From d1534023fd7070dc07e5bfc93521049687803271 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 16 Feb 2013 12:49:44 +0000 Subject: - translation fixes (patch from person) git-svn-id: http://svn.miranda-ng.org/main/trunk@3617 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Alarms/src/alarm_win.cpp | 12 +- plugins/AutoRun/src/autorun.h | 2 +- plugins/AutoRun/src/main.cpp | 2 +- plugins/BASS_interface/src/Bass_interface.h | 2 +- plugins/BossKeyPlus/src/BossKeyTriggers.cpp | 2 +- plugins/CSList/src/cslist.h | 2 +- plugins/ChangeKeyboardLayout/src/commonheaders.h | 2 +- plugins/ContactsPlus/src/receive.cpp | 8 +- plugins/ContactsPlus/src/send.cpp | 8 +- plugins/ContactsPlus/src/utils.cpp | 2 +- plugins/ExternalAPI/m_popup2.h | 4 +- plugins/FileAsMessage/src/main.h | 6 +- plugins/IEView/src/MUCCHTMLBuilder.cpp | 6 +- plugins/MetaContacts/src/addto.cpp | 4 +- plugins/MetaContacts/src/meta_utils.cpp | 4 +- plugins/MetaContacts/src/metacontacts.h | 2 +- plugins/NewEventNotify/src/neweventnotify.h | 28 ++-- plugins/NewXstatusNotify/src/indsnd.h | 2 +- plugins/NewXstatusNotify/src/xstatus.h | 2 +- plugins/NotesAndReminders/src/globals.h | 2 +- plugins/NotifyAnything/src/common.h | 2 +- plugins/RecentContacts/src/RecentContacts.cpp | 2 +- plugins/RecentContacts/src/RecentContacts.h | 2 +- plugins/SecureIM/src/language.cpp | 156 +++++++++++------------ plugins/StopSpamPlus/src/headers.h | 2 +- plugins/YAMN/src/browser/badconnect.cpp | 4 +- plugins/YAMN/src/browser/mailbrowser.cpp | 2 +- 27 files changed, 136 insertions(+), 136 deletions(-) (limited to 'plugins') diff --git a/plugins/Alarms/src/alarm_win.cpp b/plugins/Alarms/src/alarm_win.cpp index af93717105..8b913d3d00 100644 --- a/plugins/Alarms/src/alarm_win.cpp +++ b/plugins/Alarms/src/alarm_win.cpp @@ -290,12 +290,12 @@ INT_PTR CALLBACK DlgProcAlarm(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar mmi.cch = ( UINT )_tcslen(mmi.dwTypeData); \ InsertMenuItem(hMenu, mmi.wID, FALSE, &mmi); - AddItem("5 mins"); - AddItem("15 mins"); - AddItem("30 mins"); - AddItem("1 hour"); - AddItem("1 day"); - AddItem("1 week"); + AddItem(LPGEN("5 mins")); + AddItem(LPGEN("15 mins")); + AddItem(LPGEN("30 mins")); + AddItem(LPGEN("1 hour")); + AddItem(LPGEN("1 day")); + AddItem(LPGEN("1 week")); TPMPARAMS tpmp = {0}; tpmp.cbSize = sizeof(tpmp); diff --git a/plugins/AutoRun/src/autorun.h b/plugins/AutoRun/src/autorun.h index c6e9a9d724..31fb3c9065 100644 --- a/plugins/AutoRun/src/autorun.h +++ b/plugins/AutoRun/src/autorun.h @@ -12,6 +12,6 @@ #include "Version.h" #define SUB_KEY _T("Software\\Microsoft\\Windows\\CurrentVersion\\Run") -#define ModuleName "Autorun" +#define ModuleName LPGEN("Autorun") HKEY ROOT_KEY = HKEY_CURRENT_USER; diff --git a/plugins/AutoRun/src/main.cpp b/plugins/AutoRun/src/main.cpp index 7794fe0f3f..f33a164dd0 100644 --- a/plugins/AutoRun/src/main.cpp +++ b/plugins/AutoRun/src/main.cpp @@ -106,7 +106,7 @@ static int AutorunOptInitialise(WPARAM wParam,LPARAM lParam) odp.position = 100100000; odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_AUTORUN); - odp.pszTitle = LPGEN(ModuleName); + odp.pszTitle = ModuleName; odp.pszGroup = LPGEN("Services"); odp.pfnDlgProc = DlgProcAutorunOpts; odp.flags = ODPF_BOLDGROUPS; diff --git a/plugins/BASS_interface/src/Bass_interface.h b/plugins/BASS_interface/src/Bass_interface.h index d33ca22ab4..a350f2bb57 100644 --- a/plugins/BASS_interface/src/Bass_interface.h +++ b/plugins/BASS_interface/src/Bass_interface.h @@ -33,7 +33,7 @@ Copyright (C) 2010, 2011 tico-tico #define LOADBASSFUNCTION(f) (*((void**)&f)=(void*)GetProcAddress(hBass,#f)) -#define ModuleName "Bass Interface" +#define ModuleName LPGEN("Bass Interface") #define OPT_VOLUME "Volume" #define OPT_BASSPATH "PathToDll" diff --git a/plugins/BossKeyPlus/src/BossKeyTriggers.cpp b/plugins/BossKeyPlus/src/BossKeyTriggers.cpp index a16a0f05b4..bd1f39a7bd 100644 --- a/plugins/BossKeyPlus/src/BossKeyTriggers.cpp +++ b/plugins/BossKeyPlus/src/BossKeyTriggers.cpp @@ -117,7 +117,7 @@ int RegisterTrigger() { ZeroMemory(&tr, sizeof(TRIGGERREGISTER)); tr.cbSize = sizeof(TRIGGERREGISTER); tr.dFlags = DF_TCHAR; - tr.pszName = Translate(TRIGGERNAME); + tr.pszName = TRIGGERNAME; tr.hInstance = g_hInstance; tr.pfnDlgProc = DlgProcOptsBossKeyTrigger; tr.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TRIGGER); diff --git a/plugins/CSList/src/cslist.h b/plugins/CSList/src/cslist.h index f26a2c608c..a8324f1c1f 100644 --- a/plugins/CSList/src/cslist.h +++ b/plugins/CSList/src/cslist.h @@ -80,7 +80,7 @@ #include "resource.h" #include "version.h" -#define MODULENAME "Custom Status List" +#define MODULENAME LPGEN("Custom Status List") // ====[ LIMITS ]============================================================= diff --git a/plugins/ChangeKeyboardLayout/src/commonheaders.h b/plugins/ChangeKeyboardLayout/src/commonheaders.h index 3e148b9278..03d5f6cf7d 100644 --- a/plugins/ChangeKeyboardLayout/src/commonheaders.h +++ b/plugins/ChangeKeyboardLayout/src/commonheaders.h @@ -31,7 +31,7 @@ #include "version.h" #define MaxTextSize 64000 -#define ModuleName "ChangeKeyboardLayout" +#define ModuleName LPGEN("ChangeKeyboardLayout") // History++ API #define MS_HPP_EG_WINDOW "History++/ExtGrid/NewWindow" diff --git a/plugins/ContactsPlus/src/receive.cpp b/plugins/ContactsPlus/src/receive.cpp index bd963013ee..5e9e80c39f 100644 --- a/plugins/ContactsPlus/src/receive.cpp +++ b/plugins/ContactsPlus/src/receive.cpp @@ -251,10 +251,10 @@ INT_PTR CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara } } // new dlg init - wndData->hIcons[0] = InitMButton(hwndDlg, IDC_ADD, MAKEINTRESOURCEA(IDI_ADDCONTACT), "Add Contact Permanently to List"); - wndData->hIcons[1] = InitMButton(hwndDlg, IDC_DETAILS, MAKEINTRESOURCEA(IDI_USERDETAILS), "View User's Details"); - wndData->hIcons[2] = InitMButton(hwndDlg, IDC_HISTORY, MAKEINTRESOURCEA(IDI_HISTORY), "View User's History"); - wndData->hIcons[3] = InitMButton(hwndDlg, IDC_USERMENU, MAKEINTRESOURCEA(IDI_DOWNARROW), "User Menu"); + wndData->hIcons[0] = InitMButton(hwndDlg, IDC_ADD, MAKEINTRESOURCEA(IDI_ADDCONTACT), Translate("Add Contact Permanently to List")); + wndData->hIcons[1] = InitMButton(hwndDlg, IDC_DETAILS, MAKEINTRESOURCEA(IDI_USERDETAILS), Translate("View User's Details")); + wndData->hIcons[2] = InitMButton(hwndDlg, IDC_HISTORY, MAKEINTRESOURCEA(IDI_HISTORY), Translate("View User's History")); + wndData->hIcons[3] = InitMButton(hwndDlg, IDC_USERMENU, MAKEINTRESOURCEA(IDI_DOWNARROW), Translate("User Menu")); SendMessageT(hwndDlg,DM_UPDATETITLE,0,0); // new dialog init done diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp index aa1099a68b..40bd74c993 100644 --- a/plugins/ContactsPlus/src/send.cpp +++ b/plugins/ContactsPlus/src/send.cpp @@ -267,10 +267,10 @@ INT_PTR CALLBACK SendDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar wndData = new TSendContactsData((HANDLE)lParam); SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG)wndData); // new dlg init - wndData->hIcons[0] = InitMButton(hwndDlg, IDC_ADD, MAKEINTRESOURCEA(IDI_ADDCONTACT), "Add Contact Permanently to List"); - wndData->hIcons[1] = InitMButton(hwndDlg, IDC_DETAILS, MAKEINTRESOURCEA(IDI_USERDETAILS), "View User's Details"); - wndData->hIcons[2] = InitMButton(hwndDlg, IDC_HISTORY, MAKEINTRESOURCEA(IDI_HISTORY), "View User's History"); - wndData->hIcons[3] = InitMButton(hwndDlg, IDC_USERMENU, MAKEINTRESOURCEA(IDI_DOWNARROW), "User Menu"); + wndData->hIcons[0] = InitMButton(hwndDlg, IDC_ADD, MAKEINTRESOURCEA(IDI_ADDCONTACT), Translate("Add Contact Permanently to List")); + wndData->hIcons[1] = InitMButton(hwndDlg, IDC_DETAILS, MAKEINTRESOURCEA(IDI_USERDETAILS), Translate("View User's Details")); + wndData->hIcons[2] = InitMButton(hwndDlg, IDC_HISTORY, MAKEINTRESOURCEA(IDI_HISTORY), Translate("View User's History")); + wndData->hIcons[3] = InitMButton(hwndDlg, IDC_USERMENU, MAKEINTRESOURCEA(IDI_DOWNARROW), Translate("User Menu")); SendMessageT(hwndDlg,DM_UPDATETITLE,0,0); // new dialog init done diff --git a/plugins/ContactsPlus/src/utils.cpp b/plugins/ContactsPlus/src/utils.cpp index 2fc25c280e..5ff85344b8 100644 --- a/plugins/ContactsPlus/src/utils.cpp +++ b/plugins/ContactsPlus/src/utils.cpp @@ -229,7 +229,7 @@ HICON InitMButton(HWND hDlg, int idButton, LPCSTR szIcon, char* szTip) SendMessageT(hButton, BM_SETIMAGE, IMAGE_ICON, (LPARAM)hIcon); SendMessageT(hButton, BUTTONSETASFLATBTN, TRUE, 0); - SendMessageT(hButton, BUTTONADDTOOLTIP, (WPARAM)Translate(szTip), 0); + SendMessageT(hButton, BUTTONADDTOOLTIP, (WPARAM)szTip, 0); return hIcon; } diff --git a/plugins/ExternalAPI/m_popup2.h b/plugins/ExternalAPI/m_popup2.h index d88607a155..85e9afc1d0 100644 --- a/plugins/ExternalAPI/m_popup2.h +++ b/plugins/ExternalAPI/m_popup2.h @@ -305,8 +305,8 @@ Returns: handle of registered notification or sero on failure #define PNAF_CALLBACK 0x01 -#define POPUP_ACTION_NOTHING "Do nothing" -#define POPUP_ACTION_DISMISS "Dismiss popup" +#define POPUP_ACTION_NOTHING LPGEN("Do nothing") +#define POPUP_ACTION_DISMISS LPGEN("Dismiss popup") typedef struct { diff --git a/plugins/FileAsMessage/src/main.h b/plugins/FileAsMessage/src/main.h index 03b2e47f63..0962966a70 100644 --- a/plugins/FileAsMessage/src/main.h +++ b/plugins/FileAsMessage/src/main.h @@ -31,15 +31,15 @@ #include "resource.h" #define MAXBUFSIZE 4096 -#define SERVICE_TITLE "File As Message" +#define SERVICE_TITLE LPGEN("File As Message") #define SERVICE_NAME "FileAsMessage" #define SERVICE_PREFIX "<%fAM-0023%>" #define PLUGIN_URL "http://miranda-ng.org/" -#define NOPLUGIN_MESSAGE "\nIf you see this \"garbage\", probably you "\ +#define NOPLUGIN_MESSAGE LPGEN("\nIf you see this \"garbage\", probably you "\ "have no \"fileAsMessage\" plugin installed, see "\ - PLUGIN_URL " for more information and download." + PLUGIN_URL " for more information and download.") extern char *szServiceTitle; extern char *szServicePrefix; extern const ulong INITCRC; diff --git a/plugins/IEView/src/MUCCHTMLBuilder.cpp b/plugins/IEView/src/MUCCHTMLBuilder.cpp index 45e7f2113f..807f05bc7e 100644 --- a/plugins/IEView/src/MUCCHTMLBuilder.cpp +++ b/plugins/IEView/src/MUCCHTMLBuilder.cpp @@ -240,17 +240,17 @@ void MUCCHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) { if (eventData->iType == IEED_MUCC_EVENT_JOINED) { className = "userJoined"; divName = "divUserJoined"; - eventText = "%s has joined."; + eventText = LPGEN("%s has joined."); szText = encodeUTF8(NULL, event->pszProto, eventData->pszNick, ENF_NONE, isSent); } else if (eventData->iType == IEED_MUCC_EVENT_LEFT) { className = "userLeft"; divName = "divUserJoined"; - eventText = "%s has left."; + eventText = LPGEN("%s has left."); szText = encodeUTF8(NULL, event->pszProto, eventData->pszNick, ENF_NONE, isSent); } else { className = "topicChange"; divName = "divTopicChange"; - eventText = "The topic is %s."; + eventText = LPGEN("The topic is %s."); szText = encodeUTF8(NULL, event->pszProto, eventData->pszText, ENF_ALL, isSent); } Utils::appendText(&output, &outputSize, "
", divName); diff --git a/plugins/MetaContacts/src/addto.cpp b/plugins/MetaContacts/src/addto.cpp index e6c2eb6f81..cd68607d51 100644 --- a/plugins/MetaContacts/src/addto.cpp +++ b/plugins/MetaContacts/src/addto.cpp @@ -114,9 +114,9 @@ int BuildList(HWND list, BOOL sort) * @return \c TRUE if the dialog processed the message, \c FALSE if it did not. */ -#define szConvMsg "Either there is no MetaContact in the database (in this case you should first convert a contact into one)\n\ +#define szConvMsg LPGEN("Either there is no MetaContact in the database (in this case you should first convert a contact into one)\n\ or there is none that can host this contact.\n\ -Another solution could be to convert this contact into a new MetaContact.\n\nConvert this contact into a new MetaContact?" +Another solution could be to convert this contact into a new MetaContact.\n\nConvert this contact into a new MetaContact?") INT_PTR CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { diff --git a/plugins/MetaContacts/src/meta_utils.cpp b/plugins/MetaContacts/src/meta_utils.cpp index 25b0f9e684..ca2fc7abf3 100644 --- a/plugins/MetaContacts/src/meta_utils.cpp +++ b/plugins/MetaContacts/src/meta_utils.cpp @@ -885,13 +885,13 @@ int Meta_SetHandles(void) * and ensure metafilter in place */ -#define szMsg "The 'MetaContacts Hidden Group' has been added to your contact list.\n\ +#define szMsg LPGEN("The 'MetaContacts Hidden Group' has been added to your contact list.\n\ This is most likely due to server-side contact information. To fix this, so that\n\ MetaContacts continues to function correctly, you should:\n\ - disable MetaContacts using the 'Toggle MetaContacts Off' main menu item\n\ - move all contacts out of this group\n\ - synchronize your contacts with the server\n\ - - re-enable MetaContacts" + - re-enable MetaContacts") int Meta_HideLinkedContacts(void) { DBVARIANT dbv, dbv2; diff --git a/plugins/MetaContacts/src/metacontacts.h b/plugins/MetaContacts/src/metacontacts.h index 9488194ead..4ca986a933 100644 --- a/plugins/MetaContacts/src/metacontacts.h +++ b/plugins/MetaContacts/src/metacontacts.h @@ -233,6 +233,6 @@ extern BOOL meta_group_hack_disabled; #ifndef MS_CLUI_GETVERSION #define MS_CLUI_GETVERSION "CLUI/GetVersion" -#define szDelMsg "You are going to remove all the contacts associated with this MetaContact.\nThis will delete the MetaContact.\n\nProceed Anyway?" +#define szDelMsg LPGEN("You are going to remove all the contacts associated with this MetaContact.\nThis will delete the MetaContact.\n\nProceed Anyway?") #endif diff --git a/plugins/NewEventNotify/src/neweventnotify.h b/plugins/NewEventNotify/src/neweventnotify.h index 3818e410e9..bfbdd0bc07 100644 --- a/plugins/NewEventNotify/src/neweventnotify.h +++ b/plugins/NewEventNotify/src/neweventnotify.h @@ -136,20 +136,20 @@ //--------------------------- //---Translateable Strings -#define POPUP_COMMENT_MESSAGE "Message" -#define POPUP_COMMENT_URL "URL" -#define POPUP_COMMENT_FILE "File" -#define POPUP_COMMENT_CONTACTS "Contacts" -#define POPUP_COMMENT_ADDED "You were added!" -#define POPUP_COMMENT_AUTH "Requests your authorisation" -#define POPUP_COMMENT_WEBPAGER "ICQ Web pager" -#define POPUP_COMMENT_EMAILEXP "ICQ Email express" -#define POPUP_COMMENT_OTHER "Unknown Event" - -#define MENUITEM_NAME "Notify of new events" - -#define MENUITEM_ENABLE "Enable new event notification" -#define MENUITEM_DISABLE "Disable new event notification" +#define POPUP_COMMENT_MESSAGE LPGEN("Message") +#define POPUP_COMMENT_URL LPGEN("URL") +#define POPUP_COMMENT_FILE LPGEN("File") +#define POPUP_COMMENT_CONTACTS LPGEN("Contacts") +#define POPUP_COMMENT_ADDED LPGEN("You were added!") +#define POPUP_COMMENT_AUTH LPGEN("Requests your authorisation") +#define POPUP_COMMENT_WEBPAGER LPGEN("ICQ Web pager") +#define POPUP_COMMENT_EMAILEXP LPGEN("ICQ Email express") +#define POPUP_COMMENT_OTHER LPGEN("Unknown Event") + +#define MENUITEM_NAME LPGEN("Notify of new events") + +#define MENUITEM_ENABLE LPGEN("Enable new event notification") +#define MENUITEM_DISABLE LPGEN("Disable new event notification") //--------------------------- //---Structures diff --git a/plugins/NewXstatusNotify/src/indsnd.h b/plugins/NewXstatusNotify/src/indsnd.h index 010d973ec7..a95e076cd9 100644 --- a/plugins/NewXstatusNotify/src/indsnd.h +++ b/plugins/NewXstatusNotify/src/indsnd.h @@ -32,7 +32,7 @@ #define STATUS_COLUMN 110 -#define DEFAULT_SOUND "(default sound)" +#define DEFAULT_SOUND LPGEN("(default sound)") int UserInfoInitialise(WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK DlgProcFiltering(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); diff --git a/plugins/NewXstatusNotify/src/xstatus.h b/plugins/NewXstatusNotify/src/xstatus.h index 5dfcdc346d..4e7aabc9a0 100644 --- a/plugins/NewXstatusNotify/src/xstatus.h +++ b/plugins/NewXstatusNotify/src/xstatus.h @@ -51,7 +51,7 @@ #define DEFAULT_POPUP_NEW TranslateT("changed %N to: %T%D%I") #define DEFAULT_POPUP_CHANGEMSG TranslateT("changed %N message to:%D%I") #define DEFAULT_POPUP_REMOVE TranslateT("removed %N") -#define DEFAULT_POPUP_STATUSMESSAGE "changed his/her status message to %n" +#define DEFAULT_POPUP_STATUSMESSAGE LPGEN("changed his/her status message to %n") #define DEFAULT_LOG_DELIMITER _T(": ") #define DEFAULT_LOG_NEW TranslateT("changed %N @ %T%D%I") diff --git a/plugins/NotesAndReminders/src/globals.h b/plugins/NotesAndReminders/src/globals.h index c6dfc1bba6..56076f83d6 100644 --- a/plugins/NotesAndReminders/src/globals.h +++ b/plugins/NotesAndReminders/src/globals.h @@ -29,7 +29,7 @@ #define MODULENAME "StickyNotes" -#define SECTIONNAME "Notes & Reminders" +#define SECTIONNAME LPGEN("Notes & Reminders") // normal timer interval for reminder update processing #define REMINDER_UPDATE_INTERVAL 10000 diff --git a/plugins/NotifyAnything/src/common.h b/plugins/NotifyAnything/src/common.h index 264b5adee8..fc58f65940 100644 --- a/plugins/NotifyAnything/src/common.h +++ b/plugins/NotifyAnything/src/common.h @@ -58,4 +58,4 @@ int OptionsInitialize(WPARAM wParam, LPARAM lParam); extern std::string g_mirandaDir; extern bool IsLogService; -#define LOG_ID "NotifyAnything" +#define LOG_ID LPGEN("NotifyAnything") diff --git a/plugins/RecentContacts/src/RecentContacts.cpp b/plugins/RecentContacts/src/RecentContacts.cpp index 65f0e730e2..51f5ab24c0 100644 --- a/plugins/RecentContacts/src/RecentContacts.cpp +++ b/plugins/RecentContacts/src/RecentContacts.cpp @@ -449,7 +449,7 @@ int Create_TopToolbarShowList(WPARAM wParam, LPARAM lParam) ttbb.hIconHandleUp = icon.hIcolib; ttbb.pszService = msLastUC_ShowList; ttbb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP; - ttbb.name = ttbb.pszTooltipUp = LPGEN(msLastUC_ShowListName); + ttbb.name = ttbb.pszTooltipUp = msLastUC_ShowListName; hTopToolbarButtonShowList = TopToolbar_AddButton(&ttbb); return 0; } diff --git a/plugins/RecentContacts/src/RecentContacts.h b/plugins/RecentContacts/src/RecentContacts.h index 691eb6817e..6eb98986a7 100644 --- a/plugins/RecentContacts/src/RecentContacts.h +++ b/plugins/RecentContacts/src/RecentContacts.h @@ -37,7 +37,7 @@ using namespace std; void wSetData(char **Data, const char *Value); void wfree(char **Data); -static char msLastUC_ShowListName[] = "Recent Contacts"; +static char msLastUC_ShowListName[] = LPGEN("Recent Contacts"); static char dbLastUC_ModuleName[] = "RecentContacts"; static char dbLastUC_LastUsedTimeLo[] = "LastUsedTimeLo"; diff --git a/plugins/SecureIM/src/language.cpp b/plugins/SecureIM/src/language.cpp index eb19e4605e..ee0fa90447 100644 --- a/plugins/SecureIM/src/language.cpp +++ b/plugins/SecureIM/src/language.cpp @@ -1,104 +1,104 @@ #include "commonheaders.h" //Popup Messages -LPCSTR sim001 = "SecureIM established..."; -LPCSTR sim002 = "Key exchange failed..."; -LPCSTR sim003 = "Key from disabled..."; -LPCSTR sim004 = "Sended back message received..."; -LPCSTR sim005 = "Sending back secure message..."; -LPCSTR sim006 = "SecureIM disabled..."; -LPCSTR sim007 = "Sending Key..."; -LPCSTR sim008 = "Key Received..."; -LPCSTR sim009 = "Sending Message..."; -LPCSTR sim010 = "Message Received..."; -LPCSTR sim011 = "Encrypting File:"; -LPCSTR sim012 = "Decrypting File:"; -LPCSTR sim013 = "Bad key received..."; +LPCSTR sim001 = LPGEN("SecureIM established..."); +LPCSTR sim002 = LPGEN("Key exchange failed..."); +LPCSTR sim003 = LPGEN("Key from disabled..."); +LPCSTR sim004 = LPGEN("Sended back message received..."); +LPCSTR sim005 = LPGEN("Sending back secure message..."); +LPCSTR sim006 = LPGEN("SecureIM disabled..."); +LPCSTR sim007 = LPGEN("Sending Key..."); +LPCSTR sim008 = LPGEN("Key Received..."); +LPCSTR sim009 = LPGEN("Sending Message..."); +LPCSTR sim010 = LPGEN("Message Received..."); +LPCSTR sim011 = LPGEN("Encrypting File:"); +LPCSTR sim012 = LPGEN("Decrypting File:"); +LPCSTR sim013 = LPGEN("Bad key received..."); //Error Messages -LPCSTR sim101 = "SecureIM: Error while decrypting the message."; -LPCSTR sim102 = "SecureIM: Error while decrypting the message, bad message length."; -LPCSTR sim103 = "SecureIM: Error while decrypting the message, bad message CRC."; -LPCSTR sim104 = "User has not answered to key exchange !\nYour messages are still in SecureIM queue, do you want to send them Unencrypted now ?"; -LPCSTR sim105 = "SecureIM not enabled! You Must Enable SecureIM with this user..."; -LPCSTR sim106 = "Can't Send Encrypted Message !\nUser is offline now and his secure key has been expired, Do you want to send your message ?\nIt will be unencrypted !"; -LPCSTR sim107 = "SecureIM won't be loaded because cryptopp.dll is missing or wrong version !"; -LPCSTR sim108 = "SecureIM can't load PGP/GPG key! Check PGP/GPG settings!"; -LPCSTR sim109 = "SecureIM can't encrypt message! Check trust of PGP/GPG key!"; -LPCSTR sim110 = "Can't Send Encrypted Message !\nDo you want to send your message ?\nIt will be unencrypted !"; -LPCSTR sim111 = "Can't change mode! Secure connection established!"; -LPCSTR sim112 = "Can't export RSA private key!"; -LPCSTR sim113 = "Can't import RSA private key!"; -LPCSTR sim114 = "Can't export RSA public key!"; -LPCSTR sim115 = "Can't import RSA public key!"; +LPCSTR sim101 = LPGEN("SecureIM: Error while decrypting the message."); +LPCSTR sim102 = LPGEN("SecureIM: Error while decrypting the message, bad message length."); +LPCSTR sim103 = LPGEN("SecureIM: Error while decrypting the message, bad message CRC."); +LPCSTR sim104 = LPGEN("User has not answered to key exchange !\nYour messages are still in SecureIM queue, do you want to send them Unencrypted now ?"); +LPCSTR sim105 = LPGEN("SecureIM not enabled! You Must Enable SecureIM with this user..."); +LPCSTR sim106 = LPGEN("Can't Send Encrypted Message !\nUser is offline now and his secure key has been expired, Do you want to send your message ?\nIt will be unencrypted !"); +LPCSTR sim107 = LPGEN("SecureIM won't be loaded because cryptopp.dll is missing or wrong version !"); +LPCSTR sim108 = LPGEN("SecureIM can't load PGP/GPG key! Check PGP/GPG settings!"); +LPCSTR sim109 = LPGEN("SecureIM can't encrypt message! Check trust of PGP/GPG key!"); +LPCSTR sim110 = LPGEN("Can't Send Encrypted Message !\nDo you want to send your message ?\nIt will be unencrypted !"); +LPCSTR sim111 = LPGEN("Can't change mode! Secure connection established!"); +LPCSTR sim112 = LPGEN("Can't export RSA private key!"); +LPCSTR sim113 = LPGEN("Can't import RSA private key!"); +LPCSTR sim114 = LPGEN("Can't export RSA public key!"); +LPCSTR sim115 = LPGEN("Can't import RSA public key!"); //Options -LPCSTR sim201 = "General"; -LPCSTR sim202 = "Protocols"; -LPCSTR sim203 = "Nickname"; +LPCSTR sim201 = LPGEN("General"); +LPCSTR sim202 = LPGEN("Protocols"); +LPCSTR sim203 = LPGEN("Nickname"); LPCSTR sim204 = "UIN/Email/Jid/..."; -LPCSTR sim205 = "Status"; +LPCSTR sim205 = LPGEN("Status"); LPCSTR sim206 = "PSK"; -LPCSTR sim210 = "Name"; -LPCSTR sim211 = "Password is too short!"; -LPCSTR sim212 = "ON"; -LPCSTR sim213 = "Off"; +LPCSTR sim210 = LPGEN("Name"); +LPCSTR sim211 = LPGEN("Password is too short!"); +LPCSTR sim212 = LPGEN("ON"); +LPCSTR sim213 = LPGEN("Off"); LPCSTR sim214 = "PGP"; LPCSTR sim215 = "Key ID"; -LPCSTR sim216 = "Keyrings loaded."; -LPCSTR sim217 = "Keyrings not loaded!"; -LPCSTR sim218 = "PGP SDK v%i.%i.%i found."; -LPCSTR sim219 = "PGP SDK not found!"; -LPCSTR sim220 = "This version not supported!"; -LPCSTR sim221 = "(none)"; -LPCSTR sim222 = "Private key loaded."; -LPCSTR sim223 = "Private key not loaded!"; -LPCSTR sim224 = "The new settings will become valid when you restart MirandaNG!"; -LPCSTR sim225 = "Keyrings disabled!"; +LPCSTR sim216 = LPGEN("Keyrings loaded."); +LPCSTR sim217 = LPGEN("Keyrings not loaded!"); +LPCSTR sim218 = LPGEN("PGP SDK v%i.%i.%i found."); +LPCSTR sim219 = LPGEN("PGP SDK not found!"); +LPCSTR sim220 = LPGEN("This version not supported!"); +LPCSTR sim221 = LPGEN("(none)"); +LPCSTR sim222 = LPGEN("Private key loaded."); +LPCSTR sim223 = LPGEN("Private key not loaded!"); +LPCSTR sim224 = LPGEN("The new settings will become valid when you restart MirandaNG!"); +LPCSTR sim225 = LPGEN("Keyrings disabled!"); LPCSTR sim226 = "GPG"; LPCSTR sim227 = "CP"; LPCSTR sim228 = "ANSI"; LPCSTR sim229 = "UTF8"; -LPCSTR sim230 = "Mode"; -LPCSTR sim231[] = { "Native", "PGP", "GPG", "RSA/AES", "RSA" }; -LPCSTR sim232[] = { "Disabled", "Enabled", "Always try" }; +LPCSTR sim230 = LPGEN("Mode"); +LPCSTR sim231[] = { LPGEN("Native"), "PGP", "GPG", "RSA/AES", "RSA" }; +LPCSTR sim232[] = { LPGEN("Disabled"), LPGEN("Enabled"), LPGEN("Always try") }; LPCSTR sim233 = "PUB"; LPCSTR sim234 = "SHA1"; //Context Menu -LPCSTR sim301 = "Create SecureIM connection"; -LPCSTR sim302 = "Disable SecureIM connection"; -LPCSTR sim306 = "Load PGP Key"; -LPCSTR sim307 = "Unload PGP Key"; -LPCSTR sim308 = "Load GPG Key"; -LPCSTR sim309 = "Unload GPG Key"; -LPCSTR sim310 = "Delete RSA Key"; -LPCSTR sim311[] = { "SecureIM mode (Native)", - "SecureIM mode (PGP)", - "SecureIM mode (GPG)", - "SecureIM mode (RSA/AES)", - "SecureIM mode (RSA)" }; -LPCSTR sim312[] = { "SecureIM status (disabled)", - "SecureIM status (enabled)", - "SecureIM status (always try)" }; +LPCSTR sim301 = LPGEN("Create SecureIM connection"); +LPCSTR sim302 = LPGEN("Disable SecureIM connection"); +LPCSTR sim306 = LPGEN("Load PGP Key"); +LPCSTR sim307 = LPGEN("Unload PGP Key"); +LPCSTR sim308 = LPGEN("Load GPG Key"); +LPCSTR sim309 = LPGEN("Unload GPG Key"); +LPCSTR sim310 = LPGEN("Delete RSA Key"); +LPCSTR sim311[] = { LPGEN("SecureIM mode (Native)"), + LPGEN("SecureIM mode (PGP)"), + LPGEN("SecureIM mode (GPG)"), + LPGEN("SecureIM mode (RSA/AES)"), + LPGEN("SecureIM mode (RSA)") }; +LPCSTR sim312[] = { LPGEN("SecureIM status (disabled)"), + LPGEN("SecureIM status (enabled)"), + LPGEN("SecureIM status (always try)") }; //System messages -LPCSTR sim401 = "SecureIM: Sorry, unable to decrypt this message due you have no PGP/GPG installed. Visit www.pgp.com or www.gnupg.org for more info."; -LPCSTR sim402 = "SecureIM received unencrypted message:\n"; -LPCSTR sim403 = "SecureIM received encrypted message:\n"; +LPCSTR sim401 = LPGEN("SecureIM: Sorry, unable to decrypt this message due you have no PGP/GPG installed. Visit www.pgp.com or www.gnupg.org for more info."); +LPCSTR sim402 = LPGEN("SecureIM received unencrypted message:\n"); +LPCSTR sim403 = LPGEN("SecureIM received encrypted message:\n"); //RSA messages -LPCSTR sim501 = "Session closed by receiving incorrect message type"; -LPCSTR sim502 = "Session closed by other side on error"; -LPCSTR sim505 = "Error while decoding AES message"; -LPCSTR sim506 = "Error while decoding RSA message"; -LPCSTR sim507 = "Session closed on timeout"; -LPCSTR sim508 = "Session closed by other side when status \"disabled\""; -LPCSTR sim510 = "Session closed on error: %02x"; -LPCSTR sim520 = "SecureIM received RSA Public Key from \"%s\"\n\nSHA1: %s\n\nDo you Accept this Key ?"; -LPCSTR sim521 = "SecureIM auto accepted RSA Public key from: %s uin: %s SHA1: %s"; -LPCSTR sim522 = "SecureIM received NEW RSA Public Key from \"%s\"\n\nNew SHA1: %s\n\nOld SHA1: %s\n\nDo you Replace this Key ?"; -LPCSTR sim523 = "SecureIM auto accepted NEW RSA Public key from: %s uin: %s New SHA1: %s Old SHA1: %s"; +LPCSTR sim501 = LPGEN("Session closed by receiving incorrect message type"); +LPCSTR sim502 = LPGEN("Session closed by other side on error"); +LPCSTR sim505 = LPGEN("Error while decoding AES message"); +LPCSTR sim506 = LPGEN("Error while decoding RSA message"); +LPCSTR sim507 = LPGEN("Session closed on timeout"); +LPCSTR sim508 = LPGEN("Session closed by other side when status \"disabled\""); +LPCSTR sim510 = LPGEN("Session closed on error: %02x"); +LPCSTR sim520 = LPGEN("SecureIM received RSA Public Key from \"%s\"\n\nSHA1: %s\n\nDo you Accept this Key ?"); +LPCSTR sim521 = LPGEN("SecureIM auto accepted RSA Public key from: %s uin: %s SHA1: %s"); +LPCSTR sim522 = LPGEN("SecureIM received NEW RSA Public Key from \"%s\"\n\nNew SHA1: %s\n\nOld SHA1: %s\n\nDo you Replace this Key ?"); +LPCSTR sim523 = LPGEN("SecureIM auto accepted NEW RSA Public key from: %s uin: %s New SHA1: %s Old SHA1: %s"); // EOF diff --git a/plugins/StopSpamPlus/src/headers.h b/plugins/StopSpamPlus/src/headers.h index 5675319390..c1970bad83 100644 --- a/plugins/StopSpamPlus/src/headers.h +++ b/plugins/StopSpamPlus/src/headers.h @@ -33,7 +33,7 @@ #include "m_variables.h" -#define pluginName "StopSpam" +#define pluginName LPGEN("StopSpam") extern TCHAR * pluginDescription; extern TCHAR const * infTalkProtPrefix; diff --git a/plugins/YAMN/src/browser/badconnect.cpp b/plugins/YAMN/src/browser/badconnect.cpp index 791befd9fd..faa9b9ba07 100644 --- a/plugins/YAMN/src/browser/badconnect.cpp +++ b/plugins/YAMN/src/browser/badconnect.cpp @@ -7,8 +7,8 @@ #include "../yamn.h" #include "../main.h" -#define BADCONNECTTITLE "%s - connection error" -#define BADCONNECTMSG "An error occured. Error code: %d" +#define BADCONNECTTITLE LPGEN("%s - connection error") +#define BADCONNECTMSG LPGEN("An error occured. Error code: %d")//is in use? //-------------------------------------------------------------------------------------------------- diff --git a/plugins/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp index 370bf1f866..270fe2e31f 100644 --- a/plugins/YAMN/src/browser/mailbrowser.cpp +++ b/plugins/YAMN/src/browser/mailbrowser.cpp @@ -321,7 +321,7 @@ void IncrementMailCounters(HYAMNMAIL msgq,struct CMailNumbers *MN) int UpdateMails(HWND hDlg,HACCOUNT ActualAccount,DWORD nflags,DWORD nnflags) { -#define MAILBROWSERTITLE "%s - %d new mail messages, %d total" +#define MAILBROWSERTITLE LPGEN("%s - %d new mail messages, %d total") struct CMailWinUserInfo *mwui; struct CMailNumbers MN; -- cgit v1.2.3