- langpacks/english: update;

- langpacks/russian: update;

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

19 files changed, 102 insertions, 22 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 5f67a5acc4..3ba13f8c28 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1015,7 +1015,6 @@
 [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/Console.txt b/langpacks/english/Plugins/Console.txt
index 9b721cf042..5071ff055c 100644
--- a/langpacks/english/Plugins/Console.txt
+++ b/langpacks/english/Plugins/Console.txt
@@ -21,7 +21,7 @@
 [Hide Console]

 [Show Console]

 [Scrolling (Ctrl+Q)]

-[Pause logging(Ctrl+P)]

+[Pause logging (Ctrl+P)]

 [Save log to file (Ctrl+S)]

 [Copy selected log (Ctrl+C)]

 [Delete selected (Del)]

@@ -36,7 +36,7 @@
 [Miranda Console]

 [Services]

 [Text]

-[&Help]

+[Background]

 [Text Files (*.txt)]

 [All Files]

 [Save selection to file]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 441dfa46ff..ac93456f0d 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.9.9

+;  Version: 0.2.9.10

 ;  Authors: Michal Zelinka, Robert Pösel

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

 [Facebook protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/MobileState.txt b/langpacks/english/Plugins/MobileState.txt
index 8fc513f8ed..519620f829 100644
--- a/langpacks/english/Plugins/MobileState.txt
+++ b/langpacks/english/Plugins/MobileState.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MobileState.dll

 ;  Plugin: Mobile state

-;  Version: 0.0.1.4

+;  Version: 0.0.1.5

 ;  Authors: Robert Pösel

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

 [Plugin shows mobile icon in contact list next to contacts which are using mobile client.]

diff --git a/langpacks/english/Plugins/ShlExt.txt b/langpacks/english/Plugins/ShlExt.txt
index 253285d55f..5921e3eab3 100644
--- a/langpacks/english/Plugins/ShlExt.txt
+++ b/langpacks/english/Plugins/ShlExt.txt
@@ -25,6 +25,14 @@
 [Approved]

 [Are you sure? This will remove all the settings stored in your database and all registry entries created for shlext to work with Explorer]

 [Disable/Remove shlext]

+[Services]

 ;file \plugins\ShellExt\src\shlcom.cpp

 [Recently]

 [Clear entries]

+[Unable to delete registry key for 'shlext COM', this key may already be deleted or you may need admin rights.]

+[Problem]

+[Unable to delete registry key for 'File context menu handlers', this key may already be deleted or you may need admin rights.]

+[Unable to delete registry key for 'Directory context menu handlers', this key may already be deleted or you may need admin rights.]

+[Unable to delete registry entry for 'Approved context menu handlers', this key may already be deleted or you may need admin rights.]

+[Shell context menus requires your permission to register with Windows Explorer (one time only).]

+[Miranda NG - Shell context menus (shellext.dll)]

diff --git a/langpacks/english/Plugins/SkypeClassic.txt b/langpacks/english/Plugins/SkypeClassic.txt
index f1c0232313..3693671468 100644
--- a/langpacks/english/Plugins/SkypeClassic.txt
+++ b/langpacks/english/Plugins/SkypeClassic.txt
@@ -119,6 +119,15 @@
 [Sending IM message to user, who has not added you to friend list and has chosen 'only people in my friend list can start IM']

 [Sending IM message to user, who has not authorized you and has chosen 'only people whom I have authorized can start IM']

 [Unknown error]

+[Cannot resolve host!]

+[Cannot find valid host to connect to.]

+[Authentication is not supported/needed for this Skype proxy server. It will be disabled.]

+[Authentication failed for this server, connection was not successful. Verify that your password is correct!]

+[The server you specified requires authentication, but you have not supplied a password for it. Check the Skype plugin settings and try again.]

+[ERROR: Skype not running / too old / working!]

+[Skype refused the connection :(]

+[The Skype API is not available]

+[Wheee, Skype won't let me use the API. :(]

 ;file \protocols\SkypeClassic\src\skypeopt.cpp

 [Preview error message]

 [Skype default]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index b47a3fe431..60542a811a 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.0.43

+;  Version: 0.1.0.44

 ;  Authors: Miranda NG Team

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

 [VKontakte protocol support for Miranda NG.]

@@ -171,7 +171,7 @@
 [Network]

 [Account]

 [News and notifications]

-[View settings]

+[View]

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

 [%s server connection]

 [Create new chat]

@@ -197,8 +197,10 @@
 [Please authorize me to add you to my friend list.]

 [Are you sure to delete %s from your friend list?]

 [User %s was deleted from your friend list]

+[Your request to the user %s was deleted]

 [Friend request from the user %s declined]

 [Friend request suggestion for the user %s deleted]

+[User or request was not deleted]

 [ report abuse on him/her]

 [ clear server history with him/her]

 [ remove him/her from your friend list]

diff --git a/langpacks/english/Plugins/WhatsApp.txt b/langpacks/english/Plugins/WhatsApp.txt
index 366f139a64..393cde6c4e 100644
--- a/langpacks/english/Plugins/WhatsApp.txt
+++ b/langpacks/english/Plugins/WhatsApp.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: WhatsApp.dll

 ;  Plugin: WhatsApp protocol

-;  Version: 0.1.2.4

+;  Version: 0.1.2.7

 ;  Authors: Uli Hecht

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

 [WhatsApp protocol support for Miranda NG.]

@@ -14,7 +14,25 @@
 [Request code]

 [Register code]

 [Use SSL connection (port 443)]

+[Invite Users]

+[Choose an user]

+[Other user:]

+[&Invite]

 [Cancel]

+;file \protocols\WhatsApp\src\chat.cpp

+[Members]

+[Owners]

+[&Invite a user]

+[&Room options]

+[View/change &topic]

+[&Leave chat session]

+[Copy room &JID]

+[Copy room topic]

+[Set new subject for %s]

+[&Add to roster]

+[&Kick]

+[Copy &nickname]

+[Copy real &JID]

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

 [Please enter a country code.]

 [Please enter a phone number without country code.]

@@ -23,15 +41,12 @@
 ;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?]

 [Your password has been set automatically. You can proceed with login now]

 [Please correctly specify your registration code received by SMS]

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

+[server]

 [Message received: %s by %s]

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

 [%s server connection]

@@ -47,10 +62,5 @@
 [Account]

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

 [WhatsApp icon]

-[Add to group]

 [Create chat group]

-[Remove from chat group]

-[Leave and delete group]

-[Leave group]

-[Change group subject]

 [Create group]

diff --git a/langpacks/russian/Plugins/Actman.txt b/langpacks/russian/Plugins/Actman.txt
index 2fc8110a18..cd88ef1aa4 100644
--- a/langpacks/russian/Plugins/Actman.txt
+++ b/langpacks/russian/Plugins/Actman.txt
@@ -301,6 +301,8 @@
 с текущим профилем

 [Restarts Miranda]

 Перезапускает Miranda

+[Station name]

+Имя станции

 [All protocols]

 Все протоколы

 [Protocol]

diff --git a/langpacks/russian/Plugins/Console.txt b/langpacks/russian/Plugins/Console.txt
index 1be684adda..a729eb6cde 100644
--- a/langpacks/russian/Plugins/Console.txt
+++ b/langpacks/russian/Plugins/Console.txt
@@ -7,8 +7,6 @@
 ;============================================================

 [Console log window for Miranda.]

 Плагин окна консоли журнала Miranda NG.

-[Pause logging (Ctrl+P)]

-Пауза (Ctrl+P)

 [Console]

 Консоль

 [Single window mode*]

@@ -35,6 +33,8 @@
 Показать консоль

 [Scrolling (Ctrl+Q)]

 Прокручивать (Ctrl+Q)

+[Pause logging (Ctrl+P)]

+Пауза (Ctrl+P)

 [Save log to file (Ctrl+S)]

 Сохранить журнал в файл (Ctrl+S)

 [Copy selected log (Ctrl+C)]

diff --git a/langpacks/russian/Plugins/NewAwaySys.txt b/langpacks/russian/Plugins/NewAwaySys.txt
index 7e6fae8b62..aae98744fe 100644
--- a/langpacks/russian/Plugins/NewAwaySys.txt
+++ b/langpacks/russian/Plugins/NewAwaySys.txt
@@ -367,5 +367,7 @@ NewAwaySys: Входящий запрос статусного сообщени�
 Статусы

 [for]

 в течение

+[all accounts]

+Все учётные записи

 [Closing in %d]

 Закрыть (%d)

diff --git a/langpacks/russian/Plugins/ShlExt.txt b/langpacks/russian/Plugins/ShlExt.txt
index 395d124344..8516c88237 100644
--- a/langpacks/russian/Plugins/ShlExt.txt
+++ b/langpacks/russian/Plugins/ShlExt.txt
@@ -41,6 +41,8 @@
 Вы уверены? Это удалит все настройки данного плагина в вашем профиле и все ключи реестра, отвечающие за его интеграцию в оболочку ОС.

 [Disable/Remove shlext]

 Отключить/Удалить shlext

+[Services]

+Службы

 [Recently]

 Последние

 [Clear entries]

diff --git a/langpacks/russian/Plugins/Steam.txt b/langpacks/russian/Plugins/Steam.txt
index f036281928..f2d240bbc3 100644
--- a/langpacks/russian/Plugins/Steam.txt
+++ b/langpacks/russian/Plugins/Steam.txt
@@ -31,6 +31,8 @@
 Заблокировать

 [ on server %s]

  на сервере %s

+[Playing]

+Играю

 [%s has been removed from your contact list]

 %s удалён из вашего списка контактов

 [%s is back in your contact list]

diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt
index 3f58041611..9ebc2a5628 100644
--- a/langpacks/russian/Plugins/VKontakte.txt
+++ b/langpacks/russian/Plugins/VKontakte.txt
@@ -369,10 +369,14 @@ Cоздать комнату чата
 Вы уверены, что хотите удалить %s из списка друзей?

 [User %s was deleted from your friend list]

 Контакт %s был удалён из вашего списка друзей

+[Your request to the user %s was deleted]

+Ваш запрос пользователю %s удалён

 [Friend request from the user %s declined]

 Запрос дружбы от пользователя %s отклонён

 [Friend request suggestion for the user %s deleted]

 Рекомендация добавить в друзья пользователя %s удалена

+[User or request was not deleted]

+Пользователь или запрос не были удалены

 [ report abuse on him/her]

  отправит жалобу на пользователя

 [ clear server history with him/her]

diff --git a/langpacks/russian/Plugins/WhatsApp.txt b/langpacks/russian/Plugins/WhatsApp.txt
index 7f69e3e9a0..27ced196c5 100644
--- a/langpacks/russian/Plugins/WhatsApp.txt
+++ b/langpacks/russian/Plugins/WhatsApp.txt
@@ -21,8 +21,42 @@
 Код регистрации

 [Use SSL connection (port 443)]

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

+[Invite Users]

+Приглашение пользователей

+[Choose an user]

+Выберите пользователя

+[Other user:]

+Другой пользователь:

+[&Invite]

+&Пригласить

 [Cancel]

 Отмена

+[Members]

+Участник

+[Owners]

+Владельцы

+[&Invite a user]

+&Пригласить пользователя

+[&Room options]

+Настройки &комнаты чата

+[View/change &topic]

+Просмотр/смена &темы

+[&Leave chat session]

+&Покинуть чат

+[Copy room &JID]

+Копировать &JID комнаты чата

+[Copy room topic]

+Копировать тему

+[Set new subject for %s]

+Установить новую тему для %s

+[&Add to roster]

+&Добавить в ростер

+[&Kick]

+&Выкинуть

+[Copy &nickname]

+Копировать &ник

+[Copy real &JID]

+Копировать &JID

 [Please enter a country code.]

 Введите код страны.

 [Please enter a phone number without country code.]

@@ -41,6 +75,8 @@
 Ваш пароль был установлен автоматически. Теперь вы можете подключиться.

 [Please correctly specify your registration code received by SMS]

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

+[server]

+Сервер

 [Message received: %s by %s]

 Сообщение принято в: %s пользователем %s

 [%s server connection]

diff --git a/langpacks/russian/Untranslated/Actman.txt b/langpacks/russian/Untranslated/Actman.txt
index 84505f96c5..83d4cc28be 100644
--- a/langpacks/russian/Untranslated/Actman.txt
+++ b/langpacks/russian/Untranslated/Actman.txt
@@ -11,7 +11,6 @@
 [Shows contact history or (wParam=0) system history]

 [Erases contact's history. hContact can be NULL(0) to empty system history]

 [Show Global history search window. If already opened, bring it to front.]

-[Station name]

 [wParam is Handle]

 [wParam is Ansi station name]

 [wParam is Unicode station name]

diff --git a/langpacks/russian/Untranslated/NewAwaySys.txt b/langpacks/russian/Untranslated/NewAwaySys.txt
index b747f1712f..ce7a9d33dd 100644
--- a/langpacks/russian/Untranslated/NewAwaySys.txt
+++ b/langpacks/russian/Untranslated/NewAwaySys.txt
@@ -3,4 +3,3 @@
 [Set message for]

 [message for]

 [available autoreply only]

-[all accounts]

diff --git a/langpacks/russian/Untranslated/ShlExt.txt b/langpacks/russian/Untranslated/ShlExt.txt
new file mode 100644
index 0000000000..82cc81ec3e
--- /dev/null
+++ b/langpacks/russian/Untranslated/ShlExt.txt
@@ -0,0 +1,7 @@
+[Unable to delete registry key for 'shlext COM', this key may already be deleted or you may need admin rights.]

+[Problem]

+[Unable to delete registry key for 'File context menu handlers', this key may already be deleted or you may need admin rights.]

+[Unable to delete registry key for 'Directory context menu handlers', this key may already be deleted or you may need admin rights.]

+[Unable to delete registry entry for 'Approved context menu handlers', this key may already be deleted or you may need admin rights.]

+[Shell context menus requires your permission to register with Windows Explorer (one time only).]

+[Miranda NG - Shell context menus (shellext.dll)]

diff --git a/langpacks/russian/Untranslated/Steam.txt b/langpacks/russian/Untranslated/Steam.txt
index a8983df79c..45cf3df09d 100644
--- a/langpacks/russian/Untranslated/Steam.txt
+++ b/langpacks/russian/Untranslated/Steam.txt
@@ -2,6 +2,5 @@
 [Steam game]

 [Looking to play]

 [Looking to trade]

-[Playing]

 [Gaming icon]

 [SteamID]