- Another portion of _T replacement (patch from person)

git-svn-id: http://svn.miranda-ng.org/main/trunk@3191 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

15 files changed, 117 insertions, 117 deletions

diff --git a/plugins/HistoryLinkListPlus/src/language.h b/plugins/HistoryLinkListPlus/src/language.h
index 92eb5a6486..7fa3deb742 100644
--- a/plugins/HistoryLinkListPlus/src/language.h
+++ b/plugins/HistoryLinkListPlus/src/language.h
@@ -20,18 +20,19 @@
 #ifndef _LANGUAGE_H

 #define _LANGUAGE_H

 

-#define TXT_PLUGINNAME		"History Linklist"

-#define TXT_EMPTYHISTORY	"History is empty!"

-#define TXT_ERROR			"Error"

-#define TXT_INCOMING		"incoming"

-#define TXT_OUTGOING		"outgoing"

-#define TXT_FILTER			"Filter"

-#define TXT_NOFILTER		"no filter"

-#define TXT_URLSONLY		"Web addresses only"

-#define TXT_MAILSONLY		"Mail addresses only"

-#define TXT_SEARCH			"Search"

-#define TXT_SEARCHFILTER	"Search Filter"

-#define TXT_NOSETTING		"no settings"

-#define TXT_DATE			"Date"

+#define TXT_PLUGINNAME		TranslateT("History Linklist")

+#define TXT_EMPTYHISTORY	TranslateT("History is empty!")

+#define TXT_NOLINKINHISTORY TranslateT("There are no links in history!")

+#define TXT_ERROR			TranslateT("Error")

+#define TXT_INCOMING		TranslateT("incoming")

+#define TXT_OUTGOING		TranslateT("outgoing")

+#define TXT_FILTER			TranslateT("Filter")

+#define TXT_NOFILTER		TranslateT("no filter")

+#define TXT_URLSONLY		TranslateT("Web addresses only")

+#define TXT_MAILSONLY		TranslateT("Mail addresses only")

+#define TXT_SEARCH			TranslateT("Search")

+#define TXT_SEARCHFILTER	TranslateT("Search Filter")

+#define TXT_NOSETTING		TranslateT("no settings")

+#define TXT_DATE			TranslateT("Date")

 

 #endif // _LANGUAGE_H
\ No newline at end of file
diff --git a/plugins/HistoryLinkListPlus/src/linklist.cpp b/plugins/HistoryLinkListPlus/src/linklist.cpp
index 4208fb0634..d087998374 100644
--- a/plugins/HistoryLinkListPlus/src/linklist.cpp
+++ b/plugins/HistoryLinkListPlus/src/linklist.cpp
@@ -164,7 +164,7 @@ static INT_PTR LinkList_Main(WPARAM wParam,LPARAM lParam)
 	hEvent = (HANDLE)CallService(MS_DB_EVENT_FINDFIRST, (WPARAM)hContact, 0);

 	if ( hEvent == NULL )

 	{

-		MessageBox(NULL, TranslateT(TXT_EMPTYHISTORY), TranslateT(TXT_PLUGINNAME), MB_OK | MB_ICONINFORMATION );

+		MessageBox(NULL, TXT_EMPTYHISTORY, TXT_PLUGINNAME, MB_OK | MB_ICONINFORMATION );

 		return 0;

 	}

 

@@ -219,7 +219,7 @@ static INT_PTR LinkList_Main(WPARAM wParam,LPARAM lParam)
 	SendMessage(hWndProgress, WM_CLOSE, 0, 0);

 	if ( ListCount(listStart) <= 0 ) {	

 		RemoveList(listStart);

-		MessageBox(NULL, TranslateT("There are no links in history!"), TranslateT(TXT_PLUGINNAME), MB_OK | MB_ICONINFORMATION);

+		MessageBox(NULL, TXT_NOLINKINHISTORY, TXT_PLUGINNAME, MB_OK | MB_ICONINFORMATION);

 		return 0;

 	}

 

diff --git a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
index 6e26d8538d..66892ef692 100644
--- a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
+++ b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
@@ -495,7 +495,7 @@ INT_PTR WINAPI SearchDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam
 		{

 			TranslateDialogDefault(hDlg);

 			SetWindowLongPtr(hDlg, GWLP_USERDATA, (LPARAM)lParam);

-			SetWindowText(hDlg, TranslateT(TXT_SEARCH));

+			SetWindowText(hDlg, TXT_SEARCH);

 			SendDlgItemMessage(hDlg, IDC_DIR_ALL, BM_SETCHECK, BST_CHECKED, 0);

 			SendDlgItemMessage(hDlg, IDC_TYPE_ALL, BM_SETCHECK, BST_CHECKED, 0);

 			return TRUE;

@@ -545,7 +545,7 @@ INT_PTR WINAPI SearchDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam
 					WriteLinkList(hListDlg, flags, DlgParam->listStart, buffer, 0);

 					free(buffer);

 					

-					mir_sntprintf(filter, _countof(filter), _T("%s: %s"), TranslateT(TXT_FILTER), TranslateT(TXT_SEARCHFILTER));

+					mir_sntprintf(filter, _countof(filter), _T("%s: %s"), TXT_FILTER, TXT_SEARCHFILTER);

 					SetDlgItemText(hWndMain, IDC_STATUS, filter);

 				}

 				break;

@@ -749,7 +749,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l
 					mCol = GetMirandaColour(&colourSet);

 					if(mCol == 1)

 					{

-						MessageBox(NULL, TranslateT(TXT_NOSETTING), TranslateT(TXT_ERROR), MB_OK | MB_ICONEXCLAMATION);

+						MessageBox(NULL, TXT_NOSETTING, TXT_ERROR, MB_OK | MB_ICONEXCLAMATION);

 						SendDlgItemMessage(hDlg, IDC_CHECK1, BM_SETCHECK, BST_UNCHECKED, 0);

 						break;

 					}

diff --git a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
index ea039e276e..5dfb7c5236 100644
--- a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
+++ b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
@@ -601,7 +601,7 @@ int WriteOptionExample(HWND hDlg, DWORD InColourSel, DWORD OutColourSel, DWORD B
 	SendDlgItemMessage( hDlg, IDC_OPTIONS_RE, EM_SETCHARFORMAT, SCF_SELECTION | SCF_WORD, (LPARAM) &cf);

 

 	if(options->showDate == 1)

-		SendDlgItemMessage( hDlg, IDC_OPTIONS_RE, EM_REPLACESEL, FALSE, (LPARAM)TranslateT(TXT_DATE));

+		SendDlgItemMessage( hDlg, IDC_OPTIONS_RE, EM_REPLACESEL, FALSE, (LPARAM)TXT_DATE);

 	

 	SendDlgItemMessage( hDlg, IDC_OPTIONS_RE, EM_REPLACESEL, FALSE, (LPARAM) _T("\n"));

 

@@ -728,17 +728,17 @@ void GetFilterText(HMENU listMenu, LPTSTR filter, size_t max_len)
 		if ( GetMenuState(listMenu, IDM_DIR_IN, MF_BYCOMMAND) == MF_CHECKED )

 		{

 			//incoming URLs

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), TranslateT(TXT_INCOMING), TranslateT(TXT_URLSONLY));

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, TXT_INCOMING, TXT_URLSONLY);

 		}

 		else if ( GetMenuState(listMenu, IDM_DIR_OUT, MF_BYCOMMAND) == MF_CHECKED )

 		{

 			//outgoing URLs

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), TranslateT(TXT_OUTGOING), TranslateT(TXT_URLSONLY));

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, TXT_OUTGOING, TXT_URLSONLY);

 		}

 		else

 		{

 			// both directions (URL)

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), "", TranslateT(TXT_URLSONLY));

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, "", TXT_URLSONLY);

 		}

 	}

 	else if ( GetMenuState(listMenu, IDM_TYPE_MAIL, MF_BYCOMMAND) == MF_CHECKED )

@@ -746,17 +746,17 @@ void GetFilterText(HMENU listMenu, LPTSTR filter, size_t max_len)
 		if ( GetMenuState(listMenu, IDM_DIR_IN, MF_BYCOMMAND) == MF_CHECKED )

 		{

 			//incoming mail

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), TranslateT(TXT_INCOMING), TranslateT(TXT_MAILSONLY));

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, TXT_INCOMING, TXT_MAILSONLY);

 		}

 		else if ( GetMenuState(listMenu, IDM_DIR_OUT, MF_BYCOMMAND) == MF_CHECKED )

 		{

 			//outgoing mail

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), TranslateT(TXT_OUTGOING), TranslateT(TXT_MAILSONLY));

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, TXT_OUTGOING, TXT_MAILSONLY);

 		}

 		else

 		{

 			// both directions (mail)

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), "", TranslateT(TXT_MAILSONLY));

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, "", TXT_MAILSONLY);

 		}

 	}

 	else

@@ -764,17 +764,17 @@ void GetFilterText(HMENU listMenu, LPTSTR filter, size_t max_len)
 		if ( GetMenuState(listMenu, IDM_DIR_IN, MF_BYCOMMAND) == MF_CHECKED )

 		{

 			//incoming (both)

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), TranslateT(TXT_INCOMING), "");

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, TXT_INCOMING, "");

 		}

 		else if ( GetMenuState(listMenu, IDM_DIR_OUT, MF_BYCOMMAND) == MF_CHECKED )

 		{

 			//outgoing (both)

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), TranslateT(TXT_OUTGOING), "");

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, TXT_OUTGOING, "");

 		}

 		else

 		{

 			// no filter

-			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TranslateT(TXT_FILTER), TranslateT(TXT_NOFILTER), "");

+			mir_sntprintf(filter, max_len, _T("%s: %s %s"), TXT_FILTER, TXT_NOFILTER, "");

 		}

 	}

 }

diff --git a/plugins/KeyboardNotify/src/options.cpp b/plugins/KeyboardNotify/src/options.cpp
index 49a3f3fd89..28a403aeeb 100644
--- a/plugins/KeyboardNotify/src/options.cpp
+++ b/plugins/KeyboardNotify/src/options.cpp
@@ -118,7 +118,7 @@ extern PROCESS_LIST ProcessList;
 HWND hwndProto, hwndBasic, hwndEffect, hwndTheme, hwndIgnore, hwndCurrentTab;

 

 TCHAR *AttendedName[]={_T("Miranda"), _T("Windows")};

-TCHAR *OrderName[]={_T("left->right"), _T("right->left"), _T("left<->right")};

+TCHAR *OrderName[]={TranslateT("left->right"), TranslateT("right->left"), TranslateT("left<->right")};

 

 PROCESS_LIST ProcessListAux;

 XSTATUS_INFO *XstatusListAux;

@@ -937,12 +937,12 @@ INT_PTR CALLBACK DlgProcThemeOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				ofn.lStructSize = sizeof(OPENFILENAME);

 				ofn.hwndOwner = hwndDlg;

 				ofn.hInstance = NULL;

-				_tcscpy(filter,_T("Keyboard Notify Theme"));

+				_tcscpy(filter, TranslateT("Keyboard Notify Theme"));

 				wcscat(filter, _T(" (*.knt)"));

 				pfilter = filter + _tcslen(filter) + 1;

 				_tcscpy(pfilter, _T("*.knt"));

 				pfilter = pfilter + _tcslen(pfilter) + 1;

-				_tcscpy(pfilter, _T("All Files"));

+				_tcscpy(pfilter, TranslateT("All Files"));

 				pfilter = pfilter + _tcslen(pfilter) + 1;

 				_tcscpy(pfilter, _T("*.*"));

 				pfilter = pfilter + _tcslen(pfilter) + 1;

@@ -965,12 +965,12 @@ INT_PTR CALLBACK DlgProcThemeOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				ofn.lStructSize = sizeof(OPENFILENAME);

 				ofn.hwndOwner = hwndDlg;

 				ofn.hInstance = NULL;

-				_tcscpy(filter, _T("Keyboard Notify Theme"));

+				_tcscpy(filter, TranslateT("Keyboard Notify Theme"));

 				wcscat(filter, _T(" (*.knt)"));

 				pfilter = filter + _tcslen(filter) + 1;

 				_tcscpy(pfilter, _T("*.knt"));

 				pfilter = pfilter + _tcslen(pfilter) + 1;

-				_tcscpy(pfilter, _T("All Files"));

+				_tcscpy(pfilter, TranslateT("All Files"));

 				pfilter = pfilter + _tcslen(pfilter) + 1;

 				_tcscpy(pfilter, _T("*.*"));

 				pfilter = pfilter + _tcslen(pfilter) + 1;

diff --git a/plugins/ListeningTo/src/players/generic.cpp b/plugins/ListeningTo/src/players/generic.cpp
index 62582ab7bc..ebbb1ff2a5 100644
--- a/plugins/ListeningTo/src/players/generic.cpp
+++ b/plugins/ListeningTo/src/players/generic.cpp
@@ -85,7 +85,7 @@ GenericPlayer::GenericPlayer()
 

 	RegisterClass(&wc);

 

-	hWnd = CreateWindow(MIRANDA_WINDOWCLASS, _T("Miranda ListeningTo receiver"), 

+	hWnd = CreateWindow(MIRANDA_WINDOWCLASS, LPGENT("Miranda ListeningTo receiver"), 

 						0, 0, 0, 0, 0, NULL, NULL, hInst, NULL);

 }

 

@@ -134,14 +134,14 @@ void GenericPlayer::ProcessReceived()
 	int pCount = 0;

 	WCHAR *p = received;

 	do {

-		*p1 = L'\0';

+		*p1 = _T('\0');

 		parts[pCount] = p;

 		pCount ++;

 		p = p1 + 2;

-		p1 = wcsstr(p, L"\\0");

+		p1 = wcsstr(p, _T("\\0"));

 	} while( p1 != NULL && pCount < 10 );

 	if (p1 != NULL)

-		*p1 = L'\0';

+		*p1 = _T('\0');

 	parts[pCount] = p;

 

 	if (pCount < 5)

@@ -186,7 +186,7 @@ void GenericPlayer::ProcessReceived()
 

 		li->cbSize = sizeof(listening_info);

 		li->dwFlags = LTI_TCHAR;

-		li->ptszType = U2TD(parts[2], L"Music");

+		li->ptszType = U2TD(parts[2], _T("Music"));

 		li->ptszTitle = U2T(parts[3]);

 		li->ptszArtist = U2T(parts[4]);

 		li->ptszAlbum = U2T(parts[5]);

@@ -255,7 +255,7 @@ void GenericPlayer::NewData(const WCHAR *data, size_t len)
 {

 //	m_log(_T("NewData"), _T("Processing"));

 

-	if (data[0] == L'\0')

+	if (data[0] == _T('\0'))

 	{

 //		m_log(_T("NewData"), _T("ERROR: Text is empty"));

 		return;

diff --git a/plugins/ListeningTo/src/players/wmp.cpp b/plugins/ListeningTo/src/players/wmp.cpp
index a636a45119..5e154576ed 100644
--- a/plugins/ListeningTo/src/players/wmp.cpp
+++ b/plugins/ListeningTo/src/players/wmp.cpp
@@ -37,7 +37,7 @@ WindowsMediaPlayer *singleton = NULL;
 WindowsMediaPlayer::WindowsMediaPlayer()

 {

 	name = _T("WindowsMediaPlayer");

-	received[0] = L'\0';

+	received[0] = _T('\0');

 	singleton = this;

 

 	WNDCLASS wc = {0};

@@ -47,7 +47,7 @@ WindowsMediaPlayer::WindowsMediaPlayer()
 

 	RegisterClass(&wc);

 

-	hWnd = CreateWindow(WMP_WINDOWCLASS, _T("Miranda ListeningTo WMP receiver"), 

+	hWnd = CreateWindow(WMP_WINDOWCLASS, LPGENT("Miranda ListeningTo WMP receiver"), 

 							0, 0, 0, 0, 0, NULL, NULL, hInst, NULL);

 }

 

@@ -152,7 +152,7 @@ void WindowsMediaPlayer::NewData(const WCHAR *data, size_t len)
 	if (wcsncmp(received, data, len) != 0)

 	{

 		wcsncpy(received, data, len);

-		received[len] = L'\0';

+		received[len] = _T('\0');

 

 /*

 		m_log(_T("ReceiverWndProc"), _T("WMP : New data: [%d] %s"), len, received);

diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index 2b6b8a10ab..99b0d49b04 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -1049,7 +1049,7 @@ static int TabsrmmButtonsInit(WPARAM wParam, LPARAM lParam)
 	bbd.pszModuleName = MODULENAME;

 	bbd.dwButtonID = 0;

 	bbd.dwDefPos = 1000;

-	bbd.ptszTooltip = _T("Browse Received Files");

+	bbd.ptszTooltip = LPGENT("Browse Received Files");

 	bbd.bbbFlags = BBBF_ISLSIDEBUTTON | BBBF_CANBEHIDDEN;

 	bbd.hIcon = Skin_GetIconHandle("miex_recfiles");

 	CallService (MS_BB_ADDBUTTON, 0, (LPARAM)&bbd);

diff --git a/plugins/MirOTR/MirOTR/src/dllmain.cpp b/plugins/MirOTR/MirOTR/src/dllmain.cpp
index 4e5e0f91c9..ebba7331d7 100644
--- a/plugins/MirOTR/MirOTR/src/dllmain.cpp
+++ b/plugins/MirOTR/MirOTR/src/dllmain.cpp
@@ -74,7 +74,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) {
 		MessageBox(0, TranslateT(LANG_OTR_SECUREIM_TEXT), TranslateT(LANG_OTR_SECUREIM_TITLE), 0x30);

 	}

 	if (!options.bHaveSRMMIcons) {

-		MessageBox(0, _T("OTR Info"), _T("Your SRMM plugin does not support status icons. Not all OTR-functions are available!"), 0x30);

+		MessageBox(NULL, TranslateT("OTR Info"), TranslateT("Your SRMM plugin does not support status icons. Not all OTR-functions are available!"), 0x30);

 	}

 

 	// HookEvent(ME_OPT_INITIALISE, OptInit);

diff --git a/plugins/ModernOpt/src/modernopt.cpp b/plugins/ModernOpt/src/modernopt.cpp
index 11c2bb2de1..af0dbc3898 100644
--- a/plugins/ModernOpt/src/modernopt.cpp
+++ b/plugins/ModernOpt/src/modernopt.cpp
@@ -76,15 +76,15 @@ static void ModernOptUI_SelectSection(HWND hwndDlg, struct ModernOptionsData *da
 // Main option pages

 struct ModernOptMainPageInfo g_ModernOptPages[MODERNOPT_PAGE_COUNT] =

 {

-	{0,					FALSE,	IDI_MIRANDA,		_T("Home"),			_T("Miranda NG configuration center")},

-	{IDC_BTN_ACCOUNTS,	TRUE,	IDI_BIG_NETWORK,	_T("Accounts"),		_T("Setup your account information to start messaging.")},

-	{IDC_BTN_SKINS,		TRUE,	IDI_BIG_SKINS,		_T("Style"),		_T("Change the look of Miranda NG according to your taste.")},

-	{IDC_BTN_CLIST,		TRUE,	IDI_BIG_BUDDYLIST,	_T("Contacts"),		_T("Configure behaviour of your contact list.")},

-	{IDC_BTN_MESSAGING,	TRUE,	IDI_BIG_MESSAGE,	_T("Chats"),		_T("Customize look&&feel of your chat windows here.")},

-	{IDC_BTN_IGNORE,	TRUE,	IDI_BIG_IGNORE,		_T("Ignore"),		_T("Ban those users and events, you are annoyed with.")},

-	{IDC_BTN_STATUS,	TRUE,	IDI_BIG_STATUS,		_T("Status"),		_T("Set your status messages and idle reporting.")},

-	{IDC_BTN_ADVANCED,	TRUE,	IDI_BIG_ADVANCED,	_T("Advanced"),		_T("")},

-	{IDC_BTN_PLUGINS,	TRUE,	IDI_BIG_MODULES,	_T("Addons"),		_T("Miranda NG is all about plugins. Manage all the plugins you have here.")},

+	{0,					FALSE,	IDI_MIRANDA,		_T("Home"),			LPGENT("Miranda NG configuration center")},

+	{IDC_BTN_ACCOUNTS,	TRUE,	IDI_BIG_NETWORK,	_T("Accounts"),		LPGENT("Setup your account information to start messaging.")},

+	{IDC_BTN_SKINS,		TRUE,	IDI_BIG_SKINS,		_T("Style"),		LPGENT("Change the look of Miranda NG according to your taste.")},

+	{IDC_BTN_CLIST,		TRUE,	IDI_BIG_BUDDYLIST,	_T("Contacts"),		LPGENT("Configure behaviour of your contact list.")},

+	{IDC_BTN_MESSAGING,	TRUE,	IDI_BIG_MESSAGE,	_T("Chats"),		LPGENT("Customize look&&feel of your chat windows here.")},

+	{IDC_BTN_IGNORE,	TRUE,	IDI_BIG_IGNORE,		_T("Ignore"),		LPGENT("Ban those users and events, you are annoyed with.")},

+	{IDC_BTN_STATUS,	TRUE,	IDI_BIG_STATUS,		_T("Status"),		LPGENT("Set your status messages and idle reporting.")},

+	{IDC_BTN_ADVANCED,	TRUE,	IDI_BIG_ADVANCED,	_T("Advanced"),		LPGENT("")},

+	{IDC_BTN_PLUGINS,	TRUE,	IDI_BIG_MODULES,	_T("Addons"),		LPGENT("Miranda NG is all about plugins. Manage all the plugins you have here.")},

 };

 

 ////////////////////////////////////////////////////////////////////////////////

@@ -266,7 +266,7 @@ static INT_PTR CALLBACK ModernOptDlgProc(HWND hwndDlg, UINT  msg, WPARAM wParam,
 			{

 				int idResult = MessageBox(hwndDlg,

 					TranslateT("You have some unsaved changes here.\n Do you wish to apply settings before switching?"),

-					_T("Miranda NG"), MB_ICONQUESTION|MB_YESNOCANCEL);

+					_T("Miranda NG"), MB_ICONQUESTION | MB_YESNOCANCEL);

 				if (idResult == IDCANCEL) break;

 				sttNotifyPages(dat, (idResult == IDYES) ? PSN_APPLY : PSN_RESET);

 			}

diff --git a/plugins/Msg_Export/src/FileViewer.cpp b/plugins/Msg_Export/src/FileViewer.cpp
index 39ee4305c0..065a4b5f32 100755
--- a/plugins/Msg_Export/src/FileViewer.cpp
+++ b/plugins/Msg_Export/src/FileViewer.cpp
@@ -234,7 +234,7 @@ int CLStreamRTFInfo::nWriteHeader( char * pszTarget , int nLen )
 

 	if( nSrcLen > nLen )

 	{

-		MessageBox( NULL , LPGENT("Failed to write to the RichEdit the buffer was to small."),MSG_BOX_TITEL,MB_OK );

+		MessageBox( NULL , TranslateT("Failed to write to the RichEdit the buffer was to small."), MSG_BOX_TITEL, MB_OK );

 		return 0; // target buffer to small

 	}

 

@@ -267,7 +267,7 @@ int CLStreamRTFInfo::nLoadFileStream( LPBYTE pbBuff , LONG cb )
 

 	if( nOptimalReadLen < 500 )

 	{

-		MessageBox( NULL , LPGENT("Error: Optimal buffer size decrecied to a to low size !!"),MSG_BOX_TITEL,MB_OK );

+		MessageBox( NULL , TranslateT("Error: Optimal buffer size decrecied to a to low size !!"), MSG_BOX_TITEL, MB_OK );

 		return 0;

 	}

 

@@ -357,7 +357,7 @@ int CLStreamRTFInfo::nLoadFileStream( LPBYTE pbBuff , LONG cb )
 

 					LONG lExtraRead = (n+1) - dwRead;

 					if( lExtraRead >= 0 )

-						MessageBox( NULL , LPGENT("Internal error !! (lExtraRead >= 0)"),MSG_BOX_TITEL,MB_OK );

+						MessageBox( NULL , TranslateT("Internal error !! (lExtraRead >= 0)"), MSG_BOX_TITEL, MB_OK );

 					SetFilePointer( hFile , lExtraRead , NULL , FILE_CURRENT );

 					bCheckFirstForNick = true;

 					return dwCurrent;

@@ -677,9 +677,9 @@ bool bLoadFile( HWND hwndDlg , CLHistoryDlg * pclDlg )
 	DWORD dwStart = GetTickCount();

 

 	HWND hRichEdit = GetDlgItem( hwndDlg , IDC_RICHEDIT );

-	if( ! hRichEdit )

+	if( !hRichEdit )

 	{

-		MessageBox( hwndDlg , LPGENT("Failed to get handle to RichEdit!"),MSG_BOX_TITEL,MB_OK );

+		MessageBox( hwndDlg , TranslateT("Failed to get handle to RichEdit!"), MSG_BOX_TITEL, MB_OK );

 		return false;

 	}

 

@@ -770,7 +770,7 @@ bool bLoadFile( HWND hwndDlg , CLHistoryDlg * pclDlg )
 	//delete [] pabFileData;

 

 	_TCHAR szTmp[100];

-	mir_sntprintf( szTmp , 99, LPGENT("File open time %d\n") , GetTickCount() - dwStart );

+	mir_sntprintf( szTmp , 99, _T("File open time %d\n") , GetTickCount() - dwStart );

 	OutputDebugString( szTmp );

 

 

@@ -944,7 +944,7 @@ LRESULT CALLBACK EditSubclassProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 				res = (int)SendMessage(hwnd, EM_FINDTEXTW, (WPARAM)fr->Flags,(LPARAM)&ft);

 				if(res == -1)

 				{

-					MessageBox( hwnd , LPGENT("Search string was not found !"),MSG_BOX_TITEL,MB_OK );

+					MessageBox( hwnd , TranslateT("Search string was not found !"), MSG_BOX_TITEL, MB_OK );

 					return 0;

 				}

 			}

@@ -1276,12 +1276,12 @@ static INT_PTR CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam,
 				LRESULT nWriteOk = SendMessage(hRichEdit, EM_STREAMOUT, (WPARAM)SF_RTF , (LPARAM)&eds);

 				if( nWriteOk <= 0 || eds.dwError != 0 )

 				{

-					DisplayLastError( LPGENT("Failed to save file") );

+					DisplayLastError( TranslateT("Failed to save file") );

 					CloseHandle( hFile );

 					return TRUE;

 				}

 				CloseHandle( hFile );

-				tstring sReport = LPGENT("History was saved successfully in file\r\n");

+				tstring sReport = TranslateT("History was saved successfully in file\r\n");

 				sReport += sFile;

 				MessageBox( NULL , sReport.c_str() ,MSG_BOX_TITEL ,MB_OK );

 				return TRUE;

diff --git a/plugins/Msg_Export/src/Glob.h b/plugins/Msg_Export/src/Glob.h
index ec898ac3f1..2fba4e868d 100755
--- a/plugins/Msg_Export/src/Glob.h
+++ b/plugins/Msg_Export/src/Glob.h
@@ -22,7 +22,7 @@
 #include <windows.h>

 

 #define MODULE "Msg_Export"

-#define MSG_BOX_TITEL _T("Miranda (Msg_Export.dll)")

+#define MSG_BOX_TITEL TranslateT("Miranda NG (Message Export Plugin)")

 

 extern HINSTANCE hInstance;

 

diff --git a/plugins/Msg_Export/src/main.cpp b/plugins/Msg_Export/src/main.cpp
index a2a5c63789..15b43dab30 100755
--- a/plugins/Msg_Export/src/main.cpp
+++ b/plugins/Msg_Export/src/main.cpp
@@ -171,17 +171,17 @@ int MainInit(WPARAM /*wparam*/,LPARAM /*lparam*/)
 

 	hDBEventAdded = HookEvent( ME_DB_EVENT_ADDED , nExportEvent );

 	if( !hDBEventAdded )

-		MessageBox( NULL , LPGENT("Failed to HookEvent ME_DB_EVENT_ADDED") , MSG_BOX_TITEL , MB_OK );

+		MessageBox(NULL, _T("Failed to HookEvent ME_DB_EVENT_ADDED"), MSG_BOX_TITEL, MB_OK );

 

 

-	hDBContactDeleted = HookEvent( ME_DB_CONTACT_DELETED , nContactDeleted );

+	hDBContactDeleted = HookEvent(ME_DB_CONTACT_DELETED , nContactDeleted );

 	if( !hDBContactDeleted )

-		MessageBox( NULL , LPGENT("Failed to HookEvent ME_DB_CONTACT_DELETED") , MSG_BOX_TITEL , MB_OK );

+		MessageBox(NULL, _T("Failed to HookEvent ME_DB_CONTACT_DELETED"), MSG_BOX_TITEL, MB_OK );

 	

 

-	hEventOptionsInitialize = HookEvent( ME_OPT_INITIALISE , OptionsInitialize );

+	hEventOptionsInitialize = HookEvent(ME_OPT_INITIALISE, OptionsInitialize );

 	if( !hEventOptionsInitialize )

-		MessageBox( NULL , LPGENT("Failed to HookEvent ME_OPT_INITIALISE") , MSG_BOX_TITEL , MB_OK );

+		MessageBox(NULL, _T("Failed to HookEvent ME_OPT_INITIALISE"), MSG_BOX_TITEL, MB_OK );

 

 

 

@@ -197,7 +197,7 @@ int MainInit(WPARAM /*wparam*/,LPARAM /*lparam*/)
 		hOpenHistoryMenuItem  = Menu_AddContactMenuItem(&mi);

 

 		if( !hOpenHistoryMenuItem )

-			MessageBox( NULL , LPGENT("Failed to add menu item Open Exported History\nCallService(MS_CLIST_ADDCONTACTMENUITEM,...)") , MSG_BOX_TITEL , MB_OK );

+			MessageBox(NULL, _T("Failed to add menu item Open Exported History\nCallService(MS_CLIST_ADDCONTACTMENUITEM,...)"), MSG_BOX_TITEL, MB_OK );

 	}

 

 

@@ -205,7 +205,7 @@ int MainInit(WPARAM /*wparam*/,LPARAM /*lparam*/)
 	hEventSystemShutdown = HookEvent( ME_SYSTEM_SHUTDOWN , nSystemShutdown );

 

 	if( !hEventSystemShutdown )

-		MessageBox( NULL , _T("Failed to HookEvent ME_SYSTEM_SHUTDOWN") , MSG_BOX_TITEL , MB_OK );

+		MessageBox(NULL, _T("Failed to HookEvent ME_SYSTEM_SHUTDOWN"), MSG_BOX_TITEL, MB_OK );

 

 

 /*

@@ -307,7 +307,7 @@ int __declspec(dllexport)Load()
 

 	if( !hEventSystemInit )

 	{

-		MessageBox( NULL , LPGENT("Failed to HookEvent ME_SYSTEM_MODULESLOADED") , MSG_BOX_TITEL , MB_OK );

+		MessageBox(NULL, _T("Failed to HookEvent ME_SYSTEM_MODULESLOADED"), MSG_BOX_TITEL, MB_OK);

 		return 0;

 	}

 

@@ -332,7 +332,7 @@ int __declspec(dllexport)Load()
 	enDeleteAction = (ENDialogAction)db_get_b( NULL , MODULE , "DeleteAction" , enDeleteAction );;

 

 	// Plugin sweeper support

-	db_set_ts(NULL,"Uninstall","Message Export",_T(MODULE));

+	db_set_ts(NULL, "Uninstall", "Message Export", _T(MODULE));

 

 	if( bReplaceHistory )

 	{

@@ -351,18 +351,18 @@ int __declspec(dllexport)Load()
 			}

 		}*/

 

-		if( ! hServiceFunc ) 

-			MessageBox( NULL , LPGENT("Failed to replace Miranda History.\r\nThis is most likely due to changes in Miranda.") , MSG_BOX_TITEL , MB_OK );

+		if( !hServiceFunc ) 

+			MessageBox(NULL, TranslateT("Failed to replace Miranda History.\r\nThis is most likely due to changes in Miranda."), MSG_BOX_TITEL, MB_OK);

 	}

 

-	if( ! hServiceFunc )

+	if( !hServiceFunc )

 	{

-		hServiceFunc = CreateServiceFunction(MS_SHOW_EXPORT_HISTORY,ShowExportHistory);

+		hServiceFunc = CreateServiceFunction(MS_SHOW_EXPORT_HISTORY, ShowExportHistory);

 	}

 

-	if( ! hServiceFunc )

+	if( !hServiceFunc )

 	{

-		MessageBox( NULL , LPGENT("Failed to CreateServiceFunction MS_SHOW_EXPORT_HISTORY") , MSG_BOX_TITEL , MB_OK );

+		MessageBox(NULL, _T("Failed to CreateServiceFunction MS_SHOW_EXPORT_HISTORY"), MSG_BOX_TITEL, MB_OK);

 	}

 	

 	hInternalWindowList = (HANDLE) CallService(MS_UTILS_ALLOCWINDOWLIST,0,0);

diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp
index b2ba1478eb..0e015acaab 100755
--- a/plugins/Msg_Export/src/options.cpp
+++ b/plugins/Msg_Export/src/options.cpp
@@ -225,23 +225,23 @@ int nExportCompleatList(HWND hParent , bool bOnlySelected )
 

 	if( !hMapUser || nContacts <= 0 )

 	{

-		MessageBox( hParent , LPGENT("No contacts found to export"),MSG_BOX_TITEL,MB_OK );

+		MessageBox(hParent, TranslateT("No contacts found to export"), MSG_BOX_TITEL, MB_OK);

 		return 0;

 	}

 

-	HWND hDlg = CreateDialog( hInstance, MAKEINTRESOURCE( IDD_EXPORT_ALL_DLG ) , hParent , DialogProc );

-	HWND hProg = GetDlgItem( hDlg , IDC_EXPORT_PROGRESS );

-	HWND hStatus = GetDlgItem( hDlg , IDC_EXP_ALL_STATUS );

+	HWND hDlg = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_EXPORT_ALL_DLG), hParent , DialogProc);

+	HWND hProg = GetDlgItem(hDlg, IDC_EXPORT_PROGRESS );

+	HWND hStatus = GetDlgItem(hDlg, IDC_EXP_ALL_STATUS );

 

-	SendMessage( hProg , PBM_SETRANGE , 0 , MAKELPARAM( 0 , nContacts ) );

+	SendMessage(hProg, PBM_SETRANGE, 0, MAKELPARAM(0, nContacts));

 	

-	SetWindowText( hStatus , LPGENT("Reading database information ( Phase 1 of 2 )") );

+	SetWindowText(hStatus, TranslateT("Reading database information (Phase 1 of 2)"));

 

 	{ // position and show proigrassbar dialog 

 

 		RECT rParrent;

 		RECT rDlg;

-		if( GetWindowRect( hParent , &rParrent ) && GetWindowRect( hDlg , &rDlg ) )

+		if (GetWindowRect( hParent , &rParrent ) && GetWindowRect( hDlg , &rDlg ) )

 		{

 			int x = ( (rParrent.right + rParrent.left) / 2 ) - ( (rDlg.right - rDlg.left) / 2 );

 			int y = ( (rParrent.bottom + rParrent.top) / 2 ) - ( (rDlg.bottom - rDlg.top) / 2 );

@@ -267,9 +267,9 @@ int nExportCompleatList(HWND hParent , bool bOnlySelected )
 			}

 

 			sItem.iItem = nCur;

-			if( ! ListView_GetItem( hMapUser, &sItem ) )

+			if(!ListView_GetItem(hMapUser, &sItem))

 			{

-				MessageBox( hParent , LPGENT("Failed to export at least one contact"),MSG_BOX_TITEL,MB_OK );

+				MessageBox(hParent, TranslateT("Failed to export at least one contact"), MSG_BOX_TITEL, MB_OK);

 				continue;

 			}

 

@@ -404,11 +404,11 @@ BOOL bApplyChanges( HWND hwndDlg )
 	BOOL bRet = true;

 	_TCHAR szTemp[500];

 

-	int nTmp = GetDlgItemInt( hwndDlg , IDC_MAX_CLOUMN_WIDTH , &bTrans , TRUE );

-	if( !bTrans || nTmp < 5 )

+	int nTmp = GetDlgItemInt(hwndDlg, IDC_MAX_CLOUMN_WIDTH, &bTrans, TRUE );

+	if ( !bTrans || nTmp < 5 )

 	{

-		_sntprintf( szTemp , sizeof( szTemp ) ,LPGENT("Max line width must be at least %d"), 5 );

-		MessageBox( hwndDlg , szTemp ,MSG_BOX_TITEL,MB_OK );

+		_sntprintf(szTemp, sizeof(szTemp), _T("Max line width must be at least %d"), 5);

+		MessageBox(hwndDlg, szTemp, MSG_BOX_TITEL, MB_OK);

 		bRet = false;

 	}

 	else

@@ -434,7 +434,7 @@ BOOL bApplyChanges( HWND hwndDlg )
 	if( bReplaceHistory != bNewRp )

 	{

 		bReplaceHistory = bNewRp;

-		MessageBox( hwndDlg , LPGENT("You need to restart miranda to change the history function") ,MSG_BOX_TITEL,MB_OK );

+		MessageBox(hwndDlg, TranslateT("You need to restart miranda to change the history function"), MSG_BOX_TITEL, MB_OK );

 	}

 

 	bAppendNewLine = IsDlgButtonChecked( hwndDlg , IDC_APPEND_NEWLINE ) == BST_CHECKED;

@@ -649,7 +649,7 @@ void OpenHelp(HWND hwndDlg)
 		}

 	}

 

-	MessageBox( hwndDlg , LPGENT("Failed to get the path to Msg_Export.dll\nPlease locate Msg_Export.txt your self"),MSG_BOX_TITEL,MB_OK );

+	MessageBox(hwndDlg, TranslateT("Failed to get the path to Msg_Export.dll\nPlease locate Msg_Export.txt your self"), MSG_BOX_TITEL, MB_OK);

 }

 

 /////////////////////////////////////////////////////////////////////

@@ -739,7 +739,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 					sItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE;

 					sItem.iItem = nUser;

 					sItem.iSubItem = 0;

-					sItem.iImage = db_get_b(hContact,MODULE,"EnableLog",1);

+					sItem.iImage = db_get_b(hContact,MODULE, "EnableLog", 1);

 					sItem.lParam = (LPARAM) hContact;

 

 

@@ -850,7 +850,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 				{

 					if( bUnaplyedChanges )

 					{

-						DWORD res = MessageBox( hwndDlg , LPGENT("You have unapplyed changes do you wish to apply these first ?"),MSG_BOX_TITEL,MB_YESNOCANCEL );

+						DWORD res = MessageBox(hwndDlg, TranslateT("You have unapplyed changes do you wish to apply these first ?"), MSG_BOX_TITEL, MB_YESNOCANCEL);

 						if( res == IDCANCEL )

 							return TRUE;

 						if( res == IDYES )

@@ -982,7 +982,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 					// Get the shells allocator

 					if (FAILED(SHGetMalloc(&pMalloc))) // we need to use this to support old Windows versions 

 					{

-						MessageBox( hwndDlg , LPGENT("Failed to get the shells allocator !"),MSG_BOX_TITEL,MB_OK );

+						MessageBox(hwndDlg, _T("Failed to get the shells allocator!"), MSG_BOX_TITEL, MB_OK);

 						return TRUE; // TRUE because we have handled the message , sort of *S*

 					}

 

@@ -991,7 +991,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 					if ( ! lpDestDir )

 					{

 						pMalloc->Release();

-						MessageBox( hwndDlg , LPGENT("Failed to Allocate buffer space"),MSG_BOX_TITEL,MB_OK );

+						MessageBox(hwndDlg , _T("Failed to Allocate buffer space"), MSG_BOX_TITEL, MB_OK);

 						return TRUE;

 					}

 

diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp
index 134f53ae3d..cad4fd01a5 100755
--- a/plugins/Msg_Export/src/utils.cpp
+++ b/plugins/Msg_Export/src/utils.cpp
@@ -130,7 +130,7 @@ void ShowDebugInfo()
 	sDebug += _T("\r\nGetFilePathFromUser( NULL ) :");

 	sDebug += GetFilePathFromUser( NULL );

 

-	MessageBox( NULL , sDebug.c_str() ,MSG_BOX_TITEL,MB_OK );

+	MessageBox(NULL, sDebug.c_str(), MSG_BOX_TITEL, MB_OK);

 }

 

 

@@ -244,10 +244,10 @@ void DisplayLastError(const _TCHAR * pszError)
 	DWORD error = GetLastError();

 

 	_TCHAR szTemp[50];

-	_sntprintf( szTemp , sizeof( szTemp ) , LPGENT("\r\nErrorCode : %d\r\n") , error );

+	_sntprintf(szTemp, sizeof(szTemp), _T("\r\nErrorCode: %d\r\n"), error);

 	sError += szTemp;

 	sError += sGetErrorString(error);

-	MessageBox( NULL , sError.c_str() ,MSG_BOX_TITEL ,MB_OK );

+	MessageBox(NULL, sError.c_str(), MSG_BOX_TITEL, MB_OK);

 }

 

 

@@ -297,7 +297,7 @@ tstring _DBGetStringW(HANDLE hContact,const char *szModule,const char *szSetting
 	{

 		if( dbv.type != DBVT_WCHAR)

 		{

-			MessageBox(NULL, LPGENT("DB: Attempt to get wrong type of value, string"), MSG_BOX_TITEL,MB_OK);

+			MessageBox(NULL, TranslateT("DB: Attempt to get wrong type of value, string"), MSG_BOX_TITEL, MB_OK);

 			ret = pszError;

 		}

 		else

@@ -319,7 +319,7 @@ string _DBGetStringA(HANDLE hContact,const char *szModule,const char *szSetting
 	{

 		if( dbv.type != DBVT_ASCIIZ)

 		{

-			MessageBox(NULL, LPGENT("DB: Attempt to get wrong type of value, string"), MSG_BOX_TITEL,MB_OK);

+			MessageBox(NULL, TranslateT("DB: Attempt to get wrong type of value, string"), MSG_BOX_TITEL, MB_OK);

 			ret = pszError;

 		}

 		else

@@ -663,11 +663,11 @@ tstring GetFilePathFromUser( HANDLE hContact )
 					{

 						tstring sRemoteUser = NickFromHandle(hContact);

 						_sntprintf( szTemp , sizeof( szTemp ) , 

-							LPGENT("File name for the user \"%s\" has changed !\n\nfrom:\t%s\nto:\t%s\n\nDo you wish to rename file ?"), 

+							TranslateT("File name for the user \"%s\" has changed!\n\nfrom:\t%s\nto:\t%s\n\nDo you wish to rename file?"), 

 							sRemoteUser.c_str(),

 							sPrevFileName.c_str(),

 							sFilePath.c_str() );

-						bTryRename = MessageBox( NULL , szTemp ,MSG_BOX_TITEL ,MB_YESNO ) == IDYES;

+						bTryRename = MessageBox(NULL, szTemp, MSG_BOX_TITEL, MB_YESNO ) == IDYES;

 					}

 					else

 						bTryRename = true;

@@ -684,12 +684,12 @@ tstring GetFilePathFromUser( HANDLE hContact )
 							while( ! MoveFile( sPrevFileName.c_str(), sFilePath.c_str() ) )

 							{

 								_sntprintf( szTemp , sizeof( szTemp ) , 

-									LPGENT("Failed to rename file\n\nfrom:\t%s\nto:\t%s\n\nFailed with error: %s"), 

+									TranslateT("Failed to rename file\n\nfrom:\t%s\nto:\t%s\n\nFailed with error: %s"), 

 									sPrevFileName.c_str(),

 									sFilePath.c_str() ,

 									sGetErrorString().c_str() );

 

-								if( MessageBox( NULL , szTemp ,MSG_BOX_TITEL,MB_RETRYCANCEL ) != IDRETRY )

+								if( MessageBox(NULL, szTemp, MSG_BOX_TITEL, MB_RETRYCANCEL) != IDRETRY)

 									break;

 							}

 						}

@@ -944,14 +944,13 @@ void UpdateFileToColWidth()
 

 void DisplayErrorDialog( const _TCHAR * pszError , tstring& sFilePath , DBEVENTINFO * dbei )

 {

-	tstring sError = TranslateTS( pszError );

+	tstring sError = TranslateTS(pszError);

 	sError += sFilePath;

-	sError += LPGENT("\nError :");

+	sError += TranslateT("\nError: ");

 	sError += sGetErrorString();

-	sError += _T("\n");

-	sError += LPGENT("Message has not been saved !\n");

-	sError += LPGENT("Do you wish to save debug information ?");

-	if( MessageBox( NULL , sError.c_str() ,MSG_BOX_TITEL,MB_YESNO ) == IDYES )

+	sError += TranslateT("\nMessage has not been saved!\n");

+	sError += TranslateT("Do you wish to save debug information?");

+	if( MessageBox(NULL, sError.c_str(), MSG_BOX_TITEL, MB_YESNO) == IDYES)

 	{

 		OPENFILENAME ofn;       // common dialog box structure

 		_TCHAR szFile[260];       // buffer for file name

@@ -963,7 +962,7 @@ void DisplayErrorDialog( const _TCHAR * pszError , tstring& sFilePath , DBEVENTI
 		//ofn.hwndOwner = NULL;

 		ofn.lpstrFile = szFile;

 		ofn.nMaxFile = sizeof(szFile);

-		ofn.lpstrFilter = _T("All\0*.*\0Text\0*.TXT\0\0");

+		ofn.lpstrFilter = TranslateT("All\0*.*\0Text\0*.TXT\0\0");

 		ofn.nFilterIndex = 1;

 		ofn.lpstrFileTitle = NULL;

 		ofn.nMaxFileTitle = 0;

@@ -1589,7 +1588,7 @@ SuperBreak:
 		if( pszPrev == pszSrc )

 		{

 			// this is an programming error we have not moved forward in string 

-			MessageBox( NULL , LPGENT("Programming error on line __LINE__ please report this")  ,MSG_BOX_TITEL,MB_OK );

+			MessageBox(NULL, _T("Programming error on line __LINE__ please report this"), MSG_BOX_TITEL, MB_OK);

 			break;

 		}

 	}

@@ -1652,10 +1651,10 @@ int nContactDeleted(WPARAM wparam,LPARAM /*lparam*/)
 

 		_TCHAR szTemp[500];

 		_sntprintf( szTemp , sizeof( szTemp ) , _T("%s\r\n%s") ,

-			LPGENT("User has been deleted do you want to delete the file ?"), sFilePath.c_str() );

+			TranslateT("User has been deleted do you want to delete the file?"), sFilePath.c_str());

 

 		if( enDeleteAction == eDAAutomatic ||

-			 MessageBox( NULL , szTemp ,MSG_BOX_TITEL,MB_YESNO ) == IDYES )

+			 MessageBox(NULL, szTemp, MSG_BOX_TITEL, MB_YESNO ) == IDYES )

 		{

 			if( ! DeleteFile( sFilePath.c_str() ) )

 			{