MetaContact -> metacontact; decapitalization

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

2 files changed, 15 insertions, 15 deletions

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;