hi I prepared a new version of MPlayer 1.0~rc1-12etch ; I uploaded it into t-p-u ; please condider for unblocking An important note: ignore anything in debian/patches in the attached interdiff: those files are there for documentation and future reference, but are not automatically applied or removed at build time a.
diff -u mplayer-1.0~rc1/debian/changelog mplayer-1.0~rc1/debian/changelog
--- mplayer-1.0~rc1/debian/changelog
+++ mplayer-1.0~rc1/debian/changelog
@@ -1,3 +1,20 @@
+mplayer (1.0~rc1-12etch) testing-proposed-updates; urgency=medium
+
+ * fix for CVE-2007-1246 and similar (Closes: #414075)
+ thanks Kees Cook & Moritz Jodeitand & R Togni
+ patches for files
+ loader/dmo/DMO_VideoDecoder.c from SVN 22204
+ loader/dshow/DS_VideoDecoder.c from SVN 22205
+ * patch for ia64 unaligned access crash,
+ thanks to Bryan Stillwell for debugging &
+ Reimar Döffinger for the patch (Closes: #409431).
+ * [INTL] Japanese po-debconf templates translation,
+ thanks to Kobayashi Noritada (Closes: #413120).
+ * [INTL] Dutch po-debconf translation, thanks cobaco (Closes: #413880)
+ * [INTL] Russian po-debconf translation, thanks Yuri Kozlov (Closes: #414251)
+
+ -- A Mennucc1 <mennucc1@debian.org> Sun, 18 Mar 2007 15:13:11 +0100
+
mplayer (1.0~rc1-12) unstable; urgency=medium
* (possible) security fixes backported from SVN
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/debian/patches/mp3libunal.diff
+++ mplayer-1.0~rc1/debian/patches/mp3libunal.diff
@@ -0,0 +1,51 @@
+Index: mp3lib/sr1.c
+===================================================================
+--- mp3lib/sr1.c (revision 22099)
++++ mp3lib/sr1.c (working copy)
+@@ -315,7 +315,10 @@
+ */
+ LOCAL int read_frame(struct frame *fr){
+ unsigned long newhead;
+- unsigned char hbuf[8];
++ union {
++ unsigned char buf[8];
++ unsigned long dummy; // for alignment
++ } hbuf;
+ int skipped,resyncpos;
+ int frames=0;
+
+@@ -325,7 +328,7 @@
+
+ set_pointer(512);
+ fsizeold=fr->framesize; /* for Layer3 */
+- if(!stream_head_read(hbuf,&newhead)) return 0;
++ if(!stream_head_read(hbuf.buf,&newhead)) return 0;
+ if(!decode_header(fr,newhead)){
+ // invalid header! try to resync stream!
+ #ifdef DEBUG_RESYNC
+@@ -333,7 +336,7 @@
+ #endif
+ retry1:
+ while(!decode_header(fr,newhead)){
+- if(!stream_head_shift(hbuf,&newhead)) return 0;
++ if(!stream_head_shift(hbuf.buf,&newhead)) return 0;
+ }
+ resyncpos=MP3_fpos-4;
+ // found valid header
+@@ -343,14 +346,14 @@
+ if(!stream_read_frame_body(fr->framesize)) return 0; // read body
+ set_pointer(512);
+ fsizeold=fr->framesize; /* for Layer3 */
+- if(!stream_head_read(hbuf,&newhead)) return 0;
++ if(!stream_head_read(hbuf.buf,&newhead)) return 0;
+ if(!decode_header(fr,newhead)){
+ // invalid hdr! go back...
+ #ifdef DEBUG_RESYNC
+ printf("INVALID\n");
+ #endif
+ // mp3_seek(resyncpos+1);
+- if(!stream_head_read(hbuf,&newhead)) return 0;
++ if(!stream_head_read(hbuf.buf,&newhead)) return 0;
+ goto retry1;
+ }
+ #ifdef DEBUG_RESYNC
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/debian/patches/CVE-2007-1246.patch
+++ mplayer-1.0~rc1/debian/patches/CVE-2007-1246.patch
@@ -0,0 +1,28 @@
+diff -pruN 2:1.0~rc1-0ubuntu3/debian/changelog 2:1.0~rc1-0ubuntu4/debian/changelog
+--- 2:1.0~rc1-0ubuntu3/debian/changelog 2007-03-07 01:22:13.000000000 +0000
++++ 2:1.0~rc1-0ubuntu4/debian/changelog 2007-03-07 01:22:11.000000000 +0000
+@@ -1,3 +1,13 @@
++mplayer (2:1.0~rc1-0ubuntu4) feisty; urgency=low
++
++ * SECURITY UPDATE: DMO decoder heap overflow.
++ * loader/dmo/DMO_VideoDecoder.c: added upstream fix.
++ * References
++ http://svn.mplayerhq.hu/mplayer/trunk/loader/dmo/DMO_VideoDecoder.c?r1=22019&r2=22204
++ CVE-2007-1246
++
++ -- Kees Cook <kees@ubuntu.com> Tue, 6 Mar 2007 15:21:26 -0800
++
+ mplayer (2:1.0~rc1-0ubuntu3) feisty; urgency=low
+
+ * debian/rules:
+diff -pruN 2:1.0~rc1-0ubuntu3/loader/dmo/DMO_VideoDecoder.c 2:1.0~rc1-0ubuntu4/loader/dmo/DMO_VideoDecoder.c
+--- 2:1.0~rc1-0ubuntu3/loader/dmo/DMO_VideoDecoder.c 2007-02-03 04:00:24.000000000 +0000
++++ 2:1.0~rc1-0ubuntu4/loader/dmo/DMO_VideoDecoder.c 2007-03-07 01:22:11.000000000 +0000
+@@ -121,6 +121,7 @@ DMO_VideoDecoder * DMO_VideoDecoder_Open
+
+ this->iv.m_bh = malloc(bihs);
+ memcpy(this->iv.m_bh, format, bihs);
++ this->iv.m_bh->biSize = bihs;
+
+ this->iv.m_State = STOP;
+ //this->iv.m_pFrame = 0;
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/debian/patches/DS_VideoDecoder.c---SVN--22205.patch
+++ mplayer-1.0~rc1/debian/patches/DS_VideoDecoder.c---SVN--22205.patch
@@ -0,0 +1,10 @@
+--- trunk/loader/dshow/DS_VideoDecoder.c 2007/01/26 09:21:22 22019
++++ trunk/loader/dshow/DS_VideoDecoder.c 2007/02/11 17:57:02 22205
+@@ -114,6 +114,7 @@
+
+ this->iv.m_bh = malloc(bihs);
+ memcpy(this->iv.m_bh, format, bihs);
++ this->iv.m_bh->biSize = bihs;
+
+ this->iv.m_State = STOP;
+ //this->iv.m_pFrame = 0;
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/debian/po/ja.po
+++ mplayer-1.0~rc1/debian/po/ja.po
@@ -0,0 +1,212 @@
+# Japanese debconf templates translation for mplayer.
+# Copyright (C) 2007 Noritada Kobayashi
+# This file is distributed under the same license as the mplayer package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mplayer (debconf) 1.0~rc1-12\n"
+"Report-Msgid-Bugs-To: eyck@ghost.anime.pl\n"
+"POT-Creation-Date: 2006-11-19 21:34+0100\n"
+"PO-Revision-Date: 2007-03-02 22:19+0900\n"
+"Last-Translator: Noritada Kobayashi <nori1@dolphin.c.u-tokyo.ac.jp>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:1001
+msgid "Create your ~/.mplayer/mplayer.conf file"
+msgstr "~/.mplayer/mplayer.conf ã??ã?¡ã?¤ã?«ã??ä½?æ??ã??ã?¦ã??ã? ã??ã??"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:1001
+msgid ""
+"Performance of MPlayer depends heavily on hardware - this means that it may "
+"benefit from tweaking options, for every single machine it's installed to. "
+"You may wish to read the documentation (it is in the package 'mplayer-doc', "
+"under /usr/share/doc/mplayer-doc/). This DebConf interface will help you "
+"setup just a few main features; you may wish to add to /etc/mplayer/mplayer."
+"conf some more refined options (to enable multichannel audio, or video "
+"postprocessing, etc etc); and any user similarly may customize MPlayer using "
+"the file ~/.mplayer/config"
+msgstr ""
+"MPlayer ã?®å®?è¡?æ?§è?½ã?¯ã??ã?¼ã??ã?¦ã?§ã?¢ã?«å¼·ã??ä¾?å?ã??ã?¾ã??ã??ã?¤ã?¾ã??ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã?¦"
+"ã??ã??å??ã??ã?·ã?³ã?§ã?ªã??ã?·ã?§ã?³ã??微調æ?´ã??ã??ã?¨ MPlayer ã??ã??ã??好ã?¾ã??ã??å??ä½?ã??ã??ã??å?¯è?½æ?§"
+"ã??ã??ã??ã?¾ã??ã??ã??ã?®ã??ã??ã?«ä»?å±?æ??æ?¸ã??èªã??å¿?è¦?ã??ã??ã??ã??ã??ã??ã??ã?¾ã??ã?? (ä»?å±?æ??æ?¸ã?¯ "
+"'mplayer-doc' ã??ã??ã?±ã?¼ã?¸ã?® /usr/share/doc/mplayer-doc/ 以ä¸?ã?«ã??ã??ã?¾ã??)ã??ã??ã?® "
+"DebConf ã?¤ã?³ã?¿ã??ã?§ã?¼ã?¹ã?¯ã??ã??ã??ã?¤ã??ã?®ä¸»è¦?ã?ªæ©?è?½ã?®è¨å®?ã??æ??å?©ã??ã??ã??ã? ã??ã?§ã??ã??(ã??"
+"ã?«ã??ã??ã?£ã?³ã??ã?«ã?ªã?¼ã??ã?£ã?ªã??æ? å??ã?®å¾?å?¦ç??ã?ªã?©ã??æ??å?¹ã?«ã??ã??ã??ã??ã?«) ã??ã??ã?¤ã??ã?®ã??ã??"
+"ã?«ç´°ã??ã??ã?ªã??ã?·ã?§ã?³ã?? /etc/mplayer/mplayer.conf ã?«è¿½å? ã??ã??å¿?è¦?ã??ã??ã??ã??ã??ã??ã??ã?¾"
+"ã??ã??ã??ã?¾ã??ã??å??æ§?ã?«ã?©ã?®ã?¦ã?¼ã?¶ã??ã??ã?¡ã?¤ã?« ~/.mplayer/config ã??使ç?¨ã??ã?¦ MPlayer "
+"ã??ã?«ã?¹ã?¿ã??ã?¤ã?ºã?§ã??ã?¾ã??ã??"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:2001
+msgid "Enable access to RTC?"
+msgstr "RTC ã?¸ã?®ã?¢ã?¯ã?»ã?¹ã??å?¯è?½ã?«ã??ã?¾ã??ã???"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:2001
+msgid ""
+"On older kernels MPlayer can use the RTC (Real Time Clock) to provide better "
+"timing in reproduction, with less CPU cost; to this end, though, the device /"
+"dev/rtc must be accessible to group audio, and the default max-user-freq "
+"must be raised to 1024. Any needed change must be done by root. If you "
+"wish, MPlayer will automatically do this at boot, so that any user can enjoy "
+"this feature. Note that there may be security issues with this (although "
+"none are known now)."
+msgstr ""
+"å?¤ã??ã?«ã?¼ã??ã?«ä¸?ã?§å??ã??ã??å ´å??ã??MPlayer ã?¯ã??å??ç??æ??ã?« RTC (ã?ªã?¢ã?«ã?¿ã?¤ã? ã?¯ã?ã??ã?¯) "
+"ã??使ç?¨ã??ã??ã??ã??å°?ã?ªã?? CPU æ¶?è²»ã?§ã??ã??ã??ã??å??æ??ã??ã??ã??ã??ã?¨ã??å?¯è?½ã?§ã??ã??ã??ã??ã??ã??ã?®ã??"
+"ã??ã?«ã?¯ã??ã??ã??ã?¤ã?¹ /dev/rtc ã?? audio ã?°ã?«ã?¼ã??ã??ã??ã?¢ã?¯ã?»ã?¹å?¯è?½ã?«ã??ã??max-user-"
+"freq ã?®ã??ã??ã?©ã?«ã??å?¤ã?? 1024 ã?«ä¸?ã??ã?ªã??ã??ã?°ã?ªã??ã?¾ã??ã??ã??å¿?è¦?ã?ªå¤?æ?´ã?¯ã??ã?¹ã?¦ root "
+"ã?§è¡?ã??ã?ªã??ã??ã?°ã?ªã??ã?¾ã??ã??ã??ã??æ??ã?¿ã?ªã??ã??èµ·å??æ??ã?« MPlayer ã??è?ªå??ç??ã?«ã??ã??ã??ã?®å¤?æ?´"
+"ã??è¡?ã??ã??ã??ã?«ã??ã?¦ã??ã??ã?¹ã?¦ã?®ã?¦ã?¼ã?¶ã??ã??ã?®æ©?è?½ã??楽ã??ã??ã??ã??ã??ã?«ã?§ã??ã?¾ã??ã??ã??ã?®ã?ªã??"
+"ã?·ã?§ã?³ã??æ??å?¹ã?«ã??ã??ã?¨ã??(ä»?ã?®ã?¨ã??ã??ã?¯ç?¥ã??ã??ã?¦ã??ã?¾ã??ã??ã??) ã?»ã?ã?¥ã?ªã??ã?£ä¸?ã?®å??é¡?ç?¹"
+"ã??ã?§ã??ã??ã??ã??ã??ã??ã?ªã??ã??ã?¨ã?«æ³¨æ??ã??ã?¦ã??ã? ã??ã??ã??"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:3001
+msgid "Replace existing configuration file?"
+msgstr "æ?¢å?ã?®è¨å®?ã??ã?¡ã?¤ã?«ã??ç½®ã??æ??ã??ã?¾ã??ã???"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:3001
+msgid ""
+"There is already a file /etc/mplayer/mplayer.conf, but it does not contain "
+"an automatically generated part. This script may generate a new file (the "
+"old file will be moved to /etc/mplayer/mplayer.conf.debconf-old)."
+msgstr ""
+"ã??ã?¡ã?¤ã?« /etc/mplayer/mplayer.conf ã??æ?¢ã?«å?å?¨ã??ã?¾ã??ã??ã??ã??ã?®ã??ã?¡ã?¤ã?«ã?«ã?¯è?ªå??ç??"
+"æ??ã??ã??ã??é?¨å??ã??å?«ã?¾ã??ã?¦ã??ã?¾ã??ã??ã??æ?¬ã?¹ã?¯ã?ªã??ã??ã?®å®?è¡?ã?«ã??ã??æ?°ã??ã??ã??ã?¡ã?¤ã?«ã??ç??æ??"
+"ã??ã??ã??å?¯è?½æ?§ã??ã??ã??ã?¾ã?? (å?¤ã??ã??ã?¡ã?¤ã?«ã?¯ /etc/mplayer/mplayer.conf.debconf-old "
+"ã?«ç§»å??ã??ã?¾ã??)ã??"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:4001
+msgid "Files not replaced"
+msgstr "ã??ã?¡ã?¤ã?«ã?¯ç½®ã??æ??ã??ã??ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:4001
+msgid ""
+"It seems that you don't want to replace your existing configuration file /"
+"etc/mplayer/mplayer.conf. If you change your mind later, you can run \"dpkg-"
+"reconfigure mplayer\"."
+msgstr ""
+"æ?¢å?ã?®è¨å®?ã??ã?¡ã?¤ã?« /etc/mplayer/mplayer.conf ã??ç½®ã??æ??ã??ã??ã??ã?¨ã??æ??ã?¾ã?ªã??ã??ã??ã?§"
+"ã??ã?ã??å¾?ã?§æ°?ã??å¤?ã??ã?£ã??å ´å??ã?¯ \"dpkg-reconfigure mplayer\" ã??å®?è¡?ã??ã?¦ã??ã? ã??"
+"ã??ã??"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:5001
+msgid "MPlayer video output:"
+msgstr "MPlayer ã??ã??ã?ªå?ºå??:"
+
+# TRANSLATION-FIXME: Use "ja" instead of "en", if available
+#. Type: select
+#. Description
+#: ../mplayer.templates:5001
+msgid ""
+"MPlayer can use a very wide range of video output drivers; it will try to "
+"autodetect the best one, but you may choose a preferred one. Here is the a "
+"guide to the choice (in decreasing order of speed): (1) if you see an entry "
+"that matches your video card, choose that; (2) if your video card supports "
+"'XV', choose that (use 'xvinfo' to know). You should read /usr/share/doc/"
+"mplayer-doc/HTML/en/devices.html (it is in package 'mplayer-doc')."
+msgstr ""
+"MPlayer ã?¯é??常ã?«å¤?æ§?ã?ªã??ã??ã?ªå?ºå??ã??ã?©ã?¤ã??ã??使ç?¨ã?§ã??ã?¾ã??ã??MPlayer ã?¯æ??è?¯ã?®ã??ã?©"
+"ã?¤ã??ã??è?ªå??æ¤?å?ºã??ã??ã??ã?¨ã??ã?¾ã??ã??ã??使ç?¨ã??ã??ã??ã??ã?®ã??è?ªå??ã?§é?¸æ??ã??ã??ã??ã?¨ã??å?¯è?½ã?§"
+"ã??ã??ã??ã??ã?«é?¸æ??ã?®æ??é??ã??示ã??ã?¾ã?? (ã?¹ã??ã?¼ã??ã?®é??ã??é ?ã?§ã??)ã??(1) ã??ã??ã?ªã?«ã?¼ã??ã?«ã??ã??"
+"ã??ã??ã??ã?¨ã?³ã??ã?ªã??ã??ã??å ´å??ã??ã??ã??ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??ã??(2) ã??ã??ã?ªã?«ã?¼ã??ã?? 'XV' ã??"
+"ã?µã??ã?¼ã??ã??ã?¦ã??ã??å ´å??ã??ã??ã??ã??é?¸æ??ã??ã?¦ã??ã? ã??ã?? ('xvinfo' ã??使ç?¨ã??ã??ã?¨ã??ã??ã??ã?§"
+"ã??ã??ã??)ã??/usr/share/doc/mplayer-doc/HTML/en/devices.html ã??å??ç?§ã??ã?¦ã??ã? ã??ã?? "
+"(ã??ã?®ã??ã?¡ã?¤ã?«ã?¯ 'mplayer-doc' ã??ã??ã?±ã?¼ã?¸ã?«å?«ã?¾ã??ã?¦ã??ã?¾ã??)ã??"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:6001
+msgid "How to download binary codecs"
+msgstr "ã??ã?¤ã??ã?ªã?³ã?¼ã??ã??ã?¯ã?®ã??ã?¦ã?³ã?ã?¼ã??æ?¹æ³?"
+
+# FIXME: Remove white spaces after "Real 3.0" and "those".
+# FIXME: "QuickTime audio" should be "QuickTime Audio".
+# FIXME: Capitalize "internet".
+#. Type: note
+#. Description
+#: ../mplayer.templates:6001
+msgid ""
+"MPlayer supports most codecs out of the box and the rest with the help of "
+"binary codecs. Binary codecs are only necessary for Real 3.0 and 4.0, "
+"Windows Media 9, QuickTime audio and some very obscure codecs. Debian cannot "
+"distribute these codecs, but these are available on the internet for "
+"download. Run the script `/usr/share/mplayer/scripts/binary_codecs.sh' to "
+"install those made available from MPlayer web site."
+msgstr ""
+"MPlayer ã?¯ã??大å??ã?®ã?³ã?¼ã??ã??ã?¯ã?«ã?¤ã??ã?¦ã?¯æ??å??ã??ã??ã?µã??ã?¼ã??ã??ã?¦ã??ã??ã??æ®?ã??ã?®ã?³ã?¼"
+"ã??ã??ã?¯ã?«ã?¤ã??ã?¦ã??ã??ã?¤ã??ã?ªã?³ã?¼ã??ã??ã?¯ã?®å?©ã??ã??å??ã??ã?¦ã?µã??ã?¼ã??ã??ã?¦ã??ã?¾ã??ã??ã??ã?¤ã??ã?ª"
+"ã?³ã?¼ã??ã??ã?¯ã?¯ã??Real 3.0 ã?¨ 4.0ã??Windows Media 9ã??QuickTime Audio ã??ã??ã??ã?¤ã??ã?®"
+"é??常ã?«ç?¡å??ã?®ã?³ã?¼ã??ã??ã?¯ã?«ã?¤ã??ã?¦ã?®ã?¿å¿?è¦?ã?¨ã?ªã??ã?¾ã??ã??ã??ã??ã??ã?®ã?³ã?¼ã??ã??ã?¯ã?¯ "
+"Debian ã?§ã?¯é??å¸?ã?§ã??ã?¾ã??ã??ã??ã??ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã??ã??ã?¦ã?³ã?ã?¼ã??ã??ã?¦å?©ç?¨ã?§ã??ã?¾ã??ã??"
+"ã?¹ã?¯ã?ªã??ã?? `/usr/share/mplayer/scripts/binary_codecs.sh' ã??å®?è¡?ã??ã??MPlayer ã?®"
+"ã?¦ã?§ã??ã?µã?¤ã??ã??ã??å?¥æ??å?¯è?½ã?«ã?ªã?£ã?¦ã??ã??ã??ã??ã??ã?®ã?³ã?¼ã??ã??ã?¯ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??ã? "
+"ã??ã??ã??"
+
+#. Type: string
+#. Description
+#: ../mplayer.templates:7001
+msgid "DVD device name:"
+msgstr "DVD ã??ã??ã?¤ã?¹å??:"
+
+#. Type: string
+#. Description
+#: ../mplayer.templates:7001
+msgid "What is the name of your DVD device (if any):"
+msgstr "(DVD ã??ã??ã?¤ã?¹ã??ã??ã??å ´å??ã?¯) ã??ã??ã?¤ã?¹ã?®å??å??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??:"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:8001
+msgid "MPlayer OSD font:"
+msgstr "MPlayer OSD ã??ã?©ã?³ã??:"
+
+# FIXME: True Type should be TrueType.
+#. Type: select
+#. Description
+#: ../mplayer.templates:8001
+msgid ""
+" MPlayer needs True Type fonts for On Screen Display. Choose your favorite."
+msgstr ""
+"MPlayer ã?§ã?¯ã?ªã?³ã?¹ã?¯ã?ªã?¼ã?³ã??ã?£ã?¹ã??ã?¬ã?¤ (OSD) ã?« TrueType ã??ã?©ã?³ã??ã??å¿?è¦?ã?¨ã?ªã??"
+"ã?¾ã??ã??好ã?¿ã?®ã??ã?®ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??ã??"
+
+# FIXME: Decapitalize "Fonts".
+#. Type: note
+#. Description
+#: ../mplayer.templates:9001
+msgid "MPlayer cannot find TrueType Fonts"
+msgstr "Mplayer ã?¯ TrueType ã??ã?©ã?³ã??ã??è¦?ã?¤ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??"
+
+# FIXME: "truetype" should be "TrueType".
+# FIXME: Remove white spaces after "such as" and "'ttf-bitstream-vera' or".
+#. Type: note
+#. Description
+#: ../mplayer.templates:9001
+msgid ""
+"You should install a package providing truetype fonts (such as 'ttf-"
+"freefont' or 'ttf-bitstream-vera' or 'msttcorefonts' ) and reconfigure "
+"MPlayer (with the command \"dpkg-reconfigure mplayer\")"
+msgstr ""
+"TrueType ã??ã?©ã?³ã??ã??æ??ä¾?ã??ã?¦ã??ã??ã??ã??ã?±ã?¼ã?¸ ('ttf-freefont' ã?? 'ttf-bitstream-"
+"vera'ã??'msttcorefonts' ã?ªã?©) ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã??ã?®ä¸?ã?§ã??(ã?³ã??ã?³ã?? \"dpkg-"
+"reconfigure mplayer\" ã?§) MPlayer ã??å??è¨å®?ã??ã?¦ã??ã? ã??ã??ã??"
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/debian/po/ru.po
+++ mplayer-1.0~rc1/debian/po/ru.po
@@ -0,0 +1,206 @@
+# Translation of mplayer debconf templates to Russian
+# Copyright (C) Sergey V. Mironov <sergo@bk.ru>, 2007.
+# This file is distributed under the same license as the mplayer package.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: mplayer_1.0RC1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-19 21:34+0100\n"
+"PO-Revision-Date: 2007-03-04 18:12+0300\n"
+"Last-Translator: Sergey V. Mironov <sergo@bk.ru>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:1001
+msgid "Create your ~/.mplayer/mplayer.conf file"
+msgstr "СоздайÑ?е ваÑ? ~/.mplayer/mplayer.conf Ñ?айл"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:1001
+msgid ""
+"Performance of MPlayer depends heavily on hardware - this means that it may "
+"benefit from tweaking options, for every single machine it's installed to. "
+"You may wish to read the documentation (it is in the package 'mplayer-doc', "
+"under /usr/share/doc/mplayer-doc/). This DebConf interface will help you "
+"setup just a few main features; you may wish to add to /etc/mplayer/mplayer. "
+"conf some more refined options (to enable multichannel audio, or video "
+"postprocessing, etc etc); and any user similarly may customize MPlayer using "
+"the file ~/.mplayer/config"
+msgstr ""
+"Ð?Ñ?оизводиÑ?елÑ?ноÑ?Ñ?Ñ? MPlayer'а Ñ?илÑ?но завиÑ?иÑ? оÑ? обоÑ?Ñ?дованиÑ?. ÐÑ?о ознаÑ?аеÑ?, "
+"Ñ?Ñ?о можно полÑ?Ñ?иÑ?Ñ? вÑ?годÑ?, наÑ?Ñ?Ñ?оив паÑ?амеÑ?Ñ?Ñ? под конкÑ?еÑ?нÑ?Ñ? Ñ?иÑ?Ñ?емÑ?, "
+"на коÑ?оÑ?ом он Ñ?Ñ?Ñ?ановлен. Ð?озможно, вÑ? заÑ?оÑ?иÑ?е ознакомиÑ?Ñ?Ñ?Ñ? Ñ? "
+"докÑ?менÑ?аÑ?ией (она наÑ?одиÑ?Ñ?Ñ? в пакеÑ?е 'mplayer-doc', в каÑ?алоге /usr/share/"
+"doc/mplayer-doc/). Ð?нÑ?еÑ?Ñ?ейÑ? DebConf поможеÑ? вам наÑ?Ñ?Ñ?оиÑ?Ñ? лиÑ?Ñ? "
+"некоÑ?оÑ?Ñ?е оÑ?новнÑ?е опÑ?ии; вÑ? Ñ?акже можеÑ?е заÑ?оÑ?еÑ?Ñ? добавиÑ?Ñ? в /etc/"
+"mplayer/mplayer.conf дополниÑ?елÑ?нÑ?е паÑ?амеÑ?Ñ?Ñ? наÑ?Ñ?Ñ?ойки (длÑ? вклÑ?Ñ?ениÑ? "
+"многоканалÑ?ного звÑ?ка, поÑ?Ñ?обÑ?абоÑ?ки видео и Ñ?ак далее). Ð?аждÑ?й по "
+"оÑ?делÑ?ноÑ?Ñ?и полÑ?зоваÑ?елÑ? можеÑ? наÑ?Ñ?Ñ?оиÑ?Ñ? MPlayer, иÑ?полÑ?зÑ?Ñ? Ñ?айл "
+"~/.mplayer/config"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:2001
+msgid "Enable access to RTC?"
+msgstr "Ð?клÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п к RTC?"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:2001
+msgid ""
+"On older kernels MPlayer can use the RTC (Real Time Clock) to provide better "
+"timing in reproduction, with less CPU cost; to this end, though, the device /"
+"dev/rtc must be accessible to group audio, and the default max-user-freq "
+"must be raised to 1024. Any needed change must be done by root. If you "
+"wish, MPlayer will automatically do this at boot, so that any user can enjoy "
+"this feature. Note that there may be security issues with this (although "
+"none are known now)."
+msgstr ""
+"Ð?а Ñ?анниÑ? Ñ?дÑ?аÑ? MPlayer можеÑ? иÑ?полÑ?зоваÑ?Ñ? RTC (Real Time Clock), Ñ?Ñ?обÑ? "
+"добавиÑ?Ñ? бÐ?лÑ?Ñ?Ñ?Ñ? Ñ?аÑ?Ñ?оÑ?Ñ? диÑ?кÑ?едиÑ?аÑ?ии пÑ?и воÑ?пÑ?оизведении и менÑ?Ñ?ей "
+"загÑ?Ñ?зкой пÑ?оÑ?еÑ?Ñ?оÑ?а; длÑ? Ñ?Ñ?ого должен бÑ?Ñ?Ñ? доÑ?Ñ?Ñ?п к Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?вÑ? /dev/rtc, "
+" и знаÑ?ение по Ñ?молÑ?аниÑ? паÑ?амеÑ?Ñ?а max-user-freq должен бÑ?Ñ?Ñ? Ñ?велиÑ?ено "
+"до 1024. Ð?Ñ?е изменениÑ? необÑ?одимо делаÑ?Ñ? Ñ? пÑ?авами Ñ?Ñ?пеÑ?полÑ?зоваÑ?елÑ?. "
+"MPlayer можеÑ? авÑ?омаÑ?иÑ?еÑ?ки делаÑ?Ñ? Ñ?Ñ?о пÑ?и загÑ?Ñ?зке, пÑ?иÑ?Ñ?м дейÑ?Ñ?вие "
+"данной опÑ?ии Ñ?аÑ?пÑ?оÑ?Ñ?Ñ?аниÑ?Ñ?Ñ? на вÑ?еÑ? полÑ?зоваÑ?елей. Ð?амеÑ?им, Ñ?Ñ?о "
+"возможнÑ? пÑ?облемÑ? Ñ? безопаÑ?ноÑ?Ñ?Ñ?Ñ? (Ñ?оÑ?Ñ? ни об одной пока не извеÑ?Ñ?но)."
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:3001
+msgid "Replace existing configuration file?"
+msgstr "Ð?амениÑ?Ñ? Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?ий Ñ?айл конÑ?игÑ?Ñ?аÑ?ии?"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:3001
+msgid ""
+"There is already a file /etc/mplayer/mplayer.conf, but it does not contain "
+"an automatically generated part. This script may generate a new file (the "
+"old file will be moved to /etc/mplayer/mplayer.conf.debconf-old)."
+msgstr ""
+"Файл /etc/mplayer/mplayer.conf Ñ?же Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?еÑ?, но не Ñ?одеÑ?жиÑ? "
+"Ñ?оÑ?миÑ?Ñ?емой авÑ?омаÑ?иÑ?еÑ?ки Ñ?аÑ?Ñ?и. ÐÑ?оÑ? Ñ?кÑ?ипÑ? можеÑ? Ñ?оздаÑ?Ñ? новÑ?й Ñ?айл "
+"(Ñ?Ñ?аÑ?Ñ?й Ñ?айл бÑ?деÑ? пеÑ?еименован в /etc/mplayer/mplayer.conf.debconf-old)."
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:4001
+msgid "Files not replaced"
+msgstr "ФайлÑ? не замененÑ?"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:4001
+msgid ""
+"It seems that you don't want to replace your existing configuration file /"
+"etc/mplayer/mplayer.conf. If you change your mind later, you can run \"dpkg-"
+"reconfigure mplayer\"."
+msgstr ""
+"Ð?о вÑ?ей видимоÑ?Ñ?и, вÑ? не Ñ?оÑ?иÑ?е замениÑ?Ñ? ваÑ? Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?ий "
+"конÑ?игÑ?Ñ?аÑ?ионнÑ?й Ñ?айл /etc/mplayer/mplayer.conf. Ð?Ñ?ли вÑ? заÑ?оÑ?иÑ?е "
+"Ñ?делаÑ?Ñ? Ñ?Ñ?о позже, вам надо бÑ?деÑ? вÑ?полниÑ?Ñ? командÑ? "
+" \"dpkg-reconfigure mplayer\"."
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:5001
+msgid "MPlayer video output:"
+msgstr "Режим вÑ?вода видео MPlayer'а:"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:5001
+msgid ""
+"MPlayer can use a very wide range of video output drivers; it will try to "
+"autodetect the best one, but you may choose a preferred one. Here is the a "
+"guide to the choice (in decreasing order of speed): (1) if you see an entry "
+"that matches your video card, choose that; (2) if your video card supports "
+"'XV', choose that (use 'xvinfo' to know). You should read /usr/share/doc/"
+"mplayer-doc/HTML/en/devices.html (it is in package 'mplayer-doc')."
+msgstr ""
+"MPlayer можеÑ? иÑ?полÑ?зоваÑ?Ñ? оÑ?енÑ? болÑ?Ñ?ое колиÑ?еÑ?Ñ?во Ñ?ежимов вÑ?вода "
+"видео, он попÑ?Ñ?аеÑ?Ñ?Ñ? опÑ?еделиÑ?Ñ? авÑ?омаÑ?иÑ?еÑ?ки наилÑ?Ñ?Ñ?ий, но вÑ? можеÑ?е "
+"вÑ?бÑ?аÑ?Ñ? его и вÑ?Ñ?Ñ?нÑ?Ñ?."
+"Ð?деÑ?Ñ? еÑ?Ñ?Ñ? неболÑ?Ñ?аÑ? подÑ?казка (по поÑ?Ñ?дкÑ? Ñ?бÑ?ваниÑ? Ñ?коÑ?оÑ?Ñ?и): "
+"(1) еÑ?ли вÑ? видиÑ?е название ваÑ?ей видеокаÑ?Ñ?Ñ?, вÑ?беÑ?иÑ?е Ñ?Ñ?о; "
+"(2) еÑ?ли ваÑ?а видеокаÑ?Ñ?а поддеÑ?живаеÑ? 'XV', вÑ?беÑ?иÑ?е Ñ?Ñ?оÑ? пÑ?нкÑ? "
+" (иÑ?полÑ?зÑ?йÑ?е 'xvinfo', Ñ?Ñ?обÑ? Ñ?бедиÑ?Ñ?Ñ?Ñ?). Ð?Ñ?оÑ?Ñ?иÑ?е /usr/share/doc/mplayer-doc/"
+"HTML/en/devices.html (в пакеÑ?е 'mplayer-doc')."
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:6001
+msgid "How to download binary codecs"
+msgstr "Ð?ак загÑ?Ñ?зиÑ?Ñ? бинаÑ?нÑ?е кодеки"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:6001
+msgid ""
+"MPlayer supports most codecs out of the box and the rest with the help of "
+"binary codecs. Binary codecs are only necessary for Real 3.0 and 4.0, "
+"Windows Media 9, QuickTime audio and some very obscure codecs. Debian cannot "
+"distribute these codecs, but these are available on the internet for "
+"download. Run the script `/usr/share/mplayer/scripts/binary_codecs.sh' to "
+"install those made available from MPlayer web site."
+msgstr ""
+"MPlayer поддеÑ?живаеÑ? болÑ?Ñ?инÑ?Ñ?во кодеков \"из коÑ?обки\", а оÑ?Ñ?алÑ?нÑ?е Ñ? "
+"помоÑ?Ñ?Ñ? бинаÑ?нÑ?Ñ? кодеков. Ð?инаÑ?нÑ?е кодеки нÑ?жнÑ? Ñ?олÑ?ко длÑ? Real 3.0 и "
+"4.0, Windows Media 9, QuickTime audio и некоÑ?оÑ?Ñ?Ñ? дÑ?Ñ?гиÑ? малоизвеÑ?Ñ?нÑ?Ñ? "
+"кодеков. Ð? Ð?ебиан даннÑ?е кодеки не вклÑ?Ñ?енÑ?, но еÑ?Ñ?Ñ? возможноÑ?Ñ?Ñ? "
+"загÑ?Ñ?зиÑ?Ñ? иÑ? из инÑ?еÑ?неÑ?а. Ð?апÑ?Ñ?Ñ?иÑ?е Ñ?кÑ?ипÑ? `/usr/share/mplayer/scripts/"
+"binary_codecs.sh' длÑ? Ñ?ого, Ñ?Ñ?обÑ? Ñ?Ñ?Ñ?ановиÑ?Ñ? иÑ? Ñ? инÑ?еÑ?неÑ?-Ñ?айÑ?а MPlayer'а."
+
+#. Type: string
+#. Description
+#: ../mplayer.templates:7001
+msgid "DVD device name:"
+msgstr "Ð?мÑ? Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ва DVD:"
+
+#. Type: string
+#. Description
+#: ../mplayer.templates:7001
+msgid "What is the name of your DVD device (if any):"
+msgstr "Ð?азвание ваÑ?его DVD-Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ва (или дÑ?Ñ?гое):"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:8001
+msgid "MPlayer OSD font:"
+msgstr "ШÑ?иÑ?Ñ? OSD в MPlayer'е:"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:8001
+msgid ""
+" MPlayer needs True Type fonts for On Screen Display. Choose your favorite."
+msgstr ""
+"MPlayer'Ñ? Ñ?Ñ?ебÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?иÑ?Ñ?Ñ? TrueType длÑ? вÑ?вода Ñ?Ñ?бÑ?иÑ?Ñ?ов. Ð?Ñ?беÑ?иÑ?е "
+"ваÑ? лÑ?бимÑ?й Ñ?Ñ?иÑ?Ñ?."
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:9001
+msgid "MPlayer cannot find TrueType Fonts"
+msgstr "MPlayer не наÑ?Ñ?л Ñ?Ñ?иÑ?Ñ?Ñ? TrueType"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:9001
+msgid ""
+"You should install a package providing truetype fonts (such as 'ttf-"
+"freefont' or 'ttf-bitstream-vera' or 'msttcorefonts' ) and reconfigure "
+"MPlayer (with the command \"dpkg-reconfigure mplayer\")"
+msgstr ""
+"Ð?ам нÑ?жно Ñ?Ñ?Ñ?ановиÑ?Ñ? пакеÑ? Ñ? Ñ?Ñ?иÑ?Ñ?ами truetype (напÑ?имеÑ?, 'ttf-"
+"freefont' или 'ttf-bitstream-vera' или 'msttcorefonts') и "
+"пеÑ?еконÑ?игÑ?Ñ?иÑ?оваÑ?Ñ? MPlayer (запÑ?Ñ?Ñ?ив командÑ? "
+"\"dpkg-reconfigure mplayer\")."
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/debian/po/nl.po
+++ mplayer-1.0~rc1/debian/po/nl.po
@@ -0,0 +1,130 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mplayer\n"
+"Report-Msgid-Bugs-To: eyck@ghost.anime.pl\n"
+"POT-Creation-Date: 2006-11-19 21:34+0100\n"
+"PO-Revision-Date: 2007-02-25 16:44+0100\n"
+"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
+"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: nl\n"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:1001
+msgid "Create your ~/.mplayer/mplayer.conf file"
+msgstr "Uw '~/.mplayer/mplayer.conf' bestand aanmaken"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:1001
+msgid "Performance of MPlayer depends heavily on hardware - this means that it may benefit from tweaking options, for every single machine it's installed to. You may wish to read the documentation (it is in the package 'mplayer-doc', under /usr/share/doc/mplayer-doc/). This DebConf interface will help you setup just a few main features; you may wish to add to /etc/mplayer/mplayer.conf some more refined options (to enable multichannel audio, or video postprocessing, etc etc); and any user similarly may customize MPlayer using the file ~/.mplayer/config"
+msgstr "Performantie van MPlayer is sterk afhankelijk van de hardware. Dit betekend ook dat er groot voordeel te halen is van het specifiek aanpassen van de opties voor elke machine waarop u dit pakket installeert. U kunt best de docemtatie nalezen (deze vindt u na installatie van het 'mplayer-doc'-pakket in de map /usr/share/doc/mplayer-doc). Deze debconf-interface helpt u alleen met het instellen van enkele van de meest belangrijke features; het is dus denkelijk dat u de opties in /etc/mplayer/mplayer.conf verder wilt verfijnen (om bijvoorbeel multikanaal audio, of video postprocessing, of ... te activeren). Elke gebruiker kan MPlayer verder aanpassen via het bestand ~/.mplayer/config ."
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:2001
+msgid "Enable access to RTC?"
+msgstr "Toegang tot de RTC (Real Time Clock) activeren?"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:2001
+msgid "On older kernels MPlayer can use the RTC (Real Time Clock) to provide better timing in reproduction, with less CPU cost; to this end, though, the device /dev/rtc must be accessible to group audio, and the default max-user-freq must be raised to 1024. Any needed change must be done by root. If you wish, MPlayer will automatically do this at boot, so that any user can enjoy this feature. Note that there may be security issues with this (although none are known now)."
+msgstr "Voor oudere kernels kan MPlayer de RTC (Real Time Clock) gebruiken voor bettere getimede reproductie, aan minder grote CPU-kost. Opdat dit mogelijk zou zijn dient het apparaat /dev/rtc toegankelijk te zijn voor de 'audio'-groep, en dient de max-user-freq opgehoogt te worden naar 1024. Deze benodigde aanpassingen dienen door root uitgevoerd te worden. Als u dit wenst kan MPlayer dit automatisch tijdens het opstarten doen. Opgelet! Dit kan beveiliginsproblemen opleveren (hoewel er momenteel geen beveiligins problemen bekend zijn)."
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:3001
+msgid "Replace existing configuration file?"
+msgstr "Wilt u het bestaand configuratiebestand vervangen?"
+
+#. Type: boolean
+#. Description
+#: ../mplayer.templates:3001
+msgid "There is already a file /etc/mplayer/mplayer.conf, but it does not contain an automatically generated part. This script may generate a new file (the old file will be moved to /etc/mplayer/mplayer.conf.debconf-old)."
+msgstr "Er bestaat reeds een bestand '/etc/mplayer/mplayer.conf', dit bestaande bestand bevat geen automatisch gegenereerd deel. Dit script maakt een nieuw bestand aan (het oude bestand wordt verplaatst naar '/etc/mplayer/mplayer.conf.debconf-old). "
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:4001
+msgid "Files not replaced"
+msgstr "Bestanden zijn niet vervangen"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:4001
+msgid "It seems that you don't want to replace your existing configuration file /etc/mplayer/mplayer.conf. If you change your mind later, you can run \"dpkg-reconfigure mplayer\"."
+msgstr "U geeft aan dat u het bestaande configuratiebestand niet wilt vervangen. Als u later van gedacht vervanderd kunt u dit alsnog laten doen via het commando 'dpkg-reconfigure mplayer'."
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:5001
+msgid "MPlayer video output:"
+msgstr "MPlayer-video-uitvoer:"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:5001
+msgid "MPlayer can use a very wide range of video output drivers; it will try to autodetect the best one, but you may choose a preferred one. Here is the a guide to the choice (in decreasing order of speed): (1) if you see an entry that matches your video card, choose that; (2) if your video card supports 'XV', choose that (use 'xvinfo' to know). You should read /usr/share/doc/mplayer-doc/HTML/en/devices.html (it is in package 'mplayer-doc')."
+msgstr ""
+"MPlayer kan een erg veel verschillende video-uitvoerstuurprogramma's gebruiken; het probeert om het beste beschikbare stuurprogramma te gebruiken, maar u kunt het door u verkozen altijd kiezen. Hou voor deze keuze het volgende in gedachten:\n"
+"(1) Als u een ingang ziet die overeenkomt met uw beeldkaart, dan kiest u deze normaal ook.\n"
+"(2) Als uw beeldkaart 'XV' ondersteund, kiest u best die optie (u kunt dit nagaan met het commando 'xvinfo').\n"
+"Meer informatie vindt u in het bestand '/usr/share/doc/mplayer-doc/HTML/en/devices.html (hiervoor dient u het pakket 'mplayer-doc' geïnstalleerd te hebben."
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:6001
+msgid "How to download binary codecs"
+msgstr "Hoe binaire codecs te downloaden:"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:6001
+msgid "MPlayer supports most codecs out of the box and the rest with the help of binary codecs. Binary codecs are only necessary for Real 3.0 and 4.0, Windows Media 9, QuickTime audio and some very obscure codecs. Debian cannot distribute these codecs, but these are available on the internet for download. Run the script `/usr/share/mplayer/scripts/binary_codecs.sh' to install those made available from MPlayer web site."
+msgstr "MPlayer ondersteund de meeste codecs meteen na installatie, voor ondersteuning van andere codecs zijn binaire codecs nodig. Binaire codecs zijn normaal enkel nodig voor Real 3.0, Real 4.0, Windows Media 9, Quicktime audio, en sommige heel obscure codecs. Debian kan deze codecs om legale redenen niet aanbieden, maar daar deze codecs wel beschikbaar zijn op het internet bevat dit pakket het script '/usr/share/mplayer/scripts/binary_codecs.sh'. Dit script haalt de codecs voor u op van internet en zet ze op de juiste plek neer."
+
+#. Type: string
+#. Description
+#: ../mplayer.templates:7001
+msgid "DVD device name:"
+msgstr "DVD-apparaatnaam:"
+
+#. Type: string
+#. Description
+#: ../mplayer.templates:7001
+msgid "What is the name of your DVD device (if any):"
+msgstr "Wat is de naam van uw DVD-apparaat (indien aanwezig):"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:8001
+msgid "MPlayer OSD font:"
+msgstr "Lettertype voor MPlayer 'Op het scherm'-weergave:"
+
+#. Type: select
+#. Description
+#: ../mplayer.templates:8001
+msgid " MPlayer needs True Type fonts for On Screen Display. Choose your favorite."
+msgstr "MPlayer maakt gebruik van 'TrueType'-lettertypes voor 'Op het scherm'-weergave. Welk lettertype verkiest u?"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:9001
+msgid "MPlayer cannot find TrueType Fonts"
+msgstr "MPlayer kan geen 'TrueType'-lettertype vinden"
+
+#. Type: note
+#. Description
+#: ../mplayer.templates:9001
+msgid "You should install a package providing truetype fonts (such as 'ttf-freefont' or 'ttf-bitstream-vera' or 'msttcorefonts' ) and reconfigure MPlayer (with the command \"dpkg-reconfigure mplayer\")"
+msgstr "U kunt best een pakket met 'TrueType'-lettertypes installeeren (bv. 'ttf-dejavu' of 'ttf-bitstream-vera' of 'msttcorefonts') en vervolgens MPlayer herconfigureren (via het commando 'dpkg-reconfigure mplayer')."
+
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/loader/dmo/DMO_VideoDecoder.c
+++ mplayer-1.0~rc1/loader/dmo/DMO_VideoDecoder.c
@@ -121,6 +121,7 @@
this->iv.m_bh = malloc(bihs);
memcpy(this->iv.m_bh, format, bihs);
+ this->iv.m_bh->biSize = bihs;
this->iv.m_State = STOP;
//this->iv.m_pFrame = 0;
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/loader/dshow/DS_VideoDecoder.c
+++ mplayer-1.0~rc1/loader/dshow/DS_VideoDecoder.c
@@ -116,6 +116,7 @@
this->iv.m_bh = malloc(bihs);
memcpy(this->iv.m_bh, format, bihs);
+ this->iv.m_bh->biSize = bihs;
this->iv.m_State = STOP;
//this->iv.m_pFrame = 0;
only in patch2:
unchanged:
--- mplayer-1.0~rc1.orig/mp3lib/sr1.c
+++ mplayer-1.0~rc1/mp3lib/sr1.c
@@ -314,7 +314,10 @@
*/
LOCAL int read_frame(struct frame *fr){
unsigned long newhead;
- unsigned char hbuf[8];
+ union {
+ unsigned char buf[8];
+ unsigned long dummy; // for alignment
+ } hbuf;
int skipped,resyncpos;
int frames=0;
@@ -324,7 +327,7 @@
set_pointer(512);
fsizeold=fr->framesize; /* for Layer3 */
- if(!stream_head_read(hbuf,&newhead)) return 0;
+ if(!stream_head_read(hbuf.buf,&newhead)) return 0;
if(!decode_header(fr,newhead)){
// invalid header! try to resync stream!
#ifdef DEBUG_RESYNC
@@ -332,7 +335,7 @@
#endif
retry1:
while(!decode_header(fr,newhead)){
- if(!stream_head_shift(hbuf,&newhead)) return 0;
+ if(!stream_head_shift(hbuf.buf,&newhead)) return 0;
}
resyncpos=MP3_fpos-4;
// found valid header
@@ -342,14 +345,14 @@
if(!stream_read_frame_body(fr->framesize)) return 0; // read body
set_pointer(512);
fsizeold=fr->framesize; /* for Layer3 */
- if(!stream_head_read(hbuf,&newhead)) return 0;
+ if(!stream_head_read(hbuf.buf,&newhead)) return 0;
if(!decode_header(fr,newhead)){
// invalid hdr! go back...
#ifdef DEBUG_RESYNC
printf("INVALID\n");
#endif
// mp3_seek(resyncpos+1);
- if(!stream_head_read(hbuf,&newhead)) return 0;
+ if(!stream_head_read(hbuf.buf,&newhead)) return 0;
goto retry1;
}
#ifdef DEBUG_RESYNC
Attachment:
signature.asc
Description: OpenPGP digital signature