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

3 files changed, 12 insertions, 12 deletions

diff --git a/plugins/MetaContacts/res/MetaContacts.rc b/plugins/MetaContacts/res/MetaContacts.rc
index 3b8c65ca91..836d0c8f05 100644
--- a/plugins/MetaContacts/res/MetaContacts.rc
+++ b/plugins/MetaContacts/res/MetaContacts.rc
@@ -140,7 +140,7 @@ BEGIN
     GROUPBOX        "Options",IDC_STATIC,0,0,297,178

     CONTROL         "Suppress status notification for subcontacts",IDC_CHK_SUPPRESSSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,42,290,10

     GROUPBOX        "Context Menu",IDC_STATIC,4,79,289,58

-    CONTROL         "Use contact's unique id",IDC_RAD_UID,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,100,112,10

+    CONTROL         "Use contact's unique ID",IDC_RAD_UID,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,100,112,10

     CONTROL         "Use contact's display name",IDC_RAD_DID,"Button",BS_AUTORADIOBUTTON | WS_GROUP,13,114,112,10

     GROUPBOX        "Contact Labels",IDC_STATIC,9,87,120,45,WS_GROUP

     GROUPBOX        "Function",IDC_STATIC,133,87,155,45,WS_GROUP

diff --git a/plugins/MetaContacts/src/edit.cpp b/plugins/MetaContacts/src/edit.cpp
index f3f23c39b9..f5977e27c2 100644
--- a/plugins/MetaContacts/src/edit.cpp
+++ b/plugins/MetaContacts/src/edit.cpp
@@ -248,7 +248,7 @@ INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			LvCol.cx = 100;

 			ListView_InsertColumn(hwnd, 0, &LvCol);

 

-			LvCol.pszText = TranslateT("Id");

+			LvCol.pszText = TranslateT("ID");

 			LvCol.cx = 130;

 			ListView_InsertColumn(hwnd, 1, &LvCol);

 

diff --git a/plugins/MetaContacts/src/meta_utils.cpp b/plugins/MetaContacts/src/meta_utils.cpp
index 1a5998f574..5a9130b585 100644
--- a/plugins/MetaContacts/src/meta_utils.cpp
+++ b/plugins/MetaContacts/src/meta_utils.cpp
@@ -217,18 +217,18 @@ BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default)
 	HANDLE most_online;

 		

 	if ((metaID = db_get_dw(dest, META_PROTO, META_ID,(DWORD)-1))==-1) {

-		MessageBox(0, TranslateT("Could not get MetaContact id"), TranslateT("Assignment Error"), MB_OK | MB_ICONWARNING);

+		MessageBox(0, TranslateT("Could not get MetaContact ID"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		return FALSE;

 	}

 

 	if ((num_contacts = db_get_dw(dest, META_PROTO, "NumContacts",(DWORD)-1))==-1) {

-		MessageBox(0, TranslateT("Could not retreive MetaContact contact count"), TranslateT("Assignment Error"), MB_OK | MB_ICONWARNING);

+		MessageBox(0, TranslateT("Could not retreive MetaContact contact count"), TranslateT("Assignment error"), MB_OK | MB_ICONWARNING);

 		return FALSE;

 	}

 

 	char *szProto = GetContactProto(src);

 	if (szProto == NULL) {

-		MessageBox(0, TranslateT("Could not retreive contact protocol"), TranslateT("Assignment Error"), MB_OK | MB_ICONWARNING);

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

 		return FALSE;

 	}

 

@@ -236,20 +236,20 @@ BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default)
 	char *field = (char *)CallProtoService(szProto, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);

 	DBVARIANT dbv;

 	if ( db_get(src,szProto, field, &dbv)) {

-		MessageBox(0, TranslateT("Could not get unique id of contact"), TranslateT("Assignment Error"), MB_OK | MB_ICONWARNING);

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

 		return FALSE;

 	}

 

 	// Check that is is 'on the list'

 	if ( db_get_b(src, "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;

 	}

 

 	num_contacts++;

 	if (num_contacts >= 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;

 	}

@@ -259,7 +259,7 @@ BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default)
 	strcat(buffer, _itoa(num_contacts-1, szId, 10));

 

 	if ( db_set_s(dest, 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;

 	}

@@ -269,7 +269,7 @@ BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default)
 	strcat(buffer, szId);

 

 	if ( db_set(dest, 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;

 	}

@@ -282,7 +282,7 @@ BOOL Meta_Assign(HANDLE src, HANDLE dest, BOOL set_as_default)
 		strcpy(buffer, "Nick");

 		strcat(buffer, szId);

 		if (db_set(dest, 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);

 			return FALSE;

 		}

 

@@ -837,7 +837,7 @@ int Meta_SetHandles(void)
 			if (num_contacts != (DWORD)db_get_dw(hContact, META_PROTO, "NumContacts", (DWORD)-1)) {

 				hNextContact = db_find_next(hContact);

 

-				_tcscpy(nick_buffer, TranslateT("MetaId: "));

+				_tcscpy(nick_buffer, TranslateT("Meta ID: "));

 				_tcscat(nick_buffer, _itot(meta_id, buffer2, 10));

 				MessageBox(0, TranslateT("MetaContact corrupted - the number of subcontacts is incorrect.\nDeleting MetaContact."), nick_buffer, MB_OK | MB_ICONERROR);