- langpacks/english: update;

- langpacks/russian: update;

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

6 files changed, 82 insertions, 31 deletions

diff --git a/langpacks/english/Plugins/Dummy.txt b/langpacks/english/Plugins/Dummy.txt
new file mode 100644
index 0000000000..561ef32ac4
--- /dev/null
+++ b/langpacks/english/Plugins/Dummy.txt
@@ -0,0 +1,16 @@
+#muuid {2a1081d1-aee3-4091-b70d-ae46d09f9a7f}

+;============================================================

+;  File: Dummy.dll

+;  Plugin: Dummy protocol

+;  Version: 0.1.0.0

+;  Authors: Robert Pösel

+;============================================================

+[Dummy protocol for Miranda NG.]

+;file \protocols\Dummy\res\resource.rc

+[Unique ID setting:]

+[Name of setting that holds unique identifier of contacts]

+[Unique ID text:]

+[Visible name of unique identifier of contacts]

+[Restart is required to apply these changes.]

+;file \protocols\Dummy\src\dummy_proto.cpp

+[Dummy protocol is too dumb to send messages.]

diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index c7e693cff7..dac199c62c 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -46,7 +46,6 @@
 [-1 = Infinite]

 [Sec]

 [For "Restart" popup setting is always infinity]

-[Boxes]

 [Popups]

 [Component list]

 [Here is the complete list of missing Miranda NG components. Check components that you want to download.\n\nClick on info icon to view component info page.]

diff --git a/langpacks/english/Plugins/WhatsApp.txt b/langpacks/english/Plugins/WhatsApp.txt
index 29ee25b804..e2f009391d 100644
--- a/langpacks/english/Plugins/WhatsApp.txt
+++ b/langpacks/english/Plugins/WhatsApp.txt
@@ -2,21 +2,17 @@
 ;============================================================

 ;  File: WhatsApp.dll

 ;  Plugin: WhatsApp protocol

-;  Version: 0.0.2.1

+;  Version: 0.1.0.1

 ;  Authors: Uli Hecht

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

 [WhatsApp protocol support for Miranda NG.]

 ;file \protocols\WhatsApp\res\whatsapp.rc

-[Phone-Number]

+[Phone number]

 [Including country code, without '+' or '00']

 [Nickname]

-[Password]

-[Request Code]

-[Register Code]

-[SMS-Code:]

-[Will only be used for registration]

-[Paste password from WART utility]

-[Use WART utility from Plugins folder for registering your number and generating password]

+[SMS code]

+[Request code]

+[Register code]

 [Use SSL connection (443 port)]

 [Cancel]

 ;file \protocols\WhatsApp\src\connection.cpp

@@ -25,17 +21,26 @@
 [Please enter a nickname.]

 [Please enter a password.]

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

+[is now known as '%s']

 [Last seen on %x at %X]

+[You have been added to the group]

+[User '%s' has been added to the group]

+[You have been removed from the group]

+[User '%s' has been removed from the group]

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

 [An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

 [Please correctly specify your registration code received by SMS]

 [Your password has been set automatically.\nIf you change your password manually, you may lose it and need to request a new code!]

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

-[Did not unpack WART (registration utility).]

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

 [%s server connection]

 [Unable to get Netlib connection for WhatsApp]

 [Network-connection error.]

+[Registration]

+[Registration failed. Invalid server response.]

+[Registration failed due to stale code. Please request a new code]

+[Registration failed.]

+[Please try again in %i seconds]

+[Registration code has been sent to your phone.]

 [Network]

 [Account]

 ;file \protocols\WhatsApp\src\theme.cpp

diff --git a/langpacks/russian/Plugins/Dummy.txt b/langpacks/russian/Plugins/Dummy.txt
new file mode 100644
index 0000000000..a59a5ff689
--- /dev/null
+++ b/langpacks/russian/Plugins/Dummy.txt
@@ -0,0 +1,21 @@
+#muuid {2a1081d1-aee3-4091-b70d-ae46d09f9a7f}

+;============================================================

+;  File: Dummy.dll

+;  Plugin: Dummy protocol

+;  Version: 0.1.0.0

+;  Authors: Robert Pösel

+;============================================================

+[Dummy protocol for Miranda NG.]

+Протокол-заглушка для Miranda NG.

+[Unique ID setting:]

+Уникальные настройки ID

+[Name of setting that holds unique identifier of contacts]

+Название настроек содержит уникальный идентификатор контактов

+[Unique ID text:]

+Уникальный текст ID

+[Visible name of unique identifier of contacts]

+Видимое имя уникального идентификатора контактов

+[Restart is required to apply these changes.]

+Необходим перезапуск для применения настроек.

+[Dummy protocol is too dumb to send messages.]

+Протокол-заглушка чересчур туп для отсылки сообщений.

diff --git a/langpacks/russian/Plugins/PluginUpdater.txt b/langpacks/russian/Plugins/PluginUpdater.txt
index 8f8703b17f..ce9197b54e 100644
--- a/langpacks/russian/Plugins/PluginUpdater.txt
+++ b/langpacks/russian/Plugins/PluginUpdater.txt
@@ -85,8 +85,6 @@
 сек.

 [For "Restart" popup setting is always infinity]

 Всплывающее окно "Перезапуск" всегда установлено на бесконечность

-[Boxes]

-Окна

 [Popups]

 Всплывающие окна

 [Component list]

diff --git a/langpacks/russian/Plugins/WhatsApp.txt b/langpacks/russian/Plugins/WhatsApp.txt
index 64b096b43a..09a892cdbc 100644
--- a/langpacks/russian/Plugins/WhatsApp.txt
+++ b/langpacks/russian/Plugins/WhatsApp.txt
@@ -2,31 +2,23 @@
 ;============================================================

 ;  File: WhatsApp.dll

 ;  Plugin: WhatsApp protocol

-;  Version: 0.0.2.1

+;  Version: 0.1.0.1

 ;  Authors: Uli Hecht

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

 [WhatsApp protocol support for Miranda NG.]

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

-[Phone-Number]

-Телефон

+[Phone number]

+Номер телефона

 [Including country code, without '+' or '00']

 Включая код страны, без '+' или '00'

 [Nickname]

 Ник

-[Password]

-Пароль

-[Request Code]

+[SMS code]

+Код SMS

+[Request code]

 Код запроса

-[Register Code]

+[Register code]

 Код регистрации

-[SMS-Code:]

-SMS-код:

-[Will only be used for registration]

-Нужен только для регистрации

-[Paste password from WART utility]

-Вставьте пароль из программы WART

-[Use WART utility from Plugins folder for registering your number and generating password]

-Для регистрации номера и получения пароля воспользуйтесь программой WART из папки Plugins

 [Use SSL connection (443 port)]

 Подключение по SSL (порт 443)

 [Cancel]

@@ -39,22 +31,42 @@ SMS-код:
 Введите ник.

 [Please enter a password.]

 Введите пароль.

+[is now known as '%s']

+теперь известен, как '%s'

 [Last seen on %x at %X]

 Последнее появление %x в %X

+[You have been added to the group]

+Вы добавлены в группу

+[User '%s' has been added to the group]

+Пользователь '%s' добавлен в группу

+[You have been removed from the group]

+Вы удалены из группы

+[User '%s' has been removed from the group]

+Пользователь '%s' удалён из группы

 [An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

 Код регистрации придет на ваш телефон в SMS.\nУчтите, что одновременное использование этого плагина и настоящего WhatsApp невозможно!\nПродолжить?

 [Please correctly specify your registration code received by SMS]

 Пожалуйста, верно укажите свой код регистрации, полученный в SMS

 [Your password has been set automatically.\nIf you change your password manually, you may lose it and need to request a new code!]

 Ваш пароль установлен автоматически.\nЕсли вы измените его вручную, то можете потерять его и придется запросить новый код!

-[Did not unpack WART (registration utility).]

-Не распакована программа WART (необходима для регистрации).

 [%s server connection]

 %s подключение к серверу

 [Unable to get Netlib connection for WhatsApp]

 Невозможно создать подключение Netlib для WhatsApp

 [Network-connection error.]

 Ошибка соединения

+[Registration]

+Регистрация

+[Registration failed. Invalid server response.]

+Неудачная регистрация. Неверный ответ сервера.

+[Registration failed due to stale code. Please request a new code]

+Неудачная регистрация, вследствие устаревшего кода. Пожалуйста, запросите новый код

+[Registration failed.]

+Неудачная регистрация.

+[Please try again in %i seconds]

+Пожалуйста, попробуйте ещё раз через %i секунд

+[Registration code has been sent to your phone.]

+Код регистрации был выслан на ваш телефон.

 [Network]

 Сеть

 [Account]