- Options tree items change

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

32 files changed, 35 insertions, 35 deletions

diff --git a/plugins/!Deprecated/FingerPrintModPlus/src/options.cpp b/plugins/!Deprecated/FingerPrintModPlus/src/options.cpp
index 2e710faaff..df054bba89 100644
--- a/plugins/!Deprecated/FingerPrintModPlus/src/options.cpp
+++ b/plugins/!Deprecated/FingerPrintModPlus/src/options.cpp
@@ -144,7 +144,7 @@ int OnOptInitialise(WPARAM wParam, LPARAM lParam)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.cbSize = sizeof(odp);

 	odp.hInstance = g_hInst;

-	odp.ptszGroup = LPGENT("Customize");

+	odp.ptszGroup = LPGENT("Icons");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG);

 	odp.ptszTitle = LPGENT("Fingerprint");

 	odp.pfnDlgProc = DlgProcOptions;

diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp
index 54eb6892a4..70edca3ffb 100644
--- a/plugins/AVS/src/main.cpp
+++ b/plugins/AVS/src/main.cpp
@@ -2161,7 +2161,7 @@ static int OptInit(WPARAM wParam, LPARAM lParam)
 	odp.cbSize = sizeof(odp);

 	odp.hInstance = g_hInst;

 	odp.flags = ODPF_BOLDGROUPS;

-	odp.pszGroup = LPGEN("Customize");

+	odp.pszGroup = LPGEN("Contacts");

 	odp.pszTitle = LPGEN("Avatars");

 

 	odp.pszTab = LPGEN("Protocols");

diff --git a/plugins/AuthState/src/options.cpp b/plugins/AuthState/src/options.cpp
index bc4a3dcf1e..f860c62e7b 100644
--- a/plugins/AuthState/src/options.cpp
+++ b/plugins/AuthState/src/options.cpp
@@ -84,7 +84,7 @@ int onOptInitialise(WPARAM wParam, LPARAM lParam)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.cbSize = sizeof(odp);

 	odp.hInstance = g_hInst;

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

+	odp.pszGroup = LPGEN("Icons");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_AUTHSTATE_OPT);

 	odp.pszTitle = LPGEN("Auth State");

 	odp.pfnDlgProc = DlgProcOptions;

diff --git a/plugins/AutoRun/src/main.cpp b/plugins/AutoRun/src/main.cpp
index 1a96efb8fc..b65a22175b 100644
--- a/plugins/AutoRun/src/main.cpp
+++ b/plugins/AutoRun/src/main.cpp
@@ -108,7 +108,7 @@ static int AutorunOptInitialise(WPARAM wParam,LPARAM lParam)
 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_AUTORUN);

 	odp.pszTitle = LPGEN(ModuleName);

-	odp.pszGroup = LPGEN("Events");

+	odp.pszGroup = LPGEN("Services");

 	odp.pfnDlgProc = DlgProcAutorunOpts;

 	odp.flags = ODPF_BOLDGROUPS;	

 	Options_AddPage(wParam, &odp);

diff --git a/plugins/AvatarHistory/src/options.cpp b/plugins/AvatarHistory/src/options.cpp
index 316493b341..71cdc2da32 100644
--- a/plugins/AvatarHistory/src/options.cpp
+++ b/plugins/AvatarHistory/src/options.cpp
@@ -80,7 +80,7 @@ int OptInit(WPARAM wParam,LPARAM lParam)
 		odp.cbSize=sizeof(odp);

 		odp.position=0;

 		odp.hInstance=hInst;

-		odp.ptszGroup = LPGENT("Popups");

+		odp.ptszGroup = LPGENT("PopUps");

 		odp.ptszTitle = LPGENT("Avatar Change");

 		odp.pfnDlgProc = PopupsDlgProc;

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPS);

diff --git a/plugins/BuddyExpectator/src/options.cpp b/plugins/BuddyExpectator/src/options.cpp
index d20101ee49..d471b61911 100644
--- a/plugins/BuddyExpectator/src/options.cpp
+++ b/plugins/BuddyExpectator/src/options.cpp
@@ -444,7 +444,7 @@ static int OptionsInit(WPARAM wParam, LPARAM lParam)
 {

 	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

 	odp.hInstance   = hInst;

-	odp.ptszGroup   = LPGENT("Plugins");

+	odp.ptszGroup   = LPGENT("Contacts");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSPANEL);

 	odp.ptszTitle   = LPGENT("Buddy Expectator");

 	odp.pfnDlgProc  = OptionsFrameProc;

diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
index 227ba6e2fb..93e152a23e 100644
--- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp
+++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
@@ -172,7 +172,7 @@ int OnOptionsInitialise(WPARAM wParam, LPARAM lParam)
 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_MAIN_OPTION_FORM);

 	odp.pszTitle = ModuleName;

-	odp.pszGroup = LPGEN("Plugins");

+	odp.pszGroup = LPGEN("Message Sessions");

 	odp.flags = ODPF_BOLDGROUPS;

 	odp.pfnDlgProc = DlgMainProcOptions;

 	Options_AddPage(wParam, &odp);

diff --git a/plugins/CountryFlags/src/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp
index 0b1648bd6b..3883b8bf71 100644
--- a/plugins/CountryFlags/src/extraimg.cpp
+++ b/plugins/CountryFlags/src/extraimg.cpp
@@ -272,7 +272,7 @@ static int ExtraImgOptInit(WPARAM wParam,LPARAM lParam)
 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_EXTRAIMG);

 	odp.position = 900000002;

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

+	odp.pszGroup = LPGEN("Icons");  /* autotranslated */

 	odp.pszTitle = LPGEN("Country Flags"); /* autotranslated */

 	odp.pszTab = LPGEN("Country Flags");   /* autotranslated, can be made a tab */

 	odp.flags = ODPF_BOLDGROUPS;

diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp
index b9b4aef86d..98b54270d6 100644
--- a/plugins/FavContacts/src/main.cpp
+++ b/plugins/FavContacts/src/main.cpp
@@ -278,7 +278,7 @@ int ProcessOptInitialise(WPARAM wParam, LPARAM lParam)
 	odp.position = 100000000;

 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);

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

+	odp.pszGroup = LPGEN("Contacts");

 	odp.pszTitle = LPGEN("Favourites");

 	odp.groupPosition = 910000000;

 	odp.flags = ODPF_BOLDGROUPS;

diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp
index 23aec2c35b..a4978a8134 100644
--- a/plugins/FingerprintNG/src/options.cpp
+++ b/plugins/FingerprintNG/src/options.cpp
@@ -150,7 +150,7 @@ int OnOptInitialise(WPARAM wParam, LPARAM lParam)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.cbSize = sizeof(odp);

 	odp.hInstance = g_hInst;

-	odp.ptszGroup = LPGENT("Customize");

+	odp.ptszGroup = LPGENT("Icons");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG);

 	odp.ptszTitle = LPGENT("Fingerprint");

 	odp.pfnDlgProc = DlgProcOptions;

diff --git a/plugins/FloatingContacts/src/options.cpp b/plugins/FloatingContacts/src/options.cpp
index cee946a438..f999372d7c 100644
--- a/plugins/FloatingContacts/src/options.cpp
+++ b/plugins/FloatingContacts/src/options.cpp
@@ -108,7 +108,7 @@ OnOptionsInitialize
 	odp.hInstance   =  hInst;

 	odp.pszTemplate =  MAKEINTRESOURCEA(IDD_OPT_FLTCONT);

 	odp.pszTitle    =  LPGEN("Floating Contacts");

-	odp.pszGroup    =  LPGEN("Plugins");

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

 	odp.pszTab      =  LPGEN("Main Features");

 	odp.flags       =  ODPF_BOLDGROUPS;

 	odp.pfnDlgProc  =  (DLGPROC)OptWndProc;

diff --git a/plugins/Gender/src/options.cpp b/plugins/Gender/src/options.cpp
index 0a3808b73a..6726079d3b 100644
--- a/plugins/Gender/src/options.cpp
+++ b/plugins/Gender/src/options.cpp
@@ -83,7 +83,7 @@ int onOptInitialise(WPARAM wParam, LPARAM lParam)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.cbSize = sizeof(odp);

 	odp.hInstance = g_hInst;

-	odp.pszGroup = LPGEN("Plugins");

+	odp.pszGroup = LPGEN("Icons");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_GENDER_OPT);

 	odp.pszTitle = LPGEN("Gender");

 	odp.pfnDlgProc = DlgProcOptions;

diff --git a/plugins/IgnoreState/src/options.cpp b/plugins/IgnoreState/src/options.cpp
index cdd27fb3be..778f50a520 100644
--- a/plugins/IgnoreState/src/options.cpp
+++ b/plugins/IgnoreState/src/options.cpp
@@ -117,7 +117,7 @@ int onOptInitialise(WPARAM wParam, LPARAM lParam)
 	odp.cbSize = sizeof(odp);

 	odp.hInstance = g_hInst;

 	odp.flags = ODPF_BOLDGROUPS;

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

+	odp.pszGroup = LPGEN("Icons");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_RATE_OPT);

 	odp.pszTitle = MODULENAME;

 	odp.pfnDlgProc = DlgProcOptions;

diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp
index d413961f26..122c3e3521 100755
--- a/plugins/Msg_Export/src/options.cpp
+++ b/plugins/Msg_Export/src/options.cpp
@@ -1466,7 +1466,7 @@ int OptionsInitialize(WPARAM wParam,LPARAM /*lParam*/)
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGEXPORT);

 	odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR;

 	odp.ptszTitle = LPGENT("Message export");

-	odp.ptszGroup = LPGENT("Plugins");

+	odp.ptszGroup = LPGENT("History");

 	odp.groupPosition = 100000000;

 	odp.pfnDlgProc = DlgProcMsgExportOpts;

 	Options_AddPage(wParam,&odp);

diff --git a/plugins/MyDetails/src/options.cpp b/plugins/MyDetails/src/options.cpp
index a4b722b241..65b7e488db 100644
--- a/plugins/MyDetails/src/options.cpp
+++ b/plugins/MyDetails/src/options.cpp
@@ -145,7 +145,7 @@ int InitOptionsCallback(WPARAM wParam,LPARAM lParam)
 	odp.hInstance = hInst;

 	odp.pfnDlgProc = DlgProcOpts;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTS);

-	odp.ptszGroup = LPGENT("Customize");

+	odp.ptszGroup = LPGENT("Contact List");

 	odp.ptszTitle = LPGENT("My Details");

 	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;

 	Options_AddPage(wParam, &odp);

diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp
index cc84b83911..0671f11fcc 100644
--- a/plugins/NewXstatusNotify/src/options.cpp
+++ b/plugins/NewXstatusNotify/src/options.cpp
@@ -1059,7 +1059,7 @@ int OptionsInitialize(WPARAM wParam, LPARAM lParam)
 

 	if (ServiceExists(MS_POPUP_ADDPOPUP)) {

 		odp.pszTitle = LPGEN("Status Notify");

-		odp.pszGroup = LPGEN("Popups");

+		odp.pszGroup = LPGEN("PopUps");

 		odp.pszTab = LPGEN("General");

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP);

 		odp.pfnDlgProc = DlgProcPopUpOpts;

diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp
index 6a47da10c9..68bd49841d 100644
--- a/plugins/PluginUpdater/src/Options.cpp
+++ b/plugins/PluginUpdater/src/Options.cpp
@@ -406,7 +406,7 @@ int OptInit(WPARAM wParam, LPARAM lParam)
 	odp.hInstance = hInst;

 	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_UPDATENOTIFY);

-	odp.ptszGroup = LPGENT("Events");

+	odp.ptszGroup = LPGENT("Services");

 	odp.ptszTitle = LPGENT("Plugin Updater");

 	odp.pfnDlgProc = UpdateNotifyOptsProc;

 	Options_AddPage(wParam, &odp);

diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp
index be785840ba..3cb5352cc0 100644
--- a/plugins/Scriver/src/chat/options.cpp
+++ b/plugins/Scriver/src/chat/options.cpp
@@ -766,7 +766,7 @@ static int OptionsInitialize(WPARAM wParam, LPARAM lParam)
 		odp.hInstance = g_hInst;

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSPOPUP);

 		odp.pszTitle = LPGEN("Messaging");

-		odp.pszGroup = LPGEN("Popups");

+		odp.pszGroup = LPGEN("PopUps");

 		odp.pfnDlgProc = DlgProcOptionsPopup;

 		odp.flags = ODPF_BOLDGROUPS;

 		odp.ptszTab = NULL;

diff --git a/plugins/SecureIM/src/popupOptions.cpp b/plugins/SecureIM/src/popupOptions.cpp
index 23db06cfef..2b6ee87876 100644
--- a/plugins/SecureIM/src/popupOptions.cpp
+++ b/plugins/SecureIM/src/popupOptions.cpp
@@ -230,7 +230,7 @@ int onRegisterPopOptions(WPARAM wParam, LPARAM)
 	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCE(IDD_POPUP);

 	odp.pszTitle = (char*)szModuleName;

-	odp.pszGroup = LPGEN("Popups");

+	odp.pszGroup = LPGEN("PopUps");

 	odp.pfnDlgProc = PopOptionsDlgProc;

 	Options_AddPage(wParam, &odp);

 	return 0;

diff --git a/plugins/SeenPlugin/src/options.cpp b/plugins/SeenPlugin/src/options.cpp
index 4085de3708..5ffd4e9420 100644
--- a/plugins/SeenPlugin/src/options.cpp
+++ b/plugins/SeenPlugin/src/options.cpp
@@ -467,7 +467,7 @@ int OptionsInit(WPARAM wparam,LPARAM lparam)
 	odp.hInstance = hInstance;

 	odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_SETTINGS);

-	odp.ptszGroup = LPGENT("Services");

+	odp.ptszGroup = LPGENT("Contacts");

 	odp.ptszTitle = LPGENT("Last seen");

 	odp.pfnDlgProc = OptsSettingsDlgProc;

 	Options_AddPage(wparam,&odp);

diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp
index bcdca4125a..7e4a09b11d 100644
--- a/plugins/TooltipNotify/src/TooltipNotify.cpp
+++ b/plugins/TooltipNotify/src/TooltipNotify.cpp
@@ -304,7 +304,7 @@ int CTooltipNotify::InitializeOptions(WPARAM wParam, LPARAM lParam)
 	odp.hInstance = m_hDllInstance;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);

 	odp.pszTitle = LPGEN("Tooltip Notify");

-	odp.pszGroup = LPGEN("Customize");

+	odp.pszGroup = LPGEN("PopUps");

 	odp.groupPosition = 910000000;

 	odp.flags = ODPF_BOLDGROUPS;

 	odp.pfnDlgProc = CTooltipNotify::OptionsDlgProcWrapper;

diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp
index 12f3616d69..bba649312d 100644
--- a/plugins/UserInfoEx/src/psp_options.cpp
+++ b/plugins/UserInfoEx/src/psp_options.cpp
@@ -1300,7 +1300,7 @@ static INT OnInitOptions(WPARAM wParam, LPARAM lParam)
 	odp.position = 95400;

 	odp.hInstance = ghInst;

 	odp.pszTitle = MODNAME;

-	odp.pszGroup = LPGEN("Plugins");

+	odp.pszGroup = LPGEN("Contacts");

 	odp.cbSize = sizeof(odp);

 

 	// Common page

@@ -1334,7 +1334,7 @@ static INT OnInitOptions(WPARAM wParam, LPARAM lParam)
 	// Popups page

 	if (ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		odp.pszTitle = MODNAME;

-		odp.pszGroup = LPGEN("Popups");

+		odp.pszGroup = LPGEN("PopUps");

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP);

 		odp.pfnDlgProc = DlgProc_Popups;

 		odp.flags = ODPF_BOLDGROUPS;

diff --git a/plugins/WhenWasIt/src/hooked_events.cpp b/plugins/WhenWasIt/src/hooked_events.cpp
index 643ad10512..3f7efbc41d 100644
--- a/plugins/WhenWasIt/src/hooked_events.cpp
+++ b/plugins/WhenWasIt/src/hooked_events.cpp
@@ -137,8 +137,8 @@ int OnOptionsInitialise(WPARAM wParam, LPARAM lParam)
 	odp.position = 100000000;

 	odp.hInstance = hInstance;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_WWI);

-	odp.pszTitle = LPGEN("When Was It");

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

+	odp.pszTitle = LPGEN("Birthdays");

+	odp.pszGroup = LPGEN("Contacts");

 	odp.groupPosition = 910000000;

 	odp.flags = ODPF_BOLDGROUPS;

 	odp.pfnDlgProc = DlgProcOptions;

diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index de10a1f337..2fcc2177ba 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -434,7 +434,7 @@ int FacebookProto::OnOptionsInit(WPARAM wParam,LPARAM lParam)
 

 	odp.position    = 271830;

 	if (ServiceExists(MS_POPUP_ADDPOPUPT))

-		odp.ptszGroup   = LPGENT("Popups");

+		odp.ptszGroup   = LPGENT("PopUps");

 	odp.ptszTab     = LPGENT("Events");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_EVENTS);

 	odp.pfnDlgProc  = FBEventsProc;

diff --git a/protocols/GTalkExt/src/options.cpp b/protocols/GTalkExt/src/options.cpp
index 7bcc325dab..9bbd16a8f2 100644
--- a/protocols/GTalkExt/src/options.cpp
+++ b/protocols/GTalkExt/src/options.cpp
@@ -25,7 +25,7 @@
 static const LPTSTR ACCOUNT_PROP_NAME = _T("{BF447EBA-27AE-4DB7-893C-FC42A3F74D75}");

 static const LPTSTR DIALOG_INITIALIZED_PROP_NAME = _T("{5EE59FE5-679A-4A29-B0A1-03092E7AC20E}");

 

-static const LPTSTR POPUPS_OPTIONS_GROUP = _T("Popups");

+static const LPTSTR POPUPS_OPTIONS_GROUP = _T("PopUps");

 static const LPTSTR NETWORK_OPTIONS_GROUP = _T("Network");

 

 static const LPSTR NOTIFY_SETTINGS_FROM_MOD_NAME = SHORT_PLUGIN_NAME ".NotifySettingsFromModName";

diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp
index 83dea01ea9..a4c7778507 100644
--- a/protocols/IcqOscarJ/src/icq_opts.cpp
+++ b/protocols/IcqOscarJ/src/icq_opts.cpp
@@ -609,7 +609,7 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM lParam)
 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS);

 		odp.groupPosition = 900000000;

 		odp.pfnDlgProc = DlgProcIcqPopupOpts;

-		odp.ptszGroup = LPGENT("Popups");

+		odp.ptszGroup = LPGENT("PopUps");

 		odp.ptszTab = NULL;

 		Options_AddPage(wParam, &odp);

 	}

diff --git a/protocols/MRA/src/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp
index b9a2a1fdcc..a12d110ebb 100644
--- a/protocols/MRA/src/MraPopUp.cpp
+++ b/protocols/MRA/src/MraPopUp.cpp
@@ -135,7 +135,7 @@ int CMraProto::OnPopupOptInit(WPARAM wParam, LPARAM lParam)
 		odp.hInstance = masMraSettings.hInstance;

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS);

 		odp.pszTitle = m_szModuleName;

-		odp.pszGroup = LPGEN("Popups");

+		odp.pszGroup = LPGEN("PopUps");

 		odp.groupPosition = 900000000;

 		odp.flags = ODPF_BOLDGROUPS;

 		odp.pfnDlgProc = MraPopupDlgProcOpts;

diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index 5cfb37a568..7532c84d86 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -363,7 +363,7 @@ int TwitterProto::OnOptionsInit(WPARAM wParam,LPARAM lParam)
 

 	if(ServiceExists(MS_POPUP_ADDPOPUPT)) 

 	{

-		odp.ptszTab     = LPGENT("Popups");

+		odp.ptszTab     = LPGENT("PopUps");

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_POPUPS);

 		odp.pfnDlgProc  = popup_options_proc;

 		Options_AddPage(wParam, &odp);

diff --git a/src/modules/clist/contacts.cpp b/src/modules/clist/contacts.cpp
index ec1717dfd5..36adf7ed34 100644
--- a/src/modules/clist/contacts.cpp
+++ b/src/modules/clist/contacts.cpp
@@ -494,8 +494,8 @@ static int ContactOptInit(WPARAM wParam, LPARAM)
 	odp.position = -1000000000;

 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONTACT);

-	odp.pszGroup = LPGEN("Customize");

-	odp.pszTitle = LPGEN("Contacts");

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

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

 	odp.pfnDlgProc = ContactOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

diff --git a/src/modules/clist/genmenuopt.cpp b/src/modules/clist/genmenuopt.cpp
index e9e4bff881..515f5f9702 100644
--- a/src/modules/clist/genmenuopt.cpp
+++ b/src/modules/clist/genmenuopt.cpp
@@ -863,11 +863,11 @@ int GenMenuOptInit(WPARAM wParam, LPARAM)
 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.cbSize = sizeof(odp);

 	odp.hInstance = hInst;

-	odp.pszGroup = LPGEN("Customize");

 

 	odp.position = -1000000000;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GENMENU);

 	odp.pszTitle = LPGEN("Menus");

+	odp.pszGroup = LPGEN("Customize");

 	odp.pfnDlgProc = GenMenuOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

@@ -876,6 +876,7 @@ int GenMenuOptInit(WPARAM wParam, LPARAM)
 	odp.groupPosition = 1000000;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_PROTOCOLORDER);

 	odp.pszTitle = LPGEN("Accounts");

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

 	odp.pfnDlgProc = ProtocolOrderOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);

diff --git a/src/modules/icolib/skin2opts.cpp b/src/modules/icolib/skin2opts.cpp
index dc757297df..f6e697aac4 100644
--- a/src/modules/icolib/skin2opts.cpp
+++ b/src/modules/icolib/skin2opts.cpp
@@ -1045,7 +1045,6 @@ int SkinOptionsInit(WPARAM wParam, LPARAM)
 	odp.position = -180000000;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICOLIB);

 	odp.pszTitle = LPGEN("Icons");

-	odp.pszGroup = LPGEN("Customize");

 	odp.pfnDlgProc = DlgProcIcoLibOpts;

 	Options_AddPage(wParam, &odp);

 	return 0;

diff --git a/src/modules/ignore/ignore.cpp b/src/modules/ignore/ignore.cpp
index 8b93c9bdf4..728a33c632 100644
--- a/src/modules/ignore/ignore.cpp
+++ b/src/modules/ignore/ignore.cpp
@@ -338,7 +338,7 @@ static int IgnoreOptInitialise(WPARAM wParam, LPARAM)
 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_IGNORE);

 	odp.pszTitle = LPGEN("Ignore");

-	odp.pszGroup = LPGEN("Events");

+	odp.pszGroup = LPGEN("Contacts");

 	odp.pfnDlgProc = DlgProcIgnoreOpts;

 	odp.flags = ODPF_BOLDGROUPS;

 	Options_AddPage(wParam, &odp);