- langpacks/english: update;

- langpacks/russian: update;

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

9 files changed, 47 insertions, 27 deletions

diff --git a/langpacks/english/Plugins/AssocMgr.txt b/langpacks/english/Plugins/AssocMgr.txt
index 7b223bbd72..f54f382736 100644
--- a/langpacks/english/Plugins/AssocMgr.txt
+++ b/langpacks/english/Plugins/AssocMgr.txt
@@ -36,10 +36,10 @@
 [Access failed:\n%.64hs(%.128s)\n%.250hs(%u)\n%.256hs (%u)]

 [Registry warning]

 ;file \plugins\AssocMgr\src\test.cpp

-[AIM Link Protocol]

-[ICQ Link Shortcut]

+[AIM link protocol]

+[ICQ link shortcut]

 [&Add to contact list...]

-[Yahoo Link Protocol]

-[MSN Link Protocol]

-[Gadu-Gadu Link Protocol]

-[Jabber Link Protocol]

+[Yahoo link protocol]

+[MSN link protocol]

+[Gadu-Gadu link protocol]

+[Jabber link protocol]

diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index 5927bca818..e6fc5cfe82 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Import.dll

 ;  Plugin: Import contacts and messages

-;  Version: 0.95.3.1

+;  Version: 0.95.3.2

 ;  Authors: Miranda team

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

 [Imports contacts and messages from another Miranda profile or from an external program.]

@@ -48,6 +48,7 @@
 [Added %S contact %s, '%s']

 [Added %S contact %s]

 [Skipping contact with no protocol]

+[Skipping contact, account %S cannot be mapped.]

 [Skipping contact, %S not installed.]

 [Skipping non-IM contact (%S)]

 [Skipping %S contact, ID not found]

diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index b9dff12fbf..9b21b5702f 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MSN.dll

 ;  Plugin: MSN protocol

-;  Version: 0.11.0.3

+;  Version: 0.11.1.1

 ;  Authors: Boris Krasnovskiy, George Hazan, Richard Hughes

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

 [Microsoft Network (MSN) protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index 9b449d7b9d..2162610f60 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -7,23 +7,29 @@
 ;============================================================

 [Tox protocol support for Miranda NG.]

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

-[Username:]

-[Data file:]

+[Name:]

 [Default group:]

+[Username:]

 [Connection settings]

 [Disable UDP (force Tox to use TCP)]

 [Disable IPv6]

 [Tox]

+[Tox profile]

+[Cancel]

+[Tox profile contains your ID and friend list.\r\nYou may create new profile if you never used tox or use existing profile from other tox client.]

+[Create new profile]

+[Use existing profile]

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

 [Contact already in your contact list]

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

 [Network]

 [Account]

+[Contacts]

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

 [%s connection]

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

-[All Files (*.*)]

-[Select data file]

+[All files (*.*)]

+[Select tox profile]

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

 [Protocols]

 [Protocol icon]

diff --git a/langpacks/russian/Plugins/AssocMgr.txt b/langpacks/russian/Plugins/AssocMgr.txt
index bd6a933cff..19fd65f4bc 100644
--- a/langpacks/russian/Plugins/AssocMgr.txt
+++ b/langpacks/russian/Plugins/AssocMgr.txt
@@ -57,17 +57,17 @@ Miranda NG не может открыть "%S".\n\nДанная ссылка н�
 Доступ запрещён:\n%.64hs(%.128s)\n%.250hs(%u)\n%.256hs (%u)

 [Registry warning]

 Предупреждение

-[AIM Link Protocol]

+[AIM link protocol]

 Протокол AIM

-[ICQ Link Shortcut]

+[ICQ link shortcut]

 Протокол ICQ

 [&Add to contact list...]

 &Добавить в список контактов...

-[Yahoo Link Protocol]

+[Yahoo link protocol]

 Протокол Yahoo

-[MSN Link Protocol]

+[MSN link protocol]

 Протокол MSN

-[Gadu-Gadu Link Protocol]

+[Gadu-Gadu link protocol]

 Протокол Gadu-Gadu

-[Jabber Link Protocol]

+[Jabber link protocol]

 Протокол Jabber

diff --git a/langpacks/russian/Plugins/Import.txt b/langpacks/russian/Plugins/Import.txt
index 31aa114a24..ec6345002d 100644
--- a/langpacks/russian/Plugins/Import.txt
+++ b/langpacks/russian/Plugins/Import.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Import.dll

 ;  Plugin: Import contacts and messages

-;  Version: 0.95.3.1

+;  Version: 0.95.3.2

 ;  Authors: Miranda team

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

 [Imports contacts and messages from another Miranda profile or from an external program.]

diff --git a/langpacks/russian/Plugins/MSN.txt b/langpacks/russian/Plugins/MSN.txt
index ca22a5fcec..ad9d12b195 100644
--- a/langpacks/russian/Plugins/MSN.txt
+++ b/langpacks/russian/Plugins/MSN.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MSN.dll

 ;  Plugin: MSN protocol

-;  Version: 0.11.0.3

+;  Version: 0.11.1.1

 ;  Authors: Boris Krasnovskiy, George Hazan, Richard Hughes

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

 [Microsoft Network (MSN) protocol support for Miranda NG.]

diff --git a/langpacks/russian/Plugins/Tox.txt b/langpacks/russian/Plugins/Tox.txt
index 3be30fddf6..dc70a300c8 100644
--- a/langpacks/russian/Plugins/Tox.txt
+++ b/langpacks/russian/Plugins/Tox.txt
@@ -7,30 +7,42 @@
 ;============================================================

 [Tox protocol support for Miranda NG.]

 Поддержка протокола Tox в Miranda NG.

-[Username:]

-Имя пользователя:

-[Data file:]

-Файл-"ключ":

+[Name:]

+Имя:

 [Default group:]

 Группа:

+[Username:]

+Имя пользователя:

 [Connection settings]

 Настройки подключения

 [Disable UDP (force Tox to use TCP)]

 Отключить UDP (принудительно использовать TCP)

 [Disable IPv6]

 Отключить IPv6

+[Tox profile]

+Профиль Tox

+[Cancel]

+Отмена

+[Tox profile contains your ID and friend list.\r\nYou may create new profile if you never used tox or use existing profile from other tox client.]

+Профиль Tox содержит ваш ID и список друзей.\r\nВы можете создать новый профиль, если вы никогда раньше не использовали Tox, либо использовать профиль Tox от другого клиента.

+[Create new profile]

+Создать новый профиль

+[Use existing profile]

+Использовать существующий профиль

 [Contact already in your contact list]

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

 [Network]

 Сеть

 [Account]

 Учётная запись

+[Contacts]

+Контакты

 [%s connection]

 %s подключение

-[All Files (*.*)]

+[All files (*.*)]

 Все файлы (*.*)

-[Select data file]

-Выберите файл-"ключ"

+[Select tox profile]

+Выбрать профиль Tox

 [Protocols]

 Протоколы

 [Protocol icon]

diff --git a/langpacks/russian/Untranslated/Import.txt b/langpacks/russian/Untranslated/Import.txt
new file mode 100644
index 0000000000..a9b65f7233
--- /dev/null
+++ b/langpacks/russian/Untranslated/Import.txt
@@ -0,0 +1 @@
+[Skipping contact, account %S cannot be mapped.]