Use the colour spelling for printed text

diff --git a/ChangeLog b/ChangeLog
index 65cae6c60f4e6afae343dc70241e443473985dda..1983d381697eb6f88539bf64ae838e9665208b0b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Tue Jul 31 12:26:41 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
   * po/de.po: Updated
   * main/query.c: Fix help texts a bit to reflect that dpkg-query is
     not dpkg
+  * dselect/main.cc: Use `colour' consistently for printed texts.
 
 Fri Jul 27 04:21:51 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 

diff --git a/dselect/main.cc b/dselect/main.cc
index d440f1f9e14f5f7388e93a8c5fc66c5ba6da395c..e2d529d2aa49c402fefbcc128306442b22e2ea3e 100644 (file)
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -241,7 +241,7 @@ extern "C" {
 
     if ((colours == NULL || ! strlen(colours)) &&
         (attributes == NULL || ! strlen(attributes))) {
-       ohshit(_("Null color specification\n"));
+       ohshit(_("Null colour specification\n"));
     }
 
     if (colours != NULL && strlen(colours)) {
@@ -249,12 +249,12 @@ extern "C" {
       if (colourname != NULL && strlen(colourname)) {
         // normalize attributes to prevent confusion
         color[screenpart].attr= A_NORMAL;
-       color[screenpart].fore=findintable(colourtable, colourname, _("color"));
+       color[screenpart].fore=findintable(colourtable, colourname, _("colour"));
       }
       colourname= strtok(NULL, ",");
       if (colourname != NULL && strlen(colourname)) {
         color[screenpart].attr= A_NORMAL;
-        color[screenpart].back=findintable(colourtable, colourname, _("color"));
+        color[screenpart].back=findintable(colourtable, colourname, _("colour"));
       }
     }
 
@@ -262,7 +262,7 @@ extern "C" {
       for (attrib= strtok(attributes, "+");
            attrib != NULL && strlen(attrib);
           attrib= strtok(NULL, "+")) {
-               aval=findintable(attrtable, attrib, _("color attribute"));
+               aval=findintable(attrtable, attrib, _("colour attribute"));
                if (aval == A_NORMAL) // set to normal
                        color[screenpart].attr= aval;
                else // add to existing attribs