From 749d19c9caa2ebc569d640b4a12de2a1eb18c3d0 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Mon, 16 Dec 2013 19:32:41 +0000 Subject: - Clist_modern: LPGEN macro added to some old code; - langpacks/english: updated; - langpacks/russian: updated; git-svn-id: http://svn.miranda-ng.org/main/trunk@7254 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- langpacks/english/Plugins/Clist_modern.txt | 8 +++++++- langpacks/russian/Plugins/Clist_modern.txt | 16 ++++++++++++++-- langpacks/russian/Plugins/_Various.txt | 17 ----------------- plugins/Clist_modern/src/modern_clc.cpp | 8 ++++---- plugins/Clist_modern/src/modern_clistevents.cpp | 2 +- plugins/Clist_modern/src/modern_toolbar.cpp | 2 +- plugins/Clist_modern/src/modern_viewmodebar.cpp | 2 +- 7 files changed, 28 insertions(+), 27 deletions(-) diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt index eefac7bcae..4f0d5c8947 100644 --- a/langpacks/english/Plugins/Clist_modern.txt +++ b/langpacks/english/Plugins/Clist_modern.txt @@ -337,6 +337,10 @@ [Avatar Overlay] [Status Overlay] [Contact List smileys] +[List Background] +[Menu Background] +[StatusBar Background] +[Frames TitleBar BackGround] [Do you want contact '%s' to be converted to MetaContact and '%s' be added to it?] [Converting to MetaContact] [Do you want contact '%s' to be converted to MetaContact and '%s' be added to it (remove it from '%s')?] @@ -388,7 +392,6 @@ [General] [List] [Window] -[List Background] [Not focused] [Offline] [Online] @@ -411,6 +414,7 @@ [Behind left edge] [Behind right edge] ;file \plugins\Clist_modern\src\modern_clistevents.cpp +[Event Area Background] [Event Area] [No Events] ;file \plugins\Clist_modern\src\modern_clistmenus.cpp @@ -542,6 +546,7 @@ [Disable sounds] [Minimize] [To view a toolbar in Clist Modern you need the TopToolBar plugin. Click Yes to download it or Cancel to continue] +[ToolBar Background] [Toolbar upgrade] ;file \plugins\Clist_modern\src\modern_viewmodebar.cpp [Ungrouped contacts] @@ -567,4 +572,5 @@ [Setup view modes] [Clear view mode and return to default display] [Reset view mode] +[View Mode Background] [View Modes] diff --git a/langpacks/russian/Plugins/Clist_modern.txt b/langpacks/russian/Plugins/Clist_modern.txt index dc63a69b64..445b7e66ed 100644 --- a/langpacks/russian/Plugins/Clist_modern.txt +++ b/langpacks/russian/Plugins/Clist_modern.txt @@ -661,6 +661,14 @@ Ctrl+Левый клик вкл. фильтр по протоколу, клик Оверлей статуса [Contact List smileys] Список контактов +[List Background] +Фон списка +[Menu Background] +Фон меню +[StatusBar Background] +Фон панели статуса +[Frames TitleBar BackGround] +Фон заголовка фреймов [Do you want contact '%s' to be converted to MetaContact and '%s' be added to it?] Хотите конвертировать '%s' в метаконтакт и добавить '%s' в него? [Converting to MetaContact] @@ -761,8 +769,6 @@ Ctrl+Левый клик вкл. фильтр по протоколу, клик Список [Window] Окно -[List Background] -Фон списка [Not focused] Не в фокусе [Offline] @@ -805,6 +811,8 @@ Ctrl+Левый клик вкл. фильтр по протоколу, клик За левый край [Behind right edge] За правый край +[Event Area Background] +Фон области событий [Event Area] Область событий [No Events] @@ -1025,6 +1033,8 @@ Ctrl+Левый клик вкл. фильтр по протоколу, клик Свернуть [To view a toolbar in Clist Modern you need the TopToolBar plugin. Click Yes to download it or Cancel to continue] Для отображения панели кнопок в Clist Modern необходим плагин TopToolBar. Нажмите "Да", чтобы скачать плагин или "Нет", чтобы продолжить не скачивая +[ToolBar Background] +Фон панели кнопок [Toolbar upgrade] Обновление панели кнопок [Ungrouped contacts] @@ -1073,5 +1083,7 @@ Ctrl+Левый клик вкл. фильтр по протоколу, клик Сбросить режим и перейти в режим по умолчанию [Reset view mode] Сбросить режим +[View Mode Background] +Фон режимов вида [View Modes] Режимы вида diff --git a/langpacks/russian/Plugins/_Various.txt b/langpacks/russian/Plugins/_Various.txt index c1c2b26e09..ed7d40a5ad 100644 --- a/langpacks/russian/Plugins/_Various.txt +++ b/langpacks/russian/Plugins/_Various.txt @@ -2,23 +2,6 @@ ; This file is for lines that jpgen.js doesn't add to english templates but nevertheless must be translated. ;============================================================================================================== ;============================================================================== -; Clist_modern -;============================================================================== -[Event Area Background] -Фон области событий -[View Mode Background] -Фон режимов вида -[Menu Background] -Фон меню -[ToolBar Background] -Фон панели кнопок -[StatusBar Background] -Фон панели статуса -[Frames TitleBar BackGround] -Фон заголовка фреймов -['Hide Offline' means to hide:] -'Скрыть отключённых' - скрыть: -;============================================================================== ; Popup ;============================================================================== [Flat borders] diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index b7ded71b39..586834ad5c 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -138,10 +138,10 @@ static int clcHookModulesLoaded(WPARAM wParam, LPARAM lParam) hSmileyAddOptionsChangedHook = HookEvent(ME_SMILEYADD_OPTIONSCHANGED,clcHookSmileyAddOptionsChanged); } - CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)"List Background/CLC",0); - CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)"Menu Background/Menu",0); - CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)"StatusBar Background/StatusBar",0); - CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)"Frames TitleBar BackGround/FrameTitleBar",0); + CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("List Background")"/CLC"),0); + CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Menu Background")"/Menu"),0); + CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("StatusBar Background")"/StatusBar"),0); + CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Frames TitleBar BackGround")"/FrameTitleBar"),0); HookEvent(ME_BACKGROUNDCONFIG_CHANGED,clcHookBkgndConfigChanged); HookEvent(ME_BACKGROUNDCONFIG_CHANGED,BgStatusBarChange); diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp index 8768318a3d..baf47c4d9c 100644 --- a/plugins/Clist_modern/src/modern_clistevents.cpp +++ b/plugins/Clist_modern/src/modern_clistevents.cpp @@ -402,7 +402,7 @@ static void EventArea_HideShowNotifyFrame() int EventArea_Create(HWND hCluiWnd) { - CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)"Event Area Background/EventArea",0); + CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("Event Area Background")"/EventArea"),0); HookEvent(ME_BACKGROUNDCONFIG_CHANGED,ehhEventAreaBackgroundSettingsChanged); ehhEventAreaBackgroundSettingsChanged(0, 0); diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index b3e6f25b44..3379a3d3b3 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -303,7 +303,7 @@ static int Toolbar_ModuleReloaded(WPARAM wParam, LPARAM lParam) static int Toolbar_ModulesLoaded(WPARAM, LPARAM) { - CallService(MS_BACKGROUNDCONFIG_REGISTER, (WPARAM)"ToolBar Background/ToolBar",0); + CallService(MS_BACKGROUNDCONFIG_REGISTER, (WPARAM)(LPGEN("ToolBar Background")"/ToolBar"),0); HookEvent(ME_DB_CONTACT_SETTINGCHANGED, ehhToolBarSettingsChanged); diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index f2374775e2..cb2bf5bc63 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -1253,7 +1253,7 @@ static int ehhViewModeBackgroundSettingsChanged(WPARAM wParam, LPARAM lParam) void CreateViewModeFrame() { - CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)"View Mode Background/ViewMode",0); + CallService(MS_BACKGROUNDCONFIG_REGISTER,(WPARAM)(LPGEN("View Mode Background")"/ViewMode"),0); HookEvent(ME_BACKGROUNDCONFIG_CHANGED,ehhViewModeBackgroundSettingsChanged); ehhViewModeBackgroundSettingsChanged(0, 0); -- cgit v1.2.3