langpack/english & langpack/russian update

git-svn-id: http://svn.miranda-ng.org/main/trunk@16654 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

25 files changed, 98 insertions, 200 deletions

diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt
index 8075d1a346..c9151c9fd8 100644
--- a/langpacks/english/Plugins/AIM.txt
+++ b/langpacks/english/Plugins/AIM.txt
@@ -25,13 +25,14 @@
 [Instant Idle on Login]

 [Force Proxy File Transfers]

 [Masquerade as a Sidekick/Hiptop User]

-[*Aim must be reconnected for some option to take effect]

+[* Some changes will take effect the next time you connect to the AIM network]

 [Connection]

 [Port:]

 [Reset]

 [Disable SSL]

 [Manage Server Groups]

 [Force Single Client]

+[Use "clientlogin" (recommended)]

 [Save Profile]

 [Create a new AIM account]

 [AIM Instant Idler]

diff --git a/langpacks/english/Plugins/AuthState.txt b/langpacks/english/Plugins/AuthState.txt
index 2b43deeca9..33b4e59810 100644
--- a/langpacks/english/Plugins/AuthState.txt
+++ b/langpacks/english/Plugins/AuthState.txt
@@ -13,11 +13,11 @@
 [Enable menu item (restart required)]

 [Show icons only for recently added contacts]

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

-[Disable AuthState icons]

-[Enable AuthState icons]

 [Request]

 [Grant]

 [Request & Grant]

+[Disable AuthState icons]

+[Enable AuthState icons]

 [Auth state]

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

 [Icons]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 4cb6094a8e..3ebca0c5c8 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Clist_modern.dll

 ;  Plugin: Modern contact list

-;  Version: 0.9.1.3

+;  Version: 0.9.1.4

 ;  Authors: Artem Shpynov, Ricardo Pescuma Domenecci and Anton Senko based on clist_mw by Bethoven

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

 [Displays contacts, event notifications, protocol status with advanced visual modifications. Supported multi-window modifications, enhanced metacontact cooperation.]

diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index f771aa1595..ccef66c1ef 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -25,8 +25,6 @@
 [Use Dropbox]

 [Backup profile folder]

 ;file \plugins\Db_autobackups\src\backup.cpp

-[Miranda NG database]

-[Created by:]

 [Backup in progress]

 [Copying database file...]

 [Uploading to Dropbox failed]

@@ -59,3 +57,5 @@
 [Select backup folder]

 [Error creating backup folder]

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

+;file \plugins\Db_autobackups\src\zip.cpp

+[Miranda NG [%s] database backup]

diff --git a/langpacks/english/Plugins/Dropbox.txt b/langpacks/english/Plugins/Dropbox.txt
index ca09096b76..b846154ab0 100644
--- a/langpacks/english/Plugins/Dropbox.txt
+++ b/langpacks/english/Plugins/Dropbox.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Dropbox.dll

 ;  Plugin: Dropbox

-;  Version: 0.12.1.2

+;  Version: 0.12.2.1

 ;  Authors: Miranda NG Team

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

 [Allows you to transfer files via Dropbox.]

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

 ;  File: Facebook.dll

 ;  Plugin: Facebook RM

-;  Version: 0.2.12.0

+;  Version: 0.2.12.1

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

@@ -75,6 +75,7 @@
 [Login error: Invalid request.]

 [Login error: Some Facebook things are required.]

 [Login error: Your account is temporarily locked. You need to confirm this device from web browser.]

+[Login error: Facebook thinks your computer is infected. Solve it by logging in via 'private browsing' mode of your web browser and run their antivirus check.]

 [Login error: Captcha code is required. You need to confirm this device from web browser.]

 [Login error, probably bad login credentials.]

 [Could not load communication token. You should report this and wait for plugin update.]

diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index 432294a837..64c8807954 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -22,7 +22,7 @@
 [Receive image and after image is received use:]

 [Show links from unknown contacts]

 [Enable avatars]

-[You will need to reconnect for the changes you have made on this page to take effect.]

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

 [Conference policy]

 [if total participant count greater than:]

 [if unknown participant count greater than:]

@@ -40,6 +40,7 @@
 [Port:]

 [Use forwarding]

 [Host:]

+[You will need to reconnect for the changes you have made on this page to take effect.]

 [Number:]

 [Internal IP:]

 [First name:]

@@ -111,10 +112,6 @@
 [Male]

 [Female]

 [<not specified>]

-[Network]

-[General]

-[Conference]

-[Advanced]

 [<Last Status>]

 [System tray icon]

 [Popup window]

@@ -127,6 +124,10 @@
 [Ignore]

 [Your details has been uploaded to the public directory.]

 [You have to be logged in before you can change your details.]

+[Network]

+[General]

+[Conference]

+[Advanced]

 ;file \protocols\Gadu-Gadu\src\filetransfer.cpp

 [Cannot create transfer file. ERROR: %d: %s (dcc)\n%s]

 [Cannot create transfer file. ERROR: %d: %s (dcc7)\n%s]

diff --git a/langpacks/english/Plugins/GTalkExt.txt b/langpacks/english/Plugins/GTalkExt.txt
index 2963f1ea9c..696a41c9a7 100644
--- a/langpacks/english/Plugins/GTalkExt.txt
+++ b/langpacks/english/Plugins/GTalkExt.txt
@@ -26,6 +26,9 @@
 [If both colors set to the same value, default colors will be used]

 [0 means default timeout,\n-1 means no timeout]

 [Test]

+;file \protocols\GTalkExt\src\GTalkExt.cpp

+[Popup icon]

+[Protocols]

 ;file \protocols\GTalkExt\src\menu.cpp

 [Open mailbox]

 ;file \protocols\GTalkExt\src\notifications.cpp

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 20631ea60a..5b88391ad7 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -42,7 +42,7 @@
 [Enable avatar support]

 [Check avatar validity before saving *]

 [Load avatars automatically (like ICQ Lite)]

-[You will need to reconnect to the ICQ network for the changes you have made on this page to take effect.]

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

 [You cannot enable/disable the server-side contact list while you are connected to the ICQ network.]

 [Note: The options marked with an asterisk have important side-effects or caveats that may not be initially apparent documented in the help.]

 [Messaging]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 00c9eea452..6a12a78e47 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -767,6 +767,10 @@
 [Secure XMPP Network (old style)]

 [Google Talk!]

 [LiveJournal Talk]

+[League Of Legends (EU Nordic)]

+[League Of Legends (EU West)]

+[League Of Legends (Oceania)]

+[League Of Legends (US)]

 [Odnoklassniki]

 [Yandex]

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

@@ -1141,142 +1145,3 @@
 ;file \protocols\JabberG\src\stdafx.h

 [I'm happy Miranda NG user. Get it at http://miranda-ng.org/.]

 [/me slaps %s around a bit with a large trout]

-;file \protocols\JabberG\src\obsoleted\jabber_form2.cpp

-[One or more addresses for communication related to abusive traffic]

-[One or more addresses for customer feedback]

-[One or more addresses for communication related to sales and marketing]

-[One or more addresses for communication related to security concerns]

-[One or more addresses for customer support]

-[The Jabber ID of a single entity to which an operation applies]

-[The Jabber ID of one or more entities to which an operation applies]

-[The Jabber IDs associated with active sessions]

-[The number of online entities that are active]

-[A list of entities with administrative privileges]

-[The text of an announcement to be sent to active users or all users]

-[A list of entities with whom communication is blocked]

-[The number of seconds to delay before applying a change]

-[The Jabber IDs that have been disabled]

-[The number of disabled entities]

-[The email address for a user]

-[The given (first) name of a user]

-[The number of online entities that are idle]

-[The IP addresses of an account's online sessions]

-[The last login time (per XEP-0082) of a user]

-[The number of logins per minute for an account]

-[The maximum number of items associated with a search or list]

-[The text of a message of the day]

-[The names of an account's online sessions]

-[The Jabber IDs associated with online users]

-[The number of online entities]

-[The password for an account]

-[Password verification]

-[A list of registered entities]

-[The number of registered entities]

-[Number of roster items for an account]

-[The number of stanzas being sent per second by an account]

-[The family (last) name of a user]

-[The text of a welcome message]

-[A list of entities with whom communication is allowed]

-[First Name]

-[Last Name]

-[Desired Nickname]

-[Your URL]

-[Email Address]

-[FAQ Entry]

-[Whether to allow occupants to invite others]

-[Whether to allow occupants to change subject]

-[Whether to enable logging of room conversations]

-[Natural language for room discussions]

-[Maximum number of room occupants]

-[Whether to make room members-only]

-[Whether to make room moderated]

-[Whether a password is required to enter]

-[Whether to make room persistent]

-[Roles for which presence is broadcast]

-[Whether to allow public searching for room]

-[Full list of room admins]

-[Short description of room]

-[Natural-language room name]

-[Full list of room owners]

-[The room password]

-[Affiliations that may discover real JIDs of occupants]

-[Precondition: node configuration with the specified access model]

-[Whether to allow the subscription]

-[The SubID of the subscription]

-[The NodeID of the relevant node]

-[The address (JID) of the subscriber]

-[Whether an entity wants to receive or disable notifications]

-[Whether an entity wants to receive digests (aggregations) of notifications or all notifications individually]

-[The minimum number of milliseconds between sending any two notification digests]

-[The date and time at which a leased subscription will end or has ended]

-[Whether an entity wants to receive an XMPP message body in addition to the payload format]

-[The presence states for which an entity wants to receive notifications]

-[Who may subscribe and retrieve items]

-[The URL of an XSL transformation which can be applied to payloads in order to generate an appropriate message body element.]

-[The collection with which a node is affiliated]

-[The URL of an XSL transformation which can be applied to the payload format in order to generate a valid Data Forms result that the client could display using a generic Data Forms rendering engine]

-[Whether to deliver payloads with event notifications]

-[Whether owners or publisher should receive replies to items]

-[Who may associate leaf nodes with a collection]

-[The list of JIDs that may associated leaf nodes with a collection]

-[The child nodes (leaf or collection) associated with a collection]

-[The maximum number of child nodes that can be associated with a collection]

-[The maximum number of items to persist]

-[The maximum payload size in bytes]

-[Whether the node is a leaf (default) or a collection]

-[Whether to notify subscribers when the node configuration changes]

-[Whether to notify subscribers when the node is deleted]

-[Whether to notify subscribers when items are removed from the node]

-[Whether to persist items to storage]

-[Whether to deliver notifications to available users only]

-[The publisher model]

-[The specific multi-user chat rooms to specify for replyroom]

-[The specific JID(s) to specify for replyto]

-[The roster group(s) allowed to subscribe and retrieve items]

-[Whether to send items to new subscribers]

-[Whether to allow subscriptions]

-[A friendly name for the node]

-[The type of node data, usually specified by the namespace of the payload (if any); MAY be list-single rather than text-single]

-[The JIDs of those to contact with questions]

-[The date and time when the node was created]

-[The JID of the node creator]

-[A description of the node]

-[The default language of the node]

-[The number of subscribers to the node]

-[The JIDs of those with an affiliation of owner]

-[The JIDs of those with an affiliation of publisher]

-[The name of the node]

-[Payload type]

-[Whether to automatically authorize subscription requests]

-[Whether to automatically accept file transfers]

-[Whether to automatically open new messages]

-[Whether to automatically go offline when idle]

-[Whether to play sounds]

-[A list of pending file transfers]

-[A list of joined group chat rooms]

-[A presence or availability status]

-[The status message text]

-[The new priority for the client]

-[Account name associated with the user]

-[Familiar name of the user]

-[Password or secret for the user]

-[Full name of the user]

-[First name or given name of the user]

-[Last name, surname, or family name of the user]

-[Email address of the user]

-[Street portion of a physical or mailing address]

-[Locality portion of a physical or mailing address]

-[Region portion of a physical or mailing address]

-[Postal code portion of a physical or mailing address]

-[Family Name]

-[Whether to accept the invitation]

-[Another resource with which to continue the session]

-[Disclosure of content, decryption keys or identities]

-[Whether may send Chat State Notifications per XEP-0085]

-[Whether allowed to use XHTML-IM formatting per XEP-0071]

-[Primary written language of the chat (each value appears in order of preference and conforms to RFC 4646 and the IANA registry)]

-[Whether allowed to log messages (i.e., whether Off-The-Record mode is required)]

-[Whether to renegotiate the session]

-[Minimum security level]

-[Whether to terminate the session]

-[Whether to enable Message Receipts per XEP-0184]

diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index ae84934b4e..c37d3c7a12 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -133,8 +133,8 @@
 [Relative list]

 [Local list]

 [Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?]

-[The changes you have made require you to reconnect to the MSN Messenger network before they take effect]

-[MSN Options]

+[These changes will take effect the next time you connect to the MSN Messenger network.]

+[MSN options]

 [Automatically obtain host/port]

 [Manually specify host/port]

 [Disable]

diff --git a/langpacks/english/Plugins/MirLua.txt b/langpacks/english/Plugins/MirLua.txt
index 4f1a0a59e3..dfdccddea2 100644
--- a/langpacks/english/Plugins/MirLua.txt
+++ b/langpacks/english/Plugins/MirLua.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MirLua.dll

 ;  Plugin: MirLua

-;  Version: 0.11.6.1

+;  Version: 0.11.7.0

 ;  Authors: Miranda NG team

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

 [Extends Miranda NG functionality with Lua scripts.]

@@ -22,5 +22,5 @@
 [Open]

 [Reload]

 ;file \plugins\MirLua\src\mlua_options.cpp

-[Services]

 [Common scripts]

+[Services]

diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt
index 3d5bbbd61b..9f37aff784 100644
--- a/langpacks/english/Plugins/MirOTR.txt
+++ b/langpacks/english/Plugins/MirOTR.txt
@@ -140,6 +140,6 @@
 [We received a malformed data message from '%s']

 [The following message received from '%s' was NOT encrypted:\n\n%s]

 ['%s' has sent a message intended for a different session. If you are logged in multiple times, another session may have received the message.]

-[unknown OTR message received, please report that to Miranda NG]

+[unknown OTR message received, please report that to Miranda NG developers]

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

 [ has requested an Off-the-Record private conversation. However, you do not have a plugin to support that.\nSee http://wikipedia.org/wiki/Off-the-Record_Messaging for more information.]

diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index 0e268784f3..501b3139f6 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.1.4

+;  Version: 3.1.1.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/OpenSSL.txt b/langpacks/english/Plugins/OpenSSL.txt
index 8752a996ff..ec79b6530e 100644
--- a/langpacks/english/Plugins/OpenSSL.txt
+++ b/langpacks/english/Plugins/OpenSSL.txt
@@ -9,3 +9,5 @@
 ;file \plugins\OpenSSL\src\ssl_openssl.cpp

 [Client cannot decode host message. Possible causes: host does not support SSL or requires not existing security package]

 [Host we are connecting to is not the one certificate was issued for]

+[OpenSSL library loading failed]

+[OpenSSL error]

diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 1b5323ec86..df6477c95c 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -44,6 +44,7 @@
 ;file \protocols\SkypeWeb\src\skype_contacts.cpp

 [Are you sure?]

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

+[Incoming call]

 [Edited message]

 [Action]

 [Call information]

@@ -52,7 +53,6 @@
 [Moji]

 [File]

 [Unknown event]

-[Incoming call]

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

 [SkypeWeb error: Invalid data!]

 [[b]Original message:[/b]\n%s\n]

@@ -104,6 +104,7 @@
 ;file \protocols\SkypeWeb\src\skype_proto.cpp

 [Incoming call sound]

 [Incoming call canceled sound]

+[Skypename]

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

 [Failed to establish a TRouter connection.]

 [Incoming call from %s]

diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index 0163759c89..b2f9f6f910 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -27,7 +27,7 @@
 [Enable smileys]

 [Don't replace at cursor]

 [Built-in message dialog support]

-[Disable]

+[Enable]

 [Smiley button]

 [Surround inserted smiley with spaces]

 [Use first smiley for selection size]

@@ -45,8 +45,8 @@
 [Background color]

 [Only one instance of SmileyAdd could be executed.\nRemove duplicate instances from 'Plugins' directory]

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

-[Off]

-[On]

+[Hide]

+[Show]

 [Smiley packs]

 [All files]

 [Smileys]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index d55429782f..8b2889385c 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -489,7 +489,7 @@
 [Window size and theme]

 [You can select a private theme (.tabsrmm file) for this container which will then override the default message log theme. You will have to close and re-open all message windows after changing this option.]

 [Transparency]

-[This feature requires Windows 2000 or later and may be unavailable when using a container skin.]

+[This feature may be unavailable when using a container skin.]

 [Contact avatars]

 [Sound notifications]

 [Container options]

diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index 3407e709d2..049fda5da0 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Tox.dll

 ;  Plugin: Tox protocol

-;  Version: 0.11.1.19

+;  Version: 0.11.1.20

 ;  Authors: Miranda NG Team

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

 [Tox protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index fb3286df1d..7a71e1d89b 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -21,7 +21,7 @@
 [Polling rate:]

 [Once every]

 [sec]

-[Please cycle your connection for these changes to take effect]

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

 [Treat tweets as messages]

 [Enable popup notifications for tweets]

 [Colors]

@@ -41,7 +41,7 @@
 ;file \protocols\Twitter\src\connection.cpp

 [OAuth variables are out of sequence, they have been reset. Please reconnect and reauthorize Miranda to Twitter.com (do the PIN stuff again)]

 [Failed to get Twitter Access Tokens, please go offline and try again. If this keeps happening, check your internet connection.]

-[You're missing the Nick key in the database. This isn't really a big deal, but you'll notice some minor quirks (self contact in list, no group chat outgoing message highlighting, etc). To fix it either add it manually or reset your Twitter account in the Miranda account options]

+[You're missing the Nick key in the database. This isn't really a big deal, but you'll notice some minor quirks (self contact in list, no group chat outgoing message highlighting, etc). To fix it either add it manually or recreate your Miranda Twitter account]

 ;file \protocols\Twitter\src\proto.cpp

 [Send Tweet...]

 [Network]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index f4bdbd258c..972f661a4e 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -547,6 +547,9 @@
 [Divorced]

 [Separated]

 [Widowed]

+[Actively searching]

+[In love]

+[It\'s complicated]

 [jun.]

 [sen.]

 ;file \plugins\UserInfoEx\src\svc_constants.h

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index ac4fa6fdd3..abe0cb761e 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,11 +2,19 @@
 ;============================================================

 ;  File: VKontakte.dll

 ;  Plugin: VKontakte protocol

-;  Version: 0.1.1.23

+;  Version: 0.1.1.27

 ;  Authors: Miranda NG Team

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

 [VKontakte protocol support for Miranda NG.]

 ;file \protocols\VKontakte\res\resource.rc

+[Show in protocol menu ]

+[Create new chat]

+[Status message]

+[Send message to my wall]

+[Load news from VK]

+[Load history for all contacts from VK]

+[Wipe contacts missing in friend list]

+[Visit profile]

 [[img] BBCode support for image]

 [off]

 [for original size images]

@@ -16,8 +24,8 @@
 [basic ([b], [i], [u], [s])]

 [advanced (+[url], [size], [color], [code])]

 [Use this setting also for attachments on news and notifications]

-[Other]

 [BBCode support on attachments]

+[Other]

 [Process stickers as smileys]

 [Shorten links for audio attachments]

 [News and event notifications]

@@ -72,22 +80,17 @@
 [Login settings]

 [Local settings]

 [Contact list group:]

+[Language for names and titles:]

 [Server-side delivery confirmation]

 [Use local time for received messages]

 [Automatically wipe local contacts missing in your friend list]

-[Mark message as read...]

-[on read]

-[on receive]

-[on reply]

-[on typing]

-[Sync history on protocol online...]

-[automatically]

-[for last 1 day]

-[for last 3 days]

+[Mark message as read:]

+[Sync history on protocol online:]

 [Bots challenge test]

 [Instruction:]

 [Submit]

 [Cancel]

+[Open in browser]

 [Invite user to chat]

 [Choose one of your contacts to be invited:]

 [Create group chat]

@@ -96,7 +99,6 @@
 [Share]

 [URL:]

 [Only for friends]

-[Attention]

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

 [Captcha form icon]

 [Notification icon]

@@ -153,8 +155,6 @@
 [(Unknown contact)]

 [Message from]

 [at]

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

-[Enter the text you see]

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

 [Participants]

 [Owners]

@@ -177,9 +177,11 @@
 [View/change &title]

 [&Destroy room]

 [&User details]

-[Visit profile]

 [&Kick]

 [%s is typing a message...]

+;file \protocols\VKontakte\src\vk_dialogs.cpp

+[Enter the text you see]

+[Wall message for]

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

 [New news]

 [New notifications]

@@ -220,20 +222,32 @@
 [Loading history]

 [Loading messages for %s is completed]

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

-[I'm back]

 [Network]

 [Account]

 [News and notifications]

 [View]

+[Menu]

+[Account language]

+[English]

+[Russian]

+[Belarusian]

+[Ukrainian]

+[Spanish]

+[Finnish]

+[German]

+[Italian]

+[automatically]

+[for last 1 day]

+[for last 3 days]

+[on read]

+[on receive]

+[on reply]

+[on typing]

+[These changes will take effect after Miranda NG restart.\nWould you like to restart it now?]

+[VKontakte protocol]

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

 [%s server connection]

 [VKontakte newsfeed & notification event]

-[Create new chat]

-[Status message]

-[Send message to my wall]

-[Load news from VK]

-[Load history for all contacts from VK]

-[Wipe contacts missing in friend list]

 [Mark messages as read]

 [Send message to user\'s wall]

 [Add as friend]

@@ -256,7 +270,17 @@
 [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

+[Interests]

+[Activities]

+[Music]

+[Movies]

+[TV]

+[Books]

+[Games]

+[Quotes]

 [Please authorize me to add you to my friend list.]

 [Are you sure to wipe local contacts missing in your friend list?]

 [Are you sure to delete %s from your friend list?]

@@ -272,6 +296,3 @@
 [Are you sure to ban %s? %s%sContinue?]

 [\nIt will also]

 [Are you sure to report abuse on %s?]

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

-[Wall message for]

-[Attention! Message body or url should not be empty!]

diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index 14e12efbe1..ca7d603d84 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Variables.dll

 ;  Plugin: Variables

-;  Version: 0.2.3.10

+;  Version: 0.2.3.11

 ;  Authors: P Boon

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

 [Adds support for dynamic variables in strings for plugins.]

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index 69860d8730..b72be08efc 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -239,19 +239,19 @@
 [bytes]

 [Description:]

 ;file \plugins\Weather\src\weather_ini.cpp

-[No update data file is found. Please check your Plugins\\Weather directory.]

-[Invalid ini format for: %s]

 [All update data has been reloaded.]

+[Invalid ini format for: %s]

+[No update data file is found. Please check your Plugins\\Weather directory.]

 ;file \plugins\Weather\src\weather_mwin.cpp

 [Frame Font]

 [Frame Title Font]

 [Frame Background]

 ;file \plugins\Weather\src\weather_opt.cpp

+[Weather Protocol Text Preview]

 [Network]

 [General]

 [Display]

 [Popups]

-[Weather Protocol Text Preview]

 ;file \plugins\Weather\src\weather_popup.cpp

 ;file \plugins\Weather\src\weather_svcs.cpp

 [Station ID]

@@ -270,9 +270,9 @@
 ;file \plugins\Weather\src\weather_update.cpp

 [Unable to retrieve weather information for %s]

 ;file \plugins\Weather\src\weather_userinfo.cpp

-[Current condition for %n]

-[Last update on:   %u]

 [Variable]

 [Information]

 [Retrieving new data, please wait...]

 [More Info]

+[Current condition for %n]

+[Last update on:   %u]

diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt
index 2bce29e83f..007c4729ce 100644
--- a/langpacks/english/Plugins/Yahoo.txt
+++ b/langpacks/english/Plugins/Yahoo.txt
@@ -74,8 +74,8 @@
 ;file \protocols\Yahoo\src\main.cpp

 [YAHOO plugin HTTP connections]

 ;file \protocols\Yahoo\src\options.cpp

-[The changes you have made require you to reconnect to the Yahoo network before they take effect]

-[YAHOO Options]

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

+[Yahoo options]

 [You need to be connected to Yahoo to add to Ignore List.]

 [Yahoo Ignore]

 [Please enter a valid buddy name to ignore.]