Simple Status Message: proper capitalization (menus and dialogs)

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

5 files changed, 42 insertions, 43 deletions

diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp
index 17b43b5381..28521dd14c 100644
--- a/plugins/SimpleStatusMsg/src/awaymsg.cpp
+++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp
@@ -369,7 +369,7 @@ static int AwayMsgPreBuildMenu(WPARAM hContact, LPARAM lParam)
 				iHidden = 0;

 				clmi.flags = CMIM_FLAGS | CMIM_NAME | CMIM_ICON | CMIF_TCHAR;

 				clmi.hIcon = LoadSkinnedProtoIcon(szProto, iStatus);

-				mir_sntprintf(str, SIZEOF(str), TranslateT("Re&ad %s Message"), pcli->pfnGetStatusModeDescription(iStatus, 0));

+				mir_sntprintf(str, SIZEOF(str), TranslateT("Re&ad %s message"), pcli->pfnGetStatusModeDescription(iStatus, 0));

 				clmi.ptszName = str;

 			}

 		}

@@ -383,7 +383,7 @@ static int AwayMsgPreBuildMenu(WPARAM hContact, LPARAM lParam)
 	if (!iHidden && szMsg != NULL) {

 		if (db_get_b(NULL, "SimpleStatusMsg", "ShowCopy", 1)) {

 			clmi.flags = CMIM_FLAGS | CMIM_NAME | CMIF_TCHAR;

-			mir_sntprintf(str, SIZEOF(str), TranslateT("Copy %s Message"), pcli->pfnGetStatusModeDescription(iStatus, 0));

+			mir_sntprintf(str, SIZEOF(str), TranslateT("Copy %s message"), pcli->pfnGetStatusModeDescription(iStatus, 0));

 			clmi.ptszName = str;

 		}

 	}

@@ -393,7 +393,7 @@ static int AwayMsgPreBuildMenu(WPARAM hContact, LPARAM lParam)
 	if (!iHidden && szMsg != NULL) {

 		if (db_get_b(NULL, "SimpleStatusMsg", "ShowGoToURL", 1) && StrFindURL(szMsg) != NULL) {

 			clmi.flags = CMIM_FLAGS | CMIM_NAME | CMIF_TCHAR;

-			mir_sntprintf(str, SIZEOF(str), TranslateT("&Go to URL in %s Message"), pcli->pfnGetStatusModeDescription(iStatus, 0));

+			mir_sntprintf(str, SIZEOF(str), TranslateT("&Go to URL in %s message"), pcli->pfnGetStatusModeDescription(iStatus, 0));

 			clmi.ptszName = str;

 		}

 

@@ -426,21 +426,21 @@ int LoadAwayMsgModule(void)
 

 	CreateServiceFunction(MS_AWAYMSG_SHOWAWAYMSG, GetMessageCommand);

 	mi.position = -2000005000;

-	mi.ptszName = LPGENT("Re&ad Away Message");

+	mi.ptszName = LPGENT("Re&ad Away message");

 	mi.pszService = MS_AWAYMSG_SHOWAWAYMSG;

 	hAwayMsgMenuItem = Menu_AddContactMenuItem(&mi);

 

 	CreateServiceFunction(MS_SIMPLESTATUSMSG_COPYMSG, CopyAwayMsgCommand);

 	mi.position = -2000006000;

 	mi.icolibItem = GetIconHandle(IDI_COPY);

-	mi.ptszName = LPGENT("Copy Away Message");

+	mi.ptszName = LPGENT("Copy Away message");

 	mi.pszService = MS_SIMPLESTATUSMSG_COPYMSG;

 	hCopyMsgMenuItem = Menu_AddContactMenuItem(&mi);

 

 	CreateServiceFunction(MS_SIMPLESTATUSMSG_GOTOURLMSG, GoToURLMsgCommand);

 	mi.position = -2000007000;

 	mi.icolibItem = GetIconHandle(IDI_GOTOURL);

-	mi.ptszName = LPGENT("&Go to URL in Away Message");

+	mi.ptszName = LPGENT("&Go to URL in Away message");

 	mi.pszService = MS_SIMPLESTATUSMSG_GOTOURLMSG;

 	hGoToURLMenuItem = Menu_AddContactMenuItem(&mi);

 

diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp
index 4e9ff62d91..e21867ae3b 100644
--- a/plugins/SimpleStatusMsg/src/main.cpp
+++ b/plugins/SimpleStatusMsg/src/main.cpp
@@ -882,10 +882,9 @@ INT_PTR ShowStatusMessageDialogInternal(WPARAM wParam, LPARAM lParam)
 

 	if (Miranda_Terminated()) return 0;

 

-	if (hTTBButton)

-	{

+	if (hTTBButton) {

 		CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)hTTBButton, (LPARAM)TTBST_RELEASED);

-		CallService(MS_TTB_SETBUTTONOPTIONS, MAKEWPARAM((WORD)TTBO_TIPNAME, (WORD)hTTBButton), (LPARAM)Translate("Change Status Message"));

+		CallService(MS_TTB_SETBUTTONOPTIONS, MAKEWPARAM((WORD)TTBO_TIPNAME, (WORD)hTTBButton), (LPARAM)Translate("Change status message"));

 	}

 

 	box_data = (struct MsgBoxInitData *)mir_alloc(sizeof(struct MsgBoxInitData));

@@ -1421,7 +1420,7 @@ static int AddTopToolbarButton(WPARAM wParam, LPARAM lParam)
 	ttbb.hIconHandleUp = ttbb.hIconHandleDn = GetIconHandle(IDI_CSMSG);

 	ttbb.pszService = MS_SIMPLESTATUSMSG_SHOWDIALOGINT;

 	ttbb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP;

-	ttbb.name = ttbb.pszTooltipUp = LPGEN("Change Status Message");

+	ttbb.name = ttbb.pszTooltipUp = LPGEN("Change status message");

 	hTTBButton = TopToolbar_AddButton(&ttbb);

 

 	ReleaseIconEx("csmsg");

@@ -1435,8 +1434,8 @@ void RegisterHotkey(void)
 	hkd.cbSize = sizeof(hkd);

 	hkd.dwFlags = HKD_TCHAR;

 	hkd.pszName = "SimpleStatusMsg_OpenDialog";

-	hkd.ptszDescription = LPGENT("Open Status Message Dialog");

-	hkd.ptszSection = LPGENT("Status Message");

+	hkd.ptszDescription = LPGENT("Open status message dialog");

+	hkd.ptszSection = LPGENT("Status message");

 	hkd.pszService = MS_SIMPLESTATUSMSG_SHOWDIALOGINT;

 	hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, VK_OEM_3);

 	Hotkey_Register(&hkd);

@@ -1476,7 +1475,7 @@ static int ChangeStatusMsgPrebuild(WPARAM wParam, LPARAM lParam)
 		mi.flags |= CMIF_HIDDEN;

 	mi.icolibItem = GetIconHandle(IDI_CSMSG);

 	mi.pszService = MS_SIMPLESTATUSMSG_SHOWDIALOGINT;

-	mi.ptszName = LPGENT("Status Message...");

+	mi.ptszName = LPGENT("Status message...");

 	mi.position = 2000200000;

 	Menu_AddStatusMenuItem(&mi);

 

diff --git a/plugins/SimpleStatusMsg/src/msgbox.cpp b/plugins/SimpleStatusMsg/src/msgbox.cpp
index 0bfa7111c5..acbe2b22ea 100644
--- a/plugins/SimpleStatusMsg/src/msgbox.cpp
+++ b/plugins/SimpleStatusMsg/src/msgbox.cpp
@@ -295,13 +295,13 @@ HWND WINAPI CreateRecentComboBoxEx(HWND hwndDlg, struct MsgBoxData *data)
 		{

 			if (data->m_iDlgFlags & DLG_SHOW_LIST_ICONS)

 			{

-				mir_sntprintf(text, SIZEOF(text), TranslateT("Clear History"));

+				mir_sntprintf(text, SIZEOF(text), TranslateT("Clear history"));

 				cbei.iImage = I_ICON_CLEAR;

 				cbei.iSelectedImage = I_ICON_CLEAR;

 			}

 			else

 			{

-				mir_sntprintf(text, SIZEOF(text), _T("## %s ##"), TranslateT("Clear History"));

+				mir_sntprintf(text, SIZEOF(text), _T("## %s ##"), TranslateT("Clear history"));

 				cbei.iIndent = 1;

 			}

 			cbei.iItem = -1;

@@ -314,13 +314,13 @@ HWND WINAPI CreateRecentComboBoxEx(HWND hwndDlg, struct MsgBoxData *data)
 		cbei.iItem = -1;

 		if (data->m_iDlgFlags & DLG_SHOW_LIST_ICONS)

 		{

-			mir_sntprintf(text, SIZEOF(text), TranslateT("Add to Predefined"));

+			mir_sntprintf(text, SIZEOF(text), TranslateT("Add to predefined"));

 			cbei.iImage = I_ICON_ADD;

 			cbei.iSelectedImage = I_ICON_ADD;

 		}

 		else

 		{

-			mir_sntprintf(text, SIZEOF(text), _T("## %s ##"), TranslateT("Add to Predefined"));

+			mir_sntprintf(text, SIZEOF(text), _T("## %s ##"), TranslateT("Add to predefined"));

 			cbei.iIndent = 1;

 		}

 		cbei.pszText = (LPTSTR)text;

@@ -330,14 +330,14 @@ HWND WINAPI CreateRecentComboBoxEx(HWND hwndDlg, struct MsgBoxData *data)
 

 		if (data->m_iDlgFlags & DLG_SHOW_LIST_ICONS)

 		{

-			mir_sntprintf(text, SIZEOF(text), TranslateT("Delete Selected"));

+			mir_sntprintf(text, SIZEOF(text), TranslateT("Delete selected"));

 			cbei.iImage = I_ICON_DEL;

 			cbei.iSelectedImage = I_ICON_DEL;

 		}

 		else

 		{

 			cbei.iIndent = 1;

-			mir_sntprintf(text, SIZEOF(text), _T("## %s ##"), TranslateT("Delete Selected"));

+			mir_sntprintf(text, SIZEOF(text), _T("## %s ##"), TranslateT("Delete selected"));

 		}

 		cbei.iItem = -1;

 		cbei.pszText = (LPTSTR)text;

@@ -439,7 +439,7 @@ VOID APIENTRY HandlePopupMenu(HWND hwnd, POINT pt, HWND edit_control)
 

 	HMENU hmenuTrackPopup = GetSubMenu(hmenu, 0);

 

- 	TranslateMenu(hmenuTrackPopup);

+	TranslateMenu(hmenuTrackPopup);

 

 	ClientToScreen(hwnd, (LPPOINT) &pt);

 

@@ -461,17 +461,17 @@ VOID APIENTRY HandlePopupMenu(HWND hwnd, POINT pt, HWND edit_control)
 	DeleteMenu(hmenuTrackPopup, 7, MF_BYPOSITION);

 

 	int m_selection = TrackPopupMenu(hmenuTrackPopup, TPM_LEFTALIGN | TPM_RETURNCMD, pt.x, pt.y, 0, hwnd, NULL);

- 	switch (m_selection)

+	switch (m_selection)

 	{

 		case IDM_COPY:

 			SendMessage(edit_control, WM_COPY, 0, 0);

 			break;

 

 		case IDM_CUT:

-            SendMessage(edit_control, WM_CUT, 0, 0);

+			SendMessage(edit_control, WM_CUT, 0, 0);

 			break;

 

-        case IDM_PASTE:

+		case IDM_PASTE:

 			SendMessage(edit_control, WM_PASTE, 0, 0);

 			break;

 

@@ -851,13 +851,13 @@ void ChangeDlgStatus(HWND hwndDlg, struct MsgBoxData *msgbox_data, int iStatus)
 	TCHAR szTitle[256], szProtoName[128];

 	BOOL bDisabled = msgbox_data->m_szProto && !(CallProtoService(msgbox_data->m_szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND);

 

-	mir_sntprintf(szProtoName, SIZEOF(szProtoName), msgbox_data->m_szProto ? ProtoGetAccount(msgbox_data->m_szProto)->tszAccountName : TranslateT("Global"));

+	mir_sntprintf(szProtoName, SIZEOF(szProtoName), msgbox_data->m_szProto ? ProtoGetAccount(msgbox_data->m_szProto)->tszAccountName : TranslateT("global"));

 	if (iStatus == ID_STATUS_CURRENT)

 	{

 		if (msgbox_data->m_bOnStartup)

-			mir_sntprintf(szTitle, SIZEOF(szTitle), TranslateT("%s Message (%s)"), TranslateT("<startup>"), szProtoName);

+			mir_sntprintf(szTitle, SIZEOF(szTitle), TranslateT("%s message (%s)"), TranslateT("<startup>"), szProtoName);

 		else

-			mir_sntprintf(szTitle, SIZEOF(szTitle), TranslateT("%s Message (%s)"), TranslateT("<current>"), szProtoName);

+			mir_sntprintf(szTitle, SIZEOF(szTitle), TranslateT("%s message (%s)"), TranslateT("<current>"), szProtoName);

 	}

 	else if (iStatus > ID_STATUS_CURRENT)

 	{

@@ -867,9 +867,9 @@ void ChangeDlgStatus(HWND hwndDlg, struct MsgBoxData *msgbox_data, int iStatus)
 		CallService(MS_SS_GETPROFILENAME, iStatus - 40083, (LPARAM)buff1);

 		MultiByteToWideChar(CallService(MS_LANGPACK_GETCODEPAGE, 0, 0), 0, buff1, -1, buff, 128);

 

-		mir_sntprintf(szTitle, SIZEOF(szTitle), TranslateT("%s Message (%s)"), (TCHAR*)buff, szProtoName);

+		mir_sntprintf(szTitle, SIZEOF(szTitle), TranslateT("%s message (%s)"), (TCHAR*)buff, szProtoName);

 	}

-	else mir_sntprintf(szTitle, SIZEOF(szTitle), TranslateT("%s Message (%s)"), pcli->pfnGetStatusModeDescription(iStatus, 0), szProtoName);

+	else mir_sntprintf(szTitle, SIZEOF(szTitle), TranslateT("%s message (%s)"), pcli->pfnGetStatusModeDescription(iStatus, 0), szProtoName);

 	SetWindowText(hwndDlg, szTitle);

 

 	if (iStatus == ID_STATUS_CURRENT)

@@ -987,7 +987,7 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 			TranslateDialogDefault(hwndDlg);

 			init_data = (struct MsgBoxInitData*)lParam;

 			GetWindowText(hwndDlg, szFormat, SIZEOF(szFormat));

-			mir_sntprintf(szProtoName, SIZEOF(szProtoName), init_data->m_szProto ? ProtoGetAccount(init_data->m_szProto)->tszAccountName : TranslateT("Global"));

+			mir_sntprintf(szProtoName, SIZEOF(szProtoName), init_data->m_szProto ? ProtoGetAccount(init_data->m_szProto)->tszAccountName : TranslateT("global"));

 

 			if (init_data->m_iStatus == ID_STATUS_CURRENT)

 			{

@@ -1039,16 +1039,16 @@ INT_PTR CALLBACK AwayMsgBoxDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 

 			if ((copy_init_data->m_iDlgFlags & DLG_SHOW_BUTTONS) || (copy_init_data->m_iDlgFlags & DLG_SHOW_BUTTONS_FLAT))

 			{

-				SendMessage(GetDlgItem(hwndDlg, IDC_BADD), BUTTONADDTOOLTIP, (WPARAM)Translate("Add to Predefined"), 0);

+				SendMessage(GetDlgItem(hwndDlg, IDC_BADD), BUTTONADDTOOLTIP, (WPARAM)Translate("Add to predefined"), 0);

 				SendMessage(GetDlgItem(hwndDlg, IDC_BADD), BM_SETIMAGE, IMAGE_ICON, (LPARAM)copy_init_data->icon[I_ICON_ADD]);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_BADD), TRUE);

 				ShowWindow(GetDlgItem(hwndDlg, IDC_BADD), TRUE);

 

-				SendMessage(GetDlgItem(hwndDlg, IDC_BDEL), BUTTONADDTOOLTIP, (WPARAM)Translate("Delete Selected"), 0);

+				SendMessage(GetDlgItem(hwndDlg, IDC_BDEL), BUTTONADDTOOLTIP, (WPARAM)Translate("Delete selected"), 0);

 				SendMessage(GetDlgItem(hwndDlg, IDC_BDEL), BM_SETIMAGE, IMAGE_ICON, (LPARAM)copy_init_data->icon[I_ICON_DEL]);

 				ShowWindow(GetDlgItem(hwndDlg, IDC_BDEL), TRUE);

 

-				SendMessage(GetDlgItem(hwndDlg, IDC_BCLEAR), BUTTONADDTOOLTIP, (WPARAM)Translate("Clear History"), 0);

+				SendMessage(GetDlgItem(hwndDlg, IDC_BCLEAR), BUTTONADDTOOLTIP, (WPARAM)Translate("Clear history"), 0);

 				SendMessage(GetDlgItem(hwndDlg, IDC_BCLEAR), BM_SETIMAGE, IMAGE_ICON, (LPARAM)copy_init_data->icon[I_ICON_CLEAR]);

 				ShowWindow(GetDlgItem(hwndDlg, IDC_BCLEAR), TRUE);

 

diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp
index acfad76106..5f8044216d 100644
--- a/plugins/SimpleStatusMsg/src/options.cpp
+++ b/plugins/SimpleStatusMsg/src/options.cpp
@@ -246,7 +246,7 @@ static INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
 					SetDlgItemText(hwndDlg, IDC_VARSHELP, _T("V"));

 

 				if (szTipInfo == NULL)

-					SendMessage(GetDlgItem(hwndDlg, IDC_VARSHELP), BUTTONADDTOOLTIP, (WPARAM)TranslateT("Open String Formatting Help"), 0);

+					SendMessage(GetDlgItem(hwndDlg, IDC_VARSHELP), BUTTONADDTOOLTIP, (WPARAM)TranslateT("Open string formatting help"), 0);

 				else

 					SendMessage(GetDlgItem(hwndDlg, IDC_VARSHELP), BUTTONADDTOOLTIP, (WPARAM)szTipInfo, 0);

 

@@ -278,7 +278,7 @@ static INT_PTR CALLBACK DlgOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
 						SetDlgItemInt(hwndDlg, IDC_EMAXLENGTH, 1, FALSE);

 					val = GetDlgItemInt(hwndDlg, IDC_EMAXLENGTH, &translated, FALSE);

 

-					i = SendMessage(GetDlgItem(hwndDlg, IDC_CBOPTPROTO), CB_GETITEMDATA, (WPARAM)SendMessage(GetDlgItem(hwndDlg, IDC_CBOPTPROTO), CB_GETCURSEL, 0, 0), 0);							

+					i = SendMessage(GetDlgItem(hwndDlg, IDC_CBOPTPROTO), CB_GETITEMDATA, (WPARAM)SendMessage(GetDlgItem(hwndDlg, IDC_CBOPTPROTO), CB_GETCURSEL, 0, 0), 0);

 					data->proto_msg[i].max_length = val;

 					break;

 				}

@@ -1604,7 +1604,7 @@ static INT_PTR CALLBACK DlgStatusOptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wPa
 						}

 					}

 

-					index = SendMessage(GetDlgItem(hwndDlg, IDC_LISTSTATUS), LB_INSERTSTRING, -1, (LPARAM)TranslateT("<Last status>"));

+					index = SendMessage(GetDlgItem(hwndDlg, IDC_LISTSTATUS), LB_INSERTSTRING, -1, (LPARAM)TranslateT("<last status>"));

 					if (index != LB_ERR && index != LB_ERRSPACE)

 					{

 						SendMessage(GetDlgItem(hwndDlg, IDC_LISTSTATUS), LB_SETITEMDATA, (WPARAM)index, (LPARAM)ID_STATUS_CURRENT-ID_STATUS_OFFLINE);

diff --git a/plugins/SimpleStatusMsg/src/utils.cpp b/plugins/SimpleStatusMsg/src/utils.cpp
index 39d6e1295a..3880df82a3 100644
--- a/plugins/SimpleStatusMsg/src/utils.cpp
+++ b/plugins/SimpleStatusMsg/src/utils.cpp
@@ -24,14 +24,14 @@ static LIST<void> arProtoHooks(5);
 

 static IconItem iconList[] =

 {

-	{ LPGEN("Delete Selected"),           "cross",   IDI_CROSS   },

-	{ LPGEN("Recent Message"),            "recent",  IDI_HISTORY },

-	{ LPGEN("Predefined Message"),        "predef",  IDI_MESSAGE },

-	{ LPGEN("Add to Predefined"),         "add",     IDI_PLUS    },

-	{ LPGEN("Clear History"),             "clear",   IDI_CHIST   },

-	{ LPGEN("Copy Away Message"),         "copy",    IDI_COPY    },

-	{ LPGEN("Change Status Message"),     "csmsg",   IDI_CSMSG,  },

-	{ LPGEN("Go to URL in Away Message"), "gotourl", IDI_GOTOURL }

+	{ LPGEN("Delete selected"),           "cross",   IDI_CROSS   },

+	{ LPGEN("Recent message"),            "recent",  IDI_HISTORY },

+	{ LPGEN("Predefined message"),        "predef",  IDI_MESSAGE },

+	{ LPGEN("Add to predefined"),         "add",     IDI_PLUS    },

+	{ LPGEN("Clear history"),             "clear",   IDI_CHIST   },

+	{ LPGEN("Copy Away message"),         "copy",    IDI_COPY    },

+	{ LPGEN("Change status message"),     "csmsg",   IDI_CSMSG,  },

+	{ LPGEN("Go to URL in Away message"), "gotourl", IDI_GOTOURL }

 };

 

 void IconsInit(void)