9 files changed, 34 insertions, 288 deletions

diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index a62aef3cbd..0807953acd 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -16,15 +16,15 @@
 [Password:]

 [Default group:]

 [Tox]

-[Create tox profile]

-[Import tox profile]

+[Create Tox profile]

+[Import Tox profile]

 [Copy Tox ID]

-[Export tox profile]

+[Export Tox profile]

 [Connection settings]

 [Enable UDP (otherwise force Tox to use TCP)]

 [Enable IPv6]

-[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:]

+[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]

@@ -54,7 +54,9 @@
 [Outgoing call]

 [To:]

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

-[Groupchat]

+[Group chat]

+;file \protocols\Tox\src\tox_core.cpp

+[Unable to initialize tox core]

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

 [Profiles folder]

 [Tox URI scheme]

@@ -83,8 +85,8 @@
 ;file \protocols\Tox\src\tox_options.cpp

 [Tox profile]

 [All files]

-[Select tox profile]

-[Save tox profile]

+[Select Tox profile]

+[Save Tox profile]

 [Add node]

 [Change node]

 [Enter IPv4]

@@ -98,17 +100,16 @@
 [Account]

 [Nodes]

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

-[Unable to open tox profile]

-[Unable to read tox profile]

-[Unable to decrypt tox profile]

-[Unable to load tox profile]

+[Unable to open Tox profile]

+[Unable to read Tox profile]

+[Unable to decrypt Tox profile]

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

 [You cannot add yourself to your contact list]

 [Contact already in your contact list]

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

 [Query]

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

-[One of the arguments is not valid or ]

+[One of the arguments is missing]

 [Unable to allocate enough memory]

 [Unable to bind to a port]

 [The proxy type is not valid]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index c4e1b9507f..31ea18bfa4 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.1.13

+;  Version: 0.1.1.14

 ;  Authors: Miranda NG Team

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

 [VKontakte protocol support for Miranda NG.]

@@ -182,6 +182,14 @@
 [Post text:]

 [Topic text:]

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

+[Protocol is offline]

+[File not exist]

+[File type not supported]

+[Error open file]

+[Error read file]

+[Error upload file]

+[Upload server returned empty URL]

+[Invalid or unknown recipient user ID]

 [Couldn't save file]

 [Invalid album id]

 [Invalid server]

diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt
deleted file mode 100644
index 6fef4c55a3..0000000000
--- a/langpacks/english/Plugins/Xfire.txt
+++ /dev/null
@@ -1,232 +0,0 @@
-#muuid {9b8e1735-970d-4ce0-930c-a561956bdca2}

-;============================================================

-;  File: Xfire.dll

-;  Plugin: Xfire protocol

-;  Version: 0.1.9.0

-;  Authors: dufte

-;============================================================

-[Xfire protocol support for Miranda NG.]

-;file \protocols\Xfire\res\resource.rc

-[Password:]

-[Login name:]

-[XFire]

-[Nick:]

-[Current protocol version:]

-[Note: You can only change these settings if you are connected to Xfire.]

-[Create a new Xfire account on website]

-[Lost password?]

-[Account options]

-[Show my friends]

-[Game Status]

-[Show on my profile and miniprofile]

-[Show my game server data]

-[Other Activity]

-[Show my voice chat server to my friends]

-[Show people when I type to them]

-[Show nicknames when available]

-[Show friends of my friends]

-[Options]

-[More options]

-[Display Error and Info message:]

-[Main group for clan groups:]

-[Automatically scan for games:]

-[Main group for Friends of Friends:]

-[Files]

-[xfire_games.ini]

-[icons.dll]

-[Blocked User List]

-[This list contains all your blocked Xfire users. You can remove one if you wanna allow him to send you a friend request.]

-[You can simply block someone if you right click on his friend request in contact list and choose Block User...]

-[This file is used for the game search, game detection and game ID resolving. It contains all Xfire supported games.]

-[This file contains all original game icons. You can also activate the option for icon downloading if you don't have it.]

-[Be sure you put these files in following folder:]

-[Status Message]

-[Enable]

-[With this feature, following status message will be set on your other protocol plugins if you are in game. So your other buddies can also see what you play. It will also change the status to occupied if this option is enabled.]

-[Following Variables are available: %myxfiregame%, %myxfirevoice%, %myxfireserverip%, %myxfirevoiceip%]

-[Status message:]

-[Change the status to occupied or dnd]

-[The status message and status will be reset if you close the game.]

-[Prefer dnd when it is available]

-[Games]

-[Game:]

-[Don't detect this game as running]

-[Apply]

-[Don't set status message for other protocols]

-[Add new game]

-[Remove]

-[Don't show in start menu]

-[(manual added)]

-[Extra Command Line Parameters:]

-[Edit...]

-[Username:]

-[Game]

-[Voice chat]

-[Name:]

-[IP:]

-[Port:]

-[User details]

-[Copy]

-[Enter Password]

-[Join]

-[Set Nickname]

-[Cancel]

-[New xfire_games.ini]

-[There is a new XFire game list online, do you want to update now?]

-[New supported games:]

-[Update]

-[Add game]

-[Search:]

-[Custom...]

-[Game name:]

-[Game exe:]

-[Browse...]

-[Launcher exe (optional):]

-[Game ID:]

-[Send game ID:]

-[Status message for Xfire if this game will be started:]

-[Parameter:]

-[Add a new game]

-[Searching games...]

-;file \protocols\Xfire\src\addgamedialog.cpp

-[All Files]

-[Please wait, game.ini will be currently parsed...]

-[XFire Options]

-[Please choose one game in the list!]

-[If you add a mod of an Xfire supported game, then you can specify what game ID will be sent to Xfire. So if you add a Half-Life mod, you can set the Half-Life game ID and if you start the game, your Xfire buddies will see the Half-Life game icon next to your name and the game time will be tracked.]

-[Every game in Xfire needs an ID. Use a number above the last used ID to avoid problems with used IDs. Every number above 10000 should be save. This ID will not be sent to Xfire, when you start a game.]

-[Please enter a game name.]

-[Please enter a game ID.]

-[Please enter a game ID above 1.]

-[This game ID is already in use.]

-[Please select a game exe. Note: If you don't select a launcher exe, the game exe will be used in the game start menu.]

-[Supported Games]

-[Custom game]

-;file \protocols\Xfire\src\all_statusmsg.cpp

-[Yep, I'm here.]

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

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

-[Not right now.]

-[Give a guy some peace, would ya?]

-[Well, I would talk to you if Miranda ICQ supported chat]

-[That'll be the phone.]

-[Mmm... food.]

-;file \protocols\Xfire\src\baseProtocol.h

-[XFire Protocol]

-;file \protocols\Xfire\src\iniupdater.cpp

-[The xfire_games.ini was updated.]

-[Error during xfire_games.ini update.]

-[There is a new Icons.dll online, do you want to update now?]

-[The Icons.dll was updated.]

-[Error during Icons.dll Update.]

-;file \protocols\Xfire\src\main.cpp

-[Protocol icon]

-[%s (Nickname: %s) has invited you to join the %s clan. Message: %s%sPlease go to the XFire clan site to accept the Invitation.]

-[Friends of Friends Playing]

-[Login failed.]

-[The protocol version is too old. Changed current version from %d to %d. You can reconnect now.]

-[The protocol version is too old. Cannot detect a new version number.]

-[Someone logged in with your account. Disconnect.]

-[Do you really want to add %s to your friend list?]

-[Add me to your friend list.]

-[XFire is not connected.]

-[Current Game]

-[My Current Game]

-[ServerIP]

-[My Current ServerIP]

-[Voice]

-[My Current Voice]

-[Voice ServerIP]

-[My Voice ServerIP]

-[Xfire Link Protocol]

-[Buddy start a game]

-[It seems that is the first time you use this plugin. Do you want to automatically download the latest available xfire_games.ini and icons.dll?\r\nWithout the xfire_games.ini Xfire can't detect any games on your computer.]

-[Away from Keyboard]

-[&XFire Online Profile]

-[XFire &Clan Site]

-[C&opy Server Address and Port]

-[Cop&y Voice Server Address and Port]

-[Join &Game...]

-[Play this game...]

-[Remove F&riend...]

-[Block U&ser...]

-[&My XFire Online Profile]

-[&Activity Report]

-[&Rescan my games...]

-[Set &Nickname]

-[Protocols]

-[XFire game icon]

-[XFire voice icon]

-[XFire does not support offline messaging!]

-[Username]

-[Unable to connect to XFire.]

-[No Login name is set!]

-[No Password is set!]

-[Last game: %s playtime: %.2d:%.2d:%.2d]

-[%s is playing %s.]

-[%s is playing %s on server %d.%d.%d.%d:%d.]

-[Playing]

-[Do you really want to delete your friend %s?]

-[Confirm Delete]

-[Block this user from ever contacting you again?]

-[Block Confirmation]

-;file \protocols\Xfire\src\options.cpp

-[Avatars]

-[Disable avatars]

-[Don't download avatars of clan members]

-[Use alternate way for Avatar download]

-[General]

-[Automatically reconnect on protocol version changes]

-[No IP/Port in StatusMsg]

-[Use Online status for unsupported global statuses]

-[Don't move friends to clan groups]

-[GameServerQuery support]

-[No custom away message]

-[Remove friend of friend buddies from database]

-[Hide yourself in buddylist]

-[Don't display game search results]

-[Don't display game search status window]

-[Display popup if someone starts a game]

-[Don't automatically create clan groups]

-[Enable MBot support]

-[Game detection]

-[Disable game detection]

-[Use TSRemote.dll to get TeamSpeak server info]

-[Disable popups when ingame]

-[Disable sound events when ingame]

-[Automatically update xfire_games.ini (pro-laming.de)]

-[Automatically update icons.dll (pro-laming.de)]

-[Download missing game icons from Xfire website]

-[No backup on update]

-[Background updating]

-[The username must be lowercase, so it will be lowercased saved.]

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

-[Hidden]

-[Message box]

-[Popup]

-[No]

-[On every start]

-[Daily]

-[<Root Group>]

-[Are you sure you want to remove this game?]

-[Please select a game.]

-[Error: unknown game ID.]

-[Not supported]

-[Configuration saved!]

-[Game not found?!]

-[Network]

-[Account]

-[Features]

-[Blocklist / Games]

-[StatusMsg]

-;file \protocols\Xfire\src\pwd_dlg.cpp

-[Please enter server password...]

-;file \protocols\Xfire\src\searching4games.cpp

-[Write to database...]

-[Games found:%s%s]

-;file \protocols\Xfire\src\userdetails.cpp

-[<not specified>]

-;file \protocols\Xfire\src\Xfire_game.cpp

-[Start game]

-;file \protocols\Xfire\src\Xfire_gamelist.cpp

-[Please wait...]

diff --git a/langpacks/russian/Plugins/XFire.txt b/langpacks/russian/Deprecated/XFire.txt
index 352a8341b2..352a8341b2 100644
--- a/langpacks/russian/Plugins/XFire.txt
+++ b/langpacks/russian/Deprecated/XFire.txt
diff --git a/langpacks/russian/Plugins/Tox.txt b/langpacks/russian/Plugins/Tox.txt
index 25fae392ce..cfd5dbaeee 100644
--- a/langpacks/russian/Plugins/Tox.txt
+++ b/langpacks/russian/Plugins/Tox.txt
@@ -175,16 +175,12 @@ IPv6 адрес (необязательно)
 Невозможно прочесть профиль

 [Unable to decrypt Tox profile]

 Невозможно расшифровать профиль

-[Unable to load Tox profile]

-Невозможно загрузить профиль

 [You cannot add yourself to your contact list]

 Невозможно добавить себя в список контактов

 [Contact already in your contact list]

 Контакт уже в вашем списке контактов

 [Query]

 Запрос

-[One of the arguments is not valid or ]

-Один из аргументов является недопустимым или\s

 [Unable to allocate enough memory]

 Невозможно выделить достаточно памяти

 [Unable to bind to a port]

diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt
index 1f459a44e9..b0369dcbec 100644
--- a/langpacks/russian/Plugins/VKontakte.txt
+++ b/langpacks/russian/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: VKontakte.dll

 ;  Plugin: VKontakte protocol

-;  Version: 0.1.1.13

+;  Version: 0.1.1.14

 ;  Authors: Miranda NG Team

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

 [VKontakte protocol support for Miranda NG.]

diff --git a/langpacks/russian/Untranslated/Tox.txt b/langpacks/russian/Untranslated/Tox.txt
index 3872aaf45e..d4257961d5 100644
--- a/langpacks/russian/Untranslated/Tox.txt
+++ b/langpacks/russian/Untranslated/Tox.txt
@@ -1,2 +1,4 @@
 [Tox ID:]

 [Tox]

+[Unable to initialize tox core]

+[One of the arguments is missing]

diff --git a/langpacks/russian/Untranslated/VKontakte.txt b/langpacks/russian/Untranslated/VKontakte.txt
index 4d2147c4cb..6fda07a3f7 100644
--- a/langpacks/russian/Untranslated/VKontakte.txt
+++ b/langpacks/russian/Untranslated/VKontakte.txt
@@ -1 +1,9 @@
 [URL:]

+[Protocol is offline]

+[File not exist]

+[File type not supported]

+[Error open file]

+[Error read file]

+[Error upload file]

+[Upload server returned empty URL]

+[Invalid or unknown recipient user ID]

diff --git a/langpacks/russian/Untranslated/Xfire.txt b/langpacks/russian/Untranslated/Xfire.txt
deleted file mode 100644
index a2d7406671..0000000000
--- a/langpacks/russian/Untranslated/Xfire.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-[XFire]

-[xfire_games.ini]

-[icons.dll]

-[IP:]

-[There is a new XFire game list online, do you want to update now?]

-[New supported games:]

-[Launcher exe (optional):]

-[Send game ID:]

-[Status message for Xfire if this game will be started:]

-[Parameter:]

-[Please wait, game.ini will be currently parsed...]

-[If you add a mod of an Xfire supported game, then you can specify what game ID will be sent to Xfire. So if you add a Half-Life mod, you can set the Half-Life game ID and if you start the game, your Xfire buddies will see the Half-Life game icon next to your name and the game time will be tracked.]

-[Every game in Xfire needs an ID. Use a number above the last used ID to avoid problems with used IDs. Every number above 10000 should be save. This ID will not be sent to Xfire, when you start a game.]

-[Please select a game exe. Note: If you don't select a launcher exe, the game exe will be used in the game start menu.]

-[Supported Games]

-[Custom game]

-[Well, I would talk to you if Miranda ICQ supported chat]

-[Error during xfire_games.ini update.]

-[There is a new Icons.dll online, do you want to update now?]

-[The Icons.dll was updated.]

-[Error during Icons.dll Update.]

-[%s (Nickname: %s) has invited you to join the %s clan. Message: %s%sPlease go to the XFire clan site to accept the Invitation.]

-[Friends of Friends Playing]

-[Login failed.]

-[The protocol version is too old. Cannot detect a new version number.]

-[Someone logged in with your account. Disconnect.]

-[XFire is not connected.]

-[My Current Game]

-[My Current ServerIP]

-[My Current Voice]

-[Voice ServerIP]

-[My Voice ServerIP]

-[Away from Keyboard]

-[&Activity Report]

-[XFire does not support offline messaging!]

-[Last game: %s playtime: %.2d:%.2d:%.2d]

-[Write to database...]