Manual port of the color→colour change to 1.2; should make merging easier.

7 files changed, 23 insertions, 23 deletions

diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c
index 39a7917ba..943eec681 100644
--- a/src/video_out/video_out_directfb.c
+++ b/src/video_out/video_out_directfb.c
@@ -155,7 +155,7 @@ typedef struct {
 #define DEFAULT_COLORKEY  0x202040
 
 #define DIRECTFB_OPTIONS  "no-banner,"\
-                          "bg-color=00000000,"\
+                          "bg-colour=00000000,"\
                           "no-vt-switch,"\
                           "no-vt-switching,"\
                           "no-sighandler,"\
@@ -504,7 +504,7 @@ static void directfb_subpicture_paint (directfb_driver_t *this,
             colors[index].a = alpha | (alpha << 4);
           }
             
-          lprintf ("color change to %02x%02x%02x%02x.\n",
+          lprintf ("colour change to %02x%02x%02x%02x.\n",
                    colors[index].a, colors[index].r,
                    colors[index].g, colors[index].b);
           this->spic_surface->SetColor (this->spic_surface,
@@ -1008,7 +1008,7 @@ static int directfb_set_property (vo_driver_t *this_gen,
         if (value > 0xffffff)
           value = 0xffffff;
         xprintf (this->xine, XINE_VERBOSITY_DEBUG,
-                 "video_out_directfb: setting colorkey to 0x%06x.\n", value);
+                 "video_out_directfb: setting colour key to 0x%06x.\n", value);
         this->colorkey = value;
         this->layer->SetDstColorKey (this->layer, (value & 0xff0000) >> 16,
                                                   (value & 0x00ff00) >>  8,
@@ -1266,7 +1266,7 @@ static void update_config_cb (void *data, xine_cfg_entry_t *entry) {
     if (config.options != this->config.options) {
       if (this->layer->SetConfiguration (this->layer, &config) != DFB_OK) {
           xprintf (this->xine, XINE_VERBOSITY_LOG,
-                   "video_out_directfb: failed to set colorkeying to %d!\n", 
+                   "video_out_directfb: failed to set colour keying to %d!\n", 
                    entry->num_value);
           return;
       }
@@ -1354,15 +1354,15 @@ static void init_config (directfb_driver_t *this) {
   if (this->caps & DLCAPS_DST_COLORKEY) {
     this->colorkeying = config->register_bool  (config,
           "video.device.directfb_colorkeying", this->colorkeying,
-          _("enable video color key"),
-          _("Enable using a color key to tell the graphics card "
+          _("enable video colour key"),
+          _("Enable using a colour key to tell the graphics card "
             "where to overlay the video image."),
           20, update_config_cb, (void *)this);
     
     this->colorkey    = config->register_range (config,
           "video.device.directfb_colorkey", this->colorkey, 0, 0xffffff,
-          _("video color key"),
-          _("The color key is used to tell the graphics card "
+          _("video colour key"),
+          _("The colour key is used to tell the graphics card "
             "where to overlay the video image. Try different values, "
             "if you experience windows becoming transparent."),
           10, update_config_cb, (void  *)this);
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index 4914548a1..1e95e5a71 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -743,7 +743,7 @@ static int get_fb_fix_screeninfo(int fd, struct fb_fix_screeninfo *fix, xine_t *
      fix->type != FB_TYPE_PACKED_PIXELS)
   {
     xprintf(xine, XINE_VERBOSITY_LOG,
-	    _("video_out_fb: only packed truecolor/directcolor is supported (%d).\n"
+	    _("video_out_fb: only packed truecolour/directcolour is supported (%d).\n"
 	      "     Check 'fbset -i' or try 'fbset -depth 16'.\n"), fix->visual);
     return 0;
   }
diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c
index dff973317..f3650a6dd 100644
--- a/src/video_out/video_out_xcbxv.c
+++ b/src/video_out/video_out_xcbxv.c
@@ -1169,7 +1169,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
   else
     xprintf(class->xine, XINE_VERBOSITY_LOG,
 	    _("%s: using Xv port %d from adaptor %s for hardware "
-	      "colorspace conversion and scaling.\n"), LOG_MODULE, xv_port,
+	      "colour space conversion and scaling.\n"), LOG_MODULE, xv_port,
             xcb_xv_adaptor_info_name(adaptor_it.data));
   
   this->xv_port           = xv_port;
@@ -1273,7 +1273,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
 			       adaptor_it.data->base_id,
 			       "video.device.xv_autopaint_colorkey",
 			       _("autopaint colour key"),
-			       _("Make Xv autopaint its colorkey."));
+			       _("Make Xv autopaint its colour key."));
 
 	} else if(!strcmp(xcb_xv_attribute_info_name(attribute_it.data), "XV_FILTER")) {
 	  int xv_filter;
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 10e13ab3c..b99f8eae2 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -1212,7 +1212,7 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void *
   else
     xprintf(class->xine, XINE_VERBOSITY_LOG,
 	    _("%s: using Xv port %ld from adaptor %s for hardware "
-	      "colorspace conversion and scaling.\n"), LOG_MODULE, xv_port,
+	      "colour space conversion and scaling.\n"), LOG_MODULE, xv_port,
             adaptor_info[adaptor_num].name);
   
   UNLOCK_DISPLAY(this);
@@ -1326,7 +1326,7 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void *
 			       adaptor_info[adaptor_num].base_id,
 			       "video.device.xv_autopaint_colorkey",
 			       _("autopaint colour key"),
-			       _("Make Xv autopaint its colorkey."));
+			       _("Make Xv autopaint its colour key."));
 
 	} else if(!strcmp(attr[k].name, "XV_FILTER")) {
 	  int xv_filter;
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index 91db684da..8d7b5737d 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.c
@@ -1421,7 +1421,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
 				 class->adaptor_info[class->adaptor_num].base_id, "XV_AUTOPAINT_COLORKEY",
 				 "video.device.xv_autopaint_colorkey",
 				 _("autopaint colour key"),
-				 _("Make Xv autopaint its colorkey."));
+				 _("Make Xv autopaint its colour key."));
 
 	} else if(!strcmp(attr[k].name, "XV_DOUBLE_BUFFER")) {
 	  int xvmc_double_buffer;
@@ -1645,7 +1645,7 @@ static void *init_class (xine_t *xine, void *visual_gen) {
   else {
     xprintf (xine, XINE_VERBOSITY_LOG, 
 	     _("video_out_xvmc: using Xv port %ld from adaptor %s\n"
-	       "                for hardware colorspace conversion and scaling\n"),
+	       "                for hardware colour space conversion and scaling\n"),
 	     xv_port, adaptor_info[adaptor_num].name);
     
     if(IDCTaccel&XINE_VO_IDCT_ACCEL)
diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c
index c66566233..6e99d765c 100644
--- a/src/video_out/video_out_xxmc.c
+++ b/src/video_out/video_out_xxmc.c
@@ -2457,7 +2457,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   else
     xprintf(class->xine, XINE_VERBOSITY_LOG,
 	    _("%s: using Xv port %ld from adaptor %s for hardware "
-	      "colorspace conversion and scaling.\n"), LOG_MODULE, xv_port,
+	      "colour space conversion and scaling.\n"), LOG_MODULE, xv_port,
             adaptor_info[adaptor_num].name);
   
   XUnlockDisplay(this->display);
@@ -2568,7 +2568,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
 				 adaptor_info[adaptor_num].base_id, "XV_AUTOPAINT_COLORKEY",
 				 "video.device.xv_autopaint_colorkey",
 				 _("autopaint colour key"),
-				 _("Make Xv autopaint its colorkey."));
+				 _("Make Xv autopaint its colour key."));
 
 	} else if(!strcmp(attr[k].name, "XV_FILTER")) {
 	  int xv_filter;
@@ -2680,8 +2680,8 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
 			   10, xxmc_update_cpu_save, this);
   this->reverse_nvidia_palette =
     config->register_bool (config, "video.device.xvmc_nvidia_color_fix", 0,
-			   _("Fix buggy NVIDIA XvMC subpicture colors"),
-			   _("There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
+			   _("Fix buggy NVIDIA XvMC subpicture colours"),
+			   _("There's a bug in NVIDIA's XvMC lib that makes red OSD colours\n"
 			     "look blue and vice versa. This option provides a workaround.\n"),
 			   10, xxmc_update_nvidia_fix, this);
   this->bob =
diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c
index f1ad4dba8..2a3ba57fd 100644
--- a/src/video_out/yuv2rgb.c
+++ b/src/video_out/yuv2rgb.c
@@ -3220,7 +3220,7 @@ yuv2rgb_factory_t* yuv2rgb_factory_init (int mode, int swapped,
 
 #ifdef LOG
     if (this->yuv2rgb_fun != NULL)
-      printf ("yuv2rgb: using MMXEXT for colorspace transform\n");
+      printf ("yuv2rgb: using MMXEXT for colour space transform\n");
 #endif
   }
 
@@ -3230,7 +3230,7 @@ yuv2rgb_factory_t* yuv2rgb_factory_init (int mode, int swapped,
 
 #ifdef LOG
     if (this->yuv2rgb_fun != NULL)
-      printf ("yuv2rgb: using MMX for colorspace transform\n");
+      printf ("yuv2rgb: using MMX for colour space transform\n");
 #endif
   }
 #endif
@@ -3241,12 +3241,12 @@ yuv2rgb_factory_t* yuv2rgb_factory_init (int mode, int swapped,
 
 #ifdef LOG
     if (this->yuv2rgb_fun != NULL)
-      printf ("yuv2rgb: using medialib for colorspace transform\n");
+      printf ("yuv2rgb: using medialib for colour space transform\n");
 #endif
   }
 #endif
   if (this->yuv2rgb_fun == NULL) {
-    lprintf ("no accelerated colorspace conversion found\n");
+    lprintf ("no accelerated colour space conversion found\n");
 
     yuv2rgb_c_init (this);
   }