diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | m4/decoders.m4 | 3 | ||||
-rw-r--r-- | m4/input.m4 | 1 | ||||
-rw-r--r-- | po/cs.po | 21 | ||||
-rw-r--r-- | po/de.po | 5 | ||||
-rw-r--r-- | po/en_US.po | 1 | ||||
-rw-r--r-- | po/eo.po | 13 | ||||
-rw-r--r-- | po/es.po | 9 | ||||
-rw-r--r-- | po/eu.po | 9 | ||||
-rw-r--r-- | po/fr.po | 9 | ||||
-rw-r--r-- | po/it.po | 17 | ||||
-rw-r--r-- | po/ja.po | 3406 | ||||
-rw-r--r-- | src/audio_dec/xine_a52_decoder.c | 6 | ||||
-rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c | 6 | ||||
-rw-r--r-- | src/demuxers/demux_ts.c | 460 | ||||
-rw-r--r-- | src/input/Makefile.am | 2 | ||||
-rw-r--r-- | src/input/input_cdda.c | 32 | ||||
-rw-r--r-- | src/input/input_file.c | 11 | ||||
-rw-r--r-- | src/input/input_net.c | 15 | ||||
-rw-r--r-- | src/input/input_pvr.c | 8 | ||||
-rw-r--r-- | src/input/input_smb.c | 20 | ||||
-rw-r--r-- | src/input/net_buf_ctrl.c | 4 | ||||
-rw-r--r-- | src/spu_dec/spudvb_decoder.c | 54 | ||||
-rw-r--r-- | src/video_dec/image.c | 26 | ||||
-rw-r--r-- | src/xine-engine/buffer_types.c | 2 | ||||
-rw-r--r-- | src/xine-engine/configfile.c | 4 | ||||
-rw-r--r-- | src/xine-engine/io_helper.c | 16 | ||||
-rw-r--r-- | src/xine-utils/memcpy.c | 24 |
28 files changed, 2479 insertions, 1716 deletions
@@ -70,6 +70,17 @@ xine-lib (1.1.90) (Unreleased) * Report more video output capabilities via (port)->get_capabilities(): colour controls, zooming, colour keying. +xine-lib (1.1.21) 2011-??-?? + * mpeg-ts fixes and enhancements + * Improved syncing of DVB subtitles + +xine-lib (1.1.20.1) 2011-??-?? + * Various bug fixes. + * Use the current ImageMagick API (if using ImageMagick). + * Fix PVR plugin input building (needs V4L2). + * Fixes related to unknown audio & subtitle languages. + * Memory leak fixes + xine-lib (1.1.20) 2011-11-13 * Imagine that there's a large poppy here. * Ensure that file and socket descriptors are marked as CLOEXEC. diff --git a/m4/decoders.m4 b/m4/decoders.m4 index 2fe4d766f..09d8dd900 100644 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -8,7 +8,7 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ if test x"$enable_a52dec" != x"no"; then if test x"$enable_a52dec" != x"internal"; then AC_CHECK_LIB([a52], [a52_init], - [AC_CHECK_HEADERS([a52dec/a52.h a52dec/a52_internal.h], [have_external_a52dec=yes], [have_external_a52dec=no], + [AC_CHECK_HEADERS([a52dec/a52.h], [have_external_a52dec=yes], [have_external_a52dec=no], [#ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif @@ -132,6 +132,7 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [ dnl the flags for plain GraphicsMagick WAND_CFLAGS="$GRAPHICSMAGICKWAND_CFLAGS" WAND_LIBS="$GRAPHICSMAGICKWAND_LIBS" + AC_DEFINE([HAVE_GRAPHICSMAGICK], [1], [Define this if you have GraphicsMagick installed]) fi if test x"$with_imagemagick" = x"yes" && test x"$have_imagemagick" = x"no"; then AC_MSG_ERROR([ImageMagick support requested, but neither Wand, MagickWand, nor GraphicsMagick were found]) diff --git a/m4/input.m4 b/m4/input.m4 index b50b830a7..7c9fc73b1 100644 --- a/m4/input.m4 +++ b/m4/input.m4 @@ -128,6 +128,7 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ ACX_PACKAGE_CHECK([DVDNAV], [0.1.9], [dvdnav-config], [AC_DEFINE([HAVE_DVDNAV], 1, [Define this if you have a suitable version of libdvdnav])], [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])]) + AC_CHECK_LIB([dvdread], [navRead_DSI], [DVDNAV_LIBS="$DVDNAV_LIBS -ldvdread"], []) else AC_MSG_RESULT([Using included DVDNAV support]) fi @@ -10,11 +10,12 @@ msgstr "" "PO-Revision-Date: 2008-11-10 16:33+0200\n" "Last-Translator: František Dvořák <valtri@civ.zcu.cz>\n" "Language-Team: Czech <cs@li.org>\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #: lib/hstrerror.c:17 msgid "No error" @@ -2792,8 +2793,8 @@ msgid "" "See the help for the title_format for the meanings of these." msgstr "" "Formát VCD použitý v titulku GUI. Podobá se unixovému příkazu date. " -"Specifikátory formátu začínají znakem procento. Specifikátory jsou %A, %C, %" -"c, %F, %I, %L, %N, %P, %p, %S, %T, %V, %v a %%.\n" +"Specifikátory formátu začínají znakem procento. Specifikátory jsou %A, %C, " +"%c, %F, %I, %L, %N, %P, %p, %S, %T, %V, %v a %%.\n" "Jejich význam viz nápověda k title_format." # odvšivovací @@ -2962,8 +2963,8 @@ msgid "" "heavy post processing can actually make the image worse by blurring it too " "much." msgstr "" -"Můžete přizpůsobit množství dodatečného zpracování použitého na video MPEG-" -"4.\n" +"Můžete přizpůsobit množství dodatečného zpracování použitého na video " +"MPEG-4.\n" "Vyšší hodnoty mají za následek lepší kvalitu, ale více zatíží CPU. Menší " "hodnoty mohou mít za následek defekty v obrázku, např. blokové artefakty. " "Pro vysokou kvalitu videa může příliš silné dodatečné zpracování způsobit " @@ -4326,8 +4327,8 @@ msgid "" "video_out_fb: only packed truecolour/directcolour is supported (%d).\n" " Check 'fbset -i' or try 'fbset -depth 16'.\n" msgstr "" -"video_out_fb: jsou podporovány pouze pravé barvy (truecolor/directcolor) (%" -"d).\n" +"video_out_fb: jsou podporovány pouze pravé barvy (truecolor/directcolor) " +"(%d).\n" " Zkontrolujte 'fbset -i' nebo zkuste 'fbset -depth 16'.\n" #: src/video_out/video_out_fb.c:801 src/video_out/video_out_vidix.c:1236 @@ -4525,8 +4526,8 @@ msgstr "video_out_pgx64: Chyba: nelze otevřít zařízení framebufferu '%s'\n" msgid "" "video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n" msgstr "" -"video_out_pgx64: Chyba: ioctl selhalo (VIS_GETIDENTIFIER), špatné zařízení (%" -"s)\n" +"video_out_pgx64: Chyba: ioctl selhalo (VIS_GETIDENTIFIER), špatné zařízení " +"(%s)\n" #: src/video_out/video_out_pgx64.c:316 #, c-format @@ -10,6 +10,7 @@ msgstr "" "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" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -2797,8 +2798,8 @@ msgid "" "See the help for the title_format for the meanings of these." msgstr "" "Das selbe Format wie für Fenstertitel. Ähnlich dem Unix date-Befehl. " -"Formatangaben starten mit einem Prozentzeichen. Formatfelder sind %A, %C, %" -"c, %F, %I, %L, %N, %P, %p, %S, %T, %V, %v, und %%.\n" +"Formatangaben starten mit einem Prozentzeichen. Formatfelder sind %A, %C, " +"%c, %F, %I, %L, %N, %P, %p, %S, %T, %V, %v, und %%.\n" "Siehe Hilfe für title_format bezüglich deren Bedeutung." #: src/input/vcd/xineplug_inp_vcd.c:1914 diff --git a/po/en_US.po b/po/en_US.po index 8ae997a53..a8562b86d 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2009-01-15 19:04+0000\n" "Last-Translator: Not translated <null@example.com>\n" "Language-Team: en_US <none>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -16,6 +16,7 @@ msgstr "" "PO-Revision-Date: 2007-05-24 17:57+0200\n" "Last-Translator: Antonio C. Codazzi <f_sophia@libero.it>\n" "Language-Team: <it@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -2530,8 +2531,8 @@ msgstr "ffmpeg_audio_dec: agordo de bufro je %d por eviti troon.\n" #, c-format msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -"ffmpeg_audio_dec: estas neeble trovi malkodilo de ffmpeg por bufrospeco 0x%" -"X\n" +"ffmpeg_audio_dec: estas neeble trovi malkodilo de ffmpeg por bufrospeco 0x" +"%X\n" #: src/combined/ffmpeg/ff_audio_decoder.c:261 #, c-format @@ -2614,8 +2615,8 @@ msgstr "" #, c-format msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -"ffmpeg_video_dec: estas neeble trovi malkodilo de ffmpeg por bufrospeco 0x%" -"X\n" +"ffmpeg_video_dec: estas neeble trovi malkodilo de ffmpeg por bufrospeco 0x" +"%X\n" #: src/combined/ffmpeg/ff_video_decoder.c:320 #, c-format @@ -3828,8 +3829,8 @@ msgid "" " are available which is less than the recommended %d buffers. Lowering\n" " the frame buffer resolution might help.\n" msgstr "" -"ATENTU: video_out_fb: la nulkopiaj bufroj estas MALEBLIGITAJ ĉar estas nur %" -"d bufroj\n" +"ATENTU: video_out_fb: la nulkopiaj bufroj estas MALEBLIGITAJ ĉar estas nur " +"%d bufroj\n" " do ili estas malpli ol rekomenditaj %d bufroj. Malpliigo de " "kadrobufra \n" " difino povus helpi.\n" @@ -14,6 +14,7 @@ msgstr "" "PO-Revision-Date: 2008-04-02 01:05+0200\n" "Last-Translator: Carlos E. R. M. <carloser@users.sourceforge.net>\n" "Language-Team: Spanish <none>\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -1033,8 +1034,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: Identificador de flujo de bits no reconocido 0x%" -"02x. Por favor, repórtelo a los desarrolladores de xine.\n" +"xine-lib:demux_mpeg_pes: Identificador de flujo de bits no reconocido 0x" +"%02x. Por favor, repórtelo a los desarrolladores de xine.\n" #: src/demuxers/demux_mpeg_pes.c:427 #, c-format @@ -4701,8 +4702,8 @@ msgstr "" msgid "" "video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n" msgstr "" -"video_out_pgx64: Error: falló ioctl (VIS_GETIDENTIFIER), mal dispositivo (%" -"s)\n" +"video_out_pgx64: Error: falló ioctl (VIS_GETIDENTIFIER), mal dispositivo " +"(%s)\n" #: src/video_out/video_out_pgx64.c:316 #, c-format @@ -12,6 +12,7 @@ msgstr "" "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" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -2709,8 +2710,8 @@ msgid "" "See the help for the title_format for the meanings of these." msgstr "" "GUI Izenburuan erabilitako formatua. Unix date komandoaren antzerakoa. " -"Formatu espezifikazioakehuneko ikur bates hasten dira. Ezpezifikazioak: %A, %" -"C, %c, %F, %I, %L, %N, %P, %p, %S, %T, %V, %v, eta %%." +"Formatu espezifikazioakehuneko ikur bates hasten dira. Ezpezifikazioak: %A, " +"%C, %c, %F, %I, %L, %N, %P, %p, %S, %T, %V, %v, eta %%." #: src/input/vcd/xineplug_inp_vcd.c:1914 #, fuzzy @@ -4176,8 +4177,8 @@ msgstr "video_out_pgx64: Errorea: ezinda '%s' framebuffer ireki\n" msgid "" "video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n" msgstr "" -"video_out_pgx64: Error: ioctl hutsa (VIS_GETIDENTIFIER), okerreko gailua (%" -"s)\n" +"video_out_pgx64: Error: ioctl hutsa (VIS_GETIDENTIFIER), okerreko gailua " +"(%s)\n" #: src/video_out/video_out_pgx64.c:316 #, c-format @@ -11,6 +11,7 @@ msgstr "" "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" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -2663,8 +2664,8 @@ 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" +"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 " @@ -3895,8 +3896,8 @@ msgstr "" #, c-format msgid "video_out_pgx64: Error: can't open framebuffer device '%s'\n" msgstr "" -"video_out_pgx64: Erreur: ne peut pas ouvrir le périphérique framebuffer '%" -"s'\n" +"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 @@ -13,6 +13,7 @@ msgstr "" "PO-Revision-Date: 2007-12-24 16:09+0100\n" "Last-Translator: Diego 'Flameeyes' Pettenò <flameeyes@gentoo.org>\n" "Language-Team: Italian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -1108,8 +1109,8 @@ msgstr "plugin di input del file" #, c-format msgid "demux_wc3movie: SHOT chunk referenced invalid palette (%d >= %d)\n" msgstr "" -"demux_wc3movie: parte di SHOT di riferimento con palette non valida (%d >= %" -"d)\n" +"demux_wc3movie: parte di SHOT di riferimento con palette non valida (%d >= " +"%d)\n" #: src/demuxers/demux_wc3movie.c:408 #, c-format @@ -2854,8 +2855,8 @@ msgid "" msgstr "" "Formato VCD utilizzato nel campo di commento del flusso, simile al comando " "date Unix. Gli specificatori di formato iniziano con un simbolo di " -"percentuale. Gli specificatori sono %a, %C, %c, %F, %I, %L, %N, %P, %p, %S, %" -"T e %%.\n" +"percentuale. Gli specificatori sono %a, %C, %c, %F, %I, %L, %N, %P, %p, %S, " +"%T e %%.\n" "Si veda la descrizione di title_format per il loro significato." #: src/input/vcd/xineplug_inp_vcd.c:1914 @@ -3875,8 +3876,8 @@ msgstr "" " bgamma (gamma per il componente blu)\n" "\n" "Gli intervalli dei valori sono 0.1-10 per le gamma, -2-2 per il contrasto " -"(valori negativi risultano in immagini negative), -1-1 per la luminosità e 0-" -"3 per la saturazione.\n" +"(valori negativi risultano in immagini negative), -1-1 per la luminosità e " +"0-3 per la saturazione.\n" "\n" "* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n" @@ -5614,8 +5615,8 @@ msgstr "load_plugins: trovato plugin statico\n" #, c-format msgid "load_plugins: plugin limit reached, %s could not be loaded\n" msgstr "" -"load_plugins: raggiunto il limite di plugin, non è stato possibile caricare %" -"s.\n" +"load_plugins: raggiunto il limite di plugin, non è stato possibile caricare " +"%s.\n" #: src/xine-engine/load_plugins.c:511 #, c-format @@ -7,10 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: xine-lib 1.1.19\n" "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2010-07-24 23:32+0100\n" +"POT-Creation-Date: 2010-07-25 16:37+0100\n" "PO-Revision-Date: 2010-07-31 01:14+0700\n" "Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -53,19 +54,28 @@ msgstr "audio_alsa_out: %s で snd_pcm_open() が失敗: %s\n" #: src/audio_out/audio_alsa_out.c:380 #, c-format msgid "audio_alsa_out: >>> check if another program already uses PCM <<<\n" -msgstr "audio_alsa_out: >>> 他のプログラムが PCM を使用していないか確認してください <<<\n" +msgstr "" +"audio_alsa_out: >>> 他のプログラムが PCM を使用していないか確認してください " +"<<<\n" #: src/audio_out/audio_alsa_out.c:393 #, c-format -msgid "audio_alsa_out: broken configuration for this PCM: no configurations available: %s\n" -msgstr "audio_alsa_out: このPCMのための設定が壊れています: 有効な設定がありません: %s\n" +msgid "" +"audio_alsa_out: broken configuration for this PCM: no configurations " +"available: %s\n" +msgstr "" +"audio_alsa_out: このPCMのための設定が壊れています: 有効な設定がありません: " +"%s\n" #: src/audio_out/audio_alsa_out.c:1323 msgid "notify changes to the hardware mixer" msgstr "" #: src/audio_out/audio_alsa_out.c:1324 -msgid "When the hardware mixer changes, your application will receive a notification so that it can update its graphical representation of the mixer settings on the fly." +msgid "" +"When the hardware mixer changes, your application will receive a " +"notification so that it can update its graphical representation of the mixer " +"settings on the fly." msgstr "" #: src/audio_out/audio_alsa_out.c:1389 @@ -80,10 +90,13 @@ msgstr "サウンドカードは mmap を使用可能" #: src/audio_out/audio_alsa_out.c:1397 msgid "" "Enable this, if your sound card and alsa driver support memory mapped IO.\n" -"You can try enabling it and check, if everything works. If it does, this will increase performance." +"You can try enabling it and check, if everything works. If it does, this " +"will increase performance." msgstr "" -"サウンドカードと ALSA ドライバがメモリマップドIO をサポートしている場合には有効にしてください。\n" -"一度有効にしてきちんと働くか確認してみてください。大丈夫なら性能が向上します。" +"サウンドカードと ALSA ドライバがメモリマップドIO をサポートしている場合には有" +"効にしてください。\n" +"一度有効にしてきちんと働くか確認してみてください。大丈夫なら性能が向上しま" +"す。" #: src/audio_out/audio_alsa_out.c:1406 #, fuzzy @@ -118,21 +131,22 @@ msgid "" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1434 -#: src/audio_out/audio_alsa_out.c:1444 +#: src/audio_out/audio_alsa_out.c:1434 src/audio_out/audio_alsa_out.c:1444 #, fuzzy msgid "device used for 5.1-channel output" msgstr "DVD ドライブとして使用するデバイス" #: src/audio_out/audio_alsa_out.c:1435 msgid "" -"xine will use this alsa device to output 5 channel plus LFE (5.1) surround sound.\n" +"xine will use this alsa device to output 5 channel plus LFE (5.1) surround " +"sound.\n" "See the alsa documentation for information on alsa devices." msgstr "" #: src/audio_out/audio_alsa_out.c:1445 msgid "" -"xine will use this alsa device to output undecoded digital surround sound. This can be used be external surround decoders.\n" +"xine will use this alsa device to output undecoded digital surround sound. " +"This can be used be external surround decoders.\n" "See the alsa documentation for information on alsa devices." msgstr "" @@ -146,32 +160,43 @@ msgstr "%s: オープンまたは読み込みに失敗しました\n" msgid ">>> Check if another program already uses PCM <<<\n" msgstr "" -#: src/audio_out/audio_alsa_out.c:1498 -#: src/audio_out/audio_jack_out.c:742 +#: src/audio_out/audio_alsa_out.c:1498 src/audio_out/audio_jack_out.c:742 #: src/audio_out/audio_oss_out.c:927 #, fuzzy msgid "speaker arrangement" msgstr "アンプ無しスピーカ" -#: src/audio_out/audio_alsa_out.c:1499 -#: src/audio_out/audio_jack_out.c:743 +#: src/audio_out/audio_alsa_out.c:1499 src/audio_out/audio_jack_out.c:743 #: src/audio_out/audio_oss_out.c:928 msgid "" -"Select how your speakers are arranged, this determines which speakers xine uses for sound output. The individual values are:\n" +"Select how your speakers are arranged, this determines which speakers xine " +"uses for sound output. The individual values are:\n" "\n" "Mono 1.0: You have only one speaker.\n" "Stereo 2.0: You have two speakers for left and right channel.\n" "Headphones 2.0: You use headphones.\n" -"Stereo 2.1: You have two speakers for left and right channel, and one subwoofer for the low frequencies.\n" +"Stereo 2.1: You have two speakers for left and right channel, and one " +"subwoofer for the low frequencies.\n" "Surround 3.0: You have three speakers for left, right and rear channel.\n" -"Surround 4.0: You have four speakers for front left and right and rear left and right channels.\n" -"Surround 4.1: You have four speakers for front left and right and rear left and right channels, and one subwoofer for the low frequencies.\n" -"Surround 5.0: You have five speakers for front left, center and right and rear left and right channels.\n" -"Surround 5.1: You have five speakers for front left, center and right and rear left and right channels, and one subwoofer for the low frequencies.\n" -"Surround 6.0: You have six speakers for front left, center and right and rear left, center and right channels.\n" -"Surround 6.1: You have six speakers for front left, center and right and rear left, center and right channels, and one subwoofer for the low frequencies.\n" -"Surround 7.1: You have seven speakers for front left, center and right, left and right and rear left and right channels, and one subwoofer for the low frequencies.\n" -"Pass Through: Your sound system will receive undecoded digital sound from 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." +"Surround 4.0: You have four speakers for front left and right and rear left " +"and right channels.\n" +"Surround 4.1: You have four speakers for front left and right and rear left " +"and right channels, and one subwoofer for the low frequencies.\n" +"Surround 5.0: You have five speakers for front left, center and right and " +"rear left and right channels.\n" +"Surround 5.1: You have five speakers for front left, center and right and " +"rear left and right channels, and one subwoofer for the low frequencies.\n" +"Surround 6.0: You have six speakers for front left, center and right and " +"rear left, center and right channels.\n" +"Surround 6.1: You have six speakers for front left, center and right and " +"rear left, center and right channels, and one subwoofer for the low " +"frequencies.\n" +"Surround 7.1: You have seven speakers for front left, center and right, left " +"and right and rear left and right channels, and one subwoofer for the low " +"frequencies.\n" +"Pass Through: Your sound system will receive undecoded digital sound from " +"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 "" #: src/audio_out/audio_alsa_out.c:1528 @@ -194,23 +219,19 @@ msgstr " 24ビット" msgid " 32bit" msgstr " 24ビット" -#: src/audio_out/audio_alsa_out.c:1558 -#: src/audio_out/audio_oss_out.c:963 +#: src/audio_out/audio_alsa_out.c:1558 src/audio_out/audio_oss_out.c:963 msgid " mono" msgstr "モノラル" -#: src/audio_out/audio_alsa_out.c:1562 -#: src/audio_out/audio_oss_out.c:969 +#: src/audio_out/audio_alsa_out.c:1562 src/audio_out/audio_oss_out.c:969 msgid " stereo" msgstr "ステレオ" -#: src/audio_out/audio_alsa_out.c:1567 -#: src/audio_out/audio_oss_out.c:976 +#: src/audio_out/audio_alsa_out.c:1567 src/audio_out/audio_oss_out.c:976 msgid " 4-channel" msgstr " 4チャネル" -#: src/audio_out/audio_alsa_out.c:1570 -#: src/audio_out/audio_oss_out.c:979 +#: src/audio_out/audio_alsa_out.c:1570 src/audio_out/audio_oss_out.c:979 msgid " (4-channel not enabled in xine config)" msgstr "" @@ -222,23 +243,19 @@ msgstr " 4.1チャネル" msgid " (4.1-channel not enabled in xine config)" msgstr "" -#: src/audio_out/audio_alsa_out.c:1583 -#: src/audio_out/audio_oss_out.c:986 +#: src/audio_out/audio_alsa_out.c:1583 src/audio_out/audio_oss_out.c:986 msgid " 5-channel" msgstr " 5チャネル" -#: src/audio_out/audio_alsa_out.c:1586 -#: src/audio_out/audio_oss_out.c:989 +#: src/audio_out/audio_alsa_out.c:1586 src/audio_out/audio_oss_out.c:989 msgid " (5-channel not enabled in xine config)" msgstr "" -#: src/audio_out/audio_alsa_out.c:1591 -#: src/audio_out/audio_oss_out.c:996 +#: src/audio_out/audio_alsa_out.c:1591 src/audio_out/audio_oss_out.c:996 msgid " 5.1-channel" msgstr " 5.1チャネル" -#: src/audio_out/audio_alsa_out.c:1594 -#: src/audio_out/audio_oss_out.c:999 +#: src/audio_out/audio_alsa_out.c:1594 src/audio_out/audio_oss_out.c:999 msgid " (5.1-channel not enabled in xine config)" msgstr "" @@ -262,212 +279,208 @@ msgid "" "See the alsa documentation for information on alsa devices." msgstr "" -#: src/audio_out/audio_alsa_out.c:1705 +#: src/audio_out/audio_alsa_out.c:1709 msgid "xine audio output plugin using alsa-compliant audio devices/drivers" msgstr "" -#: src/audio_out/audio_arts_out.c:371 -msgid "xine audio output plugin using kde artsd" -msgstr "" - -#: src/audio_out/audio_coreaudio_out.c:569 +#: src/audio_out/audio_coreaudio_out.c:575 msgid "xine output plugin for Coreaudio/Mac OS X" msgstr "" -#: src/audio_out/audio_directx2_out.c:166 +#: src/audio_out/audio_directx2_out.c:165 msgid "Error" msgstr "エラー" -#: src/audio_out/audio_directx2_out.c:173 +#: src/audio_out/audio_directx2_out.c:172 msgid "success" msgstr "成功" -#: src/audio_out/audio_directx2_out.c:175 +#: src/audio_out/audio_directx2_out.c:174 msgid "access denied" msgstr "アクセスが拒否されました" -#: src/audio_out/audio_directx2_out.c:177 +#: src/audio_out/audio_directx2_out.c:176 #, fuzzy msgid "resource is already in use" msgstr "既にカメラは使用中です。" -#: src/audio_out/audio_directx2_out.c:178 +#: src/audio_out/audio_directx2_out.c:177 #, fuzzy msgid "object was already initialized" msgstr "カメラは既にアクティブです" -#: src/audio_out/audio_directx2_out.c:179 +#: src/audio_out/audio_directx2_out.c:178 msgid "specified wave format is not supported" msgstr "指定された波形形式はサポートされていません" -#: src/audio_out/audio_directx2_out.c:180 +#: src/audio_out/audio_directx2_out.c:179 msgid "memory buffer has been lost and must be restored" msgstr "" -#: src/audio_out/audio_directx2_out.c:181 +#: src/audio_out/audio_directx2_out.c:180 msgid "requested buffer control is not available" msgstr "" -#: src/audio_out/audio_directx2_out.c:182 +#: src/audio_out/audio_directx2_out.c:181 msgid "undetermined error inside DirectSound subsystem" msgstr "" -#: src/audio_out/audio_directx2_out.c:184 +#: src/audio_out/audio_directx2_out.c:183 msgid "DirectSound hardware device is unavailable" msgstr "" -#: src/audio_out/audio_directx2_out.c:186 +#: src/audio_out/audio_directx2_out.c:185 msgid "function is not valid for the current state of the object" msgstr "" -#: src/audio_out/audio_directx2_out.c:187 +#: src/audio_out/audio_directx2_out.c:186 #, fuzzy msgid "invalid parameter was passed" msgstr "-s オプションの値が不正です\n" -#: src/audio_out/audio_directx2_out.c:188 +#: src/audio_out/audio_directx2_out.c:187 #, fuzzy msgid "object doesn't support aggregation" msgstr "プリンタがビットマップをサポートしていません" -#: src/audio_out/audio_directx2_out.c:189 +#: src/audio_out/audio_directx2_out.c:188 #, fuzzy msgid "no sound driver available for use" msgstr "有効なブラシがありません。" -#: src/audio_out/audio_directx2_out.c:190 +#: src/audio_out/audio_directx2_out.c:189 msgid "requested COM interface not available" msgstr "" -#: src/audio_out/audio_directx2_out.c:191 +#: src/audio_out/audio_directx2_out.c:190 msgid "another application has a higher priority level" msgstr "" -#: src/audio_out/audio_directx2_out.c:192 +#: src/audio_out/audio_directx2_out.c:191 #, fuzzy msgid "insufficient memory" msgstr "メモリを使い果たしました" -#: src/audio_out/audio_directx2_out.c:193 +#: src/audio_out/audio_directx2_out.c:192 msgid "low priority level for this function" msgstr "" -#: src/audio_out/audio_directx2_out.c:194 +#: src/audio_out/audio_directx2_out.c:193 #, fuzzy msgid "DirectSound wasn't initialized" msgstr "仮引数 `%s' が初期化されました" -#: src/audio_out/audio_directx2_out.c:195 +#: src/audio_out/audio_directx2_out.c:194 #, fuzzy msgid "function is not supported" msgstr "-Pオプションはサポートしていません" -#: src/audio_out/audio_directx2_out.c:196 +#: src/audio_out/audio_directx2_out.c:195 msgid "unknown error" msgstr "不明なエラー" -#: src/audio_out/audio_directx2_out.c:206 +#: src/audio_out/audio_directx2_out.c:205 #, c-format msgid "Unable to create direct sound object." msgstr "" -#: src/audio_out/audio_directx2_out.c:212 +#: src/audio_out/audio_directx2_out.c:211 #, c-format msgid "Could not set direct sound cooperative level." msgstr "" -#: src/audio_out/audio_directx2_out.c:284 +#: src/audio_out/audio_directx2_out.c:283 msgid "Unable to create secondary direct sound buffer" msgstr "" -#: src/audio_out/audio_directx2_out.c:304 +#: src/audio_out/audio_directx2_out.c:303 #, fuzzy msgid "Couldn't play sound buffer" msgstr "サウンドカードを使用して音を出す" -#: src/audio_out/audio_directx2_out.c:316 +#: src/audio_out/audio_directx2_out.c:315 #, fuzzy msgid "Couldn't stop sound buffer" msgstr "コンテキスト・バッファ用のメモリを確保できませんでした" -#: src/audio_out/audio_directx2_out.c:329 +#: src/audio_out/audio_directx2_out.c:328 #, fuzzy msgid "Can't get buffer position" msgstr "%s: シャドウをロックできません\n" -#: src/audio_out/audio_directx2_out.c:343 +#: src/audio_out/audio_directx2_out.c:342 #, fuzzy msgid "Can't set buffer position" msgstr "ファイル '%s' 中に位置ポインタを設定できません" -#: src/audio_out/audio_directx2_out.c:374 +#: src/audio_out/audio_directx2_out.c:373 #, fuzzy msgid "Can't set sound volume" msgstr "有効な UID を設定できません" -#: src/audio_out/audio_directx2_out.c:392 +#: src/audio_out/audio_directx2_out.c:391 #, c-format msgid ": buffer lost, trying to restore\n" msgstr "" -#: src/audio_out/audio_directx2_out.c:396 +#: src/audio_out/audio_directx2_out.c:395 msgid "Couldn't lock direct sound buffer" msgstr "" -#: src/audio_out/audio_directx2_out.c:409 +#: src/audio_out/audio_directx2_out.c:408 msgid "Couldn't unlock direct sound buffer" msgstr "" -#: src/audio_out/audio_directx2_out.c:500 +#: src/audio_out/audio_directx2_out.c:499 #, c-format msgid "Unable to create primary direct sound buffer." msgstr "" -#: src/audio_out/audio_directx2_out.c:596 +#: src/audio_out/audio_directx2_out.c:595 #, c-format msgid ": play cursor overran (data %u, min %u), flushing buffers\n" msgstr "" -#: src/audio_out/audio_directx2_out.c:699 +#: src/audio_out/audio_directx2_out.c:698 #, fuzzy, c-format msgid ": can't create pthread condition: %s\n" msgstr "%s: %d行: グループIDが作成できません\n" -#: src/audio_out/audio_directx2_out.c:703 +#: src/audio_out/audio_directx2_out.c:702 #, fuzzy, c-format msgid ": can't create pthread mutex: %s\n" msgstr "FSFS 相互排除ロックを作成できません" -#: src/audio_out/audio_directx2_out.c:710 +#: src/audio_out/audio_directx2_out.c:709 #, fuzzy, c-format msgid ": can't create buffer pthread: %s\n" msgstr "%s: %d行: グループIDが作成できません\n" -#: src/audio_out/audio_directx2_out.c:825 +#: src/audio_out/audio_directx2_out.c:824 #, fuzzy, c-format msgid ": can't destroy buffer pthread: %s\n" msgstr "サイレンス用のバッファの取得に失敗しました" -#: src/audio_out/audio_directx2_out.c:832 +#: src/audio_out/audio_directx2_out.c:831 #, c-format msgid ": can't destroy pthread condition: %s\n" msgstr "" -#: src/audio_out/audio_directx2_out.c:835 +#: src/audio_out/audio_directx2_out.c:834 #, fuzzy, c-format msgid ": can't destroy pthread mutex: %s\n" msgstr "ファイルシステム相互排除ロックを割り当てられません" -#: src/audio_out/audio_directx2_out.c:890 +#: src/audio_out/audio_directx2_out.c:889 #, fuzzy, c-format msgid ": unknown control command %d\n" msgstr "切り分られたものを元に戻すコマンド %s が分かりません" -#: src/audio_out/audio_directx2_out.c:946 +#: src/audio_out/audio_directx2_out.c:949 msgid "second xine audio output plugin using directx" msgstr "" -#: src/audio_out/audio_directx_out.c:831 +#: src/audio_out/audio_directx_out.c:840 msgid "xine audio output plugin for win32 using directx" msgstr "" @@ -490,18 +503,18 @@ msgstr "" msgid "esd audio output latency (adjust a/v sync)" msgstr "" -#: src/audio_out/audio_esd_out.c:540 -#: src/audio_out/audio_oss_out.c:869 +#: src/audio_out/audio_esd_out.c:540 src/audio_out/audio_oss_out.c:869 msgid "" -"If you experience audio being not in sync with the video, you can enter a fixed offset here to compensate.\n" +"If you experience audio being not in sync with the video, you can enter a " +"fixed offset here to compensate.\n" "The unit of the value is one PTS tick, which is the 90000th part of a second." msgstr "" -#: src/audio_out/audio_esd_out.c:572 +#: src/audio_out/audio_esd_out.c:576 msgid "xine audio output plugin using esound" msgstr "" -#: src/audio_out/audio_file_out.c:362 +#: src/audio_out/audio_file_out.c:368 #, fuzzy msgid "xine file audio output plugin" msgstr "main: 音声出力プラグイン<%s> を探索中\n" @@ -512,8 +525,10 @@ msgstr "" #: src/audio_out/audio_irixal_out.c:386 msgid "" -"You can specify the maximum offset between audio and video xine will tolerate before trying to resync them.\n" -"The unit of this value is one PTS tick, which is the 90000th part of a second." +"You can specify the maximum offset between audio and video xine will " +"tolerate before trying to resync them.\n" +"The unit of this value is one PTS tick, which is the 90000th part of a " +"second." msgstr "" #: src/audio_out/audio_irixal_out.c:415 @@ -525,14 +540,16 @@ msgid "JACK audio device name" msgstr "JACK 音声デバイス名" #: src/audio_out/audio_jack_out.c:731 -msgid "Specifies the jack audio device name, leave blank for the default physical output port." +msgid "" +"Specifies the jack audio device name, leave blank for the default physical " +"output port." msgstr "" #: src/audio_out/audio_jack_out.c:908 msgid "xine output plugin for JACK Audio Connection Kit" msgstr "" -#: src/audio_out/audio_none_out.c:223 +#: src/audio_out/audio_none_out.c:229 #, fuzzy msgid "xine dummy audio output plugin" msgstr "main: 音声出力プラグイン<%s> を探索中\n" @@ -544,7 +561,8 @@ msgstr "" #: 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" +msgid "" +"audio_oss_out: warning: sampling rate %d Hz not supported, trying 44100 Hz\n" msgstr "" #: src/audio_out/audio_oss_out.c:230 @@ -558,7 +576,8 @@ msgstr "OSS 音声デバイス名" #: src/audio_out/audio_oss_out.c:746 msgid "" -"Specifies the base part of the audio device name, to which the OSS device number is appended to get the full device name.\n" +"Specifies the base part of the audio device name, to which the OSS device " +"number is appended to get the full device name.\n" "Select \"auto\" if you want xine to auto detect the corret setting." msgstr "" @@ -568,9 +587,12 @@ msgstr "" #: src/audio_out/audio_oss_out.c:754 msgid "" -"The full audio device name is created by concatenating the OSS device name and the audio device number.\n" -"If you do not need a number because you are happy with your system's default audio device, set this to -1.\n" -"The range of this value is -1 or 0-15. This setting is ignored, when the OSS audio device name is set to \"auto\"." +"The full audio device name is created by concatenating the OSS device name " +"and the audio device number.\n" +"If you do not need a number because you are happy with your system's default " +"audio device, set this to -1.\n" +"The range of this value is -1 or 0-15. This setting is ignored, when the OSS " +"audio device name is set to \"auto\"." msgstr "" #: src/audio_out/audio_oss_out.c:763 @@ -588,8 +610,7 @@ msgstr "" msgid "audio_oss_out: using device >%s<\n" msgstr "" -#: src/audio_out/audio_oss_out.c:788 -#: src/audio_out/audio_oss_out.c:902 +#: src/audio_out/audio_oss_out.c:788 src/audio_out/audio_oss_out.c:902 #, c-format msgid "" "audio_oss_out: opening audio device %s failed:\n" @@ -602,7 +623,9 @@ msgstr "" #: src/audio_out/audio_oss_out.c:810 msgid "" -"xine can use different methods to keep audio and video synchronized. Which setting works best depends on the OSS driver and sound hardware you are using. Try the various methods, if you experience sync problems.\n" +"xine can use different methods to keep audio and video synchronized. Which " +"setting works best depends on the OSS driver and sound hardware you are " +"using. Try the various methods, if you experience sync problems.\n" "\n" "The meaning of the values is as follows:\n" "\n" @@ -610,16 +633,22 @@ msgid "" "xine attempts to automatically detect the optimal setting\n" "\n" "getodelay\n" -"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the driver claims not to support realtime playback\n" +"uses the SNDCTL_DSP_GETODELAY ioctl to achieve true a/v sync even if the " +"driver claims not to support realtime playback\n" "\n" "getoptr\n" -"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n" +"uses the SNDCTL_DSP_GETOPTR ioctl to achieve true a/v sync even if the " +"driver supports the preferred SNDCTL_DSP_GETODELAY ioctl\n" "\n" "softsync\n" -"uses software synchronization with the system clock; audio and video can get severely out of sync if the system clock speed does not precisely match your sound card's playback speed\n" +"uses software synchronization with the system clock; audio and video can get " +"severely out of sync if the system clock speed does not precisely match your " +"sound card's playback speed\n" "\n" "probebuffer\n" -"probes the sound card buffer size on initialization to calculate the latency for a/v sync; try this if your system does not support any of the realtime ioctls and you experience sync errors after long playback" +"probes the sound card buffer size on initialization to calculate the latency " +"for a/v sync; try this if your system does not support any of the realtime " +"ioctls and you experience sync errors after long playback" msgstr "" #: src/audio_out/audio_oss_out.c:861 @@ -661,17 +690,20 @@ msgstr "" #: src/audio_out/audio_oss_out.c:1028 msgid "" -"The full mixer device name is created by taking the OSS device name, replacing \"dsp\" with \"mixer\" and adding the mixer number.\n" -"If you do not need a number because you are happy with your system's default mixer device, set this to -1.\n" -"The range of this value is -1 or 0-15. This setting is ignored, when the OSS audio device name is set to \"auto\"." +"The full mixer device name is created by taking the OSS device name, " +"replacing \"dsp\" with \"mixer\" and adding the mixer number.\n" +"If you do not need a number because you are happy with your system's default " +"mixer device, set this to -1.\n" +"The range of this value is -1 or 0-15. This setting is ignored, when the OSS " +"audio device name is set to \"auto\"." msgstr "" -#: src/audio_out/audio_oss_out.c:1082 +#: src/audio_out/audio_oss_out.c:1079 #, c-format msgid "audio_oss_out: open() mixer %s failed: %s\n" msgstr "" -#: src/audio_out/audio_oss_out.c:1155 +#: src/audio_out/audio_oss_out.c:1156 msgid "xine audio output plugin using oss-compliant audio devices/drivers" msgstr "" @@ -684,176 +716,49 @@ msgstr "DVD ドライブとして使用するデバイス" msgid "use 'server[:sink]' for setting the pulseaudio sink device." msgstr "" -#: src/audio_out/audio_pulse_out.c:898 +#: src/audio_out/audio_pulse_out.c:914 msgid "xine audio output plugin using pulseaudio sound server" msgstr "" -#: src/audio_out/audio_sun_out.c:457 -#: src/audio_out/audio_sun_out.c:950 +#: 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 "" -#: src/audio_out/audio_sun_out.c:925 +#: src/audio_out/audio_sun_out.c:923 #, fuzzy msgid "Sun audio device name" msgstr "Sun mu-law オーディオ" -#: src/audio_out/audio_sun_out.c:926 +#: src/audio_out/audio_sun_out.c:924 msgid "" "Specifies the file name for the Sun audio device to be used.\n" -"This setting is security critical, because when changed to a different file, xine can be used to fill this file with arbitrary content. So you should be careful that the value you enter really is a proper Sun audio device." +"This setting is security critical, because when changed to a different file, " +"xine can be used to fill this file with arbitrary content. So you should be " +"careful that the value you enter really is a proper Sun audio device." msgstr "" -#: src/audio_out/audio_sun_out.c:968 +#: src/audio_out/audio_sun_out.c:966 #, c-format msgid "audio_sun_out: audio ioctl on device %s failed: %s\n" msgstr "" -#: src/audio_out/audio_sun_out.c:1022 +#: src/audio_out/audio_sun_out.c:1023 msgid "xine audio output plugin using sun-compliant audio devices/drivers" msgstr "" -#: src/combined/ffmpeg/ff_audio_decoder.c:82 -#, c-format -msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n" -msgstr "" - -#: src/combined/ffmpeg/ff_audio_decoder.c:125 -#, c-format -msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" -msgstr "" - -#: src/combined/ffmpeg/ff_audio_decoder.c:262 -#, c-format -msgid "ffmpeg_audio_dec: trying to open null codec\n" -msgstr "" - -#: src/combined/ffmpeg/ff_audio_decoder.c:271 -#, c-format -msgid "ffmpeg_audio_dec: couldn't open decoder\n" -msgstr "" - -#: src/combined/ffmpeg/ff_dvaudio_decoder.c:285 -#, c-format -msgid "dvaudio: increasing buffer to %d to avoid overflow.\n" -msgstr "" - -#: src/combined/ffmpeg/ff_video_decoder.c:175 -#, c-format -msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" -msgstr "" - -#: src/combined/ffmpeg/ff_video_decoder.c:193 -#, c-format -msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n" -msgstr "" - -#: src/combined/ffmpeg/ff_video_decoder.c:304 -#, c-format -msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" -msgstr "" - -#: src/combined/ffmpeg/ff_video_decoder.c:331 -#, c-format -msgid "ffmpeg_video_dec: couldn't open decoder\n" -msgstr "" - -#: src/combined/ffmpeg/ff_video_decoder.c:346 -#, c-format -msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" -msgstr "" - -#: src/combined/ffmpeg/ff_video_decoder.c:391 -#, c-format -msgid "ffmpeg_video_dec: direct rendering enabled\n" -msgstr "" - -#: src/combined/ffmpeg/ff_video_decoder.c:840 +#: src/combined/xine_ogg_demuxer.c:885 #, c-format -msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n" -msgstr "" - -#: src/combined/ffmpeg/ff_video_decoder.c:1771 -#, fuzzy -msgid "MPEG-4 postprocessing quality" -msgstr "高 (普通の品質)" - -#: src/combined/ffmpeg/ff_video_decoder.c:1772 -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 result in image defects like block artifacts. For high quality content, too heavy post processing can actually make the image worse by blurring it too much." -msgstr "" - -#: src/combined/ffmpeg/ff_video_decoder.c:1780 -msgid "FFmpeg video decoding thread count" -msgstr "" - -#: src/combined/ffmpeg/ff_video_decoder.c:1781 -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).\n" -"A change of this setting will take effect with playing the next stream." -msgstr "" - -#: src/combined/ffmpeg/ff_video_decoder.c:1790 -#, fuzzy -msgid "Skip loop filter" -msgstr "高域通過フィルタ" - -#: src/combined/ffmpeg/ff_video_decoder.c:1791 -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:1800 -msgid "Choose speed over specification compliance" -msgstr "" - -#: src/combined/ffmpeg/ff_video_decoder.c:1801 -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/combined/ffmpeg/ffmpeg_encoder.c:167 -msgid "libavcodec mpeg output bitrate (kbit/s)" -msgstr "" - -#: src/combined/ffmpeg/ffmpeg_encoder.c:168 -msgid "" -"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. Higher values will increase quality and CPU usage.\n" -"This setting is only considered, when constant quality mode is disabled." -msgstr "" - -#: src/combined/ffmpeg/ffmpeg_encoder.c:175 -#, fuzzy -msgid "constant quality mode" -msgstr "サイズと品質モード" - -#: src/combined/ffmpeg/ffmpeg_encoder.c:176 -msgid "When enabled, libavcodec will use a constant quality mode by dynamically compressing the images based on their complexity. When disabled, libavcodec will use constant bitrate mode." -msgstr "" - -#: src/combined/ffmpeg/ffmpeg_encoder.c:183 -#, fuzzy -msgid "minimum compression" -msgstr "圧縮の設定" - -#: src/combined/ffmpeg/ffmpeg_encoder.c:184 -msgid "The minimum compression to apply to an image in constant quality mode." +msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n" msgstr "" -#: src/combined/ffmpeg/ffmpeg_encoder.c:189 +#: src/combined/xine_ogg_demuxer.c:2170 #, fuzzy -msgid "maximum quantizer" -msgstr "最大帯域幅:" +msgid "Annodex demux plugin" +msgstr "みつかった xine ライブラリバージョン: %d.%d.%d (%s).\n" -#: src/combined/ffmpeg/ffmpeg_encoder.c:190 -msgid "The maximum compression to apply to an image in constant quality mode." +#: src/combined/xine_ogg_demuxer.c:2194 +msgid "OGG demux plugin" msgstr "" #: src/demuxers/demux_asf.c:450 @@ -875,14 +780,16 @@ msgstr "" msgid "Media stream scrambled/encrypted" msgstr "" -#: src/demuxers/demux_avi.c:530 -#: src/demuxers/demux_avi.c:644 +#: src/demuxers/demux_asf.c:2134 +msgid "ASF demux plugin" +msgstr "" + +#: src/demuxers/demux_avi.c:530 src/demuxers/demux_avi.c:644 #, fuzzy msgid "Restoring index..." msgstr "/%s (%s:%d 上)の見出し(index)です" -#: src/demuxers/demux_avi.c:630 -#: src/demuxers/demux_avi.c:1697 +#: src/demuxers/demux_avi.c:630 src/demuxers/demux_avi.c:1697 #, c-format msgid "demux_avi: invalid avi chunk \"%c%c%c%c\" at pos %<PRIdMAX>\n" msgstr "" @@ -897,16 +804,24 @@ msgstr "" msgid "demux_avi: failed to seek to the next chunk (pos %<PRIdMAX>)\n" msgstr "" +#: src/demuxers/demux_avi.c:2330 +msgid "AVI/RIFF demux plugin" +msgstr "" + #: src/demuxers/demux_film.c:186 #, fuzzy, c-format msgid "invalid FILM chunk size\n" msgstr "record_size が無効な値です" -#: src/demuxers/demux_film.c:342 +#: src/demuxers/demux_film.c:345 #, fuzzy, c-format msgid "unrecognized FILM chunk\n" msgstr "フィルム色を選択" +#: src/demuxers/demux_film.c:904 +msgid "FILM (CPK) demux plugin" +msgstr "" + #: src/demuxers/demux_flv.c:184 #, fuzzy, c-format msgid "unsupported FLV version (%d).\n" @@ -917,12 +832,16 @@ msgstr "サポートされていないメニューバージョン %d" msgid "neither video nor audio stream in this file.\n" msgstr "" -#: src/demuxers/demux_flv.c:559 -#: src/demuxers/demux_flv.c:701 +#: src/demuxers/demux_flv.c:559 src/demuxers/demux_flv.c:701 #, c-format msgid "sequence header too big (%u bytes)!\n" msgstr "" +#: src/demuxers/demux_flv.c:1000 +#, fuzzy +msgid "Flash Video file demux plugin" +msgstr "自動再生入力プラグイン '%s' が失敗しました" + #: src/demuxers/demux_iff.c:233 #, c-format msgid "iff-8svx/16sv: unknown compression: %d\n" @@ -938,59 +857,81 @@ msgstr "" msgid "iff: unknown Chunk: %s\n" msgstr "未知のシステムエラー" +#: src/demuxers/demux_iff.c:1225 +msgid "IFF demux plugin" +msgstr "" + #: src/demuxers/demux_mpc.c:205 #, c-format msgid "demux_mpc: frame too big for buffer" msgstr "" -#: src/demuxers/demux_mpeg_block.c:291 +#: src/demuxers/demux_mpc.c:358 +msgid "Musepack demux plugin" +msgstr "" + +#: src/demuxers/demux_mpeg_block.c:297 #, c-format -msgid "xine-lib:demux_mpeg_block: Unrecognised stream_id 0x%02x. Please report this to xine developers.\n" +msgid "" +"xine-lib:demux_mpeg_block: Unrecognised stream_id 0x%02x. Please report this " +"to xine developers.\n" msgstr "" -#: src/demuxers/demux_mpeg_block.c:302 +#: src/demuxers/demux_mpeg_block.c:308 #, c-format -msgid "demux_mpeg_block: error! freeing. Please report this to xine developers.\n" +msgid "" +"demux_mpeg_block: error! freeing. Please report this to xine developers.\n" msgstr "" -#: src/demuxers/demux_mpeg_block.c:634 +#: src/demuxers/demux_mpeg_block.c:640 #, c-format msgid "demux_mpeg_block: warning: PES header reserved 10 bits not found\n" msgstr "" -#: src/demuxers/demux_mpeg_block.c:644 +#: src/demuxers/demux_mpeg_block.c:650 #, c-format -msgid "demux_mpeg_block: warning: PES header indicates that this stream may be encrypted (encryption mode %d)\n" +msgid "" +"demux_mpeg_block: warning: PES header indicates that this stream may be " +"encrypted (encryption mode %d)\n" +msgstr "" + +#: src/demuxers/demux_mpeg_block.c:1490 +msgid "DVD/VOB demux plugin" msgstr "" -#: src/demuxers/demux_mpeg_pes.c:413 +#: src/demuxers/demux_mpeg_pes.c:418 #, c-format -msgid "xine-lib:demux_mpeg_pes: Unrecognised stream_id 0x%02x. Please report this to xine developers.\n" +msgid "" +"xine-lib:demux_mpeg_pes: Unrecognised stream_id 0x%02x. Please report this " +"to xine developers.\n" msgstr "" -#: src/demuxers/demux_mpeg_pes.c:422 +#: src/demuxers/demux_mpeg_pes.c:427 #, c-format msgid "demux_mpeg_pes: warning: PACK stream id=0x%x decode failed.\n" msgstr "" -#: src/demuxers/demux_mpeg_pes.c:804 +#: src/demuxers/demux_mpeg_pes.c:809 #, c-format msgid "demux_mpeg_pes: warning: PES header reserved 10 bits not found\n" msgstr "" -#: src/demuxers/demux_mpeg_pes.c:814 +#: src/demuxers/demux_mpeg_pes.c:819 #, c-format -msgid "demux_mpeg_pes: warning: PES header indicates that this stream may be encrypted (encryption mode %d)\n" +msgid "" +"demux_mpeg_pes: warning: PES header indicates that this stream may be " +"encrypted (encryption mode %d)\n" msgstr "" -#: src/demuxers/demux_mpeg_pes.c:1088 +#: src/demuxers/demux_mpeg_pes.c:1093 #, c-format -msgid "demux_mpeg_pes:Unrecognised private stream 1 0x%02x. Please report this to xine developers.\n" +msgid "" +"demux_mpeg_pes:Unrecognised private stream 1 0x%02x. Please report this to " +"xine developers.\n" msgstr "" -#: src/demuxers/demux_ogg.c:877 -#, c-format -msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n" +#: src/demuxers/demux_mpeg_pes.c:1757 +msgid "mpeg pes demux plugin" msgstr "" #: src/demuxers/demux_snd.c:100 @@ -1003,11 +944,21 @@ msgstr "" msgid "demux_snd: unsupported audio type: %d\n" msgstr "" -#: src/demuxers/demux_tta.c:98 +#: src/demuxers/demux_snd.c:356 +#, fuzzy +msgid "SND/AU file demux plugin" +msgstr "入力ファイルが縮んだ" + +#: src/demuxers/demux_tta.c:97 #, c-format msgid "demux_tta: total frames count too high\n" msgstr "" +#: src/demuxers/demux_tta.c:326 +#, fuzzy +msgid "True Audio demux plugin" +msgstr "みつかった xine ライブラリバージョン: %d.%d.%d (%s).\n" + #: src/demuxers/demux_voc.c:103 #, c-format msgid "unknown VOC block type (0x%02X); please report to xine developers\n" @@ -1015,9 +966,15 @@ msgstr "" #: src/demuxers/demux_voc.c:118 #, c-format -msgid "unknown VOC compression type (0x%02X); please report to xine developers\n" +msgid "" +"unknown VOC compression type (0x%02X); please report to xine developers\n" msgstr "" +#: src/demuxers/demux_voc.c:336 +#, fuzzy +msgid "VOC file demux plugin" +msgstr "入力ファイルが縮んだ" + #: src/demuxers/demux_wc3movie.c:190 #, c-format msgid "demux_wc3movie: SHOT chunk referenced invalid palette (%d >= %d)\n" @@ -1028,38 +985,46 @@ msgstr "" msgid "demux_wc3movie: There was a problem while loading palette chunks\n" msgstr "" -#: src/dxr3/dxr3.h:30 -#, fuzzy -msgid "DXR3 device number" -msgstr "デバイス番号が違います" +#: src/demuxers/demux_wc3movie.c:718 +msgid "Wing Commander III Movie (MVE) demux plugin" +msgstr "" -#: src/dxr3/dxr3.h:31 -msgid "If you have more than one DXR3 in your computer, you can specify which one to use here." +#: src/dxr3/dxr3_decode_spu.c:196 +msgid "" +"subtitle decoder plugin using the hardware decoding capabilities of a DXR3 " +"decoder card" msgstr "" -#: src/dxr3/dxr3_decode_spu.c:262 +#: src/dxr3/dxr3_decode_spu.c:241 #, c-format msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n" msgstr "" -#: src/dxr3/dxr3_decode_spu.c:672 +#: src/dxr3/dxr3_decode_spu.c:635 #, fuzzy, c-format msgid "requested button not available\n" msgstr "iconv 関数が有効ではありません" -#: src/dxr3/dxr3_decode_video.c:254 +#: src/dxr3/dxr3_decode_video.c:185 +msgid "" +"MPEGI/II decoder plugin using the hardware decoding capabilities of a DXR3 " +"decoder card." +msgstr "" + +#: src/dxr3/dxr3_decode_video.c:232 #, c-format msgid "dxr3_decode_video: Failed to open control device %s (%s)\n" msgstr "" -#: src/dxr3/dxr3_decode_video.c:260 +#: src/dxr3/dxr3_decode_video.c:238 #, fuzzy msgid "use Pan & Scan info" msgstr "フォント情報モードでラベルにフォントを使用する" -#: src/dxr3/dxr3_decode_video.c:261 +#: src/dxr3/dxr3_decode_video.c:239 msgid "" -"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG encoded material. You can specify here, how to handle such content.\n" +"\"Pan & Scan\" is a special display mode which is sometimes used in MPEG " +"encoded material. You can specify here, how to handle such content.\n" "\n" "only when forced\n" "Use Pan & Scan only, when the content you are playing enforces it.\n" @@ -1068,110 +1033,135 @@ msgid "" "Enable Pan & Scan based on information embedded in the MPEG video stream.\n" "\n" "use DVB hint\n" -"Enable Pan & Scan based on information embedded in DVB streams. This makes use of the Active Format Descriptor (AFD) used in some European DVB channels." +"Enable Pan & Scan based on information embedded in DVB streams. This makes " +"use of the Active Format Descriptor (AFD) used in some European DVB channels." msgstr "" -#: src/dxr3/dxr3_decode_video.c:280 +#: src/dxr3/dxr3_decode_video.c:258 msgid "try to sync video every frame" msgstr "" -#: src/dxr3/dxr3_decode_video.c:281 +#: src/dxr3/dxr3_decode_video.c:259 msgid "" -"Tries to set a synchronization timestamp for every frame. Normally this is not necessary, because sync is sufficent even when the timestamp is set only every now and then.\n" +"Tries to set a synchronization timestamp for every frame. Normally this is " +"not necessary, because sync is sufficent even when the timestamp is set only " +"every now and then.\n" "This is relevant for progressive video only (most PAL films)." msgstr "" -#: src/dxr3/dxr3_decode_video.c:287 +#: src/dxr3/dxr3_decode_video.c:265 #, fuzzy msgid "use smooth play mode" msgstr "正準テキスト・モードを使用" -#: src/dxr3/dxr3_decode_video.c:288 +#: src/dxr3/dxr3_decode_video.c:266 msgid "Enabling this option will utilise a smoother play mode." msgstr "" -#: src/dxr3/dxr3_decode_video.c:291 +#: src/dxr3/dxr3_decode_video.c:269 msgid "correct frame durations in broken streams" msgstr "" -#: src/dxr3/dxr3_decode_video.c:292 -msgid "Enables a small logic that corrects the frame durations of some mpeg streams with wrong framerate codes. Currently a correction for NTSC streams erroneously labeled as PAL streams is implemented. Enable only, when you encounter such streams." +#: src/dxr3/dxr3_decode_video.c:270 +msgid "" +"Enables a small logic that corrects the frame durations of some mpeg streams " +"with wrong framerate codes. Currently a correction for NTSC streams " +"erroneously labeled as PAL streams is implemented. Enable only, when you " +"encounter such streams." msgstr "" -#: src/dxr3/dxr3_decode_video.c:551 +#: src/dxr3/dxr3_decode_video.c:513 #, c-format msgid "dxr3_decode_video: Failed to open video device %s (%s)\n" msgstr "" -#: src/dxr3/dxr3_decode_video.c:619 +#: src/dxr3/dxr3_decode_video.c:581 #, c-format msgid "dxr3_decode_video: write to device would block. flushing\n" msgstr "" -#: src/dxr3/dxr3_decode_video.c:623 +#: src/dxr3/dxr3_decode_video.c:585 #, c-format msgid "dxr3_decode_video: video device write failed (%s)\n" msgstr "" -#: src/dxr3/dxr3_decode_video.c:738 +#: src/dxr3/dxr3_decode_video.c:700 #, c-format msgid "dxr3_decode_video: WARNING: unknown frame rate code %d\n" msgstr "" -#: src/dxr3/dxr3_decode_video.c:766 +#: src/dxr3/dxr3_decode_video.c:728 #, c-format -msgid "dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n" +msgid "" +"dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n" +msgstr "" + +#: src/dxr3/dxr3.h:34 +#, fuzzy +msgid "DXR3 device number" +msgstr "デバイス番号が違います" + +#: src/dxr3/dxr3.h:35 +msgid "" +"If you have more than one DXR3 in your computer, you can specify which one " +"to use here." msgstr "" -#: src/dxr3/dxr3_mpeg_encoders.c:123 +#: src/dxr3/dxr3_mpeg_encoders.c:122 #, c-format msgid "dxr3_mpeg_encoder: failed to init librte\n" msgstr "" -#: src/dxr3/dxr3_mpeg_encoders.c:158 +#: src/dxr3/dxr3_mpeg_encoders.c:157 #, c-format -msgid "dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of 16\n" +msgid "" +"dxr3_mpeg_encoder: rte only handles video dimensions which are multiples of " +"16\n" msgstr "" -#: src/dxr3/dxr3_mpeg_encoders.c:168 +#: src/dxr3/dxr3_mpeg_encoders.c:167 #, c-format msgid "dxr3_mpeg_encoder: failed to get rte context.\n" msgstr "" -#: src/dxr3/dxr3_mpeg_encoders.c:179 +#: src/dxr3/dxr3_mpeg_encoders.c:178 #, c-format msgid "dxr3_mpeg_encoder: could not create codec.\n" msgstr "" -#: src/dxr3/dxr3_mpeg_encoders.c:187 +#: src/dxr3/dxr3_mpeg_encoders.c:186 msgid "rte mpeg output bitrate (kbit/s)" msgstr "" -#: src/dxr3/dxr3_mpeg_encoders.c:188 -msgid "The bitrate the mpeg encoder library librte should use for DXR3's encoding mode. Higher values will increase quality and CPU usage." +#: src/dxr3/dxr3_mpeg_encoders.c:187 +msgid "" +"The bitrate the mpeg encoder library librte should use for DXR3's encoding " +"mode. Higher values will increase quality and CPU usage." msgstr "" -#: src/dxr3/dxr3_mpeg_encoders.c:232 +#: src/dxr3/dxr3_mpeg_encoders.c:231 #, c-format msgid "dxr3_mpeg_encoder: cannot init the context: %s\n" msgstr "" -#: src/dxr3/dxr3_mpeg_encoders.c:240 +#: src/dxr3/dxr3_mpeg_encoders.c:239 #, c-format msgid "dxr3_mpeg_encoder: cannot start encoding: %s\n" msgstr "" -#: src/dxr3/dxr3_mpeg_encoders.c:370 +#: src/dxr3/dxr3_mpeg_encoders.c:367 #, c-format msgid "dxr3_mpeg_encoder: Couldn't start the FAME library\n" msgstr "" -#: src/dxr3/dxr3_mpeg_encoders.c:385 +#: src/dxr3/dxr3_mpeg_encoders.c:382 msgid "fame mpeg encoding quality" msgstr "" -#: src/dxr3/dxr3_mpeg_encoders.c:386 -msgid "The encoding quality of the libfame mpeg encoder library. Lower is faster but gives noticeable artifacts. Higher is better but slower." +#: src/dxr3/dxr3_mpeg_encoders.c:383 +msgid "" +"The encoding quality of the libfame mpeg encoder library. Lower is faster " +"but gives noticeable artifacts. Higher is better but slower." msgstr "" #: src/dxr3/dxr3_scr.c:96 @@ -1180,152 +1170,192 @@ msgid "SCR plugin priority" msgstr "不正なプロパティ \"%s\" を無視します" #: src/dxr3/dxr3_scr.c:97 -msgid "Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix system timer will be used. Values greater 5 force to use DXR3's internal clock as sync source." +msgid "" +"Priority of the DXR3 SCR plugin. Values less than 5 mean that the unix " +"system timer will be used. Values greater 5 force to use DXR3's internal " +"clock as sync source." msgstr "" -#: src/dxr3/video_out_dxr3.c:262 +#: src/dxr3/video_out_dxr3.c:186 +msgid "video output plugin displaying images through your DXR3 decoder card" +msgstr "" + +#: src/dxr3/video_out_dxr3.c:257 msgid "swap odd and even lines" msgstr "" -#: src/dxr3/video_out_dxr3.c:263 +#: src/dxr3/video_out_dxr3.c:258 msgid "" "Swaps the even and odd field of the image.\n" -"Enable this option for non-MPEG material which produces a vertical jitter on screen." +"Enable this option for non-MPEG material which produces a vertical jitter on " +"screen." msgstr "" -#: src/dxr3/video_out_dxr3.c:267 +#: src/dxr3/video_out_dxr3.c:262 msgid "add black bars to correct aspect ratio" msgstr "" -#: src/dxr3/video_out_dxr3.c:268 -msgid "Adds black bars when the image has an aspect ratio the card cannot handle natively. This is needed to maintain proper image proportions." +#: src/dxr3/video_out_dxr3.c:263 +msgid "" +"Adds black bars when the image has an aspect ratio the card cannot handle " +"natively. This is needed to maintain proper image proportions." msgstr "" -#: src/dxr3/video_out_dxr3.c:273 +#: src/dxr3/video_out_dxr3.c:268 msgid "use smooth play mode for mpeg encoder playback" msgstr "" -#: src/dxr3/video_out_dxr3.c:274 -msgid "Enabling this option will utilise a smoother play mode for non-MPEG content." +#: src/dxr3/video_out_dxr3.c:269 +msgid "" +"Enabling this option will utilise a smoother play mode for non-MPEG content." msgstr "" -#: src/dxr3/video_out_dxr3.c:282 +#: src/dxr3/video_out_dxr3.c:277 #, c-format msgid "video_out_dxr3: Failed to open control device %s (%s)\n" msgstr "" -#: src/dxr3/video_out_dxr3.c:290 +#: src/dxr3/video_out_dxr3.c:285 #, c-format msgid "video_out_dxr3: Failed to open video device %s (%s)\n" msgstr "" -#: src/dxr3/video_out_dxr3.c:336 +#: src/dxr3/video_out_dxr3.c:318 msgid "encoder for non mpeg content" msgstr "" -#: src/dxr3/video_out_dxr3.c:337 +#: src/dxr3/video_out_dxr3.c:319 msgid "" -"Content other than MPEG has to pass an additional reencoding stage, because the dxr3 handles only MPEG.\n" -"Depending on what is supported by your xine, this setting can be \"fame\", \"rte\", \"libavcodec\" or \"none\".\n" -"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships with xine, so you do not need to install any additional library for that. Even better is that libavcodec also provides high quality with low CPU usage. Using \"libavcodec\" is therefore strongly suggested.\n" -"\"fame\" and \"rte\" are still there, but xine support for them is outdated, so these might fail to work." +"Content other than MPEG has to pass an additional reencoding stage, because " +"the dxr3 handles only MPEG.\n" +"Depending on what is supported by your xine, this setting can be \"fame\", " +"\"rte\", \"libavcodec\" or \"none\".\n" +"The \"libavcodec\" encoder makes use of the ffmpeg plugin that already ships " +"with xine, so you do not need to install any additional library for that. " +"Even better is that libavcodec also provides high quality with low CPU " +"usage. Using \"libavcodec\" is therefore strongly suggested.\n" +"\"fame\" and \"rte\" are still there, but xine support for them is outdated, " +"so these might fail to work." msgstr "" -#: src/dxr3/video_out_dxr3.c:348 +#: src/dxr3/video_out_dxr3.c:330 #, c-format msgid "video_out_dxr3: Mpeg encoder libavcodec failed to init.\n" msgstr "" -#: src/dxr3/video_out_dxr3.c:354 +#: src/dxr3/video_out_dxr3.c:336 #, c-format msgid "video_out_dxr3: Mpeg encoder rte failed to init.\n" msgstr "" -#: src/dxr3/video_out_dxr3.c:361 +#: src/dxr3/video_out_dxr3.c:343 #, c-format msgid "video_out_dxr3: Mpeg encoder fame failed to init.\n" msgstr "" -#: src/dxr3/video_out_dxr3.c:367 +#: src/dxr3/video_out_dxr3.c:349 #, c-format msgid "" "video_out_dxr3: Mpeg encoding disabled.\n" "video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n" -"video_out_dxr3: you will not be able to play non-mpeg content using this video out\n" -"video_out_dxr3: driver. See the README.dxr3 for details on configuring an encoder.\n" +"video_out_dxr3: you will not be able to play non-mpeg content using this " +"video out\n" +"video_out_dxr3: driver. See the README.dxr3 for details on configuring an " +"encoder.\n" msgstr "" -#: src/dxr3/video_out_dxr3.c:373 +#: src/dxr3/video_out_dxr3.c:355 #, c-format msgid "" "video_out_dxr3: No mpeg encoder compiled in.\n" "video_out_dxr3: that's ok, you don't need it for mpeg video like DVDs, but\n" -"video_out_dxr3: you will not be able to play non-mpeg content using this video out\n" -"video_out_dxr3: driver. See the README.dxr3 for details on configuring an encoder.\n" +"video_out_dxr3: you will not be able to play non-mpeg content using this " +"video out\n" +"video_out_dxr3: driver. See the README.dxr3 for details on configuring an " +"encoder.\n" msgstr "" -#: src/dxr3/video_out_dxr3.c:388 +#: src/dxr3/video_out_dxr3.c:370 msgid "video output mode (TV or overlay)" msgstr "" -#: src/dxr3/video_out_dxr3.c:389 +#: src/dxr3/video_out_dxr3.c:371 msgid "" -"The way the DXR3 outputs the final video can be set here. The individual values are:\n" +"The way the DXR3 outputs the final video can be set here. The individual " +"values are:\n" "\n" "letterboxed tv\n" -"Send video to the TV out connector only. This is the mode used for the standard 4:3 television set. Anamorphic (16:9) video will be displayed letterboxed, pan&scan material will have the image cropped at the left and right side. This is the common setting for TV viewing and acts like a standalone DVD player.\n" +"Send video to the TV out connector only. This is the mode used for the " +"standard 4:3 television set. Anamorphic (16:9) video will be displayed " +"letterboxed, pan&scan material will have the image cropped at the left and " +"right side. This is the common setting for TV viewing and acts like a " +"standalone DVD player.\n" "\n" "widescreen tv\n" -"Send video to the tv out connector only. This mode is intended for 16:9 widescreen TV sets. Anamorphic and pan&scan content will fill the entire screen, but you have to set the TV's aspect ratio manually to 16:9 using your.\n" +"Send video to the tv out connector only. This mode is intended for 16:9 " +"widescreen TV sets. Anamorphic and pan&scan content will fill the entire " +"screen, but you have to set the TV's aspect ratio manually to 16:9 using " +"your.\n" "\n" "letterboxed overlay\n" -"Overlay Video output on the computer screen with the option of on-the-fly switching to TV out by hiding the video window. The overlay will be displayed with black borders if it is anamorphic (16:9).\n" -"This setting is only useful in the rare case of a DVD subtitle channel that would only display properly in letterbox mode. A good example for that are the animated commentator's silhouettes on \"Ghostbusters\".\n" +"Overlay Video output on the computer screen with the option of on-the-fly " +"switching to TV out by hiding the video window. The overlay will be " +"displayed with black borders if it is anamorphic (16:9).\n" +"This setting is only useful in the rare case of a DVD subtitle channel that " +"would only display properly in letterbox mode. A good example for that are " +"the animated commentator's silhouettes on \"Ghostbusters\".\n" "\n" "widescreen overlay\n" -"Overlay Video output on the computer screen with the option of on-the-fly switching to TV out by hiding the video window. This is the common variant of DXR3 overlay." +"Overlay Video output on the computer screen with the option of on-the-fly " +"switching to TV out by hiding the video window. This is the common variant " +"of DXR3 overlay." msgstr "" -#: src/dxr3/video_out_dxr3.c:436 +#: src/dxr3/video_out_dxr3.c:418 #, fuzzy msgid "overlay colour key value" msgstr "警告: キー/値の組に終端がありません" -#: src/dxr3/video_out_dxr3.c:436 +#: src/dxr3/video_out_dxr3.c:418 msgid "" "Hexadecimal RGB value of the key colour.\n" -"You can try different values, if you experience windows becoming transparent when using DXR3 overlay mode." +"You can try different values, if you experience windows becoming transparent " +"when using DXR3 overlay mode." msgstr "" -#: src/dxr3/video_out_dxr3.c:441 +#: src/dxr3/video_out_dxr3.c:423 msgid "overlay colour key tolerance" msgstr "" -#: src/dxr3/video_out_dxr3.c:441 +#: src/dxr3/video_out_dxr3.c:423 msgid "" "A greater value widens the tolerance for the overlay key colour.\n" -"You can try lower values, if you experience windows becoming transparent when using DXR3 overlay mode, but parts of the image borders may disappear when using a too low setting." +"You can try lower values, if you experience windows becoming transparent " +"when using DXR3 overlay mode, but parts of the image borders may disappear " +"when using a too low setting." msgstr "" -#: src/dxr3/video_out_dxr3.c:447 +#: src/dxr3/video_out_dxr3.c:429 msgid "crop the overlay area at top and bottom" msgstr "" -#: src/dxr3/video_out_dxr3.c:448 -msgid "Removes one pixel line from the top and bottom of the overlay. Enable this, if you see green lines at the top or bottom of the overlay." +#: src/dxr3/video_out_dxr3.c:430 +msgid "" +"Removes one pixel line from the top and bottom of the overlay. Enable this, " +"if you see green lines at the top or bottom of the overlay." msgstr "" -#: src/dxr3/video_out_dxr3.c:452 +#: src/dxr3/video_out_dxr3.c:434 #, c-format msgid "video_out_dxr3: please run autocal, overlay disabled\n" msgstr "" -#: src/dxr3/video_out_dxr3.c:462 +#: src/dxr3/video_out_dxr3.c:444 #, fuzzy msgid "preferred tv mode" msgstr "主操作モード:" -#: src/dxr3/video_out_dxr3.c:462 +#: src/dxr3/video_out_dxr3.c:444 msgid "" "Selects the TV mode to be used by the DXR3. The values mean:\n" "\n" @@ -1335,261 +1365,267 @@ msgid "" "default: keep the card's setting" msgstr "" -#: src/dxr3/video_out_dxr3.c:484 +#: src/dxr3/video_out_dxr3.c:466 #, c-format msgid "video_out_dxr3: setting video mode failed.\n" msgstr "" -#: src/dxr3/video_out_dxr3.c:714 +#: src/dxr3/video_out_dxr3.c:693 #, c-format msgid "" "video_out_dxr3: Need an mpeg encoder to play non-mpeg videos on dxr3\n" "video_out_dxr3: Read the README.dxr3 for details.\n" msgstr "" -#: src/dxr3/video_out_dxr3.c:1369 +#: src/dxr3/video_out_dxr3.c:1344 #, c-format msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n" msgstr "" -#: src/input/input_cdda.c:1605 +#: src/input/input_cdda.c:1587 #, fuzzy, c-format msgid "%s: can't connect to %s:%d\n" msgstr "「%s」へ接続できません: %s\n" -#: src/input/input_cdda.c:1652 +#: src/input/input_cdda.c:1634 #, c-format msgid "input_cdda: successfully connected to cddb server '%s:%d'.\n" msgstr "" -#: src/input/input_cdda.c:1657 +#: src/input/input_cdda.c:1639 #, c-format msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n" msgstr "" -#: src/input/input_cdda.c:2764 +#: src/input/input_cdda.c:2636 msgid "CD Digital Audio (aka. CDDA)" msgstr "" -#: src/input/input_cdda.c:2816 +#: src/input/input_cdda.c:2649 #, fuzzy msgid "device used for CD audio" msgstr "CD-ROM ドライブとして使用するデバイス" -#: src/input/input_cdda.c:2817 -msgid "The path to the device, usually a CD or DVD drive, which you intend to use for playing audio CDs." +#: src/input/input_cdda.c:2650 +msgid "" +"The path to the device, usually a CD or DVD drive, which you intend to use " +"for playing audio CDs." msgstr "" -#: src/input/input_cdda.c:2823 +#: src/input/input_cdda.c:2656 #, fuzzy msgid "query CDDB" msgstr "Query status=%d\n" -#: src/input/input_cdda.c:2823 +#: src/input/input_cdda.c:2656 msgid "" -"Enables CDDB queries, which will give you convenient title and track names for your audio CDs.\n" -"Keep in mind that, unless you use your own private CDDB, this information is retrieved from an internet server which might collect a profile of your listening habits." +"Enables CDDB queries, which will give you convenient title and track names " +"for your audio CDs.\n" +"Keep in mind that, unless you use your own private CDDB, this information is " +"retrieved from an internet server which might collect a profile of your " +"listening habits." msgstr "" -#: src/input/input_cdda.c:2831 +#: src/input/input_cdda.c:2664 msgid "CDDB server name" msgstr "CDDBサーバ名" -#: src/input/input_cdda.c:2831 +#: src/input/input_cdda.c:2664 msgid "" "The CDDB server used to retrieve the title and track information from.\n" -"This setting is security critical, because the sever will receive information about your listening habits and could answer the queries with malicious replies. Be sure to enter a server you can trust." +"This setting is security critical, because the sever will receive " +"information about your listening habits and could answer the queries with " +"malicious replies. Be sure to enter a server you can trust." msgstr "" -#: src/input/input_cdda.c:2839 +#: src/input/input_cdda.c:2672 msgid "CDDB server port" msgstr "CDDBサーバのポート番号" -#: src/input/input_cdda.c:2839 +#: src/input/input_cdda.c:2672 msgid "The server port used to retrieve the title and track information from." msgstr "" -#: src/input/input_cdda.c:2845 -msgid "CDDB cache directory" -msgstr "CDDBキャッシュディレクトリ" - -#: src/input/input_cdda.c:2845 -msgid "" -"The replies from the CDDB server will be cached in this directory.\n" -"This setting is security critical, because files with uncontrollable names will be created in this directory. Be sure to use a dedicated directory not used for anything but CDDB caching." -msgstr "" - -#: src/input/input_cdda.c:2853 +#: src/input/input_cdda.c:2678 msgid "slow down disc drive to this speed factor" msgstr "" -#: src/input/input_cdda.c:2854 +#: src/input/input_cdda.c:2679 msgid "" -"Since some CD or DVD drives make some really loud noises because of the fast disc rotation, xine will try to slow them down. With standard CD or DVD playback, the high datarates that require the fast rotation are not needed, so the slowdown should not affect playback performance.\n" +"Since some CD or DVD drives make some really loud noises because of the fast " +"disc rotation, xine will try to slow them down. With standard CD or DVD " +"playback, the high datarates that require the fast rotation are not needed, " +"so the slowdown should not affect playback performance.\n" "A value of zero here will disable the slowdown." msgstr "" -#: src/input/input_dvb.c:904 +#: src/input/input_dvb.c:894 #, c-format msgid "input_dvb: failed to open dvb channel file '%s': %s\n" msgstr "" -#: src/input/input_dvb.c:910 +#: src/input/input_dvb.c:900 #, c-format msgid "input_dvb: dvb channel file '%s' is not a plain file\n" msgstr "" -#: src/input/input_dvb.c:2148 -#: src/input/input_dvb.c:2991 +#: src/input/input_dvb.c:2134 src/input/input_dvb.c:2979 #, c-format msgid "input_dvb: tuner_set_channel failed\n" msgstr "" -#: src/input/input_dvb.c:2784 +#: src/input/input_dvb.c:2772 #, fuzzy, c-format msgid "input_dvb: DVB GUI %s\n" msgstr "Bonobo GUI サポート" -#: src/input/input_dvb.c:2789 -#: src/input/input_dvb.c:3219 +#: src/input/input_dvb.c:2777 src/input/input_dvb.c:3194 #, fuzzy, c-format msgid "input_dvb: cannot open dvb device\n" msgstr "ゼロで埋められたデバイスを開けません" -#: src/input/input_dvb.c:2813 +#: src/input/input_dvb.c:2801 #, c-format msgid "input_dvb: channel %d out of range, defaulting to 0\n" msgstr "" -#: src/input/input_dvb.c:2824 +#: src/input/input_dvb.c:2812 #, c-format msgid "input_dvb: searching for channel %s\n" msgstr "" -#: src/input/input_dvb.c:2847 +#: src/input/input_dvb.c:2835 #, c-format msgid "input_dvb: exact match for %s not found: trying partial matches\n" msgstr "" -#: src/input/input_dvb.c:2854 +#: src/input/input_dvb.c:2842 #, c-format msgid "input_dvb: found matching channel %s\n" msgstr "" -#: src/input/input_dvb.c:2867 +#: src/input/input_dvb.c:2855 #, c-format msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n" msgstr "" -#: src/input/input_dvb.c:2873 +#: src/input/input_dvb.c:2861 #, c-format -msgid "input_dvb: invalid channel specification, defaulting to last viewed channel.\n" +msgid "" +"input_dvb: invalid channel specification, defaulting to last viewed " +"channel.\n" msgstr "" -#: src/input/input_dvb.c:2881 +#: src/input/input_dvb.c:2869 #, c-format msgid "input_dvb: invalid channel specification, defaulting to channel 0\n" msgstr "" -#: src/input/input_dvb.c:2893 +#: src/input/input_dvb.c:2881 #, c-format -msgid "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-S)\n" +msgid "" +"input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-" +"S)\n" msgstr "" -#: src/input/input_dvb.c:2913 +#: src/input/input_dvb.c:2901 #, c-format -msgid "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-T)\n" +msgid "" +"input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-" +"T)\n" msgstr "" -#: src/input/input_dvb.c:2936 +#: src/input/input_dvb.c:2924 #, c-format -msgid "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-C)\n" +msgid "" +"input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-" +"C)\n" msgstr "" -#: src/input/input_dvb.c:2962 +#: src/input/input_dvb.c:2950 #, c-format -msgid "input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-A)\n" +msgid "" +"input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-" +"A)\n" msgstr "" -#: src/input/input_dvb.c:2997 +#: src/input/input_dvb.c:2985 #, c-format msgid "input_dvb: cannot open dvr device '%s'\n" msgstr "" -#: src/input/input_dvb.c:3020 +#: src/input/input_dvb.c:3008 #, c-format msgid "input_dvb: cannot create EPG updater thread\n" msgstr "" -#: src/input/input_dvb.c:3082 +#: src/input/input_dvb.c:3070 msgid "use DVB 'center cutout' (zoom)" msgstr "" -#: src/input/input_dvb.c:3083 -msgid "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 frame." +#: src/input/input_dvb.c:3071 +msgid "" +"This will allow fullscreen playback of 4:3 content transmitted in a 16:9 " +"frame." msgstr "" -#: src/input/input_dvb.c:3176 +#: src/input/input_dvb.c:3261 msgid "DVB (Digital TV) input plugin" msgstr "" -#: src/input/input_dvb.c:3308 +#: src/input/input_dvb.c:3281 msgid "Remember last DVB channel watched" msgstr "" -#: src/input/input_dvb.c:3309 -msgid "On autoplay, xine will remember and switch to the channel indicated in media.dvb.last_channel. " +#: src/input/input_dvb.c:3282 +msgid "" +"On autoplay, xine will remember and switch to the channel indicated in media." +"dvb.last_channel. " msgstr "" -#: src/input/input_dvb.c:3316 +#: src/input/input_dvb.c:3289 #, fuzzy msgid "Last DVB channel viewed" msgstr "最終値で新規チャンネル" -#: src/input/input_dvb.c:3317 +#: src/input/input_dvb.c:3290 msgid "If enabled xine will remember and switch to this channel. " msgstr "" -#: src/input/input_dvb.c:3322 +#: src/input/input_dvb.c:3295 msgid "Number of seconds until tuning times out." msgstr "" -#: src/input/input_dvb.c:3323 -msgid "Leave at 0 means try forever. Greater than 0 means wait that many seconds to get a lock. Minimum is 5 seconds." -msgstr "" - -#: src/input/input_dvb.c:3329 -msgid "Number of dvb card to use." -msgstr "使用するDVBカードの数" - -#: src/input/input_dvb.c:3330 -msgid "Leave this at zero unless you really have more than 1 card in your system." +#: src/input/input_dvb.c:3296 +msgid "" +"Leave at 0 means try forever. Greater than 0 means wait that many seconds to " +"get a lock. Minimum is 5 seconds." msgstr "" -#: src/input/input_dvb.c:3338 +#: src/input/input_dvb.c:3303 #, fuzzy msgid "Enable the DVB GUI" msgstr "Bonobo GUI サポート" -#: src/input/input_dvb.c:3339 +#: src/input/input_dvb.c:3304 msgid "Enable the DVB GUI, mouse controlled recording and channel switching." msgstr "" -#: src/input/input_dvb.c:3345 -#, fuzzy -msgid "DVB Channels config file" -msgstr "設定ファイル '%s' は空です" +#: src/input/input_dvb.c:3309 +msgid "Number of dvb card to use." +msgstr "使用するDVBカードの数" -#: src/input/input_dvb.c:3346 -msgid "DVB Channels config file to use instead of the ~/.xine/channels.conf file." +#: src/input/input_dvb.c:3310 +msgid "" +"Leave this at zero unless you really have more than 1 card in your system." msgstr "" -#: src/input/input_dvd.c:596 +#: src/input/input_dvd.c:595 #, c-format msgid "input_dvd: values of \\beta will give rise to dom!\n" msgstr "" -#: src/input/input_dvd.c:615 +#: src/input/input_dvd.c:614 #, c-format msgid "input_dvd: Error getting next block from DVD (%s)\n" msgstr "" @@ -1599,117 +1635,134 @@ msgstr "" msgid "input_dvd: Error opening DVD device\n" msgstr "" -#: src/input/input_dvd.c:1792 +#: src/input/input_dvd.c:1766 +msgid "DVD Navigator" +msgstr "" + +#: src/input/input_dvd.c:1783 msgid "device used for DVD playback" msgstr "DVD ドライブとして使用するデバイス" -#: src/input/input_dvd.c:1793 -msgid "The path to the device, usually a DVD drive, which you intend to use for playing DVDs." +#: src/input/input_dvd.c:1784 +msgid "" +"The path to the device, usually a DVD drive, which you intend to use for " +"playing DVDs." msgstr "" -#: src/input/input_dvd.c:1811 +#: src/input/input_dvd.c:1801 msgid "raw device set up for DVD access" msgstr "" -#: src/input/input_dvd.c:1812 +#: src/input/input_dvd.c:1802 msgid "" -"If this points to a raw device connected to your DVD device, xine will use the raw device for playback. This has the advantage of being slightly faster and of bypassing the block device cache, which avoids throwing away important cache content by keeping DVD data cached. Using the block device cache for DVDs is useless, because almost all DVD data will be used only once.\n" +"If this points to a raw device connected to your DVD device, xine will use " +"the raw device for playback. This has the advantage of being slightly faster " +"and of bypassing the block device cache, which avoids throwing away " +"important cache content by keeping DVD data cached. Using the block device " +"cache for DVDs is useless, because almost all DVD data will be used only " +"once.\n" "See the documentation on raw device setup (man raw) for further information." msgstr "" -#: src/input/input_dvd.c:1825 +#: src/input/input_dvd.c:1815 #, fuzzy msgid "CSS decryption method" msgstr "未知のデバイス操作です" -#: src/input/input_dvd.c:1826 -msgid "Selects the decryption method libdvdcss will use to descramble copy protected DVDs. Try the various methods, if you have problems playing scrambled DVDs." -msgstr "" - -#: src/input/input_dvd.c:1833 -#, fuzzy -msgid "path to the title key cache" -msgstr "キャッシュ生成時に相対パス `%s' が使用されました" - -#: src/input/input_dvd.c:1834 +#: src/input/input_dvd.c:1816 msgid "" -"Since cracking the copy protection of scrambled DVDs can be quite time consuming, libdvdcss will cache the cracked keys in this directory.\n" -"This setting is security critical, because files with uncontrollable names will be created in this directory. Be sure to use a dedicated directory not used for anything but DVD key caching." +"Selects the decryption method libdvdcss will use to descramble copy " +"protected DVDs. Try the various methods, if you have problems playing " +"scrambled DVDs." msgstr "" -#: src/input/input_dvd.c:1856 +#: src/input/input_dvd.c:1831 msgid "region the DVD player claims to be in (1 to 8)" msgstr "" -#: src/input/input_dvd.c:1857 -msgid "This only needs to be changed if your DVD jumps to a screen complaining about a wrong region code. It has nothing to do with the region code set in DVD drives, this is purely software." +#: src/input/input_dvd.c:1832 +msgid "" +"This only needs to be changed if your DVD jumps to a screen complaining " +"about a wrong region code. It has nothing to do with the region code set in " +"DVD drives, this is purely software." msgstr "" -#: src/input/input_dvd.c:1863 +#: src/input/input_dvd.c:1838 msgid "default language for DVD playback" msgstr "" -#: src/input/input_dvd.c:1864 +#: src/input/input_dvd.c:1839 msgid "" -"xine tries to use this language as a default for DVD playback. As far as the DVD supports it, menus and audio tracks will be presented in this language.\n" +"xine tries to use this language as a default for DVD playback. As far as the " +"DVD supports it, menus and audio tracks will be presented in this language.\n" "The value must be a two character ISO639 language code." msgstr "" -#: src/input/input_dvd.c:1870 +#: src/input/input_dvd.c:1845 #, fuzzy msgid "read-ahead caching" msgstr "" "\n" "続けますか? (y または n) " -#: src/input/input_dvd.c:1871 +#: src/input/input_dvd.c:1846 msgid "" "xine can use a read ahead cache for DVD drive access.\n" -"This may lead to jerky playback on slow drives, but it improves the impact of the DVD layer change on faster drives." +"This may lead to jerky playback on slow drives, but it improves the impact " +"of the DVD layer change on faster drives." msgstr "" -#: src/input/input_dvd.c:1877 +#: src/input/input_dvd.c:1852 #, fuzzy msgid "unit for the skip action" msgstr "アクション・グループの名前です" -#: src/input/input_dvd.c:1878 +#: src/input/input_dvd.c:1853 msgid "" -"You can configure the behaviour when issuing a skip command (using the skip buttons for example). The individual values mean:\n" +"You can configure the behaviour when issuing a skip command (using the skip " +"buttons for example). The individual values mean:\n" "\n" "skip program\n" -"will skip a DVD program, which is a navigational unit similar to the index marks on an audio CD; this is the normal behaviour for DVD players\n" +"will skip a DVD program, which is a navigational unit similar to the index " +"marks on an audio CD; this is the normal behaviour for DVD players\n" "\n" "skip part\n" -"will skip a DVD part, which is a structural unit similar to the track marks on an audio CD; parts usually coincide with programs, but parts can be larger than programs\n" +"will skip a DVD part, which is a structural unit similar to the track marks " +"on an audio CD; parts usually coincide with programs, but parts can be " +"larger than programs\n" "\n" "skip title\n" -"will skip a DVD title, which is a structural unit representing entire features on the DVD" +"will skip a DVD title, which is a structural unit representing entire " +"features on the DVD" msgstr "" -#: src/input/input_dvd.c:1893 +#: src/input/input_dvd.c:1868 #, fuzzy msgid "unit for seeking" msgstr "単位の省略形 (例 \"cm\" ならばセンチメートル)。" -#: src/input/input_dvd.c:1894 +#: src/input/input_dvd.c:1869 msgid "" -"You can configure the domain spanned by the seek slider. The individual values mean:\n" +"You can configure the domain spanned by the seek slider. The individual " +"values mean:\n" "\n" "seek in program chain\n" -"seeking will span an entire DVD program chain, which is a navigational unit representing the entire video stream of the current feature\n" +"seeking will span an entire DVD program chain, which is a navigational unit " +"representing the entire video stream of the current feature\n" "\n" "seek in program\n" -"seeking will span a DVD program, which is a navigational unit representing a chapter of the current feature" +"seeking will span a DVD program, which is a navigational unit representing a " +"chapter of the current feature" msgstr "" -#: src/input/input_dvd.c:1905 +#: src/input/input_dvd.c:1880 msgid "play mode when title/chapter is given" msgstr "" -#: src/input/input_dvd.c:1906 +#: src/input/input_dvd.c:1881 msgid "" -"You can configure the behaviour when playing a dvd from a given title/chapter (eg. using MRL 'dvd:/1.2'). The individual values mean:\n" +"You can configure the behaviour when playing a dvd from a given title/" +"chapter (eg. using MRL 'dvd:/1.2'). The individual values mean:\n" "\n" "entire dvd\n" "play the entire dvd starting on the specified position.\n" @@ -1723,248 +1776,245 @@ msgstr "" msgid "input_file: read error (%s)\n" msgstr "ファイル '%s' 上にエラーがあります: %s\n" -#: src/input/input_file.c:371 +#: src/input/input_file.c:368 #, fuzzy, c-format msgid "input_file: Permission denied: >%s<\n" msgstr "%s: 入力ファイルが出力ファイルが同じファイルです" -#: src/input/input_file.c:375 +#: src/input/input_file.c:372 #, fuzzy, c-format msgid "input_file: File not found: >%s<\n" msgstr "入力ファイル %s が見つかりません.\n" -#: src/input/input_file.c:414 -#: src/input/input_gnome_vfs.c:297 +#: src/input/input_file.c:413 src/input/input_gnome_vfs.c:286 #, fuzzy, c-format msgid "input_file: File empty: >%s<\n" msgstr "通常の空ファイル" -#: src/input/input_file.c:635 +#: src/input/input_file.c:968 #, fuzzy msgid "file input plugin" msgstr "入力ファイルが縮んだ" -#: src/input/input_file.c:994 +#: src/input/input_file.c:985 #, fuzzy msgid "file browsing start location" msgstr " --sort-by-file ファイルで出力をソート\n" -#: src/input/input_file.c:995 +#: src/input/input_file.c:986 msgid "The browser to select the file to play will start at this location." msgstr "" -#: src/input/input_file.c:1002 +#: src/input/input_file.c:993 msgid "list hidden files" msgstr "隠しファイルを表示する" -#: src/input/input_file.c:1003 -msgid "If enabled, the browser to select the file to play will also show hidden files." +#: src/input/input_file.c:994 +msgid "" +"If enabled, the browser to select the file to play will also show hidden " +"files." msgstr "" -#: src/input/input_gnome_vfs.c:223 +#: src/input/input_gnome_vfs.c:374 msgid "gnome-vfs input plugin as shipped with xine" msgstr "" -#: src/input/input_http.c:180 +#: src/input/input_http.c:181 #, fuzzy, c-format msgid "input_http: gethostbyname(%s) failed: %s\n" msgstr "HTTP による接続要求の送信に失敗しました: %s\n" -#: src/input/input_http.c:415 -#: src/input/input_http.c:1015 +#: src/input/input_http.c:380 src/input/input_http.c:987 #, fuzzy, c-format msgid "input_http: read error %d\n" msgstr "標準入力上の読み込みエラーです" -#: src/input/input_http.c:656 +#: src/input/input_http.c:621 msgid "Connecting HTTP server..." msgstr "HTTP サーバへ接続中..." -#: src/input/input_http.c:848 +#: src/input/input_http.c:808 #, fuzzy, c-format msgid "input_http: invalid http answer\n" msgstr "HTTP プロキシのホスト名が無効です。" -#: src/input/input_http.c:854 +#: src/input/input_http.c:814 #, fuzzy, c-format msgid "input_http: 3xx redirection: >%d %s<\n" msgstr "HTTP リダイレクションは実装されていません" -#: src/input/input_http.c:859 -#: src/input/input_http.c:865 -#: src/input/input_http.c:872 +#: src/input/input_http.c:819 src/input/input_http.c:824 +#: src/input/input_http.c:830 src/input/input_http.c:837 #, c-format msgid "input_http: http status not 2xx: >%d %s<\n" msgstr "" -#: src/input/input_http.c:882 +#: src/input/input_http.c:847 #, c-format msgid "input_http: content length = %<PRIdMAX> bytes\n" msgstr "" -#: src/input/input_http.c:969 +#: src/input/input_http.c:937 #, c-format msgid "input_http: buffer exhausted after %d bytes." msgstr "" -#: src/input/input_http.c:1070 +#: src/input/input_http.c:1062 #, fuzzy msgid "http input plugin" msgstr "自動再生入力プラグイン '%s' が失敗しました" -#: src/input/input_http.c:1132 +#: src/input/input_http.c:1095 #, fuzzy msgid "HTTP proxy host" msgstr "HTTP プロキシのホスト名" -#: src/input/input_http.c:1132 +#: src/input/input_http.c:1095 #, fuzzy msgid "The hostname of the HTTP proxy." msgstr "HTTP プロキシのホスト名が無効です。" -#: src/input/input_http.c:1136 +#: src/input/input_http.c:1099 #, fuzzy msgid "HTTP proxy port" msgstr "HTTP プロキシのポート番号" -#: src/input/input_http.c:1136 +#: src/input/input_http.c:1099 #, fuzzy msgid "The port number of the HTTP proxy." msgstr "セキュア HTTP プロキシのポート番号" -#: src/input/input_http.c:1146 +#: src/input/input_http.c:1109 #, fuzzy msgid "HTTP proxy username" msgstr "HTTP プロキシのユーザ名" -#: src/input/input_http.c:1147 +#: src/input/input_http.c:1110 #, fuzzy msgid "The user name for the HTTP proxy." msgstr "HTTP プロキシのホスト名が無効です。" -#: src/input/input_http.c:1150 +#: src/input/input_http.c:1113 #, fuzzy msgid "HTTP proxy password" msgstr "HTTP プロキシのパスワード" -#: src/input/input_http.c:1151 +#: src/input/input_http.c:1114 #, fuzzy msgid "The password for the HTTP proxy." msgstr "HTTP プロキシのホスト名が無効です。" -#: src/input/input_http.c:1154 +#: src/input/input_http.c:1117 msgid "Domains for which to ignore the HTTP proxy" msgstr "" -#: src/input/input_http.c:1155 +#: src/input/input_http.c:1118 msgid "" -"A comma-separated list of domain names for which the proxy is to be ignored.\n" -"If a domain name is prefixed with '=' then it is treated as a host name only (full match required)." +"A comma-separated list of domain names for which the proxy is to be " +"ignored.\n" +"If a domain name is prefixed with '=' then it is treated as a host name only " +"(full match required)." msgstr "" -#: src/input/input_mms.c:448 +#: src/input/input_mms.c:467 #, fuzzy msgid "mms streaming input plugin" msgstr "自動再生入力プラグイン '%s' が失敗しました" -#: src/input/input_mms.c:484 -#: src/input/librtsp/rtsp_session.c:95 +#: src/input/input_mms.c:475 src/input/librtsp/rtsp_session.c:95 msgid "network bandwidth" msgstr "ネットワークの帯域幅" -#: src/input/input_mms.c:485 -#: src/input/librtsp/rtsp_session.c:96 -msgid "Specify the bandwidth of your internet connection here. This will be used when streaming servers offer different versions with different bandwidth requirements of the same stream." +#: src/input/input_mms.c:476 src/input/librtsp/rtsp_session.c:96 +msgid "" +"Specify the bandwidth of your internet connection here. This will be used " +"when streaming servers offer different versions with different bandwidth " +"requirements of the same stream." msgstr "" -#: src/input/input_mms.c:494 +#: src/input/input_mms.c:485 msgid "MMS protocol" msgstr "MMSプロトコル" -#: src/input/input_mms.c:495 +#: src/input/input_mms.c:486 msgid "" "Select the protocol to encapsulate MMS.\n" "TCP is better but you may need HTTP behind a firewall." msgstr "" -#: src/input/input_net.c:121 -#: src/input/input_net.c:151 +#: src/input/input_net.c:121 src/input/input_net.c:151 #, fuzzy, c-format msgid "input_net: socket(): %s\n" msgstr "Query status=2 (SOCKET)\n" -#: src/input/input_net.c:136 -#: src/input/input_net.c:162 +#: src/input/input_net.c:136 src/input/input_net.c:162 #, fuzzy, c-format msgid "input_net: connect(): %s\n" msgstr "デジタル交差接続" -#: src/input/input_net.c:180 -#: src/input/input_net.c:222 +#: src/input/input_net.c:180 src/input/input_net.c:222 #, fuzzy, c-format msgid "input_net: unable to resolve '%s'.\n" -msgstr "%s: バインドしようとしたアドレス `%s' を解決できませんでした; バインドを禁止します。\n" +msgstr "" +"%s: バインドしようとしたアドレス `%s' を解決できませんでした; バインドを禁止" +"します。\n" -#: src/input/input_net.c:193 -#: src/input/input_net.c:239 +#: src/input/input_net.c:193 src/input/input_net.c:239 #, fuzzy, c-format msgid "input_net: unable to connect to '%s'.\n" msgstr "lpadmin: サーバに接続できません: %s\n" -#: src/input/input_net.c:524 +#: src/input/input_net.c:533 msgid "net input plugin as shipped with xine" msgstr "" -#: src/input/input_pnm.c:274 +#: src/input/input_pnm.c:284 #, fuzzy msgid "pnm streaming input plugin" msgstr "自動再生入力プラグイン '%s' が失敗しました" -#: src/input/input_pvr.c:589 +#: src/input/input_pvr.c:590 #, fuzzy, c-format msgid "input_pvr: error creating pvr file (%s)\n" msgstr "%s エラー: 適切な入力ファイル %s が必要です\n" -#: src/input/input_pvr.c:746 +#: src/input/input_pvr.c:747 #, fuzzy, c-format msgid "input_pvr: error opening pvr file (%s)\n" msgstr "ファイルをオープンする際にエラーが発生しました。" -#: src/input/input_pvr.c:822 +#: src/input/input_pvr.c:823 #, fuzzy, c-format msgid "input_pvr: read error (%s)\n" msgstr "標準入力上の読み込みエラーです" -#: src/input/input_pvr.c:1161 -#: src/input/input_pvr.c:1421 +#: src/input/input_pvr.c:1162 src/input/input_pvr.c:1422 #, c-format msgid "input_pvr: error opening device %s\n" msgstr "" -#: src/input/input_pvr.c:1167 -#: src/input/input_pvr.c:1427 +#: src/input/input_pvr.c:1168 src/input/input_pvr.c:1428 #, c-format msgid "input_pvr: IVTV_IOC_G_CODEC failed, maybe API changed?\n" msgstr "" -#: src/input/input_pvr.c:1175 -#: src/input/input_pvr.c:1436 +#: src/input/input_pvr.c:1176 src/input/input_pvr.c:1437 #, c-format msgid "input_pvr: IVTV_IOC_S_CODEC failed, maybe API changed?\n" msgstr "" -#: src/input/input_pvr.c:1544 -msgid "WinTV-PVR 250/350 input plugin" -msgstr "" - -#: src/input/input_pvr.c:1570 +#: src/input/input_pvr.c:1555 msgid "device used for WinTV-PVR 250/350 (pvr plugin)" msgstr "" -#: src/input/input_pvr.c:1571 +#: src/input/input_pvr.c:1556 msgid "The path to the device of your WinTV card." msgstr "" +#: src/input/input_pvr.c:1562 +msgid "WinTV-PVR 250/350 input plugin" +msgstr "" + #: src/input/input_rtp.c:183 #, fuzzy, c-format msgid "socket(): %s.\n" @@ -2014,155 +2064,161 @@ msgstr "'%s' に接続できません\n" msgid "recv(): %s.\n" msgstr "recv(): %s.\n" -#: src/input/input_rtp.c:642 +#: src/input/input_rtp.c:643 msgid "RTP: stopping reading thread...\n" msgstr "" -#: src/input/input_rtp.c:645 +#: src/input/input_rtp.c:646 msgid "RTP: reading thread terminated\n" msgstr "" -#: src/input/input_rtp.c:660 +#: src/input/input_rtp.c:661 #, c-format msgid "Opening >filename:%s port:%d interface:%s<\n" msgstr "" -#: src/input/input_rtp.c:677 +#: src/input/input_rtp.c:678 #, c-format msgid "input_rtp: can't create new thread (%s)\n" msgstr "" -#: src/input/input_rtp.c:781 +#: src/input/input_rtp.c:790 msgid "RTP and UDP input plugin as shipped with xine" msgstr "" -#: src/input/input_rtsp.c:295 +#: src/input/input_rtsp.c:303 #, fuzzy msgid "rtsp streaming input plugin" msgstr "自動再生入力プラグイン '%s' が失敗しました" -#: src/input/input_smb.c:165 +#: src/input/input_smb.c:498 msgid "CIFS/SMB input plugin based on libsmbclient" msgstr "" -#: src/input/input_stdin_fifo.c:173 +#: src/input/input_stdin_fifo.c:174 #, c-format msgid "stdin: cannot seek back! (%<PRIdMAX> > %<PRIdMAX>)\n" msgstr "" -#: src/input/input_stdin_fifo.c:261 +#: src/input/input_stdin_fifo.c:262 #, fuzzy, c-format msgid "stdin: failed to open '%s'\n" msgstr "ファイル '%s' のオープンに失敗しました: %s" -#: src/input/input_stdin_fifo.c:359 +#: src/input/input_stdin_fifo.c:368 #, fuzzy msgid "stdin streaming input plugin" msgstr "自動再生入力プラグイン '%s' が失敗しました" -#: src/input/input_v4l.c:385 +#: src/input/input_v4l.c:409 #, fuzzy msgid "Buffer underrun..." msgstr "シンプル・バッファ" -#: src/input/input_v4l.c:389 +#: src/input/input_v4l.c:413 #, fuzzy msgid "Buffer overrun..." msgstr "シンプル・バッファ" -#: src/input/input_v4l.c:392 +#: src/input/input_v4l.c:416 msgid "Adjusting..." msgstr "調整しています..." -#: src/input/input_v4l.c:671 +#: src/input/input_v4l.c:696 #, c-format msgid "Tuner name not found\n" msgstr "チューナーの名前が見つかりません\n" -#: src/input/input_v4l.c:1870 +#: src/input/input_v4l.c:1908 #, fuzzy msgid "v4l tv input plugin" msgstr "自動再生入力プラグイン '%s' が失敗しました" -#: src/input/input_v4l.c:1874 -#, fuzzy -msgid "v4l radio input plugin" -msgstr "自動再生入力プラグイン '%s' が失敗しました" - -#: src/input/input_v4l.c:1906 +#: src/input/input_v4l.c:1916 #, fuzzy msgid "v4l video device" msgstr "デバイス番号が違います" -#: src/input/input_v4l.c:1907 +#: src/input/input_v4l.c:1917 msgid "The path to your Video4Linux video device." msgstr "" -#: src/input/input_v4l.c:1912 +#: src/input/input_v4l.c:1922 msgid "v4l ALSA audio input device" msgstr "" -#: src/input/input_v4l.c:1913 -msgid "The name of the audio device which corresponds to your Video4Linux video device." +#: src/input/input_v4l.c:1923 +msgid "" +"The name of the audio device which corresponds to your Video4Linux video " +"device." msgstr "" -#: src/input/input_v4l.c:1918 +#: src/input/input_v4l.c:1928 #, fuzzy msgid "v4l TV standard" msgstr "標準モニカのファクトリ" -#: src/input/input_v4l.c:1919 -msgid "Selects the TV standard of the input signals. Either: AUTO, PAL, NTSC or SECAM. " +#: src/input/input_v4l.c:1929 +msgid "" +"Selects the TV standard of the input signals. Either: AUTO, PAL, NTSC or " +"SECAM. " msgstr "" -#: src/input/input_v4l.c:1944 +#: src/input/input_v4l.c:1946 +#, fuzzy +msgid "v4l radio input plugin" +msgstr "自動再生入力プラグイン '%s' が失敗しました" + +#: src/input/input_v4l.c:1954 #, fuzzy msgid "v4l radio device" msgstr "デバイス番号が違います" -#: src/input/input_v4l.c:1945 +#: src/input/input_v4l.c:1955 msgid "The path to your Video4Linux radio device." msgstr "" -#: src/input/input_vcd.c:848 +#: src/input/input_vcd.c:851 #, c-format msgid "input_vcd: malformed MRL. Use vcdo:/<track #>\n" msgstr "" -#: src/input/input_vcd.c:854 +#: src/input/input_vcd.c:857 #, c-format msgid "input_vcd: invalid track %d (valid range: 0 .. %d)\n" msgstr "" -#: src/input/input_vcd.c:925 -#, fuzzy -msgid "Video CD input plugin" -msgstr "自動再生入力プラグイン '%s' が失敗しました" - -#: src/input/input_vcd.c:979 +#: src/input/input_vcd.c:973 #, fuzzy, c-format msgid "unable to open %s: %s.\n" msgstr "'%s' をオープンできません" -#: src/input/input_vcd.c:1041 +#: src/input/input_vcd.c:1035 #, fuzzy, c-format msgid "input_vcd: unable to open %s: %s.\n" msgstr "標準入力を再オープンできません: %s" -#: src/input/input_vcd.c:1089 +#: src/input/input_vcd.c:1076 +#, fuzzy +msgid "Video CD input plugin" +msgstr "自動再生入力プラグイン '%s' が失敗しました" + +#: src/input/input_vcd.c:1083 msgid "device used for VCD playback" msgstr "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." +#: src/input/input_vcd.c:1084 +msgid "" +"The path to the device, usually a CD or DVD drive, you intend to play your " +"VideoCDs with." msgstr "" -#: src/input/librtsp/rtsp.c:438 +#: src/input/librtsp/rtsp.c:437 #, fuzzy, c-format msgid "rtsp: bad mrl: %s\n" msgstr "MRL が異常です" -#: src/input/librtsp/rtsp.c:496 +#: src/input/librtsp/rtsp.c:495 #, fuzzy, c-format msgid "rtsp: failed to connect to '%s'\n" msgstr "%cMTP による %s への接続に失敗しました。\n" @@ -2179,7 +2235,9 @@ msgstr "" #: src/input/librtsp/rtsp_session.c:157 #, c-format -msgid "rtsp_session: rtsp server returned overly-large headers, session can not be established.\n" +msgid "" +"rtsp_session: rtsp server returned overly-large headers, session can not be " +"established.\n" msgstr "" #: src/input/librtsp/rtsp_session.c:168 @@ -2239,19 +2297,19 @@ msgstr "対応していないプロトコル\n" msgid "Buffering..." msgstr "バッファリング..." -#: src/input/pnm.c:619 +#: src/input/pnm.c:621 #, c-format msgid "" "input_pnm: got message from server while reading stream:\n" "%s\n" msgstr "" -#: src/input/pnm.c:753 +#: src/input/pnm.c:755 #, fuzzy, c-format msgid "input_pnm: failed to connect '%s'\n" msgstr "Service Control Manager に接続できませんでした" -#: src/input/pnm.c:764 +#: src/input/pnm.c:766 #, c-format msgid "input_pnm: failed to set up stream\n" msgstr "" @@ -2306,95 +2364,106 @@ msgstr "" msgid "Invalid current entry type" msgstr "エントリとテーブルの型が一致しません" -#: src/input/vcd/xineplug_inp_vcd.c:1012 -msgid "Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... " -msgstr "" - -#: src/input/vcd/xineplug_inp_vcd.c:1113 +#: src/input/vcd/xineplug_inp_vcd.c:1088 #, fuzzy msgid "selection has no RETURN entry" msgstr "'%s' に対するエントリに URL はありません" -#: src/input/vcd/xineplug_inp_vcd.c:1142 +#: src/input/vcd/xineplug_inp_vcd.c:1117 msgid "DEFAULT selected, but PBC is not on." msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1147 +#: src/input/vcd/xineplug_inp_vcd.c:1122 #, fuzzy msgid "selection has no NEXT entry" msgstr "'%s' に対するエントリに URL はありません" -#: src/input/vcd/xineplug_inp_vcd.c:1155 +#: src/input/vcd/xineplug_inp_vcd.c:1130 #, fuzzy msgid "selection has no PREVIOUS entry" msgstr "'%s' に対するエントリに URL はありません" -#: src/input/vcd/xineplug_inp_vcd.c:1162 +#: src/input/vcd/xineplug_inp_vcd.c:1137 #, fuzzy msgid "Unknown event type: " msgstr "`%s' は不明な圧縮形式です!" -#: src/input/vcd/xineplug_inp_vcd.c:1458 -#: src/input/vcd/xineplug_inp_vcd.c:1505 +#: 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" msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1836 +#: src/input/vcd/xineplug_inp_vcd.c:1753 +msgid "" +"Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... " +msgstr "" + +#: src/input/vcd/xineplug_inp_vcd.c:1811 msgid "VCD default type to use on autoplay" msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1837 -msgid "The VCD play unit to use when none is specified in an MRL, e.g. vcd:// or vcd:///dev/dvd:" +#: src/input/vcd/xineplug_inp_vcd.c:1812 +msgid "" +"The VCD play unit to use when none is specified in an MRL, e.g. vcd:// or " +"vcd:///dev/dvd:" msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1847 +#: src/input/vcd/xineplug_inp_vcd.c:1822 msgid "CD-ROM drive used for VCD when none given" msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1848 -msgid "What to use if no drive specified. If the setting is empty, xine will scan for CD drives." +#: src/input/vcd/xineplug_inp_vcd.c:1823 +msgid "" +"What to use if no drive specified. If the setting is empty, xine will scan " +"for CD drives." msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1858 +#: src/input/vcd/xineplug_inp_vcd.c:1833 #, fuzzy msgid "VCD position slider range" msgstr "ストリーム再生位置スライダ" -#: src/input/vcd/xineplug_inp_vcd.c:1859 -msgid "range that the stream playback position slider represents playing a VCD." +#: src/input/vcd/xineplug_inp_vcd.c:1834 +msgid "" +"range that the stream playback position slider represents playing a VCD." msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1867 +#: src/input/vcd/xineplug_inp_vcd.c:1842 msgid "VCD read-ahead caching?" msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1868 +#: src/input/vcd/xineplug_inp_vcd.c:1843 msgid "Class may lead to jerky playback on low-end machines." msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1878 +#: src/input/vcd/xineplug_inp_vcd.c:1853 msgid "automatically advance VCD track/entry" msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1879 -msgid "If enabled, we should automatically advance to the next entry or track. Used only when playback control (PBC) is disabled." +#: src/input/vcd/xineplug_inp_vcd.c:1854 +msgid "" +"If enabled, we should automatically advance to the next entry or track. Used " +"only when playback control (PBC) is disabled." msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1888 +#: src/input/vcd/xineplug_inp_vcd.c:1863 msgid "show 'rejected' VCD LIDs" msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1889 -msgid "Some playback list IDs (LIDs) are marked not showable, but you can see them in the MRL list if this is set. Rejected entries are marked with an asterisk (*) appended to the MRL." +#: src/input/vcd/xineplug_inp_vcd.c:1864 +msgid "" +"Some playback list IDs (LIDs) are marked not showable, but you can see them " +"in the MRL list if this is set. Rejected entries are marked with an asterisk " +"(*) appended to the MRL." msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1900 +#: src/input/vcd/xineplug_inp_vcd.c:1875 msgid "VCD format string for display banner" msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1901 +#: src/input/vcd/xineplug_inp_vcd.c:1876 msgid "" -"VCD format used in the GUI Title. Similar to the Unix date command. Format specifiers start with a percent sign. Specifiers are:\n" +"VCD format used in the GUI Title. Similar to the Unix date command. Format " +"specifiers start with a percent sign. Specifiers are:\n" " %A : The album information\n" " %C : The VCD volume count - the number of CD's in the collection.\n" " %c : The VCD volume num - the number of the CD in the collection.\n" @@ -2412,21 +2481,23 @@ msgid "" " %% : a %\n" msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1926 +#: src/input/vcd/xineplug_inp_vcd.c:1901 msgid "VCD format string for stream comment field" msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1927 +#: src/input/vcd/xineplug_inp_vcd.c:1902 msgid "" -"VCD format used in the GUI Title. Similar to the Unix date command. Format specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, %N, %P, %p, %S, %T, %V, %v, and %%.\n" +"VCD format used in the GUI Title. Similar to the Unix date command. Format " +"specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, " +"%N, %P, %p, %S, %T, %V, %v, and %%.\n" "See the help for the title_format for the meanings of these." msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1939 +#: src/input/vcd/xineplug_inp_vcd.c:1914 msgid "VCD debug flag mask" msgstr "" -#: src/input/vcd/xineplug_inp_vcd.c:1940 +#: src/input/vcd/xineplug_inp_vcd.c:1915 msgid "" "For tracking down bugs in the VCD plugin. Mask values are:\n" " 1: Meta information\n" @@ -2443,76 +2514,171 @@ msgid "" "2048: Debugging from VCDINFO\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:757 -#: src/libdts/xine_dts_decoder.c:560 +#: src/combined/ffmpeg/ff_audio_decoder.c:81 #, c-format -msgid "HELP! a mono-only audio driver?!\n" +msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:820 -#, fuzzy -msgid "A/52 volume" -msgstr "--ボリュームヘッダ--\n" +#: src/combined/ffmpeg/ff_audio_decoder.c:124 +#, c-format +msgid "ffmpeg_audio_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" +msgstr "" -#: src/liba52/xine_a52_decoder.c:821 -msgid "With A/52 audio, you can modify the volume at the decoder level. This has the advantage of the audio being already decoded for the specified volume, so later operations like channel downmixing will work on an audio stream of the given volume." +#: src/combined/ffmpeg/ff_audio_decoder.c:261 +#, c-format +msgid "ffmpeg_audio_dec: trying to open null codec\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:829 -msgid "use A/52 dynamic range compression" +#: src/combined/ffmpeg/ff_audio_decoder.c:270 +#, c-format +msgid "ffmpeg_audio_dec: couldn't open decoder\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:830 -msgid "Dynamic range compression limits the dynamic range of the audio. This means making the loud sounds softer, and the soft sounds louder, so you can more easily listen to the audio in a noisy environment without disturbing anyone." +#: src/combined/ffmpeg/ff_audio_decoder.c:473 +msgid "ffmpeg based audio decoder plugin" msgstr "" -#: src/liba52/xine_a52_decoder.c:837 -msgid "downmix audio to 2 channel surround stereo" +#: src/audio_dec/ff_dvaudio_decoder.c:258 +#, c-format +msgid "dvaudio: increasing buffer to %d to avoid overflow.\n" msgstr "" -#: src/liba52/xine_a52_decoder.c:838 -msgid "When you want to listen to multichannel surround sound, but you have only two speakers or a surround decoder or amplifier which does some sort of matrix surround decoding like prologic, you should enable this option so that the additional channels are mixed into the stereo signal." +#: src/audio_dec/ff_dvaudio_decoder.c:369 +#, fuzzy +msgid "dv audio decoder plugin" +msgstr "自動再生入力プラグイン '%s' が失敗しました" + +#: src/dxr3/ffmpeg_encoder.c:170 +msgid "libavcodec mpeg output bitrate (kbit/s)" msgstr "" -#: src/libfaad/xine_faad_decoder.c:136 -#, fuzzy, c-format -msgid "libfaad: libfaad NeAACDecOpen() failed.\n" -msgstr "文字列の比較に失敗" +#: src/dxr3/ffmpeg_encoder.c:171 +msgid "" +"The bitrate the libavcodec mpeg encoder should use for DXR3's encoding mode. " +"Higher values will increase quality and CPU usage.\n" +"This setting is only considered, when constant quality mode is disabled." +msgstr "" -#: src/libfaad/xine_faad_decoder.c:145 -#, fuzzy, c-format -msgid "libfaad: libfaad NeAACDecInit2 failed.\n" -msgstr "文字列の比較に失敗" +#: src/dxr3/ffmpeg_encoder.c:178 +#, fuzzy +msgid "constant quality mode" +msgstr "サイズと品質モード" -#: src/libfaad/xine_faad_decoder.c:156 -#, fuzzy, c-format -msgid "libfaad: libfaad NeAACDecInit failed.\n" -msgstr "文字列の比較に失敗" +#: src/dxr3/ffmpeg_encoder.c:179 +msgid "" +"When enabled, libavcodec will use a constant quality mode by dynamically " +"compressing the images based on their complexity. When disabled, libavcodec " +"will use constant bitrate mode." +msgstr "" + +#: src/dxr3/ffmpeg_encoder.c:186 +#, fuzzy +msgid "minimum compression" +msgstr "圧縮の設定" + +#: src/dxr3/ffmpeg_encoder.c:187 +msgid "The minimum compression to apply to an image in constant quality mode." +msgstr "" + +#: src/dxr3/ffmpeg_encoder.c:192 +#, fuzzy +msgid "maximum quantizer" +msgstr "最大帯域幅:" -#: src/libmusepack/xine_musepack_decoder.c:287 +#: src/dxr3/ffmpeg_encoder.c:193 +msgid "The maximum compression to apply to an image in constant quality mode." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:166 #, c-format -msgid "libmusepack: mpc_demux_init failed.\n" +msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n" msgstr "" -#: src/libmusepack/xine_musepack_decoder.c:298 +#: src/combined/ffmpeg/ff_video_decoder.c:184 #, c-format -msgid "libmusepack: mpc_streaminfo_read failed: %d\n" +msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n" msgstr "" -#: src/libmusepack/xine_musepack_decoder.c:379 +#: src/combined/ffmpeg/ff_video_decoder.c:293 #, c-format -msgid "libmusepack: data after last frame ignored\n" +msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n" msgstr "" -#: src/libmusepack/xine_musepack_decoder.c:394 +#: src/combined/ffmpeg/ff_video_decoder.c:320 #, c-format -msgid "libmusepack: mpc_decoder_initialise failed\n" +msgid "ffmpeg_video_dec: couldn't open decoder\n" msgstr "" -#: src/libmusepack/xine_musepack_decoder.c:414 -#: src/libmusepack/xine_musepack_decoder.c:433 +#: src/combined/ffmpeg/ff_video_decoder.c:335 #, c-format -msgid "libmusepack: mpc_decoder_decode failed: %d\n" +msgid "ffmpeg_video_dec: couldn't open decoder (pass 2)\n" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:380 +#, c-format +msgid "ffmpeg_video_dec: direct rendering enabled\n" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:829 +#, c-format +msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1710 +msgid "ffmpeg based video decoder plugin" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1722 +#, fuzzy +msgid "MPEG-4 postprocessing quality" +msgstr "高 (普通の品質)" + +#: src/combined/ffmpeg/ff_video_decoder.c:1723 +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 " +"result in image defects like block artifacts. For high quality content, too " +"heavy post processing can actually make the image worse by blurring it too " +"much." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1731 +msgid "FFmpeg video decoding thread count" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1732 +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).\n" +"A change of this setting will take effect with playing the next stream." +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1741 +#, fuzzy +msgid "Skip loop filter" +msgstr "高域通過フィルタ" + +#: src/combined/ffmpeg/ff_video_decoder.c:1742 +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:1751 +msgid "Choose speed over specification compliance" +msgstr "" + +#: src/combined/ffmpeg/ff_video_decoder.c:1752 +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 @@ -2521,12 +2687,12 @@ msgid "path to RealPlayer codecs" msgstr "パスを SVG 形式でエクスポート" #: src/libreal/real_common.c:140 -msgid "If you have RealPlayer installed, specify the path to its codec directory here. You can easily find the codec directory by looking for a file named \"drvc.so\" in it. If xine can find the RealPlayer codecs, it will use them to decode RealPlayer content for you. Consult the xine FAQ for more information on how to install the codecs." -msgstr "" - -#: src/libreal/xine_real_video_decoder.c:174 -#, c-format -msgid "libreal: Error resolving symbols! (version incompatibility?)\n" +msgid "" +"If you have RealPlayer installed, specify the path to its codec directory " +"here. You can easily find the codec directory by looking for a file named " +"\"drvc.so\" in it. If xine can find the RealPlayer codecs, it will use them " +"to decode RealPlayer content for you. Consult the xine FAQ for more " +"information on how to install the codecs." msgstr "" #: src/libreal/xine_real_audio_decoder.c:134 @@ -2549,129 +2715,178 @@ msgstr "" msgid "libareal: oups, real can do more than 2 channels ?\n" msgstr "" -#: src/libspucc/xine_cc_decoder.c:199 +#: src/libreal/xine_real_audio_decoder.c:509 +msgid "real binary-only codec based audio decoder plugin" +msgstr "" + +#: src/libreal/xine_real_video_decoder.c:174 +#, c-format +msgid "libreal: Error resolving symbols! (version incompatibility?)\n" +msgstr "" + +#: src/libreal/xine_real_video_decoder.c:532 +msgid "real binary-only codec based video decoder plugin" +msgstr "" + +#: src/spu_dec/xine_cc_decoder.c:199 msgid "display closed captions in MPEG-2 streams" msgstr "" -#: src/libspucc/xine_cc_decoder.c:200 -msgid "Closed Captions are subtitles mostly meant to help the hearing impaired." +#: src/spu_dec/xine_cc_decoder.c:200 +msgid "" +"Closed Captions are subtitles mostly meant to help the hearing impaired." msgstr "" -#: src/libspucc/xine_cc_decoder.c:207 +#: src/spu_dec/xine_cc_decoder.c:207 msgid "closed-captioning foreground/background scheme" msgstr "" -#: src/libspucc/xine_cc_decoder.c:208 +#: src/spu_dec/xine_cc_decoder.c:208 msgid "Choose your favourite rendering of the closed captions." msgstr "" -#: src/libspucc/xine_cc_decoder.c:214 +#: src/spu_dec/xine_cc_decoder.c:214 #, fuzzy msgid "standard closed captioning font" msgstr "標準入力が閉じられています" -#: src/libspucc/xine_cc_decoder.c:215 +#: src/spu_dec/xine_cc_decoder.c:215 msgid "Choose the font for standard closed captions text." msgstr "" -#: src/libspucc/xine_cc_decoder.c:221 +#: src/spu_dec/xine_cc_decoder.c:221 #, fuzzy msgid "italic closed captioning font" msgstr "PangoStyle によるフォント記述 (例: PANGO_STYLE_ITALIC)" -#: src/libspucc/xine_cc_decoder.c:222 +#: src/spu_dec/xine_cc_decoder.c:222 msgid "Choose the font for italic closed captions text." msgstr "" -#: src/libspucc/xine_cc_decoder.c:228 +#: src/spu_dec/xine_cc_decoder.c:228 #, fuzzy msgid "closed captioning font size" msgstr "ポイント単位でのフォントの大きさ" -#: src/libspucc/xine_cc_decoder.c:229 +#: src/spu_dec/xine_cc_decoder.c:229 msgid "Choose the font size for closed captions text." msgstr "" -#: src/libspucc/xine_cc_decoder.c:233 +#: src/spu_dec/xine_cc_decoder.c:233 msgid "center-adjust closed captions" msgstr "" -#: src/libspucc/xine_cc_decoder.c:234 -msgid "When enabled, closed captions will be positioned by the center of the individual lines." +#: src/spu_dec/xine_cc_decoder.c:234 +msgid "" +"When enabled, closed captions will be positioned by the center of the " +"individual lines." msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:468 +#: src/spu_dec/xine_cc_decoder.c:340 +#, fuzzy +msgid "closed caption decoder plugin" +msgstr "ポイント単位でのフォントの大きさ" + +#: src/spu_dec/cmml_decoder.c:468 #, fuzzy msgid "font for external subtitles" msgstr "ラベルのフォント・サイズ" -#: src/libspucmml/xine_cmml_decoder.c:474 +#: src/spu_dec/cmml_decoder.c:474 msgid "subtitle vertical offset (relative window size)" msgstr "" -#: src/libspucmml/xine_cmml_decoder.c:517 +#: src/spu_dec/cmml_decoder.c:497 +msgid "CMML subtitle decoder plugin" +msgstr "" + +#: src/spu_dec/cmml_decoder.c:505 #, fuzzy msgid "encoding of subtitles" msgstr "サブタイトルを表示" -#: src/libsputext/demux_sputext.c:1479 +#: src/spu_dec/sputext_demuxer.c:1429 +#, fuzzy +msgid "sputext demuxer plugin" +msgstr "みつかった xine ライブラリバージョン: %d.%d.%d (%s).\n" + +#: src/spu_dec/sputext_demuxer.c:1444 msgid "default duration of subtitle display in seconds" msgstr "" -#: src/libsputext/demux_sputext.c:1480 -msgid "Some subtitle formats do not explicitly give a duration for each subtitle. For these, you can set a default duration here. Setting to zero will result in the subtitle being shown until the next one takes over." +#: src/spu_dec/sputext_demuxer.c:1445 +msgid "" +"Some subtitle formats do not explicitly give a duration for each subtitle. " +"For these, you can set a default duration here. Setting to zero will result " +"in the subtitle being shown until the next one takes over." +msgstr "" + +#: src/spu_dec/sputext_decoder.c:1128 +msgid "external subtitle decoder plugin" msgstr "" -#: src/libsputext/xine_sputext_decoder.c:1144 +#: src/spu_dec/sputext_decoder.c:1137 msgid "subtitle size" msgstr "字幕のサイズ" -#: src/libsputext/xine_sputext_decoder.c:1145 -msgid "You can adjust the subtitle size here. The setting will be evaluated relative to the window size." +#: src/spu_dec/sputext_decoder.c:1138 +msgid "" +"You can adjust the subtitle size here. The setting will be evaluated " +"relative to the window size." msgstr "" -#: src/libsputext/xine_sputext_decoder.c:1151 +#: src/spu_dec/sputext_decoder.c:1144 #, fuzzy msgid "subtitle vertical offset" msgstr "検索オフセットエラー" -#: src/libsputext/xine_sputext_decoder.c:1152 -msgid "You can adjust the vertical position of the subtitle. The setting will be evaluated relative to the window size." +#: src/spu_dec/sputext_decoder.c:1145 +msgid "" +"You can adjust the vertical position of the subtitle. The setting will be " +"evaluated relative to the window size." msgstr "" -#: src/libsputext/xine_sputext_decoder.c:1158 -#: src/libsputext/xine_sputext_decoder.c:1167 +#: src/spu_dec/sputext_decoder.c:1151 src/spu_dec/sputext_decoder.c:1160 msgid "font for subtitles" msgstr "字幕に使用するフォント" -#: src/libsputext/xine_sputext_decoder.c:1159 +#: src/spu_dec/sputext_decoder.c:1152 msgid "A font from the xine font directory to be used for the subtitle text." msgstr "" -#: src/libsputext/xine_sputext_decoder.c:1168 +#: src/spu_dec/sputext_decoder.c:1161 msgid "An outline font file (e.g. a .ttf) to be used for the subtitle text." msgstr "" -#: src/libsputext/xine_sputext_decoder.c:1174 +#: src/spu_dec/sputext_decoder.c:1167 #, fuzzy msgid "whether to use a freetype font" msgstr "使用するデフォルトのフォント名" -#: src/libsputext/xine_sputext_decoder.c:1181 +#: src/spu_dec/sputext_decoder.c:1174 #, fuzzy msgid "encoding of the subtitles" msgstr "サブタイトルを表示" -#: src/libsputext/xine_sputext_decoder.c:1182 -msgid "The encoding of the subtitle text in the stream. This setting is used to render non-ASCII characters correctly. If non-ASCII characters are not displayed as you expect, ask the creator of the subtitles what encoding was used." +#: src/spu_dec/sputext_decoder.c:1175 +msgid "" +"The encoding of the subtitle text in the stream. This setting is used to " +"render non-ASCII characters correctly. If non-ASCII characters are not " +"displayed as you expect, ask the creator of the subtitles what encoding was " +"used." msgstr "" -#: src/libsputext/xine_sputext_decoder.c:1190 +#: src/spu_dec/sputext_decoder.c:1183 msgid "use unscaled OSD if possible" msgstr "" -#: src/libsputext/xine_sputext_decoder.c:1191 -msgid "The unscaled OSD will be rendered independently of the video frame and will always be sharp, even if the video is magnified. This will look better, but does not work with all graphics hardware. The alternative is the scaled OSD, which will become blurry, if you enlarge a low resolution video to fullscreen, but it works with all graphics cards." +#: src/spu_dec/sputext_decoder.c:1184 +msgid "" +"The unscaled OSD will be rendered independently of the video frame and will " +"always be sharp, even if the video is magnified. This will look better, but " +"does not work with all graphics hardware. The alternative is the scaled OSD, " +"which will become blurry, if you enlarge a low resolution video to " +"fullscreen, but it works with all graphics cards." msgstr "" #: src/libw32dll/common.c:17 @@ -2680,7 +2895,12 @@ msgid "path to Win32 codecs" msgstr "パスを SVG 形式でエクスポート" #: src/libw32dll/common.c:18 -msgid "If you have the Windows or Apple Quicktime codec packs installed, specify the path the codec directory here. If xine can find the Windows or Apple Quicktime codecs, it will use them to decode various Windows Media and Quicktime streams for you. Consult the xine FAQ for more information on how to install the codecs." +msgid "" +"If you have the Windows or Apple Quicktime codec packs installed, specify " +"the path the codec directory here. If xine can find the Windows or Apple " +"Quicktime codecs, it will use them to decode various Windows Media and " +"Quicktime streams for you. Consult the xine FAQ for more information on how " +"to install the codecs." msgstr "" #: src/libw32dll/w32codec.c:589 @@ -2705,16 +2925,17 @@ msgstr "" #: src/libw32dll/w32codec.c:688 #, c-format -msgid "w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n" +msgid "" +"w32codec: DS_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n" msgstr "" #: src/libw32dll/w32codec.c:699 #, c-format -msgid "w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n" +msgid "" +"w32codec: DMO_VideoDecoder failed! unknown codec %08lx / wrong parameters?\n" msgstr "" -#: src/libw32dll/w32codec.c:819 -#: src/libw32dll/w32codec.c:1488 +#: src/libw32dll/w32codec.c:819 src/libw32dll/w32codec.c:1488 #, c-format msgid "w32codec: decoder failed to start. Is '%s' installed?\n" msgstr "" @@ -2739,33 +2960,151 @@ msgstr "" msgid "w32codec: Error initializing DMO Audio\n" msgstr "" -#: src/libxinevdec/bitplane.c:1274 +#: src/libw32dll/w32codec.c:1592 +msgid "win32 binary video codec plugin" +msgstr "" + +#: src/libw32dll/w32codec.c:1641 +#, fuzzy +msgid "win32 binary audio codec plugin" +msgstr "main: 音声出力プラグイン<%s> を探索中\n" + +#: src/audio_dec/xine_a52_decoder.c:759 src/audio_dec/xine_dts_decoder.c:536 +#, c-format +msgid "HELP! a mono-only audio driver?!\n" +msgstr "" + +#: src/audio_dec/xine_a52_decoder.c:800 +msgid "liba52 based a52 audio decoder plugin" +msgstr "" + +#: src/audio_dec/xine_a52_decoder.c:809 +#, fuzzy +msgid "A/52 volume" +msgstr "--ボリュームヘッダ--\n" + +#: src/audio_dec/xine_a52_decoder.c:810 +msgid "" +"With A/52 audio, you can modify the volume at the decoder level. This has " +"the advantage of the audio being already decoded for the specified volume, " +"so later operations like channel downmixing will work on an audio stream of " +"the given volume." +msgstr "" + +#: src/audio_dec/xine_a52_decoder.c:818 +msgid "use A/52 dynamic range compression" +msgstr "" + +#: src/audio_dec/xine_a52_decoder.c:819 +msgid "" +"Dynamic range compression limits the dynamic range of the audio. This means " +"making the loud sounds softer, and the soft sounds louder, so you can more " +"easily listen to the audio in a noisy environment without disturbing anyone." +msgstr "" + +#: src/audio_dec/xine_a52_decoder.c:826 +msgid "downmix audio to 2 channel surround stereo" +msgstr "" + +#: src/audio_dec/xine_a52_decoder.c:827 +msgid "" +"When you want to listen to multichannel surround sound, but you have only " +"two speakers or a surround decoder or amplifier which does some sort of " +"matrix surround decoding like prologic, you should enable this option so " +"that the additional channels are mixed into the stereo signal." +msgstr "" + +#: src/audio_dec/xine_dts_decoder.c:571 +msgid "DTS passthru audio format decoder plugin" +msgstr "" + +#: src/audio_dec/xine_faad_decoder.c:135 +#, fuzzy, c-format +msgid "libfaad: libfaad NeAACDecOpen() failed.\n" +msgstr "文字列の比較に失敗" + +#: src/audio_dec/xine_faad_decoder.c:144 +#, fuzzy, c-format +msgid "libfaad: libfaad NeAACDecInit2 failed.\n" +msgstr "文字列の比較に失敗" + +#: src/audio_dec/xine_faad_decoder.c:155 +#, fuzzy, c-format +msgid "libfaad: libfaad NeAACDecInit failed.\n" +msgstr "文字列の比較に失敗" + +#: src/audio_dec/xine_faad_decoder.c:487 +msgid "Freeware Advanced Audio Decoder" +msgstr "" + +#: src/audio_dec/xine_musepack_decoder.c:296 +#, c-format +msgid "libmusepack: mpc_demux_init failed.\n" +msgstr "" + +#: src/audio_dec/xine_musepack_decoder.c:307 +#, c-format +msgid "libmusepack: mpc_streaminfo_read failed: %d\n" +msgstr "" + +#: src/audio_dec/xine_musepack_decoder.c:388 +#, c-format +msgid "libmusepack: data after last frame ignored\n" +msgstr "" + +#: src/audio_dec/xine_musepack_decoder.c:403 +#, c-format +msgid "libmusepack: mpc_decoder_initialise failed\n" +msgstr "" + +#: src/audio_dec/xine_musepack_decoder.c:423 +#: src/audio_dec/xine_musepack_decoder.c:442 +#, c-format +msgid "libmusepack: mpc_decoder_decode failed: %d\n" +msgstr "" + +#: src/audio_dec/xine_musepack_decoder.c:519 +msgid "mpc: musepack audio decoder plugin" +msgstr "" + +#: src/video_dec/bitplane.c:1273 #, c-format msgid "bitplane: error doing ByteRun1 decompression\n" msgstr "" -#: src/libxinevdec/bitplane.c:1325 +#: src/video_dec/bitplane.c:1324 #, c-format msgid "bitplane: Anim Opt 1 is not supported at the moment\n" msgstr "" -#: src/libxinevdec/bitplane.c:1332 +#: src/video_dec/bitplane.c:1331 #, c-format msgid "bitplane: Anim Opt 2 is not supported at the moment\n" msgstr "" -#: src/libxinevdec/bitplane.c:1382 +#: src/video_dec/bitplane.c:1381 #, c-format msgid "bitplane: Anim ASCIIJ is not supported at the moment\n" msgstr "" -#: src/libxinevdec/bitplane.c:1388 +#: src/video_dec/bitplane.c:1387 #, c-format msgid "bitplane: This anim-type is not supported at the moment\n" msgstr "" +#: src/video_dec/bitplane.c:1525 +msgid "Raw bitplane video decoder plugin" +msgstr "" + #: src/post/audio/stretch.c:267 -msgid "This filter will perform a time stretch, playing the stream faster or slower by a factor. Pitch is optionally preserved, so it is possible, for example, to use it to watch a movie in less time than it was originally shot.\n" +msgid "" +"This filter will perform a time stretch, playing the stream faster or slower " +"by a factor. Pitch is optionally preserved, so it is possible, for example, " +"to use it to watch a movie in less time than it was originally shot.\n" +msgstr "" + +#: src/post/audio/stretch.c:676 +msgid "Time stretch by a given factor, optionally preserving pitch" msgstr "" #: src/post/audio/upmix.c:138 @@ -2774,12 +3113,20 @@ msgid "" "Parameters\n" " cut_off_freq\n" "\n" -"Note: It is possible to use frontend's control window to set these parameters.\n" +"Note: It is possible to use frontend's control window to set these " +"parameters.\n" "\n" msgstr "" +#: src/post/audio/upmix.c:433 +msgid "upmix" +msgstr "" + #: src/post/audio/upmix_mono.c:110 -msgid "This filter will upmix a mono stream to stereo, by duplicating channels. Alternatively, one may use this plugin to listen just one channel of a given stream.\n" +msgid "" +"This filter will upmix a mono stream to stereo, by duplicating channels. " +"Alternatively, one may use this plugin to listen just one channel of a given " +"stream.\n" msgstr "" #: src/post/audio/upmix_mono.c:148 @@ -2799,86 +3146,136 @@ msgstr[1] "" msgid ": audio device not capable of AO_CAP_MODE_STEREO.\n" msgstr "" +#: src/post/audio/upmix_mono.c:346 +msgid "converts Mono into Stereo" +msgstr "" + #: src/post/audio/volnorm.c:151 msgid "" "Normalizes audio by maximizing the volume without distorting the sound.\n" "\n" "Parameters:\n" -" method: 1: use a single sample to smooth the variations via the standard weighted mean over past samples (default); 2: use several samples to smooth the variations via the standard weighted mean over past samples.\n" +" method: 1: use a single sample to smooth the variations via the standard " +"weighted mean over past samples (default); 2: use several samples to smooth " +"the variations via the standard weighted mean over past samples.\n" +msgstr "" + +#: src/post/audio/volnorm.c:462 +msgid "Normalize volume" msgstr "" #: src/post/deinterlace/xine_plugin.c:211 msgid "" "Advanced tvtime/deinterlacer plugin with pulldown detection\n" -"This plugin aims to provide deinterlacing mechanisms comparable to high quality progressive DVD players and so called line-doublers, for use with computer monitors, projectors and other progressive display devices.\n" +"This plugin aims to provide deinterlacing mechanisms comparable to high " +"quality progressive DVD players and so called line-doublers, for use with " +"computer monitors, projectors and other progressive display devices.\n" "\n" "Parameters\n" "\n" -" Method: Select deinterlacing method/algorithm to use, see below for explanation of each method.\n" +" Method: Select deinterlacing method/algorithm to use, see below for " +"explanation of each method.\n" "\n" " Enabled: Enable/disable the plugin.\n" "\n" -" Pulldown_error_wait: Ensures that the telecine pattern has been locked for this many frames before changing to filmmode.\n" +" Pulldown_error_wait: Ensures that the telecine pattern has been locked for " +"this many frames before changing to filmmode.\n" "\n" -" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that have being converted to NTSC can be detected and intelligently reconstructed to their original (non-interlaced) frames.\n" +" Pulldown: Choose the 2-3 pulldown detection algorithm. 24 FPS films that " +"have being converted to NTSC can be detected and intelligently reconstructed " +"to their original (non-interlaced) frames.\n" "\n" -" Framerate_mode: Selecting 'full' will deinterlace every field to an unique frame for television quality and beyond. This feature will effetively double the frame rate, improving smoothness. Note, however, that full 59.94 FPS is not possible with plain 2.4 Linux kernel (that use a timer interrupt frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings (512 and 1000, respectively) and should work fine.\n" +" Framerate_mode: Selecting 'full' will deinterlace every field to an unique " +"frame for television quality and beyond. This feature will effetively double " +"the frame rate, improving smoothness. Note, however, that full 59.94 FPS is " +"not possible with plain 2.4 Linux kernel (that use a timer interrupt " +"frequency of 100Hz). Newer RedHat and 2.6 kernels use higher HZ settings " +"(512 and 1000, respectively) and should work fine.\n" "\n" -" Judder_correction: Once 2-3 pulldown is enabled and a film material is detected, it is possible to reduce the frame rate to original rate used (24 FPS). This will make the frames evenly spaced in time, matching the speed they were shot and eliminating the judder effect.\n" +" Judder_correction: Once 2-3 pulldown is enabled and a film material is " +"detected, it is possible to reduce the frame rate to original rate used (24 " +"FPS). This will make the frames evenly spaced in time, matching the speed " +"they were shot and eliminating the judder effect.\n" "\n" -" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to indicate progressive material. This setting control whether we trust this flag or not (some rare and buggy mpeg2 streams set it wrong).\n" +" Use_progressive_frame_flag: Well mastered MPEG2 streams uses a flag to " +"indicate progressive material. This setting control whether we trust this " +"flag or not (some rare and buggy mpeg2 streams set it wrong).\n" "\n" -" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very poor vertical chroma resolution. Upsampling the chroma for purposes of deinterlacing may cause some artifacts to occur (eg. colour stripes). Use this option to blur the chroma vertically after deinterlacing to remove the artifacts. Warning: cpu intensive.\n" +" Chroma_filter: DVD/MPEG2 use an interlaced image format that has a very " +"poor vertical chroma resolution. Upsampling the chroma for purposes of " +"deinterlacing may cause some artifacts to occur (eg. colour stripes). Use " +"this option to blur the chroma vertically after deinterlacing to remove the " +"artifacts. Warning: cpu intensive.\n" "\n" -" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, tricking tvtime/dscaler routines like if they were still handling YUY2 images. Of course, this is not correct, not all pixels will be evaluated by the algorithms to decide the regions to deinterlace and chroma will be processed separately. Nevertheless, it allows people with not so fast systems to try deinterlace algorithms, in a tradeoff between quality and cpu usage.\n" +" Cheap_mode: This will skip the expensive YV12->YUY2 image conversion, " +"tricking tvtime/dscaler routines like if they were still handling YUY2 " +"images. Of course, this is not correct, not all pixels will be evaluated by " +"the algorithms to decide the regions to deinterlace and chroma will be " +"processed separately. Nevertheless, it allows people with not so fast " +"systems to try deinterlace algorithms, in a tradeoff between quality and cpu " +"usage.\n" "\n" "* Uses several algorithms from tvtime and dscaler projects.\n" "Deinterlacing methods: (Not all methods are available for all platforms)\n" "\n" msgstr "" -#: src/post/deinterlace/xine_plugin.c:335 +#: src/post/deinterlace/xine_plugin.c:313 +msgid "advanced deinterlacer plugin with pulldown detection" +msgstr "" + +#: src/post/deinterlace/xine_plugin.c:333 #, c-format msgid "tvtime: No deinterlacing methods available, exiting.\n" msgstr "" -#: src/post/goom/xine_goom.c:206 +#: src/post/goom/xine_goom.c:196 +msgid "What a GOOM" +msgstr "" + +#: src/post/goom/xine_goom.c:204 msgid "frames per second to generate" msgstr "" -#: src/post/goom/xine_goom.c:207 -msgid "With more frames per second, the animation will get smoother and faster, but will also require more CPU power." +#: src/post/goom/xine_goom.c:205 +msgid "" +"With more frames per second, the animation will get smoother and faster, but " +"will also require more CPU power." msgstr "" -#: src/post/goom/xine_goom.c:212 +#: src/post/goom/xine_goom.c:210 #, fuzzy msgid "goom image width" msgstr "画像の幅が 0 です" -#: src/post/goom/xine_goom.c:213 +#: src/post/goom/xine_goom.c:211 msgid "The width in pixels of the image to be generated." msgstr "" -#: src/post/goom/xine_goom.c:217 +#: src/post/goom/xine_goom.c:215 #, fuzzy msgid "goom image height" msgstr "画像の高さが 0 です" -#: src/post/goom/xine_goom.c:218 +#: src/post/goom/xine_goom.c:216 msgid "The height in pixels of the image to be generated." msgstr "" -#: src/post/goom/xine_goom.c:224 +#: src/post/goom/xine_goom.c:222 msgid "colour space conversion method" msgstr "" -#: src/post/goom/xine_goom.c:225 +#: src/post/goom/xine_goom.c:223 msgid "" "You can choose the colour space conversion method used by goom.\n" "The available selections should be self-explaining." msgstr "" -#: src/post/mosaico/mosaico.c:274 +#: src/post/mosaico/mosaico.c:133 +msgid "Mosaico is a picture in picture (pip) post plugin" +msgstr "" + +#: src/post/mosaico/mosaico.c:255 msgid "" "Mosaico does simple picture in picture effects.\n" "\n" @@ -2890,7 +3287,12 @@ msgid "" " h: the height of the picture\n" msgstr "" -#: src/post/mosaico/switch.c:228 +#: src/post/mosaico/switch.c:108 +msgid "" +"Switch is a post plugin able to switch at any time between different streams" +msgstr "" + +#: src/post/mosaico/switch.c:209 msgid "" "Switch can be used for fast switching between multiple inputs.\n" "\n" @@ -2909,9 +3311,16 @@ msgid "" "* mplayer's boxblur (C) 2002 Michael Niedermayer\n" msgstr "" +#: src/post/planar/boxblur.c:147 +msgid "box blur filter from mplayer" +msgstr "" + #: src/post/planar/denoise3d.c:138 msgid "" -"This filter aims to reduce image noise producing smooth images and making still images really still (This should enhance compressibility.). It can be given from 0 to 3 parameters. If you omit a parameter, a reasonable value will be inferred.\n" +"This filter aims to reduce image noise producing smooth images and making " +"still images really still (This should enhance compressibility.). It can be " +"given from 0 to 3 parameters. If you omit a parameter, a reasonable value " +"will be inferred.\n" "\n" "Parameters\n" " Luma: Spatial luma strength (default = 4)\n" @@ -2921,23 +3330,17 @@ msgid "" "* mplayer's denoise3d (C) 2003 Daniel Moreno\n" msgstr "" -#: src/post/planar/eq.c:188 -msgid "" -"Software equalizer with interactive controls just like the hardware equalizer, for cards/drivers that do not support brightness and contrast controls in hardware.\n" -"\n" -"Parameters\n" -" brightness\n" -" contrast\n" -"\n" -"Note: It is possible to use frontend's control window to set these parameters.\n" -"\n" -"* mplayer's eq (C) Richard Felker\n" +#: src/post/planar/denoise3d.c:187 +msgid "3D Denoiser (variable lowpass filter)" msgstr "" #: src/post/planar/eq2.c:361 msgid "" -"Alternative software equalizer that uses lookup tables (very slow), allowing gamma correction in addition to simple brightness, contrast and saturation adjustment.\n" -"Note that it uses the same MMX optimized code as 'eq' if all gamma values are 1.0.\n" +"Alternative software equalizer that uses lookup tables (very slow), allowing " +"gamma correction in addition to simple brightness, contrast and saturation " +"adjustment.\n" +"Note that it uses the same MMX optimized code as 'eq' if all gamma values " +"are 1.0.\n" "\n" "Parameters\n" " gamma\n" @@ -2948,14 +3351,48 @@ msgid "" " ggamma (gamma for the green component)\n" " bgamma (gamma for the blue component)\n" "\n" -"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values result in a negative image), -1 - 1 for brightness and 0 - 3 for saturation.\n" +"Value ranges are 0.1 - 10 for gammas, -2 - 2 for contrast (negative values " +"result in a negative image), -1 - 1 for brightness and 0 - 3 for " +"saturation.\n" "\n" "* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n" msgstr "" -#: src/post/planar/expand.c:251 +#: src/post/planar/eq2.c:420 +msgid "Software video equalizer" +msgstr "" + +#: src/post/planar/eq.c:188 msgid "" -"The expand plugin is meant to take frames of arbitrary aspect ratio and converts them to a different aspect (4:3 by default) by adding black bars on the top and bottom of the frame. This allows us to shift overlays down into the black area so they don't cover the image.\n" +"Software equalizer with interactive controls just like the hardware " +"equalizer, for cards/drivers that do not support brightness and contrast " +"controls in hardware.\n" +"\n" +"Parameters\n" +" brightness\n" +" contrast\n" +"\n" +"Note: It is possible to use frontend's control window to set these " +"parameters.\n" +"\n" +"* mplayer's eq (C) Richard Felker\n" +msgstr "" + +#: src/post/planar/eq.c:239 +msgid "soft video equalizer" +msgstr "" + +#: src/post/planar/expand.c:137 +msgid "" +"add black borders to top and bottom of video to expand it to 4:3 aspect ratio" +msgstr "" + +#: src/post/planar/expand.c:232 +msgid "" +"The expand plugin is meant to take frames of arbitrary aspect ratio and " +"converts them to a different aspect (4:3 by default) by adding black bars on " +"the top and bottom of the frame. This allows us to shift overlays down into " +"the black area so they don't cover the image.\n" "\n" "Parameters (FIXME: better help)\n" " Enable_automatic_shift: Enable automatic overlay shifting\n" @@ -2965,21 +3402,29 @@ msgid "" "\n" msgstr "" -#: src/post/planar/noise.c:404 +#: src/post/planar/noise.c:406 msgid "" "Adds random noise to the video.\n" "\n" "Parameters:\n" -" luma_strength: strength of noise added to luma channel (0-100, default: 8)\n" -" chroma_strength: strength of noise added to chroma channel (0-100, default: 5)\n" -" quality: quality level of the noise. fixed: constant noise pattern; temporal: noise pattern changes between frames; averaged temporal: smoother noise pattern that changes between frames. (default: averaged temporal)\n" +" luma_strength: strength of noise added to luma channel (0-100, default: " +"8)\n" +" chroma_strength: strength of noise added to chroma channel (0-100, " +"default: 5)\n" +" quality: quality level of the noise. fixed: constant noise pattern; " +"temporal: noise pattern changes between frames; averaged temporal: smoother " +"noise pattern that changes between frames. (default: averaged temporal)\n" " type: Type of noise: uniform or gaussian. (default: gaussian)\n" " pattern: Mix random noise with a (semi)regular pattern. (default: False)\n" "\n" "* mplayer's noise (C) Michael Niedermayer\n" msgstr "" -#: src/post/planar/pp.c:115 +#: src/post/planar/noise.c:458 +msgid "Adds noise" +msgstr "" + +#: src/post/planar/pp.c:119 msgid "" "FFmpeg libpostprocess plugin.\n" "\n" @@ -2987,16 +3432,23 @@ msgid "" "\n" msgstr "" -#: src/post/planar/pp.c:121 +#: src/post/planar/pp.c:124 msgid "" "\n" "* libpostprocess (C) Michael Niedermayer\n" msgstr "" +#: src/post/planar/pp.c:163 +msgid "plugin for ffmpeg libpostprocess" +msgstr "" + #: src/post/planar/unsharp.c:215 msgid "" "Unsharp mask / gaussian blur\n" -"It is possible to set the width and height of the matrix, odd sized in both directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 and 7x7) and the relative amount of sharpness/blur to add to the image (a sane range should be -1.5 - 1.5).\n" +"It is possible to set the width and height of the matrix, odd sized in both " +"directions (min = 3x3, max = 13x11 or 11x13, usually something between 3x3 " +"and 7x7) and the relative amount of sharpness/blur to add to the image (a " +"sane range should be -1.5 - 1.5).\n" "\n" "Parameters\n" "\n" @@ -3004,23 +3456,140 @@ msgid "" "\n" " Luma_matrix_height: Height of the matrix (must be odd)\n" "\n" -" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 sharpen)\n" +" Luma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 " +"sharpen)\n" "\n" " Chroma_matrix_width: Width of the matrix (must be odd)\n" "\n" " Chroma_matrix_height: Height of the matrix (must be odd)\n" "\n" -" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 sharpen)\n" +" Chroma_amount: Relative amount of sharpness/blur (=0 disable, <0 blur, >0 " +"sharpen)\n" "\n" "\n" "* mplayer's unsharp (C) 2002 Remi Guyomarch\n" msgstr "" -#: src/video_out/video_out_aa.c:308 +#: src/post/planar/unsharp.c:273 +msgid "unsharp mask & gaussian blur" +msgstr "" + +#: src/vdr/input_vdr.c:241 src/vdr/input_vdr.c:281 src/vdr/input_vdr.c:2220 +#: src/vdr/input_vdr.c:2230 src/vdr/input_vdr.c:2330 +#, c-format +msgid "%s: input event write: %s.\n" +msgstr "" + +#: src/vdr/input_vdr.c:857 src/vdr/input_vdr.c:1324 +#, c-format +msgid "%s: buffer_pool_alloc() failed!\n" +msgstr "" + +#: src/vdr/input_vdr.c:926 +#, c-format +msgid "%s: flush buffers (vb: %d, ab: %d, vf: %d, af: %d) %s.\n" +msgstr "" + +#: src/vdr/input_vdr.c:1750 +#, c-format +msgid "%s: shutting down rpc thread (timeout: %d ms) ...\n" +msgstr "" + +#: src/vdr/input_vdr.c:1774 +#, c-format +msgid "%s: cancelling rpc thread in function %d...\n" +msgstr "" + +#: src/vdr/input_vdr.c:1781 +#, c-format +msgid "%s: joining rpc thread ...\n" +msgstr "" + +#: src/vdr/input_vdr.c:1783 +#, c-format +msgid "%s: rpc thread joined.\n" +msgstr "" + +#: src/vdr/input_vdr.c:1791 +#, c-format +msgid "%s: joining metronom thread ...\n" +msgstr "" + +#: src/vdr/input_vdr.c:1811 +#, c-format +msgid "%s: metronom thread joined.\n" +msgstr "" + +#: src/vdr/input_vdr.c:1908 src/vdr/input_vdr.c:1922 src/vdr/input_vdr.c:1946 +#: src/vdr/input_vdr.c:1968 src/vdr/input_vdr.c:1990 +#, fuzzy, c-format +msgid "%s: failed to open '%s' (%s)\n" +msgstr "ファイル '%s' のオープンに失敗しました: %s" + +#: src/vdr/input_vdr.c:1924 +msgid "timeout expired during setup phase" +msgstr "" + +#: src/vdr/input_vdr.c:2015 +#, c-format +msgid "%s: failed to create socket for port %d (%s)\n" +msgstr "" + +#: src/vdr/input_vdr.c:2029 +#, fuzzy, c-format +msgid "%s: failed to connect to port %d (%s)\n" +msgstr "%cMTP による %s への接続に失敗しました。\n" + +#: src/vdr/input_vdr.c:2036 +#, c-format +msgid "%s: socket opening (port %d) successful, fd = %d\n" +msgstr "" + +#: src/vdr/input_vdr.c:2064 +#, fuzzy, c-format +msgid "%s: connecting to vdr.\n" +msgstr "「%s」へ接続できません: %s\n" + +#: src/vdr/input_vdr.c:2069 +#, fuzzy, c-format +msgid "%s: failed to resolve hostname '%s' (%s)\n" +msgstr "ファイル '%s' のオープンに失敗しました: %s" + +#: src/vdr/input_vdr.c:2092 +#, c-format +msgid "%s: connecting to all sockets (port %d .. %d) was successful.\n" +msgstr "" + +#: src/vdr/input_vdr.c:2161 +#, c-format +msgid "" +"%s: MRL (%s) invalid! MRL should start with vdr://path/to/fifo/stream or " +"netvdr://host:port where ':port' is optional.\n" +msgstr "" + +#: src/vdr/input_vdr.c:2170 src/vdr/input_vdr.c:2187 +#, fuzzy, c-format +msgid "%s: can't create new thread (%s)\n" +msgstr "%s: %d行: グループIDが作成できません\n" + +#: src/vdr/input_vdr.c:2743 +msgid "VDR display device plugin" +msgstr "" + +#: src/vdr/post_vdr_video.c:104 +msgid "modifies every video frame as requested by VDR" +msgstr "" + +#: src/vdr/post_vdr_video.c:415 +#, c-format +msgid ": osd: (%d, %d)-(%d, %d)@%lg\n" +msgstr "" + +#: src/video_out/video_out_aa.c:303 msgid "xine video output plugin using the ascii-art library" msgstr "" -#: src/video_out/video_out_caca.c:321 +#: src/video_out/video_out_caca.c:309 msgid "xine video output plugin using the Color AsCii Art library" msgstr "" @@ -3029,7 +3598,9 @@ msgid "video layer buffering mode" msgstr "" #: src/video_out/video_out_directfb.c:1338 -msgid "Select the buffering mode of the output layer. Double or triple buffering give a smoother playback, but consume more video memory." +msgid "" +"Select the buffering mode of the output layer. Double or triple buffering " +"give a smoother playback, but consume more video memory." msgstr "" #: src/video_out/video_out_directfb.c:1345 @@ -3038,7 +3609,9 @@ msgid "wait for vertical retrace" msgstr "垂直方向の位置に対する GtkAdjustment です" #: src/video_out/video_out_directfb.c:1346 -msgid "Enable synchronizing the update of the video image to the repainting of the entire screen (\"vertical retrace\")." +msgid "" +"Enable synchronizing the update of the video image to the repainting of the " +"entire screen (\"vertical retrace\")." msgstr "" #: src/video_out/video_out_directfb.c:1353 @@ -3047,7 +3620,9 @@ msgid "enable video colour key" msgstr "動画/後処理/後処理を有効に" #: src/video_out/video_out_directfb.c:1354 -msgid "Enable using a colour key to tell the graphics card where to overlay the video image." +msgid "" +"Enable using a colour key to tell the graphics card where to overlay the " +"video image." msgstr "" #: src/video_out/video_out_directfb.c:1360 @@ -3056,11 +3631,11 @@ msgid "video colour key" msgstr "Session key が確立しました:\n" #: src/video_out/video_out_directfb.c:1361 -#: src/video_out/video_out_vidix.c:1168 -#: src/video_out/video_out_vidix.c:1175 -#: src/video_out/video_out_vidix.c:1182 -#: src/video_out/xv_common.h:25 -msgid "The colour key is used to tell the graphics card where to overlay the video image. Try different values, if you experience windows becoming transparent." +#: src/video_out/video_out_vidix.c:1164 src/video_out/video_out_vidix.c:1171 +#: src/video_out/video_out_vidix.c:1178 src/video_out/xv_common.h:25 +msgid "" +"The colour key is used to tell the graphics card where to overlay the video " +"image. Try different values, if you experience windows becoming transparent." msgstr "" #: src/video_out/video_out_directfb.c:1370 @@ -3078,7 +3653,9 @@ msgid "field parity" msgstr "パリティ・エラーです。" #: src/video_out/video_out_directfb.c:1379 -msgid "For an interlaced display, enable controlling the field parity (\"none\"=disabled)." +msgid "" +"For an interlaced display, enable controlling the field parity (\"none" +"\"=disabled)." msgstr "" #: src/video_out/video_out_directfb.c:1512 @@ -3103,7 +3680,8 @@ msgstr "" #: src/video_out/video_out_directfb.c:1553 #, c-format -msgid "video_out_directfb:need at least DirectFB 0.9.25 to play on this layer!\n" +msgid "" +"video_out_directfb:need at least DirectFB 0.9.25 to play on this layer!\n" msgstr "" #: src/video_out/video_out_directfb.c:1588 @@ -3123,120 +3701,125 @@ msgstr "" #: src/video_out/video_out_directfb.c:1700 #, c-format -msgid "video_out_directfb: image scaling with deinterlacing is hardware accelerated.\n" +msgid "" +"video_out_directfb: image scaling with deinterlacing is hardware " +"accelerated.\n" msgstr "" -#: src/video_out/video_out_directfb.c:1778 +#: src/video_out/video_out_directfb.c:1792 #, fuzzy msgid "video layer id (auto: -1)" msgstr "-V オプションには動画ドライバー ID が必要です\n" -#: src/video_out/video_out_directfb.c:1779 +#: src/video_out/video_out_directfb.c:1793 msgid "Select the video output layer by its id." msgstr "" -#: src/video_out/video_out_directfb.c:1800 -#: src/video_out/video_out_directfb.c:2010 +#: src/video_out/video_out_directfb.c:1814 +#: src/video_out/video_out_directfb.c:2011 #, c-format msgid "video_out_directfb: using display layer #%d.\n" msgstr "" -#: src/video_out/video_out_directfb.c:1884 +#: src/video_out/video_out_directfb.c:1911 msgid "xine video output plugin using DirectFB." msgstr "" -#: src/video_out/video_out_directfb.c:2003 +#: src/video_out/video_out_directfb.c:2004 #, c-format msgid "video_out_directfb: no usable display layer was found!\n" msgstr "" -#: src/video_out/video_out_directfb.c:2092 +#: src/video_out/video_out_directfb.c:2116 msgid "xine video output plugin using DirectFB under XDirectFB." msgstr "" -#: src/video_out/video_out_directx.c:1295 +#: src/video_out/video_out_directx.c:1300 msgid "xine video output plugin for win32 using directx" msgstr "" -#: src/video_out/video_out_fb.c:758 +#: src/video_out/video_out_fb.c:741 #, 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:818 -#: src/video_out/video_out_vidix.c:1248 +#: src/video_out/video_out_fb.c:801 src/video_out/video_out_vidix.c:1236 #, fuzzy msgid "framebuffer device name" msgstr "%s: デバイス名は `%s' です\n" -#: src/video_out/video_out_fb.c:819 -#: src/video_out/video_out_vidix.c:1249 +#: src/video_out/video_out_fb.c:802 src/video_out/video_out_vidix.c:1237 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, xine can be used to fill this file with arbitrary content. So you should be careful that the value you enter really is a proper framebuffer device." +"This setting is security critical, because when changed to a different file, " +"xine can be used to fill this file with arbitrary content. So you should be " +"careful that the value you enter really is a proper framebuffer device." msgstr "" -#: src/video_out/video_out_fb.c:893 +#: src/video_out/video_out_fb.c:876 #, c-format -msgid "video_out_fb: Your video mode was not recognized, sorry.\n" +msgid "%s: Your video mode was not recognized, sorry.\n" msgstr "" -#: src/video_out/video_out_fb.c:950 +#: src/video_out/video_out_fb.c:933 #, c-format -msgid "video_out_fb: %d video RAM buffers are available.\n" +msgid "%s: %d video RAM buffers are available.\n" msgstr "" -#: src/video_out/video_out_fb.c:956 +#: src/video_out/video_out_fb.c:939 #, c-format msgid "" -"WARNING: video_out_fb: Zero copy buffers are DISABLED because only %d buffers\n" +"WARNING: %s: Zero copy buffers are DISABLED because only %d buffers\n" " are available which is less than the recommended %d buffers. Lowering\n" " the frame buffer resolution might help.\n" msgstr "" -#: src/video_out/video_out_fb.c:967 +#: src/video_out/video_out_fb.c:950 #, c-format msgid "" -"WARNING: video_out_fb: Zero copy buffers are DISABLED because kernel driver\n" +"WARNING: %s: Zero copy buffers are DISABLED because kernel driver\n" " do not support screen panning (used for frame flips).\n" msgstr "" -#: src/video_out/video_out_fb.c:1036 +#: src/video_out/video_out_fb.c:1019 #, c-format msgid "" -"WARNING: video_out_fb: current display depth is %d. For better performance\n" +"WARNING: %s: current display depth is %d. For better performance\n" " a depth of 16 bpp is recommended!\n" "\n" msgstr "" -#: src/video_out/video_out_fb.c:1067 +#: src/video_out/video_out_fb.c:1050 msgid "Xine video output plugin using the Linux frame buffer device" msgstr "" -#: src/video_out/video_out_none.c:277 +#: src/video_out/video_out_none.c:279 msgid "xine video output plugin which displays nothing" msgstr "" -#: src/video_out/video_out_opengl.c:1889 +#: src/video_out/video_out_opengl.c:1891 #, fuzzy msgid "OpenGL renderer" msgstr "レンダラの GdkScreen です" -#: src/video_out/video_out_opengl.c:1890 +#: src/video_out/video_out_opengl.c:1892 msgid "" "The OpenGL plugin provides several render modules:\n" "\n" "2D_Tex_Fragprog\n" -"This module downloads the images as YUV 2D textures and renders a textured slice\n" +"This module downloads the images as YUV 2D textures and renders a textured " +"slice\n" "using fragment programs for reconstructing RGB.\n" "This is the best and fastest method on modern graphics cards.\n" "\n" "2D_Tex\n" -"This module downloads the images as 2D textures and renders a textured slice.\n" +"This module downloads the images as 2D textures and renders a textured " +"slice.\n" "2D_Tex_Tiled\n" -"This module downloads the images as multiple 2D textures and renders a textured\n" +"This module downloads the images as multiple 2D textures and renders a " +"textured\n" "slice. Thus this works with smaller maximum texture sizes as well.\n" "Image_Pipeline\n" "This module uses glDraw() to render the images.\n" @@ -3250,32 +3833,31 @@ msgid "" "Show images reflected in a spinning torus. Way cool =)" msgstr "" -#: src/video_out/video_out_opengl.c:1912 +#: src/video_out/video_out_opengl.c:1914 #, fuzzy msgid "OpenGL minimum framerate" msgstr "文字列長の最小値" -#: src/video_out/video_out_opengl.c:1913 +#: src/video_out/video_out_opengl.c:1915 msgid "" "Minimum framerate for animated render routines.\n" "Ignored for static render routines.\n" msgstr "" -#: src/video_out/video_out_opengl.c:1918 -#: src/video_out/video_out_vidix.c:1024 +#: src/video_out/video_out_opengl.c:1920 src/video_out/video_out_vidix.c:1028 #: src/video_out/xv_common.h:46 #, fuzzy msgid "enable double buffering" msgstr "\"三角形二つ (塗りつぶし)\"" -#: src/video_out/video_out_opengl.c:1919 +#: src/video_out/video_out_opengl.c:1921 msgid "" "For OpenGL double buffering does not only remove tearing artifacts,\n" "it also reduces flickering a lot.\n" "It should not have any performance impact." msgstr "" -#: src/video_out/video_out_opengl.c:2012 +#: src/video_out/video_out_opengl.c:2025 msgid "xine video output plugin using the OpenGL 3D graphics API" msgstr "" @@ -3284,8 +3866,7 @@ msgstr "" 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 +#: src/video_out/video_out_pgx32.c:206 src/video_out/video_out_pgx32.c:220 #, c-format msgid "video_out_pgx32: Error: ioctl failed, bad device (%s)\n" msgstr "" @@ -3295,6 +3876,10 @@ msgstr "" msgid "video_out_pgx32: Error: '%s' is not a pgx32 framebuffer device\n" msgstr "" +#: src/video_out/video_out_pgx32.c:864 +msgid "xine video output plugin for Sun PGX32 framebuffers" +msgstr "" + #: src/video_out/video_out_pgx64.c:278 #, c-format msgid "video_out_pgx64: Error: can't grab DGA drawable for video window\n" @@ -3307,17 +3892,20 @@ msgstr "" #: src/video_out/video_out_pgx64.c:303 #, c-format -msgid "video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n" +msgid "" +"video_out_pgx64: Error: ioctl failed (VIS_GETIDENTIFIER), bad device (%s)\n" msgstr "" #: 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" +msgid "" +"video_out_pgx64: Error: '%s' is not a xvr100/pgx64/pgx24 framebuffer device\n" msgstr "" #: src/video_out/video_out_pgx64.c:337 #, c-format -msgid "video_out_pgx64: Error: video overlay on this screen is already in use\n" +msgid "" +"video_out_pgx64: Error: video overlay on this screen is already in use\n" msgstr "" #: src/video_out/video_out_pgx64.c:352 @@ -3325,51 +3913,61 @@ msgstr "" msgid "video_out_pgx64: Error: unable to set window properties\n" msgstr "" -#: src/video_out/video_out_pgx64.c:808 +#: src/video_out/video_out_pgx64.c:807 #, c-format msgid "video_out_pgx64: Warning: low video memory, multi-buffering disabled\n" msgstr "" -#: src/video_out/video_out_pgx64.c:840 +#: src/video_out/video_out_pgx64.c:839 #, c-format msgid "video_out_pgx64: Error: insuffucient video memory\n" msgstr "" -#: src/video_out/video_out_pgx64.c:856 +#: src/video_out/video_out_pgx64.c:855 #, c-format msgid "video_out_pgx64: Warning: low video memory, double-buffering disabled\n" msgstr "" -#: src/video_out/video_out_pgx64.c:1394 +#: src/video_out/video_out_pgx64.c:1385 #, c-format msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n" msgstr "" -#: src/video_out/video_out_pgx64.c:1461 -#: src/video_out/xv_common.h:24 +#: src/video_out/video_out_pgx64.c:1452 src/video_out/xv_common.h:24 msgid "video overlay colour key" msgstr "" -#: src/video_out/video_out_pgx64.c:1462 -msgid "The colour key is used to tell the graphics card where it can overlay the video image. Try using different values if you see the video showing through other windows." +#: src/video_out/video_out_pgx64.c:1453 +msgid "" +"The colour key is used to tell the graphics card where it can overlay the " +"video image. Try using different values if you see the video showing through " +"other windows." msgstr "" -#: src/video_out/video_out_pgx64.c:1469 +#: src/video_out/video_out_pgx64.c:1460 #, fuzzy msgid "enable chroma keying" msgstr "デフォルトルートを有効にする" -#: src/video_out/video_out_pgx64.c:1470 -msgid "Draw OSD graphics on top of the overlay colour key rather than blend them into each frame." +#: src/video_out/video_out_pgx64.c:1461 +msgid "" +"Draw OSD graphics on top of the overlay colour key rather than blend them " +"into each frame." msgstr "" -#: src/video_out/video_out_pgx64.c:1473 +#: src/video_out/video_out_pgx64.c:1464 #, fuzzy msgid "enable multi-buffering" msgstr " `multi-drop' モード: " -#: src/video_out/video_out_pgx64.c:1474 -msgid "Multi buffering increases performance at the expense of using more graphics memory." +#: src/video_out/video_out_pgx64.c:1465 +msgid "" +"Multi buffering increases performance at the expense of using more graphics " +"memory." +msgstr "" + +#: src/video_out/video_out_pgx64.c:1486 +msgid "xine video output plugin for Sun XVR100/PGX64/PGX24 framebuffers" msgstr "" #: src/video_out/video_out_sdl.c:490 @@ -3377,7 +3975,10 @@ msgid "use hardware acceleration if available" msgstr "" #: src/video_out/video_out_sdl.c:491 -msgid "When your system supports it, hardware acceleration provided by your graphics hardware will be used. This might not work, so you can disable it, if things go wrong." +msgid "" +"When your system supports it, hardware acceleration provided by your " +"graphics hardware will be used. This might not work, so you can disable it, " +"if things go wrong." msgstr "" #: src/video_out/video_out_sdl.c:537 @@ -3390,186 +3991,128 @@ msgstr "" msgid "video_out_sdl: fullscreen mode is NOT supported\n" msgstr "" -#: src/video_out/video_out_sdl.c:585 +#: src/video_out/video_out_sdl.c:596 msgid "xine video output plugin using the Simple Direct Media Layer" msgstr "" -#: src/video_out/video_out_stk.c:452 +#: src/video_out/video_out_stk.c:454 msgid "xine video output plugin using the Libstk Surface Set-top Toolkit" msgstr "" -#: src/video_out/video_out_syncfb.c:280 -#, c-format -msgid "video_out_syncfb: error. (YUY2 not supported by your graphic card)\n" -msgstr "" - -#: src/video_out/video_out_syncfb.c:296 -#, c-format -msgid "video_out_syncfb: error. (YV12 not supported by your graphic card)\n" -msgstr "" - -#: src/video_out/video_out_syncfb.c:950 -#, c-format -msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (3 plane))\n" -msgstr "" - -#: src/video_out/video_out_syncfb.c:955 -#, c-format -msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:0 (2 plane))\n" -msgstr "" - -#: src/video_out/video_out_syncfb.c:960 -#, c-format -msgid "video_out_syncfb: info. (SyncFB module supports YUV 4:2:2)\n" -msgstr "" - -#: src/video_out/video_out_syncfb.c:966 -#, c-format -msgid "video_out_syncfb: info. (SyncFB module supports YUY2)\n" -msgstr "" - -#: src/video_out/video_out_syncfb.c:973 -#, c-format -msgid "video_out_syncfb: info. (SyncFB module supports RGB565)\n" -msgstr "" - -#: src/video_out/video_out_syncfb.c:978 -#, c-format -msgid "video_out_syncfb: aborting. (SyncFB module does not support YV12, YUY2 nor RGB565)\n" -msgstr "" - -#: src/video_out/video_out_syncfb.c:997 -#, c-format -msgid "video_out_syncfb: info. (brightness/contrast control won't be available because your SyncFB kernel module seems to be outdated. Please refer to README.syncfb for informations on how to update it.)\n" -msgstr "" - -#: src/video_out/video_out_syncfb.c:1021 -#, fuzzy -msgid "default number of frame repetitions" -msgstr "デフォルトのエントリにリビジョン番号がありません" - -#: src/video_out/video_out_syncfb.c:1022 -msgid "This specifies how many times a single video frame will be displayed consecutively." -msgstr "" - -#: src/video_out/video_out_syncfb.c:1070 -msgid "xine video output plugin using the SyncFB module for Matrox G200/G400 cards" -msgstr "" - -#: src/video_out/video_out_syncfb.c:1088 -#, fuzzy -msgid "SyncFB device name" -msgstr "%s: デバイス名は `%s' です\n" - -#: src/video_out/video_out_syncfb.c:1089 -msgid "" -"Specifies the file name for the SyncFB (TeleTux) device to be used.\n" -"This setting is security critical, because when changed to a different file, xine can be used to fill this file with arbitrary content. So you should be careful that the value you enter really is a proper framebuffer device." -msgstr "" - -#: src/video_out/video_out_vidix.c:1002 +#: src/video_out/video_out_vidix.c:1006 #, fuzzy msgid "red intensity" msgstr "赤チャンネルの強度を変える" -#: src/video_out/video_out_vidix.c:1002 +#: src/video_out/video_out_vidix.c:1006 #, fuzzy msgid "The intensity of the red colour components." msgstr "赤チャンネルの強度を変える" -#: src/video_out/video_out_vidix.c:1007 +#: src/video_out/video_out_vidix.c:1011 #, fuzzy msgid "green intensity" msgstr "緑チャンネルの強度を変える" -#: src/video_out/video_out_vidix.c:1007 +#: src/video_out/video_out_vidix.c:1011 #, fuzzy msgid "The intensity of the green colour components." msgstr "緑チャンネルの強度を変える" -#: src/video_out/video_out_vidix.c:1012 +#: src/video_out/video_out_vidix.c:1016 #, fuzzy msgid "blue intensity" msgstr "青チャンネルの強度を変える" -#: src/video_out/video_out_vidix.c:1012 +#: src/video_out/video_out_vidix.c:1016 #, fuzzy msgid "The intensity of the blue colour components." msgstr "青チャンネルの強度を変える" -#: src/video_out/video_out_vidix.c:1025 -#: src/video_out/xv_common.h:47 -msgid "Double buffering will synchronize the update of the video image to the repainting of the entire screen (\"vertical retrace\"). This eliminates flickering and tearing artifacts, but will use more graphics memory." +#: src/video_out/video_out_vidix.c:1029 src/video_out/xv_common.h:47 +msgid "" +"Double buffering will synchronize the update of the video image to the " +"repainting of the entire screen (\"vertical retrace\"). This eliminates " +"flickering and tearing artifacts, but will use more graphics memory." msgstr "" -#: src/video_out/video_out_vidix.c:1072 +#: src/video_out/video_out_vidix.c:1076 #, c-format msgid "video_out_vidix: adaptor supports the yuy2 format\n" msgstr "" -#: src/video_out/video_out_vidix.c:1083 +#: src/video_out/video_out_vidix.c:1087 #, c-format msgid "video_out_vidix: adaptor supports the yv12 format\n" msgstr "" -#: src/video_out/video_out_vidix.c:1099 +#: src/video_out/video_out_vidix.c:1103 #, c-format msgid "video_out_vidix: You have wrong version of VIDIX library\n" msgstr "" -#: src/video_out/video_out_vidix.c:1107 +#: src/video_out/video_out_vidix.c:1111 #, c-format msgid "video_out_vidix: Couldn't find working VIDIX driver\n" msgstr "" -#: src/video_out/video_out_vidix.c:1120 +#: src/video_out/video_out_vidix.c:1124 #, c-format msgid "video_out_vidix: using driver: %s by %s\n" msgstr "" -#: src/video_out/video_out_vidix.c:1167 +#: src/video_out/video_out_vidix.c:1163 msgid "video overlay colour key red component" msgstr "" -#: src/video_out/video_out_vidix.c:1174 +#: src/video_out/video_out_vidix.c:1170 msgid "video overlay colour key green component" msgstr "" -#: src/video_out/video_out_vidix.c:1181 +#: src/video_out/video_out_vidix.c:1177 msgid "video overlay colour key blue component" msgstr "" -#: src/video_out/video_out_vidix.c:1213 +#: src/video_out/video_out_vidix.c:1211 msgid "xine video output plugin using libvidix for x11" msgstr "" -#: src/video_out/video_out_vidix.c:1295 +#: src/video_out/video_out_vidix.c:1285 msgid "xine video output plugin using libvidix for linux frame buffer" msgstr "" -#: src/video_out/video_out_xcbshm.c:150 +#: src/video_out/video_out_xcbshm.c:154 src/video_out/video_out_xshm.c:215 #, c-format -msgid "" -"video_out_xcbshm: %s: allocating image\n" -"video_out_xcbshm: => not using MIT Shared Memory extension.\n" +msgid "%s: %s: allocating image\n" msgstr "" -#: src/video_out/video_out_xcbshm.c:159 +#: src/video_out/video_out_xcbshm.c:156 src/video_out/video_out_xcbshm.c:166 +#: src/video_out/video_out_xcbshm.c:178 src/video_out/video_out_xcbxv.c:267 +#: src/video_out/video_out_xcbxv.c:277 src/video_out/video_out_xcbxv.c:287 +#: src/video_out/video_out_xcbxv.c:299 src/video_out/video_out_xshm.c:200 +#: src/video_out/video_out_xshm.c:217 src/video_out/video_out_xshm.c:228 +#: src/video_out/video_out_xshm.c:247 src/video_out/video_out_xv.c:295 +#: src/video_out/video_out_xv.c:322 src/video_out/video_out_xv.c:331 +#: src/video_out/video_out_xv.c:367 src/video_out/video_out_xxmc.c:643 +#: src/video_out/video_out_xxmc.c:654 src/video_out/video_out_xxmc.c:663 +#: src/video_out/video_out_xxmc.c:699 #, c-format -msgid "" -"video_out_xcbshm: shared memory error (address error) when allocating image \n" -"video_out_xcbshm: => not using MIT Shared Memory extension.\n" +msgid "%s: => not using MIT Shared Memory extension.\n" msgstr "" -#: src/video_out/video_out_xcbshm.c:170 +#: src/video_out/video_out_xcbshm.c:164 src/video_out/video_out_xshm.c:226 #, c-format -msgid "" -"video_out_xcbshm: x11 error during shared memory XImage creation\n" -"video_out_xcbshm: => not using MIT Shared Memory extension.\n" +msgid "%s: shared memory error (address error) when allocating image \n" +msgstr "" + +#: src/video_out/video_out_xcbshm.c:176 src/video_out/video_out_xcbxv.c:297 +#: src/video_out/video_out_xshm.c:245 src/video_out/video_out_xv.c:365 +#: src/video_out/video_out_xxmc.c:697 +#, c-format +msgid "%s: x11 error during shared memory XImage creation\n" msgstr "" -#: src/video_out/video_out_xcbshm.c:1101 -#: src/video_out/video_out_xshm.c:1157 +#: src/video_out/video_out_xcbshm.c:1095 src/video_out/video_out_xshm.c:1152 #, c-format msgid "" "\n" @@ -3579,414 +4122,236 @@ msgid "" "\n" msgstr "" -#: src/video_out/video_out_xcbshm.c:1114 +#: src/video_out/video_out_xcbshm.c:1108 src/video_out/video_out_xshm.c:1165 #, c-format -msgid "video_out_xcbshm: MIT shared memory extension not present on display.\n" +msgid "%s: MIT shared memory extension not present on display.\n" msgstr "" -#: src/video_out/video_out_xcbshm.c:1213 +#: src/video_out/video_out_xcbshm.c:1207 src/video_out/video_out_xshm.c:1249 #, c-format -msgid "video_out_xcbshm: your video mode was not recognized, sorry :-(\n" +msgid "%s: your video mode was not recognized, sorry :-(\n" msgstr "" -#: src/video_out/video_out_xcbshm.c:1243 -#: src/video_out/video_out_xshm.c:1303 +#: src/video_out/video_out_xcbshm.c:1236 src/video_out/video_out_xshm.c:1297 msgid "xine video output plugin using the MIT X shared memory extension" msgstr "" -#: src/video_out/video_out_xcbxv.c:270 +#: src/video_out/video_out_xcbxv.c:265 src/video_out/video_out_xv.c:320 +#: src/video_out/video_out_xxmc.c:652 #, c-format -msgid "" -"video_out_xcbxv: XvShmCreateImage returned a zero size\n" -"video_out_xcbxv: => not using MIT Shared Memory extension.\n" +msgid "%s: XvShmCreateImage returned a zero size\n" msgstr "" -#: src/video_out/video_out_xcbxv.c:279 +#: src/video_out/video_out_xcbxv.c:275 src/video_out/video_out_xv.c:329 +#: src/video_out/video_out_xxmc.c:661 #, c-format -msgid "" -"video_out_xcbxv: shared memory error in shmget: %s\n" -"video_out_xcbxv: => not using MIT Shared Memory extension.\n" +msgid "%s: shared memory error in shmget: %s\n" msgstr "" -#: src/video_out/video_out_xcbxv.c:298 +#: src/video_out/video_out_xcbxv.c:285 #, c-format -msgid "" -"video_out_xcbxv: x11 error during shared memory XImage creation\n" -"video_out_xcbxv: => not using MIT Shared Memory extension.\n" +msgid "%s: shared memory error (address error)\n" msgstr "" -#: src/video_out/video_out_xcbxv.c:1354 +#: src/video_out/video_out_xcbxv.c:1190 src/video_out/video_out_xv.c:1236 +#: src/video_out/video_out_xxmc.c:2468 #, c-format -msgid "video_out_xcbxv: Xv extension not present.\n" +msgid "%s: Xv extension not present.\n" msgstr "" -#: src/video_out/video_out_xcbxv.c:1381 -#: src/video_out/video_out_xxmc.c:2457 +#: src/video_out/video_out_xcbxv.c:1217 src/video_out/video_out_xv.c:1261 +#: src/video_out/video_out_xxmc.c:2493 #, fuzzy, c-format msgid "%s: could not open Xv port %d - autodetecting\n" msgstr "Gaim は監視するポートを開けませんでした。" -#: src/video_out/video_out_xcbxv.c:1397 -#: src/video_out/video_out_xv.c:1440 -#: src/video_out/video_out_xxmc.c:2469 +#: src/video_out/video_out_xcbxv.c:1233 src/video_out/video_out_xv.c:1273 +#: src/video_out/video_out_xxmc.c:2505 #, fuzzy, c-format msgid "%s: no available ports of type \"%s\", defaulting...\n" msgstr "タイプ %s について利用可能なプラグインがありません!\n" -#: src/video_out/video_out_xcbxv.c:1405 +#: src/video_out/video_out_xcbxv.c:1241 src/video_out/video_out_xv.c:1280 +#: src/video_out/video_out_xxmc.c:2512 #, c-format msgid "" -"video_out_xcbxv: Xv extension is present but I couldn't find a usable yuv12 port.\n" -" Looks like your graphics hardware driver doesn't support Xv?!\n" +"%s: Xv extension is present but I couldn't find a usable yuv12 port.\n" +"\tLooks like your graphics hardware driver doesn't support Xv?!\n" msgstr "" -#: src/video_out/video_out_xcbxv.c:1413 +#: src/video_out/video_out_xcbxv.c:1250 #, c-format -msgid "video_out_xcbxv: using Xv port %d from adaptor %s for hardware colour space conversion and scaling.\n" +msgid "" +"%s: using Xv port %d from adaptor %s for hardware colour space conversion " +"and scaling.\n" msgstr "" -#: src/video_out/video_out_xcbxv.c:1538 -#: src/video_out/video_out_xv.c:1591 +#: src/video_out/video_out_xcbxv.c:1379 src/video_out/video_out_xv.c:1429 #, fuzzy msgid "enable vblank sync" msgstr "信用データベース: 同期に失敗しました: %s\n" -#: src/video_out/video_out_xcbxv.c:1539 -#: src/video_out/video_out_xv.c:1592 -msgid "This option will synchronize the update of the video image to the repainting of the entire screen (\"vertical retrace\"). This eliminates flickering and tearing artifacts. On nvidia cards one may also need to run \"nvidia-settings\" and choose which display device to sync to under the XVideo Settings tab" -msgstr "" - -#: src/video_out/video_out_xcbxv.c:1583 -#, c-format -msgid "video_out_xcbxv: this adaptor supports the yv12 format.\n" -msgstr "" - -#: src/video_out/video_out_xcbxv.c:1588 -#, c-format -msgid "video_out_xcbxv: this adaptor supports the yuy2 format.\n" -msgstr "" - -#: src/video_out/video_out_xcbxv.c:1602 -#: src/video_out/video_out_xv.c:1666 -#: src/video_out/video_out_xvmc.c:1535 -#, fuzzy -msgid "deinterlace method (deprecated)" -msgstr "廃止予定の関数呼び出しです" - -#: src/video_out/video_out_xcbxv.c:1603 -#: src/video_out/video_out_xv.c:1667 -#: src/video_out/video_out_xvmc.c:1536 -msgid "" -"This config setting is deprecated. You should use the new deinterlacing post processing settings instead.\n" -"\n" -"From the old days of analog television, where the even and odd numbered lines of a video frame would be displayed at different times comes the idea to increase motion smoothness by also recording the lines at different times. This is called \"interlacing\". But unfortunately, todays displays show the even and odd numbered lines as one complete frame all at the same time (called \"progressive display\"), which results in ugly frame errors known as comb artifacts. Software deinterlacing is an approach to reduce these artifacts. The individual values are:\n" -"\n" -"none\n" -"Disables software deinterlacing.\n" -"\n" -"bob\n" -"Interpolates between the lines for moving parts of the image.\n" -"\n" -"weave\n" -"Similar to bob, but with a tendency to preserve the full resolution, better for high detail in low movement scenes.\n" -"\n" -"greedy\n" -"Very good adaptive deinterlacer, but needs a lot of CPU power.\n" -"\n" -"onefield\n" -"Always interpolates and reduces vertical resolution.\n" -"\n" -"onefieldxv\n" -"Same as onefield, but does the interpolation in hardware.\n" -"\n" -"linearblend\n" -"Applies a slight vertical blur to remove the comb artifacts. Good results with medium CPU usage." -msgstr "" - -#: src/video_out/video_out_xcbxv.c:1657 -#: src/video_out/video_out_xv.c:1740 -#: src/video_out/video_out_xxmc.c:2776 -msgid "xine video output plugin using the MIT X video extension" -msgstr "" - -#: src/video_out/video_out_xshm.c:194 -#, c-format -msgid "" -"video_out_xshm: shared memory error when allocating image\n" -"video_out_xshm: => not using MIT Shared Memory extension.\n" -msgstr "" - -#: src/video_out/video_out_xshm.c:210 -#, c-format -msgid "" -"video_out_xshm: %s: allocating image\n" -"video_out_xshm: => not using MIT Shared Memory extension.\n" -msgstr "" - -#: src/video_out/video_out_xshm.c:220 -#, c-format -msgid "" -"video_out_xshm: shared memory error (address error) when allocating image \n" -"video_out_xshm: => not using MIT Shared Memory extension.\n" -msgstr "" - -#: src/video_out/video_out_xshm.c:237 -#, c-format -msgid "" -"video_out_xshm: x11 error during shared memory XImage creation\n" -"video_out_xshm: => not using MIT Shared Memory extension.\n" -msgstr "" - -#: src/video_out/video_out_xshm.c:1170 -#, c-format -msgid "video_out_xshm: MIT shared memory extension not present on display.\n" -msgstr "" - -#: src/video_out/video_out_xshm.c:1254 -#, c-format -msgid "video_out_xshm: your video mode was not recognized, sorry :-(\n" -msgstr "" - -#: src/video_out/video_out_xv.c:298 -#, c-format +#: src/video_out/video_out_xcbxv.c:1380 src/video_out/video_out_xv.c:1430 msgid "" -"video_out_xv: XvShmCreateImage failed\n" -"video_out_xv: => not using MIT Shared Memory extension.\n" +"This option will synchronize the update of the video image to the repainting " +"of the entire screen (\"vertical retrace\"). This eliminates flickering and " +"tearing artifacts. On nvidia cards one may also need to run \"nvidia-settings" +"\" and choose which display device to sync to under the XVideo Settings tab" msgstr "" -#: src/video_out/video_out_xv.c:324 +#: src/video_out/video_out_xcbxv.c:1425 src/video_out/video_out_xcbxv.c:1431 +#: src/video_out/video_out_xv.c:1472 src/video_out/video_out_xv.c:1478 +#: src/video_out/video_out_xvmc.c:1478 src/video_out/video_out_xvmc.c:1484 +#: src/video_out/video_out_xxmc.c:2697 src/video_out/video_out_xxmc.c:2703 #, c-format -msgid "" -"video_out_xv: XvShmCreateImage returned a zero size\n" -"video_out_xv: => not using MIT Shared Memory extension.\n" +msgid "%s: this adaptor supports the %s format.\n" msgstr "" -#: src/video_out/video_out_xv.c:332 -#, c-format -msgid "" -"video_out_xv: shared memory error in shmget: %s\n" -"video_out_xv: => not using MIT Shared Memory extension.\n" -msgstr "" - -#: src/video_out/video_out_xv.c:364 -#, c-format -msgid "" -"video_out_xv: x11 error during shared memory XImage creation\n" -"video_out_xv: => not using MIT Shared Memory extension.\n" +#: src/video_out/video_out_xcbxv.c:1469 src/video_out/video_out_xv.c:1549 +#: src/video_out/video_out_xxmc.c:2822 +msgid "xine video output plugin using the MIT X video extension" msgstr "" -#: src/video_out/video_out_xv.c:1403 +#: src/video_out/video_out_xshm.c:198 #, c-format -msgid "video_out_xv: Xv extension not present.\n" +msgid "%s: shared memory error when allocating image\n" msgstr "" -#: src/video_out/video_out_xv.c:1428 +#: src/video_out/video_out_xv.c:293 src/video_out/video_out_xxmc.c:641 #, c-format -msgid "%s: could not open Xv port %<PRId32> - autodetecting\n" +msgid "%s: XvShmCreateImage failed\n" msgstr "" -#: src/video_out/video_out_xv.c:1447 +#: src/video_out/video_out_xv.c:1290 src/video_out/video_out_xxmc.c:2522 #, c-format msgid "" -"video_out_xv: Xv extension is present but I couldn't find a usable yuv12 port.\n" -" Looks like your graphics hardware driver doesn't support Xv?!\n" +"%s: using Xv port %ld from adaptor %s for hardware colour space conversion " +"and scaling.\n" msgstr "" -#: src/video_out/video_out_xv.c:1456 -#, c-format -msgid "video_out_xv: using Xv port %ld from adaptor %s for hardware colour space conversion and scaling.\n" -msgstr "" - -#: src/video_out/video_out_xv.c:1633 -#, c-format -msgid "video_out_xv: this adaptor supports the yv12 format.\n" -msgstr "" - -#: src/video_out/video_out_xv.c:1638 -#, c-format -msgid "video_out_xv: this adaptor supports the yuy2 format.\n" -msgstr "" - -#: src/video_out/video_out_xvmc.c:1604 -msgid "xine video output plugin using the XvMC X video extension" -msgstr "" - -#: src/video_out/video_out_xvmc.c:1646 +#: src/video_out/video_out_xvmc.c:1556 #, c-format msgid "video_out_xvmc: XvMC extension not present.\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1744 +#: src/video_out/video_out_xvmc.c:1654 #, c-format -msgid "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 port.\n" +msgid "" +"video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 " +"port.\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1753 +#: src/video_out/video_out_xvmc.c:1663 #, c-format msgid "" "video_out_xvmc: using Xv port %ld from adaptor %s\n" " for hardware colour space conversion and scaling\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1758 +#: src/video_out/video_out_xvmc.c:1668 #, c-format msgid " idct and motion compensation acceleration \n" msgstr "" -#: src/video_out/video_out_xvmc.c:1760 +#: src/video_out/video_out_xvmc.c:1670 #, c-format msgid " motion compensation acceleration only\n" msgstr "" -#: src/video_out/video_out_xvmc.c:1762 +#: src/video_out/video_out_xvmc.c:1672 #, fuzzy, c-format msgid " no XvMC support \n" msgstr " -L, --no-lirc LIRC サポートを無効にする\n" -#: src/video_out/video_out_xvmc.c:1763 +#: src/video_out/video_out_xvmc.c:1673 #, fuzzy, c-format msgid " With Overlay = %d; UnsignedIntra = %d.\n" msgstr "パターンをオーバーレイで使う" -#: src/video_out/video_out_xxmc.c:639 -#, c-format -msgid "" -"video_out_xxmc: XvShmCreateImage failed\n" -"video_out_xxmc: => not using MIT Shared Memory extension.\n" -msgstr "" - -#: src/video_out/video_out_xxmc.c:649 -#, c-format -msgid "" -"video_out_xxmc: XvShmCreateImage returned a zero size\n" -"video_out_xxmc: => not using MIT Shared Memory extension.\n" -msgstr "" - -#: src/video_out/video_out_xxmc.c:657 -#, c-format -msgid "" -"video_out_xxmc: shared memory error in shmget: %s\n" -"video_out_xxmc: => not using MIT Shared Memory extension.\n" -msgstr "" - -#: src/video_out/video_out_xxmc.c:689 -#, c-format -msgid "" -"video_out_xxmc: x11 error during shared memory XImage creation\n" -"video_out_xxmc: => not using MIT Shared Memory extension.\n" -msgstr "" - -#: src/video_out/video_out_xxmc.c:2432 -#, c-format -msgid "video_out_xxmc: Xv extension not present.\n" -msgstr "" - -#: src/video_out/video_out_xxmc.c:2476 -#, c-format -msgid "" -"video_out_xxmc: Xv extension is present but I couldn't find a usable yuv12 port.\n" -" Looks like your graphics hardware driver doesn't support Xv?!\n" -msgstr "" - -#: src/video_out/video_out_xxmc.c:2485 -#, c-format -msgid "video_out_xxmc: using Xv port %ld from adaptor %s for hardware colour space conversion and scaling.\n" -msgstr "" - -#: src/video_out/video_out_xxmc.c:2654 -#, c-format -msgid "video_out_xxmc: this adaptor supports the yv12 format.\n" -msgstr "" - -#: src/video_out/video_out_xxmc.c:2659 -#, c-format -msgid "video_out_xxmc: this adaptor supports the yuy2 format.\n" +#: src/video_out/video_out_xvmc.c:1686 +msgid "xine video output plugin using the XvMC X video extension" msgstr "" -#: src/video_out/video_out_xxmc.c:2687 +#: src/video_out/video_out_xxmc.c:2734 msgid "Make XvMC allocate more frames for better buffering." msgstr "" -#: src/video_out/video_out_xxmc.c:2688 +#: src/video_out/video_out_xxmc.c:2735 msgid "" "Some XvMC implementations allow more than 8 frames.\n" "This option, when turned on, makes the driver try to\n" "allocate 15 frames. A must for unichrome and live VDR.\n" msgstr "" -#: src/video_out/video_out_xxmc.c:2694 +#: src/video_out/video_out_xxmc.c:2741 #, fuzzy msgid "Unichrome cpu save" msgstr "/ファイル/別名で保存(_A)..." -#: src/video_out/video_out_xxmc.c:2695 +#: src/video_out/video_out_xxmc.c:2742 msgid "" "Saves CPU time by sleeping while decoder works.\n" "Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n" "Experimental.\n" msgstr "" -#: src/video_out/video_out_xxmc.c:2701 +#: src/video_out/video_out_xxmc.c:2748 msgid "Fix buggy NVIDIA XvMC subpicture colours" msgstr "" -#: src/video_out/video_out_xxmc.c:2702 +#: src/video_out/video_out_xxmc.c:2749 msgid "" "There's a bug in NVIDIA's XvMC lib that makes red OSD colours\n" "look blue and vice versa. This option provides a workaround.\n" msgstr "" -#: src/video_out/video_out_xxmc.c:2707 +#: src/video_out/video_out_xxmc.c:2754 msgid "Use bob as accelerated deinterlace method." msgstr "" -#: src/video_out/video_out_xxmc.c:2708 +#: src/video_out/video_out_xxmc.c:2755 msgid "" "When interlacing is enabled for hardware accelerated frames,\n" "alternate between top and bottom field at double the frame rate.\n" msgstr "" -#: src/video_out/video_out_xxmc.c:2714 +#: src/video_out/video_out_xxmc.c:2761 msgid "Don't use bob deinterlacing for progressive frames." msgstr "" -#: src/video_out/video_out_xxmc.c:2715 +#: src/video_out/video_out_xxmc.c:2762 msgid "" "Progressive frames don't need deinterlacing, so disabling it on\n" "demand should result in a better picture.\n" msgstr "" -#: src/video_out/video_out_xxmc.c:2721 +#: src/video_out/video_out_xxmc.c:2768 msgid "Don't use bob deinterlacing while a scaled OSD is active." msgstr "" -#: src/video_out/video_out_xxmc.c:2722 +#: src/video_out/video_out_xxmc.c:2769 msgid "" "Bob deinterlacing adds some noise to horizontal lines, so disabling it\n" "on demand should result in a better OSD picture.\n" msgstr "" -#: src/video_out/x11osd.c:274 -#: src/video_out/xcbosd.c:268 +#: src/video_out/x11osd.c:274 src/video_out/xcbosd.c:268 #, c-format msgid "x11osd: XShape extension not available. unscaled overlay disabled.\n" msgstr "" -#: src/video_out/x11osd.c:287 -#: src/video_out/xcbosd.c:281 +#: src/video_out/x11osd.c:287 src/video_out/xcbosd.c:281 #, c-format msgid "x11osd: error creating window. unscaled overlay disabled.\n" msgstr "" -#: src/video_out/x11osd.c:295 -#: src/video_out/x11osd.c:336 +#: src/video_out/x11osd.c:295 src/video_out/x11osd.c:336 #: src/video_out/xcbosd.c:291 #, c-format msgid "x11osd: error creating pixmap. unscaled overlay disabled.\n" msgstr "" -#: src/video_out/x11osd.c:346 -#: src/video_out/xcbosd.c:330 +#: src/video_out/x11osd.c:346 src/video_out/xcbosd.c:330 #, c-format msgid "x11osd: unscaled overlay created (%s mode).\n" msgstr "" @@ -4007,7 +4372,8 @@ msgstr "主操作モード:" #: src/video_out/xv_common.h:35 msgid "" -"Selects the bilinear scaling mode for Permedia cards. The individual values are:\n" +"Selects the bilinear scaling mode for Permedia cards. The individual values " +"are:\n" "\n" "Permedia 2\n" "0 - disable bilinear filtering\n" @@ -4042,7 +4408,8 @@ msgstr "" #: src/video_out/xv_common.h:74 msgid "" -"Selects which video output method is preferred. Detection is done using the reported Xv adaptor names.\n" +"Selects which video output method is preferred. Detection is done using the " +"reported Xv adaptor names.\n" "(Only applies when auto-detecting which Xv port to use.)" msgstr "" @@ -4052,7 +4419,9 @@ msgid "bicubic filtering" msgstr "レティネックス: フィルタをかけています..." #: src/video_out/xv_common.h:82 -msgid "This option controls bicubic filtering of the video image. It may be used instead of, or as well as, xine's deinterlacers." +msgid "" +"This option controls bicubic filtering of the video image. It may be used " +"instead of, or as well as, xine's deinterlacers." msgstr "" #: src/xine-engine/alphablend.c:2150 @@ -4061,8 +4430,11 @@ msgstr "" #: src/xine-engine/alphablend.c:2151 msgid "" -"If you experience a performance impact when an On Screen Display or other overlays like DVD subtitles are active, then you might want to enable this option.\n" -"The result is that alpha blending of overlays is less accurate than before, but the CPU usage will be decreased as well." +"If you experience a performance impact when an On Screen Display or other " +"overlays like DVD subtitles are active, then you might want to enable this " +"option.\n" +"The result is that alpha blending of overlays is less accurate than before, " +"but the CPU usage will be decreased as well." msgstr "" #: src/xine-engine/audio_decoder.c:367 @@ -4081,152 +4453,180 @@ msgid "number of audio buffers" msgstr "CD ディジタル・オーディオ" #: src/xine-engine/audio_decoder.c:489 -msgid "The number of audio buffers (each is 8k in size) xine uses in its internal queue. Higher values mean smoother playback for unreliable inputs, but also increased latency and memory consumption." +msgid "" +"The number of audio buffers (each is 8k in size) xine uses in its internal " +"queue. Higher values mean smoother playback for unreliable inputs, but also " +"increased latency and memory consumption." msgstr "" -#: src/xine-engine/audio_out.c:1115 +#: src/xine-engine/audio_out.c:1117 #, c-format -msgid "audio_out: delay calculation impossible with an unavailable audio device\n" +msgid "" +"audio_out: delay calculation impossible with an unavailable audio device\n" msgstr "" -#: src/xine-engine/audio_out.c:1254 +#: src/xine-engine/audio_out.c:1256 #, c-format msgid "write to sound card failed. Assuming the device was unplugged.\n" msgstr "" -#: src/xine-engine/audio_out.c:1434 +#: src/xine-engine/audio_out.c:1436 #, c-format msgid "8 bits not supported by driver, converting to 16 bits.\n" msgstr "" -#: src/xine-engine/audio_out.c:1442 +#: src/xine-engine/audio_out.c:1444 #, c-format msgid "mono not supported by driver, converting to stereo.\n" msgstr "" -#: src/xine-engine/audio_out.c:1448 +#: src/xine-engine/audio_out.c:1450 #, c-format msgid "stereo not supported by driver, converting to mono.\n" msgstr "" -#: src/xine-engine/audio_out.c:2130 +#: src/xine-engine/audio_out.c:2132 msgid "method to sync audio and video" msgstr "" -#: src/xine-engine/audio_out.c:2131 +#: src/xine-engine/audio_out.c:2133 msgid "" -"When playing audio and video, there are at least two clocks involved: The system clock, to which video frames are synchronized and the clock in your sound hardware, which determines the speed of the audio playback. These clocks are never ticking at the same speed except for some rare cases where they are physically identical. In general, the two clocks will run drift after some time, for which xine offers two ways to keep audio and video synchronized:\n" +"When playing audio and video, there are at least two clocks involved: The " +"system clock, to which video frames are synchronized and the clock in your " +"sound hardware, which determines the speed of the audio playback. These " +"clocks are never ticking at the same speed except for some rare cases where " +"they are physically identical. In general, the two clocks will run drift " +"after some time, for which xine offers two ways to keep audio and video " +"synchronized:\n" "\n" "metronom feedback\n" -"This is the standard method, which applies a countereffecting video drift, as soon as the audio drift has accumulated over a threshold.\n" +"This is the standard method, which applies a countereffecting video drift, " +"as soon as the audio drift has accumulated over a threshold.\n" "\n" "resample\n" -"For some video hardware, which is limited to a fixed frame rate (like the DXR3 or other decoder cards) the above does not work, because the video cannot drift. Therefore we resample the audio stream to make it longer or shorter to compensate the audio drift error. This does not work for digital passthrough, where audio data is passed to an external decoder in digital form." +"For some video hardware, which is limited to a fixed frame rate (like the " +"DXR3 or other decoder cards) the above does not work, because the video " +"cannot drift. Therefore we resample the audio stream to make it longer or " +"shorter to compensate the audio drift error. This does not work for digital " +"passthrough, where audio data is passed to an external decoder in digital " +"form." msgstr "" -#: src/xine-engine/audio_out.c:2159 +#: src/xine-engine/audio_out.c:2161 #, fuzzy msgid "enable resampling" msgstr "TurboPlay を有効にする" -#: src/xine-engine/audio_out.c:2160 -msgid "When the sample rate of the decoded audio does not match the capabilities of your sound hardware, an adaptation called \"resampling\" is required. Here you can select, whether resampling is enabled, disabled or used automatically when necessary." +#: src/xine-engine/audio_out.c:2162 +msgid "" +"When the sample rate of the decoded audio does not match the capabilities of " +"your sound hardware, an adaptation called \"resampling\" is required. Here " +"you can select, whether resampling is enabled, disabled or used " +"automatically when necessary." msgstr "" -#: src/xine-engine/audio_out.c:2167 +#: src/xine-engine/audio_out.c:2169 msgid "always resample to this rate (0 to disable)" msgstr "" -#: src/xine-engine/audio_out.c:2168 -msgid "Some audio drivers do not correctly announce the capabilities of the audio hardware. By setting a value other than zero here, you can force the audio stream to be resampled to the given rate." +#: src/xine-engine/audio_out.c:2170 +msgid "" +"Some audio drivers do not correctly announce the capabilities of the audio " +"hardware. By setting a value other than zero here, you can force the audio " +"stream to be resampled to the given rate." msgstr "" -#: src/xine-engine/audio_out.c:2177 +#: src/xine-engine/audio_out.c:2179 #, fuzzy msgid "offset for digital passthrough" msgstr "%s: 不適切な文字列オフセット %u >= %lu (セクション `%s' 用)" -#: src/xine-engine/audio_out.c:2178 +#: src/xine-engine/audio_out.c:2180 msgid "" -"If you use an external surround decoder and audio is ahead or behind video, you can enter a fixed offset here to compensate.\n" +"If you use an external surround decoder and audio is ahead or behind video, " +"you can enter a fixed offset here to compensate.\n" "The unit of the value is one PTS tick, which is the 90000th part of a second." msgstr "" -#: src/xine-engine/audio_out.c:2187 +#: src/xine-engine/audio_out.c:2189 msgid "play audio even on slow/fast speeds" msgstr "" -#: src/xine-engine/audio_out.c:2188 -msgid "If you enable this option, the audio will be heard even when playback speed is different than 1X. Of course, it will sound distorted (lower/higher pitch). If want to experiment preserving the pitch you may try the 'stretch' audio post plugin instead." +#: src/xine-engine/audio_out.c:2190 +msgid "" +"If you enable this option, the audio will be heard even when playback speed " +"is different than 1X. Of course, it will sound distorted (lower/higher " +"pitch). If want to experiment preserving the pitch you may try the 'stretch' " +"audio post plugin instead." msgstr "" -#: src/xine-engine/audio_out.c:2261 +#: src/xine-engine/audio_out.c:2263 msgid "startup audio volume" msgstr "起動時の音量" -#: src/xine-engine/audio_out.c:2262 +#: src/xine-engine/audio_out.c:2264 msgid "The overall audio volume set at xine startup." msgstr "" -#: src/xine-engine/audio_out.c:2265 +#: src/xine-engine/audio_out.c:2267 msgid "restore volume level at startup" msgstr "" -#: src/xine-engine/audio_out.c:2266 +#: src/xine-engine/audio_out.c:2268 msgid "If disabled, xine will not modify any mixer settings at startup." msgstr "" -#: src/xine-engine/audio_out.c:2298 +#: src/xine-engine/audio_out.c:2300 #, c-format msgid "audio_out: sorry, this should not happen. please restart xine.\n" msgstr "" -#: src/xine-engine/buffer.c:64 +#: src/xine-engine/buffer.c:70 #, c-format msgid "xine-lib: buffer.c: There has been a fatal error: TOO MANY FREE's\n" msgstr "" -#: src/xine-engine/configfile.c:939 +#: src/xine-engine/configfile.c:953 #, c-format msgid "The current config file has been modified by a newer version of xine." msgstr "" -#: src/xine-engine/configfile.c:992 +#: src/xine-engine/configfile.c:1006 #, fuzzy, c-format msgid "Loaded configuration from file '%s'\n" msgstr "設定ファイルから削除するディレクトリ" -#: src/xine-engine/configfile.c:997 +#: src/xine-engine/configfile.c:1011 #, fuzzy, c-format msgid "Failed to load configuration from file '%s': %s\n" msgstr "'%s' から設定ファイルのパスを取得できませんでした" -#: src/xine-engine/configfile.c:1052 +#: src/xine-engine/configfile.c:1066 #, c-format msgid "configfile: WARNING: backing up configfile to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1053 +#: src/xine-engine/configfile.c:1067 #, c-format msgid "configfile: WARNING: your configuration will not be saved\n" msgstr "" -#: src/xine-engine/configfile.c:1153 +#: src/xine-engine/configfile.c:1167 #, c-format msgid "configfile: WARNING: writing configuration to %s failed\n" msgstr "" -#: src/xine-engine/configfile.c:1154 +#: src/xine-engine/configfile.c:1168 #, c-format msgid "configfile: WARNING: removing possibly broken config file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1155 +#: src/xine-engine/configfile.c:1169 #, c-format msgid "configfile: WARNING: you should check the backup file %s\n" msgstr "" -#: src/xine-engine/configfile.c:1290 +#: src/xine-engine/configfile.c:1631 #, c-format msgid "configfile: entry '%s' mustn't be modified from MRL\n" msgstr "" @@ -4238,88 +4638,91 @@ msgstr "" #: src/xine-engine/info_helper.c:242 #, c-format -msgid "info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n" +msgid "" +"info_helper: unsupported conversion %s -> UTF-8, no conversion performed\n" msgstr "" -#: src/xine-engine/input_cache.c:170 +#: src/xine-engine/input_cache.c:172 #, c-format msgid ": open() function should never be called\n" msgstr "" -#: src/xine-engine/input_cache.c:353 +#: src/xine-engine/input_cache.c:355 #, fuzzy, c-format msgid ": input plugin not defined!\n" msgstr "このプラグインは ID を定義していません。" -#: src/xine-engine/input_rip.c:138 -#: src/xine-engine/input_rip.c:258 +#: src/xine-engine/input_rip.c:140 src/xine-engine/input_rip.c:260 #, c-format msgid "input_rip: reading of saved data failed: %s\n" msgstr "" -#: src/xine-engine/input_rip.c:153 +#: src/xine-engine/input_rip.c:155 #, c-format msgid "input_rip: reading by input plugin failed\n" msgstr "" -#: src/xine-engine/input_rip.c:161 -#: src/xine-engine/input_rip.c:290 -#: src/xine-engine/input_rip.c:655 +#: src/xine-engine/input_rip.c:163 src/xine-engine/input_rip.c:292 +#: src/xine-engine/input_rip.c:657 #, c-format msgid "input_rip: error writing to file %<PRIdMAX> bytes: %s\n" msgstr "" -#: src/xine-engine/input_rip.c:182 +#: src/xine-engine/input_rip.c:184 #, c-format msgid "input_rip: open() function should never be called\n" msgstr "" -#: src/xine-engine/input_rip.c:313 -#: src/xine-engine/input_rip.c:418 +#: src/xine-engine/input_rip.c:315 src/xine-engine/input_rip.c:420 #, fuzzy, c-format msgid "input_rip: seeking failed\n" msgstr "自動再生入力プラグイン '%s' が失敗しました" -#: src/xine-engine/input_rip.c:370 -#: src/xine-engine/input_rip.c:388 +#: src/xine-engine/input_rip.c:372 src/xine-engine/input_rip.c:390 #, fuzzy, c-format msgid "input_rip: seeking failed: %s\n" msgstr "自動再生入力プラグイン '%s' が失敗しました" -#: src/xine-engine/input_rip.c:396 +#: src/xine-engine/input_rip.c:398 #, c-format msgid "input_rip: %<PRIdMAX> bytes dropped\n" msgstr "" -#: src/xine-engine/input_rip.c:560 +#: src/xine-engine/input_rip.c:562 #, fuzzy, c-format msgid "input_rip: input plugin not defined!\n" msgstr "このプラグインは ID を定義していません。" -#: src/xine-engine/input_rip.c:566 +#: src/xine-engine/input_rip.c:568 #, c-format -msgid "input_rip: target directory wasn't specified, please fill out the option 'media.capture.save_dir'\n" +msgid "" +"input_rip: target directory wasn't specified, please fill out the option " +"'media.capture.save_dir'\n" msgstr "" -#: src/xine-engine/input_rip.c:568 -msgid "The stream save feature is disabled until you set media.capture.save_dir in the configuration." +#: src/xine-engine/input_rip.c:570 +msgid "" +"The stream save feature is disabled until you set media.capture.save_dir in " +"the configuration." msgstr "" -#: src/xine-engine/input_rip.c:575 +#: src/xine-engine/input_rip.c:577 #, c-format msgid "input_rip: ripping/caching of this source is not permitted!\n" msgstr "" -#: src/xine-engine/input_rip.c:577 -msgid "xine is not allowed to save from this source. (possibly copyrighted material?)" +#: src/xine-engine/input_rip.c:579 +msgid "" +"xine is not allowed to save from this source. (possibly copyrighted " +"material?)" msgstr "" -#: src/xine-engine/input_rip.c:583 +#: src/xine-engine/input_rip.c:585 #, c-format msgid "input_rip: file name not given!\n" msgstr "" -#: src/xine-engine/input_rip.c:625 +#: src/xine-engine/input_rip.c:627 #, fuzzy, c-format msgid "input_rip: error opening file %s: %s\n" msgstr "ファイルをオープンする際にエラーが発生しました。" @@ -4339,493 +4742,534 @@ msgstr "子プロセス/ファイルへの IO が失敗しました" msgid "failed to get status of socket" msgstr "クラスの状態を取得できません:" -#: src/xine-engine/io_helper.c:388 +#: src/xine-engine/io_helper.c:389 #, c-format msgid "io_helper: Permission denied\n" msgstr "" -#: src/xine-engine/io_helper.c:392 +#: src/xine-engine/io_helper.c:393 #, fuzzy, c-format msgid "io_helper: File not found\n" msgstr "日付サンプルファイルが見つかりません" -#: src/xine-engine/io_helper.c:396 +#: src/xine-engine/io_helper.c:397 #, fuzzy, c-format msgid "io_helper: Connection Refused\n" msgstr "サーバから接続を拒絶されました。応答: %s" -#: src/xine-engine/load_plugins.c:208 +#: src/xine-engine/load_plugins.c:216 #, c-format msgid "map_decoder_list: no space for decoder, skipped.\n" msgstr "" -#: src/xine-engine/load_plugins.c:322 +#: src/xine-engine/load_plugins.c:331 #, c-format -msgid "load_plugins: ignoring plugin %s, wrong iface version %d (should be %d)\n" +msgid "" +"load_plugins: ignoring plugin %s, wrong iface version %d (should be %d)\n" msgstr "" -#: src/xine-engine/load_plugins.c:384 +#: src/xine-engine/load_plugins.c:391 #, fuzzy, c-format msgid "priority for %s decoder" msgstr "`%2$s' に対する引数 %1$s が曖昧です" -#: src/xine-engine/load_plugins.c:389 +#: src/xine-engine/load_plugins.c:396 msgid "" -"The priority provides a ranking in case some media can be handled by more than one decoder.\n" +"The priority provides a ranking in case some media can be handled by more " +"than one decoder.\n" "A priority of 0 enables the decoder's default priority." msgstr "" -#: src/xine-engine/load_plugins.c:417 +#: src/xine-engine/load_plugins.c:424 #, c-format -msgid "load_plugins: demuxer plugin %s does not provide a priority, xine-lib will use the default priority.\n" +msgid "" +"load_plugins: demuxer plugin %s does not provide a priority, xine-lib will " +"use the default priority.\n" msgstr "" -#: src/xine-engine/load_plugins.c:434 +#: src/xine-engine/load_plugins.c:441 #, c-format -msgid "load_plugins: input plugin %s does not provide a priority, xine-lib will use the default priority.\n" +msgid "" +"load_plugins: input plugin %s does not provide a priority, xine-lib will use " +"the default priority.\n" msgstr "" -#: src/xine-engine/load_plugins.c:490 +#: src/xine-engine/load_plugins.c:498 #, fuzzy, c-format msgid "load_plugins: plugin %s found\n" msgstr "" "プラグイン '%s' を読み込めませんでした\n" "%s" -#: src/xine-engine/load_plugins.c:493 +#: src/xine-engine/load_plugins.c:501 #, c-format msgid "load_plugins: static plugin found\n" msgstr "" -#: src/xine-engine/load_plugins.c:500 +#: src/xine-engine/load_plugins.c:508 #, c-format msgid "load_plugins: plugin limit reached, %s could not be loaded\n" msgstr "" -#: src/xine-engine/load_plugins.c:503 +#: src/xine-engine/load_plugins.c:511 #, c-format msgid "load_plugins: plugin limit reached, static plugin could not be loaded\n" msgstr "" -#: src/xine-engine/load_plugins.c:520 +#: src/xine-engine/load_plugins.c:528 #, c-format msgid "load_plugins: unknown plugin type %d in %s\n" msgstr "" -#: src/xine-engine/load_plugins.c:524 +#: src/xine-engine/load_plugins.c:532 #, c-format msgid "load_plugins: unknown statically linked plugin type %d\n" msgstr "" -#: src/xine-engine/load_plugins.c:579 +#: src/xine-engine/load_plugins.c:589 #, fuzzy, c-format msgid "load_plugins: unable to stat %s\n" msgstr "vsnprintf 内で状態を得られません" -#: src/xine-engine/load_plugins.c:620 +#: src/xine-engine/load_plugins.c:631 #, c-format msgid "" "load_plugins: cannot open plugin lib %s:\n" "%s\n" msgstr "" -#: src/xine-engine/load_plugins.c:635 +#: src/xine-engine/load_plugins.c:646 #, c-format msgid "" "load_plugins: can't get plugin info from %s:\n" "%s\n" msgstr "" -#: src/xine-engine/load_plugins.c:653 +#: src/xine-engine/load_plugins.c:664 #, c-format msgid "load_plugins: skipping unreadable plugin directory %s.\n" msgstr "" -#: src/xine-engine/load_plugins.c:702 +#: src/xine-engine/load_plugins.c:732 #, c-format msgid "" "load_plugins: cannot (stage 2) open plugin lib %s:\n" "%s\n" msgstr "" -#: src/xine-engine/load_plugins.c:728 +#: src/xine-engine/load_plugins.c:766 #, c-format msgid "load_plugins: Yikes! %s doesn't contain plugin info.\n" msgstr "" -#: src/xine-engine/load_plugins.c:1092 +#: src/xine-engine/load_plugins.c:1170 src/xine-engine/load_plugins.c:1179 +#, fuzzy, c-format +msgid "Unable to create %s directory: %s\n" +msgstr "'%s' をオープンできません" + +#: src/xine-engine/load_plugins.c:1217 #, fuzzy, c-format msgid "failed to save catalogue cache: %s\n" msgstr "鍵輪キャッシュの再構築に失敗しました: %s\n" -#: src/xine-engine/load_plugins.c:1099 +#: src/xine-engine/load_plugins.c:1224 #, fuzzy, c-format msgid "failed to replace catalogue cache: %s\n" msgstr "鍵輪キャッシュの再構築に失敗しました: %s\n" -#: src/xine-engine/load_plugins.c:1105 +#: src/xine-engine/load_plugins.c:1230 #, c-format msgid "failed to remove new catalogue cache: %s\n" msgstr "" -#: src/xine-engine/load_plugins.c:1362 +#: src/xine-engine/load_plugins.c:1492 #, c-format msgid "load_plugins: unknown content detection strategy %d\n" msgstr "" -#: src/xine-engine/load_plugins.c:1472 +#: src/xine-engine/load_plugins.c:1617 #, c-format msgid "load_plugins: using demuxer '%s'\n" msgstr "" -#: src/xine-engine/load_plugins.c:1798 -#: src/xine-engine/load_plugins.c:1845 +#: src/xine-engine/load_plugins.c:1944 src/xine-engine/load_plugins.c:1991 #, c-format msgid "load_plugins: failed to load audio output plugin <%s>\n" msgstr "" -#: src/xine-engine/load_plugins.c:1848 +#: src/xine-engine/load_plugins.c:1994 #, c-format -msgid "load_plugins: audio output auto-probing didn't find any usable audio driver.\n" +msgid "" +"load_plugins: audio output auto-probing didn't find any usable audio " +"driver.\n" msgstr "" -#: src/xine-engine/load_plugins.c:2152 +#: src/xine-engine/load_plugins.c:2304 #, c-format msgid "" "load_plugins: cannot unload plugin lib %s:\n" "%s\n" msgstr "" -#: src/xine-engine/osd.c:738 +#: src/xine-engine/osd.c:889 #, c-format msgid "font '%s-%d' already loaded, weird.\n" msgstr "" -#: src/xine-engine/osd.c:750 +#: src/xine-engine/osd.c:901 #, fuzzy, c-format msgid "font '%s' loading failed (%d < %d)\n" msgstr "画像の読み込みに失敗しました..." -#: src/xine-engine/osd.c:760 +#: src/xine-engine/osd.c:911 #, fuzzy, c-format msgid "wrong version for font '%s'. expected %d found %d.\n" -msgstr "'%s' 用 RA のバージョンが一致しません: 実際 %d.%d.%d%s, 予想 %d.%d.%d%s" - -#: src/xine-engine/osd.c:827 -#, c-format -msgid "osd: cannot initialize ft2 library\n" msgstr "" +"'%s' 用 RA のバージョンが一致しません: 実際 %d.%d.%d%s, 予想 %d.%d.%d%s" -#: src/xine-engine/osd.c:855 +#: src/xine-engine/osd.c:998 #, c-format msgid "osd: error matching font %s with FontConfig" msgstr "" -#: src/xine-engine/osd.c:869 +#: src/xine-engine/osd.c:1012 #, c-format msgid "osd: error loading font %s with FontConfig" msgstr "" -#: src/xine-engine/osd.c:872 +#: src/xine-engine/osd.c:1016 #, c-format msgid "osd: error looking up font %s with FontConfig" msgstr "" -#: src/xine-engine/osd.c:893 +#: src/xine-engine/osd.c:1056 +#, c-format +msgid "osd: error loading font %s with in XDG data directories.\n" +msgstr "" + +#: src/xine-engine/osd.c:1065 #, c-format -msgid "osd: error loading font %s with ft2\n" +msgid "osd: cannot initialize ft2 library\n" msgstr "" -#: src/xine-engine/osd.c:902 +#: src/xine-engine/osd.c:1091 #, c-format msgid "osd: error setting font size (no scalable font?)\n" msgstr "" -#: src/xine-engine/osd.c:1017 +#: src/xine-engine/osd.c:1206 #, c-format -msgid "osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", skipping\n" +msgid "" +"osd: unknown sequence starting with byte 0x%02X in encoding \"%s\", " +"skipping\n" msgstr "" -#: src/xine-engine/osd.c:1073 +#: src/xine-engine/osd.c:1262 #, c-format msgid "osd: can't find out current locale character set\n" msgstr "" -#: src/xine-engine/osd.c:1083 +#: src/xine-engine/osd.c:1272 #, c-format msgid "osd: unsupported conversion %s -> %s, no conversion performed\n" msgstr "" -#: src/xine-engine/osd.c:1138 -#: src/xine-engine/osd.c:1306 +#: src/xine-engine/osd.c:1327 src/xine-engine/osd.c:1496 #, c-format msgid "osd: font isn't defined\n" msgstr "" -#: src/xine-engine/osd.c:1177 +#: src/xine-engine/osd.c:1367 #, fuzzy, c-format msgid "osd: error loading glyph\n" msgstr "共有ライブラリのロード中にエラー" -#: src/xine-engine/osd.c:1183 +#: src/xine-engine/osd.c:1373 #, c-format msgid "osd: error in rendering glyph\n" msgstr "" -#: src/xine-engine/osd.c:1343 +#: src/xine-engine/osd.c:1533 #, fuzzy, c-format msgid "osd: error loading glyph %i\n" msgstr "共有ライブラリのロード中にエラー" -#: src/xine-engine/osd.c:1350 +#: src/xine-engine/osd.c:1540 #, fuzzy, c-format msgid "osd: error in rendering\n" msgstr "%.250s で読み込みエラーです" -#: src/xine-engine/osd.c:1596 +#: src/xine-engine/osd.c:1837 msgid "palette (foreground-border-background) to use for subtitles and OSD" msgstr "" -#: src/xine-engine/osd.c:1597 -msgid "The palette for on-screen-display and some subtitle formats that do not specify any colouring themselves. The palettes are listed in the form: foreground-border-background." +#: src/xine-engine/osd.c:1838 +msgid "" +"The palette for on-screen-display and some subtitle formats that do not " +"specify any colouring themselves. The palettes are listed in the form: " +"foreground-border-background." +msgstr "" + +#: src/xine-engine/spu.c:36 +msgid "opacity for the black parts of bitmapped subtitles" msgstr "" -#: src/xine-engine/video_decoder.c:391 +#: src/xine-engine/spu.c:41 +msgid "opacity for the colour parts of bitmapped subtitles" +msgstr "" + +#: src/xine-engine/video_decoder.c:392 #, c-format msgid "video_decoder: no plugin available to handle '%s'\n" msgstr "" -#: src/xine-engine/video_decoder.c:470 +#: src/xine-engine/video_decoder.c:471 #, c-format msgid "video_decoder: error, unknown buffer type: %08x\n" msgstr "" -#: src/xine-engine/video_decoder.c:508 +#: src/xine-engine/video_decoder.c:509 #, fuzzy msgid "number of video buffers" msgstr "ビデオ形式をサポートしています。\n" -#: src/xine-engine/video_decoder.c:509 -msgid "The number of video buffers (each is 8k in size) xine uses in its internal queue. Higher values mean smoother playback for unreliable inputs, but also increased latency and memory consumption." +#: src/xine-engine/video_decoder.c:510 +msgid "" +"The number of video buffers (each is 8k in size) xine uses in its internal " +"queue. Higher values mean smoother playback for unreliable inputs, but also " +"increased latency and memory consumption." msgstr "" -#: src/xine-engine/video_out.c:666 +#: src/xine-engine/video_out.c:669 #, c-format msgid "%d frames delivered, %d frames skipped, %d frames discarded\n" msgstr "" -#: src/xine-engine/video_out.c:839 +#: src/xine-engine/video_out.c:842 #, c-format -msgid "video_out: throwing away image with pts %<PRId64> because it's too old (diff : %<PRId64>).\n" +msgid "" +"video_out: throwing away image with pts %<PRId64> because it's too old " +"(diff : %<PRId64>).\n" msgstr "" -#: src/xine-engine/video_out.c:1823 +#: src/xine-engine/video_out.c:1879 #, fuzzy msgid "default number of video frames" msgstr "デフォルトのエントリにリビジョン番号がありません" -#: src/xine-engine/video_out.c:1824 -msgid "The default number of video frames to request from xine video out driver. Some drivers will override this setting with their own values." +#: src/xine-engine/video_out.c:1880 +msgid "" +"The default number of video frames to request from xine video out driver. " +"Some drivers will override this setting with their own values." msgstr "" -#: src/xine-engine/video_out.c:1881 +#: src/xine-engine/video_out.c:1937 msgid "percentage of skipped frames to tolerate" msgstr "" -#: src/xine-engine/video_out.c:1882 -msgid "When more than this percentage of frames are not shown, because they were not decoded in time, xine sends a notification." +#: src/xine-engine/video_out.c:1938 +msgid "" +"When more than this percentage of frames are not shown, because they were " +"not decoded in time, xine sends a notification." msgstr "" -#: src/xine-engine/video_out.c:1887 +#: src/xine-engine/video_out.c:1943 msgid "percentage of discarded frames to tolerate" msgstr "" -#: src/xine-engine/video_out.c:1888 -msgid "When more than this percentage of frames are not shown, because they were not scheduled for display in time, xine sends a notification." +#: src/xine-engine/video_out.c:1944 +msgid "" +"When more than this percentage of frames are not shown, because they were " +"not scheduled for display in time, xine sends a notification." msgstr "" -#: src/xine-engine/video_out.c:1924 +#: src/xine-engine/video_out.c:1983 #, c-format msgid "video_out: sorry, this should not happen. please restart xine.\n" msgstr "" -#: src/xine-engine/vo_scale.c:391 +#: src/xine-engine/vo_scale.c:384 msgid "horizontal image position in the output window" msgstr "" -#: src/xine-engine/vo_scale.c:392 +#: src/xine-engine/vo_scale.c:385 msgid "" -"If the video window's horizontal size is bigger than the actual image to show, you can adjust the position where the image will be placed.\n" -"The position is given as a percentage, so a value of 50 means \"in the middle\", while 0 means \"at the very left\" and 100 \"at the very right\"." +"If the video window's horizontal size is bigger than the actual image to " +"show, you can adjust the position where the image will be placed.\n" +"The position is given as a percentage, so a value of 50 means \"in the middle" +"\", while 0 means \"at the very left\" and 100 \"at the very right\"." msgstr "" -#: src/xine-engine/vo_scale.c:399 +#: src/xine-engine/vo_scale.c:392 msgid "vertical image position in the output window" msgstr "" -#: src/xine-engine/vo_scale.c:400 +#: src/xine-engine/vo_scale.c:393 msgid "" -"If the video window's vertical size is bigger than the actual image to show, you can adjust the position where the image will be placed.\n" -"The position is given as a percentage, so a value of 50 means \"in the middle\", while 0 means \"at the top\" and 100 \"at the bottom\"." +"If the video window's vertical size is bigger than the actual image to show, " +"you can adjust the position where the image will be placed.\n" +"The position is given as a percentage, so a value of 50 means \"in the middle" +"\", while 0 means \"at the top\" and 100 \"at the bottom\"." msgstr "" -#: src/xine-engine/vo_scale.c:407 +#: src/xine-engine/vo_scale.c:400 #, fuzzy msgid "disable all video scaling" msgstr "サムネイル表示する外部のプログラムを全て無効にする" -#: src/xine-engine/vo_scale.c:408 +#: src/xine-engine/vo_scale.c:401 msgid "" -"If you want the video image to be always shown at its original resolution, you can disable all image scaling here.\n" -"This of course means that the image will no longer adapt to the size of the video window and that videos with a pixel aspect ratio other than 1:1, like anamorphic DVDs, will be shown distorted. But on the other hand, with some video output drivers like XShm, where the image scaling is not hardware accelerated, this can dramatically reduce CPU usage." -msgstr "" - -#: src/xine-engine/xine.c:815 -#: src/xine-engine/xine.c:936 -#: src/xine-engine/xine.c:976 -#: src/xine-engine/xine.c:1012 -#: src/xine-engine/xine.c:1024 -#: src/xine-engine/xine.c:1037 -#: src/xine-engine/xine.c:1050 -#: src/xine-engine/xine.c:1063 -#: src/xine-engine/xine.c:1089 -#: src/xine-engine/xine.c:1114 -#: src/xine-engine/xine.c:1151 +"If you want the video image to be always shown at its original resolution, " +"you can disable all image scaling here.\n" +"This of course means that the image will no longer adapt to the size of the " +"video window and that videos with a pixel aspect ratio other than 1:1, like " +"anamorphic DVDs, will be shown distorted. But on the other hand, with some " +"video output drivers like XShm, where the image scaling is not hardware " +"accelerated, this can dramatically reduce CPU usage." +msgstr "" + +#: src/xine-engine/xine.c:858 src/xine-engine/xine.c:980 +#: src/xine-engine/xine.c:1020 src/xine-engine/xine.c:1056 +#: src/xine-engine/xine.c:1068 src/xine-engine/xine.c:1081 +#: src/xine-engine/xine.c:1094 src/xine-engine/xine.c:1107 +#: src/xine-engine/xine.c:1133 src/xine-engine/xine.c:1158 +#: src/xine-engine/xine.c:1195 #, c-format msgid "xine: error while parsing mrl\n" msgstr "xine: MRLの構文解析中にエラーが発生しました\n" -#: src/xine-engine/xine.c:874 +#: src/xine-engine/xine.c:917 #, c-format msgid "xine: found input plugin : %s\n" msgstr "xine: 入力プラグインが見つかりました : %s\n" -#: src/xine-engine/xine.c:890 +#: src/xine-engine/xine.c:934 #, c-format msgid "xine: input plugin cannot open MRL [%s]\n" msgstr "" -#: src/xine-engine/xine.c:899 +#: src/xine-engine/xine.c:943 #, c-format msgid "xine: cannot find input plugin for MRL [%s]\n" msgstr "" -#: src/xine-engine/xine.c:925 +#: src/xine-engine/xine.c:969 #, c-format msgid "xine: specified demuxer %s failed to start\n" msgstr "" -#: src/xine-engine/xine.c:962 +#: src/xine-engine/xine.c:1006 #, c-format msgid "xine: join rip input plugin\n" msgstr "" -#: src/xine-engine/xine.c:969 +#: src/xine-engine/xine.c:1013 #, c-format msgid "xine: error opening rip input plugin instance\n" msgstr "" -#: src/xine-engine/xine.c:1000 +#: src/xine-engine/xine.c:1044 #, c-format msgid "xine: last_probed demuxer %s failed to start\n" msgstr "" -#: src/xine-engine/xine.c:1029 +#: src/xine-engine/xine.c:1073 #, c-format msgid "ignoring video\n" msgstr "画像を無視\n" -#: src/xine-engine/xine.c:1042 +#: src/xine-engine/xine.c:1086 #, c-format msgid "ignoring audio\n" msgstr "音声を無視\n" -#: src/xine-engine/xine.c:1055 +#: src/xine-engine/xine.c:1099 #, c-format msgid "ignoring subpicture\n" msgstr "副映像を無視\n" -#: src/xine-engine/xine.c:1068 +#: src/xine-engine/xine.c:1112 #, fuzzy, c-format msgid "input cache plugin disabled\n" msgstr "自動再生入力プラグイン '%s' が失敗しました" -#: src/xine-engine/xine.c:1141 +#: src/xine-engine/xine.c:1185 #, fuzzy, c-format msgid "subtitle mrl opened '%s'\n" msgstr "開いているコンテンツをシャッフル再生します" -#: src/xine-engine/xine.c:1145 +#: src/xine-engine/xine.c:1189 #, c-format msgid "xine: error opening subtitle mrl\n" msgstr "" -#: src/xine-engine/xine.c:1177 +#: src/xine-engine/xine.c:1221 #, c-format msgid "xine: error while parsing MRL\n" msgstr "xine: MRLの構文解析中にエラーが発生しました\n" -#: src/xine-engine/xine.c:1184 +#: src/xine-engine/xine.c:1228 #, c-format msgid "xine: changing option '%s' from MRL isn't permitted\n" msgstr "" -#: src/xine-engine/xine.c:1215 +#: src/xine-engine/xine.c:1259 #, c-format msgid "xine: couldn't load plugin-specified demux %s for >%s<\n" msgstr "" -#: src/xine-engine/xine.c:1225 +#: src/xine-engine/xine.c:1269 #, fuzzy, c-format msgid "xine: couldn't find demux for >%s<\n" msgstr "%s にあるべき HESIOD pobox がありません。\n" -#: src/xine-engine/xine.c:1241 +#: src/xine-engine/xine.c:1285 #, fuzzy, c-format msgid "xine: found demuxer plugin: %s\n" msgstr "みつかった xine ライブラリバージョン: %d.%d.%d (%s).\n" -#: src/xine-engine/xine.c:1262 +#: src/xine-engine/xine.c:1307 #, c-format msgid "xine: demuxer is already done. that was fast!\n" msgstr "" -#: src/xine-engine/xine.c:1264 +#: src/xine-engine/xine.c:1309 #, fuzzy, c-format msgid "xine: demuxer failed to start\n" msgstr "xine エンジンが起動に失敗しました" -#: src/xine-engine/xine.c:1330 +#: src/xine-engine/xine.c:1375 #, c-format msgid "xine_play: no demux available\n" msgstr "" -#: src/xine-engine/xine.c:1401 +#: src/xine-engine/xine.c:1446 #, c-format msgid "xine_play: demux failed to start\n" msgstr "" -#: src/xine-engine/xine.c:1677 +#: src/xine-engine/xine.c:1725 #, c-format msgid "xine: The specified save_dir \"%s\" might be a security risk.\n" msgstr "" -#: src/xine-engine/xine.c:1682 +#: src/xine-engine/xine.c:1730 msgid "The specified save_dir might be a security risk." msgstr "" -#: src/xine-engine/xine.c:1714 +#: src/xine-engine/xine.c:1765 #, c-format msgid "xine: locale not supported by C library\n" msgstr "" -#: src/xine-engine/xine.c:1723 +#: src/xine-engine/xine.c:1774 msgid "media format detection strategy" msgstr "" -#: src/xine-engine/xine.c:1724 +#: src/xine-engine/xine.c:1775 msgid "" -"xine offers various methods to detect the media format of input to play. The individual values are:\n" +"xine offers various methods to detect the media format of input to play. The " +"individual values are:\n" "\n" "default\n" "First try to detect by content, then by file name extension.\n" @@ -4840,110 +5284,146 @@ msgid "" "Detect by file name extension only.\n" msgstr "" -#: src/xine-engine/xine.c:1742 +#: src/xine-engine/xine.c:1793 #, fuzzy msgid "directory for saving streams" msgstr "ディレクトリに対する完全再syncが要求されました" -#: src/xine-engine/xine.c:1743 +#: src/xine-engine/xine.c:1794 msgid "" -"When using the stream save feature, files will be written only into this directory.\n" -"This setting is security critical, because when changed to a different directory, xine can be used to fill files in it with arbitrary content. So you should be careful that the directory you specify is robust against any content in any file." +"When using the stream save feature, files will be written only into this " +"directory.\n" +"This setting is security critical, because when changed to a different " +"directory, xine can be used to fill files in it with arbitrary content. So " +"you should be careful that the directory you specify is robust against any " +"content in any file." msgstr "" -#: src/xine-engine/xine.c:1754 +#: src/xine-engine/xine.c:1805 msgid "allow implicit changes to the configuration (e.g. by MRL)" msgstr "" -#: src/xine-engine/xine.c:1755 +#: src/xine-engine/xine.c:1806 msgid "" -"If enabled, you allow xine to change your configuration without explicit actions from your side. For example configuration changes demanded by MRLs or embedded into playlist will be executed.\n" -"This setting is security critcal, because xine can receive MRLs or playlists from untrusted remote sources. If you allow them to arbitrarily change your configuration, you might end with a totally messed up xine." +"If enabled, you allow xine to change your configuration without explicit " +"actions from your side. For example configuration changes demanded by MRLs " +"or embedded into playlist will be executed.\n" +"This setting is security critcal, because xine can receive MRLs or playlists " +"from untrusted remote sources. If you allow them to arbitrarily change your " +"configuration, you might end with a totally messed up xine." msgstr "" -#: src/xine-engine/xine.c:1769 +#: src/xine-engine/xine.c:1820 msgid "Timeout for network stream reading (in seconds)" msgstr "" -#: src/xine-engine/xine.c:1770 -msgid "Specifies the timeout when reading from network streams, in seconds. Too low values might stop streaming when the source is slow or the bandwidth is occupied, too high values will freeze the player if the connection is lost." +#: src/xine-engine/xine.c:1821 +msgid "" +"Specifies the timeout when reading from network streams, in seconds. Too low " +"values might stop streaming when the source is slow or the bandwidth is " +"occupied, too high values will freeze the player if the connection is lost." msgstr "" -#: src/xine-engine/xine.c:2227 +#: src/xine-engine/xine.c:2290 msgid "messages" msgstr "メッセージ" -#: src/xine-engine/xine.c:2228 +#: src/xine-engine/xine.c:2291 msgid "plugin" msgstr "plugin" -#: src/xine-engine/xine.c:2229 +#: src/xine-engine/xine.c:2292 msgid "trace" msgstr "トレース" -#: src/xine-engine/xine_interface.c:962 +#: src/xine-engine/xine_interface.c:971 msgid "Warning:" msgstr "Warning:" -#: src/xine-engine/xine_interface.c:963 +#: src/xine-engine/xine_interface.c:972 msgid "Unknown host:" msgstr "不明なホスト:" -#: src/xine-engine/xine_interface.c:964 +#: src/xine-engine/xine_interface.c:973 msgid "Unknown device:" msgstr "不明なデバイス:" -#: src/xine-engine/xine_interface.c:965 +#: src/xine-engine/xine_interface.c:974 msgid "Network unreachable" msgstr "Network unreachable" -#: src/xine-engine/xine_interface.c:966 +#: src/xine-engine/xine_interface.c:975 msgid "Connection refused:" msgstr "接続を拒否されました:" -#: src/xine-engine/xine_interface.c:967 +#: src/xine-engine/xine_interface.c:976 msgid "File not found:" msgstr "ファイルがみつかりません:" -#: src/xine-engine/xine_interface.c:968 +#: src/xine-engine/xine_interface.c:977 msgid "Read error from:" msgstr "読み込みエラー:" -#: src/xine-engine/xine_interface.c:969 +#: src/xine-engine/xine_interface.c:978 msgid "Error loading library:" msgstr "ライブラリの読み込みエラー:" -#: src/xine-engine/xine_interface.c:970 +#: src/xine-engine/xine_interface.c:979 msgid "Encrypted media stream detected" msgstr "" -#: src/xine-engine/xine_interface.c:971 +#: src/xine-engine/xine_interface.c:980 msgid "Security message:" msgstr "セキュリティメッセージ:" -#: src/xine-engine/xine_interface.c:972 +#: src/xine-engine/xine_interface.c:981 msgid "Audio device unavailable" msgstr "音声デバイスが利用できません" -#: src/xine-engine/xine_interface.c:973 +#: src/xine-engine/xine_interface.c:982 #, fuzzy msgid "Permission error" msgstr "%s: 読み込みエラー" -#: src/xine-engine/xine_interface.c:974 +#: src/xine-engine/xine_interface.c:983 msgid "File is empty:" msgstr "空のファイル:" -#: src/xine-utils/memcpy.c:479 +#: src/xine-utils/memcpy.c:478 msgid "memcopy method used by xine" msgstr "" -#: src/xine-utils/memcpy.c:480 -msgid "The copying of large memory blocks is one of the most expensive operations on todays computers. Therefore xine provides various tuned methods to do this copying. Usually, the best method is detected automatically." +#: src/xine-utils/memcpy.c:479 +msgid "" +"The copying of large memory blocks is one of the most expensive operations " +"on todays computers. Therefore xine provides various tuned methods to do " +"this copying. Usually, the best method is detected automatically." msgstr "" -#: src/xine-utils/memcpy.c:507 +#: src/xine-utils/memcpy.c:506 #, c-format msgid "Benchmarking memcpy methods (smaller is better):\n" msgstr "" +#~ msgid "CDDB cache directory" +#~ msgstr "CDDBキャッシュディレクトリ" + +#, fuzzy +#~ msgid "DVB Channels config file" +#~ msgstr "設定ファイル '%s' は空です" + +#, fuzzy +#~ msgid "path to the title key cache" +#~ msgstr "キャッシュ生成時に相対パス `%s' が使用されました" + +#, fuzzy +#~ msgid "default number of frame repetitions" +#~ msgstr "デフォルトのエントリにリビジョン番号がありません" + +#, fuzzy +#~ msgid "SyncFB device name" +#~ msgstr "%s: デバイス名は `%s' です\n" + +#, fuzzy +#~ msgid "deinterlace method (deprecated)" +#~ msgstr "廃止予定の関数呼び出しです" diff --git a/src/audio_dec/xine_a52_decoder.c b/src/audio_dec/xine_a52_decoder.c index 85e20d1d4..628920fbc 100644 --- a/src/audio_dec/xine_a52_decoder.c +++ b/src/audio_dec/xine_a52_decoder.c @@ -53,12 +53,6 @@ # include "a52.h" #endif -#ifdef HAVE_A52DEC_A52_INTERNAL_H -# include <a52dec/a52_internal.h> -#else -# include "a52_internal.h" -#endif - #include <xine/buffer.h> #include <xine/xineutils.h> diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index 6b524e80c..a45d57c69 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -172,7 +172,7 @@ static void ff_audio_init_codec(ff_audio_decoder_t *this, unsigned int codec_typ * - DVB streams where multiple AAC LATM frames are packed to single PES * - DVB streams where MPEG audio frames do not follow PES packet boundaries */ -#if LIBAVCODEC_VERSION_MAJOR >= 53 +#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 94) if (codec_type == BUF_AUDIO_AAC_LATM || codec_type == BUF_AUDIO_MPEG) { @@ -355,7 +355,7 @@ static int ff_audio_decode(xine_t *xine, int consumed; int parser_consumed = 0; -#if LIBAVCODEC_VERSION_MAJOR >= 53 +#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 94) if (parser_ctx) { uint8_t *outbuf; int outsize; @@ -382,7 +382,7 @@ static int ff_audio_decode(xine_t *xine, buf = outbuf; size = outsize; } -#endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */ +#endif /* LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 94) */ #if AVAUDIO > 2 AVPacket avpkt; diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 2b20fef7a..d69c29938 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -189,8 +189,6 @@ #define BUF_SIZE (NPKT_PER_READ * (PKT_SIZE + 4)) -#define MAX_PES_BUF_SIZE 2048 - #define CORRUPT_PES_THRESHOLD 10 #define NULL_PID 0x1fff @@ -257,6 +255,10 @@ HDMV_SPU_INTERACTIVE = 0x91, HDMV_SPU_TEXT = 0x92, + /* pseudo tags */ + STREAM_AUDIO_EAC3 = (DESCRIPTOR_EAC3 << 8), + STREAM_AUDIO_DTS = (DESCRIPTOR_DTS << 8), + } streamType; #define WRAP_THRESHOLD 270000 @@ -292,13 +294,14 @@ typedef struct { unsigned int pid; fifo_buffer_t *fifo; - uint32_t size; uint32_t type; int64_t pts; buf_element_t *buf; unsigned int counter; uint16_t descriptor_tag; /* +0x100 for PES stream IDs (no available TS descriptor tag?) */ + uint8_t keep; /* used by demux_ts_dynamic_pmt_*() */ int corrupted_pes; + int pes_bytes_left; /* butes left if PES packet size is known */ int input_normpos; int input_time; @@ -420,6 +423,167 @@ typedef struct { } demux_ts_t; +static void reset_track_map(fifo_buffer_t *fifo) +{ + buf_element_t *buf = fifo->buffer_pool_alloc (fifo); + + buf->type = BUF_CONTROL_RESET_TRACK_MAP; + buf->decoder_info[1] = -1; + + fifo->put (fifo, buf); +} + +/* TJ. dynamic PMT support. The idea is: + First, reuse unchanged pids and add new ones. + Then, comb out those who are no longer referenced. + For example, the Kaffeine dvb frontend preserves original pids but only + sends the currently user selected ones, plus matching generated pat/pmt */ + +static int demux_ts_dynamic_pmt_find (demux_ts_t *this, + int pid, int type, unsigned int descriptor_tag) { + unsigned int i; + demux_ts_media *m; + for (i = 0; i < this->media_num; i++) { + m = &this->media[i]; + if ((m->pid == pid) && ((m->type & BUF_MAJOR_MASK) == type)) { + /* mark this media decriptor for reuse */ + m->keep = 1; + return i; + } + } + if (i < MAX_PIDS) { + /* prepare new media descriptor */ +#ifdef LOG_DYNAMIC_PMT + char *name = ""; + if (type == BUF_VIDEO_BASE) name = "video"; + else if (type == BUF_AUDIO_BASE) name = "audio"; + else if (type == BUF_SPU_BASE) name = "subtitle"; + printf ("demux_ts: new %s pid %d\n", name, pid); +#endif + m = &this->media[i]; + if (type == BUF_AUDIO_BASE) { + /* allocate new audio track as well */ + if (this->audio_tracks_count >= MAX_AUDIO_TRACKS) { + xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, + "demux_ts: too many audio PIDs, ignoring pid %d\n", pid); + return -1; + } + m->type = type | this->audio_tracks_count; + this->audio_tracks[this->audio_tracks_count].pid = pid; + this->audio_tracks[this->audio_tracks_count].media_index = i; + this->audio_tracks_count++; + m->fifo = this->stream->audio_fifo; + } else { + m->type = type; + m->fifo = this->stream->video_fifo; + } + m->pid = pid; + + if (m->buf) { + m->buf->free_buffer(m->buf); + m->buf = NULL; + } + m->counter = INVALID_CC; + m->corrupted_pes = 1; + + m->descriptor_tag = descriptor_tag; + + m->keep = 1; + this->media_num++; + return i; + } + /* table full */ + return -1; +} + +static void demux_ts_dynamic_pmt_clean (demux_ts_t *this) { + int i, count = 0, tracks = 0, spus = 0; + /* densify media table */ + for (i = 0; i < this->media_num; i++) { + demux_ts_media *m = &this->media[i]; + int type = m->type & BUF_MAJOR_MASK; + int chan = m->type & 0xff; + if (m->keep) { + m->keep = 0; + if (type == BUF_VIDEO_BASE) { + /* adjust single video link */ + this->videoMedia = count; + } else if (type == BUF_AUDIO_BASE) { + /* densify audio track table */ + this->audio_tracks[chan].media_index = count; + if (chan > tracks) { + m->type = (m->type & ~0xff) | tracks; + this->audio_tracks[tracks] = this->audio_tracks[chan]; + } + tracks++; + } else if (type == BUF_SPU_BASE) { + /* spu language table has already been rebuilt from scratch. + Adjust backlinks only */ + while ((spus < this->spu_langs_count) && (this->spu_langs[spus].pid == m->pid)) { + this->spu_langs[spus].media_index = count; + spus++; + } + } + if (i > count) { + this->media[count] = *m; + m->buf = NULL; + m->pid = INVALID_PID; + } + count++; + } else { + /* drop this no longer needed media descriptor */ +#ifdef LOG_DYNAMIC_PMT + char *name = ""; + if (type == BUF_VIDEO_BASE) name = "video"; + else if (type == BUF_AUDIO_BASE) name = "audio"; + else if (type == BUF_SPU_BASE) name = "subtitle"; + printf ("demux_ts: dropped %s pid %d\n", name, m->pid); +#endif + if (m->buf) { + m->buf->free_buffer (m->buf); + m->buf = NULL; + } + m->pid = INVALID_PID; + } + } + if ((tracks < this->audio_tracks_count) && this->audio_fifo) { + /* at least 1 audio track removed, tell audio decoder loop */ + reset_track_map(this->audio_fifo); +#ifdef LOG_DYNAMIC_PMT + printf ("demux_ts: new audio track map\n"); +#endif + } +#ifdef LOG_DYNAMIC_PMT + printf ("demux_ts: using %d pids, %d audio %d subtitle channels\n", count, tracks, spus); +#endif + /* adjust table sizes */ + this->media_num = count; + this->audio_tracks_count = tracks; + /* should really have no effect */ + this->spu_langs_count = spus; +} + +static void demux_ts_dynamic_pmt_clear (demux_ts_t *this) { + unsigned int i; + for (i = 0; i < this->media_num; i++) { + if (this->media[i].buf) { + this->media[i].buf->free_buffer (this->media[i].buf); + this->media[i].buf = NULL; + } + } + this->media_num = 0; + + this->videoPid = INVALID_PID; + this->audio_tracks_count = 0; + this->spu_pid = INVALID_PID; + this->spu_langs_count = 0; + + this->pcr_pid = INVALID_PID; + + this->last_pmt_crc = 0; +} + + static void demux_ts_tbre_reset (demux_ts_t *this) { if (this->tbre_time <= TBRE_TIME) { this->tbre_pid = INVALID_PID; @@ -566,6 +730,9 @@ static void demux_ts_update_spu_channel(demux_ts_t *this) this->spu_pid = lang->pid; this->spu_media = lang->media_index; + /* multiple spu langs can share same media descriptor */ + this->media[lang->media_index].type = + (this->media[lang->media_index].type & ~0xff) | this->current_spu_channel; #ifdef TS_LOG printf("demux_ts: DVBSUB: selecting lang: %s page %ld %ld\n", lang->desc.lang, lang->desc.comp_page_id, lang->desc.aux_page_id); @@ -768,11 +935,7 @@ static void demux_ts_parse_pat (demux_ts_t*this, unsigned char *original_pkt, /* force PMT reparsing when pmt_pid changes */ if (this->pmt_pid[program_count] != pmt_pid) { this->pmt_pid[program_count] = pmt_pid; - this->audio_tracks_count = 0; - this->last_pmt_crc = 0; - this->videoPid = INVALID_PID; - this->spu_pid = INVALID_PID; - this->pcr_pid = INVALID_PID; + demux_ts_dynamic_pmt_clear (this); if (this->pmt[program_count] != NULL) { free(this->pmt[program_count]); @@ -823,14 +986,13 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, return 0 ; } - /* packet_len = p[4] << 8 | p[5]; */ stream_id = p[3]; - header_len = p[8]; + header_len = p[8] + 9; /* sometimes corruption on header_len causes segfault in memcpy below */ - if (header_len + 9 > packet_len) { + if (header_len > packet_len) { xprintf (xine, XINE_VERBOSITY_DEBUG, - "demux_ts: illegal value for PES_header_data_length (0x%x)\n", header_len); + "demux_ts: illegal value for PES_header_data_length (0x%x)\n", header_len - 9); return 0; } @@ -841,7 +1003,7 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, if (p[7] & 0x80) { /* pts avail */ - if (header_len < 5) { + if (header_len < 14) { return 0; } @@ -869,22 +1031,21 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, m->pts = pts; - p += header_len + 9; - packet_len -= header_len + 9; + m->pes_bytes_left = (int)(p[4] << 8 | p[5]) - header_len + 6; + lprintf("PES packet payload left: %d bytes\n", m->pes_bytes_left); + + p += header_len; + packet_len -= header_len; if (m->descriptor_tag == STREAM_VIDEO_VC1) { - m->size = packet_len; m->type = BUF_VIDEO_VC1; - return 1; + return header_len; } if (m->descriptor_tag == HDMV_SPU_BITMAP) { - long payload_len = ((buf[4] << 8) | buf[5]) - header_len - 3; - - m->size = packet_len; m->type |= BUF_SPU_HDMV; - m->buf->decoder_info[2] = payload_len; - return 1; + m->buf->decoder_info[2] = m->pes_bytes_left; + return header_len; } else @@ -901,27 +1062,25 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, * these "raw" streams may begin with a byte that looks like a stream type. * For audio streams, m->type already contains the stream no. */ - if(m->descriptor_tag == HDMV_AUDIO_84_EAC3) { - m->size = packet_len; + if(m->descriptor_tag == HDMV_AUDIO_84_EAC3 || + m->descriptor_tag == STREAM_AUDIO_EAC3) { m->type |= BUF_AUDIO_EAC3; - return 1; + return header_len; } else if(m->descriptor_tag == STREAM_AUDIO_AC3) { /* ac3 - raw */ - m->size = packet_len; m->type |= BUF_AUDIO_A52; - return 1; + return header_len; } else if (m->descriptor_tag == HDMV_AUDIO_83_TRUEHD) { /* TODO: separate AC3 and TrueHD streams ... */ - m->size = packet_len; m->type |= BUF_AUDIO_A52; - return 1; + return header_len; - } else if (m->descriptor_tag == HDMV_AUDIO_82_DTS || + } else if (m->descriptor_tag == STREAM_AUDIO_DTS || + m->descriptor_tag == HDMV_AUDIO_82_DTS || m->descriptor_tag == HDMV_AUDIO_86_DTS_HD_MA ) { - m->size = packet_len; m->type |= BUF_AUDIO_DTS; - return 1; + return header_len; } else if (packet_len < 2) { return 0; @@ -932,45 +1091,39 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, return 0; } - m->size = packet_len - 4; m->type |= BUF_AUDIO_LPCM_BE; m->buf->decoder_flags |= BUF_FLAG_SPECIAL; m->buf->decoder_info[1] = BUF_SPECIAL_LPCM_CONFIG; m->buf->decoder_info[2] = (p[3]<<24) | (p[2]<<16) | (p[1]<<8) | p[0]; - return 1; + return header_len + 4; } else if (m->descriptor_tag == ISO_13818_PES_PRIVATE && p[0] == 0x20 && p[1] == 0x00) { /* DVBSUB */ - long payload_len = ((buf[4] << 8) | buf[5]) - header_len - 3; - - m->size = packet_len; m->type |= BUF_SPU_DVB; - m->buf->decoder_info[2] = payload_len; - return 1; + m->buf->decoder_info[2] = m->pes_bytes_left; + return header_len; } else if (p[0] == 0x0B && p[1] == 0x77) { /* ac3 - syncword */ - m->size = packet_len; m->type |= BUF_AUDIO_A52; - return 1; + return header_len; } else if ((p[0] & 0xE0) == 0x20) { spu_id = (p[0] & 0x1f); - m->size = packet_len-1; m->type = BUF_SPU_DVD + spu_id; - return 1; + return header_len + 1; + } else if ((p[0] & 0xF0) == 0x80) { if (packet_len < 4) { return 0; } - m->size = packet_len - 4; m->type |= BUF_AUDIO_A52; - return 1; + return header_len + 4; #if 0 /* commented out: does not set PCM type. Decoder can't handle raw PCM stream without configuration. */ @@ -989,15 +1142,13 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, return 0; } - m->size = packet_len-pcm_offset; m->type |= BUF_AUDIO_LPCM_BE; - return 1; + return header_len + pcm_offset; #endif } } else if ((stream_id & 0xf0) == 0xe0) { - m->size = packet_len; switch (m->descriptor_tag) { case ISO_11172_VIDEO: case ISO_13818_VIDEO: @@ -1018,11 +1169,10 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, m->type = BUF_VIDEO_MPEG; break; } - return 1; + return header_len; } else if ((stream_id & 0xe0) == 0xc0) { - m->size = packet_len; switch (m->descriptor_tag) { case ISO_11172_AUDIO: case ISO_13818_AUDIO: @@ -1042,7 +1192,7 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, m->type |= BUF_AUDIO_MPEG; break; } - return 1; + return header_len; } else { #ifdef TS_LOG @@ -1103,7 +1253,9 @@ static void demux_ts_buffer_pes(demux_ts_t*this, unsigned char *ts, /* allocate the buffer here, as pes_header needs a valid buf for dvbsubs */ m->buf = m->fifo->buffer_pool_alloc(m->fifo); - if (!demux_ts_parse_pes_header(this->stream->xine, m, ts, len)) { + int pes_header_len = demux_ts_parse_pes_header(this->stream->xine, m, ts, len); + + if (pes_header_len <= 0) { m->buf->free_buffer(m->buf); m->buf = NULL; @@ -1113,8 +1265,10 @@ static void demux_ts_buffer_pes(demux_ts_t*this, unsigned char *ts, } else { m->corrupted_pes = 0; - memcpy(m->buf->mem, ts+len-m->size, m->size); - m->buf->size = m->size; + + /* skip PES header */ + ts += pes_header_len; + len -= pes_header_len; update_extra_info(this, m); @@ -1124,41 +1278,29 @@ static void demux_ts_buffer_pes(demux_ts_t*this, unsigned char *ts, if (m->pid == this->tbre_pid) demux_ts_tbre_update (this, TBRE_MODE_AUDIO_PTS, m->pts); } + } - } else if (!m->corrupted_pes) { /* no pus -- PES packet continuation */ + if (!m->corrupted_pes) { - if ((m->buf->size + len) > MAX_PES_BUF_SIZE) { + if ((m->buf->size + len) > m->buf->max_size) { + m->pes_bytes_left -= m->buf->size; demux_ts_send_buffer(m, 0); m->buf = m->fifo->buffer_pool_alloc(m->fifo); } + memcpy(m->buf->mem + m->buf->size, ts, len); m->buf->size += len; - } -} -/* - * Create a buffer for a PES stream. - */ -static void demux_ts_pes_new(demux_ts_t*this, - unsigned int mediaIndex, - unsigned int pid, - fifo_buffer_t *fifo, - uint16_t descriptor) { - - demux_ts_media *m = &this->media[mediaIndex]; - - /* new PID seen - initialise stuff */ - m->pid = pid; - m->fifo = fifo; - - if (m->buf != NULL) m->buf->free_buffer(m->buf); - m->buf = NULL; - m->counter = INVALID_CC; - m->descriptor_tag = descriptor; - m->corrupted_pes = 1; + if (m->pes_bytes_left > 0 && m->buf->size >= m->pes_bytes_left) { + /* PES payload complete */ + m->pes_bytes_left -= m->buf->size; + demux_ts_flush_media(m); + /* skip rest data - there shouldn't be any */ + m->corrupted_pes = 1; + } + } } - /* Find the first ISO 639 language descriptor (tag 10) and * store the 3-char code in dest, nullterminated. If no * code is found, zero out dest. @@ -1268,6 +1410,7 @@ static void demux_ts_parse_pmt (demux_ts_t *this, uint8_t *ptr = NULL; unsigned char len; unsigned int offset=0; + int mi; /* * A new section should start with the payload unit start @@ -1414,10 +1557,12 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num * PMT has changed (e.g. an IPTV streamer that's just changed its source), * we'll get new PIDs that we should follow. */ - this->audio_tracks_count = 0; this->videoPid = INVALID_PID; this->spu_pid = INVALID_PID; + this->spu_langs_count = 0; + reset_track_map(this->video_fifo); + /* * ES definitions start here...we are going to learn upto one video * PID and one audio PID. @@ -1443,7 +1588,6 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num /* * Extract the elementary streams. */ - this->spu_langs_count = 0; while (section_length > 0) { unsigned int stream_info_length; @@ -1470,9 +1614,12 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num #ifdef TS_PMT_LOG printf ("demux_ts: PMT video pid 0x%.4x type %2.2x\n", pid, stream[0]); #endif - demux_ts_pes_new(this, this->media_num, pid, this->video_fifo,stream[0]); - this->videoMedia = this->media_num; - this->videoPid = pid; + + mi = demux_ts_dynamic_pmt_find (this, pid, BUF_VIDEO_BASE, stream[0]); + if (mi >= 0) { + this->videoMedia = mi; + this->videoPid = pid; + } } break; @@ -1481,18 +1628,17 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num case ISO_13818_PART7_AUDIO: case ISO_14496_PART3_AUDIO: if (this->audio_tracks_count < MAX_AUDIO_TRACKS) { - if (apid_check(this, pid) < 0) { + + mi = demux_ts_dynamic_pmt_find (this, pid, BUF_AUDIO_BASE, stream[0]); + if (mi >= 0) { #ifdef TS_PMT_LOG - printf ("demux_ts: PMT audio pid 0x%.4x type %2.2x\n", pid, stream[0]); + printf ("demux_ts: PMT audio pid 0x%.4x type %2.2x\n", pid, stream[0]); #endif - demux_ts_pes_new(this, this->media_num, pid, this->audio_fifo,stream[0]); - this->audio_tracks[this->audio_tracks_count].pid = pid; - this->audio_tracks[this->audio_tracks_count].media_index = this->media_num; - this->media[this->media_num].type = this->audio_tracks_count; - demux_ts_get_lang_desc(this, this->audio_tracks[this->audio_tracks_count].lang, - stream + 5, stream_info_length); - this->audio_tracks_count++; + demux_ts_get_lang_desc (this, + this->audio_tracks[this->media[mi].type & 0xff].lang, + stream + 5, stream_info_length); } + } break; case ISO_13818_PRIVATE: @@ -1511,28 +1657,23 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num break; case ISO_13818_PES_PRIVATE: for (i = 5; i < coded_length; i += stream[i+1] + 2) { - if (((stream[i] == DESCRIPTOR_AC3) || (stream[i] == DESCRIPTOR_EAC3)) && - (this->audio_tracks_count < MAX_AUDIO_TRACKS)) { - if (apid_check(this, pid) < 0) { + + if ((stream[i] == DESCRIPTOR_AC3) || (stream[i] == DESCRIPTOR_EAC3) || (stream[i] == DESCRIPTOR_DTS)) { + mi = demux_ts_dynamic_pmt_find (this, pid, BUF_AUDIO_BASE, + stream[i] == DESCRIPTOR_AC3 ? STREAM_AUDIO_AC3 : + stream[i] == DESCRIPTOR_DTS ? STREAM_AUDIO_DTS : + STREAM_AUDIO_EAC3); + if (mi >= 0) { #ifdef TS_PMT_LOG printf ("demux_ts: PMT AC3 audio pid 0x%.4x type %2.2x\n", pid, stream[0]); #endif - if (stream[i] == DESCRIPTOR_AC3) - demux_ts_pes_new(this, this->media_num, pid, - this->audio_fifo, STREAM_AUDIO_AC3); - else - demux_ts_pes_new(this, this->media_num, pid, - this->audio_fifo, HDMV_AUDIO_84_EAC3); - - this->audio_tracks[this->audio_tracks_count].pid = pid; - this->audio_tracks[this->audio_tracks_count].media_index = this->media_num; - this->media[this->media_num].type = this->audio_tracks_count; - demux_ts_get_lang_desc(this, this->audio_tracks[this->audio_tracks_count].lang, - stream + 5, stream_info_length); - this->audio_tracks_count++; + demux_ts_get_lang_desc (this, + this->audio_tracks[this->media[mi].type & 0xff].lang, + stream + 5, stream_info_length); break; } } + /* Teletext */ else if (stream[i] == DESCRIPTOR_TELETEXT) { @@ -1550,6 +1691,10 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num else if (stream[i] == DESCRIPTOR_DVBSUB) { int pos; + + mi = demux_ts_dynamic_pmt_find (this, pid, BUF_SPU_BASE, stream[0]); + if (mi < 0) break; + for (pos = i + 2; pos + 8 <= i + 2 + stream[i + 1] && this->spu_langs_count < MAX_SPU_LANGS; @@ -1567,9 +1712,7 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num lang->desc.aux_page_id = (stream[pos + 6] << 8) | stream[pos + 7]; lang->pid = pid; - lang->media_index = this->media_num; - this->media[this->media_num].type = no; - demux_ts_pes_new(this, this->media_num, pid, this->video_fifo, stream[0]); + lang->media_index = mi; demux_send_special_spu_buf( this, BUF_SPU_DVB, no ); #ifdef TS_LOG printf("demux_ts: DVBSUB: pid 0x%.4x: %s page %ld %ld type %2.2x\n", @@ -1604,15 +1747,17 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num break; } + mi = demux_ts_dynamic_pmt_find (this, pid, BUF_SPU_BASE, stream[0]); + if (mi < 0) break; + + demux_ts_spu_lang *lang = &this->spu_langs[this->spu_langs_count]; memset(lang->desc.lang, 0, sizeof(lang->desc.lang)); /*memcpy(lang->desc.lang, &stream[pos], 3);*/ /*lang->desc.lang[3] = 0;*/ lang->pid = pid; - lang->media_index = this->media_num; - this->media[this->media_num].type = this->spu_langs_count; - demux_ts_pes_new(this, this->media_num, pid, this->video_fifo, stream[0]); + lang->media_index = mi; demux_send_special_spu_buf( this, BUF_SPU_HDMV, this->spu_langs_count ); this->spu_langs_count++; #ifdef TS_PMT_LOG @@ -1631,43 +1776,43 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num * if is does, we tag this as an audio stream. * FIXME: This will need expanding if we ever see a DTS or other media format here. */ - if ((this->audio_tracks_count < MAX_AUDIO_TRACKS) && (stream[0] >= 0x80) ) { - if (apid_check(this,pid) < 0) { - uint32_t format_identifier=0; - demux_ts_get_reg_desc(this, &format_identifier, - stream + 5, stream_info_length); - /* If no format identifier, assume A52 */ - if (( format_identifier == 0x41432d33) || - ( format_identifier == 0) || - ((format_identifier == 0x48444d56 || this->hdmv>0) && stream[0] == HDMV_AUDIO_80_PCM) /* BluRay PCM */) { - - demux_ts_pes_new(this, this->media_num, pid, this->audio_fifo, stream[0]); - this->audio_tracks[this->audio_tracks_count].pid = pid; - this->audio_tracks[this->audio_tracks_count].media_index = this->media_num; - this->media[this->media_num].type = this->audio_tracks_count; - demux_ts_get_lang_desc(this, this->audio_tracks[this->audio_tracks_count].lang, - stream + 5, stream_info_length); - this->audio_tracks_count++; - break; - } + if ((this->audio_tracks_count < MAX_AUDIO_TRACKS) && (stream[0] >= 0x80) ) { + + uint32_t format_identifier=0; + demux_ts_get_reg_desc(this, &format_identifier, stream + 5, stream_info_length); + /* If no format identifier, assume A52 */ + if (( format_identifier == 0x41432d33) || + ( format_identifier == 0) || + ((format_identifier == 0x48444d56 || this->hdmv>0) && stream[0] == HDMV_AUDIO_80_PCM) /* BluRay PCM */) { + + mi = demux_ts_dynamic_pmt_find (this, pid, BUF_AUDIO_BASE, stream[0]); + if (mi >= 0) { + demux_ts_get_lang_desc (this, + this->audio_tracks[this->media[mi].type & 0xff].lang, + stream + 5, stream_info_length); +#ifdef TS_PMT_LOG + printf ("demux_ts: PMT audio pid 0x%.4x type %2.2x\n", pid, stream[0]); +#endif + break; + } } - } else { + } #ifdef TS_PMT_LOG - printf ("demux_ts: PMT unknown stream_type: 0x%.2x pid: 0x%.4x\n", - stream[0], pid); + printf ("demux_ts: PMT unknown stream_type: 0x%.2x pid: 0x%.4x\n", + stream[0], pid); - for (i = 5; i < coded_length; i++) - printf ("%.2x ", stream[i]); - printf ("\n"); + for (i = 5; i < coded_length; i++) + printf ("%.2x ", stream[i]); + printf ("\n"); #endif - } break; } - this->media_num++; stream += coded_length; section_length -= coded_length; } + demux_ts_dynamic_pmt_clean (this); + /* * Get the current PCR PID. */ @@ -2335,23 +2480,36 @@ static int demux_ts_get_optional_data(demux_plugin_t *this_gen, { case DEMUX_OPTIONAL_DATA_AUDIOLANG: if ((channel >= 0) && (channel < this->audio_tracks_count)) { - if(this->audio_tracks[channel].lang) + if (this->audio_tracks[channel].lang[0]) { strcpy(str, this->audio_tracks[channel].lang); - else - sprintf(str, "%3i", _x_get_audio_channel(this->stream)); + } else { + /* input plugin may know the language */ + if (this->input->get_capabilities(this->input) & INPUT_CAP_AUDIOLANG) + return DEMUX_OPTIONAL_UNSUPPORTED; + sprintf(str, "%3i", channel); + } + return DEMUX_OPTIONAL_SUCCESS; } else { - snprintf(str, XINE_LANG_MAX, "%3i", _x_get_audio_channel(this->stream)); + strcpy(str, "none"); } - return DEMUX_OPTIONAL_SUCCESS; + return DEMUX_OPTIONAL_UNSUPPORTED; case DEMUX_OPTIONAL_DATA_SPULANG: if (channel>=0 && channel<this->spu_langs_count) { - memcpy(str, this->spu_langs[channel].desc.lang, 3); - str[3] = 0;} - else + if (this->spu_langs[channel].desc.lang[0]) { + strcpy(str, this->spu_langs[channel].desc.lang); + } else { + /* input plugin may know the language */ + if (this->input->get_capabilities(this->input) & INPUT_CAP_SPULANG) + return DEMUX_OPTIONAL_UNSUPPORTED; + sprintf(str, "%3i", channel); + } + return DEMUX_OPTIONAL_SUCCESS; + } else { strcpy(str, "none"); - return DEMUX_OPTIONAL_SUCCESS; + } + return DEMUX_OPTIONAL_UNSUPPORTED; default: return DEMUX_OPTIONAL_UNSUPPORTED; diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 943be4195..da96bfa06 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -34,11 +34,11 @@ endif if ENABLE_V4L in_v4l = xineplug_inp_v4l.la -in_pvr = xineplug_inp_pvr.la endif if ENABLE_V4L2 in_v4l2 = xineplug_inp_v4l2.la +in_pvr = xineplug_inp_pvr.la endif if ENABLE_GNOME_VFS diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 824b97fbb..08229874c 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -210,7 +210,7 @@ typedef struct { int mrls_allocated_entries; xine_mrl_t **mrls; - char *autoplaylist[MAX_TRACKS]; + char **autoplaylist; } cdda_input_class_t; @@ -2436,6 +2436,21 @@ static int cdda_plugin_open (input_plugin_t *this_gen ) { return 1; } +static void free_autoplay_list(cdda_input_class_t *this) +{ + /* free old playlist */ + if (this->autoplaylist) { + unsigned int i; + for( i = 0; this->autoplaylist[i]; i++ ) { + free( this->autoplaylist[i] ); + this->autoplaylist[i] = NULL; + } + + free(this->autoplaylist); + this->autoplaylist = NULL; + } +} + static char ** cdda_class_get_autoplay_list (input_class_t *this_gen, int *num_files) { @@ -2447,11 +2462,7 @@ static char ** cdda_class_get_autoplay_list (input_class_t *this_gen, lprintf("cdda_class_get_autoplay_list for >%s<\n", this->cdda_device); - /* free old playlist */ - for( i = 0; this->autoplaylist[i]; i++ ) { - free( this->autoplaylist[i] ); - this->autoplaylist[i] = NULL; - } + free_autoplay_list(this); /* get the CD TOC */ toc = init_cdrom_toc(); @@ -2509,6 +2520,8 @@ static char ** cdda_class_get_autoplay_list (input_class_t *this_gen, num_tracks--; if (num_tracks >= MAX_TRACKS-1) num_tracks = MAX_TRACKS - 2; + + this->autoplaylist = calloc(num_tracks + 2, sizeof(char *)); for ( i = 0; i <= num_tracks; i++ ) this->autoplaylist[i] = _x_asprintf("cdda:/%d",i+toc->first_track); @@ -2624,7 +2637,14 @@ static void cdda_class_dispose (input_class_t *this_gen) { config->unregister_callback(config, "media.audio_cd.drive_slowdown"); #endif + free_autoplay_list(this); + + while (this->mrls_allocated_entries) { + MRL_ZERO(this->mrls[this->mrls_allocated_entries - 1]); + free(this->mrls[this->mrls_allocated_entries--]); + } free (this->mrls); + free (this); } diff --git a/src/input/input_file.c b/src/input/input_file.c index c2ecd3c0b..796c789d6 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -841,7 +841,7 @@ static xine_mrl_t **file_class_get_dir (input_class_t *this_gen, this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t)); } else - memset(this->mrls[num_files], 0, sizeof(xine_mrl_t)); + MRL_ZERO(this->mrls[num_files]); MRL_DUPLICATE(&dir_files[i], this->mrls[num_files]); @@ -859,7 +859,7 @@ static xine_mrl_t **file_class_get_dir (input_class_t *this_gen, this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t)); } else - memset(this->mrls[num_files], 0, sizeof(xine_mrl_t)); + MRL_ZERO(this->mrls[num_files]); MRL_DUPLICATE(&hide_files[i], this->mrls[num_files]); @@ -877,7 +877,7 @@ static xine_mrl_t **file_class_get_dir (input_class_t *this_gen, this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t)); } else - memset(this->mrls[num_files], 0, sizeof(xine_mrl_t)); + MRL_ZERO(this->mrls[num_files]); MRL_DUPLICATE(&norm_files[i], this->mrls[num_files]); @@ -945,7 +945,12 @@ static void file_class_dispose (input_class_t *this_gen) { config->unregister_callback(config, "media.files.origin_path"); + while(this->mrls_allocated_entries) { + MRL_ZERO(this->mrls[this->mrls_allocated_entries - 1]); + free(this->mrls[this->mrls_allocated_entries--]); + } free (this->mrls); + free (this); } diff --git a/src/input/input_net.c b/src/input/input_net.c index cd4a8c901..801093e96 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.c @@ -113,7 +113,10 @@ typedef struct { static int host_connect_attempt_ipv4(struct in_addr ia, int port, xine_t *xine) { int s; - struct sockaddr_in sin; + union { + struct sockaddr_in in; + struct sockaddr sa; + } sa; s = xine_socket_cloexec(PF_INET, SOCK_STREAM, IPPROTO_TCP); if (s==-1) { @@ -122,14 +125,14 @@ static int host_connect_attempt_ipv4(struct in_addr ia, int port, xine_t *xine) return -1; } - sin.sin_family = AF_INET; - sin.sin_addr = ia; - sin.sin_port = htons(port); + sa.in.sin_family = AF_INET; + sa.in.sin_addr = ia; + sa.in.sin_port = htons(port); #ifndef WIN32 - if (connect(s, (struct sockaddr *)&sin, sizeof(sin))==-1 && errno != EINPROGRESS) + if (connect(s, &sa.sa, sizeof(sa.in))==-1 && errno != EINPROGRESS) #else - if (connect(s, (struct sockaddr *)&sin, sizeof(sin))==-1 && WSAGetLastError() != WSAEINPROGRESS) + if (connect(s, &sa.sa, sizeof(sa.in))==-1 && WSAGetLastError() != WSAEINPROGRESS) #endif { xine_log(xine, XINE_LOG_MSG, diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index 5e66bee82..0503316da 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -98,7 +98,13 @@ #include <time.h> #include <pthread.h> #include <sys/ioctl.h> -#include <linux/videodev2.h> +#ifdef HAVE_SYS_VIDEOIO_H +# include <sys/videoio.h> +#elif defined(HAVE_SYS_VIDEODEV2_H) +# include <sys/videodev2.h> +#else +# include <linux/videodev2.h> +#endif #define XINE_ENABLE_EXPERIMENTAL_FEATURES diff --git a/src/input/input_smb.c b/src/input/input_smb.c index b2211e2ae..f3c2c035d 100644 --- a/src/input/input_smb.c +++ b/src/input/input_smb.c @@ -345,7 +345,7 @@ static xine_mrl_t **smb_class_get_dir (input_class_t *this_gen, (this->mrls_allocated_entries+1) * sizeof(xine_mrl_t*)); this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t)); }else - memset(this->mrls[num_files], 0, sizeof(xine_mrl_t)); + MRL_ZERO(this->mrls[num_files]); MRL_DUPLICATE(&dir_files[i], this->mrls[num_files]); @@ -362,7 +362,7 @@ static xine_mrl_t **smb_class_get_dir (input_class_t *this_gen, (this->mrls_allocated_entries+1) * sizeof(xine_mrl_t*)); this->mrls[num_files] = calloc(1, sizeof(xine_mrl_t)); }else - memset(this->mrls[num_files], 0, sizeof(xine_mrl_t)); + MRL_ZERO(this->mrls[num_files]); MRL_DUPLICATE(&norm_files[i], this->mrls[num_files]); @@ -440,6 +440,20 @@ smb_plugin_open (input_plugin_t *this_gen ) return 1; } +static void +smb_class_dispose (input_class_t *this_gen) +{ + smb_input_class_t *this = (smb_input_class_t *) this_gen; + + while(this->mrls_allocated_entries) { + MRL_ZERO(this->mrls[this->mrls_allocated_entries - 1]); + free(this->mrls[this->mrls_allocated_entries--]); + } + free(this->mrls); + + free (this); +} + static input_plugin_t * smb_class_get_instance (input_class_t *class_gen, xine_stream_t *stream, const char *mrl) @@ -498,7 +512,7 @@ static void this->input_class.description = N_("CIFS/SMB input plugin based on libsmbclient"); this->input_class.get_dir = smb_class_get_dir; this->input_class.get_autoplay_list = NULL; - this->input_class.dispose = default_input_class_dispose; + this->input_class.dispose = smb_class_dispose; this->input_class.eject_media = NULL; _exit_error: diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c index d50a6a8c4..87054bfaa 100644 --- a/src/input/net_buf_ctrl.c +++ b/src/input/net_buf_ctrl.c @@ -158,8 +158,8 @@ static void dvbspeed_init (nbc_t *this) { #endif } if (xine_config_lookup_entry (xine, "engine.buffers.video_num_buffers", - &entry) && (entry.num_value < 1800)) { - config->update_num (config, "engine.buffers.video_num_buffers", 1800); + &entry) && (entry.num_value < 800)) { + config->update_num (config, "engine.buffers.video_num_buffers", 800); #ifdef LOG_DVBSPEED printf ("net_buf_ctrl: enlarged video fifo to 1800 buffers\n"); #endif diff --git a/src/spu_dec/spudvb_decoder.c b/src/spu_dec/spudvb_decoder.c index 860d7cc35..8cdba1baa 100644 --- a/src/spu_dec/spudvb_decoder.c +++ b/src/spu_dec/spudvb_decoder.c @@ -87,6 +87,8 @@ typedef struct { typedef struct dvb_spu_class_s { spu_decoder_class_t class; xine_t *xine; + + int ignore_pts; } dvb_spu_class_t; typedef struct dvb_spu_decoder_s { @@ -105,9 +107,8 @@ typedef struct dvb_spu_decoder_s { char *pes_pkt_wrptr; unsigned int pes_pkt_size; - uint64_t pts; - uint64_t vpts; - uint64_t end_vpts; + int64_t vpts; + int64_t end_vpts; pthread_t dvbsub_timer_thread; struct timespec dvbsub_hide_timeout; @@ -896,7 +897,7 @@ static void draw_subtitles (dvb_spu_decoder_t * this) } pthread_mutex_lock(&this->dvbsub_osd_mutex); - lprintf("this->vpts=%llu\n",this->vpts); + lprintf("this->vpts=%"PRId64"\n",this->vpts); for ( r=0; r<MAX_REGIONS; r++ ) { lprintf("region=%d, visible=%d, osd=%d, empty=%d\n", r, this->dvbsub->page.regions[r].is_visible, this->dvbsub->regions[r].osd?1:0, this->dvbsub->regions[r].empty ); if ( this->dvbsub->page.regions[r].is_visible && this->dvbsub->regions[r].osd && !this->dvbsub->regions[r].empty ) { @@ -949,27 +950,29 @@ static void spudec_decode_data (spu_decoder_t * this_gen, buf_element_t * buf) } return; } - else { - if (buf->decoder_info[2]) { - memset (this->pes_pkt, 0xff, 64*1024); - this->pes_pkt_wrptr = this->pes_pkt; - this->pes_pkt_size = buf->decoder_info[2]; - this->pts = buf->pts; - xine_fast_memcpy (this->pes_pkt, buf->content, buf->size); + /* accumulate data */ + if (buf->decoder_info[2]) { + memset (this->pes_pkt, 0xff, 64*1024); + this->pes_pkt_wrptr = this->pes_pkt; + this->pes_pkt_size = buf->decoder_info[2]; + + xine_fast_memcpy (this->pes_pkt, buf->content, buf->size); + this->pes_pkt_wrptr += buf->size; + + this->vpts = 0; + } + else { + if (this->pes_pkt && (this->pes_pkt_wrptr != this->pes_pkt)) { + xine_fast_memcpy (this->pes_pkt_wrptr, buf->content, buf->size); this->pes_pkt_wrptr += buf->size; } - else { - if (this->pes_pkt && (this->pes_pkt_wrptr != this->pes_pkt)) { - xine_fast_memcpy (this->pes_pkt_wrptr, buf->content, buf->size); - this->pes_pkt_wrptr += buf->size; - } - } } + /* don't ask metronom for a vpts but rather do the calculation * because buf->pts could be too far in future and metronom won't accept * further backwards pts (see metronom_got_spu_packet) */ - if (buf->pts) { + if (!this->class->ignore_pts && buf->pts > 0) { metronom_t *metronom = this->stream->metronom; int64_t vpts_offset = metronom->get_option( metronom, METRONOM_VPTS_OFFSET ); int64_t spu_offset = metronom->get_option( metronom, METRONOM_SPU_OFFSET ); @@ -977,7 +980,7 @@ static void spudec_decode_data (spu_decoder_t * this_gen, buf_element_t * buf) metronom_clock_t *clock = this->stream->xine->clock; int64_t curvpts = clock->get_current_time( clock ); /* if buf->pts is unreliable, show page asap (better than nothing) */ - lprintf("spu_vpts=%lld - current_vpts=%lld\n", vpts, curvpts); + lprintf("spu_vpts=%"PRId64" - current_vpts=%"PRId64"\n", vpts, curvpts); if ( vpts<=curvpts || (vpts-curvpts)>(5*90000) ) this->vpts = 0; else @@ -985,7 +988,7 @@ static void spudec_decode_data (spu_decoder_t * this_gen, buf_element_t * buf) } /* completely ignore pts since it makes a lot of problems with various providers */ - this->vpts = 0; + /* this->vpts = 0; */ /* process the pes section */ @@ -1175,6 +1178,15 @@ static spu_decoder_t *dvb_spu_class_open_plugin (spu_decoder_class_t * class_gen return (spu_decoder_t *) this; } +static void dvb_spu_decoder_class_dispose (spu_decoder_class_t * this_gen) +{ + dvb_spu_class_t *this = (dvb_spu_class_t *) this_gen; + + this->xine->config->unregister_callback(this->xine->config, "subtitles.dvb.ignore_pts"); + + free (this); +} + static void *init_spu_decoder_plugin (xine_t * xine, void *data) { @@ -1184,7 +1196,7 @@ static void *init_spu_decoder_plugin (xine_t * xine, void *data) this->class.open_plugin = dvb_spu_class_open_plugin; this->class.identifier = "spudvb"; this->class.description = N_("DVB subtitle decoder plugin"); - this->class.dispose = default_spu_decoder_class_dispose; + this->class.dispose = dvb_spu_decoder_class_dispose; this->xine = xine; diff --git a/src/video_dec/image.c b/src/video_dec/image.c index cbbb9d722..e91588702 100644 --- a/src/video_dec/image.c +++ b/src/video_dec/image.c @@ -54,6 +54,17 @@ #include <xine/xineutils.h> #include "bswap.h" +#ifdef HAVE_GRAPHICSMAGICK +# define MAGICK_VERSION 0x670 +#else +# if !defined(MagickLibVersion) || MagickLibVersion < 0x671 +# define MAGICK_VERSION 0x670 +#else +# define MAGICK_VERSION MagickLibVersion +# endif +#endif + + typedef struct { video_decoder_class_t decoder_class; @@ -101,14 +112,23 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { /* * this->image -> rgb data */ +#if MAGICK_VERSION < 0x671 InitializeMagick(NULL); +#else + MagickWandGenesis(); +#endif wand = NewMagickWand(); status = MagickReadImageBlob(wand, this->image, this->index); + this->index = 0; if (!status) { DestroyMagickWand(wand); +#if MAGICK_VERSION < 0x671 DestroyMagick(); +#else + MagickWandTerminus(); +#endif lprintf("error loading image\n"); return; } @@ -116,9 +136,15 @@ static void image_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { width = MagickGetImageWidth(wand) & ~1; /* must be even for init_yuv_planes */ height = MagickGetImageHeight(wand); img_buf = malloc(width * height * 3); +#if MAGICK_VERSION < 0x671 MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf); DestroyMagickWand(wand); DestroyMagick(); +#else + MagickExportImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf); + DestroyMagickWand(wand); + MagickWandTerminus(); +#endif _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, width); _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, height); diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 55661c381..31ee4443a 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -1189,6 +1189,8 @@ static const audio_db_t audio_db[] = { }, { { + ME_FOURCC('E', 'A', 'C', '3'), + ME_FOURCC('e', 'c', '-', '3'), 0 }, BUF_AUDIO_EAC3, diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 0eada28b4..924fbe02a 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -1035,7 +1035,9 @@ void xine_config_save (xine_t *xine, const char *filename) { buf = (char *) malloc(config_stat.st_size + 1); if((rlen = fread(buf, 1, config_stat.st_size, f_config)) && ((off_t)rlen == config_stat.st_size)) { - (void) fwrite(buf, 1, rlen, f_backup); + if (rlen != fwrite(buf, 1, rlen, f_backup)) { + lprintf("backing up configfile to %s failed\n", temp); + } } free(buf); diff --git a/src/xine-engine/io_helper.c b/src/xine-engine/io_helper.c index 399cb25a4..1336fc790 100644 --- a/src/xine-engine/io_helper.c +++ b/src/xine-engine/io_helper.c @@ -87,17 +87,19 @@ static int _x_io_tcp_connect_ipv4(xine_stream_t *stream, const char *host, int p for (i = 0; h->h_addr_list[i]; i++) { struct in_addr ia; - struct sockaddr_in sin; - + union { + struct sockaddr sa; + struct sockaddr_in in; + } saddr; memcpy (&ia, h->h_addr_list[i], 4); - sin.sin_family = AF_INET; - sin.sin_addr = ia; - sin.sin_port = htons(port); + saddr.in.sin_family = AF_INET; + saddr.in.sin_addr = ia; + saddr.in.sin_port = htons(port); #ifndef WIN32 - if (connect(s, (struct sockaddr *)&sin, sizeof(sin))==-1 && errno != EINPROGRESS) { + if (connect(s, &saddr.sa, sizeof(saddr.in))==-1 && errno != EINPROGRESS) { #else - if (connect(s, (struct sockaddr *)&sin, sizeof(sin))==-1 && WSAGetLastError() != WSAEWOULDBLOCK) { + if (connect(s, &saddr.sa, sizeof(saddr.in))==-1 && WSAGetLastError() != WSAEWOULDBLOCK) { if (stream) xprintf(stream->xine, XINE_VERBOSITY_DEBUG, "io_helper: WSAGetLastError() = %d\n", WSAGetLastError()); #endif /* WIN32 */ diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c index cea2b5b0b..515919a41 100644 --- a/src/xine-utils/memcpy.c +++ b/src/xine-utils/memcpy.c @@ -1,4 +1,4 @@ -/* +;/* * Copyright (C) 2001-2004 the xine project * * This file is part of xine, a free video player. @@ -403,11 +403,23 @@ static const struct { { "ppcasm", ppcasm_memcpy, 0 }, { "ppcasm_cached", ppcasm_cacheable_memcpy, MM_ACCEL_PPC_CACHE32 }, #endif /* ARCH_PPC && !HOST_OS_DARWIN */ + { "", NULL, 0 } }; static uint64_t memcpy_timing[sizeof(memcpy_method)/sizeof(memcpy_method[0])] = { 0, }; -#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && defined(HAVE_SYS_TIMES_H) +#ifdef HAVE_POSIX_TIMERS +/* Prefer clock_gettime() where available. */ +static int64_t _x_gettime(void) +{ + struct timespec tm; + return (clock_gettime (CLOCK_THREAD_CPUTIME_ID, &tm) == -1) + ? times (NULL) + : (int64_t)tm.tv_sec * 1e9 + tm.tv_nsec; +} +# define rdtsc(x) _x_gettime() + +#elif (defined(ARCH_X86) || defined(ARCH_X86_64)) && defined(HAVE_SYS_TIMES_H) static int64_t rdtsc(int config_flags) { int64_t x; @@ -510,7 +522,13 @@ void xine_probe_fast_memcpy(xine_t *xine) memset(buf1,0,BUFSIZE); memset(buf2,0,BUFSIZE); - for(i = 1; i < sizeof(memcpy_method)/sizeof(memcpy_method[0]); i++) + /* some initial activity to ensure that we're not running slowly :-) */ + for(j=0;j<50;j++) { + memcpy_method[1].function(buf2,buf1,BUFSIZE); + memcpy_method[1].function(buf1,buf2,BUFSIZE); + } + + for(i=1; memcpy_method[i].name[0]; i++) { if( (config_flags & memcpy_method[i].cpu_require) != memcpy_method[i].cpu_require ) |