diff options
| author | Dart Raiden <wowemuh@gmail.com> | 2013-10-04 21:25:35 +0000 |
|---|---|---|
| committer | Dart Raiden <wowemuh@gmail.com> | 2013-10-04 21:25:35 +0000 |
| commit | fd97221013c50fbbb7c1cd99e8e7263d439d4297 (patch) | |
| tree | 3424ea7a28f647164351d82107050d3e6cc3f867 | |
| parent | c9ea7bb778203113dc40e3afe46a144dedfcff24 (diff) | |
plugins: "colour" eliminated
git-svn-id: http://svn.miranda-ng.org/main/trunk@6333 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
31 files changed, 91 insertions, 91 deletions
diff --git a/plugins/!NotAdopted/mDynDNS/resource.rc b/plugins/!NotAdopted/mDynDNS/resource.rc index 682ce500b3..7b1253f7f2 100644 --- a/plugins/!NotAdopted/mDynDNS/resource.rc +++ b/plugins/!NotAdopted/mDynDNS/resource.rc @@ -55,13 +55,13 @@ BEGIN CONTROL "&From Popup plugin",IDC_DELAY_POPUP,"Button",BS_AUTORADIOBUTTON,167,96,131,10
CONTROL "P&ermanent",IDC_DELAY_PERMANENT,"Button",BS_AUTORADIOBUTTON,167,81,131,10
EDITTEXT IDC_DELAY,268,64,21,12,ES_AUTOHSCROLL | ES_NUMBER
- GROUPBOX "Colours",IDC_STATIC,5,47,147,69
+ GROUPBOX "Colors",IDC_STATIC,5,47,147,69
LTEXT "Back Color",IDC_STATIC,60,54,39,8
LTEXT "Text Color",IDC_STATIC,104,54,39,8
CONTROL "",IDC_COLOR_BKG,"ColourPicker",WS_TABSTOP,59,64,39,12
CONTROL "",IDC_COLOR_TXT,"ColourPicker",WS_TABSTOP,103,64,39,12
CONTROL "Use",IDC_COLOR_CUSTOM,"Button",BS_AUTORADIOBUTTON,13,66,43,10
- CONTROL "Use default colours",IDC_COLOR_POPUP,"Button",BS_AUTORADIOBUTTON,13,96,131,10
+ CONTROL "Use default colors",IDC_COLOR_POPUP,"Button",BS_AUTORADIOBUTTON,13,96,131,10
CONTROL "&Use Windows colors",IDC_COLOR_OS,"Button",BS_AUTORADIOBUTTON,13,81,131,10
PUSHBUTTON "Preview",IDC_PREVIEW,209,166,50,14
END
diff --git a/plugins/AvatarHistory/res/AvatarHistory.rc b/plugins/AvatarHistory/res/AvatarHistory.rc index 1cc924ddfa..7d54d3ca9c 100644 --- a/plugins/AvatarHistory/res/AvatarHistory.rc +++ b/plugins/AvatarHistory/res/AvatarHistory.rc @@ -77,13 +77,13 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN
CONTROL "Show popup when a contact change his avatar",IDC_POPUPS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,3,308,12
- GROUPBOX "Colours",IDC_COLOURS_G,3,25,158,75
+ GROUPBOX "Colors",IDC_COLOURS_G,3,25,158,75
CONTROL "",IDC_BGCOLOR,"ColourPicker",WS_TABSTOP,12,37,34,14
- LTEXT "Background colour",IDC_BGCOLOR_L,55,41,89,8
+ LTEXT "Background color",IDC_BGCOLOR_L,55,41,89,8
CONTROL "",IDC_TEXTCOLOR,"ColourPicker",WS_TABSTOP,12,55,34,14
- LTEXT "Text colour",IDC_TEXTCOLOR_L,55,59,89,8
- CONTROL "Use Windows colours",IDC_WINCOLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,74,132,10
- CONTROL "Use default colours",IDC_DEFAULTCOLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,84,132,10
+ 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
CONTROL "Custom",IDC_DELAYCUSTOM,"Button",BS_AUTORADIOBUTTON,174,52,131,10
diff --git a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc index 769e3d82b6..5afff1dde2 100644 --- a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc +++ b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc @@ -181,12 +181,12 @@ IDD_POPUP_OPTION_FORM DIALOGEX 0, 0, 188, 126 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- GROUPBOX "Colours",IDC_GROUP_COLOURS,2,2,91,72,WS_GROUP
- CONTROL "Popup colours",IDC_RADIO_COLOURS_POPUP,"Button",
+ GROUPBOX "Colors",IDC_GROUP_COLOURS,2,2,91,72,WS_GROUP
+ CONTROL "Popup colors",IDC_RADIO_COLOURS_POPUP,"Button",
BS_AUTORADIOBUTTON,6,12,82,10
- CONTROL "Windows colours",IDC_RADIO_COLOURS_WINDOWS,"Button",
+ CONTROL "Windows colors",IDC_RADIO_COLOURS_WINDOWS,"Button",
BS_AUTORADIOBUTTON,6,23,82,10
- CONTROL "Custom colours",IDC_RADIO_COLOURS_CUSTOM,"Button",
+ CONTROL "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,
diff --git a/plugins/ClientChangeNotify/res/Resources.rc b/plugins/ClientChangeNotify/res/Resources.rc index 1490c390f7..194b3063e3 100644 --- a/plugins/ClientChangeNotify/res/Resources.rc +++ b/plugins/ClientChangeNotify/res/Resources.rc @@ -75,7 +75,7 @@ BEGIN CTEXT "0 = Default",IDC_POPUPOPTDLG_STATIC_DEFAULT,234,84,54,8
CTEXT "-1 = Infinite",IDC_POPUPOPTDLG_STATIC_INFINITE,234,96,
54,8
- GROUPBOX "Colours",-1,6,116,156,48
+ GROUPBOX "Colors",-1,6,116,156,48
CONTROL "",IDC_POPUPOPTDLG_BGCOLOUR,"ColourPicker",WS_TABSTOP,13,
128,19,12
LTEXT "Background",IDC_POPUPOPTDLG_STATIC_BGCOLOUR,37,131,53,8
diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc index 9bd92776f5..567bcc7c50 100644 --- a/plugins/Clist_modern/res/resource.rc +++ b/plugins/Clist_modern/res/resource.rc @@ -125,9 +125,9 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Settings",IDC_STATIC,4,21,226,152
- LTEXT "Background colour:",IDC_BC_STATIC,12,48,72,8,NOT WS_GROUP
+ LTEXT "Background color:",IDC_BC_STATIC,12,48,72,8,NOT WS_GROUP
CONTROL "",IDC_BKGCOLOUR,"ColourPicker",WS_TABSTOP,84,47,32,10
- LTEXT "Selection colour:",IDC_SC_STATIC,12,64,72,8
+ LTEXT "Selection color:",IDC_SC_STATIC,12,64,72,8
CONTROL "",IDC_SELCOLOUR,"ColourPicker",WS_TABSTOP,84,63,32,10
CONTROL "Use background bitmap",IDC_BITMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,81,161,10
EDITTEXT IDC_FILENAME,22,95,184,12,ES_AUTOHSCROLL
@@ -174,7 +174,7 @@ BEGIN GROUPBOX "Object properties",IDC_GROUP_1,127,6,178,49,WS_GROUP
LTEXT "Type",IDC_STATIC,136,18,29,11,NOT WS_GROUP
COMBOBOX IDC_TYPE,168,16,133,69,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- LTEXT "Colour",IDC_ST_COLOUR,136,38,29,11
+ LTEXT "Color",IDC_ST_COLOUR,136,38,29,11
CONTROL "",IDC_COLOR,"ColourPicker",WS_TABSTOP,168,37,41,12
LTEXT "Alpha",IDC_ST_ALPHA,222,38,33,11
EDITTEXT IDC_EDIT_ALPHA,261,37,40,12,ES_NUMBER
diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index 77e12e9bf3..95ed4040ab 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -55,7 +55,7 @@ struct FontOptionsList #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 colours")
+#define CLCCOLOURSGROUP LPGENT("Contact List")_T("/")LPGENT("Special colors")
#define DEFAULT_COLOUR RGB(0, 0, 0)
#define DEFAULT_GREYCOLOUR RGB(128, 128, 128)
@@ -119,7 +119,7 @@ static struct ColourOptionsList colourOptionsList[] = { { "Menu", "SelTextColour", CLCCOLOURSGROUP, LPGENT("Selected menu text"), CLCDEFAULT_MODERN_SELTEXTCOLOUR},
{ "FrameTitleBar", "TextColour", CLCCOLOURSGROUP, LPGENT("Frame title text"), CLCDEFAULT_TEXTCOLOUR },
{ "StatusBar", "TextColour", CLCCOLOURSGROUP, LPGENT("Statusbar text"), CLCDEFAULT_TEXTCOLOUR},
- { "ModernSettings", "KeyColor", CLCCOLOURSGROUP, LPGENT("3rd party frames transparent back colour"), SETTING_KEYCOLOR_DEFAULT},
+ { "ModernSettings", "KeyColor", CLCCOLOURSGROUP, LPGENT("3rd party frames transparent back color"), SETTING_KEYCOLOR_DEFAULT},
};
diff --git a/plugins/Clist_mw/res/resource.rc b/plugins/Clist_mw/res/resource.rc index 11038251a0..03f9c7d27c 100644 --- a/plugins/Clist_mw/res/resource.rc +++ b/plugins/Clist_mw/res/resource.rc @@ -65,9 +65,9 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Settings",IDC_STATIC,4,19,226,141
- LTEXT "Background colour:",IDC_BC_STATIC,12,35,72,8,NOT WS_GROUP
+ LTEXT "Background color:",IDC_BC_STATIC,12,35,72,8,NOT WS_GROUP
CONTROL "",IDC_BKGCOLOUR,"ColourPicker",WS_TABSTOP,84,34,32,10
- LTEXT "Selection colour:",IDC_SC_STATIC,12,51,72,8
+ LTEXT "Selection color:",IDC_SC_STATIC,12,51,72,8
CONTROL "",IDC_SELCOLOUR,"ColourPicker",WS_TABSTOP,84,50,32,10
CONTROL "Use background bitmap",IDC_BITMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,68,161,10
EDITTEXT IDC_FILENAME,22,82,184,12,ES_AUTOHSCROLL
@@ -262,9 +262,9 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Contact List Background",IDC_STATIC,4,4,227,141
- LTEXT "Background colour:",IDC_STATIC,12,20,72,8,NOT WS_GROUP
+ LTEXT "Background color:",IDC_STATIC,12,20,72,8,NOT WS_GROUP
CONTROL "",IDC_BKGCOLOUR,"ColourPicker",WS_TABSTOP,84,19,32,10
- LTEXT "Selection colour:",IDC_STATIC,12,36,72,8
+ LTEXT "Selection color:",IDC_STATIC,12,36,72,8
CONTROL "",IDC_SELCOLOUR,"ColourPicker",WS_TABSTOP,84,35,32,10
CONTROL "Use background bitmap",IDC_BITMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,53,161,10
EDITTEXT IDC_FILENAME,22,67,184,12,ES_AUTOHSCROLL
@@ -310,7 +310,7 @@ BEGIN CONTROL "Right click opens Miranda menu",IDC_RIGHTMIRANDA,"Button",BS_AUTORADIOBUTTON,20,122,142,10
CONTROL "Make sections equal width",IDC_EQUALSECTIONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,141,142,10
CONTROL "",IDC_BKGCOLOUR,"ColourPicker",WS_TABSTOP,100,175,32,10
- LTEXT "Background colour:",IDC_STATIC,20,175,72,8,NOT WS_GROUP
+ LTEXT "Background color:",IDC_STATIC,20,175,72,8,NOT WS_GROUP
PUSHBUTTON "-",IDC_DEFBKCOLOR,135,175,6,10
CONTROL "Show size grip",IDC_SHOWSIZEGRIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,72,142,10
CONTROL "Show bevel effect on panels",IDC_SBPANELBEVEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,86,107,10
diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc index eb3a93d16e..e4d2d95b4d 100644 --- a/plugins/Clist_nicer/res/resource.rc +++ b/plugins/Clist_nicer/res/resource.rc @@ -329,9 +329,9 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Contact List Background",IDC_STATIC,1,4,302,177
- CONTROL "Use Windows colours",IDC_WINCOLOUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,20,282,10
+ CONTROL "Use Windows colors",IDC_WINCOLOUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,20,282,10
CONTROL "",IDC_BKGCOLOUR,"ColourPicker",WS_TABSTOP,22,34,22,10
- LTEXT "Background colour",IDC_STATIC,48,35,246,8,NOT WS_GROUP
+ LTEXT "Background color",IDC_STATIC,48,35,246,8,NOT WS_GROUP
CONTROL "Use background image",IDC_BITMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,57,282,10
EDITTEXT IDC_FILENAME,22,71,184,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_BROWSE,208,72,15,11
diff --git a/plugins/ConnectionNotify/res/ConnectionNotify.rc b/plugins/ConnectionNotify/res/ConnectionNotify.rc index e7e6448d53..93d2f999d3 100644 --- a/plugins/ConnectionNotify/res/ConnectionNotify.rc +++ b/plugins/ConnectionNotify/res/ConnectionNotify.rc @@ -22,7 +22,7 @@ EXSTYLE WS_EX_WINDOWEDGE FONT 8, "Ms Shell Dlg", 400, 0, 1
{
- AUTOCHECKBOX "Set popup colours", IDC_SETCOLOURS, 20, 174, 132, 10, WS_GROUP | BS_PUSHLIKE
+ 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
diff --git a/plugins/DbEditorPP/res/resource.rc b/plugins/DbEditorPP/res/resource.rc index 928df36d06..5c766e606b 100644 --- a/plugins/DbEditorPP/res/resource.rc +++ b/plugins/DbEditorPP/res/resource.rc @@ -74,7 +74,7 @@ BEGIN LTEXT "Put a space or comma between each module name",IDC_STATIC,12,116,286,8
LTEXT "Changes to this list will take effect next time miranda starts",IDC_STATIC,12,189,284,8
RTEXT "Popup timeout (0 for infinite)",IDC_STATIC,35,91,103,8
- RTEXT "Background colour",IDC_STATIC,177,91,77,8
+ RTEXT "Background color",IDC_STATIC,177,91,77,8
LTEXT "If the module name has a space in it, put a \\ before the space. eg ""aaa\\ bbb""",IDC_STATIC,12,127,286,8
END
diff --git a/plugins/FloatingContacts/res/fltcnt.rc b/plugins/FloatingContacts/res/fltcnt.rc index 93468a0337..89e6dfd381 100644 --- a/plugins/FloatingContacts/res/fltcnt.rc +++ b/plugins/FloatingContacts/res/fltcnt.rc @@ -97,7 +97,7 @@ BEGIN RTEXT "Right-bottom edge's color:",IDC_STATIC,116,25,137,8,NOT WS_GROUP,WS_EX_TRANSPARENT
CONTROL "",IDC_RBEDGESCOLOR,"ColourPicker",WS_TABSTOP,257,24,32,10
GROUPBOX "Background",IDC_STATIC,3,54,294,57,0,WS_EX_TRANSPARENT
- LTEXT "Background colour:",IDC_STATIC,13,43,72,8,NOT WS_GROUP,WS_EX_TRANSPARENT
+ LTEXT "Background color:",IDC_STATIC,13,43,72,8,NOT WS_GROUP,WS_EX_TRANSPARENT
CONTROL "",IDC_BKGCOLOUR,"ColourPicker",WS_TABSTOP,87,43,32,10
CONTROL "Use background bitmap",IDC_BITMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,64,137,10,WS_EX_TRANSPARENT
EDITTEXT IDC_FILENAME,154,65,111,12,ES_AUTOHSCROLL
diff --git a/plugins/HistoryLinkListPlus/res/linklist.rc b/plugins/HistoryLinkListPlus/res/linklist.rc index 5c02beeb70..32125e3d6f 100644 --- a/plugins/HistoryLinkListPlus/res/linklist.rc +++ b/plugins/HistoryLinkListPlus/res/linklist.rc @@ -91,19 +91,19 @@ IDD_OPTIONS_DLG DIALOG 0, 0, 314, 240 STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE
FONT 8, "MS Sans Serif"
BEGIN
- GROUPBOX "Colour Select",IDC_STATIC,0,87,252,83
+ GROUPBOX "Color Select",IDC_STATIC,0,87,252,83
LTEXT "Incoming messages",IDC_TXTIN,17,101,85,9
PUSHBUTTON "Plugin Default",IDC_DEFAULT_IN,159,100,65,11
GROUPBOX "Preview",IDC_STATIC,0,181,253,59
LTEXT "Outgoing messages",IDC_TXTOUT,17,115,85,10
- LTEXT "Backgroundcolour",IDC_TXTBG,17,128,85,11
+ LTEXT "Background color",IDC_TXTBG,17,128,85,11
PUSHBUTTON "Plugin Default",IDC_DEFAULT_OUT,159,113,65,11
PUSHBUTTON "Plugin Default",IDC_DEFAULT_BG,159,126,65,11
CONTROL "Use Miranda Settings",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,157,202,10
CONTROL "",IDC_BACKGROUND,"ColourPicker",WS_TABSTOP,115,127,39,10
CONTROL "",IDC_OUTGOING,"ColourPicker",WS_TABSTOP,115,114,39,10
CONTROL "",IDC_INCOMING,"ColourPicker",WS_TABSTOP,115,101,39,10
- LTEXT "Textcolour",IDC_TXTTXT,18,141,85,11
+ LTEXT "Text color",IDC_TXTTXT,18,141,85,11
CONTROL "",IDC_TXT,"ColourPicker",WS_TABSTOP,115,140,39,10
PUSHBUTTON "Plugin Default",IDC_DEFAULT_TXT,159,139,65,11
CONTROL "",IDC_OPTIONS_RE,"RICHEDIT",TCS_RAGGEDRIGHT | TCS_MULTISELECT | WS_DISABLED | WS_TABSTOP,5,191,242,44
diff --git a/plugins/LotusNotify/res/LotusNotify.rc b/plugins/LotusNotify/res/LotusNotify.rc index 1f3666f386..38293712de 100644 --- a/plugins/LotusNotify/res/LotusNotify.rc +++ b/plugins/LotusNotify/res/LotusNotify.rc @@ -53,7 +53,7 @@ BEGIN BS_AUTOCHECKBOX | BS_LEFT | BS_PUSHLIKE | WS_TABSTOP,177,
92,130,10
EDITTEXT IDC_SERVERSEC,75,28,115,11,ES_AUTOHSCROLL
- CONTROL "Set popup colours",IDC_SETCOLOURS,"Button",
+ CONTROL "Set popup colors",IDC_SETCOLOURS,"Button",
BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_GROUP | WS_TABSTOP,17,
76,132,10
CONTROL "Custom1",IDC_BGCOLOR,"ColourPicker",WS_GROUP |
diff --git a/plugins/NewXstatusNotify/res/resource.rc b/plugins/NewXstatusNotify/res/resource.rc index b537e95902..0c64a7d15b 100644 --- a/plugins/NewXstatusNotify/res/resource.rc +++ b/plugins/NewXstatusNotify/res/resource.rc @@ -197,10 +197,10 @@ BEGIN CONTROL "",IDC_OUTTOLUNCH_TX,"ColourPicker",WS_TABSTOP,106,150,24,12
CONTROL "",IDC_ONTHEPHONE_BG,"ColourPicker",WS_TABSTOP,73,166,24,12
CONTROL "",IDC_ONTHEPHONE_TX,"ColourPicker",WS_TABSTOP,106,166,24,12
- GROUPBOX "Colours",IDC_STATIC,143,0,164,44,WS_GROUP
- CONTROL "Use custom colours",IDC_USEOWNCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,149,8,151,13
- CONTROL "Use Windows colours",IDC_USEWINCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,149,30,151,13
- CONTROL "Use Popup colours",IDC_USEPOPUPCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,149,19,151,13
+ GROUPBOX "Colors",IDC_STATIC,143,0,164,44,WS_GROUP
+ CONTROL "Use custom colors",IDC_USEOWNCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,149,8,151,13
+ CONTROL "Use Windows colors",IDC_USEWINCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,149,30,151,13
+ CONTROL "Use Popup colors",IDC_USEPOPUPCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,149,19,151,13
GROUPBOX "Popup text",IDC_STATIC,144,44,164,85,WS_GROUP
CONTROL "Read status message",IDC_READAWAYMSG,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,148,102,151,13
CONTROL "Show previous status too",IDC_SHOWPREVIOUSSTATUS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,148,90,151,13
diff --git a/plugins/PackUpdater/Res/Resource.rc b/plugins/PackUpdater/Res/Resource.rc index cefd5c20d0..312a666717 100644 --- a/plugins/PackUpdater/Res/Resource.rc +++ b/plugins/PackUpdater/Res/Resource.rc @@ -106,10 +106,10 @@ BEGIN CONTROL "",IDC_INFO_MESSAGES_TX,"ColourPicker",WS_TABSTOP,116,44,24,12
CONTROL "",IDC_PROGR_DLG_BG,"ColourPicker",WS_TABSTOP,90,58,24,12
CONTROL "",IDC_PROGR_DLG_TX,"ColourPicker",WS_TABSTOP,116,58,24,12
- GROUPBOX "Colours",IDC_COLORS,178,0,133,44,WS_GROUP
+ GROUPBOX "Colors",IDC_COLORS,178,0,133,44,WS_GROUP
CONTROL "Use cus&tom colors",IDC_USEOWNCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,186,8,122,13
- CONTROL "Use &Windows colours",IDC_USEWINCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,186,30,121,13
- CONTROL "Use Pop&up colours",IDC_USEPOPUPCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,186,19,102,13
+ CONTROL "Use &Windows colors",IDC_USEWINCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,186,30,121,13
+ CONTROL "Use Pop&up colors",IDC_USEPOPUPCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,186,19,102,13
PUSHBUTTON "Preview",IDC_PREVIEW,189,104,57,12
GROUPBOX "Click action",IDC_STATIC,1,83,145,67,WS_GROUP
COMBOBOX IDC_LC,6,103,127,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
diff --git a/plugins/Ping/res/ping.rc b/plugins/Ping/res/ping.rc index a35a795a96..8cd7a2a170 100644 --- a/plugins/Ping/res/ping.rc +++ b/plugins/Ping/res/ping.rc @@ -87,7 +87,7 @@ BEGIN GROUPBOX "Interface",IDC_STATIC,4,84,293,76
CONTROL "Do not change icon when testing",IDC_CHK_NOTESTICON,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,145,181,10
- LTEXT "Use the Customize/Fonts options to change text size and colour.",IDC_STATFS,20,101,174,18
+ LTEXT "Use the Customize/Fonts options to change text size and color.",IDC_STATFS,20,101,174,18
RTEXT "Indent:",IDC_STATIC,44,127,33,8
EDITTEXT IDC_EDIT1,89,124,33,15,ES_AUTOHSCROLL
CONTROL "Spin2",IDC_SP_INDENT,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,121,124,12,15
diff --git a/plugins/PluginUpdater/res/Resource.rc b/plugins/PluginUpdater/res/Resource.rc index 22cb50ebec..626e0d32ad 100644 --- a/plugins/PluginUpdater/res/Resource.rc +++ b/plugins/PluginUpdater/res/Resource.rc @@ -102,10 +102,10 @@ BEGIN CONTROL "",IDC_INFO_MESSAGES_TX,"ColourPicker",WS_TABSTOP,116,44,24,12
CONTROL "",IDC_PROGR_DLG_BG,"ColourPicker",WS_TABSTOP,90,58,24,12
CONTROL "",IDC_PROGR_DLG_TX,"ColourPicker",WS_TABSTOP,116,58,24,12
- GROUPBOX "Colours",IDC_COLORS,178,0,133,44,WS_GROUP
+ GROUPBOX "Colors",IDC_COLORS,178,0,133,44,WS_GROUP
CONTROL "Use cus&tom colors",IDC_USEOWNCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,186,8,122,13
- CONTROL "Use &Windows colours",IDC_USEWINCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,186,30,121,13
- CONTROL "Use Pop&up colours",IDC_USEPOPUPCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,186,19,102,13
+ CONTROL "Use &Windows colors",IDC_USEWINCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,186,30,121,13
+ CONTROL "Use Pop&up colors",IDC_USEPOPUPCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,186,19,102,13
PUSHBUTTON "Preview",IDC_PREVIEW,189,104,57,12
GROUPBOX "Click action",IDC_STATIC,1,83,145,67,WS_GROUP
COMBOBOX IDC_LC,6,103,127,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
diff --git a/plugins/Popup/src/opt_skins.cpp b/plugins/Popup/src/opt_skins.cpp index b9ad9c726d..1512695ab4 100644 --- a/plugins/Popup/src/opt_skins.cpp +++ b/plugins/Popup/src/opt_skins.cpp @@ -206,7 +206,7 @@ static LPTSTR mainOption [] = { LPGENT("Drop shadow effect"),
LPGENT("Drop shadow effect")_T("/")LPGENT("non rectangular"),
LPGENT("Enable Aero Glass (Vista+)"),
- LPGENT("Use Windows colours"),
+ LPGENT("Use Windows colors"),
LPGENT("Use advanced text render")};
int SkinOptionList_AddMain(OPTTREE_OPTION* &options, int *OptionsCount, int pos, DWORD *dwGlobalOptions)
diff --git a/plugins/Quotes/res/Forex.rc b/plugins/Quotes/res/Forex.rc index bbe911f4eb..cb7935cf0f 100644 --- a/plugins/Quotes/res/Forex.rc +++ b/plugins/Quotes/res/Forex.rc @@ -194,13 +194,13 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "Popup Window Settings"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- GROUPBOX "Colours",IDC_STATIC,7,7,149,82,WS_GROUP
- CONTROL "Use default colours",IDC_RADIO_DEFAULT_COLOURS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,15,20,82,10
- CONTROL "Use user-defined colours",IDC_RADIO_USER_DEFINED_COLOURS,
+ 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,
"Button",BS_AUTORADIOBUTTON,15,34,97,10
- LTEXT "Background colour",IDC_STATIC,70,53,66,8
+ LTEXT "Background color",IDC_STATIC,70,53,66,8
CONTROL "",IDC_BGCOLOR,"ColourPicker",WS_TABSTOP,26,49,35,14
- LTEXT "Text colour",IDC_STATIC,70,71,66,8
+ 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,76,10
diff --git a/plugins/Scriver/res/resource.rc b/plugins/Scriver/res/resource.rc index 7d260aa2cd..2172fbe021 100644 --- a/plugins/Scriver/res/resource.rc +++ b/plugins/Scriver/res/resource.rc @@ -409,8 +409,8 @@ BEGIN GROUPBOX "Group Chat",IDC_STATIC,0,0,304,229
CONTROL "Tree1",IDC_CHAT_CHECKBOXES,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_FULLROWSELECT | WS_BORDER | WS_TABSTOP,8,12,288,132
CONTROL "Use same style as in the message log",IDC_CHAT_RADIO1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,8,149,225,10
- CONTROL "Use default colours",IDC_CHAT_RADIO2,"Button",BS_AUTORADIOBUTTON,8,160,200,10
- CONTROL "Use custom colours",IDC_CHAT_RADIO3,"Button",BS_AUTORADIOBUTTON,8,171,200,10
+ CONTROL "Use default colors",IDC_CHAT_RADIO2,"Button",BS_AUTORADIOBUTTON,8,160,200,10
+ CONTROL "Use custom colors",IDC_CHAT_RADIO3,"Button",BS_AUTORADIOBUTTON,8,171,200,10
LTEXT "Text",IDC_STATIC,20,182,200,8
CONTROL "Custom1",IDC_CHAT_TEXT,"ColourPicker",WS_TABSTOP,120,182,40,11,0x18000000L
LTEXT "Background",IDC_STATIC,20,194,67,8
diff --git a/plugins/Scriver/src/chat/colorchooser.cpp b/plugins/Scriver/src/chat/colorchooser.cpp index 179072f0fe..a4a90f4286 100644 --- a/plugins/Scriver/src/chat/colorchooser.cpp +++ b/plugins/Scriver/src/chat/colorchooser.cpp @@ -95,7 +95,7 @@ INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, L pCC->yPosition -= height;
- SetDlgItemText(hwndDlg, IDC_CHAT_COLORTEXT, pCC->bForeground?TranslateT("Text colour"):TranslateT("Background colour"));
+ SetDlgItemText(hwndDlg, IDC_CHAT_COLORTEXT, pCC->bForeground?TranslateT("Text color"):TranslateT("Background color"));
SetWindowPos(GetDlgItem(hwndDlg, IDC_CHAT_COLORTEXT), NULL, 0, 0, width, 20, 0);
SetWindowPos(hwndDlg, NULL, pCC->xPosition, pCC->yPosition, width, height, SWP_SHOWWINDOW);
}
diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp index aa93737fa9..894c8cf188 100644 --- a/plugins/Scriver/src/chat/options.cpp +++ b/plugins/Scriver/src/chat/options.cpp @@ -53,7 +53,7 @@ static struct branch_t branch2[] = { GC_EVENT_KICK|GC_EVENT_NOTICE|GC_EVENT_NICK|GC_EVENT_INFORMATION|GC_EVENT_ADDSTATUS, 0, NULL},
{LPGENT("Prefix all events with a timestamp"), "ShowTimeStamp", 0,1, NULL},
{LPGENT("Only prefix with timestamp if it has changed"), "ShowTimeStampIfChanged", 0,0, NULL},
- {LPGENT("Timestamp has same colour as event"), "TimeStampEventColour", 0,0, NULL},
+ {LPGENT("Timestamp has same color as event"), "TimeStampEventColour", 0,0, NULL},
{LPGENT("Indent the second line of a message"), "LogIndentEnabled", 0,1, NULL},
{LPGENT("Limit user names to 20 characters"), "LogLimitNames", 0,1, NULL},
{LPGENT("Strip colors from messages"), "StripFormatting", 0, 0, NULL},
diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp index ce3d071f5b..8444feee69 100644 --- a/plugins/Scriver/src/globals.cpp +++ b/plugins/Scriver/src/globals.cpp @@ -60,8 +60,8 @@ static IconItem iconList[] = { LPGEN("Notice (10x10)"), "scriver_NOTICE", IDI_NOTICE, 10}, // 16
{ LPGEN("Window Icon"), "chat_window", IDI_CHANMGR }, // 1
- { LPGEN("Text colour"), "chat_fgcol", IDI_COLOR }, // 2
- { LPGEN("Background colour"), "chat_bkgcol", IDI_BKGCOLOR }, // 3
+ { LPGEN("Text color"), "chat_fgcol", IDI_COLOR }, // 2
+ { LPGEN("Background color"), "chat_bkgcol", IDI_BKGCOLOR }, // 3
{ LPGEN("Bold"), "chat_bold", IDI_BBOLD }, // 4
{ LPGEN("Italics"), "chat_italics", IDI_BITALICS }, // 5
{ LPGEN("Underlined"), "chat_underline", IDI_BUNDERLINE }, // 6
diff --git a/plugins/StatusPlugins/resource.rc b/plugins/StatusPlugins/resource.rc index 2c73db2372..7e5979521e 100644 --- a/plugins/StatusPlugins/resource.rc +++ b/plugins/StatusPlugins/resource.rc @@ -188,11 +188,11 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "",IDC_BGCOLOR,"ColourPicker",WS_TABSTOP,15,19,35,14
- LTEXT "Background colour",IDC_STATIC,59,23,66,8
+ LTEXT "Background color",IDC_STATIC,59,23,66,8
CONTROL "",IDC_TEXTCOLOR,"ColourPicker",WS_TABSTOP,15,37,35,14
- LTEXT "Text colour",IDC_STATIC,59,41,66,8
- CONTROL "Use Windows colours",IDC_WINCOLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,56,108,10
- CONTROL "Use default colours",IDC_DEFAULTCOLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,66,107,10
+ LTEXT "Text color",IDC_STATIC,59,41,66,8
+ CONTROL "Use Windows colors",IDC_WINCOLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,56,108,10
+ CONTROL "Use default colors",IDC_DEFAULTCOLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,66,107,10
GROUPBOX "Delay",IDC_STATIC,137,7,110,52
EDITTEXT IDC_DELAY,221,30,20,14,ES_AUTOHSCROLL | ES_NUMBER
GROUPBOX "On left click",IDC_STATIC,7,84,103,51
@@ -203,7 +203,7 @@ BEGIN CONTROL "Do nothing",IDC_RNOTHING,"Button",BS_AUTORADIOBUTTON | WS_GROUP,143,96,78,10
CONTROL "Close popup",IDC_RCLOSE,"Button",BS_AUTORADIOBUTTON,143,108,78,10
CONTROL "Cancel reconnecting",IDC_RCANCEL,"Button",BS_AUTORADIOBUTTON,143,120,94,10
- GROUPBOX "Colours",IDC_STATIC,7,7,126,73
+ GROUPBOX "Colors",IDC_STATIC,7,7,126,73
PUSHBUTTON "Preview",IDC_PREV,137,63,50,14
GROUPBOX "Events",IDC_STATIC,7,140,240,76
CONTROL "Show when connection is lost",IDC_PUCONNLOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,153,226,10
diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc index 5a767e2492..bcc490a850 100644 --- a/plugins/TabSRMM/res/resource.rc +++ b/plugins/TabSRMM/res/resource.rc @@ -446,8 +446,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 colours",IDC_USEPOPUPCOLORS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,71,235,13
- CONTROL "&Use Windows colours",IDC_USEWINCOLORS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,11,84,242,13
+ 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 "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/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp index f641f149c3..08a1407159 100644 --- a/plugins/TabSRMM/src/msgs.cpp +++ b/plugins/TabSRMM/src/msgs.cpp @@ -941,7 +941,7 @@ static TIconDesc _exttoolbaricons[] = static TIconDesc _chattoolbaricons[] =
{
- { "chat_bkgcol",LPGEN("Background colour"), &PluginConfig.g_buttonBarIcons[31] ,-IDI_BKGCOLOR, 1 },
+ { "chat_bkgcol",LPGEN("Background color"), &PluginConfig.g_buttonBarIcons[31] ,-IDI_BKGCOLOR, 1 },
{ "chat_settings",LPGEN("Room settings"), &PluginConfig.g_buttonBarIcons[32],-IDI_TOPICBUT, 1 },
{ "chat_filter",LPGEN("Event filter"), &PluginConfig.g_buttonBarIcons[33] ,-IDI_FILTER2, 1 },
{ "chat_shownicklist",LPGEN("Nick list"),&PluginConfig.g_buttonBarIcons[35] ,-IDI_SHOWNICKLIST, 1 }
diff --git a/plugins/TrafficCounter/res/resource.rc b/plugins/TrafficCounter/res/resource.rc index e2461211b4..c14b8a8aaa 100644 --- a/plugins/TrafficCounter/res/resource.rc +++ b/plugins/TrafficCounter/res/resource.rc @@ -62,9 +62,9 @@ BEGIN CONTROL "Notify me on every",IDC_NOTIFYTIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,30,85,10
EDITTEXT IDC_ENOTIFYTIME,96,28,29,14,ES_AUTOHSCROLL | ES_NUMBER
LTEXT "minutes",IDC_STATIC,129,30,44,8
- LTEXT "Background colour:",IDC_STATIC,178,17,63,8
+ LTEXT "Background color:",IDC_STATIC,178,17,63,8
CONTROL "",IDC_COLOR1,"ColourPicker",WS_TABSTOP,242,14,33,12
- LTEXT "Text colour:",IDC_STATIC,178,30,60,8
+ LTEXT "Text color:",IDC_STATIC,178,30,60,8
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
diff --git a/plugins/UserInfoEx/res/resource.rc b/plugins/UserInfoEx/res/resource.rc index 2d85ebdd24..90af7a75e7 100644 --- a/plugins/UserInfoEx/res/resource.rc +++ b/plugins/UserInfoEx/res/resource.rc @@ -216,13 +216,13 @@ STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- GROUPBOX "Birthday popup colours",IDC_STATIC,25,55,125,73,WS_GROUP
+ GROUPBOX "Birthday popup colors",IDC_STATIC,25,55,125,73,WS_GROUP
CONTROL "r",CLR_BBACK,"ColourPicker",WS_TABSTOP,32,69,29,12
- LTEXT "Background colour",TXT_OPT_POPUP_CLR_BACK,67,70,80,8
+ LTEXT "Background color",TXT_OPT_POPUP_CLR_BACK,67,70,80,8
CONTROL "",CLR_BTEXT,"ColourPicker",WS_TABSTOP,32,84,29,13
- LTEXT "Text colour",TXT_OPT_POPUP_CLR_TEXT,66,85,80,8
- CONTROL "Use Windows colours",CHECK_OPT_POPUP_WINCLR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,101,114,10
- CONTROL "Use default colours",CHECK_OPT_POPUP_DEFCLR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,114,114,10
+ 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
CONTROL "Custom",RADIO_OPT_POPUP_CUSTOM,"Button",BS_AUTORADIOBUTTON,182,160,59,10
@@ -230,13 +230,13 @@ BEGIN EDITTEXT EDIT_DELAY,246,159,33,14,ES_AUTOHSCROLL
CONTROL "Show reminder messages as popups (if reminder is enabled)",CHECK_OPT_POPUP_ENABLED,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,36,267,10
- GROUPBOX "Anniversary popup colours",IDC_STATIC,159,55,125,73,WS_GROUP
+ GROUPBOX "Anniversary popup colors",IDC_STATIC,159,55,125,73,WS_GROUP
CONTROL "r",CLR_ABACK,"ColourPicker",WS_TABSTOP,166,69,29,12
- LTEXT "Background colour",TXT_OPT_POPUP_CLR_ABACK,201,70,80,8
+ LTEXT "Background color",TXT_OPT_POPUP_CLR_ABACK,201,70,80,8
CONTROL "",CLR_ATEXT,"ColourPicker",WS_TABSTOP,166,84,29,13
- LTEXT "Text colour",TXT_OPT_POPUP_CLR_ATEXT,200,85,80,8
- CONTROL "Use Windows colours",CHECK_OPT_POPUP_AWINCLR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,166,101,114,10
- CONTROL "Use default colours",CHECK_OPT_POPUP_ADEFCLR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,166,114,114,10
+ LTEXT "Text color",TXT_OPT_POPUP_CLR_ATEXT,200,85,80,8
+ CONTROL "Use Windows colors",CHECK_OPT_POPUP_AWINCLR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,166,101,114,10
+ CONTROL "Use default colors",CHECK_OPT_POPUP_ADEFCLR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,166,114,114,10
CONTROL "Replace progress dialogs with popups",CHECK_OPT_POPUP_PROGRESS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,22,267,10
CONTROL "Replace message boxes with popups",CHECK_OPT_POPUP_MSGBOX,
@@ -362,7 +362,7 @@ BEGIN LTEXT "Overwritten information",TXT_OPT_CLR_BOTH,46,47,104,8
CONTROL "",CLR_CHANGED,"ColourPicker",WS_TABSTOP,153,45,29,12
LTEXT "Changed information",TXT_OPT_CLR_CHANGED,187,47,96,8
- CONTROL "Enable colours to give information about information's status.",CHECK_OPT_CLR,
+ CONTROL "Enable colors to give information about information's status.",CHECK_OPT_CLR,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,16,271,10
CONTROL "Make protocol based contact information readonly.",CHECK_OPT_READONLY,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,104,271,10
@@ -372,7 +372,7 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,165,271,10
CONTROL "",CLR_META,"ColourPicker",WS_TABSTOP,12,61,29,12
LTEXT "Info of a MetaContact's SubContact",TXT_OPT_CLR_META,46,63,232,8
- GROUPBOX "Colours",IDC_STATIC,3,4,303,74
+ GROUPBOX "Colors",IDC_STATIC,3,4,303,74
GROUPBOX "Common",IDC_STATIC,3,79,303,53
CONTROL "Change my ICQ details with UserInfoEx. (Disabled if ICQ doesn't support it)",CHECK_OPT_CHANGEMYDETAILS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,117,292,10
diff --git a/plugins/Weather/res/resource.rc b/plugins/Weather/res/resource.rc index 6c2757ae90..9ecce9a26e 100644 --- a/plugins/Weather/res/resource.rc +++ b/plugins/Weather/res/resource.rc @@ -138,12 +138,12 @@ BEGIN GROUPBOX "Popup Options",IDC_STATIC,4,5,158,54
CONTROL "Enable popups",IDC_E,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,15,15,143,9
CONTROL "Popup only when condition changes",IDC_CH,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,15,44,140,10
- GROUPBOX "Colours",IDC_STATIC,168,5,139,54
+ GROUPBOX "Colors",IDC_STATIC,168,5,139,54
CONTROL "",IDC_BGCOLOUR,"ColourPicker",WS_TABSTOP,177,16,39,11
- LTEXT "Background colour",IDC_STATIC,223,18,78,8,SS_CENTERIMAGE
+ LTEXT "Background color",IDC_STATIC,223,18,78,8,SS_CENTERIMAGE
CONTROL "",IDC_TEXTCOLOUR,"ColourPicker",WS_TABSTOP,177,30,39,11
- LTEXT "Text colour",IDC_STATIC,223,31,80,8,SS_CENTERIMAGE
- CONTROL "Use Windows colours",IDC_USEWINCOLORS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,177,43,125,13
+ LTEXT "Text color",IDC_STATIC,223,31,80,8,SS_CENTERIMAGE
+ CONTROL "Use Windows colors",IDC_USEWINCOLORS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,177,43,125,13
GROUPBOX "Popup Actions",IDC_STATIC,4,63,157,46
LTEXT "Left Click",IDC_STATIC,13,77,42,8
CONTROL "",IDC_LeftClick,"MButtonClass",WS_TABSTOP,59,76,95,9,WS_EX_NOACTIVATE | 0x10000000L
diff --git a/plugins/YAMN/res/YAMN.rc b/plugins/YAMN/res/YAMN.rc index 3e7c003a64..55336ab9fa 100644 --- a/plugins/YAMN/res/YAMN.rc +++ b/plugins/YAMN/res/YAMN.rc @@ -276,20 +276,20 @@ BEGIN CONTROL "Popup",IDC_CHECKPOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,32,108,10
CONTROL "Single popup",IDC_RADIOPOP1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,23,43,95,10
CONTROL "Multi popup",IDC_RADIOPOPN,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,23,55,95,10
- CONTROL "Use custom colour",IDC_CHECKCOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,83,107,10
+ CONTROL "Use custom color",IDC_CHECKCOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,83,107,10
CONTROL "",IDC_CPB,"ColourPicker",WS_TABSTOP,145,66,29,12
CONTROL "",IDC_CPT,"ColourPicker",WS_TABSTOP,145,83,29,12
EDITTEXT IDC_EDITPOPS,23,65,20,12,ES_AUTOHSCROLL
GROUPBOX "No new mail notifications",IDC_GBNONEWMAIL,5,152,300,62
CONTROL "Popup if no mail",IDC_CHECKNPOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,161,94,10
CONTROL "Persistant message",IDC_CHECKNMSGP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,188,110,10
- CONTROL "Use custom colour",IDC_CHECKNCOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,201,107,10
+ CONTROL "Use custom color",IDC_CHECKNCOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,201,107,10
CONTROL "",IDC_CPNB,"ColourPicker",WS_TABSTOP,145,181,29,12
CONTROL "",IDC_CPNT,"ColourPicker",WS_TABSTOP,145,198,29,12
EDITTEXT IDC_EDITNPOPS,23,173,20,12,ES_AUTOHSCROLL
GROUPBOX "Connection failure notifications",IDC_GBBADCONNECT,5,101,300,49
CONTROL "Popup notification if failed",IDC_CHECKFPOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,110,118,10
- CONTROL "Use custom colour",IDC_CHECKFCOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,136,95,10
+ CONTROL "Use custom color",IDC_CHECKFCOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,136,95,10
CONTROL "",IDC_CPFB,"ColourPicker",WS_TABSTOP,145,118,29,12
CONTROL "",IDC_CPFT,"ColourPicker",WS_TABSTOP,145,134,29,12
EDITTEXT IDC_EDITFPOPS,23,121,20,12,ES_AUTOHSCROLL
@@ -297,12 +297,12 @@ BEGIN LTEXT "..s Popup duration",IDC_STATIC,45,176,70,8
LTEXT "..s Popup duration",IDC_STATIC,45,122,70,8
PUSHBUTTON "Preview",IDC_PREVIEW,255,215,49,13
- LTEXT "Background colour",IDC_STATIC,177,184,108,10
- LTEXT "Text colour",IDC_STATIC,177,200,107,10
- LTEXT "Background colour",IDC_STATIC,177,120,108,10
- LTEXT "Text colour",IDC_STATIC,177,136,107,10
- LTEXT "Background colour",IDC_STATIC,177,69,108,10
- LTEXT "Text colour",IDC_STATIC,177,85,107,10
+ LTEXT "Background color",IDC_STATIC,177,184,108,10
+ LTEXT "Text color",IDC_STATIC,177,200,107,10
+ LTEXT "Background color",IDC_STATIC,177,120,108,10
+ LTEXT "Text color",IDC_STATIC,177,136,107,10
+ LTEXT "Background color",IDC_STATIC,177,69,108,10
+ LTEXT "Text color",IDC_STATIC,177,85,107,10
END
diff --git a/plugins/YAPP/res/yapp.rc b/plugins/YAPP/res/yapp.rc index bd981f31ae..e21eaa5bfa 100644 --- a/plugins/YAPP/res/yapp.rc +++ b/plugins/YAPP/res/yapp.rc @@ -122,8 +122,8 @@ EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LISTBOX IDC_LST_CLASSES,7,18,102,184,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
- RTEXT "Text colour:",IDC_STATIC,136,66,80,8
- RTEXT "Background colour:",IDC_STATIC,136,88,80,8
+ RTEXT "Text color:",IDC_STATIC,136,66,80,8
+ RTEXT "Background color:",IDC_STATIC,136,88,80,8
CONTROL "Set timeout",IDC_CHK_TIMEOUT,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,144,122,99,10
RTEXT "Timeout value (0 = default):",IDC_STATIC,114,143,121,8
EDITTEXT IDC_ED_TIMEOUT,243,140,43,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
|