From ccef0b4c21f28c71a715af4c68d81fd5d82b46bc Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Tue, 23 Jun 2015 19:46:05 +0000 Subject: - langpacks/english: update; - langpacks/russian: update; translation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@14354 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/Plugins/ClientChangeNotify.txt | 2 +- langpacks/english/Plugins/CmdLine.txt | 2 +- langpacks/english/Plugins/HwHotKeys.txt | 1 + langpacks/english/Plugins/New_GPG.txt | 2 ++ langpacks/english/Plugins/Tox.txt | 2 +- langpacks/english/Plugins/VKontakte.txt | 2 +- langpacks/english/Plugins/Variables.txt | 1 - langpacks/russian/Plugins/ClientChangeNotify.txt | 4 ++-- langpacks/russian/Plugins/CmdLine.txt | 2 +- langpacks/russian/Plugins/Tox.txt | 2 +- langpacks/russian/Plugins/VKontakte.txt | 2 +- langpacks/russian/Plugins/Variables.txt | 2 -- langpacks/russian/Untranslated/HwHotKeys.txt | 1 + langpacks/russian/Untranslated/New_GPG.txt | 2 ++ plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp | 2 +- 15 files changed, 16 insertions(+), 13 deletions(-) diff --git a/langpacks/english/Plugins/ClientChangeNotify.txt b/langpacks/english/Plugins/ClientChangeNotify.txt index 45bbc74284..38516426af 100644 --- a/langpacks/english/Plugins/ClientChangeNotify.txt +++ b/langpacks/english/Plugins/ClientChangeNotify.txt @@ -36,8 +36,8 @@ [%s (was %s)] [Disable c&lient change notification] [Enable c&lient change notification] -[Popups] [ClientChangeNotify: Client changed] +[Popups] ;file \plugins\ClientChangeNotify\src\Misc.h [Error #%d] [Can't open log file ] diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt index 5cbce59aae..2d515d41c1 100644 --- a/langpacks/english/Plugins/CmdLine.txt +++ b/langpacks/english/Plugins/CmdLine.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: CmdLine.dll ; Plugin: Command line -; Version: 0.0.4.4 +; Version: 0.0.4.5 ; Authors: Cristian Libotean ;============================================================ [This plugin lets you control Miranda from the command line.] diff --git a/langpacks/english/Plugins/HwHotKeys.txt b/langpacks/english/Plugins/HwHotKeys.txt index af487a8266..5d4a3c971c 100644 --- a/langpacks/english/Plugins/HwHotKeys.txt +++ b/langpacks/english/Plugins/HwHotKeys.txt @@ -18,3 +18,4 @@ [Combination of keys for assignment] ;file \plugins\HwHotKeys\src\HwHotKeys_DllMain.cpp [Customize] +[Hardware HotKeys] diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt index a31a59fae3..13682a1650 100644 --- a/langpacks/english/Plugins/New_GPG.txt +++ b/langpacks/english/Plugins/New_GPG.txt @@ -191,6 +191,8 @@ [There is no public or private key.] ;file \plugins\New_GPG\src\utilities.cpp [Do you want to toggle encryption for all subcontacts?] +[Turn off GPG encryption] +[Turn on GPG encryption] [Target file exists, do you want to replace it?] [Capability to decrypt file not found on other side.\nRecipient may be unable to decrypt file(s).\nDo you want to encrypt file(s) anyway?] [File transfer warning] diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt index 001c87626c..9d2f27c401 100644 --- a/langpacks/english/Plugins/Tox.txt +++ b/langpacks/english/Plugins/Tox.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: Tox.dll ; Plugin: Tox protocol -; Version: 0.11.1.8 +; Version: 0.11.1.9 ; Authors: Miranda NG Team ;============================================================ [Tox protocol support for Miranda NG.] diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt index 891423e9a4..f320e40ff8 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.1.7 +; Version: 0.1.1.8 ; Authors: Miranda NG Team ;============================================================ [VKontakte protocol support for Miranda NG.] diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt index d7a16b747f..2745524ae3 100644 --- a/langpacks/english/Plugins/Variables.txt +++ b/langpacks/english/Plugins/Variables.txt @@ -187,7 +187,6 @@ [formats timestamp x (seconds since 1/1/1970) in time format y] [y > 0: line number y from file x, y = 0: the whole file, y < 0: line y counted from the end, y = r: random line] [uptime in seconds] -[any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)] [expand environment variable x] [user name] [text from clipboard] diff --git a/langpacks/russian/Plugins/ClientChangeNotify.txt b/langpacks/russian/Plugins/ClientChangeNotify.txt index 2ac96715dd..e04ce64325 100644 --- a/langpacks/russian/Plugins/ClientChangeNotify.txt +++ b/langpacks/russian/Plugins/ClientChangeNotify.txt @@ -63,10 +63,10 @@ Выключить уведомления о смене к&лиента [Enable c&lient change notification] Включить уведомления о смене к&лиента -[Popups] -Всплывающие окна [ClientChangeNotify: Client changed] Уведомление о смене клиента: Клиент изменился +[Popups] +Всплывающие окна [Error #%d] Ошибка #%d [Can't open log file ] diff --git a/langpacks/russian/Plugins/CmdLine.txt b/langpacks/russian/Plugins/CmdLine.txt index fda677bf7a..d96b0a8b7f 100644 --- a/langpacks/russian/Plugins/CmdLine.txt +++ b/langpacks/russian/Plugins/CmdLine.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: CmdLine.dll ; Plugin: Command line -; Version: 0.0.4.4 +; Version: 0.0.4.5 ; Authors: Cristian Libotean ;============================================================ [This plugin lets you control Miranda from the command line.] diff --git a/langpacks/russian/Plugins/Tox.txt b/langpacks/russian/Plugins/Tox.txt index 9e9ffdf88d..27589d19db 100644 --- a/langpacks/russian/Plugins/Tox.txt +++ b/langpacks/russian/Plugins/Tox.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: Tox.dll ; Plugin: Tox protocol -; Version: 0.11.1.8 +; Version: 0.11.1.9 ; Authors: Miranda NG Team ;============================================================ [Tox protocol support for Miranda NG.] diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt index 3cb72899ea..d500e0ffcb 100644 --- a/langpacks/russian/Plugins/VKontakte.txt +++ b/langpacks/russian/Plugins/VKontakte.txt @@ -2,7 +2,7 @@ ;============================================================ ; File: VKontakte.dll ; Plugin: VKontakte protocol -; Version: 0.1.1.7 +; Version: 0.1.1.8 ; Authors: Miranda NG Team ;============================================================ [VKontakte protocol support for Miranda NG.] diff --git a/langpacks/russian/Plugins/Variables.txt b/langpacks/russian/Plugins/Variables.txt index 9c20d7ab1c..747ae43f1d 100644 --- a/langpacks/russian/Plugins/Variables.txt +++ b/langpacks/russian/Plugins/Variables.txt @@ -339,8 +339,6 @@ z, если y равно x, допустимы множественные арг y > 0: строка номер y из файла x, y = 0: целый файл, y < 0: строка y от конца файла, y = r: случайная строка [uptime in seconds] время работы системы в секундах -[any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)] -любая переменная среды, определённая в текущей сессии Windows (например, %systemroot%, %allusersprofile% и т.д.) [expand environment variable x] расширяет переменную окружения x [user name] diff --git a/langpacks/russian/Untranslated/HwHotKeys.txt b/langpacks/russian/Untranslated/HwHotKeys.txt index cd2fa9acb3..69e0c5f038 100644 --- a/langpacks/russian/Untranslated/HwHotKeys.txt +++ b/langpacks/russian/Untranslated/HwHotKeys.txt @@ -1 +1,2 @@ [Extended flag (1xx), Hardware scan code (x23), KeyName] +[Hardware HotKeys] diff --git a/langpacks/russian/Untranslated/New_GPG.txt b/langpacks/russian/Untranslated/New_GPG.txt index e3c75b6f77..a7017b11eb 100644 --- a/langpacks/russian/Untranslated/New_GPG.txt +++ b/langpacks/russian/Untranslated/New_GPG.txt @@ -64,6 +64,8 @@ [GPG public key file] [There is no public or private key.] [Do you want to toggle encryption for all subcontacts?] +[Turn off GPG encryption] +[Turn on GPG encryption] [Target file exists, do you want to replace it?] [Capability to decrypt file not found on other side.\nRecipient may be unable to decrypt file(s).\nDo you want to encrypt file(s) anyway?] [File transfer warning] diff --git a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp index 6a36f8e31e..dadc8f49b4 100644 --- a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp +++ b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp @@ -131,7 +131,7 @@ int initializeOptions(WPARAM wParam, LPARAM) OptDlgPg.flags = ODPF_BOLDGROUPS | ODPF_TCHAR; OptDlgPg.pszTemplate = MAKEINTRESOURCEA(dlg_options); OptDlgPg.ptszGroup = LPGENT("Customize"); - OptDlgPg.ptszTitle = LPGENT(__PLUGIN_NAME); + OptDlgPg.ptszTitle = LPGENT("Hardware HotKeys"); OptDlgPg.pfnDlgProc = OptDlgProc; OptDlgPg.hLangpack = hLangpack; Options_AddPage(wParam, &OptDlgPg); -- cgit v1.2.3