Fix more messages

CVS patchset: 6287
CVS date: 2004/03/18 09:07:00

12 files changed, 108 insertions, 174 deletions

diff --git a/po/cs.po b/po/cs.po
index 7dd71f433..90e5c7c4c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -50,7 +50,7 @@ msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:430
 msgid ""
-"audio_alsa_out: >>> check if another program don't already use PCM <<<\n"
+"audio_alsa_out: >>> check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:443
@@ -82,7 +82,7 @@ msgid "snd_pcm_open() failed:%d:%s\n"
 msgstr "osd: iconv_open() selhalo\n"
 
 #: src/audio_out/audio_alsa_out.c:1400
-msgid ">>> Check if another program don't already use PCM <<<\n"
+msgid ">>> Check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:1423
@@ -196,7 +196,7 @@ msgstr ""
 
 #: src/audio_out/audio_oss_out.c:227
 #, c-format
-msgid "audio_oss_out: audio rate : %d requested, %d provided by device/sec\n"
+msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:536 src/audio_out/audio_oss_out.c:587
@@ -223,7 +223,7 @@ msgstr ""
 msgid ""
 "The audio device name is created by concatenating the oss_device_name and "
 "the audio device number (eg /dev/sound/dsp2). If you do not need a number, "
-"set to -1 (eg /dev/sound/dsp. The range of this variable is -1 or 0-15."
+"set to -1 (eg /dev/sound/dsp). The range of this variable is -1 or 0-15."
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:755
@@ -307,19 +307,14 @@ msgstr "input_cda: selhala funkce open(%s): %s.\n"
 msgid "xine audio output plugin using oss-compliant audio devices/drivers"
 msgstr "výstupní zvukový modul xine použije zvuková zařízení/ovladače OSS"
 
-#: src/audio_out/audio_sun_out.c:441
-#, fuzzy, c-format
-msgid "audio_sun_out: Opening audio device %s failed: %s\n"
-msgstr "input_cda: selhal přístup k serveru '%s:%d': %s\n"
-
 #: src/audio_out/audio_sun_out.c:889
 msgid "device used for audio output with the 'Sun' audio plugin"
 msgstr "zařízení použité pro výstup se zvukovým modulem 'Sun'"
 
-#: src/audio_out/audio_sun_out.c:909
+#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:909
 #, fuzzy, c-format
 msgid "audio_sun_out: opening audio device %s failed: %s\n"
-msgstr "input_cda: selhal přístup k serveru '%s:%d': %s\n"
+msgstr "input_sun_out: selhal přístup k serveru '%s:%d': %s\n"
 
 #: src/audio_out/audio_sun_out.c:965
 msgid "xine audio output plugin using sun-compliant audio devices/drivers"
@@ -340,9 +335,7 @@ msgstr "modul zvukového výstupu xine pro win32 používající directx"
 
 #: src/demuxers/demux_asf.c:446
 #, fuzzy, c-format
-msgid ""
-"demux_asf: warning: The stream id=%d is encrypted\n"
-"."
+msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
 msgstr "demux_mpeg_pes: varování: selhalo dekódování sekvence PACK id=0x%x.\n"
 
 #: src/demuxers/demux_asf.c:448
diff --git a/po/de.po b/po/de.po
index 123e5dbd8..c9955f5b8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: xine-lib 1.0.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-03-17 08:34+0100\n"
-"PO-Revision-Date: 2003-11-04 22:36+0100\n"
+"PO-Revision-Date: 2004-03-18 09:55+0100\n"
 "Last-Translator: Philipp Hahn <pmhahn@users.sf.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -40,17 +40,18 @@ msgstr "Gerät für 5.1-Kanalausgabe"
 
 #: src/audio_out/audio_alsa_out.c:413
 msgid "audio_alsa_out:Already open...WHY!"
-msgstr ""
+msgstr "audio_alsa_out:Bereits geöffnet...WARUM?"
 
 #: src/audio_out/audio_alsa_out.c:428
 #, c-format
 msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n"
-msgstr ""
+msgstr "audio_alsa_out: snd_pcm_open() von %s schlug fehl: %s\n"
 
 #: src/audio_out/audio_alsa_out.c:430
-msgid ""
-"audio_alsa_out: >>> check if another program don't already use PCM <<<\n"
+msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n"
 msgstr ""
+"audio_alsa_out: >>> Überprüfen Sie, ob ein anderen Programm PCM bereits "
+"benutzt<<<\n"
 
 #: src/audio_out/audio_alsa_out.c:443
 #, c-format
@@ -58,6 +59,8 @@ msgid ""
 "audio_alsa_out: broken configuration for this PCM: no configurations "
 "available: %s\n"
 msgstr ""
+"audio_alsa_out: Kaputte Konfiguration für dieses PCM: Keine Konfiguration "
+"verfügbar: %s\n"
 
 #: src/audio_out/audio_alsa_out.c:1261 src/audio_out/audio_alsa_out.c:1535
 msgid "alsa mixer device"
@@ -66,7 +69,7 @@ msgstr "ALSA Mixergerät"
 #: src/audio_out/audio_alsa_out.c:1333
 #, c-format
 msgid "snd_lib_error_set_handler() failed: %d"
-msgstr ""
+msgstr "snd_lib_error_set_handler() schlug fehl: %d"
 
 #: src/audio_out/audio_alsa_out.c:1340 src/audio_out/audio_alsa_out.c:1440
 #: src/audio_out/audio_alsa_out.c:1454 src/audio_out/audio_alsa_out.c:1468
@@ -77,74 +80,70 @@ msgstr ""
 "Wird gebraucht, um xine über die Fähigkeiten der Soundkarte zu informieren"
 
 #: src/audio_out/audio_alsa_out.c:1398
-#, fuzzy, c-format
+#, c-format
 msgid "snd_pcm_open() failed:%d:%s\n"
-msgstr "osd: iconv_open() schlug fehl\n"
+msgstr "snd_pcm_open() schlug fehl:%d:%s\n"
 
 #: src/audio_out/audio_alsa_out.c:1400
-msgid ">>> Check if another program don't already use PCM <<<\n"
-msgstr ""
+#, fuzzy
+msgid ">>> Check if another program already uses PCM <<<\n"
+msgstr ">>> Überprüfen Sie, ob ein anderen Programm bereis PCM benutzt <<<\n"
 
 #: src/audio_out/audio_alsa_out.c:1423
 msgid "audio_alsa_out : supported modes are "
-msgstr ""
+msgstr "audio_alsa_out : Unterstützte Modi sind "
 
 #: src/audio_out/audio_alsa_out.c:1426
 msgid "8bit "
-msgstr ""
+msgstr "8Bit "
 
 #: src/audio_out/audio_alsa_out.c:1430
-#, fuzzy
 msgid "mono "
-msgstr "Metronom"
+msgstr "Mono "
 
 #: src/audio_out/audio_alsa_out.c:1434
 msgid "stereo "
-msgstr ""
+msgstr "Stereo "
 
 #: src/audio_out/audio_alsa_out.c:1445
-#, fuzzy
 msgid "4-channel "
-msgstr "Kanal"
+msgstr "4-Kanal "
 
 #: src/audio_out/audio_alsa_out.c:1448
 msgid "(4-channel not enabled in xine config) "
-msgstr ""
+msgstr "(4-Kanal nicht aktiviert in xine Konfiguration) "
 
 #: src/audio_out/audio_alsa_out.c:1459
-#, fuzzy
 msgid "4.1-channel "
-msgstr "Kanal"
+msgstr "4.1-Kanal "
 
 #: src/audio_out/audio_alsa_out.c:1462
 msgid "(4.1-channel not enabled in xine config) "
-msgstr ""
+msgstr "(4.1-Kanal nicht aktiviert in xine Konfiguration) "
 
 #: src/audio_out/audio_alsa_out.c:1473
-#, fuzzy
 msgid "5-channel "
-msgstr "Kanal"
+msgstr "5-Kanal "
 
 #: src/audio_out/audio_alsa_out.c:1476
 msgid "(5-channel not enabled in xine config) "
-msgstr ""
+msgstr "(5-Kanal nicht aktiviert in xine Konfiguration) "
 
 #: src/audio_out/audio_alsa_out.c:1487
-#, fuzzy
 msgid "5.1-channel "
-msgstr "Kanal"
+msgstr "5.1-Kanal "
 
 #: src/audio_out/audio_alsa_out.c:1490
 msgid "(5.1-channel not enabled in xine config) "
-msgstr ""
+msgstr "(5.1-Kanal nicht aktiviert in xine Konfiguration) "
 
 #: src/audio_out/audio_alsa_out.c:1525
 msgid "a/52 and DTS pass-through\n"
-msgstr ""
+msgstr "a/52 und DTS pass-through\n"
 
 #: src/audio_out/audio_alsa_out.c:1528
 msgid "(a/52 and DTS pass-through not enabled in xine config)\n"
-msgstr ""
+msgstr "(a/52 und DTS pass-through nicht aktiviert in xine Konfiguration)\n"
 
 #: src/audio_out/audio_alsa_out.c:1568
 msgid "xine audio output plugin using alsa-compliant audio devices/drivers"
@@ -157,16 +156,16 @@ msgstr "xine Soundausgabe benutzt kde artsd"
 #: src/audio_out/audio_esd_out.c:167
 #, c-format
 msgid "audio_esd_out: connecting to ESD server %s: %s\n"
-msgstr ""
+msgstr "audio_esd_out: Verbinde ESD Server %s: %s\n"
 
 #: src/audio_out/audio_esd_out.c:499
 msgid "audio_esd_out: connecting to esd server...\n"
-msgstr ""
+msgstr "audio_esd_out: Verbinde ESD Server...\n"
 
 #: src/audio_out/audio_esd_out.c:511
 #, c-format
 msgid "audio_esd_out: can't connect to %s ESD server: %s\n"
-msgstr ""
+msgstr "audio_esd_out: Kann ESD Server %s nicht verbinden: %s\n"
 
 #: src/audio_out/audio_esd_out.c:536
 msgid "esd audio output latency (adjust a/v sync)"
@@ -187,28 +186,30 @@ msgstr "xine Soundausgabe benutzt IRIX-kompatibles Gerät/Treiber"
 #: src/audio_out/audio_oss_out.c:193
 #, c-format
 msgid "audio_oss_out: Opening audio device %s: %s\n"
-msgstr ""
+msgstr "audio_oss_out: Öffne Audiogerät %s: %s\n"
 
 #: src/audio_out/audio_oss_out.c:215
 #, c-format
 msgid ""
 "audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n"
 msgstr ""
+"audio_oss_out: Warnung: Abtastrate %d Hz nicht unterstützt, versuche 44100 "
+"Hz\n"
 
 #: src/audio_out/audio_oss_out.c:227
 #, c-format
-msgid "audio_oss_out: audio rate : %d requested, %d provided by device/sec\n"
-msgstr ""
+msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
+msgstr "audio_oss_out: Audiodatenrate: %d gefordert, %d genutzt von Gerät\n"
 
 #: src/audio_out/audio_oss_out.c:536 src/audio_out/audio_oss_out.c:587
 #: src/audio_out/audio_oss_out.c:623
-#, fuzzy, c-format
+#, c-format
 msgid "audio_oss_out: open() %s failed: %s\n"
-msgstr "input_cda: open(%s) schlug fehl: %s.\n"
+msgstr "audio_oss_out: open() %s schlug fehl: %s\n"
 
 #: src/audio_out/audio_oss_out.c:739
 msgid "OSS audio device name"
-msgstr ""
+msgstr "OSS Audio-Gerätename"
 
 #: src/audio_out/audio_oss_out.c:740
 msgid ""
@@ -224,7 +225,7 @@ msgstr ""
 msgid ""
 "The audio device name is created by concatenating the oss_device_name and "
 "the audio device number (eg /dev/sound/dsp2). If you do not need a number, "
-"set to -1 (eg /dev/sound/dsp. The range of this variable is -1 or 0-15."
+"set to -1 (eg /dev/sound/dsp). The range of this variable is -1 or 0-15."
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:755
@@ -294,7 +295,6 @@ msgid "Enable 5.1 channel analog surround output"
 msgstr "Aktiviere analogen 5.1-Kanalraumklang"
 
 #: src/audio_out/audio_oss_out.c:959
-#, fuzzy
 msgid "OSS mixer device"
 msgstr "OSS Mixergerät"
 
@@ -307,19 +307,14 @@ msgstr "input_cda: open(%s) schlug fehl: %s.\n"
 msgid "xine audio output plugin using oss-compliant audio devices/drivers"
 msgstr "xine Soundausgabe benutzt OSS-kompatibles Gerät/Treiber"
 
-#: src/audio_out/audio_sun_out.c:441
-#, fuzzy, c-format
-msgid "audio_sun_out: Opening audio device %s failed: %s\n"
-msgstr "input_cda: Das öffnen des Servers '%s:%d' schlug fehl: %s\n"
-
 #: src/audio_out/audio_sun_out.c:889
 msgid "device used for audio output with the 'Sun' audio plugin"
 msgstr "Gerät für Soundausgabe mit 'Sun'-Audio-Plugin"
 
-#: src/audio_out/audio_sun_out.c:909
-#, fuzzy, c-format
+#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:909
+#, c-format
 msgid "audio_sun_out: opening audio device %s failed: %s\n"
-msgstr "input_cda: Das öffnen des Servers '%s:%d' schlug fehl: %s\n"
+msgstr "audio_sun_out: Öffnen des Audiogeräts %s schlug fehl: %s\n"
 
 #: src/audio_out/audio_sun_out.c:965
 msgid "xine audio output plugin using sun-compliant audio devices/drivers"
@@ -330,31 +325,26 @@ msgid "xine dummy audio output plugin"
 msgstr "xine Dummy Soundausgabe"
 
 #: src/audio_out/audio_file_out.c:318
-#, fuzzy
 msgid "xine file audio output plugin"
-msgstr "xine Dummy Soundausgabe"
+msgstr "xine Date Soundausgabe"
 
 #: src/audio_out/audio_directx_out.c:832 src/audio_out/audio_directx_out.c:849
 msgid "xine audio output plugin for win32 using directx"
 msgstr "xine Soundausgabe benutzt für win32 benutzt directx"
 
 #: src/demuxers/demux_asf.c:446
-#, fuzzy, c-format
-msgid ""
-"demux_asf: warning: The stream id=%d is encrypted\n"
-"."
-msgstr ""
-"demux_mpeg_pes: Warnung: PACK-Datenstrom id=0x%x Dekodierung "
-"fehlgeschlagen.\n"
+#, c-format
+msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
+msgstr "demux_asf: Warnung: Datenstrom id=%d ist verschlüsselt.\n"
 
 #: src/demuxers/demux_asf.c:448
 msgid "Media stream scrambled/encrypted"
-msgstr ""
+msgstr "Medienstrom gestört/verschlüsselt"
 
 #: src/demuxers/demux_asf.c:1699
-#, fuzzy, c-format
+#, c-format
 msgid "demux_asf: Wrong ASX version: %s\n"
-msgstr "demux_asf: Copyright    : %s\n"
+msgstr "demux_asf: Falsche ASX Version: %s\n"
 
 #: src/demuxers/demux_avi.c:542 src/demuxers/demux_avi.c:658
 msgid "Restoring index..."
diff --git a/po/es.po b/po/es.po
index 8498fae0a..3b83cda2c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -50,7 +50,7 @@ msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:430
 msgid ""
-"audio_alsa_out: >>> check if another program don't already use PCM <<<\n"
+"audio_alsa_out: >>> check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:443
@@ -82,7 +82,7 @@ msgid "snd_pcm_open() failed:%d:%s\n"
 msgstr "input_cda: falló open(%s): %s.\n"
 
 #: src/audio_out/audio_alsa_out.c:1400
-msgid ">>> Check if another program don't already use PCM <<<\n"
+msgid ">>> Check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:1423
@@ -192,7 +192,7 @@ msgstr ""
 
 #: src/audio_out/audio_oss_out.c:227
 #, c-format
-msgid "audio_oss_out: audio rate : %d requested, %d provided by device/sec\n"
+msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:536 src/audio_out/audio_oss_out.c:587
@@ -219,7 +219,7 @@ msgstr ""
 msgid ""
 "The audio device name is created by concatenating the oss_device_name and "
 "the audio device number (eg /dev/sound/dsp2). If you do not need a number, "
-"set to -1 (eg /dev/sound/dsp. The range of this variable is -1 or 0-15."
+"set to -1 (eg /dev/sound/dsp). The range of this variable is -1 or 0-15."
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:755
@@ -299,19 +299,14 @@ msgstr "input_cda: falló open(%s): %s.\n"
 msgid "xine audio output plugin using oss-compliant audio devices/drivers"
 msgstr ""
 
-#: src/audio_out/audio_sun_out.c:441
-#, fuzzy, c-format
-msgid "audio_sun_out: Opening audio device %s failed: %s\n"
-msgstr "input_cda: fallo al abrir el servidor '%s:%d': %s\n"
-
 #: src/audio_out/audio_sun_out.c:889
 msgid "device used for audio output with the 'Sun' audio plugin"
 msgstr ""
 
-#: src/audio_out/audio_sun_out.c:909
+#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:909
 #, fuzzy, c-format
 msgid "audio_sun_out: opening audio device %s failed: %s\n"
-msgstr "input_cda: fallo al abrir el servidor '%s:%d': %s\n"
+msgstr "input_sun_out: fallo al abrir el servidor '%s:%d': %s\n"
 
 #: src/audio_out/audio_sun_out.c:965
 msgid "xine audio output plugin using sun-compliant audio devices/drivers"
@@ -332,9 +327,7 @@ msgstr ""
 
 #: src/demuxers/demux_asf.c:446
 #, c-format
-msgid ""
-"demux_asf: warning: The stream id=%d is encrypted\n"
-"."
+msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
 msgstr ""
 
 #: src/demuxers/demux_asf.c:448
diff --git a/po/fr.po b/po/fr.po
index a64c362e3..11fa9be42 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -50,7 +50,7 @@ msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:430
 msgid ""
-"audio_alsa_out: >>> check if another program don't already use PCM <<<\n"
+"audio_alsa_out: >>> check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:443
@@ -82,7 +82,7 @@ msgid "snd_pcm_open() failed:%d:%s\n"
 msgstr "input_cda: open(%s) a échoué: %s.\n"
 
 #: src/audio_out/audio_alsa_out.c:1400
-msgid ">>> Check if another program don't already use PCM <<<\n"
+msgid ">>> Check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:1423
@@ -199,7 +199,7 @@ msgstr ""
 
 #: src/audio_out/audio_oss_out.c:227
 #, c-format
-msgid "audio_oss_out: audio rate : %d requested, %d provided by device/sec\n"
+msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:536 src/audio_out/audio_oss_out.c:587
@@ -226,7 +226,7 @@ msgstr ""
 msgid ""
 "The audio device name is created by concatenating the oss_device_name and "
 "the audio device number (eg /dev/sound/dsp2). If you do not need a number, "
-"set to -1 (eg /dev/sound/dsp. The range of this variable is -1 or 0-15."
+"set to -1 (eg /dev/sound/dsp). The range of this variable is -1 or 0-15."
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:755
@@ -308,16 +308,11 @@ msgstr "input_cda: open(%s) a échoué: %s.\n"
 msgid "xine audio output plugin using oss-compliant audio devices/drivers"
 msgstr "plugin de sortie audio de xine utilisant les pilotes/périphériques oss"
 
-#: src/audio_out/audio_sun_out.c:441
-#, c-format
-msgid "audio_sun_out: Opening audio device %s failed: %s\n"
-msgstr ""
-
 #: src/audio_out/audio_sun_out.c:889
 msgid "device used for audio output with the 'Sun' audio plugin"
 msgstr "Périphérique utilisé pour le plugin audio 'Sun'"
 
-#: src/audio_out/audio_sun_out.c:909
+#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:909
 #, c-format
 msgid "audio_sun_out: opening audio device %s failed: %s\n"
 msgstr ""
@@ -343,9 +338,7 @@ msgstr "plugin de sortie audio de xine utilisant esd"
 
 #: src/demuxers/demux_asf.c:446
 #, c-format
-msgid ""
-"demux_asf: warning: The stream id=%d is encrypted\n"
-"."
+msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
 msgstr ""
 
 #: src/demuxers/demux_asf.c:448
diff --git a/po/it.po b/po/it.po
index 0433b38bb..9d764033c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -52,7 +52,7 @@ msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:430
 msgid ""
-"audio_alsa_out: >>> check if another program don't already use PCM <<<\n"
+"audio_alsa_out: >>> check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:443
@@ -84,7 +84,7 @@ msgid "snd_pcm_open() failed:%d:%s\n"
 msgstr "osd: iconv_open() fallito\n"
 
 #: src/audio_out/audio_alsa_out.c:1400
-msgid ">>> Check if another program don't already use PCM <<<\n"
+msgid ">>> Check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:1423
@@ -196,7 +196,7 @@ msgstr ""
 
 #: src/audio_out/audio_oss_out.c:227
 #, c-format
-msgid "audio_oss_out: audio rate : %d requested, %d provided by device/sec\n"
+msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:536 src/audio_out/audio_oss_out.c:587
@@ -223,7 +223,7 @@ msgstr ""
 msgid ""
 "The audio device name is created by concatenating the oss_device_name and "
 "the audio device number (eg /dev/sound/dsp2). If you do not need a number, "
-"set to -1 (eg /dev/sound/dsp. The range of this variable is -1 or 0-15."
+"set to -1 (eg /dev/sound/dsp). The range of this variable is -1 or 0-15."
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:755
@@ -306,16 +306,11 @@ msgstr ""
 "plugin output audio di xine che usa i dispositivi/driver audio compiacenti "
 "di oss"
 
-#: src/audio_out/audio_sun_out.c:441
-#, c-format
-msgid "audio_sun_out: Opening audio device %s failed: %s\n"
-msgstr ""
-
 #: src/audio_out/audio_sun_out.c:889
 msgid "device used for audio output with the 'Sun' audio plugin"
 msgstr "dispositivo usato per l'output audio con il plugin audio 'Sun'"
 
-#: src/audio_out/audio_sun_out.c:909
+#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:909
 #, c-format
 msgid "audio_sun_out: opening audio device %s failed: %s\n"
 msgstr ""
@@ -341,9 +336,7 @@ msgstr "plugin output audio di xine che usa directx per win32"
 
 #: src/demuxers/demux_asf.c:446
 #, fuzzy, c-format
-msgid ""
-"demux_asf: warning: The stream id=%d is encrypted\n"
-"."
+msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
 msgstr ""
 "demux_mpeg_pes: attenzione: lo stream PACK con id=0x%x non è riuscito nella "
 "decodifica.\n"
diff --git a/po/pl.po b/po/pl.po
index fa8fa5cf5..ab5b69487 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -60,7 +60,7 @@ msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:430
 msgid ""
-"audio_alsa_out: >>> check if another program don't already use PCM <<<\n"
+"audio_alsa_out: >>> check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:443
@@ -95,7 +95,7 @@ msgid "snd_pcm_open() failed:%d:%s\n"
 msgstr "osd: zawiodło iconv_open()\n"
 
 #: src/audio_out/audio_alsa_out.c:1400
-msgid ">>> Check if another program don't already use PCM <<<\n"
+msgid ">>> Check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:1423
@@ -213,7 +213,7 @@ msgstr ""
 
 #: src/audio_out/audio_oss_out.c:227
 #, c-format
-msgid "audio_oss_out: audio rate : %d requested, %d provided by device/sec\n"
+msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:536 src/audio_out/audio_oss_out.c:587
@@ -240,7 +240,7 @@ msgstr ""
 msgid ""
 "The audio device name is created by concatenating the oss_device_name and "
 "the audio device number (eg /dev/sound/dsp2). If you do not need a number, "
-"set to -1 (eg /dev/sound/dsp. The range of this variable is -1 or 0-15."
+"set to -1 (eg /dev/sound/dsp). The range of this variable is -1 or 0-15."
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:755
@@ -332,17 +332,12 @@ msgstr ""
 "wtyczka wyjścia dźwięku xine, używająca urządzeń/sterowników kompatybilnych "
 "z oss"
 
-#: src/audio_out/audio_sun_out.c:441
-#, c-format
-msgid "audio_sun_out: Opening audio device %s failed: %s\n"
-msgstr ""
-
 # src/audio_out/audio_sun_out.c:664
 #: src/audio_out/audio_sun_out.c:889
 msgid "device used for audio output with the 'Sun' audio plugin"
 msgstr "urządzenie używane do wyjścia dźwięku z wtyczką dźwięku 'Sun'"
 
-#: src/audio_out/audio_sun_out.c:909
+#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:909
 #, c-format
 msgid "audio_sun_out: opening audio device %s failed: %s\n"
 msgstr ""
@@ -373,9 +368,7 @@ msgstr "wtyczka wyjścia dźwięku używająca kde artsd"
 
 #: src/demuxers/demux_asf.c:446
 #, c-format
-msgid ""
-"demux_asf: warning: The stream id=%d is encrypted\n"
-"."
+msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
 msgstr ""
 
 #: src/demuxers/demux_asf.c:448
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 97bac51d4..e8a9de818 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -50,7 +50,7 @@ msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:430
 msgid ""
-"audio_alsa_out: >>> check if another program don't already use PCM <<<\n"
+"audio_alsa_out: >>> check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:443
@@ -82,7 +82,7 @@ msgid "snd_pcm_open() failed:%d:%s\n"
 msgstr "input_cda: open(%s) failed: %s.\n"
 
 #: src/audio_out/audio_alsa_out.c:1400
-msgid ">>> Check if another program don't already use PCM <<<\n"
+msgid ">>> Check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:1423
@@ -193,7 +193,7 @@ msgstr ""
 
 #: src/audio_out/audio_oss_out.c:227
 #, c-format
-msgid "audio_oss_out: audio rate : %d requested, %d provided by device/sec\n"
+msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:536 src/audio_out/audio_oss_out.c:587
@@ -220,7 +220,7 @@ msgstr ""
 msgid ""
 "The audio device name is created by concatenating the oss_device_name and "
 "the audio device number (eg /dev/sound/dsp2). If you do not need a number, "
-"set to -1 (eg /dev/sound/dsp. The range of this variable is -1 or 0-15."
+"set to -1 (eg /dev/sound/dsp). The range of this variable is -1 or 0-15."
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:755
@@ -300,16 +300,11 @@ msgstr "input_cda: open(%s) failed: %s.\n"
 msgid "xine audio output plugin using oss-compliant audio devices/drivers"
 msgstr ""
 
-#: src/audio_out/audio_sun_out.c:441
-#, fuzzy, c-format
-msgid "audio_sun_out: Opening audio device %s failed: %s\n"
-msgstr "input_cda: opening server '%s:%d' failed: %s\n"
-
 #: src/audio_out/audio_sun_out.c:889
 msgid "device used for audio output with the 'Sun' audio plugin"
 msgstr ""
 
-#: src/audio_out/audio_sun_out.c:909
+#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:909
 #, fuzzy, c-format
 msgid "audio_sun_out: opening audio device %s failed: %s\n"
 msgstr "input_cda: opening server '%s:%d' failed: %s\n"
@@ -333,9 +328,7 @@ msgstr ""
 
 #: src/demuxers/demux_asf.c:446
 #, c-format
-msgid ""
-"demux_asf: warning: The stream id=%d is encrypted\n"
-"."
+msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
 msgstr ""
 
 #: src/demuxers/demux_asf.c:448
diff --git a/po/sk.po b/po/sk.po
index 517f25c1f..9fe181653 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -51,7 +51,7 @@ msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:430
 msgid ""
-"audio_alsa_out: >>> check if another program don't already use PCM <<<\n"
+"audio_alsa_out: >>> check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:443
@@ -83,7 +83,7 @@ msgid "snd_pcm_open() failed:%d:%s\n"
 msgstr "input_cda: zlyhalo otvorenie %s: %s\n"
 
 #: src/audio_out/audio_alsa_out.c:1400
-msgid ">>> Check if another program don't already use PCM <<<\n"
+msgid ">>> Check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:1423
@@ -194,7 +194,7 @@ msgstr ""
 
 #: src/audio_out/audio_oss_out.c:227
 #, c-format
-msgid "audio_oss_out: audio rate : %d requested, %d provided by device/sec\n"
+msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:536 src/audio_out/audio_oss_out.c:587
@@ -221,7 +221,7 @@ msgstr ""
 msgid ""
 "The audio device name is created by concatenating the oss_device_name and "
 "the audio device number (eg /dev/sound/dsp2). If you do not need a number, "
-"set to -1 (eg /dev/sound/dsp. The range of this variable is -1 or 0-15."
+"set to -1 (eg /dev/sound/dsp). The range of this variable is -1 or 0-15."
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:755
@@ -301,19 +301,14 @@ msgstr "input_cda: zlyhalo otvorenie %s: %s\n"
 msgid "xine audio output plugin using oss-compliant audio devices/drivers"
 msgstr ""
 
-#: src/audio_out/audio_sun_out.c:441
-#, fuzzy, c-format
-msgid "audio_sun_out: Opening audio device %s failed: %s\n"
-msgstr "input_cda: zlyhalo otvorenie servera '%s:%d': %s.\n"
-
 #: src/audio_out/audio_sun_out.c:889
 msgid "device used for audio output with the 'Sun' audio plugin"
 msgstr ""
 
-#: src/audio_out/audio_sun_out.c:909
+#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:909
 #, fuzzy, c-format
 msgid "audio_sun_out: opening audio device %s failed: %s\n"
-msgstr "input_cda: zlyhalo otvorenie servera '%s:%d': %s.\n"
+msgstr "input_sun_out: zlyhalo otvorenie servera '%s:%d': %s.\n"
 
 #: src/audio_out/audio_sun_out.c:965
 msgid "xine audio output plugin using sun-compliant audio devices/drivers"
@@ -334,9 +329,7 @@ msgstr ""
 
 #: src/demuxers/demux_asf.c:446
 #, c-format
-msgid ""
-"demux_asf: warning: The stream id=%d is encrypted\n"
-"."
+msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
 msgstr ""
 
 #: src/demuxers/demux_asf.c:448
diff --git a/po/xine-lib.pot b/po/xine-lib.pot
index 5a1f2d994..53fd4cf9f 100644
--- a/po/xine-lib.pot
+++ b/po/xine-lib.pot
@@ -50,7 +50,7 @@ msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:430
 msgid ""
-"audio_alsa_out: >>> check if another program don't already use PCM <<<\n"
+"audio_alsa_out: >>> check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:443
@@ -82,7 +82,7 @@ msgid "snd_pcm_open() failed:%d:%s\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:1400
-msgid ">>> Check if another program don't already use PCM <<<\n"
+msgid ">>> Check if another program already uses PCM <<<\n"
 msgstr ""
 
 #: src/audio_out/audio_alsa_out.c:1423
@@ -192,7 +192,7 @@ msgstr ""
 
 #: src/audio_out/audio_oss_out.c:227
 #, c-format
-msgid "audio_oss_out: audio rate : %d requested, %d provided by device/sec\n"
+msgid "audio_oss_out: audio rate : %d requested, %d provided by device\n"
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:536 src/audio_out/audio_oss_out.c:587
@@ -219,7 +219,7 @@ msgstr ""
 msgid ""
 "The audio device name is created by concatenating the oss_device_name and "
 "the audio device number (eg /dev/sound/dsp2). If you do not need a number, "
-"set to -1 (eg /dev/sound/dsp. The range of this variable is -1 or 0-15."
+"set to -1 (eg /dev/sound/dsp). The range of this variable is -1 or 0-15."
 msgstr ""
 
 #: src/audio_out/audio_oss_out.c:755
@@ -299,16 +299,11 @@ msgstr ""
 msgid "xine audio output plugin using oss-compliant audio devices/drivers"
 msgstr ""
 
-#: src/audio_out/audio_sun_out.c:441
-#, c-format
-msgid "audio_sun_out: Opening audio device %s failed: %s\n"
-msgstr ""
-
 #: src/audio_out/audio_sun_out.c:889
 msgid "device used for audio output with the 'Sun' audio plugin"
 msgstr ""
 
-#: src/audio_out/audio_sun_out.c:909
+#: src/audio_out/audio_sun_out.c:441 src/audio_out/audio_sun_out.c:909
 #, c-format
 msgid "audio_sun_out: opening audio device %s failed: %s\n"
 msgstr ""
@@ -331,9 +326,7 @@ msgstr ""
 
 #: src/demuxers/demux_asf.c:446
 #, c-format
-msgid ""
-"demux_asf: warning: The stream id=%d is encrypted\n"
-"."
+msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
 msgstr ""
 
 #: src/demuxers/demux_asf.c:448
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index c0733c53a..e91b68390 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.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: audio_oss_out.c,v 1.101 2004/03/04 16:06:03 valtri Exp $
+ * $Id: audio_oss_out.c,v 1.102 2004/03/18 09:07:00 pmhahn Exp $
  *
  * 20-8-2001 First implementation of Audio sync and Audio driver separation.
  * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -224,7 +224,7 @@ static int ao_oss_open(ao_driver_t *this_gen,
     this->output_sample_rate = tmp;
     this->output_sample_k_rate = this->output_sample_rate / 1000;
     xprintf(this->xine, XINE_VERBOSITY_LOG,
-	    _("audio_oss_out: audio rate : %d requested, %d provided by device/sec\n"),
+	    _("audio_oss_out: audio rate : %d requested, %d provided by device\n"),
 	    this->input_sample_rate, this->output_sample_rate);
   }
   /*
@@ -747,7 +747,7 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
 				     _("The audio device name is created by concatenating the "
 				       "oss_device_name and the audio device number (eg /dev/sound/dsp2). "
 				       "If you do not need a "
-				       "number, set to -1 (eg /dev/sound/dsp. "
+				       "number, set to -1 (eg /dev/sound/dsp). "
 				       "The range of this variable is -1 or 0-15."),
 				     10, NULL, NULL);
   if (devname_val == 0) {
diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c
index 30bc9c387..000086614 100644
--- a/src/audio_out/audio_sun_out.c
+++ b/src/audio_out/audio_sun_out.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: audio_sun_out.c,v 1.34 2003/12/14 22:13:22 siggi Exp $
+ * $Id: audio_sun_out.c,v 1.35 2004/03/18 09:07:00 pmhahn Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -438,7 +438,7 @@ static int ao_sun_open(ao_driver_t *this_gen,
   this->audio_fd = open(this->audio_dev, O_WRONLY|O_NONBLOCK);
   if(this->audio_fd < 0) {
     xprintf(this->xine, XINE_VERBOSITY_LOG, 
-	    _("audio_sun_out: Opening audio device %s failed: %s\n"), this->audio_dev, strerror(errno));
+	    _("audio_sun_out: opening audio device %s failed: %s\n"), this->audio_dev, strerror(errno));
     return 0;
   }
   
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index ed7fa233b..5847ba300 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.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: demux_asf.c,v 1.150 2004/03/08 23:54:39 tmattern Exp $
+ * $Id: demux_asf.c,v 1.151 2004/03/18 09:07:00 pmhahn Exp $
  *
  * demultiplexer for asf streams
  *
@@ -443,7 +443,7 @@ static int asf_read_header (demux_asf_t *this) {
              * Parse the end of the header but do not demux the stream. 
              */
             xine_log(this->stream->xine, XINE_LOG_MSG,
-		     _("demux_asf: warning: The stream id=%d is encrypted\n."), stream_id);
+		     _("demux_asf: warning: The stream id=%d is encrypted.\n"), stream_id);
             _x_message(this->stream, XINE_MSG_ENCRYPTED_SOURCE,
 		       _("Media stream scrambled/encrypted"), NULL);
             this->mode = ASF_MODE_ENCRYPTED_CONTENT;