eng & rus langpack update

19 files changed, 101 insertions, 77 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 37568ba0b9..3e2e935ec8 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1343,6 +1343,10 @@
 ;file \src\mir_app\src\proto_order.cpp

 ;file \src\mir_app\src\proto_ui.cpp

 [Account]

+;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?]

@@ -1385,9 +1389,6 @@
 [Non-loadable plugin]

 [Frames]

 [Add group]

-[Request authorization]

-[Grant authorization]

-[Revoke authorization]

 [Warning]

 [Always visible]

 [Always invisible]

diff --git a/langpacks/english/Plugins/AVS.txt b/langpacks/english/Plugins/AVS.txt
index 3346fe7914..34448da027 100644
--- a/langpacks/english/Plugins/AVS.txt
+++ b/langpacks/english/Plugins/AVS.txt
@@ -49,8 +49,6 @@
 [Avatars]

 [My Avatars]

 [My Global Avatar Cache]

-[Fatal error, image services not found. Avatar services will be disabled.]

-[Avatar service]

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

 [Set avatar options for %s]

 [Delete picture file from disk (may be necessary to force a reload, but will delete local pictures)?]

diff --git a/langpacks/english/Plugins/Dbx_mdbx.txt b/langpacks/english/Plugins/Dbx_mdbx.txt
new file mode 100644
index 0000000000..7a79d1f8e1
--- /dev/null
+++ b/langpacks/english/Plugins/Dbx_mdbx.txt
@@ -0,0 +1,39 @@
+#muuid {7c3d0a33-2646-4001-9107-f35ea299d292}
+;============================================================
+;  File: Dbx_mdbx.dll
+;  Plugin: Miranda NG MDBX database driver
+;  Version: 0.95.8.3
+;  Authors: Miranda-NG project
+;============================================================
+[Provides Miranda database support: global settings, contacts, history, settings per contact.]
+;file \plugins\Dbx_mdbx\res\dbx_mdbx.rc
+[Select crypto provider]
+[Cancel]
+[Total encryption (Recommended only for paranoid users)]
+[Login to Miranda NG]
+[New password]
+[Please enter your new password]
+[Enter password]
+[Change password]
+[Change]
+[Remove]
+[Old password]
+[Database encryption mode]
+[Standard]
+[Total]
+[Only critical data are encrypted (passwords, security tokens, etc). All other settings and history remains unencrypted. Fast and effective, suitable for the most cases]
+[All string settings and all events in histories are encrypted. It also makes Miranda much slower and creates a risk of losing everything you've stored in a profile in case of losing password. Recommended only for paranoid users]
+[Set password]
+;file \plugins\Dbx_mdbx\src\dbintf.h
+[Change/remove password]
+;file \plugins\Dbx_mdbx\src\ui.cpp
+[Wrong old password entered!]
+[Password is too short!]
+[Passwords do not match!]
+[Database]
+;file \plugins\Dbx_mdbx\src\ui.h
+[Logo]
+[Password]
+[Too many errors!]
+[Password is not correct!]
+[Please type in your password]
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 1f1938366f..9216166e4b 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -1,8 +1,8 @@
 #muuid {8432b009-ff32-4727-aae6-a9035038fd58}

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

 ;  File: Facebook.dll

-;  Plugin: Facebook RM

-;  Version: 0.4.0.1

+;  Plugin: Facebook

+;  Version: 0.4.1.1

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

@@ -68,14 +68,17 @@
 ;file \protocols\FacebookRM\src\captcha.cpp

 [Enter the text you see]

 ;file \protocols\FacebookRM\src\chat.cpp

+[&Invite user...]

+[E&xit chat session]

+[&Destroy chat session]

+[User &details]

+[User &history]

+[Delete conversation]

+[This will permanently delete the conversation history]

 [Former]

 [Myself]

 [Friend]

 [User]

-[&Invite user...]

-[&Leave chat session]

-[User &details]

-[User &history]

 [Notifications]

 [%s and more (%d)]

 ;file \protocols\FacebookRM\src\communication.cpp

@@ -103,18 +106,6 @@
 ;file \protocols\FacebookRM\src\connection.cpp

 [Please enter a username.]

 [Please enter a password.]

-;file \protocols\FacebookRM\src\constants.h

-[Top News]

-[Most Recent]

-[Pages]

-[Classic website]

-[Mobile website]

-[Smartphone website]

-[Public]

-[Friends of friends]

-[Friends]

-[Friends except acquaintances]

-[Only me]

 ;file \protocols\FacebookRM\src\contacts.cpp

 [Contact was removed from your server list.]

 [Error occurred when removing contact from server.]

@@ -127,19 +118,30 @@
 [Request for friendship was ignored.]

 [Error occurred when ignoring friendship request.]

 ;file \protocols\FacebookRM\src\dialogs.cpp

+[Top News]

+[Most Recent]

+[Pages]

+[Classic website]

+[Mobile website]

+[Smartphone website]

+[Public]

+[Friends of friends]

+[Friends]

+[Friends except acquaintances]

+[Only me]

 [Default]

 [<< Contacts]

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

 ;file \protocols\FacebookRM\src\json.cpp

 [a sticker]

-[a GIF]

 [files]

 [a file]

+[a GIF]

 [a link]

 [User sent %s:]

 [User sent an unsupported attachment. Open your browser to see it.]

+[Reaction]

 [%s is typing a message...]

-[This message is no longer available, because it was marked as abusive or spam.]

 ;file \protocols\FacebookRM\src\messages.cpp

 [You cannot send messages when you are offline.]

 ;file \protocols\FacebookRM\src\process.cpp

@@ -207,10 +209,7 @@
 [Visit friendship details]

 [Visit conversation]

 [Load history]

-[Cancel friendship]

 [Cancel friendship request]

-[Request friendship]

-[Approve friendship]

 [Deny friendship request]

 [Services...]

 [Check friendship requests]

diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index 26d5f8364b..9ed79d16a8 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: GG.dll

 ;  Plugin: Gadu-Gadu protocol

-;  Version: 0.11.0.3

+;  Version: 0.11.0.4

 ;  Authors: Bartosz Bialek, Adam Strzelecki

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

 [Gadu-Gadu protocol support for Miranda NG.]

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

 ;  File: ICQ.dll

 ;  Plugin: IcqOscarJ protocol

-;  Version: 0.11.3.6

+;  Version: 0.95.8.1

 ;  Authors: Joe Kucera, Bio, Martin Öberg, Richard Hughes, Jon Keating, etc.

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

 [ICQ protocol support for Miranda NG.]

@@ -742,9 +742,6 @@
 [Your file transfer has been aborted because one of the files that you selected to send is no longer readable from the disk. You may have deleted or moved it.]

 [Your file receive has been aborted because Miranda could not open the destination file in order to write to it. You may be trying to save to a read-only folder.]

 ;file \protocols\IcqOscarJ\src\icq_menu.cpp

-[Request authorization]

-[Grant authorization]

-[Revoke authorization]

 [Add to server list]

 [Show custom status details]

 [Open ICQ profile]

diff --git a/langpacks/english/Plugins/ICQCorp.txt b/langpacks/english/Plugins/ICQCorp.txt
index e7626059c5..1182012110 100644
--- a/langpacks/english/Plugins/ICQCorp.txt
+++ b/langpacks/english/Plugins/ICQCorp.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: ICQCorp.dll

 ;  Plugin: ICQ corporate protocol

-;  Version: 0.0.1.0

+;  Version: 0.2.0.2

 ;  Authors: Miranda NG team, Eugene Tarasenko

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

 [ICQ corporate protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index fbdf4e39ab..2c5a114016 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -197,7 +197,6 @@
 [Jabber Link Protocol]

 [Frame title]

 [Frame text]

-[Fatal error, image services not found. Jabber Protocol will be disabled.]

 [Jabber Activity]

 [Jabber Mood]

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

@@ -269,6 +268,7 @@
 [Supports Roster Exchange]

 [Supports direct chat invitations (XEP-0249)]

 [Receives information about OMEMO devices]

+[Supports message carbons (XEP-0280)]

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

 [Enter the text you see]

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

@@ -468,9 +468,6 @@
 [Http authentication request received]

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

 [Jabber account chooser]

-[Request authorization]

-[Grant authorization]

-[Revoke authorization]

 [Convert]

 [Add to Bookmarks]

 [Commands]

@@ -719,6 +716,7 @@
 [Receive notes]

 [Automatically save received notes]

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

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

 [Server options]

 [Disable SASL authentication (for old servers)]

 [Enable stream compression (if possible)]

diff --git a/langpacks/english/Plugins/NewsAggregator.txt b/langpacks/english/Plugins/NewsAggregator.txt
index 5f7185f7a6..3f82265ea2 100644
--- a/langpacks/english/Plugins/NewsAggregator.txt
+++ b/langpacks/english/Plugins/NewsAggregator.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: NewsAggregator.dll

 ;  Plugin: News aggregator

-;  Version: 0.1.0.2

+;  Version: 0.1.0.3

 ;  Authors: Mataes, FREAK_THEMIGHTY

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

 [RSS/Atom news aggregator.]

diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt
index 403ebad984..19bbb40ced 100644
--- a/langpacks/english/Plugins/SeenPlugin.txt
+++ b/langpacks/english/Plugins/SeenPlugin.txt
@@ -54,7 +54,6 @@
 [<unknown>]

 [Last seen]

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

-[-- Date --]

 [year (4 digits)]

 [year (2 digits)]

 [month]

@@ -63,33 +62,33 @@
 [day]

 [weekday (full)]

 [weekday (abbreviated)]

-[-- Time --]

 [hours (24)]

 [hours (12)]

 [AM/PM]

 [minutes]

 [seconds]

-[-- User --]

 [username]

 [nick]

 [UIN/handle]

-[Group]

-[Status]

-[Status message]

-[Old status]

+[group]

+[status]

+[status message]

+[old status]

 [external IP]

 [internal IP]

-[Client info]

-[Protocol]

-[Account]

-[-- Format --]

+[client info]

+[protocol]

+[account]

 [tabulator]

 [line break]

+[-- Date --]

+[-- Time --]

+[-- User --]

+[-- Format --]

 [Note:]

-[Use]

-[for empty string]

-[instead of]

-[Last Seen Variables]

+[Use # for empty string]

+[instead of <unknown>]

+[Last Seen variables]

 [Contacts]

 [Popups]

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

diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index 2b53eaafc9..35c5d1b175 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -112,7 +112,6 @@
 [SendSS HTTP connections]

 [SendSS]

 [Screenshots]

-[Image services (AdvaImg plugin) not found.\nSendSS disabled.]

 [Buttons]

 [Could not register Miranda service.]

 [Take a screenshot]

diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 88c7f1612e..099b1e56d5 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -83,8 +83,6 @@
 [Too many failed authentication attempts with given username or IP.]

 [Authentication failed. Unknown error.]

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

-[Request authorization]

-[Grant authorization]

 [Get server history]

 [Block contact]

 [Unblock contact]

diff --git a/langpacks/english/Plugins/SpellChecker.txt b/langpacks/english/Plugins/SpellChecker.txt
index 22f4dae2ff..ea527b44c8 100644
--- a/langpacks/english/Plugins/SpellChecker.txt
+++ b/langpacks/english/Plugins/SpellChecker.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SpellChecker.dll

 ;  Plugin: Spell checker

-;  Version: 0.2.6.4

+;  Version: 0.2.6.6

 ;  Authors: Ricardo Pescuma Domenecci, Wishmaster

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

 [Spell checker for the message windows. Uses Hunspell to do the checking.]

diff --git a/langpacks/english/Plugins/StatusManager.txt b/langpacks/english/Plugins/StatusManager.txt
index 2868dc9b2a..ed2a2a3731 100644
--- a/langpacks/english/Plugins/StatusManager.txt
+++ b/langpacks/english/Plugins/StatusManager.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 1.0.1.1
+;  Version: 1.1.0.2
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index 07f180a057..757d6c2fdb 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -15,6 +15,8 @@
 [Use bigger avatars]

 [Message sessions]

 [Show chat state events (i.e., user closed chat session)]

+[Connection]

+[Error limit before logout:]

 [Captcha]

 [Cancel]

 [As an added account security measure, you'll need to grant access by entering the special code we've just sent to your email address.]

@@ -33,26 +35,20 @@
 [ (Non-Steam)]

 [ on server %s]

 [Playing]

-[%s has been removed from your contact list]

 [%s is back in your contact list]

-[%s has added you to his or her Friend List]

-;file \protocols\Steam\src\steam_dialogs.cpp

-[Fatal error, image services not found. Avatar services will be disabled.]

-[Avatar Service]

-;file \protocols\Steam\src\steam_events.cpp

-[Network]

-[Blocked contacts]

+[%s has been removed from your contact list]

+[%s has added you to contact list]

 ;file \protocols\Steam\src\steam_login.cpp

 [Cannot obtain connection token.]

-[Unknown login error.]

 ;file \protocols\Steam\src\steam_menus.cpp

 [Steam menu chooser]

-[Request authorization]

+[Unblock]

 [Join to game]

 ;file \protocols\Steam\src\steam_messages.cpp

 [Unknown error]

 ;file \protocols\Steam\src\steam_options.cpp

 [Name]

+[Network]

 ;file \protocols\Steam\src\steam_proto.cpp

 [Protocols]

 [Protocol icon]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index d8ddd11ff8..fe9744a702 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -538,6 +538,7 @@
 [Group chat log]

 [Appearance and functionality of chat room windows]

 [Appearance of the message log]

+[Chat rooms]

 [Voiced]

 [Half operators]

 [Channel operators]

@@ -867,8 +868,6 @@
 [Feature enabled (used as overlay)]

 [Enable typing notification]

 [Disable typing notification]

-[The image service plugin (AdvaImg) is not properly installed.\n\nTabSRMM is disabled.]

-[TabSRMM fatal error]

 ;file \plugins\TabSRMM\src\msgs.h

 [Message windows - IM]

 [Message windows - all]

diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index 0919e81cee..df4027e483 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.3.0

+;  Version: 0.11.3.1

 ;  Authors: Miranda NG team

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

 [Tox protocol support for Miranda NG.]

@@ -50,14 +50,15 @@
 [Unable to initialize Tox core]

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

 [Protocol icon]

+[Action icon]

+[Correction icon]

 [Protocols]

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

-[Request authorization]

-[Grant authorization]

 [Password]

 [Create password]

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

 [Action]

+[Correction]

 [You cannot send when you are offline.]

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

 [%s connection]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 7486dfab79..f7963d9aec 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -255,8 +255,6 @@
 [Upload failed]

 [Your details were not uploaded successfully.\nThey were written to database only.]

 [updating]

-;file \plugins\UserInfoEx\src\init.cpp

-[Fatal error, image services not found. Flags module will be disabled.]

 ;file \plugins\UserInfoEx\src\mir_icolib.cpp

 [IM naming]

 [Password]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index c19c8875e9..6f9294e59f 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.4.0

+;  Version: 0.1.4.1

 ;  Authors: Miranda NG team

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

 [VKontakte protocol support for Miranda NG.]

@@ -243,6 +243,8 @@
 [Loading messages for all contacts is completed.]

 [Loading history]

 [Error loading message history for %s from server.]

+[%x at %X]

+[Edited message (updated %s):\n]

 [Loading messages for %s is completed.]

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

 [Edited message:\n]