Changed all user-visible strings from colour to color.
Also, the Windows viewer now accepts arguments with both spellings.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@69 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/vncviewer/CViewOptions.cxx b/vncviewer/CViewOptions.cxx
index dd3d825..f19b096 100644
--- a/vncviewer/CViewOptions.cxx
+++ b/vncviewer/CViewOptions.cxx
@@ -34,12 +34,16 @@
static BoolParameter useLocalCursor("UseLocalCursor", "Render the mouse cursor locally", true);
static BoolParameter useDesktopResize("UseDesktopResize", "Support dynamic desktop resizing", true);
-static BoolParameter fullColour("FullColour",
- "Use full colour", true);
-static IntParameter lowColourLevel("LowColourLevel",
- "Colour level to use on slow connections. "
- "0 = Very Low (8 colours), 1 = Low (64 colours), 2 = Medium (256 colours)",
+static BoolParameter fullColour("FullColor",
+ "Use full color", true);
+static AliasParameter fullColourAlias("FullColour", "Alias for FullColor", &fullColour);
+
+static IntParameter lowColourLevel("LowColorLevel",
+ "Color level to use on slow connections. "
+ "0 = Very Low (8 colors), 1 = Low (64 colors), 2 = Medium (256 colors)",
2);
+static AliasParameter lowColourLevelAlias("LowColourLevel", "Alias for LowColorLevel", &lowColourLevel);
+
static BoolParameter fullScreen("FullScreen",
"Use the whole display to show the remote desktop."
"(Press F8 to access the viewer menu)",
diff --git a/vncviewer/cview.cxx b/vncviewer/cview.cxx
index 30dbbef..5d1ee5d 100644
--- a/vncviewer/cview.cxx
+++ b/vncviewer/cview.cxx
@@ -1174,7 +1174,7 @@
// Select best color level
newFullColour = (kbitsPerSecond > 256);
if (newFullColour != options.fullColour) {
- vlog.info("Throughput %d kbit/s - full colour is now %s",
+ vlog.info("Throughput %d kbit/s - full color is now %s",
kbitsPerSecond,
newFullColour ? "enabled" : "disabled");
options.fullColour = newFullColour;
diff --git a/vncviewer/vncviewer.rc b/vncviewer/vncviewer.rc
index 5a730ed..ad25574 100644
--- a/vncviewer/vncviewer.rc
+++ b/vncviewer/vncviewer.rc
@@ -166,7 +166,7 @@
IDD_FORMAT DIALOG DISCARDABLE 0, 0, 201, 160
STYLE DS_MODALFRAME | DS_CONTROL | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Colour/Encoding"
+CAPTION "Color/Encoding"
FONT 8, "MS Sans Serif"
BEGIN
CONTROL "&Auto select",IDC_ENCODING_AUTO,"Button",
@@ -180,14 +180,14 @@
CONTROL "Raw",IDC_ENCODING_RAW,"Button",BS_AUTORADIOBUTTON,10,75,
75,15
- GROUPBOX "Colour level",IDC_STATIC,95,20,99,75
- CONTROL "&Full (all available colours)",IDC_FORMAT_FULLCOLOUR,
+ GROUPBOX "Color level",IDC_STATIC,95,20,99,75
+ CONTROL "&Full (all available colors)",IDC_FORMAT_FULLCOLOUR,
"Button",BS_AUTORADIOBUTTON | WS_GROUP,100,30,90,15
- CONTROL "&Medium (256 colours)",IDC_FORMAT_MEDIUMCOLOUR,"Button",
+ CONTROL "&Medium (256 colors)",IDC_FORMAT_MEDIUMCOLOUR,"Button",
BS_AUTORADIOBUTTON,100,45,90,14
- CONTROL "&Low (64 colours)",IDC_FORMAT_LOWCOLOUR,"Button",
+ CONTROL "&Low (64 colors)",IDC_FORMAT_LOWCOLOUR,"Button",
BS_AUTORADIOBUTTON,100,60,90,16
- CONTROL "&Very low (8 colours)",IDC_FORMAT_VERYLOWCOLOUR,"Button",
+ CONTROL "&Very low (8 colors)",IDC_FORMAT_VERYLOWCOLOUR,"Button",
BS_AUTORADIOBUTTON,100,75,90,15
CONTROL "Custom compression level:",IDC_CUSTOM_COMPRESSLEVEL,