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

8 files changed, 21 insertions, 21 deletions

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++) {