End of zoo with popup options names

17 files changed, 45 insertions, 45 deletions

diff --git a/plugins/AvatarHistory/res/AvatarHistory.rc b/plugins/AvatarHistory/res/AvatarHistory.rc
index 7f5c8ac3aa..2b0a5a3e34 100644
--- a/plugins/AvatarHistory/res/AvatarHistory.rc
+++ b/plugins/AvatarHistory/res/AvatarHistory.rc
@@ -84,8 +84,8 @@ BEGIN
     LTEXT           "Text color",IDC_TEXTCOLOR_L,55,59,89,8

     CONTROL         "Use Windows colors",IDC_WINCOLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,74,132,10

     CONTROL         "Use default colors",IDC_DEFAULTCOLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,84,132,10

-    GROUPBOX        "Delay",IDC_DELAY_G,166,25,145,75

-    CONTROL         "From popup plugin",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP,174,38,131,10

+    GROUPBOX        "Timeout",IDC_DELAY_G,166,25,145,75

+    CONTROL         "Default",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP,174,38,131,10

     CONTROL         "Custom",IDC_DELAYCUSTOM,"Button",BS_AUTORADIOBUTTON,174,52,131,10

     CONTROL         "Permanent",IDC_DELAYPERMANENT,"Button",BS_AUTORADIOBUTTON,174,82,131,10

     EDITTEXT        IDC_DELAY,208,65,31,14,ES_AUTOHSCROLL | ES_NUMBER

diff --git a/plugins/BuddyExpectator/res/BuddyExpectator.rc b/plugins/BuddyExpectator/res/BuddyExpectator.rc
index 609d06196e..2a5818e51f 100644
--- a/plugins/BuddyExpectator/res/BuddyExpectator.rc
+++ b/plugins/BuddyExpectator/res/BuddyExpectator.rc
@@ -92,7 +92,7 @@ BEGIN
     LTEXT           "Text",IDC_STATIC,17,34,46,8

     CONTROL         "",IDC_COLOR_BGR,"ColourPicker",WS_TABSTOP,61,17,26,12

     CONTROL         "",IDC_COLOR_FRG,"ColourPicker",WS_TABSTOP,61,32,26,12

-    CONTROL         "Use Popups colors",IDC_COLORS_POPUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,17,141,12

+    CONTROL         "Use default colors",IDC_COLORS_POPUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,17,141,12

     CONTROL         "Use Windows colors",IDC_COLORS_WIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,94,33,141,9

     GROUPBOX        "Delay",IDC_STATIC,7,50,237,52

     CONTROL         "Default",IDC_DELAY_DEF,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,18,61,217,10

diff --git a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
index 277de6bc88..0509157c06 100644
--- a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
+++ b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
@@ -186,9 +186,9 @@ BEGIN
     GROUPBOX        "Colors",IDC_GROUP_COLOURS,2,2,91,72,WS_GROUP

     CONTROL         "Use default colors",IDC_RADIO_COLOURS_POPUP,"Button",

                     BS_AUTORADIOBUTTON,6,12,82,10

-    CONTROL         "Windows colors",IDC_RADIO_COLOURS_WINDOWS,"Button",

+    CONTROL         "Use Windows colors",IDC_RADIO_COLOURS_WINDOWS,"Button",

                     BS_AUTORADIOBUTTON,6,23,82,10

-    CONTROL         "Custom colors",IDC_RADIO_COLOURS_CUSTOM,"Button",

+    CONTROL         "Use custom colors",IDC_RADIO_COLOURS_CUSTOM,"Button",

                     BS_AUTORADIOBUTTON,6,34,82,10

     CTEXT           "Back",IDC_STATIC,8,46,39,8

     CONTROL         "Custom1",IDC_CUSTOM_BACK,"ColourPicker",WS_TABSTOP,12,

@@ -197,7 +197,7 @@ BEGIN
     CONTROL         "Custom1",IDC_CUSTOM_TEXT,"ColourPicker",WS_TABSTOP,56,

                     55,29,14

     GROUPBOX        "Timeout",IDC_GROUP_TIMEOUT,95,2,91,72,WS_GROUP

-    CONTROL         "From popup plugin",IDC_RADIO_TIMEOUT_POPUP,"Button",

+    CONTROL         "Default",IDC_RADIO_TIMEOUT_POPUP,"Button",

                     BS_AUTORADIOBUTTON,99,12,82,10

     CONTROL         "Permanent",IDC_RADIO_TIMEOUT_PERMANENT,"Button",

                     BS_AUTORADIOBUTTON,99,23,82,10

diff --git a/plugins/ProxySwitch/res/resource.rc b/plugins/ProxySwitch/res/resource.rc
index 4448bb9588..8d9dd4e1d6 100644
--- a/plugins/ProxySwitch/res/resource.rc
+++ b/plugins/ProxySwitch/res/resource.rc
@@ -88,7 +88,7 @@ BEGIN
     CONTROL         "Text color",IDC_STATIC,"Static",SS_SIMPLE,215,94,75,8
     CONTROL         "",IDC_BGCOLOR,"ColourPicker",WS_TABSTOP,168,111,39,11
     CONTROL         "Background color",IDC_STATIC,"Static",SS_SIMPLE,215,111,75,8
-    CONTROL         "Use default popup colors",IDC_CHECK_DEFAULTCOLORS,
+    CONTROL         "Use default colors",IDC_CHECK_DEFAULTCOLORS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,129,122,10
     CONTROL         "Show proxy status on change",IDC_CHECK_SHOWPROXYSTATUS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,143,123,10
diff --git a/plugins/Spamotron/res/spamotron.rc b/plugins/Spamotron/res/spamotron.rc
index 6cbc5e2660..4f67daf1c9 100644
--- a/plugins/Spamotron/res/spamotron.rc
+++ b/plugins/Spamotron/res/spamotron.rc
@@ -219,8 +219,8 @@ BEGIN
     CONTROL         "",IDC_OPT_POPUPS_CHALLENGE_FOREGROUND,"ColourPicker",WS_TABSTOP,126,99,50,10

     CONTROL         "",IDC_OPT_POPUPS_CHALLENGE_BACKGROUND,"ColourPicker",WS_TABSTOP,184,99,50,10

     EDITTEXT        IDC_OPT_POPUPS_CHALLENGE_TIMEOUT,248,98,28,12,ES_CENTER | ES_AUTOHSCROLL

-    CONTROL         "Default colors",IDC_OPT_POPUPS_DEFAULT_COLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,149,168,10

-    CONTROL         "Windows colors",IDC_OPT_POPUPS_WINDOWS_COLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,163,168,10

+    CONTROL         "Use default colors",IDC_OPT_POPUPS_DEFAULT_COLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,149,168,10

+    CONTROL         "Use Windows colors",IDC_OPT_POPUPS_WINDOWS_COLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,163,168,10

     CONTROL         "Default timeout",IDC_OPT_POPUPS_DEFAULT_TIMEOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,210,149,83,10

     PUSHBUTTON      "Preview",IDC_OPT_POPUPS_PREVIEW,227,198,66,14

 END

diff --git a/plugins/StatusManager/res/resource.rc b/plugins/StatusManager/res/resource.rc
index 7eef85bad0..ff00f4025d 100644
--- a/plugins/StatusManager/res/resource.rc
+++ b/plugins/StatusManager/res/resource.rc
@@ -236,7 +236,7 @@ BEGIN
     LTEXT           "Text color",IDC_STATIC,59,41,69,8
     CONTROL         "Use Windows colors",IDC_WINCOLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,56,113,10
     CONTROL         "Use default colors",IDC_DEFAULTCOLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,66,113,10
-    GROUPBOX        "Delay",IDC_STATIC,137,7,122,52
+    GROUPBOX        "Timeout",IDC_STATIC,137,7,122,52
     EDITTEXT        IDC_DELAY,234,30,20,14,ES_AUTOHSCROLL | ES_NUMBER
     GROUPBOX        "On left click",IDC_STATIC,7,84,126,51
     GROUPBOX        "On right click",IDC_STATIC,137,84,122,51,WS_GROUP
@@ -255,7 +255,7 @@ BEGIN
     CONTROL         "Show when reconnection has finished",IDC_PURESULT,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,177,239,10
     CONTROL         "Show other messages",IDC_PUOTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,189,239,10
-    CONTROL         "From popup plugin",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP,143,19,111,10
+    CONTROL         "Default",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP,143,19,111,10
     CONTROL         "Custom",IDC_DELAYCUSTOM,"Button",BS_AUTORADIOBUTTON,143,32,85,10
     CONTROL         "Permanent",IDC_DELAYPERMANENT,"Button",BS_AUTORADIOBUTTON,143,45,111,10
     CONTROL         "Show additional information in popups",IDC_PUSHOWEXTRA,
diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc
index 931e2c4948..37aaa4797b 100644
--- a/plugins/TabSRMM/res/resource.rc
+++ b/plugins/TabSRMM/res/resource.rc
@@ -89,11 +89,11 @@ BEGIN
     LTEXT           "Message",IDC_STATIC,11,181,44,13

     CONTROL         "",IDC_COLTEXT_MESSAGE,"ColourPicker",WS_TABSTOP,56,179,24,13

     CONTROL         "",IDC_COLBACK_MESSAGE,"ColourPicker",WS_TABSTOP,92,179,24,13

-    CONTROL         "Default colors",IDC_CHKDEFAULTCOL_MESSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,179,72,12

+    CONTROL         "Use default colors",IDC_CHKDEFAULTCOL_MESSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,179,72,12

     LTEXT           "Others",IDC_STATIC,12,197,44,11

     CONTROL         "",IDC_COLTEXT_OTHERS,"ColourPicker",WS_TABSTOP,56,195,24,13

     CONTROL         "",IDC_COLBACK_OTHERS,"ColourPicker",WS_TABSTOP,92,195,24,13

-    CONTROL         "Default colors",IDC_CHKDEFAULTCOL_OTHERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,195,72,12

+    CONTROL         "Use default colors",IDC_CHKDEFAULTCOL_OTHERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,195,72,12

     EDITTEXT        IDC_DELAY_MESSAGE,210,179,46,12,ES_AUTOHSCROLL | ES_NUMBER

     CONTROL         "",IDC_DELAY_MESSAGE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,197,179,9,13

     EDITTEXT        IDC_DELAY_OTHERS,210,195,46,12,ES_AUTOHSCROLL | ES_NUMBER

@@ -102,14 +102,14 @@ BEGIN
     CONTROL         "",IDC_EVENTOPTIONS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,6,8,303,109

     CONTROL         "",IDC_COLTEXT_MUC,"ColourPicker",WS_TABSTOP,56,211,24,13

     CONTROL         "",IDC_COLBACK_MUC,"ColourPicker",WS_TABSTOP,92,211,24,13

-    CONTROL         "Default colors",IDC_CHKDEFAULTCOL_MUC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,211,72,12

+    CONTROL         "Use default colors",IDC_CHKDEFAULTCOL_MUC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,211,72,12

     LTEXT           "Group chats",IDC_STATIC,12,212,44,11

     EDITTEXT        IDC_DELAY_MUC,210,211,46,12,ES_AUTOHSCROLL | ES_NUMBER

     CONTROL         "",IDC_DELAY_MESSAGE_MUC_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,253,211,9,13

     LTEXT           "Errors",IDC_STATIC,12,227,44,11

     CONTROL         "",IDC_COLTEXT_ERR,"ColourPicker",WS_TABSTOP,56,227,24,13

     CONTROL         "",IDC_COLBACK_ERR,"ColourPicker",WS_TABSTOP,92,227,24,13

-    CONTROL         "Default colors",IDC_CHKDEFAULTCOL_ERR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,227,72,12

+    CONTROL         "Use default colors",IDC_CHKDEFAULTCOL_ERR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,227,72,12

     EDITTEXT        IDC_DELAY_ERR,210,227,46,12,ES_AUTOHSCROLL | ES_NUMBER

     CONTROL         "",IDC_DELAY_ERR_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,253,227,9,13

     CONTROL         "Use the message log color theme for group chat popups",IDC_MUC_LOGCOLORS,

@@ -413,8 +413,8 @@ BEGIN
     CONTROL         "",IDC_TYPEON_TX,"ColourPicker",WS_TABSTOP,120,33,24,12

     CONTROL         "",IDC_TYPEOFF_BG,"ColourPicker",WS_TABSTOP,58,59,24,12

     CONTROL         "",IDC_TYPEOFF_TX,"ColourPicker",WS_TABSTOP,120,59,24,12

-    CONTROL         "U&se Popup colors",IDC_USEPOPUPCOLORS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,71,235,13

-    CONTROL         "&Use Windows colors",IDC_USEWINCOLORS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,84,242,13

+    CONTROL         "Use &default colors",IDC_USEPOPUPCOLORS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,71,235,13

+    CONTROL         "Use &Windows colors",IDC_USEWINCOLORS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,84,242,13

     CONTROL         "Only &one popup for each contact",IDC_ONEPOPUP,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,109,250,13

     CONTROL         "Show &entry in the main menu",IDC_SHOWMENU,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,122,247,13

     GROUPBOX        "...is typing",IDC_STATIC,8,151,148,58,WS_GROUP

diff --git a/plugins/TrafficCounter/res/resource.rc b/plugins/TrafficCounter/res/resource.rc
index 0036ea1d2c..8d643e05da 100644
--- a/plugins/TrafficCounter/res/resource.rc
+++ b/plugins/TrafficCounter/res/resource.rc
@@ -70,7 +70,7 @@ BEGIN
     CONTROL         "",IDC_COLOR2,"ColourPicker",WS_TABSTOP,242,28,33,12

     PUSHBUTTON      "Reset to default",IDC_RESETCOLORS,178,44,97,14

     GROUPBOX        "Popup timeout",IDC_STATIC,10,62,110,41

-    CONTROL         "From popup plugin",IDC_RADIO_FROMPOPUP,"Button",BS_AUTORADIOBUTTON,14,73,101,10

+    CONTROL         "Default",IDC_RADIO_FROMPOPUP,"Button",BS_AUTORADIOBUTTON,14,73,101,10

     CONTROL         "Custom",IDC_RADIO_CUSTOM,"Button",BS_AUTORADIOBUTTON,14,88,73,10

     EDITTEXT        IDC_POPUP_TIMEOUT,90,85,24,14,ES_AUTOHSCROLL | ES_NUMBER

     PUSHBUTTON      "Test",IDC_TEST,251,93,50,11

diff --git a/plugins/UserInfoEx/res/resource.rc b/plugins/UserInfoEx/res/resource.rc
index aeeb744501..78e56a0e97 100644
--- a/plugins/UserInfoEx/res/resource.rc
+++ b/plugins/UserInfoEx/res/resource.rc
@@ -222,8 +222,8 @@ BEGIN
     LTEXT           "Text color",TXT_OPT_POPUP_CLR_TEXT,66,85,80,8

     CONTROL         "Use Windows colors",CHECK_OPT_POPUP_WINCLR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,101,114,10

     CONTROL         "Use default colors",CHECK_OPT_POPUP_DEFCLR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,114,114,10

-    GROUPBOX        "Delay",IDC_STATIC,176,132,108,58,WS_GROUP

-    CONTROL         "From popup plugin",RADIO_OPT_POPUP_DEFAULT,"Button",BS_AUTORADIOBUTTON,182,146,96,10

+    GROUPBOX        "Timeout",IDC_STATIC,176,132,108,58,WS_GROUP

+    CONTROL         "Default",RADIO_OPT_POPUP_DEFAULT,"Button",BS_AUTORADIOBUTTON,182,146,96,10

     CONTROL         "Custom",RADIO_OPT_POPUP_CUSTOM,"Button",BS_AUTORADIOBUTTON,182,160,59,10

     CONTROL         "Permanent",RADIO_OPT_POPUP_PERMANENT,"Button",BS_AUTORADIOBUTTON,182,175,96,10

     EDITTEXT        EDIT_DELAY,246,159,33,14,ES_RIGHT | ES_AUTOHSCROLL

diff --git a/plugins/Watrack/popup/popup.rc b/plugins/Watrack/popup/popup.rc
index c23ebe1d1b..4ad7436a65 100644
--- a/plugins/Watrack/popup/popup.rc
+++ b/plugins/Watrack/popup/popup.rc
@@ -13,9 +13,9 @@ FONT 8, "MS Shell Dlg", 400, 0
  GROUPBOX        "Colors", -1, 4, 18, 144, 74

  CTEXT           "Background", -1, 24, 64, 50, 8

  CTEXT           "Text"      , -1, 84, 64, 50, 8

- AUTORADIOBUTTON "Default colors", IDC_COLORDEF , 12, 28, 88, 10, NOT WS_TABSTOP

- AUTORADIOBUTTON "Windows colors", IDC_COLORWIN , 12, 40, 88, 10, NOT WS_TABSTOP

- AUTORADIOBUTTON "Custom colors" , IDC_COLORCUST, 12, 52, 88, 10, NOT WS_TABSTOP

+ AUTORADIOBUTTON "Use default colors", IDC_COLORDEF , 12, 28, 88, 10, NOT WS_TABSTOP

+ AUTORADIOBUTTON "Use Windows colors", IDC_COLORWIN , 12, 40, 88, 10, NOT WS_TABSTOP

+ AUTORADIOBUTTON "Use custom colors" , IDC_COLORCUST, 12, 52, 88, 10, NOT WS_TABSTOP

  CONTROL         "", IDC_BACK, "ColourPicker", WS_TABSTOP, 24, 75, 50, 14

  CONTROL         "", IDC_FORE, "ColourPicker", WS_TABSTOP, 84, 75, 50, 14

 

diff --git a/plugins/WhoUsesMyFiles/res/resource.rc b/plugins/WhoUsesMyFiles/res/resource.rc
index ae02eca06a..c077b8bc72 100644
--- a/plugins/WhoUsesMyFiles/res/resource.rc
+++ b/plugins/WhoUsesMyFiles/res/resource.rc
@@ -41,19 +41,19 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

     GROUPBOX        "Popup delay settings",IDC_STATIC,9,9,153,93,WS_GROUP

     EDITTEXT        IDC_DELAY_SEC,17,23,20,12,ES_AUTOHSCROLL | ES_NUMBER

-    LTEXT           "Popup Delay (seconds)",IDC_TX_DELAY_SEC,39,25,94,8

+    LTEXT           "Timeout (seconds)",IDC_TX_DELAY_SEC,39,25,94,8

     CONTROL         "",IDC_COLOR_BACK,"ColourPicker",WS_TABSTOP,187,24,39,12

     LTEXT           "Background color",IDC_STATIC,231,26,76,8,SS_CENTERIMAGE | NOT WS_GROUP

     CONTROL         "",IDC_COLOR_TEXT,"ColourPicker",WS_TABSTOP,187,39,39,12

     LTEXT           "Text color",IDC_STATIC,231,42,76,8,SS_CENTERIMAGE | NOT WS_GROUP

     PUSHBUTTON      "Previe&w",IDC_PREVIEW,270,231,50,15

     CONTROL         "Show infinitely",IDC_DELAY_INF,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,50,137,10

-    CONTROL         "Default Popup delay",IDC_DELAY_DEF,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,61,137,10

-    CONTROL         "Choose delay time",IDC_DELAY_SET,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,39,137,10

+    CONTROL         "Default",IDC_DELAY_DEF,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,61,137,10

+    CONTROL         "Custom",IDC_DELAY_SET,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,39,137,10

     GROUPBOX        "Popup color settings",IDC_STATIC,167,9,153,93,WS_GROUP

-    CONTROL         "Use windows colors",IDC_COLOR_WIN,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,63,125,10

-    CONTROL         "Use default Popup colors",IDC_COLOR_DEF,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,74,125,10

-    CONTROL         "Choose colors",IDC_COLOR_SET,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,52,125,10

+    CONTROL         "Use Windows colors",IDC_COLOR_WIN,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,63,125,10

+    CONTROL         "Use default colors",IDC_COLOR_DEF,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,74,125,10

+    CONTROL         "Use custom colors",IDC_COLOR_SET,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,52,125,10

     GROUPBOX        "File access filter && logging settings",IDC_STATIC,9,106,311,101

     EDITTEXT        IDC_FILE,83,123,210,12,ES_AUTOHSCROLL,WS_EX_ACCEPTFILES

     PUSHBUTTON      "...",IDC_SEL_FILE,299,123,14,12

diff --git a/protocols/ConnectionNotify/res/ConnectionNotify.rc b/protocols/ConnectionNotify/res/ConnectionNotify.rc
index 02c9c74d0a..00b4a96490 100644
--- a/protocols/ConnectionNotify/res/ConnectionNotify.rc
+++ b/protocols/ConnectionNotify/res/ConnectionNotify.rc
@@ -22,7 +22,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
     AUTOCHECKBOX    "Set popup colors", IDC_SETCOLOURS, 20, 174, 132, 10, WS_GROUP | BS_PUSHLIKE
     CONTROL         "Custom1", IDC_BGCOLOR, "ColourPicker", 0x50030000, 18, 185, 10, 10
     CONTROL         "Custom1", IDC_FGCOLOR, "ColourPicker", 0x50030000, 78, 185, 10, 9
-    GROUPBOX        "Popup options", IDC_STATIC, 10, 164, 187, 52, WS_GROUP
+    GROUPBOX        "Use default colors", IDC_STATIC, 10, 164, 187, 52, WS_GROUP
     LTEXT           "Background", IDC_STATIC, 34, 186, 43, 8, SS_LEFT
     LTEXT           "Text", IDC_STATIC, 94, 186, 41, 8, SS_LEFT
     EDITTEXT        IDC_INTERVAL1, 60, 195, 21, 12, WS_GROUP | ES_AUTOHSCROLL
diff --git a/protocols/CurrencyRates/res/Forex.rc b/protocols/CurrencyRates/res/Forex.rc
index 3d55d1d363..e62a62d4e6 100644
--- a/protocols/CurrencyRates/res/Forex.rc
+++ b/protocols/CurrencyRates/res/Forex.rc
@@ -185,19 +185,19 @@ END
 
 IDD_DIALOG_POPUP DIALOGEX 0, 0, 319, 160
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Popup Window Settings"
+CAPTION "Popup settings"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     GROUPBOX        "Colors",IDC_STATIC,7,7,149,82,WS_GROUP
     CONTROL         "Use default colors",IDC_RADIO_DEFAULT_COLOURS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,15,20,82,10
-    CONTROL         "Use user-defined colors",IDC_RADIO_USER_DEFINED_COLOURS,
+    CONTROL         "Use custom colors",IDC_RADIO_USER_DEFINED_COLOURS,
                     "Button",BS_AUTORADIOBUTTON,15,34,97,10
     LTEXT           "Background color",IDC_STATIC,70,53,66,8
     CONTROL         "",IDC_BGCOLOR,"ColourPicker",WS_TABSTOP,26,49,35,14
     LTEXT           "Text color",IDC_STATIC,70,71,66,8
     CONTROL         "",IDC_TEXTCOLOR,"ColourPicker",WS_TABSTOP,26,67,35,14
-    GROUPBOX        "Delay",IDC_STATIC,162,6,149,82,WS_GROUP
-    CONTROL         "From popup plugin",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,174,20,90,10
+    GROUPBOX        "Timeout",IDC_STATIC,162,6,149,82,WS_GROUP
+    CONTROL         "Default",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,174,20,90,10
     CONTROL         "Custom",IDC_DELAYCUSTOM,"Button",BS_AUTORADIOBUTTON,174,35,70,10
     CONTROL         "Permanent",IDC_DELAYPERMANENT,"Button",BS_AUTORADIOBUTTON,174,50,50,10
     EDITTEXT        IDC_DELAY,252,33,35,14,ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
diff --git a/protocols/Twitter/res/twitter.rc b/protocols/Twitter/res/twitter.rc
index f16fe948e6..567ea1fd01 100644
--- a/protocols/Twitter/res/twitter.rc
+++ b/protocols/Twitter/res/twitter.rc
@@ -102,14 +102,14 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,7,137,10

     GROUPBOX        "Colors",IDC_STATIC,6,32,164,59

     CONTROL         "Use Windows colors",IDC_COL_WINDOWS,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,46,79,10

-    CONTROL         "Use Popup colors",IDC_COL_POPUP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,60,71,10

+    CONTROL         "Use default colors",IDC_COL_POPUP,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,60,71,10

     CONTROL         "Use custom colors",IDC_COL_CUSTOM,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,16,74,73,10

     LTEXT           "Back",IDC_STATIC,103,64,16,8

     LTEXT           "Text",IDC_STATIC,136,64,16,8

     CONTROL         "",IDC_COLBACK,"ColourPicker",WS_TABSTOP,99,73,24,13

     CONTROL         "",IDC_COLTEXT,"ColourPicker",WS_TABSTOP,132,73,24,13

-    GROUPBOX        "Timeouts",IDC_STATIC,184,32,115,59

-    CONTROL         "Use default",IDC_TIMEOUT_DEFAULT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,196,46,53,10

+    GROUPBOX        "Timeout",IDC_STATIC,184,32,115,59

+    CONTROL         "Default",IDC_TIMEOUT_DEFAULT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,196,46,53,10

     CONTROL         "Custom",IDC_TIMEOUT_CUSTOM,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,196,60,40,10

     EDITTEXT        IDC_TIMEOUT,249,58,40,14,ES_AUTOHSCROLL

     CONTROL         "",IDC_TIMEOUT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,279,58,10,14

diff --git a/protocols/Weather/res/resource.rc b/protocols/Weather/res/resource.rc
index 9841527018..68493791d9 100644
--- a/protocols/Weather/res/resource.rc
+++ b/protocols/Weather/res/resource.rc
@@ -149,11 +149,11 @@ BEGIN
     CONTROL         "",IDC_LeftClick,"MButtonClass",WS_TABSTOP,59,76,95,9,WS_EX_NOACTIVATE | 0x10000000L
     LTEXT           "Right Click",IDC_STATIC,13,93,42,8
     CONTROL         "",IDC_RightClick,"MButtonClass",WS_TABSTOP,59,92,95,9,WS_EX_NOACTIVATE | 0x10000000L
-    GROUPBOX        "Popup Delay",IDC_STATIC,167,63,141,46
-    CONTROL         "Delay",IDC_PD3,"Button",BS_AUTORADIOBUTTON,177,74,53,8
+    GROUPBOX        "Popup timeout",IDC_STATIC,167,63,141,46
+    CONTROL         "Timeout",IDC_PD3,"Button",BS_AUTORADIOBUTTON,177,74,53,8
     EDITTEXT        IDC_DELAY,233,73,36,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_BORDER,WS_EX_STATICEDGE
     LTEXT           "seconds",IDC_STATIC,272,73,34,10
-    CONTROL         "From popup plugin",IDC_PD1,"Button",BS_AUTORADIOBUTTON,177,85,110,8
+    CONTROL         "Default",IDC_PD1,"Button",BS_AUTORADIOBUTTON,177,85,110,8
     CONTROL         "Permanent",IDC_PD2,"Button",BS_AUTORADIOBUTTON,177,96,110,8
     GROUPBOX        "Popup Text",IDC_STATIC,3,112,305,121
     LTEXT           "Popup Title",IDC_STATIC,15,124,56,9
diff --git a/protocols/Weather/src/weather_popup.cpp b/protocols/Weather/src/weather_popup.cpp
index 41f95eb743..b19d36f67e 100644
--- a/protocols/Weather/src/weather_popup.cpp
+++ b/protocols/Weather/src/weather_popup.cpp
@@ -366,7 +366,7 @@ INT_PTR CALLBACK DlgPopupOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
 			break;
 
 		case IDC_PD1:
-			// Popup delay setting from Popup plugin
+			// Popup delay setting from popup plugin
 			SetDlgItemText(hdlg, IDC_DELAY, L"0");
 			CheckRadioButton(hdlg, IDC_PD1, IDC_PD3, IDC_PD1);
 			break;
diff --git a/protocols/WebView/res/webview.rc b/protocols/WebView/res/webview.rc
index 0d92123c31..08eaefbf30 100644
--- a/protocols/WebView/res/webview.rc
+++ b/protocols/WebView/res/webview.rc
@@ -282,15 +282,15 @@ EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     ////
-    GROUPBOX        "Popup delay",IDC_STATIC,8,5,150,54,WS_GROUP
-    //CONTROL         "Delay",IDC_PD3,"Button",BS_AUTORADIOBUTTON,18,15,47,8
+    GROUPBOX        "Popup timeout",IDC_STATIC,8,5,150,54,WS_GROUP
+    //CONTROL         "Timeout",IDC_PD3,"Button",BS_AUTORADIOBUTTON,18,15,47,8
     LTEXT  "Delay",IDC_STATIC,18,15,47,8
     EDITTEXT        IDC_DELAY,65,15,31,9,ES_RIGHT | ES_AUTOHSCROLL |
         ES_NUMBER | NOT WS_BORDER,WS_EX_STATICEDGE
     LTEXT  "seconds",IDC_STATIC,106,15,34,10
-    //CONTROL         "From popup plugin",IDC_PD1,"Button",BS_AUTORADIOBUTTON,
+    //CONTROL         "Default",IDC_PD1,"Button",BS_AUTORADIOBUTTON,
     //    18,30,110,12
-    CONTROL         "From popup plugin",IDC_PD1,"MButtonClass",WS_TABSTOP,
+    CONTROL         "Default",IDC_PD1,"MButtonClass",WS_TABSTOP,
         18,30,110,12
     //CONTROL         "Permanent",IDC_PD2,"Button",BS_AUTORADIOBUTTON,18,45,
     //    110,12