MetaContact -> metacontact; decapitalization

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

24 files changed, 94 insertions, 94 deletions

diff --git a/plugins/AvatarHistory/res/AvatarHistory.rc b/plugins/AvatarHistory/res/AvatarHistory.rc
index 6b7b47772e..0b94d45b32 100644
--- a/plugins/AvatarHistory/res/AvatarHistory.rc
+++ b/plugins/AvatarHistory/res/AvatarHistory.rc
@@ -67,7 +67,7 @@ BEGIN
     GROUPBOX        "Protocols",IDC_PROTOCOLS_G,3,3,308,157

     LTEXT           "Enable tracking for these protocols:",IDC_PROTOCOLS_L,13,17,157,11

     CONTROL         "List1",IDC_PROTOCOLS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,12,31,158,119

-    LTEXT           "MetaContacts have special handling: the info is always copied from subcontacts (notifications from a meta are ignored)",IDC_STATIC,181,31,124,119

+    LTEXT           "Metacontacts have special handling: the info is always copied from subcontacts (notifications from a meta are ignored)",IDC_STATIC,181,31,124,119

 END

 

 IDD_POPUPS DIALOGEX 0, 0, 314, 235

diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index cdf7ceb50d..0273ecd38f 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -462,17 +462,17 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

     CONTROL         "Ignore empty extra icons places (arrange to right).",IDC_METASUBEXTRA_IGN,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,25,201,10

-    CONTROL         "Use 'Meta' protocol icons for MetaContacts",IDC_META,

+    CONTROL         "Use 'Meta' protocol icons for metacontacts",IDC_META,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,95,201,10

-    CONTROL         "Expand MetaContacts",IDC_METAEXPAND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,107,201,16

+    CONTROL         "Expand metacontacts",IDC_METAEXPAND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,107,201,16

     CONTROL         "Avoid double click expand",IDC_METADBLCLK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,124,196,10

     CONTROL         "Hide all extra icons for subcontacts",IDC_METASUBEXTRA,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,137,196,10

     CONTROL         "Hide offline subcontacts",IDC_METASUB_HIDEOFFLINE,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,151,196,10

-    GROUPBOX        "MetaContacts stuff",IDC_FRAME_META,2,81,218,101

+    GROUPBOX        "Metacontacts stuff",IDC_FRAME_META,2,81,218,101

     GROUPBOX        "Additional stuff",IDC_FRAME_META2,2,12,218,65

-    CTEXT           "For other stuff MetaContacts plugin should be loaded.\n\nhttp://miranda-ng.org/p/MetaContacts/",IDC_FRAME_META_CAPT,11,94,201,26,NOT WS_VISIBLE

+    CTEXT           "For other stuff metacontacts should be enabled.",IDC_FRAME_META_CAPT,11,94,201,26,NOT WS_VISIBLE

     CONTROL         "Allow internal requesting of status message text",IDC_DISCOVER_AWAYMSG,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,38,201,10

     EDITTEXT        IDC_SUBINDENT,154,163,35,12,ES_NUMBER

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 75f6000129..bc3b73e6dc 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1229,8 +1229,8 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 					if (mir_strcmp(contSour->proto, META_PROTO)) {

 						if (!contSour->isSubcontact) {

 							MCONTACT hDest = contDest->hContact;

-							mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be converted to MetaContact and '%s' be added to it?"), contDest->szText, contSour->szText);

-							res = MessageBox(hwnd, Wording, TranslateT("Converting to MetaContact"), MB_OKCANCEL | MB_ICONQUESTION);

+							mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be converted to metacontact and '%s' be added to it?"), contDest->szText, contSour->szText);

+							res = MessageBox(hwnd, Wording, TranslateT("Converting to metacontact"), MB_OKCANCEL | MB_ICONQUESTION);

 							if (res == 1) {

 								handle = (MCONTACT)CallService(MS_MC_CONVERTTOMETA, (WPARAM)hDest, 0);

 								if (!handle) return 0;

@@ -1241,8 +1241,8 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 							hcontact = contSour->hContact;

 							MCONTACT hfrom = contSour->subcontacts->hContact;

 							MCONTACT hdest = contDest->hContact;

-							mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be converted to MetaContact and '%s' be added to it (remove it from '%s')?"), contDest->szText, contSour->szText, contSour->subcontacts->szText);

-							res = MessageBox(hwnd, Wording, TranslateT("Converting to MetaContact (Moving)"), MB_OKCANCEL | MB_ICONQUESTION);

+							mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be converted to metacontact and '%s' be added to it (remove it from '%s')?"), contDest->szText, contSour->szText, contSour->subcontacts->szText);

+							res = MessageBox(hwnd, Wording, TranslateT("Converting to metacontact (moving)"), MB_OKCANCEL | MB_ICONQUESTION);

 							if (res == 1) {

 								MCONTACT handle = (MCONTACT)CallService(MS_MC_CONVERTTOMETA, (WPARAM)hdest, 0);

 								if (!handle)

@@ -1269,7 +1269,7 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 						MCONTACT hcontact = contSour->hContact;

 						MCONTACT handle = contDest->hContact;

 						mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be added to metacontact '%s'?"), contSour->szText, contDest->szText);

-						int res = MessageBox(hwnd, Wording, TranslateT("Adding contact to MetaContact"), MB_OKCANCEL | MB_ICONQUESTION);

+						int res = MessageBox(hwnd, Wording, TranslateT("Adding contact to metacontact"), MB_OKCANCEL | MB_ICONQUESTION);

 						if (res == 1) {

 							if (!handle) return 0;

 							CallService(MS_MC_ADDTOMETA, (WPARAM)hcontact, (LPARAM)handle);

@@ -1287,8 +1287,8 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 							MCONTACT hcontact = contSour->hContact;

 							MCONTACT hfrom = contSour->subcontacts->hContact;

 							MCONTACT handle = contDest->hContact;

-							mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be removed from MetaContact '%s' and added to '%s'?"), contSour->szText, contSour->subcontacts->szText, contDest->szText);

-							int res = MessageBox(hwnd, Wording, TranslateT("Changing MetaContacts (Moving)"), MB_OKCANCEL | MB_ICONQUESTION);

+							mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be removed from metacontact '%s' and added to '%s'?"), contSour->szText, contSour->subcontacts->szText, contDest->szText);

+							int res = MessageBox(hwnd, Wording, TranslateT("Changing metacontacts (moving)"), MB_OKCANCEL | MB_ICONQUESTION);

 							if (res == 1) {

 								if (!handle) return 0;

 

@@ -1312,8 +1312,8 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 					if (!contSour->isSubcontact) {

 						MCONTACT hcontact = contSour->hContact;

 						MCONTACT handle = contDest->subcontacts->hContact;

-						mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be added to MetaContact '%s'?"), contSour->szText, contDest->subcontacts->szText);

-						int res = MessageBox(hwnd, Wording, TranslateT("Changing MetaContacts (Moving)"), MB_OKCANCEL | MB_ICONQUESTION);

+						mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be added to metacontact '%s'?"), contSour->szText, contDest->subcontacts->szText);

+						int res = MessageBox(hwnd, Wording, TranslateT("Changing metacontacts (moving)"), MB_OKCANCEL | MB_ICONQUESTION);

 						if (res == 1) {

 							if (!handle) return 0;

 							CallService(MS_MC_ADDTOMETA, (WPARAM)hcontact, (LPARAM)handle);

@@ -1323,8 +1323,8 @@ static LRESULT clcOnLButtonUp(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam,
 						MCONTACT hcontact = contSour->hContact;

 						MCONTACT hfrom = contSour->subcontacts->hContact;

 						MCONTACT handle = contDest->subcontacts->hContact;

-						mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be removed from MetaContact '%s' and added to '%s'?"), contSour->szText, contSour->subcontacts->szText, contDest->subcontacts->szText);

-						int res = MessageBox(hwnd, Wording, TranslateT("Changing MetaContacts (Moving)"), MB_OKCANCEL | MB_ICONQUESTION);

+						mir_sntprintf(Wording, SIZEOF(Wording), TranslateT("Do you want contact '%s' to be removed from metacontact '%s' and added to '%s'?"), contSour->szText, contSour->subcontacts->szText, contDest->subcontacts->szText);

+						int res = MessageBox(hwnd, Wording, TranslateT("Changing metacontacts (moving)"), MB_OKCANCEL | MB_ICONQUESTION);

 						if (res == 1) {

 							if (!handle) return 0;

 

diff --git a/plugins/Clist_mw/res/resource.rc b/plugins/Clist_mw/res/resource.rc
index 95cfbbcb10..f3337f2f52 100644
--- a/plugins/Clist_mw/res/resource.rc
+++ b/plugins/Clist_mw/res/resource.rc
@@ -284,12 +284,12 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CONTROL         "Use 'Meta' protocol icons for MetaContacts",IDC_META,

+    CONTROL         "Use 'Meta' protocol icons for metacontacts",IDC_META,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,13,233,10

     CONTROL         "Avoid double click expand",IDC_METADBLCLK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,29,233,10

     CONTROL         "Hide all extra icons for subcontacts",IDC_METASUBEXTRA,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,45,233,10

-    GROUPBOX        "MetaContacts supporting",-1,2,2,252,90

+    GROUPBOX        "Metacontacts supporting",-1,2,2,252,90

     CONTROL         "Ignore empty extra icons places (arrange to right)",IDC_METASUBEXTRA_IGN,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,75,233,10

     CONTROL         "Hide offline subcontacts",IDC_METASUB_HIDEOFFLINE,

diff --git a/plugins/Clist_mw/src/clcopts.cpp b/plugins/Clist_mw/src/clcopts.cpp
index a859f095a1..2ce7736a7a 100644
--- a/plugins/Clist_mw/src/clcopts.cpp
+++ b/plugins/Clist_mw/src/clcopts.cpp
@@ -69,7 +69,7 @@ int ClcOptInit(WPARAM wParam, LPARAM lParam)
 	}

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_META_CLC);

-	odp.pszTitle = LPGEN("List MetaContacts");

+	odp.pszTitle = LPGEN("List metacontacts");

 	odp.pfnDlgProc = DlgProcClcMetaOpts;

 	Options_AddPage(wParam, &odp);

 

diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc
index 17242fdfef..ffc751c37e 100644
--- a/plugins/Clist_nicer/res/resource.rc
+++ b/plugins/Clist_nicer/res/resource.rc
@@ -625,7 +625,7 @@ BEGIN
     POPUP "Appearance"

     BEGIN

         MENUITEM "Show status icons",           POPUP_SHOWSTATUSICONS

-        MENUITEM "Show MetaContact proto icons", POPUP_SHOWMETAICONS

+        MENUITEM "Show metacontact proto icons", POPUP_SHOWMETAICONS

         MENUITEM SEPARATOR

         MENUITEM "Show additional buttons",     POPUP_BUTTONS

         MENUITEM "Draw sunken frame",           POPUP_FRAME

diff --git a/plugins/HistoryStats/src/dlgoption_subglobal.cpp b/plugins/HistoryStats/src/dlgoption_subglobal.cpp
index 056c13c72a..c46d819314 100644
--- a/plugins/HistoryStats/src/dlgoption_subglobal.cpp
+++ b/plugins/HistoryStats/src/dlgoption_subglobal.cpp
@@ -322,10 +322,10 @@ void DlgOption::SubGlobal::initSupportInfo()
 {

 	static const SupportInfo Infos[] = {

 		{

-			_T("MetaContacts"),

-			LPGENT("Create statistics for meta-contacts and their subcontacts"),

-			LPGENT("The following information are only relevant if your already use MetaContacts. In case you do please use version 0.9.10.6 or above.\r\n\r\nHistoryStats perfectly integrates with MetaContacts and is able to collect the data from the meta-contact as well as from the subcontacts. It is able to intelligently merge all subcontacts histories and more. You can configure MetContacts integration in the \"Input\" options."),

-			LPGENT("MetaContacts Plugin"),

+			_T("Metacontacts"),

+			LPGENT("Create statistics for metacontacts and their subcontacts"),

+			LPGENT("The following information are only relevant if your already use metacontacts.\r\n\r\nHistoryStats perfectly integrates with metacontacts and is able to collect the data from the metacontact as well as from the subcontacts. It is able to intelligently merge all subcontacts histories and more. You can configure metacontacts integration in the \"Input\" options."),

+			LPGENT("Metacontacts plugin"),

 			_T("http://addons.miranda-im.org/details.php?action=viewfile&id=1595")

 		},

 		{

diff --git a/plugins/HistoryStats/src/dlgoption_subinput.cpp b/plugins/HistoryStats/src/dlgoption_subinput.cpp
index 351132100a..7d61c56b63 100644
--- a/plugins/HistoryStats/src/dlgoption_subinput.cpp
+++ b/plugins/HistoryStats/src/dlgoption_subinput.cpp
@@ -78,11 +78,11 @@ void DlgOption::SubInput::onWMInitDialog()
 	hTemp = m_Options.insertGroup(NULL, TranslateT("Contact filtering"), OptionsCtrl::OCF_ROOTGROUP | OptionsCtrl::OCF_NODISABLECHILDS);

 	m_hProtocols = m_Options.insertGroup(hTemp, TranslateT("Ignore all contacts with protocol..."));

 

-	hTemp2 = m_Options.insertGroup(hTemp, TranslateT("History read mode for MetaContacts"), 0);

-	m_hMetaContactsMode = m_Options.insertRadio(hTemp2, NULL, TranslateT("Use only meta-contact's history"));

-	m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Use only subcontacts' histories (for one meta-contact)"));

-	m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Use meta-contact's history and its subcontacts' histories"));

-	m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Treat meta-contacts and subcontacts as normal contacts"));

+	hTemp2 = m_Options.insertGroup(hTemp, TranslateT("History read mode for metacontacts"), 0);

+	m_hMetaContactsMode = m_Options.insertRadio(hTemp2, NULL, TranslateT("Use only metacontact's history"));

+	m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Use only subcontacts' histories (for one metacontact)"));

+	m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Use metacontact's history and its subcontacts' histories"));

+	m_Options.insertRadio(hTemp2, m_hMetaContactsMode, TranslateT("Treat metacontacts and subcontacts as normal contacts"));

 

 	m_hMergeContacts = m_Options.insertCheck(hTemp, TranslateT("Merge contacts with same name"), OptionsCtrl::OCF_DISABLECHILDSONUNCHECK);

 	m_hMergeContactsGroups = m_Options.insertCheck(m_hMergeContacts, TranslateT("Only merge if contacts are in the same group"));

diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index a7465ba712..f73761a911 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -1825,7 +1825,7 @@ void TSAPI DM_UpdateTitle(TWindowData *dat, WPARAM wParam, LPARAM lParam)
 			TCHAR fulluin[256];
 			if (dat->bIsMeta)
 				mir_sntprintf(fulluin, SIZEOF(fulluin),
-				  TranslateT("UID: %s (SHIFT click -> copy to clipboard)\nClick for User's Details\nRight click for MetaContact control\nClick dropdown to add or remove user from your favorites."),
+				  TranslateT("UID: %s (SHIFT click -> copy to clipboard)\nClick for User's Details\nRight click for metacontact control\nClick dropdown to add or remove user from your favorites."),
 				  bHasName ? dat->cache->getUIN() : TranslateT("No UID"));
 			else
 				mir_sntprintf(fulluin, SIZEOF(fulluin),
diff --git a/plugins/TopToolBar/src/InternalButtons.cpp b/plugins/TopToolBar/src/InternalButtons.cpp
index 0869b5b7a8..8f49bae9f4 100644
--- a/plugins/TopToolBar/src/InternalButtons.cpp
+++ b/plugins/TopToolBar/src/InternalButtons.cpp
@@ -27,7 +27,7 @@ static stdButtons[] = {
 	{ LPGEN("Find/add contacts"),           MS_FINDADD_FINDADD,          SKINICON_OTHER_FINDUSER, 0,               LPGEN("Find/add contacts"),     NULL, 0, 1 },

 	{ LPGEN("Show status menu"),            TTBI_STATUSMENUBUTT,         SKINICON_OTHER_STATUS,   0,               LPGEN("Show status menu"),      NULL, 0, 0 },

 	{ LPGEN("Show/hide offline contacts"),  MS_CLIST_SETHIDEOFFLINE,     IDI_HIDEOFFLINE,         IDI_SHOWOFFLINE, LPGEN("Hide offline contacts"), LPGEN("Show offline contacts"), 1, 1 },

-	{ LPGEN("Enable/disable MetaContacts"), "MetaContacts/OnOff",        IDI_METAOFF,             IDI_METAON,      LPGEN("Disable MetaContacts"),  LPGEN("Enable MetaContacts"), 1, 1 },

+	{ LPGEN("Enable/disable metacontacts"), "MetaContacts/OnOff",        IDI_METAOFF,             IDI_METAON,      LPGEN("Disable metacontacts"),  LPGEN("Enable metacontacts"), 1, 1 },

 	{ LPGEN("Enable/disable groups"),       TTBI_GROUPSHOWHIDE,          IDI_GROUPSOFF,           IDI_GROUPSON,    LPGEN("Enable groups"),         LPGEN("Disable groups"), 1, 1 },

 	{ LPGEN("Enable/disable sounds"),       TTBI_SOUNDSONOFF,            IDI_SOUNDSOFF,           IDI_SOUNDSON,    LPGEN("Disable sounds"),        LPGEN("Enable sounds"), 1, 1 },

 	{ LPGEN("Minimize contact list"),       MS_CLIST_SHOWHIDE,           SKINICON_OTHER_SHOWHIDE, 0,               LPGEN("Minimize contact list"), NULL, 0, 1 },

diff --git a/plugins/UserInfoEx/res/resource.rc b/plugins/UserInfoEx/res/resource.rc
index 94fb902685..9e52a49541 100644
--- a/plugins/UserInfoEx/res/resource.rc
+++ b/plugins/UserInfoEx/res/resource.rc
@@ -338,7 +338,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,16,290,10

     CONTROL         "Display icons on each dialog button",CHECK_OPT_BUTTONICONS,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,30,290,10

-    GROUPBOX        "MetaContacts",STATIC_OPT_METAGROUP,3,52,303,32

+    GROUPBOX        "Metacontacts",STATIC_OPT_METAGROUP,3,52,303,32

     CONTROL         "Scan subcontacts for missing information",CHECK_OPT_METASCAN,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,67,290,10

     CONTROL         "Enable extended 'send/receive e-mail' service (*)",CHECK_OPT_SREMAIL_ENABLED,

@@ -370,7 +370,7 @@ BEGIN
     CONTROL         "Sort all tree items alphabetically",CHECK_OPT_SORTTREE,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,165,271,10

     CONTROL         "",CLR_META,"ColourPicker",WS_TABSTOP,12,61,29,12

-    LTEXT           "Info of a MetaContact's subcontact",TXT_OPT_CLR_META,46,63,232,8

+    LTEXT           "Info of a metacontact's subcontact",TXT_OPT_CLR_META,46,63,232,8

     GROUPBOX        "Colors",IDC_STATIC,3,4,303,74

     GROUPBOX        "Common",IDC_STATIC,3,79,303,53

     CONTROL         "Change my ICQ details with UserInfoEx (disabled if ICQ doesn't support it)",CHECK_OPT_CHANGEMYDETAILS,

diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
index 1cb964a2ac..0dcd377b73 100644
--- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp
@@ -745,7 +745,7 @@ int CExImContactXML::ImportMetaSubContact(CExImContactXML * pMetaContact)
 				int result = MsgBox(NULL, MB_YESNO|MB_ICONWARNING, 

 					LPGENT("Question"), 

 					LPGENT("Importing a new meta subcontact failed!"), 

-					LPGENT("The newly created MetaSubContact '%s'\ncould not be added to MetaContact '%s'!\n\nDo you want to delete this contact?"),

+					LPGENT("The newly created meta subcontact '%s'\ncould not be added to metacontact '%s'!\n\nDo you want to delete this contact?"),

 					ptszNick, ptszMetaNick);

 				MIR_FREE(ptszNick);

 				MIR_FREE(ptszMetaNick);

diff --git a/plugins/Variables/src/parse_metacontacts.cpp b/plugins/Variables/src/parse_metacontacts.cpp
index 9785b30420..9ba853fb70 100644
--- a/plugins/Variables/src/parse_metacontacts.cpp
+++ b/plugins/Variables/src/parse_metacontacts.cpp
@@ -173,7 +173,7 @@ static TCHAR *parseGetMostOnline(ARGUMENTSINFO *ai)
 

 void registerMetaContactsTokens()

 {

-	registerIntToken(MC_GETPARENT, parseGetParent, TRF_FUNCTION, LPGEN("MetaContacts")"\t(x)\t"LPGEN("get parent metacontact of contact x"));

-	registerIntToken(MC_GETDEFAULT, parseGetDefault, TRF_FUNCTION, LPGEN("MetaContacts")"\t(x)\t"LPGEN("get default subcontact x"));

-	registerIntToken(MC_GETMOSTONLINE, parseGetMostOnline, TRF_FUNCTION, LPGEN("MetaContacts")"\t(x)\t"LPGEN("get the 'most online' subcontact x"));

+	registerIntToken(MC_GETPARENT, parseGetParent, TRF_FUNCTION, LPGEN("Metacontacts")"\t(x)\t"LPGEN("get parent metacontact of contact x"));

+	registerIntToken(MC_GETDEFAULT, parseGetDefault, TRF_FUNCTION, LPGEN("Metacontacts")"\t(x)\t"LPGEN("get default subcontact x"));

+	registerIntToken(MC_GETMOSTONLINE, parseGetMostOnline, TRF_FUNCTION, LPGEN("Metacontacts")"\t(x)\t"LPGEN("get the 'most online' subcontact x"));

 }

diff --git a/src/modules/database/profilemanager.cpp b/src/modules/database/profilemanager.cpp
index a221e29a44..7178f44d2a 100644
--- a/src/modules/database/profilemanager.cpp
+++ b/src/modules/database/profilemanager.cpp
@@ -577,7 +577,7 @@ static INT_PTR CALLBACK DlgProfileManager(HWND hwndDlg, UINT msg, WPARAM wParam,
 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)dat);

 

 			TCHAR buf[512];

-			mir_sntprintf(buf, SIZEOF(buf), _T("%s\n%s"), TranslateT("Miranda NG Profile Manager"), TranslateT("Manage your Miranda NG profile"));

+			mir_sntprintf(buf, SIZEOF(buf), _T("%s\n%s"), TranslateT("Miranda NG profile manager"), TranslateT("Manage your Miranda NG profile"));

 			SetDlgItemText(hwndDlg, IDC_NAME, buf);

 

 			dat->currentPage = 0;

diff --git a/src/modules/findadd/findadd.cpp b/src/modules/findadd/findadd.cpp
index 4109c5f1f2..b731607322 100644
--- a/src/modules/findadd/findadd.cpp
+++ b/src/modules/findadd/findadd.cpp
@@ -1037,7 +1037,7 @@ int LoadFindAddModule(void)
 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.position = 500020000;

 	mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_FINDUSER);

-	mi.pszName = LPGEN("&Find/Add contacts...");

+	mi.pszName = LPGEN("&Find/add contacts...");

 	mi.pszService = MS_FINDADD_FINDADD;

 	hMainMenuItem = Menu_AddMainMenuItem(&mi);

 	return 0;

diff --git a/src/modules/metacontacts/meta_addto.cpp b/src/modules/metacontacts/meta_addto.cpp
index 696b375237..d50a4ae0fb 100644
--- a/src/modules/metacontacts/meta_addto.cpp
+++ b/src/modules/metacontacts/meta_addto.cpp
@@ -100,9 +100,9 @@ static int BuildList(HWND list, BOOL sort)
 * @return TRUE if the dialog processed the message, FALSE if it did not.

 */

 

-#define szConvMsg LPGEN("Either there is no MetaContact in the database (in this case you should first convert a contact into one)\n\

+#define szConvMsg LPGEN("Either there is no metacontact in the database (in this case you should first convert a contact into one)\n\

 or there is none that can host this contact.\n\

-Another solution could be to convert this contact into a new MetaContact.\n\nConvert this contact into a new MetaContact?")

+Another solution could be to convert this contact into a new metacontact.\n\nConvert this contact into a new metacontact?")

 

 static INT_PTR CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

@@ -118,16 +118,16 @@ static INT_PTR CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT msg, WPARAM wPa
 

 			if (cc->IsMeta()) {

 				MessageBox(hwndDlg,

-							  TranslateT("This contact is a MetaContact.\nYou can't add a MetaContact to another MetaContact.\n\nPlease choose another."),

-							  TranslateT("MetaContact Conflict"), MB_ICONERROR);

+							  TranslateT("This contact is a metacontact.\nYou can't add a metacontact to another metacontact.\n\nPlease choose another."),

+							  TranslateT("Metacontact conflict"), MB_ICONERROR);

 				DestroyWindow(hwndDlg);

 				return TRUE;

 			}

 

 			if (cc->IsSub()) {

 				MessageBox(hwndDlg,

-							  TranslateT("This contact is already associated to a MetaContact.\nYou cannot add a contact to multiple MetaContacts."),

-							  TranslateT("Multiple MetaContacts"), MB_ICONERROR);

+							  TranslateT("This contact is already associated to a metacontact.\nYou cannot add a contact to multiple metacontacts."),

+							  TranslateT("Multiple metacontacts"), MB_ICONERROR);

 				DestroyWindow(hwndDlg);

 				return TRUE;

 			}

@@ -141,7 +141,7 @@ static INT_PTR CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT msg, WPARAM wPa
 		CheckDlgButton(hwndDlg, IDC_ONLYAVAIL, BST_CHECKED); // Initially checked; display all metacontacts is only an option

 		// Besides, we can check if there is at least one metacontact to add the contact to.

 		if (BuildList(GetDlgItem(hwndDlg, IDC_METALIST), FALSE) <= 0) {

-			if (MessageBox(hwndDlg, TranslateT(szConvMsg), TranslateT("No suitable MetaContact found"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON1) == IDYES)

+			if (MessageBox(hwndDlg, TranslateT(szConvMsg), TranslateT("No suitable metacontact found"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON1) == IDYES)

 				Meta_Convert(lParam, 0);

 			DestroyWindow(hwndDlg);

 			return TRUE;

@@ -172,12 +172,12 @@ static INT_PTR CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT msg, WPARAM wPa
 			{

 				int item = SendDlgItemMessage(hwndDlg, IDC_METALIST, LB_GETCURSEL, 0, 0);	// Get the index of the selected metacontact

 				if (item == -1)

-					return IDOK == MessageBox(hwndDlg, TranslateT("Please select a MetaContact"), TranslateT("No MetaContact selected"), MB_ICONHAND);

+					return IDOK == MessageBox(hwndDlg, TranslateT("Please select a metacontact"), TranslateT("No metacontact selected"), MB_ICONHAND);

 

 				MCONTACT hContact = (MCONTACT)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

 				MCONTACT hMeta = (MCONTACT)SendMessage(GetDlgItem(hwndDlg, IDC_METALIST), LB_GETITEMDATA, item, 0);

 				if (!Meta_Assign(hContact, hMeta, FALSE))

-					MessageBox(hwndDlg, TranslateT("Assignment to the MetaContact failed."), TranslateT("Assignment failure"), MB_ICONERROR);

+					MessageBox(hwndDlg, TranslateT("Assignment to the metacontact failed."), TranslateT("Assignment failure"), MB_ICONERROR);

 			}

 			// fall through

 		case IDCANCEL:

@@ -187,7 +187,7 @@ static INT_PTR CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT msg, WPARAM wPa
 		case IDC_CHK_SRT:

 			SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_METALIST), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_METALIST), GWL_STYLE) ^ LBS_SORT);

 			if (BuildList(GetDlgItem(hwndDlg, IDC_METALIST), IsDlgButtonChecked(hwndDlg, IDC_CHK_SRT) ? TRUE : FALSE) <= 0) {

-				if (MessageBox(hwndDlg, TranslateT(szConvMsg), TranslateT("No suitable MetaContact found"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON1) == IDYES)

+				if (MessageBox(hwndDlg, TranslateT(szConvMsg), TranslateT("No suitable metacontact found"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON1) == IDYES)

 					Meta_Convert(lParam, 0);

 				DestroyWindow(hwndDlg);

 				return TRUE;

diff --git a/src/modules/metacontacts/meta_edit.cpp b/src/modules/metacontacts/meta_edit.cpp
index 14ab3bb642..51a8a4f3e9 100644
--- a/src/modules/metacontacts/meta_edit.cpp
+++ b/src/modules/metacontacts/meta_edit.cpp
@@ -55,7 +55,7 @@ static void FillContactList(HWND hList)
 

 		TCHAR *ptszCDN = cli.pfnGetContactDisplayName(g_data.hContact[i], 0);

 		if (ptszCDN == NULL)

-			ptszCDN = TranslateT("(Unknown Contact)");

+			ptszCDN = TranslateT("(Unknown contact)");

 

 		LvItem.iSubItem = 0; // clist display name

 		LvItem.pszText = ptszCDN;

@@ -246,7 +246,7 @@ static INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wPara
 			LvCol.cx = 60;

 			ListView_InsertColumn(hwndList, 3, &LvCol);

 

-			LvCol.pszText = TranslateT("Send Offline");

+			LvCol.pszText = TranslateT("Send offline");

 			LvCol.cx = 85;

 			ListView_InsertColumn(hwndList, 4, &LvCol);

 

@@ -272,7 +272,7 @@ static INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wPara
 		{

 			TCHAR *ptszCDN = cli.pfnGetContactDisplayName(lParam, 0);

 			if (ptszCDN == NULL)

-				ptszCDN = TranslateT("(Unknown Contact)");

+				ptszCDN = TranslateT("(Unknown contact)");

 

 			SetDlgItemText(hwndDlg, IDC_ED_NAME, ptszCDN);

 		}

@@ -293,7 +293,7 @@ static INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wPara
 

 				HWND hwndOffline = GetDlgItem(hwndDlg, IDC_BTN_SETOFFLINE);

 				EnableWindow(hwndOffline, sel != -1);

-				SetWindowText(hwndOffline, TranslateTS((sel != -1 && g_data.hContact[sel] != g_data.hOfflineContact) ? LPGENT("Send &Offline") : LPGENT("Send &Online")));

+				SetWindowText(hwndOffline, TranslateTS((sel != -1 && g_data.hContact[sel] != g_data.hOfflineContact) ? LPGENT("Send &offline") : LPGENT("Send &online")));

 			}

 		}

 		break;

@@ -304,7 +304,7 @@ static INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wPara
 			switch (LOWORD(wParam)) {

 			case IDC_VALIDATE: // Apply changes, if there is still one contact attached to the metacontact.

 				if (g_data.num_contacts == 0) { // Otherwise, delete the metacontact.

-					if (IDYES == MessageBox(hwndDlg, TranslateT(szDelMsg), TranslateT("Delete MetaContact?"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON1)) {

+					if (IDYES == MessageBox(hwndDlg, TranslateT(szDelMsg), TranslateT("Delete metacontact?"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON1)) {

 						Meta_Delete(g_data.hMeta, 0);

 						DestroyWindow(hwndDlg);

 					}

@@ -319,7 +319,7 @@ static INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wPara
 			case IDOK:

 				if (IsWindowEnabled(GetDlgItem(hwndDlg, IDC_VALIDATE))) { // If there are changes that could be made,

 					if (g_data.num_contacts == 0) { // do the work that would have be done if the 'Apply' button was clicked.

-						if (IDYES == MessageBox(hwndDlg, TranslateT(szDelMsg), TranslateT("Delete MetaContact?"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON1)) {

+						if (IDYES == MessageBox(hwndDlg, TranslateT(szDelMsg), TranslateT("Delete metacontact?"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON1)) {

 							Meta_Delete(g_data.hMeta, 0);

 							DestroyWindow(hwndDlg);

 						}

diff --git a/src/modules/metacontacts/meta_main.cpp b/src/modules/metacontacts/meta_main.cpp
index 257f557814..e78a7ec6bd 100644
--- a/src/modules/metacontacts/meta_main.cpp
+++ b/src/modules/metacontacts/meta_main.cpp
@@ -28,12 +28,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // icolib support

 

 static IconItem iconList[] = {

-	{ LPGEN("Toggle Off"),             "off",     IDI_MCMENUOFF     },

-	{ LPGEN("Toggle On"),              "on",      IDI_MCMENU        },

-	{ LPGEN("Convert to MetaContact"), "convert", IDI_MCCONVERT     },

-	{ LPGEN("Add to Existing"),        "add",     IDI_MCADD         },

+	{ LPGEN("Toggle off"),             "off",     IDI_MCMENUOFF     },

+	{ LPGEN("Toggle on"),              "on",      IDI_MCMENU        },

+	{ LPGEN("Convert to metacontact"), "convert", IDI_MCCONVERT     },

+	{ LPGEN("Add to existing"),        "add",     IDI_MCADD         },

 	{ LPGEN("Edit"),                   "edit",    IDI_MCEDIT        },

-	{ LPGEN("Set to Default"),         "default", IDI_MCSETDEFAULT  },

+	{ LPGEN("Set to default"),         "default", IDI_MCSETDEFAULT  },

 	{ LPGEN("Remove"),                 "remove",  IDI_MCREMOVE      },

 };

 

diff --git a/src/modules/metacontacts/meta_menu.cpp b/src/modules/metacontacts/meta_menu.cpp
index a89bf1b804..0b8fd69813 100644
--- a/src/modules/metacontacts/meta_menu.cpp
+++ b/src/modules/metacontacts/meta_menu.cpp
@@ -70,7 +70,7 @@ INT_PTR Meta_Convert(WPARAM wParam, LPARAM lParam)
 

 	// Assign the contact to the MetaContact just created (and make default).

 	if (!Meta_Assign(wParam, hMetaContact, TRUE)) {

-		MessageBox(0, TranslateT("There was a problem in assigning the contact to the MetaContact"), TranslateT("Error"), MB_ICONEXCLAMATION);

+		MessageBox(0, TranslateT("There was a problem in assigning the contact to the metacontact"), TranslateT("Error"), MB_ICONEXCLAMATION);

 		CallService(MS_DB_CONTACT_DELETE, hMetaContact, 0);

 		return 0;

 	}

@@ -183,7 +183,7 @@ INT_PTR Meta_Delete(WPARAM hContact, LPARAM bSkipQuestion)
 		// check from recursion - see second half of this function

 		if (!bSkipQuestion && IDYES != 

 			 MessageBox((HWND)CallService(MS_CLUI_GETHWND, 0, 0),

-				TranslateT("This will remove the MetaContact permanently.\n\nProceed Anyway?"),

+				TranslateT("This will remove the metacontact permanently.\n\nProceed anyway?"),

 				TranslateT("Are you sure?"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON2))

 			return 0;

 

@@ -198,7 +198,7 @@ INT_PTR Meta_Delete(WPARAM hContact, LPARAM bSkipQuestion)
 			return 0;

 

 		if (cc->nSubs == 1) {

-			if (IDYES == MessageBox(0, TranslateT(szDelMsg), TranslateT("Delete MetaContact?"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON1))

+			if (IDYES == MessageBox(0, TranslateT(szDelMsg), TranslateT("Delete metacontact?"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON1))

 				Meta_Delete(cc->contactID, 1);

 

 			return 0;

@@ -367,11 +367,11 @@ INT_PTR Meta_OnOff(WPARAM wParam, LPARAM lParam)
 	db_set_b(0, META_PROTO, "Enabled", bToggled);

 	if (bToggled) {

 		mi.icolibItem = GetIconHandle(I_MENUOFF);

-		mi.pszName = LPGEN("Toggle MetaContacts Off");

+		mi.pszName = LPGEN("Toggle metacontacts off");

 	}

 	else {

 		mi.icolibItem = GetIconHandle(I_MENU);

-		mi.pszName = LPGEN("Toggle MetaContacts On");

+		mi.pszName = LPGEN("Toggle metacontacts on");

 	}

 	Menu_ModifyItem(hMenuOnOff, &mi);

 

@@ -386,7 +386,7 @@ void InitMenus()
 

 	// main menu item

 	mi.icolibItem = GetIconHandle(I_MENUOFF);

-	mi.pszName = LPGEN("Toggle MetaContacts Off");

+	mi.pszName = LPGEN("Toggle metacontacts off");

 	mi.pszService = "MetaContacts/OnOff";

 	mi.position = 500010000;

 	hMenuOnOff = Menu_AddMainMenuItem(&mi);

@@ -394,31 +394,31 @@ void InitMenus()
 	// contact menu items

 	mi.icolibItem = GetIconHandle(I_CONVERT);

 	mi.position = -200010;

-	mi.pszName = LPGEN("Convert to MetaContact");

+	mi.pszName = LPGEN("Convert to metacontact");

 	mi.pszService = "MetaContacts/Convert";

 	hMenuConvert = Menu_AddContactMenuItem(&mi);

 

 	mi.icolibItem = GetIconHandle(I_ADD);

 	mi.position = -200009;

-	mi.pszName = LPGEN("Add to existing MetaContact...");

+	mi.pszName = LPGEN("Add to existing metacontact...");

 	mi.pszService = "MetaContacts/AddTo";

 	hMenuAdd = Menu_AddContactMenuItem(&mi);

 

 	mi.icolibItem = GetIconHandle(I_EDIT);

 	mi.position = -200010;

-	mi.pszName = LPGEN("Edit MetaContact...");

+	mi.pszName = LPGEN("Edit metacontact...");

 	mi.pszService = "MetaContacts/Edit";

 	hMenuEdit = Menu_AddContactMenuItem(&mi);

 

 	mi.icolibItem = GetIconHandle(I_SETDEFAULT);

 	mi.position = -200009;

-	mi.pszName = LPGEN("Set as MetaContact default");

+	mi.pszName = LPGEN("Set as metacontact default");

 	mi.pszService = "MetaContacts/Default";

 	hMenuDefault = Menu_AddContactMenuItem(&mi);

 

 	mi.icolibItem = GetIconHandle(I_REMOVE);

 	mi.position = -200008;

-	mi.pszName = LPGEN("Delete MetaContact");

+	mi.pszName = LPGEN("Delete metacontact");

 	mi.pszService = "MetaContacts/Delete";

 	hMenuDelete = Menu_AddContactMenuItem(&mi);

 

@@ -447,7 +447,7 @@ void InitMenus()
 		// modify main menu item

 		mi.flags = CMIM_NAME | CMIM_ICON;

 		mi.icolibItem = GetIconHandle(I_MENU);

-		mi.pszName = LPGEN("Toggle MetaContacts On");

+		mi.pszName = LPGEN("Toggle metacontacts on");

 		Menu_ModifyItem(hMenuOnOff, &mi);

 

 		Meta_HideMetaContacts(true);

diff --git a/src/modules/metacontacts/meta_options.cpp b/src/modules/metacontacts/meta_options.cpp
index f131ae56d0..ea7d4de16f 100644
--- a/src/modules/metacontacts/meta_options.cpp
+++ b/src/modules/metacontacts/meta_options.cpp
@@ -179,7 +179,7 @@ int Meta_OptInit(WPARAM wParam, LPARAM)
 	odp.flags = ODPF_BOLDGROUPS;

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_METAOPTIONS);

-	odp.pszTitle = LPGEN("MetaContacts");

+	odp.pszTitle = LPGEN("Metacontacts");

 	odp.pszGroup = LPGEN("Contacts");

 	odp.pfnDlgProc = DlgProcOpts;

 	Options_AddPage(wParam, &odp);

diff --git a/src/modules/metacontacts/meta_utils.cpp b/src/modules/metacontacts/meta_utils.cpp
index 95628960d8..bf2546ce51 100644
--- a/src/modules/metacontacts/meta_utils.cpp
+++ b/src/modules/metacontacts/meta_utils.cpp
@@ -103,13 +103,13 @@ BOOL Meta_Assign(MCONTACT hSub, MCONTACT hMeta, BOOL set_as_default)
 

 	// Check that is is 'on the list'

 	if (db_get_b(hSub, "CList", "NotOnList", 0) == 1) {

-		MessageBox(0, TranslateT("Contact is 'Not on List' - please add the contact to your contact list before assigning."), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

+		MessageBox(0, TranslateT("Contact is 'not on list' - please add the contact to your contact list before assigning."), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		db_free(&dbv);

 		return FALSE;

 	}

 

 	if (ccDest->nSubs >= MAX_CONTACTS) {

-		MessageBox(0, TranslateT("MetaContact is full"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

+		MessageBox(0, TranslateT("Metacontact is full"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		db_free(&dbv);

 		return FALSE;

 	}

@@ -118,7 +118,7 @@ BOOL Meta_Assign(MCONTACT hSub, MCONTACT hMeta, BOOL set_as_default)
 	char buffer[512];

 	mir_snprintf(buffer, SIZEOF(buffer), "Protocol%d", ccDest->nSubs);

 	if (db_set_s(hMeta, META_PROTO, buffer, szProto)) {

-		MessageBox(0, TranslateT("Could not write contact protocol to MetaContact"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

+		MessageBox(0, TranslateT("Could not write contact protocol to metacontact"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		db_free(&dbv);

 		return FALSE;

 	}

@@ -126,7 +126,7 @@ BOOL Meta_Assign(MCONTACT hSub, MCONTACT hMeta, BOOL set_as_default)
 	// write the login

 	mir_snprintf(buffer, SIZEOF(buffer), "Login%d", ccDest->nSubs);

 	if (db_set(hMeta, META_PROTO, buffer, &dbv)) {

-		MessageBox(0, TranslateT("Could not write unique ID of contact to MetaContact"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

+		MessageBox(0, TranslateT("Could not write unique ID of contact to metacontact"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		db_free(&dbv);

 		return FALSE;

 	}

@@ -138,7 +138,7 @@ BOOL Meta_Assign(MCONTACT hSub, MCONTACT hMeta, BOOL set_as_default)
 		// write the nickname

 		mir_snprintf(buffer, SIZEOF(buffer), "Nick%d", ccDest->nSubs);

 		if (db_set(hMeta, META_PROTO, buffer, &dbv)) {

-			MessageBox(0, TranslateT("Could not write nickname of contact to MetaContact"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

+			MessageBox(0, TranslateT("Could not write nickname of contact to metacontact"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 			db_free(&dbv);

 			return FALSE;

 		}

diff --git a/src/modules/metacontacts/metacontacts.h b/src/modules/metacontacts/metacontacts.h
index c5993c5c73..45bb49b294 100644
--- a/src/modules/metacontacts/metacontacts.h
+++ b/src/modules/metacontacts/metacontacts.h
@@ -125,6 +125,6 @@ extern POINT menuMousePoint;
 #ifndef MS_CLUI_GETVERSION

 #define MS_CLUI_GETVERSION      "CLUI/GetVersion"

 

-#define szDelMsg LPGEN("You are going to remove all the contacts associated with this MetaContact.\nThis will delete the MetaContact.\n\nProceed Anyway?")

+#define szDelMsg LPGEN("You are going to remove all the contacts associated with this metacontact.\nThis will delete the metacontact.\n\nProceed anyway?")

 

 #endif

diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp
index 5576865477..7fc8023b28 100644
--- a/src/modules/plugins/newplugins.cpp
+++ b/src/modules/plugins/newplugins.cpp
@@ -657,7 +657,7 @@ static int LaunchServicePlugin(pluginEntry *p)
 	if (res != CALLSERVICE_NOTFOUND)

 		return res;

 

-	MessageBox(NULL, TranslateT("Unable to load plugin in Service Mode!"), p->pluginname, MB_ICONSTOP);

+	MessageBox(NULL, TranslateT("Unable to load plugin in service mode!"), p->pluginname, MB_ICONSTOP);

 	Plugin_Uninit(p);

 	return SERVICE_FAILED;

 }

diff --git a/src/resource.rc b/src/resource.rc
index 4bc4a631f7..74039b09b5 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -87,21 +87,21 @@ END
 

 IDD_PROFILEMANAGER DIALOGEX 0, 0, 219, 211

 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-CAPTION "Miranda NG Profile Manager"

+CAPTION "Miranda NG profile manager"

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

     CONTROL         "",IDC_NAME,"MHeaderbarCtrl",0x0,0,0,220,25

     CONTROL         "Tab1",IDC_TABS,"SysTabControl32",TCS_HOTTRACK | WS_TABSTOP,2,31,215,137

     PUSHBUTTON      "&Run",IDOK,169,195,48,14

     PUSHBUTTON      "&Exit",IDCANCEL,112,195,48,14

-    RTEXT           "Start in Service Mode with",IDC_SM_LABEL,10,178,106,10

+    RTEXT           "Start in service mode with",IDC_SM_LABEL,10,178,106,10

     COMBOBOX        IDC_SM_COMBO,118,176,98,12,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

 END

 

 IDD_FINDADD DIALOGEX 0, 0, 427, 257

 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

 EXSTYLE WS_EX_CONTROLPARENT

-CAPTION "Find/Add contacts"

+CAPTION "Find/add contacts"

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

     LTEXT           "Search:",IDC_STATIC,5,32,37,8

@@ -130,7 +130,7 @@ BEGIN
     PUSHBUTTON      "Add to list",IDC_ADD,354,225,68,14,WS_DISABLED

     CONTROL         "",IDC_STATUSBAR,"msctls_statusbar32",WS_TABSTOP | 0x100,0,244,427,10

     CONTROL         "Custom",IDC_BYCUSTOM,"Button",BS_AUTORADIOBUTTON,11,190,89,10

-    CONTROL         "Find/Add contacts\nHere you can add contacts to your contact list",IDC_HEADERBAR,

+    CONTROL         "Find/add contacts\nHere you can add contacts to your contact list",IDC_HEADERBAR,

                     "MHeaderbarCtrl",0x0,0,0,427,25

 END

 

@@ -738,12 +738,12 @@ END
 IDD_METASELECT DIALOGEX 0, 0, 219, 258

 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

 EXSTYLE WS_EX_CONTROLPARENT

-CAPTION "Add to Existing MetaContact"

+CAPTION "Add to existing metacontact"

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    CTEXT           "Please select a MetaContact:",IDC_STATIC,5,4,207,8

+    CTEXT           "Please select a metacontact:",IDC_STATIC,5,4,207,8

     LISTBOX         IDC_METALIST,4,16,211,222,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP

-    CONTROL         "Sort Alphabetically",IDC_CHK_SRT,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,6,244,104,8

+    CONTROL         "Sort alphabetically",IDC_CHK_SRT,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,6,244,104,8

     DEFPUSHBUTTON   "&OK",IDOK,115,241,48,14

     PUSHBUTTON      "&Cancel",IDCANCEL,167,241,48,14

 END

@@ -760,10 +760,10 @@ BEGIN
     GROUPBOX        "Contacts",IDC_FRAME,4,33,375,202

     CONTROL         "List1",IDC_LST_CONTACTS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,10,43,363,169,WS_EX_CLIENTEDGE

     PUSHBUTTON      "&Remove",IDC_BTN_REM,87,216,54,14

-    PUSHBUTTON      "&Set as Default",IDC_BTN_SETDEFAULT,145,216,54,14

-    PUSHBUTTON      "Move &Up",IDC_BTN_UP,261,216,54,14

-    PUSHBUTTON      "Move &Down",IDC_BTN_DOWN,319,216,54,14

-    PUSHBUTTON      "Send &Offline",IDC_BTN_SETOFFLINE,203,216,54,14

+    PUSHBUTTON      "&Set as default",IDC_BTN_SETDEFAULT,145,216,54,14

+    PUSHBUTTON      "Move &up",IDC_BTN_UP,261,216,54,14

+    PUSHBUTTON      "Move &down",IDC_BTN_DOWN,319,216,54,14

+    PUSHBUTTON      "Send &offline",IDC_BTN_SETOFFLINE,203,216,54,14

     DEFPUSHBUTTON   "&OK",IDOK,220,241,50,14

     PUSHBUTTON      "&Cancel",IDCANCEL,274,241,50,14

     PUSHBUTTON      "&Apply",IDC_VALIDATE,328,241,50,14

@@ -774,15 +774,15 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x0

 BEGIN

-GROUPBOX        "Context Menu", IDC_STATIC, 4, 7, 297, 109

+GROUPBOX        "Context menu", IDC_STATIC, 4, 7, 297, 109

 CONTROL         "Use contact's unique ID", IDC_RAD_UID, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 16, 30, 264, 10

 CONTROL         "Use contact's display name", IDC_RAD_DID, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 16, 43, 264, 10

-GROUPBOX        "Contact Labels", IDC_STATIC, 9, 16, 285, 45, WS_GROUP

+GROUPBOX        "Contact labels", IDC_STATIC, 9, 16, 285, 45, WS_GROUP

 GROUPBOX        "When I click on a sub in the popup menu...", IDC_STATIC, 9, 66, 285, 45, WS_GROUP

 CONTROL         "Set default and open message window", IDC_RAD_MSG, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 16, 76, 264, 10

 CONTROL         "Show subcontact context menu", IDC_RAD_MENU, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 16, 87, 264, 10

 CONTROL         "Show user information", IDC_RAD_INFO, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 16, 97, 264, 10

-GROUPBOX        "Contact List", IDC_STATIC, 4, 117, 297, 47, WS_GROUP

+GROUPBOX        "Contact list", IDC_STATIC, 4, 117, 297, 47, WS_GROUP

 CONTROL         "Display subcontact nickname", IDC_RAD_NICK, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 9, 129, 277, 10

 CONTROL         "Display subcontact display name", IDC_RAD_NAME, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 9, 140, 277, 10

 CONTROL         "Lock name to first contact", IDC_CHK_LOCKHANDLE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 151, 278, 10