From 7b2fb827ca6b037a595c4dbac2503d18b4bc8048 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Tue, 19 Mar 2013 08:29:12 +0000 Subject: - translation fixes (patch from Basil) git-svn-id: http://svn.miranda-ng.org/main/trunk@4106 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/FavContacts/src/main.cpp | 38 ++++++++++++++--------------- plugins/FileAsMessage/src/main.cpp | 10 ++++---- plugins/TooltipNotify/src/TooltipNotify.cpp | 12 ++++----- protocols/JabberG/src/jabber.cpp | 4 +-- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp index 394a167166..3ce457fc7b 100644 --- a/plugins/FavContacts/src/main.cpp +++ b/plugins/FavContacts/src/main.cpp @@ -111,30 +111,30 @@ int ProcessReloadFonts(WPARAM wParam, LPARAM lParam) LOGFONT lf = {0}; FontIDT fontid = {0}; fontid.cbSize = sizeof(fontid); - lstrcpy(fontid.group, _T("Favourite Contacts")); + lstrcpy(fontid.group, LPGENT("Favourite Contacts")); - lstrcpy(fontid.name, _T("Contact name")); + lstrcpy(fontid.name, LPGENT("Contact name")); g_Options.clLine1 = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)&lf); g_Options.hfntName = CreateFontIndirect(&lf); - lstrcpy(fontid.name, _T("Second line")); + lstrcpy(fontid.name, LPGENT("Second line")); g_Options.clLine2 = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)&lf); g_Options.hfntSecond = CreateFontIndirect(&lf); - lstrcpy(fontid.name, _T("Selected contact name (color)")); + lstrcpy(fontid.name, LPGENT("Selected contact name (color)")); g_Options.clLine1Sel = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)&lf); - lstrcpy(fontid.name, _T("Selected second line (color)")); + lstrcpy(fontid.name, LPGENT("Selected second line (color)")); g_Options.clLine2Sel = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)&lf); ColourIDT colourid = {0}; colourid.cbSize = sizeof(colourid); - lstrcpy(colourid.group, _T("Favourite Contacts")); + lstrcpy(colourid.group, LPGENT("Favourite Contacts")); - lstrcpy(colourid.name, _T("Background")); + lstrcpy(colourid.name, LPGENT("Background")); g_Options.clBack = CallService(MS_COLOUR_GETT, (WPARAM)&colourid, (LPARAM)&lf); - lstrcpy(colourid.name, _T("Selected background")); + lstrcpy(colourid.name, LPGENT("Selected background")); g_Options.clBackSel = CallService(MS_COLOUR_GETT, (WPARAM)&colourid, (LPARAM)&lf); return 0; @@ -161,38 +161,38 @@ int ProcessModulesLoaded(WPARAM wParam, LPARAM lParam) FontIDT fontid = {0}; fontid.cbSize = sizeof(fontid); - lstrcpy(fontid.group, _T("Favourite Contacts")); + lstrcpy(fontid.group, LPGENT("Favourite Contacts")); lstrcpyA(fontid.dbSettingsGroup, "FavContacts"); - lstrcpy(fontid.backgroundGroup, _T("Favourite Contacts")); + lstrcpy(fontid.backgroundGroup, LPGENT("Favourite Contacts")); fontid.flags = FIDF_DEFAULTVALID; fontid.deffontsettings.charset = DEFAULT_CHARSET; fontid.deffontsettings.size = -11; lstrcpy(fontid.deffontsettings.szFace, _T("MS Shell Dlg")); fontid.deffontsettings.style = 0; - lstrcpy(fontid.backgroundName, _T("Background")); + lstrcpy(fontid.backgroundName, LPGENT("Background")); - lstrcpy(fontid.name, _T("Contact name")); + lstrcpy(fontid.name, LPGENT("Contact name")); lstrcpyA(fontid.prefix, "fntName"); fontid.deffontsettings.colour = GetSysColor(COLOR_MENUTEXT); fontid.deffontsettings.style = DBFONTF_BOLD; FontRegisterT(&fontid); - lstrcpy(fontid.name, _T("Second line")); + lstrcpy(fontid.name, LPGENT("Second line")); lstrcpyA(fontid.prefix, "fntSecond"); fontid.deffontsettings.colour = sttShadeColor(GetSysColor(COLOR_MENUTEXT), GetSysColor(COLOR_MENU)); fontid.deffontsettings.style = 0; FontRegisterT(&fontid); - lstrcpy(fontid.backgroundName, _T("Selected background")); + lstrcpy(fontid.backgroundName, LPGENT("Selected background")); - lstrcpy(fontid.name, _T("Selected contact name (color)")); + lstrcpy(fontid.name, LPGENT("Selected contact name (color)")); lstrcpyA(fontid.prefix, "fntNameSel"); fontid.deffontsettings.colour = GetSysColor(COLOR_HIGHLIGHTTEXT); fontid.deffontsettings.style = DBFONTF_BOLD; FontRegisterT(&fontid); - lstrcpy(fontid.name, _T("Selected second line (color)")); + lstrcpy(fontid.name, LPGENT("Selected second line (color)")); lstrcpyA(fontid.prefix, "fntSecondSel"); fontid.deffontsettings.colour = sttShadeColor(GetSysColor(COLOR_HIGHLIGHTTEXT), GetSysColor(COLOR_HIGHLIGHT)); fontid.deffontsettings.style = 0; @@ -202,15 +202,15 @@ int ProcessModulesLoaded(WPARAM wParam, LPARAM lParam) ColourIDT colourid = {0}; colourid.cbSize = sizeof(colourid); - lstrcpy(colourid.group, _T("Favourite Contacts")); + lstrcpy(colourid.group, LPGENT("Favourite Contacts")); lstrcpyA(colourid.dbSettingsGroup, "FavContacts"); - lstrcpy(colourid.name, _T("Background")); + lstrcpy(colourid.name, LPGENT("Background")); lstrcpyA(colourid.setting, "BackColour"); colourid.defcolour = GetSysColor(COLOR_MENU); ColourRegisterT(&colourid); - lstrcpy(colourid.name, _T("Selected background")); + lstrcpy(colourid.name, LPGENT("Selected background")); lstrcpyA(colourid.setting, "SelectedColour"); colourid.defcolour = GetSysColor(COLOR_HIGHLIGHT); ColourRegisterT(&colourid); diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp index 3c6d397aef..a7e7b64350 100644 --- a/plugins/FileAsMessage/src/main.cpp +++ b/plugins/FileAsMessage/src/main.cpp @@ -27,11 +27,11 @@ HICON hIcons[5]; static IconItem iconList[] = { - { "Play", "FePlay", IDI_PLAY }, - { "Pause", "FePause", IDI_PAUSE }, - { "Revive", "FeRefresh", IDI_REFRESH }, - { "Stop", "FeStop", IDI_STOP }, - { "Main", "FeMain", IDI_SMALLICON }, + { LPGEN("Play"), "FePlay", IDI_PLAY }, + { LPGEN("Pause"), "FePause", IDI_PAUSE }, + { LPGEN("Revive"), "FeRefresh", IDI_REFRESH }, + { LPGEN("Stop"), "FeStop", IDI_STOP }, + { LPGEN("Main"), "FeMain", IDI_SMALLICON }, }; int iIconId[5] = {3,2,4,1,0}; diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp index c24034ad00..705ad870d1 100644 --- a/plugins/TooltipNotify/src/TooltipNotify.cpp +++ b/plugins/TooltipNotify/src/TooltipNotify.cpp @@ -30,12 +30,12 @@ static const int ID_TTNTF_STATUS_TYPING = ID_STATUS_INVISIBLE+10; static const int ID_TTNTF_STATUS_IDLE = ID_STATUS_INVISIBLE+11; static const int ID_TTNTF_STATUS_NOT_IDLE = ID_STATUS_INVISIBLE+12; -#define FONTSERV_GROUP _T("Tooltip Notify") -#define FONTSERV_ONLINE _T("Online") -#define FONTSERV_OFFLINE _T("Offline") -#define FONTSERV_OTHER _T("Other Status") -#define FONTSERV_TYPING _T("Typing") -#define FONTSERV_IDLE _T("Idle") +#define FONTSERV_GROUP LPGENT("Tooltip Notify") +#define FONTSERV_ONLINE LPGENT("Online") +#define FONTSERV_OFFLINE LPGENT("Offline") +#define FONTSERV_OTHER LPGENT("Other Status") +#define FONTSERV_TYPING LPGENT("Typing") +#define FONTSERV_IDLE LPGENT("Idle") struct FontEntry { diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp index dff3e0c5a0..4f92a49a2c 100644 --- a/protocols/JabberG/src/jabber.cpp +++ b/protocols/JabberG/src/jabber.cpp @@ -179,12 +179,12 @@ static int OnModulesLoaded(WPARAM, LPARAM) lstrcpyA(fontid.deffontsettings.szFace, "MS Shell Dlg"); fontid.deffontsettings.style = 0; - strcpy(fontid.name, "Frame title"); + strcpy(fontid.name, LPGEN("Frame title")); strcpy(fontid.prefix, "fntFrameTitle"); fontid.deffontsettings.style = DBFONTF_BOLD; FontRegister(&fontid); - strcpy(fontid.name, "Frame text"); + strcpy(fontid.name, LPGEN("Frame text")); strcpy(fontid.prefix, "fntFrameClock"); fontid.deffontsettings.style = 0; FontRegister(&fontid); -- cgit v1.2.3