summaryrefslogtreecommitdiff
path: root/plugins/Scriver
diff options
context:
space:
mode:
authorDart Raiden <wowemuh@gmail.com>2013-10-04 21:25:35 +0000
committerDart Raiden <wowemuh@gmail.com>2013-10-04 21:25:35 +0000
commitfd97221013c50fbbb7c1cd99e8e7263d439d4297 (patch)
tree3424ea7a28f647164351d82107050d3e6cc3f867 /plugins/Scriver
parentc9ea7bb778203113dc40e3afe46a144dedfcff24 (diff)
plugins: "colour" eliminated
git-svn-id: http://svn.miranda-ng.org/main/trunk@6333 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Scriver')
-rw-r--r--plugins/Scriver/res/resource.rc4
-rw-r--r--plugins/Scriver/src/chat/colorchooser.cpp2
-rw-r--r--plugins/Scriver/src/chat/options.cpp2
-rw-r--r--plugins/Scriver/src/globals.cpp4
4 files changed, 6 insertions, 6 deletions
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