- translation fixes (patch from Basil)

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

9 files changed, 57 insertions, 57 deletions

diff --git a/plugins/Boltun/src/boltun.h b/plugins/Boltun/src/boltun.h
index dc0cdcdb22..5bc0d26f29 100644
--- a/plugins/Boltun/src/boltun.h
+++ b/plugins/Boltun/src/boltun.h
@@ -50,23 +50,23 @@
 //Plugin name

 #define BOLTUN_NAME  "Boltun"

 

-#define MIND_FILE_DESC _T("Mind Files")

-#define ALL_FILES_DESC _T("All Files")

+#define MIND_FILE_DESC LPGENT("Mind Files")

+#define ALL_FILES_DESC LPGENT("All Files")

 

 //UI strings

-#define BOLTUN_AUTO_CHAT   "Boltun/Auto Chat"

-#define BOLTUN_NOT_TO_CHAT "Boltun/Not to Chat"

-#define BOLTUN_START_CHATTING "Boltun/Start Chatting"

+#define BOLTUN_AUTO_CHAT   LPGEN("Boltun/Auto Chat")

+#define BOLTUN_NOT_TO_CHAT LPGEN("Boltun/Not to Chat")

+#define BOLTUN_START_CHATTING LPGEN("Boltun/Start Chatting")

 

-#define DEFAULT_WARN_TEXT _T("Hello. I'm Boltun! I'll talk to you, while my owner is away. Please write without mistakes!")

+#define DEFAULT_WARN_TEXT LPGENT("Hello. I'm Boltun! I'll talk to you, while my owner is away. Please write without mistakes!")

 

 // Error messages

-#define BOLTUN_ERROR         _T("Boltun Error")

-#define FAILED_TO_LOAD_BASE  _T("Failed to load base of remarks. Error at line %d of %s. (Or few lines before).")

-#define FAILED_TO_SAVE_BASE  _T("Failed to save base of remarks to %s")

+#define BOLTUN_ERROR         LPGENT("Boltun Error")

+#define FAILED_TO_LOAD_BASE  LPGENT("Failed to load base of remarks. Error at line %d of %s. (Or few lines before).")

+#define FAILED_TO_SAVE_BASE  LPGENT("Failed to save base of remarks to %s")

 

 //Settings tab names

-#define TAB_GENERAL "General Settings"

-#define TAB_ENGINE "Engine Settings"

+#define TAB_GENERAL LPGEN("General Settings")

+#define TAB_ENGINE LPGEN("Engine Settings")

 

 #endif /*_BOLTUN_H*/

diff --git a/plugins/Clist_mw/src/clcopts.cpp b/plugins/Clist_mw/src/clcopts.cpp
index 981a03a27e..a812638c09 100644
--- a/plugins/Clist_mw/src/clcopts.cpp
+++ b/plugins/Clist_mw/src/clcopts.cpp
@@ -108,31 +108,31 @@ struct CheckBoxValues_t {
 };

 static const struct CheckBoxValues_t greyoutValues[]  = 

 {

-	{GREYF_UNFOCUS,  _T("Not focused") },

-	{MODEF_OFFLINE,  _T("Offline") },

-	{PF2_ONLINE,     _T("Online") },

-	{PF2_SHORTAWAY,  _T("Away") },

-	{PF2_LONGAWAY,   _T("NA") },

-	{PF2_LIGHTDND,   _T("Occupied") },

-	{PF2_HEAVYDND,   _T("DND") },

-	{PF2_FREECHAT,   _T("Free for chat") },

-	{PF2_INVISIBLE,  _T("Invisible") },

-	{PF2_OUTTOLUNCH, _T("Out to lunch") },

-	{PF2_ONTHEPHONE, _T("On the phone") }

+	{GREYF_UNFOCUS,  LPGENT("Not focused") },

+	{MODEF_OFFLINE,  LPGENT("Offline") },

+	{PF2_ONLINE,     LPGENT("Online") },

+	{PF2_SHORTAWAY,  LPGENT("Away") },

+	{PF2_LONGAWAY,   LPGENT("NA") },

+	{PF2_LIGHTDND,   LPGENT("Occupied") },

+	{PF2_HEAVYDND,   LPGENT("DND") },

+	{PF2_FREECHAT,   LPGENT("Free for chat") },

+	{PF2_INVISIBLE,  LPGENT("Invisible") },

+	{PF2_OUTTOLUNCH, LPGENT("Out to lunch") },

+	{PF2_ONTHEPHONE, LPGENT("On the phone") }

 };

 

 static const struct CheckBoxValues_t offlineValues[]  = 

 {

-	{MODEF_OFFLINE,  _T("Offline") },

-	{PF2_ONLINE,     _T("Online") },

-	{PF2_SHORTAWAY,  _T("Away") },

-	{PF2_LONGAWAY,   _T("NA") },

-	{PF2_LIGHTDND,   _T("Occupied") },

-	{PF2_HEAVYDND,   _T("DND") },

-	{PF2_FREECHAT,   _T("Free for chat") },

-	{PF2_INVISIBLE,  _T("Invisible") },

-	{PF2_OUTTOLUNCH, _T("Out to lunch") },

-	{PF2_ONTHEPHONE, _T("On the phone") }

+	{MODEF_OFFLINE,  LPGENT("Offline") },

+	{PF2_ONLINE,     LPGENT("Online") },

+	{PF2_SHORTAWAY,  LPGENT("Away") },

+	{PF2_LONGAWAY,   LPGENT("NA") },

+	{PF2_LIGHTDND,   LPGENT("Occupied") },

+	{PF2_HEAVYDND,   LPGENT("DND") },

+	{PF2_FREECHAT,   LPGENT("Free for chat") },

+	{PF2_INVISIBLE,  LPGENT("Invisible") },

+	{PF2_OUTTOLUNCH, LPGENT("Out to lunch") },

+	{PF2_ONTHEPHONE, LPGENT("On the phone") }

 };

 

 static void FillCheckBoxTree(HWND hwndTree,const struct CheckBoxValues_t *values,int nValues,DWORD style)

diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp
index 600b0b8a5e..be59b7af1e 100644
--- a/plugins/Clist_nicer/src/clcopts.cpp
+++ b/plugins/Clist_nicer/src/clcopts.cpp
@@ -69,10 +69,10 @@ struct CheckBoxValues_t {
 };

 

 static const struct CheckBoxValues_t greyoutValues[] = {

-    {GREYF_UNFOCUS,_T("Not focused")}, {MODEF_OFFLINE,_T("Offline")}, {PF2_ONLINE,_T("Online")}, {PF2_SHORTAWAY,_T("Away")}, {PF2_LONGAWAY,_T("NA")}, {PF2_LIGHTDND,_T("Occupied")}, {PF2_HEAVYDND,_T("DND")}, {PF2_FREECHAT,_T("Free for chat")}, {PF2_INVISIBLE,_T("Invisible")}, {PF2_OUTTOLUNCH,_T("Out to lunch")}, {PF2_ONTHEPHONE,_T("On the phone")}

+    {GREYF_UNFOCUS,LPGENT("Not focused")}, {MODEF_OFFLINE,LPGENT("Offline")}, {PF2_ONLINE,LPGENT("Online")}, {PF2_SHORTAWAY,LPGENT("Away")}, {PF2_LONGAWAY,LPGENT("NA")}, {PF2_LIGHTDND,LPGENT("Occupied")}, {PF2_HEAVYDND,LPGENT("DND")}, {PF2_FREECHAT,LPGENT("Free for chat")}, {PF2_INVISIBLE,LPGENT("Invisible")}, {PF2_OUTTOLUNCH,LPGENT("Out to lunch")}, {PF2_ONTHEPHONE,LPGENT("On the phone")}

 };

 static const struct CheckBoxValues_t offlineValues[] = {

-    {MODEF_OFFLINE,_T("Offline")}, {PF2_ONLINE,_T("Online")}, {PF2_SHORTAWAY,_T("Away")}, {PF2_LONGAWAY,_T("NA")}, {PF2_LIGHTDND,_T("Occupied")}, {PF2_HEAVYDND,_T("DND")}, {PF2_FREECHAT,_T("Free for chat")}, {PF2_INVISIBLE,_T("Invisible")}, {PF2_OUTTOLUNCH,_T("Out to lunch")}, {PF2_ONTHEPHONE,_T("On the phone")}

+    {MODEF_OFFLINE,LPGENT("Offline")}, {PF2_ONLINE,LPGENT("Online")}, {PF2_SHORTAWAY,LPGENT("Away")}, {PF2_LONGAWAY,LPGENT("NA")}, {PF2_LIGHTDND,LPGENT("Occupied")}, {PF2_HEAVYDND,LPGENT("DND")}, {PF2_FREECHAT,LPGENT("Free for chat")}, {PF2_INVISIBLE,LPGENT("Invisible")}, {PF2_OUTTOLUNCH,LPGENT("Out to lunch")}, {PF2_ONTHEPHONE,LPGENT("On the phone")}

 };

 

 static HIMAGELIST himlCheckBoxes = 0;

diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp
index 3e8982e196..7442fc6e3e 100644
--- a/plugins/Clist_nicer/src/viewmodes.cpp
+++ b/plugins/Clist_nicer/src/viewmodes.cpp
@@ -628,7 +628,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETEXTRACOLUMNS, ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE, 0);

 			cii.cbSize = sizeof(cii);

 			cii.hParentGroup = 0;

-			cii.pszText = _T("*** All contacts ***");

+			cii.pszText = LPGENT("*** All contacts ***");

 			hInfoItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)&cii);

 			SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETHIDEEMPTYGROUPS, 1, 0);

 			if (SendDlgItemMessage(hwndDlg, IDC_VIEWMODES, LB_SETCURSEL, 0, 0) != LB_ERR) {

diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp
index 9d88884433..4674733fb3 100644
--- a/plugins/Folders/src/dlg_handlers.cpp
+++ b/plugins/Folders/src/dlg_handlers.cpp
@@ -239,7 +239,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static TCHAR tszMessage[] = _T("\

+static TCHAR tszMessage[] = LPGENT("\

 Don\'t forget to click on Apply to save the changes. If you don\'t then the changes won\'t\r\n\

 be saved to the database, they will only be valid for this session.\r\n\r\n\

 Variable string\t\tWhat it expands to:\r\n\

diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp
index 71b7c3e9f7..8c82d97595 100644
--- a/plugins/HTTPServer/src/GuiElements.cpp
+++ b/plugins/HTTPServer/src/GuiElements.cpp
@@ -1129,10 +1129,10 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 					SetDlgItemText(hwndDlg, IDC_PAGE_KEYWORD, sPageKeyword.c_str());

 					HWND hComboBox = GetDlgItem(hwndDlg, IDC_PAGE_KEYWORD);

 					SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)"");

-					SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("Current IP Address: "));

-					SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("Current Address: "));

-					SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("IP Adress: "));

-					SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("You are browsing from"));

+					SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)LPGENT("Current IP Address: "));

+					SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)LPGENT("Current Address: "));

+					SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)LPGENT("IP Adress: "));

+					SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)LPGENT("You are browsing from"));

 					SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("<HTML><BODY>"));

 				}

 

diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp
index 65433dd079..35df2f7cb4 100644
--- a/plugins/ListeningTo/src/listeningto.cpp
+++ b/plugins/ListeningTo/src/listeningto.cpp
@@ -384,52 +384,52 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 

 		tr.tszTokenString = _T("listening_info");

 		tr.parseFunctionT = VariablesParseInfo;

-		tr.szHelpText = "Listening info\tListening info as set in the options";

+		tr.szHelpText = LPGEN("Listening info\tListening info as set in the options");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM) &tr);

 

 		tr.tszTokenString = _T("listening_type");

 		tr.parseFunctionT = VariablesParseType;

-		tr.szHelpText = "Listening info\tMedia type: Music, Video, etc";

+		tr.szHelpText = LPGEN("Listening info\tMedia type: Music, Video, etc");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM) &tr);

 

 		tr.tszTokenString = _T("listening_artist");

 		tr.parseFunctionT = VariablesParseArtist;

-		tr.szHelpText = "Listening info\tArtist name";

+		tr.szHelpText = LPGEN("Listening info\tArtist name");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM) &tr);

 

 		tr.tszTokenString = _T("listening_album");

 		tr.parseFunctionT = VariablesParseAlbum;

-		tr.szHelpText = "Listening info\tAlbum name";

+		tr.szHelpText = LPGEN("Listening info\tAlbum name");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM) &tr);

 

 		tr.tszTokenString = _T("listening_title");

 		tr.parseFunctionT = VariablesParseTitle;

-		tr.szHelpText = "Listening info\tSong name";

+		tr.szHelpText = LPGEN("Listening info\tSong name");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM) &tr);

 

 		tr.tszTokenString = _T("listening_track");

 		tr.parseFunctionT = VariablesParseTrack;

-		tr.szHelpText = "Listening info\tTrack number";

+		tr.szHelpText = LPGEN("Listening info\tTrack number");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM) &tr);

 

 		tr.tszTokenString = _T("listening_year");

 		tr.parseFunctionT = VariablesParseYear;

-		tr.szHelpText = "Listening info\tSong year";

+		tr.szHelpText = LPGEN("Listening info\tSong year");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM) &tr);

 

 		tr.tszTokenString = _T("listening_genre");

 		tr.parseFunctionT = VariablesParseGenre;

-		tr.szHelpText = "Listening info\tSong genre";

+		tr.szHelpText = LPGEN("Listening info\tSong genre");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM) &tr);

 

 		tr.tszTokenString = _T("listening_length");

 		tr.parseFunctionT = VariablesParseLength;

-		tr.szHelpText = "Listening info\tSong length";

+		tr.szHelpText = LPGEN("Listening info\tSong length");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM) &tr);

 

 		tr.tszTokenString = _T("listening_player");

 		tr.parseFunctionT = VariablesParsePlayer;

-		tr.szHelpText = "Listening info\tPlayer name";

+		tr.szHelpText = LPGEN("Listening info\tPlayer name");

 		CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM) &tr);

 	}

 

diff --git a/plugins/ListeningTo/src/options.cpp b/plugins/ListeningTo/src/options.cpp
index 411305a279..149acefc20 100644
--- a/plugins/ListeningTo/src/options.cpp
+++ b/plugins/ListeningTo/src/options.cpp
@@ -53,10 +53,10 @@ static OptPageControl optionsControls[] = {
 

 static OptPageControl formatControls[] = { 

 	{ &opts.templ,					CONTROL_TEXT,		IDC_TEMPLATE,			"Template", (DWORD) _T("%artist% - %title%") },

-	{ &opts.unknown,				CONTROL_TEXT,		IDC_UNKNOWN,			"Unknown", (DWORD) _T("<Unknown>"), 0, 0, 128 },

-	{ &opts.xstatus_name,			CONTROL_TEXT,		IDC_XSTATUS_NAME,		"XStatusName", (DWORD) _T("Listening to") },

+	{ &opts.unknown,				CONTROL_TEXT,		IDC_UNKNOWN,			"Unknown", (DWORD) LPGENT("<Unknown>"), 0, 0, 128 },

+	{ &opts.xstatus_name,			CONTROL_TEXT,		IDC_XSTATUS_NAME,		"XStatusName", (DWORD) LPGENT("Listening to") },

 	{ &opts.xstatus_message,		CONTROL_TEXT,		IDC_XSTATUS_MESSAGE,	"XStatusMessage", (DWORD) _T("%listening%") },

-	{ &opts.nothing,				CONTROL_TEXT,		IDC_NOTHING,			"Nothing", (DWORD) _T("<Nothing is playing now>"), 0, 0, 128 }

+	{ &opts.nothing,				CONTROL_TEXT,		IDC_NOTHING,			"Nothing", (DWORD) LPGENT("<Nothing is playing now>"), 0, 0, 128 }

 };

 

 static OptPageControl playersControls[] = { 

@@ -138,11 +138,11 @@ BOOL IsTypeEnabled(LISTENINGTOINFO *lti)
 

 

 	if (lti->dwFlags & LTI_UNICODE) {

-		if (lstrcmpi(lti->ptszType, _T("Music")) == 0)

+		if (lstrcmpi(lti->ptszType, LPGENT("Music")) == 0)

 			return opts.enable_music;

-		if (lstrcmpi(lti->ptszType, _T("Radio")) == 0)

+		if (lstrcmpi(lti->ptszType, LPGENT("Radio")) == 0)

 			return opts.enable_radio;

-		if (lstrcmpi(lti->ptszType, _T("Video")) == 0)

+		if (lstrcmpi(lti->ptszType, LPGENT("Video")) == 0)

 			return opts.enable_video;

 		return opts.enable_others;

 	}

diff --git a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp
index 8d6b8512f2..d603070832 100644
--- a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp
+++ b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp
@@ -242,7 +242,7 @@ void InitMirOTRMenu(void)
 	mi.cbSize = sizeof(mi);

 

 	mi.flags = CMIF_DISABLED|CMIF_TCHAR|CMIF_ICONFROMICOLIB;

-	mi.ptszName = _T("OTR Status");

+	mi.ptszName = LPGENT("OTR Status");

 	mi.position = 0;

 	hStatusInfoItem = (HGENMENU) AddMirOTRMenuItem(0, (LPARAM) &mi);