From 370b9944a0b8cba9e178c34fbe07998cb34f3251 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Mon, 25 Mar 2013 14:12:36 +0000 Subject: - translation fixes (patch from Basil) git-svn-id: http://svn.miranda-ng.org/main/trunk@4187 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AuthState/src/main.cpp | 2 +- plugins/BuddyExpectator/src/BuddyExpectator.cpp | 2 +- plugins/CountryFlags/src/extraimg.cpp | 2 +- plugins/FingerprintNG/src/fingerprint.cpp | 2 +- plugins/MobileState/src/main.cpp | 2 +- plugins/Rate/src/main.cpp | 2 +- plugins/UserInfoEx/src/Flags/svc_flags.cpp | 2 +- plugins/UserInfoEx/src/svc_email.cpp | 2 +- plugins/UserInfoEx/src/svc_gender.cpp | 2 +- plugins/UserInfoEx/src/svc_homepage.cpp | 2 +- plugins/UserInfoEx/src/svc_phone.cpp | 2 +- plugins/UserInfoEx/src/svc_reminder.cpp | 2 +- protocols/IcqOscarJ/src/init.cpp | 2 +- protocols/JabberG/src/jabber.cpp | 4 ++-- protocols/MRA/src/MraProto.cpp | 4 ++-- protocols/Xfire/src/main.cpp | 4 ++-- src/modules/extraicons/DefaultExtraIcons.cpp | 4 ++-- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/plugins/AuthState/src/main.cpp b/plugins/AuthState/src/main.cpp index 16fba6994f..dc7c23cadd 100644 --- a/plugins/AuthState/src/main.cpp +++ b/plugins/AuthState/src/main.cpp @@ -175,7 +175,7 @@ int onModulesLoaded(WPARAM wParam,LPARAM lParam) Icon_Register(g_hInst, "Auth State", iconList, SIZEOF(iconList)); // extra icons - hExtraIcon = ExtraIcon_Register("authstate", "Auth State", "authgrant_icon"); + hExtraIcon = ExtraIcon_Register("authstate", LPGEN("Auth State"), "authgrant_icon"); // Set initial value for all contacts HANDLE hContact = db_find_first(); diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp index fdc2161c2f..d6e425ea36 100644 --- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp @@ -645,7 +645,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded2); if (options.MissYouIcon) - hExtraIcon = ExtraIcon_Register("buddy_exp", "Buddy Expectator", "enabled_icon"); + hExtraIcon = ExtraIcon_Register("buddy_exp", LPGEN("Buddy Expectator"), "enabled_icon"); //////////////////////////////////////////////////////////////////////////// diff --git a/plugins/CountryFlags/src/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp index 94af170dc3..3301c27249 100644 --- a/plugins/CountryFlags/src/extraimg.cpp +++ b/plugins/CountryFlags/src/extraimg.cpp @@ -322,7 +322,7 @@ static int ExtraImgModulesLoaded(WPARAM wParam,LPARAM lParam) CallService("DBEditorpp/RegisterSingleModule",(WPARAM)"Flags",0); /* Extra Image */ - hExtraIcon = ExtraIcon_Register("flags_extra", "Country flag"); + hExtraIcon = ExtraIcon_Register("flags_extra", LPGEN("Country flag")); HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY,ExtraImageApply); /* Status Icon */ diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp index 562fc411e0..b67d2e8b58 100644 --- a/plugins/FingerprintNG/src/fingerprint.cpp +++ b/plugins/FingerprintNG/src/fingerprint.cpp @@ -147,7 +147,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) RegisterIcons(); - hExtraIcon = ExtraIcon_Register("Client","Fingerprint","client_Miranda_Unknown", + hExtraIcon = ExtraIcon_Register("Client",LPGEN("Fingerprint"),"client_Miranda_Unknown", OnExtraIconListRebuild,OnExtraImageApply,OnExtraIconClick); return 0; diff --git a/plugins/MobileState/src/main.cpp b/plugins/MobileState/src/main.cpp index bb2d388704..66d41b83d6 100644 --- a/plugins/MobileState/src/main.cpp +++ b/plugins/MobileState/src/main.cpp @@ -97,7 +97,7 @@ int onModulesLoaded(WPARAM wParam,LPARAM lParam) Icon_Register(g_hInst, "Mobile State", &icon, 1); // extra icons - hExtraIcon = ExtraIcon_Register("mobilestate", "Mobile State", "mobile_icon"); + hExtraIcon = ExtraIcon_Register("mobilestate", LPGEN("Mobile State"), "mobile_icon"); // Set initial value for all contacts HANDLE hContact = db_find_first(); diff --git a/plugins/Rate/src/main.cpp b/plugins/Rate/src/main.cpp index 364a10214f..ea9fc78763 100644 --- a/plugins/Rate/src/main.cpp +++ b/plugins/Rate/src/main.cpp @@ -103,7 +103,7 @@ int onModulesLoaded(WPARAM wParam,LPARAM lParam) Icon_Register(g_hInst, LPGEN("Contact Rate"), iconList, SIZEOF(iconList)); // Extra icon support - hExtraIcon = ExtraIcon_Register("contact_rate", "Contact rate", "rate_high"); + hExtraIcon = ExtraIcon_Register("contact_rate", LPGEN("Contact rate"), "rate_high"); // Set initial value for all contacts HANDLE hContact = db_find_first(); diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp index 559141a0c0..6056d3d9be 100644 --- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp +++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp @@ -307,7 +307,7 @@ VOID SvcFlagsEnableExtraIcons(BYTE bColumn, BOOLEAN bUpdateDB) char szId[20]; mir_snprintf(szId, SIZEOF(szId), (langid==0xFFFF)?"%s_0x%X":"%s_%i","flags",langid); /* buffer safe */ - hExtraIconSvc = ExtraIcon_Register("Flags", "Flags (uinfoex)", szId); + hExtraIconSvc = ExtraIcon_Register("Flags", LPGEN("Flags (uinfoex)"), szId); if (hExtraIconSvc) HookEvent(ME_DB_CONTACT_SETTINGCHANGED, OnExtraIconSvcChanged); } diff --git a/plugins/UserInfoEx/src/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp index e3719db360..0b70235656 100644 --- a/plugins/UserInfoEx/src/svc_email.cpp +++ b/plugins/UserInfoEx/src/svc_email.cpp @@ -266,7 +266,7 @@ VOID SvcEMailEnableExtraIcons(BOOLEAN bEnable, BOOLEAN bUpdateDB) hApplyIconHook = HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY, OnCListApplyIcons); if (ghExtraIconSvc == INVALID_HANDLE_VALUE) - ghExtraIconSvc = ExtraIcon_Register("email", "E-mail (uinfoex)", ICO_BTN_EMAIL); + ghExtraIconSvc = ExtraIcon_Register("email", LPGEN("E-mail (uinfoex)"), ICO_BTN_EMAIL); } else { // E-mail uncheckt if (hChangedHook) { diff --git a/plugins/UserInfoEx/src/svc_gender.cpp b/plugins/UserInfoEx/src/svc_gender.cpp index 8394d2673b..48e618e7ad 100644 --- a/plugins/UserInfoEx/src/svc_gender.cpp +++ b/plugins/UserInfoEx/src/svc_gender.cpp @@ -134,7 +134,7 @@ VOID SvcGenderEnableExtraIcons(BYTE bColumn, BOOLEAN bUpdateDB) if (bEnable) { // Gender checkt or dropdown select if (ghExtraIconSvc == INVALID_HANDLE_VALUE) - ghExtraIconSvc = ExtraIcon_Register("gender", "Gender (uinfoex)", ICO_COMMON_MALE); + ghExtraIconSvc = ExtraIcon_Register("gender", LPGEN("Gender (uinfoex)"), ICO_COMMON_MALE); // hook events if (hChangedHook == NULL) diff --git a/plugins/UserInfoEx/src/svc_homepage.cpp b/plugins/UserInfoEx/src/svc_homepage.cpp index 62e81380ce..ad2c1e691c 100644 --- a/plugins/UserInfoEx/src/svc_homepage.cpp +++ b/plugins/UserInfoEx/src/svc_homepage.cpp @@ -215,7 +215,7 @@ VOID SvcHomepageEnableExtraIcons(BOOLEAN bEnable, BOOLEAN bUpdateDB) hApplyIconHook = HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY, (MIRANDAHOOK)OnCListApplyIcons); if (ghExtraIconSvc == INVALID_HANDLE_VALUE) - ghExtraIconSvc = ExtraIcon_Register("homepage", "Homepage (uinfoex)", ICO_BTN_GOTO); + ghExtraIconSvc = ExtraIcon_Register("homepage", LPGEN("Homepage (uinfoex)"), ICO_BTN_GOTO); } else { if (hChangedHook) { diff --git a/plugins/UserInfoEx/src/svc_phone.cpp b/plugins/UserInfoEx/src/svc_phone.cpp index afa9796fcd..d071d1b049 100644 --- a/plugins/UserInfoEx/src/svc_phone.cpp +++ b/plugins/UserInfoEx/src/svc_phone.cpp @@ -166,7 +166,7 @@ VOID SvcPhoneEnableExtraIcons(BOOLEAN bEnable, BOOLEAN bUpdateDB) hApplyIconHook = HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY, (MIRANDAHOOK)OnCListApplyIcons); if (ghExtraIconSvc == INVALID_HANDLE_VALUE) - ghExtraIconSvc = ExtraIcon_Register("sms", "(uinfoex)", ICO_BTN_CELLULAR); + ghExtraIconSvc = ExtraIcon_Register("sms", LPGEN("(uinfoex)"), ICO_BTN_CELLULAR); } else { if (hChangedHook) { diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp index bbe32ac5b5..09c6769d83 100644 --- a/plugins/UserInfoEx/src/svc_reminder.cpp +++ b/plugins/UserInfoEx/src/svc_reminder.cpp @@ -945,7 +945,7 @@ VOID SvcReminderEnable(BOOLEAN bEnable) if (bEnable) // Reminder is on { if (ExtraIcon == INVALID_HANDLE_VALUE) - ExtraIcon = ExtraIcon_Register("Reminder", "Reminder (uinfoex)", ICO_COMMON_ANNIVERSARY); + ExtraIcon = ExtraIcon_Register("Reminder", LPGEN("Reminder (uinfoex)"), ICO_COMMON_ANNIVERSARY); // init hooks if (!ghCListIA) diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp index a92d3faba1..d943b29ee8 100644 --- a/protocols/IcqOscarJ/src/init.cpp +++ b/protocols/IcqOscarJ/src/init.cpp @@ -128,7 +128,7 @@ extern "C" int __declspec(dllexport) Load(void) HookEvent(ME_SYSTEM_MODULELOAD, ModuleLoad); HookEvent(ME_SYSTEM_MODULEUNLOAD, ModuleLoad); - hExtraXStatus = ExtraIcon_Register("xstatus", "ICQ XStatus", "icq_xstatus13"); + hExtraXStatus = ExtraIcon_Register("xstatus", LPGEN("ICQ XStatus"), "icq_xstatus13"); g_MenuInit(); return 0; diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp index 4f92a49a2c..6b486a53c8 100644 --- a/protocols/JabberG/src/jabber.cpp +++ b/protocols/JabberG/src/jabber.cpp @@ -200,8 +200,8 @@ static int OnModulesLoaded(WPARAM, LPARAM) ColourRegister(&colourid); // Init extra icons - hExtraActivity = ExtraIcon_Register("activity", "Jabber Activity", "jabber_dancing"); - hExtraMood = ExtraIcon_Register("mood", "Jabber Mood", "jabber_contemplative"); + hExtraActivity = ExtraIcon_Register("activity", LPGEN("Jabber Activity"), "jabber_dancing"); + hExtraMood = ExtraIcon_Register("mood", LPGEN("Jabber Mood"), "jabber_contemplative"); return 0; } diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp index 6c7066bc3f..b1294148b5 100644 --- a/protocols/MRA/src/MraProto.cpp +++ b/protocols/MRA/src/MraProto.cpp @@ -60,8 +60,8 @@ CMraProto::CMraProto(const char* _module, const TCHAR* _displayName) : HookEvent(ME_CLIST_PREBUILDSTATUSMENU, &CMraProto::MraRebuildStatusMenu); - hExtraXstatusIcon = ExtraIcon_Register("MRAXstatus", "Mail.ru Xstatus", "mra_xstatus25"); - hExtraInfo = ExtraIcon_Register("MRAStatus", "Mail.ru extra info", "mra_xstatus49"); + hExtraXstatusIcon = ExtraIcon_Register("MRAXstatus", LPGEN("Mail.ru Xstatus"), "mra_xstatus25"); + hExtraInfo = ExtraIcon_Register("MRAStatus", LPGEN("Mail.ru extra info"), "mra_xstatus49"); bHideXStatusUI = FALSE; m_iXStatus = mraGetByte(NULL, DBSETTING_XSTATUSID, MRA_MIR_XSTATUS_NONE); diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index d15a51e169..4df706619d 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -1358,8 +1358,8 @@ extern "C" __declspec(dllexport) int Load(void) Icon_Register(hinstance, LPGENT("Protocols/XFire"), &icon, 1); - hExtraIcon1 = ExtraIcon_Register("xfire_game", "XFire game icon", "", ExtraListRebuild, ExtraImageApply); - hExtraIcon2 = ExtraIcon_Register("xfire_voice", "XFire voice icon", "", ExtraListRebuild, ExtraImageApply); + hExtraIcon1 = ExtraIcon_Register("xfire_game", LPGEN("XFire game icon"), "", ExtraListRebuild, ExtraImageApply); + hExtraIcon2 = ExtraIcon_Register("xfire_voice", LPGEN("XFire voice icon"), "", ExtraListRebuild, ExtraImageApply); return 0; } diff --git a/src/modules/extraicons/DefaultExtraIcons.cpp b/src/modules/extraicons/DefaultExtraIcons.cpp index d428be1c74..9abf143e46 100644 --- a/src/modules/extraicons/DefaultExtraIcons.cpp +++ b/src/modules/extraicons/DefaultExtraIcons.cpp @@ -1,4 +1,4 @@ -/* +J/* Copyright (C) 2009 Ricardo Pescuma Domenecci Copyright (C) 2012-13 Miranda NG Project @@ -327,7 +327,7 @@ static int ProtocolOnClick(WPARAM wParam, LPARAM lParam, LPARAM param) void DefaultExtraIcons_Load() { - hExtraChat = ExtraIcon_Register("chat_activity", "Chat activity", "ChatActivity"); + hExtraChat = ExtraIcon_Register("chat_activity", LPGEN("Chat activity"), "ChatActivity"); hExtraVisibility = ExtraIcon_Register("visibility", "Visibility", LoadSkinnedIconName(SKINICON_OTHER_VISIBLE_ALL)); hExtraGender = ExtraIcon_Register("gender", "Gender", "gender_male"); hExtraProto = ExtraIcon_Register("protocol", "Account", LoadSkinnedIconName(SKINICON_OTHER_ACCMGR), -- cgit v1.2.3