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/rfb/PixelFormat.cxx b/rfb/PixelFormat.cxx
index 683b53a..d20be93 100644
--- a/rfb/PixelFormat.cxx
+++ b/rfb/PixelFormat.cxx
@@ -154,7 +154,7 @@
}
if (!trueColour) {
- strncat(str, " colour-map", len-1-strlen(str));
+ strncat(str, " color-map", len-1-strlen(str));
return;
}
diff --git a/rfb/TransImageGetter.cxx b/rfb/TransImageGetter.cxx
index 693b18c..0b494a9 100644
--- a/rfb/TransImageGetter.cxx
+++ b/rfb/TransImageGetter.cxx
@@ -170,11 +170,11 @@
if (!outPF.trueColour) {
if (outPF.bpp != 8)
- throw Exception("TransImageGetter: outPF has colour map but not 8bpp");
+ throw Exception("TransImageGetter: outPF has color map but not 8bpp");
if (!inPF.trueColour) {
if (inPF.bpp != 8)
- throw Exception("TransImageGetter: inPF has colourMap but not 8bpp");
+ throw Exception("TransImageGetter: inPF has colorMap but not 8bpp");
// CM to CM/Cube
@@ -220,7 +220,7 @@
// CM to TC
if (inPF.bpp != 8)
- throw Exception("TransImageGetter: inPF has colourMap but not 8bpp");
+ throw Exception("TransImageGetter: inPF has colorMap but not 8bpp");
transFn = transSimpleFns[inPF.bpp/16][outPF.bpp/16];
(*initSimpleCMtoTCFns[outPF.bpp/16]) (&table, inPF, pb->getColourMap(),
outPF);