class CTranslator removed from tabSRMM due its stupidity

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

6 files changed, 109 insertions, 109 deletions

diff --git a/plugins/TabSRMM/chat/colorchooser.cpp b/plugins/TabSRMM/chat/colorchooser.cpp
index 4879f56d95..a618dafa5b 100644
--- a/plugins/TabSRMM/chat/colorchooser.cpp
+++ b/plugins/TabSRMM/chat/colorchooser.cpp
@@ -110,8 +110,8 @@ INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			pCC->yPosition -= height;

 

 

-			SetDlgItemText(hwndDlg, IDC_COLORTEXT, pCC->bForeground ? CTranslator::get(CTranslator::GEN_MUC_TEXTCOLOR) :

-						   CTranslator::get(CTranslator::GEN_MUC_BGCOLOR));

+			SetDlgItemText(hwndDlg, IDC_COLORTEXT, pCC->bForeground ? TranslateT("Text color") :

+						   TranslateT("Background color"));

 			SetWindowPos(GetDlgItem(hwndDlg, IDC_COLORTEXT), NULL,  0, 0, width, 20, 0);

 			SetWindowPos(hwndDlg, NULL, pCC->xPosition, pCC->yPosition, width, height, SWP_SHOWWINDOW);

 		}

diff --git a/plugins/TabSRMM/chat/log.cpp b/plugins/TabSRMM/chat/log.cpp
index 7c167441d0..a297c9b006 100644
--- a/plugins/TabSRMM/chat/log.cpp
+++ b/plugins/TabSRMM/chat/log.cpp
@@ -692,52 +692,52 @@ static void AddEventToBuffer(char **buffer, int *bufferEnd, int *bufferAlloced,
 			if (pszNick) {

 				if (!streamData->lin->bIsMe)

 					/* replace nick of a newcomer with a link */

-					Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced, CTranslator::get(CTranslator::MUC_LOG_JOINED), pszNick);

+					Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced, TranslateT("%s has joined"), pszNick);

 				else

-					Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced, CTranslator::get(CTranslator::MUC_LOG_ME_JOINED), streamData->si->ptszName);

+					Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced, TranslateT("You have joined %s"), streamData->si->ptszName);

 			}

 			break;

 		case GC_EVENT_PART:

 			if (pszNick)

-				Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced, CTranslator::get(CTranslator::MUC_LOG_LEFT), pszNick);

+				Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced, TranslateT("%s has left"), pszNick);

 			if (streamData->lin->ptszText)

 				Log_AppendRTF(streamData, FALSE, buffer, bufferEnd, bufferAlloced, _T(": %s"), streamData->lin->ptszText);

 			break;

 		case GC_EVENT_QUIT:

 			if (pszNick)

-				Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced, CTranslator::get(CTranslator::MUC_LOG_DISC), pszNick);

+				Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced, TranslateT("%s has disconnected"), pszNick);

 			if (streamData->lin->ptszText)

 				Log_AppendRTF(streamData, FALSE, buffer, bufferEnd, bufferAlloced, _T(": %s"), streamData->lin->ptszText);

 			break;

 		case GC_EVENT_NICK:

 			if (pszNick && streamData->lin->ptszText) {

 				if (!streamData->lin->bIsMe)

-					Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced, CTranslator::get(CTranslator::MUC_LOG_NICKCHANGE), pszNick, streamData->lin->ptszText);

+					Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced, TranslateT("%s is now known as %s"), pszNick, streamData->lin->ptszText);

 				else

-					Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced, CTranslator::get(CTranslator::MUC_LOG_ME_NICKCHANGE), streamData->lin->ptszText);

+					Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced, TranslateT("You are now known as %s"), streamData->lin->ptszText);

 			}

 			break;

 		case GC_EVENT_KICK:

 			if (pszNick && streamData->lin->ptszStatus)

 				Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced,

-							  CTranslator::get(CTranslator::MUC_LOG_KICK), streamData->lin->ptszStatus, pszNick);

+							  TranslateT("%s kicked %s"), streamData->lin->ptszStatus, pszNick);

 

 			if (streamData->lin->ptszText)

 				Log_AppendRTF(streamData, FALSE, buffer, bufferEnd, bufferAlloced, _T(": %s"), streamData->lin->ptszText);

 			break;

 		case GC_EVENT_NOTICE:

 			if (pszNick && streamData->lin->ptszText) {

-				Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced, CTranslator::get(CTranslator::MUC_LOG_NOTICE), pszNick);

+				Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced, TranslateT("Notice from %s: "), pszNick);

 				Log_AppendRTF(streamData, FALSE, buffer, bufferEnd, bufferAlloced, _T("%s"), streamData->lin->ptszText);

 			}

 			break;

 		case GC_EVENT_TOPIC:

 			if (streamData->lin->ptszText)

-				Log_AppendRTF(streamData, FALSE, buffer, bufferEnd, bufferAlloced, CTranslator::get(CTranslator::MUC_LOG_TOPICIS), streamData->lin->ptszText, _T("%r"));

+				Log_AppendRTF(streamData, FALSE, buffer, bufferEnd, bufferAlloced, TranslateT("The topic is \'%s%s\'"), streamData->lin->ptszText, _T("%r"));

 			if (pszNick)

 				Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced,

-							  (streamData->lin->ptszUserInfo) ? CTranslator::get(CTranslator::MUC_LOG_TOPICSETBYON) :

-							  CTranslator::get(CTranslator::MUC_LOG_TOPICSETBY),

+							  (streamData->lin->ptszUserInfo) ? TranslateT(" (set by %s on %s)") :

+							  TranslateT(" (set by %s)"),

 							  pszNick, streamData->lin->ptszUserInfo);

 			break;

 		case GC_EVENT_INFORMATION:

@@ -747,13 +747,13 @@ static void AddEventToBuffer(char **buffer, int *bufferEnd, int *bufferAlloced,
 		case GC_EVENT_ADDSTATUS:

 			if (pszNick && streamData->lin->ptszText && streamData->lin->ptszStatus)

 				Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced,

-							  CTranslator::get(CTranslator::MUC_LOG_STATUSENABLE),

+							  TranslateT("%s enables \'%s\' status for %s"),

 							  streamData->lin->ptszText, streamData->lin->ptszStatus, pszNick);

 			break;

 		case GC_EVENT_REMOVESTATUS:

 			if (pszNick && streamData->lin->ptszText && streamData->lin->ptszStatus) {

 				Log_AppendRTF(streamData, TRUE, buffer, bufferEnd, bufferAlloced,

-							  CTranslator::get(CTranslator::MUC_LOG_STATUSDISABLE),

+							  TranslateT("%s disables \'%s\' status for %s"),

 							  streamData->lin->ptszText , streamData->lin->ptszStatus, pszNick);

 			}

 			break;

diff --git a/plugins/TabSRMM/chat/muchighlight.cpp b/plugins/TabSRMM/chat/muchighlight.cpp
index 80709d863a..806a8544e8 100644
--- a/plugins/TabSRMM/chat/muchighlight.cpp
+++ b/plugins/TabSRMM/chat/muchighlight.cpp
@@ -386,14 +386,14 @@ INT_PTR CALLBACK CMUCHighlight::dlgProcAdd(HWND hwndDlg, UINT msg, WPARAM wParam
 			::SendDlgItemMessage(hwndDlg, IDC_ADDHIGHLIGHTTITLE, WM_SETFONT, (WPARAM)hFont, FALSE);

 			if(the->uCmd == THighLightEdit::CMD_ADD) {

 				Utils::showDlgControl(hwndDlg, IDC_ADDHIGHLIGHTEDITLIST, SW_HIDE);

-				::SetDlgItemTextW(hwndDlg, IDC_ADDHIGHLIGHTTITLE, CTranslator::get(CTranslator::GEN_MUC_HIGHLIGHT_ADD));

+				::SetDlgItemTextW(hwndDlg, IDC_ADDHIGHLIGHTTITLE, TranslateT("Add user to highlight list"));

 				::SendDlgItemMessageW(hwndDlg, IDC_ADDHIGHLIGHTNAME, CB_INSERTSTRING, -1, (LPARAM)the->ui->pszNick);

 				::SendDlgItemMessageW(hwndDlg, IDC_ADDHIGHLIGHTNAME, CB_INSERTSTRING, -1, (LPARAM)the->ui->pszUID);

 				::SendDlgItemMessageW(hwndDlg, IDC_ADDHIGHLIGHTNAME, CB_SETCURSEL, 1, 0);

 			} else {

 				Utils::showDlgControl(hwndDlg, IDC_ADDHIGHLIGHTNAME, SW_HIDE);

 				Utils::showDlgControl(hwndDlg, IDC_ADDHIGHLIGHTEXPLAIN, SW_HIDE);

-				::SetDlgItemTextW(hwndDlg, IDC_ADDHIGHLIGHTTITLE, CTranslator::get(CTranslator::GEN_MUC_HIGHLIGHT_EDIT));

+				::SetDlgItemTextW(hwndDlg, IDC_ADDHIGHLIGHTTITLE, TranslateT("Edit user highlight list"));

 			}

 			break;

 		}

diff --git a/plugins/TabSRMM/chat/options.cpp b/plugins/TabSRMM/chat/options.cpp
index d50ed5ecbb..a00a87161b 100644
--- a/plugins/TabSRMM/chat/options.cpp
+++ b/plugins/TabSRMM/chat/options.cpp
@@ -561,8 +561,8 @@ INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 				himlOptions = (HIMAGELIST)SendDlgItemMessage(hwndDlg, IDC_CHECKBOXES, TVM_SETIMAGELIST, TVSIL_STATE, (LPARAM)CreateStateImageList());

 				ImageList_Destroy(himlOptions);

 

-				hListHeading1 = InsertBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), const_cast<TCHAR *>(CTranslator::getOpt(CTranslator::OPT_MUC_OPTHEADER1)), TRUE);

-				hListHeading2 = InsertBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), const_cast<TCHAR *>(CTranslator::getOpt(CTranslator::OPT_MUC_OPTHEADER2)), TRUE);

+				hListHeading1 = InsertBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), TranslateT("Appearance and functionality of chat room windows"), TRUE);

+				hListHeading2 = InsertBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), TranslateT("Appearance of the message log"), TRUE);

 

 				FillBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), hListHeading1, branch1, SIZEOF(branch1), 0x0000);

 				FillBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), hListHeading2, branch2, SIZEOF(branch2), 0x0000);

@@ -956,31 +956,31 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 						_T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n\n")

 						_T("%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s\n%s - %s"),

 						// contact vars

-						_T("%nick%"),					CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP1),

-						_T("%proto%"),					CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP2),

-						_T("%userid%"),					CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP3),

+						_T("%nick%"),					TranslateT("nick of current contact (if defined)"),

+						_T("%proto%"),					TranslateT("protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts"),

+						_T("%userid%"),					TranslateT("UserID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc."),

 						// global vars

-						_T("%miranda_path%"),			CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP4),

-						_T("%miranda_profile%"),		CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP5),

-						_T("%miranda_profilename%"),	CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP6),

-						_T("%miranda_userdata%"),		CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP7),

-						_T("%appdata%"),				CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP8),

-						_T("%username%"),				CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP9),

-						_T("%mydocuments%"),			CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP10),

-						_T("%desktop%"),				CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP11),

-						_T("%xxxxxxx%"),				CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP12),

+						_T("%miranda_path%"),			TranslateT("path to root miranda folder"),

+						_T("%miranda_profile%"),		TranslateT("path to current miranda profile"),

+						_T("%miranda_profilename%"),	TranslateT("name of current miranda profile (filename, without extension)"),

+						_T("%miranda_userdata%"),		TranslateT("will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%"),

+						_T("%appdata%"),				TranslateT("same as environment variable %APPDATA% for currently logged-on Windows user"),

+						_T("%username%"),				TranslateT("username for currently logged-on Windows user"),

+						_T("%mydocuments%"),			TranslateT("\"My Documents\" folder for currently logged-on Windows user"),

+						_T("%desktop%"),				TranslateT("\"Desktop\" folder for currently logged-on Windows user"),

+						_T("%xxxxxxx%"),				TranslateT("any environment variable defined in current Windows session (like %systemroot%, %allusersprofile%, etc.)"),

 						// date/time vars

-						_T("%d%"),			CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP13),

-						_T("%dd%"),			CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP14),

-						_T("%m%"),			CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP15),

-						_T("%mm%"),			CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP16),

-						_T("%mon%"),		CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP17),

-						_T("%month%"),		CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP18),

-						_T("%yy%"),			CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP19),

-						_T("%yyyy%"),		CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP20),

-						_T("%wday%"),		CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP21),

-						_T("%weekday%"),	CTranslator::getOpt(CTranslator::OPT_MUC_LOGTIP22));

-					hPathTip = CreateToolTip(GetDlgItem(hwndDlg, IDC_LOGDIRECTORY), tszTooltipText, const_cast<TCHAR *>(CTranslator::getOpt(CTranslator::OPT_MUC_VARIABLES)));

+						_T("%d%"),			TranslateT("day of month, 1-31"),

+						_T("%dd%"),			TranslateT("day of month, 01-31"),

+						_T("%m%"),			TranslateT("month number, 1-12"),

+						_T("%mm%"),			TranslateT("month number, 01-12"),

+						_T("%mon%"),		TranslateT("abbreviated month name"),

+						_T("%month%"),		TranslateT("full month name"),

+						_T("%yy%"),			TranslateT("year without century, 01-99"),

+						_T("%yyyy%"),		TranslateT("year with century, 1901-9999"),

+						_T("%wday%"),		TranslateT("abbreviated weekday name"),

+						_T("%weekday%"),	TranslateT("full weekday name"));

+					hPathTip = CreateToolTip(GetDlgItem(hwndDlg, IDC_LOGDIRECTORY), tszTooltipText, TranslateT("Variables"));

 				}

 

 			} else {

@@ -1061,7 +1061,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 						TCHAR tszTemp[MAX_PATH];

 						bi.hwndOwner = hwndDlg;

 						bi.pszDisplayName = tszDirectory;

-						bi.lpszTitle = const_cast<TCHAR *>(CTranslator::getOpt(CTranslator::OPT_MUC_SELECTFOLDER));

+						bi.lpszTitle = TranslateT("Select Folder");

 						bi.ulFlags = BIF_NEWDIALOGSTYLE | BIF_EDITBOX | BIF_RETURNONLYFSDIRS;

 						bi.lpfn = BrowseCallbackProc;

 						bi.lParam = (LPARAM)tszDirectory;

@@ -1258,9 +1258,9 @@ INT_PTR CALLBACK DlgProcOptions3(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 					CheckDlgButton(hwndDlg, IDC_P1 + i, dwPopupFlags & _eventorder[i] ? BST_CHECKED : BST_UNCHECKED);

 					CheckDlgButton(hwndDlg, IDC_T1 + i, dwTrayFlags & _eventorder[i] ? BST_CHECKED : BST_UNCHECKED);

 				}

-				SendDlgItemMessage(hwndDlg, IDC_LOGICONTYPE, CB_ADDSTRING, -1, (LPARAM)CTranslator::getOpt(CTranslator::OPT_MUC_NOMARKERS));

-				SendDlgItemMessage(hwndDlg, IDC_LOGICONTYPE, CB_ADDSTRING, -1, (LPARAM)CTranslator::getOpt(CTranslator::OPT_MUC_ASICONS));

-				SendDlgItemMessage(hwndDlg, IDC_LOGICONTYPE, CB_ADDSTRING, -1, (LPARAM)CTranslator::getOpt(CTranslator::OPT_MUC_ASSYMBOLS));

+				SendDlgItemMessage(hwndDlg, IDC_LOGICONTYPE, CB_ADDSTRING, -1, (LPARAM)TranslateT("No markers"));

+				SendDlgItemMessage(hwndDlg, IDC_LOGICONTYPE, CB_ADDSTRING, -1, (LPARAM)TranslateT("Show as icons"));

+				SendDlgItemMessage(hwndDlg, IDC_LOGICONTYPE, CB_ADDSTRING, -1, (LPARAM)TranslateT("Show as text symbols"));

 

 				SendDlgItemMessage(hwndDlg, IDC_LOGICONTYPE, CB_SETCURSEL, (g_Settings.LogSymbols ? 2 : (g_Settings.dwIconFlags ? 1 : 0)), 0);

 

diff --git a/plugins/TabSRMM/chat/tools.cpp b/plugins/TabSRMM/chat/tools.cpp
index c7ad91cc4c..9e1c0e531d 100644
--- a/plugins/TabSRMM/chat/tools.cpp
+++ b/plugins/TabSRMM/chat/tools.cpp
@@ -248,55 +248,55 @@ static BOOL DoTrayIcon(SESSION_INFO* si, GCEVENT * gce)
 			case GC_EVENT_MESSAGE | GC_EVENT_HIGHLIGHT :

 			case GC_EVENT_ACTION | GC_EVENT_HIGHLIGHT :

 				CList_AddEvent(si->hContact, PluginConfig.g_IconMsgEvent, szChatIconString, 0,

-							   CTranslator::get(CTranslator::GEN_MUC_TRAY_HILIGHT), gce->ptszNick, si->ptszName);

+							   TranslateT("%s wants your attention in %s"), gce->ptszNick, si->ptszName);

 				break;

 			case GC_EVENT_MESSAGE :

 				CList_AddEvent(si->hContact, hIcons[ICON_MESSAGE], szChatIconString, CLEF_ONLYAFEW,

-							   CTranslator::get(CTranslator::GEN_MUC_TRAY_MSG), gce->ptszNick, si->ptszName);

+							   TranslateT("%s speaks in %s"), gce->ptszNick, si->ptszName);

 				break;

 			case GC_EVENT_ACTION:

 				CList_AddEvent(si->hContact, hIcons[ICON_ACTION], szChatIconString, CLEF_ONLYAFEW,

-							   CTranslator::get(CTranslator::GEN_MUC_TRAY_MSG), gce->ptszNick, si->ptszName);

+							   TranslateT("%s speaks in %s"), gce->ptszNick, si->ptszName);

 				break;

 			case GC_EVENT_JOIN:

 				CList_AddEvent(si->hContact, hIcons[ICON_JOIN], szChatIconString, CLEF_ONLYAFEW,

-							   CTranslator::get(CTranslator::GEN_MUC_TRAY_JOINED), gce->ptszNick, si->ptszName);

+							   TranslateT("%s has joined %s"), gce->ptszNick, si->ptszName);

 				break;

 			case GC_EVENT_PART:

 				CList_AddEvent(si->hContact, hIcons[ICON_PART], szChatIconString, CLEF_ONLYAFEW,

-							   CTranslator::get(CTranslator::GEN_MUC_TRAY_LEFT), gce->ptszNick, si->ptszName);

+							   TranslateT("%s has left %s"), gce->ptszNick, si->ptszName);

 				break;

 			case GC_EVENT_QUIT:

 				CList_AddEvent(si->hContact, hIcons[ICON_QUIT], szChatIconString, CLEF_ONLYAFEW,

-							   CTranslator::get(CTranslator::GEN_MUC_TRAY_QUIT), gce->ptszNick);

+							   TranslateT("%s has disconnected"), gce->ptszNick);

 				break;

 			case GC_EVENT_NICK:

 				CList_AddEvent(si->hContact, hIcons[ICON_NICK], szChatIconString, CLEF_ONLYAFEW,

-							   CTranslator::get(CTranslator::GEN_MUC_TRAY_NICK), gce->ptszNick, gce->pszText);

+							   TranslateT("%s is now known as %s"), gce->ptszNick, gce->pszText);

 				break;

 			case GC_EVENT_KICK:

 				CList_AddEvent(si->hContact, hIcons[ICON_KICK], szChatIconString, CLEF_ONLYAFEW,

-							   CTranslator::get(CTranslator::GEN_MUC_TRAY_KICK), gce->pszStatus, gce->ptszNick, si->ptszName);

+							   TranslateT("%s kicked %s from %s"), gce->pszStatus, gce->ptszNick, si->ptszName);

 				break;

 			case GC_EVENT_NOTICE:

 				CList_AddEvent(si->hContact, hIcons[ICON_NOTICE], szChatIconString, CLEF_ONLYAFEW,

-							   CTranslator::get(CTranslator::GEN_MUC_TRAY_NOTICE), gce->ptszNick);

+							   TranslateT("Notice from %s"), gce->ptszNick);

 				break;

 			case GC_EVENT_TOPIC:

 				CList_AddEvent(si->hContact, hIcons[ICON_TOPIC], szChatIconString, CLEF_ONLYAFEW,

-							   CTranslator::get(CTranslator::GEN_MUC_TRAY_TOPIC), si->ptszName);

+							   TranslateT("Topic change in %s"), si->ptszName);

 				break;

 			case GC_EVENT_INFORMATION:

 				CList_AddEvent(si->hContact, hIcons[ICON_INFO], szChatIconString, CLEF_ONLYAFEW,

-							   CTranslator::get(CTranslator::GEN_MUC_TRAY_INFO), si->ptszName);

+							   TranslateT("Information in %s"), si->ptszName);

 				break;

 			case GC_EVENT_ADDSTATUS:

 				CList_AddEvent(si->hContact, hIcons[ICON_ADDSTATUS], szChatIconString, CLEF_ONLYAFEW,

-							   CTranslator::get(CTranslator::GEN_MUC_TRAY_STATUS_ON), gce->pszText, gce->pszStatus, gce->ptszNick, si->ptszName);

+							   TranslateT("%s enables \'%s\' status for %s in %s"), gce->pszText, gce->pszStatus, gce->ptszNick, si->ptszName);

 				break;

 			case GC_EVENT_REMOVESTATUS:

 				CList_AddEvent(si->hContact, hIcons[ICON_REMSTATUS], szChatIconString, CLEF_ONLYAFEW,

-							   CTranslator::get(CTranslator::GEN_MUC_TRAY_STATUS_OFF), gce->pszText, gce->pszStatus, gce->ptszNick, si->ptszName);

+							   TranslateT("%s disables \'%s\' status for %s in %s"), gce->pszText, gce->pszStatus, gce->ptszNick, si->ptszName);

 				break;

 		}

 	}

@@ -371,65 +371,65 @@ passed:
 		switch (iNewEvent) {

 			case GC_EVENT_MESSAGE :

 				ShowPopup(si->hContact, si, hIcons[ICON_MESSAGE], si->pszModule, si->ptszName, clr ? clr : aFonts[9].color,

-						  CTranslator::get(CTranslator::GEN_MUC_POPUP_MSG), bbStart, gce->ptszNick, bbEnd, RemoveFormatting(gce->ptszText));

+						  TranslateT("%s%s says:%s %s"), bbStart, gce->ptszNick, bbEnd, RemoveFormatting(gce->ptszText));

 				break;

 			case GC_EVENT_ACTION:

 				ShowPopup(si->hContact, si, hIcons[ICON_ACTION], si->pszModule, si->ptszName, clr ? clr : aFonts[15].color, _T("%s %s"), gce->ptszNick, RemoveFormatting(gce->ptszText));

 				break;

 			case GC_EVENT_JOIN:

 				ShowPopup(si->hContact, si, hIcons[ICON_JOIN], si->pszModule, si->ptszName, clr ? clr : aFonts[3].color,

-						  CTranslator::get(CTranslator::GEN_MUC_POPUP_JOINED), gce->ptszNick);

+						  TranslateT("%s has joined"), gce->ptszNick);

 				break;

 			case GC_EVENT_PART:

 				if (!gce->pszText)

 					ShowPopup(si->hContact, si, hIcons[ICON_PART], si->pszModule, si->ptszName, clr ? clr : aFonts[4].color,

-							  CTranslator::get(CTranslator::GEN_MUC_POPUP_LEFT), gce->ptszNick);

+							  TranslateT("%s has left"), gce->ptszNick);

 				else

 					ShowPopup(si->hContact, si, hIcons[ICON_PART], si->pszModule, si->ptszName, clr ? clr : aFonts[4].color,

-							  CTranslator::get(CTranslator::GEN_MUC_POPUP_LEFT1), gce->ptszNick, RemoveFormatting(gce->ptszText));

+							  TranslateT("%s has left (%s)"), gce->ptszNick, RemoveFormatting(gce->ptszText));

 				break;

 			case GC_EVENT_QUIT:

 				if (!gce->pszText)

 					ShowPopup(si->hContact, si, hIcons[ICON_QUIT], si->pszModule, si->ptszName, clr ? clr : aFonts[5].color,

-							  CTranslator::get(CTranslator::GEN_MUC_POPUP_QUIT), gce->ptszNick);

+							  TranslateT("%s has disconnected"), gce->ptszNick);

 				else

 					ShowPopup(si->hContact, si, hIcons[ICON_QUIT], si->pszModule, si->ptszName, clr ? clr : aFonts[5].color,

-							  CTranslator::get(CTranslator::GEN_MUC_POPUP_QUIT1), gce->ptszNick, RemoveFormatting(gce->ptszText));

+							  TranslateT("%s has disconnected (%s)"), gce->ptszNick, RemoveFormatting(gce->ptszText));

 				break;

 			case GC_EVENT_NICK:

 				ShowPopup(si->hContact, si, hIcons[ICON_NICK], si->pszModule, si->ptszName, clr ? clr : aFonts[7].color,

-						  CTranslator::get(CTranslator::GEN_MUC_POPUP_NICK), gce->ptszNick, gce->ptszText);

+						  TranslateT("%s is now known as %s"), gce->ptszNick, gce->ptszText);

 				break;

 			case GC_EVENT_KICK:

 				if (!gce->pszText)

 					ShowPopup(si->hContact, si, hIcons[ICON_KICK], si->pszModule, si->ptszName, clr ? clr : aFonts[6].color,

-							  CTranslator::get(CTranslator::GEN_MUC_POPUP_KICK), (char *)gce->pszStatus, gce->ptszNick);

+							  TranslateT("%s kicked %s"), (char *)gce->pszStatus, gce->ptszNick);

 				else

 					ShowPopup(si->hContact, si, hIcons[ICON_KICK], si->pszModule, si->ptszName, clr ? clr : aFonts[6].color,

-							  CTranslator::get(CTranslator::GEN_MUC_POPUP_KICK1), (char *)gce->pszStatus, gce->ptszNick, RemoveFormatting(gce->ptszText));

+							  TranslateT("%s kicked %s (%s)"), (char *)gce->pszStatus, gce->ptszNick, RemoveFormatting(gce->ptszText));

 				break;

 			case GC_EVENT_NOTICE:

 				ShowPopup(si->hContact, si, hIcons[ICON_NOTICE], si->pszModule, si->ptszName, clr ? clr : aFonts[8].color,

-						  CTranslator::get(CTranslator::GEN_MUC_POPUP_NOTICE), gce->ptszNick, RemoveFormatting(gce->ptszText));

+						  TranslateT("Notice from %s: %s"), gce->ptszNick, RemoveFormatting(gce->ptszText));

 				break;

 			case GC_EVENT_TOPIC:

 				if (!gce->ptszNick)

 					ShowPopup(si->hContact, si, hIcons[ICON_TOPIC], si->pszModule, si->ptszName, clr ? clr : aFonts[11].color,

-							  CTranslator::get(CTranslator::GEN_MUC_POPUP_TOPIC), RemoveFormatting(gce->ptszText));

+							  TranslateT("The topic is \'%s\'"), RemoveFormatting(gce->ptszText));

 				else

 					ShowPopup(si->hContact, si, hIcons[ICON_TOPIC], si->pszModule, si->ptszName, clr ? clr : aFonts[11].color,

-							  CTranslator::get(CTranslator::GEN_MUC_POPUP_TOPIC1), RemoveFormatting(gce->ptszText), gce->ptszNick);

+							  TranslateT("The topic is \'%s\' (set by %s)"), RemoveFormatting(gce->ptszText), gce->ptszNick);

 				break;

 			case GC_EVENT_INFORMATION:

 				ShowPopup(si->hContact, si, hIcons[ICON_INFO], si->pszModule, si->ptszName, clr ? clr : aFonts[12].color, _T("%s"), RemoveFormatting(gce->ptszText));

 				break;

 			case GC_EVENT_ADDSTATUS:

 				ShowPopup(si->hContact, si, hIcons[ICON_ADDSTATUS], si->pszModule, si->ptszName, clr ? clr : aFonts[13].color,

-						  CTranslator::get(CTranslator::GEN_MUC_POPUP_STATUS_ON), gce->ptszText, (char *)gce->pszStatus, gce->ptszNick);

+						  TranslateT("%s enables \'%s\' status for %s"), gce->ptszText, (char *)gce->pszStatus, gce->ptszNick);

 				break;

 			case GC_EVENT_REMOVESTATUS:

 				ShowPopup(si->hContact, si, hIcons[ICON_REMSTATUS], si->pszModule, si->ptszName, clr ? clr : aFonts[14].color,

-						  CTranslator::get(CTranslator::GEN_MUC_POPUP_STATUS_OFF), gce->ptszText, (char *)gce->pszStatus, gce->ptszNick);

+						  TranslateT("%s disables \'%s\' status for %s"), gce->ptszText, (char *)gce->pszStatus, gce->ptszNick);

 				break;

 		}

 	}

@@ -821,43 +821,43 @@ BOOL LogToFile(SESSION_INFO* si, GCEVENT * gce)
 				break;

 			case GC_EVENT_JOIN:

 				p = '>';

-				mir_sntprintf(szBuffer, SIZEOF(szBuffer), CTranslator::get(CTranslator::GEN_MUC_POPUP_JOINED), (char *)pszNick);

+				mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s has joined"), (char *)pszNick);

 				break;

 			case GC_EVENT_PART:

 				p = '<';

 				if (!gce->pszText)

-					mir_sntprintf(szBuffer, SIZEOF(szBuffer), CTranslator::get(CTranslator::GEN_MUC_POPUP_LEFT), (char *)pszNick);

+					mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s has left"), (char *)pszNick);

 				else

-					mir_sntprintf(szBuffer, SIZEOF(szBuffer), CTranslator::get(CTranslator::GEN_MUC_POPUP_LEFT1), (char *)pszNick, RemoveFormatting(gce->ptszText));

+					mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s has left (%s)"), (char *)pszNick, RemoveFormatting(gce->ptszText));

 				break;

 			case GC_EVENT_QUIT:

 				p = '<';

 				if (!gce->pszText)

-					mir_sntprintf(szBuffer, SIZEOF(szBuffer), CTranslator::get(CTranslator::GEN_MUC_POPUP_QUIT), (char *)pszNick);

+					mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s has disconnected"), (char *)pszNick);

 				else

-					mir_sntprintf(szBuffer, SIZEOF(szBuffer), CTranslator::get(CTranslator::GEN_MUC_POPUP_QUIT1), (char *)pszNick, RemoveFormatting(gce->ptszText));

+					mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s has disconnected (%s)"), (char *)pszNick, RemoveFormatting(gce->ptszText));

 				break;

 			case GC_EVENT_NICK:

 				p = '^';

-				mir_sntprintf(szBuffer, SIZEOF(szBuffer), CTranslator::get(CTranslator::GEN_MUC_POPUP_NICK), gce->ptszNick, gce->ptszText);

+				mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s is now known as %s"), gce->ptszNick, gce->ptszText);

 				break;

 			case GC_EVENT_KICK:

 				p = '~';

 				if (!gce->pszText)

-					mir_sntprintf(szBuffer, SIZEOF(szBuffer), CTranslator::get(CTranslator::GEN_MUC_POPUP_KICK), (char *)gce->pszStatus, gce->ptszNick);

+					mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s kicked %s"), (char *)gce->pszStatus, gce->ptszNick);

 				else

-					mir_sntprintf(szBuffer, SIZEOF(szBuffer), CTranslator::get(CTranslator::GEN_MUC_POPUP_KICK1), (char *)gce->pszStatus, gce->ptszNick, RemoveFormatting(gce->ptszText));

+					mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s kicked %s (%s)"), (char *)gce->pszStatus, gce->ptszNick, RemoveFormatting(gce->ptszText));

 				break;

 			case GC_EVENT_NOTICE:

 				p = 'o';

-				mir_sntprintf(szBuffer, SIZEOF(szBuffer), CTranslator::get(CTranslator::GEN_MUC_POPUP_NOTICE), gce->ptszNick, RemoveFormatting(gce->ptszText));

+				mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("Notice from %s: %s"), gce->ptszNick, RemoveFormatting(gce->ptszText));

 				break;

 			case GC_EVENT_TOPIC:

 				p = '#';

 				if (!gce->pszNick)

-					mir_sntprintf(szBuffer, SIZEOF(szBuffer), CTranslator::get(CTranslator::GEN_MUC_POPUP_TOPIC), RemoveFormatting(gce->ptszText));

+					mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("The topic is \'%s\'"), RemoveFormatting(gce->ptszText));

 				else

-					mir_sntprintf(szBuffer, SIZEOF(szBuffer), CTranslator::get(CTranslator::GEN_MUC_POPUP_TOPIC1), RemoveFormatting(gce->ptszText), gce->ptszNick);

+					mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("The topic is \'%s\' (set by %s)"), RemoveFormatting(gce->ptszText), gce->ptszNick);

 				break;

 			case GC_EVENT_INFORMATION:

 				p = '!';

@@ -865,11 +865,11 @@ BOOL LogToFile(SESSION_INFO* si, GCEVENT * gce)
 				break;

 			case GC_EVENT_ADDSTATUS:

 				p = '+';

-				mir_sntprintf(szBuffer, SIZEOF(szBuffer), CTranslator::get(CTranslator::GEN_MUC_POPUP_STATUS_ON), gce->ptszText, (char *)gce->pszStatus, gce->ptszNick);

+				mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s enables \'%s\' status for %s"), gce->ptszText, (char *)gce->pszStatus, gce->ptszNick);

 				break;

 			case GC_EVENT_REMOVESTATUS:

 				p = '-';

-				mir_sntprintf(szBuffer, SIZEOF(szBuffer), CTranslator::get(CTranslator::GEN_MUC_POPUP_STATUS_OFF), gce->ptszText, (char *)gce->pszStatus, gce->ptszNick);

+				mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s disables \'%s\' status for %s"), gce->ptszText, (char *)gce->pszStatus, gce->ptszNick);

 				break;

 		}

 		/*

@@ -963,13 +963,13 @@ UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO
 

 		if (pszWordText && pszWordText[0]) {

 			TCHAR szMenuText[4096];

-			mir_sntprintf(szMenuText, 4096, CTranslator::get(CTranslator::GEN_MUC_LOOKUP), pszWordText);

+			mir_sntprintf(szMenuText, 4096, TranslateT("Look up \'%s\':"), pszWordText);

 			ModifyMenu(*hMenu, 4, MF_STRING | MF_BYPOSITION, 4, szMenuText);

-		} else ModifyMenu(*hMenu, 4, MF_STRING | MF_GRAYED | MF_BYPOSITION, 4, CTranslator::get(CTranslator::GEN_MUC_LOOKUP_NOWORD));

+		} else ModifyMenu(*hMenu, 4, MF_STRING | MF_GRAYED | MF_BYPOSITION, 4, TranslateT("No word to look up"));

 		gcmi.Type = MENU_ON_LOG;

 	} else if (iIndex == 0) {

 		TCHAR szTemp[30], szTemp2[30];

-		lstrcpyn(szTemp, CTranslator::get(CTranslator::GEN_MUC_MESSAGEAMP), 24);

+		lstrcpyn(szTemp, TranslateT("&Message"), 24);

 		if (pszUID)

 			mir_sntprintf(szTemp2, SIZEOF(szTemp2), _T("%s %s"), szTemp, pszUID);

 		else

@@ -1017,15 +1017,15 @@ UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO
 	if (iIndex == 0) {

 		AppendMenu(*hMenu, MF_SEPARATOR, 0, 0);

 		pos = GetMenuItemCount(*hMenu);

-		InsertMenu(*hMenu, pos, MF_BYPOSITION, (UINT_PTR)20020, CTranslator::get(CTranslator::GEN_MUC_MENU_ADDTOHIGHLIGHT));

-		InsertMenu(*hMenu, pos, MF_BYPOSITION, (UINT_PTR)20021, CTranslator::get(CTranslator::GEN_MUC_MENU_EDITHIGHLIGHTLIST));

+		InsertMenu(*hMenu, pos, MF_BYPOSITION, (UINT_PTR)20020, TranslateT("Highlight User..."));

+		InsertMenu(*hMenu, pos, MF_BYPOSITION, (UINT_PTR)20021, TranslateT("Edit Highlight List..."));

 	}

 #endif

 	if (iIndex == 1 && si->iType != GCW_SERVER && !(si->dwFlags & GC_UNICODE)) {

 		AppendMenu(*hMenu, MF_SEPARATOR, 0, 0);

-		InsertMenu(PluginConfig.g_hMenuEncoding, 1, MF_BYPOSITION | MF_STRING, (UINT_PTR)CP_UTF8, CTranslator::get(CTranslator::GEN_STRING_UTF8));

+		InsertMenu(PluginConfig.g_hMenuEncoding, 1, MF_BYPOSITION | MF_STRING, (UINT_PTR)CP_UTF8, TranslateT("UTF-8"));

 		pos = GetMenuItemCount(*hMenu);

-		InsertMenu(*hMenu, pos, MF_BYPOSITION | MF_POPUP, (UINT_PTR) PluginConfig.g_hMenuEncoding, CTranslator::get(CTranslator::GEN_MSG_ENCODING));

+		InsertMenu(*hMenu, pos, MF_BYPOSITION | MF_POPUP, (UINT_PTR) PluginConfig.g_hMenuEncoding, TranslateT("Character Encoding"));

 		for (i = 0; i < GetMenuItemCount(PluginConfig.g_hMenuEncoding); i++)

 			CheckMenuItem(PluginConfig.g_hMenuEncoding, i, MF_BYPOSITION | MF_UNCHECKED);

 		if (codepage == CP_ACP)

diff --git a/plugins/TabSRMM/chat/window.cpp b/plugins/TabSRMM/chat/window.cpp
index 61913f04b5..eba669e62d 100644
--- a/plugins/TabSRMM/chat/window.cpp
+++ b/plugins/TabSRMM/chat/window.cpp
@@ -1493,9 +1493,9 @@ static void ProcessNickListHovering(HWND hwnd, int hoveredItem, POINT * pt, SESS
 			else {

 				TCHAR ptszBuf[ 1024 ];

 				mir_sntprintf( ptszBuf, SIZEOF(ptszBuf), _T("%s: %s\r\n%s: %s\r\n%s: %s"),

-					CTranslator::get(CTranslator::GEN_MUC_NICKNAME), ui1->pszNick,

-					CTranslator::get(CTranslator::GEN_MUC_UID), ui1->pszUID,

-					CTranslator::get(CTranslator::GEN_MUC_STATUS), TM_WordToString( parentdat->pStatuses, ui1->Status ));

+					TranslateT("Nick name"), ui1->pszNick,

+					TranslateT("Unique Id"), ui1->pszUID,

+					TranslateT("Status"), TM_WordToString( parentdat->pStatuses, ui1->Status ));

 				ti.lpszText = mir_tstrdup( ptszBuf );

 			}

 		}

@@ -2141,14 +2141,14 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
  					hIcon = dat->wStatus <= ID_STATUS_OFFLINE ? LoadSkinnedProtoIcon(si->pszModule, ID_STATUS_OFFLINE) : LoadSkinnedProtoIcon(si->pszModule, dat->wStatus);

  					fNoCopy = FALSE;

  					mir_sntprintf(szTemp, SIZEOF(szTemp),

- 								  (si->nUsersInNicklist == 1) ? CTranslator::get(CTranslator::GEN_MUC_ROOM_TITLE_USER) :

-								  CTranslator::get(CTranslator::GEN_MUC_ROOM_TITLE_USERS),

- 								  si->ptszName, si->nUsersInNicklist, si->bFilterEnabled ? CTranslator::get(CTranslator::GEN_MUC_ROOM_TITLE_FILTER) : _T(""));

+ 								  (si->nUsersInNicklist == 1) ? TranslateT("%s: Chat Room (%u user%s)") :

+								  TranslateT("%s: Chat Room (%u users%s)"),

+ 								  si->ptszName, si->nUsersInNicklist, si->bFilterEnabled ? TranslateT(", event filter active") : _T(""));

  					break;

 				case GCW_PRIVMESS:

 					mir_sntprintf(szTemp, SIZEOF(szTemp),

-								  (si->nUsersInNicklist == 1) ? CTranslator::get(CTranslator::GEN_MUC_PRIVSESSION) :

-								  CTranslator::get(CTranslator::GEN_MUC_PRIVSESSION_MULTI), si->ptszName, si->nUsersInNicklist);

+								  (si->nUsersInNicklist == 1) ? TranslateT("%s: Message Session") :

+								  TranslateT("%s: Message Session (%u users)"), si->ptszName, si->nUsersInNicklist);

 					break;

 				case GCW_SERVER:

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

@@ -2218,15 +2218,15 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 						else if(diff > 59) {

 							DWORD hours = diff / 60;

 							DWORD minutes = diff % 60;

-							mir_sntprintf(mi->tszIdleMsg, 60, CTranslator::get(CTranslator::MUC_SBAR_IDLEFORMAT), hours, hours > 1 ?

-										  CTranslator::get(CTranslator::GEN_STRING_HOURS) : CTranslator::get(CTranslator::GEN_STRING_HOUR),

-										  minutes, minutes > 1 ? CTranslator::get(CTranslator::GEN_STRING_MINUTES) : CTranslator::get(CTranslator::GEN_STRING_MINUTE));

+							mir_sntprintf(mi->tszIdleMsg, 60, TranslateT(", %d %s, %d %s idle"), hours, hours > 1 ?

+										  TranslateT("hours") : TranslateT("hour"),

+										  minutes, minutes > 1 ? TranslateT("minutes") : TranslateT("minute"));

 						}

 						else

-							mir_sntprintf(mi->tszIdleMsg, 60, CTranslator::get(CTranslator::MUC_SBAR_IDLEFORMAT_SHORT),

-										  diff, diff > 1 ? CTranslator::get(CTranslator::GEN_STRING_MINUTES) : CTranslator::get(CTranslator::GEN_STRING_MINUTE));

+							mir_sntprintf(mi->tszIdleMsg, 60, TranslateT(", %d %s idle"),

+										  diff, diff > 1 ? TranslateT("minutes") : TranslateT("minute"));

 					}

-					mir_sntprintf(szFinalStatusBarText, SIZEOF(szFinalStatusBarText), CTranslator::get(CTranslator::MUC_SBAR_ON_SERVER), dat->szMyNickname, mi->ptszModDispName, mi->tszIdleMsg);

+					mir_sntprintf(szFinalStatusBarText, SIZEOF(szFinalStatusBarText), TranslateT("%s on %s%s"), dat->szMyNickname, mi->ptszModDispName, mi->tszIdleMsg);

 				} else {

 					if (si->ptszStatusbarText)

 						mir_sntprintf(szFinalStatusBarText, SIZEOF(szFinalStatusBarText), _T("%s %s"), mi->ptszModDispName, si->ptszStatusbarText);

@@ -3283,7 +3283,7 @@ LABEL_SHOWWINDOW:
 						break;

 

 					if (si->iLogFilterFlags == 0 && !si->bFilterEnabled) {

-						MessageBox(0, CTranslator::get(CTranslator::GEN_MUC_FILTER_ERROR), CTranslator::get(CTranslator::GEN_MUC_FILTER_ERROR_TITLE), MB_OK);

+						MessageBox(0, TranslateT("The filter canoot be enabled, because there are no event types selected either global or for this chat room"), TranslateT("Event filter error"), MB_OK);

 						si->bFilterEnabled = 0;

 					} else

 						si->bFilterEnabled = !si->bFilterEnabled;

@@ -3540,7 +3540,7 @@ LABEL_SHOWWINDOW:
 		case DM_CONTAINERSELECTED: {

 			struct TContainerData *pNewContainer = 0;

 			TCHAR *szNewName = (TCHAR *)lParam;

-			if (!_tcscmp(szNewName, CTranslator::get(CTranslator::GEN_DEFAULT_CONTAINER_NAME)))

+			if (!_tcscmp(szNewName, TranslateT("Default container")))

 				szNewName = CGlobals::m_default_container_name;

 			int iOldItems = TabCtrl_GetItemCount(hwndTab);

 			if (!_tcsncmp(dat->pContainer->szName, szNewName, CONTAINER_NAMELEN))