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.

1 files changed, 24 insertions, 29 deletions

diff --git a/po/fr.po b/po/fr.po
index eb3187b95..62a74b1b7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.13\n"
 "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-12-24 12:54+0100\n"
+"POT-Creation-Date: 2007-12-24 18:34+0000\n"
 "PO-Revision-Date: 2002-06-07 15:08 +0200\n"
 "Last-Translator: Daniel Caujolle-Bert <segfault@club-internet.fr>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -1184,23 +1184,23 @@ msgid ""
 msgstr ""
 
 #: src/dxr3/video_out_dxr3.c:434
-msgid "overlay colorkey value"
+msgid "overlay colour key value"
 msgstr ""
 
 #: src/dxr3/video_out_dxr3.c:434
 msgid ""
-"Hexadecimal RGB value of the key color.\n"
+"Hexadecimal RGB value of the key colour.\n"
 "You can try different values, if you experience windows becoming transparent "
 "when using DXR3 overlay mode."
 msgstr ""
 
 #: src/dxr3/video_out_dxr3.c:439
-msgid "overlay colorkey tolerance"
+msgid "overlay colour key tolerance"
 msgstr ""
 
 #: src/dxr3/video_out_dxr3.c:439
 msgid ""
-"A greater value widens the tolerance for the overlay keycolor.\n"
+"A greater value widens the tolerance for the overlay key colour.\n"
 "You 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."
@@ -2846,7 +2846,7 @@ msgid ""
 "\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 "
+"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"
@@ -2894,12 +2894,12 @@ msgid "The height in pixels of the image to be generated."
 msgstr ""
 
 #: src/post/goom/xine_goom.c:224
-msgid "colorspace conversion method"
+msgid "colour space conversion method"
 msgstr ""
 
 #: src/post/goom/xine_goom.c:225
 msgid ""
-"You can choose the colorspace conversion method used by goom.\n"
+"You can choose the colour space conversion method used by goom.\n"
 "The available selections should be self-explaining."
 msgstr ""
 
@@ -3094,22 +3094,26 @@ msgid ""
 msgstr ""
 
 #: src/video_out/video_out_directfb.c:1357
-msgid "enable video color key"
+msgid "enable video colour key"
 msgstr ""
 
 #: src/video_out/video_out_directfb.c:1358
 msgid ""
-"Enable using a color key to tell the graphics card where to overlay the "
+"Enable using a colour key to tell the graphics card where to overlay the "
 "video image."
 msgstr ""
 
 #: src/video_out/video_out_directfb.c:1364
-msgid "video color key"
+msgid "video colour key"
 msgstr ""
 
 #: src/video_out/video_out_directfb.c:1365
+#: src/video_out/video_out_vidix.c:1156 src/video_out/video_out_vidix.c:1163
+#: src/video_out/video_out_vidix.c:1170 src/video_out/video_out_xcbxv.c:1438
+#: src/video_out/video_out_xv.c:1491 src/video_out/video_out_xvmc.c:1445
+#: src/video_out/video_out_xxmc.c:2529
 msgid ""
-"The color key is used to tell the graphics card where to overlay the video "
+"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."
 msgstr ""
 
@@ -3208,7 +3212,7 @@ msgstr "plugin de sortie audio de xine utilisant libvidix"
 #: src/video_out/video_out_fb.c:758
 #, c-format
 msgid ""
-"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"
 msgstr ""
 
@@ -3577,15 +3581,6 @@ msgstr ""
 msgid "video overlay colour key red component"
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1156 src/video_out/video_out_vidix.c:1163
-#: src/video_out/video_out_vidix.c:1170 src/video_out/video_out_xcbxv.c:1438
-#: src/video_out/video_out_xv.c:1491 src/video_out/video_out_xvmc.c:1445
-#: src/video_out/video_out_xxmc.c:2529
-msgid ""
-"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."
-msgstr ""
-
 #: src/video_out/video_out_vidix.c:1162
 msgid "video overlay colour key green component"
 msgstr ""
@@ -3681,7 +3676,7 @@ msgstr ""
 #: src/video_out/video_out_xcbxv.c:1339
 #, c-format
 msgid ""
-"video_out_xcbxv: using Xv port %d from adaptor %s for hardware colorspace "
+"video_out_xcbxv: using Xv port %d from adaptor %s for hardware colour space "
 "conversion and scaling.\n"
 msgstr ""
 
@@ -3692,7 +3687,7 @@ msgstr ""
 
 #: src/video_out/video_out_xcbxv.c:1447 src/video_out/video_out_xv.c:1500
 #: src/video_out/video_out_xvmc.c:1454 src/video_out/video_out_xxmc.c:2538
-msgid "Make Xv autopaint its colorkey."
+msgid "Make Xv autopaint its colour key."
 msgstr ""
 
 #: src/video_out/video_out_xcbxv.c:1454 src/video_out/video_out_xv.c:1507
@@ -3855,7 +3850,7 @@ msgstr ""
 #: src/video_out/video_out_xv.c:1382
 #, c-format
 msgid ""
-"video_out_xv: using Xv port %ld from adaptor %s for hardware colorspace "
+"video_out_xv: using Xv port %ld from adaptor %s for hardware colour space "
 "conversion and scaling.\n"
 msgstr ""
 
@@ -3886,7 +3881,7 @@ msgstr ""
 #, c-format
 msgid ""
 "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"
 msgstr ""
 
 #: src/video_out/video_out_xvmc.c:1749
@@ -3945,7 +3940,7 @@ msgstr ""
 #: src/video_out/video_out_xxmc.c:2426
 #, c-format
 msgid ""
-"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colorspace "
+"video_out_xxmc: using Xv port %ld from adaptor %s for hardware colour space "
 "conversion and scaling.\n"
 msgstr ""
 
@@ -3980,12 +3975,12 @@ msgid ""
 msgstr ""
 
 #: src/video_out/video_out_xxmc.c:2650
-msgid "Fix buggy NVIDIA XvMC subpicture colors"
+msgid "Fix buggy NVIDIA XvMC subpicture colours"
 msgstr ""
 
 #: src/video_out/video_out_xxmc.c:2651
 msgid ""
-"There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
+"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"
 msgstr ""