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

2 files changed, 3 insertions, 3 deletions

diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c
index 4a7028b20..7e956a784 100644
--- a/src/post/deinterlace/xine_plugin.c
+++ b/src/post/deinterlace/xine_plugin.c
@@ -234,7 +234,7 @@ static char * get_static_help (void) {
            "\n"
            "  Chroma_filter: DVD/MPEG2 use an interlaced image format that has "
            "a very poor vertical chroma resolution. Upsampling the chroma for purposes "
-           "of deinterlacing may cause some artifacts to occur (eg. color stripes). Use "
+           "of deinterlacing may cause some artifacts to occur (eg. colour stripes). Use "
            "this option to blur the chroma vertically after deinterlacing to remove "
            "the artifacts. Warning: cpu intensive.\n"
            "\n"
diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c
index 50e72472b..47bd12942 100644
--- a/src/post/goom/xine_goom.c
+++ b/src/post/goom/xine_goom.c
@@ -219,8 +219,8 @@ static void *goom_init_plugin(xine_t *xine, void *data)
 
   cfg->register_enum (cfg, "effects.goom.csc_method", 0,
                            goom_csc_methods,
-                           _("colorspace conversion method"),
-                           _("You can choose the colorspace conversion method used by goom.\n"
+                           _("colour space conversion method"),
+                           _("You can choose the colour space conversion method used by goom.\n"
 			     "The available selections should be self-explaining."),
 			   20, csc_method_changed_cb, this);