From 841d5ccc0f810e36ee7014666d8b7e0dbd3c42fa Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 3 Jan 2014 16:33:17 +0000 Subject: - Jabber: translation fix; - langpacks/english: update; - langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@7481 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/Plugins/Jabber.txt | 7 ++++++- langpacks/english/Plugins/MSN.txt | 2 +- langpacks/russian/Plugins/Jabber.txt | 14 ++++++++++++-- langpacks/russian/Plugins/MSN.txt | 2 +- protocols/JabberG/src/jabber_privacy.cpp | 8 ++++---- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt index 80be1f48f4..d80e0cab3d 100644 --- a/langpacks/english/Plugins/Jabber.txt +++ b/langpacks/english/Plugins/Jabber.txt @@ -654,6 +654,8 @@ [Create/Join group chat] [Roster editor] [Resource priority] +[Increase priority by %d] +[Decrease priority by %d] [Resource priority [%d]] [Join conference] [Open bookmarks] @@ -965,6 +967,10 @@ [** Subsription: from **] [** Subsription: none **] [] +[Message] +[Presence (in)] +[Presence (out)] +[Query] [allow ] [deny ] [all.] @@ -1053,7 +1059,6 @@ [Sending registration information...] ;file \protocols\JabberG\src\jabber_userinfo.cpp [Resource] -[Message] [] [Software] [Version] diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt index 332143c826..37243c0fdc 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.0.2 ; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes ;============================================================ [Microsoft Network (MSN) protocol support for Miranda NG.] diff --git a/langpacks/russian/Plugins/Jabber.txt b/langpacks/russian/Plugins/Jabber.txt index e90cc818c1..86cffa3737 100644 --- a/langpacks/russian/Plugins/Jabber.txt +++ b/langpacks/russian/Plugins/Jabber.txt @@ -961,6 +961,10 @@ Jabber ошибка Редактор ростера [Resource priority] Приоритет ресурса +[Increase priority by %d] +Увеличить приоритет на %d +[Decrease priority by %d] +Уменьшить приоритет на %d [Resource priority [%d]] Приоритет ресурса [%d] [Join conference] @@ -1561,6 +1565,14 @@ XML для MS Excel (кодировка UTF-8) ** Подписка: нет ** [] <нет> +[Message] +Сообщение +[Presence (in)] +Присутствие (вх) +[Presence (out)] +Присутствие (исх) +[Query] +Запрос [allow ] разрешить [deny ] @@ -1723,8 +1735,6 @@ XML для MS Excel (кодировка UTF-8) Отсылка регистрационной информации... [Resource] Ресурс -[Message] -Сообщение [] <не указано> [Software] diff --git a/langpacks/russian/Plugins/MSN.txt b/langpacks/russian/Plugins/MSN.txt index 90b523d8ac..2e71b483d3 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.0.2 ; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes ;============================================================ [Microsoft Network (MSN) protocol support for Miranda NG.] diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index 5504d2689e..1b6ff96e2a 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -925,10 +925,10 @@ struct } static drawItems[] = { - { _T("Message"), "pl_msg_allow" }, - { _T("Presence (in)"), "pl_prin_allow" }, - { _T("Presence (out)"), "pl_prout_allow" }, - { _T("Query"), "pl_iq_allow" } + { LPGENT("Message"), "pl_msg_allow" }, + { LPGENT("Presence (in)"), "pl_prin_allow" }, + { LPGENT("Presence (out)"), "pl_prout_allow" }, + { LPGENT("Query"), "pl_iq_allow" } }; BOOL CJabberDlgPrivacyLists::OnWmDrawItem(UINT, WPARAM, LPARAM lParam) -- cgit v1.2.3