diff options
| -rwxr-xr-x | plugins/New_GPG/src/utilities.cpp | 10 | ||||
| -rw-r--r-- | plugins/NewsAggregator/Src/Options.cpp | 12 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/hotkeys.cpp | 4 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/main.cpp | 2 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/notes.cpp | 16 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/options.cpp | 2 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/reminders.cpp | 118 | ||||
| -rw-r--r-- | plugins/Nudge/src/main.cpp | 2 | ||||
| -rw-r--r-- | plugins/PackUpdater/Src/Events.cpp | 4 | ||||
| -rw-r--r-- | plugins/PackUpdater/Src/Notifications.h | 4 | ||||
| -rw-r--r-- | plugins/PackUpdater/Src/PackUpdater.cpp | 4 | ||||
| -rw-r--r-- | plugins/PasteIt/src/Options.cpp | 42 | ||||
| -rw-r--r-- | plugins/PasteIt/src/PasteIt.cpp | 8 | ||||
| -rw-r--r-- | plugins/Ping/src/options.cpp | 2 | ||||
| -rw-r--r-- | plugins/Ping/src/pingthread.cpp | 6 | ||||
| -rw-r--r-- | plugins/SecureIM/src/options.cpp | 12 | ||||
| -rw-r--r-- | protocols/MSN/src/msn_lists.cpp | 2 | ||||
| -rw-r--r-- | protocols/MSN/src/msn_proto.cpp | 2 | 
18 files changed, 126 insertions, 126 deletions
diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp index 49061229cc..129b7cb9cc 100755 --- a/plugins/New_GPG/src/utilities.cpp +++ b/plugins/New_GPG/src/utilities.cpp @@ -1,4 +1,4 @@ -// Copyright © 2010-2012 sss
 +// Copyright � 2010-2012 sss
  // 
  // This program is free software; you can redistribute it and/or
  // modify it under the terms of the GNU General Public License
 @@ -205,7 +205,7 @@ INT_PTR ToggleEncryption(WPARAM w, LPARAM l)  	if(metaIsProtoMetaContacts(hContact))
  	{
  		HANDLE hcnt = NULL;
 -		if(MessageBox(0, _T("Do you want to toggle encryption for all subcontacts ?"), _T("Metacontact detected"), MB_YESNO) == IDYES)
 +		if(MessageBox(0, TranslateT("Do you want to toggle encryption for all subcontacts ?"), TranslateT("Metacontact detected"), MB_YESNO) == IDYES)
  		{
  			int count = metaGetContactsNum(hContact);
  			for(int i = 0; i < count; i++)
 @@ -339,7 +339,7 @@ int onProtoAck(WPARAM w, LPARAM l)  						file.erase(p1, _tcslen(_T(".gpg")));
  						if(_waccess(file.c_str(), 0) != -1)
  						{
 -							if(MessageBox(0, _T("Target file exists, do you want to replace it ?"), _T("Warning"), MB_YESNO) == IDNO)
 +							if(MessageBox(0, TranslateT("Target file exists, do you want to replace it ?"), TranslateT("Warning"), MB_YESNO) == IDNO)
  								return 0;
  						}
  						DeleteFile(file.c_str());
 @@ -549,7 +549,7 @@ std::wstring encrypt_file(HANDLE hContact, TCHAR *filename)  	if(out.find("There is no assurance this key belongs to the named user") != string::npos)
  	{
  		out.clear();
 -		if(MessageBox(0, _T("We trying to encrypt with untrusted key, do you want to trust this key permanently ?"), _T("Warning"), MB_YESNO) == IDYES)
 +		if(MessageBox(0, TranslateT("We trying to encrypt with untrusted key, do you want to trust this key permanently ?"), TranslateT("Warning"), MB_YESNO) == IDYES)
  		{
  			DBWriteContactSettingByte(hcnt, szGPGModuleName, "bAlwaysTrust", 1);
  			cmd.insert(0, _T("--trust-model always "));
 @@ -1810,7 +1810,7 @@ INT_PTR ImportGpGKeys(WPARAM w, LPARAM l)  						{
  							if(output.find("already in secret keyring") != string::npos)
  							{
 -								MessageBox(0, _T("Key already in scret key ring."), _T("Info"), MB_OK);
 +								MessageBox(0, TranslateT("Key already in scret key ring."), TranslateT("Info"), MB_OK);
  								DeleteFile(tmp2);
  								break;
  							}
 diff --git a/plugins/NewsAggregator/Src/Options.cpp b/plugins/NewsAggregator/Src/Options.cpp index 6c14bf8762..af216f5b56 100644 --- a/plugins/NewsAggregator/Src/Options.cpp +++ b/plugins/NewsAggregator/Src/Options.cpp @@ -113,13 +113,13 @@ INT_PTR CALLBACK DlgProcAddFeedOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA  					{
  						TCHAR tszTagHelp[1024];
  						mir_sntprintf(tszTagHelp, SIZEOF(tszTagHelp), _T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"),
 -							_T("#<title>#"),			TranslateT("The title of the item."),
 -							_T("#<description>#"),		TranslateT("The item synopsis."),
 -							_T("#<link>#"),	TranslateT("The URL of the item."),
 +							_T("#<title>#"),		TranslateT("The title of the item."),
 +							_T("#<description>#"),	TranslateT("The item synopsis."),
 +							_T("#<link>#"),			TranslateT("The URL of the item."),
  							_T("#<author>#"),		TranslateT("Email address of the author of the item."),
 -							_T("#<comments>#"),				TranslateT("URL of a page for comments relating to the item."),
 -							_T("#<guid>#"),				TranslateT("A string that uniquely identifies the item."),
 -							_T("#<category>#"),				TranslateT("Specify one or more categories that the item belongs to.")
 +							_T("#<comments>#"),		TranslateT("URL of a page for comments relating to the item."),
 +							_T("#<guid>#"),			TranslateT("A string that uniquely identifies the item."),
 +							_T("#<category>#"),		TranslateT("Specify one or more categories that the item belongs to.")
  						);
  						MessageBox(hwndDlg, tszTagHelp, TranslateT("Feed Tag Help"), MB_OK);
  					}
 diff --git a/plugins/NotesAndReminders/src/hotkeys.cpp b/plugins/NotesAndReminders/src/hotkeys.cpp index d324d5fdd7..a71ecf9399 100644 --- a/plugins/NotesAndReminders/src/hotkeys.cpp +++ b/plugins/NotesAndReminders/src/hotkeys.cpp @@ -127,8 +127,8 @@ void CreateMsgWindow(void)  		hParent = HWND_MESSAGE;
  	}
 -  HKHwnd = CreateWindowEx(WS_EX_TOOLWINDOW,MSG_WND_CLASS,_T("StickyNotes"),0,0,0,0,0,hParent,NULL,hmiranda,NULL);
 -  SetTimer(HKHwnd,1026,REMINDER_UPDATE_INTERVAL,0);
 +  HKHwnd = CreateWindowEx(WS_EX_TOOLWINDOW, MSG_WND_CLASS, _T("StickyNotes"), 0, 0, 0, 0, 0, hParent, NULL, hmiranda, NULL);
 +  SetTimer(HKHwnd, 1026, REMINDER_UPDATE_INTERVAL, 0);
  }
  void DestroyMsgWindow(void)
 diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp index 60302fafe3..c203039f00 100644 --- a/plugins/NotesAndReminders/src/main.cpp +++ b/plugins/NotesAndReminders/src/main.cpp @@ -123,7 +123,7 @@ int OnOptInitialise(WPARAM w, LPARAM L)  	odp.hInstance = hinstance;
  	odp.pszTemplate = MAKEINTRESOURCEA(IDD_STNOTEOPTIONS);
  	odp.ptszTitle = _T(SECTIONNAME);
 -	odp.ptszGroup = _T("Plugins");
 +	odp.ptszGroup = LPGENT("Plugins");
  	odp.pfnDlgProc = DlgProcOptions;
  	odp.flags = ODPF_TCHAR;
  	Options_AddPage(w, &odp);
 diff --git a/plugins/NotesAndReminders/src/notes.cpp b/plugins/NotesAndReminders/src/notes.cpp index f249a269fe..efd0dc77df 100644 --- a/plugins/NotesAndReminders/src/notes.cpp +++ b/plugins/NotesAndReminders/src/notes.cpp @@ -1002,10 +1002,10 @@ static int FindMenuItem(HMENU h, LPTSTR lpszName)  static BOOL DoContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam)
  {
  	int n, i;
 -	STICKYNOTE *SN = (STICKYNOTE*)GetProp(AhWnd,_T("ctrldata"));
 +	STICKYNOTE *SN = (STICKYNOTE*)GetProp(AhWnd, _T("ctrldata"));
  	HMENU hMenuLoad, FhMenu, hSub;
 -	hMenuLoad = LoadMenu(hinstance,_T("MNU_NOTEPOPUP"));
 +	hMenuLoad = LoadMenu(hinstance, _T("MNU_NOTEPOPUP"));
  	FhMenu = GetSubMenu(hMenuLoad,0);
  	if (SN->OnTop)
 @@ -1371,11 +1371,11 @@ INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM l  				Buff = (char*)malloc(PEnLnk->chrg.cpMax - PEnLnk->chrg.cpMin + 1);
  				SendDlgItemMessage(hdlg,1,EM_GETSELTEXT,0,(LPARAM)Buff);
  				if ((GetAsyncKeyState(VK_CONTROL) >> 15) != 0)
 -					ShellExecute(hdlg,_T("open"),_T("iexplore"),Buff,_T(""),SW_SHOWNORMAL);
 +					ShellExecute(hdlg, _T("open"), _T("iexplore"), Buff, _T("") ,SW_SHOWNORMAL);
  				else if (g_lpszAltBrowser && *g_lpszAltBrowser)
 -					ShellExecute(hdlg,_T("open"),g_lpszAltBrowser,Buff,_T(""),SW_SHOWNORMAL);
 +					ShellExecute(hdlg,_T("open"), g_lpszAltBrowser, Buff, _T("") ,SW_SHOWNORMAL);
  				else
 -					ShellExecute(hdlg,_T("open"),Buff,_T(""),_T(""),SW_SHOWNORMAL);
 +					ShellExecute(hdlg, _T("open"), Buff, _T(""), _T(""), SW_SHOWNORMAL);
  				SAFE_FREE((void**)&Buff);
  				return TRUE;
  			}
 @@ -1467,7 +1467,7 @@ INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM l  		break;
  	case WM_COMMAND:
  		{
 -			STICKYNOTE *SN = (STICKYNOTE*)GetProp(hdlg,_T("ctrldata"));
 +			STICKYNOTE *SN = (STICKYNOTE*)GetProp(hdlg, _T("ctrldata"));
  			HWND H;
  			UINT id;
 @@ -1963,11 +1963,11 @@ INT_PTR CALLBACK DlgProcViewNotes(HWND Dialog,UINT Message,WPARAM wParam,LPARAM  			hIcon = Skin_GetIconByHandle(iconList[13].hIcolib, ICON_BIG);
  			SendMessage(Dialog, WM_SETICON, (WPARAM)ICON_BIG, (LPARAM)hIcon);
 -			SetWindowText(Dialog, _T("Notes"));
 +			SetWindowText(Dialog, LPGENT("Notes"));
  			TranslateDialogDefault(Dialog);
 -			SetDlgItemText(Dialog,IDC_REMINDERDATA,_T(""));
 +			SetDlgItemText(Dialog,IDC_REMINDERDATA, _T(""));
  			H = GetDlgItem(Dialog,IDC_LISTREMINDERS);
  			lvCol.mask = LVCF_TEXT | LVCF_WIDTH;
 diff --git a/plugins/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp index a9a1884c9b..385c8a004a 100644 --- a/plugins/NotesAndReminders/src/options.cpp +++ b/plugins/NotesAndReminders/src/options.cpp @@ -477,7 +477,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar  				ofn.lStructSize = sizeof(ofn);
  #endif
  				ofn.hwndOwner = hdlg;
 -				ofn.lpstrFilter = _T("Executable Files\0*.exe\0All Files\0*.*\0\0");
 +				ofn.lpstrFilter = TranslateT("Executable Files\0*.exe\0All Files\0*.*\0\0");
  				ofn.lpstrFile = s;
  				ofn.nMaxFile = SIZEOF(s);
  				ofn.lpstrTitle = TranslateT("Select Executable");
 diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp index 21c262f2cd..a4e12ee591 100644 --- a/plugins/NotesAndReminders/src/reminders.cpp +++ b/plugins/NotesAndReminders/src/reminders.cpp @@ -1320,35 +1320,35 @@ static void PopulateTimeCombo(HWND Dialog, UINT nIDTime, BOOL bRelative, const S  	wCurMinute = tm2.wMinute;
  	mir_snprintf(s, sizeof(s), "%02d:%02d", (UINT)tm2.wHour, (UINT)tm2.wMinute);
  	n = SendDlgItemMessage(Dialog,nIDTime,CB_ADDSTRING,0,(LPARAM)s);
 -	SendDlgItemMessage(Dialog,nIDTime,CB_SETITEMDATA,n, (LPARAM)((li.QuadPart-ref)/FILETIME_TICKS_PER_SEC));
 +	SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((li.QuadPart-ref)/FILETIME_TICKS_PER_SEC));
  	// 5 minutes
  	li.QuadPart += (ULONGLONG)5 * MinutesToFileTime;
  	FileTimeToTzLocalST((FILETIME*)&li, &tm2);
  	mir_snprintf(s, sizeof(s), "%02d:%02d (5 %s)", (UINT)tm2.wHour, (UINT)tm2.wMinute, lpszMinutes);
  	n = SendDlgItemMessage(Dialog,nIDTime,CB_ADDSTRING,0,(LPARAM)s);
 -	SendDlgItemMessage(Dialog,nIDTime,CB_SETITEMDATA,n, (LPARAM)((li.QuadPart-ref)/FILETIME_TICKS_PER_SEC));
 +	SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((li.QuadPart-ref)/FILETIME_TICKS_PER_SEC));
  	// 10 minutes
  	li.QuadPart += (ULONGLONG)5 * MinutesToFileTime;
  	FileTimeToTzLocalST((FILETIME*)&li, &tm2);
  	mir_snprintf(s, sizeof(s), "%02d:%02d (10 %s)", (UINT)tm2.wHour, (UINT)tm2.wMinute, lpszMinutes);
  	n = SendDlgItemMessage(Dialog,nIDTime,CB_ADDSTRING,0,(LPARAM)s);
 -	SendDlgItemMessage(Dialog,nIDTime,CB_SETITEMDATA,n, (LPARAM)((li.QuadPart-ref)/FILETIME_TICKS_PER_SEC));
 +	SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((li.QuadPart-ref)/FILETIME_TICKS_PER_SEC));
  	// 15 minutes
  	li.QuadPart += (ULONGLONG)5 * MinutesToFileTime;
  	FileTimeToTzLocalST((FILETIME*)&li, &tm2);
  	mir_snprintf(s, sizeof(s), "%02d:%02d (15 %s)", (UINT)tm2.wHour, (UINT)tm2.wMinute, lpszMinutes);
  	n = SendDlgItemMessage(Dialog,nIDTime,CB_ADDSTRING,0,(LPARAM)s);
 -	SendDlgItemMessage(Dialog,nIDTime,CB_SETITEMDATA,n, (LPARAM)((li.QuadPart-ref)/FILETIME_TICKS_PER_SEC));
 +	SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((li.QuadPart-ref)/FILETIME_TICKS_PER_SEC));
  	// 30 minutes
  	li.QuadPart += (ULONGLONG)15 * MinutesToFileTime;
  	FileTimeToTzLocalST((FILETIME*)&li, &tm2);
  	mir_snprintf(s, sizeof(s), "%02d:%02d (30 %s)", (UINT)tm2.wHour, (UINT)tm2.wMinute, lpszMinutes);
  	n = SendDlgItemMessage(Dialog,nIDTime,CB_ADDSTRING,0,(LPARAM)s);
 -	SendDlgItemMessage(Dialog,nIDTime,CB_SETITEMDATA,n, (LPARAM)((li.QuadPart-ref)/FILETIME_TICKS_PER_SEC));
 +	SendDlgItemMessage(Dialog, nIDTime, CB_SETITEMDATA, n, (LPARAM)((li.QuadPart-ref)/FILETIME_TICKS_PER_SEC));
  	// round +1h time to nearest even or half hour
  	li.QuadPart += (ULONGLONG)30 * MinutesToFileTime;
 @@ -1936,20 +1936,20 @@ INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wParam,LP  			case IDC_AFTER:
  				{
 -					ShowWindow(GetDlgItem(Dialog,IDC_REMINDAGAININ),SW_SHOW);
 -					ShowWindow(GetDlgItem(Dialog,IDC_DATEAGAIN),SW_HIDE);
 -					ShowWindow(GetDlgItem(Dialog,IDC_TIMEAGAIN),SW_HIDE);
 -					ShowWindow(GetDlgItem(Dialog,IDC_STATIC_DATE),SW_HIDE);
 -					ShowWindow(GetDlgItem(Dialog,IDC_STATIC_TIME),SW_HIDE);
 +					ShowWindow(GetDlgItem(Dialog, IDC_REMINDAGAININ), SW_SHOW);
 +					ShowWindow(GetDlgItem(Dialog, IDC_DATEAGAIN), SW_HIDE);
 +					ShowWindow(GetDlgItem(Dialog, IDC_TIMEAGAIN), SW_HIDE);
 +					ShowWindow(GetDlgItem(Dialog, IDC_STATIC_DATE), SW_HIDE);
 +					ShowWindow(GetDlgItem(Dialog, IDC_STATIC_TIME), SW_HIDE);
  					return TRUE;
  				}
  			case IDC_ONDATE:
  				{
 -					ShowWindow(GetDlgItem(Dialog,IDC_DATEAGAIN),SW_SHOW);
 -					ShowWindow(GetDlgItem(Dialog,IDC_TIMEAGAIN),SW_SHOW);
 -					ShowWindow(GetDlgItem(Dialog,IDC_STATIC_DATE),SW_SHOW);
 -					ShowWindow(GetDlgItem(Dialog,IDC_STATIC_TIME),SW_SHOW);
 -					ShowWindow(GetDlgItem(Dialog,IDC_REMINDAGAININ),SW_HIDE);
 +					ShowWindow(GetDlgItem(Dialog, IDC_DATEAGAIN), SW_SHOW);
 +					ShowWindow(GetDlgItem(Dialog, IDC_TIMEAGAIN), SW_SHOW);
 +					ShowWindow(GetDlgItem(Dialog, IDC_STATIC_DATE), SW_SHOW);
 +					ShowWindow(GetDlgItem(Dialog, IDC_STATIC_TIME), SW_SHOW);
 +					ShowWindow(GetDlgItem(Dialog, IDC_REMINDAGAININ), SW_HIDE);
  					return TRUE;
  				}
  			case IDC_DISMISS:
 @@ -1979,7 +1979,7 @@ INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wParam,LP  						if (pReminder->handle == Dialog)
  						{
 -							if (SendDlgItemMessage(Dialog,IDC_AFTER,BM_GETCHECK,0,0) == BST_CHECKED)
 +							if (SendDlgItemMessage(Dialog, IDC_AFTER, BM_GETCHECK, 0, 0) == BST_CHECKED)
  							{
  								// delta time
 @@ -1991,10 +1991,10 @@ INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wParam,LP  								GetSystemTime(&tm);
  								SYSTEMTIMEtoFILETIME(&tm, (FILETIME*)&li);
 -								n = SendDlgItemMessage(Dialog,IDC_REMINDAGAININ,CB_GETCURSEL,0,0);
 +								n = SendDlgItemMessage(Dialog, IDC_REMINDAGAININ, CB_GETCURSEL, 0, 0);
  								if (n != CB_ERR)
  								{
 -									TT = SendDlgItemMessage(Dialog,IDC_REMINDAGAININ,CB_GETITEMDATA,n, 0) * 60;
 +									TT = SendDlgItemMessage(Dialog, IDC_REMINDAGAININ, CB_GETITEMDATA, n, 0) * 60;
  									if (TT >= 24*3600)
  									{
 @@ -2032,7 +2032,7 @@ INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wParam,LP  									m += h * 60;
  									if (!m)
  									{
 -										MessageBox(Dialog, TranslateT("The specified time offset is invalid."), _T(SECTIONNAME), MB_OK|MB_ICONWARNING);
 +										MessageBox(Dialog, TranslateT("The specified time offset is invalid."), _T(SECTIONNAME), MB_OK | MB_ICONWARNING);
  										return TRUE;
  									}
 @@ -2042,11 +2042,11 @@ INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wParam,LP  								pReminder->When = li;
  								pReminder->When.QuadPart += (TT * FILETIME_TICKS_PER_SEC);
  							}
 -							else if (SendDlgItemMessage(Dialog,IDC_ONDATE,BM_GETCHECK,0,0) == BST_CHECKED)
 +							else if (SendDlgItemMessage(Dialog, IDC_ONDATE, BM_GETCHECK, 0, 0) == BST_CHECKED)
  							{
  								SYSTEMTIME Date;
 -								SendDlgItemMessage(Dialog,IDC_DATEAGAIN,DTM_GETSYSTEMTIME,0,(LPARAM)&Date);
 +								SendDlgItemMessage(Dialog, IDC_DATEAGAIN, DTM_GETSYSTEMTIME, 0, (LPARAM)&Date);
  								if ( !GetTriggerTime(Dialog, IDC_TIMEAGAIN, IDC_REFTIME, &Date) )
  									break;
 @@ -2057,12 +2057,12 @@ INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wParam,LP  							// update reminder text
  							{
  							char *ReminderText = NULL;
 -							int SzT = SendDlgItemMessage(Dialog,IDC_REMDATA,WM_GETTEXTLENGTH,0,0);
 +							int SzT = SendDlgItemMessage(Dialog, IDC_REMDATA, WM_GETTEXTLENGTH, 0, 0);
  							if (SzT)
  							{
  								if (SzT > MAX_REMINDER_LEN) SzT = MAX_REMINDER_LEN;
  								ReminderText = (char*)malloc(SzT+1);
 -								SendDlgItemMessage(Dialog,IDC_REMDATA,WM_GETTEXT,SzT+1,(LPARAM)ReminderText);
 +								SendDlgItemMessage(Dialog, IDC_REMDATA, WM_GETTEXT, SzT+1, (LPARAM)ReminderText);
  							}
  							if (pReminder->Reminder)
  								free(pReminder->Reminder);
 @@ -2074,7 +2074,7 @@ INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wParam,LP  							// re-insert tree item sorted
  							TreeDelete(&RemindersList,pReminder);
 -							TreeAddSorted(&RemindersList,pReminder,ReminderSortCb);
 +							TreeAddSorted(&RemindersList, pReminder, ReminderSortCb);
  							JustSaveReminders();
  							break;
  						}
 @@ -2094,12 +2094,12 @@ INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wParam,LP  						{
  							// get up-to-date reminder text
  							char *ReminderText = NULL;
 -							int SzT = SendDlgItemMessage(Dialog,IDC_REMDATA,WM_GETTEXTLENGTH,0,0);
 +							int SzT = SendDlgItemMessage(Dialog, IDC_REMDATA, WM_GETTEXTLENGTH, 0, 0);
  							if (SzT)
  							{
  								if (SzT > MAX_REMINDER_LEN) SzT = MAX_REMINDER_LEN;
  								ReminderText = (char*)malloc(SzT+1);
 -								SendDlgItemMessage(Dialog,IDC_REMDATA,WM_GETTEXT,SzT+1,(LPARAM)ReminderText);
 +								SendDlgItemMessage(Dialog, IDC_REMDATA, WM_GETTEXT, SzT+1, (LPARAM)ReminderText);
  							}
  							SetFocus(NewNote(0, 0, -1, -1, ReminderText, 0, TRUE, TRUE, 0)->REHwnd);
 @@ -2127,8 +2127,8 @@ INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wParam,LPARA  			if (NewReminderVisible == 2)
  			{
  				// opening the edit reminder dialog (uses same dialog resource as add reminder)
 -				SetWindowText(Dialog, _T("Reminder"));
 -				SetDlgItemText(Dialog, IDC_ADDREMINDER, _T("&Update Reminder"));
 +				SetWindowText(Dialog, TranslateT("Reminder"));
 +				SetDlgItemText(Dialog, IDC_ADDREMINDER, TranslateT("&Update Reminder"));
  				ShowWindow(GetDlgItem(Dialog, IDC_VIEWREMINDERS), SW_HIDE);
  				li = pEditReminder->When;
 @@ -2161,7 +2161,7 @@ INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wParam,LPARA  			FileTimeToTzLocalST((FILETIME*)&li, &tm);
  			// make sure date picker uses reference time
 -			SendDlgItemMessage(Dialog,IDC_DATE,DTM_SETSYSTEMTIME,0,(LPARAM)&tm);
 +			SendDlgItemMessage(Dialog, IDC_DATE, DTM_SETSYSTEMTIME, 0, (LPARAM)&tm);
  			InitDatePicker(Dialog, IDC_DATE);
  			SendDlgItemMessage(Dialog, IDC_REMINDER, EM_LIMITTEXT, MAX_REMINDER_LEN, 0);
 @@ -2195,38 +2195,38 @@ INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wParam,LPARA  				// NOTE: use multiples of REMINDER_UPDATE_INTERVAL_SHORT (currently 5 seconds)
 -				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_ADDSTRING,0,(LPARAM)Translate("Never"));
 +				n = SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_ADDSTRING, 0, (LPARAM)Translate("Never"));
  				SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_SETITEMDATA, n, 0);
  				mir_snprintf(s, sizeof(s), "%s 5 %s", lpszEvery, lpszSeconds);
 -				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_ADDSTRING,0,(LPARAM)s);
 -				SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_SETITEMDATA,n, (LPARAM)5);
 +				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND, CB_ADDSTRING, 0, (LPARAM)s);
 +				SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETITEMDATA, n, (LPARAM)5);
  				mir_snprintf(s, sizeof(s), "%s 10 %s", lpszEvery, lpszSeconds);
 -				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_ADDSTRING,0,(LPARAM)s);
 -				SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_SETITEMDATA,n, (LPARAM)10);
 +				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_ADDSTRING, 0, (LPARAM)s);
 +				SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETITEMDATA, n, (LPARAM)10);
  				mir_snprintf(s, sizeof(s), "%s 15 %s", lpszEvery, lpszSeconds);
 -				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_ADDSTRING,0,(LPARAM)s);
 -				SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_SETITEMDATA,n, (LPARAM)15);
 +				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_ADDSTRING, 0, (LPARAM)s);
 +				SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETITEMDATA, n, (LPARAM)15);
  				mir_snprintf(s, sizeof(s), "%s 20 %s", lpszEvery, lpszSeconds);
 -				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_ADDSTRING,0,(LPARAM)s);
 -				SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_SETITEMDATA,n, (LPARAM)20);
 +				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_ADDSTRING, 0, (LPARAM)s);
 +				SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETITEMDATA, n, (LPARAM)20);
  				mir_snprintf(s, sizeof(s), "%s 30 %s", lpszEvery, lpszSeconds);
 -				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_ADDSTRING,0,(LPARAM)s);
 -				SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_SETITEMDATA,n, (LPARAM)30);
 +				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_ADDSTRING, 0, (LPARAM)s);
 +				SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETITEMDATA, n, (LPARAM)30);
  				mir_snprintf(s, sizeof(s), "%s 60 %s", lpszEvery, lpszSeconds);
 -				n = SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_ADDSTRING,0,(LPARAM)s);
 -				SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_SETITEMDATA,n, (LPARAM)60);
 +				n = SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_ADDSTRING, 0, (LPARAM)s);
 +				SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETITEMDATA, n, (LPARAM)60);
  				if (NewReminderVisible == 2 && pEditReminder->RepeatSound)
  				{
  					mir_snprintf(s, sizeof(s), "%s %d %s", lpszEvery, pEditReminder->RepeatSound, lpszSeconds);
  					SetDlgItemText(Dialog, IDC_COMBO_REPEATSND, s);
 -					SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_SETCURSEL,SendDlgItemMessage(Dialog,IDC_COMBO_REPEATSND,CB_FINDSTRINGEXACT,(WPARAM)-1,(LPARAM)s),0);
 +					SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_SETCURSEL, SendDlgItemMessage(Dialog, IDC_COMBO_REPEATSND, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)s), 0);
  				}
  				else
  				{
 @@ -2236,14 +2236,14 @@ INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wParam,LPARA  			// populate sound selection combo
  			{
 -				int n = SendDlgItemMessage(Dialog,IDC_COMBO_SOUND,CB_ADDSTRING,0,(LPARAM)Translate("Default"));
 -				SendDlgItemMessage(Dialog,IDC_COMBO_SOUND,CB_SETITEMDATA,n, 0);
 -				n = SendDlgItemMessage(Dialog,IDC_COMBO_SOUND,CB_ADDSTRING,0,(LPARAM)Translate("Alternative 1"));
 -				SendDlgItemMessage(Dialog,IDC_COMBO_SOUND,CB_SETITEMDATA,n, (LPARAM)1);
 -				n = SendDlgItemMessage(Dialog,IDC_COMBO_SOUND,CB_ADDSTRING,0,(LPARAM)Translate("Alternative 2"));
 -				SendDlgItemMessage(Dialog,IDC_COMBO_SOUND,CB_SETITEMDATA,n, (LPARAM)2);
 -				n = SendDlgItemMessage(Dialog,IDC_COMBO_SOUND,CB_ADDSTRING,0,(LPARAM)Translate("None"));
 -				SendDlgItemMessage(Dialog,IDC_COMBO_SOUND,CB_SETITEMDATA,n, (LPARAM)-1);
 +				int n = SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_ADDSTRING, 0, (LPARAM)Translate("Default"));
 +				SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_SETITEMDATA, n, 0);
 +				n = SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_ADDSTRING, 0, (LPARAM)Translate("Alternative 1"));
 +				SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_SETITEMDATA, n, (LPARAM)1);
 +				n = SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_ADDSTRING, 0, (LPARAM)Translate("Alternative 2"));
 +				SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_SETITEMDATA, n, (LPARAM)2);
 +				n = SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_ADDSTRING, 0, (LPARAM)Translate("None"));
 +				SendDlgItemMessage(Dialog, IDC_COMBO_SOUND, CB_SETITEMDATA, n, (LPARAM)-1);
  				if (NewReminderVisible == 2 && pEditReminder->SoundSel)
  				{
 @@ -2573,9 +2573,9 @@ void UpdateGeomFromWnd(HWND Dialog, int *geom, int *colgeom, int nCols)  static BOOL DoListContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam,REMINDERDATA *pReminder)
  {
  	HWND hwndListView = (HWND)wParam;
 -	if (hwndListView != GetDlgItem(AhWnd,IDC_LISTREMINDERS)) return FALSE;
 -	HMENU hMenuLoad = LoadMenu(hinstance,_T("MNU_REMINDERPOPUP"));
 -	HMENU FhMenu = GetSubMenu(hMenuLoad,0);
 +	if (hwndListView != GetDlgItem(AhWnd, IDC_LISTREMINDERS)) return FALSE;
 +	HMENU hMenuLoad = LoadMenu(hinstance, _T("MNU_REMINDERPOPUP"));
 +	HMENU FhMenu = GetSubMenu(hMenuLoad, 0);
  	MENUITEMINFO mii;
  	mii.cbSize = sizeof(mii);
 @@ -2621,8 +2621,8 @@ INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPA  		return 0;
  	case WM_RELOAD:
  		{
 -			SetDlgItemText(Dialog,IDC_REMINDERDATA,_T(""));
 -			InitListView(GetDlgItem(Dialog,IDC_LISTREMINDERS));
 +			SetDlgItemText(Dialog, IDC_REMINDERDATA, _T(""));
 +			InitListView(GetDlgItem(Dialog, IDC_LISTREMINDERS));
  			return TRUE;
  		}
  	case WM_CONTEXTMENU:
 @@ -2652,7 +2652,7 @@ INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPA  			SendMessage(Dialog, WM_SETICON, (WPARAM)ICON_BIG, (LPARAM)hIcon);
  			TranslateDialogDefault(Dialog);
 -			SetDlgItemText(Dialog,IDC_REMINDERDATA,_T(""));
 +			SetDlgItemText(Dialog,IDC_REMINDERDATA, _T(""));
  			HWND H = GetDlgItem(Dialog,IDC_LISTREMINDERS);
  			lvCol.mask = LVCF_TEXT | LVCF_WIDTH;
  			S = Translate("Reminder text");
 @@ -2765,7 +2765,7 @@ INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPA  			case IDM_DELETEALLREMINDERS:
  				if (RemindersList && MessageBox(Dialog, TranslateT("Are you sure you want to delete all reminders?"), TranslateT(SECTIONNAME), MB_OKCANCEL) == IDOK)
  				{
 -					SetDlgItemText(Dialog,IDC_REMINDERDATA,_T(""));
 +					SetDlgItemText(Dialog, IDC_REMINDERDATA, _T(""));
  					DeleteReminders();
  					InitListView(GetDlgItem(Dialog,IDC_LISTREMINDERS));
  				}
 @@ -2781,7 +2781,7 @@ INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPA  						if (I != -1
  							&& MessageBox(Dialog, TranslateT("Are you sure you want to delete this reminder?"), TranslateT(SECTIONNAME), MB_OKCANCEL) == IDOK)
  						{
 -							SetDlgItemText(Dialog,IDC_REMINDERDATA,_T(""));
 +							SetDlgItemText(Dialog, IDC_REMINDERDATA, _T(""));
  							DeleteReminder((REMINDERDATA*)TreeGetAt(RemindersList, I));
  							JustSaveReminders();
  							InitListView(H);
 diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp index ab5c252a3c..67a5b3526c 100644 --- a/plugins/Nudge/src/main.cpp +++ b/plugins/Nudge/src/main.cpp @@ -729,7 +729,7 @@ void Nudge_AddAccount(PROTOACCOUNT *proto)  	newNudge->item.hEvent = hevent;
  	TCHAR soundDesc[MAXMODULELABELLENGTH + 10];
 -	mir_sntprintf(soundDesc,sizeof(soundDesc),_T("Nudge for %s"),proto->tszAccountName);
 +	mir_sntprintf(soundDesc,sizeof(soundDesc), LPGENT("Nudge for %s"),proto->tszAccountName);
  	SkinAddNewSoundExT(newNudge->item.NudgeSoundname, LPGENT("Nudge"), soundDesc);
  	newNudge->next = NudgeList;
 diff --git a/plugins/PackUpdater/Src/Events.cpp b/plugins/PackUpdater/Src/Events.cpp index eef80fc3f4..85cd8ea63f 100644 --- a/plugins/PackUpdater/Src/Events.cpp +++ b/plugins/PackUpdater/Src/Events.cpp @@ -30,8 +30,8 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)  	hkd.cbSize = sizeof(hkd);
  	hkd.dwFlags = HKD_TCHAR;
  	hkd.pszName = "Check for pack updates";
 -	hkd.ptszDescription = _T("Check for pack updates");
 -	hkd.ptszSection = _T("Pack Updater");
 +	hkd.ptszDescription = LPGENT("Check for pack updates");
 +	hkd.ptszSection = LPGENT("Pack Updater");
  	hkd.pszService = MODNAME"/CheckUpdates";
  	hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, VK_F10) | HKF_MIRANDA_LOCAL;
  	hkd.lParam = FALSE;
 diff --git a/plugins/PackUpdater/Src/Notifications.h b/plugins/PackUpdater/Src/Notifications.h index 09bc77a810..17f896c003 100644 --- a/plugins/PackUpdater/Src/Notifications.h +++ b/plugins/PackUpdater/Src/Notifications.h @@ -67,6 +67,6 @@ static struct {  	TCHAR *Text;
  	int Action;
  } PopupActions[] = {
 -	_T("Close popup"), PCA_CLOSEPOPUP,
 -	_T("Do nothing"), PCA_DONOTHING
 +	LPGENT("Close popup"), PCA_CLOSEPOPUP,
 +	LPGENT("Do nothing"), PCA_DONOTHING
  };
 diff --git a/plugins/PackUpdater/Src/PackUpdater.cpp b/plugins/PackUpdater/Src/PackUpdater.cpp index 6622a6ba21..7ab4ab7e50 100644 --- a/plugins/PackUpdater/Src/PackUpdater.cpp +++ b/plugins/PackUpdater/Src/PackUpdater.cpp @@ -74,7 +74,7 @@ extern "C" __declspec(dllexport) int Load(void)  	mi.position = -0x7FFFFFFF;
  	mi.flags = CMIF_TCHAR;
  	mi.hIcon = Skin_GetIcon("check_update");
 -	mi.ptszName = _T("Check for pack updates");
 +	mi.ptszName = LPGENT("Check for pack updates");
  	mi.pszService = MODNAME"/CheckUpdates";
  	Menu_AddMainMenuItem(&mi);
  	// Add empty updates folder menu item
 @@ -84,7 +84,7 @@ extern "C" __declspec(dllexport) int Load(void)  	mi.position = -0x7FFFFFFF;
  	mi.flags = CMIF_TCHAR;
  	mi.hIcon = Skin_GetIcon("empty_folder");
 -	mi.ptszName = _T("Clear pack updates folder");
 +	mi.ptszName = LPGENT("Clear pack updates folder");
  	mi.pszService = MODNAME"/EmptyFolder";
  	Menu_AddMainMenuItem(&mi);
 diff --git a/plugins/PasteIt/src/Options.cpp b/plugins/PasteIt/src/Options.cpp index 49309bc580..5552ac0d6a 100644 --- a/plugins/PasteIt/src/Options.cpp +++ b/plugins/PasteIt/src/Options.cpp @@ -34,27 +34,27 @@ struct TCpTable {  	TCHAR *cpName;
  }
  cpTable[] = {
 -	{ CP_ACP,	_T("Use default codepage")	 },
 -	{ CP_UTF8,	_T("UTF-8")	 },
 -	{ 874,	_T("Thai")	 },
 -	{ 932,	_T("Japanese") },
 -	{ 936,	_T("Simplified Chinese") },
 -	{ 949,	_T("Korean") },
 -	{ 950,	_T("Traditional Chinese") },
 -	{ 1250,	_T("Central European") },
 -	{ 1251,	_T("Cyrillic") },
 -	{ 20866,  _T("Cyrillic KOI8-R") },
 -	{ 1252,	_T("Latin I") },
 -	{ 1253,	_T("Greek") },
 -	{ 1254,	_T("Turkish") },
 -	{ 1255,	_T("Hebrew") },
 -	{ 1256,	_T("Arabic") },
 -	{ 1257,	_T("Baltic") },
 -	{ 1258,	_T("Vietnamese") },
 -	{ 1361,	_T("Korean (Johab)") },
 -	{ CP_UTF7,	_T("UTF-7")	 },
 -	{ 1200,	_T("UTF-16") },
 -	{ 1201,	_T("UTF-16BE")	 }
 +	{ CP_ACP,	LPGENT("Use default codepage")	 },
 +	{ CP_UTF8,	LPGENT("UTF-8")	 },
 +	{ 874,	LPGENT("Thai")	 },
 +	{ 932,	LPGENT("Japanese") },
 +	{ 936,	LPGENT("Simplified Chinese") },
 +	{ 949,	LPGENT("Korean") },
 +	{ 950,	LPGENT("Traditional Chinese") },
 +	{ 1250,	LPGENT("Central European") },
 +	{ 1251,	LPGENT("Cyrillic") },
 +	{ 20866,  LPGENT("Cyrillic KOI8-R") },
 +	{ 1252,	LPGENT("Latin I") },
 +	{ 1253,	LPGENT("Greek") },
 +	{ 1254,	LPGENT("Turkish") },
 +	{ 1255,	LPGENT("Hebrew") },
 +	{ 1256,	LPGENT("Arabic") },
 +	{ 1257,	LPGENT("Baltic") },
 +	{ 1258,	LPGENT("Vietnamese") },
 +	{ 1361,	LPGENT("Korean (Johab)") },
 +	{ CP_UTF7,	LPGENT("UTF-7")	 },
 +	{ 1200,	LPGENT("UTF-16") },
 +	{ 1201,	LPGENT("UTF-16BE")	 }
  };
  Options::Options()
 diff --git a/plugins/PasteIt/src/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp index 4d23855372..0297d056f9 100644 --- a/plugins/PasteIt/src/PasteIt.cpp +++ b/plugins/PasteIt/src/PasteIt.cpp @@ -370,7 +370,7 @@ void InitMenuItems()  	mi.flags = CMIF_ROOTPOPUP | CMIF_ICONFROMICOLIB | CMIF_TCHAR;
  	mi.icolibItem = icon.hIcolib;
  	mi.position = 3000090005;
 -	mi.ptszName = _T("Paste It");
 +	mi.ptszName = LPGENT("Paste It");
  	hContactMenu = Menu_AddContactMenuItem(&mi);
 @@ -380,15 +380,15 @@ void InitMenuItems()  	mi.pszService = MS_PASTEIT_CONTACTMENU;
  	mi.hParentMenu = hContactMenu;
  	mi.popupPosition = FROM_CLIPBOARD;	
 -	mi.ptszName = _T("Paste from clipboard");
 +	mi.ptszName = LPGENT("Paste from clipboard");
  	Menu_AddContactMenuItem(&mi);
  	mi.popupPosition = FROM_FILE;
 -	mi.ptszName = _T("Paste from file");
 +	mi.ptszName = LPGENT("Paste from file");
  	Menu_AddContactMenuItem(&mi);
  	mi.popupPosition = DEF_PAGES_START - 1;
 -	mi.ptszName = _T("Default web page");
 +	mi.ptszName = LPGENT("Default web page");
  	HGENMENU hDefWebMenu = Menu_AddContactMenuItem(&mi);
  	CLISTMENUITEM mi2 = { sizeof(mi2) };
 diff --git a/plugins/Ping/src/options.cpp b/plugins/Ping/src/options.cpp index 04fedfbd23..50e14bc6c7 100644 --- a/plugins/Ping/src/options.cpp +++ b/plugins/Ping/src/options.cpp @@ -101,7 +101,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA  				ofn.Flags = CC_FULLOPEN;
  				//ofn.lpstrFile[0] = '\0';
  				ofn.nMaxFile = sizeof(options.log_filename);
 -				ofn.lpstrFilter = _T("All\0*.*\0Text\0*.TXT\0");
 +				ofn.lpstrFilter = LPGENT("All\0*.*\0Text\0*.TXT\0");
  				ofn.nFilterIndex = 1;
  				ofn.lpstrFileTitle = NULL;
  				ofn.nMaxFileTitle = 0;
 diff --git a/plugins/Ping/src/pingthread.cpp b/plugins/Ping/src/pingthread.cpp index 538cb9e5cb..9ff2b50efe 100644 --- a/plugins/Ping/src/pingthread.cpp +++ b/plugins/Ping/src/pingthread.cpp @@ -1017,7 +1017,7 @@ void InitList() {  		CLISTMENUITEM mi = { sizeof(mi) };
  		mi.flags = CMIF_TCHAR;
  		mi.popupPosition = 1000200001;
 -		mi.ptszPopupName = LPGENT( "Ping" );
 +		mi.ptszPopupName = LPGENT("Ping");
  		mi.position = 3000320001;
  		mi.hIcon = 0;//LoadIcon( hInst, 0);
  		mi.ptszName = LPGENT( "Show/Hide &Ping Window" );
 @@ -1034,8 +1034,8 @@ void InitList() {  		_tcsncpy(font_id.name, _T("List"), SIZEOF(font_id.name));
  		strncpy(font_id.dbSettingsGroup, "PING", sizeof(font_id.dbSettingsGroup));
  		strncpy(font_id.prefix, "Font", sizeof(font_id.prefix));
 -		_tcsncpy(font_id.backgroundGroup,_T("Ping"),SIZEOF(font_id.backgroundGroup));
 -		_tcsncpy(font_id.backgroundName,_T("Background"),SIZEOF(font_id.backgroundName));
 +		_tcsncpy(font_id.backgroundGroup, _T("Ping"), SIZEOF(font_id.backgroundGroup));
 +		_tcsncpy(font_id.backgroundName ,_T("Background"), SIZEOF(font_id.backgroundName));
  		font_id.order = 0;
  		FontRegisterT(&font_id);
 diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index 0bef6112b6..e9c067b978 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -1782,8 +1782,8 @@ BOOL ShowSelectKeyDlg(HWND hParent, LPSTR KeyPath)     ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_NONETWORKBUTTON;
     ofn.lpstrFile = KeyPath;
 -   ofn.lpstrFilter = _T("ASC files\0*.asc\0All files (*.*)\0*.*\0");
 -   ofn.lpstrTitle = _T("Open Key File");
 +   ofn.lpstrFilter = TranslateT("ASC files\0*.asc\0All files (*.*)\0*.*\0");
 +   ofn.lpstrTitle = TranslateT("Open Key File");
     if (!GetOpenFileName(&ofn)) return FALSE;
     return TRUE;
 @@ -1851,8 +1851,8 @@ BOOL SaveExportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv)     ofn.nMaxFile = MAX_PATH;
     ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_NONETWORKBUTTON;
     ofn.lpstrFile = szFile;
 -   ofn.lpstrFilter = _T("ASC files\0*.asc\0All files (*.*)\0*.*\0");
 -   ofn.lpstrTitle = (priv)?_T("Save Private Key File"):_T("Save Public Key File");
 +   ofn.lpstrFilter = TranslateT("ASC files\0*.asc\0All files (*.*)\0*.*\0");
 +   ofn.lpstrTitle = (priv)  ? TranslateT("Save Private Key File") : TranslateT("Save Public Key File");
     if (!GetSaveFileName(&ofn)) return FALSE;
     FILE *f=_tfopen(szFile,_T("wb"));
 @@ -1875,8 +1875,8 @@ BOOL LoadImportRSAKeyDlg(HWND hParent, LPSTR key, BOOL priv)     ofn.nMaxFile = MAX_PATH;
     ofn.Flags = OFN_EXPLORER | OFN_CREATEPROMPT | OFN_OVERWRITEPROMPT | OFN_NOREADONLYRETURN;
     ofn.lpstrFile = szFile;
 -   ofn.lpstrFilter = _T("ASC files\0*.asc\0All files (*.*)\0*.*\0");
 -   ofn.lpstrTitle = (priv)?_T("Load Private Key File"):_T("Load Public Key File");
 +   ofn.lpstrFilter = TranslateT("ASC files\0*.asc\0All files (*.*)\0*.*\0");
 +   ofn.lpstrTitle = (priv) ? TranslateT("Load Private Key File") : TranslateT("Load Public Key File");
     if (!GetOpenFileName(&ofn)) return FALSE;
     FILE *f=_tfopen(szFile,_T("rb"));
 diff --git a/protocols/MSN/src/msn_lists.cpp b/protocols/MSN/src/msn_lists.cpp index a95a61b8fb..c0db8ca166 100644 --- a/protocols/MSN/src/msn_lists.cpp +++ b/protocols/MSN/src/msn_lists.cpp @@ -288,7 +288,7 @@ void CMsnProto::MSN_CleanupLists(void)  			{
  				TCHAR text[256];
  				TCHAR* sze = mir_a2t(p.email);
 -				mir_sntprintf(text, SIZEOF(text), _T("Contact %s has been removed from the server.\nWould you like to keep it as \"Local Only\" contact to preserve history?"), sze);
 +				mir_sntprintf(text, SIZEOF(text), TranslateT("Contact %s has been removed from the server.\nWould you like to keep it as \"Local Only\" contact to preserve history?"), sze);
  				mir_free(sze);
  				TCHAR title[128];
 diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index 8c31f781ab..1dcd243fb5 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -442,7 +442,7 @@ void __cdecl CMsnProto::MsnSearchAckThread(void* arg)  	if (Lists_IsInList(LIST_FL, email))
  	{
 -		MSN_ShowPopup(emailT, _T("Contact already in your contact list"), MSN_ALLOW_MSGBOX, NULL);
 +		MSN_ShowPopup(emailT, TranslateT("Contact already in your contact list"), MSN_ALLOW_MSGBOX, NULL);
  		SendBroadcast(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, arg, 0);
  		mir_free(arg);
  		return;
  | 
