From 6c090511c4e9d595f206c36ba1a7fe2467108a34 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Tue, 5 Aug 2014 09:50:37 +0000 Subject: NSSN cosmetics - langpacks/english: update; - langpacks/russian: update; git-svn-id: http://svn.miranda-ng.org/main/trunk@10062 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/Plugins/NewXstatusNotify.txt | 6 +++--- langpacks/russian/Plugins/NewXstatusNotify.txt | 6 +++--- langpacks/russian/Untranslated/NewXstatusNotify.txt | 2 +- plugins/NewXstatusNotify/src/options.cpp | 12 ++++++------ plugins/NewXstatusNotify/src/xstatus.cpp | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt index d53bd1aa97..93825961ab 100644 --- a/langpacks/english/Plugins/NewXstatusNotify.txt +++ b/langpacks/english/Plugins/NewXstatusNotify.txt @@ -194,9 +194,9 @@ [Do you want to reset all templates to default?] [Reset templates] [Account] -[Logging] +[Satatus logging] +[XStatus logging] [Filtering] -[Message log] ;file \plugins\NewXstatusNotify\src\popup.h [(was %s)] [Open message window] @@ -211,7 +211,7 @@ ;file \plugins\NewXstatusNotify\src\xstatus.cpp [Mood] [Activity] -[Xstatus] +[XStatus] [] [%s changed %s] ;file \plugins\NewXstatusNotify\src\xstatus.h diff --git a/langpacks/russian/Plugins/NewXstatusNotify.txt b/langpacks/russian/Plugins/NewXstatusNotify.txt index e17155a6c5..ed552979a0 100644 --- a/langpacks/russian/Plugins/NewXstatusNotify.txt +++ b/langpacks/russian/Plugins/NewXstatusNotify.txt @@ -373,10 +373,10 @@ xСтатус изменен Сбросить шаблоны [Account] Учётная запись +[XStatus logging] +Журналирование хСтатусов [Filtering] Фильтрация -[Message log] -Журнал [(was %s)] (был(а) %s) [Open message window] @@ -399,7 +399,7 @@ xСтатус изменен Настроение [Activity] Занятие -[Xstatus] +[XStatus] хСтатус [] <без заголовка> diff --git a/langpacks/russian/Untranslated/NewXstatusNotify.txt b/langpacks/russian/Untranslated/NewXstatusNotify.txt index f4dbaec873..2d343ca0f8 100644 --- a/langpacks/russian/Untranslated/NewXstatusNotify.txt +++ b/langpacks/russian/Untranslated/NewXstatusNotify.txt @@ -1 +1 @@ -[Logging] +[Satatus logging] diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp index dc1b9be4cd..84a0a057d1 100644 --- a/plugins/NewXstatusNotify/src/options.cpp +++ b/plugins/NewXstatusNotify/src/options.cpp @@ -1232,21 +1232,21 @@ int OptionsInitialize(WPARAM wParam, LPARAM) odp.pfnDlgProc = DlgProcGeneralOpts; Options_AddPage(wParam, &odp); - odp.pszTab = LPGEN("Logging"); + odp.pszTab = LPGEN("Satatus logging"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_LOG); odp.pfnDlgProc = DlgProcLogOpts; Options_AddPage(wParam, &odp); + + odp.pszTab = LPGEN("XStatus logging"); + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_XLOG); + odp.pfnDlgProc = DlgProcXLogOpts; + Options_AddPage(wParam, &odp); odp.pszTab = LPGEN("Filtering"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FILTERS); odp.pfnDlgProc = DlgProcFiltering; Options_AddPage(wParam, &odp); - odp.pszTab = LPGEN("Message log"); - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_XLOG); - odp.pfnDlgProc = DlgProcXLogOpts; - Options_AddPage(wParam, &odp); - if (ServiceExists(MS_POPUP_ADDPOPUPT)) { odp.pszTitle = LPGEN("Status Notify"); odp.pszGroup = LPGEN("Popups"); diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp index b71c909fd8..99a941f5c9 100644 --- a/plugins/NewXstatusNotify/src/xstatus.cpp +++ b/plugins/NewXstatusNotify/src/xstatus.cpp @@ -84,7 +84,7 @@ TCHAR *GetStatusTypeAsString(int type, TCHAR *buff) case TYPE_JABBER_ACTIVITY: _tcscpy(buff, TranslateT("Activity")); break; case TYPE_ICQ_XSTATUS: - _tcscpy(buff, TranslateT("Xstatus")); break; + _tcscpy(buff, TranslateT("XStatus")); break; default: _tcscpy(buff, TranslateT("")); } -- cgit v1.2.3