404 files changed, 6107 insertions, 7490 deletions

diff --git a/.hgignore b/.hgignore
index 260a4a086..3c5eec892 100644
--- a/.hgignore
+++ b/.hgignore
@@ -53,6 +53,10 @@ contrib/ffmpeg/config.mak
 contrib/ffmpeg/doc/*.1
 contrib/ffmpeg/doc/*.html
 contrib/ffmpeg/version.h
+contrib/libdha/pci_dev_ids.c
+contrib/libdha/pci_ids.h
+contrib/libdha/pci_names.[ch]
+contrib/libdha/pci_vendors.h
 
 doc/faq/faq.html
 doc/faq/faq.txt
@@ -76,7 +80,3 @@ po/insert-header.sed
 po/remove-potcdate.sed
 
 src/libffmpeg/ffmpeg_config.h
-src/video_out/libdha/pci_dev_ids.c
-src/video_out/libdha/pci_ids.h
-src/video_out/libdha/pci_names.[ch]
-src/video_out/libdha/pci_vendors.h
diff --git a/ChangeLog b/ChangeLog
index f6785d60d..685d79a1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,7 +8,7 @@ xine-lib (1.1.90) (Unreleased)
   * Use FFmpeg's own buildsystem, rather than wrapping automake around its
     sources; this allows to enable/disable FFmpeg features easily, and allow
     to properly support --disable-ffmpeg-(uncommon|popular)-codecs.
-  * Update libmpcdec (formerly libmusepack) to version 1.2.5 (newer than the
+  * Update libmpcdec (formerly libmusepack) to version 1.2.6 (newer than the
     previous Subversion snapshot) and contestually move it to contrib/libmpcdec
     to separate from xine's own code.
   * Save plugins' cache in the defined cache home directory as per XDG Base
@@ -26,6 +26,8 @@ xine-lib (1.1.90) (Unreleased)
   * Move modplug demuxing on its own plugin, this way binary distributions
     can make it optional, as it requires quite a bit of CPU time during
     initialisation, even for audio files that nothing have to do with modplug.
+  * Collapse the Ogg demuxer, and the Theora, Vorbis and Speex decoders in the
+    same 'xiph' plugin.
 
 xine-lib (1.1.7) (unreleased)
   * Support libdca (new name for libdts) by shuffling around the dts.h file.
@@ -47,6 +49,11 @@ xine-lib (1.1.7) (unreleased)
   * Use the integer versions of Speex decoding functions, this avoids an
     iteration over the decoded frames to transform them to integers, and
     also avoids an improper saturation.
+  * Prioritize the musepack demuxer over mpgaudio, as sometimes the latter can
+    misfire and report a good file as unplayable.
+  * Fix an mmap problem with huge files on 32-bit systems.
+  * Improved MPEG PES stream handling: specifically, misdetection of data
+    streams as PES streams.
 
 xine-lib (1.1.6)
   * Split the DirectFB plugin into X11 and non-X versions.
diff --git a/Makefile.am b/Makefile.am
index 548f93312..fb5c98316 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,6 @@ DEBFILES = debian/README.Debian debian/changelog debian/control \
 	debian/shlibdeps.sh debian/libxine-dev.install debian/libxine1.install
 
 EXTRA_DIST = config.rpath autogen.sh \
-	     automake.diff \
 	     ChangeLog \
 	     configure \
 	     config.guess \
@@ -28,8 +27,7 @@ EXTRA_DIST = config.rpath autogen.sh \
 	     README \
 	     TODO \
 	     depcomp \
-	     CREDITS \
-	     @DEPCOMP@
+	     CREDITS
 
 noinst_HEADERS = config.h
 
diff --git a/configure.ac b/configure.ac
index 434049db0..794da2895 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,7 @@ AC_SUBST(XINE_LT_REVISION)
 XINE_LT_AGE=__XINE_LT_AGE
 AC_SUBST(XINE_LT_AGE)
 
-LIBNAME="libxine${XINE_MAJOR}"
+LIBNAME="libxine$(($XINE_LT_CURRENT-$XINE_LT_AGE))"
 AC_SUBST(LIBNAME)
 AC_DEFINE_UNQUOTED([XINE_TEXTDOMAIN], "$LIBNAME", [catalog message text domain])
 
@@ -1114,11 +1114,27 @@ doc/hackersguide/Makefile
 doc/faq/Makefile
 doc/Doxyfile
 contrib/Makefile
+contrib/a52dec/Makefile
 contrib/gsm610/Makefile
+contrib/libcdio/Makefile
+contrib/libcdio/cdio/Makefile
+contrib/libcdio/MSWindows/Makefile
+contrib/libcdio/image/Makefile
 contrib/libdca/Makefile
+contrib/libdha/Makefile
+contrib/libdha/bin/Makefile
+contrib/libdha/kernelhelper/Makefile
+contrib/libdha/oth/Makefile
+contrib/libdha/sysdep/Makefile
+contrib/libfaad/Makefile
+contrib/libmad/Makefile
 contrib/libmpcdec/Makefile
+contrib/libvcd/Makefile
+contrib/libvcd/libvcd/Makefile
 contrib/libxdg-basedir/Makefile
 contrib/nosefart/Makefile
+contrib/vidix/Makefile
+contrib/vidix/drivers/Makefile
 include/Makefile
 include/xine.h
 lib/Makefile
@@ -1140,21 +1156,10 @@ src/demuxers/Makefile
 src/dxr3/Makefile
 src/input/Makefile
 src/input/libdvdnav/Makefile
-src/input/dvb/Makefile
 src/input/librtsp/Makefile
 src/input/libreal/Makefile
 src/input/vcd/Makefile
-src/input/vcd/libcdio/Makefile
-src/input/vcd/libcdio/cdio/Makefile
-src/input/vcd/libcdio/MSWindows/Makefile
-src/input/vcd/libcdio/image/Makefile
-src/input/vcd/libvcd/Makefile
-src/input/vcd/libvcd/libvcd/Makefile
-src/liba52/Makefile
-src/libfaad/Makefile
-src/libfaad/codebook/Makefile
 src/libffmpeg/Makefile
-src/libmad/Makefile
 src/libmpeg2/Makefile
 src/libspudec/Makefile
 src/libspucc/Makefile
@@ -1179,14 +1184,7 @@ src/post/audio/Makefile
 src/post/deinterlace/Makefile
 src/post/deinterlace/plugins/Makefile
 src/video_out/Makefile
-src/video_out/libdha/Makefile
-src/video_out/libdha/bin/Makefile
-src/video_out/libdha/kernelhelper/Makefile
-src/video_out/libdha/oth/Makefile
-src/video_out/libdha/sysdep/Makefile
 src/video_out/macosx/Makefile
-src/video_out/vidix/Makefile
-src/video_out/vidix/drivers/Makefile
 src/xine-utils/Makefile
 src/xine-engine/Makefile
 src/vdr/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 5f26fd25c..a61af87e0 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,4 +1,22 @@
-SUBDIRS = libmpcdec libxdg-basedir libdca nosefart gsm610
+SUBDIRS = libmpcdec libxdg-basedir libdca nosefart gsm610 libmad a52dec \
+	libfaad
+
+
+if BUILD_DHA_KMOD
+SUBDIRS += libdha
+endif
+
+# vidix depends on portions of dha
+if ENABLE_VIDIX
+if !BUILD_DHA_KMOD
+SUBDIRS += libdha
+endif
+SUBDIRS += vidix
+endif
+
+if !WITH_EXTERNAL_VCDLIBS
+SUBDIRS += libcdio libvcd
+endif
 
 srcdir = $(shell cd @srcdir@; pwd)
 
@@ -147,7 +165,7 @@ else
 	-$(MAKE) -C ffmpeg distclean
 endif
 
-EXTRA_DIST = README.contrib ffmpeg-distfiles
+EXTRA_DIST = README.contrib ffmpeg-distfiles ffmpeg-universal.sh
 
 dist-hook:
 	while read entry; do \
diff --git a/contrib/a52dec/Makefile.am b/contrib/a52dec/Makefile.am
new file mode 100644
index 000000000..6eebd58be
--- /dev/null
+++ b/contrib/a52dec/Makefile.am
@@ -0,0 +1,12 @@
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+
+if ENABLE_A52DEC
+if !WITH_EXTERNAL_A52DEC
+noinst_LTLIBRARIES = liba52.la
+endif
+endif
+
+liba52_la_SOURCES = bitstream.c bit_allocate.c downmix.c imdct.c parse.c \
+	a52.h a52_internal.h bitstream.h tables.h crc.c
+liba52_la_LIBADD = -lm
+liba52_la_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/src/liba52/a52.h b/contrib/a52dec/a52.h
index 9db52ccf8..9db52ccf8 100644
--- a/src/liba52/a52.h
+++ b/contrib/a52dec/a52.h
diff --git a/src/liba52/a52_internal.h b/contrib/a52dec/a52_internal.h
index 541d94803..541d94803 100644
--- a/src/liba52/a52_internal.h
+++ b/contrib/a52dec/a52_internal.h
diff --git a/src/liba52/bit_allocate.c b/contrib/a52dec/bit_allocate.c
index 0567b2285..0567b2285 100644
--- a/src/liba52/bit_allocate.c
+++ b/contrib/a52dec/bit_allocate.c
diff --git a/src/liba52/bitstream.c b/contrib/a52dec/bitstream.c
index 04e8ca6d0..04e8ca6d0 100644
--- a/src/liba52/bitstream.c
+++ b/contrib/a52dec/bitstream.c
diff --git a/src/liba52/bitstream.h b/contrib/a52dec/bitstream.h
index f242c37c4..f242c37c4 100644
--- a/src/liba52/bitstream.h
+++ b/contrib/a52dec/bitstream.h
diff --git a/src/liba52/crc.c b/contrib/a52dec/crc.c
index 38254c9ef..38254c9ef 100644
--- a/src/liba52/crc.c
+++ b/contrib/a52dec/crc.c
diff --git a/src/liba52/diff_against_release.patch b/contrib/a52dec/diff_against_release.patch
index d7f7ff2f2..d7f7ff2f2 100644
--- a/src/liba52/diff_against_release.patch
+++ b/contrib/a52dec/diff_against_release.patch
diff --git a/src/liba52/downmix.c b/contrib/a52dec/downmix.c
index b9ac1fdea..b9ac1fdea 100644
--- a/src/liba52/downmix.c
+++ b/contrib/a52dec/downmix.c
diff --git a/src/liba52/imdct.c b/contrib/a52dec/imdct.c
index 5835e70a1..5835e70a1 100644
--- a/src/liba52/imdct.c
+++ b/contrib/a52dec/imdct.c
diff --git a/src/liba52/parse.c b/contrib/a52dec/parse.c
index 0bfd02fce..0bfd02fce 100644
--- a/src/liba52/parse.c
+++ b/contrib/a52dec/parse.c
diff --git a/src/liba52/tables.h b/contrib/a52dec/tables.h
index a35543db7..a35543db7 100644
--- a/src/liba52/tables.h
+++ b/contrib/a52dec/tables.h
diff --git a/src/input/vcd/libcdio/FreeBSD/freebsd.c b/contrib/libcdio/FreeBSD/freebsd.c
index daea9b3f5..daea9b3f5 100644
--- a/src/input/vcd/libcdio/FreeBSD/freebsd.c
+++ b/contrib/libcdio/FreeBSD/freebsd.c
diff --git a/src/input/vcd/libcdio/FreeBSD/freebsd.h b/contrib/libcdio/FreeBSD/freebsd.h
index 50894c912..50894c912 100644
--- a/src/input/vcd/libcdio/FreeBSD/freebsd.h
+++ b/contrib/libcdio/FreeBSD/freebsd.h
diff --git a/src/input/vcd/libcdio/FreeBSD/freebsd_cam.c b/contrib/libcdio/FreeBSD/freebsd_cam.c
index 68e38ccae..68e38ccae 100644
--- a/src/input/vcd/libcdio/FreeBSD/freebsd_cam.c
+++ b/contrib/libcdio/FreeBSD/freebsd_cam.c
diff --git a/src/input/vcd/libcdio/FreeBSD/freebsd_ioctl.c b/contrib/libcdio/FreeBSD/freebsd_ioctl.c
index be9835c95..be9835c95 100644
--- a/src/input/vcd/libcdio/FreeBSD/freebsd_ioctl.c
+++ b/contrib/libcdio/FreeBSD/freebsd_ioctl.c
diff --git a/src/input/vcd/libcdio/MSWindows/Makefile.am b/contrib/libcdio/MSWindows/Makefile.am
index 61089cf69..61089cf69 100644
--- a/src/input/vcd/libcdio/MSWindows/Makefile.am
+++ b/contrib/libcdio/MSWindows/Makefile.am
diff --git a/src/input/vcd/libcdio/MSWindows/aspi32.c b/contrib/libcdio/MSWindows/aspi32.c
index 238a4b4e9..238a4b4e9 100644
--- a/src/input/vcd/libcdio/MSWindows/aspi32.c
+++ b/contrib/libcdio/MSWindows/aspi32.c
diff --git a/src/input/vcd/libcdio/MSWindows/aspi32.h b/contrib/libcdio/MSWindows/aspi32.h
index 8742c0794..8742c0794 100644
--- a/src/input/vcd/libcdio/MSWindows/aspi32.h
+++ b/contrib/libcdio/MSWindows/aspi32.h
diff --git a/src/input/vcd/libcdio/MSWindows/win32.c b/contrib/libcdio/MSWindows/win32.c
index 1c9d9b93d..1c9d9b93d 100644
--- a/src/input/vcd/libcdio/MSWindows/win32.c
+++ b/contrib/libcdio/MSWindows/win32.c
diff --git a/src/input/vcd/libcdio/MSWindows/win32.h b/contrib/libcdio/MSWindows/win32.h
index 84f3b67b3..84f3b67b3 100644
--- a/src/input/vcd/libcdio/MSWindows/win32.h
+++ b/contrib/libcdio/MSWindows/win32.h
diff --git a/src/input/vcd/libcdio/MSWindows/win32_ioctl.c b/contrib/libcdio/MSWindows/win32_ioctl.c
index dec24e785..dec24e785 100644
--- a/src/input/vcd/libcdio/MSWindows/win32_ioctl.c
+++ b/contrib/libcdio/MSWindows/win32_ioctl.c
diff --git a/src/input/vcd/libcdio/Makefile.am b/contrib/libcdio/Makefile.am
index a79525c8f..a79525c8f 100644
--- a/src/input/vcd/libcdio/Makefile.am
+++ b/contrib/libcdio/Makefile.am
diff --git a/src/input/vcd/libcdio/_cdio_bsdi.c b/contrib/libcdio/_cdio_bsdi.c
index aef535752..aef535752 100644
--- a/src/input/vcd/libcdio/_cdio_bsdi.c
+++ b/contrib/libcdio/_cdio_bsdi.c
diff --git a/src/input/vcd/libcdio/_cdio_generic.c b/contrib/libcdio/_cdio_generic.c
index fb3ed5a9c..fb3ed5a9c 100644
--- a/src/input/vcd/libcdio/_cdio_generic.c
+++ b/contrib/libcdio/_cdio_generic.c
diff --git a/src/input/vcd/libcdio/_cdio_linux.c b/contrib/libcdio/_cdio_linux.c
index ea70d262c..ea70d262c 100644
--- a/src/input/vcd/libcdio/_cdio_linux.c
+++ b/contrib/libcdio/_cdio_linux.c
diff --git a/src/input/vcd/libcdio/_cdio_osx.c b/contrib/libcdio/_cdio_osx.c
index f754933c6..f754933c6 100644
--- a/src/input/vcd/libcdio/_cdio_osx.c
+++ b/contrib/libcdio/_cdio_osx.c
diff --git a/src/input/vcd/libcdio/_cdio_stdio.c b/contrib/libcdio/_cdio_stdio.c
index 0083b2194..0083b2194 100644
--- a/src/input/vcd/libcdio/_cdio_stdio.c
+++ b/contrib/libcdio/_cdio_stdio.c
diff --git a/src/input/vcd/libcdio/_cdio_stdio.h b/contrib/libcdio/_cdio_stdio.h
index f5e79c41c..f5e79c41c 100644
--- a/src/input/vcd/libcdio/_cdio_stdio.h
+++ b/contrib/libcdio/_cdio_stdio.h
diff --git a/src/input/vcd/libcdio/_cdio_stream.c b/contrib/libcdio/_cdio_stream.c
index fc1f7fce7..fc1f7fce7 100644
--- a/src/input/vcd/libcdio/_cdio_stream.c
+++ b/contrib/libcdio/_cdio_stream.c
diff --git a/src/input/vcd/libcdio/_cdio_stream.h b/contrib/libcdio/_cdio_stream.h
index ffbb4098e..ffbb4098e 100644
--- a/src/input/vcd/libcdio/_cdio_stream.h
+++ b/contrib/libcdio/_cdio_stream.h
diff --git a/src/input/vcd/libcdio/_cdio_sunos.c b/contrib/libcdio/_cdio_sunos.c
index 245d1e319..245d1e319 100644
--- a/src/input/vcd/libcdio/_cdio_sunos.c
+++ b/contrib/libcdio/_cdio_sunos.c
diff --git a/src/input/vcd/libcdio/cd_types.c b/contrib/libcdio/cd_types.c
index b983f9899..b983f9899 100644
--- a/src/input/vcd/libcdio/cd_types.c
+++ b/contrib/libcdio/cd_types.c
diff --git a/src/input/vcd/libcdio/cdio.c b/contrib/libcdio/cdio.c
index fc18add91..fc18add91 100644
--- a/src/input/vcd/libcdio/cdio.c
+++ b/contrib/libcdio/cdio.c
diff --git a/src/input/vcd/libcdio/cdio/Makefile.am b/contrib/libcdio/cdio/Makefile.am
index 0910d60e5..0910d60e5 100644
--- a/src/input/vcd/libcdio/cdio/Makefile.am
+++ b/contrib/libcdio/cdio/Makefile.am
diff --git a/src/input/vcd/libcdio/cdio/bytesex.h b/contrib/libcdio/cdio/bytesex.h
index c40e44729..c40e44729 100644
--- a/src/input/vcd/libcdio/cdio/bytesex.h
+++ b/contrib/libcdio/cdio/bytesex.h
diff --git a/src/input/vcd/libcdio/cdio/bytesex_asm.h b/contrib/libcdio/cdio/bytesex_asm.h
index 4291563ec..4291563ec 100644
--- a/src/input/vcd/libcdio/cdio/bytesex_asm.h
+++ b/contrib/libcdio/cdio/bytesex_asm.h
diff --git a/src/input/vcd/libcdio/cdio/cd_types.h b/contrib/libcdio/cdio/cd_types.h
index 9f4a73f67..9f4a73f67 100644
--- a/src/input/vcd/libcdio/cdio/cd_types.h
+++ b/contrib/libcdio/cdio/cd_types.h
diff --git a/src/input/vcd/libcdio/cdio/cdio.h b/contrib/libcdio/cdio/cdio.h
index f9e2a38e3..f9e2a38e3 100644
--- a/src/input/vcd/libcdio/cdio/cdio.h
+++ b/contrib/libcdio/cdio/cdio.h
diff --git a/src/input/vcd/libcdio/cdio/cdtext.h b/contrib/libcdio/cdio/cdtext.h
index 4b397a3ff..4b397a3ff 100644
--- a/src/input/vcd/libcdio/cdio/cdtext.h
+++ b/contrib/libcdio/cdio/cdtext.h
diff --git a/src/input/vcd/libcdio/cdio/ds.h b/contrib/libcdio/cdio/ds.h
index c811cadd4..c811cadd4 100644
--- a/src/input/vcd/libcdio/cdio/ds.h
+++ b/contrib/libcdio/cdio/ds.h
diff --git a/src/input/vcd/libcdio/cdio/dvd.h b/contrib/libcdio/cdio/dvd.h
index df58c4322..df58c4322 100644
--- a/src/input/vcd/libcdio/cdio/dvd.h
+++ b/contrib/libcdio/cdio/dvd.h
diff --git a/src/input/vcd/libcdio/cdio/iso9660.h b/contrib/libcdio/cdio/iso9660.h
index 104b6ba62..104b6ba62 100644
--- a/src/input/vcd/libcdio/cdio/iso9660.h
+++ b/contrib/libcdio/cdio/iso9660.h
diff --git a/src/input/vcd/libcdio/cdio/logging.h b/contrib/libcdio/cdio/logging.h
index 8c78259ea..8c78259ea 100644
--- a/src/input/vcd/libcdio/cdio/logging.h
+++ b/contrib/libcdio/cdio/logging.h
diff --git a/src/input/vcd/libcdio/cdio/scsi_mmc.h b/contrib/libcdio/cdio/scsi_mmc.h
index 12860247e..12860247e 100644
--- a/src/input/vcd/libcdio/cdio/scsi_mmc.h
+++ b/contrib/libcdio/cdio/scsi_mmc.h
diff --git a/src/input/vcd/libcdio/cdio/sector.h b/contrib/libcdio/cdio/sector.h
index 826883aea..826883aea 100644
--- a/src/input/vcd/libcdio/cdio/sector.h
+++ b/contrib/libcdio/cdio/sector.h
diff --git a/src/input/vcd/libcdio/cdio/types.h b/contrib/libcdio/cdio/types.h
index ec84a142b..ec84a142b 100644
--- a/src/input/vcd/libcdio/cdio/types.h
+++ b/contrib/libcdio/cdio/types.h
diff --git a/src/input/vcd/libcdio/cdio/util.h b/contrib/libcdio/cdio/util.h
index 3cea313b4..3cea313b4 100644
--- a/src/input/vcd/libcdio/cdio/util.h
+++ b/contrib/libcdio/cdio/util.h
diff --git a/src/input/vcd/libcdio/cdio/version.h b/contrib/libcdio/cdio/version.h
index 345924cab..345924cab 100644
--- a/src/input/vcd/libcdio/cdio/version.h
+++ b/contrib/libcdio/cdio/version.h
diff --git a/src/input/vcd/libcdio/cdio/xa.h b/contrib/libcdio/cdio/xa.h
index 3af27eab5..3af27eab5 100644
--- a/src/input/vcd/libcdio/cdio/xa.h
+++ b/contrib/libcdio/cdio/xa.h
diff --git a/src/input/vcd/libcdio/cdio_assert.h b/contrib/libcdio/cdio_assert.h
index 2433bf0c7..2433bf0c7 100644
--- a/src/input/vcd/libcdio/cdio_assert.h
+++ b/contrib/libcdio/cdio_assert.h
diff --git a/src/input/vcd/libcdio/cdio_private.h b/contrib/libcdio/cdio_private.h
index b1e2777ed..b1e2777ed 100644
--- a/src/input/vcd/libcdio/cdio_private.h
+++ b/contrib/libcdio/cdio_private.h
diff --git a/src/input/vcd/libcdio/cdtext.c b/contrib/libcdio/cdtext.c
index 5842641f7..5842641f7 100644
--- a/src/input/vcd/libcdio/cdtext.c
+++ b/contrib/libcdio/cdtext.c
diff --git a/src/input/vcd/libcdio/cdtext_private.h b/contrib/libcdio/cdtext_private.h
index 03a9c4945..03a9c4945 100644
--- a/src/input/vcd/libcdio/cdtext_private.h
+++ b/contrib/libcdio/cdtext_private.h
diff --git a/src/input/vcd/libcdio/ds.c b/contrib/libcdio/ds.c
index 381c0f00c..381c0f00c 100644
--- a/src/input/vcd/libcdio/ds.c
+++ b/contrib/libcdio/ds.c
diff --git a/src/input/vcd/libcdio/generic.h b/contrib/libcdio/generic.h
index 9deb77254..9deb77254 100644
--- a/src/input/vcd/libcdio/generic.h
+++ b/contrib/libcdio/generic.h
diff --git a/src/input/vcd/libcdio/image.h b/contrib/libcdio/image.h
index 79c836d32..79c836d32 100644
--- a/src/input/vcd/libcdio/image.h
+++ b/contrib/libcdio/image.h
diff --git a/src/input/vcd/libcdio/image/Makefile.am b/contrib/libcdio/image/Makefile.am
index e7a09e980..e7a09e980 100644
--- a/src/input/vcd/libcdio/image/Makefile.am
+++ b/contrib/libcdio/image/Makefile.am
diff --git a/src/input/vcd/libcdio/image/bincue.c b/contrib/libcdio/image/bincue.c
index 56f0e151c..56f0e151c 100644
--- a/src/input/vcd/libcdio/image/bincue.c
+++ b/contrib/libcdio/image/bincue.c
diff --git a/src/input/vcd/libcdio/image/cdrdao.c b/contrib/libcdio/image/cdrdao.c
index 828172721..828172721 100644
--- a/src/input/vcd/libcdio/image/cdrdao.c
+++ b/contrib/libcdio/image/cdrdao.c
diff --git a/src/input/vcd/libcdio/image/nrg.c b/contrib/libcdio/image/nrg.c
index 40e5bbbf7..40e5bbbf7 100644
--- a/src/input/vcd/libcdio/image/nrg.c
+++ b/contrib/libcdio/image/nrg.c
diff --git a/src/input/vcd/libcdio/image/nrg.h b/contrib/libcdio/image/nrg.h
index 2923c78f1..2923c78f1 100644
--- a/src/input/vcd/libcdio/image/nrg.h
+++ b/contrib/libcdio/image/nrg.h
diff --git a/src/input/vcd/libcdio/image_common.h b/contrib/libcdio/image_common.h
index 30699c15c..30699c15c 100644
--- a/src/input/vcd/libcdio/image_common.h
+++ b/contrib/libcdio/image_common.h
diff --git a/src/input/vcd/libcdio/iso9660.c b/contrib/libcdio/iso9660.c
index 91b89d516..91b89d516 100644
--- a/src/input/vcd/libcdio/iso9660.c
+++ b/contrib/libcdio/iso9660.c
diff --git a/src/input/vcd/libcdio/iso9660_fs.c b/contrib/libcdio/iso9660_fs.c
index fff12cd7c..fff12cd7c 100644
--- a/src/input/vcd/libcdio/iso9660_fs.c
+++ b/contrib/libcdio/iso9660_fs.c
diff --git a/src/input/vcd/libcdio/iso9660_private.h b/contrib/libcdio/iso9660_private.h
index 9a10950aa..9a10950aa 100644
--- a/src/input/vcd/libcdio/iso9660_private.h
+++ b/contrib/libcdio/iso9660_private.h
diff --git a/src/input/vcd/libcdio/logging.c b/contrib/libcdio/logging.c
index 8d561debe..8d561debe 100644
--- a/src/input/vcd/libcdio/logging.c
+++ b/contrib/libcdio/logging.c
diff --git a/src/input/vcd/libcdio/portable.h b/contrib/libcdio/portable.h
index 3da436245..3da436245 100644
--- a/src/input/vcd/libcdio/portable.h
+++ b/contrib/libcdio/portable.h
diff --git a/src/input/vcd/libcdio/scsi_mmc.c b/contrib/libcdio/scsi_mmc.c
index 9b4a456a5..9b4a456a5 100644
--- a/src/input/vcd/libcdio/scsi_mmc.c
+++ b/contrib/libcdio/scsi_mmc.c
diff --git a/src/input/vcd/libcdio/scsi_mmc.h b/contrib/libcdio/scsi_mmc.h
index b6ea05b7a..b6ea05b7a 100644
--- a/src/input/vcd/libcdio/scsi_mmc.h
+++ b/contrib/libcdio/scsi_mmc.h
diff --git a/src/input/vcd/libcdio/scsi_mmc_private.h b/contrib/libcdio/scsi_mmc_private.h
index b3f1e7061..b3f1e7061 100644
--- a/src/input/vcd/libcdio/scsi_mmc_private.h
+++ b/contrib/libcdio/scsi_mmc_private.h
diff --git a/src/input/vcd/libcdio/sector.c b/contrib/libcdio/sector.c
index da49e9908..da49e9908 100644
--- a/src/input/vcd/libcdio/sector.c
+++ b/contrib/libcdio/sector.c
diff --git a/src/input/vcd/libcdio/util.c b/contrib/libcdio/util.c
index 9c646daf6..9c646daf6 100644
--- a/src/input/vcd/libcdio/util.c
+++ b/contrib/libcdio/util.c
diff --git a/src/input/vcd/libcdio/xa.c b/contrib/libcdio/xa.c
index f811f7ebd..f811f7ebd 100644
--- a/src/input/vcd/libcdio/xa.c
+++ b/contrib/libcdio/xa.c
diff --git a/src/video_out/libdha/.hgignore b/contrib/libdha/.hgignore
index 7b5ba91fb..7b5ba91fb 100644
--- a/src/video_out/libdha/.hgignore
+++ b/contrib/libdha/.hgignore
diff --git a/src/video_out/libdha/AsmMacros.h b/contrib/libdha/AsmMacros.h
index d1b136a7b..d1b136a7b 100644
--- a/src/video_out/libdha/AsmMacros.h
+++ b/contrib/libdha/AsmMacros.h
diff --git a/src/video_out/libdha/Makefile.am b/contrib/libdha/Makefile.am
index 05aebb704..8340fe671 100644
--- a/src/video_out/libdha/Makefile.am
+++ b/contrib/libdha/Makefile.am
@@ -25,7 +25,7 @@ nodist_libdha_la_SOURCES = pci_names.c
 EXTRA_PROGRAMS = test
 
 test_SOURCES = test.c
-test_LDADD = $(top_builddir)/src/video_out/libdha/libdha.la
+test_LDADD = libdha.la
 
 ## for OpenBSD LIBS += -li386
 
@@ -34,8 +34,8 @@ pci_db2c.awk:
 oth/pci.db:
 
 $(awk_generated): pci_db2c.awk oth/pci.db
-	LC_ALL=C $(AWK) -f $(top_srcdir)/src/video_out/libdha/pci_db2c.awk \
-		$(top_srcdir)/src/video_out/libdha/oth/pci.db
+	LC_ALL=C $(AWK) -f $(srcdir)/pci_db2c.awk \
+		$(srcdir)/oth/pci.db
 
 pci_names.lo: $(awk_generated)
 	source='$*.c' object='$@' libtool=yes \
diff --git a/src/video_out/libdha/README b/contrib/libdha/README
index a855880cd..a855880cd 100644
--- a/src/video_out/libdha/README
+++ b/contrib/libdha/README
diff --git a/src/video_out/libdha/bin/Makefile.am b/contrib/libdha/bin/Makefile.am
index 24c6d3abf..24c6d3abf 100644
--- a/src/video_out/libdha/bin/Makefile.am
+++ b/contrib/libdha/bin/Makefile.am
diff --git a/src/video_out/libdha/bin/README b/contrib/libdha/bin/README
index fe4bfa6f3..fe4bfa6f3 100644
--- a/src/video_out/libdha/bin/README
+++ b/contrib/libdha/bin/README
diff --git a/src/video_out/libdha/bin/mapdev.copyright b/contrib/libdha/bin/mapdev.copyright
index b22433d29..b22433d29 100644
--- a/src/video_out/libdha/bin/mapdev.copyright
+++ b/contrib/libdha/bin/mapdev.copyright
diff --git a/src/video_out/libdha/bin/mapdev.vxd b/contrib/libdha/bin/mapdev.vxd
index e09194b84..e09194b84 100644
--- a/src/video_out/libdha/bin/mapdev.vxd
+++ b/contrib/libdha/bin/mapdev.vxd
diff --git a/src/video_out/libdha/cpu_flush.c b/contrib/libdha/cpu_flush.c
index 9186f89e8..9186f89e8 100644
--- a/src/video_out/libdha/cpu_flush.c
+++ b/contrib/libdha/cpu_flush.c
diff --git a/src/video_out/libdha/irq.c b/contrib/libdha/irq.c
index abccaf74c..abccaf74c 100644
--- a/src/video_out/libdha/irq.c
+++ b/contrib/libdha/irq.c
diff --git a/src/video_out/libdha/kernelhelper/Makefile.am b/contrib/libdha/kernelhelper/Makefile.am
index fffaab433..fffaab433 100644
--- a/src/video_out/libdha/kernelhelper/Makefile.am
+++ b/contrib/libdha/kernelhelper/Makefile.am
diff --git a/src/video_out/libdha/kernelhelper/README b/contrib/libdha/kernelhelper/README
index 98a7923b3..98a7923b3 100644
--- a/src/video_out/libdha/kernelhelper/README
+++ b/contrib/libdha/kernelhelper/README
diff --git a/src/video_out/libdha/kernelhelper/dhahelper.c b/contrib/libdha/kernelhelper/dhahelper.c
index 0e755064a..0e755064a 100644
--- a/src/video_out/libdha/kernelhelper/dhahelper.c
+++ b/contrib/libdha/kernelhelper/dhahelper.c
diff --git a/src/video_out/libdha/kernelhelper/dhahelper.h b/contrib/libdha/kernelhelper/dhahelper.h
index 7db56abb5..7db56abb5 100644
--- a/src/video_out/libdha/kernelhelper/dhahelper.h
+++ b/contrib/libdha/kernelhelper/dhahelper.h
diff --git a/src/video_out/libdha/kernelhelper/test.c b/contrib/libdha/kernelhelper/test.c
index d2d807f3f..d2d807f3f 100644
--- a/src/video_out/libdha/kernelhelper/test.c
+++ b/contrib/libdha/kernelhelper/test.c
diff --git a/src/video_out/libdha/libdha.c b/contrib/libdha/libdha.c
index 73a4387a2..73a4387a2 100644
--- a/src/video_out/libdha/libdha.c
+++ b/contrib/libdha/libdha.c
diff --git a/src/video_out/libdha/libdha.h b/contrib/libdha/libdha.h
index 2bd8fe39b..2bd8fe39b 100644
--- a/src/video_out/libdha/libdha.h
+++ b/contrib/libdha/libdha.h
diff --git a/src/video_out/libdha/mmi.c b/contrib/libdha/mmi.c
index 39d21926a..39d21926a 100644
--- a/src/video_out/libdha/mmi.c
+++ b/contrib/libdha/mmi.c
diff --git a/src/video_out/libdha/mtrr.c b/contrib/libdha/mtrr.c
index 48ae5a1fd..48ae5a1fd 100644
--- a/src/video_out/libdha/mtrr.c
+++ b/contrib/libdha/mtrr.c
diff --git a/src/video_out/libdha/oth/Makefile.am b/contrib/libdha/oth/Makefile.am
index 55651d233..55651d233 100644
--- a/src/video_out/libdha/oth/Makefile.am
+++ b/contrib/libdha/oth/Makefile.am
diff --git a/src/video_out/libdha/oth/pci.db b/contrib/libdha/oth/pci.db
index 083b2892f..083b2892f 100644
--- a/src/video_out/libdha/oth/pci.db
+++ b/contrib/libdha/oth/pci.db
diff --git a/src/video_out/libdha/pci.c b/contrib/libdha/pci.c
index db8f4ddd5..db8f4ddd5 100644
--- a/src/video_out/libdha/pci.c
+++ b/contrib/libdha/pci.c
diff --git a/src/video_out/libdha/pci_db2c.awk b/contrib/libdha/pci_db2c.awk
index feaa1c7a1..feaa1c7a1 100644
--- a/src/video_out/libdha/pci_db2c.awk
+++ b/contrib/libdha/pci_db2c.awk
diff --git a/src/video_out/libdha/ports.c b/contrib/libdha/ports.c
index b531082d3..b531082d3 100644
--- a/src/video_out/libdha/ports.c
+++ b/contrib/libdha/ports.c
diff --git a/src/video_out/libdha/sysdep/AsmMacros_alpha.h b/contrib/libdha/sysdep/AsmMacros_alpha.h
index 59da53891..59da53891 100644
--- a/src/video_out/libdha/sysdep/AsmMacros_alpha.h
+++ b/contrib/libdha/sysdep/AsmMacros_alpha.h
diff --git a/src/video_out/libdha/sysdep/AsmMacros_arm32.h b/contrib/libdha/sysdep/AsmMacros_arm32.h
index e618d32ee..e618d32ee 100644
--- a/src/video_out/libdha/sysdep/AsmMacros_arm32.h
+++ b/contrib/libdha/sysdep/AsmMacros_arm32.h
diff --git a/src/video_out/libdha/sysdep/AsmMacros_generic.h b/contrib/libdha/sysdep/AsmMacros_generic.h
index 183f831e5..183f831e5 100644
--- a/src/video_out/libdha/sysdep/AsmMacros_generic.h
+++ b/contrib/libdha/sysdep/AsmMacros_generic.h
diff --git a/src/video_out/libdha/sysdep/AsmMacros_ia64.h b/contrib/libdha/sysdep/AsmMacros_ia64.h
index 7d6123f33..7d6123f33 100644
--- a/src/video_out/libdha/sysdep/AsmMacros_ia64.h
+++ b/contrib/libdha/sysdep/AsmMacros_ia64.h
diff --git a/src/video_out/libdha/sysdep/AsmMacros_powerpc.h b/contrib/libdha/sysdep/AsmMacros_powerpc.h
index 2169c96b4..2169c96b4 100644
--- a/src/video_out/libdha/sysdep/AsmMacros_powerpc.h
+++ b/contrib/libdha/sysdep/AsmMacros_powerpc.h
diff --git a/src/video_out/libdha/sysdep/AsmMacros_sparc.h b/contrib/libdha/sysdep/AsmMacros_sparc.h
index f6717b4bb..f6717b4bb 100644
--- a/src/video_out/libdha/sysdep/AsmMacros_sparc.h
+++ b/contrib/libdha/sysdep/AsmMacros_sparc.h
diff --git a/src/video_out/libdha/sysdep/AsmMacros_x86.h b/contrib/libdha/sysdep/AsmMacros_x86.h
index 97dcaae16..97dcaae16 100644
--- a/src/video_out/libdha/sysdep/AsmMacros_x86.h
+++ b/contrib/libdha/sysdep/AsmMacros_x86.h
diff --git a/src/video_out/libdha/sysdep/Makefile.am b/contrib/libdha/sysdep/Makefile.am
index 807572c39..807572c39 100644
--- a/src/video_out/libdha/sysdep/Makefile.am
+++ b/contrib/libdha/sysdep/Makefile.am
diff --git a/src/video_out/libdha/sysdep/libdha_os2.c b/contrib/libdha/sysdep/libdha_os2.c
index 041f6be71..041f6be71 100644
--- a/src/video_out/libdha/sysdep/libdha_os2.c
+++ b/contrib/libdha/sysdep/libdha_os2.c
diff --git a/src/video_out/libdha/sysdep/libdha_win32.c b/contrib/libdha/sysdep/libdha_win32.c
index 75c5dfb94..75c5dfb94 100644
--- a/src/video_out/libdha/sysdep/libdha_win32.c
+++ b/contrib/libdha/sysdep/libdha_win32.c
diff --git a/src/video_out/libdha/sysdep/pci_386bsd.c b/contrib/libdha/sysdep/pci_386bsd.c
index d00ecb078..d00ecb078 100644
--- a/src/video_out/libdha/sysdep/pci_386bsd.c
+++ b/contrib/libdha/sysdep/pci_386bsd.c
diff --git a/src/video_out/libdha/sysdep/pci_alpha.c b/contrib/libdha/sysdep/pci_alpha.c
index 74c3eb687..74c3eb687 100644
--- a/src/video_out/libdha/sysdep/pci_alpha.c
+++ b/contrib/libdha/sysdep/pci_alpha.c
diff --git a/src/video_out/libdha/sysdep/pci_arm32.c b/contrib/libdha/sysdep/pci_arm32.c
index 6920b615e..6920b615e 100644
--- a/src/video_out/libdha/sysdep/pci_arm32.c
+++ b/contrib/libdha/sysdep/pci_arm32.c
diff --git a/src/video_out/libdha/sysdep/pci_bsdi.c b/contrib/libdha/sysdep/pci_bsdi.c
index b6b142054..b6b142054 100644
--- a/src/video_out/libdha/sysdep/pci_bsdi.c
+++ b/contrib/libdha/sysdep/pci_bsdi.c
diff --git a/src/video_out/libdha/sysdep/pci_freebsd.c b/contrib/libdha/sysdep/pci_freebsd.c
index 9ad4b15f2..9ad4b15f2 100644
--- a/src/video_out/libdha/sysdep/pci_freebsd.c
+++ b/contrib/libdha/sysdep/pci_freebsd.c
diff --git a/src/video_out/libdha/sysdep/pci_generic_cpu.c b/contrib/libdha/sysdep/pci_generic_cpu.c
index 729d48b5a..729d48b5a 100644
--- a/src/video_out/libdha/sysdep/pci_generic_cpu.c
+++ b/contrib/libdha/sysdep/pci_generic_cpu.c
diff --git a/src/video_out/libdha/sysdep/pci_generic_os.c b/contrib/libdha/sysdep/pci_generic_os.c
index 8855bb4ba..8855bb4ba 100644
--- a/src/video_out/libdha/sysdep/pci_generic_os.c
+++ b/contrib/libdha/sysdep/pci_generic_os.c
diff --git a/src/video_out/libdha/sysdep/pci_ia64.c b/contrib/libdha/sysdep/pci_ia64.c
index ef2074ab2..ef2074ab2 100644
--- a/src/video_out/libdha/sysdep/pci_ia64.c
+++ b/contrib/libdha/sysdep/pci_ia64.c
diff --git a/src/video_out/libdha/sysdep/pci_isc.c b/contrib/libdha/sysdep/pci_isc.c
index 5b5a59182..5b5a59182 100644
--- a/src/video_out/libdha/sysdep/pci_isc.c
+++ b/contrib/libdha/sysdep/pci_isc.c
diff --git a/src/video_out/libdha/sysdep/pci_linux.c b/contrib/libdha/sysdep/pci_linux.c
index 1d2116da6..1d2116da6 100644
--- a/src/video_out/libdha/sysdep/pci_linux.c
+++ b/contrib/libdha/sysdep/pci_linux.c
diff --git a/src/video_out/libdha/sysdep/pci_lynx.c b/contrib/libdha/sysdep/pci_lynx.c
index b698f6308..b698f6308 100644
--- a/src/video_out/libdha/sysdep/pci_lynx.c
+++ b/contrib/libdha/sysdep/pci_lynx.c
diff --git a/src/video_out/libdha/sysdep/pci_mach386.c b/contrib/libdha/sysdep/pci_mach386.c
index 31621862b..31621862b 100644
--- a/src/video_out/libdha/sysdep/pci_mach386.c
+++ b/contrib/libdha/sysdep/pci_mach386.c
diff --git a/src/video_out/libdha/sysdep/pci_netbsd.c b/contrib/libdha/sysdep/pci_netbsd.c
index 793944beb..793944beb 100644
--- a/src/video_out/libdha/sysdep/pci_netbsd.c
+++ b/contrib/libdha/sysdep/pci_netbsd.c
diff --git a/src/video_out/libdha/sysdep/pci_openbsd.c b/contrib/libdha/sysdep/pci_openbsd.c
index 89c85eab6..89c85eab6 100644
--- a/src/video_out/libdha/sysdep/pci_openbsd.c
+++ b/contrib/libdha/sysdep/pci_openbsd.c
diff --git a/src/video_out/libdha/sysdep/pci_os2.c b/contrib/libdha/sysdep/pci_os2.c
index ddfc0c0ea..ddfc0c0ea 100644
--- a/src/video_out/libdha/sysdep/pci_os2.c
+++ b/contrib/libdha/sysdep/pci_os2.c
diff --git a/src/video_out/libdha/sysdep/pci_powerpc.c b/contrib/libdha/sysdep/pci_powerpc.c
index 667b4db37..667b4db37 100644
--- a/src/video_out/libdha/sysdep/pci_powerpc.c
+++ b/contrib/libdha/sysdep/pci_powerpc.c
diff --git a/src/video_out/libdha/sysdep/pci_sco.c b/contrib/libdha/sysdep/pci_sco.c
index 9cb2282ad..9cb2282ad 100644
--- a/src/video_out/libdha/sysdep/pci_sco.c
+++ b/contrib/libdha/sysdep/pci_sco.c
diff --git a/src/video_out/libdha/sysdep/pci_sparc.c b/contrib/libdha/sysdep/pci_sparc.c
index ef2074ab2..ef2074ab2 100644
--- a/src/video_out/libdha/sysdep/pci_sparc.c
+++ b/contrib/libdha/sysdep/pci_sparc.c
diff --git a/src/video_out/libdha/sysdep/pci_svr4.c b/contrib/libdha/sysdep/pci_svr4.c
index bcce5c901..bcce5c901 100644
--- a/src/video_out/libdha/sysdep/pci_svr4.c
+++ b/contrib/libdha/sysdep/pci_svr4.c
diff --git a/src/video_out/libdha/sysdep/pci_win32.c b/contrib/libdha/sysdep/pci_win32.c
index 1c88cb13e..1c88cb13e 100644
--- a/src/video_out/libdha/sysdep/pci_win32.c
+++ b/contrib/libdha/sysdep/pci_win32.c
diff --git a/src/video_out/libdha/sysdep/pci_x86.c b/contrib/libdha/sysdep/pci_x86.c
index ef2074ab2..ef2074ab2 100644
--- a/src/video_out/libdha/sysdep/pci_x86.c
+++ b/contrib/libdha/sysdep/pci_x86.c
diff --git a/src/video_out/libdha/test.c b/contrib/libdha/test.c
index 857e739c6..857e739c6 100644
--- a/src/video_out/libdha/test.c
+++ b/contrib/libdha/test.c
diff --git a/src/libfaad/Makefile.am b/contrib/libfaad/Makefile.am
index 379033b15..835457e0c 100644
--- a/src/libfaad/Makefile.am
+++ b/contrib/libfaad/Makefile.am
@@ -3,11 +3,49 @@ include $(top_srcdir)/misc/Makefile.common
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
-VPATH = @srcdir@:@srcdir@/codebook:
-
-SUBDIRS = codebook
+if ENABLE_FAAD
+noinst_LTLIBRARIES = libfaad.la
+endif
 
-noinst_HEADERS = \
+libfaad_la_SOURCES = \
+	bits.c \
+	cfft.c \
+	common.c \
+	decoder.c \
+	drc.c \
+	drm_dec.c \
+	error.c \
+	filtbank.c \
+	hcr.c \
+	huffman.c \
+	ic_predict.c \
+	is.c \
+	lt_predict.c \
+	mdct.c \
+	mp4.c \
+	ms.c \
+	output.c \
+	pns.c \
+	ps_dec.c \
+	ps_syntax.c \
+	pulse.c \
+	rvlc.c \
+	sbr_dct.c \
+	sbr_dec.c \
+	sbr_e_nf.c \
+	sbr_fbt.c \
+	sbr_hfadj.c \
+	sbr_hfgen.c \
+	sbr_huff.c \
+	sbr_qmf.c \
+	sbr_syntax.c \
+	sbr_tf_grid.c \
+	specrec.c \
+	ssr.c \
+	ssr_fb.c \
+	ssr_ipqf.c \
+	syntax.c \
+	tns.c \
 	analysis.h \
 	bits.h \
 	cfft.h \
@@ -55,52 +93,19 @@ noinst_HEADERS = \
 	ssr_win.h \
 	structs.h \
 	syntax.h \
-	tns.h 
-
-if ENABLE_FAAD
-xineplug_LTLIBRARIES = xineplug_decode_faad.la
-endif
-
-xineplug_decode_faad_la_SOURCES = \
-	bits.c \
-	cfft.c \
-	common.c \
-	decoder.c \
-	drc.c \
-	drm_dec.c \
-	error.c \
-	filtbank.c \
-	hcr.c \
-	huffman.c \
-	ic_predict.c \
-	is.c \
-	lt_predict.c \
-	mdct.c \
-	mp4.c \
-	ms.c \
-	output.c \
-	pns.c \
-	ps_dec.c \
-	ps_syntax.c \
-	pulse.c \
-	rvlc.c \
-	sbr_dct.c \
-	sbr_dec.c \
-	sbr_e_nf.c \
-	sbr_fbt.c \
-	sbr_hfadj.c \
-	sbr_hfgen.c \
-	sbr_huff.c \
-	sbr_qmf.c \
-	sbr_syntax.c \
-	sbr_tf_grid.c \
-	specrec.c \
-	ssr.c \
-	ssr_fb.c \
-	ssr_ipqf.c \
-	syntax.c \
-	tns.c \
-	xine_faad_decoder.c
+	tns.h \
+	codebook/hcb.h \
+	codebook/hcb_1.h \
+	codebook/hcb_2.h \
+	codebook/hcb_3.h \
+	codebook/hcb_4.h \
+	codebook/hcb_5.h \
+	codebook/hcb_6.h \
+	codebook/hcb_7.h \
+	codebook/hcb_8.h \
+	codebook/hcb_9.h \
+	codebook/hcb_10.h \
+	codebook/hcb_11.h \
+	codebook/hcb_sf.h 
 
-xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB)
-xineplug_decode_faad_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
+libfaad_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
diff --git a/src/libfaad/analysis.h b/contrib/libfaad/analysis.h
index 810a95f3b..810a95f3b 100644
--- a/src/libfaad/analysis.h
+++ b/contrib/libfaad/analysis.h
diff --git a/src/libfaad/bits.c b/contrib/libfaad/bits.c
index ae273c7d8..ae273c7d8 100644
--- a/src/libfaad/bits.c
+++ b/contrib/libfaad/bits.c
diff --git a/src/libfaad/bits.h b/contrib/libfaad/bits.h
index 05460f0cc..05460f0cc 100644
--- a/src/libfaad/bits.h
+++ b/contrib/libfaad/bits.h
diff --git a/src/libfaad/cfft.c b/contrib/libfaad/cfft.c
index 61cac2fd5..61cac2fd5 100644
--- a/src/libfaad/cfft.c
+++ b/contrib/libfaad/cfft.c
diff --git a/src/libfaad/cfft.h b/contrib/libfaad/cfft.h
index a29537bed..a29537bed 100644
--- a/src/libfaad/cfft.h
+++ b/contrib/libfaad/cfft.h
diff --git a/src/libfaad/cfft_tab.h b/contrib/libfaad/cfft_tab.h
index 072a991f1..072a991f1 100644
--- a/src/libfaad/cfft_tab.h
+++ b/contrib/libfaad/cfft_tab.h
diff --git a/src/libfaad/codebook/hcb.h b/contrib/libfaad/codebook/hcb.h
index 96093300c..96093300c 100644
--- a/src/libfaad/codebook/hcb.h
+++ b/contrib/libfaad/codebook/hcb.h
diff --git a/src/libfaad/codebook/hcb_1.h b/contrib/libfaad/codebook/hcb_1.h
index 220299c55..220299c55 100644
--- a/src/libfaad/codebook/hcb_1.h
+++ b/contrib/libfaad/codebook/hcb_1.h
diff --git a/src/libfaad/codebook/hcb_10.h b/contrib/libfaad/codebook/hcb_10.h
index 60bcab90a..60bcab90a 100644
--- a/src/libfaad/codebook/hcb_10.h
+++ b/contrib/libfaad/codebook/hcb_10.h
diff --git a/src/libfaad/codebook/hcb_11.h b/contrib/libfaad/codebook/hcb_11.h
index bd4f647e6..bd4f647e6 100644
--- a/src/libfaad/codebook/hcb_11.h
+++ b/contrib/libfaad/codebook/hcb_11.h
diff --git a/src/libfaad/codebook/hcb_2.h b/contrib/libfaad/codebook/hcb_2.h
index 6aff6b12b..6aff6b12b 100644
--- a/src/libfaad/codebook/hcb_2.h
+++ b/contrib/libfaad/codebook/hcb_2.h
diff --git a/src/libfaad/codebook/hcb_3.h b/contrib/libfaad/codebook/hcb_3.h
index 25b54da90..25b54da90 100644
--- a/src/libfaad/codebook/hcb_3.h
+++ b/contrib/libfaad/codebook/hcb_3.h
diff --git a/src/libfaad/codebook/hcb_4.h b/contrib/libfaad/codebook/hcb_4.h
index 9378b0980..9378b0980 100644
--- a/src/libfaad/codebook/hcb_4.h
+++ b/contrib/libfaad/codebook/hcb_4.h
diff --git a/src/libfaad/codebook/hcb_5.h b/contrib/libfaad/codebook/hcb_5.h
index 7e50207e3..7e50207e3 100644
--- a/src/libfaad/codebook/hcb_5.h
+++ b/contrib/libfaad/codebook/hcb_5.h
diff --git a/src/libfaad/codebook/hcb_6.h b/contrib/libfaad/codebook/hcb_6.h
index 12417d997..12417d997 100644
--- a/src/libfaad/codebook/hcb_6.h
+++ b/contrib/libfaad/codebook/hcb_6.h
diff --git a/src/libfaad/codebook/hcb_7.h b/contrib/libfaad/codebook/hcb_7.h
index e5392326d..e5392326d 100644
--- a/src/libfaad/codebook/hcb_7.h
+++ b/contrib/libfaad/codebook/hcb_7.h
diff --git a/src/libfaad/codebook/hcb_8.h b/contrib/libfaad/codebook/hcb_8.h
index 951743bed..951743bed 100644
--- a/src/libfaad/codebook/hcb_8.h
+++ b/contrib/libfaad/codebook/hcb_8.h
diff --git a/src/libfaad/codebook/hcb_9.h b/contrib/libfaad/codebook/hcb_9.h
index daccf6197..daccf6197 100644
--- a/src/libfaad/codebook/hcb_9.h
+++ b/contrib/libfaad/codebook/hcb_9.h
diff --git a/src/libfaad/codebook/hcb_sf.h b/contrib/libfaad/codebook/hcb_sf.h
index 494053177..494053177 100644
--- a/src/libfaad/codebook/hcb_sf.h
+++ b/contrib/libfaad/codebook/hcb_sf.h
diff --git a/src/libfaad/common.c b/contrib/libfaad/common.c
index 8c0d93e95..8c0d93e95 100644
--- a/src/libfaad/common.c
+++ b/contrib/libfaad/common.c
diff --git a/src/libfaad/common.h b/contrib/libfaad/common.h
index 47832e648..47832e648 100644
--- a/src/libfaad/common.h
+++ b/contrib/libfaad/common.h
diff --git a/src/libfaad/decoder.c b/contrib/libfaad/decoder.c
index 33aee247e..33aee247e 100644
--- a/src/libfaad/decoder.c
+++ b/contrib/libfaad/decoder.c
diff --git a/src/libfaad/decoder.h b/contrib/libfaad/decoder.h
index 5a3a2663f..5a3a2663f 100644
--- a/src/libfaad/decoder.h
+++ b/contrib/libfaad/decoder.h
diff --git a/src/libfaad/diff_to_faad2_cvs.patch b/contrib/libfaad/diff_to_faad2_cvs.patch
index 0d8490f2e..0d8490f2e 100644
--- a/src/libfaad/diff_to_faad2_cvs.patch
+++ b/contrib/libfaad/diff_to_faad2_cvs.patch
diff --git a/src/libfaad/drc.c b/contrib/libfaad/drc.c
index ef4b6a96e..ef4b6a96e 100644
--- a/src/libfaad/drc.c
+++ b/contrib/libfaad/drc.c
diff --git a/src/libfaad/drc.h b/contrib/libfaad/drc.h
index 046ecbc3e..046ecbc3e 100644
--- a/src/libfaad/drc.h
+++ b/contrib/libfaad/drc.h
diff --git a/src/libfaad/drm_dec.c b/contrib/libfaad/drm_dec.c
index a782b0f22..a782b0f22 100644
--- a/src/libfaad/drm_dec.c
+++ b/contrib/libfaad/drm_dec.c
diff --git a/src/libfaad/drm_dec.h b/contrib/libfaad/drm_dec.h
index bb7d6dc93..bb7d6dc93 100644
--- a/src/libfaad/drm_dec.h
+++ b/contrib/libfaad/drm_dec.h
diff --git a/src/libfaad/error.c b/contrib/libfaad/error.c
index 2fbe08fc1..2fbe08fc1 100644
--- a/src/libfaad/error.c
+++ b/contrib/libfaad/error.c
diff --git a/src/libfaad/error.h b/contrib/libfaad/error.h
index 1009a9f57..1009a9f57 100644
--- a/src/libfaad/error.h
+++ b/contrib/libfaad/error.h
diff --git a/src/libfaad/faad.h b/contrib/libfaad/faad.h
index e46c31d87..e46c31d87 100644
--- a/src/libfaad/faad.h
+++ b/contrib/libfaad/faad.h
diff --git a/src/libfaad/filtbank.c b/contrib/libfaad/filtbank.c
index 2919b5be3..2919b5be3 100644
--- a/src/libfaad/filtbank.c
+++ b/contrib/libfaad/filtbank.c
diff --git a/src/libfaad/filtbank.h b/contrib/libfaad/filtbank.h
index 54c72c0ef..54c72c0ef 100644
--- a/src/libfaad/filtbank.h
+++ b/contrib/libfaad/filtbank.h
diff --git a/src/libfaad/fixed.h b/contrib/libfaad/fixed.h
index c58ee26cb..c58ee26cb 100644
--- a/src/libfaad/fixed.h
+++ b/contrib/libfaad/fixed.h
diff --git a/src/libfaad/hcr.c b/contrib/libfaad/hcr.c
index 94f08fd2a..94f08fd2a 100644
--- a/src/libfaad/hcr.c
+++ b/contrib/libfaad/hcr.c
diff --git a/src/libfaad/huffman.c b/contrib/libfaad/huffman.c
index 6c24a6cec..6c24a6cec 100644
--- a/src/libfaad/huffman.c
+++ b/contrib/libfaad/huffman.c
diff --git a/src/libfaad/huffman.h b/contrib/libfaad/huffman.h
index cffe23093..cffe23093 100644
--- a/src/libfaad/huffman.h
+++ b/contrib/libfaad/huffman.h
diff --git a/src/libfaad/ic_predict.c b/contrib/libfaad/ic_predict.c
index 82753a9f2..82753a9f2 100644
--- a/src/libfaad/ic_predict.c
+++ b/contrib/libfaad/ic_predict.c
diff --git a/src/libfaad/ic_predict.h b/contrib/libfaad/ic_predict.h
index 233992b96..233992b96 100644
--- a/src/libfaad/ic_predict.h
+++ b/contrib/libfaad/ic_predict.h
diff --git a/src/libfaad/iq_table.h b/contrib/libfaad/iq_table.h
index 9002e15d7..9002e15d7 100644
--- a/src/libfaad/iq_table.h
+++ b/contrib/libfaad/iq_table.h
diff --git a/src/libfaad/is.c b/contrib/libfaad/is.c
index 9fcdbcbb5..9fcdbcbb5 100644
--- a/src/libfaad/is.c
+++ b/contrib/libfaad/is.c
diff --git a/src/libfaad/is.h b/contrib/libfaad/is.h
index 0786f7258..0786f7258 100644
--- a/src/libfaad/is.h
+++ b/contrib/libfaad/is.h
diff --git a/src/libfaad/kbd_win.h b/contrib/libfaad/kbd_win.h
index 046b6b995..046b6b995 100644
--- a/src/libfaad/kbd_win.h
+++ b/contrib/libfaad/kbd_win.h
diff --git a/src/libfaad/lt_predict.c b/contrib/libfaad/lt_predict.c
index 3aab00426..3aab00426 100644
--- a/src/libfaad/lt_predict.c
+++ b/contrib/libfaad/lt_predict.c
diff --git a/src/libfaad/lt_predict.h b/contrib/libfaad/lt_predict.h
index faa2fbca7..faa2fbca7 100644
--- a/src/libfaad/lt_predict.h
+++ b/contrib/libfaad/lt_predict.h
diff --git a/src/libfaad/mdct.c b/contrib/libfaad/mdct.c
index 0df3d6aae..0df3d6aae 100644
--- a/src/libfaad/mdct.c
+++ b/contrib/libfaad/mdct.c
diff --git a/src/libfaad/mdct.h b/contrib/libfaad/mdct.h
index c2b738795..c2b738795 100644
--- a/src/libfaad/mdct.h
+++ b/contrib/libfaad/mdct.h
diff --git a/src/libfaad/mdct_tab.h b/contrib/libfaad/mdct_tab.h
index 7dd17166b..7dd17166b 100644
--- a/src/libfaad/mdct_tab.h
+++ b/contrib/libfaad/mdct_tab.h
diff --git a/src/libfaad/mp4.c b/contrib/libfaad/mp4.c
index 651280805..651280805 100644
--- a/src/libfaad/mp4.c
+++ b/contrib/libfaad/mp4.c
diff --git a/src/libfaad/mp4.h b/contrib/libfaad/mp4.h
index 478c9b9be..478c9b9be 100644
--- a/src/libfaad/mp4.h
+++ b/contrib/libfaad/mp4.h
diff --git a/src/libfaad/ms.c b/contrib/libfaad/ms.c
index 93b0a2051..93b0a2051 100644
--- a/src/libfaad/ms.c
+++ b/contrib/libfaad/ms.c
diff --git a/src/libfaad/ms.h b/contrib/libfaad/ms.h
index 4bc7c8175..4bc7c8175 100644
--- a/src/libfaad/ms.h
+++ b/contrib/libfaad/ms.h
diff --git a/src/libfaad/output.c b/contrib/libfaad/output.c
index 33ebed39c..33ebed39c 100644
--- a/src/libfaad/output.c
+++ b/contrib/libfaad/output.c
diff --git a/src/libfaad/output.h b/contrib/libfaad/output.h
index 1b15dae58..1b15dae58 100644
--- a/src/libfaad/output.h
+++ b/contrib/libfaad/output.h
diff --git a/src/libfaad/pns.c b/contrib/libfaad/pns.c
index 5266d8eef..5266d8eef 100644
--- a/src/libfaad/pns.c
+++ b/contrib/libfaad/pns.c
diff --git a/src/libfaad/pns.h b/contrib/libfaad/pns.h
index 2f246cc4f..2f246cc4f 100644
--- a/src/libfaad/pns.h
+++ b/contrib/libfaad/pns.h
diff --git a/src/libfaad/ps_dec.c b/contrib/libfaad/ps_dec.c
index 3b957bfda..3b957bfda 100644
--- a/src/libfaad/ps_dec.c
+++ b/contrib/libfaad/ps_dec.c
diff --git a/src/libfaad/ps_dec.h b/contrib/libfaad/ps_dec.h
index 978161fff..978161fff 100644
--- a/src/libfaad/ps_dec.h
+++ b/contrib/libfaad/ps_dec.h
diff --git a/src/libfaad/ps_syntax.c b/contrib/libfaad/ps_syntax.c
index fc2f9e7f2..fc2f9e7f2 100644
--- a/src/libfaad/ps_syntax.c
+++ b/contrib/libfaad/ps_syntax.c
diff --git a/src/libfaad/ps_tables.h b/contrib/libfaad/ps_tables.h
index c71489617..c71489617 100644
--- a/src/libfaad/ps_tables.h
+++ b/contrib/libfaad/ps_tables.h
diff --git a/src/libfaad/pulse.c b/contrib/libfaad/pulse.c
index 9e0a705e6..9e0a705e6 100644
--- a/src/libfaad/pulse.c
+++ b/contrib/libfaad/pulse.c
diff --git a/src/libfaad/pulse.h b/contrib/libfaad/pulse.h
index a057c0d3b..a057c0d3b 100644
--- a/src/libfaad/pulse.h
+++ b/contrib/libfaad/pulse.h
diff --git a/src/libfaad/rvlc.c b/contrib/libfaad/rvlc.c
index bad49a0c6..bad49a0c6 100644
--- a/src/libfaad/rvlc.c
+++ b/contrib/libfaad/rvlc.c
diff --git a/src/libfaad/rvlc.h b/contrib/libfaad/rvlc.h
index 867468580..867468580 100644
--- a/src/libfaad/rvlc.h
+++ b/contrib/libfaad/rvlc.h
diff --git a/src/libfaad/sbr_dct.c b/contrib/libfaad/sbr_dct.c
index ba8bbaf9b..ba8bbaf9b 100644
--- a/src/libfaad/sbr_dct.c
+++ b/contrib/libfaad/sbr_dct.c
diff --git a/src/libfaad/sbr_dct.h b/contrib/libfaad/sbr_dct.h
index 6293486c7..6293486c7 100644
--- a/src/libfaad/sbr_dct.h
+++ b/contrib/libfaad/sbr_dct.h
diff --git a/src/libfaad/sbr_dec.c b/contrib/libfaad/sbr_dec.c
index 24c1f5031..24c1f5031 100644
--- a/src/libfaad/sbr_dec.c
+++ b/contrib/libfaad/sbr_dec.c
diff --git a/src/libfaad/sbr_dec.h b/contrib/libfaad/sbr_dec.h
index 5efd5c5e0..5efd5c5e0 100644
--- a/src/libfaad/sbr_dec.h
+++ b/contrib/libfaad/sbr_dec.h
diff --git a/src/libfaad/sbr_e_nf.c b/contrib/libfaad/sbr_e_nf.c
index 2d2bf4f85..2d2bf4f85 100644
--- a/src/libfaad/sbr_e_nf.c
+++ b/contrib/libfaad/sbr_e_nf.c
diff --git a/src/libfaad/sbr_e_nf.h b/contrib/libfaad/sbr_e_nf.h
index 48874c125..48874c125 100644
--- a/src/libfaad/sbr_e_nf.h
+++ b/contrib/libfaad/sbr_e_nf.h
diff --git a/src/libfaad/sbr_fbt.c b/contrib/libfaad/sbr_fbt.c
index 511235863..511235863 100644
--- a/src/libfaad/sbr_fbt.c
+++ b/contrib/libfaad/sbr_fbt.c
diff --git a/src/libfaad/sbr_fbt.h b/contrib/libfaad/sbr_fbt.h
index 26c580efe..26c580efe 100644
--- a/src/libfaad/sbr_fbt.h
+++ b/contrib/libfaad/sbr_fbt.h
diff --git a/src/libfaad/sbr_hfadj.c b/contrib/libfaad/sbr_hfadj.c
index 081f731e9..081f731e9 100644
--- a/src/libfaad/sbr_hfadj.c
+++ b/contrib/libfaad/sbr_hfadj.c
diff --git a/src/libfaad/sbr_hfadj.h b/contrib/libfaad/sbr_hfadj.h
index aeaba32e8..aeaba32e8 100644
--- a/src/libfaad/sbr_hfadj.h
+++ b/contrib/libfaad/sbr_hfadj.h
diff --git a/src/libfaad/sbr_hfgen.c b/contrib/libfaad/sbr_hfgen.c
index 688b9a0ea..688b9a0ea 100644
--- a/src/libfaad/sbr_hfgen.c
+++ b/contrib/libfaad/sbr_hfgen.c
diff --git a/src/libfaad/sbr_hfgen.h b/contrib/libfaad/sbr_hfgen.h
index 27a58be61..27a58be61 100644
--- a/src/libfaad/sbr_hfgen.h
+++ b/contrib/libfaad/sbr_hfgen.h
diff --git a/src/libfaad/sbr_huff.c b/contrib/libfaad/sbr_huff.c
index 39ae32b9b..39ae32b9b 100644
--- a/src/libfaad/sbr_huff.c
+++ b/contrib/libfaad/sbr_huff.c
diff --git a/src/libfaad/sbr_huff.h b/contrib/libfaad/sbr_huff.h
index 631a43a8d..631a43a8d 100644
--- a/src/libfaad/sbr_huff.h
+++ b/contrib/libfaad/sbr_huff.h
diff --git a/src/libfaad/sbr_noise.h b/contrib/libfaad/sbr_noise.h
index a25fbf3cd..a25fbf3cd 100644
--- a/src/libfaad/sbr_noise.h
+++ b/contrib/libfaad/sbr_noise.h
diff --git a/src/libfaad/sbr_qmf.c b/contrib/libfaad/sbr_qmf.c
index d534a0442..d534a0442 100644
--- a/src/libfaad/sbr_qmf.c
+++ b/contrib/libfaad/sbr_qmf.c
diff --git a/src/libfaad/sbr_qmf.h b/contrib/libfaad/sbr_qmf.h
index b1d673d9c..b1d673d9c 100644
--- a/src/libfaad/sbr_qmf.h
+++ b/contrib/libfaad/sbr_qmf.h
diff --git a/src/libfaad/sbr_qmf_c.h b/contrib/libfaad/sbr_qmf_c.h
index d9c079520..d9c079520 100644
--- a/src/libfaad/sbr_qmf_c.h
+++ b/contrib/libfaad/sbr_qmf_c.h
diff --git a/src/libfaad/sbr_syntax.c b/contrib/libfaad/sbr_syntax.c
index 19cb1b5c2..19cb1b5c2 100644
--- a/src/libfaad/sbr_syntax.c
+++ b/contrib/libfaad/sbr_syntax.c
diff --git a/src/libfaad/sbr_syntax.h b/contrib/libfaad/sbr_syntax.h
index 1baa5fec3..1baa5fec3 100644
--- a/src/libfaad/sbr_syntax.h
+++ b/contrib/libfaad/sbr_syntax.h
diff --git a/src/libfaad/sbr_tf_grid.c b/contrib/libfaad/sbr_tf_grid.c
index ae741c256..ae741c256 100644
--- a/src/libfaad/sbr_tf_grid.c
+++ b/contrib/libfaad/sbr_tf_grid.c
diff --git a/src/libfaad/sbr_tf_grid.h b/contrib/libfaad/sbr_tf_grid.h
index 8772a384a..8772a384a 100644
--- a/src/libfaad/sbr_tf_grid.h
+++ b/contrib/libfaad/sbr_tf_grid.h
diff --git a/src/libfaad/sine_win.h b/contrib/libfaad/sine_win.h
index c7e6ecd6e..c7e6ecd6e 100644
--- a/src/libfaad/sine_win.h
+++ b/contrib/libfaad/sine_win.h
diff --git a/src/libfaad/specrec.c b/contrib/libfaad/specrec.c
index fd4b0653c..fd4b0653c 100644
--- a/src/libfaad/specrec.c
+++ b/contrib/libfaad/specrec.c
diff --git a/src/libfaad/specrec.h b/contrib/libfaad/specrec.h
index da174abe8..da174abe8 100644
--- a/src/libfaad/specrec.h
+++ b/contrib/libfaad/specrec.h
diff --git a/src/libfaad/ssr.c b/contrib/libfaad/ssr.c
index 46517d0c8..46517d0c8 100644
--- a/src/libfaad/ssr.c
+++ b/contrib/libfaad/ssr.c
diff --git a/src/libfaad/ssr.h b/contrib/libfaad/ssr.h
index d1defdc45..d1defdc45 100644
--- a/src/libfaad/ssr.h
+++ b/contrib/libfaad/ssr.h
diff --git a/src/libfaad/ssr_fb.c b/contrib/libfaad/ssr_fb.c
index fb62c90c6..fb62c90c6 100644
--- a/src/libfaad/ssr_fb.c
+++ b/contrib/libfaad/ssr_fb.c
diff --git a/src/libfaad/ssr_fb.h b/contrib/libfaad/ssr_fb.h
index 739a4dfbb..739a4dfbb 100644
--- a/src/libfaad/ssr_fb.h
+++ b/contrib/libfaad/ssr_fb.h
diff --git a/src/libfaad/ssr_ipqf.c b/contrib/libfaad/ssr_ipqf.c
index 3064285de..3064285de 100644
--- a/src/libfaad/ssr_ipqf.c
+++ b/contrib/libfaad/ssr_ipqf.c
diff --git a/src/libfaad/ssr_ipqf.h b/contrib/libfaad/ssr_ipqf.h
index 360db978b..360db978b 100644
--- a/src/libfaad/ssr_ipqf.h
+++ b/contrib/libfaad/ssr_ipqf.h
diff --git a/src/libfaad/ssr_win.h b/contrib/libfaad/ssr_win.h
index ddbb3086e..ddbb3086e 100644
--- a/src/libfaad/ssr_win.h
+++ b/contrib/libfaad/ssr_win.h
diff --git a/src/libfaad/structs.h b/contrib/libfaad/structs.h
index db6361a5c..db6361a5c 100644
--- a/src/libfaad/structs.h
+++ b/contrib/libfaad/structs.h
diff --git a/src/libfaad/syntax.c b/contrib/libfaad/syntax.c
index 6dc9fc57d..6dc9fc57d 100644
--- a/src/libfaad/syntax.c
+++ b/contrib/libfaad/syntax.c
diff --git a/src/libfaad/syntax.h b/contrib/libfaad/syntax.h
index a047dd644..a047dd644 100644
--- a/src/libfaad/syntax.h
+++ b/contrib/libfaad/syntax.h
diff --git a/src/libfaad/tns.c b/contrib/libfaad/tns.c
index bb4db731a..bb4db731a 100644
--- a/src/libfaad/tns.c
+++ b/contrib/libfaad/tns.c
diff --git a/src/libfaad/tns.h b/contrib/libfaad/tns.h
index fc77894d8..fc77894d8 100644
--- a/src/libfaad/tns.h
+++ b/contrib/libfaad/tns.h
diff --git a/contrib/libmad/COPYING b/contrib/libmad/COPYING
new file mode 100644
index 000000000..d60c31a97
--- /dev/null
+++ b/contrib/libmad/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/src/libmad/D.dat b/contrib/libmad/D.dat
index 31c6cd4fa..4a7fa4fa9 100644
--- a/src/libmad/D.dat
+++ b/contrib/libmad/D.dat
@@ -16,7 +16,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: D.dat,v 1.3 2004/04/22 00:22:33 miguelfreitas Exp $
+ * $Id: D.dat,v 1.9 2004/01/23 09:41:32 rob Exp $
  */
 
 /*
diff --git a/contrib/libmad/Makefile.am b/contrib/libmad/Makefile.am
new file mode 100644
index 000000000..d3c285b01
--- /dev/null
+++ b/contrib/libmad/Makefile.am
@@ -0,0 +1,44 @@
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CPPFLAGS = -DOPT_SPEED
+
+EXTRA_DIST = COPYING
+
+if ENABLE_MAD
+if !WITH_EXTERNAL_MAD
+noinst_LTLIBRARIES = libmad.la
+endif
+endif
+
+##
+## libmad - MPEG audio decoder library
+## Copyright (C) 2000-2004 Underbit Technologies, Inc.
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+##
+## $Id: Makefile.am,v 1.23 2004/02/17 02:02:03 rob Exp $
+##
+
+exported_headers =	version.h fixed.h bit.h timer.h stream.h frame.h  \
+			synth.h decoder.h
+
+headers =		$(exported_headers)  \
+			global.h layer12.h layer3.h huffman.h
+
+data_includes =		D.dat imdct_s.dat qc_table.dat rq_table.dat  \
+			sf_table.dat
+
+libmad_la_SOURCES =	version.c fixed.c bit.c timer.c stream.c frame.c  \
+			synth.c decoder.c layer12.c layer3.c huffman.c  \
+			$(headers) $(data_includes)
diff --git a/src/libmad/bit.c b/contrib/libmad/bit.c
index 8d9571e8f..c2bfb243c 100755..100644
--- a/src/libmad/bit.c
+++ b/contrib/libmad/bit.c
@@ -16,7 +16,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: bit.c,v 1.3 2004/04/22 00:22:35 miguelfreitas Exp $
+ * $Id: bit.c,v 1.12 2004/01/23 09:41:32 rob Exp $
  */
 
 # ifdef HAVE_CONFIG_H
diff --git a/src/libmad/bit.h b/contrib/libmad/bit.h
index 6c09d5493..5a51570b2 100644
--- a/src/libmad/bit.h
+++ b/contrib/libmad/bit.h
@@ -16,7 +16,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: bit.h,v 1.3 2004/04/22 00:22:36 miguelfreitas Exp $
+ * $Id: bit.h,v 1.12 2004/01/23 09:41:32 rob Exp $
  */
 
 # ifndef LIBMAD_BIT_H
diff --git a/contrib/libmad/decoder.c b/contrib/libmad/decoder.c
new file mode 100644
index 000000000..6d6df0db5
--- /dev/null
+++ b/contrib/libmad/decoder.c
@@ -0,0 +1,582 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: decoder.c,v 1.22 2004/01/23 09:41:32 rob Exp $
+ */
+
+# ifdef HAVE_CONFIG_H
+#  include "config.h"
+# endif
+
+# include "global.h"
+
+# ifdef HAVE_SYS_TYPES_H
+#  include <sys/types.h>
+# endif
+
+# ifdef HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+# endif
+
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
+
+# ifdef HAVE_FCNTL_H
+#  include <fcntl.h>
+# endif
+
+# include <stdlib.h>
+
+# ifdef HAVE_ERRNO_H
+#  include <errno.h>
+# endif
+
+# include "stream.h"
+# include "frame.h"
+# include "synth.h"
+# include "decoder.h"
+
+/*
+ * NAME:	decoder->init()
+ * DESCRIPTION:	initialize a decoder object with callback routines
+ */
+void mad_decoder_init(struct mad_decoder *decoder, void *data,
+		      enum mad_flow (*input_func)(void *,
+						  struct mad_stream *),
+		      enum mad_flow (*header_func)(void *,
+						   struct mad_header const *),
+		      enum mad_flow (*filter_func)(void *,
+						   struct mad_stream const *,
+						   struct mad_frame *),
+		      enum mad_flow (*output_func)(void *,
+						   struct mad_header const *,
+						   struct mad_pcm *),
+		      enum mad_flow (*error_func)(void *,
+						  struct mad_stream *,
+						  struct mad_frame *),
+		      enum mad_flow (*message_func)(void *,
+						    void *, unsigned int *))
+{
+  decoder->mode         = -1;
+
+  decoder->options      = 0;
+
+  decoder->async.pid    = 0;
+  decoder->async.in     = -1;
+  decoder->async.out    = -1;
+
+  decoder->sync         = 0;
+
+  decoder->cb_data      = data;
+
+  decoder->input_func   = input_func;
+  decoder->header_func  = header_func;
+  decoder->filter_func  = filter_func;
+  decoder->output_func  = output_func;
+  decoder->error_func   = error_func;
+  decoder->message_func = message_func;
+}
+
+int mad_decoder_finish(struct mad_decoder *decoder)
+{
+# if defined(USE_ASYNC)
+  if (decoder->mode == MAD_DECODER_MODE_ASYNC && decoder->async.pid) {
+    pid_t pid;
+    int status;
+
+    close(decoder->async.in);
+
+    do
+      pid = waitpid(decoder->async.pid, &status, 0);
+    while (pid == -1 && errno == EINTR);
+
+    decoder->mode = -1;
+
+    close(decoder->async.out);
+
+    decoder->async.pid = 0;
+    decoder->async.in  = -1;
+    decoder->async.out = -1;
+
+    if (pid == -1)
+      return -1;
+
+    return (!WIFEXITED(status) || WEXITSTATUS(status)) ? -1 : 0;
+  }
+# endif
+
+  return 0;
+}
+
+# if defined(USE_ASYNC)
+static
+enum mad_flow send_io(int fd, void const *data, size_t len)
+{
+  char const *ptr = data;
+  ssize_t count;
+
+  while (len) {
+    do
+      count = write(fd, ptr, len);
+    while (count == -1 && errno == EINTR);
+
+    if (count == -1)
+      return MAD_FLOW_BREAK;
+
+    len -= count;
+    ptr += count;
+  }
+
+  return MAD_FLOW_CONTINUE;
+}
+
+static
+enum mad_flow receive_io(int fd, void *buffer, size_t len)
+{
+  char *ptr = buffer;
+  ssize_t count;
+
+  while (len) {
+    do
+      count = read(fd, ptr, len);
+    while (count == -1 && errno == EINTR);
+
+    if (count == -1)
+      return (errno == EAGAIN) ? MAD_FLOW_IGNORE : MAD_FLOW_BREAK;
+    else if (count == 0)
+      return MAD_FLOW_STOP;
+
+    len -= count;
+    ptr += count;
+  }
+
+  return MAD_FLOW_CONTINUE;
+}
+
+static
+enum mad_flow receive_io_blocking(int fd, void *buffer, size_t len)
+{
+  int flags, blocking;
+  enum mad_flow result;
+
+  flags = fcntl(fd, F_GETFL);
+  if (flags == -1)
+    return MAD_FLOW_BREAK;
+
+  blocking = flags & ~O_NONBLOCK;
+
+  if (blocking != flags &&
+      fcntl(fd, F_SETFL, blocking) == -1)
+    return MAD_FLOW_BREAK;
+
+  result = receive_io(fd, buffer, len);
+
+  if (flags != blocking &&
+      fcntl(fd, F_SETFL, flags) == -1)
+    return MAD_FLOW_BREAK;
+
+  return result;
+}
+
+static
+enum mad_flow send(int fd, void const *message, unsigned int size)
+{
+  enum mad_flow result;
+
+  /* send size */
+
+  result = send_io(fd, &size, sizeof(size));
+
+  /* send message */
+
+  if (result == MAD_FLOW_CONTINUE)
+    result = send_io(fd, message, size);
+
+  return result;
+}
+
+static
+enum mad_flow receive(int fd, void **message, unsigned int *size)
+{
+  enum mad_flow result;
+  unsigned int actual;
+
+  if (*message == 0)
+    *size = 0;
+
+  /* receive size */
+
+  result = receive_io(fd, &actual, sizeof(actual));
+
+  /* receive message */
+
+  if (result == MAD_FLOW_CONTINUE) {
+    if (actual > *size)
+      actual -= *size;
+    else {
+      *size  = actual;
+      actual = 0;
+    }
+
+    if (*size > 0) {
+      if (*message == 0) {
+	*message = malloc(*size);
+	if (*message == 0)
+	  return MAD_FLOW_BREAK;
+      }
+
+      result = receive_io_blocking(fd, *message, *size);
+    }
+
+    /* throw away remainder of message */
+
+    while (actual && result == MAD_FLOW_CONTINUE) {
+      char sink[256];
+      unsigned int len;
+
+      len = actual > sizeof(sink) ? sizeof(sink) : actual;
+
+      result = receive_io_blocking(fd, sink, len);
+
+      actual -= len;
+    }
+  }
+
+  return result;
+}
+
+static
+enum mad_flow check_message(struct mad_decoder *decoder)
+{
+  enum mad_flow result;
+  void *message = 0;
+  unsigned int size;
+
+  result = receive(decoder->async.in, &message, &size);
+
+  if (result == MAD_FLOW_CONTINUE) {
+    if (decoder->message_func == 0)
+      size = 0;
+    else {
+      result = decoder->message_func(decoder->cb_data, message, &size);
+
+      if (result == MAD_FLOW_IGNORE ||
+	  result == MAD_FLOW_BREAK)
+	size = 0;
+    }
+
+    if (send(decoder->async.out, message, size) != MAD_FLOW_CONTINUE)
+      result = MAD_FLOW_BREAK;
+  }
+
+  if (message)
+    free(message);
+
+  return result;
+}
+# endif
+
+static
+enum mad_flow error_default(void *data, struct mad_stream *stream,
+			    struct mad_frame *frame)
+{
+  int *bad_last_frame = data;
+
+  switch (stream->error) {
+  case MAD_ERROR_BADCRC:
+    if (*bad_last_frame)
+      mad_frame_mute(frame);
+    else
+      *bad_last_frame = 1;
+
+    return MAD_FLOW_IGNORE;
+
+  default:
+    return MAD_FLOW_CONTINUE;
+  }
+}
+
+static
+int run_sync(struct mad_decoder *decoder)
+{
+  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
+  void *error_data;
+  int bad_last_frame = 0;
+  struct mad_stream *stream;
+  struct mad_frame *frame;
+  struct mad_synth *synth;
+  int result = 0;
+
+  if (decoder->input_func == 0)
+    return 0;
+
+  if (decoder->error_func) {
+    error_func = decoder->error_func;
+    error_data = decoder->cb_data;
+  }
+  else {
+    error_func = error_default;
+    error_data = &bad_last_frame;
+  }
+
+  stream = &decoder->sync->stream;
+  frame  = &decoder->sync->frame;
+  synth  = &decoder->sync->synth;
+
+  mad_stream_init(stream);
+  mad_frame_init(frame);
+  mad_synth_init(synth);
+
+  mad_stream_options(stream, decoder->options);
+
+  do {
+    switch (decoder->input_func(decoder->cb_data, stream)) {
+    case MAD_FLOW_STOP:
+      goto done;
+    case MAD_FLOW_BREAK:
+      goto fail;
+    case MAD_FLOW_IGNORE:
+      continue;
+    case MAD_FLOW_CONTINUE:
+      break;
+    }
+
+    while (1) {
+# if defined(USE_ASYNC)
+      if (decoder->mode == MAD_DECODER_MODE_ASYNC) {
+	switch (check_message(decoder)) {
+	case MAD_FLOW_IGNORE:
+	case MAD_FLOW_CONTINUE:
+	  break;
+	case MAD_FLOW_BREAK:
+	  goto fail;
+	case MAD_FLOW_STOP:
+	  goto done;
+	}
+      }
+# endif
+
+      if (decoder->header_func) {
+	if (mad_header_decode(&frame->header, stream) == -1) {
+	  if (!MAD_RECOVERABLE(stream->error))
+	    break;
+
+	  switch (error_func(error_data, stream, frame)) {
+	  case MAD_FLOW_STOP:
+	    goto done;
+	  case MAD_FLOW_BREAK:
+	    goto fail;
+	  case MAD_FLOW_IGNORE:
+	  case MAD_FLOW_CONTINUE:
+	  default:
+	    continue;
+	  }
+	}
+
+	switch (decoder->header_func(decoder->cb_data, &frame->header)) {
+	case MAD_FLOW_STOP:
+	  goto done;
+	case MAD_FLOW_BREAK:
+	  goto fail;
+	case MAD_FLOW_IGNORE:
+	  continue;
+	case MAD_FLOW_CONTINUE:
+	  break;
+	}
+      }
+
+      if (mad_frame_decode(frame, stream) == -1) {
+	if (!MAD_RECOVERABLE(stream->error))
+	  break;
+
+	switch (error_func(error_data, stream, frame)) {
+	case MAD_FLOW_STOP:
+	  goto done;
+	case MAD_FLOW_BREAK:
+	  goto fail;
+	case MAD_FLOW_IGNORE:
+	  break;
+	case MAD_FLOW_CONTINUE:
+	default:
+	  continue;
+	}
+      }
+      else
+	bad_last_frame = 0;
+
+      if (decoder->filter_func) {
+	switch (decoder->filter_func(decoder->cb_data, stream, frame)) {
+	case MAD_FLOW_STOP:
+	  goto done;
+	case MAD_FLOW_BREAK:
+	  goto fail;
+	case MAD_FLOW_IGNORE:
+	  continue;
+	case MAD_FLOW_CONTINUE:
+	  break;
+	}
+      }
+
+      mad_synth_frame(synth, frame);
+
+      if (decoder->output_func) {
+	switch (decoder->output_func(decoder->cb_data,
+				     &frame->header, &synth->pcm)) {
+	case MAD_FLOW_STOP:
+	  goto done;
+	case MAD_FLOW_BREAK:
+	  goto fail;
+	case MAD_FLOW_IGNORE:
+	case MAD_FLOW_CONTINUE:
+	  break;
+	}
+      }
+    }
+  }
+  while (stream->error == MAD_ERROR_BUFLEN);
+
+ fail:
+  result = -1;
+
+ done:
+  mad_synth_finish(synth);
+  mad_frame_finish(frame);
+  mad_stream_finish(stream);
+
+  return result;
+}
+
+# if defined(USE_ASYNC)
+static
+int run_async(struct mad_decoder *decoder)
+{
+  pid_t pid;
+  int ptoc[2], ctop[2], flags;
+
+  if (pipe(ptoc) == -1)
+    return -1;
+
+  if (pipe(ctop) == -1) {
+    close(ptoc[0]);
+    close(ptoc[1]);
+    return -1;
+  }
+
+  flags = fcntl(ptoc[0], F_GETFL);
+  if (flags == -1 ||
+      fcntl(ptoc[0], F_SETFL, flags | O_NONBLOCK) == -1) {
+    close(ctop[0]);
+    close(ctop[1]);
+    close(ptoc[0]);
+    close(ptoc[1]);
+    return -1;
+  }
+
+  pid = fork();
+  if (pid == -1) {
+    close(ctop[0]);
+    close(ctop[1]);
+    close(ptoc[0]);
+    close(ptoc[1]);
+    return -1;
+  }
+
+  decoder->async.pid = pid;
+
+  if (pid) {
+    /* parent */
+
+    close(ptoc[0]);
+    close(ctop[1]);
+
+    decoder->async.in  = ctop[0];
+    decoder->async.out = ptoc[1];
+
+    return 0;
+  }
+
+  /* child */
+
+  close(ptoc[1]);
+  close(ctop[0]);
+
+  decoder->async.in  = ptoc[0];
+  decoder->async.out = ctop[1];
+
+  _exit(run_sync(decoder));
+
+  /* not reached */
+  return -1;
+}
+# endif
+
+/*
+ * NAME:	decoder->run()
+ * DESCRIPTION:	run the decoder thread either synchronously or asynchronously
+ */
+int mad_decoder_run(struct mad_decoder *decoder, enum mad_decoder_mode mode)
+{
+  int result;
+  int (*run)(struct mad_decoder *) = 0;
+
+  switch (decoder->mode = mode) {
+  case MAD_DECODER_MODE_SYNC:
+    run = run_sync;
+    break;
+
+  case MAD_DECODER_MODE_ASYNC:
+# if defined(USE_ASYNC)
+    run = run_async;
+# endif
+    break;
+  }
+
+  if (run == 0)
+    return -1;
+
+  decoder->sync = malloc(sizeof(*decoder->sync));
+  if (decoder->sync == 0)
+    return -1;
+
+  result = run(decoder);
+
+  free(decoder->sync);
+  decoder->sync = 0;
+
+  return result;
+}
+
+/*
+ * NAME:	decoder->message()
+ * DESCRIPTION:	send a message to and receive a reply from the decoder process
+ */
+int mad_decoder_message(struct mad_decoder *decoder,
+			void *message, unsigned int *len)
+{
+# if defined(USE_ASYNC)
+  if (decoder->mode != MAD_DECODER_MODE_ASYNC ||
+      send(decoder->async.out, message, *len) != MAD_FLOW_CONTINUE ||
+      receive(decoder->async.in, &message, len) != MAD_FLOW_CONTINUE)
+    return -1;
+
+  return 0;
+# else
+  return -1;
+# endif
+}
diff --git a/contrib/libmad/decoder.h b/contrib/libmad/decoder.h
new file mode 100644
index 000000000..f0ad758dd
--- /dev/null
+++ b/contrib/libmad/decoder.h
@@ -0,0 +1,91 @@
+/*
+ * libmad - MPEG audio decoder library
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: decoder.h,v 1.17 2004/01/23 09:41:32 rob Exp $
+ */
+
+# ifndef LIBMAD_DECODER_H
+# define LIBMAD_DECODER_H
+
+# include "stream.h"
+# include "frame.h"
+# include "synth.h"
+
+enum mad_decoder_mode {
+  MAD_DECODER_MODE_SYNC  = 0,
+  MAD_DECODER_MODE_ASYNC
+};
+
+enum mad_flow {
+  MAD_FLOW_CONTINUE = 0x0000,	/* continue normally */
+  MAD_FLOW_STOP     = 0x0010,	/* stop decoding normally */
+  MAD_FLOW_BREAK    = 0x0011,	/* stop decoding and signal an error */
+  MAD_FLOW_IGNORE   = 0x0020	/* ignore the current frame */
+};
+
+struct mad_decoder {
+  enum mad_decoder_mode mode;
+
+  int options;
+
+  struct {
+    long pid;
+    int in;
+    int out;
+  } async;
+
+  struct {
+    struct mad_stream stream;
+    struct mad_frame frame;
+    struct mad_synth synth;
+  } *sync;
+
+  void *cb_data;
+
+  enum mad_flow (*input_func)(void *, struct mad_stream *);
+  enum mad_flow (*header_func)(void *, struct mad_header const *);
+  enum mad_flow (*filter_func)(void *,
+			       struct mad_stream const *, struct mad_frame *);
+  enum mad_flow (*output_func)(void *,
+			       struct mad_header const *, struct mad_pcm *);
+  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
+  enum mad_flow (*message_func)(void *, void *, unsigned int *);
+};
+
+void mad_decoder_init(struct mad_decoder *, void *,
+		      enum mad_flow (*)(void *, struct mad_stream *),
+		      enum mad_flow (*)(void *, struct mad_header const *),
+		      enum mad_flow (*)(void *,
+					struct mad_stream const *,
+					struct mad_frame *),
+		      enum mad_flow (*)(void *,
+					struct mad_header const *,
+					struct mad_pcm *),
+		      enum mad_flow (*)(void *,
+					struct mad_stream *,
+					struct mad_frame *),
+		      enum mad_flow (*)(void *, void *, unsigned int *));
+int mad_decoder_finish(struct mad_decoder *);
+
+# define mad_decoder_options(decoder, opts)  \
+    ((void) ((decoder)->options = (opts)))
+
+int mad_decoder_run(struct mad_decoder *, enum mad_decoder_mode);
+int mad_decoder_message(struct mad_decoder *, void *, unsigned int *);
+
+# endif
diff --git a/src/libmad/fixed.c b/contrib/libmad/fixed.c
index ae02360ca..9785466f6 100644
--- a/src/libmad/fixed.c
+++ b/contrib/libmad/fixed.c
@@ -16,7 +16,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: fixed.c,v 1.3 2004/04/22 00:22:36 miguelfreitas Exp $
+ * $Id: fixed.c,v 1.13 2004/01/23 09:41:32 rob Exp $
  */
 
 # ifdef HAVE_CONFIG_H
diff --git a/src/libmad/fixed.h b/contrib/libmad/fixed.h
index 658b3399e..4b58abf56 100755..100644
--- a/src/libmad/fixed.h
+++ b/contrib/libmad/fixed.h
@@ -16,7 +16,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: fixed.h,v 1.3 2004/04/28 19:57:40 mroi Exp $
+ * $Id: fixed.h,v 1.38 2004/02/17 02:02:03 rob Exp $
  */
 
 # ifndef LIBMAD_FIXED_H
diff --git a/src/libmad/frame.c b/contrib/libmad/frame.c
index 6fe1970c0..0cb3d0f33 100755..100644
--- a/src/libmad/frame.c
+++ b/contrib/libmad/frame.c
@@ -16,7 +16,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: frame.c,v 1.3 2004/04/22 00:22:36 miguelfreitas Exp $
+ * $Id: frame.c,v 1.29 2004/02/04 22:59:19 rob Exp $
  */
 
 # ifdef HAVE_CONFIG_H
diff --git a/src/libmad/frame.h b/contrib/libmad/frame.h
index 270420ab8..3f5bf37ef 100755..100644
--- a/src/libmad/frame.h
+++ b/contrib/libmad/frame.h
@@ -16,7 +16,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: frame.h,v 1.3 2004/04/22 00:22:36 miguelfreitas Exp $
+ * $Id: frame.h,v 1.20 2004/01/23 09:41:32 rob Exp $
  */
 
 # ifndef LIBMAD_FRAME_H
diff --git a/src/libmad/global.h b/contrib/libmad/global.h
index 2f4b41db5..a6debfd8b 100644
--- a/src/libmad/global.h
+++ b/contrib/libmad/global.h
@@ -16,7 +16,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: global.h,v 1.4 2004/04/22 00:22:36 miguelfreitas Exp $
+ * $Id: global.h,v 1.11 2004/01/23 09:41:32 rob Exp $
  */
 
 # ifndef LIBMAD_GLOBAL_H
diff --git a/src/libmad/huffman.c b/contrib/libmad/huffman.c
index 5d34c0142..a230a9c10 100644
--- a/src/libmad/huffman.c
+++ b/contrib/libmad/huffman.c
@@ -16,7 +16,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: huffman.c,v 1.4 2004/04/22 00:22:36 miguelfreitas Exp $
+ * $Id: huffman.c,v 1.10 2004/01/23 09:41:32 rob Exp $
  */
 
 # ifdef HAVE_CONFIG_H
diff --git a/src/libmad/huffman.h b/contrib/libmad/huffman.h
index 2f00c00a1..6325db44a 100644
--- a/src/libmad/huffman.h
+++ b/contrib/libmad/huffman.h
@@ -16,7 +16,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: huffman.h,v 1.4 2004/04/22 00:22:41 miguelfreitas Exp $
+ * $Id: huffman.h,v 1.11 2004/01/23 09:41:32 rob Exp $
  */
 
 # ifndef LIBMAD_HUFFMAN_H
diff --git a/src/libmad/imdct_s.dat b/contrib/libmad/imdct_s.dat
index c938859e0..476710eaf 100644
--- a/src/libmad/imdct_s.dat
+++ b/contrib/libmad/imdct_s.dat
@@ -16,7 +16,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: imdct_s.dat,v 1.3 2004/04/22 00:22:41 miguelfreitas Exp $
+ * $Id: imdct_s.dat,v 1.8 2004/01/23 09:41:32 rob Exp $
  */
 
   /*  0 */  {  MAD_F(0x09bd7ca0) /*  0.608761429 */,
diff --git a/src/libmad/layer12.c b/contrib/libmad/layer12.c
index 25fd04d70..6981f9ce1 100755..100644
--- a/src/libmad/layer12.c
+++ b/contrib/libmad/layer12.c
@@ -16,7 +16,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: layer12.c,v 1.3 2004/04/22 00:22:41 miguelfreitas Exp $
+ * $Id: layer12.c,v 1.17 2004/02/05 09:02:39 rob Exp $
  */
 
 # ifdef HAVE_CONFIG_H
diff --git a/src/libmad/layer12.h b/contrib/libmad/layer12.h
index 645bb6405..e1c499696 100644
--- a/src/libmad/layer12.h
+++ b/contrib/libmad/layer12.h
@@ -16,7 +16,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: layer12.h,v 1.3 2004/04/22 00:22:49 miguelfreitas Exp $
+ * $Id: layer12.h,v 1.10 2004/01/23 09:41:32 rob Exp $
  */
 
 # ifndef LIBMAD_LAYER12_H
diff --git a/src/libmad/layer3.c b/contrib/libmad/layer3.c
index c5d46e8d1..4e5d3fa02 100755..100644
--- a/src/libmad/layer3.c
+++ b/contrib/libmad/layer3.c
@@ -16,7 +16,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: layer3.c,v 1.7 2006/09/26 00:12:20 dgp85 Exp $
+ * $Id: layer3.c,v 1.43 2004/01/23 09:41:32 rob Exp $
  */
 
 # ifdef HAVE_CONFIG_H
@@ -1547,8 +1547,8 @@ void III_aliasreduce(mad_fixed_t xr[576], int lines)
   for (xr += 18; xr < bound; xr += 18) {
     for (i = 0; i < 8; ++i) {
       register mad_fixed_t a, b;
-      register mad_fixed64hi_t hi = 0;
-      register mad_fixed64lo_t lo = 0;
+      register mad_fixed64hi_t hi;
+      register mad_fixed64lo_t lo;
 
       a = xr[-1 - i];
       b = xr[     i];
diff --git a/src/libmad/layer3.h b/contrib/libmad/layer3.h
index 3dca5b3b8..2504d461a 100644
--- a/src/libmad/layer3.h
+++ b/contrib/libmad/layer3.h
@@ -16,7 +16,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: layer3.h,v 1.3 2004/04/22 00:23:06 miguelfreitas Exp $
+ * $Id: layer3.h,v 1.10 2004/01/23 09:41:32 rob Exp $
  */
 
 # ifndef LIBMAD_LAYER3_H
diff --git a/src/libmad/qc_table.dat b/contrib/libmad/qc_table.dat
index 1848e0011..35a22234f 100644
--- a/src/libmad/qc_table.dat
+++ b/contrib/libmad/qc_table.dat
@@ -1,6 +1,6 @@
 /*
  * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,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: qc_table.dat,v 1.2 2002/04/30 18:46:58 miguelfreitas Exp $
+ * $Id: qc_table.dat,v 1.7 2004/01/23 09:41:32 rob Exp $
  */
 
 /*
diff --git a/src/libmad/rq_table.dat b/contrib/libmad/rq_table.dat
index 7db10fd33..059c4f318 100644
--- a/src/libmad/rq_table.dat
+++ b/contrib/libmad/rq_table.dat
@@ -1,6 +1,6 @@
 /*
  * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,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: rq_table.dat,v 1.2 2002/04/30 18:46:58 miguelfreitas Exp $
+ * $Id: rq_table.dat,v 1.7 2004/01/23 09:41:32 rob Exp $
  */
 
 /*
diff --git a/src/libmad/sf_table.dat b/contrib/libmad/sf_table.dat
index ea7a1c191..db1484a0e 100644
--- a/src/libmad/sf_table.dat
+++ b/contrib/libmad/sf_table.dat
@@ -1,6 +1,6 @@
 /*
  * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2001 Robert Leslie
+ * Copyright (C) 2000-2004 Underbit Technologies, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,7 +16,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: sf_table.dat,v 1.2 2002/04/30 18:46:58 miguelfreitas Exp $
+ * $Id: sf_table.dat,v 1.7 2004/01/23 09:41:33 rob Exp $
  */
 
 /*
@@ -26,6 +26,11 @@
  * There is some error introduced by the 32-bit fixed-point representation;
  * the amount of error is shown. For 16-bit PCM output, this shouldn't be
  * too much of a problem.
+ *
+ * Strictly speaking, Table B.1 has only 63 entries (0-62), thus a strict
+ * interpretation of ISO/IEC 11172-3 would suggest that a scalefactor index of
+ * 63 is invalid. However, for better compatibility with current practices, we
+ * add a 64th entry.
  */
 
   MAD_F(0x20000000),  /* 2.000000000000 => 2.000000000000, e  0.000000000000 */
@@ -97,4 +102,5 @@
   MAD_F(0x00000285),  /* 0.000002403109 => 0.000002402812, e  0.000000000296 */
   MAD_F(0x00000200),  /* 0.000001907349 => 0.000001907349, e -0.000000000000 */
   MAD_F(0x00000196),  /* 0.000001513864 => 0.000001512468, e  0.000000001396 */
-  MAD_F(0x00000143)   /* 0.000001201554 => 0.000001203269, e -0.000000001714 */
+  MAD_F(0x00000143),  /* 0.000001201554 => 0.000001203269, e -0.000000001714 */
+  MAD_F(0x00000000)   /* this compatibility entry is not part of Table B.1 */
diff --git a/src/libmad/stream.c b/contrib/libmad/stream.c
index fecc87434..8bb4d6a49 100644
--- a/src/libmad/stream.c
+++ b/contrib/libmad/stream.c
@@ -16,7 +16,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: stream.c,v 1.3 2004/04/22 00:23:07 miguelfreitas Exp $
+ * $Id: stream.c,v 1.12 2004/02/05 09:02:39 rob Exp $
  */
 
 # ifdef HAVE_CONFIG_H
diff --git a/src/libmad/stream.h b/contrib/libmad/stream.h
index b99b87582..8bff8b49d 100644
--- a/src/libmad/stream.h
+++ b/contrib/libmad/stream.h
@@ -16,7 +16,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: stream.h,v 1.3 2004/04/22 00:23:12 miguelfreitas Exp $
+ * $Id: stream.h,v 1.20 2004/02/05 09:02:39 rob Exp $
  */
 
 # ifndef LIBMAD_STREAM_H
diff --git a/src/libmad/synth.c b/contrib/libmad/synth.c
index c05ad3efc..1d28d438c 100755..100644
--- a/src/libmad/synth.c
+++ b/contrib/libmad/synth.c
@@ -16,7 +16,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: synth.c,v 1.4 2006/09/26 03:02:20 dgp85 Exp $
+ * $Id: synth.c,v 1.25 2004/01/23 09:41:33 rob Exp $
  */
 
 # ifdef HAVE_CONFIG_H
@@ -563,8 +563,8 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
   mad_fixed_t const (*sbsample)[36][32];
   register mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8];
   register mad_fixed_t const (*Dptr)[32], *ptr;
-  register mad_fixed64hi_t hi = 0;
-  register mad_fixed64lo_t lo = 0;
+  register mad_fixed64hi_t hi;
+  register mad_fixed64lo_t lo;
 
   for (ch = 0; ch < nch; ++ch) {
     sbsample = &frame->sbsample[ch];
@@ -700,8 +700,8 @@ void synth_half(struct mad_synth *synth, struct mad_frame const *frame,
   mad_fixed_t const (*sbsample)[36][32];
   register mad_fixed_t (*fe)[8], (*fx)[8], (*fo)[8];
   register mad_fixed_t const (*Dptr)[32], *ptr;
-  register mad_fixed64hi_t hi = 0;
-  register mad_fixed64lo_t lo = 0;
+  register mad_fixed64hi_t hi;
+  register mad_fixed64lo_t lo;
 
   for (ch = 0; ch < nch; ++ch) {
     sbsample = &frame->sbsample[ch];
diff --git a/src/libmad/synth.h b/contrib/libmad/synth.h
index d5a63589e..8ae4bc95e 100644
--- a/src/libmad/synth.h
+++ b/contrib/libmad/synth.h
@@ -16,7 +16,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: synth.h,v 1.3 2004/04/22 00:23:24 miguelfreitas Exp $
+ * $Id: synth.h,v 1.15 2004/01/23 09:41:33 rob Exp $
  */
 
 # ifndef LIBMAD_SYNTH_H
diff --git a/src/libmad/timer.c b/contrib/libmad/timer.c
index 9aa2e8924..4b909aba9 100755..100644
--- a/src/libmad/timer.c
+++ b/contrib/libmad/timer.c
@@ -16,7 +16,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: timer.c,v 1.6 2004/04/22 00:23:26 miguelfreitas Exp $
+ * $Id: timer.c,v 1.18 2004/01/23 09:41:33 rob Exp $
  */
 
 # ifdef HAVE_CONFIG_H
diff --git a/src/libmad/timer.h b/contrib/libmad/timer.h
index 88e997d5e..eb4542bb9 100755..100644
--- a/src/libmad/timer.h
+++ b/contrib/libmad/timer.h
@@ -16,7 +16,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: timer.h,v 1.3 2004/04/22 00:23:27 miguelfreitas Exp $
+ * $Id: timer.h,v 1.16 2004/01/23 09:41:33 rob Exp $
  */
 
 # ifndef LIBMAD_TIMER_H
diff --git a/src/libmad/version.c b/contrib/libmad/version.c
index 8fc70f408..e643fa71e 100644
--- a/src/libmad/version.c
+++ b/contrib/libmad/version.c
@@ -16,7 +16,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: version.c,v 1.2 2004/04/22 00:23:27 miguelfreitas Exp $
+ * $Id: version.c,v 1.15 2004/01/23 09:41:33 rob Exp $
  */
 
 # ifdef HAVE_CONFIG_H
diff --git a/src/libmad/version.h b/contrib/libmad/version.h
index c056e6fc9..d215d4c10 100644
--- a/src/libmad/version.h
+++ b/contrib/libmad/version.h
@@ -16,7 +16,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: version.h,v 1.2 2004/04/22 00:23:29 miguelfreitas Exp $
+ * $Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp $
  */
 
 # ifndef LIBMAD_VERSION_H
diff --git a/contrib/libmpcdec/mpc_decoder.c b/contrib/libmpcdec/mpc_decoder.c
index 0617869c8..a7b31c970 100644
--- a/contrib/libmpcdec/mpc_decoder.c
+++ b/contrib/libmpcdec/mpc_decoder.c
@@ -244,8 +244,8 @@ mpc_decoder_reset_globals(mpc_decoder *d)
 
     memset(d->Y_L             , 0, sizeof d->Y_L              );
     memset(d->Y_R             , 0, sizeof d->Y_R              );
-	memset(d->SCF_Index_L     , 1, sizeof d->SCF_Index_L      );
-    memset(d->SCF_Index_R     , 1, sizeof d->SCF_Index_R      );
+    memset(d->SCF_Index_L     , 0, sizeof d->SCF_Index_L      );
+    memset(d->SCF_Index_R     , 0, sizeof d->SCF_Index_R      );
     memset(d->Res_L           , 0, sizeof d->Res_L            );
     memset(d->Res_R           , 0, sizeof d->Res_R            );
     memset(d->SCFI_L          , 0, sizeof d->SCFI_L           );
@@ -1185,7 +1185,7 @@ mpc_bool_t mpc_decoder_initialize(mpc_decoder *d, mpc_streaminfo *si)
     mpc_decoder_seek(d, get_initial_fpos(d));
 
     d->seeking_pwr = 0;
-    while (d->OverallFrames > (SEEKING_TABLE_SIZE << d->seeking_pwr))
+    while( d->OverallFrames > ((mpc_int64_t) SEEKING_TABLE_SIZE << d->seeking_pwr) )
         d->seeking_pwr++;
     d->seeking_table_frames = 0;
     d->seeking_table[0] = get_initial_fpos(d);
diff --git a/src/input/vcd/libvcd/Makefile.am b/contrib/libvcd/Makefile.am
index c922685e3..c922685e3 100644
--- a/src/input/vcd/libvcd/Makefile.am
+++ b/contrib/libvcd/Makefile.am
diff --git a/src/input/vcd/libvcd/bitvec.h b/contrib/libvcd/bitvec.h
index f45059db0..f45059db0 100644
--- a/src/input/vcd/libvcd/bitvec.h
+++ b/contrib/libvcd/bitvec.h
diff --git a/src/input/vcd/libvcd/bytesex.h b/contrib/libvcd/bytesex.h
index 9a212693d..9a212693d 100644
--- a/src/input/vcd/libvcd/bytesex.h
+++ b/contrib/libvcd/bytesex.h
diff --git a/src/input/vcd/libvcd/bytesex_asm.h b/contrib/libvcd/bytesex_asm.h
index 3265c592b..3265c592b 100644
--- a/src/input/vcd/libvcd/bytesex_asm.h
+++ b/contrib/libvcd/bytesex_asm.h
diff --git a/src/input/vcd/libvcd/data_structures.c b/contrib/libvcd/data_structures.c
index 1fdca95c9..1fdca95c9 100644
--- a/src/input/vcd/libvcd/data_structures.c
+++ b/contrib/libvcd/data_structures.c
diff --git a/src/input/vcd/libvcd/data_structures.h b/contrib/libvcd/data_structures.h
index 70fe88045..70fe88045 100644
--- a/src/input/vcd/libvcd/data_structures.h
+++ b/contrib/libvcd/data_structures.h
diff --git a/src/input/vcd/libvcd/dict.h b/contrib/libvcd/dict.h
index 229ad5706..229ad5706 100644
--- a/src/input/vcd/libvcd/dict.h
+++ b/contrib/libvcd/dict.h
diff --git a/src/input/vcd/libvcd/directory.c b/contrib/libvcd/directory.c
index 992d728c6..992d728c6 100644
--- a/src/input/vcd/libvcd/directory.c
+++ b/contrib/libvcd/directory.c
diff --git a/src/input/vcd/libvcd/directory.h b/contrib/libvcd/directory.h
index c4cba9efc..c4cba9efc 100644
--- a/src/input/vcd/libvcd/directory.h
+++ b/contrib/libvcd/directory.h
diff --git a/src/input/vcd/libvcd/files.c b/contrib/libvcd/files.c
index 38780edf0..38780edf0 100644
--- a/src/input/vcd/libvcd/files.c
+++ b/contrib/libvcd/files.c
diff --git a/src/input/vcd/libvcd/image.c b/contrib/libvcd/image.c
index d26bb0910..d26bb0910 100644
--- a/src/input/vcd/libvcd/image.c
+++ b/contrib/libvcd/image.c
diff --git a/src/input/vcd/libvcd/image_bincue.c b/contrib/libvcd/image_bincue.c
index 9c447a42a..9c447a42a 100644
--- a/src/input/vcd/libvcd/image_bincue.c
+++ b/contrib/libvcd/image_bincue.c
diff --git a/src/input/vcd/libvcd/image_cdrdao.c b/contrib/libvcd/image_cdrdao.c
index 5e00c14ee..5e00c14ee 100644
--- a/src/input/vcd/libvcd/image_cdrdao.c
+++ b/contrib/libvcd/image_cdrdao.c
diff --git a/src/input/vcd/libvcd/image_nrg.c b/contrib/libvcd/image_nrg.c
index 1faeb98a9..1faeb98a9 100644
--- a/src/input/vcd/libvcd/image_nrg.c
+++ b/contrib/libvcd/image_nrg.c
diff --git a/src/input/vcd/libvcd/image_sink.h b/contrib/libvcd/image_sink.h
index a71e30199..a71e30199 100644
--- a/src/input/vcd/libvcd/image_sink.h
+++ b/contrib/libvcd/image_sink.h
diff --git a/src/input/vcd/libvcd/inf.c b/contrib/libvcd/inf.c
index 588c8e5f7..588c8e5f7 100644
--- a/src/input/vcd/libvcd/inf.c
+++ b/contrib/libvcd/inf.c
diff --git a/src/input/vcd/libvcd/info.c b/contrib/libvcd/info.c
index b01bd6eee..b01bd6eee 100644
--- a/src/input/vcd/libvcd/info.c
+++ b/contrib/libvcd/info.c
diff --git a/src/input/vcd/libvcd/info_private.c b/contrib/libvcd/info_private.c
index 9f89a3dcb..9f89a3dcb 100644
--- a/src/input/vcd/libvcd/info_private.c
+++ b/contrib/libvcd/info_private.c
diff --git a/src/input/vcd/libvcd/info_private.h b/contrib/libvcd/info_private.h
index d17b6680b..d17b6680b 100644
--- a/src/input/vcd/libvcd/info_private.h
+++ b/contrib/libvcd/info_private.h
diff --git a/src/input/vcd/libvcd/libvcd/Makefile.am b/contrib/libvcd/libvcd/Makefile.am
index ea29859f6..ea29859f6 100644
--- a/src/input/vcd/libvcd/libvcd/Makefile.am
+++ b/contrib/libvcd/libvcd/Makefile.am
diff --git a/src/input/vcd/libvcd/libvcd/files.h b/contrib/libvcd/libvcd/files.h
index 91eeafad8..91eeafad8 100644
--- a/src/input/vcd/libvcd/libvcd/files.h
+++ b/contrib/libvcd/libvcd/files.h
diff --git a/src/input/vcd/libvcd/libvcd/files_private.h b/contrib/libvcd/libvcd/files_private.h
index aabb6ab0c..aabb6ab0c 100644
--- a/src/input/vcd/libvcd/libvcd/files_private.h
+++ b/contrib/libvcd/libvcd/files_private.h
diff --git a/src/input/vcd/libvcd/libvcd/inf.h b/contrib/libvcd/libvcd/inf.h
index fcd9098e2..fcd9098e2 100644
--- a/src/input/vcd/libvcd/libvcd/inf.h
+++ b/contrib/libvcd/libvcd/inf.h
diff --git a/src/input/vcd/libvcd/libvcd/info.h b/contrib/libvcd/libvcd/info.h
index 91b25c956..91b25c956 100644
--- a/src/input/vcd/libvcd/libvcd/info.h
+++ b/contrib/libvcd/libvcd/info.h
diff --git a/src/input/vcd/libvcd/libvcd/logging.h b/contrib/libvcd/libvcd/logging.h
index bc088ed1c..bc088ed1c 100644
--- a/src/input/vcd/libvcd/libvcd/logging.h
+++ b/contrib/libvcd/libvcd/logging.h
diff --git a/src/input/vcd/libvcd/libvcd/sector.h b/contrib/libvcd/libvcd/sector.h
index 32c2cc89a..32c2cc89a 100644
--- a/src/input/vcd/libvcd/libvcd/sector.h
+++ b/contrib/libvcd/libvcd/sector.h
diff --git a/src/input/vcd/libvcd/libvcd/types.h b/contrib/libvcd/libvcd/types.h
index 56a07d447..56a07d447 100644
--- a/src/input/vcd/libvcd/libvcd/types.h
+++ b/contrib/libvcd/libvcd/types.h
diff --git a/src/input/vcd/libvcd/libvcd/version.h b/contrib/libvcd/libvcd/version.h
index 0cd2096d3..0cd2096d3 100644
--- a/src/input/vcd/libvcd/libvcd/version.h
+++ b/contrib/libvcd/libvcd/version.h
diff --git a/src/input/vcd/libvcd/logging.c b/contrib/libvcd/logging.c
index 652a8090b..652a8090b 100644
--- a/src/input/vcd/libvcd/logging.c
+++ b/contrib/libvcd/logging.c
diff --git a/src/input/vcd/libvcd/mpeg.c b/contrib/libvcd/mpeg.c
index 545a44fbc..545a44fbc 100644
--- a/src/input/vcd/libvcd/mpeg.c
+++ b/contrib/libvcd/mpeg.c
diff --git a/src/input/vcd/libvcd/mpeg.h b/contrib/libvcd/mpeg.h
index 2d28d2aef..2d28d2aef 100644
--- a/src/input/vcd/libvcd/mpeg.h
+++ b/contrib/libvcd/mpeg.h
diff --git a/src/input/vcd/libvcd/mpeg_stream.c b/contrib/libvcd/mpeg_stream.c
index e5466766a..e5466766a 100644
--- a/src/input/vcd/libvcd/mpeg_stream.c
+++ b/contrib/libvcd/mpeg_stream.c
diff --git a/src/input/vcd/libvcd/mpeg_stream.h b/contrib/libvcd/mpeg_stream.h
index 14f73d928..14f73d928 100644
--- a/src/input/vcd/libvcd/mpeg_stream.h
+++ b/contrib/libvcd/mpeg_stream.h
diff --git a/src/input/vcd/libvcd/obj.h b/contrib/libvcd/obj.h
index d6849a3ab..d6849a3ab 100644
--- a/src/input/vcd/libvcd/obj.h
+++ b/contrib/libvcd/obj.h
diff --git a/src/input/vcd/libvcd/pbc.c b/contrib/libvcd/pbc.c
index 1b4f1a6c1..1b4f1a6c1 100644
--- a/src/input/vcd/libvcd/pbc.c
+++ b/contrib/libvcd/pbc.c
diff --git a/src/input/vcd/libvcd/pbc.h b/contrib/libvcd/pbc.h
index 9972c3143..9972c3143 100644
--- a/src/input/vcd/libvcd/pbc.h
+++ b/contrib/libvcd/pbc.h
diff --git a/src/input/vcd/libvcd/salloc.c b/contrib/libvcd/salloc.c
index d6fc41c68..d6fc41c68 100644
--- a/src/input/vcd/libvcd/salloc.c
+++ b/contrib/libvcd/salloc.c
diff --git a/src/input/vcd/libvcd/salloc.h b/contrib/libvcd/salloc.h
index 4676f9b45..4676f9b45 100644
--- a/src/input/vcd/libvcd/salloc.h
+++ b/contrib/libvcd/salloc.h
diff --git a/src/input/vcd/libvcd/sector.c b/contrib/libvcd/sector.c
index d072a4f17..d072a4f17 100644
--- a/src/input/vcd/libvcd/sector.c
+++ b/contrib/libvcd/sector.c
diff --git a/src/input/vcd/libvcd/sector_private.h b/contrib/libvcd/sector_private.h
index 9411b5420..9411b5420 100644
--- a/src/input/vcd/libvcd/sector_private.h
+++ b/contrib/libvcd/sector_private.h
diff --git a/src/input/vcd/libvcd/stream.c b/contrib/libvcd/stream.c
index 2840a05d6..2840a05d6 100644
--- a/src/input/vcd/libvcd/stream.c
+++ b/contrib/libvcd/stream.c
diff --git a/src/input/vcd/libvcd/stream.h b/contrib/libvcd/stream.h
index 43b8c911a..43b8c911a 100644
--- a/src/input/vcd/libvcd/stream.h
+++ b/contrib/libvcd/stream.h
diff --git a/src/input/vcd/libvcd/stream_stdio.c b/contrib/libvcd/stream_stdio.c
index 4eac0f6b3..4eac0f6b3 100644
--- a/src/input/vcd/libvcd/stream_stdio.c
+++ b/contrib/libvcd/stream_stdio.c
diff --git a/src/input/vcd/libvcd/stream_stdio.h b/contrib/libvcd/stream_stdio.h
index 46bca3140..46bca3140 100644
--- a/src/input/vcd/libvcd/stream_stdio.h
+++ b/contrib/libvcd/stream_stdio.h
diff --git a/src/input/vcd/libvcd/util.c b/contrib/libvcd/util.c
index a1e5c57d4..a1e5c57d4 100644
--- a/src/input/vcd/libvcd/util.c
+++ b/contrib/libvcd/util.c
diff --git a/src/input/vcd/libvcd/util.h b/contrib/libvcd/util.h
index c5a9ead7c..c5a9ead7c 100644
--- a/src/input/vcd/libvcd/util.h
+++ b/contrib/libvcd/util.h
diff --git a/src/input/vcd/libvcd/vcd.c b/contrib/libvcd/vcd.c
index 0772149ec..0772149ec 100644
--- a/src/input/vcd/libvcd/vcd.c
+++ b/contrib/libvcd/vcd.c
diff --git a/src/input/vcd/libvcd/vcd.h b/contrib/libvcd/vcd.h
index 7c001d282..7c001d282 100644
--- a/src/input/vcd/libvcd/vcd.h
+++ b/contrib/libvcd/vcd.h
diff --git a/src/input/vcd/libvcd/vcd_assert.h b/contrib/libvcd/vcd_assert.h
index c096b3677..c096b3677 100644
--- a/src/input/vcd/libvcd/vcd_assert.h
+++ b/contrib/libvcd/vcd_assert.h
diff --git a/src/input/vcd/libvcd/vcd_read.c b/contrib/libvcd/vcd_read.c
index dd9d30cfa..dd9d30cfa 100644
--- a/src/input/vcd/libvcd/vcd_read.c
+++ b/contrib/libvcd/vcd_read.c
diff --git a/src/input/vcd/libvcd/vcd_read.h b/contrib/libvcd/vcd_read.h
index fb9e1509b..fb9e1509b 100644
--- a/src/input/vcd/libvcd/vcd_read.h
+++ b/contrib/libvcd/vcd_read.h
diff --git a/contrib/vidix/Makefile.am b/contrib/vidix/Makefile.am
new file mode 100644
index 000000000..a76fc380b
--- /dev/null
+++ b/contrib/vidix/Makefile.am
@@ -0,0 +1,19 @@
+include $(top_srcdir)/misc/Makefile.common
+
+SUBDIRS = drivers
+
+AM_CFLAGS   = $(DEFAULT_OCFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/contrib/vidix -I$(top_builddir)/contrib/libdha
+
+EXTRA_DIST = README vidix.txt
+
+noinst_HEADERS = fourcc.h vidix.h vidixlib.h
+
+noinst_LTLIBRARIES = libvidix.la
+
+$(top_builddir)/contrib/libdha/libdha.la:
+	$(MAKE) -C $(top_builddir)/contrib/libdha libdha.la
+
+libvidix_la_SOURCES = vidixlib.c
+libvidix_la_LIBADD = $(DYNAMIC_LD_LIBS) $(top_builddir)/contrib/libdha/libdha.la
+
diff --git a/src/video_out/vidix/README b/contrib/vidix/README
index 23bcaca30..23bcaca30 100644
--- a/src/video_out/vidix/README
+++ b/contrib/vidix/README
diff --git a/src/video_out/vidix/drivers/Makefile.am b/contrib/vidix/drivers/Makefile.am
index db3adc078..f2711fc07 100644
--- a/src/video_out/vidix/drivers/Makefile.am
+++ b/contrib/vidix/drivers/Makefile.am
@@ -1,8 +1,8 @@
 include $(top_srcdir)/misc/Makefile.common
 
 AM_CFLAGS   = $(DEFAULT_OCFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \
-              -I$(top_srcdir)/src/video_out/libdha -I$(top_builddir)/src/video_out/libdha
+AM_CPPFLAGS = -I$(top_srcdir)/contrib/vidix \
+              -I$(top_srcdir)/contrib/libdha -I$(top_builddir)/contrib/libdha
 AM_LDFLAGS  = $(xineplug_ldflags)
 
 EXTRA_DIST = genfb_vid.c
@@ -10,6 +10,12 @@ EXTRA_DIST = genfb_vid.c
 noinst_HEADERS = mach64.h glint_regs.h pm3_regs.h radeon.h savage_regs.h \
                  cyberblade_regs.h unichrome_regs.h sis_defs.h sis_regs.h
 
+BUILT_SOURCES = $(top_srcdir)/contrib/libdha/pci_ids.h \
+		$(top_srcdir)/contrib/libdha/pci_names.h
+
+$(BUILT_SOURCES):
+	$(MAKE) -C $(dir $@) $(notdir $@)
+
 vidix_LTLIBRARIES = \
 	mach64_vid.la \
 	mga_crtc2_vid.la \
diff --git a/src/video_out/vidix/drivers/cyberblade_regs.h b/contrib/vidix/drivers/cyberblade_regs.h
index 1bae61d4a..1bae61d4a 100644
--- a/src/video_out/vidix/drivers/cyberblade_regs.h
+++ b/contrib/vidix/drivers/cyberblade_regs.h
diff --git a/src/video_out/vidix/drivers/cyberblade_vid.c b/contrib/vidix/drivers/cyberblade_vid.c
index 7a32ce7bd..7a32ce7bd 100644
--- a/src/video_out/vidix/drivers/cyberblade_vid.c
+++ b/contrib/vidix/drivers/cyberblade_vid.c
diff --git a/src/video_out/vidix/drivers/genfb_vid.c b/contrib/vidix/drivers/genfb_vid.c
index eaf548438..eaf548438 100644
--- a/src/video_out/vidix/drivers/genfb_vid.c
+++ b/contrib/vidix/drivers/genfb_vid.c
diff --git a/src/video_out/vidix/drivers/glint_regs.h b/contrib/vidix/drivers/glint_regs.h
index f33accd3d..f33accd3d 100644
--- a/src/video_out/vidix/drivers/glint_regs.h
+++ b/contrib/vidix/drivers/glint_regs.h
diff --git a/src/video_out/vidix/drivers/mach64.h b/contrib/vidix/drivers/mach64.h
index 807efdb8d..807efdb8d 100644
--- a/src/video_out/vidix/drivers/mach64.h
+++ b/contrib/vidix/drivers/mach64.h
diff --git a/src/video_out/vidix/drivers/mach64_vid.c b/contrib/vidix/drivers/mach64_vid.c
index 02447af19..02447af19 100644
--- a/src/video_out/vidix/drivers/mach64_vid.c
+++ b/contrib/vidix/drivers/mach64_vid.c
diff --git a/src/video_out/vidix/drivers/mga_vid.c b/contrib/vidix/drivers/mga_vid.c
index eed2b9e65..eed2b9e65 100644
--- a/src/video_out/vidix/drivers/mga_vid.c
+++ b/contrib/vidix/drivers/mga_vid.c
diff --git a/src/video_out/vidix/drivers/nvidia_vid.c b/contrib/vidix/drivers/nvidia_vid.c
index 34fa27cb7..34fa27cb7 100644
--- a/src/video_out/vidix/drivers/nvidia_vid.c
+++ b/contrib/vidix/drivers/nvidia_vid.c
diff --git a/src/video_out/vidix/drivers/pm2_vid.c b/contrib/vidix/drivers/pm2_vid.c
index 075b178de..075b178de 100644
--- a/src/video_out/vidix/drivers/pm2_vid.c
+++ b/contrib/vidix/drivers/pm2_vid.c
diff --git a/src/video_out/vidix/drivers/pm3_regs.h b/contrib/vidix/drivers/pm3_regs.h
index 44cc92dca..44cc92dca 100644
--- a/src/video_out/vidix/drivers/pm3_regs.h
+++ b/contrib/vidix/drivers/pm3_regs.h
diff --git a/src/video_out/vidix/drivers/pm3_vid.c b/contrib/vidix/drivers/pm3_vid.c
index 72a6523b3..72a6523b3 100644
--- a/src/video_out/vidix/drivers/pm3_vid.c
+++ b/contrib/vidix/drivers/pm3_vid.c
diff --git a/src/video_out/vidix/drivers/radeon.h b/contrib/vidix/drivers/radeon.h
index 090fbf8df..090fbf8df 100644
--- a/src/video_out/vidix/drivers/radeon.h
+++ b/contrib/vidix/drivers/radeon.h
diff --git a/src/video_out/vidix/drivers/radeon_vid.c b/contrib/vidix/drivers/radeon_vid.c
index de4e66194..de4e66194 100644
--- a/src/video_out/vidix/drivers/radeon_vid.c
+++ b/contrib/vidix/drivers/radeon_vid.c
diff --git a/src/video_out/vidix/drivers/savage_regs.h b/contrib/vidix/drivers/savage_regs.h
index a8a44c7c3..a8a44c7c3 100644
--- a/src/video_out/vidix/drivers/savage_regs.h
+++ b/contrib/vidix/drivers/savage_regs.h
diff --git a/src/video_out/vidix/drivers/savage_vid.c b/contrib/vidix/drivers/savage_vid.c
index 2ac76198d..2ac76198d 100644
--- a/src/video_out/vidix/drivers/savage_vid.c
+++ b/contrib/vidix/drivers/savage_vid.c
diff --git a/src/video_out/vidix/drivers/sis_bridge.c b/contrib/vidix/drivers/sis_bridge.c
index f6916ae87..f6916ae87 100644
--- a/src/video_out/vidix/drivers/sis_bridge.c
+++ b/contrib/vidix/drivers/sis_bridge.c
diff --git a/src/video_out/vidix/drivers/sis_defs.h b/contrib/vidix/drivers/sis_defs.h
index 79a61a19b..79a61a19b 100644
--- a/src/video_out/vidix/drivers/sis_defs.h
+++ b/contrib/vidix/drivers/sis_defs.h
diff --git a/src/video_out/vidix/drivers/sis_regs.h b/contrib/vidix/drivers/sis_regs.h
index 0157e049a..0157e049a 100644
--- a/src/video_out/vidix/drivers/sis_regs.h
+++ b/contrib/vidix/drivers/sis_regs.h
diff --git a/src/video_out/vidix/drivers/sis_vid.c b/contrib/vidix/drivers/sis_vid.c
index c3ef2bdcf..c3ef2bdcf 100644
--- a/src/video_out/vidix/drivers/sis_vid.c
+++ b/contrib/vidix/drivers/sis_vid.c
diff --git a/src/video_out/vidix/drivers/unichrome_regs.h b/contrib/vidix/drivers/unichrome_regs.h
index 15795f126..15795f126 100644
--- a/src/video_out/vidix/drivers/unichrome_regs.h
+++ b/contrib/vidix/drivers/unichrome_regs.h
diff --git a/src/video_out/vidix/drivers/unichrome_vid.c b/contrib/vidix/drivers/unichrome_vid.c
index b5ff314e6..b5ff314e6 100644
--- a/src/video_out/vidix/drivers/unichrome_vid.c
+++ b/contrib/vidix/drivers/unichrome_vid.c
diff --git a/src/video_out/vidix/fourcc.h b/contrib/vidix/fourcc.h
index 891f0b6ff..891f0b6ff 100644
--- a/src/video_out/vidix/fourcc.h
+++ b/contrib/vidix/fourcc.h
diff --git a/src/video_out/vidix/vidix.h b/contrib/vidix/vidix.h
index bcf6b4ae0..bcf6b4ae0 100644
--- a/src/video_out/vidix/vidix.h
+++ b/contrib/vidix/vidix.h
diff --git a/src/video_out/vidix/vidix.txt b/contrib/vidix/vidix.txt
index e642147b4..e642147b4 100644
--- a/src/video_out/vidix/vidix.txt
+++ b/contrib/vidix/vidix.txt
diff --git a/src/video_out/vidix/vidixlib.c b/contrib/vidix/vidixlib.c
index 37af2035b..37af2035b 100644
--- a/src/video_out/vidix/vidixlib.c
+++ b/contrib/vidix/vidixlib.c
diff --git a/src/video_out/vidix/vidixlib.h b/contrib/vidix/vidixlib.h
index ebc3dd309..ebc3dd309 100644
--- a/src/video_out/vidix/vidixlib.h
+++ b/contrib/vidix/vidixlib.h
diff --git a/debian/control b/debian/control
index fc7bf047c..a831ad8c7 100644
--- a/debian/control
+++ b/debian/control
@@ -22,11 +22,11 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config,
 Build-Conflicts: libdvdnav-dev, libvcdinfo-dev
 Standards-Version: 3.7.2
 
-Package: libxine-dev
+Package: libxine2-dev
 Architecture: any
 Section: libdevel
 Depends: libxine2 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev
-Conflicts: xine-ui (<< 0.9.10)
+Conflicts: xine-ui (<< 0.9.10), libxine-dev
 Description: the xine video player library, development packages
  This contains development files (headers, documentation and the like)
  for the xine library (libxine).
@@ -42,10 +42,26 @@ Description: the xine video player library, development packages
  The xine-ui and gxine packages each provide one for your convenience, so
  you can just start watching your VCDs ;-)
 
+Package: libxine2-doc
+Architecture: all
+Section: libdevel
+Provides: libxine-doc
+Conflicts: libxine1-doc
+Replaces: libxine1-doc
+Description: the xine video player library, development packages
+ This contains documentation for the xine library (libxine).
+ .
+ Libxine provides the complete infrastructure for a video/media player. It
+ supports MPEG 1/2 and some AVI and Quicktime videos out of the box, so you
+ can use it to play DVDs, (S)VCDs and most video files out there. It
+ supports network streams, subtitles and even MP3 or Ogg files. It's
+ extensible to your heart's content via plugins for audio and video output,
+ input media, demuxers (stream types), audio/video and subtitle codecs.
+
 Package: libxine2
 Architecture: any
 Depends: ${shlibs:Depends}
-Recommends: ${shlibs:Recommends}
+Recommends: ${shlibs:Recommends}, libxine2-doc | libxine-doc
 Suggests: ${shlibs:Suggests}, libartsc0
 Description: the xine video/media player library, binary files
  This is the xine media player library (libxine). 
diff --git a/debian/libxine-dev.install b/debian/libxine2-dev.install
index 6fadf7dc5..6fadf7dc5 100644
--- a/debian/libxine-dev.install
+++ b/debian/libxine2-dev.install
diff --git a/debian/libxine2-doc.docs b/debian/libxine2-doc.docs
new file mode 100644
index 000000000..3df629bbf
--- /dev/null
+++ b/debian/libxine2-doc.docs
@@ -0,0 +1,8 @@
+debian/tmp/usr/share/doc/libxine2/faq/*
+debian/tmp/usr/share/doc/libxine2/README_xxmc.html
+debian/tmp/usr/share/doc/libxine2/README
+debian/tmp/usr/share/doc/libxine2/faq.*
+debian/tmp/usr/share/doc/libxine2/README.syncfb*
+debian/tmp/usr/share/doc/libxine2/README.opengl*
+debian/tmp/usr/share/doc/libxine2/README.dxr3*
+debian/tmp/usr/share/doc/libxine2/README.dvb*
diff --git a/debian/libxine2-doc.manpages b/debian/libxine2-doc.manpages
new file mode 100644
index 000000000..23e59ea93
--- /dev/null
+++ b/debian/libxine2-doc.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man5/xine.5
diff --git a/debian/libxine2.install b/debian/libxine2.install
index 42f7937c2..8c97ee196 100644
--- a/debian/libxine2.install
+++ b/debian/libxine2.install
@@ -4,8 +4,5 @@ usr/lib/xine/plugins/*/*.so
 usr/lib/xine/plugins/*/vidix/*.so
 usr/share/locale
 usr/share/xine-lib
-usr/share/man/man5/xine.5
-usr/share/doc/libxine2/faq/*
-usr/share/doc/libxine2/README*
 usr/share/doc/libxine2/hackersguide/*
 usr/share/bug/libxine2/presubj
diff --git a/doc/hackersguide/Makefile.am b/doc/hackersguide/Makefile.am
index 02a433299..17d7eed8f 100644
--- a/doc/hackersguide/Makefile.am
+++ b/doc/hackersguide/Makefile.am
@@ -61,10 +61,10 @@ hackersguide.html: $(hackersguide_sgml)
 endif
 
 if HAVE_FIG2DEV
-%.png: %.fig
+.fig.png:
 	$(FIG2DEV) -L png -S 4 $< $@;
 else
-%.png: %.fig
+.fig.png:
 	if test x"$(fail_if_missing)" = x"yes"; then \
 	  echo "Please install fig2dev."; \
 	  exit 1; \
@@ -75,3 +75,5 @@ else
 	  touch $(notdir $^); \
 	fi
 endif
+
+SUFFIXES = .png .fig
diff --git a/m4/decoders.m4 b/m4/decoders.m4
index 094f406ea..7327ba5db 100644
--- a/m4/decoders.m4
+++ b/m4/decoders.m4
@@ -29,6 +29,18 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
         else
             AC_MSG_RESULT([Using included a52dec support])
         fi
+        if test x"$have_external_a52dec" = x"yes"; then
+            A52DEC_CFLAGS=''
+            A52DEC_LIBS='-la52'
+            A52DEC_DEPS=''
+	else
+            A52DEC_CFLAGS='-I$(top_srcdir)/contrib/a52dec'
+            A52DEC_LIBS='$(top_builddir)/contrib/a52dec/liba52.la'
+            A52DEC_DEPS='$(top_builddir)/contrib/a52dec/liba52.la'
+        fi
+        AC_SUBST(A52DEC_CFLAGS)
+        AC_SUBST(A52DEC_DEPS)
+        AC_SUBST(A52DEC_LIBS)
     fi
     AM_CONDITIONAL([ENABLE_A52DEC], [test x"$enable_a52dec" != x"no"])
     AM_CONDITIONAL([WITH_EXTERNAL_A52DEC], [test x"$have_external_a52dec" = x"yes"])
@@ -260,6 +272,14 @@ use internal ffmpeg.
                     ;;
             esac
         fi
+        if test x"$have_external_libmad" != x"yes"; then
+            LIBMAD_CFLAGS='-I$(top_srcdir)/contrib/libmad'
+            LIBMAD_LIBS='$(top_builddir)/contrib/libmad/libmad.la'
+            LIBMAD_DEPS='$(top_builddir)/contrib/libmad/libmad.la'
+        fi
+        AC_SUBST(LIBMAD_CFLAGS)
+        AC_SUBST(LIBMAD_DEPS)
+        AC_SUBST(LIBMAD_LIBS)
     fi
     AM_CONDITIONAL([ENABLE_MAD], [test x"$enable_mad" != x"no"])
     AM_CONDITIONAL([WITH_EXTERNAL_MAD], [test x"$have_external_libmad" = x"yes"])
diff --git a/m4/input.m4 b/m4/input.m4
index 76ad12ad9..a0de77dc0 100644
--- a/m4/input.m4
+++ b/m4/input.m4
@@ -218,12 +218,16 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [
                 fi
             fi
 
-            LIBCDIO_CFLAGS='-I$(top_srcdir)/src/input/vcd/libcdio'
-            LIBCDIO_LIBS='$(top_builddir)/src/input/vcd/libcdio/libcdio.la'
-            LIBISO9660_LIBS='$(top_builddir)/src/input/vcd/libcdio/libiso9660.la'
-            LIBVCD_CFLAGS='-I$(top_srcdir)/src/input/vcd/libvcd'
-            LIBVCD_LIBS='$(top_builddir)/src/input/vcd/libvcd/libvcd.la'
-            LIBVCDINFO_LIBS='$(top_builddir)/src/input/vcd/libvcd/libvcdinfo.la'
+            LIBCDIO_CFLAGS='-I$(top_srcdir)/contrib/libcdio'
+            LIBCDIO_LIBS='$(top_builddir)/contrib/libcdio/libcdio.la'
+            LIBCDIO_DEPS='$(top_builddir)/contrib/libcdio/libcdio.la'
+            LIBISO9660_LIBS='$(top_builddir)/contrib/libcdio/libiso9660.la'
+            LIBISO9660_DEPS='$(top_builddir)/contrib/libcdio/libiso9660.la'
+            LIBVCD_CFLAGS='-I$(top_srcdir)/contrib/libvcd'
+            LIBVCD_LIBS='$(top_builddir)/contrib/libvcd/libvcd.la'
+            LIBVCD_DEPS='$(top_builddir)/contrib/libvcd/libvcd.la'
+            LIBVCDINFO_LIBS='$(top_builddir)/contrib/libvcd/libvcdinfo.la'
+            LIBVCDINFO_DEPS='$(top_builddir)/contrib/libvcd/libvcdinfo.la'
 
             case "$host_os" in
                 bsdi*)
@@ -270,10 +274,14 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [
     AC_DEFINE([EXTERNAL_LIBCDIO_CONFIG_H], 1, [Get of rid system libcdio build configuration])
     AC_SUBST(LIBCDIO_CFLAGS)
     AC_SUBST(LIBCDIO_LIBS)
+    AC_SUBST(LIBCDIO_DEPS)
     AC_SUBST(LIBISO9660_LIBS)
+    AC_SUBST(LIBISO9660_DEPS)
     AC_SUBST(LIBVCD_CFLAGS)
     AC_SUBST(LIBVCD_LIBS)
+    AC_SUBST(LIBVCD_DEPS)
     AC_SUBST(LIBVCDINFO_LIBS)
+    AC_SUBST(LIBVCDINFO_DEPS)
     AM_CONDITIONAL([WITH_EXTERNAL_VCDLIBS], [test x"$with_internal_vcdlibs" = x"no"])
     AM_CONDITIONAL([ENABLE_VCD], [test x"$enable_vcd" != x"no"])
     AM_CONDITIONAL([ENABLE_VCDO], [test x"$enable_vcdo" != x"no"])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d56ea9160..52064f8c7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,8 @@
 # For updating this file, look at the result of:
-#  head -n 3 po/POTFILES.in > /tmp/POTFILES.in && grep -l '[^A-Za-z_]_(' . -r --include '*.[chy]' --exclude xineintl.h | sed -e 's:^\./::' >> /tmp/POTFILES.in && cp /tmp/POTFILES.in po/
+#  head -n 3 po/POTFILES.in > /tmp/POTFILES.in && grep -l '[^A-Za-z_]_(' . -r --include '*.[chy]' --exclude xineintl.h | sed -e 's:^\./::' | sort >> /tmp/POTFILES.in && cp /tmp/POTFILES.in po/
 
+contrib/libmpcdec/requant.c
+contrib/libmpcdec/synth_filter.c
 lib/hstrerror.c
 src/audio_out/audio_alsa_out.c
 src/audio_out/audio_arts_out.c
@@ -15,6 +17,7 @@ src/audio_out/audio_none_out.c
 src/audio_out/audio_oss_out.c
 src/audio_out/audio_pulse_out.c
 src/audio_out/audio_sun_out.c
+src/combined/xine_ogg_demuxer.c
 src/demuxers/demux_asf.c
 src/demuxers/demux_avi.c
 src/demuxers/demux_film.c
@@ -23,14 +26,13 @@ src/demuxers/demux_iff.c
 src/demuxers/demux_mpc.c
 src/demuxers/demux_mpeg_block.c
 src/demuxers/demux_mpeg_pes.c
-src/demuxers/demux_ogg.c
 src/demuxers/demux_snd.c
 src/demuxers/demux_tta.c
 src/demuxers/demux_voc.c
 src/demuxers/demux_wc3movie.c
-src/dxr3/dxr3.h
 src/dxr3/dxr3_decode_spu.c
 src/dxr3/dxr3_decode_video.c
+src/dxr3/dxr3.h
 src/dxr3/dxr3_mpeg_encoders.c
 src/dxr3/dxr3_scr.c
 src/dxr3/video_out_dxr3.c
@@ -61,19 +63,13 @@ src/input/vcd/vcdio.c
 src/input/vcd/vcdplayer.c
 src/input/vcd/vcdplayer.h
 src/input/vcd/xineplug_inp_vcd.c
-src/liba52/xine_a52_decoder.c
-src/libxineadec/xine_dts_decoder.c
-src/libfaad/xine_faad_decoder.c
 src/libffmpeg/ff_audio_decoder.c
 src/libffmpeg/ff_dvaudio_decoder.c
-src/libffmpeg/ff_video_decoder.c
 src/libffmpeg/ffmpeg_encoder.c
-contrib/libmpcdec/requant.c
-contrib/libmpcdec/synth_filter.c
-src/libxineadec/xine_musepack_decoder.c
+src/libffmpeg/ff_video_decoder.c
 src/libreal/real_common.c
-src/libreal/xine_real_video_decoder.c
 src/libreal/xine_real_audio_decoder.c
+src/libreal/xine_real_video_decoder.c
 src/libspucc/xine_cc_decoder.c
 src/libspucmml/xine_cmml_decoder.c
 src/libspudvb/xine_spudvb_decoder.c
@@ -81,6 +77,10 @@ src/libsputext/demux_sputext.c
 src/libsputext/xine_sputext_decoder.c
 src/libw32dll/common.c
 src/libw32dll/w32codec.c
+src/libxineadec/xine_a52_decoder.c
+src/libxineadec/xine_dts_decoder.c
+src/libxineadec/xine_faad_decoder.c
+src/libxineadec/xine_musepack_decoder.c
 src/libxinevdec/bitplane.c
 src/post/audio/stretch.c
 src/post/audio/upmix.c
@@ -92,12 +92,14 @@ src/post/mosaico/mosaico.c
 src/post/mosaico/switch.c
 src/post/planar/boxblur.c
 src/post/planar/denoise3d.c
-src/post/planar/eq.c
 src/post/planar/eq2.c
+src/post/planar/eq.c
 src/post/planar/expand.c
 src/post/planar/noise.c
 src/post/planar/pp.c
 src/post/planar/unsharp.c
+src/vdr/input_vdr.c
+src/vdr/post_vdr_video.c
 src/video_out/video_out_aa.c
 src/video_out/video_out_caca.c
 src/video_out/video_out_directfb.c
diff --git a/po/cs.po b/po/cs.po
index 69af8bba6..63799ea4a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 1.0.1\n"
 "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-04-24 21:48+0100\n"
+"POT-Creation-Date: 2007-06-02 13:14+0200\n"
 "PO-Revision-Date: 2005-12-11 20:47+0100\n"
 "Last-Translator: František Dvořák <valtri@atlas.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -841,6 +841,13 @@ msgstr "audio_sun_out: otevírání zvukového zařízení %s selhalo: %s\n"
 msgid "xine audio output plugin using sun-compliant audio devices/drivers"
 msgstr "výstupní zvukový modul použije zvuková zařízení/ovlada�e sun"
 
+#: src/combined/xine_ogg_demuxer.c:810
+#, c-format
+msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+msgstr ""
+"ogg: zjištěna zvuková stopa vorbis, ale nenalezena žádná hlavi�ka dat "
+"vorbis.\n"
+
 #: src/demuxers/demux_asf.c:428
 #, c-format
 msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
@@ -982,13 +989,6 @@ msgstr ""
 "demux_mpeg_pes: Nerozpoznaný soukromý proud dat 1 0x%02x. Prosím oznamte to "
 "vývojářům xine.\n"
 
-#: src/demuxers/demux_ogg.c:802
-#, c-format
-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
-msgstr ""
-"ogg: zjištěna zvuková stopa vorbis, ale nenalezena žádná hlavi�ka dat "
-"vorbis.\n"
-
 #: src/demuxers/demux_snd.c:104
 #, c-format
 msgid "demux_snd: bad header parameters\n"
@@ -1025,18 +1025,6 @@ msgstr ""
 msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
 msgstr "demux_wc3movie: Byl zde problém během na�ítání datových bloků palety\n"
 
-#: src/dxr3/dxr3.h:32
-msgid "DXR3 device number"
-msgstr "Číslo zařízení DXR3"
-
-#: src/dxr3/dxr3.h:33
-msgid ""
-"If you have more than one DXR3 in your computer, you can specify which one "
-"to use here."
-msgstr ""
-"Jestliže máte ve vašem po�íta�i více než jednu DXR3, můžete uvézt, kterou z "
-"nich zde použít."
-
 #: src/dxr3/dxr3_decode_spu.c:253
 #, c-format
 msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
@@ -1150,6 +1138,18 @@ msgid ""
 msgstr ""
 "dxr3_decode_video: VAROV�N�: oprava kódu rychlosti snímků z PAL na NTSC\n"
 
+#: src/dxr3/dxr3.h:32
+msgid "DXR3 device number"
+msgstr "Číslo zařízení DXR3"
+
+#: src/dxr3/dxr3.h:33
+msgid ""
+"If you have more than one DXR3 in your computer, you can specify which one "
+"to use here."
+msgstr ""
+"Jestliže máte ve vašem po�íta�i více než jednu DXR3, můžete uvézt, kterou z "
+"nich zde použít."
+
 #: src/dxr3/dxr3_mpeg_encoders.c:125
 msgid "dxr3_mpeg_encoder: failed to init librte\n"
 msgstr "dxr3_mpeg_encoder: selhala inicializace librte\n"
@@ -1488,30 +1488,30 @@ msgstr ""
 "video_out_dxr3: CHYBA �tení souboru inicializace překrývání. Spusťte "
 "autocal!\n"
 
-#: src/input/input_cdda.c:1608
+#: src/input/input_cdda.c:1611
 #, c-format
 msgid "%s: can't connect to %s:%d\n"
 msgstr "%s: http: nelze se připojit k %s:%d\n"
 
-#: src/input/input_cdda.c:1655
+#: src/input/input_cdda.c:1658
 #, c-format
 msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
 msgstr "input_cdda: úspěšně připojeno k CDDB serveru '%s:%d'.\n"
 
-#: src/input/input_cdda.c:1660
+#: src/input/input_cdda.c:1663
 #, c-format
 msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
 msgstr "input_cdda: nelze se připojit k CDDB serveru '%s:%d' (%s).\n"
 
-#: src/input/input_cdda.c:2690
+#: src/input/input_cdda.c:2693
 msgid "CD Digital Audio (aka. CDDA)"
 msgstr "digitální zvukové CD (CDDA)"
 
-#: src/input/input_cdda.c:2742
+#: src/input/input_cdda.c:2745
 msgid "device used for CD audio"
 msgstr "zařízení použité pro zvukové CD"
 
-#: src/input/input_cdda.c:2743
+#: src/input/input_cdda.c:2746
 msgid ""
 "The path to the device, usually a CD or DVD drive, which you intend to use "
 "for playing audio CDs."
@@ -1519,11 +1519,11 @@ msgstr ""
 "Cesta k zeřízení, obvykle CD nebo DVD mechanika, které máte v úmyslu "
 "používat k přehrávání zvukových CD."
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid "query CDDB"
 msgstr "dotazovat se CDDB"
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid ""
 "Enables CDDB queries, which will give you convenient title and track names "
 "for your audio CDs.\n"
@@ -1537,11 +1537,11 @@ msgstr ""
 "internetového serveru, který by pak mohl znát profil vašich poslechových "
 "zvyků."
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid "CDDB server name"
 msgstr "jméno serveru CDDB"
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid ""
 "The CDDB server used to retrieve the title and track information from.\n"
 "This setting is security critical, because the sever will receive "
@@ -1554,21 +1554,21 @@ msgstr ""
 "posílány informace o vašich poslechovích zvycích a také mohl by odpovídat na "
 "dotazy zákeřnými odpově�mi. Ujistěte se, že serveru můžete důvěřovat."
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "CDDB server port"
 msgstr "port serveru CDDB"
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "The server port used to retrieve the title and track information from."
 msgstr ""
 "Port serveru, který se použije, aby se z něj získávaly nadpisy a informace o "
 "stopÄ›."
 
-#: src/input/input_cdda.c:2771
+#: src/input/input_cdda.c:2774
 msgid "slow down disc drive to this speed factor"
 msgstr "zpomalit diskovou jednotku na tento rychlostní faktor"
 
-#: src/input/input_cdda.c:2772
+#: src/input/input_cdda.c:2775
 msgid ""
 "Since some CD or DVD drives make some really loud noises because of the fast "
 "disc rotation, xine will try to slow them down. With standard CD or DVD "
@@ -1582,61 +1582,61 @@ msgstr ""
 "potřebné, a tak by nemělo zpomalení ovlivnit výkon přehrávání.\n"
 "Hodnota nula zde zakáže zpomalování."
 
-#: src/input/input_dvb.c:899
+#: src/input/input_dvb.c:900
 #, fuzzy, c-format
 msgid "input_dvb: failed to open dvb channel file '%s': %s\n"
 msgstr "input_dvb: selhalo otevření souboru kanálu dvb '%s'\n"
 
-#: src/input/input_dvb.c:905
+#: src/input/input_dvb.c:906
 #, fuzzy, c-format
 msgid "input_dvb: dvb channel file '%s' is not a plain file\n"
 msgstr "input_dvb: selhalo otevření souboru kanálu dvb '%s'\n"
 
-#: src/input/input_dvb.c:2115 src/input/input_dvb.c:2943
+#: src/input/input_dvb.c:2116 src/input/input_dvb.c:2948
 msgid "input_dvb: tuner_set_channel failed\n"
 msgstr "input_dvb: selhalo nastavení kanálu\n"
 
-#: src/input/input_dvb.c:2743
+#: src/input/input_dvb.c:2748
 msgid "input_dvb: cannot open dvb device\n"
 msgstr "input_dvb: nelze otevřít zařízení dvb\n"
 
-#: src/input/input_dvb.c:2767
+#: src/input/input_dvb.c:2772
 #, c-format
 msgid "input_dvb: channel %d out of range, defaulting to 0\n"
 msgstr "input_dvb: kanál %d mimo rozsah, použije se výchozí 0\n"
 
-#: src/input/input_dvb.c:2778
+#: src/input/input_dvb.c:2783
 #, c-format
 msgid "input_dvb: searching for channel %s\n"
 msgstr "input_dvb: hledání kanálu %s\n"
 
-#: src/input/input_dvb.c:2801
+#: src/input/input_dvb.c:2806
 #, c-format
 msgid "input_dvb: exact match for %s not found: trying partial matches\n"
 msgstr "input_dvb: přesná shoda pro %s nenalezena: zkusí se �áste�né shody\n"
 
-#: src/input/input_dvb.c:2808
+#: src/input/input_dvb.c:2813
 #, c-format
 msgid "input_dvb: found matching channel %s\n"
 msgstr "input_dvb: nalezen odpovídající kanál %s\n"
 
-#: src/input/input_dvb.c:2821
+#: src/input/input_dvb.c:2826
 #, c-format
 msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
 msgstr "input_dvb: kanál %s nenalezen v channels.conf, použije se výchozí.\n"
 
-#: src/input/input_dvb.c:2827
+#: src/input/input_dvb.c:2832
 msgid ""
 "input_dvb: invalid channel specification, defaulting to last viewed "
 "channel.\n"
 msgstr ""
 "input_dvb: neplatná specifikace kanálu, použije se naposledy sledovaný\n"
 
-#: src/input/input_dvb.c:2833
+#: src/input/input_dvb.c:2838
 msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
 msgstr "input_dvb: neplatná specifikace kanálu, použije se výchozí kanál 0\n"
 
-#: src/input/input_dvb.c:2845
+#: src/input/input_dvb.c:2850
 msgid ""
 "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
 "S)\n"
@@ -1644,7 +1644,7 @@ msgstr ""
 "input_dvb: bylo uvedeno MRL DVBS, ale nezdá se, že by tuner byl QPSK (DVB-"
 "S)\n"
 
-#: src/input/input_dvb.c:2865
+#: src/input/input_dvb.c:2870
 msgid ""
 "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
 "T)\n"
@@ -1652,27 +1652,35 @@ msgstr ""
 "input_dvb: bylo uvedeno MRL DVBT, ale nezdá se, že by byl tuner OFDM (DVB-"
 "T)\n"
 
-#: src/input/input_dvb.c:2888 src/input/input_dvb.c:2914
+#: src/input/input_dvb.c:2893
 msgid ""
 "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
 "C)\n"
 msgstr ""
 "input_dvb: bylo uvedeno MRL DVBC, ale nezdá se, že by byl tuner QAM (DVB-C)\n"
 
-#: src/input/input_dvb.c:2949
+#: src/input/input_dvb.c:2919
+#, fuzzy
+msgid ""
+"input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-"
+"A)\n"
+msgstr ""
+"input_dvb: bylo uvedeno MRL DVBC, ale nezdá se, že by byl tuner QAM (DVB-C)\n"
+
+#: src/input/input_dvb.c:2954
 #, c-format
 msgid "input_dvb: cannot open dvr device '%s'\n"
 msgstr "input_dvb: nelze otevřít zařízení dvr '%s'\n"
 
-#: src/input/input_dvb.c:2971
+#: src/input/input_dvb.c:2976
 msgid "input_dvb: cannot create EPG updater thread\n"
 msgstr "input_dvb: nelze vytvořit vlákno na aktualizace EPG\n"
 
-#: src/input/input_dvb.c:3033
+#: src/input/input_dvb.c:3038
 msgid "use DVB 'center cutout' (zoom)"
 msgstr "použít 'středový výsek' DVB (zvětšení)"
 
-#: src/input/input_dvb.c:3034
+#: src/input/input_dvb.c:3039
 msgid ""
 "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
 "frame."
@@ -1680,15 +1688,15 @@ msgstr ""
 "Toto dovolí přehrát obsah 4:3 na celé obrazovce, který byl přenášen ve "
 "formátu 16:9."
 
-#: src/input/input_dvb.c:3127
+#: src/input/input_dvb.c:3132
 msgid "DVB (Digital TV) input plugin"
 msgstr "vstupní modul DVB (digitální TV)"
 
-#: src/input/input_dvb.c:3244
+#: src/input/input_dvb.c:3249
 msgid "Remember last DVB channel watched"
 msgstr "Pamatovat si naposledy sledovaný kanál DVB"
 
-#: src/input/input_dvb.c:3245
+#: src/input/input_dvb.c:3250
 msgid ""
 "On autoplay, xine will remember and switch to the channel indicated in media."
 "dvb.last_channel. "
@@ -1696,21 +1704,21 @@ msgstr ""
 "Při automatickém přehrávání xine přepne na poslední kanál uvedený v media."
 "dvb.last_channel."
 
-#: src/input/input_dvb.c:3252
+#: src/input/input_dvb.c:3257
 msgid "Last DVB channel viewed"
 msgstr "Naposledy sledovaný kanál DVB"
 
-#: src/input/input_dvb.c:3253
+#: src/input/input_dvb.c:3258
 msgid "If enabled xine will remember and switch to this channel. "
 msgstr ""
 "Pokud je povoleno, xine si bude pamatovat tento kanál a bude se na něj "
 "automaticky přepínat."
 
-#: src/input/input_dvb.c:3259
+#: src/input/input_dvb.c:3264
 msgid "Number of dvb card to use."
 msgstr "Po�et karet DVB, které se mají použít."
 
-#: src/input/input_dvb.c:3260
+#: src/input/input_dvb.c:3265
 msgid ""
 "Leave this at zero unless you really have more than 1 card in your system."
 msgstr ""
@@ -1957,87 +1965,87 @@ msgstr ""
 msgid "gnome-vfs input plugin as shipped with xine"
 msgstr "vstupní modul gnome-vfs dodaný se xine"
 
-#: src/input/input_http.c:174
+#: src/input/input_http.c:176
 #, c-format
 msgid "input_http: gethostbyname(%s) failed: %s\n"
 msgstr "input_http: selhalo gethostbyname(%s): %s\n"
 
-#: src/input/input_http.c:400 src/input/input_http.c:943
+#: src/input/input_http.c:402 src/input/input_http.c:957
 #, c-format
 msgid "input_http: read error %d\n"
 msgstr "input_http: chyba �tení %d\n"
 
-#: src/input/input_http.c:627
+#: src/input/input_http.c:629
 msgid "Connecting HTTP server..."
 msgstr "Připojuje se k HTTP serveru..."
 
-#: src/input/input_http.c:819
+#: src/input/input_http.c:820
 #, c-format
 msgid "input_http: invalid http answer\n"
 msgstr "input_http: neplatná odpově� http\n"
 
-#: src/input/input_http.c:825
+#: src/input/input_http.c:826
 #, c-format
 msgid "input_http: 3xx redirection: >%d %s<\n"
 msgstr "input_http: přesměrování 3xx: >%d %s<\n"
 
-#: src/input/input_http.c:830 src/input/input_http.c:836
-#: src/input/input_http.c:843
+#: src/input/input_http.c:831 src/input/input_http.c:836
+#: src/input/input_http.c:842 src/input/input_http.c:849
 #, c-format
 msgid "input_http: http status not 2xx: >%d %s<\n"
 msgstr "input_http: stav http není 2xx: >%d %s<\n"
 
-#: src/input/input_http.c:853
+#: src/input/input_http.c:859
 #, c-format
 msgid "input_http: content length = %<PRIdMAX> bytes\n"
 msgstr "input_http: délka obsahu = %<PRIdMAX> bytů\n"
 
-#: src/input/input_http.c:922
+#: src/input/input_http.c:932
 #, fuzzy, c-format
 msgid "input_http: buffer exhausted after %d bytes."
 msgstr "input_http: chyba �tení %d\n"
 
-#: src/input/input_http.c:996
+#: src/input/input_http.c:1010
 msgid "http input plugin"
 msgstr "vstupní modul http"
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "HTTP proxy host"
 msgstr "HTTP proxy host"
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "The hostname of the HTTP proxy."
 msgstr "Hostitelské jméno HTTP proxy."
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "HTTP proxy port"
 msgstr "HTTP proxy port"
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "The port number of the HTTP proxy."
 msgstr "Číslo portu HTTP proxy."
 
-#: src/input/input_http.c:1076
+#: src/input/input_http.c:1090
 msgid "HTTP proxy username"
 msgstr "Uživatelské jméno HTTP proxy"
 
-#: src/input/input_http.c:1077
+#: src/input/input_http.c:1091
 msgid "The user name for the HTTP proxy."
 msgstr "Uživatelské jméno pro HTTP proxy."
 
-#: src/input/input_http.c:1080
+#: src/input/input_http.c:1094
 msgid "HTTP proxy password"
 msgstr "Heslo HTTP proxy"
 
-#: src/input/input_http.c:1081
+#: src/input/input_http.c:1095
 msgid "The password for the HTTP proxy."
 msgstr "Heslo pro HTTP proxy."
 
-#: src/input/input_http.c:1084
+#: src/input/input_http.c:1098
 msgid "Domains for which to ignore the HTTP proxy"
 msgstr "Domény, pro které ignorovat HTTP proxy"
 
-#: src/input/input_http.c:1085
+#: src/input/input_http.c:1099
 msgid ""
 "A comma-separated list of domain names for which the proxy is to be "
 "ignored.\n"
@@ -2251,31 +2259,31 @@ msgstr "Buffer přetekl..."
 msgid "Adjusting..."
 msgstr "Přizpůsobuje se..."
 
-#: src/input/input_v4l.c:660
+#: src/input/input_v4l.c:658
 msgid "Tuner name not found\n"
 msgstr "Jméno tuneru nenalezeno\n"
 
-#: src/input/input_v4l.c:1876
+#: src/input/input_v4l.c:1874
 msgid "v4l tv input plugin"
 msgstr "vstupní modul v4l tv"
 
-#: src/input/input_v4l.c:1880
+#: src/input/input_v4l.c:1878
 msgid "v4l radio input plugin"
 msgstr "vstupní modul v4l rádio"
 
-#: src/input/input_v4l.c:1912
+#: src/input/input_v4l.c:1910
 msgid "v4l video device"
 msgstr "zařízení videa v4l"
 
-#: src/input/input_v4l.c:1913
+#: src/input/input_v4l.c:1911
 msgid "The path to your Video4Linux video device."
 msgstr "Cesta k vašemu zařízení videa Video4Linux."
 
-#: src/input/input_v4l.c:1938
+#: src/input/input_v4l.c:1936
 msgid "v4l radio device"
 msgstr "zařízení rádia v4l"
 
-#: src/input/input_v4l.c:1939
+#: src/input/input_v4l.c:1937
 msgid "The path to your Video4Linux radio device."
 msgstr "Cesta k vašemu zařízení rádia Video4Linux."
 
@@ -2439,52 +2447,52 @@ msgstr "Chyba při získávání �ísla aktuálního segmentu"
 msgid "Should have converted this above"
 msgstr "Výše uvedené by mělo být převedeno"
 
-#: src/input/vcd/xineplug_inp_vcd.c:191
+#: src/input/vcd/xineplug_inp_vcd.c:192
 msgid "failed to find a device with a VCD"
 msgstr "selhalo hledání zařízení s VCD"
 
-#: src/input/vcd/xineplug_inp_vcd.c:328
+#: src/input/vcd/xineplug_inp_vcd.c:329
 msgid "was passed a null class parameter"
 msgstr "byl předán parametr třídy null"
 
-#: src/input/vcd/xineplug_inp_vcd.c:972
+#: src/input/vcd/xineplug_inp_vcd.c:982
 msgid "Invalid current entry type"
 msgstr "Neplatný typ aktuální položky"
 
-#: src/input/vcd/xineplug_inp_vcd.c:996
+#: src/input/vcd/xineplug_inp_vcd.c:1006
 msgid ""
 "Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
 msgstr "modul video CD s PBC a podporou: (X)VCD, (X)SVCD, HQVCD, CVD ... "
 
-#: src/input/vcd/xineplug_inp_vcd.c:1097
+#: src/input/vcd/xineplug_inp_vcd.c:1107
 msgid "selection has no RETURN entry"
 msgstr "výběr nemá položku N�VRAT"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1126
+#: src/input/vcd/xineplug_inp_vcd.c:1136
 msgid "DEFAULT selected, but PBC is not on."
 msgstr "V�CHOZ� vybráno, ale PBC není zapnuto."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1131
+#: src/input/vcd/xineplug_inp_vcd.c:1141
 msgid "selection has no NEXT entry"
 msgstr "výběr nemá položku DALŠ�"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1139
+#: src/input/vcd/xineplug_inp_vcd.c:1149
 msgid "selection has no PREVIOUS entry"
 msgstr "výběr nemá položku PŘEDCHOZ�"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1146
+#: src/input/vcd/xineplug_inp_vcd.c:1156
 msgid "Unknown event type: "
 msgstr "Neznámý typ události: "
 
-#: src/input/vcd/xineplug_inp_vcd.c:1446 src/input/vcd/xineplug_inp_vcd.c:1493
+#: src/input/vcd/xineplug_inp_vcd.c:1452 src/input/vcd/xineplug_inp_vcd.c:1499
 msgid "The above message had unknown vcdimager log level"
 msgstr "Výše uvedená zpráva má neznámou logovací úroveň vcdimageru"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1824
+#: src/input/vcd/xineplug_inp_vcd.c:1830
 msgid "VCD default type to use on autoplay"
 msgstr "výchozí typ VCD, který se použije na automatické přehrání"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1825
+#: src/input/vcd/xineplug_inp_vcd.c:1831
 msgid ""
 "The VCD play unit to use when none is specified in an MRL, e.g. vcd:// or "
 "vcd:///dev/dvd:"
@@ -2492,11 +2500,11 @@ msgstr ""
 "Jednotka přehrávání VCD, kterou použít, jestliže není žádná uvedena v MRL. "
 "NapÅ™. vcd:// nebo vcd:///dev/dvd:"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1835
+#: src/input/vcd/xineplug_inp_vcd.c:1841
 msgid "CD-ROM drive used for VCD when none given"
 msgstr "výchozí zařízení CD-ROM použité pro VCD, jestliže není žádné zadáno"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1836
+#: src/input/vcd/xineplug_inp_vcd.c:1842
 msgid ""
 "What to use if no drive specified. If the setting is empty, xine will scan "
 "for CD drives."
@@ -2504,28 +2512,28 @@ msgstr ""
 "Co použít, jestliže není uvedeno zařízení. Jestliže je nastavení prázdné, "
 "xine prozkoumá jednotky CD."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1846
+#: src/input/vcd/xineplug_inp_vcd.c:1852
 msgid "VCD position slider range"
 msgstr "rozsah ukazatele pozice VCD"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1847
+#: src/input/vcd/xineplug_inp_vcd.c:1853
 msgid ""
 "range that the stream playback position slider represents playing a VCD."
 msgstr "Rozsah ukazatele pozice přehrávání přítomného při přehrávání."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1855
+#: src/input/vcd/xineplug_inp_vcd.c:1861
 msgid "VCD read-ahead caching?"
 msgstr "read-ahead cachování VCD?"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1856
+#: src/input/vcd/xineplug_inp_vcd.c:1862
 msgid "Class may lead to jerky playback on low-end machines."
 msgstr "Na slabších strojích může toto vést k trhanému přehrávání"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1866
+#: src/input/vcd/xineplug_inp_vcd.c:1872
 msgid "automatically advance VCD track/entry"
 msgstr "automaticky postupovat po stopách nebo položkách VCD"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1867
+#: src/input/vcd/xineplug_inp_vcd.c:1873
 msgid ""
 "If enabled, we should automatically advance to the next entry or track. Used "
 "only when playback control (PBC) is disabled."
@@ -2533,11 +2541,11 @@ msgstr ""
 "Jestliže je povoleno, měli bychom automaticky postoupit na další položku "
 "nebo stopu. Použito pouze, když není zapnuta kontrola přehrávání (PBC)."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1876
+#: src/input/vcd/xineplug_inp_vcd.c:1882
 msgid "show 'rejected' VCD LIDs"
 msgstr "zobrazit 'odmítané' VCD LID?"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1877
+#: src/input/vcd/xineplug_inp_vcd.c:1883
 msgid ""
 "Some playback list IDs (LIDs) are marked not showable, but you can see them "
 "in the MRL list if this is set. Rejected entries are marked with an asterisk "
@@ -2547,11 +2555,11 @@ msgstr ""
 "nezobrazovaly. Ale pokud je nastavena tato volba, můžete je vidět v seznamu "
 "MRL. Odmítané položky jsou ozna�eny hvězdi�kou (*) přidanou na konec MRL."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1888
+#: src/input/vcd/xineplug_inp_vcd.c:1894
 msgid "VCD format string for display banner"
 msgstr "VCD formát řetězce pro nápis na obrazovce"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1889
+#: src/input/vcd/xineplug_inp_vcd.c:1895
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are:\n"
@@ -2589,11 +2597,11 @@ msgstr ""
 "      �íslo 1 až po�et svazků\n"
 " %% : %\n"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1914
+#: src/input/vcd/xineplug_inp_vcd.c:1920
 msgid "VCD format string for stream comment field"
 msgstr "formátovací řetězec VCD pro pole komentáře proudu dat"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1915
+#: src/input/vcd/xineplug_inp_vcd.c:1921
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
@@ -2605,11 +2613,11 @@ msgstr ""
 "c, %F, %I, %L, %N, %P, %p, %S, %T, %V, %v a %%.\n"
 "Jejich význam viz. help k title_format."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1927
+#: src/input/vcd/xineplug_inp_vcd.c:1933
 msgid "VCD debug flag mask"
 msgstr "debugovací maska příznaků VCD"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1928
+#: src/input/vcd/xineplug_inp_vcd.c:1934
 msgid ""
 "For tracking down bugs in the VCD plugin. Mask values are:\n"
 "   1: Meta information\n"
@@ -2639,67 +2647,6 @@ msgstr ""
 "1024: nehybný snímek\n"
 "2048: debugování z VCDINFO\n"
 
-#: src/liba52/xine_a52_decoder.c:742 src/libxineadec/xine_dts_decoder.c:524
-msgid "HELP! a mono-only audio driver?!\n"
-msgstr "POMÓC! Zvukový ovlada� pouze mono?!\n"
-
-#: src/liba52/xine_a52_decoder.c:805
-msgid "A/52 volume"
-msgstr "hlasitost A/52"
-
-#: src/liba52/xine_a52_decoder.c:806
-msgid ""
-"With A/52 audio, you can modify the volume at the decoder level. This has "
-"the advantage of the audio being already decoded for the specified volume, "
-"so later operations like channel downmixing will work on an audio stream of "
-"the given volume."
-msgstr ""
-"U zvuku A/52 můžete změnit hlasitost na úrovni dekódování. To má výhodu, že "
-"zvuk je již dekódován na specifikovanou hlasitost, takže pozdější operace "
-"jako smixovávání kanálů budou pracovat na zvukových datech dané hlasitosti."
-
-#: src/liba52/xine_a52_decoder.c:814
-msgid "use A/52 dynamic range compression"
-msgstr "povolit zhuštění dynamického rozsahu A/52"
-
-#: src/liba52/xine_a52_decoder.c:815
-msgid ""
-"Dynamic range compression limits the dynamic range of the audio. This means "
-"making the loud sounds softer, and the soft sounds louder, so you can more "
-"easily listen to the audio in a noisy environment without disturbing anyone."
-msgstr ""
-"Zhuštění dynamického rozsahu omezí dynamický rozsah zvuku. To znamená, že "
-"hlasité zvuky se stanou tiššími a tiché zvuky hlasitějšími, a tak můžete "
-"lépe slyšet zvuk v hlasitém prostředí bez toho, abyste kohokoliv rušili."
-
-#: src/liba52/xine_a52_decoder.c:822
-msgid "downmix audio to 2 channel surround stereo"
-msgstr "redukce zvuku do 2.0 surround stereo"
-
-#: src/liba52/xine_a52_decoder.c:823
-msgid ""
-"When you want to listen to multichannel surround sound, but you have only "
-"two speakers or a surround decoder or amplifier which does some sort of "
-"matrix surround decoding like prologic, you should enable this option so "
-"that the additional channels are mixed into the stereo signal."
-msgstr ""
-"Jestli chcete poslouchat vícekanálový surround zvuk, ale máte pouze dva "
-"reproduktory, surround dekodér nebo zesilova�, který provádí nějaké maticové "
-"surround dekódování jako např. prologic, měli byste tuto volbu povolit. Pak "
-"budou dodate�né kanály přimixovávány do stereo signálu."
-
-#: src/libfaad/xine_faad_decoder.c:131
-msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
-msgstr "libfaad: selhala funkce NeAACDecOpen().\n"
-
-#: src/libfaad/xine_faad_decoder.c:140
-msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
-msgstr "libfaad: selhala funkce NeAACDecInit2.\n"
-
-#: src/libfaad/xine_faad_decoder.c:151
-msgid "libfaad: libfaad NeAACDecInit failed.\n"
-msgstr "libfaad: selhala funkce NeAACDecInit.\n"
-
 #: src/libffmpeg/ff_audio_decoder.c:122
 #, c-format
 msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
@@ -2724,51 +2671,6 @@ msgstr "ffmpeg_audio_dec: nelze otevřít dekodér\n"
 msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
 msgstr "dvaudio: zvětšení bufferu na %d, aby se předešlo přete�ení.\n"
 
-#: src/libffmpeg/ff_video_decoder.c:155
-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
-msgstr "ffmpeg_video_dec: nepodporovaný formát, DR1 zakázáno.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:173
-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
-msgstr "ffmpeg_video_dec: nepodporované rozměry snímku, DR1 zakázáno.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:333
-#, c-format
-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
-msgstr "ffmpeg_video_dec: nelze nalézt dekodér ffmpeg pro buffer typu 0x%X\n"
-
-#: src/libffmpeg/ff_video_decoder.c:362
-msgid "ffmpeg_video_dec: couldn't open decoder\n"
-msgstr "ffmpeg_video_dec: nelze otevřít dekodér\n"
-
-#: src/libffmpeg/ff_video_decoder.c:397
-msgid "ffmpeg_video_dec: direct rendering enabled\n"
-msgstr "ffmpeg_video_dec: přímé renderování povoleno\n"
-
-#: src/libffmpeg/ff_video_decoder.c:816
-#, c-format
-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
-msgstr "ffmpeg_video_dec: zvětšení bufferu na %d, aby se předešlo přete�ení.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:1514
-msgid "MPEG-4 postprocessing quality"
-msgstr "kvalita dodate�ného zpracování MPEG-4"
-
-#: src/libffmpeg/ff_video_decoder.c:1515
-msgid ""
-"You can adjust the amount of post processing applied to MPEG-4 video.\n"
-"Higher values result in better quality, but need more CPU. Lower values may "
-"result in image defects like block artifacts. For high quality content, too "
-"heavy post processing can actually make the image worse by blurring it too "
-"much."
-msgstr ""
-"Můžete přizpůsobit množství dodate�ného zpracování použitého na video MPEG-"
-"4.\n"
-"Vyšší hodnoty mají za následek lepší kvalitu, ale více zatíží CPU. Menší "
-"hodnoty mohou mít za následek defekty v obrázku, např. blokové artefakty. "
-"Pro vysokou kvalitu videa může příliš silné dodate�né zpracování způsobit "
-"horší obraz tím, že ho více rozmaže."
-
 #: src/libffmpeg/ffmpeg_encoder.c:163
 msgid "libavcodec mpeg output bitrate (kbit/s)"
 msgstr "výstupní rychlost libavcodec mpeg (kbit/s)"
@@ -2815,24 +2717,50 @@ msgid "The maximum compression to apply to an image in constant quality mode."
 msgstr ""
 "Maximální komprese, která se použije na obraz v režimu konstantní kvality."
 
-#: src/libxineadec/xine_musepack_decoder.c:249
+#: src/libffmpeg/ff_video_decoder.c:155
+msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
+msgstr "ffmpeg_video_dec: nepodporovaný formát, DR1 zakázáno.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:173
+msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+msgstr "ffmpeg_video_dec: nepodporované rozměry snímku, DR1 zakázáno.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:333
 #, c-format
-msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
-msgstr "libmusepack: mpc_streaminfo_read selhalo: %d\n"
+msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+msgstr "ffmpeg_video_dec: nelze nalézt dekodér ffmpeg pro buffer typu 0x%X\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:323
-msgid "libmusepack: data after last frame ignored\n"
-msgstr "libmusepack: data po posledním snímku ignorována\n"
+#: src/libffmpeg/ff_video_decoder.c:362
+msgid "ffmpeg_video_dec: couldn't open decoder\n"
+msgstr "ffmpeg_video_dec: nelze otevřít dekodér\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:334
-msgid "libmusepack: mpc_decoder_initialise failed\n"
-msgstr "libmusepack: selhalo mpc_decoder_initialise\n"
+#: src/libffmpeg/ff_video_decoder.c:397
+msgid "ffmpeg_video_dec: direct rendering enabled\n"
+msgstr "ffmpeg_video_dec: přímé renderování povoleno\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:354
-#: src/libxineadec/xine_musepack_decoder.c:369
+#: src/libffmpeg/ff_video_decoder.c:816
 #, c-format
-msgid "libmusepack: mpc_decoder_decode failed: %d\n"
-msgstr "libmusepack: selhalo mpc_decoder_decode: %d\n"
+msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+msgstr "ffmpeg_video_dec: zvětšení bufferu na %d, aby se předešlo přete�ení.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:1519
+msgid "MPEG-4 postprocessing quality"
+msgstr "kvalita dodate�ného zpracování MPEG-4"
+
+#: src/libffmpeg/ff_video_decoder.c:1520
+msgid ""
+"You can adjust the amount of post processing applied to MPEG-4 video.\n"
+"Higher values result in better quality, but need more CPU. Lower values may "
+"result in image defects like block artifacts. For high quality content, too "
+"heavy post processing can actually make the image worse by blurring it too "
+"much."
+msgstr ""
+"Můžete přizpůsobit množství dodate�ného zpracování použitého na video MPEG-"
+"4.\n"
+"Vyšší hodnoty mají za následek lepší kvalitu, ale více zatíží CPU. Menší "
+"hodnoty mohou mít za následek defekty v obrázku, např. blokové artefakty. "
+"Pro vysokou kvalitu videa může příliš silné dodate�né zpracování způsobit "
+"horší obraz tím, že ho více rozmaže."
 
 #: src/libreal/real_common.c:107
 msgid "path to RealPlayer codecs"
@@ -2853,10 +2781,6 @@ msgstr ""
 "použije je pro vás k dekódování RealPlayer obsahu. Více informací, jak "
 "nainstalovat kodeky, získáte ve xine FAQ."
 
-#: src/libreal/xine_real_video_decoder.c:164
-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
-msgstr "libreal: Chyba hledání symbolů! (nekompatibilita verzí?)\n"
-
 #: src/libreal/xine_real_audio_decoder.c:130
 #, c-format
 msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
@@ -2876,6 +2800,10 @@ msgstr "libareal: nastavení esence dekodéru selhalo, chybový kód: 0x%x\n"
 msgid "libareal: oups, real can do more than 2 channels ?\n"
 msgstr "libareal: jejda, real může mít více než 2 kanály?\n"
 
+#: src/libreal/xine_real_video_decoder.c:164
+msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+msgstr "libreal: Chyba hledání symbolů! (nekompatibilita verzí?)\n"
+
 #: src/libspucc/xine_cc_decoder.c:192
 msgid "display closed captions in MPEG-2 streams"
 msgstr "zobrazovat skryté titulky v sekvencích MPEG-2"
@@ -3118,6 +3046,87 @@ msgstr "w32codec: Chyba inicializace DirectShow zvuku\n"
 msgid "w32codec: Error initializing DMO Audio\n"
 msgstr "w32codec: Chyba inicializace DMO zvuku\n"
 
+#: src/libxineadec/xine_a52_decoder.c:742
+#: src/libxineadec/xine_dts_decoder.c:524
+msgid "HELP! a mono-only audio driver?!\n"
+msgstr "POMÓC! Zvukový ovlada� pouze mono?!\n"
+
+#: src/libxineadec/xine_a52_decoder.c:805
+msgid "A/52 volume"
+msgstr "hlasitost A/52"
+
+#: src/libxineadec/xine_a52_decoder.c:806
+msgid ""
+"With A/52 audio, you can modify the volume at the decoder level. This has "
+"the advantage of the audio being already decoded for the specified volume, "
+"so later operations like channel downmixing will work on an audio stream of "
+"the given volume."
+msgstr ""
+"U zvuku A/52 můžete změnit hlasitost na úrovni dekódování. To má výhodu, že "
+"zvuk je již dekódován na specifikovanou hlasitost, takže pozdější operace "
+"jako smixovávání kanálů budou pracovat na zvukových datech dané hlasitosti."
+
+#: src/libxineadec/xine_a52_decoder.c:814
+msgid "use A/52 dynamic range compression"
+msgstr "povolit zhuštění dynamického rozsahu A/52"
+
+#: src/libxineadec/xine_a52_decoder.c:815
+msgid ""
+"Dynamic range compression limits the dynamic range of the audio. This means "
+"making the loud sounds softer, and the soft sounds louder, so you can more "
+"easily listen to the audio in a noisy environment without disturbing anyone."
+msgstr ""
+"Zhuštění dynamického rozsahu omezí dynamický rozsah zvuku. To znamená, že "
+"hlasité zvuky se stanou tiššími a tiché zvuky hlasitějšími, a tak můžete "
+"lépe slyšet zvuk v hlasitém prostředí bez toho, abyste kohokoliv rušili."
+
+#: src/libxineadec/xine_a52_decoder.c:822
+msgid "downmix audio to 2 channel surround stereo"
+msgstr "redukce zvuku do 2.0 surround stereo"
+
+#: src/libxineadec/xine_a52_decoder.c:823
+msgid ""
+"When you want to listen to multichannel surround sound, but you have only "
+"two speakers or a surround decoder or amplifier which does some sort of "
+"matrix surround decoding like prologic, you should enable this option so "
+"that the additional channels are mixed into the stereo signal."
+msgstr ""
+"Jestli chcete poslouchat vícekanálový surround zvuk, ale máte pouze dva "
+"reproduktory, surround dekodér nebo zesilova�, který provádí nějaké maticové "
+"surround dekódování jako např. prologic, měli byste tuto volbu povolit. Pak "
+"budou dodate�né kanály přimixovávány do stereo signálu."
+
+#: src/libxineadec/xine_faad_decoder.c:130
+msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
+msgstr "libfaad: selhala funkce NeAACDecOpen().\n"
+
+#: src/libxineadec/xine_faad_decoder.c:139
+msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
+msgstr "libfaad: selhala funkce NeAACDecInit2.\n"
+
+#: src/libxineadec/xine_faad_decoder.c:150
+msgid "libfaad: libfaad NeAACDecInit failed.\n"
+msgstr "libfaad: selhala funkce NeAACDecInit.\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:249
+#, c-format
+msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+msgstr "libmusepack: mpc_streaminfo_read selhalo: %d\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:323
+msgid "libmusepack: data after last frame ignored\n"
+msgstr "libmusepack: data po posledním snímku ignorována\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:334
+msgid "libmusepack: mpc_decoder_initialise failed\n"
+msgstr "libmusepack: selhalo mpc_decoder_initialise\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:354
+#: src/libxineadec/xine_musepack_decoder.c:369
+#, c-format
+msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgstr "libmusepack: selhalo mpc_decoder_decode: %d\n"
+
 #: src/libxinevdec/bitplane.c:1272
 #, c-format
 msgid "bitplane: error doing ByteRun1 decompression\n"
@@ -3432,32 +3441,6 @@ msgstr ""
 "\n"
 "* denoise3d mplayeru (C) 2003 Daniel Moreno\n"
 
-#: src/post/planar/eq.c:186
-msgid ""
-"Software equalizer with interactive controls just like the hardware "
-"equalizer, for cards/drivers that do not support brightness and contrast "
-"controls in hardware.\n"
-"\n"
-"Parameters\n"
-"  brightness\n"
-"  contrast\n"
-"\n"
-"Note: It is possible to use frontend's control window to set these "
-"parameters.\n"
-"\n"
-"* mplayer's eq (C) Richard Felker\n"
-msgstr ""
-"Softwarový ekvalizér s interaktivním ovládáním tak jako u hardwarového "
-"ekvalizéru pro karty, které nepodporují řízení jasu a kontrastu hardwarově.\n"
-"Parametry\n"
-"  světlost\n"
-"  kontrast\n"
-"\n"
-"Poznámka: K nastavení těchto parametrů je možné použít okno ovládání "
-"frontendů.\n"
-"\n"
-"* eq mplayeru (C) Richard Felker\n"
-
 #: src/post/planar/eq2.c:359
 msgid ""
 "Alternative software equalizer that uses lookup tables (very slow), allowing "
@@ -3502,6 +3485,32 @@ msgstr ""
 "\n"
 "* eq2 mplayeru (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
 
+#: src/post/planar/eq.c:186
+msgid ""
+"Software equalizer with interactive controls just like the hardware "
+"equalizer, for cards/drivers that do not support brightness and contrast "
+"controls in hardware.\n"
+"\n"
+"Parameters\n"
+"  brightness\n"
+"  contrast\n"
+"\n"
+"Note: It is possible to use frontend's control window to set these "
+"parameters.\n"
+"\n"
+"* mplayer's eq (C) Richard Felker\n"
+msgstr ""
+"Softwarový ekvalizér s interaktivním ovládáním tak jako u hardwarového "
+"ekvalizéru pro karty, které nepodporují řízení jasu a kontrastu hardwarově.\n"
+"Parametry\n"
+"  světlost\n"
+"  kontrast\n"
+"\n"
+"Poznámka: K nastavení těchto parametrů je možné použít okno ovládání "
+"frontendů.\n"
+"\n"
+"* eq mplayeru (C) Richard Felker\n"
+
 #: src/post/planar/expand.c:251
 #, fuzzy
 msgid ""
@@ -3617,6 +3626,65 @@ msgstr ""
 "\n"
 "* unsharp mplayeru (C) 2002 Rémi Guyomarch\n"
 
+#: src/vdr/input_vdr.c:183 src/vdr/input_vdr.c:223 src/vdr/input_vdr.c:2297
+#: src/vdr/input_vdr.c:2394
+#, fuzzy, c-format
+msgid ": input event write: %s.\n"
+msgstr "input_rip: selhalo nastavení pozice: %s\n"
+
+#: src/vdr/input_vdr.c:713 src/vdr/input_vdr.c:1137
+msgid ": buffer_pool_alloc() failed!\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:782
+#, c-format
+msgid ": flush buffers (vb: %d, ab: %d, vf: %d, af: %d) %s.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1475
+#, c-format
+msgid ": shutting down rpc thread (timeout: %d ms) ...\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1499
+#, fuzzy, c-format
+msgid ": cancelling rpc thread in function %d...\n"
+msgstr ": nelze vytvořit pthread condition: %s\n"
+
+#: src/vdr/input_vdr.c:1506
+#, fuzzy
+msgid ": joining rpc thread ...\n"
+msgstr "RTP: ukon�uje se �tecí vlákno...\n"
+
+#: src/vdr/input_vdr.c:1508
+#, fuzzy
+msgid ": rpc thread joined.\n"
+msgstr "RTP: �tecí vlákno ukon�eno\n"
+
+#: src/vdr/input_vdr.c:2137 src/vdr/input_vdr.c:2151 src/vdr/input_vdr.c:2169
+#: src/vdr/input_vdr.c:2190 src/vdr/input_vdr.c:2211
+#, fuzzy, c-format
+msgid ": failed to open '%s' (%s)\n"
+msgstr "stdin: selhalo otevření '%s'\n"
+
+#: src/vdr/input_vdr.c:2153
+msgid "timeout expired during setup phase"
+msgstr ""
+
+#: src/vdr/input_vdr.c:2227
+#, fuzzy, c-format
+msgid ": can't create new thread (%s)\n"
+msgstr "input_rtp: nelze vytvořit nové vlákno (%s)\n"
+
+#: src/vdr/input_vdr.c:2487
+msgid "VDR display device plugin"
+msgstr ""
+
+#: src/vdr/post_vdr_video.c:435
+#, c-format
+msgid ": osd: (%d, %d)-(%d, %d)@%lg\n"
+msgstr ""
+
 #: src/video_out/video_out_aa.c:311
 msgid "xine video output plugin using the ascii-art library"
 msgstr "výstupní modul videa xine použije knihovnu ascii-art"
@@ -3925,8 +3993,8 @@ msgstr ""
 "Ignorováno u statických renderovacích podprogramů.\n"
 
 #: src/video_out/video_out_opengl.c:1918 src/video_out/video_out_vidix.c:1015
-#: src/video_out/video_out_xcbxv.c:1476 src/video_out/video_out_xv.c:1489
-#: src/video_out/video_out_xvmc.c:1461 src/video_out/video_out_xxmc.c:2465
+#: src/video_out/video_out_xcbxv.c:1304 src/video_out/video_out_xv.c:1359
+#: src/video_out/video_out_xvmc.c:1423 src/video_out/video_out_xxmc.c:2531
 msgid "enable double buffering"
 msgstr "povolit dvojité bufferování"
 
@@ -4012,9 +4080,9 @@ msgstr ""
 msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
 msgstr "video_out_pgx64: Chyba: selhalo ioctl (FBIOGATTR)\n"
 
-#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1443
-#: src/video_out/video_out_xv.c:1456 src/video_out/video_out_xvmc.c:1446
-#: src/video_out/video_out_xxmc.c:2432
+#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1271
+#: src/video_out/video_out_xv.c:1326 src/video_out/video_out_xvmc.c:1408
+#: src/video_out/video_out_xxmc.c:2498
 msgid "video overlay colour key"
 msgstr "hodnota klí�ové barvy překrývání"
 
@@ -4189,9 +4257,9 @@ msgstr "intenzita modré"
 msgid "The intensity of the blue colour components."
 msgstr "Intenzita modré barevné složky."
 
-#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1477
-#: src/video_out/video_out_xv.c:1490 src/video_out/video_out_xvmc.c:1462
-#: src/video_out/video_out_xxmc.c:2466
+#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1305
+#: src/video_out/video_out_xv.c:1360 src/video_out/video_out_xvmc.c:1424
+#: src/video_out/video_out_xxmc.c:2532
 msgid ""
 "Double buffering will synchronize the update of the video image to the "
 "repainting of the entire screen (\"vertical retrace\"). This eliminates "
@@ -4227,9 +4295,9 @@ msgid "video overlay colour key red component"
 msgstr "klí�ová barva překrývání videa �ervené složky"
 
 #: src/video_out/video_out_vidix.c:1159 src/video_out/video_out_vidix.c:1166
-#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1444
-#: src/video_out/video_out_xv.c:1457 src/video_out/video_out_xvmc.c:1447
-#: src/video_out/video_out_xxmc.c:2433
+#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1272
+#: src/video_out/video_out_xv.c:1327 src/video_out/video_out_xvmc.c:1409
+#: src/video_out/video_out_xxmc.c:2499
 msgid ""
 "The colour key is used to tell the graphics card where to overlay the video "
 "image. Try different values, if you experience windows becoming transparent."
@@ -4260,13 +4328,13 @@ msgid "%s: %s: allocating image\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbshm.c:159 src/video_out/video_out_xcbshm.c:169
-#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:272
-#: src/video_out/video_out_xcbxv.c:282 src/video_out/video_out_xcbxv.c:292
-#: src/video_out/video_out_xcbxv.c:304 src/video_out/video_out_xshm.c:204
+#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:267
+#: src/video_out/video_out_xcbxv.c:277 src/video_out/video_out_xcbxv.c:287
+#: src/video_out/video_out_xcbxv.c:299 src/video_out/video_out_xshm.c:204
 #: src/video_out/video_out_xshm.c:221 src/video_out/video_out_xshm.c:232
-#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:296
-#: src/video_out/video_out_xv.c:307 src/video_out/video_out_xv.c:316
-#: src/video_out/video_out_xv.c:352 src/video_out/video_out_xxmc.c:648
+#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:295
+#: src/video_out/video_out_xv.c:322 src/video_out/video_out_xv.c:331
+#: src/video_out/video_out_xv.c:367 src/video_out/video_out_xxmc.c:648
 #: src/video_out/video_out_xxmc.c:659 src/video_out/video_out_xxmc.c:668
 #: src/video_out/video_out_xxmc.c:704
 #, fuzzy, c-format
@@ -4280,8 +4348,8 @@ msgstr ""
 "video_out_xshm: chyba sdílené paměti (chyba adresy) během alokování obrázku\n"
 "video_out_xshm: => rozšíření MIT Shared Memory se nepoužije.\n"
 
-#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:302
-#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:350
+#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:297
+#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:365
 #: src/video_out/video_out_xxmc.c:702
 #, c-format
 msgid "%s: x11 error during shared memory XImage creation\n"
@@ -4317,31 +4385,31 @@ msgstr "video_out_fb: Váš videorežim nebyl rozpoznán, bohužel.\n"
 msgid "xine video output plugin using the MIT X shared memory extension"
 msgstr "výstupní modul videa xine použije rozšíření MIT X shared memory"
 
-#: src/video_out/video_out_xcbxv.c:270 src/video_out/video_out_xv.c:305
+#: src/video_out/video_out_xcbxv.c:265 src/video_out/video_out_xv.c:320
 #: src/video_out/video_out_xxmc.c:657
 #, c-format
 msgid "%s: XvShmCreateImage returned a zero size\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:280 src/video_out/video_out_xv.c:314
+#: src/video_out/video_out_xcbxv.c:275 src/video_out/video_out_xv.c:329
 #: src/video_out/video_out_xxmc.c:666
 #, c-format
 msgid "%s: shared memory error in shmget: %s\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:290
+#: src/video_out/video_out_xcbxv.c:285
 #, c-format
 msgid "%s: shared memory error (address error)\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1294 src/video_out/video_out_xv.c:1301
-#: src/video_out/video_out_xxmc.c:2283
+#: src/video_out/video_out_xcbxv.c:1125 src/video_out/video_out_xv.c:1174
+#: src/video_out/video_out_xxmc.c:2349
 #, fuzzy, c-format
 msgid "%s: Xv extension not present.\n"
 msgstr "video_out_xv: Rozšíření Xv není přítomno.\n"
 
-#: src/video_out/video_out_xcbxv.c:1336 src/video_out/video_out_xv.c:1338
-#: src/video_out/video_out_xxmc.c:2320
+#: src/video_out/video_out_xcbxv.c:1167 src/video_out/video_out_xv.c:1211
+#: src/video_out/video_out_xxmc.c:2386
 #, fuzzy, c-format
 msgid ""
 "%s: Xv extension is present but I couldn't find a usable yuv12 port.\n"
@@ -4352,7 +4420,7 @@ msgstr ""
 "              Vypadá to, jako by váš grafický hardwarový ovlada� "
 "nepodporoval Xv?!\n"
 
-#: src/video_out/video_out_xcbxv.c:1345
+#: src/video_out/video_out_xcbxv.c:1176
 #, fuzzy, c-format
 msgid ""
 "%s: using Xv port %d from adaptor %s for hardware colorspace conversion and "
@@ -4361,23 +4429,23 @@ msgstr ""
 "video_out_xv: pro hardwarovou konverzi barevného prostoru a škálování se "
 "použije Xv port %ld z adaptéru %s.\n"
 
-#: src/video_out/video_out_xcbxv.c:1452 src/video_out/video_out_xv.c:1465
-#: src/video_out/video_out_xvmc.c:1455 src/video_out/video_out_xxmc.c:2441
+#: src/video_out/video_out_xcbxv.c:1280 src/video_out/video_out_xv.c:1335
+#: src/video_out/video_out_xvmc.c:1417 src/video_out/video_out_xxmc.c:2507
 msgid "autopaint colour key"
 msgstr "klí�ová barva pro automatické vykreslování"
 
-#: src/video_out/video_out_xcbxv.c:1453 src/video_out/video_out_xv.c:1466
-#: src/video_out/video_out_xvmc.c:1456 src/video_out/video_out_xxmc.c:2442
+#: src/video_out/video_out_xcbxv.c:1281 src/video_out/video_out_xv.c:1336
+#: src/video_out/video_out_xvmc.c:1418 src/video_out/video_out_xxmc.c:2508
 msgid "Make Xv autopaint its colorkey."
 msgstr "Přimět Xv automaticky kreslit svou klí�ovou barvu."
 
-#: src/video_out/video_out_xcbxv.c:1460 src/video_out/video_out_xv.c:1473
-#: src/video_out/video_out_xxmc.c:2449
+#: src/video_out/video_out_xcbxv.c:1288 src/video_out/video_out_xv.c:1343
+#: src/video_out/video_out_xxmc.c:2515
 msgid "bilinear scaling mode"
 msgstr "bilineární režim škálování"
 
-#: src/video_out/video_out_xcbxv.c:1461 src/video_out/video_out_xv.c:1474
-#: src/video_out/video_out_xxmc.c:2450
+#: src/video_out/video_out_xcbxv.c:1289 src/video_out/video_out_xv.c:1344
+#: src/video_out/video_out_xxmc.c:2516
 msgid ""
 "Selects the bilinear scaling mode for Permedia cards. The individual values "
 "are:\n"
@@ -4403,110 +4471,31 @@ msgstr ""
 "1 - horizontální lineární filtrování\n"
 "2 - povolit plné bilineární filtrování"
 
-#: src/video_out/video_out_xcbxv.c:1513 src/video_out/video_out_xv.c:1523
-#: src/video_out/video_out_xxmc.c:2506
+#: src/video_out/video_out_xcbxv.c:1341 src/video_out/video_out_xv.c:1393
+#: src/video_out/video_out_xxmc.c:2572
 #, fuzzy, c-format
 msgid "%s: this adaptor supports the yv12 format.\n"
 msgstr "video_out_xv: tento adaptér podporuje formát yv12.\n"
 
-#: src/video_out/video_out_xcbxv.c:1518 src/video_out/video_out_xv.c:1528
-#: src/video_out/video_out_xxmc.c:2511
+#: src/video_out/video_out_xcbxv.c:1346 src/video_out/video_out_xv.c:1398
+#: src/video_out/video_out_xxmc.c:2577
 #, fuzzy, c-format
 msgid "%s: this adaptor supports the yuy2 format.\n"
 msgstr "video_out_xv: tento adaptér podporuje formát yuy2.\n"
 
-#: src/video_out/video_out_xcbxv.c:1526 src/video_out/video_out_xv.c:1550
-#: src/video_out/video_out_xxmc.c:2534
+#: src/video_out/video_out_xcbxv.c:1354 src/video_out/video_out_xv.c:1420
+#: src/video_out/video_out_xxmc.c:2600
 msgid "pitch alignment workaround"
 msgstr "obcházet chybu zarovnávání rozte�e"
 
-#: src/video_out/video_out_xcbxv.c:1527 src/video_out/video_out_xv.c:1551
-#: src/video_out/video_out_xxmc.c:2535
+#: src/video_out/video_out_xcbxv.c:1355 src/video_out/video_out_xv.c:1421
+#: src/video_out/video_out_xxmc.c:2601
 msgid "Some buggy video drivers need a workaround to function properly."
 msgstr ""
 "Některé chybové ovlada�e videa potřebují ke správně funkci tento workaround."
 
-#: src/video_out/video_out_xcbxv.c:1533 src/video_out/video_out_xv.c:1557
-#: src/video_out/video_out_xvmc.c:1524
-msgid "deinterlace method (deprecated)"
-msgstr "metoda korekce prokládání (zavrženo)"
-
-#: src/video_out/video_out_xcbxv.c:1534 src/video_out/video_out_xv.c:1558
-#: src/video_out/video_out_xvmc.c:1525
-msgid ""
-"This config setting is deprecated. You should use the new deinterlacing post "
-"processing settings instead.\n"
-"\n"
-"From the old days of analog television, where the even and odd numbered "
-"lines of a video frame would be displayed at different times comes the idea "
-"to increase motion smoothness by also recording the lines at different "
-"times. This is called \"interlacing\". But unfortunately, todays displays "
-"show the even and odd numbered lines as one complete frame all at the same "
-"time (called \"progressive display\"), which results in ugly frame errors "
-"known as comb artifacts. Software deinterlacing is an approach to reduce "
-"these artifacts. The individual values are:\n"
-"\n"
-"none\n"
-"Disables software deinterlacing.\n"
-"\n"
-"bob\n"
-"Interpolates between the lines for moving parts of the image.\n"
-"\n"
-"weave\n"
-"Similar to bob, but with a tendency to preserve the full resolution, better "
-"for high detail in low movement scenes.\n"
-"\n"
-"greedy\n"
-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
-"\n"
-"onefield\n"
-"Always interpolates and reduces vertical resolution.\n"
-"\n"
-"onefieldxv\n"
-"Same as onefield, but does the interpolation in hardware.\n"
-"\n"
-"linearblend\n"
-"Applies a slight vertical blur to remove the comb artifacts. Good results "
-"with medium CPU usage."
-msgstr ""
-"Tato položka nastavení konfigurace je zavržena. Měli byste používat nové "
-"nastavení dodate�né korekce prokládání.\n"
-"\n"
-"Ze starých �asů analogové televize, kde by měly být sudé a liché řádky "
-"zobrazovány v různých �asech, pochází myšlenka zvýšit hladkost pohybu "
-"zaznamenáváním řádek v různých �asech. Tomu se říká \"prokládání\". Ale "
-"naneštěstí, dnešní zobrazova�e zobrazují všechny sudé a liché řádky najednou "
-"jako jeden kompletní snímek (tzv. \"postupný zobrazova�\"), což má za "
-"následek ošklivé chyby známé jako hřebenové artefakty. Softwarová korekce "
-"prokládání je způsob, jak redukovat tyto artefakty. Jednotlivé hodnoty "
-"jsou:\n"
-"\n"
-"none\n"
-"Zakáže softwarovou korekci prokládání.\n"
-"\n"
-"bob\n"
-"Interpoluje mezi řádky pohyblivých �ástí obrazu.\n"
-"\n"
-"weave\n"
-"Podobné jako bob, ale se snahou zachovat plné rozlišení, lepší u velkých "
-"detailů v ne moc pohyblivých scénách.\n"
-"\n"
-"greedy\n"
-"Velmi dobrý přizpůsobivý korektor prokládání, ale potřebuje velký výkon "
-"CPU.\n"
-"\n"
-"onefield\n"
-"Interpoluje vždy a redukuje svislé rozlišení.\n"
-"\n"
-"onefieldxv\n"
-"Stejné jako onefield, ale interpoluje hardwarově.\n"
-"\n"
-"linearblend\n"
-"K odstranění hřebenových artefaktů použije lehké rozmazání. Dobré výsledky "
-"se střední zátěží CPU."
-
-#: src/video_out/video_out_xcbxv.c:1588 src/video_out/video_out_xv.c:1631
-#: src/video_out/video_out_xxmc.c:2615
+#: src/video_out/video_out_xcbxv.c:1383 src/video_out/video_out_xv.c:1468
+#: src/video_out/video_out_xxmc.c:2681
 msgid "xine video output plugin using the MIT X video extension"
 msgstr "výstupní modul videa xine použije rozšíření MIT X video"
 
@@ -4515,12 +4504,12 @@ msgstr "výstupní modul videa xine použije rozšíření MIT X video"
 msgid "%s: shared memory error when allocating image\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:294 src/video_out/video_out_xxmc.c:646
+#: src/video_out/video_out_xv.c:293 src/video_out/video_out_xxmc.c:646
 #, c-format
 msgid "%s: XvShmCreateImage failed\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1348 src/video_out/video_out_xxmc.c:2330
+#: src/video_out/video_out_xv.c:1221 src/video_out/video_out_xxmc.c:2396
 #, fuzzy, c-format
 msgid ""
 "%s: using Xv port %ld from adaptor %s for hardware colorspace conversion and "
@@ -4529,15 +4518,15 @@ msgstr ""
 "video_out_xv: pro hardwarovou konverzi barevného prostoru a škálování se "
 "použije Xv port %ld z adaptéru %s.\n"
 
-#: src/video_out/video_out_xvmc.c:1593
+#: src/video_out/video_out_xvmc.c:1496
 msgid "xine video output plugin using the XvMC X video extension"
 msgstr "výstupní modul videa xine použije X video rozšíření XvMC"
 
-#: src/video_out/video_out_xvmc.c:1639
+#: src/video_out/video_out_xvmc.c:1542
 msgid "video_out_xvmc: XvMC extension not present.\n"
 msgstr "video_out_xvmc: rozšíření XvMC není přítomno.\n"
 
-#: src/video_out/video_out_xvmc.c:1737
+#: src/video_out/video_out_xvmc.c:1640
 msgid ""
 "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
 "port.\n"
@@ -4545,7 +4534,7 @@ msgstr ""
 "video_out_xvmc: rozšíření Xv je přítomno, ale nebyl nalezen použitelný port "
 "yuv12\n"
 
-#: src/video_out/video_out_xvmc.c:1746
+#: src/video_out/video_out_xvmc.c:1649
 #, c-format
 msgid ""
 "video_out_xvmc: using Xv port %ld from adaptor %s\n"
@@ -4554,28 +4543,28 @@ msgstr ""
 "video_out_xvmc: pro hardwarovou konverzi barevného prostoru a škálování\n"
 "                se použije Xv port %ld z adaptéru %s\n"
 
-#: src/video_out/video_out_xvmc.c:1751
+#: src/video_out/video_out_xvmc.c:1654
 msgid "                idct and motion compensation acceleration \n"
 msgstr "                idct a akcelerace kompenzace pohybu\n"
 
-#: src/video_out/video_out_xvmc.c:1753
+#: src/video_out/video_out_xvmc.c:1656
 msgid "                motion compensation acceleration only\n"
 msgstr "                pouze akcelerace kompenzace pohybu\n"
 
-#: src/video_out/video_out_xvmc.c:1755
+#: src/video_out/video_out_xvmc.c:1658
 msgid "                no XvMC support \n"
 msgstr "                žádná podpora XvMC\n"
 
-#: src/video_out/video_out_xvmc.c:1756
+#: src/video_out/video_out_xvmc.c:1659
 #, c-format
 msgid "                With Overlay = %d; UnsignedIntra = %d.\n"
 msgstr "                S Overlay = %d; UnsignedIntra = %d.\n"
 
-#: src/video_out/video_out_xxmc.c:2540
+#: src/video_out/video_out_xxmc.c:2606
 msgid "Make XvMC allocate more frames for better buffering."
 msgstr "Přimět XvMC alokovat více snímků za ú�elem lepšího buferrování."
 
-#: src/video_out/video_out_xxmc.c:2541
+#: src/video_out/video_out_xxmc.c:2607
 msgid ""
 "Some XvMC implementations allow more than 8 frames.\n"
 "This option, when turned on, makes the driver try to\n"
@@ -4585,11 +4574,11 @@ msgstr ""
 "Tato volba, pokud je zapnuta, přiměje ovlada� zkusit alokovat 15 snímků. "
 "Nutnost pro unichrome a live VDR.\n"
 
-#: src/video_out/video_out_xxmc.c:2547
+#: src/video_out/video_out_xxmc.c:2613
 msgid "Unichrome cpu save"
 msgstr "Šetření procesoru unichrome"
 
-#: src/video_out/video_out_xxmc.c:2548
+#: src/video_out/video_out_xxmc.c:2614
 msgid ""
 "Saves CPU time by sleeping while decoder works.\n"
 "Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n"
@@ -4599,11 +4588,11 @@ msgstr ""
 "Pouze pro jádra Linuxu řady 2.6 nebo 2.4 s multimediálním patchem.\n"
 "Experimentální.\n"
 
-#: src/video_out/video_out_xxmc.c:2554
+#: src/video_out/video_out_xxmc.c:2620
 msgid "Fix buggy NVIDIA XvMC subpicture colors"
 msgstr "Opravovat chybné barvy elementů XvMC"
 
-#: src/video_out/video_out_xxmc.c:2555
+#: src/video_out/video_out_xxmc.c:2621
 msgid ""
 "There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
 "look blue and vice versa. This option provides a workaround.\n"
@@ -4611,11 +4600,11 @@ msgstr ""
 "V knivovně XvMC od NVidie je chyba, která způsobuje, že �ervené barvy OSD "
 "vypadají modře a naopak. Tato volba umožňuje chybu obejít.\n"
 
-#: src/video_out/video_out_xxmc.c:2560
+#: src/video_out/video_out_xxmc.c:2626
 msgid "Use bob as accelerated deinterlace method."
 msgstr "Použít 'bob' jako akcelerovanou metodu korekce prokládání."
 
-#: src/video_out/video_out_xxmc.c:2561
+#: src/video_out/video_out_xxmc.c:2627
 msgid ""
 "When interlacing is enabled for hardware accelerated frames,\n"
 "Alternate between top and bottom field at double the frame rate.\n"
@@ -4644,11 +4633,11 @@ msgstr "x11osd: chyba vytváření mapy bodů. Overlay bez zmÄ›n měřítka zakÃ
 msgid "x11osd: unscaled overlay created (%s mode).\n"
 msgstr "x11osd: overlay bez změn měřítka vytvořen (režim %s).\n"
 
-#: src/xine-engine/alphablend.c:2123
+#: src/xine-engine/alphablend.c:2146
 msgid "disable exact alpha blending of overlays"
 msgstr "zakázat přesné alfa míchání overlayů"
 
-#: src/xine-engine/alphablend.c:2124
+#: src/xine-engine/alphablend.c:2147
 msgid ""
 "If you experience a performance impact when an On Screen Display or other "
 "overlays like DVD subtitles are active, then you might want to enable this "
@@ -5258,21 +5247,21 @@ msgstr ""
 "Paleta on-screen-display a některých formátů titulků, které samy o sobě "
 "nespecifikují žádnou barvu. Paleta je uvedena ve formě: popředí-okraj-pozadí."
 
-#: src/xine-engine/video_decoder.c:380
+#: src/xine-engine/video_decoder.c:390
 #, c-format
 msgid "video_decoder: no plugin available to handle '%s'\n"
 msgstr "video_decoder: není k dispozici žádný modul ke zpracování '%s'\n"
 
-#: src/xine-engine/video_decoder.c:459
+#: src/xine-engine/video_decoder.c:469
 #, c-format
 msgid "video_decoder: error, unknown buffer type: %08x\n"
 msgstr "video_decoder: chyba, neznámý typ bufferu: %08x\n"
 
-#: src/xine-engine/video_decoder.c:495
+#: src/xine-engine/video_decoder.c:505
 msgid "number of video buffers"
 msgstr "po�et bufferů videa"
 
-#: src/xine-engine/video_decoder.c:496
+#: src/xine-engine/video_decoder.c:506
 msgid ""
 "The number of video buffers (each is 8k in size) xine uses in its internal "
 "queue. Higher values mean smoother playback for unreliable inputs, but also "
@@ -5283,13 +5272,13 @@ msgstr ""
 "vstupů, ale také zvýšené zpoždění a spotřebu paměti."
 
 # This message should match with FAQ_cs.
-#: src/xine-engine/video_out.c:642
+#: src/xine-engine/video_out.c:671
 #, c-format
 msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
 msgstr "%d snímků předaných, %d snímků přesko�ených, %d snímků zahozených\n"
 
 # This message should match with FAQ_cs.
-#: src/xine-engine/video_out.c:815
+#: src/xine-engine/video_out.c:844
 #, c-format
 msgid ""
 "video_out: throwing away image with pts %<PRId64> because it's too old "
@@ -5298,22 +5287,22 @@ msgstr ""
 "video_out: zahození obrazu s pts %<PRId64>, protože je příliš starý "
 "(rozdíl : %<PRId64>).\n"
 
-#: src/xine-engine/video_out.c:1794
+#: src/xine-engine/video_out.c:1863
 #, fuzzy
 msgid "default number of video frames"
 msgstr "Výchozí po�et opakování snímku"
 
-#: src/xine-engine/video_out.c:1795
+#: src/xine-engine/video_out.c:1864
 msgid ""
 "The default number of video frames to request from xine video out driver. "
 "Some drivers will override this setting with their own values."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1834
+#: src/xine-engine/video_out.c:1921
 msgid "percentage of skipped frames to tolerate"
 msgstr "procento přesko�ených snímků, které se bude tolerovat"
 
-#: src/xine-engine/video_out.c:1835
+#: src/xine-engine/video_out.c:1922
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not decoded in time, xine sends a notification."
@@ -5321,11 +5310,11 @@ msgstr ""
 "Pokud se nezobrazí více než toto procento snímků, protože nebyly v�as "
 "dekódovány, pošle xine hlášení."
 
-#: src/xine-engine/video_out.c:1840
+#: src/xine-engine/video_out.c:1927
 msgid "percentage of discarded frames to tolerate"
 msgstr "procentní tolerance zahozených snímků"
 
-#: src/xine-engine/video_out.c:1841
+#: src/xine-engine/video_out.c:1928
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not scheduled for display in time, xine sends a notification."
@@ -5333,7 +5322,7 @@ msgstr ""
 "Pokud se nezobrazí více než toto procento snímků, protože nebyly v�as "
 "naplánovány k zobrazení, pošle xine hlášení."
 
-#: src/xine-engine/video_out.c:1875
+#: src/xine-engine/video_out.c:1965
 msgid "video_out: sorry, this should not happen. please restart xine.\n"
 msgstr ""
 "video_out: Litujeme, toto by se nemělo přihodit. Prosím restartujte xine.\n"
@@ -5392,129 +5381,129 @@ msgstr ""
 "videovýstupy jako je XShm, kde není škálování obrazu hardwarově urychlováno, "
 "může toto dramaticky snížit využití CPU."
 
-#: src/xine-engine/xine.c:706 src/xine-engine/xine.c:813
-#: src/xine-engine/xine.c:852 src/xine-engine/xine.c:888
-#: src/xine-engine/xine.c:900 src/xine-engine/xine.c:913
-#: src/xine-engine/xine.c:926 src/xine-engine/xine.c:939
-#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:990
-#: src/xine-engine/xine.c:1025
+#: src/xine-engine/xine.c:771 src/xine-engine/xine.c:878
+#: src/xine-engine/xine.c:917 src/xine-engine/xine.c:953
+#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:978
+#: src/xine-engine/xine.c:991 src/xine-engine/xine.c:1004
+#: src/xine-engine/xine.c:1030 src/xine-engine/xine.c:1055
+#: src/xine-engine/xine.c:1090
 msgid "xine: error while parsing mrl\n"
 msgstr "xine: chyba během zpracování MRL\n"
 
-#: src/xine-engine/xine.c:742
+#: src/xine-engine/xine.c:807
 #, c-format
 msgid "xine: found input plugin  : %s\n"
 msgstr "xine: nelze nalézt vstupní modul: %s\n"
 
-#: src/xine-engine/xine.c:760
+#: src/xine-engine/xine.c:825
 #, c-format
 msgid "xine: input plugin cannot open MRL [%s]\n"
 msgstr "xine: vstupní modul nemůže otevřít MRL [%s]\n"
 
-#: src/xine-engine/xine.c:776
+#: src/xine-engine/xine.c:841
 #, c-format
 msgid "xine: cannot find input plugin for MRL [%s]\n"
 msgstr "xine: nelze nalézt vstupní modul pro MRL [%s]\n"
 
-#: src/xine-engine/xine.c:802
+#: src/xine-engine/xine.c:867
 #, c-format
 msgid "xine: specified demuxer %s failed to start\n"
 msgstr "xine: selhalo spuštění demultiplexoru %s\n"
 
-#: src/xine-engine/xine.c:838
+#: src/xine-engine/xine.c:903
 #, c-format
 msgid "xine: join rip input plugin\n"
 msgstr "xine: připojen ripovací vstupní modul\n"
 
-#: src/xine-engine/xine.c:845
+#: src/xine-engine/xine.c:910
 msgid "xine: error opening rip input plugin instance\n"
 msgstr "xine: chyba otevírání instance ripovacího vstupního modulu\n"
 
-#: src/xine-engine/xine.c:876
+#: src/xine-engine/xine.c:941
 #, c-format
 msgid "xine: last_probed demuxer %s failed to start\n"
 msgstr "xine: selhalo spuštění posledního vyzkoušeného demultiplexoru %s\n"
 
-#: src/xine-engine/xine.c:905
+#: src/xine-engine/xine.c:970
 msgid "ignoring video\n"
 msgstr "ignoruje se video\n"
 
-#: src/xine-engine/xine.c:918
+#: src/xine-engine/xine.c:983
 msgid "ignoring audio\n"
 msgstr "ignoruje se zvuk\n"
 
-#: src/xine-engine/xine.c:931
+#: src/xine-engine/xine.c:996
 msgid "ignoring subpicture\n"
 msgstr "ignorují se titulky\n"
 
-#: src/xine-engine/xine.c:944
+#: src/xine-engine/xine.c:1009
 msgid "input cache plugin disabled\n"
 msgstr "vstupní modul cache zakázán\n"
 
-#: src/xine-engine/xine.c:1015
+#: src/xine-engine/xine.c:1080
 #, c-format
 msgid "subtitle mrl opened '%s'\n"
 msgstr "otevřeno MRL titulků '%s'\n"
 
-#: src/xine-engine/xine.c:1019
+#: src/xine-engine/xine.c:1084
 msgid "xine: error opening subtitle mrl\n"
 msgstr "xine: chyba otevírání MRL titulků\n"
 
-#: src/xine-engine/xine.c:1051
+#: src/xine-engine/xine.c:1116
 #, c-format
 msgid "xine: error while parsing MRL\n"
 msgstr "xine: chyba během zpracování MRL\n"
 
-#: src/xine-engine/xine.c:1058
+#: src/xine-engine/xine.c:1123
 #, c-format
 msgid "xine: changing option '%s' from MRL isn't permitted\n"
 msgstr "xine: změna volby '%s' z MRL naní povolena\n"
 
-#: src/xine-engine/xine.c:1078
+#: src/xine-engine/xine.c:1143
 #, c-format
 msgid "xine: couldn't find demux for >%s<\n"
 msgstr "xine: nelze nalézt demultiplexor pro >%s<\n"
 
-#: src/xine-engine/xine.c:1094
+#: src/xine-engine/xine.c:1159
 #, c-format
 msgid "xine: found demuxer plugin: %s\n"
 msgstr "xine: nalezen demultiplexní modul: %s\n"
 
-#: src/xine-engine/xine.c:1114
+#: src/xine-engine/xine.c:1179
 #, c-format
 msgid "xine: demuxer failed to start\n"
 msgstr "xine: selhalo spuštění demultiplexoru\n"
 
-#: src/xine-engine/xine.c:1179
+#: src/xine-engine/xine.c:1244
 #, c-format
 msgid "xine_play: no demux available\n"
 msgstr "xine_play: žádný dostupný demultiplexor\n"
 
-#: src/xine-engine/xine.c:1249
+#: src/xine-engine/xine.c:1314
 #, c-format
 msgid "xine_play: demux failed to start\n"
 msgstr "xine_play: selhalo spuštění demultiplexoru\n"
 
-#: src/xine-engine/xine.c:1527
+#: src/xine-engine/xine.c:1592
 #, c-format
 msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
 msgstr ""
 "xine: Uvedený adresář pro ukládání \"%s\" by mohl znamenat bezpe�nostní "
 "riziko.\n"
 
-#: src/xine-engine/xine.c:1532
+#: src/xine-engine/xine.c:1597
 msgid "The specified save_dir might be a security risk."
 msgstr "Uvedený adresář pro ukládání by mohl znamenat bezpe�nostní riziko."
 
-#: src/xine-engine/xine.c:1561
+#: src/xine-engine/xine.c:1626
 msgid "xine: locale not supported by C library\n"
 msgstr "xine: locale není podporováno knihovnou C\n"
 
-#: src/xine-engine/xine.c:1570
+#: src/xine-engine/xine.c:1635
 msgid "media format detection strategy"
 msgstr "strategie zjištování formátu dat"
 
-#: src/xine-engine/xine.c:1571
+#: src/xine-engine/xine.c:1636
 msgid ""
 "xine offers various methods to detect the media format of input to play. The "
 "individual values are:\n"
@@ -5545,11 +5534,11 @@ msgstr ""
 "extension\n"
 "Detekovat pouze podle přípony jména souboru.\n"
 
-#: src/xine-engine/xine.c:1589
+#: src/xine-engine/xine.c:1654
 msgid "directory for saving streams"
 msgstr "adresář pro ukládání dat"
 
-#: src/xine-engine/xine.c:1590
+#: src/xine-engine/xine.c:1655
 msgid ""
 "When using the stream save feature, files will be written only into this "
 "directory.\n"
@@ -5565,11 +5554,11 @@ msgstr ""
 "Proto byste si měli být jisti, že je v uvedeném adresáři bezproblémový "
 "jakýkoliv obsah v jakémkoliv souboru."
 
-#: src/xine-engine/xine.c:1601
+#: src/xine-engine/xine.c:1666
 msgid "allow implicit changes to the configuration (e.g. by MRL)"
 msgstr "povolit implicitní změny v konfiguraci (např. pomocí MRL)"
 
-#: src/xine-engine/xine.c:1602
+#: src/xine-engine/xine.c:1667
 msgid ""
 "If enabled, you allow xine to change your configuration without explicit "
 "actions from your side. For example configuration changes demanded by MRLs "
@@ -5586,26 +5575,26 @@ msgstr ""
 "dovolíte libovolně měnit vaši konfiguraci, můžete skon�it s úplně rozhozeným "
 "xine."
 
-#: src/xine-engine/xine.c:1616
+#: src/xine-engine/xine.c:1681
 msgid "Timeout for network stream reading (in seconds)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1617
+#: src/xine-engine/xine.c:1682
 msgid ""
 "Specifies the timeout when reading from network streams, in seconds. Too low "
 "values might stop streaming when the source is slow or the bandwidth is "
 "occupied, too high values will freeze the player if the connection is lost."
 msgstr ""
 
-#: src/xine-engine/xine.c:1969
+#: src/xine-engine/xine.c:2034
 msgid "messages"
 msgstr "zprávy"
 
-#: src/xine-engine/xine.c:1970
+#: src/xine-engine/xine.c:2035
 msgid "plugin"
 msgstr "modul"
 
-#: src/xine-engine/xine.c:1971
+#: src/xine-engine/xine.c:2036
 msgid "trace"
 msgstr "trasování"
 
@@ -5687,6 +5676,82 @@ msgstr ""
 msgid "Benchmarking memcpy methods (smaller is better):\n"
 msgstr "Výkonnostní testování metod memcpy (menší je lepší):\n"
 
+#~ msgid "deinterlace method (deprecated)"
+#~ msgstr "metoda korekce prokládání (zavrženo)"
+
+#~ msgid ""
+#~ "This config setting is deprecated. You should use the new deinterlacing "
+#~ "post processing settings instead.\n"
+#~ "\n"
+#~ "From the old days of analog television, where the even and odd numbered "
+#~ "lines of a video frame would be displayed at different times comes the "
+#~ "idea to increase motion smoothness by also recording the lines at "
+#~ "different times. This is called \"interlacing\". But unfortunately, "
+#~ "todays displays show the even and odd numbered lines as one complete "
+#~ "frame all at the same time (called \"progressive display\"), which "
+#~ "results in ugly frame errors known as comb artifacts. Software "
+#~ "deinterlacing is an approach to reduce these artifacts. The individual "
+#~ "values are:\n"
+#~ "\n"
+#~ "none\n"
+#~ "Disables software deinterlacing.\n"
+#~ "\n"
+#~ "bob\n"
+#~ "Interpolates between the lines for moving parts of the image.\n"
+#~ "\n"
+#~ "weave\n"
+#~ "Similar to bob, but with a tendency to preserve the full resolution, "
+#~ "better for high detail in low movement scenes.\n"
+#~ "\n"
+#~ "greedy\n"
+#~ "Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
+#~ "\n"
+#~ "onefield\n"
+#~ "Always interpolates and reduces vertical resolution.\n"
+#~ "\n"
+#~ "onefieldxv\n"
+#~ "Same as onefield, but does the interpolation in hardware.\n"
+#~ "\n"
+#~ "linearblend\n"
+#~ "Applies a slight vertical blur to remove the comb artifacts. Good results "
+#~ "with medium CPU usage."
+#~ msgstr ""
+#~ "Tato položka nastavení konfigurace je zavržena. Měli byste používat nové "
+#~ "nastavení dodate�né korekce prokládání.\n"
+#~ "\n"
+#~ "Ze starých �asů analogové televize, kde by měly být sudé a liché řádky "
+#~ "zobrazovány v různých �asech, pochází myšlenka zvýšit hladkost pohybu "
+#~ "zaznamenáváním řádek v různých �asech. Tomu se říká \"prokládání\". Ale "
+#~ "naneštěstí, dnešní zobrazova�e zobrazují všechny sudé a liché řádky "
+#~ "najednou jako jeden kompletní snímek (tzv. \"postupný zobrazova�\"), což "
+#~ "má za následek ošklivé chyby známé jako hřebenové artefakty. Softwarová "
+#~ "korekce prokládání je způsob, jak redukovat tyto artefakty. Jednotlivé "
+#~ "hodnoty jsou:\n"
+#~ "\n"
+#~ "none\n"
+#~ "Zakáže softwarovou korekci prokládání.\n"
+#~ "\n"
+#~ "bob\n"
+#~ "Interpoluje mezi řádky pohyblivých �ástí obrazu.\n"
+#~ "\n"
+#~ "weave\n"
+#~ "Podobné jako bob, ale se snahou zachovat plné rozlišení, lepší u velkých "
+#~ "detailů v ne moc pohyblivých scénách.\n"
+#~ "\n"
+#~ "greedy\n"
+#~ "Velmi dobrý přizpůsobivý korektor prokládání, ale potřebuje velký výkon "
+#~ "CPU.\n"
+#~ "\n"
+#~ "onefield\n"
+#~ "Interpoluje vždy a redukuje svislé rozlišení.\n"
+#~ "\n"
+#~ "onefieldxv\n"
+#~ "Stejné jako onefield, ale interpoluje hardwarově.\n"
+#~ "\n"
+#~ "linearblend\n"
+#~ "K odstranění hřebenových artefaktů použije lehké rozmazání. Dobré "
+#~ "výsledky se střední zátěží CPU."
+
 #, fuzzy
 #~ msgid ""
 #~ "video_out_xcbshm: %s: allocating image\n"
diff --git a/po/de.po b/po/de.po
index 492096c2c..4db478c2a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 1.1.6\n"
 "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-04-24 21:48+0100\n"
+"POT-Creation-Date: 2007-06-02 13:14+0200\n"
 "PO-Revision-Date: 2007-04-18 11:00+0200\n"
 "Last-Translator: Philipp Hahn <pmhahn@users.sf.net>\n"
 "Language-Team: German <de@li.org>\n"
@@ -832,6 +832,11 @@ msgstr "audio_sun_out: Audio ioctl auf Gerät %s schlug fehl: %s\n"
 msgid "xine audio output plugin using sun-compliant audio devices/drivers"
 msgstr "xine Soundausgabe benutzt SUN-kompatibles Gerät/Treiber"
 
+#: src/combined/xine_ogg_demuxer.c:810
+#, c-format
+msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+msgstr "ogg: vorbis Tonspur erkannt, aber kein Heder im Datenstrom gefunden.\n"
+
 #: src/demuxers/demux_asf.c:428
 #, c-format
 msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
@@ -976,11 +981,6 @@ msgstr ""
 "Entwicklern melden.\n"
 "melden\n"
 
-#: src/demuxers/demux_ogg.c:802
-#, c-format
-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
-msgstr "ogg: vorbis Tonspur erkannt, aber kein Heder im Datenstrom gefunden.\n"
-
 #: src/demuxers/demux_snd.c:104
 #, c-format
 msgid "demux_snd: bad header parameters\n"
@@ -1019,18 +1019,6 @@ msgstr "demux_wc3movie: SHOT Paket referenziert ungültige Palette (%d >= %d)\n"
 msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
 msgstr "demux_wc3movie: Beim Laden der Palette ist ein Problem aufgetreten\n"
 
-#: src/dxr3/dxr3.h:32
-msgid "DXR3 device number"
-msgstr "DXR3 Gerätenummer"
-
-#: src/dxr3/dxr3.h:33
-msgid ""
-"If you have more than one DXR3 in your computer, you can specify which one "
-"to use here."
-msgstr ""
-"Falls Sie mehr als eine DXR3 in Ihrem Computer haben, können Sie hier "
-"angeben, welche benutzt werden soll."
-
 #: src/dxr3/dxr3_decode_spu.c:253
 #, c-format
 msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
@@ -1145,6 +1133,18 @@ msgstr ""
 "dxr3_decode_video: WARNUNG: Korrigiere Code für Wiederholrate von PAL zu "
 "NTSC\n"
 
+#: src/dxr3/dxr3.h:32
+msgid "DXR3 device number"
+msgstr "DXR3 Gerätenummer"
+
+#: src/dxr3/dxr3.h:33
+msgid ""
+"If you have more than one DXR3 in your computer, you can specify which one "
+"to use here."
+msgstr ""
+"Falls Sie mehr als eine DXR3 in Ihrem Computer haben, können Sie hier "
+"angeben, welche benutzt werden soll."
+
 #: src/dxr3/dxr3_mpeg_encoders.c:125
 msgid "dxr3_mpeg_encoder: failed to init librte\n"
 msgstr "dxr3_mpeg_encoder: Initialisierung von librte schlug fehl\n"
@@ -1489,31 +1489,31 @@ msgstr ""
 "video_out_dxr3: Fehler beim Lesen der Ãœberlagerungsdatei. Starten Sie "
 "autocal!\n"
 
-#: src/input/input_cdda.c:1608
+#: src/input/input_cdda.c:1611
 #, c-format
 msgid "%s: can't connect to %s:%d\n"
 msgstr "%s: Kann keine Verbindung zu '%s:%d' aufbauen\n"
 
-#: src/input/input_cdda.c:1655
+#: src/input/input_cdda.c:1658
 #, c-format
 msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
 msgstr "input_cdda: Verbindung zum CDDB-Server '%s:%d' steht.\n"
 
-#: src/input/input_cdda.c:1660
+#: src/input/input_cdda.c:1663
 #, c-format
 msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
 msgstr ""
 "input_cdda: Kann keine Verbindung zum CDDB-Server '%s:%d' (%s) herstellen.\n"
 
-#: src/input/input_cdda.c:2690
+#: src/input/input_cdda.c:2693
 msgid "CD Digital Audio (aka. CDDA)"
 msgstr "CD Digital Audio (CDDA)"
 
-#: src/input/input_cdda.c:2742
+#: src/input/input_cdda.c:2745
 msgid "device used for CD audio"
 msgstr "Gerät für CD-Audio"
 
-#: src/input/input_cdda.c:2743
+#: src/input/input_cdda.c:2746
 msgid ""
 "The path to the device, usually a CD or DVD drive, which you intend to use "
 "for playing audio CDs."
@@ -1521,11 +1521,11 @@ msgstr ""
 "Pfadangabe zum Gerät (normalerweise CD oder DVD Laufwerk), das zur "
 "Wiedergabe von Audio-CDs benutzt werden soll."
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid "query CDDB"
 msgstr "CDDB abfragen"
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid ""
 "Enables CDDB queries, which will give you convenient title and track names "
 "for your audio CDs.\n"
@@ -1538,11 +1538,11 @@ msgstr ""
 "Informationen von einem Internetserver bezogen werden, der ein Profil Ihrer "
 "Hörgewohnheiten erstellen kann."
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid "CDDB server name"
 msgstr "CDDB Servername"
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid ""
 "The CDDB server used to retrieve the title and track information from.\n"
 "This setting is security critical, because the sever will receive "
@@ -1554,19 +1554,19 @@ msgstr ""
 "Ihren Hörgewohnheiten erhält und bösartige Antworten senden kann. Geben Sie "
 "nur einen Server ihres Vertrauens an."
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "CDDB server port"
 msgstr "CDDB Serverport"
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "The server port used to retrieve the title and track information from."
 msgstr "Der Serverport, vom dem Titelinformationen bezogen werden sollen."
 
-#: src/input/input_cdda.c:2771
+#: src/input/input_cdda.c:2774
 msgid "slow down disc drive to this speed factor"
 msgstr "Laufwerk auf diesen Faktor verlangsamen"
 
-#: src/input/input_cdda.c:2772
+#: src/input/input_cdda.c:2775
 msgid ""
 "Since some CD or DVD drives make some really loud noises because of the fast "
 "disc rotation, xine will try to slow them down. With standard CD or DVD "
@@ -1581,63 +1581,63 @@ msgstr ""
 "auf die Wiedergabeleistung haben sollte.\n"
 "Ein Wert von Null deaktiviert das Bremsen."
 
-#: src/input/input_dvb.c:899
+#: src/input/input_dvb.c:900
 #, fuzzy, c-format
 msgid "input_dvb: failed to open dvb channel file '%s': %s\n"
 msgstr "input_dvb: Öffnen der DVB-Kanaldatei '%s' schlug fehl\n"
 
-#: src/input/input_dvb.c:905
+#: src/input/input_dvb.c:906
 #, fuzzy, c-format
 msgid "input_dvb: dvb channel file '%s' is not a plain file\n"
 msgstr "input_dvb: Öffnen der DVB-Kanaldatei '%s' schlug fehl\n"
 
-#: src/input/input_dvb.c:2115 src/input/input_dvb.c:2943
+#: src/input/input_dvb.c:2116 src/input/input_dvb.c:2948
 msgid "input_dvb: tuner_set_channel failed\n"
 msgstr "input_dvb: tuner_set_channel schlug fehl\n"
 
-#: src/input/input_dvb.c:2743
+#: src/input/input_dvb.c:2748
 msgid "input_dvb: cannot open dvb device\n"
 msgstr "input_dvb: Kann DVB-Gerät nicht öffnen\n"
 
-#: src/input/input_dvb.c:2767
+#: src/input/input_dvb.c:2772
 #, c-format
 msgid "input_dvb: channel %d out of range, defaulting to 0\n"
 msgstr "input_dvb: Kanal %d außerhalb des Bereis, benutzt 0\n"
 
-#: src/input/input_dvb.c:2778
+#: src/input/input_dvb.c:2783
 #, c-format
 msgid "input_dvb: searching for channel %s\n"
 msgstr "input_dvb: Suche nach Kanal %s\n"
 
-#: src/input/input_dvb.c:2801
+#: src/input/input_dvb.c:2806
 #, c-format
 msgid "input_dvb: exact match for %s not found: trying partial matches\n"
 msgstr ""
 "input_dvb: Keine exakte Übereinstimmung für %s gefunden: versuche teilweise "
 "Ãœbereinstimmung\n"
 
-#: src/input/input_dvb.c:2808
+#: src/input/input_dvb.c:2813
 #, c-format
 msgid "input_dvb: found matching channel %s\n"
 msgstr "input_dvb: Ãœbereinstimmung mit Kanal %s gefunden\n"
 
-#: src/input/input_dvb.c:2821
+#: src/input/input_dvb.c:2826
 #, c-format
 msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
 msgstr "input_dvb: Kanal %s nicht in channels.conf gefunden, Standardkanal.\n"
 
-#: src/input/input_dvb.c:2827
+#: src/input/input_dvb.c:2832
 msgid ""
 "input_dvb: invalid channel specification, defaulting to last viewed "
 "channel.\n"
 msgstr ""
 "input_dvb: Ungültige Kanalspezifikation, benutze zulest gesehenen Kanal.\n"
 
-#: src/input/input_dvb.c:2833
+#: src/input/input_dvb.c:2838
 msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
 msgstr "input_dvb: Ungültige Kanalspezifikation, benutze Kanal 0\n"
 
-#: src/input/input_dvb.c:2845
+#: src/input/input_dvb.c:2850
 msgid ""
 "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
 "S)\n"
@@ -1645,7 +1645,7 @@ msgstr ""
 "input_dvb: DVB-S MRL angegeben, aber Tuner scheint kein QPSK (DVB-S) zu "
 "sein\n"
 
-#: src/input/input_dvb.c:2865
+#: src/input/input_dvb.c:2870
 msgid ""
 "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
 "T)\n"
@@ -1653,27 +1653,35 @@ msgstr ""
 "input_dvb: DVB-T MRL angegeben, aber Tuner scheint kein OFDM (DVB-T) zu "
 "sein\n"
 
-#: src/input/input_dvb.c:2888 src/input/input_dvb.c:2914
+#: src/input/input_dvb.c:2893
 msgid ""
 "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
 "C)\n"
 msgstr ""
 "input_dvb: DVB-C MRL angegeben, aber Tuner scheint kein QAM (DVB-C) zu sein\n"
 
-#: src/input/input_dvb.c:2949
+#: src/input/input_dvb.c:2919
+#, fuzzy
+msgid ""
+"input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-"
+"A)\n"
+msgstr ""
+"input_dvb: DVB-C MRL angegeben, aber Tuner scheint kein QAM (DVB-C) zu sein\n"
+
+#: src/input/input_dvb.c:2954
 #, c-format
 msgid "input_dvb: cannot open dvr device '%s'\n"
 msgstr "input_dvb: Kann DVR-Gerät '%s' nicht öffnen\n"
 
-#: src/input/input_dvb.c:2971
+#: src/input/input_dvb.c:2976
 msgid "input_dvb: cannot create EPG updater thread\n"
 msgstr "input_dvb: Kann EPG-Aktualisierungsthread nicht erstellen\n"
 
-#: src/input/input_dvb.c:3033
+#: src/input/input_dvb.c:3038
 msgid "use DVB 'center cutout' (zoom)"
 msgstr "Benutze DVB 'center cutout' (Zoom)"
 
-#: src/input/input_dvb.c:3034
+#: src/input/input_dvb.c:3039
 msgid ""
 "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
 "frame."
@@ -1681,15 +1689,15 @@ msgstr ""
 "Dies erlaubt Vollbildwiedergabe von 4:3 Inhalten, die in 16:9 übertragen "
 "werden."
 
-#: src/input/input_dvb.c:3127
+#: src/input/input_dvb.c:3132
 msgid "DVB (Digital TV) input plugin"
 msgstr "DVB (Digital TV) Plugin"
 
-#: src/input/input_dvb.c:3244
+#: src/input/input_dvb.c:3249
 msgid "Remember last DVB channel watched"
 msgstr "Zuletzt gesehenen DVB-Kanal vermerken"
 
-#: src/input/input_dvb.c:3245
+#: src/input/input_dvb.c:3250
 msgid ""
 "On autoplay, xine will remember and switch to the channel indicated in media."
 "dvb.last_channel. "
@@ -1697,19 +1705,19 @@ msgstr ""
 "Bei automatischer Widergabe wechselt xine zum zuletztgesehenen Kanal media."
 "dvb.last_channel. "
 
-#: src/input/input_dvb.c:3252
+#: src/input/input_dvb.c:3257
 msgid "Last DVB channel viewed"
 msgstr "Zuletzt gesehener DVB-Kanal"
 
-#: src/input/input_dvb.c:3253
+#: src/input/input_dvb.c:3258
 msgid "If enabled xine will remember and switch to this channel. "
 msgstr "Falls aktiviert vermerkt xine den Kanal und wechselt zu diesem. "
 
-#: src/input/input_dvb.c:3259
+#: src/input/input_dvb.c:3264
 msgid "Number of dvb card to use."
 msgstr "Nummer der zu benutzenden DVB-Karte."
 
-#: src/input/input_dvb.c:3260
+#: src/input/input_dvb.c:3265
 msgid ""
 "Leave this at zero unless you really have more than 1 card in your system."
 msgstr ""
@@ -1956,87 +1964,87 @@ msgstr "Fals aktiviert zeigt die Dateiauswahl auch versteckte Dateien."
 msgid "gnome-vfs input plugin as shipped with xine"
 msgstr "Mit xine ausgeliefertes gnome-vfs Plugin"
 
-#: src/input/input_http.c:174
+#: src/input/input_http.c:176
 #, c-format
 msgid "input_http: gethostbyname(%s) failed: %s\n"
 msgstr "input_http: gethostbyname(%s) schlug fehl: %s\n"
 
-#: src/input/input_http.c:400 src/input/input_http.c:943
+#: src/input/input_http.c:402 src/input/input_http.c:957
 #, c-format
 msgid "input_http: read error %d\n"
 msgstr "input_http: Lesefehler %d\n"
 
-#: src/input/input_http.c:627
+#: src/input/input_http.c:629
 msgid "Connecting HTTP server..."
 msgstr "Kontaktiere HTTP Server..."
 
-#: src/input/input_http.c:819
+#: src/input/input_http.c:820
 #, c-format
 msgid "input_http: invalid http answer\n"
 msgstr "input_http: Ungültige http-Antwort\n"
 
-#: src/input/input_http.c:825
+#: src/input/input_http.c:826
 #, c-format
 msgid "input_http: 3xx redirection: >%d %s<\n"
 msgstr "input_http: 3xx Weiterleitung : >%d %s<\n"
 
-#: src/input/input_http.c:830 src/input/input_http.c:836
-#: src/input/input_http.c:843
+#: src/input/input_http.c:831 src/input/input_http.c:836
+#: src/input/input_http.c:842 src/input/input_http.c:849
 #, c-format
 msgid "input_http: http status not 2xx: >%d %s<\n"
 msgstr "input_http: http-Status ungleich 2xx: >%d %s<\n"
 
-#: src/input/input_http.c:853
+#: src/input/input_http.c:859
 #, c-format
 msgid "input_http: content length = %<PRIdMAX> bytes\n"
 msgstr "input_http: Inhaltslänge = %<PRIdMAX> bytes\n"
 
-#: src/input/input_http.c:922
+#: src/input/input_http.c:932
 #, c-format
 msgid "input_http: buffer exhausted after %d bytes."
 msgstr "input_http: Puffer erschöpft nach %d Bytes."
 
-#: src/input/input_http.c:996
+#: src/input/input_http.c:1010
 msgid "http input plugin"
 msgstr "http Plugin"
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "HTTP proxy host"
 msgstr "HTTP Proxy Rechnername"
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "The hostname of the HTTP proxy."
 msgstr "Der Rechnername des HTTP Proxys."
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "HTTP proxy port"
 msgstr "HTTP Proxy Portnummer"
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "The port number of the HTTP proxy."
 msgstr "Die Portnummer des HTTP Proxys."
 
-#: src/input/input_http.c:1076
+#: src/input/input_http.c:1090
 msgid "HTTP proxy username"
 msgstr "HTTP Proxy Benutzername"
 
-#: src/input/input_http.c:1077
+#: src/input/input_http.c:1091
 msgid "The user name for the HTTP proxy."
 msgstr "Der Benutzername für den HTTP Proxy."
 
-#: src/input/input_http.c:1080
+#: src/input/input_http.c:1094
 msgid "HTTP proxy password"
 msgstr "HTTP Proxy Passwort"
 
-#: src/input/input_http.c:1081
+#: src/input/input_http.c:1095
 msgid "The password for the HTTP proxy."
 msgstr "Das Passwort für den HTTP Proxy."
 
-#: src/input/input_http.c:1084
+#: src/input/input_http.c:1098
 msgid "Domains for which to ignore the HTTP proxy"
 msgstr "Domains, die den HTTP Proxy umgehen"
 
-#: src/input/input_http.c:1085
+#: src/input/input_http.c:1099
 msgid ""
 "A comma-separated list of domain names for which the proxy is to be "
 "ignored.\n"
@@ -2251,31 +2259,31 @@ msgstr "Pufferüberlauf..."
 msgid "Adjusting..."
 msgstr "Anpassen..."
 
-#: src/input/input_v4l.c:660
+#: src/input/input_v4l.c:658
 msgid "Tuner name not found\n"
 msgstr "Empfängername nicht gefunden\n"
 
-#: src/input/input_v4l.c:1876
+#: src/input/input_v4l.c:1874
 msgid "v4l tv input plugin"
 msgstr "V4L TV Plugin"
 
-#: src/input/input_v4l.c:1880
+#: src/input/input_v4l.c:1878
 msgid "v4l radio input plugin"
 msgstr "V4L Radio Plugin"
 
-#: src/input/input_v4l.c:1912
+#: src/input/input_v4l.c:1910
 msgid "v4l video device"
 msgstr "Pfad zum V4L Videogerät"
 
-#: src/input/input_v4l.c:1913
+#: src/input/input_v4l.c:1911
 msgid "The path to your Video4Linux video device."
 msgstr "Pfad zum Video4Linux Videogerät"
 
-#: src/input/input_v4l.c:1938
+#: src/input/input_v4l.c:1936
 msgid "v4l radio device"
 msgstr "Pfad zum V4L Radiogerät"
 
-#: src/input/input_v4l.c:1939
+#: src/input/input_v4l.c:1937
 msgid "The path to your Video4Linux radio device."
 msgstr "Pfad zum Video4Linux Radiogerät"
 
@@ -2439,54 +2447,54 @@ msgstr "Fehler beim lesen der aktuellen Segmentnummer"
 msgid "Should have converted this above"
 msgstr "Sollte bereis konvertiert worden sein"
 
-#: src/input/vcd/xineplug_inp_vcd.c:191
+#: src/input/vcd/xineplug_inp_vcd.c:192
 msgid "failed to find a device with a VCD"
 msgstr "Konnte kein Gerät mit einer VCD finden"
 
-#: src/input/vcd/xineplug_inp_vcd.c:328
+#: src/input/vcd/xineplug_inp_vcd.c:329
 msgid "was passed a null class parameter"
 msgstr "Es wurde ein NULL-Klassenparameter übergeben"
 
-#: src/input/vcd/xineplug_inp_vcd.c:972
+#: src/input/vcd/xineplug_inp_vcd.c:982
 msgid "Invalid current entry type"
 msgstr "Ungültiger Eintragstyp"
 
-#: src/input/vcd/xineplug_inp_vcd.c:996
+#: src/input/vcd/xineplug_inp_vcd.c:1006
 msgid ""
 "Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
 msgstr ""
 "Video-CD Plugin mit PBC und Unterstützung für (X)VCD, (X)SVCD, HQVCD, "
 "CVD, ... "
 
-#: src/input/vcd/xineplug_inp_vcd.c:1097
+#: src/input/vcd/xineplug_inp_vcd.c:1107
 msgid "selection has no RETURN entry"
 msgstr "Auswahl hat keinen RETURN-Eintrag"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1126
+#: src/input/vcd/xineplug_inp_vcd.c:1136
 msgid "DEFAULT selected, but PBC is not on."
 msgstr "DEFAULT ausgewählt, aber PBC ist nicht an."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1131
+#: src/input/vcd/xineplug_inp_vcd.c:1141
 msgid "selection has no NEXT entry"
 msgstr "Auswahl hat keinen NEXT-Eintrag"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1139
+#: src/input/vcd/xineplug_inp_vcd.c:1149
 msgid "selection has no PREVIOUS entry"
 msgstr "Auswahl hat keinen PREVIOUS-Eintrag"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1146
+#: src/input/vcd/xineplug_inp_vcd.c:1156
 msgid "Unknown event type: "
 msgstr "Unbekannter Ereignistyp"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1446 src/input/vcd/xineplug_inp_vcd.c:1493
+#: src/input/vcd/xineplug_inp_vcd.c:1452 src/input/vcd/xineplug_inp_vcd.c:1499
 msgid "The above message had unknown vcdimager log level"
 msgstr "Die vorherige Nachricht hat einen unbekannten Log-Level"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1824
+#: src/input/vcd/xineplug_inp_vcd.c:1830
 msgid "VCD default type to use on autoplay"
 msgstr "Standardlaufwerk für VCD bei automatischer Wiedergabe"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1825
+#: src/input/vcd/xineplug_inp_vcd.c:1831
 msgid ""
 "The VCD play unit to use when none is specified in an MRL, e.g. vcd:// or "
 "vcd:///dev/dvd:"
@@ -2494,11 +2502,11 @@ msgstr ""
 "Das zu benutzende Laufwerk, wenn keins in der MRL angegeben ist (z.B. vcd:// "
 "oder vcd:///dev/dvd:)"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1835
+#: src/input/vcd/xineplug_inp_vcd.c:1841
 msgid "CD-ROM drive used for VCD when none given"
 msgstr "Standard CD-ROM-Laufwerk für VCD, wenn keins angegeben wird"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1836
+#: src/input/vcd/xineplug_inp_vcd.c:1842
 msgid ""
 "What to use if no drive specified. If the setting is empty, xine will scan "
 "for CD drives."
@@ -2506,29 +2514,29 @@ msgstr ""
 "Welches Laufwerk benutzt werden soll, falls kein angegeben ist. Falls die "
 "Einstellung leer ist, wird xine nach CD-Laufwerken suchen."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1846
+#: src/input/vcd/xineplug_inp_vcd.c:1852
 msgid "VCD position slider range"
 msgstr "VCD Positionierungsbereich"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1847
+#: src/input/vcd/xineplug_inp_vcd.c:1853
 msgid ""
 "range that the stream playback position slider represents playing a VCD."
 msgstr ""
 "Der Bereich, den der Positionsschieber bei Wiedergabe von VCDs repräsentiert."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1855
+#: src/input/vcd/xineplug_inp_vcd.c:1861
 msgid "VCD read-ahead caching?"
 msgstr "Vorauseilendes Caching für VCDs benutzen?"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1856
+#: src/input/vcd/xineplug_inp_vcd.c:1862
 msgid "Class may lead to jerky playback on low-end machines."
 msgstr "Kann zu ruckliger Wiedergabe auf leistungsschwachen Rechnern führen."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1866
+#: src/input/vcd/xineplug_inp_vcd.c:1872
 msgid "automatically advance VCD track/entry"
 msgstr "Automatisch Spur/Eintrag weiterschalten bei VCDs"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1867
+#: src/input/vcd/xineplug_inp_vcd.c:1873
 msgid ""
 "If enabled, we should automatically advance to the next entry or track. Used "
 "only when playback control (PBC) is disabled."
@@ -2537,11 +2545,11 @@ msgstr ""
 "weitergeschaltet. Wird nur benutzt, wenn die Wiedergabekontrolle PBC nicht "
 "aktiviert ist."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1876
+#: src/input/vcd/xineplug_inp_vcd.c:1882
 msgid "show 'rejected' VCD LIDs"
 msgstr "'Ablegehnte' VCD LIDs anzeigen"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1877
+#: src/input/vcd/xineplug_inp_vcd.c:1883
 msgid ""
 "Some playback list IDs (LIDs) are marked not showable, but you can see them "
 "in the MRL list if this is set. Rejected entries are marked with an asterisk "
@@ -2551,11 +2559,11 @@ msgstr ""
 "Anwahl dieser Option werden sie trozem angezeigt und mit einem Stern (*) am "
 "Ende der MRL gekennzeichnet."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1888
+#: src/input/vcd/xineplug_inp_vcd.c:1894
 msgid "VCD format string for display banner"
 msgstr "Formatvorlage für Fenstertitle bei VCDs"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1889
+#: src/input/vcd/xineplug_inp_vcd.c:1895
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are:\n"
@@ -2594,11 +2602,11 @@ msgstr ""
 "      Eine Nummer zwischen 1 und der Serienlänge.\n"
 " %% : ein %\n"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1914
+#: src/input/vcd/xineplug_inp_vcd.c:1920
 msgid "VCD format string for stream comment field"
 msgstr "Formatvorlage für Kommentarfeld eines VCD Datenstroms."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1915
+#: src/input/vcd/xineplug_inp_vcd.c:1921
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
@@ -2610,11 +2618,11 @@ msgstr ""
 "c, %F, %I, %L, %N, %P, %p, %S, %T, %V, %v, und %%.\n"
 "Siehe Hilfe für title_format bezüglich deren Bedeutung."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1927
+#: src/input/vcd/xineplug_inp_vcd.c:1933
 msgid "VCD debug flag mask"
 msgstr "Bitfeld für VCD Fehlersuche"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1928
+#: src/input/vcd/xineplug_inp_vcd.c:1934
 msgid ""
 "For tracking down bugs in the VCD plugin. Mask values are:\n"
 "   1: Meta information\n"
@@ -2644,69 +2652,6 @@ msgstr ""
 "1024: Standbilder\n"
 "2048: Debugging von VCDINFO\n"
 
-#: src/liba52/xine_a52_decoder.c:742 src/libxineadec/xine_dts_decoder.c:524
-msgid "HELP! a mono-only audio driver?!\n"
-msgstr "HILFE! Ein nur-Mono-Audiogerät?!\n"
-
-#: src/liba52/xine_a52_decoder.c:805
-msgid "A/52 volume"
-msgstr "A/52 Lautstärke"
-
-#: src/liba52/xine_a52_decoder.c:806
-msgid ""
-"With A/52 audio, you can modify the volume at the decoder level. This has "
-"the advantage of the audio being already decoded for the specified volume, "
-"so later operations like channel downmixing will work on an audio stream of "
-"the given volume."
-msgstr ""
-"Mit A/52 Audio kann die Lautstärke auf Dekoderebene verändert werden. Dies "
-"hat den Vorteil, daß die Audiodaten bereits für die spezifische Lautstärke "
-"dekodiert sind und nachfolgende Operationen wie Heruntermischen direkt mit "
-"diesen Audiodaten arbeiten können."
-
-#: src/liba52/xine_a52_decoder.c:814
-msgid "use A/52 dynamic range compression"
-msgstr "Benutze dynamische A/52 Bereichskomprimierung"
-
-#: src/liba52/xine_a52_decoder.c:815
-msgid ""
-"Dynamic range compression limits the dynamic range of the audio. This means "
-"making the loud sounds softer, and the soft sounds louder, so you can more "
-"easily listen to the audio in a noisy environment without disturbing anyone."
-msgstr ""
-"Dynamische Bereichskomprimierung reduziert den dynamischen Bereich des Tons: "
-"Laute Geräusche klingen leiser und leise Geräusche klingen lauter. Dies "
-"ermöglicht ein besseres Verständnis des Tons in lauten Umgebungen, ohne "
-"dabei andere zu stören."
-
-#: src/liba52/xine_a52_decoder.c:822
-msgid "downmix audio to 2 channel surround stereo"
-msgstr "Heruntermischen zu Zweikanal Stereo Raumklang"
-
-#: src/liba52/xine_a52_decoder.c:823
-msgid ""
-"When you want to listen to multichannel surround sound, but you have only "
-"two speakers or a surround decoder or amplifier which does some sort of "
-"matrix surround decoding like prologic, you should enable this option so "
-"that the additional channels are mixed into the stereo signal."
-msgstr ""
-"Aktivieren sie dies, falls Sie Mehrkanal-Raumklang anhören wollen, aber nur "
-"zwei Lautsprecher oder einen Surround-Dekodierer haben, der Matrix-Surround-"
-"Dekodierung wie ProLogic unterstützt, damit die zusätzlichen Kanäle in das "
-"Stereo-Signal gemixt werden."
-
-#: src/libfaad/xine_faad_decoder.c:131
-msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
-msgstr "libfaad: libfaad NeAACDecOpen() schlug fehl.\n"
-
-#: src/libfaad/xine_faad_decoder.c:140
-msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
-msgstr "libfaad: libfaad NeAACDecInit2 schlug fehl.\n"
-
-#: src/libfaad/xine_faad_decoder.c:151
-msgid "libfaad: libfaad NeAACDecInit failed.\n"
-msgstr "libfaad: libfaad NeAACDecInit schlug fehl.\n"
-
 #: src/libffmpeg/ff_audio_decoder.c:122
 #, c-format
 msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
@@ -2731,51 +2676,6 @@ msgstr "ffmpeg_audio_dec: Konnte Dekoder nicht öffnen\n"
 msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
 msgstr "dvaudio: Vergrößere Puffer auf %d um Überlauf zu vermeiden.\n"
 
-#: src/libffmpeg/ff_video_decoder.c:155
-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
-msgstr "ffmpeg_video_dec: Nichtunterstütztes Bildformat, DR1 deaktiviert.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:173
-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
-msgstr "ffmpeg_video_dec: Nichtunterstütztes Bildformat, DR1 deaktiviert.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:333
-#, c-format
-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
-msgstr ""
-"ffmpeg_video_dec: Konnte keinen ffmpeg-Dekoder für Puffertyp 0x%X finden\n"
-
-#: src/libffmpeg/ff_video_decoder.c:362
-msgid "ffmpeg_video_dec: couldn't open decoder\n"
-msgstr "ffmpeg_video_dec: Konnte Dekoder nicht öffnen\n"
-
-#: src/libffmpeg/ff_video_decoder.c:397
-msgid "ffmpeg_video_dec: direct rendering enabled\n"
-msgstr "ffmpeg_video_dec: Direktausgabe aktiviert\n"
-
-#: src/libffmpeg/ff_video_decoder.c:816
-#, c-format
-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
-msgstr "ffmpeg_video_dec: Vergrößere Puffer auf %d um Überlauf zu vermeiden.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:1514
-msgid "MPEG-4 postprocessing quality"
-msgstr "Qualität der MPEG-4 Nachbearbeitungsstufe"
-
-#: src/libffmpeg/ff_video_decoder.c:1515
-msgid ""
-"You can adjust the amount of post processing applied to MPEG-4 video.\n"
-"Higher values result in better quality, but need more CPU. Lower values may "
-"result in image defects like block artifacts. For high quality content, too "
-"heavy post processing can actually make the image worse by blurring it too "
-"much."
-msgstr ""
-"Die Umfang der Nachbearbeitung bei MPEG-4 Videos kann angepasst werden.\n"
-"Höhere Werte verwessern die Qualität zu Lasten der CPU-Belastunga. Niedrige "
-"Werte können zu Defekten wie Artefakte führen. Bei hochqualitativen Inhalten "
-"kann zu starke Nachbearbeitung das Bild durch zu starkes verwischen "
-"verschlechtern."
-
 #: src/libffmpeg/ffmpeg_encoder.c:163
 msgid "libavcodec mpeg output bitrate (kbit/s)"
 msgstr "libavcodec MPEG Ausgangsbitrate (kBit/s)"
@@ -2821,24 +2721,50 @@ msgstr "Maximaler Quantisierer"
 msgid "The maximum compression to apply to an image in constant quality mode."
 msgstr "Maximale Kompression für ein Bild im Modus konstanter Qualität"
 
-#: src/libxineadec/xine_musepack_decoder.c:249
+#: src/libffmpeg/ff_video_decoder.c:155
+msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
+msgstr "ffmpeg_video_dec: Nichtunterstütztes Bildformat, DR1 deaktiviert.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:173
+msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+msgstr "ffmpeg_video_dec: Nichtunterstütztes Bildformat, DR1 deaktiviert.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:333
 #, c-format
-msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
-msgstr "libmusepack: mpc_streaminfo_read schlug fehl: %d\n"
+msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+msgstr ""
+"ffmpeg_video_dec: Konnte keinen ffmpeg-Dekoder für Puffertyp 0x%X finden\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:323
-msgid "libmusepack: data after last frame ignored\n"
-msgstr "libmusepack: Daten nach letzem Bild ignoriert\n"
+#: src/libffmpeg/ff_video_decoder.c:362
+msgid "ffmpeg_video_dec: couldn't open decoder\n"
+msgstr "ffmpeg_video_dec: Konnte Dekoder nicht öffnen\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:334
-msgid "libmusepack: mpc_decoder_initialise failed\n"
-msgstr "libmusepack: mpc_decoder_initialise schlug fehl\n"
+#: src/libffmpeg/ff_video_decoder.c:397
+msgid "ffmpeg_video_dec: direct rendering enabled\n"
+msgstr "ffmpeg_video_dec: Direktausgabe aktiviert\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:354
-#: src/libxineadec/xine_musepack_decoder.c:369
+#: src/libffmpeg/ff_video_decoder.c:816
 #, c-format
-msgid "libmusepack: mpc_decoder_decode failed: %d\n"
-msgstr "libmusepack: mpc_decoder_decode schlug fehl: %d\n"
+msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+msgstr "ffmpeg_video_dec: Vergrößere Puffer auf %d um Überlauf zu vermeiden.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:1519
+msgid "MPEG-4 postprocessing quality"
+msgstr "Qualität der MPEG-4 Nachbearbeitungsstufe"
+
+#: src/libffmpeg/ff_video_decoder.c:1520
+msgid ""
+"You can adjust the amount of post processing applied to MPEG-4 video.\n"
+"Higher values result in better quality, but need more CPU. Lower values may "
+"result in image defects like block artifacts. For high quality content, too "
+"heavy post processing can actually make the image worse by blurring it too "
+"much."
+msgstr ""
+"Die Umfang der Nachbearbeitung bei MPEG-4 Videos kann angepasst werden.\n"
+"Höhere Werte verwessern die Qualität zu Lasten der CPU-Belastunga. Niedrige "
+"Werte können zu Defekten wie Artefakte führen. Bei hochqualitativen Inhalten "
+"kann zu starke Nachbearbeitung das Bild durch zu starkes verwischen "
+"verschlechtern."
 
 #: src/libreal/real_common.c:107
 msgid "path to RealPlayer codecs"
@@ -2859,10 +2785,6 @@ msgstr ""
 "Konsultieren Sie die xine FAQ für weitere Informationen, wie die Codecs zu "
 "installieren sind."
 
-#: src/libreal/xine_real_video_decoder.c:164
-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
-msgstr "libreal: Kann Symbole nicht auflösen! (Version inkompatibel?)\n"
-
 #: src/libreal/xine_real_audio_decoder.c:130
 #, c-format
 msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
@@ -2883,6 +2805,10 @@ msgstr ""
 msgid "libareal: oups, real can do more than 2 channels ?\n"
 msgstr "libareal: Ups, Real ünterstützt mehr als 2 Kanäle?\n"
 
+#: src/libreal/xine_real_video_decoder.c:164
+msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+msgstr "libreal: Kann Symbole nicht auflösen! (Version inkompatibel?)\n"
+
 #: src/libspucc/xine_cc_decoder.c:192
 msgid "display closed captions in MPEG-2 streams"
 msgstr "Untertitel in MEPG-2-Strömen anzeigen"
@@ -3124,6 +3050,89 @@ msgstr "w32codec: Fehler beim Initialisieren von DirectShow Audio\n"
 msgid "w32codec: Error initializing DMO Audio\n"
 msgstr "w32codec: Fehler beim Initialisieren von DMO Audio\n"
 
+#: src/libxineadec/xine_a52_decoder.c:742
+#: src/libxineadec/xine_dts_decoder.c:524
+msgid "HELP! a mono-only audio driver?!\n"
+msgstr "HILFE! Ein nur-Mono-Audiogerät?!\n"
+
+#: src/libxineadec/xine_a52_decoder.c:805
+msgid "A/52 volume"
+msgstr "A/52 Lautstärke"
+
+#: src/libxineadec/xine_a52_decoder.c:806
+msgid ""
+"With A/52 audio, you can modify the volume at the decoder level. This has "
+"the advantage of the audio being already decoded for the specified volume, "
+"so later operations like channel downmixing will work on an audio stream of "
+"the given volume."
+msgstr ""
+"Mit A/52 Audio kann die Lautstärke auf Dekoderebene verändert werden. Dies "
+"hat den Vorteil, daß die Audiodaten bereits für die spezifische Lautstärke "
+"dekodiert sind und nachfolgende Operationen wie Heruntermischen direkt mit "
+"diesen Audiodaten arbeiten können."
+
+#: src/libxineadec/xine_a52_decoder.c:814
+msgid "use A/52 dynamic range compression"
+msgstr "Benutze dynamische A/52 Bereichskomprimierung"
+
+#: src/libxineadec/xine_a52_decoder.c:815
+msgid ""
+"Dynamic range compression limits the dynamic range of the audio. This means "
+"making the loud sounds softer, and the soft sounds louder, so you can more "
+"easily listen to the audio in a noisy environment without disturbing anyone."
+msgstr ""
+"Dynamische Bereichskomprimierung reduziert den dynamischen Bereich des Tons: "
+"Laute Geräusche klingen leiser und leise Geräusche klingen lauter. Dies "
+"ermöglicht ein besseres Verständnis des Tons in lauten Umgebungen, ohne "
+"dabei andere zu stören."
+
+#: src/libxineadec/xine_a52_decoder.c:822
+msgid "downmix audio to 2 channel surround stereo"
+msgstr "Heruntermischen zu Zweikanal Stereo Raumklang"
+
+#: src/libxineadec/xine_a52_decoder.c:823
+msgid ""
+"When you want to listen to multichannel surround sound, but you have only "
+"two speakers or a surround decoder or amplifier which does some sort of "
+"matrix surround decoding like prologic, you should enable this option so "
+"that the additional channels are mixed into the stereo signal."
+msgstr ""
+"Aktivieren sie dies, falls Sie Mehrkanal-Raumklang anhören wollen, aber nur "
+"zwei Lautsprecher oder einen Surround-Dekodierer haben, der Matrix-Surround-"
+"Dekodierung wie ProLogic unterstützt, damit die zusätzlichen Kanäle in das "
+"Stereo-Signal gemixt werden."
+
+#: src/libxineadec/xine_faad_decoder.c:130
+msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
+msgstr "libfaad: libfaad NeAACDecOpen() schlug fehl.\n"
+
+#: src/libxineadec/xine_faad_decoder.c:139
+msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
+msgstr "libfaad: libfaad NeAACDecInit2 schlug fehl.\n"
+
+#: src/libxineadec/xine_faad_decoder.c:150
+msgid "libfaad: libfaad NeAACDecInit failed.\n"
+msgstr "libfaad: libfaad NeAACDecInit schlug fehl.\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:249
+#, c-format
+msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+msgstr "libmusepack: mpc_streaminfo_read schlug fehl: %d\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:323
+msgid "libmusepack: data after last frame ignored\n"
+msgstr "libmusepack: Daten nach letzem Bild ignoriert\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:334
+msgid "libmusepack: mpc_decoder_initialise failed\n"
+msgstr "libmusepack: mpc_decoder_initialise schlug fehl\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:354
+#: src/libxineadec/xine_musepack_decoder.c:369
+#, c-format
+msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgstr "libmusepack: mpc_decoder_decode schlug fehl: %d\n"
+
 #: src/libxinevdec/bitplane.c:1272
 #, c-format
 msgid "bitplane: error doing ByteRun1 decompression\n"
@@ -3449,34 +3458,6 @@ msgstr ""
 "\n"
 "* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
 
-#: src/post/planar/eq.c:186
-msgid ""
-"Software equalizer with interactive controls just like the hardware "
-"equalizer, for cards/drivers that do not support brightness and contrast "
-"controls in hardware.\n"
-"\n"
-"Parameters\n"
-"  brightness\n"
-"  contrast\n"
-"\n"
-"Note: It is possible to use frontend's control window to set these "
-"parameters.\n"
-"\n"
-"* mplayer's eq (C) Richard Felker\n"
-msgstr ""
-"Software-Equalizer mit interaktiver Steuerung ähnlich Hardware-Equalizer für "
-"solche Karten/Treiber, die keine Helligkeits-/Kontraststeuerung in Hardware "
-"besitzen.\n"
-"\n"
-"Parameters\n"
-"  brightness: Helligkeit\n"
-"  contrast: Kontrast\n"
-"\n"
-"Hinweis: Es kann das Kontrollfenster der Bedienoberfläche benutzt werden, um "
-"diese Parameter zu setzen.\n"
-"\n"
-"* mplayer's eq (C) Richard Felker\n"
-
 #: src/post/planar/eq2.c:359
 msgid ""
 "Alternative software equalizer that uses lookup tables (very slow), allowing "
@@ -3520,6 +3501,34 @@ msgstr ""
 "\n"
 "* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
 
+#: src/post/planar/eq.c:186
+msgid ""
+"Software equalizer with interactive controls just like the hardware "
+"equalizer, for cards/drivers that do not support brightness and contrast "
+"controls in hardware.\n"
+"\n"
+"Parameters\n"
+"  brightness\n"
+"  contrast\n"
+"\n"
+"Note: It is possible to use frontend's control window to set these "
+"parameters.\n"
+"\n"
+"* mplayer's eq (C) Richard Felker\n"
+msgstr ""
+"Software-Equalizer mit interaktiver Steuerung ähnlich Hardware-Equalizer für "
+"solche Karten/Treiber, die keine Helligkeits-/Kontraststeuerung in Hardware "
+"besitzen.\n"
+"\n"
+"Parameters\n"
+"  brightness: Helligkeit\n"
+"  contrast: Kontrast\n"
+"\n"
+"Hinweis: Es kann das Kontrollfenster der Bedienoberfläche benutzt werden, um "
+"diese Parameter zu setzen.\n"
+"\n"
+"* mplayer's eq (C) Richard Felker\n"
+
 #: src/post/planar/expand.c:251
 msgid ""
 "The expand plugin is meant to take frames of arbitrary aspect ratio and "
@@ -3646,6 +3655,65 @@ msgstr ""
 "\n"
 "* mplayer's unsharp (C) 2002 Rémi Guyomarch\n"
 
+#: src/vdr/input_vdr.c:183 src/vdr/input_vdr.c:223 src/vdr/input_vdr.c:2297
+#: src/vdr/input_vdr.c:2394
+#, fuzzy, c-format
+msgid ": input event write: %s.\n"
+msgstr "input_rip: Positionierung fehlgeschlagen: %s\n"
+
+#: src/vdr/input_vdr.c:713 src/vdr/input_vdr.c:1137
+msgid ": buffer_pool_alloc() failed!\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:782
+#, c-format
+msgid ": flush buffers (vb: %d, ab: %d, vf: %d, af: %d) %s.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1475
+#, c-format
+msgid ": shutting down rpc thread (timeout: %d ms) ...\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1499
+#, fuzzy, c-format
+msgid ": cancelling rpc thread in function %d...\n"
+msgstr ": Kann PThread-Bedingung nicht erzeugen: %s\n"
+
+#: src/vdr/input_vdr.c:1506
+#, fuzzy
+msgid ": joining rpc thread ...\n"
+msgstr "RTP: Stoppe Lese-Thread...\n"
+
+#: src/vdr/input_vdr.c:1508
+#, fuzzy
+msgid ": rpc thread joined.\n"
+msgstr "RTP: Lese-Thread terminiert\n"
+
+#: src/vdr/input_vdr.c:2137 src/vdr/input_vdr.c:2151 src/vdr/input_vdr.c:2169
+#: src/vdr/input_vdr.c:2190 src/vdr/input_vdr.c:2211
+#, fuzzy, c-format
+msgid ": failed to open '%s' (%s)\n"
+msgstr "Standardeingabe: Öffnen von '%s' schlug fehl\n"
+
+#: src/vdr/input_vdr.c:2153
+msgid "timeout expired during setup phase"
+msgstr ""
+
+#: src/vdr/input_vdr.c:2227
+#, fuzzy, c-format
+msgid ": can't create new thread (%s)\n"
+msgstr "demux_ts: Kann neuen Thread (%s) nicht erzeugen\n"
+
+#: src/vdr/input_vdr.c:2487
+msgid "VDR display device plugin"
+msgstr ""
+
+#: src/vdr/post_vdr_video.c:435
+#, c-format
+msgid ": osd: (%d, %d)-(%d, %d)@%lg\n"
+msgstr ""
+
 #: src/video_out/video_out_aa.c:311
 msgid "xine video output plugin using the ascii-art library"
 msgstr "xine Videoausgabe benutzt ASCII-Art Bibliothek"
@@ -3954,8 +4022,8 @@ msgstr ""
 "Ignoriert für statische Renderroutinen.\n"
 
 #: src/video_out/video_out_opengl.c:1918 src/video_out/video_out_vidix.c:1015
-#: src/video_out/video_out_xcbxv.c:1476 src/video_out/video_out_xv.c:1489
-#: src/video_out/video_out_xvmc.c:1461 src/video_out/video_out_xxmc.c:2465
+#: src/video_out/video_out_xcbxv.c:1304 src/video_out/video_out_xv.c:1359
+#: src/video_out/video_out_xvmc.c:1423 src/video_out/video_out_xxmc.c:2531
 msgid "enable double buffering"
 msgstr "Doppelpufferung benutzen"
 
@@ -4044,9 +4112,9 @@ msgstr ""
 msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
 msgstr "video_out_pgx64: Fehler: ioctl(FBIOGATTR) schlug fehl\n"
 
-#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1443
-#: src/video_out/video_out_xv.c:1456 src/video_out/video_out_xvmc.c:1446
-#: src/video_out/video_out_xxmc.c:2432
+#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1271
+#: src/video_out/video_out_xv.c:1326 src/video_out/video_out_xvmc.c:1408
+#: src/video_out/video_out_xxmc.c:2498
 msgid "video overlay colour key"
 msgstr "Farbschlüssel für Overlay"
 
@@ -4220,9 +4288,9 @@ msgstr "Blau-Intensität"
 msgid "The intensity of the blue colour components."
 msgstr "Die Intensität blauer Farbanteile"
 
-#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1477
-#: src/video_out/video_out_xv.c:1490 src/video_out/video_out_xvmc.c:1462
-#: src/video_out/video_out_xxmc.c:2466
+#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1305
+#: src/video_out/video_out_xv.c:1360 src/video_out/video_out_xvmc.c:1424
+#: src/video_out/video_out_xxmc.c:2532
 msgid ""
 "Double buffering will synchronize the update of the video image to the "
 "repainting of the entire screen (\"vertical retrace\"). This eliminates "
@@ -4258,9 +4326,9 @@ msgid "video overlay colour key red component"
 msgstr "Rot-Komponente des Farbschlüssels für Overlays"
 
 #: src/video_out/video_out_vidix.c:1159 src/video_out/video_out_vidix.c:1166
-#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1444
-#: src/video_out/video_out_xv.c:1457 src/video_out/video_out_xvmc.c:1447
-#: src/video_out/video_out_xxmc.c:2433
+#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1272
+#: src/video_out/video_out_xv.c:1327 src/video_out/video_out_xvmc.c:1409
+#: src/video_out/video_out_xxmc.c:2499
 msgid ""
 "The colour key is used to tell the graphics card where to overlay the video "
 "image. Try different values, if you experience windows becoming transparent."
@@ -4291,13 +4359,13 @@ msgid "%s: %s: allocating image\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbshm.c:159 src/video_out/video_out_xcbshm.c:169
-#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:272
-#: src/video_out/video_out_xcbxv.c:282 src/video_out/video_out_xcbxv.c:292
-#: src/video_out/video_out_xcbxv.c:304 src/video_out/video_out_xshm.c:204
+#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:267
+#: src/video_out/video_out_xcbxv.c:277 src/video_out/video_out_xcbxv.c:287
+#: src/video_out/video_out_xcbxv.c:299 src/video_out/video_out_xshm.c:204
 #: src/video_out/video_out_xshm.c:221 src/video_out/video_out_xshm.c:232
-#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:296
-#: src/video_out/video_out_xv.c:307 src/video_out/video_out_xv.c:316
-#: src/video_out/video_out_xv.c:352 src/video_out/video_out_xxmc.c:648
+#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:295
+#: src/video_out/video_out_xv.c:322 src/video_out/video_out_xv.c:331
+#: src/video_out/video_out_xv.c:367 src/video_out/video_out_xxmc.c:648
 #: src/video_out/video_out_xxmc.c:659 src/video_out/video_out_xxmc.c:668
 #: src/video_out/video_out_xxmc.c:704
 #, fuzzy, c-format
@@ -4311,8 +4379,8 @@ msgstr ""
 "video_out_xshm: Shared-Memory-Fehler (Adressfehler) beim Belegen des Bilds\n"
 "video_out_xshm: => MIT-Shared-Memory-Erweiterung wird nicht genutzt.\n"
 
-#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:302
-#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:350
+#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:297
+#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:365
 #: src/video_out/video_out_xxmc.c:702
 #, c-format
 msgid "%s: x11 error during shared memory XImage creation\n"
@@ -4347,31 +4415,31 @@ msgstr "video_out_fb: Ihr Videomodues wurde nicht erkannt, Entschuldigung.\n"
 msgid "xine video output plugin using the MIT X shared memory extension"
 msgstr "xine Videoausgabe benutzt 'MIX X Shared Memory' Erweiterung"
 
-#: src/video_out/video_out_xcbxv.c:270 src/video_out/video_out_xv.c:305
+#: src/video_out/video_out_xcbxv.c:265 src/video_out/video_out_xv.c:320
 #: src/video_out/video_out_xxmc.c:657
 #, c-format
 msgid "%s: XvShmCreateImage returned a zero size\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:280 src/video_out/video_out_xv.c:314
+#: src/video_out/video_out_xcbxv.c:275 src/video_out/video_out_xv.c:329
 #: src/video_out/video_out_xxmc.c:666
 #, c-format
 msgid "%s: shared memory error in shmget: %s\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:290
+#: src/video_out/video_out_xcbxv.c:285
 #, c-format
 msgid "%s: shared memory error (address error)\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1294 src/video_out/video_out_xv.c:1301
-#: src/video_out/video_out_xxmc.c:2283
+#: src/video_out/video_out_xcbxv.c:1125 src/video_out/video_out_xv.c:1174
+#: src/video_out/video_out_xxmc.c:2349
 #, fuzzy, c-format
 msgid "%s: Xv extension not present.\n"
 msgstr "video_out_xv: Xv-Erweiterung nicht vorhanden.\n"
 
-#: src/video_out/video_out_xcbxv.c:1336 src/video_out/video_out_xv.c:1338
-#: src/video_out/video_out_xxmc.c:2320
+#: src/video_out/video_out_xcbxv.c:1167 src/video_out/video_out_xv.c:1211
+#: src/video_out/video_out_xxmc.c:2386
 #, fuzzy, c-format
 msgid ""
 "%s: Xv extension is present but I couldn't find a usable yuv12 port.\n"
@@ -4381,7 +4449,7 @@ msgstr ""
 "YUV12-Port gefunden.\n"
 "              Unterstützt die Grafikhardware evtl. kein Xv?!\n"
 
-#: src/video_out/video_out_xcbxv.c:1345
+#: src/video_out/video_out_xcbxv.c:1176
 #, fuzzy, c-format
 msgid ""
 "%s: using Xv port %d from adaptor %s for hardware colorspace conversion and "
@@ -4390,23 +4458,23 @@ msgstr ""
 "video_out_xv: Benutze Xv-Port %ld von Adapter %s for Hardware-"
 "Farbraumtransformation und Skalierung.\n"
 
-#: src/video_out/video_out_xcbxv.c:1452 src/video_out/video_out_xv.c:1465
-#: src/video_out/video_out_xvmc.c:1455 src/video_out/video_out_xxmc.c:2441
+#: src/video_out/video_out_xcbxv.c:1280 src/video_out/video_out_xv.c:1335
+#: src/video_out/video_out_xvmc.c:1417 src/video_out/video_out_xxmc.c:2507
 msgid "autopaint colour key"
 msgstr "automatischer Farbschlüssel"
 
-#: src/video_out/video_out_xcbxv.c:1453 src/video_out/video_out_xv.c:1466
-#: src/video_out/video_out_xvmc.c:1456 src/video_out/video_out_xxmc.c:2442
+#: src/video_out/video_out_xcbxv.c:1281 src/video_out/video_out_xv.c:1336
+#: src/video_out/video_out_xvmc.c:1418 src/video_out/video_out_xxmc.c:2508
 msgid "Make Xv autopaint its colorkey."
 msgstr "Veranlasst Xv automatisch den Farbschlüssel zu zeichnen."
 
-#: src/video_out/video_out_xcbxv.c:1460 src/video_out/video_out_xv.c:1473
-#: src/video_out/video_out_xxmc.c:2449
+#: src/video_out/video_out_xcbxv.c:1288 src/video_out/video_out_xv.c:1343
+#: src/video_out/video_out_xxmc.c:2515
 msgid "bilinear scaling mode"
 msgstr "Bilinearer Skalierungsmodus"
 
-#: src/video_out/video_out_xcbxv.c:1461 src/video_out/video_out_xv.c:1474
-#: src/video_out/video_out_xxmc.c:2450
+#: src/video_out/video_out_xcbxv.c:1289 src/video_out/video_out_xv.c:1344
+#: src/video_out/video_out_xxmc.c:2516
 msgid ""
 "Selects the bilinear scaling mode for Permedia cards. The individual values "
 "are:\n"
@@ -4432,107 +4500,30 @@ msgstr ""
 "1 - horizontales lineares Filtern\n"
 "2 - aktiviert volles bilineares Filtern"
 
-#: src/video_out/video_out_xcbxv.c:1513 src/video_out/video_out_xv.c:1523
-#: src/video_out/video_out_xxmc.c:2506
+#: src/video_out/video_out_xcbxv.c:1341 src/video_out/video_out_xv.c:1393
+#: src/video_out/video_out_xxmc.c:2572
 #, fuzzy, c-format
 msgid "%s: this adaptor supports the yv12 format.\n"
 msgstr "video_out_xv: Adapter unterstützt YV12 Format.\n"
 
-#: src/video_out/video_out_xcbxv.c:1518 src/video_out/video_out_xv.c:1528
-#: src/video_out/video_out_xxmc.c:2511
+#: src/video_out/video_out_xcbxv.c:1346 src/video_out/video_out_xv.c:1398
+#: src/video_out/video_out_xxmc.c:2577
 #, fuzzy, c-format
 msgid "%s: this adaptor supports the yuy2 format.\n"
 msgstr "video_out_xv: Adapter unterstützt YUY2 Format.\n"
 
-#: src/video_out/video_out_xcbxv.c:1526 src/video_out/video_out_xv.c:1550
-#: src/video_out/video_out_xxmc.c:2534
+#: src/video_out/video_out_xcbxv.c:1354 src/video_out/video_out_xv.c:1420
+#: src/video_out/video_out_xxmc.c:2600
 msgid "pitch alignment workaround"
 msgstr "pitch alignment Abhilfe"
 
-#: src/video_out/video_out_xcbxv.c:1527 src/video_out/video_out_xv.c:1551
-#: src/video_out/video_out_xxmc.c:2535
+#: src/video_out/video_out_xcbxv.c:1355 src/video_out/video_out_xv.c:1421
+#: src/video_out/video_out_xxmc.c:2601
 msgid "Some buggy video drivers need a workaround to function properly."
 msgstr "Einige fehlerhafte Videotreiber benötigen dies zur korrekten Funktion."
 
-#: src/video_out/video_out_xcbxv.c:1533 src/video_out/video_out_xv.c:1557
-#: src/video_out/video_out_xvmc.c:1524
-msgid "deinterlace method (deprecated)"
-msgstr "Deinterlace-Methode (veraltet)"
-
-#: src/video_out/video_out_xcbxv.c:1534 src/video_out/video_out_xv.c:1558
-#: src/video_out/video_out_xvmc.c:1525
-msgid ""
-"This config setting is deprecated. You should use the new deinterlacing post "
-"processing settings instead.\n"
-"\n"
-"From the old days of analog television, where the even and odd numbered "
-"lines of a video frame would be displayed at different times comes the idea "
-"to increase motion smoothness by also recording the lines at different "
-"times. This is called \"interlacing\". But unfortunately, todays displays "
-"show the even and odd numbered lines as one complete frame all at the same "
-"time (called \"progressive display\"), which results in ugly frame errors "
-"known as comb artifacts. Software deinterlacing is an approach to reduce "
-"these artifacts. The individual values are:\n"
-"\n"
-"none\n"
-"Disables software deinterlacing.\n"
-"\n"
-"bob\n"
-"Interpolates between the lines for moving parts of the image.\n"
-"\n"
-"weave\n"
-"Similar to bob, but with a tendency to preserve the full resolution, better "
-"for high detail in low movement scenes.\n"
-"\n"
-"greedy\n"
-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
-"\n"
-"onefield\n"
-"Always interpolates and reduces vertical resolution.\n"
-"\n"
-"onefieldxv\n"
-"Same as onefield, but does the interpolation in hardware.\n"
-"\n"
-"linearblend\n"
-"Applies a slight vertical blur to remove the comb artifacts. Good results "
-"with medium CPU usage."
-msgstr ""
-"Die Konfigurationseinstellung ist veraltet; Sie sollten stattdessen die "
-"Einstellungen der Deinterlacing Nachbearbeitung verwenden.\n"
-"\n"
-"In den Anfangstagen des analogen Fernsehens wurden die geraden und ungeraden "
-"Zeilen des Videobildes zu verschiedenen Zeiten aufgenommen und angezeigt, um "
-"Bewegungen flüssiger darzustellen. Dies nennt man \"interlacing\". "
-"Unglücklicherweise zeigen heutige Bildschirme sowohl gerade und ungerade "
-"Zeilen immer gleichzeitig als vollständiges Bild an, genannt \"progressiv\", "
-"was zu Kammartefakten genannten Bildfehlern führt. Softwareinterlacing ist "
-"ein Ansatz, diese Artefakte zu reduzieren. Die Werte bedeuten:\n"
-"\n"
-"none\n"
-"Deaktiviert Softwaredeinterlacing.\n"
-"\n"
-"bob\n"
-"Interpoliert zwischen den Linien in bewegten Teilen des Bildes.\n"
-"\n"
-"weave\n"
-"Ähnlich wie bob, mit der Tendez, die volle Auflösung zu erhalten, besser für "
-"hohe Details in Szenen mit wenig Bewegung.\n"
-"\n"
-"greedy\n"
-"Sehr guter adaptiver Deinterlacer, der aber viel CPU-Leistung benötigt.\n"
-"\n"
-"onefield\n"
-"Interpoliert immer und reduziert die vertikale Auflösung.\n"
-"\n"
-"onefieldxv\n"
-"Wie onefield, benutzt aber die Hardware zur Interpolation.\n"
-"\n"
-"linearblend\n"
-"Verwischt das Bild vertikal, um Kammartefakte zu entfernen. Gute Resultate "
-"bei mittlerer CPU-Auslastung."
-
-#: src/video_out/video_out_xcbxv.c:1588 src/video_out/video_out_xv.c:1631
-#: src/video_out/video_out_xxmc.c:2615
+#: src/video_out/video_out_xcbxv.c:1383 src/video_out/video_out_xv.c:1468
+#: src/video_out/video_out_xxmc.c:2681
 msgid "xine video output plugin using the MIT X video extension"
 msgstr "xine Videoausgabe benutzt 'MIX XVideo' Erweiterung"
 
@@ -4541,12 +4532,12 @@ msgstr "xine Videoausgabe benutzt 'MIX XVideo' Erweiterung"
 msgid "%s: shared memory error when allocating image\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:294 src/video_out/video_out_xxmc.c:646
+#: src/video_out/video_out_xv.c:293 src/video_out/video_out_xxmc.c:646
 #, c-format
 msgid "%s: XvShmCreateImage failed\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1348 src/video_out/video_out_xxmc.c:2330
+#: src/video_out/video_out_xv.c:1221 src/video_out/video_out_xxmc.c:2396
 #, fuzzy, c-format
 msgid ""
 "%s: using Xv port %ld from adaptor %s for hardware colorspace conversion and "
@@ -4555,15 +4546,15 @@ msgstr ""
 "video_out_xv: Benutze Xv-Port %ld von Adapter %s for Hardware-"
 "Farbraumtransformation und Skalierung.\n"
 
-#: src/video_out/video_out_xvmc.c:1593
+#: src/video_out/video_out_xvmc.c:1496
 msgid "xine video output plugin using the XvMC X video extension"
 msgstr "xine Videoausgabe benutzt XvMC XVideo-Erweiterung"
 
-#: src/video_out/video_out_xvmc.c:1639
+#: src/video_out/video_out_xvmc.c:1542
 msgid "video_out_xvmc: XvMC extension not present.\n"
 msgstr "video_out_xvmc: XvMC-Erweiterung nicht vorhanden.\n"
 
-#: src/video_out/video_out_xvmc.c:1737
+#: src/video_out/video_out_xvmc.c:1640
 msgid ""
 "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
 "port.\n"
@@ -4571,7 +4562,7 @@ msgstr ""
 "video_out_xvmc: Xv-Erweiterung ist vorhanden, aber es wurde kein benutzparer "
 "YUV12-Port gefunden.\n"
 
-#: src/video_out/video_out_xvmc.c:1746
+#: src/video_out/video_out_xvmc.c:1649
 #, c-format
 msgid ""
 "video_out_xvmc: using Xv port %ld from adaptor %s\n"
@@ -4580,28 +4571,28 @@ msgstr ""
 "video_out_xvmc: Benutze Xv-Port %ld von Adapter %s for Hardware-"
 "Farbraumtransformation und Skalierung\n"
 
-#: src/video_out/video_out_xvmc.c:1751
+#: src/video_out/video_out_xvmc.c:1654
 msgid "                idct and motion compensation acceleration \n"
 msgstr "                IDCT und Bewegungskompensationsbeschleunigung \n"
 
-#: src/video_out/video_out_xvmc.c:1753
+#: src/video_out/video_out_xvmc.c:1656
 msgid "                motion compensation acceleration only\n"
 msgstr "                nur Bewegungskompensationsbeschleunigung\n"
 
-#: src/video_out/video_out_xvmc.c:1755
+#: src/video_out/video_out_xvmc.c:1658
 msgid "                no XvMC support \n"
 msgstr "                Keine XvMC-Unterstützung \n"
 
-#: src/video_out/video_out_xvmc.c:1756
+#: src/video_out/video_out_xvmc.c:1659
 #, c-format
 msgid "                With Overlay = %d; UnsignedIntra = %d.\n"
 msgstr "                Mit Ãœberlagerung = %d; UnsignedIntra = %d.\n"
 
-#: src/video_out/video_out_xxmc.c:2540
+#: src/video_out/video_out_xxmc.c:2606
 msgid "Make XvMC allocate more frames for better buffering."
 msgstr "XvMC belegt zur besseren Pufferung mehr Bildspeicher."
 
-#: src/video_out/video_out_xxmc.c:2541
+#: src/video_out/video_out_xxmc.c:2607
 msgid ""
 "Some XvMC implementations allow more than 8 frames.\n"
 "This option, when turned on, makes the driver try to\n"
@@ -4611,11 +4602,11 @@ msgstr ""
 "Diese Option, wenn ausgewählt, veranlasst den Treiber 15\n"
 "Bilder zu belegen. Ein Muß für Unichrome oder live VDR.\n"
 
-#: src/video_out/video_out_xxmc.c:2547
+#: src/video_out/video_out_xxmc.c:2613
 msgid "Unichrome cpu save"
 msgstr "Unichrome Prozessorschoner"
 
-#: src/video_out/video_out_xxmc.c:2548
+#: src/video_out/video_out_xxmc.c:2614
 msgid ""
 "Saves CPU time by sleeping while decoder works.\n"
 "Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n"
@@ -4626,11 +4617,11 @@ msgstr ""
 "Patch.\n"
 "Experimentell.\n"
 
-#: src/video_out/video_out_xxmc.c:2554
+#: src/video_out/video_out_xxmc.c:2620
 msgid "Fix buggy NVIDIA XvMC subpicture colors"
 msgstr "Behebe NVIDIA XvMV Subpicture-Farbfehler"
 
-#: src/video_out/video_out_xxmc.c:2555
+#: src/video_out/video_out_xxmc.c:2621
 msgid ""
 "There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
 "look blue and vice versa. This option provides a workaround.\n"
@@ -4639,11 +4630,11 @@ msgstr ""
 "blau darstellt und umgekehrt. Diese Option liefert eine provisorische "
 "Lösung.\n"
 
-#: src/video_out/video_out_xxmc.c:2560
+#: src/video_out/video_out_xxmc.c:2626
 msgid "Use bob as accelerated deinterlace method."
 msgstr "Benutze BOB als beschleunigte Deinterlacingmethode."
 
-#: src/video_out/video_out_xxmc.c:2561
+#: src/video_out/video_out_xxmc.c:2627
 msgid ""
 "When interlacing is enabled for hardware accelerated frames,\n"
 "Alternate between top and bottom field at double the frame rate.\n"
@@ -4674,11 +4665,11 @@ msgstr ""
 msgid "x11osd: unscaled overlay created (%s mode).\n"
 msgstr "x11osd: Unskaliertes Overlay erzeugt (%s Modus).\n"
 
-#: src/xine-engine/alphablend.c:2123
+#: src/xine-engine/alphablend.c:2146
 msgid "disable exact alpha blending of overlays"
 msgstr "Deaktiviert exaktes Alphaüberblendn bei Overlays"
 
-#: src/xine-engine/alphablend.c:2124
+#: src/xine-engine/alphablend.c:2147
 msgid ""
 "If you experience a performance impact when an On Screen Display or other "
 "overlays like DVD subtitles are active, then you might want to enable this "
@@ -5304,21 +5295,21 @@ msgstr ""
 "Färbung spezifizieren. Die Paletten sind in der Form Vordergrund-Rand-"
 "Hintergrund aufgelistst."
 
-#: src/xine-engine/video_decoder.c:380
+#: src/xine-engine/video_decoder.c:390
 #, c-format
 msgid "video_decoder: no plugin available to handle '%s'\n"
 msgstr "video_decoder: Kein Plugin gefunden zur Behandlung von '%s'\n"
 
-#: src/xine-engine/video_decoder.c:459
+#: src/xine-engine/video_decoder.c:469
 #, c-format
 msgid "video_decoder: error, unknown buffer type: %08x\n"
 msgstr "video_decoder: Fehler, unbekannter Puffertyp: %08x\n"
 
-#: src/xine-engine/video_decoder.c:495
+#: src/xine-engine/video_decoder.c:505
 msgid "number of video buffers"
 msgstr "Anzahl der Videopuffer"
 
-#: src/xine-engine/video_decoder.c:496
+#: src/xine-engine/video_decoder.c:506
 msgid ""
 "The number of video buffers (each is 8k in size) xine uses in its internal "
 "queue. Higher values mean smoother playback for unreliable inputs, but also "
@@ -5329,12 +5320,12 @@ msgstr ""
 "unzuverlässigen Quellen, erhöhen aber auch die Latenzzeit und den "
 "Speicherverbrauch."
 
-#: src/xine-engine/video_out.c:642
+#: src/xine-engine/video_out.c:671
 #, c-format
 msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
 msgstr "%d Bilder angezeigt, %d Bilder übersprungen, %d Bilder verworfen\n"
 
-#: src/xine-engine/video_out.c:815
+#: src/xine-engine/video_out.c:844
 #, c-format
 msgid ""
 "video_out: throwing away image with pts %<PRId64> because it's too old "
@@ -5343,11 +5334,11 @@ msgstr ""
 "video_out: Verwerfe Bild mit pts %<PRId64>, weil es zu alt ist (Unterschied: "
 "%<PRId64>).\n"
 
-#: src/xine-engine/video_out.c:1794
+#: src/xine-engine/video_out.c:1863
 msgid "default number of video frames"
 msgstr "Standardanzahl von Videobildern"
 
-#: src/xine-engine/video_out.c:1795
+#: src/xine-engine/video_out.c:1864
 msgid ""
 "The default number of video frames to request from xine video out driver. "
 "Some drivers will override this setting with their own values."
@@ -5356,11 +5347,11 @@ msgstr ""
 "angefordert werden. Einige Treiber überschreiben diese Einstellung mit ihren "
 "eigenen Werten."
 
-#: src/xine-engine/video_out.c:1834
+#: src/xine-engine/video_out.c:1921
 msgid "percentage of skipped frames to tolerate"
 msgstr "Erlaubter Prozentsatz für übersprungene Frames"
 
-#: src/xine-engine/video_out.c:1835
+#: src/xine-engine/video_out.c:1922
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not decoded in time, xine sends a notification."
@@ -5368,11 +5359,11 @@ msgstr ""
 "xine zeigt eine Meldung an, wenn mehr Frames als dieser Prozentsatz nicht "
 "angezeigt werden, weil sie nicht rechtzeitig dekodiert werden konnten."
 
-#: src/xine-engine/video_out.c:1840
+#: src/xine-engine/video_out.c:1927
 msgid "percentage of discarded frames to tolerate"
 msgstr "Erlaubter Prozentsatz für verworfene Frames"
 
-#: src/xine-engine/video_out.c:1841
+#: src/xine-engine/video_out.c:1928
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not scheduled for display in time, xine sends a notification."
@@ -5380,7 +5371,7 @@ msgstr ""
 "xine zeigt eine Meldung an, wenn mehr Frames als dieser Prozentsatz nicht "
 "angezeigt werden, weil sie nicht rechtzeitig dargestellt werden konnten."
 
-#: src/xine-engine/video_out.c:1875
+#: src/xine-engine/video_out.c:1965
 msgid "video_out: sorry, this should not happen. please restart xine.\n"
 msgstr ""
 "video_out : Ups, das sollte eigentlich nicht passieren, bitte xine "
@@ -5442,127 +5433,127 @@ msgstr ""
 "einige Videoausgabetreiber wie XShm davon, deren Bildskalierung nicht "
 "hardwarebeschleunigt ist, wodurch die CPU-Auslastung drastisch sinkt."
 
-#: src/xine-engine/xine.c:706 src/xine-engine/xine.c:813
-#: src/xine-engine/xine.c:852 src/xine-engine/xine.c:888
-#: src/xine-engine/xine.c:900 src/xine-engine/xine.c:913
-#: src/xine-engine/xine.c:926 src/xine-engine/xine.c:939
-#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:990
-#: src/xine-engine/xine.c:1025
+#: src/xine-engine/xine.c:771 src/xine-engine/xine.c:878
+#: src/xine-engine/xine.c:917 src/xine-engine/xine.c:953
+#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:978
+#: src/xine-engine/xine.c:991 src/xine-engine/xine.c:1004
+#: src/xine-engine/xine.c:1030 src/xine-engine/xine.c:1055
+#: src/xine-engine/xine.c:1090
 msgid "xine: error while parsing mrl\n"
 msgstr "xine: Fehler beim Parsen der MRL\n"
 
-#: src/xine-engine/xine.c:742
+#: src/xine-engine/xine.c:807
 #, c-format
 msgid "xine: found input plugin  : %s\n"
 msgstr "xine: Inputplugin gefunden: %s\n"
 
-#: src/xine-engine/xine.c:760
+#: src/xine-engine/xine.c:825
 #, c-format
 msgid "xine: input plugin cannot open MRL [%s]\n"
 msgstr "xine: Plugin kann MRL [%s] nicht öffnen\n"
 
-#: src/xine-engine/xine.c:776
+#: src/xine-engine/xine.c:841
 #, c-format
 msgid "xine: cannot find input plugin for MRL [%s]\n"
 msgstr "xine: Kann kein Plugin für MRL [%s] finden\n"
 
-#: src/xine-engine/xine.c:802
+#: src/xine-engine/xine.c:867
 #, c-format
 msgid "xine: specified demuxer %s failed to start\n"
 msgstr "xine: Demultiplexer-Plugins %s startete nicht\n"
 
-#: src/xine-engine/xine.c:838
+#: src/xine-engine/xine.c:903
 #, c-format
 msgid "xine: join rip input plugin\n"
 msgstr "xine: Join rip Plugin\n"
 
-#: src/xine-engine/xine.c:845
+#: src/xine-engine/xine.c:910
 msgid "xine: error opening rip input plugin instance\n"
 msgstr "xine: Fehler beim Öffnen einer RIP-Plugin-Instanz\n"
 
-#: src/xine-engine/xine.c:876
+#: src/xine-engine/xine.c:941
 #, c-format
 msgid "xine: last_probed demuxer %s failed to start\n"
 msgstr "xine: Letztes Demultiplexer-Plugins %s startete nicht\n"
 
-#: src/xine-engine/xine.c:905
+#: src/xine-engine/xine.c:970
 msgid "ignoring video\n"
 msgstr "Ignoriere Video\n"
 
-#: src/xine-engine/xine.c:918
+#: src/xine-engine/xine.c:983
 msgid "ignoring audio\n"
 msgstr "Ignoriere Audio\n"
 
-#: src/xine-engine/xine.c:931
+#: src/xine-engine/xine.c:996
 msgid "ignoring subpicture\n"
 msgstr "Ignoriere Untertitel\n"
 
-#: src/xine-engine/xine.c:944
+#: src/xine-engine/xine.c:1009
 msgid "input cache plugin disabled\n"
 msgstr "Input-Cache Plugin deaktiviert\n"
 
-#: src/xine-engine/xine.c:1015
+#: src/xine-engine/xine.c:1080
 #, c-format
 msgid "subtitle mrl opened '%s'\n"
 msgstr "Untertitel-MRL öffnet '%s'\n"
 
-#: src/xine-engine/xine.c:1019
+#: src/xine-engine/xine.c:1084
 msgid "xine: error opening subtitle mrl\n"
 msgstr "xine: Fehler beim Öffnen der Untertitel-MRL\n"
 
-#: src/xine-engine/xine.c:1051
+#: src/xine-engine/xine.c:1116
 #, c-format
 msgid "xine: error while parsing MRL\n"
 msgstr "xine: Fehler beim parsen der MRL\n"
 
-#: src/xine-engine/xine.c:1058
+#: src/xine-engine/xine.c:1123
 #, c-format
 msgid "xine: changing option '%s' from MRL isn't permitted\n"
 msgstr "xine: Das Ändern der Option '%s' per MRL ist verboten\n"
 
-#: src/xine-engine/xine.c:1078
+#: src/xine-engine/xine.c:1143
 #, c-format
 msgid "xine: couldn't find demux for >%s<\n"
 msgstr "xine: Kann keinen Demultiplexer für >%s< finden\n"
 
-#: src/xine-engine/xine.c:1094
+#: src/xine-engine/xine.c:1159
 #, c-format
 msgid "xine: found demuxer plugin: %s\n"
 msgstr "xine: Demultiplexer-Plugin gefunden: %s\n"
 
-#: src/xine-engine/xine.c:1114
+#: src/xine-engine/xine.c:1179
 #, c-format
 msgid "xine: demuxer failed to start\n"
 msgstr "xine: Demultiplexer-Plugins startete nicht\n"
 
-#: src/xine-engine/xine.c:1179
+#: src/xine-engine/xine.c:1244
 #, c-format
 msgid "xine_play: no demux available\n"
 msgstr "xine_play: Kein Demultiplexer vorhanden\n"
 
-#: src/xine-engine/xine.c:1249
+#: src/xine-engine/xine.c:1314
 #, c-format
 msgid "xine_play: demux failed to start\n"
 msgstr "xine_play: Demultiplexer startete nicht\n"
 
-#: src/xine-engine/xine.c:1527
+#: src/xine-engine/xine.c:1592
 #, c-format
 msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
 msgstr "xine: Das angegebene save_dir '%s' kann ein Sicherheitsproblem sein.\n"
 
-#: src/xine-engine/xine.c:1532
+#: src/xine-engine/xine.c:1597
 msgid "The specified save_dir might be a security risk."
 msgstr "Das angegebene save_dir kann ein Sicherheitsproblem sein."
 
-#: src/xine-engine/xine.c:1561
+#: src/xine-engine/xine.c:1626
 msgid "xine: locale not supported by C library\n"
 msgstr "xine: Locale wird nicht von C-Bibliothek unterstützt\n"
 
-#: src/xine-engine/xine.c:1570
+#: src/xine-engine/xine.c:1635
 msgid "media format detection strategy"
 msgstr "Medienformaterkennungsstrategie"
 
-#: src/xine-engine/xine.c:1571
+#: src/xine-engine/xine.c:1636
 msgid ""
 "xine offers various methods to detect the media format of input to play. The "
 "individual values are:\n"
@@ -5594,11 +5585,11 @@ msgstr ""
 "extension\n"
 "Nur anhand der Dateiendung erkennen.\n"
 
-#: src/xine-engine/xine.c:1589
+#: src/xine-engine/xine.c:1654
 msgid "directory for saving streams"
 msgstr "Pfad zum Sichen von Datenströmen"
 
-#: src/xine-engine/xine.c:1590
+#: src/xine-engine/xine.c:1655
 msgid ""
 "When using the stream save feature, files will be written only into this "
 "directory.\n"
@@ -5613,11 +5604,11 @@ msgstr ""
 "benutzt werden kann, um Dateien mit beliebigen Inhalt zu füllen. Stellen Sie "
 "sicher, daß das Verzeichnis robust ist für beliebige Inhalte in jeder Datei."
 
-#: src/xine-engine/xine.c:1601
+#: src/xine-engine/xine.c:1666
 msgid "allow implicit changes to the configuration (e.g. by MRL)"
 msgstr "Erlaube implizierte Änderungen an Konfiguration (z.B. durch MRL)"
 
-#: src/xine-engine/xine.c:1602
+#: src/xine-engine/xine.c:1667
 msgid ""
 "If enabled, you allow xine to change your configuration without explicit "
 "actions from your side. For example configuration changes demanded by MRLs "
@@ -5633,11 +5624,11 @@ msgstr ""
 "unvertrauenswürdigen Stellen empfangen kann. Falls diese willkürlichen "
 "Änderungen erlaubt sind, kann dies zu einem verkonfigurierten xine führen."
 
-#: src/xine-engine/xine.c:1616
+#: src/xine-engine/xine.c:1681
 msgid "Timeout for network stream reading (in seconds)"
 msgstr "Zeitüberschreitung für Netzwerkdatenströme (in Sekunden)"
 
-#: src/xine-engine/xine.c:1617
+#: src/xine-engine/xine.c:1682
 msgid ""
 "Specifies the timeout when reading from network streams, in seconds. Too low "
 "values might stop streaming when the source is slow or the bandwidth is "
@@ -5648,15 +5639,15 @@ msgstr ""
 "langsam ist oder die Bandbreite erschöpft ist. Zu hohe Werte können xine "
 "einfrieren lassen, wenn die Verbindung abbricht."
 
-#: src/xine-engine/xine.c:1969
+#: src/xine-engine/xine.c:2034
 msgid "messages"
 msgstr "Nachrichten"
 
-#: src/xine-engine/xine.c:1970
+#: src/xine-engine/xine.c:2035
 msgid "plugin"
 msgstr "Plugin"
 
-#: src/xine-engine/xine.c:1971
+#: src/xine-engine/xine.c:2036
 msgid "trace"
 msgstr "Programmverfolgung"
 
@@ -5731,6 +5722,81 @@ msgstr ""
 msgid "Benchmarking memcpy methods (smaller is better):\n"
 msgstr "Geschwindigkeitsvergleich der memcpy-Methoden (klein ist besser):\n"
 
+#~ msgid "deinterlace method (deprecated)"
+#~ msgstr "Deinterlace-Methode (veraltet)"
+
+#~ msgid ""
+#~ "This config setting is deprecated. You should use the new deinterlacing "
+#~ "post processing settings instead.\n"
+#~ "\n"
+#~ "From the old days of analog television, where the even and odd numbered "
+#~ "lines of a video frame would be displayed at different times comes the "
+#~ "idea to increase motion smoothness by also recording the lines at "
+#~ "different times. This is called \"interlacing\". But unfortunately, "
+#~ "todays displays show the even and odd numbered lines as one complete "
+#~ "frame all at the same time (called \"progressive display\"), which "
+#~ "results in ugly frame errors known as comb artifacts. Software "
+#~ "deinterlacing is an approach to reduce these artifacts. The individual "
+#~ "values are:\n"
+#~ "\n"
+#~ "none\n"
+#~ "Disables software deinterlacing.\n"
+#~ "\n"
+#~ "bob\n"
+#~ "Interpolates between the lines for moving parts of the image.\n"
+#~ "\n"
+#~ "weave\n"
+#~ "Similar to bob, but with a tendency to preserve the full resolution, "
+#~ "better for high detail in low movement scenes.\n"
+#~ "\n"
+#~ "greedy\n"
+#~ "Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
+#~ "\n"
+#~ "onefield\n"
+#~ "Always interpolates and reduces vertical resolution.\n"
+#~ "\n"
+#~ "onefieldxv\n"
+#~ "Same as onefield, but does the interpolation in hardware.\n"
+#~ "\n"
+#~ "linearblend\n"
+#~ "Applies a slight vertical blur to remove the comb artifacts. Good results "
+#~ "with medium CPU usage."
+#~ msgstr ""
+#~ "Die Konfigurationseinstellung ist veraltet; Sie sollten stattdessen die "
+#~ "Einstellungen der Deinterlacing Nachbearbeitung verwenden.\n"
+#~ "\n"
+#~ "In den Anfangstagen des analogen Fernsehens wurden die geraden und "
+#~ "ungeraden Zeilen des Videobildes zu verschiedenen Zeiten aufgenommen und "
+#~ "angezeigt, um Bewegungen flüssiger darzustellen. Dies nennt man "
+#~ "\"interlacing\". Unglücklicherweise zeigen heutige Bildschirme sowohl "
+#~ "gerade und ungerade Zeilen immer gleichzeitig als vollständiges Bild an, "
+#~ "genannt \"progressiv\", was zu Kammartefakten genannten Bildfehlern "
+#~ "führt. Softwareinterlacing ist ein Ansatz, diese Artefakte zu reduzieren. "
+#~ "Die Werte bedeuten:\n"
+#~ "\n"
+#~ "none\n"
+#~ "Deaktiviert Softwaredeinterlacing.\n"
+#~ "\n"
+#~ "bob\n"
+#~ "Interpoliert zwischen den Linien in bewegten Teilen des Bildes.\n"
+#~ "\n"
+#~ "weave\n"
+#~ "Ähnlich wie bob, mit der Tendez, die volle Auflösung zu erhalten, besser "
+#~ "für hohe Details in Szenen mit wenig Bewegung.\n"
+#~ "\n"
+#~ "greedy\n"
+#~ "Sehr guter adaptiver Deinterlacer, der aber viel CPU-Leistung benötigt.\n"
+#~ "\n"
+#~ "onefield\n"
+#~ "Interpoliert immer und reduziert die vertikale Auflösung.\n"
+#~ "\n"
+#~ "onefieldxv\n"
+#~ "Wie onefield, benutzt aber die Hardware zur Interpolation.\n"
+#~ "\n"
+#~ "linearblend\n"
+#~ "Verwischt das Bild vertikal, um Kammartefakte zu entfernen. Gute "
+#~ "Resultate bei mittlerer CPU-Auslastung."
+
 #~ msgid ""
 #~ "video_out_xcbshm: %s: allocating image\n"
 #~ "video_out_xcbshm: => not using MIT Shared Memory extension.\n"
@@ -6650,9 +6716,6 @@ msgstr "Geschwindigkeitsvergleich der memcpy-Methoden (klein ist besser):\n"
 #~ msgid "valid mrls ending for ts demuxer"
 #~ msgstr "Gültige MRL-Endungen für TS-Demultiplexer"
 
-#~ msgid "demux_ts: can't create new thread (%s)\n"
-#~ msgstr "demux_ts: Kann neuen Thread (%s) nicht erzeugen\n"
-
 #~ msgid "stdin/fifo input plugin as shipped with xine"
 #~ msgstr "Mit xine ausgeliefertes stdin/fifi Plugin"
 
diff --git a/po/es.po b/po/es.po
index caee6a749..1373458b2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib-1.1.4\n"
 "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-04-24 21:48+0100\n"
+"POT-Creation-Date: 2007-06-02 13:14+0200\n"
 "PO-Revision-Date: 2007-02-28 14:07+0100\n"
 "Last-Translator: Carlos E. Robinson M. <carloser@users.sourceforge.net>\n"
 "Language-Team: Spanish\n"
@@ -864,6 +864,13 @@ msgstr ""
 "complemento de xine de salida de audio usando dispositivos/drivers "
 "compatibles sun"
 
+#: src/combined/xine_ogg_demuxer.c:810
+#, c-format
+msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+msgstr ""
+"ogg: pista de audio vorbis indicada pero cabecera de flujo de bits vorbis no "
+"encontrada.\n"
+
 #: src/demuxers/demux_asf.c:428
 #, c-format
 msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
@@ -1007,13 +1014,6 @@ msgstr ""
 "demux_mpeg_pes:flujo de bits privado 1 0x%02x. Por favor, repórtelo a los "
 "desarrolladores de xine.\n"
 
-#: src/demuxers/demux_ogg.c:802
-#, c-format
-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
-msgstr ""
-"ogg: pista de audio vorbis indicada pero cabecera de flujo de bits vorbis no "
-"encontrada.\n"
-
 #: src/demuxers/demux_snd.c:104
 #, c-format
 msgid "demux_snd: bad header parameters\n"
@@ -1055,18 +1055,6 @@ msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
 msgstr ""
 "demux_wc3movie: Hubo un problema mientras se cargaban bloques de paleta\n"
 
-#: src/dxr3/dxr3.h:32
-msgid "DXR3 device number"
-msgstr "número de dispositivo DXR3"
-
-#: src/dxr3/dxr3.h:33
-msgid ""
-"If you have more than one DXR3 in your computer, you can specify which one "
-"to use here."
-msgstr ""
-"Si tiene más de un DXR3 en su computadora, puede especificar cual debe "
-"usarse aquí."
-
 #: src/dxr3/dxr3_decode_spu.c:253
 #, c-format
 msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
@@ -1186,6 +1174,18 @@ msgstr ""
 "dxr3_decode_video: AVISO: corrigiendo código de frecuencia de cuadro de de "
 "PAL a NTSC\n"
 
+#: src/dxr3/dxr3.h:32
+msgid "DXR3 device number"
+msgstr "número de dispositivo DXR3"
+
+#: src/dxr3/dxr3.h:33
+msgid ""
+"If you have more than one DXR3 in your computer, you can specify which one "
+"to use here."
+msgstr ""
+"Si tiene más de un DXR3 en su computadora, puede especificar cual debe "
+"usarse aquí."
+
 #: src/dxr3/dxr3_mpeg_encoders.c:125
 msgid "dxr3_mpeg_encoder: failed to init librte\n"
 msgstr "dxr3_mpeg_encoder: falló al inicializar librte\n"
@@ -1534,30 +1534,30 @@ msgstr ""
 "video_out_dxr3: ERROR leyendo en fichero de inicialización de la "
 "superposición. ¡Ejecute autocal!\n"
 
-#: src/input/input_cdda.c:1608
+#: src/input/input_cdda.c:1611
 #, c-format
 msgid "%s: can't connect to %s:%d\n"
 msgstr "%s: no se puede conectar a %s:%d\n"
 
-#: src/input/input_cdda.c:1655
+#: src/input/input_cdda.c:1658
 #, c-format
 msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
 msgstr "input_cdda: conectado con éxito al servidor cddb '%s:%d'.\n"
 
-#: src/input/input_cdda.c:1660
+#: src/input/input_cdda.c:1663
 #, c-format
 msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
 msgstr "input_cdda: falló al conectar al servidor cddb '%s:%d' (%s).\n"
 
-#: src/input/input_cdda.c:2690
+#: src/input/input_cdda.c:2693
 msgid "CD Digital Audio (aka. CDDA)"
 msgstr "audio CD digital (alias CDDA)"
 
-#: src/input/input_cdda.c:2742
+#: src/input/input_cdda.c:2745
 msgid "device used for CD audio"
 msgstr "dispositivo usado para audio CD"
 
-#: src/input/input_cdda.c:2743
+#: src/input/input_cdda.c:2746
 msgid ""
 "The path to the device, usually a CD or DVD drive, which you intend to use "
 "for playing audio CDs."
@@ -1565,11 +1565,11 @@ msgstr ""
 "El camino al dispositivo, normalmente un lector de de CD o DVD, que desea "
 "usar para reproducir CDs de audio."
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid "query CDDB"
 msgstr "consultar la CDDB"
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid ""
 "Enables CDDB queries, which will give you convenient title and track names "
 "for your audio CDs.\n"
@@ -1583,11 +1583,11 @@ msgstr ""
 "información se obtiene de un servidor en Internet que podría sacar un perfil "
 "de sus hábitos de escucha."
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid "CDDB server name"
 msgstr "nombre del servidor CDDB"
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid ""
 "The CDDB server used to retrieve the title and track information from.\n"
 "This setting is security critical, because the sever will receive "
@@ -1600,20 +1600,20 @@ msgstr ""
 "consultas con respuestas maliciosas. Asegúrese de poner un servidor del que "
 "se pueda fiar."
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "CDDB server port"
 msgstr "puerto del servidor CDDB"
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "The server port used to retrieve the title and track information from."
 msgstr ""
 "El puerto del servidor usado para obtener la información de título y pista."
 
-#: src/input/input_cdda.c:2771
+#: src/input/input_cdda.c:2774
 msgid "slow down disc drive to this speed factor"
 msgstr "enlentecer la unidad de disco a este factor de velocidad"
 
-#: src/input/input_cdda.c:2772
+#: src/input/input_cdda.c:2775
 msgid ""
 "Since some CD or DVD drives make some really loud noises because of the fast "
 "disc rotation, xine will try to slow them down. With standard CD or DVD "
@@ -1628,55 +1628,55 @@ msgstr ""
 "que el enlentecimiento no afectaría el rendimiento de la reproducción.\n"
 "Un valor de cero desactivará el enlentecimiento."
 
-#: src/input/input_dvb.c:899
+#: src/input/input_dvb.c:900
 #, fuzzy, c-format
 msgid "input_dvb: failed to open dvb channel file '%s': %s\n"
 msgstr "input_dvb: failló al abrir el fichero de canales DVB '%s'\n"
 
-#: src/input/input_dvb.c:905
+#: src/input/input_dvb.c:906
 #, fuzzy, c-format
 msgid "input_dvb: dvb channel file '%s' is not a plain file\n"
 msgstr "input_dvb: failló al abrir el fichero de canales DVB '%s'\n"
 
-#: src/input/input_dvb.c:2115 src/input/input_dvb.c:2943
+#: src/input/input_dvb.c:2116 src/input/input_dvb.c:2948
 msgid "input_dvb: tuner_set_channel failed\n"
 msgstr "input_dvb: falló tuner_set_channel\n"
 
-#: src/input/input_dvb.c:2743
+#: src/input/input_dvb.c:2748
 msgid "input_dvb: cannot open dvb device\n"
 msgstr "input_dvb: no puedo abrir dispositivo DVB\n"
 
-#: src/input/input_dvb.c:2767
+#: src/input/input_dvb.c:2772
 #, c-format
 msgid "input_dvb: channel %d out of range, defaulting to 0\n"
 msgstr "input_dvb: canal %d fuera de rango, poniendo a 0\n"
 
-#: src/input/input_dvb.c:2778
+#: src/input/input_dvb.c:2783
 #, c-format
 msgid "input_dvb: searching for channel %s\n"
 msgstr "input_dvb: buscando el canal %s\n"
 
-#: src/input/input_dvb.c:2801
+#: src/input/input_dvb.c:2806
 #, c-format
 msgid "input_dvb: exact match for %s not found: trying partial matches\n"
 msgstr ""
 "input_dvb: no encontrada una coincidencia exacta para %s: probando "
 "coincidencias parciales\n"
 
-#: src/input/input_dvb.c:2808
+#: src/input/input_dvb.c:2813
 #, c-format
 msgid "input_dvb: found matching channel %s\n"
 msgstr "input_dvb: encontrado el canal correspondiente %s\n"
 
 # Cer: (temporal) "valores por defecto" no es la traducción exacta
-#: src/input/input_dvb.c:2821
+#: src/input/input_dvb.c:2826
 #, fuzzy, c-format
 msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
 msgstr ""
 "input_dvb: canal %s no encontrado en channels.conf, yendo a valores por "
 "defecto.\n"
 
-#: src/input/input_dvb.c:2827
+#: src/input/input_dvb.c:2832
 msgid ""
 "input_dvb: invalid channel specification, defaulting to last viewed "
 "channel.\n"
@@ -1684,11 +1684,11 @@ msgstr ""
 "input_dvb: especificación de canal inválida, usaremos el ultimo canal "
 "visualizado.\n"
 
-#: src/input/input_dvb.c:2833
+#: src/input/input_dvb.c:2838
 msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
 msgstr "input_dvb: especificación de canal inválida, usaremos el canal 0.\n"
 
-#: src/input/input_dvb.c:2845
+#: src/input/input_dvb.c:2850
 msgid ""
 "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
 "S)\n"
@@ -1696,7 +1696,7 @@ msgstr ""
 "input_dvb: se especificó MRL DVBS pero el sintonizador no aparenta ser QPSK "
 "(DVB-S)\n"
 
-#: src/input/input_dvb.c:2865
+#: src/input/input_dvb.c:2870
 msgid ""
 "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
 "T)\n"
@@ -1704,7 +1704,7 @@ msgstr ""
 "input_dvb: se especificó MRL DVBT pero el sintonizador no aparenta ser OFDM "
 "(DVB-T)\n"
 
-#: src/input/input_dvb.c:2888 src/input/input_dvb.c:2914
+#: src/input/input_dvb.c:2893
 msgid ""
 "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
 "C)\n"
@@ -1712,20 +1712,29 @@ msgstr ""
 "input_dvb: se especificó MRL DVBC pero el sintonizador no aparenta ser QAM "
 "(DVB-C)\n"
 
-#: src/input/input_dvb.c:2949
+#: src/input/input_dvb.c:2919
+#, fuzzy
+msgid ""
+"input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-"
+"A)\n"
+msgstr ""
+"input_dvb: se especificó MRL DVBC pero el sintonizador no aparenta ser QAM "
+"(DVB-C)\n"
+
+#: src/input/input_dvb.c:2954
 #, c-format
 msgid "input_dvb: cannot open dvr device '%s'\n"
 msgstr "input_dvb: no se puede abrir el dispositivo DVR '%s'\n"
 
-#: src/input/input_dvb.c:2971
+#: src/input/input_dvb.c:2976
 msgid "input_dvb: cannot create EPG updater thread\n"
 msgstr "input_dvb: no se puede crear el hilo actualizador de EPG\n"
 
-#: src/input/input_dvb.c:3033
+#: src/input/input_dvb.c:3038
 msgid "use DVB 'center cutout' (zoom)"
 msgstr "usar corte de la zona central del DVB (zoom)"
 
-#: src/input/input_dvb.c:3034
+#: src/input/input_dvb.c:3039
 msgid ""
 "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
 "frame."
@@ -1733,15 +1742,15 @@ msgstr ""
 "Esto permitirá reproducción a pantalla completa de contenido en formato 4:3 "
 "transmitido en un cuadro 16:9."
 
-#: src/input/input_dvb.c:3127
+#: src/input/input_dvb.c:3132
 msgid "DVB (Digital TV) input plugin"
 msgstr "complemento de entrada DVB (TV Digital)"
 
-#: src/input/input_dvb.c:3244
+#: src/input/input_dvb.c:3249
 msgid "Remember last DVB channel watched"
 msgstr "Recordar el último canal DVB visto"
 
-#: src/input/input_dvb.c:3245
+#: src/input/input_dvb.c:3250
 msgid ""
 "On autoplay, xine will remember and switch to the channel indicated in media."
 "dvb.last_channel. "
@@ -1749,19 +1758,19 @@ msgstr ""
 "En autoejecución, xine recordará y cambiará al canal indicado en media.dvb."
 "last_channel. "
 
-#: src/input/input_dvb.c:3252
+#: src/input/input_dvb.c:3257
 msgid "Last DVB channel viewed"
 msgstr "Último canal DVB visto"
 
-#: src/input/input_dvb.c:3253
+#: src/input/input_dvb.c:3258
 msgid "If enabled xine will remember and switch to this channel. "
 msgstr "Si se activa xine recordará y cambiará a este canal. "
 
-#: src/input/input_dvb.c:3259
+#: src/input/input_dvb.c:3264
 msgid "Number of dvb card to use."
 msgstr "Número de tarjeta DVB a usar."
 
-#: src/input/input_dvb.c:3260
+#: src/input/input_dvb.c:3265
 msgid ""
 "Leave this at zero unless you really have more than 1 card in your system."
 msgstr ""
@@ -2017,87 +2026,87 @@ msgstr ""
 msgid "gnome-vfs input plugin as shipped with xine"
 msgstr "complemento de entrada gnome-vfs tal como vino con xine"
 
-#: src/input/input_http.c:174
+#: src/input/input_http.c:176
 #, c-format
 msgid "input_http: gethostbyname(%s) failed: %s\n"
 msgstr "input_http: gethostbyname(%s) falló: %s\n"
 
-#: src/input/input_http.c:400 src/input/input_http.c:943
+#: src/input/input_http.c:402 src/input/input_http.c:957
 #, c-format
 msgid "input_http: read error %d\n"
 msgstr "input_http: error de lectura %d\n"
 
-#: src/input/input_http.c:627
+#: src/input/input_http.c:629
 msgid "Connecting HTTP server..."
 msgstr "Conectando servidor HTTP..."
 
-#: src/input/input_http.c:819
+#: src/input/input_http.c:820
 #, c-format
 msgid "input_http: invalid http answer\n"
 msgstr "input_http: respuesta http no válida\n"
 
-#: src/input/input_http.c:825
+#: src/input/input_http.c:826
 #, c-format
 msgid "input_http: 3xx redirection: >%d %s<\n"
 msgstr "input_http: redirección 3xx: >%d %s<\n"
 
-#: src/input/input_http.c:830 src/input/input_http.c:836
-#: src/input/input_http.c:843
+#: src/input/input_http.c:831 src/input/input_http.c:836
+#: src/input/input_http.c:842 src/input/input_http.c:849
 #, c-format
 msgid "input_http: http status not 2xx: >%d %s<\n"
 msgstr "input_http: el estado de http no es 2xx: >%d %s<\n"
 
-#: src/input/input_http.c:853
+#: src/input/input_http.c:859
 #, c-format
 msgid "input_http: content length = %<PRIdMAX> bytes\n"
 msgstr "input_http: longitud del contenido = %<PRIdMAX> bytes\n"
 
-#: src/input/input_http.c:922
+#: src/input/input_http.c:932
 #, fuzzy, c-format
 msgid "input_http: buffer exhausted after %d bytes."
 msgstr "input_http: error de lectura %d\n"
 
-#: src/input/input_http.c:996
+#: src/input/input_http.c:1010
 msgid "http input plugin"
 msgstr "complemento de entrada http"
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "HTTP proxy host"
 msgstr "Servidor delegado de HTTP"
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "The hostname of the HTTP proxy."
 msgstr "El nombre del servidor delegado (\"proxy\") de HTTP."
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "HTTP proxy port"
 msgstr "Puerto del servidor delegado de HTTP"
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "The port number of the HTTP proxy."
 msgstr "El número de puerto en el servidor delegado (\"proxy\") de HTTP."
 
-#: src/input/input_http.c:1076
+#: src/input/input_http.c:1090
 msgid "HTTP proxy username"
 msgstr "Usuario en el servidor delegado de HTTP"
 
-#: src/input/input_http.c:1077
+#: src/input/input_http.c:1091
 msgid "The user name for the HTTP proxy."
 msgstr "El nombre de usuario en el servidor delegado de HTTP."
 
-#: src/input/input_http.c:1080
+#: src/input/input_http.c:1094
 msgid "HTTP proxy password"
 msgstr "Contraseña en el servidor delegado de HTTP"
 
-#: src/input/input_http.c:1081
+#: src/input/input_http.c:1095
 msgid "The password for the HTTP proxy."
 msgstr "La contraseña en el servidor delegado de HTTP."
 
-#: src/input/input_http.c:1084
+#: src/input/input_http.c:1098
 msgid "Domains for which to ignore the HTTP proxy"
 msgstr "Dominios para los cuales se ignorará el servidor HTTP delegado"
 
-#: src/input/input_http.c:1085
+#: src/input/input_http.c:1099
 msgid ""
 "A comma-separated list of domain names for which the proxy is to be "
 "ignored.\n"
@@ -2317,31 +2326,31 @@ msgstr "Memoria intermedia rebosando..."
 msgid "Adjusting..."
 msgstr "Ajustando..."
 
-#: src/input/input_v4l.c:660
+#: src/input/input_v4l.c:658
 msgid "Tuner name not found\n"
 msgstr "Nombre del sintonizador no encontrado\n"
 
-#: src/input/input_v4l.c:1876
+#: src/input/input_v4l.c:1874
 msgid "v4l tv input plugin"
 msgstr "Complemento de entrada v4l tv"
 
-#: src/input/input_v4l.c:1880
+#: src/input/input_v4l.c:1878
 msgid "v4l radio input plugin"
 msgstr "Complemento de entrada v4l radio"
 
-#: src/input/input_v4l.c:1912
+#: src/input/input_v4l.c:1910
 msgid "v4l video device"
 msgstr "dispositivo vídeo v4l"
 
-#: src/input/input_v4l.c:1913
+#: src/input/input_v4l.c:1911
 msgid "The path to your Video4Linux video device."
 msgstr "El camino a su dispositivo de vídeo Video4Linux."
 
-#: src/input/input_v4l.c:1938
+#: src/input/input_v4l.c:1936
 msgid "v4l radio device"
 msgstr "dispositivo audio v4l"
 
-#: src/input/input_v4l.c:1939
+#: src/input/input_v4l.c:1937
 msgid "The path to your Video4Linux radio device."
 msgstr "El camino a su dispositivo de radio Video4Linux."
 
@@ -2508,54 +2517,54 @@ msgstr "Error en conseguir número de segmento actual"
 msgid "Should have converted this above"
 msgstr "Debería haber convertido esto arriba"
 
-#: src/input/vcd/xineplug_inp_vcd.c:191
+#: src/input/vcd/xineplug_inp_vcd.c:192
 msgid "failed to find a device with a VCD"
 msgstr "falló en encontrar un dispositivo con un VCD"
 
-#: src/input/vcd/xineplug_inp_vcd.c:328
+#: src/input/vcd/xineplug_inp_vcd.c:329
 msgid "was passed a null class parameter"
 msgstr "se pasó un parámetro de clase nula"
 
-#: src/input/vcd/xineplug_inp_vcd.c:972
+#: src/input/vcd/xineplug_inp_vcd.c:982
 msgid "Invalid current entry type"
 msgstr "Tipo de entrada actual incorrecta"
 
-#: src/input/vcd/xineplug_inp_vcd.c:996
+#: src/input/vcd/xineplug_inp_vcd.c:1006
 msgid ""
 "Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
 msgstr ""
 "Complemento de entrada Video CD con PBC y soporte para: (X)VCD, (X)SVCD, "
 "HQVCD, CVD ... "
 
-#: src/input/vcd/xineplug_inp_vcd.c:1097
+#: src/input/vcd/xineplug_inp_vcd.c:1107
 msgid "selection has no RETURN entry"
 msgstr "la selección no tiene entrada RETURN"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1126
+#: src/input/vcd/xineplug_inp_vcd.c:1136
 msgid "DEFAULT selected, but PBC is not on."
 msgstr "se seleccionó DEFAULT, pero PBC no está activado."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1131
+#: src/input/vcd/xineplug_inp_vcd.c:1141
 msgid "selection has no NEXT entry"
 msgstr "la selección no tiene entrada NEXT"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1139
+#: src/input/vcd/xineplug_inp_vcd.c:1149
 msgid "selection has no PREVIOUS entry"
 msgstr "la selección no tiene entrada PREVIOUS"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1146
+#: src/input/vcd/xineplug_inp_vcd.c:1156
 msgid "Unknown event type: "
 msgstr "Tipo de evento desconocido: "
 
-#: src/input/vcd/xineplug_inp_vcd.c:1446 src/input/vcd/xineplug_inp_vcd.c:1493
+#: src/input/vcd/xineplug_inp_vcd.c:1452 src/input/vcd/xineplug_inp_vcd.c:1499
 msgid "The above message had unknown vcdimager log level"
 msgstr "El mensaje de arriba tenía nivel de registro vcdimager desconocido"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1824
+#: src/input/vcd/xineplug_inp_vcd.c:1830
 msgid "VCD default type to use on autoplay"
 msgstr "tipo por defecto VCD a usar en autoreproducción"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1825
+#: src/input/vcd/xineplug_inp_vcd.c:1831
 msgid ""
 "The VCD play unit to use when none is specified in an MRL, e.g. vcd:// or "
 "vcd:///dev/dvd:"
@@ -2563,11 +2572,11 @@ msgstr ""
 "La unidad de reproducción VCD a usar cuando ninguna se especifica en un MRL, "
 "p.e. vcd:// o vcd:///dev/dvd:"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1835
+#: src/input/vcd/xineplug_inp_vcd.c:1841
 msgid "CD-ROM drive used for VCD when none given"
 msgstr "Unidad de CD-ROM usada para VCD cuando no se da ninguno"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1836
+#: src/input/vcd/xineplug_inp_vcd.c:1842
 msgid ""
 "What to use if no drive specified. If the setting is empty, xine will scan "
 "for CD drives."
@@ -2575,31 +2584,31 @@ msgstr ""
 "Que usar si no se especifica unidad. Si la configuración está vacía, xine "
 "buscará unidades CD."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1846
+#: src/input/vcd/xineplug_inp_vcd.c:1852
 msgid "VCD position slider range"
 msgstr "rango de la barra deslizadora de posiciones del VCD"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1847
+#: src/input/vcd/xineplug_inp_vcd.c:1853
 msgid ""
 "range that the stream playback position slider represents playing a VCD."
 msgstr ""
 "rango que la barra deslizadora de posiciones del flujo de bits representa al "
 "reproducir un VCD."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1855
+#: src/input/vcd/xineplug_inp_vcd.c:1861
 msgid "VCD read-ahead caching?"
 msgstr "¿Memoria intermedia de lectura adelantada del VCD?"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1856
+#: src/input/vcd/xineplug_inp_vcd.c:1862
 msgid "Class may lead to jerky playback on low-end machines."
 msgstr ""
 "La clase puede llevar a reproducción temblorosa en máquinas de gama inferior."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1866
+#: src/input/vcd/xineplug_inp_vcd.c:1872
 msgid "automatically advance VCD track/entry"
 msgstr "automáticamente avanzar pista/entrada en el VCD"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1867
+#: src/input/vcd/xineplug_inp_vcd.c:1873
 msgid ""
 "If enabled, we should automatically advance to the next entry or track. Used "
 "only when playback control (PBC) is disabled."
@@ -2607,11 +2616,11 @@ msgstr ""
 "Si se activa, deberíamos avanzar automáticamente a la siguiente entrada o "
 "pista. Se usa sólo cuando el control de reproducción (PBC) está desactivado."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1876
+#: src/input/vcd/xineplug_inp_vcd.c:1882
 msgid "show 'rejected' VCD LIDs"
 msgstr "mostrar LIDs de VCD 'rechazados' "
 
-#: src/input/vcd/xineplug_inp_vcd.c:1877
+#: src/input/vcd/xineplug_inp_vcd.c:1883
 msgid ""
 "Some playback list IDs (LIDs) are marked not showable, but you can see them "
 "in the MRL list if this is set. Rejected entries are marked with an asterisk "
@@ -2621,11 +2630,11 @@ msgstr ""
 "pero puede verlas en la lista de MRL si se activa esto. Las entradas "
 "rechazadas se marcan con un asterisco (*) anexado al MRL."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1888
+#: src/input/vcd/xineplug_inp_vcd.c:1894
 msgid "VCD format string for display banner"
 msgstr "Cadena de formato VCD para pantalla banderola"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1889
+#: src/input/vcd/xineplug_inp_vcd.c:1895
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are:\n"
@@ -2665,11 +2674,11 @@ msgstr ""
 "      Un número entre 1 y el contador de volúmenes.\n"
 " %% : a %\n"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1914
+#: src/input/vcd/xineplug_inp_vcd.c:1920
 msgid "VCD format string for stream comment field"
 msgstr "Cadena de formato VCD para campo de comentario"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1915
+#: src/input/vcd/xineplug_inp_vcd.c:1921
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
@@ -2682,11 +2691,11 @@ msgstr ""
 "%.\n"
 "Vea la ayuda para title_format para ver su significado."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1927
+#: src/input/vcd/xineplug_inp_vcd.c:1933
 msgid "VCD debug flag mask"
 msgstr "Máscara de banderas de depuración VCD"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1928
+#: src/input/vcd/xineplug_inp_vcd.c:1934
 msgid ""
 "For tracking down bugs in the VCD plugin. Mask values are:\n"
 "   1: Meta information\n"
@@ -2716,69 +2725,6 @@ msgstr ""
 "1024: Cuadro congelado\n"
 "2048: Depurando desde VCDINFO\n"
 
-#: src/liba52/xine_a52_decoder.c:742 src/libxineadec/xine_dts_decoder.c:524
-msgid "HELP! a mono-only audio driver?!\n"
-msgstr "¡AYUDA! ¿¡Un manejador de audio exclusivamente mono-aural?!\n"
-
-#: src/liba52/xine_a52_decoder.c:805
-msgid "A/52 volume"
-msgstr "Volúmen A/52"
-
-#: src/liba52/xine_a52_decoder.c:806
-msgid ""
-"With A/52 audio, you can modify the volume at the decoder level. This has "
-"the advantage of the audio being already decoded for the specified volume, "
-"so later operations like channel downmixing will work on an audio stream of "
-"the given volume."
-msgstr ""
-"Con audio A/52, puede modificar el volúmen en el decodificador. Esto tiene "
-"la ventaja que el sonido se ya se decodifica para el volúmen especificado, "
-"de modo que las operaciones posteriores como mezclado hacia abajo de canales "
-"trabajaran en un flujo de bits de audio del volúmen dado."
-
-#: src/liba52/xine_a52_decoder.c:814
-msgid "use A/52 dynamic range compression"
-msgstr "use A/52 compresión de rango dinámico"
-
-#: src/liba52/xine_a52_decoder.c:815
-msgid ""
-"Dynamic range compression limits the dynamic range of the audio. This means "
-"making the loud sounds softer, and the soft sounds louder, so you can more "
-"easily listen to the audio in a noisy environment without disturbing anyone."
-msgstr ""
-"La compresión de rango dinámico limita el rango dinámico del sonido. Esto "
-"significa hacer más suaves los sonidos fuertes, y más fuertes los sonidos "
-"flojos, de modo que puede escuchar el audio en un entorno ruidoso sin "
-"molestar a nadie."
-
-#: src/liba52/xine_a52_decoder.c:822
-msgid "downmix audio to 2 channel surround stereo"
-msgstr "mezcla reducida de audio a 2 canales estereo envolvente"
-
-#: src/liba52/xine_a52_decoder.c:823
-msgid ""
-"When you want to listen to multichannel surround sound, but you have only "
-"two speakers or a surround decoder or amplifier which does some sort of "
-"matrix surround decoding like prologic, you should enable this option so "
-"that the additional channels are mixed into the stereo signal."
-msgstr ""
-"Cuando desee escuchar sonido envolvente multicanal, pero sólo tiene dos "
-"altavoces o un decodificador o amplificador envolvente  que hace algún tipo "
-"de decodificación envolvente matricial como prologic, debería activar esta "
-"opción de modo que los canales adicionales se mezclen en la señal estéreo."
-
-#: src/libfaad/xine_faad_decoder.c:131
-msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
-msgstr "libfaad: libfaad NeAACDecOpen() falló.\n"
-
-#: src/libfaad/xine_faad_decoder.c:140
-msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
-msgstr "libfaad: libfaad NeAACDecInit2 falló.\n"
-
-#: src/libfaad/xine_faad_decoder.c:151
-msgid "libfaad: libfaad NeAACDecInit failed.\n"
-msgstr "libfaad: libfaad NeAACDecInit falló.\n"
-
 #: src/libffmpeg/ff_audio_decoder.c:122
 #, c-format
 msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
@@ -2809,55 +2755,6 @@ msgstr ""
 "dvaudio: incrementando el tamaño de la memoria tampón a %d para evitar el "
 "desbordamiento.\n"
 
-#: src/libffmpeg/ff_video_decoder.c:155
-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
-msgstr "ffmpeg_video_dec: formato de cuadro no soportado, DR1 desactivado.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:173
-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
-msgstr ""
-"ffmpeg_video_dec: dimensiones de cuadro no soportadas, DR1 desactivado.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:333
-#, c-format
-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
-msgstr ""
-"ffmpeg_video_dec: no pude encontrar el decodificador ffmpeg para el tipo de "
-"tampón  0x%X\n"
-
-#: src/libffmpeg/ff_video_decoder.c:362
-msgid "ffmpeg_video_dec: couldn't open decoder\n"
-msgstr "ffmpeg_video_dec: no pude abrir el decodificador\n"
-
-#: src/libffmpeg/ff_video_decoder.c:397
-msgid "ffmpeg_video_dec: direct rendering enabled\n"
-msgstr "ffmpeg_video_dec: renderizado directo activado\n"
-
-#: src/libffmpeg/ff_video_decoder.c:816
-#, c-format
-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
-msgstr ""
-"ffmpeg_video_dec: incrementando el tamaño de la memoria tampón a %d para "
-"evitar el desbordamiento.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:1514
-msgid "MPEG-4 postprocessing quality"
-msgstr "calidad de postprocesado MPEG-4"
-
-#: src/libffmpeg/ff_video_decoder.c:1515
-msgid ""
-"You can adjust the amount of post processing applied to MPEG-4 video.\n"
-"Higher values result in better quality, but need more CPU. Lower values may "
-"result in image defects like block artifacts. For high quality content, too "
-"heavy post processing can actually make the image worse by blurring it too "
-"much."
-msgstr ""
-"Puede ajustar la cantidad de postprocesado aplicado a video MPEG-4.\n"
-"Valores más altos pueden resultar en mejor calidad, pero necesitarán más "
-"CPU. Valores más bajos resultarán en defectos de imagen como artefactos de "
-"bloque. Para contenido de alta calidad, demasiado postprocesado puede de "
-"hecho hacer la imagen peor emborronándola demasiado."
-
 #: src/libffmpeg/ffmpeg_encoder.c:163
 msgid "libavcodec mpeg output bitrate (kbit/s)"
 msgstr "tasa de bits salida mpeg de libavcodec (kbit/s)"
@@ -2906,24 +2803,54 @@ msgid "The maximum compression to apply to an image in constant quality mode."
 msgstr ""
 "La máxima compresión a aplicar a una imagen en modo de calidad constante."
 
-#: src/libxineadec/xine_musepack_decoder.c:249
+#: src/libffmpeg/ff_video_decoder.c:155
+msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
+msgstr "ffmpeg_video_dec: formato de cuadro no soportado, DR1 desactivado.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:173
+msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+msgstr ""
+"ffmpeg_video_dec: dimensiones de cuadro no soportadas, DR1 desactivado.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:333
 #, c-format
-msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
-msgstr "libmusepack: falló lectura mpc_streaminfo_read: %d\n"
+msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+msgstr ""
+"ffmpeg_video_dec: no pude encontrar el decodificador ffmpeg para el tipo de "
+"tampón  0x%X\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:323
-msgid "libmusepack: data after last frame ignored\n"
-msgstr "libmusepack: datos después de la última trama ignorados\n"
+#: src/libffmpeg/ff_video_decoder.c:362
+msgid "ffmpeg_video_dec: couldn't open decoder\n"
+msgstr "ffmpeg_video_dec: no pude abrir el decodificador\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:334
-msgid "libmusepack: mpc_decoder_initialise failed\n"
-msgstr "libmusepack: falló mpc_decoder_initialise\n"
+#: src/libffmpeg/ff_video_decoder.c:397
+msgid "ffmpeg_video_dec: direct rendering enabled\n"
+msgstr "ffmpeg_video_dec: renderizado directo activado\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:354
-#: src/libxineadec/xine_musepack_decoder.c:369
+#: src/libffmpeg/ff_video_decoder.c:816
 #, c-format
-msgid "libmusepack: mpc_decoder_decode failed: %d\n"
-msgstr "libmusepack: falló mpc_decoder_decode: %d\n"
+msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+msgstr ""
+"ffmpeg_video_dec: incrementando el tamaño de la memoria tampón a %d para "
+"evitar el desbordamiento.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:1519
+msgid "MPEG-4 postprocessing quality"
+msgstr "calidad de postprocesado MPEG-4"
+
+#: src/libffmpeg/ff_video_decoder.c:1520
+msgid ""
+"You can adjust the amount of post processing applied to MPEG-4 video.\n"
+"Higher values result in better quality, but need more CPU. Lower values may "
+"result in image defects like block artifacts. For high quality content, too "
+"heavy post processing can actually make the image worse by blurring it too "
+"much."
+msgstr ""
+"Puede ajustar la cantidad de postprocesado aplicado a video MPEG-4.\n"
+"Valores más altos pueden resultar en mejor calidad, pero necesitarán más "
+"CPU. Valores más bajos resultarán en defectos de imagen como artefactos de "
+"bloque. Para contenido de alta calidad, demasiado postprocesado puede de "
+"hecho hacer la imagen peor emborronándola demasiado."
 
 #: src/libreal/real_common.c:107
 msgid "path to RealPlayer codecs"
@@ -2945,11 +2872,6 @@ msgstr ""
 "RealPlayer para usted. Consulte el FAQ de xine FAQ para más información "
 "sobre cómo instalar los codificadores."
 
-#: src/libreal/xine_real_video_decoder.c:164
-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
-msgstr ""
-"libreal: ¡Error resolviendo símbolos! (¿incompatibilidad de versión?)\n"
-
 #: src/libreal/xine_real_audio_decoder.c:130
 #, c-format
 msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
@@ -2972,6 +2894,11 @@ msgstr ""
 msgid "libareal: oups, real can do more than 2 channels ?\n"
 msgstr "libareal: Ostras, ¿puede real hacer más de dos canales?\n"
 
+#: src/libreal/xine_real_video_decoder.c:164
+msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+msgstr ""
+"libreal: ¡Error resolviendo símbolos! (¿incompatibilidad de versión?)\n"
+
 #: src/libspucc/xine_cc_decoder.c:192
 msgid "display closed captions in MPEG-2 streams"
 msgstr "mostrar los subtítulos en flujos MPEG-2"
@@ -3224,6 +3151,89 @@ msgstr "w32codec: Error inicializando audio DirectShow\n"
 msgid "w32codec: Error initializing DMO Audio\n"
 msgstr "w32codec: Error inicializando audio DMO\n"
 
+#: src/libxineadec/xine_a52_decoder.c:742
+#: src/libxineadec/xine_dts_decoder.c:524
+msgid "HELP! a mono-only audio driver?!\n"
+msgstr "¡AYUDA! ¿¡Un manejador de audio exclusivamente mono-aural?!\n"
+
+#: src/libxineadec/xine_a52_decoder.c:805
+msgid "A/52 volume"
+msgstr "Volúmen A/52"
+
+#: src/libxineadec/xine_a52_decoder.c:806
+msgid ""
+"With A/52 audio, you can modify the volume at the decoder level. This has "
+"the advantage of the audio being already decoded for the specified volume, "
+"so later operations like channel downmixing will work on an audio stream of "
+"the given volume."
+msgstr ""
+"Con audio A/52, puede modificar el volúmen en el decodificador. Esto tiene "
+"la ventaja que el sonido se ya se decodifica para el volúmen especificado, "
+"de modo que las operaciones posteriores como mezclado hacia abajo de canales "
+"trabajaran en un flujo de bits de audio del volúmen dado."
+
+#: src/libxineadec/xine_a52_decoder.c:814
+msgid "use A/52 dynamic range compression"
+msgstr "use A/52 compresión de rango dinámico"
+
+#: src/libxineadec/xine_a52_decoder.c:815
+msgid ""
+"Dynamic range compression limits the dynamic range of the audio. This means "
+"making the loud sounds softer, and the soft sounds louder, so you can more "
+"easily listen to the audio in a noisy environment without disturbing anyone."
+msgstr ""
+"La compresión de rango dinámico limita el rango dinámico del sonido. Esto "
+"significa hacer más suaves los sonidos fuertes, y más fuertes los sonidos "
+"flojos, de modo que puede escuchar el audio en un entorno ruidoso sin "
+"molestar a nadie."
+
+#: src/libxineadec/xine_a52_decoder.c:822
+msgid "downmix audio to 2 channel surround stereo"
+msgstr "mezcla reducida de audio a 2 canales estereo envolvente"
+
+#: src/libxineadec/xine_a52_decoder.c:823
+msgid ""
+"When you want to listen to multichannel surround sound, but you have only "
+"two speakers or a surround decoder or amplifier which does some sort of "
+"matrix surround decoding like prologic, you should enable this option so "
+"that the additional channels are mixed into the stereo signal."
+msgstr ""
+"Cuando desee escuchar sonido envolvente multicanal, pero sólo tiene dos "
+"altavoces o un decodificador o amplificador envolvente  que hace algún tipo "
+"de decodificación envolvente matricial como prologic, debería activar esta "
+"opción de modo que los canales adicionales se mezclen en la señal estéreo."
+
+#: src/libxineadec/xine_faad_decoder.c:130
+msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
+msgstr "libfaad: libfaad NeAACDecOpen() falló.\n"
+
+#: src/libxineadec/xine_faad_decoder.c:139
+msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
+msgstr "libfaad: libfaad NeAACDecInit2 falló.\n"
+
+#: src/libxineadec/xine_faad_decoder.c:150
+msgid "libfaad: libfaad NeAACDecInit failed.\n"
+msgstr "libfaad: libfaad NeAACDecInit falló.\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:249
+#, c-format
+msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+msgstr "libmusepack: falló lectura mpc_streaminfo_read: %d\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:323
+msgid "libmusepack: data after last frame ignored\n"
+msgstr "libmusepack: datos después de la última trama ignorados\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:334
+msgid "libmusepack: mpc_decoder_initialise failed\n"
+msgstr "libmusepack: falló mpc_decoder_initialise\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:354
+#: src/libxineadec/xine_musepack_decoder.c:369
+#, c-format
+msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgstr "libmusepack: falló mpc_decoder_decode: %d\n"
+
 #: src/libxinevdec/bitplane.c:1272
 #, c-format
 msgid "bitplane: error doing ByteRun1 decompression\n"
@@ -3553,34 +3563,6 @@ msgstr ""
 "\n"
 "* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
 
-#: src/post/planar/eq.c:186
-msgid ""
-"Software equalizer with interactive controls just like the hardware "
-"equalizer, for cards/drivers that do not support brightness and contrast "
-"controls in hardware.\n"
-"\n"
-"Parameters\n"
-"  brightness\n"
-"  contrast\n"
-"\n"
-"Note: It is possible to use frontend's control window to set these "
-"parameters.\n"
-"\n"
-"* mplayer's eq (C) Richard Felker\n"
-msgstr ""
-"Ecualizador en software con controles interactivos justo como el ecualizador "
-"en hardware, para tarjetas/drivers que no soportan controles de brillo y "
-"contraste en hardware.\n"
-"\n"
-"Parámetros\n"
-"  brightness (brillo)\n"
-"  contrast (contraste)\n"
-"\n"
-"Note: es posible usar los la ventana de control de la interfaz para ajustar "
-"estos parámetros.\n"
-"\n"
-"* mplayer's eq (C) Richard Felker\n"
-
 #: src/post/planar/eq2.c:359
 msgid ""
 "Alternative software equalizer that uses lookup tables (very slow), allowing "
@@ -3625,6 +3607,34 @@ msgstr ""
 "\n"
 "* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
 
+#: src/post/planar/eq.c:186
+msgid ""
+"Software equalizer with interactive controls just like the hardware "
+"equalizer, for cards/drivers that do not support brightness and contrast "
+"controls in hardware.\n"
+"\n"
+"Parameters\n"
+"  brightness\n"
+"  contrast\n"
+"\n"
+"Note: It is possible to use frontend's control window to set these "
+"parameters.\n"
+"\n"
+"* mplayer's eq (C) Richard Felker\n"
+msgstr ""
+"Ecualizador en software con controles interactivos justo como el ecualizador "
+"en hardware, para tarjetas/drivers que no soportan controles de brillo y "
+"contraste en hardware.\n"
+"\n"
+"Parámetros\n"
+"  brightness (brillo)\n"
+"  contrast (contraste)\n"
+"\n"
+"Note: es posible usar los la ventana de control de la interfaz para ajustar "
+"estos parámetros.\n"
+"\n"
+"* mplayer's eq (C) Richard Felker\n"
+
 #: src/post/planar/expand.c:251
 #, fuzzy
 msgid ""
@@ -3744,6 +3754,65 @@ msgstr ""
 "\n"
 "* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
 
+#: src/vdr/input_vdr.c:183 src/vdr/input_vdr.c:223 src/vdr/input_vdr.c:2297
+#: src/vdr/input_vdr.c:2394
+#, c-format
+msgid ": input event write: %s.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:713 src/vdr/input_vdr.c:1137
+msgid ": buffer_pool_alloc() failed!\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:782
+#, c-format
+msgid ": flush buffers (vb: %d, ab: %d, vf: %d, af: %d) %s.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1475
+#, c-format
+msgid ": shutting down rpc thread (timeout: %d ms) ...\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1499
+#, fuzzy, c-format
+msgid ": cancelling rpc thread in function %d...\n"
+msgstr ": no puedo crear condición pthread: %s\n"
+
+#: src/vdr/input_vdr.c:1506
+#, fuzzy
+msgid ": joining rpc thread ...\n"
+msgstr "RTP: parando el hilo de lectura...\n"
+
+#: src/vdr/input_vdr.c:1508
+#, fuzzy
+msgid ": rpc thread joined.\n"
+msgstr "RTP: hilo de lectura terminado\n"
+
+#: src/vdr/input_vdr.c:2137 src/vdr/input_vdr.c:2151 src/vdr/input_vdr.c:2169
+#: src/vdr/input_vdr.c:2190 src/vdr/input_vdr.c:2211
+#, fuzzy, c-format
+msgid ": failed to open '%s' (%s)\n"
+msgstr "stdin: falló al abrir '%s'\n"
+
+#: src/vdr/input_vdr.c:2153
+msgid "timeout expired during setup phase"
+msgstr ""
+
+#: src/vdr/input_vdr.c:2227
+#, fuzzy, c-format
+msgid ": can't create new thread (%s)\n"
+msgstr "input_rtp: no se puede crear un hilo nuevo (%s)\n"
+
+#: src/vdr/input_vdr.c:2487
+msgid "VDR display device plugin"
+msgstr ""
+
+#: src/vdr/post_vdr_video.c:435
+#, c-format
+msgid ": osd: (%d, %d)-(%d, %d)@%lg\n"
+msgstr ""
+
 #: src/video_out/video_out_aa.c:311
 msgid "xine video output plugin using the ascii-art library"
 msgstr ""
@@ -4065,8 +4134,8 @@ msgstr ""
 "Ignorado para rutinas estáticas de renderizado.\n"
 
 #: src/video_out/video_out_opengl.c:1918 src/video_out/video_out_vidix.c:1015
-#: src/video_out/video_out_xcbxv.c:1476 src/video_out/video_out_xv.c:1489
-#: src/video_out/video_out_xvmc.c:1461 src/video_out/video_out_xxmc.c:2465
+#: src/video_out/video_out_xcbxv.c:1304 src/video_out/video_out_xv.c:1359
+#: src/video_out/video_out_xvmc.c:1423 src/video_out/video_out_xxmc.c:2531
 msgid "enable double buffering"
 msgstr "activar doble tamponeado"
 
@@ -4160,9 +4229,9 @@ msgstr ""
 msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
 msgstr "video_out_pgx64: Error: falló ioctl (FBIOGATTR)\n"
 
-#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1443
-#: src/video_out/video_out_xv.c:1456 src/video_out/video_out_xvmc.c:1446
-#: src/video_out/video_out_xxmc.c:2432
+#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1271
+#: src/video_out/video_out_xv.c:1326 src/video_out/video_out_xvmc.c:1408
+#: src/video_out/video_out_xxmc.c:2498
 msgid "video overlay colour key"
 msgstr "llave de color de superposición de vídeo"
 
@@ -4326,9 +4395,9 @@ msgstr ""
 msgid "The intensity of the blue colour components."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1477
-#: src/video_out/video_out_xv.c:1490 src/video_out/video_out_xvmc.c:1462
-#: src/video_out/video_out_xxmc.c:2466
+#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1305
+#: src/video_out/video_out_xv.c:1360 src/video_out/video_out_xvmc.c:1424
+#: src/video_out/video_out_xxmc.c:2532
 msgid ""
 "Double buffering will synchronize the update of the video image to the "
 "repainting of the entire screen (\"vertical retrace\"). This eliminates "
@@ -4361,9 +4430,9 @@ msgid "video overlay colour key red component"
 msgstr ""
 
 #: src/video_out/video_out_vidix.c:1159 src/video_out/video_out_vidix.c:1166
-#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1444
-#: src/video_out/video_out_xv.c:1457 src/video_out/video_out_xvmc.c:1447
-#: src/video_out/video_out_xxmc.c:2433
+#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1272
+#: src/video_out/video_out_xv.c:1327 src/video_out/video_out_xvmc.c:1409
+#: src/video_out/video_out_xxmc.c:2499
 msgid ""
 "The colour key is used to tell the graphics card where to overlay the video "
 "image. Try different values, if you experience windows becoming transparent."
@@ -4391,13 +4460,13 @@ msgid "%s: %s: allocating image\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbshm.c:159 src/video_out/video_out_xcbshm.c:169
-#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:272
-#: src/video_out/video_out_xcbxv.c:282 src/video_out/video_out_xcbxv.c:292
-#: src/video_out/video_out_xcbxv.c:304 src/video_out/video_out_xshm.c:204
+#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:267
+#: src/video_out/video_out_xcbxv.c:277 src/video_out/video_out_xcbxv.c:287
+#: src/video_out/video_out_xcbxv.c:299 src/video_out/video_out_xshm.c:204
 #: src/video_out/video_out_xshm.c:221 src/video_out/video_out_xshm.c:232
-#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:296
-#: src/video_out/video_out_xv.c:307 src/video_out/video_out_xv.c:316
-#: src/video_out/video_out_xv.c:352 src/video_out/video_out_xxmc.c:648
+#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:295
+#: src/video_out/video_out_xv.c:322 src/video_out/video_out_xv.c:331
+#: src/video_out/video_out_xv.c:367 src/video_out/video_out_xxmc.c:648
 #: src/video_out/video_out_xxmc.c:659 src/video_out/video_out_xxmc.c:668
 #: src/video_out/video_out_xxmc.c:704
 #, c-format
@@ -4409,8 +4478,8 @@ msgstr ""
 msgid "%s: shared memory error (address error) when allocating image \n"
 msgstr ""
 
-#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:302
-#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:350
+#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:297
+#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:365
 #: src/video_out/video_out_xxmc.c:702
 #, c-format
 msgid "%s: x11 error during shared memory XImage creation\n"
@@ -4440,61 +4509,61 @@ msgstr "video_out_fb: Lo sentimos, su modo de vídeo no fue reconocido .\n"
 msgid "xine video output plugin using the MIT X shared memory extension"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:270 src/video_out/video_out_xv.c:305
+#: src/video_out/video_out_xcbxv.c:265 src/video_out/video_out_xv.c:320
 #: src/video_out/video_out_xxmc.c:657
 #, c-format
 msgid "%s: XvShmCreateImage returned a zero size\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:280 src/video_out/video_out_xv.c:314
+#: src/video_out/video_out_xcbxv.c:275 src/video_out/video_out_xv.c:329
 #: src/video_out/video_out_xxmc.c:666
 #, c-format
 msgid "%s: shared memory error in shmget: %s\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:290
+#: src/video_out/video_out_xcbxv.c:285
 #, c-format
 msgid "%s: shared memory error (address error)\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1294 src/video_out/video_out_xv.c:1301
-#: src/video_out/video_out_xxmc.c:2283
+#: src/video_out/video_out_xcbxv.c:1125 src/video_out/video_out_xv.c:1174
+#: src/video_out/video_out_xxmc.c:2349
 #, c-format
 msgid "%s: Xv extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1336 src/video_out/video_out_xv.c:1338
-#: src/video_out/video_out_xxmc.c:2320
+#: src/video_out/video_out_xcbxv.c:1167 src/video_out/video_out_xv.c:1211
+#: src/video_out/video_out_xxmc.c:2386
 #, c-format
 msgid ""
 "%s: Xv extension is present but I couldn't find a usable yuv12 port.\n"
 "\tLooks like your graphics hardware driver doesn't support Xv?!\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1345
+#: src/video_out/video_out_xcbxv.c:1176
 #, c-format
 msgid ""
 "%s: using Xv port %d from adaptor %s for hardware colorspace conversion and "
 "scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1452 src/video_out/video_out_xv.c:1465
-#: src/video_out/video_out_xvmc.c:1455 src/video_out/video_out_xxmc.c:2441
+#: src/video_out/video_out_xcbxv.c:1280 src/video_out/video_out_xv.c:1335
+#: src/video_out/video_out_xvmc.c:1417 src/video_out/video_out_xxmc.c:2507
 msgid "autopaint colour key"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1453 src/video_out/video_out_xv.c:1466
-#: src/video_out/video_out_xvmc.c:1456 src/video_out/video_out_xxmc.c:2442
+#: src/video_out/video_out_xcbxv.c:1281 src/video_out/video_out_xv.c:1336
+#: src/video_out/video_out_xvmc.c:1418 src/video_out/video_out_xxmc.c:2508
 msgid "Make Xv autopaint its colorkey."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1460 src/video_out/video_out_xv.c:1473
-#: src/video_out/video_out_xxmc.c:2449
+#: src/video_out/video_out_xcbxv.c:1288 src/video_out/video_out_xv.c:1343
+#: src/video_out/video_out_xxmc.c:2515
 msgid "bilinear scaling mode"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1461 src/video_out/video_out_xv.c:1474
-#: src/video_out/video_out_xxmc.c:2450
+#: src/video_out/video_out_xcbxv.c:1289 src/video_out/video_out_xv.c:1344
+#: src/video_out/video_out_xxmc.c:2516
 msgid ""
 "Selects the bilinear scaling mode for Permedia cards. The individual values "
 "are:\n"
@@ -4509,74 +4578,30 @@ msgid ""
 "2 - enable full bilinear filtering"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1513 src/video_out/video_out_xv.c:1523
-#: src/video_out/video_out_xxmc.c:2506
+#: src/video_out/video_out_xcbxv.c:1341 src/video_out/video_out_xv.c:1393
+#: src/video_out/video_out_xxmc.c:2572
 #, fuzzy, c-format
 msgid "%s: this adaptor supports the yv12 format.\n"
 msgstr "video_out_directfb: ¡no se encontró una capa de salida usable!\n"
 
-#: src/video_out/video_out_xcbxv.c:1518 src/video_out/video_out_xv.c:1528
-#: src/video_out/video_out_xxmc.c:2511
+#: src/video_out/video_out_xcbxv.c:1346 src/video_out/video_out_xv.c:1398
+#: src/video_out/video_out_xxmc.c:2577
 #, fuzzy, c-format
 msgid "%s: this adaptor supports the yuy2 format.\n"
 msgstr "video_out_directfb: ¡no se encontró una capa de salida usable!\n"
 
-#: src/video_out/video_out_xcbxv.c:1526 src/video_out/video_out_xv.c:1550
-#: src/video_out/video_out_xxmc.c:2534
+#: src/video_out/video_out_xcbxv.c:1354 src/video_out/video_out_xv.c:1420
+#: src/video_out/video_out_xxmc.c:2600
 msgid "pitch alignment workaround"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1527 src/video_out/video_out_xv.c:1551
-#: src/video_out/video_out_xxmc.c:2535
+#: src/video_out/video_out_xcbxv.c:1355 src/video_out/video_out_xv.c:1421
+#: src/video_out/video_out_xxmc.c:2601
 msgid "Some buggy video drivers need a workaround to function properly."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1533 src/video_out/video_out_xv.c:1557
-#: src/video_out/video_out_xvmc.c:1524
-msgid "deinterlace method (deprecated)"
-msgstr ""
-
-#: src/video_out/video_out_xcbxv.c:1534 src/video_out/video_out_xv.c:1558
-#: src/video_out/video_out_xvmc.c:1525
-msgid ""
-"This config setting is deprecated. You should use the new deinterlacing post "
-"processing settings instead.\n"
-"\n"
-"From the old days of analog television, where the even and odd numbered "
-"lines of a video frame would be displayed at different times comes the idea "
-"to increase motion smoothness by also recording the lines at different "
-"times. This is called \"interlacing\". But unfortunately, todays displays "
-"show the even and odd numbered lines as one complete frame all at the same "
-"time (called \"progressive display\"), which results in ugly frame errors "
-"known as comb artifacts. Software deinterlacing is an approach to reduce "
-"these artifacts. The individual values are:\n"
-"\n"
-"none\n"
-"Disables software deinterlacing.\n"
-"\n"
-"bob\n"
-"Interpolates between the lines for moving parts of the image.\n"
-"\n"
-"weave\n"
-"Similar to bob, but with a tendency to preserve the full resolution, better "
-"for high detail in low movement scenes.\n"
-"\n"
-"greedy\n"
-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
-"\n"
-"onefield\n"
-"Always interpolates and reduces vertical resolution.\n"
-"\n"
-"onefieldxv\n"
-"Same as onefield, but does the interpolation in hardware.\n"
-"\n"
-"linearblend\n"
-"Applies a slight vertical blur to remove the comb artifacts. Good results "
-"with medium CPU usage."
-msgstr ""
-
-#: src/video_out/video_out_xcbxv.c:1588 src/video_out/video_out_xv.c:1631
-#: src/video_out/video_out_xxmc.c:2615
+#: src/video_out/video_out_xcbxv.c:1383 src/video_out/video_out_xv.c:1468
+#: src/video_out/video_out_xxmc.c:2681
 msgid "xine video output plugin using the MIT X video extension"
 msgstr ""
 
@@ -4585,93 +4610,93 @@ msgstr ""
 msgid "%s: shared memory error when allocating image\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:294 src/video_out/video_out_xxmc.c:646
+#: src/video_out/video_out_xv.c:293 src/video_out/video_out_xxmc.c:646
 #, c-format
 msgid "%s: XvShmCreateImage failed\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1348 src/video_out/video_out_xxmc.c:2330
+#: src/video_out/video_out_xv.c:1221 src/video_out/video_out_xxmc.c:2396
 #, c-format
 msgid ""
 "%s: using Xv port %ld from adaptor %s for hardware colorspace conversion and "
 "scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1593
+#: src/video_out/video_out_xvmc.c:1496
 msgid "xine video output plugin using the XvMC X video extension"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1639
+#: src/video_out/video_out_xvmc.c:1542
 msgid "video_out_xvmc: XvMC extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1737
+#: src/video_out/video_out_xvmc.c:1640
 msgid ""
 "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
 "port.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1746
+#: src/video_out/video_out_xvmc.c:1649
 #, c-format
 msgid ""
 "video_out_xvmc: using Xv port %ld from adaptor %s\n"
 "                for hardware colorspace conversion and scaling\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1751
+#: src/video_out/video_out_xvmc.c:1654
 msgid "                idct and motion compensation acceleration \n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1753
+#: src/video_out/video_out_xvmc.c:1656
 msgid "                motion compensation acceleration only\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1755
+#: src/video_out/video_out_xvmc.c:1658
 msgid "                no XvMC support \n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1756
+#: src/video_out/video_out_xvmc.c:1659
 #, c-format
 msgid "                With Overlay = %d; UnsignedIntra = %d.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2540
+#: src/video_out/video_out_xxmc.c:2606
 msgid "Make XvMC allocate more frames for better buffering."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2541
+#: src/video_out/video_out_xxmc.c:2607
 msgid ""
 "Some XvMC implementations allow more than 8 frames.\n"
 "This option, when turned on, makes the driver try to\n"
 "allocate 15 frames. A must for unichrome and live VDR.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2547
+#: src/video_out/video_out_xxmc.c:2613
 msgid "Unichrome cpu save"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2548
+#: src/video_out/video_out_xxmc.c:2614
 msgid ""
 "Saves CPU time by sleeping while decoder works.\n"
 "Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n"
 "Experimental.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2554
+#: src/video_out/video_out_xxmc.c:2620
 msgid "Fix buggy NVIDIA XvMC subpicture colors"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2555
+#: src/video_out/video_out_xxmc.c:2621
 msgid ""
 "There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
 "look blue and vice versa. This option provides a workaround.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2560
+#: src/video_out/video_out_xxmc.c:2626
 msgid "Use bob as accelerated deinterlace method."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2561
+#: src/video_out/video_out_xxmc.c:2627
 msgid ""
 "When interlacing is enabled for hardware accelerated frames,\n"
 "Alternate between top and bottom field at double the frame rate.\n"
@@ -4695,11 +4720,11 @@ msgstr ""
 msgid "x11osd: unscaled overlay created (%s mode).\n"
 msgstr ""
 
-#: src/xine-engine/alphablend.c:2123
+#: src/xine-engine/alphablend.c:2146
 msgid "disable exact alpha blending of overlays"
 msgstr "desactivar la mezcla alfa exacta de superposiciones"
 
-#: src/xine-engine/alphablend.c:2124
+#: src/xine-engine/alphablend.c:2147
 msgid ""
 "If you experience a performance impact when an On Screen Display or other "
 "overlays like DVD subtitles are active, then you might want to enable this "
@@ -5238,70 +5263,70 @@ msgid ""
 "foreground-border-background."
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:380
+#: src/xine-engine/video_decoder.c:390
 #, c-format
 msgid "video_decoder: no plugin available to handle '%s'\n"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:459
+#: src/xine-engine/video_decoder.c:469
 #, c-format
 msgid "video_decoder: error, unknown buffer type: %08x\n"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:495
+#: src/xine-engine/video_decoder.c:505
 msgid "number of video buffers"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:496
+#: src/xine-engine/video_decoder.c:506
 msgid ""
 "The number of video buffers (each is 8k in size) xine uses in its internal "
 "queue. Higher values mean smoother playback for unreliable inputs, but also "
 "increased latency and memory consumption."
 msgstr ""
 
-#: src/xine-engine/video_out.c:642
+#: src/xine-engine/video_out.c:671
 #, c-format
 msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
 msgstr "%d marcos llegados, %d frames saltados, %d frames descartados\n"
 
-#: src/xine-engine/video_out.c:815
+#: src/xine-engine/video_out.c:844
 #, c-format
 msgid ""
 "video_out: throwing away image with pts %<PRId64> because it's too old "
 "(diff : %<PRId64>).\n"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1794
+#: src/xine-engine/video_out.c:1863
 msgid "default number of video frames"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1795
+#: src/xine-engine/video_out.c:1864
 msgid ""
 "The default number of video frames to request from xine video out driver. "
 "Some drivers will override this setting with their own values."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1834
+#: src/xine-engine/video_out.c:1921
 msgid "percentage of skipped frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1835
+#: src/xine-engine/video_out.c:1922
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not decoded in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1840
+#: src/xine-engine/video_out.c:1927
 msgid "percentage of discarded frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1841
+#: src/xine-engine/video_out.c:1928
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not scheduled for display in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1875
+#: src/xine-engine/video_out.c:1965
 msgid "video_out: sorry, this should not happen. please restart xine.\n"
 msgstr ""
 "video_out: Lo siento, esto no debería ocurrir. Por favor, reinicie xine.\n"
@@ -5345,127 +5370,127 @@ msgid ""
 "accelerated, this can dramatically reduce CPU usage."
 msgstr ""
 
-#: src/xine-engine/xine.c:706 src/xine-engine/xine.c:813
-#: src/xine-engine/xine.c:852 src/xine-engine/xine.c:888
-#: src/xine-engine/xine.c:900 src/xine-engine/xine.c:913
-#: src/xine-engine/xine.c:926 src/xine-engine/xine.c:939
-#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:990
-#: src/xine-engine/xine.c:1025
+#: src/xine-engine/xine.c:771 src/xine-engine/xine.c:878
+#: src/xine-engine/xine.c:917 src/xine-engine/xine.c:953
+#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:978
+#: src/xine-engine/xine.c:991 src/xine-engine/xine.c:1004
+#: src/xine-engine/xine.c:1030 src/xine-engine/xine.c:1055
+#: src/xine-engine/xine.c:1090
 msgid "xine: error while parsing mrl\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:742
+#: src/xine-engine/xine.c:807
 #, c-format
 msgid "xine: found input plugin  : %s\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:760
+#: src/xine-engine/xine.c:825
 #, c-format
 msgid "xine: input plugin cannot open MRL [%s]\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:776
+#: src/xine-engine/xine.c:841
 #, c-format
 msgid "xine: cannot find input plugin for MRL [%s]\n"
 msgstr "xine: no se puede encontrar el complemento de entrada para MRL [%s]\n"
 
-#: src/xine-engine/xine.c:802
+#: src/xine-engine/xine.c:867
 #, c-format
 msgid "xine: specified demuxer %s failed to start\n"
 msgstr "xine_play: fallo al iniciar el demultiplexor %s especificado\n"
 
-#: src/xine-engine/xine.c:838
+#: src/xine-engine/xine.c:903
 #, c-format
 msgid "xine: join rip input plugin\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:845
+#: src/xine-engine/xine.c:910
 msgid "xine: error opening rip input plugin instance\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:876
+#: src/xine-engine/xine.c:941
 #, c-format
 msgid "xine: last_probed demuxer %s failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:905
+#: src/xine-engine/xine.c:970
 msgid "ignoring video\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:918
+#: src/xine-engine/xine.c:983
 msgid "ignoring audio\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:931
+#: src/xine-engine/xine.c:996
 msgid "ignoring subpicture\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:944
+#: src/xine-engine/xine.c:1009
 msgid "input cache plugin disabled\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1015
+#: src/xine-engine/xine.c:1080
 #, c-format
 msgid "subtitle mrl opened '%s'\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1019
+#: src/xine-engine/xine.c:1084
 msgid "xine: error opening subtitle mrl\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1051
+#: src/xine-engine/xine.c:1116
 #, c-format
 msgid "xine: error while parsing MRL\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1058
+#: src/xine-engine/xine.c:1123
 #, c-format
 msgid "xine: changing option '%s' from MRL isn't permitted\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1078
+#: src/xine-engine/xine.c:1143
 #, c-format
 msgid "xine: couldn't find demux for >%s<\n"
 msgstr "xine: no se pudo encontrar un demultiplexor para >%s<\n"
 
-#: src/xine-engine/xine.c:1094
+#: src/xine-engine/xine.c:1159
 #, c-format
 msgid "xine: found demuxer plugin: %s\n"
 msgstr "xine: encontrado complemento demultiplexor: %s\n"
 
-#: src/xine-engine/xine.c:1114
+#: src/xine-engine/xine.c:1179
 #, c-format
 msgid "xine: demuxer failed to start\n"
 msgstr "xine: fallo al iniciar el demultiplexor\n"
 
-#: src/xine-engine/xine.c:1179
+#: src/xine-engine/xine.c:1244
 #, c-format
 msgid "xine_play: no demux available\n"
 msgstr "xine_play: no hay disponible un demultiplexor\n"
 
-#: src/xine-engine/xine.c:1249
+#: src/xine-engine/xine.c:1314
 #, c-format
 msgid "xine_play: demux failed to start\n"
 msgstr "xine_play: fallo al iniciar el demultiplexor\n"
 
-#: src/xine-engine/xine.c:1527
+#: src/xine-engine/xine.c:1592
 #, c-format
 msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1532
+#: src/xine-engine/xine.c:1597
 msgid "The specified save_dir might be a security risk."
 msgstr ""
 
-#: src/xine-engine/xine.c:1561
+#: src/xine-engine/xine.c:1626
 msgid "xine: locale not supported by C library\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1570
+#: src/xine-engine/xine.c:1635
 msgid "media format detection strategy"
 msgstr ""
 
-#: src/xine-engine/xine.c:1571
+#: src/xine-engine/xine.c:1636
 msgid ""
 "xine offers various methods to detect the media format of input to play. The "
 "individual values are:\n"
@@ -5483,11 +5508,11 @@ msgid ""
 "Detect by file name extension only.\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1589
+#: src/xine-engine/xine.c:1654
 msgid "directory for saving streams"
 msgstr ""
 
-#: src/xine-engine/xine.c:1590
+#: src/xine-engine/xine.c:1655
 msgid ""
 "When using the stream save feature, files will be written only into this "
 "directory.\n"
@@ -5497,11 +5522,11 @@ msgid ""
 "content in any file."
 msgstr ""
 
-#: src/xine-engine/xine.c:1601
+#: src/xine-engine/xine.c:1666
 msgid "allow implicit changes to the configuration (e.g. by MRL)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1602
+#: src/xine-engine/xine.c:1667
 msgid ""
 "If enabled, you allow xine to change your configuration without explicit "
 "actions from your side. For example configuration changes demanded by MRLs "
@@ -5511,26 +5536,26 @@ msgid ""
 "configuration, you might end with a totally messed up xine."
 msgstr ""
 
-#: src/xine-engine/xine.c:1616
+#: src/xine-engine/xine.c:1681
 msgid "Timeout for network stream reading (in seconds)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1617
+#: src/xine-engine/xine.c:1682
 msgid ""
 "Specifies the timeout when reading from network streams, in seconds. Too low "
 "values might stop streaming when the source is slow or the bandwidth is "
 "occupied, too high values will freeze the player if the connection is lost."
 msgstr ""
 
-#: src/xine-engine/xine.c:1969
+#: src/xine-engine/xine.c:2034
 msgid "messages"
 msgstr "mensajes"
 
-#: src/xine-engine/xine.c:1970
+#: src/xine-engine/xine.c:2035
 msgid "plugin"
 msgstr "complemento"
 
-#: src/xine-engine/xine.c:1971
+#: src/xine-engine/xine.c:2036
 msgid "trace"
 msgstr "traza"
 
diff --git a/po/eu.po b/po/eu.po
index c9feed8a7..cb1613049 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib-1\n"
 "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-04-24 21:48+0100\n"
+"POT-Creation-Date: 2007-06-02 13:14+0200\n"
 "PO-Revision-Date: 2005-02-17 14:29+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: lubrezale <librezale@librezale.org>\n"
@@ -843,6 +843,13 @@ msgid "xine audio output plugin using sun-compliant audio devices/drivers"
 msgstr ""
 "xine audio irteera plugina sun-kompilaturiko audio gailu/kontrolatzailea"
 
+#: src/combined/xine_ogg_demuxer.c:810
+#, c-format
+msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+msgstr ""
+"ogg: vorbis audio pista esan da baina ez da vorbis korronte bururik "
+"aurkitu.\n"
+
 #: src/demuxers/demux_asf.c:428
 #, c-format
 msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
@@ -983,13 +990,6 @@ msgstr ""
 "demux_mpeg_pes:1 0x%02x korronte pribatu ezezaguna. Mesedez berri eman xine "
 "garatzaileei.\n"
 
-#: src/demuxers/demux_ogg.c:802
-#, c-format
-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
-msgstr ""
-"ogg: vorbis audio pista esan da baina ez da vorbis korronte bururik "
-"aurkitu.\n"
-
 #: src/demuxers/demux_snd.c:104
 #, c-format
 msgid "demux_snd: bad header parameters\n"
@@ -1029,18 +1029,6 @@ msgstr ""
 msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
 msgstr "demux_wc3movie: Arazo bat dago paleta zatiak kargatzerakoan\n"
 
-#: src/dxr3/dxr3.h:32
-msgid "DXR3 device number"
-msgstr "DXR3 gailu zenbakia"
-
-#: src/dxr3/dxr3.h:33
-msgid ""
-"If you have more than one DXR3 in your computer, you can specify which one "
-"to use here."
-msgstr ""
-"Zure ordenagailuan DXR3 gailu bat baino gehiago izan ezkero zein erabili "
-"nahi duzun ezarri dezakezu."
-
 #: src/dxr3/dxr3_decode_spu.c:253
 #, c-format
 msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
@@ -1148,6 +1136,18 @@ msgid ""
 msgstr ""
 "dxr3_decode_video: ABISUA: marko abiaradura PAT-etik NTSC-ra biurtzen\n"
 
+#: src/dxr3/dxr3.h:32
+msgid "DXR3 device number"
+msgstr "DXR3 gailu zenbakia"
+
+#: src/dxr3/dxr3.h:33
+msgid ""
+"If you have more than one DXR3 in your computer, you can specify which one "
+"to use here."
+msgstr ""
+"Zure ordenagailuan DXR3 gailu bat baino gehiago izan ezkero zein erabili "
+"nahi duzun ezarri dezakezu."
+
 #: src/dxr3/dxr3_mpeg_encoders.c:125
 msgid "dxr3_mpeg_encoder: failed to init librte\n"
 msgstr "dxr3_mpeg_encoder: huts librte abiaraztean\n"
@@ -1461,30 +1461,30 @@ msgstr ""
 "video_out_dxr3: ERROREA gainjarri abiarazte fitxategia irakurtzeab. Run "
 "abiarazi!\n"
 
-#: src/input/input_cdda.c:1608
+#: src/input/input_cdda.c:1611
 #, c-format
 msgid "%s: can't connect to %s:%d\n"
 msgstr "%s: Ezin da %s-ra konektatu: %d\n"
 
-#: src/input/input_cdda.c:1655
+#: src/input/input_cdda.c:1658
 #, c-format
 msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
 msgstr "input_cdda: arrakastatsuki konektaturik cddb zerbitzarira'%s:%d'.\n"
 
-#: src/input/input_cdda.c:1660
+#: src/input/input_cdda.c:1663
 #, c-format
 msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
 msgstr "input_cdda: huts cddb zerbitzarira konektatzerakoan '%s:%d' (%s).\n"
 
-#: src/input/input_cdda.c:2690
+#: src/input/input_cdda.c:2693
 msgid "CD Digital Audio (aka. CDDA)"
 msgstr "CD Audio Digitala (hemen. CDDA)"
 
-#: src/input/input_cdda.c:2742
+#: src/input/input_cdda.c:2745
 msgid "device used for CD audio"
 msgstr "CD audio-k erabiliko duen gailua"
 
-#: src/input/input_cdda.c:2743
+#: src/input/input_cdda.c:2746
 msgid ""
 "The path to the device, usually a CD or DVD drive, which you intend to use "
 "for playing audio CDs."
@@ -1492,11 +1492,11 @@ msgstr ""
 "Gailuaren bidea, arruntean audio CD erreproduzitzeko erabili nahi duzun CD "
 "edo DVD gailua."
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid "query CDDB"
 msgstr "CDDB galderak"
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid ""
 "Enables CDDB queries, which will give you convenient title and track names "
 "for your audio CDs.\n"
@@ -1509,11 +1509,11 @@ msgstr ""
 "Izan kontutan zuk ez baduzu CDDB zerbitzari pribatu bat, informazio hau zure "
 "ohiturak grabatuko dituen internet ostalari batetatik jasoko da."
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid "CDDB server name"
 msgstr "CDDB zerbitzari izena"
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid ""
 "The CDDB server used to retrieve the title and track information from.\n"
 "This setting is security critical, because the sever will receive "
@@ -1525,20 +1525,20 @@ msgstr ""
 "entzuteko ohituraz informazioa jaso eta erantzun zitalekin erantzun bait "
 "dezake. Ziurtatu konfidantza duzun zerbitzari bat izatea."
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "CDDB server port"
 msgstr "CDDB zerbitzari ataka"
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "The server port used to retrieve the title and track information from."
 msgstr ""
 "Izenburu eta pista informazioa jasotzeko erabiliko den zerbitzari ataka."
 
-#: src/input/input_cdda.c:2771
+#: src/input/input_cdda.c:2774
 msgid "slow down disc drive to this speed factor"
 msgstr "gutxitu diska gailua abiadura faktore honetara"
 
-#: src/input/input_cdda.c:2772
+#: src/input/input_cdda.c:2775
 msgid ""
 "Since some CD or DVD drives make some really loud noises because of the fast "
 "disc rotation, xine will try to slow them down. With standard CD or DVD "
@@ -1552,63 +1552,63 @@ msgstr ""
 "geldoarazteak ez du ezertan txikiagotzen erreprodukzio kalitatea.\n"
 "Zero balioa poliagotzea ezgaitzen da."
 
-#: src/input/input_dvb.c:899
+#: src/input/input_dvb.c:900
 #, fuzzy, c-format
 msgid "input_dvb: failed to open dvb channel file '%s': %s\n"
 msgstr "input_dvb: huts '%s' dvb kanal fitxategia irekitzerakoan\n"
 
-#: src/input/input_dvb.c:905
+#: src/input/input_dvb.c:906
 #, fuzzy, c-format
 msgid "input_dvb: dvb channel file '%s' is not a plain file\n"
 msgstr "input_dvb: huts '%s' dvb kanal fitxategia irekitzerakoan\n"
 
-#: src/input/input_dvb.c:2115 src/input/input_dvb.c:2943
+#: src/input/input_dvb.c:2116 src/input/input_dvb.c:2948
 msgid "input_dvb: tuner_set_channel failed\n"
 msgstr "input_dvb: irrati_ezarpen_kanalak huts egin du\n"
 
-#: src/input/input_dvb.c:2743
+#: src/input/input_dvb.c:2748
 msgid "input_dvb: cannot open dvb device\n"
 msgstr "input_dvb: ezin da dvb gailua ireki\n"
 
-#: src/input/input_dvb.c:2767
+#: src/input/input_dvb.c:2772
 #, c-format
 msgid "input_dvb: channel %d out of range, defaulting to 0\n"
 msgstr "input_dvb: %d kanala eremutik kanpo, 0-ra lehenesten\n"
 
-#: src/input/input_dvb.c:2778
+#: src/input/input_dvb.c:2783
 #, c-format
 msgid "input_dvb: searching for channel %s\n"
 msgstr "input_dvb: %s kanala bilatzen\n"
 
-#: src/input/input_dvb.c:2801
+#: src/input/input_dvb.c:2806
 #, c-format
 msgid "input_dvb: exact match for %s not found: trying partial matches\n"
 msgstr ""
 "input_dvb: ez da %s-ren parekatze zehatzik aurkitu: parekatze hurbilduak "
 "saiatzen\n"
 
-#: src/input/input_dvb.c:2808
+#: src/input/input_dvb.c:2813
 #, c-format
 msgid "input_dvb: found matching channel %s\n"
 msgstr "input_dvb: %s kanal parekatzea aurkiturik\n"
 
-#: src/input/input_dvb.c:2821
+#: src/input/input_dvb.c:2826
 #, fuzzy, c-format
 msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
 msgstr "input_dvb: %s kanala ez da kanaletan aurkitu, 0 kanalera lehenesten\n"
 
-#: src/input/input_dvb.c:2827
+#: src/input/input_dvb.c:2832
 #, fuzzy
 msgid ""
 "input_dvb: invalid channel specification, defaulting to last viewed "
 "channel.\n"
 msgstr "input_dvb: baliogabeko kanal ezarpena, 0 kanalera lehenesten\n"
 
-#: src/input/input_dvb.c:2833
+#: src/input/input_dvb.c:2838
 msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
 msgstr "input_dvb: baliogabeko kanal ezarpena, 0 kanalera lehenesten\n"
 
-#: src/input/input_dvb.c:2845
+#: src/input/input_dvb.c:2850
 msgid ""
 "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
 "S)\n"
@@ -1616,7 +1616,7 @@ msgstr ""
 "input_dvb: dvbs mrl ezarririk baina sintonizatzailea ez dirudu QPSK (DVB-S) "
 "dagoenik\n"
 
-#: src/input/input_dvb.c:2865
+#: src/input/input_dvb.c:2870
 msgid ""
 "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
 "T)\n"
@@ -1624,7 +1624,7 @@ msgstr ""
 "input_dvb: dvbt mrl ezarririk baina sintonizatzailea ez dirudu OFDM (DVB-T) "
 "dagoenik\n"
 
-#: src/input/input_dvb.c:2888 src/input/input_dvb.c:2914
+#: src/input/input_dvb.c:2893
 msgid ""
 "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
 "C)\n"
@@ -1632,21 +1632,30 @@ msgstr ""
 "input_dvb: dvbc mrl ezarririk baina sintonizatzailea ez dirudu QAM (DVB-C) "
 "dagoenik\n"
 
-#: src/input/input_dvb.c:2949
+#: src/input/input_dvb.c:2919
+#, fuzzy
+msgid ""
+"input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-"
+"A)\n"
+msgstr ""
+"input_dvb: dvbc mrl ezarririk baina sintonizatzailea ez dirudu QAM (DVB-C) "
+"dagoenik\n"
+
+#: src/input/input_dvb.c:2954
 #, c-format
 msgid "input_dvb: cannot open dvr device '%s'\n"
 msgstr "input_dvb: ezin da '%s' dvr gailua ireki\n"
 
-#: src/input/input_dvb.c:2971
+#: src/input/input_dvb.c:2976
 #, fuzzy
 msgid "input_dvb: cannot create EPG updater thread\n"
 msgstr "input_rtp: Ezin da hari berria sortu (%s)\n"
 
-#: src/input/input_dvb.c:3033
+#: src/input/input_dvb.c:3038
 msgid "use DVB 'center cutout' (zoom)"
 msgstr ""
 
-#: src/input/input_dvb.c:3034
+#: src/input/input_dvb.c:3039
 msgid ""
 "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
 "frame."
@@ -1654,35 +1663,35 @@ msgstr ""
 "Honek pantaila osoko erreprdukzioa 4:3 formatu edukiak 16:9 markotan "
 "transmititzea gaitzen du."
 
-#: src/input/input_dvb.c:3127
+#: src/input/input_dvb.c:3132
 msgid "DVB (Digital TV) input plugin"
 msgstr "DVB (Telebista Digitala) sarrera plugina"
 
-#: src/input/input_dvb.c:3244
+#: src/input/input_dvb.c:3249
 msgid "Remember last DVB channel watched"
 msgstr ""
 
-#: src/input/input_dvb.c:3245
+#: src/input/input_dvb.c:3250
 msgid ""
 "On autoplay, xine will remember and switch to the channel indicated in media."
 "dvb.last_channel. "
 msgstr ""
 
-#: src/input/input_dvb.c:3252
+#: src/input/input_dvb.c:3257
 #, fuzzy
 msgid "Last DVB channel viewed"
 msgstr "bistaratu DVB kanal izena"
 
-#: src/input/input_dvb.c:3253
+#: src/input/input_dvb.c:3258
 msgid "If enabled xine will remember and switch to this channel. "
 msgstr ""
 
-#: src/input/input_dvb.c:3259
+#: src/input/input_dvb.c:3264
 #, fuzzy
 msgid "Number of dvb card to use."
 msgstr "audio buffer kopurua"
 
-#: src/input/input_dvb.c:3260
+#: src/input/input_dvb.c:3265
 msgid ""
 "Leave this at zero unless you really have more than 1 card in your system."
 msgstr ""
@@ -1884,88 +1893,88 @@ msgstr ""
 msgid "gnome-vfs input plugin as shipped with xine"
 msgstr "gnome-vfs sarrera plugina, xinerekin banatzen dena"
 
-#: src/input/input_http.c:174
+#: src/input/input_http.c:176
 #, c-format
 msgid "input_http: gethostbyname(%s) failed: %s\n"
 msgstr "input_http: gethostbyname(%s)-ek huts egin du: %s\n"
 
-#: src/input/input_http.c:400 src/input/input_http.c:943
+#: src/input/input_http.c:402 src/input/input_http.c:957
 #, c-format
 msgid "input_http: read error %d\n"
 msgstr "input_http: irekurketa errorea %d\n"
 
-#: src/input/input_http.c:627
+#: src/input/input_http.c:629
 msgid "Connecting HTTP server..."
 msgstr "HTTP zerbitzarira konektatzen..."
 
-#: src/input/input_http.c:819
+#: src/input/input_http.c:820
 #, c-format
 msgid "input_http: invalid http answer\n"
 msgstr "input_http: http erantzun baliogabea\n"
 
-#: src/input/input_http.c:825
+#: src/input/input_http.c:826
 #, c-format
 msgid "input_http: 3xx redirection: >%d %s<\n"
 msgstr "input_http: 3xx birbideratzea: >%d %s<\n"
 
-#: src/input/input_http.c:830 src/input/input_http.c:836
-#: src/input/input_http.c:843
+#: src/input/input_http.c:831 src/input/input_http.c:836
+#: src/input/input_http.c:842 src/input/input_http.c:849
 #, c-format
 msgid "input_http: http status not 2xx: >%d %s<\n"
 msgstr "input_http: http egoera ez da 2xx: >%d %s<\n"
 
-#: src/input/input_http.c:853
+#: src/input/input_http.c:859
 #, fuzzy, c-format
 msgid "input_http: content length = %<PRIdMAX> bytes\n"
 msgstr "input_http: eduki luzera = %Ld bite\n"
 
-#: src/input/input_http.c:922
+#: src/input/input_http.c:932
 #, fuzzy, c-format
 msgid "input_http: buffer exhausted after %d bytes."
 msgstr "input_http: irekurketa errorea %d\n"
 
-#: src/input/input_http.c:996
+#: src/input/input_http.c:1010
 msgid "http input plugin"
 msgstr "http sarrera plugina"
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "HTTP proxy host"
 msgstr "HTTP proxy ostalaria"
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "The hostname of the HTTP proxy."
 msgstr "HTTP proxy-aren ostalari izena."
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "HTTP proxy port"
 msgstr "HTTP proxy ataka"
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "The port number of the HTTP proxy."
 msgstr "HTTP proxy-aren ataka zenbakia."
 
-#: src/input/input_http.c:1076
+#: src/input/input_http.c:1090
 msgid "HTTP proxy username"
 msgstr "HTTP proxy erabiltzailea"
 
-#: src/input/input_http.c:1077
+#: src/input/input_http.c:1091
 msgid "The user name for the HTTP proxy."
 msgstr "HTTP proxy-aren erabiltzaile izena"
 
-#: src/input/input_http.c:1080
+#: src/input/input_http.c:1094
 msgid "HTTP proxy password"
 msgstr "HTTP proxy pasahitza"
 
-#: src/input/input_http.c:1081
+#: src/input/input_http.c:1095
 msgid "The password for the HTTP proxy."
 msgstr "HRRP proxy-aren pasahitza."
 
-#: src/input/input_http.c:1084
+#: src/input/input_http.c:1098
 #, fuzzy
 msgid "Domains for which to ignore the HTTP proxy"
 msgstr "Domeinuak, non ez den HTTP proxy-a erabiliko"
 
-#: src/input/input_http.c:1085
+#: src/input/input_http.c:1099
 msgid ""
 "A comma-separated list of domain names for which the proxy is to be "
 "ignored.\n"
@@ -2176,31 +2185,31 @@ msgstr "Buffer askieza..."
 msgid "Adjusting..."
 msgstr "Egokitzen..."
 
-#: src/input/input_v4l.c:660
+#: src/input/input_v4l.c:658
 msgid "Tuner name not found\n"
 msgstr "sintonizatzaile izena ez da aurkitu\n"
 
-#: src/input/input_v4l.c:1876
+#: src/input/input_v4l.c:1874
 msgid "v4l tv input plugin"
 msgstr "v4l tv sarrera plugina"
 
-#: src/input/input_v4l.c:1880
+#: src/input/input_v4l.c:1878
 msgid "v4l radio input plugin"
 msgstr "v4l irrati sarrera plugina"
 
-#: src/input/input_v4l.c:1912
+#: src/input/input_v4l.c:1910
 msgid "v4l video device"
 msgstr "v4l bideo gailua"
 
-#: src/input/input_v4l.c:1913
+#: src/input/input_v4l.c:1911
 msgid "The path to your Video4Linux video device."
 msgstr "Video4Linux bideo gailuaren bidea."
 
-#: src/input/input_v4l.c:1938
+#: src/input/input_v4l.c:1936
 msgid "v4l radio device"
 msgstr "v4l irrati gailua"
 
-#: src/input/input_v4l.c:1939
+#: src/input/input_v4l.c:1937
 msgid "The path to your Video4Linux radio device."
 msgstr "Video4Linux irrati gailuaren bidea."
 
@@ -2366,56 +2375,56 @@ msgstr "Erroreauneko segmentu zenbakia eskuratzerakoan"
 msgid "Should have converted this above"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:191
+#: src/input/vcd/xineplug_inp_vcd.c:192
 msgid "failed to find a device with a VCD"
 msgstr "huts VCD bat duen gailu bat bilatzerakoan"
 
-#: src/input/vcd/xineplug_inp_vcd.c:328
+#: src/input/vcd/xineplug_inp_vcd.c:329
 msgid "was passed a null class parameter"
 msgstr "baliogabeko klase parametroa pasa zen"
 
-#: src/input/vcd/xineplug_inp_vcd.c:972
+#: src/input/vcd/xineplug_inp_vcd.c:982
 msgid "Invalid current entry type"
 msgstr "baliogabeko sarrera mota"
 
-#: src/input/vcd/xineplug_inp_vcd.c:996
+#: src/input/vcd/xineplug_inp_vcd.c:1006
 msgid ""
 "Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
 msgstr ""
 "Bideo CD plugina PBC.rekin eta onarpen hauekin: (X)VCD, (X)SVCD, HQVCD, "
 "CVD ... "
 
-#: src/input/vcd/xineplug_inp_vcd.c:1097
+#: src/input/vcd/xineplug_inp_vcd.c:1107
 msgid "selection has no RETURN entry"
 msgstr "Aukerak ez du RETURN sarrerarik"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1126
+#: src/input/vcd/xineplug_inp_vcd.c:1136
 #, fuzzy
 msgid "DEFAULT selected, but PBC is not on."
 msgstr "LEHENETSIRIKOA aukeraturik baina PBC ez dago gaiturik."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1131
+#: src/input/vcd/xineplug_inp_vcd.c:1141
 msgid "selection has no NEXT entry"
 msgstr "Aukerak ez du HURRENGO sarrerarik"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1139
+#: src/input/vcd/xineplug_inp_vcd.c:1149
 msgid "selection has no PREVIOUS entry"
 msgstr "Aukerak ez du AURREKO sarrerarik"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1146
+#: src/input/vcd/xineplug_inp_vcd.c:1156
 msgid "Unknown event type: "
 msgstr "gertaera mota ezezaguna: "
 
-#: src/input/vcd/xineplug_inp_vcd.c:1446 src/input/vcd/xineplug_inp_vcd.c:1493
+#: src/input/vcd/xineplug_inp_vcd.c:1452 src/input/vcd/xineplug_inp_vcd.c:1499
 msgid "The above message had unknown vcdimager log level"
 msgstr "Goiko mezuak vcdimager arazpen maila ezezagun bat du"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1824
+#: src/input/vcd/xineplug_inp_vcd.c:1830
 #, fuzzy
 msgid "VCD default type to use on autoplay"
 msgstr "VCD auto-erreproduzitzea erabiltzeko lehenetsiriko mota"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1825
+#: src/input/vcd/xineplug_inp_vcd.c:1831
 #, fuzzy
 msgid ""
 "The VCD play unit to use when none is specified in an MRL, e.g. vcd:// or "
@@ -2424,12 +2433,12 @@ msgstr ""
 "MRL-an ez ezarri ezkero erabiliko den erreprodukzio unitatea, adib. vcd:// "
 "edo vcd:///dev/dvd:"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1835
+#: src/input/vcd/xineplug_inp_vcd.c:1841
 #, fuzzy
 msgid "CD-ROM drive used for VCD when none given"
 msgstr "Lehenetsiriko CD gailya VCD-entzat ematen ez denean"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1836
+#: src/input/vcd/xineplug_inp_vcd.c:1842
 msgid ""
 "What to use if no drive specified. If the setting is empty, xine will scan "
 "for CD drives."
@@ -2437,31 +2446,31 @@ msgstr ""
 "Zein erabili gailurik ez ezartzean. Ezarpen hau hutsik utzi ezkero xinek "
 "gailu guztietan bilatuko du."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1846
+#: src/input/vcd/xineplug_inp_vcd.c:1852
 #, fuzzy
 msgid "VCD position slider range"
 msgstr "posizio graduatzaile bitartea"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1847
+#: src/input/vcd/xineplug_inp_vcd.c:1853
 msgid ""
 "range that the stream playback position slider represents playing a VCD."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1855
+#: src/input/vcd/xineplug_inp_vcd.c:1861
 #, fuzzy
 msgid "VCD read-ahead caching?"
 msgstr "irakuketa-goiburu gordetzea"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1856
+#: src/input/vcd/xineplug_inp_vcd.c:1862
 msgid "Class may lead to jerky playback on low-end machines."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1866
+#: src/input/vcd/xineplug_inp_vcd.c:1872
 #, fuzzy
 msgid "automatically advance VCD track/entry"
 msgstr "automatikoki aurrera pista/sarrera"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1867
+#: src/input/vcd/xineplug_inp_vcd.c:1873
 msgid ""
 "If enabled, we should automatically advance to the next entry or track. Used "
 "only when playback control (PBC) is disabled."
@@ -2469,24 +2478,24 @@ msgstr ""
 "Gaiturik dagoenean, hurrengo sarrera edo pista automatikoki erreproduzituko "
 "du. Erreprodukzio kontrola (PBC) ezgaiturik dagoenean bakarrik erabiliko da."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1876
+#: src/input/vcd/xineplug_inp_vcd.c:1882
 #, fuzzy
 msgid "show 'rejected' VCD LIDs"
 msgstr "bistaratu ukaturiko LID-ak"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1877
+#: src/input/vcd/xineplug_inp_vcd.c:1883
 msgid ""
 "Some playback list IDs (LIDs) are marked not showable, but you can see them "
 "in the MRL list if this is set. Rejected entries are marked with an asterisk "
 "(*) appended to the MRL."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1888
+#: src/input/vcd/xineplug_inp_vcd.c:1894
 #, fuzzy
 msgid "VCD format string for display banner"
 msgstr "Bistaratze banerraren kate formatua"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1889
+#: src/input/vcd/xineplug_inp_vcd.c:1895
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are:\n"
@@ -2507,12 +2516,12 @@ msgid ""
 " %% : a %\n"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1914
+#: src/input/vcd/xineplug_inp_vcd.c:1920
 #, fuzzy
 msgid "VCD format string for stream comment field"
 msgstr "Korronte iruzkin eremuaren kate formatua"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1915
+#: src/input/vcd/xineplug_inp_vcd.c:1921
 #, fuzzy
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
@@ -2524,12 +2533,12 @@ msgstr ""
 "Formatu espezifikazioakehuneko ikur bates hasten dira. Ezpezifikazioak: %A, %"
 "C,  %c, %F, %I, %L, %N, %P, %p, %S, %T, %V, %v, eta %%."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1927
+#: src/input/vcd/xineplug_inp_vcd.c:1933
 #, fuzzy
 msgid "VCD debug flag mask"
 msgstr "arazpen bandera maskara"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1928
+#: src/input/vcd/xineplug_inp_vcd.c:1934
 msgid ""
 "For tracking down bugs in the VCD plugin. Mask values are:\n"
 "   1: Meta information\n"
@@ -2546,60 +2555,6 @@ msgid ""
 "2048: Debugging from VCDINFO\n"
 msgstr ""
 
-#: src/liba52/xine_a52_decoder.c:742 src/libxineadec/xine_dts_decoder.c:524
-msgid "HELP! a mono-only audio driver?!\n"
-msgstr "LAGUNTZA! mono bakarrik audio kontrolatzailea?\n"
-
-#: src/liba52/xine_a52_decoder.c:805
-msgid "A/52 volume"
-msgstr "A/52 bolumena"
-
-#: src/liba52/xine_a52_decoder.c:806
-msgid ""
-"With A/52 audio, you can modify the volume at the decoder level. This has "
-"the advantage of the audio being already decoded for the specified volume, "
-"so later operations like channel downmixing will work on an audio stream of "
-"the given volume."
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:814
-msgid "use A/52 dynamic range compression"
-msgstr "A/52 bitarte dinamiko konpresioa"
-
-#: src/liba52/xine_a52_decoder.c:815
-msgid ""
-"Dynamic range compression limits the dynamic range of the audio. This means "
-"making the loud sounds softer, and the soft sounds louder, so you can more "
-"easily listen to the audio in a noisy environment without disturbing anyone."
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:822
-msgid "downmix audio to 2 channel surround stereo"
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:823
-msgid ""
-"When you want to listen to multichannel surround sound, but you have only "
-"two speakers or a surround decoder or amplifier which does some sort of "
-"matrix surround decoding like prologic, you should enable this option so "
-"that the additional channels are mixed into the stereo signal."
-msgstr ""
-
-#: src/libfaad/xine_faad_decoder.c:131
-#, fuzzy
-msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
-msgstr "libfaad: libfaad faacDecOpen()-ek huts egin du.\n"
-
-#: src/libfaad/xine_faad_decoder.c:140
-#, fuzzy
-msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
-msgstr "libfaad: libfaad faacDecInit2-ek huts egin du.\n"
-
-#: src/libfaad/xine_faad_decoder.c:151
-#, fuzzy
-msgid "libfaad: libfaad NeAACDecInit failed.\n"
-msgstr "libfaad: libfaad faacDecInit-ek huts egin du.\n"
-
 #: src/libffmpeg/ff_audio_decoder.c:122
 #, c-format
 msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
@@ -2624,46 +2579,6 @@ msgstr "ffmpeg_audio_dec: ezin da deskodetzailea ireki\n"
 msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
 msgstr "dvaudio: bufeera %d -ra handitzen askieza sahiesteko.\n"
 
-#: src/libffmpeg/ff_video_decoder.c:155
-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
-msgstr "ffmpeg_video_dec: marko formatu onartezina, DR1 ezgaiturik.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:173
-#, fuzzy
-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
-msgstr "ffmpeg_video_dec: marko formatu onartezina, DR1 ezgaiturik.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:333
-#, c-format
-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:362
-msgid "ffmpeg_video_dec: couldn't open decoder\n"
-msgstr "ffmpeg_video_dec: ezin da deskodetzailea ireki\n"
-
-#: src/libffmpeg/ff_video_decoder.c:397
-msgid "ffmpeg_video_dec: direct rendering enabled\n"
-msgstr "ffmpeg_video_dec: direct reenderizazioa gaiturik\n"
-
-#: src/libffmpeg/ff_video_decoder.c:816
-#, c-format
-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
-msgstr "ffmpeg_video_dec: bufferra %d -ra handitzen askieza saiesteko.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:1514
-msgid "MPEG-4 postprocessing quality"
-msgstr "MPEG-4 postprozesatze kalitatea"
-
-#: src/libffmpeg/ff_video_decoder.c:1515
-msgid ""
-"You can adjust the amount of post processing applied to MPEG-4 video.\n"
-"Higher values result in better quality, but need more CPU. Lower values may "
-"result in image defects like block artifacts. For high quality content, too "
-"heavy post processing can actually make the image worse by blurring it too "
-"much."
-msgstr ""
-
 #: src/libffmpeg/ffmpeg_encoder.c:163
 msgid "libavcodec mpeg output bitrate (kbit/s)"
 msgstr "libavcodec mpeg irteera bit tasa (kbit/s)"
@@ -2704,23 +2619,44 @@ msgid "The maximum compression to apply to an image in constant quality mode."
 msgstr ""
 "Kalitate iraunkorreko kalitate moduko ezarriko den gehinezko konpresioa."
 
-#: src/libxineadec/xine_musepack_decoder.c:249
+#: src/libffmpeg/ff_video_decoder.c:155
+msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
+msgstr "ffmpeg_video_dec: marko formatu onartezina, DR1 ezgaiturik.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:173
+#, fuzzy
+msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+msgstr "ffmpeg_video_dec: marko formatu onartezina, DR1 ezgaiturik.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:333
 #, c-format
-msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:323
-msgid "libmusepack: data after last frame ignored\n"
-msgstr ""
+#: src/libffmpeg/ff_video_decoder.c:362
+msgid "ffmpeg_video_dec: couldn't open decoder\n"
+msgstr "ffmpeg_video_dec: ezin da deskodetzailea ireki\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:334
-msgid "libmusepack: mpc_decoder_initialise failed\n"
-msgstr ""
+#: src/libffmpeg/ff_video_decoder.c:397
+msgid "ffmpeg_video_dec: direct rendering enabled\n"
+msgstr "ffmpeg_video_dec: direct reenderizazioa gaiturik\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:354
-#: src/libxineadec/xine_musepack_decoder.c:369
+#: src/libffmpeg/ff_video_decoder.c:816
 #, c-format
-msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+msgstr "ffmpeg_video_dec: bufferra %d -ra handitzen askieza saiesteko.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:1519
+msgid "MPEG-4 postprocessing quality"
+msgstr "MPEG-4 postprozesatze kalitatea"
+
+#: src/libffmpeg/ff_video_decoder.c:1520
+msgid ""
+"You can adjust the amount of post processing applied to MPEG-4 video.\n"
+"Higher values result in better quality, but need more CPU. Lower values may "
+"result in image defects like block artifacts. For high quality content, too "
+"heavy post processing can actually make the image worse by blurring it too "
+"much."
 msgstr ""
 
 #: src/libreal/real_common.c:107
@@ -2742,11 +2678,6 @@ msgstr ""
 "dekodifikatzeko. Begiratu XINE FAQ dokumentua kodek horiek nola instalaturi "
 "buruzko argibide gehiagorako."
 
-#: src/libreal/xine_real_video_decoder.c:164
-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
-msgstr ""
-"libreal: Errorea sinboloak ebazterakoan! (bertsio bateragarritasun eza?)\n"
-
 #: src/libreal/xine_real_audio_decoder.c:130
 #, c-format
 msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
@@ -2767,6 +2698,11 @@ msgstr ""
 msgid "libareal: oups, real can do more than 2 channels ?\n"
 msgstr ""
 
+#: src/libreal/xine_real_video_decoder.c:164
+msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+msgstr ""
+"libreal: Errorea sinboloak ebazterakoan! (bertsio bateragarritasun eza?)\n"
+
 #: src/libspucc/xine_cc_decoder.c:192
 msgid "display closed captions in MPEG-2 streams"
 msgstr "bistaratu itxitako izenburuak MPEG-2 korronteetan"
@@ -3010,6 +2946,80 @@ msgstr "w32codec: Errorea DirectShow Audio abiarazterakoan\n"
 msgid "w32codec: Error initializing DMO Audio\n"
 msgstr "w32codec: Errorea DMO Audioa abiarazterakoan\n"
 
+#: src/libxineadec/xine_a52_decoder.c:742
+#: src/libxineadec/xine_dts_decoder.c:524
+msgid "HELP! a mono-only audio driver?!\n"
+msgstr "LAGUNTZA! mono bakarrik audio kontrolatzailea?\n"
+
+#: src/libxineadec/xine_a52_decoder.c:805
+msgid "A/52 volume"
+msgstr "A/52 bolumena"
+
+#: src/libxineadec/xine_a52_decoder.c:806
+msgid ""
+"With A/52 audio, you can modify the volume at the decoder level. This has "
+"the advantage of the audio being already decoded for the specified volume, "
+"so later operations like channel downmixing will work on an audio stream of "
+"the given volume."
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:814
+msgid "use A/52 dynamic range compression"
+msgstr "A/52 bitarte dinamiko konpresioa"
+
+#: src/libxineadec/xine_a52_decoder.c:815
+msgid ""
+"Dynamic range compression limits the dynamic range of the audio. This means "
+"making the loud sounds softer, and the soft sounds louder, so you can more "
+"easily listen to the audio in a noisy environment without disturbing anyone."
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:822
+msgid "downmix audio to 2 channel surround stereo"
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:823
+msgid ""
+"When you want to listen to multichannel surround sound, but you have only "
+"two speakers or a surround decoder or amplifier which does some sort of "
+"matrix surround decoding like prologic, you should enable this option so "
+"that the additional channels are mixed into the stereo signal."
+msgstr ""
+
+#: src/libxineadec/xine_faad_decoder.c:130
+#, fuzzy
+msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
+msgstr "libfaad: libfaad faacDecOpen()-ek huts egin du.\n"
+
+#: src/libxineadec/xine_faad_decoder.c:139
+#, fuzzy
+msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
+msgstr "libfaad: libfaad faacDecInit2-ek huts egin du.\n"
+
+#: src/libxineadec/xine_faad_decoder.c:150
+#, fuzzy
+msgid "libfaad: libfaad NeAACDecInit failed.\n"
+msgstr "libfaad: libfaad faacDecInit-ek huts egin du.\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:249
+#, c-format
+msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:323
+msgid "libmusepack: data after last frame ignored\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:334
+msgid "libmusepack: mpc_decoder_initialise failed\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:354
+#: src/libxineadec/xine_musepack_decoder.c:369
+#, c-format
+msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgstr ""
+
 #: src/libxinevdec/bitplane.c:1272
 #, c-format
 msgid "bitplane: error doing ByteRun1 decompression\n"
@@ -3256,22 +3266,6 @@ msgstr ""
 "\n"
 "* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
 
-#: src/post/planar/eq.c:186
-msgid ""
-"Software equalizer with interactive controls just like the hardware "
-"equalizer, for cards/drivers that do not support brightness and contrast "
-"controls in hardware.\n"
-"\n"
-"Parameters\n"
-"  brightness\n"
-"  contrast\n"
-"\n"
-"Note: It is possible to use frontend's control window to set these "
-"parameters.\n"
-"\n"
-"* mplayer's eq (C) Richard Felker\n"
-msgstr ""
-
 #: src/post/planar/eq2.c:359
 msgid ""
 "Alternative software equalizer that uses lookup tables (very slow), allowing "
@@ -3296,6 +3290,22 @@ msgid ""
 "* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
 msgstr ""
 
+#: src/post/planar/eq.c:186
+msgid ""
+"Software equalizer with interactive controls just like the hardware "
+"equalizer, for cards/drivers that do not support brightness and contrast "
+"controls in hardware.\n"
+"\n"
+"Parameters\n"
+"  brightness\n"
+"  contrast\n"
+"\n"
+"Note: It is possible to use frontend's control window to set these "
+"parameters.\n"
+"\n"
+"* mplayer's eq (C) Richard Felker\n"
+msgstr ""
+
 #: src/post/planar/expand.c:251
 msgid ""
 "The expand plugin is meant to take frames of arbitrary aspect ratio and "
@@ -3377,6 +3387,65 @@ msgid ""
 "* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
 msgstr ""
 
+#: src/vdr/input_vdr.c:183 src/vdr/input_vdr.c:223 src/vdr/input_vdr.c:2297
+#: src/vdr/input_vdr.c:2394
+#, fuzzy, c-format
+msgid ": input event write: %s.\n"
+msgstr "input_rip: bilaketak huts egin du: %s\n"
+
+#: src/vdr/input_vdr.c:713 src/vdr/input_vdr.c:1137
+msgid ": buffer_pool_alloc() failed!\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:782
+#, c-format
+msgid ": flush buffers (vb: %d, ab: %d, vf: %d, af: %d) %s.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1475
+#, c-format
+msgid ": shutting down rpc thread (timeout: %d ms) ...\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1499
+#, fuzzy, c-format
+msgid ": cancelling rpc thread in function %d...\n"
+msgstr "input_rtp: Ezin da hari berria sortu (%s)\n"
+
+#: src/vdr/input_vdr.c:1506
+#, fuzzy
+msgid ": joining rpc thread ...\n"
+msgstr "RTP: geratu irakurketa haria...\n"
+
+#: src/vdr/input_vdr.c:1508
+#, fuzzy
+msgid ": rpc thread joined.\n"
+msgstr "RTP: hari irakurketa amaiturik\n"
+
+#: src/vdr/input_vdr.c:2137 src/vdr/input_vdr.c:2151 src/vdr/input_vdr.c:2169
+#: src/vdr/input_vdr.c:2190 src/vdr/input_vdr.c:2211
+#, fuzzy, c-format
+msgid ": failed to open '%s' (%s)\n"
+msgstr "stdin: ezin da '%s' ireki\n"
+
+#: src/vdr/input_vdr.c:2153
+msgid "timeout expired during setup phase"
+msgstr ""
+
+#: src/vdr/input_vdr.c:2227
+#, fuzzy, c-format
+msgid ": can't create new thread (%s)\n"
+msgstr "input_rtp: Ezin da hari berria sortu (%s)\n"
+
+#: src/vdr/input_vdr.c:2487
+msgid "VDR display device plugin"
+msgstr ""
+
+#: src/vdr/post_vdr_video.c:435
+#, c-format
+msgid ": osd: (%d, %d)-(%d, %d)@%lg\n"
+msgstr ""
+
 #: src/video_out/video_out_aa.c:311
 msgid "xine video output plugin using the ascii-art library"
 msgstr "xine bideo irteera plugina AsCii Arte liburutegia erabiliaz"
@@ -3628,8 +3697,8 @@ msgid ""
 msgstr ""
 
 #: src/video_out/video_out_opengl.c:1918 src/video_out/video_out_vidix.c:1015
-#: src/video_out/video_out_xcbxv.c:1476 src/video_out/video_out_xv.c:1489
-#: src/video_out/video_out_xvmc.c:1461 src/video_out/video_out_xxmc.c:2465
+#: src/video_out/video_out_xcbxv.c:1304 src/video_out/video_out_xv.c:1359
+#: src/video_out/video_out_xvmc.c:1423 src/video_out/video_out_xxmc.c:2531
 msgid "enable double buffering"
 msgstr "gaitu buffer bikoitza"
 
@@ -3711,9 +3780,9 @@ msgstr ""
 msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
 msgstr "video_out_pgx64: Errorea: ioctl hutsa (FBIOGATTR)\n"
 
-#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1443
-#: src/video_out/video_out_xv.c:1456 src/video_out/video_out_xvmc.c:1446
-#: src/video_out/video_out_xxmc.c:2432
+#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1271
+#: src/video_out/video_out_xv.c:1326 src/video_out/video_out_xvmc.c:1408
+#: src/video_out/video_out_xxmc.c:2498
 msgid "video overlay colour key"
 msgstr ""
 
@@ -3880,9 +3949,9 @@ msgstr "Intentsitate urdina"
 msgid "The intensity of the blue colour components."
 msgstr "Urdin koloreko osagaien intentsitatea."
 
-#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1477
-#: src/video_out/video_out_xv.c:1490 src/video_out/video_out_xvmc.c:1462
-#: src/video_out/video_out_xxmc.c:2466
+#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1305
+#: src/video_out/video_out_xv.c:1360 src/video_out/video_out_xvmc.c:1424
+#: src/video_out/video_out_xxmc.c:2532
 msgid ""
 "Double buffering will synchronize the update of the video image to the "
 "repainting of the entire screen (\"vertical retrace\"). This eliminates "
@@ -3915,9 +3984,9 @@ msgid "video overlay colour key red component"
 msgstr "bideo ingurune kolore teklaren gorri osagaia"
 
 #: src/video_out/video_out_vidix.c:1159 src/video_out/video_out_vidix.c:1166
-#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1444
-#: src/video_out/video_out_xv.c:1457 src/video_out/video_out_xvmc.c:1447
-#: src/video_out/video_out_xxmc.c:2433
+#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1272
+#: src/video_out/video_out_xv.c:1327 src/video_out/video_out_xvmc.c:1409
+#: src/video_out/video_out_xxmc.c:2499
 msgid ""
 "The colour key is used to tell the graphics card where to overlay the video "
 "image. Try different values, if you experience windows becoming transparent."
@@ -3946,13 +4015,13 @@ msgid "%s: %s: allocating image\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbshm.c:159 src/video_out/video_out_xcbshm.c:169
-#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:272
-#: src/video_out/video_out_xcbxv.c:282 src/video_out/video_out_xcbxv.c:292
-#: src/video_out/video_out_xcbxv.c:304 src/video_out/video_out_xshm.c:204
+#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:267
+#: src/video_out/video_out_xcbxv.c:277 src/video_out/video_out_xcbxv.c:287
+#: src/video_out/video_out_xcbxv.c:299 src/video_out/video_out_xshm.c:204
 #: src/video_out/video_out_xshm.c:221 src/video_out/video_out_xshm.c:232
-#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:296
-#: src/video_out/video_out_xv.c:307 src/video_out/video_out_xv.c:316
-#: src/video_out/video_out_xv.c:352 src/video_out/video_out_xxmc.c:648
+#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:295
+#: src/video_out/video_out_xv.c:322 src/video_out/video_out_xv.c:331
+#: src/video_out/video_out_xv.c:367 src/video_out/video_out_xxmc.c:648
 #: src/video_out/video_out_xxmc.c:659 src/video_out/video_out_xxmc.c:668
 #: src/video_out/video_out_xxmc.c:704
 #, c-format
@@ -3964,8 +4033,8 @@ msgstr ""
 msgid "%s: shared memory error (address error) when allocating image \n"
 msgstr ""
 
-#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:302
-#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:350
+#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:297
+#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:365
 #: src/video_out/video_out_xxmc.c:702
 #, c-format
 msgid "%s: x11 error during shared memory XImage creation\n"
@@ -3996,31 +4065,31 @@ msgstr "video_out_fb: Bideo modua ez da ezagutzen, barkatu.\n"
 msgid "xine video output plugin using the MIT X shared memory extension"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:270 src/video_out/video_out_xv.c:305
+#: src/video_out/video_out_xcbxv.c:265 src/video_out/video_out_xv.c:320
 #: src/video_out/video_out_xxmc.c:657
 #, c-format
 msgid "%s: XvShmCreateImage returned a zero size\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:280 src/video_out/video_out_xv.c:314
+#: src/video_out/video_out_xcbxv.c:275 src/video_out/video_out_xv.c:329
 #: src/video_out/video_out_xxmc.c:666
 #, c-format
 msgid "%s: shared memory error in shmget: %s\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:290
+#: src/video_out/video_out_xcbxv.c:285
 #, c-format
 msgid "%s: shared memory error (address error)\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1294 src/video_out/video_out_xv.c:1301
-#: src/video_out/video_out_xxmc.c:2283
+#: src/video_out/video_out_xcbxv.c:1125 src/video_out/video_out_xv.c:1174
+#: src/video_out/video_out_xxmc.c:2349
 #, fuzzy, c-format
 msgid "%s: Xv extension not present.\n"
 msgstr "video_out_xv: Xv luzapena ez dago.\n"
 
-#: src/video_out/video_out_xcbxv.c:1336 src/video_out/video_out_xv.c:1338
-#: src/video_out/video_out_xxmc.c:2320
+#: src/video_out/video_out_xcbxv.c:1167 src/video_out/video_out_xv.c:1211
+#: src/video_out/video_out_xxmc.c:2386
 #, fuzzy, c-format
 msgid ""
 "%s: Xv extension is present but I couldn't find a usable yuv12 port.\n"
@@ -4030,30 +4099,30 @@ msgstr ""
 "erabilgarririkaurkitu.\n"
 "              Dirudienez zure txartela grafikoak ez du Xv onartzen?!\n"
 
-#: src/video_out/video_out_xcbxv.c:1345
+#: src/video_out/video_out_xcbxv.c:1176
 #, c-format
 msgid ""
 "%s: using Xv port %d from adaptor %s for hardware colorspace conversion and "
 "scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1452 src/video_out/video_out_xv.c:1465
-#: src/video_out/video_out_xvmc.c:1455 src/video_out/video_out_xxmc.c:2441
+#: src/video_out/video_out_xcbxv.c:1280 src/video_out/video_out_xv.c:1335
+#: src/video_out/video_out_xvmc.c:1417 src/video_out/video_out_xxmc.c:2507
 msgid "autopaint colour key"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1453 src/video_out/video_out_xv.c:1466
-#: src/video_out/video_out_xvmc.c:1456 src/video_out/video_out_xxmc.c:2442
+#: src/video_out/video_out_xcbxv.c:1281 src/video_out/video_out_xv.c:1336
+#: src/video_out/video_out_xvmc.c:1418 src/video_out/video_out_xxmc.c:2508
 msgid "Make Xv autopaint its colorkey."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1460 src/video_out/video_out_xv.c:1473
-#: src/video_out/video_out_xxmc.c:2449
+#: src/video_out/video_out_xcbxv.c:1288 src/video_out/video_out_xv.c:1343
+#: src/video_out/video_out_xxmc.c:2515
 msgid "bilinear scaling mode"
 msgstr "eskalatze modu bilinearra"
 
-#: src/video_out/video_out_xcbxv.c:1461 src/video_out/video_out_xv.c:1474
-#: src/video_out/video_out_xxmc.c:2450
+#: src/video_out/video_out_xcbxv.c:1289 src/video_out/video_out_xv.c:1344
+#: src/video_out/video_out_xxmc.c:2516
 msgid ""
 "Selects the bilinear scaling mode for Permedia cards. The individual values "
 "are:\n"
@@ -4068,74 +4137,30 @@ msgid ""
 "2 - enable full bilinear filtering"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1513 src/video_out/video_out_xv.c:1523
-#: src/video_out/video_out_xxmc.c:2506
+#: src/video_out/video_out_xcbxv.c:1341 src/video_out/video_out_xv.c:1393
+#: src/video_out/video_out_xxmc.c:2572
 #, fuzzy, c-format
 msgid "%s: this adaptor supports the yv12 format.\n"
 msgstr "video_out_xv: adaptadoreak yv12 formatua onartzen du.\n"
 
-#: src/video_out/video_out_xcbxv.c:1518 src/video_out/video_out_xv.c:1528
-#: src/video_out/video_out_xxmc.c:2511
+#: src/video_out/video_out_xcbxv.c:1346 src/video_out/video_out_xv.c:1398
+#: src/video_out/video_out_xxmc.c:2577
 #, fuzzy, c-format
 msgid "%s: this adaptor supports the yuy2 format.\n"
 msgstr "video_out_xv: adaptadoreak yuy2 formatua onartzen du.\n"
 
-#: src/video_out/video_out_xcbxv.c:1526 src/video_out/video_out_xv.c:1550
-#: src/video_out/video_out_xxmc.c:2534
+#: src/video_out/video_out_xcbxv.c:1354 src/video_out/video_out_xv.c:1420
+#: src/video_out/video_out_xxmc.c:2600
 msgid "pitch alignment workaround"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1527 src/video_out/video_out_xv.c:1551
-#: src/video_out/video_out_xxmc.c:2535
+#: src/video_out/video_out_xcbxv.c:1355 src/video_out/video_out_xv.c:1421
+#: src/video_out/video_out_xxmc.c:2601
 msgid "Some buggy video drivers need a workaround to function properly."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1533 src/video_out/video_out_xv.c:1557
-#: src/video_out/video_out_xvmc.c:1524
-msgid "deinterlace method (deprecated)"
-msgstr "ez-elkarlituriko metodoa (zaharkiturik)"
-
-#: src/video_out/video_out_xcbxv.c:1534 src/video_out/video_out_xv.c:1558
-#: src/video_out/video_out_xvmc.c:1525
-msgid ""
-"This config setting is deprecated. You should use the new deinterlacing post "
-"processing settings instead.\n"
-"\n"
-"From the old days of analog television, where the even and odd numbered "
-"lines of a video frame would be displayed at different times comes the idea "
-"to increase motion smoothness by also recording the lines at different "
-"times. This is called \"interlacing\". But unfortunately, todays displays "
-"show the even and odd numbered lines as one complete frame all at the same "
-"time (called \"progressive display\"), which results in ugly frame errors "
-"known as comb artifacts. Software deinterlacing is an approach to reduce "
-"these artifacts. The individual values are:\n"
-"\n"
-"none\n"
-"Disables software deinterlacing.\n"
-"\n"
-"bob\n"
-"Interpolates between the lines for moving parts of the image.\n"
-"\n"
-"weave\n"
-"Similar to bob, but with a tendency to preserve the full resolution, better "
-"for high detail in low movement scenes.\n"
-"\n"
-"greedy\n"
-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
-"\n"
-"onefield\n"
-"Always interpolates and reduces vertical resolution.\n"
-"\n"
-"onefieldxv\n"
-"Same as onefield, but does the interpolation in hardware.\n"
-"\n"
-"linearblend\n"
-"Applies a slight vertical blur to remove the comb artifacts. Good results "
-"with medium CPU usage."
-msgstr ""
-
-#: src/video_out/video_out_xcbxv.c:1588 src/video_out/video_out_xv.c:1631
-#: src/video_out/video_out_xxmc.c:2615
+#: src/video_out/video_out_xcbxv.c:1383 src/video_out/video_out_xv.c:1468
+#: src/video_out/video_out_xxmc.c:2681
 msgid "xine video output plugin using the MIT X video extension"
 msgstr "xine bideo irteera plugina MIT X bideo luzapena erabiltzen"
 
@@ -4144,93 +4169,93 @@ msgstr "xine bideo irteera plugina MIT X bideo luzapena erabiltzen"
 msgid "%s: shared memory error when allocating image\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:294 src/video_out/video_out_xxmc.c:646
+#: src/video_out/video_out_xv.c:293 src/video_out/video_out_xxmc.c:646
 #, c-format
 msgid "%s: XvShmCreateImage failed\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1348 src/video_out/video_out_xxmc.c:2330
+#: src/video_out/video_out_xv.c:1221 src/video_out/video_out_xxmc.c:2396
 #, c-format
 msgid ""
 "%s: using Xv port %ld from adaptor %s for hardware colorspace conversion and "
 "scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1593
+#: src/video_out/video_out_xvmc.c:1496
 msgid "xine video output plugin using the XvMC X video extension"
 msgstr "xineo bideo irteera plugina XvMC X bideo luzapena erabiltzen"
 
-#: src/video_out/video_out_xvmc.c:1639
+#: src/video_out/video_out_xvmc.c:1542
 msgid "video_out_xvmc: XvMC extension not present.\n"
 msgstr "video_out_xvmc: XvMC luzapena ez dago.\n"
 
-#: src/video_out/video_out_xvmc.c:1737
+#: src/video_out/video_out_xvmc.c:1640
 msgid ""
 "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
 "port.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1746
+#: src/video_out/video_out_xvmc.c:1649
 #, c-format
 msgid ""
 "video_out_xvmc: using Xv port %ld from adaptor %s\n"
 "                for hardware colorspace conversion and scaling\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1751
+#: src/video_out/video_out_xvmc.c:1654
 msgid "                idct and motion compensation acceleration \n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1753
+#: src/video_out/video_out_xvmc.c:1656
 msgid "                motion compensation acceleration only\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1755
+#: src/video_out/video_out_xvmc.c:1658
 msgid "                no XvMC support \n"
 msgstr "                ez da XvMC onartzen \n"
 
-#: src/video_out/video_out_xvmc.c:1756
+#: src/video_out/video_out_xvmc.c:1659
 #, c-format
 msgid "                With Overlay = %d; UnsignedIntra = %d.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2540
+#: src/video_out/video_out_xxmc.c:2606
 msgid "Make XvMC allocate more frames for better buffering."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2541
+#: src/video_out/video_out_xxmc.c:2607
 msgid ""
 "Some XvMC implementations allow more than 8 frames.\n"
 "This option, when turned on, makes the driver try to\n"
 "allocate 15 frames. A must for unichrome and live VDR.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2547
+#: src/video_out/video_out_xxmc.c:2613
 msgid "Unichrome cpu save"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2548
+#: src/video_out/video_out_xxmc.c:2614
 msgid ""
 "Saves CPU time by sleeping while decoder works.\n"
 "Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n"
 "Experimental.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2554
+#: src/video_out/video_out_xxmc.c:2620
 msgid "Fix buggy NVIDIA XvMC subpicture colors"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2555
+#: src/video_out/video_out_xxmc.c:2621
 msgid ""
 "There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
 "look blue and vice versa. This option provides a workaround.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2560
+#: src/video_out/video_out_xxmc.c:2626
 msgid "Use bob as accelerated deinterlace method."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2561
+#: src/video_out/video_out_xxmc.c:2627
 msgid ""
 "When interlacing is enabled for hardware accelerated frames,\n"
 "Alternate between top and bottom field at double the frame rate.\n"
@@ -4257,11 +4282,11 @@ msgstr ""
 msgid "x11osd: unscaled overlay created (%s mode).\n"
 msgstr "x11osd: eskala gabeko gainjarria sorturik (%s modua).\n"
 
-#: src/xine-engine/alphablend.c:2123
+#: src/xine-engine/alphablend.c:2146
 msgid "disable exact alpha blending of overlays"
 msgstr ""
 
-#: src/xine-engine/alphablend.c:2124
+#: src/xine-engine/alphablend.c:2147
 msgid ""
 "If you experience a performance impact when an On Screen Display or other "
 "overlays like DVD subtitles are active, then you might want to enable this "
@@ -4822,71 +4847,71 @@ msgid ""
 "foreground-border-background."
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:380
+#: src/xine-engine/video_decoder.c:390
 #, c-format
 msgid "video_decoder: no plugin available to handle '%s'\n"
 msgstr "video_decoder: ez dago pluginik '%s' kudeatzeko\n"
 
-#: src/xine-engine/video_decoder.c:459
+#: src/xine-engine/video_decoder.c:469
 #, c-format
 msgid "video_decoder: error, unknown buffer type: %08x\n"
 msgstr "video_decoder: errorea, buffer mota ezezaguna: %08x\n"
 
-#: src/xine-engine/video_decoder.c:495
+#: src/xine-engine/video_decoder.c:505
 msgid "number of video buffers"
 msgstr "bideo buffer kopurua"
 
-#: src/xine-engine/video_decoder.c:496
+#: src/xine-engine/video_decoder.c:506
 msgid ""
 "The number of video buffers (each is 8k in size) xine uses in its internal "
 "queue. Higher values mean smoother playback for unreliable inputs, but also "
 "increased latency and memory consumption."
 msgstr ""
 
-#: src/xine-engine/video_out.c:642
+#: src/xine-engine/video_out.c:671
 #, c-format
 msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
 msgstr ""
 
-#: src/xine-engine/video_out.c:815
+#: src/xine-engine/video_out.c:844
 #, c-format
 msgid ""
 "video_out: throwing away image with pts %<PRId64> because it's too old "
 "(diff : %<PRId64>).\n"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1794
+#: src/xine-engine/video_out.c:1863
 #, fuzzy
 msgid "default number of video frames"
 msgstr "marko errepikatze lehenetsiriko kopurua"
 
-#: src/xine-engine/video_out.c:1795
+#: src/xine-engine/video_out.c:1864
 msgid ""
 "The default number of video frames to request from xine video out driver. "
 "Some drivers will override this setting with their own values."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1834
+#: src/xine-engine/video_out.c:1921
 msgid "percentage of skipped frames to tolerate"
 msgstr "onartzen den alde batetara utziko marko kopuru ehunekoa"
 
-#: src/xine-engine/video_out.c:1835
+#: src/xine-engine/video_out.c:1922
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not decoded in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1840
+#: src/xine-engine/video_out.c:1927
 msgid "percentage of discarded frames to tolerate"
 msgstr "onartzen den alde batetara utziko marko kopuru ehunekoa"
 
-#: src/xine-engine/video_out.c:1841
+#: src/xine-engine/video_out.c:1928
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not scheduled for display in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1875
+#: src/xine-engine/video_out.c:1965
 msgid "video_out: sorry, this should not happen. please restart xine.\n"
 msgstr ""
 "video_out: barkatu, hau ez zen gertatu beharko. mesedez xine berrabiarazi.\n"
@@ -4930,130 +4955,130 @@ msgid ""
 "accelerated, this can dramatically reduce CPU usage."
 msgstr ""
 
-#: src/xine-engine/xine.c:706 src/xine-engine/xine.c:813
-#: src/xine-engine/xine.c:852 src/xine-engine/xine.c:888
-#: src/xine-engine/xine.c:900 src/xine-engine/xine.c:913
-#: src/xine-engine/xine.c:926 src/xine-engine/xine.c:939
-#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:990
-#: src/xine-engine/xine.c:1025
+#: src/xine-engine/xine.c:771 src/xine-engine/xine.c:878
+#: src/xine-engine/xine.c:917 src/xine-engine/xine.c:953
+#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:978
+#: src/xine-engine/xine.c:991 src/xine-engine/xine.c:1004
+#: src/xine-engine/xine.c:1030 src/xine-engine/xine.c:1055
+#: src/xine-engine/xine.c:1090
 msgid "xine: error while parsing mrl\n"
 msgstr "xine: errorea mrl analizatzerakoan\n"
 
-#: src/xine-engine/xine.c:742
+#: src/xine-engine/xine.c:807
 #, c-format
 msgid "xine: found input plugin  : %s\n"
 msgstr "xine: input plugin-a aurkiturik  : %s\n"
 
-#: src/xine-engine/xine.c:760
+#: src/xine-engine/xine.c:825
 #, c-format
 msgid "xine: input plugin cannot open MRL [%s]\n"
 msgstr "xine: sarrera pluginak ezin du MRL-a [%s] ireki\n"
 
-#: src/xine-engine/xine.c:776
+#: src/xine-engine/xine.c:841
 #, c-format
 msgid "xine: cannot find input plugin for MRL [%s]\n"
 msgstr "xine: ezin da [%s] MRL-aren plugina aurkitu\n"
 
-#: src/xine-engine/xine.c:802
+#: src/xine-engine/xine.c:867
 #, c-format
 msgid "xine: specified demuxer %s failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:838
+#: src/xine-engine/xine.c:903
 #, c-format
 msgid "xine: join rip input plugin\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:845
+#: src/xine-engine/xine.c:910
 msgid "xine: error opening rip input plugin instance\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:876
+#: src/xine-engine/xine.c:941
 #, c-format
 msgid "xine: last_probed demuxer %s failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:905
+#: src/xine-engine/xine.c:970
 msgid "ignoring video\n"
 msgstr "bidoa alde batetara uzten\n"
 
-#: src/xine-engine/xine.c:918
+#: src/xine-engine/xine.c:983
 msgid "ignoring audio\n"
 msgstr "audioa alde batetara uzten\n"
 
-#: src/xine-engine/xine.c:931
+#: src/xine-engine/xine.c:996
 msgid "ignoring subpicture\n"
 msgstr "azpi-irudia alde batetara uzten\n"
 
-#: src/xine-engine/xine.c:944
+#: src/xine-engine/xine.c:1009
 msgid "input cache plugin disabled\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1015
+#: src/xine-engine/xine.c:1080
 #, c-format
 msgid "subtitle mrl opened '%s'\n"
 msgstr "'%s' azpititulu mrl-a irekirik\n"
 
-#: src/xine-engine/xine.c:1019
+#: src/xine-engine/xine.c:1084
 msgid "xine: error opening subtitle mrl\n"
 msgstr "xine: errorea azpititulu mrl-a irekitzerakoan\n"
 
-#: src/xine-engine/xine.c:1051
+#: src/xine-engine/xine.c:1116
 #, c-format
 msgid "xine: error while parsing MRL\n"
 msgstr "xine: errorea MRL-analizatzerakoan\n"
 
-#: src/xine-engine/xine.c:1058
+#: src/xine-engine/xine.c:1123
 #, c-format
 msgid "xine: changing option '%s' from MRL isn't permitted\n"
 msgstr "xine: MRL-ko '%s' aukera aldaketa ez da onartzen\n"
 
-#: src/xine-engine/xine.c:1078
+#: src/xine-engine/xine.c:1143
 #, c-format
 msgid "xine: couldn't find demux for >%s<\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1094
+#: src/xine-engine/xine.c:1159
 #, c-format
 msgid "xine: found demuxer plugin: %s\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1114
+#: src/xine-engine/xine.c:1179
 #, c-format
 msgid "xine: demuxer failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1179
+#: src/xine-engine/xine.c:1244
 #, c-format
 msgid "xine_play: no demux available\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1249
+#: src/xine-engine/xine.c:1314
 #, c-format
 msgid "xine_play: demux failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1527
+#: src/xine-engine/xine.c:1592
 #, c-format
 msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
 msgstr ""
 "xine: Ezarritako \"%s\" gordetze karpeta (save_dir) segurtasun arrisku bat "
 "izan daiteke.\n"
 
-#: src/xine-engine/xine.c:1532
+#: src/xine-engine/xine.c:1597
 msgid "The specified save_dir might be a security risk."
 msgstr ""
 "Ezarritako gordetze karpeta (save_dir) segurtasun arrisku bat izan daiteke."
 
-#: src/xine-engine/xine.c:1561
+#: src/xine-engine/xine.c:1626
 msgid "xine: locale not supported by C library\n"
 msgstr "xine: lokala ez du C liburutegiak onartzen\n"
 
-#: src/xine-engine/xine.c:1570
+#: src/xine-engine/xine.c:1635
 msgid "media format detection strategy"
 msgstr "medio formatu atzemate modua"
 
-#: src/xine-engine/xine.c:1571
+#: src/xine-engine/xine.c:1636
 msgid ""
 "xine offers various methods to detect the media format of input to play. The "
 "individual values are:\n"
@@ -5082,11 +5107,11 @@ msgstr ""
 "extension\n"
 "Izen luzapen bidez bakarrik atzemna.\n"
 
-#: src/xine-engine/xine.c:1589
+#: src/xine-engine/xine.c:1654
 msgid "directory for saving streams"
 msgstr "korronteak gordetzeko karpeta"
 
-#: src/xine-engine/xine.c:1590
+#: src/xine-engine/xine.c:1655
 msgid ""
 "When using the stream save feature, files will be written only into this "
 "directory.\n"
@@ -5096,11 +5121,11 @@ msgid ""
 "content in any file."
 msgstr ""
 
-#: src/xine-engine/xine.c:1601
+#: src/xine-engine/xine.c:1666
 msgid "allow implicit changes to the configuration (e.g. by MRL)"
 msgstr "Onartu aldaketa inplizitoak konfiguraketan (adib. MRL bidez)"
 
-#: src/xine-engine/xine.c:1602
+#: src/xine-engine/xine.c:1667
 msgid ""
 "If enabled, you allow xine to change your configuration without explicit "
 "actions from your side. For example configuration changes demanded by MRLs "
@@ -5110,26 +5135,26 @@ msgid ""
 "configuration, you might end with a totally messed up xine."
 msgstr ""
 
-#: src/xine-engine/xine.c:1616
+#: src/xine-engine/xine.c:1681
 msgid "Timeout for network stream reading (in seconds)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1617
+#: src/xine-engine/xine.c:1682
 msgid ""
 "Specifies the timeout when reading from network streams, in seconds. Too low "
 "values might stop streaming when the source is slow or the bandwidth is "
 "occupied, too high values will freeze the player if the connection is lost."
 msgstr ""
 
-#: src/xine-engine/xine.c:1969
+#: src/xine-engine/xine.c:2034
 msgid "messages"
 msgstr "mezuak"
 
-#: src/xine-engine/xine.c:1970
+#: src/xine-engine/xine.c:2035
 msgid "plugin"
 msgstr "plugina"
 
-#: src/xine-engine/xine.c:1971
+#: src/xine-engine/xine.c:2036
 msgid "trace"
 msgstr "aztarna"
 
@@ -5206,6 +5231,9 @@ msgstr ""
 msgid "Benchmarking memcpy methods (smaller is better):\n"
 msgstr "memcpy metodoak frogatzen (txeikiena obea da)\n"
 
+#~ msgid "deinterlace method (deprecated)"
+#~ msgstr "ez-elkarlituriko metodoa (zaharkiturik)"
+
 #, fuzzy
 #~ msgid ""
 #~ "video_out_xcbshm: MIT shared memory extension not present on display.\n"
diff --git a/po/fr.po b/po/fr.po
index 102ceb203..244af4e72 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.13\n"
 "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-04-24 21:48+0100\n"
+"POT-Creation-Date: 2007-06-02 13:14+0200\n"
 "PO-Revision-Date: 2002-06-07 15:08 +0200\n"
 "Last-Translator: Daniel Caujolle-Bert <segfault@club-internet.fr>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -728,6 +728,11 @@ msgstr "input_cda: open(%s) a échoué: %s.\n"
 msgid "xine audio output plugin using sun-compliant audio devices/drivers"
 msgstr "plugin de sortie audio de xine utilisant les pilotes/périphériques sun"
 
+#: src/combined/xine_ogg_demuxer.c:810
+#, c-format
+msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+msgstr ""
+
 #: src/demuxers/demux_asf.c:428
 #, c-format
 msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
@@ -859,11 +864,6 @@ msgid ""
 "xine developers.\n"
 msgstr ""
 
-#: src/demuxers/demux_ogg.c:802
-#, c-format
-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
-msgstr ""
-
 #: src/demuxers/demux_snd.c:104
 #, c-format
 msgid "demux_snd: bad header parameters\n"
@@ -899,16 +899,6 @@ msgstr ""
 msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
 msgstr ""
 
-#: src/dxr3/dxr3.h:32
-msgid "DXR3 device number"
-msgstr ""
-
-#: src/dxr3/dxr3.h:33
-msgid ""
-"If you have more than one DXR3 in your computer, you can specify which one "
-"to use here."
-msgstr ""
-
 #: src/dxr3/dxr3_decode_spu.c:253
 #, c-format
 msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
@@ -999,6 +989,16 @@ msgid ""
 "dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
 msgstr ""
 
+#: src/dxr3/dxr3.h:32
+msgid "DXR3 device number"
+msgstr ""
+
+#: src/dxr3/dxr3.h:33
+msgid ""
+"If you have more than one DXR3 in your computer, you can specify which one "
+"to use here."
+msgstr ""
+
 #: src/dxr3/dxr3_mpeg_encoders.c:125
 msgid "dxr3_mpeg_encoder: failed to init librte\n"
 msgstr ""
@@ -1253,41 +1253,41 @@ msgstr ""
 msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
 msgstr ""
 
-#: src/input/input_cdda.c:1608
+#: src/input/input_cdda.c:1611
 #, fuzzy, c-format
 msgid "%s: can't connect to %s:%d\n"
 msgstr "input_net: impossible de se connecter à '%s'.\n"
 
-#: src/input/input_cdda.c:1655
+#: src/input/input_cdda.c:1658
 #, fuzzy, c-format
 msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
 msgstr "input_cda: serveur '%s:%d' connecté avec succés.\n"
 
-#: src/input/input_cdda.c:1660
+#: src/input/input_cdda.c:1663
 #, fuzzy, c-format
 msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
 msgstr "input_net: impossible de se connecter à '%s'.\n"
 
-#: src/input/input_cdda.c:2690
+#: src/input/input_cdda.c:2693
 msgid "CD Digital Audio (aka. CDDA)"
 msgstr ""
 
-#: src/input/input_cdda.c:2742
+#: src/input/input_cdda.c:2745
 #, fuzzy
 msgid "device used for CD audio"
 msgstr "périphérique utilisé pour la sortie 4 canaux"
 
-#: src/input/input_cdda.c:2743
+#: src/input/input_cdda.c:2746
 msgid ""
 "The path to the device, usually a CD or DVD drive, which you intend to use "
 "for playing audio CDs."
 msgstr ""
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid "query CDDB"
 msgstr ""
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid ""
 "Enables CDDB queries, which will give you convenient title and track names "
 "for your audio CDs.\n"
@@ -1296,11 +1296,11 @@ msgid ""
 "listening habits."
 msgstr ""
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid "CDDB server name"
 msgstr ""
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid ""
 "The CDDB server used to retrieve the title and track information from.\n"
 "This setting is security critical, because the sever will receive "
@@ -1308,19 +1308,19 @@ msgid ""
 "malicious replies. Be sure to enter a server you can trust."
 msgstr ""
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "CDDB server port"
 msgstr ""
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "The server port used to retrieve the title and track information from."
 msgstr ""
 
-#: src/input/input_cdda.c:2771
+#: src/input/input_cdda.c:2774
 msgid "slow down disc drive to this speed factor"
 msgstr ""
 
-#: src/input/input_cdda.c:2772
+#: src/input/input_cdda.c:2775
 msgid ""
 "Since some CD or DVD drives make some really loud noises because of the fast "
 "disc rotation, xine will try to slow them down. With standard CD or DVD "
@@ -1329,126 +1329,132 @@ msgid ""
 "A value of zero here will disable the slowdown."
 msgstr ""
 
-#: src/input/input_dvb.c:899
+#: src/input/input_dvb.c:900
 #, fuzzy, c-format
 msgid "input_dvb: failed to open dvb channel file '%s': %s\n"
 msgstr "input_file: tente d'ouvrir le fichier de sous-titre '%s'\n"
 
-#: src/input/input_dvb.c:905
+#: src/input/input_dvb.c:906
 #, fuzzy, c-format
 msgid "input_dvb: dvb channel file '%s' is not a plain file\n"
 msgstr "input_file: tente d'ouvrir le fichier de sous-titre '%s'\n"
 
-#: src/input/input_dvb.c:2115 src/input/input_dvb.c:2943
+#: src/input/input_dvb.c:2116 src/input/input_dvb.c:2948
 #, fuzzy
 msgid "input_dvb: tuner_set_channel failed\n"
 msgstr "input_cda: fopen(%s) à échoué: %s\n"
 
-#: src/input/input_dvb.c:2743
+#: src/input/input_dvb.c:2748
 #, fuzzy
 msgid "input_dvb: cannot open dvb device\n"
 msgstr "input_dvd: ne peux pas ouvrir le périphérique dvd >%s<\n"
 
-#: src/input/input_dvb.c:2767
+#: src/input/input_dvb.c:2772
 #, c-format
 msgid "input_dvb: channel %d out of range, defaulting to 0\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2778
+#: src/input/input_dvb.c:2783
 #, fuzzy, c-format
 msgid "input_dvb: searching for channel %s\n"
 msgstr "input_file: tente d'ouvrir le fichier de sous-titre '%s'\n"
 
-#: src/input/input_dvb.c:2801
+#: src/input/input_dvb.c:2806
 #, c-format
 msgid "input_dvb: exact match for %s not found: trying partial matches\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2808
+#: src/input/input_dvb.c:2813
 #, fuzzy, c-format
 msgid "input_dvb: found matching channel %s\n"
 msgstr "input_file: tente d'ouvrir le fichier de sous-titre '%s'\n"
 
-#: src/input/input_dvb.c:2821
+#: src/input/input_dvb.c:2826
 #, c-format
 msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2827
+#: src/input/input_dvb.c:2832
 msgid ""
 "input_dvb: invalid channel specification, defaulting to last viewed "
 "channel.\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2833
+#: src/input/input_dvb.c:2838
 msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2845
+#: src/input/input_dvb.c:2850
 msgid ""
 "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
 "S)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2865
+#: src/input/input_dvb.c:2870
 msgid ""
 "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
 "T)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2888 src/input/input_dvb.c:2914
+#: src/input/input_dvb.c:2893
 msgid ""
 "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
 "C)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2949
+#: src/input/input_dvb.c:2919
+msgid ""
+"input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-"
+"A)\n"
+msgstr ""
+
+#: src/input/input_dvb.c:2954
 #, fuzzy, c-format
 msgid "input_dvb: cannot open dvr device '%s'\n"
 msgstr "input_dvd: ne peux pas ouvrir le périphérique dvd >%s<\n"
 
-#: src/input/input_dvb.c:2971
+#: src/input/input_dvb.c:2976
 #, fuzzy
 msgid "input_dvb: cannot create EPG updater thread\n"
 msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n"
 
-#: src/input/input_dvb.c:3033
+#: src/input/input_dvb.c:3038
 msgid "use DVB 'center cutout' (zoom)"
 msgstr ""
 
-#: src/input/input_dvb.c:3034
+#: src/input/input_dvb.c:3039
 msgid ""
 "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
 "frame."
 msgstr ""
 
-#: src/input/input_dvb.c:3127
+#: src/input/input_dvb.c:3132
 msgid "DVB (Digital TV) input plugin"
 msgstr ""
 
-#: src/input/input_dvb.c:3244
+#: src/input/input_dvb.c:3249
 msgid "Remember last DVB channel watched"
 msgstr ""
 
-#: src/input/input_dvb.c:3245
+#: src/input/input_dvb.c:3250
 msgid ""
 "On autoplay, xine will remember and switch to the channel indicated in media."
 "dvb.last_channel. "
 msgstr ""
 
-#: src/input/input_dvb.c:3252
+#: src/input/input_dvb.c:3257
 msgid "Last DVB channel viewed"
 msgstr ""
 
-#: src/input/input_dvb.c:3253
+#: src/input/input_dvb.c:3258
 msgid "If enabled xine will remember and switch to this channel. "
 msgstr ""
 
-#: src/input/input_dvb.c:3259
+#: src/input/input_dvb.c:3264
 msgid "Number of dvb card to use."
 msgstr ""
 
-#: src/input/input_dvb.c:3260
+#: src/input/input_dvb.c:3265
 msgid ""
 "Leave this at zero unless you really have more than 1 card in your system."
 msgstr ""
@@ -1641,87 +1647,87 @@ msgstr ""
 msgid "gnome-vfs input plugin as shipped with xine"
 msgstr "plugin d'entrée réseau fournis avec xine"
 
-#: src/input/input_http.c:174
+#: src/input/input_http.c:176
 #, fuzzy, c-format
 msgid "input_http: gethostbyname(%s) failed: %s\n"
 msgstr "input_cda: fopen(%s) à échoué: %s\n"
 
-#: src/input/input_http.c:400 src/input/input_http.c:943
+#: src/input/input_http.c:402 src/input/input_http.c:957
 #, fuzzy, c-format
 msgid "input_http: read error %d\n"
 msgstr "input_file: erreur de lecture (%s)\n"
 
-#: src/input/input_http.c:627
+#: src/input/input_http.c:629
 msgid "Connecting HTTP server..."
 msgstr ""
 
-#: src/input/input_http.c:819
+#: src/input/input_http.c:820
 #, c-format
 msgid "input_http: invalid http answer\n"
 msgstr ""
 
-#: src/input/input_http.c:825
+#: src/input/input_http.c:826
 #, fuzzy, c-format
 msgid "input_http: 3xx redirection: >%d %s<\n"
 msgstr "input_file: erreur de lecture (%s)\n"
 
-#: src/input/input_http.c:830 src/input/input_http.c:836
-#: src/input/input_http.c:843
+#: src/input/input_http.c:831 src/input/input_http.c:836
+#: src/input/input_http.c:842 src/input/input_http.c:849
 #, c-format
 msgid "input_http: http status not 2xx: >%d %s<\n"
 msgstr ""
 
-#: src/input/input_http.c:853
+#: src/input/input_http.c:859
 #, c-format
 msgid "input_http: content length = %<PRIdMAX> bytes\n"
 msgstr ""
 
-#: src/input/input_http.c:922
+#: src/input/input_http.c:932
 #, fuzzy, c-format
 msgid "input_http: buffer exhausted after %d bytes."
 msgstr "input_file: erreur de lecture (%s)\n"
 
-#: src/input/input_http.c:996
+#: src/input/input_http.c:1010
 msgid "http input plugin"
 msgstr ""
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "HTTP proxy host"
 msgstr ""
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "The hostname of the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "HTTP proxy port"
 msgstr ""
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "The port number of the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1076
+#: src/input/input_http.c:1090
 msgid "HTTP proxy username"
 msgstr ""
 
-#: src/input/input_http.c:1077
+#: src/input/input_http.c:1091
 msgid "The user name for the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1080
+#: src/input/input_http.c:1094
 msgid "HTTP proxy password"
 msgstr ""
 
-#: src/input/input_http.c:1081
+#: src/input/input_http.c:1095
 msgid "The password for the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1084
+#: src/input/input_http.c:1098
 msgid "Domains for which to ignore the HTTP proxy"
 msgstr ""
 
-#: src/input/input_http.c:1085
+#: src/input/input_http.c:1099
 msgid ""
 "A comma-separated list of domain names for which the proxy is to be "
 "ignored.\n"
@@ -1928,33 +1934,33 @@ msgstr ""
 msgid "Adjusting..."
 msgstr ""
 
-#: src/input/input_v4l.c:660
+#: src/input/input_v4l.c:658
 msgid "Tuner name not found\n"
 msgstr ""
 
-#: src/input/input_v4l.c:1876
+#: src/input/input_v4l.c:1874
 msgid "v4l tv input plugin"
 msgstr ""
 
-#: src/input/input_v4l.c:1880
+#: src/input/input_v4l.c:1878
 msgid "v4l radio input plugin"
 msgstr ""
 
-#: src/input/input_v4l.c:1912
+#: src/input/input_v4l.c:1910
 #, fuzzy
 msgid "v4l video device"
 msgstr "périphérique du mixeur alsa"
 
-#: src/input/input_v4l.c:1913
+#: src/input/input_v4l.c:1911
 msgid "The path to your Video4Linux video device."
 msgstr ""
 
-#: src/input/input_v4l.c:1938
+#: src/input/input_v4l.c:1936
 #, fuzzy
 msgid "v4l radio device"
 msgstr "périphérique du mixeur alsa"
 
-#: src/input/input_v4l.c:1939
+#: src/input/input_v4l.c:1937
 msgid "The path to your Video4Linux radio device."
 msgstr ""
 
@@ -2117,110 +2123,110 @@ msgstr ""
 msgid "Should have converted this above"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:191
+#: src/input/vcd/xineplug_inp_vcd.c:192
 msgid "failed to find a device with a VCD"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:328
+#: src/input/vcd/xineplug_inp_vcd.c:329
 msgid "was passed a null class parameter"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:972
+#: src/input/vcd/xineplug_inp_vcd.c:982
 msgid "Invalid current entry type"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:996
+#: src/input/vcd/xineplug_inp_vcd.c:1006
 msgid ""
 "Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1097
+#: src/input/vcd/xineplug_inp_vcd.c:1107
 msgid "selection has no RETURN entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1126
+#: src/input/vcd/xineplug_inp_vcd.c:1136
 msgid "DEFAULT selected, but PBC is not on."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1131
+#: src/input/vcd/xineplug_inp_vcd.c:1141
 msgid "selection has no NEXT entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1139
+#: src/input/vcd/xineplug_inp_vcd.c:1149
 msgid "selection has no PREVIOUS entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1146
+#: src/input/vcd/xineplug_inp_vcd.c:1156
 msgid "Unknown event type: "
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1446 src/input/vcd/xineplug_inp_vcd.c:1493
+#: src/input/vcd/xineplug_inp_vcd.c:1452 src/input/vcd/xineplug_inp_vcd.c:1499
 msgid "The above message had unknown vcdimager log level"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1824
+#: src/input/vcd/xineplug_inp_vcd.c:1830
 msgid "VCD default type to use on autoplay"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1825
+#: src/input/vcd/xineplug_inp_vcd.c:1831
 msgid ""
 "The VCD play unit to use when none is specified in an MRL, e.g. vcd:// or "
 "vcd:///dev/dvd:"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1835
+#: src/input/vcd/xineplug_inp_vcd.c:1841
 msgid "CD-ROM drive used for VCD when none given"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1836
+#: src/input/vcd/xineplug_inp_vcd.c:1842
 msgid ""
 "What to use if no drive specified. If the setting is empty, xine will scan "
 "for CD drives."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1846
+#: src/input/vcd/xineplug_inp_vcd.c:1852
 msgid "VCD position slider range"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1847
+#: src/input/vcd/xineplug_inp_vcd.c:1853
 msgid ""
 "range that the stream playback position slider represents playing a VCD."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1855
+#: src/input/vcd/xineplug_inp_vcd.c:1861
 msgid "VCD read-ahead caching?"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1856
+#: src/input/vcd/xineplug_inp_vcd.c:1862
 msgid "Class may lead to jerky playback on low-end machines."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1866
+#: src/input/vcd/xineplug_inp_vcd.c:1872
 msgid "automatically advance VCD track/entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1867
+#: src/input/vcd/xineplug_inp_vcd.c:1873
 msgid ""
 "If enabled, we should automatically advance to the next entry or track. Used "
 "only when playback control (PBC) is disabled."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1876
+#: src/input/vcd/xineplug_inp_vcd.c:1882
 msgid "show 'rejected' VCD LIDs"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1877
+#: src/input/vcd/xineplug_inp_vcd.c:1883
 msgid ""
 "Some playback list IDs (LIDs) are marked not showable, but you can see them "
 "in the MRL list if this is set. Rejected entries are marked with an asterisk "
 "(*) appended to the MRL."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1888
+#: src/input/vcd/xineplug_inp_vcd.c:1894
 msgid "VCD format string for display banner"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1889
+#: src/input/vcd/xineplug_inp_vcd.c:1895
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are:\n"
@@ -2241,11 +2247,11 @@ msgid ""
 " %% : a %\n"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1914
+#: src/input/vcd/xineplug_inp_vcd.c:1920
 msgid "VCD format string for stream comment field"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1915
+#: src/input/vcd/xineplug_inp_vcd.c:1921
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
@@ -2253,11 +2259,11 @@ msgid ""
 "See the help for the title_format for the meanings of these."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1927
+#: src/input/vcd/xineplug_inp_vcd.c:1933
 msgid "VCD debug flag mask"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1928
+#: src/input/vcd/xineplug_inp_vcd.c:1934
 msgid ""
 "For tracking down bugs in the VCD plugin. Mask values are:\n"
 "   1: Meta information\n"
@@ -2274,57 +2280,6 @@ msgid ""
 "2048: Debugging from VCDINFO\n"
 msgstr ""
 
-#: src/liba52/xine_a52_decoder.c:742 src/libxineadec/xine_dts_decoder.c:524
-msgid "HELP! a mono-only audio driver?!\n"
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:805
-msgid "A/52 volume"
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:806
-msgid ""
-"With A/52 audio, you can modify the volume at the decoder level. This has "
-"the advantage of the audio being already decoded for the specified volume, "
-"so later operations like channel downmixing will work on an audio stream of "
-"the given volume."
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:814
-msgid "use A/52 dynamic range compression"
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:815
-msgid ""
-"Dynamic range compression limits the dynamic range of the audio. This means "
-"making the loud sounds softer, and the soft sounds louder, so you can more "
-"easily listen to the audio in a noisy environment without disturbing anyone."
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:822
-msgid "downmix audio to 2 channel surround stereo"
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:823
-msgid ""
-"When you want to listen to multichannel surround sound, but you have only "
-"two speakers or a surround decoder or amplifier which does some sort of "
-"matrix surround decoding like prologic, you should enable this option so "
-"that the additional channels are mixed into the stereo signal."
-msgstr ""
-
-#: src/libfaad/xine_faad_decoder.c:131
-msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
-msgstr ""
-
-#: src/libfaad/xine_faad_decoder.c:140
-msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
-msgstr ""
-
-#: src/libfaad/xine_faad_decoder.c:151
-msgid "libfaad: libfaad NeAACDecInit failed.\n"
-msgstr ""
-
 #: src/libffmpeg/ff_audio_decoder.c:122
 #, c-format
 msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
@@ -2348,45 +2303,6 @@ msgstr ""
 msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
 msgstr ""
 
-#: src/libffmpeg/ff_video_decoder.c:155
-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:173
-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:333
-#, c-format
-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:362
-msgid "ffmpeg_video_dec: couldn't open decoder\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:397
-msgid "ffmpeg_video_dec: direct rendering enabled\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:816
-#, c-format
-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:1514
-msgid "MPEG-4 postprocessing quality"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:1515
-msgid ""
-"You can adjust the amount of post processing applied to MPEG-4 video.\n"
-"Higher values result in better quality, but need more CPU. Lower values may "
-"result in image defects like block artifacts. For high quality content, too "
-"heavy post processing can actually make the image worse by blurring it too "
-"much."
-msgstr ""
-
 #: src/libffmpeg/ffmpeg_encoder.c:163
 msgid "libavcodec mpeg output bitrate (kbit/s)"
 msgstr ""
@@ -2425,23 +2341,43 @@ msgstr ""
 msgid "The maximum compression to apply to an image in constant quality mode."
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:249
+#: src/libffmpeg/ff_video_decoder.c:155
+msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:173
+msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:333
 #, c-format
-msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:323
-msgid "libmusepack: data after last frame ignored\n"
+#: src/libffmpeg/ff_video_decoder.c:362
+msgid "ffmpeg_video_dec: couldn't open decoder\n"
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:334
-msgid "libmusepack: mpc_decoder_initialise failed\n"
+#: src/libffmpeg/ff_video_decoder.c:397
+msgid "ffmpeg_video_dec: direct rendering enabled\n"
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:354
-#: src/libxineadec/xine_musepack_decoder.c:369
+#: src/libffmpeg/ff_video_decoder.c:816
 #, c-format
-msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:1519
+msgid "MPEG-4 postprocessing quality"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:1520
+msgid ""
+"You can adjust the amount of post processing applied to MPEG-4 video.\n"
+"Higher values result in better quality, but need more CPU. Lower values may "
+"result in image defects like block artifacts. For high quality content, too "
+"heavy post processing can actually make the image worse by blurring it too "
+"much."
 msgstr ""
 
 #: src/libreal/real_common.c:107
@@ -2457,10 +2393,6 @@ msgid ""
 "information on how to install the codecs."
 msgstr ""
 
-#: src/libreal/xine_real_video_decoder.c:164
-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
-msgstr ""
-
 #: src/libreal/xine_real_audio_decoder.c:130
 #, c-format
 msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
@@ -2480,6 +2412,10 @@ msgstr ""
 msgid "libareal: oups, real can do more than 2 channels ?\n"
 msgstr ""
 
+#: src/libreal/xine_real_video_decoder.c:164
+msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+msgstr ""
+
 #: src/libspucc/xine_cc_decoder.c:192
 msgid "display closed captions in MPEG-2 streams"
 msgstr ""
@@ -2691,6 +2627,77 @@ msgstr ""
 msgid "w32codec: Error initializing DMO Audio\n"
 msgstr ""
 
+#: src/libxineadec/xine_a52_decoder.c:742
+#: src/libxineadec/xine_dts_decoder.c:524
+msgid "HELP! a mono-only audio driver?!\n"
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:805
+msgid "A/52 volume"
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:806
+msgid ""
+"With A/52 audio, you can modify the volume at the decoder level. This has "
+"the advantage of the audio being already decoded for the specified volume, "
+"so later operations like channel downmixing will work on an audio stream of "
+"the given volume."
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:814
+msgid "use A/52 dynamic range compression"
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:815
+msgid ""
+"Dynamic range compression limits the dynamic range of the audio. This means "
+"making the loud sounds softer, and the soft sounds louder, so you can more "
+"easily listen to the audio in a noisy environment without disturbing anyone."
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:822
+msgid "downmix audio to 2 channel surround stereo"
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:823
+msgid ""
+"When you want to listen to multichannel surround sound, but you have only "
+"two speakers or a surround decoder or amplifier which does some sort of "
+"matrix surround decoding like prologic, you should enable this option so "
+"that the additional channels are mixed into the stereo signal."
+msgstr ""
+
+#: src/libxineadec/xine_faad_decoder.c:130
+msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
+msgstr ""
+
+#: src/libxineadec/xine_faad_decoder.c:139
+msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
+msgstr ""
+
+#: src/libxineadec/xine_faad_decoder.c:150
+msgid "libfaad: libfaad NeAACDecInit failed.\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:249
+#, c-format
+msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:323
+msgid "libmusepack: data after last frame ignored\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:334
+msgid "libmusepack: mpc_decoder_initialise failed\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:354
+#: src/libxineadec/xine_musepack_decoder.c:369
+#, c-format
+msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgstr ""
+
 #: src/libxinevdec/bitplane.c:1272
 #, c-format
 msgid "bitplane: error doing ByteRun1 decompression\n"
@@ -2905,22 +2912,6 @@ msgid ""
 "* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
 msgstr ""
 
-#: src/post/planar/eq.c:186
-msgid ""
-"Software equalizer with interactive controls just like the hardware "
-"equalizer, for cards/drivers that do not support brightness and contrast "
-"controls in hardware.\n"
-"\n"
-"Parameters\n"
-"  brightness\n"
-"  contrast\n"
-"\n"
-"Note: It is possible to use frontend's control window to set these "
-"parameters.\n"
-"\n"
-"* mplayer's eq (C) Richard Felker\n"
-msgstr ""
-
 #: src/post/planar/eq2.c:359
 msgid ""
 "Alternative software equalizer that uses lookup tables (very slow), allowing "
@@ -2945,6 +2936,22 @@ msgid ""
 "* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
 msgstr ""
 
+#: src/post/planar/eq.c:186
+msgid ""
+"Software equalizer with interactive controls just like the hardware "
+"equalizer, for cards/drivers that do not support brightness and contrast "
+"controls in hardware.\n"
+"\n"
+"Parameters\n"
+"  brightness\n"
+"  contrast\n"
+"\n"
+"Note: It is possible to use frontend's control window to set these "
+"parameters.\n"
+"\n"
+"* mplayer's eq (C) Richard Felker\n"
+msgstr ""
+
 #: src/post/planar/expand.c:251
 msgid ""
 "The expand plugin is meant to take frames of arbitrary aspect ratio and "
@@ -3020,6 +3027,63 @@ msgid ""
 "* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
 msgstr ""
 
+#: src/vdr/input_vdr.c:183 src/vdr/input_vdr.c:223 src/vdr/input_vdr.c:2297
+#: src/vdr/input_vdr.c:2394
+#, fuzzy, c-format
+msgid ": input event write: %s.\n"
+msgstr "input_cda: fopen(%s) à échoué: %s\n"
+
+#: src/vdr/input_vdr.c:713 src/vdr/input_vdr.c:1137
+msgid ": buffer_pool_alloc() failed!\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:782
+#, c-format
+msgid ": flush buffers (vb: %d, ab: %d, vf: %d, af: %d) %s.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1475
+#, c-format
+msgid ": shutting down rpc thread (timeout: %d ms) ...\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1499
+#, fuzzy, c-format
+msgid ": cancelling rpc thread in function %d...\n"
+msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n"
+
+#: src/vdr/input_vdr.c:1506
+msgid ": joining rpc thread ...\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1508
+msgid ": rpc thread joined.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:2137 src/vdr/input_vdr.c:2151 src/vdr/input_vdr.c:2169
+#: src/vdr/input_vdr.c:2190 src/vdr/input_vdr.c:2211
+#, fuzzy, c-format
+msgid ": failed to open '%s' (%s)\n"
+msgstr "incapable de resoudre '%s'.\n"
+
+#: src/vdr/input_vdr.c:2153
+msgid "timeout expired during setup phase"
+msgstr ""
+
+#: src/vdr/input_vdr.c:2227
+#, fuzzy, c-format
+msgid ": can't create new thread (%s)\n"
+msgstr "input_rtp: ne peux pas créer le nouveau thread (%s)\n"
+
+#: src/vdr/input_vdr.c:2487
+msgid "VDR display device plugin"
+msgstr ""
+
+#: src/vdr/post_vdr_video.c:435
+#, c-format
+msgid ": osd: (%d, %d)-(%d, %d)@%lg\n"
+msgstr ""
+
 #: src/video_out/video_out_aa.c:311
 msgid "xine video output plugin using the ascii-art library"
 msgstr "plugin de sortie video de xine utilisant la librairie ascii-art"
@@ -3269,8 +3333,8 @@ msgid ""
 msgstr ""
 
 #: src/video_out/video_out_opengl.c:1918 src/video_out/video_out_vidix.c:1015
-#: src/video_out/video_out_xcbxv.c:1476 src/video_out/video_out_xv.c:1489
-#: src/video_out/video_out_xvmc.c:1461 src/video_out/video_out_xxmc.c:2465
+#: src/video_out/video_out_xcbxv.c:1304 src/video_out/video_out_xv.c:1359
+#: src/video_out/video_out_xvmc.c:1423 src/video_out/video_out_xxmc.c:2531
 msgid "enable double buffering"
 msgstr ""
 
@@ -3346,9 +3410,9 @@ msgstr ""
 msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
 msgstr ""
 
-#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1443
-#: src/video_out/video_out_xv.c:1456 src/video_out/video_out_xvmc.c:1446
-#: src/video_out/video_out_xxmc.c:2432
+#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1271
+#: src/video_out/video_out_xv.c:1326 src/video_out/video_out_xvmc.c:1408
+#: src/video_out/video_out_xxmc.c:2498
 msgid "video overlay colour key"
 msgstr ""
 
@@ -3500,9 +3564,9 @@ msgstr ""
 msgid "The intensity of the blue colour components."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1477
-#: src/video_out/video_out_xv.c:1490 src/video_out/video_out_xvmc.c:1462
-#: src/video_out/video_out_xxmc.c:2466
+#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1305
+#: src/video_out/video_out_xv.c:1360 src/video_out/video_out_xvmc.c:1424
+#: src/video_out/video_out_xxmc.c:2532
 msgid ""
 "Double buffering will synchronize the update of the video image to the "
 "repainting of the entire screen (\"vertical retrace\"). This eliminates "
@@ -3535,9 +3599,9 @@ msgid "video overlay colour key red component"
 msgstr ""
 
 #: src/video_out/video_out_vidix.c:1159 src/video_out/video_out_vidix.c:1166
-#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1444
-#: src/video_out/video_out_xv.c:1457 src/video_out/video_out_xvmc.c:1447
-#: src/video_out/video_out_xxmc.c:2433
+#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1272
+#: src/video_out/video_out_xv.c:1327 src/video_out/video_out_xvmc.c:1409
+#: src/video_out/video_out_xxmc.c:2499
 msgid ""
 "The colour key is used to tell the graphics card where to overlay the video "
 "image. Try different values, if you experience windows becoming transparent."
@@ -3568,13 +3632,13 @@ msgid "%s: %s: allocating image\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbshm.c:159 src/video_out/video_out_xcbshm.c:169
-#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:272
-#: src/video_out/video_out_xcbxv.c:282 src/video_out/video_out_xcbxv.c:292
-#: src/video_out/video_out_xcbxv.c:304 src/video_out/video_out_xshm.c:204
+#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:267
+#: src/video_out/video_out_xcbxv.c:277 src/video_out/video_out_xcbxv.c:287
+#: src/video_out/video_out_xcbxv.c:299 src/video_out/video_out_xshm.c:204
 #: src/video_out/video_out_xshm.c:221 src/video_out/video_out_xshm.c:232
-#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:296
-#: src/video_out/video_out_xv.c:307 src/video_out/video_out_xv.c:316
-#: src/video_out/video_out_xv.c:352 src/video_out/video_out_xxmc.c:648
+#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:295
+#: src/video_out/video_out_xv.c:322 src/video_out/video_out_xv.c:331
+#: src/video_out/video_out_xv.c:367 src/video_out/video_out_xxmc.c:648
 #: src/video_out/video_out_xxmc.c:659 src/video_out/video_out_xxmc.c:668
 #: src/video_out/video_out_xxmc.c:704
 #, c-format
@@ -3586,8 +3650,8 @@ msgstr ""
 msgid "%s: shared memory error (address error) when allocating image \n"
 msgstr ""
 
-#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:302
-#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:350
+#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:297
+#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:365
 #: src/video_out/video_out_xxmc.c:702
 #, c-format
 msgid "%s: x11 error during shared memory XImage creation\n"
@@ -3617,61 +3681,61 @@ msgstr ""
 msgid "xine video output plugin using the MIT X shared memory extension"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:270 src/video_out/video_out_xv.c:305
+#: src/video_out/video_out_xcbxv.c:265 src/video_out/video_out_xv.c:320
 #: src/video_out/video_out_xxmc.c:657
 #, c-format
 msgid "%s: XvShmCreateImage returned a zero size\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:280 src/video_out/video_out_xv.c:314
+#: src/video_out/video_out_xcbxv.c:275 src/video_out/video_out_xv.c:329
 #: src/video_out/video_out_xxmc.c:666
 #, c-format
 msgid "%s: shared memory error in shmget: %s\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:290
+#: src/video_out/video_out_xcbxv.c:285
 #, c-format
 msgid "%s: shared memory error (address error)\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1294 src/video_out/video_out_xv.c:1301
-#: src/video_out/video_out_xxmc.c:2283
+#: src/video_out/video_out_xcbxv.c:1125 src/video_out/video_out_xv.c:1174
+#: src/video_out/video_out_xxmc.c:2349
 #, c-format
 msgid "%s: Xv extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1336 src/video_out/video_out_xv.c:1338
-#: src/video_out/video_out_xxmc.c:2320
+#: src/video_out/video_out_xcbxv.c:1167 src/video_out/video_out_xv.c:1211
+#: src/video_out/video_out_xxmc.c:2386
 #, c-format
 msgid ""
 "%s: Xv extension is present but I couldn't find a usable yuv12 port.\n"
 "\tLooks like your graphics hardware driver doesn't support Xv?!\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1345
+#: src/video_out/video_out_xcbxv.c:1176
 #, c-format
 msgid ""
 "%s: using Xv port %d from adaptor %s for hardware colorspace conversion and "
 "scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1452 src/video_out/video_out_xv.c:1465
-#: src/video_out/video_out_xvmc.c:1455 src/video_out/video_out_xxmc.c:2441
+#: src/video_out/video_out_xcbxv.c:1280 src/video_out/video_out_xv.c:1335
+#: src/video_out/video_out_xvmc.c:1417 src/video_out/video_out_xxmc.c:2507
 msgid "autopaint colour key"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1453 src/video_out/video_out_xv.c:1466
-#: src/video_out/video_out_xvmc.c:1456 src/video_out/video_out_xxmc.c:2442
+#: src/video_out/video_out_xcbxv.c:1281 src/video_out/video_out_xv.c:1336
+#: src/video_out/video_out_xvmc.c:1418 src/video_out/video_out_xxmc.c:2508
 msgid "Make Xv autopaint its colorkey."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1460 src/video_out/video_out_xv.c:1473
-#: src/video_out/video_out_xxmc.c:2449
+#: src/video_out/video_out_xcbxv.c:1288 src/video_out/video_out_xv.c:1343
+#: src/video_out/video_out_xxmc.c:2515
 msgid "bilinear scaling mode"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1461 src/video_out/video_out_xv.c:1474
-#: src/video_out/video_out_xxmc.c:2450
+#: src/video_out/video_out_xcbxv.c:1289 src/video_out/video_out_xv.c:1344
+#: src/video_out/video_out_xxmc.c:2516
 msgid ""
 "Selects the bilinear scaling mode for Permedia cards. The individual values "
 "are:\n"
@@ -3686,74 +3750,30 @@ msgid ""
 "2 - enable full bilinear filtering"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1513 src/video_out/video_out_xv.c:1523
-#: src/video_out/video_out_xxmc.c:2506
+#: src/video_out/video_out_xcbxv.c:1341 src/video_out/video_out_xv.c:1393
+#: src/video_out/video_out_xxmc.c:2572
 #, c-format
 msgid "%s: this adaptor supports the yv12 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1518 src/video_out/video_out_xv.c:1528
-#: src/video_out/video_out_xxmc.c:2511
+#: src/video_out/video_out_xcbxv.c:1346 src/video_out/video_out_xv.c:1398
+#: src/video_out/video_out_xxmc.c:2577
 #, c-format
 msgid "%s: this adaptor supports the yuy2 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1526 src/video_out/video_out_xv.c:1550
-#: src/video_out/video_out_xxmc.c:2534
+#: src/video_out/video_out_xcbxv.c:1354 src/video_out/video_out_xv.c:1420
+#: src/video_out/video_out_xxmc.c:2600
 msgid "pitch alignment workaround"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1527 src/video_out/video_out_xv.c:1551
-#: src/video_out/video_out_xxmc.c:2535
+#: src/video_out/video_out_xcbxv.c:1355 src/video_out/video_out_xv.c:1421
+#: src/video_out/video_out_xxmc.c:2601
 msgid "Some buggy video drivers need a workaround to function properly."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1533 src/video_out/video_out_xv.c:1557
-#: src/video_out/video_out_xvmc.c:1524
-msgid "deinterlace method (deprecated)"
-msgstr ""
-
-#: src/video_out/video_out_xcbxv.c:1534 src/video_out/video_out_xv.c:1558
-#: src/video_out/video_out_xvmc.c:1525
-msgid ""
-"This config setting is deprecated. You should use the new deinterlacing post "
-"processing settings instead.\n"
-"\n"
-"From the old days of analog television, where the even and odd numbered "
-"lines of a video frame would be displayed at different times comes the idea "
-"to increase motion smoothness by also recording the lines at different "
-"times. This is called \"interlacing\". But unfortunately, todays displays "
-"show the even and odd numbered lines as one complete frame all at the same "
-"time (called \"progressive display\"), which results in ugly frame errors "
-"known as comb artifacts. Software deinterlacing is an approach to reduce "
-"these artifacts. The individual values are:\n"
-"\n"
-"none\n"
-"Disables software deinterlacing.\n"
-"\n"
-"bob\n"
-"Interpolates between the lines for moving parts of the image.\n"
-"\n"
-"weave\n"
-"Similar to bob, but with a tendency to preserve the full resolution, better "
-"for high detail in low movement scenes.\n"
-"\n"
-"greedy\n"
-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
-"\n"
-"onefield\n"
-"Always interpolates and reduces vertical resolution.\n"
-"\n"
-"onefieldxv\n"
-"Same as onefield, but does the interpolation in hardware.\n"
-"\n"
-"linearblend\n"
-"Applies a slight vertical blur to remove the comb artifacts. Good results "
-"with medium CPU usage."
-msgstr ""
-
-#: src/video_out/video_out_xcbxv.c:1588 src/video_out/video_out_xv.c:1631
-#: src/video_out/video_out_xxmc.c:2615
+#: src/video_out/video_out_xcbxv.c:1383 src/video_out/video_out_xv.c:1468
+#: src/video_out/video_out_xxmc.c:2681
 msgid "xine video output plugin using the MIT X video extension"
 msgstr "plugin de sortie video de xine utilisant l'extension video MIT X"
 
@@ -3762,94 +3782,94 @@ msgstr "plugin de sortie video de xine utilisant l'extension video MIT X"
 msgid "%s: shared memory error when allocating image\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:294 src/video_out/video_out_xxmc.c:646
+#: src/video_out/video_out_xv.c:293 src/video_out/video_out_xxmc.c:646
 #, c-format
 msgid "%s: XvShmCreateImage failed\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1348 src/video_out/video_out_xxmc.c:2330
+#: src/video_out/video_out_xv.c:1221 src/video_out/video_out_xxmc.c:2396
 #, c-format
 msgid ""
 "%s: using Xv port %ld from adaptor %s for hardware colorspace conversion and "
 "scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1593
+#: src/video_out/video_out_xvmc.c:1496
 #, fuzzy
 msgid "xine video output plugin using the XvMC X video extension"
 msgstr "plugin de sortie video de xine utilisant l'extension video MIT X"
 
-#: src/video_out/video_out_xvmc.c:1639
+#: src/video_out/video_out_xvmc.c:1542
 msgid "video_out_xvmc: XvMC extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1737
+#: src/video_out/video_out_xvmc.c:1640
 msgid ""
 "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
 "port.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1746
+#: src/video_out/video_out_xvmc.c:1649
 #, c-format
 msgid ""
 "video_out_xvmc: using Xv port %ld from adaptor %s\n"
 "                for hardware colorspace conversion and scaling\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1751
+#: src/video_out/video_out_xvmc.c:1654
 msgid "                idct and motion compensation acceleration \n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1753
+#: src/video_out/video_out_xvmc.c:1656
 msgid "                motion compensation acceleration only\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1755
+#: src/video_out/video_out_xvmc.c:1658
 msgid "                no XvMC support \n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1756
+#: src/video_out/video_out_xvmc.c:1659
 #, c-format
 msgid "                With Overlay = %d; UnsignedIntra = %d.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2540
+#: src/video_out/video_out_xxmc.c:2606
 msgid "Make XvMC allocate more frames for better buffering."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2541
+#: src/video_out/video_out_xxmc.c:2607
 msgid ""
 "Some XvMC implementations allow more than 8 frames.\n"
 "This option, when turned on, makes the driver try to\n"
 "allocate 15 frames. A must for unichrome and live VDR.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2547
+#: src/video_out/video_out_xxmc.c:2613
 msgid "Unichrome cpu save"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2548
+#: src/video_out/video_out_xxmc.c:2614
 msgid ""
 "Saves CPU time by sleeping while decoder works.\n"
 "Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n"
 "Experimental.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2554
+#: src/video_out/video_out_xxmc.c:2620
 msgid "Fix buggy NVIDIA XvMC subpicture colors"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2555
+#: src/video_out/video_out_xxmc.c:2621
 msgid ""
 "There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
 "look blue and vice versa. This option provides a workaround.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2560
+#: src/video_out/video_out_xxmc.c:2626
 msgid "Use bob as accelerated deinterlace method."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2561
+#: src/video_out/video_out_xxmc.c:2627
 msgid ""
 "When interlacing is enabled for hardware accelerated frames,\n"
 "Alternate between top and bottom field at double the frame rate.\n"
@@ -3873,11 +3893,11 @@ msgstr ""
 msgid "x11osd: unscaled overlay created (%s mode).\n"
 msgstr ""
 
-#: src/xine-engine/alphablend.c:2123
+#: src/xine-engine/alphablend.c:2146
 msgid "disable exact alpha blending of overlays"
 msgstr ""
 
-#: src/xine-engine/alphablend.c:2124
+#: src/xine-engine/alphablend.c:2147
 msgid ""
 "If you experience a performance impact when an On Screen Display or other "
 "overlays like DVD subtitles are active, then you might want to enable this "
@@ -4411,70 +4431,70 @@ msgid ""
 "foreground-border-background."
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:380
+#: src/xine-engine/video_decoder.c:390
 #, c-format
 msgid "video_decoder: no plugin available to handle '%s'\n"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:459
+#: src/xine-engine/video_decoder.c:469
 #, c-format
 msgid "video_decoder: error, unknown buffer type: %08x\n"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:495
+#: src/xine-engine/video_decoder.c:505
 msgid "number of video buffers"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:496
+#: src/xine-engine/video_decoder.c:506
 msgid ""
 "The number of video buffers (each is 8k in size) xine uses in its internal "
 "queue. Higher values mean smoother playback for unreliable inputs, but also "
 "increased latency and memory consumption."
 msgstr ""
 
-#: src/xine-engine/video_out.c:642
+#: src/xine-engine/video_out.c:671
 #, c-format
 msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
 msgstr ""
 
-#: src/xine-engine/video_out.c:815
+#: src/xine-engine/video_out.c:844
 #, c-format
 msgid ""
 "video_out: throwing away image with pts %<PRId64> because it's too old "
 "(diff : %<PRId64>).\n"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1794
+#: src/xine-engine/video_out.c:1863
 msgid "default number of video frames"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1795
+#: src/xine-engine/video_out.c:1864
 msgid ""
 "The default number of video frames to request from xine video out driver. "
 "Some drivers will override this setting with their own values."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1834
+#: src/xine-engine/video_out.c:1921
 msgid "percentage of skipped frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1835
+#: src/xine-engine/video_out.c:1922
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not decoded in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1840
+#: src/xine-engine/video_out.c:1927
 msgid "percentage of discarded frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1841
+#: src/xine-engine/video_out.c:1928
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not scheduled for display in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1875
+#: src/xine-engine/video_out.c:1965
 msgid "video_out: sorry, this should not happen. please restart xine.\n"
 msgstr ""
 
@@ -4517,129 +4537,129 @@ msgid ""
 "accelerated, this can dramatically reduce CPU usage."
 msgstr ""
 
-#: src/xine-engine/xine.c:706 src/xine-engine/xine.c:813
-#: src/xine-engine/xine.c:852 src/xine-engine/xine.c:888
-#: src/xine-engine/xine.c:900 src/xine-engine/xine.c:913
-#: src/xine-engine/xine.c:926 src/xine-engine/xine.c:939
-#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:990
-#: src/xine-engine/xine.c:1025
+#: src/xine-engine/xine.c:771 src/xine-engine/xine.c:878
+#: src/xine-engine/xine.c:917 src/xine-engine/xine.c:953
+#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:978
+#: src/xine-engine/xine.c:991 src/xine-engine/xine.c:1004
+#: src/xine-engine/xine.c:1030 src/xine-engine/xine.c:1055
+#: src/xine-engine/xine.c:1090
 msgid "xine: error while parsing mrl\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:742
+#: src/xine-engine/xine.c:807
 #, fuzzy, c-format
 msgid "xine: found input plugin  : %s\n"
 msgstr "plugin de sortie video de xine pour cartes dxr3"
 
-#: src/xine-engine/xine.c:760
+#: src/xine-engine/xine.c:825
 #, fuzzy, c-format
 msgid "xine: input plugin cannot open MRL [%s]\n"
 msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
 
-#: src/xine-engine/xine.c:776
+#: src/xine-engine/xine.c:841
 #, fuzzy, c-format
 msgid "xine: cannot find input plugin for MRL [%s]\n"
 msgstr "plugin de sortie video de xine pour cartes dxr3"
 
-#: src/xine-engine/xine.c:802
+#: src/xine-engine/xine.c:867
 #, c-format
 msgid "xine: specified demuxer %s failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:838
+#: src/xine-engine/xine.c:903
 #, c-format
 msgid "xine: join rip input plugin\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:845
+#: src/xine-engine/xine.c:910
 #, fuzzy
 msgid "xine: error opening rip input plugin instance\n"
 msgstr "input_dvd: erreur de lecture dans le plugin input_dvd\n"
 
-#: src/xine-engine/xine.c:876
+#: src/xine-engine/xine.c:941
 #, c-format
 msgid "xine: last_probed demuxer %s failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:905
+#: src/xine-engine/xine.c:970
 msgid "ignoring video\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:918
+#: src/xine-engine/xine.c:983
 msgid "ignoring audio\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:931
+#: src/xine-engine/xine.c:996
 msgid "ignoring subpicture\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:944
+#: src/xine-engine/xine.c:1009
 msgid "input cache plugin disabled\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1015
+#: src/xine-engine/xine.c:1080
 #, c-format
 msgid "subtitle mrl opened '%s'\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1019
+#: src/xine-engine/xine.c:1084
 #, fuzzy
 msgid "xine: error opening subtitle mrl\n"
 msgstr "input_dvd: ne peux pas ouvrir le fichier >%s<\n"
 
-#: src/xine-engine/xine.c:1051
+#: src/xine-engine/xine.c:1116
 #, c-format
 msgid "xine: error while parsing MRL\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1058
+#: src/xine-engine/xine.c:1123
 #, c-format
 msgid "xine: changing option '%s' from MRL isn't permitted\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1078
+#: src/xine-engine/xine.c:1143
 #, c-format
 msgid "xine: couldn't find demux for >%s<\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1094
+#: src/xine-engine/xine.c:1159
 #, c-format
 msgid "xine: found demuxer plugin: %s\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1114
+#: src/xine-engine/xine.c:1179
 #, c-format
 msgid "xine: demuxer failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1179
+#: src/xine-engine/xine.c:1244
 #, c-format
 msgid "xine_play: no demux available\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1249
+#: src/xine-engine/xine.c:1314
 #, c-format
 msgid "xine_play: demux failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1527
+#: src/xine-engine/xine.c:1592
 #, c-format
 msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1532
+#: src/xine-engine/xine.c:1597
 msgid "The specified save_dir might be a security risk."
 msgstr ""
 
-#: src/xine-engine/xine.c:1561
+#: src/xine-engine/xine.c:1626
 msgid "xine: locale not supported by C library\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1570
+#: src/xine-engine/xine.c:1635
 msgid "media format detection strategy"
 msgstr ""
 
-#: src/xine-engine/xine.c:1571
+#: src/xine-engine/xine.c:1636
 msgid ""
 "xine offers various methods to detect the media format of input to play. The "
 "individual values are:\n"
@@ -4657,11 +4677,11 @@ msgid ""
 "Detect by file name extension only.\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1589
+#: src/xine-engine/xine.c:1654
 msgid "directory for saving streams"
 msgstr ""
 
-#: src/xine-engine/xine.c:1590
+#: src/xine-engine/xine.c:1655
 msgid ""
 "When using the stream save feature, files will be written only into this "
 "directory.\n"
@@ -4671,11 +4691,11 @@ msgid ""
 "content in any file."
 msgstr ""
 
-#: src/xine-engine/xine.c:1601
+#: src/xine-engine/xine.c:1666
 msgid "allow implicit changes to the configuration (e.g. by MRL)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1602
+#: src/xine-engine/xine.c:1667
 msgid ""
 "If enabled, you allow xine to change your configuration without explicit "
 "actions from your side. For example configuration changes demanded by MRLs "
@@ -4685,26 +4705,26 @@ msgid ""
 "configuration, you might end with a totally messed up xine."
 msgstr ""
 
-#: src/xine-engine/xine.c:1616
+#: src/xine-engine/xine.c:1681
 msgid "Timeout for network stream reading (in seconds)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1617
+#: src/xine-engine/xine.c:1682
 msgid ""
 "Specifies the timeout when reading from network streams, in seconds. Too low "
 "values might stop streaming when the source is slow or the bandwidth is "
 "occupied, too high values will freeze the player if the connection is lost."
 msgstr ""
 
-#: src/xine-engine/xine.c:1969
+#: src/xine-engine/xine.c:2034
 msgid "messages"
 msgstr "messages"
 
-#: src/xine-engine/xine.c:1970
+#: src/xine-engine/xine.c:2035
 msgid "plugin"
 msgstr ""
 
-#: src/xine-engine/xine.c:1971
+#: src/xine-engine/xine.c:2036
 msgid "trace"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 096261ca0..c2fdfd57a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-04-24 21:48+0100\n"
+"POT-Creation-Date: 2007-06-02 13:14+0200\n"
 "PO-Revision-Date: 2006-06-18 23:05+0200\n"
 "Last-Translator: Diego 'Flameeyes' Pettenò <flameeyes@gentoo.org>\n"
 "Language-Team: Italian\n"
@@ -849,6 +849,13 @@ msgstr ""
 "plugin output audio di xine che usa i dispositivi/driver audio compiacenti "
 "di sun"
 
+#: src/combined/xine_ogg_demuxer.c:810
+#, c-format
+msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+msgstr ""
+"ogg: indicata traccia audio vorbis ma nessuno stream di intestazione vorbis "
+"trovato.\n"
+
 #: src/demuxers/demux_asf.c:428
 #, c-format
 msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
@@ -995,13 +1002,6 @@ msgstr ""
 "demux_mpeg_pes: stream 1 0x%02x privato sconosciuto. Segnala la cosa agli "
 "sviluppatori di xine.\n"
 
-#: src/demuxers/demux_ogg.c:802
-#, c-format
-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
-msgstr ""
-"ogg: indicata traccia audio vorbis ma nessuno stream di intestazione vorbis "
-"trovato.\n"
-
 #: src/demuxers/demux_snd.c:104
 #, c-format
 msgid "demux_snd: bad header parameters\n"
@@ -1045,18 +1045,6 @@ msgstr ""
 "demux_wc3movie: Si è verificato un problema durante il caricamento di un "
 "grossi pezzi di palette\n"
 
-#: src/dxr3/dxr3.h:32
-msgid "DXR3 device number"
-msgstr "Numero del dispositivo DXR3"
-
-#: src/dxr3/dxr3.h:33
-msgid ""
-"If you have more than one DXR3 in your computer, you can specify which one "
-"to use here."
-msgstr ""
-"Se si ha più di un dispositivo DXR3 nel proprio computer si può specificare "
-"quale utilizzare."
-
 #: src/dxr3/dxr3_decode_spu.c:253
 #, c-format
 msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
@@ -1176,6 +1164,18 @@ msgstr ""
 "dxr3_decode_video: ATTENZIONE: si sta correggendo il codice tasso frame da "
 "PAL a NTSC\n"
 
+#: src/dxr3/dxr3.h:32
+msgid "DXR3 device number"
+msgstr "Numero del dispositivo DXR3"
+
+#: src/dxr3/dxr3.h:33
+msgid ""
+"If you have more than one DXR3 in your computer, you can specify which one "
+"to use here."
+msgstr ""
+"Se si ha più di un dispositivo DXR3 nel proprio computer si può specificare "
+"quale utilizzare."
+
 #: src/dxr3/dxr3_mpeg_encoders.c:125
 msgid "dxr3_mpeg_encoder: failed to init librte\n"
 msgstr "dxr3_mpeg_encoder: inizializzazione librte non riuscita\n"
@@ -1524,30 +1524,30 @@ msgstr ""
 "video_out_dxr3: ERRORE leggendo il file di inizializzazione dell'overlay. Si "
 "esegua l'autocalibrazione.\n"
 
-#: src/input/input_cdda.c:1608
+#: src/input/input_cdda.c:1611
 #, c-format
 msgid "%s: can't connect to %s:%d\n"
 msgstr "%s: impossibile connettersi a %s: %d\n"
 
-#: src/input/input_cdda.c:1655
+#: src/input/input_cdda.c:1658
 #, c-format
 msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
 msgstr "input_cdda: connesso al server CDDB %s:%d con successo.\n"
 
-#: src/input/input_cdda.c:1660
+#: src/input/input_cdda.c:1663
 #, c-format
 msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
 msgstr "input_cdda: connessione al server CDDB '%s:%d' non riuscita (%s).\n"
 
-#: src/input/input_cdda.c:2690
+#: src/input/input_cdda.c:2693
 msgid "CD Digital Audio (aka. CDDA)"
 msgstr "CD Audio (CDDA)"
 
-#: src/input/input_cdda.c:2742
+#: src/input/input_cdda.c:2745
 msgid "device used for CD audio"
 msgstr "dispositivo utilizzato per CD audio"
 
-#: src/input/input_cdda.c:2743
+#: src/input/input_cdda.c:2746
 msgid ""
 "The path to the device, usually a CD or DVD drive, which you intend to use "
 "for playing audio CDs."
@@ -1555,11 +1555,11 @@ msgstr ""
 "Il percorso al dispositivo, solitamente un lettore CD o DVD, che si intende "
 "utilizzare per riprodurre CD audio."
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid "query CDDB"
 msgstr "interroga CDDB"
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid ""
 "Enables CDDB queries, which will give you convenient title and track names "
 "for your audio CDs.\n"
@@ -1573,11 +1573,11 @@ msgstr ""
 "informazioni sono ricercate su un server internet che può raccogliere un "
 "profilo delle proprie abitudini d'ascolto."
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid "CDDB server name"
 msgstr "nome del server CDDB"
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid ""
 "The CDDB server used to retrieve the title and track information from.\n"
 "This setting is security critical, because the sever will receive "
@@ -1590,19 +1590,19 @@ msgstr ""
 "risposte maliziose. Assicuratevi di inserire un server di cui ci si possa "
 "fidare."
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "CDDB server port"
 msgstr "porta del server CDDB"
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "The server port used to retrieve the title and track information from."
 msgstr "La porta del server utilizzato per recuperare titoli e tracce."
 
-#: src/input/input_cdda.c:2771
+#: src/input/input_cdda.c:2774
 msgid "slow down disc drive to this speed factor"
 msgstr "rallenta il lettore dischi a questa velocità"
 
-#: src/input/input_cdda.c:2772
+#: src/input/input_cdda.c:2775
 msgid ""
 "Since some CD or DVD drives make some really loud noises because of the fast "
 "disc rotation, xine will try to slow them down. With standard CD or DVD "
@@ -1617,55 +1617,55 @@ msgstr ""
 "dovrebbe influenzare le prestazioni di riproduzione.\n"
 "Un valore pari a zero disabilita il rallentamento."
 
-#: src/input/input_dvb.c:899
+#: src/input/input_dvb.c:900
 #, fuzzy, c-format
 msgid "input_dvb: failed to open dvb channel file '%s': %s\n"
 msgstr "input_dvb: apertura file di canale DVB non riuscita '%s'\n"
 
-#: src/input/input_dvb.c:905
+#: src/input/input_dvb.c:906
 #, fuzzy, c-format
 msgid "input_dvb: dvb channel file '%s' is not a plain file\n"
 msgstr "input_dvb: apertura file di canale DVB non riuscita '%s'\n"
 
-#: src/input/input_dvb.c:2115 src/input/input_dvb.c:2943
+#: src/input/input_dvb.c:2116 src/input/input_dvb.c:2948
 msgid "input_dvb: tuner_set_channel failed\n"
 msgstr "input_dvb: tuner_set_channel non riuscito\n"
 
-#: src/input/input_dvb.c:2743
+#: src/input/input_dvb.c:2748
 msgid "input_dvb: cannot open dvb device\n"
 msgstr "input_dvb: impossibile aprire dispositivo DVB\n"
 
-#: src/input/input_dvb.c:2767
+#: src/input/input_dvb.c:2772
 #, c-format
 msgid "input_dvb: channel %d out of range, defaulting to 0\n"
 msgstr ""
 "input_dvb: canale %d fuori scala, sarà utilizzato il valore predefinito 0\n"
 
-#: src/input/input_dvb.c:2778
+#: src/input/input_dvb.c:2783
 #, c-format
 msgid "input_dvb: searching for channel %s\n"
 msgstr "input_dvb: ricerca del canale %s\n"
 
-#: src/input/input_dvb.c:2801
+#: src/input/input_dvb.c:2806
 #, c-format
 msgid "input_dvb: exact match for %s not found: trying partial matches\n"
 msgstr ""
 "input_dvb: corrispondenza esatta per %s non trovata: saranno provate le "
 "corrispondenze parziali.\n"
 
-#: src/input/input_dvb.c:2808
+#: src/input/input_dvb.c:2813
 #, c-format
 msgid "input_dvb: found matching channel %s\n"
 msgstr "input_dvb: trovato canale corrispondente %s\n"
 
-#: src/input/input_dvb.c:2821
+#: src/input/input_dvb.c:2826
 #, c-format
 msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
 msgstr ""
 "input_dvb: canale %s non trovato in channels.conf, sarà utilizzata un "
 "predefinito.\n"
 
-#: src/input/input_dvb.c:2827
+#: src/input/input_dvb.c:2832
 msgid ""
 "input_dvb: invalid channel specification, defaulting to last viewed "
 "channel.\n"
@@ -1673,13 +1673,13 @@ msgstr ""
 "input_dvb: specifica del canale non valida, sarà utilizzato l'ultimo canale "
 "visto.\n"
 
-#: src/input/input_dvb.c:2833
+#: src/input/input_dvb.c:2838
 msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
 msgstr ""
 "input_dvb: specifica del canale non valida, sarà utilizzato il canale "
 "predefinito 0.\n"
 
-#: src/input/input_dvb.c:2845
+#: src/input/input_dvb.c:2850
 msgid ""
 "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
 "S)\n"
@@ -1687,7 +1687,7 @@ msgstr ""
 "input_dvb: è stato specificato un MRL DVB-S, ma il sintonizzatore non pare "
 "essere QPSK (DVB-S)\n"
 
-#: src/input/input_dvb.c:2865
+#: src/input/input_dvb.c:2870
 msgid ""
 "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
 "T)\n"
@@ -1695,7 +1695,7 @@ msgstr ""
 "input_dvb: è stato specificato un MRL DVB-T ma il sintonizzatore non pare "
 "essere OFDM (DVB-T)\n"
 
-#: src/input/input_dvb.c:2888 src/input/input_dvb.c:2914
+#: src/input/input_dvb.c:2893
 msgid ""
 "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
 "C)\n"
@@ -1703,20 +1703,29 @@ msgstr ""
 "input_dvb: è stato specificato un MRL DVB-C ma il sintonizzatore non pare "
 "essere QAM (DVB-C)\n"
 
-#: src/input/input_dvb.c:2949
+#: src/input/input_dvb.c:2919
+#, fuzzy
+msgid ""
+"input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-"
+"A)\n"
+msgstr ""
+"input_dvb: è stato specificato un MRL DVB-C ma il sintonizzatore non pare "
+"essere QAM (DVB-C)\n"
+
+#: src/input/input_dvb.c:2954
 #, c-format
 msgid "input_dvb: cannot open dvr device '%s'\n"
 msgstr "input_dvb: impossibile aprire dispositivo DVR '%s'\n"
 
-#: src/input/input_dvb.c:2971
+#: src/input/input_dvb.c:2976
 msgid "input_dvb: cannot create EPG updater thread\n"
 msgstr "input_dvb: impossibile creare thread di aggiornamento EPG.\n"
 
-#: src/input/input_dvb.c:3033
+#: src/input/input_dvb.c:3038
 msgid "use DVB 'center cutout' (zoom)"
 msgstr "usa il 'taglio centrale' DVB (zoom)"
 
-#: src/input/input_dvb.c:3034
+#: src/input/input_dvb.c:3039
 msgid ""
 "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
 "frame."
@@ -1724,15 +1733,15 @@ msgstr ""
 "Questo permetterà la riproduzione a pieno schermo di contenuto 4:3 trasmesso "
 "in un frame 16:9."
 
-#: src/input/input_dvb.c:3127
+#: src/input/input_dvb.c:3132
 msgid "DVB (Digital TV) input plugin"
 msgstr "plugin di input per DVB (TV Digitale)"
 
-#: src/input/input_dvb.c:3244
+#: src/input/input_dvb.c:3249
 msgid "Remember last DVB channel watched"
 msgstr "Ricorda l'ultimo canale DVB visto."
 
-#: src/input/input_dvb.c:3245
+#: src/input/input_dvb.c:3250
 msgid ""
 "On autoplay, xine will remember and switch to the channel indicated in media."
 "dvb.last_channel. "
@@ -1740,19 +1749,19 @@ msgstr ""
 "Durante l'auto riproduzione xine ricorderà e scambierà al canale indicato in "
 "media.dvb.last_channel ."
 
-#: src/input/input_dvb.c:3252
+#: src/input/input_dvb.c:3257
 msgid "Last DVB channel viewed"
 msgstr "Ultimo canale DVB visto"
 
-#: src/input/input_dvb.c:3253
+#: src/input/input_dvb.c:3258
 msgid "If enabled xine will remember and switch to this channel. "
 msgstr "Se abilitato xine ricorderà e scambierà a questo canale."
 
-#: src/input/input_dvb.c:3259
+#: src/input/input_dvb.c:3264
 msgid "Number of dvb card to use."
 msgstr "Indice di scheda DVB da utilizzare."
 
-#: src/input/input_dvb.c:3260
+#: src/input/input_dvb.c:3265
 msgid ""
 "Leave this at zero unless you really have more than 1 card in your system."
 msgstr ""
@@ -2008,87 +2017,87 @@ msgstr ""
 msgid "gnome-vfs input plugin as shipped with xine"
 msgstr "plugin di input gnome-vfs incluso con xine"
 
-#: src/input/input_http.c:174
+#: src/input/input_http.c:176
 #, c-format
 msgid "input_http: gethostbyname(%s) failed: %s\n"
 msgstr "input_http: gethostbyname(%s) fallito: %s\n"
 
-#: src/input/input_http.c:400 src/input/input_http.c:943
+#: src/input/input_http.c:402 src/input/input_http.c:957
 #, c-format
 msgid "input_http: read error %d\n"
 msgstr "input_http: errore di lettura %d\n"
 
-#: src/input/input_http.c:627
+#: src/input/input_http.c:629
 msgid "Connecting HTTP server..."
 msgstr "Connessione in corso al server HTTP..."
 
-#: src/input/input_http.c:819
+#: src/input/input_http.c:820
 #, c-format
 msgid "input_http: invalid http answer\n"
 msgstr "input_http: risposta http non valida\n"
 
-#: src/input/input_http.c:825
+#: src/input/input_http.c:826
 #, c-format
 msgid "input_http: 3xx redirection: >%d %s<\n"
 msgstr "input_http: 3xx ridirezione: >%d %s<\n"
 
-#: src/input/input_http.c:830 src/input/input_http.c:836
-#: src/input/input_http.c:843
+#: src/input/input_http.c:831 src/input/input_http.c:836
+#: src/input/input_http.c:842 src/input/input_http.c:849
 #, c-format
 msgid "input_http: http status not 2xx: >%d %s<\n"
 msgstr "input_http: lo stato di http non è 2xx: >%d %s<\n"
 
-#: src/input/input_http.c:853
+#: src/input/input_http.c:859
 #, c-format
 msgid "input_http: content length = %<PRIdMAX> bytes\n"
 msgstr "input_httml: lunghezza del contenuto = %<PRIdMAX> byte\n"
 
-#: src/input/input_http.c:922
+#: src/input/input_http.c:932
 #, c-format
 msgid "input_http: buffer exhausted after %d bytes."
 msgstr "input_http: buffer esaurito dopo %d byte."
 
-#: src/input/input_http.c:996
+#: src/input/input_http.c:1010
 msgid "http input plugin"
 msgstr "plugin di ingresso http"
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "HTTP proxy host"
 msgstr "Server proxy HTTP"
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "The hostname of the HTTP proxy."
 msgstr "Nome del proxy HTTP"
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "HTTP proxy port"
 msgstr "Porta proxy HTTP"
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "The port number of the HTTP proxy."
 msgstr "Il numero di porta del proxy HTTP"
 
-#: src/input/input_http.c:1076
+#: src/input/input_http.c:1090
 msgid "HTTP proxy username"
 msgstr "Nome utente proxy HTTP"
 
-#: src/input/input_http.c:1077
+#: src/input/input_http.c:1091
 msgid "The user name for the HTTP proxy."
 msgstr "Il nome utente per il proxy HTTP"
 
-#: src/input/input_http.c:1080
+#: src/input/input_http.c:1094
 msgid "HTTP proxy password"
 msgstr "Password proxy HTTP"
 
-#: src/input/input_http.c:1081
+#: src/input/input_http.c:1095
 msgid "The password for the HTTP proxy."
 msgstr "La password per il proxy HTTP"
 
-#: src/input/input_http.c:1084
+#: src/input/input_http.c:1098
 msgid "Domains for which to ignore the HTTP proxy"
 msgstr "Domini per cui si vuole ignorare il proxy HTTP"
 
-#: src/input/input_http.c:1085
+#: src/input/input_http.c:1099
 msgid ""
 "A comma-separated list of domain names for which the proxy is to be "
 "ignored.\n"
@@ -2304,31 +2313,31 @@ msgstr "Buffer overrun..."
 msgid "Adjusting..."
 msgstr "Calibrando..."
 
-#: src/input/input_v4l.c:660
+#: src/input/input_v4l.c:658
 msgid "Tuner name not found\n"
 msgstr "Nome del sintonizzatore non trovato.\n"
 
-#: src/input/input_v4l.c:1876
+#: src/input/input_v4l.c:1874
 msgid "v4l tv input plugin"
 msgstr "plugin di ingresso TV V4L"
 
-#: src/input/input_v4l.c:1880
+#: src/input/input_v4l.c:1878
 msgid "v4l radio input plugin"
 msgstr "plugin di ingresso radio V4L"
 
-#: src/input/input_v4l.c:1912
+#: src/input/input_v4l.c:1910
 msgid "v4l video device"
 msgstr "dispositivo video v4l"
 
-#: src/input/input_v4l.c:1913
+#: src/input/input_v4l.c:1911
 msgid "The path to your Video4Linux video device."
 msgstr "Il percorso al proprio dispositivo video Video4Linux."
 
-#: src/input/input_v4l.c:1938
+#: src/input/input_v4l.c:1936
 msgid "v4l radio device"
 msgstr "dispositivo radio v4l"
 
-#: src/input/input_v4l.c:1939
+#: src/input/input_v4l.c:1937
 msgid "The path to your Video4Linux radio device."
 msgstr "Il percorso al proprio dispositivo radio Video4Linux,"
 
@@ -2493,53 +2502,53 @@ msgstr "errore nel leggere il numero di segmento corrente"
 msgid "Should have converted this above"
 msgstr "Il precedente sarebbe dovuto esser convertito"
 
-#: src/input/vcd/xineplug_inp_vcd.c:191
+#: src/input/vcd/xineplug_inp_vcd.c:192
 msgid "failed to find a device with a VCD"
 msgstr "impossibile trovare un dispositivo con un VCD"
 
-#: src/input/vcd/xineplug_inp_vcd.c:328
+#: src/input/vcd/xineplug_inp_vcd.c:329
 msgid "was passed a null class parameter"
 msgstr "è stato passato un parametro classe nullo."
 
-#: src/input/vcd/xineplug_inp_vcd.c:972
+#: src/input/vcd/xineplug_inp_vcd.c:982
 msgid "Invalid current entry type"
 msgstr "Tipo di inserimento attuale non valido."
 
-#: src/input/vcd/xineplug_inp_vcd.c:996
+#: src/input/vcd/xineplug_inp_vcd.c:1006
 msgid ""
 "Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
 msgstr ""
 "Plugin Video CD con PBC e supporto per: (X)VCD, (X)SVCD, HQVCD, CVD ..."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1097
+#: src/input/vcd/xineplug_inp_vcd.c:1107
 msgid "selection has no RETURN entry"
 msgstr "la selezione non ha un elemento RETURN"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1126
+#: src/input/vcd/xineplug_inp_vcd.c:1136
 msgid "DEFAULT selected, but PBC is not on."
 msgstr "selezionato DEFAULT, ma PBC non è abilitato."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1131
+#: src/input/vcd/xineplug_inp_vcd.c:1141
 msgid "selection has no NEXT entry"
 msgstr "la selezione non ha un elemento NEXT"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1139
+#: src/input/vcd/xineplug_inp_vcd.c:1149
 msgid "selection has no PREVIOUS entry"
 msgstr "la selezione non ha un elemento PREVIOUS"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1146
+#: src/input/vcd/xineplug_inp_vcd.c:1156
 msgid "Unknown event type: "
 msgstr "Tipo di evento sconosciuto: "
 
-#: src/input/vcd/xineplug_inp_vcd.c:1446 src/input/vcd/xineplug_inp_vcd.c:1493
+#: src/input/vcd/xineplug_inp_vcd.c:1452 src/input/vcd/xineplug_inp_vcd.c:1499
 msgid "The above message had unknown vcdimager log level"
 msgstr "Il messaggio precedente ha un livello di log di vcdimager sconosciuto."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1824
+#: src/input/vcd/xineplug_inp_vcd.c:1830
 msgid "VCD default type to use on autoplay"
 msgstr "Tipo predefinito di VCD da usare in riproduzione automatica."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1825
+#: src/input/vcd/xineplug_inp_vcd.c:1831
 msgid ""
 "The VCD play unit to use when none is specified in an MRL, e.g. vcd:// or "
 "vcd:///dev/dvd:"
@@ -2547,11 +2556,11 @@ msgstr ""
 "L'unità di riproduzione VCD da utilizzare quando non è specificata in un "
 "MRL, per esempio vcd:// o vcd://dev/dvd:"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1835
+#: src/input/vcd/xineplug_inp_vcd.c:1841
 msgid "CD-ROM drive used for VCD when none given"
 msgstr "Lettore CD-ROM utilizzato per i VCD quando non è specificato."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1836
+#: src/input/vcd/xineplug_inp_vcd.c:1842
 msgid ""
 "What to use if no drive specified. If the setting is empty, xine will scan "
 "for CD drives."
@@ -2559,30 +2568,30 @@ msgstr ""
 "Cosa usare se non è specificato nessun drive. Se l'impostazione è vuota xine "
 "scandirà per lettori CD. "
 
-#: src/input/vcd/xineplug_inp_vcd.c:1846
+#: src/input/vcd/xineplug_inp_vcd.c:1852
 msgid "VCD position slider range"
 msgstr "intervallo della slitta di posizione VCD"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1847
+#: src/input/vcd/xineplug_inp_vcd.c:1853
 msgid ""
 "range that the stream playback position slider represents playing a VCD."
 msgstr ""
 "intervallo che la slitta di posizione nel flusso riprodotto rappresenta "
 "quando si riproduce un VCD."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1855
+#: src/input/vcd/xineplug_inp_vcd.c:1861
 msgid "VCD read-ahead caching?"
 msgstr "VCD read-ahead caching?"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1856
+#: src/input/vcd/xineplug_inp_vcd.c:1862
 msgid "Class may lead to jerky playback on low-end machines."
 msgstr "La classe può portare a riproduzione a singhiozzo su macchine lente."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1866
+#: src/input/vcd/xineplug_inp_vcd.c:1872
 msgid "automatically advance VCD track/entry"
 msgstr "avanza automaticamente di traccia/elemento VCD"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1867
+#: src/input/vcd/xineplug_inp_vcd.c:1873
 msgid ""
 "If enabled, we should automatically advance to the next entry or track. Used "
 "only when playback control (PBC) is disabled."
@@ -2590,11 +2599,11 @@ msgstr ""
 "Se abilitato si passerà automaticamente al successivo elemento o traccia. "
 "Utilizzato solo quando il controllo di riproduzione (PBC) è disabilitato."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1876
+#: src/input/vcd/xineplug_inp_vcd.c:1882
 msgid "show 'rejected' VCD LIDs"
 msgstr "mostra LID \"rifiutati\" dei VCD"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1877
+#: src/input/vcd/xineplug_inp_vcd.c:1883
 msgid ""
 "Some playback list IDs (LIDs) are marked not showable, but you can see them "
 "in the MRL list if this is set. Rejected entries are marked with an asterisk "
@@ -2604,11 +2613,11 @@ msgstr ""
 "possono vedere nella lista MRL se questa opzione è abilitata. Gli elementi "
 "rifiutati sono segnati con un asterisco (*) alla fine del MRL."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1888
+#: src/input/vcd/xineplug_inp_vcd.c:1894
 msgid "VCD format string for display banner"
 msgstr "Stringa di formato VCD per il banner da visualizzare."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1889
+#: src/input/vcd/xineplug_inp_vcd.c:1895
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are:\n"
@@ -2647,11 +2656,11 @@ msgstr ""
 " %v : l'ID del volume (un numero tra 1 e il totale di volumi).\n"
 " %% :  un simbolo %\n"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1914
+#: src/input/vcd/xineplug_inp_vcd.c:1920
 msgid "VCD format string for stream comment field"
 msgstr "Stringa di formato utilizzata per il campo di commento del flusso"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1915
+#: src/input/vcd/xineplug_inp_vcd.c:1921
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
@@ -2664,11 +2673,11 @@ msgstr ""
 "T e %%.\n"
 "Si veda la descrizione di title_format per il loro significato."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1927
+#: src/input/vcd/xineplug_inp_vcd.c:1933
 msgid "VCD debug flag mask"
 msgstr "Flag di debug per VCD"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1928
+#: src/input/vcd/xineplug_inp_vcd.c:1934
 msgid ""
 "For tracking down bugs in the VCD plugin. Mask values are:\n"
 "   1: Meta information\n"
@@ -2698,70 +2707,6 @@ msgstr ""
 "1024: Still-frame\n"
 "2048: Debugging from VCDINFO\n"
 
-#: src/liba52/xine_a52_decoder.c:742 src/libxineadec/xine_dts_decoder.c:524
-msgid "HELP! a mono-only audio driver?!\n"
-msgstr "AIUTO! un driver audio solo mono?\n"
-
-#: src/liba52/xine_a52_decoder.c:805
-msgid "A/52 volume"
-msgstr "volume A/52"
-
-#: src/liba52/xine_a52_decoder.c:806
-msgid ""
-"With A/52 audio, you can modify the volume at the decoder level. This has "
-"the advantage of the audio being already decoded for the specified volume, "
-"so later operations like channel downmixing will work on an audio stream of "
-"the given volume."
-msgstr ""
-"Con l'audio A/52 si può modificare il volume a livello di decoder. Questo ha "
-"il vantaggio che l'audio è già decodificato al volume specificato quindi le "
-"successive operazioni come il mixaggio dei canali funzioneranno su uno "
-"stream al volume richiesto."
-
-#: src/liba52/xine_a52_decoder.c:814
-msgid "use A/52 dynamic range compression"
-msgstr "usa la compressione dinamica A/52"
-
-#: src/liba52/xine_a52_decoder.c:815
-msgid ""
-"Dynamic range compression limits the dynamic range of the audio. This means "
-"making the loud sounds softer, and the soft sounds louder, so you can more "
-"easily listen to the audio in a noisy environment without disturbing anyone."
-msgstr ""
-"La compressione dinamica limita l'intervallo dell'audio. Questo singifica "
-"che rende i suoni forti morbidi e i suoni morbidi forti, in modo che si "
-"possa ascoltare più facilmente l'audio in un ambiente rumoroso senza "
-"disturbare."
-
-#: src/liba52/xine_a52_decoder.c:822
-msgid "downmix audio to 2 channel surround stereo"
-msgstr "declassa l'audio a due canali stereo surround"
-
-#: src/liba52/xine_a52_decoder.c:823
-msgid ""
-"When you want to listen to multichannel surround sound, but you have only "
-"two speakers or a surround decoder or amplifier which does some sort of "
-"matrix surround decoding like prologic, you should enable this option so "
-"that the additional channels are mixed into the stereo signal."
-msgstr ""
-"Quando si vuole ascoltare un suono surround multicanale ma si hanno solo due "
-"speaker o un decodificatore o amplificatore surround che effettua una "
-"decodifica della matrice surround come prologic, si dovrebbe abilitare "
-"questa opzione in modo che i canali aggiuntivi sono mixati nel segnale "
-"stereo."
-
-#: src/libfaad/xine_faad_decoder.c:131
-msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
-msgstr "libfaad: libfaad NeAACDecOpen() fallita.\n"
-
-#: src/libfaad/xine_faad_decoder.c:140
-msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
-msgstr "libfaad: libfaad NeAACDecInit2 fallita.\n"
-
-#: src/libfaad/xine_faad_decoder.c:151
-msgid "libfaad: libfaad NeAACDecInit failed.\n"
-msgstr "libfaad: libfaad NeAACDecInit fallita.\n"
-
 #: src/libffmpeg/ff_audio_decoder.c:122
 #, c-format
 msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
@@ -2787,53 +2732,6 @@ msgstr "ffmpeg_audio_dec: impossibile aprire il decoder.\n"
 msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
 msgstr "dvaudio: aumentando il buffer a %d per evitare overflow.\n"
 
-#: src/libffmpeg/ff_video_decoder.c:155
-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
-msgstr "ffmpeg_video_dec: formato frame non supportato, DR1 disabilitato.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:173
-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
-msgstr ""
-"ffmpeg_video_dec: dimensioni del frame non supportate. DR1 disabilitato.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:333
-#, c-format
-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
-msgstr ""
-"ffmpeg_video_dec: impossibile trovare il decoder ffmpeg per il tipo di "
-"buffer 0x%X\n"
-
-#: src/libffmpeg/ff_video_decoder.c:362
-msgid "ffmpeg_video_dec: couldn't open decoder\n"
-msgstr "ffmpeg_video_dec: impossibile aprire il decoder\n"
-
-#: src/libffmpeg/ff_video_decoder.c:397
-msgid "ffmpeg_video_dec: direct rendering enabled\n"
-msgstr "ffmpeg_video_dec: visualizzazione diretta abilitata\n"
-
-#: src/libffmpeg/ff_video_decoder.c:816
-#, c-format
-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
-msgstr "ffmpeg_video_dec: buffer aumentato a %d per evitare overflow.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:1514
-msgid "MPEG-4 postprocessing quality"
-msgstr "qualità di post-elaborazione MPEG-4"
-
-#: src/libffmpeg/ff_video_decoder.c:1515
-msgid ""
-"You can adjust the amount of post processing applied to MPEG-4 video.\n"
-"Higher values result in better quality, but need more CPU. Lower values may "
-"result in image defects like block artifacts. For high quality content, too "
-"heavy post processing can actually make the image worse by blurring it too "
-"much."
-msgstr ""
-"Si può tarare la quantità di post elaborazione applicata ai video MPEG-4.\n"
-"Valori più alti risultano in qualità migliore ma richiedono più CPU. Valroi "
-"più bassi possono risultare in difetti dell'immagine come artefatti. Per unc "
-"otnenuto ad alta qualità, una post elaborazione troppo alta può in realtà "
-"rendere l'immagine peggiore sfocandola troppo."
-
 #: src/libffmpeg/ffmpeg_encoder.c:163
 msgid "libavcodec mpeg output bitrate (kbit/s)"
 msgstr "bitrate MPEG di uscita per libavcodec (kbit/s)"
@@ -2883,24 +2781,52 @@ msgstr ""
 "La compressione massima da applicare ad un'immagine utilizzando una modalità "
 "a qualità costante."
 
-#: src/libxineadec/xine_musepack_decoder.c:249
+#: src/libffmpeg/ff_video_decoder.c:155
+msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
+msgstr "ffmpeg_video_dec: formato frame non supportato, DR1 disabilitato.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:173
+msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+msgstr ""
+"ffmpeg_video_dec: dimensioni del frame non supportate. DR1 disabilitato.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:333
 #, c-format
-msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
-msgstr "libmusepack: mpc_streaminfo_read fallita: %d\n"
+msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+msgstr ""
+"ffmpeg_video_dec: impossibile trovare il decoder ffmpeg per il tipo di "
+"buffer 0x%X\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:323
-msgid "libmusepack: data after last frame ignored\n"
-msgstr "libmusepack: dati dopo l'ultimo frame ignorati.\n"
+#: src/libffmpeg/ff_video_decoder.c:362
+msgid "ffmpeg_video_dec: couldn't open decoder\n"
+msgstr "ffmpeg_video_dec: impossibile aprire il decoder\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:334
-msgid "libmusepack: mpc_decoder_initialise failed\n"
-msgstr "libmusepack: mpc_decoder_initialise fallita\n"
+#: src/libffmpeg/ff_video_decoder.c:397
+msgid "ffmpeg_video_dec: direct rendering enabled\n"
+msgstr "ffmpeg_video_dec: visualizzazione diretta abilitata\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:354
-#: src/libxineadec/xine_musepack_decoder.c:369
+#: src/libffmpeg/ff_video_decoder.c:816
 #, c-format
-msgid "libmusepack: mpc_decoder_decode failed: %d\n"
-msgstr "libmusepack: mpc_decoder_decode fallita: %d\n"
+msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+msgstr "ffmpeg_video_dec: buffer aumentato a %d per evitare overflow.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:1519
+msgid "MPEG-4 postprocessing quality"
+msgstr "qualità di post-elaborazione MPEG-4"
+
+#: src/libffmpeg/ff_video_decoder.c:1520
+msgid ""
+"You can adjust the amount of post processing applied to MPEG-4 video.\n"
+"Higher values result in better quality, but need more CPU. Lower values may "
+"result in image defects like block artifacts. For high quality content, too "
+"heavy post processing can actually make the image worse by blurring it too "
+"much."
+msgstr ""
+"Si può tarare la quantità di post elaborazione applicata ai video MPEG-4.\n"
+"Valori più alti risultano in qualità migliore ma richiedono più CPU. Valroi "
+"più bassi possono risultare in difetti dell'immagine come artefatti. Per unc "
+"otnenuto ad alta qualità, una post elaborazione troppo alta può in realtà "
+"rendere l'immagine peggiore sfocandola troppo."
 
 #: src/libreal/real_common.c:107
 msgid "path to RealPlayer codecs"
@@ -2921,12 +2847,6 @@ msgstr ""
 "decodificare contenuto RealPlayer. Si consulti la FAQ per maggiori "
 "informazioni su come installare i codec."
 
-#: src/libreal/xine_real_video_decoder.c:164
-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
-msgstr ""
-"libreal: Errore nella risoluzione dei simboli (incompatibilità di "
-"versione?)\n"
-
 #: src/libreal/xine_real_audio_decoder.c:130
 #, c-format
 msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
@@ -2948,6 +2868,12 @@ msgstr "libareal: setup del tipo di decoder fallito, codice di errore: 0x%x\n"
 msgid "libareal: oups, real can do more than 2 channels ?\n"
 msgstr "libareal: ops, real può usare più di 2 canali?\n"
 
+#: src/libreal/xine_real_video_decoder.c:164
+msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+msgstr ""
+"libreal: Errore nella risoluzione dei simboli (incompatibilità di "
+"versione?)\n"
+
 #: src/libspucc/xine_cc_decoder.c:192
 msgid "display closed captions in MPEG-2 streams"
 msgstr "visualizza sottotitoli CC (closed captions) negli stream MPEG-2"
@@ -3196,6 +3122,90 @@ msgstr "w32codec: errore inizializzando l'audio DirectShow\n"
 msgid "w32codec: Error initializing DMO Audio\n"
 msgstr "w32codec: errore inizializzando l'audio DMO\n"
 
+#: src/libxineadec/xine_a52_decoder.c:742
+#: src/libxineadec/xine_dts_decoder.c:524
+msgid "HELP! a mono-only audio driver?!\n"
+msgstr "AIUTO! un driver audio solo mono?\n"
+
+#: src/libxineadec/xine_a52_decoder.c:805
+msgid "A/52 volume"
+msgstr "volume A/52"
+
+#: src/libxineadec/xine_a52_decoder.c:806
+msgid ""
+"With A/52 audio, you can modify the volume at the decoder level. This has "
+"the advantage of the audio being already decoded for the specified volume, "
+"so later operations like channel downmixing will work on an audio stream of "
+"the given volume."
+msgstr ""
+"Con l'audio A/52 si può modificare il volume a livello di decoder. Questo ha "
+"il vantaggio che l'audio è già decodificato al volume specificato quindi le "
+"successive operazioni come il mixaggio dei canali funzioneranno su uno "
+"stream al volume richiesto."
+
+#: src/libxineadec/xine_a52_decoder.c:814
+msgid "use A/52 dynamic range compression"
+msgstr "usa la compressione dinamica A/52"
+
+#: src/libxineadec/xine_a52_decoder.c:815
+msgid ""
+"Dynamic range compression limits the dynamic range of the audio. This means "
+"making the loud sounds softer, and the soft sounds louder, so you can more "
+"easily listen to the audio in a noisy environment without disturbing anyone."
+msgstr ""
+"La compressione dinamica limita l'intervallo dell'audio. Questo singifica "
+"che rende i suoni forti morbidi e i suoni morbidi forti, in modo che si "
+"possa ascoltare più facilmente l'audio in un ambiente rumoroso senza "
+"disturbare."
+
+#: src/libxineadec/xine_a52_decoder.c:822
+msgid "downmix audio to 2 channel surround stereo"
+msgstr "declassa l'audio a due canali stereo surround"
+
+#: src/libxineadec/xine_a52_decoder.c:823
+msgid ""
+"When you want to listen to multichannel surround sound, but you have only "
+"two speakers or a surround decoder or amplifier which does some sort of "
+"matrix surround decoding like prologic, you should enable this option so "
+"that the additional channels are mixed into the stereo signal."
+msgstr ""
+"Quando si vuole ascoltare un suono surround multicanale ma si hanno solo due "
+"speaker o un decodificatore o amplificatore surround che effettua una "
+"decodifica della matrice surround come prologic, si dovrebbe abilitare "
+"questa opzione in modo che i canali aggiuntivi sono mixati nel segnale "
+"stereo."
+
+#: src/libxineadec/xine_faad_decoder.c:130
+msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
+msgstr "libfaad: libfaad NeAACDecOpen() fallita.\n"
+
+#: src/libxineadec/xine_faad_decoder.c:139
+msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
+msgstr "libfaad: libfaad NeAACDecInit2 fallita.\n"
+
+#: src/libxineadec/xine_faad_decoder.c:150
+msgid "libfaad: libfaad NeAACDecInit failed.\n"
+msgstr "libfaad: libfaad NeAACDecInit fallita.\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:249
+#, c-format
+msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+msgstr "libmusepack: mpc_streaminfo_read fallita: %d\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:323
+msgid "libmusepack: data after last frame ignored\n"
+msgstr "libmusepack: dati dopo l'ultimo frame ignorati.\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:334
+msgid "libmusepack: mpc_decoder_initialise failed\n"
+msgstr "libmusepack: mpc_decoder_initialise fallita\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:354
+#: src/libxineadec/xine_musepack_decoder.c:369
+#, c-format
+msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgstr "libmusepack: mpc_decoder_decode fallita: %d\n"
+
 #: src/libxinevdec/bitplane.c:1272
 #, c-format
 msgid "bitplane: error doing ByteRun1 decompression\n"
@@ -3467,33 +3477,6 @@ msgstr ""
 "\n"
 "* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
 
-#: src/post/planar/eq.c:186
-msgid ""
-"Software equalizer with interactive controls just like the hardware "
-"equalizer, for cards/drivers that do not support brightness and contrast "
-"controls in hardware.\n"
-"\n"
-"Parameters\n"
-"  brightness\n"
-"  contrast\n"
-"\n"
-"Note: It is possible to use frontend's control window to set these "
-"parameters.\n"
-"\n"
-"* mplayer's eq (C) Richard Felker\n"
-msgstr ""
-"Equalizzatore software con controlli interattivi come l'equalizzatore "
-"hardware, per driver e schede che non supportano i controlli di luminosità e "
-"contrasto in hardware.\n"
-"\n"
-"Parametri:   luminosità\n"
-"  contrasto\n"
-"\n"
-"Nota: è possibile utilizzare la finestra di controllo del frontend per "
-"impostare questi parametri\n"
-"\n"
-"* mplayer's eq (C) Richard Felker\n"
-
 #: src/post/planar/eq2.c:359
 msgid ""
 "Alternative software equalizer that uses lookup tables (very slow), allowing "
@@ -3538,6 +3521,33 @@ msgstr ""
 "\n"
 "* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
 
+#: src/post/planar/eq.c:186
+msgid ""
+"Software equalizer with interactive controls just like the hardware "
+"equalizer, for cards/drivers that do not support brightness and contrast "
+"controls in hardware.\n"
+"\n"
+"Parameters\n"
+"  brightness\n"
+"  contrast\n"
+"\n"
+"Note: It is possible to use frontend's control window to set these "
+"parameters.\n"
+"\n"
+"* mplayer's eq (C) Richard Felker\n"
+msgstr ""
+"Equalizzatore software con controlli interattivi come l'equalizzatore "
+"hardware, per driver e schede che non supportano i controlli di luminosità e "
+"contrasto in hardware.\n"
+"\n"
+"Parametri:   luminosità\n"
+"  contrasto\n"
+"\n"
+"Nota: è possibile utilizzare la finestra di controllo del frontend per "
+"impostare questi parametri\n"
+"\n"
+"* mplayer's eq (C) Richard Felker\n"
+
 #: src/post/planar/expand.c:251
 #, fuzzy
 msgid ""
@@ -3670,6 +3680,65 @@ msgstr ""
 "\n"
 "* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
 
+#: src/vdr/input_vdr.c:183 src/vdr/input_vdr.c:223 src/vdr/input_vdr.c:2297
+#: src/vdr/input_vdr.c:2394
+#, fuzzy, c-format
+msgid ": input event write: %s.\n"
+msgstr "input_rip: posizionamento fallito: %s.\n"
+
+#: src/vdr/input_vdr.c:713 src/vdr/input_vdr.c:1137
+msgid ": buffer_pool_alloc() failed!\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:782
+#, c-format
+msgid ": flush buffers (vb: %d, ab: %d, vf: %d, af: %d) %s.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1475
+#, c-format
+msgid ": shutting down rpc thread (timeout: %d ms) ...\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1499
+#, fuzzy, c-format
+msgid ": cancelling rpc thread in function %d...\n"
+msgstr ": impossibile creare la condizione pthread: %s\n"
+
+#: src/vdr/input_vdr.c:1506
+#, fuzzy
+msgid ": joining rpc thread ...\n"
+msgstr "RTP: interruzione di lettura di thread...\n"
+
+#: src/vdr/input_vdr.c:1508
+#, fuzzy
+msgid ": rpc thread joined.\n"
+msgstr "RTP: lettura thread terminata\n"
+
+#: src/vdr/input_vdr.c:2137 src/vdr/input_vdr.c:2151 src/vdr/input_vdr.c:2169
+#: src/vdr/input_vdr.c:2190 src/vdr/input_vdr.c:2211
+#, fuzzy, c-format
+msgid ": failed to open '%s' (%s)\n"
+msgstr "stdin: apertura non riuscita '%s'\n"
+
+#: src/vdr/input_vdr.c:2153
+msgid "timeout expired during setup phase"
+msgstr ""
+
+#: src/vdr/input_vdr.c:2227
+#, fuzzy, c-format
+msgid ": can't create new thread (%s)\n"
+msgstr "input_rtp: impossibile creare nuova thread (%s)\n"
+
+#: src/vdr/input_vdr.c:2487
+msgid "VDR display device plugin"
+msgstr ""
+
+#: src/vdr/post_vdr_video.c:435
+#, c-format
+msgid ": osd: (%d, %d)-(%d, %d)@%lg\n"
+msgstr ""
+
 #: src/video_out/video_out_aa.c:311
 msgid "xine video output plugin using the ascii-art library"
 msgstr "plugin di uscita video per xine usante la libreria art ascii"
@@ -3985,8 +4054,8 @@ msgstr ""
 "Ignorato per le routine statiche.\n"
 
 #: src/video_out/video_out_opengl.c:1918 src/video_out/video_out_vidix.c:1015
-#: src/video_out/video_out_xcbxv.c:1476 src/video_out/video_out_xv.c:1489
-#: src/video_out/video_out_xvmc.c:1461 src/video_out/video_out_xxmc.c:2465
+#: src/video_out/video_out_xcbxv.c:1304 src/video_out/video_out_xv.c:1359
+#: src/video_out/video_out_xvmc.c:1423 src/video_out/video_out_xxmc.c:2531
 msgid "enable double buffering"
 msgstr "abilita doppio buffering"
 
@@ -4078,9 +4147,9 @@ msgstr ""
 msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
 msgstr "video_out_pgx64: Errore: ioctl fallita (FBIOGATTR)\n"
 
-#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1443
-#: src/video_out/video_out_xv.c:1456 src/video_out/video_out_xvmc.c:1446
-#: src/video_out/video_out_xxmc.c:2432
+#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1271
+#: src/video_out/video_out_xv.c:1326 src/video_out/video_out_xvmc.c:1408
+#: src/video_out/video_out_xxmc.c:2498
 msgid "video overlay colour key"
 msgstr "chiave cromatica per l'overlay video"
 
@@ -4259,9 +4328,9 @@ msgstr "intensità del colore blu"
 msgid "The intensity of the blue colour components."
 msgstr "L'intensità dei componenti di colore blu."
 
-#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1477
-#: src/video_out/video_out_xv.c:1490 src/video_out/video_out_xvmc.c:1462
-#: src/video_out/video_out_xxmc.c:2466
+#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1305
+#: src/video_out/video_out_xv.c:1360 src/video_out/video_out_xvmc.c:1424
+#: src/video_out/video_out_xxmc.c:2532
 msgid ""
 "Double buffering will synchronize the update of the video image to the "
 "repainting of the entire screen (\"vertical retrace\"). This eliminates "
@@ -4297,9 +4366,9 @@ msgid "video overlay colour key red component"
 msgstr "componente rossa della chiave cromatica di sovraimpressione"
 
 #: src/video_out/video_out_vidix.c:1159 src/video_out/video_out_vidix.c:1166
-#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1444
-#: src/video_out/video_out_xv.c:1457 src/video_out/video_out_xvmc.c:1447
-#: src/video_out/video_out_xxmc.c:2433
+#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1272
+#: src/video_out/video_out_xv.c:1327 src/video_out/video_out_xvmc.c:1409
+#: src/video_out/video_out_xxmc.c:2499
 msgid ""
 "The colour key is used to tell the graphics card where to overlay the video "
 "image. Try different values, if you experience windows becoming transparent."
@@ -4331,13 +4400,13 @@ msgid "%s: %s: allocating image\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbshm.c:159 src/video_out/video_out_xcbshm.c:169
-#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:272
-#: src/video_out/video_out_xcbxv.c:282 src/video_out/video_out_xcbxv.c:292
-#: src/video_out/video_out_xcbxv.c:304 src/video_out/video_out_xshm.c:204
+#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:267
+#: src/video_out/video_out_xcbxv.c:277 src/video_out/video_out_xcbxv.c:287
+#: src/video_out/video_out_xcbxv.c:299 src/video_out/video_out_xshm.c:204
 #: src/video_out/video_out_xshm.c:221 src/video_out/video_out_xshm.c:232
-#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:296
-#: src/video_out/video_out_xv.c:307 src/video_out/video_out_xv.c:316
-#: src/video_out/video_out_xv.c:352 src/video_out/video_out_xxmc.c:648
+#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:295
+#: src/video_out/video_out_xv.c:322 src/video_out/video_out_xv.c:331
+#: src/video_out/video_out_xv.c:367 src/video_out/video_out_xxmc.c:648
 #: src/video_out/video_out_xxmc.c:659 src/video_out/video_out_xxmc.c:668
 #: src/video_out/video_out_xxmc.c:704
 #, fuzzy, c-format
@@ -4353,8 +4422,8 @@ msgstr ""
 "riservando l'immagine \n"
 "video_out_xshm: => l'estensione MIT Shared Memory non sarà utilizzata.\n"
 
-#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:302
-#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:350
+#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:297
+#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:365
 #: src/video_out/video_out_xxmc.c:702
 #, c-format
 msgid "%s: x11 error during shared memory XImage creation\n"
@@ -4391,31 +4460,31 @@ msgid "xine video output plugin using the MIT X shared memory extension"
 msgstr ""
 "plugin di output video per xine utilizzante l'estensione MIT X Shared Memory"
 
-#: src/video_out/video_out_xcbxv.c:270 src/video_out/video_out_xv.c:305
+#: src/video_out/video_out_xcbxv.c:265 src/video_out/video_out_xv.c:320
 #: src/video_out/video_out_xxmc.c:657
 #, c-format
 msgid "%s: XvShmCreateImage returned a zero size\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:280 src/video_out/video_out_xv.c:314
+#: src/video_out/video_out_xcbxv.c:275 src/video_out/video_out_xv.c:329
 #: src/video_out/video_out_xxmc.c:666
 #, c-format
 msgid "%s: shared memory error in shmget: %s\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:290
+#: src/video_out/video_out_xcbxv.c:285
 #, c-format
 msgid "%s: shared memory error (address error)\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1294 src/video_out/video_out_xv.c:1301
-#: src/video_out/video_out_xxmc.c:2283
+#: src/video_out/video_out_xcbxv.c:1125 src/video_out/video_out_xv.c:1174
+#: src/video_out/video_out_xxmc.c:2349
 #, fuzzy, c-format
 msgid "%s: Xv extension not present.\n"
 msgstr "video_out_xv: estensione Xv non presente.\n"
 
-#: src/video_out/video_out_xcbxv.c:1336 src/video_out/video_out_xv.c:1338
-#: src/video_out/video_out_xxmc.c:2320
+#: src/video_out/video_out_xcbxv.c:1167 src/video_out/video_out_xv.c:1211
+#: src/video_out/video_out_xxmc.c:2386
 #, fuzzy, c-format
 msgid ""
 "%s: Xv extension is present but I couldn't find a usable yuv12 port.\n"
@@ -4425,7 +4494,7 @@ msgstr ""
 "porta yuv12 utilizzabile.               sembrerebbe che l'hardware grafico "
 "non supporti Xv.\n"
 
-#: src/video_out/video_out_xcbxv.c:1345
+#: src/video_out/video_out_xcbxv.c:1176
 #, fuzzy, c-format
 msgid ""
 "%s: using Xv port %d from adaptor %s for hardware colorspace conversion and "
@@ -4434,23 +4503,23 @@ msgstr ""
 "video_out_xv: utilizzando la porta Xv %ld dal dispositivo %s per la "
 "conversione di colori e il ridimensionamento hardware.\n"
 
-#: src/video_out/video_out_xcbxv.c:1452 src/video_out/video_out_xv.c:1465
-#: src/video_out/video_out_xvmc.c:1455 src/video_out/video_out_xxmc.c:2441
+#: src/video_out/video_out_xcbxv.c:1280 src/video_out/video_out_xv.c:1335
+#: src/video_out/video_out_xvmc.c:1417 src/video_out/video_out_xxmc.c:2507
 msgid "autopaint colour key"
 msgstr "colora automaticamente la chive cromatica"
 
-#: src/video_out/video_out_xcbxv.c:1453 src/video_out/video_out_xv.c:1466
-#: src/video_out/video_out_xvmc.c:1456 src/video_out/video_out_xxmc.c:2442
+#: src/video_out/video_out_xcbxv.c:1281 src/video_out/video_out_xv.c:1336
+#: src/video_out/video_out_xvmc.c:1418 src/video_out/video_out_xxmc.c:2508
 msgid "Make Xv autopaint its colorkey."
 msgstr "Fa sì che Xv colori automaticamente la propria chiave cromatica."
 
-#: src/video_out/video_out_xcbxv.c:1460 src/video_out/video_out_xv.c:1473
-#: src/video_out/video_out_xxmc.c:2449
+#: src/video_out/video_out_xcbxv.c:1288 src/video_out/video_out_xv.c:1343
+#: src/video_out/video_out_xxmc.c:2515
 msgid "bilinear scaling mode"
 msgstr "modalità di ridimensionamento bilineare"
 
-#: src/video_out/video_out_xcbxv.c:1461 src/video_out/video_out_xv.c:1474
-#: src/video_out/video_out_xxmc.c:2450
+#: src/video_out/video_out_xcbxv.c:1289 src/video_out/video_out_xv.c:1344
+#: src/video_out/video_out_xxmc.c:2516
 msgid ""
 "Selects the bilinear scaling mode for Permedia cards. The individual values "
 "are:\n"
@@ -4476,111 +4545,32 @@ msgstr ""
 "1 - abilita il filtro lineare orizzontale\n"
 "2 - abilita il filtro bilineare completo"
 
-#: src/video_out/video_out_xcbxv.c:1513 src/video_out/video_out_xv.c:1523
-#: src/video_out/video_out_xxmc.c:2506
+#: src/video_out/video_out_xcbxv.c:1341 src/video_out/video_out_xv.c:1393
+#: src/video_out/video_out_xxmc.c:2572
 #, fuzzy, c-format
 msgid "%s: this adaptor supports the yv12 format.\n"
 msgstr "video_out_xv: questo dispositivo supporta il formato yv12\n"
 
-#: src/video_out/video_out_xcbxv.c:1518 src/video_out/video_out_xv.c:1528
-#: src/video_out/video_out_xxmc.c:2511
+#: src/video_out/video_out_xcbxv.c:1346 src/video_out/video_out_xv.c:1398
+#: src/video_out/video_out_xxmc.c:2577
 #, fuzzy, c-format
 msgid "%s: this adaptor supports the yuy2 format.\n"
 msgstr "video_out_xv: questo dispositivo supporta il formato yuv2.\n"
 
-#: src/video_out/video_out_xcbxv.c:1526 src/video_out/video_out_xv.c:1550
-#: src/video_out/video_out_xxmc.c:2534
+#: src/video_out/video_out_xcbxv.c:1354 src/video_out/video_out_xv.c:1420
+#: src/video_out/video_out_xxmc.c:2600
 msgid "pitch alignment workaround"
 msgstr "pitch alignment workaround"
 
-#: src/video_out/video_out_xcbxv.c:1527 src/video_out/video_out_xv.c:1551
-#: src/video_out/video_out_xxmc.c:2535
+#: src/video_out/video_out_xcbxv.c:1355 src/video_out/video_out_xv.c:1421
+#: src/video_out/video_out_xxmc.c:2601
 msgid "Some buggy video drivers need a workaround to function properly."
 msgstr ""
 "Alcuni driver video difettosi richiedono un workaround per funzionare "
 "correttamente."
 
-#: src/video_out/video_out_xcbxv.c:1533 src/video_out/video_out_xv.c:1557
-#: src/video_out/video_out_xvmc.c:1524
-msgid "deinterlace method (deprecated)"
-msgstr "metodo di deinterlacciamento (deprecato)"
-
-#: src/video_out/video_out_xcbxv.c:1534 src/video_out/video_out_xv.c:1558
-#: src/video_out/video_out_xvmc.c:1525
-msgid ""
-"This config setting is deprecated. You should use the new deinterlacing post "
-"processing settings instead.\n"
-"\n"
-"From the old days of analog television, where the even and odd numbered "
-"lines of a video frame would be displayed at different times comes the idea "
-"to increase motion smoothness by also recording the lines at different "
-"times. This is called \"interlacing\". But unfortunately, todays displays "
-"show the even and odd numbered lines as one complete frame all at the same "
-"time (called \"progressive display\"), which results in ugly frame errors "
-"known as comb artifacts. Software deinterlacing is an approach to reduce "
-"these artifacts. The individual values are:\n"
-"\n"
-"none\n"
-"Disables software deinterlacing.\n"
-"\n"
-"bob\n"
-"Interpolates between the lines for moving parts of the image.\n"
-"\n"
-"weave\n"
-"Similar to bob, but with a tendency to preserve the full resolution, better "
-"for high detail in low movement scenes.\n"
-"\n"
-"greedy\n"
-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
-"\n"
-"onefield\n"
-"Always interpolates and reduces vertical resolution.\n"
-"\n"
-"onefieldxv\n"
-"Same as onefield, but does the interpolation in hardware.\n"
-"\n"
-"linearblend\n"
-"Applies a slight vertical blur to remove the comb artifacts. Good results "
-"with medium CPU usage."
-msgstr ""
-"Questa impostazione è deprecata, si dovrebbe utilizzare la nuova "
-"impostazione per il deinterlacciamento in post elaborazione invece. \n"
-"\n"
-"Dai vecchi giorni della TV analogica, dove le linee pari e dispari del frame "
-"erano visualizzate in momenti diversi proviene l'idea di migliorare la "
-"scioltezza dei movimenti anche registrando le linee in momenti diversi, e "
-"praticando il cosiddetto \"interlacciamento\". Sfortunatamente i video "
-"moderni visualizzano le linee pari e dispari come un solo frame (display "
-"progrssivo), portando alla visualizzazione di brutti errori conosciuti come "
-"artefatti di comb. Il deinterlacciamento software è un approccio alla "
-"riduzione di tali artefatti. I singoli valori sono:\n"
-"\n"
-"none\n"
-"Disabilita il deinterlacciamento software.\n"
-"\n"
-"bob\n"
-"Interpola le linee tra le parti in movimenti dell'immagine.\n"
-"\n"
-"weave\n"
-"Simile a bob, ma con la tendenza di preservare la risoluzione completa, "
-"migliore per un maggior dettaglio su scene dal movimento lento.\n"
-"\n"
-"greedy\n"
-"Deinterlacciatore adattante molto buono, ma che richiede molta potenza di "
-"CPU.\n"
-"\n"
-"onefield\n"
-"Interopola e riduce sempre la risoluzione verticale.\n"
-"\n"
-"onefieldxv\n"
-"Come onefield, ma effettua l'interpolazione in hardware.\n"
-"\n"
-"linearblend\n"
-"Applica un leggero sfocamento verticale per rimuovere gli artefatti di comb. "
-"Buoni risultati con un uso di CPU medio."
-
-#: src/video_out/video_out_xcbxv.c:1588 src/video_out/video_out_xv.c:1631
-#: src/video_out/video_out_xxmc.c:2615
+#: src/video_out/video_out_xcbxv.c:1383 src/video_out/video_out_xv.c:1468
+#: src/video_out/video_out_xxmc.c:2681
 msgid "xine video output plugin using the MIT X video extension"
 msgstr "plugin di output video di xine che usa l'estensione video MIT X"
 
@@ -4589,12 +4579,12 @@ msgstr "plugin di output video di xine che usa l'estensione video MIT X"
 msgid "%s: shared memory error when allocating image\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:294 src/video_out/video_out_xxmc.c:646
+#: src/video_out/video_out_xv.c:293 src/video_out/video_out_xxmc.c:646
 #, c-format
 msgid "%s: XvShmCreateImage failed\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1348 src/video_out/video_out_xxmc.c:2330
+#: src/video_out/video_out_xv.c:1221 src/video_out/video_out_xxmc.c:2396
 #, fuzzy, c-format
 msgid ""
 "%s: using Xv port %ld from adaptor %s for hardware colorspace conversion and "
@@ -4603,15 +4593,15 @@ msgstr ""
 "video_out_xv: utilizzando la porta Xv %ld dal dispositivo %s per la "
 "conversione di colori e il ridimensionamento hardware.\n"
 
-#: src/video_out/video_out_xvmc.c:1593
+#: src/video_out/video_out_xvmc.c:1496
 msgid "xine video output plugin using the XvMC X video extension"
 msgstr "plugin di output video per xine utilizzante l'estensione X video XvMC"
 
-#: src/video_out/video_out_xvmc.c:1639
+#: src/video_out/video_out_xvmc.c:1542
 msgid "video_out_xvmc: XvMC extension not present.\n"
 msgstr "video_out_xvmc: estensione XvMC non presente.\n"
 
-#: src/video_out/video_out_xvmc.c:1737
+#: src/video_out/video_out_xvmc.c:1640
 msgid ""
 "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
 "port.\n"
@@ -4619,7 +4609,7 @@ msgstr ""
 "video_out_xvmc: estensione XV presente ma non è stato possibile trovare una "
 "porta yuv12 utilizzabile.\n"
 
-#: src/video_out/video_out_xvmc.c:1746
+#: src/video_out/video_out_xvmc.c:1649
 #, c-format
 msgid ""
 "video_out_xvmc: using Xv port %ld from adaptor %s\n"
@@ -4628,28 +4618,28 @@ msgstr ""
 "video_out_xxmc: utilizzando la porta Xv %ld dal dispositivo %s\n"
 "              per la conversione di colori e il ridimensionamento hardware.\n"
 
-#: src/video_out/video_out_xvmc.c:1751
+#: src/video_out/video_out_xvmc.c:1654
 msgid "                idct and motion compensation acceleration \n"
 msgstr "                accelerazione idct e compensazione del movimento \n"
 
-#: src/video_out/video_out_xvmc.c:1753
+#: src/video_out/video_out_xvmc.c:1656
 msgid "                motion compensation acceleration only\n"
 msgstr "                solo accelerazione della compensazione di movimento\n"
 
-#: src/video_out/video_out_xvmc.c:1755
+#: src/video_out/video_out_xvmc.c:1658
 msgid "                no XvMC support \n"
 msgstr "                nessun supporto XvMC \n"
 
-#: src/video_out/video_out_xvmc.c:1756
+#: src/video_out/video_out_xvmc.c:1659
 #, c-format
 msgid "                With Overlay = %d; UnsignedIntra = %d.\n"
 msgstr "                Con overlay = %d; UnsignedIntra = %d.\n"
 
-#: src/video_out/video_out_xxmc.c:2540
+#: src/video_out/video_out_xxmc.c:2606
 msgid "Make XvMC allocate more frames for better buffering."
 msgstr "Fa sì che XvMC riservi più frame per un miglior buffer."
 
-#: src/video_out/video_out_xxmc.c:2541
+#: src/video_out/video_out_xxmc.c:2607
 msgid ""
 "Some XvMC implementations allow more than 8 frames.\n"
 "This option, when turned on, makes the driver try to\n"
@@ -4659,11 +4649,11 @@ msgstr ""
 "Questa opzione, quando abilitata, fa sì che il drive tenti\n"
 "di riservare 15 frame. Necessario per unichrom e VDR istantanei.\n"
 
-#: src/video_out/video_out_xxmc.c:2547
+#: src/video_out/video_out_xxmc.c:2613
 msgid "Unichrome cpu save"
 msgstr "Risparmio CPU Unichrome"
 
-#: src/video_out/video_out_xxmc.c:2548
+#: src/video_out/video_out_xxmc.c:2614
 msgid ""
 "Saves CPU time by sleeping while decoder works.\n"
 "Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n"
@@ -4673,11 +4663,11 @@ msgstr ""
 "Solo per kernel Linux 2.6 o 2.4 con patch multimediale.\n"
 "Sperimentale.\n"
 
-#: src/video_out/video_out_xxmc.c:2554
+#: src/video_out/video_out_xxmc.c:2620
 msgid "Fix buggy NVIDIA XvMC subpicture colors"
 msgstr "Correggi i colori dei sottotitoli difettosi su NVIDIA XvMC"
 
-#: src/video_out/video_out_xxmc.c:2555
+#: src/video_out/video_out_xxmc.c:2621
 msgid ""
 "There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
 "look blue and vice versa. This option provides a workaround.\n"
@@ -4685,11 +4675,11 @@ msgstr ""
 "C'è un errore nella libreria XvMC NVIDIA che rende i colori rossi dell'OSD "
 "blu e viceversa. Questa opzione fornisce un workaround.\n"
 
-#: src/video_out/video_out_xxmc.c:2560
+#: src/video_out/video_out_xxmc.c:2626
 msgid "Use bob as accelerated deinterlace method."
 msgstr "Utilizza bob come metodo di deinterlacciamento accelerato."
 
-#: src/video_out/video_out_xxmc.c:2561
+#: src/video_out/video_out_xxmc.c:2627
 msgid ""
 "When interlacing is enabled for hardware accelerated frames,\n"
 "Alternate between top and bottom field at double the frame rate.\n"
@@ -4720,11 +4710,11 @@ msgstr ""
 msgid "x11osd: unscaled overlay created (%s mode).\n"
 msgstr "x11osd: overlay non ridimensionato creato (modalità %s).\n"
 
-#: src/xine-engine/alphablend.c:2123
+#: src/xine-engine/alphablend.c:2146
 msgid "disable exact alpha blending of overlays"
 msgstr "disabilita la trasparenza esatta per gli overlay"
 
-#: src/xine-engine/alphablend.c:2124
+#: src/xine-engine/alphablend.c:2147
 msgid ""
 "If you experience a performance impact when an On Screen Display or other "
 "overlays like DVD subtitles are active, then you might want to enable this "
@@ -5149,10 +5139,10 @@ msgstr ""
 msgid "load_plugins: plugin %s found\n"
 msgstr "load_plugins: trovato plugin %s\n"
 
-#: src/xine-engine/load_plugins.c:502
-#, fuzzy, c-format
+#: src/xine-engine/load_plugins.c:499
+#, c-format
 msgid "load_plugins: static plugin found\n"
-msgstr "load_plugins: trovato plugin statico %s\n"
+msgstr "load_plugins: trovato plugin statico\n"
 
 #: src/xine-engine/load_plugins.c:509
 #, c-format
@@ -5357,21 +5347,21 @@ msgstr ""
 "sottotitolo ceh non specificano nessuna colorazione. Le palette sono "
 "elencate nella forma: primo piano - bordo - sfondo."
 
-#: src/xine-engine/video_decoder.c:380
+#: src/xine-engine/video_decoder.c:390
 #, c-format
 msgid "video_decoder: no plugin available to handle '%s'\n"
 msgstr "video_decoder: nessun plugin disponibile per gestire '%s'\n"
 
-#: src/xine-engine/video_decoder.c:459
+#: src/xine-engine/video_decoder.c:469
 #, c-format
 msgid "video_decoder: error, unknown buffer type: %08x\n"
 msgstr "video_decoder: errore, tipo di buffer sconosciuto: %08x\n"
 
-#: src/xine-engine/video_decoder.c:495
+#: src/xine-engine/video_decoder.c:505
 msgid "number of video buffers"
 msgstr "numero di buffer video"
 
-#: src/xine-engine/video_decoder.c:496
+#: src/xine-engine/video_decoder.c:506
 msgid ""
 "The number of video buffers (each is 8k in size) xine uses in its internal "
 "queue. Higher values mean smoother playback for unreliable inputs, but also "
@@ -5381,12 +5371,12 @@ msgstr ""
 "interna. Valori alti significano una riproduzione più liscia per ingressi "
 "inaffidabili, ma aumenta la latenza e il consumo di memoria."
 
-#: src/xine-engine/video_out.c:642
+#: src/xine-engine/video_out.c:671
 #, c-format
 msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
 msgstr "%d frame consegnati, %d frame saltati, %d frame scartati\n"
 
-#: src/xine-engine/video_out.c:815
+#: src/xine-engine/video_out.c:844
 #, c-format
 msgid ""
 "video_out: throwing away image with pts %<PRId64> because it's too old "
@@ -5395,22 +5385,22 @@ msgstr ""
 "video_out: immagine con %<PRId64> pts scartata perché troppo vecchia (diff : "
 "%<PRId64>).\n"
 
-#: src/xine-engine/video_out.c:1794
+#: src/xine-engine/video_out.c:1863
 #, fuzzy
 msgid "default number of video frames"
 msgstr "numero predefinito di ripetizioni dei frame"
 
-#: src/xine-engine/video_out.c:1795
+#: src/xine-engine/video_out.c:1864
 msgid ""
 "The default number of video frames to request from xine video out driver. "
 "Some drivers will override this setting with their own values."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1834
+#: src/xine-engine/video_out.c:1921
 msgid "percentage of skipped frames to tolerate"
 msgstr "percentuale di frame saltati da tollerare."
 
-#: src/xine-engine/video_out.c:1835
+#: src/xine-engine/video_out.c:1922
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not decoded in time, xine sends a notification."
@@ -5418,11 +5408,11 @@ msgstr ""
 "Quando non è mostrata una percentuale di frame superiore a questa, perché "
 "non decodificati in tempo, xine invia una notifica."
 
-#: src/xine-engine/video_out.c:1840
+#: src/xine-engine/video_out.c:1927
 msgid "percentage of discarded frames to tolerate"
 msgstr "percentuale di frame scartati da tollerare."
 
-#: src/xine-engine/video_out.c:1841
+#: src/xine-engine/video_out.c:1928
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not scheduled for display in time, xine sends a notification."
@@ -5430,7 +5420,7 @@ msgstr ""
 "Quando non è mostrata una percentuale di frame superiore a questa, perché "
 "non disposti alla visualizzazione in tempo, xine invia una notifica."
 
-#: src/xine-engine/video_out.c:1875
+#: src/xine-engine/video_out.c:1965
 msgid "video_out: sorry, this should not happen. please restart xine.\n"
 msgstr ""
 "video_out: spiacente, non sarebbe dovuto succedere. Per favore riavvia "
@@ -5492,131 +5482,131 @@ msgstr ""
 "driver di uscita video come XShm, dove il ridimensionamento non è accelerato "
 "in hardware, questo può ridurre drasticamente l'uso di CPU."
 
-#: src/xine-engine/xine.c:706 src/xine-engine/xine.c:813
-#: src/xine-engine/xine.c:852 src/xine-engine/xine.c:888
-#: src/xine-engine/xine.c:900 src/xine-engine/xine.c:913
-#: src/xine-engine/xine.c:926 src/xine-engine/xine.c:939
-#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:990
-#: src/xine-engine/xine.c:1025
+#: src/xine-engine/xine.c:771 src/xine-engine/xine.c:878
+#: src/xine-engine/xine.c:917 src/xine-engine/xine.c:953
+#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:978
+#: src/xine-engine/xine.c:991 src/xine-engine/xine.c:1004
+#: src/xine-engine/xine.c:1030 src/xine-engine/xine.c:1055
+#: src/xine-engine/xine.c:1090
 msgid "xine: error while parsing mrl\n"
 msgstr "xine: errore durante l'interpretazione del MRL\n"
 
-#: src/xine-engine/xine.c:742
+#: src/xine-engine/xine.c:807
 #, c-format
 msgid "xine: found input plugin  : %s\n"
 msgstr "xine: plugin di ingresso trovato  : %s\n"
 
-#: src/xine-engine/xine.c:760
+#: src/xine-engine/xine.c:825
 #, c-format
 msgid "xine: input plugin cannot open MRL [%s]\n"
 msgstr "xine: il plugin di ingresso non può aprire il MRL [%s]\n"
 
-#: src/xine-engine/xine.c:776
+#: src/xine-engine/xine.c:841
 #, c-format
 msgid "xine: cannot find input plugin for MRL [%s]\n"
 msgstr "xine: impossibile trovare il plugin di ingresso per il MRL [%s]\n"
 
-#: src/xine-engine/xine.c:802
+#: src/xine-engine/xine.c:867
 #, c-format
 msgid "xine: specified demuxer %s failed to start\n"
 msgstr "xine: l'avvio del demuxer %s specificato è fallito.\n"
 
-#: src/xine-engine/xine.c:838
+#: src/xine-engine/xine.c:903
 #, c-format
 msgid "xine: join rip input plugin\n"
 msgstr "xine: avvio del plugin di estrazione.\n"
 
-#: src/xine-engine/xine.c:845
+#: src/xine-engine/xine.c:910
 msgid "xine: error opening rip input plugin instance\n"
 msgstr "xine: errore nell'avvio del plugin di estrazione.\n"
 
-#: src/xine-engine/xine.c:876
+#: src/xine-engine/xine.c:941
 #, c-format
 msgid "xine: last_probed demuxer %s failed to start\n"
 msgstr "xine: l'avvio dell'ultimo demuxer provato %s è fallito.\n"
 
-#: src/xine-engine/xine.c:905
+#: src/xine-engine/xine.c:970
 msgid "ignoring video\n"
 msgstr "video ignorato\n"
 
-#: src/xine-engine/xine.c:918
+#: src/xine-engine/xine.c:983
 msgid "ignoring audio\n"
 msgstr "audio ignorato\n"
 
-#: src/xine-engine/xine.c:931
+#: src/xine-engine/xine.c:996
 msgid "ignoring subpicture\n"
 msgstr "sottotitoli ignorati\n"
 
-#: src/xine-engine/xine.c:944
+#: src/xine-engine/xine.c:1009
 msgid "input cache plugin disabled\n"
 msgstr "plugin cache d'ingresso disattivato.\n"
 
-#: src/xine-engine/xine.c:1015
+#: src/xine-engine/xine.c:1080
 #, c-format
 msgid "subtitle mrl opened '%s'\n"
 msgstr "aperto il MRL sottotitoli '%s'\n"
 
-#: src/xine-engine/xine.c:1019
+#: src/xine-engine/xine.c:1084
 msgid "xine: error opening subtitle mrl\n"
 msgstr "xine: errore nell'apertura del MRL dei sottotitoli.\n"
 
-#: src/xine-engine/xine.c:1051
+#: src/xine-engine/xine.c:1116
 #, c-format
 msgid "xine: error while parsing MRL\n"
 msgstr "xine: errore nell'interpretazione del MRL.\n"
 
-#: src/xine-engine/xine.c:1058
+#: src/xine-engine/xine.c:1123
 #, c-format
 msgid "xine: changing option '%s' from MRL isn't permitted\n"
 msgstr "xine: modificare l'opzione '%s' da MRL non è consentito.\n"
 
-#: src/xine-engine/xine.c:1078
+#: src/xine-engine/xine.c:1143
 #, c-format
 msgid "xine: couldn't find demux for >%s<\n"
 msgstr "xine: impossibile trovare il demuxer per >%s<\n"
 
-#: src/xine-engine/xine.c:1094
+#: src/xine-engine/xine.c:1159
 #, c-format
 msgid "xine: found demuxer plugin: %s\n"
 msgstr "xine: trovato plugin demuxer: %s\n"
 
-#: src/xine-engine/xine.c:1114
+#: src/xine-engine/xine.c:1179
 #, c-format
 msgid "xine: demuxer failed to start\n"
 msgstr "xine: avvio del demuxer fallito.\n"
 
-#: src/xine-engine/xine.c:1179
+#: src/xine-engine/xine.c:1244
 #, c-format
 msgid "xine_play: no demux available\n"
 msgstr "xine_play: nessun demux disponibile\n"
 
-#: src/xine-engine/xine.c:1249
+#: src/xine-engine/xine.c:1314
 #, c-format
 msgid "xine_play: demux failed to start\n"
 msgstr "xine: avvio del demuxer fallito.\n"
 
-#: src/xine-engine/xine.c:1527
+#: src/xine-engine/xine.c:1592
 #, c-format
 msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
 msgstr ""
 "xine: La directory di salvataggio specificata \"%s\" potrebbe essere un "
 "rischio per la sicurezza.\n"
 
-#: src/xine-engine/xine.c:1532
+#: src/xine-engine/xine.c:1597
 msgid "The specified save_dir might be a security risk."
 msgstr ""
 "La directory di salvataggio specificata potrebbe essere un rischio per la "
 "sicurezza."
 
-#: src/xine-engine/xine.c:1561
+#: src/xine-engine/xine.c:1626
 msgid "xine: locale not supported by C library\n"
 msgstr "xine: locale non supportarto dalla liberaria C\n"
 
-#: src/xine-engine/xine.c:1570
+#: src/xine-engine/xine.c:1635
 msgid "media format detection strategy"
 msgstr "Strategia di riconoscimento del formato di contenuto"
 
-#: src/xine-engine/xine.c:1571
+#: src/xine-engine/xine.c:1636
 msgid ""
 "xine offers various methods to detect the media format of input to play. The "
 "individual values are:\n"
@@ -5650,11 +5640,11 @@ msgstr ""
 "extension\n"
 "Riconosce solo tramite estensione del file.\n"
 
-#: src/xine-engine/xine.c:1589
+#: src/xine-engine/xine.c:1654
 msgid "directory for saving streams"
 msgstr "Cartella di salvataggio degli stream"
 
-#: src/xine-engine/xine.c:1590
+#: src/xine-engine/xine.c:1655
 msgid ""
 "When using the stream save feature, files will be written only into this "
 "directory.\n"
@@ -5670,12 +5660,12 @@ msgstr ""
 "arbitrario. Per questo si deve essere attenti che la directory che si "
 "specifica sia robusta per qualsiasi contenuto di ogni file."
 
-#: src/xine-engine/xine.c:1601
+#: src/xine-engine/xine.c:1666
 msgid "allow implicit changes to the configuration (e.g. by MRL)"
 msgstr ""
 "permetti modifiche implicite alla configurazione (per esmepio tramite MRL)"
 
-#: src/xine-engine/xine.c:1602
+#: src/xine-engine/xine.c:1667
 msgid ""
 "If enabled, you allow xine to change your configuration without explicit "
 "actions from your side. For example configuration changes demanded by MRLs "
@@ -5692,26 +5682,26 @@ msgstr ""
 "arbitrariamente la propria configurazione si può finire con uno xine "
 "completamente caotico."
 
-#: src/xine-engine/xine.c:1616
+#: src/xine-engine/xine.c:1681
 msgid "Timeout for network stream reading (in seconds)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1617
+#: src/xine-engine/xine.c:1682
 msgid ""
 "Specifies the timeout when reading from network streams, in seconds. Too low "
 "values might stop streaming when the source is slow or the bandwidth is "
 "occupied, too high values will freeze the player if the connection is lost."
 msgstr ""
 
-#: src/xine-engine/xine.c:1969
+#: src/xine-engine/xine.c:2034
 msgid "messages"
 msgstr "messaggi"
 
-#: src/xine-engine/xine.c:1970
+#: src/xine-engine/xine.c:2035
 msgid "plugin"
 msgstr "plugin"
 
-#: src/xine-engine/xine.c:1971
+#: src/xine-engine/xine.c:2036
 msgid "trace"
 msgstr "traccia"
 
@@ -5785,6 +5775,82 @@ msgstr ""
 msgid "Benchmarking memcpy methods (smaller is better):\n"
 msgstr "Test di velocità dei metodi memcpy (più piccolo è migliore):\n"
 
+#~ msgid "deinterlace method (deprecated)"
+#~ msgstr "metodo di deinterlacciamento (deprecato)"
+
+#~ msgid ""
+#~ "This config setting is deprecated. You should use the new deinterlacing "
+#~ "post processing settings instead.\n"
+#~ "\n"
+#~ "From the old days of analog television, where the even and odd numbered "
+#~ "lines of a video frame would be displayed at different times comes the "
+#~ "idea to increase motion smoothness by also recording the lines at "
+#~ "different times. This is called \"interlacing\". But unfortunately, "
+#~ "todays displays show the even and odd numbered lines as one complete "
+#~ "frame all at the same time (called \"progressive display\"), which "
+#~ "results in ugly frame errors known as comb artifacts. Software "
+#~ "deinterlacing is an approach to reduce these artifacts. The individual "
+#~ "values are:\n"
+#~ "\n"
+#~ "none\n"
+#~ "Disables software deinterlacing.\n"
+#~ "\n"
+#~ "bob\n"
+#~ "Interpolates between the lines for moving parts of the image.\n"
+#~ "\n"
+#~ "weave\n"
+#~ "Similar to bob, but with a tendency to preserve the full resolution, "
+#~ "better for high detail in low movement scenes.\n"
+#~ "\n"
+#~ "greedy\n"
+#~ "Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
+#~ "\n"
+#~ "onefield\n"
+#~ "Always interpolates and reduces vertical resolution.\n"
+#~ "\n"
+#~ "onefieldxv\n"
+#~ "Same as onefield, but does the interpolation in hardware.\n"
+#~ "\n"
+#~ "linearblend\n"
+#~ "Applies a slight vertical blur to remove the comb artifacts. Good results "
+#~ "with medium CPU usage."
+#~ msgstr ""
+#~ "Questa impostazione è deprecata, si dovrebbe utilizzare la nuova "
+#~ "impostazione per il deinterlacciamento in post elaborazione invece. \n"
+#~ "\n"
+#~ "Dai vecchi giorni della TV analogica, dove le linee pari e dispari del "
+#~ "frame erano visualizzate in momenti diversi proviene l'idea di migliorare "
+#~ "la scioltezza dei movimenti anche registrando le linee in momenti "
+#~ "diversi, e praticando il cosiddetto \"interlacciamento\". Sfortunatamente "
+#~ "i video moderni visualizzano le linee pari e dispari come un solo frame "
+#~ "(display progrssivo), portando alla visualizzazione di brutti errori "
+#~ "conosciuti come artefatti di comb. Il deinterlacciamento software è un "
+#~ "approccio alla riduzione di tali artefatti. I singoli valori sono:\n"
+#~ "\n"
+#~ "none\n"
+#~ "Disabilita il deinterlacciamento software.\n"
+#~ "\n"
+#~ "bob\n"
+#~ "Interpola le linee tra le parti in movimenti dell'immagine.\n"
+#~ "\n"
+#~ "weave\n"
+#~ "Simile a bob, ma con la tendenza di preservare la risoluzione completa, "
+#~ "migliore per un maggior dettaglio su scene dal movimento lento.\n"
+#~ "\n"
+#~ "greedy\n"
+#~ "Deinterlacciatore adattante molto buono, ma che richiede molta potenza di "
+#~ "CPU.\n"
+#~ "\n"
+#~ "onefield\n"
+#~ "Interopola e riduce sempre la risoluzione verticale.\n"
+#~ "\n"
+#~ "onefieldxv\n"
+#~ "Come onefield, ma effettua l'interpolazione in hardware.\n"
+#~ "\n"
+#~ "linearblend\n"
+#~ "Applica un leggero sfocamento verticale per rimuovere gli artefatti di "
+#~ "comb. Buoni risultati con un uso di CPU medio."
+
 #, fuzzy
 #~ msgid ""
 #~ "video_out_xcbshm: %s: allocating image\n"
diff --git a/po/libxine1.pot b/po/libxine2.pot
index 58edd19bf..c41c486d3 100644
--- a/po/libxine1.pot
+++ b/po/libxine2.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-04-24 21:48+0100\n"
+"POT-Creation-Date: 2007-06-02 13:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -712,6 +712,11 @@ msgstr ""
 msgid "xine audio output plugin using sun-compliant audio devices/drivers"
 msgstr ""
 
+#: src/combined/xine_ogg_demuxer.c:810
+#, c-format
+msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+msgstr ""
+
 #: src/demuxers/demux_asf.c:428
 #, c-format
 msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
@@ -838,11 +843,6 @@ msgid ""
 "xine developers.\n"
 msgstr ""
 
-#: src/demuxers/demux_ogg.c:802
-#, c-format
-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
-msgstr ""
-
 #: src/demuxers/demux_snd.c:104
 #, c-format
 msgid "demux_snd: bad header parameters\n"
@@ -878,16 +878,6 @@ msgstr ""
 msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
 msgstr ""
 
-#: src/dxr3/dxr3.h:32
-msgid "DXR3 device number"
-msgstr ""
-
-#: src/dxr3/dxr3.h:33
-msgid ""
-"If you have more than one DXR3 in your computer, you can specify which one "
-"to use here."
-msgstr ""
-
 #: src/dxr3/dxr3_decode_spu.c:253
 #, c-format
 msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
@@ -978,6 +968,16 @@ msgid ""
 "dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
 msgstr ""
 
+#: src/dxr3/dxr3.h:32
+msgid "DXR3 device number"
+msgstr ""
+
+#: src/dxr3/dxr3.h:33
+msgid ""
+"If you have more than one DXR3 in your computer, you can specify which one "
+"to use here."
+msgstr ""
+
 #: src/dxr3/dxr3_mpeg_encoders.c:125
 msgid "dxr3_mpeg_encoder: failed to init librte\n"
 msgstr ""
@@ -1232,40 +1232,40 @@ msgstr ""
 msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
 msgstr ""
 
-#: src/input/input_cdda.c:1608
+#: src/input/input_cdda.c:1611
 #, c-format
 msgid "%s: can't connect to %s:%d\n"
 msgstr ""
 
-#: src/input/input_cdda.c:1655
+#: src/input/input_cdda.c:1658
 #, c-format
 msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
 msgstr ""
 
-#: src/input/input_cdda.c:1660
+#: src/input/input_cdda.c:1663
 #, c-format
 msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
 msgstr ""
 
-#: src/input/input_cdda.c:2690
+#: src/input/input_cdda.c:2693
 msgid "CD Digital Audio (aka. CDDA)"
 msgstr ""
 
-#: src/input/input_cdda.c:2742
+#: src/input/input_cdda.c:2745
 msgid "device used for CD audio"
 msgstr ""
 
-#: src/input/input_cdda.c:2743
+#: src/input/input_cdda.c:2746
 msgid ""
 "The path to the device, usually a CD or DVD drive, which you intend to use "
 "for playing audio CDs."
 msgstr ""
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid "query CDDB"
 msgstr ""
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid ""
 "Enables CDDB queries, which will give you convenient title and track names "
 "for your audio CDs.\n"
@@ -1274,11 +1274,11 @@ msgid ""
 "listening habits."
 msgstr ""
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid "CDDB server name"
 msgstr ""
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid ""
 "The CDDB server used to retrieve the title and track information from.\n"
 "This setting is security critical, because the sever will receive "
@@ -1286,19 +1286,19 @@ msgid ""
 "malicious replies. Be sure to enter a server you can trust."
 msgstr ""
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "CDDB server port"
 msgstr ""
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "The server port used to retrieve the title and track information from."
 msgstr ""
 
-#: src/input/input_cdda.c:2771
+#: src/input/input_cdda.c:2774
 msgid "slow down disc drive to this speed factor"
 msgstr ""
 
-#: src/input/input_cdda.c:2772
+#: src/input/input_cdda.c:2775
 msgid ""
 "Since some CD or DVD drives make some really loud noises because of the fast "
 "disc rotation, xine will try to slow them down. With standard CD or DVD "
@@ -1307,123 +1307,129 @@ msgid ""
 "A value of zero here will disable the slowdown."
 msgstr ""
 
-#: src/input/input_dvb.c:899
+#: src/input/input_dvb.c:900
 #, c-format
 msgid "input_dvb: failed to open dvb channel file '%s': %s\n"
 msgstr ""
 
-#: src/input/input_dvb.c:905
+#: src/input/input_dvb.c:906
 #, c-format
 msgid "input_dvb: dvb channel file '%s' is not a plain file\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2115 src/input/input_dvb.c:2943
+#: src/input/input_dvb.c:2116 src/input/input_dvb.c:2948
 msgid "input_dvb: tuner_set_channel failed\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2743
+#: src/input/input_dvb.c:2748
 msgid "input_dvb: cannot open dvb device\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2767
+#: src/input/input_dvb.c:2772
 #, c-format
 msgid "input_dvb: channel %d out of range, defaulting to 0\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2778
+#: src/input/input_dvb.c:2783
 #, c-format
 msgid "input_dvb: searching for channel %s\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2801
+#: src/input/input_dvb.c:2806
 #, c-format
 msgid "input_dvb: exact match for %s not found: trying partial matches\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2808
+#: src/input/input_dvb.c:2813
 #, c-format
 msgid "input_dvb: found matching channel %s\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2821
+#: src/input/input_dvb.c:2826
 #, c-format
 msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2827
+#: src/input/input_dvb.c:2832
 msgid ""
 "input_dvb: invalid channel specification, defaulting to last viewed "
 "channel.\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2833
+#: src/input/input_dvb.c:2838
 msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2845
+#: src/input/input_dvb.c:2850
 msgid ""
 "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
 "S)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2865
+#: src/input/input_dvb.c:2870
 msgid ""
 "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
 "T)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2888 src/input/input_dvb.c:2914
+#: src/input/input_dvb.c:2893
 msgid ""
 "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
 "C)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2949
+#: src/input/input_dvb.c:2919
+msgid ""
+"input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-"
+"A)\n"
+msgstr ""
+
+#: src/input/input_dvb.c:2954
 #, c-format
 msgid "input_dvb: cannot open dvr device '%s'\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2971
+#: src/input/input_dvb.c:2976
 msgid "input_dvb: cannot create EPG updater thread\n"
 msgstr ""
 
-#: src/input/input_dvb.c:3033
+#: src/input/input_dvb.c:3038
 msgid "use DVB 'center cutout' (zoom)"
 msgstr ""
 
-#: src/input/input_dvb.c:3034
+#: src/input/input_dvb.c:3039
 msgid ""
 "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
 "frame."
 msgstr ""
 
-#: src/input/input_dvb.c:3127
+#: src/input/input_dvb.c:3132
 msgid "DVB (Digital TV) input plugin"
 msgstr ""
 
-#: src/input/input_dvb.c:3244
+#: src/input/input_dvb.c:3249
 msgid "Remember last DVB channel watched"
 msgstr ""
 
-#: src/input/input_dvb.c:3245
+#: src/input/input_dvb.c:3250
 msgid ""
 "On autoplay, xine will remember and switch to the channel indicated in media."
 "dvb.last_channel. "
 msgstr ""
 
-#: src/input/input_dvb.c:3252
+#: src/input/input_dvb.c:3257
 msgid "Last DVB channel viewed"
 msgstr ""
 
-#: src/input/input_dvb.c:3253
+#: src/input/input_dvb.c:3258
 msgid "If enabled xine will remember and switch to this channel. "
 msgstr ""
 
-#: src/input/input_dvb.c:3259
+#: src/input/input_dvb.c:3264
 msgid "Number of dvb card to use."
 msgstr ""
 
-#: src/input/input_dvb.c:3260
+#: src/input/input_dvb.c:3265
 msgid ""
 "Leave this at zero unless you really have more than 1 card in your system."
 msgstr ""
@@ -1613,87 +1619,87 @@ msgstr ""
 msgid "gnome-vfs input plugin as shipped with xine"
 msgstr ""
 
-#: src/input/input_http.c:174
+#: src/input/input_http.c:176
 #, c-format
 msgid "input_http: gethostbyname(%s) failed: %s\n"
 msgstr ""
 
-#: src/input/input_http.c:400 src/input/input_http.c:943
+#: src/input/input_http.c:402 src/input/input_http.c:957
 #, c-format
 msgid "input_http: read error %d\n"
 msgstr ""
 
-#: src/input/input_http.c:627
+#: src/input/input_http.c:629
 msgid "Connecting HTTP server..."
 msgstr ""
 
-#: src/input/input_http.c:819
+#: src/input/input_http.c:820
 #, c-format
 msgid "input_http: invalid http answer\n"
 msgstr ""
 
-#: src/input/input_http.c:825
+#: src/input/input_http.c:826
 #, c-format
 msgid "input_http: 3xx redirection: >%d %s<\n"
 msgstr ""
 
-#: src/input/input_http.c:830 src/input/input_http.c:836
-#: src/input/input_http.c:843
+#: src/input/input_http.c:831 src/input/input_http.c:836
+#: src/input/input_http.c:842 src/input/input_http.c:849
 #, c-format
 msgid "input_http: http status not 2xx: >%d %s<\n"
 msgstr ""
 
-#: src/input/input_http.c:853
+#: src/input/input_http.c:859
 #, c-format
 msgid "input_http: content length = %<PRIdMAX> bytes\n"
 msgstr ""
 
-#: src/input/input_http.c:922
+#: src/input/input_http.c:932
 #, c-format
 msgid "input_http: buffer exhausted after %d bytes."
 msgstr ""
 
-#: src/input/input_http.c:996
+#: src/input/input_http.c:1010
 msgid "http input plugin"
 msgstr ""
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "HTTP proxy host"
 msgstr ""
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "The hostname of the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "HTTP proxy port"
 msgstr ""
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "The port number of the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1076
+#: src/input/input_http.c:1090
 msgid "HTTP proxy username"
 msgstr ""
 
-#: src/input/input_http.c:1077
+#: src/input/input_http.c:1091
 msgid "The user name for the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1080
+#: src/input/input_http.c:1094
 msgid "HTTP proxy password"
 msgstr ""
 
-#: src/input/input_http.c:1081
+#: src/input/input_http.c:1095
 msgid "The password for the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1084
+#: src/input/input_http.c:1098
 msgid "Domains for which to ignore the HTTP proxy"
 msgstr ""
 
-#: src/input/input_http.c:1085
+#: src/input/input_http.c:1099
 msgid ""
 "A comma-separated list of domain names for which the proxy is to be "
 "ignored.\n"
@@ -1899,31 +1905,31 @@ msgstr ""
 msgid "Adjusting..."
 msgstr ""
 
-#: src/input/input_v4l.c:660
+#: src/input/input_v4l.c:658
 msgid "Tuner name not found\n"
 msgstr ""
 
-#: src/input/input_v4l.c:1876
+#: src/input/input_v4l.c:1874
 msgid "v4l tv input plugin"
 msgstr ""
 
-#: src/input/input_v4l.c:1880
+#: src/input/input_v4l.c:1878
 msgid "v4l radio input plugin"
 msgstr ""
 
-#: src/input/input_v4l.c:1912
+#: src/input/input_v4l.c:1910
 msgid "v4l video device"
 msgstr ""
 
-#: src/input/input_v4l.c:1913
+#: src/input/input_v4l.c:1911
 msgid "The path to your Video4Linux video device."
 msgstr ""
 
-#: src/input/input_v4l.c:1938
+#: src/input/input_v4l.c:1936
 msgid "v4l radio device"
 msgstr ""
 
-#: src/input/input_v4l.c:1939
+#: src/input/input_v4l.c:1937
 msgid "The path to your Video4Linux radio device."
 msgstr ""
 
@@ -2083,110 +2089,110 @@ msgstr ""
 msgid "Should have converted this above"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:191
+#: src/input/vcd/xineplug_inp_vcd.c:192
 msgid "failed to find a device with a VCD"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:328
+#: src/input/vcd/xineplug_inp_vcd.c:329
 msgid "was passed a null class parameter"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:972
+#: src/input/vcd/xineplug_inp_vcd.c:982
 msgid "Invalid current entry type"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:996
+#: src/input/vcd/xineplug_inp_vcd.c:1006
 msgid ""
 "Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1097
+#: src/input/vcd/xineplug_inp_vcd.c:1107
 msgid "selection has no RETURN entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1126
+#: src/input/vcd/xineplug_inp_vcd.c:1136
 msgid "DEFAULT selected, but PBC is not on."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1131
+#: src/input/vcd/xineplug_inp_vcd.c:1141
 msgid "selection has no NEXT entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1139
+#: src/input/vcd/xineplug_inp_vcd.c:1149
 msgid "selection has no PREVIOUS entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1146
+#: src/input/vcd/xineplug_inp_vcd.c:1156
 msgid "Unknown event type: "
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1446 src/input/vcd/xineplug_inp_vcd.c:1493
+#: src/input/vcd/xineplug_inp_vcd.c:1452 src/input/vcd/xineplug_inp_vcd.c:1499
 msgid "The above message had unknown vcdimager log level"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1824
+#: src/input/vcd/xineplug_inp_vcd.c:1830
 msgid "VCD default type to use on autoplay"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1825
+#: src/input/vcd/xineplug_inp_vcd.c:1831
 msgid ""
 "The VCD play unit to use when none is specified in an MRL, e.g. vcd:// or "
 "vcd:///dev/dvd:"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1835
+#: src/input/vcd/xineplug_inp_vcd.c:1841
 msgid "CD-ROM drive used for VCD when none given"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1836
+#: src/input/vcd/xineplug_inp_vcd.c:1842
 msgid ""
 "What to use if no drive specified. If the setting is empty, xine will scan "
 "for CD drives."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1846
+#: src/input/vcd/xineplug_inp_vcd.c:1852
 msgid "VCD position slider range"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1847
+#: src/input/vcd/xineplug_inp_vcd.c:1853
 msgid ""
 "range that the stream playback position slider represents playing a VCD."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1855
+#: src/input/vcd/xineplug_inp_vcd.c:1861
 msgid "VCD read-ahead caching?"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1856
+#: src/input/vcd/xineplug_inp_vcd.c:1862
 msgid "Class may lead to jerky playback on low-end machines."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1866
+#: src/input/vcd/xineplug_inp_vcd.c:1872
 msgid "automatically advance VCD track/entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1867
+#: src/input/vcd/xineplug_inp_vcd.c:1873
 msgid ""
 "If enabled, we should automatically advance to the next entry or track. Used "
 "only when playback control (PBC) is disabled."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1876
+#: src/input/vcd/xineplug_inp_vcd.c:1882
 msgid "show 'rejected' VCD LIDs"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1877
+#: src/input/vcd/xineplug_inp_vcd.c:1883
 msgid ""
 "Some playback list IDs (LIDs) are marked not showable, but you can see them "
 "in the MRL list if this is set. Rejected entries are marked with an asterisk "
 "(*) appended to the MRL."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1888
+#: src/input/vcd/xineplug_inp_vcd.c:1894
 msgid "VCD format string for display banner"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1889
+#: src/input/vcd/xineplug_inp_vcd.c:1895
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are:\n"
@@ -2207,11 +2213,11 @@ msgid ""
 " %% : a %\n"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1914
+#: src/input/vcd/xineplug_inp_vcd.c:1920
 msgid "VCD format string for stream comment field"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1915
+#: src/input/vcd/xineplug_inp_vcd.c:1921
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
@@ -2219,11 +2225,11 @@ msgid ""
 "See the help for the title_format for the meanings of these."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1927
+#: src/input/vcd/xineplug_inp_vcd.c:1933
 msgid "VCD debug flag mask"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1928
+#: src/input/vcd/xineplug_inp_vcd.c:1934
 msgid ""
 "For tracking down bugs in the VCD plugin. Mask values are:\n"
 "   1: Meta information\n"
@@ -2240,57 +2246,6 @@ msgid ""
 "2048: Debugging from VCDINFO\n"
 msgstr ""
 
-#: src/liba52/xine_a52_decoder.c:742 src/libxineadec/xine_dts_decoder.c:524
-msgid "HELP! a mono-only audio driver?!\n"
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:805
-msgid "A/52 volume"
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:806
-msgid ""
-"With A/52 audio, you can modify the volume at the decoder level. This has "
-"the advantage of the audio being already decoded for the specified volume, "
-"so later operations like channel downmixing will work on an audio stream of "
-"the given volume."
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:814
-msgid "use A/52 dynamic range compression"
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:815
-msgid ""
-"Dynamic range compression limits the dynamic range of the audio. This means "
-"making the loud sounds softer, and the soft sounds louder, so you can more "
-"easily listen to the audio in a noisy environment without disturbing anyone."
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:822
-msgid "downmix audio to 2 channel surround stereo"
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:823
-msgid ""
-"When you want to listen to multichannel surround sound, but you have only "
-"two speakers or a surround decoder or amplifier which does some sort of "
-"matrix surround decoding like prologic, you should enable this option so "
-"that the additional channels are mixed into the stereo signal."
-msgstr ""
-
-#: src/libfaad/xine_faad_decoder.c:131
-msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
-msgstr ""
-
-#: src/libfaad/xine_faad_decoder.c:140
-msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
-msgstr ""
-
-#: src/libfaad/xine_faad_decoder.c:151
-msgid "libfaad: libfaad NeAACDecInit failed.\n"
-msgstr ""
-
 #: src/libffmpeg/ff_audio_decoder.c:122
 #, c-format
 msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
@@ -2314,45 +2269,6 @@ msgstr ""
 msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
 msgstr ""
 
-#: src/libffmpeg/ff_video_decoder.c:155
-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:173
-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:333
-#, c-format
-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:362
-msgid "ffmpeg_video_dec: couldn't open decoder\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:397
-msgid "ffmpeg_video_dec: direct rendering enabled\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:816
-#, c-format
-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:1514
-msgid "MPEG-4 postprocessing quality"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:1515
-msgid ""
-"You can adjust the amount of post processing applied to MPEG-4 video.\n"
-"Higher values result in better quality, but need more CPU. Lower values may "
-"result in image defects like block artifacts. For high quality content, too "
-"heavy post processing can actually make the image worse by blurring it too "
-"much."
-msgstr ""
-
 #: src/libffmpeg/ffmpeg_encoder.c:163
 msgid "libavcodec mpeg output bitrate (kbit/s)"
 msgstr ""
@@ -2391,23 +2307,43 @@ msgstr ""
 msgid "The maximum compression to apply to an image in constant quality mode."
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:249
+#: src/libffmpeg/ff_video_decoder.c:155
+msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:173
+msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:333
 #, c-format
-msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:323
-msgid "libmusepack: data after last frame ignored\n"
+#: src/libffmpeg/ff_video_decoder.c:362
+msgid "ffmpeg_video_dec: couldn't open decoder\n"
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:334
-msgid "libmusepack: mpc_decoder_initialise failed\n"
+#: src/libffmpeg/ff_video_decoder.c:397
+msgid "ffmpeg_video_dec: direct rendering enabled\n"
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:354
-#: src/libxineadec/xine_musepack_decoder.c:369
+#: src/libffmpeg/ff_video_decoder.c:816
 #, c-format
-msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:1519
+msgid "MPEG-4 postprocessing quality"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:1520
+msgid ""
+"You can adjust the amount of post processing applied to MPEG-4 video.\n"
+"Higher values result in better quality, but need more CPU. Lower values may "
+"result in image defects like block artifacts. For high quality content, too "
+"heavy post processing can actually make the image worse by blurring it too "
+"much."
 msgstr ""
 
 #: src/libreal/real_common.c:107
@@ -2423,10 +2359,6 @@ msgid ""
 "information on how to install the codecs."
 msgstr ""
 
-#: src/libreal/xine_real_video_decoder.c:164
-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
-msgstr ""
-
 #: src/libreal/xine_real_audio_decoder.c:130
 #, c-format
 msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
@@ -2446,6 +2378,10 @@ msgstr ""
 msgid "libareal: oups, real can do more than 2 channels ?\n"
 msgstr ""
 
+#: src/libreal/xine_real_video_decoder.c:164
+msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+msgstr ""
+
 #: src/libspucc/xine_cc_decoder.c:192
 msgid "display closed captions in MPEG-2 streams"
 msgstr ""
@@ -2656,6 +2592,77 @@ msgstr ""
 msgid "w32codec: Error initializing DMO Audio\n"
 msgstr ""
 
+#: src/libxineadec/xine_a52_decoder.c:742
+#: src/libxineadec/xine_dts_decoder.c:524
+msgid "HELP! a mono-only audio driver?!\n"
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:805
+msgid "A/52 volume"
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:806
+msgid ""
+"With A/52 audio, you can modify the volume at the decoder level. This has "
+"the advantage of the audio being already decoded for the specified volume, "
+"so later operations like channel downmixing will work on an audio stream of "
+"the given volume."
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:814
+msgid "use A/52 dynamic range compression"
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:815
+msgid ""
+"Dynamic range compression limits the dynamic range of the audio. This means "
+"making the loud sounds softer, and the soft sounds louder, so you can more "
+"easily listen to the audio in a noisy environment without disturbing anyone."
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:822
+msgid "downmix audio to 2 channel surround stereo"
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:823
+msgid ""
+"When you want to listen to multichannel surround sound, but you have only "
+"two speakers or a surround decoder or amplifier which does some sort of "
+"matrix surround decoding like prologic, you should enable this option so "
+"that the additional channels are mixed into the stereo signal."
+msgstr ""
+
+#: src/libxineadec/xine_faad_decoder.c:130
+msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
+msgstr ""
+
+#: src/libxineadec/xine_faad_decoder.c:139
+msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
+msgstr ""
+
+#: src/libxineadec/xine_faad_decoder.c:150
+msgid "libfaad: libfaad NeAACDecInit failed.\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:249
+#, c-format
+msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:323
+msgid "libmusepack: data after last frame ignored\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:334
+msgid "libmusepack: mpc_decoder_initialise failed\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:354
+#: src/libxineadec/xine_musepack_decoder.c:369
+#, c-format
+msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgstr ""
+
 #: src/libxinevdec/bitplane.c:1272
 #, c-format
 msgid "bitplane: error doing ByteRun1 decompression\n"
@@ -2870,22 +2877,6 @@ msgid ""
 "* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
 msgstr ""
 
-#: src/post/planar/eq.c:186
-msgid ""
-"Software equalizer with interactive controls just like the hardware "
-"equalizer, for cards/drivers that do not support brightness and contrast "
-"controls in hardware.\n"
-"\n"
-"Parameters\n"
-"  brightness\n"
-"  contrast\n"
-"\n"
-"Note: It is possible to use frontend's control window to set these "
-"parameters.\n"
-"\n"
-"* mplayer's eq (C) Richard Felker\n"
-msgstr ""
-
 #: src/post/planar/eq2.c:359
 msgid ""
 "Alternative software equalizer that uses lookup tables (very slow), allowing "
@@ -2910,6 +2901,22 @@ msgid ""
 "* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
 msgstr ""
 
+#: src/post/planar/eq.c:186
+msgid ""
+"Software equalizer with interactive controls just like the hardware "
+"equalizer, for cards/drivers that do not support brightness and contrast "
+"controls in hardware.\n"
+"\n"
+"Parameters\n"
+"  brightness\n"
+"  contrast\n"
+"\n"
+"Note: It is possible to use frontend's control window to set these "
+"parameters.\n"
+"\n"
+"* mplayer's eq (C) Richard Felker\n"
+msgstr ""
+
 #: src/post/planar/expand.c:251
 msgid ""
 "The expand plugin is meant to take frames of arbitrary aspect ratio and "
@@ -2985,6 +2992,63 @@ msgid ""
 "* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
 msgstr ""
 
+#: src/vdr/input_vdr.c:183 src/vdr/input_vdr.c:223 src/vdr/input_vdr.c:2297
+#: src/vdr/input_vdr.c:2394
+#, c-format
+msgid ": input event write: %s.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:713 src/vdr/input_vdr.c:1137
+msgid ": buffer_pool_alloc() failed!\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:782
+#, c-format
+msgid ": flush buffers (vb: %d, ab: %d, vf: %d, af: %d) %s.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1475
+#, c-format
+msgid ": shutting down rpc thread (timeout: %d ms) ...\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1499
+#, c-format
+msgid ": cancelling rpc thread in function %d...\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1506
+msgid ": joining rpc thread ...\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1508
+msgid ": rpc thread joined.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:2137 src/vdr/input_vdr.c:2151 src/vdr/input_vdr.c:2169
+#: src/vdr/input_vdr.c:2190 src/vdr/input_vdr.c:2211
+#, c-format
+msgid ": failed to open '%s' (%s)\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:2153
+msgid "timeout expired during setup phase"
+msgstr ""
+
+#: src/vdr/input_vdr.c:2227
+#, c-format
+msgid ": can't create new thread (%s)\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:2487
+msgid "VDR display device plugin"
+msgstr ""
+
+#: src/vdr/post_vdr_video.c:435
+#, c-format
+msgid ": osd: (%d, %d)-(%d, %d)@%lg\n"
+msgstr ""
+
 #: src/video_out/video_out_aa.c:311
 msgid "xine video output plugin using the ascii-art library"
 msgstr ""
@@ -3226,8 +3290,8 @@ msgid ""
 msgstr ""
 
 #: src/video_out/video_out_opengl.c:1918 src/video_out/video_out_vidix.c:1015
-#: src/video_out/video_out_xcbxv.c:1476 src/video_out/video_out_xv.c:1489
-#: src/video_out/video_out_xvmc.c:1461 src/video_out/video_out_xxmc.c:2465
+#: src/video_out/video_out_xcbxv.c:1304 src/video_out/video_out_xv.c:1359
+#: src/video_out/video_out_xvmc.c:1423 src/video_out/video_out_xxmc.c:2531
 msgid "enable double buffering"
 msgstr ""
 
@@ -3302,9 +3366,9 @@ msgstr ""
 msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
 msgstr ""
 
-#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1443
-#: src/video_out/video_out_xv.c:1456 src/video_out/video_out_xvmc.c:1446
-#: src/video_out/video_out_xxmc.c:2432
+#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1271
+#: src/video_out/video_out_xv.c:1326 src/video_out/video_out_xvmc.c:1408
+#: src/video_out/video_out_xxmc.c:2498
 msgid "video overlay colour key"
 msgstr ""
 
@@ -3454,9 +3518,9 @@ msgstr ""
 msgid "The intensity of the blue colour components."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1477
-#: src/video_out/video_out_xv.c:1490 src/video_out/video_out_xvmc.c:1462
-#: src/video_out/video_out_xxmc.c:2466
+#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1305
+#: src/video_out/video_out_xv.c:1360 src/video_out/video_out_xvmc.c:1424
+#: src/video_out/video_out_xxmc.c:2532
 msgid ""
 "Double buffering will synchronize the update of the video image to the "
 "repainting of the entire screen (\"vertical retrace\"). This eliminates "
@@ -3489,9 +3553,9 @@ msgid "video overlay colour key red component"
 msgstr ""
 
 #: src/video_out/video_out_vidix.c:1159 src/video_out/video_out_vidix.c:1166
-#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1444
-#: src/video_out/video_out_xv.c:1457 src/video_out/video_out_xvmc.c:1447
-#: src/video_out/video_out_xxmc.c:2433
+#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1272
+#: src/video_out/video_out_xv.c:1327 src/video_out/video_out_xvmc.c:1409
+#: src/video_out/video_out_xxmc.c:2499
 msgid ""
 "The colour key is used to tell the graphics card where to overlay the video "
 "image. Try different values, if you experience windows becoming transparent."
@@ -3519,13 +3583,13 @@ msgid "%s: %s: allocating image\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbshm.c:159 src/video_out/video_out_xcbshm.c:169
-#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:272
-#: src/video_out/video_out_xcbxv.c:282 src/video_out/video_out_xcbxv.c:292
-#: src/video_out/video_out_xcbxv.c:304 src/video_out/video_out_xshm.c:204
+#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:267
+#: src/video_out/video_out_xcbxv.c:277 src/video_out/video_out_xcbxv.c:287
+#: src/video_out/video_out_xcbxv.c:299 src/video_out/video_out_xshm.c:204
 #: src/video_out/video_out_xshm.c:221 src/video_out/video_out_xshm.c:232
-#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:296
-#: src/video_out/video_out_xv.c:307 src/video_out/video_out_xv.c:316
-#: src/video_out/video_out_xv.c:352 src/video_out/video_out_xxmc.c:648
+#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:295
+#: src/video_out/video_out_xv.c:322 src/video_out/video_out_xv.c:331
+#: src/video_out/video_out_xv.c:367 src/video_out/video_out_xxmc.c:648
 #: src/video_out/video_out_xxmc.c:659 src/video_out/video_out_xxmc.c:668
 #: src/video_out/video_out_xxmc.c:704
 #, c-format
@@ -3537,8 +3601,8 @@ msgstr ""
 msgid "%s: shared memory error (address error) when allocating image \n"
 msgstr ""
 
-#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:302
-#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:350
+#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:297
+#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:365
 #: src/video_out/video_out_xxmc.c:702
 #, c-format
 msgid "%s: x11 error during shared memory XImage creation\n"
@@ -3568,61 +3632,61 @@ msgstr ""
 msgid "xine video output plugin using the MIT X shared memory extension"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:270 src/video_out/video_out_xv.c:305
+#: src/video_out/video_out_xcbxv.c:265 src/video_out/video_out_xv.c:320
 #: src/video_out/video_out_xxmc.c:657
 #, c-format
 msgid "%s: XvShmCreateImage returned a zero size\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:280 src/video_out/video_out_xv.c:314
+#: src/video_out/video_out_xcbxv.c:275 src/video_out/video_out_xv.c:329
 #: src/video_out/video_out_xxmc.c:666
 #, c-format
 msgid "%s: shared memory error in shmget: %s\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:290
+#: src/video_out/video_out_xcbxv.c:285
 #, c-format
 msgid "%s: shared memory error (address error)\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1294 src/video_out/video_out_xv.c:1301
-#: src/video_out/video_out_xxmc.c:2283
+#: src/video_out/video_out_xcbxv.c:1125 src/video_out/video_out_xv.c:1174
+#: src/video_out/video_out_xxmc.c:2349
 #, c-format
 msgid "%s: Xv extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1336 src/video_out/video_out_xv.c:1338
-#: src/video_out/video_out_xxmc.c:2320
+#: src/video_out/video_out_xcbxv.c:1167 src/video_out/video_out_xv.c:1211
+#: src/video_out/video_out_xxmc.c:2386
 #, c-format
 msgid ""
 "%s: Xv extension is present but I couldn't find a usable yuv12 port.\n"
 "\tLooks like your graphics hardware driver doesn't support Xv?!\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1345
+#: src/video_out/video_out_xcbxv.c:1176
 #, c-format
 msgid ""
 "%s: using Xv port %d from adaptor %s for hardware colorspace conversion and "
 "scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1452 src/video_out/video_out_xv.c:1465
-#: src/video_out/video_out_xvmc.c:1455 src/video_out/video_out_xxmc.c:2441
+#: src/video_out/video_out_xcbxv.c:1280 src/video_out/video_out_xv.c:1335
+#: src/video_out/video_out_xvmc.c:1417 src/video_out/video_out_xxmc.c:2507
 msgid "autopaint colour key"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1453 src/video_out/video_out_xv.c:1466
-#: src/video_out/video_out_xvmc.c:1456 src/video_out/video_out_xxmc.c:2442
+#: src/video_out/video_out_xcbxv.c:1281 src/video_out/video_out_xv.c:1336
+#: src/video_out/video_out_xvmc.c:1418 src/video_out/video_out_xxmc.c:2508
 msgid "Make Xv autopaint its colorkey."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1460 src/video_out/video_out_xv.c:1473
-#: src/video_out/video_out_xxmc.c:2449
+#: src/video_out/video_out_xcbxv.c:1288 src/video_out/video_out_xv.c:1343
+#: src/video_out/video_out_xxmc.c:2515
 msgid "bilinear scaling mode"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1461 src/video_out/video_out_xv.c:1474
-#: src/video_out/video_out_xxmc.c:2450
+#: src/video_out/video_out_xcbxv.c:1289 src/video_out/video_out_xv.c:1344
+#: src/video_out/video_out_xxmc.c:2516
 msgid ""
 "Selects the bilinear scaling mode for Permedia cards. The individual values "
 "are:\n"
@@ -3637,74 +3701,30 @@ msgid ""
 "2 - enable full bilinear filtering"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1513 src/video_out/video_out_xv.c:1523
-#: src/video_out/video_out_xxmc.c:2506
+#: src/video_out/video_out_xcbxv.c:1341 src/video_out/video_out_xv.c:1393
+#: src/video_out/video_out_xxmc.c:2572
 #, c-format
 msgid "%s: this adaptor supports the yv12 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1518 src/video_out/video_out_xv.c:1528
-#: src/video_out/video_out_xxmc.c:2511
+#: src/video_out/video_out_xcbxv.c:1346 src/video_out/video_out_xv.c:1398
+#: src/video_out/video_out_xxmc.c:2577
 #, c-format
 msgid "%s: this adaptor supports the yuy2 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1526 src/video_out/video_out_xv.c:1550
-#: src/video_out/video_out_xxmc.c:2534
+#: src/video_out/video_out_xcbxv.c:1354 src/video_out/video_out_xv.c:1420
+#: src/video_out/video_out_xxmc.c:2600
 msgid "pitch alignment workaround"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1527 src/video_out/video_out_xv.c:1551
-#: src/video_out/video_out_xxmc.c:2535
+#: src/video_out/video_out_xcbxv.c:1355 src/video_out/video_out_xv.c:1421
+#: src/video_out/video_out_xxmc.c:2601
 msgid "Some buggy video drivers need a workaround to function properly."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1533 src/video_out/video_out_xv.c:1557
-#: src/video_out/video_out_xvmc.c:1524
-msgid "deinterlace method (deprecated)"
-msgstr ""
-
-#: src/video_out/video_out_xcbxv.c:1534 src/video_out/video_out_xv.c:1558
-#: src/video_out/video_out_xvmc.c:1525
-msgid ""
-"This config setting is deprecated. You should use the new deinterlacing post "
-"processing settings instead.\n"
-"\n"
-"From the old days of analog television, where the even and odd numbered "
-"lines of a video frame would be displayed at different times comes the idea "
-"to increase motion smoothness by also recording the lines at different "
-"times. This is called \"interlacing\". But unfortunately, todays displays "
-"show the even and odd numbered lines as one complete frame all at the same "
-"time (called \"progressive display\"), which results in ugly frame errors "
-"known as comb artifacts. Software deinterlacing is an approach to reduce "
-"these artifacts. The individual values are:\n"
-"\n"
-"none\n"
-"Disables software deinterlacing.\n"
-"\n"
-"bob\n"
-"Interpolates between the lines for moving parts of the image.\n"
-"\n"
-"weave\n"
-"Similar to bob, but with a tendency to preserve the full resolution, better "
-"for high detail in low movement scenes.\n"
-"\n"
-"greedy\n"
-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
-"\n"
-"onefield\n"
-"Always interpolates and reduces vertical resolution.\n"
-"\n"
-"onefieldxv\n"
-"Same as onefield, but does the interpolation in hardware.\n"
-"\n"
-"linearblend\n"
-"Applies a slight vertical blur to remove the comb artifacts. Good results "
-"with medium CPU usage."
-msgstr ""
-
-#: src/video_out/video_out_xcbxv.c:1588 src/video_out/video_out_xv.c:1631
-#: src/video_out/video_out_xxmc.c:2615
+#: src/video_out/video_out_xcbxv.c:1383 src/video_out/video_out_xv.c:1468
+#: src/video_out/video_out_xxmc.c:2681
 msgid "xine video output plugin using the MIT X video extension"
 msgstr ""
 
@@ -3713,93 +3733,93 @@ msgstr ""
 msgid "%s: shared memory error when allocating image\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:294 src/video_out/video_out_xxmc.c:646
+#: src/video_out/video_out_xv.c:293 src/video_out/video_out_xxmc.c:646
 #, c-format
 msgid "%s: XvShmCreateImage failed\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1348 src/video_out/video_out_xxmc.c:2330
+#: src/video_out/video_out_xv.c:1221 src/video_out/video_out_xxmc.c:2396
 #, c-format
 msgid ""
 "%s: using Xv port %ld from adaptor %s for hardware colorspace conversion and "
 "scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1593
+#: src/video_out/video_out_xvmc.c:1496
 msgid "xine video output plugin using the XvMC X video extension"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1639
+#: src/video_out/video_out_xvmc.c:1542
 msgid "video_out_xvmc: XvMC extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1737
+#: src/video_out/video_out_xvmc.c:1640
 msgid ""
 "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
 "port.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1746
+#: src/video_out/video_out_xvmc.c:1649
 #, c-format
 msgid ""
 "video_out_xvmc: using Xv port %ld from adaptor %s\n"
 "                for hardware colorspace conversion and scaling\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1751
+#: src/video_out/video_out_xvmc.c:1654
 msgid "                idct and motion compensation acceleration \n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1753
+#: src/video_out/video_out_xvmc.c:1656
 msgid "                motion compensation acceleration only\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1755
+#: src/video_out/video_out_xvmc.c:1658
 msgid "                no XvMC support \n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1756
+#: src/video_out/video_out_xvmc.c:1659
 #, c-format
 msgid "                With Overlay = %d; UnsignedIntra = %d.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2540
+#: src/video_out/video_out_xxmc.c:2606
 msgid "Make XvMC allocate more frames for better buffering."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2541
+#: src/video_out/video_out_xxmc.c:2607
 msgid ""
 "Some XvMC implementations allow more than 8 frames.\n"
 "This option, when turned on, makes the driver try to\n"
 "allocate 15 frames. A must for unichrome and live VDR.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2547
+#: src/video_out/video_out_xxmc.c:2613
 msgid "Unichrome cpu save"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2548
+#: src/video_out/video_out_xxmc.c:2614
 msgid ""
 "Saves CPU time by sleeping while decoder works.\n"
 "Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n"
 "Experimental.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2554
+#: src/video_out/video_out_xxmc.c:2620
 msgid "Fix buggy NVIDIA XvMC subpicture colors"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2555
+#: src/video_out/video_out_xxmc.c:2621
 msgid ""
 "There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
 "look blue and vice versa. This option provides a workaround.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2560
+#: src/video_out/video_out_xxmc.c:2626
 msgid "Use bob as accelerated deinterlace method."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2561
+#: src/video_out/video_out_xxmc.c:2627
 msgid ""
 "When interlacing is enabled for hardware accelerated frames,\n"
 "Alternate between top and bottom field at double the frame rate.\n"
@@ -3823,11 +3843,11 @@ msgstr ""
 msgid "x11osd: unscaled overlay created (%s mode).\n"
 msgstr ""
 
-#: src/xine-engine/alphablend.c:2123
+#: src/xine-engine/alphablend.c:2146
 msgid "disable exact alpha blending of overlays"
 msgstr ""
 
-#: src/xine-engine/alphablend.c:2124
+#: src/xine-engine/alphablend.c:2147
 msgid ""
 "If you experience a performance impact when an On Screen Display or other "
 "overlays like DVD subtitles are active, then you might want to enable this "
@@ -4361,70 +4381,70 @@ msgid ""
 "foreground-border-background."
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:380
+#: src/xine-engine/video_decoder.c:390
 #, c-format
 msgid "video_decoder: no plugin available to handle '%s'\n"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:459
+#: src/xine-engine/video_decoder.c:469
 #, c-format
 msgid "video_decoder: error, unknown buffer type: %08x\n"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:495
+#: src/xine-engine/video_decoder.c:505
 msgid "number of video buffers"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:496
+#: src/xine-engine/video_decoder.c:506
 msgid ""
 "The number of video buffers (each is 8k in size) xine uses in its internal "
 "queue. Higher values mean smoother playback for unreliable inputs, but also "
 "increased latency and memory consumption."
 msgstr ""
 
-#: src/xine-engine/video_out.c:642
+#: src/xine-engine/video_out.c:671
 #, c-format
 msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
 msgstr ""
 
-#: src/xine-engine/video_out.c:815
+#: src/xine-engine/video_out.c:844
 #, c-format
 msgid ""
 "video_out: throwing away image with pts %<PRId64> because it's too old "
 "(diff : %<PRId64>).\n"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1794
+#: src/xine-engine/video_out.c:1863
 msgid "default number of video frames"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1795
+#: src/xine-engine/video_out.c:1864
 msgid ""
 "The default number of video frames to request from xine video out driver. "
 "Some drivers will override this setting with their own values."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1834
+#: src/xine-engine/video_out.c:1921
 msgid "percentage of skipped frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1835
+#: src/xine-engine/video_out.c:1922
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not decoded in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1840
+#: src/xine-engine/video_out.c:1927
 msgid "percentage of discarded frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1841
+#: src/xine-engine/video_out.c:1928
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not scheduled for display in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1875
+#: src/xine-engine/video_out.c:1965
 msgid "video_out: sorry, this should not happen. please restart xine.\n"
 msgstr ""
 
@@ -4467,127 +4487,127 @@ msgid ""
 "accelerated, this can dramatically reduce CPU usage."
 msgstr ""
 
-#: src/xine-engine/xine.c:706 src/xine-engine/xine.c:813
-#: src/xine-engine/xine.c:852 src/xine-engine/xine.c:888
-#: src/xine-engine/xine.c:900 src/xine-engine/xine.c:913
-#: src/xine-engine/xine.c:926 src/xine-engine/xine.c:939
-#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:990
-#: src/xine-engine/xine.c:1025
+#: src/xine-engine/xine.c:771 src/xine-engine/xine.c:878
+#: src/xine-engine/xine.c:917 src/xine-engine/xine.c:953
+#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:978
+#: src/xine-engine/xine.c:991 src/xine-engine/xine.c:1004
+#: src/xine-engine/xine.c:1030 src/xine-engine/xine.c:1055
+#: src/xine-engine/xine.c:1090
 msgid "xine: error while parsing mrl\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:742
+#: src/xine-engine/xine.c:807
 #, c-format
 msgid "xine: found input plugin  : %s\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:760
+#: src/xine-engine/xine.c:825
 #, c-format
 msgid "xine: input plugin cannot open MRL [%s]\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:776
+#: src/xine-engine/xine.c:841
 #, c-format
 msgid "xine: cannot find input plugin for MRL [%s]\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:802
+#: src/xine-engine/xine.c:867
 #, c-format
 msgid "xine: specified demuxer %s failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:838
+#: src/xine-engine/xine.c:903
 #, c-format
 msgid "xine: join rip input plugin\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:845
+#: src/xine-engine/xine.c:910
 msgid "xine: error opening rip input plugin instance\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:876
+#: src/xine-engine/xine.c:941
 #, c-format
 msgid "xine: last_probed demuxer %s failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:905
+#: src/xine-engine/xine.c:970
 msgid "ignoring video\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:918
+#: src/xine-engine/xine.c:983
 msgid "ignoring audio\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:931
+#: src/xine-engine/xine.c:996
 msgid "ignoring subpicture\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:944
+#: src/xine-engine/xine.c:1009
 msgid "input cache plugin disabled\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1015
+#: src/xine-engine/xine.c:1080
 #, c-format
 msgid "subtitle mrl opened '%s'\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1019
+#: src/xine-engine/xine.c:1084
 msgid "xine: error opening subtitle mrl\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1051
+#: src/xine-engine/xine.c:1116
 #, c-format
 msgid "xine: error while parsing MRL\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1058
+#: src/xine-engine/xine.c:1123
 #, c-format
 msgid "xine: changing option '%s' from MRL isn't permitted\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1078
+#: src/xine-engine/xine.c:1143
 #, c-format
 msgid "xine: couldn't find demux for >%s<\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1094
+#: src/xine-engine/xine.c:1159
 #, c-format
 msgid "xine: found demuxer plugin: %s\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1114
+#: src/xine-engine/xine.c:1179
 #, c-format
 msgid "xine: demuxer failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1179
+#: src/xine-engine/xine.c:1244
 #, c-format
 msgid "xine_play: no demux available\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1249
+#: src/xine-engine/xine.c:1314
 #, c-format
 msgid "xine_play: demux failed to start\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1527
+#: src/xine-engine/xine.c:1592
 #, c-format
 msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1532
+#: src/xine-engine/xine.c:1597
 msgid "The specified save_dir might be a security risk."
 msgstr ""
 
-#: src/xine-engine/xine.c:1561
+#: src/xine-engine/xine.c:1626
 msgid "xine: locale not supported by C library\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1570
+#: src/xine-engine/xine.c:1635
 msgid "media format detection strategy"
 msgstr ""
 
-#: src/xine-engine/xine.c:1571
+#: src/xine-engine/xine.c:1636
 msgid ""
 "xine offers various methods to detect the media format of input to play. The "
 "individual values are:\n"
@@ -4605,11 +4625,11 @@ msgid ""
 "Detect by file name extension only.\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1589
+#: src/xine-engine/xine.c:1654
 msgid "directory for saving streams"
 msgstr ""
 
-#: src/xine-engine/xine.c:1590
+#: src/xine-engine/xine.c:1655
 msgid ""
 "When using the stream save feature, files will be written only into this "
 "directory.\n"
@@ -4619,11 +4639,11 @@ msgid ""
 "content in any file."
 msgstr ""
 
-#: src/xine-engine/xine.c:1601
+#: src/xine-engine/xine.c:1666
 msgid "allow implicit changes to the configuration (e.g. by MRL)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1602
+#: src/xine-engine/xine.c:1667
 msgid ""
 "If enabled, you allow xine to change your configuration without explicit "
 "actions from your side. For example configuration changes demanded by MRLs "
@@ -4633,26 +4653,26 @@ msgid ""
 "configuration, you might end with a totally messed up xine."
 msgstr ""
 
-#: src/xine-engine/xine.c:1616
+#: src/xine-engine/xine.c:1681
 msgid "Timeout for network stream reading (in seconds)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1617
+#: src/xine-engine/xine.c:1682
 msgid ""
 "Specifies the timeout when reading from network streams, in seconds. Too low "
 "values might stop streaming when the source is slow or the bandwidth is "
 "occupied, too high values will freeze the player if the connection is lost."
 msgstr ""
 
-#: src/xine-engine/xine.c:1969
+#: src/xine-engine/xine.c:2034
 msgid "messages"
 msgstr ""
 
-#: src/xine-engine/xine.c:1970
+#: src/xine-engine/xine.c:2035
 msgid "plugin"
 msgstr ""
 
-#: src/xine-engine/xine.c:1971
+#: src/xine-engine/xine.c:2036
 msgid "trace"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 84326748a..18c82e5f1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pl_PL\n"
 "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-04-24 21:48+0100\n"
+"POT-Creation-Date: 2007-06-02 13:14+0200\n"
 "PO-Revision-Date: 2003-05-24 12:36+0200\n"
 "Last-Translator: Bartłomiej Muryn <_4ever_@irc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -761,6 +761,13 @@ msgid "xine audio output plugin using sun-compliant audio devices/drivers"
 msgstr ""
 "wtyczka wyjścia dźwięku xine kompatybilna z urządzeniami/sterownikami sun"
 
+#: src/combined/xine_ogg_demuxer.c:810
+#, c-format
+msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+msgstr ""
+"ogg: ścieżka oznaczona jako vorbis ale nie znaleziono nagłówka strumienia "
+"vorbis.\n"
+
 #: src/demuxers/demux_asf.c:428
 #, c-format
 msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
@@ -901,13 +908,6 @@ msgstr ""
 "nieznany typ kompresji VOC (0x%02X); proszę skontaktować się z programistami "
 "xine\n"
 
-#: src/demuxers/demux_ogg.c:802
-#, c-format
-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
-msgstr ""
-"ogg: ścieżka oznaczona jako vorbis ale nie znaleziono nagłówka strumienia "
-"vorbis.\n"
-
 #: src/demuxers/demux_snd.c:104
 #, c-format
 msgid "demux_snd: bad header parameters\n"
@@ -949,18 +949,6 @@ msgstr ""
 msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
 msgstr "demux_wc3movie: Wystąpił problem przy ładowaniu fragmentów palety\n"
 
-# src/dxr3/dxr3.h:33
-#: src/dxr3/dxr3.h:32
-#, fuzzy
-msgid "DXR3 device number"
-msgstr "dxr3: nazwa urzÄ…dzenia"
-
-#: src/dxr3/dxr3.h:33
-msgid ""
-"If you have more than one DXR3 in your computer, you can specify which one "
-"to use here."
-msgstr ""
-
 #: src/dxr3/dxr3_decode_spu.c:253
 #, c-format
 msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
@@ -1058,6 +1046,18 @@ msgid ""
 "dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
 msgstr ""
 
+# src/dxr3/dxr3.h:33
+#: src/dxr3/dxr3.h:32
+#, fuzzy
+msgid "DXR3 device number"
+msgstr "dxr3: nazwa urzÄ…dzenia"
+
+#: src/dxr3/dxr3.h:33
+msgid ""
+"If you have more than one DXR3 in your computer, you can specify which one "
+"to use here."
+msgstr ""
+
 #: src/dxr3/dxr3_mpeg_encoders.c:125
 msgid "dxr3_mpeg_encoder: failed to init librte\n"
 msgstr ""
@@ -1342,43 +1342,43 @@ msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
 msgstr ""
 
 # src/input/input_http.c:134
-#: src/input/input_cdda.c:1608
+#: src/input/input_cdda.c:1611
 #, fuzzy, c-format
 msgid "%s: can't connect to %s:%d\n"
 msgstr "http: nie mogę się podłączyć do >%s<\n"
 
-#: src/input/input_cdda.c:1655
+#: src/input/input_cdda.c:1658
 #, c-format
 msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
 msgstr ""
 
 # src/input/input_net.c:138
-#: src/input/input_cdda.c:1660
+#: src/input/input_cdda.c:1663
 #, fuzzy, c-format
 msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
 msgstr "input_net: nie mogę podłączyć się do '%s'.\n"
 
-#: src/input/input_cdda.c:2690
+#: src/input/input_cdda.c:2693
 msgid "CD Digital Audio (aka. CDDA)"
 msgstr ""
 
 # src/audio_out/audio_alsa_out.c:201 src/audio_out/audio_alsa_out.c:927
-#: src/input/input_cdda.c:2742
+#: src/input/input_cdda.c:2745
 #, fuzzy
 msgid "device used for CD audio"
 msgstr "urządzenie użyte do wyjścia 4-kanałowego"
 
-#: src/input/input_cdda.c:2743
+#: src/input/input_cdda.c:2746
 msgid ""
 "The path to the device, usually a CD or DVD drive, which you intend to use "
 "for playing audio CDs."
 msgstr ""
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid "query CDDB"
 msgstr ""
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid ""
 "Enables CDDB queries, which will give you convenient title and track names "
 "for your audio CDs.\n"
@@ -1387,11 +1387,11 @@ msgid ""
 "listening habits."
 msgstr ""
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid "CDDB server name"
 msgstr ""
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid ""
 "The CDDB server used to retrieve the title and track information from.\n"
 "This setting is security critical, because the sever will receive "
@@ -1399,19 +1399,19 @@ msgid ""
 "malicious replies. Be sure to enter a server you can trust."
 msgstr ""
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "CDDB server port"
 msgstr ""
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "The server port used to retrieve the title and track information from."
 msgstr ""
 
-#: src/input/input_cdda.c:2771
+#: src/input/input_cdda.c:2774
 msgid "slow down disc drive to this speed factor"
 msgstr ""
 
-#: src/input/input_cdda.c:2772
+#: src/input/input_cdda.c:2775
 msgid ""
 "Since some CD or DVD drives make some really loud noises because of the fast "
 "disc rotation, xine will try to slow them down. With standard CD or DVD "
@@ -1421,129 +1421,135 @@ msgid ""
 msgstr ""
 
 # src/input/input_http.c:98
-#: src/input/input_dvb.c:899
+#: src/input/input_dvb.c:900
 #, fuzzy, c-format
 msgid "input_dvb: failed to open dvb channel file '%s': %s\n"
 msgstr "input_http: otwarcie gniazda zawiodło\n"
 
 # src/input/input_http.c:98
-#: src/input/input_dvb.c:905
+#: src/input/input_dvb.c:906
 #, fuzzy, c-format
 msgid "input_dvb: dvb channel file '%s' is not a plain file\n"
 msgstr "input_http: otwarcie gniazda zawiodło\n"
 
-#: src/input/input_dvb.c:2115 src/input/input_dvb.c:2943
+#: src/input/input_dvb.c:2116 src/input/input_dvb.c:2948
 msgid "input_dvb: tuner_set_channel failed\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2743
+#: src/input/input_dvb.c:2748
 msgid "input_dvb: cannot open dvb device\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2767
+#: src/input/input_dvb.c:2772
 #, c-format
 msgid "input_dvb: channel %d out of range, defaulting to 0\n"
 msgstr ""
 
 # src/input/input_http.c:98
-#: src/input/input_dvb.c:2778
+#: src/input/input_dvb.c:2783
 #, fuzzy, c-format
 msgid "input_dvb: searching for channel %s\n"
 msgstr "input_http: otwarcie gniazda zawiodło\n"
 
-#: src/input/input_dvb.c:2801
+#: src/input/input_dvb.c:2806
 #, c-format
 msgid "input_dvb: exact match for %s not found: trying partial matches\n"
 msgstr ""
 
 # src/input/input_http.c:98
-#: src/input/input_dvb.c:2808
+#: src/input/input_dvb.c:2813
 #, fuzzy, c-format
 msgid "input_dvb: found matching channel %s\n"
 msgstr "input_http: otwarcie gniazda zawiodło\n"
 
-#: src/input/input_dvb.c:2821
+#: src/input/input_dvb.c:2826
 #, c-format
 msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2827
+#: src/input/input_dvb.c:2832
 msgid ""
 "input_dvb: invalid channel specification, defaulting to last viewed "
 "channel.\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2833
+#: src/input/input_dvb.c:2838
 msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2845
+#: src/input/input_dvb.c:2850
 msgid ""
 "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
 "S)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2865
+#: src/input/input_dvb.c:2870
 msgid ""
 "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
 "T)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2888 src/input/input_dvb.c:2914
+#: src/input/input_dvb.c:2893
 msgid ""
 "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
 "C)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2949
+#: src/input/input_dvb.c:2919
+msgid ""
+"input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-"
+"A)\n"
+msgstr ""
+
+#: src/input/input_dvb.c:2954
 #, c-format
 msgid "input_dvb: cannot open dvr device '%s'\n"
 msgstr ""
 
 # src/input/input_rtp.c:339
-#: src/input/input_dvb.c:2971
+#: src/input/input_dvb.c:2976
 #, fuzzy
 msgid "input_dvb: cannot create EPG updater thread\n"
 msgstr "input_rtp: nie mogę utworzyć nowego wątku (%s)\n"
 
-#: src/input/input_dvb.c:3033
+#: src/input/input_dvb.c:3038
 msgid "use DVB 'center cutout' (zoom)"
 msgstr ""
 
-#: src/input/input_dvb.c:3034
+#: src/input/input_dvb.c:3039
 msgid ""
 "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
 "frame."
 msgstr ""
 
-#: src/input/input_dvb.c:3127
+#: src/input/input_dvb.c:3132
 #, fuzzy
 msgid "DVB (Digital TV) input plugin"
 msgstr "wtyczka wejścia pliku"
 
-#: src/input/input_dvb.c:3244
+#: src/input/input_dvb.c:3249
 msgid "Remember last DVB channel watched"
 msgstr ""
 
-#: src/input/input_dvb.c:3245
+#: src/input/input_dvb.c:3250
 msgid ""
 "On autoplay, xine will remember and switch to the channel indicated in media."
 "dvb.last_channel. "
 msgstr ""
 
-#: src/input/input_dvb.c:3252
+#: src/input/input_dvb.c:3257
 msgid "Last DVB channel viewed"
 msgstr ""
 
-#: src/input/input_dvb.c:3253
+#: src/input/input_dvb.c:3258
 msgid "If enabled xine will remember and switch to this channel. "
 msgstr ""
 
-#: src/input/input_dvb.c:3259
+#: src/input/input_dvb.c:3264
 msgid "Number of dvb card to use."
 msgstr ""
 
-#: src/input/input_dvb.c:3260
+#: src/input/input_dvb.c:3265
 msgid ""
 "Leave this at zero unless you really have more than 1 card in your system."
 msgstr ""
@@ -1742,94 +1748,94 @@ msgid "gnome-vfs input plugin as shipped with xine"
 msgstr "wtyczka wejścia net dostarczana z xine"
 
 # src/input/input_rtp.c:339
-#: src/input/input_http.c:174
+#: src/input/input_http.c:176
 #, fuzzy, c-format
 msgid "input_http: gethostbyname(%s) failed: %s\n"
 msgstr "input_rtp: nie mogę utworzyć nowego wątku (%s)\n"
 
 # src/input/input_http.c:416 src/input/input_http.c:537
-#: src/input/input_http.c:400 src/input/input_http.c:943
+#: src/input/input_http.c:402 src/input/input_http.c:957
 #, c-format
 msgid "input_http: read error %d\n"
 msgstr "input_http: błąd odczytu %d\n"
 
-#: src/input/input_http.c:627
+#: src/input/input_http.c:629
 msgid "Connecting HTTP server..."
 msgstr ""
 
 # src/input/input_http.c:445
-#: src/input/input_http.c:819
+#: src/input/input_http.c:820
 #, c-format
 msgid "input_http: invalid http answer\n"
 msgstr "input_http: błędna odpowiedź http\n"
 
 # src/input/input_http.c:450
-#: src/input/input_http.c:825
+#: src/input/input_http.c:826
 #, c-format
 msgid "input_http: 3xx redirection: >%d %s<\n"
 msgstr "input_http: przekierowanie 3xx: >%d %s<\n"
 
 # src/input/input_http.c:455
-#: src/input/input_http.c:830 src/input/input_http.c:836
-#: src/input/input_http.c:843
+#: src/input/input_http.c:831 src/input/input_http.c:836
+#: src/input/input_http.c:842 src/input/input_http.c:849
 #, c-format
 msgid "input_http: http status not 2xx: >%d %s<\n"
 msgstr "input_http: status http nie jest 2xx: >%d %s<\n"
 
 # src/input/input_http.c:464
-#: src/input/input_http.c:853
+#: src/input/input_http.c:859
 #, fuzzy, c-format
 msgid "input_http: content length = %<PRIdMAX> bytes\n"
 msgstr "input_http: długość zawartości = %Ld bytes\n"
 
 # src/input/input_http.c:416 src/input/input_http.c:537
-#: src/input/input_http.c:922
+#: src/input/input_http.c:932
 #, fuzzy, c-format
 msgid "input_http: buffer exhausted after %d bytes."
 msgstr "input_http: błąd odczytu %d\n"
 
 # src/input/input_http.c:640
-#: src/input/input_http.c:996
+#: src/input/input_http.c:1010
 msgid "http input plugin"
 msgstr "wtyczka wejścia http"
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "HTTP proxy host"
 msgstr ""
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "The hostname of the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "HTTP proxy port"
 msgstr ""
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "The port number of the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1076
+#: src/input/input_http.c:1090
 msgid "HTTP proxy username"
 msgstr ""
 
-#: src/input/input_http.c:1077
+#: src/input/input_http.c:1091
 msgid "The user name for the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1080
+#: src/input/input_http.c:1094
 msgid "HTTP proxy password"
 msgstr ""
 
-#: src/input/input_http.c:1081
+#: src/input/input_http.c:1095
 msgid "The password for the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1084
+#: src/input/input_http.c:1098
 msgid "Domains for which to ignore the HTTP proxy"
 msgstr ""
 
-#: src/input/input_http.c:1085
+#: src/input/input_http.c:1099
 msgid ""
 "A comma-separated list of domain names for which the proxy is to be "
 "ignored.\n"
@@ -2064,40 +2070,40 @@ msgstr "Buforowanie..."
 msgid "Adjusting..."
 msgstr ""
 
-#: src/input/input_v4l.c:660
+#: src/input/input_v4l.c:658
 msgid "Tuner name not found\n"
 msgstr ""
 
-#: src/input/input_v4l.c:1876
+#: src/input/input_v4l.c:1874
 #, fuzzy
 msgid "v4l tv input plugin"
 msgstr "wtyczka wejścia pliku"
 
-#: src/input/input_v4l.c:1880
+#: src/input/input_v4l.c:1878
 #, fuzzy
 msgid "v4l radio input plugin"
 msgstr "wtyczka wejścia pliku"
 
 # src/input/input_vcd.c:1184
-#: src/input/input_v4l.c:1912
+#: src/input/input_v4l.c:1910
 #, fuzzy
 msgid "v4l video device"
 msgstr "ścieżka dostępu do pliku lokalnego urządzenia vcd"
 
 # src/input/input_vcd.c:1184
-#: src/input/input_v4l.c:1913
+#: src/input/input_v4l.c:1911
 #, fuzzy
 msgid "The path to your Video4Linux video device."
 msgstr "ścieżka dostępu do pliku lokalnego urządzenia vcd"
 
 # src/input/input_vcd.c:1184
-#: src/input/input_v4l.c:1938
+#: src/input/input_v4l.c:1936
 #, fuzzy
 msgid "v4l radio device"
 msgstr "ścieżka dostępu do pliku lokalnego urządzenia vcd"
 
 # src/input/input_vcd.c:1184
-#: src/input/input_v4l.c:1939
+#: src/input/input_v4l.c:1937
 #, fuzzy
 msgid "The path to your Video4Linux radio device."
 msgstr "ścieżka dostępu do pliku lokalnego urządzenia vcd"
@@ -2274,110 +2280,110 @@ msgstr ""
 msgid "Should have converted this above"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:191
+#: src/input/vcd/xineplug_inp_vcd.c:192
 msgid "failed to find a device with a VCD"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:328
+#: src/input/vcd/xineplug_inp_vcd.c:329
 msgid "was passed a null class parameter"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:972
+#: src/input/vcd/xineplug_inp_vcd.c:982
 msgid "Invalid current entry type"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:996
+#: src/input/vcd/xineplug_inp_vcd.c:1006
 msgid ""
 "Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1097
+#: src/input/vcd/xineplug_inp_vcd.c:1107
 msgid "selection has no RETURN entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1126
+#: src/input/vcd/xineplug_inp_vcd.c:1136
 msgid "DEFAULT selected, but PBC is not on."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1131
+#: src/input/vcd/xineplug_inp_vcd.c:1141
 msgid "selection has no NEXT entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1139
+#: src/input/vcd/xineplug_inp_vcd.c:1149
 msgid "selection has no PREVIOUS entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1146
+#: src/input/vcd/xineplug_inp_vcd.c:1156
 msgid "Unknown event type: "
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1446 src/input/vcd/xineplug_inp_vcd.c:1493
+#: src/input/vcd/xineplug_inp_vcd.c:1452 src/input/vcd/xineplug_inp_vcd.c:1499
 msgid "The above message had unknown vcdimager log level"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1824
+#: src/input/vcd/xineplug_inp_vcd.c:1830
 msgid "VCD default type to use on autoplay"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1825
+#: src/input/vcd/xineplug_inp_vcd.c:1831
 msgid ""
 "The VCD play unit to use when none is specified in an MRL, e.g. vcd:// or "
 "vcd:///dev/dvd:"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1835
+#: src/input/vcd/xineplug_inp_vcd.c:1841
 msgid "CD-ROM drive used for VCD when none given"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1836
+#: src/input/vcd/xineplug_inp_vcd.c:1842
 msgid ""
 "What to use if no drive specified. If the setting is empty, xine will scan "
 "for CD drives."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1846
+#: src/input/vcd/xineplug_inp_vcd.c:1852
 msgid "VCD position slider range"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1847
+#: src/input/vcd/xineplug_inp_vcd.c:1853
 msgid ""
 "range that the stream playback position slider represents playing a VCD."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1855
+#: src/input/vcd/xineplug_inp_vcd.c:1861
 msgid "VCD read-ahead caching?"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1856
+#: src/input/vcd/xineplug_inp_vcd.c:1862
 msgid "Class may lead to jerky playback on low-end machines."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1866
+#: src/input/vcd/xineplug_inp_vcd.c:1872
 msgid "automatically advance VCD track/entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1867
+#: src/input/vcd/xineplug_inp_vcd.c:1873
 msgid ""
 "If enabled, we should automatically advance to the next entry or track. Used "
 "only when playback control (PBC) is disabled."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1876
+#: src/input/vcd/xineplug_inp_vcd.c:1882
 msgid "show 'rejected' VCD LIDs"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1877
+#: src/input/vcd/xineplug_inp_vcd.c:1883
 msgid ""
 "Some playback list IDs (LIDs) are marked not showable, but you can see them "
 "in the MRL list if this is set. Rejected entries are marked with an asterisk "
 "(*) appended to the MRL."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1888
+#: src/input/vcd/xineplug_inp_vcd.c:1894
 msgid "VCD format string for display banner"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1889
+#: src/input/vcd/xineplug_inp_vcd.c:1895
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are:\n"
@@ -2398,11 +2404,11 @@ msgid ""
 " %% : a %\n"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1914
+#: src/input/vcd/xineplug_inp_vcd.c:1920
 msgid "VCD format string for stream comment field"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1915
+#: src/input/vcd/xineplug_inp_vcd.c:1921
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
@@ -2410,11 +2416,11 @@ msgid ""
 "See the help for the title_format for the meanings of these."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1927
+#: src/input/vcd/xineplug_inp_vcd.c:1933
 msgid "VCD debug flag mask"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1928
+#: src/input/vcd/xineplug_inp_vcd.c:1934
 msgid ""
 "For tracking down bugs in the VCD plugin. Mask values are:\n"
 "   1: Meta information\n"
@@ -2431,63 +2437,6 @@ msgid ""
 "2048: Debugging from VCDINFO\n"
 msgstr ""
 
-#: src/liba52/xine_a52_decoder.c:742 src/libxineadec/xine_dts_decoder.c:524
-msgid "HELP! a mono-only audio driver?!\n"
-msgstr ""
-
-# src/xine-engine/audio_out.c:868
-#: src/liba52/xine_a52_decoder.c:805
-#, fuzzy
-msgid "A/52 volume"
-msgstr "głośność dźwięku"
-
-#: src/liba52/xine_a52_decoder.c:806
-msgid ""
-"With A/52 audio, you can modify the volume at the decoder level. This has "
-"the advantage of the audio being already decoded for the specified volume, "
-"so later operations like channel downmixing will work on an audio stream of "
-"the given volume."
-msgstr ""
-
-# src/liba52/xine_decoder.c:577
-#: src/liba52/xine_a52_decoder.c:814
-#, fuzzy
-msgid "use A/52 dynamic range compression"
-msgstr "włączanie dynamicznego zakresu kompensacji a/52"
-
-#: src/liba52/xine_a52_decoder.c:815
-msgid ""
-"Dynamic range compression limits the dynamic range of the audio. This means "
-"making the loud sounds softer, and the soft sounds louder, so you can more "
-"easily listen to the audio in a noisy environment without disturbing anyone."
-msgstr ""
-
-# src/liba52/xine_decoder.c:580
-#: src/liba52/xine_a52_decoder.c:822
-#, fuzzy
-msgid "downmix audio to 2 channel surround stereo"
-msgstr "włącz redukcję dźwięku do 2.0 surround stereo"
-
-#: src/liba52/xine_a52_decoder.c:823
-msgid ""
-"When you want to listen to multichannel surround sound, but you have only "
-"two speakers or a surround decoder or amplifier which does some sort of "
-"matrix surround decoding like prologic, you should enable this option so "
-"that the additional channels are mixed into the stereo signal."
-msgstr ""
-
-#: src/libfaad/xine_faad_decoder.c:131
-msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
-msgstr ""
-
-#: src/libfaad/xine_faad_decoder.c:140
-msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
-msgstr ""
-
-#: src/libfaad/xine_faad_decoder.c:151
-msgid "libfaad: libfaad NeAACDecInit failed.\n"
-msgstr ""
-
 #: src/libffmpeg/ff_audio_decoder.c:122
 #, c-format
 msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
@@ -2511,46 +2460,6 @@ msgstr ""
 msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
 msgstr ""
 
-#: src/libffmpeg/ff_video_decoder.c:155
-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:173
-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:333
-#, c-format
-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:362
-msgid "ffmpeg_video_dec: couldn't open decoder\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:397
-msgid "ffmpeg_video_dec: direct rendering enabled\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:816
-#, c-format
-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:1514
-#, fuzzy
-msgid "MPEG-4 postprocessing quality"
-msgstr "jakość post-przetwarzania ffmpeg mpeg-4"
-
-#: src/libffmpeg/ff_video_decoder.c:1515
-msgid ""
-"You can adjust the amount of post processing applied to MPEG-4 video.\n"
-"Higher values result in better quality, but need more CPU. Lower values may "
-"result in image defects like block artifacts. For high quality content, too "
-"heavy post processing can actually make the image worse by blurring it too "
-"much."
-msgstr ""
-
 # src/dxr3/dxr3_mpeg_encoders.c:182
 #: src/libffmpeg/ffmpeg_encoder.c:163
 #, fuzzy
@@ -2591,23 +2500,44 @@ msgstr ""
 msgid "The maximum compression to apply to an image in constant quality mode."
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:249
+#: src/libffmpeg/ff_video_decoder.c:155
+msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:173
+msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:333
 #, c-format
-msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:323
-msgid "libmusepack: data after last frame ignored\n"
+#: src/libffmpeg/ff_video_decoder.c:362
+msgid "ffmpeg_video_dec: couldn't open decoder\n"
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:334
-msgid "libmusepack: mpc_decoder_initialise failed\n"
+#: src/libffmpeg/ff_video_decoder.c:397
+msgid "ffmpeg_video_dec: direct rendering enabled\n"
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:354
-#: src/libxineadec/xine_musepack_decoder.c:369
+#: src/libffmpeg/ff_video_decoder.c:816
 #, c-format
-msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:1519
+#, fuzzy
+msgid "MPEG-4 postprocessing quality"
+msgstr "jakość post-przetwarzania ffmpeg mpeg-4"
+
+#: src/libffmpeg/ff_video_decoder.c:1520
+msgid ""
+"You can adjust the amount of post processing applied to MPEG-4 video.\n"
+"Higher values result in better quality, but need more CPU. Lower values may "
+"result in image defects like block artifacts. For high quality content, too "
+"heavy post processing can actually make the image worse by blurring it too "
+"much."
 msgstr ""
 
 # src/libw32dll/w32codec.c:1404 src/libw32dll/w32codec.c:1453
@@ -2625,10 +2555,6 @@ msgid ""
 "information on how to install the codecs."
 msgstr ""
 
-#: src/libreal/xine_real_video_decoder.c:164
-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
-msgstr ""
-
 #: src/libreal/xine_real_audio_decoder.c:130
 #, c-format
 msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
@@ -2648,6 +2574,10 @@ msgstr ""
 msgid "libareal: oups, real can do more than 2 channels ?\n"
 msgstr ""
 
+#: src/libreal/xine_real_video_decoder.c:164
+msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+msgstr ""
+
 # src/libspucc/xine_decoder.c:220
 #: src/libspucc/xine_cc_decoder.c:192
 #, fuzzy
@@ -2886,6 +2816,83 @@ msgstr ""
 msgid "w32codec: Error initializing DMO Audio\n"
 msgstr ""
 
+#: src/libxineadec/xine_a52_decoder.c:742
+#: src/libxineadec/xine_dts_decoder.c:524
+msgid "HELP! a mono-only audio driver?!\n"
+msgstr ""
+
+# src/xine-engine/audio_out.c:868
+#: src/libxineadec/xine_a52_decoder.c:805
+#, fuzzy
+msgid "A/52 volume"
+msgstr "głośność dźwięku"
+
+#: src/libxineadec/xine_a52_decoder.c:806
+msgid ""
+"With A/52 audio, you can modify the volume at the decoder level. This has "
+"the advantage of the audio being already decoded for the specified volume, "
+"so later operations like channel downmixing will work on an audio stream of "
+"the given volume."
+msgstr ""
+
+# src/liba52/xine_decoder.c:577
+#: src/libxineadec/xine_a52_decoder.c:814
+#, fuzzy
+msgid "use A/52 dynamic range compression"
+msgstr "włączanie dynamicznego zakresu kompensacji a/52"
+
+#: src/libxineadec/xine_a52_decoder.c:815
+msgid ""
+"Dynamic range compression limits the dynamic range of the audio. This means "
+"making the loud sounds softer, and the soft sounds louder, so you can more "
+"easily listen to the audio in a noisy environment without disturbing anyone."
+msgstr ""
+
+# src/liba52/xine_decoder.c:580
+#: src/libxineadec/xine_a52_decoder.c:822
+#, fuzzy
+msgid "downmix audio to 2 channel surround stereo"
+msgstr "włącz redukcję dźwięku do 2.0 surround stereo"
+
+#: src/libxineadec/xine_a52_decoder.c:823
+msgid ""
+"When you want to listen to multichannel surround sound, but you have only "
+"two speakers or a surround decoder or amplifier which does some sort of "
+"matrix surround decoding like prologic, you should enable this option so "
+"that the additional channels are mixed into the stereo signal."
+msgstr ""
+
+#: src/libxineadec/xine_faad_decoder.c:130
+msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
+msgstr ""
+
+#: src/libxineadec/xine_faad_decoder.c:139
+msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
+msgstr ""
+
+#: src/libxineadec/xine_faad_decoder.c:150
+msgid "libfaad: libfaad NeAACDecInit failed.\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:249
+#, c-format
+msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:323
+msgid "libmusepack: data after last frame ignored\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:334
+msgid "libmusepack: mpc_decoder_initialise failed\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:354
+#: src/libxineadec/xine_musepack_decoder.c:369
+#, c-format
+msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgstr ""
+
 #: src/libxinevdec/bitplane.c:1272
 #, c-format
 msgid "bitplane: error doing ByteRun1 decompression\n"
@@ -3100,22 +3107,6 @@ msgid ""
 "* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
 msgstr ""
 
-#: src/post/planar/eq.c:186
-msgid ""
-"Software equalizer with interactive controls just like the hardware "
-"equalizer, for cards/drivers that do not support brightness and contrast "
-"controls in hardware.\n"
-"\n"
-"Parameters\n"
-"  brightness\n"
-"  contrast\n"
-"\n"
-"Note: It is possible to use frontend's control window to set these "
-"parameters.\n"
-"\n"
-"* mplayer's eq (C) Richard Felker\n"
-msgstr ""
-
 #: src/post/planar/eq2.c:359
 msgid ""
 "Alternative software equalizer that uses lookup tables (very slow), allowing "
@@ -3140,6 +3131,22 @@ msgid ""
 "* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
 msgstr ""
 
+#: src/post/planar/eq.c:186
+msgid ""
+"Software equalizer with interactive controls just like the hardware "
+"equalizer, for cards/drivers that do not support brightness and contrast "
+"controls in hardware.\n"
+"\n"
+"Parameters\n"
+"  brightness\n"
+"  contrast\n"
+"\n"
+"Note: It is possible to use frontend's control window to set these "
+"parameters.\n"
+"\n"
+"* mplayer's eq (C) Richard Felker\n"
+msgstr ""
+
 #: src/post/planar/expand.c:251
 msgid ""
 "The expand plugin is meant to take frames of arbitrary aspect ratio and "
@@ -3215,6 +3222,68 @@ msgid ""
 "* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
 msgstr ""
 
+#: src/vdr/input_vdr.c:183 src/vdr/input_vdr.c:223 src/vdr/input_vdr.c:2297
+#: src/vdr/input_vdr.c:2394
+#, c-format
+msgid ": input event write: %s.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:713 src/vdr/input_vdr.c:1137
+msgid ": buffer_pool_alloc() failed!\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:782
+#, c-format
+msgid ": flush buffers (vb: %d, ab: %d, vf: %d, af: %d) %s.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1475
+#, c-format
+msgid ": shutting down rpc thread (timeout: %d ms) ...\n"
+msgstr ""
+
+# src/xine-engine/video_out.c:890
+#: src/vdr/input_vdr.c:1499
+#, fuzzy, c-format
+msgid ": cancelling rpc thread in function %d...\n"
+msgstr "video_out: nie mogę utworzyć wątku (%s)\n"
+
+#: src/vdr/input_vdr.c:1506
+#, fuzzy
+msgid ": joining rpc thread ...\n"
+msgstr "RTP: zatrzymuje odczyt wÄ…tku...\n"
+
+#: src/vdr/input_vdr.c:1508
+#, fuzzy
+msgid ": rpc thread joined.\n"
+msgstr "RTP: odczyt wątku zakończony\n"
+
+# src/input/input_http.c:98
+#: src/vdr/input_vdr.c:2137 src/vdr/input_vdr.c:2151 src/vdr/input_vdr.c:2169
+#: src/vdr/input_vdr.c:2190 src/vdr/input_vdr.c:2211
+#, fuzzy, c-format
+msgid ": failed to open '%s' (%s)\n"
+msgstr "input_http: otwarcie gniazda zawiodło\n"
+
+#: src/vdr/input_vdr.c:2153
+msgid "timeout expired during setup phase"
+msgstr ""
+
+# src/input/input_rtp.c:339
+#: src/vdr/input_vdr.c:2227
+#, fuzzy, c-format
+msgid ": can't create new thread (%s)\n"
+msgstr "input_rtp: nie mogę utworzyć nowego wątku (%s)\n"
+
+#: src/vdr/input_vdr.c:2487
+msgid "VDR display device plugin"
+msgstr ""
+
+#: src/vdr/post_vdr_video.c:435
+#, c-format
+msgid ": osd: (%d, %d)-(%d, %d)@%lg\n"
+msgstr ""
+
 # src/video_out/video_out_aa.c:307
 #: src/video_out/video_out_aa.c:311
 msgid "xine video output plugin using the ascii-art library"
@@ -3475,8 +3544,8 @@ msgid ""
 msgstr ""
 
 #: src/video_out/video_out_opengl.c:1918 src/video_out/video_out_vidix.c:1015
-#: src/video_out/video_out_xcbxv.c:1476 src/video_out/video_out_xv.c:1489
-#: src/video_out/video_out_xvmc.c:1461 src/video_out/video_out_xxmc.c:2465
+#: src/video_out/video_out_xcbxv.c:1304 src/video_out/video_out_xv.c:1359
+#: src/video_out/video_out_xvmc.c:1423 src/video_out/video_out_xxmc.c:2531
 msgid "enable double buffering"
 msgstr ""
 
@@ -3554,9 +3623,9 @@ msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
 msgstr ""
 
 # src/dxr3/video_out_dxr3.c:287
-#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1443
-#: src/video_out/video_out_xv.c:1456 src/video_out/video_out_xvmc.c:1446
-#: src/video_out/video_out_xxmc.c:2432
+#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1271
+#: src/video_out/video_out_xv.c:1326 src/video_out/video_out_xvmc.c:1408
+#: src/video_out/video_out_xxmc.c:2498
 #, fuzzy
 msgid "video overlay colour key"
 msgstr "dxr3: wartość koloru kluczowego dla overlay"
@@ -3712,9 +3781,9 @@ msgstr ""
 msgid "The intensity of the blue colour components."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1477
-#: src/video_out/video_out_xv.c:1490 src/video_out/video_out_xvmc.c:1462
-#: src/video_out/video_out_xxmc.c:2466
+#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1305
+#: src/video_out/video_out_xv.c:1360 src/video_out/video_out_xvmc.c:1424
+#: src/video_out/video_out_xxmc.c:2532
 msgid ""
 "Double buffering will synchronize the update of the video image to the "
 "repainting of the entire screen (\"vertical retrace\"). This eliminates "
@@ -3749,9 +3818,9 @@ msgid "video overlay colour key red component"
 msgstr "dxr3: zakres koloru kluczowego"
 
 #: src/video_out/video_out_vidix.c:1159 src/video_out/video_out_vidix.c:1166
-#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1444
-#: src/video_out/video_out_xv.c:1457 src/video_out/video_out_xvmc.c:1447
-#: src/video_out/video_out_xxmc.c:2433
+#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1272
+#: src/video_out/video_out_xv.c:1327 src/video_out/video_out_xvmc.c:1409
+#: src/video_out/video_out_xxmc.c:2499
 msgid ""
 "The colour key is used to tell the graphics card where to overlay the video "
 "image. Try different values, if you experience windows becoming transparent."
@@ -3788,13 +3857,13 @@ msgstr ""
 
 # src/video_out/video_out_xshm.c:1445
 #: src/video_out/video_out_xcbshm.c:159 src/video_out/video_out_xcbshm.c:169
-#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:272
-#: src/video_out/video_out_xcbxv.c:282 src/video_out/video_out_xcbxv.c:292
-#: src/video_out/video_out_xcbxv.c:304 src/video_out/video_out_xshm.c:204
+#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:267
+#: src/video_out/video_out_xcbxv.c:277 src/video_out/video_out_xcbxv.c:287
+#: src/video_out/video_out_xcbxv.c:299 src/video_out/video_out_xshm.c:204
 #: src/video_out/video_out_xshm.c:221 src/video_out/video_out_xshm.c:232
-#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:296
-#: src/video_out/video_out_xv.c:307 src/video_out/video_out_xv.c:316
-#: src/video_out/video_out_xv.c:352 src/video_out/video_out_xxmc.c:648
+#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:295
+#: src/video_out/video_out_xv.c:322 src/video_out/video_out_xv.c:331
+#: src/video_out/video_out_xv.c:367 src/video_out/video_out_xxmc.c:648
 #: src/video_out/video_out_xxmc.c:659 src/video_out/video_out_xxmc.c:668
 #: src/video_out/video_out_xxmc.c:704
 #, fuzzy, c-format
@@ -3807,8 +3876,8 @@ msgstr ""
 msgid "%s: shared memory error (address error) when allocating image \n"
 msgstr ""
 
-#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:302
-#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:350
+#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:297
+#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:365
 #: src/video_out/video_out_xxmc.c:702
 #, c-format
 msgid "%s: x11 error during shared memory XImage creation\n"
@@ -3840,65 +3909,65 @@ msgid "xine video output plugin using the MIT X shared memory extension"
 msgstr ""
 "wtyczka wyjścia obrazu xine używajaca rozszerzenie dzielonej pamięci MIT X"
 
-#: src/video_out/video_out_xcbxv.c:270 src/video_out/video_out_xv.c:305
+#: src/video_out/video_out_xcbxv.c:265 src/video_out/video_out_xv.c:320
 #: src/video_out/video_out_xxmc.c:657
 #, c-format
 msgid "%s: XvShmCreateImage returned a zero size\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:280 src/video_out/video_out_xv.c:314
+#: src/video_out/video_out_xcbxv.c:275 src/video_out/video_out_xv.c:329
 #: src/video_out/video_out_xxmc.c:666
 #, c-format
 msgid "%s: shared memory error in shmget: %s\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:290
+#: src/video_out/video_out_xcbxv.c:285
 #, c-format
 msgid "%s: shared memory error (address error)\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1294 src/video_out/video_out_xv.c:1301
-#: src/video_out/video_out_xxmc.c:2283
+#: src/video_out/video_out_xcbxv.c:1125 src/video_out/video_out_xv.c:1174
+#: src/video_out/video_out_xxmc.c:2349
 #, c-format
 msgid "%s: Xv extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1336 src/video_out/video_out_xv.c:1338
-#: src/video_out/video_out_xxmc.c:2320
+#: src/video_out/video_out_xcbxv.c:1167 src/video_out/video_out_xv.c:1211
+#: src/video_out/video_out_xxmc.c:2386
 #, c-format
 msgid ""
 "%s: Xv extension is present but I couldn't find a usable yuv12 port.\n"
 "\tLooks like your graphics hardware driver doesn't support Xv?!\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1345
+#: src/video_out/video_out_xcbxv.c:1176
 #, c-format
 msgid ""
 "%s: using Xv port %d from adaptor %s for hardware colorspace conversion and "
 "scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1452 src/video_out/video_out_xv.c:1465
-#: src/video_out/video_out_xvmc.c:1455 src/video_out/video_out_xxmc.c:2441
+#: src/video_out/video_out_xcbxv.c:1280 src/video_out/video_out_xv.c:1335
+#: src/video_out/video_out_xvmc.c:1417 src/video_out/video_out_xxmc.c:2507
 #, fuzzy
 msgid "autopaint colour key"
 msgstr "Auto-tworzenie koloru-klucza przez Xv"
 
-#: src/video_out/video_out_xcbxv.c:1453 src/video_out/video_out_xv.c:1466
-#: src/video_out/video_out_xvmc.c:1456 src/video_out/video_out_xxmc.c:2442
+#: src/video_out/video_out_xcbxv.c:1281 src/video_out/video_out_xv.c:1336
+#: src/video_out/video_out_xvmc.c:1418 src/video_out/video_out_xxmc.c:2508
 #, fuzzy
 msgid "Make Xv autopaint its colorkey."
 msgstr "Auto-tworzenie koloru-klucza przez Xv"
 
 # src/video_out/video_out_xv.c:1408
-#: src/video_out/video_out_xcbxv.c:1460 src/video_out/video_out_xv.c:1473
-#: src/video_out/video_out_xxmc.c:2449
+#: src/video_out/video_out_xcbxv.c:1288 src/video_out/video_out_xv.c:1343
+#: src/video_out/video_out_xxmc.c:2515
 #, fuzzy
 msgid "bilinear scaling mode"
 msgstr "tryb skalowania bilinearnego (permedia 2/3)"
 
-#: src/video_out/video_out_xcbxv.c:1461 src/video_out/video_out_xv.c:1474
-#: src/video_out/video_out_xxmc.c:2450
+#: src/video_out/video_out_xcbxv.c:1289 src/video_out/video_out_xv.c:1344
+#: src/video_out/video_out_xxmc.c:2516
 msgid ""
 "Selects the bilinear scaling mode for Permedia cards. The individual values "
 "are:\n"
@@ -3913,75 +3982,31 @@ msgid ""
 "2 - enable full bilinear filtering"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1513 src/video_out/video_out_xv.c:1523
-#: src/video_out/video_out_xxmc.c:2506
+#: src/video_out/video_out_xcbxv.c:1341 src/video_out/video_out_xv.c:1393
+#: src/video_out/video_out_xxmc.c:2572
 #, c-format
 msgid "%s: this adaptor supports the yv12 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1518 src/video_out/video_out_xv.c:1528
-#: src/video_out/video_out_xxmc.c:2511
+#: src/video_out/video_out_xcbxv.c:1346 src/video_out/video_out_xv.c:1398
+#: src/video_out/video_out_xxmc.c:2577
 #, c-format
 msgid "%s: this adaptor supports the yuy2 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1526 src/video_out/video_out_xv.c:1550
-#: src/video_out/video_out_xxmc.c:2534
+#: src/video_out/video_out_xcbxv.c:1354 src/video_out/video_out_xv.c:1420
+#: src/video_out/video_out_xxmc.c:2600
 msgid "pitch alignment workaround"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1527 src/video_out/video_out_xv.c:1551
-#: src/video_out/video_out_xxmc.c:2535
+#: src/video_out/video_out_xcbxv.c:1355 src/video_out/video_out_xv.c:1421
+#: src/video_out/video_out_xxmc.c:2601
 msgid "Some buggy video drivers need a workaround to function properly."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1533 src/video_out/video_out_xv.c:1557
-#: src/video_out/video_out_xvmc.c:1524
-msgid "deinterlace method (deprecated)"
-msgstr ""
-
-#: src/video_out/video_out_xcbxv.c:1534 src/video_out/video_out_xv.c:1558
-#: src/video_out/video_out_xvmc.c:1525
-msgid ""
-"This config setting is deprecated. You should use the new deinterlacing post "
-"processing settings instead.\n"
-"\n"
-"From the old days of analog television, where the even and odd numbered "
-"lines of a video frame would be displayed at different times comes the idea "
-"to increase motion smoothness by also recording the lines at different "
-"times. This is called \"interlacing\". But unfortunately, todays displays "
-"show the even and odd numbered lines as one complete frame all at the same "
-"time (called \"progressive display\"), which results in ugly frame errors "
-"known as comb artifacts. Software deinterlacing is an approach to reduce "
-"these artifacts. The individual values are:\n"
-"\n"
-"none\n"
-"Disables software deinterlacing.\n"
-"\n"
-"bob\n"
-"Interpolates between the lines for moving parts of the image.\n"
-"\n"
-"weave\n"
-"Similar to bob, but with a tendency to preserve the full resolution, better "
-"for high detail in low movement scenes.\n"
-"\n"
-"greedy\n"
-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
-"\n"
-"onefield\n"
-"Always interpolates and reduces vertical resolution.\n"
-"\n"
-"onefieldxv\n"
-"Same as onefield, but does the interpolation in hardware.\n"
-"\n"
-"linearblend\n"
-"Applies a slight vertical blur to remove the comb artifacts. Good results "
-"with medium CPU usage."
-msgstr ""
-
 # src/video_out/video_out_xv.c:1479
-#: src/video_out/video_out_xcbxv.c:1588 src/video_out/video_out_xv.c:1631
-#: src/video_out/video_out_xxmc.c:2615
+#: src/video_out/video_out_xcbxv.c:1383 src/video_out/video_out_xv.c:1468
+#: src/video_out/video_out_xxmc.c:2681
 msgid "xine video output plugin using the MIT X video extension"
 msgstr "wtyczka wyjścia obrazu xine używająca rozszerzenia obrazu MIT X"
 
@@ -3990,12 +4015,12 @@ msgstr "wtyczka wyjścia obrazu xine używająca rozszerzenia obrazu MIT X"
 msgid "%s: shared memory error when allocating image\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:294 src/video_out/video_out_xxmc.c:646
+#: src/video_out/video_out_xv.c:293 src/video_out/video_out_xxmc.c:646
 #, c-format
 msgid "%s: XvShmCreateImage failed\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1348 src/video_out/video_out_xxmc.c:2330
+#: src/video_out/video_out_xv.c:1221 src/video_out/video_out_xxmc.c:2396
 #, c-format
 msgid ""
 "%s: using Xv port %ld from adaptor %s for hardware colorspace conversion and "
@@ -4003,82 +4028,82 @@ msgid ""
 msgstr ""
 
 # src/video_out/video_out_xv.c:1479
-#: src/video_out/video_out_xvmc.c:1593
+#: src/video_out/video_out_xvmc.c:1496
 #, fuzzy
 msgid "xine video output plugin using the XvMC X video extension"
 msgstr "wtyczka wyjścia obrazu xine używająca rozszerzenia obrazu MIT X"
 
-#: src/video_out/video_out_xvmc.c:1639
+#: src/video_out/video_out_xvmc.c:1542
 msgid "video_out_xvmc: XvMC extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1737
+#: src/video_out/video_out_xvmc.c:1640
 msgid ""
 "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
 "port.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1746
+#: src/video_out/video_out_xvmc.c:1649
 #, c-format
 msgid ""
 "video_out_xvmc: using Xv port %ld from adaptor %s\n"
 "                for hardware colorspace conversion and scaling\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1751
+#: src/video_out/video_out_xvmc.c:1654
 msgid "                idct and motion compensation acceleration \n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1753
+#: src/video_out/video_out_xvmc.c:1656
 msgid "                motion compensation acceleration only\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1755
+#: src/video_out/video_out_xvmc.c:1658
 msgid "                no XvMC support \n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1756
+#: src/video_out/video_out_xvmc.c:1659
 #, c-format
 msgid "                With Overlay = %d; UnsignedIntra = %d.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2540
+#: src/video_out/video_out_xxmc.c:2606
 msgid "Make XvMC allocate more frames for better buffering."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2541
+#: src/video_out/video_out_xxmc.c:2607
 msgid ""
 "Some XvMC implementations allow more than 8 frames.\n"
 "This option, when turned on, makes the driver try to\n"
 "allocate 15 frames. A must for unichrome and live VDR.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2547
+#: src/video_out/video_out_xxmc.c:2613
 msgid "Unichrome cpu save"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2548
+#: src/video_out/video_out_xxmc.c:2614
 msgid ""
 "Saves CPU time by sleeping while decoder works.\n"
 "Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n"
 "Experimental.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2554
+#: src/video_out/video_out_xxmc.c:2620
 msgid "Fix buggy NVIDIA XvMC subpicture colors"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2555
+#: src/video_out/video_out_xxmc.c:2621
 msgid ""
 "There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
 "look blue and vice versa. This option provides a workaround.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2560
+#: src/video_out/video_out_xxmc.c:2626
 msgid "Use bob as accelerated deinterlace method."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2561
+#: src/video_out/video_out_xxmc.c:2627
 msgid ""
 "When interlacing is enabled for hardware accelerated frames,\n"
 "Alternate between top and bottom field at double the frame rate.\n"
@@ -4102,11 +4127,11 @@ msgstr ""
 msgid "x11osd: unscaled overlay created (%s mode).\n"
 msgstr ""
 
-#: src/xine-engine/alphablend.c:2123
+#: src/xine-engine/alphablend.c:2146
 msgid "disable exact alpha blending of overlays"
 msgstr ""
 
-#: src/xine-engine/alphablend.c:2124
+#: src/xine-engine/alphablend.c:2147
 msgid ""
 "If you experience a performance impact when an On Screen Display or other "
 "overlays like DVD subtitles are active, then you might want to enable this "
@@ -4691,21 +4716,21 @@ msgid ""
 "foreground-border-background."
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:380
+#: src/xine-engine/video_decoder.c:390
 #, c-format
 msgid "video_decoder: no plugin available to handle '%s'\n"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:459
+#: src/xine-engine/video_decoder.c:469
 #, c-format
 msgid "video_decoder: error, unknown buffer type: %08x\n"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:495
+#: src/xine-engine/video_decoder.c:505
 msgid "number of video buffers"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:496
+#: src/xine-engine/video_decoder.c:506
 msgid ""
 "The number of video buffers (each is 8k in size) xine uses in its internal "
 "queue. Higher values mean smoother playback for unreliable inputs, but also "
@@ -4713,51 +4738,51 @@ msgid ""
 msgstr ""
 
 # src/xine-engine/video_out.c:308
-#: src/xine-engine/video_out.c:642
+#: src/xine-engine/video_out.c:671
 #, c-format
 msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
 msgstr "%d ramek dostarczonych, %d ramek pominiętych, %d ramek porzuconych\n"
 
 # src/xine-engine/video_out.c:351
-#: src/xine-engine/video_out.c:815
+#: src/xine-engine/video_out.c:844
 #, fuzzy, c-format
 msgid ""
 "video_out: throwing away image with pts %<PRId64> because it's too old "
 "(diff : %<PRId64>).\n"
 msgstr "video_out: odrzucam obraz o pts %lld bo jest za stary (diff : %lld).\n"
 
-#: src/xine-engine/video_out.c:1794
+#: src/xine-engine/video_out.c:1863
 msgid "default number of video frames"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1795
+#: src/xine-engine/video_out.c:1864
 msgid ""
 "The default number of video frames to request from xine video out driver. "
 "Some drivers will override this setting with their own values."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1834
+#: src/xine-engine/video_out.c:1921
 msgid "percentage of skipped frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1835
+#: src/xine-engine/video_out.c:1922
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not decoded in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1840
+#: src/xine-engine/video_out.c:1927
 msgid "percentage of discarded frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1841
+#: src/xine-engine/video_out.c:1928
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not scheduled for display in time, xine sends a notification."
 msgstr ""
 
 # src/xine-engine/video_out.c:893
-#: src/xine-engine/video_out.c:1875
+#: src/xine-engine/video_out.c:1965
 msgid "video_out: sorry, this should not happen. please restart xine.\n"
 msgstr ""
 "video_out: przykro mi, to nie powinno sie zdarzyć.\n"
@@ -4804,140 +4829,140 @@ msgid ""
 "accelerated, this can dramatically reduce CPU usage."
 msgstr ""
 
-#: src/xine-engine/xine.c:706 src/xine-engine/xine.c:813
-#: src/xine-engine/xine.c:852 src/xine-engine/xine.c:888
-#: src/xine-engine/xine.c:900 src/xine-engine/xine.c:913
-#: src/xine-engine/xine.c:926 src/xine-engine/xine.c:939
-#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:990
-#: src/xine-engine/xine.c:1025
+#: src/xine-engine/xine.c:771 src/xine-engine/xine.c:878
+#: src/xine-engine/xine.c:917 src/xine-engine/xine.c:953
+#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:978
+#: src/xine-engine/xine.c:991 src/xine-engine/xine.c:1004
+#: src/xine-engine/xine.c:1030 src/xine-engine/xine.c:1055
+#: src/xine-engine/xine.c:1090
 msgid "xine: error while parsing mrl\n"
 msgstr ""
 
 # src/xine-engine/xine.c:415
-#: src/xine-engine/xine.c:742
+#: src/xine-engine/xine.c:807
 #, fuzzy, c-format
 msgid "xine: found input plugin  : %s\n"
 msgstr "xine: nie mogę znaleźć wtyczki wejścia dla tego MRL\n"
 
 # src/xine-engine/xine.c:415
-#: src/xine-engine/xine.c:760
+#: src/xine-engine/xine.c:825
 #, fuzzy, c-format
 msgid "xine: input plugin cannot open MRL [%s]\n"
 msgstr "xine: nie mogę znaleźć wtyczki wejścia dla tego MRL\n"
 
 # src/xine-engine/xine.c:415
-#: src/xine-engine/xine.c:776
+#: src/xine-engine/xine.c:841
 #, fuzzy, c-format
 msgid "xine: cannot find input plugin for MRL [%s]\n"
 msgstr "xine: nie mogę znaleźć wtyczki wejścia dla tego MRL\n"
 
 # src/xine-engine/xine.c:471
-#: src/xine-engine/xine.c:802
+#: src/xine-engine/xine.c:867
 #, c-format
 msgid "xine: specified demuxer %s failed to start\n"
 msgstr "xine: zawiódł start wybranego demultiplexera %s\n"
 
 # src/input/input_http.c:640
-#: src/xine-engine/xine.c:838
+#: src/xine-engine/xine.c:903
 #, fuzzy, c-format
 msgid "xine: join rip input plugin\n"
 msgstr "wtyczka wejścia VCD"
 
 # src/input/input_http.c:640
-#: src/xine-engine/xine.c:845
+#: src/xine-engine/xine.c:910
 #, fuzzy
 msgid "xine: error opening rip input plugin instance\n"
 msgstr "wtyczka wejścia VCD"
 
 # src/xine-engine/xine.c:471
-#: src/xine-engine/xine.c:876
+#: src/xine-engine/xine.c:941
 #, c-format
 msgid "xine: last_probed demuxer %s failed to start\n"
 msgstr "xine: zawiódł start ostatnio próbowanego demultiplexera %s\n"
 
-#: src/xine-engine/xine.c:905
+#: src/xine-engine/xine.c:970
 msgid "ignoring video\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:918
+#: src/xine-engine/xine.c:983
 msgid "ignoring audio\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:931
+#: src/xine-engine/xine.c:996
 msgid "ignoring subpicture\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:944
+#: src/xine-engine/xine.c:1009
 msgid "input cache plugin disabled\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1015
+#: src/xine-engine/xine.c:1080
 #, c-format
 msgid "subtitle mrl opened '%s'\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1019
+#: src/xine-engine/xine.c:1084
 msgid "xine: error opening subtitle mrl\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1051
+#: src/xine-engine/xine.c:1116
 #, c-format
 msgid "xine: error while parsing MRL\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1058
+#: src/xine-engine/xine.c:1123
 #, c-format
 msgid "xine: changing option '%s' from MRL isn't permitted\n"
 msgstr ""
 
 # src/xine-engine/xine.c:436
-#: src/xine-engine/xine.c:1078
+#: src/xine-engine/xine.c:1143
 #, c-format
 msgid "xine: couldn't find demux for >%s<\n"
 msgstr "xine: nie mogę znaleźć demultiplexera dla >%s<\n"
 
 # src/xine-engine/xine.c:436
-#: src/xine-engine/xine.c:1094
+#: src/xine-engine/xine.c:1159
 #, fuzzy, c-format
 msgid "xine: found demuxer plugin: %s\n"
 msgstr "xine: nie mogę znaleźć demultiplexera dla >%s<\n"
 
 # src/xine-engine/xine.c:471
-#: src/xine-engine/xine.c:1114
+#: src/xine-engine/xine.c:1179
 #, c-format
 msgid "xine: demuxer failed to start\n"
 msgstr "xine: zawiódł start demultiplexera\n"
 
 # src/xine-engine/xine.c:471
-#: src/xine-engine/xine.c:1179
+#: src/xine-engine/xine.c:1244
 #, c-format
 msgid "xine_play: no demux available\n"
 msgstr "xine_play: brak dostępnego demultiplexera\n"
 
 # src/xine-engine/xine.c:471
-#: src/xine-engine/xine.c:1249
+#: src/xine-engine/xine.c:1314
 #, c-format
 msgid "xine_play: demux failed to start\n"
 msgstr "xine_play: zawiódł start demultiplexera\n"
 
-#: src/xine-engine/xine.c:1527
+#: src/xine-engine/xine.c:1592
 #, c-format
 msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1532
+#: src/xine-engine/xine.c:1597
 msgid "The specified save_dir might be a security risk."
 msgstr ""
 
-#: src/xine-engine/xine.c:1561
+#: src/xine-engine/xine.c:1626
 msgid "xine: locale not supported by C library\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1570
+#: src/xine-engine/xine.c:1635
 msgid "media format detection strategy"
 msgstr ""
 
-#: src/xine-engine/xine.c:1571
+#: src/xine-engine/xine.c:1636
 msgid ""
 "xine offers various methods to detect the media format of input to play. The "
 "individual values are:\n"
@@ -4955,11 +4980,11 @@ msgid ""
 "Detect by file name extension only.\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1589
+#: src/xine-engine/xine.c:1654
 msgid "directory for saving streams"
 msgstr ""
 
-#: src/xine-engine/xine.c:1590
+#: src/xine-engine/xine.c:1655
 msgid ""
 "When using the stream save feature, files will be written only into this "
 "directory.\n"
@@ -4969,11 +4994,11 @@ msgid ""
 "content in any file."
 msgstr ""
 
-#: src/xine-engine/xine.c:1601
+#: src/xine-engine/xine.c:1666
 msgid "allow implicit changes to the configuration (e.g. by MRL)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1602
+#: src/xine-engine/xine.c:1667
 msgid ""
 "If enabled, you allow xine to change your configuration without explicit "
 "actions from your side. For example configuration changes demanded by MRLs "
@@ -4983,11 +5008,11 @@ msgid ""
 "configuration, you might end with a totally messed up xine."
 msgstr ""
 
-#: src/xine-engine/xine.c:1616
+#: src/xine-engine/xine.c:1681
 msgid "Timeout for network stream reading (in seconds)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1617
+#: src/xine-engine/xine.c:1682
 msgid ""
 "Specifies the timeout when reading from network streams, in seconds. Too low "
 "values might stop streaming when the source is slow or the bandwidth is "
@@ -4995,16 +5020,16 @@ msgid ""
 msgstr ""
 
 # src/xine-engine/xine.c:1025
-#: src/xine-engine/xine.c:1969
+#: src/xine-engine/xine.c:2034
 msgid "messages"
 msgstr "wiadomości"
 
 # src/xine-engine/xine.c:1026
-#: src/xine-engine/xine.c:1970
+#: src/xine-engine/xine.c:2035
 msgid "plugin"
 msgstr "wtyczka"
 
-#: src/xine-engine/xine.c:1971
+#: src/xine-engine/xine.c:2036
 msgid "trace"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4b3a55f86..cdb178a20 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 0.9.13\n"
 "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-04-24 21:48+0100\n"
+"POT-Creation-Date: 2007-06-02 13:14+0200\n"
 "PO-Revision-Date: 2002-01-22 18:31GMT-3\n"
 "Last-Translator: Marcelo Roberto Jimenez <mroberto@cetuc.puc-rio.br>\n"
 "Language-Team: Portuguese (Brazilian) <pt_BR@li.org>\n"
@@ -715,6 +715,11 @@ msgstr "input_cda: opening server '%s:%d' failed: %s\n"
 msgid "xine audio output plugin using sun-compliant audio devices/drivers"
 msgstr ""
 
+#: src/combined/xine_ogg_demuxer.c:810
+#, c-format
+msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+msgstr ""
+
 #: src/demuxers/demux_asf.c:428
 #, c-format
 msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
@@ -846,11 +851,6 @@ msgid ""
 "xine developers.\n"
 msgstr ""
 
-#: src/demuxers/demux_ogg.c:802
-#, c-format
-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
-msgstr ""
-
 #: src/demuxers/demux_snd.c:104
 #, c-format
 msgid "demux_snd: bad header parameters\n"
@@ -886,16 +886,6 @@ msgstr ""
 msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
 msgstr ""
 
-#: src/dxr3/dxr3.h:32
-msgid "DXR3 device number"
-msgstr ""
-
-#: src/dxr3/dxr3.h:33
-msgid ""
-"If you have more than one DXR3 in your computer, you can specify which one "
-"to use here."
-msgstr ""
-
 #: src/dxr3/dxr3_decode_spu.c:253
 #, c-format
 msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
@@ -986,6 +976,16 @@ msgid ""
 "dxr3_decode_video: WARNING: correcting frame rate code from PAL to NTSC\n"
 msgstr ""
 
+#: src/dxr3/dxr3.h:32
+msgid "DXR3 device number"
+msgstr ""
+
+#: src/dxr3/dxr3.h:33
+msgid ""
+"If you have more than one DXR3 in your computer, you can specify which one "
+"to use here."
+msgstr ""
+
 #: src/dxr3/dxr3_mpeg_encoders.c:125
 msgid "dxr3_mpeg_encoder: failed to init librte\n"
 msgstr ""
@@ -1241,40 +1241,40 @@ msgstr ""
 msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
 msgstr ""
 
-#: src/input/input_cdda.c:1608
+#: src/input/input_cdda.c:1611
 #, fuzzy, c-format
 msgid "%s: can't connect to %s:%d\n"
 msgstr "http: unable to connect to >%s<\n"
 
-#: src/input/input_cdda.c:1655
+#: src/input/input_cdda.c:1658
 #, fuzzy, c-format
 msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
 msgstr "input_cda: server '%s:%d' successfuly connected.\n"
 
-#: src/input/input_cdda.c:1660
+#: src/input/input_cdda.c:1663
 #, fuzzy, c-format
 msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
 msgstr "input_net: incapaz de conectar em '%s'.\n"
 
-#: src/input/input_cdda.c:2690
+#: src/input/input_cdda.c:2693
 msgid "CD Digital Audio (aka. CDDA)"
 msgstr ""
 
-#: src/input/input_cdda.c:2742
+#: src/input/input_cdda.c:2745
 msgid "device used for CD audio"
 msgstr ""
 
-#: src/input/input_cdda.c:2743
+#: src/input/input_cdda.c:2746
 msgid ""
 "The path to the device, usually a CD or DVD drive, which you intend to use "
 "for playing audio CDs."
 msgstr ""
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid "query CDDB"
 msgstr ""
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid ""
 "Enables CDDB queries, which will give you convenient title and track names "
 "for your audio CDs.\n"
@@ -1283,11 +1283,11 @@ msgid ""
 "listening habits."
 msgstr ""
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid "CDDB server name"
 msgstr ""
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid ""
 "The CDDB server used to retrieve the title and track information from.\n"
 "This setting is security critical, because the sever will receive "
@@ -1295,19 +1295,19 @@ msgid ""
 "malicious replies. Be sure to enter a server you can trust."
 msgstr ""
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "CDDB server port"
 msgstr ""
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "The server port used to retrieve the title and track information from."
 msgstr ""
 
-#: src/input/input_cdda.c:2771
+#: src/input/input_cdda.c:2774
 msgid "slow down disc drive to this speed factor"
 msgstr ""
 
-#: src/input/input_cdda.c:2772
+#: src/input/input_cdda.c:2775
 msgid ""
 "Since some CD or DVD drives make some really loud noises because of the fast "
 "disc rotation, xine will try to slow them down. With standard CD or DVD "
@@ -1316,127 +1316,133 @@ msgid ""
 "A value of zero here will disable the slowdown."
 msgstr ""
 
-#: src/input/input_dvb.c:899
+#: src/input/input_dvb.c:900
 #, fuzzy, c-format
 msgid "input_dvb: failed to open dvb channel file '%s': %s\n"
 msgstr "input_file: tentando abrir o arquivo de subtítulos '%s'\n"
 
-#: src/input/input_dvb.c:905
+#: src/input/input_dvb.c:906
 #, fuzzy, c-format
 msgid "input_dvb: dvb channel file '%s' is not a plain file\n"
 msgstr "input_file: tentando abrir o arquivo de subtítulos '%s'\n"
 
-#: src/input/input_dvb.c:2115 src/input/input_dvb.c:2943
+#: src/input/input_dvb.c:2116 src/input/input_dvb.c:2948
 #, fuzzy
 msgid "input_dvb: tuner_set_channel failed\n"
 msgstr "input_vcd: read data failed\n"
 
-#: src/input/input_dvb.c:2743
+#: src/input/input_dvb.c:2748
 #, fuzzy
 msgid "input_dvb: cannot open dvb device\n"
 msgstr "input_dvd: não consigo abrir o acionador de dvd >%s<\n"
 
-#: src/input/input_dvb.c:2767
+#: src/input/input_dvb.c:2772
 #, c-format
 msgid "input_dvb: channel %d out of range, defaulting to 0\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2778
+#: src/input/input_dvb.c:2783
 #, fuzzy, c-format
 msgid "input_dvb: searching for channel %s\n"
 msgstr "input_file: tentando abrir o arquivo de subtítulos '%s'\n"
 
-#: src/input/input_dvb.c:2801
+#: src/input/input_dvb.c:2806
 #, c-format
 msgid "input_dvb: exact match for %s not found: trying partial matches\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2808
+#: src/input/input_dvb.c:2813
 #, fuzzy, c-format
 msgid "input_dvb: found matching channel %s\n"
 msgstr "input_file: tentando abrir o arquivo de subtítulos '%s'\n"
 
-#: src/input/input_dvb.c:2821
+#: src/input/input_dvb.c:2826
 #, c-format
 msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2827
+#: src/input/input_dvb.c:2832
 msgid ""
 "input_dvb: invalid channel specification, defaulting to last viewed "
 "channel.\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2833
+#: src/input/input_dvb.c:2838
 msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2845
+#: src/input/input_dvb.c:2850
 msgid ""
 "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
 "S)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2865
+#: src/input/input_dvb.c:2870
 msgid ""
 "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
 "T)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2888 src/input/input_dvb.c:2914
+#: src/input/input_dvb.c:2893
 msgid ""
 "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
 "C)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2949
+#: src/input/input_dvb.c:2919
+msgid ""
+"input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-"
+"A)\n"
+msgstr ""
+
+#: src/input/input_dvb.c:2954
 #, fuzzy, c-format
 msgid "input_dvb: cannot open dvr device '%s'\n"
 msgstr "input_dvd: não consigo abrir o acionador de dvd >%s<\n"
 
-#: src/input/input_dvb.c:2971
+#: src/input/input_dvb.c:2976
 #, fuzzy
 msgid "input_dvb: cannot create EPG updater thread\n"
 msgstr "input_rtp: não consigo criar um novo thread (%s)\n"
 
-#: src/input/input_dvb.c:3033
+#: src/input/input_dvb.c:3038
 msgid "use DVB 'center cutout' (zoom)"
 msgstr ""
 
-#: src/input/input_dvb.c:3034
+#: src/input/input_dvb.c:3039
 msgid ""
 "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
 "frame."
 msgstr ""
 
-#: src/input/input_dvb.c:3127
+#: src/input/input_dvb.c:3132
 #, fuzzy
 msgid "DVB (Digital TV) input plugin"
 msgstr "http network stream input plugin"
 
-#: src/input/input_dvb.c:3244
+#: src/input/input_dvb.c:3249
 msgid "Remember last DVB channel watched"
 msgstr ""
 
-#: src/input/input_dvb.c:3245
+#: src/input/input_dvb.c:3250
 msgid ""
 "On autoplay, xine will remember and switch to the channel indicated in media."
 "dvb.last_channel. "
 msgstr ""
 
-#: src/input/input_dvb.c:3252
+#: src/input/input_dvb.c:3257
 msgid "Last DVB channel viewed"
 msgstr ""
 
-#: src/input/input_dvb.c:3253
+#: src/input/input_dvb.c:3258
 msgid "If enabled xine will remember and switch to this channel. "
 msgstr ""
 
-#: src/input/input_dvb.c:3259
+#: src/input/input_dvb.c:3264
 msgid "Number of dvb card to use."
 msgstr ""
 
-#: src/input/input_dvb.c:3260
+#: src/input/input_dvb.c:3265
 msgid ""
 "Leave this at zero unless you really have more than 1 card in your system."
 msgstr ""
@@ -1628,88 +1634,88 @@ msgstr ""
 msgid "gnome-vfs input plugin as shipped with xine"
 msgstr "net input plugin tal como enviado com xine"
 
-#: src/input/input_http.c:174
+#: src/input/input_http.c:176
 #, fuzzy, c-format
 msgid "input_http: gethostbyname(%s) failed: %s\n"
 msgstr "input_cda: fopen(%s) failed: %s\n"
 
-#: src/input/input_http.c:400 src/input/input_http.c:943
+#: src/input/input_http.c:402 src/input/input_http.c:957
 #, fuzzy, c-format
 msgid "input_http: read error %d\n"
 msgstr "input_http: read error\n"
 
-#: src/input/input_http.c:627
+#: src/input/input_http.c:629
 msgid "Connecting HTTP server..."
 msgstr ""
 
-#: src/input/input_http.c:819
+#: src/input/input_http.c:820
 #, c-format
 msgid "input_http: invalid http answer\n"
 msgstr "input_http: invalid http answer\n"
 
-#: src/input/input_http.c:825
+#: src/input/input_http.c:826
 #, fuzzy, c-format
 msgid "input_http: 3xx redirection: >%d %s<\n"
 msgstr "input_http: 3xx redirection not implemented: >%d %s<\n"
 
-#: src/input/input_http.c:830 src/input/input_http.c:836
-#: src/input/input_http.c:843
+#: src/input/input_http.c:831 src/input/input_http.c:836
+#: src/input/input_http.c:842 src/input/input_http.c:849
 #, c-format
 msgid "input_http: http status not 2xx: >%d %s<\n"
 msgstr "input_http: http status not 2xx: >%d %s<\n"
 
-#: src/input/input_http.c:853
+#: src/input/input_http.c:859
 #, fuzzy, c-format
 msgid "input_http: content length = %<PRIdMAX> bytes\n"
 msgstr "input_http: content length = %Ld bytes\n"
 
-#: src/input/input_http.c:922
+#: src/input/input_http.c:932
 #, fuzzy, c-format
 msgid "input_http: buffer exhausted after %d bytes."
 msgstr "input_http: read error\n"
 
-#: src/input/input_http.c:996
+#: src/input/input_http.c:1010
 #, fuzzy
 msgid "http input plugin"
 msgstr "http network stream input plugin"
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "HTTP proxy host"
 msgstr ""
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "The hostname of the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "HTTP proxy port"
 msgstr ""
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "The port number of the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1076
+#: src/input/input_http.c:1090
 msgid "HTTP proxy username"
 msgstr ""
 
-#: src/input/input_http.c:1077
+#: src/input/input_http.c:1091
 msgid "The user name for the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1080
+#: src/input/input_http.c:1094
 msgid "HTTP proxy password"
 msgstr ""
 
-#: src/input/input_http.c:1081
+#: src/input/input_http.c:1095
 msgid "The password for the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1084
+#: src/input/input_http.c:1098
 msgid "Domains for which to ignore the HTTP proxy"
 msgstr ""
 
-#: src/input/input_http.c:1085
+#: src/input/input_http.c:1099
 msgid ""
 "A comma-separated list of domain names for which the proxy is to be "
 "ignored.\n"
@@ -1920,33 +1926,33 @@ msgstr ""
 msgid "Adjusting..."
 msgstr ""
 
-#: src/input/input_v4l.c:660
+#: src/input/input_v4l.c:658
 msgid "Tuner name not found\n"
 msgstr ""
 
-#: src/input/input_v4l.c:1876
+#: src/input/input_v4l.c:1874
 #, fuzzy
 msgid "v4l tv input plugin"
 msgstr "http network stream input plugin"
 
-#: src/input/input_v4l.c:1880
+#: src/input/input_v4l.c:1878
 #, fuzzy
 msgid "v4l radio input plugin"
 msgstr "http network stream input plugin"
 
-#: src/input/input_v4l.c:1912
+#: src/input/input_v4l.c:1910
 msgid "v4l video device"
 msgstr ""
 
-#: src/input/input_v4l.c:1913
+#: src/input/input_v4l.c:1911
 msgid "The path to your Video4Linux video device."
 msgstr ""
 
-#: src/input/input_v4l.c:1938
+#: src/input/input_v4l.c:1936
 msgid "v4l radio device"
 msgstr ""
 
-#: src/input/input_v4l.c:1939
+#: src/input/input_v4l.c:1937
 msgid "The path to your Video4Linux radio device."
 msgstr ""
 
@@ -2111,110 +2117,110 @@ msgstr ""
 msgid "Should have converted this above"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:191
+#: src/input/vcd/xineplug_inp_vcd.c:192
 msgid "failed to find a device with a VCD"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:328
+#: src/input/vcd/xineplug_inp_vcd.c:329
 msgid "was passed a null class parameter"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:972
+#: src/input/vcd/xineplug_inp_vcd.c:982
 msgid "Invalid current entry type"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:996
+#: src/input/vcd/xineplug_inp_vcd.c:1006
 msgid ""
 "Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1097
+#: src/input/vcd/xineplug_inp_vcd.c:1107
 msgid "selection has no RETURN entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1126
+#: src/input/vcd/xineplug_inp_vcd.c:1136
 msgid "DEFAULT selected, but PBC is not on."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1131
+#: src/input/vcd/xineplug_inp_vcd.c:1141
 msgid "selection has no NEXT entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1139
+#: src/input/vcd/xineplug_inp_vcd.c:1149
 msgid "selection has no PREVIOUS entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1146
+#: src/input/vcd/xineplug_inp_vcd.c:1156
 msgid "Unknown event type: "
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1446 src/input/vcd/xineplug_inp_vcd.c:1493
+#: src/input/vcd/xineplug_inp_vcd.c:1452 src/input/vcd/xineplug_inp_vcd.c:1499
 msgid "The above message had unknown vcdimager log level"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1824
+#: src/input/vcd/xineplug_inp_vcd.c:1830
 msgid "VCD default type to use on autoplay"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1825
+#: src/input/vcd/xineplug_inp_vcd.c:1831
 msgid ""
 "The VCD play unit to use when none is specified in an MRL, e.g. vcd:// or "
 "vcd:///dev/dvd:"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1835
+#: src/input/vcd/xineplug_inp_vcd.c:1841
 msgid "CD-ROM drive used for VCD when none given"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1836
+#: src/input/vcd/xineplug_inp_vcd.c:1842
 msgid ""
 "What to use if no drive specified. If the setting is empty, xine will scan "
 "for CD drives."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1846
+#: src/input/vcd/xineplug_inp_vcd.c:1852
 msgid "VCD position slider range"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1847
+#: src/input/vcd/xineplug_inp_vcd.c:1853
 msgid ""
 "range that the stream playback position slider represents playing a VCD."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1855
+#: src/input/vcd/xineplug_inp_vcd.c:1861
 msgid "VCD read-ahead caching?"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1856
+#: src/input/vcd/xineplug_inp_vcd.c:1862
 msgid "Class may lead to jerky playback on low-end machines."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1866
+#: src/input/vcd/xineplug_inp_vcd.c:1872
 msgid "automatically advance VCD track/entry"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1867
+#: src/input/vcd/xineplug_inp_vcd.c:1873
 msgid ""
 "If enabled, we should automatically advance to the next entry or track. Used "
 "only when playback control (PBC) is disabled."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1876
+#: src/input/vcd/xineplug_inp_vcd.c:1882
 msgid "show 'rejected' VCD LIDs"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1877
+#: src/input/vcd/xineplug_inp_vcd.c:1883
 msgid ""
 "Some playback list IDs (LIDs) are marked not showable, but you can see them "
 "in the MRL list if this is set. Rejected entries are marked with an asterisk "
 "(*) appended to the MRL."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1888
+#: src/input/vcd/xineplug_inp_vcd.c:1894
 msgid "VCD format string for display banner"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1889
+#: src/input/vcd/xineplug_inp_vcd.c:1895
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are:\n"
@@ -2235,11 +2241,11 @@ msgid ""
 " %% : a %\n"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1914
+#: src/input/vcd/xineplug_inp_vcd.c:1920
 msgid "VCD format string for stream comment field"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1915
+#: src/input/vcd/xineplug_inp_vcd.c:1921
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are %A, %C, %c, %F, %I, %L, "
@@ -2247,11 +2253,11 @@ msgid ""
 "See the help for the title_format for the meanings of these."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1927
+#: src/input/vcd/xineplug_inp_vcd.c:1933
 msgid "VCD debug flag mask"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1928
+#: src/input/vcd/xineplug_inp_vcd.c:1934
 msgid ""
 "For tracking down bugs in the VCD plugin. Mask values are:\n"
 "   1: Meta information\n"
@@ -2268,57 +2274,6 @@ msgid ""
 "2048: Debugging from VCDINFO\n"
 msgstr ""
 
-#: src/liba52/xine_a52_decoder.c:742 src/libxineadec/xine_dts_decoder.c:524
-msgid "HELP! a mono-only audio driver?!\n"
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:805
-msgid "A/52 volume"
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:806
-msgid ""
-"With A/52 audio, you can modify the volume at the decoder level. This has "
-"the advantage of the audio being already decoded for the specified volume, "
-"so later operations like channel downmixing will work on an audio stream of "
-"the given volume."
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:814
-msgid "use A/52 dynamic range compression"
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:815
-msgid ""
-"Dynamic range compression limits the dynamic range of the audio. This means "
-"making the loud sounds softer, and the soft sounds louder, so you can more "
-"easily listen to the audio in a noisy environment without disturbing anyone."
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:822
-msgid "downmix audio to 2 channel surround stereo"
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:823
-msgid ""
-"When you want to listen to multichannel surround sound, but you have only "
-"two speakers or a surround decoder or amplifier which does some sort of "
-"matrix surround decoding like prologic, you should enable this option so "
-"that the additional channels are mixed into the stereo signal."
-msgstr ""
-
-#: src/libfaad/xine_faad_decoder.c:131
-msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
-msgstr ""
-
-#: src/libfaad/xine_faad_decoder.c:140
-msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
-msgstr ""
-
-#: src/libfaad/xine_faad_decoder.c:151
-msgid "libfaad: libfaad NeAACDecInit failed.\n"
-msgstr ""
-
 #: src/libffmpeg/ff_audio_decoder.c:122
 #, c-format
 msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
@@ -2342,45 +2297,6 @@ msgstr ""
 msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
 msgstr ""
 
-#: src/libffmpeg/ff_video_decoder.c:155
-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:173
-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:333
-#, c-format
-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:362
-msgid "ffmpeg_video_dec: couldn't open decoder\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:397
-msgid "ffmpeg_video_dec: direct rendering enabled\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:816
-#, c-format
-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:1514
-msgid "MPEG-4 postprocessing quality"
-msgstr ""
-
-#: src/libffmpeg/ff_video_decoder.c:1515
-msgid ""
-"You can adjust the amount of post processing applied to MPEG-4 video.\n"
-"Higher values result in better quality, but need more CPU. Lower values may "
-"result in image defects like block artifacts. For high quality content, too "
-"heavy post processing can actually make the image worse by blurring it too "
-"much."
-msgstr ""
-
 #: src/libffmpeg/ffmpeg_encoder.c:163
 msgid "libavcodec mpeg output bitrate (kbit/s)"
 msgstr ""
@@ -2419,23 +2335,43 @@ msgstr ""
 msgid "The maximum compression to apply to an image in constant quality mode."
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:249
+#: src/libffmpeg/ff_video_decoder.c:155
+msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:173
+msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:333
 #, c-format
-msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:323
-msgid "libmusepack: data after last frame ignored\n"
+#: src/libffmpeg/ff_video_decoder.c:362
+msgid "ffmpeg_video_dec: couldn't open decoder\n"
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:334
-msgid "libmusepack: mpc_decoder_initialise failed\n"
+#: src/libffmpeg/ff_video_decoder.c:397
+msgid "ffmpeg_video_dec: direct rendering enabled\n"
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:354
-#: src/libxineadec/xine_musepack_decoder.c:369
+#: src/libffmpeg/ff_video_decoder.c:816
 #, c-format
-msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:1519
+msgid "MPEG-4 postprocessing quality"
+msgstr ""
+
+#: src/libffmpeg/ff_video_decoder.c:1520
+msgid ""
+"You can adjust the amount of post processing applied to MPEG-4 video.\n"
+"Higher values result in better quality, but need more CPU. Lower values may "
+"result in image defects like block artifacts. For high quality content, too "
+"heavy post processing can actually make the image worse by blurring it too "
+"much."
 msgstr ""
 
 #: src/libreal/real_common.c:107
@@ -2451,10 +2387,6 @@ msgid ""
 "information on how to install the codecs."
 msgstr ""
 
-#: src/libreal/xine_real_video_decoder.c:164
-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
-msgstr ""
-
 #: src/libreal/xine_real_audio_decoder.c:130
 #, c-format
 msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
@@ -2474,6 +2406,10 @@ msgstr ""
 msgid "libareal: oups, real can do more than 2 channels ?\n"
 msgstr ""
 
+#: src/libreal/xine_real_video_decoder.c:164
+msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+msgstr ""
+
 #: src/libspucc/xine_cc_decoder.c:192
 msgid "display closed captions in MPEG-2 streams"
 msgstr ""
@@ -2685,6 +2621,77 @@ msgstr ""
 msgid "w32codec: Error initializing DMO Audio\n"
 msgstr ""
 
+#: src/libxineadec/xine_a52_decoder.c:742
+#: src/libxineadec/xine_dts_decoder.c:524
+msgid "HELP! a mono-only audio driver?!\n"
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:805
+msgid "A/52 volume"
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:806
+msgid ""
+"With A/52 audio, you can modify the volume at the decoder level. This has "
+"the advantage of the audio being already decoded for the specified volume, "
+"so later operations like channel downmixing will work on an audio stream of "
+"the given volume."
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:814
+msgid "use A/52 dynamic range compression"
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:815
+msgid ""
+"Dynamic range compression limits the dynamic range of the audio. This means "
+"making the loud sounds softer, and the soft sounds louder, so you can more "
+"easily listen to the audio in a noisy environment without disturbing anyone."
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:822
+msgid "downmix audio to 2 channel surround stereo"
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:823
+msgid ""
+"When you want to listen to multichannel surround sound, but you have only "
+"two speakers or a surround decoder or amplifier which does some sort of "
+"matrix surround decoding like prologic, you should enable this option so "
+"that the additional channels are mixed into the stereo signal."
+msgstr ""
+
+#: src/libxineadec/xine_faad_decoder.c:130
+msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
+msgstr ""
+
+#: src/libxineadec/xine_faad_decoder.c:139
+msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
+msgstr ""
+
+#: src/libxineadec/xine_faad_decoder.c:150
+msgid "libfaad: libfaad NeAACDecInit failed.\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:249
+#, c-format
+msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:323
+msgid "libmusepack: data after last frame ignored\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:334
+msgid "libmusepack: mpc_decoder_initialise failed\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:354
+#: src/libxineadec/xine_musepack_decoder.c:369
+#, c-format
+msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgstr ""
+
 #: src/libxinevdec/bitplane.c:1272
 #, c-format
 msgid "bitplane: error doing ByteRun1 decompression\n"
@@ -2899,22 +2906,6 @@ msgid ""
 "* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
 msgstr ""
 
-#: src/post/planar/eq.c:186
-msgid ""
-"Software equalizer with interactive controls just like the hardware "
-"equalizer, for cards/drivers that do not support brightness and contrast "
-"controls in hardware.\n"
-"\n"
-"Parameters\n"
-"  brightness\n"
-"  contrast\n"
-"\n"
-"Note: It is possible to use frontend's control window to set these "
-"parameters.\n"
-"\n"
-"* mplayer's eq (C) Richard Felker\n"
-msgstr ""
-
 #: src/post/planar/eq2.c:359
 msgid ""
 "Alternative software equalizer that uses lookup tables (very slow), allowing "
@@ -2939,6 +2930,22 @@ msgid ""
 "* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
 msgstr ""
 
+#: src/post/planar/eq.c:186
+msgid ""
+"Software equalizer with interactive controls just like the hardware "
+"equalizer, for cards/drivers that do not support brightness and contrast "
+"controls in hardware.\n"
+"\n"
+"Parameters\n"
+"  brightness\n"
+"  contrast\n"
+"\n"
+"Note: It is possible to use frontend's control window to set these "
+"parameters.\n"
+"\n"
+"* mplayer's eq (C) Richard Felker\n"
+msgstr ""
+
 #: src/post/planar/expand.c:251
 msgid ""
 "The expand plugin is meant to take frames of arbitrary aspect ratio and "
@@ -3014,6 +3021,63 @@ msgid ""
 "* mplayer's unsharp (C) 2002 Remi Guyomarch\n"
 msgstr ""
 
+#: src/vdr/input_vdr.c:183 src/vdr/input_vdr.c:223 src/vdr/input_vdr.c:2297
+#: src/vdr/input_vdr.c:2394
+#, fuzzy, c-format
+msgid ": input event write: %s.\n"
+msgstr "input_cda: fopen(%s) failed: %s\n"
+
+#: src/vdr/input_vdr.c:713 src/vdr/input_vdr.c:1137
+msgid ": buffer_pool_alloc() failed!\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:782
+#, c-format
+msgid ": flush buffers (vb: %d, ab: %d, vf: %d, af: %d) %s.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1475
+#, c-format
+msgid ": shutting down rpc thread (timeout: %d ms) ...\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1499
+#, fuzzy, c-format
+msgid ": cancelling rpc thread in function %d...\n"
+msgstr "video_out : não consigo criar thread (%s)\n"
+
+#: src/vdr/input_vdr.c:1506
+msgid ": joining rpc thread ...\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1508
+msgid ": rpc thread joined.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:2137 src/vdr/input_vdr.c:2151 src/vdr/input_vdr.c:2169
+#: src/vdr/input_vdr.c:2190 src/vdr/input_vdr.c:2211
+#, fuzzy, c-format
+msgid ": failed to open '%s' (%s)\n"
+msgstr "input_http: failed to open socket\n"
+
+#: src/vdr/input_vdr.c:2153
+msgid "timeout expired during setup phase"
+msgstr ""
+
+#: src/vdr/input_vdr.c:2227
+#, fuzzy, c-format
+msgid ": can't create new thread (%s)\n"
+msgstr "demux_ts: não consigo criar novo thread (%s)\n"
+
+#: src/vdr/input_vdr.c:2487
+msgid "VDR display device plugin"
+msgstr ""
+
+#: src/vdr/post_vdr_video.c:435
+#, c-format
+msgid ": osd: (%d, %d)-(%d, %d)@%lg\n"
+msgstr ""
+
 #: src/video_out/video_out_aa.c:311
 msgid "xine video output plugin using the ascii-art library"
 msgstr ""
@@ -3257,8 +3321,8 @@ msgid ""
 msgstr ""
 
 #: src/video_out/video_out_opengl.c:1918 src/video_out/video_out_vidix.c:1015
-#: src/video_out/video_out_xcbxv.c:1476 src/video_out/video_out_xv.c:1489
-#: src/video_out/video_out_xvmc.c:1461 src/video_out/video_out_xxmc.c:2465
+#: src/video_out/video_out_xcbxv.c:1304 src/video_out/video_out_xv.c:1359
+#: src/video_out/video_out_xvmc.c:1423 src/video_out/video_out_xxmc.c:2531
 msgid "enable double buffering"
 msgstr ""
 
@@ -3333,9 +3397,9 @@ msgstr ""
 msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
 msgstr ""
 
-#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1443
-#: src/video_out/video_out_xv.c:1456 src/video_out/video_out_xvmc.c:1446
-#: src/video_out/video_out_xxmc.c:2432
+#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1271
+#: src/video_out/video_out_xv.c:1326 src/video_out/video_out_xvmc.c:1408
+#: src/video_out/video_out_xxmc.c:2498
 msgid "video overlay colour key"
 msgstr ""
 
@@ -3485,9 +3549,9 @@ msgstr ""
 msgid "The intensity of the blue colour components."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1477
-#: src/video_out/video_out_xv.c:1490 src/video_out/video_out_xvmc.c:1462
-#: src/video_out/video_out_xxmc.c:2466
+#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1305
+#: src/video_out/video_out_xv.c:1360 src/video_out/video_out_xvmc.c:1424
+#: src/video_out/video_out_xxmc.c:2532
 msgid ""
 "Double buffering will synchronize the update of the video image to the "
 "repainting of the entire screen (\"vertical retrace\"). This eliminates "
@@ -3520,9 +3584,9 @@ msgid "video overlay colour key red component"
 msgstr ""
 
 #: src/video_out/video_out_vidix.c:1159 src/video_out/video_out_vidix.c:1166
-#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1444
-#: src/video_out/video_out_xv.c:1457 src/video_out/video_out_xvmc.c:1447
-#: src/video_out/video_out_xxmc.c:2433
+#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1272
+#: src/video_out/video_out_xv.c:1327 src/video_out/video_out_xvmc.c:1409
+#: src/video_out/video_out_xxmc.c:2499
 msgid ""
 "The colour key is used to tell the graphics card where to overlay the video "
 "image. Try different values, if you experience windows becoming transparent."
@@ -3550,13 +3614,13 @@ msgid "%s: %s: allocating image\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbshm.c:159 src/video_out/video_out_xcbshm.c:169
-#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:272
-#: src/video_out/video_out_xcbxv.c:282 src/video_out/video_out_xcbxv.c:292
-#: src/video_out/video_out_xcbxv.c:304 src/video_out/video_out_xshm.c:204
+#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:267
+#: src/video_out/video_out_xcbxv.c:277 src/video_out/video_out_xcbxv.c:287
+#: src/video_out/video_out_xcbxv.c:299 src/video_out/video_out_xshm.c:204
 #: src/video_out/video_out_xshm.c:221 src/video_out/video_out_xshm.c:232
-#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:296
-#: src/video_out/video_out_xv.c:307 src/video_out/video_out_xv.c:316
-#: src/video_out/video_out_xv.c:352 src/video_out/video_out_xxmc.c:648
+#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:295
+#: src/video_out/video_out_xv.c:322 src/video_out/video_out_xv.c:331
+#: src/video_out/video_out_xv.c:367 src/video_out/video_out_xxmc.c:648
 #: src/video_out/video_out_xxmc.c:659 src/video_out/video_out_xxmc.c:668
 #: src/video_out/video_out_xxmc.c:704
 #, c-format
@@ -3568,8 +3632,8 @@ msgstr ""
 msgid "%s: shared memory error (address error) when allocating image \n"
 msgstr ""
 
-#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:302
-#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:350
+#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:297
+#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:365
 #: src/video_out/video_out_xxmc.c:702
 #, c-format
 msgid "%s: x11 error during shared memory XImage creation\n"
@@ -3599,61 +3663,61 @@ msgstr ""
 msgid "xine video output plugin using the MIT X shared memory extension"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:270 src/video_out/video_out_xv.c:305
+#: src/video_out/video_out_xcbxv.c:265 src/video_out/video_out_xv.c:320
 #: src/video_out/video_out_xxmc.c:657
 #, c-format
 msgid "%s: XvShmCreateImage returned a zero size\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:280 src/video_out/video_out_xv.c:314
+#: src/video_out/video_out_xcbxv.c:275 src/video_out/video_out_xv.c:329
 #: src/video_out/video_out_xxmc.c:666
 #, c-format
 msgid "%s: shared memory error in shmget: %s\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:290
+#: src/video_out/video_out_xcbxv.c:285
 #, c-format
 msgid "%s: shared memory error (address error)\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1294 src/video_out/video_out_xv.c:1301
-#: src/video_out/video_out_xxmc.c:2283
+#: src/video_out/video_out_xcbxv.c:1125 src/video_out/video_out_xv.c:1174
+#: src/video_out/video_out_xxmc.c:2349
 #, c-format
 msgid "%s: Xv extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1336 src/video_out/video_out_xv.c:1338
-#: src/video_out/video_out_xxmc.c:2320
+#: src/video_out/video_out_xcbxv.c:1167 src/video_out/video_out_xv.c:1211
+#: src/video_out/video_out_xxmc.c:2386
 #, c-format
 msgid ""
 "%s: Xv extension is present but I couldn't find a usable yuv12 port.\n"
 "\tLooks like your graphics hardware driver doesn't support Xv?!\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1345
+#: src/video_out/video_out_xcbxv.c:1176
 #, c-format
 msgid ""
 "%s: using Xv port %d from adaptor %s for hardware colorspace conversion and "
 "scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1452 src/video_out/video_out_xv.c:1465
-#: src/video_out/video_out_xvmc.c:1455 src/video_out/video_out_xxmc.c:2441
+#: src/video_out/video_out_xcbxv.c:1280 src/video_out/video_out_xv.c:1335
+#: src/video_out/video_out_xvmc.c:1417 src/video_out/video_out_xxmc.c:2507
 msgid "autopaint colour key"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1453 src/video_out/video_out_xv.c:1466
-#: src/video_out/video_out_xvmc.c:1456 src/video_out/video_out_xxmc.c:2442
+#: src/video_out/video_out_xcbxv.c:1281 src/video_out/video_out_xv.c:1336
+#: src/video_out/video_out_xvmc.c:1418 src/video_out/video_out_xxmc.c:2508
 msgid "Make Xv autopaint its colorkey."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1460 src/video_out/video_out_xv.c:1473
-#: src/video_out/video_out_xxmc.c:2449
+#: src/video_out/video_out_xcbxv.c:1288 src/video_out/video_out_xv.c:1343
+#: src/video_out/video_out_xxmc.c:2515
 msgid "bilinear scaling mode"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1461 src/video_out/video_out_xv.c:1474
-#: src/video_out/video_out_xxmc.c:2450
+#: src/video_out/video_out_xcbxv.c:1289 src/video_out/video_out_xv.c:1344
+#: src/video_out/video_out_xxmc.c:2516
 msgid ""
 "Selects the bilinear scaling mode for Permedia cards. The individual values "
 "are:\n"
@@ -3668,74 +3732,30 @@ msgid ""
 "2 - enable full bilinear filtering"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1513 src/video_out/video_out_xv.c:1523
-#: src/video_out/video_out_xxmc.c:2506
+#: src/video_out/video_out_xcbxv.c:1341 src/video_out/video_out_xv.c:1393
+#: src/video_out/video_out_xxmc.c:2572
 #, c-format
 msgid "%s: this adaptor supports the yv12 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1518 src/video_out/video_out_xv.c:1528
-#: src/video_out/video_out_xxmc.c:2511
+#: src/video_out/video_out_xcbxv.c:1346 src/video_out/video_out_xv.c:1398
+#: src/video_out/video_out_xxmc.c:2577
 #, c-format
 msgid "%s: this adaptor supports the yuy2 format.\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1526 src/video_out/video_out_xv.c:1550
-#: src/video_out/video_out_xxmc.c:2534
+#: src/video_out/video_out_xcbxv.c:1354 src/video_out/video_out_xv.c:1420
+#: src/video_out/video_out_xxmc.c:2600
 msgid "pitch alignment workaround"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1527 src/video_out/video_out_xv.c:1551
-#: src/video_out/video_out_xxmc.c:2535
+#: src/video_out/video_out_xcbxv.c:1355 src/video_out/video_out_xv.c:1421
+#: src/video_out/video_out_xxmc.c:2601
 msgid "Some buggy video drivers need a workaround to function properly."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1533 src/video_out/video_out_xv.c:1557
-#: src/video_out/video_out_xvmc.c:1524
-msgid "deinterlace method (deprecated)"
-msgstr ""
-
-#: src/video_out/video_out_xcbxv.c:1534 src/video_out/video_out_xv.c:1558
-#: src/video_out/video_out_xvmc.c:1525
-msgid ""
-"This config setting is deprecated. You should use the new deinterlacing post "
-"processing settings instead.\n"
-"\n"
-"From the old days of analog television, where the even and odd numbered "
-"lines of a video frame would be displayed at different times comes the idea "
-"to increase motion smoothness by also recording the lines at different "
-"times. This is called \"interlacing\". But unfortunately, todays displays "
-"show the even and odd numbered lines as one complete frame all at the same "
-"time (called \"progressive display\"), which results in ugly frame errors "
-"known as comb artifacts. Software deinterlacing is an approach to reduce "
-"these artifacts. The individual values are:\n"
-"\n"
-"none\n"
-"Disables software deinterlacing.\n"
-"\n"
-"bob\n"
-"Interpolates between the lines for moving parts of the image.\n"
-"\n"
-"weave\n"
-"Similar to bob, but with a tendency to preserve the full resolution, better "
-"for high detail in low movement scenes.\n"
-"\n"
-"greedy\n"
-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
-"\n"
-"onefield\n"
-"Always interpolates and reduces vertical resolution.\n"
-"\n"
-"onefieldxv\n"
-"Same as onefield, but does the interpolation in hardware.\n"
-"\n"
-"linearblend\n"
-"Applies a slight vertical blur to remove the comb artifacts. Good results "
-"with medium CPU usage."
-msgstr ""
-
-#: src/video_out/video_out_xcbxv.c:1588 src/video_out/video_out_xv.c:1631
-#: src/video_out/video_out_xxmc.c:2615
+#: src/video_out/video_out_xcbxv.c:1383 src/video_out/video_out_xv.c:1468
+#: src/video_out/video_out_xxmc.c:2681
 msgid "xine video output plugin using the MIT X video extension"
 msgstr ""
 
@@ -3744,93 +3764,93 @@ msgstr ""
 msgid "%s: shared memory error when allocating image\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:294 src/video_out/video_out_xxmc.c:646
+#: src/video_out/video_out_xv.c:293 src/video_out/video_out_xxmc.c:646
 #, c-format
 msgid "%s: XvShmCreateImage failed\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1348 src/video_out/video_out_xxmc.c:2330
+#: src/video_out/video_out_xv.c:1221 src/video_out/video_out_xxmc.c:2396
 #, c-format
 msgid ""
 "%s: using Xv port %ld from adaptor %s for hardware colorspace conversion and "
 "scaling.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1593
+#: src/video_out/video_out_xvmc.c:1496
 msgid "xine video output plugin using the XvMC X video extension"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1639
+#: src/video_out/video_out_xvmc.c:1542
 msgid "video_out_xvmc: XvMC extension not present.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1737
+#: src/video_out/video_out_xvmc.c:1640
 msgid ""
 "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
 "port.\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1746
+#: src/video_out/video_out_xvmc.c:1649
 #, c-format
 msgid ""
 "video_out_xvmc: using Xv port %ld from adaptor %s\n"
 "                for hardware colorspace conversion and scaling\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1751
+#: src/video_out/video_out_xvmc.c:1654
 msgid "                idct and motion compensation acceleration \n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1753
+#: src/video_out/video_out_xvmc.c:1656
 msgid "                motion compensation acceleration only\n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1755
+#: src/video_out/video_out_xvmc.c:1658
 msgid "                no XvMC support \n"
 msgstr ""
 
-#: src/video_out/video_out_xvmc.c:1756
+#: src/video_out/video_out_xvmc.c:1659
 #, c-format
 msgid "                With Overlay = %d; UnsignedIntra = %d.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2540
+#: src/video_out/video_out_xxmc.c:2606
 msgid "Make XvMC allocate more frames for better buffering."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2541
+#: src/video_out/video_out_xxmc.c:2607
 msgid ""
 "Some XvMC implementations allow more than 8 frames.\n"
 "This option, when turned on, makes the driver try to\n"
 "allocate 15 frames. A must for unichrome and live VDR.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2547
+#: src/video_out/video_out_xxmc.c:2613
 msgid "Unichrome cpu save"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2548
+#: src/video_out/video_out_xxmc.c:2614
 msgid ""
 "Saves CPU time by sleeping while decoder works.\n"
 "Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n"
 "Experimental.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2554
+#: src/video_out/video_out_xxmc.c:2620
 msgid "Fix buggy NVIDIA XvMC subpicture colors"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2555
+#: src/video_out/video_out_xxmc.c:2621
 msgid ""
 "There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
 "look blue and vice versa. This option provides a workaround.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2560
+#: src/video_out/video_out_xxmc.c:2626
 msgid "Use bob as accelerated deinterlace method."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2561
+#: src/video_out/video_out_xxmc.c:2627
 msgid ""
 "When interlacing is enabled for hardware accelerated frames,\n"
 "Alternate between top and bottom field at double the frame rate.\n"
@@ -3854,11 +3874,11 @@ msgstr ""
 msgid "x11osd: unscaled overlay created (%s mode).\n"
 msgstr ""
 
-#: src/xine-engine/alphablend.c:2123
+#: src/xine-engine/alphablend.c:2146
 msgid "disable exact alpha blending of overlays"
 msgstr ""
 
-#: src/xine-engine/alphablend.c:2124
+#: src/xine-engine/alphablend.c:2147
 msgid ""
 "If you experience a performance impact when an On Screen Display or other "
 "overlays like DVD subtitles are active, then you might want to enable this "
@@ -4409,33 +4429,33 @@ msgid ""
 "foreground-border-background."
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:380
+#: src/xine-engine/video_decoder.c:390
 #, fuzzy, c-format
 msgid "video_decoder: no plugin available to handle '%s'\n"
 msgstr "video decoder plugin achado : %s\n"
 
-#: src/xine-engine/video_decoder.c:459
+#: src/xine-engine/video_decoder.c:469
 #, c-format
 msgid "video_decoder: error, unknown buffer type: %08x\n"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:495
+#: src/xine-engine/video_decoder.c:505
 msgid "number of video buffers"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:496
+#: src/xine-engine/video_decoder.c:506
 msgid ""
 "The number of video buffers (each is 8k in size) xine uses in its internal "
 "queue. Higher values mean smoother playback for unreliable inputs, but also "
 "increased latency and memory consumption."
 msgstr ""
 
-#: src/xine-engine/video_out.c:642
+#: src/xine-engine/video_out.c:671
 #, c-format
 msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
 msgstr "%d quadros enviados, %d quadros pulados, %d quadros descartados\n"
 
-#: src/xine-engine/video_out.c:815
+#: src/xine-engine/video_out.c:844
 #, fuzzy, c-format
 msgid ""
 "video_out: throwing away image with pts %<PRId64> because it's too old "
@@ -4444,37 +4464,37 @@ msgstr ""
 "video_out : descartando imagem com pts %d porque é muito velha (diff : %d > %"
 "d).\n"
 
-#: src/xine-engine/video_out.c:1794
+#: src/xine-engine/video_out.c:1863
 msgid "default number of video frames"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1795
+#: src/xine-engine/video_out.c:1864
 msgid ""
 "The default number of video frames to request from xine video out driver. "
 "Some drivers will override this setting with their own values."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1834
+#: src/xine-engine/video_out.c:1921
 msgid "percentage of skipped frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1835
+#: src/xine-engine/video_out.c:1922
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not decoded in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1840
+#: src/xine-engine/video_out.c:1927
 msgid "percentage of discarded frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1841
+#: src/xine-engine/video_out.c:1928
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not scheduled for display in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1875
+#: src/xine-engine/video_out.c:1965
 #, fuzzy
 msgid "video_out: sorry, this should not happen. please restart xine.\n"
 msgstr ""
@@ -4520,129 +4540,129 @@ msgid ""
 "accelerated, this can dramatically reduce CPU usage."
 msgstr ""
 
-#: src/xine-engine/xine.c:706 src/xine-engine/xine.c:813
-#: src/xine-engine/xine.c:852 src/xine-engine/xine.c:888
-#: src/xine-engine/xine.c:900 src/xine-engine/xine.c:913
-#: src/xine-engine/xine.c:926 src/xine-engine/xine.c:939
-#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:990
-#: src/xine-engine/xine.c:1025
+#: src/xine-engine/xine.c:771 src/xine-engine/xine.c:878
+#: src/xine-engine/xine.c:917 src/xine-engine/xine.c:953
+#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:978
+#: src/xine-engine/xine.c:991 src/xine-engine/xine.c:1004
+#: src/xine-engine/xine.c:1030 src/xine-engine/xine.c:1055
+#: src/xine-engine/xine.c:1090
 msgid "xine: error while parsing mrl\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:742
+#: src/xine-engine/xine.c:807
 #, fuzzy, c-format
 msgid "xine: found input plugin  : %s\n"
 msgstr "xine: não consigo achar um plugin para este MRL\n"
 
-#: src/xine-engine/xine.c:760
+#: src/xine-engine/xine.c:825
 #, fuzzy, c-format
 msgid "xine: input plugin cannot open MRL [%s]\n"
 msgstr "xine: usando plugin de entrada >%s< para este MRL (%s).\n"
 
-#: src/xine-engine/xine.c:776
+#: src/xine-engine/xine.c:841
 #, fuzzy, c-format
 msgid "xine: cannot find input plugin for MRL [%s]\n"
 msgstr "xine: não consigo achar um plugin para este MRL\n"
 
-#: src/xine-engine/xine.c:802
+#: src/xine-engine/xine.c:867
 #, fuzzy, c-format
 msgid "xine: specified demuxer %s failed to start\n"
 msgstr "xine_play: demuxer falhou em começar\n"
 
-#: src/xine-engine/xine.c:838
+#: src/xine-engine/xine.c:903
 #, fuzzy, c-format
 msgid "xine: join rip input plugin\n"
 msgstr "http network stream input plugin"
 
-#: src/xine-engine/xine.c:845
+#: src/xine-engine/xine.c:910
 #, fuzzy
 msgid "xine: error opening rip input plugin instance\n"
 msgstr "http network stream input plugin"
 
-#: src/xine-engine/xine.c:876
+#: src/xine-engine/xine.c:941
 #, fuzzy, c-format
 msgid "xine: last_probed demuxer %s failed to start\n"
 msgstr "xine_play: demuxer falhou em começar\n"
 
-#: src/xine-engine/xine.c:905
+#: src/xine-engine/xine.c:970
 msgid "ignoring video\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:918
+#: src/xine-engine/xine.c:983
 msgid "ignoring audio\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:931
+#: src/xine-engine/xine.c:996
 msgid "ignoring subpicture\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:944
+#: src/xine-engine/xine.c:1009
 msgid "input cache plugin disabled\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1015
+#: src/xine-engine/xine.c:1080
 #, c-format
 msgid "subtitle mrl opened '%s'\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1019
+#: src/xine-engine/xine.c:1084
 #, fuzzy
 msgid "xine: error opening subtitle mrl\n"
 msgstr "input_dvd: não consigo abrir o arquivo >%s<\n"
 
-#: src/xine-engine/xine.c:1051
+#: src/xine-engine/xine.c:1116
 #, c-format
 msgid "xine: error while parsing MRL\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1058
+#: src/xine-engine/xine.c:1123
 #, c-format
 msgid "xine: changing option '%s' from MRL isn't permitted\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1078
+#: src/xine-engine/xine.c:1143
 #, fuzzy, c-format
 msgid "xine: couldn't find demux for >%s<\n"
 msgstr "xine: não conseguí achar o demuxer para >%s<\n"
 
-#: src/xine-engine/xine.c:1094
+#: src/xine-engine/xine.c:1159
 #, fuzzy, c-format
 msgid "xine: found demuxer plugin: %s\n"
 msgstr "xine: usando o plugin de demuxer >%s< para este MRL.\n"
 
-#: src/xine-engine/xine.c:1114
+#: src/xine-engine/xine.c:1179
 #, fuzzy, c-format
 msgid "xine: demuxer failed to start\n"
 msgstr "xine_play: demuxer falhou em começar\n"
 
-#: src/xine-engine/xine.c:1179
+#: src/xine-engine/xine.c:1244
 #, fuzzy, c-format
 msgid "xine_play: no demux available\n"
 msgstr "xine_play: demuxer falhou em começar\n"
 
-#: src/xine-engine/xine.c:1249
+#: src/xine-engine/xine.c:1314
 #, fuzzy, c-format
 msgid "xine_play: demux failed to start\n"
 msgstr "xine_play: demuxer falhou em começar\n"
 
-#: src/xine-engine/xine.c:1527
+#: src/xine-engine/xine.c:1592
 #, c-format
 msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1532
+#: src/xine-engine/xine.c:1597
 msgid "The specified save_dir might be a security risk."
 msgstr ""
 
-#: src/xine-engine/xine.c:1561
+#: src/xine-engine/xine.c:1626
 msgid "xine: locale not supported by C library\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1570
+#: src/xine-engine/xine.c:1635
 msgid "media format detection strategy"
 msgstr ""
 
-#: src/xine-engine/xine.c:1571
+#: src/xine-engine/xine.c:1636
 msgid ""
 "xine offers various methods to detect the media format of input to play. The "
 "individual values are:\n"
@@ -4660,11 +4680,11 @@ msgid ""
 "Detect by file name extension only.\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1589
+#: src/xine-engine/xine.c:1654
 msgid "directory for saving streams"
 msgstr ""
 
-#: src/xine-engine/xine.c:1590
+#: src/xine-engine/xine.c:1655
 msgid ""
 "When using the stream save feature, files will be written only into this "
 "directory.\n"
@@ -4674,11 +4694,11 @@ msgid ""
 "content in any file."
 msgstr ""
 
-#: src/xine-engine/xine.c:1601
+#: src/xine-engine/xine.c:1666
 msgid "allow implicit changes to the configuration (e.g. by MRL)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1602
+#: src/xine-engine/xine.c:1667
 msgid ""
 "If enabled, you allow xine to change your configuration without explicit "
 "actions from your side. For example configuration changes demanded by MRLs "
@@ -4688,26 +4708,26 @@ msgid ""
 "configuration, you might end with a totally messed up xine."
 msgstr ""
 
-#: src/xine-engine/xine.c:1616
+#: src/xine-engine/xine.c:1681
 msgid "Timeout for network stream reading (in seconds)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1617
+#: src/xine-engine/xine.c:1682
 msgid ""
 "Specifies the timeout when reading from network streams, in seconds. Too low "
 "values might stop streaming when the source is slow or the bandwidth is "
 "occupied, too high values will freeze the player if the connection is lost."
 msgstr ""
 
-#: src/xine-engine/xine.c:1969
+#: src/xine-engine/xine.c:2034
 msgid "messages"
 msgstr "menssagens"
 
-#: src/xine-engine/xine.c:1970
+#: src/xine-engine/xine.c:2035
 msgid "plugin"
 msgstr "plugin"
 
-#: src/xine-engine/xine.c:1971
+#: src/xine-engine/xine.c:2036
 msgid "trace"
 msgstr ""
 
@@ -5009,9 +5029,6 @@ msgstr ""
 #~ msgid "demux %u ts_open!\n"
 #~ msgstr "demux %u ts_open!\n"
 
-#~ msgid "demux_ts: can't create new thread (%s)\n"
-#~ msgstr "demux_ts: não consigo criar novo thread (%s)\n"
-
 #, fuzzy
 #~ msgid "demux_mpeg: please specify mpeg(mpeg1/mpeg2) stream type.\n"
 #~ msgstr "Voce deve especificar mpeg(mpeg1/mpeg2) como tipo de stream.\n"
diff --git a/po/sk.po b/po/sk.po
index 51a7a18f9..cdf47a6d8 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xine-lib 1.0\n"
 "Report-Msgid-Bugs-To: xine-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-04-24 21:48+0100\n"
+"POT-Creation-Date: 2007-06-02 13:14+0200\n"
 "PO-Revision-Date: 2004-09-15 13:53+0100\n"
 "Last-Translator: \n"
 "Language-Team: Slovak <ski18n@lists.isternet.sk>\n"
@@ -757,6 +757,12 @@ msgid "xine audio output plugin using sun-compliant audio devices/drivers"
 msgstr ""
 "výstupný xine audio plugin používa sun-compliant audio zariadenia/ovláda�e"
 
+#: src/combined/xine_ogg_demuxer.c:810
+#, c-format
+msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
+msgstr ""
+"stopa ogg: vorbis audio indikovaná, ale hlavi�ka vorbis prúdu nenájdená.\n"
+
 #: src/demuxers/demux_asf.c:428
 #, c-format
 msgid "demux_asf: warning: The stream id=%d is encrypted.\n"
@@ -895,12 +901,6 @@ msgstr ""
 "demux_mpeg_pes:Nerozoznaný súkr. prúd 1 0x%02x. Prosím nahláste to tvorcom "
 "xine.\n"
 
-#: src/demuxers/demux_ogg.c:802
-#, c-format
-msgid "ogg: vorbis audio track indicated but no vorbis stream header found.\n"
-msgstr ""
-"stopa ogg: vorbis audio indikovaná, ale hlavi�ka vorbis prúdu nenájdená.\n"
-
 #: src/demuxers/demux_snd.c:104
 #, c-format
 msgid "demux_snd: bad header parameters\n"
@@ -936,17 +936,6 @@ msgstr "demux_wc3movie: SHOT blok refercoval neznámu paletu (%d >= %d)\n"
 msgid "demux_wc3movie: There was a problem while loading palette chunks\n"
 msgstr "demux_wc3movie: Bol problém pri nahrávaní blokov palety\n"
 
-#: src/dxr3/dxr3.h:32
-#, fuzzy
-msgid "DXR3 device number"
-msgstr "Dxr3: Názov zariadenia"
-
-#: src/dxr3/dxr3.h:33
-msgid ""
-"If you have more than one DXR3 in your computer, you can specify which one "
-"to use here."
-msgstr ""
-
 #: src/dxr3/dxr3_decode_spu.c:253
 #, c-format
 msgid "dxr3_decode_spu: Failed to open spu device %s (%s)\n"
@@ -1041,6 +1030,17 @@ msgid ""
 msgstr ""
 "dxr3_decode_video: VAROVANIE: korigujem snímk. rýchlosť z PAL na NTSC\n"
 
+#: src/dxr3/dxr3.h:32
+#, fuzzy
+msgid "DXR3 device number"
+msgstr "Dxr3: Názov zariadenia"
+
+#: src/dxr3/dxr3.h:33
+msgid ""
+"If you have more than one DXR3 in your computer, you can specify which one "
+"to use here."
+msgstr ""
+
 #: src/dxr3/dxr3_mpeg_encoders.c:125
 msgid "dxr3_mpeg_encoder: failed to init librte\n"
 msgstr "dxr3_mpeg_encoder: init librte zlyhal\n"
@@ -1328,41 +1328,41 @@ msgid "video_out_dxr3: ERROR Reading overlay init file. Run autocal!\n"
 msgstr ""
 "video_out_dxr3: CHYBA Čítania init súboru prekrývania. Spustite autocal!\n"
 
-#: src/input/input_cdda.c:1608
+#: src/input/input_cdda.c:1611
 #, fuzzy, c-format
 msgid "%s: can't connect to %s:%d\n"
 msgstr "rtsp: nemožno sa pripojiť k '%s'\n"
 
-#: src/input/input_cdda.c:1655
+#: src/input/input_cdda.c:1658
 #, c-format
 msgid "input_cdda: successfuly connected to cddb server '%s:%d'.\n"
 msgstr "input_cdda: úspešne pripojenie na cddb server '%s:%d'.\n"
 
-#: src/input/input_cdda.c:1660
+#: src/input/input_cdda.c:1663
 #, c-format
 msgid "input_cdda: failed to connect to cddb server '%s:%d' (%s).\n"
 msgstr "input_cdda: nemožno sa pripojiť na cddb server '%s:%d' (%s).\n"
 
-#: src/input/input_cdda.c:2690
+#: src/input/input_cdda.c:2693
 msgid "CD Digital Audio (aka. CDDA)"
 msgstr "CD Digital Audio (aka. CDDA)"
 
-#: src/input/input_cdda.c:2742
+#: src/input/input_cdda.c:2745
 #, fuzzy
 msgid "device used for CD audio"
 msgstr "zariadenie pre cdda mechaniku"
 
-#: src/input/input_cdda.c:2743
+#: src/input/input_cdda.c:2746
 msgid ""
 "The path to the device, usually a CD or DVD drive, which you intend to use "
 "for playing audio CDs."
 msgstr ""
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid "query CDDB"
 msgstr ""
 
-#: src/input/input_cdda.c:2749
+#: src/input/input_cdda.c:2752
 msgid ""
 "Enables CDDB queries, which will give you convenient title and track names "
 "for your audio CDs.\n"
@@ -1371,12 +1371,12 @@ msgid ""
 "listening habits."
 msgstr ""
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 #, fuzzy
 msgid "CDDB server name"
 msgstr "cddbp meno servera"
 
-#: src/input/input_cdda.c:2757
+#: src/input/input_cdda.c:2760
 msgid ""
 "The CDDB server used to retrieve the title and track information from.\n"
 "This setting is security critical, because the sever will receive "
@@ -1384,20 +1384,20 @@ msgid ""
 "malicious replies. Be sure to enter a server you can trust."
 msgstr ""
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 #, fuzzy
 msgid "CDDB server port"
 msgstr "cddbp port servra"
 
-#: src/input/input_cdda.c:2765
+#: src/input/input_cdda.c:2768
 msgid "The server port used to retrieve the title and track information from."
 msgstr ""
 
-#: src/input/input_cdda.c:2771
+#: src/input/input_cdda.c:2774
 msgid "slow down disc drive to this speed factor"
 msgstr ""
 
-#: src/input/input_cdda.c:2772
+#: src/input/input_cdda.c:2775
 msgid ""
 "Since some CD or DVD drives make some really loud noises because of the fast "
 "disc rotation, xine will try to slow them down. With standard CD or DVD "
@@ -1406,124 +1406,130 @@ msgid ""
 "A value of zero here will disable the slowdown."
 msgstr ""
 
-#: src/input/input_dvb.c:899
+#: src/input/input_dvb.c:900
 #, fuzzy, c-format
 msgid "input_dvb: failed to open dvb channel file '%s': %s\n"
 msgstr "input_dvb: zlyhalo otvorenie súboru dvb kanála '%s'\n"
 
-#: src/input/input_dvb.c:905
+#: src/input/input_dvb.c:906
 #, fuzzy, c-format
 msgid "input_dvb: dvb channel file '%s' is not a plain file\n"
 msgstr "input_dvb: zlyhalo otvorenie súboru dvb kanála '%s'\n"
 
-#: src/input/input_dvb.c:2115 src/input/input_dvb.c:2943
+#: src/input/input_dvb.c:2116 src/input/input_dvb.c:2948
 msgid "input_dvb: tuner_set_channel failed\n"
 msgstr "input_dvb: tuner_set_channel zlyhal\n"
 
-#: src/input/input_dvb.c:2743
+#: src/input/input_dvb.c:2748
 msgid "input_dvb: cannot open dvb device\n"
 msgstr "input_dvb: nemožno otvoriť dvb zariadenie\n"
 
-#: src/input/input_dvb.c:2767
+#: src/input/input_dvb.c:2772
 #, c-format
 msgid "input_dvb: channel %d out of range, defaulting to 0\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2778
+#: src/input/input_dvb.c:2783
 #, fuzzy, c-format
 msgid "input_dvb: searching for channel %s\n"
 msgstr "input_dvb: zlyhalo otvorenie súboru dvb kanála '%s'\n"
 
-#: src/input/input_dvb.c:2801
+#: src/input/input_dvb.c:2806
 #, c-format
 msgid "input_dvb: exact match for %s not found: trying partial matches\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2808
+#: src/input/input_dvb.c:2813
 #, fuzzy, c-format
 msgid "input_dvb: found matching channel %s\n"
 msgstr "input_dvb: zlyhalo otvorenie súboru dvb kanála '%s'\n"
 
-#: src/input/input_dvb.c:2821
+#: src/input/input_dvb.c:2826
 #, c-format
 msgid "input_dvb: channel %s not found in channels.conf, defaulting.\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2827
+#: src/input/input_dvb.c:2832
 msgid ""
 "input_dvb: invalid channel specification, defaulting to last viewed "
 "channel.\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2833
+#: src/input/input_dvb.c:2838
 msgid "input_dvb: invalid channel specification, defaulting to channel 0\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2845
+#: src/input/input_dvb.c:2850
 msgid ""
 "input_dvb: dvbs mrl specified but the tuner doesn't appear to be QPSK (DVB-"
 "S)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2865
+#: src/input/input_dvb.c:2870
 msgid ""
 "input_dvb: dvbt mrl specified but the tuner doesn't appear to be OFDM (DVB-"
 "T)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2888 src/input/input_dvb.c:2914
+#: src/input/input_dvb.c:2893
 msgid ""
 "input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-"
 "C)\n"
 msgstr ""
 
-#: src/input/input_dvb.c:2949
+#: src/input/input_dvb.c:2919
+msgid ""
+"input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-"
+"A)\n"
+msgstr ""
+
+#: src/input/input_dvb.c:2954
 #, c-format
 msgid "input_dvb: cannot open dvr device '%s'\n"
 msgstr "input_dvb: nemožno otvoriť dvr zariadenie '%s'\n"
 
-#: src/input/input_dvb.c:2971
+#: src/input/input_dvb.c:2976
 #, fuzzy
 msgid "input_dvb: cannot create EPG updater thread\n"
 msgstr "input_rtp: nemožno vytvoriť nové vlákno (%s)\n"
 
-#: src/input/input_dvb.c:3033
+#: src/input/input_dvb.c:3038
 msgid "use DVB 'center cutout' (zoom)"
 msgstr ""
 
-#: src/input/input_dvb.c:3034
+#: src/input/input_dvb.c:3039
 msgid ""
 "This will allow fullscreen playback of 4:3 content transmitted in a 16:9 "
 "frame."
 msgstr ""
 
-#: src/input/input_dvb.c:3127
+#: src/input/input_dvb.c:3132
 msgid "DVB (Digital TV) input plugin"
 msgstr "DVB (Digital TV) vstupný modul"
 
-#: src/input/input_dvb.c:3244
+#: src/input/input_dvb.c:3249
 msgid "Remember last DVB channel watched"
 msgstr ""
 
-#: src/input/input_dvb.c:3245
+#: src/input/input_dvb.c:3250
 msgid ""
 "On autoplay, xine will remember and switch to the channel indicated in media."
 "dvb.last_channel. "
 msgstr ""
 
-#: src/input/input_dvb.c:3252
+#: src/input/input_dvb.c:3257
 msgid "Last DVB channel viewed"
 msgstr ""
 
-#: src/input/input_dvb.c:3253
+#: src/input/input_dvb.c:3258
 msgid "If enabled xine will remember and switch to this channel. "
 msgstr ""
 
-#: src/input/input_dvb.c:3259
+#: src/input/input_dvb.c:3264
 msgid "Number of dvb card to use."
 msgstr ""
 
-#: src/input/input_dvb.c:3260
+#: src/input/input_dvb.c:3265
 msgid ""
 "Leave this at zero unless you really have more than 1 card in your system."
 msgstr ""
@@ -1715,91 +1721,91 @@ msgstr ""
 msgid "gnome-vfs input plugin as shipped with xine"
 msgstr "modul vstupu gnome-vfs dodávaný so xine"
 
-#: src/input/input_http.c:174
+#: src/input/input_http.c:176
 #, fuzzy, c-format
 msgid "input_http: gethostbyname(%s) failed: %s\n"
 msgstr "input_rip: skok zlyhal: %s\n"
 
-#: src/input/input_http.c:400 src/input/input_http.c:943
+#: src/input/input_http.c:402 src/input/input_http.c:957
 #, c-format
 msgid "input_http: read error %d\n"
 msgstr "input_http: chyba pri �ítaní %d\n"
 
-#: src/input/input_http.c:627
+#: src/input/input_http.c:629
 msgid "Connecting HTTP server..."
 msgstr "Pripájam sa na HTTP server..."
 
-#: src/input/input_http.c:819
+#: src/input/input_http.c:820
 #, c-format
 msgid "input_http: invalid http answer\n"
 msgstr "input_http: neplatná odpove� http\n"
 
-#: src/input/input_http.c:825
+#: src/input/input_http.c:826
 #, c-format
 msgid "input_http: 3xx redirection: >%d %s<\n"
 msgstr "input_http: presmerovanie 3xx: >%d %s<\n"
 
-#: src/input/input_http.c:830 src/input/input_http.c:836
-#: src/input/input_http.c:843
+#: src/input/input_http.c:831 src/input/input_http.c:836
+#: src/input/input_http.c:842 src/input/input_http.c:849
 #, c-format
 msgid "input_http: http status not 2xx: >%d %s<\n"
 msgstr "input_http: stav http nie je 2xx: >%d %s<\n"
 
-#: src/input/input_http.c:853
+#: src/input/input_http.c:859
 #, fuzzy, c-format
 msgid "input_http: content length = %<PRIdMAX> bytes\n"
 msgstr "input_http: dĺžka obsahu = %Ld bajtov\n"
 
-#: src/input/input_http.c:922
+#: src/input/input_http.c:932
 #, fuzzy, c-format
 msgid "input_http: buffer exhausted after %d bytes."
 msgstr "input_http: chyba pri �ítaní %d\n"
 
-#: src/input/input_http.c:996
+#: src/input/input_http.c:1010
 msgid "http input plugin"
 msgstr "modul vstupu zo siete protokolom http"
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 #, fuzzy
 msgid "HTTP proxy host"
 msgstr "adresa http proxy"
 
-#: src/input/input_http.c:1062
+#: src/input/input_http.c:1076
 msgid "The hostname of the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 #, fuzzy
 msgid "HTTP proxy port"
 msgstr "port http proxy"
 
-#: src/input/input_http.c:1066
+#: src/input/input_http.c:1080
 msgid "The port number of the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1076
+#: src/input/input_http.c:1090
 #, fuzzy
 msgid "HTTP proxy username"
 msgstr "meno používateľa pre http proxy"
 
-#: src/input/input_http.c:1077
+#: src/input/input_http.c:1091
 msgid "The user name for the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1080
+#: src/input/input_http.c:1094
 #, fuzzy
 msgid "HTTP proxy password"
 msgstr "heslo pre http proxy"
 
-#: src/input/input_http.c:1081
+#: src/input/input_http.c:1095
 msgid "The password for the HTTP proxy."
 msgstr ""
 
-#: src/input/input_http.c:1084
+#: src/input/input_http.c:1098
 msgid "Domains for which to ignore the HTTP proxy"
 msgstr ""
 
-#: src/input/input_http.c:1085
+#: src/input/input_http.c:1099
 msgid ""
 "A comma-separated list of domain names for which the proxy is to be "
 "ignored.\n"
@@ -2011,34 +2017,34 @@ msgstr "Buffer pretiekol..."
 msgid "Adjusting..."
 msgstr "Prispôsobovanie sa..."
 
-#: src/input/input_v4l.c:660
+#: src/input/input_v4l.c:658
 msgid "Tuner name not found\n"
 msgstr "Meno tuneru nenájdené\n"
 
-#: src/input/input_v4l.c:1876
+#: src/input/input_v4l.c:1874
 msgid "v4l tv input plugin"
 msgstr "modul vstupu z tv v4l"
 
-#: src/input/input_v4l.c:1880
+#: src/input/input_v4l.c:1878
 msgid "v4l radio input plugin"
 msgstr "modul vstupu z rádia v4l"
 
-#: src/input/input_v4l.c:1912
+#: src/input/input_v4l.c:1910
 #, fuzzy
 msgid "v4l video device"
 msgstr "cesta k video zariadeniu v4l"
 
-#: src/input/input_v4l.c:1913
+#: src/input/input_v4l.c:1911
 #, fuzzy
 msgid "The path to your Video4Linux video device."
 msgstr "cesta k video zariadeniu v4l"
 
-#: src/input/input_v4l.c:1938
+#: src/input/input_v4l.c:1936
 #, fuzzy
 msgid "v4l radio device"
 msgstr "cesta k rádio zariadeniu v4l"
 
-#: src/input/input_v4l.c:1939
+#: src/input/input_v4l.c:1937
 #, fuzzy
 msgid "The path to your Video4Linux radio device."
 msgstr "cesta k rádio zariadeniu v4l"
@@ -2204,56 +2210,56 @@ msgstr "Chyba pri získavaní aktuálneho �ísla segmentu"
 msgid "Should have converted this above"
 msgstr "Vyššie uvedené by malo byť prevedené"
 
-#: src/input/vcd/xineplug_inp_vcd.c:191
+#: src/input/vcd/xineplug_inp_vcd.c:192
 msgid "failed to find a device with a VCD"
 msgstr "zlyhalo hľadanie zariadenia s VCD"
 
-#: src/input/vcd/xineplug_inp_vcd.c:328
+#: src/input/vcd/xineplug_inp_vcd.c:329
 msgid "was passed a null class parameter"
 msgstr "bol poslaný parameter neznámej triedy"
 
-#: src/input/vcd/xineplug_inp_vcd.c:972
+#: src/input/vcd/xineplug_inp_vcd.c:982
 msgid "Invalid current entry type"
 msgstr "Neplatný typ aktuálnej položky"
 
-#: src/input/vcd/xineplug_inp_vcd.c:996
+#: src/input/vcd/xineplug_inp_vcd.c:1006
 msgid ""
 "Video CD plugin with PBC and support for: (X)VCD, (X)SVCD, HQVCD, CVD ... "
 msgstr "Video CD modul s PBC a podporou pre: (X)VCD, (X)SVCD, HQVCD, CVD ... "
 
-#: src/input/vcd/xineplug_inp_vcd.c:1097
+#: src/input/vcd/xineplug_inp_vcd.c:1107
 #, fuzzy
 msgid "selection has no RETURN entry"
 msgstr "výber nemá �aľšiu položku"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1126
+#: src/input/vcd/xineplug_inp_vcd.c:1136
 msgid "DEFAULT selected, but PBC is not on."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1131
+#: src/input/vcd/xineplug_inp_vcd.c:1141
 #, fuzzy
 msgid "selection has no NEXT entry"
 msgstr "výber nemá �aľšiu položku"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1139
+#: src/input/vcd/xineplug_inp_vcd.c:1149
 #, fuzzy
 msgid "selection has no PREVIOUS entry"
 msgstr "výber nemá �aľšiu položku"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1146
+#: src/input/vcd/xineplug_inp_vcd.c:1156
 msgid "Unknown event type: "
 msgstr "Udalosť neznámeho typu: "
 
-#: src/input/vcd/xineplug_inp_vcd.c:1446 src/input/vcd/xineplug_inp_vcd.c:1493
+#: src/input/vcd/xineplug_inp_vcd.c:1452 src/input/vcd/xineplug_inp_vcd.c:1499
 msgid "The above message had unknown vcdimager log level"
 msgstr "Vyššie uvedená správa má neznámu log. úroveň vcdimageru"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1824
+#: src/input/vcd/xineplug_inp_vcd.c:1830
 #, fuzzy
 msgid "VCD default type to use on autoplay"
 msgstr "predvolený typ, ktorý sa použije na automat. prehratie VCD"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1825
+#: src/input/vcd/xineplug_inp_vcd.c:1831
 #, fuzzy
 msgid ""
 "The VCD play unit to use when none is specified in an MRL, e.g. vcd:// or "
@@ -2262,12 +2268,12 @@ msgstr ""
 "Jednotka prehrávania, ktorú použiť, ke� nie je uvedená v  MRL, napr. vcd:// "
 "alebo vcd:///dev/dvd:"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1835
+#: src/input/vcd/xineplug_inp_vcd.c:1841
 #, fuzzy
 msgid "CD-ROM drive used for VCD when none given"
 msgstr "predvolené CD zariadenie použité pre VCD, pokiaľ nie je žiadne zadané"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1836
+#: src/input/vcd/xineplug_inp_vcd.c:1842
 #, fuzzy
 msgid ""
 "What to use if no drive specified. If the setting is empty, xine will scan "
@@ -2276,32 +2282,32 @@ msgstr ""
 "Čo použiť ak nie je mechanika zadaná. Ak je zadané ni�, xine preskenuje CD "
 "mechaniky."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1846
+#: src/input/vcd/xineplug_inp_vcd.c:1852
 #, fuzzy
 msgid "VCD position slider range"
 msgstr "rozsah ukazovateľa pozície"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1847
+#: src/input/vcd/xineplug_inp_vcd.c:1853
 #, fuzzy
 msgid ""
 "range that the stream playback position slider represents playing a VCD."
 msgstr "Rozsah ukazovateľa pozície prehrávania použitého pri prehrávaní."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1855
+#: src/input/vcd/xineplug_inp_vcd.c:1861
 #, fuzzy
 msgid "VCD read-ahead caching?"
 msgstr "Použijeme kešovanie pred�ítaním?"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1856
+#: src/input/vcd/xineplug_inp_vcd.c:1862
 msgid "Class may lead to jerky playback on low-end machines."
 msgstr "Na slabších strojoch by mohlo viesť k trhanému prehrávaniu"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1866
+#: src/input/vcd/xineplug_inp_vcd.c:1872
 #, fuzzy
 msgid "automatically advance VCD track/entry"
 msgstr "Automaticky postupovať po stopách/položkách?"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1867
+#: src/input/vcd/xineplug_inp_vcd.c:1873
 #, fuzzy
 msgid ""
 "If enabled, we should automatically advance to the next entry or track. Used "
@@ -2310,24 +2316,24 @@ msgstr ""
 "Ak je povolené, mali by sme automaticky postúpiť na �aľšiu položku alebo "
 "stopu. Použité iba ak nie je zapnutá kontola prehrávania (PBC)."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1876
+#: src/input/vcd/xineplug_inp_vcd.c:1882
 #, fuzzy
 msgid "show 'rejected' VCD LIDs"
 msgstr "Zobraziť 'odmietnuté' LID?"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1877
+#: src/input/vcd/xineplug_inp_vcd.c:1883
 msgid ""
 "Some playback list IDs (LIDs) are marked not showable, but you can see them "
 "in the MRL list if this is set. Rejected entries are marked with an asterisk "
 "(*) appended to the MRL."
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1888
+#: src/input/vcd/xineplug_inp_vcd.c:1894
 #, fuzzy
 msgid "VCD format string for display banner"
 msgstr "formát reťazca pre nápis na obrazovke"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1889
+#: src/input/vcd/xineplug_inp_vcd.c:1895
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
 "specifiers start with a percent sign. Specifiers are:\n"
@@ -2348,12 +2354,12 @@ msgid ""
 " %% : a %\n"
 msgstr ""
 
-#: src/input/vcd/xineplug_inp_vcd.c:1914
+#: src/input/vcd/xineplug_inp_vcd.c:1920
 #, fuzzy
 msgid "VCD format string for stream comment field"
 msgstr "formátovací reťazec pre pole komentáru prúdu dát"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1915
+#: src/input/vcd/xineplug_inp_vcd.c:1921
 #, fuzzy
 msgid ""
 "VCD format used in the GUI Title. Similar to the Unix date command. Format "
@@ -2365,12 +2371,12 @@ msgstr ""
 "Špecifikátory formátu za�ínaju znakom percento. Špecifikátory sú %A, %C, %c, "
 "%F, %I, %L, %N, %P, %p, %S, %T, %V, %v, and %%."
 
-#: src/input/vcd/xineplug_inp_vcd.c:1927
+#: src/input/vcd/xineplug_inp_vcd.c:1933
 #, fuzzy
 msgid "VCD debug flag mask"
 msgstr "debugovacia maska príznakov"
 
-#: src/input/vcd/xineplug_inp_vcd.c:1928
+#: src/input/vcd/xineplug_inp_vcd.c:1934
 msgid ""
 "For tracking down bugs in the VCD plugin. Mask values are:\n"
 "   1: Meta information\n"
@@ -2387,63 +2393,6 @@ msgid ""
 "2048: Debugging from VCDINFO\n"
 msgstr ""
 
-#: src/liba52/xine_a52_decoder.c:742 src/libxineadec/xine_dts_decoder.c:524
-msgid "HELP! a mono-only audio driver?!\n"
-msgstr "POMOC! iba mono audio ovláda�?!\n"
-
-#: src/liba52/xine_a52_decoder.c:805
-#, fuzzy
-msgid "A/52 volume"
-msgstr "Hlasitosť"
-
-#: src/liba52/xine_a52_decoder.c:806
-msgid ""
-"With A/52 audio, you can modify the volume at the decoder level. This has "
-"the advantage of the audio being already decoded for the specified volume, "
-"so later operations like channel downmixing will work on an audio stream of "
-"the given volume."
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:814
-#, fuzzy
-msgid "use A/52 dynamic range compression"
-msgstr "povoliť a/52 dynamickú úpravu rozsahu"
-
-#: src/liba52/xine_a52_decoder.c:815
-msgid ""
-"Dynamic range compression limits the dynamic range of the audio. This means "
-"making the loud sounds softer, and the soft sounds louder, so you can more "
-"easily listen to the audio in a noisy environment without disturbing anyone."
-msgstr ""
-
-#: src/liba52/xine_a52_decoder.c:822
-#, fuzzy
-msgid "downmix audio to 2 channel surround stereo"
-msgstr "povoliť audio zmiešanie na 2.0 priestorové stereo"
-
-#: src/liba52/xine_a52_decoder.c:823
-msgid ""
-"When you want to listen to multichannel surround sound, but you have only "
-"two speakers or a surround decoder or amplifier which does some sort of "
-"matrix surround decoding like prologic, you should enable this option so "
-"that the additional channels are mixed into the stereo signal."
-msgstr ""
-
-#: src/libfaad/xine_faad_decoder.c:131
-#, fuzzy
-msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
-msgstr "libfaad: libfaad faacDecOpen() zlyhal.\n"
-
-#: src/libfaad/xine_faad_decoder.c:140
-#, fuzzy
-msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
-msgstr "libfaad: libfaad faacDecInit2() zlyhal.\n"
-
-#: src/libfaad/xine_faad_decoder.c:151
-#, fuzzy
-msgid "libfaad: libfaad NeAACDecInit failed.\n"
-msgstr "libfaad: libfaad faacDecInit() zlyhal.\n"
-
 #: src/libffmpeg/ff_audio_decoder.c:122
 #, c-format
 msgid "ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"
@@ -2468,47 +2417,6 @@ msgstr "ffmpeg_audio_dec: nemôžem otvoriť dekóder\n"
 msgid "dvaudio: increasing buffer to %d to avoid overflow.\n"
 msgstr "ffmpeg_audio_dec: zvä�šujem buffer na %d aby sa predišlo prete�eniu.\n"
 
-#: src/libffmpeg/ff_video_decoder.c:155
-msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
-msgstr "ffmpeg_video_dec: nepodporovaný formát snímku, DR1 nepovolený.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:173
-#, fuzzy
-msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
-msgstr "ffmpeg_video_dec: nepodporovaný formát snímku, DR1 nepovolený.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:333
-#, c-format
-msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
-msgstr "ffmpeg_video_dec: nenájdený ffmpeg dekóder pre buf typu 0x%X\n"
-
-#: src/libffmpeg/ff_video_decoder.c:362
-msgid "ffmpeg_video_dec: couldn't open decoder\n"
-msgstr "ffmpeg_video_dec: nedá sa otvoriť dekóder\n"
-
-#: src/libffmpeg/ff_video_decoder.c:397
-msgid "ffmpeg_video_dec: direct rendering enabled\n"
-msgstr "ffmpeg_video_dec: priame vykreslovanie zapnuté\n"
-
-#: src/libffmpeg/ff_video_decoder.c:816
-#, c-format
-msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
-msgstr "ffmpeg_video_dec: zvä�šujem buffer na %d aby sa predišlo prete�eniu.\n"
-
-#: src/libffmpeg/ff_video_decoder.c:1514
-#, fuzzy
-msgid "MPEG-4 postprocessing quality"
-msgstr "kvalita ffmpeg mpeg-4 postspracovania"
-
-#: src/libffmpeg/ff_video_decoder.c:1515
-msgid ""
-"You can adjust the amount of post processing applied to MPEG-4 video.\n"
-"Higher values result in better quality, but need more CPU. Lower values may "
-"result in image defects like block artifacts. For high quality content, too "
-"heavy post processing can actually make the image worse by blurring it too "
-"much."
-msgstr ""
-
 #: src/libffmpeg/ffmpeg_encoder.c:163
 #, fuzzy
 msgid "libavcodec mpeg output bitrate (kbit/s)"
@@ -2550,23 +2458,45 @@ msgstr "Dxr3enc: Maximálny kvantizér"
 msgid "The maximum compression to apply to an image in constant quality mode."
 msgstr ""
 
-#: src/libxineadec/xine_musepack_decoder.c:249
+#: src/libffmpeg/ff_video_decoder.c:155
+msgid "ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n"
+msgstr "ffmpeg_video_dec: nepodporovaný formát snímku, DR1 nepovolený.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:173
+#, fuzzy
+msgid "ffmpeg_video_dec: unsupported frame dimensions, DR1 disabled.\n"
+msgstr "ffmpeg_video_dec: nepodporovaný formát snímku, DR1 nepovolený.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:333
 #, c-format
-msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
-msgstr ""
+msgid "ffmpeg_video_dec: couldn't find ffmpeg decoder for buf type 0x%X\n"
+msgstr "ffmpeg_video_dec: nenájdený ffmpeg dekóder pre buf typu 0x%X\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:323
-msgid "libmusepack: data after last frame ignored\n"
-msgstr ""
+#: src/libffmpeg/ff_video_decoder.c:362
+msgid "ffmpeg_video_dec: couldn't open decoder\n"
+msgstr "ffmpeg_video_dec: nedá sa otvoriť dekóder\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:334
-msgid "libmusepack: mpc_decoder_initialise failed\n"
-msgstr ""
+#: src/libffmpeg/ff_video_decoder.c:397
+msgid "ffmpeg_video_dec: direct rendering enabled\n"
+msgstr "ffmpeg_video_dec: priame vykreslovanie zapnuté\n"
 
-#: src/libxineadec/xine_musepack_decoder.c:354
-#: src/libxineadec/xine_musepack_decoder.c:369
+#: src/libffmpeg/ff_video_decoder.c:816
 #, c-format
-msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgid "ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"
+msgstr "ffmpeg_video_dec: zvä�šujem buffer na %d aby sa predišlo prete�eniu.\n"
+
+#: src/libffmpeg/ff_video_decoder.c:1519
+#, fuzzy
+msgid "MPEG-4 postprocessing quality"
+msgstr "kvalita ffmpeg mpeg-4 postspracovania"
+
+#: src/libffmpeg/ff_video_decoder.c:1520
+msgid ""
+"You can adjust the amount of post processing applied to MPEG-4 video.\n"
+"Higher values result in better quality, but need more CPU. Lower values may "
+"result in image defects like block artifacts. For high quality content, too "
+"heavy post processing can actually make the image worse by blurring it too "
+"much."
 msgstr ""
 
 #: src/libreal/real_common.c:107
@@ -2583,10 +2513,6 @@ msgid ""
 "information on how to install the codecs."
 msgstr ""
 
-#: src/libreal/xine_real_video_decoder.c:164
-msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
-msgstr "libreal: Chyba hľadania symbolov! (nekompatibilita verzii?)\n"
-
 #: src/libreal/xine_real_audio_decoder.c:130
 #, c-format
 msgid "libareal: (audio) Cannot resolve symbols - incompatible dll: %s\n"
@@ -2606,6 +2532,10 @@ msgstr "libareal: chutné nastavenie dekódera zlyhalo, kód chyby: 0x%x\n"
 msgid "libareal: oups, real can do more than 2 channels ?\n"
 msgstr "libareal: ach, real môže mať viac ako 2 kanály ?\n"
 
+#: src/libreal/xine_real_video_decoder.c:164
+msgid "libreal: Error resolving symbols! (version incompatibility?)\n"
+msgstr "libreal: Chyba hľadania symbolov! (nekompatibilita verzii?)\n"
+
 #: src/libspucc/xine_cc_decoder.c:192
 #, fuzzy
 msgid "display closed captions in MPEG-2 streams"
@@ -2834,6 +2764,83 @@ msgstr "w32codec: Chyba inicializácie DirectShow zvuku\n"
 msgid "w32codec: Error initializing DMO Audio\n"
 msgstr "w32codec: Chyba inicializácie DMO zvuku\n"
 
+#: src/libxineadec/xine_a52_decoder.c:742
+#: src/libxineadec/xine_dts_decoder.c:524
+msgid "HELP! a mono-only audio driver?!\n"
+msgstr "POMOC! iba mono audio ovláda�?!\n"
+
+#: src/libxineadec/xine_a52_decoder.c:805
+#, fuzzy
+msgid "A/52 volume"
+msgstr "Hlasitosť"
+
+#: src/libxineadec/xine_a52_decoder.c:806
+msgid ""
+"With A/52 audio, you can modify the volume at the decoder level. This has "
+"the advantage of the audio being already decoded for the specified volume, "
+"so later operations like channel downmixing will work on an audio stream of "
+"the given volume."
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:814
+#, fuzzy
+msgid "use A/52 dynamic range compression"
+msgstr "povoliť a/52 dynamickú úpravu rozsahu"
+
+#: src/libxineadec/xine_a52_decoder.c:815
+msgid ""
+"Dynamic range compression limits the dynamic range of the audio. This means "
+"making the loud sounds softer, and the soft sounds louder, so you can more "
+"easily listen to the audio in a noisy environment without disturbing anyone."
+msgstr ""
+
+#: src/libxineadec/xine_a52_decoder.c:822
+#, fuzzy
+msgid "downmix audio to 2 channel surround stereo"
+msgstr "povoliť audio zmiešanie na 2.0 priestorové stereo"
+
+#: src/libxineadec/xine_a52_decoder.c:823
+msgid ""
+"When you want to listen to multichannel surround sound, but you have only "
+"two speakers or a surround decoder or amplifier which does some sort of "
+"matrix surround decoding like prologic, you should enable this option so "
+"that the additional channels are mixed into the stereo signal."
+msgstr ""
+
+#: src/libxineadec/xine_faad_decoder.c:130
+#, fuzzy
+msgid "libfaad: libfaad NeAACDecOpen() failed.\n"
+msgstr "libfaad: libfaad faacDecOpen() zlyhal.\n"
+
+#: src/libxineadec/xine_faad_decoder.c:139
+#, fuzzy
+msgid "libfaad: libfaad NeAACDecInit2 failed.\n"
+msgstr "libfaad: libfaad faacDecInit2() zlyhal.\n"
+
+#: src/libxineadec/xine_faad_decoder.c:150
+#, fuzzy
+msgid "libfaad: libfaad NeAACDecInit failed.\n"
+msgstr "libfaad: libfaad faacDecInit() zlyhal.\n"
+
+#: src/libxineadec/xine_musepack_decoder.c:249
+#, c-format
+msgid "libmusepack: mpc_streaminfo_read failed: %d\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:323
+msgid "libmusepack: data after last frame ignored\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:334
+msgid "libmusepack: mpc_decoder_initialise failed\n"
+msgstr ""
+
+#: src/libxineadec/xine_musepack_decoder.c:354
+#: src/libxineadec/xine_musepack_decoder.c:369
+#, c-format
+msgid "libmusepack: mpc_decoder_decode failed: %d\n"
+msgstr ""
+
 #: src/libxinevdec/bitplane.c:1272
 #, c-format
 msgid "bitplane: error doing ByteRun1 decompression\n"
@@ -3137,33 +3144,6 @@ msgstr ""
 "\n"
 "* mplayer's denoise3d (C) 2003 Daniel Moreno\n"
 
-#: src/post/planar/eq.c:186
-msgid ""
-"Software equalizer with interactive controls just like the hardware "
-"equalizer, for cards/drivers that do not support brightness and contrast "
-"controls in hardware.\n"
-"\n"
-"Parameters\n"
-"  brightness\n"
-"  contrast\n"
-"\n"
-"Note: It is possible to use frontend's control window to set these "
-"parameters.\n"
-"\n"
-"* mplayer's eq (C) Richard Felker\n"
-msgstr ""
-"Softvétový ekvalizér s interaktívným ovládaním tak ako pri hardvérovom "
-"ekvalizéri pre karty, ktoré nepodporujú riadenie jasu a kontrastu "
-"harvérovo.\n"
-"\n"
-"Parametre\n"
-"  jas\n"
-"  kontrast\n"
-"\n"
-"Poznámka: K ich nastaveniu je možne použiť ovládacie okno frontendu.\n"
-"\n"
-"* mplayer's eq (C) Richard Felker\n"
-
 #: src/post/planar/eq2.c:359
 msgid ""
 "Alternative software equalizer that uses lookup tables (very slow), allowing "
@@ -3208,6 +3188,33 @@ msgstr ""
 "\n"
 "* mplayer's eq2 (C) Hampa Hug, Daniel Moreno, Richard Felker\n"
 
+#: src/post/planar/eq.c:186
+msgid ""
+"Software equalizer with interactive controls just like the hardware "
+"equalizer, for cards/drivers that do not support brightness and contrast "
+"controls in hardware.\n"
+"\n"
+"Parameters\n"
+"  brightness\n"
+"  contrast\n"
+"\n"
+"Note: It is possible to use frontend's control window to set these "
+"parameters.\n"
+"\n"
+"* mplayer's eq (C) Richard Felker\n"
+msgstr ""
+"Softvétový ekvalizér s interaktívným ovládaním tak ako pri hardvérovom "
+"ekvalizéri pre karty, ktoré nepodporujú riadenie jasu a kontrastu "
+"harvérovo.\n"
+"\n"
+"Parametre\n"
+"  jas\n"
+"  kontrast\n"
+"\n"
+"Poznámka: K ich nastaveniu je možne použiť ovládacie okno frontendu.\n"
+"\n"
+"* mplayer's eq (C) Richard Felker\n"
+
 #: src/post/planar/expand.c:251
 #, fuzzy
 msgid ""
@@ -3324,6 +3331,65 @@ msgstr ""
 "\n"
 "* mplayer's unsharp (C) 2002 Rémi Guyomarch\n"
 
+#: src/vdr/input_vdr.c:183 src/vdr/input_vdr.c:223 src/vdr/input_vdr.c:2297
+#: src/vdr/input_vdr.c:2394
+#, fuzzy, c-format
+msgid ": input event write: %s.\n"
+msgstr "input_rip: skok zlyhal: %s\n"
+
+#: src/vdr/input_vdr.c:713 src/vdr/input_vdr.c:1137
+msgid ": buffer_pool_alloc() failed!\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:782
+#, c-format
+msgid ": flush buffers (vb: %d, ab: %d, vf: %d, af: %d) %s.\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1475
+#, c-format
+msgid ": shutting down rpc thread (timeout: %d ms) ...\n"
+msgstr ""
+
+#: src/vdr/input_vdr.c:1499
+#, fuzzy, c-format
+msgid ": cancelling rpc thread in function %d...\n"
+msgstr "input_rtp: nemožno vytvoriť nové vlákno (%s)\n"
+
+#: src/vdr/input_vdr.c:1506
+#, fuzzy
+msgid ": joining rpc thread ...\n"
+msgstr "RTP: zastavujem �ítacie vlákno...\n"
+
+#: src/vdr/input_vdr.c:1508
+#, fuzzy
+msgid ": rpc thread joined.\n"
+msgstr "RTP: �ítacie vlákno ukon�ené\n"
+
+#: src/vdr/input_vdr.c:2137 src/vdr/input_vdr.c:2151 src/vdr/input_vdr.c:2169
+#: src/vdr/input_vdr.c:2190 src/vdr/input_vdr.c:2211
+#, fuzzy, c-format
+msgid ": failed to open '%s' (%s)\n"
+msgstr "stdin: nemožno otvoriť '%s'\n"
+
+#: src/vdr/input_vdr.c:2153
+msgid "timeout expired during setup phase"
+msgstr ""
+
+#: src/vdr/input_vdr.c:2227
+#, fuzzy, c-format
+msgid ": can't create new thread (%s)\n"
+msgstr "input_rtp: nemožno vytvoriť nové vlákno (%s)\n"
+
+#: src/vdr/input_vdr.c:2487
+msgid "VDR display device plugin"
+msgstr ""
+
+#: src/vdr/post_vdr_video.c:435
+#, c-format
+msgid ": osd: (%d, %d)-(%d, %d)@%lg\n"
+msgstr ""
+
 #: src/video_out/video_out_aa.c:311
 msgid "xine video output plugin using the ascii-art library"
 msgstr "výstupný modul xine s použitím ascii-art knižnice"
@@ -3588,8 +3654,8 @@ msgid ""
 msgstr ""
 
 #: src/video_out/video_out_opengl.c:1918 src/video_out/video_out_vidix.c:1015
-#: src/video_out/video_out_xcbxv.c:1476 src/video_out/video_out_xv.c:1489
-#: src/video_out/video_out_xvmc.c:1461 src/video_out/video_out_xxmc.c:2465
+#: src/video_out/video_out_xcbxv.c:1304 src/video_out/video_out_xv.c:1359
+#: src/video_out/video_out_xvmc.c:1423 src/video_out/video_out_xxmc.c:2531
 msgid "enable double buffering"
 msgstr ""
 
@@ -3672,9 +3738,9 @@ msgstr ""
 msgid "video_out_pgx64: Error: ioctl failed (FBIOGATTR)\n"
 msgstr "video_out_pgx64: Chyba: nedostato�ná veľkosť video pamäte\n"
 
-#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1443
-#: src/video_out/video_out_xv.c:1456 src/video_out/video_out_xvmc.c:1446
-#: src/video_out/video_out_xxmc.c:2432
+#: src/video_out/video_out_pgx64.c:1464 src/video_out/video_out_xcbxv.c:1271
+#: src/video_out/video_out_xv.c:1326 src/video_out/video_out_xvmc.c:1408
+#: src/video_out/video_out_xxmc.c:2498
 #, fuzzy
 msgid "video overlay colour key"
 msgstr "Dx3: hodnota kľú�ovej farby prekrývánia"
@@ -3833,9 +3899,9 @@ msgstr ""
 msgid "The intensity of the blue colour components."
 msgstr ""
 
-#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1477
-#: src/video_out/video_out_xv.c:1490 src/video_out/video_out_xvmc.c:1462
-#: src/video_out/video_out_xxmc.c:2466
+#: src/video_out/video_out_vidix.c:1016 src/video_out/video_out_xcbxv.c:1305
+#: src/video_out/video_out_xv.c:1360 src/video_out/video_out_xvmc.c:1424
+#: src/video_out/video_out_xxmc.c:2532
 msgid ""
 "Double buffering will synchronize the update of the video image to the "
 "repainting of the entire screen (\"vertical retrace\"). This eliminates "
@@ -3869,9 +3935,9 @@ msgid "video overlay colour key red component"
 msgstr "rozsah kľú�ovej farby prekrývánia"
 
 #: src/video_out/video_out_vidix.c:1159 src/video_out/video_out_vidix.c:1166
-#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1444
-#: src/video_out/video_out_xv.c:1457 src/video_out/video_out_xvmc.c:1447
-#: src/video_out/video_out_xxmc.c:2433
+#: src/video_out/video_out_vidix.c:1173 src/video_out/video_out_xcbxv.c:1272
+#: src/video_out/video_out_xv.c:1327 src/video_out/video_out_xvmc.c:1409
+#: src/video_out/video_out_xxmc.c:2499
 msgid ""
 "The colour key is used to tell the graphics card where to overlay the video "
 "image. Try different values, if you experience windows becoming transparent."
@@ -3901,13 +3967,13 @@ msgid "%s: %s: allocating image\n"
 msgstr ""
 
 #: src/video_out/video_out_xcbshm.c:159 src/video_out/video_out_xcbshm.c:169
-#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:272
-#: src/video_out/video_out_xcbxv.c:282 src/video_out/video_out_xcbxv.c:292
-#: src/video_out/video_out_xcbxv.c:304 src/video_out/video_out_xshm.c:204
+#: src/video_out/video_out_xcbshm.c:181 src/video_out/video_out_xcbxv.c:267
+#: src/video_out/video_out_xcbxv.c:277 src/video_out/video_out_xcbxv.c:287
+#: src/video_out/video_out_xcbxv.c:299 src/video_out/video_out_xshm.c:204
 #: src/video_out/video_out_xshm.c:221 src/video_out/video_out_xshm.c:232
-#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:296
-#: src/video_out/video_out_xv.c:307 src/video_out/video_out_xv.c:316
-#: src/video_out/video_out_xv.c:352 src/video_out/video_out_xxmc.c:648
+#: src/video_out/video_out_xshm.c:251 src/video_out/video_out_xv.c:295
+#: src/video_out/video_out_xv.c:322 src/video_out/video_out_xv.c:331
+#: src/video_out/video_out_xv.c:367 src/video_out/video_out_xxmc.c:648
 #: src/video_out/video_out_xxmc.c:659 src/video_out/video_out_xxmc.c:668
 #: src/video_out/video_out_xxmc.c:704
 #, fuzzy, c-format
@@ -3921,8 +3987,8 @@ msgstr ""
 "video_out_xshm: chyba dielanej pamäte (chyba adresy) pri alokácii obrazu\n"
 "video_out_xshm: => nepoužívam rozšírenie MIT Shared Memory.\n"
 
-#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:302
-#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:350
+#: src/video_out/video_out_xcbshm.c:179 src/video_out/video_out_xcbxv.c:297
+#: src/video_out/video_out_xshm.c:249 src/video_out/video_out_xv.c:365
 #: src/video_out/video_out_xxmc.c:702
 #, c-format
 msgid "%s: x11 error during shared memory XImage creation\n"
@@ -3958,31 +4024,31 @@ msgstr "video_out_fb: Váš video mód nebol rozpoznaný, prepá�te.\n"
 msgid "xine video output plugin using the MIT X shared memory extension"
 msgstr "výstupný video xine modul použitím rozšírenia zdielanej pamäte MIT X"
 
-#: src/video_out/video_out_xcbxv.c:270 src/video_out/video_out_xv.c:305
+#: src/video_out/video_out_xcbxv.c:265 src/video_out/video_out_xv.c:320
 #: src/video_out/video_out_xxmc.c:657
 #, c-format
 msgid "%s: XvShmCreateImage returned a zero size\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:280 src/video_out/video_out_xv.c:314
+#: src/video_out/video_out_xcbxv.c:275 src/video_out/video_out_xv.c:329
 #: src/video_out/video_out_xxmc.c:666
 #, c-format
 msgid "%s: shared memory error in shmget: %s\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:290
+#: src/video_out/video_out_xcbxv.c:285
 #, c-format
 msgid "%s: shared memory error (address error)\n"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1294 src/video_out/video_out_xv.c:1301
-#: src/video_out/video_out_xxmc.c:2283
+#: src/video_out/video_out_xcbxv.c:1125 src/video_out/video_out_xv.c:1174
+#: src/video_out/video_out_xxmc.c:2349
 #, fuzzy, c-format
 msgid "%s: Xv extension not present.\n"
 msgstr "video_out_xv: Xv rozšírenie neprítomné.\n"
 
-#: src/video_out/video_out_xcbxv.c:1336 src/video_out/video_out_xv.c:1338
-#: src/video_out/video_out_xxmc.c:2320
+#: src/video_out/video_out_xcbxv.c:1167 src/video_out/video_out_xv.c:1211
+#: src/video_out/video_out_xxmc.c:2386
 #, fuzzy, c-format
 msgid ""
 "%s: Xv extension is present but I couldn't find a usable yuv12 port.\n"
@@ -3992,7 +4058,7 @@ msgstr ""
 "port.\n"
 "              Vyzerá to tak, že vaša grafická karta nepodoruje Xv?!\n"
 
-#: src/video_out/video_out_xcbxv.c:1345
+#: src/video_out/video_out_xcbxv.c:1176
 #, fuzzy, c-format
 msgid ""
 "%s: using Xv port %d from adaptor %s for hardware colorspace conversion and "
@@ -4001,26 +4067,26 @@ msgstr ""
 "video_out_xv: používam Xv port %ld z adaptéru %s pre hardvérovú konverziu "
 "farebného priestoru a škálovania.\n"
 
-#: src/video_out/video_out_xcbxv.c:1452 src/video_out/video_out_xv.c:1465
-#: src/video_out/video_out_xvmc.c:1455 src/video_out/video_out_xxmc.c:2441
+#: src/video_out/video_out_xcbxv.c:1280 src/video_out/video_out_xv.c:1335
+#: src/video_out/video_out_xvmc.c:1417 src/video_out/video_out_xxmc.c:2507
 #, fuzzy
 msgid "autopaint colour key"
 msgstr "Donútiť Xv automaticky kresliť svojou kľú�ovou farbou"
 
-#: src/video_out/video_out_xcbxv.c:1453 src/video_out/video_out_xv.c:1466
-#: src/video_out/video_out_xvmc.c:1456 src/video_out/video_out_xxmc.c:2442
+#: src/video_out/video_out_xcbxv.c:1281 src/video_out/video_out_xv.c:1336
+#: src/video_out/video_out_xvmc.c:1418 src/video_out/video_out_xxmc.c:2508
 #, fuzzy
 msgid "Make Xv autopaint its colorkey."
 msgstr "Donútiť Xv automaticky kresliť svojou kľú�ovou farbou"
 
-#: src/video_out/video_out_xcbxv.c:1460 src/video_out/video_out_xv.c:1473
-#: src/video_out/video_out_xxmc.c:2449
+#: src/video_out/video_out_xcbxv.c:1288 src/video_out/video_out_xv.c:1343
+#: src/video_out/video_out_xxmc.c:2515
 #, fuzzy
 msgid "bilinear scaling mode"
 msgstr "bilinearny škálovací mód (permedia 2/3)"
 
-#: src/video_out/video_out_xcbxv.c:1461 src/video_out/video_out_xv.c:1474
-#: src/video_out/video_out_xxmc.c:2450
+#: src/video_out/video_out_xcbxv.c:1289 src/video_out/video_out_xv.c:1344
+#: src/video_out/video_out_xxmc.c:2516
 msgid ""
 "Selects the bilinear scaling mode for Permedia cards. The individual values "
 "are:\n"
@@ -4035,74 +4101,30 @@ msgid ""
 "2 - enable full bilinear filtering"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1513 src/video_out/video_out_xv.c:1523
-#: src/video_out/video_out_xxmc.c:2506
+#: src/video_out/video_out_xcbxv.c:1341 src/video_out/video_out_xv.c:1393
+#: src/video_out/video_out_xxmc.c:2572
 #, fuzzy, c-format
 msgid "%s: this adaptor supports the yv12 format.\n"
 msgstr "video_out_xv: tento adaptér podporuje yv12 formát.\n"
 
-#: src/video_out/video_out_xcbxv.c:1518 src/video_out/video_out_xv.c:1528
-#: src/video_out/video_out_xxmc.c:2511
+#: src/video_out/video_out_xcbxv.c:1346 src/video_out/video_out_xv.c:1398
+#: src/video_out/video_out_xxmc.c:2577
 #, fuzzy, c-format
 msgid "%s: this adaptor supports the yuy2 format.\n"
 msgstr "video_out_xv: tento adaptér podporuje yuy2 formát.\n"
 
-#: src/video_out/video_out_xcbxv.c:1526 src/video_out/video_out_xv.c:1550
-#: src/video_out/video_out_xxmc.c:2534
+#: src/video_out/video_out_xcbxv.c:1354 src/video_out/video_out_xv.c:1420
+#: src/video_out/video_out_xxmc.c:2600
 msgid "pitch alignment workaround"
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1527 src/video_out/video_out_xv.c:1551
-#: src/video_out/video_out_xxmc.c:2535
+#: src/video_out/video_out_xcbxv.c:1355 src/video_out/video_out_xv.c:1421
+#: src/video_out/video_out_xxmc.c:2601
 msgid "Some buggy video drivers need a workaround to function properly."
 msgstr ""
 
-#: src/video_out/video_out_xcbxv.c:1533 src/video_out/video_out_xv.c:1557
-#: src/video_out/video_out_xvmc.c:1524
-msgid "deinterlace method (deprecated)"
-msgstr ""
-
-#: src/video_out/video_out_xcbxv.c:1534 src/video_out/video_out_xv.c:1558
-#: src/video_out/video_out_xvmc.c:1525
-msgid ""
-"This config setting is deprecated. You should use the new deinterlacing post "
-"processing settings instead.\n"
-"\n"
-"From the old days of analog television, where the even and odd numbered "
-"lines of a video frame would be displayed at different times comes the idea "
-"to increase motion smoothness by also recording the lines at different "
-"times. This is called \"interlacing\". But unfortunately, todays displays "
-"show the even and odd numbered lines as one complete frame all at the same "
-"time (called \"progressive display\"), which results in ugly frame errors "
-"known as comb artifacts. Software deinterlacing is an approach to reduce "
-"these artifacts. The individual values are:\n"
-"\n"
-"none\n"
-"Disables software deinterlacing.\n"
-"\n"
-"bob\n"
-"Interpolates between the lines for moving parts of the image.\n"
-"\n"
-"weave\n"
-"Similar to bob, but with a tendency to preserve the full resolution, better "
-"for high detail in low movement scenes.\n"
-"\n"
-"greedy\n"
-"Very good adaptive deinterlacer, but needs a lot of CPU power.\n"
-"\n"
-"onefield\n"
-"Always interpolates and reduces vertical resolution.\n"
-"\n"
-"onefieldxv\n"
-"Same as onefield, but does the interpolation in hardware.\n"
-"\n"
-"linearblend\n"
-"Applies a slight vertical blur to remove the comb artifacts. Good results "
-"with medium CPU usage."
-msgstr ""
-
-#: src/video_out/video_out_xcbxv.c:1588 src/video_out/video_out_xv.c:1631
-#: src/video_out/video_out_xxmc.c:2615
+#: src/video_out/video_out_xcbxv.c:1383 src/video_out/video_out_xv.c:1468
+#: src/video_out/video_out_xxmc.c:2681
 msgid "xine video output plugin using the MIT X video extension"
 msgstr "výstupný video xine modul použitím MIT X video rozšírenia"
 
@@ -4111,12 +4133,12 @@ msgstr "výstupný video xine modul použitím MIT X video rozšírenia"
 msgid "%s: shared memory error when allocating image\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:294 src/video_out/video_out_xxmc.c:646
+#: src/video_out/video_out_xv.c:293 src/video_out/video_out_xxmc.c:646
 #, c-format
 msgid "%s: XvShmCreateImage failed\n"
 msgstr ""
 
-#: src/video_out/video_out_xv.c:1348 src/video_out/video_out_xxmc.c:2330
+#: src/video_out/video_out_xv.c:1221 src/video_out/video_out_xxmc.c:2396
 #, fuzzy, c-format
 msgid ""
 "%s: using Xv port %ld from adaptor %s for hardware colorspace conversion and "
@@ -4125,15 +4147,15 @@ msgstr ""
 "video_out_xv: používam Xv port %ld z adaptéru %s pre hardvérovú konverziu "
 "farebného priestoru a škálovania.\n"
 
-#: src/video_out/video_out_xvmc.c:1593
+#: src/video_out/video_out_xvmc.c:1496
 msgid "xine video output plugin using the XvMC X video extension"
 msgstr "výstupný video xine modul použitím XvMC X video rozšírenia"
 
-#: src/video_out/video_out_xvmc.c:1639
+#: src/video_out/video_out_xvmc.c:1542
 msgid "video_out_xvmc: XvMC extension not present.\n"
 msgstr "video_out_xvmc: XvMC rozšírenie neprítomné.\n"
 
-#: src/video_out/video_out_xvmc.c:1737
+#: src/video_out/video_out_xvmc.c:1640
 msgid ""
 "video_out_xvmc: Xv extension is present but I couldn't find a usable yuv12 "
 "port.\n"
@@ -4141,7 +4163,7 @@ msgstr ""
 "video_out_xvmc: Xv rozšírenie je prítomné, ale nenašiel som použiteľný yuv12 "
 "port.\n"
 
-#: src/video_out/video_out_xvmc.c:1746
+#: src/video_out/video_out_xvmc.c:1649
 #, c-format
 msgid ""
 "video_out_xvmc: using Xv port %ld from adaptor %s\n"
@@ -4150,60 +4172,60 @@ msgstr ""
 "video_out_xvmc: používam Xv port %ld z adaptéru %s\n"
 "                pre hardvérovú konverziu farebného priestoru a škálovania\n"
 
-#: src/video_out/video_out_xvmc.c:1751
+#: src/video_out/video_out_xvmc.c:1654
 msgid "                idct and motion compensation acceleration \n"
 msgstr "                idct a akcelerácia kompenzácie pohybu \n"
 
-#: src/video_out/video_out_xvmc.c:1753
+#: src/video_out/video_out_xvmc.c:1656
 msgid "                motion compensation acceleration only\n"
 msgstr "                iba akcelerácia kompenzácie pohybu\n"
 
-#: src/video_out/video_out_xvmc.c:1755
+#: src/video_out/video_out_xvmc.c:1658
 msgid "                no XvMC support \n"
 msgstr "                žiadna XvMC podpora \n"
 
-#: src/video_out/video_out_xvmc.c:1756
+#: src/video_out/video_out_xvmc.c:1659
 #, c-format
 msgid "                With Overlay = %d; UnsignedIntra = %d.\n"
 msgstr "                S Prekrývaním = %d; UnsignedIntra = %d.\n"
 
-#: src/video_out/video_out_xxmc.c:2540
+#: src/video_out/video_out_xxmc.c:2606
 msgid "Make XvMC allocate more frames for better buffering."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2541
+#: src/video_out/video_out_xxmc.c:2607
 msgid ""
 "Some XvMC implementations allow more than 8 frames.\n"
 "This option, when turned on, makes the driver try to\n"
 "allocate 15 frames. A must for unichrome and live VDR.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2547
+#: src/video_out/video_out_xxmc.c:2613
 msgid "Unichrome cpu save"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2548
+#: src/video_out/video_out_xxmc.c:2614
 msgid ""
 "Saves CPU time by sleeping while decoder works.\n"
 "Only for Linux kernel 2.6 series or 2.4 with multimedia patch.\n"
 "Experimental.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2554
+#: src/video_out/video_out_xxmc.c:2620
 msgid "Fix buggy NVIDIA XvMC subpicture colors"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2555
+#: src/video_out/video_out_xxmc.c:2621
 msgid ""
 "There's a bug in NVIDIA's XvMC lib that makes red OSD colors\n"
 "look blue and vice versa. This option provides a workaround.\n"
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2560
+#: src/video_out/video_out_xxmc.c:2626
 msgid "Use bob as accelerated deinterlace method."
 msgstr ""
 
-#: src/video_out/video_out_xxmc.c:2561
+#: src/video_out/video_out_xxmc.c:2627
 msgid ""
 "When interlacing is enabled for hardware accelerated frames,\n"
 "Alternate between top and bottom field at double the frame rate.\n"
@@ -4232,11 +4254,11 @@ msgstr ""
 msgid "x11osd: unscaled overlay created (%s mode).\n"
 msgstr ""
 
-#: src/xine-engine/alphablend.c:2123
+#: src/xine-engine/alphablend.c:2146
 msgid "disable exact alpha blending of overlays"
 msgstr ""
 
-#: src/xine-engine/alphablend.c:2124
+#: src/xine-engine/alphablend.c:2147
 msgid ""
 "If you experience a performance impact when an On Screen Display or other "
 "overlays like DVD subtitles are active, then you might want to enable this "
@@ -4796,33 +4818,33 @@ msgid ""
 "foreground-border-background."
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:380
+#: src/xine-engine/video_decoder.c:390
 #, c-format
 msgid "video_decoder: no plugin available to handle '%s'\n"
 msgstr "video_decoder: nedostupný modul na spracovanie '%s'\n"
 
-#: src/xine-engine/video_decoder.c:459
+#: src/xine-engine/video_decoder.c:469
 #, c-format
 msgid "video_decoder: error, unknown buffer type: %08x\n"
 msgstr "video_decoder: chyba, neznámy typ bufferu: %08x\n"
 
-#: src/xine-engine/video_decoder.c:495
+#: src/xine-engine/video_decoder.c:505
 msgid "number of video buffers"
 msgstr ""
 
-#: src/xine-engine/video_decoder.c:496
+#: src/xine-engine/video_decoder.c:506
 msgid ""
 "The number of video buffers (each is 8k in size) xine uses in its internal "
 "queue. Higher values mean smoother playback for unreliable inputs, but also "
 "increased latency and memory consumption."
 msgstr ""
 
-#: src/xine-engine/video_out.c:642
+#: src/xine-engine/video_out.c:671
 #, c-format
 msgid "%d frames delivered, %d frames skipped, %d frames discarded\n"
 msgstr "doru�ených %d rámcov, presko�ených %d rámcov, zahodených %d rámcov\n"
 
-#: src/xine-engine/video_out.c:815
+#: src/xine-engine/video_out.c:844
 #, c-format
 msgid ""
 "video_out: throwing away image with pts %<PRId64> because it's too old "
@@ -4831,37 +4853,37 @@ msgstr ""
 "video_out: zahadzuje sa obraz s pts %<PRId64>, pretože už je príliš starý "
 "(rozdiel: %<PRId64>).\n"
 
-#: src/xine-engine/video_out.c:1794
+#: src/xine-engine/video_out.c:1863
 msgid "default number of video frames"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1795
+#: src/xine-engine/video_out.c:1864
 msgid ""
 "The default number of video frames to request from xine video out driver. "
 "Some drivers will override this setting with their own values."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1834
+#: src/xine-engine/video_out.c:1921
 msgid "percentage of skipped frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1835
+#: src/xine-engine/video_out.c:1922
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not decoded in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1840
+#: src/xine-engine/video_out.c:1927
 msgid "percentage of discarded frames to tolerate"
 msgstr ""
 
-#: src/xine-engine/video_out.c:1841
+#: src/xine-engine/video_out.c:1928
 msgid ""
 "When more than this percentage of frames are not shown, because they were "
 "not scheduled for display in time, xine sends a notification."
 msgstr ""
 
-#: src/xine-engine/video_out.c:1875
+#: src/xine-engine/video_out.c:1965
 msgid "video_out: sorry, this should not happen. please restart xine.\n"
 msgstr "video_out: prepá�, toto sa nemalo stať, reštartuj xine.\n"
 
@@ -4905,128 +4927,128 @@ msgid ""
 "accelerated, this can dramatically reduce CPU usage."
 msgstr ""
 
-#: src/xine-engine/xine.c:706 src/xine-engine/xine.c:813
-#: src/xine-engine/xine.c:852 src/xine-engine/xine.c:888
-#: src/xine-engine/xine.c:900 src/xine-engine/xine.c:913
-#: src/xine-engine/xine.c:926 src/xine-engine/xine.c:939
-#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:990
-#: src/xine-engine/xine.c:1025
+#: src/xine-engine/xine.c:771 src/xine-engine/xine.c:878
+#: src/xine-engine/xine.c:917 src/xine-engine/xine.c:953
+#: src/xine-engine/xine.c:965 src/xine-engine/xine.c:978
+#: src/xine-engine/xine.c:991 src/xine-engine/xine.c:1004
+#: src/xine-engine/xine.c:1030 src/xine-engine/xine.c:1055
+#: src/xine-engine/xine.c:1090
 msgid "xine: error while parsing mrl\n"
 msgstr "xine: chyba pri spracovaní mrl\n"
 
-#: src/xine-engine/xine.c:742
+#: src/xine-engine/xine.c:807
 #, c-format
 msgid "xine: found input plugin  : %s\n"
 msgstr "xine: nájdený vstupný modul  : %s\n"
 
-#: src/xine-engine/xine.c:760
+#: src/xine-engine/xine.c:825
 #, c-format
 msgid "xine: input plugin cannot open MRL [%s]\n"
 msgstr "xine: vstupný modul nemôže otvoriť MRL [%s]\n"
 
-#: src/xine-engine/xine.c:776
+#: src/xine-engine/xine.c:841
 #, c-format
 msgid "xine: cannot find input plugin for MRL [%s]\n"
 msgstr "xine: nemožno nájsť vstupný modul pre MRL [%s]\n"
 
-#: src/xine-engine/xine.c:802
+#: src/xine-engine/xine.c:867
 #, c-format
 msgid "xine: specified demuxer %s failed to start\n"
 msgstr "xine: špecifikovaný demultiplexor %s nenaštartoval\n"
 
-#: src/xine-engine/xine.c:838
+#: src/xine-engine/xine.c:903
 #, c-format
 msgid "xine: join rip input plugin\n"
 msgstr "xine: pripojený rip vstupný modul\n"
 
-#: src/xine-engine/xine.c:845
+#: src/xine-engine/xine.c:910
 msgid "xine: error opening rip input plugin instance\n"
 msgstr "xine: chyba otvorenia modulu vstupu rip\n"
 
-#: src/xine-engine/xine.c:876
+#: src/xine-engine/xine.c:941
 #, c-format
 msgid "xine: last_probed demuxer %s failed to start\n"
 msgstr "xine: last_probed demultiplexor %s nenaštartoval\n"
 
-#: src/xine-engine/xine.c:905
+#: src/xine-engine/xine.c:970
 msgid "ignoring video\n"
 msgstr "ignorujem video\n"
 
-#: src/xine-engine/xine.c:918
+#: src/xine-engine/xine.c:983
 msgid "ignoring audio\n"
 msgstr "ignorujem audio\n"
 
-#: src/xine-engine/xine.c:931
+#: src/xine-engine/xine.c:996
 msgid "ignoring subpicture\n"
 msgstr "ignorujem titulky\n"
 
-#: src/xine-engine/xine.c:944
+#: src/xine-engine/xine.c:1009
 msgid "input cache plugin disabled\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1015
+#: src/xine-engine/xine.c:1080
 #, c-format
 msgid "subtitle mrl opened '%s'\n"
 msgstr "mrl titulkov otvorené '%s'\n"
 
-#: src/xine-engine/xine.c:1019
+#: src/xine-engine/xine.c:1084
 msgid "xine: error opening subtitle mrl\n"
 msgstr "xine: nemožno otvoriť mrl titulkov\n"
 
-#: src/xine-engine/xine.c:1051
+#: src/xine-engine/xine.c:1116
 #, c-format
 msgid "xine: error while parsing MRL\n"
 msgstr "xine: chyba pri spracovaní MRL\n"
 
-#: src/xine-engine/xine.c:1058
+#: src/xine-engine/xine.c:1123
 #, c-format
 msgid "xine: changing option '%s' from MRL isn't permitted\n"
 msgstr "xine: zmeniť voľbu '%s' z MRL nie je dovolené\n"
 
-#: src/xine-engine/xine.c:1078
+#: src/xine-engine/xine.c:1143
 #, c-format
 msgid "xine: couldn't find demux for >%s<\n"
 msgstr "xine: nemožno nájsť demultiplexor pre >%s<\n"
 
-#: src/xine-engine/xine.c:1094
+#: src/xine-engine/xine.c:1159
 #, c-format
 msgid "xine: found demuxer plugin: %s\n"
 msgstr "xine: nájdený modul demultiplexora %s\n"
 
-#: src/xine-engine/xine.c:1114
+#: src/xine-engine/xine.c:1179
 #, c-format
 msgid "xine: demuxer failed to start\n"
 msgstr "xine: demultiplexor nenaštartoval\n"
 
-#: src/xine-engine/xine.c:1179
+#: src/xine-engine/xine.c:1244
 #, c-format
 msgid "xine_play: no demux available\n"
 msgstr "xine_play: demultiplexor nedostupný\n"
 
-#: src/xine-engine/xine.c:1249
+#: src/xine-engine/xine.c:1314
 #, c-format
 msgid "xine_play: demux failed to start\n"
 msgstr "xine_play: demultiplexor nenaštartoval\n"
 
-#: src/xine-engine/xine.c:1527
+#: src/xine-engine/xine.c:1592
 #, c-format
 msgid "xine: The specified save_dir \"%s\" might be a security risk.\n"
 msgstr "xine: Špecifikovaný save_dir \"%s\" môže byť bezpe�nostným rizikom.\n"
 
-#: src/xine-engine/xine.c:1532
+#: src/xine-engine/xine.c:1597
 msgid "The specified save_dir might be a security risk."
 msgstr "Špecifikovaný save_dir môže byť bezpe�nostným rizikom."
 
-#: src/xine-engine/xine.c:1561
+#: src/xine-engine/xine.c:1626
 msgid "xine: locale not supported by C library\n"
 msgstr "xine: locale nepodporované vašou C knižnicou\n"
 
-#: src/xine-engine/xine.c:1570
+#: src/xine-engine/xine.c:1635
 #, fuzzy
 msgid "media format detection strategy"
 msgstr "Stratégia detekcie formátu médii"
 
-#: src/xine-engine/xine.c:1571
+#: src/xine-engine/xine.c:1636
 msgid ""
 "xine offers various methods to detect the media format of input to play. The "
 "individual values are:\n"
@@ -5044,12 +5066,12 @@ msgid ""
 "Detect by file name extension only.\n"
 msgstr ""
 
-#: src/xine-engine/xine.c:1589
+#: src/xine-engine/xine.c:1654
 #, fuzzy
 msgid "directory for saving streams"
 msgstr "Cesta pre ukladanie prúdov"
 
-#: src/xine-engine/xine.c:1590
+#: src/xine-engine/xine.c:1655
 msgid ""
 "When using the stream save feature, files will be written only into this "
 "directory.\n"
@@ -5059,11 +5081,11 @@ msgid ""
 "content in any file."
 msgstr ""
 
-#: src/xine-engine/xine.c:1601
+#: src/xine-engine/xine.c:1666
 msgid "allow implicit changes to the configuration (e.g. by MRL)"
 msgstr "dovoliť implicitné zmeny v konfigurácii (napr. cez MRL)"
 
-#: src/xine-engine/xine.c:1602
+#: src/xine-engine/xine.c:1667
 msgid ""
 "If enabled, you allow xine to change your configuration without explicit "
 "actions from your side. For example configuration changes demanded by MRLs "
@@ -5079,26 +5101,26 @@ msgstr ""
 "MRL alebo playlisty z nedôverihodných vzdialených zdrojov. Ak im dovolíte "
 "ľubovoľne meniť vašu konfiguráciu, môžete skon�iť s úplne rozhodeným xine."
 
-#: src/xine-engine/xine.c:1616
+#: src/xine-engine/xine.c:1681
 msgid "Timeout for network stream reading (in seconds)"
 msgstr ""
 
-#: src/xine-engine/xine.c:1617
+#: src/xine-engine/xine.c:1682
 msgid ""
 "Specifies the timeout when reading from network streams, in seconds. Too low "
 "values might stop streaming when the source is slow or the bandwidth is "
 "occupied, too high values will freeze the player if the connection is lost."
 msgstr ""
 
-#: src/xine-engine/xine.c:1969
+#: src/xine-engine/xine.c:2034
 msgid "messages"
 msgstr "správy"
 
-#: src/xine-engine/xine.c:1970
+#: src/xine-engine/xine.c:2035
 msgid "plugin"
 msgstr "modul"
 
-#: src/xine-engine/xine.c:1971
+#: src/xine-engine/xine.c:2036
 msgid "trace"
 msgstr "trace"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 0accfab88..256e28bfa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,18 +11,15 @@ SUBDIRS = \
 	demuxers \
 	libffmpeg \
 	libmpeg2 \
-	liba52 \
 	libspudec \
 	libspucc \
 	libspucmml \
 	libspudvb \
 	libsputext \
-	libmad \
 	libw32dll \
 	libxinevdec \
 	libxineadec \
 	libreal \
-	libfaad \
 	post \
 	combined \
 	vdr
diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c
index 5923eb658..ca91a8fe6 100644
--- a/src/audio_out/audio_sun_out.c
+++ b/src/audio_out/audio_sun_out.c
@@ -248,13 +248,11 @@ static int realtime_samplecounter_available(xine_t *xine, char *dev)
 error:
   if (silence != NULL) free(silence);
   if (fd >= 0) {
-#ifdef	__svr4__
     /*
      * remove the 0 bytes from the above measurement from the
      * audio driver's STREAMS queue
      */
     ioctl(fd, I_FLUSH, FLUSHW);
-#endif
     close(fd);
   }
 
@@ -334,7 +332,7 @@ find_close_samplerate_match(int dev, int sample_rate)
 
 #else
     int i, err;
-    int audiocs_rates[] = {
+    static const int audiocs_rates[] = {
 	5510, 6620, 8000, 9600, 11025, 16000, 18900, 22050,
 	27420, 32000, 33075, 37800, 44100, 48000, 0
     };
diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am
index cf88795ba..c1e590fd7 100644
--- a/src/combined/Makefile.am
+++ b/src/combined/Makefile.am
@@ -32,3 +32,29 @@ xineplug_nsf_la_SOURCES = nsf_decoder.c nsf_demuxer.c nsf_combined.c
 xineplug_nsf_la_LIBADD = $(XINE_LIB) $(top_builddir)/contrib/nosefart/libnosefart.la -lm
 xineplug_nsf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
 xineplug_nsf_la_CPPFLAGS = $(AM_CPPFLAGS) -DNSF_PLAYER -I$(top_srcdir)/contrib/nosefart -I$(top_srcdir)/src/demuxers
+
+xineplug_xiph_la_SOURCES = xine_ogg_demuxer.c
+xineplug_xiph_la_LIBADD = $(XINE_LIB)
+xineplug_xiph_la_CFLAGS = $(AM_CFLAGS) 
+xineplug_xiph_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/demuxers
+
+if ENABLE_VORBIS
+xineplug_LTLIBRARIES += xineplug_xiph.la
+xineplug_xiph_la_SOURCES += xine_vorbis_decoder.c
+xineplug_xiph_la_LIBADD += $(VORBIS_LIBS)
+xineplug_xiph_la_CFLAGS += $(VORBIS_CFLAGS)
+endif
+
+if ENABLE_THEORA
+xineplug_LTLIBRARIES += xineplug_xiph.la
+xineplug_xiph_la_SOURCES += xine_theora_decoder.c
+xineplug_xiph_la_LIBADD += $(THEORA_LIBS)
+xineplug_xiph_la_CFLAGS += $(THEORA_CFLAGS)
+endif
+
+if ENABLE_SPEEX
+xineplug_LTLIBRARIES += xineplug_xiph.la
+xineplug_xiph_la_SOURCES += xine_speex_decoder.c
+xineplug_xiph_la_LIBADD += $(SPEEX_LIBS)
+xineplug_xiph_la_CFLAGS += $(SPEEX_CFLAGS)
+endif
diff --git a/src/demuxers/demux_ogg.c b/src/combined/xine_ogg_demuxer.c
index f868018af..56234723d 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/combined/xine_ogg_demuxer.c
@@ -40,7 +40,10 @@
 #include <inttypes.h>
 
 #include <ogg/ogg.h>
+
+#ifdef HAVE_VORBIS
 #include <vorbis/codec.h>
+#endif
 
 #ifdef HAVE_SPEEX
 #include <speex/speex.h>
@@ -416,6 +419,7 @@ static void ogg_handle_event (demux_ogg_t *this) {
  * to label audio and spu streams
  */
 static void read_language_comment (demux_ogg_t *this, ogg_packet *op, int stream_num) {
+#ifdef HAVE_VORBIS
   char           **ptr;
   char           *comment;
   vorbis_comment vc;
@@ -439,6 +443,7 @@ static void read_language_comment (demux_ogg_t *this, ogg_packet *op, int stream
   }
   vorbis_comment_clear(&vc);
   vorbis_info_clear(&vi);
+#endif
 }
 
 /*
@@ -446,6 +451,7 @@ static void read_language_comment (demux_ogg_t *this, ogg_packet *op, int stream
  * to name parts of the videostream
  */
 static void read_chapter_comment (demux_ogg_t *this, ogg_packet *op) {
+#ifdef HAVE_VORBIS
   char           **ptr;
   char           *comment;
   vorbis_comment vc;
@@ -512,6 +518,7 @@ static void read_chapter_comment (demux_ogg_t *this, ogg_packet *op) {
   }
   vorbis_comment_clear(&vc);
   vorbis_info_clear(&vi);
+#endif
 }
 
 /*
@@ -770,6 +777,7 @@ static void send_ogg_buf (demux_ogg_t *this,
 }
 
 static void decode_vorbis_header (demux_ogg_t *this, const int stream_num, ogg_packet *op) {
+#ifdef HAVE_VORBIS
   vorbis_info       vi;
   vorbis_comment    vc;
 
@@ -803,6 +811,7 @@ static void decode_vorbis_header (demux_ogg_t *this, const int stream_num, ogg_p
   }
   vorbis_comment_clear(&vc);
   vorbis_info_clear(&vi);
+#endif
 }
 
 static void decode_speex_header (demux_ogg_t *this, const int stream_num, ogg_packet *op) {
@@ -1295,7 +1304,11 @@ static void decode_anxdata_header (demux_ogg_t *this, const int stream_num, ogg_
 
   /* what type of stream are we dealing with? */
   if (!strncmp(content_type, "audio/x-vorbis", content_type_length)) {
+#ifdef HAVE_VORBIS
     this->si[stream_num]->buf_types = BUF_AUDIO_VORBIS;
+#else
+    this->si[stream_num]->buf_types = BUF_CONTROL_NOP;
+#endif
     this->num_audio_streams++;
   } else if (!strncmp(content_type, "audio/x-speex", content_type_length)) {
     this->num_audio_streams++;
@@ -2194,9 +2207,25 @@ static const demuxer_info_t demux_info_ogg = {
   10                       /* priority */
 };
 
+extern const demuxer_info_t dec_info_vorbis;
+void *vorbis_init_plugin (xine_t *xine, void *data);
+extern const demuxer_info_t dec_info_speex;
+void *speex_init_plugin (xine_t *xine, void *data);
+extern const demuxer_info_t dec_info_theora;
+void *theora_init_plugin (xine_t *xine, void *data);
+
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */  
   { PLUGIN_DEMUX, 26, "ogg", XINE_VERSION_CODE, &demux_info_ogg, ogg_init_class },
   { PLUGIN_DEMUX, 26, "anx", XINE_VERSION_CODE, &demux_info_anx, anx_init_class },
+#ifdef HAVE_VORBIS
+  { PLUGIN_AUDIO_DECODER, 15, "vorbis", XINE_VERSION_CODE, &dec_info_vorbis, vorbis_init_plugin },
+#endif
+#ifdef HAVE_SPEEX
+  { PLUGIN_AUDIO_DECODER, 15, "speex", XINE_VERSION_CODE, &dec_info_speex, speex_init_plugin },
+#endif
+#ifdef HAVE_THEORA
+  { PLUGIN_VIDEO_DECODER, 18, "theora", XINE_VERSION_CODE, &dec_info_theora, theora_init_plugin },
+#endif
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/libxineadec/xine_speex_decoder.c b/src/combined/xine_speex_decoder.c
index 034e726a6..a17de15d6 100644
--- a/src/libxineadec/xine_speex_decoder.c
+++ b/src/combined/xine_speex_decoder.c
@@ -389,7 +389,7 @@ static void dispose_class (audio_decoder_class_t *this) {
   free (this);
 }
 
-static void *init_plugin (xine_t *xine, void *data) {
+void *speex_init_plugin (xine_t *xine, void *data) {
 
   speex_class_t *this;
   
@@ -407,13 +407,7 @@ static uint32_t audio_types[] = {
   BUF_AUDIO_SPEEX, 0
  };
 
-static const decoder_info_t dec_info_audio = {
+const decoder_info_t dec_info_speex = {
   audio_types,         /* supported types */
   5                    /* priority        */
 };
-
-const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_AUDIO_DECODER, 15, "speex", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
diff --git a/src/libxinevdec/xine_theora_decoder.c b/src/combined/xine_theora_decoder.c
index 032f8800f..8dd997692 100644
--- a/src/libxinevdec/xine_theora_decoder.c
+++ b/src/combined/xine_theora_decoder.c
@@ -370,7 +370,7 @@ static void theora_dispose_class (video_decoder_class_t *this) {
   free (this);
 }
 
-static void *init_plugin (xine_t *xine, void *data) {
+void *theora_init_plugin (xine_t *xine, void *data) {
   /*initialize our plugin*/
   theora_class_t *this;
   
@@ -390,13 +390,7 @@ static void *init_plugin (xine_t *xine, void *data) {
 
 static uint32_t supported_types[] = { BUF_VIDEO_THEORA, 0 };
 
-static const decoder_info_t dec_info_video = {
+const decoder_info_t dec_info_theora = {
   supported_types,   /* supported types */
   5                        /* priority        */
 };
-
-const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_VIDEO_DECODER, 18, "theora", XINE_VERSION_CODE, &dec_info_video, init_plugin },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
diff --git a/src/libxineadec/xine_vorbis_decoder.c b/src/combined/xine_vorbis_decoder.c
index 7fc1b9197..259ef40b0 100644
--- a/src/libxineadec/xine_vorbis_decoder.c
+++ b/src/combined/xine_vorbis_decoder.c
@@ -324,7 +324,7 @@ static void dispose_class (audio_decoder_class_t *this) {
   free (this);
 }
 
-static void *init_plugin (xine_t *xine, void *data) {
+void *vorbis_init_plugin (xine_t *xine, void *data) {
 
   vorbis_class_t *this;
   
@@ -342,13 +342,7 @@ static uint32_t audio_types[] = {
   BUF_AUDIO_VORBIS, 0
  };
 
-static const decoder_info_t dec_info_audio = {
+const decoder_info_t dec_info_vorbis = {
   audio_types,         /* supported types */
   5                    /* priority        */
 };
-
-const plugin_info_t xine_plugin_info[] EXPORTED = {
-  /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_AUDIO_DECODER, 15, "vorbis", XINE_VERSION_CODE, &dec_info_audio, init_plugin },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index aa6bc5d5e..1dec2eabf 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -12,10 +12,6 @@ xineinclude_HEADERS = demux.h
 
 noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h id3.h ebml.h matroska.h iff.h flacutils.h
 
-if ENABLE_VORBIS
-ogg_module = xineplug_dmx_ogg.la
-endif
-
 if ENABLE_ASF
 asf_module = xineplug_dmx_asf.la 
 endif
@@ -33,7 +29,6 @@ image_module = xineplug_dmx_image.la
 endif
 
 xineplug_LTLIBRARIES = \
-	$(ogg_module) \
 	$(asf_module) \
 	$(mng_module) \
 	$(image_module) \
@@ -59,10 +54,6 @@ xineplug_LTLIBRARIES = \
 	xineplug_dmx_iff.la \
 	xineplug_dmx_flv.la 
 
-xineplug_dmx_ogg_la_SOURCES = demux_ogg.c
-xineplug_dmx_ogg_la_LIBADD = $(VORBIS_LIBS) $(SPEEX_LIBS) $(THEORA_LIBS) $(OGG_LIBS) $(XINE_LIB)
-xineplug_dmx_ogg_la_CFLAGS = $(AM_CFLAGS) $(VORBIS_CFLAGS) $(SPEEX_CFLAGS) $(THEORA_CFLAGS) $(OGG_CFLAGS)
-
 xineplug_dmx_avi_la_SOURCES = demux_avi.c
 xineplug_dmx_avi_la_LIBADD = $(XINE_LIB)
 
@@ -126,7 +117,7 @@ xineplug_dmx_audio_la_LIBADD = $(XINE_LIB)
 
 xineplug_dmx_modplug_la_SOURCES = demux_mod.c
 xineplug_dmx_modplug_la_LIBADD = $(XINE_LIB) $(LIBMODPLUG_LIBS)
-xineplug_dmx_modplug_la_CFLAGS = $(LIBMODPLUG_CFLAGS)
+xineplug_dmx_modplug_la_CFLAGS = $(AM_CFLAGS) $(LIBMODPLUG_CFLAGS)
 
 xineplug_dmx_yuv_frames_la_SOURCES = demux_yuv_frames.c
 xineplug_dmx_yuv_frames_la_LIBADD = $(XINE_LIB)
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index cff4c48f9..1b82a288d 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -121,6 +121,7 @@ typedef unsigned int qt_atom;
 #define WRT_ATOM QT_ATOM(0xA9, 'w', 'r', 't')
 #define DAY_ATOM QT_ATOM(0xA9, 'd', 'a', 'y')
 
+#define RMRA_ATOM QT_ATOM('r', 'm', 'r', 'a')
 #define RMDA_ATOM QT_ATOM('r', 'm', 'd', 'a')
 #define RDRF_ATOM QT_ATOM('r', 'd', 'r', 'f')
 #define RMDR_ATOM QT_ATOM('r', 'm', 'd', 'r')
@@ -1984,7 +1985,8 @@ static void parse_moov_atom(qt_info *info, unsigned char *moov_atom,
       strncpy(info->comment, &moov_atom[i + 8], string_size - 1);
       info->comment[string_size - 1] = 0;
 
-    } else if (current_atom == RMDA_ATOM) {
+    } else if (current_atom == RMDA_ATOM ||
+               current_atom == RMRA_ATOM) {
 
       /* create a new reference structure */
       info->reference_count++;
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index b40c7d49f..0c8b4e974 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -180,6 +180,8 @@
 
 #define MAX_PES_BUF_SIZE 2048
 
+#define CORRUPT_PES_THRESHOLD 10
+
 #define NULL_PID 0x1fff
 #define INVALID_PID ((unsigned int)(-1))
 #define INVALID_PROGRAM ((unsigned int)(-1))
@@ -913,12 +915,17 @@ static void demux_ts_buffer_pes(demux_ts_t*this, unsigned char *ts,
      m->buf = m->fifo->buffer_pool_alloc(m->fifo);
 
     if (!demux_ts_parse_pes_header(this->stream->xine, m, ts, len, this->stream)) {
-      m->corrupted_pes = 1;
       m->buf->free_buffer(m->buf);
       m->buf = NULL;
-      xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
+      
+      if (m->corrupted_pes > CORRUPT_PES_THRESHOLD) {
+        if (this->videoPid == m->pid)
+          this->videoPid = INVALID_PID;
+      } else {
+        m->corrupted_pes++;
+        xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, 
 	      "demux_ts: PID 0x%.4x: corrupted pes encountered\n", m->pid);
-
+      }
     } else {
 
       m->corrupted_pes = 0;
@@ -1784,13 +1791,27 @@ static void demux_ts_parse_packet (demux_ts_t*this) {
     
     if ( (pes_stream_id >= VIDEO_STREAM_S) && (pes_stream_id <= VIDEO_STREAM_E) ) {
       if ( this->videoPid == INVALID_PID) {
-
-	xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
-		 "demux_ts: auto-detected video pid 0x%.4x\n", pid);
-
-	this->videoPid = pid;
-	this->videoMedia = this->media_num;
-	demux_ts_pes_new(this, this->media_num++, pid, this->video_fifo, pes_stream_id);
+        int i, found = 0;
+        for(i = 0; i < this->media_num; i++) {
+          if (this->media[i].pid == pid) {
+            found = 1;
+            break;
+          }
+        }
+        
+        if (found && (this->media[i].corrupted_pes == 0)) {
+          this->videoPid = pid;
+	  this->videoMedia = i;
+        } else if (!found) {
+	  this->videoPid = pid;
+	  this->videoMedia = this->media_num;
+	  demux_ts_pes_new(this, this->media_num++, pid, this->video_fifo, pes_stream_id);
+        }
+        
+        if (this->videoPid != INVALID_PID) {
+          xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, 
+                   "demux_ts: auto-detected video pid 0x%.4x\n", pid);
+        } 
       }
     } else if ( (pes_stream_id >= AUDIO_STREAM_S) && (pes_stream_id <= AUDIO_STREAM_E) ) {
        if (this->audio_tracks_count < MAX_AUDIO_TRACKS) {
diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c
index 8c1efdde6..449c2ad12 100644
--- a/src/demuxers/group_audio.c
+++ b/src/demuxers/group_audio.c
@@ -68,7 +68,7 @@ static const demuxer_info_t demux_info_mpgaudio = {
 };
 
 static const demuxer_info_t demux_info_mpc = {
-  0                        /* priority */
+  1                        /* priority */
 };
 
 static const demuxer_info_t demux_info_realaudio = {
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index f9f9a9fb8..c6ec10b96 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -11,9 +11,6 @@ AM_LDFLAGS = $(xineplug_ldflags)
 #
 
 SUBDIRS = libreal librtsp
-if ENABLE_DVB
-SUBDIRS += dvb
-endif
 if ENABLE_VCD
 SUBDIRS += vcd
 endif
diff --git a/src/input/dvb/Makefile.am b/src/input/dvb/Makefile.am
deleted file mode 100644
index 229ac21bf..000000000
--- a/src/input/dvb/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(top_srcdir)/misc/Makefile.common
-
-noinst_HEADERS =     \
-	dmx.h        \
-	frontend.h   
diff --git a/src/input/dvb/dmx.h b/src/input/dvb/dmx.h
deleted file mode 100644
index 51d3c48cd..000000000
--- a/src/input/dvb/dmx.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/* 
- * dmx.h
- *
- * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
- *                  & Ralph  Metzler <ralph@convergence.de>
-                      for convergence integrated media GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-
-#ifndef _DMX_H_
-#define _DMX_H_
-
-#ifdef __KERNEL__
-#include <linux/types.h>
-#else
-#if HAVE_INTTYPES_H
-#include <inttypes.h>
-#else
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#endif
-#endif
-
-#define DMX_FILTER_SIZE 16
-
-typedef enum
-{
-	DMX_OUT_DECODER, /* Streaming directly to decoder. */
-	DMX_OUT_TAP,     /* Output going to a memory buffer */
-	                 /* (to be retrieved via the read command).*/
-	DMX_OUT_TS_TAP   /* Output multiplexed into a new TS  */
-	                 /* (to be retrieved by reading from the */
-	                 /* logical DVR device).                 */
-} dmx_output_t;
-
-
-typedef enum
-{
-	DMX_IN_FRONTEND, /* Input from a front-end device.  */
-	DMX_IN_DVR       /* Input from the logical DVR device.  */
-} dmx_input_t;
-
-
-typedef enum
-{
-        DMX_PES_AUDIO0,
-	DMX_PES_VIDEO0,
-	DMX_PES_TELETEXT0,
-	DMX_PES_SUBTITLE0,
-	DMX_PES_PCR0,
-
-        DMX_PES_AUDIO1,
-	DMX_PES_VIDEO1,
-	DMX_PES_TELETEXT1,
-	DMX_PES_SUBTITLE1,
-	DMX_PES_PCR1,
-
-        DMX_PES_AUDIO2,
-	DMX_PES_VIDEO2,
-	DMX_PES_TELETEXT2,
-	DMX_PES_SUBTITLE2,
-	DMX_PES_PCR2,
-
-        DMX_PES_AUDIO3,
-	DMX_PES_VIDEO3,
-	DMX_PES_TELETEXT3,
-	DMX_PES_SUBTITLE3,
-	DMX_PES_PCR3,
-
-	DMX_PES_OTHER
-} dmx_pes_type_t;
-
-#define DMX_PES_AUDIO    DMX_PES_AUDIO0
-#define DMX_PES_VIDEO    DMX_PES_VIDEO0
-#define DMX_PES_TELETEXT DMX_PES_TELETEXT0
-#define DMX_PES_SUBTITLE DMX_PES_SUBTITLE0
-#define DMX_PES_PCR      DMX_PES_PCR0
-
-
-typedef enum
-{
-        DMX_SCRAMBLING_EV,
-        DMX_FRONTEND_EV
-} dmx_event_t;
-
-
-typedef enum
-{
-	DMX_SCRAMBLING_OFF,
-	DMX_SCRAMBLING_ON
-} dmx_scrambling_status_t;
-
-
-typedef struct dmx_filter
-{
-	uint8_t         filter[DMX_FILTER_SIZE];
-	uint8_t         mask[DMX_FILTER_SIZE];
-	uint8_t         mode[DMX_FILTER_SIZE];
-} dmx_filter_t;
-
-
-struct dmx_sct_filter_params
-{
-	uint16_t            pid;
-	dmx_filter_t        filter;
-	uint32_t            timeout;
-	uint32_t            flags;
-#define DMX_CHECK_CRC       1
-#define DMX_ONESHOT         2
-#define DMX_IMMEDIATE_START 4
-#define DMX_KERNEL_CLIENT   0x8000
-};
-
-
-struct dmx_pes_filter_params
-{
-	uint16_t            pid;
-	dmx_input_t         input;
-	dmx_output_t        output;
-	dmx_pes_type_t      pes_type;
-	uint32_t            flags;
-};
-
-
-struct dmx_event
-{
-	dmx_event_t         event;
-	time_t              timeStamp;
-	union
-	{
-		dmx_scrambling_status_t scrambling;
-	} u;
-};
-
-typedef struct dmx_caps {
-	uint32_t caps;
-	int num_decoders; 
-} dmx_caps_t;
-
-typedef enum {
-	DMX_SOURCE_FRONT0 = 0,
-	DMX_SOURCE_FRONT1,
-	DMX_SOURCE_FRONT2,
-	DMX_SOURCE_FRONT3,
-	DMX_SOURCE_DVR0   = 16,
-	DMX_SOURCE_DVR1,
-	DMX_SOURCE_DVR2,
-	DMX_SOURCE_DVR3
-} dmx_source_t;
-
-
-#define DMX_START                _IO('o',41) 
-#define DMX_STOP                 _IO('o',42)
-#define DMX_SET_FILTER           _IOW('o',43,struct dmx_sct_filter_params)
-#define DMX_SET_PES_FILTER       _IOW('o',44,struct dmx_pes_filter_params)
-#define DMX_SET_BUFFER_SIZE      _IO('o',45)
-#define DMX_GET_EVENT            _IOR('o',46,struct dmx_event)
-#define DMX_GET_PES_PIDS         _IOR('o',47,uint16_t[5])
-#define DMX_GET_CAPS             _IOR('o',48,dmx_caps_t)
-#define DMX_SET_SOURCE           _IOW('o',49,dmx_source_t)
-
-#endif /*_DMX_H_*/
-
diff --git a/src/input/dvb/frontend.h b/src/input/dvb/frontend.h
deleted file mode 100644
index aa671d43d..000000000
--- a/src/input/dvb/frontend.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * frontend.h
- *
- * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
- *                    Ralph  Metzler <ralph@convergence.de>
- *                    Holger Waechtler <holger@convergence.de>
- *                    Andre Draszik <ad@convergence.de>
- *                    for convergence integrated media GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-
-#ifndef _FRONTEND_H_
-#define _FRONTEND_H_
-
-#ifdef __KERNEL__
-#include <linux/types.h>
-#else
-#if HAVE_INTTYPE_H
-#include <inttypes.h>
-#else
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-#endif
-#endif
-
-
-typedef enum {
-        FE_QPSK,
-        FE_QAM,
-        FE_OFDM,
-	FE_ATSC
-} fe_type_t;
-
-
-typedef enum {
-	FE_IS_STUPID                  = 0,
-	FE_CAN_INVERSION_AUTO         = 0x1,
-	FE_CAN_FEC_1_2                = 0x2,
-	FE_CAN_FEC_2_3                = 0x4,
-	FE_CAN_FEC_3_4                = 0x8,
-	FE_CAN_FEC_4_5                = 0x10,
-	FE_CAN_FEC_5_6                = 0x20,
-	FE_CAN_FEC_6_7                = 0x40,
-	FE_CAN_FEC_7_8                = 0x80,
-	FE_CAN_FEC_8_9                = 0x100,
-	FE_CAN_FEC_AUTO               = 0x200,
-	FE_CAN_QPSK                   = 0x400,
-	FE_CAN_QAM_16                 = 0x800,
-	FE_CAN_QAM_32                 = 0x1000,
-	FE_CAN_QAM_64                 = 0x2000,
-	FE_CAN_QAM_128                = 0x4000,
-	FE_CAN_QAM_256                = 0x8000,
-	FE_CAN_QAM_AUTO               = 0x10000,
-	FE_CAN_TRANSMISSION_MODE_AUTO = 0x20000,
-	FE_CAN_BANDWIDTH_AUTO         = 0x40000,
-	FE_CAN_GUARD_INTERVAL_AUTO    = 0x80000,
-	FE_CAN_HIERARCHY_AUTO         = 0x100000,
-	FE_CAN_8VSB                   = 0x200000,
-	FE_CAN_16VSB                  = 0x400000,
-	FE_CAN_MUTE_TS                = 0x80000000,
-	FE_CAN_CLEAN_SETUP            = 0x40000000
-} fe_caps_t;
-
-
-struct dvb_frontend_info {
-	char       name[128];
-        fe_type_t  type;
-        uint32_t   frequency_min;
-        uint32_t   frequency_max;
-	uint32_t   frequency_stepsize;
-	uint32_t   frequency_tolerance;
-	uint32_t   symbol_rate_min;
-        uint32_t   symbol_rate_max;
-	uint32_t   symbol_rate_tolerance;     /* ppm */
-	uint32_t   notifier_delay;            /* ms */
-	fe_caps_t  caps;
-};
-
-
-/**
- *  Check out the DiSEqC bus spec available on http://www.eutelsat.org/ for
- *  the meaning of this struct...
- */
-struct dvb_diseqc_master_cmd {
-        uint8_t msg [6];        /*  { framing, address, command, data [3] } */
-        uint8_t msg_len;        /*  valid values are 3...6  */
-};
-
-
-struct dvb_diseqc_slave_reply {
-	uint8_t msg [4];        /*  { framing, data [3] } */
-	uint8_t msg_len;        /*  valid values are 0...4, 0 means no msg  */
-	int     timeout;        /*  return from ioctl after timeout ms with */
-};                              /*  errorcode when no message was received  */
-
-
-typedef enum {
-        SEC_VOLTAGE_13,
-        SEC_VOLTAGE_18
-} fe_sec_voltage_t;
-
-
-typedef enum {
-        SEC_TONE_ON,
-        SEC_TONE_OFF
-} fe_sec_tone_mode_t;
-
-
-typedef enum {
-        SEC_MINI_A,
-        SEC_MINI_B
-} fe_sec_mini_cmd_t;
-
-
-typedef enum {
-	FE_HAS_SIGNAL     = 0x01,   /*  found something above the noise level */
-	FE_HAS_CARRIER    = 0x02,   /*  found a DVB signal  */
-	FE_HAS_VITERBI    = 0x04,   /*  FEC is stable  */
-	FE_HAS_SYNC       = 0x08,   /*  found sync bytes  */
-	FE_HAS_LOCK       = 0x10,   /*  everything's working... */
-	FE_TIMEDOUT       = 0x20,   /*  no lock within the last ~2 seconds */
-	FE_REINIT         = 0x40    /*  frontend was reinitialized,  */
-} fe_status_t;                      /*  application is recommned to reset */
-                                    /*  DiSEqC, tone and parameters */
-
-typedef enum {
-        INVERSION_OFF,
-        INVERSION_ON,
-        INVERSION_AUTO
-} fe_spectral_inversion_t;
-
-
-typedef enum {
-        FEC_NONE = 0,
-        FEC_1_2,
-        FEC_2_3,
-        FEC_3_4,
-        FEC_4_5,
-        FEC_5_6,
-        FEC_6_7,
-        FEC_7_8,
-        FEC_8_9,
-        FEC_AUTO
-} fe_code_rate_t;
-
-
-typedef enum {
-        QPSK,
-        QAM_16,
-        QAM_32,
-        QAM_64,
-        QAM_128,
-        QAM_256,
-	QAM_AUTO,
-	VSB_8,
-	VSB_16
-} fe_modulation_t;
-
-
-typedef enum {
-	TRANSMISSION_MODE_2K,
-	TRANSMISSION_MODE_8K,
-	TRANSMISSION_MODE_AUTO
-} fe_transmit_mode_t;
-
-typedef enum {
-	BANDWIDTH_8_MHZ,
-	BANDWIDTH_7_MHZ,
-	BANDWIDTH_6_MHZ,
-	BANDWIDTH_AUTO
-} fe_bandwidth_t;
-
-
-typedef enum {
-	GUARD_INTERVAL_1_32,
-	GUARD_INTERVAL_1_16,
-	GUARD_INTERVAL_1_8,
-	GUARD_INTERVAL_1_4,
-	GUARD_INTERVAL_AUTO
-} fe_guard_interval_t;
-
-
-typedef enum {
-	HIERARCHY_NONE,
-	HIERARCHY_1,
-	HIERARCHY_2,
-	HIERARCHY_4,
-	HIERARCHY_AUTO
-} fe_hierarchy_t;
-
-
-struct dvb_qpsk_parameters {
-        uint32_t        symbol_rate;  /* symbol rate in Symbols per second */
-        fe_code_rate_t  fec_inner;    /* forward error correction (see above) */
-};
-
-
-struct dvb_qam_parameters {
-        uint32_t         symbol_rate; /* symbol rate in Symbols per second */
-        fe_code_rate_t   fec_inner;   /* forward error correction (see above) */
-        fe_modulation_t  modulation;  /* modulation type (see above) */
-};
-
-struct dvb_vsb_parameters {
-	fe_modulation_t	modulation;  /* modulation type (see above) */
-};
-
-struct dvb_ofdm_parameters {
-        fe_bandwidth_t      bandwidth;
-        fe_code_rate_t      code_rate_HP;  /* high priority stream code rate */
-        fe_code_rate_t      code_rate_LP;  /* low priority stream code rate */
-        fe_modulation_t     constellation; /* modulation type (see above) */
-        fe_transmit_mode_t  transmission_mode;
-        fe_guard_interval_t guard_interval;
-        fe_hierarchy_t      hierarchy_information;
-};
-
-
-struct dvb_frontend_parameters {
-        uint32_t frequency;       /* (absolute) frequency in Hz for QAM/OFDM */
-                                  /* intermediate frequency in kHz for QPSK */
-	fe_spectral_inversion_t inversion;
-	union {
-		struct dvb_qpsk_parameters qpsk;
-		struct dvb_qam_parameters  qam;
-		struct dvb_ofdm_parameters ofdm;
-		struct dvb_vsb_parameters vsb;
-	} u;
-};
-
-
-struct dvb_frontend_event {
-	fe_status_t status;
-	struct dvb_frontend_parameters parameters;
-};
-
-
-
-#define FE_GET_INFO                _IOR('o', 61, struct dvb_frontend_info)
-
-#define FE_DISEQC_RESET_OVERLOAD   _IO('o', 62)
-#define FE_DISEQC_SEND_MASTER_CMD  _IOW('o', 63, struct dvb_diseqc_master_cmd)
-#define FE_DISEQC_RECV_SLAVE_REPLY _IOR('o', 64, struct dvb_diseqc_slave_reply)
-#define FE_DISEQC_SEND_BURST       _IO('o', 65)  /* fe_sec_mini_cmd_t */
-
-#define FE_SET_TONE                _IO('o', 66)  /* fe_sec_tone_mode_t */
-#define FE_SET_VOLTAGE             _IO('o', 67)  /* fe_sec_voltage_t */
-#define FE_ENABLE_HIGH_LNB_VOLTAGE _IO('o', 68)  /* int */
-
-#define FE_READ_STATUS             _IOR('o', 69, fe_status_t)
-#define FE_READ_BER                _IOR('o', 70, uint32_t)
-#define FE_READ_SIGNAL_STRENGTH    _IOR('o', 71, uint16_t)
-#define FE_READ_SNR                _IOR('o', 72, uint16_t)
-#define FE_READ_UNCORRECTED_BLOCKS _IOR('o', 73, uint32_t)
-
-#define FE_SET_FRONTEND            _IOW('o', 76, struct dvb_frontend_parameters)
-#define FE_GET_FRONTEND            _IOR('o', 77, struct dvb_frontend_parameters)
-#define FE_GET_EVENT               _IOR('o', 78, struct dvb_frontend_event)
-
-
-#endif /*_FRONTEND_H_*/
-
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 80f0bda39..b85bc534e 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -2598,7 +2598,7 @@ static input_plugin_t *cdda_class_get_instance (input_class_t *cls_gen, xine_str
   cdda_input_plugin_t *this;
   cdda_input_class_t  *class = (cdda_input_class_t *) cls_gen;
   int                  track;
-  xine_cfg_entry_t     enable_entry, server_entry, port_entry, cachedir_entry;
+  xine_cfg_entry_t     enable_entry, server_entry, port_entry;
   char                *cdda_device = NULL;
   int                  cddb_error = class->cddb_error;
 
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index efc3a88d8..50162c7db 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -103,9 +103,8 @@
 /* XDG */
 #include <basedir.h>
 
-/* These will eventually be #include <linux/dvb/...> */
-#include "dvb/dmx.h"
-#include "dvb/frontend.h"
+#include <linux/dvb/dmx.h>
+#include <linux/dvb/frontend.h>
 
 #define LOG_MODULE "input_dvb"
 #define LOG_VERBOSE
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 0ec25e1f8..1dce8baad 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -359,6 +359,9 @@ static int file_plugin_open (input_plugin_t *this_gen ) {
   file_input_plugin_t *this = (file_input_plugin_t *) this_gen;
   char                *filename;
   struct stat          sbuf;
+#ifdef HAVE_MMAP
+  size_t	       tmp_size;
+#endif
 
   lprintf("file_plugin_open\n");
 
@@ -423,10 +426,14 @@ static int file_plugin_open (input_plugin_t *this_gen ) {
   }
 
 #ifdef HAVE_MMAP
-  if ( (this->mmap_base = mmap(NULL, sbuf.st_size, PROT_READ, MAP_SHARED, this->fh, 0)) != (void*)-1 ) {
+  tmp_size = sbuf.st_size; /* may cause truncation - if it does, DON'T mmap! */
+  if ((tmp_size == sbuf.st_size) &&
+      ( (this->mmap_base = mmap(NULL, tmp_size, PROT_READ, MAP_SHARED, this->fh, 0)) != (void*)-1 )) {
     this->mmap_on = 1;
     this->mmap_curr = this->mmap_base;
     this->mmap_len = sbuf.st_size;
+  } else {
+    this->mmap_base = NULL;
   }
 #endif
 
diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am
index 3de899f7e..e08396ef7 100644
--- a/src/input/vcd/Makefile.am
+++ b/src/input/vcd/Makefile.am
@@ -1,17 +1,25 @@
 include $(top_srcdir)/misc/Makefile.common
 
+$(top_builddir)/contrib/libcdio/libcdio.la:
+	$(MAKE) -C $(top_builddir)/contrib/libcdio
+
+$(top_builddir)/contrib/libcdio/libiso9660.la:
+	$(MAKE) -C $(top_builddir)/contrib/libcdio
+
+$(top_builddir)/contrib/libvcd/libvcd.la:
+	$(MAKE) -C $(top_builddir)/contrib/libvcd
+
+$(top_builddir)/contrib/libvcd/libvcdinfo.la:
+	$(MAKE) -C $(top_builddir)/contrib/libvcd
+
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
-SUBDIRS =
-if !WITH_EXTERNAL_VCDLIBS
-SUBDIRS += libcdio libvcd
-endif
-
 noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h
 
 xineplug_LTLIBRARIES = xineplug_inp_vcd.la
 
 xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
 xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBCDIO_LIBS) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) $(LIBISO9660_LIBS) -lm
+xineplug_inp_vcd_la_DEPENDENCIES = $(LIBCDIO_DEPS) $(LIBVCD_DEPS) $(LIBVCDINFO_DEPS) $(LIBISO9660_DEPS)
 xineplug_inp_vcd_la_CFLAGS  = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am
deleted file mode 100644
index 1025b373d..000000000
--- a/src/liba52/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-include $(top_srcdir)/misc/Makefile.common
-
-AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
-AM_LDFLAGS = $(xineplug_ldflags)
-
-noinst_HEADERS = a52.h a52_internal.h bitstream.h tables.h crc.c
-
-if ENABLE_A52DEC
-xineplug_LTLIBRARIES = xineplug_decode_a52.la
-endif
-
-if WITH_EXTERNAL_A52DEC
-external_libs = -la52
-internal_sources =
-else
-external_libs =
-internal_sources = bitstream.c bit_allocate.c downmix.c imdct.c parse.c
-endif
-
-xineplug_decode_a52_la_SOURCES = xine_a52_decoder.c $(internal_sources)
-xineplug_decode_a52_la_LIBADD = $(XINE_LIB) $(external_libs) -lm
diff --git a/src/libfaad/codebook/Makefile.am b/src/libfaad/codebook/Makefile.am
deleted file mode 100644
index e4691f4b9..000000000
--- a/src/libfaad/codebook/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/misc/Makefile.common
-
-EXTRA_DIST = hcb.h \
-	hcb_1.h \
-	hcb_2.h \
-	hcb_3.h \
-	hcb_4.h \
-	hcb_5.h \
-	hcb_6.h \
-	hcb_7.h \
-	hcb_8.h \
-	hcb_9.h \
-	hcb_10.h \
-	hcb_11.h \
-	hcb_sf.h 
diff --git a/src/libmad/Makefile.am b/src/libmad/Makefile.am
deleted file mode 100644
index 482d68bb3..000000000
--- a/src/libmad/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-include $(top_srcdir)/misc/Makefile.common
-
-AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
-AM_CPPFLAGS = -DOPT_SPEED
-AM_LDFLAGS  = $(xineplug_ldflags)
-
-EXTRA_DIST = imdct_l_arm.S
-
-noinst_HEADERS = \
-	D.dat \
-	imdct_s.dat \
-	qc_table.dat \
-	rq_table.dat \
-	sf_table.dat \
-	bit.h \
-	fixed.h \
-	frame.h \
-	global.h \
-	huffman.h \
-	layer12.h \
-	layer3.h \
-	stream.h \
-	synth.h \
-	timer.h \
-	version.h
-
-if ENABLE_MAD
-xineplug_LTLIBRARIES = xineplug_decode_mad.la
-endif
-
-if WITH_EXTERNAL_MAD
-internal_sources =
-external_libs = $(LIBMAD_LIBS)
-else
-internal_sources = \
-	bit.c \
-	fixed.c \
-	frame.c \
-	huffman.c \
-	layer12.c \
-	layer3.c \
-	stream.c \
-	synth.c \
-	timer.c \
-	version.c
-external_libs =
-endif
-
-xineplug_decode_mad_la_SOURCES = xine_mad_decoder.c $(internal_sources)
-xineplug_decode_mad_la_LIBADD = $(XINE_LIB) $(external_libs)
-xineplug_decode_mad_la_CFLAGS = $(AM_CFLAGS) $(LIBMAD_CFLAGS)
diff --git a/src/libmad/imdct_l_arm.S b/src/libmad/imdct_l_arm.S
deleted file mode 100644
index 35b2e2626..000000000
--- a/src/libmad/imdct_l_arm.S
+++ /dev/null
@@ -1,1000 +0,0 @@
-/*****************************************************************************
-* Copyright (C) 2000-2001 Andre McCurdy  <armccurdy@yahoo.co.uk>
-*
-* This program is free software. you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation@ either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY, without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program@ if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*
-*****************************************************************************
-*
-* Notes:
-*
-*
-*****************************************************************************
-*
-* $Id: imdct_l_arm.S,v 1.1 2002/04/30 18:46:58 miguelfreitas Exp $
-*
-* 2001/03/24:  Andre McCurdy <armccurdy@yahoo.co.uk>
-*   - Corrected PIC unsafe loading of address of 'imdct36_long_karray'
-*
-* 2000/09/20:  Robert Leslie <rob@mars.org>
-*   - Added a global symbol with leading underscore per suggestion of
-*     Simon Burge to support linking with the a.out format.
-*
-* 2000/09/15:  Robert Leslie <rob@mars.org>
-*   - Fixed a small bug where flags were changed before a conditional branch.
-*
-* 2000/09/15:  Andre McCurdy <armccurdy@yahoo.co.uk>
-*   - Applied Nicolas Pitre's rounding optimisation in all remaining places.
-*
-* 2000/09/09:  Nicolas Pitre <nico@cam.org>
-*   - Optimized rounding + scaling operations.
-*
-* 2000/08/09:  Andre McCurdy <armccurdy@yahoo.co.uk>
-*   - Original created.
-*
-****************************************************************************/
-
-
-/*
-   On entry:
-
-      r0 = pointer to 18 element input  array
-      r1 = pointer to 36 element output array
-      r2 = windowing block type
-
-
-   Stack frame created during execution of the function:
-
-   Initial   Holds:
-   Stack
-   pointer
-   minus:
-
-       0
-       4     lr
-       8     r11
-      12     r10
-      16     r9
-      20     r8
-      24     r7
-      28     r6
-      32     r5
-      36     r4
-
-      40     r2 : windowing block type
-
-      44     ct00 high
-      48     ct00 low
-      52     ct01 high
-      56     ct01 low
-      60     ct04 high
-      64     ct04 low
-      68     ct06 high
-      72     ct06 low
-      76     ct05 high
-      80     ct05 low
-      84     ct03 high
-      88     ct03 low
-      92    -ct05 high
-      96    -ct05 low
-     100    -ct07 high
-     104    -ct07 low
-     108     ct07 high
-     112     ct07 low
-     116     ct02 high
-     120     ct02 low
-*/
-
-#define BLOCK_MODE_NORMAL   0
-#define BLOCK_MODE_START    1
-#define BLOCK_MODE_STOP     3
-
-
-#define X0   0x00
-#define X1   0x04
-#define X2   0x08
-#define X3   0x0C
-#define X4   0x10
-#define X5   0x14
-#define X6   0x18
-#define X7   0x1c
-#define X8   0x20
-#define X9   0x24
-#define X10  0x28
-#define X11  0x2c
-#define X12  0x30
-#define X13  0x34
-#define X14  0x38
-#define X15  0x3c
-#define X16  0x40
-#define X17  0x44
-
-#define x0   0x00
-#define x1   0x04
-#define x2   0x08
-#define x3   0x0C
-#define x4   0x10
-#define x5   0x14
-#define x6   0x18
-#define x7   0x1c
-#define x8   0x20
-#define x9   0x24
-#define x10  0x28
-#define x11  0x2c
-#define x12  0x30
-#define x13  0x34
-#define x14  0x38
-#define x15  0x3c
-#define x16  0x40
-#define x17  0x44
-#define x18  0x48
-#define x19  0x4c
-#define x20  0x50
-#define x21  0x54
-#define x22  0x58
-#define x23  0x5c
-#define x24  0x60
-#define x25  0x64
-#define x26  0x68
-#define x27  0x6c
-#define x28  0x70
-#define x29  0x74
-#define x30  0x78
-#define x31  0x7c
-#define x32  0x80
-#define x33  0x84
-#define x34  0x88
-#define x35  0x8c
-
-#define K00  0x0ffc19fd
-#define K01  0x00b2aa3e
-#define K02  0x0fdcf549
-#define K03  0x0216a2a2
-#define K04  0x0f9ee890
-#define K05  0x03768962
-#define K06  0x0f426cb5
-#define K07  0x04cfb0e2
-#define K08  0x0ec835e8
-#define K09  0x061f78aa
-#define K10  0x0e313245
-#define K11  0x07635284
-#define K12  0x0d7e8807
-#define K13  0x0898c779
-#define K14  0x0cb19346
-#define K15  0x09bd7ca0
-#define K16  0x0bcbe352
-#define K17  0x0acf37ad
-
-#define minus_K02 0xf0230ab7
-
-#define WL0  0x00b2aa3e
-#define WL1  0x0216a2a2
-#define WL2  0x03768962
-#define WL3  0x04cfb0e2
-#define WL4  0x061f78aa
-#define WL5  0x07635284
-#define WL6  0x0898c779
-#define WL7  0x09bd7ca0
-#define WL8  0x0acf37ad
-#define WL9  0x0bcbe352
-#define WL10 0x0cb19346
-#define WL11 0x0d7e8807
-#define WL12 0x0e313245
-#define WL13 0x0ec835e8
-#define WL14 0x0f426cb5
-#define WL15 0x0f9ee890
-#define WL16 0x0fdcf549
-#define WL17 0x0ffc19fd
-
-
-@*****************************************************************************
-
-
-    .text
-    .align
-
-    .global III_imdct_l
-    .global _III_imdct_l
-
-III_imdct_l:
-_III_imdct_l:
-
-    stmdb   sp!, { r2, r4 - r11, lr }   @ all callee saved regs, plus arg3
-
-    ldr     r4, =K08                    @ r4 =  K08
-    ldr     r5, =K09                    @ r5 =  K09
-    ldr     r8, [r0, #X4]               @ r8 =  X4
-    ldr     r9, [r0, #X13]              @ r9 =  X13
-    rsb     r6, r4, #0                  @ r6 = -K08
-    rsb     r7, r5, #0                  @ r7 = -K09
-
-    smull   r2, r3, r4, r8              @ r2..r3  = (X4 * K08)
-    smlal   r2, r3, r5, r9              @ r2..r3  = (X4 * K08) + (X13 *  K09) = ct01
-
-    smull   r10, lr, r8, r5             @ r10..lr = (X4 * K09)
-    smlal   r10, lr, r9, r6             @ r10..lr = (X4 * K09) + (X13 * -K08) = ct00
-
-    ldr     r8, [r0, #X7]               @ r8 = X7
-    ldr     r9, [r0, #X16]              @ r9 = X16
-
-    stmdb   sp!, { r2, r3, r10, lr }    @ stack ct00_h, ct00_l, ct01_h, ct01_l
-
-    add     r8, r8, r9                  @ r8 = (X7 + X16)
-    ldr     r9, [r0, #X1]               @ r9 = X1
-
-    smlal   r2, r3, r6, r8              @ r2..r3  = ct01 + ((X7 + X16) * -K08)
-    smlal   r2, r3, r7, r9              @ r2..r3 += (X1  * -K09)
-
-    ldr     r7, [r0, #X10]              @ r7 = X10
-
-    rsbs    r10, r10, #0
-    rsc     lr, lr, #0                  @ r10..lr  = -ct00
-
-    smlal   r2, r3, r5, r7              @ r2..r3  += (X10 *  K09) = ct06
-
-    smlal   r10, lr, r9, r6             @ r10..lr  = -ct00 + ( X1        * -K08)
-    smlal   r10, lr, r8, r5             @ r10..lr +=         ((X7 + X16) *  K09)
-    smlal   r10, lr, r7, r4             @ r10..lr +=         ( X10       *  K08) = ct04
-
-    stmdb   sp!, { r2, r3, r10, lr }    @ stack ct04_h, ct04_l, ct06_h, ct06_l
-
-    @----
-
-    ldr     r7, [r0, #X0]
-    ldr     r8, [r0, #X11]
-    ldr     r9, [r0, #X12]
-    sub     r7, r7, r8
-    sub     r7, r7, r9                  @ r7 = (X0 - X11 -X12) = ct14
-
-    ldr     r9,  [r0, #X3]
-    ldr     r8,  [r0, #X8]
-    ldr     r11, [r0, #X15]
-    sub     r8, r8, r9
-    add     r8, r8, r11                 @ r8 = (X8 - X3 + X15) = ct16
-
-    add     r11, r7, r8                 @ r11 = ct14 + ct16 = ct18
-
-    smlal   r2, r3, r6, r11             @ r2..r3 = ct06 + ((X0 - X11 - X3 + X15 + X8 - X12) * -K08)
-
-    ldr     r6,  [r0, #X2]
-    ldr     r9,  [r0, #X9]
-    ldr     r12, [r0, #X14]
-    sub     r6, r6, r9
-    sub     r6, r6, r12                 @ r6 = (X2 - X9 - X14) = ct15
-
-    ldr     r9,  [r0, #X5]
-    ldr     r12, [r0, #X6]
-    sub     r9, r9, r12
-    ldr     r12, [r0, #X17]
-    sub     r9, r9, r12                 @ r9 = (X5 - X6 - X17) = ct17
-
-    add     r12, r9, r6                 @ r12 = ct15 + ct17 = ct19
-
-    smlal   r2, r3, r5, r12             @ r2..r3 += ((X2 - X9 + X5 - X6 - X17 - X14) * K09)
-
-    smlal   r10, lr, r11, r5            @ r10..lr = ct04 + (ct18 * K09)
-    smlal   r10, lr, r12, r4            @ r10..lr = ct04 + (ct18 * K09) + (ct19 * K08)
-
-    movs    r2, r2, lsr #28
-    adc     r2, r2, r3, lsl #4          @ r2 = bits[59..28] of r2..r3
-    str     r2, [r1, #x22]              @ store result x22
-
-    movs    r10, r10, lsr #28
-    adc     r10, r10, lr, lsl #4        @ r10 = bits[59..28] of r10..lr
-    str     r10, [r1, #x4]              @ store result x4
-
-    @----
-
-    ldmia   sp, { r2, r3, r4, r5 }      @ r2..r3 = ct06, r4..r5 = ct04 (dont update sp)
-
-    @ r2..r3 = ct06
-    @ r4..r5 = ct04
-    @ r6     = ct15
-    @ r7     = ct14
-    @ r8     = ct16
-    @ r9     = ct17
-    @ r10    = .
-    @ r11    = .
-    @ r12    = .
-    @ lr     = .
-
-    ldr     r10, =K03                   @ r10 = K03
-    ldr     lr,  =K15                   @ lr  = K15
-
-    smlal   r2, r3, r10, r7             @ r2..r3 = ct06 + (ct14 * K03)
-    smlal   r4, r5,  lr, r7             @ r4..r5 = ct04 + (ct14 * K15)
-
-    ldr     r12, =K14                   @ r12 =  K14
-    rsb     r10, r10, #0                @ r10 = -K03
-
-    smlal   r2, r3,  lr, r6             @ r2..r3 += (ct15 *  K15)
-    smlal   r4, r5, r10, r6             @ r4..r5 += (ct15 * -K03)
-    smlal   r2, r3, r12, r8             @ r2..r3 += (ct16 *  K14)
-
-    ldr     r11, =minus_K02             @ r11 = -K02
-    rsb     r12, r12, #0                @ r12 = -K14
-
-    smlal   r4, r5, r12, r9             @ r4..r5 += (ct17 * -K14)
-    smlal   r2, r3, r11, r9             @ r2..r3 += (ct17 * -K02)
-    smlal   r4, r5, r11, r8             @ r4..r5 += (ct16 * -K02)
-
-    movs    r2, r2, lsr #28
-    adc     r2, r2, r3, lsl #4          @ r2 = bits[59..28] of r2..r3
-    str     r2, [r1, #x7]               @ store result x7
-
-    movs    r4, r4, lsr #28
-    adc     r4, r4, r5, lsl #4          @ r4 = bits[59..28] of r4..r5
-    str     r4, [r1, #x1]               @ store result x1
-
-    @----
-
-    ldmia   sp, { r2, r3, r4, r5 }      @ r2..r3 = ct06, r4..r5 = ct04 (dont update sp)
-
-    @ r2..r3 = ct06
-    @ r4..r5 = ct04
-    @ r6     = ct15
-    @ r7     = ct14
-    @ r8     = ct16
-    @ r9     = ct17
-    @ r10    = -K03
-    @ r11    = -K02
-    @ r12    = -K14
-    @ lr     =  K15
-
-    rsbs    r2, r2, #0
-    rsc     r3, r3, #0                  @ r2..r3 = -ct06
-
-    smlal   r2, r3, r12, r7             @ r2..r3  = -ct06 + (ct14 * -K14)
-    smlal   r2, r3, r10, r8             @ r2..r3 += (ct16 * -K03)
-
-    smlal   r4, r5, r12, r6             @ r4..r5  =  ct04 + (ct15 * -K14)
-    smlal   r4, r5, r10, r9             @ r4..r5 += (ct17 * -K03)
-    smlal   r4, r5,  lr, r8             @ r4..r5 += (ct16 *  K15)
-    smlal   r4, r5, r11, r7             @ r4..r5 += (ct14 * -K02)
-
-    rsb     lr, lr, #0                  @ lr  = -K15
-    rsb     r11, r11, #0                @ r11 =  K02
-
-    smlal   r2, r3,  lr, r9             @ r2..r3 += (ct17 * -K15)
-    smlal   r2, r3, r11, r6             @ r2..r3 += (ct15 *  K02)
-
-    movs    r4, r4, lsr #28
-    adc     r4, r4, r5, lsl #4          @ r4 = bits[59..28] of r4..r5
-    str     r4, [r1, #x25]              @ store result x25
-
-    movs    r2, r2, lsr #28
-    adc     r2, r2, r3, lsl #4          @ r2 = bits[59..28] of r2..r3
-    str     r2, [r1, #x19]              @ store result x19
-
-    @----
-
-    ldr     r2, [sp, #16]               @ r2 = ct01_l
-    ldr     r3, [sp, #20]               @ r3 = ct01_h
-
-    ldr     r6, [r0, #X1]
-    ldr     r8, [r0, #X7]
-    ldr     r9, [r0, #X10]
-    ldr     r7, [r0, #X16]
-
-    rsbs    r2, r2, #0
-    rsc     r3, r3, #0                  @ r2..r3 = -ct01
-
-    mov     r4, r2
-    mov     r5, r3                      @ r4..r5 = -ct01
-
-    @ r2..r3 = -ct01
-    @ r4..r5 = -ct01
-    @ r6     =  X1
-    @ r7     =  X16
-    @ r8     =  X7
-    @ r9     =  X10
-    @ r10    = -K03
-    @ r11    =  K02
-    @ r12    = -K14
-    @ lr     = -K15
-
-    smlal   r4, r5, r12, r7             @ r4..r5 = -ct01 + (X16 * -K14)
-    smlal   r2, r3,  lr, r9             @ r2..r3 = -ct01 + (X10 * -K15)
-
-    smlal   r4, r5, r10, r8             @ r4..r5 += (X7  * -K03)
-    smlal   r2, r3, r10, r7             @ r2..r3 += (X16 * -K03)
-
-    smlal   r4, r5, r11, r9             @ r4..r5 += (X10 *  K02)
-    smlal   r2, r3, r12, r8             @ r2..r3 += (X7  * -K14)
-
-    rsb     lr, lr, #0                  @ lr  =  K15
-    rsb     r11, r11, #0                @ r11 = -K02
-
-    smlal   r4, r5,  lr, r6             @ r4..r5 += (X1  *  K15) = ct05
-    smlal   r2, r3, r11, r6             @ r2..r3 += (X1  * -K02) = ct03
-
-    stmdb   sp!, { r2, r3, r4, r5 }     @ stack ct05_h, ct05_l, ct03_h, ct03_l
-
-    rsbs    r4, r4, #0
-    rsc     r5, r5, #0                  @ r4..r5 = -ct05
-
-    stmdb   sp!, { r4, r5 }             @ stack -ct05_h, -ct05_l
-
-    ldr     r2, [sp, #48]               @ r2 = ct00_l
-    ldr     r3, [sp, #52]               @ r3 = ct00_h
-
-    rsb     r10, r10, #0                @ r10 = K03
-
-    rsbs    r4, r2, #0
-    rsc     r5, r3, #0                  @ r4..r5 = -ct00
-
-    @ r2..r3 =  ct00
-    @ r4..r5 = -ct00
-    @ r6     =  X1
-    @ r7     =  X16
-    @ r8     =  X7
-    @ r9     =  X10
-    @ r10    =  K03
-    @ r11    = -K02
-    @ r12    = -K14
-    @ lr     =  K15
-
-    smlal   r4, r5, r10, r6             @ r4..r5 = -ct00 + (X1  * K03)
-    smlal   r2, r3, r10, r9             @ r2..r3 =  ct00 + (X10 * K03)
-
-    smlal   r4, r5, r12, r9             @ r4..r5 += (X10 * -K14)
-    smlal   r2, r3, r12, r6             @ r2..r3 += (X1  * -K14)
-
-    smlal   r4, r5, r11, r7             @ r4..r5 += (X16 * -K02)
-    smlal   r4, r5,  lr, r8             @ r4..r5 += (X7  *  K15) = ct07
-
-    rsb     lr, lr, #0                  @ lr  = -K15
-    rsb     r11, r11, #0                @ r11 =  K02
-
-    smlal   r2, r3, r11, r8             @ r2..r3 += (X7  *  K02)
-    smlal   r2, r3,  lr, r7             @ r2..r3 += (X16 * -K15) = ct02
-
-    rsbs    r6, r4, #0
-    rsc     r7, r5, #0                  @ r6..r7 = -ct07
-
-    stmdb   sp!, { r2 - r7 }            @ stack -ct07_h, -ct07_l, ct07_h, ct07_l, ct02_h, ct02_l
-
-
-    @----
-
-    add     r2, pc, #(imdct36_long_karray-.-8)  @ r2 = base address of Knn array (PIC safe ?)
-
-
-loop:
-    ldr     r12, [r0, #X0]
-
-    ldmia   r2!, { r5 - r11 }           @ first 7 words from Karray element
-
-    smull   r3, r4, r5, r12             @ sum =  (Kxx * X0)
-    ldr     r12, [r0, #X2]
-    ldr     r5,  [r0, #X3]
-    smlal   r3, r4, r6, r12             @ sum += (Kxx * X2)
-    ldr     r12, [r0, #X5]
-    ldr     r6,  [r0, #X6]
-    smlal   r3, r4, r7, r5              @ sum += (Kxx * X3)
-    smlal   r3, r4, r8, r12             @ sum += (Kxx * X5)
-    ldr     r12, [r0, #X8]
-    ldr     r5,  [r0, #X9]
-    smlal   r3, r4, r9, r6              @ sum += (Kxx * X6)
-    smlal   r3, r4, r10, r12            @ sum += (Kxx * X8)
-    smlal   r3, r4, r11, r5             @ sum += (Kxx * X9)
-
-    ldmia   r2!, { r5 - r10 }           @ final 6 words from Karray element
-
-    ldr     r11, [r0, #X11]
-    ldr     r12, [r0, #X12]
-    smlal   r3, r4, r5, r11             @ sum += (Kxx * X11)
-    ldr     r11, [r0, #X14]
-    ldr     r5,  [r0, #X15]
-    smlal   r3, r4, r6, r12             @ sum += (Kxx * X12)
-    smlal   r3, r4, r7, r11             @ sum += (Kxx * X14)
-    ldr     r11, [r0, #X17]
-    smlal   r3, r4, r8, r5              @ sum += (Kxx * X15)
-    smlal   r3, r4, r9, r11             @ sum += (Kxx * X17)
-
-    add     r5, sp, r10, lsr #16        @ create index back into stack for required ctxx
-
-    ldmia   r5, { r6, r7 }              @ r6..r7 = ctxx
-
-    mov     r8, r10, lsl #16            @ push ctxx index off the top end
-
-    adds    r3, r3, r6                  @ add low words
-    adc     r4, r4, r7                  @ add high words, with carry
-    movs    r3, r3, lsr #28
-    adc     r3, r3, r4, lsl #4          @ r3 = bits[59..28] of r3..r4
-
-    str     r3, [r1, r8, lsr #24]       @ push completion flag off the bottom end
-
-    movs    r8, r8, lsl #8              @ push result location index off the top end
-    beq     loop                        @ loop back if completion flag not set
-    b       imdct_l_windowing           @ branch to windowing stage if looping finished
-
-imdct36_long_karray:
-
-    .word   K17, -K13,  K10, -K06, -K05,  K01, -K00,  K04, -K07,  K11,  K12, -K16, 0x00000000
-    .word   K13,  K07,  K16,  K01,  K10, -K05,  K04, -K11,  K00, -K17,  K06, -K12, 0x00200800
-    .word   K11,  K17,  K05,  K12, -K01,  K06, -K07,  K00, -K13,  K04, -K16,  K10, 0x00200c00
-    .word   K07,  K00, -K12,  K05, -K16, -K10,  K11, -K17,  K04,  K13,  K01,  K06, 0x00001400
-    .word   K05,  K10, -K00, -K17,  K07, -K13,  K12,  K06, -K16,  K01, -K11, -K04, 0x00181800
-    .word   K01,  K05, -K07, -K11,  K13,  K17, -K16, -K12,  K10,  K06, -K04, -K00, 0x00102000
-    .word  -K16,  K12, -K11,  K07,  K04, -K00, -K01,  K05, -K06,  K10,  K13, -K17, 0x00284800
-    .word  -K12,  K06,  K17, -K00, -K11,  K04,  K05, -K10,  K01,  K16, -K07, -K13, 0x00085000
-    .word  -K10,  K16,  K04, -K13, -K00,  K07,  K06, -K01, -K12, -K05,  K17,  K11, 0x00105400
-    .word  -K06, -K01,  K13,  K04,  K17, -K11, -K10, -K16, -K05,  K12,  K00,  K07, 0x00185c00
-    .word  -K04, -K11, -K01,  K16,  K06,  K12,  K13, -K07, -K17, -K00, -K10, -K05, 0x00006000
-    .word  -K00, -K04, -K06, -K10, -K12, -K16, -K17, -K13, -K11, -K07, -K05, -K01, 0x00206801
-
-
-    @----
-    @-------------------------------------------------------------------------
-    @----
-
-imdct_l_windowing:
-
-    ldr     r11, [sp, #80]              @ fetch function parameter 3 from out of the stack
-    ldmia   r1!, { r0, r2 - r9 }        @ load 9 words from x0, update pointer
-
-    @ r0     = x0
-    @ r1     = &x[9]
-    @ r2     = x1
-    @ r3     = x2
-    @ r4     = x3
-    @ r5     = x4
-    @ r6     = x5
-    @ r7     = x6
-    @ r8     = x7
-    @ r9     = x8
-    @ r10    = .
-    @ r11    = window mode: (0 == normal), (1 == start block), (3 == stop block)
-    @ r12    = .
-    @ lr     = .
-
-    cmp     r11, #BLOCK_MODE_STOP       @ setup flags
-    rsb     r10, r0, #0                 @ r10 = -x0 (DONT change flags !!)
-    beq     stop_block_x0_to_x17
-
-
-    @ start and normal blocks are treated the same for x[0]..x[17]
-
-normal_block_x0_to_x17:
-
-    ldr     r12, =WL9                   @ r12 = window_l[9]
-
-    rsb     r0,  r9, #0                 @ r0  = -x8
-    rsb     r9,  r2, #0                 @ r9  = -x1
-    rsb     r2,  r8, #0                 @ r2  = -x7
-    rsb     r8,  r3, #0                 @ r8  = -x2
-    rsb     r3,  r7, #0                 @ r3  = -x6
-    rsb     r7,  r4, #0                 @ r7  = -x3
-    rsb     r4,  r6, #0                 @ r4  = -x5
-    rsb     r6,  r5, #0                 @ r6  = -x4
-
-    @ r0     = -x8
-    @ r1     = &x[9]
-    @ r2     = -x7
-    @ r3     = -x6
-    @ r4     = -x5
-    @ r5     = .
-    @ r6     = -x4
-    @ r7     = -x3
-    @ r8     = -x2
-    @ r9     = -x1
-    @ r10    = -x0
-    @ r11    = window mode: (0 == normal), (1 == start block), (3 == stop block)
-    @ r12    = window_l[9]
-    @ lr     = .
-
-    smull   r5, lr, r12, r0             @ r5..lr = (window_l[9]  * (x[9]  == -x[8]))
-    ldr     r12, =WL10                  @ r12 = window_l[10]
-    movs    r5, r5, lsr #28
-    adc     r0, r5, lr, lsl #4          @ r0 = bits[59..28] of windowed x9
-
-    smull   r5, lr, r12, r2             @ r5..lr = (window_l[10] * (x[10] == -x[7]))
-    ldr     r12, =WL11                  @ r12 = window_l[11]
-    movs    r5, r5, lsr #28
-    adc     r2, r5, lr, lsl #4          @ r2 = bits[59..28] of windowed x10
-
-    smull   r5, lr, r12, r3             @ r5..lr = (window_l[11] * (x[11] == -x[6]))
-    ldr     r12, =WL12                  @ r12 = window_l[12]
-    movs    r5, r5, lsr #28
-    adc     r3, r5, lr, lsl #4          @ r3 = bits[59..28] of windowed x11
-
-    smull   r5, lr, r12, r4             @ r5..lr = (window_l[12] * (x[12] == -x[5]))
-    ldr     r12, =WL13                  @ r12 = window_l[13]
-    movs    r5, r5, lsr #28
-    adc     r4, r5, lr, lsl #4          @ r4 = bits[59..28] of windowed x12
-
-    smull   r5, lr, r12, r6             @ r5..lr = (window_l[13] * (x[13] == -x[4]))
-    ldr     r12, =WL14                  @ r12 = window_l[14]
-    movs    r5, r5, lsr #28
-    adc     r6, r5, lr, lsl #4          @ r6 = bits[59..28] of windowed x13
-
-    smull   r5, lr, r12, r7             @ r5..lr = (window_l[14] * (x[14] == -x[3]))
-    ldr     r12, =WL15                  @ r12 = window_l[15]
-    movs    r5, r5, lsr #28
-    adc     r7, r5, lr, lsl #4          @ r7 = bits[59..28] of windowed x14
-
-    smull   r5, lr, r12, r8             @ r5..lr = (window_l[15] * (x[15] == -x[2]))
-    ldr     r12, =WL16                  @ r12 = window_l[16]
-    movs    r5, r5, lsr #28
-    adc     r8, r5, lr, lsl #4          @ r8 = bits[59..28] of windowed x15
-
-    smull   r5, lr, r12, r9             @ r5..lr = (window_l[16] * (x[16] == -x[1]))
-    ldr     r12, =WL17                  @ r12 = window_l[17]
-    movs    r5, r5, lsr #28
-    adc     r9, r5, lr, lsl #4          @ r9 = bits[59..28] of windowed x16
-
-    smull   r5, lr, r12, r10            @ r5..lr = (window_l[17] * (x[17] == -x[0]))
-    ldr     r12, =WL0                   @ r12 = window_l[0]
-    movs    r5, r5, lsr #28
-    adc     r10, r5, lr, lsl #4         @ r10 = bits[59..28] of windowed x17
-
-
-    stmia   r1,  { r0, r2 - r4, r6 - r10 } @ store windowed x[9] .. x[17]
-    ldmdb   r1!, { r0, r2 - r9 }           @ load 9 words downto (and including) x0
-
-
-    smull   r10, lr, r12, r0            @ r10..lr = (window_l[0] * x[0])
-    ldr     r12, =WL1                   @ r12 = window_l[1]
-    movs    r10, r10, lsr #28
-    adc     r0, r10, lr, lsl #4         @ r0 = bits[59..28] of windowed x0
-
-    smull   r10, lr, r12, r2            @ r10..lr = (window_l[1] * x[1])
-    ldr     r12, =WL2                   @ r12 = window_l[2]
-    movs    r10, r10, lsr #28
-    adc     r2, r10, lr, lsl #4         @ r2 = bits[59..28] of windowed x1
-
-    smull   r10, lr, r12, r3            @ r10..lr = (window_l[2] * x[2])
-    ldr     r12, =WL3                   @ r12 = window_l[3]
-    movs    r10, r10, lsr #28
-    adc     r3, r10, lr, lsl #4         @ r3 = bits[59..28] of windowed x2
-
-    smull   r10, lr, r12, r4            @ r10..lr = (window_l[3] * x[3])
-    ldr     r12, =WL4                   @ r12 = window_l[4]
-    movs    r10, r10, lsr #28
-    adc     r4, r10, lr, lsl #4         @ r4 = bits[59..28] of windowed x3
-
-    smull   r10, lr, r12, r5            @ r10..lr = (window_l[4] * x[4])
-    ldr     r12, =WL5                   @ r12 = window_l[5]
-    movs    r10, r10, lsr #28
-    adc     r5, r10, lr, lsl #4         @ r5 = bits[59..28] of windowed x4
-
-    smull   r10, lr, r12, r6            @ r10..lr = (window_l[5] * x[5])
-    ldr     r12, =WL6                   @ r12 = window_l[6]
-    movs    r10, r10, lsr #28
-    adc     r6, r10, lr, lsl #4         @ r6 = bits[59..28] of windowed x5
-
-    smull   r10, lr, r12, r7            @ r10..lr = (window_l[6] * x[6])
-    ldr     r12, =WL7                   @ r12 = window_l[7]
-    movs    r10, r10, lsr #28
-    adc     r7, r10, lr, lsl #4         @ r7 = bits[59..28] of windowed x6
-
-    smull   r10, lr, r12, r8            @ r10..lr = (window_l[7] * x[7])
-    ldr     r12, =WL8                   @ r12 = window_l[8]
-    movs    r10, r10, lsr #28
-    adc     r8, r10, lr, lsl #4         @ r8 = bits[59..28] of windowed x7
-
-    smull   r10, lr, r12, r9            @ r10..lr = (window_l[8] * x[8])
-    movs    r10, r10, lsr #28
-    adc     r9, r10, lr, lsl #4         @ r9 = bits[59..28] of windowed x8
-
-    stmia   r1, { r0, r2 - r9 }         @ store windowed x[0] .. x[8]
-
-    cmp     r11, #BLOCK_MODE_START
-    beq     start_block_x18_to_x35
-
-
-    @----
-
-
-normal_block_x18_to_x35:
-
-    ldr     r11, =WL3                   @ r11 = window_l[3]
-    ldr     r12, =WL4                   @ r12 = window_l[4]
-
-    add     r1, r1, #(18*4)             @ r1 = &x[18]
-
-    ldmia   r1!, { r0, r2 - r4, r6 - r10 }  @ load 9 words from x18, update pointer
-
-    @ r0     = x18
-    @ r1     = &x[27]
-    @ r2     = x19
-    @ r3     = x20
-    @ r4     = x21
-    @ r5     = .
-    @ r6     = x22
-    @ r7     = x23
-    @ r8     = x24
-    @ r9     = x25
-    @ r10    = x26
-    @ r11    = window_l[3]
-    @ r12    = window_l[4]
-    @ lr     = .
-
-    smull   r5, lr, r12, r6             @ r5..lr = (window_l[4] * (x[22] == x[31]))
-    movs    r5, r5, lsr #28
-    adc     r5, r5, lr, lsl #4          @ r5 = bits[59..28] of windowed x31
-
-    smull   r6, lr, r11, r4             @ r5..lr = (window_l[3] * (x[21] == x[32]))
-    ldr     r12, =WL5                   @ r12    =  window_l[5]
-    movs    r6, r6, lsr #28
-    adc     r6, r6, lr, lsl #4          @ r6 = bits[59..28] of windowed x32
-
-    smull   r4, lr, r12, r7             @ r4..lr = (window_l[5] * (x[23] == x[30]))
-    ldr     r11, =WL1                   @ r11    =  window_l[1]
-    ldr     r12, =WL2                   @ r12    =  window_l[2]
-    movs    r4, r4, lsr #28
-    adc     r4, r4, lr, lsl #4          @ r4 = bits[59..28] of windowed x30
-
-    smull   r7, lr, r12, r3             @ r7..lr = (window_l[2] * (x[20] == x[33]))
-    ldr     r12, =WL6                   @ r12 = window_l[6]
-    movs    r7, r7, lsr #28
-    adc     r7, r7, lr, lsl #4          @ r7 = bits[59..28] of windowed x33
-
-    smull   r3, lr, r12, r8             @ r3..lr = (window_l[6] * (x[24] == x[29]))
-    movs    r3, r3, lsr #28
-    adc     r3, r3, lr, lsl #4          @ r3 = bits[59..28] of windowed x29
-
-    smull   r8, lr, r11, r2             @ r7..lr = (window_l[1] * (x[19] == x[34]))
-    ldr     r12, =WL7                   @ r12    =  window_l[7]
-    ldr     r11, =WL8                   @ r11    =  window_l[8]
-    movs    r8, r8, lsr #28
-    adc     r8, r8, lr, lsl #4          @ r8 = bits[59..28] of windowed x34
-
-    smull   r2, lr, r12, r9             @ r7..lr = (window_l[7] * (x[25] == x[28]))
-    ldr     r12, =WL0                   @ r12 = window_l[0]
-    movs    r2, r2, lsr #28
-    adc     r2, r2, lr, lsl #4          @ r2 = bits[59..28] of windowed x28
-
-    smull   r9, lr, r12, r0             @ r3..lr = (window_l[0] * (x[18] == x[35]))
-    movs    r9, r9, lsr #28
-    adc     r9, r9, lr, lsl #4          @ r9 = bits[59..28] of windowed x35
-
-    smull   r0, lr, r11, r10            @ r7..lr = (window_l[8] * (x[26] == x[27]))
-    ldr     r11, =WL16                  @ r11    =  window_l[16]
-    ldr     r12, =WL17                  @ r12    =  window_l[17]
-    movs    r0, r0, lsr #28
-    adc     r0, r0, lr, lsl #4          @ r0 = bits[59..28] of windowed x27
-
-
-    stmia   r1,  { r0, r2 - r9 }        @ store windowed x[27] .. x[35]
-    ldmdb   r1!, { r0, r2 - r9 }        @ load 9 words downto (and including) x18
-
-
-    smull   r10, lr, r12, r0            @ r10..lr = (window_l[17] * x[18])
-    movs    r10, r10, lsr #28
-    adc     r0,  r10, lr, lsl #4        @ r0 = bits[59..28] of windowed x0
-
-    smull   r10, lr, r11, r2            @ r10..lr = (window_l[16] * x[19])
-    ldr     r11, =WL14                  @ r11     =  window_l[14]
-    ldr     r12, =WL15                  @ r12     =  window_l[15]
-    movs    r10, r10, lsr #28
-    adc     r2,  r10, lr, lsl #4        @ r2 = bits[59..28] of windowed x1
-
-    smull   r10, lr, r12, r3            @ r10..lr = (window_l[15] * x[20])
-    movs    r10, r10, lsr #28
-    adc     r3,  r10, lr, lsl #4        @ r3 = bits[59..28] of windowed x2
-
-    smull   r10, lr, r11, r4            @ r10..lr = (window_l[14] * x[21])
-    ldr     r11, =WL12                  @ r11     =  window_l[12]
-    ldr     r12, =WL13                  @ r12     =  window_l[13]
-    movs    r10, r10, lsr #28
-    adc     r4,  r10, lr, lsl #4        @ r4 = bits[59..28] of windowed x3
-
-    smull   r10, lr, r12, r5            @ r10..lr = (window_l[13] * x[22])
-    movs    r10, r10, lsr #28
-    adc     r5,  r10, lr, lsl #4        @ r5 = bits[59..28] of windowed x4
-
-    smull   r10, lr, r11, r6            @ r10..lr = (window_l[12] * x[23])
-    ldr     r11, =WL10                  @ r12 = window_l[10]
-    ldr     r12, =WL11                  @ r12 = window_l[11]
-    movs    r10, r10, lsr #28
-    adc     r6,  r10, lr, lsl #4        @ r6 = bits[59..28] of windowed x5
-
-    smull   r10, lr, r12, r7            @ r10..lr = (window_l[11] * x[24])
-    movs    r10, r10, lsr #28
-    adc     r7,  r10, lr, lsl #4        @ r7 = bits[59..28] of windowed x6
-
-    smull   r10, lr, r11, r8            @ r10..lr = (window_l[10] * x[25])
-    ldr     r12, =WL9                   @ r12 = window_l[9]
-    movs    r10, r10, lsr #28
-    adc     r8,  r10, lr, lsl #4        @ r8 = bits[59..28] of windowed x7
-
-    smull   r10, lr, r12, r9            @ r10..lr = (window_l[9] * x[26])
-
-    movs    r10, r10, lsr #28
-    adc     r9,  r10, lr, lsl #4        @ r9 = bits[59..28] of windowed x8
-
-    stmia   r1, { r0, r2 - r9 }         @ store windowed x[18] .. x[26]
-
-    @----
-    @ NB there are 2 possible exits from this function - this is only one of them
-    @----
-
-    add     sp, sp, #(21*4)             @ return stack frame
-    ldmia   sp!, { r4 - r11, pc }       @ restore callee saved regs, and return
-
-    @----
-
-
-stop_block_x0_to_x17:
-
-    @ r0     =  x0
-    @ r1     = &x[9]
-    @ r2     =  x1
-    @ r3     =  x2
-    @ r4     =  x3
-    @ r5     =  x4
-    @ r6     =  x5
-    @ r7     =  x6
-    @ r8     =  x7
-    @ r9     =  x8
-    @ r10    = -x0
-    @ r11    =  window mode: (0 == normal), (1 == start block), (3 == stop block)
-    @ r12    =  .
-    @ lr     =  .
-
-    rsb     r0, r6, #0                  @ r0 = -x5
-    rsb     r6, r2, #0                  @ r6 = -x1
-    rsb     r2, r5, #0                  @ r2 = -x4
-    rsb     r5, r3, #0                  @ r5 = -x2
-    rsb     r3, r4, #0                  @ r3 = -x3
-
-    add     r1, r1, #(3*4)                      @ r1 = &x[12]
-    stmia   r1, { r0, r2, r3, r5, r6, r10 }     @ store unchanged x[12] .. x[17]
-
-    ldr     r0, =WL1                    @ r0 = window_l[1]  == window_s[0]
-
-    rsb     r10, r9, #0                 @ r10 = -x8
-    rsb     r12, r8, #0                 @ r12 = -x7
-    rsb     lr,  r7, #0                 @ lr  = -x6
-
-    @ r0     =  WL1
-    @ r1     = &x[12]
-    @ r2     =  .
-    @ r3     =  .
-    @ r4     =  .
-    @ r5     =  .
-    @ r6     =  .
-    @ r7     =  x6
-    @ r8     =  x7
-    @ r9     =  x8
-    @ r10    = -x8
-    @ r11    =  window mode: (0 == normal), (1 == start block), (3 == stop block)
-    @ r12    = -x7
-    @ lr     = -x6
-
-    smull   r5, r6, r0, r7              @ r5..r6 = (window_l[1] * x[6])
-    ldr     r2, =WL4                    @ r2     =  window_l[4] == window_s[1]
-    movs    r5, r5, lsr #28
-    adc     r7, r5, r6, lsl #4          @ r7 = bits[59..28] of windowed x6
-
-    smull   r5, r6, r2, r8              @ r5..r6 = (window_l[4] * x[7])
-    ldr     r3, =WL7                    @ r3     =  window_l[7] == window_s[2]
-    movs    r5, r5, lsr #28
-    adc     r8, r5, r6, lsl #4          @ r8 = bits[59..28] of windowed x7
-
-    smull   r5, r6, r3, r9              @ r5..r6 = (window_l[7] * x[8])
-    ldr     r4, =WL10                   @ r4     =  window_l[10] == window_s[3]
-    movs    r5, r5, lsr #28
-    adc     r9, r5, r6, lsl #4          @ r9 = bits[59..28] of windowed x8
-
-    smull   r5, r6, r4, r10             @ r5..r6 = (window_l[10] * (x[9] == -x[8]))
-    ldr     r0, =WL13                   @ r0     =  window_l[13] == window_s[4]
-    movs    r5, r5, lsr #28
-    adc     r10, r5, r6, lsl #4         @ r10 = bits[59..28] of windowed x9
-
-    smull   r5, r6, r0, r12             @ r5..r6 = (window_l[13] * (x[10] == -x[7]))
-    ldr     r2, =WL16                   @ r2     =  window_l[16] == window_s[5]
-    movs    r5, r5, lsr #28
-    adc     r12, r5, r6, lsl #4         @ r10 = bits[59..28] of windowed x9
-
-    smull   r5, r6, r2, lr              @ r5..r6 = (window_l[16] * (x[11] == -x[6]))
-
-    ldr     r0, =0x00
-
-    movs    r5, r5, lsr #28
-    adc     lr, r5, r6, lsl #4          @ r10 = bits[59..28] of windowed x9
-
-    stmdb   r1!, { r7 - r10, r12, lr }  @ store windowed x[6] .. x[11]
-
-    ldr     r5, =0x00
-    ldr     r6, =0x00
-    ldr     r2, =0x00
-    ldr     r3, =0x00
-    ldr     r4, =0x00
-
-    stmdb   r1!, { r0, r2 - r6 }        @ store windowed x[0] .. x[5]
-
-    b       normal_block_x18_to_x35
-
-
-    @----
-
-
-start_block_x18_to_x35:
-
-    ldr     r4, =WL1                    @ r0 = window_l[1]  == window_s[0]
-
-    add     r1, r1, #(24*4)             @ r1 = &x[24]
-
-    ldmia   r1, { r0, r2, r3 }          @ load 3 words from x24, dont update pointer
-
-    @ r0     = x24
-    @ r1     = &x[24]
-    @ r2     = x25
-    @ r3     = x26
-    @ r4     = WL1
-    @ r5     = WL4
-    @ r6     = WL7
-    @ r7     = WL10
-    @ r8     = WL13
-    @ r9     = WL16
-    @ r10    = .
-    @ r11    = .
-    @ r12    = .
-    @ lr     = .
-
-    ldr     r5, =WL4                    @ r5 = window_l[4] == window_s[1]
-
-    smull   r10, r11, r4, r0            @ r10..r11 = (window_l[1] * (x[24] == x[29]))
-    ldr     r6, =WL7                    @ r6       =  window_l[7]  == window_s[2]
-    movs    r10, r10, lsr #28
-    adc     lr, r10, r11, lsl #4        @ lr = bits[59..28] of windowed x29
-
-    smull   r10, r11, r5, r2            @ r10..r11 = (window_l[4] * (x[25] == x[28]))
-    ldr     r7, =WL10                   @ r7       =  window_l[10] == window_s[3]
-    movs    r10, r10, lsr #28
-    adc     r12, r10, r11, lsl #4       @ r12 = bits[59..28] of windowed x28
-
-    smull   r10, r11, r6, r3            @ r10..r11 = (window_l[7] * (x[26] == x[27]))
-    ldr     r8, =WL13                   @ r8       =  window_l[13] == window_s[4]
-    movs    r10, r10, lsr #28
-    adc     r4, r10, r11, lsl #4        @ r4 = bits[59..28] of windowed x27
-
-    smull   r10, r11, r7, r3            @ r10..r11 = (window_l[10] * x[26])
-    ldr     r9, =WL16                   @ r9       =  window_l[16] == window_s[5]
-    movs    r10, r10, lsr #28
-    adc     r3, r10, r11, lsl #4        @ r3 = bits[59..28] of windowed x26
-
-    smull   r10, r11, r8, r2            @ r10..r11 = (window_l[13] * x[25])
-    ldr     r5, =0x00
-    movs    r10, r10, lsr #28
-    adc     r2, r10, r11, lsl #4        @ r2 = bits[59..28] of windowed x25
-
-    smull   r10, r11, r9, r0            @ r10..r11 = (window_l[16] * x[24])
-    ldr     r6, =0x00
-    movs    r10, r10, lsr #28
-    adc     r0, r10, r11, lsl #4        @ r0 = bits[59..28] of windowed x24
-
-    stmia   r1!, { r0, r2, r3, r4, r12, lr }    @ store windowed x[24] .. x[29]
-
-    ldr     r7, =0x00
-    ldr     r8, =0x00
-    ldr     r9, =0x00
-    ldr     r10, =0x00
-
-    stmia   r1!, { r5 - r10 }           @ store windowed x[30] .. x[35]
-
-    @----
-    @ NB there are 2 possible exits from this function - this is only one of them
-    @----
-
-    add     sp, sp, #(21*4)             @ return stack frame
-    ldmia   sp!, { r4 - r11, pc }       @ restore callee saved regs, and return
-
-    @----
-    @END
-    @----
-
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index 25d1e358a..c552d9a08 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -5,14 +5,6 @@ AM_LDFLAGS = $(xineplug_ldflags)
 
 EXTRA_DIST = fooaudio.c
 
-if ENABLE_VORBIS
-vorbis_module = xineplug_decode_vorbis.la
-endif
-
-if ENABLE_SPEEX
-speex_module = xineplug_decode_speex.la
-endif
-
 if ENABLE_MUSEPACK
 musepack_module = xineplug_decode_mpc.la
 endif
@@ -21,6 +13,27 @@ if ENABLE_DTS
 dts_module = xineplug_decode_dts.la
 endif
 
+if ENABLE_MAD
+mad_module = xineplug_decode_mad.la
+endif
+
+if ENABLE_A52DEC
+a52_module = xineplug_decode_a52.la
+endif
+
+if ENABLE_FAAD
+faad_module = xineplug_decode_faad.la
+endif
+
+$(top_builddir)/contrib/a52dec/liba52.la:
+	$(MAKE) -C $(top_builddir)/contrib/a52dec
+
+$(top_builddir)/contrib/libfaad/libfaad.la:
+	$(MAKE) -C $(top_builddir)/contrib/libfaad
+
+$(top_builddir)/contrib/libmad/libmad.la:
+	$(MAKE) -C $(top_builddir)/contrib/libmad
+
 $(top_builddir)/contrib/libmpcdec/libmpcdec.la:
 	$(MAKE) -C $(top_builddir)/contrib/libmpcdec
 
@@ -33,10 +46,11 @@ $(top_builddir)/contrib/gsm610/libgsm610.la:
 xineplug_LTLIBRARIES = \
 	xineplug_decode_gsm610.la \
 	xineplug_decode_lpcm.la \
-	$(vorbis_module) \
-	$(speex_module) \
 	$(musepack_module) \
-	$(dts_module)
+	$(dts_module) \
+	$(mad_module) \
+	$(a52_module) \
+	$(faad_module)
 
 xineplug_decode_gsm610_la_SOURCES = gsm610.c
 xineplug_decode_gsm610_la_LIBADD = $(XINE_LIB) $(top_builddir)/contrib/gsm610/libgsm610.la
@@ -45,14 +59,6 @@ xineplug_decode_gsm610_la_CPPFLAGS = -I$(top_srcdir)/contrib/gsm610
 xineplug_decode_lpcm_la_SOURCES = xine_lpcm_decoder.c
 xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB)
 
-xineplug_decode_vorbis_la_SOURCES = xine_vorbis_decoder.c
-xineplug_decode_vorbis_la_LIBADD = $(XINE_LIB) $(VORBIS_LIBS) $(OGG_LIBS)
-xineplug_decode_vorbis_la_CFLAGS = $(AM_CFLAGS) $(VORBIS_CFLAGS)
-
-xineplug_decode_speex_la_SOURCES = xine_speex_decoder.c
-xineplug_decode_speex_la_LIBADD = $(XINE_LIB) $(SPEEX_LIBS)
-xineplug_decode_speex_la_CFLAGS = $(AM_CFLAGS) $(SPEEX_CFLAGS)
-
 xineplug_decode_mpc_la_SOURCES = xine_musepack_decoder.c
 xineplug_decode_mpc_la_DEPENDENCIES = $(MPCDEC_DEPS)
 xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(MPCDEC_LIBS)
@@ -62,3 +68,17 @@ xineplug_decode_dts_la_SOURCES = xine_dts_decoder.c
 xineplug_decode_dts_la_DEPENDENCIES = $(LIBDTS_DEPS)
 xineplug_decode_dts_la_LIBADD = $(XINE_LIB) $(LIBDTS_LIBS)
 xineplug_decode_dts_la_CFLAGS = $(AM_CFLAGS) $(LIBDTS_CFLAGS)
+
+xineplug_decode_mad_la_SOURCES = xine_mad_decoder.c
+xineplug_decode_mad_la_DEPENDENCIES = $(LIBMAD_DEPS)
+xineplug_decode_mad_la_LIBADD = $(XINE_LIB) $(LIBMAD_LIBS)
+xineplug_decode_mad_la_CFLAGS = $(AM_CFLAGS) $(LIBMAD_CFLAGS)
+
+xineplug_decode_a52_la_SOURCES = xine_a52_decoder.c
+xineplug_decode_a52_la_DEPENDENCIES = $(A52DEC_DEPS)
+xineplug_decode_a52_la_LIBADD = $(XINE_LIB) $(A52DEC_LIBS) -lm
+xineplug_decode_a52_la_CFLAGS = $(AM_CFLAGS) $(A52DEC_CFLAGS)
+
+xineplug_decode_faad_la_SOURCES = xine_faad_decoder.c
+xineplug_decode_faad_la_LIBADD = $(XINE_LIB) $(top_builddir)/contrib/libfaad/libfaad.la -lm
+xineplug_decode_faad_la_CPPFLAGS = -I$(top_srcdir)/contrib/libfaad
diff --git a/src/liba52/xine_a52_decoder.c b/src/libxineadec/xine_a52_decoder.c
index 5435e9664..f6fa8a9a3 100644
--- a/src/liba52/xine_a52_decoder.c
+++ b/src/libxineadec/xine_a52_decoder.c
@@ -64,7 +64,7 @@
 #include "buffer.h"
 #include "xineutils.h"
 
-#include "crc.c"
+#include "../../contrib/a52dec/crc.c"
 
 #undef DEBUG_A52
 #ifdef DEBUG_A52
diff --git a/src/libfaad/xine_faad_decoder.c b/src/libxineadec/xine_faad_decoder.c
index 169874a44..169874a44 100644
--- a/src/libfaad/xine_faad_decoder.c
+++ b/src/libxineadec/xine_faad_decoder.c
diff --git a/src/libmad/xine_mad_decoder.c b/src/libxineadec/xine_mad_decoder.c
index 28407cfec..98695db68 100644
--- a/src/libmad/xine_mad_decoder.c
+++ b/src/libxineadec/xine_mad_decoder.c
@@ -39,10 +39,15 @@
 #include "xine_internal.h"
 #include "audio_out.h"
 #include "buffer.h"
-#include "frame.h"
-#include "synth.h"
 #include "xineutils.h"
 
+#ifdef HAVE_MAD_H
+# include <mad.h>
+#else
+# include "frame.h"
+# include "synth.h"
+#endif
+
 #define INPUT_BUF_SIZE  16384
 
 typedef struct {
diff --git a/src/libxinevdec/Makefile.am b/src/libxinevdec/Makefile.am
index 28a926a79..ac632dfd5 100644
--- a/src/libxinevdec/Makefile.am
+++ b/src/libxinevdec/Makefile.am
@@ -13,10 +13,6 @@ if ENABLE_GDK_PIXBUF
 gdkpixbuf_module = xineplug_decode_gdk_pixbuf.la
 endif
 
-if ENABLE_THEORA
-theora_module = xineplug_decode_theora.la
-endif
-
 xineplug_LTLIBRARIES = $(image_module) \
 	$(gdkpixbuf_module) \
 	$(theora_module) \
@@ -40,7 +36,3 @@ xineplug_decode_image_la_CFLAGS = $(AM_CFLAGS) $(WAND_CFLAGS)
 xineplug_decode_gdk_pixbuf_la_SOURCES = gdkpixbuf.c
 xineplug_decode_gdk_pixbuf_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(GDK_PIXBUF_LIBS)
 xineplug_decode_gdk_pixbuf_la_CFLAGS = $(AM_CFLAGS) $(GDK_PIXBUF_CFLAGS)
-
-xineplug_decode_theora_la_SOURCES = xine_theora_decoder.c
-xineplug_decode_theora_la_LIBADD = $(XINE_LIB) $(OGG_LIBS) $(THEORA_LIBS)
-xineplug_decode_theora_la_CFLAGS = $(AM_CFLAGS) $(OGG_CFLAGS) $(THEORA_CFLAGS)
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index a4f219b9c..9a9f879fe 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -6,25 +6,13 @@ AM_OBJCFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 
 SUBDIRS = 
 
-if BUILD_DHA_KMOD
-SUBDIRS += libdha
-endif
-
-# vidix depends on portions of dha
-if ENABLE_VIDIX
-if !BUILD_DHA_KMOD
-SUBDIRS += libdha
-endif
-SUBDIRS += vidix
-endif
-
 if ENABLE_MACOSX_VIDEO
 SUBDIRS += macosx
 endif
 
 EXTRA_DIST = video_out_directfb.c video_out_directfb_fb.c video_out_directfb_x.c video_out_directx.c video_out_macosx.m
 
-noinst_HEADERS = deinterlace.h video_out_syncfb.h yuv2rgb.h x11osd.h xcbosd.h
+noinst_HEADERS = video_out_syncfb.h yuv2rgb.h x11osd.h xcbosd.h
 
 if HAVE_X11
 X11OSD = x11osd.c
@@ -64,6 +52,8 @@ endif
 
 if ENABLE_VIDIX
 vidix_module = xineplug_vo_out_vidix.la
+$(top_builddir)/contrib/vidix/libvidix.la:
+	$(MAKE) -C $(top_builddir)/contrib/vidix libvidix.la
 endif
 
 if ENABLE_AA
@@ -122,7 +112,7 @@ xineplug_vo_out_xcbshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c video
 xineplug_vo_out_xcbshm_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(XCB_LIBS) $(XCBSHM_LIBS)
 xineplug_vo_out_xcbshm_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS)
 
-xineplug_vo_out_xcbxv_la_SOURCES = deinterlace.c video_out_xcbxv.c $(XCBOSD)
+xineplug_vo_out_xcbxv_la_SOURCES = video_out_xcbxv.c $(XCBOSD)
 xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(XCBXV_LIBS) $(XCB_LIBS)
 xineplug_vo_out_xcbxv_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBXV_CFLAGS)
 
@@ -131,15 +121,15 @@ xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \
 xineplug_vo_out_xshm_la_LIBADD = $(MLIB_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
 xineplug_vo_out_xshm_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(MLIB_CFLAGS) -fno-strict-aliasing
 
-xineplug_vo_out_xv_la_SOURCES = $(X11OSD) deinterlace.c video_out_xv.c
+xineplug_vo_out_xv_la_SOURCES = $(X11OSD) video_out_xv.c
 xineplug_vo_out_xv_la_LIBADD = $(XV_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
 xineplug_vo_out_xv_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(XV_CFLAGS) -fno-strict-aliasing
 
-xineplug_vo_out_xvmc_la_SOURCES = deinterlace.c video_out_xvmc.c
+xineplug_vo_out_xvmc_la_SOURCES = video_out_xvmc.c
 xineplug_vo_out_xvmc_la_LIBADD = $(XVMC_LIBS) $(XV_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
 xineplug_vo_out_xvmc_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(XV_CFLAGS)
 
-xineplug_vo_out_xxmc_la_SOURCES = $(X11OSD) deinterlace.c video_out_xxmc.c\
+xineplug_vo_out_xxmc_la_SOURCES = $(X11OSD) video_out_xxmc.c\
 				xvmc_mocomp.c xvmc_vld.c xxmc.h
 xineplug_vo_out_xxmc_la_LIBADD = $(XXMC_LIBS) $(XV_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS)
 xineplug_vo_out_xxmc_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(XV_CFLAGS) -fno-strict-aliasing
@@ -165,10 +155,10 @@ xineplug_vo_out_pgx32_la_CPPFLAGS = $(AM_CPPFLAGS) $(SUNDGA_CPPFLAGS)
 
 xineplug_vo_out_vidix_la_SOURCES = video_out_vidix.c $(X11OSD)
 xineplug_vo_out_vidix_la_LIBADD =  $(XINE_LIB) $(X_LIBS) \
-	$(top_builddir)/src/video_out/vidix/libvidix.la $(PTHREAD_LIBS)
+	$(top_builddir)/contrib/vidix/libvidix.la $(PTHREAD_LIBS)
 xineplug_vo_out_vidix_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) -fno-strict-aliasing
-xineplug_vo_out_vidix_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/video_out/vidix \
-	-I$(top_srcdir)/src/video_out/vidix
+xineplug_vo_out_vidix_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/contrib/vidix \
+	-I$(top_srcdir)/contrib/vidix
 
 
 xineplug_vo_out_aa_la_SOURCES =  video_out_aa.c
diff --git a/src/video_out/deinterlace.c b/src/video_out/deinterlace.c
deleted file mode 100644
index 1fda3d733..000000000
--- a/src/video_out/deinterlace.c
+++ /dev/null
@@ -1,847 +0,0 @@
- /*
- * Copyright (C) 2001 the xine project
- *
- * This file is part of xine, a free video player.
- *
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- *
- * Deinterlace routines by Miguel Freitas
- * based of DScaler project sources (deinterlace.sourceforge.net)
- *
- * Currently only available for Xv driver and MMX extensions
- *
- * small todo list:
- * - implement non-MMX versions for all methods
- * - support MMX2 instructions
- * - move some generic code from xv driver to this file
- * - make it also work for yuy2 frames
- *
- */
-
-#include <stdio.h>
-#include <string.h>
-#include "xine_internal.h"
-#include "deinterlace.h"
-#include "xineutils.h"
-
-
-/*
-   DeinterlaceFieldBob algorithm
-   Based on Virtual Dub plugin by Gunnar Thalin
-   MMX asm version from dscaler project (deinterlace.sourceforge.net)
-   Linux version for Xine player by Miguel Freitas
-*/
-static void deinterlace_bob_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
-    int width, int height )
-{
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
-  int Line;
-  uint64_t *YVal1;
-  uint64_t *YVal2;
-  uint64_t *YVal3;
-  uint64_t *Dest;
-  uint8_t* pEvenLines = psrc[0];
-  uint8_t* pOddLines = psrc[0]+width;
-  int LineLength = width;
-  int SourcePitch = width * 2;
-  int IsOdd = 1;
-  long EdgeDetect = 625;
-  long JaggieThreshold = 73;
-
-  int n;
-
-  uint64_t qwEdgeDetect;
-  uint64_t qwThreshold;
-
-  static mmx_t YMask = {ub:{0xff,0,0xff,0,0xff,0,0xff,0}};
-  static mmx_t Mask = {ub:{0xfe,0xfe,0xfe,0xfe,0xfe,0xfe,0xfe,0xfe}};
-
-  qwEdgeDetect = EdgeDetect;
-  qwEdgeDetect += (qwEdgeDetect << 48) + (qwEdgeDetect << 32) + (qwEdgeDetect << 16);
-  qwThreshold = JaggieThreshold;
-  qwThreshold += (qwThreshold << 48) + (qwThreshold << 32) + (qwThreshold << 16);
-
-
-  // copy first even line no matter what, and the first odd line if we're
-  // processing an odd field.
-  xine_fast_memcpy(pdst, pEvenLines, LineLength);
-  if (IsOdd)
-    xine_fast_memcpy(pdst + LineLength, pOddLines, LineLength);
-
-  height = height / 2;
-  for (Line = 0; Line < height - 1; ++Line)
-  {
-    if (IsOdd)
-    {
-      YVal1 = (uint64_t *)(pOddLines + Line * SourcePitch);
-      YVal2 = (uint64_t *)(pEvenLines + (Line + 1) * SourcePitch);
-      YVal3 = (uint64_t *)(pOddLines + (Line + 1) * SourcePitch);
-      Dest = (uint64_t *)(pdst + (Line * 2 + 2) * LineLength);
-    }
-    else
-    {
-      YVal1 = (uint64_t *)(pEvenLines + Line * SourcePitch);
-      YVal2 = (uint64_t *)(pOddLines + Line * SourcePitch);
-      YVal3 = (uint64_t *)(pEvenLines + (Line + 1) * SourcePitch);
-      Dest = (uint64_t *)(pdst + (Line * 2 + 1) * LineLength);
-    }
-
-    // For ease of reading, the comments below assume that we're operating on an odd
-    // field (i.e., that bIsOdd is true).  The exact same processing is done when we
-    // operate on an even field, but the roles of the odd and even fields are reversed.
-    // It's just too cumbersome to explain the algorithm in terms of "the next odd
-    // line if we're doing an odd field, or the next even line if we're doing an
-    // even field" etc.  So wherever you see "odd" or "even" below, keep in mind that
-    // half the time this function is called, those words' meanings will invert.
-
-    // Copy the odd line to the overlay verbatim.
-    xine_fast_memcpy((char *)Dest + LineLength, YVal3, LineLength);
-
-    n = LineLength >> 3;
-    while( n-- )
-    {
-      movq_m2r (*YVal1++, mm0);
-      movq_m2r (*YVal2++, mm1);
-      movq_m2r (*YVal3++, mm2);
-
-      // get intensities in mm3 - 4
-      movq_r2r ( mm0, mm3 );
-      pand_m2r ( YMask, mm3 );
-      movq_r2r ( mm1, mm4 );
-      pand_m2r ( YMask, mm4 );
-      movq_r2r ( mm2, mm5 );
-      pand_m2r ( YMask, mm5 );
-
-      // get average in mm0
-      pand_m2r ( Mask, mm0 );
-      pand_m2r ( Mask, mm2 );
-      psrlw_i2r ( 01, mm0 );
-      psrlw_i2r ( 01, mm2 );
-      paddw_r2r ( mm2, mm0 );
-
-      // work out (O1 - E) * (O2 - E) / 2 - EdgeDetect * (O1 - O2) ^ 2 >> 12
-      // result will be in mm6
-
-      psrlw_i2r ( 01, mm3 );
-      psrlw_i2r ( 01, mm4 );
-      psrlw_i2r ( 01, mm5 );
-
-      movq_r2r ( mm3, mm6 );
-      psubw_r2r ( mm4, mm6 );	//mm6 = O1 - E
-
-      movq_r2r ( mm5, mm7 );
-      psubw_r2r ( mm4, mm7 );	//mm7 = O2 - E
-
-      pmullw_r2r ( mm7, mm6 );		// mm6 = (O1 - E) * (O2 - E)
-
-      movq_r2r ( mm3, mm7 );
-      psubw_r2r ( mm5, mm7 );		// mm7 = (O1 - O2)
-      pmullw_r2r ( mm7, mm7 );	// mm7 = (O1 - O2) ^ 2
-      psrlw_i2r ( 12, mm7 );		// mm7 = (O1 - O2) ^ 2 >> 12
-      pmullw_m2r ( *&qwEdgeDetect, mm7 );// mm7  = EdgeDetect * (O1 - O2) ^ 2 >> 12
-
-      psubw_r2r ( mm7, mm6 );      // mm6 is what we want
-
-      pcmpgtw_m2r ( *&qwThreshold, mm6 );
-
-      movq_r2r ( mm6, mm7 );
-
-      pand_r2r ( mm6, mm0 );
-
-      pandn_r2r ( mm1, mm7 );
-
-      por_r2r ( mm0, mm7 );
-
-      movq_r2m ( mm7, *Dest++ );
-    }
-  }
-
-  // Copy last odd line if we're processing an even field.
-  if (! IsOdd)
-  {
-    xine_fast_memcpy(pdst + (height * 2 - 1) * LineLength,
-                      pOddLines + (height - 1) * SourcePitch,
-                      LineLength);
-  }
-
-  // clear out the MMX registers ready for doing floating point
-  // again
-  emms();
-#endif
-}
-
-/* Deinterlace the latest field, with a tendency to weave rather than bob.
-   Good for high detail on low-movement scenes.
-   Seems to produce bad output in general case, need to check if this
-   is normal or if the code is broken. 
-*/
-static int deinterlace_weave_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
-    int width, int height )
-{
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
-
-  int Line;
-  uint64_t *YVal1;
-  uint64_t *YVal2;
-  uint64_t *YVal3;
-  uint64_t *YVal4;
-  uint64_t *Dest;
-  uint8_t* pEvenLines = psrc[0];
-  uint8_t* pOddLines = psrc[0]+width;
-  uint8_t* pPrevLines;
-
-  int LineLength = width;
-  int SourcePitch = width * 2;
-  int IsOdd = 1;
-
-  long TemporalTolerance = 300;
-  long SpatialTolerance = 600;
-  long SimilarityThreshold = 25;
-
-  int n;
-
-  uint64_t qwSpatialTolerance;
-  uint64_t qwTemporalTolerance;
-  uint64_t qwThreshold;
-
-  static mmx_t YMask = {ub:{0xff,0,0xff,0,0xff,0,0xff,0}};
-  static mmx_t Mask = {ub:{0xfe,0xfe,0xfe,0xfe,0xfe,0xfe,0xfe,0xfe}};
-
-
-  // Make sure we have all the data we need.
-  if ( psrc[0] == NULL || psrc[1] == NULL )
-    return 0;
-
-  if (IsOdd)
-    pPrevLines = psrc[1] + width;
-  else
-    pPrevLines = psrc[1];
-
-  // Since the code uses MMX to process 4 pixels at a time, we need our constants
-  // to be represented 4 times per quadword.
-  qwSpatialTolerance = SpatialTolerance;
-  qwSpatialTolerance += (qwSpatialTolerance << 48) + (qwSpatialTolerance << 32) + (qwSpatialTolerance << 16);
-  qwTemporalTolerance = TemporalTolerance;
-  qwTemporalTolerance += (qwTemporalTolerance << 48) + (qwTemporalTolerance << 32) + (qwTemporalTolerance << 16);
-  qwThreshold = SimilarityThreshold;
-  qwThreshold += (qwThreshold << 48) + (qwThreshold << 32) + (qwThreshold << 16);
-
-  // copy first even line no matter what, and the first odd line if we're
-  // processing an even field.
-  xine_fast_memcpy(pdst, pEvenLines, LineLength);
-  if (!IsOdd)
-    xine_fast_memcpy(pdst + LineLength, pOddLines, LineLength);
-
-  height = height / 2;
-  for (Line = 0; Line < height - 1; ++Line)
-  {
-    if (IsOdd)
-    {
-      YVal1 = (uint64_t *)(pEvenLines + Line * SourcePitch);
-      YVal2 = (uint64_t *)(pOddLines + Line * SourcePitch);
-      YVal3 = (uint64_t *)(pEvenLines + (Line + 1) * SourcePitch);
-      YVal4 = (uint64_t *)(pPrevLines + Line * SourcePitch);
-      Dest = (uint64_t *)(pdst + (Line * 2 + 1) * LineLength);
-    }
-    else
-    {
-      YVal1 = (uint64_t *)(pOddLines + Line * SourcePitch);
-      YVal2 = (uint64_t *)(pEvenLines + (Line + 1) * SourcePitch);
-      YVal3 = (uint64_t *)(pOddLines + (Line + 1) * SourcePitch);
-      YVal4 = (uint64_t *)(pPrevLines + (Line + 1) * SourcePitch);
-      Dest = (uint64_t *)(pdst + (Line * 2 + 2) * LineLength);
-    }
-
-    // For ease of reading, the comments below assume that we're operating on an odd
-    // field (i.e., that bIsOdd is true).  The exact same processing is done when we
-    // operate on an even field, but the roles of the odd and even fields are reversed.
-    // It's just too cumbersome to explain the algorithm in terms of "the next odd
-    // line if we're doing an odd field, or the next even line if we're doing an
-    // even field" etc.  So wherever you see "odd" or "even" below, keep in mind that
-    // half the time this function is called, those words' meanings will invert.
-
-    // Copy the even scanline below this one to the overlay buffer, since we'll be
-    // adapting the current scanline to the even lines surrounding it.  The scanline
-    // above has already been copied by the previous pass through the loop.
-    xine_fast_memcpy((char *)Dest + LineLength, YVal3, LineLength);
-
-    n = LineLength >> 3;
-    while( n-- )
-    {
-      movq_m2r ( *YVal1++, mm0 );    // mm0 = E1
-      movq_m2r ( *YVal2++, mm1 );    // mm1 = O
-      movq_m2r ( *YVal3++, mm2 );    // mm2 = E2
-
-      movq_r2r ( mm0, mm3 );       // mm3 = intensity(E1)
-      movq_r2r ( mm1, mm4 );       // mm4 = intensity(O)
-      movq_r2r ( mm2, mm6 );       // mm6 = intensity(E2)
-
-      pand_m2r ( YMask, mm3 );
-      pand_m2r ( YMask, mm4 );
-      pand_m2r ( YMask, mm6 );
-
-      // Average E1 and E2 for interpolated bobbing.
-      // leave result in mm0
-      pand_m2r ( Mask, mm0 ); // mm0 = E1 with lower chroma bit stripped off
-      pand_m2r ( Mask, mm2 ); // mm2 = E2 with lower chroma bit stripped off
-      psrlw_i2r ( 01, mm0 );    // mm0 = E1 / 2
-      psrlw_i2r ( 01, mm2 );    // mm2 = E2 / 2
-      paddb_r2r ( mm2, mm0 );
-
-      // The meat of the work is done here.  We want to see whether this pixel is
-      // close in luminosity to ANY of: its top neighbor, its bottom neighbor,
-      // or its predecessor.  To do this without branching, we use MMX's
-      // saturation feature, which gives us Z(x) = x if x>=0, or 0 if x<0.
-      //
-      // The formula we're computing here is
-      //		Z(ST - (E1 - O) ^ 2) + Z(ST - (E2 - O) ^ 2) + Z(TT - (Oold - O) ^ 2)
-      // where ST is spatial tolerance and TT is temporal tolerance.  The idea
-      // is that if a pixel is similar to none of its neighbors, the resulting
-      // value will be pretty low, probably zero.  A high value therefore indicates
-      // that the pixel had a similar neighbor.  The pixel in the same position
-      // in the field before last (Oold) is considered a neighbor since we want
-      // to be able to display 1-pixel-high horizontal lines.
-
-      movq_m2r ( *&qwSpatialTolerance, mm7 );
-      movq_r2r ( mm3, mm5 );     // mm5 = E1
-      psubsw_r2r ( mm4, mm5 );   // mm5 = E1 - O
-      psraw_i2r ( 1, mm5 );
-      pmullw_r2r ( mm5, mm5 );   // mm5 = (E1 - O) ^ 2
-      psubusw_r2r ( mm5, mm7 );  // mm7 = ST - (E1 - O) ^ 2, or 0 if that's negative
-
-      movq_m2r ( *&qwSpatialTolerance, mm3 );
-      movq_r2r ( mm6, mm5 );    // mm5 = E2
-      psubsw_r2r ( mm4, mm5 );  // mm5 = E2 - O
-      psraw_i2r ( 1, mm5 );
-      pmullw_r2r ( mm5, mm5 );  // mm5 = (E2 - O) ^ 2
-      psubusw_r2r ( mm5, mm3 ); // mm0 = ST - (E2 - O) ^ 2, or 0 if that's negative
-      paddusw_r2r ( mm3, mm7 ); // mm7 = (ST - (E1 - O) ^ 2) + (ST - (E2 - O) ^ 2)
-
-      movq_m2r ( *&qwTemporalTolerance, mm3 );
-      movq_m2r ( *YVal4++, mm5 ); // mm5 = Oold
-      pand_m2r ( YMask, mm5 );
-      psubsw_r2r ( mm4, mm5 );  // mm5 = Oold - O
-      psraw_i2r ( 1, mm5 ); // XXX
-      pmullw_r2r ( mm5, mm5 );  // mm5 = (Oold - O) ^ 2
-      psubusw_r2r ( mm5, mm3 ); /* mm0 = TT - (Oold - O) ^ 2, or 0 if that's negative */
-      paddusw_r2r ( mm3, mm7 ); // mm7 = our magic number
-
-      /*
-       * Now compare the similarity totals against our threshold.  The pcmpgtw
-       * instruction will populate the target register with a bunch of mask bits,
-       * filling words where the comparison is true with 1s and ones where it's
-       * false with 0s.  A few ANDs and NOTs and an OR later, we have bobbed
-       * values for pixels under the similarity threshold and weaved ones for
-       * pixels over the threshold.
-       */
-
-      pcmpgtw_m2r( *&qwThreshold, mm7 ); // mm7 = 0xffff where we're greater than the threshold, 0 elsewhere
-      movq_r2r ( mm7, mm6 );  // mm6 = 0xffff where we're greater than the threshold, 0 elsewhere
-      pand_r2r ( mm1, mm7 );  // mm7 = weaved data where we're greater than the threshold, 0 elsewhere
-      pandn_r2r ( mm0, mm6 ); // mm6 = bobbed data where we're not greater than the threshold, 0 elsewhere
-      por_r2r ( mm6, mm7 );   // mm7 = bobbed and weaved data
-
-      movq_r2m ( mm7, *Dest++ );
-    }
-  }
-
-  // Copy last odd line if we're processing an odd field.
-  if (IsOdd)
-  {
-    xine_fast_memcpy(pdst + (height * 2 - 1) * LineLength,
-                      pOddLines + (height - 1) * SourcePitch,
-                      LineLength);
-  }
-
-  // clear out the MMX registers ready for doing floating point
-  // again
-  emms();
-
-#endif
-
-  return 1;
-}
-
-
-// This is a simple lightweight DeInterlace method that uses little CPU time
-// but gives very good results for low or intermedite motion. (MORE CPU THAN BOB)
-// It defers frames by one field, but that does not seem to produce noticeable
-// lip sync problems.
-//
-// The method used is to take either the older or newer weave pixel depending
-// upon which give the smaller comb factor, and then clip to avoid large damage
-// when wrong.
-//
-// I'd intended this to be part of a larger more elaborate method added to
-// Blended Clip but this give too good results for the CPU to ignore here.
-static int deinterlace_greedy_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
-    int width, int height )
-{
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
-  int Line;
-  int	LoopCtr;
-  uint64_t *L1;					// ptr to Line1, of 3
-  uint64_t *L2;					// ptr to Line2, the weave line
-  uint64_t *L3;					// ptr to Line3
-  uint64_t *LP2;					// ptr to prev Line2
-  uint64_t *Dest;
-  uint8_t* pEvenLines = psrc[0];
-  uint8_t* pOddLines = psrc[0]+width;
-  uint8_t* pPrevLines;
-
-  static mmx_t ShiftMask = {ub:{0xfe,0xfe,0xfe,0xfe,0xfe,0xfe,0xfe,0xfe}};
-
-  int LineLength = width;
-  int SourcePitch = width * 2;
-  int IsOdd = 1;
-  long GreedyMaxComb = 15;
-  static mmx_t MaxComb;
-  int i;
-
-  if ( psrc[0] == NULL || psrc[1] == NULL )
-    return 0;
-
-  if (IsOdd)
-    pPrevLines = psrc[1] + width;
-  else
-    pPrevLines = psrc[1];
-
-
-  for( i = 0; i < 8; i++ )
-    MaxComb.ub[i] = GreedyMaxComb; // How badly do we let it weave? 0-255
-
-
-  // copy first even line no matter what, and the first odd line if we're
-  // processing an EVEN field. (note diff from other deint rtns.)
-  xine_fast_memcpy(pdst, pEvenLines, LineLength); //DL0
-  if (!IsOdd)
-    xine_fast_memcpy(pdst + LineLength, pOddLines, LineLength); //DL1
-
-  height = height / 2;
-  for (Line = 0; Line < height - 1; ++Line)
-  {
-    LoopCtr = LineLength / 8;				// there are LineLength / 8 qwords per line
-
-    if (IsOdd)
-    {
-      L1 = (uint64_t *)(pEvenLines + Line * SourcePitch);
-      L2 = (uint64_t *)(pOddLines + Line * SourcePitch);
-      L3 = (uint64_t *)(pEvenLines + (Line + 1) * SourcePitch);
-      LP2 = (uint64_t *)(pPrevLines + Line * SourcePitch); // prev Odd lines
-      Dest = (uint64_t *)(pdst + (Line * 2 + 1) * LineLength);
-    }
-    else
-    {
-      L1 = (uint64_t *)(pOddLines + Line * SourcePitch);
-      L2 = (uint64_t *)(pEvenLines + (Line + 1) * SourcePitch);
-      L3 = (uint64_t *)(pOddLines + (Line + 1) * SourcePitch);
-      LP2 = (uint64_t *)(pPrevLines + (Line + 1) * SourcePitch); //prev even lines
-      Dest = (uint64_t *)(pdst + (Line * 2 + 2) * LineLength);
-    }
-
-    xine_fast_memcpy((char *)Dest + LineLength, L3, LineLength);
-
-// For ease of reading, the comments below assume that we're operating on an odd
-// field (i.e., that info->IsOdd is true).  Assume the obvious for even lines..
-
-    while( LoopCtr-- )
-    {
-      movq_m2r ( *L1++, mm1 );
-      movq_m2r ( *L2++, mm2 );
-      movq_m2r ( *L3++, mm3 );
-      movq_m2r ( *LP2++, mm0 );
-
-      // average L1 and L3 leave result in mm4
-      movq_r2r ( mm1, mm4 );	// L1
-
-      pand_m2r ( ShiftMask, mm4 );
-      psrlw_i2r ( 01, mm4 );
-      movq_r2r ( mm3, mm5 );  // L3
-      pand_m2r ( ShiftMask, mm5 );
-      psrlw_i2r ( 01, mm5 );
-      paddb_r2r ( mm5, mm4 );  // the average, for computing comb
-
-      // get abs value of possible L2 comb
-      movq_r2r	( mm2, mm7 );				// L2
-      psubusb_r2r ( mm4, mm7 );				// L2 - avg
-      movq_r2r ( mm4, mm5 );				// avg
-      psubusb_r2r ( mm2, mm5 );				// avg - L2
-      por_r2r ( mm7, mm5 );				// abs(avg-L2)
-      movq_r2r ( mm4, mm6 );     // copy of avg for later
-
-      // get abs value of possible LP2 comb
-      movq_r2r ( mm0, mm7 );				// LP2
-      psubusb_r2r ( mm4, mm7 );				// LP2 - avg
-      psubusb_r2r ( mm0, mm4 );				// avg - LP2
-      por_r2r ( mm7, mm4 );				// abs(avg-LP2)
-
-      // use L2 or LP2 depending upon which makes smaller comb
-      psubusb_r2r ( mm5, mm4 );				// see if it goes to zero
-      psubusb_r2r ( mm5, mm5 );				// 0
-      pcmpeqb_r2r ( mm5, mm4 );				// if (mm4=0) then FF else 0
-      pcmpeqb_r2r ( mm4, mm5 );				// opposite of mm4
-
-      // if Comb(LP2) <= Comb(L2) then mm4=ff, mm5=0 else mm4=0, mm5 = 55
-      pand_r2r ( mm2, mm5 );				// use L2 if mm5 == ff, else 0
-      pand_r2r ( mm0, mm4 );				// use LP2 if mm4 = ff, else 0
-      por_r2r ( mm5, mm4 );				// may the best win
-
-      // Now lets clip our chosen value to be not outside of the range
-      // of the high/low range L1-L3 by more than abs(L1-L3)
-      // This allows some comb but limits the damages and also allows more
-      // detail than a boring oversmoothed clip.
-
-      movq_r2r ( mm1, mm2 );				// copy L1
-      psubusb_r2r ( mm3, mm2 );				// - L3, with saturation
-      paddusb_r2r ( mm3, mm2 );                // now = Max(L1,L3)
-
-      pcmpeqb_r2r ( mm7, mm7 );				// all ffffffff
-      psubusb_r2r ( mm1, mm7 );				// - L1
-      paddusb_r2r ( mm7, mm3 );				// add, may sat at fff..
-      psubusb_r2r ( mm7, mm3 );				// now = Min(L1,L3)
-
-      // allow the value to be above the high or below the low by amt of MaxComb
-      paddusb_m2r ( MaxComb, mm2 );			// increase max by diff
-      psubusb_m2r ( MaxComb, mm3 );			// lower min by diff
-
-      psubusb_r2r ( mm3, mm4 );				// best - Min
-      paddusb_r2r ( mm3, mm4 );				// now = Max(best,Min(L1,L3)
-
-      pcmpeqb_r2r ( mm7, mm7 );				// all ffffffff
-      psubusb_r2r ( mm4, mm7 );				// - Max(best,Min(best,L3)
-      paddusb_r2r ( mm7, mm2 );				// add may sat at FFF..
-      psubusb_r2r ( mm7, mm2 );				// now = Min( Max(best, Min(L1,L3), L2 )=L2 clipped
-
-      movq_r2m ( mm2, *Dest++ );        // move in our clipped best
-
-    }
-  }
-
-  /* Copy last odd line if we're processing an Odd field. */
-  if (IsOdd)
-  {
-    xine_fast_memcpy(pdst + (height * 2 - 1) * LineLength,
-                      pOddLines + (height - 1) * SourcePitch,
-                      LineLength);
-  }
-
-  /* clear out the MMX registers ready for doing floating point again */
-  emms();
-
-#endif
-
-  return 1;
-}
-
-/* Use one field to interpolate the other (low cpu utilization)
-   Will lose resolution but does not produce weaving effect
-   (good for fast moving scenes) also know as "linear interpolation"
-*/
-static void deinterlace_onefield_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
-    int width, int height )
-{
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
-  int Line;
-  uint64_t *YVal1;
-  uint64_t *YVal3;
-  uint64_t *Dest;
-  uint8_t* pEvenLines = psrc[0];
-  uint8_t* pOddLines = psrc[0]+width;
-  int LineLength = width;
-  int SourcePitch = width * 2;
-  int IsOdd = 1;
-
-  int n;
-
-  static mmx_t Mask = {ub:{0xfe,0xfe,0xfe,0xfe,0xfe,0xfe,0xfe,0xfe}};
-
-  /*
-   * copy first even line no matter what, and the first odd line if we're
-   * processing an odd field.
-   */
-
-  xine_fast_memcpy(pdst, pEvenLines, LineLength);
-  if (IsOdd)
-    xine_fast_memcpy(pdst + LineLength, pOddLines, LineLength);
-
-  height = height / 2;
-  for (Line = 0; Line < height - 1; ++Line)
-  {
-    if (IsOdd)
-    {
-      YVal1 = (uint64_t *)(pOddLines + Line * SourcePitch);
-      YVal3 = (uint64_t *)(pOddLines + (Line + 1) * SourcePitch);
-      Dest = (uint64_t *)(pdst + (Line * 2 + 2) * LineLength);
-    }
-    else
-    {
-      YVal1 = (uint64_t *)(pEvenLines + Line * SourcePitch);
-      YVal3 = (uint64_t *)(pEvenLines + (Line + 1) * SourcePitch);
-      Dest = (uint64_t *)(pdst + (Line * 2 + 1) * LineLength);
-    }
-
-    // Copy the odd line to the overlay verbatim.
-    xine_fast_memcpy((char *)Dest + LineLength, YVal3, LineLength);
-
-    n = LineLength >> 3;
-    while( n-- )
-    {
-      movq_m2r (*YVal1++, mm0);
-      movq_m2r (*YVal3++, mm2);
-
-      // get average in mm0
-      pand_m2r ( Mask, mm0 );
-      pand_m2r ( Mask, mm2 );
-      psrlw_i2r ( 01, mm0 );
-      psrlw_i2r ( 01, mm2 );
-      paddw_r2r ( mm2, mm0 );
-
-      movq_r2m ( mm0, *Dest++ );
-    }
-  }
-
-  /* Copy last odd line if we're processing an even field. */
-  if (! IsOdd)
-  {
-    xine_fast_memcpy(pdst + (height * 2 - 1) * LineLength,
-                      pOddLines + (height - 1) * SourcePitch,
-                      LineLength);
-  }
-
-  /* clear out the MMX registers ready for doing floating point
-   * again
-   */
-  emms();
-#endif
-}
-
-/* Linear Blend filter - does a kind of vertical blurring on the image.
-   (idea borrowed from mplayer's sources)
-*/
-static void deinterlace_linearblend_yuv_mmx( uint8_t *pdst, uint8_t *psrc[],
-    int width, int height )
-{
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
-  int Line;
-  uint64_t *YVal1;
-  uint64_t *YVal2;
-  uint64_t *YVal3;
-  uint64_t *Dest;
-  int LineLength = width;
-  
-  int n;
-
-  /* Copy first line */
-  xine_fast_memcpy(pdst, psrc[0], LineLength);
-
-  for (Line = 1; Line < height - 1; ++Line)
-  {
-    YVal1 = (uint64_t *)(psrc[0] + (Line - 1) * LineLength);
-    YVal2 = (uint64_t *)(psrc[0] + (Line) * LineLength);
-    YVal3 = (uint64_t *)(psrc[0] + (Line + 1) * LineLength);
-    Dest = (uint64_t *)(pdst + Line * LineLength);
-
-    n = LineLength >> 3;
-    while( n-- )
-    {
-      /* load data from 3 lines */
-      movq_m2r (*YVal1++, mm0);
-      movq_m2r (*YVal2++, mm1);
-      movq_m2r (*YVal3++, mm2);
-      
-      /* expand bytes to words */
-      punpckhbw_r2r (mm0, mm3);
-      punpckhbw_r2r (mm1, mm4);
-      punpckhbw_r2r (mm2, mm5);
-      punpcklbw_r2r (mm0, mm0);
-      punpcklbw_r2r (mm1, mm1);
-      punpcklbw_r2r (mm2, mm2);
-      
-      /* 
-       * deinterlacing:
-       * deint_line = (line0 + 2*line1 + line2) / 4
-       */
-      psrlw_i2r (07, mm0);
-      psrlw_i2r (06, mm1);
-      psrlw_i2r (07, mm2);
-      psrlw_i2r (07, mm3);
-      psrlw_i2r (06, mm4);
-      psrlw_i2r (07, mm5);
-      paddw_r2r (mm1, mm0);
-      paddw_r2r (mm2, mm0);
-      paddw_r2r (mm4, mm3);
-      paddw_r2r (mm5, mm3);
-      psrlw_i2r (03, mm0);
-      psrlw_i2r (03, mm3);
-
-      /* pack 8 words to 8 bytes in mm0 */
-      packuswb_r2r (mm3, mm0);
-      
-      movq_r2m ( mm0, *Dest++ );
-    }
-  }
-
-  /* Copy last line */
-  xine_fast_memcpy(pdst + Line * LineLength, 
-                   psrc[0] + Line * LineLength, LineLength);
-                   
-  /* clear out the MMX registers ready for doing floating point
-   * again
-   */
-  emms();
-#endif
-}
-
-/* Linear Blend filter - C version contributed by Rogerio Brito.
-   This algorithm has the same interface as the other functions.
-
-   The destination "screen" (pdst) is constructed from the source
-   screen (psrc[0]) line by line.
-
-   The i-th line of the destination screen is the average of 3 lines
-   from the source screen: the (i-1)-th, i-th and (i+1)-th lines, with
-   the i-th line having weight 2 in the computation.
-
-   Remarks:
-   * each line on pdst doesn't depend on previous lines;
-   * due to the way the algorithm is defined, the first & last lines of the
-     screen aren't deinterlaced.
-   
-*/
-static void deinterlace_linearblend_yuv( uint8_t *pdst, uint8_t *psrc[],
-                                         int width, int height )
-{
-  register int x, y;
-  register uint8_t *l0, *l1, *l2, *l3;
-
-  l0 = pdst;		/* target line */
-  l1 = psrc[0];		/* 1st source line */
-  l2 = l1 + width;	/* 2nd source line = line that follows l1 */
-  l3 = l2 + width;	/* 3rd source line = line that follows l2 */
-
-  /* Copy the first line */
-  xine_fast_memcpy(l0, l1, width);
-  l0 += width;
-
-  for (y = 1; y < height-1; ++y) { 
-    /* computes avg of: l1 + 2*l2 + l3 */
-
-    for (x = 0; x < width; ++x) {
-      l0[x] = (l1[x] + (l2[x]<<1) + l3[x]) >> 2;
-    }
-
-    /* updates the line pointers */
-    l1 = l2; l2 = l3; l3 += width;
-    l0 += width;
-  }
-
-  /* Copy the last line */
-  xine_fast_memcpy(l0, l1, width);
-}
-
-static int check_for_mmx(void)
-{
-#if defined(ARCH_X86) || defined(ARCH_X86_64)
-static int config_flags = -1;
-
-  if ( config_flags == -1 )
-    config_flags = xine_mm_accel();
-  if (config_flags & MM_ACCEL_X86_MMX)
-    return 1;
-  return 0;
-#else
-  return 0;
-#endif
-}
-
-/* generic YUV deinterlacer
-   pdst -> pointer to destination bitmap
-   psrc -> array of pointers to source bitmaps ([0] = most recent)
-   width,height -> dimension for bitmaps
-   method -> DEINTERLACE_xxx
-*/
-
-void deinterlace_yuv( uint8_t *pdst, uint8_t *psrc[],
-    int width, int height, int method )
-{
-  switch( method ) {
-    case DEINTERLACE_NONE:
-      xine_fast_memcpy(pdst,psrc[0],width*height);
-      break;
-    case DEINTERLACE_BOB:
-      if( check_for_mmx() )
-        deinterlace_bob_yuv_mmx(pdst,psrc,width,height);
-      else /* FIXME: provide an alternative? */
-        xine_fast_memcpy(pdst,psrc[0],width*height);
-      break;
-    case DEINTERLACE_WEAVE:
-      if( check_for_mmx() )
-      {
-        if( !deinterlace_weave_yuv_mmx(pdst,psrc,width,height) )
-          xine_fast_memcpy(pdst,psrc[0],width*height);
-      }
-      else /* FIXME: provide an alternative? */
-        xine_fast_memcpy(pdst,psrc[0],width*height);
-      break;
-    case DEINTERLACE_GREEDY:
-      if( check_for_mmx() )
-      {
-        if( !deinterlace_greedy_yuv_mmx(pdst,psrc,width,height) )
-          xine_fast_memcpy(pdst,psrc[0],width*height);
-      }
-      else /* FIXME: provide an alternative? */
-        xine_fast_memcpy(pdst,psrc[0],width*height);
-      break;
-    case DEINTERLACE_ONEFIELD:
-      if( check_for_mmx() )
-        deinterlace_onefield_yuv_mmx(pdst,psrc,width,height);
-      else /* FIXME: provide an alternative? */
-        xine_fast_memcpy(pdst,psrc[0],width*height);
-      break;
-    case DEINTERLACE_ONEFIELDXV:
-      lprintf("ONEFIELDXV must be handled by the video driver.\n");
-      break;
-    case DEINTERLACE_LINEARBLEND:
-      if( check_for_mmx() )
-        deinterlace_linearblend_yuv_mmx(pdst,psrc,width,height);
-      else
-        deinterlace_linearblend_yuv(pdst,psrc,width,height);
-      break;
-    default:
-      lprintf("unknow method %d.\n",method);
-      break;
-  }
-}
-
-int deinterlace_yuv_supported ( int method )
-{
-  switch( method ) {
-    case DEINTERLACE_NONE:
-      return 1;
-    case DEINTERLACE_BOB:
-    case DEINTERLACE_WEAVE:
-    case DEINTERLACE_GREEDY:
-    case DEINTERLACE_ONEFIELD:
-      return check_for_mmx();
-    case DEINTERLACE_ONEFIELDXV:
-      lprintf ("ONEFIELDXV must be handled by the video driver.\n");
-      return 0;
-    case DEINTERLACE_LINEARBLEND:
-      return 1;
-  }
-
-  return 0;
-}
-
diff --git a/src/video_out/deinterlace.h b/src/video_out/deinterlace.h
deleted file mode 100644
index 6f398fcbd..000000000
--- a/src/video_out/deinterlace.h
+++ /dev/null
@@ -1,55 +0,0 @@
- /*
- * Copyright (C) 2001 the xine project
- *
- * This file is part of xine, a free video player.
- *
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- *
- * Deinterlace routines by Miguel Freitas
- * based of DScaler project sources (deinterlace.sourceforge.net)
- *
- * Currently only available for Xv driver and MMX extensions
- *
- */
-
-#ifndef __DEINTERLACE_H__
-#define __DEINTERLACE_H__
-
-#include "video_out.h"
-
-int deinterlace_yuv_supported ( int method );
-void deinterlace_yuv( uint8_t *pdst, uint8_t *psrc[],
-    int width, int height, int method );
-
-#define DEINTERLACE_NONE        0
-#define DEINTERLACE_BOB         1
-#define DEINTERLACE_WEAVE       2
-#define DEINTERLACE_GREEDY      3
-#define DEINTERLACE_ONEFIELD    4
-#define DEINTERLACE_ONEFIELDXV  5
-#define DEINTERLACE_LINEARBLEND 6
-
-static const char *const deinterlace_methods[] = {
-  "none", 
-  "bob",
-  "weave",
-  "greedy",
-  "onefield",
-  "onefield_xv",
-  "linearblend",
-  NULL
-};
-
-#endif
diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c
index 36d6de7a7..baeeaea8d 100644
--- a/src/video_out/video_out_xcbxv.c
+++ b/src/video_out/video_out_xcbxv.c
@@ -63,7 +63,6 @@
 #include "video_out.h"
 #include "xine_internal.h"
 /* #include "overlay.h" */
-#include "deinterlace.h"
 #include "xineutils.h"
 #include "vo_scale.h"
 #include "xcbosd.h"
@@ -132,10 +131,6 @@ struct xv_driver_s {
   /* all scaling information goes here */
   vo_scale_t         sc;
 
-  xv_frame_t         deinterlace_frame;
-  int                deinterlace_method;
-  int                deinterlace_enabled;
-
   int                use_colorkey;
   uint32_t           colorkey;
 
@@ -405,117 +400,6 @@ static void xv_update_frame_format (vo_driver_t *this_gen,
   frame->ratio = ratio;
 }
 
-#define DEINTERLACE_CROMA
-static void xv_deinterlace_frame (xv_driver_t *this) {
-  uint8_t    *recent_bitmaps[VO_NUM_RECENT_FRAMES];
-  xv_frame_t *frame = this->recent_frames[0];
-  int         i;
-  int         xvscaling;
-
-  xvscaling = (this->deinterlace_method == DEINTERLACE_ONEFIELDXV) ? 2 : 1;
-
-  if (!this->deinterlace_frame.image
-      || (frame->width != this->deinterlace_frame.width)
-      || (frame->height != this->deinterlace_frame.height )
-      || (frame->format != this->deinterlace_frame.format)
-      || (frame->ratio != this->deinterlace_frame.ratio)) {
-    pthread_mutex_lock(&this->main_mutex);
-
-    if(this->deinterlace_frame.image)
-      dispose_ximage(this, &this->deinterlace_frame);
-    
-    create_ximage(this, &this->deinterlace_frame, frame->width, frame->height / xvscaling, frame->format);
-    this->deinterlace_frame.width  = frame->width;
-    this->deinterlace_frame.height = frame->height;
-    this->deinterlace_frame.format = frame->format;
-    this->deinterlace_frame.ratio  = frame->ratio;
-
-    pthread_mutex_unlock(&this->main_mutex);
-  }
-
-
-  if ( this->deinterlace_method != DEINTERLACE_ONEFIELDXV ) {
-#ifdef DEINTERLACE_CROMA
-
-    /* I don't think this is the right way to do it (deinterlacing croma by croma info).
-       DScaler deinterlaces croma together with luma, but it's easier for them because
-       they have that components 1:1 at the same table.
-    */
-    for( i = 0; i < VO_NUM_RECENT_FRAMES; i++ )
-      if( this->recent_frames[i] && this->recent_frames[i]->width == frame->width &&
-          this->recent_frames[i]->height == frame->height )
-        recent_bitmaps[i] = this->recent_frames[i]->image + frame->width*frame->height;
-      else
-        recent_bitmaps[i] = NULL;
-
-    deinterlace_yuv( this->deinterlace_frame.image+frame->width*frame->height,
-		     recent_bitmaps, frame->width/2, frame->height/2, this->deinterlace_method );
-    for( i = 0; i < VO_NUM_RECENT_FRAMES; i++ )
-      if( this->recent_frames[i] && this->recent_frames[i]->width == frame->width &&
-          this->recent_frames[i]->height == frame->height )
-        recent_bitmaps[i] = this->recent_frames[i]->image + frame->width*frame->height*5/4;
-      else
-        recent_bitmaps[i] = NULL;
-
-    deinterlace_yuv( this->deinterlace_frame.image+frame->width*frame->height*5/4,
-		     recent_bitmaps, frame->width/2, frame->height/2, this->deinterlace_method );
-
-#else
-
-    /* know bug: we are not deinterlacing Cb and Cr */
-    xine_fast_memcpy(this->deinterlace_frame.image + frame->width*frame->height,
-		     frame->image + frame->width*frame->height,
-		     frame->width*frame->height*1/2);
-
-#endif
-
-    for( i = 0; i < VO_NUM_RECENT_FRAMES; i++ )
-      if( this->recent_frames[i] && this->recent_frames[i]->width == frame->width &&
-          this->recent_frames[i]->height == frame->height )
-        recent_bitmaps[i] = this->recent_frames[i]->image;
-      else
-        recent_bitmaps[i] = NULL;
-
-    deinterlace_yuv( this->deinterlace_frame.image, recent_bitmaps,
-                     frame->width, frame->height, this->deinterlace_method );
-  }
-  else {
-    /*
-      dirty and cheap deinterlace method: we give half of the lines to xv
-      driver and let it scale for us.
-      note that memcpy's below don't seem to impact much on performance,
-      specially when fast memcpys are available.
-    */
-    uint8_t *dst, *src;
-
-    dst = this->deinterlace_frame.image;
-    src = this->recent_frames[0]->image;
-    for( i = 0; i < frame->height; i+=2 ) {
-      xine_fast_memcpy(dst,src,frame->width);
-      dst += frame->width;
-      src += 2 * frame->width;
-    }
-
-    dst = this->deinterlace_frame.image + frame->width * frame->height / 2;
-    src = this->recent_frames[0]->image + frame->width * frame->height;
-    for( i = 0; i < frame->height; i+=4 ) {
-      xine_fast_memcpy(dst,src,frame->width / 2);
-      dst += frame->width / 2;
-      src += frame->width;
-    }
-
-    dst = this->deinterlace_frame.image + frame->width * frame->height * 5 / 8;
-    src = this->recent_frames[0]->image + frame->width * frame->height * 5 / 4;
-    for( i = 0; i < frame->height; i+=4 ) {
-      xine_fast_memcpy(dst,src,frame->width / 2);
-      dst += frame->width / 2;
-      src += frame->width;
-    }
-  }
-
-  this->cur_frame = &this->deinterlace_frame;
-}
-
 static void xv_clean_output_area (xv_driver_t *this) {
   int i;
   xcb_rectangle_t rects[4];
@@ -570,14 +454,6 @@ static void xv_compute_ideal_size (xv_driver_t *this) {
 static void xv_compute_output_size (xv_driver_t *this) {
 
   _x_vo_scale_compute_output_size( &this->sc );
-
-  /* onefield_xv divide by 2 the number of lines */
-  if (this->deinterlace_enabled
-      && (this->deinterlace_method == DEINTERLACE_ONEFIELDXV)
-      && this->cur_frame && (this->cur_frame->format == XINE_IMGFMT_YV12)) {
-    this->sc.displayed_height  = this->sc.displayed_height / 2 - 1;
-    this->sc.displayed_yoffset = this->sc.displayed_yoffset / 2;
-  }
 }
 
 static void xv_overlay_begin (vo_driver_t *this_gen, 
@@ -721,17 +597,6 @@ static void xv_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) {
   }
 
   /*
-   * deinterlace frame if necessary
-   * (currently only working for YUV images)
-   */
-
-  if (this->deinterlace_enabled && this->deinterlace_method
-      && frame->format == XINE_IMGFMT_YV12
-      && (deinterlace_yuv_supported( this->deinterlace_method ) == 1
-	  || this->deinterlace_method ==  DEINTERLACE_ONEFIELDXV))
-    xv_deinterlace_frame (this);
-
-  /*
    * tell gui that we are about to display a frame,
    * ask for offset and output size
    */
@@ -825,18 +690,6 @@ static int xv_set_property (vo_driver_t *this_gen,
   } 
   else {
     switch (property) {
-
-    case VO_PROP_INTERLACED:
-      this->props[property].value = value;
-      xprintf(this->xine, XINE_VERBOSITY_LOG,
-	      LOG_MODULE ": VO_PROP_INTERLACED(%d)\n", this->props[property].value);
-      this->deinterlace_enabled = value;
-      if (this->deinterlace_method == DEINTERLACE_ONEFIELDXV) {
-         xv_compute_ideal_size (this);
-         xv_compute_output_size (this);
-      }
-      break;
-  
     case VO_PROP_ASPECT_RATIO:
       if (value>=XINE_VO_ASPECT_NUM_RATIOS)
 	value = XINE_VO_ASPECT_AUTO;
@@ -981,15 +834,6 @@ static int xv_gui_data_exchange (vo_driver_t *this_gen,
       rect->y = y1;
       rect->w = x2-x1;
       rect->h = y2-y1;
-
-      /* onefield_xv divide by 2 the number of lines */
-      if (this->deinterlace_enabled
-          && (this->deinterlace_method == DEINTERLACE_ONEFIELDXV)
-          && (this->cur_frame->format == XINE_IMGFMT_YV12)) {
-        rect->y = rect->y * 2;
-        rect->h = rect->h * 2;
-      }
-
     }
     break;
 
@@ -1059,12 +903,6 @@ static void xv_dispose (vo_driver_t *this_gen) {
 
   /* restore port attributes to their initial values */
   xv_restore_port_attributes(this);
-  
-  if (this->deinterlace_frame.image) {
-    pthread_mutex_lock(&this->main_mutex);
-    dispose_ximage(this, &this->deinterlace_frame);
-    pthread_mutex_unlock(&this->main_mutex);
-  }
 
   pthread_mutex_lock(&this->main_mutex);
   xcb_xv_ungrab_port(this->connection, this->xv_port, XCB_CURRENT_TIME);
@@ -1196,13 +1034,6 @@ static void xv_check_capability (xv_driver_t *this,
     }
   } else
     this->props[property].value  = int_default;
-
-}
-
-static void xv_update_deinterlace(void *this_gen, xine_cfg_entry_t *entry) {
-  xv_driver_t *this = (xv_driver_t *) this_gen;
-
-  this->deinterlace_method = entry->num_value;
 }
 
 static void xv_update_XV_FILTER(void *this_gen, xine_cfg_entry_t *entry) {
@@ -1356,8 +1187,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
   xcb_create_gc(this->connection, this->gc, this->window, 0, NULL);
   this->capabilities            = VO_CAP_CROP;
   this->use_shm                 = 1;
-  this->deinterlace_method      = 0;
-  this->deinterlace_frame.image = NULL;
   this->use_colorkey            = 0;
   this->colorkey                = 0;
   this->xoverlay                = NULL;
@@ -1391,7 +1220,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
     this->props[i].this  = this;
   }
 
-  this->props[VO_PROP_INTERLACED].value      = 0;
   this->sc.user_ratio                        =
     this->props[VO_PROP_ASPECT_RATIO].value  = XINE_VO_ASPECT_AUTO;
   this->props[VO_PROP_ZOOM_X].value          = 100;
@@ -1527,39 +1355,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
 			   _("Some buggy video drivers need a workaround to function properly."),
 			   10, xv_update_xv_pitch_alignment, this);
 
-  this->deinterlace_method = 
-    config->register_enum (config, "video.output.xv_deinterlace_method", 4,
-			   deinterlace_methods,
-			   _("deinterlace method (deprecated)"),
-			   _("This config setting is deprecated. You should use the new deinterlacing "
-			     "post processing settings instead.\n\n"
-			     "From the old days of analog television, where the even and odd numbered "
-			     "lines of a video frame would be displayed at different times comes the "
-			     "idea to increase motion smoothness by also recording the lines at "
-			     "different times. This is called \"interlacing\". But unfortunately, "
-			     "todays displays show the even and odd numbered lines as one complete frame "
-			     "all at the same time (called \"progressive display\"), which results in "
-			     "ugly frame errors known as comb artifacts. Software deinterlacing is an "
-			     "approach to reduce these artifacts. The individual values are:\n\n"
-			     "none\n"
-			     "Disables software deinterlacing.\n\n"
-			     "bob\n"
-			     "Interpolates between the lines for moving parts of the image.\n\n"
-			     "weave\n"
-			     "Similar to bob, but with a tendency to preserve the full resolution, "
-			     "better for high detail in low movement scenes.\n\n"
-			     "greedy\n"
-			     "Very good adaptive deinterlacer, but needs a lot of CPU power.\n\n"
-			     "onefield\n"
-			     "Always interpolates and reduces vertical resolution.\n\n"
-			     "onefieldxv\n"
-			     "Same as onefield, but does the interpolation in hardware.\n\n"
-			     "linearblend\n"
-			     "Applies a slight vertical blur to remove the comb artifacts. Good results "
-			     "with medium CPU usage."),
-			   10, xv_update_deinterlace, this);
-  this->deinterlace_enabled = 0;
-
   if(this->use_colorkey==1) {
     this->xoverlay = xcbosd_create(this->xine, this->connection, this->screen,
                                    this->window, XCBOSD_COLORKEY);
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 4338246ae..894192c6b 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -68,7 +68,6 @@
 #include "video_out.h"
 #include "xine_internal.h"
 /* #include "overlay.h" */
-#include "deinterlace.h"
 #include "xineutils.h"
 #include "vo_scale.h"
 #include "x11osd.h"
@@ -137,10 +136,6 @@ struct xv_driver_s {
   /* all scaling information goes here */
   vo_scale_t         sc;
 
-  xv_frame_t         deinterlace_frame;
-  int                deinterlace_method;
-  int                deinterlace_enabled;
-
   int                use_colorkey;
   uint32_t           colorkey;
 
@@ -490,120 +485,6 @@ static void xv_update_frame_format (vo_driver_t *this_gen,
   frame->ratio = ratio;
 }
 
-#define DEINTERLACE_CROMA
-static void xv_deinterlace_frame (xv_driver_t *this) {
-  uint8_t    *recent_bitmaps[VO_NUM_RECENT_FRAMES];
-  xv_frame_t *frame = this->recent_frames[0];
-  int         i;
-  int         xvscaling;
-
-  xvscaling = (this->deinterlace_method == DEINTERLACE_ONEFIELDXV) ? 2 : 1;
-
-  if (!this->deinterlace_frame.image
-      || (frame->width != this->deinterlace_frame.width)
-      || (frame->height != this->deinterlace_frame.height )
-      || (frame->format != this->deinterlace_frame.format)
-      || (frame->ratio != this->deinterlace_frame.ratio)) {
-    LOCK_DISPLAY(this);
-
-    if(this->deinterlace_frame.image)
-      dispose_ximage (this, &this->deinterlace_frame.shminfo,
-                      this->deinterlace_frame.image);
-    
-    this->deinterlace_frame.image = create_ximage (this, &this->deinterlace_frame.shminfo,
-						   frame->width,frame->height / xvscaling,
-						   frame->format);
-    this->deinterlace_frame.width  = frame->width;
-    this->deinterlace_frame.height = frame->height;
-    this->deinterlace_frame.format = frame->format;
-    this->deinterlace_frame.ratio  = frame->ratio;
-
-    UNLOCK_DISPLAY(this);
-  }
-
-
-  if ( this->deinterlace_method != DEINTERLACE_ONEFIELDXV ) {
-#ifdef DEINTERLACE_CROMA
-
-    /* I don't think this is the right way to do it (deinterlacing croma by croma info).
-       DScaler deinterlaces croma together with luma, but it's easier for them because
-       they have that components 1:1 at the same table.
-    */
-    for( i = 0; i < VO_NUM_RECENT_FRAMES; i++ )
-      if( this->recent_frames[i] && this->recent_frames[i]->width == frame->width &&
-          this->recent_frames[i]->height == frame->height )
-        recent_bitmaps[i] = this->recent_frames[i]->image->data + frame->width*frame->height;
-      else
-        recent_bitmaps[i] = NULL;
-
-    deinterlace_yuv( this->deinterlace_frame.image->data+this->deinterlace_frame.image->width*frame->height,
-		     recent_bitmaps, this->deinterlace_frame.image->width/2, frame->height/2, this->deinterlace_method );
-    for( i = 0; i < VO_NUM_RECENT_FRAMES; i++ )
-      if( this->recent_frames[i] && this->recent_frames[i]->width == frame->width &&
-          this->recent_frames[i]->height == frame->height )
-        recent_bitmaps[i] = this->recent_frames[i]->image->data + this->deinterlace_frame.image->width*frame->height*5/4;
-      else
-        recent_bitmaps[i] = NULL;
-
-    deinterlace_yuv( this->deinterlace_frame.image->data+this->deinterlace_frame.image->width*frame->height*5/4,
-		     recent_bitmaps, this->deinterlace_frame.image->width/2, frame->height/2, this->deinterlace_method );
-
-#else
-
-    /* know bug: we are not deinterlacing Cb and Cr */
-    xine_fast_memcpy(this->deinterlace_frame.image->data + frame->width*frame->height,
-		     frame->image->data + frame->width*frame->height,
-		     frame->width*frame->height*1/2);
-
-#endif
-
-    for( i = 0; i < VO_NUM_RECENT_FRAMES; i++ )
-      if( this->recent_frames[i] && this->recent_frames[i]->width == frame->width &&
-          this->recent_frames[i]->height == frame->height )
-        recent_bitmaps[i] = this->recent_frames[i]->image->data;
-      else
-        recent_bitmaps[i] = NULL;
-
-    deinterlace_yuv( this->deinterlace_frame.image->data, recent_bitmaps,
-                     this->deinterlace_frame.image->width, frame->height, this->deinterlace_method );
-  }
-  else {
-    /*
-      dirty and cheap deinterlace method: we give half of the lines to xv
-      driver and let it scale for us.
-      note that memcpy's below don't seem to impact much on performance,
-      specially when fast memcpys are available.
-    */
-    uint8_t *dst, *src;
-
-    dst = this->deinterlace_frame.image->data;
-    src = this->recent_frames[0]->image->data;
-    for( i = 0; i < frame->height; i+=2 ) {
-      xine_fast_memcpy(dst,src,frame->width);
-      dst += frame->width;
-      src += 2 * frame->width;
-    }
-
-    dst = this->deinterlace_frame.image->data + frame->width * frame->height / 2;
-    src = this->recent_frames[0]->image->data + frame->width * frame->height;
-    for( i = 0; i < frame->height; i+=4 ) {
-      xine_fast_memcpy(dst,src,frame->width / 2);
-      dst += frame->width / 2;
-      src += frame->width;
-    }
-
-    dst = this->deinterlace_frame.image->data + frame->width * frame->height * 5 / 8;
-    src = this->recent_frames[0]->image->data + frame->width * frame->height * 5 / 4;
-    for( i = 0; i < frame->height; i+=4 ) {
-      xine_fast_memcpy(dst,src,frame->width / 2);
-      dst += frame->width / 2;
-      src += frame->width;
-    }
-  }
-
-  this->cur_frame = &this->deinterlace_frame;
-}
-
 static void xv_clean_output_area (xv_driver_t *this) {
   int i;
 
@@ -651,14 +532,6 @@ static void xv_compute_ideal_size (xv_driver_t *this) {
 static void xv_compute_output_size (xv_driver_t *this) {
 
   _x_vo_scale_compute_output_size( &this->sc );
-
-  /* onefield_xv divide by 2 the number of lines */
-  if (this->deinterlace_enabled
-      && (this->deinterlace_method == DEINTERLACE_ONEFIELDXV)
-      && this->cur_frame && (this->cur_frame->format == XINE_IMGFMT_YV12)) {
-    this->sc.displayed_height  = this->sc.displayed_height / 2 - 1;
-    this->sc.displayed_yoffset = this->sc.displayed_yoffset / 2;
-  }
 }
 
 static void xv_overlay_begin (vo_driver_t *this_gen, 
@@ -812,17 +685,6 @@ static void xv_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) {
   }
 
   /*
-   * deinterlace frame if necessary
-   * (currently only working for YUV images)
-   */
-
-  if (this->deinterlace_enabled && this->deinterlace_method
-      && frame->format == XINE_IMGFMT_YV12
-      && (deinterlace_yuv_supported( this->deinterlace_method ) == 1
-	  || this->deinterlace_method ==  DEINTERLACE_ONEFIELDXV))
-    xv_deinterlace_frame (this);
-
-  /*
    * tell gui that we are about to display a frame,
    * ask for offset and output size
    */
@@ -926,17 +788,6 @@ static int xv_set_property (vo_driver_t *this_gen,
   else {
     switch (property) {
 
-    case VO_PROP_INTERLACED:
-      this->props[property].value = value;
-      xprintf(this->xine, XINE_VERBOSITY_LOG,
-	      LOG_MODULE ": VO_PROP_INTERLACED(%d)\n", this->props[property].value);
-      this->deinterlace_enabled = value;
-      if (this->deinterlace_method == DEINTERLACE_ONEFIELDXV) {
-         xv_compute_ideal_size (this);
-         xv_compute_output_size (this);
-      }
-      break;
-  
     case VO_PROP_ASPECT_RATIO:
       if (value>=XINE_VO_ASPECT_NUM_RATIOS)
 	value = XINE_VO_ASPECT_AUTO;
@@ -1070,15 +921,6 @@ static int xv_gui_data_exchange (vo_driver_t *this_gen,
       rect->y = y1;
       rect->w = x2-x1;
       rect->h = y2-y1;
-
-      /* onefield_xv divide by 2 the number of lines */
-      if (this->deinterlace_enabled
-          && (this->deinterlace_method == DEINTERLACE_ONEFIELDXV)
-          && (this->cur_frame->format == XINE_IMGFMT_YV12)) {
-        rect->y = rect->y * 2;
-        rect->h = rect->h * 2;
-      }
-
     }
     break;
 
@@ -1134,14 +976,6 @@ static void xv_dispose (vo_driver_t *this_gen) {
 
   /* restore port attributes to their initial values */
   xv_restore_port_attributes(this);
-  
-  if (this->deinterlace_frame.image) {
-    LOCK_DISPLAY(this);
-    dispose_ximage (this, &this->deinterlace_frame.shminfo,
-		    this->deinterlace_frame.image);
-    UNLOCK_DISPLAY(this);
-    this->deinterlace_frame.image = NULL;
-  }
 
   LOCK_DISPLAY(this);
   if(XvUngrabPort (this->display, this->xv_port, CurrentTime) != Success) {
@@ -1257,13 +1091,6 @@ static void xv_check_capability (xv_driver_t *this,
     }
   } else
     this->props[property].value  = int_default;
-
-}
-
-static void xv_update_deinterlace(void *this_gen, xine_cfg_entry_t *entry) {
-  xv_driver_t *this = (xv_driver_t *) this_gen;
-
-  this->deinterlace_method = entry->num_value;
 }
 
 static void xv_update_XV_FILTER(void *this_gen, xine_cfg_entry_t *entry) {
@@ -1409,8 +1236,6 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void *
   UNLOCK_DISPLAY(this);
   this->capabilities            = VO_CAP_CROP;
   this->use_shm                 = 1;
-  this->deinterlace_method      = 0;
-  this->deinterlace_frame.image = NULL;
   this->use_colorkey            = 0;
   this->colorkey                = 0;
   this->xoverlay                = NULL;
@@ -1451,7 +1276,6 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void *
     this->props[i].this  = this;
   }
 
-  this->props[VO_PROP_INTERLACED].value      = 0;
   this->sc.user_ratio                        =
     this->props[VO_PROP_ASPECT_RATIO].value  = XINE_VO_ASPECT_AUTO;
   this->props[VO_PROP_ZOOM_X].value          = 100;
@@ -1597,39 +1421,6 @@ static vo_driver_t *open_plugin_2 (video_driver_class_t *class_gen, const void *
 			   _("Some buggy video drivers need a workaround to function properly."),
 			   10, xv_update_xv_pitch_alignment, this);
 
-  this->deinterlace_method = 
-    config->register_enum (config, "video.output.xv_deinterlace_method", 4,
-			   deinterlace_methods,
-			   _("deinterlace method (deprecated)"),
-			   _("This config setting is deprecated. You should use the new deinterlacing "
-			     "post processing settings instead.\n\n"
-			     "From the old days of analog television, where the even and odd numbered "
-			     "lines of a video frame would be displayed at different times comes the "
-			     "idea to increase motion smoothness by also recording the lines at "
-			     "different times. This is called \"interlacing\". But unfortunately, "
-			     "todays displays show the even and odd numbered lines as one complete frame "
-			     "all at the same time (called \"progressive display\"), which results in "
-			     "ugly frame errors known as comb artifacts. Software deinterlacing is an "
-			     "approach to reduce these artifacts. The individual values are:\n\n"
-			     "none\n"
-			     "Disables software deinterlacing.\n\n"
-			     "bob\n"
-			     "Interpolates between the lines for moving parts of the image.\n\n"
-			     "weave\n"
-			     "Similar to bob, but with a tendency to preserve the full resolution, "
-			     "better for high detail in low movement scenes.\n\n"
-			     "greedy\n"
-			     "Very good adaptive deinterlacer, but needs a lot of CPU power.\n\n"
-			     "onefield\n"
-			     "Always interpolates and reduces vertical resolution.\n\n"
-			     "onefieldxv\n"
-			     "Same as onefield, but does the interpolation in hardware.\n\n"
-			     "linearblend\n"
-			     "Applies a slight vertical blur to remove the comb artifacts. Good results "
-			     "with medium CPU usage."),
-			   10, xv_update_deinterlace, this);
-  this->deinterlace_enabled = 0;
-
   LOCK_DISPLAY(this);
   if(this->use_colorkey==1) {
     this->xoverlay = x11osd_create (this->xine, this->display, this->screen,
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index 53d09b7d5..8773c3dd2 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.c
@@ -72,9 +72,6 @@
 #include "xine_internal.h"
 #include "accel_xvmc.h"
 
-/* TODO - delete these? */
-#include "deinterlace.h"
-
 #include "xineutils.h"
 #include "vo_scale.h"
 
@@ -198,11 +195,6 @@ struct xvmc_driver_s {
   double               ratio_factor;         /* output frame must fullfill:
 						height = width * ratio_factor  */
 
-  
-  xvmc_frame_t         deinterlace_frame;
-  int                  deinterlace_method;
-  int                  deinterlace_enabled;
-
   /* gui callback */
   
   void               (*frame_output_cb) (void *user_data,
@@ -966,24 +958,13 @@ static void xvmc_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) {
   /* Make sure the surface has finished rendering before we display */  
   XvMCSyncSurface(this->display, &this->cur_frame->surface);
   
-  if (this->deinterlace_enabled &&
-      (this->deinterlace_method == DEINTERLACE_ONEFIELD)) {
-    XvMCPutSurface(this->display, &this->cur_frame->surface,
-		   this->drawable,
-		   this->sc.displayed_xoffset, this->sc.displayed_yoffset,
-		   this->sc.displayed_width, this->sc.displayed_height,
-		   this->sc.output_xoffset, this->sc.output_yoffset,
-		   this->sc.output_width, this->sc.output_height,
-		   XVMC_TOP_FIELD);
-  } else { /* WEAVE */
-    XvMCPutSurface(this->display, &this->cur_frame->surface,
-		   this->drawable,
-		   this->sc.displayed_xoffset, this->sc.displayed_yoffset,
-		   this->sc.displayed_width, this->sc.displayed_height,
-		   this->sc.output_xoffset, this->sc.output_yoffset,
-		   this->sc.output_width, this->sc.output_height,
-		   XVMC_FRAME_PICTURE);
-  }
+  XvMCPutSurface(this->display, &this->cur_frame->surface,
+		 this->drawable,
+		 this->sc.displayed_xoffset, this->sc.displayed_yoffset,
+		 this->sc.displayed_width, this->sc.displayed_height,
+		 this->sc.output_xoffset, this->sc.output_yoffset,
+		 this->sc.output_width, this->sc.output_height,
+		 XVMC_FRAME_PICTURE);
   
   XUnlockDisplay (this->display);
   
@@ -1047,16 +1028,6 @@ static int xvmc_set_property (vo_driver_t *this_gen,
   } 
   else {
     switch (property) {
-    case VO_PROP_INTERLACED:
-      this->props[property].value = value;
-      lprintf("VO_PROP_INTERLACED(%d)\n", this->props[property].value);
-      this->deinterlace_enabled = value;
-
-      if (this->deinterlace_method == DEINTERLACE_ONEFIELDXV) {
-	xvmc_compute_ideal_size (this);
-      }
-      break;
-
     case VO_PROP_ASPECT_RATIO:
       if (value>=XINE_VO_ASPECT_NUM_RATIOS)
 	value = XINE_VO_ASPECT_AUTO;
@@ -1288,14 +1259,6 @@ static void xvmc_check_capability (xvmc_driver_t *this,
     this->props[property].value  = int_default;
 }
 
-static void xvmc_update_deinterlace(void *this_gen, xine_cfg_entry_t *entry) {
-  xvmc_driver_t *this = (xvmc_driver_t *) this_gen;
-
-  lprintf ("xvmc_update_deinterlace method = %d\n",entry->num_value);
-  
-  this->deinterlace_method = entry->num_value;
-}
-
 static void xvmc_update_XV_DOUBLE_BUFFER(void *this_gen, xine_cfg_entry_t *entry)
 {
   xvmc_driver_t *this = (xvmc_driver_t *) this_gen;
@@ -1366,7 +1329,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   /* TODO CLEAN UP THIS */
   this->user_data          = visual->user_data;
 
-  this->deinterlace_method = 0;
   this->use_colorkey       = 0;
   this->colorkey           = 0;
 
@@ -1517,65 +1479,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
     dispose_ximage (this, &myshminfo, myimage);
     XUnLockDisplay(this->display);
   */
-  
-  this->deinterlace_method =
-    config->register_enum (config, "video.output.xv_deinterlace_method", 4,
-			   deinterlace_methods, 
-			   _("deinterlace method (deprecated)"),
-			   _("This config setting is deprecated. You should use the new deinterlacing "
-			     "post processing settings instead.\n\n"
-			     "From the old days of analog television, where the even and odd numbered "
-			     "lines of a video frame would be displayed at different times comes the "
-			     "idea to increase motion smoothness by also recording the lines at "
-			     "different times. This is called \"interlacing\". But unfortunately, "
-			     "todays displays show the even and odd numbered lines as one complete frame "
-			     "all at the same time (called \"progressive display\"), which results in "
-			     "ugly frame errors known as comb artifacts. Software deinterlacing is an "
-			     "approach to reduce these artifacts. The individual values are:\n\n"
-			     "none\n"
-			     "Disables software deinterlacing.\n\n"
-			     "bob\n"
-			     "Interpolates between the lines for moving parts of the image.\n\n"
-			     "weave\n"
-			     "Similar to bob, but with a tendency to preserve the full resolution, "
-			     "better for high detail in low movement scenes.\n\n"
-			     "greedy\n"
-			     "Very good adaptive deinterlacer, but needs a lot of CPU power.\n\n"
-			     "onefield\n"
-			     "Always interpolates and reduces vertical resolution.\n\n"
-			     "onefieldxv\n"
-			     "Same as onefield, but does the interpolation in hardware.\n\n"
-			     "linearblend\n"
-			     "Applies a slight vertical blur to remove the comb artifacts. Good results "
-			     "with medium CPU usage."),
-			   10, xvmc_update_deinterlace, this);
-
-  this->deinterlace_enabled = 1;  /* default is enabled */
-  lprintf("deinterlace_methods %d ",this->deinterlace_method);
-
-  switch(this->deinterlace_method) {
-  case DEINTERLACE_NONE: 
-    lprintf("NONE\n"); 
-    break;
-  case DEINTERLACE_BOB: 
-    lprintf("BOB\n"); 
-    break;
-  case DEINTERLACE_WEAVE: 
-    lprintf("WEAVE\n");
-    break;
-  case DEINTERLACE_GREEDY: 
-    lprintf("GREEDY\n");
-    break;
-  case DEINTERLACE_ONEFIELD: 
-    lprintf("ONEFIELD\n");
-    break;
-  case DEINTERLACE_ONEFIELDXV: 
-    lprintf("ONEFIELDXV\n");
-    break;
-  case DEINTERLACE_LINEARBLEND: 
-    lprintf("LINEARBLEND\n"); 
-    break;
-  }
 
   lprintf("initialization of plugin successful\n");
   return &this->vo_driver;
diff --git a/src/video_out/vidix/Makefile.am b/src/video_out/vidix/Makefile.am
deleted file mode 100644
index 7f19e7ce8..000000000
--- a/src/video_out/vidix/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-include $(top_srcdir)/misc/Makefile.common
-
-SUBDIRS = drivers
-
-AM_CFLAGS   = $(DEFAULT_OCFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix -I$(top_builddir)/src/video_out/libdha
-
-EXTRA_DIST = README vidix.txt
-
-noinst_HEADERS = fourcc.h vidix.h vidixlib.h
-
-noinst_LTLIBRARIES = libvidix.la
-
-libvidix_la_SOURCES = vidixlib.c
-libvidix_la_LIBADD = $(DYNAMIC_LD_LIBS) $(top_builddir)/src/video_out/libdha/libdha.la
-
diff --git a/src/video_out/xxmc.h b/src/video_out/xxmc.h
index d5c067d36..dd836d08b 100644
--- a/src/video_out/xxmc.h
+++ b/src/video_out/xxmc.h
@@ -87,7 +87,6 @@
 #include "xine.h"
 #include "video_out.h"
 #include "xine_internal.h"
-#include "deinterlace.h"
 #include "xineutils.h"
 #include "vo_scale.h"
 #include "x11osd.h"
diff --git a/version.sh b/version.sh
index 2d9438379..37649ecda 100755
--- a/version.sh
+++ b/version.sh
@@ -6,32 +6,31 @@
 #   3. Adjust the values of XINE_LT_CURRENT, XINE_LT_REVISION, and XINE_LT_AGE
 #      according to the following rules:
 #
-#          If the interface is totally unchanged from the previous release,
-#          increment XINE_LT_REVISION by one.  Otherwise:
-#            1. XINE_LT_REVISION=0
-#            2. Increment XINE_LT_CURRENT by one.
-#            3. If any interfaces have been ADDED since the last release,
-#               increment XINE_LT_AGE by one.  If any interfaces have been
-#               REMOVED or incompatibly changed, XINE_LT_AGE=0
+#      1. Increment XINE_LT_REVISION.
+#      2. If any interfaces have been added, removed, or changed, set
+#         XINE_LT_REVISION to 0 and increment XINE_LT_CURRENT.
+#      3. If any interfaces have been added, increment XINE_LT_AGE.
+#      4. If any interfaces have been removed or incompatibly changed,
+#         set XINE_LT_AGE to 0, and rename po/libxine*.pot accordingly
+#         (use "hg rename").
 #
-# Regarding libtool versioning, here are some details, but see the info page for
-# libtool for the whole story.  The most important thing to keep in mind is that
-# the libtool version numbers DO NOT MATCH the xine-lib version numbers, and you
-# should NEVER try to make them match.
+# The most important thing to keep in mind is that the libtool version
+# numbers DO NOT MATCH the xine-lib version numbers, and you should NEVER
+# try to make them match.
+#
+# See the libtool documentation for more information.
 #
 #   XINE_LT_CURRENT     the current API version
-#   XINE_LT_REVISION    an internal revision number that is increased when the
-#                       API does not change in any way
-#   XINE_LT_AGE         the number of previous API versions still supported by
-#                       this version
+#   XINE_LT_REVISION    the current revision of the current API
+#   XINE_LT_AGE         the number of previous API versions still supported
 
 XINE_VERSION_MAJOR=1
 XINE_VERSION_MINOR=1
 XINE_VERSION_SUB=90
 
-XINE_LT_CURRENT=19
+XINE_LT_CURRENT=2
 XINE_LT_REVISION=0
-XINE_LT_AGE=17
+XINE_LT_AGE=0
 
 test -f "`dirname $0`/.cvsversion" && XINE_VERSION_SUFFIX="hg"
 XINE_VERSION_SPEC="${XINE_VERSION_MAJOR}.${XINE_VERSION_MINOR}.${XINE_VERSION_SUB}${XINE_VERSION_SUFFIX}"