- langpacks/english: update;

- langpacks/russian: update;

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

4 files changed, 9 insertions, 14 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 0698172679..3fdfc8a2d3 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1016,6 +1016,7 @@
 [View/change my &details...]

 ;file \src\core\stduseronline\src\useronline.cpp

 [%s is online]

+;file \src\icons\proto_metacontacts\src\resource.h

 ;file \src\modules\addcontact\addcontact.cpp

 [Add contact]

 [Please authorize my request and add me to your contact list.]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 825ffe72c3..ed21db27bf 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.10.2

+;  Version: 0.2.10.3

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

@@ -21,9 +21,6 @@
 [Share]

 [Cancel]

 [User details]

-[Network]

-[Force secure (HTTPS) connection]

-[Use secure connection also for channel requests]

 [Contacts]

 [Default group:]

 [Automatically set 'Ignore status change' flag]

@@ -77,7 +74,6 @@
 [Login error: Your account is temporarily locked. You need to confirm this device from web browser.]

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

 [Login error, probably bad login credentials.]

-[Your account requires HTTPS connection. Activating.]

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

 [Could not load all required data. Plugin may still work correctly, but you should report this and wait for plugin update.]

 [Need confirmation for sending messages to other clients.\nOpen Facebook website and try to send message to this contact again!]

@@ -115,7 +111,6 @@
 [Default]

 [<< Contacts]

 [What's on your mind, %s?]

-[Note: Make sure you have disabled 'Validate SSL certificates' option in Network options to work properly.]

 [Sample event]

 [Sample request]

 [Sample newsfeed]

@@ -142,6 +137,7 @@
 [Unable to get Netlib connection for Facebook]

 [Video call]

 [Facebook ID must be numeric value.]

+[Network]

 [Account]

 [Events]

 [Messaging]

diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index b1c1eb0118..0c0fe85f44 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -12,18 +12,17 @@
 [Default group:]

 [C]

 [Tox ID:]

+[Import tox profile]

+[Tox profile contains your ID and friend list.\r\nYou may import existing profile from other tox client.]

 [Connection settings]

 [Disable UDP (force Tox to use TCP)]

 [Disable IPv6]

 [Tox]

-[Tox profile import]

-[Import]

-[Tox profile contains your ID and friend list.\r\nYou may import existing profile from other tox client.\r\nPress "Import" to perform import from existing profile.\r\nPress "Cancel" or close this window to create new profile.]

-[Cancel]

 [If this field contains tox address (76 hex characters), you will be prompted to add it in your friend list. Otherwise, Miranda will search this query via tox dns discovery.]

 [Dns name:]

 [Enter password]

 [Save password]

+[Cancel]

 [Tox profile is encrypted. Enter the password to continue.]

 [Add]

 [IPv4]

@@ -37,6 +36,8 @@
 ;file \protocols\Tox\src\tox_netlib.cpp

 [%s connection]

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

+[All files (*.*)]

+[Select tox profile]

 [Add node]

 [Change node]

 [Enter IPv4]

@@ -44,9 +45,6 @@
 [Enter public key]

 [Are you sure?]

 [Node deleting]

-;file \protocols\Tox\src\tox_profile.cpp

-[All files (*.*)]

-[Select tox profile]

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

 [Protocols]

 [Protocol icon]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 164ec249f6..f90fc5db67 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -50,7 +50,7 @@
 [Advanced]

 [Hide chats on startup]

 [Always notify as unread for all incoming message]

-[Force ivisible status upon user activity]

+[Force invisible status upon user activity]

 [Invisible interval timeout (min):]

 [Use non-standard urlEncode for sent messages (less traffic)]

 [When I ban user...]