diff -Naur oxine-0.6.orig/ChangeLog oxine-0.6.3/ChangeLog --- oxine-0.6.orig/ChangeLog 2006-11-03 17:53:38.000000000 +0100 +++ oxine-0.6.3/ChangeLog 2006-11-22 10:53:14.000000000 +0100 @@ -1,3 +1,19 @@ +oxine 0.6.3 + * Fixed resolving of softlinks. + * Fixed some polling issues. + * Fixed various OSD issues. + * Fixed the logic of how we handle DVDs/ VCDs and audio CDs. + * Fixed datarootdir warning in po. + +oxine 0.6.2 + * Fixed bug #1593969. + * Added patch #1591174. + * Added patch #1591173. + * Added patch #1591171. + +oxine 0.6.1 + * Fixed bug #1590850. + oxine 0.6 * Added support for configuring the main menu using an XML-file. * Added support for image buttons. diff -Naur oxine-0.6.orig/configure oxine-0.6.3/configure --- oxine-0.6.orig/configure 2006-11-03 18:23:55.000000000 +0100 +++ oxine-0.6.3/configure 2006-11-22 10:55:46.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for oxine 0.6. +# Generated by GNU Autoconf 2.60 for oxine 0.6.3. # # Report bugs to . # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='oxine' PACKAGE_TARNAME='oxine' -PACKAGE_VERSION='0.6' -PACKAGE_STRING='oxine 0.6' +PACKAGE_VERSION='0.6.3' +PACKAGE_STRING='oxine 0.6.3' PACKAGE_BUGREPORT='mschwerin@users.sf.net' ac_unique_file="src/oxine.c" @@ -1256,7 +1256,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures oxine 0.6 to adapt to many kinds of systems. +\`configure' configures oxine 0.6.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1330,7 +1330,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of oxine 0.6:";; + short | recursive ) echo "Configuration of oxine 0.6.3:";; esac cat <<\_ACEOF @@ -1443,7 +1443,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -oxine configure 0.6 +oxine configure 0.6.3 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1457,7 +1457,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by oxine $as_me 0.6, which was +It was created by oxine $as_me 0.6.3, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2127,7 +2127,7 @@ # Define the identity of the package. PACKAGE=oxine - VERSION=0.6 + VERSION=0.6.3 cat >>confdefs.h <<_ACEOF @@ -10203,7 +10203,7 @@ lirc_libprefix="$LIRC_PREFIX/lib" LIRC_INCLUDE="-I$LIRC_PREFIX/include" fi - for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do + for llirc in $lirc_libprefix /lib /lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64; do as_ac_File=`echo "ac_cv_file_"$llirc/liblirc_client.a"" | $as_tr_sh` { echo "$as_me:$LINENO: checking for \"$llirc/liblirc_client.a\"" >&5 echo $ECHO_N "checking for \"$llirc/liblirc_client.a\"... $ECHO_C" >&6; } @@ -16041,7 +16041,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by oxine $as_me 0.6, which was +This file was extended by oxine $as_me 0.6.3, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16094,7 +16094,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -oxine config.status 0.6 +oxine config.status 0.6.3 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Naur oxine-0.6.orig/configure.ac oxine-0.6.3/configure.ac --- oxine-0.6.orig/configure.ac 2006-11-03 17:53:45.000000000 +0100 +++ oxine-0.6.3/configure.ac 2006-11-22 10:53:22.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([oxine],[0.6],[mschwerin@users.sf.net]) +AC_INIT([oxine],[0.6.3],[mschwerin@users.sf.net]) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AC_CONFIG_SRCDIR([src/oxine.c]) AC_CONFIG_HEADER([config.h]) diff -Naur oxine-0.6.orig/data/skins/greyraven/backgrounds/oxine-createGUI.c oxine-0.6.3/data/skins/greyraven/backgrounds/oxine-createGUI.c --- oxine-0.6.orig/data/skins/greyraven/backgrounds/oxine-createGUI.c 2006-10-18 12:57:37.000000000 +0200 +++ oxine-0.6.3/data/skins/greyraven/backgrounds/oxine-createGUI.c 2006-11-06 08:26:56.000000000 +0100 @@ -110,7 +110,7 @@ " -fill blue" " -draw 'line 15,0 15,99'" " -fill black"); - _cmd = (char *) (int) _cmd + strlen (_cmd); + _cmd = (char *) _cmd + strlen (_cmd); char *header = strdup (header_menus[j].header); char *word = strtok (header, " "); @@ -128,7 +128,7 @@ " -annotate +5+60 \" %c\" \\) ", (word[0] != word_upper[0]) ? 50 : 60, COLOR, word_upper[0]); - _cmd = (char *) (int) _cmd + strlen (_cmd); + _cmd = (char *) _cmd + strlen (_cmd); sprintf (_cmd, " \\( -clone 0" @@ -136,8 +136,8 @@ " -pointsize 50" " -fill '#%s'" " -annotate +5+60 \" %s\" \\) ", COLOR, - (char *) ((int) word_upper + 1)); - _cmd = (char *) (int) _cmd + strlen (_cmd); + (char *) (word_upper + 1)); + _cmd = (char *) _cmd + strlen (_cmd); word = strtok (NULL, " "); } diff -Naur oxine-0.6.orig/data/skins/Makefile.am oxine-0.6.3/data/skins/Makefile.am --- oxine-0.6.orig/data/skins/Makefile.am 2006-10-18 12:57:38.000000000 +0200 +++ oxine-0.6.3/data/skins/Makefile.am 2006-11-06 08:24:21.000000000 +0100 @@ -4,8 +4,8 @@ DEFAULT_SKIN = @OXINE_SKINDIR@/default install-data-local: - test -L $(DEFAULT_SKIN) || \ - $(LN_S) oxinetic $(DEFAULT_SKIN) || \ + test -L $(DESTDIR)/$(DEFAULT_SKIN) || \ + $(LN_S) oxinetic $(DESTDIR)/$(DEFAULT_SKIN) || \ exit 1 mostlyclean-local: diff -Naur oxine-0.6.orig/data/skins/Makefile.in oxine-0.6.3/data/skins/Makefile.in --- oxine-0.6.orig/data/skins/Makefile.in 2006-11-03 18:23:53.000000000 +0100 +++ oxine-0.6.3/data/skins/Makefile.in 2006-11-22 10:55:43.000000000 +0100 @@ -513,8 +513,8 @@ install-data-local: - test -L $(DEFAULT_SKIN) || \ - $(LN_S) oxinetic $(DEFAULT_SKIN) || \ + test -L $(DESTDIR)/$(DEFAULT_SKIN) || \ + $(LN_S) oxinetic $(DESTDIR)/$(DEFAULT_SKIN) || \ exit 1 mostlyclean-local: diff -Naur oxine-0.6.orig/data/skins/oxinetic/backgrounds/oxine-createGUI.c oxine-0.6.3/data/skins/oxinetic/backgrounds/oxine-createGUI.c --- oxine-0.6.orig/data/skins/oxinetic/backgrounds/oxine-createGUI.c 2006-11-03 18:34:54.000000000 +0100 +++ oxine-0.6.3/data/skins/oxinetic/backgrounds/oxine-createGUI.c 2006-11-06 08:27:52.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: oxine-createGUI.c 1449 2006-11-03 17:34:10Z mschwerin $ + * $Id: oxine-createGUI.c 1466 2006-11-06 07:26:48Z mschwerin $ * */ #include "config.h" @@ -106,8 +106,10 @@ char *_cmd = cmd; sprintf (_cmd, BIN_CONVERT " -size 500x100 xc:none " - " -fill blue" " -draw 'line 15,0 15,99'" " -fill black"); - _cmd = (char *) (int) _cmd + strlen (_cmd); + " -fill blue" + " -draw 'line 15,0 15,99'" + " -fill black"); + _cmd = (char *) _cmd + strlen (_cmd); char *header = strdup (header_menus[j].header); char *word = strtok (header, " "); @@ -125,7 +127,7 @@ " -annotate +5+60 \" %c\" \\) ", (word[0] != word_upper[0]) ? 50 : 60, COLOR, word_upper[0]); - _cmd = (char *) (int) _cmd + strlen (_cmd); + _cmd = (char *) _cmd + strlen (_cmd); sprintf (_cmd, " \\( -clone 0" @@ -133,8 +135,8 @@ " -pointsize 50" " -fill '#%s'" " -annotate +5+60 \" %s\" \\) ", COLOR, - (char *) ((int) word_upper + 1)); - _cmd = (char *) (int) _cmd + strlen (_cmd); + (char *) (word_upper + 1)); + _cmd = (char *) _cmd + strlen (_cmd); word = strtok (NULL, " "); } @@ -176,8 +178,8 @@ return 0; #else - printf - ("Please install mjpegtools, netpbm and imagemagic to use this tool!\n"); + printf ("Please install mjpegtools, netpbm and " + "imagemagic to use this tool!\n"); return 1; #endif } diff -Naur oxine-0.6.orig/m4/lirc.m4 oxine-0.6.3/m4/lirc.m4 --- oxine-0.6.orig/m4/lirc.m4 2006-08-30 18:00:12.000000000 +0200 +++ oxine-0.6.3/m4/lirc.m4 2006-11-06 08:21:41.000000000 +0100 @@ -18,7 +18,7 @@ lirc_libprefix="$LIRC_PREFIX/lib" LIRC_INCLUDE="-I$LIRC_PREFIX/include" fi - for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do + for llirc in $lirc_libprefix /lib /lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64; do AC_CHECK_FILE(["$llirc/liblirc_client.a"], [LIRC_LIBS="$llirc/liblirc_client.a"] AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblir_client) installed.]),,) diff -Naur oxine-0.6.orig/po/de.gmo oxine-0.6.3/po/de.gmo --- oxine-0.6.orig/po/de.gmo 2006-11-03 18:35:36.000000000 +0100 +++ oxine-0.6.3/po/de.gmo 2006-11-22 10:56:28.000000000 +0100 @@ -1,90 +1,88 @@ -m)6267747BL7:7?7< -8AG8Q8:8|959099 : +:9:I:[:m::::: ::::; ;"; 4;>; B;O; T;^;c;l; s;}; -;; ;';;; ;;;; ; - <<,<+?<k<r<z< <<<<<<< -<<<< < < = =*=H2={= -= = ========== -= > - >> >(>1>N>!i>)>%>&>??$8?]?q??F?!?) @6@&T@{@@@@@A5ATAhAAA1A*A B$B:BSBsBBB BB%C&CMHMZM lMyM -M -MM!MAM@N[NdN jN tNNNNN NN N N N N!NO O O O )O3O;O AONOWO_O hOuOOO O OOO OOOO OO -O -P P P#P7PKPRP UPcP jPxP~PPPPPPPP Q Q Q,Q;QBQJQ -OQZQ4jQ!QQQQ%Q RR8RCSRIRRR -R S -SS S -(S 3SAS FSRSfSxSSSSSS SSSS ST T TTT 'T -1T U HUTU -jUuU{U U UUUU -U -UUUU -U -UUU VV %V)/V&YV+V/V$V)W&+W+RW/~W$W W W W W X X X +X 8XEXMXSX[XvXzXXXXXX XX\XjYj}Y7Y/ ZDPZ'Z&Z%Z' -[ 2[?[V[t[[[[[[ -[[[[[[\ \\ \3!\'U\"}\\ \ \\\+\!]=]D]]]b]5]]]]]] ]] -] - ^^ ^*^!1^S^ [^g^x^^^^^Y^P_f_ -u___%_____5_(`*`1`6`;`N`k``` ` -` -``!` aa6a;aPafa'aaa$aaa!a -bb b*bAbJbSblbbbbbbbbbbbbbcc3cPclcqcxc|c cc c&cccc d!d'd@dIdQdidyddddddd e e7eKe ^e he -ueeeeeeeeeee ff'f -DfOfcf{ffff4ChxhhhJhB i?Pi8iDijAjjEXk1kkk k ll/lAlSljl|ll lllllll -m mm6m >mHm MmWm ^m hmrmm m)m m -mm mmm n -nn .n.;njn sn}nnnnnnnn nnn n o o o.oGoePo -o -o o -o -oo o p pp -%p0pIpXpgp lpxppp"pp&p0p*.q+Yq!q!q(q2q6%r+\rSr#r-s!.s-Ps"~s s&s s -t)t<Ht2tt+t*u2.u8au"u,uu"v*vHv,hv#v!v+v2w%:w`w ewowwww wwww -w wwx/xJx Sx_x qx}x -xxxxxx x -xxx xxy y)y2yo6y z z6z3z!+{%M{5s{3{3{;|>M|| -||#||| -}} '}3}9} B}'P}3x}}}}} ~ ~~!~0~ 9~C~I~ P~Z~b~ -~~~~~~ ~~~~ -~~~~ ~ $ -7 MZ bnw ˀ(Ӏ2S9  Łсׁށ - - ( -=HQ Y gs { "͂܂ - & -20=inf؃ ? I S] -t ń ˄"ل - -  -! ,6< LX my ƅՅ܅  $)1 : -GRfz  cdž+0)8 bo  ć҇/*@ -S^ n""Јc[Wlj Љ މ  # )6Ke y  - -%NJ -  #) -2 -=HX$h ͋  '?D KY -` -kv~  Ō̌Ҍ׌ߌ  - - -&7G -Y6d13͍7.94h/1͎5,5 b o | ʏ׏ߏ -"  )6 <F -M XYfpm1B<Ii*-ɒ(;T hr{ -   -Ǔ -ғ^ݓ2<!o "ǔ/"4 We"?   & :HN W c$o -  Ė Җ ޖbSP ŗ˗$ї6.Fu|"Ә -$ /#;%_ ə0CJ7S  ̚ Ԛ#3N!Su|͛#=X_fj my%$ݜ# )J S_}ϝ:UuӞ.5Ocu{' -Ɵ,w_Ly!h"2CZU]b;~p*)]W[f<ch+HG'SBt@E,Dz I51-nY:Dn~ . ESAW: rvu-TQ=73H{v.JKoj m|QKuq.0N$%mC\+ -JthI &3 G -lXA?B8M -c|`}Yb{I8t$M>R[=w#)1*f9dOVY8!0;d)\xia~$z_Xnx?l>4}7o_VT? PHgZe#5ebw N(v^9O7Rj>1"QF/  +s 6LW@}p'o!zZ/U&cPENq;F,idJk4 3]^xu=L a|rkMk`2{ifGlK[j(:DyF XRP\Orgaqs-#B6A/&%,s"2V%<m`U0C9'TS45@pg<^e*6y( Available drivers: +lm(p62q6666B6:/7?j7<7A7Q)8:{8|85390i999 9999 ::6:H:O: _:l:~::::: :: :: ::; ; ;; +%;0; 7;'A;i;r; z;;;; ; +;;;+; <<< !<-<2<G<X<`<h< +o<z<<< < << <<H<= +"= -= ;=E=M=T=[=c=l=t=|== += = +======! >)+>%U>&{>>>$>>?F/?!v?)??&?@!@;@[@u@@5@@@A1&A*XAAAAAAB!B ;B\B%xBBBBBB BC CCCC!C )C5CEC [C |CC CCC CCCC CCCCCCCDD D*D3DK7DEE-E0EF"F2AF5tF%F,F7F5GPG XGeG +G +GGG +GGGGG$G*H:H KH YHfHmHuH {HHHHHHHHH HHHHH I III'I.I3I:I @IJIfI jItI I I IIsI}JJJ +J J J JJ)JK+K@KDFKKKKKKKKKK KKKKKKLL LLL&L .L V)cV&V+V/V$W 5W ?W LW YW fW sW W W WWWWWWWWWWWW XX\XjtXjX7JY/YDY'Y&Z%FZ'lZ ZZZZZ +[![)[2[ +8[C[I[P[W[^[f[n[r[ y[3['["[\ +\ \%\A\+W\\\\\\\\\\] ]] +*] +5]@] I]V]!]]] ]]]]]]]Y]PA^^ +^^^%^^^^^5^(-_V_]_b_g_z____ _ +_ +__!`5`I`b`g`|``'```$`aa!a +;aFa LaVamavaaaaaaaaaaaab bb3bJb_b|bbbbb bb bbbc c&c,cEcNcVcnc~cccccccd%dzz +z{#{2{G{Y{a{ v{{{ {'{3{{|/|B| U| b|l|p|| ||| ||| +|||||} }}}!} +0};}A}H} N}X}s} |}} }} }}}K~~~ ~ ~  ("KhS     &- +4? D +Q\enw + € ʀ ׀"+<LQ +j u +0if'  +Â΂ӂق  "(K +Q +\g +p {  ȃ߃ $+2A FR esx +ɄЄӄ  cz)  ҅߅  !/4*d + ކ""cB[  - 9EM Ucr x Ȉ ҈ + + %<B K +Xc hrx + +$܉  3;J ] jv  + +Ŋ͊  !&. 7A J +T +_ +ju +6137P.4/15N, ˍ ؍ &. +4"?bf n x  + YpmB<1InҐ*-FObw ʑ +Б ۑ  + +!^,2! "9/S" Г"Փ " +5 IW] f r$~ + ̔ Ӕ bS_ ԕڕ$ 6.U͖" +3 >#J%n ̗ؗ0!RY7b  Ϙۘ  #B]!bܙ2Lgnuy |$ƚߚ 3 <Hfyכ#>^yМ֜ߜ8L^d +|՝r\Hxc"2|@VUZ^8{m')YS[c8` e'D~D$SBo=E(Au I1.*mY7@ky .BP=W6 mup-TQ=4/Hyq~+GGlghyMHr p{*-K!%lC\+FqhE &3CkT><>8I +_w`zUbxF4s  M;OX9v%}-&a6dKRV5,7a&Ywi ]|$w_Xi}s?i:1{3j[VQ;P|EdWb 5e_t N(s[z5L7Rj>1NF+  (n3IT@xk'n!Z/R#c}MAJn;B)d`J0 0]Zut:L azohJf\.vffGgKWe%:DtC +UNLXOq~g^lp)#?6A +,"!,r/S"9j]Q0?9#PO42<ob<^*2v$ Available drivers: device: %s filesystem: %s mountpoint: %s --verbose [=level] Set verbosity level. Default is 1. -A, --audio-driver Select audio driver by ID. -F, --no-fullscreen Do no start in fullscreen mode. @@ -98,7 +96,7 @@ -v, --version Display version. %a, %b %d / %H:%M(c) 2005 by the oxine project 1.5 Mbps (T1)10.5 Mbps (LAN)115.2 Kbps (ISDN)14.4 Kbps (Modem)19.2 Kbps (Modem)262.2 Kbps (Cable/DSL)28.8 Kbps (Modem)2D_Tex2D_Tex_Fragprog2D_Tex_Tiled33.6 Kbps (Modem)34.4 Kbps (Modem)393.2 Kbps (Cable/DSL)4:3524.3 Kbps (Cable/DSL)57.6 Kbps (Modem)AbkhazianAddAdd subtitleAfarAfrikaansAkanAlbanianAlbum:AltimeterAmharicAngle MenuArabicAragoneseAre we to show the quit confirm dialog?ArmenianArtist:Aspect RatioAssameseAudioAudio CDAudio ChannelAudio MenuAudio VisualizationAudio-Video OffsetAutomatically load subtitles if they exist.AvaricAvestanAymaraAzerbaijaniBackBackground AnimationBackground ImageBambaraBashkirBasqueBelarusianBengaliBihariBislamaBlowing dustBlowing sandBlowing snowfallBlowing sprayBosnianBoth libcurl and libmetar must be -installed for weather support to work!BretonBrightnessBroken cloudsBulgarianBurmeseCD-ROMCancelCatalanChamorroChechenChineseChoose an entry...ChuvashClear listClear skyConditionsContrastCornishCorsicanCould not connect to %s: %s!Could not create '%s': %s!Could not create LIRC thread: %s!Could not create disc polling thread: %s!Could not create joystick thread: %s!Could not create scheduler thread: %s!Could not create socket: %s!Could not create stream!Could not create weather thread: %s!Could not eject %s!Could not eject '%s': %s!Could not eject device!Could not find %s, trying to use default configuration file %s/lircrc.Could not find DVB channels file!Could not find a LIRC configuration file.Could not find demuxer pluginCould not free a cache entry for '%s'.Could not get pixel data!Could not initialize ODK!Could not initialize X threads!Could not inizialize OTK!Could not load main menu!Could not load mediamarks.Could not load palette, reverting to standard colors.Could not mount %s!Could not open '%s': %s!Could not open disc!Could not open display!Could not open or play background, leaving oxine!Could not perform codeset conversion (%s)!Could not play '%s': %s!Could not play title!Could not read '%s': %s!Could not read from server: %s!Could not read image '%s'!Could not remove '%s': %s!Could not resolve %s: %s!Could not retrieve weather data!Could not scale image '%s'!Could not send command to server: %s!Could not unmount %s!Could not write to '%s': %s!CreeCroatianCtrl + Alt + left/ rightCtrl + left/ rightCurrent titleCylinderCzechDVBDVDDanishDecoderDeinterlaceDelete subtitleDemuxer plugin failedDevices oxine tried to open are:Dew pointDivehiDrifting snowDrizzleDustDuststormDutchDzongkhaEastEdit SettingsEffectsEjectElapsed:EngineEnglishEnterEnv_Mapped_TorusEsc/ BackspaceEsperantoEstonianEweExamples for valid MRLs (media resource locator): +installed for weather support to work!BretonBrightnessBroken cloudsBulgarianBurmeseCD-ROMCancelCatalanChamorroChechenChineseChoose an entry...ChuvashClear listClear skyConditionsContrastCornishCorsicanCould not connect to %s: %s!Could not create '%s': %s!Could not create LIRC thread: %s!Could not create disc polling thread: %s!Could not create joystick thread: %s!Could not create scheduler thread: %s!Could not create socket: %s!Could not create stream!Could not create weather thread: %s!Could not eject '%s': %s!Could not eject device!Could not find %s, trying to use default configuration file %s/lircrc.Could not find DVB channels file!Could not find a LIRC configuration file.Could not find demuxer pluginCould not free a cache entry for '%s'.Could not get pixel data!Could not initialize ODK!Could not initialize X threads!Could not inizialize OTK!Could not load main menu!Could not load mediamarks.Could not load palette, reverting to standard colors.Could not open '%s': %s!Could not open disc!Could not open display!Could not open or play background, leaving oxine!Could not perform codeset conversion (%s)!Could not play '%s': %s!Could not play title!Could not read '%s': %s!Could not read from server: %s!Could not read image '%s'!Could not remove '%s': %s!Could not resolve %s: %s!Could not retrieve weather data!Could not scale image '%s'!Could not send command to server: %s!Could not write to '%s': %s!CreeCroatianCtrl + Alt + left/ rightCtrl + left/ rightCurrent titleCylinderCzechDVBDVDDanishDecoderDeinterlaceDelete subtitleDemuxer plugin failedDevices oxine tried to open are:Dew pointDivehiDrifting snowDrizzleDustDuststormDutchDzongkhaEastEdit SettingsEffectsEjectElapsed:EngineEnglishEnterEnv_Mapped_TorusEsc/ BackspaceEsperantoEstonianEweExamples for valid MRLs (media resource locator): File: 'path/foo.vob' '/path/foo.vob' 'file://path/foo.vob' @@ -112,9 +110,9 @@ for the changes to take effect!ItalianJapaneseJavaneseKannadaKanuriKashmiriKazakhKhmerKikuyuKinyarwandaKirghizKomiKongoKoreanKuanyamaKurdishLaoLast updateLatinLatvianLength:LetzeburgeschLimburganLingalaListen to MusicLithuanianLoading menu file '%s'...Loading palette file '%s'...Loop ModeLow drifting dustLow drifting sandLuba-KatangaMETAR ICAO location indicatorMPEG trackMacedonianMainmenuMake sure you have lircd running.Make sure you have the permissions to connect to the LIRC socket.Make sure you have the permissions to open the joystick devices.MalagasyMalayMalayalamMalformed MRLMalteseManxMaoriMarathiMarshalleseMediaMedia BrowserMedia-BrowserMenu toggleMiscellaneousMissing property (required) '%s'!MistMoldavianMongolianMono 1.0Move downMove upMusicMy FavoritesMy FilmsMy HomeMy MusicMy PlaylistsMy VDR RecordingsNauruNavahoNdebele NorthNdebele SouthNdongaNepaliNext PageNoNo discNo input pluginNormal ModeNorthNorth-EastNorth-WestNorthern SamiNorwegianNorwegian (Bokmål)Norwegian (Nynorsk)NyanjaOKOPTIONS are: OjibwaOld BulgarianOriyaOromoOssetianOvercastOverriding calculated monitor pixel aspect ratio with user provided value: %.02fPaliPanjabiParsing '%s' failed!Part MenuPartial fogPass ThroughPatches of fogPausedPersianPlayPlay a DVDPlay a Video CDPlay all titles in this folder and all subfolders...Play all titles in this folder...Play an Audio CDPlayingPlaylistPlease enter a name for the playlist:Please insert a DVD!Please insert a Video CD!Please insert an Audio CD!Please make sure, that your version of xine-lib can play PNG files.Please run 'jscalibrator -file %s -device %s' to calibrate your joystick.Please wait...PolishPortuguesePost PluginProvençalPushtoQuechuaQuit oxineRaeto-RomanceRainRainshowersReboot the computerRelative humidityRemovable DiscRemoveResetRetrieving weather data...RetryRomanianRoot MenuRoot node of '%s' must be '%s'!RundiRussianSVDRP errorSamoanSandSandstormSangoSanskritSardinianSaturationSave listScattered cloudsSelect device to eject:SerbianSettingsShallow fogShonaShow HelpShow Weather ReportShowersShowers of ice pelletsShowers of small hailShuffle ModeShutdownShutdown the computerSichuan YiSindhiSinhaleseSky coverSlovakSlovenianSlow MotionSlow but looks betterSmall HailSmokeSnowSnow GrainsSnowshowersSomaliSothoSouthSouth-EastSouth-WestSpaceSpanishSquallsStereo 2.0Stereo 2.1SubtitleSubtitle ChannelSubtitle MenuSubtitle OffsetSubtitlesSuccessfully started disc polling thread.Successfully started scheduler thread.Successfully started the LIRC input plugin.Successfully started the joystick input plugin.Successfully started weather thread.Successfully stopped disc polling thread.Successfully stopped scheduler thread.Successfully stopped the LIRC input plugin.Successfully stopped the joystick input plugin.Successfully stopped weather thread.SundaneseSurround 3.0Surround 4.0Surround 4.1Surround 5.0Surround 5.1Surround 6.0Surround 6.1Surround 7.1SwahiliSwatiSwedishSwitch computer to standbyTCPTagalogTahitianTajikTamilTatarTeluguTemperatureThaiThe METAR ICAO Location Indicator defines for which location the weather is to be displayed.The MRL of the background image that will be displayed if 'visual_anim.style' is set to 'Background Image'The MRL of the stream animation that will be displayed if 'visual_anim.style' is set to 'Stream Animation'The current video driver does not support unscaled OSD!The current video driver supports unscaled OSD!The current window manager supports 'Extended Window Manager Hints'.The height of the non-fullscreen windowThe width of the non-fullscreen windowThis is %s - A free Video-Player v%s This is not a valid VDR recordings MRL!ThunderstormThunderstorm with hailThunderstorm with ice pelletsThunderstorm with rainThunderstorm with small hailThunderstorm with snowTibetanTigrinyaTitleTitle MenuTongaTrack:TsongaTswanaTurkishTurkmenTwiUighurUkrainianUnable to find usable home directory, using '/tmp'.Unable to get status for file '%s': %s.Unable to read link '%s' file: %s.UnknownUnknown DiscUnknown errorUnknown name '%s' for node!Unknown parameter %d!Unknown parameter '%s' for type 'autoplay'!Unknown prefix to URL '%s'!UpdateUpdating weather data...UrduUsage: oxine [OPTIONS] [MRL] -Use unscaled (full screen resolution) OSD if possibleUser InterfaceUzbekVendaVideoVideo CDVideo DVDVideo Disc RecorderVietnameseVisibilityVolapükVolcanic AshVolumeWaiting for alternative stream...WalloonWatch FilmsWatch TelevisionWeatherWeather stationWell-developed Dust/Sand WhirlsWelshWestWhat audio post plugin is to be displayed if 'visual_anim.style' is set to 'Post Plugin'.What kind of visual output is to be displayed when playing an audio only stream.Wind directionWind speedWolofXhosaXinerama screen for fullscreen windowYear:YesYiddishYorubaYou should create a file containing mediamarks at %s!Your joystick has never been calibrated!ZhuangZoomZulu[M3U-Playlist: %s]activate an item or a buttonadjust audio offsetadjust stream speedadjust subtitle offsetadjust volumeanamorphicarrow keysask before leaving oxineaspect ratio of one monitor pixelaudio driver to useaudio visualization typeautobackground image MRLchange audio languagechange subtitle languagecommand that was selected the last timecontentdefaultdevices to poll (separate using ';')disabledenabledencode special characters in MRLsentire dvdentryextensionfast rewind / forewardfftgraphfftscopego back/ go up one levelgo to the DVD menusgoomhostname for SVDRP connectionhugekernellargelibcmetronom feedbackmmxmmxextmutednavigate the menusnext/ previous channelnext/ previous chapternext/ previous titlenon-fullscreen window heightnon-fullscreen window widthnonenormaloffonone chapteroscopepause/ playpercentage of fullscreen screen to useplay reloaded playlist on startplayback-control itemport for SVDRP connectionpost pluginprobereload playlist on startresamplereverseseek backward/ forewardseek in programseek in program chainsegmentselect an item in a listshell command (power off)shell command (reboot)shell command (standby)show the main menushow the music menushow the playback menushow the video menushow/ hide the OSDskip partskip programskip titlesmallsquaressestop the streamstream animation MRLsubtitle autoloadingtinytoggle aspect ratiotoggle deinterlacetoggle mute/ unmutetrackunknown language (%d)use unscaled OSD if possiblevery largevideo driver to usewhite-black-transparentwhite-none-translucidwhite-none-transparentyellow-black-transparentProject-Id-Version: oxine 0.5 +User InterfaceUzbekVendaVideoVideo CDVideo DVDVideo Disc RecorderVietnameseVisibilityVolapükVolcanic AshVolumeWaiting for alternative stream...WalloonWatch FilmsWatch TelevisionWeatherWeather stationWell-developed Dust/Sand WhirlsWelshWestWhat audio post plugin is to be displayed if 'visual_anim.style' is set to 'Post Plugin'.What kind of visual output is to be displayed when playing an audio only stream.Wind directionWind speedWolofXhosaXinerama screen for fullscreen windowYear:YesYiddishYorubaYou should create a file containing mediamarks at %s!Your joystick has never been calibrated!ZhuangZoomZulu[M3U-Playlist: %s]activate an item or a buttonadjust audio offsetadjust stream speedadjust subtitle offsetadjust volumeanamorphicarrow keysask before leaving oxineaspect ratio of one monitor pixelaudio driver to useaudio visualization typeautobackground image MRLchange audio languagechange subtitle languagecommand that was selected the last timecontentdefaultdevices to poll (separate using ';')disabledenabledencode special characters in MRLsentire dvdentryextensionfast rewind / forewardfftgraphfftscopego back/ go up one levelgo to the DVD menusgoomhostname for SVDRP connectionhugekernellargelibcmetronom feedbackmmxmmxextmutednavigate the menusnext/ previous channelnext/ previous chapternext/ previous titlenon-fullscreen window heightnon-fullscreen window widthnonenormaloffonone chapteroscopepause/ playplay reloaded playlist on startplayback-control itemport for SVDRP connectionpost pluginprobereload playlist on startresamplereverseseek backward/ forewardseek in programseek in program chainsegmentselect an item in a listshell command (power off)shell command (reboot)shell command (standby)show the main menushow the music menushow the playback menushow the video menushow/ hide the OSDskip partskip programskip titlesmallsquaressestop the streamstream animation MRLsubtitle autoloadingtinytoggle aspect ratiotoggle deinterlacetoggle mute/ unmutetrackunknown language (%d)very largevideo driver to usewhite-black-transparentwhite-none-translucidwhite-none-transparentyellow-black-transparentProject-Id-Version: oxine 0.5 Report-Msgid-Bugs-To: mschwerin@users.sf.net -POT-Creation-Date: 2006-11-03 18:35+0100 +POT-Creation-Date: 2006-11-22 10:56+0100 PO-Revision-Date: 2006-11-02 20:25+0100 Last-Translator: Maximilian Schwerin Language-Team: German @@ -138,7 +136,7 @@ %a, %d. %b, %H:%M(c) 2005, das oxine Projekt 1.5 Mbps (T1)10.5 Mbps (LAN)115.2 Kbps (ISDN)14.4 Kbps (Modem)19.2 Kbps (Modem)262.2 Kbps (Cable/DSL)28.8 Kbps (Modem)2D_Tex2D_Tex_Fragprog2D_Tex_Tiled33.6 Kbps (Modem)34.4 Kbps (Modem)393.2 Kbps (Cable/DSL)4:3524.3 Kbps (Cable/DSL)57.6 Kbps (Modem)AbchasischHinzufügenUntertitel hinzufügenDanakilAfrikaansAkanAlbanischAlbum:LuftdruckAmharischAnsichtenmenüArabischAragonesischSoll der Beenden Dialog angezeigt werden?ArmenischKünstler:SeitenverhältnisAssamesischAudioAudio CDAudio KanalAudiomenüAudiovisualisierungAudioversatzAutomatische Untertitel laden falls vorhanden.AwarischAvestischAymaráAserbaidschanischZurückHintergrundanimationHintergrundbildBambaraBachkirBaskischWeißrussischBengaliBihariBeach-la-MarStaubtreibenSandtreibenSchneetreibenAufgewirbeltes SeewasserBosnischUm das aktuelle Wetter anzeigen zu können müssen sowohl libcurl als auch libmetar -installiert sein!BretonischHelligkeitTeils wolkigBulgarischBurmesischCD-ROMAbbrechenKatalanischChamorroTschetschenischChinesischEinen Eintrag wählen...TschuwaschischListe löschenKlarBedingungenKontrastKornischKorsischKonnte nicht mit %s verbinden: %s!Konnte '%s' nicht erzeugen: %s!Konnte LIRC Thread nicht erzeugen: %s!Konnte Plattenabfrage Thread nicht erzeugen: %s!Konnte Joystick Thread nicht erzeugen: %s!Konnte Scheduler Thread nicht erzeugen: %s!Konnte Socket nicht erzeugen: %s!Konnte Datenstrom nicht erzeugen!Konnte Wetter Thread nicht erzeugen: %s!Das Laufwerk '%s' konnte nicht ausgeworfen werden!Das Laufwerk '%s' konnte nicht ausgeworfen werden: %s!Das Gerät konnte nicht ausgeworfen werden!Konnte %s nicht finden, versuche Standardkonfigurationsdatei %s/lircrc zu benutzen.Konnte DVB Kanaldatei nicht finden!Konnte keine LIRC Konfigurationsdatei finden.Konnte Demuxerplugin nicht findenKonnte keine Cacheeintrag für '%s' befreien!Konnte Pixeldaten nicht ermitteln!Konnte ODK nicht initialisieren!Konnte X Threads nicht initialisieren!Konnte OTK nicht initialisieren!Konnte Hauptmenü nicht laden.Konnte Mediamarks nicht laden.Konnte Palette nicht lade, falle auf Standardfarben zurück.Das Laufwerk '%s' konnte nicht eingehängt werden!Konnte '%s' nicht öffnen: %s!Das Laufwerk konnte nicht geöffnet werden!Das Display konnte nicht geöffnet werden!Konnte Hintergrund nicht öffnen oder wiedergeben.Konnte Zeichensatzkonvertierung nicht durchführen (%s)!Konnte '%s' nicht wiedergeben: %s!Der Titel konnte nicht wiedergegeben werden!Konnte '%s' nicht lesen: %s!Konnte nicht vom Server lesen: %s!Konnte Bild '%s' nicht lesen!Konnte '%s' nicht löschen: %s!Konnte Adresse von '%s' nicht ermitteln: %s!Konnte Wetterdaten nicht ermitteln!Konnte Bild '%s' nicht skalieren!Konnte Kommando nicht an Server senden: %s!Das Laufwerk '%s' konnte nicht ausgehängt werden!Konnte nicht nach '%s' schreiben: %s!CreeKroatischStrg + Alt + links/ rechtsStrg + links/ rechtsAktueller TitelZylinderTschechischDVBDVDDänischDekodiererDeinterlaceUntertitel löschenDemuxerplugin hat versagtoxine hat versucht folgende Geräte zu öffnen:TaupunktMaledivischSchneeverwehungenNieselregenStaubStaubsturmNiederländischDzongkhaOstEinstellungen bearbeitenEffekteAuswerfenVergangen:EngineEnglischEingabetasteEnv_Mapped_TorusEsc/ RücktasteEsperantoEstnischEweBeispiele für MRLs (von "Media Resource Locator", Medienquellenbezeichnung): +installiert sein!BretonischHelligkeitTeils wolkigBulgarischBurmesischCD-ROMAbbrechenKatalanischChamorroTschetschenischChinesischEinen Eintrag wählen...TschuwaschischListe löschenKlarBedingungenKontrastKornischKorsischKonnte nicht mit %s verbinden: %s!Konnte '%s' nicht erzeugen: %s!Konnte LIRC Thread nicht erzeugen: %s!Konnte Plattenabfrage Thread nicht erzeugen: %s!Konnte Joystick Thread nicht erzeugen: %s!Konnte Scheduler Thread nicht erzeugen: %s!Konnte Socket nicht erzeugen: %s!Konnte Datenstrom nicht erzeugen!Konnte Wetter Thread nicht erzeugen: %s!Das Laufwerk '%s' konnte nicht ausgeworfen werden: %s!Das Gerät konnte nicht ausgeworfen werden!Konnte %s nicht finden, versuche Standardkonfigurationsdatei %s/lircrc zu benutzen.Konnte DVB Kanaldatei nicht finden!Konnte keine LIRC Konfigurationsdatei finden.Konnte Demuxerplugin nicht findenKonnte keine Cacheeintrag für '%s' befreien!Konnte Pixeldaten nicht ermitteln!Konnte ODK nicht initialisieren!Konnte X Threads nicht initialisieren!Konnte OTK nicht initialisieren!Konnte Hauptmenü nicht laden.Konnte Mediamarks nicht laden.Konnte Palette nicht lade, falle auf Standardfarben zurück.Konnte '%s' nicht öffnen: %s!Das Laufwerk konnte nicht geöffnet werden!Das Display konnte nicht geöffnet werden!Konnte Hintergrund nicht öffnen oder wiedergeben.Konnte Zeichensatzkonvertierung nicht durchführen (%s)!Konnte '%s' nicht wiedergeben: %s!Der Titel konnte nicht wiedergegeben werden!Konnte '%s' nicht lesen: %s!Konnte nicht vom Server lesen: %s!Konnte Bild '%s' nicht lesen!Konnte '%s' nicht löschen: %s!Konnte Adresse von '%s' nicht ermitteln: %s!Konnte Wetterdaten nicht ermitteln!Konnte Bild '%s' nicht skalieren!Konnte Kommando nicht an Server senden: %s!Konnte nicht nach '%s' schreiben: %s!CreeKroatischStrg + Alt + links/ rechtsStrg + links/ rechtsAktueller TitelZylinderTschechischDVBDVDDänischDekodiererDeinterlaceUntertitel löschenDemuxerplugin hat versagtoxine hat versucht folgende Geräte zu öffnen:TaupunktMaledivischSchneeverwehungenNieselregenStaubStaubsturmNiederländischDzongkhaOstEinstellungen bearbeitenEffekteAuswerfenVergangen:EngineEnglischEingabetasteEnv_Mapped_TorusEsc/ RücktasteEsperantoEstnischEweBeispiele für MRLs (von "Media Resource Locator", Medienquellenbezeichnung): Datei: 'Pfad/Datei.vob' '/Pfad/Datei.vob' 'file://Pfad/Datei.vob' @@ -152,4 +150,4 @@ damit die Änderungen wirksam werden!ItalienischJapanischJavanischKannadaKanuriKashmiriKasaschischKhmerKikuyuRwandaKirgisischKomiKongolesischKoreanischKuanyamaKurdischLaotischZuletzt aktualisiertLateinischLettischLänge:LuxemburgischLimburgischLingalaMusik hörenLitauischLade Menüdatei '%s'...Lade Farbpalette aus Datei '%s'...EndlosschleifeStaubverwehungenSandverwehungenLubaMETAR ICAO OrtsindikatorMPEG TitelMazedonischHauptmenüStellen Sie sicher, dass lircd ausgeführt wird.Stellen Sie sicher, dass Sie die notwendigen Zugriffsrechte besitzen, um auf das LIRC Socket zuzugreifen.Stellen Sie sicher, dass Sie die zum Öffnen des Joystickgerätes notwendigen Zugriffsrechte besitzen.MalagassiMalaiischMalayalamFalsch formatierte MRLMaltesischManxMaoriMarathiMarschallesischMedienMedienbrowserMedienbrowserMenüVerschiedenesNotwendige Eigenschaft '%s' fehlt!NebelMoldavischMongolischMono 1.0Nach UntenNach ObenMusikMeine FavoritenMeine FilmePersönlicher OrdnerMeine MusikMeine WiedergabelistenMeine VDR AufnahmenNauruanischNavajoNdebele (Nord)Ndebele (Süd)NdongaNepaliNächste SeiteNeinKein MediumKein EingabepluginStandardmodusNordNordostNordwestNordsaamischNorwegischNorwegisch (Bokmal)Norwegisch (Nyorsk)NyanjaOKOPTIONEN sind: OjibwaAltbulgarischOriyaGallaOssetischBedecktÜberschreibe berechnetes Seitenverhältnis eines Monitorpixels mit benutzerdefiniertem Wert: %.02fPaliPanjabiParsen der Datei '%s' ist fehlgeschlagen!KapitelmenüTeils dichter NebeldurchreichenVereinzelt dichter NebelPausePersischWiedergebenDVD abspielenVideo CD abspielenAlle Titel in allen Unterordnern wiedergeben...Alle Titel in diesem Ordner wiedergeben...Audio CD abspielenWiedergabeWiedergabelisteBitte geben Sie einen Namen ein:Bitte legen Sie eine DVD ein!Bitte legen Sie eine Video CD ein!Bitte legen Sie eine Audio CD ein!Bitte stellen Sie sicher, dass Ihre Version von xine-lib in der Lage ist PNG Dateien wiederzugeben.Bitte führen Sie 'jscalibrator -file %s -device %s' aus, um Ihren Joystick zu kalibrieren.Bitte warten Sie...PolnischPortugiesischPost PluginOkzitanischPaschtuQuechuaoxine beendenRätoromanischRegenRegenschauerComputer neu startenRelative LuftfeuchtigkeitWechseldatenträgerEntfernenZurücksetzenLade Wetterdaten...WiederholenRumänischHauptmenüWurzelknoten von '%s' muss '%s' sein!RundiRussischSVDRP FehlerSamoanischSandSandsturmSangoSanskritSardinischSättigungListe speichernLeicht BewölktDas auszuwerfende Gerät auswählen:SerbischEinstellungenDichter BodennebelSchonaHilfe anzeigenWetterbericht anzeigenSchauerGraupelschauerReifgraupelschauerZufallsmodusAusschaltenComputer herunterfahrenNosuSindhiSinghalesischHimmelSlowakischSlovenischLangsamLangsam aber besserReifgraupelRauchSnowSchneegrieselSchneeschauerSomaliSothoSüdSüdostSüdwestLeertasteSpanischWindböenStereo 2.0Stereo 2.1UntertitelUntertitel KanalUntertitelmenüUntertitelversatzUntertitelDer Plattenabfrage Thread wurde erfolgreich gestartet.Der Scheduler Thread wurde erfolgreich gestartet.Das LIRC Eingabeplugin wurde erfolgreich gestartet.Das Joystick Eingabeplugin wurde erfolgreich gestartet.Der Wetter Thread wurde erfolgreich gestartet.Der Plattenabfrage Thread wurde erfolgreich beendet.Der Scheduler Thread wurde erfolgreich beendet.Das LIRC Eingabeplugin wurde erfolgreich beendet.Das Joystick Eingabeplugin wurde erfolgreich beendet.Der Wetter Thread wurde erfolgreich beendet.SundanesischSurround 3.0Surround 4.0Surround 4.1Surround 5.0Surround 5.1Surround 6.0Surround 6.1Surround 7.1SwahiliSwaziSchwedischComputer in Standby-Modus schaltenTCPTagalogTahitischTadschikischTamilTatarischTeluguTemperaturThailändischDer METAR ICAO Ortsindikator definiert für welchen Ort das Wetter angezeigt werden soll.Die MRL des Hintergrundbildes, das angezeigt wird, falls 'visual_anim.style' auf 'Background Image' gesetzt ist.Die MRL der Videoanimation, die angezeigt wird, falls 'visual_anim.style' auf 'Stream Animation' gesetzt ist.Der aktuelle Videotreiber unterstützt unvergrößertes OSD nicht!Der aktuelle Videotreiber unterstützt unvergrößertes OSD!Der aktuelle Fenstermanager unterstützt 'Extended Window Manager Hints'.Höhe des AusgabefenstersBreite des AusgabefenstersDies ist %s - Ein freier Video-Player v%s Dies ist keine gültige MRL einer VDR-AufnameGewitterGewitter mit HagelGewitter mit GraupelGewitter mit RegenGewitter mit ReifgraupelGewitter mit SchneeTibetischTigrinjaTitelTitelmenüTongaischTitel:TsongaTswanaTürkischTurkmenischAlkanUighurischUkrainischEs konnte kein nutzbares Heimatverzeichnis bestimmt werden. '/tmp' wird stattdessen verwendet.Konnte Status für Datei '%s' nicht ermitteln: %s.Konnte Link '%s' nicht lesen: %s.UnbekanntUnbekannter DatenträgerUnbekannter FehlerUnbekannter Name '%s' für Knoten!Unbekannter Parameter %d!Unbekannter Parameter '%s' für Typ 'autoplay'!Prefix von URL '%s' nicht bekannt!AktualisierenAktualisiere Wetterdaten...UrduBenutzung: oxine [OPTIONEN] [MRL] -Benutze unvergößertes (Vollbildauflösung) OSD falls möglichBenutzeroberflächeUzbekischVendaVideoVideo CDVideo DVDVideo Disc RecorderVietnamesischSichtVolapükVulkanascheLautstärkeWarte auf alternativen Datenstrom...WallonischFilme ansehenFernsehen sehenWetterWetterstationStaubteufelWalisischWestWelches Audio Post Plugin wird angezeigt, falls 'visual_anim.style' auf 'Post Plugin' gesetzt ist.Welche Art von visueller Darstellung soll bei nur-audio Strömen ausgegeben werden.WindrichtungWindgeschwindigkeitWolofXhosaXinerama Schirm für VollbildfensterJahr:JaJiddischYorubaSie sollten eine Datei mit Mediamarks an %s erstellen!Ihr Joystick ist noch nicht kalibriert worden!ZhuangZoomZulu[M3U-Wiedergabeliste: %s]Eintrag oder Knopf aktivierenAudioversatz ändernWiedergabegeschwindigkeit anpassenUntertitelversatz ändernLautstärke ändernanamorphicPfeiltastenNachfragen bevor oxine beendet wirdSeitenverhältnis eines MonitorpixelsZu benutzender AudiotreiberArt der AudiovisualisierungautomatischMRL des HintergrundbildesAudiosprache ändernUntertitelsprache ändernKommando, das beim letzten Mal ausgewählt wurdeInhaltStandardautomatisch abgefragte Gerätedateien (mit ';' trennen)deaktiviertaktiviertSonderzeichen in MRLs kodierengesamte DVDEintragErweiterungSchneller Vorlauf/ RücklauffftgraphfftscopeZurück gehen/ Eine Ebene nach obenIn die DVD-Menüs wechselngoomRechnername für SVDRP-Verbindungriesigkernelgroßlibcmetronom feedbackmmxmmxextstummDurch die Menüs navigierenNächster/ Vorheriger KanalNächstes/ Vorheriges KapitelNächster/ Vorheriger TitelHöhe des AusgabefenstersBreite des Ausgabefensterskeinernormalausanein KapiteloscopePause/ WiedergabeProzent des Vollbildfensters benutzenWiedergabeliste beim Start abspielenWiedergabekontroleinheitPort für SVDRP-VerbindungAudio Post PluginprobeWiedergabeliste beim Start ladenresampleRückwärtsRückwärts/ Vorwärts spulenin Programm suchenin Programmkette suchenSegmentEintrag einer Liste auswählenShellkommando (Herunterfahren)Shellkommando (Neustart)Shellkommando (Standby)In das Hauptmenü wechselnIn das Musikmenü wechselnIn das Wiedergabemenü wechselnIn das Videomenü wechselnOSD anzeigen/ versteckenTeil überspringenProgramm überspringenTitel überspringenkleinrechtecksseStopMRL der AnimationUntertitel automatisch ladenwinzigSeitenverhältnis ändernDeinterlace ändernLautstärke stummTitelUnbekannte Sprache (%d)Benutze unskaliertes OSD falls möglichsehr großZu benutzender Videotreiberweiß-schwarz-transparentweiß-keine-transparentweiß-keine-transparentgelb-schwarz-transparent \ Kein Zeilenumbruch am Dateiende. +BenutzeroberflächeUzbekischVendaVideoVideo CDVideo DVDVideo Disc RecorderVietnamesischSichtVolapükVulkanascheLautstärkeWarte auf alternativen Datenstrom...WallonischFilme ansehenFernsehen sehenWetterWetterstationStaubteufelWalisischWestWelches Audio Post Plugin wird angezeigt, falls 'visual_anim.style' auf 'Post Plugin' gesetzt ist.Welche Art von visueller Darstellung soll bei nur-audio Strömen ausgegeben werden.WindrichtungWindgeschwindigkeitWolofXhosaXinerama Schirm für VollbildfensterJahr:JaJiddischYorubaSie sollten eine Datei mit Mediamarks an %s erstellen!Ihr Joystick ist noch nicht kalibriert worden!ZhuangZoomZulu[M3U-Wiedergabeliste: %s]Eintrag oder Knopf aktivierenAudioversatz ändernWiedergabegeschwindigkeit anpassenUntertitelversatz ändernLautstärke ändernanamorphicPfeiltastenNachfragen bevor oxine beendet wirdSeitenverhältnis eines MonitorpixelsZu benutzender AudiotreiberArt der AudiovisualisierungautomatischMRL des HintergrundbildesAudiosprache ändernUntertitelsprache ändernKommando, das beim letzten Mal ausgewählt wurdeInhaltStandardautomatisch abgefragte Gerätedateien (mit ';' trennen)deaktiviertaktiviertSonderzeichen in MRLs kodierengesamte DVDEintragErweiterungSchneller Vorlauf/ RücklauffftgraphfftscopeZurück gehen/ Eine Ebene nach obenIn die DVD-Menüs wechselngoomRechnername für SVDRP-Verbindungriesigkernelgroßlibcmetronom feedbackmmxmmxextstummDurch die Menüs navigierenNächster/ Vorheriger KanalNächstes/ Vorheriges KapitelNächster/ Vorheriger TitelHöhe des AusgabefenstersBreite des Ausgabefensterskeinernormalausanein KapiteloscopePause/ WiedergabeWiedergabeliste beim Start abspielenWiedergabekontroleinheitPort für SVDRP-VerbindungAudio Post PluginprobeWiedergabeliste beim Start ladenresampleRückwärtsRückwärts/ Vorwärts spulenin Programm suchenin Programmkette suchenSegmentEintrag einer Liste auswählenShellkommando (Herunterfahren)Shellkommando (Neustart)Shellkommando (Standby)In das Hauptmenü wechselnIn das Musikmenü wechselnIn das Wiedergabemenü wechselnIn das Videomenü wechselnOSD anzeigen/ versteckenTeil überspringenProgramm überspringenTitel überspringenkleinrechtecksseStopMRL der AnimationUntertitel automatisch ladenwinzigSeitenverhältnis ändernDeinterlace ändernLautstärke stummTitelUnbekannte Sprache (%d)sehr großZu benutzender Videotreiberweiß-schwarz-transparentweiß-keine-transparentweiß-keine-transparentgelb-schwarz-transparent \ Kein Zeilenumbruch am Dateiende. diff -Naur oxine-0.6.orig/po/de.po oxine-0.6.3/po/de.po --- oxine-0.6.orig/po/de.po 2006-11-03 18:35:35.000000000 +0100 +++ oxine-0.6.3/po/de.po 2006-11-22 10:56:27.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: oxine 0.5\n" "Report-Msgid-Bugs-To: mschwerin@users.sf.net\n" -"POT-Creation-Date: 2006-11-03 18:35+0100\n" +"POT-Creation-Date: 2006-11-22 10:56+0100\n" "PO-Revision-Date: 2006-11-02 20:25+0100\n" "Last-Translator: Maximilian Schwerin \n" "Language-Team: German \n" @@ -22,20 +22,20 @@ msgid "Could not perform codeset conversion (%s)!" msgstr "Konnte Zeichensatzkonvertierung nicht durchführen (%s)!" -#: src/disc.c:122 src/disc.c:323 src/disc.c:625 src/environment.c:819 -#: src/environment.c:837 src/filelist.c:805 src/mediamarks_favorites.c:98 -#: src/meta_info.c:85 src/odk.c:1020 src/odk.c:1103 src/odk_osd.c:806 -#: src/odk_osd.c:855 src/playlist_m3u.c:109 src/playlist_xml.c:55 -#: src/weather.c:122 +#: src/disc.c:122 src/disc.c:301 src/disc.c:326 src/disc.c:628 +#: src/environment.c:829 src/environment.c:847 src/filelist.c:805 +#: src/mediamarks_favorites.c:98 src/meta_info.c:85 src/odk.c:1020 +#: src/odk.c:1105 src/odk_osd.c:831 src/odk_osd.c:880 src/playlist_m3u.c:109 +#: src/playlist_xml.c:55 src/weather.c:122 #, c-format msgid "Could not open '%s': %s!" msgstr "Konnte '%s' nicht öffnen: %s!" -#: src/disc.c:213 src/disc.c:473 src/filelist.c:736 +#: src/disc.c:213 src/disc.c:474 src/filelist.c:736 msgid "Audio CD" msgstr "Audio CD" -#: src/disc.c:229 src/filelist.c:734 src/main_menu.c:238 +#: src/disc.c:229 src/filelist.c:734 src/main_menu.c:253 src/main_menu.c:269 msgid "Video CD" msgstr "Video CD" @@ -59,40 +59,39 @@ msgid "Unknown Disc" msgstr "Unbekannter Datenträger" -#: src/disc.c:371 -#, c-format -msgid "Could not mount %s!" -msgstr "Das Laufwerk '%s' konnte nicht eingehängt werden!" +#: src/disc.c:374 +#, fuzzy, c-format +msgid "Could not mount '%s': %s!" +msgstr "Konnte '%s' nicht öffnen: %s!" -#: src/disc.c:391 -#, c-format -msgid "Could not unmount %s!" -msgstr "Das Laufwerk '%s' konnte nicht ausgehängt werden!" +#: src/disc.c:374 src/disc.c:394 src/disc.c:414 src/lang.c:506 +msgid "Unknown" +msgstr "Unbekannt" -#: src/disc.c:411 -#, c-format -msgid "Could not eject %s!" -msgstr "Das Laufwerk '%s' konnte nicht ausgeworfen werden!" +#: src/disc.c:394 +#, fuzzy, c-format +msgid "Could not unmount '%s': %s!" +msgstr "Das Laufwerk '%s' konnte nicht ausgehängt werden!" -#: src/disc.c:419 src/disc.c:425 +#: src/disc.c:414 src/disc.c:422 src/disc.c:427 #, c-format msgid "Could not eject '%s': %s!" msgstr "Das Laufwerk '%s' konnte nicht ausgeworfen werden: %s!" -#: src/disc.c:474 +#: src/disc.c:475 msgid "Title" msgstr "Titel" -#: src/disc.c:671 +#: src/disc.c:688 #, c-format msgid "Could not create disc polling thread: %s!" msgstr "Konnte Plattenabfrage Thread nicht erzeugen: %s!" -#: src/disc.c:673 +#: src/disc.c:691 msgid "Successfully started disc polling thread." msgstr "Der Plattenabfrage Thread wurde erfolgreich gestartet." -#: src/disc.c:685 +#: src/disc.c:703 msgid "Successfully stopped disc polling thread." msgstr "Der Plattenabfrage Thread wurde erfolgreich beendet." @@ -105,7 +104,7 @@ msgid "Unknown prefix to URL '%s'!" msgstr "Prefix von URL '%s' nicht bekannt!" -#: src/download.c:227 src/environment.c:612 +#: src/download.c:227 src/environment.c:622 #, c-format msgid "Could not create '%s': %s!" msgstr "Konnte '%s' nicht erzeugen: %s!" @@ -143,61 +142,61 @@ msgid "Part Menu" msgstr "Kapitelmenü" -#: src/environment.c:135 src/environment.c:268 src/environment.c:586 -#: src/environment.c:593 src/environment.c:825 +#: src/environment.c:141 src/environment.c:289 src/environment.c:596 +#: src/environment.c:603 src/environment.c:835 #, c-format msgid "Unable to get status for file '%s': %s." msgstr "Konnte Status für Datei '%s' nicht ermitteln: %s." -#: src/environment.c:144 src/environment.c:278 +#: src/environment.c:153 #, c-format msgid "Unable to read link '%s' file: %s." msgstr "Konnte Link '%s' nicht lesen: %s." -#: src/environment.c:218 +#: src/environment.c:230 msgid "Found a device we are interested in:" msgstr "Es wurde ein Gerät gefunden, das uns interessiert:" -#: src/environment.c:219 +#: src/environment.c:231 #, c-format msgid " device: %s" msgstr " Gerät: %s" -#: src/environment.c:220 +#: src/environment.c:232 #, c-format msgid " mountpoint: %s" msgstr " Einhängepunkt: %s" -#: src/environment.c:221 +#: src/environment.c:233 #, c-format msgid " filesystem: %s" msgstr " Dateisystemtyp: %s" -#: src/environment.c:413 +#: src/environment.c:423 msgid "Unable to find usable home directory, using '/tmp'." msgstr "" "Es konnte kein nutzbares Heimatverzeichnis bestimmt werden. '/tmp' wird " "stattdessen verwendet." -#: src/environment.c:831 +#: src/environment.c:841 #, c-format msgid "File '%s' is empty!" msgstr "Datei '%s' ist leer!" -#: src/environment.c:848 +#: src/environment.c:858 #, c-format msgid "Could not read '%s': %s!" msgstr "Konnte '%s' nicht lesen: %s!" -#: src/environment.c:930 src/environment.c:931 +#: src/environment.c:940 src/environment.c:941 msgid "devices to poll (separate using ';')" msgstr "automatisch abgefragte Gerätedateien (mit ';' trennen)" -#: src/event.c:635 src/gui_utils.c:465 +#: src/event.c:681 src/gui_utils.c:492 msgid "Could not play title!" msgstr "Der Titel konnte nicht wiedergegeben werden!" -#: src/event.c:639 +#: src/event.c:685 msgid "Waiting for alternative stream..." msgstr "Warte auf alternativen Datenstrom..." @@ -218,7 +217,7 @@ msgid "[M3U-Playlist: %s]" msgstr "[M3U-Wiedergabeliste: %s]" -#: src/filelist.c:732 src/main_menu.c:276 +#: src/filelist.c:732 src/main_menu.c:303 src/main_menu.c:319 msgid "DVD" msgstr "DVD" @@ -238,119 +237,147 @@ msgid "My VDR Recordings" msgstr "Meine VDR Aufnahmen" -#: src/filelist_menu.c:135 +#: src/filelist_menu.c:127 msgid "Reset" msgstr "Zurücksetzen" -#: src/filelist_menu.c:137 src/filelist_menu.c:818 src/playlist_menu.c:1028 +#: src/filelist_menu.c:132 src/filelist_menu.c:139 src/filelist_menu.c:146 +#: src/filelist_menu.c:151 src/filelist_menu.c:834 src/playlist_menu.c:1041 msgid "Remove" msgstr "Entfernen" -#: src/filelist_menu.c:145 src/main_menu.c:465 -msgid "Eject" -msgstr "Auswerfen" - -#: src/filelist_menu.c:237 +#: src/filelist_menu.c:250 msgid "Play all titles in this folder and all subfolders..." msgstr "Alle Titel in allen Unterordnern wiedergeben..." -#: src/filelist_menu.c:243 +#: src/filelist_menu.c:256 msgid "Play all titles in this folder..." msgstr "Alle Titel in diesem Ordner wiedergeben..." -#: src/filelist_menu.c:367 src/filelist_menu.c:575 src/playlist_menu.c:245 -#: src/playlist_menu.c:410 +#: src/filelist_menu.c:385 src/filelist_menu.c:591 src/playlist_menu.c:255 +#: src/playlist_menu.c:420 msgid "Choose an entry..." msgstr "Einen Eintrag wählen..." -#: src/filelist_menu.c:398 src/filelist_menu.c:408 src/filelist_menu.c:710 +#: src/filelist_menu.c:416 src/filelist_menu.c:426 src/filelist_menu.c:726 #, c-format msgid "Could not remove '%s': %s!" msgstr "Konnte '%s' nicht löschen: %s!" -#: src/filelist_menu.c:409 +#: src/filelist_menu.c:427 msgid "SVDRP error" msgstr "SVDRP Fehler" -#: src/filelist_menu.c:446 src/playlist_menu.c:295 +#: src/filelist_menu.c:462 src/playlist_menu.c:305 msgid "Could not open disc!" msgstr "Das Laufwerk konnte nicht geöffnet werden!" -#: src/filelist_menu.c:810 src/playlist_menu.c:1010 +#: src/filelist_menu.c:826 src/playlist_menu.c:1023 msgid "Play" msgstr "Wiedergeben" -#: src/filelist_menu.c:814 src/playlist_menu.c:540 src/playlist_menu.c:1023 +#: src/filelist_menu.c:830 src/playlist_menu.c:550 src/playlist_menu.c:1036 msgid "Add" msgstr "Hinzufügen" -#: src/filelist_menu.c:822 src/playback_menu.c:1053 src/settings_menu.c:511 +#: src/filelist_menu.c:838 src/main_menu.c:524 +msgid "Eject" +msgstr "Auswerfen" + +#: src/filelist_menu.c:842 src/playback_menu.c:1076 src/settings_menu.c:509 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:77 msgid "Playlist" msgstr "Wiedergabeliste" -#: src/filelist_menu.c:826 src/playback_menu.c:1047 src/playlist_menu.c:1053 -#: src/settings_menu.c:539 src/weather_menu.c:164 +#: src/filelist_menu.c:846 src/playback_menu.c:1070 src/playlist_menu.c:1066 +#: src/settings_menu.c:537 src/weather_menu.c:164 msgid "Mainmenu" msgstr "Hauptmenü" -#: src/filelist_menu.c:830 src/main_menu.c:481 src/playlist_menu.c:1057 +#: src/filelist_menu.c:850 src/main_menu.c:540 src/playlist_menu.c:1070 msgid "Current title" msgstr "Aktueller Titel" -#: src/filelist_menu.c:945 +#: src/filelist_menu.c:965 msgid "Could not load mediamarks." msgstr "Konnte Mediamarks nicht laden." -#: src/filelist_menu.c:946 +#: src/filelist_menu.c:966 #, c-format msgid "You should create a file containing mediamarks at %s!" msgstr "Sie sollten eine Datei mit Mediamarks an %s erstellen!" -#: src/filelist_menu.c:980 src/filelist_menu.c:1013 src/filelist_menu.c:1044 +#: src/filelist_menu.c:1000 src/filelist_menu.c:1033 src/filelist_menu.c:1064 #: src/gui_utils.h:65 msgid "Please wait..." msgstr "Bitte warten Sie..." -#: src/gui_utils.c:193 +#: src/gui_utils.c:195 msgid "Could not open or play background, leaving oxine!" msgstr "Konnte Hintergrund nicht öffnen oder wiedergeben." -#: src/gui_utils.c:194 +#: src/gui_utils.c:196 msgid "Please make sure, that your version of xine-lib can play PNG files." msgstr "" "Bitte stellen Sie sicher, dass Ihre Version von xine-lib in der Lage ist PNG " "Dateien wiederzugeben." -#: src/gui_utils.c:391 src/gui_utils.c:398 src/main_menu.c:381 -#: src/playlist_menu.c:950 +#: src/gui_utils.c:393 src/gui_utils.c:400 src/main_menu.c:419 +#: src/playlist_menu.c:963 msgid "OK" msgstr "OK" -#: src/gui_utils.c:403 src/gui_utils.c:425 src/main_menu.c:385 -#: src/main_menu.c:469 src/playlist_menu.c:953 +#: src/gui_utils.c:405 src/gui_utils.c:427 src/main_menu.c:423 +#: src/main_menu.c:528 src/playlist_menu.c:966 msgid "Cancel" msgstr "Abbrechen" -#: src/gui_utils.c:409 +#: src/gui_utils.c:411 msgid "Yes" msgstr "Ja" -#: src/gui_utils.c:414 +#: src/gui_utils.c:416 msgid "No" msgstr "Nein" -#: src/gui_utils.c:420 +#: src/gui_utils.c:422 msgid "Retry" msgstr "Wiederholen" -#: src/help_menu.c:43 src/playback_menu.c:473 src/playback_menu.c:527 -#: src/settings_menu.c:462 +#: src/gui_utils.c:478 +#, fuzzy +msgid "Could not play Audio CD!" +msgstr "Der Titel konnte nicht wiedergegeben werden!" + +#: src/gui_utils.c:479 src/main_menu.c:213 +msgid "Please insert an Audio CD!" +msgstr "Bitte legen Sie eine Audio CD ein!" + +#: src/gui_utils.c:483 +#, fuzzy +msgid "Could not play Video CD!" +msgstr "Der Titel konnte nicht wiedergegeben werden!" + +#: src/gui_utils.c:484 src/main_menu.c:263 +msgid "Please insert a Video CD!" +msgstr "Bitte legen Sie eine Video CD ein!" + +#: src/gui_utils.c:488 +#, fuzzy +msgid "Could not play DVD!" +msgstr "Der Titel konnte nicht wiedergegeben werden!" + +#: src/gui_utils.c:489 src/main_menu.c:313 +msgid "Please insert a DVD!" +msgstr "Bitte legen Sie eine DVD ein!" + +#: src/help_menu.c:43 src/playback_menu.c:490 src/playback_menu.c:549 +#: src/settings_menu.c:460 msgid "Next Page" msgstr "Nächste Seite" -#: src/help_menu.c:49 src/playback_menu.c:477 src/playback_menu.c:531 -#: src/playback_menu.c:535 src/playlist_menu.c:543 src/settings_menu.c:467 +#: src/help_menu.c:49 src/playback_menu.c:494 src/playback_menu.c:553 +#: src/playback_menu.c:557 src/playlist_menu.c:553 src/settings_menu.c:465 msgid "Back" msgstr "Zurück" @@ -1218,101 +1245,90 @@ msgid "Zulu" msgstr "Zulu" -#: src/lang.c:506 -msgid "Unknown" -msgstr "Unbekannt" - #: src/main_menu.c:71 msgid "Could not find DVB channels file!" msgstr "Konnte DVB Kanaldatei nicht finden!" -#: src/main_menu.c:207 -msgid "Please insert an Audio CD!" -msgstr "Bitte legen Sie eine Audio CD ein!" - -#: src/main_menu.c:245 -msgid "Please insert a Video CD!" -msgstr "Bitte legen Sie eine Video CD ein!" - -#: src/main_menu.c:283 -msgid "Please insert a DVD!" -msgstr "Bitte legen Sie eine DVD ein!" - -#: src/main_menu.c:328 +#: src/main_menu.c:366 msgid "How do you want to proceed?" msgstr "Wie möchten Sie vorgehen?" -#: src/main_menu.c:342 +#: src/main_menu.c:380 msgid "Quit oxine" msgstr "oxine beenden" -#: src/main_menu.c:351 +#: src/main_menu.c:389 msgid "Shutdown the computer" msgstr "Computer herunterfahren" -#: src/main_menu.c:360 +#: src/main_menu.c:398 msgid "Switch computer to standby" msgstr "Computer in Standby-Modus schalten" -#: src/main_menu.c:369 +#: src/main_menu.c:407 msgid "Reboot the computer" msgstr "Computer neu starten" -#: src/main_menu.c:427 +#: src/main_menu.c:472 +#, fuzzy +msgid "Could not unmount device!" +msgstr "Das Laufwerk '%s' konnte nicht ausgehängt werden!" + +#: src/main_menu.c:476 msgid "Could not eject device!" msgstr "Das Gerät konnte nicht ausgeworfen werden!" -#: src/main_menu.c:449 +#: src/main_menu.c:508 msgid "Select device to eject:" msgstr "Das auszuwerfende Gerät auswählen:" -#: src/main_menu.c:593 +#: src/main_menu.c:652 msgid "Listen to Music" msgstr "Musik hören" -#: src/main_menu.c:594 +#: src/main_menu.c:653 msgid "Watch Films" msgstr "Filme ansehen" -#: src/main_menu.c:595 +#: src/main_menu.c:654 msgid "Watch Television" msgstr "Fernsehen sehen" -#: src/main_menu.c:596 +#: src/main_menu.c:655 msgid "Play a DVD" msgstr "DVD abspielen" -#: src/main_menu.c:597 +#: src/main_menu.c:656 msgid "Play a Video CD" msgstr "Video CD abspielen" -#: src/main_menu.c:598 +#: src/main_menu.c:657 msgid "Play an Audio CD" msgstr "Audio CD abspielen" -#: src/main_menu.c:599 +#: src/main_menu.c:658 msgid "Show Help" msgstr "Hilfe anzeigen" -#: src/main_menu.c:600 +#: src/main_menu.c:659 msgid "Show Weather Report" msgstr "Wetterbericht anzeigen" -#: src/main_menu.c:601 +#: src/main_menu.c:660 msgid "Edit Settings" msgstr "Einstellungen bearbeiten" -#: src/main_menu.c:602 src/settings_menu.c:512 +#: src/main_menu.c:661 src/settings_menu.c:510 msgid "Shutdown" msgstr "Ausschalten" -#: src/main_menu.c:624 +#: src/main_menu.c:683 msgid "Could not load main menu!" msgstr "Konnte Hauptmenü nicht laden." #: src/mediamarks.c:103 src/mediamarks.c:139 src/menulist.c:140 -#: src/menulist.c:186 src/otk.c:3560 src/otk.c:3565 src/otk.c:3622 -#: src/otk.c:3627 src/playlist_xml.c:141 src/playlist_xml.c:176 +#: src/menulist.c:186 src/otk.c:3597 src/otk.c:3602 src/otk.c:3659 +#: src/otk.c:3664 src/playlist_xml.c:141 src/playlist_xml.c:176 #, c-format msgid "Unknown name '%s' for node!" msgstr "Unbekannter Name '%s' für Knoten!" @@ -1321,13 +1337,13 @@ msgid "Found an entry that did not contain a MRL!" msgstr "Eintrag ohne MRL gefunden!" -#: src/mediamarks.c:159 src/menulist.c:207 src/otk.c:3591 +#: src/mediamarks.c:159 src/menulist.c:207 src/otk.c:3628 #: src/playlist_xml.c:196 #, c-format msgid "Parsing '%s' failed!" msgstr "Parsen der Datei '%s' ist fehlgeschlagen!" -#: src/mediamarks.c:165 src/menulist.c:212 src/otk.c:3596 +#: src/mediamarks.c:165 src/menulist.c:212 src/otk.c:3633 #: src/playlist_xml.c:201 #, c-format msgid "Root node of '%s' must be '%s'!" @@ -1375,23 +1391,23 @@ msgid "Aspect Ratio" msgstr "Seitenverhältnis" -#: src/odk.c:519 src/odk.c:1414 +#: src/odk.c:519 src/odk.c:1458 msgid "Hue" msgstr "Farbwert" -#: src/odk.c:522 src/odk.c:1416 +#: src/odk.c:522 src/odk.c:1460 msgid "Saturation" msgstr "Sättigung" -#: src/odk.c:525 src/odk.c:1412 +#: src/odk.c:525 src/odk.c:1455 msgid "Contrast" msgstr "Kontrast" -#: src/odk.c:528 src/odk.c:1410 +#: src/odk.c:528 src/odk.c:1452 msgid "Brightness" msgstr "Helligkeit" -#: src/odk.c:532 +#: src/odk.c:532 src/odk.c:1463 msgid "Zoom" msgstr "Zoom" @@ -1432,8 +1448,8 @@ msgid "none" msgstr "keiner" -#: src/odk.c:592 src/odk.c:608 src/odk.c:629 src/settings_menu.c:600 -#: src/settings_menu.c:634 src/settings_menu.c:643 +#: src/odk.c:592 src/odk.c:608 src/odk.c:629 src/settings_menu.c:598 +#: src/settings_menu.c:632 src/settings_menu.c:641 msgid "auto" msgstr "automatisch" @@ -1486,28 +1502,20 @@ msgid "Malformed MRL" msgstr "Falsch formatierte MRL" -#: src/odk.c:1110 +#: src/odk.c:1112 #, c-format msgid "Could not play '%s': %s!" msgstr "Konnte '%s' nicht wiedergeben: %s!" -#: src/odk.c:1375 src/odk.c:1376 +#: src/odk.c:1422 src/odk.c:1423 msgid "encode special characters in MRLs" msgstr "Sonderzeichen in MRLs kodieren" -#: src/odk.c:1380 -msgid "use unscaled OSD if possible" -msgstr "Benutze unskaliertes OSD falls möglich" - -#: src/odk.c:1381 -msgid "Use unscaled (full screen resolution) OSD if possible" -msgstr "Benutze unvergößertes (Vollbildauflösung) OSD falls möglich" - -#: src/odk.c:1386 +#: src/odk.c:1428 msgid "audio visualization type" msgstr "Art der Audiovisualisierung" -#: src/odk.c:1387 +#: src/odk.c:1429 msgid "" "What kind of visual output is to be displayed when playing an audio only " "stream." @@ -1515,11 +1523,11 @@ "Welche Art von visueller Darstellung soll bei nur-audio Strömen ausgegeben " "werden." -#: src/odk.c:1394 +#: src/odk.c:1436 msgid "background image MRL" msgstr "MRL des Hintergrundbildes" -#: src/odk.c:1395 +#: src/odk.c:1437 msgid "" "The MRL of the background image that will be displayed if 'visual_anim." "style' is set to 'Background Image'" @@ -1527,11 +1535,11 @@ "Die MRL des Hintergrundbildes, das angezeigt wird, falls 'visual_anim.style' " "auf 'Background Image' gesetzt ist." -#: src/odk.c:1403 +#: src/odk.c:1445 msgid "stream animation MRL" msgstr "MRL der Animation" -#: src/odk.c:1404 +#: src/odk.c:1446 msgid "" "The MRL of the stream animation that will be displayed if 'visual_anim." "style' is set to 'Stream Animation'" @@ -1539,21 +1547,21 @@ "Die MRL der Videoanimation, die angezeigt wird, falls 'visual_anim.style' " "auf 'Stream Animation' gesetzt ist." -#: src/odk.c:1459 +#: src/odk.c:1506 #, c-format msgid "Failed to create window using video driver '%s'!" msgstr "Konnte kein Videofenster mit Treiber '%s' erzeugen!" -#: src/odk.c:1464 +#: src/odk.c:1511 msgid "Failed to create window using default driver." msgstr "Konnte kein Videofenster mit Standardtreiber erzeugen." -#: src/odk.c:1474 +#: src/odk.c:1521 #, c-format msgid "Failed to open audio port using audio driver '%s'!" msgstr "Konnte Audioport mit Audiotreiber '%s' nicht öffnen!" -#: src/odk.c:1479 +#: src/odk.c:1526 msgid "Failed to open audio port using default audio driver." msgstr "Konnte Audioport mit Standardtreiber nicht öffnen." @@ -1647,30 +1655,30 @@ msgid "Successfully stopped the LIRC input plugin." msgstr "Das LIRC Eingabeplugin wurde erfolgreich beendet." -#: src/odk_osd.c:427 +#: src/odk_osd.c:452 #, c-format msgid "Could not read image '%s'!" msgstr "Konnte Bild '%s' nicht lesen!" -#: src/odk_osd.c:482 +#: src/odk_osd.c:507 #, c-format msgid "Could not scale image '%s'!" msgstr "Konnte Bild '%s' nicht skalieren!" -#: src/odk_osd.c:525 +#: src/odk_osd.c:550 msgid "Could not get pixel data!" msgstr "Konnte Pixeldaten nicht ermitteln!" -#: src/odk_osd.c:745 +#: src/odk_osd.c:770 #, c-format msgid "Could not free a cache entry for '%s'." msgstr "Konnte keine Cacheeintrag für '%s' befreien!" -#: src/odk_osd.c:1671 +#: src/odk_osd.c:1721 msgid "The current video driver supports unscaled OSD!" msgstr "Der aktuelle Videotreiber unterstützt unvergrößertes OSD!" -#: src/odk_osd.c:1673 +#: src/odk_osd.c:1723 msgid "The current video driver does not support unscaled OSD!" msgstr "Der aktuelle Videotreiber unterstützt unvergrößertes OSD nicht!" @@ -1704,7 +1712,7 @@ msgid "Found %d Xinerama screens:" msgstr "Es wurden %d Xinerama-Schirme gefunden:" -#: src/odk_x11.c:1014 +#: src/odk_x11.c:1002 #, c-format msgid "" "Overriding calculated monitor pixel aspect ratio with user provided value: " @@ -1713,71 +1721,71 @@ "Überschreibe berechnetes Seitenverhältnis eines Monitorpixels mit " "benutzerdefiniertem Wert: %.02f" -#: src/odk_x11.c:1030 +#: src/odk_x11.c:1018 #, c-format msgid "Failed to open video port '%s', falling back to 'auto'." msgstr "Konnte Videoport '%s' nicht öffnen, falle zurück auf 'auto'." -#: src/odk_x11.c:1037 +#: src/odk_x11.c:1025 msgid "Failed to open video port!" msgstr "Konnte Videoport nicht öffnen!" -#: src/otk.c:3527 src/otk.c:3534 +#: src/otk.c:3564 src/otk.c:3571 #, c-format msgid "Missing property (required) '%s'!" msgstr "Notwendige Eigenschaft '%s' fehlt!" -#: src/otk.c:3578 +#: src/otk.c:3615 #, c-format msgid "Loading palette file '%s'..." msgstr "Lade Farbpalette aus Datei '%s'..." -#: src/otk.c:3654 +#: src/otk.c:3691 msgid "Could not load palette, reverting to standard colors." msgstr "Konnte Palette nicht lade, falle auf Standardfarben zurück." -#: src/oxine.c:107 +#: src/oxine.c:113 #, c-format msgid "Usage: oxine [OPTIONS] [MRL]\n" msgstr "Benutzung: oxine [OPTIONEN] [MRL]\n" -#: src/oxine.c:109 +#: src/oxine.c:115 #, c-format msgid "OPTIONS are:\n" msgstr "OPTIONEN sind:\n" -#: src/oxine.c:110 +#: src/oxine.c:116 #, c-format msgid " -v, --version Display version.\n" msgstr " -v, --version Version anzeigen.\n" -#: src/oxine.c:111 +#: src/oxine.c:117 #, c-format msgid " --verbose [=level] Set verbosity level. Default is 1.\n" msgstr "" " --verbose [=Stufe] Geschwätzigkeit setzen. Standardstufe: 1.\n" -#: src/oxine.c:113 +#: src/oxine.c:119 #, c-format msgid " -l, --logfile Set the log filename.\n" msgstr " -l, --logfile Dateinamen der Protokolldatei setzen.\n" -#: src/oxine.c:114 +#: src/oxine.c:120 #, c-format msgid " -V, --video-driver Select video driver by ID.\n" msgstr " -V, --video-driver Video-Treiber nach ID auswählen.\n" -#: src/oxine.c:115 src/oxine.c:129 +#: src/oxine.c:121 src/oxine.c:135 #, c-format msgid " Available drivers:\n" msgstr " Verfügbare Treiber:\n" -#: src/oxine.c:128 +#: src/oxine.c:134 #, c-format msgid " -A, --audio-driver Select audio driver by ID.\n" msgstr " -A, --audio-driver Audio-Treibers nach ID auswählen.\n" -#: src/oxine.c:140 +#: src/oxine.c:146 #, c-format msgid "" " -X, --xineramascreen [=num] Sets the screen on which the fullscreen " @@ -1787,12 +1795,12 @@ " -X, --xineramascreen [=num] Setzt den Xinerama Schirm, auf dem das\n" " Vollbildfenster angezeigt wird.\n" -#: src/oxine.c:144 +#: src/oxine.c:150 #, c-format msgid " -F, --no-fullscreen Do no start in fullscreen mode.\n" msgstr " -f, --fullscreen Nicht im Vollbildmodus starten.\n" -#: src/oxine.c:147 +#: src/oxine.c:153 #, c-format msgid "" " -P, --no-polling Do not use automatic polling for removable " @@ -1801,17 +1809,26 @@ " -P, --no-polling Automatisches Abfragens von Wechseldaten-\n" " trägern nicht benutzen.\n" -#: src/oxine.c:151 +#: src/oxine.c:157 #, c-format msgid " -L, --no-lirc Do not use remote control (LIRC).\n" msgstr " -L, --no-lirc Fernbedienung (LIRC) nicht benutzen.\n" -#: src/oxine.c:155 +#: src/oxine.c:161 #, c-format msgid " -J, --no-joystick Do not use joystick support.\n" msgstr " -J, --no-joystick Joystick nicht benutzen.\n" -#: src/oxine.c:159 +#: src/oxine.c:165 +#, fuzzy, c-format +msgid "" +" -W, --no-weather Do not automaticaly retrieve weather " +"information.\n" +msgstr "" +" -P, --no-polling Automatisches Abfragens von Wechseldaten-\n" +" trägern nicht benutzen.\n" + +#: src/oxine.c:169 #, c-format msgid "" "Examples for valid MRLs (media resource locator):\n" @@ -1837,71 +1854,67 @@ " 'dvd://'\n" " VCD: 'vcd://'\n" -#: src/oxine.c:180 src/oxine.c:181 +#: src/oxine.c:190 src/oxine.c:191 msgid "video driver to use" msgstr "Zu benutzender Videotreiber" -#: src/oxine.c:184 src/oxine.c:185 +#: src/oxine.c:194 src/oxine.c:195 msgid "audio driver to use" msgstr "Zu benutzender Audiotreiber" -#: src/oxine.c:190 src/oxine.c:191 +#: src/oxine.c:199 src/oxine.c:200 msgid "Xinerama screen for fullscreen window" msgstr "Xinerama Schirm für Vollbildfenster" -#: src/oxine.c:196 src/oxine.c:197 -msgid "percentage of fullscreen screen to use" -msgstr "Prozent des Vollbildfensters benutzen" - -#: src/oxine.c:201 +#: src/oxine.c:204 msgid "non-fullscreen window width" msgstr "Breite des Ausgabefensters" -#: src/oxine.c:202 +#: src/oxine.c:205 msgid "The width of the non-fullscreen window" msgstr "Breite des Ausgabefensters" -#: src/oxine.c:206 +#: src/oxine.c:209 msgid "non-fullscreen window height" msgstr "Höhe des Ausgabefensters" -#: src/oxine.c:207 +#: src/oxine.c:210 msgid "The height of the non-fullscreen window" msgstr "Höhe des Ausgabefensters" -#: src/oxine.c:211 src/oxine.c:212 +#: src/oxine.c:214 src/oxine.c:215 msgid "aspect ratio of one monitor pixel" msgstr "Seitenverhältnis eines Monitorpixels" -#: src/oxine.c:217 +#: src/oxine.c:220 msgid "ask before leaving oxine" msgstr "Nachfragen bevor oxine beendet wird" -#: src/oxine.c:218 +#: src/oxine.c:221 msgid "Are we to show the quit confirm dialog?" msgstr "Soll der Beenden Dialog angezeigt werden?" -#: src/oxine.c:222 src/oxine.c:223 +#: src/oxine.c:225 src/oxine.c:226 msgid "command that was selected the last time" msgstr "Kommando, das beim letzten Mal ausgewählt wurde" -#: src/oxine.c:228 src/oxine.c:229 +#: src/oxine.c:231 src/oxine.c:232 msgid "shell command (power off)" msgstr "Shellkommando (Herunterfahren)" -#: src/oxine.c:234 src/oxine.c:235 +#: src/oxine.c:237 src/oxine.c:238 msgid "shell command (reboot)" msgstr "Shellkommando (Neustart)" -#: src/oxine.c:239 src/oxine.c:240 +#: src/oxine.c:242 src/oxine.c:243 msgid "shell command (standby)" msgstr "Shellkommando (Standby)" -#: src/oxine.c:245 +#: src/oxine.c:248 msgid "METAR ICAO location indicator" msgstr "METAR ICAO Ortsindikator" -#: src/oxine.c:246 +#: src/oxine.c:249 msgid "" "The METAR ICAO Location Indicator defines for which location the weather is " "to be displayed." @@ -1909,11 +1922,11 @@ "Der METAR ICAO Ortsindikator definiert für welchen Ort das Wetter angezeigt " "werden soll." -#: src/oxine.c:252 +#: src/oxine.c:255 msgid "reload playlist on start" msgstr "Wiedergabeliste beim Start laden" -#: src/oxine.c:253 +#: src/oxine.c:256 msgid "" "If this is enabled and if you don't specify any MRL on the command line, " "oxine will automatically load the previous playlist." @@ -1921,11 +1934,11 @@ "Ist diese Option aktiviert und wurde keine MRL über die Kommandozeile " "angegeben, lädt oxine beim Start automatisch die vorherige Playliste." -#: src/oxine.c:259 +#: src/oxine.c:262 msgid "play reloaded playlist on start" msgstr "Wiedergabeliste beim Start abspielen" -#: src/oxine.c:260 +#: src/oxine.c:263 msgid "" "If this is enabled and gui.playlist_auto_reload is also enabled the reloaded " "playlist will automatically be played." @@ -1933,119 +1946,119 @@ "Sind diese Option und die Option gui.playlist_auto_reload aktiviert, spielt " "oxine beim Start automatisch die vorherige Playliste ab." -#: src/oxine.c:267 +#: src/oxine.c:270 msgid "subtitle autoloading" msgstr "Untertitel automatisch laden" -#: src/oxine.c:268 +#: src/oxine.c:271 msgid "Automatically load subtitles if they exist." msgstr "Automatische Untertitel laden falls vorhanden." -#: src/oxine.c:395 +#: src/oxine.c:406 #, c-format msgid "This is %s - A free Video-Player v%s\n" msgstr "Dies ist %s - Ein freier Video-Player v%s\n" -#: src/oxine.c:397 +#: src/oxine.c:408 #, c-format msgid "(c) 2005 by the oxine project\n" msgstr "(c) 2005, das oxine Projekt\n" -#: src/oxine.c:406 +#: src/oxine.c:417 #, c-format msgid "Invalid argument %d!" msgstr "Ungültiges Argument %d!" -#: src/oxine.c:491 +#: src/oxine.c:502 msgid "Could not initialize ODK!" msgstr "Konnte ODK nicht initialisieren!" -#: src/oxine.c:502 +#: src/oxine.c:513 msgid "Could not inizialize OTK!" msgstr "Konnte OTK nicht initialisieren!" -#: src/playback_menu.c:747 src/playback_menu.c:1172 +#: src/playback_menu.c:769 src/playback_menu.c:1195 msgid "Album:" msgstr "Album:" -#: src/playback_menu.c:753 src/playback_menu.c:1178 +#: src/playback_menu.c:775 src/playback_menu.c:1201 msgid "Artist:" msgstr "Künstler:" -#: src/playback_menu.c:759 src/playback_menu.c:1184 +#: src/playback_menu.c:781 src/playback_menu.c:1207 msgid "Year:" msgstr "Jahr:" -#: src/playback_menu.c:765 src/playback_menu.c:1190 +#: src/playback_menu.c:787 src/playback_menu.c:1213 msgid "Track:" msgstr "Titel:" -#: src/playback_menu.c:772 src/playback_menu.c:1197 +#: src/playback_menu.c:794 src/playback_menu.c:1220 msgid "Genre:" msgstr "Genre:" -#: src/playback_menu.c:779 +#: src/playback_menu.c:801 msgid "Length:" msgstr "Länge:" -#: src/playback_menu.c:788 +#: src/playback_menu.c:810 msgid "Elapsed:" msgstr "Vergangen:" -#: src/playback_menu.c:1014 +#: src/playback_menu.c:1037 msgid "Loop Mode" msgstr "Endlosschleife" -#: src/playback_menu.c:1019 +#: src/playback_menu.c:1042 msgid "Shuffle Mode" msgstr "Zufallsmodus" -#: src/playback_menu.c:1024 +#: src/playback_menu.c:1047 msgid "Normal Mode" msgstr "Standardmodus" -#: src/playback_menu.c:1035 +#: src/playback_menu.c:1058 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:79 msgid "Settings" msgstr "Einstellungen" -#: src/playback_menu.c:1058 +#: src/playback_menu.c:1081 msgid "Media Browser" msgstr "Medienbrowser" -#: src/playlist_menu.c:637 +#: src/playlist_menu.c:650 msgid "Delete subtitle" msgstr "Untertitel löschen" -#: src/playlist_menu.c:639 src/playlist_menu.c:1043 +#: src/playlist_menu.c:652 src/playlist_menu.c:1056 msgid "Add subtitle" msgstr "Untertitel hinzufügen" -#: src/playlist_menu.c:661 +#: src/playlist_menu.c:674 msgid "Subtitle" msgstr "Untertitel" -#: src/playlist_menu.c:943 +#: src/playlist_menu.c:956 msgid "Please enter a name for the playlist:" msgstr "Bitte geben Sie einen Namen ein:" -#: src/playlist_menu.c:1014 +#: src/playlist_menu.c:1027 msgid "Clear list" msgstr "Liste löschen" -#: src/playlist_menu.c:1018 +#: src/playlist_menu.c:1031 msgid "Save list" msgstr "Liste speichern" -#: src/playlist_menu.c:1033 +#: src/playlist_menu.c:1046 msgid "Move up" msgstr "Nach Oben" -#: src/playlist_menu.c:1038 +#: src/playlist_menu.c:1051 msgid "Move down" msgstr "Nach Unten" -#: src/playlist_menu.c:1048 +#: src/playlist_menu.c:1061 msgid "Media-Browser" msgstr "Medienbrowser" @@ -2070,366 +2083,366 @@ "Es kann notwendig sein, oxine neu zu starten,\n" "damit die Änderungen wirksam werden!" -#: src/settings_menu.c:504 +#: src/settings_menu.c:502 msgid "User Interface" msgstr "Benutzeroberfläche" -#: src/settings_menu.c:506 +#: src/settings_menu.c:504 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:80 msgid "Weather" msgstr "Wetter" -#: src/settings_menu.c:509 +#: src/settings_menu.c:507 msgid "Video Disc Recorder" msgstr "Video Disc Recorder" -#: src/settings_menu.c:513 +#: src/settings_menu.c:511 msgid "Audio Visualization" msgstr "Audiovisualisierung" -#: src/settings_menu.c:514 +#: src/settings_menu.c:512 msgid "Audio" msgstr "Audio" -#: src/settings_menu.c:515 +#: src/settings_menu.c:513 msgid "Video" msgstr "Video" -#: src/settings_menu.c:516 +#: src/settings_menu.c:514 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:76 msgid "Media" msgstr "Medien" -#: src/settings_menu.c:517 +#: src/settings_menu.c:515 msgid "Decoder" msgstr "Dekodierer" -#: src/settings_menu.c:518 +#: src/settings_menu.c:516 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:78 msgid "Subtitles" msgstr "Untertitel" -#: src/settings_menu.c:519 +#: src/settings_menu.c:517 msgid "Effects" msgstr "Effekte" -#: src/settings_menu.c:520 +#: src/settings_menu.c:518 msgid "Engine" msgstr "Engine" -#: src/settings_menu.c:521 +#: src/settings_menu.c:519 msgid "Miscellaneous" msgstr "Verschiedenes" -#: src/settings_menu.c:578 +#: src/settings_menu.c:576 msgid "white-black-transparent" msgstr "weiß-schwarz-transparent" -#: src/settings_menu.c:579 +#: src/settings_menu.c:577 msgid "white-none-transparent" msgstr "weiß-keine-transparent" -#: src/settings_menu.c:580 +#: src/settings_menu.c:578 msgid "white-none-translucid" msgstr "weiß-keine-transparent" -#: src/settings_menu.c:581 +#: src/settings_menu.c:579 msgid "yellow-black-transparent" msgstr "gelb-schwarz-transparent" -#: src/settings_menu.c:583 +#: src/settings_menu.c:581 msgid "Mono 1.0" msgstr "Mono 1.0" -#: src/settings_menu.c:584 +#: src/settings_menu.c:582 msgid "Stereo 2.0" msgstr "Stereo 2.0" -#: src/settings_menu.c:585 +#: src/settings_menu.c:583 msgid "Headphones 2.0" msgstr "Kopfhörer 2.0" -#: src/settings_menu.c:586 +#: src/settings_menu.c:584 msgid "Stereo 2.1" msgstr "Stereo 2.1" -#: src/settings_menu.c:587 +#: src/settings_menu.c:585 msgid "Surround 3.0" msgstr "Surround 3.0" -#: src/settings_menu.c:588 +#: src/settings_menu.c:586 msgid "Surround 4.0" msgstr "Surround 4.0" -#: src/settings_menu.c:589 +#: src/settings_menu.c:587 msgid "Surround 4.1" msgstr "Surround 4.1" -#: src/settings_menu.c:590 +#: src/settings_menu.c:588 msgid "Surround 5.0" msgstr "Surround 5.0" -#: src/settings_menu.c:591 +#: src/settings_menu.c:589 msgid "Surround 5.1" msgstr "Surround 5.1" -#: src/settings_menu.c:592 +#: src/settings_menu.c:590 msgid "Surround 6.0" msgstr "Surround 6.0" -#: src/settings_menu.c:593 +#: src/settings_menu.c:591 msgid "Surround 6.1" msgstr "Surround 6.1" -#: src/settings_menu.c:594 +#: src/settings_menu.c:592 msgid "Surround 7.1" msgstr "Surround 7.1" -#: src/settings_menu.c:595 +#: src/settings_menu.c:593 msgid "Pass Through" msgstr "durchreichen" -#: src/settings_menu.c:597 +#: src/settings_menu.c:595 msgid "metronom feedback" msgstr "metronom feedback" -#: src/settings_menu.c:598 +#: src/settings_menu.c:596 msgid "resample" msgstr "resample" -#: src/settings_menu.c:601 +#: src/settings_menu.c:599 msgid "off" msgstr "aus" -#: src/settings_menu.c:602 +#: src/settings_menu.c:600 msgid "on" msgstr "an" -#: src/settings_menu.c:604 +#: src/settings_menu.c:602 msgid "2D_Tex_Fragprog" msgstr "2D_Tex_Fragprog" -#: src/settings_menu.c:605 +#: src/settings_menu.c:603 msgid "2D_Tex" msgstr "2D_Tex" -#: src/settings_menu.c:606 +#: src/settings_menu.c:604 msgid "2D_Tex_Tiled" msgstr "2D_Tex_Tiled" -#: src/settings_menu.c:607 +#: src/settings_menu.c:605 msgid "Image_Pipeline" msgstr "Image_Pipeline" -#: src/settings_menu.c:608 +#: src/settings_menu.c:606 msgid "Cylinder" msgstr "Zylinder" -#: src/settings_menu.c:609 +#: src/settings_menu.c:607 msgid "Env_Mapped_Torus" msgstr "Env_Mapped_Torus" -#: src/settings_menu.c:611 +#: src/settings_menu.c:609 msgid "entire dvd" msgstr "gesamte DVD" -#: src/settings_menu.c:612 +#: src/settings_menu.c:610 msgid "one chapter" msgstr "ein Kapitel" -#: src/settings_menu.c:614 +#: src/settings_menu.c:612 msgid "seek in program chain" msgstr "in Programmkette suchen" -#: src/settings_menu.c:615 +#: src/settings_menu.c:613 msgid "seek in program" msgstr "in Programm suchen" -#: src/settings_menu.c:617 +#: src/settings_menu.c:615 msgid "skip program" msgstr "Programm überspringen" -#: src/settings_menu.c:618 +#: src/settings_menu.c:616 msgid "skip part" msgstr "Teil überspringen" -#: src/settings_menu.c:619 +#: src/settings_menu.c:617 msgid "skip title" msgstr "Titel überspringen" -#: src/settings_menu.c:621 +#: src/settings_menu.c:619 msgid "14.4 Kbps (Modem)" msgstr "14.4 Kbps (Modem)" -#: src/settings_menu.c:622 +#: src/settings_menu.c:620 msgid "19.2 Kbps (Modem)" msgstr "19.2 Kbps (Modem)" -#: src/settings_menu.c:623 +#: src/settings_menu.c:621 msgid "28.8 Kbps (Modem)" msgstr "28.8 Kbps (Modem)" -#: src/settings_menu.c:624 +#: src/settings_menu.c:622 msgid "33.6 Kbps (Modem)" msgstr "33.6 Kbps (Modem)" -#: src/settings_menu.c:625 +#: src/settings_menu.c:623 msgid "34.4 Kbps (Modem)" msgstr "34.4 Kbps (Modem)" -#: src/settings_menu.c:626 +#: src/settings_menu.c:624 msgid "57.6 Kbps (Modem)" msgstr "57.6 Kbps (Modem)" -#: src/settings_menu.c:627 +#: src/settings_menu.c:625 msgid "115.2 Kbps (ISDN)" msgstr "115.2 Kbps (ISDN)" -#: src/settings_menu.c:628 +#: src/settings_menu.c:626 msgid "262.2 Kbps (Cable/DSL)" msgstr "262.2 Kbps (Cable/DSL)" -#: src/settings_menu.c:629 +#: src/settings_menu.c:627 msgid "393.2 Kbps (Cable/DSL)" msgstr "393.2 Kbps (Cable/DSL)" -#: src/settings_menu.c:630 +#: src/settings_menu.c:628 msgid "524.3 Kbps (Cable/DSL)" msgstr "524.3 Kbps (Cable/DSL)" -#: src/settings_menu.c:631 +#: src/settings_menu.c:629 msgid "1.5 Mbps (T1)" msgstr "1.5 Mbps (T1)" -#: src/settings_menu.c:632 +#: src/settings_menu.c:630 msgid "10.5 Mbps (LAN)" msgstr "10.5 Mbps (LAN)" -#: src/settings_menu.c:635 +#: src/settings_menu.c:633 msgid "TCP" msgstr "TCP" -#: src/settings_menu.c:636 +#: src/settings_menu.c:634 msgid "HTTP" msgstr "HTTP" -#: src/settings_menu.c:638 +#: src/settings_menu.c:636 msgid "MPEG track" msgstr "MPEG Titel" -#: src/settings_menu.c:639 src/settings_menu.c:645 +#: src/settings_menu.c:637 src/settings_menu.c:643 msgid "entry" msgstr "Eintrag" -#: src/settings_menu.c:640 +#: src/settings_menu.c:638 msgid "segment" msgstr "Segment" -#: src/settings_menu.c:641 +#: src/settings_menu.c:639 msgid "playback-control item" msgstr "Wiedergabekontroleinheit" -#: src/settings_menu.c:644 +#: src/settings_menu.c:642 msgid "track" msgstr "Titel" -#: src/settings_menu.c:647 +#: src/settings_menu.c:645 msgid "tiny" msgstr "winzig" -#: src/settings_menu.c:648 +#: src/settings_menu.c:646 msgid "small" msgstr "klein" -#: src/settings_menu.c:649 +#: src/settings_menu.c:647 msgid "normal" msgstr "normal" -#: src/settings_menu.c:650 +#: src/settings_menu.c:648 msgid "large" msgstr "groß" -#: src/settings_menu.c:651 +#: src/settings_menu.c:649 msgid "very large" msgstr "sehr groß" -#: src/settings_menu.c:652 +#: src/settings_menu.c:650 msgid "huge" msgstr "riesig" -#: src/settings_menu.c:654 +#: src/settings_menu.c:652 msgid "Fast but not photorealistic" msgstr "Schnell aber nicht photorealistisch" -#: src/settings_menu.c:655 +#: src/settings_menu.c:653 msgid "Slow but looks better" msgstr "Langsam aber besser" -#: src/settings_menu.c:657 +#: src/settings_menu.c:655 msgid "default" msgstr "Standard" -#: src/settings_menu.c:658 +#: src/settings_menu.c:656 msgid "reverse" msgstr "Rückwärts" -#: src/settings_menu.c:659 +#: src/settings_menu.c:657 msgid "content" msgstr "Inhalt" -#: src/settings_menu.c:660 +#: src/settings_menu.c:658 msgid "extension" msgstr "Erweiterung" -#: src/settings_menu.c:662 +#: src/settings_menu.c:660 msgid "probe" msgstr "probe" -#: src/settings_menu.c:663 +#: src/settings_menu.c:661 msgid "libc" msgstr "libc" -#: src/settings_menu.c:664 +#: src/settings_menu.c:662 msgid "kernel" msgstr "kernel" -#: src/settings_menu.c:665 +#: src/settings_menu.c:663 msgid "mmx" msgstr "mmx" -#: src/settings_menu.c:666 +#: src/settings_menu.c:664 msgid "mmxext" msgstr "mmxext" -#: src/settings_menu.c:667 +#: src/settings_menu.c:665 msgid "sse" msgstr "sse" -#: src/settings_menu.c:669 +#: src/settings_menu.c:667 msgid "Background Image" msgstr "Hintergrundbild" -#: src/settings_menu.c:670 +#: src/settings_menu.c:668 msgid "Background Animation" msgstr "Hintergrundanimation" -#: src/settings_menu.c:671 +#: src/settings_menu.c:669 msgid "Post Plugin" msgstr "Post Plugin" -#: src/settings_menu.c:673 +#: src/settings_menu.c:671 msgid "oscope" msgstr "oscope" -#: src/settings_menu.c:674 +#: src/settings_menu.c:672 msgid "fftscope" msgstr "fftscope" -#: src/settings_menu.c:675 +#: src/settings_menu.c:673 msgid "fftgraph" msgstr "fftgraph" -#: src/settings_menu.c:676 +#: src/settings_menu.c:674 msgid "goom" msgstr "goom" @@ -2814,6 +2827,21 @@ msgid "Music" msgstr "Musik" +#~ msgid "Could not mount %s!" +#~ msgstr "Das Laufwerk '%s' konnte nicht eingehängt werden!" + +#~ msgid "Could not eject %s!" +#~ msgstr "Das Laufwerk '%s' konnte nicht ausgeworfen werden!" + +#~ msgid "use unscaled OSD if possible" +#~ msgstr "Benutze unskaliertes OSD falls möglich" + +#~ msgid "Use unscaled (full screen resolution) OSD if possible" +#~ msgstr "Benutze unvergößertes (Vollbildauflösung) OSD falls möglich" + +#~ msgid "percentage of fullscreen screen to use" +#~ msgstr "Prozent des Vollbildfensters benutzen" + #~ msgid "Corse" #~ msgstr "Korsisch" diff -Naur oxine-0.6.orig/po/es.gmo oxine-0.6.3/po/es.gmo --- oxine-0.6.orig/po/es.gmo 2006-11-03 18:35:36.000000000 +0100 +++ oxine-0.6.3/po/es.gmo 2006-11-22 10:56:28.000000000 +0100 @@ -1,43 +1,46 @@ -< \ 2 B : <2!Ao!Q!:"0>"o"""" """" """" "" -# ### %#2#;#A# J# -X#c#w#+## ##### -#### $ $!$ 2$@$H$ -O$ Z$ h$r$z$$$$$$$ $ -$$$$$!$%%&C%j%%%%%%%&,&D&]&s&&&&&&&&& & & ''' '%'+' 0'>'F'L'U'\'d' u'''K'((( ) -) -)()/) -C)N)T)\)`) q) ))))))))))))))))))) * * * * (* 4*>*}B*** -* ****+ +++#+*+0+ 7+C+K+P+V+]+e+i+o+w+++ -+ ++ + -++++ ++,, ,, ,,, 1, ;,E, K,X,a,i, r,,, ,, ,, -, -, , ,,,- ---- (- 2->-M-T-Y-a-j---- ----- ----.. &.0.6.>.E. J.T. Z. -d.o.... .. .... ./ -// / */4/ ;/ E/ -Q/\/b/ g/ s/// -/ -///// // / //0 000 0)0/050;0 B0N0%S0 y0000 -000000000 00 0 0 1+!1M1f1k1511111 1 -1 -1 122 2"2*20252 -D2O2U2[2a2e2m2t2{222222 2 -22 33(3A3J3R3[3d3x3}33333333333 34!494R4e4y444444445"546O6N*7<y787\7RL8988 8 99 #90949<9 A9K9P9Y9a9w9 999999999 99:<:S: Z:g:n:v:~: :::::::::::;;;%;,;5;>;G;P;V;^; n; z; ;;;);0;- <:<W<q<%<'<<<=9=!X=#z===!==>> >> >%>4>K>^>g>m> >>>>>>>>> >>>>}@@@@@ @@@A -A -"A-A4A DA RA`AiAqAwA}A AAAAAAAAAAAAA AAAAB "B,B0BBB B B BCCC C(C/C8C?CEC LCXC`CeCkCsCyC}CC -CCCC CC C CCCD DD!D(D -0D;DADGDOD WDaD iD vDD -DDDDDD DDDD -EEE(E:E=EPEVE\E nEzEEE -E EEE%EF,F -3F>FEFMF TF^FoFF!FF FFFFFFFF FG%G:GAGPGbGhGnGGGGG -GG GGGG GHHH H &H0H8Hr?u_~*<ZJi9v>L4k -xFpg2hOb}|\g)Yn]Q$e n6wxG]'_Hs1 -P !J/W5aI%5bX-  ^odp#[{2B 8ljd[j:&U7i9R"Sf Available drivers: +$ ,P 2Q B : <!A?!Q!:!0"?"Q"p"w" """" """" "" +"""" "# ## # +(#3#G#+Z## ##### +#### # ## $$$ +$ *$ 8$B$J$Q$X$`$i$q$y$ $ +$$$$$!$%$&%:%S%m%%%%%%&&/&H&c&&&&&&& & & &&& &&& &&'''' ' 1';'D'KH'((( ( +( +((( +( +)))) -) ;)H)O)W)])c)j)s)z))))))))))) )) ) ) ) ))})|** +* *********** **+ +++!+%+++3+;+C+ +S+ ^+h+ z+ +++++ ++++ ++ ++ + +, ,,,%, .,;,B, I,S, V,b, +h, +s, ~, ,,,, ,,,, , ,, ----&-;-U-d- +k-v-}-- ------ ----. .. . + .+.<.T.\. e.q. w.... .. +.. . .. . / + /// #/ //;/B/ +H/ +S/^/f/n/w/ // / /////////// / +0%0 50B0J0S0 +Y0d0j0q0x00000 00 0 00+0 1"1'1E1K1Q1W1 `1 +j1 +u1 111 11111 +1111111122 22;2O2 f2 +t222222222223 +3333 333J3a3v3{3 333333344'4<4P4c4w4446OC6N6<687\X7R798B8 T8u8|8 8888 888888 888999(9.979 F9R9j9<99 99999 99::: :1:B:T:[:c:j:}:::::::::: : : :::);0D;-u;;;%;'<.<N<k<<!<#<< =!(=J=Q=W=[=_= f=t====== ======> >> %>/>7>;>???? @ @.@6@R@ +f@ +q@|@@ @ @@@@@@ @@@@@AAAAA!A'A.A 4A>ADAMA`A qA{AA B%B 4B >B JBTB]BfBoBwB~BBBB BBBBBBBBB +BBBB CC 'C 4C>CNCWC ^ChCpCwC +CCCCC CC C CC +CC DDD,D /D;DADID +RD]DeDwDDDDDD DDDD +D D E E%@EfE{E +EEEE EEEE!EE FFFF#F)F;FAF GFSF%cFFFFFFFFFFG + GG G)G/G8G AGOG`GeG kG uGGGGGGG +GGGG +GHHHH"H&H -H7H>HDHJH QH ]H0iHHHHH HHHHHH HHH I II4IFI3aI%IIIIII I +I +J JJ1J9J@JOJVJ]JcJxJJJJJJJJJJJJJ K(K8KMK bKnK$K KKKKKKKKLLLL&L?L\LwLLL3LL#LMM9MRMVM \M}M!MMMz83y??Tq #C='^iV|qM +(3mJ<c&0 (}R@%bLX~YCZ, Des_sRf-&Q2;KBGl.rS)/A1BxkoPMKI6k#aTL_vH;Vz5 /Uw*ED9+ :!u+EA]xpu,=p>t^|*<XHh8t >J4j wFnf1gNa{{[e)Wl\O$dm6v}G[']F~r0 +O!N.U5`I$4`W- \nco"Yy2@ 7jhbZi:%S7g9P"Qd Available drivers: --verbose [=level] Set verbosity level. Default is 1. -A, --audio-driver Select audio driver by ID. -J, --no-joystick Do not use joystick support. @@ -46,7 +49,7 @@ -V, --video-driver Select video driver by ID. -v, --version Display version. %a, %b %d / %H:%M(c) 2005 by the oxine project -2D_Tex2D_Tex_Fragprog2D_Tex_Tiled4:3AddAfarAfrikaansAkanAlbanianAlbum:AltimeterAmharicAngle MenuArabicArmenianArtist:Aspect RatioAssameseAudioAudio CDAudio ChannelAudio MenuAudio VisualizationAudio-Video OffsetAutomatically load subtitles if they exist.AymaraAzerbaijaniBackBambaraBashkirBasqueBelarusianBengaliBihariBislamaBlowing dustBlowing sandBlowing snowfallBlowing sprayBosnianBretonBrightnessBroken cloudsBulgarianBurmeseCD-ROMCancelCatalanChamorroChechenChineseChuvashClear skyConditionsContrastCornishCorsicanCould not create '%s': %s!Could not create LIRC thread: %s!Could not create joystick thread: %s!Could not create scheduler thread: %s!Could not create stream!Could not eject %s!Could not eject '%s': %s!Could not eject device!Could not load main menu!Could not load mediamarks.Could not open '%s': %s!Could not open disc!Could not open display!Could not play '%s': %s!Could not play title!Could not read '%s': %s!Could not read image '%s'!Could not write to '%s': %s!CroatianCzechDVBDVDDanishDecoderDeinterlaceDew pointDrifting snowDrizzleDustDuststormDutchEastEdit SettingsEffectsEjectElapsed:EngineEnglishEnv_Mapped_TorusEsperantoEstonianEweExamples for valid MRLs (media resource locator): +2D_Tex2D_Tex_Fragprog2D_Tex_Tiled4:3AddAfarAfrikaansAkanAlbanianAlbum:AltimeterAmharicAngle MenuArabicArmenianArtist:Aspect RatioAssameseAudioAudio CDAudio ChannelAudio MenuAudio VisualizationAudio-Video OffsetAutomatically load subtitles if they exist.AymaraAzerbaijaniBackBambaraBashkirBasqueBelarusianBengaliBihariBislamaBlowing dustBlowing sandBlowing snowfallBlowing sprayBosnianBretonBrightnessBroken cloudsBulgarianBurmeseCD-ROMCancelCatalanChamorroChechenChineseChuvashClear skyConditionsContrastCornishCorsicanCould not create '%s': %s!Could not create LIRC thread: %s!Could not create joystick thread: %s!Could not create scheduler thread: %s!Could not create stream!Could not eject '%s': %s!Could not eject device!Could not load main menu!Could not load mediamarks.Could not open '%s': %s!Could not open disc!Could not open display!Could not play '%s': %s!Could not play title!Could not read '%s': %s!Could not read image '%s'!Could not write to '%s': %s!CroatianCzechDVBDVDDanishDecoderDeinterlaceDew pointDrifting snowDrizzleDustDuststormDutchEastEdit SettingsEffectsEjectElapsed:EngineEnglishEnv_Mapped_TorusEsperantoEstonianEweExamples for valid MRLs (media resource locator): File: 'path/foo.vob' '/path/foo.vob' 'file://path/foo.vob' @@ -59,9 +62,9 @@ Extra Fast ForwardExtra Slow MotionFaroeseFast ForwardFeels likeFew cloudsFijianFile '%s' is empty!FilesystemFilmsFinnishFogFreezing DrizzleFreezing RainFreezing fogFrenchFrisianFulahGandaGenre:GeorgianGermanGreekGuaraniGujaratiHTTPHailHausaHazeHebrewHelpHereroHindiHiri MotuHueHungarianIce CrystalsIce PelletsIcelandicIdoIf this is enabled and if you don't specify any MRL on the command line, oxine will automatically load the previous playlist.IgboImage_PipelineIndonesianInterlinguaIrishItalianJapaneseJavaneseKannadaKanuriKashmiriKazakhKhmerKikuyuKinyarwandaKirghizKomiKongoKoreanKurdishLaoLatinLatvianLength:LingalaListen to MusicLithuanianLoop ModeLow drifting sandLuba-KatangaMacedonianMainmenuMalagasyMalayMalayalamMalteseMaoriMarathiMarshalleseMediaMenu toggleMistMoldavianMongolianMusicMy FavoritesMy FilmsMy HomeMy MusicMy PlaylistsNdongaNepaliNext PageNoNormal ModeNorthNorth-EastNorth-WestNorthern SamiNorwegianNorwegian (Bokmål)Norwegian (Nynorsk)OKOPTIONS are: OriyaOromoOvercastPart MenuPartial fogPatches of fogPausedPlayPlayingPlaylistPlease insert a DVD!Please insert a Video CD!Please wait...PolishPortuguesePushtoQuechuaRainRainshowersRelative humidityRemovable DiscRemoveRetrieving weather data...RomanianRoot MenuRundiRussianSamoanSandSandstormSangoSardinianSaturationScattered cloudsSelect device to eject:SerbianSettingsShallow fogShonaShow HelpShow Weather ReportShowersShowers of ice pelletsShuffle ModeShutdownSichuan YiSindhiSinhaleseSky coverSlovakSlovenianSlow MotionSmall HailSmokeSnowSnow GrainsSnowshowersSomaliSouthSouth-EastSouth-WestSpanishSquallsSubtitleSubtitle ChannelSubtitle MenuSubtitle OffsetSubtitlesSundaneseSwahiliSwatiSwedishTCPTagalogTahitianTajikTamilTatarTeluguTemperatureThaiThis is %s - A free Video-Player v%s ThunderstormTibetanTigrinyaTitleTitle MenuTongaTrack:TsongaTswanaTurkishTurkmenTwiUighurUkrainianUnknownUnknown DiscUnknown errorUnknown parameter %d!Unknown parameter '%s' for type 'autoplay'!Updating weather data...UrduUsage: oxine [OPTIONS] [MRL] -Use unscaled (full screen resolution) OSD if possibleUzbekVendaVideoVideo CDVideo DVDVietnameseVisibilityVolcanic AshVolumeWalloonWatch FilmsWeatherWelshWestWind directionWind speedWolofXhosaYear:YesYiddishYorubaZhuangZoomZulu[M3U-Playlist: %s]activate an item or a buttonadjust audio offsetadjust subtitle offsetadjust volumearrow keysaudio driver to useautochange audio languagechange subtitle languagedisabledenabledfftgraphfftscopego to the DVD menusgoomkernellibcmmxmmxextmutednavigate the menusnext/ previous channelnext/ previous chapternext/ previous titlenoneoscopepause/ playreload playlist on startseek backward/ forewardselect an item in a listshow the main menushow the music menushow the video menussestop the streamsubtitle autoloadingtoggle aspect ratiotoggle deinterlacetoggle mute/ unmuteuse unscaled OSD if possiblevideo driver to useProject-Id-Version: oxine 0.5 +UzbekVendaVideoVideo CDVideo DVDVietnameseVisibilityVolcanic AshVolumeWalloonWatch FilmsWeatherWelshWestWind directionWind speedWolofXhosaYear:YesYiddishYorubaZhuangZoomZulu[M3U-Playlist: %s]activate an item or a buttonadjust audio offsetadjust subtitle offsetadjust volumearrow keysaudio driver to useautochange audio languagechange subtitle languagedisabledenabledfftgraphfftscopego to the DVD menusgoomkernellibcmmxmmxextmutednavigate the menusnext/ previous channelnext/ previous chapternext/ previous titlenoneoscopepause/ playreload playlist on startseek backward/ forewardselect an item in a listshow the main menushow the music menushow the video menussestop the streamsubtitle autoloadingtoggle aspect ratiotoggle deinterlacetoggle mute/ unmutevideo driver to useProject-Id-Version: oxine 0.5 Report-Msgid-Bugs-To: mschwerin@users.sf.net -POT-Creation-Date: 2006-11-03 18:35+0100 +POT-Creation-Date: 2006-11-22 10:56+0100 PO-Revision-Date: 2006-10-17 10:12+0100 Last-Translator: Maximilian Schwerin Language-Team: Spanish @@ -78,7 +81,7 @@ -V, --video-driver Seleccionar el driver de vídeo por identificador. -v, --version Mostrar versión y salir. %a, %b %d / %H:%M(c) 2005, por el proyecto oxine -2D_Tex2D_Tex_Fragprog2D_Tex_Tiled4:3AñadirAfarAfrikaansAkanAlbanésÁlbum:Presión atmosféricaAmharicoMenú ÁnguloÁrabeArmenioArtista:Tasa de aspectoAssameseAudioAudio CDCanal de AudioMenú AudioVisualización de audioRetraso Audio-VídeoCarga automáticamente un archivo de subtítulos, si existe.AymaraAzerbaijaníAtrásBambaraBashkirVascoBielorusoBengalíBihariBislamaCortina de polvoViento con arenaCascada de nieveCortina de rocíoBosnioBretónBrilloNubosidad dispersaBúlgaroBurmeseCD-ROMCancelarCatalánChamorroChechenoChinoChuvashCielo despejadoCondicionesContrasteIrlandésCorso¡No se pudo crear '%s': %s!¡No se pudo crear el hilo para LIRC: %s!¡No se pudo crear el hilo para el joystick: %s!¡No se pudo crear el hilo del scheduler: %s!¡No se pudo crear el flujo!¡No se pudo expulsar %s!¡No se pudo expulsar '%s': %s!¡No se pudo expulsar el dispositivo!¡No se pudo cargar el menú principal!¡No se pudo cargar mediamarks!¡No se pudo abrir '%s': %s!¡No se pudo abrir el disco!¡No se pudo abrir el display!¡No se pudo reproducir '%s': %s!¡No se pudo reproducir el título!¡No se pudo leer '%s': %s!¡No se pudo leer imagen '%s'!¡No se pudo escribir a '%s': %s!CroataChecoDVBDVDDanésDecodificadorDesentrelazadoPunto de condensaciónCorriente de nieveLloviznaPolvoTormenta de polvoHolandésEsteConfiguraciónEfectosExpulsarPasado:EngineInglésEnv_Mapped_TorusEsperantoEstonioEweEjemplos de MRLs ("Media Resource Locator") válidas: +2D_Tex2D_Tex_Fragprog2D_Tex_Tiled4:3AñadirAfarAfrikaansAkanAlbanésÁlbum:Presión atmosféricaAmharicoMenú ÁnguloÁrabeArmenioArtista:Tasa de aspectoAssameseAudioAudio CDCanal de AudioMenú AudioVisualización de audioRetraso Audio-VídeoCarga automáticamente un archivo de subtítulos, si existe.AymaraAzerbaijaníAtrásBambaraBashkirVascoBielorusoBengalíBihariBislamaCortina de polvoViento con arenaCascada de nieveCortina de rocíoBosnioBretónBrilloNubosidad dispersaBúlgaroBurmeseCD-ROMCancelarCatalánChamorroChechenoChinoChuvashCielo despejadoCondicionesContrasteIrlandésCorso¡No se pudo crear '%s': %s!¡No se pudo crear el hilo para LIRC: %s!¡No se pudo crear el hilo para el joystick: %s!¡No se pudo crear el hilo del scheduler: %s!¡No se pudo crear el flujo!¡No se pudo expulsar '%s': %s!¡No se pudo expulsar el dispositivo!¡No se pudo cargar el menú principal!¡No se pudo cargar mediamarks!¡No se pudo abrir '%s': %s!¡No se pudo abrir el disco!¡No se pudo abrir el display!¡No se pudo reproducir '%s': %s!¡No se pudo reproducir el título!¡No se pudo leer '%s': %s!¡No se pudo leer imagen '%s'!¡No se pudo escribir a '%s': %s!CroataChecoDVBDVDDanésDecodificadorDesentrelazadoPunto de condensaciónCorriente de nieveLloviznaPolvoTormenta de polvoHolandésEsteConfiguraciónEfectosExpulsarPasado:EngineInglésEnv_Mapped_TorusEsperantoEstonioEweEjemplos de MRLs ("Media Resource Locator") válidas: Archivo: 'directorio/archivo.vob' '/directorio/archivo.vob' 'file://directorio/archivo.vob' @@ -91,4 +94,4 @@ Avance extra rápidoCámara extra lentaFaroésAvance rápidoSensación térmicaAlgunas nubesFijiano¡Fichero '%s' esta vació!Sistema de archivosPelículasFinlandésNieblaLlovizna heladaLluvia heladaNiebla heladaFrancésFrisónFulahGandaGénero:GeorgianoAlemánGriegoGuaraníGujaratiHTTPPedriscoHausaBrumaHebreoAyudaHereroHindiHiri MotuTintaHúngaroCristales de hieloBolitas de hieloIslandésIdoSi esta función está habilitada y usted no especifica ningún MRL en la línea de comando, oxine cargará automáticamente la anterior lista de reproducción.IgboImage_PipelineIndonesioInterlinguaIrlandésItalianoJaponésJavanésKannadaKanuriKashmiriKazakhKhmerKikuyuKinyarwandaKirghizKomiKongoCoreanoKurdoLaoLatínLetónDuración:LingalaEscuchar músicaLituanoModo continuoCorriente de arenaLuba-KatangaMacedonioMenú PrincipalMalgacheMalayoMalayalamMaltésMaoríMarathiMarshalésMediaMenúNeblinaMoldavoMongolésMúsicaMi FavoritosMi películasCarpeta de inicioMi músicaMi listas de reproducciónNdongaNepalíPágina siguienteNoModo normalNorteNoresteNoroesteSami norteNoruegoNoruego (Bokmål)Noruego (Nynorsk)OKlas OPCIONES son: OriyaOromoCubierto de nubesMenú ParteNiebla parcialNiebla dispersaPausadoReproducirReproduciendoLista de reproducción¡Por favor, introduzca un DVD!¡Por favor, introduzca un Vídeo CD!Por favor, espere...PolacoPortuguésPushtoQuechuaLluviaAguacerosHumedad relativaDispositivo RemovibleBorrarCargando datos meteorológicos...RumanoMenú RaízRundiRusoSamoanoArenaTormenta de arenaSangoSardoSaturaciónNubes dispersasSelecciona dispositivo para expulsar:ServioConfiguraciónNiebla muy gruesaShonaAyudaInforme meteorológicoChorrosChorros de bolitas de hieloModo aleatorioSalirSichuan YiSindhiSinhalésCieloEslovacoEslovenoCámara lentaGranizo pequeñoHumoNieveGranizadaAguanieveSomalíSurSuresteSuroesteEspañolChubascoSubtítuloCanal de subtítulosMenú de SubtítulosRetraso de subtítulosSubtítuloSudanésSwahiliSwatiSuecoTCPTagaloTahitianoTajicoTamilTatarTeluguTemperaturaThailandésEsto es %s - Un reproductor de Vídeo libre v%s TormentaTibetanoTigrinyaTítuloMenú TítuloTongaTitulo:TsongaTswanaTurcoTurkmenistanoTwiUighurUcranianoDesconocidoDispositivo DesconocidoError desconocidoParámetro desconocido %d!Parámetro desconocido '%s' por el tipo 'autoplay'!Actualizando datos meteorológicos...UrduUso: oxine [OPCIONES] [MRL] -usa OSD sin escalar (resolución pantalla completa) si es posibleUzbecoVendaVídeoVídeo CDVídeo DVDVietnamitaVisibilidadCenizas volcánicasVolumenValónVer películasTiempoGalésOesteDirección de vientoVelocidad de vientoWolofXhosaAño:SiYiddishYorubaZhuangZoomZulú[Lista-M3U: %s]activar un elemento o botónajustar retraso Audio-Vídeoajustar retraso subtítulosajustar volumenteclas de direcciónusar driver de audioautomáticocambiar el idioma del audiocambiar el idioma de los subtítulosdesactivadoactivadofftgraphfftscopesaltar a los menús del DVDgoomkernellibcmmxmmxextmudonavegar los menússiguiente/anterior canalsiguiente/anterior capítulosiguiente/anterior títuloningunooscopepausar/ reproducirrecarga la antigua lista de reproducción al inicioretroceder/ avanzarseleccionar un elemento de la listasaltar al menú principalsaltar al menú de musicasaltar al menú de videossepararcarga automática de subtítuloscambiar tasa de aspectoactivar/desactivar desentrelazadoactivar/desactivar modo mudousa OSD sin escalar si posibleusar driver de vídeo \ Kein Zeilenumbruch am Dateiende. +UzbecoVendaVídeoVídeo CDVídeo DVDVietnamitaVisibilidadCenizas volcánicasVolumenValónVer películasTiempoGalésOesteDirección de vientoVelocidad de vientoWolofXhosaAño:SiYiddishYorubaZhuangZoomZulú[Lista-M3U: %s]activar un elemento o botónajustar retraso Audio-Vídeoajustar retraso subtítulosajustar volumenteclas de direcciónusar driver de audioautomáticocambiar el idioma del audiocambiar el idioma de los subtítulosdesactivadoactivadofftgraphfftscopesaltar a los menús del DVDgoomkernellibcmmxmmxextmudonavegar los menússiguiente/anterior canalsiguiente/anterior capítulosiguiente/anterior títuloningunooscopepausar/ reproducirrecarga la antigua lista de reproducción al inicioretroceder/ avanzarseleccionar un elemento de la listasaltar al menú principalsaltar al menú de musicasaltar al menú de videossepararcarga automática de subtítuloscambiar tasa de aspectoactivar/desactivar desentrelazadoactivar/desactivar modo mudousar driver de vídeo \ Kein Zeilenumbruch am Dateiende. diff -Naur oxine-0.6.orig/po/es.po oxine-0.6.3/po/es.po --- oxine-0.6.orig/po/es.po 2006-11-03 18:35:35.000000000 +0100 +++ oxine-0.6.3/po/es.po 2006-11-22 10:56:27.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: oxine 0.5\n" "Report-Msgid-Bugs-To: mschwerin@users.sf.net\n" -"POT-Creation-Date: 2006-11-03 18:35+0100\n" +"POT-Creation-Date: 2006-11-22 10:56+0100\n" "PO-Revision-Date: 2006-10-17 10:12+0100\n" "Last-Translator: Maximilian Schwerin \n" "Language-Team: Spanish \n" @@ -22,20 +22,20 @@ msgid "Could not perform codeset conversion (%s)!" msgstr "" -#: src/disc.c:122 src/disc.c:323 src/disc.c:625 src/environment.c:819 -#: src/environment.c:837 src/filelist.c:805 src/mediamarks_favorites.c:98 -#: src/meta_info.c:85 src/odk.c:1020 src/odk.c:1103 src/odk_osd.c:806 -#: src/odk_osd.c:855 src/playlist_m3u.c:109 src/playlist_xml.c:55 -#: src/weather.c:122 +#: src/disc.c:122 src/disc.c:301 src/disc.c:326 src/disc.c:628 +#: src/environment.c:829 src/environment.c:847 src/filelist.c:805 +#: src/mediamarks_favorites.c:98 src/meta_info.c:85 src/odk.c:1020 +#: src/odk.c:1105 src/odk_osd.c:831 src/odk_osd.c:880 src/playlist_m3u.c:109 +#: src/playlist_xml.c:55 src/weather.c:122 #, c-format msgid "Could not open '%s': %s!" msgstr "¡No se pudo abrir '%s': %s!" -#: src/disc.c:213 src/disc.c:473 src/filelist.c:736 +#: src/disc.c:213 src/disc.c:474 src/filelist.c:736 msgid "Audio CD" msgstr "Audio CD" -#: src/disc.c:229 src/filelist.c:734 src/main_menu.c:238 +#: src/disc.c:229 src/filelist.c:734 src/main_menu.c:253 src/main_menu.c:269 msgid "Video CD" msgstr "Vídeo CD" @@ -59,40 +59,39 @@ msgid "Unknown Disc" msgstr "Dispositivo Desconocido" -#: src/disc.c:371 -#, c-format -msgid "Could not mount %s!" -msgstr "" +#: src/disc.c:374 +#, fuzzy, c-format +msgid "Could not mount '%s': %s!" +msgstr "¡No se pudo abrir '%s': %s!" -#: src/disc.c:391 -#, c-format -msgid "Could not unmount %s!" -msgstr "" +#: src/disc.c:374 src/disc.c:394 src/disc.c:414 src/lang.c:506 +msgid "Unknown" +msgstr "Desconocido" -#: src/disc.c:411 -#, c-format -msgid "Could not eject %s!" -msgstr "¡No se pudo expulsar %s!" +#: src/disc.c:394 +#, fuzzy, c-format +msgid "Could not unmount '%s': %s!" +msgstr "¡No se pudo abrir '%s': %s!" -#: src/disc.c:419 src/disc.c:425 +#: src/disc.c:414 src/disc.c:422 src/disc.c:427 #, c-format msgid "Could not eject '%s': %s!" msgstr "¡No se pudo expulsar '%s': %s!" -#: src/disc.c:474 +#: src/disc.c:475 msgid "Title" msgstr "Título" -#: src/disc.c:671 +#: src/disc.c:688 #, fuzzy, c-format msgid "Could not create disc polling thread: %s!" msgstr "¡No se pudo crear el hilo del scheduler: %s!" -#: src/disc.c:673 +#: src/disc.c:691 msgid "Successfully started disc polling thread." msgstr "" -#: src/disc.c:685 +#: src/disc.c:703 msgid "Successfully stopped disc polling thread." msgstr "" @@ -105,7 +104,7 @@ msgid "Unknown prefix to URL '%s'!" msgstr "Parámetro desconocido %d!" -#: src/download.c:227 src/environment.c:612 +#: src/download.c:227 src/environment.c:622 #, c-format msgid "Could not create '%s': %s!" msgstr "¡No se pudo crear '%s': %s!" @@ -143,59 +142,59 @@ msgid "Part Menu" msgstr "Menú Parte" -#: src/environment.c:135 src/environment.c:268 src/environment.c:586 -#: src/environment.c:593 src/environment.c:825 +#: src/environment.c:141 src/environment.c:289 src/environment.c:596 +#: src/environment.c:603 src/environment.c:835 #, c-format msgid "Unable to get status for file '%s': %s." msgstr "" -#: src/environment.c:144 src/environment.c:278 +#: src/environment.c:153 #, c-format msgid "Unable to read link '%s' file: %s." msgstr "" -#: src/environment.c:218 +#: src/environment.c:230 msgid "Found a device we are interested in:" msgstr "" -#: src/environment.c:219 +#: src/environment.c:231 #, c-format msgid " device: %s" msgstr "" -#: src/environment.c:220 +#: src/environment.c:232 #, c-format msgid " mountpoint: %s" msgstr "" -#: src/environment.c:221 +#: src/environment.c:233 #, c-format msgid " filesystem: %s" msgstr "" -#: src/environment.c:413 +#: src/environment.c:423 msgid "Unable to find usable home directory, using '/tmp'." msgstr "" -#: src/environment.c:831 +#: src/environment.c:841 #, c-format msgid "File '%s' is empty!" msgstr "¡Fichero '%s' esta vació!" -#: src/environment.c:848 +#: src/environment.c:858 #, c-format msgid "Could not read '%s': %s!" msgstr "¡No se pudo leer '%s': %s!" -#: src/environment.c:930 src/environment.c:931 +#: src/environment.c:940 src/environment.c:941 msgid "devices to poll (separate using ';')" msgstr "" -#: src/event.c:635 src/gui_utils.c:465 +#: src/event.c:681 src/gui_utils.c:492 msgid "Could not play title!" msgstr "¡No se pudo reproducir el título!" -#: src/event.c:639 +#: src/event.c:685 msgid "Waiting for alternative stream..." msgstr "" @@ -216,7 +215,7 @@ msgid "[M3U-Playlist: %s]" msgstr "[Lista-M3U: %s]" -#: src/filelist.c:732 src/main_menu.c:276 +#: src/filelist.c:732 src/main_menu.c:303 src/main_menu.c:319 msgid "DVD" msgstr "DVD" @@ -236,117 +235,146 @@ msgid "My VDR Recordings" msgstr "" -#: src/filelist_menu.c:135 +#: src/filelist_menu.c:127 msgid "Reset" msgstr "" -#: src/filelist_menu.c:137 src/filelist_menu.c:818 src/playlist_menu.c:1028 +#: src/filelist_menu.c:132 src/filelist_menu.c:139 src/filelist_menu.c:146 +#: src/filelist_menu.c:151 src/filelist_menu.c:834 src/playlist_menu.c:1041 msgid "Remove" msgstr "Borrar" -#: src/filelist_menu.c:145 src/main_menu.c:465 -msgid "Eject" -msgstr "Expulsar" - -#: src/filelist_menu.c:237 +#: src/filelist_menu.c:250 msgid "Play all titles in this folder and all subfolders..." msgstr "" -#: src/filelist_menu.c:243 +#: src/filelist_menu.c:256 msgid "Play all titles in this folder..." msgstr "" -#: src/filelist_menu.c:367 src/filelist_menu.c:575 src/playlist_menu.c:245 -#: src/playlist_menu.c:410 +#: src/filelist_menu.c:385 src/filelist_menu.c:591 src/playlist_menu.c:255 +#: src/playlist_menu.c:420 msgid "Choose an entry..." msgstr "" -#: src/filelist_menu.c:398 src/filelist_menu.c:408 src/filelist_menu.c:710 +#: src/filelist_menu.c:416 src/filelist_menu.c:426 src/filelist_menu.c:726 #, fuzzy, c-format msgid "Could not remove '%s': %s!" msgstr "¡No se pudo crear '%s': %s!" -#: src/filelist_menu.c:409 +#: src/filelist_menu.c:427 msgid "SVDRP error" msgstr "" -#: src/filelist_menu.c:446 src/playlist_menu.c:295 +#: src/filelist_menu.c:462 src/playlist_menu.c:305 msgid "Could not open disc!" msgstr "¡No se pudo abrir el disco!" -#: src/filelist_menu.c:810 src/playlist_menu.c:1010 +#: src/filelist_menu.c:826 src/playlist_menu.c:1023 msgid "Play" msgstr "Reproducir" -#: src/filelist_menu.c:814 src/playlist_menu.c:540 src/playlist_menu.c:1023 +#: src/filelist_menu.c:830 src/playlist_menu.c:550 src/playlist_menu.c:1036 msgid "Add" msgstr "Añadir" -#: src/filelist_menu.c:822 src/playback_menu.c:1053 src/settings_menu.c:511 +#: src/filelist_menu.c:838 src/main_menu.c:524 +msgid "Eject" +msgstr "Expulsar" + +#: src/filelist_menu.c:842 src/playback_menu.c:1076 src/settings_menu.c:509 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:77 msgid "Playlist" msgstr "Lista de reproducción" -#: src/filelist_menu.c:826 src/playback_menu.c:1047 src/playlist_menu.c:1053 -#: src/settings_menu.c:539 src/weather_menu.c:164 +#: src/filelist_menu.c:846 src/playback_menu.c:1070 src/playlist_menu.c:1066 +#: src/settings_menu.c:537 src/weather_menu.c:164 msgid "Mainmenu" msgstr "Menú Principal" -#: src/filelist_menu.c:830 src/main_menu.c:481 src/playlist_menu.c:1057 +#: src/filelist_menu.c:850 src/main_menu.c:540 src/playlist_menu.c:1070 msgid "Current title" msgstr "" -#: src/filelist_menu.c:945 +#: src/filelist_menu.c:965 msgid "Could not load mediamarks." msgstr "¡No se pudo cargar mediamarks!" -#: src/filelist_menu.c:946 +#: src/filelist_menu.c:966 #, c-format msgid "You should create a file containing mediamarks at %s!" msgstr "" -#: src/filelist_menu.c:980 src/filelist_menu.c:1013 src/filelist_menu.c:1044 +#: src/filelist_menu.c:1000 src/filelist_menu.c:1033 src/filelist_menu.c:1064 #: src/gui_utils.h:65 msgid "Please wait..." msgstr "Por favor, espere..." -#: src/gui_utils.c:193 +#: src/gui_utils.c:195 msgid "Could not open or play background, leaving oxine!" msgstr "" -#: src/gui_utils.c:194 +#: src/gui_utils.c:196 msgid "Please make sure, that your version of xine-lib can play PNG files." msgstr "" -#: src/gui_utils.c:391 src/gui_utils.c:398 src/main_menu.c:381 -#: src/playlist_menu.c:950 +#: src/gui_utils.c:393 src/gui_utils.c:400 src/main_menu.c:419 +#: src/playlist_menu.c:963 msgid "OK" msgstr "OK" -#: src/gui_utils.c:403 src/gui_utils.c:425 src/main_menu.c:385 -#: src/main_menu.c:469 src/playlist_menu.c:953 +#: src/gui_utils.c:405 src/gui_utils.c:427 src/main_menu.c:423 +#: src/main_menu.c:528 src/playlist_menu.c:966 msgid "Cancel" msgstr "Cancelar" -#: src/gui_utils.c:409 +#: src/gui_utils.c:411 msgid "Yes" msgstr "Si" -#: src/gui_utils.c:414 +#: src/gui_utils.c:416 msgid "No" msgstr "No" -#: src/gui_utils.c:420 +#: src/gui_utils.c:422 msgid "Retry" msgstr "" -#: src/help_menu.c:43 src/playback_menu.c:473 src/playback_menu.c:527 -#: src/settings_menu.c:462 +#: src/gui_utils.c:478 +#, fuzzy +msgid "Could not play Audio CD!" +msgstr "¡No se pudo reproducir el título!" + +#: src/gui_utils.c:479 src/main_menu.c:213 +#, fuzzy +msgid "Please insert an Audio CD!" +msgstr "¡Por favor, introduzca un Audio CD!" + +#: src/gui_utils.c:483 +#, fuzzy +msgid "Could not play Video CD!" +msgstr "¡No se pudo reproducir el título!" + +#: src/gui_utils.c:484 src/main_menu.c:263 +msgid "Please insert a Video CD!" +msgstr "¡Por favor, introduzca un Vídeo CD!" + +#: src/gui_utils.c:488 +#, fuzzy +msgid "Could not play DVD!" +msgstr "¡No se pudo reproducir el título!" + +#: src/gui_utils.c:489 src/main_menu.c:313 +msgid "Please insert a DVD!" +msgstr "¡Por favor, introduzca un DVD!" + +#: src/help_menu.c:43 src/playback_menu.c:490 src/playback_menu.c:549 +#: src/settings_menu.c:460 msgid "Next Page" msgstr "Página siguiente" -#: src/help_menu.c:49 src/playback_menu.c:477 src/playback_menu.c:531 -#: src/playback_menu.c:535 src/playlist_menu.c:543 src/settings_menu.c:467 +#: src/help_menu.c:49 src/playback_menu.c:494 src/playback_menu.c:553 +#: src/playback_menu.c:557 src/playlist_menu.c:553 src/settings_menu.c:465 msgid "Back" msgstr "Atrás" @@ -1236,107 +1264,95 @@ msgid "Zulu" msgstr "Zulú" -#: src/lang.c:506 -msgid "Unknown" -msgstr "Desconocido" - #: src/main_menu.c:71 #, fuzzy msgid "Could not find DVB channels file!" msgstr "No se puede cargar el archivo glade." -#: src/main_menu.c:207 -#, fuzzy -msgid "Please insert an Audio CD!" -msgstr "¡Por favor, introduzca un Audio CD!" - -#: src/main_menu.c:245 -msgid "Please insert a Video CD!" -msgstr "¡Por favor, introduzca un Vídeo CD!" - -#: src/main_menu.c:283 -msgid "Please insert a DVD!" -msgstr "¡Por favor, introduzca un DVD!" - -#: src/main_menu.c:328 +#: src/main_menu.c:366 msgid "How do you want to proceed?" msgstr "" -#: src/main_menu.c:342 +#: src/main_menu.c:380 msgid "Quit oxine" msgstr "" -#: src/main_menu.c:351 +#: src/main_menu.c:389 msgid "Shutdown the computer" msgstr "" -#: src/main_menu.c:360 +#: src/main_menu.c:398 msgid "Switch computer to standby" msgstr "" -#: src/main_menu.c:369 +#: src/main_menu.c:407 msgid "Reboot the computer" msgstr "" -#: src/main_menu.c:427 +#: src/main_menu.c:472 +#, fuzzy +msgid "Could not unmount device!" +msgstr "¡No se pudo expulsar el dispositivo!" + +#: src/main_menu.c:476 msgid "Could not eject device!" msgstr "¡No se pudo expulsar el dispositivo!" -#: src/main_menu.c:449 +#: src/main_menu.c:508 msgid "Select device to eject:" msgstr "Selecciona dispositivo para expulsar:" -#: src/main_menu.c:593 +#: src/main_menu.c:652 msgid "Listen to Music" msgstr "Escuchar música" -#: src/main_menu.c:594 +#: src/main_menu.c:653 msgid "Watch Films" msgstr "Ver películas" -#: src/main_menu.c:595 +#: src/main_menu.c:654 #, fuzzy msgid "Watch Television" msgstr "Televisión digital" -#: src/main_menu.c:596 +#: src/main_menu.c:655 #, fuzzy msgid "Play a DVD" msgstr "¡Por favor, introduzca un DVD!" -#: src/main_menu.c:597 +#: src/main_menu.c:656 #, fuzzy msgid "Play a Video CD" msgstr "¡Por favor, introduzca un Vídeo CD!" -#: src/main_menu.c:598 +#: src/main_menu.c:657 #, fuzzy msgid "Play an Audio CD" msgstr "¡Por favor, introduzca un Audio CD!" -#: src/main_menu.c:599 +#: src/main_menu.c:658 msgid "Show Help" msgstr "Ayuda" -#: src/main_menu.c:600 +#: src/main_menu.c:659 msgid "Show Weather Report" msgstr "Informe meteorológico" -#: src/main_menu.c:601 +#: src/main_menu.c:660 msgid "Edit Settings" msgstr "Configuración" -#: src/main_menu.c:602 src/settings_menu.c:512 +#: src/main_menu.c:661 src/settings_menu.c:510 msgid "Shutdown" msgstr "Salir" -#: src/main_menu.c:624 +#: src/main_menu.c:683 msgid "Could not load main menu!" msgstr "¡No se pudo cargar el menú principal!" #: src/mediamarks.c:103 src/mediamarks.c:139 src/menulist.c:140 -#: src/menulist.c:186 src/otk.c:3560 src/otk.c:3565 src/otk.c:3622 -#: src/otk.c:3627 src/playlist_xml.c:141 src/playlist_xml.c:176 +#: src/menulist.c:186 src/otk.c:3597 src/otk.c:3602 src/otk.c:3659 +#: src/otk.c:3664 src/playlist_xml.c:141 src/playlist_xml.c:176 #, fuzzy, c-format msgid "Unknown name '%s' for node!" msgstr "Parámetro desconocido '%s' por el tipo 'autoplay'!" @@ -1345,13 +1361,13 @@ msgid "Found an entry that did not contain a MRL!" msgstr "" -#: src/mediamarks.c:159 src/menulist.c:207 src/otk.c:3591 +#: src/mediamarks.c:159 src/menulist.c:207 src/otk.c:3628 #: src/playlist_xml.c:196 #, c-format msgid "Parsing '%s' failed!" msgstr "" -#: src/mediamarks.c:165 src/menulist.c:212 src/otk.c:3596 +#: src/mediamarks.c:165 src/menulist.c:212 src/otk.c:3633 #: src/playlist_xml.c:201 #, c-format msgid "Root node of '%s' must be '%s'!" @@ -1399,23 +1415,23 @@ msgid "Aspect Ratio" msgstr "Tasa de aspecto" -#: src/odk.c:519 src/odk.c:1414 +#: src/odk.c:519 src/odk.c:1458 msgid "Hue" msgstr "Tinta" -#: src/odk.c:522 src/odk.c:1416 +#: src/odk.c:522 src/odk.c:1460 msgid "Saturation" msgstr "Saturación" -#: src/odk.c:525 src/odk.c:1412 +#: src/odk.c:525 src/odk.c:1455 msgid "Contrast" msgstr "Contraste" -#: src/odk.c:528 src/odk.c:1410 +#: src/odk.c:528 src/odk.c:1452 msgid "Brightness" msgstr "Brillo" -#: src/odk.c:532 +#: src/odk.c:532 src/odk.c:1463 msgid "Zoom" msgstr "Zoom" @@ -1456,8 +1472,8 @@ msgid "none" msgstr "ninguno" -#: src/odk.c:592 src/odk.c:608 src/odk.c:629 src/settings_menu.c:600 -#: src/settings_menu.c:634 src/settings_menu.c:643 +#: src/odk.c:592 src/odk.c:608 src/odk.c:629 src/settings_menu.c:598 +#: src/settings_menu.c:632 src/settings_menu.c:641 msgid "auto" msgstr "automático" @@ -1510,69 +1526,61 @@ msgid "Malformed MRL" msgstr "" -#: src/odk.c:1110 +#: src/odk.c:1112 #, c-format msgid "Could not play '%s': %s!" msgstr "¡No se pudo reproducir '%s': %s!" -#: src/odk.c:1375 src/odk.c:1376 +#: src/odk.c:1422 src/odk.c:1423 msgid "encode special characters in MRLs" msgstr "" -#: src/odk.c:1380 -msgid "use unscaled OSD if possible" -msgstr "usa OSD sin escalar si posible" - -#: src/odk.c:1381 -msgid "Use unscaled (full screen resolution) OSD if possible" -msgstr "usa OSD sin escalar (resolución pantalla completa) si es posible" - -#: src/odk.c:1386 +#: src/odk.c:1428 #, fuzzy msgid "audio visualization type" msgstr "visualización de audio - Estilo" -#: src/odk.c:1387 +#: src/odk.c:1429 msgid "" "What kind of visual output is to be displayed when playing an audio only " "stream." msgstr "" -#: src/odk.c:1394 +#: src/odk.c:1436 msgid "background image MRL" msgstr "" -#: src/odk.c:1395 +#: src/odk.c:1437 msgid "" "The MRL of the background image that will be displayed if 'visual_anim." "style' is set to 'Background Image'" msgstr "" -#: src/odk.c:1403 +#: src/odk.c:1445 msgid "stream animation MRL" msgstr "" -#: src/odk.c:1404 +#: src/odk.c:1446 msgid "" "The MRL of the stream animation that will be displayed if 'visual_anim." "style' is set to 'Stream Animation'" msgstr "" -#: src/odk.c:1459 +#: src/odk.c:1506 #, c-format msgid "Failed to create window using video driver '%s'!" msgstr "" -#: src/odk.c:1464 +#: src/odk.c:1511 msgid "Failed to create window using default driver." msgstr "" -#: src/odk.c:1474 +#: src/odk.c:1521 #, c-format msgid "Failed to open audio port using audio driver '%s'!" msgstr "" -#: src/odk.c:1479 +#: src/odk.c:1526 msgid "Failed to open audio port using default audio driver." msgstr "" @@ -1658,30 +1666,30 @@ msgid "Successfully stopped the LIRC input plugin." msgstr "" -#: src/odk_osd.c:427 +#: src/odk_osd.c:452 #, c-format msgid "Could not read image '%s'!" msgstr "¡No se pudo leer imagen '%s'!" -#: src/odk_osd.c:482 +#: src/odk_osd.c:507 #, c-format msgid "Could not scale image '%s'!" msgstr "" -#: src/odk_osd.c:525 +#: src/odk_osd.c:550 msgid "Could not get pixel data!" msgstr "" -#: src/odk_osd.c:745 +#: src/odk_osd.c:770 #, fuzzy, c-format msgid "Could not free a cache entry for '%s'." msgstr "¡No se pudo leer imagen '%s'!" -#: src/odk_osd.c:1671 +#: src/odk_osd.c:1721 msgid "The current video driver supports unscaled OSD!" msgstr "" -#: src/odk_osd.c:1673 +#: src/odk_osd.c:1723 msgid "The current video driver does not support unscaled OSD!" msgstr "" @@ -1712,83 +1720,83 @@ msgid "Found %d Xinerama screens:" msgstr "" -#: src/odk_x11.c:1014 +#: src/odk_x11.c:1002 #, c-format msgid "" "Overriding calculated monitor pixel aspect ratio with user provided value: " "%.02f" msgstr "" -#: src/odk_x11.c:1030 +#: src/odk_x11.c:1018 #, c-format msgid "Failed to open video port '%s', falling back to 'auto'." msgstr "" -#: src/odk_x11.c:1037 +#: src/odk_x11.c:1025 msgid "Failed to open video port!" msgstr "" -#: src/otk.c:3527 src/otk.c:3534 +#: src/otk.c:3564 src/otk.c:3571 #, c-format msgid "Missing property (required) '%s'!" msgstr "" -#: src/otk.c:3578 +#: src/otk.c:3615 #, c-format msgid "Loading palette file '%s'..." msgstr "" -#: src/otk.c:3654 +#: src/otk.c:3691 msgid "Could not load palette, reverting to standard colors." msgstr "" -#: src/oxine.c:107 +#: src/oxine.c:113 #, c-format msgid "Usage: oxine [OPTIONS] [MRL]\n" msgstr "Uso: oxine [OPCIONES] [MRL]\n" -#: src/oxine.c:109 +#: src/oxine.c:115 #, c-format msgid "OPTIONS are:\n" msgstr "las OPCIONES son:\n" -#: src/oxine.c:110 +#: src/oxine.c:116 #, c-format msgid " -v, --version Display version.\n" msgstr " -v, --version Mostrar versión y salir.\n" -#: src/oxine.c:111 +#: src/oxine.c:117 #, c-format msgid " --verbose [=level] Set verbosity level. Default is 1.\n" msgstr "" " --verbose [=nivel] Indicar nivel de depuración. Por defecto es " "1.\n" -#: src/oxine.c:113 +#: src/oxine.c:119 #, c-format msgid " -l, --logfile Set the log filename.\n" msgstr "" -#: src/oxine.c:114 +#: src/oxine.c:120 #, c-format msgid " -V, --video-driver Select video driver by ID.\n" msgstr "" " -V, --video-driver Seleccionar el driver de vídeo por " "identificador.\n" -#: src/oxine.c:115 src/oxine.c:129 +#: src/oxine.c:121 src/oxine.c:135 #, c-format msgid " Available drivers:\n" msgstr " Drivers disponibles:\n" -#: src/oxine.c:128 +#: src/oxine.c:134 #, c-format msgid " -A, --audio-driver Select audio driver by ID.\n" msgstr "" " -A, --audio-driver Seleccionar driver de audio por " "identificador.\n" -#: src/oxine.c:140 +#: src/oxine.c:146 #, c-format msgid "" " -X, --xineramascreen [=num] Sets the screen on which the fullscreen " @@ -1796,12 +1804,12 @@ " will be shown.\n" msgstr "" -#: src/oxine.c:144 +#: src/oxine.c:150 #, fuzzy, c-format msgid " -F, --no-fullscreen Do no start in fullscreen mode.\n" msgstr " -f, --fullscreen Comenzar en modo pantalla completa.\n" -#: src/oxine.c:147 +#: src/oxine.c:153 #, c-format msgid "" " -P, --no-polling Do not use automatic polling for removable " @@ -1810,17 +1818,26 @@ " -P, --no-polling Desactivar búsqueda automática de " "dispositivos removibles.\n" -#: src/oxine.c:151 +#: src/oxine.c:157 #, c-format msgid " -L, --no-lirc Do not use remote control (LIRC).\n" msgstr " -L, --no-lirc Desactivar soporte LIRC.\n" -#: src/oxine.c:155 +#: src/oxine.c:161 #, c-format msgid " -J, --no-joystick Do not use joystick support.\n" msgstr " -J, --no-joystick Desactivar soporte joystick.\n" -#: src/oxine.c:159 +#: src/oxine.c:165 +#, fuzzy, c-format +msgid "" +" -W, --no-weather Do not automaticaly retrieve weather " +"information.\n" +msgstr "" +" -P, --no-polling Desactivar búsqueda automática de " +"dispositivos removibles.\n" + +#: src/oxine.c:169 #, c-format msgid "" "Examples for valid MRLs (media resource locator):\n" @@ -1845,85 +1862,81 @@ " 'dvd://'\n" " VCD: 'vcd://'\n" -#: src/oxine.c:180 src/oxine.c:181 +#: src/oxine.c:190 src/oxine.c:191 msgid "video driver to use" msgstr "usar driver de vídeo" -#: src/oxine.c:184 src/oxine.c:185 +#: src/oxine.c:194 src/oxine.c:195 msgid "audio driver to use" msgstr "usar driver de audio" -#: src/oxine.c:190 src/oxine.c:191 +#: src/oxine.c:199 src/oxine.c:200 msgid "Xinerama screen for fullscreen window" msgstr "" -#: src/oxine.c:196 src/oxine.c:197 -msgid "percentage of fullscreen screen to use" -msgstr "" - -#: src/oxine.c:201 +#: src/oxine.c:204 msgid "non-fullscreen window width" msgstr "" -#: src/oxine.c:202 +#: src/oxine.c:205 msgid "The width of the non-fullscreen window" msgstr "" -#: src/oxine.c:206 +#: src/oxine.c:209 msgid "non-fullscreen window height" msgstr "" -#: src/oxine.c:207 +#: src/oxine.c:210 msgid "The height of the non-fullscreen window" msgstr "" -#: src/oxine.c:211 src/oxine.c:212 +#: src/oxine.c:214 src/oxine.c:215 msgid "aspect ratio of one monitor pixel" msgstr "" -#: src/oxine.c:217 +#: src/oxine.c:220 msgid "ask before leaving oxine" msgstr "" -#: src/oxine.c:218 +#: src/oxine.c:221 msgid "Are we to show the quit confirm dialog?" msgstr "" -#: src/oxine.c:222 src/oxine.c:223 +#: src/oxine.c:225 src/oxine.c:226 #, fuzzy msgid "command that was selected the last time" msgstr "¿Qué comando es ejecutando en la salida?" -#: src/oxine.c:228 src/oxine.c:229 +#: src/oxine.c:231 src/oxine.c:232 #, fuzzy msgid "shell command (power off)" msgstr "¿qué comando es ejecutando en la salida?" -#: src/oxine.c:234 src/oxine.c:235 +#: src/oxine.c:237 src/oxine.c:238 #, fuzzy msgid "shell command (reboot)" msgstr "¿qué comando es ejecutando en la salida?" -#: src/oxine.c:239 src/oxine.c:240 +#: src/oxine.c:242 src/oxine.c:243 #, fuzzy msgid "shell command (standby)" msgstr "¿qué comando es ejecutando en la salida?" -#: src/oxine.c:245 +#: src/oxine.c:248 msgid "METAR ICAO location indicator" msgstr "" -#: src/oxine.c:246 +#: src/oxine.c:249 msgid "" "The METAR ICAO Location Indicator defines for which location the weather is " "to be displayed." msgstr "" -#: src/oxine.c:252 +#: src/oxine.c:255 msgid "reload playlist on start" msgstr "recarga la antigua lista de reproducción al inicio" -#: src/oxine.c:253 +#: src/oxine.c:256 msgid "" "If this is enabled and if you don't specify any MRL on the command line, " "oxine will automatically load the previous playlist." @@ -1931,138 +1944,138 @@ "Si esta función está habilitada y usted no especifica ningún MRL en la línea " "de comando, oxine cargará automáticamente la anterior lista de reproducción." -#: src/oxine.c:259 +#: src/oxine.c:262 #, fuzzy msgid "play reloaded playlist on start" msgstr "recarga la antigua lista de reproducción al inicio" -#: src/oxine.c:260 +#: src/oxine.c:263 msgid "" "If this is enabled and gui.playlist_auto_reload is also enabled the reloaded " "playlist will automatically be played." msgstr "" -#: src/oxine.c:267 +#: src/oxine.c:270 msgid "subtitle autoloading" msgstr "carga automática de subtítulos" -#: src/oxine.c:268 +#: src/oxine.c:271 msgid "Automatically load subtitles if they exist." msgstr "Carga automáticamente un archivo de subtítulos, si existe." -#: src/oxine.c:395 +#: src/oxine.c:406 #, c-format msgid "This is %s - A free Video-Player v%s\n" msgstr "Esto es %s - Un reproductor de Vídeo libre v%s\n" -#: src/oxine.c:397 +#: src/oxine.c:408 #, c-format msgid "(c) 2005 by the oxine project\n" msgstr "(c) 2005, por el proyecto oxine\n" -#: src/oxine.c:406 +#: src/oxine.c:417 #, c-format msgid "Invalid argument %d!" msgstr "" -#: src/oxine.c:491 +#: src/oxine.c:502 #, fuzzy msgid "Could not initialize ODK!" msgstr "No se puede inicializar Bonobo" -#: src/oxine.c:502 +#: src/oxine.c:513 #, fuzzy msgid "Could not inizialize OTK!" msgstr "No se puede inicializar Bonobo" -#: src/playback_menu.c:747 src/playback_menu.c:1172 +#: src/playback_menu.c:769 src/playback_menu.c:1195 msgid "Album:" msgstr "Álbum:" -#: src/playback_menu.c:753 src/playback_menu.c:1178 +#: src/playback_menu.c:775 src/playback_menu.c:1201 msgid "Artist:" msgstr "Artista:" -#: src/playback_menu.c:759 src/playback_menu.c:1184 +#: src/playback_menu.c:781 src/playback_menu.c:1207 msgid "Year:" msgstr "Año:" -#: src/playback_menu.c:765 src/playback_menu.c:1190 +#: src/playback_menu.c:787 src/playback_menu.c:1213 msgid "Track:" msgstr "Titulo:" -#: src/playback_menu.c:772 src/playback_menu.c:1197 +#: src/playback_menu.c:794 src/playback_menu.c:1220 msgid "Genre:" msgstr "Género:" -#: src/playback_menu.c:779 +#: src/playback_menu.c:801 msgid "Length:" msgstr "Duración:" -#: src/playback_menu.c:788 +#: src/playback_menu.c:810 msgid "Elapsed:" msgstr "Pasado:" -#: src/playback_menu.c:1014 +#: src/playback_menu.c:1037 msgid "Loop Mode" msgstr "Modo continuo" -#: src/playback_menu.c:1019 +#: src/playback_menu.c:1042 msgid "Shuffle Mode" msgstr "Modo aleatorio" -#: src/playback_menu.c:1024 +#: src/playback_menu.c:1047 msgid "Normal Mode" msgstr "Modo normal" -#: src/playback_menu.c:1035 +#: src/playback_menu.c:1058 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:79 msgid "Settings" msgstr "Configuración" -#: src/playback_menu.c:1058 +#: src/playback_menu.c:1081 msgid "Media Browser" msgstr "" -#: src/playlist_menu.c:637 +#: src/playlist_menu.c:650 #, fuzzy msgid "Delete subtitle" msgstr "Borrar Subtítulo" -#: src/playlist_menu.c:639 src/playlist_menu.c:1043 +#: src/playlist_menu.c:652 src/playlist_menu.c:1056 #, fuzzy msgid "Add subtitle" msgstr "Añadir Subtítulo" -#: src/playlist_menu.c:661 +#: src/playlist_menu.c:674 msgid "Subtitle" msgstr "Subtítulo" -#: src/playlist_menu.c:943 +#: src/playlist_menu.c:956 msgid "Please enter a name for the playlist:" msgstr "" -#: src/playlist_menu.c:1014 +#: src/playlist_menu.c:1027 #, fuzzy msgid "Clear list" msgstr "Borrar Lista" -#: src/playlist_menu.c:1018 +#: src/playlist_menu.c:1031 #, fuzzy msgid "Save list" msgstr "Guardar Lista" -#: src/playlist_menu.c:1033 +#: src/playlist_menu.c:1046 #, fuzzy msgid "Move up" msgstr "Mover arriba" -#: src/playlist_menu.c:1038 +#: src/playlist_menu.c:1051 #, fuzzy msgid "Move down" msgstr "Mover abajo" -#: src/playlist_menu.c:1048 +#: src/playlist_menu.c:1061 msgid "Media-Browser" msgstr "" @@ -2086,374 +2099,374 @@ "for the changes to take effect!" msgstr "" -#: src/settings_menu.c:504 +#: src/settings_menu.c:502 #, fuzzy msgid "User Interface" msgstr "Desentrelazado" -#: src/settings_menu.c:506 +#: src/settings_menu.c:504 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:80 msgid "Weather" msgstr "Tiempo" -#: src/settings_menu.c:509 +#: src/settings_menu.c:507 msgid "Video Disc Recorder" msgstr "" -#: src/settings_menu.c:513 +#: src/settings_menu.c:511 msgid "Audio Visualization" msgstr "Visualización de audio" -#: src/settings_menu.c:514 +#: src/settings_menu.c:512 msgid "Audio" msgstr "Audio" -#: src/settings_menu.c:515 +#: src/settings_menu.c:513 msgid "Video" msgstr "Vídeo" -#: src/settings_menu.c:516 +#: src/settings_menu.c:514 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:76 msgid "Media" msgstr "Media" -#: src/settings_menu.c:517 +#: src/settings_menu.c:515 msgid "Decoder" msgstr "Decodificador" -#: src/settings_menu.c:518 +#: src/settings_menu.c:516 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:78 msgid "Subtitles" msgstr "Subtítulo" -#: src/settings_menu.c:519 +#: src/settings_menu.c:517 msgid "Effects" msgstr "Efectos" -#: src/settings_menu.c:520 +#: src/settings_menu.c:518 msgid "Engine" msgstr "Engine" -#: src/settings_menu.c:521 +#: src/settings_menu.c:519 msgid "Miscellaneous" msgstr "" -#: src/settings_menu.c:578 +#: src/settings_menu.c:576 msgid "white-black-transparent" msgstr "" -#: src/settings_menu.c:579 +#: src/settings_menu.c:577 msgid "white-none-transparent" msgstr "" -#: src/settings_menu.c:580 +#: src/settings_menu.c:578 msgid "white-none-translucid" msgstr "" -#: src/settings_menu.c:581 +#: src/settings_menu.c:579 msgid "yellow-black-transparent" msgstr "" -#: src/settings_menu.c:583 +#: src/settings_menu.c:581 msgid "Mono 1.0" msgstr "" -#: src/settings_menu.c:584 +#: src/settings_menu.c:582 msgid "Stereo 2.0" msgstr "" -#: src/settings_menu.c:585 +#: src/settings_menu.c:583 msgid "Headphones 2.0" msgstr "" -#: src/settings_menu.c:586 +#: src/settings_menu.c:584 msgid "Stereo 2.1" msgstr "" -#: src/settings_menu.c:587 +#: src/settings_menu.c:585 msgid "Surround 3.0" msgstr "" -#: src/settings_menu.c:588 +#: src/settings_menu.c:586 msgid "Surround 4.0" msgstr "" -#: src/settings_menu.c:589 +#: src/settings_menu.c:587 msgid "Surround 4.1" msgstr "" -#: src/settings_menu.c:590 +#: src/settings_menu.c:588 msgid "Surround 5.0" msgstr "" -#: src/settings_menu.c:591 +#: src/settings_menu.c:589 msgid "Surround 5.1" msgstr "" -#: src/settings_menu.c:592 +#: src/settings_menu.c:590 msgid "Surround 6.0" msgstr "" -#: src/settings_menu.c:593 +#: src/settings_menu.c:591 msgid "Surround 6.1" msgstr "" -#: src/settings_menu.c:594 +#: src/settings_menu.c:592 msgid "Surround 7.1" msgstr "" -#: src/settings_menu.c:595 +#: src/settings_menu.c:593 msgid "Pass Through" msgstr "" -#: src/settings_menu.c:597 +#: src/settings_menu.c:595 msgid "metronom feedback" msgstr "" -#: src/settings_menu.c:598 +#: src/settings_menu.c:596 msgid "resample" msgstr "" -#: src/settings_menu.c:601 +#: src/settings_menu.c:599 msgid "off" msgstr "" -#: src/settings_menu.c:602 +#: src/settings_menu.c:600 #, fuzzy msgid "on" msgstr "ninguno" -#: src/settings_menu.c:604 +#: src/settings_menu.c:602 msgid "2D_Tex_Fragprog" msgstr "2D_Tex_Fragprog" -#: src/settings_menu.c:605 +#: src/settings_menu.c:603 msgid "2D_Tex" msgstr "2D_Tex" -#: src/settings_menu.c:606 +#: src/settings_menu.c:604 msgid "2D_Tex_Tiled" msgstr "2D_Tex_Tiled" -#: src/settings_menu.c:607 +#: src/settings_menu.c:605 msgid "Image_Pipeline" msgstr "Image_Pipeline" -#: src/settings_menu.c:608 +#: src/settings_menu.c:606 msgid "Cylinder" msgstr "" -#: src/settings_menu.c:609 +#: src/settings_menu.c:607 msgid "Env_Mapped_Torus" msgstr "Env_Mapped_Torus" -#: src/settings_menu.c:611 +#: src/settings_menu.c:609 msgid "entire dvd" msgstr "" -#: src/settings_menu.c:612 +#: src/settings_menu.c:610 #, fuzzy msgid "one chapter" msgstr "siguiente/anterior capítulo" -#: src/settings_menu.c:614 +#: src/settings_menu.c:612 msgid "seek in program chain" msgstr "" -#: src/settings_menu.c:615 +#: src/settings_menu.c:613 msgid "seek in program" msgstr "" -#: src/settings_menu.c:617 +#: src/settings_menu.c:615 msgid "skip program" msgstr "" -#: src/settings_menu.c:618 +#: src/settings_menu.c:616 msgid "skip part" msgstr "" -#: src/settings_menu.c:619 +#: src/settings_menu.c:617 msgid "skip title" msgstr "" -#: src/settings_menu.c:621 +#: src/settings_menu.c:619 msgid "14.4 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:622 +#: src/settings_menu.c:620 msgid "19.2 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:623 +#: src/settings_menu.c:621 msgid "28.8 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:624 +#: src/settings_menu.c:622 msgid "33.6 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:625 +#: src/settings_menu.c:623 msgid "34.4 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:626 +#: src/settings_menu.c:624 msgid "57.6 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:627 +#: src/settings_menu.c:625 msgid "115.2 Kbps (ISDN)" msgstr "" -#: src/settings_menu.c:628 +#: src/settings_menu.c:626 msgid "262.2 Kbps (Cable/DSL)" msgstr "" -#: src/settings_menu.c:629 +#: src/settings_menu.c:627 msgid "393.2 Kbps (Cable/DSL)" msgstr "" -#: src/settings_menu.c:630 +#: src/settings_menu.c:628 msgid "524.3 Kbps (Cable/DSL)" msgstr "" -#: src/settings_menu.c:631 +#: src/settings_menu.c:629 msgid "1.5 Mbps (T1)" msgstr "" -#: src/settings_menu.c:632 +#: src/settings_menu.c:630 msgid "10.5 Mbps (LAN)" msgstr "" -#: src/settings_menu.c:635 +#: src/settings_menu.c:633 msgid "TCP" msgstr "TCP" -#: src/settings_menu.c:636 +#: src/settings_menu.c:634 msgid "HTTP" msgstr "HTTP" -#: src/settings_menu.c:638 +#: src/settings_menu.c:636 msgid "MPEG track" msgstr "" -#: src/settings_menu.c:639 src/settings_menu.c:645 +#: src/settings_menu.c:637 src/settings_menu.c:643 msgid "entry" msgstr "" -#: src/settings_menu.c:640 +#: src/settings_menu.c:638 msgid "segment" msgstr "" -#: src/settings_menu.c:641 +#: src/settings_menu.c:639 msgid "playback-control item" msgstr "" -#: src/settings_menu.c:644 +#: src/settings_menu.c:642 #, fuzzy msgid "track" msgstr "Titulo:" -#: src/settings_menu.c:647 +#: src/settings_menu.c:645 #, fuzzy msgid "tiny" msgstr "Latín" -#: src/settings_menu.c:648 +#: src/settings_menu.c:646 msgid "small" msgstr "" -#: src/settings_menu.c:649 +#: src/settings_menu.c:647 #, fuzzy msgid "normal" msgstr "Somalí" -#: src/settings_menu.c:650 +#: src/settings_menu.c:648 msgid "large" msgstr "" -#: src/settings_menu.c:651 +#: src/settings_menu.c:649 msgid "very large" msgstr "" -#: src/settings_menu.c:652 +#: src/settings_menu.c:650 #, fuzzy msgid "huge" msgstr "Zhuang" -#: src/settings_menu.c:654 +#: src/settings_menu.c:652 msgid "Fast but not photorealistic" msgstr "" -#: src/settings_menu.c:655 +#: src/settings_menu.c:653 msgid "Slow but looks better" msgstr "" -#: src/settings_menu.c:657 +#: src/settings_menu.c:655 msgid "default" msgstr "" -#: src/settings_menu.c:658 +#: src/settings_menu.c:656 msgid "reverse" msgstr "" -#: src/settings_menu.c:659 +#: src/settings_menu.c:657 msgid "content" msgstr "" -#: src/settings_menu.c:660 +#: src/settings_menu.c:658 msgid "extension" msgstr "" -#: src/settings_menu.c:662 +#: src/settings_menu.c:660 msgid "probe" msgstr "" -#: src/settings_menu.c:663 +#: src/settings_menu.c:661 msgid "libc" msgstr "libc" -#: src/settings_menu.c:664 +#: src/settings_menu.c:662 msgid "kernel" msgstr "kernel" -#: src/settings_menu.c:665 +#: src/settings_menu.c:663 msgid "mmx" msgstr "mmx" -#: src/settings_menu.c:666 +#: src/settings_menu.c:664 msgid "mmxext" msgstr "mmxext" -#: src/settings_menu.c:667 +#: src/settings_menu.c:665 msgid "sse" msgstr "sse" -#: src/settings_menu.c:669 +#: src/settings_menu.c:667 msgid "Background Image" msgstr "" -#: src/settings_menu.c:670 +#: src/settings_menu.c:668 #, fuzzy msgid "Background Animation" msgstr "Saturación" -#: src/settings_menu.c:671 +#: src/settings_menu.c:669 msgid "Post Plugin" msgstr "" -#: src/settings_menu.c:673 +#: src/settings_menu.c:671 msgid "oscope" msgstr "oscope" -#: src/settings_menu.c:674 +#: src/settings_menu.c:672 msgid "fftscope" msgstr "fftscope" -#: src/settings_menu.c:675 +#: src/settings_menu.c:673 msgid "fftgraph" msgstr "fftgraph" -#: src/settings_menu.c:676 +#: src/settings_menu.c:674 msgid "goom" msgstr "goom" @@ -2838,6 +2851,15 @@ msgid "Music" msgstr "Música" +#~ msgid "Could not eject %s!" +#~ msgstr "¡No se pudo expulsar %s!" + +#~ msgid "use unscaled OSD if possible" +#~ msgstr "usa OSD sin escalar si posible" + +#~ msgid "Use unscaled (full screen resolution) OSD if possible" +#~ msgstr "usa OSD sin escalar (resolución pantalla completa) si es posible" + #, fuzzy #~ msgid "Corse" #~ msgstr "Irlandés" diff -Naur oxine-0.6.orig/po/fr.gmo oxine-0.6.3/po/fr.gmo --- oxine-0.6.orig/po/fr.gmo 2006-11-03 18:35:36.000000000 +0100 +++ oxine-0.6.3/po/fr.gmo 2006-11-22 10:56:28.000000000 +0100 @@ -1,68 +1,68 @@ -m)6267747BL7:7?7< -8AG8Q8:8|959099 : +:9:I:[:m::::: ::::; ;"; 4;>; B;O; T;^;c;l; s;}; -;; ;';;; ;;;; ; - <<,<+?<k<r<z< <<<<<<< -<<<< < < = =*=H2={= -= = ========== -= > - >> >(>1>N>!i>)>%>&>??$8?]?q??F?!?) @6@&T@{@@@@@A5ATAhAAA1A*A B$B:BSBsBBB BB%C&CMHMZM lMyM -M -MM!MAM@N[NdN jN tNNNNN NN N N N N!NO O O O )O3O;O AONOWO_O hOuOOO O OOO OOOO OO -O -P P P#P7PKPRP UPcP jPxP~PPPPPPPP Q Q Q,Q;QBQJQ -OQZQ4jQ!QQQQ%Q RR8RCSRIRRR -R S -SS S -(S 3SAS FSRSfSxSSSSSS SSSS ST T TTT 'T -1T U HUTU -jUuU{U U UUUU -U -UUUU -U -UUU VV %V)/V&YV+V/V$V)W&+W+RW/~W$W W W W W X X X +X 8XEXMXSX[XvXzXXXXXX XX\XjYj}Y7Y/ ZDPZ'Z&Z%Z' -[ 2[?[V[t[[[[[[ -[[[[[[\ \\ \3!\'U\"}\\ \ \\\+\!]=]D]]]b]5]]]]]] ]] -] - ^^ ^*^!1^S^ [^g^x^^^^^Y^P_f_ -u___%_____5_(`*`1`6`;`N`k``` ` -` -``!` aa6a;aPafa'aaa$aaa!a -bb b*bAbJbSblbbbbbbbbbbbbbcc3cPclcqcxc|c cc c&cccc d!d'd@dIdQdidyddddddd e e7eKe ^e he -ueeeeeeeeeee ff'f -DfOfcf{fff|f4>hsh!hhNhF"iIiiDiFiL?jFjj;Vk3kk kk -ll;lPlellll lllllmm2m:mBmUm Zmdmimrmym m -mm m3m mmmn nn n -&n1nEn8\nn nnnnn nnnn nno oo (o6oMo ]oLgoo oooooooo ppp -3p>p Qp -_p jptp}p%pp+pBp27q0jq$qq.q r'r)Grdqr0r:s'Bs4jsss)st($t#Mt?qtttt u7(uF`uuuu)u (v!Ivkv/v*v0vw#3wWw[wbw~wwwwwww wwww? xMx ]xgx~x -xx xxx xxx xxxxx y -"y-y6yFKR Xb W  $./6f Y'07= DPY^dlu{ ǂς -%( @Lh # - ǃ.փL`R Ä݄̈́27)>hnv} Džх  ':L S ]k o|  - -Ɔц - $*08U@ ͇   (;:*v)È *KKP   -(/ 7 ERX`y & -ފ()/ 5BIOagp -v*Ћ ֋ *2Oh x  -ƌό׌ 07=A ISZ -c n {  Ӎ>ߍ!-@1n)<ʎ ,(0U( Ə ӏ  !)/8VZbkry  ^WPR@:B8b3'ϒ1)0Edv  -Ɠ̓ӓړ  S1[$ɔٔ0?_#n@ " -,7 -K Vbkזߖ T`s ԗ$"*.6?=)}!͘ -$%J \i|$ڙ!-)Oy- Ú/˚ - 5>#Gk#śכۛ"@([( ͜Ԝ') 5K ht#{ ҝߝ#"=Zržڞ'-48I&f ՟- 1=Wnw_Ly!h"2CZU]b;~p*)]W[f<ch+HG'SBt@E,Dz I51-nY:Dn~ . ESAW: rvu-TQ=73H{v.JKoj m|QKuq.0N$%mC\+ -JthI &3 G -lXA?B8M -c|`}Yb{I8t$M>R[=w#)1*f9dOVY8!0;d)\xia~$z_Xnx?l>4}7o_VT? PHgZe#5ebw N(v^9O7Rj>1"QF/  +s 6LW@}p'o!zZ/U&cPENq;F,idJk4 3]^xu=L a|rkMk`2{ifGlK[j(:DyF XRP\Orgaqs-#B6A/&%,s"2V%<m`U0C9'TS45@pg<^e*6y( Available drivers: +lm(p62q6666B6:/7?j7<7A7Q)8:{8|85390i999 9999 ::6:H:O: _:l:~::::: :: :: ::; ; ;; +%;0; 7;'A;i;r; z;;;; ; +;;;+; <<< !<-<2<G<X<`<h< +o<z<<< < << <<H<= +"= -= ;=E=M=T=[=c=l=t=|== += = +======! >)+>%U>&{>>>$>>?F/?!v?)??&?@!@;@[@u@@5@@@A1&A*XAAAAAAB!B ;B\B%xBBBBBB BC CCCC!C )C5CEC [C |CC CCC CCCC CCCCCCCDD D*D3DK7DEE-E0EF"F2AF5tF%F,F7F5GPG XGeG +G +GGG +GGGGG$G*H:H KH YHfHmHuH {HHHHHHHHH HHHHH I III'I.I3I:I @IJIfI jItI I I IIsI}JJJ +J J J JJ)JK+K@KDFKKKKKKKKKK KKKKKKLL LLL&L .L V)cV&V+V/V$W 5W ?W LW YW fW sW W W WWWWWWWWWWWW XX\XjtXjX7JY/YDY'Y&Z%FZ'lZ ZZZZZ +[![)[2[ +8[C[I[P[W[^[f[n[r[ y[3['["[\ +\ \%\A\+W\\\\\\\\\\] ]] +*] +5]@] I]V]!]]] ]]]]]]]Y]PA^^ +^^^%^^^^^5^(-_V_]_b_g_z____ _ +_ +__!`5`I`b`g`|``'```$`aa!a +;aFa LaVamavaaaaaaaaaaaab bb3bJb_b|bbbbb bb bbbc c&c,cEcNcVcnc~cccccccd%dj3zjj jjjk#k8kMkhk}kk kkkkkkll"l*l=l BlLlQlZlal jl +tll l3l llllll m +mm-m8Dm}m mmmmm mmmm mmm mm nn5n EnLOnn nnnnnnnn nno +o&o 9o +Go Ro\oeo%koo+oBo2p0Rp$pp.pp)qd?q0q:q'r48rmrr)rr(r#s??sss s7sFt\tytt)t t!t u/@u*pu0u#uuuuv-v +G R +_j + ÅɅхUم/4= Xf ~ ;ӆ*:KS)\ ÇKP0 +Ȉ Ј ވ% 7A&P +w(‰ȉ Ήۉ +**>i oyÊˊ  1? +FQV_hp ɋЋ֋ڋ  +   !-AR l>x!-ٌ1)9<c ,0( H R _ l y ŽȎю   ".^4WP@<:}B834'h1‘ɑޑ) ;EN +T_elsz  S1$&KSbr0ؓ#+2Pfms z + + Ôהޔ/7 GhpTv`˕ ,9IO$Uz?)Ֆ !%Gb$} ԗ$2NSl!)ј٘- /# +S^ dn#Ùڙ#ߙ /3:?]z((ܚ  %,);e{ #ϛ؛ &#.Rm֜ +"3GW]dhy& ǝ 3?Ypr\Hxc"2|@VUZ^8{m')YS[c8` e'D~D$SBo=E(Au I1.*mY7@ky .BP=W6 mup-TQ=4/Hyq~+GGlghyMHr p{*-K!%lC\+FqhE &3CkT><>8I +_w`zUbxF4s  M;OX9v%}-&a6dKRV5,7a&Ywi ]|$w_Xi}s?i:1{3j[VQ;P|EdWb 5e_t N(s[z5L7Rj>1NF+  (n3IT@xk'n!Z/R#c}MAJn;B)d`J0 0]Zut:L azohJf\.vffGgKWe%:DtC +UNLXOq~g^lp)#?6A +,"!,r/S"9j]Q0?9#PO42<ob<^*2v$ Available drivers: device: %s filesystem: %s mountpoint: %s --verbose [=level] Set verbosity level. Default is 1. -A, --audio-driver Select audio driver by ID. -F, --no-fullscreen Do no start in fullscreen mode. @@ -76,7 +76,7 @@ -v, --version Display version. %a, %b %d / %H:%M(c) 2005 by the oxine project 1.5 Mbps (T1)10.5 Mbps (LAN)115.2 Kbps (ISDN)14.4 Kbps (Modem)19.2 Kbps (Modem)262.2 Kbps (Cable/DSL)28.8 Kbps (Modem)2D_Tex2D_Tex_Fragprog2D_Tex_Tiled33.6 Kbps (Modem)34.4 Kbps (Modem)393.2 Kbps (Cable/DSL)4:3524.3 Kbps (Cable/DSL)57.6 Kbps (Modem)AbkhazianAddAdd subtitleAfarAfrikaansAkanAlbanianAlbum:AltimeterAmharicAngle MenuArabicAragoneseAre we to show the quit confirm dialog?ArmenianArtist:Aspect RatioAssameseAudioAudio CDAudio ChannelAudio MenuAudio VisualizationAudio-Video OffsetAutomatically load subtitles if they exist.AvaricAvestanAymaraAzerbaijaniBackBackground AnimationBackground ImageBambaraBashkirBasqueBelarusianBengaliBihariBislamaBlowing dustBlowing sandBlowing snowfallBlowing sprayBosnianBoth libcurl and libmetar must be -installed for weather support to work!BretonBrightnessBroken cloudsBulgarianBurmeseCD-ROMCancelCatalanChamorroChechenChineseChoose an entry...ChuvashClear listClear skyConditionsContrastCornishCorsicanCould not connect to %s: %s!Could not create '%s': %s!Could not create LIRC thread: %s!Could not create disc polling thread: %s!Could not create joystick thread: %s!Could not create scheduler thread: %s!Could not create socket: %s!Could not create stream!Could not create weather thread: %s!Could not eject %s!Could not eject '%s': %s!Could not eject device!Could not find %s, trying to use default configuration file %s/lircrc.Could not find DVB channels file!Could not find a LIRC configuration file.Could not find demuxer pluginCould not free a cache entry for '%s'.Could not get pixel data!Could not initialize ODK!Could not initialize X threads!Could not inizialize OTK!Could not load main menu!Could not load mediamarks.Could not load palette, reverting to standard colors.Could not mount %s!Could not open '%s': %s!Could not open disc!Could not open display!Could not open or play background, leaving oxine!Could not perform codeset conversion (%s)!Could not play '%s': %s!Could not play title!Could not read '%s': %s!Could not read from server: %s!Could not read image '%s'!Could not remove '%s': %s!Could not resolve %s: %s!Could not retrieve weather data!Could not scale image '%s'!Could not send command to server: %s!Could not unmount %s!Could not write to '%s': %s!CreeCroatianCtrl + Alt + left/ rightCtrl + left/ rightCurrent titleCylinderCzechDVBDVDDanishDecoderDeinterlaceDelete subtitleDemuxer plugin failedDevices oxine tried to open are:Dew pointDivehiDrifting snowDrizzleDustDuststormDutchDzongkhaEastEdit SettingsEffectsEjectElapsed:EngineEnglishEnterEnv_Mapped_TorusEsc/ BackspaceEsperantoEstonianEweExamples for valid MRLs (media resource locator): +installed for weather support to work!BretonBrightnessBroken cloudsBulgarianBurmeseCD-ROMCancelCatalanChamorroChechenChineseChoose an entry...ChuvashClear listClear skyConditionsContrastCornishCorsicanCould not connect to %s: %s!Could not create '%s': %s!Could not create LIRC thread: %s!Could not create disc polling thread: %s!Could not create joystick thread: %s!Could not create scheduler thread: %s!Could not create socket: %s!Could not create stream!Could not create weather thread: %s!Could not eject '%s': %s!Could not eject device!Could not find %s, trying to use default configuration file %s/lircrc.Could not find DVB channels file!Could not find a LIRC configuration file.Could not find demuxer pluginCould not free a cache entry for '%s'.Could not get pixel data!Could not initialize ODK!Could not initialize X threads!Could not inizialize OTK!Could not load main menu!Could not load mediamarks.Could not load palette, reverting to standard colors.Could not open '%s': %s!Could not open disc!Could not open display!Could not open or play background, leaving oxine!Could not perform codeset conversion (%s)!Could not play '%s': %s!Could not play title!Could not read '%s': %s!Could not read from server: %s!Could not read image '%s'!Could not remove '%s': %s!Could not resolve %s: %s!Could not retrieve weather data!Could not scale image '%s'!Could not send command to server: %s!Could not write to '%s': %s!CreeCroatianCtrl + Alt + left/ rightCtrl + left/ rightCurrent titleCylinderCzechDVBDVDDanishDecoderDeinterlaceDelete subtitleDemuxer plugin failedDevices oxine tried to open are:Dew pointDivehiDrifting snowDrizzleDustDuststormDutchDzongkhaEastEdit SettingsEffectsEjectElapsed:EngineEnglishEnterEnv_Mapped_TorusEsc/ BackspaceEsperantoEstonianEweExamples for valid MRLs (media resource locator): File: 'path/foo.vob' '/path/foo.vob' 'file://path/foo.vob' @@ -90,9 +90,9 @@ for the changes to take effect!ItalianJapaneseJavaneseKannadaKanuriKashmiriKazakhKhmerKikuyuKinyarwandaKirghizKomiKongoKoreanKuanyamaKurdishLaoLast updateLatinLatvianLength:LetzeburgeschLimburganLingalaListen to MusicLithuanianLoading menu file '%s'...Loading palette file '%s'...Loop ModeLow drifting dustLow drifting sandLuba-KatangaMETAR ICAO location indicatorMPEG trackMacedonianMainmenuMake sure you have lircd running.Make sure you have the permissions to connect to the LIRC socket.Make sure you have the permissions to open the joystick devices.MalagasyMalayMalayalamMalformed MRLMalteseManxMaoriMarathiMarshalleseMediaMedia BrowserMedia-BrowserMenu toggleMiscellaneousMissing property (required) '%s'!MistMoldavianMongolianMono 1.0Move downMove upMusicMy FavoritesMy FilmsMy HomeMy MusicMy PlaylistsMy VDR RecordingsNauruNavahoNdebele NorthNdebele SouthNdongaNepaliNext PageNoNo discNo input pluginNormal ModeNorthNorth-EastNorth-WestNorthern SamiNorwegianNorwegian (Bokmål)Norwegian (Nynorsk)NyanjaOKOPTIONS are: OjibwaOld BulgarianOriyaOromoOssetianOvercastOverriding calculated monitor pixel aspect ratio with user provided value: %.02fPaliPanjabiParsing '%s' failed!Part MenuPartial fogPass ThroughPatches of fogPausedPersianPlayPlay a DVDPlay a Video CDPlay all titles in this folder and all subfolders...Play all titles in this folder...Play an Audio CDPlayingPlaylistPlease enter a name for the playlist:Please insert a DVD!Please insert a Video CD!Please insert an Audio CD!Please make sure, that your version of xine-lib can play PNG files.Please run 'jscalibrator -file %s -device %s' to calibrate your joystick.Please wait...PolishPortuguesePost PluginProvençalPushtoQuechuaQuit oxineRaeto-RomanceRainRainshowersReboot the computerRelative humidityRemovable DiscRemoveResetRetrieving weather data...RetryRomanianRoot MenuRoot node of '%s' must be '%s'!RundiRussianSVDRP errorSamoanSandSandstormSangoSanskritSardinianSaturationSave listScattered cloudsSelect device to eject:SerbianSettingsShallow fogShonaShow HelpShow Weather ReportShowersShowers of ice pelletsShowers of small hailShuffle ModeShutdownShutdown the computerSichuan YiSindhiSinhaleseSky coverSlovakSlovenianSlow MotionSlow but looks betterSmall HailSmokeSnowSnow GrainsSnowshowersSomaliSothoSouthSouth-EastSouth-WestSpaceSpanishSquallsStereo 2.0Stereo 2.1SubtitleSubtitle ChannelSubtitle MenuSubtitle OffsetSubtitlesSuccessfully started disc polling thread.Successfully started scheduler thread.Successfully started the LIRC input plugin.Successfully started the joystick input plugin.Successfully started weather thread.Successfully stopped disc polling thread.Successfully stopped scheduler thread.Successfully stopped the LIRC input plugin.Successfully stopped the joystick input plugin.Successfully stopped weather thread.SundaneseSurround 3.0Surround 4.0Surround 4.1Surround 5.0Surround 5.1Surround 6.0Surround 6.1Surround 7.1SwahiliSwatiSwedishSwitch computer to standbyTCPTagalogTahitianTajikTamilTatarTeluguTemperatureThaiThe METAR ICAO Location Indicator defines for which location the weather is to be displayed.The MRL of the background image that will be displayed if 'visual_anim.style' is set to 'Background Image'The MRL of the stream animation that will be displayed if 'visual_anim.style' is set to 'Stream Animation'The current video driver does not support unscaled OSD!The current video driver supports unscaled OSD!The current window manager supports 'Extended Window Manager Hints'.The height of the non-fullscreen windowThe width of the non-fullscreen windowThis is %s - A free Video-Player v%s This is not a valid VDR recordings MRL!ThunderstormThunderstorm with hailThunderstorm with ice pelletsThunderstorm with rainThunderstorm with small hailThunderstorm with snowTibetanTigrinyaTitleTitle MenuTongaTrack:TsongaTswanaTurkishTurkmenTwiUighurUkrainianUnable to find usable home directory, using '/tmp'.Unable to get status for file '%s': %s.Unable to read link '%s' file: %s.UnknownUnknown DiscUnknown errorUnknown name '%s' for node!Unknown parameter %d!Unknown parameter '%s' for type 'autoplay'!Unknown prefix to URL '%s'!UpdateUpdating weather data...UrduUsage: oxine [OPTIONS] [MRL] -Use unscaled (full screen resolution) OSD if possibleUser InterfaceUzbekVendaVideoVideo CDVideo DVDVideo Disc RecorderVietnameseVisibilityVolapükVolcanic AshVolumeWaiting for alternative stream...WalloonWatch FilmsWatch TelevisionWeatherWeather stationWell-developed Dust/Sand WhirlsWelshWestWhat audio post plugin is to be displayed if 'visual_anim.style' is set to 'Post Plugin'.What kind of visual output is to be displayed when playing an audio only stream.Wind directionWind speedWolofXhosaXinerama screen for fullscreen windowYear:YesYiddishYorubaYou should create a file containing mediamarks at %s!Your joystick has never been calibrated!ZhuangZoomZulu[M3U-Playlist: %s]activate an item or a buttonadjust audio offsetadjust stream speedadjust subtitle offsetadjust volumeanamorphicarrow keysask before leaving oxineaspect ratio of one monitor pixelaudio driver to useaudio visualization typeautobackground image MRLchange audio languagechange subtitle languagecommand that was selected the last timecontentdefaultdevices to poll (separate using ';')disabledenabledencode special characters in MRLsentire dvdentryextensionfast rewind / forewardfftgraphfftscopego back/ go up one levelgo to the DVD menusgoomhostname for SVDRP connectionhugekernellargelibcmetronom feedbackmmxmmxextmutednavigate the menusnext/ previous channelnext/ previous chapternext/ previous titlenon-fullscreen window heightnon-fullscreen window widthnonenormaloffonone chapteroscopepause/ playpercentage of fullscreen screen to useplay reloaded playlist on startplayback-control itemport for SVDRP connectionpost pluginprobereload playlist on startresamplereverseseek backward/ forewardseek in programseek in program chainsegmentselect an item in a listshell command (power off)shell command (reboot)shell command (standby)show the main menushow the music menushow the playback menushow the video menushow/ hide the OSDskip partskip programskip titlesmallsquaressestop the streamstream animation MRLsubtitle autoloadingtinytoggle aspect ratiotoggle deinterlacetoggle mute/ unmutetrackunknown language (%d)use unscaled OSD if possiblevery largevideo driver to usewhite-black-transparentwhite-none-translucidwhite-none-transparentyellow-black-transparentProject-Id-Version: oxine 0.5 +User InterfaceUzbekVendaVideoVideo CDVideo DVDVideo Disc RecorderVietnameseVisibilityVolapükVolcanic AshVolumeWaiting for alternative stream...WalloonWatch FilmsWatch TelevisionWeatherWeather stationWell-developed Dust/Sand WhirlsWelshWestWhat audio post plugin is to be displayed if 'visual_anim.style' is set to 'Post Plugin'.What kind of visual output is to be displayed when playing an audio only stream.Wind directionWind speedWolofXhosaXinerama screen for fullscreen windowYear:YesYiddishYorubaYou should create a file containing mediamarks at %s!Your joystick has never been calibrated!ZhuangZoomZulu[M3U-Playlist: %s]activate an item or a buttonadjust audio offsetadjust stream speedadjust subtitle offsetadjust volumeanamorphicarrow keysask before leaving oxineaspect ratio of one monitor pixelaudio driver to useaudio visualization typeautobackground image MRLchange audio languagechange subtitle languagecommand that was selected the last timecontentdefaultdevices to poll (separate using ';')disabledenabledencode special characters in MRLsentire dvdentryextensionfast rewind / forewardfftgraphfftscopego back/ go up one levelgo to the DVD menusgoomhostname for SVDRP connectionhugekernellargelibcmetronom feedbackmmxmmxextmutednavigate the menusnext/ previous channelnext/ previous chapternext/ previous titlenon-fullscreen window heightnon-fullscreen window widthnonenormaloffonone chapteroscopepause/ playplay reloaded playlist on startplayback-control itemport for SVDRP connectionpost pluginprobereload playlist on startresamplereverseseek backward/ forewardseek in programseek in program chainsegmentselect an item in a listshell command (power off)shell command (reboot)shell command (standby)show the main menushow the music menushow the playback menushow the video menushow/ hide the OSDskip partskip programskip titlesmallsquaressestop the streamstream animation MRLsubtitle autoloadingtinytoggle aspect ratiotoggle deinterlacetoggle mute/ unmutetrackunknown language (%d)very largevideo driver to usewhite-black-transparentwhite-none-translucidwhite-none-transparentyellow-black-transparentProject-Id-Version: oxine 0.5 Report-Msgid-Bugs-To: mschwerin@users.sf.net -POT-Creation-Date: 2006-11-03 18:35+0100 +POT-Creation-Date: 2006-11-22 10:56+0100 PO-Revision-Date: 2006-11-02 20:25+0100 Last-Translator: Maximilian Schwerin Language-Team: French @@ -114,7 +114,7 @@ -v, --version Affiche la version. %a, %b %d / %H:%M(c) 2005 par the oxine project. 1.5 Mbits/s (T1)10.5 Mbits/s (LAN)115.2 Kbits/s (ISDN/Numéris)14.4 Kbits/s (Modem)19.2 Kbits/s (Modem)262.2 Kbits/s (Câble/DSL)28.8 Kbits/s (Modem)2D_Tex2D_Tex_Fragprog2D_Tex_Tiled33.6 Kbits/s (Modem)34.4 Kbits/s (Modem)393.2 Kbits/s (Câble/DSL)4:3524.3 Kbits/s (Câble/DSL)57.6 kbits/s (Modem)AbkhazeAjouterAjouter Sous-titreAfarAfrikaansAkanAlbanaisAlbum:PressionAmhariqueMenu AngleArabeAragonaisAfficher la fenêtre de confirmation de fermeture ?ArménienArtiste:Rapport d'affichageAssamaisAudioCD AudioCanal AudioMenu AudioVisualisation AudioDécalage audio/vidéoCharge automatiquement les sous-titres, si ils existent.AvarAvestiqueAymaraAzériRetourAnimation de fondImage de fondBambaraBachkirBasqueBiélorusseBengaliBihariBichlamarPoussière et ventSable venteuxChute de neige et ventEmbruns et ventBosniaquelibcurl et libmetar doivent être -installés pour que la météo fonctionne!BretonBrillanceQuelques nuagesBulgareBirmanCD-ROMAnnulerCatalanChamorroTchétchèneChinoisChoisissez une entrée...TchouvacheSupprimer la listeCiel dégagéConditionsContrasteCorniqueCorseImpossible de se connecter à %s: %s!Impossible de créer '%s': %s!Impossible de créer le processus LIRC: %s!Impossible de créer un processus d'interrogation des disques: %s!Impossible de créer le processus de joystick: %s!Impossible de créer le processus scheduler: %s!Impossible de créer le socket : %s!Impossible de créer le flux!Impossible de créer le processus météo: %s!Impossible d'éjecter %s!Impossible d'éjecter '%s': %s!Impossible d'éjecter le périphérique !Impossible de trouver %s, tentative d'utilisation du fichier de configuration par défaut %s/lircrc.Impossible de trouver le fichier des canaux DVB!Impossible de trouver un fichier de configuration de LIRC.Impossible de trouver le plugin demuxerImpossible de libérer l'entrée du cache pour '%s'.Impossible de lire les pixels!Impossible d'initialiser ODK!Impossible d'initialiser les processus X!Impossible d'initialiser OTK!Impossible de charger le menu principal!Impossible d'ouvrir les mediamarks!Impossible de charger la palette, retour aux couleurs standard.Impossible de monter %s!Impossible d'ouvrir '%s': %s!Impossible d'ouvrir le disque!Impossible d'ouvrir l'affichage!Impossible d'ouvrir ou de jouer le fond, arret d'oxine!Impossible de réaliser la conversion de la table de caractères (%s)!Impossible de lire '%s': %s!Impossible de lire le titre!Impossible de lire '%s': %s!Impossible de lire depuis le serveur: %s!Impossible de lire l'image '%s'!Impossible de supprimer '%s': %s!Impossible de résoudre %s: %s!Impossible de récupérer les données météo!Impossible de redimensionner l'image '%s'!Impossible d'envoyer la commande au serveur: %s!Impossible de démonter %s!Impossible d'écrire dans '%s': %s!criCroateCtrl + Alt + gauche/ droiteCtrl + gauche/ droiteTitre en coursCylinderTchèqueDVBDVDDanoisDécodeurDésentrelacementSupprimer Sous-titreEchec du plugin demuxerLes périphériques sur lesquels oxine a tenté un accès sont:Point de roséeMaldivienAmoncellement de neigeBruinesPoussièreTempête de poussièreNéerlandaisDzongkhaEstRéglagesEffetsÉjecterÉcoulé:MoteurAnglaisEntrerEnv_Mapped_TorusEch/ Retour arrièreEspérantoEstonienÉwéExemples de MRL valides (Media Resource Locator) : +installés pour que la météo fonctionne!BretonBrillanceQuelques nuagesBulgareBirmanCD-ROMAnnulerCatalanChamorroTchétchèneChinoisChoisissez une entrée...TchouvacheSupprimer la listeCiel dégagéConditionsContrasteCorniqueCorseImpossible de se connecter à %s: %s!Impossible de créer '%s': %s!Impossible de créer le processus LIRC: %s!Impossible de créer un processus d'interrogation des disques: %s!Impossible de créer le processus de joystick: %s!Impossible de créer le processus scheduler: %s!Impossible de créer le socket : %s!Impossible de créer le flux!Impossible de créer le processus météo: %s!Impossible d'éjecter '%s': %s!Impossible d'éjecter le périphérique !Impossible de trouver %s, tentative d'utilisation du fichier de configuration par défaut %s/lircrc.Impossible de trouver le fichier des canaux DVB!Impossible de trouver un fichier de configuration de LIRC.Impossible de trouver le plugin demuxerImpossible de libérer l'entrée du cache pour '%s'.Impossible de lire les pixels!Impossible d'initialiser ODK!Impossible d'initialiser les processus X!Impossible d'initialiser OTK!Impossible de charger le menu principal!Impossible d'ouvrir les mediamarks!Impossible de charger la palette, retour aux couleurs standard.Impossible d'ouvrir '%s': %s!Impossible d'ouvrir le disque!Impossible d'ouvrir l'affichage!Impossible d'ouvrir ou de jouer le fond, arret d'oxine!Impossible de réaliser la conversion de la table de caractères (%s)!Impossible de lire '%s': %s!Impossible de lire le titre!Impossible de lire '%s': %s!Impossible de lire depuis le serveur: %s!Impossible de lire l'image '%s'!Impossible de supprimer '%s': %s!Impossible de résoudre %s: %s!Impossible de récupérer les données météo!Impossible de redimensionner l'image '%s'!Impossible d'envoyer la commande au serveur: %s!Impossible d'écrire dans '%s': %s!criCroateCtrl + Alt + gauche/ droiteCtrl + gauche/ droiteTitre en coursCylinderTchèqueDVBDVDDanoisDécodeurDésentrelacementSupprimer Sous-titreEchec du plugin demuxerLes périphériques sur lesquels oxine a tenté un accès sont:Point de roséeMaldivienAmoncellement de neigeBruinesPoussièreTempête de poussièreNéerlandaisDzongkhaEstRéglagesEffetsÉjecterÉcoulé:MoteurAnglaisEntrerEnv_Mapped_TorusEch/ Retour arrièreEspérantoEstonienÉwéExemples de MRL valides (Media Resource Locator) : Fichier: 'chemin/fichier.vob' '/chemin/fichier.vob' 'file://chemin/fichier.vob' @@ -128,4 +128,4 @@ pour que les changements soient effectifs!ItalienJaponaisJavanaisKannaraKanouriKashmiriKazakhKhmerKikuyuKinyarwandaKirghizeKomiKongoCoréenKuanyamaKurdeLaoDernière mise à jourLatinLettonDurée:LuxembourgeoisLimbourgeoisLingalaÉcouter de la musiqueLithuanienChargement du fichier de menu '%s'...Chargement du fichier de palette '%s'...Mode BoucleAmoncellement de poussièreAmoncellement de sableLuba-katangaIndicateur d'emplacement METAR ICAOMPEG trackMacédonienMenu principalVérifiez que lircd est en cours d'exécution.Vérifiez que vous avez les permissions de vous connectez au socket de LIRC.Vérifiez que vous avez les permissions nécessaires pour accéder aux périphériques joystick.MalgacheMalaisMalayalamMRL mal forméeMaltaisManxMaoriMaratheMarshallMédiaNavigateur de MédiaNavigateur de MédiaMenuDiversPropriété manquante (obligatoire) '%s'!BrumeMoldaveMongolMono 1.0Déplacer vers le BasDéplacer vers le HautMusiqueMes FavorisMes FilmsDossiers PersonnelsMes MusiquesMes PlaylistsMes Enregistrements VDRNauruanNavahoNdébélé du NordNdébélé du SudNdongaNépalaisPage suivanteNonAucun disquePas de plugin d'entréeMode NormalNordNord-EstNord-OuestSami du nordNorvégienNorvégien (Bokmål)Norvégien (Nyorsk)NyanjaOKOPTIONS : OjibwaVieux BulgareOriyaGallaOssèteCouvertRemplacement du rapport d'aspect d'un pixel moniteur par la valeur utilisateur :%.02fPaliPendjabiLecture de '%s' échouée!Menu ChapitreBrouillard intermittentPass ThroughNappes de brouillardPausePersanLectureLire un DVDLire un CD VidéoJouer tous les titres de ce dossier et ses sous-dossiers...Jouer tous les titres de ce répertoire...Lire un CD AudioLecturePlaylistVeuillez entrer un nom pour la playlist :Veuillez introduire un DVD!Veuillez introduire un CD video!Veuillez introduire un CD audio!Merci de vérifier que votre version de xine-lib supporte les fichiers PNG.Merci de lancer 'jscalibrator -file %s -device %s' pour calibrer votre joystick.Veuillez patienter...PolonaisPortugaispost pluginProvençalPachtoQuechuaQuitter oxineRhéto-RomanPluieAversesRedémarrer l'ordinateurHumidité relativeDisque éjectableSupprimerRéinitialiserRécupération des données météo...RéessayerRoumainMenu PrincipalLe noeud racine de '%s' doit être '%s'!RundiRusseErreur SVDRPSamoanSableTempête de sableSangoSanskritSardeSaturationSauver la listeNuages disséminésChoisissez un périphérique à éjecter :SerbeRéglagesBrouillard superficielShonaAfficher l'AideAfficher le bulletin MétéoAversesAverses de granules de glaceAverses de petite grêleMode AléatoireÉteindreEteindre l'ordinateurYi de SichuanSindhiSinghalaisCielSlovaqueSlovèneRalentiLent mais plus beauPetite grêleFuméeNeigeFlocons de neigePrécipitations de neigeSomaliSothoSudSud-EstSud-OuestEspaceEspagnolBourrasqueStéréo 2.0Stéréo 2.1Sous-titresCanal de sous-titreMenu Sous-titresDécalage des sous-titresSous-titresProcéssus d'interrogation des disques démarré avec succès.Scheduler démarré avec succès.Plugin d'entrée LIRC démarré avec succès.Plugin d'entrée joystick démarré avec succés.Processus météo démarré avec succès.Processus d'interrogation des disques arrêté avec succès.Scheduler arrêté avec succès.Plugin d'entrée LIRC arrêté avec succès.Plugin d'entrée joystick arrêté avec succés.Processus météo arrêté avec succès.SoudanaisSurround 3.0Surround 4.0Surround 4.1Surround 5.0Surround 5.1Surround 6.0Surround 6.1Surround 7.1SwahiliSwatiSuédoisMettre l'ordinateur en veilleTCPTagalogTahitienTadjikTamoulTatarTélougouTemperatureThaïL'indicateur d'emplacement METAR ICAO définit pour quel lieu la météo doit être affichée.La MRL de l'image de fond sera affichée si 'visual_anim.style' vaut 'Background Image'La MRL d'animation sera affichée si 'visual_anim.style' vaut 'Stream Animation'Le driver vidéo actuel ne support par l'OSD non redimensionné!Le driver vidéo actuel supporte l'OSD non redimensionné!Le window manager actuel supporte 'Extended Window Manager Hints'.La hauteur de la fenêtre en dehors du mode plein écranLa largeur de la fenêtre en dehors du plein écranVoici %s - un lecteur vidéo libre v%s Ce n'est pas une MRL d'enregistrement VDR valide!OragesOrages avec grêlonsOrages avec granules de glacesOrages avec pluieOrages avec petite grêleOrages avec neigeTibétainTigrignaTitreMenu TitreTongaPiste:TsongaTswanaTurcTurkmèneTwiOuïgourUkrainienImpossible de trouver un répertoire utilisateur utilisable, utilisation de '/tmp'.Impossible d'obtenir l'état du fichier '%s': %s.Impossible de lire le lien '%s': %s.InconnuDisque InconnuErreur inconnueNom inconnu '%s' comme noeud!Paramètre inconnu %d!Paramètre inconnu '%s' pour le type 'autoplay'!Préfixe de l'URL inconnu '%s'!Mettre à jourMise à jour des donnée météo...OurdouUsage: oxine [OPTIONS] [MRL] -utilise l'OSD non redimensionné (mode plein écran) si possibleInterface UtilisateurOuzbekVendaVidéoCD VidéoDVD VidéoVideo Disc RecorderVietnamienVisibilitéVolapükCendres volcaniquesVolumeEn attente d'un autre flux...WallonRegarder des filmsRegarder la télévisionMétéoStation météoTourbillions de poussière/sableGalloisOuestQuel post plugin audio doit être affiché si 'visual_anim.style' vaut 'Post Plugin'Quel genre de sortie visuelle doit être utilisée lors de la lecture des flux uniquement audio.Sens du ventVitesse du ventWolofXhosaécran xinerama pour le plein écranAnnée:OuiYiddishYorubaVous devriez créer un ficher contenant les mediamarks dans %s!Votre joystick n'a jamais été calibré!ZhuangZoomZoulou[Playlist M3U: %s]activer un élément ou un boutonajuster le décalage audioajuster la vitesse du fluxajuster le décalage des sous-titresajuster le volumeanamorphiquetouches fléchéesdemander avant de quitter oxinerapport d'aspect d'un pixel moniteurpilote audio à utilisertype de visualisation audioautoMRL pour l'image de fondchanger le langage audiochanger la langue des sous-titrescommande sélectionnée la dernière foiscontenudéfautpériphériques à sonder (séparer avec ';')désactivéactivéencoder les caractères spéciaux dans les MRLsDVD entierentryextentionretour arrière/ avance rapidefftgraphfftscopeniveau précédent / niveau suivantaller aux menus du DVDgoomnom d'hôte pour la connexion SVDRPénormekernellargelibcmetronom feedbackmmxmmxextmuetnaviguer à travers les menuscanal suivante/ précédentechapitre suivant/ précédenttitre suivant/ précédenthauteur de la fenêtre hors plein écranlargeur de la fenêtre hors plein écranaucunnormaloffonun chapitreoscopepause/ lecturepourcentage du plein écran à utiliserlire la playlist rechargée au démarrageplayback-control itemPort pour la connexion SVDRPpost pluginsonderrecharger la playlist au démarrageresampleinversérechercher en avant/ en arrièrele programmela chaîne de programesegmentchoisir un élément dans une listecommande shell (éteindre)commande shell (redémarrer)commande shell (veille)afficher le menu principalafficher le menu musiqueafficher le menu de lectureafficher le menu vidéoafficher/ chacher l'OSDsauter la partiesauter le programmesauter le titrepetitcarréssearrêter le fluxMRL pour l'animation du fondchargement automatique des sous-titresminusculealterner le rapport d'affichagealterner le désentrelacementalterner muet/ sontracklangue inconnue (%d)utiliser l'OSD non redimensionné si possibletrès largepilote vidéo à utiliserblanc-noir-transparentblanc-non-translucideblanc-non-transparentjaune-noir-transparent \ Kein Zeilenumbruch am Dateiende. +Interface UtilisateurOuzbekVendaVidéoCD VidéoDVD VidéoVideo Disc RecorderVietnamienVisibilitéVolapükCendres volcaniquesVolumeEn attente d'un autre flux...WallonRegarder des filmsRegarder la télévisionMétéoStation météoTourbillions de poussière/sableGalloisOuestQuel post plugin audio doit être affiché si 'visual_anim.style' vaut 'Post Plugin'Quel genre de sortie visuelle doit être utilisée lors de la lecture des flux uniquement audio.Sens du ventVitesse du ventWolofXhosaécran xinerama pour le plein écranAnnée:OuiYiddishYorubaVous devriez créer un ficher contenant les mediamarks dans %s!Votre joystick n'a jamais été calibré!ZhuangZoomZoulou[Playlist M3U: %s]activer un élément ou un boutonajuster le décalage audioajuster la vitesse du fluxajuster le décalage des sous-titresajuster le volumeanamorphiquetouches fléchéesdemander avant de quitter oxinerapport d'aspect d'un pixel moniteurpilote audio à utilisertype de visualisation audioautoMRL pour l'image de fondchanger le langage audiochanger la langue des sous-titrescommande sélectionnée la dernière foiscontenudéfautpériphériques à sonder (séparer avec ';')désactivéactivéencoder les caractères spéciaux dans les MRLsDVD entierentryextentionretour arrière/ avance rapidefftgraphfftscopeniveau précédent / niveau suivantaller aux menus du DVDgoomnom d'hôte pour la connexion SVDRPénormekernellargelibcmetronom feedbackmmxmmxextmuetnaviguer à travers les menuscanal suivante/ précédentechapitre suivant/ précédenttitre suivant/ précédenthauteur de la fenêtre hors plein écranlargeur de la fenêtre hors plein écranaucunnormaloffonun chapitreoscopepause/ lecturelire la playlist rechargée au démarrageplayback-control itemPort pour la connexion SVDRPpost pluginsonderrecharger la playlist au démarrageresampleinversérechercher en avant/ en arrièrele programmela chaîne de programesegmentchoisir un élément dans une listecommande shell (éteindre)commande shell (redémarrer)commande shell (veille)afficher le menu principalafficher le menu musiqueafficher le menu de lectureafficher le menu vidéoafficher/ chacher l'OSDsauter la partiesauter le programmesauter le titrepetitcarréssearrêter le fluxMRL pour l'animation du fondchargement automatique des sous-titresminusculealterner le rapport d'affichagealterner le désentrelacementalterner muet/ sontracklangue inconnue (%d)très largepilote vidéo à utiliserblanc-noir-transparentblanc-non-translucideblanc-non-transparentjaune-noir-transparent \ Kein Zeilenumbruch am Dateiende. diff -Naur oxine-0.6.orig/po/fr.po oxine-0.6.3/po/fr.po --- oxine-0.6.orig/po/fr.po 2006-11-03 18:35:36.000000000 +0100 +++ oxine-0.6.3/po/fr.po 2006-11-22 10:56:28.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: oxine 0.5\n" "Report-Msgid-Bugs-To: mschwerin@users.sf.net\n" -"POT-Creation-Date: 2006-11-03 18:35+0100\n" +"POT-Creation-Date: 2006-11-22 10:56+0100\n" "PO-Revision-Date: 2006-11-02 20:25+0100\n" "Last-Translator: Maximilian Schwerin \n" "Language-Team: French \n" @@ -22,20 +22,20 @@ msgid "Could not perform codeset conversion (%s)!" msgstr "Impossible de réaliser la conversion de la table de caractères (%s)!" -#: src/disc.c:122 src/disc.c:323 src/disc.c:625 src/environment.c:819 -#: src/environment.c:837 src/filelist.c:805 src/mediamarks_favorites.c:98 -#: src/meta_info.c:85 src/odk.c:1020 src/odk.c:1103 src/odk_osd.c:806 -#: src/odk_osd.c:855 src/playlist_m3u.c:109 src/playlist_xml.c:55 -#: src/weather.c:122 +#: src/disc.c:122 src/disc.c:301 src/disc.c:326 src/disc.c:628 +#: src/environment.c:829 src/environment.c:847 src/filelist.c:805 +#: src/mediamarks_favorites.c:98 src/meta_info.c:85 src/odk.c:1020 +#: src/odk.c:1105 src/odk_osd.c:831 src/odk_osd.c:880 src/playlist_m3u.c:109 +#: src/playlist_xml.c:55 src/weather.c:122 #, c-format msgid "Could not open '%s': %s!" msgstr "Impossible d'ouvrir '%s': %s!" -#: src/disc.c:213 src/disc.c:473 src/filelist.c:736 +#: src/disc.c:213 src/disc.c:474 src/filelist.c:736 msgid "Audio CD" msgstr "CD Audio" -#: src/disc.c:229 src/filelist.c:734 src/main_menu.c:238 +#: src/disc.c:229 src/filelist.c:734 src/main_menu.c:253 src/main_menu.c:269 msgid "Video CD" msgstr "CD Vidéo" @@ -59,40 +59,39 @@ msgid "Unknown Disc" msgstr "Disque Inconnu" -#: src/disc.c:371 -#, c-format -msgid "Could not mount %s!" -msgstr "Impossible de monter %s!" +#: src/disc.c:374 +#, fuzzy, c-format +msgid "Could not mount '%s': %s!" +msgstr "Impossible d'ouvrir '%s': %s!" -#: src/disc.c:391 -#, c-format -msgid "Could not unmount %s!" -msgstr "Impossible de démonter %s!" +#: src/disc.c:374 src/disc.c:394 src/disc.c:414 src/lang.c:506 +msgid "Unknown" +msgstr "Inconnu" -#: src/disc.c:411 -#, c-format -msgid "Could not eject %s!" -msgstr "Impossible d'éjecter %s!" +#: src/disc.c:394 +#, fuzzy, c-format +msgid "Could not unmount '%s': %s!" +msgstr "Impossible de démonter %s!" -#: src/disc.c:419 src/disc.c:425 +#: src/disc.c:414 src/disc.c:422 src/disc.c:427 #, c-format msgid "Could not eject '%s': %s!" msgstr "Impossible d'éjecter '%s': %s!" -#: src/disc.c:474 +#: src/disc.c:475 msgid "Title" msgstr "Titre" -#: src/disc.c:671 +#: src/disc.c:688 #, c-format msgid "Could not create disc polling thread: %s!" msgstr "Impossible de créer un processus d'interrogation des disques: %s!" -#: src/disc.c:673 +#: src/disc.c:691 msgid "Successfully started disc polling thread." msgstr "Procéssus d'interrogation des disques démarré avec succès." -#: src/disc.c:685 +#: src/disc.c:703 msgid "Successfully stopped disc polling thread." msgstr "Processus d'interrogation des disques arrêté avec succès." @@ -105,7 +104,7 @@ msgid "Unknown prefix to URL '%s'!" msgstr "Préfixe de l'URL inconnu '%s'!" -#: src/download.c:227 src/environment.c:612 +#: src/download.c:227 src/environment.c:622 #, c-format msgid "Could not create '%s': %s!" msgstr "Impossible de créer '%s': %s!" @@ -143,61 +142,61 @@ msgid "Part Menu" msgstr "Menu Chapitre" -#: src/environment.c:135 src/environment.c:268 src/environment.c:586 -#: src/environment.c:593 src/environment.c:825 +#: src/environment.c:141 src/environment.c:289 src/environment.c:596 +#: src/environment.c:603 src/environment.c:835 #, c-format msgid "Unable to get status for file '%s': %s." msgstr "Impossible d'obtenir l'état du fichier '%s': %s." -#: src/environment.c:144 src/environment.c:278 +#: src/environment.c:153 #, c-format msgid "Unable to read link '%s' file: %s." msgstr "Impossible de lire le lien '%s': %s." -#: src/environment.c:218 +#: src/environment.c:230 msgid "Found a device we are interested in:" msgstr "Périphérique intéressant trouvé :" -#: src/environment.c:219 +#: src/environment.c:231 #, c-format msgid " device: %s" msgstr " périphérique: %s" -#: src/environment.c:220 +#: src/environment.c:232 #, c-format msgid " mountpoint: %s" msgstr " point de montage: %s" -#: src/environment.c:221 +#: src/environment.c:233 #, c-format msgid " filesystem: %s" msgstr " système de fichiers: %s" -#: src/environment.c:413 +#: src/environment.c:423 msgid "Unable to find usable home directory, using '/tmp'." msgstr "" "Impossible de trouver un répertoire utilisateur utilisable, utilisation de '/" "tmp'." -#: src/environment.c:831 +#: src/environment.c:841 #, c-format msgid "File '%s' is empty!" msgstr "Le fichier '%s' est vide!" -#: src/environment.c:848 +#: src/environment.c:858 #, c-format msgid "Could not read '%s': %s!" msgstr "Impossible de lire '%s': %s!" -#: src/environment.c:930 src/environment.c:931 +#: src/environment.c:940 src/environment.c:941 msgid "devices to poll (separate using ';')" msgstr "périphériques à sonder (séparer avec ';')" -#: src/event.c:635 src/gui_utils.c:465 +#: src/event.c:681 src/gui_utils.c:492 msgid "Could not play title!" msgstr "Impossible de lire le titre!" -#: src/event.c:639 +#: src/event.c:685 msgid "Waiting for alternative stream..." msgstr "En attente d'un autre flux..." @@ -218,7 +217,7 @@ msgid "[M3U-Playlist: %s]" msgstr "[Playlist M3U: %s]" -#: src/filelist.c:732 src/main_menu.c:276 +#: src/filelist.c:732 src/main_menu.c:303 src/main_menu.c:319 msgid "DVD" msgstr "DVD" @@ -238,118 +237,146 @@ msgid "My VDR Recordings" msgstr "Mes Enregistrements VDR" -#: src/filelist_menu.c:135 +#: src/filelist_menu.c:127 msgid "Reset" msgstr "Réinitialiser" -#: src/filelist_menu.c:137 src/filelist_menu.c:818 src/playlist_menu.c:1028 +#: src/filelist_menu.c:132 src/filelist_menu.c:139 src/filelist_menu.c:146 +#: src/filelist_menu.c:151 src/filelist_menu.c:834 src/playlist_menu.c:1041 msgid "Remove" msgstr "Supprimer" -#: src/filelist_menu.c:145 src/main_menu.c:465 -msgid "Eject" -msgstr "Éjecter" - -#: src/filelist_menu.c:237 +#: src/filelist_menu.c:250 msgid "Play all titles in this folder and all subfolders..." msgstr "Jouer tous les titres de ce dossier et ses sous-dossiers..." -#: src/filelist_menu.c:243 +#: src/filelist_menu.c:256 msgid "Play all titles in this folder..." msgstr "Jouer tous les titres de ce répertoire..." -#: src/filelist_menu.c:367 src/filelist_menu.c:575 src/playlist_menu.c:245 -#: src/playlist_menu.c:410 +#: src/filelist_menu.c:385 src/filelist_menu.c:591 src/playlist_menu.c:255 +#: src/playlist_menu.c:420 msgid "Choose an entry..." msgstr "Choisissez une entrée..." -#: src/filelist_menu.c:398 src/filelist_menu.c:408 src/filelist_menu.c:710 +#: src/filelist_menu.c:416 src/filelist_menu.c:426 src/filelist_menu.c:726 #, c-format msgid "Could not remove '%s': %s!" msgstr "Impossible de supprimer '%s': %s!" -#: src/filelist_menu.c:409 +#: src/filelist_menu.c:427 msgid "SVDRP error" msgstr "Erreur SVDRP" -#: src/filelist_menu.c:446 src/playlist_menu.c:295 +#: src/filelist_menu.c:462 src/playlist_menu.c:305 msgid "Could not open disc!" msgstr "Impossible d'ouvrir le disque!" -#: src/filelist_menu.c:810 src/playlist_menu.c:1010 +#: src/filelist_menu.c:826 src/playlist_menu.c:1023 msgid "Play" msgstr "Lecture" -#: src/filelist_menu.c:814 src/playlist_menu.c:540 src/playlist_menu.c:1023 +#: src/filelist_menu.c:830 src/playlist_menu.c:550 src/playlist_menu.c:1036 msgid "Add" msgstr "Ajouter" -#: src/filelist_menu.c:822 src/playback_menu.c:1053 src/settings_menu.c:511 +#: src/filelist_menu.c:838 src/main_menu.c:524 +msgid "Eject" +msgstr "Éjecter" + +#: src/filelist_menu.c:842 src/playback_menu.c:1076 src/settings_menu.c:509 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:77 msgid "Playlist" msgstr "Playlist" -#: src/filelist_menu.c:826 src/playback_menu.c:1047 src/playlist_menu.c:1053 -#: src/settings_menu.c:539 src/weather_menu.c:164 +#: src/filelist_menu.c:846 src/playback_menu.c:1070 src/playlist_menu.c:1066 +#: src/settings_menu.c:537 src/weather_menu.c:164 msgid "Mainmenu" msgstr "Menu principal" -#: src/filelist_menu.c:830 src/main_menu.c:481 src/playlist_menu.c:1057 +#: src/filelist_menu.c:850 src/main_menu.c:540 src/playlist_menu.c:1070 msgid "Current title" msgstr "Titre en cours" -#: src/filelist_menu.c:945 +#: src/filelist_menu.c:965 msgid "Could not load mediamarks." msgstr "Impossible d'ouvrir les mediamarks!" -#: src/filelist_menu.c:946 +#: src/filelist_menu.c:966 #, c-format msgid "You should create a file containing mediamarks at %s!" msgstr "Vous devriez créer un ficher contenant les mediamarks dans %s!" -#: src/filelist_menu.c:980 src/filelist_menu.c:1013 src/filelist_menu.c:1044 +#: src/filelist_menu.c:1000 src/filelist_menu.c:1033 src/filelist_menu.c:1064 #: src/gui_utils.h:65 msgid "Please wait..." msgstr "Veuillez patienter..." -#: src/gui_utils.c:193 +#: src/gui_utils.c:195 msgid "Could not open or play background, leaving oxine!" msgstr "Impossible d'ouvrir ou de jouer le fond, arret d'oxine!" -#: src/gui_utils.c:194 +#: src/gui_utils.c:196 msgid "Please make sure, that your version of xine-lib can play PNG files." msgstr "" "Merci de vérifier que votre version de xine-lib supporte les fichiers PNG." -#: src/gui_utils.c:391 src/gui_utils.c:398 src/main_menu.c:381 -#: src/playlist_menu.c:950 +#: src/gui_utils.c:393 src/gui_utils.c:400 src/main_menu.c:419 +#: src/playlist_menu.c:963 msgid "OK" msgstr "OK" -#: src/gui_utils.c:403 src/gui_utils.c:425 src/main_menu.c:385 -#: src/main_menu.c:469 src/playlist_menu.c:953 +#: src/gui_utils.c:405 src/gui_utils.c:427 src/main_menu.c:423 +#: src/main_menu.c:528 src/playlist_menu.c:966 msgid "Cancel" msgstr "Annuler" -#: src/gui_utils.c:409 +#: src/gui_utils.c:411 msgid "Yes" msgstr "Oui" -#: src/gui_utils.c:414 +#: src/gui_utils.c:416 msgid "No" msgstr "Non" -#: src/gui_utils.c:420 +#: src/gui_utils.c:422 msgid "Retry" msgstr "Réessayer" -#: src/help_menu.c:43 src/playback_menu.c:473 src/playback_menu.c:527 -#: src/settings_menu.c:462 +#: src/gui_utils.c:478 +#, fuzzy +msgid "Could not play Audio CD!" +msgstr "Impossible de lire le titre!" + +#: src/gui_utils.c:479 src/main_menu.c:213 +msgid "Please insert an Audio CD!" +msgstr "Veuillez introduire un CD audio!" + +#: src/gui_utils.c:483 +#, fuzzy +msgid "Could not play Video CD!" +msgstr "Impossible de lire le titre!" + +#: src/gui_utils.c:484 src/main_menu.c:263 +msgid "Please insert a Video CD!" +msgstr "Veuillez introduire un CD video!" + +#: src/gui_utils.c:488 +#, fuzzy +msgid "Could not play DVD!" +msgstr "Impossible de lire le titre!" + +#: src/gui_utils.c:489 src/main_menu.c:313 +msgid "Please insert a DVD!" +msgstr "Veuillez introduire un DVD!" + +#: src/help_menu.c:43 src/playback_menu.c:490 src/playback_menu.c:549 +#: src/settings_menu.c:460 msgid "Next Page" msgstr "Page suivante" -#: src/help_menu.c:49 src/playback_menu.c:477 src/playback_menu.c:531 -#: src/playback_menu.c:535 src/playlist_menu.c:543 src/settings_menu.c:467 +#: src/help_menu.c:49 src/playback_menu.c:494 src/playback_menu.c:553 +#: src/playback_menu.c:557 src/playlist_menu.c:553 src/settings_menu.c:465 msgid "Back" msgstr "Retour" @@ -1217,101 +1244,90 @@ msgid "Zulu" msgstr "Zoulou" -#: src/lang.c:506 -msgid "Unknown" -msgstr "Inconnu" - #: src/main_menu.c:71 msgid "Could not find DVB channels file!" msgstr "Impossible de trouver le fichier des canaux DVB!" -#: src/main_menu.c:207 -msgid "Please insert an Audio CD!" -msgstr "Veuillez introduire un CD audio!" - -#: src/main_menu.c:245 -msgid "Please insert a Video CD!" -msgstr "Veuillez introduire un CD video!" - -#: src/main_menu.c:283 -msgid "Please insert a DVD!" -msgstr "Veuillez introduire un DVD!" - -#: src/main_menu.c:328 +#: src/main_menu.c:366 msgid "How do you want to proceed?" msgstr "Comment voulez-vous procéder ?" -#: src/main_menu.c:342 +#: src/main_menu.c:380 msgid "Quit oxine" msgstr "Quitter oxine" -#: src/main_menu.c:351 +#: src/main_menu.c:389 msgid "Shutdown the computer" msgstr "Eteindre l'ordinateur" -#: src/main_menu.c:360 +#: src/main_menu.c:398 msgid "Switch computer to standby" msgstr "Mettre l'ordinateur en veille" -#: src/main_menu.c:369 +#: src/main_menu.c:407 msgid "Reboot the computer" msgstr "Redémarrer l'ordinateur" -#: src/main_menu.c:427 +#: src/main_menu.c:472 +#, fuzzy +msgid "Could not unmount device!" +msgstr "Impossible de démonter %s!" + +#: src/main_menu.c:476 msgid "Could not eject device!" msgstr "Impossible d'éjecter le périphérique !" -#: src/main_menu.c:449 +#: src/main_menu.c:508 msgid "Select device to eject:" msgstr "Choisissez un périphérique à éjecter :" -#: src/main_menu.c:593 +#: src/main_menu.c:652 msgid "Listen to Music" msgstr "Écouter de la musique" -#: src/main_menu.c:594 +#: src/main_menu.c:653 msgid "Watch Films" msgstr "Regarder des films" -#: src/main_menu.c:595 +#: src/main_menu.c:654 msgid "Watch Television" msgstr "Regarder la télévision" -#: src/main_menu.c:596 +#: src/main_menu.c:655 msgid "Play a DVD" msgstr "Lire un DVD" -#: src/main_menu.c:597 +#: src/main_menu.c:656 msgid "Play a Video CD" msgstr "Lire un CD Vidéo" -#: src/main_menu.c:598 +#: src/main_menu.c:657 msgid "Play an Audio CD" msgstr "Lire un CD Audio" -#: src/main_menu.c:599 +#: src/main_menu.c:658 msgid "Show Help" msgstr "Afficher l'Aide" -#: src/main_menu.c:600 +#: src/main_menu.c:659 msgid "Show Weather Report" msgstr "Afficher le bulletin Météo" -#: src/main_menu.c:601 +#: src/main_menu.c:660 msgid "Edit Settings" msgstr "Réglages" -#: src/main_menu.c:602 src/settings_menu.c:512 +#: src/main_menu.c:661 src/settings_menu.c:510 msgid "Shutdown" msgstr "Éteindre" -#: src/main_menu.c:624 +#: src/main_menu.c:683 msgid "Could not load main menu!" msgstr "Impossible de charger le menu principal!" #: src/mediamarks.c:103 src/mediamarks.c:139 src/menulist.c:140 -#: src/menulist.c:186 src/otk.c:3560 src/otk.c:3565 src/otk.c:3622 -#: src/otk.c:3627 src/playlist_xml.c:141 src/playlist_xml.c:176 +#: src/menulist.c:186 src/otk.c:3597 src/otk.c:3602 src/otk.c:3659 +#: src/otk.c:3664 src/playlist_xml.c:141 src/playlist_xml.c:176 #, c-format msgid "Unknown name '%s' for node!" msgstr "Nom inconnu '%s' comme noeud!" @@ -1320,13 +1336,13 @@ msgid "Found an entry that did not contain a MRL!" msgstr "Entrée sans MRL trouvée!" -#: src/mediamarks.c:159 src/menulist.c:207 src/otk.c:3591 +#: src/mediamarks.c:159 src/menulist.c:207 src/otk.c:3628 #: src/playlist_xml.c:196 #, c-format msgid "Parsing '%s' failed!" msgstr "Lecture de '%s' échouée!" -#: src/mediamarks.c:165 src/menulist.c:212 src/otk.c:3596 +#: src/mediamarks.c:165 src/menulist.c:212 src/otk.c:3633 #: src/playlist_xml.c:201 #, c-format msgid "Root node of '%s' must be '%s'!" @@ -1374,23 +1390,23 @@ msgid "Aspect Ratio" msgstr "Rapport d'affichage" -#: src/odk.c:519 src/odk.c:1414 +#: src/odk.c:519 src/odk.c:1458 msgid "Hue" msgstr "Teinte" -#: src/odk.c:522 src/odk.c:1416 +#: src/odk.c:522 src/odk.c:1460 msgid "Saturation" msgstr "Saturation" -#: src/odk.c:525 src/odk.c:1412 +#: src/odk.c:525 src/odk.c:1455 msgid "Contrast" msgstr "Contraste" -#: src/odk.c:528 src/odk.c:1410 +#: src/odk.c:528 src/odk.c:1452 msgid "Brightness" msgstr "Brillance" -#: src/odk.c:532 +#: src/odk.c:532 src/odk.c:1463 msgid "Zoom" msgstr "Zoom" @@ -1431,8 +1447,8 @@ msgid "none" msgstr "aucun" -#: src/odk.c:592 src/odk.c:608 src/odk.c:629 src/settings_menu.c:600 -#: src/settings_menu.c:634 src/settings_menu.c:643 +#: src/odk.c:592 src/odk.c:608 src/odk.c:629 src/settings_menu.c:598 +#: src/settings_menu.c:632 src/settings_menu.c:641 msgid "auto" msgstr "auto" @@ -1485,28 +1501,20 @@ msgid "Malformed MRL" msgstr "MRL mal formée" -#: src/odk.c:1110 +#: src/odk.c:1112 #, c-format msgid "Could not play '%s': %s!" msgstr "Impossible de lire '%s': %s!" -#: src/odk.c:1375 src/odk.c:1376 +#: src/odk.c:1422 src/odk.c:1423 msgid "encode special characters in MRLs" msgstr "encoder les caractères spéciaux dans les MRLs" -#: src/odk.c:1380 -msgid "use unscaled OSD if possible" -msgstr "utiliser l'OSD non redimensionné si possible" - -#: src/odk.c:1381 -msgid "Use unscaled (full screen resolution) OSD if possible" -msgstr "utilise l'OSD non redimensionné (mode plein écran) si possible" - -#: src/odk.c:1386 +#: src/odk.c:1428 msgid "audio visualization type" msgstr "type de visualisation audio" -#: src/odk.c:1387 +#: src/odk.c:1429 msgid "" "What kind of visual output is to be displayed when playing an audio only " "stream." @@ -1514,11 +1522,11 @@ "Quel genre de sortie visuelle doit être utilisée lors de la lecture des flux " "uniquement audio." -#: src/odk.c:1394 +#: src/odk.c:1436 msgid "background image MRL" msgstr "MRL pour l'image de fond" -#: src/odk.c:1395 +#: src/odk.c:1437 msgid "" "The MRL of the background image that will be displayed if 'visual_anim." "style' is set to 'Background Image'" @@ -1526,11 +1534,11 @@ "La MRL de l'image de fond sera affichée si 'visual_anim.style' vaut " "'Background Image'" -#: src/odk.c:1403 +#: src/odk.c:1445 msgid "stream animation MRL" msgstr "MRL pour l'animation du fond" -#: src/odk.c:1404 +#: src/odk.c:1446 msgid "" "The MRL of the stream animation that will be displayed if 'visual_anim." "style' is set to 'Stream Animation'" @@ -1538,21 +1546,21 @@ "La MRL d'animation sera affichée si 'visual_anim.style' vaut 'Stream " "Animation'" -#: src/odk.c:1459 +#: src/odk.c:1506 #, c-format msgid "Failed to create window using video driver '%s'!" msgstr "Impossible de créer la fenêtre en utilisant le driver vidéo '%s'!" -#: src/odk.c:1464 +#: src/odk.c:1511 msgid "Failed to create window using default driver." msgstr "Impossible de créer la fenêtre en utilisant le driver par défaut." -#: src/odk.c:1474 +#: src/odk.c:1521 #, c-format msgid "Failed to open audio port using audio driver '%s'!" msgstr "Impossible d'ouvrir le port audio en utilisant le driver audio '%s'!" -#: src/odk.c:1479 +#: src/odk.c:1526 msgid "Failed to open audio port using default audio driver." msgstr "" "Impossible d'ouvrir le port audio en utilisant le driver audio par défaut." @@ -1646,30 +1654,30 @@ msgid "Successfully stopped the LIRC input plugin." msgstr "Plugin d'entrée LIRC arrêté avec succès." -#: src/odk_osd.c:427 +#: src/odk_osd.c:452 #, c-format msgid "Could not read image '%s'!" msgstr "Impossible de lire l'image '%s'!" -#: src/odk_osd.c:482 +#: src/odk_osd.c:507 #, c-format msgid "Could not scale image '%s'!" msgstr "Impossible de redimensionner l'image '%s'!" -#: src/odk_osd.c:525 +#: src/odk_osd.c:550 msgid "Could not get pixel data!" msgstr "Impossible de lire les pixels!" -#: src/odk_osd.c:745 +#: src/odk_osd.c:770 #, c-format msgid "Could not free a cache entry for '%s'." msgstr "Impossible de libérer l'entrée du cache pour '%s'." -#: src/odk_osd.c:1671 +#: src/odk_osd.c:1721 msgid "The current video driver supports unscaled OSD!" msgstr "Le driver vidéo actuel supporte l'OSD non redimensionné!" -#: src/odk_osd.c:1673 +#: src/odk_osd.c:1723 msgid "The current video driver does not support unscaled OSD!" msgstr "Le driver vidéo actuel ne support par l'OSD non redimensionné!" @@ -1702,7 +1710,7 @@ msgid "Found %d Xinerama screens:" msgstr "Ecrans Xinerama trouvés : %d" -#: src/odk_x11.c:1014 +#: src/odk_x11.c:1002 #, c-format msgid "" "Overriding calculated monitor pixel aspect ratio with user provided value: " @@ -1711,71 +1719,71 @@ "Remplacement du rapport d'aspect d'un pixel moniteur par la valeur " "utilisateur :%.02f" -#: src/odk_x11.c:1030 +#: src/odk_x11.c:1018 #, c-format msgid "Failed to open video port '%s', falling back to 'auto'." msgstr "Impossible d'ouvrir le port vidéo '%s', utilisation de 'auto'." -#: src/odk_x11.c:1037 +#: src/odk_x11.c:1025 msgid "Failed to open video port!" msgstr "Impossible d'ouvrir le port vidéo!" -#: src/otk.c:3527 src/otk.c:3534 +#: src/otk.c:3564 src/otk.c:3571 #, c-format msgid "Missing property (required) '%s'!" msgstr "Propriété manquante (obligatoire) '%s'!" -#: src/otk.c:3578 +#: src/otk.c:3615 #, c-format msgid "Loading palette file '%s'..." msgstr "Chargement du fichier de palette '%s'..." -#: src/otk.c:3654 +#: src/otk.c:3691 msgid "Could not load palette, reverting to standard colors." msgstr "Impossible de charger la palette, retour aux couleurs standard." -#: src/oxine.c:107 +#: src/oxine.c:113 #, c-format msgid "Usage: oxine [OPTIONS] [MRL]\n" msgstr "Usage: oxine [OPTIONS] [MRL]\n" -#: src/oxine.c:109 +#: src/oxine.c:115 #, c-format msgid "OPTIONS are:\n" msgstr "OPTIONS :\n" -#: src/oxine.c:110 +#: src/oxine.c:116 #, c-format msgid " -v, --version Display version.\n" msgstr " -v, --version Affiche la version.\n" -#: src/oxine.c:111 +#: src/oxine.c:117 #, c-format msgid " --verbose [=level] Set verbosity level. Default is 1.\n" msgstr "" " --verbose [=level] Définit le niveau de verbosité. Defaut à 1.\n" -#: src/oxine.c:113 +#: src/oxine.c:119 #, c-format msgid " -l, --logfile Set the log filename.\n" msgstr " -l, --logfile Définit le fichier de log.\n" -#: src/oxine.c:114 +#: src/oxine.c:120 #, c-format msgid " -V, --video-driver Select video driver by ID.\n" msgstr " -V, --video-driver Sélectionne le pilote video par l'ID.\n" -#: src/oxine.c:115 src/oxine.c:129 +#: src/oxine.c:121 src/oxine.c:135 #, c-format msgid " Available drivers:\n" msgstr " Pilotes disponibles:\n" -#: src/oxine.c:128 +#: src/oxine.c:134 #, c-format msgid " -A, --audio-driver Select audio driver by ID.\n" msgstr " -A, --audio-drivers Sélectionne le pilote audio par l'ID.\n" -#: src/oxine.c:140 +#: src/oxine.c:146 #, c-format msgid "" " -X, --xineramascreen [=num] Sets the screen on which the fullscreen " @@ -1786,13 +1794,13 @@ "écran\n" " sera affichée.\n" -#: src/oxine.c:144 +#: src/oxine.c:150 #, c-format msgid " -F, --no-fullscreen Do no start in fullscreen mode.\n" msgstr "" " -F, --no-fullscreen Désactive le plein écran au démarrage.\n" -#: src/oxine.c:147 +#: src/oxine.c:153 #, c-format msgid "" " -P, --no-polling Do not use automatic polling for removable " @@ -1800,17 +1808,25 @@ msgstr "" " -P, --no-polling Désactive le sondage des médias amovibles.\n" -#: src/oxine.c:151 +#: src/oxine.c:157 #, c-format msgid " -L, --no-lirc Do not use remote control (LIRC).\n" msgstr " -L, --no-lirc Désactive les télécommandes (LIRC).\n" -#: src/oxine.c:155 +#: src/oxine.c:161 #, c-format msgid " -J, --no-joystick Do not use joystick support.\n" msgstr " -J, --no-joystick Désactive le support des joysticks.\n" -#: src/oxine.c:159 +#: src/oxine.c:165 +#, fuzzy, c-format +msgid "" +" -W, --no-weather Do not automaticaly retrieve weather " +"information.\n" +msgstr "" +" -P, --no-polling Désactive le sondage des médias amovibles.\n" + +#: src/oxine.c:169 #, c-format msgid "" "Examples for valid MRLs (media resource locator):\n" @@ -1835,71 +1851,67 @@ " 'dvd://'\n" " VCD: 'vcd://'\n" -#: src/oxine.c:180 src/oxine.c:181 +#: src/oxine.c:190 src/oxine.c:191 msgid "video driver to use" msgstr "pilote vidéo à utiliser" -#: src/oxine.c:184 src/oxine.c:185 +#: src/oxine.c:194 src/oxine.c:195 msgid "audio driver to use" msgstr "pilote audio à utiliser" -#: src/oxine.c:190 src/oxine.c:191 +#: src/oxine.c:199 src/oxine.c:200 msgid "Xinerama screen for fullscreen window" msgstr "écran xinerama pour le plein écran" -#: src/oxine.c:196 src/oxine.c:197 -msgid "percentage of fullscreen screen to use" -msgstr "pourcentage du plein écran à utiliser" - -#: src/oxine.c:201 +#: src/oxine.c:204 msgid "non-fullscreen window width" msgstr "largeur de la fenêtre hors plein écran" -#: src/oxine.c:202 +#: src/oxine.c:205 msgid "The width of the non-fullscreen window" msgstr "La largeur de la fenêtre en dehors du plein écran" -#: src/oxine.c:206 +#: src/oxine.c:209 msgid "non-fullscreen window height" msgstr "hauteur de la fenêtre hors plein écran" -#: src/oxine.c:207 +#: src/oxine.c:210 msgid "The height of the non-fullscreen window" msgstr "La hauteur de la fenêtre en dehors du mode plein écran" -#: src/oxine.c:211 src/oxine.c:212 +#: src/oxine.c:214 src/oxine.c:215 msgid "aspect ratio of one monitor pixel" msgstr "rapport d'aspect d'un pixel moniteur" -#: src/oxine.c:217 +#: src/oxine.c:220 msgid "ask before leaving oxine" msgstr "demander avant de quitter oxine" -#: src/oxine.c:218 +#: src/oxine.c:221 msgid "Are we to show the quit confirm dialog?" msgstr "Afficher la fenêtre de confirmation de fermeture ?" -#: src/oxine.c:222 src/oxine.c:223 +#: src/oxine.c:225 src/oxine.c:226 msgid "command that was selected the last time" msgstr "commande sélectionnée la dernière fois" -#: src/oxine.c:228 src/oxine.c:229 +#: src/oxine.c:231 src/oxine.c:232 msgid "shell command (power off)" msgstr "commande shell (éteindre)" -#: src/oxine.c:234 src/oxine.c:235 +#: src/oxine.c:237 src/oxine.c:238 msgid "shell command (reboot)" msgstr "commande shell (redémarrer)" -#: src/oxine.c:239 src/oxine.c:240 +#: src/oxine.c:242 src/oxine.c:243 msgid "shell command (standby)" msgstr "commande shell (veille)" -#: src/oxine.c:245 +#: src/oxine.c:248 msgid "METAR ICAO location indicator" msgstr "Indicateur d'emplacement METAR ICAO" -#: src/oxine.c:246 +#: src/oxine.c:249 msgid "" "The METAR ICAO Location Indicator defines for which location the weather is " "to be displayed." @@ -1907,11 +1919,11 @@ "L'indicateur d'emplacement METAR ICAO définit pour quel lieu la météo doit " "être affichée." -#: src/oxine.c:252 +#: src/oxine.c:255 msgid "reload playlist on start" msgstr "recharger la playlist au démarrage" -#: src/oxine.c:253 +#: src/oxine.c:256 msgid "" "If this is enabled and if you don't specify any MRL on the command line, " "oxine will automatically load the previous playlist." @@ -1919,11 +1931,11 @@ "Si cette option est activée et que vous ne spécifiez aucune MRL sur la ligne " "de commande, oxine chargera automatiquement la playlist précédente." -#: src/oxine.c:259 +#: src/oxine.c:262 msgid "play reloaded playlist on start" msgstr "lire la playlist rechargée au démarrage" -#: src/oxine.c:260 +#: src/oxine.c:263 msgid "" "If this is enabled and gui.playlist_auto_reload is also enabled the reloaded " "playlist will automatically be played." @@ -1931,119 +1943,119 @@ "Si cette option est activée et que gui.playlist_auto_reload est aussi activé," "la playlist rechargée sera automatiquement jouée." -#: src/oxine.c:267 +#: src/oxine.c:270 msgid "subtitle autoloading" msgstr "chargement automatique des sous-titres" -#: src/oxine.c:268 +#: src/oxine.c:271 msgid "Automatically load subtitles if they exist." msgstr "Charge automatiquement les sous-titres, si ils existent." -#: src/oxine.c:395 +#: src/oxine.c:406 #, c-format msgid "This is %s - A free Video-Player v%s\n" msgstr "Voici %s - un lecteur vidéo libre v%s\n" -#: src/oxine.c:397 +#: src/oxine.c:408 #, c-format msgid "(c) 2005 by the oxine project\n" msgstr "(c) 2005 par the oxine project.\n" -#: src/oxine.c:406 +#: src/oxine.c:417 #, c-format msgid "Invalid argument %d!" msgstr "Argument invalide %d!" -#: src/oxine.c:491 +#: src/oxine.c:502 msgid "Could not initialize ODK!" msgstr "Impossible d'initialiser ODK!" -#: src/oxine.c:502 +#: src/oxine.c:513 msgid "Could not inizialize OTK!" msgstr "Impossible d'initialiser OTK!" -#: src/playback_menu.c:747 src/playback_menu.c:1172 +#: src/playback_menu.c:769 src/playback_menu.c:1195 msgid "Album:" msgstr "Album:" -#: src/playback_menu.c:753 src/playback_menu.c:1178 +#: src/playback_menu.c:775 src/playback_menu.c:1201 msgid "Artist:" msgstr "Artiste:" -#: src/playback_menu.c:759 src/playback_menu.c:1184 +#: src/playback_menu.c:781 src/playback_menu.c:1207 msgid "Year:" msgstr "Année:" -#: src/playback_menu.c:765 src/playback_menu.c:1190 +#: src/playback_menu.c:787 src/playback_menu.c:1213 msgid "Track:" msgstr "Piste:" -#: src/playback_menu.c:772 src/playback_menu.c:1197 +#: src/playback_menu.c:794 src/playback_menu.c:1220 msgid "Genre:" msgstr "Genre:" -#: src/playback_menu.c:779 +#: src/playback_menu.c:801 msgid "Length:" msgstr "Durée:" -#: src/playback_menu.c:788 +#: src/playback_menu.c:810 msgid "Elapsed:" msgstr "Écoulé:" -#: src/playback_menu.c:1014 +#: src/playback_menu.c:1037 msgid "Loop Mode" msgstr "Mode Boucle" -#: src/playback_menu.c:1019 +#: src/playback_menu.c:1042 msgid "Shuffle Mode" msgstr "Mode Aléatoire" -#: src/playback_menu.c:1024 +#: src/playback_menu.c:1047 msgid "Normal Mode" msgstr "Mode Normal" -#: src/playback_menu.c:1035 +#: src/playback_menu.c:1058 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:79 msgid "Settings" msgstr "Réglages" -#: src/playback_menu.c:1058 +#: src/playback_menu.c:1081 msgid "Media Browser" msgstr "Navigateur de Média" -#: src/playlist_menu.c:637 +#: src/playlist_menu.c:650 msgid "Delete subtitle" msgstr "Supprimer Sous-titre" -#: src/playlist_menu.c:639 src/playlist_menu.c:1043 +#: src/playlist_menu.c:652 src/playlist_menu.c:1056 msgid "Add subtitle" msgstr "Ajouter Sous-titre" -#: src/playlist_menu.c:661 +#: src/playlist_menu.c:674 msgid "Subtitle" msgstr "Sous-titres" -#: src/playlist_menu.c:943 +#: src/playlist_menu.c:956 msgid "Please enter a name for the playlist:" msgstr "Veuillez entrer un nom pour la playlist :" -#: src/playlist_menu.c:1014 +#: src/playlist_menu.c:1027 msgid "Clear list" msgstr "Supprimer la liste" -#: src/playlist_menu.c:1018 +#: src/playlist_menu.c:1031 msgid "Save list" msgstr "Sauver la liste" -#: src/playlist_menu.c:1033 +#: src/playlist_menu.c:1046 msgid "Move up" msgstr "Déplacer vers le Haut" -#: src/playlist_menu.c:1038 +#: src/playlist_menu.c:1051 msgid "Move down" msgstr "Déplacer vers le Bas" -#: src/playlist_menu.c:1048 +#: src/playlist_menu.c:1061 msgid "Media-Browser" msgstr "Navigateur de Média" @@ -2068,366 +2080,366 @@ "Il peut être nécessaire de redémarrer oxine\n" "pour que les changements soient effectifs!" -#: src/settings_menu.c:504 +#: src/settings_menu.c:502 msgid "User Interface" msgstr "Interface Utilisateur" -#: src/settings_menu.c:506 +#: src/settings_menu.c:504 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:80 msgid "Weather" msgstr "Météo" -#: src/settings_menu.c:509 +#: src/settings_menu.c:507 msgid "Video Disc Recorder" msgstr "Video Disc Recorder" -#: src/settings_menu.c:513 +#: src/settings_menu.c:511 msgid "Audio Visualization" msgstr "Visualisation Audio" -#: src/settings_menu.c:514 +#: src/settings_menu.c:512 msgid "Audio" msgstr "Audio" -#: src/settings_menu.c:515 +#: src/settings_menu.c:513 msgid "Video" msgstr "Vidéo" -#: src/settings_menu.c:516 +#: src/settings_menu.c:514 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:76 msgid "Media" msgstr "Média" -#: src/settings_menu.c:517 +#: src/settings_menu.c:515 msgid "Decoder" msgstr "Décodeur" -#: src/settings_menu.c:518 +#: src/settings_menu.c:516 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:78 msgid "Subtitles" msgstr "Sous-titres" -#: src/settings_menu.c:519 +#: src/settings_menu.c:517 msgid "Effects" msgstr "Effets" -#: src/settings_menu.c:520 +#: src/settings_menu.c:518 msgid "Engine" msgstr "Moteur" -#: src/settings_menu.c:521 +#: src/settings_menu.c:519 msgid "Miscellaneous" msgstr "Divers" -#: src/settings_menu.c:578 +#: src/settings_menu.c:576 msgid "white-black-transparent" msgstr "blanc-noir-transparent" -#: src/settings_menu.c:579 +#: src/settings_menu.c:577 msgid "white-none-transparent" msgstr "blanc-non-transparent" -#: src/settings_menu.c:580 +#: src/settings_menu.c:578 msgid "white-none-translucid" msgstr "blanc-non-translucide" -#: src/settings_menu.c:581 +#: src/settings_menu.c:579 msgid "yellow-black-transparent" msgstr "jaune-noir-transparent" -#: src/settings_menu.c:583 +#: src/settings_menu.c:581 msgid "Mono 1.0" msgstr "Mono 1.0" -#: src/settings_menu.c:584 +#: src/settings_menu.c:582 msgid "Stereo 2.0" msgstr "Stéréo 2.0" -#: src/settings_menu.c:585 +#: src/settings_menu.c:583 msgid "Headphones 2.0" msgstr "Casque 2.0" -#: src/settings_menu.c:586 +#: src/settings_menu.c:584 msgid "Stereo 2.1" msgstr "Stéréo 2.1" -#: src/settings_menu.c:587 +#: src/settings_menu.c:585 msgid "Surround 3.0" msgstr "Surround 3.0" -#: src/settings_menu.c:588 +#: src/settings_menu.c:586 msgid "Surround 4.0" msgstr "Surround 4.0" -#: src/settings_menu.c:589 +#: src/settings_menu.c:587 msgid "Surround 4.1" msgstr "Surround 4.1" -#: src/settings_menu.c:590 +#: src/settings_menu.c:588 msgid "Surround 5.0" msgstr "Surround 5.0" -#: src/settings_menu.c:591 +#: src/settings_menu.c:589 msgid "Surround 5.1" msgstr "Surround 5.1" -#: src/settings_menu.c:592 +#: src/settings_menu.c:590 msgid "Surround 6.0" msgstr "Surround 6.0" -#: src/settings_menu.c:593 +#: src/settings_menu.c:591 msgid "Surround 6.1" msgstr "Surround 6.1" -#: src/settings_menu.c:594 +#: src/settings_menu.c:592 msgid "Surround 7.1" msgstr "Surround 7.1" -#: src/settings_menu.c:595 +#: src/settings_menu.c:593 msgid "Pass Through" msgstr "Pass Through" -#: src/settings_menu.c:597 +#: src/settings_menu.c:595 msgid "metronom feedback" msgstr "metronom feedback" -#: src/settings_menu.c:598 +#: src/settings_menu.c:596 msgid "resample" msgstr "resample" -#: src/settings_menu.c:601 +#: src/settings_menu.c:599 msgid "off" msgstr "off" -#: src/settings_menu.c:602 +#: src/settings_menu.c:600 msgid "on" msgstr "on" -#: src/settings_menu.c:604 +#: src/settings_menu.c:602 msgid "2D_Tex_Fragprog" msgstr "2D_Tex_Fragprog" -#: src/settings_menu.c:605 +#: src/settings_menu.c:603 msgid "2D_Tex" msgstr "2D_Tex" -#: src/settings_menu.c:606 +#: src/settings_menu.c:604 msgid "2D_Tex_Tiled" msgstr "2D_Tex_Tiled" -#: src/settings_menu.c:607 +#: src/settings_menu.c:605 msgid "Image_Pipeline" msgstr "Image_Pipeline" -#: src/settings_menu.c:608 +#: src/settings_menu.c:606 msgid "Cylinder" msgstr "Cylinder" -#: src/settings_menu.c:609 +#: src/settings_menu.c:607 msgid "Env_Mapped_Torus" msgstr "Env_Mapped_Torus" -#: src/settings_menu.c:611 +#: src/settings_menu.c:609 msgid "entire dvd" msgstr "DVD entier" -#: src/settings_menu.c:612 +#: src/settings_menu.c:610 msgid "one chapter" msgstr "un chapitre" -#: src/settings_menu.c:614 +#: src/settings_menu.c:612 msgid "seek in program chain" msgstr "la chaîne de programe" -#: src/settings_menu.c:615 +#: src/settings_menu.c:613 msgid "seek in program" msgstr "le programme" -#: src/settings_menu.c:617 +#: src/settings_menu.c:615 msgid "skip program" msgstr "sauter le programme" -#: src/settings_menu.c:618 +#: src/settings_menu.c:616 msgid "skip part" msgstr "sauter la partie" -#: src/settings_menu.c:619 +#: src/settings_menu.c:617 msgid "skip title" msgstr "sauter le titre" -#: src/settings_menu.c:621 +#: src/settings_menu.c:619 msgid "14.4 Kbps (Modem)" msgstr "14.4 Kbits/s (Modem)" -#: src/settings_menu.c:622 +#: src/settings_menu.c:620 msgid "19.2 Kbps (Modem)" msgstr "19.2 Kbits/s (Modem)" -#: src/settings_menu.c:623 +#: src/settings_menu.c:621 msgid "28.8 Kbps (Modem)" msgstr "28.8 Kbits/s (Modem)" -#: src/settings_menu.c:624 +#: src/settings_menu.c:622 msgid "33.6 Kbps (Modem)" msgstr "33.6 Kbits/s (Modem)" -#: src/settings_menu.c:625 +#: src/settings_menu.c:623 msgid "34.4 Kbps (Modem)" msgstr "34.4 Kbits/s (Modem)" -#: src/settings_menu.c:626 +#: src/settings_menu.c:624 msgid "57.6 Kbps (Modem)" msgstr "57.6 kbits/s (Modem)" -#: src/settings_menu.c:627 +#: src/settings_menu.c:625 msgid "115.2 Kbps (ISDN)" msgstr "115.2 Kbits/s (ISDN/Numéris)" -#: src/settings_menu.c:628 +#: src/settings_menu.c:626 msgid "262.2 Kbps (Cable/DSL)" msgstr "262.2 Kbits/s (Câble/DSL)" -#: src/settings_menu.c:629 +#: src/settings_menu.c:627 msgid "393.2 Kbps (Cable/DSL)" msgstr "393.2 Kbits/s (Câble/DSL)" -#: src/settings_menu.c:630 +#: src/settings_menu.c:628 msgid "524.3 Kbps (Cable/DSL)" msgstr "524.3 Kbits/s (Câble/DSL)" -#: src/settings_menu.c:631 +#: src/settings_menu.c:629 msgid "1.5 Mbps (T1)" msgstr "1.5 Mbits/s (T1)" -#: src/settings_menu.c:632 +#: src/settings_menu.c:630 msgid "10.5 Mbps (LAN)" msgstr "10.5 Mbits/s (LAN)" -#: src/settings_menu.c:635 +#: src/settings_menu.c:633 msgid "TCP" msgstr "TCP" -#: src/settings_menu.c:636 +#: src/settings_menu.c:634 msgid "HTTP" msgstr "HTTP" -#: src/settings_menu.c:638 +#: src/settings_menu.c:636 msgid "MPEG track" msgstr "MPEG track" -#: src/settings_menu.c:639 src/settings_menu.c:645 +#: src/settings_menu.c:637 src/settings_menu.c:643 msgid "entry" msgstr "entry" -#: src/settings_menu.c:640 +#: src/settings_menu.c:638 msgid "segment" msgstr "segment" -#: src/settings_menu.c:641 +#: src/settings_menu.c:639 msgid "playback-control item" msgstr "playback-control item" -#: src/settings_menu.c:644 +#: src/settings_menu.c:642 msgid "track" msgstr "track" -#: src/settings_menu.c:647 +#: src/settings_menu.c:645 msgid "tiny" msgstr "minuscule" -#: src/settings_menu.c:648 +#: src/settings_menu.c:646 msgid "small" msgstr "petit" -#: src/settings_menu.c:649 +#: src/settings_menu.c:647 msgid "normal" msgstr "normal" -#: src/settings_menu.c:650 +#: src/settings_menu.c:648 msgid "large" msgstr "large" -#: src/settings_menu.c:651 +#: src/settings_menu.c:649 msgid "very large" msgstr "très large" -#: src/settings_menu.c:652 +#: src/settings_menu.c:650 msgid "huge" msgstr "énorme" -#: src/settings_menu.c:654 +#: src/settings_menu.c:652 msgid "Fast but not photorealistic" msgstr "Rapide mais moins réaliste" -#: src/settings_menu.c:655 +#: src/settings_menu.c:653 msgid "Slow but looks better" msgstr "Lent mais plus beau" -#: src/settings_menu.c:657 +#: src/settings_menu.c:655 msgid "default" msgstr "défaut" -#: src/settings_menu.c:658 +#: src/settings_menu.c:656 msgid "reverse" msgstr "inversé" -#: src/settings_menu.c:659 +#: src/settings_menu.c:657 msgid "content" msgstr "contenu" -#: src/settings_menu.c:660 +#: src/settings_menu.c:658 msgid "extension" msgstr "extention" -#: src/settings_menu.c:662 +#: src/settings_menu.c:660 msgid "probe" msgstr "sonder" -#: src/settings_menu.c:663 +#: src/settings_menu.c:661 msgid "libc" msgstr "libc" -#: src/settings_menu.c:664 +#: src/settings_menu.c:662 msgid "kernel" msgstr "kernel" -#: src/settings_menu.c:665 +#: src/settings_menu.c:663 msgid "mmx" msgstr "mmx" -#: src/settings_menu.c:666 +#: src/settings_menu.c:664 msgid "mmxext" msgstr "mmxext" -#: src/settings_menu.c:667 +#: src/settings_menu.c:665 msgid "sse" msgstr "sse" -#: src/settings_menu.c:669 +#: src/settings_menu.c:667 msgid "Background Image" msgstr "Image de fond" -#: src/settings_menu.c:670 +#: src/settings_menu.c:668 msgid "Background Animation" msgstr "Animation de fond" -#: src/settings_menu.c:671 +#: src/settings_menu.c:669 msgid "Post Plugin" msgstr "post plugin" -#: src/settings_menu.c:673 +#: src/settings_menu.c:671 msgid "oscope" msgstr "oscope" -#: src/settings_menu.c:674 +#: src/settings_menu.c:672 msgid "fftscope" msgstr "fftscope" -#: src/settings_menu.c:675 +#: src/settings_menu.c:673 msgid "fftgraph" msgstr "fftgraph" -#: src/settings_menu.c:676 +#: src/settings_menu.c:674 msgid "goom" msgstr "goom" @@ -2811,6 +2823,21 @@ msgid "Music" msgstr "Musique" +#~ msgid "Could not mount %s!" +#~ msgstr "Impossible de monter %s!" + +#~ msgid "Could not eject %s!" +#~ msgstr "Impossible d'éjecter %s!" + +#~ msgid "use unscaled OSD if possible" +#~ msgstr "utiliser l'OSD non redimensionné si possible" + +#~ msgid "Use unscaled (full screen resolution) OSD if possible" +#~ msgstr "utilise l'OSD non redimensionné (mode plein écran) si possible" + +#~ msgid "percentage of fullscreen screen to use" +#~ msgstr "pourcentage du plein écran à utiliser" + #~ msgid "Corse" #~ msgstr "Corse" diff -Naur oxine-0.6.orig/po/it.gmo oxine-0.6.3/po/it.gmo --- oxine-0.6.orig/po/it.gmo 2006-11-03 18:35:36.000000000 +0100 +++ oxine-0.6.3/po/it.gmo 2006-11-22 10:56:28.000000000 +0100 @@ -1,32 +1,31 @@ -%l 2B40w  -  # -1<+O{ -!%&;ThF)/J^w*-JPTX _k  -0-^2y5%,75m  -$*")/4; ? IsS}ETiDo -  !A4@v  !   #7K N\ q{I  -'2AH Q[ c -mx     + /9+i/7/ '9&a% - '   , 5J   !    5 (!;!@!S!p!! !!!!!!!" """ "%")"0"6"I"f""" """""""" ##3$O$4,%a%~%% %%%% %%%% % -%%2&F&O& W&e&k&s& |&&,&2&3'7'U'%o'X'6''%(.M(!|(((((3 ) A)!b))))))))))**F*O* -W*b*j* {***<*;*1+>Q+E+.+=,6C,z, ,,, -, -,,),&-/-7-?-E-J-R- Y- c-nm-j-G.V. o.@y... -.... //'"/@J/4///'/ -00 00 =0G0[0n0q00 000 0000S0F1Y1 -a1l1}11111 1&1 11 112 22'202D2U2i2~22222-2)313J3"f33 333373 33 -4$43@4t4 }44%4444454+5;5@5S5p5 555 -5 5 5 6 66(61666=6B6F6M6R6b6s666666666# 7/7J7T.6p]=$G?u'/X\ z^Wb Akq-_O K@+9R,Uw2)3dZ07>hno~"8mtlPa#D&S1:`J -e}L4NCxBEI%jfMVQs !(5<yv;{girc|Y[H*F Available drivers: +, 2B08W^ n{ +   ++  +")08A!\%~&F)Cm* 7Pf    ",?-Q025%4,Z7  +$*;fmt{  s}D +,7 Q[!dA@  !# EO _ ku  Icr +y   +     (0 AO+_/+/7#/['&% + '*R Zh~ ! 5(. W \ o        !!!'!0!5!"*Ea*.*=*6+K+ j+t++ ++ +++)++,,,,,#, *, 4,n>,j,-'- @-@J--- +---- --'-@.4\...'. +.. / //,/?/B/T/ m/{// ////S/0*0 +20=0N0W0^0n0t0 z0&0 00 00000011&1:1O1l1111-1)122"72Z2 a2m2v2|272 22223 3$3%+3Q3`3h3n35v3+3333 4 $4E4U4 +k4 v4 4 4 444444444445#5+525F5f5n5r55#555]FUv([;~/0%jMV!Gg=s#d_ <X>H +tDOQeyr{".J5Ezi6o9lu2m$*wY3}`CTN'7hnWS,\Z1B) a|q8^Ap:R&KIxcL-k4 b Pf+@?  Available drivers: --verbose [=level] Set verbosity level. Default is 1. -v, --version Display version. (c) 2005 by the oxine project -2D_Tex2D_Tex_Fragprog2D_Tex_Tiled4:3AddAlbum:Angle MenuArtist:Aspect RatioAudio CDAudio ChannelAudio MenuAudio-Video OffsetAutomatically load subtitles if they exist.BackBretonBrightnessCD-ROMCancelCatalanContrastCould not create '%s': %s!Could not create LIRC thread: %s!Could not create joystick thread: %s!Could not create scheduler thread: %s!Could not create stream!Could not eject %s!Could not eject device!Could not find %s, trying to use default configuration file %s/lircrc.Could not find a LIRC configuration file.Could not find demuxer pluginCould not initialize X threads!Could not load mediamarks.Could not mount %s!Could not open '%s': %s!Could not open disc!Could not open display!Could not perform codeset conversion (%s)!Could not play '%s': %s!Could not play title!Could not read '%s': %s!Could not unmount %s!Could not write to '%s': %s!CzechDVBDVDDanishDeinterlaceDemuxer plugin failedDevices oxine tried to open are:DutchEjectElapsed:EnglishEnv_Mapped_TorusEsperantoExtra Fast ForwardExtra Slow MotionFailed to create window using default driver.Failed to create window using video driver '%s'!Failed to initialize LIRC.Failed to open audio port using audio driver '%s'!Failed to open audio port using default audio driver.Failed to open joystick using libjsw!Failed to open joystick using raw interface!Failed to open video port '%s', falling back to 'auto'.Failed to open video port!FaroeseFast ForwardFile '%s' is empty!FilesystemFinnishFound a device we are interested in:Found an entry that did not contain a MRL!FrenchGenre:GermanGreekHTTPHebrewHueHungarianIcelandicIf this is enabled and gui.playlist_auto_reload is also enabled the reloaded playlist will automatically be played.If this is enabled and if you don't specify any MRL on the command line, oxine will automatically load the previous playlist.Image_PipelineInvalid argument %d!IrishIt may be necessary to restart oxine +2D_Tex2D_Tex_Fragprog2D_Tex_Tiled4:3AddAlbum:Angle MenuArtist:Aspect RatioAudio CDAudio ChannelAudio MenuAudio-Video OffsetAutomatically load subtitles if they exist.BackBretonBrightnessCD-ROMCancelCatalanContrastCould not create '%s': %s!Could not create LIRC thread: %s!Could not create joystick thread: %s!Could not create scheduler thread: %s!Could not create stream!Could not eject device!Could not find %s, trying to use default configuration file %s/lircrc.Could not find a LIRC configuration file.Could not find demuxer pluginCould not initialize X threads!Could not load mediamarks.Could not open '%s': %s!Could not open disc!Could not open display!Could not perform codeset conversion (%s)!Could not play '%s': %s!Could not play title!Could not read '%s': %s!Could not write to '%s': %s!CzechDVBDVDDanishDeinterlaceDemuxer plugin failedDevices oxine tried to open are:DutchEjectElapsed:EnglishEnv_Mapped_TorusEsperantoExtra Fast ForwardExtra Slow MotionFailed to create window using default driver.Failed to create window using video driver '%s'!Failed to initialize LIRC.Failed to open audio port using audio driver '%s'!Failed to open audio port using default audio driver.Failed to open joystick using libjsw!Failed to open joystick using raw interface!Failed to open video port '%s', falling back to 'auto'.Failed to open video port!FaroeseFast ForwardFile '%s' is empty!FilesystemFinnishFound a device we are interested in:Found an entry that did not contain a MRL!FrenchGenre:GermanGreekHTTPHebrewHueHungarianIcelandicIf this is enabled and gui.playlist_auto_reload is also enabled the reloaded playlist will automatically be played.If this is enabled and if you don't specify any MRL on the command line, oxine will automatically load the previous playlist.Image_PipelineInvalid argument %d!IrishIt may be necessary to restart oxine for the changes to take effect!ItalianLatinLength:Listen to MusicLithuanianLoading menu file '%s'...Loop ModeMainmenuMake sure you have lircd running.Make sure you have the permissions to connect to the LIRC socket.Make sure you have the permissions to open the joystick devices.Malformed MRLMenu toggleMissing property (required) '%s'!Next PageNo input pluginNormal ModeNorwegianNorwegian (Bokmål)Norwegian (Nynorsk)OKOPTIONS are: Parsing '%s' failed!Part MenuPausedPlayPlayingPlaylistPlease insert a DVD!Please insert a Video CD!Please run 'jscalibrator -file %s -device %s' to calibrate your joystick.Please wait...PolishPortugueseRemovable DiscRemoveRomanianRoot MenuRussianSardinianSaturationSelect device to eject:SettingsShow HelpShuffle ModeShutdownSlovakSlovenianSlow MotionSpanishSubtitle ChannelSubtitle MenuSubtitle OffsetSuccessfully started the LIRC input plugin.Successfully started the joystick input plugin.Successfully stopped the LIRC input plugin.Successfully stopped the joystick input plugin.SwedishTCPThe current video driver does not support unscaled OSD!The current video driver supports unscaled OSD!The height of the non-fullscreen windowThe width of the non-fullscreen windowThis is %s - A free Video-Player v%s TitleTitle MenuTrack:TurkishUkrainianUnable to get status for file '%s': %s.UnknownUnknown errorUnknown parameter %d!Usage: oxine [OPTIONS] [MRL] -Use unscaled (full screen resolution) OSD if possibleVideo CDVideo DVDVolumeWaiting for alternative stream...Watch FilmsWelshYear:YiddishYou should create a file containing mediamarks at %s!Your joystick has never been calibrated!Zoom[M3U-Playlist: %s]activate an item or a buttonadjust audio offsetadjust subtitle offsetadjust volumeaudio driver to useautochange audio languagechange subtitle languagedisabledenabledfftgraphfftscopegoomkernellibcmmxmmxextmutednavigate the menusnon-fullscreen window heightnon-fullscreen window widthnoneoscopepause/ playselect an item in a listsquaressestop the streamtoggle aspect ratiotoggle deinterlacetoggle mute/ unmutevideo driver to useProject-Id-Version: oxine 0.5 +Video CDVideo DVDVolumeWaiting for alternative stream...Watch FilmsWelshYear:YiddishYou should create a file containing mediamarks at %s!Your joystick has never been calibrated!Zoom[M3U-Playlist: %s]activate an item or a buttonadjust audio offsetadjust subtitle offsetadjust volumeaudio driver to useautochange audio languagechange subtitle languagedisabledenabledfftgraphfftscopegoomkernellibcmmxmmxextmutednavigate the menusnon-fullscreen window heightnon-fullscreen window widthnoneoscopepause/ playselect an item in a listsquaressestop the streamtoggle aspect ratiotoggle deinterlacetoggle mute/ unmutevideo driver to useProject-Id-Version: oxine 0.5 Report-Msgid-Bugs-To: mschwerin@users.sf.net -POT-Creation-Date: 2006-11-03 18:35+0100 +POT-Creation-Date: 2006-11-22 10:56+0100 PO-Revision-Date: 2006-10-17 10:14+0100 Last-Translator: Maximilian Schwerin Language-Team: Italian @@ -38,8 +37,8 @@ --verbose [=level] Imposta il livello di dettaglio. Predefinito 1. -v, --version Visualizza versione. (c) 2005 del progetto oxine -2D_Tex2D_Tex_Fragprog2D_Tex_Tiled4:3AggiungiAlbum:Menu AngoloArtista:Rapporto d'aspettoAudio CDCanale AudioMenu AudioRitardo Audio/VideoCarica automaticamente i sottotitoli, se esistono.IndietroBretoneLuminosità CDROMAnnullaCatalanoContrastoImpossibile creare '%s': %s!Impossibile creare il processo per LIRC: %s!Impossibile creare il processo per i joystick: %s!Impossibile creare il processo per i scheduler: %s!Impossibile creare un flusso!Impossibile espellere %s!Impossibile espellere il dispositivo!Impossibile trovare %s, provo ad usare la configurazione predefinita nel file %s/lircrc.Impossibile trovare un file di configurazione di LIRC.Impossibile trovare i plugin di demuxerErrore di inizializzazione dei processi per X!Impossibile caricare i mediamark.Impossibile montare %s!Impossibile aprire '%s': %s!Impossibile aprire il disco!Non posso aprire la finestraImpossibile effettuare la conversione codeset (%s)!Impossibile riprodurre '%s': %s!Impossibile riprodurre il titolo!Impossibile leggere '%s': %s!Impossibile smontare %s!Impossibile scrivere '%s': %s!CecoDVBDVDDaneseDeinterallacciaErrore del plugin di demuxerDispositivi che oxine ha provato ad usare:OlandeseEspelliTrascorso:IngleseEnv_Mapped_TorusEsperantoRiproduzione Molto VeloceRiproduzione Molto LentaImpossibile creare la finestra usando il driver predefinito.Impossibile creare la finestra usando il driver video '%s'!Impossibile inizializzare LIRC.Impossibile aprire la porta audio usando il driver audio '%s'!Impossibile aprire la porta audio usando il driver audio predefinito.Impossibile trovare il joystick usando libjsw!Impossibile trovare il joystick usando l'interfaccia diretta!Errore di apertura porta video '%s', ritorno su 'auto'Errore di apertura porta videoFærøeseRiproduzione VeloceIl file '%s' è vuoto!FilesystemFinlandeseTrovato un dispositivo:Trovata una voce che non contiene un MRL!FranceseGenere:TedescoGrecoHTTPEbraicoColoreUnghereseIslandesese abilitato insieme a gui.playlist_auto_reload, la riproduzione della playlist sarà automaticamente avviata.Se abilitato e non c'è nessun MRL nella linea di comando, oxine automaticamente carica l'ultima playlist.Image_PipelineArgomento %d non valido!IrlandeseE' necessario riavviare oxine +2D_Tex2D_Tex_Fragprog2D_Tex_Tiled4:3AggiungiAlbum:Menu AngoloArtista:Rapporto d'aspettoAudio CDCanale AudioMenu AudioRitardo Audio/VideoCarica automaticamente i sottotitoli, se esistono.IndietroBretoneLuminosità CDROMAnnullaCatalanoContrastoImpossibile creare '%s': %s!Impossibile creare il processo per LIRC: %s!Impossibile creare il processo per i joystick: %s!Impossibile creare il processo per i scheduler: %s!Impossibile creare un flusso!Impossibile espellere il dispositivo!Impossibile trovare %s, provo ad usare la configurazione predefinita nel file %s/lircrc.Impossibile trovare un file di configurazione di LIRC.Impossibile trovare i plugin di demuxerErrore di inizializzazione dei processi per X!Impossibile caricare i mediamark.Impossibile aprire '%s': %s!Impossibile aprire il disco!Non posso aprire la finestraImpossibile effettuare la conversione codeset (%s)!Impossibile riprodurre '%s': %s!Impossibile riprodurre il titolo!Impossibile leggere '%s': %s!Impossibile scrivere '%s': %s!CecoDVBDVDDaneseDeinterallacciaErrore del plugin di demuxerDispositivi che oxine ha provato ad usare:OlandeseEspelliTrascorso:IngleseEnv_Mapped_TorusEsperantoRiproduzione Molto VeloceRiproduzione Molto LentaImpossibile creare la finestra usando il driver predefinito.Impossibile creare la finestra usando il driver video '%s'!Impossibile inizializzare LIRC.Impossibile aprire la porta audio usando il driver audio '%s'!Impossibile aprire la porta audio usando il driver audio predefinito.Impossibile trovare il joystick usando libjsw!Impossibile trovare il joystick usando l'interfaccia diretta!Errore di apertura porta video '%s', ritorno su 'auto'Errore di apertura porta videoFærøeseRiproduzione VeloceIl file '%s' è vuoto!FilesystemFinlandeseTrovato un dispositivo:Trovata una voce che non contiene un MRL!FranceseGenere:TedescoGrecoHTTPEbraicoColoreUnghereseIslandesese abilitato insieme a gui.playlist_auto_reload, la riproduzione della playlist sarà automaticamente avviata.Se abilitato e non c'è nessun MRL nella linea di comando, oxine automaticamente carica l'ultima playlist.Image_PipelineArgomento %d non valido!IrlandeseE' necessario riavviare oxine affinchè i cambi abbiano effetto!ItalianoLatinoLunghezza:Ascolta MusicaLituanoCaricamento menu '%s'...Modo CiclicoMenu principaleAssicurati che hai lircd in esecuzione.Assicurati che hai i permessi per connetterti al socket di LIRC.Assicurati di avere i permessi per usare i joystick.MRL non correttoMostra/Nascondi MenuParametro mancante (obbligatorio) '%s'!SuccessivaNessun plugin di inputModo NormaleNorvegeseNorvegese (Bokmål)Norvegese (Nyorsk)OKLe OPZIONI sono: Analisi di '%s' fallita!Menu CapitoliPausePlayRiproduzionePlaylistInserire un DVD!Inserire un Video CD!Per favore esegui 'jscalibrator -file %s -device %s' per calibrare il tuo joystick.Attendere prego...PolaccoPortogheseDisco RimovibileCancellaRumenoMenu PrincipaleRussoSardoSaturazioneSeleziona il dispositivo da espellere:ImpostazioniAiutoModo CasualeSpegniSlovaccoSlovenoRiproduzione LentaSpagnoloTraccia SottotitoliMenu SottotitoliRitardo SottotitoliPlugin LIRC avviato.Plugin del joystick avviato.Plugin LIRC fermato.Plugin del joystick fermato.SvedeseTCPIl driver video non supporta OSD non scalati!Il driver video supporta OSD non scalati!L'altezza della finestraLa larghezza della finestra%s - Un Video-Player gratuito v%s TitoloMenu TitoloTraccia:TurcoUcrainoImpossibile reperire le informazioni sul file '%s': %s.SconosciutoErrore sconosciutoParametro %d sconosciuto!Uso: oxine [OPTIONS] [MRL] -Usa OSD non scalato (a schermo intero) se possibileVideo CDDVD VideoVolumeIn attesa di un flusso alternativo...Guarda un FilmGalleseAnno:YiddishDovresti creare un file contenente i mediamark in %s!Il tuo joystick non è stato mai calibrato!Zoom[M3U-Playlist: %s]attiva una voce o un bottonevaria il ritardo audiovaria il ritardo dei sottotitolivaria il volumedriver audio da usareautomaticocambia linguacambia la lingua dei sottotitolidisabilitatoabilitatofftgraphfftscopegoomkernellibcmmxmmxextMutonaviga nei menualtezza finestralarghezza finestranessunaoscopepausa/ riproduzioneseleziona una voce in una listasquadrasseferma la riproduzionemodifica il rapporto di aspettoattiva/disattiva l'interlacciamentoAttiva/Disattiva il volumedriver video da usare \ Kein Zeilenumbruch am Dateiende. +Video CDDVD VideoVolumeIn attesa di un flusso alternativo...Guarda un FilmGalleseAnno:YiddishDovresti creare un file contenente i mediamark in %s!Il tuo joystick non è stato mai calibrato!Zoom[M3U-Playlist: %s]attiva una voce o un bottonevaria il ritardo audiovaria il ritardo dei sottotitolivaria il volumedriver audio da usareautomaticocambia linguacambia la lingua dei sottotitolidisabilitatoabilitatofftgraphfftscopegoomkernellibcmmxmmxextMutonaviga nei menualtezza finestralarghezza finestranessunaoscopepausa/ riproduzioneseleziona una voce in una listasquadrasseferma la riproduzionemodifica il rapporto di aspettoattiva/disattiva l'interlacciamentoAttiva/Disattiva il volumedriver video da usare \ Kein Zeilenumbruch am Dateiende. diff -Naur oxine-0.6.orig/po/it.po oxine-0.6.3/po/it.po --- oxine-0.6.orig/po/it.po 2006-11-03 18:35:36.000000000 +0100 +++ oxine-0.6.3/po/it.po 2006-11-22 10:56:28.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: oxine 0.5\n" "Report-Msgid-Bugs-To: mschwerin@users.sf.net\n" -"POT-Creation-Date: 2006-11-03 18:35+0100\n" +"POT-Creation-Date: 2006-11-22 10:56+0100\n" "PO-Revision-Date: 2006-10-17 10:14+0100\n" "Last-Translator: Maximilian Schwerin \n" "Language-Team: Italian \n" @@ -21,20 +21,20 @@ msgid "Could not perform codeset conversion (%s)!" msgstr "Impossibile effettuare la conversione codeset (%s)!" -#: src/disc.c:122 src/disc.c:323 src/disc.c:625 src/environment.c:819 -#: src/environment.c:837 src/filelist.c:805 src/mediamarks_favorites.c:98 -#: src/meta_info.c:85 src/odk.c:1020 src/odk.c:1103 src/odk_osd.c:806 -#: src/odk_osd.c:855 src/playlist_m3u.c:109 src/playlist_xml.c:55 -#: src/weather.c:122 +#: src/disc.c:122 src/disc.c:301 src/disc.c:326 src/disc.c:628 +#: src/environment.c:829 src/environment.c:847 src/filelist.c:805 +#: src/mediamarks_favorites.c:98 src/meta_info.c:85 src/odk.c:1020 +#: src/odk.c:1105 src/odk_osd.c:831 src/odk_osd.c:880 src/playlist_m3u.c:109 +#: src/playlist_xml.c:55 src/weather.c:122 #, c-format msgid "Could not open '%s': %s!" msgstr "Impossibile aprire '%s': %s!" -#: src/disc.c:213 src/disc.c:473 src/filelist.c:736 +#: src/disc.c:213 src/disc.c:474 src/filelist.c:736 msgid "Audio CD" msgstr "Audio CD" -#: src/disc.c:229 src/filelist.c:734 src/main_menu.c:238 +#: src/disc.c:229 src/filelist.c:734 src/main_menu.c:253 src/main_menu.c:269 msgid "Video CD" msgstr "Video CD" @@ -59,41 +59,40 @@ msgid "Unknown Disc" msgstr "Sconosciuto" -#: src/disc.c:371 -#, c-format -msgid "Could not mount %s!" -msgstr "Impossibile montare %s!" +#: src/disc.c:374 +#, fuzzy, c-format +msgid "Could not mount '%s': %s!" +msgstr "Impossibile aprire '%s': %s!" -#: src/disc.c:391 -#, c-format -msgid "Could not unmount %s!" -msgstr "Impossibile smontare %s!" +#: src/disc.c:374 src/disc.c:394 src/disc.c:414 src/lang.c:506 +msgid "Unknown" +msgstr "Sconosciuto" -#: src/disc.c:411 -#, c-format -msgid "Could not eject %s!" -msgstr "Impossibile espellere %s!" +#: src/disc.c:394 +#, fuzzy, c-format +msgid "Could not unmount '%s': %s!" +msgstr "Impossibile smontare %s!" -#: src/disc.c:419 src/disc.c:425 +#: src/disc.c:414 src/disc.c:422 src/disc.c:427 #, fuzzy, c-format msgid "Could not eject '%s': %s!" msgstr "Impossibile espellere %s!" -#: src/disc.c:474 +#: src/disc.c:475 msgid "Title" msgstr "Titolo" -#: src/disc.c:671 +#: src/disc.c:688 #, fuzzy, c-format msgid "Could not create disc polling thread: %s!" msgstr "Impossibile creare il processo per l'autorilevamento del disco!" -#: src/disc.c:673 +#: src/disc.c:691 #, fuzzy msgid "Successfully started disc polling thread." msgstr "Scheduler avviato." -#: src/disc.c:685 +#: src/disc.c:703 #, fuzzy msgid "Successfully stopped disc polling thread." msgstr "Plugin LIRC fermato." @@ -107,7 +106,7 @@ msgid "Unknown prefix to URL '%s'!" msgstr "Parametro %d sconosciuto!" -#: src/download.c:227 src/environment.c:612 +#: src/download.c:227 src/environment.c:622 #, c-format msgid "Could not create '%s': %s!" msgstr "Impossibile creare '%s': %s!" @@ -145,61 +144,61 @@ msgid "Part Menu" msgstr "Menu Capitoli" -#: src/environment.c:135 src/environment.c:268 src/environment.c:586 -#: src/environment.c:593 src/environment.c:825 +#: src/environment.c:141 src/environment.c:289 src/environment.c:596 +#: src/environment.c:603 src/environment.c:835 #, c-format msgid "Unable to get status for file '%s': %s." msgstr "Impossibile reperire le informazioni sul file '%s': %s." -#: src/environment.c:144 src/environment.c:278 +#: src/environment.c:153 #, fuzzy, c-format msgid "Unable to read link '%s' file: %s." msgstr "Impossibile reperire le informazioni sul file '%s': %s." -#: src/environment.c:218 +#: src/environment.c:230 msgid "Found a device we are interested in:" msgstr "Trovato un dispositivo:" -#: src/environment.c:219 +#: src/environment.c:231 #, c-format msgid " device: %s" msgstr "" -#: src/environment.c:220 +#: src/environment.c:232 #, c-format msgid " mountpoint: %s" msgstr "" -#: src/environment.c:221 +#: src/environment.c:233 #, c-format msgid " filesystem: %s" msgstr "" -#: src/environment.c:413 +#: src/environment.c:423 #, fuzzy msgid "Unable to find usable home directory, using '/tmp'." msgstr "Impossibile determinare la cartella home, uso '/tmp'." -#: src/environment.c:831 +#: src/environment.c:841 #, c-format msgid "File '%s' is empty!" msgstr "Il file '%s' è vuoto!" -#: src/environment.c:848 +#: src/environment.c:858 #, c-format msgid "Could not read '%s': %s!" msgstr "Impossibile leggere '%s': %s!" -#: src/environment.c:930 src/environment.c:931 +#: src/environment.c:940 src/environment.c:941 #, fuzzy msgid "devices to poll (separate using ';')" msgstr "dispositivi aggiuntivi (separati da ';')" -#: src/event.c:635 src/gui_utils.c:465 +#: src/event.c:681 src/gui_utils.c:492 msgid "Could not play title!" msgstr "Impossibile riprodurre il titolo!" -#: src/event.c:639 +#: src/event.c:685 msgid "Waiting for alternative stream..." msgstr "In attesa di un flusso alternativo..." @@ -222,7 +221,7 @@ msgid "[M3U-Playlist: %s]" msgstr "[M3U-Playlist: %s]" -#: src/filelist.c:732 src/main_menu.c:276 +#: src/filelist.c:732 src/main_menu.c:303 src/main_menu.c:319 msgid "DVD" msgstr "DVD" @@ -244,118 +243,147 @@ msgid "My VDR Recordings" msgstr "" -#: src/filelist_menu.c:135 +#: src/filelist_menu.c:127 msgid "Reset" msgstr "" -#: src/filelist_menu.c:137 src/filelist_menu.c:818 src/playlist_menu.c:1028 +#: src/filelist_menu.c:132 src/filelist_menu.c:139 src/filelist_menu.c:146 +#: src/filelist_menu.c:151 src/filelist_menu.c:834 src/playlist_menu.c:1041 msgid "Remove" msgstr "Cancella" -#: src/filelist_menu.c:145 src/main_menu.c:465 -msgid "Eject" -msgstr "Espelli" - -#: src/filelist_menu.c:237 +#: src/filelist_menu.c:250 msgid "Play all titles in this folder and all subfolders..." msgstr "" -#: src/filelist_menu.c:243 +#: src/filelist_menu.c:256 msgid "Play all titles in this folder..." msgstr "" -#: src/filelist_menu.c:367 src/filelist_menu.c:575 src/playlist_menu.c:245 -#: src/playlist_menu.c:410 +#: src/filelist_menu.c:385 src/filelist_menu.c:591 src/playlist_menu.c:255 +#: src/playlist_menu.c:420 msgid "Choose an entry..." msgstr "" -#: src/filelist_menu.c:398 src/filelist_menu.c:408 src/filelist_menu.c:710 +#: src/filelist_menu.c:416 src/filelist_menu.c:426 src/filelist_menu.c:726 #, fuzzy, c-format msgid "Could not remove '%s': %s!" msgstr "Impossibile creare '%s': %s!" -#: src/filelist_menu.c:409 +#: src/filelist_menu.c:427 msgid "SVDRP error" msgstr "" -#: src/filelist_menu.c:446 src/playlist_menu.c:295 +#: src/filelist_menu.c:462 src/playlist_menu.c:305 msgid "Could not open disc!" msgstr "Impossibile aprire il disco!" -#: src/filelist_menu.c:810 src/playlist_menu.c:1010 +#: src/filelist_menu.c:826 src/playlist_menu.c:1023 msgid "Play" msgstr "Play" -#: src/filelist_menu.c:814 src/playlist_menu.c:540 src/playlist_menu.c:1023 +#: src/filelist_menu.c:830 src/playlist_menu.c:550 src/playlist_menu.c:1036 msgid "Add" msgstr "Aggiungi" -#: src/filelist_menu.c:822 src/playback_menu.c:1053 src/settings_menu.c:511 +#: src/filelist_menu.c:838 src/main_menu.c:524 +msgid "Eject" +msgstr "Espelli" + +#: src/filelist_menu.c:842 src/playback_menu.c:1076 src/settings_menu.c:509 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:77 msgid "Playlist" msgstr "Playlist" -#: src/filelist_menu.c:826 src/playback_menu.c:1047 src/playlist_menu.c:1053 -#: src/settings_menu.c:539 src/weather_menu.c:164 +#: src/filelist_menu.c:846 src/playback_menu.c:1070 src/playlist_menu.c:1066 +#: src/settings_menu.c:537 src/weather_menu.c:164 msgid "Mainmenu" msgstr "Menu principale" -#: src/filelist_menu.c:830 src/main_menu.c:481 src/playlist_menu.c:1057 +#: src/filelist_menu.c:850 src/main_menu.c:540 src/playlist_menu.c:1070 msgid "Current title" msgstr "" -#: src/filelist_menu.c:945 +#: src/filelist_menu.c:965 msgid "Could not load mediamarks." msgstr "Impossibile caricare i mediamark." -#: src/filelist_menu.c:946 +#: src/filelist_menu.c:966 #, c-format msgid "You should create a file containing mediamarks at %s!" msgstr "Dovresti creare un file contenente i mediamark in %s!" -#: src/filelist_menu.c:980 src/filelist_menu.c:1013 src/filelist_menu.c:1044 +#: src/filelist_menu.c:1000 src/filelist_menu.c:1033 src/filelist_menu.c:1064 #: src/gui_utils.h:65 msgid "Please wait..." msgstr "Attendere prego..." -#: src/gui_utils.c:193 +#: src/gui_utils.c:195 msgid "Could not open or play background, leaving oxine!" msgstr "" -#: src/gui_utils.c:194 +#: src/gui_utils.c:196 msgid "Please make sure, that your version of xine-lib can play PNG files." msgstr "" -#: src/gui_utils.c:391 src/gui_utils.c:398 src/main_menu.c:381 -#: src/playlist_menu.c:950 +#: src/gui_utils.c:393 src/gui_utils.c:400 src/main_menu.c:419 +#: src/playlist_menu.c:963 msgid "OK" msgstr "OK" -#: src/gui_utils.c:403 src/gui_utils.c:425 src/main_menu.c:385 -#: src/main_menu.c:469 src/playlist_menu.c:953 +#: src/gui_utils.c:405 src/gui_utils.c:427 src/main_menu.c:423 +#: src/main_menu.c:528 src/playlist_menu.c:966 msgid "Cancel" msgstr "Annulla" -#: src/gui_utils.c:409 +#: src/gui_utils.c:411 #, fuzzy msgid "Yes" msgstr "esc" -#: src/gui_utils.c:414 +#: src/gui_utils.c:416 msgid "No" msgstr "" -#: src/gui_utils.c:420 +#: src/gui_utils.c:422 msgid "Retry" msgstr "" -#: src/help_menu.c:43 src/playback_menu.c:473 src/playback_menu.c:527 -#: src/settings_menu.c:462 +#: src/gui_utils.c:478 +#, fuzzy +msgid "Could not play Audio CD!" +msgstr "Impossibile riprodurre il titolo!" + +#: src/gui_utils.c:479 src/main_menu.c:213 +#, fuzzy +msgid "Please insert an Audio CD!" +msgstr "Inserire un Audio CD!" + +#: src/gui_utils.c:483 +#, fuzzy +msgid "Could not play Video CD!" +msgstr "Impossibile riprodurre il titolo!" + +#: src/gui_utils.c:484 src/main_menu.c:263 +msgid "Please insert a Video CD!" +msgstr "Inserire un Video CD!" + +#: src/gui_utils.c:488 +#, fuzzy +msgid "Could not play DVD!" +msgstr "Impossibile riprodurre il titolo!" + +#: src/gui_utils.c:489 src/main_menu.c:313 +msgid "Please insert a DVD!" +msgstr "Inserire un DVD!" + +#: src/help_menu.c:43 src/playback_menu.c:490 src/playback_menu.c:549 +#: src/settings_menu.c:460 msgid "Next Page" msgstr "Successiva" -#: src/help_menu.c:49 src/playback_menu.c:477 src/playback_menu.c:531 -#: src/playback_menu.c:535 src/playlist_menu.c:543 src/settings_menu.c:467 +#: src/help_menu.c:49 src/playback_menu.c:494 src/playback_menu.c:553 +#: src/playback_menu.c:557 src/playlist_menu.c:553 src/settings_menu.c:465 msgid "Back" msgstr "Indietro" @@ -1272,109 +1300,97 @@ msgid "Zulu" msgstr "" -#: src/lang.c:506 -msgid "Unknown" -msgstr "Sconosciuto" - #: src/main_menu.c:71 #, fuzzy msgid "Could not find DVB channels file!" msgstr "Impossibile trovare un file di configurazione di LIRC." -#: src/main_menu.c:207 -#, fuzzy -msgid "Please insert an Audio CD!" -msgstr "Inserire un Audio CD!" - -#: src/main_menu.c:245 -msgid "Please insert a Video CD!" -msgstr "Inserire un Video CD!" - -#: src/main_menu.c:283 -msgid "Please insert a DVD!" -msgstr "Inserire un DVD!" - -#: src/main_menu.c:328 +#: src/main_menu.c:366 msgid "How do you want to proceed?" msgstr "" -#: src/main_menu.c:342 +#: src/main_menu.c:380 msgid "Quit oxine" msgstr "" -#: src/main_menu.c:351 +#: src/main_menu.c:389 msgid "Shutdown the computer" msgstr "" -#: src/main_menu.c:360 +#: src/main_menu.c:398 msgid "Switch computer to standby" msgstr "" -#: src/main_menu.c:369 +#: src/main_menu.c:407 msgid "Reboot the computer" msgstr "" -#: src/main_menu.c:427 +#: src/main_menu.c:472 +#, fuzzy +msgid "Could not unmount device!" +msgstr "Impossibile smontare %s!" + +#: src/main_menu.c:476 msgid "Could not eject device!" msgstr "Impossibile espellere il dispositivo!" -#: src/main_menu.c:449 +#: src/main_menu.c:508 msgid "Select device to eject:" msgstr "Seleziona il dispositivo da espellere:" -#: src/main_menu.c:593 +#: src/main_menu.c:652 msgid "Listen to Music" msgstr "Ascolta Musica" -#: src/main_menu.c:594 +#: src/main_menu.c:653 msgid "Watch Films" msgstr "Guarda un Film" -#: src/main_menu.c:595 +#: src/main_menu.c:654 #, fuzzy msgid "Watch Television" msgstr "TV Digitale" -#: src/main_menu.c:596 +#: src/main_menu.c:655 #, fuzzy msgid "Play a DVD" msgstr "Inserire un DVD!" -#: src/main_menu.c:597 +#: src/main_menu.c:656 #, fuzzy msgid "Play a Video CD" msgstr "Inserire un Video CD!" -#: src/main_menu.c:598 +#: src/main_menu.c:657 #, fuzzy msgid "Play an Audio CD" msgstr "Inserire un Audio CD!" -#: src/main_menu.c:599 +#: src/main_menu.c:658 msgid "Show Help" msgstr "Aiuto" -#: src/main_menu.c:600 +#: src/main_menu.c:659 msgid "Show Weather Report" msgstr "" -#: src/main_menu.c:601 +#: src/main_menu.c:660 #, fuzzy msgid "Edit Settings" msgstr "Impostazioni" -#: src/main_menu.c:602 src/settings_menu.c:512 +#: src/main_menu.c:661 src/settings_menu.c:510 msgid "Shutdown" msgstr "Spegni" -#: src/main_menu.c:624 +#: src/main_menu.c:683 #, fuzzy msgid "Could not load main menu!" msgstr "Impossibile caricare i mediamark." #: src/mediamarks.c:103 src/mediamarks.c:139 src/menulist.c:140 -#: src/menulist.c:186 src/otk.c:3560 src/otk.c:3565 src/otk.c:3622 -#: src/otk.c:3627 src/playlist_xml.c:141 src/playlist_xml.c:176 +#: src/menulist.c:186 src/otk.c:3597 src/otk.c:3602 src/otk.c:3659 +#: src/otk.c:3664 src/playlist_xml.c:141 src/playlist_xml.c:176 #, fuzzy, c-format msgid "Unknown name '%s' for node!" msgstr "Parametro %s sconosciuto!" @@ -1383,13 +1399,13 @@ msgid "Found an entry that did not contain a MRL!" msgstr "Trovata una voce che non contiene un MRL!" -#: src/mediamarks.c:159 src/menulist.c:207 src/otk.c:3591 +#: src/mediamarks.c:159 src/menulist.c:207 src/otk.c:3628 #: src/playlist_xml.c:196 #, c-format msgid "Parsing '%s' failed!" msgstr "Analisi di '%s' fallita!" -#: src/mediamarks.c:165 src/menulist.c:212 src/otk.c:3596 +#: src/mediamarks.c:165 src/menulist.c:212 src/otk.c:3633 #: src/playlist_xml.c:201 #, fuzzy, c-format msgid "Root node of '%s' must be '%s'!" @@ -1437,23 +1453,23 @@ msgid "Aspect Ratio" msgstr "Rapporto d'aspetto" -#: src/odk.c:519 src/odk.c:1414 +#: src/odk.c:519 src/odk.c:1458 msgid "Hue" msgstr "Colore" -#: src/odk.c:522 src/odk.c:1416 +#: src/odk.c:522 src/odk.c:1460 msgid "Saturation" msgstr "Saturazione" -#: src/odk.c:525 src/odk.c:1412 +#: src/odk.c:525 src/odk.c:1455 msgid "Contrast" msgstr "Contrasto" -#: src/odk.c:528 src/odk.c:1410 +#: src/odk.c:528 src/odk.c:1452 msgid "Brightness" msgstr "Luminosità " -#: src/odk.c:532 +#: src/odk.c:532 src/odk.c:1463 msgid "Zoom" msgstr "Zoom" @@ -1494,8 +1510,8 @@ msgid "none" msgstr "nessuna" -#: src/odk.c:592 src/odk.c:608 src/odk.c:629 src/settings_menu.c:600 -#: src/settings_menu.c:634 src/settings_menu.c:643 +#: src/odk.c:592 src/odk.c:608 src/odk.c:629 src/settings_menu.c:598 +#: src/settings_menu.c:632 src/settings_menu.c:641 msgid "auto" msgstr "automatico" @@ -1548,51 +1564,42 @@ msgid "Malformed MRL" msgstr "MRL non corretto" -#: src/odk.c:1110 +#: src/odk.c:1112 #, c-format msgid "Could not play '%s': %s!" msgstr "Impossibile riprodurre '%s': %s!" -#: src/odk.c:1375 src/odk.c:1376 +#: src/odk.c:1422 src/odk.c:1423 msgid "encode special characters in MRLs" msgstr "" -#: src/odk.c:1380 -#, fuzzy -msgid "use unscaled OSD if possible" -msgstr "Usa OSD non scalato" - -#: src/odk.c:1381 -msgid "Use unscaled (full screen resolution) OSD if possible" -msgstr "Usa OSD non scalato (a schermo intero) se possibile" - -#: src/odk.c:1386 +#: src/odk.c:1428 #, fuzzy msgid "audio visualization type" msgstr "Plugin di visualizzazione audio" -#: src/odk.c:1387 +#: src/odk.c:1429 msgid "" "What kind of visual output is to be displayed when playing an audio only " "stream." msgstr "" -#: src/odk.c:1394 +#: src/odk.c:1436 msgid "background image MRL" msgstr "" -#: src/odk.c:1395 +#: src/odk.c:1437 #, fuzzy msgid "" "The MRL of the background image that will be displayed if 'visual_anim." "style' is set to 'Background Image'" msgstr "l'MRL che sarà  visualizzato se 'visual_anim' è impostato a 'None'" -#: src/odk.c:1403 +#: src/odk.c:1445 msgid "stream animation MRL" msgstr "" -#: src/odk.c:1404 +#: src/odk.c:1446 #, fuzzy msgid "" "The MRL of the stream animation that will be displayed if 'visual_anim." @@ -1601,21 +1608,21 @@ "Il MRL che sarà visualizzato se 'visual_anim' è impostato a 'Stream " "Animation'" -#: src/odk.c:1459 +#: src/odk.c:1506 #, c-format msgid "Failed to create window using video driver '%s'!" msgstr "Impossibile creare la finestra usando il driver video '%s'!" -#: src/odk.c:1464 +#: src/odk.c:1511 msgid "Failed to create window using default driver." msgstr "Impossibile creare la finestra usando il driver predefinito." -#: src/odk.c:1474 +#: src/odk.c:1521 #, c-format msgid "Failed to open audio port using audio driver '%s'!" msgstr "Impossibile aprire la porta audio usando il driver audio '%s'!" -#: src/odk.c:1479 +#: src/odk.c:1526 msgid "Failed to open audio port using default audio driver." msgstr "Impossibile aprire la porta audio usando il driver audio predefinito." @@ -1706,31 +1713,31 @@ msgid "Successfully stopped the LIRC input plugin." msgstr "Plugin LIRC fermato." -#: src/odk_osd.c:427 +#: src/odk_osd.c:452 #, fuzzy, c-format msgid "Could not read image '%s'!" msgstr "Impossibile creare '%s': %s!" -#: src/odk_osd.c:482 +#: src/odk_osd.c:507 #, fuzzy, c-format msgid "Could not scale image '%s'!" msgstr "Impossibile creare '%s': %s!" -#: src/odk_osd.c:525 +#: src/odk_osd.c:550 #, fuzzy msgid "Could not get pixel data!" msgstr "Impossibile creare un flusso!" -#: src/odk_osd.c:745 +#: src/odk_osd.c:770 #, fuzzy, c-format msgid "Could not free a cache entry for '%s'." msgstr "Impossibile creare '%s': %s!" -#: src/odk_osd.c:1671 +#: src/odk_osd.c:1721 msgid "The current video driver supports unscaled OSD!" msgstr "Il driver video supporta OSD non scalati!" -#: src/odk_osd.c:1673 +#: src/odk_osd.c:1723 msgid "The current video driver does not support unscaled OSD!" msgstr "Il driver video non supporta OSD non scalati!" @@ -1765,79 +1772,79 @@ msgid "Found %d Xinerama screens:" msgstr "" -#: src/odk_x11.c:1014 +#: src/odk_x11.c:1002 #, c-format msgid "" "Overriding calculated monitor pixel aspect ratio with user provided value: " "%.02f" msgstr "" -#: src/odk_x11.c:1030 +#: src/odk_x11.c:1018 #, c-format msgid "Failed to open video port '%s', falling back to 'auto'." msgstr "Errore di apertura porta video '%s', ritorno su 'auto'" -#: src/odk_x11.c:1037 +#: src/odk_x11.c:1025 msgid "Failed to open video port!" msgstr "Errore di apertura porta video" -#: src/otk.c:3527 src/otk.c:3534 +#: src/otk.c:3564 src/otk.c:3571 #, c-format msgid "Missing property (required) '%s'!" msgstr "Parametro mancante (obbligatorio) '%s'!" -#: src/otk.c:3578 +#: src/otk.c:3615 #, fuzzy, c-format msgid "Loading palette file '%s'..." msgstr "Caricamento menu '%s'..." -#: src/otk.c:3654 +#: src/otk.c:3691 msgid "Could not load palette, reverting to standard colors." msgstr "" -#: src/oxine.c:107 +#: src/oxine.c:113 #, c-format msgid "Usage: oxine [OPTIONS] [MRL]\n" msgstr "Uso: oxine [OPTIONS] [MRL]\n" -#: src/oxine.c:109 +#: src/oxine.c:115 #, c-format msgid "OPTIONS are:\n" msgstr "Le OPZIONI sono:\n" -#: src/oxine.c:110 +#: src/oxine.c:116 #, c-format msgid " -v, --version Display version.\n" msgstr " -v, --version Visualizza versione.\n" -#: src/oxine.c:111 +#: src/oxine.c:117 #, c-format msgid " --verbose [=level] Set verbosity level. Default is 1.\n" msgstr "" " --verbose [=level] Imposta il livello di dettaglio. Predefinito " "1.\n" -#: src/oxine.c:113 +#: src/oxine.c:119 #, c-format msgid " -l, --logfile Set the log filename.\n" msgstr "" -#: src/oxine.c:114 +#: src/oxine.c:120 #, fuzzy, c-format msgid " -V, --video-driver Select video driver by ID.\n" msgstr " -V, --video-driver Seleziona il driver video usando ID.\n" -#: src/oxine.c:115 src/oxine.c:129 +#: src/oxine.c:121 src/oxine.c:135 #, c-format msgid " Available drivers:\n" msgstr " Driver disponibili:\n" -#: src/oxine.c:128 +#: src/oxine.c:134 #, fuzzy, c-format msgid " -A, --audio-driver Select audio driver by ID.\n" msgstr " -A, --audio-driver Seleziona il driver audio usando ID.\n" -#: src/oxine.c:140 +#: src/oxine.c:146 #, fuzzy, c-format msgid "" " -X, --xineramascreen [=num] Sets the screen on which the fullscreen " @@ -1847,12 +1854,12 @@ " -X, --xineramascreen [=NUM] Seleziona lo scrermo nel quale la finestra\n" " a schermo intero sarà visualizzata.\n" -#: src/oxine.c:144 +#: src/oxine.c:150 #, fuzzy, c-format msgid " -F, --no-fullscreen Do no start in fullscreen mode.\n" msgstr " -f, --fullscreen Modalità schermo intero.\n" -#: src/oxine.c:147 +#: src/oxine.c:153 #, fuzzy, c-format msgid "" " -P, --no-polling Do not use automatic polling for removable " @@ -1860,17 +1867,25 @@ msgstr "" " -P, --no-polling Disabilita l'autorilevamento dei discchi.\n" -#: src/oxine.c:151 +#: src/oxine.c:157 #, fuzzy, c-format msgid " -L, --no-lirc Do not use remote control (LIRC).\n" msgstr " -L, --no-lirc Disabilita il supporto per LIRC.\n" -#: src/oxine.c:155 +#: src/oxine.c:161 #, fuzzy, c-format msgid " -J, --no-joystick Do not use joystick support.\n" msgstr " -J, --no-joystick Disabilita il supporto ai joystick.\n" -#: src/oxine.c:159 +#: src/oxine.c:165 +#, fuzzy, c-format +msgid "" +" -W, --no-weather Do not automaticaly retrieve weather " +"information.\n" +msgstr "" +" -P, --no-polling Disabilita l'autorilevamento dei discchi.\n" + +#: src/oxine.c:169 #, fuzzy, c-format msgid "" "Examples for valid MRLs (media resource locator):\n" @@ -1895,88 +1910,83 @@ " 'dvd://'\n" " VCD: 'vcd://'\n" -#: src/oxine.c:180 src/oxine.c:181 +#: src/oxine.c:190 src/oxine.c:191 msgid "video driver to use" msgstr "driver video da usare" -#: src/oxine.c:184 src/oxine.c:185 +#: src/oxine.c:194 src/oxine.c:195 msgid "audio driver to use" msgstr "driver audio da usare" -#: src/oxine.c:190 src/oxine.c:191 +#: src/oxine.c:199 src/oxine.c:200 #, fuzzy msgid "Xinerama screen for fullscreen window" msgstr "L'altezza della finestra" -#: src/oxine.c:196 src/oxine.c:197 -#, fuzzy -msgid "percentage of fullscreen screen to use" -msgstr "percentuale di riduzione schermo intero" - -#: src/oxine.c:201 +#: src/oxine.c:204 msgid "non-fullscreen window width" msgstr "larghezza finestra" -#: src/oxine.c:202 +#: src/oxine.c:205 msgid "The width of the non-fullscreen window" msgstr "La larghezza della finestra" -#: src/oxine.c:206 +#: src/oxine.c:209 msgid "non-fullscreen window height" msgstr "altezza finestra" -#: src/oxine.c:207 +#: src/oxine.c:210 msgid "The height of the non-fullscreen window" msgstr "L'altezza della finestra" -#: src/oxine.c:211 src/oxine.c:212 +#: src/oxine.c:214 src/oxine.c:215 msgid "aspect ratio of one monitor pixel" msgstr "" -#: src/oxine.c:217 +#: src/oxine.c:220 msgid "ask before leaving oxine" msgstr "" -#: src/oxine.c:218 +#: src/oxine.c:221 msgid "Are we to show the quit confirm dialog?" msgstr "" -#: src/oxine.c:222 src/oxine.c:223 +#: src/oxine.c:225 src/oxine.c:226 #, fuzzy msgid "command that was selected the last time" msgstr "Comando eseguito allo spegnimento" -#: src/oxine.c:228 src/oxine.c:229 +#: src/oxine.c:231 src/oxine.c:232 #, fuzzy msgid "shell command (power off)" msgstr "Comando shell eseguito allo spegnimento" -#: src/oxine.c:234 src/oxine.c:235 +#: src/oxine.c:237 src/oxine.c:238 #, fuzzy msgid "shell command (reboot)" msgstr "Comando shell eseguito allo spegnimento" -#: src/oxine.c:239 src/oxine.c:240 +#: src/oxine.c:242 src/oxine.c:243 #, fuzzy msgid "shell command (standby)" msgstr "Comando shell eseguito allo spegnimento" -#: src/oxine.c:245 +#: src/oxine.c:248 msgid "METAR ICAO location indicator" msgstr "" -#: src/oxine.c:246 +#: src/oxine.c:249 msgid "" "The METAR ICAO Location Indicator defines for which location the weather is " "to be displayed." msgstr "" -#: src/oxine.c:252 +#: src/oxine.c:255 #, fuzzy msgid "reload playlist on start" msgstr "Salva la playlist su file" -#: src/oxine.c:253 +#: src/oxine.c:256 msgid "" "If this is enabled and if you don't specify any MRL on the command line, " "oxine will automatically load the previous playlist." @@ -1984,12 +1994,12 @@ "Se abilitato e non c'è nessun MRL nella linea di comando, oxine " "automaticamente carica l'ultima playlist." -#: src/oxine.c:259 +#: src/oxine.c:262 #, fuzzy msgid "play reloaded playlist on start" msgstr "Salva la playlist su file" -#: src/oxine.c:260 +#: src/oxine.c:263 msgid "" "If this is enabled and gui.playlist_auto_reload is also enabled the reloaded " "playlist will automatically be played." @@ -1997,130 +2007,130 @@ "se abilitato insieme a gui.playlist_auto_reload, la riproduzione della " "playlist sarà automaticamente avviata." -#: src/oxine.c:267 +#: src/oxine.c:270 #, fuzzy msgid "subtitle autoloading" msgstr "Caricamento automatico dei sottotitoli" -#: src/oxine.c:268 +#: src/oxine.c:271 msgid "Automatically load subtitles if they exist." msgstr "Carica automaticamente i sottotitoli, se esistono." -#: src/oxine.c:395 +#: src/oxine.c:406 #, c-format msgid "This is %s - A free Video-Player v%s\n" msgstr "%s - Un Video-Player gratuito v%s\n" -#: src/oxine.c:397 +#: src/oxine.c:408 #, c-format msgid "(c) 2005 by the oxine project\n" msgstr "(c) 2005 del progetto oxine\n" -#: src/oxine.c:406 +#: src/oxine.c:417 #, c-format msgid "Invalid argument %d!" msgstr "Argomento %d non valido!" -#: src/oxine.c:491 +#: src/oxine.c:502 #, fuzzy msgid "Could not initialize ODK!" msgstr "Errore di inizializzazione dei processi per X!" -#: src/oxine.c:502 +#: src/oxine.c:513 #, fuzzy msgid "Could not inizialize OTK!" msgstr "Errore di inizializzazione dei processi per X!" -#: src/playback_menu.c:747 src/playback_menu.c:1172 +#: src/playback_menu.c:769 src/playback_menu.c:1195 msgid "Album:" msgstr "Album:" -#: src/playback_menu.c:753 src/playback_menu.c:1178 +#: src/playback_menu.c:775 src/playback_menu.c:1201 msgid "Artist:" msgstr "Artista:" -#: src/playback_menu.c:759 src/playback_menu.c:1184 +#: src/playback_menu.c:781 src/playback_menu.c:1207 msgid "Year:" msgstr "Anno:" -#: src/playback_menu.c:765 src/playback_menu.c:1190 +#: src/playback_menu.c:787 src/playback_menu.c:1213 msgid "Track:" msgstr "Traccia:" -#: src/playback_menu.c:772 src/playback_menu.c:1197 +#: src/playback_menu.c:794 src/playback_menu.c:1220 msgid "Genre:" msgstr "Genere:" -#: src/playback_menu.c:779 +#: src/playback_menu.c:801 msgid "Length:" msgstr "Lunghezza:" -#: src/playback_menu.c:788 +#: src/playback_menu.c:810 msgid "Elapsed:" msgstr "Trascorso:" -#: src/playback_menu.c:1014 +#: src/playback_menu.c:1037 msgid "Loop Mode" msgstr "Modo Ciclico" -#: src/playback_menu.c:1019 +#: src/playback_menu.c:1042 msgid "Shuffle Mode" msgstr "Modo Casuale" -#: src/playback_menu.c:1024 +#: src/playback_menu.c:1047 msgid "Normal Mode" msgstr "Modo Normale" -#: src/playback_menu.c:1035 +#: src/playback_menu.c:1058 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:79 msgid "Settings" msgstr "Impostazioni" -#: src/playback_menu.c:1058 +#: src/playback_menu.c:1081 msgid "Media Browser" msgstr "" -#: src/playlist_menu.c:637 +#: src/playlist_menu.c:650 #, fuzzy msgid "Delete subtitle" msgstr "Menu Sottotitoli" -#: src/playlist_menu.c:639 src/playlist_menu.c:1043 +#: src/playlist_menu.c:652 src/playlist_menu.c:1056 #, fuzzy msgid "Add subtitle" msgstr "Menu Sottotitoli" -#: src/playlist_menu.c:661 +#: src/playlist_menu.c:674 #, fuzzy msgid "Subtitle" msgstr "Menu Sottotitoli" -#: src/playlist_menu.c:943 +#: src/playlist_menu.c:956 #, fuzzy msgid "Please enter a name for the playlist:" msgstr "L'ultima traccia suonata nella playlist" -#: src/playlist_menu.c:1014 +#: src/playlist_menu.c:1027 #, fuzzy msgid "Clear list" msgstr "Mostra Lista" -#: src/playlist_menu.c:1018 +#: src/playlist_menu.c:1031 #, fuzzy msgid "Save list" msgstr "Mostra Lista" -#: src/playlist_menu.c:1033 +#: src/playlist_menu.c:1046 #, fuzzy msgid "Move up" msgstr "Muovi Su" -#: src/playlist_menu.c:1038 +#: src/playlist_menu.c:1051 #, fuzzy msgid "Move down" msgstr "Muovi Giù" -#: src/playlist_menu.c:1048 +#: src/playlist_menu.c:1061 msgid "Media-Browser" msgstr "" @@ -2147,384 +2157,384 @@ "E' necessario riavviare oxine\n" "affinchè i cambi abbiano effetto!" -#: src/settings_menu.c:504 +#: src/settings_menu.c:502 #, fuzzy msgid "User Interface" msgstr "Deinterallaccia" -#: src/settings_menu.c:506 +#: src/settings_menu.c:504 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:80 #, fuzzy msgid "Weather" msgstr "Saturazione" -#: src/settings_menu.c:509 +#: src/settings_menu.c:507 msgid "Video Disc Recorder" msgstr "" -#: src/settings_menu.c:513 +#: src/settings_menu.c:511 #, fuzzy msgid "Audio Visualization" msgstr "Plugin di visualizzazione audio" -#: src/settings_menu.c:514 +#: src/settings_menu.c:512 #, fuzzy msgid "Audio" msgstr "automatico" -#: src/settings_menu.c:515 +#: src/settings_menu.c:513 #, fuzzy msgid "Video" msgstr "Video CD" -#: src/settings_menu.c:516 +#: src/settings_menu.c:514 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:76 #, fuzzy msgid "Media" msgstr "Muto" -#: src/settings_menu.c:517 +#: src/settings_menu.c:515 #, fuzzy msgid "Decoder" msgstr "decoder" -#: src/settings_menu.c:518 +#: src/settings_menu.c:516 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:78 #, fuzzy msgid "Subtitles" msgstr "Menu Sottotitoli" -#: src/settings_menu.c:519 +#: src/settings_menu.c:517 #, fuzzy msgid "Effects" msgstr "effetti" -#: src/settings_menu.c:520 +#: src/settings_menu.c:518 #, fuzzy msgid "Engine" msgstr "nessuna" -#: src/settings_menu.c:521 +#: src/settings_menu.c:519 msgid "Miscellaneous" msgstr "" -#: src/settings_menu.c:578 +#: src/settings_menu.c:576 msgid "white-black-transparent" msgstr "" -#: src/settings_menu.c:579 +#: src/settings_menu.c:577 msgid "white-none-transparent" msgstr "" -#: src/settings_menu.c:580 +#: src/settings_menu.c:578 msgid "white-none-translucid" msgstr "" -#: src/settings_menu.c:581 +#: src/settings_menu.c:579 msgid "yellow-black-transparent" msgstr "" -#: src/settings_menu.c:583 +#: src/settings_menu.c:581 msgid "Mono 1.0" msgstr "" -#: src/settings_menu.c:584 +#: src/settings_menu.c:582 msgid "Stereo 2.0" msgstr "" -#: src/settings_menu.c:585 +#: src/settings_menu.c:583 msgid "Headphones 2.0" msgstr "" -#: src/settings_menu.c:586 +#: src/settings_menu.c:584 msgid "Stereo 2.1" msgstr "" -#: src/settings_menu.c:587 +#: src/settings_menu.c:585 msgid "Surround 3.0" msgstr "" -#: src/settings_menu.c:588 +#: src/settings_menu.c:586 msgid "Surround 4.0" msgstr "" -#: src/settings_menu.c:589 +#: src/settings_menu.c:587 msgid "Surround 4.1" msgstr "" -#: src/settings_menu.c:590 +#: src/settings_menu.c:588 msgid "Surround 5.0" msgstr "" -#: src/settings_menu.c:591 +#: src/settings_menu.c:589 msgid "Surround 5.1" msgstr "" -#: src/settings_menu.c:592 +#: src/settings_menu.c:590 msgid "Surround 6.0" msgstr "" -#: src/settings_menu.c:593 +#: src/settings_menu.c:591 msgid "Surround 6.1" msgstr "" -#: src/settings_menu.c:594 +#: src/settings_menu.c:592 msgid "Surround 7.1" msgstr "" -#: src/settings_menu.c:595 +#: src/settings_menu.c:593 msgid "Pass Through" msgstr "" -#: src/settings_menu.c:597 +#: src/settings_menu.c:595 msgid "metronom feedback" msgstr "" -#: src/settings_menu.c:598 +#: src/settings_menu.c:596 msgid "resample" msgstr "" -#: src/settings_menu.c:601 +#: src/settings_menu.c:599 msgid "off" msgstr "" -#: src/settings_menu.c:602 +#: src/settings_menu.c:600 #, fuzzy msgid "on" msgstr "nessuna" -#: src/settings_menu.c:604 +#: src/settings_menu.c:602 msgid "2D_Tex_Fragprog" msgstr "2D_Tex_Fragprog" -#: src/settings_menu.c:605 +#: src/settings_menu.c:603 msgid "2D_Tex" msgstr "2D_Tex" -#: src/settings_menu.c:606 +#: src/settings_menu.c:604 msgid "2D_Tex_Tiled" msgstr "2D_Tex_Tiled" -#: src/settings_menu.c:607 +#: src/settings_menu.c:605 msgid "Image_Pipeline" msgstr "Image_Pipeline" -#: src/settings_menu.c:608 +#: src/settings_menu.c:606 msgid "Cylinder" msgstr "" -#: src/settings_menu.c:609 +#: src/settings_menu.c:607 msgid "Env_Mapped_Torus" msgstr "Env_Mapped_Torus" -#: src/settings_menu.c:611 +#: src/settings_menu.c:609 msgid "entire dvd" msgstr "" -#: src/settings_menu.c:612 +#: src/settings_menu.c:610 #, fuzzy msgid "one chapter" msgstr "capitolo o titolo successivo/precedente" -#: src/settings_menu.c:614 +#: src/settings_menu.c:612 msgid "seek in program chain" msgstr "" -#: src/settings_menu.c:615 +#: src/settings_menu.c:613 msgid "seek in program" msgstr "" -#: src/settings_menu.c:617 +#: src/settings_menu.c:615 msgid "skip program" msgstr "" -#: src/settings_menu.c:618 +#: src/settings_menu.c:616 msgid "skip part" msgstr "" -#: src/settings_menu.c:619 +#: src/settings_menu.c:617 #, fuzzy msgid "skip title" msgstr "Menu Sottotitoli" -#: src/settings_menu.c:621 +#: src/settings_menu.c:619 msgid "14.4 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:622 +#: src/settings_menu.c:620 msgid "19.2 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:623 +#: src/settings_menu.c:621 msgid "28.8 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:624 +#: src/settings_menu.c:622 msgid "33.6 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:625 +#: src/settings_menu.c:623 msgid "34.4 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:626 +#: src/settings_menu.c:624 msgid "57.6 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:627 +#: src/settings_menu.c:625 msgid "115.2 Kbps (ISDN)" msgstr "" -#: src/settings_menu.c:628 +#: src/settings_menu.c:626 msgid "262.2 Kbps (Cable/DSL)" msgstr "" -#: src/settings_menu.c:629 +#: src/settings_menu.c:627 msgid "393.2 Kbps (Cable/DSL)" msgstr "" -#: src/settings_menu.c:630 +#: src/settings_menu.c:628 msgid "524.3 Kbps (Cable/DSL)" msgstr "" -#: src/settings_menu.c:631 +#: src/settings_menu.c:629 msgid "1.5 Mbps (T1)" msgstr "" -#: src/settings_menu.c:632 +#: src/settings_menu.c:630 msgid "10.5 Mbps (LAN)" msgstr "" -#: src/settings_menu.c:635 +#: src/settings_menu.c:633 msgid "TCP" msgstr "TCP" -#: src/settings_menu.c:636 +#: src/settings_menu.c:634 msgid "HTTP" msgstr "HTTP" -#: src/settings_menu.c:638 +#: src/settings_menu.c:636 msgid "MPEG track" msgstr "" -#: src/settings_menu.c:639 src/settings_menu.c:645 +#: src/settings_menu.c:637 src/settings_menu.c:643 #, fuzzy msgid "entry" msgstr "invio" -#: src/settings_menu.c:640 +#: src/settings_menu.c:638 msgid "segment" msgstr "" -#: src/settings_menu.c:641 +#: src/settings_menu.c:639 msgid "playback-control item" msgstr "" -#: src/settings_menu.c:644 +#: src/settings_menu.c:642 #, fuzzy msgid "track" msgstr "Traccia:" -#: src/settings_menu.c:647 +#: src/settings_menu.c:645 #, fuzzy msgid "tiny" msgstr "Latino" -#: src/settings_menu.c:648 +#: src/settings_menu.c:646 msgid "small" msgstr "" -#: src/settings_menu.c:649 +#: src/settings_menu.c:647 msgid "normal" msgstr "" -#: src/settings_menu.c:650 +#: src/settings_menu.c:648 msgid "large" msgstr "" -#: src/settings_menu.c:651 +#: src/settings_menu.c:649 msgid "very large" msgstr "" -#: src/settings_menu.c:652 +#: src/settings_menu.c:650 msgid "huge" msgstr "" -#: src/settings_menu.c:654 +#: src/settings_menu.c:652 msgid "Fast but not photorealistic" msgstr "" -#: src/settings_menu.c:655 +#: src/settings_menu.c:653 msgid "Slow but looks better" msgstr "" -#: src/settings_menu.c:657 +#: src/settings_menu.c:655 msgid "default" msgstr "" -#: src/settings_menu.c:658 +#: src/settings_menu.c:656 msgid "reverse" msgstr "" -#: src/settings_menu.c:659 +#: src/settings_menu.c:657 msgid "content" msgstr "" -#: src/settings_menu.c:660 +#: src/settings_menu.c:658 msgid "extension" msgstr "" -#: src/settings_menu.c:662 +#: src/settings_menu.c:660 msgid "probe" msgstr "" -#: src/settings_menu.c:663 +#: src/settings_menu.c:661 msgid "libc" msgstr "libc" -#: src/settings_menu.c:664 +#: src/settings_menu.c:662 msgid "kernel" msgstr "kernel" -#: src/settings_menu.c:665 +#: src/settings_menu.c:663 msgid "mmx" msgstr "mmx" -#: src/settings_menu.c:666 +#: src/settings_menu.c:664 msgid "mmxext" msgstr "mmxext" -#: src/settings_menu.c:667 +#: src/settings_menu.c:665 msgid "sse" msgstr "sse" -#: src/settings_menu.c:669 +#: src/settings_menu.c:667 msgid "Background Image" msgstr "" -#: src/settings_menu.c:670 +#: src/settings_menu.c:668 #, fuzzy msgid "Background Animation" msgstr "Saturazione" -#: src/settings_menu.c:671 +#: src/settings_menu.c:669 #, fuzzy msgid "Post Plugin" msgstr "Nessun plugin di input" -#: src/settings_menu.c:673 +#: src/settings_menu.c:671 msgid "oscope" msgstr "oscope" -#: src/settings_menu.c:674 +#: src/settings_menu.c:672 msgid "fftscope" msgstr "fftscope" -#: src/settings_menu.c:675 +#: src/settings_menu.c:673 msgid "fftgraph" msgstr "fftgraph" -#: src/settings_menu.c:676 +#: src/settings_menu.c:674 msgid "goom" msgstr "goom" @@ -2920,6 +2930,23 @@ msgid "Music" msgstr "" +#~ msgid "Could not mount %s!" +#~ msgstr "Impossibile montare %s!" + +#~ msgid "Could not eject %s!" +#~ msgstr "Impossibile espellere %s!" + +#, fuzzy +#~ msgid "use unscaled OSD if possible" +#~ msgstr "Usa OSD non scalato" + +#~ msgid "Use unscaled (full screen resolution) OSD if possible" +#~ msgstr "Usa OSD non scalato (a schermo intero) se possibile" + +#, fuzzy +#~ msgid "percentage of fullscreen screen to use" +#~ msgstr "percentuale di riduzione schermo intero" + #, fuzzy #~ msgid "Corse" #~ msgstr "Irlandese" diff -Naur oxine-0.6.orig/po/Makefile.in.in oxine-0.6.3/po/Makefile.in.in --- oxine-0.6.orig/po/Makefile.in.in 2006-08-30 08:46:38.000000000 +0200 +++ oxine-0.6.3/po/Makefile.in.in 2006-11-11 14:08:21.000000000 +0100 @@ -23,9 +23,13 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ +ifeq ($(datarootdir),\@datarootdir\@) +datarootdir = @datadir@ +endif datadir = @datadir@ localedir = $(datadir)/locale -gettextsrcdir = $(datadir)/gettext/po +gettextsrcdir = $(datarootdir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -Naur oxine-0.6.orig/po/oxine.pot oxine-0.6.3/po/oxine.pot --- oxine-0.6.orig/po/oxine.pot 2006-11-03 18:35:35.000000000 +0100 +++ oxine-0.6.3/po/oxine.pot 2006-11-22 10:56:27.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: mschwerin@users.sf.net\n" -"POT-Creation-Date: 2006-11-03 18:35+0100\n" +"POT-Creation-Date: 2006-11-22 10:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,20 +21,20 @@ msgid "Could not perform codeset conversion (%s)!" msgstr "" -#: src/disc.c:122 src/disc.c:323 src/disc.c:625 src/environment.c:819 -#: src/environment.c:837 src/filelist.c:805 src/mediamarks_favorites.c:98 -#: src/meta_info.c:85 src/odk.c:1020 src/odk.c:1103 src/odk_osd.c:806 -#: src/odk_osd.c:855 src/playlist_m3u.c:109 src/playlist_xml.c:55 -#: src/weather.c:122 +#: src/disc.c:122 src/disc.c:301 src/disc.c:326 src/disc.c:628 +#: src/environment.c:829 src/environment.c:847 src/filelist.c:805 +#: src/mediamarks_favorites.c:98 src/meta_info.c:85 src/odk.c:1020 +#: src/odk.c:1105 src/odk_osd.c:831 src/odk_osd.c:880 src/playlist_m3u.c:109 +#: src/playlist_xml.c:55 src/weather.c:122 #, c-format msgid "Could not open '%s': %s!" msgstr "" -#: src/disc.c:213 src/disc.c:473 src/filelist.c:736 +#: src/disc.c:213 src/disc.c:474 src/filelist.c:736 msgid "Audio CD" msgstr "" -#: src/disc.c:229 src/filelist.c:734 src/main_menu.c:238 +#: src/disc.c:229 src/filelist.c:734 src/main_menu.c:253 src/main_menu.c:269 msgid "Video CD" msgstr "" @@ -58,40 +58,39 @@ msgid "Unknown Disc" msgstr "" -#: src/disc.c:371 +#: src/disc.c:374 #, c-format -msgid "Could not mount %s!" +msgid "Could not mount '%s': %s!" msgstr "" -#: src/disc.c:391 -#, c-format -msgid "Could not unmount %s!" +#: src/disc.c:374 src/disc.c:394 src/disc.c:414 src/lang.c:506 +msgid "Unknown" msgstr "" -#: src/disc.c:411 +#: src/disc.c:394 #, c-format -msgid "Could not eject %s!" +msgid "Could not unmount '%s': %s!" msgstr "" -#: src/disc.c:419 src/disc.c:425 +#: src/disc.c:414 src/disc.c:422 src/disc.c:427 #, c-format msgid "Could not eject '%s': %s!" msgstr "" -#: src/disc.c:474 +#: src/disc.c:475 msgid "Title" msgstr "" -#: src/disc.c:671 +#: src/disc.c:688 #, c-format msgid "Could not create disc polling thread: %s!" msgstr "" -#: src/disc.c:673 +#: src/disc.c:691 msgid "Successfully started disc polling thread." msgstr "" -#: src/disc.c:685 +#: src/disc.c:703 msgid "Successfully stopped disc polling thread." msgstr "" @@ -104,7 +103,7 @@ msgid "Unknown prefix to URL '%s'!" msgstr "" -#: src/download.c:227 src/environment.c:612 +#: src/download.c:227 src/environment.c:622 #, c-format msgid "Could not create '%s': %s!" msgstr "" @@ -142,59 +141,59 @@ msgid "Part Menu" msgstr "" -#: src/environment.c:135 src/environment.c:268 src/environment.c:586 -#: src/environment.c:593 src/environment.c:825 +#: src/environment.c:141 src/environment.c:289 src/environment.c:596 +#: src/environment.c:603 src/environment.c:835 #, c-format msgid "Unable to get status for file '%s': %s." msgstr "" -#: src/environment.c:144 src/environment.c:278 +#: src/environment.c:153 #, c-format msgid "Unable to read link '%s' file: %s." msgstr "" -#: src/environment.c:218 +#: src/environment.c:230 msgid "Found a device we are interested in:" msgstr "" -#: src/environment.c:219 +#: src/environment.c:231 #, c-format msgid " device: %s" msgstr "" -#: src/environment.c:220 +#: src/environment.c:232 #, c-format msgid " mountpoint: %s" msgstr "" -#: src/environment.c:221 +#: src/environment.c:233 #, c-format msgid " filesystem: %s" msgstr "" -#: src/environment.c:413 +#: src/environment.c:423 msgid "Unable to find usable home directory, using '/tmp'." msgstr "" -#: src/environment.c:831 +#: src/environment.c:841 #, c-format msgid "File '%s' is empty!" msgstr "" -#: src/environment.c:848 +#: src/environment.c:858 #, c-format msgid "Could not read '%s': %s!" msgstr "" -#: src/environment.c:930 src/environment.c:931 +#: src/environment.c:940 src/environment.c:941 msgid "devices to poll (separate using ';')" msgstr "" -#: src/event.c:635 src/gui_utils.c:465 +#: src/event.c:681 src/gui_utils.c:492 msgid "Could not play title!" msgstr "" -#: src/event.c:639 +#: src/event.c:685 msgid "Waiting for alternative stream..." msgstr "" @@ -215,7 +214,7 @@ msgid "[M3U-Playlist: %s]" msgstr "" -#: src/filelist.c:732 src/main_menu.c:276 +#: src/filelist.c:732 src/main_menu.c:303 src/main_menu.c:319 msgid "DVD" msgstr "" @@ -235,117 +234,142 @@ msgid "My VDR Recordings" msgstr "" -#: src/filelist_menu.c:135 +#: src/filelist_menu.c:127 msgid "Reset" msgstr "" -#: src/filelist_menu.c:137 src/filelist_menu.c:818 src/playlist_menu.c:1028 +#: src/filelist_menu.c:132 src/filelist_menu.c:139 src/filelist_menu.c:146 +#: src/filelist_menu.c:151 src/filelist_menu.c:834 src/playlist_menu.c:1041 msgid "Remove" msgstr "" -#: src/filelist_menu.c:145 src/main_menu.c:465 -msgid "Eject" -msgstr "" - -#: src/filelist_menu.c:237 +#: src/filelist_menu.c:250 msgid "Play all titles in this folder and all subfolders..." msgstr "" -#: src/filelist_menu.c:243 +#: src/filelist_menu.c:256 msgid "Play all titles in this folder..." msgstr "" -#: src/filelist_menu.c:367 src/filelist_menu.c:575 src/playlist_menu.c:245 -#: src/playlist_menu.c:410 +#: src/filelist_menu.c:385 src/filelist_menu.c:591 src/playlist_menu.c:255 +#: src/playlist_menu.c:420 msgid "Choose an entry..." msgstr "" -#: src/filelist_menu.c:398 src/filelist_menu.c:408 src/filelist_menu.c:710 +#: src/filelist_menu.c:416 src/filelist_menu.c:426 src/filelist_menu.c:726 #, c-format msgid "Could not remove '%s': %s!" msgstr "" -#: src/filelist_menu.c:409 +#: src/filelist_menu.c:427 msgid "SVDRP error" msgstr "" -#: src/filelist_menu.c:446 src/playlist_menu.c:295 +#: src/filelist_menu.c:462 src/playlist_menu.c:305 msgid "Could not open disc!" msgstr "" -#: src/filelist_menu.c:810 src/playlist_menu.c:1010 +#: src/filelist_menu.c:826 src/playlist_menu.c:1023 msgid "Play" msgstr "" -#: src/filelist_menu.c:814 src/playlist_menu.c:540 src/playlist_menu.c:1023 +#: src/filelist_menu.c:830 src/playlist_menu.c:550 src/playlist_menu.c:1036 msgid "Add" msgstr "" -#: src/filelist_menu.c:822 src/playback_menu.c:1053 src/settings_menu.c:511 +#: src/filelist_menu.c:838 src/main_menu.c:524 +msgid "Eject" +msgstr "" + +#: src/filelist_menu.c:842 src/playback_menu.c:1076 src/settings_menu.c:509 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:77 msgid "Playlist" msgstr "" -#: src/filelist_menu.c:826 src/playback_menu.c:1047 src/playlist_menu.c:1053 -#: src/settings_menu.c:539 src/weather_menu.c:164 +#: src/filelist_menu.c:846 src/playback_menu.c:1070 src/playlist_menu.c:1066 +#: src/settings_menu.c:537 src/weather_menu.c:164 msgid "Mainmenu" msgstr "" -#: src/filelist_menu.c:830 src/main_menu.c:481 src/playlist_menu.c:1057 +#: src/filelist_menu.c:850 src/main_menu.c:540 src/playlist_menu.c:1070 msgid "Current title" msgstr "" -#: src/filelist_menu.c:945 +#: src/filelist_menu.c:965 msgid "Could not load mediamarks." msgstr "" -#: src/filelist_menu.c:946 +#: src/filelist_menu.c:966 #, c-format msgid "You should create a file containing mediamarks at %s!" msgstr "" -#: src/filelist_menu.c:980 src/filelist_menu.c:1013 src/filelist_menu.c:1044 +#: src/filelist_menu.c:1000 src/filelist_menu.c:1033 src/filelist_menu.c:1064 #: src/gui_utils.h:65 msgid "Please wait..." msgstr "" -#: src/gui_utils.c:193 +#: src/gui_utils.c:195 msgid "Could not open or play background, leaving oxine!" msgstr "" -#: src/gui_utils.c:194 +#: src/gui_utils.c:196 msgid "Please make sure, that your version of xine-lib can play PNG files." msgstr "" -#: src/gui_utils.c:391 src/gui_utils.c:398 src/main_menu.c:381 -#: src/playlist_menu.c:950 +#: src/gui_utils.c:393 src/gui_utils.c:400 src/main_menu.c:419 +#: src/playlist_menu.c:963 msgid "OK" msgstr "" -#: src/gui_utils.c:403 src/gui_utils.c:425 src/main_menu.c:385 -#: src/main_menu.c:469 src/playlist_menu.c:953 +#: src/gui_utils.c:405 src/gui_utils.c:427 src/main_menu.c:423 +#: src/main_menu.c:528 src/playlist_menu.c:966 msgid "Cancel" msgstr "" -#: src/gui_utils.c:409 +#: src/gui_utils.c:411 msgid "Yes" msgstr "" -#: src/gui_utils.c:414 +#: src/gui_utils.c:416 msgid "No" msgstr "" -#: src/gui_utils.c:420 +#: src/gui_utils.c:422 msgid "Retry" msgstr "" -#: src/help_menu.c:43 src/playback_menu.c:473 src/playback_menu.c:527 -#: src/settings_menu.c:462 +#: src/gui_utils.c:478 +msgid "Could not play Audio CD!" +msgstr "" + +#: src/gui_utils.c:479 src/main_menu.c:213 +msgid "Please insert an Audio CD!" +msgstr "" + +#: src/gui_utils.c:483 +msgid "Could not play Video CD!" +msgstr "" + +#: src/gui_utils.c:484 src/main_menu.c:263 +msgid "Please insert a Video CD!" +msgstr "" + +#: src/gui_utils.c:488 +msgid "Could not play DVD!" +msgstr "" + +#: src/gui_utils.c:489 src/main_menu.c:313 +msgid "Please insert a DVD!" +msgstr "" + +#: src/help_menu.c:43 src/playback_menu.c:490 src/playback_menu.c:549 +#: src/settings_menu.c:460 msgid "Next Page" msgstr "" -#: src/help_menu.c:49 src/playback_menu.c:477 src/playback_menu.c:531 -#: src/playback_menu.c:535 src/playlist_menu.c:543 src/settings_menu.c:467 +#: src/help_menu.c:49 src/playback_menu.c:494 src/playback_menu.c:553 +#: src/playback_menu.c:557 src/playlist_menu.c:553 src/settings_menu.c:465 msgid "Back" msgstr "" @@ -1213,101 +1237,89 @@ msgid "Zulu" msgstr "" -#: src/lang.c:506 -msgid "Unknown" -msgstr "" - #: src/main_menu.c:71 msgid "Could not find DVB channels file!" msgstr "" -#: src/main_menu.c:207 -msgid "Please insert an Audio CD!" -msgstr "" - -#: src/main_menu.c:245 -msgid "Please insert a Video CD!" -msgstr "" - -#: src/main_menu.c:283 -msgid "Please insert a DVD!" -msgstr "" - -#: src/main_menu.c:328 +#: src/main_menu.c:366 msgid "How do you want to proceed?" msgstr "" -#: src/main_menu.c:342 +#: src/main_menu.c:380 msgid "Quit oxine" msgstr "" -#: src/main_menu.c:351 +#: src/main_menu.c:389 msgid "Shutdown the computer" msgstr "" -#: src/main_menu.c:360 +#: src/main_menu.c:398 msgid "Switch computer to standby" msgstr "" -#: src/main_menu.c:369 +#: src/main_menu.c:407 msgid "Reboot the computer" msgstr "" -#: src/main_menu.c:427 +#: src/main_menu.c:472 +msgid "Could not unmount device!" +msgstr "" + +#: src/main_menu.c:476 msgid "Could not eject device!" msgstr "" -#: src/main_menu.c:449 +#: src/main_menu.c:508 msgid "Select device to eject:" msgstr "" -#: src/main_menu.c:593 +#: src/main_menu.c:652 msgid "Listen to Music" msgstr "" -#: src/main_menu.c:594 +#: src/main_menu.c:653 msgid "Watch Films" msgstr "" -#: src/main_menu.c:595 +#: src/main_menu.c:654 msgid "Watch Television" msgstr "" -#: src/main_menu.c:596 +#: src/main_menu.c:655 msgid "Play a DVD" msgstr "" -#: src/main_menu.c:597 +#: src/main_menu.c:656 msgid "Play a Video CD" msgstr "" -#: src/main_menu.c:598 +#: src/main_menu.c:657 msgid "Play an Audio CD" msgstr "" -#: src/main_menu.c:599 +#: src/main_menu.c:658 msgid "Show Help" msgstr "" -#: src/main_menu.c:600 +#: src/main_menu.c:659 msgid "Show Weather Report" msgstr "" -#: src/main_menu.c:601 +#: src/main_menu.c:660 msgid "Edit Settings" msgstr "" -#: src/main_menu.c:602 src/settings_menu.c:512 +#: src/main_menu.c:661 src/settings_menu.c:510 msgid "Shutdown" msgstr "" -#: src/main_menu.c:624 +#: src/main_menu.c:683 msgid "Could not load main menu!" msgstr "" #: src/mediamarks.c:103 src/mediamarks.c:139 src/menulist.c:140 -#: src/menulist.c:186 src/otk.c:3560 src/otk.c:3565 src/otk.c:3622 -#: src/otk.c:3627 src/playlist_xml.c:141 src/playlist_xml.c:176 +#: src/menulist.c:186 src/otk.c:3597 src/otk.c:3602 src/otk.c:3659 +#: src/otk.c:3664 src/playlist_xml.c:141 src/playlist_xml.c:176 #, c-format msgid "Unknown name '%s' for node!" msgstr "" @@ -1316,13 +1328,13 @@ msgid "Found an entry that did not contain a MRL!" msgstr "" -#: src/mediamarks.c:159 src/menulist.c:207 src/otk.c:3591 +#: src/mediamarks.c:159 src/menulist.c:207 src/otk.c:3628 #: src/playlist_xml.c:196 #, c-format msgid "Parsing '%s' failed!" msgstr "" -#: src/mediamarks.c:165 src/menulist.c:212 src/otk.c:3596 +#: src/mediamarks.c:165 src/menulist.c:212 src/otk.c:3633 #: src/playlist_xml.c:201 #, c-format msgid "Root node of '%s' must be '%s'!" @@ -1370,23 +1382,23 @@ msgid "Aspect Ratio" msgstr "" -#: src/odk.c:519 src/odk.c:1414 +#: src/odk.c:519 src/odk.c:1458 msgid "Hue" msgstr "" -#: src/odk.c:522 src/odk.c:1416 +#: src/odk.c:522 src/odk.c:1460 msgid "Saturation" msgstr "" -#: src/odk.c:525 src/odk.c:1412 +#: src/odk.c:525 src/odk.c:1455 msgid "Contrast" msgstr "" -#: src/odk.c:528 src/odk.c:1410 +#: src/odk.c:528 src/odk.c:1452 msgid "Brightness" msgstr "" -#: src/odk.c:532 +#: src/odk.c:532 src/odk.c:1463 msgid "Zoom" msgstr "" @@ -1427,8 +1439,8 @@ msgid "none" msgstr "" -#: src/odk.c:592 src/odk.c:608 src/odk.c:629 src/settings_menu.c:600 -#: src/settings_menu.c:634 src/settings_menu.c:643 +#: src/odk.c:592 src/odk.c:608 src/odk.c:629 src/settings_menu.c:598 +#: src/settings_menu.c:632 src/settings_menu.c:641 msgid "auto" msgstr "" @@ -1481,68 +1493,60 @@ msgid "Malformed MRL" msgstr "" -#: src/odk.c:1110 +#: src/odk.c:1112 #, c-format msgid "Could not play '%s': %s!" msgstr "" -#: src/odk.c:1375 src/odk.c:1376 +#: src/odk.c:1422 src/odk.c:1423 msgid "encode special characters in MRLs" msgstr "" -#: src/odk.c:1380 -msgid "use unscaled OSD if possible" -msgstr "" - -#: src/odk.c:1381 -msgid "Use unscaled (full screen resolution) OSD if possible" -msgstr "" - -#: src/odk.c:1386 +#: src/odk.c:1428 msgid "audio visualization type" msgstr "" -#: src/odk.c:1387 +#: src/odk.c:1429 msgid "" "What kind of visual output is to be displayed when playing an audio only " "stream." msgstr "" -#: src/odk.c:1394 +#: src/odk.c:1436 msgid "background image MRL" msgstr "" -#: src/odk.c:1395 +#: src/odk.c:1437 msgid "" "The MRL of the background image that will be displayed if 'visual_anim." "style' is set to 'Background Image'" msgstr "" -#: src/odk.c:1403 +#: src/odk.c:1445 msgid "stream animation MRL" msgstr "" -#: src/odk.c:1404 +#: src/odk.c:1446 msgid "" "The MRL of the stream animation that will be displayed if 'visual_anim." "style' is set to 'Stream Animation'" msgstr "" -#: src/odk.c:1459 +#: src/odk.c:1506 #, c-format msgid "Failed to create window using video driver '%s'!" msgstr "" -#: src/odk.c:1464 +#: src/odk.c:1511 msgid "Failed to create window using default driver." msgstr "" -#: src/odk.c:1474 +#: src/odk.c:1521 #, c-format msgid "Failed to open audio port using audio driver '%s'!" msgstr "" -#: src/odk.c:1479 +#: src/odk.c:1526 msgid "Failed to open audio port using default audio driver." msgstr "" @@ -1628,30 +1632,30 @@ msgid "Successfully stopped the LIRC input plugin." msgstr "" -#: src/odk_osd.c:427 +#: src/odk_osd.c:452 #, c-format msgid "Could not read image '%s'!" msgstr "" -#: src/odk_osd.c:482 +#: src/odk_osd.c:507 #, c-format msgid "Could not scale image '%s'!" msgstr "" -#: src/odk_osd.c:525 +#: src/odk_osd.c:550 msgid "Could not get pixel data!" msgstr "" -#: src/odk_osd.c:745 +#: src/odk_osd.c:770 #, c-format msgid "Could not free a cache entry for '%s'." msgstr "" -#: src/odk_osd.c:1671 +#: src/odk_osd.c:1721 msgid "The current video driver supports unscaled OSD!" msgstr "" -#: src/odk_osd.c:1673 +#: src/odk_osd.c:1723 msgid "The current video driver does not support unscaled OSD!" msgstr "" @@ -1682,77 +1686,77 @@ msgid "Found %d Xinerama screens:" msgstr "" -#: src/odk_x11.c:1014 +#: src/odk_x11.c:1002 #, c-format msgid "" "Overriding calculated monitor pixel aspect ratio with user provided value: " "%.02f" msgstr "" -#: src/odk_x11.c:1030 +#: src/odk_x11.c:1018 #, c-format msgid "Failed to open video port '%s', falling back to 'auto'." msgstr "" -#: src/odk_x11.c:1037 +#: src/odk_x11.c:1025 msgid "Failed to open video port!" msgstr "" -#: src/otk.c:3527 src/otk.c:3534 +#: src/otk.c:3564 src/otk.c:3571 #, c-format msgid "Missing property (required) '%s'!" msgstr "" -#: src/otk.c:3578 +#: src/otk.c:3615 #, c-format msgid "Loading palette file '%s'..." msgstr "" -#: src/otk.c:3654 +#: src/otk.c:3691 msgid "Could not load palette, reverting to standard colors." msgstr "" -#: src/oxine.c:107 +#: src/oxine.c:113 #, c-format msgid "Usage: oxine [OPTIONS] [MRL]\n" msgstr "" -#: src/oxine.c:109 +#: src/oxine.c:115 #, c-format msgid "OPTIONS are:\n" msgstr "" -#: src/oxine.c:110 +#: src/oxine.c:116 #, c-format msgid " -v, --version Display version.\n" msgstr "" -#: src/oxine.c:111 +#: src/oxine.c:117 #, c-format msgid " --verbose [=level] Set verbosity level. Default is 1.\n" msgstr "" -#: src/oxine.c:113 +#: src/oxine.c:119 #, c-format msgid " -l, --logfile Set the log filename.\n" msgstr "" -#: src/oxine.c:114 +#: src/oxine.c:120 #, c-format msgid " -V, --video-driver Select video driver by ID.\n" msgstr "" -#: src/oxine.c:115 src/oxine.c:129 +#: src/oxine.c:121 src/oxine.c:135 #, c-format msgid " Available drivers:\n" msgstr "" -#: src/oxine.c:128 +#: src/oxine.c:134 #, c-format msgid " -A, --audio-driver Select audio driver by ID.\n" msgstr "" -#: src/oxine.c:140 +#: src/oxine.c:146 #, c-format msgid "" " -X, --xineramascreen [=num] Sets the screen on which the fullscreen " @@ -1760,29 +1764,36 @@ " will be shown.\n" msgstr "" -#: src/oxine.c:144 +#: src/oxine.c:150 #, c-format msgid " -F, --no-fullscreen Do no start in fullscreen mode.\n" msgstr "" -#: src/oxine.c:147 +#: src/oxine.c:153 #, c-format msgid "" " -P, --no-polling Do not use automatic polling for removable " "media.\n" msgstr "" -#: src/oxine.c:151 +#: src/oxine.c:157 #, c-format msgid " -L, --no-lirc Do not use remote control (LIRC).\n" msgstr "" -#: src/oxine.c:155 +#: src/oxine.c:161 #, c-format msgid " -J, --no-joystick Do not use joystick support.\n" msgstr "" -#: src/oxine.c:159 +#: src/oxine.c:165 +#, c-format +msgid "" +" -W, --no-weather Do not automaticaly retrieve weather " +"information.\n" +msgstr "" + +#: src/oxine.c:169 #, c-format msgid "" "Examples for valid MRLs (media resource locator):\n" @@ -1797,209 +1808,205 @@ " VCD: 'vcd://'\n" msgstr "" -#: src/oxine.c:180 src/oxine.c:181 +#: src/oxine.c:190 src/oxine.c:191 msgid "video driver to use" msgstr "" -#: src/oxine.c:184 src/oxine.c:185 +#: src/oxine.c:194 src/oxine.c:195 msgid "audio driver to use" msgstr "" -#: src/oxine.c:190 src/oxine.c:191 +#: src/oxine.c:199 src/oxine.c:200 msgid "Xinerama screen for fullscreen window" msgstr "" -#: src/oxine.c:196 src/oxine.c:197 -msgid "percentage of fullscreen screen to use" -msgstr "" - -#: src/oxine.c:201 +#: src/oxine.c:204 msgid "non-fullscreen window width" msgstr "" -#: src/oxine.c:202 +#: src/oxine.c:205 msgid "The width of the non-fullscreen window" msgstr "" -#: src/oxine.c:206 +#: src/oxine.c:209 msgid "non-fullscreen window height" msgstr "" -#: src/oxine.c:207 +#: src/oxine.c:210 msgid "The height of the non-fullscreen window" msgstr "" -#: src/oxine.c:211 src/oxine.c:212 +#: src/oxine.c:214 src/oxine.c:215 msgid "aspect ratio of one monitor pixel" msgstr "" -#: src/oxine.c:217 +#: src/oxine.c:220 msgid "ask before leaving oxine" msgstr "" -#: src/oxine.c:218 +#: src/oxine.c:221 msgid "Are we to show the quit confirm dialog?" msgstr "" -#: src/oxine.c:222 src/oxine.c:223 +#: src/oxine.c:225 src/oxine.c:226 msgid "command that was selected the last time" msgstr "" -#: src/oxine.c:228 src/oxine.c:229 +#: src/oxine.c:231 src/oxine.c:232 msgid "shell command (power off)" msgstr "" -#: src/oxine.c:234 src/oxine.c:235 +#: src/oxine.c:237 src/oxine.c:238 msgid "shell command (reboot)" msgstr "" -#: src/oxine.c:239 src/oxine.c:240 +#: src/oxine.c:242 src/oxine.c:243 msgid "shell command (standby)" msgstr "" -#: src/oxine.c:245 +#: src/oxine.c:248 msgid "METAR ICAO location indicator" msgstr "" -#: src/oxine.c:246 +#: src/oxine.c:249 msgid "" "The METAR ICAO Location Indicator defines for which location the weather is " "to be displayed." msgstr "" -#: src/oxine.c:252 +#: src/oxine.c:255 msgid "reload playlist on start" msgstr "" -#: src/oxine.c:253 +#: src/oxine.c:256 msgid "" "If this is enabled and if you don't specify any MRL on the command line, " "oxine will automatically load the previous playlist." msgstr "" -#: src/oxine.c:259 +#: src/oxine.c:262 msgid "play reloaded playlist on start" msgstr "" -#: src/oxine.c:260 +#: src/oxine.c:263 msgid "" "If this is enabled and gui.playlist_auto_reload is also enabled the reloaded " "playlist will automatically be played." msgstr "" -#: src/oxine.c:267 +#: src/oxine.c:270 msgid "subtitle autoloading" msgstr "" -#: src/oxine.c:268 +#: src/oxine.c:271 msgid "Automatically load subtitles if they exist." msgstr "" -#: src/oxine.c:395 +#: src/oxine.c:406 #, c-format msgid "This is %s - A free Video-Player v%s\n" msgstr "" -#: src/oxine.c:397 +#: src/oxine.c:408 #, c-format msgid "(c) 2005 by the oxine project\n" msgstr "" -#: src/oxine.c:406 +#: src/oxine.c:417 #, c-format msgid "Invalid argument %d!" msgstr "" -#: src/oxine.c:491 +#: src/oxine.c:502 msgid "Could not initialize ODK!" msgstr "" -#: src/oxine.c:502 +#: src/oxine.c:513 msgid "Could not inizialize OTK!" msgstr "" -#: src/playback_menu.c:747 src/playback_menu.c:1172 +#: src/playback_menu.c:769 src/playback_menu.c:1195 msgid "Album:" msgstr "" -#: src/playback_menu.c:753 src/playback_menu.c:1178 +#: src/playback_menu.c:775 src/playback_menu.c:1201 msgid "Artist:" msgstr "" -#: src/playback_menu.c:759 src/playback_menu.c:1184 +#: src/playback_menu.c:781 src/playback_menu.c:1207 msgid "Year:" msgstr "" -#: src/playback_menu.c:765 src/playback_menu.c:1190 +#: src/playback_menu.c:787 src/playback_menu.c:1213 msgid "Track:" msgstr "" -#: src/playback_menu.c:772 src/playback_menu.c:1197 +#: src/playback_menu.c:794 src/playback_menu.c:1220 msgid "Genre:" msgstr "" -#: src/playback_menu.c:779 +#: src/playback_menu.c:801 msgid "Length:" msgstr "" -#: src/playback_menu.c:788 +#: src/playback_menu.c:810 msgid "Elapsed:" msgstr "" -#: src/playback_menu.c:1014 +#: src/playback_menu.c:1037 msgid "Loop Mode" msgstr "" -#: src/playback_menu.c:1019 +#: src/playback_menu.c:1042 msgid "Shuffle Mode" msgstr "" -#: src/playback_menu.c:1024 +#: src/playback_menu.c:1047 msgid "Normal Mode" msgstr "" -#: src/playback_menu.c:1035 +#: src/playback_menu.c:1058 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:79 msgid "Settings" msgstr "" -#: src/playback_menu.c:1058 +#: src/playback_menu.c:1081 msgid "Media Browser" msgstr "" -#: src/playlist_menu.c:637 +#: src/playlist_menu.c:650 msgid "Delete subtitle" msgstr "" -#: src/playlist_menu.c:639 src/playlist_menu.c:1043 +#: src/playlist_menu.c:652 src/playlist_menu.c:1056 msgid "Add subtitle" msgstr "" -#: src/playlist_menu.c:661 +#: src/playlist_menu.c:674 msgid "Subtitle" msgstr "" -#: src/playlist_menu.c:943 +#: src/playlist_menu.c:956 msgid "Please enter a name for the playlist:" msgstr "" -#: src/playlist_menu.c:1014 +#: src/playlist_menu.c:1027 msgid "Clear list" msgstr "" -#: src/playlist_menu.c:1018 +#: src/playlist_menu.c:1031 msgid "Save list" msgstr "" -#: src/playlist_menu.c:1033 +#: src/playlist_menu.c:1046 msgid "Move up" msgstr "" -#: src/playlist_menu.c:1038 +#: src/playlist_menu.c:1051 msgid "Move down" msgstr "" -#: src/playlist_menu.c:1048 +#: src/playlist_menu.c:1061 msgid "Media-Browser" msgstr "" @@ -2022,366 +2029,366 @@ "for the changes to take effect!" msgstr "" -#: src/settings_menu.c:504 +#: src/settings_menu.c:502 msgid "User Interface" msgstr "" -#: src/settings_menu.c:506 +#: src/settings_menu.c:504 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:80 msgid "Weather" msgstr "" -#: src/settings_menu.c:509 +#: src/settings_menu.c:507 msgid "Video Disc Recorder" msgstr "" -#: src/settings_menu.c:513 +#: src/settings_menu.c:511 msgid "Audio Visualization" msgstr "" -#: src/settings_menu.c:514 +#: src/settings_menu.c:512 msgid "Audio" msgstr "" -#: src/settings_menu.c:515 +#: src/settings_menu.c:513 msgid "Video" msgstr "" -#: src/settings_menu.c:516 +#: src/settings_menu.c:514 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:76 msgid "Media" msgstr "" -#: src/settings_menu.c:517 +#: src/settings_menu.c:515 msgid "Decoder" msgstr "" -#: src/settings_menu.c:518 +#: src/settings_menu.c:516 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:78 msgid "Subtitles" msgstr "" -#: src/settings_menu.c:519 +#: src/settings_menu.c:517 msgid "Effects" msgstr "" -#: src/settings_menu.c:520 +#: src/settings_menu.c:518 msgid "Engine" msgstr "" -#: src/settings_menu.c:521 +#: src/settings_menu.c:519 msgid "Miscellaneous" msgstr "" -#: src/settings_menu.c:578 +#: src/settings_menu.c:576 msgid "white-black-transparent" msgstr "" -#: src/settings_menu.c:579 +#: src/settings_menu.c:577 msgid "white-none-transparent" msgstr "" -#: src/settings_menu.c:580 +#: src/settings_menu.c:578 msgid "white-none-translucid" msgstr "" -#: src/settings_menu.c:581 +#: src/settings_menu.c:579 msgid "yellow-black-transparent" msgstr "" -#: src/settings_menu.c:583 +#: src/settings_menu.c:581 msgid "Mono 1.0" msgstr "" -#: src/settings_menu.c:584 +#: src/settings_menu.c:582 msgid "Stereo 2.0" msgstr "" -#: src/settings_menu.c:585 +#: src/settings_menu.c:583 msgid "Headphones 2.0" msgstr "" -#: src/settings_menu.c:586 +#: src/settings_menu.c:584 msgid "Stereo 2.1" msgstr "" -#: src/settings_menu.c:587 +#: src/settings_menu.c:585 msgid "Surround 3.0" msgstr "" -#: src/settings_menu.c:588 +#: src/settings_menu.c:586 msgid "Surround 4.0" msgstr "" -#: src/settings_menu.c:589 +#: src/settings_menu.c:587 msgid "Surround 4.1" msgstr "" -#: src/settings_menu.c:590 +#: src/settings_menu.c:588 msgid "Surround 5.0" msgstr "" -#: src/settings_menu.c:591 +#: src/settings_menu.c:589 msgid "Surround 5.1" msgstr "" -#: src/settings_menu.c:592 +#: src/settings_menu.c:590 msgid "Surround 6.0" msgstr "" -#: src/settings_menu.c:593 +#: src/settings_menu.c:591 msgid "Surround 6.1" msgstr "" -#: src/settings_menu.c:594 +#: src/settings_menu.c:592 msgid "Surround 7.1" msgstr "" -#: src/settings_menu.c:595 +#: src/settings_menu.c:593 msgid "Pass Through" msgstr "" -#: src/settings_menu.c:597 +#: src/settings_menu.c:595 msgid "metronom feedback" msgstr "" -#: src/settings_menu.c:598 +#: src/settings_menu.c:596 msgid "resample" msgstr "" -#: src/settings_menu.c:601 +#: src/settings_menu.c:599 msgid "off" msgstr "" -#: src/settings_menu.c:602 +#: src/settings_menu.c:600 msgid "on" msgstr "" -#: src/settings_menu.c:604 +#: src/settings_menu.c:602 msgid "2D_Tex_Fragprog" msgstr "" -#: src/settings_menu.c:605 +#: src/settings_menu.c:603 msgid "2D_Tex" msgstr "" -#: src/settings_menu.c:606 +#: src/settings_menu.c:604 msgid "2D_Tex_Tiled" msgstr "" -#: src/settings_menu.c:607 +#: src/settings_menu.c:605 msgid "Image_Pipeline" msgstr "" -#: src/settings_menu.c:608 +#: src/settings_menu.c:606 msgid "Cylinder" msgstr "" -#: src/settings_menu.c:609 +#: src/settings_menu.c:607 msgid "Env_Mapped_Torus" msgstr "" -#: src/settings_menu.c:611 +#: src/settings_menu.c:609 msgid "entire dvd" msgstr "" -#: src/settings_menu.c:612 +#: src/settings_menu.c:610 msgid "one chapter" msgstr "" -#: src/settings_menu.c:614 +#: src/settings_menu.c:612 msgid "seek in program chain" msgstr "" -#: src/settings_menu.c:615 +#: src/settings_menu.c:613 msgid "seek in program" msgstr "" -#: src/settings_menu.c:617 +#: src/settings_menu.c:615 msgid "skip program" msgstr "" -#: src/settings_menu.c:618 +#: src/settings_menu.c:616 msgid "skip part" msgstr "" -#: src/settings_menu.c:619 +#: src/settings_menu.c:617 msgid "skip title" msgstr "" -#: src/settings_menu.c:621 +#: src/settings_menu.c:619 msgid "14.4 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:622 +#: src/settings_menu.c:620 msgid "19.2 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:623 +#: src/settings_menu.c:621 msgid "28.8 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:624 +#: src/settings_menu.c:622 msgid "33.6 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:625 +#: src/settings_menu.c:623 msgid "34.4 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:626 +#: src/settings_menu.c:624 msgid "57.6 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:627 +#: src/settings_menu.c:625 msgid "115.2 Kbps (ISDN)" msgstr "" -#: src/settings_menu.c:628 +#: src/settings_menu.c:626 msgid "262.2 Kbps (Cable/DSL)" msgstr "" -#: src/settings_menu.c:629 +#: src/settings_menu.c:627 msgid "393.2 Kbps (Cable/DSL)" msgstr "" -#: src/settings_menu.c:630 +#: src/settings_menu.c:628 msgid "524.3 Kbps (Cable/DSL)" msgstr "" -#: src/settings_menu.c:631 +#: src/settings_menu.c:629 msgid "1.5 Mbps (T1)" msgstr "" -#: src/settings_menu.c:632 +#: src/settings_menu.c:630 msgid "10.5 Mbps (LAN)" msgstr "" -#: src/settings_menu.c:635 +#: src/settings_menu.c:633 msgid "TCP" msgstr "" -#: src/settings_menu.c:636 +#: src/settings_menu.c:634 msgid "HTTP" msgstr "" -#: src/settings_menu.c:638 +#: src/settings_menu.c:636 msgid "MPEG track" msgstr "" -#: src/settings_menu.c:639 src/settings_menu.c:645 +#: src/settings_menu.c:637 src/settings_menu.c:643 msgid "entry" msgstr "" -#: src/settings_menu.c:640 +#: src/settings_menu.c:638 msgid "segment" msgstr "" -#: src/settings_menu.c:641 +#: src/settings_menu.c:639 msgid "playback-control item" msgstr "" -#: src/settings_menu.c:644 +#: src/settings_menu.c:642 msgid "track" msgstr "" -#: src/settings_menu.c:647 +#: src/settings_menu.c:645 msgid "tiny" msgstr "" -#: src/settings_menu.c:648 +#: src/settings_menu.c:646 msgid "small" msgstr "" -#: src/settings_menu.c:649 +#: src/settings_menu.c:647 msgid "normal" msgstr "" -#: src/settings_menu.c:650 +#: src/settings_menu.c:648 msgid "large" msgstr "" -#: src/settings_menu.c:651 +#: src/settings_menu.c:649 msgid "very large" msgstr "" -#: src/settings_menu.c:652 +#: src/settings_menu.c:650 msgid "huge" msgstr "" -#: src/settings_menu.c:654 +#: src/settings_menu.c:652 msgid "Fast but not photorealistic" msgstr "" -#: src/settings_menu.c:655 +#: src/settings_menu.c:653 msgid "Slow but looks better" msgstr "" -#: src/settings_menu.c:657 +#: src/settings_menu.c:655 msgid "default" msgstr "" -#: src/settings_menu.c:658 +#: src/settings_menu.c:656 msgid "reverse" msgstr "" -#: src/settings_menu.c:659 +#: src/settings_menu.c:657 msgid "content" msgstr "" -#: src/settings_menu.c:660 +#: src/settings_menu.c:658 msgid "extension" msgstr "" -#: src/settings_menu.c:662 +#: src/settings_menu.c:660 msgid "probe" msgstr "" -#: src/settings_menu.c:663 +#: src/settings_menu.c:661 msgid "libc" msgstr "" -#: src/settings_menu.c:664 +#: src/settings_menu.c:662 msgid "kernel" msgstr "" -#: src/settings_menu.c:665 +#: src/settings_menu.c:663 msgid "mmx" msgstr "" -#: src/settings_menu.c:666 +#: src/settings_menu.c:664 msgid "mmxext" msgstr "" -#: src/settings_menu.c:667 +#: src/settings_menu.c:665 msgid "sse" msgstr "" -#: src/settings_menu.c:669 +#: src/settings_menu.c:667 msgid "Background Image" msgstr "" -#: src/settings_menu.c:670 +#: src/settings_menu.c:668 msgid "Background Animation" msgstr "" -#: src/settings_menu.c:671 +#: src/settings_menu.c:669 msgid "Post Plugin" msgstr "" -#: src/settings_menu.c:673 +#: src/settings_menu.c:671 msgid "oscope" msgstr "" -#: src/settings_menu.c:674 +#: src/settings_menu.c:672 msgid "fftscope" msgstr "" -#: src/settings_menu.c:675 +#: src/settings_menu.c:673 msgid "fftgraph" msgstr "" -#: src/settings_menu.c:676 +#: src/settings_menu.c:674 msgid "goom" msgstr "" diff -Naur oxine-0.6.orig/po/ru.gmo oxine-0.6.3/po/ru.gmo --- oxine-0.6.orig/po/ru.gmo 2006-11-03 18:35:36.000000000 +0100 +++ oxine-0.6.3/po/ru.gmo 2006-11-22 10:56:28.000000000 +0100 @@ -44,7 +44,7 @@ OriyaOromoPart MenuPausedPlayPlayingPlaylistPlease insert a DVD!Please insert a Video CD!Please run 'jscalibrator -file %s -device %s' to calibrate your joystick.Please wait...PolishPushtoQuechuaRemovable DiscRemoveRomanianRoot MenuRundiRussianSamoanSangoSardinianSelect device to eject:SerbianSettingsShonaShow HelpShuffle ModeShutdownSichuan YiSindhiSinhaleseSlovakSlovenianSlow MotionSomaliSpanishSubtitle ChannelSubtitle MenuSubtitle OffsetSuccessfully started the joystick input plugin.Successfully stopped the joystick input plugin.SundaneseSwahiliSwatiSwedishTCPTagalogTahitianTajikTamilTatarTeluguThaiThe height of the non-fullscreen windowThe width of the non-fullscreen windowTibetanTigrinyaTitleTitle MenuTongaTrack:TsongaTswanaTurkishTurkmenTwiUighurUkrainianUnknownUnknown errorUnknown parameter %d!UrduUsage: oxine [OPTIONS] [MRL] UzbekVendaVideo CDVideo DVDVietnameseVolumeWalloonWatch FilmsWelshWolofXhosaYear:YiddishYorubaYour joystick has never been calibrated!ZhuangZoomZulu[M3U-Playlist: %s]activate an item or a buttonadjust volumeautochange audio languagechange subtitle languagedisabledenabledfftgraphfftscopegoomkernellibcmmxmmxextmutednavigate the menusnon-fullscreen window heightnon-fullscreen window widthnoneoscopepause/ playselect an item in a listssestop the streamtoggle mute/ unmuteProject-Id-Version: oxine 0.5 Report-Msgid-Bugs-To: mschwerin@users.sf.net -POT-Creation-Date: 2006-11-03 18:35+0100 +POT-Creation-Date: 2006-11-22 10:56+0100 PO-Revision-Date: 2006-10-17 10:17+0100 Last-Translator: Maximilian Schwerin Language-Team: ru diff -Naur oxine-0.6.orig/po/ru.po oxine-0.6.3/po/ru.po --- oxine-0.6.orig/po/ru.po 2006-11-03 18:35:36.000000000 +0100 +++ oxine-0.6.3/po/ru.po 2006-11-22 10:56:28.000000000 +0100 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: oxine 0.5\n" "Report-Msgid-Bugs-To: mschwerin@users.sf.net\n" -"POT-Creation-Date: 2006-11-03 18:35+0100\n" +"POT-Creation-Date: 2006-11-22 10:56+0100\n" "PO-Revision-Date: 2006-10-17 10:17+0100\n" "Last-Translator: Maximilian Schwerin \n" "Language-Team: ru \n" @@ -26,20 +26,20 @@ msgid "Could not perform codeset conversion (%s)!" msgstr "" -#: src/disc.c:122 src/disc.c:323 src/disc.c:625 src/environment.c:819 -#: src/environment.c:837 src/filelist.c:805 src/mediamarks_favorites.c:98 -#: src/meta_info.c:85 src/odk.c:1020 src/odk.c:1103 src/odk_osd.c:806 -#: src/odk_osd.c:855 src/playlist_m3u.c:109 src/playlist_xml.c:55 -#: src/weather.c:122 +#: src/disc.c:122 src/disc.c:301 src/disc.c:326 src/disc.c:628 +#: src/environment.c:829 src/environment.c:847 src/filelist.c:805 +#: src/mediamarks_favorites.c:98 src/meta_info.c:85 src/odk.c:1020 +#: src/odk.c:1105 src/odk_osd.c:831 src/odk_osd.c:880 src/playlist_m3u.c:109 +#: src/playlist_xml.c:55 src/weather.c:122 #, fuzzy, c-format msgid "Could not open '%s': %s!" msgstr "Не могу открыть '%s' (%s)!" -#: src/disc.c:213 src/disc.c:473 src/filelist.c:736 +#: src/disc.c:213 src/disc.c:474 src/filelist.c:736 msgid "Audio CD" msgstr "Уадио CD" -#: src/disc.c:229 src/filelist.c:734 src/main_menu.c:238 +#: src/disc.c:229 src/filelist.c:734 src/main_menu.c:253 src/main_menu.c:269 msgid "Video CD" msgstr "Видео CD" @@ -65,41 +65,40 @@ msgid "Unknown Disc" msgstr "Неизвестный" -#: src/disc.c:371 +#: src/disc.c:374 #, fuzzy, c-format -msgid "Could not mount %s!" -msgstr "Не могу подключить %s" +msgid "Could not mount '%s': %s!" +msgstr "Не могу открыть '%s' (%s)!" -#: src/disc.c:391 -#, fuzzy, c-format -msgid "Could not unmount %s!" -msgstr "Не могу отключить %s" +#: src/disc.c:374 src/disc.c:394 src/disc.c:414 src/lang.c:506 +msgid "Unknown" +msgstr "Неизвестный" -#: src/disc.c:411 +#: src/disc.c:394 #, fuzzy, c-format -msgid "Could not eject %s!" -msgstr "Не могу извлеч %s" +msgid "Could not unmount '%s': %s!" +msgstr "Не могу отключить %s" -#: src/disc.c:419 src/disc.c:425 +#: src/disc.c:414 src/disc.c:422 src/disc.c:427 #, fuzzy, c-format msgid "Could not eject '%s': %s!" msgstr "Не могу извлеч %s" -#: src/disc.c:474 +#: src/disc.c:475 msgid "Title" msgstr "Название" -#: src/disc.c:671 +#: src/disc.c:688 #, fuzzy, c-format msgid "Could not create disc polling thread: %s!" msgstr "Не согу создать поток" -#: src/disc.c:673 +#: src/disc.c:691 #, fuzzy msgid "Successfully started disc polling thread." msgstr "Запускается плагин джойстика" -#: src/disc.c:685 +#: src/disc.c:703 #, fuzzy msgid "Successfully stopped disc polling thread." msgstr "Останавливается плагин" @@ -113,7 +112,7 @@ msgid "Unknown prefix to URL '%s'!" msgstr "Не известный параметр %d" -#: src/download.c:227 src/environment.c:612 +#: src/download.c:227 src/environment.c:622 #, fuzzy, c-format msgid "Could not create '%s': %s!" msgstr "Не могу воспроизвести '%s' (%s)!" @@ -151,63 +150,63 @@ msgid "Part Menu" msgstr "Настройка частей" -#: src/environment.c:135 src/environment.c:268 src/environment.c:586 -#: src/environment.c:593 src/environment.c:825 +#: src/environment.c:141 src/environment.c:289 src/environment.c:596 +#: src/environment.c:603 src/environment.c:835 #, fuzzy, c-format msgid "Unable to get status for file '%s': %s." msgstr "Не могу начать '%s' файл: %s" -#: src/environment.c:144 src/environment.c:278 +#: src/environment.c:153 #, fuzzy, c-format msgid "Unable to read link '%s' file: %s." msgstr "Не могу начать '%s' файл: %s" -#: src/environment.c:218 +#: src/environment.c:230 msgid "Found a device we are interested in:" msgstr "Правельное устройство находиться в:" -#: src/environment.c:219 +#: src/environment.c:231 #, c-format msgid " device: %s" msgstr "" -#: src/environment.c:220 +#: src/environment.c:232 #, c-format msgid " mountpoint: %s" msgstr "" -#: src/environment.c:221 +#: src/environment.c:233 #, c-format msgid " filesystem: %s" msgstr "" -#: src/environment.c:413 +#: src/environment.c:423 #, fuzzy msgid "Unable to find usable home directory, using '/tmp'." msgstr "Не могу открыть домашнюю директорию, используется /tmp" -#: src/environment.c:831 +#: src/environment.c:841 #, fuzzy, c-format msgid "File '%s' is empty!" msgstr "Файл '%s' пустой" -#: src/environment.c:848 +#: src/environment.c:858 #, fuzzy, c-format msgid "Could not read '%s': %s!" msgstr "Не могу открыть '%s' (%s)!" -#: src/environment.c:930 src/environment.c:931 +#: src/environment.c:940 src/environment.c:941 #, fuzzy msgid "devices to poll (separate using ';')" msgstr "" "Укажите дополнтельные устройства чтобы их использовал oxine (для разделения " "используйте :)" -#: src/event.c:635 src/gui_utils.c:465 +#: src/event.c:681 src/gui_utils.c:492 msgid "Could not play title!" msgstr "Не могу воспроизвести название" -#: src/event.c:639 +#: src/event.c:685 msgid "Waiting for alternative stream..." msgstr "" @@ -230,7 +229,7 @@ msgid "[M3U-Playlist: %s]" msgstr "[M3U-Плейлист: %s]" -#: src/filelist.c:732 src/main_menu.c:276 +#: src/filelist.c:732 src/main_menu.c:303 src/main_menu.c:319 msgid "DVD" msgstr "DVD" @@ -252,117 +251,146 @@ msgid "My VDR Recordings" msgstr "" -#: src/filelist_menu.c:135 +#: src/filelist_menu.c:127 msgid "Reset" msgstr "" -#: src/filelist_menu.c:137 src/filelist_menu.c:818 src/playlist_menu.c:1028 +#: src/filelist_menu.c:132 src/filelist_menu.c:139 src/filelist_menu.c:146 +#: src/filelist_menu.c:151 src/filelist_menu.c:834 src/playlist_menu.c:1041 msgid "Remove" msgstr "Удалить" -#: src/filelist_menu.c:145 src/main_menu.c:465 -msgid "Eject" -msgstr "Извлеч" - -#: src/filelist_menu.c:237 +#: src/filelist_menu.c:250 msgid "Play all titles in this folder and all subfolders..." msgstr "" -#: src/filelist_menu.c:243 +#: src/filelist_menu.c:256 msgid "Play all titles in this folder..." msgstr "" -#: src/filelist_menu.c:367 src/filelist_menu.c:575 src/playlist_menu.c:245 -#: src/playlist_menu.c:410 +#: src/filelist_menu.c:385 src/filelist_menu.c:591 src/playlist_menu.c:255 +#: src/playlist_menu.c:420 msgid "Choose an entry..." msgstr "" -#: src/filelist_menu.c:398 src/filelist_menu.c:408 src/filelist_menu.c:710 +#: src/filelist_menu.c:416 src/filelist_menu.c:426 src/filelist_menu.c:726 #, fuzzy, c-format msgid "Could not remove '%s': %s!" msgstr "Не могу воспроизвести '%s' (%s)!" -#: src/filelist_menu.c:409 +#: src/filelist_menu.c:427 msgid "SVDRP error" msgstr "" -#: src/filelist_menu.c:446 src/playlist_menu.c:295 +#: src/filelist_menu.c:462 src/playlist_menu.c:305 msgid "Could not open disc!" msgstr "Не могу открыть диск" -#: src/filelist_menu.c:810 src/playlist_menu.c:1010 +#: src/filelist_menu.c:826 src/playlist_menu.c:1023 msgid "Play" msgstr "Играть" -#: src/filelist_menu.c:814 src/playlist_menu.c:540 src/playlist_menu.c:1023 +#: src/filelist_menu.c:830 src/playlist_menu.c:550 src/playlist_menu.c:1036 msgid "Add" msgstr "Добавить" -#: src/filelist_menu.c:822 src/playback_menu.c:1053 src/settings_menu.c:511 +#: src/filelist_menu.c:838 src/main_menu.c:524 +msgid "Eject" +msgstr "Извлеч" + +#: src/filelist_menu.c:842 src/playback_menu.c:1076 src/settings_menu.c:509 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:77 msgid "Playlist" msgstr "Список" -#: src/filelist_menu.c:826 src/playback_menu.c:1047 src/playlist_menu.c:1053 -#: src/settings_menu.c:539 src/weather_menu.c:164 +#: src/filelist_menu.c:846 src/playback_menu.c:1070 src/playlist_menu.c:1066 +#: src/settings_menu.c:537 src/weather_menu.c:164 msgid "Mainmenu" msgstr "Главное меню" -#: src/filelist_menu.c:830 src/main_menu.c:481 src/playlist_menu.c:1057 +#: src/filelist_menu.c:850 src/main_menu.c:540 src/playlist_menu.c:1070 msgid "Current title" msgstr "" -#: src/filelist_menu.c:945 +#: src/filelist_menu.c:965 msgid "Could not load mediamarks." msgstr "Немогу загрузить mediamarks" -#: src/filelist_menu.c:946 +#: src/filelist_menu.c:966 #, c-format msgid "You should create a file containing mediamarks at %s!" msgstr "" -#: src/filelist_menu.c:980 src/filelist_menu.c:1013 src/filelist_menu.c:1044 +#: src/filelist_menu.c:1000 src/filelist_menu.c:1033 src/filelist_menu.c:1064 #: src/gui_utils.h:65 msgid "Please wait..." msgstr "Подождите..." -#: src/gui_utils.c:193 +#: src/gui_utils.c:195 msgid "Could not open or play background, leaving oxine!" msgstr "" -#: src/gui_utils.c:194 +#: src/gui_utils.c:196 msgid "Please make sure, that your version of xine-lib can play PNG files." msgstr "" -#: src/gui_utils.c:391 src/gui_utils.c:398 src/main_menu.c:381 -#: src/playlist_menu.c:950 +#: src/gui_utils.c:393 src/gui_utils.c:400 src/main_menu.c:419 +#: src/playlist_menu.c:963 msgid "OK" msgstr "" -#: src/gui_utils.c:403 src/gui_utils.c:425 src/main_menu.c:385 -#: src/main_menu.c:469 src/playlist_menu.c:953 +#: src/gui_utils.c:405 src/gui_utils.c:427 src/main_menu.c:423 +#: src/main_menu.c:528 src/playlist_menu.c:966 msgid "Cancel" msgstr "Отмена" -#: src/gui_utils.c:409 +#: src/gui_utils.c:411 msgid "Yes" msgstr "" -#: src/gui_utils.c:414 +#: src/gui_utils.c:416 msgid "No" msgstr "" -#: src/gui_utils.c:420 +#: src/gui_utils.c:422 msgid "Retry" msgstr "" -#: src/help_menu.c:43 src/playback_menu.c:473 src/playback_menu.c:527 -#: src/settings_menu.c:462 +#: src/gui_utils.c:478 +#, fuzzy +msgid "Could not play Audio CD!" +msgstr "Не могу воспроизвести название" + +#: src/gui_utils.c:479 src/main_menu.c:213 +#, fuzzy +msgid "Please insert an Audio CD!" +msgstr "Пожалюста вставте аудио CD" + +#: src/gui_utils.c:483 +#, fuzzy +msgid "Could not play Video CD!" +msgstr "Не могу воспроизвести название" + +#: src/gui_utils.c:484 src/main_menu.c:263 +msgid "Please insert a Video CD!" +msgstr "Пожалюста вставте Видео CD" + +#: src/gui_utils.c:488 +#, fuzzy +msgid "Could not play DVD!" +msgstr "Не могу воспроизвести название" + +#: src/gui_utils.c:489 src/main_menu.c:313 +msgid "Please insert a DVD!" +msgstr "пожалюста вставте DVD" + +#: src/help_menu.c:43 src/playback_menu.c:490 src/playback_menu.c:549 +#: src/settings_menu.c:460 msgid "Next Page" msgstr "Следующий лист" -#: src/help_menu.c:49 src/playback_menu.c:477 src/playback_menu.c:531 -#: src/playback_menu.c:535 src/playlist_menu.c:543 src/settings_menu.c:467 +#: src/help_menu.c:49 src/playback_menu.c:494 src/playback_menu.c:553 +#: src/playback_menu.c:557 src/playlist_menu.c:553 src/settings_menu.c:465 msgid "Back" msgstr "Назад" @@ -1269,110 +1297,98 @@ msgid "Zulu" msgstr "Зулу" -#: src/lang.c:506 -msgid "Unknown" -msgstr "Неизвестный" - #: src/main_menu.c:71 #, fuzzy msgid "Could not find DVB channels file!" msgstr "Не могу найти файл настроек для LIRC" -#: src/main_menu.c:207 -#, fuzzy -msgid "Please insert an Audio CD!" -msgstr "Пожалюста вставте аудио CD" - -#: src/main_menu.c:245 -msgid "Please insert a Video CD!" -msgstr "Пожалюста вставте Видео CD" - -#: src/main_menu.c:283 -msgid "Please insert a DVD!" -msgstr "пожалюста вставте DVD" - -#: src/main_menu.c:328 +#: src/main_menu.c:366 msgid "How do you want to proceed?" msgstr "" -#: src/main_menu.c:342 +#: src/main_menu.c:380 msgid "Quit oxine" msgstr "" -#: src/main_menu.c:351 +#: src/main_menu.c:389 msgid "Shutdown the computer" msgstr "" -#: src/main_menu.c:360 +#: src/main_menu.c:398 msgid "Switch computer to standby" msgstr "" -#: src/main_menu.c:369 +#: src/main_menu.c:407 msgid "Reboot the computer" msgstr "" -#: src/main_menu.c:427 +#: src/main_menu.c:472 +#, fuzzy +msgid "Could not unmount device!" +msgstr "Не могу отключить %s" + +#: src/main_menu.c:476 #, fuzzy msgid "Could not eject device!" msgstr "Не могу извлеч устройство %s" -#: src/main_menu.c:449 +#: src/main_menu.c:508 msgid "Select device to eject:" msgstr "Выберите устройство для извлечения" -#: src/main_menu.c:593 +#: src/main_menu.c:652 msgid "Listen to Music" msgstr "Слушать музыку" -#: src/main_menu.c:594 +#: src/main_menu.c:653 msgid "Watch Films" msgstr "Смотреть фильмы" -#: src/main_menu.c:595 +#: src/main_menu.c:654 #, fuzzy msgid "Watch Television" msgstr "Аналоговое телевидинье" -#: src/main_menu.c:596 +#: src/main_menu.c:655 #, fuzzy msgid "Play a DVD" msgstr "пожалюста вставте DVD" -#: src/main_menu.c:597 +#: src/main_menu.c:656 #, fuzzy msgid "Play a Video CD" msgstr "Пожалюста вставте Видео CD" -#: src/main_menu.c:598 +#: src/main_menu.c:657 #, fuzzy msgid "Play an Audio CD" msgstr "Пожалюста вставте аудио CD" -#: src/main_menu.c:599 +#: src/main_menu.c:658 msgid "Show Help" msgstr "Показать помошь" -#: src/main_menu.c:600 +#: src/main_menu.c:659 msgid "Show Weather Report" msgstr "" -#: src/main_menu.c:601 +#: src/main_menu.c:660 #, fuzzy msgid "Edit Settings" msgstr "Настройки" -#: src/main_menu.c:602 src/settings_menu.c:512 +#: src/main_menu.c:661 src/settings_menu.c:510 msgid "Shutdown" msgstr "Выключиь" -#: src/main_menu.c:624 +#: src/main_menu.c:683 #, fuzzy msgid "Could not load main menu!" msgstr "Немогу загрузить mediamarks" #: src/mediamarks.c:103 src/mediamarks.c:139 src/menulist.c:140 -#: src/menulist.c:186 src/otk.c:3560 src/otk.c:3565 src/otk.c:3622 -#: src/otk.c:3627 src/playlist_xml.c:141 src/playlist_xml.c:176 +#: src/menulist.c:186 src/otk.c:3597 src/otk.c:3602 src/otk.c:3659 +#: src/otk.c:3664 src/playlist_xml.c:141 src/playlist_xml.c:176 #, fuzzy, c-format msgid "Unknown name '%s' for node!" msgstr "Не известный параметр %d" @@ -1381,13 +1397,13 @@ msgid "Found an entry that did not contain a MRL!" msgstr "" -#: src/mediamarks.c:159 src/menulist.c:207 src/otk.c:3591 +#: src/mediamarks.c:159 src/menulist.c:207 src/otk.c:3628 #: src/playlist_xml.c:196 #, c-format msgid "Parsing '%s' failed!" msgstr "" -#: src/mediamarks.c:165 src/menulist.c:212 src/otk.c:3596 +#: src/mediamarks.c:165 src/menulist.c:212 src/otk.c:3633 #: src/playlist_xml.c:201 #, fuzzy, c-format msgid "Root node of '%s' must be '%s'!" @@ -1435,23 +1451,23 @@ msgid "Aspect Ratio" msgstr "" -#: src/odk.c:519 src/odk.c:1414 +#: src/odk.c:519 src/odk.c:1458 msgid "Hue" msgstr "Насыщеность" -#: src/odk.c:522 src/odk.c:1416 +#: src/odk.c:522 src/odk.c:1460 msgid "Saturation" msgstr "" -#: src/odk.c:525 src/odk.c:1412 +#: src/odk.c:525 src/odk.c:1455 msgid "Contrast" msgstr "Контраст" -#: src/odk.c:528 src/odk.c:1410 +#: src/odk.c:528 src/odk.c:1452 msgid "Brightness" msgstr "Яркость" -#: src/odk.c:532 +#: src/odk.c:532 src/odk.c:1463 msgid "Zoom" msgstr "Зум" @@ -1492,8 +1508,8 @@ msgid "none" msgstr "нет" -#: src/odk.c:592 src/odk.c:608 src/odk.c:629 src/settings_menu.c:600 -#: src/settings_menu.c:634 src/settings_menu.c:643 +#: src/odk.c:592 src/odk.c:608 src/odk.c:629 src/settings_menu.c:598 +#: src/settings_menu.c:632 src/settings_menu.c:641 msgid "auto" msgstr "авто" @@ -1546,40 +1562,31 @@ msgid "Malformed MRL" msgstr "" -#: src/odk.c:1110 +#: src/odk.c:1112 #, fuzzy, c-format msgid "Could not play '%s': %s!" msgstr "Не могу воспроизвести '%s' (%s)!" -#: src/odk.c:1375 src/odk.c:1376 +#: src/odk.c:1422 src/odk.c:1423 msgid "encode special characters in MRLs" msgstr "" -#: src/odk.c:1380 -#, fuzzy -msgid "use unscaled OSD if possible" -msgstr "Используется полноэкранный OSD" - -#: src/odk.c:1381 -msgid "Use unscaled (full screen resolution) OSD if possible" -msgstr "" - -#: src/odk.c:1386 +#: src/odk.c:1428 #, fuzzy msgid "audio visualization type" msgstr "Аудио визуализация - Style" -#: src/odk.c:1387 +#: src/odk.c:1429 msgid "" "What kind of visual output is to be displayed when playing an audio only " "stream." msgstr "" -#: src/odk.c:1394 +#: src/odk.c:1436 msgid "background image MRL" msgstr "" -#: src/odk.c:1395 +#: src/odk.c:1437 #, fuzzy msgid "" "The MRL of the background image that will be displayed if 'visual_anim." @@ -1588,11 +1595,11 @@ "MRL может быть показан если перененная 'gui.visual_anim.stile' будет " "установлена на 'Background Image'" -#: src/odk.c:1403 +#: src/odk.c:1445 msgid "stream animation MRL" msgstr "" -#: src/odk.c:1404 +#: src/odk.c:1446 #, fuzzy msgid "" "The MRL of the stream animation that will be displayed if 'visual_anim." @@ -1601,21 +1608,21 @@ "MRL может быть показан если перененная 'gui.visual_anim.stile' будет " "установлена на Animation'" -#: src/odk.c:1459 +#: src/odk.c:1506 #, c-format msgid "Failed to create window using video driver '%s'!" msgstr "Ошибка создания окна программы используется драйвер %s !" -#: src/odk.c:1464 +#: src/odk.c:1511 msgid "Failed to create window using default driver." msgstr "Ошибка создания окна программы, использую драйвер по умолчанию" -#: src/odk.c:1474 +#: src/odk.c:1521 #, c-format msgid "Failed to open audio port using audio driver '%s'!" msgstr "Ошибка открытия аудио порта, использую драйвер '%s'" -#: src/odk.c:1479 +#: src/odk.c:1526 msgid "Failed to open audio port using default audio driver." msgstr "Ошибка открытия аудио порта, используется драйвер поумолчанию" @@ -1704,31 +1711,31 @@ msgid "Successfully stopped the LIRC input plugin." msgstr "" -#: src/odk_osd.c:427 +#: src/odk_osd.c:452 #, fuzzy, c-format msgid "Could not read image '%s'!" msgstr "Не могу открыть '%s' (%s)!" -#: src/odk_osd.c:482 +#: src/odk_osd.c:507 #, fuzzy, c-format msgid "Could not scale image '%s'!" msgstr "Не могу воспроизвести '%s' (%s)!" -#: src/odk_osd.c:525 +#: src/odk_osd.c:550 #, fuzzy msgid "Could not get pixel data!" msgstr "Не согу получить параметры пикселей" -#: src/odk_osd.c:745 +#: src/odk_osd.c:770 #, fuzzy, c-format msgid "Could not free a cache entry for '%s'." msgstr "Не известно время для %s" -#: src/odk_osd.c:1671 +#: src/odk_osd.c:1721 msgid "The current video driver supports unscaled OSD!" msgstr "" -#: src/odk_osd.c:1673 +#: src/odk_osd.c:1723 msgid "The current video driver does not support unscaled OSD!" msgstr "" @@ -1763,77 +1770,77 @@ msgid "Found %d Xinerama screens:" msgstr "" -#: src/odk_x11.c:1014 +#: src/odk_x11.c:1002 #, c-format msgid "" "Overriding calculated monitor pixel aspect ratio with user provided value: " "%.02f" msgstr "" -#: src/odk_x11.c:1030 +#: src/odk_x11.c:1018 #, c-format msgid "Failed to open video port '%s', falling back to 'auto'." msgstr "Ошибка открытия порта '%s'. Используется автоматическое определение" -#: src/odk_x11.c:1037 +#: src/odk_x11.c:1025 msgid "Failed to open video port!" msgstr "Ошибка открытия видио порта!" -#: src/otk.c:3527 src/otk.c:3534 +#: src/otk.c:3564 src/otk.c:3571 #, c-format msgid "Missing property (required) '%s'!" msgstr "" -#: src/otk.c:3578 +#: src/otk.c:3615 #, fuzzy, c-format msgid "Loading palette file '%s'..." msgstr "Загружаю файл меню '%s'..." -#: src/otk.c:3654 +#: src/otk.c:3691 msgid "Could not load palette, reverting to standard colors." msgstr "" -#: src/oxine.c:107 +#: src/oxine.c:113 #, c-format msgid "Usage: oxine [OPTIONS] [MRL]\n" msgstr "Использовать oxine [OPTIONS] [MRL]\n" -#: src/oxine.c:109 +#: src/oxine.c:115 #, c-format msgid "OPTIONS are:\n" msgstr "Опции\n" -#: src/oxine.c:110 +#: src/oxine.c:116 #, c-format msgid " -v, --version Display version.\n" msgstr " -v, --version Показать версию.\n" -#: src/oxine.c:111 +#: src/oxine.c:117 #, c-format msgid " --verbose [=level] Set verbosity level. Default is 1.\n" msgstr "" -#: src/oxine.c:113 +#: src/oxine.c:119 #, c-format msgid " -l, --logfile Set the log filename.\n" msgstr "" -#: src/oxine.c:114 +#: src/oxine.c:120 #, c-format msgid " -V, --video-driver Select video driver by ID.\n" msgstr "" -#: src/oxine.c:115 src/oxine.c:129 +#: src/oxine.c:121 src/oxine.c:135 #, c-format msgid " Available drivers:\n" msgstr "" -#: src/oxine.c:128 +#: src/oxine.c:134 #, c-format msgid " -A, --audio-driver Select audio driver by ID.\n" msgstr "" -#: src/oxine.c:140 +#: src/oxine.c:146 #, c-format msgid "" " -X, --xineramascreen [=num] Sets the screen on which the fullscreen " @@ -1841,29 +1848,36 @@ " will be shown.\n" msgstr "" -#: src/oxine.c:144 +#: src/oxine.c:150 #, c-format msgid " -F, --no-fullscreen Do no start in fullscreen mode.\n" msgstr "" -#: src/oxine.c:147 +#: src/oxine.c:153 #, c-format msgid "" " -P, --no-polling Do not use automatic polling for removable " "media.\n" msgstr "" -#: src/oxine.c:151 +#: src/oxine.c:157 #, c-format msgid " -L, --no-lirc Do not use remote control (LIRC).\n" msgstr "" -#: src/oxine.c:155 +#: src/oxine.c:161 #, c-format msgid " -J, --no-joystick Do not use joystick support.\n" msgstr "" -#: src/oxine.c:159 +#: src/oxine.c:165 +#, c-format +msgid "" +" -W, --no-weather Do not automaticaly retrieve weather " +"information.\n" +msgstr "" + +#: src/oxine.c:169 #, c-format msgid "" "Examples for valid MRLs (media resource locator):\n" @@ -1878,221 +1892,217 @@ " VCD: 'vcd://'\n" msgstr "" -#: src/oxine.c:180 src/oxine.c:181 +#: src/oxine.c:190 src/oxine.c:191 msgid "video driver to use" msgstr "" -#: src/oxine.c:184 src/oxine.c:185 +#: src/oxine.c:194 src/oxine.c:195 msgid "audio driver to use" msgstr "" -#: src/oxine.c:190 src/oxine.c:191 +#: src/oxine.c:199 src/oxine.c:200 #, fuzzy msgid "Xinerama screen for fullscreen window" msgstr "не полноэкранная ширина окна" -#: src/oxine.c:196 src/oxine.c:197 -msgid "percentage of fullscreen screen to use" -msgstr "" - -#: src/oxine.c:201 +#: src/oxine.c:204 msgid "non-fullscreen window width" msgstr "не полноэкранная ширина окна" -#: src/oxine.c:202 +#: src/oxine.c:205 msgid "The width of the non-fullscreen window" msgstr "не полноэкранная ширина окна" -#: src/oxine.c:206 +#: src/oxine.c:209 msgid "non-fullscreen window height" msgstr "не полноэкранная высота окна" -#: src/oxine.c:207 +#: src/oxine.c:210 msgid "The height of the non-fullscreen window" msgstr "не полноэкранная ширина окна" -#: src/oxine.c:211 src/oxine.c:212 +#: src/oxine.c:214 src/oxine.c:215 msgid "aspect ratio of one monitor pixel" msgstr "" -#: src/oxine.c:217 +#: src/oxine.c:220 msgid "ask before leaving oxine" msgstr "" -#: src/oxine.c:218 +#: src/oxine.c:221 msgid "Are we to show the quit confirm dialog?" msgstr "" -#: src/oxine.c:222 src/oxine.c:223 +#: src/oxine.c:225 src/oxine.c:226 msgid "command that was selected the last time" msgstr "" -#: src/oxine.c:228 src/oxine.c:229 +#: src/oxine.c:231 src/oxine.c:232 msgid "shell command (power off)" msgstr "" -#: src/oxine.c:234 src/oxine.c:235 +#: src/oxine.c:237 src/oxine.c:238 msgid "shell command (reboot)" msgstr "" -#: src/oxine.c:239 src/oxine.c:240 +#: src/oxine.c:242 src/oxine.c:243 msgid "shell command (standby)" msgstr "" -#: src/oxine.c:245 +#: src/oxine.c:248 msgid "METAR ICAO location indicator" msgstr "" -#: src/oxine.c:246 +#: src/oxine.c:249 msgid "" "The METAR ICAO Location Indicator defines for which location the weather is " "to be displayed." msgstr "" -#: src/oxine.c:252 +#: src/oxine.c:255 #, fuzzy msgid "reload playlist on start" msgstr "Сохранить список в файл" -#: src/oxine.c:253 +#: src/oxine.c:256 msgid "" "If this is enabled and if you don't specify any MRL on the command line, " "oxine will automatically load the previous playlist." msgstr "" -#: src/oxine.c:259 +#: src/oxine.c:262 #, fuzzy msgid "play reloaded playlist on start" msgstr "Сохранить список в файл" -#: src/oxine.c:260 +#: src/oxine.c:263 msgid "" "If this is enabled and gui.playlist_auto_reload is also enabled the reloaded " "playlist will automatically be played." msgstr "" -#: src/oxine.c:267 +#: src/oxine.c:270 msgid "subtitle autoloading" msgstr "" -#: src/oxine.c:268 +#: src/oxine.c:271 msgid "Automatically load subtitles if they exist." msgstr "Автоматически загружать субтитры при наличии" -#: src/oxine.c:395 +#: src/oxine.c:406 #, c-format msgid "This is %s - A free Video-Player v%s\n" msgstr "" -#: src/oxine.c:397 +#: src/oxine.c:408 #, c-format msgid "(c) 2005 by the oxine project\n" msgstr "" -#: src/oxine.c:406 +#: src/oxine.c:417 #, c-format msgid "Invalid argument %d!" msgstr "" -#: src/oxine.c:491 +#: src/oxine.c:502 #, fuzzy msgid "Could not initialize ODK!" msgstr "Не могу инициализировать Х-расширения" -#: src/oxine.c:502 +#: src/oxine.c:513 #, fuzzy msgid "Could not inizialize OTK!" msgstr "Не могу инициализировать Х-расширения" -#: src/playback_menu.c:747 src/playback_menu.c:1172 +#: src/playback_menu.c:769 src/playback_menu.c:1195 msgid "Album:" msgstr "Альбом" -#: src/playback_menu.c:753 src/playback_menu.c:1178 +#: src/playback_menu.c:775 src/playback_menu.c:1201 msgid "Artist:" msgstr "Артист" -#: src/playback_menu.c:759 src/playback_menu.c:1184 +#: src/playback_menu.c:781 src/playback_menu.c:1207 msgid "Year:" msgstr "Год" -#: src/playback_menu.c:765 src/playback_menu.c:1190 +#: src/playback_menu.c:787 src/playback_menu.c:1213 msgid "Track:" msgstr "Трек" -#: src/playback_menu.c:772 src/playback_menu.c:1197 +#: src/playback_menu.c:794 src/playback_menu.c:1220 msgid "Genre:" msgstr "Стиль" -#: src/playback_menu.c:779 +#: src/playback_menu.c:801 msgid "Length:" msgstr "Длина" -#: src/playback_menu.c:788 +#: src/playback_menu.c:810 msgid "Elapsed:" msgstr "Прошло:" -#: src/playback_menu.c:1014 +#: src/playback_menu.c:1037 msgid "Loop Mode" msgstr "Один файл" -#: src/playback_menu.c:1019 +#: src/playback_menu.c:1042 msgid "Shuffle Mode" msgstr "Вразброс" -#: src/playback_menu.c:1024 +#: src/playback_menu.c:1047 msgid "Normal Mode" msgstr "Поочереди" -#: src/playback_menu.c:1035 +#: src/playback_menu.c:1058 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:79 msgid "Settings" msgstr "Настройки" -#: src/playback_menu.c:1058 +#: src/playback_menu.c:1081 msgid "Media Browser" msgstr "" -#: src/playlist_menu.c:637 +#: src/playlist_menu.c:650 #, fuzzy msgid "Delete subtitle" msgstr "Настройка субтитров" -#: src/playlist_menu.c:639 src/playlist_menu.c:1043 +#: src/playlist_menu.c:652 src/playlist_menu.c:1056 #, fuzzy msgid "Add subtitle" msgstr "Настройка субтитров" -#: src/playlist_menu.c:661 +#: src/playlist_menu.c:674 #, fuzzy msgid "Subtitle" msgstr "Настройка субтитров" -#: src/playlist_menu.c:943 +#: src/playlist_menu.c:956 msgid "Please enter a name for the playlist:" msgstr "" -#: src/playlist_menu.c:1014 +#: src/playlist_menu.c:1027 #, fuzzy msgid "Clear list" msgstr "Отчистить список" -#: src/playlist_menu.c:1018 +#: src/playlist_menu.c:1031 #, fuzzy msgid "Save list" msgstr "Сохранить список" -#: src/playlist_menu.c:1033 +#: src/playlist_menu.c:1046 #, fuzzy msgid "Move up" msgstr "Вверх" -#: src/playlist_menu.c:1038 +#: src/playlist_menu.c:1051 #, fuzzy msgid "Move down" msgstr "Вниз" -#: src/playlist_menu.c:1048 +#: src/playlist_menu.c:1061 msgid "Media-Browser" msgstr "" @@ -2117,382 +2127,382 @@ "for the changes to take effect!" msgstr "" -#: src/settings_menu.c:504 +#: src/settings_menu.c:502 msgid "User Interface" msgstr "" -#: src/settings_menu.c:506 +#: src/settings_menu.c:504 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:80 msgid "Weather" msgstr "" -#: src/settings_menu.c:509 +#: src/settings_menu.c:507 msgid "Video Disc Recorder" msgstr "" -#: src/settings_menu.c:513 +#: src/settings_menu.c:511 #, fuzzy msgid "Audio Visualization" msgstr "Аудио визуализация - Style" -#: src/settings_menu.c:514 +#: src/settings_menu.c:512 #, fuzzy msgid "Audio" msgstr "авто" -#: src/settings_menu.c:515 +#: src/settings_menu.c:513 #, fuzzy msgid "Video" msgstr "Скрыть" -#: src/settings_menu.c:516 +#: src/settings_menu.c:514 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:76 #, fuzzy msgid "Media" msgstr "без звука" -#: src/settings_menu.c:517 +#: src/settings_menu.c:515 #, fuzzy msgid "Decoder" msgstr "декодер" -#: src/settings_menu.c:518 +#: src/settings_menu.c:516 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:78 #, fuzzy msgid "Subtitles" msgstr "Настройка субтитров" -#: src/settings_menu.c:519 +#: src/settings_menu.c:517 #, fuzzy msgid "Effects" msgstr "эфекты" -#: src/settings_menu.c:520 +#: src/settings_menu.c:518 #, fuzzy msgid "Engine" msgstr "движок" -#: src/settings_menu.c:521 +#: src/settings_menu.c:519 msgid "Miscellaneous" msgstr "" -#: src/settings_menu.c:578 +#: src/settings_menu.c:576 msgid "white-black-transparent" msgstr "" -#: src/settings_menu.c:579 +#: src/settings_menu.c:577 msgid "white-none-transparent" msgstr "" -#: src/settings_menu.c:580 +#: src/settings_menu.c:578 msgid "white-none-translucid" msgstr "" -#: src/settings_menu.c:581 +#: src/settings_menu.c:579 msgid "yellow-black-transparent" msgstr "" -#: src/settings_menu.c:583 +#: src/settings_menu.c:581 msgid "Mono 1.0" msgstr "" -#: src/settings_menu.c:584 +#: src/settings_menu.c:582 msgid "Stereo 2.0" msgstr "" -#: src/settings_menu.c:585 +#: src/settings_menu.c:583 msgid "Headphones 2.0" msgstr "" -#: src/settings_menu.c:586 +#: src/settings_menu.c:584 msgid "Stereo 2.1" msgstr "" -#: src/settings_menu.c:587 +#: src/settings_menu.c:585 msgid "Surround 3.0" msgstr "" -#: src/settings_menu.c:588 +#: src/settings_menu.c:586 msgid "Surround 4.0" msgstr "" -#: src/settings_menu.c:589 +#: src/settings_menu.c:587 msgid "Surround 4.1" msgstr "" -#: src/settings_menu.c:590 +#: src/settings_menu.c:588 msgid "Surround 5.0" msgstr "" -#: src/settings_menu.c:591 +#: src/settings_menu.c:589 msgid "Surround 5.1" msgstr "" -#: src/settings_menu.c:592 +#: src/settings_menu.c:590 msgid "Surround 6.0" msgstr "" -#: src/settings_menu.c:593 +#: src/settings_menu.c:591 msgid "Surround 6.1" msgstr "" -#: src/settings_menu.c:594 +#: src/settings_menu.c:592 msgid "Surround 7.1" msgstr "" -#: src/settings_menu.c:595 +#: src/settings_menu.c:593 msgid "Pass Through" msgstr "" -#: src/settings_menu.c:597 +#: src/settings_menu.c:595 msgid "metronom feedback" msgstr "" -#: src/settings_menu.c:598 +#: src/settings_menu.c:596 msgid "resample" msgstr "" -#: src/settings_menu.c:601 +#: src/settings_menu.c:599 msgid "off" msgstr "" -#: src/settings_menu.c:602 +#: src/settings_menu.c:600 #, fuzzy msgid "on" msgstr "нет" -#: src/settings_menu.c:604 +#: src/settings_menu.c:602 msgid "2D_Tex_Fragprog" msgstr "2D_Tex_Fragprog" -#: src/settings_menu.c:605 +#: src/settings_menu.c:603 msgid "2D_Tex" msgstr "2D_Tex" -#: src/settings_menu.c:606 +#: src/settings_menu.c:604 msgid "2D_Tex_Tiled" msgstr "2D_Tex_Tiled" -#: src/settings_menu.c:607 +#: src/settings_menu.c:605 msgid "Image_Pipeline" msgstr "Image_Pipeline" -#: src/settings_menu.c:608 +#: src/settings_menu.c:606 msgid "Cylinder" msgstr "" -#: src/settings_menu.c:609 +#: src/settings_menu.c:607 msgid "Env_Mapped_Torus" msgstr "Env_Mapped_Torus" -#: src/settings_menu.c:611 +#: src/settings_menu.c:609 msgid "entire dvd" msgstr "" -#: src/settings_menu.c:612 +#: src/settings_menu.c:610 msgid "one chapter" msgstr "" -#: src/settings_menu.c:614 +#: src/settings_menu.c:612 msgid "seek in program chain" msgstr "" -#: src/settings_menu.c:615 +#: src/settings_menu.c:613 msgid "seek in program" msgstr "" -#: src/settings_menu.c:617 +#: src/settings_menu.c:615 msgid "skip program" msgstr "" -#: src/settings_menu.c:618 +#: src/settings_menu.c:616 msgid "skip part" msgstr "" -#: src/settings_menu.c:619 +#: src/settings_menu.c:617 #, fuzzy msgid "skip title" msgstr "Настройка субтитров" -#: src/settings_menu.c:621 +#: src/settings_menu.c:619 msgid "14.4 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:622 +#: src/settings_menu.c:620 msgid "19.2 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:623 +#: src/settings_menu.c:621 msgid "28.8 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:624 +#: src/settings_menu.c:622 msgid "33.6 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:625 +#: src/settings_menu.c:623 msgid "34.4 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:626 +#: src/settings_menu.c:624 msgid "57.6 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:627 +#: src/settings_menu.c:625 msgid "115.2 Kbps (ISDN)" msgstr "" -#: src/settings_menu.c:628 +#: src/settings_menu.c:626 msgid "262.2 Kbps (Cable/DSL)" msgstr "" -#: src/settings_menu.c:629 +#: src/settings_menu.c:627 msgid "393.2 Kbps (Cable/DSL)" msgstr "" -#: src/settings_menu.c:630 +#: src/settings_menu.c:628 msgid "524.3 Kbps (Cable/DSL)" msgstr "" -#: src/settings_menu.c:631 +#: src/settings_menu.c:629 msgid "1.5 Mbps (T1)" msgstr "" -#: src/settings_menu.c:632 +#: src/settings_menu.c:630 msgid "10.5 Mbps (LAN)" msgstr "" -#: src/settings_menu.c:635 +#: src/settings_menu.c:633 msgid "TCP" msgstr "TCP" -#: src/settings_menu.c:636 +#: src/settings_menu.c:634 msgid "HTTP" msgstr "HTTP" -#: src/settings_menu.c:638 +#: src/settings_menu.c:636 msgid "MPEG track" msgstr "" -#: src/settings_menu.c:639 src/settings_menu.c:645 +#: src/settings_menu.c:637 src/settings_menu.c:643 #, fuzzy msgid "entry" msgstr "ввод" -#: src/settings_menu.c:640 +#: src/settings_menu.c:638 msgid "segment" msgstr "" -#: src/settings_menu.c:641 +#: src/settings_menu.c:639 msgid "playback-control item" msgstr "" -#: src/settings_menu.c:644 +#: src/settings_menu.c:642 #, fuzzy msgid "track" msgstr "Трек" -#: src/settings_menu.c:647 +#: src/settings_menu.c:645 #, fuzzy msgid "tiny" msgstr "Латинский" -#: src/settings_menu.c:648 +#: src/settings_menu.c:646 msgid "small" msgstr "" -#: src/settings_menu.c:649 +#: src/settings_menu.c:647 #, fuzzy msgid "normal" msgstr "Сомали" -#: src/settings_menu.c:650 +#: src/settings_menu.c:648 msgid "large" msgstr "" -#: src/settings_menu.c:651 +#: src/settings_menu.c:649 msgid "very large" msgstr "" -#: src/settings_menu.c:652 +#: src/settings_menu.c:650 #, fuzzy msgid "huge" msgstr "Чжуань" -#: src/settings_menu.c:654 +#: src/settings_menu.c:652 msgid "Fast but not photorealistic" msgstr "" -#: src/settings_menu.c:655 +#: src/settings_menu.c:653 msgid "Slow but looks better" msgstr "" -#: src/settings_menu.c:657 +#: src/settings_menu.c:655 msgid "default" msgstr "" -#: src/settings_menu.c:658 +#: src/settings_menu.c:656 msgid "reverse" msgstr "" -#: src/settings_menu.c:659 +#: src/settings_menu.c:657 msgid "content" msgstr "" -#: src/settings_menu.c:660 +#: src/settings_menu.c:658 msgid "extension" msgstr "" -#: src/settings_menu.c:662 +#: src/settings_menu.c:660 msgid "probe" msgstr "" -#: src/settings_menu.c:663 +#: src/settings_menu.c:661 msgid "libc" msgstr "libc" -#: src/settings_menu.c:664 +#: src/settings_menu.c:662 msgid "kernel" msgstr "kernel" -#: src/settings_menu.c:665 +#: src/settings_menu.c:663 msgid "mmx" msgstr "mmx" -#: src/settings_menu.c:666 +#: src/settings_menu.c:664 msgid "mmxext" msgstr "mmxext" -#: src/settings_menu.c:667 +#: src/settings_menu.c:665 msgid "sse" msgstr "sse" -#: src/settings_menu.c:669 +#: src/settings_menu.c:667 msgid "Background Image" msgstr "" -#: src/settings_menu.c:670 +#: src/settings_menu.c:668 msgid "Background Animation" msgstr "" -#: src/settings_menu.c:671 +#: src/settings_menu.c:669 #, fuzzy msgid "Post Plugin" msgstr "Нет поагина для ввода" -#: src/settings_menu.c:673 +#: src/settings_menu.c:671 msgid "oscope" msgstr "oscope" -#: src/settings_menu.c:674 +#: src/settings_menu.c:672 msgid "fftscope" msgstr "fftscope" -#: src/settings_menu.c:675 +#: src/settings_menu.c:673 msgid "fftgraph" msgstr "fftgraph" -#: src/settings_menu.c:676 +#: src/settings_menu.c:674 msgid "goom" msgstr "goom" @@ -2888,6 +2898,18 @@ msgstr "" #, fuzzy +#~ msgid "Could not mount %s!" +#~ msgstr "Не могу подключить %s" + +#, fuzzy +#~ msgid "Could not eject %s!" +#~ msgstr "Не могу извлеч %s" + +#, fuzzy +#~ msgid "use unscaled OSD if possible" +#~ msgstr "Используется полноэкранный OSD" + +#, fuzzy #~ msgid "Corse" #~ msgstr "Корнский" diff -Naur oxine-0.6.orig/po/uk.gmo oxine-0.6.3/po/uk.gmo --- oxine-0.6.orig/po/uk.gmo 2006-11-03 18:35:36.000000000 +0100 +++ oxine-0.6.3/po/uk.gmo 2006-11-22 10:56:29.000000000 +0100 @@ -1,23 +1,23 @@ -% `2aB::0M~  -   -+%QV -]hov~!%&*>FV)9Th*!<Xn    - K%q-02/5b%,7#> FS -gr$z*  s}qD^flt - !A@  a o!{      /II   -   ' 0 7 A M U ^ o } + / + /!E!7M!/!'!&!%"*" -0";"B" J"'T""|"" ""+""5#K# T#^#!e# ####5#(#$ $$;$O$ f$t$$$$$$$$$$$$$$%%1%M%R% Y%e%~%%%%%%%%g&>m''O1(O(>()/)6) F)S) W) d)r)))) )))&*b'* -*******.+90+Nj+I+0,&4,.[,,O8-N-A-8.CR.A.,../.4/4c/E///%0040Ae0G0001 1 R1_1c1r161A12262 E2S2h2y22(40;4xl4k4?Q5>5u5F6Z6x#77918k8~8888E8=09n9 99 -99999:;-;;;c< x<<<<6< ==:'=b==}>>>>>*?9?N? a?n?#??? -?? ?(@2,@_@&@A A8AIA\AtAAAGAAB.BABRBeB'zBBBBB#CG$C[lCGC[DlDf}DaD8FE8E<E -EFF.F?FFTFPFFF'GBEG;GG ZHhHwH9HHHHHQICTII-I7I0J?JJ'J?JJ)J*%K PKZKbKkKtKyKKKKKK8K8K0L9L!@L/bLLLL@L3M6M]QM?Mp2;3vcC&OFy+5>b"~Dd]hHq^1eW4 SG/?g0[{-8j`6<Entu$ =sxrX -%L*Z7'fR kT9VK|IM)(@QlJU\Yw #,:B}z Amoi_aP!.N Available drivers: +%| 2BD::0.MT dquy +   ++ + &.7!R%t&F)9c *6az  0Q Wekt| K-06g25% +,07]  +$*<CJPW [ eso}apD + %!.AP@  !  ) 5? BP eov{I*1 :D L +Vay     +/+ +[ /  7 / ''!&O!%v!! +!!! !'!"!" "'"+="i"" ""!" """"5"(#B#G#Z#w## ######$ $$$ $'$,$0$7$=$P$m$$$ $$$$$$$$%g$%>&&OP'O'>'/(N(U( e(r( v( ((()( (( )&)bF) +))))))*. *9O*N*I*0"+.S++O0,N,A,8-CJ-A-.-.-4..Ec./.%.0.A0/Gr/1/ /// 06)0A`0000 0011&1(202x3k3?3>+4uj44Zb5x566967787W7u7E7=78 8)8 +88C8T8e8z8:9:--:[:p:: ;;5;Q;6d; ;;:;;<=2=>N==*=== =>#>A>W> +n>y> >(>2>>&??????@!@6@GM@@@@@@@'A|jlf}\^M!,K Available drivers: --verbose [=level] Set verbosity level. Default is 1. -A, --audio-driver Select audio driver by ID. -V, --video-driver Select video driver by ID. -v, --version Display version. (c) 2005 by the oxine project -2D_Tex2D_Tex_Fragprog2D_Tex_Tiled4:3AddAlbum:Angle MenuArtist:Aspect RatioAudio CDAudio ChannelAudio MenuAudio-Video OffsetAutomatically load subtitles if they exist.BackBretonBrightnessCD-ROMCancelCatalanContrastCould not create '%s': %s!Could not create LIRC thread: %s!Could not create joystick thread: %s!Could not create scheduler thread: %s!Could not create stream!Could not eject %s!Could not eject device!Could not find %s, trying to use default configuration file %s/lircrc.Could not find a LIRC configuration file.Could not find demuxer pluginCould not get pixel data!Could not initialize X threads!Could not load main menu!Could not load mediamarks.Could not mount %s!Could not open '%s': %s!Could not open disc!Could not open display!Could not perform codeset conversion (%s)!Could not play '%s': %s!Could not play title!Could not read '%s': %s!Could not read image '%s'!Could not scale image '%s'!Could not unmount %s!Could not write to '%s': %s!CzechDVDDanishDeinterlaceDemuxer plugin failedDevices oxine tried to open are:DutchEdit SettingsEjectElapsed:EnglishEnv_Mapped_TorusEsperantoExamples for valid MRLs (media resource locator): +2D_Tex2D_Tex_Fragprog2D_Tex_Tiled4:3AddAlbum:Angle MenuArtist:Aspect RatioAudio CDAudio ChannelAudio MenuAudio-Video OffsetAutomatically load subtitles if they exist.BackBretonBrightnessCD-ROMCancelCatalanContrastCould not create '%s': %s!Could not create LIRC thread: %s!Could not create joystick thread: %s!Could not create scheduler thread: %s!Could not create stream!Could not eject device!Could not find %s, trying to use default configuration file %s/lircrc.Could not find a LIRC configuration file.Could not find demuxer pluginCould not get pixel data!Could not initialize X threads!Could not load main menu!Could not load mediamarks.Could not open '%s': %s!Could not open disc!Could not open display!Could not perform codeset conversion (%s)!Could not play '%s': %s!Could not play title!Could not read '%s': %s!Could not read image '%s'!Could not scale image '%s'!Could not write to '%s': %s!CzechDVDDanishDeinterlaceDemuxer plugin failedDevices oxine tried to open are:DutchEdit SettingsEjectElapsed:EnglishEnv_Mapped_TorusEsperantoExamples for valid MRLs (media resource locator): File: 'path/foo.vob' '/path/foo.vob' 'file://path/foo.vob' @@ -31,9 +31,9 @@ for the changes to take effect!ItalianLatinLength:Listen to MusicLithuanianLoading menu file '%s'...Loop ModeMainmenuMake sure you have lircd running.Make sure you have the permissions to connect to the LIRC socket.Make sure you have the permissions to open the joystick devices.Malformed MRLMenu toggleMissing property (required) '%s'!Next PageNo input pluginNormal ModeNorwegianOKOPTIONS are: Parsing '%s' failed!Part MenuPausedPlayPlayingPlaylistPlease insert a DVD!Please insert a Video CD!Please run 'jscalibrator -file %s -device %s' to calibrate your joystick.Please wait...PolishRemovable DiscRemoveRomanianRoot MenuRussianSardinianSaturationSelect device to eject:SettingsShow HelpShuffle ModeShutdownSlovakSlovenianSlow MotionSpanishSubtitleSubtitle ChannelSubtitle MenuSubtitle OffsetSuccessfully started the LIRC input plugin.Successfully started the joystick input plugin.Successfully stopped the LIRC input plugin.Successfully stopped the joystick input plugin.SwedishThe current video driver does not support unscaled OSD!The current video driver supports unscaled OSD!The height of the non-fullscreen windowThe width of the non-fullscreen windowThis is %s - A free Video-Player v%s TitleTitle MenuTrack:TurkishUkrainianUnable to get status for file '%s': %s.Unable to read link '%s' file: %s.UnknownUnknown errorUnknown parameter %d!Unknown parameter '%s' for type 'autoplay'!Usage: oxine [OPTIONS] [MRL] -Use unscaled (full screen resolution) OSD if possibleVideo CDVideo DVDVolumeWaiting for alternative stream...Watch FilmsWelshYear:YiddishYou should create a file containing mediamarks at %s!Your joystick has never been calibrated!Zoom[M3U-Playlist: %s]activate an item or a buttonadjust audio offsetadjust subtitle offsetadjust volumeaudio driver to useautochange audio languagechange subtitle languagedisabledenabledfftgraphfftscopegoomkernellibcmmxmmxextmutednavigate the menusnon-fullscreen window heightnon-fullscreen window widthnoneoscopepause/ playselect an item in a listsquaressestop the streamtoggle aspect ratiotoggle deinterlacetoggle mute/ unmuteuse unscaled OSD if possiblevideo driver to useProject-Id-Version: oxine-uk +Video CDVideo DVDVolumeWaiting for alternative stream...Watch FilmsWelshYear:YiddishYou should create a file containing mediamarks at %s!Your joystick has never been calibrated!Zoom[M3U-Playlist: %s]activate an item or a buttonadjust audio offsetadjust subtitle offsetadjust volumeaudio driver to useautochange audio languagechange subtitle languagedisabledenabledfftgraphfftscopegoomkernellibcmmxmmxextmutednavigate the menusnon-fullscreen window heightnon-fullscreen window widthnoneoscopepause/ playselect an item in a listsquaressestop the streamtoggle aspect ratiotoggle deinterlacetoggle mute/ unmutevideo driver to useProject-Id-Version: oxine-uk Report-Msgid-Bugs-To: mschwerin@users.sf.net -POT-Creation-Date: 2006-11-03 18:35+0100 +POT-Creation-Date: 2006-11-22 10:56+0100 PO-Revision-Date: 2006-10-17 10:15+0100 Last-Translator: Maximilian Schwerin Language-Team: ukrainian @@ -47,7 +47,7 @@ -V, --video-driver Вибір відео-драйвера за ID. -v, --version Показати версію. (c) 2005 by the oxine project -2D_Tex2D_Tex_Fragprog2D_Tex_Tiled4:3ДодатиАльбом:Меню сторінВиконавець:Співвідношення сторінАудіо CDАудіо-каналАудіо-менюЗміщення аудіо-відеоАвтоматично завантажувати субтитри, якщо вони наявніНазадБретонськаЯскравістьCD-ROMСкасуватиКаталонськаКонтрастНе вдалося створити '%s': %s!Не вдалося створити нитку LIRC: %s!Не вдалося створити нитку для джойстика: %s!Не вдалося створити потік диспетчера: %s!Не вдалося створити потік!Не вдалося витягти %s!Не можу витягти пристрій!Не вдалося знайти файл %s. Спробую використати файл налаштування для LIRC за замовчуванням: %s/lircrc.Не вдалося знайти файл налаштування для LIRC.Не вдалося знайти втулок демультиплексораНе вдалося отримати піксельні дані!Не вдалося ініціювати X-потоки!Не вдалося завантажити головне меню!Не вдалося завантажити мітки медіа.Не вдалося змонтувати %s!Не вдалося відкрити '%s': %s!Не вдалося відкрити диск!Не вдалося відкрити дисплей!Не вдалося виконати перекодування (%s)!Не вдалося програти '%s' (%s)!Не вдалося програти!Не вдалося прочитати '%s': %s!Не вдалося прочитати зображення '%s'!Не вдалося масштабувати зображення '%s'!Не вдалося відмонтувати %s!Не вдалося записати в '%s': %s!ЧеськаDVDДатськаДеінтерлейсінгЗбій втулка демультиплексораПристрої, що oxine намагався відкрити:ГолландськаНалаштуватиВитягтиМинуло:АнглійськаEnv_Mapped_TorusЕсперантоПриклади MRL(media resource locator) що є правильними : +2D_Tex2D_Tex_Fragprog2D_Tex_Tiled4:3ДодатиАльбом:Меню сторінВиконавець:Співвідношення сторінАудіо CDАудіо-каналАудіо-менюЗміщення аудіо-відеоАвтоматично завантажувати субтитри, якщо вони наявніНазадБретонськаЯскравістьCD-ROMСкасуватиКаталонськаКонтрастНе вдалося створити '%s': %s!Не вдалося створити нитку LIRC: %s!Не вдалося створити нитку для джойстика: %s!Не вдалося створити потік диспетчера: %s!Не вдалося створити потік!Не можу витягти пристрій!Не вдалося знайти файл %s. Спробую використати файл налаштування для LIRC за замовчуванням: %s/lircrc.Не вдалося знайти файл налаштування для LIRC.Не вдалося знайти втулок демультиплексораНе вдалося отримати піксельні дані!Не вдалося ініціювати X-потоки!Не вдалося завантажити головне меню!Не вдалося завантажити мітки медіа.Не вдалося відкрити '%s': %s!Не вдалося відкрити диск!Не вдалося відкрити дисплей!Не вдалося виконати перекодування (%s)!Не вдалося програти '%s' (%s)!Не вдалося програти!Не вдалося прочитати '%s': %s!Не вдалося прочитати зображення '%s'!Не вдалося масштабувати зображення '%s'!Не вдалося записати в '%s': %s!ЧеськаDVDДатськаДеінтерлейсінгЗбій втулка демультиплексораПристрої, що oxine намагався відкрити:ГолландськаНалаштуватиВитягтиМинуло:АнглійськаEnv_Mapped_TorusЕсперантоПриклади MRL(media resource locator) що є правильними : Файл: 'path/foo.vob' '/path/foo.vob' 'file://path/foo.vob' @@ -61,4 +61,4 @@ для того щоб зміни вступили в силу!ІталійськаЛатинаТривалість:Слухати музикуЛитовськаЗавантажується файл меню '%s'...По-колуГоловне менюПеревірте - чи був запущений lircd.Переконайтесь, що Ви маєте необхідні дозволи для підключення до сокету LIRC.Переконайтесь, що Ви маєте необхідні дозволи для відкриття пристрою джойстика.Некоректний MRLПеремикач менюВідсутній необхідний параметр '%s'!Наступна стор.Втулок вводу відсутнійПослідовноНорвезькаГараздПАРАМЕТРИ: Помилка аналізу '%s'!Меню частинПризупиненоГратиПрограєтьсяСписокВставте DVD, будь ласка!Вставте відео-CD, будь ласка!Виконайте 'jscalibrator -file %s -device %s', будь ласка, щоб відкалібрувати Ваш джойстик.Чекайте, будь ласка...ПольськаЗмінний дискВидалитиРумунськаОсновне менюРосійськаСардинськаНасиченістьВиберіть пристрій що потрібно витягти:ПараметриПоказати довідкуВипадковоВимкнутиСловацькаСловенськаПовільне програванняІспанськаСубтитриКанал субтитрівМеню субтитрівЗміщення субтитрівВтулок підтримки LIRC успішно запущений.Втулок для роботи з джойстиком успішно запущений.Втулок підтримки LIRC успішно зупинений.Втулок для роботи з джойстиком успішно зупинений.ШведськаПоточний відео-драйвер не підтримує немасштабований OSD!Поточний відео-драйвер підтримує немасштабований OSD!Висота неповноекранного вікнаШирина неповноекранного вікна%s - свободний медіа-програвач в.%s НазваМеню композиційДоріжка:ТурецькаУкраїнськаНе вдалося отримати статус файла '%s': %s.Не вдалося прочитати посилання '%s' на файл: %sНевідомоНевідома помилкаНевідомий параметр %d!Невідомий параметр %s для типу 'autoplay'!Використання: oxine [ПАРАМЕТРИ] [MRL] -Використовувати, по можливості, немасштабований OSD (повноекранна розподільність)Відео-CDВідео-DVDГучністьЧекаю альтернативного потоку...Дивитися фільмиУельськаРік:ІдишВи повинні створити файл з мітками медіа в %s!Ваш джойстик не був відкалібрований!Масштабування[Список програвання M3U: %s]активувати елемент або кнопкувстановити зміщення звукувстановити зміщення для субтитрівналаштувати гучністьаудіо-драйвер що використовуєтьсяавтозмінити мову для звукузмінити мову субтитріввикл.вкл.fftgraphfftscopegoomkernellibcmmxmmxextбез звукукерування менювисота неповноекранного вікнаширина неповноекранного вікнанемаoscopeпризупинити/гративибрати елемент зі спискуквадратsseзупинити потікпереключити співвідношення сторінпереключити деінтерлейсінгвмк./вимк. звуквикористовувати, по можливості, немасштабований OSDвідео-драйвер що використовується \ Kein Zeilenumbruch am Dateiende. +Відео-CDВідео-DVDГучністьЧекаю альтернативного потоку...Дивитися фільмиУельськаРік:ІдишВи повинні створити файл з мітками медіа в %s!Ваш джойстик не був відкалібрований!Масштабування[Список програвання M3U: %s]активувати елемент або кнопкувстановити зміщення звукувстановити зміщення для субтитрівналаштувати гучністьаудіо-драйвер що використовуєтьсяавтозмінити мову для звукузмінити мову субтитріввикл.вкл.fftgraphfftscopegoomkernellibcmmxmmxextбез звукукерування менювисота неповноекранного вікнаширина неповноекранного вікнанемаoscopeпризупинити/гративибрати елемент зі спискуквадратsseзупинити потікпереключити співвідношення сторінпереключити деінтерлейсінгвмк./вимк. звуквідео-драйвер що використовується \ Kein Zeilenumbruch am Dateiende. diff -Naur oxine-0.6.orig/po/uk.po oxine-0.6.3/po/uk.po --- oxine-0.6.orig/po/uk.po 2006-11-03 18:35:36.000000000 +0100 +++ oxine-0.6.3/po/uk.po 2006-11-22 10:56:28.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: oxine-uk\n" "Report-Msgid-Bugs-To: mschwerin@users.sf.net\n" -"POT-Creation-Date: 2006-11-03 18:35+0100\n" +"POT-Creation-Date: 2006-11-22 10:56+0100\n" "PO-Revision-Date: 2006-10-17 10:15+0100\n" "Last-Translator: Maximilian Schwerin \n" "Language-Team: ukrainian\n" @@ -19,20 +19,20 @@ msgid "Could not perform codeset conversion (%s)!" msgstr "Не вдалося виконати перекодування (%s)!" -#: src/disc.c:122 src/disc.c:323 src/disc.c:625 src/environment.c:819 -#: src/environment.c:837 src/filelist.c:805 src/mediamarks_favorites.c:98 -#: src/meta_info.c:85 src/odk.c:1020 src/odk.c:1103 src/odk_osd.c:806 -#: src/odk_osd.c:855 src/playlist_m3u.c:109 src/playlist_xml.c:55 -#: src/weather.c:122 +#: src/disc.c:122 src/disc.c:301 src/disc.c:326 src/disc.c:628 +#: src/environment.c:829 src/environment.c:847 src/filelist.c:805 +#: src/mediamarks_favorites.c:98 src/meta_info.c:85 src/odk.c:1020 +#: src/odk.c:1105 src/odk_osd.c:831 src/odk_osd.c:880 src/playlist_m3u.c:109 +#: src/playlist_xml.c:55 src/weather.c:122 #, c-format msgid "Could not open '%s': %s!" msgstr "Не вдалося відкрити '%s': %s!" -#: src/disc.c:213 src/disc.c:473 src/filelist.c:736 +#: src/disc.c:213 src/disc.c:474 src/filelist.c:736 msgid "Audio CD" msgstr "Аудіо CD" -#: src/disc.c:229 src/filelist.c:734 src/main_menu.c:238 +#: src/disc.c:229 src/filelist.c:734 src/main_menu.c:253 src/main_menu.c:269 msgid "Video CD" msgstr "Відео-CD" @@ -57,41 +57,40 @@ msgid "Unknown Disc" msgstr "Невідомо" -#: src/disc.c:371 -#, c-format -msgid "Could not mount %s!" -msgstr "Не вдалося змонтувати %s!" +#: src/disc.c:374 +#, fuzzy, c-format +msgid "Could not mount '%s': %s!" +msgstr "Не вдалося відкрити '%s': %s!" -#: src/disc.c:391 -#, c-format -msgid "Could not unmount %s!" -msgstr "Не вдалося відмонтувати %s!" +#: src/disc.c:374 src/disc.c:394 src/disc.c:414 src/lang.c:506 +msgid "Unknown" +msgstr "Невідомо" -#: src/disc.c:411 -#, c-format -msgid "Could not eject %s!" -msgstr "Не вдалося витягти %s!" +#: src/disc.c:394 +#, fuzzy, c-format +msgid "Could not unmount '%s': %s!" +msgstr "Не вдалося відмонтувати %s!" -#: src/disc.c:419 src/disc.c:425 +#: src/disc.c:414 src/disc.c:422 src/disc.c:427 #, fuzzy, c-format msgid "Could not eject '%s': %s!" msgstr "Не вдалося витягти %s!" -#: src/disc.c:474 +#: src/disc.c:475 msgid "Title" msgstr "Назва" -#: src/disc.c:671 +#: src/disc.c:688 #, fuzzy, c-format msgid "Could not create disc polling thread: %s!" msgstr "Не вдалося створити нитку для опитування диску!" -#: src/disc.c:673 +#: src/disc.c:691 #, fuzzy msgid "Successfully started disc polling thread." msgstr "Планувальник запустився успішно." -#: src/disc.c:685 +#: src/disc.c:703 #, fuzzy msgid "Successfully stopped disc polling thread." msgstr "Втулок підтримки LIRC успішно зупинений." @@ -105,7 +104,7 @@ msgid "Unknown prefix to URL '%s'!" msgstr "Невідомий параметр %d!" -#: src/download.c:227 src/environment.c:612 +#: src/download.c:227 src/environment.c:622 #, c-format msgid "Could not create '%s': %s!" msgstr "Не вдалося створити '%s': %s!" @@ -143,65 +142,65 @@ msgid "Part Menu" msgstr "Меню частин" -#: src/environment.c:135 src/environment.c:268 src/environment.c:586 -#: src/environment.c:593 src/environment.c:825 +#: src/environment.c:141 src/environment.c:289 src/environment.c:596 +#: src/environment.c:603 src/environment.c:835 #, c-format msgid "Unable to get status for file '%s': %s." msgstr "Не вдалося отримати статус файла '%s': %s." -#: src/environment.c:144 src/environment.c:278 +#: src/environment.c:153 #, c-format msgid "Unable to read link '%s' file: %s." msgstr "Не вдалося прочитати посилання '%s' на файл: %s" -#: src/environment.c:218 +#: src/environment.c:230 msgid "Found a device we are interested in:" msgstr "Знайдено пристрій для змінних носіїв:" -#: src/environment.c:219 +#: src/environment.c:231 #, c-format msgid " device: %s" msgstr "" -#: src/environment.c:220 +#: src/environment.c:232 #, c-format msgid " mountpoint: %s" msgstr "" -#: src/environment.c:221 +#: src/environment.c:233 #, c-format msgid " filesystem: %s" msgstr "" -#: src/environment.c:413 +#: src/environment.c:423 #, fuzzy msgid "Unable to find usable home directory, using '/tmp'." msgstr "" "Не вдалося знайти домашній каталог. Замість нього буде використовуватись '/" "tmp'." -#: src/environment.c:831 +#: src/environment.c:841 #, c-format msgid "File '%s' is empty!" msgstr "Файл '%s' - пустий!" -#: src/environment.c:848 +#: src/environment.c:858 #, c-format msgid "Could not read '%s': %s!" msgstr "Не вдалося прочитати '%s': %s!" -#: src/environment.c:930 src/environment.c:931 +#: src/environment.c:940 src/environment.c:941 #, fuzzy msgid "devices to poll (separate using ';')" msgstr "" "додаткові пристрої, про які повинен знати oxine (для відокремлення " "використовуйте ';')" -#: src/event.c:635 src/gui_utils.c:465 +#: src/event.c:681 src/gui_utils.c:492 msgid "Could not play title!" msgstr "Не вдалося програти!" -#: src/event.c:639 +#: src/event.c:685 msgid "Waiting for alternative stream..." msgstr "Чекаю альтернативного потоку..." @@ -224,7 +223,7 @@ msgid "[M3U-Playlist: %s]" msgstr "[Список програвання M3U: %s]" -#: src/filelist.c:732 src/main_menu.c:276 +#: src/filelist.c:732 src/main_menu.c:303 src/main_menu.c:319 msgid "DVD" msgstr "DVD" @@ -246,118 +245,147 @@ msgid "My VDR Recordings" msgstr "" -#: src/filelist_menu.c:135 +#: src/filelist_menu.c:127 msgid "Reset" msgstr "" -#: src/filelist_menu.c:137 src/filelist_menu.c:818 src/playlist_menu.c:1028 +#: src/filelist_menu.c:132 src/filelist_menu.c:139 src/filelist_menu.c:146 +#: src/filelist_menu.c:151 src/filelist_menu.c:834 src/playlist_menu.c:1041 msgid "Remove" msgstr "Видалити" -#: src/filelist_menu.c:145 src/main_menu.c:465 -msgid "Eject" -msgstr "Витягти" - -#: src/filelist_menu.c:237 +#: src/filelist_menu.c:250 msgid "Play all titles in this folder and all subfolders..." msgstr "" -#: src/filelist_menu.c:243 +#: src/filelist_menu.c:256 msgid "Play all titles in this folder..." msgstr "" -#: src/filelist_menu.c:367 src/filelist_menu.c:575 src/playlist_menu.c:245 -#: src/playlist_menu.c:410 +#: src/filelist_menu.c:385 src/filelist_menu.c:591 src/playlist_menu.c:255 +#: src/playlist_menu.c:420 msgid "Choose an entry..." msgstr "" -#: src/filelist_menu.c:398 src/filelist_menu.c:408 src/filelist_menu.c:710 +#: src/filelist_menu.c:416 src/filelist_menu.c:426 src/filelist_menu.c:726 #, fuzzy, c-format msgid "Could not remove '%s': %s!" msgstr "Не вдалося створити '%s': %s!" -#: src/filelist_menu.c:409 +#: src/filelist_menu.c:427 msgid "SVDRP error" msgstr "" -#: src/filelist_menu.c:446 src/playlist_menu.c:295 +#: src/filelist_menu.c:462 src/playlist_menu.c:305 msgid "Could not open disc!" msgstr "Не вдалося відкрити диск!" -#: src/filelist_menu.c:810 src/playlist_menu.c:1010 +#: src/filelist_menu.c:826 src/playlist_menu.c:1023 msgid "Play" msgstr "Грати" -#: src/filelist_menu.c:814 src/playlist_menu.c:540 src/playlist_menu.c:1023 +#: src/filelist_menu.c:830 src/playlist_menu.c:550 src/playlist_menu.c:1036 msgid "Add" msgstr "Додати" -#: src/filelist_menu.c:822 src/playback_menu.c:1053 src/settings_menu.c:511 +#: src/filelist_menu.c:838 src/main_menu.c:524 +msgid "Eject" +msgstr "Витягти" + +#: src/filelist_menu.c:842 src/playback_menu.c:1076 src/settings_menu.c:509 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:77 msgid "Playlist" msgstr "Список" -#: src/filelist_menu.c:826 src/playback_menu.c:1047 src/playlist_menu.c:1053 -#: src/settings_menu.c:539 src/weather_menu.c:164 +#: src/filelist_menu.c:846 src/playback_menu.c:1070 src/playlist_menu.c:1066 +#: src/settings_menu.c:537 src/weather_menu.c:164 msgid "Mainmenu" msgstr "Головне меню" -#: src/filelist_menu.c:830 src/main_menu.c:481 src/playlist_menu.c:1057 +#: src/filelist_menu.c:850 src/main_menu.c:540 src/playlist_menu.c:1070 msgid "Current title" msgstr "" -#: src/filelist_menu.c:945 +#: src/filelist_menu.c:965 msgid "Could not load mediamarks." msgstr "Не вдалося завантажити мітки медіа." -#: src/filelist_menu.c:946 +#: src/filelist_menu.c:966 #, c-format msgid "You should create a file containing mediamarks at %s!" msgstr "Ви повинні створити файл з мітками медіа в %s!" -#: src/filelist_menu.c:980 src/filelist_menu.c:1013 src/filelist_menu.c:1044 +#: src/filelist_menu.c:1000 src/filelist_menu.c:1033 src/filelist_menu.c:1064 #: src/gui_utils.h:65 msgid "Please wait..." msgstr "Чекайте, будь ласка..." -#: src/gui_utils.c:193 +#: src/gui_utils.c:195 msgid "Could not open or play background, leaving oxine!" msgstr "" -#: src/gui_utils.c:194 +#: src/gui_utils.c:196 msgid "Please make sure, that your version of xine-lib can play PNG files." msgstr "" -#: src/gui_utils.c:391 src/gui_utils.c:398 src/main_menu.c:381 -#: src/playlist_menu.c:950 +#: src/gui_utils.c:393 src/gui_utils.c:400 src/main_menu.c:419 +#: src/playlist_menu.c:963 msgid "OK" msgstr "Гаразд" -#: src/gui_utils.c:403 src/gui_utils.c:425 src/main_menu.c:385 -#: src/main_menu.c:469 src/playlist_menu.c:953 +#: src/gui_utils.c:405 src/gui_utils.c:427 src/main_menu.c:423 +#: src/main_menu.c:528 src/playlist_menu.c:966 msgid "Cancel" msgstr "Скасувати" -#: src/gui_utils.c:409 +#: src/gui_utils.c:411 #, fuzzy msgid "Yes" msgstr "Esc" -#: src/gui_utils.c:414 +#: src/gui_utils.c:416 msgid "No" msgstr "" -#: src/gui_utils.c:420 +#: src/gui_utils.c:422 msgid "Retry" msgstr "" -#: src/help_menu.c:43 src/playback_menu.c:473 src/playback_menu.c:527 -#: src/settings_menu.c:462 +#: src/gui_utils.c:478 +#, fuzzy +msgid "Could not play Audio CD!" +msgstr "Не вдалося програти!" + +#: src/gui_utils.c:479 src/main_menu.c:213 +#, fuzzy +msgid "Please insert an Audio CD!" +msgstr "Вставте аудіо-CD, будь ласка!" + +#: src/gui_utils.c:483 +#, fuzzy +msgid "Could not play Video CD!" +msgstr "Не вдалося програти!" + +#: src/gui_utils.c:484 src/main_menu.c:263 +msgid "Please insert a Video CD!" +msgstr "Вставте відео-CD, будь ласка!" + +#: src/gui_utils.c:488 +#, fuzzy +msgid "Could not play DVD!" +msgstr "Не вдалося програти!" + +#: src/gui_utils.c:489 src/main_menu.c:313 +msgid "Please insert a DVD!" +msgstr "Вставте DVD, будь ласка!" + +#: src/help_menu.c:43 src/playback_menu.c:490 src/playback_menu.c:549 +#: src/settings_menu.c:460 msgid "Next Page" msgstr "Наступна стор." -#: src/help_menu.c:49 src/playback_menu.c:477 src/playback_menu.c:531 -#: src/playback_menu.c:535 src/playlist_menu.c:543 src/settings_menu.c:467 +#: src/help_menu.c:49 src/playback_menu.c:494 src/playback_menu.c:553 +#: src/playback_menu.c:557 src/playlist_menu.c:553 src/settings_menu.c:465 msgid "Back" msgstr "Назад" @@ -1278,107 +1306,95 @@ msgid "Zulu" msgstr "" -#: src/lang.c:506 -msgid "Unknown" -msgstr "Невідомо" - #: src/main_menu.c:71 #, fuzzy msgid "Could not find DVB channels file!" msgstr "Не вдалося знайти файл налаштування для LIRC." -#: src/main_menu.c:207 -#, fuzzy -msgid "Please insert an Audio CD!" -msgstr "Вставте аудіо-CD, будь ласка!" - -#: src/main_menu.c:245 -msgid "Please insert a Video CD!" -msgstr "Вставте відео-CD, будь ласка!" - -#: src/main_menu.c:283 -msgid "Please insert a DVD!" -msgstr "Вставте DVD, будь ласка!" - -#: src/main_menu.c:328 +#: src/main_menu.c:366 msgid "How do you want to proceed?" msgstr "" -#: src/main_menu.c:342 +#: src/main_menu.c:380 msgid "Quit oxine" msgstr "" -#: src/main_menu.c:351 +#: src/main_menu.c:389 msgid "Shutdown the computer" msgstr "" -#: src/main_menu.c:360 +#: src/main_menu.c:398 msgid "Switch computer to standby" msgstr "" -#: src/main_menu.c:369 +#: src/main_menu.c:407 msgid "Reboot the computer" msgstr "" -#: src/main_menu.c:427 +#: src/main_menu.c:472 +#, fuzzy +msgid "Could not unmount device!" +msgstr "Не вдалося відмонтувати %s!" + +#: src/main_menu.c:476 msgid "Could not eject device!" msgstr "Не можу витягти пристрій!" -#: src/main_menu.c:449 +#: src/main_menu.c:508 msgid "Select device to eject:" msgstr "Виберіть пристрій що потрібно витягти:" -#: src/main_menu.c:593 +#: src/main_menu.c:652 msgid "Listen to Music" msgstr "Слухати музику" -#: src/main_menu.c:594 +#: src/main_menu.c:653 msgid "Watch Films" msgstr "Дивитися фільми" -#: src/main_menu.c:595 +#: src/main_menu.c:654 #, fuzzy msgid "Watch Television" msgstr "Цифрове телебачення" -#: src/main_menu.c:596 +#: src/main_menu.c:655 #, fuzzy msgid "Play a DVD" msgstr "Вставте DVD, будь ласка!" -#: src/main_menu.c:597 +#: src/main_menu.c:656 #, fuzzy msgid "Play a Video CD" msgstr "Вставте відео-CD, будь ласка!" -#: src/main_menu.c:598 +#: src/main_menu.c:657 #, fuzzy msgid "Play an Audio CD" msgstr "Вставте аудіо-CD, будь ласка!" -#: src/main_menu.c:599 +#: src/main_menu.c:658 msgid "Show Help" msgstr "Показати довідку" -#: src/main_menu.c:600 +#: src/main_menu.c:659 msgid "Show Weather Report" msgstr "" -#: src/main_menu.c:601 +#: src/main_menu.c:660 msgid "Edit Settings" msgstr "Налаштувати" -#: src/main_menu.c:602 src/settings_menu.c:512 +#: src/main_menu.c:661 src/settings_menu.c:510 msgid "Shutdown" msgstr "Вимкнути" -#: src/main_menu.c:624 +#: src/main_menu.c:683 msgid "Could not load main menu!" msgstr "Не вдалося завантажити головне меню!" #: src/mediamarks.c:103 src/mediamarks.c:139 src/menulist.c:140 -#: src/menulist.c:186 src/otk.c:3560 src/otk.c:3565 src/otk.c:3622 -#: src/otk.c:3627 src/playlist_xml.c:141 src/playlist_xml.c:176 +#: src/menulist.c:186 src/otk.c:3597 src/otk.c:3602 src/otk.c:3659 +#: src/otk.c:3664 src/playlist_xml.c:141 src/playlist_xml.c:176 #, fuzzy, c-format msgid "Unknown name '%s' for node!" msgstr "Невідомий параметр %s для типу 'autoplay'!" @@ -1387,13 +1403,13 @@ msgid "Found an entry that did not contain a MRL!" msgstr "Знайдено запис якій не містить MRL!" -#: src/mediamarks.c:159 src/menulist.c:207 src/otk.c:3591 +#: src/mediamarks.c:159 src/menulist.c:207 src/otk.c:3628 #: src/playlist_xml.c:196 #, c-format msgid "Parsing '%s' failed!" msgstr "Помилка аналізу '%s'!" -#: src/mediamarks.c:165 src/menulist.c:212 src/otk.c:3596 +#: src/mediamarks.c:165 src/menulist.c:212 src/otk.c:3633 #: src/playlist_xml.c:201 #, fuzzy, c-format msgid "Root node of '%s' must be '%s'!" @@ -1441,23 +1457,23 @@ msgid "Aspect Ratio" msgstr "Співвідношення сторін" -#: src/odk.c:519 src/odk.c:1414 +#: src/odk.c:519 src/odk.c:1458 msgid "Hue" msgstr "Відтінок" -#: src/odk.c:522 src/odk.c:1416 +#: src/odk.c:522 src/odk.c:1460 msgid "Saturation" msgstr "Насиченість" -#: src/odk.c:525 src/odk.c:1412 +#: src/odk.c:525 src/odk.c:1455 msgid "Contrast" msgstr "Контраст" -#: src/odk.c:528 src/odk.c:1410 +#: src/odk.c:528 src/odk.c:1452 msgid "Brightness" msgstr "Яскравість" -#: src/odk.c:532 +#: src/odk.c:532 src/odk.c:1463 msgid "Zoom" msgstr "Масштабування" @@ -1498,8 +1514,8 @@ msgid "none" msgstr "нема" -#: src/odk.c:592 src/odk.c:608 src/odk.c:629 src/settings_menu.c:600 -#: src/settings_menu.c:634 src/settings_menu.c:643 +#: src/odk.c:592 src/odk.c:608 src/odk.c:629 src/settings_menu.c:598 +#: src/settings_menu.c:632 src/settings_menu.c:641 msgid "auto" msgstr "авто" @@ -1553,41 +1569,31 @@ msgid "Malformed MRL" msgstr "Некоректний MRL" -#: src/odk.c:1110 +#: src/odk.c:1112 #, c-format msgid "Could not play '%s': %s!" msgstr "Не вдалося програти '%s' (%s)!" -#: src/odk.c:1375 src/odk.c:1376 +#: src/odk.c:1422 src/odk.c:1423 msgid "encode special characters in MRLs" msgstr "" -#: src/odk.c:1380 -msgid "use unscaled OSD if possible" -msgstr "використовувати, по можливості, немасштабований OSD" - -#: src/odk.c:1381 -msgid "Use unscaled (full screen resolution) OSD if possible" -msgstr "" -"Використовувати, по можливості, немасштабований OSD (повноекранна " -"розподільність)" - -#: src/odk.c:1386 +#: src/odk.c:1428 #, fuzzy msgid "audio visualization type" msgstr "Візуалізація для звуку - Стиль" -#: src/odk.c:1387 +#: src/odk.c:1429 msgid "" "What kind of visual output is to be displayed when playing an audio only " "stream." msgstr "" -#: src/odk.c:1394 +#: src/odk.c:1436 msgid "background image MRL" msgstr "" -#: src/odk.c:1395 +#: src/odk.c:1437 #, fuzzy msgid "" "The MRL of the background image that will be displayed if 'visual_anim." @@ -1596,11 +1602,11 @@ "MRL що буде відображений якщо значення 'gui.visual_anim.style' встановлено в " "'Background Image'" -#: src/odk.c:1403 +#: src/odk.c:1445 msgid "stream animation MRL" msgstr "" -#: src/odk.c:1404 +#: src/odk.c:1446 #, fuzzy msgid "" "The MRL of the stream animation that will be displayed if 'visual_anim." @@ -1609,21 +1615,21 @@ "MRL що буде відображений якщо значення 'gui.visual_anim.style' встановлено в " "'Stream Animation'" -#: src/odk.c:1459 +#: src/odk.c:1506 #, c-format msgid "Failed to create window using video driver '%s'!" msgstr "Не вдалося створити вікно використовуючи відео-драйвер %s !" -#: src/odk.c:1464 +#: src/odk.c:1511 msgid "Failed to create window using default driver." msgstr "Не вдалося створити вікно використовуючи драйвер за замовченням!" -#: src/odk.c:1474 +#: src/odk.c:1521 #, c-format msgid "Failed to open audio port using audio driver '%s'!" msgstr "Не вдалося відкрити аудіо-порт використовуючи аудіо-драйвер '%s'!" -#: src/odk.c:1479 +#: src/odk.c:1526 msgid "Failed to open audio port using default audio driver." msgstr "Не вдалося відкрити аудіо-порт використовуючи драйвер за замовченням!" @@ -1716,30 +1722,30 @@ msgid "Successfully stopped the LIRC input plugin." msgstr "Втулок підтримки LIRC успішно зупинений." -#: src/odk_osd.c:427 +#: src/odk_osd.c:452 #, c-format msgid "Could not read image '%s'!" msgstr "Не вдалося прочитати зображення '%s'!" -#: src/odk_osd.c:482 +#: src/odk_osd.c:507 #, c-format msgid "Could not scale image '%s'!" msgstr "Не вдалося масштабувати зображення '%s'!" -#: src/odk_osd.c:525 +#: src/odk_osd.c:550 msgid "Could not get pixel data!" msgstr "Не вдалося отримати піксельні дані!" -#: src/odk_osd.c:745 +#: src/odk_osd.c:770 #, fuzzy, c-format msgid "Could not free a cache entry for '%s'." msgstr "Не вдалося прочитати зображення '%s'!" -#: src/odk_osd.c:1671 +#: src/odk_osd.c:1721 msgid "The current video driver supports unscaled OSD!" msgstr "Поточний відео-драйвер підтримує немасштабований OSD!" -#: src/odk_osd.c:1673 +#: src/odk_osd.c:1723 msgid "The current video driver does not support unscaled OSD!" msgstr "Поточний відео-драйвер не підтримує немасштабований OSD!" @@ -1774,81 +1780,81 @@ msgid "Found %d Xinerama screens:" msgstr "" -#: src/odk_x11.c:1014 +#: src/odk_x11.c:1002 #, c-format msgid "" "Overriding calculated monitor pixel aspect ratio with user provided value: " "%.02f" msgstr "" -#: src/odk_x11.c:1030 +#: src/odk_x11.c:1018 #, c-format msgid "Failed to open video port '%s', falling back to 'auto'." msgstr "" "Не вдалося відкрити відео-порт '%s', повертаюсь к тому що визначається " "автоматично" -#: src/odk_x11.c:1037 +#: src/odk_x11.c:1025 msgid "Failed to open video port!" msgstr "Не вдалося відкрити відео-порт!" -#: src/otk.c:3527 src/otk.c:3534 +#: src/otk.c:3564 src/otk.c:3571 #, c-format msgid "Missing property (required) '%s'!" msgstr "Відсутній необхідний параметр '%s'!" -#: src/otk.c:3578 +#: src/otk.c:3615 #, fuzzy, c-format msgid "Loading palette file '%s'..." msgstr "Завантажується файл меню '%s'..." -#: src/otk.c:3654 +#: src/otk.c:3691 msgid "Could not load palette, reverting to standard colors." msgstr "" -#: src/oxine.c:107 +#: src/oxine.c:113 #, c-format msgid "Usage: oxine [OPTIONS] [MRL]\n" msgstr "Використання: oxine [ПАРАМЕТРИ] [MRL]\n" -#: src/oxine.c:109 +#: src/oxine.c:115 #, c-format msgid "OPTIONS are:\n" msgstr "ПАРАМЕТРИ:\n" -#: src/oxine.c:110 +#: src/oxine.c:116 #, c-format msgid " -v, --version Display version.\n" msgstr " -v, --version Показати версію.\n" -#: src/oxine.c:111 +#: src/oxine.c:117 #, c-format msgid " --verbose [=level] Set verbosity level. Default is 1.\n" msgstr "" " --verbose [=level] Встановити рівень \"багатослівності\". За " "замовченням - 1.\n" -#: src/oxine.c:113 +#: src/oxine.c:119 #, c-format msgid " -l, --logfile Set the log filename.\n" msgstr "" -#: src/oxine.c:114 +#: src/oxine.c:120 #, c-format msgid " -V, --video-driver Select video driver by ID.\n" msgstr " -V, --video-driver Вибір відео-драйвера за ID.\n" -#: src/oxine.c:115 src/oxine.c:129 +#: src/oxine.c:121 src/oxine.c:135 #, c-format msgid " Available drivers:\n" msgstr " Наявні драйвери:\n" -#: src/oxine.c:128 +#: src/oxine.c:134 #, c-format msgid " -A, --audio-driver Select audio driver by ID.\n" msgstr " -A, --audio-driver Вибір аудіо-драйвера за ID.\n" -#: src/oxine.c:140 +#: src/oxine.c:146 #, fuzzy, c-format msgid "" " -X, --xineramascreen [=num] Sets the screen on which the fullscreen " @@ -1858,12 +1864,12 @@ " -X, --xineramascreen [=NUM] Вказати екран на який буде видображено\n" " повноекранне вікно.\n" -#: src/oxine.c:144 +#: src/oxine.c:150 #, fuzzy, c-format msgid " -F, --no-fullscreen Do no start in fullscreen mode.\n" msgstr " -f, --fullscreen Запускати в повноекранному режимі.\n" -#: src/oxine.c:147 +#: src/oxine.c:153 #, fuzzy, c-format msgid "" " -P, --no-polling Do not use automatic polling for removable " @@ -1872,17 +1878,26 @@ " -P, --no-polling Вимкнути автоматичне опитування змінних " "носіїв.\n" -#: src/oxine.c:151 +#: src/oxine.c:157 #, fuzzy, c-format msgid " -L, --no-lirc Do not use remote control (LIRC).\n" msgstr " -L, --no-lirc Відключити підтримку LIRC.\n" -#: src/oxine.c:155 +#: src/oxine.c:161 #, fuzzy, c-format msgid " -J, --no-joystick Do not use joystick support.\n" msgstr " -J, --no-joystick Відключити підтримку джойстика.\n" -#: src/oxine.c:159 +#: src/oxine.c:165 +#, fuzzy, c-format +msgid "" +" -W, --no-weather Do not automaticaly retrieve weather " +"information.\n" +msgstr "" +" -P, --no-polling Вимкнути автоматичне опитування змінних " +"носіїв.\n" + +#: src/oxine.c:169 #, c-format msgid "" "Examples for valid MRLs (media resource locator):\n" @@ -1907,88 +1922,83 @@ " 'dvd://<номер доріжки>'\n" " VCD: 'vcd://<номер доріжки>'\n" -#: src/oxine.c:180 src/oxine.c:181 +#: src/oxine.c:190 src/oxine.c:191 msgid "video driver to use" msgstr "відео-драйвер що використовується" -#: src/oxine.c:184 src/oxine.c:185 +#: src/oxine.c:194 src/oxine.c:195 msgid "audio driver to use" msgstr "аудіо-драйвер що використовується" -#: src/oxine.c:190 src/oxine.c:191 +#: src/oxine.c:199 src/oxine.c:200 #, fuzzy msgid "Xinerama screen for fullscreen window" msgstr "екран xinerama для повноекранного вікна" -#: src/oxine.c:196 src/oxine.c:197 -#, fuzzy -msgid "percentage of fullscreen screen to use" -msgstr "відсоток чорної кайми в повноекранному режимі" - -#: src/oxine.c:201 +#: src/oxine.c:204 msgid "non-fullscreen window width" msgstr "ширина неповноекранного вікна" -#: src/oxine.c:202 +#: src/oxine.c:205 msgid "The width of the non-fullscreen window" msgstr "Ширина неповноекранного вікна" -#: src/oxine.c:206 +#: src/oxine.c:209 msgid "non-fullscreen window height" msgstr "висота неповноекранного вікна" -#: src/oxine.c:207 +#: src/oxine.c:210 msgid "The height of the non-fullscreen window" msgstr "Висота неповноекранного вікна" -#: src/oxine.c:211 src/oxine.c:212 +#: src/oxine.c:214 src/oxine.c:215 msgid "aspect ratio of one monitor pixel" msgstr "" -#: src/oxine.c:217 +#: src/oxine.c:220 msgid "ask before leaving oxine" msgstr "" -#: src/oxine.c:218 +#: src/oxine.c:221 msgid "Are we to show the quit confirm dialog?" msgstr "" -#: src/oxine.c:222 src/oxine.c:223 +#: src/oxine.c:225 src/oxine.c:226 #, fuzzy msgid "command that was selected the last time" msgstr "Яка команда виконується по завершенні" -#: src/oxine.c:228 src/oxine.c:229 +#: src/oxine.c:231 src/oxine.c:232 #, fuzzy msgid "shell command (power off)" msgstr "Виконати команду оболонки по завершенні" -#: src/oxine.c:234 src/oxine.c:235 +#: src/oxine.c:237 src/oxine.c:238 #, fuzzy msgid "shell command (reboot)" msgstr "Виконати команду оболонки по завершенні" -#: src/oxine.c:239 src/oxine.c:240 +#: src/oxine.c:242 src/oxine.c:243 #, fuzzy msgid "shell command (standby)" msgstr "Виконати команду оболонки по завершенні" -#: src/oxine.c:245 +#: src/oxine.c:248 msgid "METAR ICAO location indicator" msgstr "" -#: src/oxine.c:246 +#: src/oxine.c:249 msgid "" "The METAR ICAO Location Indicator defines for which location the weather is " "to be displayed." msgstr "" -#: src/oxine.c:252 +#: src/oxine.c:255 #, fuzzy msgid "reload playlist on start" msgstr "Перезавантажити список програвання при старті" -#: src/oxine.c:253 +#: src/oxine.c:256 msgid "" "If this is enabled and if you don't specify any MRL on the command line, " "oxine will automatically load the previous playlist." @@ -1996,12 +2006,12 @@ "Якщо це включено і ви не вказали будь-якого MRL в командному рядку, oxine " "автоматичнозавантажить попередній список програвання." -#: src/oxine.c:259 +#: src/oxine.c:262 #, fuzzy msgid "play reloaded playlist on start" msgstr "Грати перезавантажений список програвання при старті" -#: src/oxine.c:260 +#: src/oxine.c:263 msgid "" "If this is enabled and gui.playlist_auto_reload is also enabled the reloaded " "playlist will automatically be played." @@ -2009,129 +2019,129 @@ "Якщо це і gui.playlist_auto_reload включені, то перезавантажений список " "програвання буде програватися автаматично." -#: src/oxine.c:267 +#: src/oxine.c:270 #, fuzzy msgid "subtitle autoloading" msgstr "Автозавантаження субтитрів" -#: src/oxine.c:268 +#: src/oxine.c:271 msgid "Automatically load subtitles if they exist." msgstr "Автоматично завантажувати субтитри, якщо вони наявні" -#: src/oxine.c:395 +#: src/oxine.c:406 #, c-format msgid "This is %s - A free Video-Player v%s\n" msgstr "%s - свободний медіа-програвач в.%s\n" -#: src/oxine.c:397 +#: src/oxine.c:408 #, c-format msgid "(c) 2005 by the oxine project\n" msgstr "(c) 2005 by the oxine project\n" -#: src/oxine.c:406 +#: src/oxine.c:417 #, c-format msgid "Invalid argument %d!" msgstr "Недозволений аргумент %d!" -#: src/oxine.c:491 +#: src/oxine.c:502 #, fuzzy msgid "Could not initialize ODK!" msgstr "Не вдалося ініціювати X-потоки!" -#: src/oxine.c:502 +#: src/oxine.c:513 #, fuzzy msgid "Could not inizialize OTK!" msgstr "Не вдалося ініціювати X-потоки!" -#: src/playback_menu.c:747 src/playback_menu.c:1172 +#: src/playback_menu.c:769 src/playback_menu.c:1195 msgid "Album:" msgstr "Альбом:" -#: src/playback_menu.c:753 src/playback_menu.c:1178 +#: src/playback_menu.c:775 src/playback_menu.c:1201 msgid "Artist:" msgstr "Виконавець:" -#: src/playback_menu.c:759 src/playback_menu.c:1184 +#: src/playback_menu.c:781 src/playback_menu.c:1207 msgid "Year:" msgstr "Рік:" -#: src/playback_menu.c:765 src/playback_menu.c:1190 +#: src/playback_menu.c:787 src/playback_menu.c:1213 msgid "Track:" msgstr "Доріжка:" -#: src/playback_menu.c:772 src/playback_menu.c:1197 +#: src/playback_menu.c:794 src/playback_menu.c:1220 msgid "Genre:" msgstr "Стиль:" -#: src/playback_menu.c:779 +#: src/playback_menu.c:801 msgid "Length:" msgstr "Тривалість:" -#: src/playback_menu.c:788 +#: src/playback_menu.c:810 msgid "Elapsed:" msgstr "Минуло:" -#: src/playback_menu.c:1014 +#: src/playback_menu.c:1037 msgid "Loop Mode" msgstr "По-колу" -#: src/playback_menu.c:1019 +#: src/playback_menu.c:1042 msgid "Shuffle Mode" msgstr "Випадково" -#: src/playback_menu.c:1024 +#: src/playback_menu.c:1047 msgid "Normal Mode" msgstr "Послідовно" -#: src/playback_menu.c:1035 +#: src/playback_menu.c:1058 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:79 msgid "Settings" msgstr "Параметри" -#: src/playback_menu.c:1058 +#: src/playback_menu.c:1081 msgid "Media Browser" msgstr "" -#: src/playlist_menu.c:637 +#: src/playlist_menu.c:650 #, fuzzy msgid "Delete subtitle" msgstr "Видалити субтитри" -#: src/playlist_menu.c:639 src/playlist_menu.c:1043 +#: src/playlist_menu.c:652 src/playlist_menu.c:1056 #, fuzzy msgid "Add subtitle" msgstr "Додати субтитри" -#: src/playlist_menu.c:661 +#: src/playlist_menu.c:674 msgid "Subtitle" msgstr "Субтитри" -#: src/playlist_menu.c:943 +#: src/playlist_menu.c:956 #, fuzzy msgid "Please enter a name for the playlist:" msgstr "Остання доріжка у списку програвання що була програна" -#: src/playlist_menu.c:1014 +#: src/playlist_menu.c:1027 #, fuzzy msgid "Clear list" msgstr "Очистити список" -#: src/playlist_menu.c:1018 +#: src/playlist_menu.c:1031 #, fuzzy msgid "Save list" msgstr "Зберегти список" -#: src/playlist_menu.c:1033 +#: src/playlist_menu.c:1046 #, fuzzy msgid "Move up" msgstr "Вгору" -#: src/playlist_menu.c:1038 +#: src/playlist_menu.c:1051 #, fuzzy msgid "Move down" msgstr "Вниз" -#: src/playlist_menu.c:1048 +#: src/playlist_menu.c:1061 msgid "Media-Browser" msgstr "" @@ -2158,384 +2168,384 @@ "Можливо буде необхідно перезапустити oxine\n" " для того щоб зміни вступили в силу!" -#: src/settings_menu.c:504 +#: src/settings_menu.c:502 #, fuzzy msgid "User Interface" msgstr "Деінтерлейсінг" -#: src/settings_menu.c:506 +#: src/settings_menu.c:504 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:80 #, fuzzy msgid "Weather" msgstr "Насиченість" -#: src/settings_menu.c:509 +#: src/settings_menu.c:507 msgid "Video Disc Recorder" msgstr "" -#: src/settings_menu.c:513 +#: src/settings_menu.c:511 #, fuzzy msgid "Audio Visualization" msgstr "Візуалізація для звуку - Стиль" -#: src/settings_menu.c:514 +#: src/settings_menu.c:512 #, fuzzy msgid "Audio" msgstr "аудіо" -#: src/settings_menu.c:515 +#: src/settings_menu.c:513 #, fuzzy msgid "Video" msgstr "відео" -#: src/settings_menu.c:516 +#: src/settings_menu.c:514 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:76 #, fuzzy msgid "Media" msgstr "носій" -#: src/settings_menu.c:517 +#: src/settings_menu.c:515 #, fuzzy msgid "Decoder" msgstr "декодер" -#: src/settings_menu.c:518 +#: src/settings_menu.c:516 #: data/skins/oxinetic/backgrounds/oxine-createGUI.c:78 #, fuzzy msgid "Subtitles" msgstr "Субтитри" -#: src/settings_menu.c:519 +#: src/settings_menu.c:517 #, fuzzy msgid "Effects" msgstr "ефекти" -#: src/settings_menu.c:520 +#: src/settings_menu.c:518 #, fuzzy msgid "Engine" msgstr "рушій" -#: src/settings_menu.c:521 +#: src/settings_menu.c:519 msgid "Miscellaneous" msgstr "" -#: src/settings_menu.c:578 +#: src/settings_menu.c:576 msgid "white-black-transparent" msgstr "" -#: src/settings_menu.c:579 +#: src/settings_menu.c:577 msgid "white-none-transparent" msgstr "" -#: src/settings_menu.c:580 +#: src/settings_menu.c:578 msgid "white-none-translucid" msgstr "" -#: src/settings_menu.c:581 +#: src/settings_menu.c:579 msgid "yellow-black-transparent" msgstr "" -#: src/settings_menu.c:583 +#: src/settings_menu.c:581 msgid "Mono 1.0" msgstr "" -#: src/settings_menu.c:584 +#: src/settings_menu.c:582 msgid "Stereo 2.0" msgstr "" -#: src/settings_menu.c:585 +#: src/settings_menu.c:583 msgid "Headphones 2.0" msgstr "" -#: src/settings_menu.c:586 +#: src/settings_menu.c:584 msgid "Stereo 2.1" msgstr "" -#: src/settings_menu.c:587 +#: src/settings_menu.c:585 msgid "Surround 3.0" msgstr "" -#: src/settings_menu.c:588 +#: src/settings_menu.c:586 msgid "Surround 4.0" msgstr "" -#: src/settings_menu.c:589 +#: src/settings_menu.c:587 msgid "Surround 4.1" msgstr "" -#: src/settings_menu.c:590 +#: src/settings_menu.c:588 msgid "Surround 5.0" msgstr "" -#: src/settings_menu.c:591 +#: src/settings_menu.c:589 msgid "Surround 5.1" msgstr "" -#: src/settings_menu.c:592 +#: src/settings_menu.c:590 msgid "Surround 6.0" msgstr "" -#: src/settings_menu.c:593 +#: src/settings_menu.c:591 msgid "Surround 6.1" msgstr "" -#: src/settings_menu.c:594 +#: src/settings_menu.c:592 msgid "Surround 7.1" msgstr "" -#: src/settings_menu.c:595 +#: src/settings_menu.c:593 msgid "Pass Through" msgstr "" -#: src/settings_menu.c:597 +#: src/settings_menu.c:595 msgid "metronom feedback" msgstr "" -#: src/settings_menu.c:598 +#: src/settings_menu.c:596 msgid "resample" msgstr "" -#: src/settings_menu.c:601 +#: src/settings_menu.c:599 msgid "off" msgstr "" -#: src/settings_menu.c:602 +#: src/settings_menu.c:600 #, fuzzy msgid "on" msgstr "нема" -#: src/settings_menu.c:604 +#: src/settings_menu.c:602 msgid "2D_Tex_Fragprog" msgstr "2D_Tex_Fragprog" -#: src/settings_menu.c:605 +#: src/settings_menu.c:603 msgid "2D_Tex" msgstr "2D_Tex" -#: src/settings_menu.c:606 +#: src/settings_menu.c:604 msgid "2D_Tex_Tiled" msgstr "2D_Tex_Tiled" -#: src/settings_menu.c:607 +#: src/settings_menu.c:605 msgid "Image_Pipeline" msgstr "Image_Pipeline" -#: src/settings_menu.c:608 +#: src/settings_menu.c:606 msgid "Cylinder" msgstr "" -#: src/settings_menu.c:609 +#: src/settings_menu.c:607 msgid "Env_Mapped_Torus" msgstr "Env_Mapped_Torus" -#: src/settings_menu.c:611 +#: src/settings_menu.c:609 msgid "entire dvd" msgstr "" -#: src/settings_menu.c:612 +#: src/settings_menu.c:610 #, fuzzy msgid "one chapter" msgstr "наступна/попередня композиція" -#: src/settings_menu.c:614 +#: src/settings_menu.c:612 msgid "seek in program chain" msgstr "" -#: src/settings_menu.c:615 +#: src/settings_menu.c:613 msgid "seek in program" msgstr "" -#: src/settings_menu.c:617 +#: src/settings_menu.c:615 msgid "skip program" msgstr "" -#: src/settings_menu.c:618 +#: src/settings_menu.c:616 msgid "skip part" msgstr "" -#: src/settings_menu.c:619 +#: src/settings_menu.c:617 #, fuzzy msgid "skip title" msgstr "субтитри" -#: src/settings_menu.c:621 +#: src/settings_menu.c:619 msgid "14.4 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:622 +#: src/settings_menu.c:620 msgid "19.2 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:623 +#: src/settings_menu.c:621 msgid "28.8 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:624 +#: src/settings_menu.c:622 msgid "33.6 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:625 +#: src/settings_menu.c:623 msgid "34.4 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:626 +#: src/settings_menu.c:624 msgid "57.6 Kbps (Modem)" msgstr "" -#: src/settings_menu.c:627 +#: src/settings_menu.c:625 msgid "115.2 Kbps (ISDN)" msgstr "" -#: src/settings_menu.c:628 +#: src/settings_menu.c:626 msgid "262.2 Kbps (Cable/DSL)" msgstr "" -#: src/settings_menu.c:629 +#: src/settings_menu.c:627 msgid "393.2 Kbps (Cable/DSL)" msgstr "" -#: src/settings_menu.c:630 +#: src/settings_menu.c:628 msgid "524.3 Kbps (Cable/DSL)" msgstr "" -#: src/settings_menu.c:631 +#: src/settings_menu.c:629 msgid "1.5 Mbps (T1)" msgstr "" -#: src/settings_menu.c:632 +#: src/settings_menu.c:630 msgid "10.5 Mbps (LAN)" msgstr "" -#: src/settings_menu.c:635 +#: src/settings_menu.c:633 msgid "TCP" msgstr "" -#: src/settings_menu.c:636 +#: src/settings_menu.c:634 msgid "HTTP" msgstr "" -#: src/settings_menu.c:638 +#: src/settings_menu.c:636 msgid "MPEG track" msgstr "" -#: src/settings_menu.c:639 src/settings_menu.c:645 +#: src/settings_menu.c:637 src/settings_menu.c:643 #, fuzzy msgid "entry" msgstr "Enter" -#: src/settings_menu.c:640 +#: src/settings_menu.c:638 msgid "segment" msgstr "" -#: src/settings_menu.c:641 +#: src/settings_menu.c:639 msgid "playback-control item" msgstr "" -#: src/settings_menu.c:644 +#: src/settings_menu.c:642 #, fuzzy msgid "track" msgstr "Доріжка:" -#: src/settings_menu.c:647 +#: src/settings_menu.c:645 #, fuzzy msgid "tiny" msgstr "Латина" -#: src/settings_menu.c:648 +#: src/settings_menu.c:646 msgid "small" msgstr "" -#: src/settings_menu.c:649 +#: src/settings_menu.c:647 msgid "normal" msgstr "" -#: src/settings_menu.c:650 +#: src/settings_menu.c:648 msgid "large" msgstr "" -#: src/settings_menu.c:651 +#: src/settings_menu.c:649 msgid "very large" msgstr "" -#: src/settings_menu.c:652 +#: src/settings_menu.c:650 msgid "huge" msgstr "" -#: src/settings_menu.c:654 +#: src/settings_menu.c:652 msgid "Fast but not photorealistic" msgstr "" -#: src/settings_menu.c:655 +#: src/settings_menu.c:653 msgid "Slow but looks better" msgstr "" -#: src/settings_menu.c:657 +#: src/settings_menu.c:655 msgid "default" msgstr "" -#: src/settings_menu.c:658 +#: src/settings_menu.c:656 msgid "reverse" msgstr "" -#: src/settings_menu.c:659 +#: src/settings_menu.c:657 msgid "content" msgstr "" -#: src/settings_menu.c:660 +#: src/settings_menu.c:658 msgid "extension" msgstr "" -#: src/settings_menu.c:662 +#: src/settings_menu.c:660 msgid "probe" msgstr "" -#: src/settings_menu.c:663 +#: src/settings_menu.c:661 msgid "libc" msgstr "libc" -#: src/settings_menu.c:664 +#: src/settings_menu.c:662 msgid "kernel" msgstr "kernel" -#: src/settings_menu.c:665 +#: src/settings_menu.c:663 msgid "mmx" msgstr "mmx" -#: src/settings_menu.c:666 +#: src/settings_menu.c:664 msgid "mmxext" msgstr "mmxext" -#: src/settings_menu.c:667 +#: src/settings_menu.c:665 msgid "sse" msgstr "sse" -#: src/settings_menu.c:669 +#: src/settings_menu.c:667 msgid "Background Image" msgstr "" -#: src/settings_menu.c:670 +#: src/settings_menu.c:668 #, fuzzy msgid "Background Animation" msgstr "Насиченість" -#: src/settings_menu.c:671 +#: src/settings_menu.c:669 #, fuzzy msgid "Post Plugin" msgstr "Втулок вводу відсутній" -#: src/settings_menu.c:673 +#: src/settings_menu.c:671 msgid "oscope" msgstr "oscope" -#: src/settings_menu.c:674 +#: src/settings_menu.c:672 msgid "fftscope" msgstr "fftscope" -#: src/settings_menu.c:675 +#: src/settings_menu.c:673 msgid "fftgraph" msgstr "fftgraph" -#: src/settings_menu.c:676 +#: src/settings_menu.c:674 msgid "goom" msgstr "goom" @@ -2931,6 +2941,24 @@ msgid "Music" msgstr "" +#~ msgid "Could not mount %s!" +#~ msgstr "Не вдалося змонтувати %s!" + +#~ msgid "Could not eject %s!" +#~ msgstr "Не вдалося витягти %s!" + +#~ msgid "use unscaled OSD if possible" +#~ msgstr "використовувати, по можливості, немасштабований OSD" + +#~ msgid "Use unscaled (full screen resolution) OSD if possible" +#~ msgstr "" +#~ "Використовувати, по можливості, немасштабований OSD (повноекранна " +#~ "розподільність)" + +#, fuzzy +#~ msgid "percentage of fullscreen screen to use" +#~ msgstr "відсоток чорної кайми в повноекранному режимі" + #, fuzzy #~ msgid "Corse" #~ msgstr "Ірландська" diff -Naur oxine-0.6.orig/src/disc.c oxine-0.6.3/src/disc.c --- oxine-0.6.orig/src/disc.c 2006-10-21 16:12:40.000000000 +0200 +++ oxine-0.6.3/src/disc.c 2006-11-13 18:40:28.000000000 +0100 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: disc.c 1408 2006-10-21 14:12:32Z mschwerin $ + * $Id: disc.c 1541 2006-11-13 16:25:16Z mschwerin $ * */ #include "config.h" @@ -227,13 +227,13 @@ break; case DEVICE_TYPE_VIDEO_CD: disc_type = _("Video CD"); - disc_title = - meta_info_get_from_mrl (entry->current_mrl, META_INFO_TITLE); + disc_title = meta_info_get_from_mrl (entry->current_mrl, + META_INFO_TITLE); break; case DEVICE_TYPE_VIDEO_DVD: disc_type = _("Video DVD"); - disc_title = - meta_info_get_from_mrl (entry->current_mrl, META_INFO_TITLE); + disc_title = meta_info_get_from_mrl (entry->current_mrl, + META_INFO_TITLE); break; case DEVICE_TYPE_CDROM: disc_type = _("CD-ROM"); @@ -293,38 +293,41 @@ } -int +bool disc_is_mounted (const char *device) { - int mounted = 0; - FILE *f = fopen ("/proc/mounts", "r"); - if (f != NULL) { - char line[256]; - while (fgets (line, 255, f) != NULL) { - if (strstr (line, device) != NULL) { - mounted = 1; - break; - } + if (!f) { + error (_("Could not open '%s': %s!"), + "/proc/mounts", strerror (errno)); + return false; + } + + bool mounted = false; + char line[256]; + while (fgets (line, 255, f) != NULL) { + if (strstr (line, device) != NULL) { + mounted = true; + break; } - fclose (f); } + fclose (f); return mounted; } -int +bool disc_is_present (const char *device) { #ifdef HAVE_LINUX_CDROM_H int fd = open (device, O_RDONLY | O_NONBLOCK); if (fd < 0) { error (_("Could not open '%s': %s!"), device, strerror (errno)); - return 0; + return false; } - int ret = 0; + bool present = false; int drive_status = ioctl (fd, CDROM_DRIVE_STATUS); switch (drive_status) { case CDS_NO_INFO: @@ -341,7 +344,7 @@ break; case CDS_DISC_OK: debug ("drive reports: disc ok"); - ret = 1; + present = true; break; default: debug ("drive reports: unknown value"); @@ -349,18 +352,18 @@ } close (fd); - return ret; + return present; #else - return 0; + return false; #endif } -int +bool disc_mount (const char *device) { if (disc_is_mounted (device)) - return 1; + return true; #ifdef BIN_MOUNT char command[256]; @@ -368,18 +371,18 @@ debug (command); if (system (command)) { - error (_("Could not mount %s!"), device); - return 0; + error (_("Could not mount '%s': %s!"), device, _("Unknown")); + return false; } - return 1; + return true; #else - return 0; + return false; #endif } -int +bool disc_umount (const char *device) { #ifdef BIN_UMOUNT @@ -388,18 +391,18 @@ debug (command); if (system (command)) { - error (_("Could not unmount %s!"), device); - return 0; + error (_("Could not unmount '%s': %s!"), device, _("Unknown")); + return false; } - return 1; + return true; #else - return 0; + return false; #endif } -int +bool disc_eject (const char *device) { #if defined BIN_EJECT @@ -408,30 +411,28 @@ debug (command); if (system (command)) { - error (_("Could not eject %s!"), device); - return 0; + error (_("Could not eject '%s': %s!"), device, _("Unknown")); + return false; } - return 1; + return true; #elif defined HAVE_LINUX_CDROM_H - int fd = open (disc->device, O_RDONLY | O_NONBLOCK); + int fd = open (device, O_RDONLY | O_NONBLOCK); if (fd < 0) { - error (_("Could not eject '%s': %s!"), disc->device, - strerror (errno)); - return 0; + error (_("Could not eject '%s': %s!"), device, strerror (errno)); + return false; } if (ioctl (fd, CDROMEJECT) < 0) { - error (_("Could not eject '%s': %s!"), disc->device, - strerror (errno)); + error (_("Could not eject '%s': %s!"), device, strerror (errno)); close (fd); - return 0; + return false; } close (fd); - return 1; + return true; #else - return 0; + return false; #endif } @@ -609,6 +610,8 @@ static void device_poll (device_entry_t * entry) { + bool repaint = false; + /* We assume that for a removable drive to be attached the device file has * to exist and has to be readable. */ bool is_disc_in = (access (entry->device, R_OK) == 0); @@ -624,22 +627,36 @@ } else { error (_("Could not open '%s': %s!"), entry->device, strerror (errno)); + /* If we fail to open the device, we quit neither removing nor + * adding this disc. */ + return; } } + /* We want to make sure that we're not adding or removing anything while + * another thread is updating the GUI using this data. */ + mutex_lock (&oxine->removable_discs->mutex); + if (!is_disc_in) { if (entry->is_disc_in && device_del (entry)) { - current_menu_cb (oxine); entry->is_disc_in = false; + repaint = true; } } else { if (!entry->is_disc_in && device_add (entry)) { - current_menu_cb (oxine); entry->is_disc_in = true; + repaint = true; } } + + mutex_unlock (&oxine->removable_discs->mutex); + + /* If anything changed, we update the GUI. */ + if (repaint) { + current_menu_cb (oxine); + } } @@ -668,7 +685,8 @@ if (pthread_create (&disc_thread_info.thread, NULL, disc_thread, NULL) != 0) { - error (_("Could not create disc polling thread: %s!"), strerror (errno)); + error (_("Could not create disc polling thread: %s!"), + strerror (errno)); } else { info (_("Successfully started disc polling thread.")); } diff -Naur oxine-0.6.orig/src/disc.h oxine-0.6.3/src/disc.h --- oxine-0.6.orig/src/disc.h 2006-10-17 17:36:00.000000000 +0200 +++ oxine-0.6.3/src/disc.h 2006-11-11 14:58:43.000000000 +0100 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: disc.h 1390 2006-10-17 13:01:21Z mschwerin $ + * $Id: disc.h 1522 2006-11-11 13:57:10Z mschwerin $ * */ @@ -58,12 +58,12 @@ char *disc_get_title (const char *device); device_type_t disc_get_type (const char *device); -int disc_is_mounted (const char *device); -int disc_is_present (const char *device); +bool disc_is_mounted (const char *device); +bool disc_is_present (const char *device); -int disc_eject (const char *device); -int disc_mount (const char *device); -int disc_umount (const char *device); +bool disc_eject (const char *device); +bool disc_mount (const char *device); +bool disc_umount (const char *device); void disc_autoscan_load (playlist_t * playlist, const char *mrl); void disc_autoscan_read (filelist_t * filelist); diff -Naur oxine-0.6.orig/src/dvd_menu.c oxine-0.6.3/src/dvd_menu.c --- oxine-0.6.orig/src/dvd_menu.c 2006-09-30 23:17:52.000000000 +0200 +++ oxine-0.6.3/src/dvd_menu.c 2006-11-15 13:26:21.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: dvd_menu.c 1197 2006-09-30 21:17:11Z mschwerin $ + * $Id: dvd_menu.c 1555 2006-11-15 09:04:35Z mschwerin $ * */ #include "config.h" @@ -33,7 +33,7 @@ { oxine_t *oxine = (oxine_t *) data; hide_user_interface (oxine); - odk_xine_event_send (oxine->odk, menu); + odk_xine_event_send (oxine->odk, true, menu); } void diff -Naur oxine-0.6.orig/src/environment.c oxine-0.6.3/src/environment.c --- oxine-0.6.orig/src/environment.c 2006-10-17 17:36:00.000000000 +0200 +++ oxine-0.6.3/src/environment.c 2006-11-13 18:40:28.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: environment.c 1390 2006-10-17 13:01:21Z mschwerin $ + * $Id: environment.c 1538 2006-11-13 15:19:30Z mschwerin $ * */ #include "config.h" @@ -79,10 +79,11 @@ char _directory[1024]; getcwd (_directory, 1024); - char *d = strtok (_directory, "/"); + char *saveptr; + char *d = strtok_r (_directory, "/", &saveptr); while (d) { l_list_append (list, d); - d = strtok (NULL, "/"); + d = strtok_r (NULL, "/", &saveptr); } } @@ -91,7 +92,8 @@ char _filename[1024]; strncpy (_filename, filename, 1023); - char *f = strtok (_filename, "/"); + char *saveptr; + char *f = strtok_r (_filename, "/", &saveptr); while (f) { if (strcmp (".", f) == 0) { // do nothing @@ -105,7 +107,7 @@ l_list_append (list, f); } - f = strtok (NULL, "/"); + f = strtok_r (NULL, "/", &saveptr); } } @@ -131,42 +133,48 @@ { struct stat filestat; - if (lstat (mrl, &filestat) == -1) { + /* We want to make sure we're handling an absolute path without any ups + * and downs in between. */ + char *abs_mrl = relative_to_absolute (mrl); + + if (lstat (abs_mrl, &filestat) == -1) { error (_("Unable to get status for file '%s': %s."), - mrl, strerror (errno)); - return relative_to_absolute (mrl); + abs_mrl, strerror (errno)); + return abs_mrl; } - if (S_ISLNK (filestat.st_mode)) { - char link_target[1024]; - int len = readlink (mrl, link_target, 1024); - if (len == -1) { - error (_("Unable to read link '%s' file: %s."), - mrl, strerror (errno)); - return NULL; - } - - if (link_target[len - 1] == '/') - link_target[len - 1] = 0; - else - link_target[len] = 0; + if (!S_ISLNK (filestat.st_mode)) { + return abs_mrl; + } - if (link_target[0] != '/') { - char *dev = ho_strdup (mrl); - char *link = ho_strdup (link_target); - snprintf (link_target, 1024, "%s/%s", dirname (dev), link); - ho_free (dev); - ho_free (link); - } + char link_target[1024]; + int len = readlink (abs_mrl, link_target, 1024); + if (len == -1) { + error (_("Unable to read link '%s' file: %s."), + abs_mrl, strerror (errno)); + return abs_mrl; + } - debug ("found symbolic link: %s -> %s", mrl, link_target); + if (link_target[len - 1] == '/') + link_target[len - 1] = 0; + else + link_target[len] = 0; - return resolve_softlink (link_target); - } + if (link_target[0] != '/') { + char *dev = ho_strdup (abs_mrl); + char *link = ho_strdup (link_target); + snprintf (link_target, 1024, "%s/%s", dirname (dev), link); + ho_free (dev); + ho_free (link); + } +#ifdef DEBUG + char *abs_target = relative_to_absolute (link_target); + debug ("found symbolic link: %s -> %s", abs_mrl, abs_target); + ho_free (abs_target); +#endif + ho_free (abs_mrl); - else { - return relative_to_absolute (mrl); - } + return resolve_softlink (link_target); } static int @@ -211,10 +219,14 @@ if (!fstab) return false; + /* We want to make sure we're handling an absolute path without any ups + * and downs in between. */ + char *abs_device = relative_to_absolute (device); + struct mntent *entry = getmntent (fstab); while (entry) { - if ((strcmp (device, entry->mnt_fsname) == 0) - && !disc_list_contains (device)) { + if ((strcmp (abs_device, entry->mnt_fsname) == 0) + && !disc_list_contains (abs_device)) { info (_("Found a device we are interested in:")); info (_(" device: %s"), entry->mnt_fsname); info (_(" mountpoint: %s"), entry->mnt_dir); @@ -236,72 +248,69 @@ endmntent (fstab); + ho_free (abs_device); return true; } entry = getmntent (fstab); } endmntent (fstab); + ho_free (abs_device); return false; } static void evaluate_device (const char *device, bool is_type_cd) { - if (disc_list_contains (device)) - return; - - debug ("evaluating %s", device); - if (strstr (device, "cdrom") - || strstr (device, "cdrw") - || strstr (device, "dvd")) + /* We want to make sure we're handling an absolute path without any ups + * and downs in between. */ + char *abs_device = relative_to_absolute (device); + debug ("evaluating %s", abs_device); + + /* If the disc list already contains this device, we can leave. */ + if (disc_list_contains (abs_device)) + goto out_free; + + /* We try to guess if this device is a CDROM drive. */ + if (strstr (abs_device, "cdrom") + || strstr (abs_device, "cdrw") + || strstr (abs_device, "dvd") + || strstr (abs_device, "dvdrw")) is_type_cd = true; - /* if the device does not exist, we only add it if it's in fstab */ - if (access (device, F_OK) != 0) { - scan_fstab_for_mountpoint (device, is_type_cd); - return; + /* If the device does not exist, we only add it if it's in fstab */ + if (access (abs_device, F_OK) != 0) { + scan_fstab_for_mountpoint (abs_device, is_type_cd); + goto out_free; } struct stat filestat; - if (lstat (device, &filestat) == -1) { + if (lstat (abs_device, &filestat) == -1) { error (_("Unable to get status for file '%s': %s."), - device, strerror (errno)); - return; + abs_device, strerror (errno)); + goto out_free; } if (S_ISLNK (filestat.st_mode)) { - if (!scan_fstab_for_mountpoint (device, is_type_cd)) { - char link_target[1024]; - int len = readlink (device, link_target, 1024); - if (len == -1) { - error (_("Unable to read link '%s' file: %s."), - device, strerror (errno)); - return; - } - link_target[len] = 0; - - if (link_target[0] != '/') { - char *dev = ho_strdup (device); - char *link = ho_strdup (link_target); - snprintf (link_target, 1024, "%s/%s", dirname (dev), link); - ho_free (dev); - ho_free (link); - } - - debug ("found symbolic link: %s -> %s", device, link_target); + if (!scan_fstab_for_mountpoint (abs_device, is_type_cd)) { + char *link_target = resolve_softlink (abs_device); evaluate_device (link_target, is_type_cd); + ho_free (link_target); } } else if (S_ISBLK (filestat.st_mode)) { - debug (" found block device: %s", device); - if (!scan_fstab_for_mountpoint (device, is_type_cd)) { - device_entry_t *new_entry = disc_new (device, NULL); + debug (" found block device: %s", abs_device); + + if (!scan_fstab_for_mountpoint (abs_device, is_type_cd)) { + device_entry_t *new_entry = disc_new (abs_device, NULL); new_entry->is_type_cd = is_type_cd; l_list_append (disc_list, new_entry); } } + + out_free: + ho_free (abs_device); } @@ -355,11 +364,12 @@ xine_cfg_entry_t centry; xine_config_lookup_entry (oxine->xine, "misc.polling.devices", ¢ry); if (centry.str_value && strlen (centry.str_value) > 0) { + char *saveptr; char *devices = ho_strdup (centry.str_value); - char *device = strtok (devices, ";"); + char *device = strtok_r (devices, ";", &saveptr); while (device) { evaluate_device (device, false); - device = strtok (NULL, ";"); + device = strtok_r (NULL, ";", &saveptr); } ho_free (devices); } diff -Naur oxine-0.6.orig/src/event.c oxine-0.6.3/src/event.c --- oxine-0.6.orig/src/event.c 2006-10-22 18:44:44.000000000 +0200 +++ oxine-0.6.3/src/event.c 2006-11-19 18:54:56.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: event.c 1412 2006-10-22 16:44:39Z mschwerin $ + * $Id: event.c 1571 2006-11-19 17:54:55Z mschwerin $ * */ #include "config.h" @@ -48,6 +48,50 @@ } +static void +oxine_dvd_key_handler (oxine_t * oxine, oxine_event_t * ev) +{ + if (ev->source.key == OXINE_KEY_NULL) + return; + if (!odk_current_is_playback_mode (oxine->odk)) + return; + if (!odk_current_is_dvd (oxine->odk)) + return; + + /* we backup the key */ + oxine_key_id_t key_save = ev->source.key; + /* and consume this event */ + ev->source.key = OXINE_KEY_NULL; + + switch (key_save) { + case OXINE_KEY_ACTIVATE: + hide_user_interface (oxine); + break; + case OXINE_KEY_PREV: + /* This is necessary because we don't automatically forward events to + * oxine when the GUI is visible. */ + if (!odk_get_forward_events_to_xine (oxine->odk) + && odk_current_has_chapters (oxine->odk)) { + odk_xine_event_send (oxine->odk, true, XINE_EVENT_INPUT_PREVIOUS); + } + break; + case OXINE_KEY_NEXT: + /* This is necessary because we don't automatically forward events to + * oxine when the GUI is visible. */ + if (!odk_get_forward_events_to_xine (oxine->odk) + && odk_current_has_chapters (oxine->odk)) { + odk_xine_event_send (oxine->odk, true, XINE_EVENT_INPUT_NEXT); + } + break; + default: + /* As this was not an event we want to handle, we restore the original + * key code. */ + ev->source.key = key_save; + break; + } +} + + #ifdef HAVE_VDR static void oxine_vdr_key_handler (oxine_t * oxine, oxine_event_t * ev) @@ -83,46 +127,46 @@ break; case OXINE_KEY_SELECT: case OXINE_KEY_PPLAY: - odk_xine_event_send (oxine->odk, XINE_EVENT_VDR_PAUSE); + odk_xine_event_send (oxine->odk, false, XINE_EVENT_VDR_PAUSE); break; case OXINE_KEY_PLAY: - odk_xine_event_send (oxine->odk, XINE_EVENT_VDR_PLAY); + odk_xine_event_send (oxine->odk, false, XINE_EVENT_VDR_PLAY); break; case OXINE_KEY_PAUSE: - odk_xine_event_send (oxine->odk, XINE_EVENT_VDR_PAUSE); + odk_xine_event_send (oxine->odk, false, XINE_EVENT_VDR_PAUSE); break; case OXINE_KEY_STOP: - odk_xine_event_send (oxine->odk, XINE_EVENT_VDR_STOP); + odk_xine_event_send (oxine->odk, false, XINE_EVENT_VDR_STOP); break; case OXINE_KEY_FASTRWD: - odk_xine_event_send (oxine->odk, XINE_EVENT_VDR_FASTREW); + odk_xine_event_send (oxine->odk, false, XINE_EVENT_VDR_FASTREW); break; case OXINE_KEY_FASTFWD: - odk_xine_event_send (oxine->odk, XINE_EVENT_VDR_FASTFWD); + odk_xine_event_send (oxine->odk, false, XINE_EVENT_VDR_FASTFWD); break; case OXINE_KEY_PREV: - odk_xine_event_send (oxine->odk, XINE_EVENT_VDR_CHANNELMINUS); + odk_xine_event_send (oxine->odk, false, XINE_EVENT_VDR_CHANNELMINUS); break; case OXINE_KEY_NEXT: - odk_xine_event_send (oxine->odk, XINE_EVENT_VDR_CHANNELPLUS); + odk_xine_event_send (oxine->odk, false, XINE_EVENT_VDR_CHANNELPLUS); break; case OXINE_KEY_BACK: - odk_xine_event_send (oxine->odk, XINE_EVENT_VDR_BACK); + odk_xine_event_send (oxine->odk, false, XINE_EVENT_VDR_BACK); break; case OXINE_KEY_VOLUME: if (ev->data.how > 0) - odk_xine_event_send (oxine->odk, XINE_EVENT_VDR_VOLPLUS); + odk_xine_event_send (oxine->odk, false, XINE_EVENT_VDR_VOLPLUS); else - odk_xine_event_send (oxine->odk, XINE_EVENT_VDR_VOLMINUS); + odk_xine_event_send (oxine->odk, false, XINE_EVENT_VDR_VOLMINUS); break; case OXINE_KEY_VOLMUTE: - odk_xine_event_send (oxine->odk, XINE_EVENT_VDR_MUTE); + odk_xine_event_send (oxine->odk, false, XINE_EVENT_VDR_MUTE); break; case OXINE_KEY_MENU_OSD: - odk_xine_event_send (oxine->odk, XINE_EVENT_INPUT_MENU1); + odk_xine_event_send (oxine->odk, false, XINE_EVENT_INPUT_MENU1); break; case OXINE_KEY_AUDIO_CHANNEL: - odk_xine_event_send (oxine->odk, XINE_EVENT_VDR_AUDIO); + odk_xine_event_send (oxine->odk, false, XINE_EVENT_VDR_AUDIO); break; case OXINE_KEY_MENU_MAIN: case OXINE_KEY_PLAY_DVB: @@ -133,10 +177,10 @@ case OXINE_KEY_SHUTDOWN: /* As we do not want to use the oxine OSD over VDR, we always stop TV * playback before showing our menus. */ - odk_xine_event_send (oxine->odk, XINE_EVENT_VDR_STOP); + odk_xine_event_send (oxine->odk, false, XINE_EVENT_VDR_STOP); odk_stop (oxine->odk); default: - /* As this was not an event we want to pass to vdr, we restore the + /* As this was not an event we want to pass to VDR, we restore the * original key code. */ ev->source.key = key_save; break; @@ -234,6 +278,9 @@ oxine_vdr_key_handler (oxine, ev); #endif + /* Evaluate all keys used by DVDs. */ + oxine_dvd_key_handler (oxine, ev); + /* Evaluate all the keys related only to stream speed. */ oxine_stream_speed_key_handler (oxine, ev); @@ -243,8 +290,7 @@ /* First of all we handle all keys that are allowed anywhere. */ switch (ev->source.key) { case OXINE_KEY_ACTIVATE: - if (!oxine->stream_parameter_is_visible - && !odk_current_is_dvd (oxine->odk)) + if (!oxine->stream_parameter_is_visible) show_stream_parameter (oxine, ODK_PARAM_SPEED); else hide_user_interface (oxine); @@ -293,19 +339,13 @@ show_stream_parameter (oxine, ODK_PARAM_POSITION); break; case OXINE_KEY_PREV: - if (odk_current_is_dvd (oxine->odk) - && odk_current_has_chapters (oxine->odk)) { - odk_xine_event_send (oxine->odk, XINE_EVENT_INPUT_PREVIOUS); - } else if (playlist_get_current_pos (oxine->current_playlist) > 0) { + if (playlist_get_current_pos (oxine->current_playlist) > 0) { playlist_play_prev (oxine); } break; case OXINE_KEY_NEXT: - if (odk_current_is_dvd (oxine->odk) - && odk_current_has_chapters (oxine->odk)) { - odk_xine_event_send (oxine->odk, XINE_EVENT_INPUT_NEXT); - } else if ((playlist_get_current_pos (oxine->current_playlist) + 1) != - playlist_length (oxine->current_playlist)) { + if ((playlist_get_current_pos (oxine->current_playlist) + 1) != + playlist_length (oxine->current_playlist)) { playlist_play_next (oxine); } break; @@ -609,16 +649,22 @@ break; } #endif - if (((oxine->current_menu == hide_user_interface) - || (oxine->current_menu == show_playback_menu_cb)) - && odk_current_has_video (oxine->odk) - && !odk_current_is_v4l (oxine->odk) - && !odk_current_is_dvb (oxine->odk) - && !odk_current_is_dvd (oxine->odk) - && !odk_current_is_vcd (oxine->odk)) { - show_playback_info_cb (oxine); - } else { + + if ((oxine->current_menu != hide_user_interface) + && (oxine->current_menu != show_playback_menu_cb)) { current_menu_cb (oxine); + break; + } + + if (!odk_current_has_video (oxine->odk)) { + show_playback_menu_cb (oxine); + } else if (odk_current_is_v4l (oxine->odk) + || odk_current_is_dvb (oxine->odk) + || odk_current_is_dvd (oxine->odk) + || odk_current_is_vcd (oxine->odk)) { + hide_user_interface (oxine); + } else { + show_playback_info_cb (oxine); } break; case OXINE_EVENT_PLAYBACK_STOPPED: diff -Naur oxine-0.6.orig/src/event.h oxine-0.6.3/src/event.h --- oxine-0.6.orig/src/event.h 2006-10-17 17:36:00.000000000 +0200 +++ oxine-0.6.3/src/event.h 2006-11-19 18:54:56.000000000 +0100 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: event.h 1385 2006-10-17 07:32:36Z mschwerin $ + * $Id: event.h 1571 2006-11-19 17:54:55Z mschwerin $ * */ @@ -35,21 +35,23 @@ * oxine global events and keycodes */ typedef enum { - // xine-lib events going to the frontend + /* xine-lib events going to the frontend */ OXINE_EVENT_PLAYBACK_FINISHED = XINE_EVENT_UI_PLAYBACK_FINISHED, OXINE_EVENT_CHANNELS_CHANGED = XINE_EVENT_UI_CHANNELS_CHANGED, OXINE_EVENT_SET_TITLE = XINE_EVENT_UI_SET_TITLE, OXINE_EVENT_MESSAGE = XINE_EVENT_UI_MESSAGE, OXINE_EVENT_FRAME_FORMAT_CHANGED = XINE_EVENT_FRAME_FORMAT_CHANGE, - // xine-lib events coming from the frontend + /* xine-lib events coming from the frontend */ OXINE_EVENT_BUTTON = XINE_EVENT_INPUT_MOUSE_BUTTON, OXINE_EVENT_MOTION = XINE_EVENT_INPUT_MOUSE_MOVE, - // oxine events going to the frontend + /* oxine events going to the frontend */ OXINE_EVENT_PLAYBACK_STARTED = 1000, OXINE_EVENT_PLAYBACK_STOPPED, OXINE_EVENT_PLAYBACK_ERROR, OXINE_EVENT_WAITING_FOR_ALTERNATIVE, OXINE_EVENT_KEY, + OXINE_EVENT_OUTPUT_FORMAT_CHANGED, // the size of the output window has changed + OXINE_EVENT_OSD_FORMAT_CHANGED, } oxine_event_id_t; typedef enum { diff -Naur oxine-0.6.orig/src/filelist.c oxine-0.6.3/src/filelist.c --- oxine-0.6.orig/src/filelist.c 2006-10-20 18:16:54.000000000 +0200 +++ oxine-0.6.3/src/filelist.c 2006-11-15 13:26:21.000000000 +0100 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: filelist.c 1402 2006-10-20 16:16:42Z mschwerin $ + * $Id: filelist.c 1555 2006-11-15 09:04:35Z mschwerin $ * */ #include "config.h" @@ -231,23 +231,23 @@ * compared to all suffixes of the allowed type. * *************************************************************************** */ -int +bool is_file_allowed (const char *mrl, int allowed_filetypes) { char *suffix = rindex (mrl, '.'); if (!suffix) - return 0; + return false; suffix = (char *) (suffix + 1); switch (allowed_filetypes) { case ALLOW_FILES_ALL: { - int allow = 0; + bool allow = false; char *base = get_basename (mrl); if (base[0] != '.') - allow = 1; + allow = true; ho_free (base); return allow; } @@ -257,7 +257,7 @@ char *ext = l_list_first (allowed_xine_extensions); while (ext) { if (strcasecmp (ext, suffix) == 0) { - return 1; + return true; } ext = l_list_next (allowed_xine_extensions, ext); } @@ -268,7 +268,7 @@ char *ext = l_list_first (allowed_audio_extensions); while (ext) { if (strcasecmp (ext, suffix) == 0) { - return 1; + return true; } ext = l_list_next (allowed_audio_extensions, ext); } @@ -279,7 +279,7 @@ int i = 0; for (; video_extensions[i]; i++) { if (strcasecmp (video_extensions[i], suffix) == 0) { - return 1; + return true; } } } @@ -289,14 +289,14 @@ int i = 0; for (; subtitle_extensions[i]; i++) { if (strcasecmp (subtitle_extensions[i], suffix) == 0) { - return 1; + return true; } } } break; } - return 0; + return false; } @@ -1033,19 +1033,19 @@ * MRL. * *************************************************************************** */ -int +bool filelist_contains (filelist_t * filelist, const char *mrl) { assert (filelist); mutex_lock (&filelist->mutex); - int contains = 0; + bool contains = false; if (mrl) { fileitem_t *fileitem = filelist_first (filelist); while (fileitem) { if (strcasecmp (fileitem->mrl, mrl) == 0) { - contains = 1; + contains = true; break; } fileitem = filelist_next (filelist, fileitem); diff -Naur oxine-0.6.orig/src/filelist.h oxine-0.6.3/src/filelist.h --- oxine-0.6.orig/src/filelist.h 2006-10-20 18:16:54.000000000 +0200 +++ oxine-0.6.3/src/filelist.h 2006-11-15 13:26:21.000000000 +0100 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: filelist.h 1402 2006-10-20 16:16:42Z mschwerin $ + * $Id: filelist.h 1555 2006-11-15 09:04:35Z mschwerin $ * */ @@ -31,6 +31,7 @@ #include "list.h" #include "mutex.h" +#include "types.h" #define FILELIST_TOPLEVEL_MRL "computer:///" #ifdef HAVE_VDR @@ -277,7 +278,7 @@ * MRL. * *************************************************************************** */ -int filelist_contains (filelist_t * filelist, const char *mrl); +bool filelist_contains (filelist_t * filelist, const char *mrl); /* @@ -313,7 +314,7 @@ * compared to all suffixes of the allowed type. * *************************************************************************** */ -int is_file_allowed (const char *mrl, int allowed_filetypes); +bool is_file_allowed (const char *mrl, int allowed_filetypes); #ifdef __cplusplus } #endif diff -Naur oxine-0.6.orig/src/filelist_menu.c oxine-0.6.3/src/filelist_menu.c --- oxine-0.6.orig/src/filelist_menu.c 2006-11-02 20:33:13.000000000 +0100 +++ oxine-0.6.3/src/filelist_menu.c 2006-11-13 18:40:28.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: filelist_menu.c 1442 2006-11-02 19:32:34Z mschwerin $ + * $Id: filelist_menu.c 1541 2006-11-13 16:25:16Z mschwerin $ * */ #include "config.h" @@ -64,7 +64,7 @@ static otk_widget_t *button_next = NULL; static otk_widget_t *button_home = NULL; -#define FILELIST_BUTTONS_NUM 6 +#define FILELIST_BUTTONS_NUM 7 static otk_widget_t *filelist_menu_buttons[FILELIST_BUTTONS_NUM]; static otk_widget_t *filelist_menu_list = NULL; static otk_widget_t *filelist_menu_window = NULL; @@ -109,46 +109,53 @@ bool has_next = (l_list_length (next_filelist) > 0); bool is_toplevel = (current_filelist != toplevel_filelist); + int num_selected; + fileitem_t **items = filelist_get_selected_fileitems (&num_selected); + otk_widget_set_enabled (button_up, is_toplevel); otk_widget_set_enabled (button_home, is_toplevel); otk_widget_set_enabled (button_prev, has_prev); otk_widget_set_enabled (button_next, has_next); - enabled = (otk_list_get_selected_count (filelist_menu_list) > 0); + enabled = (num_selected > 0); otk_widget_set_enabled (filelist_menu_buttons[0], enabled); otk_widget_set_enabled (filelist_menu_buttons[1], enabled); - if (current_filelist == favorites_filelist) + /* Remove/ Reset/ Eject */ + if (current_filelist == favorites_filelist) { otk_widget_set_enabled (filelist_menu_buttons[2], true); - else if (enabled && (strcmp (current_filelist->mrl, - get_dir_oxine_playlists ()) == 0)) + otk_button_set_text (filelist_menu_buttons[2], _("Reset")); + } else if ((num_selected > 0) + && (strcmp (current_filelist->mrl, + get_dir_oxine_playlists ()) == 0)) { otk_widget_set_enabled (filelist_menu_buttons[2], true); + otk_button_set_text (filelist_menu_buttons[2], _("Remove")); + } #ifdef HAVE_VDR - else if (enabled && (strcmp (current_filelist->mrl, - FILELIST_VDR_RECORDINGS_MRL) == 0)) + else if ((num_selected > 0) + && (strcmp (current_filelist->mrl, + FILELIST_VDR_RECORDINGS_MRL) == 0)) { otk_widget_set_enabled (filelist_menu_buttons[2], true); -#endif - else - otk_widget_set_enabled (filelist_menu_buttons[2], false); - - if (current_filelist == favorites_filelist) - otk_button_set_text (filelist_menu_buttons[2], _("Reset")); - else otk_button_set_text (filelist_menu_buttons[2], _("Remove")); - + } +#endif #ifdef HAVE_DISC_POLLING - int num_selected; - fileitem_t **items = filelist_get_selected_fileitems (&num_selected); - if ((num_selected == 1) && items - && (items[0]->parent == oxine->removable_discs)) { + else if ((num_selected == 1) + && (items[0]->parent == oxine->removable_discs)) { otk_widget_set_enabled (filelist_menu_buttons[2], true); - otk_button_set_text (filelist_menu_buttons[2], _("Eject")); + otk_button_set_text (filelist_menu_buttons[2], _("Remove")); } - ho_free (items); #endif + else { + otk_widget_set_enabled (filelist_menu_buttons[2], false); + otk_button_set_text (filelist_menu_buttons[2], _("Remove")); + } + /* Current title */ enabled = odk_current_is_playback_mode (oxine->odk); - otk_widget_set_visible (filelist_menu_buttons[5], enabled); + otk_widget_set_visible (filelist_menu_buttons[6], enabled); + + ho_free (items); } @@ -164,7 +171,8 @@ device = ((device_entry_t *) item->user_data)->device; #endif w = otk_listentry_new (filelist_menu_list, item->title, - play_dvd_cb, device, NULL, NULL, NULL, NULL); + play_dvd_cb, device, + filelist_select_cb, item, NULL, NULL); } else if (strncasecmp (item->mrl, "vcd://", 6) == 0) { @@ -174,8 +182,8 @@ device = ((device_entry_t *) item->user_data)->device; #endif w = otk_listentry_new (filelist_menu_list, item->title, - play_videocd_cb, device, - NULL, NULL, NULL, NULL); + play_vcd_cb, device, + filelist_select_cb, item, NULL, NULL); } else { @@ -209,6 +217,11 @@ otk_clear_list (filelist_menu_list); + mutex_lock (¤t_filelist->mutex); +#ifdef HAVE_DISC_POLLING + mutex_lock (&oxine->removable_discs->mutex); +#endif + /* If we're in the music menu and the current filelist has regular * files in it, we add a play-all-entries entry to the top of the * list. */ @@ -279,6 +292,11 @@ } #endif +#ifdef HAVE_DISC_POLLING + mutex_unlock (&oxine->removable_discs->mutex); +#endif + mutex_unlock (¤t_filelist->mutex); + otk_list_set_pos (filelist_menu_list, current_filelist->top_position); otk_list_set_focus (filelist_menu_list, current_filelist->cur_position); } @@ -301,9 +319,9 @@ if (mrl && (access (mrl, R_OK) == 0)) { int x = 110; - int y = 450; + int y = 470; int w = 180; - int h = 260; + int h = 220; if (odk_current_is_playback_mode (oxine->odk)) { y += 20; @@ -416,8 +434,6 @@ disc_eject (entry->device); } #endif - - filelist_menu_update_buttons (); } @@ -817,16 +833,20 @@ filelist_menu_buttons[2] = otk_text_button_new (oxine->otk, x, y, 180, 35, _("Remove"), remove_selected_cb, oxine); - y += 50; + y += 40; filelist_menu_buttons[3] = + otk_text_button_new (oxine->otk, x, y, 180, 35, _("Eject"), + eject_cb, oxine); + y += 50; + filelist_menu_buttons[4] = otk_text_button_new (oxine->otk, x, y, 180, 35, _("Playlist"), show_playlist_menu_cb, oxine); y += 40; - filelist_menu_buttons[4] = + filelist_menu_buttons[5] = otk_text_button_new (oxine->otk, x, y, 180, 35, _("Mainmenu"), show_main_menu_cb, oxine); y += 40; - filelist_menu_buttons[5] = + filelist_menu_buttons[6] = otk_text_button_new (oxine->otk, x, y, 180, 35, _("Current title"), show_playback_menu_cb, oxine); diff -Naur oxine-0.6.orig/src/gui_utils.c oxine-0.6.3/src/gui_utils.c --- oxine-0.6.orig/src/gui_utils.c 2006-10-25 14:09:38.000000000 +0200 +++ oxine-0.6.3/src/gui_utils.c 2006-11-15 13:26:21.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: gui_utils.c 1413 2006-10-23 07:16:27Z mschwerin $ + * $Id: gui_utils.c 1555 2006-11-15 09:04:35Z mschwerin $ * */ #include "config.h" @@ -74,7 +74,9 @@ || (oxine->current_menu == repaint_message_dialog) || (oxine->current_menu == show_playback_menu_cb) || (oxine->current_menu == show_playback_info_cb) - || (oxine->current_menu == show_playback_controls_cb)) { + || (oxine->current_menu == show_playback_controls_cb) + || (oxine->current_menu == show_playback_settings_p1_cb) + || (oxine->current_menu == show_playback_settings_p2_cb)) { oxine->playback_ended_menu (oxine); } else { oxine->current_menu (oxine); @@ -104,7 +106,7 @@ otk_draw (oxine->otk); oxine->user_interface_is_visible = true; - odk_forward_events_to_xine (oxine->odk, false); + odk_set_forward_events_to_xine (oxine->odk, false); } @@ -128,9 +130,9 @@ #else if (odk_current_is_dvd (oxine->odk)) #endif - odk_forward_events_to_xine (oxine->odk, true); + odk_set_forward_events_to_xine (oxine->odk, true); else - odk_forward_events_to_xine (oxine->odk, false); + odk_set_forward_events_to_xine (oxine->odk, false); oxine->current_menu = hide_user_interface; } @@ -156,7 +158,7 @@ ""); set_time_string (oxine, time); otk_label_set_upcall (time, set_time_string, oxine); - otk_widget_set_update (time, 1); + otk_widget_set_update (time, true); } @@ -182,11 +184,11 @@ odk_play_background_stream (oxine->odk, mrl); } else { char *current = odk_current_get_mrl (oxine->odk); - if (!current || (strcmp (mrl, current) != 0)) { - if (odk_play (oxine->odk, mrl, NULL, ODK_MODE_LOGO)) { + if (!current || !mrl || (strcmp (mrl, current) != 0)) { + if (mrl && odk_play (oxine->odk, mrl, NULL, ODK_MODE_LOGO)) { return; } - if (odk_play (oxine->odk, OXINE_BACKGROUNDS "/background.png", + if (odk_play (oxine->odk, OXINE_BACKGROUNDS "/mainmenu.png", NULL, ODK_MODE_LOGO)) { return; } @@ -451,18 +453,52 @@ || (strncasecmp (playitem->mrl, "vcd://", 6) == 0) || (strncasecmp (playitem->mrl, "dvb://", 6) == 0) || (strncasecmp (playitem->mrl, "v4l://", 6) == 0)) { - otk_cb_t current_menu = oxine->current_menu; - please_wait (); - oxine->current_menu = current_menu; + /* This is only necessary when we start oxine and start playing a + * video at once. If we call please_wait in this situation we + * first load the background and a very short time after that + * start playing the video. That would not look good! */ + if (odk_current_is_logo_mode (oxine->odk) + || odk_current_is_playback_mode (oxine->odk)) { + otk_cb_t current_menu = oxine->current_menu; + please_wait (); + oxine->current_menu = current_menu; + } + } else { + otk_clear (oxine->otk); } if (!odk_play (oxine->odk, playitem->mrl, playitem->subtitle_mrl, ODK_MODE_NORMAL)) { + char *msg = NULL; + otk_cb_t ok_cb = NULL; + void *ok_cb_data = NULL; + + if (strncasecmp (playitem->mrl, "cdda:/", 6) == 0) { + msg = ho_strdup_printf ("%s\n%s", + _("Could not play Audio CD!"), + _("Please insert an Audio CD!")); + ok_cb = play_audiocd_cb; + } else if (strncasecmp (playitem->mrl, "vcd://", 6) == 0) { + msg = ho_strdup_printf ("%s\n%s", + _("Could not play Video CD!"), + _("Please insert a Video CD!")); + ok_cb = play_vcd_cb; + } else if (strncasecmp (playitem->mrl, "dvd://", 6) == 0) { + msg = ho_strdup_printf ("%s\n%s", + _("Could not play DVD!"), + _("Please insert a DVD!")); + ok_cb = play_dvd_cb; + } else { + msg = ho_strdup (_("Could not play title!")); + ok_cb = error_cb; + ok_cb_data = oxine; + } + playlist_remove (oxine->current_playlist, playitem); - show_message_dialog (error_cb, oxine, + show_message_dialog (ok_cb, ok_cb_data, playback_ended_menu_cb, oxine, - DIALOG_OK_CANCEL, NULL, - _("Could not play title!")); + DIALOG_OK_CANCEL, NULL, msg); + ho_free (msg); } } } @@ -473,6 +509,7 @@ playlist_t * playlist) { assert (playlist); + oxine->backto_menu = next_menu; oxine->current_menu = next_menu; oxine->current_playlist = playlist; playitem_t *playitem = playlist_get_first (oxine->current_playlist); @@ -485,6 +522,7 @@ playlist_t * playlist, playitem_t * playitem) { assert (playlist); + oxine->backto_menu = next_menu; oxine->current_menu = next_menu; oxine->current_playlist = playlist; playlist_set_current (oxine->current_playlist, playitem); diff -Naur oxine-0.6.orig/src/heap.c oxine-0.6.3/src/heap.c --- oxine-0.6.orig/src/heap.c 2006-09-22 18:20:35.000000000 +0200 +++ oxine-0.6.3/src/heap.c 2006-11-06 08:27:52.000000000 +0100 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: heap.c 1181 2006-09-21 07:53:16Z mschwerin $ + * $Id: heap.c 1466 2006-11-06 07:26:48Z mschwerin $ * */ #include "config.h" @@ -308,7 +308,8 @@ RenderDesc (prefix_tag_t * prefix, char *lpBuffer) { if (prefix->content == &prefix[1]) { - sprintf (lpBuffer, "%3i words @ 0x%08lx:", prefix->size, + sprintf (lpBuffer, "%3lu words @ 0x%08lx:", + (unsigned long) prefix->size, (unsigned long) prefix->content); if (prefix->filename) { sprintf (lpBuffer + strlen (lpBuffer), "%s:%ld ", diff -Naur oxine-0.6.orig/src/main_menu.c oxine-0.6.3/src/main_menu.c --- oxine-0.6.orig/src/main_menu.c 2006-11-02 20:16:10.000000000 +0100 +++ oxine-0.6.3/src/main_menu.c 2006-11-19 18:54:56.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: main_menu.c 1414 2006-10-28 12:47:20Z mschwerin $ + * $Id: main_menu.c 1571 2006-11-19 17:54:55Z mschwerin $ * */ #include "config.h" @@ -192,7 +192,10 @@ device = ho_strdup ((char *) device_p); } - if (disc_get_type (device) == DEVICE_TYPE_AUDIO_CD) { + device_type_t type = disc_get_type (device); + /* If we are certain that the disc in the specified audio CD drive is + * indeed an audio CD we play this disc. */ + if (type == DEVICE_TYPE_AUDIO_CD) { char mrl[1024]; snprintf (mrl, 1024, "cdda:/%s", device); @@ -200,19 +203,30 @@ disc_autoscan_load (oxine->ro_playlist, mrl); playlist_play_first (oxine, show_playback_menu_cb, oxine->ro_playlist); - } else { + } + /* If there is no disc in the drive or if there is a disc in the drive but + * we know what kind of disc this is we tell the user to insert a audio CD. */ + else if (type != DEVICE_TYPE_UNKNOWN) { show_message_dialog (play_audiocd_cb, device, backto_menu_cb, oxine, DIALOG_OK_CANCEL, NULL, _("Please insert an Audio CD!")); } + /* If none of the above apply we just try our luck and hope xine-lib can + * solve this problem for us. */ + else { + playlist_clear (oxine->ro_playlist); + disc_autoscan_load (oxine->ro_playlist, "cdda:/"); + playlist_play_first (oxine, show_playback_menu_cb, + oxine->ro_playlist); + } ho_free (device); } void -play_videocd_cb (void *device_p) +play_vcd_cb (void *device_p) { oxine->backto_menu = show_main_menu_cb; oxine->playback_ended_menu = show_main_menu_cb; @@ -229,8 +243,9 @@ } device_type_t type = disc_get_type (device); - if ((type == DEVICE_TYPE_VIDEO_CD) - || (type == DEVICE_TYPE_CDROM)) { + /* If we are certain that the disc in the specified VCD drive is indeed a + * VCD we play this disc. */ + if (type == DEVICE_TYPE_VIDEO_CD) { char mrl[1024]; snprintf (mrl, 1024, "vcd://%s", device); @@ -238,12 +253,23 @@ playlist_add (oxine->ro_playlist, _("Video CD"), mrl); playlist_play_first (oxine, show_playback_menu_cb, oxine->ro_playlist); - } else { - show_message_dialog (play_videocd_cb, device, + } + /* If there is no disc in the drive or if there is a disc in the drive but + * we know what kind of disc this is we tell the user to insert a VCD. */ + else if (type != DEVICE_TYPE_UNKNOWN) { + show_message_dialog (play_vcd_cb, device, backto_menu_cb, oxine, DIALOG_OK_CANCEL, NULL, _("Please insert a Video CD!")); } + /* If none of the above apply we just try our luck and hope xine-lib can + * solve this problem for us. */ + else { + playlist_clear (oxine->ro_playlist); + playlist_add (oxine->ro_playlist, _("Video CD"), "vcd://"); + playlist_play_first (oxine, show_playback_menu_cb, + oxine->ro_playlist); + } ho_free (device); } @@ -267,8 +293,9 @@ } device_type_t type = disc_get_type (device); - if ((type == DEVICE_TYPE_VIDEO_DVD) - || (type == DEVICE_TYPE_CDROM)) { + /* If we are certain that the disc in the specified DVD drive is indeed a + * DVD we play this disc. */ + if (type == DEVICE_TYPE_VIDEO_DVD) { char mrl[1024]; snprintf (mrl, 1024, "dvd://%s", device); @@ -276,12 +303,23 @@ playlist_add (oxine->ro_playlist, _("DVD"), mrl); playlist_play_first (oxine, show_playback_menu_cb, oxine->ro_playlist); - } else { + } + /* If there is no disc in the drive or if there is a disc in the drive but + * we know what kind of disc this is we tell the user to insert a DVD. */ + else if (type != DEVICE_TYPE_UNKNOWN) { show_message_dialog (play_dvd_cb, device, backto_menu_cb, oxine, DIALOG_OK_CANCEL, NULL, _("Please insert a DVD!")); } + /* If none of the above apply we just try our luck and hope xine-lib can + * solve this problem for us. */ + else { + playlist_clear (oxine->ro_playlist); + playlist_add (oxine->ro_playlist, _("DVD"), "dvd://"); + playlist_play_first (oxine, show_playback_menu_cb, + oxine->ro_playlist); + } ho_free (device); } @@ -395,11 +433,19 @@ { int p = otk_list_get_pos (eject_list); int i = 0; + +#ifdef HAVE_DISC_POLLING + mutex_lock (&oxine->removable_discs->mutex); +#endif + device_entry_t *entry = devicelist_first (); while (entry) { if (i == p) { + otk_cb_t cb = backto_menu_cb; + please_wait (); if (odk_current_is_playback_mode (oxine->odk)) { + cb = oxine->playback_ended_menu; char *current_mrl = odk_current_get_mrl (oxine->odk); // are we playing from the disc we're about to eject? if ((entry->mountpoint @@ -417,23 +463,36 @@ } } - please_wait (); - - disc_umount (entry->device); - - if (!disc_eject (entry->device)) { - show_message_dialog (backto_menu_cb, oxine, NULL, NULL, + /* Now we first try to unmount and then try to eject the + * device. */ + if (disc_is_mounted (entry->device) + && !disc_umount (entry->device)) { + show_message_dialog (cb, oxine, NULL, NULL, + DIALOG_OK, NULL, + _("Could not unmount device!")); + } else if (!disc_eject (entry->device)) { + show_message_dialog (cb, oxine, NULL, NULL, DIALOG_OK, NULL, _("Could not eject device!")); +#ifdef HAVE_DISC_POLLING + } else if (!oxine->use_polling) { + cb (oxine); + } +#else } else { - backto_menu_cb (oxine); + cb (oxine); } +#endif break; } i += 1; entry = devicelist_next (entry); } + +#ifdef HAVE_DISC_POLLING + mutex_unlock (&oxine->removable_discs->mutex); +#endif } @@ -544,7 +603,7 @@ create_new_window (false, true); otk_widget_t *l = otk_list_new (oxine->otk, 215, 150, 370, 400, - 45, 60, false, false, + 45, 55, false, false, OTK_LIST_MULTIPLE_SELECTION, oxine); @@ -602,7 +661,7 @@ _("Shutdown"); main_menu_list = otk_list_new (oxine->otk, 215, 150, 370, 400, - 45, 60, false, false, + 45, 55, false, false, OTK_LIST_MULTIPLE_SELECTION, oxine); menulist_show (main_menu_list, oxine->main_menu_items); diff -Naur oxine-0.6.orig/src/main_menu.h oxine-0.6.3/src/main_menu.h --- oxine-0.6.orig/src/main_menu.h 2006-10-21 14:25:14.000000000 +0200 +++ oxine-0.6.3/src/main_menu.h 2006-11-11 14:58:43.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: main_menu.h 1197 2006-09-30 21:17:11Z mschwerin $ + * $Id: main_menu.h 1522 2006-11-11 13:57:10Z mschwerin $ * */ @@ -42,7 +42,7 @@ #endif void play_mrl_cb (void *mrl_p); void play_audiocd_cb (void *oxine_p); -void play_videocd_cb (void *oxine_p); +void play_vcd_cb (void *oxine_p); void show_sub_menu_cb (void *menu_mrl_p); void show_main_menu_cb (void *oxine_p); diff -Naur oxine-0.6.orig/src/menulist.c oxine-0.6.3/src/menulist.c --- oxine-0.6.orig/src/menulist.c 2006-10-21 14:25:44.000000000 +0200 +++ oxine-0.6.3/src/menulist.c 2006-11-11 14:58:43.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: menulist.c 1406 2006-10-21 12:25:25Z mschwerin $ + * $Id: menulist.c 1522 2006-11-11 13:57:10Z mschwerin $ * */ #include "config.h" @@ -80,7 +80,7 @@ item->cb = play_dvd_cb; item->cb_data = NULL; } else if (strcasecmp (param, "vcd") == 0) { - item->cb = play_videocd_cb; + item->cb = play_vcd_cb; item->cb_data = NULL; } else if (strcasecmp (param, "cddb") == 0) { item->cb = play_audiocd_cb; diff -Naur oxine-0.6.orig/src/meta_info.h oxine-0.6.3/src/meta_info.h --- oxine-0.6.orig/src/meta_info.h 2006-09-22 18:20:25.000000000 +0200 +++ oxine-0.6.3/src/meta_info.h 2006-11-06 08:25:16.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: meta_info.h 1182 2006-09-22 07:53:33Z mschwerin $ + * $Id: meta_info.h 1465 2006-11-06 07:24:04Z mschwerin $ * */ @@ -34,7 +34,8 @@ META_INFO_GENRE = XINE_META_INFO_GENRE, META_INFO_ALBUM = XINE_META_INFO_ALBUM, META_INFO_YEAR = XINE_META_INFO_YEAR, - META_INFO_TRACK_NUMBER = XINE_META_INFO_TRACK_NUMBER + META_INFO_TRACK_NUMBER = XINE_META_INFO_TRACK_NUMBER, + META_INFO_CDINDEX_DISCID = XINE_META_INFO_CDINDEX_DISCID, } meta_info_t; char *meta_info_get_from_stream (xine_stream_t * stream, meta_info_t type); diff -Naur oxine-0.6.orig/src/odk.c oxine-0.6.3/src/odk.c --- oxine-0.6.orig/src/odk.c 2006-10-18 12:56:37.000000000 +0200 +++ oxine-0.6.3/src/odk.c 2006-11-19 18:54:56.000000000 +0100 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: odk.c 1398 2006-10-18 08:34:13Z mschwerin $ + * $Id: odk.c 1571 2006-11-19 17:54:55Z mschwerin $ * */ @@ -95,7 +95,7 @@ if (stream && (xine_get_status (stream) == XINE_STATUS_PLAY)) { while (((ret = xine_get_pos_length (stream, pos, time, length)) == 0) && (++t < 10)) - usleep (100000); /* wait before trying again */ + usleep (100000); /* wait before trying again */ } return ret; } @@ -796,7 +796,7 @@ xine_cfg_entry_t entry; xine_config_lookup_entry (odk->xine, "gui.video.brightness", &entry); - entry.num_value = value; + entry.num_value = value / 655; xine_config_update_entry (odk->xine, &entry); } break; @@ -805,7 +805,7 @@ xine_cfg_entry_t entry; xine_config_lookup_entry (odk->xine, "gui.video.contrast", &entry); - entry.num_value = value; + entry.num_value = value / 655; xine_config_update_entry (odk->xine, &entry); } break; @@ -813,7 +813,7 @@ { xine_cfg_entry_t entry; xine_config_lookup_entry (odk->xine, "gui.video.hue", &entry); - entry.num_value = value; + entry.num_value = value / 655; xine_config_update_entry (odk->xine, &entry); } break; @@ -822,7 +822,7 @@ xine_cfg_entry_t entry; xine_config_lookup_entry (odk->xine, "gui.video.saturation", &entry); - entry.num_value = value; + entry.num_value = value / 655; xine_config_update_entry (odk->xine, &entry); } break; @@ -1038,8 +1038,10 @@ } /* Reset zoom */ - xine_set_param (odk->win->stream, ODK_PARAM_VO_ZOOM_X, 100); - xine_set_param (odk->win->stream, ODK_PARAM_VO_ZOOM_Y, 100); + xine_cfg_entry_t centry; + xine_config_lookup_entry (odk->xine, "gui.video.zoom", ¢ry); + xine_set_param (odk->win->stream, ODK_PARAM_VO_ZOOM_X, centry.num_value); + xine_set_param (odk->win->stream, ODK_PARAM_VO_ZOOM_Y, centry.num_value); /* Reset audio-video and subtitle offset. */ xine_set_param (odk->win->stream, ODK_PARAM_AUDIO_OFFSET, 0); @@ -1126,7 +1128,7 @@ odk_oxine_event_send (odk, &ev); /* Adapt OSD size to new stream. */ - odk_osd_adapt_size (odk); + odk_osd_adapt_size (odk, NULL); if (escaped_mrl) ho_free (escaped_mrl); @@ -1232,7 +1234,7 @@ { odk->win->show (odk->win); odk->win->fullscreen (odk->win, fullscreen); - odk_osd_adapt_size (odk); + odk_osd_adapt_size (odk, NULL); } @@ -1263,7 +1265,7 @@ odk_set_fullscreen (odk_t * odk, bool fullscreen) { odk->win->fullscreen (odk->win, fullscreen); - odk_osd_adapt_size (odk); + odk_osd_adapt_size (odk, NULL); } @@ -1352,6 +1354,51 @@ } +static void +brightness_set (void *user_data, xine_cfg_entry_t * entry) +{ + odk_t *odk = (odk_t *) user_data; + xine_set_param (odk->win->stream, ODK_PARAM_VO_BRIGHTNESS, + entry->num_value * 655); +} + + +static void +contrast_set (void *user_data, xine_cfg_entry_t * entry) +{ + odk_t *odk = (odk_t *) user_data; + xine_set_param (odk->win->stream, ODK_PARAM_VO_CONTRAST, + entry->num_value * 655); +} + + +static void +hue_set (void *user_data, xine_cfg_entry_t * entry) +{ + odk_t *odk = (odk_t *) user_data; + xine_set_param (odk->win->stream, ODK_PARAM_VO_HUE, + entry->num_value * 655); +} + + +static void +saturation_set (void *user_data, xine_cfg_entry_t * entry) +{ + odk_t *odk = (odk_t *) user_data; + xine_set_param (odk->win->stream, ODK_PARAM_VO_SATURATION, + entry->num_value * 655); +} + + +static void +zoom_set (void *user_data, xine_cfg_entry_t * entry) +{ + odk_t *odk = (odk_t *) user_data; + xine_set_param (odk->win->stream, ODK_PARAM_VO_ZOOM_X, entry->num_value); + xine_set_param (odk->win->stream, ODK_PARAM_VO_ZOOM_Y, entry->num_value); +} + + /* * *************************************************************************** * Name: odk_config_register @@ -1375,11 +1422,6 @@ _("encode special characters in MRLs"), _("encode special characters in MRLs"), 10, NULL, NULL); - odk->use_unscaled_osd = - xine_config_register_bool (odk->xine, "gui.use_unscaled_osd", 1, - _("use unscaled OSD if possible"), - _("Use unscaled (full screen resolution) " - "OSD if possible"), 10, NULL, NULL); odk->visual_anim_style = xine_config_register_enum (odk->xine, "visual_anim.anim_style", 0, visual_anims, @@ -1406,14 +1448,19 @@ "if 'visual_anim.style' is set to " "'Stream Animation'"), 10, NULL, NULL); - xine_config_register_num (odk->xine, "gui.video.brightness", -1, - _("Brightness"), NULL, 10, NULL, NULL); - xine_config_register_num (odk->xine, "gui.video.contrast", -1, - _("Contrast"), NULL, 10, NULL, NULL); - xine_config_register_num (odk->xine, "gui.video.hue", -1, - _("Hue"), NULL, 10, NULL, NULL); - xine_config_register_num (odk->xine, "gui.video.saturation", -1, - _("Saturation"), NULL, 10, NULL, NULL); + xine_config_register_range (odk->xine, "gui.video.brightness", + 50, 0, 100, _("Brightness"), + NULL, 10, brightness_set, odk); + xine_config_register_range (odk->xine, "gui.video.contrast", + 50, 0, 100, _("Contrast"), + NULL, 10, contrast_set, odk); + xine_config_register_range (odk->xine, "gui.video.hue", + 50, 0, 100, _("Hue"), NULL, 10, hue_set, odk); + xine_config_register_range (odk->xine, "gui.video.saturation", + 50, 0, 100, _("Saturation"), + NULL, 10, saturation_set, odk); + xine_config_register_range (odk->xine, "gui.video.zoom", 100, 0, 100, + _("Zoom"), NULL, 10, zoom_set, odk); } /* @@ -1498,28 +1545,27 @@ /* Restore old video values. */ xine_config_lookup_entry (xine, "gui.video.brightness", ¢ry); - if (centry.num_value != -1) - xine_set_param (odk->subtitle_stream, ODK_PARAM_VO_BRIGHTNESS, - centry.num_value); + xine_set_param (odk->win->stream, ODK_PARAM_VO_BRIGHTNESS, + centry.num_value * 655); xine_config_lookup_entry (xine, "gui.video.contrast", ¢ry); - if (centry.num_value != -1) - xine_set_param (odk->subtitle_stream, ODK_PARAM_VO_CONTRAST, - centry.num_value); + xine_set_param (odk->win->stream, ODK_PARAM_VO_CONTRAST, + centry.num_value * 655); xine_config_lookup_entry (xine, "gui.video.hue", ¢ry); - if (centry.num_value != -1) - xine_set_param (odk->subtitle_stream, ODK_PARAM_VO_HUE, - centry.num_value); + xine_set_param (odk->win->stream, ODK_PARAM_VO_HUE, + centry.num_value * 655); xine_config_lookup_entry (xine, "gui.video.saturation", ¢ry); - if (centry.num_value != -1) - xine_set_param (odk->subtitle_stream, ODK_PARAM_VO_SATURATION, - centry.num_value); - - /* Initialize OSD stuff. */ - odk_osd_init (odk); + xine_set_param (odk->win->stream, ODK_PARAM_VO_SATURATION, + centry.num_value * 655); + xine_config_lookup_entry (xine, "gui.video.zoom", ¢ry); + xine_set_param (odk->win->stream, ODK_PARAM_VO_ZOOM_X, centry.num_value); + xine_set_param (odk->win->stream, ODK_PARAM_VO_ZOOM_Y, centry.num_value); /* Initialize event handling. */ odk_event_init (odk); + /* Initialize OSD stuff. */ + odk_osd_init (odk); + /* Initialize post plugin stuff. */ odk_post_init (odk); diff -Naur oxine-0.6.orig/src/odk_event.c oxine-0.6.3/src/odk_event.c --- oxine-0.6.orig/src/odk_event.c 2006-10-30 17:32:46.000000000 +0100 +++ oxine-0.6.3/src/odk_event.c 2006-11-19 21:48:45.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: odk_event.c 1434 2006-10-30 14:11:17Z mschwerin $ + * $Id: odk_event.c 1574 2006-11-19 20:48:44Z mschwerin $ * */ @@ -120,14 +120,29 @@ /* * *************************************************************************** - * Name: odk_forward_events_to_xine + * Name: odk_get_forward_events_to_xine + * Access: public + * + * Description: Are events supposed to be forwarded to the xine engine. + * *************************************************************************** + */ +bool +odk_get_forward_events_to_xine (odk_t * odk) +{ + return odk->forward_events_to_xine; +} + + +/* + * *************************************************************************** + * Name: odk_set_forward_events_to_xine * Access: public * * Description: Are events supposed to be forwarded to the xine engine. * *************************************************************************** */ void -odk_forward_events_to_xine (odk_t * odk, bool forward) +odk_set_forward_events_to_xine (odk_t * odk, bool forward) { odk->forward_events_to_xine = forward; } @@ -142,9 +157,9 @@ * *************************************************************************** */ void -odk_xine_event_send (odk_t * odk, int type) +odk_xine_event_send (odk_t * odk, bool force, int type) { - if (!odk->forward_events_to_xine) + if (!odk->forward_events_to_xine && !force) return; xine_event_t ev; @@ -219,8 +234,8 @@ odk_t *odk = (odk_t *) odk_p; switch (event->type) { - case OXINE_EVENT_FRAME_FORMAT_CHANGED: - odk_osd_adapt_size (odk); + case OXINE_EVENT_OUTPUT_FORMAT_CHANGED: + odk_osd_adapt_size (odk, NULL); break; case OXINE_EVENT_BUTTON: case OXINE_EVENT_MOTION: @@ -244,7 +259,7 @@ } /* Scale x and y to video size. */ - if (!odk->use_unscaled_osd || !odk->is_unscaled_osd_available) { + if (!odk->is_unscaled_osd_available) { int vx = event->data.pos.x; int vy = event->data.pos.y; scale_mouse_position (odk, &vx, &vy); @@ -331,7 +346,11 @@ odk_t *odk = (odk_t *) odk_p; switch (xine_event->type) { - case OXINE_EVENT_PLAYBACK_FINISHED: + case XINE_EVENT_FRAME_FORMAT_CHANGE: + odk_osd_adapt_size (odk, (xine_format_change_data_t *) + xine_event->data); + break; + case XINE_EVENT_UI_PLAYBACK_FINISHED: if (odk->current_mode == ODK_MODE_NULL) return; if (odk->current_mode == ODK_MODE_LOGO) @@ -383,7 +402,7 @@ } } break; - case OXINE_EVENT_CHANNELS_CHANGED: + case XINE_EVENT_UI_CHANNELS_CHANGED: /* If current mode is still ODK_MODE_NULL we ignore this event, as * we're going to send a OXINE_EVENT_PLAYBACK_STARTED event after * setting the new mode in odk_mutexed_play anyway. */ diff -Naur oxine-0.6.orig/src/odk_event.h oxine-0.6.3/src/odk_event.h --- oxine-0.6.orig/src/odk_event.h 2006-10-12 12:51:43.000000000 +0200 +++ oxine-0.6.3/src/odk_event.h 2006-11-15 13:26:21.000000000 +0100 @@ -46,9 +46,10 @@ void odk_del_event_handler (odk_t * odk, event_handler_t eh); void odk_oxine_event_send (odk_t * odk, oxine_event_t * event); -void odk_xine_event_send (odk_t * odk, int type); +void odk_xine_event_send (odk_t * odk, bool force, int type); -void odk_forward_events_to_xine (odk_t * odk, bool forward); +bool odk_get_forward_events_to_xine (odk_t * odk); +void odk_set_forward_events_to_xine (odk_t * odk, bool forward); #ifdef __cplusplus } diff -Naur oxine-0.6.orig/src/odk_osd.c oxine-0.6.3/src/odk_osd.c --- oxine-0.6.orig/src/odk_osd.c 2006-10-27 23:34:32.000000000 +0200 +++ oxine-0.6.3/src/odk_osd.c 2006-11-19 21:48:45.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: odk_osd.c 1410 2006-10-21 14:19:43Z mschwerin $ + * $Id: odk_osd.c 1574 2006-11-19 20:48:44Z mschwerin $ * * This file is part of the odk system. * @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -42,9 +43,33 @@ #include "logger.h" #include "odk_private.h" + +#ifdef DEBUG +#define VALIDATE_POINT(x,y) { \ + assert (x >= 0); \ + assert (y >= 0); \ + assert (x < odk->osd.width); \ + assert (y < odk->osd.height); \ +} +#else +#define VALIDATE_POINT(x,y) { \ + if (x < 0) \ + return; \ + if (y < 0) \ + return; \ + if (x >= odk->osd.width) \ + return; \ + if (y >= odk->osd.height) \ + return; \ +} +#endif + +#define MIN(a,b) (a < b ? a : b) +#define MAX(a,b) (a > b ? a : b) + /* * *************************************************************************** - * Name: odk_osd_show + * Name: odk_osd_show_osd * Access: public * * Description: Shows the passed OSD. @@ -53,7 +78,7 @@ static void odk_osd_show_osd (odk_t * odk, xine_osd_t * osd) { - if (odk->use_unscaled_osd && odk->is_unscaled_osd_available) + if (odk->is_unscaled_osd_available) xine_osd_show_unscaled (osd, 0); else xine_osd_show (osd, 0); @@ -1243,8 +1268,12 @@ //int pw = (int) ((double) w * odk->hscale); //int ph = (int) ((double) h * odk->osd.vscale); - int px = (int) ((double) x * odk->osd.hscale) - w / 2; - int py = (int) ((double) y * odk->osd.vscale) - h / 2; + int px = round ((double) x * odk->osd.hscale) - w / 2; + int py = round ((double) y * odk->osd.vscale) - h / 2; + + VALIDATE_POINT (px, py); + VALIDATE_POINT (px - w / 2, py - h / 2); + VALIDATE_POINT (px + w / 2, py + h / 2); // TODO: scale bitmap /* @@ -1277,13 +1306,19 @@ if (!(odk->osd.hscale && odk->osd.vscale)) return; - int px1 = (int) ((double) x1 * odk->osd.hscale); - int py1 = (int) ((double) y1 * odk->osd.vscale); - int px2 = (int) ((double) x2 * odk->osd.hscale); - int py2 = (int) ((double) y2 * odk->osd.vscale); + int px1 = round ((double) x1 * odk->osd.hscale); + int py1 = round ((double) y1 * odk->osd.vscale); + int px2 = round ((double) x2 * odk->osd.hscale); + int py2 = round ((double) y2 * odk->osd.vscale); + + VALIDATE_POINT (px1, py1); + VALIDATE_POINT (px2, py2); xine_osd_draw_line (odk->osd.x_osd, px1, py1, px2, py2, XINE_OSD_TEXT1 + color); + + xine_osd_draw_point (odk->osd.x_osd, px1, py1, XINE_OSD_TEXT1 + color); + xine_osd_draw_point (odk->osd.x_osd, px2, py2, XINE_OSD_TEXT1 + color); } @@ -1302,10 +1337,13 @@ if (!(odk->osd.hscale && odk->osd.vscale)) return; - int px1 = (int) ((double) x1 * odk->osd.hscale); - int py1 = (int) ((double) y1 * odk->osd.vscale); - int px2 = (int) ((double) x2 * odk->osd.hscale); - int py2 = (int) ((double) y2 * odk->osd.vscale); + int px1 = round ((double) x1 * odk->osd.hscale); + int py1 = round ((double) y1 * odk->osd.vscale); + int px2 = round ((double) x2 * odk->osd.hscale); + int py2 = round ((double) y2 * odk->osd.vscale); + + VALIDATE_POINT (px1, py1); + VALIDATE_POINT (px2, py2); // FIXME: This is a hack! We draw a point to the bottom righthand corner. // This is necessary, because the bottom line of a non-filled rectangle is @@ -1317,11 +1355,11 @@ } // FIXME: xine-lib does not draw the point at the lower right hand corner // of an unfilled rectangle. - if (!filled) { - xine_osd_draw_point (odk->osd.x_osd, px2, py2, - XINE_OSD_TEXT1 + color); - } + xine_osd_draw_point (odk->osd.x_osd, px2, py2, XINE_OSD_TEXT1 + color); + xine_osd_draw_rect (odk->osd.x_osd, px1, py1, px2, py2, + XINE_OSD_TEXT1 + color, false); + // FIXME: xine-lib does not draw the correct width of a filled rectangle. xine_osd_draw_rect (odk->osd.x_osd, px1, py1, px2, py2, XINE_OSD_TEXT1 + color, filled); } @@ -1342,11 +1380,9 @@ if (!(odk->osd.hscale && odk->osd.vscale)) return; -#ifdef DEBUG_TEXT_DRAWING int pw = 0; int pd = 0; int ph = 0; -#endif { int w; int h1; @@ -1374,10 +1410,8 @@ y -= h; } -#ifdef DEBUG_TEXT_DRAWING - pd = (int) ((double) (h2 - h1) * odk->osd.vscale); - ph = (int) ((double) h * odk->osd.vscale); -#endif + pd = round ((double) (h2 - h1) * odk->osd.vscale); + ph = round ((double) h * odk->osd.vscale); } { int w; @@ -1391,13 +1425,14 @@ if (alignment & ODK_ALIGN_RIGHT) x -= w; -#ifdef DEBUG_TEXT_DRAWING - pw = (int) ((double) w * odk->osd.hscale); -#endif + pw = round ((double) w * odk->osd.hscale); } - int px = (int) ((double) x * odk->osd.hscale); - int py = (int) ((double) y * odk->osd.vscale); + int px = round ((double) x * odk->osd.hscale); + int py = round ((double) y * odk->osd.vscale); + + VALIDATE_POINT (px, py); + VALIDATE_POINT (px + pw, py + ph); xine_osd_draw_text (odk->osd.x_osd, px, py, text, color_base); @@ -1494,41 +1529,50 @@ /* * *************************************************************************** - * Name: odk_get_output_size - * Access: private - * - * Description: Returns width and height of the output window. - * *************************************************************************** - */ -void -odk_get_output_size (odk_t * odk, int *width, int *height) -{ - *width = odk->win->output_width; - *height = odk->win->output_height; -} - - -/* - * *************************************************************************** * Name: adapt_osd_size * Access: private * - * Description: Adapt the OSD to the current output size. + * Description: Adapt the OSD to the current output size. Whenever the + * size of the current video is equal to that of the OSD we + * do not use unscaled OSD so that we can use transparency. * *************************************************************************** */ void -odk_osd_adapt_size (odk_t * odk) +odk_osd_adapt_size (odk_t * odk, xine_format_change_data_t * fcd) { int x_off = 0; int y_off = 0; int width = 0; int height = 0; - /* Get the size of the output area that the OSD can use. */ - if (odk->use_unscaled_osd && odk->is_unscaled_osd_available) - odk_get_output_size (odk, &width, &height); - else + /* If the size of the current frame is not equal to that of our OSD and if + * unscaled OSD is available, we use unscaled OSD. */ + if (odk->is_unscaled_osd_available) { + width = odk->win->output_width; + height = odk->win->output_height; + } + /* If we got XINE_EVENT_FRAME_FORMAT_CHANGE we can use the data provided + * by this event. */ + else if (fcd) { + width = fcd->width; + height = fcd->height; + } + /* Else we've got to get the data all by ourselves. */ + else { odk_get_frame_size (odk, &width, &height); + } + + /* Adjust the OSD size to the current zoom level. */ + xine_cfg_entry_t centry; + xine_config_lookup_entry (odk->xine, "gui.video.zoom", ¢ry); + if (centry.num_value < 100) { + int w = width; + int h = height; + width = (width * centry.num_value) / 100; + height = (height * centry.num_value) / 100; + x_off = (w - width) / 2; + y_off = (h - height) / 2; + } /* Correct height and width to the OSD aspect ratio. */ double osd_aspect = (double) OSD_WIDTH / (double) OSD_HEIGHT; @@ -1536,11 +1580,11 @@ if (osd_aspect > output_aspect) { int real_height = height; height = width * OSD_HEIGHT / OSD_WIDTH; - y_off = (real_height - height) / 2; + y_off += (real_height - height) / 2; } else if (osd_aspect < output_aspect) { int real_width = width; width = height * OSD_WIDTH / OSD_HEIGHT; - x_off = (real_width - width) / 2; + x_off += (real_width - width) / 2; } if (!odk->osd.x_osd || (odk->osd.x_off != x_off) @@ -1620,6 +1664,12 @@ } #endif } + + /* We send an event to notify any listeners that the format of the OSD has + * changed. */ + oxine_event_t ev; + ev.type = OXINE_EVENT_OSD_FORMAT_CHANGED; + odk_oxine_event_send (odk, &ev); } @@ -1679,7 +1729,7 @@ #endif /* Adapt size of OSD to current window/ output size. */ - odk_osd_adapt_size (odk); + odk_osd_adapt_size (odk, NULL); } diff -Naur oxine-0.6.orig/src/odk_private.h oxine-0.6.3/src/odk_private.h --- oxine-0.6.orig/src/odk_private.h 2006-10-30 17:32:46.000000000 +0100 +++ oxine-0.6.3/src/odk_private.h 2006-11-19 21:48:45.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: odk_private.h 1434 2006-10-30 14:11:17Z mschwerin $ + * $Id: odk_private.h 1574 2006-11-19 20:48:44Z mschwerin $ * * *************************************************************************** * This file contains private types and methods used inside the odk system. @@ -188,7 +188,6 @@ #endif /* Configuration */ - bool use_unscaled_osd; int visual_anim_style; int aspect_ratio; int encode_mrls; @@ -238,10 +237,9 @@ void odk_osd_init (odk_t * odk); void odk_osd_free (odk_t * odk); -void odk_get_output_size (odk_t * odk, int *width, int *height); void odk_get_frame_size (odk_t * odk, int *w, int *h); -void odk_osd_adapt_size (odk_t * odk); +void odk_osd_adapt_size (odk_t * odk, xine_format_change_data_t *fcd); /* Event handling */ void odk_event_init (odk_t * odk); diff -Naur oxine-0.6.orig/src/odk_x11.c oxine-0.6.3/src/odk_x11.c --- oxine-0.6.orig/src/odk_x11.c 2006-10-21 16:19:50.000000000 +0200 +++ oxine-0.6.3/src/odk_x11.c 2006-11-19 18:54:56.000000000 +0100 @@ -21,7 +21,7 @@ * * Thanks goes to Florian Echtler for adding Xinerama support. * - * $Id: odk_x11.c 1410 2006-10-21 14:19:43Z mschwerin $ + * $Id: odk_x11.c 1571 2006-11-19 17:54:55Z mschwerin $ * */ @@ -85,8 +85,8 @@ /* The output window. */ Window window; + /* The pixel aspect ratio of the monitor. */ double monitor_pixel_aspect; - double fullscreen_underscan; /* The real width and height of the display. */ int display_width; @@ -651,16 +651,6 @@ win->window_xpos = 0; win->window_ypos = 0; } - - /* Set size and position of the output area inside the window. */ - win->window_class.output_width = - win->fullscreen_underscan * win->window_width; - win->window_class.output_height = - win->fullscreen_underscan * win->window_height; - win->window_class.output_xpos = - (win->window_width - win->window_class.output_width) / 2; - win->window_class.output_ypos = - (win->window_height - win->window_class.output_height) / 2; } else { @@ -669,13 +659,13 @@ win->window_height = win->saved_height; win->window_xpos = win->saved_xpos; win->window_ypos = win->saved_ypos; + } /* Set size and position of the output area inside the window. */ win->window_class.output_width = win->window_width; win->window_class.output_height = win->window_height; win->window_class.output_xpos = 0; win->window_class.output_ypos = 0; - } /* Go to fullscreen the modern (e.g. metacity) way. */ wm_set_ewmh_state (win, XA_NET_WM_STATE_FULLSCREEN, want_fullscreen); @@ -764,7 +754,7 @@ win->window_class.output_height = win->window_height; oxine_event_t ev; - ev.type = OXINE_EVENT_FRAME_FORMAT_CHANGED; + ev.type = OXINE_EVENT_OUTPUT_FORMAT_CHANGED; win->event_handler (win->event_handler_data, &ev); } } @@ -999,8 +989,6 @@ int window_height = centry.num_value; xine_config_lookup_entry (xine, "gui.x11.monitor_pixel_aspect", ¢ry); double monitor_pixel_aspect = (double) centry.num_value / (double) 100; - xine_config_lookup_entry (xine, "gui.x11.fullscreen_underscan", ¢ry); - win->fullscreen_underscan = (double) centry.num_value / (double) 100; xine_config_lookup_entry (xine, "gui.x11.xinerama_screen", ¢ry); win->xinerama_screen = centry.num_value; diff -Naur oxine-0.6.orig/src/otk.c oxine-0.6.3/src/otk.c --- oxine-0.6.orig/src/otk.c 2006-11-02 20:32:56.000000000 +0100 +++ oxine-0.6.3/src/otk.c 2006-11-19 18:54:56.000000000 +0100 @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: otk.c 1441 2006-11-02 19:32:15Z mschwerin $ + * $Id: otk.c 1571 2006-11-19 17:54:55Z mschwerin $ * * The scrollbar code was backported from the xine-ui CVS and was originally * written by Miguel Freitas. @@ -955,8 +955,8 @@ int background_color = color_base + OSD_TEXT_PALETTE_BACKGROUND; int foreground_color = color_base + OSD_TEXT_PALETTE_FOREGROUND; - odk_draw_rect (this->odk, this->x, this->y, - this->x + this->w, this->y + this->h, background_color, 1); + odk_draw_rect (this->odk, this->x, this->y, this->x + this->w, + this->y + this->h, background_color, true); if (button->text) { odk_osd_set_font (this->odk, this->font, this->fontsize); @@ -1116,15 +1116,35 @@ return; int value = 0; - if (slider->get_value_cb) + if (slider->get_value_cb) { value = slider->get_value_cb (slider->get_value_cb_data); - if (value < 0) + } else { + value = slider->last_value; + } + + /* We may get wrong values here sometimes. This is why we always save the + * last valid value to reuse in such a case. */ + if (value < slider->min_value) { + debug ("value is outside of valid range (%d-%d): %d", + slider->min_value, slider->max_value, value); value = slider->last_value; + } else if (value > slider->max_value) { + debug ("value is outside of valid range (%d-%d): %d", + slider->min_value, slider->max_value, value); + value = slider->last_value; + } slider->last_value = value; int max = slider->max_value - slider->min_value; int val = value - slider->min_value; - int perc_value = round ((double) val / ((double) (max) / 100.0)); + int perc_value = round ((double) val / ((double) max / 100.0)); + + /* Just to make sure we don't try to draw anything outside the displayable + * range. */ + if (perc_value < 0) + perc_value = 0; + else if (perc_value > 100) + perc_value = 100; odk_draw_rect (this->odk, this->x, this->y, this->x + this->w, this->y + this->h, @@ -1394,33 +1414,36 @@ if (!is_correct_widget (this, OTK_WIDGET_CHECKBOX)) return; - odk_draw_rect (this->odk, this->x, this->y, - this->x + this->w, this->y + this->h, - this->otk->textpalette_button[this->is_focused] + - OSD_TEXT_PALETTE_BACKGROUND, 1); - - odk_draw_rect (this->odk, this->x, this->y, this->x + this->w - 1, - this->y + this->h - 1, - this->otk->textpalette_button[0] + - OSD_TEXT_PALETTE_FOREGROUND, 0); + if (this->is_focused) { + odk_draw_rect (this->odk, this->x, this->y, + this->x + this->w, this->y + this->h, + this->otk->textpalette_button[this->is_focused] + + OSD_TEXT_PALETTE_BACKGROUND, true); + } + { + odk_draw_rect (this->odk, this->x, this->y, + this->x + this->w, this->y + this->h, + this->otk->textpalette_button[this->is_focused] + + OSD_TEXT_PALETTE_FOREGROUND, false); + } if (checkbox->is_checked) { uint8_t palette_map[2]; - palette_map[0] = - this->otk->textpalette_button[this->is_focused] + - OSD_TEXT_PALETTE_BACKGROUND; - palette_map[1] = - this->otk->textpalette_button[0] + OSD_TEXT_PALETTE_FOREGROUND; + palette_map[0] = 0; + palette_map[1] = 0; + + if (this->is_focused) { + palette_map[0] = this->otk->textpalette_button[this->is_focused] + + OSD_TEXT_PALETTE_BACKGROUND; + } + { + palette_map[1] = this->otk->textpalette_button[this->is_focused] + + OSD_TEXT_PALETTE_FOREGROUND; + } odk_draw_bitmap (this->odk, checkbox->bitmap, this->x + this->w / 2, this->y + this->h / 2, 20, 20, palette_map); - /* - odk_draw_text (this->odk, this->x + this->w / 2, - this->y + this->w / 2, - "X", ODK_ALIGN_CENTER | ODK_ALIGN_VCENTER, - this->otk->textpalette_button[1]); - */ } } @@ -1473,7 +1496,7 @@ odk_draw_rect (this->odk, this->x, this->y, this->x + this->w, this->y + this->h, this->otk->textpalette_button[this->is_focused] + - OSD_TEXT_PALETTE_BACKGROUND, 1); + OSD_TEXT_PALETTE_BACKGROUND, true); int top_y = this->y + 2; top_y += (scrollbar->position * (this->h - 4)) / 100; @@ -1484,7 +1507,7 @@ odk_draw_rect (this->odk, this->x + 5, top_y, this->x + this->w - 5, bot_y, this->otk->textpalette_button[this->is_focused] + - OSD_TEXT_PALETTE_FOREGROUND, 1); + OSD_TEXT_PALETTE_FOREGROUND, true); } otk_widget_t * @@ -1557,7 +1580,7 @@ odk_draw_rect (this->odk, this->x, this->y, this->x + this->w, this->y + this->h, this->otk->textpalette_label + OSD_TEXT_PALETTE_FOREGROUND, - 0); + false); } @@ -1678,7 +1701,7 @@ if (background_color) { odk_draw_rect (this->odk, this->x, this->y, this->x + this->w, this->y + this->h, - background_color, 1); + background_color, true); } if (listentry->text) { @@ -1843,7 +1866,7 @@ otk_listentry_t *entry = l_list_first (list->entries); while (entry) { if (entry->is_selected) { - selected_entries[counter++] = entry->activate_cb_data; + selected_entries[counter++] = entry->select_cb_data; } entry = l_list_next (list->entries, entry); } @@ -2494,10 +2517,10 @@ if (this->is_focused) odk_draw_rect (this->odk, this->x, this->y, this->x + this->w, - this->y + this->h, background_color, 1); + this->y + this->h, background_color, true); - odk_draw_rect (this->odk, this->x, this->y, this->x + this->w - 1, - this->y + this->h - 1, foreground_color, 0); + odk_draw_rect (this->odk, this->x, this->y, this->x + this->w, + this->y + this->h, foreground_color, false); odk_osd_set_font (this->odk, this->font, this->fontsize); odk_draw_text (this->odk, this->x + 5, this->y + (this->h / 2), @@ -2693,14 +2716,14 @@ window->widget.x + window->widget.w, window->widget.y + window->widget.h, this->otk->textpalette_label + - OSD_TEXT_PALETTE_BACKGROUND, 1); + OSD_TEXT_PALETTE_BACKGROUND, true); } else if (!window->fill && window->show_border) { odk_draw_rect (this->odk, window->widget.x, window->widget.y, window->widget.x + window->widget.w, window->widget.y + window->widget.h, this->otk->textpalette_button[0] + - OSD_TEXT_PALETTE_TRANSPARENT, 0); + OSD_TEXT_PALETTE_TRANSPARENT, false); } if (window->show_border) { @@ -2708,7 +2731,7 @@ window->widget.x + window->widget.w - 1, window->widget.y + window->widget.h - 1, this->otk->textpalette_label + - OSD_TEXT_PALETTE_FOREGROUND, 0); + OSD_TEXT_PALETTE_FOREGROUND, false); } otk_widget_t *widget = l_list_first (window->subs); @@ -2926,7 +2949,7 @@ return; switch (ev->source.button) { - case OXINE_BUTTON1: // left button + case OXINE_BUTTON1: // left button if (is_correct_widget (widget, OTK_WIDGET_BUTTON)) { otk_button_t *button = (otk_button_t *) widget; @@ -2943,17 +2966,25 @@ otk_slider_t *slider = (otk_slider_t *) widget; if (slider->set_value_cb) { - int perc_value = 0; + double p = 0; if (slider->direction == OTK_SLIDER_HORIZONTAL) { - perc_value = - ((ev->data.pos.x - widget->x) * 100) / widget->w; + int b = (widget->h - slider->marker_h) / 2; + int w = (widget->w - 2 * b); + int x = (widget->x + b); + p = ((ev->data.pos.x - x) * 100) / w; } else if (slider->direction == OTK_SLIDER_VERTICAL) { - perc_value = - ((ev->data.pos.y - widget->y) * 100) / widget->h; - perc_value = 100 - perc_value; + int b = (widget->w - slider->marker_w) / 2; + int h = (widget->h - 2 * b); + int y = (widget->y + b); + p = ((ev->data.pos.y - y) * 100) / h; + p = 100 - p; } int max = slider->max_value - slider->min_value; - int value = (perc_value * max / 100) + slider->min_value; + int value = (p * max / 100) + slider->min_value; + if (value > slider->max_value) + value = slider->max_value; + if (value < slider->min_value) + value = slider->min_value; slider->set_value_cb (slider->set_value_cb_data, value); } } @@ -3002,7 +3033,7 @@ } break; - case OXINE_BUTTON4: // scrollwheel down + case OXINE_BUTTON4: // scrollwheel down if (is_correct_widget (widget, OTK_WIDGET_LISTENTRY)) { otk_listentry_t *entry = (otk_listentry_t *) widget; otk_list_t *list = entry->list; @@ -3032,7 +3063,7 @@ } break; - case OXINE_BUTTON5: // scrollwheel up + case OXINE_BUTTON5: // scrollwheel up if (is_correct_widget (widget, OTK_WIDGET_LISTENTRY)) { otk_listentry_t *entry = (otk_listentry_t *) widget; otk_list_t *list = entry->list; @@ -3302,6 +3333,7 @@ otk_checkbox_t *checkbox = (otk_checkbox_t *) cur_widget; checkbox->is_checked = (checkbox->is_checked + 1) % 2; + checkbox->widget.need_repaint = true; if (checkbox->cb) { checkbox->cb (checkbox->cb_data); @@ -3359,7 +3391,7 @@ case OXINE_EVENT_BUTTON: button_handler (otk, ev); break; - case OXINE_EVENT_FRAME_FORMAT_CHANGED: + case OXINE_EVENT_OSD_FORMAT_CHANGED: otk_draw (otk); break; default: @@ -3399,11 +3431,16 @@ void otk_clear (otk_t * otk) { + mutex_lock (&otk->draw_mutex); + if (otk->window && !otk->window->keep) window_destroy ((otk_widget_t *) otk->window); otk->window = NULL; + odk_osd_clear (otk->odk); odk_osd_hide (otk->odk); + + mutex_unlock (&otk->draw_mutex); } void @@ -3656,36 +3693,36 @@ uint32_t c[3]; /* define the palette for a non-focused button */ - c[0] = 0xffffff; // foreground - c[1] = 0x2a569d; // background - c[2] = 0xffffff; // border + c[0] = 0xffffff; // foreground + c[1] = 0x2a569d; // background + c[2] = 0xffffff; // border otk->textpalette_button[0] = odk_osd_alloc_text_palette (odk, c[0], 0xf, c[1], 0xf, c[2], 0xf); /* define the palette for a focused button */ - c[0] = 0xffffff; // foreground - c[1] = 0x5175b0; // background - c[2] = 0xffffff; // border + c[0] = 0xffffff; // foreground + c[1] = 0x5175b0; // background + c[2] = 0xffffff; // border otk->textpalette_button[1] = odk_osd_alloc_text_palette (odk, c[0], 0xf, c[1], 0xf, c[2], 0xf); /* define the palette for a disabled button */ - c[0] = 0x5175b0; // foreground - c[1] = 0x2a569d; // background - c[2] = 0x5175b0; // border + c[0] = 0x5175b0; // foreground + c[1] = 0x2a569d; // background + c[2] = 0x5175b0; // border otk->textpalette_button[2] = odk_osd_alloc_text_palette (odk, c[0], 0xf, c[1], 0xf, c[2], 0xf); /* define the palette for a label */ - c[0] = 0xffffff; // foreground - c[1] = 0x5175b0; // background - c[2] = 0xffffff; // border + c[0] = 0xffffff; // foreground + c[1] = 0x5175b0; // background + c[2] = 0xffffff; // border otk->textpalette_label = odk_osd_alloc_text_palette (odk, c[0], 0xf, c[1], 0xf, diff -Naur oxine-0.6.orig/src/oxine.c oxine-0.6.3/src/oxine.c --- oxine-0.6.orig/src/oxine.c 2006-10-30 17:32:46.000000000 +0100 +++ oxine-0.6.3/src/oxine.c 2006-11-19 18:54:56.000000000 +0100 @@ -20,7 +20,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: oxine.c 1434 2006-10-30 14:11:17Z mschwerin $ + * $Id: oxine.c 1571 2006-11-19 17:54:55Z mschwerin $ * */ @@ -68,6 +68,9 @@ #ifdef HAVE_JOYSTICK "J" #endif +#ifdef HAVE_WEATHER + "W" +#endif #ifdef HAVE_XINERAMA "X" #endif @@ -92,6 +95,9 @@ #ifdef HAVE_XINERAMA {"xineramascreen", required_argument, 0, 'X'}, #endif +#ifdef HAVE_WEATHER + {"no-weather", no_argument, 0, 'W'}, +#endif {"verbose", optional_argument, 0, OPTION_VERBOSE}, {0, no_argument, 0, 0} }; @@ -155,6 +161,10 @@ printf (_(" -J, --no-joystick " "Do not use joystick support.\n")); #endif +#ifdef HAVE_WEATHER + printf (_(" -W, --no-weather " + "Do not automaticaly retrieve weather information.\n")); +#endif printf ("\n"); printf (_("Examples for valid MRLs (media resource locator):\n" " File: 'path/foo.vob'\n" @@ -185,18 +195,11 @@ _("audio driver to use"), 10, NULL, NULL); /* GUI */ - xine_config_register_num (oxine->xine, - "gui.x11.fullscreen.xinerama_screen", 0, + xine_config_register_num (oxine->xine, "gui.x11.xinerama_screen", 0, _("Xinerama screen for fullscreen window"), _("Xinerama screen for fullscreen window"), 10, NULL, NULL); - xine_config_register_range (oxine->xine, "gui.x11.fullscreen_underscan", - 100, 0, 100, - _("percentage of fullscreen screen to use"), - _("percentage of fullscreen screen to use"), - 10, NULL, NULL); - xine_config_register_num (oxine->xine, "gui.x11.window_width", OSD_WIDTH, _("non-fullscreen window width"), _("The width of the non-fullscreen window"), 10, @@ -314,6 +317,9 @@ #ifdef HAVE_DISC_POLLING bool use_polling = true; #endif +#ifdef HAVE_WEATHER + bool use_weather = true; +#endif #ifdef DEBUG char *codeset = get_system_encoding (); @@ -391,6 +397,11 @@ use_joystick = false; break; #endif +#ifdef HAVE_WEATHER + case 'W': + use_weather = false; + break; +#endif case 'v': printf (_("This is %s - A free Video-Player v%s\n"), PACKAGE_NAME, PACKAGE_VERSION); @@ -585,7 +596,8 @@ #ifdef HAVE_WEATHER /* Start the weather thread. */ - start_weather_thread (oxine); + if (use_weather) + start_weather_thread (oxine); #endif /* Start the event loop. */ diff -Naur oxine-0.6.orig/src/playback_menu.c oxine-0.6.3/src/playback_menu.c --- oxine-0.6.orig/src/playback_menu.c 2006-10-27 23:34:32.000000000 +0200 +++ oxine-0.6.3/src/playback_menu.c 2006-11-19 18:54:56.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: playback_menu.c 1406 2006-10-21 12:25:25Z mschwerin $ + * $Id: playback_menu.c 1571 2006-11-19 17:54:55Z mschwerin $ * */ #include "config.h" @@ -55,7 +55,6 @@ static int playback_menu_show_volume = 0; static void show_playback_menu_gui (void *oxine_p); -static void show_playback_settings_p2_cb (void *oxine_p); /* * ************************************************************************** @@ -92,6 +91,24 @@ static int +zoom_set (void *oxine_p, int value) +{ + oxine_t *oxine = (oxine_t *) oxine_p; + odk_set_stream_param (oxine->odk, ODK_PARAM_VO_ZOOM_X, value); + odk_set_stream_param (oxine->odk, ODK_PARAM_VO_ZOOM_Y, value); + return value; +} + + +static int +zoom_get (void *oxine_p) +{ + oxine_t *oxine = (oxine_t *) oxine_p; + return odk_get_stream_param (oxine->odk, ODK_PARAM_VO_ZOOM_Y); +} + + +static int audio_channel_change (void *oxine_p, int pos) { oxine_t *oxine = (oxine_t *) oxine_p; @@ -336,7 +353,7 @@ show_stream_param_slider (oxine_t * oxine, odk_stream_param_t param, otk_int_get_cb_t get_cb, otk_int_set_cb_t set_cb, - int with_reset_button, int default_value, + bool with_reset_button, int default_value, int min_value, int max_value, int min_step, int y) { otk_widget_t *w; @@ -351,7 +368,7 @@ OTK_SLIDER_HORIZONTAL, "%d%%", 1, with_reset_button, default_value, min_value, max_value, min_step, get_cb, oxine, set_cb, oxine); - otk_widget_set_update (w, 1); + otk_widget_set_update (w, true); } @@ -391,7 +408,7 @@ if (event->source.key != OXINE_KEY_BACK) return; - if ((oxine->current_menu == show_playback_settings_cb) + if ((oxine->current_menu == show_playback_settings_p1_cb) || (oxine->current_menu == show_playback_settings_p2_cb)) { show_playback_menu_gui (oxine); event->source.key = OXINE_KEY_NULL; @@ -399,7 +416,7 @@ } -static void +void show_playback_settings_p2_cb (void *oxine_p) { oxine_t *oxine = (oxine_t *) oxine_p; @@ -471,7 +488,7 @@ otk_widget_t *b; b = otk_text_button_new (oxine->otk, 20, 545, 180, 35, _("Next Page"), - show_playback_settings_cb, oxine); + show_playback_settings_p1_cb, oxine); otk_widget_set_alignment (b, OTK_ALIGN_CENTER); otk_widget_set_focus (b); b = otk_text_button_new (oxine->otk, 210, 545, 180, 35, _("Back"), @@ -483,11 +500,11 @@ void -show_playback_settings_cb (void *oxine_p) +show_playback_settings_p1_cb (void *oxine_p) { oxine_t *oxine = (oxine_t *) oxine_p; - if (oxine->backto_menu == show_playback_settings_cb) + if (oxine->backto_menu == show_playback_settings_p1_cb) return; playback_menu_focus_buttons = B_FOCUS_PARAM; @@ -495,8 +512,8 @@ hide_user_interface (oxine); create_new_window (false, true); - oxine->backto_menu = show_playback_settings_cb; - oxine->current_menu = show_playback_settings_cb; + oxine->backto_menu = show_playback_settings_p1_cb; + oxine->current_menu = show_playback_settings_p1_cb; odk_add_event_handler (oxine->odk, stream_parameter_menu_event_handler, oxine, EVENT_HANDLER_PRIORITY_NORMAL); @@ -505,22 +522,27 @@ // Volume otk_widget_t *b; show_stream_param_slider (oxine, ODK_PARAM_AUDIO_VOLUME, - volume_get, volume_set, 1, 50, 0, 100, 5, y); + volume_get, volume_set, + true, 100, 0, 100, 5, y); y += 50; show_stream_param_slider (oxine, ODK_PARAM_VO_BRIGHTNESS, brightness_get, brightness_set, - 1, 32896, 0, 65535, 500, y); + true, 32896, 0, 65535, 656, y); y += 50; show_stream_param_slider (oxine, ODK_PARAM_VO_CONTRAST, contrast_get, contrast_set, - 1, 32896, 0, 65535, 500, y); + true, 32896, 0, 65535, 656, y); y += 50; show_stream_param_slider (oxine, ODK_PARAM_VO_SATURATION, saturation_get, saturation_set, - 1, 32896, 0, 65535, 500, y); + true, 32896, 0, 65535, 656, y); y += 50; show_stream_param_slider (oxine, ODK_PARAM_VO_HUE, - hue_get, hue_set, 1, 32896, 0, 65535, 500, y); + hue_get, hue_set, + true, 32896, 0, 65535, 656, y); + y += 50; + show_stream_param_slider (oxine, ODK_PARAM_VO_ZOOM_X, + zoom_get, zoom_set, true, 100, 0, 100, 1, y); y += 50; if (odk_get_stream_info (oxine->odk, ODK_STREAM_INFO_HAS_VIDEO)) { @@ -780,16 +802,17 @@ l = otk_label_new (oxine->otk, x2, y, w2, al, "0:00:00"); set_time_total_string (oxine, l); otk_label_set_upcall (l, set_time_total_string, oxine); - otk_widget_set_update (l, 1); + otk_widget_set_update (l, true); + y += 40; } { - y += 40; l = otk_label_new (oxine->otk, x1, y, w1, ar, _("Elapsed:")); l = otk_label_new (oxine->otk, x2, y, w2, al, "0:00:00"); set_time_gone_string (oxine, l); otk_label_set_upcall (l, set_time_gone_string, oxine); - otk_widget_set_update (l, 1); + otk_widget_set_update (l, true); + y += 40; } ho_free (title); @@ -920,7 +943,7 @@ false, false, 0, 0, 100, 1, get_stream_progress, oxine, set_stream_progress, oxine); - otk_widget_set_update (b, 1); + otk_widget_set_update (b, true); } /* @@ -960,7 +983,7 @@ OTK_SLIDER_VERTICAL, NULL, true, false, 0, 0, 100, 5, volume_get, oxine, volume_set, oxine); - otk_widget_set_update (b, 1); + otk_widget_set_update (b, true); } } @@ -1033,7 +1056,7 @@ { b = otk_text_button_new (oxine->otk, x, y, 180, 35, _("Settings"), - show_playback_settings_cb, oxine); + show_playback_settings_p1_cb, oxine); if (playback_menu_focus_buttons == B_FOCUS_PARAM) otk_widget_set_focus (b); y += 40; diff -Naur oxine-0.6.orig/src/playback_menu.h oxine-0.6.3/src/playback_menu.h --- oxine-0.6.orig/src/playback_menu.h 2006-10-12 12:51:43.000000000 +0200 +++ oxine-0.6.3/src/playback_menu.h 2006-11-15 13:26:21.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: playback_menu.h 1313 2006-10-12 09:00:38Z mschwerin $ + * $Id: playback_menu.h 1549 2006-11-15 08:21:15Z mschwerin $ * */ @@ -31,7 +31,8 @@ void show_playback_menu_cb (void *oxine_p); void show_playback_info_cb (void *oxine_p); void show_playback_controls_cb (void *oxine_p); -void show_playback_settings_cb (void *oxine_p); +void show_playback_settings_p1_cb (void *oxine_p); +void show_playback_settings_p2_cb (void *oxine_p); #ifdef __cplusplus } diff -Naur oxine-0.6.orig/src/playlist_menu.c oxine-0.6.3/src/playlist_menu.c --- oxine-0.6.orig/src/playlist_menu.c 2006-11-02 20:33:13.000000000 +0100 +++ oxine-0.6.3/src/playlist_menu.c 2006-11-13 18:40:28.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: playlist_menu.c 1442 2006-11-02 19:32:34Z mschwerin $ + * $Id: playlist_menu.c 1541 2006-11-13 16:25:16Z mschwerin $ * */ #include "config.h" @@ -147,6 +147,11 @@ otk_clear_list (filelist_menu_list); + mutex_lock (¤t_filelist->mutex); +#ifdef HAVE_DISC_POLLING + mutex_lock (&oxine->removable_discs->mutex); +#endif + /* next we add all the entries from the current filelist */ { fileitem_t *item = filelist_first (current_filelist); @@ -167,6 +172,11 @@ } #endif +#ifdef HAVE_DISC_POLLING + mutex_unlock (&oxine->removable_discs->mutex); +#endif + mutex_unlock (¤t_filelist->mutex); + otk_list_set_pos (filelist_menu_list, current_filelist->top_position); otk_list_set_focus (filelist_menu_list, current_filelist->cur_position); } @@ -596,7 +606,7 @@ * Playlist Menu Stuff * *************************************************************** */ -#define PLAYLIST_BUTTONS_NUM 11 +#define PLAYLIST_BUTTONS_NUM 12 static otk_widget_t *playlist_menu_buttons[PLAYLIST_BUTTONS_NUM]; static otk_widget_t *playlist_menu_list = NULL; static otk_widget_t *playlist_menu_window = NULL; @@ -630,9 +640,12 @@ otk_widget_set_enabled (playlist_menu_buttons[4], enabled); otk_widget_set_enabled (playlist_menu_buttons[5], enabled); otk_widget_set_enabled (playlist_menu_buttons[6], enabled); - otk_widget_set_enabled (playlist_menu_buttons[7], enabled); playitem_t *selected = playlist_get_selected (); + + enabled = selected && is_file_allowed (selected->mrl, ALLOW_FILES_VIDEO); + otk_widget_set_enabled (playlist_menu_buttons[7], enabled); + if (selected && (selected->subtitle_mrl != NULL)) { otk_button_set_text (playlist_menu_buttons[7], _("Delete subtitle")); } else { @@ -640,7 +653,7 @@ } enabled = odk_current_is_playback_mode (oxine->odk); - otk_widget_set_visible (playlist_menu_buttons[10], enabled); + otk_widget_set_visible (playlist_menu_buttons[11], enabled); } @@ -1044,16 +1057,16 @@ playlist_subtitle_cb, oxine); y += 50; - playlist_menu_buttons[8] = otk_text_button_new (oxine->otk, x, y, 180, 35, + playlist_menu_buttons[9] = otk_text_button_new (oxine->otk, x, y, 180, 35, _("Media-Browser"), show_filelist_menu_cb, oxine); y += 40; - playlist_menu_buttons[9] = otk_text_button_new (oxine->otk, x, y, 180, 35, - _("Mainmenu"), - show_main_menu_cb, oxine); - y += 40; playlist_menu_buttons[10] = + otk_text_button_new (oxine->otk, x, y, 180, 35, _("Mainmenu"), + show_main_menu_cb, oxine); + y += 40; + playlist_menu_buttons[11] = otk_text_button_new (oxine->otk, x, y, 180, 35, _("Current title"), show_playback_menu_cb, oxine); diff -Naur oxine-0.6.orig/src/settings_menu.c oxine-0.6.3/src/settings_menu.c --- oxine-0.6.orig/src/settings_menu.c 2006-10-21 14:25:44.000000000 +0200 +++ oxine-0.6.3/src/settings_menu.c 2006-11-19 18:54:56.000000000 +0100 @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: settings_menu.c 1406 2006-10-21 12:25:25Z mschwerin $ + * $Id: settings_menu.c 1571 2006-11-19 17:54:55Z mschwerin $ * */ #include "config.h" @@ -37,7 +37,7 @@ #include "settings_menu.h" #define NAME_X 20 -#define NAME_W 450 +#define NAME_W 420 #define EDIT_X (NAME_X + NAME_W + 10) #define EDIT_W (780 - EDIT_X) @@ -195,7 +195,7 @@ entry->range_min, entry->range_max, 1, config_range_get_cb, entry_cpy, config_range_change_cb, entry_cpy); - otk_widget_set_update (s, 1); + otk_widget_set_update (s, true); } @@ -345,24 +345,22 @@ } -static int +static bool is_from_correct_section (xine_cfg_entry_t * entry) { return (strncmp (entry->key, section, strlen (section)) == 0); } -static int +static bool is_ok_to_show (xine_cfg_entry_t * entry) { - if (strncmp (entry->key, "gui.video.", 10) == 0) - return 0; - else if (strcmp (entry->key, "shutdown.last") == 0) - return 0; + if (strcmp (entry->key, "shutdown.last") == 0) + return false; else if (strcmp (entry->key, "media.dvb.last_channel") == 0) - return 0; + return false; - return 1; + return true; } @@ -522,7 +520,7 @@ }; settings_menu_list = otk_list_new (oxine->otk, 215, 150, 370, 400, - 45, 60, false, false, + 45, 55, false, false, OTK_LIST_MULTIPLE_SELECTION, oxine); int i = 0; for (; sections[i]; i++) {