From 047ec3257cc6e15d8e611a8c8c411894c5cced82 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Mon, 9 Feb 2015 20:12:46 +0000 Subject: - langpacks/english: update; - langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@12073 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/=CORE=.txt | 1 + langpacks/english/Plugins/MRA.txt | 2 +- langpacks/english/Plugins/VKontakte.txt | 6 ++++-- langpacks/english/Plugins/WhatsApp.txt | 13 ++++++++----- langpacks/russian/=CORE=.txt | 2 ++ langpacks/russian/Plugins/MRA.txt | 2 +- langpacks/russian/Plugins/WhatsApp.txt | 24 +++++++++++++++--------- protocols/WhatsApp/res/whatsapp.rc | 4 ++-- 8 files changed, 34 insertions(+), 20 deletions(-) diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt index 3ba13f8c28..eb91c96901 100644 --- a/langpacks/english/=CORE=.txt +++ b/langpacks/english/=CORE=.txt @@ -1269,6 +1269,7 @@ [Metacontacts] ;file \src\modules\metacontacts\meta_services.cpp [No online contacts found.] +[Select metacontact] ;file \src\modules\metacontacts\meta_utils.cpp [Sender] [Could not retrieve contact protocol] diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt index 296c84f2bc..056e13563a 100644 --- a/langpacks/english/Plugins/MRA.txt +++ b/langpacks/english/Plugins/MRA.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: MRA.dll ; Plugin: MRA protocol -; Version: 2.1.0.9 +; Version: 2.1.0.10 ; Authors: Rozhuk Ivan ;============================================================ [Miranda Mail.ru Agent protocol plugin.] diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt index 60542a811a..bfed9d18a1 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.44 +; Version: 0.1.0.45 ; Authors: Miranda NG Team ;============================================================ [VKontakte protocol support for Miranda NG.] @@ -128,6 +128,9 @@ [Link] [Image] [Unsupported or unknown attachment type: %s] +[(Unknown contact)] +[Message from] +[at] ;file \protocols\VKontakte\src\vk_captcha.cpp [Enter the text you see] ;file \protocols\VKontakte\src\vk_chats.cpp @@ -139,7 +142,6 @@ [Warning] [I'm back] [You've been kicked by ] -[(Unknown contact)] [Chat] [&Invite a user] [View/change &title] diff --git a/langpacks/english/Plugins/WhatsApp.txt b/langpacks/english/Plugins/WhatsApp.txt index 6b7dbd4ae6..777d49e536 100644 --- a/langpacks/english/Plugins/WhatsApp.txt +++ b/langpacks/english/Plugins/WhatsApp.txt @@ -2,19 +2,21 @@ ;============================================================ ; File: WhatsApp.dll ; Plugin: WhatsApp protocol -; Version: 0.1.2.7 +; Version: 0.1.2.8 ; Authors: Uli Hecht ;============================================================ [WhatsApp protocol support for Miranda NG.] ;file \protocols\WhatsApp\res\whatsapp.rc [Phone number] -[Including country code, without '+' or '00'] [Nickname] +[Default group:] +[Use SSL connection (port 443)] +[Automatically open group chats] +[Registration] [SMS code] [Request code] [Register code] -[Use SSL connection (port 443)] -[Automatically open group chats] +[Including country code, without '+' or '00'] [Invite users] [Choose an user] [Other user:] @@ -27,6 +29,7 @@ [&Room options] [View/change &topic] [&Leave chat session] +[Set &avatar] [Copy room &JID] [Copy room topic] [Set new subject for %s] @@ -46,6 +49,7 @@ [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] +[Changes will be applied after protocol restart] ;file \protocols\WhatsApp\src\messages.cpp [server] [Message received: %s by %s] @@ -53,7 +57,6 @@ [%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.] diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt index d688b68906..cc8a371d89 100644 --- a/langpacks/russian/=CORE=.txt +++ b/langpacks/russian/=CORE=.txt @@ -2351,6 +2351,8 @@ Ctrl+Искать добавляет контакт Метаконтакты [No online contacts found.] Не найдено контактов в сети. +[Select metacontact] +Выберите метаконтакт [Sender] Отправитель [Could not retrieve contact protocol] diff --git a/langpacks/russian/Plugins/MRA.txt b/langpacks/russian/Plugins/MRA.txt index e405d19eb0..088c78f1a8 100644 --- a/langpacks/russian/Plugins/MRA.txt +++ b/langpacks/russian/Plugins/MRA.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: MRA.dll ; Plugin: MRA protocol -; Version: 2.1.0.9 +; Version: 2.1.0.10 ; Authors: Rozhuk Ivan ;============================================================ [Miranda Mail.ru Agent protocol plugin.] diff --git a/langpacks/russian/Plugins/WhatsApp.txt b/langpacks/russian/Plugins/WhatsApp.txt index 5f8a0d7a7d..ccb0ca5dfa 100644 --- a/langpacks/russian/Plugins/WhatsApp.txt +++ b/langpacks/russian/Plugins/WhatsApp.txt @@ -2,27 +2,31 @@ ;============================================================ ; File: WhatsApp.dll ; Plugin: WhatsApp protocol -; Version: 0.1.2.7 +; Version: 0.1.2.8 ; Authors: Uli Hecht ;============================================================ [WhatsApp protocol support for Miranda NG.] Поддержка протокола WhatsApp в Miranda NG. [Phone number] Номер телефона -[Including country code, without '+' or '00'] -Включая код страны, без '+' или '00' [Nickname] Ник +[Default group:] +Группа: +[Use SSL connection (port 443)] +Подключение по SSL (порт 443) +[Automatically open group chats] +Автоматически открывать комнаты чата +[Registration] +Регистрация [SMS code] Код SMS [Request code] Код запроса [Register code] Код регистрации -[Use SSL connection (port 443)] -Подключение по SSL (порт 443) -[Automatically open group chats] -Автоматически открывать комнаты чата +[Including country code, without '+' or '00'] +Включая код страны, без '+' или '00' [Invite users] Приглашение пользователей [Choose an user] @@ -45,6 +49,8 @@ Просмотр/смена &темы [&Leave chat session] &Покинуть чат +[Set &avatar] +Настройки &аватара [Copy room &JID] Копировать &JID комнаты чата [Copy room topic] @@ -77,6 +83,8 @@ Ваш пароль был установлен автоматически. Теперь вы можете подключиться. [Please correctly specify your registration code received by SMS] Пожалуйста, верно укажите свой код регистрации, полученный в SMS +[Changes will be applied after protocol restart] +Изменения будут применены после перезапуска протокола [server] Сервер [Message received: %s by %s] @@ -87,8 +95,6 @@ Невозможно создать подключение Netlib для WhatsApp [Network connection error.] Ошибка соединения. -[Registration] -Регистрация [Registration failed. Invalid server response.] Неудачная регистрация. Неверный ответ сервера. [Registration failed due to stale code. Please request a new code] diff --git a/protocols/WhatsApp/res/whatsapp.rc b/protocols/WhatsApp/res/whatsapp.rc index 020effc39e..ec76d479ea 100644 --- a/protocols/WhatsApp/res/whatsapp.rc +++ b/protocols/WhatsApp/res/whatsapp.rc @@ -78,7 +78,7 @@ BEGIN EDITTEXT IDC_LOGIN,84,6,100,12,ES_AUTOHSCROLL LTEXT "Nickname",IDC_STATIC,4,23,55,10 EDITTEXT IDC_NICK,60,22,124,12,ES_AUTOHSCROLL - LTEXT "Default group",IDC_STATIC,4,37,55,10 + LTEXT "Default group:",IDC_STATIC,4,37,55,10 EDITTEXT IDC_DEFGROUP,60,36,124,12,ES_AUTOHSCROLL CONTROL "Use SSL connection (port 443)",IDC_SSL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,52,180,10 CONTROL "Automatically open group chats",IDC_AUTORUN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,64,180,10 @@ -102,7 +102,7 @@ BEGIN LTEXT "Including country code, without '+' or '00'",IDC_STATIC,60,22,118,18 LTEXT "Nickname",IDC_STATIC,4,43,55,10 EDITTEXT IDC_NICK,60,42,124,12,ES_AUTOHSCROLL - LTEXT "Default group",IDC_STATIC,4,57,55,10 + LTEXT "Default group:",IDC_STATIC,4,57,55,10 EDITTEXT IDC_DEFGROUP,60,56,124,12,ES_AUTOHSCROLL CONTROL "Use SSL connection (port 443)",IDC_SSL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,72,180,10 CONTROL "Automatically open group chats",IDC_AUTORUN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,84,180,10 -- cgit v1.2.3