11 files changed, 196 insertions, 333 deletions

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 186f7534a..e78a6a7bc 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -69,7 +69,7 @@ CATALOGS = @CATALOGS@
 
 .po.gmo:
 	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) --statistics -o $$file $<
+	  && rm -f $$file && $(GMSGFMT) --check --statistics -o $$file $<
 
 
 all: all-@USE_NLS@
diff --git a/po/cs.po b/po/cs.po
index b060b1bac..b11933e9e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.9\n"
-"POT-Creation-Date: 2002-06-23 10:57+0200\n"
+"POT-Creation-Date: 2002-06-24 21:51+0200\n"
 "PO-Revision-Date: 2002-05-18 08:36+0200\n"
 "Last-Translator: Frantisek Dvorak <valtri@atlas.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -969,7 +969,7 @@ msgstr "input_vcd: selhalo ioctl CDROM_DRIVE_STATUS: %s\n"
 msgid "vcd device input plugin as shipped with xine"
 msgstr "vstupní modul pro vcd zaøízení dodávaný se xine"
 
-#: src/input/input_vcd.c:991
+#: src/input/input_vcd.c:991 src/input/input_vcd.c:1071
 #, c-format
 msgid "unable to open %s: %s.\n"
 msgstr "nelze otevøít %s: %s.\n"
@@ -978,11 +978,6 @@ msgstr "nelze otevøít %s: %s.\n"
 msgid "vcd_read_toc failed\n"
 msgstr "selhala funkce vcd_read_toc\n"
 
-#: src/input/input_vcd.c:1071
-#, c-format
-msgid "unable to open %s: %s."
-msgstr "nelze otevøít %s: %s."
-
 #: src/input/input_vcd.c:1146
 #, c-format
 msgid ""
@@ -1543,7 +1538,7 @@ msgstr ""
 "demux_avi: demux-modulem.\n"
 "Instalace aktuálního demux-modulu by mìla pomoci.\n"
 
-#: src/libffmpeg/xine_decoder.c:375
+#: src/libffmpeg/xine_decoder.c:379
 #, fuzzy, c-format
 msgid ""
 "ffmpeg: plugin doesn't support plugin API version %d.\n"
@@ -1565,7 +1560,7 @@ msgstr ""
 msgid "The device file of the dxr3 mpeg decoder card control device."
 msgstr ""
 
-#: src/dxr3/dxr3_decode_spu.c:100
+#: src/dxr3/dxr3_decode_spu.c:106
 #, fuzzy, c-format
 msgid ""
 "dxr3_decode_spu: plugin doesn't support plugin API version %d.\n"
@@ -1610,7 +1605,7 @@ msgstr ""
 msgid "Use alternate Play mode"
 msgstr ""
 
-#: src/dxr3/dxr3_decode_video.c:181
+#: src/dxr3/dxr3_decode_video.c:181 src/dxr3/video_out_dxr3.c:161
 msgid "Enabling this option will utilise a smoother play mode."
 msgstr ""
 
@@ -1668,14 +1663,6 @@ msgstr ""
 msgid "dxr3: use alternate play mode for mpeg encoder playback"
 msgstr ""
 
-#: src/dxr3/video_out_dxr3.c:161
-msgid "Enabling this option will utilise a smoother play mode"
-msgstr ""
-
-#: src/dxr3/video_out_dxr3.c:214 src/dxr3/video_out_dxr3.c:236
-msgid "none"
-msgstr ""
-
 #: src/dxr3/video_out_dxr3.c:221
 msgid "the encoder for non mpeg content"
 msgstr ""
@@ -1815,23 +1802,11 @@ msgstr ""
 "demux_avi: demux-modulem.\n"
 "Instalace aktuálního demux-modulu by mìla pomoci.\n"
 
-#: src/xine-utils/memcpy.c:437
+#: src/xine-utils/memcpy.c:439
 msgid "Memcopy method to use in xine for large data chunks."
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1039
-msgid "Small"
-msgstr ""
-
-#: src/libsputext/xine_decoder.c:1040
-msgid "Normal"
-msgstr ""
-
 #: src/libsputext/xine_decoder.c:1041
-msgid "Large"
-msgstr ""
-
-#: src/libsputext/xine_decoder.c:1045
 #, fuzzy, c-format
 msgid ""
 "libsputext: doesn't support plugin api version %d.\n"
@@ -1843,20 +1818,20 @@ msgstr ""
 "Toto znamená nesluèitelnost verzí mezi xine a tímto vstupním modulem.\n"
 "Instalace aktuálních vstupních modulù by mìla pomoci.\n"
 
-#: src/libsputext/xine_decoder.c:1067
+#: src/libsputext/xine_decoder.c:1063
 msgid "font for avi subtitles"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1073
+#: src/libsputext/xine_decoder.c:1069
 msgid "subtitle size (relative window size)"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1078
-msgid "source encoging of subtitles"
+#: src/libsputext/xine_decoder.c:1074
+msgid "source encoding of subtitles"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1083
-msgid "target encoging for subtitles (have to match font encoding)"
+#: src/libsputext/xine_decoder.c:1079
+msgid "target encoding for subtitles (have to match font encoding)"
 msgstr ""
 
 #: src/libspucc/xine_decoder.c:220
@@ -1895,7 +1870,7 @@ msgstr ""
 "Toto znamená nesluèitelnost verzí mezi xine a tímto vstupním modulem.\n"
 "Instalace aktuálních vstupních modulù by mìla pomoci.\n"
 
-#: src/libxvid/xine_decoder.c:224
+#: src/libxvid/xine_decoder.c:226
 #, fuzzy, c-format
 msgid ""
 "xvid: plugin doesn't support plugin API version %d.\n"
@@ -1907,7 +1882,7 @@ msgstr ""
 "demux_avi: demux-modulem.\n"
 "Instalace aktuálního demux-modulu by mìla pomoci.\n"
 
-#: src/libxvid/xine_decoder.c:234
+#: src/libxvid/xine_decoder.c:236
 #, c-format
 msgid ""
 "xvid: there is mismatch between API used by currently installed XviD\n"
@@ -1953,6 +1928,9 @@ msgstr ""
 "demux_avi: demux-modulem.\n"
 "Instalace aktuálního demux-modulu by mìla pomoci.\n"
 
+#~ msgid "unable to open %s: %s."
+#~ msgstr "nelze otevøít %s: %s."
+
 #~ msgid ""
 #~ "demux_qt: video codec %s (%f fps), audio codec %s (%ld Hz, %d bits)\n"
 #~ msgstr ""
diff --git a/po/de.po b/po/de.po
index a0fb83838..608f28476 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.12\n"
-"POT-Creation-Date: 2002-06-23 10:57+0200\n"
+"POT-Creation-Date: 2002-06-24 21:51+0200\n"
 "PO-Revision-Date: 2002-06-24 19:42+0200\n"
 "Last-Translator: Philipp Hahn <pmhahn@users.sf.net>\n"
 "Language-Team: German <de@li.org>\n"
@@ -42,7 +42,8 @@ msgstr "ALSA Mixergerät"
 #: src/audio_out/audio_alsa_out.c:994 src/audio_out/audio_alsa_out.c:1007
 #: src/audio_out/audio_alsa_out.c:1020 src/audio_out/audio_alsa_out.c:1038
 msgid "used to inform xine about what the sound card can do"
-msgstr "Wird gebraucht, um xine über die Fähigkeiten der Soundkarte zu informieren"
+msgstr ""
+"Wird gebraucht, um xine über die Fähigkeiten der Soundkarte zu informieren"
 
 #: src/audio_out/audio_alsa_out.c:1090
 msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
@@ -70,7 +71,9 @@ msgstr "A/V Synchronisationsanpassung für OSS SoftSync"
 
 #: src/audio_out/audio_oss_out.c:774
 msgid "Use this to manually adjust a/v sync if you're using softsync"
-msgstr "Benutze dies um die A/V Synchronisation manuell anzupassen, falls SoftSync benutzt wird"
+msgstr ""
+"Benutze dies um die A/V Synchronisation manuell anzupassen, falls SoftSync "
+"benutzt wird"
 
 #: src/audio_out/audio_oss_out.c:796
 msgid "Enable 4.0 channel analog surround output"
@@ -981,7 +984,7 @@ msgstr "input_vcd: Auslesen vom Status des VCD-Laufwerks schlug fehl: %s\n"
 msgid "vcd device input plugin as shipped with xine"
 msgstr "Mit xine ausgeliefertes VCD Plugin"
 
-#: src/input/input_vcd.c:991
+#: src/input/input_vcd.c:991 src/input/input_vcd.c:1071
 #, c-format
 msgid "unable to open %s: %s.\n"
 msgstr "Kann %s nicht öffnen: %s.\n"
@@ -990,11 +993,6 @@ msgstr "Kann %s nicht öffnen: %s.\n"
 msgid "vcd_read_toc failed\n"
 msgstr "vcd_read_toc schlug fehl\n"
 
-#: src/input/input_vcd.c:1071
-#, c-format
-msgid "unable to open %s: %s."
-msgstr "Kann %s nicht öffnen: %s."
-
 #: src/input/input_vcd.c:1146
 #, c-format
 msgid ""
@@ -1324,7 +1322,8 @@ msgstr "Schattenpuffer zur Synchronisation mit Strahlenrücklauf"
 
 #: src/video_out/video_out_xv.c:1463
 msgid "Software deinterlace method (Key I toggles deinterlacer on/off)"
-msgstr "Software Deinterlacing Methode (Taste 'i' schaltet Deinterlacing ein/aus)"
+msgstr ""
+"Software Deinterlacing Methode (Taste 'i' schaltet Deinterlacing ein/aus)"
 
 #: src/video_out/video_out_xv.c:1479
 msgid "xine video output plugin using the MIT X video extension"
@@ -1451,7 +1450,9 @@ msgstr "Läustärke beim Starten wiederherstellen"
 
 #: src/xine-engine/audio_out.c:765
 msgid "if this not set, xine will not touch any mixer settings at startup"
-msgstr "Wenn nicht angewählte, wird xine die Lautstärke beim Starten unverändert lassen"
+msgstr ""
+"Wenn nicht angewählte, wird xine die Lautstärke beim Starten unverändert "
+"lassen"
 
 #: src/xine-engine/osd.c:863
 msgid "Palette (foreground-border-background) to use on subtitles"
@@ -1478,7 +1479,8 @@ msgstr "load_plugins: Demultiplexer-Plugin gefunden : %s\n"
 
 #: src/xine-engine/load_plugins.c:161
 msgid "load_plugins: too many demux plugins installed, exiting.\n"
-msgstr "load_plugins: Zu viele Demultiplexer-Plugins installiert, beende jetzt.\n"
+msgstr ""
+"load_plugins: Zu viele Demultiplexer-Plugins installiert, beende jetzt.\n"
 
 #: src/xine-engine/load_plugins.c:300
 #, c-format
@@ -1554,7 +1556,7 @@ msgstr ""
 "         diesem Dekodierungs-Plugin existiert.\n"
 "Das Installieren aktueller Dekodierungs-Plugins sollte helfen.\n"
 
-#: src/libffmpeg/xine_decoder.c:375
+#: src/libffmpeg/xine_decoder.c:379
 #, c-format
 msgid ""
 "ffmpeg: plugin doesn't support plugin API version %d.\n"
@@ -1576,7 +1578,7 @@ msgstr "DXR3: Gerätepfad"
 msgid "The device file of the dxr3 mpeg decoder card control device."
 msgstr "Der Gerätepfad für das Steuergerät der DXR3-MPEG-Dekoderkarte."
 
-#: src/dxr3/dxr3_decode_spu.c:100
+#: src/dxr3/dxr3_decode_spu.c:106
 #, c-format
 msgid ""
 "dxr3_decode_spu: plugin doesn't support plugin API version %d.\n"
@@ -1597,7 +1599,8 @@ msgid ""
 "dxr3_decode_video: decoder plugin. Installing current plugins should help.\n"
 msgstr ""
 "dxr3_decode_video: Plugin unterstützt die API-Version %d nicht.\n"
-"                   Das bedeutet das ein Versionsunterschied zwischen xine und\n"
+"                   Das bedeutet das ein Versionsunterschied zwischen xine "
+"und\n"
 "                   diesem Plugin existiert.\n"
 "Das Installieren aktueller Plugins sollte helfen.\n"
 
@@ -1607,7 +1610,9 @@ msgstr "DXR3: Videodekoder Priorität"
 
 #: src/dxr3/dxr3_decode_video.c:165
 msgid "Decoder priorities greater 5 enable hardware decoding, 0 disables it."
-msgstr "Dekoderprioritäten größer 5 aktivieren Hardwaredekodierung, 0 deaktiviert sie."
+msgstr ""
+"Dekoderprioritäten größer 5 aktivieren Hardwaredekodierung, 0 deaktiviert "
+"sie."
 
 #: src/dxr3/dxr3_decode_video.c:175
 msgid "Try to sync video every frame"
@@ -1615,13 +1620,14 @@ msgstr "Versuche Video mit jedem Bild zu synchonisieren"
 
 #: src/dxr3/dxr3_decode_video.c:176
 msgid "This is relevant for progressive video only (most PAL films)."
-msgstr "Dies ist nur für progessive Videos (die meisten PAL-Filme) interessant."
+msgstr ""
+"Dies ist nur für progessive Videos (die meisten PAL-Filme) interessant."
 
 #: src/dxr3/dxr3_decode_video.c:180
 msgid "Use alternate Play mode"
 msgstr "Alternativen Wiedergabemodus benutzen"
 
-#: src/dxr3/video_out_dxr3.c:161 src/dxr3/dxr3_decode_video.c:181
+#: src/dxr3/dxr3_decode_video.c:181 src/dxr3/video_out_dxr3.c:161
 msgid "Enabling this option will utilise a smoother play mode."
 msgstr "Das Aktivieren dieser Option sorgt für eine flüssigere Wiedergabe."
 
@@ -1641,7 +1647,8 @@ msgstr "DXR3enc: Bitrate der RTE-MPEG Wiedergabe (kBit/s)"
 msgid ""
 "The bitrate the mpeg encoder library librte should use for dxr3's encoding "
 "mode"
-msgstr "Bitrate für die MPEG-Enkodierungsbibliothek librte zur DXR3 Enkodierung."
+msgstr ""
+"Bitrate für die MPEG-Enkodierungsbibliothek librte zur DXR3 Enkodierung."
 
 #: src/dxr3/dxr3_mpeg_encoders.c:375
 msgid "Dxr3enc: fame mpeg encoding quality"
@@ -1679,10 +1686,6 @@ msgstr "Falls deaktiviert, geht xine von einem 4:3 Seitenverhältniss aus."
 msgid "dxr3: use alternate play mode for mpeg encoder playback"
 msgstr "dxr3: Benutze alternativen Wiedergabemodus für MPEG-Wiedergabe"
 
-#: src/dxr3/video_out_dxr3.c:214 src/dxr3/video_out_dxr3.c:236
-msgid "none"
-msgstr "Keine"
-
 #: src/dxr3/video_out_dxr3.c:221
 msgid "the encoder for non mpeg content"
 msgstr "Der Enkodierer für nicht-MPEG-Inhalte"
@@ -1691,7 +1694,9 @@ msgstr "Der Enkodierer für nicht-MPEG-Inhalte"
 msgid ""
 "Content other than mpeg has to pass an additional reencoding stage, because "
 "the dxr3 handles mpeg only."
-msgstr "Nicht-MPEG-Inhalte müssen eine zusätzliche Reenkodierungsstufe durchlaufen, da die DXR3 nur MPEG kann."
+msgstr ""
+"Nicht-MPEG-Inhalte müssen eine zusätzliche Reenkodierungsstufe durchlaufen, "
+"da die DXR3 nur MPEG kann."
 
 #: src/dxr3/video_out_dxr3.c:252
 msgid "Dxr3: contrast control"
@@ -1719,7 +1724,8 @@ msgstr "DXR3: Farbbereich für Overlay"
 
 #: src/dxr3/video_out_dxr3.c:282
 msgid "A greater value widens the tolerance for the overlay keycolor"
-msgstr "Ein größerer Wert vergrößert die Toleranz für die den Farbwert des Overlays"
+msgstr ""
+"Ein größerer Wert vergrößert die Toleranz für die den Farbwert des Overlays"
 
 #: src/dxr3/video_out_dxr3.c:293
 msgid "dxr3 preferred tv mode"
@@ -1799,7 +1805,8 @@ msgstr "Priorität des divx4-Plugins (>5 zum aktivieren)"
 
 #: src/libdivx4/xine_decoder.c:598
 msgid "the postprocessing level, 0 = none and fast, 6 = all and slow"
-msgstr "Nachbearbeitungsstufe, 0 = keine, aber schnell, 6 = alles, dafür langsam"
+msgstr ""
+"Nachbearbeitungsstufe, 0 = keine, aber schnell, 6 = alles, dafür langsam"
 
 #: src/libdivx4/xine_decoder.c:601
 msgid "use divx4 plugin for msmpeg4v3 streams"
@@ -1822,23 +1829,11 @@ msgstr ""
 "           diesem Dekodierungs-Plugin existiert.\n"
 "Das Installieren aktueller Plugins sollte helfen.\n"
 
-#: src/xine-utils/memcpy.c:437
+#: src/xine-utils/memcpy.c:439
 msgid "Memcopy method to use in xine for large data chunks."
 msgstr "Kopiermethode für große Datenbereiche."
 
-#: src/libsputext/xine_decoder.c:1039
-msgid "Small"
-msgstr "Klein"
-
-#: src/libsputext/xine_decoder.c:1040
-msgid "Normal"
-msgstr "Normal"
-
 #: src/libsputext/xine_decoder.c:1041
-msgid "Large"
-msgstr "Groß"
-
-#: src/libsputext/xine_decoder.c:1045
 #, c-format
 msgid ""
 "libsputext: doesn't support plugin api version %d.\n"
@@ -1849,21 +1844,23 @@ msgstr ""
 "            Das bedeutet das ein Versionsunterschied zwischen xine und\n"
 "            diesem Plugin existiert.\n"
 
-#: src/libsputext/xine_decoder.c:1067
+#: src/libsputext/xine_decoder.c:1063
 msgid "font for avi subtitles"
 msgstr "Zeichensatz für AVI-Untertitel"
 
-#: src/libsputext/xine_decoder.c:1073
+#: src/libsputext/xine_decoder.c:1069
 msgid "subtitle size (relative window size)"
 msgstr "Untertitelgröße (Relativ zu Fenstergröße)"
 
-#: src/libsputext/xine_decoder.c:1078
+#: src/libsputext/xine_decoder.c:1074
 msgid "source encoding of subtitles"
 msgstr "Zeichenkodierung für Untertitel"
 
-#: src/libsputext/xine_decoder.c:1083
+#: src/libsputext/xine_decoder.c:1079
 msgid "target encoding for subtitles (have to match font encoding)"
-msgstr "Zielzeichenkodierung für Untertitel (muß mit Zeichensatzkodierung übereinstimmen)"
+msgstr ""
+"Zielzeichenkodierung für Untertitel (muß mit Zeichensatzkodierung "
+"übereinstimmen)"
 
 #: src/libspucc/xine_decoder.c:220
 msgid "Enable closed captions in MPEG-2 streams"
@@ -1901,7 +1898,7 @@ msgstr ""
 "          diesem Plugin existiert.\n"
 "Das Installieren aktueller Plugins sollte helfen.\n"
 
-#: src/libxvid/xine_decoder.c:224
+#: src/libxvid/xine_decoder.c:226
 #, c-format
 msgid ""
 "xvid: plugin doesn't support plugin API version %d.\n"
@@ -1913,7 +1910,7 @@ msgstr ""
 "      diesem Dekodierung-Plugin existiert.\n"
 "Das Installieren aktueller Plugins sollte helfen.\n"
 
-#: src/libxvid/xine_decoder.c:234
+#: src/libxvid/xine_decoder.c:236
 #, c-format
 msgid ""
 "xvid: there is mismatch between API used by currently installed XviD\n"
@@ -1922,7 +1919,8 @@ msgid ""
 msgstr ""
 "xvid: Es existiert ein API-Versionsunterschied zwischen der verwendeten\n"
 "      XviD-Bibliothek (%d.%d) und der Version zum Übersetzungszeitpunkt\n"
-"      (%d.%d). Das Neuübersetzten mit der momentanen Bibliothek sollte hefen.\n"
+"      (%d.%d). Das Neuübersetzten mit der momentanen Bibliothek sollte "
+"hefen.\n"
 
 #: src/libxinevdec/cinepak.c:432
 #, c-format
@@ -1963,6 +1961,21 @@ msgstr ""
 "           diesem Dekodierungs-Plugin existiert.\n"
 "Das Installieren aktueller Plugins sollte helfen.\n"
 
+#~ msgid "unable to open %s: %s."
+#~ msgstr "Kann %s nicht öffnen: %s."
+
+#~ msgid "none"
+#~ msgstr "Keine"
+
+#~ msgid "Small"
+#~ msgstr "Klein"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Large"
+#~ msgstr "Groß"
+
 #~ msgid ""
 #~ "demux_qt: video codec %s (%f fps), audio codec %s (%ld Hz, %d bits)\n"
 #~ msgstr ""
diff --git a/po/es.po b/po/es.po
index bf59191fe..8cc7d86d0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.8\n"
-"POT-Creation-Date: 2002-06-23 10:57+0200\n"
+"POT-Creation-Date: 2002-06-24 21:51+0200\n"
 "PO-Revision-Date: 2002-02-20 00:00+0100\n"
 "Last-Translator: Juan Manuel García Molina <juanma_gm@wanadoo.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -993,7 +993,7 @@ msgstr "input_vcd: falló CDROM_DRIVE_STATUS: %s\n"
 msgid "vcd device input plugin as shipped with xine"
 msgstr "plugin de entrada del dispositivo de vcd incluido en xine"
 
-#: src/input/input_vcd.c:991
+#: src/input/input_vcd.c:991 src/input/input_vcd.c:1071
 #, c-format
 msgid "unable to open %s: %s.\n"
 msgstr "no se puede abrir %s: %s.\n"
@@ -1002,11 +1002,6 @@ msgstr "no se puede abrir %s: %s.\n"
 msgid "vcd_read_toc failed\n"
 msgstr "falló vcd_read_toc\n"
 
-#: src/input/input_vcd.c:1071
-#, c-format
-msgid "unable to open %s: %s."
-msgstr "no se puede abrir %s: %s."
-
 #: src/input/input_vcd.c:1146
 #, c-format
 msgid ""
@@ -1570,7 +1565,7 @@ msgstr ""
 "           y este plugin demultiplexor.\n"
 "Instalar los plugins demultiplexores actuales debería ser de ayuda.\n"
 
-#: src/libffmpeg/xine_decoder.c:375
+#: src/libffmpeg/xine_decoder.c:379
 #, fuzzy, c-format
 msgid ""
 "ffmpeg: plugin doesn't support plugin API version %d.\n"
@@ -1592,7 +1587,7 @@ msgstr ""
 msgid "The device file of the dxr3 mpeg decoder card control device."
 msgstr ""
 
-#: src/dxr3/dxr3_decode_spu.c:100
+#: src/dxr3/dxr3_decode_spu.c:106
 #, fuzzy, c-format
 msgid ""
 "dxr3_decode_spu: plugin doesn't support plugin API version %d.\n"
@@ -1637,7 +1632,7 @@ msgstr ""
 msgid "Use alternate Play mode"
 msgstr ""
 
-#: src/dxr3/dxr3_decode_video.c:181
+#: src/dxr3/dxr3_decode_video.c:181 src/dxr3/video_out_dxr3.c:161
 msgid "Enabling this option will utilise a smoother play mode."
 msgstr ""
 
@@ -1695,15 +1690,6 @@ msgstr ""
 msgid "dxr3: use alternate play mode for mpeg encoder playback"
 msgstr ""
 
-#: src/dxr3/video_out_dxr3.c:161
-msgid "Enabling this option will utilise a smoother play mode"
-msgstr ""
-
-#: src/dxr3/video_out_dxr3.c:214 src/dxr3/video_out_dxr3.c:236
-#, fuzzy
-msgid "none"
-msgstr "hecho\n"
-
 #: src/dxr3/video_out_dxr3.c:221
 msgid "the encoder for non mpeg content"
 msgstr ""
@@ -1843,23 +1829,11 @@ msgstr ""
 "           y este plugin demultiplexor.\n"
 "Instalar los plugins demultiplexores actuales debería ser de ayuda.\n"
 
-#: src/xine-utils/memcpy.c:437
+#: src/xine-utils/memcpy.c:439
 msgid "Memcopy method to use in xine for large data chunks."
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1039
-msgid "Small"
-msgstr ""
-
-#: src/libsputext/xine_decoder.c:1040
-msgid "Normal"
-msgstr ""
-
 #: src/libsputext/xine_decoder.c:1041
-msgid "Large"
-msgstr ""
-
-#: src/libsputext/xine_decoder.c:1045
 #, fuzzy, c-format
 msgid ""
 "libsputext: doesn't support plugin api version %d.\n"
@@ -1873,20 +1847,20 @@ msgstr ""
 "de entrada.\n"
 "Instalar los plugins de entrada actuales debería ser de ayuda.\n"
 
-#: src/libsputext/xine_decoder.c:1067
+#: src/libsputext/xine_decoder.c:1063
 msgid "font for avi subtitles"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1073
+#: src/libsputext/xine_decoder.c:1069
 msgid "subtitle size (relative window size)"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1078
-msgid "source encoging of subtitles"
+#: src/libsputext/xine_decoder.c:1074
+msgid "source encoding of subtitles"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1083
-msgid "target encoging for subtitles (have to match font encoding)"
+#: src/libsputext/xine_decoder.c:1079
+msgid "target encoding for subtitles (have to match font encoding)"
 msgstr ""
 
 #: src/libspucc/xine_decoder.c:220
@@ -1927,7 +1901,7 @@ msgstr ""
 "de entrada.\n"
 "Instalar los plugins de entrada actuales debería ser de ayuda.\n"
 
-#: src/libxvid/xine_decoder.c:224
+#: src/libxvid/xine_decoder.c:226
 #, fuzzy, c-format
 msgid ""
 "xvid: plugin doesn't support plugin API version %d.\n"
@@ -1939,7 +1913,7 @@ msgstr ""
 "           y este plugin demultiplexor.\n"
 "Instalar los plugins demultiplexores actuales debería ser de ayuda.\n"
 
-#: src/libxvid/xine_decoder.c:234
+#: src/libxvid/xine_decoder.c:236
 #, c-format
 msgid ""
 "xvid: there is mismatch between API used by currently installed XviD\n"
@@ -1986,6 +1960,13 @@ msgstr ""
 "           y este plugin demultiplexor.\n"
 "Instalar los plugins demultiplexores actuales debería ser de ayuda.\n"
 
+#~ msgid "unable to open %s: %s."
+#~ msgstr "no se puede abrir %s: %s."
+
+#, fuzzy
+#~ msgid "none"
+#~ msgstr "hecho\n"
+
 #~ msgid ""
 #~ "demux_qt: video codec %s (%f fps), audio codec %s (%ld Hz, %d bits)\n"
 #~ msgstr ""
diff --git a/po/fr.po b/po/fr.po
index e91f2ab70..fbf3259fc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.9\n"
-"POT-Creation-Date: 2002-06-23 10:57+0200\n"
+"POT-Creation-Date: 2002-06-24 21:51+0200\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"
@@ -997,7 +997,7 @@ msgstr ""
 msgid "vcd device input plugin as shipped with xine"
 msgstr "Plugin d'entrée VCD fournis avec xine"
 
-#: src/input/input_vcd.c:991
+#: src/input/input_vcd.c:991 src/input/input_vcd.c:1071
 #, c-format
 msgid "unable to open %s: %s.\n"
 msgstr ""
@@ -1006,11 +1006,6 @@ msgstr ""
 msgid "vcd_read_toc failed\n"
 msgstr ""
 
-#: src/input/input_vcd.c:1071
-#, c-format
-msgid "unable to open %s: %s."
-msgstr ""
-
 #: src/input/input_vcd.c:1146
 #, c-format
 msgid ""
@@ -1562,7 +1557,7 @@ msgstr ""
 "          plugin de demultiplexage ne correspondent pas.\n"
 "Installer la version courante des plugins de demultiplexage peut aider.\n"
 
-#: src/libffmpeg/xine_decoder.c:375
+#: src/libffmpeg/xine_decoder.c:379
 #, fuzzy, c-format
 msgid ""
 "ffmpeg: plugin doesn't support plugin API version %d.\n"
@@ -1584,7 +1579,7 @@ msgstr ""
 msgid "The device file of the dxr3 mpeg decoder card control device."
 msgstr ""
 
-#: src/dxr3/dxr3_decode_spu.c:100
+#: src/dxr3/dxr3_decode_spu.c:106
 #, fuzzy, c-format
 msgid ""
 "dxr3_decode_spu: plugin doesn't support plugin API version %d.\n"
@@ -1629,7 +1624,7 @@ msgstr ""
 msgid "Use alternate Play mode"
 msgstr ""
 
-#: src/dxr3/dxr3_decode_video.c:181
+#: src/dxr3/dxr3_decode_video.c:181 src/dxr3/video_out_dxr3.c:161
 msgid "Enabling this option will utilise a smoother play mode."
 msgstr ""
 
@@ -1687,14 +1682,6 @@ msgstr ""
 msgid "dxr3: use alternate play mode for mpeg encoder playback"
 msgstr ""
 
-#: src/dxr3/video_out_dxr3.c:161
-msgid "Enabling this option will utilise a smoother play mode"
-msgstr ""
-
-#: src/dxr3/video_out_dxr3.c:214 src/dxr3/video_out_dxr3.c:236
-msgid "none"
-msgstr ""
-
 #: src/dxr3/video_out_dxr3.c:221
 msgid "the encoder for non mpeg content"
 msgstr ""
@@ -1834,23 +1821,11 @@ msgstr ""
 "           plugin de demultiplexage ne correspondent pas.\n"
 "Installer la version courante des plugins de demultiplexage peut aider.\n"
 
-#: src/xine-utils/memcpy.c:437
+#: src/xine-utils/memcpy.c:439
 msgid "Memcopy method to use in xine for large data chunks."
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1039
-msgid "Small"
-msgstr ""
-
-#: src/libsputext/xine_decoder.c:1040
-msgid "Normal"
-msgstr ""
-
 #: src/libsputext/xine_decoder.c:1041
-msgid "Large"
-msgstr ""
-
-#: src/libsputext/xine_decoder.c:1045
 #, fuzzy, c-format
 msgid ""
 "libsputext: doesn't support plugin api version %d.\n"
@@ -1863,20 +1838,20 @@ msgstr ""
 "d'entrée ne correspondent pas.\n"
 "Installer la version courante des plugins d'entrée peut aider.\n"
 
-#: src/libsputext/xine_decoder.c:1067
+#: src/libsputext/xine_decoder.c:1063
 msgid "font for avi subtitles"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1073
+#: src/libsputext/xine_decoder.c:1069
 msgid "subtitle size (relative window size)"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1078
-msgid "source encoging of subtitles"
+#: src/libsputext/xine_decoder.c:1074
+msgid "source encoding of subtitles"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1083
-msgid "target encoging for subtitles (have to match font encoding)"
+#: src/libsputext/xine_decoder.c:1079
+msgid "target encoding for subtitles (have to match font encoding)"
 msgstr ""
 
 #: src/libspucc/xine_decoder.c:220
@@ -1916,7 +1891,7 @@ msgstr ""
 "d'entrée ne correspondent pas.\n"
 "Installer la version courante des plugins d'entrée peux aider.\n"
 
-#: src/libxvid/xine_decoder.c:224
+#: src/libxvid/xine_decoder.c:226
 #, fuzzy, c-format
 msgid ""
 "xvid: plugin doesn't support plugin API version %d.\n"
@@ -1928,7 +1903,7 @@ msgstr ""
 "           plugin de demultiplexage ne correspondent pas.\n"
 "Installer la version courante des plugins de demultiplexage peux aider.\n"
 
-#: src/libxvid/xine_decoder.c:234
+#: src/libxvid/xine_decoder.c:236
 #, c-format
 msgid ""
 "xvid: there is mismatch between API used by currently installed XviD\n"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index 8c4078033..2b415fdb3 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.9\n"
-"POT-Creation-Date: 2002-06-23 10:57+0200\n"
+"POT-Creation-Date: 2002-06-24 21:51+0200\n"
 "PO-Revision-Date: 2002-06-07 11:25+0200\n"
 "Last-Translator: Bart³omiej Muryn <_4ever_@irc.pl>\n"
 "Language-Team: Polski <pl@li.org>\n"
@@ -982,7 +982,7 @@ msgstr "input_vcd: CDROM_DRIVE_STATUS zawiód³: %s\n"
 msgid "vcd device input plugin as shipped with xine"
 msgstr "wtyczka wej¶cia VCD dostarczana z xine"
 
-#: src/input/input_vcd.c:991
+#: src/input/input_vcd.c:991 src/input/input_vcd.c:1071
 #, c-format
 msgid "unable to open %s: %s.\n"
 msgstr "nie mogê otworzyæ %s: %s.\n"
@@ -991,11 +991,6 @@ msgstr "nie mogê otworzyæ %s: %s.\n"
 msgid "vcd_read_toc failed\n"
 msgstr "vcd_read_toc zawiod³o\n"
 
-#: src/input/input_vcd.c:1071
-#, c-format
-msgid "unable to open %s: %s."
-msgstr "nie mogê otworzyæ %s: %s."
-
 #: src/input/input_vcd.c:1146
 #, c-format
 msgid ""
@@ -1556,7 +1551,7 @@ msgstr ""
 "demultiplexera.\n"
 "Instalacja najnowszej wersji wtyczki powinna pomóc.\n"
 
-#: src/libffmpeg/xine_decoder.c:375
+#: src/libffmpeg/xine_decoder.c:379
 #, fuzzy, c-format
 msgid ""
 "ffmpeg: plugin doesn't support plugin API version %d.\n"
@@ -1578,7 +1573,7 @@ msgstr ""
 msgid "The device file of the dxr3 mpeg decoder card control device."
 msgstr ""
 
-#: src/dxr3/dxr3_decode_spu.c:100
+#: src/dxr3/dxr3_decode_spu.c:106
 #, fuzzy, c-format
 msgid ""
 "dxr3_decode_spu: plugin doesn't support plugin API version %d.\n"
@@ -1623,7 +1618,7 @@ msgstr ""
 msgid "Use alternate Play mode"
 msgstr ""
 
-#: src/dxr3/dxr3_decode_video.c:181
+#: src/dxr3/dxr3_decode_video.c:181 src/dxr3/video_out_dxr3.c:161
 msgid "Enabling this option will utilise a smoother play mode."
 msgstr ""
 
@@ -1681,14 +1676,6 @@ msgstr ""
 msgid "dxr3: use alternate play mode for mpeg encoder playback"
 msgstr ""
 
-#: src/dxr3/video_out_dxr3.c:161
-msgid "Enabling this option will utilise a smoother play mode"
-msgstr ""
-
-#: src/dxr3/video_out_dxr3.c:214 src/dxr3/video_out_dxr3.c:236
-msgid "none"
-msgstr ""
-
 #: src/dxr3/video_out_dxr3.c:221
 msgid "the encoder for non mpeg content"
 msgstr ""
@@ -1828,23 +1815,11 @@ msgstr ""
 "demultiplexera.\n"
 "Instalacja najnowszej wersji wtyczki powinna pomóc.\n"
 
-#: src/xine-utils/memcpy.c:437
+#: src/xine-utils/memcpy.c:439
 msgid "Memcopy method to use in xine for large data chunks."
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1039
-msgid "Small"
-msgstr ""
-
-#: src/libsputext/xine_decoder.c:1040
-msgid "Normal"
-msgstr ""
-
 #: src/libsputext/xine_decoder.c:1041
-msgid "Large"
-msgstr ""
-
-#: src/libsputext/xine_decoder.c:1045
 #, fuzzy, c-format
 msgid ""
 "libsputext: doesn't support plugin api version %d.\n"
@@ -1856,20 +1831,20 @@ msgstr ""
 "oznacza to niezgodno¶æ miêdzy xine a t± wtyczka wej¶cia\n"
 "Instalacja najnowszej wersji wtyczki powinna pomóc.\n"
 
-#: src/libsputext/xine_decoder.c:1067
+#: src/libsputext/xine_decoder.c:1063
 msgid "font for avi subtitles"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1073
+#: src/libsputext/xine_decoder.c:1069
 msgid "subtitle size (relative window size)"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1078
-msgid "source encoging of subtitles"
+#: src/libsputext/xine_decoder.c:1074
+msgid "source encoding of subtitles"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1083
-msgid "target encoging for subtitles (have to match font encoding)"
+#: src/libsputext/xine_decoder.c:1079
+msgid "target encoding for subtitles (have to match font encoding)"
 msgstr ""
 
 #: src/libspucc/xine_decoder.c:220
@@ -1908,7 +1883,7 @@ msgstr ""
 "oznacza to niezgodno¶æ miêdzy xine a t± wtyczka wej¶cia\n"
 "Instalacja najnowszej wersji wtyczki powinna pomóc.\n"
 
-#: src/libxvid/xine_decoder.c:224
+#: src/libxvid/xine_decoder.c:226
 #, fuzzy, c-format
 msgid ""
 "xvid: plugin doesn't support plugin API version %d.\n"
@@ -1920,7 +1895,7 @@ msgstr ""
 "demultiplexera.\n"
 "Instalacja najnowszej wersji wtyczki powinna pomóc.\n"
 
-#: src/libxvid/xine_decoder.c:234
+#: src/libxvid/xine_decoder.c:236
 #, c-format
 msgid ""
 "xvid: there is mismatch between API used by currently installed XviD\n"
@@ -1967,6 +1942,9 @@ msgstr ""
 "demultiplexera.\n"
 "Instalacja najnowszej wersji wtyczki powinna pomóc.\n"
 
+#~ msgid "unable to open %s: %s."
+#~ msgstr "nie mogê otworzyæ %s: %s."
+
 #~ msgid ""
 #~ "demux_qt: video codec %s (%f fps), audio codec %s (%ld Hz, %d bits)\n"
 #~ msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3b5797ea3..128a09f3d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.9\n"
-"POT-Creation-Date: 2002-06-23 10:57+0200\n"
+"POT-Creation-Date: 2002-06-24 21:51+0200\n"
 "PO-Revision-Date: 2002-01-22 18:31GMT-3\n"
 "Last-Translator: Marcelo Roberto Jimenez <mroberto@cetuc.puc-rio.br>\n"
 "Language-Team: Portuguese (Brazilian) <pt_BR@li.org>\n"
@@ -990,7 +990,7 @@ msgstr "input_vcd: CDROM_DRIVE_STATUS failed: %s\n"
 msgid "vcd device input plugin as shipped with xine"
 msgstr "vcd device input plugin as shipped with xine"
 
-#: src/input/input_vcd.c:991
+#: src/input/input_vcd.c:991 src/input/input_vcd.c:1071
 #, c-format
 msgid "unable to open %s: %s.\n"
 msgstr "incapaz de abrir %s: %s.\n"
@@ -999,11 +999,6 @@ msgstr "incapaz de abrir %s: %s.\n"
 msgid "vcd_read_toc failed\n"
 msgstr "vcd_read_toc falhou\n"
 
-#: src/input/input_vcd.c:1071
-#, c-format
-msgid "unable to open %s: %s."
-msgstr "incapaz de abrir %s: %s."
-
 #: src/input/input_vcd.c:1146
 #, c-format
 msgid ""
@@ -1569,7 +1564,7 @@ msgstr ""
 "xine e este             plugin de demuxer.\n"
 "Instalar os plugins de demuxer atuais deve ajudar.\n"
 
-#: src/libffmpeg/xine_decoder.c:375
+#: src/libffmpeg/xine_decoder.c:379
 #, fuzzy, c-format
 msgid ""
 "ffmpeg: plugin doesn't support plugin API version %d.\n"
@@ -1591,7 +1586,7 @@ msgstr ""
 msgid "The device file of the dxr3 mpeg decoder card control device."
 msgstr ""
 
-#: src/dxr3/dxr3_decode_spu.c:100
+#: src/dxr3/dxr3_decode_spu.c:106
 #, fuzzy, c-format
 msgid ""
 "dxr3_decode_spu: plugin doesn't support plugin API version %d.\n"
@@ -1636,7 +1631,7 @@ msgstr ""
 msgid "Use alternate Play mode"
 msgstr ""
 
-#: src/dxr3/dxr3_decode_video.c:181
+#: src/dxr3/dxr3_decode_video.c:181 src/dxr3/video_out_dxr3.c:161
 msgid "Enabling this option will utilise a smoother play mode."
 msgstr ""
 
@@ -1694,15 +1689,6 @@ msgstr ""
 msgid "dxr3: use alternate play mode for mpeg encoder playback"
 msgstr ""
 
-#: src/dxr3/video_out_dxr3.c:161
-msgid "Enabling this option will utilise a smoother play mode"
-msgstr ""
-
-#: src/dxr3/video_out_dxr3.c:214 src/dxr3/video_out_dxr3.c:236
-#, fuzzy
-msgid "none"
-msgstr "feito\n"
-
 #: src/dxr3/video_out_dxr3.c:221
 msgid "the encoder for non mpeg content"
 msgstr ""
@@ -1842,23 +1828,11 @@ msgstr ""
 "e este demux_avi: plugin de demuxer.\n"
 "Instalar os plugind de demuxer atuais deve ajudar.\n"
 
-#: src/xine-utils/memcpy.c:437
+#: src/xine-utils/memcpy.c:439
 msgid "Memcopy method to use in xine for large data chunks."
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1039
-msgid "Small"
-msgstr ""
-
-#: src/libsputext/xine_decoder.c:1040
-msgid "Normal"
-msgstr ""
-
 #: src/libsputext/xine_decoder.c:1041
-msgid "Large"
-msgstr ""
-
-#: src/libsputext/xine_decoder.c:1045
 #, fuzzy, c-format
 msgid ""
 "libsputext: doesn't support plugin api version %d.\n"
@@ -1871,20 +1845,20 @@ msgstr ""
 "plugin de entrada.\n"
 "Instalar os plugins de entrada atuais deve ajudar.\n"
 
-#: src/libsputext/xine_decoder.c:1067
+#: src/libsputext/xine_decoder.c:1063
 msgid "font for avi subtitles"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1073
+#: src/libsputext/xine_decoder.c:1069
 msgid "subtitle size (relative window size)"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1078
-msgid "source encoging of subtitles"
+#: src/libsputext/xine_decoder.c:1074
+msgid "source encoding of subtitles"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1083
-msgid "target encoging for subtitles (have to match font encoding)"
+#: src/libsputext/xine_decoder.c:1079
+msgid "target encoding for subtitles (have to match font encoding)"
 msgstr ""
 
 #: src/libspucc/xine_decoder.c:220
@@ -1924,7 +1898,7 @@ msgstr ""
 "plugin de entrada.\n"
 "Instalar os plugins de entrada atuais deve ajudar.\n"
 
-#: src/libxvid/xine_decoder.c:224
+#: src/libxvid/xine_decoder.c:226
 #, fuzzy, c-format
 msgid ""
 "xvid: plugin doesn't support plugin API version %d.\n"
@@ -1936,7 +1910,7 @@ msgstr ""
 "e este demux_avi: plugin de demuxer.\n"
 "Instalar os plugind de demuxer atuais deve ajudar.\n"
 
-#: src/libxvid/xine_decoder.c:234
+#: src/libxvid/xine_decoder.c:236
 #, c-format
 msgid ""
 "xvid: there is mismatch between API used by currently installed XviD\n"
@@ -1983,6 +1957,13 @@ msgstr ""
 "e este demux_avi: plugin de demuxer.\n"
 "Instalar os plugind de demuxer atuais deve ajudar.\n"
 
+#~ msgid "unable to open %s: %s."
+#~ msgstr "incapaz de abrir %s: %s."
+
+#, fuzzy
+#~ msgid "none"
+#~ msgstr "feito\n"
+
 #~ msgid ""
 #~ "demux_qt: video codec %s (%f fps), audio codec %s (%ld Hz, %d bits)\n"
 #~ msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 6b91719b3..d69fc96bf 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.9\n"
-"POT-Creation-Date: 2002-06-23 10:57+0200\n"
+"POT-Creation-Date: 2002-06-24 21:51+0200\n"
 "PO-Revision-Date: 2002-02-15 15:08+0200\n"
 "Last-Translator: Tomá¹ Kovár <tomask@mac.com>\n"
 "Language-Team: Slovak <ski18n@lists.isternet.sk>\n"
@@ -785,8 +785,7 @@ msgstr "input_dvd: krátke èítanie v module input_dvd (%d != %d)\n"
 #: src/input/input_dvd.c:475
 #, c-format
 msgid "input_dvd: error in input_dvd plugin read: %Ld bytes is not a sector!\n"
-msgstr ""
-"input_dvd: chyba pri èítaní v module input_dvd: %d bajtov nie je sektor!\n"
+msgstr "input_dvd: chyba pri èítaní v module input_dvd: %Ld bajtov nie je sektor!\n"
 
 #: src/input/input_dvd.c:487
 msgid "input_dvd: read error in input_dvd plugin\n"
@@ -981,7 +980,7 @@ msgstr "input_vcd: zlyhala funkcia CDROM_DRIVE_STATUS: %s\n"
 msgid "vcd device input plugin as shipped with xine"
 msgstr "modul vstupu zo zariadenia vcd dodávaný so xine"
 
-#: src/input/input_vcd.c:991
+#: src/input/input_vcd.c:991 src/input/input_vcd.c:1071
 #, c-format
 msgid "unable to open %s: %s.\n"
 msgstr "nemo¾no otvori» %s: %s.\n"
@@ -990,11 +989,6 @@ msgstr "nemo¾no otvori» %s: %s.\n"
 msgid "vcd_read_toc failed\n"
 msgstr "zlyhala funkcia vcd_read_toc\n"
 
-#: src/input/input_vcd.c:1071
-#, c-format
-msgid "unable to open %s: %s."
-msgstr "nemo¾no otvori» %s: %s."
-
 #: src/input/input_vcd.c:1146
 #, c-format
 msgid ""
@@ -1552,7 +1546,7 @@ msgstr ""
 "          To znamená, ¾e xine a tento vstupný modul majú rozlièné verzie.\n"
 "          In¹talácia aktuálneho demultiplexného modulu by mala pomôc».\n"
 
-#: src/libffmpeg/xine_decoder.c:375
+#: src/libffmpeg/xine_decoder.c:379
 #, fuzzy, c-format
 msgid ""
 "ffmpeg: plugin doesn't support plugin API version %d.\n"
@@ -1573,7 +1567,7 @@ msgstr ""
 msgid "The device file of the dxr3 mpeg decoder card control device."
 msgstr ""
 
-#: src/dxr3/dxr3_decode_spu.c:100
+#: src/dxr3/dxr3_decode_spu.c:106
 #, fuzzy, c-format
 msgid ""
 "dxr3_decode_spu: plugin doesn't support plugin API version %d.\n"
@@ -1616,7 +1610,7 @@ msgstr ""
 msgid "Use alternate Play mode"
 msgstr ""
 
-#: src/dxr3/dxr3_decode_video.c:181
+#: src/dxr3/dxr3_decode_video.c:181 src/dxr3/video_out_dxr3.c:161
 msgid "Enabling this option will utilise a smoother play mode."
 msgstr ""
 
@@ -1674,15 +1668,6 @@ msgstr ""
 msgid "dxr3: use alternate play mode for mpeg encoder playback"
 msgstr ""
 
-#: src/dxr3/video_out_dxr3.c:161
-msgid "Enabling this option will utilise a smoother play mode"
-msgstr ""
-
-#: src/dxr3/video_out_dxr3.c:214 src/dxr3/video_out_dxr3.c:236
-#, fuzzy
-msgid "none"
-msgstr "hotovo\n"
-
 #: src/dxr3/video_out_dxr3.c:221
 msgid "the encoder for non mpeg content"
 msgstr ""
@@ -1817,23 +1802,11 @@ msgstr ""
 "           To znamená, ¾e xine a tento vstupný modul majú rozlièné verzie.\n"
 "           In¹talácia aktuálneho demultiplexného modulu by mala pomôc».\n"
 
-#: src/xine-utils/memcpy.c:437
+#: src/xine-utils/memcpy.c:439
 msgid "Memcopy method to use in xine for large data chunks."
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1039
-msgid "Small"
-msgstr ""
-
-#: src/libsputext/xine_decoder.c:1040
-msgid "Normal"
-msgstr ""
-
 #: src/libsputext/xine_decoder.c:1041
-msgid "Large"
-msgstr ""
-
-#: src/libsputext/xine_decoder.c:1045
 #, fuzzy, c-format
 msgid ""
 "libsputext: doesn't support plugin api version %d.\n"
@@ -1845,20 +1818,20 @@ msgstr ""
 "To znamená, ¾e xine a tento vstupný modul majú rozlièné verzie.\n"
 "In¹talácia aktuálneho vstupného modulu by mala pomôc».\n"
 
-#: src/libsputext/xine_decoder.c:1067
+#: src/libsputext/xine_decoder.c:1063
 msgid "font for avi subtitles"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1073
+#: src/libsputext/xine_decoder.c:1069
 msgid "subtitle size (relative window size)"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1078
-msgid "source encoging of subtitles"
+#: src/libsputext/xine_decoder.c:1074
+msgid "source encoding of subtitles"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1083
-msgid "target encoging for subtitles (have to match font encoding)"
+#: src/libsputext/xine_decoder.c:1079
+msgid "target encoding for subtitles (have to match font encoding)"
 msgstr ""
 
 #: src/libspucc/xine_decoder.c:220
@@ -1897,7 +1870,7 @@ msgstr ""
 "To znamená, ¾e xine a tento vstupný modul majú rozlièné verzie.\n"
 "In¹talácia aktuálneho vstupného modulu by mala pomôc».\n"
 
-#: src/libxvid/xine_decoder.c:224
+#: src/libxvid/xine_decoder.c:226
 #, fuzzy, c-format
 msgid ""
 "xvid: plugin doesn't support plugin API version %d.\n"
@@ -1908,7 +1881,7 @@ msgstr ""
 "           To znamená, ¾e xine a tento vstupný modul majú rozlièné verzie.\n"
 "           In¹talácia aktuálneho demultiplexného modulu by mala pomôc».\n"
 
-#: src/libxvid/xine_decoder.c:234
+#: src/libxvid/xine_decoder.c:236
 #, c-format
 msgid ""
 "xvid: there is mismatch between API used by currently installed XviD\n"
@@ -1952,6 +1925,13 @@ msgstr ""
 "           To znamená, ¾e xine a tento vstupný modul majú rozlièné verzie.\n"
 "           In¹talácia aktuálneho demultiplexného modulu by mala pomôc».\n"
 
+#~ msgid "unable to open %s: %s."
+#~ msgstr "nemo¾no otvori» %s: %s."
+
+#, fuzzy
+#~ msgid "none"
+#~ msgstr "hotovo\n"
+
 #~ msgid ""
 #~ "demux_qt: video codec %s (%f fps), audio codec %s (%ld Hz, %d bits)\n"
 #~ msgstr ""
diff --git a/po/xine-lib.pot b/po/xine-lib.pot
index d12cd8f9f..d64d99629 100644
--- a/po/xine-lib.pot
+++ b/po/xine-lib.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-06-23 10:57+0200\n"
+"POT-Creation-Date: 2002-06-24 21:51+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -896,7 +896,7 @@ msgstr ""
 msgid "vcd device input plugin as shipped with xine"
 msgstr ""
 
-#: src/input/input_vcd.c:991
+#: src/input/input_vcd.c:991 src/input/input_vcd.c:1071
 #, c-format
 msgid "unable to open %s: %s.\n"
 msgstr ""
@@ -905,11 +905,6 @@ msgstr ""
 msgid "vcd_read_toc failed\n"
 msgstr ""
 
-#: src/input/input_vcd.c:1071
-#, c-format
-msgid "unable to open %s: %s."
-msgstr ""
-
 #: src/input/input_vcd.c:1146
 #, c-format
 msgid ""
@@ -1424,7 +1419,7 @@ msgid ""
 "Installing current plugins should help.\n"
 msgstr ""
 
-#: src/libffmpeg/xine_decoder.c:375
+#: src/libffmpeg/xine_decoder.c:379
 #, c-format
 msgid ""
 "ffmpeg: plugin doesn't support plugin API version %d.\n"
@@ -1442,7 +1437,7 @@ msgstr ""
 msgid "The device file of the dxr3 mpeg decoder card control device."
 msgstr ""
 
-#: src/dxr3/dxr3_decode_spu.c:100
+#: src/dxr3/dxr3_decode_spu.c:106
 #, c-format
 msgid ""
 "dxr3_decode_spu: plugin doesn't support plugin API version %d.\n"
@@ -1479,7 +1474,7 @@ msgstr ""
 msgid "Use alternate Play mode"
 msgstr ""
 
-#: src/dxr3/dxr3_decode_video.c:181
+#: src/dxr3/dxr3_decode_video.c:181 src/dxr3/video_out_dxr3.c:161
 msgid "Enabling this option will utilise a smoother play mode."
 msgstr ""
 
@@ -1537,14 +1532,6 @@ msgstr ""
 msgid "dxr3: use alternate play mode for mpeg encoder playback"
 msgstr ""
 
-#: src/dxr3/video_out_dxr3.c:161
-msgid "Enabling this option will utilise a smoother play mode"
-msgstr ""
-
-#: src/dxr3/video_out_dxr3.c:214 src/dxr3/video_out_dxr3.c:236
-msgid "none"
-msgstr ""
-
 #: src/dxr3/video_out_dxr3.c:221
 msgid "the encoder for non mpeg content"
 msgstr ""
@@ -1664,23 +1651,11 @@ msgid ""
 "Installing current plugins should help.\n"
 msgstr ""
 
-#: src/xine-utils/memcpy.c:437
+#: src/xine-utils/memcpy.c:439
 msgid "Memcopy method to use in xine for large data chunks."
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1039
-msgid "Small"
-msgstr ""
-
-#: src/libsputext/xine_decoder.c:1040
-msgid "Normal"
-msgstr ""
-
 #: src/libsputext/xine_decoder.c:1041
-msgid "Large"
-msgstr ""
-
-#: src/libsputext/xine_decoder.c:1045
 #, c-format
 msgid ""
 "libsputext: doesn't support plugin api version %d.\n"
@@ -1688,20 +1663,20 @@ msgid ""
 "libsputext: this plugin.\n"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1067
+#: src/libsputext/xine_decoder.c:1063
 msgid "font for avi subtitles"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1073
+#: src/libsputext/xine_decoder.c:1069
 msgid "subtitle size (relative window size)"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1078
-msgid "source encoging of subtitles"
+#: src/libsputext/xine_decoder.c:1074
+msgid "source encoding of subtitles"
 msgstr ""
 
-#: src/libsputext/xine_decoder.c:1083
-msgid "target encoging for subtitles (have to match font encoding)"
+#: src/libsputext/xine_decoder.c:1079
+msgid "target encoding for subtitles (have to match font encoding)"
 msgstr ""
 
 #: src/libspucc/xine_decoder.c:220
@@ -1736,7 +1711,7 @@ msgid ""
 "libspucc: this plugin.\n"
 msgstr ""
 
-#: src/libxvid/xine_decoder.c:224
+#: src/libxvid/xine_decoder.c:226
 #, c-format
 msgid ""
 "xvid: plugin doesn't support plugin API version %d.\n"
@@ -1744,7 +1719,7 @@ msgid ""
 "xvid: decoder plugin. Installing current plugins should help.\n"
 msgstr ""
 
-#: src/libxvid/xine_decoder.c:234
+#: src/libxvid/xine_decoder.c:236
 #, c-format
 msgid ""
 "xvid: there is mismatch between API used by currently installed XviD\n"
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index a06b655f8..7e05faab4 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_dxr3.c,v 1.30 2002/06/24 17:40:44 pmhahn Exp $
+ * $Id: video_out_dxr3.c,v 1.31 2002/06/24 19:55:38 f1rmb Exp $
  */
  
 /* mpeg1 encoding video out plugin for the dxr3.  
@@ -211,7 +211,7 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen)
   printf("rte, ");
 #endif
 #endif
-  available_encoders[encoder] = _("none");
+  available_encoders[encoder] = "none";
   available_encoders[encoder + 1] = NULL;
 #if LOG_VID
   printf("none\n");
@@ -233,7 +233,7 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen)
       return 0;
     }
 #endif
-    if (strcmp(available_encoders[encoder], _("none")) == 0)
+    if (strcmp(available_encoders[encoder], "none") == 0)
       printf("video_out_dxr3: Mpeg encoding disabled.\n"
              "video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n"
              "video_out_dxr3: you will not be able to play non-mpeg content using this video out\n"
diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c
index daaec310e..a27cce1d3 100644
--- a/src/xine-utils/memcpy.c
+++ b/src/xine-utils/memcpy.c
@@ -421,14 +421,16 @@ void xine_probe_fast_memcpy(config_values_t *config)
   char *buf1, *buf2;
   int i, j, best;
   int config_flags = -1;
-  static char *memcpy_methods[] = {"probe", "glibc",
+  static char *memcpy_methods[] = { 
+    "probe", "glibc",
 #ifdef ARCH_X86
-     "kernel", "mmx", "mmxext", "sse", 
+    "kernel", "mmx", "mmxext", "sse", 
 #endif
 #ifdef ARCH_PPC
-	"ppcasm_memcpy", "ppcasm_cacheable_memcpy",
+    "ppcasm_memcpy", "ppcasm_cacheable_memcpy",
 #endif
-     NULL};
+    NULL
+  };
   
   config_flags = xine_mm_accel();