- Another portion of _T replacement (patch from person)

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

28 files changed, 144 insertions, 173 deletions

diff --git a/plugins/Popup/src/config.cpp b/plugins/Popup/src/config.cpp
index 2ecf985d1f..a372f79119 100644
--- a/plugins/Popup/src/config.cpp
+++ b/plugins/Popup/src/config.cpp
@@ -1,10 +1,10 @@
 /*

 Popup Plus plugin for Miranda IM

 

-Copyright	© 2002 Luca Santarelli,

-			© 2004-2007 Victor Pavlychko

-			© 2010 MPK

-			© 2010 Merlin_de

+Copyright	� 2002 Luca Santarelli,

+			� 2004-2007 Victor Pavlychko

+			� 2010 MPK

+			� 2010 Merlin_de

 

 This program is free software; you can redistribute it and/or

 modify it under the terms of the GNU General Public License

@@ -98,20 +98,11 @@ void LoadOptions() {
 void PopUpPreview()

 {

 	TCHAR *lptzTitle1Eng = TranslateT("The Jabberwocky");

-	TCHAR *lptzText1Eng  = TranslateTS(

-		_T("`Twas brillig, and the slithy toves\r\n")

-		_T("Did gyre and gimble in the wabe:\r\n")

-		_T("All mimsy were the borogoves,\r\n")

-		_T("And the mome raths outgrabe.\r\n")

-		_T("\t[b][i]Lewis Carroll, 1855[/i][/b]")

-		);

+	TCHAR *lptzText1Eng  = TranslateT("`Twas brillig, and the slithy toves\r\nDid gyre and gimble in the wabe:\r\nAll mimsy were the borogoves,\r\nAnd the mome raths outgrabe.\r\n\t[b][i]Lewis Carroll, 1855[/i][/b]");

 

 	TCHAR *lptzTitle2 = TranslateT("Test preview for the popup plugin settings. This is supposed to be long enough not to fit in one line...");

 	TCHAR *lptzText2  = TranslateTS(

-		_T("This is a special test preview for the popup ")

-		_T("plugin settings. The text and title are quite ")

-		_T("long so you can tweak your skin and plugin ")

-		_T("settings to best fit your needs :)")

+		LPGENT("This is a special test preview for the popup plugin settings. The text and title are quite long so you can tweak your skin and plugin settings to best fit your needs :)")

 		);

 

 	POPUPDATA2 ppd = {0};

diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index 764a7acc20..eda317574a 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -454,11 +454,7 @@ MIRAPI int Load(void)
 	LoadPopupThread();

 	if (!LoadPopupWnd2())

 	{

-		MessageBox(0, TranslateTS(

-			_T("Error: I could not register the PopUp Window class.\r\n")

-			_T("The plugin will not operate.")

-			),

-			_T(MODULNAME_LONG), MB_ICONSTOP|MB_OK);

+		MessageBox(0, TranslateT("Error: I could not register the PopUp Window class.\r\nThe plugin will not operate."), _T(MODULNAME_LONG), MB_ICONSTOP | MB_OK);

 		return 0; //We couldn't register our Window Class, don't hook any event: the plugin will act as if it was disabled.

 	}

 	RegisterOptPrevBox();

diff --git a/plugins/Popup/src/opt_gen.cpp b/plugins/Popup/src/opt_gen.cpp
index 39f756b606..0d745697bb 100644
--- a/plugins/Popup/src/opt_gen.cpp
+++ b/plugins/Popup/src/opt_gen.cpp
@@ -1,10 +1,10 @@
 /*

 Popup Plus plugin for Miranda IM

 

-Copyright	© 2002 Luca Santarelli,

-			© 2004-2007 Victor Pavlychko

-			© 2010 MPK

-			© 2010 Merlin_de

+Copyright	� 2002 Luca Santarelli,

+			� 2004-2007 Victor Pavlychko

+			� 2010 MPK

+			� 2010 Merlin_de

 

 This program is free software; you can redistribute it and/or

 modify it under the terms of the GNU General Public License

@@ -63,16 +63,16 @@ int AddStatusMode (OPTTREE_OPTION *options, int pos, LPTSTR prefix, DWORD flag)
 	lstrcpy(options[pos].pszOptionName, prefix);

 	switch (flag)

 	{

-		case PF2_IDLE:		lstrcat(options[pos].pszOptionName, _T("/Offline")); break;

-		case PF2_ONLINE:	lstrcat(options[pos].pszOptionName, _T("/Online")); break;

-		case PF2_INVISIBLE:	lstrcat(options[pos].pszOptionName, _T("/Invisible")); break;

-		case PF2_SHORTAWAY:	lstrcat(options[pos].pszOptionName, _T("/Away")); break;

-		case PF2_LONGAWAY:	lstrcat(options[pos].pszOptionName, _T("/NA")); break;

-		case PF2_LIGHTDND:	lstrcat(options[pos].pszOptionName, _T("/Occupied")); break;

-		case PF2_HEAVYDND:	lstrcat(options[pos].pszOptionName, _T("/DND")); break;

-		case PF2_FREECHAT:	lstrcat(options[pos].pszOptionName, _T("/Free for chat")); break;

-		case PF2_OUTTOLUNCH:lstrcat(options[pos].pszOptionName, _T("/Out to lunch")); break;

-		case PF2_ONTHEPHONE:lstrcat(options[pos].pszOptionName, _T("/On the phone")); break;

+		case PF2_IDLE:		lstrcat(options[pos].pszOptionName, LPGENT("/Offline")); break;

+		case PF2_ONLINE:	lstrcat(options[pos].pszOptionName, LPGENT("/Online")); break;

+		case PF2_INVISIBLE:	lstrcat(options[pos].pszOptionName, LPGENT("/Invisible")); break;

+		case PF2_SHORTAWAY:	lstrcat(options[pos].pszOptionName, LPGENT("/Away")); break;

+		case PF2_LONGAWAY:	lstrcat(options[pos].pszOptionName, LPGENT("/NA")); break;

+		case PF2_LIGHTDND:	lstrcat(options[pos].pszOptionName, LPGENT("/Occupied")); break;

+		case PF2_HEAVYDND:	lstrcat(options[pos].pszOptionName, LPGENT("/DND")); break;

+		case PF2_FREECHAT:	lstrcat(options[pos].pszOptionName, LPGENT("/Free for chat")); break;

+		case PF2_OUTTOLUNCH:lstrcat(options[pos].pszOptionName, LPGENT("/Out to lunch")); break;

+		case PF2_ONTHEPHONE:lstrcat(options[pos].pszOptionName, LPGENT("/On the phone")); break;

 	}

 	return pos+1;

 }

@@ -158,7 +158,7 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 			//Dynamic Resize

 			{

 			CheckDlgButton(hwnd, IDC_DYNAMICRESIZE, PopUpOptions.DynamicResize);

-			SetDlgItemText(hwnd, IDC_USEMAXIMUMWIDTH, PopUpOptions.DynamicResize ? _T("Maximum width"): _T("Width"));

+			SetDlgItemText(hwnd, IDC_USEMAXIMUMWIDTH, PopUpOptions.DynamicResize ? LPGENT("Maximum width"): LPGENT("Width"));

 			//Minimum Width

 			CheckDlgButton(hwnd, IDC_USEMINIMUMWIDTH, PopUpOptions.UseMinimumWidth);

 			SendDlgItemMessage(hwnd, IDC_MINIMUMWIDTH_SPIN, UDM_SETRANGE, 0, (LPARAM)MAKELONG(

@@ -258,8 +258,7 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 				mir_free(pszSettingName); pszSettingName = NULL;

 			}

 			OptTree_SetOptions(hwnd, IDC_STATUSES, statusOptions, statusOptionsCount,

-				DBGetContactSettingDword(NULL, MODULNAME, "Global Status", 0),

-				_T("Global Status"));

+				DBGetContactSettingDword(NULL, MODULNAME, "Global Status", 0), _T("Global Status"));

 			}

 			//Debug

 			{

@@ -636,14 +635,8 @@ void Check_ReorderPopUps(HWND hwnd) {
 	if (!PopUpOptions.ReorderPopUps && PopUpOptions.ReorderPopUpsWarning)

 	{

 		int res = MessageBox(hwnd,

-			TranslateTS(

-				_T("'Reorder Popups' option is currently diabled.\r\n")

-				_T("This may cause misaligned popups when used with\r\n")

-				_T("avatars and text replacement (mainly NewStatusNotify).\r\n")

-				_T("\r\n")

-				_T("Do you want to enable popup reordering now?\r\n")

-				),

-			TranslateT("Popup Plus Warning"), MB_ICONEXCLAMATION|MB_YESNOCANCEL);

+			TranslateT("'Reorder Popups' option is currently diabled.\r\nThis may cause misaligned popups when used with\r\navatars and text replacement (mainly NewStatusNotify).\r\n\r\nDo you want to enable popup reordering now?\r\n"),

+			TranslateT("Popup Plus Warning"), MB_ICONEXCLAMATION | MB_YESNOCANCEL);

 

 		switch (res)

 		{

diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp
index fff5b4464a..97393fdab4 100644
--- a/plugins/Popup/src/popup_wnd2.cpp
+++ b/plugins/Popup/src/popup_wnd2.cpp
@@ -1,10 +1,10 @@
 /*

 Popup Plus plugin for Miranda IM

 

-Copyright	© 2002 Luca Santarelli,

-			© 2004-2007 Victor Pavlychko

-			© 2010 MPK

-			© 2010 Merlin_de

+Copyright	� 2002 Luca Santarelli,

+			� 2004-2007 Victor Pavlychko

+			� 2010 MPK

+			� 2010 Merlin_de

 

 This program is free software; you can redistribute it and/or

 modify it under the terms of the GNU General Public License

@@ -102,7 +102,7 @@ bool	LoadPopupWnd2()
 		err = GetLastError();

 		if (!g_wndClass.cPopupEditBox) {

 			TCHAR msg[2048];

-			wsprintf(msg, _T("Failed to register custom edit box window class.\r\n\r\ncbSize: %i\r\nstyle: %p\r\nlpfnWndProc: %i\r\ncbClsExtra: %i\r\ncbWndExtra: %i\r\nhInstance: %i\r\nhIcon: %i\r\nhCursor: %i\r\nhbrBackground: %i\r\nlpszMenuName: %s\r\nlpszClassName: %s\r\nhIconSm: %i\r\n"),

+			wsprintf(msg, LPGENT("Failed to register custom edit box window class.\r\n\r\ncbSize: %i\r\nstyle: %p\r\nlpfnWndProc: %i\r\ncbClsExtra: %i\r\ncbWndExtra: %i\r\nhInstance: %i\r\nhIcon: %i\r\nhCursor: %i\r\nhbrBackground: %i\r\nlpszMenuName: %s\r\nlpszClassName: %s\r\nhIconSm: %i\r\n"),

 				wclw.cbSize,		//UINT        cbSize;

 				wclw.style,			//UINT        style;

 				wclw.lpfnWndProc,	//WNDPROC     lpfnWndProc;

diff --git a/plugins/Popup/src/skin.cpp b/plugins/Popup/src/skin.cpp
index ee6846bab4..2ef8ee20f8 100644
--- a/plugins/Popup/src/skin.cpp
+++ b/plugins/Popup/src/skin.cpp
@@ -1,10 +1,10 @@
 /*

 Popup Plus plugin for Miranda IM

 

-Copyright	© 2002 Luca Santarelli,

-			© 2004-2007 Victor Pavlychko

-			© 2010 MPK

-			© 2010 Merlin_de

+Copyright	� 2002 Luca Santarelli,

+			� 2004-2007 Victor Pavlychko

+			� 2010 MPK

+			� 2010 Merlin_de

 

 This program is free software; you can redistribute it and/or

 modify it under the terms of the GNU General Public License

@@ -1403,13 +1403,8 @@ const PopupSkin *Skins::getSkin(LPCTSTR name)
 

 	if (!any->skin->isCompatible())

 		MessageBox(NULL,

-			TranslateTS(

-				_T("The skin you are trying to load is designed\r\n")

-				_T("for newer version of Popup Plus. And will not\r\n")

-				_T("display properly.\r\n")

-				_T("\r\n")

-				_T("Please choose another skin.")),

-			_T(MODULNAME_LONG), MB_ICONSTOP|MB_OK);

+			TranslateT("The skin you are trying to load is designed\r\nfor newer version of Popup Plus. And will not\r\ndisplay properly.\r\n\r\nPlease choose another skin."),

+			_T(MODULNAME_LONG), MB_ICONSTOP | MB_OK);

 

 	return any->skin;

 }

diff --git a/plugins/QuickMessages/src/options.cpp b/plugins/QuickMessages/src/options.cpp
index e3e20d5b75..b5add8e26f 100644
--- a/plugins/QuickMessages/src/options.cpp
+++ b/plugins/QuickMessages/src/options.cpp
@@ -183,7 +183,7 @@ void SetMenuEntryProperties(HWND hdlg)
 				else

 					{

 					if (!bd->pszOpValue)

-						bd->pszOpValue=mir_tstrdup(_T("Enter Value"));

+						bd->pszOpValue=mir_tstrdup(LPGENT("Enter Value"));

 					}

 					if(TreeView_GetParent(hMenuTree, tvi.hItem))

 						bd->fEntryOpType|=QMF_EX_CHILD;

@@ -992,11 +992,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam)
 			int count=TreeView_GetCount(hButtonsList);

 			if (count>10) break;

 			if(g_iOPButtonsCount==99){

-				MessageBox(NULL,_T("Congratulation!\n\

-								   You have clicked this button 100 times!\n\

-								   There was access violation at this point...\n\

-								   And now function for freeing resources must be called...\n\

-								   But no! there's only break :D"),_T("You win!"),MB_OK);

+				MessageBox(NULL, TranslateT("Congratulation!\r\nYou have clicked this button 100 times!\r\nThere was access violation at this point...\r\nAnd now function for freeing resources must be called...\r\nBut no! there's only break :D"), TranslateT("You win!"),MB_OK);

 				break;

 				}

 

diff --git a/plugins/QuickReplies/src/events.cpp b/plugins/QuickReplies/src/events.cpp
index 4185aea730..009403872d 100644
--- a/plugins/QuickReplies/src/events.cpp
+++ b/plugins/QuickReplies/src/events.cpp
@@ -59,7 +59,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
 		bbd.cbSize = sizeof(BBButton);

 		bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON;

 		bbd.pszModuleName = buttonName;

-		bbd.ptszTooltip = _T("Quick Replies\r\nLeft button - open menu\r\nRight button - options page");

+		bbd.ptszTooltip = LPGENT("Quick Replies\r\nLeft button - open menu\r\nRight button - options page");

 		bbd.hIcon = icon.hIcolib;

 		bbd.dwButtonID = iNumber;

 		bbd.dwDefPos = 220;

diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp
index d931ca9813..09f231052f 100644
--- a/plugins/Quotes/src/Forex.cpp
+++ b/plugins/Quotes/src/Forex.cpp
@@ -74,13 +74,13 @@ namespace
 	void InitMenu()

 	{

 		CLISTMENUITEM mi = { sizeof(mi) };

-		mi.ptszName = _T("Quotes");

+		mi.ptszName = LPGENT("Quotes");

 		mi.flags = CMIF_TCHAR|CMIF_ICONFROMICOLIB|CMIF_ROOTPOPUP;

 		mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_MAIN);

 		HGENMENU hMenuRoot = Menu_AddMainMenuItem(&mi);

 		g_ahMenus.push_back(hMenuRoot);

 

-		mi.ptszName = _T("Refresh All Quotes\\Rates");

+		mi.ptszName = LPGENT("Refresh All Quotes\\Rates");

 		mi.flags = CMIF_TCHAR|CMIF_ICONFROMICOLIB|CMIF_ROOTHANDLE;

 		//mi.position = 0x0FFFFFFF;

 		mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_MAIN);

@@ -91,7 +91,7 @@ namespace
 		HANDLE h = CreateServiceFunction(mi.pszService, QuotesMenu_RefreshAll);

 		g_ahServices.push_back(h);

 

-		mi.ptszName = _T("Currency Converter...");

+		mi.ptszName = LPGENT("Currency Converter...");

 		//mi.flags = CMIF_TCHAR|CMIF_ICONFROMICOLIB|CMIF_ROOTHANDLE;

 		//mi.position = 0x0FFFFFFF;

 		mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_CURRENCY_CONVERTER);

@@ -102,7 +102,7 @@ namespace
 		g_ahServices.push_back(h);

 

 #ifdef TEST_IMPORT_EXPORT

-		mi.ptszName = _T("Export All Quotes");

+		mi.ptszName = LPGENT("Export All Quotes");

 		//mi.flags = CMIF_TCHAR|CMIF_ICONFROMICOLIB|CMIF_ROOTHANDLE;

 		mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_EXPORT);

 		mi.pszService = "Quotes/ExportAll";

@@ -111,7 +111,7 @@ namespace
 		h = CreateServiceFunction(mi.pszService, QuotesMenu_ExportAll);

 		g_ahServices.push_back(h);

 

-		mi.ptszName =_T("Import All Quotes");

+		mi.ptszName = LPGENT("Import All Quotes");

 		//mi.flags = CMIF_TCHAR|CMIF_ICONFROMICOLIB|CMIF_ROOTHANDLE;

 		mi.icolibItem = Quotes_GetIconHandle(IDI_ICON_IMPORT);

 		mi.pszService = "Quotes/ImportAll";

@@ -149,7 +149,7 @@ namespace
 			mi.pszPopupName = (char*)hMenuRoot;

 		}

 

-		mi.ptszName = _T("Refresh");

+		mi.ptszName = LPGENT("Refresh");

 		mi.popupPosition = 0;

 		mi.flags |= CMIF_ICONFROMICOLIB;

 		mi.icolibItem =  Quotes_GetIconHandle(IDI_ICON_REFRESH);

@@ -160,7 +160,7 @@ namespace
 		h = CreateServiceFunction(mi.pszService, QuotesMenu_RefreshContact);

 		g_ahServices.push_back(h);

 

-		mi.ptszName = _T("Open Log File...");

+		mi.ptszName = LPGENT("Open Log File...");

 		mi.popupPosition = 1;

 		mi.icolibItem = NULL;

 		mi.pszService = "Quotes/OpenLogFile";

@@ -171,7 +171,7 @@ namespace
 		g_ahServices.push_back(h);

 

 #ifdef CHART_IMPLEMENT

-		mi.ptszName = _T("Chart...");

+		mi.ptszName = LPGENT("Chart...");

 		mi.popupPosition = 2;

 		mi.icolibItem = NULL;

 		mi.pszService = "Quotes/Chart";

@@ -182,7 +182,7 @@ namespace
 		g_ahServices.push_back(h);

 #endif

 

-		mi.ptszName = _T("Edit Settings...");

+		mi.ptszName = LPGENT("Edit Settings...");

 #ifdef CHART_IMPLEMENT

 		mi.popupPosition = 3;

 #else

diff --git a/plugins/Quotes/src/QuoteChart.cpp b/plugins/Quotes/src/QuoteChart.cpp
index 3746540d23..5e5567cb0b 100644
--- a/plugins/Quotes/src/QuoteChart.cpp
+++ b/plugins/Quotes/src/QuoteChart.cpp
@@ -230,8 +230,8 @@ namespace
 

 				::SetWindowLongPtr(hDlg,GWLP_USERDATA,reinterpret_cast<LONG_PTR>(hContact));

 

-				static LPCTSTR szSources[] = {_T("Log File"),_T("Miranda's History")};

-				static LPCTSTR szFilters[] = {_T("All"),_T("Last Day"),_T("Last Week"),_T("Last Month"),_T("Last Year"),_T("User-Defined")};

+				static LPCTSTR szSources[] = {LPGENT("Log File"), LPGENT("Miranda's History")};

+				static LPCTSTR szFilters[] = {LPGENT("All"), LPGENT("Last Day"), LPGENT("Last Week"), LPGENT("Last Month"), LPGENT("Last Year"), LPGENT("User-Defined")};

 

 				for(int i = 0;i < sizeof(szSources)/sizeof(szSources[0]);++i)

 				{

diff --git a/plugins/Quotes/src/QuotesProviderGoogle.cpp b/plugins/Quotes/src/QuotesProviderGoogle.cpp
index c2b30a9a6a..d55f28fb82 100644
--- a/plugins/Quotes/src/QuotesProviderGoogle.cpp
+++ b/plugins/Quotes/src/QuotesProviderGoogle.cpp
@@ -125,7 +125,7 @@ namespace
 	bool parse_html_node(const THTMLNodePtr& pNode,double& rdRate)

 	{

 		tstring sID = pNode->GetAttribute(_T("id"));

-		if ((false == sID.empty()) && (0 == quotes_stricmp(sID.c_str(),_T("currency_converter_result"))))

+		if ((false == sID.empty()) && (0 == quotes_stricmp(sID.c_str(), _T("currency_converter_result"))))

 		{

 			size_t cChild = pNode->GetChildCount();

 // 			assert(1 == cChild);

diff --git a/plugins/Quotes/src/SettingsDlg.cpp b/plugins/Quotes/src/SettingsDlg.cpp
index 0011d2e917..d426880cd0 100644
--- a/plugins/Quotes/src/SettingsDlg.cpp
+++ b/plugins/Quotes/src/SettingsDlg.cpp
@@ -97,7 +97,7 @@ namespace
 	std::vector<TCHAR> get_filter()

 	{

 		std::vector<TCHAR> aFilter;

-		LPCTSTR pszFilterParts[] = {_T("Log Files (*.txt,*.log)"),_T("*.txt;*.log"),_T("All files (*.*)"),_T("*.*")};

+		LPCTSTR pszFilterParts[] = {LPGENT("Log Files (*.txt,*.log)"), _T("*.txt;*.log"), LPGENT("All files (*.*)"), _T("*.*")};

 		for(int i = 0;i < sizeof(pszFilterParts)/sizeof(pszFilterParts[0]);++i)

 		{

 			tstring sPart = TranslateTS(pszFilterParts[i]);

diff --git a/plugins/Restart/src/restart.cpp b/plugins/Restart/src/restart.cpp
index ef3dfd383c..ce1fd383d0 100644
--- a/plugins/Restart/src/restart.cpp
+++ b/plugins/Restart/src/restart.cpp
@@ -68,7 +68,7 @@ extern "C" __declspec(dllexport) int Load(void)
 	mi.position = -0x7FFFFFFF;

 	mi.flags = CMIF_ICONFROMICOLIB | CMIF_TCHAR;

 	mi.icolibItem = icon.hIcolib;

-	mi.ptszName = _T("Restart");

+	mi.ptszName = LPGENT("Restart");

 	mi.pszService = "System/RestartMe";

 	Menu_AddMainMenuItem(&mi);

 	Menu_AddTrayMenuItem(&mi);

diff --git a/plugins/Scriver/src/chat/services.cpp b/plugins/Scriver/src/chat/services.cpp
index f5538861b8..c332375871 100644
--- a/plugins/Scriver/src/chat/services.cpp
+++ b/plugins/Scriver/src/chat/services.cpp
@@ -244,7 +244,7 @@ static INT_PTR Service_NewChat(WPARAM wParam, LPARAM lParam)
 				si->bBGSet = TRUE;

 			}

 			if (si->iType == GCW_SERVER)

-				mir_sntprintf(szTemp, SIZEOF(szTemp), _T("Server: %s"), si->ptszName);

+				mir_sntprintf(szTemp, SIZEOF(szTemp), LPGENT("Server: %s"), si->ptszName);

 			else

 				mir_sntprintf(szTemp, SIZEOF(szTemp), _T("%s"), si->ptszName);

 			si->windowData.hContact = CList_AddRoom( gcw->pszModule, ptszID, szTemp, si->iType);

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index 2e60fa30da..ccc59410b8 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -44,18 +44,18 @@ static WNDPROC OldFilterButtonProc;
 static WNDPROC OldLogProc;

 

 static ToolbarButton toolbarButtons[] = {

-	{_T("Bold"), IDC_CHAT_BOLD, 0, 4, 24},

-	{_T("Italic"), IDC_CHAT_ITALICS, 0, 0, 24},

-	{_T("Underline"), IDC_CHAT_UNDERLINE, 0, 0, 24},

-	{_T("Text color"), IDC_CHAT_COLOR, 0, 0, 24},

-	{_T("Background color"), IDC_CHAT_BKGCOLOR, 0, 0, 24},

-//	{_T("Font size"), IDC_CHAT_FONTSIZE, 0, 0, 48},

-	{_T("Smiley"), IDC_CHAT_SMILEY, 0, 8, 24},

-	{_T("History"), IDC_CHAT_HISTORY, 1, 0, 24},

-	{_T("Filter"), IDC_CHAT_FILTER, 1, 0, 24},

-	{_T("Manager"), IDC_CHAT_CHANMGR, 1, 0, 24},

-	{_T("Nick list"), IDC_CHAT_SHOWNICKLIST, 1, 0, 24},

-	{_T("Send"), IDOK, 1, 0, 38},

+	{LPGENT("Bold"), IDC_CHAT_BOLD, 0, 4, 24},

+	{LPGENT("Italic"), IDC_CHAT_ITALICS, 0, 0, 24},

+	{LPGENT("Underline"), IDC_CHAT_UNDERLINE, 0, 0, 24},

+	{LPGENT("Text color"), IDC_CHAT_COLOR, 0, 0, 24},

+	{LPGENT("Background color"), IDC_CHAT_BKGCOLOR, 0, 0, 24},

+//	{LPGENT("Font size"), IDC_CHAT_FONTSIZE, 0, 0, 48},

+	{LPGENT("Smiley"), IDC_CHAT_SMILEY, 0, 8, 24},

+	{LPGENT("History"), IDC_CHAT_HISTORY, 1, 0, 24},

+	{LPGENT("Filter"), IDC_CHAT_FILTER, 1, 0, 24},

+	{LPGENT("Manager"), IDC_CHAT_CHANMGR, 1, 0, 24},

+	{LPGENT("Nick list"), IDC_CHAT_SHOWNICKLIST, 1, 0, 24},

+	{LPGENT("Send"), IDOK, 1, 0, 38},

 };

 

 typedef struct

diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp
index 50dcdb68c2..7c1f15c2e8 100644
--- a/plugins/Scriver/src/globals.cpp
+++ b/plugins/Scriver/src/globals.cpp
@@ -210,21 +210,21 @@ static BOOL CALLBACK LangAddCallback(CHAR * str) {
 	int i, count;

 	UINT cp;

 	static struct { UINT cpId; const TCHAR *cpName; } cpTable[] = {

-		{	874,	_T("Thai") }, //

-		{	932,	_T("Japanese") }, //

-		{	936,	_T("Simplified Chinese") }, //

-		{	949,	_T("Korean") }, //

-		{	950,	_T("Traditional Chinese") }, //

-		{	1250,	_T("Central European") }, //

-		{	1251,	_T("Cyrillic") }, //

-		{	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)") }

+		{	874,	LPGENT("Thai") }, //

+		{	932,	LPGENT("Japanese") }, //

+		{	936,	LPGENT("Simplified Chinese") }, //

+		{	949,	LPGENT("Korean") }, //

+		{	950,	LPGENT("Traditional Chinese") }, //

+		{	1250,	LPGENT("Central European") }, //

+		{	1251,	LPGENT("Cyrillic") }, //

+		{	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 = atoi(str);

 	count = sizeof(cpTable)/sizeof(cpTable[0]);

diff --git a/plugins/Scriver/src/input.cpp b/plugins/Scriver/src/input.cpp
index 79dce58fdc..8539f8f3af 100644
--- a/plugins/Scriver/src/input.cpp
+++ b/plugins/Scriver/src/input.cpp
@@ -293,9 +293,9 @@ void RegisterKeyBindings() {
 	HOTKEYDESC desc;

 	ZeroMemory(&desc, sizeof(desc));

 	desc.cbSize = sizeof(desc);

-	desc.pszSection = "Messaging";

+	desc.pszSection = LPGEN("Messaging");

 	desc.pszName = "Scriver/Nav/Previous Tab";

-	desc.pszDescription = "Navigate: Previous Tab";

+	desc.pszDescription = LPGEN("Navigate: Previous Tab");

 	desc.lParam = KB_PREV_TAB;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, VK_TAB);

 	Hotkey_Register( &desc);

@@ -305,7 +305,7 @@ void RegisterKeyBindings() {
 	Hotkey_Register( &desc);

 

 	desc.pszName = "Scriver/Nav/Next Tab";

-	desc.pszDescription = "Navigate: Next Tab";

+	desc.pszDescription = LPGEN("Navigate: Next Tab");

 	desc.lParam = KB_NEXT_TAB;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, VK_TAB);

 	Hotkey_Register( &desc);

@@ -317,50 +317,50 @@ void RegisterKeyBindings() {
 	desc.pszDescription = strDesc;

 	for (i = 0; i < 9; i++) {

 		mir_snprintf(strName, SIZEOF(strName), "Scriver/Nav/Tab %d", i + 1);

-		mir_snprintf(strDesc, SIZEOF(strDesc), "Navigate: Tab %d", i + 1);

+		mir_snprintf(strDesc, SIZEOF(strDesc), LPGEN("Navigate: Tab %d"), i + 1);

 		desc.lParam = KB_TAB1 + i;

 		desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, '1' + i);

 		Hotkey_Register( &desc);

 	}

 

 	desc.pszName = "Scriver/Wnd/Toggle Statusbar";

-	desc.pszDescription = "Window: Toggle Statusbar";

+	desc.pszDescription = LPGEN("Window: Toggle Statusbar");

 	desc.lParam = KB_SWITCHSTATUSBAR;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'S');

 	Hotkey_Register( &desc);

 

 	desc.pszName = "Scriver/Wnd/Toggle Titlebar";

-	desc.pszDescription = "Window: Toggle Titlebar";

+	desc.pszDescription = LPGEN("Window: Toggle Titlebar");

 	desc.lParam = KB_SWITCHTITLEBAR;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'M');

 	Hotkey_Register( &desc);

 

 	desc.pszName = "Scriver/Wnd/Toggle Toolbar";

-	desc.pszDescription = "Window: Toggle Toolbar";

+	desc.pszDescription = LPGEN("Window: Toggle Toolbar");

 	desc.lParam = KB_SWITCHTOOLBAR;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'T');

 	Hotkey_Register( &desc);

 

 	desc.pszName = "Scriver/Wnd/Toggle Infobar";

-	desc.pszDescription = "Window: Toggle Infobar";

+	desc.pszDescription = LPGEN("Window: Toggle Infobar");

 	desc.lParam = KB_SWITCHINFOBAR;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, 'N');

 	Hotkey_Register( &desc);

 

 	desc.pszName = "Scriver/Wnd/Clear Log";

-	desc.pszDescription = "Window: Clear Log";

+	desc.pszDescription = LPGEN("Window: Clear Log");

 	desc.lParam = KB_CLEAR_LOG;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'L');

 	Hotkey_Register( &desc);

 

 	desc.pszName = "Scriver/Wnd/Minimize";

-	desc.pszDescription = "Window: Minimize";

+	desc.pszDescription = LPGEN("Window: Minimize");

 	desc.lParam = KB_MINIMIZE;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_SHIFT, VK_ESCAPE);

 	Hotkey_Register( &desc);

 

 	desc.pszName = "Scriver/Wnd/Close Tab";

-	desc.pszDescription = "Window: Close Tab";

+	desc.pszDescription = LPGEN("Window: Close Tab");

 	desc.lParam = KB_CLOSE;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, VK_F4);

 	Hotkey_Register( &desc);

@@ -368,19 +368,19 @@ void RegisterKeyBindings() {
 	Hotkey_Register( &desc);

 

 	desc.pszName = "Scriver/Action/Quote";

-	desc.pszDescription = "Action: Quote";

+	desc.pszDescription = LPGEN("Action: Quote");

 	desc.lParam = KB_QUOTE;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, 'Q');

 	Hotkey_Register( &desc);

 

 	desc.pszName = "Scriver/Action/Send All";

-	desc.pszDescription = "Action: Send to All";

+	desc.pszDescription = LPGEN("Action: Send to All");

 	desc.lParam = KB_SEND_ALL;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, VK_RETURN);

 	Hotkey_Register( &desc);

 

 	desc.pszName = "Scriver/Action/PasteSend";

-	desc.pszDescription = "Action: Paste & Send";

+	desc.pszDescription = LPGEN("Action: Paste & Send");

 	desc.lParam = KB_PASTESEND;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, VK_INSERT);

 	Hotkey_Register( &desc);

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 757f74aaa5..9b90c24636 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -43,13 +43,13 @@ static void UpdateReadChars(HWND hwndDlg, struct SrmmWindowData * dat);
 

 static WNDPROC OldMessageEditProc, OldLogEditProc;

 static ToolbarButton toolbarButtons[] = {

-	{_T("Quote"), IDC_QUOTE, 0, 4, 24},

-	{_T("Smiley"), IDC_SMILEYS, 0, 10, 24},

-	{_T("Add Contact"), IDC_ADD, 0, 10, 24},

-	{_T("User Menu"), IDC_USERMENU, 1, 0, 24},

-	{_T("User Details"), IDC_DETAILS, 1, 0, 24},

-	{_T("History"), IDC_HISTORY, 1, 0, 24},

-	{_T("Send"), IDOK, 1, 0, 38}

+	{LPGENT("Quote"), IDC_QUOTE, 0, 4, 24},

+	{LPGENT("Smiley"), IDC_SMILEYS, 0, 10, 24},

+	{LPGENT("Add Contact"), IDC_ADD, 0, 10, 24},

+	{LPGENT("User Menu"), IDC_USERMENU, 1, 0, 24},

+	{LPGENT("User Details"), IDC_DETAILS, 1, 0, 24},

+	{LPGENT("History"), IDC_HISTORY, 1, 0, 24},

+	{LPGENT("Send"), IDOK, 1, 0, 38}

 };

 

 static DWORD CALLBACK StreamOutCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG * pcb)

diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp
index 6c610bd0cd..d197809415 100644
--- a/plugins/Scriver/src/msglog.cpp
+++ b/plugins/Scriver/src/msglog.cpp
@@ -243,21 +243,21 @@ static EventData *GetTestEvents()
 {

 	EventData *event, *firstEvent, *prevEvent;

 	firstEvent = prevEvent = event = GetTestEvent(IEEDF_SENT);

-	event->pszNickT = mir_tstrdup(_T("Me"));

-	event->pszTextT = mir_tstrdup(_T("O Lord, bless this Thy hand grenade that with it Thou mayest blow Thine enemies"));

+	event->pszNickT = mir_tstrdup(LPGENT("Me"));

+	event->pszTextT = mir_tstrdup(LPGENT("O Lord, bless this Thy hand grenade that with it Thou mayest blow Thine enemies"));

     event = GetTestEvent(IEEDF_SENT);

-	event->pszNickT = mir_tstrdup(_T("Me"));

-	event->pszTextT = mir_tstrdup(_T("to tiny bits, in Thy mercy"));

+	event->pszNickT = mir_tstrdup(LPGENT("Me"));

+	event->pszTextT = mir_tstrdup(LPGENT("to tiny bits, in Thy mercy"));

     prevEvent->next = event;

     prevEvent = event;

     event = GetTestEvent(0);

-	event->pszNickT = mir_tstrdup(_T("My Contact"));

-	event->pszTextT = mir_tstrdup(_T("Lorem ipsum dolor sit amet,"));

+	event->pszNickT = mir_tstrdup(LPGENT("My Contact"));

+	event->pszTextT = mir_tstrdup(LPGENT("Lorem ipsum dolor sit amet,"));

     prevEvent->next = event;

     prevEvent = event;

     event = GetTestEvent(0);

-	event->pszNickT = mir_tstrdup(_T("My Contact"));

-	event->pszTextT = mir_tstrdup(_T("consectetur adipisicing elit"));

+	event->pszNickT = mir_tstrdup(LPGENT("My Contact"));

+	event->pszTextT = mir_tstrdup(LPGENT("consectetur adipisicing elit"));

     prevEvent->next = event;

     prevEvent = event;

 	return firstEvent;

diff --git a/plugins/SeenPlugin/src/history.cpp b/plugins/SeenPlugin/src/history.cpp
index 27f89e223e..289fe676b4 100644
--- a/plugins/SeenPlugin/src/history.cpp
+++ b/plugins/SeenPlugin/src/history.cpp
@@ -230,7 +230,7 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwndDlg, UINT Message, WPARAM wparam, LPARA
 			CallService(MS_MSG_SENDMESSAGE,(WPARAM)hContact,0);

 			break;

 		case IDC_TEST:

-			debug( ParseString( _T("Date: %d.%m.%y(%Y) \n Date desc: %W - %w - %E - %e \n Time: %H:%M:%S (%h-%p) \n user: %n - %u \n Status: %s \n IP: %i - %r"), hContact, 0));

+			debug( ParseString( LPGENT("Date: %d.%m.%y(%Y) \n Date desc: %W - %w - %E - %e \n Time: %H:%M:%S (%h-%p) \n user: %n - %u \n Status: %s \n IP: %i - %r"), hContact, 0));

 			break;

 		}

 		break;

diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp
index bbbcc66779..8983ac53e0 100644
--- a/plugins/SeenPlugin/src/utils.cpp
+++ b/plugins/SeenPlugin/src/utils.cpp
@@ -142,10 +142,10 @@ DWORD isSeen(HANDLE hcontact, SYSTEMTIME *st)
 	return res;

 }

 

-TCHAR *weekdays[] = { _T("Sunday"), _T("Monday"), _T("Tuesday"), _T("Wednesday"), _T("Thursday"), _T("Friday"), _T("Saturday") };

-TCHAR *wdays_short[] = { _T("Sun."), _T("Mon."), _T("Tue."), _T("Wed."), _T("Thu."), _T("Fri."), _T("Sat.") };

-TCHAR *monthnames[] = { _T("January"), _T("February"), _T("March"), _T("April"), _T("May"), _T("June"), _T("July"), _T("August"), _T("September"), _T("October"), _T("November"), _T("December") };

-TCHAR *mnames_short[] = { _T("Jan."), _T("Feb."), _T("Mar."), _T("Apr."), _T("May"), _T("Jun."), _T("Jul."), _T("Aug."), _T("Sep."), _T("Oct."), _T("Nov."), _T("Dec.") };

+TCHAR *weekdays[] = { LPGENT("Sunday"), LPGENT("Monday"), LPGENT("Tuesday"), LPGENT("Wednesday"), LPGENT("Thursday"), LPGENT("Friday"), LPGENT("Saturday") };

+TCHAR *wdays_short[] = { LPGENT("Sun."), LPGENT("Mon."), LPGENT("Tue."), LPGENT("Wed."), LPGENT("Thu."), LPGENT("Fri."), LPGENT("Sat.") };

+TCHAR *monthnames[] = { LPGENT("January"), LPGENT("February"), LPGENT("March"), LPGENT("April"), LPGENT("May"), LPGENT("June"), LPGENT("July"), LPGENT("August"), LPGENT("September"), LPGENT("October"), LPGENT("November"), LPGENT("December") };

+TCHAR *mnames_short[] = { LPGENT("Jan."), LPGENT("Feb."), LPGENT("Mar."), LPGENT("Apr."), LPGENT("May"), LPGENT("Jun."), LPGENT("Jul."), LPGENT("Aug."), LPGENT("Sep."), LPGENT("Oct."), LPGENT("Nov."), LPGENT("Dec.") };

 

 TCHAR *ParseString(TCHAR *szstring, HANDLE hcontact, BYTE isfile)

 {

diff --git a/plugins/SendScreenshotPlus/src/CSend.h b/plugins/SendScreenshotPlus/src/CSend.h
index 082f3e961a..f174ab98b4 100644
--- a/plugins/SendScreenshotPlus/src/CSend.h
+++ b/plugins/SendScreenshotPlus/src/CSend.h
@@ -52,8 +52,8 @@ Last change by : $Author: ing.u.horn $
 #define GC_RESULT_ERROR				202

 #define GC_RESULT_NOSESSION			209

 

-#define SS_ERR_INIT					_T("Unable to initiate %s.")

-#define SS_ERR_MAPI					_T("MAPI error (%i):\n%s.")

+#define SS_ERR_INIT					LPGENT("Unable to initiate %s.")

+#define SS_ERR_MAPI					LPGENT("MAPI error (%i):\n%s.")

 

 //---------------------------------------------------------------------------

 class CSend {

diff --git a/plugins/SendScreenshotPlus/src/CSendEmail.cpp b/plugins/SendScreenshotPlus/src/CSendEmail.cpp
index 7026ae13ef..cc8dc8c0d4 100644
--- a/plugins/SendScreenshotPlus/src/CSendEmail.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendEmail.cpp
@@ -159,46 +159,46 @@ void CSendEmail::SendThread() {
 

 			// No message was sent

 			case MAPI_E_AMBIGUOUS_RECIPIENT:

-				err = _T("A recipient matched more than one of the recipient descriptor structures and MAPI_DIALOG was not set");

+				err = LPGENT("A recipient matched more than one of the recipient descriptor structures and MAPI_DIALOG was not set");

 				break;

 			case MAPI_E_ATTACHMENT_NOT_FOUND:

-				err = _T("The specified attachment was not found");

+				err = LPGENT("The specified attachment was not found");

 				break;

 			case MAPI_E_ATTACHMENT_OPEN_FAILURE:

-				err = _T("The specified attachment could not be opened");

+				err = LPGENT("The specified attachment could not be opened");

 				break;

 			case MAPI_E_BAD_RECIPTYPE:

-				err = _T("The type of a recipient was not MAPI_TO, MAPI_CC, or MAPI_BCC");

+				err = LPGENT("The type of a recipient was not MAPI_TO, MAPI_CC, or MAPI_BCC");

 				break;

 			case MAPI_E_FAILURE:

-				err = _T("One or more unspecified errors occurred");

+				err = LPGENT("One or more unspecified errors occurred");

 				break;

 			case MAPI_E_INSUFFICIENT_MEMORY:

-				err = _T("There was insufficient memory to proceed");

+				err = LPGENT("There was insufficient memory to proceed");

 				break;

 			case MAPI_E_INVALID_RECIPS:

-				err = _T("One or more recipients were invalid or did not resolve to any address");

+				err = LPGENT("One or more recipients were invalid or did not resolve to any address");

 				break;

 			case MAPI_E_LOGIN_FAILURE:

-				err = _T("There was no default logon, and the user failed to log on successfully when the logon dialog box was displayed");

+				err = LPGENT("There was no default logon, and the user failed to log on successfully when the logon dialog box was displayed");

 				break;

 			case MAPI_E_TEXT_TOO_LARGE:

-				err = _T("The text in the message was too large");

+				err = LPGENT("The text in the message was too large");

 				break;

 			case MAPI_E_TOO_MANY_FILES:

-				err = _T("There were too many file attachments");

+				err = LPGENT("There were too many file attachments");

 				break;

 			case MAPI_E_TOO_MANY_RECIPIENTS:

-				err = _T("There were too many recipients");

+				err = LPGENT("There were too many recipients");

 				break;

 			case MAPI_E_UNKNOWN_RECIPIENT:

-				err = _T("A recipient did not appear in the address list");

+				err = LPGENT("A recipient did not appear in the address list");

 				break;

 			case MAPI_E_USER_ABORT:

-				err = _T("The user canceled one of the dialog boxes");

+				err = LPGENT("The user canceled one of the dialog boxes");

 				break;

 			default:

-				err = _T("Unknown Error");

+				err = LPGENT("Unknown Error");

 				break;

 		}

 		Error(SS_ERR_MAPI, res, err);

diff --git a/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp
index d7512d2fe6..3d33389d81 100644
--- a/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp
@@ -38,7 +38,7 @@ Last change by : $Author: ing.u.horn $
 CSendFTPFile::CSendFTPFile(HWND Owner, HANDLE hContact, bool bFreeOnExit)

 : CSend(Owner, hContact, bFreeOnExit){

 	m_EnableItem		= NULL ; //SS_DLG_DESCRIPTION| SS_DLG_AUTOSEND | SS_DLG_DELETEAFTERSSEND;

-	m_pszSendTyp		= _T("FTPFile transfer");

+	m_pszSendTyp		= LPGENT("FTPFile transfer");

 	m_pszFileName		= NULL;

 	m_URL				= NULL;

 }

@@ -78,7 +78,7 @@ void CSendFTPFile::SendThread() {
 

 	ret = (int)CallService(MS_FTPFILE_SHAREFILE, (WPARAM)m_hContact, (LPARAM)m_pszFileName);

 	if (ret != 0) {

-		Error(_T("%s (%i):\nCould not add a share to the FTP File plugin."),TranslateTS(m_pszSendTyp),ret);

+		Error(TranslateT("%s (%i):\nCould not add a share to the FTP File plugin."),TranslateTS(m_pszSendTyp),ret);

 		Exit(ret);

 	}

 

diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
index 819086ead7..1c21a736f2 100644
--- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp
@@ -58,7 +58,7 @@ CSendHTTPServer::~CSendHTTPServer(){
 void	CSendHTTPServer::Send() {

 

 	if (CallService(MS_HTTP_ACCEPT_CONNECTIONS, (WPARAM)true, 0) != 0) {

-		Error(NULL, _T("Could not start the HTTP Server plugin."));

+		Error(NULL, TranslateT("Could not start the HTTP Server plugin."));

 		return;

 	}

 

@@ -104,7 +104,7 @@ void CSendHTTPServer::SendThread() {
 	}

 

 	if (ret != 0) {

-		Error(_T("%s (%i):\nCould not add a share to the HTTP Server plugin."),TranslateTS(m_pszSendTyp),ret);

+		Error(TranslateT("%s (%i):\nCould not add a share to the HTTP Server plugin."),TranslateTS(m_pszSendTyp),ret);

 		Exit(ret);

 	}

 

diff --git a/plugins/SendScreenshotPlus/src/CSendImageShack.cpp b/plugins/SendScreenshotPlus/src/CSendImageShack.cpp
index a27b4f5273..20d1dfd87e 100644
--- a/plugins/SendScreenshotPlus/src/CSendImageShack.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendImageShack.cpp
@@ -224,7 +224,7 @@ void CSendImageShack::SendThread() {
 			}

 		}

 		else {

-				Error(NULL, _T("Upload server did not respond timely."));

+				Error(NULL, TranslateT("Upload server did not respond timely."));

 		}

 		CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM) m_nlreply);

 		m_nlreply = NULL;

diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp
index 58d92dd8aa..209028bb9a 100644
--- a/plugins/SendScreenshotPlus/src/Main.cpp
+++ b/plugins/SendScreenshotPlus/src/Main.cpp
@@ -103,7 +103,7 @@ extern "C" int __declspec(dllexport) Load(void) {
 	INT_PTR result = CallService(MS_IMG_GETINTERFACE, FI_IF_VERSION, (LPARAM)&FIP);

 

 	if(FIP == NULL || result != S_OK) {

-		MessageBoxEx(NULL, TranslateT("Fatal error, image services not found. Send Screenshot will be disabled."), _T("Error"), MB_OK | MB_ICONERROR | MB_APPLMODAL, 0);

+		MessageBoxEx(NULL, TranslateT("Fatal error, image services not found. Send Screenshot will be disabled."), TranslateT("Error"), MB_OK | MB_ICONERROR | MB_APPLMODAL, 0);

 		return 1;

 	}

 

diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp
index 3059c23f67..03990201eb 100644
--- a/plugins/SendScreenshotPlus/src/UMainForm.cpp
+++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp
@@ -40,7 +40,7 @@ INT_PTR CALLBACK TfrmMain::DlgProc_CaptureWindow(HWND hDlg, UINT uMsg, WPARAM wP
 	switch (uMsg) {

 	case WM_INITDIALOG:

 		Static_SetIcon(GetDlgItem(hDlg, ID_imgTarget), IcoLib_GetIcon(ICO_PLUG_SSTARGET));

-		SetDlgItemText(hDlg, ID_edtCaption, _T("Drag&&Drop the target on the desired window."));

+		SetDlgItemText(hDlg, ID_edtCaption, TranslateT("Drag&&Drop the target on the desired window."));

 		TranslateDialogDefault(hDlg);

 		break;

 	case WM_CTLCOLOREDIT:		//ctrl is NOT read-only or disabled 

@@ -974,14 +974,14 @@ INT_PTR TfrmMain::SaveScreenshot(FIBITMAP* dib) {
 

 	//Generate a description according to the screenshot

 	TCHAR winText[1024];

-	mir_tcsadd(pszFileDesc, _T("Screenshot "));

+	mir_tcsadd(pszFileDesc, TranslateT("Screenshot "));

 	if (m_opt_tabCapture == 0 && m_opt_chkClientArea) {

-		mir_tcsadd(pszFileDesc, _T("for Client area "));

+		mir_tcsadd(pszFileDesc, TranslateT("for Client area "));

 	}

-	mir_tcsadd(pszFileDesc, _T("of \""));

+	mir_tcsadd(pszFileDesc, TranslateT("of \""));

 	GetDlgItemText(m_hwndTabPage, ID_edtCaption, winText, 1024);

 	mir_tcsadd(pszFileDesc, winText);

-	mir_tcsadd(pszFileDesc, _T("\" Window"));

+	mir_tcsadd(pszFileDesc, TranslateT("\" Window"));

 

 	// convert to 32Bits (make shure it is 32bit)

 	FIBITMAP *dib_new = FIP->FI_ConvertTo32Bits(dib);

diff --git a/plugins/SendScreenshotPlus/src/global.h b/plugins/SendScreenshotPlus/src/global.h
index 7fe0c9b182..a9d22c898a 100644
--- a/plugins/SendScreenshotPlus/src/global.h
+++ b/plugins/SendScreenshotPlus/src/global.h
@@ -33,7 +33,7 @@ Last change by : $Author: ing.u.horn $
 #ifndef _GLOBAL_H_

 #define _GLOBAL_H_

 

-#define _CRT_SECURE_NO_WARNINGS

+//#define _CRT_SECURE_NO_WARNINGS

 #define WINVER			0x0700

 #define _WIN32_WINNT	0x0700

 #define _WIN32_IE		0x0601

@@ -123,7 +123,7 @@ typedef struct _MGLOBAL {
 } MGLOBAL, *LPMGLOBAL;

 

 //---------------------------------------------------------------------------

-#define ERROR_TITLE		_T("SendScreenshot - Error")

+#define ERROR_TITLE		TranslateT("SendScreenshot - Error")

 

 // Miranda Database Key

 #define SZ_SENDSS		"SendSS"