Minor bugfixes:

- #607 (Capitalization inconsistency)
- #609 (Unnecessary messagebox in Plugin Updater)
- #613 (UserInfoEx writes wrong popup color settings to db)
- #614 (NewAwaySys translation issue)

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

20 files changed, 62 insertions, 77 deletions

diff --git a/plugins/Clist_blind/src/clcopts.cpp b/plugins/Clist_blind/src/clcopts.cpp
index 49f4f32ff8..b42bf1894a 100644
--- a/plugins/Clist_blind/src/clcopts.cpp
+++ b/plugins/Clist_blind/src/clcopts.cpp
@@ -263,7 +263,7 @@ int ClcOptInit(WPARAM wParam, LPARAM lParam)
 {

 	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

 	odp.hInstance = g_hInst;

-	odp.pszGroup = LPGEN("Contact List");

+	odp.pszGroup = LPGEN("Contact list");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC);

 	odp.pszTitle = LPGEN("List");

 	odp.pfnDlgProc = DlgProcClcMainOpts;

diff --git a/plugins/Clist_blind/src/clcpaint.cpp b/plugins/Clist_blind/src/clcpaint.cpp
index ba2d069264..7192f7a6ec 100644
--- a/plugins/Clist_blind/src/clcpaint.cpp
+++ b/plugins/Clist_blind/src/clcpaint.cpp
@@ -127,11 +127,10 @@ static int GetGeneralisedStatus(void)
 

 static int GetRealStatus(struct ClcContact *contact, int status)

 {

-	int i;

 	char *szProto = contact->proto;

 	if (!szProto)

 		return status;

-	for (i = 0; i < pcli->hClcProtoCount; i++) {

+	for (int i = 0; i < pcli->hClcProtoCount; i++) {

 		if (!lstrcmpA(pcli->clcProto[i].szProto, szProto)) {

 			return pcli->clcProto[i].dwStatus;

 		}

@@ -141,7 +140,6 @@ static int GetRealStatus(struct ClcContact *contact, int status)
 

 void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)

 {

-	HDC hdcMem;

 	RECT clRect;

 	int y, indent, index, fontHeight;

 	struct ClcGroup *group;

@@ -163,7 +161,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 	if (IsRectEmpty(rcPaint))

 		return;

 	y = -dat->yScroll;

-	hdcMem = CreateCompatibleDC(hdc);

+	HDC hdcMem = CreateCompatibleDC(hdc);

 	HBITMAP hBmpOsb = CreateBitmap(clRect.right, clRect.bottom, 1, GetDeviceCaps(hdc, BITSPIXEL), NULL);

 	HBITMAP hOldBitmap = (HBITMAP)SelectObject(hdcMem, hBmpOsb);

 	{

@@ -182,27 +180,23 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 	ChangeToFont(hdcMem, dat, FONTID_CONTACTS, &fontHeight);

 	SetBkMode(hdcMem, TRANSPARENT);

 	{

-		HBRUSH hBrush;

-

-		hBrush = CreateSolidBrush(tmpbkcolour);

+		HBRUSH hBrush = CreateSolidBrush(tmpbkcolour);

 		FillRect(hdcMem, rcPaint, hBrush);

 		DeleteObject(hBrush);

 		if (dat->hBmpBackground) {

-			BITMAP bmp;

-			HDC hdcBmp;

 			int x, y;

-			int maxx, maxy;

 			int destw, desth;

 

 			// XXX: Halftone isnt supported on 9x, however the scretch problems dont happen on 98.

 			SetStretchBltMode(hdcMem, HALFTONE);

 

+			BITMAP bmp;

 			GetObject(dat->hBmpBackground, sizeof(bmp), &bmp);

-			hdcBmp = CreateCompatibleDC(hdcMem);

+			HDC hdcBmp = CreateCompatibleDC(hdcMem);

 			SelectObject(hdcBmp, dat->hBmpBackground);

 			y = dat->backgroundBmpUse & CLBF_SCROLL ? -dat->yScroll : 0;

-			maxx = dat->backgroundBmpUse & CLBF_TILEH ? clRect.right : 1;

-			maxy = dat->backgroundBmpUse & CLBF_TILEV ? maxy = rcPaint->bottom : y + 1;

+			int maxx = dat->backgroundBmpUse & CLBF_TILEH ? clRect.right : 1;

+			int maxy = dat->backgroundBmpUse & CLBF_TILEV ? maxy = rcPaint->bottom : y + 1;

 			switch (dat->backgroundBmpUse & CLBM_TYPE) {

 			case CLB_STRETCH:

 				if (dat->backgroundBmpUse & CLBF_PROPORTIONAL) {

@@ -524,28 +518,24 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 	if (hBrushAlternateGrey)

 		DeleteObject(hBrushAlternateGrey);

 	if (grey) {

-		PBYTE bits;

 		BITMAPINFOHEADER bmih = { 0 };

-		int i;

-		int greyRed, greyGreen, greyBlue;

-		COLORREF greyColour;

 		bmih.biBitCount = 32;

 		bmih.biSize = sizeof(bmih);

 		bmih.biCompression = BI_RGB;

 		bmih.biHeight = -clRect.bottom;

 		bmih.biPlanes = 1;

 		bmih.biWidth = clRect.right;

-		bits = (PBYTE) malloc(4 * bmih.biWidth * -bmih.biHeight);

+		PBYTE bits = (PBYTE) malloc(4 * bmih.biWidth * -bmih.biHeight);

 		GetDIBits(hdc, hBmpOsb, 0, clRect.bottom, bits, (BITMAPINFO *) & bmih, DIB_RGB_COLORS);

-		greyColour = GetSysColor(COLOR_3DFACE);

-		greyRed = GetRValue(greyColour) * 2;

-		greyGreen = GetGValue(greyColour) * 2;

-		greyBlue = GetBValue(greyColour) * 2;

+		COLORREF greyColour = GetSysColor(COLOR_3DFACE);

+		int greyRed = GetRValue(greyColour) * 2;

+		int greyGreen = GetGValue(greyColour) * 2;

+		int greyBlue = GetBValue(greyColour) * 2;

 		if (divide3[0] == 255) {

-			for (i = 0; i < SIZEOF(divide3); i++)

+			for (int i = 0; i < SIZEOF(divide3); i++)

 				divide3[i] = (i + 1) / 3;

 		}

-		for (i = 4 * clRect.right * clRect.bottom - 4; i >= 0; i -= 4) {

+		for (int i = 4 * clRect.right * clRect.bottom - 4; i >= 0; i -= 4) {

 			bits[i] = divide3[bits[i] + greyBlue];

 			bits[i + 1] = divide3[bits[i + 1] + greyGreen];

 			bits[i + 2] = divide3[bits[i + 2] + greyRed];

diff --git a/plugins/Clist_blind/src/clistmenus.cpp b/plugins/Clist_blind/src/clistmenus.cpp
index 76e8d86bc8..74438b7c4c 100644
--- a/plugins/Clist_blind/src/clistmenus.cpp
+++ b/plugins/Clist_blind/src/clistmenus.cpp
@@ -23,12 +23,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 #include "commonheaders.h"

 

-INT_PTR CloseAction(WPARAM wParam,LPARAM lParam)

+INT_PTR CloseAction(WPARAM,LPARAM)

 {

 	if (CallService(MS_SYSTEM_OKTOEXIT,0,0))

 		DestroyWindow(pcli->hwndContactList);

 

-	return(0);

+	return 0;

 }

 

 void InitCustomMenus()

diff --git a/plugins/Clist_blind/src/clistopts.cpp b/plugins/Clist_blind/src/clistopts.cpp
index bc06a27efa..2f4c3417dd 100644
--- a/plugins/Clist_blind/src/clistopts.cpp
+++ b/plugins/Clist_blind/src/clistopts.cpp
@@ -45,22 +45,14 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		TranslateDialogDefault(hwndDlg);

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR) HookEventMessage(ME_DB_CONTACT_SETTINGCHANGED, hwndDlg, WM_USER + 1));

 		CheckDlgButton(hwndDlg, IDC_ONTOP, db_get_b(NULL, "CList", "OnTop", SETTING_ONTOP_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_HIDEOFFLINE,

-			db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_HIDEEMPTYGROUPS,

-			db_get_b(NULL, "CList", "HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_DISABLEGROUPS,

-			db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? BST_UNCHECKED : BST_CHECKED);

-		CheckDlgButton(hwndDlg, IDC_SORTBYNAME, !db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT)

-			&& !db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_SORTBYSTATUS,

-			db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_SORTBYPROTO,

-			db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_CONFIRMDELETE,

-			db_get_b(NULL, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

-		CheckDlgButton(hwndDlg, IDC_AUTOHIDE,

-			db_get_b(NULL, "CList", "AutoHide", SETTING_AUTOHIDE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_HIDEOFFLINE, db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_HIDEEMPTYGROUPS, db_get_b(NULL, "CList", "HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_DISABLEGROUPS, db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? BST_UNCHECKED : BST_CHECKED);

+		CheckDlgButton(hwndDlg, IDC_SORTBYNAME, !db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT) && !db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_SORTBYSTATUS, db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_SORTBYPROTO, db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_CONFIRMDELETE, db_get_b(NULL, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_AUTOHIDE, db_get_b(NULL, "CList", "AutoHide", SETTING_AUTOHIDE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

 		EnableWindow(GetDlgItem(hwndDlg, IDC_HIDETIME), IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

 		EnableWindow(GetDlgItem(hwndDlg, IDC_HIDETIMESPIN), IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE));

 		{

@@ -119,7 +111,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_SETPOS, 0,

 			MAKELONG(db_get_w(NULL, "CList", "CycleTime", SETTING_CYCLETIME_DEFAULT), 0));

 		{

-			int i, count, item;

+			int count, item;

 			PROTOACCOUNT **accs;

 			char szName[64];

 			DBVARIANT dbv = { DBVT_DELETED };

@@ -127,7 +119,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			CallService(MS_PROTO_ENUMACCOUNTS, (WPARAM)&count, (LPARAM)&accs);

 			item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM) TranslateT("Global"));

 			SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETITEMDATA, item, (LPARAM) 0);

-			for (i = 0; i < count; i++) {

+			for (int i = 0; i < count; i++) {

                 if (!IsAccountEnabled(accs[i]) || CallProtoService( accs[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0) == 0)

 					continue;

 				CallProtoService(accs[i]->szModuleName, PS_GETNAME, SIZEOF(szName), (LPARAM) szName);

@@ -241,7 +233,7 @@ int CListOptInit(WPARAM wParam, LPARAM lParam)
 	odp.position = -1000000000;

 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLIST);

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

+	odp.pszTitle = LPGEN("Contact list");

 	odp.pfnDlgProc = DlgProcGenOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

diff --git a/plugins/Clist_blind/src/cluiopts.cpp b/plugins/Clist_blind/src/cluiopts.cpp
index 64f53a1f57..7bd6aeaccb 100644
--- a/plugins/Clist_blind/src/cluiopts.cpp
+++ b/plugins/Clist_blind/src/cluiopts.cpp
@@ -311,7 +311,7 @@ int CluiOptInit(WPARAM wParam, LPARAM lParam)
 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLUI);

 	odp.pszTitle = LPGEN("Window");

-	odp.pszGroup = LPGEN("Contact List");

+	odp.pszGroup = LPGEN("Contact list");

 	odp.pfnDlgProc = DlgProcCluiOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index 0069988101..65bc48f046 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -366,8 +366,8 @@ BEGIN
     CONTROL         "Ask before deleting contacts",IDC_CONFIRMDELETE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,61,124,10

     CONTROL         "Don't move offline user to bottom",IDC_NOOFFLINEMOVE,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,153,77,141,10

-    GROUPBOX        "Contact List",IDC_STCLISTGROUP,2,8,142,84

-    GROUPBOX        "Contact List Sorting",IDC_STATIC,146,8,154,84,WS_GROUP

+    GROUPBOX        "Contact list",IDC_STCLISTGROUP,2,8,142,84

+    GROUPBOX        "Contact list sorting",IDC_STATIC,146,8,154,84,WS_GROUP

     LTEXT           "1st:",IDC_STATIC,153,19,14,8

     LTEXT           "2nd:",IDC_STATIC,153,35,14,8

     LTEXT           "3rd:",IDC_STATIC,153,49,14,8

diff --git a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
index a09df84b28..8996b94249 100644
--- a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
@@ -244,7 +244,7 @@ int static OnIconLibIconChanged(WPARAM wParam, LPARAM lParam)
 

 void GroupMenus_Init(void)

 {

-	Icon_Register(g_hInst, "Contact List", &iconItem, 1);

+	Icon_Register(g_hInst, LPGEN("Contact list"), &iconItem, 1);

 

 	HICON hIcon = Skin_GetIconByHandle(iconItem.hIcolib);

 	NewGroupIconidx = hIcon ? ImageList_AddIcon(hCListImages, hIcon) : -1;

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 3bf7f46083..efeb4278c5 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -91,13 +91,13 @@ static int clcHookModulesLoaded(WPARAM wParam, LPARAM lParam)
 	sid.ptszDefaultFile = szMyPath;

 	sid.flags = SIDF_PATH_TCHAR;

 

-	sid.pszSection = LPGEN("Contact List");

+	sid.pszSection = LPGEN("Contact list");

 	sid.pszDescription = LPGEN("Listening to");

 	sid.pszName = "LISTENING_TO_ICON";

 	sid.iDefaultIndex = -IDI_LISTENING_TO;

 	Skin_AddIcon(&sid);

 

-	sid.pszSection = LPGEN("Contact List") "/" LPGEN("Avatar Overlay");

+	sid.pszSection = LPGEN("Contact list") "/" LPGEN("Avatar Overlay");

 	for (int i = 0; i < SIZEOF(g_pAvatarOverlayIcons); i++) {

 		sid.pszDescription = g_pAvatarOverlayIcons[i].description;

 		sid.pszName = g_pAvatarOverlayIcons[i].name;

@@ -105,7 +105,7 @@ static int clcHookModulesLoaded(WPARAM wParam, LPARAM lParam)
 		Skin_AddIcon(&sid);

 	}

 

-	sid.pszSection = LPGEN("Contact List") "/" LPGEN("Status Overlay");

+	sid.pszSection = LPGEN("Contact list") "/" LPGEN("Status Overlay");

 	for (int i = 0; i < SIZEOF(g_pStatusOverlayIcons); i++) {

 		sid.pszDescription = g_pStatusOverlayIcons[i].description;

 		sid.pszName = g_pStatusOverlayIcons[i].name;

@@ -123,7 +123,7 @@ static int clcHookModulesLoaded(WPARAM wParam, LPARAM lParam)
 

 		rc.cbSize = sizeof(rc);

 		rc.name = "clist";

-		rc.dispname = Translate("Contact List smileys");

+		rc.dispname = Translate("Contact list smileys");

 

 		CallService(MS_SMILEYADD_REGISTERCATEGORY, 0, (LPARAM)&rc);

 

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 6e0c31486f..aa98df3946 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -56,10 +56,10 @@ struct FontOptionsList
 	char       size;

 };

 

-#define CLCGROUP        LPGENT("Contact List")_T("/")LPGENT("Contact names")

-#define CLCLINESGROUP   LPGENT("Contact List")_T("/")LPGENT("Row items")

-#define CLCFRAMESGROUP  LPGENT("Contact List")_T("/")LPGENT("Frame texts")

-#define CLCCOLOURSGROUP LPGENT("Contact List")_T("/")LPGENT("Special colors")

+#define CLCGROUP        LPGENT("Contact list")_T("/")LPGENT("Contact names")

+#define CLCLINESGROUP   LPGENT("Contact list")_T("/")LPGENT("Row items")

+#define CLCFRAMESGROUP  LPGENT("Contact list")_T("/")LPGENT("Frame texts")

+#define CLCCOLOURSGROUP LPGENT("Contact list")_T("/")LPGENT("Special colors")

 

 #define DEFAULT_COLOUR     RGB(0, 0, 0)

 #define DEFAULT_GREYCOLOUR RGB(128, 128, 128)

@@ -1921,7 +1921,7 @@ int ModernOptInit(WPARAM wParam, LPARAM lParam)
 	obj.iBoldControls = iBoldControls;

 	obj.lptzSubsection = _T("Fonts");

 	obj.lpzClassicGroup = NULL;

-	obj.lpzClassicPage = "Contact List";

+	obj.lpzClassicPage = "Contact list";

 	obj.lpzHelpUrl = "http://wiki.miranda-ng.org/";

 

 	obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPTS);

@@ -1958,7 +1958,7 @@ int ClcOptInit(WPARAM wParam, LPARAM lParam)
 	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC);

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

+	odp.pszTitle = LPGEN("Contact list");

 	odp.pfnDlgProc = DlgProcClistListOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 

@@ -1973,7 +1973,7 @@ int ClcOptInit(WPARAM wParam, LPARAM lParam)
 	if (g_CluiData.fDisableSkinEngine) {

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLIST_LISTBKG);

 		odp.pszGroup = LPGEN("Skins");

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

+		odp.pszTitle = LPGEN("Contact list");

 		odp.pszTab = LPGEN("List background");

 		odp.pfnDlgProc = DlgProcClcBkgOpts;

 		odp.flags = ODPF_BOLDGROUPS;

diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp
index a619d019a9..d0b21ac07e 100644
--- a/plugins/Clist_modern/src/modern_clistmenus.cpp
+++ b/plugins/Clist_modern/src/modern_clistmenus.cpp
@@ -180,7 +180,7 @@ INT_PTR FAV_ToggleShowOffline(WPARAM hContact,LPARAM lParam)
 

 int LoadFavoriteContactMenu()

 {

-	Icon_Register(g_hInst, "Contact List", iconList, SIZEOF(iconList));

+	Icon_Register(g_hInst, LPGEN("Contact list"), iconList, SIZEOF(iconList));

 

 	CreateServiceFunction(CLUI_FAVSETRATE,FAV_SetRate);

 	CreateServiceFunction(CLUI_FAVTOGGLESHOWOFFLINE,FAV_ToggleShowOffline);

diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp
index 48a7ff29b3..69a9c504f9 100644
--- a/plugins/Clist_modern/src/modern_clistopts.cpp
+++ b/plugins/Clist_modern/src/modern_clistopts.cpp
@@ -943,7 +943,7 @@ int CListOptInit(WPARAM wParam, LPARAM lParam)
 	odp.position = -200000000;

 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ITEMS);

-	odp.pszGroup = LPGEN("Contact List");

+	odp.pszGroup = LPGEN("Contact list");

 	odp.pszTitle = LPGEN("Row items");

 	odp.flags = ODPF_BOLDGROUPS;

 

diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp
index a1289008a9..9586f0003b 100644
--- a/plugins/Clist_modern/src/modern_skinopt.cpp
+++ b/plugins/Clist_modern/src/modern_skinopt.cpp
@@ -55,7 +55,7 @@ int SkinOptInit(WPARAM wParam, LPARAM lParam)
 		odp.pfnDlgProc = DlgSkinOpts;

 		odp.pszTemplate = MAKEINTRESOURCEA( IDD_OPT_SKIN );

 		odp.ptszGroup = LPGENT("Skins");

-		odp.ptszTitle = LPGENT("Contact List");

+		odp.ptszTitle = LPGENT("Contact list");

 		odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;

 		odp.ptszTab = LPGENT("Load/Save");

 		Options_AddPage(wParam, &odp);

@@ -63,7 +63,7 @@ int SkinOptInit(WPARAM wParam, LPARAM lParam)
 		if ( db_get_b( NULL, "ModernData", "EnableSkinEditor", SETTING_ENABLESKINEDITOR_DEFAULT )) {

 			odp.pfnDlgProc = DlgSkinEditorOpts;

 			odp.pszTemplate = MAKEINTRESOURCEA( IDD_OPT_SKINEDITOR );

-			odp.ptszTab = LPGENT("Object Editor");

+			odp.ptszTab = LPGENT("Object editor");

 			Options_AddPage(wParam, &odp);

 		}

 	}

@@ -79,7 +79,7 @@ int ModernSkinOptInit(WPARAM wParam, LPARAM lParam)
 	obj.hInstance = g_hInst;

 	obj.iSection = MODERNOPT_PAGE_SKINS;

 	obj.iType = MODERNOPT_TYPE_SELECTORPAGE;

-	obj.lptzSubsection = _T("Contact List");

+	obj.lptzSubsection = _T("Contact list");

 	obj.lpzThemeExtension = ".msf";

 	obj.lpzThemeModuleName = "ModernSkinSel";

 	CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 2dc289494b..4ed058faf3 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -1020,10 +1020,10 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 

 	case WM_USER + 100:

 		SendMessage(GetDlgItem(hwnd, IDC_RESETMODES), MBM_SETICOLIBHANDLE, 0,

-			(LPARAM) RegisterIcolibIconHandle("CLN_CLVM_reset", "Contact List", LPGEN("Reset view mode"), NULL, 0, g_hInst, IDI_RESETVIEW ));

+			(LPARAM) RegisterIcolibIconHandle("CLN_CLVM_reset", LPGEN("Contact list"), LPGEN("Reset view mode"), NULL, 0, g_hInst, IDI_RESETVIEW ));

 

 		SendMessage(GetDlgItem(hwnd, IDC_CONFIGUREMODES), MBM_SETICOLIBHANDLE, 0,

-			(LPARAM) RegisterIcolibIconHandle("CLN_CLVM_set", "Contact List", LPGEN("Setup view modes"), NULL, 0, g_hInst, IDI_SETVIEW ));

+			(LPARAM) RegisterIcolibIconHandle("CLN_CLVM_set", LPGEN("Contact list"), LPGEN("Setup view modes"), NULL, 0, g_hInst, IDI_SETVIEW ));

 

 		{

 			for (int i=0; _buttons[i] != 0; i++) {

diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp
index 823bc6fb10..b6c7464fe3 100644
--- a/plugins/MyDetails/src/mydetails.cpp
+++ b/plugins/MyDetails/src/mydetails.cpp
@@ -623,7 +623,7 @@ static int MainInit(WPARAM wparam,LPARAM lparam)
 	InitFrames();

 

 	if ( Skin_GetIcon("LISTENING_TO_ICON") == NULL)

-		Icon_Register(hInst, LPGEN("Contact List"), iconList, 1);

+		Icon_Register(hInst, LPGEN("Contact list"), iconList, 1);

 

 	Icon_Register(hInst, LPGEN("My Details"), iconList+1, SIZEOF(iconList)-1);

 	return 0;

diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp
index bcfd76cecc..0dae3e2a38 100644
--- a/plugins/NewAwaySysMod/src/AwaySys.cpp
+++ b/plugins/NewAwaySysMod/src/AwaySys.cpp
@@ -565,11 +565,11 @@ INT_PTR srvVariablesHandler(WPARAM, LPARAM lParam)
 	ai->flags = AIF_DONTPARSE;

 	TCString Result;

 	if (!lstrcmp(ai->targv[0], VAR_AWAYSINCE_TIME)) {

-		GetTimeFormat(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT), 0, g_ProtoStates[VarParseData.szProto].AwaySince, (ai->argc > 1 && *ai->targv[1]) ? ai->targv[1] : _T("H:mm"), Result.GetBuffer(256), 256);

+		GetTimeFormat(LOCALE_USER_DEFAULT, 0, g_ProtoStates[VarParseData.szProto].AwaySince, (ai->argc > 1 && *ai->targv[1]) ? ai->targv[1] : _T("H:mm"), Result.GetBuffer(256), 256);

 		Result.ReleaseBuffer();

 	}

 	else if (!lstrcmp(ai->targv[0], VAR_AWAYSINCE_DATE)) {

-		GetDateFormat(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT), 0, g_ProtoStates[VarParseData.szProto].AwaySince, (ai->argc > 1 && *ai->targv[1]) ? ai->targv[1] : NULL, Result.GetBuffer(256), 256);

+		GetDateFormat(LOCALE_USER_DEFAULT, 0, g_ProtoStates[VarParseData.szProto].AwaySince, (ai->argc > 1 && *ai->targv[1]) ? ai->targv[1] : NULL, Result.GetBuffer(256), 256);

 		Result.ReleaseBuffer();

 	}

 	else if (!lstrcmp(ai->targv[0], VAR_STATDESC)) {

diff --git a/plugins/PluginUpdater/src/Common.h b/plugins/PluginUpdater/src/Common.h
index 7d3bdc7167..0025df82d2 100644
--- a/plugins/PluginUpdater/src/Common.h
+++ b/plugins/PluginUpdater/src/Common.h
@@ -192,7 +192,7 @@ int   CompareHashes(const ServListEntry *p1, const ServListEntry *p2);
 TCHAR* GetDefaultUrl();

 BOOL   DownloadFile(LPCTSTR tszURL, LPCTSTR tszLocal, int CRCsum, HANDLE &nlc);

 

-void  ShowPopup(HWND hDlg, LPCTSTR Title, LPCTSTR Text, int Number, int ActType);

+void  ShowPopup(HWND hDlg, LPCTSTR Title, LPCTSTR Text, int Number, int ActType, bool NoMessageBox = false);

 void  __stdcall RestartMe(void*);

 void  __stdcall OpenPluginOptions(void*);

 BOOL  AllowUpdateOnStartup();

diff --git a/plugins/PluginUpdater/src/Notifications.cpp b/plugins/PluginUpdater/src/Notifications.cpp
index e76ce083bb..0076c923f1 100644
--- a/plugins/PluginUpdater/src/Notifications.cpp
+++ b/plugins/PluginUpdater/src/Notifications.cpp
@@ -113,9 +113,12 @@ static void MakePopupAction(POPUPACTION &pa, int id)
 	}

 }

 

-void ShowPopup(HWND hDlg, LPCTSTR ptszTitle, LPCTSTR ptszText, int Number, int ActType)

+void ShowPopup(HWND hDlg, LPCTSTR ptszTitle, LPCTSTR ptszText, int Number, int ActType, bool NoMessageBox)

 {	

 	if (!ServiceExists(MS_POPUP_ADDPOPUPT) || !db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) ) {

+		if(NoMessageBox){

+			return;

+		}

 		char setting[100];

 		mir_snprintf(setting, SIZEOF(setting), "Popups%dM", Number);

 		if (db_get_b(NULL, MODNAME, setting, DEFAULT_MESSAGE_ENABLED)) {

diff --git a/plugins/PluginUpdater/src/Services.cpp b/plugins/PluginUpdater/src/Services.cpp
index cf5df545b9..0fb3bf4c1b 100644
--- a/plugins/PluginUpdater/src/Services.cpp
+++ b/plugins/PluginUpdater/src/Services.cpp
@@ -40,14 +40,14 @@ static INT_PTR srvParseHashes(WPARAM wParam, LPARAM lParam)
 	return NULL;

 }

 

-static INT_PTR srvFreeHashes(WPARAM wParam, LPARAM lParam)

+static INT_PTR srvFreeHashes(WPARAM, LPARAM lParam)

 {

 	SERVLIST *pList = (SERVLIST*)lParam;

 	delete pList;

 	return 0;

 }

 

-static INT_PTR srvGetHashCount(WPARAM wParam, LPARAM lParam)

+static INT_PTR srvGetHashCount(WPARAM, LPARAM lParam)

 {

 	SERVLIST *pList = (SERVLIST*)lParam;

 	return (pList == NULL) ? 0 : pList->getCount();

diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp
index ba1b78d64b..267e8ea2a6 100644
--- a/plugins/PluginUpdater/src/Utils.cpp
+++ b/plugins/PluginUpdater/src/Utils.cpp
@@ -211,7 +211,7 @@ bool ParseHashes(const TCHAR *ptszUrl, ptrT& baseUrl, SERVLIST& arHashes)
 

 	// Download version info

 	if (!opts.bSilent)

-		ShowPopup(NULL, TranslateT("Plugin Updater"), TranslateT("Checking new updates..."), 2, 0);

+		ShowPopup(NULL, TranslateT("Plugin Updater"), TranslateT("Checking new updates..."), 2, 0, true);

 

 	FILEURL pFileUrl;

 	mir_sntprintf(pFileUrl.tszDownloadURL, SIZEOF(pFileUrl.tszDownloadURL), _T("%s/hashes.zip"), baseUrl);

diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp
index bfc97a7e93..2dc997080b 100644
--- a/plugins/UserInfoEx/src/psp_options.cpp
+++ b/plugins/UserInfoEx/src/psp_options.cpp
@@ -209,7 +209,7 @@ static void DBGetColor(HWND hDlg, const int idCtrl, LPCSTR pszSetting, DWORD bDe
  **/

 static void DBWriteColor(HWND hDlg, const int idCtrl, LPCSTR pszSetting)

 {

-	db_set_w(NULL, MODNAME, pszSetting, SendDlgItemMessage(hDlg, idCtrl, CPM_GETCOLOUR, 0, 0));

+	db_set_dw(NULL, MODNAME, pszSetting, (DWORD)SendDlgItemMessage(hDlg, idCtrl, CPM_GETCOLOUR, 0, 0));

 }

 

 /**