diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/database/profilemanager.cpp | 2 | ||||
| -rw-r--r-- | src/modules/findadd/findadd.cpp | 2 | ||||
| -rw-r--r-- | src/modules/metacontacts/meta_addto.cpp | 20 | ||||
| -rw-r--r-- | src/modules/metacontacts/meta_edit.cpp | 12 | ||||
| -rw-r--r-- | src/modules/metacontacts/meta_main.cpp | 10 | ||||
| -rw-r--r-- | src/modules/metacontacts/meta_menu.cpp | 24 | ||||
| -rw-r--r-- | src/modules/metacontacts/meta_options.cpp | 2 | ||||
| -rw-r--r-- | src/modules/metacontacts/meta_utils.cpp | 10 | ||||
| -rw-r--r-- | src/modules/metacontacts/metacontacts.h | 2 | ||||
| -rw-r--r-- | src/modules/plugins/newplugins.cpp | 2 | ||||
| -rw-r--r-- | src/resource.rc | 28 | 
11 files changed, 57 insertions, 57 deletions
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
  | 
