langpacks/english: update

25 files changed, 371 insertions, 243 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 810aa3f59c..f3cd8a26b7 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -52,6 +52,7 @@
 [System tray icon]

 [System tray icon when using multiple protocols]

 [Contact list sorting]

+[Don't move offline user to bottom]

 [Window]

 [Always on top]

 [Tool style main window]

@@ -83,7 +84,6 @@
 [Show selection even when list is not focused]

 [Make selection highlight translucent]

 [Dim idle contacts]

-['Hide offline' means to hide:]

 [Groups]

 [Draw a line alongside group names]

 [Show counts of number of contacts in a group]

@@ -96,8 +96,8 @@
 [Scroll list smoothly]

 [Time:]

 [milliseconds]

-[Left margin:]

 [Hide vertical scroll bar]

+[Left margin:]

 [Row height:]

 [Gamma correction]

 [Gray out entire list when:]

@@ -583,6 +583,7 @@
 [Enable groups]

 [Ask before deleting contacts]

 [Remove temporary contacts on exit]

+['Hide offline' means to hide:]

 [Hidden window]

 [Tray]

 [&Hide/Show]

@@ -631,6 +632,7 @@
 ;file \src\core\stdaway\src\awaymsg.cpp

 [Re&ad %s message]

 [Re&ad status message]

+;file \src\core\stdaway\src\options.cpp

 ;file \src\core\stdaway\src\sendmsg.cpp

 [I've been away since %time%.]

 [Give it up, I'm not in!]

@@ -665,6 +667,7 @@
 [List background]

 ;file \src\core\stdclist\src\clistopts.cpp

 [Global]

+[General]

 ;file \src\core\stdclist\src\cluiopts.cpp

 ;file \src\core\stdcrypt\src\encrypt.cpp

 [Standard crypto provider]

@@ -843,7 +846,6 @@
 [Icons to display in the message log]

 [Icons to display in the tray]

 [Popups to display]

-[General]

 [Chat log]

 [Chat]

 [Popups]

@@ -1033,8 +1035,8 @@
 [%s is now known as %s]

 [You are now known as %s]

 [%s kicked %s]

-[Notice from %s: ]

-[The topic is '%s%s']

+[Notice from %s]

+[The topic is '%s']

 [ (set by %s on %s)]

 [ (set by %s)]

 [%s enables '%s' status for %s]

@@ -1074,22 +1076,12 @@
 [%s has joined %s]

 [%s has left %s]

 [%s kicked %s from %s]

-[Notice from %s]

 [Topic change in %s]

 [Information in %s]

 [%s enables '%s' status for %s in %s]

 [%s disables '%s' status for %s in %s]

-[%s says: %s]

-[%s has left (%s)]

-[%s has disconnected (%s)]

-[%s kicked %s (%s)]

-[Notice from %s: %s]

-[The topic is '%s']

-[The topic is '%s' (set by %s)]

+[%s says]

 [Chat rooms]

-[Look up '%s':]

-[No word to look up]

-[&Message %s]

 ;file \src\mir_app\src\clcitems.cpp

 ;file \src\mir_app\src\clistgroups.cpp

 [New group]

@@ -1226,6 +1218,7 @@
 [Show/Hide contact list]

 [Read message]

 [Open Options page]

+[Toggle groups]

 [Open logging options]

 [Open 'Find user' dialog]

 ;file \src\mir_app\src\lpopts.cpp

@@ -1366,6 +1359,10 @@
 [Modified]

 [My profiles]

 [New profile]

+;file \src\mir_app\src\proto_interface.cpp

+[Request authorization]

+[Grant authorization]

+[Revoke authorization]

 ;file \src\mir_app\src\proto_opts.cpp

 [WARNING! The account is going to be deleted. It means that all its settings, contacts and histories will be also erased.\n\nAre you absolutely sure?]

 [Your account was successfully upgraded. To activate it, restart of Miranda is needed.\n\nIf you want to restart Miranda now, press Yes, if you want to upgrade another account, press No]

@@ -1394,10 +1391,6 @@
 [Account name has to be unique. Please enter unique name.]

 [&Accounts...]

 ;file \src\mir_app\src\proto_order.cpp

-;file \src\mir_app\src\proto_utils.cpp

-[Request authorization]

-[Grant authorization]

-[Revoke authorization]

 ;file \src\mir_app\src\searchresults.cpp

 [Could not start a search on '%s', there was a problem - is %s connected?]

 [Could not search on any of the protocols, are you online?]

@@ -1450,10 +1443,14 @@
 [WAV files]

 [Unselect all]

 ;file \src\mir_app\src\srmm_base.cpp

+[&Message %s]

 [Nickname]

 [Unique ID]

 ;file \src\mir_app\src\srmm_log.cpp

 [Log viewer]

+;file \src\mir_app\src\srmm_log_rtf.cpp

+[Look up '%s':]

+[No word to look up]

 ;file \src\mir_app\src\srmm_toolbar.cpp

 [<Separator>]

 [Toolbar]

diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt
index 2518a3b679..769c31d774 100644
--- a/langpacks/english/Plugins/Clist_blind.txt
+++ b/langpacks/english/Plugins/Clist_blind.txt
@@ -7,20 +7,6 @@
 ;============================================================

 [A contact list for blind folks.]

 ;file \plugins\Clist_blind\res\resource.rc

-[Delete contact]

-[Are you sure you want to delete %s?]

-[This will erase all history and settings for this contact!]

-[Yes]

-[No]

-[Hide from list only, in order to keep their history and ignore/visibility settings]

-[Use Options -> Contacts -> Ignore to unhide contacts.]

-[Hotkeys]

-[Show/Hide:]

-[Read message:]

-[Web search:]

-[URL:]

-[Open in new browser window]

-[Show options]

 [Sort contacts by name]

 [Sort contacts by status]

 [Sort contacts by protocol]

@@ -59,8 +45,6 @@
 [If window is partially covered, bring to front instead of hiding]

 [Show drop shadow (restart required)]

 [Pin to desktop]

-[Items]

-['Hide offline' means to hide:]

 [Groups]

 [Show counts of number of contacts in a group]

 [Hide group counts when there are none online]

@@ -82,15 +66,6 @@
 [Show bevels on panels]

 [Show resize grip indicator]

 ;file \plugins\Clist_blind\src\clcopts.cpp

-[Not focused]

-[Offline]

-[Online]

-[Away]

-[Not available]

-[Occupied]

-[Do not disturb]

-[Free for chat]

-[Invisible]

 [Group: %name% %count% [%mode%]]

 [Divider: %s]

 [Info: %s]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 8dde9b1470..3431ce87b9 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -127,7 +127,6 @@
 [Show selection even when list is not focused]

 [Make selection highlight translucent]

 [Dim idle contacts]

-['Hide offline' means to hide:]

 [Groups]

 [Draw a line alongside group names]

 [Show counts of number of contacts in a group]

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index a0ea788ed7..2d80234f14 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -61,7 +61,6 @@
 [Finally by]

 [Move events to the top of list or group]

 [Do not separate offline contacts]

-[Hide as offline]

 [Right align contacts]

 [Avatars]

 [Show avatars]

@@ -203,18 +202,6 @@
 [Setup view modes]

 [Clear view mode]

 ;file \plugins\Clist_nicer\src\clcopts.cpp

-[Not focused]

-[Offline]

-[Online]

-[Away]

-[Not available]

-[Occupied]

-[Do not disturb]

-[Free for chat]

-[Invisible]

-[Always left]

-[Always right]

-[Automatic (RTL)]

 [Nothing]

 [Name]

 [Status]

@@ -223,24 +210,39 @@
 [Always]

 [For RTL only]

 [RTL TEXT only]

+[Always left]

+[Always right]

+[Automatic (RTL)]

 [When space allows it]

 [When needed]

 [With nickname - left]

 [Far left]

 [Far right]

 [With nickname - right]

-[General]

-[List layout]

-[Background]

 [Row items]

 [Contacts]

 [Groups and layout]

 [Advanced]

-[Skins]

 ;file \plugins\Clist_nicer\src\clcpaint.cpp

 [No events...]

 ;file \plugins\Clist_nicer\src\clistopts.cpp

 [Global]

+[Not focused]

+[Offline]

+[Online]

+[Away]

+[Not available]

+[Occupied]

+[Do not disturb]

+[Free for chat]

+[Invisible]

+[Title bar]

+[Tool Window]

+[Thin border]

+[No border]

+[General]

+[List layout]

+[Background]

 ;file \plugins\Clist_nicer\src\clui.cpp

 [Toggle show online/offline]

 [Toggle groups]

@@ -304,16 +306,12 @@
 [Show all frames]

 [Show all title bars]

 [Hide all title bars]

-;file \plugins\Clist_nicer\src\cluiopts.cpp

-[Title bar]

-[Tool Window]

-[Thin border]

-[No border]

 ;file \plugins\Clist_nicer\src\Docking.cpp

 [The contact list cannot be docked when using the default title bar and border. Use a toolwindow or borderless style instead.]

 [Contact list docking]

 ;file \plugins\Clist_nicer\src\extBackg.cpp

 [Load and apply]

+[Skins]

 ;file \plugins\Clist_nicer\src\groupmenu.cpp

 [Show metacontact protocol icons]

 [Show additional buttons]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index e4226daa13..cd9de4e63f 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Facebook.dll

 ;  Plugin: Facebook

-;  Version: 0.1.0.4

+;  Version: 0.1.0.7

 ;  Authors: Miranda NG Team

 ;============================================================

 [Facebook protocol support for Miranda NG.]

@@ -14,6 +14,8 @@
 [Contacts]

 [Default group:]

 [Keep messages as unread on server]

+[Use invisible mode after login]

+[Load also Messenger contacts at login (not only Facebook friends)]

 [Group chats]

 [Enable group chats]

 [Do not open chat windows on creation]

diff --git a/langpacks/english/Plugins/Fingerprint.txt b/langpacks/english/Plugins/Fingerprint.txt
index 46232127bb..a70e606de4 100644
--- a/langpacks/english/Plugins/Fingerprint.txt
+++ b/langpacks/english/Plugins/Fingerprint.txt
@@ -22,7 +22,6 @@
 [ICQ clients]

 [IRC clients]

 [Jabber clients]

-[MSN clients]

 [RSS clients]

 [VKontakte clients]

 [Weather clients]

@@ -60,7 +59,6 @@
 [JGmail overlay]

 [JGTalk overlay]

 [Jabber overlay]

-[MSN overlay]

 [VK overlay]

 [Skype overlay]

 [ICQ v8.x overlay]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index b4c26bedc9..ecf90361e1 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: ICQ.dll

 ;  Plugin: ICQ-WIM protocol

-;  Version: 0.95.11.9

+;  Version: 0.95.11.11

 ;  Authors: George Hazan

 ;============================================================

 [ICQ protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/IEView.txt b/langpacks/english/Plugins/IEView.txt
index 81d9206768..eb2c559f59 100644
--- a/langpacks/english/Plugins/IEView.txt
+++ b/langpacks/english/Plugins/IEView.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: IEView.dll

 ;  Plugin: IEView

-;  Version: 1.6.0.3

+;  Version: 1.6.0.4

 ;  Authors: Piotr Piastucki, Francois Mean

 ;============================================================

 [IE Based Chat Log.]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 7b522c4ae2..2187f21fff 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -41,6 +41,7 @@
 [Host:]

 [Keep connection alive]

 [Automatically delete contacts not in my roster]

+[History recording mode]

 [Language for human-readable resources:]

 [File Transfer]

 [Allow file sending through direct peer-to-peer connection]

@@ -210,7 +211,7 @@
 [Sending Ad-Hoc command to %s]

 ;file \protocols\JabberG\src\jabber_agent.cpp

 [Jabber Agent Registration]

-[No message]

+[Registration successful]

 [Register]

 [Please wait...]

 ;file \protocols\JabberG\src\jabber_bookmarks.cpp

@@ -256,6 +257,7 @@
 [Receives information about the music to which a user is listening]

 [Supports private XML Storage (for bookmarks and other)]

 [Supports attention requests ('nudge')]

+[Support Message Archive Management (XEP-0313)]

 [Supports chat history retrieving]

 [Supports chat history management]

 [Can report information about user activity]

@@ -352,14 +354,6 @@
 [Outgoing XML parsing error]

 ;file \protocols\JabberG\src\jabber_disco.cpp

 [request timeout.]

-[Node hierarchy]

-[Node]

-[Navigate]

-[Browse all favorites]

-[Remove all favorites]

-[Registered transports]

-[Browse local transports]

-[Browse chatrooms]

 [Contact Menu...]

 [View vCard]

 [Join chatroom]

@@ -377,6 +371,14 @@
 [Copy JID]

 [Copy node name]

 [Copy node information]

+[Node hierarchy]

+[Node]

+[Navigate]

+[Browse all favorites]

+[Remove all favorites]

+[Registered transports]

+[Browse local transports]

+[Browse chatrooms]

 ;file \protocols\JabberG\src\jabber_disco.h

 [Identities]

 [category]

@@ -386,6 +388,8 @@
 [Supported features]

 [Info request error]

 [Items request error]

+;file \protocols\JabberG\src\jabber_ft.cpp

+[No compatible file transfer mechanism exists]

 ;file \protocols\JabberG\src\jabber_groupchat.cpp

 [Failed to retrieve room list from server.]

 [No rooms available on server.]

@@ -447,7 +451,6 @@
 ;file \protocols\JabberG\src\jabber_iqid.cpp

 [Authentication failed for %s.]

 [Authentication]

-[Registration successful]

 [Password is successfully changed. Don't forget to update your password in the Jabber protocol option.]

 [Password cannot be changed.]

 [Jabber Bookmarks Error]

@@ -692,6 +695,9 @@
 [Yoruba]

 [Zhuang; Chuang]

 [Zulu]

+[Never]

+[Roster]

+[Always]

 [These changes will take effect the next time you connect to the Jabber network.]

 [Jabber Protocol Option]

 [This operation will kill your account, roster and all other information stored at the server. Are you ready to do that?]

@@ -710,8 +716,9 @@
 [Receive notes]

 [Automatically save received notes]

 [Inline pictures in messages (XEP-0231)]

+[Enable chat states sending (XEP-0085)]

 [Enable server-side history (XEP-0136)]

-[Receive conversations from other devices (XEP-0280)]

+[Enable carbon copies (XEP-0280)]

 [Use Stream Management (XEP-0198) if possible (Testing)]

 [Server options]

 [Disable SASL authentication (for old servers)]

@@ -724,7 +731,7 @@
 [Fix incorrect timestamps in incoming messages]

 [Disable frame]

 [Enable XMPP link processing (requires AssocMgr)]

-[Keep contacts assigned to local groups (ignore roster group)]

+[Ignore server roster (groups and nick names)]

 [Security]

 [Allow servers to request version (XEP-0092)]

 [Show information about operating system in version replies]

@@ -827,7 +834,6 @@
 [Unable to save list because you are currently offline.]

 [List Editor...]

 ;file \protocols\JabberG\src\jabber_proto.cpp

-[No compatible file transfer mechanism exists]

 [Protocol is offline or no JID]

 [No valid OMEMO session exists]

 ;file \protocols\JabberG\src\jabber_rc.cpp

@@ -870,7 +876,7 @@
 [Uploading...]

 [Downloading...]

 [Connecting...]

-[XML for MS Excel (UTF-8 encoded)]

+[XML (UTF-8 encoded)]

 ;file \protocols\JabberG\src\jabber_search.cpp

 [Error %s %s\r\nPlease select other server]

 [Error: unknown reply received\r\nPlease select other server]

@@ -897,6 +903,7 @@
 [Requesting registration instruction...]

 [Authentication failed for %s@%s.]

 [Message redirected from: %s\r\n]

+[Unable to decrypt a carbon copy of the encrypted outgoing message]

 [Registration canceled]

 [Sending registration information...]

 ;file \protocols\JabberG\src\jabber_userinfo.cpp

diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt
index d0309078da..4e252bcb74 100644
--- a/langpacks/english/Plugins/MirOTR.txt
+++ b/langpacks/english/Plugins/MirOTR.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MirOTR.dll

 ;  Plugin: Miranda OTR

-;  Version: 0.14.2.1

+;  Version: 0.14.2.2

 ;  Authors: ProgAndy & CHEF-KOCH

 ;============================================================

 [OTR (Off-the-Record) plugin for Miranda NG (using some code and ideas from SecureIM, Pidgin-OTR and old Miranda OTR (by SJE)).]

@@ -25,13 +25,8 @@
 [Show verification dialog when receiving unverified fingerprint]

 [Set OTR policy per account]

 [Current policy:]

-[Generate new private key]

-[Forget private key]

 [Set OTR policy per contact]

 [View & Modify status of known fingerprints]

-[Set verified]

-[Set unknown]

-[Forget]

 [Socialist Millionaires Protocol]

 [Socialist Millionaires Protocol\r\nVerification progress]

 [&Cancel]

@@ -43,6 +38,12 @@
 [&Refresh OTR session]

 [Sto&p OTR session]

 [&Verify Fingerprint]

+[Set verified]

+[Set unknown]

+[Copy]

+[Forget]

+[Generate new private key]

+[Forget private key]

 ;file \plugins\MirOTR\src\icons.cpp

 [OTR private]

 [OTR unverified]

@@ -75,10 +76,6 @@
 [OTR encrypted session with '%s' is now using a VERIFIED fingerprint]

 [OTR encrypted session with '%s' is now using a NOT VERIFIED fingerprint]

 [Generating new private key for account '%s'.\nPlease Wait...]

-[General]

-[Accounts]

-[Contacts]

-[Fingerprints]

 [Contact]

 [Account]

 [Policy]

@@ -126,6 +123,10 @@
 ;file \plugins\MirOTR\src\options.cpp

 [Private Data]

 [Services]

+[General]

+[Accounts]

+[Contacts]

+[Fingerprints]

 ;file \plugins\MirOTR\src\otr.cpp

 [\nusing older protocol version %i]

 [Attempting to start a private conversation...]

diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index f8ac037e5d..366c70b75e 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Msg_Export.dll

 ;  Plugin: Message export

-;  Version: 3.1.2.4

+;  Version: 3.1.2.5

 ;  Authors: Kennet Nielsen, mod by ring0

 ;============================================================

 [Exports every message, URL or file you receive to a text file.]

diff --git a/langpacks/english/Plugins/NewStory.txt b/langpacks/english/Plugins/NewStory.txt
new file mode 100644
index 0000000000..59a7b9ab00
--- /dev/null
+++ b/langpacks/english/Plugins/NewStory.txt
@@ -0,0 +1,164 @@
+#muuid {1ad11c86-caab-4372-a0a4-8b1168d51b9e}
+;============================================================
+;  File: NewStory.dll
+;  Plugin: NewStory
+;  Version: 0.1.0.2
+;  Authors: nullbie
+;============================================================
+[History viewer for Miranda NG.]
+;file \plugins\NewStory\res\resource.rc
+[Messages]
+[Files]
+[URLs]
+[Total]
+[Incoming]
+[Outgoing]
+[since]
+[till]
+[Group messages]
+[Log window]
+[Enable vertical scroll bar]
+[Draw window edge]
+[Template list:]
+[Edit template:]
+[Text preview:]
+[Graphic preview:]
+[Filter]
+[Show all events]
+[Show incoming events only]
+[Show outgoing events only]
+[Use custom filter...]
+[Incoming events]
+[Outgoing events]
+[Show messages]
+[Show file transfers]
+[Show URLs]
+[Show sign in/out events]
+[Show other events]
+[Auto search]
+[Log options]
+[Options]
+[Templates]
+[Copy]
+[Edit]
+[Delete]
+[Select all]
+;file \plugins\NewStory\src\fonts.cpp
+[Incoming messages]
+[Outgoing messages]
+[Incoming files]
+[Outgoing files]
+[Status changes]
+[Other incoming events]
+[Other outgoing events]
+[Selected item's text]
+[Selected item's background]
+[Selected item's frame]
+[Grid background]
+[Separator]
+[Incoming name]
+[Outgoing name]
+;file \plugins\NewStory\src\history.cpp
+[FirstName]
+[LastName]
+[e-mail]
+[Nick]
+[Age]
+[Gender]
+[City]
+[State]
+[Phone]
+[Homepage]
+[About]
+[History search results]
+[Export...]
+[Delete...]
+[Search...]
+[Send message]
+[Jump to date]
+[User info]
+[User menu]
+[Find next]
+[Find previous]
+[Conversations]
+[It is metacontact. For export use one of this subcontacts:\r\n%s]
+[Export warning]
+[JSON files]
+[Export %s history]
+[Complete]
+[History export]
+;file \plugins\NewStory\src\history_control.cpp
+[Are you sure to remove all events from history?]
+;file \plugins\NewStory\src\history_menus.cpp
+[User history]
+[Empty history]
+[System history]
+;file \plugins\NewStory\src\main.cpp
+[Main icon]
+[Search]
+[Export]
+[Incoming message]
+[Outgoing message]
+[User signed in]
+[Unknown event]
+[Template group]
+[Cancel edit]
+[Update preview]
+[Help]
+;file \plugins\NewStory\src\options.cpp
+[Reset to default]
+[Variables help]
+[Test contact]
+[simply % character]
+[a "hard" line break (cr/lf - will break indent)]
+[my nickname]
+[buddy\'s nickname]
+[event count]
+[icon]
+[direction icon]
+[direction symbol]
+[timestamp]
+[hour (24 hour format, 0-23)]
+[hour (12 hour format)]
+[minute]
+[second]
+[month]
+[day of month]
+[year (4 digits)]
+[day of week (Sunday, Monday... translatable)]
+[AM/PM symbol]
+[name of month, translatable]
+[the message string itself]
+[History]
+[Advanced]
+;file \plugins\NewStory\src\templates.cpp
+[Sunday]
+[Monday]
+[Tuesday]
+[Wednesday]
+[Thursday]
+[Friday]
+[Saturday]
+[January]
+[February]
+[March]
+[April]
+[May]
+[June]
+[July]
+[August]
+[September]
+[October]
+[November]
+[December]
+[System event]
+[Interface]
+[Window title]
+[Message log]
+[Grouped messages]
+[Presence requests]
+[Other events]
+[Authorization requests]
+['You were added' events]
+['You were deleted' events]
+[Clipboard]
diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 2db4810d52..c0d3d74c94 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: New_GPG.dll

 ;  Plugin: GPG

-;  Version: 0.2.0.2

+;  Version: 0.2.0.4

 ;  Authors: sss, Miranda NG Team

 ;============================================================

 [New GPG encryption support plugin, based on code from old GPG plugin and SecureIM.]

@@ -12,9 +12,10 @@
 [Select existing]

 [Turn on encryption]

 [Import key from keyserver]

-[Set own key]

+[Bind own keys to accounts]

+[Bind]

 [Generate key]

-[Select key to use]

+[Select own key to bind to account]

 [Key password:]

 [Load other]

 [Delete key]

@@ -73,7 +74,7 @@
 [Encrypt file transfers]

 [Automatic key exchange]

 [Copy own key]

-[Select own key]

+[Bind keys to accounts]

 [Add tags to encoded and decoded messages]

 [Incoming message tags:]

 [Outgoing message tags:]

@@ -83,6 +84,7 @@
 [Turn on presence signing (Jabber) (required by XEP-0027)]

 [Export keys]

 [Import keys]

+[Send error messages]

 ;file \plugins\New_GPG\src\init.cpp

 [GPG Turn off encryption]

 [GPG Turn on encryption]

@@ -92,6 +94,15 @@
 [Import GPG Public keys]

 [GPG encryption status]

 ;file \plugins\New_GPG\src\main.cpp

+[GPG binary found in Miranda folder, but English locale does not exist.\nIt's highly recommended that you place \\gnupg.nls\\en@quot.mo in GnuPG folder under Miranda root.\nWithout this file you may experience many problems with GPG output on non-English systems\nand plugin may completely not work.\nYou have been warned.]

+[Warning]

+[Wrong GPG binary location found in system.\nPlease choose another location]

+[This is not GnuPG binary!\nIt is recommended that you use GnuPG v1.x.x with this plugin.]

+[Error]

+[Unsupported GnuPG version found, use at you own risk!\nIt is recommended that you use GnuPG v1.x.x with this plugin.]

+["GPG" directory found in Miranda root.\nAssuming it's GPG home directory.\nGPG home directory set.]

+[Info]

+[Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue.]

 [GPG binary is set and valid (this is good).\n]

 [GPG binary unset or invalid (plugin will not work).\n]

 [Home dir write access granted (this is good).\n]

@@ -111,15 +122,21 @@
 [Metacontact detected]

 ;file \plugins\New_GPG\src\messages.cpp

 [We received encrypted message from contact with encryption turned off.\nDo you want to turn on encryption for this contact?]

-[Warning]

 [Do you want to try to decrypt encrypted message?]

+[GPG cannot decrypt imcoming message]

+[Received unencrypted message:]

+[Failed to decrypt GPG encrypted message.\nMessage body for manual decryption:\n]

 [We're trying to encrypt with untrusted key. Do you want to trust this key permanently?]

 [Something is wrong, GPG does not understand us, aborting encryption.]

 ;file \plugins\New_GPG\src\options.cpp

-[Contact]

 [Key ID]

-[Name]

 [Email]

+[Name]

+[Creation date]

+[Expiration date]

+[Key length]

+[Failed to export public key.]

+[Contact]

 [Account]

 [Default private key ID]

 [not set]

@@ -132,14 +149,12 @@
 [Export public key]

 [.asc pubkey file]

 [Failed to allocate memory]

-[Error]

 [Failed to lock memory with error %d]

 [Failed write to clipboard with error %d]

 [Failed to open clipboard with error %d]

 [Set log file]

 [LOG files]

 [Choose gpg.exe]

-[This is not GnuPG binary!\nIt is recommended that you use GnuPG v1.x.x with this plugin.]

 [Set home directory]

 [Load Public GPG Key for ]

 [Turn off encryption]

@@ -148,7 +163,6 @@
 [ found in presence.)]

 [This is not public or private key]

 [Key already in secret keyring.]

-[Info]

 [Set file containing GPG public key]

 [GPG public key file]

 [Failed to open file]

@@ -161,32 +175,23 @@
 ;file \plugins\New_GPG\src\ui.cpp

 [New passwords do not match]

 [Old password does not match, you can continue, but GPG will reject wrong password.\nDo you want to continue?]

-[Creation date]

+[You must set encryption algorithm first]

+[Key length must be of length from 1024 to 4096 bits]

+[Invalid date]

+[Name must contain at least 5 characters]

+[Name cannot contain '(' or ')']

+[Invalid Email]

+[Generating new key, please wait...]

 [Expire date]

-[Key length]

 [Accounts]

 [Default]

 [key ID]

 [Generating new random key, please wait]

-[GPG binary found in Miranda folder, but English locale does not exist.\nIt's highly recommended that you place \\gnupg.nls\\en@quot.mo in GnuPG folder under Miranda root.\nWithout this file you may experience many problems with GPG output on non-English systems\nand plugin may completely not work.\nYou have been warned.]

-[Wrong GPG binary location found in system.\nPlease choose another location]

-[Unsupported GnuPG version found, use at you own risk!\nIt is recommended that you use GnuPG v1.x.x with this plugin.]

-["GPG" directory found in Miranda root.\nAssuming it's GPG home directory.\nGPG home directory set.]

-[Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue.]

 [There is existing key for contact, would you like to replace it with new key?]

 [New public key was received, do you want to import it?]

 [Replace]

 [Accept]

 [Received key from %s]

-[You must set encryption algorithm first]

-[Key length must be of length from 1024 to 4096 bits]

-[Invalid date]

-[Name must contain at least 5 characters]

-[Name cannot contain '(' or ')']

-[Invalid Email]

-[Generating new key, please wait...]

-[Expiration date]

-[Failed to export public key.]

 [Please enter password for key with ID: ]

 ;file \plugins\New_GPG\src\utilities.cpp

 [Do you want to toggle encryption for all subcontacts?]

diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 863cf4b62d..b52fc7f4c8 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: PluginUpdater.dll

 ;  Plugin: Plugin updater

-;  Version: 0.2.0.6

+;  Version: 0.2.0.7

 ;  Authors: Mataes, George Hazan

 ;============================================================

 [Installs and updates plugins and other Miranda NG components.]

@@ -14,13 +14,12 @@
 [Cancel]

 [Select &all]

 [Select &none]

-[Hotkey]

-[Go to Options -> Customize -> Hotkeys to change the hotkey]

 [Update options]

 [On startup]

 [(but only once a day)]

 [Every]

 [Silent mode]

+[Restart Miranda automatically]

 [Backup database before update (requires Db_autobackups plugin)]

 [Files source]

 [Stable version]

@@ -29,8 +28,8 @@
 [Development version with debug symbols]

 [Custom version]

 [Change platform to 32-bit]

-[Some component(s) was updated.\nYou need to restart your Miranda to apply installed updates.]

 [Use HTTPS]

+[Some component(s) was updated.\nYou need to restart your Miranda to apply installed updates.]

 [Notifications]

 [Restart]

 [Errors]

@@ -80,13 +79,13 @@
 [Update failed! One of the components wasn't downloaded correctly. Try it again later.]

 [%d component(s) was updated]

 [You need to restart your Miranda to apply installed updates.]

-[Would you like to restart it now?]

 [Checking for new updates...]

 [No updates found.]

 [Update checking already started!]

 ;file \plugins\PluginUpdater\src\Events.cpp

 [Plugin updater URI scheme]

 ;file \plugins\PluginUpdater\src\Notifications.cpp

+[Would you like to restart it now?]

 ;file \plugins\PluginUpdater\src\Options.cpp

 [Backup database before update]

 [Stable version (incompatible with current development version)]

diff --git a/langpacks/english/Plugins/PopupPlus.txt b/langpacks/english/Plugins/PopupPlus.txt
index 1f083ff275..485378f7d6 100644
--- a/langpacks/english/Plugins/PopupPlus.txt
+++ b/langpacks/english/Plugins/PopupPlus.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: PopupPlus.dll

 ;  Plugin: Popup plus

-;  Version: 2.1.1.15

+;  Version: 2.1.1.17

 ;  Authors: MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)

 ;============================================================

 [Provides popup notification services for different plugins.]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 9bf8bf5a7c..00cd2d0faa 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Scriver.dll

 ;  Plugin: Scriver

-;  Version: 3.0.2.1

+;  Version: 3.0.2.2

 ;  Authors: Miranda NG team

 ;============================================================

 [Scriver - send and receive instant messages.]

diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt
index 07bc865041..07792fcf55 100644
--- a/langpacks/english/Plugins/SecureIM.txt
+++ b/langpacks/english/Plugins/SecureIM.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SecureIM.dll

 ;  Plugin: SecureIM

-;  Version: 1.0.12.4

+;  Version: 1.0.12.6

 ;  Authors: Johell, Ghost, Nightwish, __alex, Baloo

 ;============================================================

 [SecureIM plugin for Miranda NG.]

@@ -89,86 +89,20 @@
 [Export public key]

 [Import public key]

 [Delete public key]

-;file \plugins\SecureIM\src\language.cpp

-[SecureIM established...]

+;file \plugins\SecureIM\src\crypt_dll.cpp

 [Key exchange failed...]

-[Key from disabled...]

-[Sent back message received...]

-[Sending back secure message...]

+[SecureIM: Error while decrypting the message, bad message length.]

+[SecureIM: Error while decrypting the message, bad message CRC.]

+[SecureIM: Error while decrypting the message.]

+;file \plugins\SecureIM\src\crypt_misc.cpp

+[User has not answered to key exchange!\nYour messages are still in SecureIM queue, do you want to send them unencrypted now?]

+;file \plugins\SecureIM\src\crypt_popups.cpp

 [SecureIM disabled...]

+[SecureIM established...]

 [Sending key...]

 [Key received...]

 [Sending message...]

 [Message received...]

-[Encrypting file:]

-[Decrypting file:]

-[Bad key received...]

-[SecureIM: Error while decrypting the message.]

-[SecureIM: Error while decrypting the message, bad message length.]

-[SecureIM: Error while decrypting the message, bad message CRC.]

-[User has not answered to key exchange!\nYour messages are still in SecureIM queue, do you want to send them unencrypted now?]

-[SecureIM not enabled! You must enable SecureIM with this user...]

-[Can't send encrypted message!\nUser is offline now and his secure key has been expired. Do you want to send your message?\nIt will be unencrypted!]

-[SecureIM won't be loaded because cryptopp.dll is missing or wrong version!]

-[SecureIM can't load PGP/GPG key! Check PGP/GPG settings!]

-[SecureIM can't encrypt message! Check trust of PGP/GPG key!]

-[Can't send encrypted message!\nDo you want to send your message?\nIt will be unencrypted!]

-[Can't change mode! Secure connection established!]

-[Can't export RSA private key!]

-[Can't import RSA private key!]

-[Can't export RSA public key!]

-[Can't import RSA public key!]

-[General]

-[Nickname]

-[User ID]

-[Name]

-[Password is too short!]

-[ON]

-[Off]

-[Key ID]

-[Keyrings loaded.]

-[Keyrings not loaded!]

-[PGP SDK v%i.%i.%i found.]

-[PGP SDK not found!]

-[This version not supported!]

-[(none)]

-[Private key loaded.]

-[Private key not loaded!]

-[The new settings will become valid when you restart Miranda NG!]

-[Keyrings disabled!]

-[Native]

-[Disabled]

-[Enabled]

-[Always try]

-[Create SecureIM connection]

-[Disable SecureIM connection]

-[Load PGP Key]

-[Unload PGP Key]

-[Load GPG Key]

-[Unload GPG Key]

-[Delete RSA Key]

-[SecureIM mode (Native)]

-[SecureIM mode (PGP)]

-[SecureIM mode (GPG)]

-[SecureIM mode (RSA/AES)]

-[SecureIM mode (RSA)]

-[SecureIM status (disabled)]

-[SecureIM status (enabled)]

-[SecureIM status (always try)]

-[SecureIM: Sorry, unable to decrypt this message because you have no PGP/GPG installed. Visit www.pgp.com or www.gnupg.org for more info.]

-[SecureIM received unencrypted message:\n]

-[SecureIM received encrypted message:\n]

-[Session closed by receiving incorrect message type]

-[Session closed by other side on error]

-[Error while decoding AES message]

-[Error while decoding RSA message]

-[Session closed on timeout]

-[Session closed by other side when status "disabled"]

-[Session closed on error: %02x]

-[SecureIM received RSA Public Key from "%s"\n\nSHA-1: %s\n\nDo you Accept this Key?]

-[SecureIM auto accepted RSA Public key from: %s uin: %s SHA-1: %s]

-[SecureIM received NEW RSA Public Key from "%s"\n\nNew SHA-1: %s\n\nOld SHA-1: %s\n\nDo you Replace this Key?]

-[SecureIM auto accepted NEW RSA Public key from: %s uin: %s New SHA-1: %s Old SHA-1: %s]

 ;file \plugins\SecureIM\src\loadicons.cpp

 [Contact List]

 [Connection Disabled]

@@ -184,6 +118,8 @@
 [Recv Secured Message]

 [Sent Secured Message]

 [Menu State]

+[Disabled]

+[Enabled]

 [Always Try]

 [Overlays]

 [Native mode]

@@ -191,14 +127,29 @@
 [GPG mode]

 [RSA/AES mode]

 ;file \plugins\SecureIM\src\main.cpp

+[SecureIM mode (Native)]

+[SecureIM mode (PGP)]

+[SecureIM mode (GPG)]

+[SecureIM mode (RSA/AES)]

+[SecureIM mode (RSA)]

+[SecureIM status (disabled)]

+[SecureIM status (enabled)]

+[SecureIM status (always try)]

+[Native]

+[Always try]

 [SecureIM]

 [Icons]

 [Incoming Secure Message]

 [Outgoing Secure Message]

+[Create SecureIM connection]

+[Disable SecureIM connection]

+[Load PGP Key]

+[Unload PGP Key]

+[Load GPG Key]

+[Unload GPG Key]

+[SecureIM won't be loaded because cryptopp.dll is missing or wrong version!]

 [SecureIM status]

 ;file \plugins\SecureIM\src\options.cpp

-[Executable Files]

-[Select GnuPG Executable]

 [ASC files]

 [All files]

 [Open Key File]

@@ -206,11 +157,60 @@
 [Save Public Key File]

 [Load Private Key File]

 [Load Public Key File]

+[Password is too short!]

+[The new settings will become valid when you restart Miranda NG!]

+[Nickname]

+[Account]

+[User ID]

+[Can't export RSA public key!]

+[Can't import RSA public key!]

+[Name]

+[Can't export RSA private key!]

+[Can't import RSA private key!]

+[Keyrings disabled!]

+[This version not supported!]

+[Keyrings loaded.]

+[Keyrings not loaded!]

+[Private key loaded.]

+[Private key not loaded!]

+[PGP SDK v%i.%i.%i found.]

+[PGP SDK not found!]

+[(none)]

+[Key ID]

+[Executable Files]

+[Select GnuPG Executable]

 [Services]

+[General]

 ;file \plugins\SecureIM\src\popupOptions.cpp

 [Key Popup]

 [Secure Popup]

 [Message Popup]

+;file \plugins\SecureIM\src\svcs_menu.cpp

+[Can't change mode! Secure connection established!]

+;file \plugins\SecureIM\src\svcs_proto.cpp

+[SecureIM received unencrypted message:\n]

+[Key from disabled...]

+[SecureIM: Sorry, unable to decrypt this message because you have no PGP/GPG installed. Visit www.pgp.com or www.gnupg.org for more info.]

+[SecureIM received encrypted message:\n]

+[Sending back secure message...]

+[Sent back message received...]

+[Bad key received...]

+[SecureIM can't load PGP/GPG key! Check PGP/GPG settings!]

+[SecureIM can't encrypt message! Check trust of PGP/GPG key!]

+[SecureIM not enabled! You must enable SecureIM with this user...]

+[Can't send encrypted message!\nUser is offline now and his secure key has been expired. Do you want to send your message?\nIt will be unencrypted!]

+;file \plugins\SecureIM\src\svcs_rsa.cpp

+[SecureIM auto accepted NEW RSA Public key from: %s uin: %s New SHA-1: %s Old SHA-1: %s]

+[SecureIM auto accepted RSA Public key from: %s uin: %s SHA-1: %s]

+[SecureIM received NEW RSA Public Key from "%s"\n\nNew SHA-1: %s\n\nOld SHA-1: %s\n\nDo you Replace this Key?]

+[SecureIM received RSA Public Key from "%s"\n\nSHA-1: %s\n\nDo you Accept this Key?]

+[Session closed by receiving incorrect message type]

+[Session closed by other side on error]

+[Error while decoding AES message]

+[Error while decoding RSA message]

+[Session closed on timeout]

+[Session closed by other side when status "disabled"]

+[Session closed on error: %02x]

 ;file \plugins\SecureIM\src\svcs_srmm.cpp

 [SecureIM [Native]]

 [SecureIM [PGP]]

diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 108392ca8d..209c499e05 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SkypeWeb.dll

 ;  Plugin: Skype protocol (Web)

-;  Version: 0.12.3.6

+;  Version: 0.95.12.1

 ;  Authors: Miranda NG team

 ;============================================================

 [Skype protocol support for Miranda NG. Based on new Skype for Web.]

@@ -93,8 +93,6 @@
 [You cannot send when you are offline.]

 [Unknown error!]

 [Network error!]

-;file \protocols\SkypeWeb\src\skype_mslogin.cpp

-[Enter confirmation code]

 ;file \protocols\SkypeWeb\src\skype_network.cpp

 [%s connection]

 ;file \protocols\SkypeWeb\src\skype_options.cpp

@@ -106,5 +104,3 @@
 ;file \protocols\SkypeWeb\src\skype_proto.cpp

 [Incoming call canceled]

 [Skypename]

-;file \protocols\SkypeWeb\src\skype_trouter.cpp

-[Incoming call from %s]

diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index 57dd790f66..45b83a4fa3 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -17,10 +17,10 @@
 [Display]

 [Replace only smileys surrounded by spaces]

 [Scale smiley to text height]

-[Disable custom smileys]

+[Disable stickers]

 [High quality smiley scaling]

 [Animate]

-[Maximum 'Custom smiley' height]

+[Maximum sticker height]

 [Minimum smiley height]

 [Smiley selector]

 [Input area]

diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index 7cb0fcd8b5..5b471b9e66 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Steam.dll

 ;  Plugin: Steam protocol

-;  Version: 0.11.6.7

+;  Version: 0.95.12.1

 ;  Authors: Miranda NG team, Robert Pösel

 ;============================================================

 [Steam protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 7de602502a..4dc6c89595 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -389,20 +389,6 @@
 [Toggle nick list]

 [Event filter - right click to setup, left click to activate/deactivate]

 [Channel manager]

-;file \plugins\TabSRMM\src\chat_log.cpp

-[%s has joined]

-[You have joined %s]

-[%s has left]

-[%s has disconnected]

-[%s is now known as %s]

-[You are now known as %s]

-[%s kicked %s]

-[Notice from %s: ]

-[The topic is '%s%s']

-[ (set by %s on %s)]

-[ (set by %s)]

-[%s enables '%s' status for %s]

-[%s disables '%s' status for %s]

 ;file \plugins\TabSRMM\src\chat_main.cpp

 [Message sessions]

 ;file \plugins\TabSRMM\src\chat_options.cpp

@@ -568,6 +554,7 @@
 [%s%s says:%s %s]

 ;file \plugins\TabSRMM\src\container.cpp

 [Message session...]

+[Message from %s]

 [Default container]

 [Attach to]

 ;file \plugins\TabSRMM\src\containeroptions.cpp

@@ -653,7 +640,6 @@
 [TabSRMM: typing]

 [&Messaging settings...]

 [&Send later job list...]

-[Message from %s]

 [signed off.]

 [signed on and is now %s.]

 [changed status from %s to %s.]

@@ -819,6 +805,10 @@
 [Log status changes]

 [Use the same splitter height for all sessions]

 [Automatically copy selected text]

+[Test contact]

+[Template set editor]

+[This will reset the template set to the default built-in templates. Are you sure you want to do this?]

+[Template set was successfully reset, please close and reopen all message windows. This template editor window will now close.]

 [Message log appearance]

 [Support for external plugins]

 [Timestamp settings (note: timestamps also depend on your templates)]

@@ -965,9 +955,6 @@
 [Group In (Inner)]

 [Group Out (Inner)]

 [Error message]

-[Template set editor]

-[This will reset the template set to the default built-in templates. Are you sure you want to do this?]

-[Template set was successfully reset, please close and reopen all message windows. This template editor window will now close.]

 ;file \plugins\TabSRMM\src\themeio.cpp

 [TabSRMM themes]

 ;file \plugins\TabSRMM\src\themes.cpp

diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index d794887bb8..bf0edeeaa8 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -81,10 +81,10 @@
 [Unable to open Tox profile]

 [Unable to read Tox profile]

 [Unable to decrypt Tox profile]

-[Removing the password will lead to decryption of the profile.\r\nAre you sure to remove password?]

 [New password is empty]

 [New password is not equal to confirmation]

 [Old password is not valid]

+[Removing the password will lead to decryption of the profile.\r\nAre you sure to remove password?]

 ;file \protocols\Tox\src\tox_proto.cpp

 [You cannot add yourself to your contact list]

 [Contact already in your contact list]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 97081c17e2..091d1ebc09 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -603,11 +603,11 @@
 [The SaveFileDialog returned an error: %d!]

 ;file \plugins\UserInfoEx\src\ex_import\svc_ExImINI.cpp

 [The ini-file "%s"\nfor saving contact information could not be opened.]

+[The ini-file "%s"\nfor reading contact information could not be opened.]

 [None of the %d contacts, stored in the ini-file, match the selected contact!\nNothing will be imported]

 [Import complete]

 [Some basic statistics]

 [Added %d of %d contacts stored in the ini-file.]

-[The ini-file "%s"\nfor reading contact information could not be opened.]

 ;file \plugins\UserInfoEx\src\ex_import\svc_ExImport.cpp

 [all Contacts]

 [Select a destination file...]

@@ -616,6 +616,7 @@
 [Can't create xml file!\n%S]

 [Contact: %s (%S)]

 [Parser is unable to load XMLCard "%s"\nError: %d\nDescription: %s]

+[File not found]

 [The selected file is no valid XMLCard]

 [The version of the XMLCard is not supported by UserInfoEx]

 [Complete]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 21c5994819..c46aee1b50 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: VKontakte.dll

 ;  Plugin: VKontakte protocol

-;  Version: 0.1.10.0

+;  Version: 0.1.11.1

 ;  Authors: Miranda NG team

 ;============================================================

 [VKontakte protocol support for Miranda NG.]

@@ -79,8 +79,6 @@
 [as regular status for unknown music and audio status otherwise]

 [as audio status only]

 [as regular status only]

-[Group chats]

-[Message for return to group chat:]

 [Login settings]

 [Local settings]

 [Contact list group:]

@@ -157,11 +155,14 @@
 [Photo]

 [Attachments:]

 [Audio]

+[Audio message]

+[Transcription]

+[Graffiti]

 [Video]

 [Link]

-[Audio message]

 [Document]

 [Wall post]

+[Story]

 [Product]

 [Price]

 [Gift]

@@ -305,8 +306,6 @@
 [Loading status message from vk.com.\nThis may take some time.]

 [Waiting...]

 [Enter new status message]

-;file \protocols\VKontakte\src\vk_struct.cpp

-[I'm back]

 ;file \protocols\VKontakte\src\vk_thread.cpp

 [Service message]

 [%s is listening to]

diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index 9ac6018b24..783ffb95da 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -195,5 +195,5 @@
 [x, and stores y as variable named x]

 [only stores y as variables x]

 ;file \plugins\Variables\src\stdafx.h

-[--- Special characters ---\r\n\r\nThe following characters have a special meaning in a formatting string:\r\n\r\n?<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will be parsed again. Example: Today is ?cdate(yyyy/MM/dd).\r\n\r\n!<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will not be parsed again. Example: Message waiting: !message(,first,rcvd,unread).\r\n\r\n%<field>%\r\nThis will parse the given field. Example: I installed Miranda at: %mirandapath%.\r\n\r\n`<string>`\r\nThis will not parse the given string, any function, field or special character in the string will shown in the result without being translated. Example: Use `%mirandapath%` to show the installation path.\r\n\r\n#<comment>\r\nThis will add a comment in the formatting string. Everything from the # character to the end of the line will be removed. Example: %dbprofile% #this is a useless comment.\r\n\r\n\r\n--- Contacts ---\r\n\r\nWhenever a functions requires a contact as an argument, you can specify it in two ways:\r\n\r\n(1) Using a unique ID (UIN for ICQ, email for MSN) or, a protocol ID followed by a unique ID in the form <PROTOID:UNIQUEID>, for example <MSN:miranda@hotmail.com> or <ICQ:123456789>.\r\n\r\n(2) Using the contact function:\r\n?contact(x,y)\r\nA contact will be searched which will have value x for its property y, y can be one of the following:\r\nfirst, last, nick, email, ID or display\r\n\r\nFor example: ?contact(miranda@hotmail.com,email) or ?contact(Miranda,nick). The contact function will return either a unique contact according to the arguments or nothing if none or multiple contacts exists with the given property.]

+[--- Special characters ---\r\n\r\nThe following characters have a special meaning in a formatting string:\r\n\r\n?<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will be parsed again. Example: Today is ?cdate(yyyy/MM/dd).\r\n\r\n!<function>(<arguments>)\r\nThis will parse the function given the arguments, the result will not be parsed again. Example: Message waiting: !message(,first,rcvd,unread).\r\n\r\n%<field>%\r\nThis will parse the given field. Example: I installed Miranda at: %mirandapath%.\r\n\r\n`<string>`\r\nThis will not parse the given string, any function, field or special character in the string will shown in the result without being translated. Example: Use `%mirandapath%` to show the installation path.\r\n\r\n#<comment>\r\nThis will add a comment in the formatting string. Everything from the # character to the end of the line will be removed. Example: %dbprofile% #this is a useless comment.\r\n\r\n\r\n--- Contacts ---\r\n\r\nWhenever a functions requires a contact as an argument, you can specify it in two ways:\r\n\r\n(1) Using a unique ID (UIN for ICQ, JID for Jabber) or, a protocol ID followed by a unique ID in the form <PROTOID:UNIQUEID>, for example <JABBER:miranda@example.com> or <ICQ:123456789>.\r\n\r\n(2) Using the contact function:\r\n?contact(x,y)\r\nA contact will be searched which will have value x for its property y, y can be one of the following:\r\nfirst, last, nick, email, ID or display\r\n\r\nFor example: ?contact(miranda@example.com,email) or ?contact(Miranda,nick). The contact function will return either a unique contact according to the arguments or nothing if none or multiple contacts exists with the given property.]

 ;file \plugins\Variables\src\variables.cpp