Consistently use "colour", "colour key", "colour space" in output.

Some instances of "key colour" remain; ffmpeg is unmodified.

This change has caused two strings with two translations to collide (the
strings have become identical since some instances already used "colour").
I have therefore arbitrarily dropped the first of the differing translations,
the one for the string at src/video_out/video_out_directfb.c:1365.

2 files changed, 8 insertions, 8 deletions

diff --git a/src/dxr3/dxr3_spu_encoder.c b/src/dxr3/dxr3_spu_encoder.c
index 1dcc13b77..2517063ac 100644
--- a/src/dxr3/dxr3_spu_encoder.c
+++ b/src/dxr3/dxr3_spu_encoder.c
@@ -167,11 +167,11 @@ static void create_histogram(spu_encoder_t *this)
 #ifdef LOG
   for (i = 0; i < OVL_PALETTE_SIZE; i++)
     if (this->map[i])
-      lprintf("histogram: color #%d 0x%.8x appears %d times\n",
+      lprintf("histogram: colour #%d 0x%.8x appears %d times\n",
 	     i, this->overlay->color[i], this->map[i]);
   for (i = 0; i < OVL_PALETTE_SIZE; i++)
     if (this->clip_map[i])
-      lprintf("histogram: clip color #%d 0x%.8x appears %d times\n",
+      lprintf("histogram: clip colour #%d 0x%.8x appears %d times\n",
         i, this->overlay->hili_color[i], this->clip_map[i]);
 #endif
 }
@@ -209,7 +209,7 @@ static void generate_clut(spu_encoder_t *this)
   }
 #ifdef LOG
   for (spu_color = 0; spu_color < 4; spu_color++)
-    lprintf("spu color %d: 0x%.8x, trans: %d\n", spu_color,
+    lprintf("spu colour %d: 0x%.8x, trans: %d\n", spu_color,
       this->color[spu_color], this->trans[spu_color]);
 #endif
 
@@ -243,7 +243,7 @@ static void generate_clut(spu_encoder_t *this)
   }
 #ifdef LOG
   for (spu_color = 0; spu_color < 4; spu_color++)
-    lprintf("spu clip color %d: 0x%.8x, trans: %d\n", spu_color,
+    lprintf("spu clip colour %d: 0x%.8x, trans: %d\n", spu_color,
       this->hili_color[spu_color], this->hili_trans[spu_color]);
 #endif
 }
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index 73eb133e1..c51354157 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -431,13 +431,13 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v
       this->tv_switchable = 1;
       this->widescreen_enabled = confnum - 2;
       confstr = config->register_string(config, "dxr3.output.keycolor", "0x80a040",
-	_("overlay colorkey value"), _("Hexadecimal RGB value of the key color.\n"
+	_("overlay colour key value"), _("Hexadecimal RGB value of the key colour.\n"
 	"You can try different values, if you experience windows becoming transparent "
 	"when using DXR3 overlay mode."), 20, NULL, NULL);
       sscanf(confstr, "%x", &this->overlay.colorkey);
       confstr = config->register_string(config, "dxr3.output.keycolor_interval", "50.0",
-	_("overlay colorkey tolerance"), _("A greater value widens the tolerance for "
-	"the overlay keycolor.\nYou can try lower values, if you experience windows "
+	_("overlay colour key tolerance"), _("A greater value widens the tolerance for "
+	"the overlay key colour.\nYou can try lower values, if you experience windows "
 	"becoming transparent when using DXR3 overlay mode, but parts of the image borders may "
 	"disappear when using a too low setting."), 20, NULL, NULL);
       sscanf(confstr, "%f", &this->overlay.color_interval);
@@ -509,7 +509,7 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v
     
     if (dxr3_overlay_set_keycolor(&this->overlay) != 0)
       xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, 
-	      "video_out_dxr3: setting the overlay keycolor failed.\n");
+	      "video_out_dxr3: setting the overlay key colour failed.\n");
     if (dxr3_overlay_set_attributes(&this->overlay) != 0)
       xprintf(this->class->xine, XINE_VERBOSITY_DEBUG, 
 	      "video_out_dxr3: setting an overlay attribute failed.\n");