core: "colour" eliminated

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

4 files changed, 12 insertions, 12 deletions

diff --git a/src/core/stdchat/res/chat.rc b/src/core/stdchat/res/chat.rc
index 69f19393cd..81fb384ab6 100644
--- a/src/core/stdchat/res/chat.rc
+++ b/src/core/stdchat/res/chat.rc
@@ -202,9 +202,9 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

     CONTROL         "Use same style as in the message log",IDC_RADIO1,"Button",

 					BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,33,29,225,10

-    CONTROL         "Use default colours",IDC_RADIO2,"Button",

+    CONTROL         "Use default colors",IDC_RADIO2,"Button",

 					BS_AUTORADIOBUTTON,33,62,217,10

-    CONTROL         "Use custom colours",IDC_RADIO3,"Button",

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

 					BS_AUTORADIOBUTTON,33,95,105,10

     CONTROL         "Custom1",IDC_TEXT,"ColourPicker",WS_TABSTOP,141,93,50,

 					14,0x18000000L

diff --git a/src/core/stdchat/src/colorchooser.cpp b/src/core/stdchat/src/colorchooser.cpp
index 0d2642165f..b7a1066e7d 100644
--- a/src/core/stdchat/src/colorchooser.cpp
+++ b/src/core/stdchat/src/colorchooser.cpp
@@ -96,7 +96,7 @@ INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			pCC->yPosition -= height;

 

 

-			SetDlgItemText(hwndDlg, IDC_COLORTEXT, pCC->bForeground?TranslateT("Text colour"):TranslateT("Background colour"));

+			SetDlgItemText(hwndDlg, IDC_COLORTEXT, pCC->bForeground?TranslateT("Text color"):TranslateT("Background color"));

 			SetWindowPos(GetDlgItem(hwndDlg, IDC_COLORTEXT), NULL,  0, 0, width, 20, 0);

 			SetWindowPos(hwndDlg, NULL, pCC->xPosition, pCC->yPosition, width, height, SWP_SHOWWINDOW);

 		}

diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp
index 65a41422ff..1ee629ff4e 100644
--- a/src/core/stdchat/src/options.cpp
+++ b/src/core/stdchat/src/options.cpp
@@ -112,7 +112,7 @@ static const struct branch_t branch1[] = {
 static const struct branch_t branch2[] = {

 	{ LPGENT("Prefix all events with a timestamp"), "ShowTimeStamp", 0,1},

 	{ LPGENT("Only prefix with timestamp if it has changed"), "ShowTimeStampIfChanged", 0,0},

-	{ LPGENT("Timestamp has same colour as the event"), "TimeStampEventColour", 0,0},

+	{ LPGENT("Timestamp has same color as the event"), "TimeStampEventColour", 0,0},

 	{ LPGENT("Indent the second line of a message"), "LogIndentEnabled", 0,1},

 	{ LPGENT("Limit user names in the message log to 20 characters"), "LogLimitNames", 0,1},

 	{ LPGENT("Add \':\' to auto-completed user names"), "AddColonToAutoComplete", 0, 1},

@@ -429,8 +429,8 @@ void RegisterFonts( void )
 static IconItem iconList[] =

 {

 	{ LPGEN("Window Icon"),           "chat_window",           IDI_CHANMGR,     0 },

-	{ LPGEN("Text colour"),           "chat_fgcol",            IDI_COLOR,       0 },

-	{ LPGEN("Background colour"),     "chat_bkgcol",           IDI_BKGCOLOR,    0 },

+	{ LPGEN("Text color"),            "chat_fgcol",            IDI_COLOR,       0 },

+	{ LPGEN("Background color"),      "chat_bkgcol",           IDI_BKGCOLOR,    0 },

 	{ LPGEN("Bold"),                  "chat_bold",             IDI_BBOLD,       0 },

 	{ LPGEN("Italics"),               "chat_italics",          IDI_BITALICS,    0 },

 	{ LPGEN("Underlined"),            "chat_underline",        IDI_BUNDERLINE,  0 },

diff --git a/src/core/stdclist/res/resource.rc b/src/core/stdclist/res/resource.rc
index f66a37e02c..acc6d9d114 100644
--- a/src/core/stdclist/res/resource.rc
+++ b/src/core/stdclist/res/resource.rc
@@ -181,9 +181,9 @@ EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

     GROUPBOX        "Contact List Background",IDC_STATIC,4,4,227,146

-    LTEXT           "Background colour",IDC_STATIC,59,35,72,8,NOT WS_GROUP

+    LTEXT           "Background color",IDC_STATIC,59,35,72,8,NOT WS_GROUP

     CONTROL         "",IDC_BKGCOLOUR,"ColourPicker",WS_TABSTOP,22,35,32,10

-    LTEXT           "Selection colour",IDC_STATIC,59,51,72,8

+    LTEXT           "Selection color",IDC_STATIC,59,51,72,8

     CONTROL         "",IDC_SELCOLOUR,"ColourPicker",WS_TABSTOP,22,51,32,10

     CONTROL         "Use background image",IDC_BITMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,70,161,10

     EDITTEXT        IDC_FILENAME,22,88,184,12,ES_AUTOHSCROLL

@@ -194,7 +194,7 @@ BEGIN
     CONTROL         "Tile vertically",IDC_TILEV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,122,118,101,10

     CONTROL         "Scroll with text",IDC_SCROLL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,131,100,10

     CONTROL         "Stretch proportionally",IDC_PROPORTIONAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,122,131,101,10

-    CONTROL         "Use Windows colours",IDC_WINCOLOUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,20,156,10

+    CONTROL         "Use Windows colors",IDC_WINCOLOUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,20,156,10

 END

 

 IDD_OPT_SBAR DIALOGEX 0, 0, 203, 212

@@ -310,9 +310,9 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x0

 BEGIN

-    LTEXT           "Background colour",IDC_STATIC,57,28,72,8,NOT WS_GROUP

+    LTEXT           "Background color",IDC_STATIC,57,28,72,8,NOT WS_GROUP

     CONTROL         "",IDC_BKGCOLOUR,"ColourPicker",WS_TABSTOP,20,28,32,10

-    LTEXT           "Selection colour",IDC_STATIC,57,44,72,8

+    LTEXT           "Selection color",IDC_STATIC,57,44,72,8

     CONTROL         "",IDC_SELCOLOUR,"ColourPicker",WS_TABSTOP,20,44,32,10

     CONTROL         "Use background image",IDC_BITMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,63,161,10

     EDITTEXT        IDC_FILENAME,20,79,184,12,ES_AUTOHSCROLL

@@ -323,7 +323,7 @@ BEGIN
     CONTROL         "Tile vertically",IDC_TILEV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,109,101,10

     CONTROL         "Scroll with text",IDC_SCROLL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,122,100,10

     CONTROL         "Stretch proportionally",IDC_PROPORTIONAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,122,101,10

-    CONTROL         "Use Windows colours",IDC_WINCOLOUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,13,156,10

+    CONTROL         "Use Windows colors",IDC_WINCOLOUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,13,156,10

     LTEXT           "Contact list background:",IDC_TXT_TITLE1,1,0,230,8

 END