diff options
-rw-r--r-- | .hgsigs | 1 | ||||
-rw-r--r-- | .hgtags | 1 | ||||
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | configure.ac | 7 | ||||
-rw-r--r-- | include/xine/buffer.h | 1 | ||||
-rw-r--r-- | po/LINGUAS | 1 | ||||
-rw-r--r-- | po/cs.po | 39 | ||||
-rw-r--r-- | po/de.po | 39 | ||||
-rw-r--r-- | po/es.po | 39 | ||||
-rw-r--r-- | po/eu.po | 39 | ||||
-rw-r--r-- | po/fr.po | 957 | ||||
-rw-r--r-- | po/it.po | 39 | ||||
-rw-r--r-- | po/libxine2.pot | 37 | ||||
-rw-r--r-- | po/pl.po | 42 | ||||
-rw-r--r-- | po/pt_BR.po | 37 | ||||
-rw-r--r-- | po/sk.po | 39 | ||||
-rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 4 | ||||
-rw-r--r-- | src/demuxers/demux_mpgaudio.c | 70 | ||||
-rw-r--r-- | src/demuxers/demux_real.c | 22 | ||||
-rw-r--r-- | src/input/input_pvr.c | 30 | ||||
-rw-r--r-- | src/spu_dec/sputext_decoder.c | 48 | ||||
-rw-r--r-- | src/video_out/Makefile.am | 1 | ||||
-rw-r--r-- | src/xine-engine/buffer_types.c | 8 |
23 files changed, 990 insertions, 525 deletions
@@ -1,2 +1,3 @@ 5e6d0656ac4efdc1a89ed0fc32f11050f4a22970 0 iD8DBQBGZ207sBKtjPGfWZ8RAhdEAKCrkwiBT6bTof7ro5QQwewRfF/dMACffsvfK42+ahQrjpSfQxEp6k7RpCI= 42358e16442fe54fa554006e0b0bafd51e065c32 0 iD8DBQBG0xz0zbwfTn7RbcARAoD3AJ4012pabmpQvCKKDokZNyZzfPIbWgCfRk5FRly/Eei/xXnSaT54XHAT5KM= +1dbf784bebc791266fcca02e917ee63034ac2e0b 0 iD8DBQBHgQ2mzbwfTn7RbcARArl9AKCslqZDrrm0GiU3IbBvcQVbOdSXlwCgyEMuHY2y/+T6WEeB2CXvCTs5ulI= @@ -62,3 +62,4 @@ fd12068ebd3fab2438f77b06e312c4244e97950a DXR3_095 7b60f85a95345c41fb074dc5e3f7355d9e72968e xine-lib-1_1_6-release ab1531337553ad5eac24a69ac665eae33916b423 xine-lib-1_1_7-release e0a332b9d3e8bb3fad4d7feac1e519292b062056 xine-lib-1_1_8-release +b6be674453e922114b55d4613cb197c77d19f094 xine-lib-1_1_9-release @@ -53,7 +53,7 @@ xine-lib (1.1.90) (Unreleased) * Check for supported extensions before opening the plugin and remove redundant core from plugins. -xine-lib (1.1.9) (unreleased) +xine-lib (1.1.9) * Fix dvd://.../title[.chapter] handling (somewhat broken in 1.1.8). * Fix switching DVB subtitles channels. * DVB sub: switch to dyn mem alloc and allow multiple CLUTs per page. @@ -80,9 +80,9 @@ xine-lib (1.1.9) (unreleased) buffer. * DXR3 encoding with external ffmpeg should be fixed now. (This was broken by ffmpeg revision 9283). - * Enabled the WMV VC1 (ffmpeg) codec. + * Enabled the WMV VC1 & VMware Screen (ffmpeg) codecs. * Fixed a crash that happened when a video output was closed - * Made the Real demuxer recognise http references. + * Made the Real demuxer recognise simple lists of http references. * Require correct URL encoding of '#'s which aren't separators. * Don't decode %nn in raw filenames. [Bug 1784272] * Always enable a52dec capabilities for external a52dec, this makes it @@ -93,6 +93,13 @@ xine-lib (1.1.9) (unreleased) reading the COMM_TAG. [Bug #6] * Avoid potential mislinkage at install time if a system-wide libxine.so is present but is *not* pointing at libxine.so.1. + * Update French translation, thanks to Christophe Giraud. [Bug #15] + * Detect corrupted or broken seek tables in CBR MP3 files. [Bug #3] + * Fixed an issue in input_pvr with setting the frequency of the tuner for + ivtv versions 0.10.6+ + * Add Turkish translation by Serdar Soytetir and Server Acim. + * Workaround for subtitle rendering when using variable-length character + encodings other than UTF-8. (There is probably still some breakage here.) xine-lib (1.1.8) * Send a channel-changed event to the frontend when receiving the SYNC @@ -1660,3 +1667,4 @@ xine (0.3.0+older) unstable; urgency=low - minor Makefile fixes for FreeBSD ports -- Siggi Langauf <siggi@users.sourceforge.net> Sun, 7 Jan 2001 23:59:12 +0100 + diff --git a/configure.ac b/configure.ac index 80db4096b..301f95f15 100644 --- a/configure.ac +++ b/configure.ac @@ -1206,6 +1206,13 @@ win32/include/Makefile]) AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]]) AC_OUTPUT +dnl Guard against multiple inclusion +AH_TOP([#ifndef _XINE_CONFIGURE_H_ +#define _XINE_CONFIGURE_H_ +]) +AH_BOTTOM([#endif +]) + dnl --------------------------------------------- dnl Work around a suspected bug in libtool: dnl diff --git a/include/xine/buffer.h b/include/xine/buffer.h index 4af718a1b..9401f8852 100644 --- a/include/xine/buffer.h +++ b/include/xine/buffer.h @@ -192,6 +192,7 @@ extern "C" { #define BUF_VIDEO_VP6F 0x02630000 #define BUF_VIDEO_THEORA_RAW 0x02640000 #define BUF_VIDEO_VC1 0x02650000 +#define BUF_VIDEO_VMNC 0x02660000 /*@}*/ /** diff --git a/po/LINGUAS b/po/LINGUAS index 636f4dfff..8a29b895c 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -7,3 +7,4 @@ it pl pt_BR sk +tr @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib 1.0.1\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-12-30 15:46+0000\n" +"POT-Creation-Date: 2008-01-06 21:08+0000\n" "PO-Revision-Date: 2005-12-11 20:47+0100\n" "Last-Translator: František Dvořák <valtri@atlas.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -1561,12 +1561,12 @@ msgstr "" msgid "%s: can't connect to %s:%d\n" msgstr "%s: http: nelze se připojit k %s:%d\n" -#: src/input/input_cdda.c:1633 -#, c-format -msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n" +#: src/input/input_cdda.c:1631 +#, fuzzy, c-format +msgid "input_cdda: successfully connected to cddb server '%s:%d'.\n" msgstr "input_cdda: úspěšně připojeno k CDDB serveru '%s:%d'.\n" -#: src/input/input_cdda.c:1638 +#: src/input/input_cdda.c:1636 #, c-format msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "input_cdda: nelze se připojit k CDDB serveru '%s:%d' (%s).\n" @@ -2888,8 +2888,33 @@ msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " "whether parallel decoding is supported. A rule of thumb is to have one " -"decoding thread per logical CPU (typically 1 to 4). A change will take " -"effect with playing the next stream." +"decoding thread per logical CPU (typically 1 to 4).\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1605 +msgid "Skip loop filter" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1606 +msgid "" +"You can control for which frames the loop filter shall be skipped after " +"decoding.\n" +"Skipping the loop filter will speedup decoding but may lead to artefacts. " +"The number of frames for which it is skipped increases from 'none' to 'all'. " +"The default value leaves the decision up to the implementation.\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1615 +msgid "Choose speed over specification compliance" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1616 +msgid "" +"You may want to allow speed cheats which violate codec specification.\n" +"Cheating may speed up decoding but can also lead to decoding artefacts.\n" +"A change of this setting will take effect with playing the next stream." msgstr "" #: src/libreal/real_common.c:139 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib 1.1.6\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-12-30 15:46+0000\n" +"POT-Creation-Date: 2008-01-06 21:08+0000\n" "PO-Revision-Date: 2007-04-18 11:00+0200\n" "Last-Translator: Philipp Hahn <pmhahn@users.sf.net>\n" "Language-Team: German <de@li.org>\n" @@ -1562,12 +1562,12 @@ msgstr "" msgid "%s: can't connect to %s:%d\n" msgstr "%s: Kann keine Verbindung zu '%s:%d' aufbauen\n" -#: src/input/input_cdda.c:1633 -#, c-format -msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n" +#: src/input/input_cdda.c:1631 +#, fuzzy, c-format +msgid "input_cdda: successfully connected to cddb server '%s:%d'.\n" msgstr "input_cdda: Verbindung zum CDDB-Server '%s:%d' steht.\n" -#: src/input/input_cdda.c:1638 +#: src/input/input_cdda.c:1636 #, c-format msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "" @@ -2892,8 +2892,33 @@ msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " "whether parallel decoding is supported. A rule of thumb is to have one " -"decoding thread per logical CPU (typically 1 to 4). A change will take " -"effect with playing the next stream." +"decoding thread per logical CPU (typically 1 to 4).\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1605 +msgid "Skip loop filter" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1606 +msgid "" +"You can control for which frames the loop filter shall be skipped after " +"decoding.\n" +"Skipping the loop filter will speedup decoding but may lead to artefacts. " +"The number of frames for which it is skipped increases from 'none' to 'all'. " +"The default value leaves the decision up to the implementation.\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1615 +msgid "Choose speed over specification compliance" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1616 +msgid "" +"You may want to allow speed cheats which violate codec specification.\n" +"Cheating may speed up decoding but can also lead to decoding artefacts.\n" +"A change of this setting will take effect with playing the next stream." msgstr "" #: src/libreal/real_common.c:139 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib-1.1.4\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-12-30 15:46+0000\n" +"POT-Creation-Date: 2008-01-06 21:08+0000\n" "PO-Revision-Date: 2007-10-28 00:11+0200\n" "Last-Translator: Carlos E. Robinson <carloser@users.sourceforge.net>\n" "Language-Team: Spanish\n" @@ -1606,12 +1606,12 @@ msgstr "" msgid "%s: can't connect to %s:%d\n" msgstr "%s: no se puede conectar a %s:%d\n" -#: src/input/input_cdda.c:1633 -#, c-format -msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n" +#: src/input/input_cdda.c:1631 +#, fuzzy, c-format +msgid "input_cdda: successfully connected to cddb server '%s:%d'.\n" msgstr "input_cdda: conectado con éxito al servidor cddb '%s:%d'.\n" -#: src/input/input_cdda.c:1638 +#: src/input/input_cdda.c:1636 #, c-format msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "input_cdda: falló al conectar al servidor cddb '%s:%d' (%s).\n" @@ -2979,8 +2979,33 @@ msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " "whether parallel decoding is supported. A rule of thumb is to have one " -"decoding thread per logical CPU (typically 1 to 4). A change will take " -"effect with playing the next stream." +"decoding thread per logical CPU (typically 1 to 4).\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1605 +msgid "Skip loop filter" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1606 +msgid "" +"You can control for which frames the loop filter shall be skipped after " +"decoding.\n" +"Skipping the loop filter will speedup decoding but may lead to artefacts. " +"The number of frames for which it is skipped increases from 'none' to 'all'. " +"The default value leaves the decision up to the implementation.\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1615 +msgid "Choose speed over specification compliance" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1616 +msgid "" +"You may want to allow speed cheats which violate codec specification.\n" +"Cheating may speed up decoding but can also lead to decoding artefacts.\n" +"A change of this setting will take effect with playing the next stream." msgstr "" #: src/libreal/real_common.c:139 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib-1\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-12-30 15:46+0000\n" +"POT-Creation-Date: 2008-01-06 21:08+0000\n" "PO-Revision-Date: 2005-02-17 14:29+0100\n" "Last-Translator: Piarres Beobide <pi@beobide.net>\n" "Language-Team: lubrezale <librezale@librezale.org>\n" @@ -1532,12 +1532,12 @@ msgstr "" msgid "%s: can't connect to %s:%d\n" msgstr "%s: Ezin da %s-ra konektatu: %d\n" -#: src/input/input_cdda.c:1633 -#, c-format -msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n" +#: src/input/input_cdda.c:1631 +#, fuzzy, c-format +msgid "input_cdda: successfully connected to cddb server '%s:%d'.\n" msgstr "input_cdda: arrakastatsuki konektaturik cddb zerbitzarira'%s:%d'.\n" -#: src/input/input_cdda.c:1638 +#: src/input/input_cdda.c:1636 #, c-format msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "input_cdda: huts cddb zerbitzarira konektatzerakoan '%s:%d' (%s).\n" @@ -2783,8 +2783,33 @@ msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " "whether parallel decoding is supported. A rule of thumb is to have one " -"decoding thread per logical CPU (typically 1 to 4). A change will take " -"effect with playing the next stream." +"decoding thread per logical CPU (typically 1 to 4).\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1605 +msgid "Skip loop filter" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1606 +msgid "" +"You can control for which frames the loop filter shall be skipped after " +"decoding.\n" +"Skipping the loop filter will speedup decoding but may lead to artefacts. " +"The number of frames for which it is skipped increases from 'none' to 'all'. " +"The default value leaves the decision up to the implementation.\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1615 +msgid "Choose speed over specification compliance" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1616 +msgid "" +"You may want to allow speed cheats which violate codec specification.\n" +"Cheating may speed up decoding but can also lead to decoding artefacts.\n" +"A change of this setting will take effect with playing the next stream." msgstr "" #: src/libreal/real_common.c:139 @@ -1,57 +1,60 @@ -# Frensh xine-lib.po file. -# Copyright (C) 2002 Free Software Foundation, Inc. -# Daniel Caujolle-Bert <segfault@club-internet.fr>, 2001 -# +# translation of fr.po to français +# Daniel Caujolle-Bert <segfault@club-internet.fr>, 2001. +# Christophe Giraud <chris256gnu@gmail.com>, 2007, 2008. +# French xine-lib.po file. +# Copyright (C) 2002, 2007, 2008 Free Software Foundation, Inc. msgid "" msgstr "" -"Project-Id-Version: xine-lib 0.9.13\n" +"Project-Id-Version: xine-lib 1.1.9\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-12-30 15:46+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" +"POT-Creation-Date: 2008-01-06 21:08+0000\n" +"PO-Revision-Date: 2008-01-01 15:18+0100\n" +"Last-Translator: Christophe Giraud <chris256gnu@gmail.com>\n" +"Language-Team: french <fr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: KBabel 1.11.4\n" #: lib/hstrerror.c:17 msgid "No error" -msgstr "" +msgstr "Aucune erreur" #: lib/hstrerror.c:18 msgid "Unknown host" -msgstr "" +msgstr "Hôte inconnu" #: lib/hstrerror.c:19 msgid "No address associated with name" -msgstr "" +msgstr "Aucune adresse associée à ce nom" #: lib/hstrerror.c:20 msgid "Unknown server error" -msgstr "" +msgstr "Erreur du serveur inconnue" #: lib/hstrerror.c:21 msgid "Host name lookup failure" -msgstr "" +msgstr "La recherche du nom d'hôte a échouée" #: lib/hstrerror.c:22 msgid "Unknown error" -msgstr "" +msgstr "Erreur inconnue" #: src/audio_out/audio_alsa_out.c:350 #, c-format msgid "audio_alsa_out:Already open...WHY!" -msgstr "" +msgstr "audio_alsa_out: Déjà ouvert...POURQUOI!" #: src/audio_out/audio_alsa_out.c:378 #, c-format msgid "audio_alsa_out: snd_pcm_open() of %s failed: %s\n" -msgstr "" +msgstr "audio_alsa_out: snd_pcm_open() de %s a echoué: %s\n" #: src/audio_out/audio_alsa_out.c:380 msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n" msgstr "" +"audio_alsa_out: >>> Vérifie si un autre programme utilise déjà PCM <<<\n" #: src/audio_out/audio_alsa_out.c:393 #, c-format @@ -59,10 +62,12 @@ msgid "" "audio_alsa_out: broken configuration for this PCM: no configurations " "available: %s\n" msgstr "" +"audio_alsa_out: Mauvaise configuration pour ce PCM: aucune configuration " +"disponible: %s\n" #: src/audio_out/audio_alsa_out.c:1295 msgid "notify changes to the hardware mixer" -msgstr "" +msgstr "Notifie les changements au mixeur matériel" #: src/audio_out/audio_alsa_out.c:1296 msgid "" @@ -70,15 +75,18 @@ msgid "" "notification so that it can update its graphical representation of the mixer " "settings on the fly." msgstr "" +"A chaque modification du mixeur matériel , votre application recevra une " +"notification afin qu'elle puisse automatiquement mettre à jour sa " +"représentation graphique du mixeur ." #: src/audio_out/audio_alsa_out.c:1361 #, c-format msgid "snd_lib_error_set_handler() failed: %d" -msgstr "" +msgstr "snd_lib_error_set_handler() a échoué: %d" #: src/audio_out/audio_alsa_out.c:1368 msgid "sound card can do mmap" -msgstr "" +msgstr "La carte son peut utiliser mmap" #: src/audio_out/audio_alsa_out.c:1369 msgid "" @@ -86,6 +94,10 @@ msgid "" "You can try enabling it and check, if everything works. If it does, this " "will increase performance." msgstr "" +"Activez ceci si votre carte son et votre pilote alsa supportent memory " +"mapped IO.\n" +"Essayez de l'activer et contrôlez que tout fonctionne correctement.Si c'est " +"le cas,cela augmentera les performances ." #: src/audio_out/audio_alsa_out.c:1378 msgid "device used for mono output" @@ -96,6 +108,9 @@ msgid "" "xine will use this alsa device to output mono sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" +"xine utilisera ce périphérique alsa pour la sortie son mono.\n" +"Voir la documentation alsa pour toutes informations complémentaires sur les " +"périphériques alsa." #: src/audio_out/audio_alsa_out.c:1387 msgid "device used for stereo output" @@ -106,6 +121,9 @@ msgid "" "xine will use this alsa device to output stereo sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" +"xine utilisera ce périphérique alsa pour la sortie son stéréo.\n" +"Voir la documentation alsa pour toutes informations complémentaires sur les " +"périphériques alsa" #: src/audio_out/audio_alsa_out.c:1396 msgid "device used for 4-channel output" @@ -116,6 +134,10 @@ msgid "" "xine will use this alsa device to output 4 channel (4.0) surround sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" +"xine utilisera ce périphérique alsa pour la sortie son 4 canaux ( 4.0 ) " +"surround.\n" +"Voir la documentation alsa pour toutes informations complémentaires sur les " +"périphériques alsa." #: src/audio_out/audio_alsa_out.c:1406 src/audio_out/audio_alsa_out.c:1416 msgid "device used for 5.1-channel output" @@ -127,6 +149,10 @@ msgid "" "sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" +"xine utilisera ce périphérique alsa pour la sortie son 5 canaux plus LFE " +"(5.1) surround.\n" +"Voir la documentation alsa pour toutes informations complémentaires sur les " +"périphériques alsa." #: src/audio_out/audio_alsa_out.c:1417 msgid "" @@ -134,20 +160,24 @@ msgid "" "This can be used be external surround decoders.\n" "See the alsa documentation for information on alsa devices." msgstr "" +"xine utilisera ce périphérique alsa pour une sortie son numérique surround " +"non décodée. Celle-ci peut être utilisée par un décodeur surround externe.\n" +"Voir la documentation alsa pour toutes informations complémentaires sur les " +"périphériques alsa." #: src/audio_out/audio_alsa_out.c:1437 -#, fuzzy, c-format +#, c-format msgid "snd_pcm_open() failed:%d:%s\n" -msgstr "input_cda: open(%s) a échoué: %s.\n" +msgstr "snd_pcm_open() a échoué:%d:%s\n" #: src/audio_out/audio_alsa_out.c:1439 #, c-format msgid ">>> Check if another program already uses PCM <<<\n" -msgstr "" +msgstr ">>> Vérifie si un autre programme utilise déjà PCM <<<\n" #: src/audio_out/audio_alsa_out.c:1470 src/audio_out/audio_oss_out.c:926 msgid "speaker arrangement" -msgstr "" +msgstr "Arrangement des haut-parleurs" #: src/audio_out/audio_alsa_out.c:1471 src/audio_out/audio_oss_out.c:927 msgid "" @@ -180,70 +210,100 @@ msgid "" "xine. You need to connect a digital surround decoder capable of decoding the " "formats you want to play to your sound card's digital output." msgstr "" +"Choisissez parmi les choix suivants selon les haut-parleurs à votre " +"disposition , Cela déterminera quels haut-parleurs xine utilisera pour la " +"sortie son. Les valeurs individuelles sont:\n" +"\n" +"Mono 1.0: Vous avez seulement un haut-parleur.\n" +"Stereo 2.0: Vous avez deux haut-parleurs , un pour le canal gauche et un " +"pour le canal droit\n" +"Headphones 2.0: Vous utilisez un casque audio.\n" +"Stereo 2.1: Vous avez deux haut-parleurs: 1 gauche et 1 droit, plus un " +"subwoofer pour les basses fréquences.\n" +"Surround 3.0: Vous avez trois haut-parleurs : 1 avant gauche et 1 avant " +"droit, plus un arrière.\n" +"Surround 4.0: Vous avez quatre haut-parleurs : 1 avant gauche , 1 avant " +"droit, 1 arrière gauche et 1 arrière droit.\n" +"Surround 4.1: Vous avez quatre haut-parleurs : 1 avant gauche, 1 avant " +"droit, 1 arrière gauche et 1 arrière droit, plus un subwoofer pour les " +"basses fréquences.\n" +"Surround 5.0: Vous avez cinq haut-parleurs : 1 avant gauche, 1 avant droit, " +"1 voie centrale, 1 arrière gauche et 1 arrière droit.\n" +"Surround 5.1: Vous avez cinq haut-parleurs : 1 avant gauche, 1 avant droit, " +"1 voie centrale, 1 arrière gauche et 1 arrière droit, plus un subwoofer pour " +"les basses fréquences .\n" +"Surround 6.0: Vous avez six haut-parleurs : 1 avant gauche, 1 avant droit, 1 " +"voie centrale avant, 1 arrière gauche, 1 arrière droit et 1 voie centrale " +"arrière.\n" +"Surround 6.1: Vous avez six haut-parleurs : 1 avant gauche, 1 avant droit, 1 " +"voie centrale avant, 1 arrière gauche, 1 arrière droit et 1 voie centrale " +"arrière, plus un subwoofer pour les basses fréquences.\n" +"Surround 7.1: Vous avez sept haut-parleurs : 1 avant gauche, 1 avant droit, " +"1 voie centrale avant droite et 1 avant gauche, 1 arrière gauche et 1 " +"arrière droit, plus un subwoofer pour les basses fréquences.\n" +"Pass Through: Votre système de son recevra un signal numérique non décodé " +"provenant de xine .Vous aurez besoin de connecter un décodeur numérique " +"surround capable de traiter le signal envoyé par votre carte son. " #: src/audio_out/audio_alsa_out.c:1500 msgid "audio_alsa_out : supported modes are " -msgstr "" +msgstr "audio_alsa_out : les modes supportés sont " #: src/audio_out/audio_alsa_out.c:1503 msgid "8bit " -msgstr "" +msgstr "8bit " #: src/audio_out/audio_alsa_out.c:1508 msgid "16bit " -msgstr "" +msgstr "16bit " #: src/audio_out/audio_alsa_out.c:1512 msgid "24bit " -msgstr "" +msgstr "24bit " #: src/audio_out/audio_alsa_out.c:1516 msgid "32bit " -msgstr "" +msgstr "32bit " #: src/audio_out/audio_alsa_out.c:1527 msgid "mono " -msgstr "" +msgstr "mono " #: src/audio_out/audio_alsa_out.c:1531 msgid "stereo " -msgstr "" +msgstr "stéréo " #: src/audio_out/audio_alsa_out.c:1536 -#, fuzzy msgid "4-channel " -msgstr "canal" +msgstr "4-canaux" #: src/audio_out/audio_alsa_out.c:1539 msgid "(4-channel not enabled in xine config) " -msgstr "" +msgstr "(sortie 4 canaux non activée dans la configuration de xine)" #: src/audio_out/audio_alsa_out.c:1544 -#, fuzzy msgid "4.1-channel " -msgstr "canal" +msgstr "sortie 4.1 canaux" #: src/audio_out/audio_alsa_out.c:1547 msgid "(4.1-channel not enabled in xine config) " -msgstr "" +msgstr "(sortie 4.1 canaux non activée dans la configuration de xine)" #: src/audio_out/audio_alsa_out.c:1552 -#, fuzzy msgid "5-channel " -msgstr "canal" +msgstr "Sortie 5 canaux" #: src/audio_out/audio_alsa_out.c:1555 msgid "(5-channel not enabled in xine config) " -msgstr "" +msgstr "(Sortie 5 canaux non activée dans la configuration de xine)" #: src/audio_out/audio_alsa_out.c:1560 -#, fuzzy msgid "5.1-channel " -msgstr "canal" +msgstr "Sortie 5.1 canaux" #: src/audio_out/audio_alsa_out.c:1563 msgid "(5.1-channel not enabled in xine config) " -msgstr "" +msgstr "(Sortie 5.1 canaux non activée dans la configuration de xine)" #: src/audio_out/audio_alsa_out.c:1586 msgid "a/52 and DTS pass-through\n" @@ -251,7 +311,7 @@ msgstr "" #: src/audio_out/audio_alsa_out.c:1589 msgid "(a/52 and DTS pass-through not enabled in xine config)\n" -msgstr "" +msgstr "(a/52 et DTS pass-through non activés dans la configuration de xine)\n" #: src/audio_out/audio_alsa_out.c:1596 msgid "alsa mixer device" @@ -262,105 +322,108 @@ msgid "" "xine will use this alsa mixer device to change the volume.\n" "See the alsa documentation for information on alsa devices." msgstr "" +"xine utilisera ce périphérique du mixeur alsa pour changer le volume.\n" +"Voir la documentation alsa pour toutes informations complémentaires sur les " +"périphériques alsa." #: src/audio_out/audio_alsa_out.c:1675 msgid "xine audio output plugin using alsa-compliant audio devices/drivers" msgstr "" -"plugin de sortie audio de xine utilisant les pilotes/périphériques alsa" +"plugin de sortie audio xine utilisant les pilotes/périphériques compatible " +"alsa " #: src/audio_out/audio_coreaudio_out.c:575 -#, fuzzy msgid "xine output plugin for Coreaudio/Mac OS X" -msgstr "plugin de sortie audio de xine utilisant esd" +msgstr "plugin de sortie audio xine pour Coreaudio/Mac OS X" #: src/audio_out/audio_directx2_out.c:161 msgid "Error" -msgstr "" +msgstr "Erreur" #: src/audio_out/audio_directx2_out.c:168 msgid "success" -msgstr "" +msgstr "succès" #: src/audio_out/audio_directx2_out.c:170 msgid "access denied" -msgstr "" +msgstr "accès interdit" #: src/audio_out/audio_directx2_out.c:172 msgid "resource is already in use" -msgstr "" +msgstr "la ressource est déjà en cours d'utilisation" #: src/audio_out/audio_directx2_out.c:173 msgid "object was already initialized" -msgstr "" +msgstr "L'objet était déjà initialisé" #: src/audio_out/audio_directx2_out.c:174 msgid "specified wave format is not supported" -msgstr "" +msgstr "Le format wave spécifié n'est pas supporté" #: src/audio_out/audio_directx2_out.c:175 msgid "memory buffer has been lost and must be restored" -msgstr "" +msgstr "le tampon mémoire a été perdu et doit être restauré" #: src/audio_out/audio_directx2_out.c:176 msgid "requested buffer control is not available" -msgstr "" +msgstr "Le contrôle du buffer requis n'est pas disponible" #: src/audio_out/audio_directx2_out.c:177 msgid "undetermined error inside DirectSound subsystem" -msgstr "" +msgstr "Erreur interne indéterminée du sous-système DirectSound" #: src/audio_out/audio_directx2_out.c:179 msgid "DirectSound hardware device is unavailable" -msgstr "" +msgstr "Le périphérique matériel DirectSound est indisponible" #: src/audio_out/audio_directx2_out.c:181 msgid "function is not valid for the current state of the object" -msgstr "" +msgstr "La fonction n'est pas valide pour l'état actuel de l'objet" #: src/audio_out/audio_directx2_out.c:182 msgid "invalid parameter was passed" -msgstr "" +msgstr "Un paramètre invalide a été passé" #: src/audio_out/audio_directx2_out.c:183 msgid "object doesn't support aggregation" -msgstr "" +msgstr "L'objet ne supporte pas l'agrégation" #: src/audio_out/audio_directx2_out.c:184 msgid "no sound driver available for use" -msgstr "" +msgstr "pas de pilote son disponible" #: src/audio_out/audio_directx2_out.c:185 msgid "requested COM interface not available" -msgstr "" +msgstr "L'interface COM requise n'est pas disponible" #: src/audio_out/audio_directx2_out.c:186 msgid "another application has a higher priority level" -msgstr "" +msgstr "une autre application a un niveau de priorité plus élevé" #: src/audio_out/audio_directx2_out.c:187 msgid "insufficient memory" -msgstr "" +msgstr "mémoire insuffisante" #: src/audio_out/audio_directx2_out.c:188 msgid "low priority level for this function" -msgstr "" +msgstr "Niveau de priorité bas pour cette fonction" #: src/audio_out/audio_directx2_out.c:189 msgid "DirectSound wasn't initialized" -msgstr "" +msgstr "DirectSound n'était pas initialisé" #: src/audio_out/audio_directx2_out.c:190 msgid "function is not supported" -msgstr "" +msgstr "cette fonction n'est pas supportée" #: src/audio_out/audio_directx2_out.c:191 msgid "unknown error" -msgstr "" +msgstr "erreur inconnue" #: src/audio_out/audio_directx2_out.c:201 #, c-format msgid "Unable to create direct sound object." -msgstr "" +msgstr "Impossible de créer l'objet direct sound." #: src/audio_out/audio_directx2_out.c:207 #, c-format @@ -369,7 +432,7 @@ msgstr "" #: src/audio_out/audio_directx2_out.c:281 msgid "Unable to create secondary direct sound buffer" -msgstr "" +msgstr "Impossible de créer un second tampon pour direct sound " #: src/audio_out/audio_directx2_out.c:305 #, c-format @@ -378,7 +441,7 @@ msgstr "" #: src/audio_out/audio_directx2_out.c:313 msgid "Unable to get notification interface" -msgstr "" +msgstr "Impossible d'obtenir une notification de l'interface" #: src/audio_out/audio_directx2_out.c:318 msgid "Unable to set notification positions" @@ -386,41 +449,41 @@ msgstr "" #: src/audio_out/audio_directx2_out.c:338 msgid "Couldn't play sound buffer" -msgstr "" +msgstr "Ne peut pas utiliser le buffer audio" #: src/audio_out/audio_directx2_out.c:350 msgid "Couldn't stop sound buffer" -msgstr "" +msgstr "Ne peut pas stopper le buffer audio" #: src/audio_out/audio_directx2_out.c:363 msgid "Can't get buffer position" -msgstr "" +msgstr "Ne peut pas obtenir la position du buffer" #: src/audio_out/audio_directx2_out.c:377 msgid "Can't set buffer position" -msgstr "" +msgstr "Ne peut pas ajuster la position du buffer" #: src/audio_out/audio_directx2_out.c:409 msgid "Can't set sound volume" -msgstr "" +msgstr "Impossible de régler le volume sonore" #: src/audio_out/audio_directx2_out.c:427 #, c-format msgid ": buffer lost, tryig to restore\n" -msgstr "" +msgstr ": buffer perdu, tentative de restauration\n" #: src/audio_out/audio_directx2_out.c:431 msgid "Couldn't lock direct sound buffer" -msgstr "" +msgstr "Impossible de verrouiller le buffer de direct sound" #: src/audio_out/audio_directx2_out.c:442 msgid "Couldn't unlock direct sound buffer" -msgstr "" +msgstr "Impossible de déverrouiller le buffer de direct sound" #: src/audio_out/audio_directx2_out.c:539 -#, fuzzy, c-format +#, c-format msgid "Unable to create primary direct sound buffer." -msgstr "incapable d'allouer le buffer d'entrée.\n" +msgstr "incapable d'allouer le buffer d'entré." #: src/audio_out/audio_directx2_out.c:632 #, c-format @@ -430,66 +493,64 @@ msgstr "" #: src/audio_out/audio_directx2_out.c:650 #, c-format msgid ": delayed by %ld msec\n" -msgstr "" +msgstr ": retardé de %ld msec\n" #: src/audio_out/audio_directx2_out.c:754 -#, fuzzy, c-format +#, c-format msgid ": can't create pthread condition: %s\n" -msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n" +msgstr ": ne peux pas créer la condition pthread: %s\n" #: src/audio_out/audio_directx2_out.c:758 -#, fuzzy, c-format +#, c-format msgid ": can't create pthread mutex: %s\n" -msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n" +msgstr ": ne peut pas créer pthread mutex: %s\n" #: src/audio_out/audio_directx2_out.c:765 -#, fuzzy, c-format +#, c-format msgid ": can't create buffer pthread: %s\n" -msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n" +msgstr ": ne peut pas créer le pthread du buffer: %s\n" #: src/audio_out/audio_directx2_out.c:872 -#, fuzzy, c-format +#, c-format msgid ": can't destroy buffer pthread: %s\n" -msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n" +msgstr ": ne peut pas détruire le pthread du buffer: %s\n" #: src/audio_out/audio_directx2_out.c:879 #, c-format msgid ": can't destroy pthread condition: %s\n" -msgstr "" +msgstr ":ne peut pas détruire la condition pthread: %s\n" #: src/audio_out/audio_directx2_out.c:882 #, c-format msgid ": can't destroy pthread mutex: %s\n" -msgstr "" +msgstr ": ne peut pas détruire pthread mutex: %s\n" #: src/audio_out/audio_directx2_out.c:942 #, c-format msgid ": unknown control command %d\n" -msgstr "" +msgstr ": commande inconnu %d\n" #: src/audio_out/audio_directx2_out.c:1002 -#, fuzzy msgid "second xine audio output plugin using directx" -msgstr "plugin de sortie audio de xine utilisant esd" +msgstr "second plugin de sortie audio xine utilisant directx" #: src/audio_out/audio_directx_out.c:836 -#, fuzzy msgid "xine audio output plugin for win32 using directx" -msgstr "plugin de sortie audio de xine utilisant esd" +msgstr "plugin de sortie audio xine pour win32 utilisant directx" #: src/audio_out/audio_esd_out.c:165 #, c-format msgid "audio_esd_out: connecting to ESD server %s: %s\n" -msgstr "" +msgstr "audio_esd_out: connexion au serveur ESD en cours %s: %s\n" #: src/audio_out/audio_esd_out.c:497 msgid "audio_esd_out: connecting to esd server...\n" -msgstr "" +msgstr "audio_esd_out: connexion au serveur esd en cours...\n" #: src/audio_out/audio_esd_out.c:509 #, c-format msgid "audio_esd_out: can't connect to %s ESD server: %s\n" -msgstr "" +msgstr "audio_esd_out: ne peut pas se connecter au %s serveur ESD: %s\n" #: src/audio_out/audio_esd_out.c:539 msgid "esd audio output latency (adjust a/v sync)" @@ -501,21 +562,21 @@ msgid "" "fixed offset here to compensate.\n" "The unit of the value is one PTS tick, which is the 90000th part of a second." msgstr "" +"Si vous rencontrez des problèmes de synchronisation du son par rapport a la " +"vidéo, Vous pouvez entrer une valeur de décalage fixe pour compenser.\n" +"L'unité de valeur est un PTS tick, ce qui représente 1/90000 de seconde." #: src/audio_out/audio_esd_out.c:576 -#, fuzzy msgid "xine audio output plugin using esound" -msgstr "plugin de sortie audio de xine utilisant esd" +msgstr "plugin de sortie audio xine utilisant esound" #: src/audio_out/audio_file_out.c:368 -#, fuzzy msgid "xine file audio output plugin" -msgstr "plugin de sortie audio de xine utilisant esd" +msgstr "plugin de sortie audio xine utilisant un fichier " #: src/audio_out/audio_irixal_out.c:385 -#, fuzzy msgid "irixal audio output maximum gap length" -msgstr "taille maximale du gap pour la sortie audio irixal en 1/90000s" +msgstr "" #: src/audio_out/audio_irixal_out.c:386 msgid "" @@ -527,28 +588,28 @@ msgstr "" #: src/audio_out/audio_irixal_out.c:415 msgid "xine audio output plugin using IRIX libaudio" -msgstr "Sortie audio de Xine utilise IRIX libaudio" +msgstr "plugin de sortie audio xine utilisant IRIX libaudio" #: src/audio_out/audio_jack_out.c:408 -#, fuzzy msgid "xine output plugin for JACK Audio Connection Kit" -msgstr "plugin de sortie audio de xine utilisant esd" +msgstr "plugin de sortie audio xine pour JACK Audio Connection Kit" #: src/audio_out/audio_none_out.c:229 -#, fuzzy msgid "xine dummy audio output plugin" -msgstr "plugin de sortie audio de xine utilisant esd" +msgstr "plugin de sortie audio xine utilisant dummy" #: src/audio_out/audio_oss_out.c:196 #, c-format msgid "audio_oss_out: Opening audio device %s: %s\n" -msgstr "" +msgstr "audio_oss_out: Ouverture du périphérique audio %s: %s\n" #: src/audio_out/audio_oss_out.c:218 #, c-format msgid "" "audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n" msgstr "" +"audio_oss_out: Attention: un taux d'échantillonage de %d Hz n'est pas " +"supporté , essayez 44100 Hz\n" #: src/audio_out/audio_oss_out.c:230 #, c-format @@ -557,7 +618,7 @@ msgstr "" #: src/audio_out/audio_oss_out.c:743 msgid "OSS audio device name" -msgstr "" +msgstr "Nom du périphérique audio OSS" #: src/audio_out/audio_oss_out.c:744 msgid "" @@ -565,6 +626,10 @@ msgid "" "number is appended to get the full device name.\n" "Select \"auto\" if you want xine to auto detect the corret setting." msgstr "" +"Specifies the base part of the audio device name, to which the OSS device " +"number is appended to get the full device name.\n" +"Choisissez \"auto\" si vous voulez que xine détecte automatiquement le " +"réglage adéquat." #: src/audio_out/audio_oss_out.c:751 msgid "OSS audio device number, -1 for none" @@ -591,7 +656,7 @@ msgstr "" #: src/audio_out/audio_oss_out.c:780 #, c-format msgid "audio_oss_out: using device >%s<\n" -msgstr "" +msgstr "audio_oss_out: utilise le périphérique >%s<\n" #: src/audio_out/audio_oss_out.c:786 src/audio_out/audio_oss_out.c:901 #, c-format @@ -599,11 +664,12 @@ msgid "" "audio_oss_out: opening audio device %s failed:\n" "%s\n" msgstr "" +"audio_oss_out: l'ouverture du périphérique audio %s a échouée:\n" +"%s\n" #: src/audio_out/audio_oss_out.c:807 -#, fuzzy msgid "a/v sync method to use by OSS" -msgstr "méthode A/V sync a utiliser par OSS, dépend du pilote/périphérique" +msgstr "méthode A/V sync à utiliser par OSS" #: src/audio_out/audio_oss_out.c:808 msgid "" @@ -643,9 +709,8 @@ msgid "" msgstr "" #: src/audio_out/audio_oss_out.c:863 -#, fuzzy msgid "OSS audio output latency (adjust a/v sync)" -msgstr "Temps de latence de la sortie audio esd (ajustement de a/v sync) " +msgstr "Temps de latence de la sortie audio OSS (ajustement de a/v sync) " #: src/audio_out/audio_oss_out.c:877 msgid "" @@ -675,36 +740,36 @@ msgid "" msgstr "" #: src/audio_out/audio_oss_out.c:1075 -#, fuzzy, c-format +#, c-format msgid "audio_oss_out: open() mixer %s failed: %s\n" -msgstr "input_cda: open(%s) a échoué: %s.\n" +msgstr "audio_oss_out: l'ouverture() du mixeur %s a échouée: %s\n" #: src/audio_out/audio_oss_out.c:1152 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" +msgstr "" +"plugin de sortie audio xine utilisant les pilotes/périphériques audio " +"compatible oss" #: src/audio_out/audio_pulse_out.c:548 -#, fuzzy msgid "device used for pulseaudio" -msgstr "périphérique utilisé pour la sortie 4 canaux" +msgstr "périphérique utilisé pour pulseaudio" #: src/audio_out/audio_pulse_out.c:549 msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "" #: src/audio_out/audio_pulse_out.c:603 -#, fuzzy msgid "xine audio output plugin using pulseaudio sound server" -msgstr "plugin de sortie audio de xine utilisant esd" +msgstr "plugin de sortie audio xine utilisant le serveur de son pulseaudio" #: src/audio_out/audio_sun_out.c:455 src/audio_out/audio_sun_out.c:948 #, c-format msgid "audio_sun_out: opening audio device %s failed: %s\n" -msgstr "" +msgstr "audio_sun_out: l'ouverture du périphérique audio %s a échouée : %s\n" #: src/audio_out/audio_sun_out.c:923 msgid "Sun audio device name" -msgstr "" +msgstr "Nom du périphérique audio Sun" #: src/audio_out/audio_sun_out.c:924 msgid "" @@ -715,43 +780,50 @@ msgid "" msgstr "" #: src/audio_out/audio_sun_out.c:966 -#, fuzzy, c-format +#, c-format msgid "audio_sun_out: audio ioctl on device %s failed: %s\n" -msgstr "input_cda: open(%s) a échoué: %s.\n" +msgstr "audio_sun_out: audio ioctl sur le périphérique %s a échoué: %s\n" #: src/audio_out/audio_sun_out.c:1023 msgid "xine audio output plugin using sun-compliant audio devices/drivers" -msgstr "plugin de sortie audio de xine utilisant les pilotes/périphériques sun" +msgstr "" +"plugin de sortie audio xine utilisant les pilotes/périphériques compatible " +"sun" #: src/combined/xine_ogg_demuxer.c:813 #, c-format msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n" msgstr "" +"ogg: piste audio vorbis indiquée mais aucune entête de flux vorbis n'a été " +"trouvée.\n" #: src/combined/xine_ogg_demuxer.c:2080 +#, fuzzy msgid "Annodex demux plugin" -msgstr "" +msgstr "plugin de sortie audio de xine utilisant esd" #: src/combined/xine_ogg_demuxer.c:2098 +#, fuzzy msgid "OGG demux plugin" -msgstr "" +msgstr "plugin de sortie audio de xine utilisant esd" #: src/demuxers/demux_asf.c:426 #, c-format msgid "demux_asf: warning: The stream id=%d is encrypted.\n" -msgstr "" +msgstr "demux_asf: attention: Le flux id=%d est crypté.\n" #: src/demuxers/demux_asf.c:428 msgid "Media stream scrambled/encrypted" -msgstr "" +msgstr "Flux média brouillé/crypté" #: src/demuxers/demux_asf.c:2091 +#, fuzzy msgid "ASF demux plugin" -msgstr "" +msgstr "plugin de sortie audio de xine utilisant esd" #: src/demuxers/demux_avi.c:528 src/demuxers/demux_avi.c:642 msgid "Restoring index..." -msgstr "" +msgstr "Restauration de l'index..." #: src/demuxers/demux_avi.c:628 src/demuxers/demux_avi.c:1683 #, c-format @@ -792,23 +864,23 @@ msgid "unsupported FLV version (%d).\n" msgstr "" #: src/demuxers/demux_flv.c:185 -#, fuzzy msgid "neither video nor audio stream in this file.\n" -msgstr "metronom: fin de flux audio ignoré\n" +msgstr "aucun flux audio ou vidéo n'est présent dans ce fichier.\n" #: src/demuxers/demux_flv.c:879 +#, fuzzy msgid "Flash Video file demux plugin" -msgstr "" +msgstr "plugin de sortie audio de xine utilisant esd" #: src/demuxers/demux_iff.c:233 #, c-format msgid "iff-8svx/16sv: unknown compression: %d\n" -msgstr "" +msgstr "iff-8svx/16sv: compression inconnue: %d\n" #: src/demuxers/demux_iff.c:367 #, c-format msgid "iff-ilbm: unknown compression: %d\n" -msgstr "" +msgstr "iff-ilbm: compression inconnue: %d\n" #: src/demuxers/demux_iff.c:568 #, c-format @@ -845,13 +917,13 @@ msgid "demux_mpeg_block: warning: PES header reserved 10 bits not found\n" msgstr "" #: src/demuxers/demux_mpeg_block.c:647 -#, fuzzy, c-format +#, c-format msgid "" "demux_mpeg_block: warning: PES header indicates that this stream may be " "encrypted (encryption mode %d)\n" msgstr "" -"demux_mpeg_block: attention: l'entête pes indique que ce flux sera crypté " -"(mode de cryptage %d)\n" +"demux_mpeg_block: attention: l'entête PES indique que ce flux peut être " +"crypté (mode de cryptage %d)\n" #: src/demuxers/demux_mpeg_block.c:1493 msgid "DVD/VOB demux plugin" @@ -863,6 +935,8 @@ msgid "" "xine-lib:demux_mpeg_pes: Unrecognised stream_id 0x%02x. Please report this " "to xine developers.\n" msgstr "" +"xine-lib:demux_mpeg_pes: stream_id 0x%02x non reconnu. Veuillez reporter " +"ceci aux développeurs xine.\n" #: src/demuxers/demux_mpeg_pes.c:424 #, c-format @@ -875,13 +949,13 @@ msgid "demux_mpeg_pes: warning: PES header reserved 10 bits not found\n" msgstr "" #: src/demuxers/demux_mpeg_pes.c:816 -#, fuzzy, c-format +#, c-format msgid "" "demux_mpeg_pes: warning: PES header indicates that this stream may be " "encrypted (encryption mode %d)\n" msgstr "" -"demux_mpeg_block: attention: l'entête pes indique que ce flux sera crypté " -"(mode de cryptage %d)\n" +"demux_mpeg_block: attention: l'entête PES indique que ce flux peut être " +"crypté (mode de cryptage %d)\n" #: src/demuxers/demux_mpeg_pes.c:1090 #, c-format @@ -889,10 +963,13 @@ msgid "" "demux_mpeg_pes:Unrecognised private stream 1 0x%02x. Please report this to " "xine developers.\n" msgstr "" +"demux_mpeg_pes:Flux privé non reconnu 1 0x%02x. Veuillez reporter ceci aux " +"développeurs xine.\n" #: src/demuxers/demux_mpeg_pes.c:1754 +#, fuzzy msgid "mpeg pes demux plugin" -msgstr "" +msgstr "plugin de sortie audio de xine utilisant esd" #: src/demuxers/demux_snd.c:102 #, c-format @@ -900,13 +977,14 @@ msgid "demux_snd: bad header parameters\n" msgstr "" #: src/demuxers/demux_snd.c:147 -#, fuzzy, c-format +#, c-format msgid "demux_snd: unsupported audio type: %d\n" -msgstr "demus_avi: type audio inconnu 0x%lx\n" +msgstr "demux_snd: type audio non supporté: %d\n" #: src/demuxers/demux_snd.c:358 +#, fuzzy msgid "SND/AU file demux plugin" -msgstr "" +msgstr "plugin de sortie audio de xine utilisant esd" #: src/demuxers/demux_tta.c:85 msgid "demux_tta: total frames count too high\n" @@ -1025,9 +1103,10 @@ msgid "" msgstr "" #: src/dxr3/dxr3_decode_video.c:507 -#, fuzzy, c-format +#, c-format msgid "dxr3_decode_video: Failed to open video device %s (%s)\n" -msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n" +msgstr "" +"dxr3_decode_video: L'ouverture du périphérique vidéo a echouée %s (%s)\n" #: src/dxr3/dxr3_decode_video.c:575 msgid "dxr3_decode_video: write to device would block. flushing\n" @@ -1094,7 +1173,7 @@ msgstr "" #: src/dxr3/dxr3_mpeg_encoders.c:240 #, c-format msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n" -msgstr "" +msgstr "dxr3_mpeg_encoder: ne peut pas démarrer l'encodage: %s\n" #: src/dxr3/dxr3_mpeg_encoders.c:370 msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n" @@ -1156,14 +1235,14 @@ msgid "" msgstr "" #: src/dxr3/video_out_dxr3.c:269 -#, fuzzy, c-format +#, c-format msgid "video_out_dxr3: Failed to open control device %s (%s)\n" -msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n" +msgstr "" #: src/dxr3/video_out_dxr3.c:277 -#, fuzzy, c-format +#, c-format msgid "video_out_dxr3: Failed to open video device %s (%s)\n" -msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n" +msgstr "video_out_dxr3: L'ouverture du périphérique vidéo a échouée %s (%s)\n" #: src/dxr3/video_out_dxr3.c:323 msgid "encoder for non mpeg content" @@ -1316,37 +1395,38 @@ msgstr "" msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n" msgstr "" -#: src/input/input_cdda.c:1586 -#, fuzzy, c-format +#: src/input/input_cdda.c:1584 +#, c-format msgid "%s: can't connect to %s:%d\n" -msgstr "input_net: impossible de se connecter à '%s'.\n" +msgstr "%s: ne peut pas se connecter à %s:%d\n" -#: src/input/input_cdda.c:1633 -#, fuzzy, c-format -msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n" -msgstr "input_cda: serveur '%s:%d' connecté avec succés.\n" +#: src/input/input_cdda.c:1631 +#, c-format +msgid "input_cdda: successfully connected to cddb server '%s:%d'.\n" +msgstr "input_cdda: serveur cddb '%s:%d' connecté avec succés.\n" -#: src/input/input_cdda.c:1638 -#, fuzzy, c-format +#: src/input/input_cdda.c:1636 +#, c-format msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" -msgstr "input_net: impossible de se connecter à '%s'.\n" +msgstr "input_cdda: impossible de se connecter au serveur cddb '%s:%d' (%s).\n" -#: src/input/input_cdda.c:2687 +#: src/input/input_cdda.c:2685 msgid "CD Digital Audio (aka. CDDA)" msgstr "" -#: src/input/input_cdda.c:2700 -#, fuzzy +#: src/input/input_cdda.c:2698 msgid "device used for CD audio" -msgstr "périphérique utilisé pour la sortie 4 canaux" +msgstr "périphérique utilisé pour les cd audio" -#: src/input/input_cdda.c:2701 +#: src/input/input_cdda.c:2699 msgid "" "The path to the device, usually a CD or DVD drive, which you intend to use " "for playing audio CDs." msgstr "" +"Le chemin d'accès vers le périphérique, généralement un lecteur CD ou DVD, " +"choisissez celui que vous souhaitez utiliser pour lire vos CD audio." -#: src/input/input_cdda.c:2707 +#: src/input/input_cdda.c:2705 msgid "query CDDB" msgstr "" @@ -1359,11 +1439,11 @@ msgid "" "listening habits." msgstr "" -#: src/input/input_cdda.c:2715 +#: src/input/input_cdda.c:2713 msgid "CDDB server name" -msgstr "" +msgstr "Nom du serveur CDDB" -#: src/input/input_cdda.c:2715 +#: src/input/input_cdda.c:2713 msgid "" "The CDDB server used to retrieve the title and track information from.\n" "This setting is security critical, because the sever will receive " @@ -1371,11 +1451,11 @@ msgid "" "malicious replies. Be sure to enter a server you can trust." msgstr "" -#: src/input/input_cdda.c:2723 +#: src/input/input_cdda.c:2721 msgid "CDDB server port" -msgstr "" +msgstr "Port du serveur CDDB " -#: src/input/input_cdda.c:2723 +#: src/input/input_cdda.c:2721 msgid "The server port used to retrieve the title and track information from." msgstr "" @@ -1393,17 +1473,16 @@ msgid "" msgstr "" #: src/input/input_dvb.c:883 -#, fuzzy, c-format +#, c-format msgid "input_dvb: failed to open dvb channel file '%s': %s\n" -msgstr "input_file: tente d'ouvrir le fichier de sous-titre '%s'\n" +msgstr "" #: src/input/input_dvb.c:889 -#, fuzzy, c-format +#, c-format msgid "input_dvb: dvb channel file '%s' is not a plain file\n" -msgstr "input_file: tente d'ouvrir le fichier de sous-titre '%s'\n" +msgstr "" #: src/input/input_dvb.c:2127 src/input/input_dvb.c:2967 -#, fuzzy msgid "input_dvb: tuner_set_channel failed\n" msgstr "input_cda: fopen(%s) à échoué: %s\n" @@ -1413,9 +1492,8 @@ msgid "input_dvb: DVB GUI %s\n" msgstr "" #: src/input/input_dvb.c:2767 src/input/input_dvb.c:3183 -#, fuzzy msgid "input_dvb: cannot open dvb device\n" -msgstr "input_dvd: ne peux pas ouvrir le périphérique dvd >%s<\n" +msgstr "input_dvb: ne peux pas ouvrir le périphérique dvb\n" #: src/input/input_dvb.c:2791 #, c-format @@ -1423,9 +1501,9 @@ msgid "input_dvb: channel %d out of range, defaulting to 0\n" msgstr "" #: src/input/input_dvb.c:2802 -#, fuzzy, c-format +#, c-format msgid "input_dvb: searching for channel %s\n" -msgstr "input_file: tente d'ouvrir le fichier de sous-titre '%s'\n" +msgstr "input_dvb: recherche pour le canal %s\n" #: src/input/input_dvb.c:2825 #, c-format @@ -1433,9 +1511,9 @@ msgid "input_dvb: exact match for %s not found: trying partial matches\n" msgstr "" #: src/input/input_dvb.c:2832 -#, fuzzy, c-format +#, c-format msgid "input_dvb: found matching channel %s\n" -msgstr "input_file: tente d'ouvrir le fichier de sous-titre '%s'\n" +msgstr "" #: src/input/input_dvb.c:2845 #, c-format @@ -1477,14 +1555,13 @@ msgid "" msgstr "" #: src/input/input_dvb.c:2973 -#, fuzzy, c-format +#, c-format msgid "input_dvb: cannot open dvr device '%s'\n" -msgstr "input_dvd: ne peux pas ouvrir le périphérique dvd >%s<\n" +msgstr "input_dvb: ne peut pas ouvrir le périhérique dvr '%s'\n" #: src/input/input_dvb.c:2996 -#, fuzzy msgid "input_dvb: cannot create EPG updater thread\n" -msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n" +msgstr "" #: src/input/input_dvb.c:3058 msgid "use DVB 'center cutout' (zoom)" @@ -1555,24 +1632,24 @@ msgid "input_dvd: Error getting next block from DVD (%s)\n" msgstr "" #: src/input/input_dvd.c:1498 -#, fuzzy msgid "input_dvd: Error opening DVD device\n" -msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n" +msgstr "input_dvd: Erreur à l'ouverture du périphérique DVD\n" #: src/input/input_dvd.c:1759 msgid "DVD Navigator" msgstr "" #: src/input/input_dvd.c:1776 -#, fuzzy msgid "device used for DVD playback" -msgstr "périphérique utilisé pour la sortie mono" +msgstr "périphérique utilisé pour la lecture des DVD" #: src/input/input_dvd.c:1777 msgid "" "The path to the device, usually a DVD drive, which you intend to use for " "playing DVDs." msgstr "" +"Le chemin d'accès vers le périphérique, généralement un lecteur CD ou DVD, " +"choisissez celui que vous souhaitez utiliser pour lire vos DVD ." #: src/input/input_dvd.c:1794 msgid "raw device set up for DVD access" @@ -1613,7 +1690,7 @@ msgstr "" #: src/input/input_dvd.c:1831 msgid "default language for DVD playback" -msgstr "" +msgstr "langue par défaut pour la lecture des DVD" #: src/input/input_dvd.c:1832 msgid "" @@ -1696,19 +1773,19 @@ msgid "input_file: read error (%s)\n" msgstr "input_file: erreur de lecture (%s)\n" #: src/input/input_file.c:358 -#, fuzzy, c-format +#, c-format msgid "input_file: Permission denied: >%s<\n" -msgstr "input_cda: fopen(%s) à échoué: %s\n" +msgstr "input_file: Permission refusée: >%s<\n" #: src/input/input_file.c:362 -#, fuzzy, c-format +#, c-format msgid "input_file: File not found: >%s<\n" -msgstr "input_file: erreur de lecture (%s)\n" +msgstr "input_file: Fichier non trouvé: >%s<\n" #: src/input/input_file.c:402 src/input/input_gnome_vfs.c:279 -#, fuzzy, c-format +#, c-format msgid "input_file: File empty: >%s<\n" -msgstr "input_file: erreur de lecture (%s)\n" +msgstr "input_file: Fichier vide: >%s<\n" #: src/input/input_file.c:967 msgid "file input plugin" @@ -1724,42 +1801,43 @@ msgstr "" #: src/input/input_file.c:992 msgid "list hidden files" -msgstr "" +msgstr "lister les fichiers cachés" #: src/input/input_file.c:993 msgid "" "If enabled, the browser to select the file to play will also show hidden " "files." msgstr "" +"Si activé, le navigateur qui vous permet de sélectionner les fichiers à " +"jouer vous montrera également ceux qui sont cachés." #: src/input/input_gnome_vfs.c:367 -#, fuzzy msgid "gnome-vfs input plugin as shipped with xine" -msgstr "plugin d'entrée réseau fournis avec xine" +msgstr "plugin d'entré gnome-vfs fourni avec xine" #: src/input/input_http.c:173 -#, fuzzy, c-format +#, c-format msgid "input_http: gethostbyname(%s) failed: %s\n" -msgstr "input_cda: fopen(%s) à échoué: %s\n" +msgstr "input_http: gethostbyname(%s) a echoué: %s\n" #: src/input/input_http.c:418 src/input/input_http.c:1014 -#, fuzzy, c-format +#, c-format msgid "input_http: read error %d\n" -msgstr "input_file: erreur de lecture (%s)\n" +msgstr "input_http: erreur de lecture %d\n" #: src/input/input_http.c:646 msgid "Connecting HTTP server..." -msgstr "" +msgstr "Connexion au serveur HTTP..." #: src/input/input_http.c:840 #, c-format msgid "input_http: invalid http answer\n" -msgstr "" +msgstr "input_http: réponse http invalide\n" #: src/input/input_http.c:846 -#, fuzzy, c-format +#, c-format msgid "input_http: 3xx redirection: >%d %s<\n" -msgstr "input_file: erreur de lecture (%s)\n" +msgstr "input_http: 3xx redirection: >%d %s<\n" #: src/input/input_http.c:851 src/input/input_http.c:856 #: src/input/input_http.c:862 src/input/input_http.c:869 @@ -1773,13 +1851,13 @@ msgid "input_http: content length = %<PRIdMAX> bytes\n" msgstr "" #: src/input/input_http.c:965 -#, fuzzy, c-format +#, c-format msgid "input_http: buffer exhausted after %d bytes." -msgstr "input_file: erreur de lecture (%s)\n" +msgstr "input_http: buffer épuisé après %d bytes." #: src/input/input_http.c:1087 msgid "http input plugin" -msgstr "" +msgstr "plugin d'entré http" #: src/input/input_http.c:1124 msgid "HTTP proxy host" @@ -1787,7 +1865,7 @@ msgstr "" #: src/input/input_http.c:1124 msgid "The hostname of the HTTP proxy." -msgstr "" +msgstr "Le nom d'hôte pour le proxy HTTP." #: src/input/input_http.c:1128 msgid "HTTP proxy port" @@ -1842,7 +1920,7 @@ msgstr "" #: src/input/input_mms.c:478 msgid "MMS protocol" -msgstr "" +msgstr "Protocole MMS" #: src/input/input_mms.c:479 msgid "" @@ -1863,60 +1941,62 @@ msgstr "input_net: connect(): %s\n" #: src/input/input_net.c:180 src/input/input_net.c:222 #, c-format msgid "input_net: unable to resolve '%s'.\n" -msgstr "input_net: impossible de resoudre '%s'.\n" +msgstr "input_net: impossible de résoudre '%s'.\n" #: src/input/input_net.c:193 src/input/input_net.c:239 #, c-format msgid "input_net: unable to connect to '%s'.\n" msgstr "input_net: impossible de se connecter à '%s'.\n" -#: src/input/input_net.c:517 +#: src/input/input_net.c:523 msgid "net input plugin as shipped with xine" -msgstr "plugin d'entrée réseau fournis avec xine" +msgstr "plugin d'entré réseau fournis avec xine" #: src/input/input_pnm.c:272 msgid "pnm streaming input plugin" msgstr "" #: src/input/input_pvr.c:593 -#, fuzzy, c-format +#, c-format msgid "input_pvr: error creating pvr file (%s)\n" -msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n" +msgstr "input_pvr: erreur à la création du fichier pvr (%s)\n" #: src/input/input_pvr.c:750 -#, fuzzy, c-format +#, c-format msgid "input_pvr: error opening pvr file (%s)\n" -msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n" +msgstr "input_pvr: erreur à l'ouverture du fichier pvr (%s)\n" #: src/input/input_pvr.c:826 -#, fuzzy, c-format +#, c-format msgid "input_pvr: read error (%s)\n" -msgstr "input_file: erreur de lecture (%s)\n" +msgstr "input_pvr: erreur de lecture (%s)\n" -#: src/input/input_pvr.c:1142 src/input/input_pvr.c:1395 -#, fuzzy, c-format +#: src/input/input_pvr.c:1165 src/input/input_pvr.c:1418 +#, c-format msgid "input_pvr: error opening device %s\n" -msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n" +msgstr "input_pvr: erreur à l'ouverture du périphérique %s\n" -#: src/input/input_pvr.c:1148 src/input/input_pvr.c:1401 +#: src/input/input_pvr.c:1171 src/input/input_pvr.c:1424 msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n" msgstr "" +"input_pvr: IVTV_IOC_G_CODEC a échoué, peut-être que l' API a changé ?\n" -#: src/input/input_pvr.c:1156 src/input/input_pvr.c:1410 +#: src/input/input_pvr.c:1179 src/input/input_pvr.c:1433 msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n" msgstr "" +"input_pvr: IVTV_IOC_S_CODEC a échoué, peut-être que l' API a changé ?\n" -#: src/input/input_pvr.c:1528 +#: src/input/input_pvr.c:1551 msgid "device used for WinTV-PVR 250/350 (pvr plugin)" -msgstr "" +msgstr "périphérique utilisé pour WinTV-PVR 250/350 (pvr plugin)" -#: src/input/input_pvr.c:1529 +#: src/input/input_pvr.c:1552 msgid "The path to the device of your WinTV card." -msgstr "" +msgstr "Le chemin d'accès vers le périphérique de votre carte WinTV." -#: src/input/input_pvr.c:1535 +#: src/input/input_pvr.c:1558 msgid "WinTV-PVR 250/350 input plugin" -msgstr "" +msgstr "plugin d'entré WinTV-PVR 250/350" #: src/input/input_rtp.c:183 #, c-format @@ -1925,17 +2005,17 @@ msgstr "socket(): %s.\n" #: src/input/input_rtp.c:193 msgid "IP address specified is multicast\n" -msgstr "" +msgstr "L'adresse IP spécifiée est multicast\n" #: src/input/input_rtp.c:202 -#, fuzzy, c-format +#, c-format msgid "setsockopt(SO_RCVBUF): %s.\n" -msgstr "socket(): %s.\n" +msgstr "setsockopt(SO_RCVBUF): %s.\n" #: src/input/input_rtp.c:210 -#, fuzzy, c-format +#, c-format msgid "setsockopt(SO_REUSEADDR): %s.\n" -msgstr "socket(): %s.\n" +msgstr "" #: src/input/input_rtp.c:217 #, c-format @@ -1958,18 +2038,18 @@ msgid "unable to resolve '%s'.\n" msgstr "incapable de resoudre '%s'.\n" #: src/input/input_rtp.c:287 -#, fuzzy, c-format +#, c-format msgid "unable to bind to '%s'.\n" msgstr "incapable de se connecter à '%s'.\n" #: src/input/input_rtp.c:336 -#, fuzzy, c-format +#, c-format msgid "recv(): %s.\n" -msgstr "socket(): %s.\n" +msgstr "" #: src/input/input_rtp.c:631 msgid "RTP: stopping reading thread...\n" -msgstr "" +msgstr "RTP: arrêt de la lecture du thread...\n" #: src/input/input_rtp.c:634 msgid "RTP: reading thread terminated\n" @@ -1986,9 +2066,8 @@ msgid "input_rtp: can't create new thread (%s)\n" msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n" #: src/input/input_rtp.c:778 -#, fuzzy msgid "RTP and UDP input plugin as shipped with xine" -msgstr "plugin d'entrée réseau fournis avec xine" +msgstr "plugin d'entré RTP et UDP fournis avec xine" #: src/input/input_rtsp.c:292 msgid "rtsp streaming input plugin" @@ -1996,7 +2075,7 @@ msgstr "" #: src/input/input_smb.c:503 msgid "CIFS/SMB input plugin based on libsmbclient" -msgstr "" +msgstr "plugin d'entré CIFS/SMB basé sur libsmbclient" #: src/input/input_stdin_fifo.c:165 #, c-format @@ -2004,9 +2083,9 @@ msgid "stdin: cannot seek back! (%<PRIdMAX> > %<PRIdMAX>)\n" msgstr "" #: src/input/input_stdin_fifo.c:253 -#, fuzzy, c-format +#, c-format msgid "stdin: failed to open '%s'\n" -msgstr "incapable de resoudre '%s'.\n" +msgstr "stdin: impossible d'ouvrir '%s'\n" #: src/input/input_stdin_fifo.c:357 msgid "stdin streaming input plugin" @@ -2026,20 +2105,19 @@ msgstr "" #: src/input/input_v4l.c:683 msgid "Tuner name not found\n" -msgstr "" +msgstr "Tuner non trouvé\n" #: src/input/input_v4l.c:1914 msgid "v4l tv input plugin" -msgstr "" +msgstr "plugin d'entré tv V4l" #: src/input/input_v4l.c:1922 -#, fuzzy msgid "v4l video device" -msgstr "périphérique du mixeur alsa" +msgstr "périphérique vidéo v4l" #: src/input/input_v4l.c:1923 msgid "The path to your Video4Linux video device." -msgstr "" +msgstr "Le chemin d'accès vers votre périphérique vidéo Video4Linux" #: src/input/input_v4l.c:1927 msgid "v4l TV standard" @@ -2052,75 +2130,76 @@ msgstr "" #: src/input/input_v4l.c:1946 msgid "v4l radio input plugin" -msgstr "" +msgstr "plugin d'entré radio v4l" #: src/input/input_v4l.c:1954 -#, fuzzy msgid "v4l radio device" -msgstr "périphérique du mixeur alsa" +msgstr "périphérique radio v4l" #: src/input/input_v4l.c:1955 msgid "The path to your Video4Linux radio device." -msgstr "" +msgstr "Le chemin d'accès vers votre périphérique radio Video4Linux" #: src/input/input_vcd.c:850 -#, fuzzy msgid "input_vcd: malformed MRL. Use vcdo:/<track #>\n" -msgstr "input_cda: MRL malformée. Utilisez cda://<piste #>\n" +msgstr "input_vcd: MRL mal formée. Utilisez vcdo:/<track #>\n" #: src/input/input_vcd.c:856 -#, fuzzy, c-format +#, c-format msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n" -msgstr "input_cda: piste %d invalide (limites correctes: 1 .. %d)\n" +msgstr "input_vcd: piste %d invalide (limites correctes: 0 .. %d)\n" #: src/input/input_vcd.c:959 -#, fuzzy, c-format +#, c-format msgid "unable to open %s: %s.\n" -msgstr "incapable de resoudre '%s'.\n" +msgstr "incapable d'ouvrir %s: %s.\n" #: src/input/input_vcd.c:1035 -#, fuzzy, c-format +#, c-format msgid "input_vcd: unable to open %s: %s.\n" -msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n" +msgstr "input_vcd: incapable d'ouvrir %s: %s.\n" #: src/input/input_vcd.c:1082 msgid "Video CD input plugin" -msgstr "" +msgstr "plugin d'entré Video CD" #: src/input/input_vcd.c:1089 -#, fuzzy msgid "device used for VCD playback" -msgstr "périphérique utilisé pour la sortie mono" +msgstr "périphérique utilisé pour la lecture des VCD" #: src/input/input_vcd.c:1090 msgid "" "The path to the device, usually a CD or DVD drive, you intend to play your " "VideoCDs with." msgstr "" +"Le chemin d'accès vers le périphérique, généralement un lecteur CD ou DVD, " +"choisissez celui que vous souhaitez utiliser pour lire vos VideoCD ." #: src/input/librtsp/rtsp.c:435 #, c-format msgid "rtsp: bad mrl: %s\n" -msgstr "" +msgstr "rtsp: mauvaise mrl: %s\n" #: src/input/librtsp/rtsp.c:493 -#, fuzzy, c-format +#, c-format msgid "rtsp: failed to connect to '%s'\n" -msgstr "input_net: impossible de se connecter à '%s'.\n" +msgstr "rtsp: impossible de se connecter à '%s'\n" #: src/input/librtsp/rtsp_session.c:107 -#, fuzzy, c-format +#, c-format msgid "rtsp_session: failed to connect to server %s\n" -msgstr "input_net: impossible de se connecter à '%s'.\n" +msgstr "rtsp_session: impossible de se connecter au serveur %s\n" #: src/input/librtsp/rtsp_session.c:141 msgid "rtsp_session: session can not be established.\n" -msgstr "" +msgstr "rtsp_session: la session ne peut pas être établie.\n" #: src/input/librtsp/rtsp_session.c:159 #, c-format msgid "rtsp_session: rtsp server type '%s' not supported yet. sorry.\n" msgstr "" +"rtsp_session: ce type de serveur rtsp '%s' n'est pas encore supporté. " +"Désolé.\n" #: src/input/media_helper.c:148 #, c-format @@ -2129,7 +2208,7 @@ msgstr "" #: src/input/mms.c:559 msgid "Connecting MMS server (over tcp)..." -msgstr "" +msgstr "Connexion au serveur MMS (over tcp)..." #: src/input/mmsh.c:199 msgid "libmmsh: send error\n" @@ -2138,12 +2217,12 @@ msgstr "" #: src/input/mmsh.c:244 #, c-format msgid "libmmsh: bad response format\n" -msgstr "" +msgstr "libmmsh: mauvais format de réponse\n" #: src/input/mmsh.c:250 -#, fuzzy, c-format +#, c-format msgid "libmmsh: 3xx redirection not implemented: >%d %s<\n" -msgstr "input_file: erreur de lecture (%s)\n" +msgstr "libmmsh: 3xx redirection non effectuée: >%d %s<\n" #: src/input/mmsh.c:257 #, c-format @@ -2181,14 +2260,13 @@ msgid "" msgstr "" #: src/input/pnm.c:753 -#, fuzzy, c-format +#, c-format msgid "input_pnm: failed to connect '%s'\n" -msgstr "input_net: impossible de se connecter à '%s'.\n" +msgstr "input_pnm: impossible de se connecter '%s'\n" #: src/input/pnm.c:764 -#, fuzzy msgid "input_pnm: failed to set up stream\n" -msgstr "input_net: impossible de se connecter à '%s'.\n" +msgstr "" #: src/input/vcd/vcdio.c:222 msgid "SEEK_CUR not implemented for non-zero offset" @@ -2252,7 +2330,7 @@ msgstr "" #: src/input/vcd/xineplug_inp_vcd.c:1137 msgid "Unknown event type: " -msgstr "" +msgstr "type d'évènement inconnu:" #: src/input/vcd/xineplug_inp_vcd.c:1433 src/input/vcd/xineplug_inp_vcd.c:1480 msgid "The above message had unknown vcdimager log level" @@ -2383,6 +2461,7 @@ msgstr "" #, c-format msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n" msgstr "" +"ffmpeg_audio_dec: augmentation du buffer à %d pour éviter sa saturation.\n" #: src/combined/ffmpeg/ff_audio_decoder.c:163 #, c-format @@ -2404,7 +2483,7 @@ msgstr "" #: src/combined/ffmpeg/ff_dvaudio_decoder.c:277 #, c-format msgid "dvaudio: increasing buffer to %d to avoid overflow.\n" -msgstr "" +msgstr "dvaudio: augmentation du buffer à %d pour éviter sa saturation.\n" #: src/combined/ffmpeg/ff_dvaudio_decoder.c:388 #, fuzzy @@ -2434,8 +2513,9 @@ msgid "" msgstr "" #: src/combined/ffmpeg/ffmpeg_encoder.c:177 +#, fuzzy msgid "minimum compression" -msgstr "" +msgstr "iff-ilbm: compression inconnue: %d\n" #: src/combined/ffmpeg/ffmpeg_encoder.c:178 msgid "The minimum compression to apply to an image in constant quality mode." @@ -2474,16 +2554,17 @@ msgstr "" #, c-format msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n" msgstr "" +"ffmpeg_video_dec: augmentation du buffer à %d pour éviter sa saturation.\n" -#: src/combined/ffmpeg/ff_video_decoder.c:1536 +#: src/combined/ffmpeg/ff_video_decoder.c:1574 msgid "ffmpeg based video decoder plugin" msgstr "" -#: src/combined/ffmpeg/ff_video_decoder.c:1548 +#: src/combined/ffmpeg/ff_video_decoder.c:1586 msgid "MPEG-4 postprocessing quality" -msgstr "" +msgstr "Qualité du post-traitement MPEG-4" -#: src/combined/ffmpeg/ff_video_decoder.c:1549 +#: src/combined/ffmpeg/ff_video_decoder.c:1587 msgid "" "You can adjust the amount of post processing applied to MPEG-4 video.\n" "Higher values result in better quality, but need more CPU. Lower values may " @@ -2491,8 +2572,15 @@ msgid "" "heavy post processing can actually make the image worse by blurring it too " "much." msgstr "" +"Vous pouvez ajuster le niveau de post-traitement a appliqué au vidéo MPEG-" +"4.\n" +"De hautes valeurs donnent une meilleure qualité d'image mais sollicite " +"davantage le processeur.De faibles valeurs peuvent provoquer une dégradation " +"de l'image comme par exemple l'apparition d'artefacts. Dans le cas d'une " +"vidéo de haute qualité, un post-traitement trop important peut actuellement " +"dégrader l'image en la rendant plus floue . " -#: src/combined/ffmpeg/ff_video_decoder.c:1557 +#: src/combined/ffmpeg/ff_video_decoder.c:1595 msgid "FFmpeg video decoding thread count" msgstr "" @@ -2501,13 +2589,38 @@ msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " "whether parallel decoding is supported. A rule of thumb is to have one " -"decoding thread per logical CPU (typically 1 to 4). A change will take " -"effect with playing the next stream." +"decoding thread per logical CPU (typically 1 to 4).\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1605 +msgid "Skip loop filter" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1606 +msgid "" +"You can control for which frames the loop filter shall be skipped after " +"decoding.\n" +"Skipping the loop filter will speedup decoding but may lead to artefacts. " +"The number of frames for which it is skipped increases from 'none' to 'all'. " +"The default value leaves the decision up to the implementation.\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1615 +msgid "Choose speed over specification compliance" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1616 +msgid "" +"You may want to allow speed cheats which violate codec specification.\n" +"Cheating may speed up decoding but can also lead to decoding artefacts.\n" +"A change of this setting will take effect with playing the next stream." msgstr "" #: src/libreal/real_common.c:139 msgid "path to RealPlayer codecs" -msgstr "" +msgstr "chemin d'accès vers les codecs RealPlayer" #: src/libreal/real_common.c:140 msgid "" @@ -2828,15 +2941,15 @@ msgstr "" #: src/audio_dec/xine_faad_decoder.c:131 msgid "libfaad: libfaad NeAACDecOpen() failed.\n" -msgstr "" +msgstr "libfaad: libfaad NeAACDecOpen() a échoué.\n" #: src/audio_dec/xine_faad_decoder.c:140 msgid "libfaad: libfaad NeAACDecInit2 failed.\n" -msgstr "" +msgstr "libfaad: libfaad NeAACDecInit2 a échoué.\n" #: src/audio_dec/xine_faad_decoder.c:151 msgid "libfaad: libfaad NeAACDecInit failed.\n" -msgstr "" +msgstr "libfaad: libfaad NeAACDecInit a échoué.\n" #: src/audio_dec/xine_faad_decoder.c:458 msgid "Freeware Advanced Audio Decoder" @@ -3367,12 +3480,11 @@ msgstr "" #: src/video_out/video_out_aa.c:298 msgid "xine video output plugin using the ascii-art library" -msgstr "plugin de sortie video de xine utilisant la librairie ascii-art" +msgstr "plugin de sortie video xine utilisant la bibliothèque ascii-art" #: src/video_out/video_out_caca.c:302 -#, fuzzy msgid "xine video output plugin using the Color AsCii Art library" -msgstr "plugin de sortie video de xine utilisant la librairie ascii-art" +msgstr "plugin de sortie video xine utilisant la bibliothèque Color AsCii Art" #: src/video_out/video_out_directfb.c:1341 msgid "video layer buffering mode" @@ -3492,37 +3604,33 @@ msgid "video_out_directfb: using display layer #%d.\n" msgstr "" #: src/video_out/video_out_directfb.c:1901 -#, fuzzy msgid "xine video output plugin using DirectFB." -msgstr "plugin de sortie audio de xine utilisant libvidix" +msgstr "plugin de sortie vidéo xine utilisant DirectFB." #: src/video_out/video_out_directfb.c:1994 msgid "video_out_directfb: no usable display layer was found!\n" msgstr "" #: src/video_out/video_out_directfb.c:2106 -#, fuzzy msgid "xine video output plugin using DirectFB under XDirectFB." -msgstr "plugin de sortie audio de xine utilisant libvidix" +msgstr "plugin de sortie vidéo xine utilisant DirectFB sous XDirectFB." #: src/video_out/video_out_directx.c:1241 -#, fuzzy msgid "xine video output plugin for win32 using directx" -msgstr "plugin de sortie audio de xine utilisant libvidix" +msgstr "plugin de sortie vidéo xine pour win32 utilisant directx" -#: src/video_out/video_out_fb.c:746 +#: src/video_out/video_out_fb.c:758 #, c-format msgid "" "video_out_fb: only packed truecolour/directcolour is supported (%d).\n" " Check 'fbset -i' or try 'fbset -depth 16'.\n" msgstr "" -#: src/video_out/video_out_fb.c:806 src/video_out/video_out_vidix.c:1220 -#, fuzzy +#: src/video_out/video_out_fb.c:818 src/video_out/video_out_vidix.c:1232 msgid "framebuffer device name" -msgstr "périphérique framebuffer" +msgstr "Nom du périphérique framebuffer" -#: src/video_out/video_out_fb.c:807 src/video_out/video_out_vidix.c:1221 +#: src/video_out/video_out_fb.c:819 src/video_out/video_out_vidix.c:1233 msgid "" "Specifies the file name for the framebuffer device to be used.\n" "This setting is security critical, because when changed to a different file, " @@ -3563,16 +3671,14 @@ msgid "" "\n" msgstr "" -#: src/video_out/video_out_fb.c:1055 -#, fuzzy +#: src/video_out/video_out_fb.c:1067 msgid "Xine video output plugin using the Linux frame buffer device" msgstr "" -"plugin de sortie video de xine utilisant le périphérique framebuffer de linux" +"plugin de sortie video xine utilisant le périphérique framebuffer de linux" #: src/video_out/video_out_none.c:279 -#, fuzzy msgid "xine video output plugin which displays nothing" -msgstr "plugin de sortie video de xine pour cartes dxr3" +msgstr "plugin de sortie video xine qui n'affiche rien" #: src/video_out/video_out_opengl.c:1886 msgid "OpenGL renderer" @@ -3631,18 +3737,17 @@ msgid "" msgstr "" #: src/video_out/video_out_opengl.c:1962 -#, fuzzy msgid "xine video output plugin using the OpenGL 3D graphics API" -msgstr "plugin de sortie audio de xine utilisant libvidix" +msgstr "plugin de sortie vidéo xine utilisant l'API graphique 3D OpenGL" #: src/video_out/video_out_pgx32.c:187 msgid "video_out_pgx32: Error: can't grab DGA drawable for video window\n" msgstr "" #: src/video_out/video_out_pgx32.c:206 src/video_out/video_out_pgx32.c:220 -#, fuzzy, c-format +#, c-format msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n" -msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n" +msgstr "video_out_pgx32: Erreur: ioctl a échoué, mauvais périphérique (%s)\n" #: src/video_out/video_out_pgx32.c:213 #, c-format @@ -3660,21 +3765,27 @@ msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n" msgstr "" #: src/video_out/video_out_pgx64.c:296 -#, fuzzy, c-format +#, c-format msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n" -msgstr "input_dvd: impossible d'ouvrir le périphérique dvd (%s): %s\n" +msgstr "" +"video_out_pgx64: Erreur: ne peut pas ouvrir le périphérique framebuffer '%" +"s'\n" #: src/video_out/video_out_pgx64.c:303 #, c-format msgid "" "video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n" msgstr "" +"video_out_pgx64: Erreur: ioctl a échoué (VIS_GETIDENTIFIER), mauvais " +"périphérique (%s)\n" #: src/video_out/video_out_pgx64.c:316 #, c-format msgid "" "video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n" msgstr "" +"video_out_pgx64: Erreur: '%s' n'est pas un périphérique framebuffer xvr100/" +"pgx64/pgx24\n" #: src/video_out/video_out_pgx64.c:337 msgid "" @@ -3699,11 +3810,11 @@ msgstr "" #: src/video_out/video_out_pgx64.c:1386 msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n" -msgstr "" +msgstr "video_out_pgx64: Erreur: ioctl a échoué (FBIOGATTR)\n" -#: src/video_out/video_out_pgx64.c:1453 src/video_out/video_out_xcbxv.c:1266 -#: src/video_out/video_out_xv.c:1319 src/video_out/video_out_xvmc.c:1414 -#: src/video_out/video_out_xxmc.c:2561 +#: src/video_out/video_out_pgx64.c:1453 src/video_out/video_out_xcbxv.c:1278 +#: src/video_out/video_out_xv.c:1331 src/video_out/video_out_xvmc.c:1426 +#: src/video_out/video_out_xxmc.c:2573 msgid "video overlay colour key" msgstr "" @@ -3759,15 +3870,14 @@ msgstr "" msgid "video_out_sdl: fullscreen mode is NOT supported\n" msgstr "" -#: src/video_out/video_out_sdl.c:582 -#, fuzzy +#: src/video_out/video_out_sdl.c:590 msgid "xine video output plugin using the Simple Direct Media Layer" -msgstr "plugin de sortie video de xine utilisant Simple DirectMedia Layer" +msgstr "plugin de sortie video xine utilisant Simple Direct Media Layer" #: src/video_out/video_out_stk.c:454 -#, fuzzy msgid "xine video output plugin using the Libstk Surface Set-top Toolkit" -msgstr "plugin de sortie video de xine utilisant la librairie ascii-art" +msgstr "" +"plugin de sortie video xine utilisant le toolkit Libstk Surface Set-top" #: src/video_out/video_out_syncfb.c:280 msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n" @@ -3903,16 +4013,14 @@ msgstr "" msgid "video overlay colour key blue component" msgstr "" -#: src/video_out/video_out_vidix.c:1195 -#, fuzzy +#: src/video_out/video_out_vidix.c:1207 msgid "xine video output plugin using libvidix for x11" -msgstr "plugin de sortie audio de xine utilisant libvidix" +msgstr "plugin de sortie vidéo xine utilisant libvidix pour x11" -#: src/video_out/video_out_vidix.c:1269 -#, fuzzy +#: src/video_out/video_out_vidix.c:1281 msgid "xine video output plugin using libvidix for linux frame buffer" msgstr "" -"plugin de sortie video de xine utilisant le périphérique framebuffer de linux" +"plugin de sortie video xine utilisant libvidix pour le framebuffer linux" #: src/video_out/video_out_xcbshm.c:150 src/video_out/video_out_xshm.c:211 #, c-format @@ -4055,15 +4163,17 @@ msgstr "" msgid "pitch alignment workaround" msgstr "" -#: src/video_out/video_out_xcbxv.c:1350 src/video_out/video_out_xv.c:1414 -#: src/video_out/video_out_xxmc.c:2664 +#: src/video_out/video_out_xcbxv.c:1362 src/video_out/video_out_xv.c:1426 +#: src/video_out/video_out_xxmc.c:2676 msgid "Some buggy video drivers need a workaround to function properly." msgstr "" +"Certains pilotes vidéo buggés ont besoin d'un workaround ( une solution de " +"rechange/contournement ) pour fonctionner correctement." -#: src/video_out/video_out_xcbxv.c:1377 src/video_out/video_out_xv.c:1460 -#: src/video_out/video_out_xxmc.c:2757 +#: src/video_out/video_out_xcbxv.c:1389 src/video_out/video_out_xv.c:1472 +#: src/video_out/video_out_xxmc.c:2769 msgid "xine video output plugin using the MIT X video extension" -msgstr "plugin de sortie video de xine utilisant l'extension video MIT X" +msgstr "plugin de sortie video xine utilisant l'extension video MIT X" #: src/video_out/video_out_xshm.c:194 #, c-format @@ -4116,12 +4226,11 @@ msgstr "" msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1670 -#, fuzzy +#: src/video_out/video_out_xvmc.c:1682 msgid "xine video output plugin using the XvMC X video extension" -msgstr "plugin de sortie video de xine utilisant l'extension video MIT X" +msgstr "plugin de sortie video xine utilisant l'extension video XvMC " -#: src/video_out/video_out_xxmc.c:2669 +#: src/video_out/video_out_xxmc.c:2681 msgid "Make XvMC allocate more frames for better buffering." msgstr "" @@ -4404,25 +4513,25 @@ msgid ": open() function should never be called\n" msgstr "" #: src/xine-engine/input_cache.c:354 -#, fuzzy, c-format +#, c-format msgid ": input plugin not defined!\n" -msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n" +msgstr ": plugin d'entré non défini!\n" #: src/xine-engine/input_rip.c:139 src/xine-engine/input_rip.c:259 -#, fuzzy, c-format +#, c-format msgid "input_rip: reading of saved data failed: %s\n" -msgstr "input_cda: l'ouverture du serveur '%s:%d' a échouée: %s\n" +msgstr "input_rip: la lecture des données sauvegardées a échouée: %s\n" #: src/xine-engine/input_rip.c:154 -#, fuzzy, c-format +#, c-format msgid "input_rip: reading by input plugin failed\n" -msgstr "input_dvd: erreur de lecture dans le plugin input_dvd\n" +msgstr "input_rip: la lecture par le plugin d'entré a echoué\n" #: src/xine-engine/input_rip.c:162 src/xine-engine/input_rip.c:291 #: src/xine-engine/input_rip.c:657 -#, fuzzy, c-format +#, c-format msgid "input_rip: error writing to file %<PRIdMAX> bytes: %s\n" -msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n" +msgstr "" #: src/xine-engine/input_rip.c:183 #, c-format @@ -4430,14 +4539,14 @@ msgid "input_rip: open() function should never be called\n" msgstr "" #: src/xine-engine/input_rip.c:314 src/xine-engine/input_rip.c:419 -#, fuzzy, c-format +#, c-format msgid "input_rip: seeking failed\n" -msgstr "input_cda: fopen(%s) à échoué: %s\n" +msgstr "input_rip: la recherche a échouée\n" #: src/xine-engine/input_rip.c:371 src/xine-engine/input_rip.c:389 -#, fuzzy, c-format +#, c-format msgid "input_rip: seeking failed: %s\n" -msgstr "input_cda: fopen(%s) à échoué: %s\n" +msgstr "input_rip: la recherche a échouée: %s\n" #: src/xine-engine/input_rip.c:397 #, c-format @@ -4479,9 +4588,9 @@ msgid "input_rip: file name not given!\n" msgstr "" #: src/xine-engine/input_rip.c:627 -#, fuzzy, c-format +#, c-format msgid "input_rip: error opening file %s: %s\n" -msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n" +msgstr "input_rip: erreur à l'ouverture du fichier %s: %s\n" #: src/xine-engine/io_helper.c:252 #, c-format @@ -4489,9 +4598,9 @@ msgid "io_helper: waiting abandoned\n" msgstr "" #: src/xine-engine/io_helper.c:259 -#, fuzzy, c-format +#, c-format msgid "io_helper: waiting failed: %s\n" -msgstr "input_cda: fopen(%s) à échoué: %s\n" +msgstr "" #: src/xine-engine/io_helper.c:314 msgid "failed to get status of socket" @@ -4500,17 +4609,17 @@ msgstr "" #: src/xine-engine/io_helper.c:389 #, c-format msgid "io_helper: Permission denied\n" -msgstr "" +msgstr "io_helper: Permission refusée\n" #: src/xine-engine/io_helper.c:393 #, c-format msgid "io_helper: File not found\n" -msgstr "" +msgstr "io_helper: Fichier non trouvé\n" #: src/xine-engine/io_helper.c:397 #, c-format msgid "io_helper: Connection Refused\n" -msgstr "" +msgstr "io_helper: Connexion refusée\n" #: src/xine-engine/load_plugins.c:213 #, c-format @@ -4555,9 +4664,9 @@ msgid "load_plugins: plugin %s found\n" msgstr "" #: src/xine-engine/load_plugins.c:494 -#, fuzzy, c-format +#, c-format msgid "load_plugins: static plugin found\n" -msgstr "input_net: impossible de se connecter à '%s'.\n" +msgstr "" #: src/xine-engine/load_plugins.c:501 #, c-format @@ -4575,21 +4684,23 @@ msgid "load_plugins: unknown plugin type %d in %s\n" msgstr "" #: src/xine-engine/load_plugins.c:525 -#, fuzzy, c-format +#, c-format msgid "load_plugins: unknown statically linked plugin type %d\n" -msgstr "input_net: impossible de se connecter à '%s'.\n" +msgstr "" #: src/xine-engine/load_plugins.c:585 -#, fuzzy, c-format +#, c-format msgid "load_plugins: unable to stat %s\n" -msgstr "input_net: impossible de se connecter à '%s'.\n" +msgstr "" #: src/xine-engine/load_plugins.c:626 -#, fuzzy, c-format +#, c-format msgid "" "load_plugins: cannot open plugin lib %s:\n" "%s\n" -msgstr "input_net: impossible de se connecter à '%s'.\n" +msgstr "" +"load_plugins: impossible d'ouvrir plugin lib %s:\n" +"%s\n" #: src/xine-engine/load_plugins.c:641 #, c-format @@ -4599,9 +4710,9 @@ msgid "" msgstr "" #: src/xine-engine/load_plugins.c:659 -#, fuzzy, c-format +#, c-format msgid "load_plugins: skipping unreadable plugin directory %s.\n" -msgstr "input_net: impossible de se connecter à '%s'.\n" +msgstr "" #: src/xine-engine/load_plugins.c:708 #, c-format @@ -4618,22 +4729,22 @@ msgstr "" #: src/xine-engine/load_plugins.c:1097 src/xine-engine/load_plugins.c:1106 #, fuzzy, c-format msgid "Unable to create %s directory: %s\n" -msgstr "incapable d'allouer le buffer d'entrée.\n" +msgstr "Impossible de créer l'objet direct sound." #: src/xine-engine/load_plugins.c:1343 -#, fuzzy, c-format +#, c-format msgid "load_plugins: unknown content detection strategy %d\n" -msgstr "input_net: impossible de se connecter à '%s'.\n" +msgstr "" #: src/xine-engine/load_plugins.c:1468 -#, fuzzy, c-format +#, c-format msgid "load_plugins: using demuxer '%s'\n" -msgstr "input_net: impossible de se connecter à '%s'.\n" +msgstr "load_plugins: utilise le demuxer '%s'\n" #: src/xine-engine/load_plugins.c:1763 src/xine-engine/load_plugins.c:1810 -#, fuzzy, c-format +#, c-format msgid "load_plugins: failed to load audio output plugin <%s>\n" -msgstr "input_net: impossible de se connecter à '%s'.\n" +msgstr "load_plugins: impossible de charger le plugin de sortie audio <%s>\n" #: src/xine-engine/load_plugins.c:1813 msgid "" @@ -4642,11 +4753,13 @@ msgid "" msgstr "" #: src/xine-engine/load_plugins.c:2116 -#, fuzzy, c-format +#, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" "%s\n" -msgstr "input_net: impossible de se connecter à '%s'.\n" +msgstr "" +"load_plugins: ne peut pas décharger plugin lib %s:\n" +"%s\n" #: src/xine-engine/osd.c:829 #, c-format @@ -4705,7 +4818,7 @@ msgstr "" #: src/xine-engine/osd.c:1209 #, c-format msgid "osd: unsupported conversion %s -> %s, no conversion performed\n" -msgstr "" +msgstr "osd: conversion non supportée %s -> %s, pas de conversion effectuée\n" #: src/xine-engine/osd.c:1264 src/xine-engine/osd.c:1432 msgid "osd: font isn't defined\n" @@ -4863,19 +4976,19 @@ msgid "xine: error while parsing mrl\n" msgstr "" #: src/xine-engine/xine.c:873 -#, fuzzy, c-format +#, c-format msgid "xine: found input plugin : %s\n" -msgstr "plugin de sortie video de xine pour cartes dxr3" +msgstr "xine: plugin d'entré trouvé : %s\n" #: src/xine-engine/xine.c:891 -#, fuzzy, c-format +#, c-format msgid "xine: input plugin cannot open MRL [%s]\n" -msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n" +msgstr "xine: le plugin d'entré ne peut pas ouvrir la MRL [%s]\n" #: src/xine-engine/xine.c:902 -#, fuzzy, c-format +#, c-format msgid "xine: cannot find input plugin for MRL [%s]\n" -msgstr "plugin de sortie video de xine pour cartes dxr3" +msgstr "" #: src/xine-engine/xine.c:928 #, c-format @@ -4888,9 +5001,8 @@ msgid "xine: join rip input plugin\n" msgstr "" #: src/xine-engine/xine.c:971 -#, fuzzy msgid "xine: error opening rip input plugin instance\n" -msgstr "input_dvd: erreur de lecture dans le plugin input_dvd\n" +msgstr "" #: src/xine-engine/xine.c:1002 #, c-format @@ -4919,9 +5031,8 @@ msgid "subtitle mrl opened '%s'\n" msgstr "" #: src/xine-engine/xine.c:1145 -#, fuzzy msgid "xine: error opening subtitle mrl\n" -msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n" +msgstr "xine: erreur à l'ouverture des sous-titres de la mrl\n" #: src/xine-engine/xine.c:1177 #, c-format @@ -5043,7 +5154,7 @@ msgstr "messages" #: src/xine-engine/xine.c:2099 msgid "plugin" -msgstr "" +msgstr "plugin" #: src/xine-engine/xine.c:2100 msgid "trace" @@ -5051,62 +5162,57 @@ msgstr "" #: src/xine-engine/xine_interface.c:946 msgid "Warning:" -msgstr "" +msgstr "Attention:" #: src/xine-engine/xine_interface.c:947 msgid "Unknown host:" -msgstr "" +msgstr "Hôte inconnu:" #: src/xine-engine/xine_interface.c:948 msgid "Unknown device:" -msgstr "" +msgstr "Périphérique inconnu:" #: src/xine-engine/xine_interface.c:949 msgid "Network unreachable" -msgstr "" +msgstr "Réseau inaccessible" #: src/xine-engine/xine_interface.c:950 msgid "Connection refused:" -msgstr "" +msgstr "Connexion refusée:" #: src/xine-engine/xine_interface.c:951 -#, fuzzy msgid "File not found:" -msgstr "input_file: erreur de lecture (%s)\n" +msgstr "Fichier non trouvé:" #: src/xine-engine/xine_interface.c:952 msgid "Read error from:" -msgstr "" +msgstr "Erreur de lecture provenant de:" #: src/xine-engine/xine_interface.c:953 msgid "Error loading library:" msgstr "" #: src/xine-engine/xine_interface.c:954 -#, fuzzy msgid "Encrypted media stream detected" -msgstr "" -"ogg: flux audio vorbis detecté\n" -"\n" +msgstr "Flux média crypté détecté" #: src/xine-engine/xine_interface.c:955 msgid "Security message:" -msgstr "" +msgstr "Message de sécurité:" #: src/xine-engine/xine_interface.c:956 -#, fuzzy msgid "Audio device unavailable" -msgstr "fifo non disponible (%d)\n" +msgstr "Périphérique audio non disponible" #: src/xine-engine/xine_interface.c:957 msgid "Permission error" -msgstr "" +msgstr "Erreur de permission" #: src/xine-engine/xine_interface.c:958 msgid "File is empty:" -msgstr "" +msgstr "Le fichier est vide:" -#: src/xine-utils/memcpy.c:479 +#: src/xine-utils/memcpy.c:478 msgid "memcopy method used by xine" msgstr "" @@ -5121,15 +5227,14 @@ msgstr "" msgid "Benchmarking memcpy methods (smaller is better):\n" msgstr "" +#~ msgid "xine audio output plugin using kde artsd" +#~ msgstr "plugin de sortie audio xine utilisant arts de kde" + #, fuzzy #~ msgid "demux_asf: Wrong ASX version: %s\n" #~ msgstr "demux_asf: copyright : %s\n" #, fuzzy -#~ msgid "xine audio output plugin using kde artsd" -#~ msgstr "plugin de sortie audio de xine utilisant esd" - -#, fuzzy #~ msgid "dvbsub: cannot create timer thread\n" #~ msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-12-30 15:46+0000\n" +"POT-Creation-Date: 2008-01-06 21:08+0000\n" "PO-Revision-Date: 2006-06-18 23:05+0200\n" "Last-Translator: Diego 'Flameeyes' Pettenò <flameeyes@gentoo.org>\n" "Language-Team: Italian\n" @@ -1597,12 +1597,12 @@ msgstr "" msgid "%s: can't connect to %s:%d\n" msgstr "%s: impossibile connettersi a %s: %d\n" -#: src/input/input_cdda.c:1633 -#, c-format -msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n" +#: src/input/input_cdda.c:1631 +#, fuzzy, c-format +msgid "input_cdda: successfully connected to cddb server '%s:%d'.\n" msgstr "input_cdda: connesso al server CDDB %s:%d con successo.\n" -#: src/input/input_cdda.c:1638 +#: src/input/input_cdda.c:1636 #, c-format msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "input_cdda: connessione al server CDDB '%s:%d' non riuscita (%s).\n" @@ -2954,8 +2954,33 @@ msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " "whether parallel decoding is supported. A rule of thumb is to have one " -"decoding thread per logical CPU (typically 1 to 4). A change will take " -"effect with playing the next stream." +"decoding thread per logical CPU (typically 1 to 4).\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1605 +msgid "Skip loop filter" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1606 +msgid "" +"You can control for which frames the loop filter shall be skipped after " +"decoding.\n" +"Skipping the loop filter will speedup decoding but may lead to artefacts. " +"The number of frames for which it is skipped increases from 'none' to 'all'. " +"The default value leaves the decision up to the implementation.\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1615 +msgid "Choose speed over specification compliance" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1616 +msgid "" +"You may want to allow speed cheats which violate codec specification.\n" +"Cheating may speed up decoding but can also lead to decoding artefacts.\n" +"A change of this setting will take effect with playing the next stream." msgstr "" #: src/libreal/real_common.c:139 diff --git a/po/libxine2.pot b/po/libxine2.pot index 3e24545ab..9c05b9045 100644 --- a/po/libxine2.pot +++ b/po/libxine2.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-12-30 15:46+0000\n" +"POT-Creation-Date: 2008-01-06 21:08+0000\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" @@ -1300,12 +1300,12 @@ msgstr "" msgid "%s: can't connect to %s:%d\n" msgstr "" -#: src/input/input_cdda.c:1633 +#: src/input/input_cdda.c:1631 #, c-format -msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n" +msgid "input_cdda: successfully connected to cddb server '%s:%d'.\n" msgstr "" -#: src/input/input_cdda.c:1638 +#: src/input/input_cdda.c:1636 #, c-format msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "" @@ -2466,8 +2466,33 @@ msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " "whether parallel decoding is supported. A rule of thumb is to have one " -"decoding thread per logical CPU (typically 1 to 4). A change will take " -"effect with playing the next stream." +"decoding thread per logical CPU (typically 1 to 4).\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1605 +msgid "Skip loop filter" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1606 +msgid "" +"You can control for which frames the loop filter shall be skipped after " +"decoding.\n" +"Skipping the loop filter will speedup decoding but may lead to artefacts. " +"The number of frames for which it is skipped increases from 'none' to 'all'. " +"The default value leaves the decision up to the implementation.\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1615 +msgid "Choose speed over specification compliance" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1616 +msgid "" +"You may want to allow speed cheats which violate codec specification.\n" +"Cheating may speed up decoding but can also lead to decoding artefacts.\n" +"A change of this setting will take effect with playing the next stream." msgstr "" #: src/libreal/real_common.c:139 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pl_PL\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-12-30 15:46+0000\n" +"POT-Creation-Date: 2008-01-06 21:08+0000\n" "PO-Revision-Date: 2003-05-24 12:36+0200\n" "Last-Translator: Bartłomiej Muryn <_4ever_@irc.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -1417,13 +1417,14 @@ msgstr "" msgid "%s: can't connect to %s:%d\n" msgstr "http: nie mogę się podłączyć do >%s<\n" -#: src/input/input_cdda.c:1633 -#, c-format -msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n" -msgstr "" +# src/input/input_net.c:138 +#: src/input/input_cdda.c:1631 +#, fuzzy, c-format +msgid "input_cdda: successfully connected to cddb server '%s:%d'.\n" +msgstr "input_net: nie mogę podłączyć się do '%s'.\n" # src/input/input_net.c:138 -#: src/input/input_cdda.c:1638 +#: src/input/input_cdda.c:1636 #, fuzzy, c-format msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "input_net: nie mogę podłączyć się do '%s'.\n" @@ -2668,8 +2669,33 @@ msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " "whether parallel decoding is supported. A rule of thumb is to have one " -"decoding thread per logical CPU (typically 1 to 4). A change will take " -"effect with playing the next stream." +"decoding thread per logical CPU (typically 1 to 4).\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1605 +msgid "Skip loop filter" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1606 +msgid "" +"You can control for which frames the loop filter shall be skipped after " +"decoding.\n" +"Skipping the loop filter will speedup decoding but may lead to artefacts. " +"The number of frames for which it is skipped increases from 'none' to 'all'. " +"The default value leaves the decision up to the implementation.\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1615 +msgid "Choose speed over specification compliance" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1616 +msgid "" +"You may want to allow speed cheats which violate codec specification.\n" +"Cheating may speed up decoding but can also lead to decoding artefacts.\n" +"A change of this setting will take effect with playing the next stream." msgstr "" # src/libw32dll/w32codec.c:1404 src/libw32dll/w32codec.c:1453 diff --git a/po/pt_BR.po b/po/pt_BR.po index 59d4ff9f9..5a8b9fe00 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.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-30 15:46+0000\n" +"POT-Creation-Date: 2008-01-06 21:08+0000\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" @@ -1313,12 +1313,12 @@ msgstr "" msgid "%s: can't connect to %s:%d\n" msgstr "http: unable to connect to >%s<\n" -#: src/input/input_cdda.c:1633 +#: src/input/input_cdda.c:1631 #, fuzzy, c-format -msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n" +msgid "input_cdda: successfully connected to cddb server '%s:%d'.\n" msgstr "input_cda: server '%s:%d' successfuly connected.\n" -#: src/input/input_cdda.c:1638 +#: src/input/input_cdda.c:1636 #, fuzzy, c-format msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "input_net: incapaz de conectar em '%s'.\n" @@ -2499,8 +2499,33 @@ msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " "whether parallel decoding is supported. A rule of thumb is to have one " -"decoding thread per logical CPU (typically 1 to 4). A change will take " -"effect with playing the next stream." +"decoding thread per logical CPU (typically 1 to 4).\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1605 +msgid "Skip loop filter" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1606 +msgid "" +"You can control for which frames the loop filter shall be skipped after " +"decoding.\n" +"Skipping the loop filter will speedup decoding but may lead to artefacts. " +"The number of frames for which it is skipped increases from 'none' to 'all'. " +"The default value leaves the decision up to the implementation.\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1615 +msgid "Choose speed over specification compliance" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1616 +msgid "" +"You may want to allow speed cheats which violate codec specification.\n" +"Cheating may speed up decoding but can also lead to decoding artefacts.\n" +"A change of this setting will take effect with playing the next stream." msgstr "" #: src/libreal/real_common.c:139 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib 1.0\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2007-12-30 15:46+0000\n" +"POT-Creation-Date: 2008-01-06 21:08+0000\n" "PO-Revision-Date: 2004-09-15 13:53+0100\n" "Last-Translator: \n" "Language-Team: Slovak <ski18n@lists.isternet.sk>\n" @@ -1401,12 +1401,12 @@ msgstr "" msgid "%s: can't connect to %s:%d\n" msgstr "rtsp: nemožno sa pripojiť k '%s'\n" -#: src/input/input_cdda.c:1633 -#, c-format -msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n" +#: src/input/input_cdda.c:1631 +#, fuzzy, c-format +msgid "input_cdda: successfully connected to cddb server '%s:%d'.\n" msgstr "input_cdda: úspešne pripojenie na cddb server '%s:%d'.\n" -#: src/input/input_cdda.c:1638 +#: src/input/input_cdda.c:1636 #, c-format msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "input_cdda: nemožno sa pripojiť na cddb server '%s:%d' (%s).\n" @@ -2625,8 +2625,33 @@ msgid "" "You can adjust the number of video decoding threads which FFmpeg may use.\n" "Higher values should speed up decoding but it depends on the codec used " "whether parallel decoding is supported. A rule of thumb is to have one " -"decoding thread per logical CPU (typically 1 to 4). A change will take " -"effect with playing the next stream." +"decoding thread per logical CPU (typically 1 to 4).\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1605 +msgid "Skip loop filter" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1606 +msgid "" +"You can control for which frames the loop filter shall be skipped after " +"decoding.\n" +"Skipping the loop filter will speedup decoding but may lead to artefacts. " +"The number of frames for which it is skipped increases from 'none' to 'all'. " +"The default value leaves the decision up to the implementation.\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1615 +msgid "Choose speed over specification compliance" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1616 +msgid "" +"You may want to allow speed cheats which violate codec specification.\n" +"Cheating may speed up decoding but can also lead to decoding artefacts.\n" +"A change of this setting will take effect with playing the next stream." msgstr "" #: src/libreal/real_common.c:139 diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index b99046547..b7a5338fc 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -313,6 +313,7 @@ static const ff_codec_t ff_video_lookup[] = { {BUF_VIDEO_KMVC, CODEC_ID_KMVC, "Karl Morton's Video Codec (ffmpeg)"}, {BUF_VIDEO_FLASHSV, CODEC_ID_FLASHSV, "Flash Screen Video (ffmpeg)"}, {BUF_VIDEO_CAVS, CODEC_ID_CAVS, "Chinese AVS (ffmpeg)"}, + {BUF_VIDEO_VMNC, CODEC_ID_VMNC, "VMware Screen Codec (ffmpeg)"}, {BUF_VIDEO_THEORA_RAW, CODEC_ID_THEORA, "Theora (ffmpeg)"}, }; @@ -1841,6 +1842,9 @@ static const uint32_t supported_video_types[] = { #if defined(HAVE_FFMPEG) || CONFIG_CAVS_DECODER BUF_VIDEO_CAVS, #endif +#if defined(HAVE_FFMPEG) || CONFIG_VMNC_DECODER + BUF_VIDEO_VMNC, +#endif BUF_VIDEO_THEORA_RAW, 0 }; diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 27ee7f56b..549005bef 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.c @@ -64,6 +64,7 @@ /* Xing header stuff */ #define XING_TAG FOURCC_TAG('X', 'i', 'n', 'g') +#define INFO_TAG FOURCC_TAG('I', 'n', 'f', 'o') #define XING_FRAMES_FLAG 0x0001 #define XING_BYTES_FLAG 0x0002 #define XING_TOC_FLAG 0x0004 @@ -295,16 +296,8 @@ static int parse_frame_header(mpg_audio_frame_t *const frame, const uint8_t *con */ static xing_header_t* parse_xing_header(mpg_audio_frame_t *frame, uint8_t *buf, int bufsize) { - -#ifdef LOG - int i; -#endif uint8_t *ptr = buf; - xing_header_t *xing; - - xing = xine_xmalloc (sizeof (xing_header_t)); - if (!xing) - return NULL; + xing_header_t *xing = NULL; /* offset of the Xing header */ if (frame->lsf_bit) { @@ -319,52 +312,87 @@ static xing_header_t* parse_xing_header(mpg_audio_frame_t *frame, ptr += (9 + 4); } - if (ptr >= (buf + bufsize - 4)) return 0; + if (ptr >= (buf + bufsize - 4)) goto exit_error; lprintf("checking %08X\n", *ptr); + if (_X_BE_32(ptr) == XING_TAG) { + int has_frames_flag = 0; + int has_bytes_flag = 0; + + xing = xine_xmalloc (sizeof (xing_header_t)); + if (!xing) + goto exit_error; + lprintf("Xing header found\n"); ptr += 4; - if (ptr >= (buf + bufsize - 4)) return 0; + if (ptr >= (buf + bufsize - 4)) goto exit_error; xing->flags = _X_BE_32(ptr); ptr += 4; if (xing->flags & XING_FRAMES_FLAG) { - if (ptr >= (buf + bufsize - 4)) return 0; + if (ptr >= (buf + bufsize - 4)) goto exit_error; xing->stream_frames = _X_BE_32(ptr); ptr += 4; lprintf("stream frames: %d\n", xing->stream_frames); + has_frames_flag = 1; } if (xing->flags & XING_BYTES_FLAG) { - if (ptr >= (buf + bufsize - 4)) return 0; + if (ptr >= (buf + bufsize - 4)) goto exit_error; xing->stream_size = _X_BE_32(ptr); ptr += 4; lprintf("stream size: %d\n", xing->stream_size); + has_bytes_flag = 1; + } + + /* check if it's a useful Xing header */ + if (!has_frames_flag || !has_bytes_flag) { + lprintf("Stupid Xing tag, cannot do anything with it !\n"); + goto exit_error; } + if (xing->flags & XING_TOC_FLAG) { + int i; + lprintf("toc found\n"); - if (ptr >= (buf + bufsize - XING_TOC_LENGTH)) return 0; + if (ptr >= (buf + bufsize - XING_TOC_LENGTH)) goto exit_error; memcpy(xing->toc, ptr, XING_TOC_LENGTH); #ifdef LOG for (i = 0; i < XING_TOC_LENGTH; i++) { - lprintf("%d ", xing->toc[i]); + printf("%d ", xing->toc[i]); } - lprintf("\n"); + printf("\n"); #endif + /* check the table validity + * - MUST start with 0 + * - values MUST increase + */ + if (xing->toc[0] != 0) { + lprintf("invalid Xing toc\n"); + goto exit_error; + } + for (i = 1; i < XING_TOC_LENGTH; i++) { + if (xing->toc[i] < xing->toc[i-1]) { + lprintf("invalid Xing toc\n"); + goto exit_error; + } + } ptr += XING_TOC_LENGTH; } xing->vbr_scale = -1; if (xing->flags & XING_VBR_SCALE_FLAG) { - if (ptr >= (buf + bufsize - 4)) return 0; + if (ptr >= (buf + bufsize - 4)) goto exit_error; xing->vbr_scale = _X_BE_32(ptr); lprintf("vbr_scale: %d\n", xing->vbr_scale); } - - return xing; } else { lprintf("Xing header not found\n"); + } + return xing; + +exit_error: + lprintf("Xing header parse error\n"); free(xing); return NULL; } -} /* * Parse a Vbri header @@ -919,7 +947,7 @@ static int demux_mpgaudio_seek (demux_plugin_t *this_gen, if (this->stream_length > 0) { if (this->xing_header && - (this->xing_header->flags & (XING_TOC_FLAG | XING_BYTES_FLAG))) { + (this->xing_header->flags & XING_TOC_FLAG)) { seek_pos += xing_get_seek_point(this->xing_header, start_time, this->stream_length); lprintf("time seek: xing: time=%d, pos=%"PRId64"\n", start_time, seek_pos); } else if (this->vbri_header) { diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index 21308bd45..8f6ce0611 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -800,12 +800,22 @@ static int demux_real_parse_references( demux_real_t *this) { if (!strncmp(buf,"http://",7)) { - for (i = 0; buf[i] && !isspace(buf[i]); ++i) - /**/; - buf[i] = 0; - lprintf("reference [%s] found\n", buf); - - _x_demux_send_mrl_reference (this->stream, 0, buf, NULL, 0, 0); + i = 0; + while (buf[i]) + { + j = i; + while (buf[i] && !isspace(buf[i])) + ++i; /* skip non-space */ + len = buf[i]; + buf[i] = 0; + if (strncmp (buf + j, "http://", 7) || (i - j) < 8) + break; /* stop at the first non-http reference */ + lprintf("reference [%s] found\n", buf + j); + _x_demux_send_mrl_reference (this->stream, 0, buf + j, NULL, 0, 0); + buf[i] = (char) len; + while (buf[i] && isspace(buf[i])) + ++i; /* skip spaces */ + } } else for (i = 0; i < buf_used; ++i) { diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index 50ba4720e..740d51665 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -1008,19 +1008,21 @@ static void pvr_event_handler (pvr_input_plugin_t *this) { /* change input */ if (v4l2_data->input != -1 && v4l2_data->input != this->input) { - lprintf("change input to:%d\n", v4l2_data->input); this->input = v4l2_data->input; /* as of ivtv 0.10.6: must close and reopen to set input */ close(this->dev_fd); this->dev_fd = open (this->class->devname, O_RDWR); - if (this->dev_fd == -1) { + if (this->dev_fd < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "input_pvr: error opening device %s\n", this->class->devname ); } else { - if( ioctl(this->dev_fd, VIDIOC_S_INPUT, &this->input) ) + if( ioctl(this->dev_fd, VIDIOC_S_INPUT, &this->input) == 0 ) { + lprintf("Tuner Input set to:%d\n", v4l2_data->input); + } else { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "input_pvr: error setting v4l2 input\n"); + } } } @@ -1032,14 +1034,30 @@ static void pvr_event_handler (pvr_input_plugin_t *this) { /* change frequency */ if (v4l2_data->frequency != -1 && v4l2_data->frequency != this->frequency) { - lprintf("changing frequency to:%.2f\n", (float)v4l2_data->frequency * 62.5); + double freq = (double)v4l2_data->frequency / 1000.0; struct v4l2_frequency vf; + struct v4l2_tuner vt; + double fac = 16; + + memset(&vf, 0, sizeof(vf)); + memset(&vt, 0, sizeof(vt)); + this->frequency = v4l2_data->frequency; - vf.frequency = this->frequency; + + if (ioctl(this->dev_fd, VIDIOC_G_TUNER, &vt) == 0) { + fac = (vt.capability & V4L2_TUNER_CAP_LOW) ? 16000 : 16; + } + vf.tuner = 0; - if( ioctl(this->dev_fd, VIDIOC_S_FREQUENCY, &vf) ) + vf.type = vt.type; + vf.frequency = (__u32)(freq * fac); + + if (ioctl(this->dev_fd, VIDIOC_S_FREQUENCY, &vf) == 0) { + lprintf("Tuner Frequency set to %d (%f.3 MHz)\n", vf.frequency, vf.frequency / fac); + } else { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "input_pvr: error setting v4l2 frequency\n"); + } } pthread_mutex_unlock(&this->dev_lock); diff --git a/src/spu_dec/sputext_decoder.c b/src/spu_dec/sputext_decoder.c index 093fca1e7..0cc0ee21b 100644 --- a/src/spu_dec/sputext_decoder.c +++ b/src/spu_dec/sputext_decoder.c @@ -507,11 +507,52 @@ static void read_ssa_tag(sputext_decoder_t *this, const char* text, (*sub_x), (*sub_y), (*max_width), (*alignment)); } +static int is_cjk_encoding(const char *enc) { + /* CJK charset strings defined in iconvdata/gconv-modules of glibc */ + static const char cjk_encoding_strings[][16] = { + "SJIS", + "CP932", + "EUC-KR", + "UHC", + "JOHAB", + "BIG5", + "BIG5HKSCS", + "EUC-JP-MS", + "EUC-JP", + "EUC-CN", + "GBBIG5", + "GBK", + "GBGBK", + "EUC-TW", + "ISO-2022-JP", + "ISO-2022-JP-2", + "ISO-2022-JP-3", + "ISO-2022-KR", + "ISO-2022-CN", + "ISO-2022-CN-EXT", + "GB18030", + "EUC-JISX0213", + "SHIFT_JISX0213", + }; + + int pstr; + + /* return 1 if encoding string is one of the CJK(Chinese,Jananese,Korean) + * character set strings. */ + for (pstr = 0; pstr < sizeof (cjk_encoding_strings) / sizeof (cjk_encoding_strings[0]); pstr++) + if (strcasecmp (enc, cjk_encoding_strings[pstr]) == 0) + return 1; + + return 0; +} + static void draw_subtitle(sputext_decoder_t *this, int64_t sub_start, int64_t sub_end ) { int line, y; int font_size; char *font; + const char *encoding = (this->buf_encoding)?this->buf_encoding: + this->class->src_encoding; int sub_x, sub_y, max_width; int alignment; int rebuild_all; @@ -720,7 +761,12 @@ static void draw_subtitle(sputext_decoder_t *this, int64_t sub_start, int64_t su } } - ogm_render_line(this, x, y + line*this->line_height, this->text[line]); + if( is_cjk_encoding(encoding) ) { + this->renderer->render_text (this->osd, x, y + line * this->line_height, + this->text[line], OSD_TEXT1); + } else { + ogm_render_line(this, x, y + line*this->line_height, this->text[line]); + } } if( font_size != this->font_size ) diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 9fd8b2d91..b7e24d088 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -142,6 +142,7 @@ xineplug_vo_out_opengl_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(MLIB_CFLAGS) -fno- xineplug_vo_out_syncfb_la_SOURCES = video_out_syncfb.c xineplug_vo_out_syncfb_la_LIBADD = $(XINE_LIB) $(X_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL) +xineplug_vo_out_syncfb_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) xineplug_vo_out_pgx64_la_SOURCES = video_out_pgx64.c xineplug_vo_out_pgx64_la_LIBADD = $(XINE_LIB) $(X_LIBS) $(SUNDGA_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL) diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 08ff194fa..c7b6ae860 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -771,6 +771,14 @@ static const video_db_t video_db[] = { BUF_VIDEO_KMVC, "Karl Morton's Video Codec" }, +{ + { + ME_FOURCC('V','M','n','c'), + 0 + }, + BUF_VIDEO_VMNC, + "VMware Screen Codec" +}, { { 0 }, 0, "last entry" } }; |