From 8e9d90a13090f7e9e75a45687d8007c99ac621f6 Mon Sep 17 00:00:00 2001
From: Gildas Bazin <gbazin@videolan.org>
Date: Tue, 27 May 2003 21:48:45 +0000
Subject: [PATCH] * ALL: bumped version to 0.6.0-test2 * Makefile.am: got rid
 of the faq in the package-win32 target.

---
 Makefile.am                                   |   6 +-
 NEWS                                          |   5 +-
 configure.ac.in                               |   4 +-
 .../Resources/English.lproj/InfoPlist.strings |   4 +-
 extras/MacOSX/vlc.pbproj/project.pbxproj      |   6 +-
 po/POTFILES.in                                | 113 +--
 po/de.po                                      | 955 +++++++++++-------
 po/en_GB.po                                   | 881 +++++++++-------
 po/fr.po                                      | 923 ++++++++++-------
 po/it.po                                      | 934 ++++++++++-------
 po/ja.po                                      | 940 ++++++++++-------
 po/nl.po                                      | 949 ++++++++++-------
 po/no.po                                      | 927 ++++++++++-------
 po/pl.po                                      | 930 ++++++++++-------
 po/ru.po                                      | 909 ++++++++++-------
 po/sv.po                                      | 913 ++++++++++-------
 po/vlc.pot                                    | 880 +++++++++-------
 17 files changed, 5977 insertions(+), 4302 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 739ec039e5..0a4af38b4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -553,8 +553,7 @@ package-win32:
 	fi ; done
 
 	for i in dummy $(srcdir)/tmp/plugins/*$(LIBEXT) ; \
-		do if test $$i != $(srcdir)/tmp/plugins/libwin32_plugin$(LIBEXT) \
-		-a $$i != dummy ; then $(STRIP) $$i ; fi ; done
+		do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done
 
 	mkdir $(srcdir)/tmp/share
 	cp $(srcdir)/share/*.rle $(srcdir)/tmp/share/ ;
@@ -574,9 +573,6 @@ package-win32:
 		cp $$i $(srcdir)/tmp/skins/ || true ; \
 	done
 
-	$(MAKE) -C $(srcdir)/doc/faq html ;
-	cp $(srcdir)/doc/faq/faq.html $(srcdir)/tmp/FAQ.htm ;
-
 # Create package 
 	wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} $(srcdir)/tmp/nsi
 # Clean up
diff --git a/NEWS b/NEWS
index 453a3a43b5..cb26605838 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.45 2003/05/20 21:35:52 hartman Exp $
+$Id: NEWS,v 1.46 2003/05/27 21:48:44 gbazin Exp $
 
 Changes between 0.5.3 and 0.6.0:
 ---------------------------------
@@ -40,7 +40,7 @@ Miscellaneous:
  * Added a Gentoo ebuild file to the distribution
 
 UNIX ports:
- *
+ * Basic support for the X11 Xinerama extension.
 
 Mac OS X port:
  * When you add several items to the playlist, they are sorted alphabetically.
@@ -59,6 +59,7 @@ Win32 port:
  * Fixed the "no sound" problem on NT4
  * Improved skinnable interface (it now uses the wxWindows interface dialogs).
  * Added support for compressed skins files (.vlt files)
+ * Fixed SVCD chapters support.
 
 BeOS port:
  * Interface localization
diff --git a/configure.ac.in b/configure.ac.in
index 994d8f606b..3269037864 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,6 +1,6 @@
 dnl Autoconf settings for vlc
 
-AC_INIT(vlc,0.6.0-test1)
+AC_INIT(vlc,0.6.0-test2)
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Natalya"
@@ -12,7 +12,7 @@ AC_CANONICAL_SYSTEM
 
 dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
 dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.6.0-test1)
+AM_INIT_AUTOMAKE(vlc,0.6.0-test2)
 AM_CONFIG_HEADER(config.h)
 
 dnl
diff --git a/extras/MacOSX/Resources/English.lproj/InfoPlist.strings b/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
index f1796a7e67..48565be494 100644
--- a/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
+++ b/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "VLC";
-CFBundleShortVersionString = "0.6.0-test1";
-CFBundleGetInfoString = "VLC media player 0.6.0-test1, Copyright (c) 1996-2003 VideoLAN.";
+CFBundleShortVersionString = "0.6.0-test2";
+CFBundleGetInfoString = "VLC media player 0.6.0-test2, Copyright (c) 1996-2003 VideoLAN.";
 NSHumanReadableCopyright = "Copyright (c) 1996-2003 VideoLAN.";
diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj
index ba07503550..f62441aa47 100644
--- a/extras/MacOSX/vlc.pbproj/project.pbxproj
+++ b/extras/MacOSX/vlc.pbproj/project.pbxproj
@@ -415,7 +415,7 @@
 	<key>CFBundleExecutable</key>
 	<string>VLC</string>
 	<key>CFBundleGetInfoString</key>
-	<string>VLC media player 0.6.0-test1, Copyright (c) 1996-2003 VideoLAN.</string>
+	<string>VLC media player 0.6.0-test2, Copyright (c) 1996-2003 VideoLAN.</string>
 	<key>CFBundleIconFile</key>
 	<string>vlc.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -427,7 +427,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.0-test1</string>
+	<string>0.6.0-test2</string>
 	<key>CFBundleSignature</key>
 	<string>VLC#</string>
 	<key>CFBundleURLTypes</key>
@@ -474,7 +474,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>0.6.0-test1</string>
+	<string>0.6.0-test2</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSMainNibFile</key>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7d8b9ad2c7..af1d6856b8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,29 +23,29 @@ include/modules.h
 include/modules_inner.h
 include/mtime.h
 include/network.h
-include/os_specific.h
 include/osd.h
+include/os_specific.h
 include/stream_control.h
 include/stream_output.h
 include/variables.h
 include/video.h
 include/video_output.h
 include/vlc/aout.h
-include/vlc/decoder.h
-include/vlc/input.h
-include/vlc/intf.h
-include/vlc/sout.h
-include/vlc/vlc.h
-include/vlc/vout.h
 include/vlc_common.h
 include/vlc_config.h
 include/vlc_cpu.h
+include/vlc/decoder.h
+include/vlc/input.h
+include/vlc/intf.h
 include/vlc_messages.h
 include/vlc_objects.h
 include/vlc_playlist.h
+include/vlc/sout.h
 include/vlc_symbols.h
-include/vlc_threads.h
 include/vlc_threads_funcs.h
+include/vlc_threads.h
+include/vlc/vlc.h
+include/vlc/vout.h
 include/vout_synchro.h
 include/win32_specific.h
 src/audio_output/common.c
@@ -57,9 +57,9 @@ src/audio_output/mixer.c
 src/audio_output/output.c
 src/extras/dirent.c
 src/extras/dirent.h
+src/extras/getopt1.c
 src/extras/getopt.c
 src/extras/getopt.h
-src/extras/getopt1.c
 src/extras/libc.c
 src/input/input.c
 src/input/input_clock.c
@@ -81,8 +81,8 @@ src/misc/error.c
 src/misc/iso-639_def.h
 src/misc/iso_lang.c
 src/misc/messages.c
-src/misc/modules.c
 src/misc/modules_builtin.h
+src/misc/modules.c
 src/misc/modules_plugin.h
 src/misc/mtime.c
 src/misc/objects.c
@@ -107,18 +107,12 @@ modules/access/directory.c
 modules/access/dvd/access.c
 modules/access/dvd/demux.c
 modules/access/dvd/dvd.c
-modules/access/dvd/dvd.h
 modules/access/dvd/dvdcss.h
+modules/access/dvd/dvd.h
 modules/access/dvd/es.c
 modules/access/dvd/es.h
 modules/access/dvd/ifo.c
 modules/access/dvd/ifo.h
-modules/access/dvd/seek.c
-modules/access/dvd/seek.h
-modules/access/dvd/summary.c
-modules/access/dvd/summary.h
-modules/access/dvd/udf.c
-modules/access/dvd/udf.h
 modules/access/dvdplay/access.c
 modules/access/dvdplay/access.h
 modules/access/dvdplay/demux.c
@@ -134,6 +128,12 @@ modules/access/dvdplay/tools.h
 modules/access/dvdread/dvdread.c
 modules/access/dvdread/input.c
 modules/access/dvdread/input.h
+modules/access/dvd/seek.c
+modules/access/dvd/seek.h
+modules/access/dvd/summary.c
+modules/access/dvd/summary.h
+modules/access/dvd/udf.c
+modules/access/dvd/udf.h
 modules/access/file.c
 modules/access/ftp.c
 modules/access/http.c
@@ -147,6 +147,10 @@ modules/access/mms/mmsh.c
 modules/access/mms/mmsh.h
 modules/access/mms/mmstu.c
 modules/access/mms/mmstu.h
+modules/access_output/dummy.c
+modules/access_output/file.c
+modules/access_output/http.c
+modules/access_output/udp.c
 modules/access/satellite/access.c
 modules/access/satellite/dvb.c
 modules/access/satellite/dvb.h
@@ -158,11 +162,6 @@ modules/access/vcd/cdrom.c
 modules/access/vcd/cdrom.h
 modules/access/vcd/cdrom_internals.h
 modules/access/vcd/vcd.c
-modules/access/vlcs.c
-modules/access_output/dummy.c
-modules/access_output/file.c
-modules/access_output/http.c
-modules/access_output/udp.c
 modules/audio_filter/channel_mixer/headphone.c
 modules/audio_filter/channel_mixer/trivial.c
 modules/audio_filter/converter/a52tofloat32.c
@@ -205,26 +204,26 @@ modules/codec/a52old/adec.h
 modules/codec/a52old/bit_allocate.c
 modules/codec/a52old/decoder.c
 modules/codec/a52old/decoder.h
-modules/codec/a52old/downmix.h
-modules/codec/a52old/downmix/downmix.c
 modules/codec/a52old/downmix/downmix_3dn.c
+modules/codec/a52old/downmix/downmix.c
 modules/codec/a52old/downmix/downmix_c.c
 modules/codec/a52old/downmix/downmix_common.h
 modules/codec/a52old/downmix/downmix_sse.c
+modules/codec/a52old/downmix.h
 modules/codec/a52old/exponent.c
 modules/codec/a52old/exponent.h
 modules/codec/a52old/imdct.c
 modules/codec/a52old/imdct.h
-modules/codec/a52old/imdct/imdct.c
 modules/codec/a52old/imdct/imdct_3dn.c
+modules/codec/a52old/imdct/imdct.c
 modules/codec/a52old/imdct/imdct_c.c
 modules/codec/a52old/imdct/imdct_common.c
 modules/codec/a52old/imdct/imdct_common.h
 modules/codec/a52old/imdct/imdct_sse.c
 modules/codec/a52old/imdct/retables.h
-modules/codec/a52old/imdct/srfft.h
 modules/codec/a52old/imdct/srfft_3dn.c
 modules/codec/a52old/imdct/srfft_c.c
+modules/codec/a52old/imdct/srfft.h
 modules/codec/a52old/imdct/srfft_sse.c
 modules/codec/a52old/internal.h
 modules/codec/a52old/mantissa.c
@@ -245,9 +244,9 @@ modules/codec/ffmpeg/chroma.c
 modules/codec/ffmpeg/ffmpeg.c
 modules/codec/ffmpeg/ffmpeg.h
 modules/codec/ffmpeg/postprocessing/postprocessing.c
-modules/codec/ffmpeg/postprocessing/postprocessing.h
 modules/codec/ffmpeg/postprocessing/postprocessing_c.c
 modules/codec/ffmpeg/postprocessing/postprocessing_common.h
+modules/codec/ffmpeg/postprocessing/postprocessing.h
 modules/codec/ffmpeg/postprocessing/postprocessing_mmx.c
 modules/codec/ffmpeg/postprocessing/postprocessing_mmxext.c
 modules/codec/ffmpeg/video.c
@@ -274,17 +273,17 @@ modules/codec/mpeg_video/decoder.h
 modules/codec/mpeg_video/headers.c
 modules/codec/mpeg_video/idct/block_c.h
 modules/codec/mpeg_video/idct/block_mmx.h
-modules/codec/mpeg_video/idct/idct.c
-modules/codec/mpeg_video/idct/idct.h
-modules/codec/mpeg_video/idct/idct_decl.h
-modules/codec/mpeg_video/idct/idct_sparse.h
 modules/codec/mpeg_video/idct/idctaltivec.c
+modules/codec/mpeg_video/idct/idct.c
 modules/codec/mpeg_video/idct/idctclassic.c
+modules/codec/mpeg_video/idct/idct_decl.h
+modules/codec/mpeg_video/idct/idct.h
 modules/codec/mpeg_video/idct/idctmmx.c
 modules/codec/mpeg_video/idct/idctmmxext.c
-modules/codec/mpeg_video/motion/motion.c
+modules/codec/mpeg_video/idct/idct_sparse.h
 modules/codec/mpeg_video/motion/motion3dnow.c
 modules/codec/mpeg_video/motion/motionaltivec.c
+modules/codec/mpeg_video/motion/motion.c
 modules/codec/mpeg_video/motion/motionmmx.c
 modules/codec/mpeg_video/motion/motionmmxext.c
 modules/codec/mpeg_video/parser.c
@@ -384,6 +383,20 @@ modules/gui/familiar/playlist.c
 modules/gui/familiar/playlist.h
 modules/gui/familiar/support.c
 modules/gui/familiar/support.h
+modules/gui/gtk2/gnome2.c
+modules/gui/gtk2/gnome2_callbacks.c
+modules/gui/gtk2/gnome2_callbacks.h
+modules/gui/gtk2/gnome2_interface.c
+modules/gui/gtk2/gnome2_interface.h
+modules/gui/gtk2/gnome2_support.c
+modules/gui/gtk2/gnome2_support.h
+modules/gui/gtk2/gtk2.c
+modules/gui/gtk2/gtk2_callbacks.c
+modules/gui/gtk2/gtk2_callbacks.h
+modules/gui/gtk2/gtk2_interface.c
+modules/gui/gtk2/gtk2_interface.h
+modules/gui/gtk2/gtk2_support.c
+modules/gui/gtk2/gtk2_support.h
 modules/gui/gtk/common.h
 modules/gui/gtk/control.c
 modules/gui/gtk/control.h
@@ -414,55 +427,30 @@ modules/gui/gtk/playlist.h
 modules/gui/gtk/preferences.c
 modules/gui/gtk/preferences.h
 modules/gui/gtk/sout.c
-modules/gui/gtk2/gnome2.c
-modules/gui/gtk2/gnome2_callbacks.c
-modules/gui/gtk2/gnome2_callbacks.h
-modules/gui/gtk2/gnome2_interface.c
-modules/gui/gtk2/gnome2_interface.h
-modules/gui/gtk2/gnome2_support.c
-modules/gui/gtk2/gnome2_support.h
-modules/gui/gtk2/gtk2.c
-modules/gui/gtk2/gtk2_callbacks.c
-modules/gui/gtk2/gtk2_callbacks.h
-modules/gui/gtk2/gtk2_interface.c
-modules/gui/gtk2/gtk2_interface.h
-modules/gui/gtk2/gtk2_support.c
-modules/gui/gtk2/gtk2_support.h
-modules/gui/kde/QConfigItem.cpp
-modules/gui/kde/QConfigItem.h
-modules/gui/kde/QConfigItem.moc.cpp
 modules/gui/kde/common.h
 modules/gui/kde/disc.cpp
 modules/gui/kde/disc.h
-modules/gui/kde/disc.moc.cpp
 modules/gui/kde/info.cpp
 modules/gui/kde/info.h
-modules/gui/kde/info.moc.cpp
 modules/gui/kde/interface.cpp
 modules/gui/kde/interface.h
-modules/gui/kde/interface.moc.cpp
 modules/gui/kde/kde.cpp
 modules/gui/kde/languagemenu.cpp
 modules/gui/kde/languagemenu.h
-modules/gui/kde/languagemenu.moc.cpp
 modules/gui/kde/menu.cpp
 modules/gui/kde/menu.h
-modules/gui/kde/menu.moc.cpp
 modules/gui/kde/messages.cpp
 modules/gui/kde/messages.h
-modules/gui/kde/messages.moc.cpp
 modules/gui/kde/net.cpp
 modules/gui/kde/net.h
-modules/gui/kde/net.moc.cpp
 modules/gui/kde/pluginsbox.cpp
 modules/gui/kde/pluginsbox.h
-modules/gui/kde/pluginsbox.moc.cpp
 modules/gui/kde/preferences.cpp
 modules/gui/kde/preferences.h
-modules/gui/kde/preferences.moc.cpp
+modules/gui/kde/QConfigItem.cpp
+modules/gui/kde/QConfigItem.h
 modules/gui/kde/slider.cpp
 modules/gui/kde/slider.h
-modules/gui/kde/slider.moc.cpp
 modules/gui/macosx/about.h
 modules/gui/macosx/about.m
 modules/gui/macosx/applescript.h
@@ -492,7 +480,6 @@ modules/gui/qnx/qnx.c
 modules/gui/qnx/vout.c
 modules/gui/qt/intf.cpp
 modules/gui/qt/intf.h
-modules/gui/qt/intf.moc.cpp
 modules/gui/qt/qt.cpp
 modules/gui/skins/controls/button.cpp
 modules/gui/skins/controls/button.h
@@ -618,8 +605,8 @@ modules/misc/gtk_main.c
 modules/misc/httpd.c
 modules/misc/logger/logger.c
 modules/misc/memcpy/fastmemcpy.h
-modules/misc/memcpy/memcpy.c
 modules/misc/memcpy/memcpyaltivec.c
+modules/misc/memcpy/memcpy.c
 modules/misc/network/ipv4.c
 modules/misc/network/ipv6.c
 modules/misc/qte_main.cpp
@@ -650,11 +637,11 @@ modules/stream_out/duplicate.c
 modules/stream_out/es.c
 modules/stream_out/standard.c
 modules/stream_out/transcode.c
-modules/video_chroma/i420_rgb.c
-modules/video_chroma/i420_rgb.h
 modules/video_chroma/i420_rgb16.c
 modules/video_chroma/i420_rgb8.c
+modules/video_chroma/i420_rgb.c
 modules/video_chroma/i420_rgb_c.h
+modules/video_chroma/i420_rgb.h
 modules/video_chroma/i420_rgb_mmx.h
 modules/video_chroma/i420_ymga.c
 modules/video_chroma/i420_yuy2.c
diff --git a/po/de.po b/po/de.po
index 468539989b..3495aa656c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc 0.73.3\n"
-"POT-Creation-Date: 2003-05-24 14:40+0200\n"
+"POT-Creation-Date: 2003-05-27 23:43+0200\n"
 "PO-Revision-Date: 2002-04-18 23:38+0100\n"
 "Last-Translator: Felix Kühne <fk@aenneburghardt.de>\n"
 "Language-Team: \n"
@@ -32,7 +32,7 @@ msgid "Audio channels"
 msgstr "Ton-Kanal festlegen"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:165 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:358
 msgid "Stereo"
@@ -120,7 +120,7 @@ msgstr "Wiedergabeliste"
 
 #: src/input/input_programs.c:94 modules/gui/gtk/gnome_interface.c:1078
 #: modules/gui/gtk/gtk_interface.c:1199 modules/gui/kde/interface.cpp:142
-#: modules/gui/macosx/intf.m:347 modules/gui/macosx/intf.m:348
+#: modules/gui/macosx/intf.m:370 modules/gui/macosx/intf.m:371
 msgid "Program"
 msgstr "Programm"
 
@@ -128,18 +128,18 @@ msgstr "Programm"
 #: modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
-#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:349
-#: modules/gui/macosx/intf.m:350 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:382
+#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:372
+#: modules/gui/macosx/intf.m:373 modules/gui/macosx/open.m:149
+#: modules/gui/wxwindows/open.cpp:393
 msgid "Title"
 msgstr "Titel"
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
 #: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
-#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:351
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:388
+#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:374
+#: modules/gui/macosx/intf.m:375 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:399
 msgid "Chapter"
 msgstr "Kapitel"
 
@@ -192,7 +192,7 @@ msgstr "Kapitel"
 msgid "Previous Chapter"
 msgstr "Kapitel"
 
-#: src/input/input_programs.c:668
+#: src/input/input_programs.c:668 src/video_output/video_output.c:397
 msgid "Disable"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "C"
 msgstr "de"
 
-#: src/libvlc.c:301 src/libvlc.c:1357
+#: src/libvlc.c:301 src/libvlc.c:1364
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
@@ -214,27 +214,27 @@ msgstr ""
 "Usage: %s [Optionen] [Date]...\n"
 "\n"
 
-#: src/libvlc.c:1189 src/misc/configuration.c:961
+#: src/libvlc.c:1196 src/misc/configuration.c:961
 msgid "string"
 msgstr "Text"
 
-#: src/libvlc.c:1206 src/misc/configuration.c:946
+#: src/libvlc.c:1213 src/misc/configuration.c:946
 msgid "integer"
 msgstr "Ganzzahl"
 
-#: src/libvlc.c:1209 src/misc/configuration.c:953
+#: src/libvlc.c:1216 src/misc/configuration.c:953
 msgid "float"
 msgstr "Fließkommazahl"
 
-#: src/libvlc.c:1215
+#: src/libvlc.c:1222
 msgid " (default enabled)"
 msgstr "(standardmäßig an)"
 
-#: src/libvlc.c:1216
+#: src/libvlc.c:1223
 msgid " (default disabled)"
 msgstr "(standardmäßig aus)"
 
-#: src/libvlc.c:1332 src/libvlc.c:1387 src/libvlc.c:1411
+#: src/libvlc.c:1339 src/libvlc.c:1394 src/libvlc.c:1418
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
@@ -242,11 +242,11 @@ msgstr ""
 "\n"
 "Drücken Sie die Eingabetaste um fortzufahren...\n"
 
-#: src/libvlc.c:1360
+#: src/libvlc.c:1367
 msgid "[module]              [description]\n"
 msgstr "[Modul]               [Beschreibung]\n"
 
-#: src/libvlc.c:1405
+#: src/libvlc.c:1412
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -1144,15 +1144,15 @@ msgstr "Oberfl
 #: modules/demux/ogg.c:554 modules/demux/ogg.c:813 modules/demux/ogg.c:986
 #: modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m:354 modules/gui/macosx/output.m:150
+#: modules/gui/macosx/intf.m:377 modules/gui/macosx/output.m:155
 msgid "Audio"
 msgstr "Ton"
 
 #: src/libvlc.h:473 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:893 modules/gui/gtk/gnome_interface.c:1099
-#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:365
-#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:140
+#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:388
+#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:144
 #: modules/misc/dummy/dummy.c:83 modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "Bild"
@@ -1183,8 +1183,8 @@ msgstr "Prozessor"
 #: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
-#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:297
-#: modules/gui/macosx/intf.m:385 modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:408 modules/gui/wxwindows/interface.cpp:352
 #: modules/gui/wxwindows/playlist.cpp:102
 msgid "Playlist"
 msgstr "Wiedergabeliste"
@@ -1227,12 +1227,43 @@ msgstr "Versionsinformationen ausgeben."
 msgid "boolean"
 msgstr "boolesch"
 
-#: src/video_output/video_output.c:382 modules/gui/beos/VideoOutput.cpp:1138
+#: src/video_output/video_output.c:384 modules/gui/beos/VideoOutput.cpp:1138
 #: modules/gui/macosx/controls.m:342 modules/gui/macosx/controls.m:486
-#: modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/intf.m:393
 msgid "Fullscreen"
 msgstr "Vollbild"
 
+#: src/video_output/video_output.c:395 modules/gui/gtk/gnome_interface.c:183
+#: modules/gui/gtk/gnome_interface.c:966 modules/gui/gtk/gtk_interface.c:553
+#: modules/gui/gtk/gtk_interface.c:1349 modules/gui/macosx/controls.m:526
+#: modules/gui/macosx/intf.m:401 modules/gui/macosx/intf.m:402
+#: modules/video_filter/deinterlace/deinterlace.c:81
+msgid "Deinterlace"
+msgstr "Bild glätten"
+
+#: src/video_output/video_output.c:399
+#, fuzzy
+msgid "Discard"
+msgstr "Volume"
+
+#: src/video_output/video_output.c:401
+msgid "Blend"
+msgstr ""
+
+#: src/video_output/video_output.c:403
+#, fuzzy
+msgid "Mean"
+msgstr "Medium/Media"
+
+#: src/video_output/video_output.c:405
+msgid "Bob"
+msgstr ""
+
+#: src/video_output/video_output.c:407
+#, fuzzy
+msgid "Linear"
+msgstr "Ganzzahl"
+
 #: modules/access/cdda.c:86 modules/access/file.c:69 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
 #: modules/access/v4l/v4l.c:64
@@ -1397,6 +1428,22 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr "Microsoft Media Server (MMS) Input"
 
+#: modules/access_output/dummy.c:56
+msgid "Dummy stream ouput"
+msgstr "Dummy-Streamausgabe"
+
+#: modules/access_output/file.c:58
+msgid "File stream ouput"
+msgstr "Datei-Streamausgabe"
+
+#: modules/access_output/http.c:54
+msgid "HTTP stream ouput"
+msgstr "HTTP-Streamausgabe"
+
+#: modules/access_output/udp.c:73
+msgid "UDP stream ouput"
+msgstr "UDP-Streamausgabe"
+
 #: modules/access/satellite/satellite.c:41
 #, fuzzy
 msgid "Satellite default transponder frequency"
@@ -1494,30 +1541,6 @@ msgstr "Video4Linux Input"
 msgid "VCD input"
 msgstr "VCD Input"
 
-#: modules/access/vlcs.c:131 modules/misc/sap.c:131
-msgid "SAP"
-msgstr "SAP"
-
-#: modules/access/vlcs.c:134
-msgid "SAP interface module"
-msgstr "SAP Oberflächen Modul"
-
-#: modules/access_output/dummy.c:56
-msgid "Dummy stream ouput"
-msgstr "Dummy-Streamausgabe"
-
-#: modules/access_output/file.c:58
-msgid "File stream ouput"
-msgstr "Datei-Streamausgabe"
-
-#: modules/access_output/http.c:54
-msgid "HTTP stream ouput"
-msgstr "HTTP-Streamausgabe"
-
-#: modules/access_output/udp.c:73
-msgid "UDP stream ouput"
-msgstr "UDP-Streamausgabe"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 #, fuzzy
 msgid "Characteristic dimension"
@@ -1674,13 +1697,13 @@ msgstr "ALSA Tonausgabe"
 msgid "Audio device"
 msgstr "Ton-Anschluss"
 
-#: modules/audio_output/alsa.c:159 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:161 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:371
 msgid "Mono"
 msgstr "Mono"
 
-#: modules/audio_output/alsa.c:201 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:203 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:387
 msgid "A/52 over S/PDIF"
 msgstr "A/52 über S/PDIF"
@@ -1843,23 +1866,148 @@ msgstr "DV Bilddekoder"
 msgid "AAC audio decoder (using libfaad2)"
 msgstr "AAC Tondekoder (benutzt libfaad2)"
 
-#: modules/codec/ffmpeg/ffmpeg.c:154
-msgid "ffmpeg"
-msgstr "ffmpeg"
+#: modules/codec/ffmpeg/ffmpeg.c:86
+msgid "Direct rendering"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:88
+msgid "Error resilience"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:90
+msgid ""
+"ffmpeg can make errors resiliences.          \n"
+"Nevertheless, with buggy encoder (like ISO MPEG-4 encoder from M$) this will "
+"produce a lot of errors.\n"
+"Valid range is -1 to 99 (-1 disable all errors resiliences)."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:95
+msgid "Workaround bugs"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:97
+msgid ""
+"Try to fix some bugs\n"
+"1  autodetect\n"
+"2  old msmpeg4\n"
+"4  xvid interlaced\n"
+"8  ump4 \n"
+"16 no padding\n"
+"32 ac vlc64 Qpel chroma"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:106
+msgid "Hurry up"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:108
+msgid ""
+"Allow the decoder to partially decode or skip frame(s) when there not enough "
+"time.\n"
+" It's usefull with low CPU power but it could produce broken pictures."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:112
+#, fuzzy
+msgid "Truncated stream"
+msgstr "Stream abspielen"
+
+#: modules/codec/ffmpeg/ffmpeg.c:113
+msgid "truncated stream -1:auto,0:disable,:1:enable"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:115
+#, fuzzy
+msgid "Post processing quality"
+msgstr "C-Post Processing"
+
+#: modules/codec/ffmpeg/ffmpeg.c:117
+msgid ""
+"Quality of post processing\n"
+"Valid range is 0 to 6"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:120
+msgid "Ffmpeg postproc filter chains"
+msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:157
-msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
-msgstr "ffmpeg Ton/Bild - Dekoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgid "Ffmpeg postprocessing module"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:159
+msgid "Auto-level Post processing quality"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:161
+msgid ""
+"Post processing quality is selected upon time left but no more than "
+"requested quality\n"
+"Not yet implemented !"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:165
+msgid "Force vertical luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:166
+msgid "Force vertical luminance deblocking (override other settings)"
+msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:168
-msgid "Post processing"
+msgid "Force horizontal luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:169
+msgid "Force horizontal luminance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:171
+msgid "Force vertical chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:172
+msgid "Force vertical chrominance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:174
+msgid "Force horizontal chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:175
+msgid "Force horizontal chrominance deblocking (override other settings)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:177
-msgid "ffmpeg postprocessing module"
+msgid "Force luminance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:178
+msgid "Force luminance deringing (override other settings)"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:204
+#: modules/codec/ffmpeg/ffmpeg.c:180
+msgid "Force chrominance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:181
+msgid "Force chrominance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:184
+msgid "ffmpeg"
+msgstr "ffmpeg"
+
+#: modules/codec/ffmpeg/ffmpeg.c:187
+msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgstr "ffmpeg Ton/Bild - Dekoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+
+#: modules/codec/ffmpeg/ffmpeg.c:195
+msgid "Post processing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:215
 msgid "ffmpeg chroma conversion"
 msgstr ""
 
@@ -1879,7 +2027,7 @@ msgstr "MMXEXT-Post Processing"
 msgid "flac audio decoder"
 msgstr "flac - Tondekoder"
 
-#: modules/codec/libmpeg2.c:89
+#: modules/codec/libmpeg2.c:90
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr "MPEG I/II - Video Dekoder (benutzt libmpeg2)"
 
@@ -1896,14 +2044,14 @@ msgstr "MPEG audio layer I/II/III parser"
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr "MPEG I/II - Video Dekoder"
 
-#: modules/codec/mpeg_video/idct/idct.c:41
-msgid "IDCT"
-msgstr "IDCT"
-
 #: modules/codec/mpeg_video/idct/idctaltivec.c:45
 msgid "AltiVec IDCT"
 msgstr "AltiVec IDCT"
 
+#: modules/codec/mpeg_video/idct/idct.c:41
+msgid "IDCT"
+msgstr "IDCT"
+
 #: modules/codec/mpeg_video/idct/idctclassic.c:41
 msgid "classic IDCT"
 msgstr "klassisches IDCT"
@@ -1916,10 +2064,6 @@ msgstr "MMX IDCT"
 msgid "MMX EXT IDCT"
 msgstr "MMX EXT IDCT"
 
-#: modules/codec/mpeg_video/motion/motion.c:42
-msgid "motion compensation"
-msgstr "Bewegungsausgleich"
-
 #: modules/codec/mpeg_video/motion/motion3dnow.c:44
 msgid "3D Now! motion compensation"
 msgstr "3D Now! Bewegungsausgleich"
@@ -1928,6 +2072,10 @@ msgstr "3D Now! Bewegungsausgleich"
 msgid "AltiVec motion compensation"
 msgstr "AltiVec Bewegungsausgleich"
 
+#: modules/codec/mpeg_video/motion/motion.c:42
+msgid "motion compensation"
+msgstr "Bewegungsausgleich"
+
 #: modules/codec/mpeg_video/motion/motionmmx.c:45
 msgid "MMX motion compensation"
 msgstr "MMX Bewegungsausgleich"
@@ -2113,20 +2261,20 @@ msgstr "Beenden"
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
 #: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
-#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:879
-#: modules/gui/macosx/intf.m:880 modules/gui/macosx/intf.m:881
-#: modules/gui/wxwindows/interface.cpp:810
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:902
+#: modules/gui/macosx/intf.m:903 modules/gui/macosx/intf.m:904
+#: modules/gui/wxwindows/interface.cpp:811
 msgid "Pause"
 msgstr "Pause"
 
 #: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
 #: modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
-#: modules/gui/macosx/intf.m:300 modules/gui/macosx/intf.m:338
-#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:886
-#: modules/gui/macosx/intf.m:887 modules/gui/macosx/intf.m:888
-#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:348
-#: modules/gui/wxwindows/interface.cpp:815
+#: modules/gui/macosx/intf.m:323 modules/gui/macosx/intf.m:361
+#: modules/gui/macosx/intf.m:422 modules/gui/macosx/intf.m:909
+#: modules/gui/macosx/intf.m:910 modules/gui/macosx/intf.m:911
+#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:816
 msgid "Play"
 msgstr "Wiedergabe"
 
@@ -2182,8 +2330,8 @@ msgstr "Layer"
 #: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:821
 #: modules/demux/ogg.c:994 modules/gui/gtk/gnome_interface.c:148
 #: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
-#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:360
-#: modules/gui/macosx/intf.m:361
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:384
 msgid "Channels"
 msgstr "Kanäle"
 
@@ -2207,7 +2355,7 @@ msgstr "Anzahl der Streams"
 #: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:554
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:813 modules/demux/ogg.c:893 modules/demux/ogg.c:986
-#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:130
+#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134
 msgid "Type"
 msgstr "Typ"
 
@@ -2867,7 +3015,7 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:201
 #: modules/gui/beos/InterfaceWindow.cpp:300
 #: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:304 modules/gui/macosx/prefs.m:75
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/prefs.m:75
 #: modules/gui/wxwindows/preferences.cpp:229
 msgid "Preferences"
 msgstr "Einstellungen"
@@ -2876,7 +3024,7 @@ msgstr "Einstellungen"
 #: modules/gui/beos/InterfaceWindow.cpp:298
 #: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
 #: modules/gui/kde/info.cpp:9 modules/gui/kde/messages.cpp:8
-#: modules/gui/macosx/intf.m:310 modules/gui/macosx/intf.m:387
+#: modules/gui/macosx/intf.m:333 modules/gui/macosx/intf.m:410
 #: modules/gui/wxwindows/messages.cpp:79
 msgid "Messages"
 msgstr "Nachrichten"
@@ -2891,16 +3039,16 @@ msgstr "Nachrichten"
 #: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
 #: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
 #: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:264
-#: modules/gui/macosx/output.m:121 modules/gui/macosx/output.m:194
-#: modules/gui/macosx/output.m:279 modules/gui/wxwindows/interface.cpp:335
+#: modules/gui/macosx/output.m:125 modules/gui/macosx/output.m:200
+#: modules/gui/macosx/output.m:285 modules/gui/wxwindows/interface.cpp:336
 #: modules/gui/wxwindows/open.cpp:276 modules/gui/wxwindows/streamout.cpp:340
 msgid "File"
 msgstr "Datei"
 
 #: modules/gui/beos/InterfaceWindow.cpp:240
 #: modules/gui/beos/PlayListWindow.cpp:84
-#: modules/gui/gtk/gnome_interface.c:2179
-#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332
 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677
 msgid "Open File"
 msgstr "Datei öffnen"
@@ -2922,7 +3070,7 @@ msgid "About"
 msgstr "Über uns"
 
 #: modules/gui/beos/InterfaceWindow.cpp:256 modules/gui/kde/interface.cpp:93
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/intf.m:377
+#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:400
 msgid "Subtitles"
 msgstr "Untertitel"
 
@@ -2961,8 +3109,8 @@ msgid "Speed"
 msgstr "Ausgewählt"
 
 #: modules/gui/beos/InterfaceWindow.cpp:286 modules/gui/macosx/controls.m:422
-#: modules/gui/macosx/intf.m:299 modules/gui/macosx/intf.m:341
-#: modules/gui/wxwindows/interface.cpp:357
+#: modules/gui/macosx/intf.m:322 modules/gui/macosx/intf.m:364
+#: modules/gui/wxwindows/interface.cpp:358
 msgid "Slower"
 msgstr "Langsamer"
 
@@ -2972,12 +3120,12 @@ msgid "Normal"
 msgstr "Normale Größe"
 
 #: modules/gui/beos/InterfaceWindow.cpp:290 modules/gui/macosx/controls.m:421
-#: modules/gui/macosx/intf.m:302 modules/gui/macosx/intf.m:340
-#: modules/gui/wxwindows/interface.cpp:359
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/wxwindows/interface.cpp:360
 msgid "Faster"
 msgstr "Schneller"
 
-#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:381
+#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:404
 msgid "Window"
 msgstr "Fenster"
 
@@ -2991,7 +3139,7 @@ msgstr "Wiedergabeliste"
 #: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
 #: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
 #: modules/gui/gtk/preferences.c:605 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:117
+#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:121
 #: modules/gui/wxwindows/fileinfo.cpp:96
 #: modules/gui/wxwindows/messages.cpp:102 modules/gui/wxwindows/open.cpp:267
 #: modules/gui/wxwindows/preferences.cpp:250
@@ -3016,16 +3164,16 @@ msgstr "Datei mit Untertiteln 
 msgid "Drop files to play"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:167
+#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:169
 #: modules/gui/wxwindows/playlist.cpp:154
 msgid "Close"
 msgstr "Schließen"
 
-#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:330
+#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:353
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:335
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:358
 #: modules/gui/macosx/playlist.m:180
 msgid "Select All"
 msgstr "Alles auswählen"
@@ -3078,24 +3226,24 @@ msgstr "Name"
 #: modules/gui/beos/PreferencesWindow.cpp:44
 #: modules/gui/beos/PreferencesWindow.cpp:46
 #: modules/gui/beos/PreferencesWindow.cpp:98
-#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:607
-#: modules/gui/macosx/prefs.m:615 modules/gui/macosx/prefs.m:685
+#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:690
+#: modules/gui/macosx/prefs.m:698 modules/gui/macosx/prefs.m:768
 msgid "Modules"
 msgstr "Module"
 
-#: modules/gui/beos/PreferencesWindow.cpp:220
+#: modules/gui/beos/PreferencesWindow.cpp:219
 #: modules/gui/gtk/preferences.c:609
 msgid "Apply"
 msgstr "Übernehmen"
 
-#: modules/gui/beos/PreferencesWindow.cpp:225
+#: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
-#: modules/gui/macosx/output.m:332 modules/gui/macosx/prefs.m:76
+#: modules/gui/macosx/output.m:338 modules/gui/macosx/prefs.m:76
 #: modules/gui/wxwindows/preferences.cpp:254
 msgid "Save"
 msgstr "Speichern"
 
-#: modules/gui/beos/PreferencesWindow.cpp:229
+#: modules/gui/beos/PreferencesWindow.cpp:228
 #, fuzzy
 msgid "Defaults"
 msgstr "Standard"
@@ -3136,6 +3284,7 @@ msgid "Take Screen Shot"
 msgstr ""
 
 #: modules/gui/beos/VlcWrapper.cpp:185 modules/gui/gtk/menu.c:733
+#: modules/gui/macosx/prefs.m:348
 msgid "None"
 msgstr "Kein"
 
@@ -3165,8 +3314,8 @@ msgstr "Familiar Linux Gtk+ Oberfl
 msgid "VLC media player"
 msgstr "VLC Media Player"
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:652
-#: modules/gui/wxwindows/preferences.cpp:965
+#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:663
+#: modules/gui/wxwindows/preferences.cpp:967
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr "Datei öffnen"
@@ -3190,8 +3339,8 @@ msgstr "Stream abspielen"
 #: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
 #: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
 #: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:435
-#: modules/gui/macosx/intf.m:301 modules/gui/macosx/intf.m:339
-#: modules/gui/macosx/intf.m:400 modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
+#: modules/gui/macosx/intf.m:423 modules/gui/wxwindows/interface.cpp:347
 msgid "Stop"
 msgstr "Stopp"
 
@@ -3223,7 +3372,7 @@ msgstr "UDP/RTP (Adresse wenn Multicast)"
 
 #: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
 #: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:160
-#: modules/gui/macosx/output.m:124 modules/gui/wxwindows/open.cpp:445
+#: modules/gui/macosx/output.m:128 modules/gui/wxwindows/open.cpp:456
 #: modules/gui/wxwindows/streamout.cpp:380
 msgid "Address"
 msgstr "Adresse"
@@ -3233,13 +3382,13 @@ msgstr "Adresse"
 #: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
 #: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
 #: modules/gui/macosx/open.m:159 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:125 modules/gui/wxwindows/open.cpp:430
-#: modules/gui/wxwindows/open.cpp:453 modules/gui/wxwindows/streamout.cpp:390
+#: modules/gui/macosx/output.m:129 modules/gui/wxwindows/open.cpp:441
+#: modules/gui/wxwindows/open.cpp:464 modules/gui/wxwindows/streamout.cpp:390
 msgid "Port"
 msgstr "Port"
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:127
-#: modules/gui/macosx/output.m:221 modules/gui/macosx/output.m:289
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:131
+#: modules/gui/macosx/output.m:227 modules/gui/macosx/output.m:295
 #: modules/gui/wxwindows/streamout.cpp:341
 msgid "HTTP"
 msgstr "HTTP"
@@ -3320,10 +3469,10 @@ msgstr ""
 "Der VideoLAN Client ist ein MPEG 1, MPEG 2, MP3 und DivX Player der sowohl "
 "lokale Dateien als auch Netzwerk-Quellen unterstützt."
 
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
+#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100
 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Konnte pixmap-Datei %s nicht finden"
@@ -3333,6 +3482,73 @@ msgstr "Konnte pixmap-Datei %s nicht finden"
 msgid "Error loading pixmap file: %s"
 msgstr "Fehler beim Laden der pixmap Datei %s"
 
+#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
+#, fuzzy
+msgid "Gtk2 interface"
+msgstr "Gtk+ Oberfläche"
+
+#: modules/gui/gtk2/gnome2_interface.c:31
+#, fuzzy
+msgid "_New"
+msgstr "_Ansicht"
+
+#: modules/gui/gtk2/gnome2_interface.c:87
+msgid "gnome2"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:112
+#, fuzzy
+msgid "button4"
+msgstr "Maustaste"
+
+#: modules/gui/gtk2/gnome2_interface.c:122
+#: modules/gui/gtk2/gtk2_interface.c:183
+#, fuzzy
+msgid "button3"
+msgstr "Maustaste"
+
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337
+msgid "Save File"
+msgstr "Datei sichern"
+
+#: modules/gui/gtk2/gtk2_interface.c:67
+#, fuzzy
+msgid "window1"
+msgstr "Fenster"
+
+#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147
+#: modules/gui/gtk/gtk_interface.c:1373
+msgid "_File"
+msgstr "_Datei"
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+#, fuzzy
+msgid "_Edit"
+msgstr "Bearbeiten"
+
+#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268
+msgid "_View"
+msgstr "_Ansicht"
+
+#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: modules/gui/gtk2/gtk2_interface.c:146
+#, fuzzy
+msgid "_About"
+msgstr "Über uns"
+
+#: modules/gui/gtk2/gtk2_interface.c:163
+#, fuzzy
+msgid "button1"
+msgstr "Maustaste"
+
+#: modules/gui/gtk2/gtk2_interface.c:173
+#, fuzzy
+msgid "button2"
+msgstr "Maustaste"
+
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 #, fuzzy
 msgid "Show tooltips"
@@ -3378,7 +3594,7 @@ msgstr "Datei 
 #: modules/gui/gtk/gnome_interface.c:20 modules/gui/gtk/gnome_interface.c:504
 #: modules/gui/gtk/gnome_interface.c:986 modules/gui/gtk/gtk_interface.c:173
 #: modules/gui/gtk/gtk_interface.c:619 modules/gui/gtk/gtk_interface.c:1399
-#: modules/gui/wxwindows/interface.cpp:230
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Open a file"
 msgstr "Datei öffnen"
 
@@ -3478,25 +3694,25 @@ msgstr "Ton-Kanal festlegen"
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:909
 #: modules/gui/gtk/gtk_interface.c:452 modules/gui/gtk/gtk_interface.c:1253
-#: modules/gui/macosx/intf.m:355
+#: modules/gui/macosx/intf.m:378
 msgid "Volume Up"
 msgstr "Lauter"
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:916
 #: modules/gui/gtk/gtk_interface.c:459 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:356
+#: modules/gui/macosx/intf.m:379
 msgid "Volume Down"
 msgstr "Leiser"
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:923
 #: modules/gui/gtk/gtk_interface.c:466 modules/gui/gtk/gtk_interface.c:1267
-#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:357
+#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:380
 msgid "Mute"
 msgstr "Ton aus"
 
 #: modules/gui/gtk/gnome_interface.c:155 modules/gui/gtk/gnome_interface.c:938
 #: modules/gui/gtk/gtk_interface.c:488 modules/gui/gtk/gtk_interface.c:1289
-#: modules/gui/macosx/intf.m:362 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:385 modules/gui/macosx/intf.m:386
 msgid "Device"
 msgstr "Anschluss"
 
@@ -3515,18 +3731,10 @@ msgstr "Untertitel ausw
 msgid "_Fullscreen"
 msgstr "Vollbildmodus"
 
-#: modules/gui/gtk/gnome_interface.c:183 modules/gui/gtk/gnome_interface.c:966
-#: modules/gui/gtk/gtk_interface.c:553 modules/gui/gtk/gtk_interface.c:1349
-#: modules/gui/macosx/controls.m:526 modules/gui/macosx/intf.m:378
-#: modules/gui/macosx/intf.m:379
-#: modules/video_filter/deinterlace/deinterlace.c:81
-msgid "Deinterlace"
-msgstr "Bild glätten"
-
 #: modules/gui/gtk/gnome_interface.c:190 modules/gui/gtk/gnome_interface.c:973
 #: modules/gui/gtk/gtk_interface.c:560 modules/gui/gtk/gtk_interface.c:1356
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/intf.m:375
-#: modules/gui/macosx/output.m:120 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/intf.m:397 modules/gui/macosx/intf.m:398
+#: modules/gui/macosx/output.m:124 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr "Bildschirm"
 
@@ -3543,18 +3751,18 @@ msgstr "_Video"
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
 #: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2005
 #: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:142
-#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:337
+#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:338
 #: modules/gui/wxwindows/open.cpp:278
 msgid "Disc"
 msgstr "Volume"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:339
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Net"
 msgstr "Netzwerk"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:343
 msgid "Sat"
 msgstr "Satellit"
 
@@ -3616,7 +3824,7 @@ msgstr "Wiedergabeliste 
 #: modules/gui/gtk/gnome_interface.c:1063 modules/gui/gtk/gtk_interface.c:758
 #: modules/gui/gtk/gtk_interface.c:844 modules/gui/gtk/gtk_interface.c:888
 #: modules/gui/gtk/gtk_interface.c:1173
-#: modules/gui/wxwindows/interface.cpp:353
+#: modules/gui/wxwindows/interface.cpp:354
 msgid "Prev"
 msgstr "Vorher"
 
@@ -3628,8 +3836,8 @@ msgstr "Vorherige Datei"
 #: modules/gui/gtk/gnome_interface.c:1056 modules/gui/gtk/gtk_interface.c:769
 #: modules/gui/gtk/gtk_interface.c:852 modules/gui/gtk/gtk_interface.c:896
 #: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:443
-#: modules/gui/macosx/intf.m:303 modules/gui/macosx/intf.m:343
-#: modules/gui/macosx/intf.m:401 modules/gui/wxwindows/interface.cpp:355
+#: modules/gui/macosx/intf.m:326 modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:424 modules/gui/wxwindows/interface.cpp:356
 msgid "Next"
 msgstr "Nächstes Objekt"
 
@@ -3729,8 +3937,8 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
 #: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
 #: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:173
-#: modules/gui/macosx/output.m:123 modules/gui/wxwindows/open.cpp:246
-#: modules/gui/wxwindows/open.cpp:343
+#: modules/gui/macosx/output.m:127 modules/gui/wxwindows/open.cpp:246
+#: modules/gui/wxwindows/open.cpp:354
 #: modules/gui/wxwindows/preferences.cpp:778
 #: modules/gui/wxwindows/streamout.cpp:367
 #: modules/gui/wxwindows/subtitles.cpp:107
@@ -3738,24 +3946,24 @@ msgid "Browse..."
 msgstr "Durchsuchen..."
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:368
+#: modules/gui/wxwindows/open.cpp:379
 msgid "Disc type"
 msgstr "Volume Typ"
 
 #: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
 #: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:488
-#: modules/gui/wxwindows/open.cpp:362
+#: modules/gui/wxwindows/open.cpp:373
 msgid "DVD"
 msgstr "DVD"
 
 #: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
 #: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:382
-#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:363
+#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:374
 msgid "VCD"
 msgstr "VCD"
 
 #: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:374
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:385
 msgid "Device name"
 msgstr "Gerätename"
 
@@ -3766,24 +3974,24 @@ msgstr "DVD-Men
 
 #: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:547
-#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:409
+#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:420
 msgid "UDP/RTP"
 msgstr "UDP/RTP"
 
 #: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
 #: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:548
-#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:421
 msgid "UDP/RTP Multicast"
 msgstr "UDP/RTP Multicast"
 
 #: modules/gui/gtk/gnome_interface.c:1727 modules/gui/gtk/gtk_interface.c:2042
 #: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:549
-#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:411
+#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:422
 msgid "HTTP/FTP/MMS"
 msgstr "HTTP/FTP/MMS"
 
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:467
+#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:478
 msgid "URL"
 msgstr "URL"
 
@@ -3831,7 +4039,7 @@ msgid "fps"
 msgstr "fps / bps"
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:116
+#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:120
 #: modules/gui/wxwindows/open.cpp:201 modules/gui/wxwindows/open.cpp:223
 msgid "Settings..."
 msgstr "Einstellungen..."
@@ -3910,14 +4118,14 @@ msgid "Destination Target: "
 msgstr "Ziel: "
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:128 modules/gui/macosx/output.m:231
-#: modules/gui/macosx/output.m:290 modules/gui/wxwindows/streamout.cpp:342
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/output.m:237
+#: modules/gui/macosx/output.m:296 modules/gui/wxwindows/streamout.cpp:342
 msgid "UDP"
 msgstr "UDP"
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:129 modules/gui/macosx/output.m:241
-#: modules/gui/macosx/output.m:292 modules/gui/wxwindows/streamout.cpp:343
+#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:298 modules/gui/wxwindows/streamout.cpp:343
 msgid "RTP"
 msgstr "RTP"
 
@@ -3938,8 +4146,8 @@ msgid "PS"
 msgstr "PS"
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:135 modules/gui/macosx/output.m:273
-#: modules/gui/macosx/output.m:319
+#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:279
+#: modules/gui/macosx/output.m:325
 msgid "AVI"
 msgstr "AVI"
 
@@ -3956,11 +4164,6 @@ msgstr "Gtk+"
 msgid "Gtk+ interface"
 msgstr "Gtk+ Oberfläche"
 
-#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
-#: modules/gui/gtk2/gtk2_interface.c:77
-msgid "_File"
-msgstr "_Datei"
-
 #: modules/gui/gtk/gtk_interface.c:238
 msgid "_Close"
 msgstr "_Schließen"
@@ -3977,10 +4180,6 @@ msgstr "B_eenden"
 msgid "Exit the program"
 msgstr "Programm beenden"
 
-#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132
-msgid "_View"
-msgstr "_Ansicht"
-
 #: modules/gui/gtk/gtk_interface.c:294
 msgid "Hide the main interface window"
 msgstr "Hauptfenster ausblenden"
@@ -4001,10 +4200,6 @@ msgstr "_Einstellungen..."
 msgid "Configure the application"
 msgstr "Programm einstellen"
 
-#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139
-msgid "_Help"
-msgstr "_Hilfe"
-
 #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435
 msgid "_About..."
 msgstr "_Über..."
@@ -4109,60 +4304,6 @@ msgstr "Einstellen"
 msgid "Selected:"
 msgstr "Ausgewählt:"
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-#, fuzzy
-msgid "Gtk2 interface"
-msgstr "Gtk+ Oberfläche"
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-#, fuzzy
-msgid "_New"
-msgstr "_Ansicht"
-
-#: modules/gui/gtk2/gnome2_interface.c:87
-msgid "gnome2"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:112
-#, fuzzy
-msgid "button4"
-msgstr "Maustaste"
-
-#: modules/gui/gtk2/gnome2_interface.c:122
-#: modules/gui/gtk2/gtk2_interface.c:183
-#, fuzzy
-msgid "button3"
-msgstr "Maustaste"
-
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:331
-msgid "Save File"
-msgstr "Datei sichern"
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-#, fuzzy
-msgid "window1"
-msgstr "Fenster"
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-#, fuzzy
-msgid "_Edit"
-msgstr "Bearbeiten"
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-#, fuzzy
-msgid "_About"
-msgstr "Über uns"
-
-#: modules/gui/gtk2/gtk2_interface.c:163
-#, fuzzy
-msgid "button1"
-msgstr "Maustaste"
-
-#: modules/gui/gtk2/gtk2_interface.c:173
-#, fuzzy
-msgid "button2"
-msgstr "Maustaste"
-
 #: modules/gui/kde/interface.cpp:88
 msgid "Languages"
 msgstr "Sprachen"
@@ -4192,224 +4333,224 @@ msgstr "Nachrichten:"
 msgid "Plugins"
 msgstr "Plug-Ins"
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:315
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:338
 msgid "About VLC media player"
 msgstr "Über den VLC media player"
 
 #: modules/gui/macosx/controls.m:344 modules/gui/macosx/controls.m:487
-#: modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:389
 msgid "Half Size"
 msgstr "Halbe Größe"
 
 #: modules/gui/macosx/controls.m:346 modules/gui/macosx/controls.m:488
-#: modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:390
 msgid "Normal Size"
 msgstr "Normale Größe"
 
 #: modules/gui/macosx/controls.m:348 modules/gui/macosx/controls.m:489
-#: modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/intf.m:391
 msgid "Double Size"
 msgstr "Doppelte Größe"
 
 #: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:491
 #: modules/gui/macosx/controls.m:498 modules/gui/macosx/controls.m:520
-#: modules/gui/macosx/intf.m:371
+#: modules/gui/macosx/intf.m:394
 msgid "Float On Top"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:490
-#: modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/intf.m:392
 #, fuzzy
 msgid "Fit To Screen"
 msgstr "Bildschirm"
 
-#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:298
-#: modules/gui/macosx/intf.m:342 modules/gui/macosx/intf.m:402
+#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:321
+#: modules/gui/macosx/intf.m:365 modules/gui/macosx/intf.m:425
 msgid "Previous"
 msgstr "Vorheriges Objekt"
 
-#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:344
+#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:367
 msgid "Loop"
 msgstr "Wiederholen"
 
-#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:345
+#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:368
 msgid "Step Forward"
 msgstr "Ein Stück vorwärts"
 
-#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:346
+#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:369
 msgid "Step Backward"
 msgstr "Ein Stück rückwärts"
 
-#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:386
-#: modules/gui/macosx/intf.m:411
+#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:434
 msgid "Info"
 msgstr "Information"
 
-#: modules/gui/macosx/intf.m:293
+#: modules/gui/macosx/intf.m:316
 msgid "VLC - Controller"
 msgstr "VLC - Steuerung"
 
-#: modules/gui/macosx/intf.m:305
+#: modules/gui/macosx/intf.m:328
 msgid "Volume"
 msgstr "Lautstärke"
 
-#: modules/gui/macosx/intf.m:306
+#: modules/gui/macosx/intf.m:329
 msgid "Position"
 msgstr "Position"
 
-#: modules/gui/macosx/intf.m:312
+#: modules/gui/macosx/intf.m:335
 msgid "Open CrashLog"
 msgstr "Das CrashLog öffnen"
 
-#: modules/gui/macosx/intf.m:316
+#: modules/gui/macosx/intf.m:339
 msgid "Preferences..."
 msgstr "Einstellungen..."
 
-#: modules/gui/macosx/intf.m:317
+#: modules/gui/macosx/intf.m:340
 msgid "Hide VLC"
 msgstr "VLC ausblenden"
 
-#: modules/gui/macosx/intf.m:318
+#: modules/gui/macosx/intf.m:341
 msgid "Hide Others"
 msgstr "Andere ausblenden"
 
-#: modules/gui/macosx/intf.m:319
+#: modules/gui/macosx/intf.m:342
 msgid "Show All"
 msgstr "Alle einblenden"
 
-#: modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:343
 msgid "Quit VLC"
 msgstr "VLC beenden"
 
-#: modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/intf.m:345
 msgid "1:File"
 msgstr "1:Ablage"
 
-#: modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:346
 msgid "Open..."
 msgstr "Öffnen..."
 
-#: modules/gui/macosx/intf.m:324
+#: modules/gui/macosx/intf.m:347
 msgid "Open File..."
 msgstr "Datei öffnen..."
 
-#: modules/gui/macosx/intf.m:325
+#: modules/gui/macosx/intf.m:348
 msgid "Open Disc..."
 msgstr "Volume öffnen..."
 
-#: modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:349
 msgid "Open Network..."
 msgstr "Netzwerk öffnen..."
 
-#: modules/gui/macosx/intf.m:327
+#: modules/gui/macosx/intf.m:350
 msgid "Open Recent"
 msgstr "Benutzte Dokumente"
 
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/intf.m:1291
+#: modules/gui/macosx/intf.m:351 modules/gui/macosx/intf.m:1314
 msgid "Clear Menu"
 msgstr "Menü löschen"
 
-#: modules/gui/macosx/intf.m:331
+#: modules/gui/macosx/intf.m:354
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: modules/gui/macosx/intf.m:332
+#: modules/gui/macosx/intf.m:355
 msgid "Copy"
 msgstr "Kopieren"
 
-#: modules/gui/macosx/intf.m:333
+#: modules/gui/macosx/intf.m:356
 msgid "Paste"
 msgstr "Einsetzen"
 
-#: modules/gui/macosx/intf.m:334
+#: modules/gui/macosx/intf.m:357
 msgid "Clear"
 msgstr "Löschen"
 
-#: modules/gui/macosx/intf.m:337
+#: modules/gui/macosx/intf.m:360
 msgid "Controls"
 msgstr "Steuerung"
 
-#: modules/gui/macosx/intf.m:358 modules/gui/macosx/intf.m:359
+#: modules/gui/macosx/intf.m:381 modules/gui/macosx/intf.m:382
 #, fuzzy
 msgid "Audio Track"
 msgstr "Ton"
 
-#: modules/gui/macosx/intf.m:372 modules/gui/macosx/intf.m:373
+#: modules/gui/macosx/intf.m:395 modules/gui/macosx/intf.m:396
 #, fuzzy
 msgid "Video Track"
 msgstr "Bild"
 
-#: modules/gui/macosx/intf.m:382
+#: modules/gui/macosx/intf.m:405
 msgid "Minimize Window"
 msgstr "Im Dock ablegen"
 
-#: modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:406
 msgid "Close Window"
 msgstr "Fenster schließen"
 
-#: modules/gui/macosx/intf.m:384
+#: modules/gui/macosx/intf.m:407
 msgid "Controller"
 msgstr "Steuerungsfenster"
 
-#: modules/gui/macosx/intf.m:389
+#: modules/gui/macosx/intf.m:412
 msgid "Bring All to Front"
 msgstr "Alle nach vorne bringen"
 
-#: modules/gui/macosx/intf.m:391
+#: modules/gui/macosx/intf.m:414
 msgid "Help"
 msgstr "Hilfe"
 
-#: modules/gui/macosx/intf.m:392
+#: modules/gui/macosx/intf.m:415
 msgid "ReadMe..."
 msgstr "Lies mich..."
 
-#: modules/gui/macosx/intf.m:393
+#: modules/gui/macosx/intf.m:416
 #, fuzzy
 msgid "Online Documentation"
 msgstr "Bewegungsausgleich"
 
-#: modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/intf.m:417
 msgid "Report a Bug"
 msgstr "Einen Fehler melden..."
 
-#: modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/intf.m:418
 msgid "VideoLAN Website"
 msgstr "VideoLAN Website"
 
-#: modules/gui/macosx/intf.m:396
+#: modules/gui/macosx/intf.m:419
 msgid "License"
 msgstr "Lizenzvertrag"
 
-#: modules/gui/macosx/intf.m:405
+#: modules/gui/macosx/intf.m:428
 msgid "Error"
 msgstr "Fehler"
 
-#: modules/gui/macosx/intf.m:406
+#: modules/gui/macosx/intf.m:429
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr ""
 "Ein Fehler ist aufgetreten, der wahrscheinlich die Ausführung der "
 "gewünschten Funktion verhindert hat."
 
-#: modules/gui/macosx/intf.m:407
+#: modules/gui/macosx/intf.m:430
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr ""
 "Wenn Sie glauben, dass dies ein Fehler ist, folgen Sie bitte den Anweisungen "
 "unter :"
 
-#: modules/gui/macosx/intf.m:408
+#: modules/gui/macosx/intf.m:431
 msgid "Open Messages Window"
 msgstr "Nachrichtenfenster öffnen"
 
-#: modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:432
 msgid "Dismiss"
 msgstr "Ignorieren"
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid "No CrashLog found"
 msgstr "Kein CrashLog gefunden"
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4489,65 +4630,58 @@ msgstr "Keine %@s gefunden"
 msgid "Open VIDEO_TS Directory"
 msgstr "VIDEO_TS Ordner öffnen"
 
-#: modules/gui/macosx/output.m:115
+#: modules/gui/macosx/output.m:119
 #, fuzzy
 msgid "Advanced output:"
 msgstr "ALSA Tonausgabe"
 
-#: modules/gui/macosx/output.m:119
+#: modules/gui/macosx/output.m:123
 #, fuzzy
 msgid "Output Options"
 msgstr "Ausgabemethode"
 
-#: modules/gui/macosx/output.m:122 modules/gui/macosx/output.m:210
-#: modules/gui/macosx/output.m:285
+#: modules/gui/macosx/output.m:126 modules/gui/macosx/output.m:216
+#: modules/gui/macosx/output.m:291
 #, fuzzy
 msgid "Stream"
 msgstr "Stream stoppen"
 
-#: modules/gui/macosx/output.m:126
+#: modules/gui/macosx/output.m:130
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132 modules/gui/wxwindows/streamout.cpp:437
+#: modules/gui/macosx/output.m:136 modules/gui/wxwindows/streamout.cpp:437
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:133
+#: modules/gui/macosx/output.m:137
 msgid "MPEG TS"
 msgstr "MPEG TS"
 
-#: modules/gui/macosx/output.m:134 modules/gui/macosx/output.m:275
-#: modules/gui/macosx/output.m:317
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:281
+#: modules/gui/macosx/output.m:323
 msgid "MPEG PS"
 msgstr "MPEG PS"
 
-#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:274
-#: modules/gui/macosx/output.m:321
+#: modules/gui/macosx/output.m:140 modules/gui/macosx/output.m:280
+#: modules/gui/macosx/output.m:327
 msgid "Ogg"
 msgstr "Ogg"
 
-#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:276
-#: modules/gui/macosx/output.m:323
+#: modules/gui/macosx/output.m:141 modules/gui/macosx/output.m:282
+#: modules/gui/macosx/output.m:329
 msgid "mp4"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139
+#: modules/gui/macosx/output.m:143
 #, fuzzy
 msgid "Transcode options"
 msgstr "Stream anhalten"
 
-#: modules/gui/macosx/output.m:149 modules/gui/macosx/output.m:153
-msgid "Bitrate (bps)"
-msgstr ""
-
-#: modules/gui/macosx/output.m:151
-#, fuzzy
-msgid "mpga"
-msgstr "mpeg"
-
-#: modules/gui/macosx/output.m:152
-msgid "a52 "
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:158
+#: modules/gui/wxwindows/streamout.cpp:512
+#: modules/gui/wxwindows/streamout.cpp:549
+msgid "Bitrate (kb/s)"
 msgstr ""
 
 #: modules/gui/macosx/prefs.m:78 modules/gui/wxwindows/preferences.cpp:256
@@ -4560,12 +4694,6 @@ msgstr "Alles ausw
 msgid "Advanced"
 msgstr "Erweitert..."
 
-#: modules/gui/macosx/prefs.m:143 modules/gui/macosx/prefs.m:341
-#: modules/gui/macosx/prefs.m:368
-#, fuzzy
-msgid "Auto"
-msgstr "Autoren"
-
 #: modules/gui/ncurses/ncurses.c:66
 msgid "ncurses interface"
 msgstr "ncurses Oberfläche"
@@ -4578,33 +4706,33 @@ msgstr "QNX RTOS Bild- und Tonausgabe."
 msgid "Qt interface"
 msgstr "QT Oberfläche"
 
-#: modules/gui/skins/src/skin_main.cpp:251
-#: modules/gui/skins/src/vlcproc.cpp:338
+#: modules/gui/skins/src/skin_main.cpp:239
+#: modules/gui/skins/src/vlcproc.cpp:339
 #, fuzzy
 msgid "Open a skin file"
 msgstr "Datei öffnen"
 
-#: modules/gui/skins/src/skin_main.cpp:292
-#: modules/gui/skins/src/skin_main.cpp:293
+#: modules/gui/skins/src/skin_main.cpp:280
+#: modules/gui/skins/src/skin_main.cpp:281
 msgid "Last skin actually used"
 msgstr "Letzter benutzter Skin"
 
-#: modules/gui/skins/src/skin_main.cpp:294
-#: modules/gui/skins/src/skin_main.cpp:295
+#: modules/gui/skins/src/skin_main.cpp:282
+#: modules/gui/skins/src/skin_main.cpp:283
 msgid "Config of last used skin"
 msgstr "Konfiguration des letzten Skins"
 
-#: modules/gui/skins/src/skin_main.cpp:296
-#: modules/gui/skins/src/skin_main.cpp:297
+#: modules/gui/skins/src/skin_main.cpp:284
+#: modules/gui/skins/src/skin_main.cpp:285
 msgid "Show application in system tray"
 msgstr "Programm im System-Tray anzeigen"
 
-#: modules/gui/skins/src/skin_main.cpp:298
-#: modules/gui/skins/src/skin_main.cpp:299
+#: modules/gui/skins/src/skin_main.cpp:286
+#: modules/gui/skins/src/skin_main.cpp:287
 msgid "Show application in taskbar"
 msgstr "Programm in der Taskleiste anzeigen"
 
-#: modules/gui/skins/src/skin_main.cpp:310
+#: modules/gui/skins/src/skin_main.cpp:298
 msgid "Skinnable Interface"
 msgstr "mit Skins anpassbare Oberfläche"
 
@@ -4613,160 +4741,161 @@ msgstr "mit Skins anpassbare Oberfl
 msgid "FileInfo"
 msgstr "&Datei-Info..."
 
-#: modules/gui/wxwindows/interface.cpp:231
+#: modules/gui/wxwindows/interface.cpp:232
 msgid "Open a DVD or (S)VCD"
 msgstr "Eine DVD oder (S)VCD öffnen"
 
-#: modules/gui/wxwindows/interface.cpp:232
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Open a network stream"
 msgstr "Netzwerk Stream öffnen"
 
-#: modules/gui/wxwindows/interface.cpp:233
+#: modules/gui/wxwindows/interface.cpp:234
 msgid "Open a satellite stream"
 msgstr "Einen Satelliten-Stream öffnen"
 
-#: modules/gui/wxwindows/interface.cpp:234
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "Eject the DVD/CD"
 msgstr "Die DVD/CD auswerfen"
 
-#: modules/gui/wxwindows/interface.cpp:235
+#: modules/gui/wxwindows/interface.cpp:236
 msgid "Exit this program"
 msgstr "Dieses Programm verlassen"
 
-#: modules/gui/wxwindows/interface.cpp:237
+#: modules/gui/wxwindows/interface.cpp:238
 msgid "Open the playlist"
 msgstr "Die Wiedergabeliste öffnen"
 
-#: modules/gui/wxwindows/interface.cpp:238
+#: modules/gui/wxwindows/interface.cpp:239
 msgid "Show the program logs"
 msgstr "Die Programm-Logs anzeigen"
 
-#: modules/gui/wxwindows/interface.cpp:239
+#: modules/gui/wxwindows/interface.cpp:240
 msgid "Show information about the file being played"
 msgstr "Informationen über die abgespielte Datei anzeigen"
 
-#: modules/gui/wxwindows/interface.cpp:241
+#: modules/gui/wxwindows/interface.cpp:242
 msgid "Go to the preferences menu"
 msgstr "Zum Preferences-Menü gehen"
 
-#: modules/gui/wxwindows/interface.cpp:243
+#: modules/gui/wxwindows/interface.cpp:244
 msgid "About this program"
 msgstr "Über dieses Programm"
 
-#: modules/gui/wxwindows/interface.cpp:247
+#: modules/gui/wxwindows/interface.cpp:248
 msgid "&Open File..."
 msgstr "Datei &öffnen..."
 
-#: modules/gui/wxwindows/interface.cpp:249
+#: modules/gui/wxwindows/interface.cpp:250
 msgid "Open &Disc..."
 msgstr "&Volume öffnen..."
 
-#: modules/gui/wxwindows/interface.cpp:251
+#: modules/gui/wxwindows/interface.cpp:252
 msgid "&Network Stream..."
 msgstr "&Netzwerk Stream..."
 
-#: modules/gui/wxwindows/interface.cpp:254
+#: modules/gui/wxwindows/interface.cpp:255
 msgid "&Satellite Stream..."
 msgstr "&Sateliten-Stream..."
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:260
 msgid "&Eject Disc"
 msgstr "Volume &auswerfen"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:264
 msgid "E&xit"
 msgstr "&Verlassen"
 
-#: modules/gui/wxwindows/interface.cpp:267
+#: modules/gui/wxwindows/interface.cpp:268
 msgid "&Playlist..."
 msgstr "&Wiedergabeliste..."
 
-#: modules/gui/wxwindows/interface.cpp:269
-msgid "&Logs..."
-msgstr "&Logs..."
-
 #: modules/gui/wxwindows/interface.cpp:270
+#, fuzzy
+msgid "&Messages..."
+msgstr "Nachrichten..."
+
+#: modules/gui/wxwindows/interface.cpp:271
 msgid "&File info..."
 msgstr "&Datei-Info..."
 
-#: modules/gui/wxwindows/interface.cpp:275
+#: modules/gui/wxwindows/interface.cpp:276
 msgid "&Preferences..."
 msgstr "&Einstellungen..."
 
-#: modules/gui/wxwindows/interface.cpp:292
+#: modules/gui/wxwindows/interface.cpp:293
 msgid "&About..."
 msgstr "&Über..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:297
 msgid "&File"
 msgstr "&Datei"
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:298
 msgid "&View"
 msgstr "&Ansicht"
 
-#: modules/gui/wxwindows/interface.cpp:298
+#: modules/gui/wxwindows/interface.cpp:299
 msgid "&Settings"
 msgstr "&Einstellungen"
 
-#: modules/gui/wxwindows/interface.cpp:299
-#: modules/gui/wxwindows/interface.cpp:476
-#: modules/gui/wxwindows/interface.cpp:524
+#: modules/gui/wxwindows/interface.cpp:300
+#: modules/gui/wxwindows/interface.cpp:478
+#: modules/gui/wxwindows/interface.cpp:526
 msgid "&Audio"
 msgstr "&Ton"
 
-#: modules/gui/wxwindows/interface.cpp:300
-#: modules/gui/wxwindows/interface.cpp:495
-#: modules/gui/wxwindows/interface.cpp:528
+#: modules/gui/wxwindows/interface.cpp:301
+#: modules/gui/wxwindows/interface.cpp:497
+#: modules/gui/wxwindows/interface.cpp:530
 #, fuzzy
 msgid "&Video"
 msgstr "Bild"
 
-#: modules/gui/wxwindows/interface.cpp:301
-#: modules/gui/wxwindows/interface.cpp:514
-#: modules/gui/wxwindows/interface.cpp:532
+#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:516
+#: modules/gui/wxwindows/interface.cpp:534
 #, fuzzy
 msgid "&Navigation"
 msgstr "Navigation"
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:303
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: modules/gui/wxwindows/interface.cpp:318
+#: modules/gui/wxwindows/interface.cpp:319
 msgid "Stop current playlist item"
 msgstr "Aktuelles Wiedergabelistenobjekt stoppen"
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:320
 msgid "Play current playlist item"
 msgstr "Aktuelles Wiedergabelistenobjekt abspielen"
 
-#: modules/gui/wxwindows/interface.cpp:320
+#: modules/gui/wxwindows/interface.cpp:321
 msgid "Pause current playlist item"
 msgstr "Aktuelles Wiedergabelistenobjekt anhalten"
 
-#: modules/gui/wxwindows/interface.cpp:321
+#: modules/gui/wxwindows/interface.cpp:322
 #: modules/gui/wxwindows/playlist.cpp:351
 msgid "Open playlist"
 msgstr "Wiedergabeliste öffnen"
 
-#: modules/gui/wxwindows/interface.cpp:322
+#: modules/gui/wxwindows/interface.cpp:323
 msgid "Previous playlist item"
 msgstr "Vorheriges Wiedergabelistenobjekt"
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:324
 msgid "Next playlist item"
 msgstr "Nächstes Wiedergabelistenobjekt"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:325
 msgid "Play slower"
 msgstr "Langsamer abspielen"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:326
 msgid "Play faster"
 msgstr "Schneller abspielen"
 
-#: modules/gui/wxwindows/interface.cpp:560
+#: modules/gui/wxwindows/interface.cpp:561
 msgid ""
 " (wxWindows interface)\n"
 "\n"
@@ -4774,7 +4903,7 @@ msgstr ""
 " (wxWindows Oberfläche)\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:561
+#: modules/gui/wxwindows/interface.cpp:562
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
@@ -4782,7 +4911,7 @@ msgstr ""
 "(c) 1996-2003 - das VideoLAN Team\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:562
+#: modules/gui/wxwindows/interface.cpp:563
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
@@ -4791,7 +4920,7 @@ msgstr ""
 "Das VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 
-#: modules/gui/wxwindows/interface.cpp:564
+#: modules/gui/wxwindows/interface.cpp:565
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
 "It can play MPEG and MPEG2 files from a file or from a network source."
@@ -4800,7 +4929,7 @@ msgstr ""
 "Er kann MPEG und MPEG2 Dateien lokal oder von einer Quelle im Netzwerk "
 "abspielen."
 
-#: modules/gui/wxwindows/interface.cpp:568
+#: modules/gui/wxwindows/interface.cpp:569
 #, c-format
 msgid "About %s"
 msgstr "Über %s"
@@ -4813,11 +4942,11 @@ msgstr "Ton-Men
 msgid "Video menu"
 msgstr "Bild-Menü"
 
-#: modules/gui/wxwindows/menus.cpp:139
+#: modules/gui/wxwindows/menus.cpp:141
 msgid "Input menu"
 msgstr "Input-Menü"
 
-#: modules/gui/wxwindows/menus.cpp:329
+#: modules/gui/wxwindows/menus.cpp:334
 msgid "Empty"
 msgstr ""
 
@@ -4854,16 +4983,16 @@ msgstr "Stream-Input festhalten"
 msgid "Capture the stream you are playing to a file"
 msgstr "Den Stream einfangen, die Sie in eine Datei abspielen"
 
-#: modules/gui/wxwindows/open.cpp:361
+#: modules/gui/wxwindows/open.cpp:372
 msgid "DVD (menus support)"
 msgstr "DVD (Menü-Unterstützung)"
 
-#: modules/gui/wxwindows/open.cpp:364
+#: modules/gui/wxwindows/open.cpp:375
 #, fuzzy
 msgid "CD Audio"
 msgstr "Ton"
 
-#: modules/gui/wxwindows/open.cpp:837 modules/gui/wxwindows/streamout.cpp:640
+#: modules/gui/wxwindows/open.cpp:848 modules/gui/wxwindows/streamout.cpp:640
 msgid "Save file"
 msgstr "Datei sichern"
 
@@ -4934,8 +5063,9 @@ msgid "No configuration options available"
 msgstr "Keine Konfigurationsoptionen verfügbar"
 
 #: modules/gui/wxwindows/preferences.cpp:865
-msgid "Advanced..."
-msgstr "Erweitert..."
+#, fuzzy
+msgid "Advanced options"
+msgstr "Erweiterte Optionen"
 
 #: modules/gui/wxwindows/streamout.cpp:166
 msgid "Stream output MRL"
@@ -4976,11 +5106,6 @@ msgstr "Erweiterte Optionen"
 msgid "Video codec"
 msgstr "Ton-Anschluss/Device"
 
-#: modules/gui/wxwindows/streamout.cpp:512
-#: modules/gui/wxwindows/streamout.cpp:549
-msgid "Bitrate (kb/s)"
-msgstr ""
-
 #: modules/gui/wxwindows/streamout.cpp:543
 #, fuzzy
 msgid "Audio codec"
@@ -5116,6 +5241,10 @@ msgstr "Interface-Aktionen in Datei mitschreiben"
 msgid "Using the logger interface plugin..."
 msgstr "Das Benutzeroberflächen-Aufzeichnungs-PlugIn benutzen..."
 
+#: modules/misc/memcpy/memcpyaltivec.c:52
+msgid "AltiVec memcpy"
+msgstr "AltiVec memcpy"
+
 #: modules/misc/memcpy/memcpy.c:81
 msgid "libc memcpy"
 msgstr "libc memcpy"
@@ -5132,10 +5261,6 @@ msgstr "MMX memcpy"
 msgid "MMX EXT memcpy"
 msgstr "MMX EXT memcpy"
 
-#: modules/misc/memcpy/memcpyaltivec.c:52
-msgid "AltiVec memcpy"
-msgstr "AltiVec memcpy"
-
 #: modules/misc/network/ipv4.c:85
 msgid "IPv4 network abstraction layer"
 msgstr "IPv4 Netzwerk Abstraktions-Layer"
@@ -5148,6 +5273,10 @@ msgstr "IPv6 Netzwerk Abstraktions-Layer"
 msgid "Qt Embedded GUI helper"
 msgstr "integrierte QT Hilfe"
 
+#: modules/misc/sap.c:131
+msgid "SAP"
+msgstr "SAP"
+
 #: modules/misc/sap.c:134
 msgid "SAP interface"
 msgstr "SAP Benutzeroberfläche"
@@ -5277,8 +5406,9 @@ msgid "Set image contrast"
 msgstr "Bildkontrast einstellen"
 
 #: modules/video_filter/adjust.c:61
-msgid "Set the image contrast. Defaults to 1"
-msgstr "Den Bildkontrast einstellen. Standardmäßig 1"
+#, fuzzy
+msgid "Set the image contrast, between 0 and 2. Defaults to 1"
+msgstr "Die Bildfarbe einstellen, zwischen 0 und 360. Standardmäßig 0."
 
 #: modules/video_filter/adjust.c:62
 #, fuzzy
@@ -5295,8 +5425,9 @@ msgid "Set image saturation"
 msgstr "Bildsättigung einstellen"
 
 #: modules/video_filter/adjust.c:65
-msgid "Set the image saturation. Defaults to 1"
-msgstr "Die Bildsättigung einstellen. Standardmäßig 1"
+#, fuzzy
+msgid "Set the image saturation, between 0 and 3. Defaults to 1"
+msgstr "Die Bildfarbe einstellen, zwischen 0 und 360. Standardmäßig 0."
 
 #: modules/video_filter/adjust.c:66
 #, fuzzy
@@ -5304,8 +5435,9 @@ msgid "Set image brightness"
 msgstr "Bildhelligkeit einstellen"
 
 #: modules/video_filter/adjust.c:67
-msgid "Set the image brightness. Defaults to 1"
-msgstr "Die Bildhelligkeit einstellen. Standardmäßig 1"
+#, fuzzy
+msgid "Set the image brightness, between 0 and 2. Defaults to 1"
+msgstr "Die Bildfarbe einstellen, zwischen 0 und 360. Standardmäßig 0."
 
 #: modules/video_filter/adjust.c:71
 msgid "Adjust"
@@ -5349,8 +5481,10 @@ msgid "Crop geometry"
 msgstr "Geometrie beschneiden"
 
 #: modules/video_filter/crop.c:55
-msgid "Set the geometry of the zone to crop"
-msgstr "Geben Sie die Geometrie der Zone ein, die freigestellt werden soll"
+msgid ""
+"Set the geometry of the zone to crop. This is set as width x heigth + left "
+"offset + top offset."
+msgstr ""
 
 #: modules/video_filter/crop.c:57
 #, fuzzy
@@ -5668,11 +5802,21 @@ msgstr ""
 "Geteilten Speicher benutzen, um zwischen VLC und dem X Server zu "
 "kommunizieren."
 
-#: modules/video_output/x11/x11.c:62
+#: modules/video_output/x11/x11.c:61 modules/video_output/x11/xvideo.c:72
+msgid "choose the screen to be used for fullscreen mode."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:63 modules/video_output/x11/xvideo.c:74
+msgid ""
+"Choose the screen you want to use in fullscreen mode. For instance set it to "
+"0 for first screen, 1 for the second."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:67
 msgid "X11"
 msgstr "X11"
 
-#: modules/video_output/x11/x11.c:68
+#: modules/video_output/x11/x11.c:76
 msgid "X11 video output"
 msgstr "X11 Bildausgabe"
 
@@ -5701,11 +5845,11 @@ msgstr ""
 "Den XVideo - Renderer zwingen ein bestimmtes reines Bild-Format zu benutzen, "
 "anstatt ihn das effizienteste wählen zu lassen"
 
-#: modules/video_output/x11/xvideo.c:73
+#: modules/video_output/x11/xvideo.c:78
 msgid "XVideo"
 msgstr "XVideo"
 
-#: modules/video_output/x11/xvideo.c:81
+#: modules/video_output/x11/xvideo.c:90
 msgid "XVideo extension video output"
 msgstr "XVideo extension Bildausgabe"
 
@@ -5753,6 +5897,35 @@ msgstr "XOSD Modul"
 msgid "xosd interface"
 msgstr "xosd Oberfläche"
 
+#~ msgid "SAP interface module"
+#~ msgstr "SAP Oberflächen Modul"
+
+#, fuzzy
+#~ msgid "mpga"
+#~ msgstr "mpeg"
+
+#, fuzzy
+#~ msgid "Auto"
+#~ msgstr "Autoren"
+
+#~ msgid "&Logs..."
+#~ msgstr "&Logs..."
+
+#~ msgid "Advanced..."
+#~ msgstr "Erweitert..."
+
+#~ msgid "Set the image contrast. Defaults to 1"
+#~ msgstr "Den Bildkontrast einstellen. Standardmäßig 1"
+
+#~ msgid "Set the image saturation. Defaults to 1"
+#~ msgstr "Die Bildsättigung einstellen. Standardmäßig 1"
+
+#~ msgid "Set the image brightness. Defaults to 1"
+#~ msgstr "Die Bildhelligkeit einstellen. Standardmäßig 1"
+
+#~ msgid "Set the geometry of the zone to crop"
+#~ msgstr "Geben Sie die Geometrie der Zone ein, die freigestellt werden soll"
+
 #, fuzzy
 #~ msgid "Display identifier"
 #~ msgstr "Bildschirm identifizieren"
diff --git a/po/en_GB.po b/po/en_GB.po
index 295bebc316..b5a0f565a0 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-05-24 14:40+0200\n"
+"POT-Creation-Date: 2003-05-27 23:43+0200\n"
 "PO-Revision-Date: 2002-04-22 09:56+0200\n"
 "Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
 "Language-Team: \n"
@@ -37,7 +37,7 @@ msgid "Audio channels"
 msgstr ""
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:165 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:358
 msgid "Stereo"
@@ -124,7 +124,7 @@ msgstr ""
 
 #: src/input/input_programs.c:94 modules/gui/gtk/gnome_interface.c:1078
 #: modules/gui/gtk/gtk_interface.c:1199 modules/gui/kde/interface.cpp:142
-#: modules/gui/macosx/intf.m:347 modules/gui/macosx/intf.m:348
+#: modules/gui/macosx/intf.m:370 modules/gui/macosx/intf.m:371
 msgid "Program"
 msgstr "Programme"
 
@@ -132,18 +132,18 @@ msgstr "Programme"
 #: modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
-#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:349
-#: modules/gui/macosx/intf.m:350 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:382
+#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:372
+#: modules/gui/macosx/intf.m:373 modules/gui/macosx/open.m:149
+#: modules/gui/wxwindows/open.cpp:393
 msgid "Title"
 msgstr ""
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
 #: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
-#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:351
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:388
+#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:374
+#: modules/gui/macosx/intf.m:375 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:399
 msgid "Chapter"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Previous Chapter"
 msgstr ""
 
-#: src/input/input_programs.c:668
+#: src/input/input_programs.c:668 src/video_output/video_output.c:397
 msgid "Disable"
 msgstr ""
 
@@ -202,44 +202,44 @@ msgstr ""
 msgid "C"
 msgstr "en_GB"
 
-#: src/libvlc.c:301 src/libvlc.c:1357
+#: src/libvlc.c:301 src/libvlc.c:1364
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
 "\n"
 msgstr ""
 
-#: src/libvlc.c:1189 src/misc/configuration.c:961
+#: src/libvlc.c:1196 src/misc/configuration.c:961
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:1206 src/misc/configuration.c:946
+#: src/libvlc.c:1213 src/misc/configuration.c:946
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:1209 src/misc/configuration.c:953
+#: src/libvlc.c:1216 src/misc/configuration.c:953
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:1215
+#: src/libvlc.c:1222
 msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:1216
+#: src/libvlc.c:1223
 msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:1332 src/libvlc.c:1387 src/libvlc.c:1411
+#: src/libvlc.c:1339 src/libvlc.c:1394 src/libvlc.c:1418
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
 msgstr ""
 
-#: src/libvlc.c:1360
+#: src/libvlc.c:1367
 msgid "[module]              [description]\n"
 msgstr ""
 
-#: src/libvlc.c:1405
+#: src/libvlc.c:1412
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -956,15 +956,15 @@ msgstr ""
 #: modules/demux/ogg.c:554 modules/demux/ogg.c:813 modules/demux/ogg.c:986
 #: modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m:354 modules/gui/macosx/output.m:150
+#: modules/gui/macosx/intf.m:377 modules/gui/macosx/output.m:155
 msgid "Audio"
 msgstr ""
 
 #: src/libvlc.h:473 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:893 modules/gui/gtk/gnome_interface.c:1099
-#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:365
-#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:140
+#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:388
+#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:144
 #: modules/misc/dummy/dummy.c:83 modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr ""
@@ -995,8 +995,8 @@ msgstr ""
 #: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
-#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:297
-#: modules/gui/macosx/intf.m:385 modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:408 modules/gui/wxwindows/interface.cpp:352
 #: modules/gui/wxwindows/playlist.cpp:102
 msgid "Playlist"
 msgstr ""
@@ -1039,12 +1039,41 @@ msgstr ""
 msgid "boolean"
 msgstr ""
 
-#: src/video_output/video_output.c:382 modules/gui/beos/VideoOutput.cpp:1138
+#: src/video_output/video_output.c:384 modules/gui/beos/VideoOutput.cpp:1138
 #: modules/gui/macosx/controls.m:342 modules/gui/macosx/controls.m:486
-#: modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/intf.m:393
 msgid "Fullscreen"
 msgstr ""
 
+#: src/video_output/video_output.c:395 modules/gui/gtk/gnome_interface.c:183
+#: modules/gui/gtk/gnome_interface.c:966 modules/gui/gtk/gtk_interface.c:553
+#: modules/gui/gtk/gtk_interface.c:1349 modules/gui/macosx/controls.m:526
+#: modules/gui/macosx/intf.m:401 modules/gui/macosx/intf.m:402
+#: modules/video_filter/deinterlace/deinterlace.c:81
+msgid "Deinterlace"
+msgstr ""
+
+#: src/video_output/video_output.c:399
+msgid "Discard"
+msgstr ""
+
+#: src/video_output/video_output.c:401
+msgid "Blend"
+msgstr ""
+
+#: src/video_output/video_output.c:403
+msgid "Mean"
+msgstr ""
+
+#: src/video_output/video_output.c:405
+msgid "Bob"
+msgstr ""
+
+#: src/video_output/video_output.c:407
+#, fuzzy
+msgid "Linear"
+msgstr "Licence"
+
 #: modules/access/cdda.c:86 modules/access/file.c:69 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
 #: modules/access/v4l/v4l.c:64
@@ -1176,6 +1205,22 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
+#: modules/access_output/dummy.c:56
+msgid "Dummy stream ouput"
+msgstr ""
+
+#: modules/access_output/file.c:58
+msgid "File stream ouput"
+msgstr ""
+
+#: modules/access_output/http.c:54
+msgid "HTTP stream ouput"
+msgstr ""
+
+#: modules/access_output/udp.c:73
+msgid "UDP stream ouput"
+msgstr ""
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr ""
@@ -1260,30 +1305,6 @@ msgstr ""
 msgid "VCD input"
 msgstr ""
 
-#: modules/access/vlcs.c:131 modules/misc/sap.c:131
-msgid "SAP"
-msgstr ""
-
-#: modules/access/vlcs.c:134
-msgid "SAP interface module"
-msgstr ""
-
-#: modules/access_output/dummy.c:56
-msgid "Dummy stream ouput"
-msgstr ""
-
-#: modules/access_output/file.c:58
-msgid "File stream ouput"
-msgstr ""
-
-#: modules/access_output/http.c:54
-msgid "HTTP stream ouput"
-msgstr ""
-
-#: modules/access_output/udp.c:73
-msgid "UDP stream ouput"
-msgstr ""
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr ""
@@ -1433,13 +1454,13 @@ msgstr ""
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:159 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:161 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:371
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:201 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:203 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:387
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1587,23 +1608,146 @@ msgstr ""
 msgid "AAC audio decoder (using libfaad2)"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:154
-msgid "ffmpeg"
+#: modules/codec/ffmpeg/ffmpeg.c:86
+msgid "Direct rendering"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:88
+msgid "Error resilience"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:90
+msgid ""
+"ffmpeg can make errors resiliences.          \n"
+"Nevertheless, with buggy encoder (like ISO MPEG-4 encoder from M$) this will "
+"produce a lot of errors.\n"
+"Valid range is -1 to 99 (-1 disable all errors resiliences)."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:95
+msgid "Workaround bugs"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:97
+msgid ""
+"Try to fix some bugs\n"
+"1  autodetect\n"
+"2  old msmpeg4\n"
+"4  xvid interlaced\n"
+"8  ump4 \n"
+"16 no padding\n"
+"32 ac vlc64 Qpel chroma"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:106
+msgid "Hurry up"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:108
+msgid ""
+"Allow the decoder to partially decode or skip frame(s) when there not enough "
+"time.\n"
+" It's usefull with low CPU power but it could produce broken pictures."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:112
+msgid "Truncated stream"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:113
+msgid "truncated stream -1:auto,0:disable,:1:enable"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:115
+msgid "Post processing quality"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:117
+msgid ""
+"Quality of post processing\n"
+"Valid range is 0 to 6"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:120
+msgid "Ffmpeg postproc filter chains"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:157
-msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgid "Ffmpeg postprocessing module"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:159
+msgid "Auto-level Post processing quality"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:161
+msgid ""
+"Post processing quality is selected upon time left but no more than "
+"requested quality\n"
+"Not yet implemented !"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:165
+msgid "Force vertical luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:166
+msgid "Force vertical luminance deblocking (override other settings)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:168
-msgid "Post processing"
+msgid "Force horizontal luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:169
+msgid "Force horizontal luminance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:171
+msgid "Force vertical chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:172
+msgid "Force vertical chrominance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:174
+msgid "Force horizontal chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:175
+msgid "Force horizontal chrominance deblocking (override other settings)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:177
-msgid "ffmpeg postprocessing module"
+msgid "Force luminance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:178
+msgid "Force luminance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:180
+msgid "Force chrominance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:181
+msgid "Force chrominance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:184
+msgid "ffmpeg"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:187
+msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:195
+msgid "Post processing"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:204
+#: modules/codec/ffmpeg/ffmpeg.c:215
 msgid "ffmpeg chroma conversion"
 msgstr ""
 
@@ -1623,7 +1767,7 @@ msgstr ""
 msgid "flac audio decoder"
 msgstr ""
 
-#: modules/codec/libmpeg2.c:89
+#: modules/codec/libmpeg2.c:90
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr ""
 
@@ -1639,14 +1783,14 @@ msgstr ""
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr ""
 
-#: modules/codec/mpeg_video/idct/idct.c:41
-msgid "IDCT"
-msgstr ""
-
 #: modules/codec/mpeg_video/idct/idctaltivec.c:45
 msgid "AltiVec IDCT"
 msgstr ""
 
+#: modules/codec/mpeg_video/idct/idct.c:41
+msgid "IDCT"
+msgstr ""
+
 #: modules/codec/mpeg_video/idct/idctclassic.c:41
 msgid "classic IDCT"
 msgstr ""
@@ -1659,10 +1803,6 @@ msgstr ""
 msgid "MMX EXT IDCT"
 msgstr ""
 
-#: modules/codec/mpeg_video/motion/motion.c:42
-msgid "motion compensation"
-msgstr ""
-
 #: modules/codec/mpeg_video/motion/motion3dnow.c:44
 msgid "3D Now! motion compensation"
 msgstr ""
@@ -1671,6 +1811,10 @@ msgstr ""
 msgid "AltiVec motion compensation"
 msgstr ""
 
+#: modules/codec/mpeg_video/motion/motion.c:42
+msgid "motion compensation"
+msgstr ""
+
 #: modules/codec/mpeg_video/motion/motionmmx.c:45
 msgid "MMX motion compensation"
 msgstr ""
@@ -1837,20 +1981,20 @@ msgstr ""
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
 #: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
-#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:879
-#: modules/gui/macosx/intf.m:880 modules/gui/macosx/intf.m:881
-#: modules/gui/wxwindows/interface.cpp:810
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:902
+#: modules/gui/macosx/intf.m:903 modules/gui/macosx/intf.m:904
+#: modules/gui/wxwindows/interface.cpp:811
 msgid "Pause"
 msgstr ""
 
 #: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
 #: modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
-#: modules/gui/macosx/intf.m:300 modules/gui/macosx/intf.m:338
-#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:886
-#: modules/gui/macosx/intf.m:887 modules/gui/macosx/intf.m:888
-#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:348
-#: modules/gui/wxwindows/interface.cpp:815
+#: modules/gui/macosx/intf.m:323 modules/gui/macosx/intf.m:361
+#: modules/gui/macosx/intf.m:422 modules/gui/macosx/intf.m:909
+#: modules/gui/macosx/intf.m:910 modules/gui/macosx/intf.m:911
+#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:816
 msgid "Play"
 msgstr ""
 
@@ -1904,8 +2048,8 @@ msgstr ""
 #: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:821
 #: modules/demux/ogg.c:994 modules/gui/gtk/gnome_interface.c:148
 #: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
-#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:360
-#: modules/gui/macosx/intf.m:361
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:384
 msgid "Channels"
 msgstr ""
 
@@ -1929,7 +2073,7 @@ msgstr ""
 #: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:554
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:813 modules/demux/ogg.c:893 modules/demux/ogg.c:986
-#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:130
+#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134
 msgid "Type"
 msgstr ""
 
@@ -2545,7 +2689,7 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:201
 #: modules/gui/beos/InterfaceWindow.cpp:300
 #: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:304 modules/gui/macosx/prefs.m:75
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/prefs.m:75
 #: modules/gui/wxwindows/preferences.cpp:229
 msgid "Preferences"
 msgstr ""
@@ -2554,7 +2698,7 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:298
 #: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
 #: modules/gui/kde/info.cpp:9 modules/gui/kde/messages.cpp:8
-#: modules/gui/macosx/intf.m:310 modules/gui/macosx/intf.m:387
+#: modules/gui/macosx/intf.m:333 modules/gui/macosx/intf.m:410
 #: modules/gui/wxwindows/messages.cpp:79
 msgid "Messages"
 msgstr ""
@@ -2569,16 +2713,16 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
 #: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
 #: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:264
-#: modules/gui/macosx/output.m:121 modules/gui/macosx/output.m:194
-#: modules/gui/macosx/output.m:279 modules/gui/wxwindows/interface.cpp:335
+#: modules/gui/macosx/output.m:125 modules/gui/macosx/output.m:200
+#: modules/gui/macosx/output.m:285 modules/gui/wxwindows/interface.cpp:336
 #: modules/gui/wxwindows/open.cpp:276 modules/gui/wxwindows/streamout.cpp:340
 msgid "File"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:240
 #: modules/gui/beos/PlayListWindow.cpp:84
-#: modules/gui/gtk/gnome_interface.c:2179
-#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332
 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677
 msgid "Open File"
 msgstr ""
@@ -2599,7 +2743,7 @@ msgid "About"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:256 modules/gui/kde/interface.cpp:93
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/intf.m:377
+#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:400
 msgid "Subtitles"
 msgstr ""
 
@@ -2632,8 +2776,8 @@ msgid "Speed"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:286 modules/gui/macosx/controls.m:422
-#: modules/gui/macosx/intf.m:299 modules/gui/macosx/intf.m:341
-#: modules/gui/wxwindows/interface.cpp:357
+#: modules/gui/macosx/intf.m:322 modules/gui/macosx/intf.m:364
+#: modules/gui/wxwindows/interface.cpp:358
 msgid "Slower"
 msgstr ""
 
@@ -2642,12 +2786,12 @@ msgid "Normal"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:290 modules/gui/macosx/controls.m:421
-#: modules/gui/macosx/intf.m:302 modules/gui/macosx/intf.m:340
-#: modules/gui/wxwindows/interface.cpp:359
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/wxwindows/interface.cpp:360
 msgid "Faster"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:381
+#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:404
 msgid "Window"
 msgstr ""
 
@@ -2660,7 +2804,7 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
 #: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
 #: modules/gui/gtk/preferences.c:605 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:117
+#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:121
 #: modules/gui/wxwindows/fileinfo.cpp:96
 #: modules/gui/wxwindows/messages.cpp:102 modules/gui/wxwindows/open.cpp:267
 #: modules/gui/wxwindows/preferences.cpp:250
@@ -2681,16 +2825,16 @@ msgstr ""
 msgid "Drop files to play"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:167
+#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:169
 #: modules/gui/wxwindows/playlist.cpp:154
 msgid "Close"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:330
+#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:353
 msgid "Edit"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:335
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:358
 #: modules/gui/macosx/playlist.m:180
 msgid "Select All"
 msgstr ""
@@ -2740,24 +2884,24 @@ msgstr ""
 #: modules/gui/beos/PreferencesWindow.cpp:44
 #: modules/gui/beos/PreferencesWindow.cpp:46
 #: modules/gui/beos/PreferencesWindow.cpp:98
-#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:607
-#: modules/gui/macosx/prefs.m:615 modules/gui/macosx/prefs.m:685
+#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:690
+#: modules/gui/macosx/prefs.m:698 modules/gui/macosx/prefs.m:768
 msgid "Modules"
 msgstr ""
 
-#: modules/gui/beos/PreferencesWindow.cpp:220
+#: modules/gui/beos/PreferencesWindow.cpp:219
 #: modules/gui/gtk/preferences.c:609
 msgid "Apply"
 msgstr ""
 
-#: modules/gui/beos/PreferencesWindow.cpp:225
+#: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
-#: modules/gui/macosx/output.m:332 modules/gui/macosx/prefs.m:76
+#: modules/gui/macosx/output.m:338 modules/gui/macosx/prefs.m:76
 #: modules/gui/wxwindows/preferences.cpp:254
 msgid "Save"
 msgstr ""
 
-#: modules/gui/beos/PreferencesWindow.cpp:229
+#: modules/gui/beos/PreferencesWindow.cpp:228
 msgid "Defaults"
 msgstr ""
 
@@ -2794,6 +2938,7 @@ msgid "Take Screen Shot"
 msgstr ""
 
 #: modules/gui/beos/VlcWrapper.cpp:185 modules/gui/gtk/menu.c:733
+#: modules/gui/macosx/prefs.m:348
 msgid "None"
 msgstr ""
 
@@ -2819,8 +2964,8 @@ msgstr ""
 msgid "VLC media player"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:652
-#: modules/gui/wxwindows/preferences.cpp:965
+#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:663
+#: modules/gui/wxwindows/preferences.cpp:967
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr ""
@@ -2844,8 +2989,8 @@ msgstr ""
 #: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
 #: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
 #: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:435
-#: modules/gui/macosx/intf.m:301 modules/gui/macosx/intf.m:339
-#: modules/gui/macosx/intf.m:400 modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
+#: modules/gui/macosx/intf.m:423 modules/gui/wxwindows/interface.cpp:347
 msgid "Stop"
 msgstr ""
 
@@ -2876,7 +3021,7 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
 #: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:160
-#: modules/gui/macosx/output.m:124 modules/gui/wxwindows/open.cpp:445
+#: modules/gui/macosx/output.m:128 modules/gui/wxwindows/open.cpp:456
 #: modules/gui/wxwindows/streamout.cpp:380
 msgid "Address"
 msgstr ""
@@ -2886,13 +3031,13 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
 #: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
 #: modules/gui/macosx/open.m:159 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:125 modules/gui/wxwindows/open.cpp:430
-#: modules/gui/wxwindows/open.cpp:453 modules/gui/wxwindows/streamout.cpp:390
+#: modules/gui/macosx/output.m:129 modules/gui/wxwindows/open.cpp:441
+#: modules/gui/wxwindows/open.cpp:464 modules/gui/wxwindows/streamout.cpp:390
 msgid "Port"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:127
-#: modules/gui/macosx/output.m:221 modules/gui/macosx/output.m:289
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:131
+#: modules/gui/macosx/output.m:227 modules/gui/macosx/output.m:295
 #: modules/gui/wxwindows/streamout.cpp:341
 msgid "HTTP"
 msgstr ""
@@ -2971,10 +3116,10 @@ msgid ""
 "from local or network sources."
 msgstr ""
 
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
+#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100
 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
@@ -2984,6 +3129,64 @@ msgstr ""
 msgid "Error loading pixmap file: %s"
 msgstr ""
 
+#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
+msgid "Gtk2 interface"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:31
+msgid "_New"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:87
+msgid "gnome2"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:112
+msgid "button4"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:122
+#: modules/gui/gtk2/gtk2_interface.c:183
+msgid "button3"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337
+msgid "Save File"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:67
+msgid "window1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147
+#: modules/gui/gtk/gtk_interface.c:1373
+msgid "_File"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+msgid "_Edit"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268
+msgid "_View"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569
+msgid "_Help"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:146
+msgid "_About"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:163
+msgid "button1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:173
+msgid "button2"
+msgstr ""
+
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr ""
@@ -3026,7 +3229,7 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:20 modules/gui/gtk/gnome_interface.c:504
 #: modules/gui/gtk/gnome_interface.c:986 modules/gui/gtk/gtk_interface.c:173
 #: modules/gui/gtk/gtk_interface.c:619 modules/gui/gtk/gtk_interface.c:1399
-#: modules/gui/wxwindows/interface.cpp:230
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Open a file"
 msgstr ""
 
@@ -3126,25 +3329,25 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:909
 #: modules/gui/gtk/gtk_interface.c:452 modules/gui/gtk/gtk_interface.c:1253
-#: modules/gui/macosx/intf.m:355
+#: modules/gui/macosx/intf.m:378
 msgid "Volume Up"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:916
 #: modules/gui/gtk/gtk_interface.c:459 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:356
+#: modules/gui/macosx/intf.m:379
 msgid "Volume Down"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:923
 #: modules/gui/gtk/gtk_interface.c:466 modules/gui/gtk/gtk_interface.c:1267
-#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:357
+#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:380
 msgid "Mute"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:155 modules/gui/gtk/gnome_interface.c:938
 #: modules/gui/gtk/gtk_interface.c:488 modules/gui/gtk/gtk_interface.c:1289
-#: modules/gui/macosx/intf.m:362 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:385 modules/gui/macosx/intf.m:386
 msgid "Device"
 msgstr ""
 
@@ -3163,18 +3366,10 @@ msgstr ""
 msgid "_Fullscreen"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:183 modules/gui/gtk/gnome_interface.c:966
-#: modules/gui/gtk/gtk_interface.c:553 modules/gui/gtk/gtk_interface.c:1349
-#: modules/gui/macosx/controls.m:526 modules/gui/macosx/intf.m:378
-#: modules/gui/macosx/intf.m:379
-#: modules/video_filter/deinterlace/deinterlace.c:81
-msgid "Deinterlace"
-msgstr ""
-
 #: modules/gui/gtk/gnome_interface.c:190 modules/gui/gtk/gnome_interface.c:973
 #: modules/gui/gtk/gtk_interface.c:560 modules/gui/gtk/gtk_interface.c:1356
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/intf.m:375
-#: modules/gui/macosx/output.m:120 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/intf.m:397 modules/gui/macosx/intf.m:398
+#: modules/gui/macosx/output.m:124 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr ""
 
@@ -3191,18 +3386,18 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
 #: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2005
 #: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:142
-#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:337
+#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:338
 #: modules/gui/wxwindows/open.cpp:278
 msgid "Disc"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:339
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Net"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:343
 msgid "Sat"
 msgstr ""
 
@@ -3264,7 +3459,7 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1063 modules/gui/gtk/gtk_interface.c:758
 #: modules/gui/gtk/gtk_interface.c:844 modules/gui/gtk/gtk_interface.c:888
 #: modules/gui/gtk/gtk_interface.c:1173
-#: modules/gui/wxwindows/interface.cpp:353
+#: modules/gui/wxwindows/interface.cpp:354
 msgid "Prev"
 msgstr ""
 
@@ -3276,8 +3471,8 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1056 modules/gui/gtk/gtk_interface.c:769
 #: modules/gui/gtk/gtk_interface.c:852 modules/gui/gtk/gtk_interface.c:896
 #: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:443
-#: modules/gui/macosx/intf.m:303 modules/gui/macosx/intf.m:343
-#: modules/gui/macosx/intf.m:401 modules/gui/wxwindows/interface.cpp:355
+#: modules/gui/macosx/intf.m:326 modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:424 modules/gui/wxwindows/interface.cpp:356
 msgid "Next"
 msgstr ""
 
@@ -3373,8 +3568,8 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
 #: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
 #: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:173
-#: modules/gui/macosx/output.m:123 modules/gui/wxwindows/open.cpp:246
-#: modules/gui/wxwindows/open.cpp:343
+#: modules/gui/macosx/output.m:127 modules/gui/wxwindows/open.cpp:246
+#: modules/gui/wxwindows/open.cpp:354
 #: modules/gui/wxwindows/preferences.cpp:778
 #: modules/gui/wxwindows/streamout.cpp:367
 #: modules/gui/wxwindows/subtitles.cpp:107
@@ -3382,24 +3577,24 @@ msgid "Browse..."
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:368
+#: modules/gui/wxwindows/open.cpp:379
 msgid "Disc type"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
 #: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:488
-#: modules/gui/wxwindows/open.cpp:362
+#: modules/gui/wxwindows/open.cpp:373
 msgid "DVD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
 #: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:382
-#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:363
+#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:374
 msgid "VCD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:374
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:385
 msgid "Device name"
 msgstr ""
 
@@ -3410,24 +3605,24 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:547
-#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:409
+#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:420
 msgid "UDP/RTP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
 #: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:548
-#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:421
 msgid "UDP/RTP Multicast"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1727 modules/gui/gtk/gtk_interface.c:2042
 #: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:549
-#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:411
+#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:422
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:467
+#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:478
 msgid "URL"
 msgstr ""
 
@@ -3475,7 +3670,7 @@ msgid "fps"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:116
+#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:120
 #: modules/gui/wxwindows/open.cpp:201 modules/gui/wxwindows/open.cpp:223
 msgid "Settings..."
 msgstr ""
@@ -3552,14 +3747,14 @@ msgid "Destination Target: "
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:128 modules/gui/macosx/output.m:231
-#: modules/gui/macosx/output.m:290 modules/gui/wxwindows/streamout.cpp:342
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/output.m:237
+#: modules/gui/macosx/output.m:296 modules/gui/wxwindows/streamout.cpp:342
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:129 modules/gui/macosx/output.m:241
-#: modules/gui/macosx/output.m:292 modules/gui/wxwindows/streamout.cpp:343
+#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:298 modules/gui/wxwindows/streamout.cpp:343
 msgid "RTP"
 msgstr ""
 
@@ -3580,8 +3775,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:135 modules/gui/macosx/output.m:273
-#: modules/gui/macosx/output.m:319
+#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:279
+#: modules/gui/macosx/output.m:325
 msgid "AVI"
 msgstr ""
 
@@ -3598,11 +3793,6 @@ msgstr ""
 msgid "Gtk+ interface"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
-#: modules/gui/gtk2/gtk2_interface.c:77
-msgid "_File"
-msgstr ""
-
 #: modules/gui/gtk/gtk_interface.c:238
 msgid "_Close"
 msgstr ""
@@ -3619,10 +3809,6 @@ msgstr ""
 msgid "Exit the program"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132
-msgid "_View"
-msgstr ""
-
 #: modules/gui/gtk/gtk_interface.c:294
 msgid "Hide the main interface window"
 msgstr ""
@@ -3643,10 +3829,6 @@ msgstr ""
 msgid "Configure the application"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139
-msgid "_Help"
-msgstr ""
-
 #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435
 msgid "_About..."
 msgstr ""
@@ -3751,51 +3933,6 @@ msgstr ""
 msgid "Selected:"
 msgstr ""
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-msgid "Gtk2 interface"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-msgid "_New"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:87
-msgid "gnome2"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:112
-msgid "button4"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:122
-#: modules/gui/gtk2/gtk2_interface.c:183
-msgid "button3"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:331
-msgid "Save File"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-msgid "window1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-msgid "_Edit"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-msgid "_About"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:163
-msgid "button1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:173
-msgid "button2"
-msgstr ""
-
 #: modules/gui/kde/interface.cpp:88
 msgid "Languages"
 msgstr ""
@@ -3825,216 +3962,216 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:315
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:338
 msgid "About VLC media player"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:344 modules/gui/macosx/controls.m:487
-#: modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:389
 msgid "Half Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:346 modules/gui/macosx/controls.m:488
-#: modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:390
 msgid "Normal Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:348 modules/gui/macosx/controls.m:489
-#: modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/intf.m:391
 msgid "Double Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:491
 #: modules/gui/macosx/controls.m:498 modules/gui/macosx/controls.m:520
-#: modules/gui/macosx/intf.m:371
+#: modules/gui/macosx/intf.m:394
 msgid "Float On Top"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:490
-#: modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/intf.m:392
 msgid "Fit To Screen"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:298
-#: modules/gui/macosx/intf.m:342 modules/gui/macosx/intf.m:402
+#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:321
+#: modules/gui/macosx/intf.m:365 modules/gui/macosx/intf.m:425
 msgid "Previous"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:344
+#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:367
 msgid "Loop"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:345
+#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:368
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:346
+#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:369
 msgid "Step Backward"
 msgstr ""
 
-#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:386
-#: modules/gui/macosx/intf.m:411
+#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:434
 msgid "Info"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:293
+#: modules/gui/macosx/intf.m:316
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:305
+#: modules/gui/macosx/intf.m:328
 msgid "Volume"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:306
+#: modules/gui/macosx/intf.m:329
 msgid "Position"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:312
+#: modules/gui/macosx/intf.m:335
 msgid "Open CrashLog"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:316
+#: modules/gui/macosx/intf.m:339
 msgid "Preferences..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:317
+#: modules/gui/macosx/intf.m:340
 msgid "Hide VLC"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:318
+#: modules/gui/macosx/intf.m:341
 msgid "Hide Others"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:319
+#: modules/gui/macosx/intf.m:342
 msgid "Show All"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:343
 msgid "Quit VLC"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/intf.m:345
 msgid "1:File"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:346
 msgid "Open..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:324
+#: modules/gui/macosx/intf.m:347
 msgid "Open File..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:325
+#: modules/gui/macosx/intf.m:348
 msgid "Open Disc..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:349
 msgid "Open Network..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:327
+#: modules/gui/macosx/intf.m:350
 msgid "Open Recent"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/intf.m:1291
+#: modules/gui/macosx/intf.m:351 modules/gui/macosx/intf.m:1314
 msgid "Clear Menu"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:331
+#: modules/gui/macosx/intf.m:354
 msgid "Cut"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:332
+#: modules/gui/macosx/intf.m:355
 msgid "Copy"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:333
+#: modules/gui/macosx/intf.m:356
 msgid "Paste"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:334
+#: modules/gui/macosx/intf.m:357
 msgid "Clear"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:337
+#: modules/gui/macosx/intf.m:360
 msgid "Controls"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:358 modules/gui/macosx/intf.m:359
+#: modules/gui/macosx/intf.m:381 modules/gui/macosx/intf.m:382
 msgid "Audio Track"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:372 modules/gui/macosx/intf.m:373
+#: modules/gui/macosx/intf.m:395 modules/gui/macosx/intf.m:396
 msgid "Video Track"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:382
+#: modules/gui/macosx/intf.m:405
 msgid "Minimize Window"
 msgstr "Minimise Window"
 
-#: modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:406
 msgid "Close Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:384
+#: modules/gui/macosx/intf.m:407
 msgid "Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:389
+#: modules/gui/macosx/intf.m:412
 msgid "Bring All to Front"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:391
+#: modules/gui/macosx/intf.m:414
 msgid "Help"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:392
+#: modules/gui/macosx/intf.m:415
 msgid "ReadMe..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:393
+#: modules/gui/macosx/intf.m:416
 msgid "Online Documentation"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/intf.m:417
 msgid "Report a Bug"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/intf.m:418
 msgid "VideoLAN Website"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:396
+#: modules/gui/macosx/intf.m:419
 msgid "License"
 msgstr "Licence"
 
-#: modules/gui/macosx/intf.m:405
+#: modules/gui/macosx/intf.m:428
 msgid "Error"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:406
+#: modules/gui/macosx/intf.m:429
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:407
+#: modules/gui/macosx/intf.m:430
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:408
+#: modules/gui/macosx/intf.m:431
 msgid "Open Messages Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:432
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4109,60 +4246,54 @@ msgstr ""
 msgid "Open VIDEO_TS Directory"
 msgstr ""
 
-#: modules/gui/macosx/output.m:115
+#: modules/gui/macosx/output.m:119
 msgid "Advanced output:"
 msgstr ""
 
-#: modules/gui/macosx/output.m:119
+#: modules/gui/macosx/output.m:123
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:122 modules/gui/macosx/output.m:210
-#: modules/gui/macosx/output.m:285
+#: modules/gui/macosx/output.m:126 modules/gui/macosx/output.m:216
+#: modules/gui/macosx/output.m:291
 msgid "Stream"
 msgstr ""
 
-#: modules/gui/macosx/output.m:126
+#: modules/gui/macosx/output.m:130
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132 modules/gui/wxwindows/streamout.cpp:437
+#: modules/gui/macosx/output.m:136 modules/gui/wxwindows/streamout.cpp:437
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:133
+#: modules/gui/macosx/output.m:137
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:134 modules/gui/macosx/output.m:275
-#: modules/gui/macosx/output.m:317
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:281
+#: modules/gui/macosx/output.m:323
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:274
-#: modules/gui/macosx/output.m:321
+#: modules/gui/macosx/output.m:140 modules/gui/macosx/output.m:280
+#: modules/gui/macosx/output.m:327
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:276
-#: modules/gui/macosx/output.m:323
+#: modules/gui/macosx/output.m:141 modules/gui/macosx/output.m:282
+#: modules/gui/macosx/output.m:329
 msgid "mp4"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139
+#: modules/gui/macosx/output.m:143
 msgid "Transcode options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:149 modules/gui/macosx/output.m:153
-msgid "Bitrate (bps)"
-msgstr ""
-
-#: modules/gui/macosx/output.m:151
-msgid "mpga"
-msgstr ""
-
-#: modules/gui/macosx/output.m:152
-msgid "a52 "
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:158
+#: modules/gui/wxwindows/streamout.cpp:512
+#: modules/gui/wxwindows/streamout.cpp:549
+msgid "Bitrate (kb/s)"
 msgstr ""
 
 #: modules/gui/macosx/prefs.m:78 modules/gui/wxwindows/preferences.cpp:256
@@ -4173,11 +4304,6 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:143 modules/gui/macosx/prefs.m:341
-#: modules/gui/macosx/prefs.m:368
-msgid "Auto"
-msgstr ""
-
 #: modules/gui/ncurses/ncurses.c:66
 msgid "ncurses interface"
 msgstr ""
@@ -4190,32 +4316,32 @@ msgstr ""
 msgid "Qt interface"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:251
-#: modules/gui/skins/src/vlcproc.cpp:338
+#: modules/gui/skins/src/skin_main.cpp:239
+#: modules/gui/skins/src/vlcproc.cpp:339
 msgid "Open a skin file"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:292
-#: modules/gui/skins/src/skin_main.cpp:293
+#: modules/gui/skins/src/skin_main.cpp:280
+#: modules/gui/skins/src/skin_main.cpp:281
 msgid "Last skin actually used"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:294
-#: modules/gui/skins/src/skin_main.cpp:295
+#: modules/gui/skins/src/skin_main.cpp:282
+#: modules/gui/skins/src/skin_main.cpp:283
 msgid "Config of last used skin"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:296
-#: modules/gui/skins/src/skin_main.cpp:297
+#: modules/gui/skins/src/skin_main.cpp:284
+#: modules/gui/skins/src/skin_main.cpp:285
 msgid "Show application in system tray"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:298
-#: modules/gui/skins/src/skin_main.cpp:299
+#: modules/gui/skins/src/skin_main.cpp:286
+#: modules/gui/skins/src/skin_main.cpp:287
 msgid "Show application in taskbar"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:310
+#: modules/gui/skins/src/skin_main.cpp:298
 msgid "Skinnable Interface"
 msgstr ""
 
@@ -4223,164 +4349,164 @@ msgstr ""
 msgid "FileInfo"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:231
+#: modules/gui/wxwindows/interface.cpp:232
 msgid "Open a DVD or (S)VCD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:232
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Open a network stream"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:233
+#: modules/gui/wxwindows/interface.cpp:234
 msgid "Open a satellite stream"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:234
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:235
+#: modules/gui/wxwindows/interface.cpp:236
 msgid "Exit this program"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:237
+#: modules/gui/wxwindows/interface.cpp:238
 msgid "Open the playlist"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:238
+#: modules/gui/wxwindows/interface.cpp:239
 msgid "Show the program logs"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:239
+#: modules/gui/wxwindows/interface.cpp:240
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:241
+#: modules/gui/wxwindows/interface.cpp:242
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:243
+#: modules/gui/wxwindows/interface.cpp:244
 msgid "About this program"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:247
+#: modules/gui/wxwindows/interface.cpp:248
 msgid "&Open File..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:249
+#: modules/gui/wxwindows/interface.cpp:250
 msgid "Open &Disc..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:251
+#: modules/gui/wxwindows/interface.cpp:252
 msgid "&Network Stream..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:254
+#: modules/gui/wxwindows/interface.cpp:255
 msgid "&Satellite Stream..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:260
 msgid "&Eject Disc"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:264
 msgid "E&xit"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:267
+#: modules/gui/wxwindows/interface.cpp:268
 msgid "&Playlist..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:269
-msgid "&Logs..."
+#: modules/gui/wxwindows/interface.cpp:270
+msgid "&Messages..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:270
+#: modules/gui/wxwindows/interface.cpp:271
 msgid "&File info..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:275
+#: modules/gui/wxwindows/interface.cpp:276
 msgid "&Preferences..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:292
+#: modules/gui/wxwindows/interface.cpp:293
 msgid "&About..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:297
 msgid "&File"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:298
 msgid "&View"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:298
+#: modules/gui/wxwindows/interface.cpp:299
 msgid "&Settings"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:299
-#: modules/gui/wxwindows/interface.cpp:476
-#: modules/gui/wxwindows/interface.cpp:524
+#: modules/gui/wxwindows/interface.cpp:300
+#: modules/gui/wxwindows/interface.cpp:478
+#: modules/gui/wxwindows/interface.cpp:526
 msgid "&Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:300
-#: modules/gui/wxwindows/interface.cpp:495
-#: modules/gui/wxwindows/interface.cpp:528
+#: modules/gui/wxwindows/interface.cpp:301
+#: modules/gui/wxwindows/interface.cpp:497
+#: modules/gui/wxwindows/interface.cpp:530
 msgid "&Video"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:301
-#: modules/gui/wxwindows/interface.cpp:514
-#: modules/gui/wxwindows/interface.cpp:532
+#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:516
+#: modules/gui/wxwindows/interface.cpp:534
 msgid "&Navigation"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:303
 msgid "&Help"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:318
+#: modules/gui/wxwindows/interface.cpp:319
 msgid "Stop current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:320
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:320
+#: modules/gui/wxwindows/interface.cpp:321
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:321
+#: modules/gui/wxwindows/interface.cpp:322
 #: modules/gui/wxwindows/playlist.cpp:351
 msgid "Open playlist"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:322
+#: modules/gui/wxwindows/interface.cpp:323
 msgid "Previous playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:324
 msgid "Next playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:325
 msgid "Play slower"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:326
 msgid "Play faster"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:560
+#: modules/gui/wxwindows/interface.cpp:561
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:561
+#: modules/gui/wxwindows/interface.cpp:562
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
@@ -4388,20 +4514,20 @@ msgstr ""
 "© 1996-2003 the VideoLAN team\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:562
+#: modules/gui/wxwindows/interface.cpp:563
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:564
+#: modules/gui/wxwindows/interface.cpp:565
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
 "It can play MPEG and MPEG2 files from a file or from a network source."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:568
+#: modules/gui/wxwindows/interface.cpp:569
 #, c-format
 msgid "About %s"
 msgstr ""
@@ -4414,11 +4540,11 @@ msgstr ""
 msgid "Video menu"
 msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:139
+#: modules/gui/wxwindows/menus.cpp:141
 msgid "Input menu"
 msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:329
+#: modules/gui/wxwindows/menus.cpp:334
 msgid "Empty"
 msgstr ""
 
@@ -4453,15 +4579,15 @@ msgstr ""
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:361
+#: modules/gui/wxwindows/open.cpp:372
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:364
+#: modules/gui/wxwindows/open.cpp:375
 msgid "CD Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:837 modules/gui/wxwindows/streamout.cpp:640
+#: modules/gui/wxwindows/open.cpp:848 modules/gui/wxwindows/streamout.cpp:640
 msgid "Save file"
 msgstr ""
 
@@ -4528,7 +4654,7 @@ msgid "No configuration options available"
 msgstr ""
 
 #: modules/gui/wxwindows/preferences.cpp:865
-msgid "Advanced..."
+msgid "Advanced options"
 msgstr ""
 
 #: modules/gui/wxwindows/streamout.cpp:166
@@ -4566,11 +4692,6 @@ msgstr ""
 msgid "Video codec"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:512
-#: modules/gui/wxwindows/streamout.cpp:549
-msgid "Bitrate (kb/s)"
-msgstr ""
-
 #: modules/gui/wxwindows/streamout.cpp:543
 msgid "Audio codec"
 msgstr ""
@@ -4685,6 +4806,10 @@ msgstr ""
 msgid "Using the logger interface plugin..."
 msgstr ""
 
+#: modules/misc/memcpy/memcpyaltivec.c:52
+msgid "AltiVec memcpy"
+msgstr ""
+
 #: modules/misc/memcpy/memcpy.c:81
 msgid "libc memcpy"
 msgstr ""
@@ -4701,10 +4826,6 @@ msgstr ""
 msgid "MMX EXT memcpy"
 msgstr ""
 
-#: modules/misc/memcpy/memcpyaltivec.c:52
-msgid "AltiVec memcpy"
-msgstr ""
-
 #: modules/misc/network/ipv4.c:85
 msgid "IPv4 network abstraction layer"
 msgstr ""
@@ -4717,6 +4838,10 @@ msgstr ""
 msgid "Qt Embedded GUI helper"
 msgstr ""
 
+#: modules/misc/sap.c:131
+msgid "SAP"
+msgstr ""
+
 #: modules/misc/sap.c:134
 msgid "SAP interface"
 msgstr ""
@@ -4838,7 +4963,7 @@ msgid "Set image contrast"
 msgstr ""
 
 #: modules/video_filter/adjust.c:61
-msgid "Set the image contrast. Defaults to 1"
+msgid "Set the image contrast, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:62
@@ -4854,7 +4979,7 @@ msgid "Set image saturation"
 msgstr ""
 
 #: modules/video_filter/adjust.c:65
-msgid "Set the image saturation. Defaults to 1"
+msgid "Set the image saturation, between 0 and 3. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:66
@@ -4862,7 +4987,7 @@ msgid "Set image brightness"
 msgstr ""
 
 #: modules/video_filter/adjust.c:67
-msgid "Set the image brightness. Defaults to 1"
+msgid "Set the image brightness, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:71
@@ -4902,7 +5027,9 @@ msgid "Crop geometry"
 msgstr ""
 
 #: modules/video_filter/crop.c:55
-msgid "Set the geometry of the zone to crop"
+msgid ""
+"Set the geometry of the zone to crop. This is set as width x heigth + left "
+"offset + top offset."
 msgstr ""
 
 #: modules/video_filter/crop.c:57
@@ -5171,11 +5298,21 @@ msgstr ""
 msgid "Use shared memory to communicate between VLC and the X server."
 msgstr ""
 
-#: modules/video_output/x11/x11.c:62
+#: modules/video_output/x11/x11.c:61 modules/video_output/x11/xvideo.c:72
+msgid "choose the screen to be used for fullscreen mode."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:63 modules/video_output/x11/xvideo.c:74
+msgid ""
+"Choose the screen you want to use in fullscreen mode. For instance set it to "
+"0 for first screen, 1 for the second."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:67
 msgid "X11"
 msgstr ""
 
-#: modules/video_output/x11/x11.c:68
+#: modules/video_output/x11/x11.c:76
 msgid "X11 video output"
 msgstr ""
 
@@ -5199,11 +5336,11 @@ msgid ""
 "to improve performances by using the most efficient one."
 msgstr ""
 
-#: modules/video_output/x11/xvideo.c:73
+#: modules/video_output/x11/xvideo.c:78
 msgid "XVideo"
 msgstr ""
 
-#: modules/video_output/x11/xvideo.c:81
+#: modules/video_output/x11/xvideo.c:90
 msgid "XVideo extension video output"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index a0da2eeaae..89b554d8fb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-05-24 14:40+0200\n"
+"POT-Creation-Date: 2003-05-27 23:43+0200\n"
 "PO-Revision-Date: 2001-12-10 13:32+0100\n"
 "Last-Translator: Jean-Pierre Kuypers <Kuypers@sri.ucl.ac.be>\n"
 "Language-Team: \n"
@@ -31,7 +31,7 @@ msgid "Audio channels"
 msgstr "Sélectionner la piste audio"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:165 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:358
 msgid "Stereo"
@@ -119,7 +119,7 @@ msgstr "Liste de lecture"
 
 #: src/input/input_programs.c:94 modules/gui/gtk/gnome_interface.c:1078
 #: modules/gui/gtk/gtk_interface.c:1199 modules/gui/kde/interface.cpp:142
-#: modules/gui/macosx/intf.m:347 modules/gui/macosx/intf.m:348
+#: modules/gui/macosx/intf.m:370 modules/gui/macosx/intf.m:371
 msgid "Program"
 msgstr "Programme"
 
@@ -127,18 +127,18 @@ msgstr "Programme"
 #: modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
-#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:349
-#: modules/gui/macosx/intf.m:350 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:382
+#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:372
+#: modules/gui/macosx/intf.m:373 modules/gui/macosx/open.m:149
+#: modules/gui/wxwindows/open.cpp:393
 msgid "Title"
 msgstr "Titre"
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
 #: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
-#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:351
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:388
+#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:374
+#: modules/gui/macosx/intf.m:375 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:399
 msgid "Chapter"
 msgstr "Chapitre"
 
@@ -191,7 +191,7 @@ msgstr "Chapitre"
 msgid "Previous Chapter"
 msgstr "Chapitre"
 
-#: src/input/input_programs.c:668
+#: src/input/input_programs.c:668 src/video_output/video_output.c:397
 msgid "Disable"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "C"
 msgstr "fr"
 
-#: src/libvlc.c:301 src/libvlc.c:1357
+#: src/libvlc.c:301 src/libvlc.c:1364
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
@@ -213,27 +213,27 @@ msgstr ""
 "Utilisation: %s [options] [fichier]...\n"
 "\n"
 
-#: src/libvlc.c:1189 src/misc/configuration.c:961
+#: src/libvlc.c:1196 src/misc/configuration.c:961
 msgid "string"
 msgstr "chaîne"
 
-#: src/libvlc.c:1206 src/misc/configuration.c:946
+#: src/libvlc.c:1213 src/misc/configuration.c:946
 msgid "integer"
 msgstr "entier"
 
-#: src/libvlc.c:1209 src/misc/configuration.c:953
+#: src/libvlc.c:1216 src/misc/configuration.c:953
 msgid "float"
 msgstr "flottant"
 
-#: src/libvlc.c:1215
+#: src/libvlc.c:1222
 msgid " (default enabled)"
 msgstr " (activé par défaut)"
 
-#: src/libvlc.c:1216
+#: src/libvlc.c:1223
 msgid " (default disabled)"
 msgstr " (désactivé par défaut)"
 
-#: src/libvlc.c:1332 src/libvlc.c:1387 src/libvlc.c:1411
+#: src/libvlc.c:1339 src/libvlc.c:1394 src/libvlc.c:1418
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
@@ -241,11 +241,11 @@ msgstr ""
 "\n"
 "Appuyez sur <Entrée> pour continuer...\n"
 
-#: src/libvlc.c:1360
+#: src/libvlc.c:1367
 msgid "[module]              [description]\n"
 msgstr "[module]              [description]\n"
 
-#: src/libvlc.c:1405
+#: src/libvlc.c:1412
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -1158,15 +1158,15 @@ msgstr "Interface"
 #: modules/demux/ogg.c:554 modules/demux/ogg.c:813 modules/demux/ogg.c:986
 #: modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m:354 modules/gui/macosx/output.m:150
+#: modules/gui/macosx/intf.m:377 modules/gui/macosx/output.m:155
 msgid "Audio"
 msgstr "Audio"
 
 #: src/libvlc.h:473 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:893 modules/gui/gtk/gnome_interface.c:1099
-#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:365
-#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:140
+#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:388
+#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:144
 #: modules/misc/dummy/dummy.c:83 modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "Vidéo"
@@ -1197,8 +1197,8 @@ msgstr "Processeur"
 #: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
-#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:297
-#: modules/gui/macosx/intf.m:385 modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:408 modules/gui/wxwindows/interface.cpp:352
 #: modules/gui/wxwindows/playlist.cpp:102
 msgid "Playlist"
 msgstr "Liste de lecture"
@@ -1241,12 +1241,43 @@ msgstr "afficher le nom et la version du logiciel"
 msgid "boolean"
 msgstr "booléen"
 
-#: src/video_output/video_output.c:382 modules/gui/beos/VideoOutput.cpp:1138
+#: src/video_output/video_output.c:384 modules/gui/beos/VideoOutput.cpp:1138
 #: modules/gui/macosx/controls.m:342 modules/gui/macosx/controls.m:486
-#: modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/intf.m:393
 msgid "Fullscreen"
 msgstr "Plein écran"
 
+#: src/video_output/video_output.c:395 modules/gui/gtk/gnome_interface.c:183
+#: modules/gui/gtk/gnome_interface.c:966 modules/gui/gtk/gtk_interface.c:553
+#: modules/gui/gtk/gtk_interface.c:1349 modules/gui/macosx/controls.m:526
+#: modules/gui/macosx/intf.m:401 modules/gui/macosx/intf.m:402
+#: modules/video_filter/deinterlace/deinterlace.c:81
+msgid "Deinterlace"
+msgstr "Désentrelacer"
+
+#: src/video_output/video_output.c:399
+#, fuzzy
+msgid "Discard"
+msgstr "Disque"
+
+#: src/video_output/video_output.c:401
+msgid "Blend"
+msgstr ""
+
+#: src/video_output/video_output.c:403
+#, fuzzy
+msgid "Mean"
+msgstr "Verticale"
+
+#: src/video_output/video_output.c:405
+msgid "Bob"
+msgstr ""
+
+#: src/video_output/video_output.c:407
+#, fuzzy
+msgid "Linear"
+msgstr "entier"
+
 #: modules/access/cdda.c:86 modules/access/file.c:69 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
 #: modules/access/v4l/v4l.c:64
@@ -1397,6 +1428,22 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr "lecture Microsoft Media Server (MMS)"
 
+#: modules/access_output/dummy.c:56
+msgid "Dummy stream ouput"
+msgstr "Flux de sortie muet"
+
+#: modules/access_output/file.c:58
+msgid "File stream ouput"
+msgstr "Sortie vers un fichier"
+
+#: modules/access_output/http.c:54
+msgid "HTTP stream ouput"
+msgstr "Flux de sortie HTTP"
+
+#: modules/access_output/udp.c:73
+msgid "UDP stream ouput"
+msgstr "Flux de sortie UDP"
+
 #: modules/access/satellite/satellite.c:41
 #, fuzzy
 msgid "Satellite default transponder frequency"
@@ -1494,30 +1541,6 @@ msgstr "lecture Video4Linux"
 msgid "VCD input"
 msgstr "lecture VCD"
 
-#: modules/access/vlcs.c:131 modules/misc/sap.c:131
-msgid "SAP"
-msgstr ""
-
-#: modules/access/vlcs.c:134
-msgid "SAP interface module"
-msgstr "Module d'interface SAP"
-
-#: modules/access_output/dummy.c:56
-msgid "Dummy stream ouput"
-msgstr "Flux de sortie muet"
-
-#: modules/access_output/file.c:58
-msgid "File stream ouput"
-msgstr "Sortie vers un fichier"
-
-#: modules/access_output/http.c:54
-msgid "HTTP stream ouput"
-msgstr "Flux de sortie HTTP"
-
-#: modules/access_output/udp.c:73
-msgid "UDP stream ouput"
-msgstr "Flux de sortie UDP"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 #, fuzzy
 msgid "Characteristic dimension"
@@ -1670,13 +1693,13 @@ msgstr "sortie audio ALSA"
 msgid "Audio device"
 msgstr "Périphérique audio"
 
-#: modules/audio_output/alsa.c:159 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:161 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:371
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:201 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:203 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:387
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1828,23 +1851,150 @@ msgstr "d
 msgid "AAC audio decoder (using libfaad2)"
 msgstr "décodeur audio AAC (utilisant libfaad2)"
 
-#: modules/codec/ffmpeg/ffmpeg.c:154
-msgid "ffmpeg"
+#: modules/codec/ffmpeg/ffmpeg.c:86
+msgid "Direct rendering"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:88
+msgid "Error resilience"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:90
+msgid ""
+"ffmpeg can make errors resiliences.          \n"
+"Nevertheless, with buggy encoder (like ISO MPEG-4 encoder from M$) this will "
+"produce a lot of errors.\n"
+"Valid range is -1 to 99 (-1 disable all errors resiliences)."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:95
+msgid "Workaround bugs"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:97
+msgid ""
+"Try to fix some bugs\n"
+"1  autodetect\n"
+"2  old msmpeg4\n"
+"4  xvid interlaced\n"
+"8  ump4 \n"
+"16 no padding\n"
+"32 ac vlc64 Qpel chroma"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:106
+msgid "Hurry up"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:108
+msgid ""
+"Allow the decoder to partially decode or skip frame(s) when there not enough "
+"time.\n"
+" It's usefull with low CPU power but it could produce broken pictures."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:112
+#, fuzzy
+msgid "Truncated stream"
+msgstr "Jouer le flux"
+
+#: modules/codec/ffmpeg/ffmpeg.c:113
+msgid "truncated stream -1:auto,0:disable,:1:enable"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:115
+#, fuzzy
+msgid "Post processing quality"
+msgstr "Post-traitement"
+
+#: modules/codec/ffmpeg/ffmpeg.c:117
+msgid ""
+"Quality of post processing\n"
+"Valid range is 0 to 6"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:120
+msgid "Ffmpeg postproc filter chains"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:157
+#, fuzzy
+msgid "Ffmpeg postprocessing module"
+msgstr "module de post-traitement ffmpeg"
+
+#: modules/codec/ffmpeg/ffmpeg.c:159
+#, fuzzy
+msgid "Auto-level Post processing quality"
+msgstr "Post-traitement"
+
+#: modules/codec/ffmpeg/ffmpeg.c:161
+msgid ""
+"Post processing quality is selected upon time left but no more than "
+"requested quality\n"
+"Not yet implemented !"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:165
+msgid "Force vertical luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:166
+msgid "Force vertical luminance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:168
+msgid "Force horizontal luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:169
+msgid "Force horizontal luminance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:171
+msgid "Force vertical chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:172
+msgid "Force vertical chrominance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:174
+msgid "Force horizontal chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:175
+msgid "Force horizontal chrominance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:177
+msgid "Force luminance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:178
+msgid "Force luminance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:180
+msgid "Force chrominance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:181
+msgid "Force chrominance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:184
+msgid "ffmpeg"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:187
 msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 msgstr "décodeur audio/vidéo ffmpeg ((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 
-#: modules/codec/ffmpeg/ffmpeg.c:168
+#: modules/codec/ffmpeg/ffmpeg.c:195
 msgid "Post processing"
 msgstr "Post-traitement"
 
-#: modules/codec/ffmpeg/ffmpeg.c:177
-msgid "ffmpeg postprocessing module"
-msgstr "module de post-traitement ffmpeg"
-
-#: modules/codec/ffmpeg/ffmpeg.c:204
+#: modules/codec/ffmpeg/ffmpeg.c:215
 msgid "ffmpeg chroma conversion"
 msgstr ""
 
@@ -1864,7 +2014,7 @@ msgstr "Module de post-traitement optimis
 msgid "flac audio decoder"
 msgstr "décodeur audio flac"
 
-#: modules/codec/libmpeg2.c:89
+#: modules/codec/libmpeg2.c:90
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr "décodeur vidéo MPEG I/II (utilisant libmpeg2)"
 
@@ -1881,14 +2031,14 @@ msgstr "parser MPEG audio couches I/II/III"
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr "décodeur vidéo MPEG I/II"
 
-#: modules/codec/mpeg_video/idct/idct.c:41
-msgid "IDCT"
-msgstr ""
-
 #: modules/codec/mpeg_video/idct/idctaltivec.c:45
 msgid "AltiVec IDCT"
 msgstr "IDCT optimisé AltiVec"
 
+#: modules/codec/mpeg_video/idct/idct.c:41
+msgid "IDCT"
+msgstr ""
+
 #: modules/codec/mpeg_video/idct/idctclassic.c:41
 msgid "classic IDCT"
 msgstr "IDCT classique"
@@ -1901,10 +2051,6 @@ msgstr "IDCT optimis
 msgid "MMX EXT IDCT"
 msgstr "IDCT optimisé MMX EXT"
 
-#: modules/codec/mpeg_video/motion/motion.c:42
-msgid "motion compensation"
-msgstr "compensation de mouvement"
-
 #: modules/codec/mpeg_video/motion/motion3dnow.c:44
 msgid "3D Now! motion compensation"
 msgstr "compensation de mouvement optimisé 3D Now!"
@@ -1913,6 +2059,10 @@ msgstr "compensation de mouvement optimis
 msgid "AltiVec motion compensation"
 msgstr "compensation de mouvement optimisé AltiVec"
 
+#: modules/codec/mpeg_video/motion/motion.c:42
+msgid "motion compensation"
+msgstr "compensation de mouvement"
+
 #: modules/codec/mpeg_video/motion/motionmmx.c:45
 msgid "MMX motion compensation"
 msgstr "compensation de mouvement optimisé MMX"
@@ -2090,20 +2240,20 @@ msgstr "Quitter VLC"
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
 #: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
-#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:879
-#: modules/gui/macosx/intf.m:880 modules/gui/macosx/intf.m:881
-#: modules/gui/wxwindows/interface.cpp:810
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:902
+#: modules/gui/macosx/intf.m:903 modules/gui/macosx/intf.m:904
+#: modules/gui/wxwindows/interface.cpp:811
 msgid "Pause"
 msgstr "Suspendre"
 
 #: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
 #: modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
-#: modules/gui/macosx/intf.m:300 modules/gui/macosx/intf.m:338
-#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:886
-#: modules/gui/macosx/intf.m:887 modules/gui/macosx/intf.m:888
-#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:348
-#: modules/gui/wxwindows/interface.cpp:815
+#: modules/gui/macosx/intf.m:323 modules/gui/macosx/intf.m:361
+#: modules/gui/macosx/intf.m:422 modules/gui/macosx/intf.m:909
+#: modules/gui/macosx/intf.m:910 modules/gui/macosx/intf.m:911
+#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:816
 msgid "Play"
 msgstr "Lire"
 
@@ -2158,8 +2308,8 @@ msgstr ""
 #: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:821
 #: modules/demux/ogg.c:994 modules/gui/gtk/gnome_interface.c:148
 #: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
-#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:360
-#: modules/gui/macosx/intf.m:361
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:384
 msgid "Channels"
 msgstr "Canaux"
 
@@ -2183,7 +2333,7 @@ msgstr "Nombre de flux"
 #: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:554
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:813 modules/demux/ogg.c:893 modules/demux/ogg.c:986
-#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:130
+#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134
 msgid "Type"
 msgstr ""
 
@@ -2831,7 +2981,7 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:201
 #: modules/gui/beos/InterfaceWindow.cpp:300
 #: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:304 modules/gui/macosx/prefs.m:75
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/prefs.m:75
 #: modules/gui/wxwindows/preferences.cpp:229
 msgid "Preferences"
 msgstr "Préférences"
@@ -2840,7 +2990,7 @@ msgstr "Pr
 #: modules/gui/beos/InterfaceWindow.cpp:298
 #: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
 #: modules/gui/kde/info.cpp:9 modules/gui/kde/messages.cpp:8
-#: modules/gui/macosx/intf.m:310 modules/gui/macosx/intf.m:387
+#: modules/gui/macosx/intf.m:333 modules/gui/macosx/intf.m:410
 #: modules/gui/wxwindows/messages.cpp:79
 msgid "Messages"
 msgstr "Messages"
@@ -2855,16 +3005,16 @@ msgstr "Messages"
 #: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
 #: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
 #: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:264
-#: modules/gui/macosx/output.m:121 modules/gui/macosx/output.m:194
-#: modules/gui/macosx/output.m:279 modules/gui/wxwindows/interface.cpp:335
+#: modules/gui/macosx/output.m:125 modules/gui/macosx/output.m:200
+#: modules/gui/macosx/output.m:285 modules/gui/wxwindows/interface.cpp:336
 #: modules/gui/wxwindows/open.cpp:276 modules/gui/wxwindows/streamout.cpp:340
 msgid "File"
 msgstr "Fichier"
 
 #: modules/gui/beos/InterfaceWindow.cpp:240
 #: modules/gui/beos/PlayListWindow.cpp:84
-#: modules/gui/gtk/gnome_interface.c:2179
-#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332
 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677
 msgid "Open File"
 msgstr "Ouvrir un fichier"
@@ -2886,7 +3036,7 @@ msgid "About"
 msgstr "À propos"
 
 #: modules/gui/beos/InterfaceWindow.cpp:256 modules/gui/kde/interface.cpp:93
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/intf.m:377
+#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:400
 msgid "Subtitles"
 msgstr "Sous-titres"
 
@@ -2925,8 +3075,8 @@ msgid "Speed"
 msgstr "Sélectionné"
 
 #: modules/gui/beos/InterfaceWindow.cpp:286 modules/gui/macosx/controls.m:422
-#: modules/gui/macosx/intf.m:299 modules/gui/macosx/intf.m:341
-#: modules/gui/wxwindows/interface.cpp:357
+#: modules/gui/macosx/intf.m:322 modules/gui/macosx/intf.m:364
+#: modules/gui/wxwindows/interface.cpp:358
 msgid "Slower"
 msgstr "Ralentir"
 
@@ -2936,12 +3086,12 @@ msgid "Normal"
 msgstr "Taille 100 %"
 
 #: modules/gui/beos/InterfaceWindow.cpp:290 modules/gui/macosx/controls.m:421
-#: modules/gui/macosx/intf.m:302 modules/gui/macosx/intf.m:340
-#: modules/gui/wxwindows/interface.cpp:359
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/wxwindows/interface.cpp:360
 msgid "Faster"
 msgstr "Accélérer"
 
-#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:381
+#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:404
 msgid "Window"
 msgstr "Fenêtre"
 
@@ -2955,7 +3105,7 @@ msgstr "Liste de lecture"
 #: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
 #: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
 #: modules/gui/gtk/preferences.c:605 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:117
+#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:121
 #: modules/gui/wxwindows/fileinfo.cpp:96
 #: modules/gui/wxwindows/messages.cpp:102 modules/gui/wxwindows/open.cpp:267
 #: modules/gui/wxwindows/preferences.cpp:250
@@ -2980,16 +3130,16 @@ msgstr "Ouvrir un fichier de sous-titres"
 msgid "Drop files to play"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:167
+#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:169
 #: modules/gui/wxwindows/playlist.cpp:154
 msgid "Close"
 msgstr "Fermer"
 
-#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:330
+#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:353
 msgid "Edit"
 msgstr "Édition"
 
-#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:335
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:358
 #: modules/gui/macosx/playlist.m:180
 msgid "Select All"
 msgstr "Tout sélectionner"
@@ -3042,24 +3192,24 @@ msgstr "Nom"
 #: modules/gui/beos/PreferencesWindow.cpp:44
 #: modules/gui/beos/PreferencesWindow.cpp:46
 #: modules/gui/beos/PreferencesWindow.cpp:98
-#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:607
-#: modules/gui/macosx/prefs.m:615 modules/gui/macosx/prefs.m:685
+#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:690
+#: modules/gui/macosx/prefs.m:698 modules/gui/macosx/prefs.m:768
 msgid "Modules"
 msgstr "Modules"
 
-#: modules/gui/beos/PreferencesWindow.cpp:220
+#: modules/gui/beos/PreferencesWindow.cpp:219
 #: modules/gui/gtk/preferences.c:609
 msgid "Apply"
 msgstr "Appliquer"
 
-#: modules/gui/beos/PreferencesWindow.cpp:225
+#: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
-#: modules/gui/macosx/output.m:332 modules/gui/macosx/prefs.m:76
+#: modules/gui/macosx/output.m:338 modules/gui/macosx/prefs.m:76
 #: modules/gui/wxwindows/preferences.cpp:254
 msgid "Save"
 msgstr "Enregistrer"
 
-#: modules/gui/beos/PreferencesWindow.cpp:229
+#: modules/gui/beos/PreferencesWindow.cpp:228
 #, fuzzy
 msgid "Defaults"
 msgstr "Defaut"
@@ -3100,6 +3250,7 @@ msgid "Take Screen Shot"
 msgstr ""
 
 #: modules/gui/beos/VlcWrapper.cpp:185 modules/gui/gtk/menu.c:733
+#: modules/gui/macosx/prefs.m:348
 msgid "None"
 msgstr "Aucun"
 
@@ -3126,8 +3277,8 @@ msgstr "Interface Gtk+ Familiar Linux"
 msgid "VLC media player"
 msgstr "Lecteur multimédia VLC"
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:652
-#: modules/gui/wxwindows/preferences.cpp:965
+#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:663
+#: modules/gui/wxwindows/preferences.cpp:967
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr "Ouvrir un fichier"
@@ -3151,8 +3302,8 @@ msgstr "Jouer le flux"
 #: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
 #: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
 #: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:435
-#: modules/gui/macosx/intf.m:301 modules/gui/macosx/intf.m:339
-#: modules/gui/macosx/intf.m:400 modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
+#: modules/gui/macosx/intf.m:423 modules/gui/wxwindows/interface.cpp:347
 msgid "Stop"
 msgstr "Stop"
 
@@ -3184,7 +3335,7 @@ msgstr "Multidiffusion UDP/RTP"
 
 #: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
 #: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:160
-#: modules/gui/macosx/output.m:124 modules/gui/wxwindows/open.cpp:445
+#: modules/gui/macosx/output.m:128 modules/gui/wxwindows/open.cpp:456
 #: modules/gui/wxwindows/streamout.cpp:380
 msgid "Address"
 msgstr "Adresse"
@@ -3194,13 +3345,13 @@ msgstr "Adresse"
 #: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
 #: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
 #: modules/gui/macosx/open.m:159 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:125 modules/gui/wxwindows/open.cpp:430
-#: modules/gui/wxwindows/open.cpp:453 modules/gui/wxwindows/streamout.cpp:390
+#: modules/gui/macosx/output.m:129 modules/gui/wxwindows/open.cpp:441
+#: modules/gui/wxwindows/open.cpp:464 modules/gui/wxwindows/streamout.cpp:390
 msgid "Port"
 msgstr "Port"
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:127
-#: modules/gui/macosx/output.m:221 modules/gui/macosx/output.m:289
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:131
+#: modules/gui/macosx/output.m:227 modules/gui/macosx/output.m:295
 #: modules/gui/wxwindows/streamout.cpp:341
 msgid "HTTP"
 msgstr "HTTP"
@@ -3279,10 +3430,10 @@ msgid ""
 "from local or network sources."
 msgstr ""
 
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
+#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100
 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
@@ -3292,6 +3443,69 @@ msgstr ""
 msgid "Error loading pixmap file: %s"
 msgstr ""
 
+#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
+#, fuzzy
+msgid "Gtk2 interface"
+msgstr "Interface Gtk+"
+
+#: modules/gui/gtk2/gnome2_interface.c:31
+#, fuzzy
+msgid "_New"
+msgstr "_Vue"
+
+#: modules/gui/gtk2/gnome2_interface.c:87
+msgid "gnome2"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:112
+msgid "button4"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:122
+#: modules/gui/gtk2/gtk2_interface.c:183
+msgid "button3"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337
+msgid "Save File"
+msgstr "Enregistrer le fichier"
+
+#: modules/gui/gtk2/gtk2_interface.c:67
+#, fuzzy
+msgid "window1"
+msgstr "Fenêtre"
+
+#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147
+#: modules/gui/gtk/gtk_interface.c:1373
+msgid "_File"
+msgstr "_Fichier"
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+#, fuzzy
+msgid "_Edit"
+msgstr "Édition"
+
+#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268
+msgid "_View"
+msgstr "_Vue"
+
+#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569
+msgid "_Help"
+msgstr "Aide"
+
+#: modules/gui/gtk2/gtk2_interface.c:146
+#, fuzzy
+msgid "_About"
+msgstr "À propos"
+
+#: modules/gui/gtk2/gtk2_interface.c:163
+msgid "button1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:173
+msgid "button2"
+msgstr ""
+
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 #, fuzzy
 msgid "Show tooltips"
@@ -3338,7 +3552,7 @@ msgstr "_Ouvrir fichier..."
 #: modules/gui/gtk/gnome_interface.c:20 modules/gui/gtk/gnome_interface.c:504
 #: modules/gui/gtk/gnome_interface.c:986 modules/gui/gtk/gtk_interface.c:173
 #: modules/gui/gtk/gtk_interface.c:619 modules/gui/gtk/gtk_interface.c:1399
-#: modules/gui/wxwindows/interface.cpp:230
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Open a file"
 msgstr "Ouvre un fichier"
 
@@ -3438,25 +3652,25 @@ msgstr "S
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:909
 #: modules/gui/gtk/gtk_interface.c:452 modules/gui/gtk/gtk_interface.c:1253
-#: modules/gui/macosx/intf.m:355
+#: modules/gui/macosx/intf.m:378
 msgid "Volume Up"
 msgstr "Augmenter le volume"
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:916
 #: modules/gui/gtk/gtk_interface.c:459 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:356
+#: modules/gui/macosx/intf.m:379
 msgid "Volume Down"
 msgstr "Baisser le volume"
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:923
 #: modules/gui/gtk/gtk_interface.c:466 modules/gui/gtk/gtk_interface.c:1267
-#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:357
+#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:380
 msgid "Mute"
 msgstr "Muet"
 
 #: modules/gui/gtk/gnome_interface.c:155 modules/gui/gtk/gnome_interface.c:938
 #: modules/gui/gtk/gtk_interface.c:488 modules/gui/gtk/gtk_interface.c:1289
-#: modules/gui/macosx/intf.m:362 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:385 modules/gui/macosx/intf.m:386
 msgid "Device"
 msgstr "Périphérique"
 
@@ -3475,18 +3689,10 @@ msgstr "S
 msgid "_Fullscreen"
 msgstr "Plein écran"
 
-#: modules/gui/gtk/gnome_interface.c:183 modules/gui/gtk/gnome_interface.c:966
-#: modules/gui/gtk/gtk_interface.c:553 modules/gui/gtk/gtk_interface.c:1349
-#: modules/gui/macosx/controls.m:526 modules/gui/macosx/intf.m:378
-#: modules/gui/macosx/intf.m:379
-#: modules/video_filter/deinterlace/deinterlace.c:81
-msgid "Deinterlace"
-msgstr "Désentrelacer"
-
 #: modules/gui/gtk/gnome_interface.c:190 modules/gui/gtk/gnome_interface.c:973
 #: modules/gui/gtk/gtk_interface.c:560 modules/gui/gtk/gtk_interface.c:1356
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/intf.m:375
-#: modules/gui/macosx/output.m:120 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/intf.m:397 modules/gui/macosx/intf.m:398
+#: modules/gui/macosx/output.m:124 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr "Écran"
 
@@ -3503,18 +3709,18 @@ msgstr "_Vid
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
 #: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2005
 #: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:142
-#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:337
+#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:338
 #: modules/gui/wxwindows/open.cpp:278
 msgid "Disc"
 msgstr "Disque"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:339
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Net"
 msgstr "Réseau"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:343
 msgid "Sat"
 msgstr "Sat"
 
@@ -3576,7 +3782,7 @@ msgstr "Ouvre la liste de lecture"
 #: modules/gui/gtk/gnome_interface.c:1063 modules/gui/gtk/gtk_interface.c:758
 #: modules/gui/gtk/gtk_interface.c:844 modules/gui/gtk/gtk_interface.c:888
 #: modules/gui/gtk/gtk_interface.c:1173
-#: modules/gui/wxwindows/interface.cpp:353
+#: modules/gui/wxwindows/interface.cpp:354
 msgid "Prev"
 msgstr "Précédent"
 
@@ -3588,8 +3794,8 @@ msgstr "Fichier pr
 #: modules/gui/gtk/gnome_interface.c:1056 modules/gui/gtk/gtk_interface.c:769
 #: modules/gui/gtk/gtk_interface.c:852 modules/gui/gtk/gtk_interface.c:896
 #: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:443
-#: modules/gui/macosx/intf.m:303 modules/gui/macosx/intf.m:343
-#: modules/gui/macosx/intf.m:401 modules/gui/wxwindows/interface.cpp:355
+#: modules/gui/macosx/intf.m:326 modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:424 modules/gui/wxwindows/interface.cpp:356
 msgid "Next"
 msgstr "Suivant"
 
@@ -3689,8 +3895,8 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
 #: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
 #: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:173
-#: modules/gui/macosx/output.m:123 modules/gui/wxwindows/open.cpp:246
-#: modules/gui/wxwindows/open.cpp:343
+#: modules/gui/macosx/output.m:127 modules/gui/wxwindows/open.cpp:246
+#: modules/gui/wxwindows/open.cpp:354
 #: modules/gui/wxwindows/preferences.cpp:778
 #: modules/gui/wxwindows/streamout.cpp:367
 #: modules/gui/wxwindows/subtitles.cpp:107
@@ -3698,24 +3904,24 @@ msgid "Browse..."
 msgstr "Choisir..."
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:368
+#: modules/gui/wxwindows/open.cpp:379
 msgid "Disc type"
 msgstr "Type de disque"
 
 #: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
 #: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:488
-#: modules/gui/wxwindows/open.cpp:362
+#: modules/gui/wxwindows/open.cpp:373
 msgid "DVD"
 msgstr "DVD"
 
 #: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
 #: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:382
-#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:363
+#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:374
 msgid "VCD"
 msgstr "VCD"
 
 #: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:374
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:385
 msgid "Device name"
 msgstr "Nom du périphérique"
 
@@ -3726,24 +3932,24 @@ msgstr "Activer les menus DVD"
 
 #: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:547
-#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:409
+#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:420
 msgid "UDP/RTP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
 #: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:548
-#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:421
 msgid "UDP/RTP Multicast"
 msgstr "Multidiffusion UDP/RTP"
 
 #: modules/gui/gtk/gnome_interface.c:1727 modules/gui/gtk/gtk_interface.c:2042
 #: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:549
-#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:411
+#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:422
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:467
+#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:478
 msgid "URL"
 msgstr ""
 
@@ -3791,7 +3997,7 @@ msgid "fps"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:116
+#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:120
 #: modules/gui/wxwindows/open.cpp:201 modules/gui/wxwindows/open.cpp:223
 msgid "Settings..."
 msgstr "Paramètres..."
@@ -3870,14 +4076,14 @@ msgid "Destination Target: "
 msgstr "Destination:"
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:128 modules/gui/macosx/output.m:231
-#: modules/gui/macosx/output.m:290 modules/gui/wxwindows/streamout.cpp:342
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/output.m:237
+#: modules/gui/macosx/output.m:296 modules/gui/wxwindows/streamout.cpp:342
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:129 modules/gui/macosx/output.m:241
-#: modules/gui/macosx/output.m:292 modules/gui/wxwindows/streamout.cpp:343
+#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:298 modules/gui/wxwindows/streamout.cpp:343
 msgid "RTP"
 msgstr ""
 
@@ -3898,8 +4104,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:135 modules/gui/macosx/output.m:273
-#: modules/gui/macosx/output.m:319
+#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:279
+#: modules/gui/macosx/output.m:325
 msgid "AVI"
 msgstr ""
 
@@ -3916,11 +4122,6 @@ msgstr ""
 msgid "Gtk+ interface"
 msgstr "Interface Gtk+"
 
-#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
-#: modules/gui/gtk2/gtk2_interface.c:77
-msgid "_File"
-msgstr "_Fichier"
-
 #: modules/gui/gtk/gtk_interface.c:238
 msgid "_Close"
 msgstr "Fermer"
@@ -3937,10 +4138,6 @@ msgstr "Quitter"
 msgid "Exit the program"
 msgstr "Quitte le programme"
 
-#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132
-msgid "_View"
-msgstr "_Vue"
-
 #: modules/gui/gtk/gtk_interface.c:294
 msgid "Hide the main interface window"
 msgstr "Masquer la fenêtre d'interface"
@@ -3961,10 +4158,6 @@ msgstr "_Pr
 msgid "Configure the application"
 msgstr "Configurer l'application"
 
-#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139
-msgid "_Help"
-msgstr "Aide"
-
 #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435
 msgid "_About..."
 msgstr "_A propos..."
@@ -4069,56 +4262,6 @@ msgstr "Configurer"
 msgid "Selected:"
 msgstr "Sélectionné:"
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-#, fuzzy
-msgid "Gtk2 interface"
-msgstr "Interface Gtk+"
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-#, fuzzy
-msgid "_New"
-msgstr "_Vue"
-
-#: modules/gui/gtk2/gnome2_interface.c:87
-msgid "gnome2"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:112
-msgid "button4"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:122
-#: modules/gui/gtk2/gtk2_interface.c:183
-msgid "button3"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:331
-msgid "Save File"
-msgstr "Enregistrer le fichier"
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-#, fuzzy
-msgid "window1"
-msgstr "Fenêtre"
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-#, fuzzy
-msgid "_Edit"
-msgstr "Édition"
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-#, fuzzy
-msgid "_About"
-msgstr "À propos"
-
-#: modules/gui/gtk2/gtk2_interface.c:163
-msgid "button1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:173
-msgid "button2"
-msgstr ""
-
 #: modules/gui/kde/interface.cpp:88
 msgid "Languages"
 msgstr "Langues"
@@ -4148,224 +4291,224 @@ msgstr "Messages:"
 msgid "Plugins"
 msgstr ""
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:315
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:338
 msgid "About VLC media player"
 msgstr "À propos du lecteur multimédia VLC"
 
 #: modules/gui/macosx/controls.m:344 modules/gui/macosx/controls.m:487
-#: modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:389
 msgid "Half Size"
 msgstr "Taille 50 %"
 
 #: modules/gui/macosx/controls.m:346 modules/gui/macosx/controls.m:488
-#: modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:390
 msgid "Normal Size"
 msgstr "Taille 100 %"
 
 #: modules/gui/macosx/controls.m:348 modules/gui/macosx/controls.m:489
-#: modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/intf.m:391
 msgid "Double Size"
 msgstr "Taille 200 %"
 
 #: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:491
 #: modules/gui/macosx/controls.m:498 modules/gui/macosx/controls.m:520
-#: modules/gui/macosx/intf.m:371
+#: modules/gui/macosx/intf.m:394
 msgid "Float On Top"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:490
-#: modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/intf.m:392
 #, fuzzy
 msgid "Fit To Screen"
 msgstr "Écran"
 
-#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:298
-#: modules/gui/macosx/intf.m:342 modules/gui/macosx/intf.m:402
+#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:321
+#: modules/gui/macosx/intf.m:365 modules/gui/macosx/intf.m:425
 msgid "Previous"
 msgstr "Précédent"
 
-#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:344
+#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:367
 msgid "Loop"
 msgstr "Tout répéter"
 
-#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:345
+#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:368
 msgid "Step Forward"
 msgstr "Avancer"
 
-#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:346
+#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:369
 msgid "Step Backward"
 msgstr "Reculer"
 
-#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:386
-#: modules/gui/macosx/intf.m:411
+#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:434
 msgid "Info"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:293
+#: modules/gui/macosx/intf.m:316
 msgid "VLC - Controller"
 msgstr "VLC - Contrôleur"
 
-#: modules/gui/macosx/intf.m:305
+#: modules/gui/macosx/intf.m:328
 msgid "Volume"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:306
+#: modules/gui/macosx/intf.m:329
 msgid "Position"
 msgstr "Position"
 
-#: modules/gui/macosx/intf.m:312
+#: modules/gui/macosx/intf.m:335
 msgid "Open CrashLog"
 msgstr "Ouvrir le \"CrashLog\""
 
-#: modules/gui/macosx/intf.m:316
+#: modules/gui/macosx/intf.m:339
 msgid "Preferences..."
 msgstr "Préférences..."
 
-#: modules/gui/macosx/intf.m:317
+#: modules/gui/macosx/intf.m:340
 msgid "Hide VLC"
 msgstr "Masquer VLC"
 
-#: modules/gui/macosx/intf.m:318
+#: modules/gui/macosx/intf.m:341
 msgid "Hide Others"
 msgstr "Masquer les autres"
 
-#: modules/gui/macosx/intf.m:319
+#: modules/gui/macosx/intf.m:342
 msgid "Show All"
 msgstr "Tout afficher"
 
-#: modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:343
 msgid "Quit VLC"
 msgstr "Quitter VLC"
 
-#: modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/intf.m:345
 msgid "1:File"
 msgstr "1:Fichier"
 
-#: modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:346
 msgid "Open..."
 msgstr "Ouvrir..."
 
-#: modules/gui/macosx/intf.m:324
+#: modules/gui/macosx/intf.m:347
 msgid "Open File..."
 msgstr "Ouvrir un fichier..."
 
-#: modules/gui/macosx/intf.m:325
+#: modules/gui/macosx/intf.m:348
 msgid "Open Disc..."
 msgstr "Ouvrir un disque..."
 
-#: modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:349
 msgid "Open Network..."
 msgstr "Ouvrir un flux réseau..."
 
-#: modules/gui/macosx/intf.m:327
+#: modules/gui/macosx/intf.m:350
 msgid "Open Recent"
 msgstr "Ouvrir un flux récent"
 
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/intf.m:1291
+#: modules/gui/macosx/intf.m:351 modules/gui/macosx/intf.m:1314
 msgid "Clear Menu"
 msgstr "Tout effacer"
 
-#: modules/gui/macosx/intf.m:331
+#: modules/gui/macosx/intf.m:354
 msgid "Cut"
 msgstr "Couper"
 
-#: modules/gui/macosx/intf.m:332
+#: modules/gui/macosx/intf.m:355
 msgid "Copy"
 msgstr "Copier"
 
-#: modules/gui/macosx/intf.m:333
+#: modules/gui/macosx/intf.m:356
 msgid "Paste"
 msgstr "Coller"
 
-#: modules/gui/macosx/intf.m:334
+#: modules/gui/macosx/intf.m:357
 msgid "Clear"
 msgstr "Effacer"
 
-#: modules/gui/macosx/intf.m:337
+#: modules/gui/macosx/intf.m:360
 msgid "Controls"
 msgstr "Contrôles"
 
-#: modules/gui/macosx/intf.m:358 modules/gui/macosx/intf.m:359
+#: modules/gui/macosx/intf.m:381 modules/gui/macosx/intf.m:382
 #, fuzzy
 msgid "Audio Track"
 msgstr "Audio"
 
-#: modules/gui/macosx/intf.m:372 modules/gui/macosx/intf.m:373
+#: modules/gui/macosx/intf.m:395 modules/gui/macosx/intf.m:396
 #, fuzzy
 msgid "Video Track"
 msgstr "Vidéo"
 
-#: modules/gui/macosx/intf.m:382
+#: modules/gui/macosx/intf.m:405
 msgid "Minimize Window"
 msgstr "Réduire/agrandir la fenêtre"
 
-#: modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:406
 msgid "Close Window"
 msgstr "Fermer la fenêtre"
 
-#: modules/gui/macosx/intf.m:384
+#: modules/gui/macosx/intf.m:407
 msgid "Controller"
 msgstr "Contrôleur"
 
-#: modules/gui/macosx/intf.m:389
+#: modules/gui/macosx/intf.m:412
 msgid "Bring All to Front"
 msgstr "Tout ramener au premier plan"
 
-#: modules/gui/macosx/intf.m:391
+#: modules/gui/macosx/intf.m:414
 msgid "Help"
 msgstr "Aide"
 
-#: modules/gui/macosx/intf.m:392
+#: modules/gui/macosx/intf.m:415
 msgid "ReadMe..."
 msgstr "Lisez-moi..."
 
-#: modules/gui/macosx/intf.m:393
+#: modules/gui/macosx/intf.m:416
 #, fuzzy
 msgid "Online Documentation"
 msgstr "compensation de mouvement"
 
-#: modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/intf.m:417
 msgid "Report a Bug"
 msgstr "Rapporter un problème"
 
-#: modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/intf.m:418
 msgid "VideoLAN Website"
 msgstr "Site web de VideoLAN"
 
-#: modules/gui/macosx/intf.m:396
+#: modules/gui/macosx/intf.m:419
 msgid "License"
 msgstr "Licence"
 
-#: modules/gui/macosx/intf.m:405
+#: modules/gui/macosx/intf.m:428
 msgid "Error"
 msgstr "Erreur"
 
-#: modules/gui/macosx/intf.m:406
+#: modules/gui/macosx/intf.m:429
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr ""
 "Une erreur est survenue, qui a probablement empêché le déroulement normal du "
 "programme:"
 
-#: modules/gui/macosx/intf.m:407
+#: modules/gui/macosx/intf.m:430
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr ""
 "Si vous estimez qu'il s'agit d'une erreur, veuillez suivre les instructions "
 "à l'adresse:"
 
-#: modules/gui/macosx/intf.m:408
+#: modules/gui/macosx/intf.m:431
 msgid "Open Messages Window"
 msgstr "Ouvrir la fenêtre de messages"
 
-#: modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:432
 msgid "Dismiss"
 msgstr "Fermer"
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid "No CrashLog found"
 msgstr "Aucun CrashLog trouvé"
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4443,64 +4586,58 @@ msgstr "Aucun %@ trouv
 msgid "Open VIDEO_TS Directory"
 msgstr "Ouvrir un dossier VIDEO_TS"
 
-#: modules/gui/macosx/output.m:115
+#: modules/gui/macosx/output.m:119
 #, fuzzy
 msgid "Advanced output:"
 msgstr "sortie audio ALSA"
 
-#: modules/gui/macosx/output.m:119
+#: modules/gui/macosx/output.m:123
 #, fuzzy
 msgid "Output Options"
 msgstr "Méthode de sortie"
 
-#: modules/gui/macosx/output.m:122 modules/gui/macosx/output.m:210
-#: modules/gui/macosx/output.m:285
+#: modules/gui/macosx/output.m:126 modules/gui/macosx/output.m:216
+#: modules/gui/macosx/output.m:291
 #, fuzzy
 msgid "Stream"
 msgstr "Arrêter le flux"
 
-#: modules/gui/macosx/output.m:126
+#: modules/gui/macosx/output.m:130
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132 modules/gui/wxwindows/streamout.cpp:437
+#: modules/gui/macosx/output.m:136 modules/gui/wxwindows/streamout.cpp:437
 msgid "Encapsulation Method"
 msgstr "Méthode d'encapsulation"
 
-#: modules/gui/macosx/output.m:133
+#: modules/gui/macosx/output.m:137
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:134 modules/gui/macosx/output.m:275
-#: modules/gui/macosx/output.m:317
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:281
+#: modules/gui/macosx/output.m:323
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:274
-#: modules/gui/macosx/output.m:321
+#: modules/gui/macosx/output.m:140 modules/gui/macosx/output.m:280
+#: modules/gui/macosx/output.m:327
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:276
-#: modules/gui/macosx/output.m:323
+#: modules/gui/macosx/output.m:141 modules/gui/macosx/output.m:282
+#: modules/gui/macosx/output.m:329
 msgid "mp4"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139
+#: modules/gui/macosx/output.m:143
 #, fuzzy
 msgid "Transcode options"
 msgstr "Suspendre le flux"
 
-#: modules/gui/macosx/output.m:149 modules/gui/macosx/output.m:153
-msgid "Bitrate (bps)"
-msgstr ""
-
-#: modules/gui/macosx/output.m:151
-msgid "mpga"
-msgstr ""
-
-#: modules/gui/macosx/output.m:152
-msgid "a52 "
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:158
+#: modules/gui/wxwindows/streamout.cpp:512
+#: modules/gui/wxwindows/streamout.cpp:549
+msgid "Bitrate (kb/s)"
 msgstr ""
 
 #: modules/gui/macosx/prefs.m:78 modules/gui/wxwindows/preferences.cpp:256
@@ -4513,12 +4650,6 @@ msgstr "Tout s
 msgid "Advanced"
 msgstr "Avancée..."
 
-#: modules/gui/macosx/prefs.m:143 modules/gui/macosx/prefs.m:341
-#: modules/gui/macosx/prefs.m:368
-#, fuzzy
-msgid "Auto"
-msgstr "Auteurs"
-
 #: modules/gui/ncurses/ncurses.c:66
 msgid "ncurses interface"
 msgstr "interface ncurses"
@@ -4531,33 +4662,33 @@ msgstr "sortie vid
 msgid "Qt interface"
 msgstr "interface Qt"
 
-#: modules/gui/skins/src/skin_main.cpp:251
-#: modules/gui/skins/src/vlcproc.cpp:338
+#: modules/gui/skins/src/skin_main.cpp:239
+#: modules/gui/skins/src/vlcproc.cpp:339
 #, fuzzy
 msgid "Open a skin file"
 msgstr "Ouvre un fichier"
 
-#: modules/gui/skins/src/skin_main.cpp:292
-#: modules/gui/skins/src/skin_main.cpp:293
+#: modules/gui/skins/src/skin_main.cpp:280
+#: modules/gui/skins/src/skin_main.cpp:281
 msgid "Last skin actually used"
 msgstr "Dernière skin utilisée"
 
-#: modules/gui/skins/src/skin_main.cpp:294
-#: modules/gui/skins/src/skin_main.cpp:295
+#: modules/gui/skins/src/skin_main.cpp:282
+#: modules/gui/skins/src/skin_main.cpp:283
 msgid "Config of last used skin"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:296
-#: modules/gui/skins/src/skin_main.cpp:297
+#: modules/gui/skins/src/skin_main.cpp:284
+#: modules/gui/skins/src/skin_main.cpp:285
 msgid "Show application in system tray"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:298
-#: modules/gui/skins/src/skin_main.cpp:299
+#: modules/gui/skins/src/skin_main.cpp:286
+#: modules/gui/skins/src/skin_main.cpp:287
 msgid "Show application in taskbar"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:310
+#: modules/gui/skins/src/skin_main.cpp:298
 #, fuzzy
 msgid "Skinnable Interface"
 msgstr "Cacher/montrer l'_interface"
@@ -4567,160 +4698,161 @@ msgstr "Cacher/montrer l'_interface"
 msgid "FileInfo"
 msgstr "&Infos fichier..."
 
-#: modules/gui/wxwindows/interface.cpp:231
+#: modules/gui/wxwindows/interface.cpp:232
 msgid "Open a DVD or (S)VCD"
 msgstr "Ouvre un DVD ou un (S)VCD"
 
-#: modules/gui/wxwindows/interface.cpp:232
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Open a network stream"
 msgstr "Sélectionne un flux réseau"
 
-#: modules/gui/wxwindows/interface.cpp:233
+#: modules/gui/wxwindows/interface.cpp:234
 msgid "Open a satellite stream"
 msgstr "Ouvrir une carte satellite"
 
-#: modules/gui/wxwindows/interface.cpp:234
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "Eject the DVD/CD"
 msgstr "Éjecter le DVD/CD"
 
-#: modules/gui/wxwindows/interface.cpp:235
+#: modules/gui/wxwindows/interface.cpp:236
 msgid "Exit this program"
 msgstr "Quitter le programme"
 
-#: modules/gui/wxwindows/interface.cpp:237
+#: modules/gui/wxwindows/interface.cpp:238
 msgid "Open the playlist"
 msgstr "Ouvrir la liste de lecture"
 
-#: modules/gui/wxwindows/interface.cpp:238
+#: modules/gui/wxwindows/interface.cpp:239
 msgid "Show the program logs"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:239
+#: modules/gui/wxwindows/interface.cpp:240
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:241
+#: modules/gui/wxwindows/interface.cpp:242
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:243
+#: modules/gui/wxwindows/interface.cpp:244
 msgid "About this program"
 msgstr "À propos de ce programme"
 
-#: modules/gui/wxwindows/interface.cpp:247
+#: modules/gui/wxwindows/interface.cpp:248
 msgid "&Open File..."
 msgstr "&Ouvrir un fichier..."
 
-#: modules/gui/wxwindows/interface.cpp:249
+#: modules/gui/wxwindows/interface.cpp:250
 msgid "Open &Disc..."
 msgstr "Ouvrir un &disque..."
 
-#: modules/gui/wxwindows/interface.cpp:251
+#: modules/gui/wxwindows/interface.cpp:252
 msgid "&Network Stream..."
 msgstr "&Flux réseau..."
 
-#: modules/gui/wxwindows/interface.cpp:254
+#: modules/gui/wxwindows/interface.cpp:255
 msgid "&Satellite Stream..."
 msgstr "Flux &satellite..."
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:260
 msgid "&Eject Disc"
 msgstr "Éjecter le disque"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:264
 msgid "E&xit"
 msgstr "Quitter"
 
-#: modules/gui/wxwindows/interface.cpp:267
+#: modules/gui/wxwindows/interface.cpp:268
 msgid "&Playlist..."
 msgstr "Liste de lecture..."
 
-#: modules/gui/wxwindows/interface.cpp:269
-msgid "&Logs..."
-msgstr "&Messages..."
-
 #: modules/gui/wxwindows/interface.cpp:270
+#, fuzzy
+msgid "&Messages..."
+msgstr "Messages..."
+
+#: modules/gui/wxwindows/interface.cpp:271
 msgid "&File info..."
 msgstr "&Infos fichier..."
 
-#: modules/gui/wxwindows/interface.cpp:275
+#: modules/gui/wxwindows/interface.cpp:276
 msgid "&Preferences..."
 msgstr "&Préférences..."
 
-#: modules/gui/wxwindows/interface.cpp:292
+#: modules/gui/wxwindows/interface.cpp:293
 msgid "&About..."
 msgstr "&À propos..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:297
 msgid "&File"
 msgstr "&Fichier"
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:298
 msgid "&View"
 msgstr "&Vue"
 
-#: modules/gui/wxwindows/interface.cpp:298
+#: modules/gui/wxwindows/interface.cpp:299
 msgid "&Settings"
 msgstr "&Paramètres"
 
-#: modules/gui/wxwindows/interface.cpp:299
-#: modules/gui/wxwindows/interface.cpp:476
-#: modules/gui/wxwindows/interface.cpp:524
+#: modules/gui/wxwindows/interface.cpp:300
+#: modules/gui/wxwindows/interface.cpp:478
+#: modules/gui/wxwindows/interface.cpp:526
 msgid "&Audio"
 msgstr "&Audio"
 
-#: modules/gui/wxwindows/interface.cpp:300
-#: modules/gui/wxwindows/interface.cpp:495
-#: modules/gui/wxwindows/interface.cpp:528
+#: modules/gui/wxwindows/interface.cpp:301
+#: modules/gui/wxwindows/interface.cpp:497
+#: modules/gui/wxwindows/interface.cpp:530
 #, fuzzy
 msgid "&Video"
 msgstr "Vidéo"
 
-#: modules/gui/wxwindows/interface.cpp:301
-#: modules/gui/wxwindows/interface.cpp:514
-#: modules/gui/wxwindows/interface.cpp:532
+#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:516
+#: modules/gui/wxwindows/interface.cpp:534
 #, fuzzy
 msgid "&Navigation"
 msgstr "Navigation"
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:303
 msgid "&Help"
 msgstr "&Aide"
 
-#: modules/gui/wxwindows/interface.cpp:318
+#: modules/gui/wxwindows/interface.cpp:319
 msgid "Stop current playlist item"
 msgstr "Arrête l'élément de liste de lecture en cours"
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:320
 msgid "Play current playlist item"
 msgstr "Joue l'élément de liste de lecture en cours"
 
-#: modules/gui/wxwindows/interface.cpp:320
+#: modules/gui/wxwindows/interface.cpp:321
 msgid "Pause current playlist item"
 msgstr "Suspend l'élément de liste de lecture en cours"
 
-#: modules/gui/wxwindows/interface.cpp:321
+#: modules/gui/wxwindows/interface.cpp:322
 #: modules/gui/wxwindows/playlist.cpp:351
 msgid "Open playlist"
 msgstr "Ouvre la liste de lecture"
 
-#: modules/gui/wxwindows/interface.cpp:322
+#: modules/gui/wxwindows/interface.cpp:323
 msgid "Previous playlist item"
 msgstr "Fichier précédent"
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:324
 msgid "Next playlist item"
 msgstr "Fichier suivant"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:325
 msgid "Play slower"
 msgstr "Jouer plus lentement"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:326
 msgid "Play faster"
 msgstr "Jouer plus rapidement"
 
-#: modules/gui/wxwindows/interface.cpp:560
+#: modules/gui/wxwindows/interface.cpp:561
 msgid ""
 " (wxWindows interface)\n"
 "\n"
@@ -4728,7 +4860,7 @@ msgstr ""
 "(interface wxWindows)\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:561
+#: modules/gui/wxwindows/interface.cpp:562
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
@@ -4736,7 +4868,7 @@ msgstr ""
 "© 1996-2003 l'équipe VideoLAN\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:562
+#: modules/gui/wxwindows/interface.cpp:563
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
@@ -4745,7 +4877,7 @@ msgstr ""
 "L'équipe VideoLAN <videolan@videolan.org>\n"
 "<http://www.videolan.org/>\n"
 
-#: modules/gui/wxwindows/interface.cpp:564
+#: modules/gui/wxwindows/interface.cpp:565
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
 "It can play MPEG and MPEG2 files from a file or from a network source."
@@ -4753,7 +4885,7 @@ msgstr ""
 "Ceci est le client VideoLAN, un lecteur de DVD, MPEG et DivX. Il peut jouer "
 "des flux MPEG et MPEG2 à partir d'un fichier ou d'une source réseau."
 
-#: modules/gui/wxwindows/interface.cpp:568
+#: modules/gui/wxwindows/interface.cpp:569
 #, c-format
 msgid "About %s"
 msgstr "À propos de %s"
@@ -4766,11 +4898,11 @@ msgstr "Param
 msgid "Video menu"
 msgstr "Paramètres vidéo"
 
-#: modules/gui/wxwindows/menus.cpp:139
+#: modules/gui/wxwindows/menus.cpp:141
 msgid "Input menu"
 msgstr "Entrée"
 
-#: modules/gui/wxwindows/menus.cpp:329
+#: modules/gui/wxwindows/menus.cpp:334
 msgid "Empty"
 msgstr ""
 
@@ -4806,16 +4938,16 @@ msgstr "Capturer le flux entrant"
 msgid "Capture the stream you are playing to a file"
 msgstr "Capture le flux joué dans un fichier"
 
-#: modules/gui/wxwindows/open.cpp:361
+#: modules/gui/wxwindows/open.cpp:372
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:364
+#: modules/gui/wxwindows/open.cpp:375
 #, fuzzy
 msgid "CD Audio"
 msgstr "Audio"
 
-#: modules/gui/wxwindows/open.cpp:837 modules/gui/wxwindows/streamout.cpp:640
+#: modules/gui/wxwindows/open.cpp:848 modules/gui/wxwindows/streamout.cpp:640
 msgid "Save file"
 msgstr "Enregistrer le fichier"
 
@@ -4885,8 +5017,9 @@ msgid "No configuration options available"
 msgstr "Pas d'option de configuration disponible"
 
 #: modules/gui/wxwindows/preferences.cpp:865
-msgid "Advanced..."
-msgstr "Avancée..."
+#, fuzzy
+msgid "Advanced options"
+msgstr "afficher les options avancées"
 
 #: modules/gui/wxwindows/streamout.cpp:166
 msgid "Stream output MRL"
@@ -4927,11 +5060,6 @@ msgstr "afficher les options avanc
 msgid "Video codec"
 msgstr "périphérique audio"
 
-#: modules/gui/wxwindows/streamout.cpp:512
-#: modules/gui/wxwindows/streamout.cpp:549
-msgid "Bitrate (kb/s)"
-msgstr ""
-
 #: modules/gui/wxwindows/streamout.cpp:543
 #, fuzzy
 msgid "Audio codec"
@@ -5058,6 +5186,11 @@ msgstr "Module d'interface fichier journal"
 msgid "Using the logger interface plugin..."
 msgstr ""
 
+#: modules/misc/memcpy/memcpyaltivec.c:52
+#, fuzzy
+msgid "AltiVec memcpy"
+msgstr "Module de memcpy optimisé AltiVec"
+
 #: modules/misc/memcpy/memcpy.c:81
 #, fuzzy
 msgid "libc memcpy"
@@ -5078,11 +5211,6 @@ msgstr "Module de memcpy optimis
 msgid "MMX EXT memcpy"
 msgstr "Module de memcpy optimisé MMMEXT"
 
-#: modules/misc/memcpy/memcpyaltivec.c:52
-#, fuzzy
-msgid "AltiVec memcpy"
-msgstr "Module de memcpy optimisé AltiVec"
-
 #: modules/misc/network/ipv4.c:85
 msgid "IPv4 network abstraction layer"
 msgstr "couche d'abstraction de réseau IPv4"
@@ -5096,6 +5224,10 @@ msgstr "couche d'abstraction de r
 msgid "Qt Embedded GUI helper"
 msgstr "Module vidéo Qt Embedded"
 
+#: modules/misc/sap.c:131
+msgid "SAP"
+msgstr ""
+
 #: modules/misc/sap.c:134
 #, fuzzy
 msgid "SAP interface"
@@ -5228,7 +5360,7 @@ msgid "Set image contrast"
 msgstr ""
 
 #: modules/video_filter/adjust.c:61
-msgid "Set the image contrast. Defaults to 1"
+msgid "Set the image contrast, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:62
@@ -5244,7 +5376,7 @@ msgid "Set image saturation"
 msgstr ""
 
 #: modules/video_filter/adjust.c:65
-msgid "Set the image saturation. Defaults to 1"
+msgid "Set the image saturation, between 0 and 3. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:66
@@ -5252,7 +5384,7 @@ msgid "Set image brightness"
 msgstr ""
 
 #: modules/video_filter/adjust.c:67
-msgid "Set the image brightness. Defaults to 1"
+msgid "Set the image brightness, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:71
@@ -5294,7 +5426,9 @@ msgid "Crop geometry"
 msgstr ""
 
 #: modules/video_filter/crop.c:55
-msgid "Set the geometry of the zone to crop"
+msgid ""
+"Set the geometry of the zone to crop. This is set as width x heigth + left "
+"offset + top offset."
 msgstr ""
 
 #: modules/video_filter/crop.c:57
@@ -5600,11 +5734,21 @@ msgid "Use shared memory to communicate between VLC and the X server."
 msgstr ""
 "Utiliser la mémoire partagée pour communiquer entre VLC et le serveur X."
 
-#: modules/video_output/x11/x11.c:62
+#: modules/video_output/x11/x11.c:61 modules/video_output/x11/xvideo.c:72
+msgid "choose the screen to be used for fullscreen mode."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:63 modules/video_output/x11/xvideo.c:74
+msgid ""
+"Choose the screen you want to use in fullscreen mode. For instance set it to "
+"0 for first screen, 1 for the second."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:67
 msgid "X11"
 msgstr ""
 
-#: modules/video_output/x11/x11.c:68
+#: modules/video_output/x11/x11.c:76
 msgid "X11 video output"
 msgstr "sortie vidéo X11"
 
@@ -5631,11 +5775,11 @@ msgid ""
 "to improve performances by using the most efficient one."
 msgstr ""
 
-#: modules/video_output/x11/xvideo.c:73
+#: modules/video_output/x11/xvideo.c:78
 msgid "XVideo"
 msgstr ""
 
-#: modules/video_output/x11/xvideo.c:81
+#: modules/video_output/x11/xvideo.c:90
 msgid "XVideo extension video output"
 msgstr "sortie vidéo extension XVideo"
 
@@ -5682,6 +5826,19 @@ msgstr "Module XOSD"
 msgid "xosd interface"
 msgstr "Module d'interface xosd"
 
+#~ msgid "SAP interface module"
+#~ msgstr "Module d'interface SAP"
+
+#, fuzzy
+#~ msgid "Auto"
+#~ msgstr "Auteurs"
+
+#~ msgid "&Logs..."
+#~ msgstr "&Messages..."
+
+#~ msgid "Advanced..."
+#~ msgstr "Avancée..."
+
 #, fuzzy
 #~ msgid "Display identifier"
 #~ msgstr "identificateur d'affichage"
diff --git a/po/it.po b/po/it.po
index b7083f9d82..879b99e89e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-05-24 14:40+0200\n"
+"POT-Creation-Date: 2003-05-27 23:43+0200\n"
 "PO-Revision-Date: 2003-01-31 16:35+0100\n"
 "Last-Translator: Vella Bruno\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -27,7 +27,7 @@ msgid "Audio channels"
 msgstr "Seleziona canale audio"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:165 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:358
 msgid "Stereo"
@@ -115,7 +115,7 @@ msgstr "Playlist"
 
 #: src/input/input_programs.c:94 modules/gui/gtk/gnome_interface.c:1078
 #: modules/gui/gtk/gtk_interface.c:1199 modules/gui/kde/interface.cpp:142
-#: modules/gui/macosx/intf.m:347 modules/gui/macosx/intf.m:348
+#: modules/gui/macosx/intf.m:370 modules/gui/macosx/intf.m:371
 msgid "Program"
 msgstr "Programma"
 
@@ -123,18 +123,18 @@ msgstr "Programma"
 #: modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
-#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:349
-#: modules/gui/macosx/intf.m:350 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:382
+#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:372
+#: modules/gui/macosx/intf.m:373 modules/gui/macosx/open.m:149
+#: modules/gui/wxwindows/open.cpp:393
 msgid "Title"
 msgstr "Titolo"
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
 #: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
-#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:351
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:388
+#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:374
+#: modules/gui/macosx/intf.m:375 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:399
 msgid "Chapter"
 msgstr "Capitolo"
 
@@ -187,7 +187,7 @@ msgstr "Capitolo"
 msgid "Previous Chapter"
 msgstr "Capitolo"
 
-#: src/input/input_programs.c:668
+#: src/input/input_programs.c:668 src/video_output/video_output.c:397
 msgid "Disable"
 msgstr ""
 
@@ -200,34 +200,34 @@ msgstr ""
 msgid "C"
 msgstr "it"
 
-#: src/libvlc.c:301 src/libvlc.c:1357
+#: src/libvlc.c:301 src/libvlc.c:1364
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
 "\n"
 msgstr "Utilizzo: %s [opzioni] [elementi]...\n"
 
-#: src/libvlc.c:1189 src/misc/configuration.c:961
+#: src/libvlc.c:1196 src/misc/configuration.c:961
 msgid "string"
 msgstr "stringa"
 
-#: src/libvlc.c:1206 src/misc/configuration.c:946
+#: src/libvlc.c:1213 src/misc/configuration.c:946
 msgid "integer"
 msgstr "intero"
 
-#: src/libvlc.c:1209 src/misc/configuration.c:953
+#: src/libvlc.c:1216 src/misc/configuration.c:953
 msgid "float"
 msgstr "virgola mobile"
 
-#: src/libvlc.c:1215
+#: src/libvlc.c:1222
 msgid " (default enabled)"
 msgstr " (predefinito abilitato)"
 
-#: src/libvlc.c:1216
+#: src/libvlc.c:1223
 msgid " (default disabled)"
 msgstr " (predefinito disabilitato)"
 
-#: src/libvlc.c:1332 src/libvlc.c:1387 src/libvlc.c:1411
+#: src/libvlc.c:1339 src/libvlc.c:1394 src/libvlc.c:1418
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
@@ -235,11 +235,11 @@ msgstr ""
 "\n"
 "Premi il tasto INVIO per continuare...\n"
 
-#: src/libvlc.c:1360
+#: src/libvlc.c:1367
 msgid "[module]              [description]\n"
 msgstr "[modulo]              [descrizione]\n"
 
-#: src/libvlc.c:1405
+#: src/libvlc.c:1412
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -1118,15 +1118,15 @@ msgstr "Interfaccia"
 #: modules/demux/ogg.c:554 modules/demux/ogg.c:813 modules/demux/ogg.c:986
 #: modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m:354 modules/gui/macosx/output.m:150
+#: modules/gui/macosx/intf.m:377 modules/gui/macosx/output.m:155
 msgid "Audio"
 msgstr "Audio"
 
 #: src/libvlc.h:473 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:893 modules/gui/gtk/gnome_interface.c:1099
-#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:365
-#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:140
+#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:388
+#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:144
 #: modules/misc/dummy/dummy.c:83 modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "Video"
@@ -1157,8 +1157,8 @@ msgstr "CPU"
 #: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
-#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:297
-#: modules/gui/macosx/intf.m:385 modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:408 modules/gui/wxwindows/interface.cpp:352
 #: modules/gui/wxwindows/playlist.cpp:102
 msgid "Playlist"
 msgstr "Playlist"
@@ -1201,12 +1201,43 @@ msgstr "stampa informazioni versione"
 msgid "boolean"
 msgstr "booleana"
 
-#: src/video_output/video_output.c:382 modules/gui/beos/VideoOutput.cpp:1138
+#: src/video_output/video_output.c:384 modules/gui/beos/VideoOutput.cpp:1138
 #: modules/gui/macosx/controls.m:342 modules/gui/macosx/controls.m:486
-#: modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/intf.m:393
 msgid "Fullscreen"
 msgstr "A schermo pieno"
 
+#: src/video_output/video_output.c:395 modules/gui/gtk/gnome_interface.c:183
+#: modules/gui/gtk/gnome_interface.c:966 modules/gui/gtk/gtk_interface.c:553
+#: modules/gui/gtk/gtk_interface.c:1349 modules/gui/macosx/controls.m:526
+#: modules/gui/macosx/intf.m:401 modules/gui/macosx/intf.m:402
+#: modules/video_filter/deinterlace/deinterlace.c:81
+msgid "Deinterlace"
+msgstr "Deinterlaccia"
+
+#: src/video_output/video_output.c:399
+#, fuzzy
+msgid "Discard"
+msgstr "Disco"
+
+#: src/video_output/video_output.c:401
+msgid "Blend"
+msgstr ""
+
+#: src/video_output/video_output.c:403
+#, fuzzy
+msgid "Mean"
+msgstr "Supporto"
+
+#: src/video_output/video_output.c:405
+msgid "Bob"
+msgstr ""
+
+#: src/video_output/video_output.c:407
+#, fuzzy
+msgid "Linear"
+msgstr "intero"
+
 #: modules/access/cdda.c:86 modules/access/file.c:69 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
 #: modules/access/v4l/v4l.c:64
@@ -1353,6 +1384,22 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
+#: modules/access_output/dummy.c:56
+msgid "Dummy stream ouput"
+msgstr "uscita sorgente dummy"
+
+#: modules/access_output/file.c:58
+msgid "File stream ouput"
+msgstr "uscita sorgente file"
+
+#: modules/access_output/http.c:54
+msgid "HTTP stream ouput"
+msgstr "uscita sorgente HTTP"
+
+#: modules/access_output/udp.c:73
+msgid "UDP stream ouput"
+msgstr "uscita sorgente UDP"
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr ""
@@ -1442,30 +1489,6 @@ msgstr "ingresso Video4Linux"
 msgid "VCD input"
 msgstr "ingresso VCD"
 
-#: modules/access/vlcs.c:131 modules/misc/sap.c:131
-msgid "SAP"
-msgstr "SAP"
-
-#: modules/access/vlcs.c:134
-msgid "SAP interface module"
-msgstr "modulo interfaccia SAP"
-
-#: modules/access_output/dummy.c:56
-msgid "Dummy stream ouput"
-msgstr "uscita sorgente dummy"
-
-#: modules/access_output/file.c:58
-msgid "File stream ouput"
-msgstr "uscita sorgente file"
-
-#: modules/access_output/http.c:54
-msgid "HTTP stream ouput"
-msgstr "uscita sorgente HTTP"
-
-#: modules/access_output/udp.c:73
-msgid "UDP stream ouput"
-msgstr "uscita sorgente UDP"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 #, fuzzy
 msgid "Characteristic dimension"
@@ -1618,13 +1641,13 @@ msgstr "uscita audio ALSA"
 msgid "Audio device"
 msgstr "Periferica audio"
 
-#: modules/audio_output/alsa.c:159 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:161 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:371
 msgid "Mono"
 msgstr "Mono"
 
-#: modules/audio_output/alsa.c:201 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:203 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:387
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1775,23 +1798,147 @@ msgstr "decodifica video DV"
 msgid "AAC audio decoder (using libfaad2)"
 msgstr "decodifica audio AAC (usa libfaad2)"
 
-#: modules/codec/ffmpeg/ffmpeg.c:154
-msgid "ffmpeg"
-msgstr "ffmpeg"
+#: modules/codec/ffmpeg/ffmpeg.c:86
+msgid "Direct rendering"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:88
+msgid "Error resilience"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:90
+msgid ""
+"ffmpeg can make errors resiliences.          \n"
+"Nevertheless, with buggy encoder (like ISO MPEG-4 encoder from M$) this will "
+"produce a lot of errors.\n"
+"Valid range is -1 to 99 (-1 disable all errors resiliences)."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:95
+msgid "Workaround bugs"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:97
+msgid ""
+"Try to fix some bugs\n"
+"1  autodetect\n"
+"2  old msmpeg4\n"
+"4  xvid interlaced\n"
+"8  ump4 \n"
+"16 no padding\n"
+"32 ac vlc64 Qpel chroma"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:106
+msgid "Hurry up"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:108
+msgid ""
+"Allow the decoder to partially decode or skip frame(s) when there not enough "
+"time.\n"
+" It's usefull with low CPU power but it could produce broken pictures."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:112
+#, fuzzy
+msgid "Truncated stream"
+msgstr "Riproduci sorgente"
+
+#: modules/codec/ffmpeg/ffmpeg.c:113
+msgid "truncated stream -1:auto,0:disable,:1:enable"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:115
+msgid "Post processing quality"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:117
+msgid ""
+"Quality of post processing\n"
+"Valid range is 0 to 6"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:120
+msgid "Ffmpeg postproc filter chains"
+msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:157
-msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgid "Ffmpeg postprocessing module"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:159
+msgid "Auto-level Post processing quality"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:161
+msgid ""
+"Post processing quality is selected upon time left but no more than "
+"requested quality\n"
+"Not yet implemented !"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:165
+msgid "Force vertical luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:166
+msgid "Force vertical luminance deblocking (override other settings)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:168
-msgid "Post processing"
+msgid "Force horizontal luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:169
+msgid "Force horizontal luminance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:171
+msgid "Force vertical chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:172
+msgid "Force vertical chrominance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:174
+msgid "Force horizontal chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:175
+msgid "Force horizontal chrominance deblocking (override other settings)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:177
-msgid "ffmpeg postprocessing module"
+msgid "Force luminance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:178
+msgid "Force luminance deringing (override other settings)"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:204
+#: modules/codec/ffmpeg/ffmpeg.c:180
+msgid "Force chrominance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:181
+msgid "Force chrominance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:184
+msgid "ffmpeg"
+msgstr "ffmpeg"
+
+#: modules/codec/ffmpeg/ffmpeg.c:187
+msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:195
+msgid "Post processing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:215
 msgid "ffmpeg chroma conversion"
 msgstr ""
 
@@ -1811,7 +1958,7 @@ msgstr ""
 msgid "flac audio decoder"
 msgstr "decodifica audio flac"
 
-#: modules/codec/libmpeg2.c:89
+#: modules/codec/libmpeg2.c:90
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr ""
 
@@ -1828,14 +1975,14 @@ msgstr ""
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr "decodifica video MPEG I/II"
 
-#: modules/codec/mpeg_video/idct/idct.c:41
-msgid "IDCT"
-msgstr ""
-
 #: modules/codec/mpeg_video/idct/idctaltivec.c:45
 msgid "AltiVec IDCT"
 msgstr ""
 
+#: modules/codec/mpeg_video/idct/idct.c:41
+msgid "IDCT"
+msgstr ""
+
 #: modules/codec/mpeg_video/idct/idctclassic.c:41
 msgid "classic IDCT"
 msgstr ""
@@ -1848,10 +1995,6 @@ msgstr ""
 msgid "MMX EXT IDCT"
 msgstr ""
 
-#: modules/codec/mpeg_video/motion/motion.c:42
-msgid "motion compensation"
-msgstr ""
-
 #: modules/codec/mpeg_video/motion/motion3dnow.c:44
 msgid "3D Now! motion compensation"
 msgstr ""
@@ -1860,6 +2003,10 @@ msgstr ""
 msgid "AltiVec motion compensation"
 msgstr ""
 
+#: modules/codec/mpeg_video/motion/motion.c:42
+msgid "motion compensation"
+msgstr ""
+
 #: modules/codec/mpeg_video/motion/motionmmx.c:45
 msgid "MMX motion compensation"
 msgstr ""
@@ -2029,20 +2176,20 @@ msgstr "Esci"
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
 #: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
-#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:879
-#: modules/gui/macosx/intf.m:880 modules/gui/macosx/intf.m:881
-#: modules/gui/wxwindows/interface.cpp:810
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:902
+#: modules/gui/macosx/intf.m:903 modules/gui/macosx/intf.m:904
+#: modules/gui/wxwindows/interface.cpp:811
 msgid "Pause"
 msgstr "Pausa"
 
 #: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
 #: modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
-#: modules/gui/macosx/intf.m:300 modules/gui/macosx/intf.m:338
-#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:886
-#: modules/gui/macosx/intf.m:887 modules/gui/macosx/intf.m:888
-#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:348
-#: modules/gui/wxwindows/interface.cpp:815
+#: modules/gui/macosx/intf.m:323 modules/gui/macosx/intf.m:361
+#: modules/gui/macosx/intf.m:422 modules/gui/macosx/intf.m:909
+#: modules/gui/macosx/intf.m:910 modules/gui/macosx/intf.m:911
+#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:816
 msgid "Play"
 msgstr "Riproduci"
 
@@ -2097,8 +2244,8 @@ msgstr "Livello"
 #: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:821
 #: modules/demux/ogg.c:994 modules/gui/gtk/gnome_interface.c:148
 #: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
-#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:360
-#: modules/gui/macosx/intf.m:361
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:384
 msgid "Channels"
 msgstr "Canali"
 
@@ -2122,7 +2269,7 @@ msgstr "Numero di sorgenti"
 #: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:554
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:813 modules/demux/ogg.c:893 modules/demux/ogg.c:986
-#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:130
+#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134
 msgid "Type"
 msgstr "Tipo"
 
@@ -2771,7 +2918,7 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:201
 #: modules/gui/beos/InterfaceWindow.cpp:300
 #: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:304 modules/gui/macosx/prefs.m:75
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/prefs.m:75
 #: modules/gui/wxwindows/preferences.cpp:229
 msgid "Preferences"
 msgstr "Preferenze"
@@ -2780,7 +2927,7 @@ msgstr "Preferenze"
 #: modules/gui/beos/InterfaceWindow.cpp:298
 #: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
 #: modules/gui/kde/info.cpp:9 modules/gui/kde/messages.cpp:8
-#: modules/gui/macosx/intf.m:310 modules/gui/macosx/intf.m:387
+#: modules/gui/macosx/intf.m:333 modules/gui/macosx/intf.m:410
 #: modules/gui/wxwindows/messages.cpp:79
 msgid "Messages"
 msgstr "Messaggi"
@@ -2795,16 +2942,16 @@ msgstr "Messaggi"
 #: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
 #: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
 #: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:264
-#: modules/gui/macosx/output.m:121 modules/gui/macosx/output.m:194
-#: modules/gui/macosx/output.m:279 modules/gui/wxwindows/interface.cpp:335
+#: modules/gui/macosx/output.m:125 modules/gui/macosx/output.m:200
+#: modules/gui/macosx/output.m:285 modules/gui/wxwindows/interface.cpp:336
 #: modules/gui/wxwindows/open.cpp:276 modules/gui/wxwindows/streamout.cpp:340
 msgid "File"
 msgstr "Archivio"
 
 #: modules/gui/beos/InterfaceWindow.cpp:240
 #: modules/gui/beos/PlayListWindow.cpp:84
-#: modules/gui/gtk/gnome_interface.c:2179
-#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332
 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677
 msgid "Open File"
 msgstr "Apri File"
@@ -2826,7 +2973,7 @@ msgid "About"
 msgstr "Info su"
 
 #: modules/gui/beos/InterfaceWindow.cpp:256 modules/gui/kde/interface.cpp:93
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/intf.m:377
+#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:400
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
@@ -2865,8 +3012,8 @@ msgid "Speed"
 msgstr "Selezionato"
 
 #: modules/gui/beos/InterfaceWindow.cpp:286 modules/gui/macosx/controls.m:422
-#: modules/gui/macosx/intf.m:299 modules/gui/macosx/intf.m:341
-#: modules/gui/wxwindows/interface.cpp:357
+#: modules/gui/macosx/intf.m:322 modules/gui/macosx/intf.m:364
+#: modules/gui/wxwindows/interface.cpp:358
 msgid "Slower"
 msgstr "Lento"
 
@@ -2876,12 +3023,12 @@ msgid "Normal"
 msgstr "Dimensione Normale"
 
 #: modules/gui/beos/InterfaceWindow.cpp:290 modules/gui/macosx/controls.m:421
-#: modules/gui/macosx/intf.m:302 modules/gui/macosx/intf.m:340
-#: modules/gui/wxwindows/interface.cpp:359
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/wxwindows/interface.cpp:360
 msgid "Faster"
 msgstr "Veloce"
 
-#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:381
+#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:404
 msgid "Window"
 msgstr "Finestra"
 
@@ -2895,7 +3042,7 @@ msgstr "Playlist"
 #: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
 #: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
 #: modules/gui/gtk/preferences.c:605 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:117
+#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:121
 #: modules/gui/wxwindows/fileinfo.cpp:96
 #: modules/gui/wxwindows/messages.cpp:102 modules/gui/wxwindows/open.cpp:267
 #: modules/gui/wxwindows/preferences.cpp:250
@@ -2917,16 +3064,16 @@ msgstr "Apri file sottotitolo"
 msgid "Drop files to play"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:167
+#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:169
 #: modules/gui/wxwindows/playlist.cpp:154
 msgid "Close"
 msgstr "Chiudi"
 
-#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:330
+#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:353
 msgid "Edit"
 msgstr "Composizione"
 
-#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:335
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:358
 #: modules/gui/macosx/playlist.m:180
 msgid "Select All"
 msgstr "Seleziona Tutto"
@@ -2980,24 +3127,24 @@ msgstr "Nome"
 #: modules/gui/beos/PreferencesWindow.cpp:44
 #: modules/gui/beos/PreferencesWindow.cpp:46
 #: modules/gui/beos/PreferencesWindow.cpp:98
-#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:607
-#: modules/gui/macosx/prefs.m:615 modules/gui/macosx/prefs.m:685
+#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:690
+#: modules/gui/macosx/prefs.m:698 modules/gui/macosx/prefs.m:768
 msgid "Modules"
 msgstr "Moduli"
 
-#: modules/gui/beos/PreferencesWindow.cpp:220
+#: modules/gui/beos/PreferencesWindow.cpp:219
 #: modules/gui/gtk/preferences.c:609
 msgid "Apply"
 msgstr "Applica"
 
-#: modules/gui/beos/PreferencesWindow.cpp:225
+#: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
-#: modules/gui/macosx/output.m:332 modules/gui/macosx/prefs.m:76
+#: modules/gui/macosx/output.m:338 modules/gui/macosx/prefs.m:76
 #: modules/gui/wxwindows/preferences.cpp:254
 msgid "Save"
 msgstr "Registra"
 
-#: modules/gui/beos/PreferencesWindow.cpp:229
+#: modules/gui/beos/PreferencesWindow.cpp:228
 #, fuzzy
 msgid "Defaults"
 msgstr "Preimpostato"
@@ -3038,6 +3185,7 @@ msgid "Take Screen Shot"
 msgstr ""
 
 #: modules/gui/beos/VlcWrapper.cpp:185 modules/gui/gtk/menu.c:733
+#: modules/gui/macosx/prefs.m:348
 msgid "None"
 msgstr "Nessuno"
 
@@ -3068,8 +3216,8 @@ msgstr ""
 msgid "VLC media player"
 msgstr "VLC media player"
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:652
-#: modules/gui/wxwindows/preferences.cpp:965
+#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:663
+#: modules/gui/wxwindows/preferences.cpp:967
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr "Apri file"
@@ -3093,8 +3241,8 @@ msgstr "Riproduci sorgente"
 #: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
 #: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
 #: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:435
-#: modules/gui/macosx/intf.m:301 modules/gui/macosx/intf.m:339
-#: modules/gui/macosx/intf.m:400 modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
+#: modules/gui/macosx/intf.m:423 modules/gui/wxwindows/interface.cpp:347
 msgid "Stop"
 msgstr "Interrompi"
 
@@ -3126,7 +3274,7 @@ msgstr "UDP/RTP (Indirizzo quando Multicast)"
 
 #: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
 #: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:160
-#: modules/gui/macosx/output.m:124 modules/gui/wxwindows/open.cpp:445
+#: modules/gui/macosx/output.m:128 modules/gui/wxwindows/open.cpp:456
 #: modules/gui/wxwindows/streamout.cpp:380
 msgid "Address"
 msgstr "Indirizzo"
@@ -3136,13 +3284,13 @@ msgstr "Indirizzo"
 #: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
 #: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
 #: modules/gui/macosx/open.m:159 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:125 modules/gui/wxwindows/open.cpp:430
-#: modules/gui/wxwindows/open.cpp:453 modules/gui/wxwindows/streamout.cpp:390
+#: modules/gui/macosx/output.m:129 modules/gui/wxwindows/open.cpp:441
+#: modules/gui/wxwindows/open.cpp:464 modules/gui/wxwindows/streamout.cpp:390
 msgid "Port"
 msgstr "Porta"
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:127
-#: modules/gui/macosx/output.m:221 modules/gui/macosx/output.m:289
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:131
+#: modules/gui/macosx/output.m:227 modules/gui/macosx/output.m:295
 #: modules/gui/wxwindows/streamout.cpp:341
 msgid "HTTP"
 msgstr "HTTP"
@@ -3221,10 +3369,10 @@ msgid ""
 "from local or network sources."
 msgstr ""
 
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
+#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100
 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Non riesco a trovare il file pixmap: %s"
@@ -3234,6 +3382,73 @@ msgstr "Non riesco a trovare il file pixmap: %s"
 msgid "Error loading pixmap file: %s"
 msgstr "Errore caricamento file pixmap: %s"
 
+#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
+#, fuzzy
+msgid "Gtk2 interface"
+msgstr "interfaccia Gtk+"
+
+#: modules/gui/gtk2/gnome2_interface.c:31
+#, fuzzy
+msgid "_New"
+msgstr "_Vista"
+
+#: modules/gui/gtk2/gnome2_interface.c:87
+msgid "gnome2"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:112
+#, fuzzy
+msgid "button4"
+msgstr "pulsante Mouse"
+
+#: modules/gui/gtk2/gnome2_interface.c:122
+#: modules/gui/gtk2/gtk2_interface.c:183
+#, fuzzy
+msgid "button3"
+msgstr "pulsante Mouse"
+
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337
+msgid "Save File"
+msgstr "Registra File"
+
+#: modules/gui/gtk2/gtk2_interface.c:67
+#, fuzzy
+msgid "window1"
+msgstr "Finestra"
+
+#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147
+#: modules/gui/gtk/gtk_interface.c:1373
+msgid "_File"
+msgstr "Archivio"
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+#, fuzzy
+msgid "_Edit"
+msgstr "Composizione"
+
+#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268
+msgid "_View"
+msgstr "_Vista"
+
+#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569
+msgid "_Help"
+msgstr "Aiuto"
+
+#: modules/gui/gtk2/gtk2_interface.c:146
+#, fuzzy
+msgid "_About"
+msgstr "Info su"
+
+#: modules/gui/gtk2/gtk2_interface.c:163
+#, fuzzy
+msgid "button1"
+msgstr "pulsante Mouse"
+
+#: modules/gui/gtk2/gtk2_interface.c:173
+#, fuzzy
+msgid "button2"
+msgstr "pulsante Mouse"
+
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 #, fuzzy
 msgid "Show tooltips"
@@ -3279,7 +3494,7 @@ msgstr "Apri File..."
 #: modules/gui/gtk/gnome_interface.c:20 modules/gui/gtk/gnome_interface.c:504
 #: modules/gui/gtk/gnome_interface.c:986 modules/gui/gtk/gtk_interface.c:173
 #: modules/gui/gtk/gtk_interface.c:619 modules/gui/gtk/gtk_interface.c:1399
-#: modules/gui/wxwindows/interface.cpp:230
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Open a file"
 msgstr "Apri un File"
 
@@ -3379,25 +3594,25 @@ msgstr "Seleziona canale audio"
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:909
 #: modules/gui/gtk/gtk_interface.c:452 modules/gui/gtk/gtk_interface.c:1253
-#: modules/gui/macosx/intf.m:355
+#: modules/gui/macosx/intf.m:378
 msgid "Volume Up"
 msgstr "Alza Volume"
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:916
 #: modules/gui/gtk/gtk_interface.c:459 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:356
+#: modules/gui/macosx/intf.m:379
 msgid "Volume Down"
 msgstr "Abbassa Volume"
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:923
 #: modules/gui/gtk/gtk_interface.c:466 modules/gui/gtk/gtk_interface.c:1267
-#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:357
+#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:380
 msgid "Mute"
 msgstr "Muto"
 
 #: modules/gui/gtk/gnome_interface.c:155 modules/gui/gtk/gnome_interface.c:938
 #: modules/gui/gtk/gtk_interface.c:488 modules/gui/gtk/gtk_interface.c:1289
-#: modules/gui/macosx/intf.m:362 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:385 modules/gui/macosx/intf.m:386
 msgid "Device"
 msgstr "Periferica"
 
@@ -3416,18 +3631,10 @@ msgstr "Seleziona canale sottotitoli"
 msgid "_Fullscreen"
 msgstr "A schermo pieno"
 
-#: modules/gui/gtk/gnome_interface.c:183 modules/gui/gtk/gnome_interface.c:966
-#: modules/gui/gtk/gtk_interface.c:553 modules/gui/gtk/gtk_interface.c:1349
-#: modules/gui/macosx/controls.m:526 modules/gui/macosx/intf.m:378
-#: modules/gui/macosx/intf.m:379
-#: modules/video_filter/deinterlace/deinterlace.c:81
-msgid "Deinterlace"
-msgstr "Deinterlaccia"
-
 #: modules/gui/gtk/gnome_interface.c:190 modules/gui/gtk/gnome_interface.c:973
 #: modules/gui/gtk/gtk_interface.c:560 modules/gui/gtk/gtk_interface.c:1356
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/intf.m:375
-#: modules/gui/macosx/output.m:120 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/intf.m:397 modules/gui/macosx/intf.m:398
+#: modules/gui/macosx/output.m:124 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr "Schermo"
 
@@ -3444,18 +3651,18 @@ msgstr "_Video"
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
 #: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2005
 #: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:142
-#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:337
+#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:338
 #: modules/gui/wxwindows/open.cpp:278
 msgid "Disc"
 msgstr "Disco"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:339
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Net"
 msgstr "Rete"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:343
 msgid "Sat"
 msgstr "Sat"
 
@@ -3517,7 +3724,7 @@ msgstr "Apri Playlist"
 #: modules/gui/gtk/gnome_interface.c:1063 modules/gui/gtk/gtk_interface.c:758
 #: modules/gui/gtk/gtk_interface.c:844 modules/gui/gtk/gtk_interface.c:888
 #: modules/gui/gtk/gtk_interface.c:1173
-#: modules/gui/wxwindows/interface.cpp:353
+#: modules/gui/wxwindows/interface.cpp:354
 msgid "Prev"
 msgstr "Precedente"
 
@@ -3529,8 +3736,8 @@ msgstr "File Precedente"
 #: modules/gui/gtk/gnome_interface.c:1056 modules/gui/gtk/gtk_interface.c:769
 #: modules/gui/gtk/gtk_interface.c:852 modules/gui/gtk/gtk_interface.c:896
 #: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:443
-#: modules/gui/macosx/intf.m:303 modules/gui/macosx/intf.m:343
-#: modules/gui/macosx/intf.m:401 modules/gui/wxwindows/interface.cpp:355
+#: modules/gui/macosx/intf.m:326 modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:424 modules/gui/wxwindows/interface.cpp:356
 msgid "Next"
 msgstr "Successivo"
 
@@ -3626,8 +3833,8 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
 #: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
 #: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:173
-#: modules/gui/macosx/output.m:123 modules/gui/wxwindows/open.cpp:246
-#: modules/gui/wxwindows/open.cpp:343
+#: modules/gui/macosx/output.m:127 modules/gui/wxwindows/open.cpp:246
+#: modules/gui/wxwindows/open.cpp:354
 #: modules/gui/wxwindows/preferences.cpp:778
 #: modules/gui/wxwindows/streamout.cpp:367
 #: modules/gui/wxwindows/subtitles.cpp:107
@@ -3635,24 +3842,24 @@ msgid "Browse..."
 msgstr "Sfoglia..."
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:368
+#: modules/gui/wxwindows/open.cpp:379
 msgid "Disc type"
 msgstr "Tipo Disco"
 
 #: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
 #: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:488
-#: modules/gui/wxwindows/open.cpp:362
+#: modules/gui/wxwindows/open.cpp:373
 msgid "DVD"
 msgstr "DVD"
 
 #: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
 #: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:382
-#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:363
+#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:374
 msgid "VCD"
 msgstr "VCD"
 
 #: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:374
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:385
 msgid "Device name"
 msgstr "Nome Periferica"
 
@@ -3663,24 +3870,24 @@ msgstr "Usa menu DVD"
 
 #: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:547
-#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:409
+#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:420
 msgid "UDP/RTP"
 msgstr "UDP/RTP"
 
 #: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
 #: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:548
-#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:421
 msgid "UDP/RTP Multicast"
 msgstr "UDP/RTP Multicast"
 
 #: modules/gui/gtk/gnome_interface.c:1727 modules/gui/gtk/gtk_interface.c:2042
 #: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:549
-#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:411
+#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:422
 msgid "HTTP/FTP/MMS"
 msgstr "HTTP/FTP/MMS"
 
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:467
+#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:478
 msgid "URL"
 msgstr "URL"
 
@@ -3728,7 +3935,7 @@ msgid "fps"
 msgstr "fps"
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:116
+#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:120
 #: modules/gui/wxwindows/open.cpp:201 modules/gui/wxwindows/open.cpp:223
 msgid "Settings..."
 msgstr "Impostazioni..."
@@ -3805,14 +4012,14 @@ msgid "Destination Target: "
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:128 modules/gui/macosx/output.m:231
-#: modules/gui/macosx/output.m:290 modules/gui/wxwindows/streamout.cpp:342
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/output.m:237
+#: modules/gui/macosx/output.m:296 modules/gui/wxwindows/streamout.cpp:342
 msgid "UDP"
 msgstr "UDP"
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:129 modules/gui/macosx/output.m:241
-#: modules/gui/macosx/output.m:292 modules/gui/wxwindows/streamout.cpp:343
+#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:298 modules/gui/wxwindows/streamout.cpp:343
 msgid "RTP"
 msgstr "RTP"
 
@@ -3833,8 +4040,8 @@ msgid "PS"
 msgstr "PS"
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:135 modules/gui/macosx/output.m:273
-#: modules/gui/macosx/output.m:319
+#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:279
+#: modules/gui/macosx/output.m:325
 msgid "AVI"
 msgstr "AVI"
 
@@ -3851,11 +4058,6 @@ msgstr "Gtk+"
 msgid "Gtk+ interface"
 msgstr "interfaccia Gtk+"
 
-#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
-#: modules/gui/gtk2/gtk2_interface.c:77
-msgid "_File"
-msgstr "Archivio"
-
 #: modules/gui/gtk/gtk_interface.c:238
 msgid "_Close"
 msgstr "_Chiudi"
@@ -3872,10 +4074,6 @@ msgstr "Esci"
 msgid "Exit the program"
 msgstr "Esci dal programma"
 
-#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132
-msgid "_View"
-msgstr "_Vista"
-
 #: modules/gui/gtk/gtk_interface.c:294
 msgid "Hide the main interface window"
 msgstr "Nascondi la finestra dell'interfaccia principale"
@@ -3896,10 +4094,6 @@ msgstr "_Preferenze..."
 msgid "Configure the application"
 msgstr "Configura l'applicazione"
 
-#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139
-msgid "_Help"
-msgstr "Aiuto"
-
 #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435
 msgid "_About..."
 msgstr "Info su..."
@@ -4004,60 +4198,6 @@ msgstr "Configura"
 msgid "Selected:"
 msgstr "Selezionato:"
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-#, fuzzy
-msgid "Gtk2 interface"
-msgstr "interfaccia Gtk+"
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-#, fuzzy
-msgid "_New"
-msgstr "_Vista"
-
-#: modules/gui/gtk2/gnome2_interface.c:87
-msgid "gnome2"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:112
-#, fuzzy
-msgid "button4"
-msgstr "pulsante Mouse"
-
-#: modules/gui/gtk2/gnome2_interface.c:122
-#: modules/gui/gtk2/gtk2_interface.c:183
-#, fuzzy
-msgid "button3"
-msgstr "pulsante Mouse"
-
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:331
-msgid "Save File"
-msgstr "Registra File"
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-#, fuzzy
-msgid "window1"
-msgstr "Finestra"
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-#, fuzzy
-msgid "_Edit"
-msgstr "Composizione"
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-#, fuzzy
-msgid "_About"
-msgstr "Info su"
-
-#: modules/gui/gtk2/gtk2_interface.c:163
-#, fuzzy
-msgid "button1"
-msgstr "pulsante Mouse"
-
-#: modules/gui/gtk2/gtk2_interface.c:173
-#, fuzzy
-msgid "button2"
-msgstr "pulsante Mouse"
-
 #: modules/gui/kde/interface.cpp:88
 msgid "Languages"
 msgstr "Lingue"
@@ -4087,219 +4227,219 @@ msgstr "Messaggi:"
 msgid "Plugins"
 msgstr ""
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:315
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:338
 msgid "About VLC media player"
 msgstr "Info su VLC media player"
 
 #: modules/gui/macosx/controls.m:344 modules/gui/macosx/controls.m:487
-#: modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:389
 msgid "Half Size"
 msgstr "Dimensione Dimezzata"
 
 #: modules/gui/macosx/controls.m:346 modules/gui/macosx/controls.m:488
-#: modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:390
 msgid "Normal Size"
 msgstr "Dimensione Normale"
 
 #: modules/gui/macosx/controls.m:348 modules/gui/macosx/controls.m:489
-#: modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/intf.m:391
 msgid "Double Size"
 msgstr "Dimensione Doppia"
 
 #: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:491
 #: modules/gui/macosx/controls.m:498 modules/gui/macosx/controls.m:520
-#: modules/gui/macosx/intf.m:371
+#: modules/gui/macosx/intf.m:394
 msgid "Float On Top"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:490
-#: modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/intf.m:392
 #, fuzzy
 msgid "Fit To Screen"
 msgstr "Schermo"
 
-#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:298
-#: modules/gui/macosx/intf.m:342 modules/gui/macosx/intf.m:402
+#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:321
+#: modules/gui/macosx/intf.m:365 modules/gui/macosx/intf.m:425
 msgid "Previous"
 msgstr "Precedente"
 
-#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:344
+#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:367
 msgid "Loop"
 msgstr "Ripeti"
 
-#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:345
+#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:368
 msgid "Step Forward"
 msgstr "Vai Avanti"
 
-#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:346
+#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:369
 msgid "Step Backward"
 msgstr "Vai Indietro"
 
-#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:386
-#: modules/gui/macosx/intf.m:411
+#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:434
 msgid "Info"
 msgstr "Informazioni"
 
-#: modules/gui/macosx/intf.m:293
+#: modules/gui/macosx/intf.m:316
 msgid "VLC - Controller"
 msgstr "Pannello - VLC"
 
-#: modules/gui/macosx/intf.m:305
+#: modules/gui/macosx/intf.m:328
 msgid "Volume"
 msgstr "Volume"
 
-#: modules/gui/macosx/intf.m:306
+#: modules/gui/macosx/intf.m:329
 msgid "Position"
 msgstr "Posizione"
 
-#: modules/gui/macosx/intf.m:312
+#: modules/gui/macosx/intf.m:335
 msgid "Open CrashLog"
 msgstr "Apri Rapporto Crash"
 
-#: modules/gui/macosx/intf.m:316
+#: modules/gui/macosx/intf.m:339
 msgid "Preferences..."
 msgstr "Preferenze..."
 
-#: modules/gui/macosx/intf.m:317
+#: modules/gui/macosx/intf.m:340
 msgid "Hide VLC"
 msgstr "Nascondi VLC"
 
-#: modules/gui/macosx/intf.m:318
+#: modules/gui/macosx/intf.m:341
 msgid "Hide Others"
 msgstr "Nascondi Altre"
 
-#: modules/gui/macosx/intf.m:319
+#: modules/gui/macosx/intf.m:342
 msgid "Show All"
 msgstr "Mostra Tutte"
 
-#: modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:343
 msgid "Quit VLC"
 msgstr "Esci da VLC"
 
-#: modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/intf.m:345
 msgid "1:File"
 msgstr "1:File"
 
-#: modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:346
 msgid "Open..."
 msgstr "Apri..."
 
-#: modules/gui/macosx/intf.m:324
+#: modules/gui/macosx/intf.m:347
 msgid "Open File..."
 msgstr "Apri File..."
 
-#: modules/gui/macosx/intf.m:325
+#: modules/gui/macosx/intf.m:348
 msgid "Open Disc..."
 msgstr "Apri Disco..."
 
-#: modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:349
 msgid "Open Network..."
 msgstr "Apri Rete..."
 
-#: modules/gui/macosx/intf.m:327
+#: modules/gui/macosx/intf.m:350
 msgid "Open Recent"
 msgstr "Apri Recenti"
 
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/intf.m:1291
+#: modules/gui/macosx/intf.m:351 modules/gui/macosx/intf.m:1314
 msgid "Clear Menu"
 msgstr "Cancella Menu"
 
-#: modules/gui/macosx/intf.m:331
+#: modules/gui/macosx/intf.m:354
 msgid "Cut"
 msgstr "Taglia"
 
-#: modules/gui/macosx/intf.m:332
+#: modules/gui/macosx/intf.m:355
 msgid "Copy"
 msgstr "Copia"
 
-#: modules/gui/macosx/intf.m:333
+#: modules/gui/macosx/intf.m:356
 msgid "Paste"
 msgstr "Incolla"
 
-#: modules/gui/macosx/intf.m:334
+#: modules/gui/macosx/intf.m:357
 msgid "Clear"
 msgstr "Elimina"
 
-#: modules/gui/macosx/intf.m:337
+#: modules/gui/macosx/intf.m:360
 msgid "Controls"
 msgstr "Controlli"
 
-#: modules/gui/macosx/intf.m:358 modules/gui/macosx/intf.m:359
+#: modules/gui/macosx/intf.m:381 modules/gui/macosx/intf.m:382
 #, fuzzy
 msgid "Audio Track"
 msgstr "Audio"
 
-#: modules/gui/macosx/intf.m:372 modules/gui/macosx/intf.m:373
+#: modules/gui/macosx/intf.m:395 modules/gui/macosx/intf.m:396
 #, fuzzy
 msgid "Video Track"
 msgstr "Video"
 
-#: modules/gui/macosx/intf.m:382
+#: modules/gui/macosx/intf.m:405
 msgid "Minimize Window"
 msgstr "Contrai Finestra"
 
-#: modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:406
 msgid "Close Window"
 msgstr "Chiudi Finestra"
 
-#: modules/gui/macosx/intf.m:384
+#: modules/gui/macosx/intf.m:407
 msgid "Controller"
 msgstr "Pannello"
 
-#: modules/gui/macosx/intf.m:389
+#: modules/gui/macosx/intf.m:412
 msgid "Bring All to Front"
 msgstr "Porta tutto in primo piano"
 
-#: modules/gui/macosx/intf.m:391
+#: modules/gui/macosx/intf.m:414
 msgid "Help"
 msgstr "Aiuto"
 
-#: modules/gui/macosx/intf.m:392
+#: modules/gui/macosx/intf.m:415
 msgid "ReadMe..."
 msgstr "Leggimi..."
 
-#: modules/gui/macosx/intf.m:393
+#: modules/gui/macosx/intf.m:416
 msgid "Online Documentation"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/intf.m:417
 msgid "Report a Bug"
 msgstr "Segnala Un Errore"
 
-#: modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/intf.m:418
 msgid "VideoLAN Website"
 msgstr "Sito Web VideoLAN"
 
-#: modules/gui/macosx/intf.m:396
+#: modules/gui/macosx/intf.m:419
 msgid "License"
 msgstr "Licenza"
 
-#: modules/gui/macosx/intf.m:405
+#: modules/gui/macosx/intf.m:428
 msgid "Error"
 msgstr "Errore"
 
-#: modules/gui/macosx/intf.m:406
+#: modules/gui/macosx/intf.m:429
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:407
+#: modules/gui/macosx/intf.m:430
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:408
+#: modules/gui/macosx/intf.m:431
 msgid "Open Messages Window"
 msgstr "Apri la finestra messaggi"
 
-#: modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:432
 msgid "Dismiss"
 msgstr "Chiudi"
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid "No CrashLog found"
 msgstr "Nessun Rapporto Crash trovato"
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4377,65 +4517,58 @@ msgstr "Nessun %@ trovato"
 msgid "Open VIDEO_TS Directory"
 msgstr "Apri Cartella VIDEO_TS"
 
-#: modules/gui/macosx/output.m:115
+#: modules/gui/macosx/output.m:119
 #, fuzzy
 msgid "Advanced output:"
 msgstr "uscita audio ALSA"
 
-#: modules/gui/macosx/output.m:119
+#: modules/gui/macosx/output.m:123
 #, fuzzy
 msgid "Output Options"
 msgstr "Metodo Uscita"
 
-#: modules/gui/macosx/output.m:122 modules/gui/macosx/output.m:210
-#: modules/gui/macosx/output.m:285
+#: modules/gui/macosx/output.m:126 modules/gui/macosx/output.m:216
+#: modules/gui/macosx/output.m:291
 #, fuzzy
 msgid "Stream"
 msgstr "Interrompi sorgente"
 
-#: modules/gui/macosx/output.m:126
+#: modules/gui/macosx/output.m:130
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132 modules/gui/wxwindows/streamout.cpp:437
+#: modules/gui/macosx/output.m:136 modules/gui/wxwindows/streamout.cpp:437
 msgid "Encapsulation Method"
 msgstr "Metodo Incapsulazione"
 
-#: modules/gui/macosx/output.m:133
+#: modules/gui/macosx/output.m:137
 msgid "MPEG TS"
 msgstr "MPEG TS"
 
-#: modules/gui/macosx/output.m:134 modules/gui/macosx/output.m:275
-#: modules/gui/macosx/output.m:317
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:281
+#: modules/gui/macosx/output.m:323
 msgid "MPEG PS"
 msgstr "MPEG PS"
 
-#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:274
-#: modules/gui/macosx/output.m:321
+#: modules/gui/macosx/output.m:140 modules/gui/macosx/output.m:280
+#: modules/gui/macosx/output.m:327
 msgid "Ogg"
 msgstr "Ogg"
 
-#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:276
-#: modules/gui/macosx/output.m:323
+#: modules/gui/macosx/output.m:141 modules/gui/macosx/output.m:282
+#: modules/gui/macosx/output.m:329
 msgid "mp4"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139
+#: modules/gui/macosx/output.m:143
 #, fuzzy
 msgid "Transcode options"
 msgstr "Pausa sorgente"
 
-#: modules/gui/macosx/output.m:149 modules/gui/macosx/output.m:153
-msgid "Bitrate (bps)"
-msgstr ""
-
-#: modules/gui/macosx/output.m:151
-#, fuzzy
-msgid "mpga"
-msgstr "ffmpeg"
-
-#: modules/gui/macosx/output.m:152
-msgid "a52 "
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:158
+#: modules/gui/wxwindows/streamout.cpp:512
+#: modules/gui/wxwindows/streamout.cpp:549
+msgid "Bitrate (kb/s)"
 msgstr ""
 
 #: modules/gui/macosx/prefs.m:78 modules/gui/wxwindows/preferences.cpp:256
@@ -4448,12 +4581,6 @@ msgstr "Seleziona Tutto"
 msgid "Advanced"
 msgstr "Avanzate..."
 
-#: modules/gui/macosx/prefs.m:143 modules/gui/macosx/prefs.m:341
-#: modules/gui/macosx/prefs.m:368
-#, fuzzy
-msgid "Auto"
-msgstr "Autori"
-
 #: modules/gui/ncurses/ncurses.c:66
 msgid "ncurses interface"
 msgstr "interfaccia ncurses"
@@ -4466,33 +4593,33 @@ msgstr "uscita video e audio QNX RTOS"
 msgid "Qt interface"
 msgstr "interfaccia Qt"
 
-#: modules/gui/skins/src/skin_main.cpp:251
-#: modules/gui/skins/src/vlcproc.cpp:338
+#: modules/gui/skins/src/skin_main.cpp:239
+#: modules/gui/skins/src/vlcproc.cpp:339
 #, fuzzy
 msgid "Open a skin file"
 msgstr "Apri un File"
 
-#: modules/gui/skins/src/skin_main.cpp:292
-#: modules/gui/skins/src/skin_main.cpp:293
+#: modules/gui/skins/src/skin_main.cpp:280
+#: modules/gui/skins/src/skin_main.cpp:281
 msgid "Last skin actually used"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:294
-#: modules/gui/skins/src/skin_main.cpp:295
+#: modules/gui/skins/src/skin_main.cpp:282
+#: modules/gui/skins/src/skin_main.cpp:283
 msgid "Config of last used skin"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:296
-#: modules/gui/skins/src/skin_main.cpp:297
+#: modules/gui/skins/src/skin_main.cpp:284
+#: modules/gui/skins/src/skin_main.cpp:285
 msgid "Show application in system tray"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:298
-#: modules/gui/skins/src/skin_main.cpp:299
+#: modules/gui/skins/src/skin_main.cpp:286
+#: modules/gui/skins/src/skin_main.cpp:287
 msgid "Show application in taskbar"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:310
+#: modules/gui/skins/src/skin_main.cpp:298
 msgid "Skinnable Interface"
 msgstr ""
 
@@ -4501,166 +4628,167 @@ msgstr ""
 msgid "FileInfo"
 msgstr "Informazioni &File..."
 
-#: modules/gui/wxwindows/interface.cpp:231
+#: modules/gui/wxwindows/interface.cpp:232
 msgid "Open a DVD or (S)VCD"
 msgstr "Apri un DVD o (S)VCD"
 
-#: modules/gui/wxwindows/interface.cpp:232
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Open a network stream"
 msgstr "Apri una sorgente di rete"
 
-#: modules/gui/wxwindows/interface.cpp:233
+#: modules/gui/wxwindows/interface.cpp:234
 msgid "Open a satellite stream"
 msgstr "Apri una sorgente satellite"
 
-#: modules/gui/wxwindows/interface.cpp:234
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "Eject the DVD/CD"
 msgstr "Espelli il DVD/CD"
 
-#: modules/gui/wxwindows/interface.cpp:235
+#: modules/gui/wxwindows/interface.cpp:236
 msgid "Exit this program"
 msgstr "Esci da questo programma"
 
-#: modules/gui/wxwindows/interface.cpp:237
+#: modules/gui/wxwindows/interface.cpp:238
 msgid "Open the playlist"
 msgstr "Apri la playlist"
 
-#: modules/gui/wxwindows/interface.cpp:238
+#: modules/gui/wxwindows/interface.cpp:239
 msgid "Show the program logs"
 msgstr "Mostra i resoconti del programma"
 
-#: modules/gui/wxwindows/interface.cpp:239
+#: modules/gui/wxwindows/interface.cpp:240
 msgid "Show information about the file being played"
 msgstr "Mostra le informazioni sul file in riproduzione"
 
-#: modules/gui/wxwindows/interface.cpp:241
+#: modules/gui/wxwindows/interface.cpp:242
 msgid "Go to the preferences menu"
 msgstr "Vai al menu preferenze"
 
-#: modules/gui/wxwindows/interface.cpp:243
+#: modules/gui/wxwindows/interface.cpp:244
 msgid "About this program"
 msgstr "Informazioni su questo programma"
 
-#: modules/gui/wxwindows/interface.cpp:247
+#: modules/gui/wxwindows/interface.cpp:248
 msgid "&Open File..."
 msgstr "Apri File..."
 
-#: modules/gui/wxwindows/interface.cpp:249
+#: modules/gui/wxwindows/interface.cpp:250
 msgid "Open &Disc..."
 msgstr "Apri &Disco..."
 
-#: modules/gui/wxwindows/interface.cpp:251
+#: modules/gui/wxwindows/interface.cpp:252
 msgid "&Network Stream..."
 msgstr "Sorgente di Rete..."
 
-#: modules/gui/wxwindows/interface.cpp:254
+#: modules/gui/wxwindows/interface.cpp:255
 msgid "&Satellite Stream..."
 msgstr "Sorgente &Satellite..."
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:260
 msgid "&Eject Disc"
 msgstr "&Espelli Disco"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:264
 msgid "E&xit"
 msgstr "Esci"
 
-#: modules/gui/wxwindows/interface.cpp:267
+#: modules/gui/wxwindows/interface.cpp:268
 msgid "&Playlist..."
 msgstr "&Playlist..."
 
-#: modules/gui/wxwindows/interface.cpp:269
-msgid "&Logs..."
-msgstr "&Resoconti..."
-
 #: modules/gui/wxwindows/interface.cpp:270
+#, fuzzy
+msgid "&Messages..."
+msgstr "Messaggi..."
+
+#: modules/gui/wxwindows/interface.cpp:271
 msgid "&File info..."
 msgstr "Informazioni &File..."
 
-#: modules/gui/wxwindows/interface.cpp:275
+#: modules/gui/wxwindows/interface.cpp:276
 msgid "&Preferences..."
 msgstr "&Preferenze..."
 
-#: modules/gui/wxwindows/interface.cpp:292
+#: modules/gui/wxwindows/interface.cpp:293
 msgid "&About..."
 msgstr "Info su..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:297
 msgid "&File"
 msgstr "&Archivio"
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:298
 msgid "&View"
 msgstr "&Vista"
 
-#: modules/gui/wxwindows/interface.cpp:298
+#: modules/gui/wxwindows/interface.cpp:299
 msgid "&Settings"
 msgstr "Impo&stazioni"
 
-#: modules/gui/wxwindows/interface.cpp:299
-#: modules/gui/wxwindows/interface.cpp:476
-#: modules/gui/wxwindows/interface.cpp:524
+#: modules/gui/wxwindows/interface.cpp:300
+#: modules/gui/wxwindows/interface.cpp:478
+#: modules/gui/wxwindows/interface.cpp:526
 msgid "&Audio"
 msgstr "&Audio"
 
-#: modules/gui/wxwindows/interface.cpp:300
-#: modules/gui/wxwindows/interface.cpp:495
-#: modules/gui/wxwindows/interface.cpp:528
+#: modules/gui/wxwindows/interface.cpp:301
+#: modules/gui/wxwindows/interface.cpp:497
+#: modules/gui/wxwindows/interface.cpp:530
 #, fuzzy
 msgid "&Video"
 msgstr "Video"
 
-#: modules/gui/wxwindows/interface.cpp:301
-#: modules/gui/wxwindows/interface.cpp:514
-#: modules/gui/wxwindows/interface.cpp:532
+#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:516
+#: modules/gui/wxwindows/interface.cpp:534
 #, fuzzy
 msgid "&Navigation"
 msgstr "Navigazione"
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:303
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: modules/gui/wxwindows/interface.cpp:318
+#: modules/gui/wxwindows/interface.cpp:319
 msgid "Stop current playlist item"
 msgstr "Interrompi lÕelemento playlist corrente"
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:320
 msgid "Play current playlist item"
 msgstr "Riproduci lÕelemento playlist corrente"
 
-#: modules/gui/wxwindows/interface.cpp:320
+#: modules/gui/wxwindows/interface.cpp:321
 msgid "Pause current playlist item"
 msgstr "Metti in pausa lÕelemento playlist corrente"
 
-#: modules/gui/wxwindows/interface.cpp:321
+#: modules/gui/wxwindows/interface.cpp:322
 #: modules/gui/wxwindows/playlist.cpp:351
 msgid "Open playlist"
 msgstr "Apri playlist"
 
-#: modules/gui/wxwindows/interface.cpp:322
+#: modules/gui/wxwindows/interface.cpp:323
 msgid "Previous playlist item"
 msgstr "Elemento playlist precedente"
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:324
 msgid "Next playlist item"
 msgstr "Elemento playlist successivo"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:325
 msgid "Play slower"
 msgstr "Riproduci Lento"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:326
 msgid "Play faster"
 msgstr "Riproduci Veloce"
 
-#: modules/gui/wxwindows/interface.cpp:560
+#: modules/gui/wxwindows/interface.cpp:561
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:561
+#: modules/gui/wxwindows/interface.cpp:562
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
@@ -4668,7 +4796,7 @@ msgstr ""
 "(C) 1996-2003 - il Team VideoLAN\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:562
+#: modules/gui/wxwindows/interface.cpp:563
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
@@ -4678,13 +4806,13 @@ msgstr ""
 "http://www.videolan.org/\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:564
+#: modules/gui/wxwindows/interface.cpp:565
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
 "It can play MPEG and MPEG2 files from a file or from a network source."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:568
+#: modules/gui/wxwindows/interface.cpp:569
 #, c-format
 msgid "About %s"
 msgstr "Info su %s"
@@ -4697,11 +4825,11 @@ msgstr "Menu Audio"
 msgid "Video menu"
 msgstr "Menu Video"
 
-#: modules/gui/wxwindows/menus.cpp:139
+#: modules/gui/wxwindows/menus.cpp:141
 msgid "Input menu"
 msgstr "Menu Ingresso"
 
-#: modules/gui/wxwindows/menus.cpp:329
+#: modules/gui/wxwindows/menus.cpp:334
 msgid "Empty"
 msgstr ""
 
@@ -4737,16 +4865,16 @@ msgstr "Cattura ingresso sorgente"
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:361
+#: modules/gui/wxwindows/open.cpp:372
 msgid "DVD (menus support)"
 msgstr "DVD (supporto menu)"
 
-#: modules/gui/wxwindows/open.cpp:364
+#: modules/gui/wxwindows/open.cpp:375
 #, fuzzy
 msgid "CD Audio"
 msgstr "Audio"
 
-#: modules/gui/wxwindows/open.cpp:837 modules/gui/wxwindows/streamout.cpp:640
+#: modules/gui/wxwindows/open.cpp:848 modules/gui/wxwindows/streamout.cpp:640
 msgid "Save file"
 msgstr "Registra file"
 
@@ -4817,8 +4945,9 @@ msgid "No configuration options available"
 msgstr "Nessuna opzione configurazione disponibile."
 
 #: modules/gui/wxwindows/preferences.cpp:865
-msgid "Advanced..."
-msgstr "Avanzate..."
+#, fuzzy
+msgid "Advanced options"
+msgstr "mostra opzioni avanzate"
 
 #: modules/gui/wxwindows/streamout.cpp:166
 msgid "Stream output MRL"
@@ -4859,11 +4988,6 @@ msgstr "mostra opzioni avanzate"
 msgid "Video codec"
 msgstr "periferica audio"
 
-#: modules/gui/wxwindows/streamout.cpp:512
-#: modules/gui/wxwindows/streamout.cpp:549
-msgid "Bitrate (kb/s)"
-msgstr ""
-
 #: modules/gui/wxwindows/streamout.cpp:543
 #, fuzzy
 msgid "Audio codec"
@@ -4985,6 +5109,10 @@ msgstr "interfaccia file resoconti"
 msgid "Using the logger interface plugin..."
 msgstr ""
 
+#: modules/misc/memcpy/memcpyaltivec.c:52
+msgid "AltiVec memcpy"
+msgstr ""
+
 #: modules/misc/memcpy/memcpy.c:81
 msgid "libc memcpy"
 msgstr ""
@@ -5001,10 +5129,6 @@ msgstr ""
 msgid "MMX EXT memcpy"
 msgstr ""
 
-#: modules/misc/memcpy/memcpyaltivec.c:52
-msgid "AltiVec memcpy"
-msgstr ""
-
 #: modules/misc/network/ipv4.c:85
 msgid "IPv4 network abstraction layer"
 msgstr ""
@@ -5017,6 +5141,10 @@ msgstr ""
 msgid "Qt Embedded GUI helper"
 msgstr ""
 
+#: modules/misc/sap.c:131
+msgid "SAP"
+msgstr "SAP"
+
 #: modules/misc/sap.c:134
 msgid "SAP interface"
 msgstr "interfaccia SAP"
@@ -5144,7 +5272,7 @@ msgid "Set image contrast"
 msgstr ""
 
 #: modules/video_filter/adjust.c:61
-msgid "Set the image contrast. Defaults to 1"
+msgid "Set the image contrast, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:62
@@ -5160,7 +5288,7 @@ msgid "Set image saturation"
 msgstr ""
 
 #: modules/video_filter/adjust.c:65
-msgid "Set the image saturation. Defaults to 1"
+msgid "Set the image saturation, between 0 and 3. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:66
@@ -5168,7 +5296,7 @@ msgid "Set image brightness"
 msgstr ""
 
 #: modules/video_filter/adjust.c:67
-msgid "Set the image brightness. Defaults to 1"
+msgid "Set the image brightness, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:71
@@ -5211,8 +5339,10 @@ msgid "Crop geometry"
 msgstr "geometria ritaglio"
 
 #: modules/video_filter/crop.c:55
-msgid "Set the geometry of the zone to crop"
-msgstr "Imposta la geometria della zona da ritagliare"
+msgid ""
+"Set the geometry of the zone to crop. This is set as width x heigth + left "
+"offset + top offset."
+msgstr ""
 
 #: modules/video_filter/crop.c:57
 #, fuzzy
@@ -5497,11 +5627,21 @@ msgstr "utilizza memoria condivisa"
 msgid "Use shared memory to communicate between VLC and the X server."
 msgstr ""
 
-#: modules/video_output/x11/x11.c:62
+#: modules/video_output/x11/x11.c:61 modules/video_output/x11/xvideo.c:72
+msgid "choose the screen to be used for fullscreen mode."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:63 modules/video_output/x11/xvideo.c:74
+msgid ""
+"Choose the screen you want to use in fullscreen mode. For instance set it to "
+"0 for first screen, 1 for the second."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:67
 msgid "X11"
 msgstr "X11"
 
-#: modules/video_output/x11/x11.c:68
+#: modules/video_output/x11/x11.c:76
 msgid "X11 video output"
 msgstr "uscita video X11"
 
@@ -5525,11 +5665,11 @@ msgid ""
 "to improve performances by using the most efficient one."
 msgstr ""
 
-#: modules/video_output/x11/xvideo.c:73
+#: modules/video_output/x11/xvideo.c:78
 msgid "XVideo"
 msgstr "XVideo"
 
-#: modules/video_output/x11/xvideo.c:81
+#: modules/video_output/x11/xvideo.c:90
 msgid "XVideo extension video output"
 msgstr "uscita video XVideo extension"
 
@@ -5576,6 +5716,26 @@ msgstr "modulo XOSD"
 msgid "xosd interface"
 msgstr "interfaccia xosd"
 
+#~ msgid "SAP interface module"
+#~ msgstr "modulo interfaccia SAP"
+
+#, fuzzy
+#~ msgid "mpga"
+#~ msgstr "ffmpeg"
+
+#, fuzzy
+#~ msgid "Auto"
+#~ msgstr "Autori"
+
+#~ msgid "&Logs..."
+#~ msgstr "&Resoconti..."
+
+#~ msgid "Advanced..."
+#~ msgstr "Avanzate..."
+
+#~ msgid "Set the geometry of the zone to crop"
+#~ msgstr "Imposta la geometria della zona da ritagliare"
+
 #, fuzzy
 #~ msgid "Display identifier"
 #~ msgstr "indentificatore schermo"
diff --git a/po/ja.po b/po/ja.po
index e9c837b371..c3a802a050 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-05-24 14:40+0200\n"
+"POT-Creation-Date: 2003-05-27 23:43+0200\n"
 "PO-Revision-Date: 2003-01-09 02:37+0900\n"
 "Last-Translator: Fumio Nakayama <endymion@ca2.so-net.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -29,7 +29,7 @@ msgid "Audio channels"
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥Á¥ã¥ó¥Í¥ë¤ÎÁªÂò"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:165 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:358
 msgid "Stereo"
@@ -117,7 +117,7 @@ msgstr "
 
 #: src/input/input_programs.c:94 modules/gui/gtk/gnome_interface.c:1078
 #: modules/gui/gtk/gtk_interface.c:1199 modules/gui/kde/interface.cpp:142
-#: modules/gui/macosx/intf.m:347 modules/gui/macosx/intf.m:348
+#: modules/gui/macosx/intf.m:370 modules/gui/macosx/intf.m:371
 msgid "Program"
 msgstr "¥×¥í¥°¥é¥à"
 
@@ -125,18 +125,18 @@ msgstr "
 #: modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
-#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:349
-#: modules/gui/macosx/intf.m:350 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:382
+#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:372
+#: modules/gui/macosx/intf.m:373 modules/gui/macosx/open.m:149
+#: modules/gui/wxwindows/open.cpp:393
 msgid "Title"
 msgstr "¥¿¥¤¥È¥ë"
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
 #: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
-#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:351
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:388
+#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:374
+#: modules/gui/macosx/intf.m:375 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:399
 msgid "Chapter"
 msgstr "¥Á¥ã¥×¥¿¡¼"
 
@@ -190,7 +190,7 @@ msgstr "
 msgid "Previous Chapter"
 msgstr "¥Á¥ã¥×¥¿¡¼"
 
-#: src/input/input_programs.c:668
+#: src/input/input_programs.c:668 src/video_output/video_output.c:397
 msgid "Disable"
 msgstr ""
 
@@ -203,34 +203,34 @@ msgstr ""
 msgid "C"
 msgstr "ja"
 
-#: src/libvlc.c:301 src/libvlc.c:1357
+#: src/libvlc.c:301 src/libvlc.c:1364
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
 "\n"
 msgstr ""
 
-#: src/libvlc.c:1189 src/misc/configuration.c:961
+#: src/libvlc.c:1196 src/misc/configuration.c:961
 msgid "string"
 msgstr "ʸ»úÎó"
 
-#: src/libvlc.c:1206 src/misc/configuration.c:946
+#: src/libvlc.c:1213 src/misc/configuration.c:946
 msgid "integer"
 msgstr "À°¿ô"
 
-#: src/libvlc.c:1209 src/misc/configuration.c:953
+#: src/libvlc.c:1216 src/misc/configuration.c:953
 msgid "float"
 msgstr "ÉâÆ°¾®¿ôÅÀ"
 
-#: src/libvlc.c:1215
+#: src/libvlc.c:1222
 msgid " (default enabled)"
 msgstr " (¥Ç¥Õ¥©¥ë¥È¡§Í­¸ú)"
 
-#: src/libvlc.c:1216
+#: src/libvlc.c:1223
 msgid " (default disabled)"
 msgstr " (¥Ç¥Õ¥©¥ë¥È¡§Ìµ¸ú)"
 
-#: src/libvlc.c:1332 src/libvlc.c:1387 src/libvlc.c:1411
+#: src/libvlc.c:1339 src/libvlc.c:1394 src/libvlc.c:1418
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
@@ -238,11 +238,11 @@ msgstr ""
 "\n"
 "³¤±¤ë¤Ë¤ÏEnter¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/libvlc.c:1360
+#: src/libvlc.c:1367
 msgid "[module]              [description]\n"
 msgstr "[¥â¥¸¥å¡¼¥ë]          [ÀâÌÀ]\n"
 
-#: src/libvlc.c:1405
+#: src/libvlc.c:1412
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -1117,15 +1117,15 @@ msgstr "
 #: modules/demux/ogg.c:554 modules/demux/ogg.c:813 modules/demux/ogg.c:986
 #: modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m:354 modules/gui/macosx/output.m:150
+#: modules/gui/macosx/intf.m:377 modules/gui/macosx/output.m:155
 msgid "Audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
 #: src/libvlc.h:473 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:893 modules/gui/gtk/gnome_interface.c:1099
-#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:365
-#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:140
+#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:388
+#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:144
 #: modules/misc/dummy/dummy.c:83 modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "¥Ó¥Ç¥ª"
@@ -1157,8 +1157,8 @@ msgstr ""
 #: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
-#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:297
-#: modules/gui/macosx/intf.m:385 modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:408 modules/gui/wxwindows/interface.cpp:352
 #: modules/gui/wxwindows/playlist.cpp:102
 msgid "Playlist"
 msgstr "¥ê¥¹¥È"
@@ -1201,12 +1201,43 @@ msgstr "
 msgid "boolean"
 msgstr "¿¿µ¶ÃÍ"
 
-#: src/video_output/video_output.c:382 modules/gui/beos/VideoOutput.cpp:1138
+#: src/video_output/video_output.c:384 modules/gui/beos/VideoOutput.cpp:1138
 #: modules/gui/macosx/controls.m:342 modules/gui/macosx/controls.m:486
-#: modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/intf.m:393
 msgid "Fullscreen"
 msgstr "Á´²èÌ̲½"
 
+#: src/video_output/video_output.c:395 modules/gui/gtk/gnome_interface.c:183
+#: modules/gui/gtk/gnome_interface.c:966 modules/gui/gtk/gtk_interface.c:553
+#: modules/gui/gtk/gtk_interface.c:1349 modules/gui/macosx/controls.m:526
+#: modules/gui/macosx/intf.m:401 modules/gui/macosx/intf.m:402
+#: modules/video_filter/deinterlace/deinterlace.c:81
+msgid "Deinterlace"
+msgstr "¥Î¥ó¥¤¥ó¥¿¥ì¡¼¥¹²½"
+
+#: src/video_output/video_output.c:399
+#, fuzzy
+msgid "Discard"
+msgstr "¥Ç¥£¥¹¥¯"
+
+#: src/video_output/video_output.c:401
+msgid "Blend"
+msgstr ""
+
+#: src/video_output/video_output.c:403
+#, fuzzy
+msgid "Mean"
+msgstr "¥á¥Ç¥£¥¢"
+
+#: src/video_output/video_output.c:405
+msgid "Bob"
+msgstr ""
+
+#: src/video_output/video_output.c:407
+#, fuzzy
+msgid "Linear"
+msgstr "À°¿ô"
+
 #: modules/access/cdda.c:86 modules/access/file.c:69 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
 #: modules/access/v4l/v4l.c:64
@@ -1375,6 +1406,26 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
+#: modules/access_output/dummy.c:56
+#, fuzzy
+msgid "Dummy stream ouput"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
+
+#: modules/access_output/file.c:58
+#, fuzzy
+msgid "File stream ouput"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
+
+#: modules/access_output/http.c:54
+#, fuzzy
+msgid "HTTP stream ouput"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
+
+#: modules/access_output/udp.c:73
+#, fuzzy
+msgid "UDP stream ouput"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
+
 #: modules/access/satellite/satellite.c:41
 #, fuzzy
 msgid "Satellite default transponder frequency"
@@ -1475,35 +1526,6 @@ msgstr "Video4Linux
 msgid "VCD input"
 msgstr "VCDÆþÎϥ⥸¥å¡¼¥ë"
 
-#: modules/access/vlcs.c:131 modules/misc/sap.c:131
-msgid "SAP"
-msgstr ""
-
-#: modules/access/vlcs.c:134
-#, fuzzy
-msgid "SAP interface module"
-msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
-
-#: modules/access_output/dummy.c:56
-#, fuzzy
-msgid "Dummy stream ouput"
-msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
-
-#: modules/access_output/file.c:58
-#, fuzzy
-msgid "File stream ouput"
-msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
-
-#: modules/access_output/http.c:54
-#, fuzzy
-msgid "HTTP stream ouput"
-msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
-
-#: modules/access_output/udp.c:73
-#, fuzzy
-msgid "UDP stream ouput"
-msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 #, fuzzy
 msgid "Characteristic dimension"
@@ -1677,13 +1699,13 @@ msgstr "ALSA
 msgid "Audio device"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/audio_output/alsa.c:159 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:161 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:371
 msgid "Mono"
 msgstr "¥â¥Î¥é¥ë"
 
-#: modules/audio_output/alsa.c:201 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:203 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:387
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1852,23 +1874,150 @@ msgstr "DV
 msgid "AAC audio decoder (using libfaad2)"
 msgstr "AAC¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë (libfaad2)"
 
-#: modules/codec/ffmpeg/ffmpeg.c:154
-msgid "ffmpeg"
+#: modules/codec/ffmpeg/ffmpeg.c:86
+msgid "Direct rendering"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:88
+msgid "Error resilience"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:90
+msgid ""
+"ffmpeg can make errors resiliences.          \n"
+"Nevertheless, with buggy encoder (like ISO MPEG-4 encoder from M$) this will "
+"produce a lot of errors.\n"
+"Valid range is -1 to 99 (-1 disable all errors resiliences)."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:95
+msgid "Workaround bugs"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:97
+msgid ""
+"Try to fix some bugs\n"
+"1  autodetect\n"
+"2  old msmpeg4\n"
+"4  xvid interlaced\n"
+"8  ump4 \n"
+"16 no padding\n"
+"32 ac vlc64 Qpel chroma"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:106
+msgid "Hurry up"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:108
+msgid ""
+"Allow the decoder to partially decode or skip frame(s) when there not enough "
+"time.\n"
+" It's usefull with low CPU power but it could produce broken pictures."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:112
+#, fuzzy
+msgid "Truncated stream"
+msgstr "¥¹¥È¥ê¡¼¥à¤ÎºÆÀ¸"
+
+#: modules/codec/ffmpeg/ffmpeg.c:113
+msgid "truncated stream -1:auto,0:disable,:1:enable"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:115
+#, fuzzy
+msgid "Post processing quality"
+msgstr "¸å½èÍý"
+
+#: modules/codec/ffmpeg/ffmpeg.c:117
+msgid ""
+"Quality of post processing\n"
+"Valid range is 0 to 6"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:120
+msgid "Ffmpeg postproc filter chains"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:157
+#, fuzzy
+msgid "Ffmpeg postprocessing module"
+msgstr "ffmpeg ¸å½èÍý¥â¥¸¥å¡¼¥ë"
+
+#: modules/codec/ffmpeg/ffmpeg.c:159
+#, fuzzy
+msgid "Auto-level Post processing quality"
+msgstr "C ¸å½èÍý¥â¥¸¥å¡¼¥ë"
+
+#: modules/codec/ffmpeg/ffmpeg.c:161
+msgid ""
+"Post processing quality is selected upon time left but no more than "
+"requested quality\n"
+"Not yet implemented !"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:165
+msgid "Force vertical luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:166
+msgid "Force vertical luminance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:168
+msgid "Force horizontal luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:169
+msgid "Force horizontal luminance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:171
+msgid "Force vertical chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:172
+msgid "Force vertical chrominance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:174
+msgid "Force horizontal chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:175
+msgid "Force horizontal chrominance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:177
+msgid "Force luminance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:178
+msgid "Force luminance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:180
+msgid "Force chrominance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:181
+msgid "Force chrominance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:184
+msgid "ffmpeg"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:187
 msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 msgstr "ffmpeg ¥ª¡¼¥Ç¥£¥ª¡¿¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 
-#: modules/codec/ffmpeg/ffmpeg.c:168
+#: modules/codec/ffmpeg/ffmpeg.c:195
 msgid "Post processing"
 msgstr "¸å½èÍý"
 
-#: modules/codec/ffmpeg/ffmpeg.c:177
-msgid "ffmpeg postprocessing module"
-msgstr "ffmpeg ¸å½èÍý¥â¥¸¥å¡¼¥ë"
-
-#: modules/codec/ffmpeg/ffmpeg.c:204
+#: modules/codec/ffmpeg/ffmpeg.c:215
 msgid "ffmpeg chroma conversion"
 msgstr ""
 
@@ -1892,7 +2041,7 @@ msgstr "MMX
 msgid "flac audio decoder"
 msgstr "µ¿»÷AC3¥ª¡¼¥Ç¥£¥ª¡¦¥Ç¥³¡¼¥À"
 
-#: modules/codec/libmpeg2.c:89
+#: modules/codec/libmpeg2.c:90
 #, fuzzy
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
@@ -1910,15 +2059,15 @@ msgstr ""
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr "MPEG 1/2¥Ó¥Ç¥ª¡¦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/mpeg_video/idct/idct.c:41
-msgid "IDCT"
-msgstr ""
-
 #: modules/codec/mpeg_video/idct/idctaltivec.c:45
 #, fuzzy
 msgid "AltiVec IDCT"
 msgstr "Altivec IDCT¥â¥¸¥å¡¼¥ë"
 
+#: modules/codec/mpeg_video/idct/idct.c:41
+msgid "IDCT"
+msgstr ""
+
 #: modules/codec/mpeg_video/idct/idctclassic.c:41
 #, fuzzy
 msgid "classic IDCT"
@@ -1934,11 +2083,6 @@ msgstr "MMX IDCT
 msgid "MMX EXT IDCT"
 msgstr "MMX¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥óIDCT¥â¥¸¥å¡¼¥ë"
 
-#: modules/codec/mpeg_video/motion/motion.c:42
-#, fuzzy
-msgid "motion compensation"
-msgstr "¥â¡¼¥·¥ç¥óÊäÀµ¥â¥¸¥å¡¼¥ë"
-
 #: modules/codec/mpeg_video/motion/motion3dnow.c:44
 #, fuzzy
 msgid "3D Now! motion compensation"
@@ -1949,6 +2093,11 @@ msgstr "3D Now!
 msgid "AltiVec motion compensation"
 msgstr "AltiVec¥â¡¼¥·¥ç¥óÊäÀµ¥â¥¸¥å¡¼¥ë"
 
+#: modules/codec/mpeg_video/motion/motion.c:42
+#, fuzzy
+msgid "motion compensation"
+msgstr "¥â¡¼¥·¥ç¥óÊäÀµ¥â¥¸¥å¡¼¥ë"
+
 #: modules/codec/mpeg_video/motion/motionmmx.c:45
 #, fuzzy
 msgid "MMX motion compensation"
@@ -2141,20 +2290,20 @@ msgstr "VLC
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
 #: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
-#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:879
-#: modules/gui/macosx/intf.m:880 modules/gui/macosx/intf.m:881
-#: modules/gui/wxwindows/interface.cpp:810
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:902
+#: modules/gui/macosx/intf.m:903 modules/gui/macosx/intf.m:904
+#: modules/gui/wxwindows/interface.cpp:811
 msgid "Pause"
 msgstr "°ì»þÄä»ß"
 
 #: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
 #: modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
-#: modules/gui/macosx/intf.m:300 modules/gui/macosx/intf.m:338
-#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:886
-#: modules/gui/macosx/intf.m:887 modules/gui/macosx/intf.m:888
-#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:348
-#: modules/gui/wxwindows/interface.cpp:815
+#: modules/gui/macosx/intf.m:323 modules/gui/macosx/intf.m:361
+#: modules/gui/macosx/intf.m:422 modules/gui/macosx/intf.m:909
+#: modules/gui/macosx/intf.m:910 modules/gui/macosx/intf.m:911
+#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:816
 msgid "Play"
 msgstr "ºÆÀ¸"
 
@@ -2213,8 +2362,8 @@ msgstr ""
 #: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:821
 #: modules/demux/ogg.c:994 modules/gui/gtk/gnome_interface.c:148
 #: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
-#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:360
-#: modules/gui/macosx/intf.m:361
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:384
 msgid "Channels"
 msgstr "¥Á¥ã¥ó¥Í¥ë"
 
@@ -2240,7 +2389,7 @@ msgstr "
 #: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:554
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:813 modules/demux/ogg.c:893 modules/demux/ogg.c:986
-#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:130
+#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134
 msgid "Type"
 msgstr "¥¿¥¤¥×"
 
@@ -2908,7 +3057,7 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:201
 #: modules/gui/beos/InterfaceWindow.cpp:300
 #: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:304 modules/gui/macosx/prefs.m:75
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/prefs.m:75
 #: modules/gui/wxwindows/preferences.cpp:229
 msgid "Preferences"
 msgstr "ÀßÄê..."
@@ -2917,7 +3066,7 @@ msgstr "
 #: modules/gui/beos/InterfaceWindow.cpp:298
 #: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
 #: modules/gui/kde/info.cpp:9 modules/gui/kde/messages.cpp:8
-#: modules/gui/macosx/intf.m:310 modules/gui/macosx/intf.m:387
+#: modules/gui/macosx/intf.m:333 modules/gui/macosx/intf.m:410
 #: modules/gui/wxwindows/messages.cpp:79
 msgid "Messages"
 msgstr "¥á¥Ã¥»¡¼¥¸"
@@ -2932,16 +3081,16 @@ msgstr "
 #: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
 #: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
 #: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:264
-#: modules/gui/macosx/output.m:121 modules/gui/macosx/output.m:194
-#: modules/gui/macosx/output.m:279 modules/gui/wxwindows/interface.cpp:335
+#: modules/gui/macosx/output.m:125 modules/gui/macosx/output.m:200
+#: modules/gui/macosx/output.m:285 modules/gui/wxwindows/interface.cpp:336
 #: modules/gui/wxwindows/open.cpp:276 modules/gui/wxwindows/streamout.cpp:340
 msgid "File"
 msgstr "¥Õ¥¡¥¤¥ë"
 
 #: modules/gui/beos/InterfaceWindow.cpp:240
 #: modules/gui/beos/PlayListWindow.cpp:84
-#: modules/gui/gtk/gnome_interface.c:2179
-#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332
 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677
 msgid "Open File"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
@@ -2964,7 +3113,7 @@ msgid "About"
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
 
 #: modules/gui/beos/InterfaceWindow.cpp:256 modules/gui/kde/interface.cpp:93
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/intf.m:377
+#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:400
 msgid "Subtitles"
 msgstr "»úËë"
 
@@ -3003,8 +3152,8 @@ msgid "Speed"
 msgstr "ÁªÂòºÑ¤ß"
 
 #: modules/gui/beos/InterfaceWindow.cpp:286 modules/gui/macosx/controls.m:422
-#: modules/gui/macosx/intf.m:299 modules/gui/macosx/intf.m:341
-#: modules/gui/wxwindows/interface.cpp:357
+#: modules/gui/macosx/intf.m:322 modules/gui/macosx/intf.m:364
+#: modules/gui/wxwindows/interface.cpp:358
 msgid "Slower"
 msgstr "¥¹¥í¡¼"
 
@@ -3013,12 +3162,12 @@ msgid "Normal"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:290 modules/gui/macosx/controls.m:421
-#: modules/gui/macosx/intf.m:302 modules/gui/macosx/intf.m:340
-#: modules/gui/wxwindows/interface.cpp:359
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/wxwindows/interface.cpp:360
 msgid "Faster"
 msgstr "ÁáÁ÷¤ê"
 
-#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:381
+#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:404
 msgid "Window"
 msgstr "¥¦¥£¥ó¥É¥¦"
 
@@ -3032,7 +3181,7 @@ msgstr "
 #: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
 #: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
 #: modules/gui/gtk/preferences.c:605 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:117
+#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:121
 #: modules/gui/wxwindows/fileinfo.cpp:96
 #: modules/gui/wxwindows/messages.cpp:102 modules/gui/wxwindows/open.cpp:267
 #: modules/gui/wxwindows/preferences.cpp:250
@@ -3054,16 +3203,16 @@ msgstr "
 msgid "Drop files to play"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:167
+#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:169
 #: modules/gui/wxwindows/playlist.cpp:154
 msgid "Close"
 msgstr "ÊĤ¸¤ë"
 
-#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:330
+#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:353
 msgid "Edit"
 msgstr "ÊÔ½¸"
 
-#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:335
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:358
 #: modules/gui/macosx/playlist.m:180
 msgid "Select All"
 msgstr "¤¹¤Ù¤Æ¤òÁªÂò"
@@ -3116,24 +3265,24 @@ msgstr "̾
 #: modules/gui/beos/PreferencesWindow.cpp:44
 #: modules/gui/beos/PreferencesWindow.cpp:46
 #: modules/gui/beos/PreferencesWindow.cpp:98
-#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:607
-#: modules/gui/macosx/prefs.m:615 modules/gui/macosx/prefs.m:685
+#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:690
+#: modules/gui/macosx/prefs.m:698 modules/gui/macosx/prefs.m:768
 msgid "Modules"
 msgstr "¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/beos/PreferencesWindow.cpp:220
+#: modules/gui/beos/PreferencesWindow.cpp:219
 #: modules/gui/gtk/preferences.c:609
 msgid "Apply"
 msgstr "ŬÍÑ"
 
-#: modules/gui/beos/PreferencesWindow.cpp:225
+#: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
-#: modules/gui/macosx/output.m:332 modules/gui/macosx/prefs.m:76
+#: modules/gui/macosx/output.m:338 modules/gui/macosx/prefs.m:76
 #: modules/gui/wxwindows/preferences.cpp:254
 msgid "Save"
 msgstr "Êݸ"
 
-#: modules/gui/beos/PreferencesWindow.cpp:229
+#: modules/gui/beos/PreferencesWindow.cpp:228
 #, fuzzy
 msgid "Defaults"
 msgstr "ºï½ü"
@@ -3174,6 +3323,7 @@ msgid "Take Screen Shot"
 msgstr ""
 
 #: modules/gui/beos/VlcWrapper.cpp:185 modules/gui/gtk/menu.c:733
+#: modules/gui/macosx/prefs.m:348
 msgid "None"
 msgstr "¤Ê¤·"
 
@@ -3202,8 +3352,8 @@ msgstr "Gtk+
 msgid "VLC media player"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:652
-#: modules/gui/wxwindows/preferences.cpp:965
+#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:663
+#: modules/gui/wxwindows/preferences.cpp:967
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
@@ -3227,8 +3377,8 @@ msgstr "
 #: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
 #: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
 #: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:435
-#: modules/gui/macosx/intf.m:301 modules/gui/macosx/intf.m:339
-#: modules/gui/macosx/intf.m:400 modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
+#: modules/gui/macosx/intf.m:423 modules/gui/wxwindows/interface.cpp:347
 msgid "Stop"
 msgstr "Ää»ß"
 
@@ -3260,7 +3410,7 @@ msgstr "UDP
 
 #: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
 #: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:160
-#: modules/gui/macosx/output.m:124 modules/gui/wxwindows/open.cpp:445
+#: modules/gui/macosx/output.m:128 modules/gui/wxwindows/open.cpp:456
 #: modules/gui/wxwindows/streamout.cpp:380
 msgid "Address"
 msgstr "¥Û¥¹¥È̾/¥¢¥É¥ì¥¹"
@@ -3270,13 +3420,13 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
 #: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
 #: modules/gui/macosx/open.m:159 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:125 modules/gui/wxwindows/open.cpp:430
-#: modules/gui/wxwindows/open.cpp:453 modules/gui/wxwindows/streamout.cpp:390
+#: modules/gui/macosx/output.m:129 modules/gui/wxwindows/open.cpp:441
+#: modules/gui/wxwindows/open.cpp:464 modules/gui/wxwindows/streamout.cpp:390
 msgid "Port"
 msgstr "¥Ý¡¼¥ÈÈÖ¹æ"
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:127
-#: modules/gui/macosx/output.m:221 modules/gui/macosx/output.m:289
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:131
+#: modules/gui/macosx/output.m:227 modules/gui/macosx/output.m:295
 #: modules/gui/wxwindows/streamout.cpp:341
 msgid "HTTP"
 msgstr ""
@@ -3363,10 +3513,10 @@ msgstr ""
 "VideoLAN Client¤Ï¡¢MPEG, MPEG 2, MP3 DivX¤ò¥í¡¼¥«¥ë¤ª¤è¤Ó¡¢¥Í¥Ã¥È¥ï¡¼¥¯¾å¤Î"
 "¥½¡¼¥¹¤«¤éºÆÀ¸¤Ç¤­¤ë¥×¥ì¥¤¥ä¡¼¤Ç¤¹¡£"
 
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
+#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100
 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "¥Ô¥Ã¥¯¥¹¥Þ¥Ã¥×¡¦¥Õ¥¡¥¤¥ë %s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£"
@@ -3376,6 +3526,69 @@ msgstr "
 msgid "Error loading pixmap file: %s"
 msgstr "¥Ô¥Ã¥¯¥¹¥Þ¥Ã¥×¡¦¥Õ¥¡¥¤¥ë %s ¤Î¥í¡¼¥É¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£"
 
+#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
+#, fuzzy
+msgid "Gtk2 interface"
+msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
+
+#: modules/gui/gtk2/gnome2_interface.c:31
+#, fuzzy
+msgid "_New"
+msgstr "ɽ¼¨(_V)"
+
+#: modules/gui/gtk2/gnome2_interface.c:87
+msgid "gnome2"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:112
+msgid "button4"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:122
+#: modules/gui/gtk2/gtk2_interface.c:183
+msgid "button3"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337
+msgid "Save File"
+msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ"
+
+#: modules/gui/gtk2/gtk2_interface.c:67
+#, fuzzy
+msgid "window1"
+msgstr "¥¦¥£¥ó¥É¥¦"
+
+#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147
+#: modules/gui/gtk/gtk_interface.c:1373
+msgid "_File"
+msgstr "¥Õ¥¡¥¤¥ë(_F)"
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+#, fuzzy
+msgid "_Edit"
+msgstr "ÊÔ½¸"
+
+#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268
+msgid "_View"
+msgstr "ɽ¼¨(_V)"
+
+#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569
+msgid "_Help"
+msgstr "¥Ø¥ë¥×(_H)"
+
+#: modules/gui/gtk2/gtk2_interface.c:146
+#, fuzzy
+msgid "_About"
+msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
+
+#: modules/gui/gtk2/gtk2_interface.c:163
+msgid "button1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:173
+msgid "button2"
+msgstr ""
+
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 #, fuzzy
 msgid "Show tooltips"
@@ -3424,7 +3637,7 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:20 modules/gui/gtk/gnome_interface.c:504
 #: modules/gui/gtk/gnome_interface.c:986 modules/gui/gtk/gtk_interface.c:173
 #: modules/gui/gtk/gtk_interface.c:619 modules/gui/gtk/gtk_interface.c:1399
-#: modules/gui/wxwindows/interface.cpp:230
+#: modules/gui/wxwindows/interface.cpp:231
 #, fuzzy
 msgid "Open a file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
@@ -3527,25 +3740,25 @@ msgstr "
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:909
 #: modules/gui/gtk/gtk_interface.c:452 modules/gui/gtk/gtk_interface.c:1253
-#: modules/gui/macosx/intf.m:355
+#: modules/gui/macosx/intf.m:378
 msgid "Volume Up"
 msgstr "¥Ü¥ê¥å¡¼¥à¤ò¾å¤²¤ë"
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:916
 #: modules/gui/gtk/gtk_interface.c:459 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:356
+#: modules/gui/macosx/intf.m:379
 msgid "Volume Down"
 msgstr "¥Ü¥ê¥å¡¼¥à¤ò²¼¤²¤ë"
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:923
 #: modules/gui/gtk/gtk_interface.c:466 modules/gui/gtk/gtk_interface.c:1267
-#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:357
+#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:380
 msgid "Mute"
 msgstr "¥ß¥å¡¼¥È¤¹¤ë"
 
 #: modules/gui/gtk/gnome_interface.c:155 modules/gui/gtk/gnome_interface.c:938
 #: modules/gui/gtk/gtk_interface.c:488 modules/gui/gtk/gtk_interface.c:1289
-#: modules/gui/macosx/intf.m:362 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:385 modules/gui/macosx/intf.m:386
 msgid "Device"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
@@ -3564,18 +3777,10 @@ msgstr "
 msgid "_Fullscreen"
 msgstr "Á´²èÌ̲½(_F)"
 
-#: modules/gui/gtk/gnome_interface.c:183 modules/gui/gtk/gnome_interface.c:966
-#: modules/gui/gtk/gtk_interface.c:553 modules/gui/gtk/gtk_interface.c:1349
-#: modules/gui/macosx/controls.m:526 modules/gui/macosx/intf.m:378
-#: modules/gui/macosx/intf.m:379
-#: modules/video_filter/deinterlace/deinterlace.c:81
-msgid "Deinterlace"
-msgstr "¥Î¥ó¥¤¥ó¥¿¥ì¡¼¥¹²½"
-
 #: modules/gui/gtk/gnome_interface.c:190 modules/gui/gtk/gnome_interface.c:973
 #: modules/gui/gtk/gtk_interface.c:560 modules/gui/gtk/gtk_interface.c:1356
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/intf.m:375
-#: modules/gui/macosx/output.m:120 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/intf.m:397 modules/gui/macosx/intf.m:398
+#: modules/gui/macosx/output.m:124 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr "¥¹¥¯¥ê¡¼¥ó"
 
@@ -3593,18 +3798,18 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
 #: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2005
 #: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:142
-#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:337
+#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:338
 #: modules/gui/wxwindows/open.cpp:278
 msgid "Disc"
 msgstr "¥Ç¥£¥¹¥¯"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:339
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Net"
 msgstr "Network"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:343
 msgid "Sat"
 msgstr "±ÒÀ±"
 
@@ -3666,7 +3871,7 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:1063 modules/gui/gtk/gtk_interface.c:758
 #: modules/gui/gtk/gtk_interface.c:844 modules/gui/gtk/gtk_interface.c:888
 #: modules/gui/gtk/gtk_interface.c:1173
-#: modules/gui/wxwindows/interface.cpp:353
+#: modules/gui/wxwindows/interface.cpp:354
 msgid "Prev"
 msgstr "Á°"
 
@@ -3679,8 +3884,8 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:1056 modules/gui/gtk/gtk_interface.c:769
 #: modules/gui/gtk/gtk_interface.c:852 modules/gui/gtk/gtk_interface.c:896
 #: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:443
-#: modules/gui/macosx/intf.m:303 modules/gui/macosx/intf.m:343
-#: modules/gui/macosx/intf.m:401 modules/gui/wxwindows/interface.cpp:355
+#: modules/gui/macosx/intf.m:326 modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:424 modules/gui/wxwindows/interface.cpp:356
 msgid "Next"
 msgstr "¼¡"
 
@@ -3781,8 +3986,8 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
 #: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
 #: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:173
-#: modules/gui/macosx/output.m:123 modules/gui/wxwindows/open.cpp:246
-#: modules/gui/wxwindows/open.cpp:343
+#: modules/gui/macosx/output.m:127 modules/gui/wxwindows/open.cpp:246
+#: modules/gui/wxwindows/open.cpp:354
 #: modules/gui/wxwindows/preferences.cpp:778
 #: modules/gui/wxwindows/streamout.cpp:367
 #: modules/gui/wxwindows/subtitles.cpp:107
@@ -3790,24 +3995,24 @@ msgid "Browse..."
 msgstr "¥Ö¥é¥¦¥º..."
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:368
+#: modules/gui/wxwindows/open.cpp:379
 msgid "Disc type"
 msgstr "¥Ç¥£¥¹¥¯¡¦¥¿¥¤¥×"
 
 #: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
 #: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:488
-#: modules/gui/wxwindows/open.cpp:362
+#: modules/gui/wxwindows/open.cpp:373
 msgid "DVD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
 #: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:382
-#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:363
+#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:374
 msgid "VCD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:374
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:385
 msgid "Device name"
 msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
 
@@ -3818,24 +4023,24 @@ msgstr "DVD
 
 #: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:547
-#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:409
+#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:420
 msgid "UDP/RTP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
 #: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:548
-#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:421
 msgid "UDP/RTP Multicast"
 msgstr "UDP¥Þ¥ë¥Á¥­¥ã¥¹¥È"
 
 #: modules/gui/gtk/gnome_interface.c:1727 modules/gui/gtk/gtk_interface.c:2042
 #: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:549
-#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:411
+#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:422
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:467
+#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:478
 msgid "URL"
 msgstr ""
 
@@ -3885,7 +4090,7 @@ msgid "fps"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:116
+#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:120
 #: modules/gui/wxwindows/open.cpp:201 modules/gui/wxwindows/open.cpp:223
 #, fuzzy
 msgid "Settings..."
@@ -3967,14 +4172,14 @@ msgid "Destination Target: "
 msgstr "Á÷¿®Àè¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:128 modules/gui/macosx/output.m:231
-#: modules/gui/macosx/output.m:290 modules/gui/wxwindows/streamout.cpp:342
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/output.m:237
+#: modules/gui/macosx/output.m:296 modules/gui/wxwindows/streamout.cpp:342
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:129 modules/gui/macosx/output.m:241
-#: modules/gui/macosx/output.m:292 modules/gui/wxwindows/streamout.cpp:343
+#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:298 modules/gui/wxwindows/streamout.cpp:343
 msgid "RTP"
 msgstr ""
 
@@ -3997,8 +4202,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:135 modules/gui/macosx/output.m:273
-#: modules/gui/macosx/output.m:319
+#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:279
+#: modules/gui/macosx/output.m:325
 msgid "AVI"
 msgstr ""
 
@@ -4016,11 +4221,6 @@ msgstr ""
 msgid "Gtk+ interface"
 msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
-#: modules/gui/gtk2/gtk2_interface.c:77
-msgid "_File"
-msgstr "¥Õ¥¡¥¤¥ë(_F)"
-
 #: modules/gui/gtk/gtk_interface.c:238
 msgid "_Close"
 msgstr "ÊĤ¸¤ë(_C)"
@@ -4037,10 +4237,6 @@ msgstr "
 msgid "Exit the program"
 msgstr "¥×¥í¥°¥é¥à¤Î½ªÎ»"
 
-#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132
-msgid "_View"
-msgstr "ɽ¼¨(_V)"
-
 #: modules/gui/gtk/gtk_interface.c:294
 msgid "Hide the main interface window"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¥¦¥£¥ó¥É¥¦¤ò±£¤¹"
@@ -4061,10 +4257,6 @@ msgstr "
 msgid "Configure the application"
 msgstr "¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ÎÀßÄê"
 
-#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139
-msgid "_Help"
-msgstr "¥Ø¥ë¥×(_H)"
-
 #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435
 msgid "_About..."
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ(_A)..."
@@ -4173,56 +4365,6 @@ msgstr "
 msgid "Selected:"
 msgstr "ÁªÂòºÑ¤ß:"
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-#, fuzzy
-msgid "Gtk2 interface"
-msgstr "Gtk+¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-#, fuzzy
-msgid "_New"
-msgstr "ɽ¼¨(_V)"
-
-#: modules/gui/gtk2/gnome2_interface.c:87
-msgid "gnome2"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:112
-msgid "button4"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:122
-#: modules/gui/gtk2/gtk2_interface.c:183
-msgid "button3"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:331
-msgid "Save File"
-msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ"
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-#, fuzzy
-msgid "window1"
-msgstr "¥¦¥£¥ó¥É¥¦"
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-#, fuzzy
-msgid "_Edit"
-msgstr "ÊÔ½¸"
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-#, fuzzy
-msgid "_About"
-msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
-
-#: modules/gui/gtk2/gtk2_interface.c:163
-msgid "button1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:173
-msgid "button2"
-msgstr ""
-
 #: modules/gui/kde/interface.cpp:88
 msgid "Languages"
 msgstr "¸À¸ì"
@@ -4254,235 +4396,235 @@ msgstr "
 msgid "Plugins"
 msgstr ""
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:315
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:338
 #, fuzzy
 msgid "About VLC media player"
 msgstr "VLC¥á¥Ç¥£¥¢¡¦¥×¥ì¥¤¥ä¡¼¤Ë¤Ä¤¤¤Æ"
 
 #: modules/gui/macosx/controls.m:344 modules/gui/macosx/controls.m:487
-#: modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:389
 #, fuzzy
 msgid "Half Size"
 msgstr "¥µ¥¤¥º"
 
 #: modules/gui/macosx/controls.m:346 modules/gui/macosx/controls.m:488
-#: modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:390
 msgid "Normal Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:348 modules/gui/macosx/controls.m:489
-#: modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/intf.m:391
 msgid "Double Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:491
 #: modules/gui/macosx/controls.m:498 modules/gui/macosx/controls.m:520
-#: modules/gui/macosx/intf.m:371
+#: modules/gui/macosx/intf.m:394
 msgid "Float On Top"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:490
-#: modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/intf.m:392
 #, fuzzy
 msgid "Fit To Screen"
 msgstr "¥¹¥¯¥ê¡¼¥ó"
 
-#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:298
-#: modules/gui/macosx/intf.m:342 modules/gui/macosx/intf.m:402
+#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:321
+#: modules/gui/macosx/intf.m:365 modules/gui/macosx/intf.m:425
 msgid "Previous"
 msgstr "Á°¤Î¥Õ¥¡¥¤¥ë"
 
-#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:344
+#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:367
 msgid "Loop"
 msgstr "¥ë¡¼¥×"
 
-#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:345
+#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:368
 #, fuzzy
 msgid "Step Forward"
 msgstr "žÁ÷"
 
-#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:346
+#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:369
 #, fuzzy
 msgid "Step Backward"
 msgstr "µÕžºÆÀ¸"
 
-#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:386
-#: modules/gui/macosx/intf.m:411
+#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:434
 msgid "Info"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:293
+#: modules/gui/macosx/intf.m:316
 #, fuzzy
 msgid "VLC - Controller"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
-#: modules/gui/macosx/intf.m:305
+#: modules/gui/macosx/intf.m:328
 #, fuzzy
 msgid "Volume"
 msgstr "¥Ü¥ê¥å¡¼¥à¤ò¾å¤²¤ë"
 
-#: modules/gui/macosx/intf.m:306
+#: modules/gui/macosx/intf.m:329
 #, fuzzy
 msgid "Position"
 msgstr "¶ËÀ­"
 
-#: modules/gui/macosx/intf.m:312
+#: modules/gui/macosx/intf.m:335
 msgid "Open CrashLog"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:316
+#: modules/gui/macosx/intf.m:339
 #, fuzzy
 msgid "Preferences..."
 msgstr "ÀßÄê(_P)..."
 
-#: modules/gui/macosx/intf.m:317
+#: modules/gui/macosx/intf.m:340
 msgid "Hide VLC"
 msgstr "VLC¤ò±£¤¹"
 
-#: modules/gui/macosx/intf.m:318
+#: modules/gui/macosx/intf.m:341
 msgid "Hide Others"
 msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò±£¤¹"
 
-#: modules/gui/macosx/intf.m:319
+#: modules/gui/macosx/intf.m:342
 msgid "Show All"
 msgstr "¤¹¤Ù¤Æ¤òɽ¼¨"
 
-#: modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:343
 msgid "Quit VLC"
 msgstr "VLC¤ò½ªÎ»"
 
-#: modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/intf.m:345
 msgid "1:File"
 msgstr "1:¥Õ¥¡¥¤¥ë"
 
-#: modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:346
 msgid "Open..."
 msgstr "³«¤¯..."
 
-#: modules/gui/macosx/intf.m:324
+#: modules/gui/macosx/intf.m:347
 msgid "Open File..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
 
-#: modules/gui/macosx/intf.m:325
+#: modules/gui/macosx/intf.m:348
 msgid "Open Disc..."
 msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯..."
 
-#: modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:349
 msgid "Open Network..."
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¤ò³«¤¯"
 
-#: modules/gui/macosx/intf.m:327
+#: modules/gui/macosx/intf.m:350
 msgid "Open Recent"
 msgstr "ºÇ¶á»È¤Ã¤¿¹àÌܤò³«¤¯"
 
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/intf.m:1291
+#: modules/gui/macosx/intf.m:351 modules/gui/macosx/intf.m:1314
 msgid "Clear Menu"
 msgstr "¥á¥Ë¥å¡¼¤ò¥¯¥ê¥¢¤¹¤ë"
 
-#: modules/gui/macosx/intf.m:331
+#: modules/gui/macosx/intf.m:354
 msgid "Cut"
 msgstr "¥«¥Ã¥È"
 
-#: modules/gui/macosx/intf.m:332
+#: modules/gui/macosx/intf.m:355
 msgid "Copy"
 msgstr "¥³¥Ô¡¼"
 
-#: modules/gui/macosx/intf.m:333
+#: modules/gui/macosx/intf.m:356
 msgid "Paste"
 msgstr "¥Ú¡¼¥¹¥È"
 
-#: modules/gui/macosx/intf.m:334
+#: modules/gui/macosx/intf.m:357
 msgid "Clear"
 msgstr "¥¯¥ê¥¢"
 
-#: modules/gui/macosx/intf.m:337
+#: modules/gui/macosx/intf.m:360
 msgid "Controls"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
-#: modules/gui/macosx/intf.m:358 modules/gui/macosx/intf.m:359
+#: modules/gui/macosx/intf.m:381 modules/gui/macosx/intf.m:382
 #, fuzzy
 msgid "Audio Track"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/macosx/intf.m:372 modules/gui/macosx/intf.m:373
+#: modules/gui/macosx/intf.m:395 modules/gui/macosx/intf.m:396
 #, fuzzy
 msgid "Video Track"
 msgstr "¥Ó¥Ç¥ª"
 
-#: modules/gui/macosx/intf.m:382
+#: modules/gui/macosx/intf.m:405
 msgid "Minimize Window"
 msgstr "¥¦¥£¥ó¥É¥¦¤òºÇ¾®²½"
 
-#: modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:406
 msgid "Close Window"
 msgstr "¥¦¥£¥ó¥É¥¦¤òÊĤ¸¤ë"
 
-#: modules/gui/macosx/intf.m:384
+#: modules/gui/macosx/intf.m:407
 #, fuzzy
 msgid "Controller"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
-#: modules/gui/macosx/intf.m:389
+#: modules/gui/macosx/intf.m:412
 msgid "Bring All to Front"
 msgstr "¤¹¤Ù¤Æ¤òÁ°¤Ë"
 
-#: modules/gui/macosx/intf.m:391
+#: modules/gui/macosx/intf.m:414
 #, fuzzy
 msgid "Help"
 msgstr "¥Ø¥ë¥×"
 
-#: modules/gui/macosx/intf.m:392
+#: modules/gui/macosx/intf.m:415
 #, fuzzy
 msgid "ReadMe..."
 msgstr "¥á¥Ã¥»¡¼¥¸..."
 
-#: modules/gui/macosx/intf.m:393
+#: modules/gui/macosx/intf.m:416
 #, fuzzy
 msgid "Online Documentation"
 msgstr "¥â¡¼¥·¥ç¥óÊäÀµ¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/intf.m:417
 msgid "Report a Bug"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/intf.m:418
 #, fuzzy
 msgid "VideoLAN Website"
 msgstr "VideoLAN¥¯¥é¥¤¥¢¥ó¥È"
 
-#: modules/gui/macosx/intf.m:396
+#: modules/gui/macosx/intf.m:419
 msgid "License"
 msgstr "¥é¥¤¥»¥ó¥¹"
 
-#: modules/gui/macosx/intf.m:405
+#: modules/gui/macosx/intf.m:428
 msgid "Error"
 msgstr "¥¨¥é¡¼"
 
-#: modules/gui/macosx/intf.m:406
+#: modules/gui/macosx/intf.m:429
 #, fuzzy
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr "Í׵ᤵ¤ì¤¿½èÍý¤Î¼Â¹Ô¤Ç¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ :"
 
-#: modules/gui/macosx/intf.m:407
+#: modules/gui/macosx/intf.m:430
 #, fuzzy
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr "¤â¤·¡¢¥Ð¥°¤Ç¤¢¤ë¤È»×¤ï¤ì¤ë¤Ê¤é¡¢°Ê²¼¤Î¼ê½ç¤Ë¤·¤¿¤¬¤Ã¤Æ¤¯¤À¤µ¤¤ :"
 
-#: modules/gui/macosx/intf.m:408
+#: modules/gui/macosx/intf.m:431
 msgid "Open Messages Window"
 msgstr "¥á¥Ã¥»¡¼¥¸¥¦¥£¥ó¥É¥¦¤òɽ¼¨"
 
-#: modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:432
 msgid "Dismiss"
 msgstr "¤ä¤êľ¤·"
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 #, fuzzy
 msgid "No CrashLog found"
 msgstr "%@s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4562,63 +4704,57 @@ msgstr "%@s 
 msgid "Open VIDEO_TS Directory"
 msgstr "VIDEO_TS¥Ç¥£¥ì¥¯¥È¥ê¤ò³«¤¯"
 
-#: modules/gui/macosx/output.m:115
+#: modules/gui/macosx/output.m:119
 #, fuzzy
 msgid "Advanced output:"
 msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/macosx/output.m:119
+#: modules/gui/macosx/output.m:123
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:122 modules/gui/macosx/output.m:210
-#: modules/gui/macosx/output.m:285
+#: modules/gui/macosx/output.m:126 modules/gui/macosx/output.m:216
+#: modules/gui/macosx/output.m:291
 #, fuzzy
 msgid "Stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
 
-#: modules/gui/macosx/output.m:126
+#: modules/gui/macosx/output.m:130
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132 modules/gui/wxwindows/streamout.cpp:437
+#: modules/gui/macosx/output.m:136 modules/gui/wxwindows/streamout.cpp:437
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:133
+#: modules/gui/macosx/output.m:137
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:134 modules/gui/macosx/output.m:275
-#: modules/gui/macosx/output.m:317
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:281
+#: modules/gui/macosx/output.m:323
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:274
-#: modules/gui/macosx/output.m:321
+#: modules/gui/macosx/output.m:140 modules/gui/macosx/output.m:280
+#: modules/gui/macosx/output.m:327
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:276
-#: modules/gui/macosx/output.m:323
+#: modules/gui/macosx/output.m:141 modules/gui/macosx/output.m:282
+#: modules/gui/macosx/output.m:329
 msgid "mp4"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139
+#: modules/gui/macosx/output.m:143
 #, fuzzy
 msgid "Transcode options"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
 
-#: modules/gui/macosx/output.m:149 modules/gui/macosx/output.m:153
-msgid "Bitrate (bps)"
-msgstr ""
-
-#: modules/gui/macosx/output.m:151
-msgid "mpga"
-msgstr ""
-
-#: modules/gui/macosx/output.m:152
-msgid "a52 "
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:158
+#: modules/gui/wxwindows/streamout.cpp:512
+#: modules/gui/wxwindows/streamout.cpp:549
+msgid "Bitrate (kb/s)"
 msgstr ""
 
 #: modules/gui/macosx/prefs.m:78 modules/gui/wxwindows/preferences.cpp:256
@@ -4630,12 +4766,6 @@ msgstr "
 msgid "Advanced"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:143 modules/gui/macosx/prefs.m:341
-#: modules/gui/macosx/prefs.m:368
-#, fuzzy
-msgid "Auto"
-msgstr "ºîÀ®¼Ô"
-
 #: modules/gui/ncurses/ncurses.c:66
 #, fuzzy
 msgid "ncurses interface"
@@ -4651,33 +4781,33 @@ msgstr "
 msgid "Qt interface"
 msgstr "Qt¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/skins/src/skin_main.cpp:251
-#: modules/gui/skins/src/vlcproc.cpp:338
+#: modules/gui/skins/src/skin_main.cpp:239
+#: modules/gui/skins/src/vlcproc.cpp:339
 #, fuzzy
 msgid "Open a skin file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
-#: modules/gui/skins/src/skin_main.cpp:292
-#: modules/gui/skins/src/skin_main.cpp:293
+#: modules/gui/skins/src/skin_main.cpp:280
+#: modules/gui/skins/src/skin_main.cpp:281
 msgid "Last skin actually used"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:294
-#: modules/gui/skins/src/skin_main.cpp:295
+#: modules/gui/skins/src/skin_main.cpp:282
+#: modules/gui/skins/src/skin_main.cpp:283
 msgid "Config of last used skin"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:296
-#: modules/gui/skins/src/skin_main.cpp:297
+#: modules/gui/skins/src/skin_main.cpp:284
+#: modules/gui/skins/src/skin_main.cpp:285
 msgid "Show application in system tray"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:298
-#: modules/gui/skins/src/skin_main.cpp:299
+#: modules/gui/skins/src/skin_main.cpp:286
+#: modules/gui/skins/src/skin_main.cpp:287
 msgid "Show application in taskbar"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:310
+#: modules/gui/skins/src/skin_main.cpp:298
 #, fuzzy
 msgid "Skinnable Interface"
 msgstr "¥á¥¤¥ó¥¦¥£¥ó¥É¥¦¤Îɽ¼¨/Èóɽ¼¨(_I)"
@@ -4687,209 +4817,209 @@ msgstr "
 msgid "FileInfo"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
 
-#: modules/gui/wxwindows/interface.cpp:231
+#: modules/gui/wxwindows/interface.cpp:232
 #, fuzzy
 msgid "Open a DVD or (S)VCD"
 msgstr "DVD¤Þ¤¿¤ÏVCD¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:232
+#: modules/gui/wxwindows/interface.cpp:233
 #, fuzzy
 msgid "Open a network stream"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à¤òÁªÂò¤¹¤ë"
 
-#: modules/gui/wxwindows/interface.cpp:233
+#: modules/gui/wxwindows/interface.cpp:234
 #, fuzzy
 msgid "Open a satellite stream"
 msgstr "±ÒÀ±¥«¡¼¥É¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:234
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:235
+#: modules/gui/wxwindows/interface.cpp:236
 #, fuzzy
 msgid "Exit this program"
 msgstr "¥×¥í¥°¥é¥à¤Î½ªÎ»"
 
-#: modules/gui/wxwindows/interface.cpp:237
+#: modules/gui/wxwindows/interface.cpp:238
 #, fuzzy
 msgid "Open the playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:238
+#: modules/gui/wxwindows/interface.cpp:239
 #, fuzzy
 msgid "Show the program logs"
 msgstr "¥×¥í¥°¥é¥à¤ÎÁªÂò"
 
-#: modules/gui/wxwindows/interface.cpp:239
+#: modules/gui/wxwindows/interface.cpp:240
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:241
+#: modules/gui/wxwindows/interface.cpp:242
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:243
+#: modules/gui/wxwindows/interface.cpp:244
 #, fuzzy
 msgid "About this program"
 msgstr "¥×¥í¥°¥é¥à¤Î½ªÎ»"
 
-#: modules/gui/wxwindows/interface.cpp:247
+#: modules/gui/wxwindows/interface.cpp:248
 #, fuzzy
 msgid "&Open File..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
 
-#: modules/gui/wxwindows/interface.cpp:249
+#: modules/gui/wxwindows/interface.cpp:250
 #, fuzzy
 msgid "Open &Disc..."
 msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯..."
 
-#: modules/gui/wxwindows/interface.cpp:251
+#: modules/gui/wxwindows/interface.cpp:252
 #, fuzzy
 msgid "&Network Stream..."
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à(_N)..."
 
-#: modules/gui/wxwindows/interface.cpp:254
+#: modules/gui/wxwindows/interface.cpp:255
 #, fuzzy
 msgid "&Satellite Stream..."
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à(_N)..."
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:260
 #, fuzzy
 msgid "&Eject Disc"
 msgstr "¥Ç¥£¥¹¥¯¤Î¼è½Ð¤·(_E)"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:264
 #, fuzzy
 msgid "E&xit"
 msgstr "½ªÎ»(_x)"
 
-#: modules/gui/wxwindows/interface.cpp:267
+#: modules/gui/wxwindows/interface.cpp:268
 #, fuzzy
 msgid "&Playlist..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
 
-#: modules/gui/wxwindows/interface.cpp:269
+#: modules/gui/wxwindows/interface.cpp:270
 #, fuzzy
-msgid "&Logs..."
-msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯(_D)..."
+msgid "&Messages..."
+msgstr "¥á¥Ã¥»¡¼¥¸..."
 
-#: modules/gui/wxwindows/interface.cpp:270
+#: modules/gui/wxwindows/interface.cpp:271
 #, fuzzy
 msgid "&File info..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
 
-#: modules/gui/wxwindows/interface.cpp:275
+#: modules/gui/wxwindows/interface.cpp:276
 #, fuzzy
 msgid "&Preferences..."
 msgstr "ÀßÄê(_P)..."
 
-#: modules/gui/wxwindows/interface.cpp:292
+#: modules/gui/wxwindows/interface.cpp:293
 #, fuzzy
 msgid "&About..."
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ(_A)..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:297
 #, fuzzy
 msgid "&File"
 msgstr "¥Õ¥¡¥¤¥ë"
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:298
 #, fuzzy
 msgid "&View"
 msgstr "ɽ¼¨(_V)"
 
-#: modules/gui/wxwindows/interface.cpp:298
+#: modules/gui/wxwindows/interface.cpp:299
 #, fuzzy
 msgid "&Settings"
 msgstr "ÀßÄê(_S)"
 
-#: modules/gui/wxwindows/interface.cpp:299
-#: modules/gui/wxwindows/interface.cpp:476
-#: modules/gui/wxwindows/interface.cpp:524
+#: modules/gui/wxwindows/interface.cpp:300
+#: modules/gui/wxwindows/interface.cpp:478
+#: modules/gui/wxwindows/interface.cpp:526
 #, fuzzy
 msgid "&Audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/wxwindows/interface.cpp:300
-#: modules/gui/wxwindows/interface.cpp:495
-#: modules/gui/wxwindows/interface.cpp:528
+#: modules/gui/wxwindows/interface.cpp:301
+#: modules/gui/wxwindows/interface.cpp:497
+#: modules/gui/wxwindows/interface.cpp:530
 #, fuzzy
 msgid "&Video"
 msgstr "¥Ó¥Ç¥ª"
 
-#: modules/gui/wxwindows/interface.cpp:301
-#: modules/gui/wxwindows/interface.cpp:514
-#: modules/gui/wxwindows/interface.cpp:532
+#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:516
+#: modules/gui/wxwindows/interface.cpp:534
 #, fuzzy
 msgid "&Navigation"
 msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:303
 #, fuzzy
 msgid "&Help"
 msgstr "¥Ø¥ë¥×(_H)"
 
-#: modules/gui/wxwindows/interface.cpp:318
+#: modules/gui/wxwindows/interface.cpp:319
 #, fuzzy
 msgid "Stop current playlist item"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:320
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:320
+#: modules/gui/wxwindows/interface.cpp:321
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:321
+#: modules/gui/wxwindows/interface.cpp:322
 #: modules/gui/wxwindows/playlist.cpp:351
 #, fuzzy
 msgid "Open playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:322
+#: modules/gui/wxwindows/interface.cpp:323
 #, fuzzy
 msgid "Previous playlist item"
 msgstr "Á°¤Î¥Õ¥¡¥¤¥ë"
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:324
 #, fuzzy
 msgid "Next playlist item"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:325
 #, fuzzy
 msgid "Play slower"
 msgstr "¥¹¥í¡¼ºÆÀ¸"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:326
 #, fuzzy
 msgid "Play faster"
 msgstr "ÁáÁ÷¤êºÆÀ¸"
 
-#: modules/gui/wxwindows/interface.cpp:560
+#: modules/gui/wxwindows/interface.cpp:561
 #, fuzzy
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr "¥Í¥¤¥Æ¥£¥ÖWindows¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
 
-#: modules/gui/wxwindows/interface.cpp:561
+#: modules/gui/wxwindows/interface.cpp:562
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:562
+#: modules/gui/wxwindows/interface.cpp:563
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:564
+#: modules/gui/wxwindows/interface.cpp:565
 #, fuzzy
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
@@ -4898,7 +5028,7 @@ msgstr ""
 "¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤ÏDVD¤ª¤è¤Ó¡¢MPEG¤òºÆÀ¸¤¹¤ëVideoLAN¥¯¥é¥¤¥¢¥ó¥È¤Ç¤¹¡£\n"
 "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¡¢¥Í¥Ã¥È¥ï¡¼¥¯¤«¤éMPEG¤ÈMPEG 2¥Ç¡¼¥¿¤òºÆÀ¸¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: modules/gui/wxwindows/interface.cpp:568
+#: modules/gui/wxwindows/interface.cpp:569
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
@@ -4913,12 +5043,12 @@ msgstr "
 msgid "Video menu"
 msgstr "ÀßÄê(_S)"
 
-#: modules/gui/wxwindows/menus.cpp:139
+#: modules/gui/wxwindows/menus.cpp:141
 #, fuzzy
 msgid "Input menu"
 msgstr "ÆþÎÏ"
 
-#: modules/gui/wxwindows/menus.cpp:329
+#: modules/gui/wxwindows/menus.cpp:334
 msgid "Empty"
 msgstr ""
 
@@ -4955,16 +5085,16 @@ msgstr "
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:361
+#: modules/gui/wxwindows/open.cpp:372
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:364
+#: modules/gui/wxwindows/open.cpp:375
 #, fuzzy
 msgid "CD Audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/wxwindows/open.cpp:837 modules/gui/wxwindows/streamout.cpp:640
+#: modules/gui/wxwindows/open.cpp:848 modules/gui/wxwindows/streamout.cpp:640
 #, fuzzy
 msgid "Save file"
 msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ"
@@ -5043,8 +5173,9 @@ msgid "No configuration options available"
 msgstr "¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¡¦¥ª¥×¥·¥ç¥ó¤Ë¥Ä¡¼¥ë¥Á¥Ã¥×¤òɽ¼¨"
 
 #: modules/gui/wxwindows/preferences.cpp:865
-msgid "Advanced..."
-msgstr ""
+#, fuzzy
+msgid "Advanced options"
+msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
 #: modules/gui/wxwindows/streamout.cpp:166
 msgid "Stream output MRL"
@@ -5086,11 +5217,6 @@ msgstr "
 msgid "Video codec"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/gui/wxwindows/streamout.cpp:512
-#: modules/gui/wxwindows/streamout.cpp:549
-msgid "Bitrate (kb/s)"
-msgstr ""
-
 #: modules/gui/wxwindows/streamout.cpp:543
 #, fuzzy
 msgid "Audio codec"
@@ -5226,6 +5352,11 @@ msgstr "
 msgid "Using the logger interface plugin..."
 msgstr "¥í¥®¥ó¥°¡¦¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥×¥é¥°¥¤¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£"
 
+#: modules/misc/memcpy/memcpyaltivec.c:52
+#, fuzzy
+msgid "AltiVec memcpy"
+msgstr "AltiVec memcpy¥â¥¸¥å¡¼¥ë"
+
 #: modules/misc/memcpy/memcpy.c:81
 #, fuzzy
 msgid "libc memcpy"
@@ -5246,11 +5377,6 @@ msgstr "MMX memcpy
 msgid "MMX EXT memcpy"
 msgstr "MMX¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ómemcpy¥â¥¸¥å¡¼¥ë"
 
-#: modules/misc/memcpy/memcpyaltivec.c:52
-#, fuzzy
-msgid "AltiVec memcpy"
-msgstr "AltiVec memcpy¥â¥¸¥å¡¼¥ë"
-
 #: modules/misc/network/ipv4.c:85
 msgid "IPv4 network abstraction layer"
 msgstr "IPv4¥Í¥Ã¥È¥ï¡¼¥¯Ãê¾Ý¥ì¥¤¥ä"
@@ -5264,6 +5390,10 @@ msgstr "IPv6
 msgid "Qt Embedded GUI helper"
 msgstr "QTËä¤á¹þ¤ß¥â¥¸¥å¡¼¥ë"
 
+#: modules/misc/sap.c:131
+msgid "SAP"
+msgstr ""
+
 #: modules/misc/sap.c:134
 #, fuzzy
 msgid "SAP interface"
@@ -5395,7 +5525,7 @@ msgid "Set image contrast"
 msgstr ""
 
 #: modules/video_filter/adjust.c:61
-msgid "Set the image contrast. Defaults to 1"
+msgid "Set the image contrast, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:62
@@ -5411,7 +5541,7 @@ msgid "Set image saturation"
 msgstr ""
 
 #: modules/video_filter/adjust.c:65
-msgid "Set the image saturation. Defaults to 1"
+msgid "Set the image saturation, between 0 and 3. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:66
@@ -5419,7 +5549,7 @@ msgid "Set image brightness"
 msgstr ""
 
 #: modules/video_filter/adjust.c:67
-msgid "Set the image brightness. Defaults to 1"
+msgid "Set the image brightness, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:71
@@ -5464,8 +5594,10 @@ msgid "Crop geometry"
 msgstr "±ï¼è¤ê¥¸¥ª¥á¥È¥ê"
 
 #: modules/video_filter/crop.c:55
-msgid "Set the geometry of the zone to crop"
-msgstr "¶è²è¤«¤é±ï¼è¤ê¤Þ¤Ç¤Î¥¸¥ª¥á¥È¥ê¤ò»ØÄê"
+msgid ""
+"Set the geometry of the zone to crop. This is set as width x heigth + left "
+"offset + top offset."
+msgstr ""
 
 #: modules/video_filter/crop.c:57
 #, fuzzy
@@ -5786,11 +5918,21 @@ msgstr "
 msgid "Use shared memory to communicate between VLC and the X server."
 msgstr "¶¦Í­¥á¥â¥ê¤òVLC¤ÈX¥µ¡¼¥Ð¤ÎÄÌ¿®¤Î¤¿¤á¤Ë»ÈÍѤ·¤Þ¤¹¡£"
 
-#: modules/video_output/x11/x11.c:62
+#: modules/video_output/x11/x11.c:61 modules/video_output/x11/xvideo.c:72
+msgid "choose the screen to be used for fullscreen mode."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:63 modules/video_output/x11/xvideo.c:74
+msgid ""
+"Choose the screen you want to use in fullscreen mode. For instance set it to "
+"0 for first screen, 1 for the second."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:67
 msgid "X11"
 msgstr ""
 
-#: modules/video_output/x11/x11.c:68
+#: modules/video_output/x11/x11.c:76
 #, fuzzy
 msgid "X11 video output"
 msgstr "¥ª¡¼¥Ð¡¼¥ì¥¤"
@@ -5819,11 +5961,11 @@ msgstr ""
 "ºÇ¤â¸ú²ÌŪ¤Ê¤â¤Î¤ò»È¤Ã¤Æ¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤ò²þÁ±¤¹¤ë¤«¤ï¤ê¤Ë¡¢ÆÃÄê¤Î¿§ºÌ¥Õ¥©¡¼"
 "¥Þ¥Ã¥È¤ò»ÈÍѤ¹¤ë¤¿¤á¤ÎXVideo¥ì¥ó¥À¥é¤ò¶¯À©Åª¤Ë»ØÄꤷ¤Þ¤¹¡£"
 
-#: modules/video_output/x11/xvideo.c:73
+#: modules/video_output/x11/xvideo.c:78
 msgid "XVideo"
 msgstr ""
 
-#: modules/video_output/x11/xvideo.c:81
+#: modules/video_output/x11/xvideo.c:90
 #, fuzzy
 msgid "XVideo extension video output"
 msgstr "XVideo¥¨¥¯¥¹¥Æ¥ó¥·¥ç¥ó¡¦¥â¥¸¥å¡¼¥ë"
@@ -5872,6 +6014,21 @@ msgstr "XOSD
 msgid "xosd interface"
 msgstr "xosd¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
 
+#, fuzzy
+#~ msgid "SAP interface module"
+#~ msgstr "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥â¥¸¥å¡¼¥ë"
+
+#, fuzzy
+#~ msgid "Auto"
+#~ msgstr "ºîÀ®¼Ô"
+
+#, fuzzy
+#~ msgid "&Logs..."
+#~ msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯(_D)..."
+
+#~ msgid "Set the geometry of the zone to crop"
+#~ msgstr "¶è²è¤«¤é±ï¼è¤ê¤Þ¤Ç¤Î¥¸¥ª¥á¥È¥ê¤ò»ØÄê"
+
 #, fuzzy
 #~ msgid "Display identifier"
 #~ msgstr "¥Ç¥£¥¹¥×¥ì¥¤Ì¾"
@@ -6276,9 +6433,6 @@ msgstr "xosd
 #~ msgid "flac decoder module"
 #~ msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
 
-#~ msgid "C Post Processing module"
-#~ msgstr "C ¸å½èÍý¥â¥¸¥å¡¼¥ë"
-
 #, fuzzy
 #~ msgid "libmpeg2 decoder module"
 #~ msgstr "»úË롦¥Ç¥³¡¼¥À¡¦¥â¥¸¥å¡¼¥ë"
diff --git a/po/nl.po b/po/nl.po
index c89b00ce93..f3f9ebc1f7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-05-24 14:40+0200\n"
+"POT-Creation-Date: 2003-05-27 23:43+0200\n"
 "PO-Revision-Date: 2002-04-20 16:58GMT\n"
 "Last-Translator: Derk-Jan Hartman <thedj at sf.net>\n"
 "Language-Team: Nederlands <nl@li.org>\n"
@@ -31,7 +31,7 @@ msgid "Audio channels"
 msgstr "Audio kanalen"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:165 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:358
 msgid "Stereo"
@@ -118,7 +118,7 @@ msgstr "Afspeellijst element"
 
 #: src/input/input_programs.c:94 modules/gui/gtk/gnome_interface.c:1078
 #: modules/gui/gtk/gtk_interface.c:1199 modules/gui/kde/interface.cpp:142
-#: modules/gui/macosx/intf.m:347 modules/gui/macosx/intf.m:348
+#: modules/gui/macosx/intf.m:370 modules/gui/macosx/intf.m:371
 msgid "Program"
 msgstr "Programma"
 
@@ -126,18 +126,18 @@ msgstr "Programma"
 #: modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
-#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:349
-#: modules/gui/macosx/intf.m:350 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:382
+#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:372
+#: modules/gui/macosx/intf.m:373 modules/gui/macosx/open.m:149
+#: modules/gui/wxwindows/open.cpp:393
 msgid "Title"
 msgstr "Titel"
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
 #: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
-#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:351
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:388
+#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:374
+#: modules/gui/macosx/intf.m:375 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:399
 msgid "Chapter"
 msgstr "Hoofdstuk"
 
@@ -183,7 +183,7 @@ msgstr "Volgend Hoofdstuk"
 msgid "Previous Chapter"
 msgstr "Vorig Hoofdstuk"
 
-#: src/input/input_programs.c:668
+#: src/input/input_programs.c:668 src/video_output/video_output.c:397
 msgid "Disable"
 msgstr "Geen"
 
@@ -196,7 +196,7 @@ msgstr "Spoor %i"
 msgid "C"
 msgstr "nl"
 
-#: src/libvlc.c:301 src/libvlc.c:1357
+#: src/libvlc.c:301 src/libvlc.c:1364
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
@@ -205,27 +205,27 @@ msgstr ""
 "Gebruik: %s [opties] [parameters] ...\n"
 "\n"
 
-#: src/libvlc.c:1189 src/misc/configuration.c:961
+#: src/libvlc.c:1196 src/misc/configuration.c:961
 msgid "string"
 msgstr "tekst"
 
-#: src/libvlc.c:1206 src/misc/configuration.c:946
+#: src/libvlc.c:1213 src/misc/configuration.c:946
 msgid "integer"
 msgstr "heel getal"
 
-#: src/libvlc.c:1209 src/misc/configuration.c:953
+#: src/libvlc.c:1216 src/misc/configuration.c:953
 msgid "float"
 msgstr "gebroken getal"
 
-#: src/libvlc.c:1215
+#: src/libvlc.c:1222
 msgid " (default enabled)"
 msgstr " (standaard)"
 
-#: src/libvlc.c:1216
+#: src/libvlc.c:1223
 msgid " (default disabled)"
 msgstr " (niet standaard)"
 
-#: src/libvlc.c:1332 src/libvlc.c:1387 src/libvlc.c:1411
+#: src/libvlc.c:1339 src/libvlc.c:1394 src/libvlc.c:1418
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
@@ -233,11 +233,11 @@ msgstr ""
 "\n"
 "Druk op RETURN om verder te gaan...\n"
 
-#: src/libvlc.c:1360
+#: src/libvlc.c:1367
 msgid "[module]              [description]\n"
 msgstr "[module]              [beschrijving]\n"
 
-#: src/libvlc.c:1405
+#: src/libvlc.c:1412
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -1084,15 +1084,15 @@ msgstr "Interface"
 #: modules/demux/ogg.c:554 modules/demux/ogg.c:813 modules/demux/ogg.c:986
 #: modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m:354 modules/gui/macosx/output.m:150
+#: modules/gui/macosx/intf.m:377 modules/gui/macosx/output.m:155
 msgid "Audio"
 msgstr "Audio"
 
 #: src/libvlc.h:473 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:893 modules/gui/gtk/gnome_interface.c:1099
-#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:365
-#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:140
+#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:388
+#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:144
 #: modules/misc/dummy/dummy.c:83 modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "Video"
@@ -1123,8 +1123,8 @@ msgstr "CPU"
 #: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
-#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:297
-#: modules/gui/macosx/intf.m:385 modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:408 modules/gui/wxwindows/interface.cpp:352
 #: modules/gui/wxwindows/playlist.cpp:102
 msgid "Playlist"
 msgstr "Afspeellijst"
@@ -1167,12 +1167,44 @@ msgstr "print versie informatie"
 msgid "boolean"
 msgstr "boolean"
 
-#: src/video_output/video_output.c:382 modules/gui/beos/VideoOutput.cpp:1138
+#: src/video_output/video_output.c:384 modules/gui/beos/VideoOutput.cpp:1138
 #: modules/gui/macosx/controls.m:342 modules/gui/macosx/controls.m:486
-#: modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/intf.m:393
 msgid "Fullscreen"
 msgstr "Volledig scherm"
 
+#: src/video_output/video_output.c:395 modules/gui/gtk/gnome_interface.c:183
+#: modules/gui/gtk/gnome_interface.c:966 modules/gui/gtk/gtk_interface.c:553
+#: modules/gui/gtk/gtk_interface.c:1349 modules/gui/macosx/controls.m:526
+#: modules/gui/macosx/intf.m:401 modules/gui/macosx/intf.m:402
+#: modules/video_filter/deinterlace/deinterlace.c:81
+msgid "Deinterlace"
+msgstr "Deinterlace"
+
+#: src/video_output/video_output.c:399
+#, fuzzy
+msgid "Discard"
+msgstr "Disk"
+
+#: src/video_output/video_output.c:401
+#, fuzzy
+msgid "Blend"
+msgstr "Blues"
+
+#: src/video_output/video_output.c:403
+#, fuzzy
+msgid "Mean"
+msgstr "Media"
+
+#: src/video_output/video_output.c:405
+msgid "Bob"
+msgstr ""
+
+#: src/video_output/video_output.c:407
+#, fuzzy
+msgid "Linear"
+msgstr "heel getal"
+
 #: modules/access/cdda.c:86 modules/access/file.c:69 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
 #: modules/access/v4l/v4l.c:64
@@ -1332,6 +1364,22 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr "Microsoft Media Server (MMS) invoer"
 
+#: modules/access_output/dummy.c:56
+msgid "Dummy stream ouput"
+msgstr "Dummy stream uitvoer"
+
+#: modules/access_output/file.c:58
+msgid "File stream ouput"
+msgstr "Voer uit naar stream"
+
+#: modules/access_output/http.c:54
+msgid "HTTP stream ouput"
+msgstr "HTTP stream uitvoer"
+
+#: modules/access_output/udp.c:73
+msgid "UDP stream ouput"
+msgstr "UDP stream uitvoer"
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr "Standaard satelliet transponder frequentie"
@@ -1420,30 +1468,6 @@ msgstr "Video4Linux demuxer"
 msgid "VCD input"
 msgstr "VCD input"
 
-#: modules/access/vlcs.c:131 modules/misc/sap.c:131
-msgid "SAP"
-msgstr "SAP"
-
-#: modules/access/vlcs.c:134
-msgid "SAP interface module"
-msgstr "SAP interface module"
-
-#: modules/access_output/dummy.c:56
-msgid "Dummy stream ouput"
-msgstr "Dummy stream uitvoer"
-
-#: modules/access_output/file.c:58
-msgid "File stream ouput"
-msgstr "Voer uit naar stream"
-
-#: modules/access_output/http.c:54
-msgid "HTTP stream ouput"
-msgstr "HTTP stream uitvoer"
-
-#: modules/access_output/udp.c:73
-msgid "UDP stream ouput"
-msgstr "UDP stream uitvoer"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr "Karakteristieke dimensie"
@@ -1599,13 +1623,13 @@ msgstr "ALSA audio uitvoer"
 msgid "Audio device"
 msgstr "Audio apparaat"
 
-#: modules/audio_output/alsa.c:159 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:161 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:371
 msgid "Mono"
 msgstr "Mono"
 
-#: modules/audio_output/alsa.c:201 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:203 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:387
 msgid "A/52 over S/PDIF"
 msgstr "A/52 over S/PDIF"
@@ -1761,23 +1785,150 @@ msgstr "DV video decoder"
 msgid "AAC audio decoder (using libfaad2)"
 msgstr "AAC audio decoder (gebruikt libfaad2)"
 
-#: modules/codec/ffmpeg/ffmpeg.c:154
+#: modules/codec/ffmpeg/ffmpeg.c:86
+msgid "Direct rendering"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:88
+msgid "Error resilience"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:90
+msgid ""
+"ffmpeg can make errors resiliences.          \n"
+"Nevertheless, with buggy encoder (like ISO MPEG-4 encoder from M$) this will "
+"produce a lot of errors.\n"
+"Valid range is -1 to 99 (-1 disable all errors resiliences)."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:95
+msgid "Workaround bugs"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:97
+msgid ""
+"Try to fix some bugs\n"
+"1  autodetect\n"
+"2  old msmpeg4\n"
+"4  xvid interlaced\n"
+"8  ump4 \n"
+"16 no padding\n"
+"32 ac vlc64 Qpel chroma"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:106
+msgid "Hurry up"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:108
+msgid ""
+"Allow the decoder to partially decode or skip frame(s) when there not enough "
+"time.\n"
+" It's usefull with low CPU power but it could produce broken pictures."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:112
+#, fuzzy
+msgid "Truncated stream"
+msgstr "Dupliceer stream"
+
+#: modules/codec/ffmpeg/ffmpeg.c:113
+msgid "truncated stream -1:auto,0:disable,:1:enable"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:115
+#, fuzzy
+msgid "Post processing quality"
+msgstr "Nabewerking"
+
+#: modules/codec/ffmpeg/ffmpeg.c:117
+msgid ""
+"Quality of post processing\n"
+"Valid range is 0 to 6"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:120
+msgid "Ffmpeg postproc filter chains"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:157
+#, fuzzy
+msgid "Ffmpeg postprocessing module"
+msgstr "ffmpeg nabewerkingsmodule"
+
+#: modules/codec/ffmpeg/ffmpeg.c:159
+#, fuzzy
+msgid "Auto-level Post processing quality"
+msgstr "C nabewerkingsmodule"
+
+#: modules/codec/ffmpeg/ffmpeg.c:161
+msgid ""
+"Post processing quality is selected upon time left but no more than "
+"requested quality\n"
+"Not yet implemented !"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:165
+msgid "Force vertical luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:166
+msgid "Force vertical luminance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:168
+msgid "Force horizontal luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:169
+msgid "Force horizontal luminance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:171
+msgid "Force vertical chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:172
+msgid "Force vertical chrominance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:174
+msgid "Force horizontal chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:175
+msgid "Force horizontal chrominance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:177
+msgid "Force luminance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:178
+msgid "Force luminance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:180
+msgid "Force chrominance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:181
+msgid "Force chrominance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:184
 msgid "ffmpeg"
 msgstr "ffmpeg"
 
-#: modules/codec/ffmpeg/ffmpeg.c:157
+#: modules/codec/ffmpeg/ffmpeg.c:187
 msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 msgstr "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 
-#: modules/codec/ffmpeg/ffmpeg.c:168
+#: modules/codec/ffmpeg/ffmpeg.c:195
 msgid "Post processing"
 msgstr "Nabewerking"
 
-#: modules/codec/ffmpeg/ffmpeg.c:177
-msgid "ffmpeg postprocessing module"
-msgstr "ffmpeg nabewerkingsmodule"
-
-#: modules/codec/ffmpeg/ffmpeg.c:204
+#: modules/codec/ffmpeg/ffmpeg.c:215
 msgid "ffmpeg chroma conversion"
 msgstr "ffmpeg chroma conversie"
 
@@ -1797,7 +1948,7 @@ msgstr "MMXEXT nabewerking"
 msgid "flac audio decoder"
 msgstr "flac audio decoder"
 
-#: modules/codec/libmpeg2.c:89
+#: modules/codec/libmpeg2.c:90
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr "MPEG I/II video decoder (gebruikt libmpeg2)"
 
@@ -1813,14 +1964,14 @@ msgstr "MPEG layer I/II/III audio parser"
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr "MPEG I/II layer 1/2 audio decoder"
 
-#: modules/codec/mpeg_video/idct/idct.c:41
-msgid "IDCT"
-msgstr "IDCT"
-
 #: modules/codec/mpeg_video/idct/idctaltivec.c:45
 msgid "AltiVec IDCT"
 msgstr "AltiVec IDCT"
 
+#: modules/codec/mpeg_video/idct/idct.c:41
+msgid "IDCT"
+msgstr "IDCT"
+
 #: modules/codec/mpeg_video/idct/idctclassic.c:41
 msgid "classic IDCT"
 msgstr "classic IDCT"
@@ -1833,10 +1984,6 @@ msgstr "MMX IDCT"
 msgid "MMX EXT IDCT"
 msgstr "MMX EXT IDCT"
 
-#: modules/codec/mpeg_video/motion/motion.c:42
-msgid "motion compensation"
-msgstr "compensatie van beweging"
-
 #: modules/codec/mpeg_video/motion/motion3dnow.c:44
 msgid "3D Now! motion compensation"
 msgstr "3D Now! compensatie van beweging"
@@ -1845,6 +1992,10 @@ msgstr "3D Now! compensatie van beweging"
 msgid "AltiVec motion compensation"
 msgstr "AltiVec compensatie van beweging"
 
+#: modules/codec/mpeg_video/motion/motion.c:42
+msgid "motion compensation"
+msgstr "compensatie van beweging"
+
 #: modules/codec/mpeg_video/motion/motionmmx.c:45
 msgid "MMX motion compensation"
 msgstr "MMX compensatie van beweging"
@@ -2024,20 +2175,20 @@ msgstr "Afsluiten"
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
 #: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
-#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:879
-#: modules/gui/macosx/intf.m:880 modules/gui/macosx/intf.m:881
-#: modules/gui/wxwindows/interface.cpp:810
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:902
+#: modules/gui/macosx/intf.m:903 modules/gui/macosx/intf.m:904
+#: modules/gui/wxwindows/interface.cpp:811
 msgid "Pause"
 msgstr "Pauze"
 
 #: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
 #: modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
-#: modules/gui/macosx/intf.m:300 modules/gui/macosx/intf.m:338
-#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:886
-#: modules/gui/macosx/intf.m:887 modules/gui/macosx/intf.m:888
-#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:348
-#: modules/gui/wxwindows/interface.cpp:815
+#: modules/gui/macosx/intf.m:323 modules/gui/macosx/intf.m:361
+#: modules/gui/macosx/intf.m:422 modules/gui/macosx/intf.m:909
+#: modules/gui/macosx/intf.m:910 modules/gui/macosx/intf.m:911
+#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:816
 msgid "Play"
 msgstr "Start"
 
@@ -2091,8 +2242,8 @@ msgstr "Laag"
 #: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:821
 #: modules/demux/ogg.c:994 modules/gui/gtk/gnome_interface.c:148
 #: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
-#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:360
-#: modules/gui/macosx/intf.m:361
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:384
 msgid "Channels"
 msgstr "Kanalen"
 
@@ -2116,7 +2267,7 @@ msgstr "Aantal streams"
 #: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:554
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:813 modules/demux/ogg.c:893 modules/demux/ogg.c:986
-#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:130
+#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134
 msgid "Type"
 msgstr "Type"
 
@@ -2737,7 +2888,7 @@ msgstr "Ja"
 #: modules/gui/beos/InterfaceWindow.cpp:201
 #: modules/gui/beos/InterfaceWindow.cpp:300
 #: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:304 modules/gui/macosx/prefs.m:75
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/prefs.m:75
 #: modules/gui/wxwindows/preferences.cpp:229
 msgid "Preferences"
 msgstr "Voorkeuren"
@@ -2746,7 +2897,7 @@ msgstr "Voorkeuren"
 #: modules/gui/beos/InterfaceWindow.cpp:298
 #: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
 #: modules/gui/kde/info.cpp:9 modules/gui/kde/messages.cpp:8
-#: modules/gui/macosx/intf.m:310 modules/gui/macosx/intf.m:387
+#: modules/gui/macosx/intf.m:333 modules/gui/macosx/intf.m:410
 #: modules/gui/wxwindows/messages.cpp:79
 msgid "Messages"
 msgstr "Berichten"
@@ -2761,16 +2912,16 @@ msgstr "Berichten"
 #: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
 #: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
 #: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:264
-#: modules/gui/macosx/output.m:121 modules/gui/macosx/output.m:194
-#: modules/gui/macosx/output.m:279 modules/gui/wxwindows/interface.cpp:335
+#: modules/gui/macosx/output.m:125 modules/gui/macosx/output.m:200
+#: modules/gui/macosx/output.m:285 modules/gui/wxwindows/interface.cpp:336
 #: modules/gui/wxwindows/open.cpp:276 modules/gui/wxwindows/streamout.cpp:340
 msgid "File"
 msgstr "Bestand"
 
 #: modules/gui/beos/InterfaceWindow.cpp:240
 #: modules/gui/beos/PlayListWindow.cpp:84
-#: modules/gui/gtk/gnome_interface.c:2179
-#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332
 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677
 msgid "Open File"
 msgstr "Open Bestand"
@@ -2791,7 +2942,7 @@ msgid "About"
 msgstr "Over"
 
 #: modules/gui/beos/InterfaceWindow.cpp:256 modules/gui/kde/interface.cpp:93
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/intf.m:377
+#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:400
 msgid "Subtitles"
 msgstr "Ondertiteling"
 
@@ -2824,8 +2975,8 @@ msgid "Speed"
 msgstr "Snelheid"
 
 #: modules/gui/beos/InterfaceWindow.cpp:286 modules/gui/macosx/controls.m:422
-#: modules/gui/macosx/intf.m:299 modules/gui/macosx/intf.m:341
-#: modules/gui/wxwindows/interface.cpp:357
+#: modules/gui/macosx/intf.m:322 modules/gui/macosx/intf.m:364
+#: modules/gui/wxwindows/interface.cpp:358
 msgid "Slower"
 msgstr "Langzamer"
 
@@ -2834,12 +2985,12 @@ msgid "Normal"
 msgstr "Normaal"
 
 #: modules/gui/beos/InterfaceWindow.cpp:290 modules/gui/macosx/controls.m:421
-#: modules/gui/macosx/intf.m:302 modules/gui/macosx/intf.m:340
-#: modules/gui/wxwindows/interface.cpp:359
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/wxwindows/interface.cpp:360
 msgid "Faster"
 msgstr "Sneller"
 
-#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:381
+#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:404
 msgid "Window"
 msgstr "Venster"
 
@@ -2852,7 +3003,7 @@ msgstr "Speel Lijst"
 #: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
 #: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
 #: modules/gui/gtk/preferences.c:605 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:117
+#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:121
 #: modules/gui/wxwindows/fileinfo.cpp:96
 #: modules/gui/wxwindows/messages.cpp:102 modules/gui/wxwindows/open.cpp:267
 #: modules/gui/wxwindows/preferences.cpp:250
@@ -2873,16 +3024,16 @@ msgstr "VideoLAN Client: Open Ondertitelingsbestand"
 msgid "Drop files to play"
 msgstr "Drop bestanden om af te spelen"
 
-#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:167
+#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:169
 #: modules/gui/wxwindows/playlist.cpp:154
 msgid "Close"
 msgstr "Sluit"
 
-#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:330
+#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:353
 msgid "Edit"
 msgstr "Bewerk"
 
-#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:335
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:358
 #: modules/gui/macosx/playlist.m:180
 msgid "Select All"
 msgstr "Alles selecteren"
@@ -2932,24 +3083,24 @@ msgstr "Naam"
 #: modules/gui/beos/PreferencesWindow.cpp:44
 #: modules/gui/beos/PreferencesWindow.cpp:46
 #: modules/gui/beos/PreferencesWindow.cpp:98
-#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:607
-#: modules/gui/macosx/prefs.m:615 modules/gui/macosx/prefs.m:685
+#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:690
+#: modules/gui/macosx/prefs.m:698 modules/gui/macosx/prefs.m:768
 msgid "Modules"
 msgstr "Modules"
 
-#: modules/gui/beos/PreferencesWindow.cpp:220
+#: modules/gui/beos/PreferencesWindow.cpp:219
 #: modules/gui/gtk/preferences.c:609
 msgid "Apply"
 msgstr "Pas Toe"
 
-#: modules/gui/beos/PreferencesWindow.cpp:225
+#: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
-#: modules/gui/macosx/output.m:332 modules/gui/macosx/prefs.m:76
+#: modules/gui/macosx/output.m:338 modules/gui/macosx/prefs.m:76
 #: modules/gui/wxwindows/preferences.cpp:254
 msgid "Save"
 msgstr "Opslaan"
 
-#: modules/gui/beos/PreferencesWindow.cpp:229
+#: modules/gui/beos/PreferencesWindow.cpp:228
 msgid "Defaults"
 msgstr "Standaardwaarden"
 
@@ -2986,6 +3137,7 @@ msgid "Take Screen Shot"
 msgstr "Neem een Screenshot"
 
 #: modules/gui/beos/VlcWrapper.cpp:185 modules/gui/gtk/menu.c:733
+#: modules/gui/macosx/prefs.m:348
 msgid "None"
 msgstr "Geen"
 
@@ -3013,8 +3165,8 @@ msgstr "Familiar Linux Gtk+ interface"
 msgid "VLC media player"
 msgstr "VLC media speler"
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:652
-#: modules/gui/wxwindows/preferences.cpp:965
+#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:663
+#: modules/gui/wxwindows/preferences.cpp:967
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr "Open een bestand"
@@ -3038,8 +3190,8 @@ msgstr "Start stream"
 #: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
 #: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
 #: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:435
-#: modules/gui/macosx/intf.m:301 modules/gui/macosx/intf.m:339
-#: modules/gui/macosx/intf.m:400 modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
+#: modules/gui/macosx/intf.m:423 modules/gui/wxwindows/interface.cpp:347
 msgid "Stop"
 msgstr "Stop"
 
@@ -3070,7 +3222,7 @@ msgstr "UDP/RTP (Adres indien Multicast)"
 
 #: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
 #: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:160
-#: modules/gui/macosx/output.m:124 modules/gui/wxwindows/open.cpp:445
+#: modules/gui/macosx/output.m:128 modules/gui/wxwindows/open.cpp:456
 #: modules/gui/wxwindows/streamout.cpp:380
 msgid "Address"
 msgstr "Adres"
@@ -3080,13 +3232,13 @@ msgstr "Adres"
 #: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
 #: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
 #: modules/gui/macosx/open.m:159 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:125 modules/gui/wxwindows/open.cpp:430
-#: modules/gui/wxwindows/open.cpp:453 modules/gui/wxwindows/streamout.cpp:390
+#: modules/gui/macosx/output.m:129 modules/gui/wxwindows/open.cpp:441
+#: modules/gui/wxwindows/open.cpp:464 modules/gui/wxwindows/streamout.cpp:390
 msgid "Port"
 msgstr "Poort"
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:127
-#: modules/gui/macosx/output.m:221 modules/gui/macosx/output.m:289
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:131
+#: modules/gui/macosx/output.m:227 modules/gui/macosx/output.m:295
 #: modules/gui/wxwindows/streamout.cpp:341
 msgid "HTTP"
 msgstr "HTTP"
@@ -3167,10 +3319,10 @@ msgstr ""
 "De VideoLAN Client is een MPEG 1, MPEG 2, MP3, DivX multimedia speler, die "
 "invoer zowel van schijf als van netwerk kan afspelen."
 
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
+#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100
 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr "Pixmap bestand niet gevonden: %s"
@@ -3180,6 +3332,64 @@ msgstr "Pixmap bestand niet gevonden: %s"
 msgid "Error loading pixmap file: %s"
 msgstr "Fout tijdens laden van pixmap bestand: %s"
 
+#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
+msgid "Gtk2 interface"
+msgstr "Gtk2 interface"
+
+#: modules/gui/gtk2/gnome2_interface.c:31
+msgid "_New"
+msgstr "_Nieuw"
+
+#: modules/gui/gtk2/gnome2_interface.c:87
+msgid "gnome2"
+msgstr "gnome2"
+
+#: modules/gui/gtk2/gnome2_interface.c:112
+msgid "button4"
+msgstr "knop4"
+
+#: modules/gui/gtk2/gnome2_interface.c:122
+#: modules/gui/gtk2/gtk2_interface.c:183
+msgid "button3"
+msgstr "knop3"
+
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337
+msgid "Save File"
+msgstr "Bewaar Bestand"
+
+#: modules/gui/gtk2/gtk2_interface.c:67
+msgid "window1"
+msgstr "venster1"
+
+#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147
+#: modules/gui/gtk/gtk_interface.c:1373
+msgid "_File"
+msgstr "_Bestand"
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+msgid "_Edit"
+msgstr "_Bewerk"
+
+#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268
+msgid "_View"
+msgstr "_Toon"
+
+#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569
+msgid "_Help"
+msgstr "_Help"
+
+#: modules/gui/gtk2/gtk2_interface.c:146
+msgid "_About"
+msgstr "_Over"
+
+#: modules/gui/gtk2/gtk2_interface.c:163
+msgid "button1"
+msgstr "knop1"
+
+#: modules/gui/gtk2/gtk2_interface.c:173
+msgid "button2"
+msgstr "knop2"
+
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr "Toon tooltips"
@@ -3224,7 +3434,7 @@ msgstr "_Open Bestand..."
 #: modules/gui/gtk/gnome_interface.c:20 modules/gui/gtk/gnome_interface.c:504
 #: modules/gui/gtk/gnome_interface.c:986 modules/gui/gtk/gtk_interface.c:173
 #: modules/gui/gtk/gtk_interface.c:619 modules/gui/gtk/gtk_interface.c:1399
-#: modules/gui/wxwindows/interface.cpp:230
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Open a file"
 msgstr "Open een bestand"
 
@@ -3324,25 +3534,25 @@ msgstr "Selecteer een audio kanaal"
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:909
 #: modules/gui/gtk/gtk_interface.c:452 modules/gui/gtk/gtk_interface.c:1253
-#: modules/gui/macosx/intf.m:355
+#: modules/gui/macosx/intf.m:378
 msgid "Volume Up"
 msgstr "Geluid Harder"
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:916
 #: modules/gui/gtk/gtk_interface.c:459 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:356
+#: modules/gui/macosx/intf.m:379
 msgid "Volume Down"
 msgstr "Geluid Zachter"
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:923
 #: modules/gui/gtk/gtk_interface.c:466 modules/gui/gtk/gtk_interface.c:1267
-#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:357
+#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:380
 msgid "Mute"
 msgstr "Geluid Stil"
 
 #: modules/gui/gtk/gnome_interface.c:155 modules/gui/gtk/gnome_interface.c:938
 #: modules/gui/gtk/gtk_interface.c:488 modules/gui/gtk/gtk_interface.c:1289
-#: modules/gui/macosx/intf.m:362 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:385 modules/gui/macosx/intf.m:386
 msgid "Device"
 msgstr "Apparaat"
 
@@ -3361,18 +3571,10 @@ msgstr "Selecteer ondertitelingskanaal"
 msgid "_Fullscreen"
 msgstr "Volledig Scherm"
 
-#: modules/gui/gtk/gnome_interface.c:183 modules/gui/gtk/gnome_interface.c:966
-#: modules/gui/gtk/gtk_interface.c:553 modules/gui/gtk/gtk_interface.c:1349
-#: modules/gui/macosx/controls.m:526 modules/gui/macosx/intf.m:378
-#: modules/gui/macosx/intf.m:379
-#: modules/video_filter/deinterlace/deinterlace.c:81
-msgid "Deinterlace"
-msgstr "Deinterlace"
-
 #: modules/gui/gtk/gnome_interface.c:190 modules/gui/gtk/gnome_interface.c:973
 #: modules/gui/gtk/gtk_interface.c:560 modules/gui/gtk/gtk_interface.c:1356
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/intf.m:375
-#: modules/gui/macosx/output.m:120 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/intf.m:397 modules/gui/macosx/intf.m:398
+#: modules/gui/macosx/output.m:124 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr "Scherm"
 
@@ -3389,18 +3591,18 @@ msgstr "_Video"
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
 #: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2005
 #: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:142
-#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:337
+#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:338
 #: modules/gui/wxwindows/open.cpp:278
 msgid "Disc"
 msgstr "Disk"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:339
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Net"
 msgstr "Net"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:343
 msgid "Sat"
 msgstr "Sat"
 
@@ -3462,7 +3664,7 @@ msgstr "Open Speellijst"
 #: modules/gui/gtk/gnome_interface.c:1063 modules/gui/gtk/gtk_interface.c:758
 #: modules/gui/gtk/gtk_interface.c:844 modules/gui/gtk/gtk_interface.c:888
 #: modules/gui/gtk/gtk_interface.c:1173
-#: modules/gui/wxwindows/interface.cpp:353
+#: modules/gui/wxwindows/interface.cpp:354
 msgid "Prev"
 msgstr "Vorige"
 
@@ -3474,8 +3676,8 @@ msgstr "Vorig Bestand"
 #: modules/gui/gtk/gnome_interface.c:1056 modules/gui/gtk/gtk_interface.c:769
 #: modules/gui/gtk/gtk_interface.c:852 modules/gui/gtk/gtk_interface.c:896
 #: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:443
-#: modules/gui/macosx/intf.m:303 modules/gui/macosx/intf.m:343
-#: modules/gui/macosx/intf.m:401 modules/gui/wxwindows/interface.cpp:355
+#: modules/gui/macosx/intf.m:326 modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:424 modules/gui/wxwindows/interface.cpp:356
 msgid "Next"
 msgstr "Volgende"
 
@@ -3573,8 +3775,8 @@ msgstr "Bouw een MRL met behulp van de volgende voorgedefinieerde doelen:"
 #: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
 #: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
 #: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:173
-#: modules/gui/macosx/output.m:123 modules/gui/wxwindows/open.cpp:246
-#: modules/gui/wxwindows/open.cpp:343
+#: modules/gui/macosx/output.m:127 modules/gui/wxwindows/open.cpp:246
+#: modules/gui/wxwindows/open.cpp:354
 #: modules/gui/wxwindows/preferences.cpp:778
 #: modules/gui/wxwindows/streamout.cpp:367
 #: modules/gui/wxwindows/subtitles.cpp:107
@@ -3582,24 +3784,24 @@ msgid "Browse..."
 msgstr "Blader..."
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:368
+#: modules/gui/wxwindows/open.cpp:379
 msgid "Disc type"
 msgstr "Disk type"
 
 #: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
 #: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:488
-#: modules/gui/wxwindows/open.cpp:362
+#: modules/gui/wxwindows/open.cpp:373
 msgid "DVD"
 msgstr "DVD"
 
 #: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
 #: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:382
-#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:363
+#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:374
 msgid "VCD"
 msgstr "VCD"
 
 #: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:374
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:385
 msgid "Device name"
 msgstr "Apparaat naam"
 
@@ -3610,24 +3812,24 @@ msgstr "Gebruik DVD menus"
 
 #: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:547
-#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:409
+#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:420
 msgid "UDP/RTP"
 msgstr "UDP/RTP"
 
 #: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
 #: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:548
-#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:421
 msgid "UDP/RTP Multicast"
 msgstr "UDP/RTP Multicast"
 
 #: modules/gui/gtk/gnome_interface.c:1727 modules/gui/gtk/gtk_interface.c:2042
 #: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:549
-#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:411
+#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:422
 msgid "HTTP/FTP/MMS"
 msgstr "HTTP/FTP/MMS"
 
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:467
+#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:478
 msgid "URL"
 msgstr "URL"
 
@@ -3675,7 +3877,7 @@ msgid "fps"
 msgstr "fps"
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:116
+#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:120
 #: modules/gui/wxwindows/open.cpp:201 modules/gui/wxwindows/open.cpp:223
 msgid "Settings..."
 msgstr "Instellingen..."
@@ -3753,14 +3955,14 @@ msgid "Destination Target: "
 msgstr "Doel: "
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:128 modules/gui/macosx/output.m:231
-#: modules/gui/macosx/output.m:290 modules/gui/wxwindows/streamout.cpp:342
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/output.m:237
+#: modules/gui/macosx/output.m:296 modules/gui/wxwindows/streamout.cpp:342
 msgid "UDP"
 msgstr "UDP"
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:129 modules/gui/macosx/output.m:241
-#: modules/gui/macosx/output.m:292 modules/gui/wxwindows/streamout.cpp:343
+#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:298 modules/gui/wxwindows/streamout.cpp:343
 msgid "RTP"
 msgstr "RTP"
 
@@ -3781,8 +3983,8 @@ msgid "PS"
 msgstr "PS"
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:135 modules/gui/macosx/output.m:273
-#: modules/gui/macosx/output.m:319
+#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:279
+#: modules/gui/macosx/output.m:325
 msgid "AVI"
 msgstr "AVI"
 
@@ -3799,11 +4001,6 @@ msgstr "Gtk+"
 msgid "Gtk+ interface"
 msgstr "Gtk+ interface"
 
-#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
-#: modules/gui/gtk2/gtk2_interface.c:77
-msgid "_File"
-msgstr "_Bestand"
-
 #: modules/gui/gtk/gtk_interface.c:238
 msgid "_Close"
 msgstr "_Sluit"
@@ -3820,10 +4017,6 @@ msgstr "Af_sluiten"
 msgid "Exit the program"
 msgstr "Sluit programma af"
 
-#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132
-msgid "_View"
-msgstr "_Toon"
-
 #: modules/gui/gtk/gtk_interface.c:294
 msgid "Hide the main interface window"
 msgstr "Verberg het hoofdscherm"
@@ -3844,10 +4037,6 @@ msgstr "_Voorkeuren..."
 msgid "Configure the application"
 msgstr "Stel applicatie voorkeuren in"
 
-#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139
-msgid "_Help"
-msgstr "_Help"
-
 #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435
 msgid "_About..."
 msgstr "_Over..."
@@ -3952,51 +4141,6 @@ msgstr "Configureer"
 msgid "Selected:"
 msgstr "Geselecteerd:"
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-msgid "Gtk2 interface"
-msgstr "Gtk2 interface"
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-msgid "_New"
-msgstr "_Nieuw"
-
-#: modules/gui/gtk2/gnome2_interface.c:87
-msgid "gnome2"
-msgstr "gnome2"
-
-#: modules/gui/gtk2/gnome2_interface.c:112
-msgid "button4"
-msgstr "knop4"
-
-#: modules/gui/gtk2/gnome2_interface.c:122
-#: modules/gui/gtk2/gtk2_interface.c:183
-msgid "button3"
-msgstr "knop3"
-
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:331
-msgid "Save File"
-msgstr "Bewaar Bestand"
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-msgid "window1"
-msgstr "venster1"
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-msgid "_Edit"
-msgstr "_Bewerk"
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-msgid "_About"
-msgstr "_Over"
-
-#: modules/gui/gtk2/gtk2_interface.c:163
-msgid "button1"
-msgstr "knop1"
-
-#: modules/gui/gtk2/gtk2_interface.c:173
-msgid "button2"
-msgstr "knop2"
-
 #: modules/gui/kde/interface.cpp:88
 msgid "Languages"
 msgstr "Talen"
@@ -4026,221 +4170,221 @@ msgstr "Berichten:"
 msgid "Plugins"
 msgstr "Plugins"
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:315
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:338
 msgid "About VLC media player"
 msgstr "Over VLC media speler"
 
 #: modules/gui/macosx/controls.m:344 modules/gui/macosx/controls.m:487
-#: modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:389
 msgid "Half Size"
 msgstr "Halve grootte"
 
 #: modules/gui/macosx/controls.m:346 modules/gui/macosx/controls.m:488
-#: modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:390
 msgid "Normal Size"
 msgstr "Normale grootte"
 
 #: modules/gui/macosx/controls.m:348 modules/gui/macosx/controls.m:489
-#: modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/intf.m:391
 msgid "Double Size"
 msgstr "Dubbele grootte"
 
 #: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:491
 #: modules/gui/macosx/controls.m:498 modules/gui/macosx/controls.m:520
-#: modules/gui/macosx/intf.m:371
+#: modules/gui/macosx/intf.m:394
 msgid "Float On Top"
 msgstr "Altijd op de Voorgrond"
 
 #: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:490
-#: modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/intf.m:392
 msgid "Fit To Screen"
 msgstr "Vul Scherm"
 
-#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:298
-#: modules/gui/macosx/intf.m:342 modules/gui/macosx/intf.m:402
+#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:321
+#: modules/gui/macosx/intf.m:365 modules/gui/macosx/intf.m:425
 msgid "Previous"
 msgstr "Vorige"
 
-#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:344
+#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:367
 msgid "Loop"
 msgstr "Herhaal"
 
-#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:345
+#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:368
 msgid "Step Forward"
 msgstr "Stap vooruit"
 
-#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:346
+#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:369
 msgid "Step Backward"
 msgstr "Stap terug"
 
-#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:386
-#: modules/gui/macosx/intf.m:411
+#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:434
 msgid "Info"
 msgstr "Info"
 
-#: modules/gui/macosx/intf.m:293
+#: modules/gui/macosx/intf.m:316
 msgid "VLC - Controller"
 msgstr "VLC - Bedieningspaneel"
 
-#: modules/gui/macosx/intf.m:305
+#: modules/gui/macosx/intf.m:328
 msgid "Volume"
 msgstr "Volume"
 
-#: modules/gui/macosx/intf.m:306
+#: modules/gui/macosx/intf.m:329
 msgid "Position"
 msgstr "Positie"
 
-#: modules/gui/macosx/intf.m:312
+#: modules/gui/macosx/intf.m:335
 msgid "Open CrashLog"
 msgstr "Open CrashLog"
 
-#: modules/gui/macosx/intf.m:316
+#: modules/gui/macosx/intf.m:339
 msgid "Preferences..."
 msgstr "Voorkeuren..."
 
-#: modules/gui/macosx/intf.m:317
+#: modules/gui/macosx/intf.m:340
 msgid "Hide VLC"
 msgstr "Verberg VLC"
 
-#: modules/gui/macosx/intf.m:318
+#: modules/gui/macosx/intf.m:341
 msgid "Hide Others"
 msgstr "Verberg anderen"
 
-#: modules/gui/macosx/intf.m:319
+#: modules/gui/macosx/intf.m:342
 msgid "Show All"
 msgstr "Toon alles"
 
-#: modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:343
 msgid "Quit VLC"
 msgstr "Stop VLC"
 
-#: modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/intf.m:345
 msgid "1:File"
 msgstr "1:Bestand"
 
-#: modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:346
 msgid "Open..."
 msgstr "Open..."
 
-#: modules/gui/macosx/intf.m:324
+#: modules/gui/macosx/intf.m:347
 msgid "Open File..."
 msgstr "Open bestand..."
 
-#: modules/gui/macosx/intf.m:325
+#: modules/gui/macosx/intf.m:348
 msgid "Open Disc..."
 msgstr "Open disk..."
 
-#: modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:349
 msgid "Open Network..."
 msgstr "Open netwerk..."
 
-#: modules/gui/macosx/intf.m:327
+#: modules/gui/macosx/intf.m:350
 msgid "Open Recent"
 msgstr "Open laatste"
 
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/intf.m:1291
+#: modules/gui/macosx/intf.m:351 modules/gui/macosx/intf.m:1314
 msgid "Clear Menu"
 msgstr "Wis menu"
 
-#: modules/gui/macosx/intf.m:331
+#: modules/gui/macosx/intf.m:354
 msgid "Cut"
 msgstr "Knip"
 
-#: modules/gui/macosx/intf.m:332
+#: modules/gui/macosx/intf.m:355
 msgid "Copy"
 msgstr "Kopieer"
 
-#: modules/gui/macosx/intf.m:333
+#: modules/gui/macosx/intf.m:356
 msgid "Paste"
 msgstr "Plak"
 
-#: modules/gui/macosx/intf.m:334
+#: modules/gui/macosx/intf.m:357
 msgid "Clear"
 msgstr "Verwijder"
 
-#: modules/gui/macosx/intf.m:337
+#: modules/gui/macosx/intf.m:360
 msgid "Controls"
 msgstr "Bediening"
 
-#: modules/gui/macosx/intf.m:358 modules/gui/macosx/intf.m:359
+#: modules/gui/macosx/intf.m:381 modules/gui/macosx/intf.m:382
 msgid "Audio Track"
 msgstr "Audio Spoor"
 
-#: modules/gui/macosx/intf.m:372 modules/gui/macosx/intf.m:373
+#: modules/gui/macosx/intf.m:395 modules/gui/macosx/intf.m:396
 msgid "Video Track"
 msgstr "Video Spoor"
 
-#: modules/gui/macosx/intf.m:382
+#: modules/gui/macosx/intf.m:405
 msgid "Minimize Window"
 msgstr "Minimalizeer venster"
 
-#: modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:406
 msgid "Close Window"
 msgstr "Sluit venster"
 
-#: modules/gui/macosx/intf.m:384
+#: modules/gui/macosx/intf.m:407
 msgid "Controller"
 msgstr "Bedieningspaneel"
 
-#: modules/gui/macosx/intf.m:389
+#: modules/gui/macosx/intf.m:412
 msgid "Bring All to Front"
 msgstr "Alles op voorgrond"
 
-#: modules/gui/macosx/intf.m:391
+#: modules/gui/macosx/intf.m:414
 msgid "Help"
 msgstr "Help"
 
-#: modules/gui/macosx/intf.m:392
+#: modules/gui/macosx/intf.m:415
 msgid "ReadMe..."
 msgstr "Lees mij..."
 
-#: modules/gui/macosx/intf.m:393
+#: modules/gui/macosx/intf.m:416
 #, fuzzy
 msgid "Online Documentation"
 msgstr "compensatie van beweging"
 
-#: modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/intf.m:417
 msgid "Report a Bug"
 msgstr "Rapporteer een fout"
 
-#: modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/intf.m:418
 msgid "VideoLAN Website"
 msgstr "VideoLAN Website"
 
-#: modules/gui/macosx/intf.m:396
+#: modules/gui/macosx/intf.m:419
 msgid "License"
 msgstr "Licentie"
 
-#: modules/gui/macosx/intf.m:405
+#: modules/gui/macosx/intf.m:428
 msgid "Error"
 msgstr "Fout"
 
-#: modules/gui/macosx/intf.m:406
+#: modules/gui/macosx/intf.m:429
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr ""
 "Er is een fout opgetreden die het onmogelijk maakte om uw verzoek af te "
 "handelen :"
 
-#: modules/gui/macosx/intf.m:407
+#: modules/gui/macosx/intf.m:430
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr ""
 "Mocht u van mening zijn dat het een software fout betreft, volg dan de "
 "instructies op:"
 
-#: modules/gui/macosx/intf.m:408
+#: modules/gui/macosx/intf.m:431
 msgid "Open Messages Window"
 msgstr "Open het berichten venster"
 
-#: modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:432
 msgid "Dismiss"
 msgstr "Dismiss"
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid "No CrashLog found"
 msgstr "Geen CrashLog gevonden"
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4320,61 +4464,55 @@ msgstr "Geen %@s gevonden"
 msgid "Open VIDEO_TS Directory"
 msgstr "Open VIDEO_TS map"
 
-#: modules/gui/macosx/output.m:115
+#: modules/gui/macosx/output.m:119
 msgid "Advanced output:"
 msgstr "Geavanceerde uitvoer:"
 
-#: modules/gui/macosx/output.m:119
+#: modules/gui/macosx/output.m:123
 msgid "Output Options"
 msgstr "Uitvoer Opties"
 
-#: modules/gui/macosx/output.m:122 modules/gui/macosx/output.m:210
-#: modules/gui/macosx/output.m:285
+#: modules/gui/macosx/output.m:126 modules/gui/macosx/output.m:216
+#: modules/gui/macosx/output.m:291
 msgid "Stream"
 msgstr "Stream"
 
-#: modules/gui/macosx/output.m:126
+#: modules/gui/macosx/output.m:130
 msgid "TTL"
 msgstr "TTL"
 
-#: modules/gui/macosx/output.m:132 modules/gui/wxwindows/streamout.cpp:437
+#: modules/gui/macosx/output.m:136 modules/gui/wxwindows/streamout.cpp:437
 msgid "Encapsulation Method"
 msgstr "Inkapseling Methode"
 
-#: modules/gui/macosx/output.m:133
+#: modules/gui/macosx/output.m:137
 msgid "MPEG TS"
 msgstr "MPEG TS"
 
-#: modules/gui/macosx/output.m:134 modules/gui/macosx/output.m:275
-#: modules/gui/macosx/output.m:317
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:281
+#: modules/gui/macosx/output.m:323
 msgid "MPEG PS"
 msgstr "MPEG PS"
 
-#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:274
-#: modules/gui/macosx/output.m:321
+#: modules/gui/macosx/output.m:140 modules/gui/macosx/output.m:280
+#: modules/gui/macosx/output.m:327
 msgid "Ogg"
 msgstr "Ogg"
 
-#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:276
-#: modules/gui/macosx/output.m:323
+#: modules/gui/macosx/output.m:141 modules/gui/macosx/output.m:282
+#: modules/gui/macosx/output.m:329
 msgid "mp4"
 msgstr "mp4"
 
-#: modules/gui/macosx/output.m:139
+#: modules/gui/macosx/output.m:143
 msgid "Transcode options"
 msgstr "Transcode opties"
 
-#: modules/gui/macosx/output.m:149 modules/gui/macosx/output.m:153
-msgid "Bitrate (bps)"
-msgstr "Bitrate (bps)"
-
-#: modules/gui/macosx/output.m:151
-msgid "mpga"
-msgstr "mpga"
-
-#: modules/gui/macosx/output.m:152
-msgid "a52 "
-msgstr "a52 "
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:158
+#: modules/gui/wxwindows/streamout.cpp:512
+#: modules/gui/wxwindows/streamout.cpp:549
+msgid "Bitrate (kb/s)"
+msgstr "Bitrate (kb/s)"
 
 #: modules/gui/macosx/prefs.m:78 modules/gui/wxwindows/preferences.cpp:256
 msgid "Reset All"
@@ -4384,12 +4522,6 @@ msgstr "Alles Wissen"
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: modules/gui/macosx/prefs.m:143 modules/gui/macosx/prefs.m:341
-#: modules/gui/macosx/prefs.m:368
-#, fuzzy
-msgid "Auto"
-msgstr "Auteur"
-
 #: modules/gui/ncurses/ncurses.c:66
 msgid "ncurses interface"
 msgstr "ncurses interface"
@@ -4402,32 +4534,32 @@ msgstr "QNX RTOS video en audio uitvoer"
 msgid "Qt interface"
 msgstr "Qt interface"
 
-#: modules/gui/skins/src/skin_main.cpp:251
-#: modules/gui/skins/src/vlcproc.cpp:338
+#: modules/gui/skins/src/skin_main.cpp:239
+#: modules/gui/skins/src/vlcproc.cpp:339
 msgid "Open a skin file"
 msgstr "Open een skin bestand"
 
-#: modules/gui/skins/src/skin_main.cpp:292
-#: modules/gui/skins/src/skin_main.cpp:293
+#: modules/gui/skins/src/skin_main.cpp:280
+#: modules/gui/skins/src/skin_main.cpp:281
 msgid "Last skin actually used"
 msgstr "Laast gebruikte skin"
 
-#: modules/gui/skins/src/skin_main.cpp:294
-#: modules/gui/skins/src/skin_main.cpp:295
+#: modules/gui/skins/src/skin_main.cpp:282
+#: modules/gui/skins/src/skin_main.cpp:283
 msgid "Config of last used skin"
 msgstr "Configuratie van laatst gebruikte skin"
 
-#: modules/gui/skins/src/skin_main.cpp:296
-#: modules/gui/skins/src/skin_main.cpp:297
+#: modules/gui/skins/src/skin_main.cpp:284
+#: modules/gui/skins/src/skin_main.cpp:285
 msgid "Show application in system tray"
 msgstr "Toon programma in system tray"
 
-#: modules/gui/skins/src/skin_main.cpp:298
-#: modules/gui/skins/src/skin_main.cpp:299
+#: modules/gui/skins/src/skin_main.cpp:286
+#: modules/gui/skins/src/skin_main.cpp:287
 msgid "Show application in taskbar"
 msgstr "Toon programma in taakbalk"
 
-#: modules/gui/skins/src/skin_main.cpp:310
+#: modules/gui/skins/src/skin_main.cpp:298
 msgid "Skinnable Interface"
 msgstr "Interface met Skins"
 
@@ -4435,158 +4567,159 @@ msgstr "Interface met Skins"
 msgid "FileInfo"
 msgstr "&Bestand info..."
 
-#: modules/gui/wxwindows/interface.cpp:231
+#: modules/gui/wxwindows/interface.cpp:232
 msgid "Open a DVD or (S)VCD"
 msgstr "Open een DVD of (S)VCD"
 
-#: modules/gui/wxwindows/interface.cpp:232
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Open a network stream"
 msgstr "Selecteer een Netwerk Stream"
 
-#: modules/gui/wxwindows/interface.cpp:233
+#: modules/gui/wxwindows/interface.cpp:234
 msgid "Open a satellite stream"
 msgstr "Open een satelliet kaart"
 
-#: modules/gui/wxwindows/interface.cpp:234
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "Eject the DVD/CD"
 msgstr "Verwijder de DVD/CD"
 
-#: modules/gui/wxwindows/interface.cpp:235
+#: modules/gui/wxwindows/interface.cpp:236
 msgid "Exit this program"
 msgstr "Sluit programma af"
 
-#: modules/gui/wxwindows/interface.cpp:237
+#: modules/gui/wxwindows/interface.cpp:238
 msgid "Open the playlist"
 msgstr "Open de speellijst"
 
-#: modules/gui/wxwindows/interface.cpp:238
+#: modules/gui/wxwindows/interface.cpp:239
 msgid "Show the program logs"
 msgstr "Toon de logs van het programma"
 
-#: modules/gui/wxwindows/interface.cpp:239
+#: modules/gui/wxwindows/interface.cpp:240
 msgid "Show information about the file being played"
 msgstr "Toon informatie van het bestand dat gespeeld word."
 
-#: modules/gui/wxwindows/interface.cpp:241
+#: modules/gui/wxwindows/interface.cpp:242
 msgid "Go to the preferences menu"
 msgstr "Ga naar het voorkeuren menu"
 
-#: modules/gui/wxwindows/interface.cpp:243
+#: modules/gui/wxwindows/interface.cpp:244
 msgid "About this program"
 msgstr "Over dit programma"
 
-#: modules/gui/wxwindows/interface.cpp:247
+#: modules/gui/wxwindows/interface.cpp:248
 msgid "&Open File..."
 msgstr "&Open Bestand..."
 
-#: modules/gui/wxwindows/interface.cpp:249
+#: modules/gui/wxwindows/interface.cpp:250
 msgid "Open &Disc..."
 msgstr "Open &Disk..."
 
-#: modules/gui/wxwindows/interface.cpp:251
+#: modules/gui/wxwindows/interface.cpp:252
 msgid "&Network Stream..."
 msgstr "&Netwerk Stream..."
 
-#: modules/gui/wxwindows/interface.cpp:254
+#: modules/gui/wxwindows/interface.cpp:255
 msgid "&Satellite Stream..."
 msgstr "&Sateliet Stream..."
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:260
 msgid "&Eject Disc"
 msgstr "V&erwijder Disk"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:264
 msgid "E&xit"
 msgstr "Af&sluiten"
 
-#: modules/gui/wxwindows/interface.cpp:267
+#: modules/gui/wxwindows/interface.cpp:268
 msgid "&Playlist..."
 msgstr "&Speellijst..."
 
-#: modules/gui/wxwindows/interface.cpp:269
-msgid "&Logs..."
-msgstr "&Logs..."
-
 #: modules/gui/wxwindows/interface.cpp:270
+#, fuzzy
+msgid "&Messages..."
+msgstr "Berichten..."
+
+#: modules/gui/wxwindows/interface.cpp:271
 msgid "&File info..."
 msgstr "&Bestand info..."
 
-#: modules/gui/wxwindows/interface.cpp:275
+#: modules/gui/wxwindows/interface.cpp:276
 msgid "&Preferences..."
 msgstr "&Voorkeuren..."
 
-#: modules/gui/wxwindows/interface.cpp:292
+#: modules/gui/wxwindows/interface.cpp:293
 msgid "&About..."
 msgstr "&Over..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:297
 msgid "&File"
 msgstr "&Bestand"
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:298
 msgid "&View"
 msgstr "&Toon"
 
-#: modules/gui/wxwindows/interface.cpp:298
+#: modules/gui/wxwindows/interface.cpp:299
 msgid "&Settings"
 msgstr "&Instellingen"
 
-#: modules/gui/wxwindows/interface.cpp:299
-#: modules/gui/wxwindows/interface.cpp:476
-#: modules/gui/wxwindows/interface.cpp:524
+#: modules/gui/wxwindows/interface.cpp:300
+#: modules/gui/wxwindows/interface.cpp:478
+#: modules/gui/wxwindows/interface.cpp:526
 msgid "&Audio"
 msgstr "&Audio"
 
-#: modules/gui/wxwindows/interface.cpp:300
-#: modules/gui/wxwindows/interface.cpp:495
-#: modules/gui/wxwindows/interface.cpp:528
+#: modules/gui/wxwindows/interface.cpp:301
+#: modules/gui/wxwindows/interface.cpp:497
+#: modules/gui/wxwindows/interface.cpp:530
 msgid "&Video"
 msgstr "&Video"
 
-#: modules/gui/wxwindows/interface.cpp:301
-#: modules/gui/wxwindows/interface.cpp:514
-#: modules/gui/wxwindows/interface.cpp:532
+#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:516
+#: modules/gui/wxwindows/interface.cpp:534
 msgid "&Navigation"
 msgstr "&Navigatie"
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:303
 msgid "&Help"
 msgstr "&Help"
 
-#: modules/gui/wxwindows/interface.cpp:318
+#: modules/gui/wxwindows/interface.cpp:319
 msgid "Stop current playlist item"
 msgstr "Stop het het huidige speellijst item"
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:320
 msgid "Play current playlist item"
 msgstr "Speel het huidige speellijst item af"
 
-#: modules/gui/wxwindows/interface.cpp:320
+#: modules/gui/wxwindows/interface.cpp:321
 msgid "Pause current playlist item"
 msgstr "Pauzeer het huidige speellijst item"
 
-#: modules/gui/wxwindows/interface.cpp:321
+#: modules/gui/wxwindows/interface.cpp:322
 #: modules/gui/wxwindows/playlist.cpp:351
 msgid "Open playlist"
 msgstr "Open speellijst"
 
-#: modules/gui/wxwindows/interface.cpp:322
+#: modules/gui/wxwindows/interface.cpp:323
 msgid "Previous playlist item"
 msgstr "Vorige speellijst item"
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:324
 msgid "Next playlist item"
 msgstr "Volgende speellijst item"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:325
 msgid "Play slower"
 msgstr "Speel langzamer"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:326
 msgid "Play faster"
 msgstr "Speel Sneller"
 
-#: modules/gui/wxwindows/interface.cpp:560
+#: modules/gui/wxwindows/interface.cpp:561
 msgid ""
 " (wxWindows interface)\n"
 "\n"
@@ -4594,7 +4727,7 @@ msgstr ""
 " (wxWindows interface)\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:561
+#: modules/gui/wxwindows/interface.cpp:562
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
@@ -4602,7 +4735,7 @@ msgstr ""
 "© 1996-2003 het VideoLAN team\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:562
+#: modules/gui/wxwindows/interface.cpp:563
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
@@ -4612,7 +4745,7 @@ msgstr ""
 "http://www.videolan.org/\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:564
+#: modules/gui/wxwindows/interface.cpp:565
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
 "It can play MPEG and MPEG2 files from a file or from a network source."
@@ -4621,7 +4754,7 @@ msgstr ""
 "Het kan MPEG-1 en MPEG-2 multimedia bestanden spelen van een bestand of "
 "netwerk locatie."
 
-#: modules/gui/wxwindows/interface.cpp:568
+#: modules/gui/wxwindows/interface.cpp:569
 #, c-format
 msgid "About %s"
 msgstr "Over %s"
@@ -4634,11 +4767,11 @@ msgstr "Audio menu"
 msgid "Video menu"
 msgstr "Video menu"
 
-#: modules/gui/wxwindows/menus.cpp:139
+#: modules/gui/wxwindows/menus.cpp:141
 msgid "Input menu"
 msgstr "Input menu"
 
-#: modules/gui/wxwindows/menus.cpp:329
+#: modules/gui/wxwindows/menus.cpp:334
 msgid "Empty"
 msgstr "Leeg"
 
@@ -4675,15 +4808,15 @@ msgstr "Opnemen van de stream"
 msgid "Capture the stream you are playing to a file"
 msgstr "Schrijf de stream die u afspeelt naar een bestand"
 
-#: modules/gui/wxwindows/open.cpp:361
+#: modules/gui/wxwindows/open.cpp:372
 msgid "DVD (menus support)"
 msgstr "DVD (menu ondersteuning)"
 
-#: modules/gui/wxwindows/open.cpp:364
+#: modules/gui/wxwindows/open.cpp:375
 msgid "CD Audio"
 msgstr "CD Audio"
 
-#: modules/gui/wxwindows/open.cpp:837 modules/gui/wxwindows/streamout.cpp:640
+#: modules/gui/wxwindows/open.cpp:848 modules/gui/wxwindows/streamout.cpp:640
 msgid "Save file"
 msgstr "Bewaar bestand"
 
@@ -4753,8 +4886,9 @@ msgid "No configuration options available"
 msgstr "Geen configuratie opties beschikbaar"
 
 #: modules/gui/wxwindows/preferences.cpp:865
-msgid "Advanced..."
-msgstr "Geavanceerd..."
+#, fuzzy
+msgid "Advanced options"
+msgstr "Toon geavanceerde opties"
 
 #: modules/gui/wxwindows/streamout.cpp:166
 msgid "Stream output MRL"
@@ -4791,11 +4925,6 @@ msgstr "Transcoding opties"
 msgid "Video codec"
 msgstr "Video codec"
 
-#: modules/gui/wxwindows/streamout.cpp:512
-#: modules/gui/wxwindows/streamout.cpp:549
-msgid "Bitrate (kb/s)"
-msgstr "Bitrate (kb/s)"
-
 #: modules/gui/wxwindows/streamout.cpp:543
 msgid "Audio codec"
 msgstr "Audio codec"
@@ -4920,6 +5049,10 @@ msgstr "bestands logging interface"
 msgid "Using the logger interface plugin..."
 msgstr "De logger interface plugin module wordt gebruikt..."
 
+#: modules/misc/memcpy/memcpyaltivec.c:52
+msgid "AltiVec memcpy"
+msgstr "AltiVec memcpy"
+
 #: modules/misc/memcpy/memcpy.c:81
 msgid "libc memcpy"
 msgstr "libc memcpy"
@@ -4936,10 +5069,6 @@ msgstr "MMX memcpy"
 msgid "MMX EXT memcpy"
 msgstr "MMX EXT memcpy"
 
-#: modules/misc/memcpy/memcpyaltivec.c:52
-msgid "AltiVec memcpy"
-msgstr "AltiVec memcpy"
-
 #: modules/misc/network/ipv4.c:85
 msgid "IPv4 network abstraction layer"
 msgstr "IPv4 network abstractie laag"
@@ -4952,6 +5081,10 @@ msgstr "IPv6 network abstractie laag"
 msgid "Qt Embedded GUI helper"
 msgstr "Qt Embedded GUI helper"
 
+#: modules/misc/sap.c:131
+msgid "SAP"
+msgstr "SAP"
+
 #: modules/misc/sap.c:134
 msgid "SAP interface"
 msgstr "SAP interface"
@@ -5073,8 +5206,9 @@ msgid "Set image contrast"
 msgstr "Wijzig contrast"
 
 #: modules/video_filter/adjust.c:61
-msgid "Set the image contrast. Defaults to 1"
-msgstr "Wijzig het contrast van het beeld. 1 is normaal."
+#, fuzzy
+msgid "Set the image contrast, between 0 and 2. Defaults to 1"
+msgstr "Wijzig de tint van het beeld. Waarden tussen 0 en 360, 0 is normaal."
 
 #: modules/video_filter/adjust.c:62
 msgid "Set image hue"
@@ -5089,16 +5223,18 @@ msgid "Set image saturation"
 msgstr "Wijzig de kleurverzadiging"
 
 #: modules/video_filter/adjust.c:65
-msgid "Set the image saturation. Defaults to 1"
-msgstr "Wijzig de kleurverzadiging van het beeld. 1 is normaal."
+#, fuzzy
+msgid "Set the image saturation, between 0 and 3. Defaults to 1"
+msgstr "Wijzig de tint van het beeld. Waarden tussen 0 en 360, 0 is normaal."
 
 #: modules/video_filter/adjust.c:66
 msgid "Set image brightness"
 msgstr "Wijzig helderheid"
 
 #: modules/video_filter/adjust.c:67
-msgid "Set the image brightness. Defaults to 1"
-msgstr "Wijzig de helderheid van het beeld. 1 is normaal."
+#, fuzzy
+msgid "Set the image brightness, between 0 and 2. Defaults to 1"
+msgstr "Wijzig de tint van het beeld. Waarden tussen 0 en 360, 0 is normaal."
 
 #: modules/video_filter/adjust.c:71
 msgid "Adjust"
@@ -5139,8 +5275,10 @@ msgid "Crop geometry"
 msgstr "Verklein afmetingen"
 
 #: modules/video_filter/crop.c:55
-msgid "Set the geometry of the zone to crop"
-msgstr "Zet de afmetingen van de te verkleinen zone"
+msgid ""
+"Set the geometry of the zone to crop. This is set as width x heigth + left "
+"offset + top offset."
+msgstr ""
 
 #: modules/video_filter/crop.c:57
 msgid "Automatic cropping"
@@ -5436,11 +5574,21 @@ msgid "Use shared memory to communicate between VLC and the X server."
 msgstr ""
 "Gebruik gedeeld geheugen voor het communiceren tussen VLC en de X server"
 
-#: modules/video_output/x11/x11.c:62
+#: modules/video_output/x11/x11.c:61 modules/video_output/x11/xvideo.c:72
+msgid "choose the screen to be used for fullscreen mode."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:63 modules/video_output/x11/xvideo.c:74
+msgid ""
+"Choose the screen you want to use in fullscreen mode. For instance set it to "
+"0 for first screen, 1 for the second."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:67
 msgid "X11"
 msgstr "X11"
 
-#: modules/video_output/x11/x11.c:68
+#: modules/video_output/x11/x11.c:76
 msgid "X11 video output"
 msgstr "X11 video uitvoer"
 
@@ -5468,11 +5616,11 @@ msgstr ""
 "Forceer de XVideo renderer om een specifiek chroma formaat te gebruiken in "
 "plaats van de snelste en meest efficiente te gebruiken."
 
-#: modules/video_output/x11/xvideo.c:73
+#: modules/video_output/x11/xvideo.c:78
 msgid "XVideo"
 msgstr "XVideo"
 
-#: modules/video_output/x11/xvideo.c:81
+#: modules/video_output/x11/xvideo.c:90
 msgid "XVideo extension video output"
 msgstr "XVideo extensie video uitvoer"
 
@@ -5516,6 +5664,40 @@ msgstr "XOSD module"
 msgid "xosd interface"
 msgstr "xosd interface"
 
+#~ msgid "SAP interface module"
+#~ msgstr "SAP interface module"
+
+#~ msgid "Bitrate (bps)"
+#~ msgstr "Bitrate (bps)"
+
+#~ msgid "mpga"
+#~ msgstr "mpga"
+
+#~ msgid "a52 "
+#~ msgstr "a52 "
+
+#, fuzzy
+#~ msgid "Auto"
+#~ msgstr "Auteur"
+
+#~ msgid "&Logs..."
+#~ msgstr "&Logs..."
+
+#~ msgid "Advanced..."
+#~ msgstr "Geavanceerd..."
+
+#~ msgid "Set the image contrast. Defaults to 1"
+#~ msgstr "Wijzig het contrast van het beeld. 1 is normaal."
+
+#~ msgid "Set the image saturation. Defaults to 1"
+#~ msgstr "Wijzig de kleurverzadiging van het beeld. 1 is normaal."
+
+#~ msgid "Set the image brightness. Defaults to 1"
+#~ msgstr "Wijzig de helderheid van het beeld. 1 is normaal."
+
+#~ msgid "Set the geometry of the zone to crop"
+#~ msgstr "Zet de afmetingen van de te verkleinen zone"
+
 #~ msgid "Display identifier"
 #~ msgstr "Beeldscherm naam"
 
@@ -5934,9 +6116,6 @@ msgstr "xosd interface"
 #~ msgid "flac decoder module"
 #~ msgstr "flac decodeer module"
 
-#~ msgid "C Post Processing module"
-#~ msgstr "C nabewerkingsmodule"
-
 #~ msgid "libmpeg2 decoder module"
 #~ msgstr "libmpeg2 decodeer module"
 
diff --git a/po/no.po b/po/no.po
index 4d6a751e89..3fc8f58218 100644
--- a/po/no.po
+++ b/po/no.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-05-24 14:40+0200\n"
+"POT-Creation-Date: 2003-05-27 23:43+0200\n"
 "PO-Revision-Date: 2003-04-06 12:32+0200\n"
 "Last-Translator: Haakon Meland Eriksen <haakon.eriksen@far.no>\n"
 "Language-Team: vlc <>\n"
@@ -29,7 +29,7 @@ msgid "Audio channels"
 msgstr "Velg lydkanal"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:165 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:358
 msgid "Stereo"
@@ -117,7 +117,7 @@ msgstr "Spilleliste"
 
 #: src/input/input_programs.c:94 modules/gui/gtk/gnome_interface.c:1078
 #: modules/gui/gtk/gtk_interface.c:1199 modules/gui/kde/interface.cpp:142
-#: modules/gui/macosx/intf.m:347 modules/gui/macosx/intf.m:348
+#: modules/gui/macosx/intf.m:370 modules/gui/macosx/intf.m:371
 #, fuzzy
 msgid "Program"
 msgstr "Avslutt programmet"
@@ -126,18 +126,18 @@ msgstr "Avslutt programmet"
 #: modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
-#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:349
-#: modules/gui/macosx/intf.m:350 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:382
+#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:372
+#: modules/gui/macosx/intf.m:373 modules/gui/macosx/open.m:149
+#: modules/gui/wxwindows/open.cpp:393
 msgid "Title"
 msgstr "Tittel"
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
 #: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
-#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:351
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:388
+#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:374
+#: modules/gui/macosx/intf.m:375 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:399
 msgid "Chapter"
 msgstr "Kapittel"
 
@@ -191,7 +191,7 @@ msgstr "Kapittel"
 msgid "Previous Chapter"
 msgstr "Kapittel"
 
-#: src/input/input_programs.c:668
+#: src/input/input_programs.c:668 src/video_output/video_output.c:397
 msgid "Disable"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "C"
 msgstr "no"
 
-#: src/libvlc.c:301 src/libvlc.c:1357
+#: src/libvlc.c:301 src/libvlc.c:1364
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
@@ -213,27 +213,27 @@ msgstr ""
 "Bruk: %s [alternativer] [punkter]...\n"
 "\n"
 
-#: src/libvlc.c:1189 src/misc/configuration.c:961
+#: src/libvlc.c:1196 src/misc/configuration.c:961
 msgid "string"
 msgstr "tegn"
 
-#: src/libvlc.c:1206 src/misc/configuration.c:946
+#: src/libvlc.c:1213 src/misc/configuration.c:946
 msgid "integer"
 msgstr "heltall"
 
-#: src/libvlc.c:1209 src/misc/configuration.c:953
+#: src/libvlc.c:1216 src/misc/configuration.c:953
 msgid "float"
 msgstr "desimaltall"
 
-#: src/libvlc.c:1215
+#: src/libvlc.c:1222
 msgid " (default enabled)"
 msgstr " (grunninnstilling påskrudd)"
 
-#: src/libvlc.c:1216
+#: src/libvlc.c:1223
 msgid " (default disabled)"
 msgstr " (grunninnstilling avskrudd)"
 
-#: src/libvlc.c:1332 src/libvlc.c:1387 src/libvlc.c:1411
+#: src/libvlc.c:1339 src/libvlc.c:1394 src/libvlc.c:1418
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
@@ -241,11 +241,11 @@ msgstr ""
 "\n"
 "Trykk Retur-knappen for å fortsette...\n"
 
-#: src/libvlc.c:1360
+#: src/libvlc.c:1367
 msgid "[module]              [description]\n"
 msgstr "[modul]              [beskrivelse]\n"
 
-#: src/libvlc.c:1405
+#: src/libvlc.c:1412
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -1142,15 +1142,15 @@ msgstr "Grensesnitt"
 #: modules/demux/ogg.c:554 modules/demux/ogg.c:813 modules/demux/ogg.c:986
 #: modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m:354 modules/gui/macosx/output.m:150
+#: modules/gui/macosx/intf.m:377 modules/gui/macosx/output.m:155
 msgid "Audio"
 msgstr "Lyd"
 
 #: src/libvlc.h:473 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:893 modules/gui/gtk/gnome_interface.c:1099
-#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:365
-#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:140
+#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:388
+#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:144
 #: modules/misc/dummy/dummy.c:83 modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "Video"
@@ -1183,8 +1183,8 @@ msgstr ""
 #: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
-#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:297
-#: modules/gui/macosx/intf.m:385 modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:408 modules/gui/wxwindows/interface.cpp:352
 #: modules/gui/wxwindows/playlist.cpp:102
 msgid "Playlist"
 msgstr "Spilleliste"
@@ -1227,13 +1227,44 @@ msgstr "skriv ut versjonsinformasjon"
 msgid "boolean"
 msgstr "boolsk"
 
-#: src/video_output/video_output.c:382 modules/gui/beos/VideoOutput.cpp:1138
+#: src/video_output/video_output.c:384 modules/gui/beos/VideoOutput.cpp:1138
 #: modules/gui/macosx/controls.m:342 modules/gui/macosx/controls.m:486
-#: modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/intf.m:393
 #, fuzzy
 msgid "Fullscreen"
 msgstr "_Fullskjerm"
 
+#: src/video_output/video_output.c:395 modules/gui/gtk/gnome_interface.c:183
+#: modules/gui/gtk/gnome_interface.c:966 modules/gui/gtk/gtk_interface.c:553
+#: modules/gui/gtk/gtk_interface.c:1349 modules/gui/macosx/controls.m:526
+#: modules/gui/macosx/intf.m:401 modules/gui/macosx/intf.m:402
+#: modules/video_filter/deinterlace/deinterlace.c:81
+#, fuzzy
+msgid "Deinterlace"
+msgstr "Standard grensesnitt: "
+
+#: src/video_output/video_output.c:399
+#, fuzzy
+msgid "Discard"
+msgstr "Disk"
+
+#: src/video_output/video_output.c:401
+msgid "Blend"
+msgstr ""
+
+#: src/video_output/video_output.c:403
+msgid "Mean"
+msgstr ""
+
+#: src/video_output/video_output.c:405
+msgid "Bob"
+msgstr ""
+
+#: src/video_output/video_output.c:407
+#, fuzzy
+msgid "Linear"
+msgstr "heltall"
+
 #: modules/access/cdda.c:86 modules/access/file.c:69 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
 #: modules/access/v4l/v4l.c:64
@@ -1368,6 +1399,26 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
+#: modules/access_output/dummy.c:56
+#, fuzzy
+msgid "Dummy stream ouput"
+msgstr "Standard output:"
+
+#: modules/access_output/file.c:58
+#, fuzzy
+msgid "File stream ouput"
+msgstr "Standard output:"
+
+#: modules/access_output/http.c:54
+#, fuzzy
+msgid "HTTP stream ouput"
+msgstr "Standard output:"
+
+#: modules/access_output/udp.c:73
+#, fuzzy
+msgid "UDP stream ouput"
+msgstr "Standard output:"
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr ""
@@ -1455,35 +1506,6 @@ msgstr "Standard grensesnitt: "
 msgid "VCD input"
 msgstr ""
 
-#: modules/access/vlcs.c:131 modules/misc/sap.c:131
-msgid "SAP"
-msgstr ""
-
-#: modules/access/vlcs.c:134
-#, fuzzy
-msgid "SAP interface module"
-msgstr "Standard grensesnitt: "
-
-#: modules/access_output/dummy.c:56
-#, fuzzy
-msgid "Dummy stream ouput"
-msgstr "Standard output:"
-
-#: modules/access_output/file.c:58
-#, fuzzy
-msgid "File stream ouput"
-msgstr "Standard output:"
-
-#: modules/access_output/http.c:54
-#, fuzzy
-msgid "HTTP stream ouput"
-msgstr "Standard output:"
-
-#: modules/access_output/udp.c:73
-#, fuzzy
-msgid "UDP stream ouput"
-msgstr "Standard output:"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 #, fuzzy
 msgid "Characteristic dimension"
@@ -1638,13 +1660,13 @@ msgstr "Lydeksport volum"
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:159 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:161 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:371
 msgid "Mono"
 msgstr "Mono"
 
-#: modules/audio_output/alsa.c:201 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:203 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:387
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1804,23 +1826,147 @@ msgstr ""
 msgid "AAC audio decoder (using libfaad2)"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:154
-msgid "ffmpeg"
+#: modules/codec/ffmpeg/ffmpeg.c:86
+msgid "Direct rendering"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:88
+msgid "Error resilience"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:90
+msgid ""
+"ffmpeg can make errors resiliences.          \n"
+"Nevertheless, with buggy encoder (like ISO MPEG-4 encoder from M$) this will "
+"produce a lot of errors.\n"
+"Valid range is -1 to 99 (-1 disable all errors resiliences)."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:95
+msgid "Workaround bugs"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:97
+msgid ""
+"Try to fix some bugs\n"
+"1  autodetect\n"
+"2  old msmpeg4\n"
+"4  xvid interlaced\n"
+"8  ump4 \n"
+"16 no padding\n"
+"32 ac vlc64 Qpel chroma"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:106
+msgid "Hurry up"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:108
+msgid ""
+"Allow the decoder to partially decode or skip frame(s) when there not enough "
+"time.\n"
+" It's usefull with low CPU power but it could produce broken pictures."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:112
+#, fuzzy
+msgid "Truncated stream"
+msgstr "Spill strøm"
+
+#: modules/codec/ffmpeg/ffmpeg.c:113
+msgid "truncated stream -1:auto,0:disable,:1:enable"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:115
+msgid "Post processing quality"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:117
+msgid ""
+"Quality of post processing\n"
+"Valid range is 0 to 6"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:120
+msgid "Ffmpeg postproc filter chains"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:157
-msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgid "Ffmpeg postprocessing module"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:159
+msgid "Auto-level Post processing quality"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:161
+msgid ""
+"Post processing quality is selected upon time left but no more than "
+"requested quality\n"
+"Not yet implemented !"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:165
+msgid "Force vertical luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:166
+msgid "Force vertical luminance deblocking (override other settings)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:168
-msgid "Post processing"
+msgid "Force horizontal luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:169
+msgid "Force horizontal luminance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:171
+msgid "Force vertical chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:172
+msgid "Force vertical chrominance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:174
+msgid "Force horizontal chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:175
+msgid "Force horizontal chrominance deblocking (override other settings)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:177
-msgid "ffmpeg postprocessing module"
+msgid "Force luminance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:178
+msgid "Force luminance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:180
+msgid "Force chrominance deringing"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:204
+#: modules/codec/ffmpeg/ffmpeg.c:181
+msgid "Force chrominance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:184
+msgid "ffmpeg"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:187
+msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:195
+msgid "Post processing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:215
 msgid "ffmpeg chroma conversion"
 msgstr ""
 
@@ -1841,7 +1987,7 @@ msgstr ""
 msgid "flac audio decoder"
 msgstr "Standard grensesnitt: "
 
-#: modules/codec/libmpeg2.c:89
+#: modules/codec/libmpeg2.c:90
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr ""
 
@@ -1858,14 +2004,14 @@ msgstr ""
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr "Standard grensesnitt: "
 
-#: modules/codec/mpeg_video/idct/idct.c:41
-msgid "IDCT"
-msgstr ""
-
 #: modules/codec/mpeg_video/idct/idctaltivec.c:45
 msgid "AltiVec IDCT"
 msgstr ""
 
+#: modules/codec/mpeg_video/idct/idct.c:41
+msgid "IDCT"
+msgstr ""
+
 #: modules/codec/mpeg_video/idct/idctclassic.c:41
 msgid "classic IDCT"
 msgstr ""
@@ -1878,10 +2024,6 @@ msgstr ""
 msgid "MMX EXT IDCT"
 msgstr ""
 
-#: modules/codec/mpeg_video/motion/motion.c:42
-msgid "motion compensation"
-msgstr ""
-
 #: modules/codec/mpeg_video/motion/motion3dnow.c:44
 msgid "3D Now! motion compensation"
 msgstr ""
@@ -1890,6 +2032,10 @@ msgstr ""
 msgid "AltiVec motion compensation"
 msgstr ""
 
+#: modules/codec/mpeg_video/motion/motion.c:42
+msgid "motion compensation"
+msgstr ""
+
 #: modules/codec/mpeg_video/motion/motionmmx.c:45
 msgid "MMX motion compensation"
 msgstr ""
@@ -2064,20 +2210,20 @@ msgstr "Om"
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
 #: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
-#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:879
-#: modules/gui/macosx/intf.m:880 modules/gui/macosx/intf.m:881
-#: modules/gui/wxwindows/interface.cpp:810
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:902
+#: modules/gui/macosx/intf.m:903 modules/gui/macosx/intf.m:904
+#: modules/gui/wxwindows/interface.cpp:811
 msgid "Pause"
 msgstr "Pause"
 
 #: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
 #: modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
-#: modules/gui/macosx/intf.m:300 modules/gui/macosx/intf.m:338
-#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:886
-#: modules/gui/macosx/intf.m:887 modules/gui/macosx/intf.m:888
-#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:348
-#: modules/gui/wxwindows/interface.cpp:815
+#: modules/gui/macosx/intf.m:323 modules/gui/macosx/intf.m:361
+#: modules/gui/macosx/intf.m:422 modules/gui/macosx/intf.m:909
+#: modules/gui/macosx/intf.m:910 modules/gui/macosx/intf.m:911
+#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:816
 msgid "Play"
 msgstr "Spill"
 
@@ -2133,8 +2279,8 @@ msgstr ""
 #: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:821
 #: modules/demux/ogg.c:994 modules/gui/gtk/gnome_interface.c:148
 #: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
-#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:360
-#: modules/gui/macosx/intf.m:361
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:384
 msgid "Channels"
 msgstr "Kanaler"
 
@@ -2159,7 +2305,7 @@ msgstr "Stopp str
 #: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:554
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:813 modules/demux/ogg.c:893 modules/demux/ogg.c:986
-#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:130
+#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134
 msgid "Type"
 msgstr ""
 
@@ -2810,7 +2956,7 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:201
 #: modules/gui/beos/InterfaceWindow.cpp:300
 #: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:304 modules/gui/macosx/prefs.m:75
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/prefs.m:75
 #: modules/gui/wxwindows/preferences.cpp:229
 msgid "Preferences"
 msgstr "Innstillinger"
@@ -2819,7 +2965,7 @@ msgstr "Innstillinger"
 #: modules/gui/beos/InterfaceWindow.cpp:298
 #: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
 #: modules/gui/kde/info.cpp:9 modules/gui/kde/messages.cpp:8
-#: modules/gui/macosx/intf.m:310 modules/gui/macosx/intf.m:387
+#: modules/gui/macosx/intf.m:333 modules/gui/macosx/intf.m:410
 #: modules/gui/wxwindows/messages.cpp:79
 msgid "Messages"
 msgstr "Beskjeder"
@@ -2834,16 +2980,16 @@ msgstr "Beskjeder"
 #: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
 #: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
 #: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:264
-#: modules/gui/macosx/output.m:121 modules/gui/macosx/output.m:194
-#: modules/gui/macosx/output.m:279 modules/gui/wxwindows/interface.cpp:335
+#: modules/gui/macosx/output.m:125 modules/gui/macosx/output.m:200
+#: modules/gui/macosx/output.m:285 modules/gui/wxwindows/interface.cpp:336
 #: modules/gui/wxwindows/open.cpp:276 modules/gui/wxwindows/streamout.cpp:340
 msgid "File"
 msgstr "Fil"
 
 #: modules/gui/beos/InterfaceWindow.cpp:240
 #: modules/gui/beos/PlayListWindow.cpp:84
-#: modules/gui/gtk/gnome_interface.c:2179
-#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332
 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677
 msgid "Open File"
 msgstr "Åpne fil"
@@ -2866,7 +3012,7 @@ msgid "About"
 msgstr "Om"
 
 #: modules/gui/beos/InterfaceWindow.cpp:256 modules/gui/kde/interface.cpp:93
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/intf.m:377
+#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:400
 #, fuzzy
 msgid "Subtitles"
 msgstr "_Teksting"
@@ -2906,8 +3052,8 @@ msgid "Speed"
 msgstr "Valgte"
 
 #: modules/gui/beos/InterfaceWindow.cpp:286 modules/gui/macosx/controls.m:422
-#: modules/gui/macosx/intf.m:299 modules/gui/macosx/intf.m:341
-#: modules/gui/wxwindows/interface.cpp:357
+#: modules/gui/macosx/intf.m:322 modules/gui/macosx/intf.m:364
+#: modules/gui/wxwindows/interface.cpp:358
 #, fuzzy
 msgid "Slower"
 msgstr "Sakte"
@@ -2917,13 +3063,13 @@ msgid "Normal"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:290 modules/gui/macosx/controls.m:421
-#: modules/gui/macosx/intf.m:302 modules/gui/macosx/intf.m:340
-#: modules/gui/wxwindows/interface.cpp:359
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/wxwindows/interface.cpp:360
 #, fuzzy
 msgid "Faster"
 msgstr "Fort"
 
-#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:381
+#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:404
 msgid "Window"
 msgstr ""
 
@@ -2937,7 +3083,7 @@ msgstr "Spilleliste"
 #: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
 #: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
 #: modules/gui/gtk/preferences.c:605 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:117
+#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:121
 #: modules/gui/wxwindows/fileinfo.cpp:96
 #: modules/gui/wxwindows/messages.cpp:102 modules/gui/wxwindows/open.cpp:267
 #: modules/gui/wxwindows/preferences.cpp:250
@@ -2959,17 +3105,17 @@ msgstr "Velg teksting kanal"
 msgid "Drop files to play"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:167
+#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:169
 #: modules/gui/wxwindows/playlist.cpp:154
 msgid "Close"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:330
+#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:353
 #, fuzzy
 msgid "Edit"
 msgstr "_Avslutt"
 
-#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:335
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:358
 #: modules/gui/macosx/playlist.m:180
 #, fuzzy
 msgid "Select All"
@@ -3024,25 +3170,25 @@ msgstr "Navn"
 #: modules/gui/beos/PreferencesWindow.cpp:44
 #: modules/gui/beos/PreferencesWindow.cpp:46
 #: modules/gui/beos/PreferencesWindow.cpp:98
-#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:607
-#: modules/gui/macosx/prefs.m:615 modules/gui/macosx/prefs.m:685
+#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:690
+#: modules/gui/macosx/prefs.m:698 modules/gui/macosx/prefs.m:768
 msgid "Modules"
 msgstr "Moduler"
 
-#: modules/gui/beos/PreferencesWindow.cpp:220
+#: modules/gui/beos/PreferencesWindow.cpp:219
 #: modules/gui/gtk/preferences.c:609
 msgid "Apply"
 msgstr "Bruk"
 
-#: modules/gui/beos/PreferencesWindow.cpp:225
+#: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
-#: modules/gui/macosx/output.m:332 modules/gui/macosx/prefs.m:76
+#: modules/gui/macosx/output.m:338 modules/gui/macosx/prefs.m:76
 #: modules/gui/wxwindows/preferences.cpp:254
 #, fuzzy
 msgid "Save"
 msgstr "Tjener"
 
-#: modules/gui/beos/PreferencesWindow.cpp:229
+#: modules/gui/beos/PreferencesWindow.cpp:228
 #, fuzzy
 msgid "Defaults"
 msgstr "Slett"
@@ -3082,6 +3228,7 @@ msgid "Take Screen Shot"
 msgstr ""
 
 #: modules/gui/beos/VlcWrapper.cpp:185 modules/gui/gtk/menu.c:733
+#: modules/gui/macosx/prefs.m:348
 msgid "None"
 msgstr ""
 
@@ -3110,8 +3257,8 @@ msgstr "Standard grensesnitt: "
 msgid "VLC media player"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:652
-#: modules/gui/wxwindows/preferences.cpp:965
+#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:663
+#: modules/gui/wxwindows/preferences.cpp:967
 #: modules/gui/wxwindows/subtitles.cpp:196
 #, fuzzy
 msgid "Open file"
@@ -3139,8 +3286,8 @@ msgstr "Spill str
 #: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
 #: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
 #: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:435
-#: modules/gui/macosx/intf.m:301 modules/gui/macosx/intf.m:339
-#: modules/gui/macosx/intf.m:400 modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
+#: modules/gui/macosx/intf.m:423 modules/gui/wxwindows/interface.cpp:347
 msgid "Stop"
 msgstr "Stopp"
 
@@ -3172,7 +3319,7 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
 #: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:160
-#: modules/gui/macosx/output.m:124 modules/gui/wxwindows/open.cpp:445
+#: modules/gui/macosx/output.m:128 modules/gui/wxwindows/open.cpp:456
 #: modules/gui/wxwindows/streamout.cpp:380
 msgid "Address"
 msgstr "Adresse"
@@ -3182,13 +3329,13 @@ msgstr "Adresse"
 #: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
 #: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
 #: modules/gui/macosx/open.m:159 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:125 modules/gui/wxwindows/open.cpp:430
-#: modules/gui/wxwindows/open.cpp:453 modules/gui/wxwindows/streamout.cpp:390
+#: modules/gui/macosx/output.m:129 modules/gui/wxwindows/open.cpp:441
+#: modules/gui/wxwindows/open.cpp:464 modules/gui/wxwindows/streamout.cpp:390
 msgid "Port"
 msgstr "Port"
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:127
-#: modules/gui/macosx/output.m:221 modules/gui/macosx/output.m:289
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:131
+#: modules/gui/macosx/output.m:227 modules/gui/macosx/output.m:295
 #: modules/gui/wxwindows/streamout.cpp:341
 msgid "HTTP"
 msgstr ""
@@ -3273,10 +3420,10 @@ msgid ""
 "from local or network sources."
 msgstr ""
 
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
+#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100
 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
@@ -3286,6 +3433,69 @@ msgstr ""
 msgid "Error loading pixmap file: %s"
 msgstr ""
 
+#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
+#, fuzzy
+msgid "Gtk2 interface"
+msgstr "Standard grensesnitt: "
+
+#: modules/gui/gtk2/gnome2_interface.c:31
+#, fuzzy
+msgid "_New"
+msgstr "_Vis"
+
+#: modules/gui/gtk2/gnome2_interface.c:87
+msgid "gnome2"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:112
+msgid "button4"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:122
+#: modules/gui/gtk2/gtk2_interface.c:183
+msgid "button3"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337
+#, fuzzy
+msgid "Save File"
+msgstr "Velg fil"
+
+#: modules/gui/gtk2/gtk2_interface.c:67
+msgid "window1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147
+#: modules/gui/gtk/gtk_interface.c:1373
+msgid "_File"
+msgstr "_Fil"
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+#, fuzzy
+msgid "_Edit"
+msgstr "_Avslutt"
+
+#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268
+msgid "_View"
+msgstr "_Vis"
+
+#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569
+msgid "_Help"
+msgstr "_Hjelp"
+
+#: modules/gui/gtk2/gtk2_interface.c:146
+#, fuzzy
+msgid "_About"
+msgstr "Om"
+
+#: modules/gui/gtk2/gtk2_interface.c:163
+msgid "button1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:173
+msgid "button2"
+msgstr ""
+
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr ""
@@ -3329,7 +3539,7 @@ msgstr "_
 #: modules/gui/gtk/gnome_interface.c:20 modules/gui/gtk/gnome_interface.c:504
 #: modules/gui/gtk/gnome_interface.c:986 modules/gui/gtk/gtk_interface.c:173
 #: modules/gui/gtk/gtk_interface.c:619 modules/gui/gtk/gtk_interface.c:1399
-#: modules/gui/wxwindows/interface.cpp:230
+#: modules/gui/wxwindows/interface.cpp:231
 #, fuzzy
 msgid "Open a file"
 msgstr "Åpne en fil"
@@ -3434,25 +3644,25 @@ msgstr "Velg lydkanal"
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:909
 #: modules/gui/gtk/gtk_interface.c:452 modules/gui/gtk/gtk_interface.c:1253
-#: modules/gui/macosx/intf.m:355
+#: modules/gui/macosx/intf.m:378
 msgid "Volume Up"
 msgstr "Øk volum"
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:916
 #: modules/gui/gtk/gtk_interface.c:459 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:356
+#: modules/gui/macosx/intf.m:379
 msgid "Volume Down"
 msgstr "Senk volum"
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:923
 #: modules/gui/gtk/gtk_interface.c:466 modules/gui/gtk/gtk_interface.c:1267
-#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:357
+#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:380
 msgid "Mute"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:155 modules/gui/gtk/gnome_interface.c:938
 #: modules/gui/gtk/gtk_interface.c:488 modules/gui/gtk/gtk_interface.c:1289
-#: modules/gui/macosx/intf.m:362 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:385 modules/gui/macosx/intf.m:386
 #, fuzzy
 msgid "Device"
 msgstr "Navn på enhet"
@@ -3472,19 +3682,10 @@ msgstr "Velg teksting kanal"
 msgid "_Fullscreen"
 msgstr "_Fullskjerm"
 
-#: modules/gui/gtk/gnome_interface.c:183 modules/gui/gtk/gnome_interface.c:966
-#: modules/gui/gtk/gtk_interface.c:553 modules/gui/gtk/gtk_interface.c:1349
-#: modules/gui/macosx/controls.m:526 modules/gui/macosx/intf.m:378
-#: modules/gui/macosx/intf.m:379
-#: modules/video_filter/deinterlace/deinterlace.c:81
-#, fuzzy
-msgid "Deinterlace"
-msgstr "Standard grensesnitt: "
-
 #: modules/gui/gtk/gnome_interface.c:190 modules/gui/gtk/gnome_interface.c:973
 #: modules/gui/gtk/gtk_interface.c:560 modules/gui/gtk/gtk_interface.c:1356
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/intf.m:375
-#: modules/gui/macosx/output.m:120 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/intf.m:397 modules/gui/macosx/intf.m:398
+#: modules/gui/macosx/output.m:124 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr "Fullskjerm"
 
@@ -3501,18 +3702,18 @@ msgstr "_Video"
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
 #: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2005
 #: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:142
-#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:337
+#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:338
 #: modules/gui/wxwindows/open.cpp:278
 msgid "Disc"
 msgstr "Disk"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:339
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Net"
 msgstr "Nett"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:343
 msgid "Sat"
 msgstr ""
 
@@ -3576,7 +3777,7 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:1063 modules/gui/gtk/gtk_interface.c:758
 #: modules/gui/gtk/gtk_interface.c:844 modules/gui/gtk/gtk_interface.c:888
 #: modules/gui/gtk/gtk_interface.c:1173
-#: modules/gui/wxwindows/interface.cpp:353
+#: modules/gui/wxwindows/interface.cpp:354
 msgid "Prev"
 msgstr "Forrige"
 
@@ -3589,8 +3790,8 @@ msgstr "Forrige fil"
 #: modules/gui/gtk/gnome_interface.c:1056 modules/gui/gtk/gtk_interface.c:769
 #: modules/gui/gtk/gtk_interface.c:852 modules/gui/gtk/gtk_interface.c:896
 #: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:443
-#: modules/gui/macosx/intf.m:303 modules/gui/macosx/intf.m:343
-#: modules/gui/macosx/intf.m:401 modules/gui/wxwindows/interface.cpp:355
+#: modules/gui/macosx/intf.m:326 modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:424 modules/gui/wxwindows/interface.cpp:356
 msgid "Next"
 msgstr "Neste"
 
@@ -3692,8 +3893,8 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
 #: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
 #: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:173
-#: modules/gui/macosx/output.m:123 modules/gui/wxwindows/open.cpp:246
-#: modules/gui/wxwindows/open.cpp:343
+#: modules/gui/macosx/output.m:127 modules/gui/wxwindows/open.cpp:246
+#: modules/gui/wxwindows/open.cpp:354
 #: modules/gui/wxwindows/preferences.cpp:778
 #: modules/gui/wxwindows/streamout.cpp:367
 #: modules/gui/wxwindows/subtitles.cpp:107
@@ -3702,24 +3903,24 @@ msgid "Browse..."
 msgstr "Utforsk"
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:368
+#: modules/gui/wxwindows/open.cpp:379
 msgid "Disc type"
 msgstr "Disktype"
 
 #: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
 #: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:488
-#: modules/gui/wxwindows/open.cpp:362
+#: modules/gui/wxwindows/open.cpp:373
 msgid "DVD"
 msgstr "DVD"
 
 #: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
 #: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:382
-#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:363
+#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:374
 msgid "VCD"
 msgstr "VCD"
 
 #: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:374
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:385
 msgid "Device name"
 msgstr "Navn på enhet"
 
@@ -3730,24 +3931,24 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:547
-#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:409
+#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:420
 msgid "UDP/RTP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
 #: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:548
-#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:421
 msgid "UDP/RTP Multicast"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1727 modules/gui/gtk/gtk_interface.c:2042
 #: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:549
-#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:411
+#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:422
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:467
+#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:478
 msgid "URL"
 msgstr ""
 
@@ -3800,7 +4001,7 @@ msgid "fps"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:116
+#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:120
 #: modules/gui/wxwindows/open.cpp:201 modules/gui/wxwindows/open.cpp:223
 #, fuzzy
 msgid "Settings..."
@@ -3883,14 +4084,14 @@ msgid "Destination Target: "
 msgstr "Stopp strøm"
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:128 modules/gui/macosx/output.m:231
-#: modules/gui/macosx/output.m:290 modules/gui/wxwindows/streamout.cpp:342
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/output.m:237
+#: modules/gui/macosx/output.m:296 modules/gui/wxwindows/streamout.cpp:342
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:129 modules/gui/macosx/output.m:241
-#: modules/gui/macosx/output.m:292 modules/gui/wxwindows/streamout.cpp:343
+#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:298 modules/gui/wxwindows/streamout.cpp:343
 msgid "RTP"
 msgstr "RTP"
 
@@ -3913,8 +4114,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:135 modules/gui/macosx/output.m:273
-#: modules/gui/macosx/output.m:319
+#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:279
+#: modules/gui/macosx/output.m:325
 msgid "AVI"
 msgstr ""
 
@@ -3932,11 +4133,6 @@ msgstr "Gtk+"
 msgid "Gtk+ interface"
 msgstr "Standard grensesnitt: "
 
-#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
-#: modules/gui/gtk2/gtk2_interface.c:77
-msgid "_File"
-msgstr "_Fil"
-
 #: modules/gui/gtk/gtk_interface.c:238
 msgid "_Close"
 msgstr ""
@@ -3954,10 +4150,6 @@ msgstr "_Avslutt"
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132
-msgid "_View"
-msgstr "_Vis"
-
 #: modules/gui/gtk/gtk_interface.c:294
 msgid "Hide the main interface window"
 msgstr "Skjul grensesnittvinduet"
@@ -3978,10 +4170,6 @@ msgstr "_Preferanser..."
 msgid "Configure the application"
 msgstr "Konfigurer programmet"
 
-#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139
-msgid "_Help"
-msgstr "_Hjelp"
-
 #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435
 msgid "_About..."
 msgstr "_Om..."
@@ -4092,56 +4280,6 @@ msgstr ""
 msgid "Selected:"
 msgstr "Valgte"
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-#, fuzzy
-msgid "Gtk2 interface"
-msgstr "Standard grensesnitt: "
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-#, fuzzy
-msgid "_New"
-msgstr "_Vis"
-
-#: modules/gui/gtk2/gnome2_interface.c:87
-msgid "gnome2"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:112
-msgid "button4"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:122
-#: modules/gui/gtk2/gtk2_interface.c:183
-msgid "button3"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:331
-#, fuzzy
-msgid "Save File"
-msgstr "Velg fil"
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-msgid "window1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-#, fuzzy
-msgid "_Edit"
-msgstr "_Avslutt"
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-#, fuzzy
-msgid "_About"
-msgstr "Om"
-
-#: modules/gui/gtk2/gtk2_interface.c:163
-msgid "button1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:173
-msgid "button2"
-msgstr ""
-
 #: modules/gui/kde/interface.cpp:88
 msgid "Languages"
 msgstr ""
@@ -4173,237 +4311,237 @@ msgstr "Beskjeder"
 msgid "Plugins"
 msgstr ""
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:315
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:338
 msgid "About VLC media player"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:344 modules/gui/macosx/controls.m:487
-#: modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:389
 msgid "Half Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:346 modules/gui/macosx/controls.m:488
-#: modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:390
 msgid "Normal Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:348 modules/gui/macosx/controls.m:489
-#: modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/intf.m:391
 msgid "Double Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:491
 #: modules/gui/macosx/controls.m:498 modules/gui/macosx/controls.m:520
-#: modules/gui/macosx/intf.m:371
+#: modules/gui/macosx/intf.m:394
 msgid "Float On Top"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:490
-#: modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/intf.m:392
 #, fuzzy
 msgid "Fit To Screen"
 msgstr "Fullskjerm"
 
-#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:298
-#: modules/gui/macosx/intf.m:342 modules/gui/macosx/intf.m:402
+#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:321
+#: modules/gui/macosx/intf.m:365 modules/gui/macosx/intf.m:425
 #, fuzzy
 msgid "Previous"
 msgstr "Forrige fil"
 
-#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:344
+#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:367
 msgid "Loop"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:345
+#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:368
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:346
+#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:369
 #, fuzzy
 msgid "Step Backward"
 msgstr "Gå tilbake"
 
-#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:386
-#: modules/gui/macosx/intf.m:411
+#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:434
 msgid "Info"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:293
+#: modules/gui/macosx/intf.m:316
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:305
+#: modules/gui/macosx/intf.m:328
 msgid "Volume"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:306
+#: modules/gui/macosx/intf.m:329
 #, fuzzy
 msgid "Position"
 msgstr "_Navigasjon"
 
-#: modules/gui/macosx/intf.m:312
+#: modules/gui/macosx/intf.m:335
 msgid "Open CrashLog"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:316
+#: modules/gui/macosx/intf.m:339
 #, fuzzy
 msgid "Preferences..."
 msgstr "_Preferanser..."
 
-#: modules/gui/macosx/intf.m:317
+#: modules/gui/macosx/intf.m:340
 msgid "Hide VLC"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:318
+#: modules/gui/macosx/intf.m:341
 #, fuzzy
 msgid "Hide Others"
 msgstr "_Gjem grensesnitt"
 
-#: modules/gui/macosx/intf.m:319
+#: modules/gui/macosx/intf.m:342
 msgid "Show All"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:343
 #, fuzzy
 msgid "Quit VLC"
 msgstr "Om"
 
-#: modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/intf.m:345
 #, fuzzy
 msgid "1:File"
 msgstr "Fil"
 
-#: modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:346
 #, fuzzy
 msgid "Open..."
 msgstr "Åpne fil"
 
-#: modules/gui/macosx/intf.m:324
+#: modules/gui/macosx/intf.m:347
 #, fuzzy
 msgid "Open File..."
 msgstr "_Åpne fil..."
 
-#: modules/gui/macosx/intf.m:325
+#: modules/gui/macosx/intf.m:348
 #, fuzzy
 msgid "Open Disc..."
 msgstr "Åpne en _disk"
 
-#: modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:349
 #, fuzzy
 msgid "Open Network..."
 msgstr "Åpne nettverk"
 
-#: modules/gui/macosx/intf.m:327
+#: modules/gui/macosx/intf.m:350
 #, fuzzy
 msgid "Open Recent"
 msgstr "Stopp strøm"
 
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/intf.m:1291
+#: modules/gui/macosx/intf.m:351 modules/gui/macosx/intf.m:1314
 msgid "Clear Menu"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:331
+#: modules/gui/macosx/intf.m:354
 msgid "Cut"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:332
+#: modules/gui/macosx/intf.m:355
 #, fuzzy
 msgid "Copy"
 msgstr "Crop?"
 
-#: modules/gui/macosx/intf.m:333
+#: modules/gui/macosx/intf.m:356
 #, fuzzy
 msgid "Paste"
 msgstr "Pause"
 
-#: modules/gui/macosx/intf.m:334
+#: modules/gui/macosx/intf.m:357
 msgid "Clear"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:337
+#: modules/gui/macosx/intf.m:360
 msgid "Controls"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:358 modules/gui/macosx/intf.m:359
+#: modules/gui/macosx/intf.m:381 modules/gui/macosx/intf.m:382
 #, fuzzy
 msgid "Audio Track"
 msgstr "Lyd"
 
-#: modules/gui/macosx/intf.m:372 modules/gui/macosx/intf.m:373
+#: modules/gui/macosx/intf.m:395 modules/gui/macosx/intf.m:396
 #, fuzzy
 msgid "Video Track"
 msgstr "Video"
 
-#: modules/gui/macosx/intf.m:382
+#: modules/gui/macosx/intf.m:405
 msgid "Minimize Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:406
 #, fuzzy
 msgid "Close Window"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/macosx/intf.m:384
+#: modules/gui/macosx/intf.m:407
 msgid "Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:389
+#: modules/gui/macosx/intf.m:412
 msgid "Bring All to Front"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:391
+#: modules/gui/macosx/intf.m:414
 #, fuzzy
 msgid "Help"
 msgstr "_Hjelp"
 
-#: modules/gui/macosx/intf.m:392
+#: modules/gui/macosx/intf.m:415
 #, fuzzy
 msgid "ReadMe..."
 msgstr "Beskjeder"
 
-#: modules/gui/macosx/intf.m:393
+#: modules/gui/macosx/intf.m:416
 msgid "Online Documentation"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/intf.m:417
 msgid "Report a Bug"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/intf.m:418
 msgid "VideoLAN Website"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:396
+#: modules/gui/macosx/intf.m:419
 msgid "License"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:405
+#: modules/gui/macosx/intf.m:428
 msgid "Error"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:406
+#: modules/gui/macosx/intf.m:429
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:407
+#: modules/gui/macosx/intf.m:430
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:408
+#: modules/gui/macosx/intf.m:431
 #, fuzzy
 msgid "Open Messages Window"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:432
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4484,64 +4622,57 @@ msgstr ""
 msgid "Open VIDEO_TS Directory"
 msgstr ""
 
-#: modules/gui/macosx/output.m:115
+#: modules/gui/macosx/output.m:119
 #, fuzzy
 msgid "Advanced output:"
 msgstr "Lydeksport volum"
 
-#: modules/gui/macosx/output.m:119
+#: modules/gui/macosx/output.m:123
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:122 modules/gui/macosx/output.m:210
-#: modules/gui/macosx/output.m:285
+#: modules/gui/macosx/output.m:126 modules/gui/macosx/output.m:216
+#: modules/gui/macosx/output.m:291
 #, fuzzy
 msgid "Stream"
 msgstr "Stopp strøm"
 
-#: modules/gui/macosx/output.m:126
+#: modules/gui/macosx/output.m:130
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132 modules/gui/wxwindows/streamout.cpp:437
+#: modules/gui/macosx/output.m:136 modules/gui/wxwindows/streamout.cpp:437
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:133
+#: modules/gui/macosx/output.m:137
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:134 modules/gui/macosx/output.m:275
-#: modules/gui/macosx/output.m:317
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:281
+#: modules/gui/macosx/output.m:323
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:274
-#: modules/gui/macosx/output.m:321
+#: modules/gui/macosx/output.m:140 modules/gui/macosx/output.m:280
+#: modules/gui/macosx/output.m:327
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:276
-#: modules/gui/macosx/output.m:323
+#: modules/gui/macosx/output.m:141 modules/gui/macosx/output.m:282
+#: modules/gui/macosx/output.m:329
 msgid "mp4"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139
+#: modules/gui/macosx/output.m:143
 #, fuzzy
 msgid "Transcode options"
 msgstr "Pause strøm"
 
-#: modules/gui/macosx/output.m:149 modules/gui/macosx/output.m:153
-msgid "Bitrate (bps)"
-msgstr ""
-
-#: modules/gui/macosx/output.m:151
-#, fuzzy
-msgid "mpga"
-msgstr "mpeg"
-
-#: modules/gui/macosx/output.m:152
-msgid "a52 "
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:158
+#: modules/gui/wxwindows/streamout.cpp:512
+#: modules/gui/wxwindows/streamout.cpp:549
+msgid "Bitrate (kb/s)"
 msgstr ""
 
 #: modules/gui/macosx/prefs.m:78 modules/gui/wxwindows/preferences.cpp:256
@@ -4553,12 +4684,6 @@ msgstr "Velg fil"
 msgid "Advanced"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:143 modules/gui/macosx/prefs.m:341
-#: modules/gui/macosx/prefs.m:368
-#, fuzzy
-msgid "Auto"
-msgstr "Forfattere"
-
 #: modules/gui/ncurses/ncurses.c:66
 #, fuzzy
 msgid "ncurses interface"
@@ -4574,33 +4699,33 @@ msgstr "Dette framtvinger eksport av monolyd"
 msgid "Qt interface"
 msgstr "Standard grensesnitt: "
 
-#: modules/gui/skins/src/skin_main.cpp:251
-#: modules/gui/skins/src/vlcproc.cpp:338
+#: modules/gui/skins/src/skin_main.cpp:239
+#: modules/gui/skins/src/vlcproc.cpp:339
 #, fuzzy
 msgid "Open a skin file"
 msgstr "Åpne en fil"
 
-#: modules/gui/skins/src/skin_main.cpp:292
-#: modules/gui/skins/src/skin_main.cpp:293
+#: modules/gui/skins/src/skin_main.cpp:280
+#: modules/gui/skins/src/skin_main.cpp:281
 msgid "Last skin actually used"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:294
-#: modules/gui/skins/src/skin_main.cpp:295
+#: modules/gui/skins/src/skin_main.cpp:282
+#: modules/gui/skins/src/skin_main.cpp:283
 msgid "Config of last used skin"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:296
-#: modules/gui/skins/src/skin_main.cpp:297
+#: modules/gui/skins/src/skin_main.cpp:284
+#: modules/gui/skins/src/skin_main.cpp:285
 msgid "Show application in system tray"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:298
-#: modules/gui/skins/src/skin_main.cpp:299
+#: modules/gui/skins/src/skin_main.cpp:286
+#: modules/gui/skins/src/skin_main.cpp:287
 msgid "Show application in taskbar"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:310
+#: modules/gui/skins/src/skin_main.cpp:298
 #, fuzzy
 msgid "Skinnable Interface"
 msgstr "Grensesnitt"
@@ -4610,210 +4735,210 @@ msgstr "Grensesnitt"
 msgid "FileInfo"
 msgstr "_Åpne fil..."
 
-#: modules/gui/wxwindows/interface.cpp:231
+#: modules/gui/wxwindows/interface.cpp:232
 #, fuzzy
 msgid "Open a DVD or (S)VCD"
 msgstr "Åpne en DVD eller VCD"
 
-#: modules/gui/wxwindows/interface.cpp:232
+#: modules/gui/wxwindows/interface.cpp:233
 #, fuzzy
 msgid "Open a network stream"
 msgstr "Velg en nettverksstrøm"
 
-#: modules/gui/wxwindows/interface.cpp:233
+#: modules/gui/wxwindows/interface.cpp:234
 #, fuzzy
 msgid "Open a satellite stream"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/wxwindows/interface.cpp:234
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:235
+#: modules/gui/wxwindows/interface.cpp:236
 #, fuzzy
 msgid "Exit this program"
 msgstr "Avslutt programmet"
 
-#: modules/gui/wxwindows/interface.cpp:237
+#: modules/gui/wxwindows/interface.cpp:238
 #, fuzzy
 msgid "Open the playlist"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/wxwindows/interface.cpp:238
+#: modules/gui/wxwindows/interface.cpp:239
 #, fuzzy
 msgid "Show the program logs"
 msgstr "Avslutt programmet"
 
-#: modules/gui/wxwindows/interface.cpp:239
+#: modules/gui/wxwindows/interface.cpp:240
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:241
+#: modules/gui/wxwindows/interface.cpp:242
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:243
+#: modules/gui/wxwindows/interface.cpp:244
 #, fuzzy
 msgid "About this program"
 msgstr "Avslutt programmet"
 
-#: modules/gui/wxwindows/interface.cpp:247
+#: modules/gui/wxwindows/interface.cpp:248
 #, fuzzy
 msgid "&Open File..."
 msgstr "_Åpne fil..."
 
-#: modules/gui/wxwindows/interface.cpp:249
+#: modules/gui/wxwindows/interface.cpp:250
 #, fuzzy
 msgid "Open &Disc..."
 msgstr "Åpne en _disk"
 
-#: modules/gui/wxwindows/interface.cpp:251
+#: modules/gui/wxwindows/interface.cpp:252
 #, fuzzy
 msgid "&Network Stream..."
 msgstr "_Nettverksstrøm"
 
-#: modules/gui/wxwindows/interface.cpp:254
+#: modules/gui/wxwindows/interface.cpp:255
 #, fuzzy
 msgid "&Satellite Stream..."
 msgstr "_Nettverksstrøm"
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:260
 #, fuzzy
 msgid "&Eject Disc"
 msgstr "Løs ut disk"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:264
 #, fuzzy
 msgid "E&xit"
 msgstr "_Avslutt"
 
-#: modules/gui/wxwindows/interface.cpp:267
+#: modules/gui/wxwindows/interface.cpp:268
 #, fuzzy
 msgid "&Playlist..."
 msgstr "Spilleliste..."
 
-#: modules/gui/wxwindows/interface.cpp:269
+#: modules/gui/wxwindows/interface.cpp:270
 #, fuzzy
-msgid "&Logs..."
-msgstr "Åpne en _disk"
+msgid "&Messages..."
+msgstr "Beskjeder..."
 
-#: modules/gui/wxwindows/interface.cpp:270
+#: modules/gui/wxwindows/interface.cpp:271
 #, fuzzy
 msgid "&File info..."
 msgstr "_Åpne fil..."
 
-#: modules/gui/wxwindows/interface.cpp:275
+#: modules/gui/wxwindows/interface.cpp:276
 #, fuzzy
 msgid "&Preferences..."
 msgstr "_Preferanser..."
 
-#: modules/gui/wxwindows/interface.cpp:292
+#: modules/gui/wxwindows/interface.cpp:293
 #, fuzzy
 msgid "&About..."
 msgstr "_Om..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:297
 #, fuzzy
 msgid "&File"
 msgstr "Fil"
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:298
 #, fuzzy
 msgid "&View"
 msgstr "_Vis"
 
-#: modules/gui/wxwindows/interface.cpp:298
+#: modules/gui/wxwindows/interface.cpp:299
 #, fuzzy
 msgid "&Settings"
 msgstr "_Innstillinger"
 
-#: modules/gui/wxwindows/interface.cpp:299
-#: modules/gui/wxwindows/interface.cpp:476
-#: modules/gui/wxwindows/interface.cpp:524
+#: modules/gui/wxwindows/interface.cpp:300
+#: modules/gui/wxwindows/interface.cpp:478
+#: modules/gui/wxwindows/interface.cpp:526
 #, fuzzy
 msgid "&Audio"
 msgstr "Lyd"
 
-#: modules/gui/wxwindows/interface.cpp:300
-#: modules/gui/wxwindows/interface.cpp:495
-#: modules/gui/wxwindows/interface.cpp:528
+#: modules/gui/wxwindows/interface.cpp:301
+#: modules/gui/wxwindows/interface.cpp:497
+#: modules/gui/wxwindows/interface.cpp:530
 #, fuzzy
 msgid "&Video"
 msgstr "Video"
 
-#: modules/gui/wxwindows/interface.cpp:301
-#: modules/gui/wxwindows/interface.cpp:514
-#: modules/gui/wxwindows/interface.cpp:532
+#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:516
+#: modules/gui/wxwindows/interface.cpp:534
 #, fuzzy
 msgid "&Navigation"
 msgstr "_Navigasjon"
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:303
 #, fuzzy
 msgid "&Help"
 msgstr "_Hjelp"
 
-#: modules/gui/wxwindows/interface.cpp:318
+#: modules/gui/wxwindows/interface.cpp:319
 #, fuzzy
 msgid "Stop current playlist item"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:320
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:320
+#: modules/gui/wxwindows/interface.cpp:321
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:321
+#: modules/gui/wxwindows/interface.cpp:322
 #: modules/gui/wxwindows/playlist.cpp:351
 #, fuzzy
 msgid "Open playlist"
 msgstr "Åpne Spilleliste"
 
-#: modules/gui/wxwindows/interface.cpp:322
+#: modules/gui/wxwindows/interface.cpp:323
 #, fuzzy
 msgid "Previous playlist item"
 msgstr "Forrige fil"
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:324
 #, fuzzy
 msgid "Next playlist item"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:325
 #, fuzzy
 msgid "Play slower"
 msgstr "Spill saktere"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:326
 #, fuzzy
 msgid "Play faster"
 msgstr "Spill fortere"
 
-#: modules/gui/wxwindows/interface.cpp:560
+#: modules/gui/wxwindows/interface.cpp:561
 #, fuzzy
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr "Standard grensesnitt: "
 
-#: modules/gui/wxwindows/interface.cpp:561
+#: modules/gui/wxwindows/interface.cpp:562
 #, fuzzy
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr "© 1996-2003 the VideoLAN team"
 
-#: modules/gui/wxwindows/interface.cpp:562
+#: modules/gui/wxwindows/interface.cpp:563
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:564
+#: modules/gui/wxwindows/interface.cpp:565
 #, fuzzy
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
@@ -4822,7 +4947,7 @@ msgstr ""
 "Dette er VideoLAN client, en DVD, MPEG og DivX spiller. Den kan spille MPEG "
 "og MPEG 2 filer fra en fil eller en nettverkskilde"
 
-#: modules/gui/wxwindows/interface.cpp:568
+#: modules/gui/wxwindows/interface.cpp:569
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "Om"
@@ -4837,11 +4962,11 @@ msgstr "_Innstillinger"
 msgid "Video menu"
 msgstr "_Innstillinger"
 
-#: modules/gui/wxwindows/menus.cpp:139
+#: modules/gui/wxwindows/menus.cpp:141
 msgid "Input menu"
 msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:329
+#: modules/gui/wxwindows/menus.cpp:334
 msgid "Empty"
 msgstr ""
 
@@ -4878,16 +5003,16 @@ msgstr "Pause str
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:361
+#: modules/gui/wxwindows/open.cpp:372
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:364
+#: modules/gui/wxwindows/open.cpp:375
 #, fuzzy
 msgid "CD Audio"
 msgstr "Lyd"
 
-#: modules/gui/wxwindows/open.cpp:837 modules/gui/wxwindows/streamout.cpp:640
+#: modules/gui/wxwindows/open.cpp:848 modules/gui/wxwindows/streamout.cpp:640
 #, fuzzy
 msgid "Save file"
 msgstr "Velg fil"
@@ -4964,8 +5089,9 @@ msgid "No configuration options available"
 msgstr ""
 
 #: modules/gui/wxwindows/preferences.cpp:865
-msgid "Advanced..."
-msgstr ""
+#, fuzzy
+msgid "Advanced options"
+msgstr "vis avanserte alternativer"
 
 #: modules/gui/wxwindows/streamout.cpp:166
 #, fuzzy
@@ -5008,11 +5134,6 @@ msgstr "vis avanserte alternativer"
 msgid "Video codec"
 msgstr "lydenhet"
 
-#: modules/gui/wxwindows/streamout.cpp:512
-#: modules/gui/wxwindows/streamout.cpp:549
-msgid "Bitrate (kb/s)"
-msgstr ""
-
 #: modules/gui/wxwindows/streamout.cpp:543
 #, fuzzy
 msgid "Audio codec"
@@ -5139,6 +5260,10 @@ msgstr "Standard grensesnitt: "
 msgid "Using the logger interface plugin..."
 msgstr ""
 
+#: modules/misc/memcpy/memcpyaltivec.c:52
+msgid "AltiVec memcpy"
+msgstr ""
+
 #: modules/misc/memcpy/memcpy.c:81
 msgid "libc memcpy"
 msgstr ""
@@ -5155,10 +5280,6 @@ msgstr ""
 msgid "MMX EXT memcpy"
 msgstr ""
 
-#: modules/misc/memcpy/memcpyaltivec.c:52
-msgid "AltiVec memcpy"
-msgstr ""
-
 #: modules/misc/network/ipv4.c:85
 msgid "IPv4 network abstraction layer"
 msgstr ""
@@ -5172,6 +5293,10 @@ msgstr ""
 msgid "Qt Embedded GUI helper"
 msgstr "Standard grensesnitt: "
 
+#: modules/misc/sap.c:131
+msgid "SAP"
+msgstr ""
+
 #: modules/misc/sap.c:134
 #, fuzzy
 msgid "SAP interface"
@@ -5302,7 +5427,7 @@ msgid "Set image contrast"
 msgstr ""
 
 #: modules/video_filter/adjust.c:61
-msgid "Set the image contrast. Defaults to 1"
+msgid "Set the image contrast, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:62
@@ -5318,7 +5443,7 @@ msgid "Set image saturation"
 msgstr ""
 
 #: modules/video_filter/adjust.c:65
-msgid "Set the image saturation. Defaults to 1"
+msgid "Set the image saturation, between 0 and 3. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:66
@@ -5326,7 +5451,7 @@ msgid "Set image brightness"
 msgstr ""
 
 #: modules/video_filter/adjust.c:67
-msgid "Set the image brightness. Defaults to 1"
+msgid "Set the image brightness, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:71
@@ -5369,7 +5494,9 @@ msgid "Crop geometry"
 msgstr ""
 
 #: modules/video_filter/crop.c:55
-msgid "Set the geometry of the zone to crop"
+msgid ""
+"Set the geometry of the zone to crop. This is set as width x heigth + left "
+"offset + top offset."
 msgstr ""
 
 #: modules/video_filter/crop.c:57
@@ -5664,11 +5791,21 @@ msgstr "bruk delt minne"
 msgid "Use shared memory to communicate between VLC and the X server."
 msgstr "Bruk delt minne for å kommunisere mellom VLC og X-tjenesten."
 
-#: modules/video_output/x11/x11.c:62
+#: modules/video_output/x11/x11.c:61 modules/video_output/x11/xvideo.c:72
+msgid "choose the screen to be used for fullscreen mode."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:63 modules/video_output/x11/xvideo.c:74
+msgid ""
+"Choose the screen you want to use in fullscreen mode. For instance set it to "
+"0 for first screen, 1 for the second."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:67
 msgid "X11"
 msgstr "X11"
 
-#: modules/video_output/x11/x11.c:68
+#: modules/video_output/x11/x11.c:76
 #, fuzzy
 msgid "X11 video output"
 msgstr "Fullskjermdybde:"
@@ -5697,11 +5834,11 @@ msgstr ""
 "Krev at XVideo-gjengiveren skal bruke et bestemt chroma format, i stedet for "
 "å forsøke å forbedre yttelsen ved å benytte det mest effektive."
 
-#: modules/video_output/x11/xvideo.c:73
+#: modules/video_output/x11/xvideo.c:78
 msgid "XVideo"
 msgstr "XVideo"
 
-#: modules/video_output/x11/xvideo.c:81
+#: modules/video_output/x11/xvideo.c:90
 #, fuzzy
 msgid "XVideo extension video output"
 msgstr "XVideo utvidelsesmodul"
@@ -5750,6 +5887,22 @@ msgstr "XOSD modul"
 msgid "xosd interface"
 msgstr "xosd modulgrensesnitt"
 
+#, fuzzy
+#~ msgid "SAP interface module"
+#~ msgstr "Standard grensesnitt: "
+
+#, fuzzy
+#~ msgid "mpga"
+#~ msgstr "mpeg"
+
+#, fuzzy
+#~ msgid "Auto"
+#~ msgstr "Forfattere"
+
+#, fuzzy
+#~ msgid "&Logs..."
+#~ msgstr "Åpne en _disk"
+
 #, fuzzy
 #~ msgid "Display identifier"
 #~ msgstr "Identifikator for visningsområde"
diff --git a/po/pl.po b/po/pl.po
index 13398e2f06..5cca683d5a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-05-24 14:40+0200\n"
+"POT-Creation-Date: 2003-05-27 23:43+0200\n"
 "PO-Revision-Date: 2002-07-12 11:49+0100\n"
 "Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
 "Language-Team: polish <pl@li.org>\n"
@@ -26,7 +26,7 @@ msgid "Audio channels"
 msgstr "Wybiera kana³ d¼wiêkowy"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:165 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:358
 #, fuzzy
@@ -115,7 +115,7 @@ msgstr "Lista odtwarzania"
 
 #: src/input/input_programs.c:94 modules/gui/gtk/gnome_interface.c:1078
 #: modules/gui/gtk/gtk_interface.c:1199 modules/gui/kde/interface.cpp:142
-#: modules/gui/macosx/intf.m:347 modules/gui/macosx/intf.m:348
+#: modules/gui/macosx/intf.m:370 modules/gui/macosx/intf.m:371
 msgid "Program"
 msgstr "Program"
 
@@ -123,18 +123,18 @@ msgstr "Program"
 #: modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
-#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:349
-#: modules/gui/macosx/intf.m:350 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:382
+#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:372
+#: modules/gui/macosx/intf.m:373 modules/gui/macosx/open.m:149
+#: modules/gui/wxwindows/open.cpp:393
 msgid "Title"
 msgstr "Tytu³"
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
 #: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
-#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:351
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:388
+#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:374
+#: modules/gui/macosx/intf.m:375 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:399
 msgid "Chapter"
 msgstr "Rozdzia³"
 
@@ -188,7 +188,7 @@ msgstr "Rozdzia
 msgid "Previous Chapter"
 msgstr "Rozdzia³"
 
-#: src/input/input_programs.c:668
+#: src/input/input_programs.c:668 src/video_output/video_output.c:397
 msgid "Disable"
 msgstr ""
 
@@ -201,7 +201,7 @@ msgstr ""
 msgid "C"
 msgstr "pl"
 
-#: src/libvlc.c:301 src/libvlc.c:1357
+#: src/libvlc.c:301 src/libvlc.c:1364
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
@@ -210,27 +210,27 @@ msgstr ""
 "U¿ycie: %s [opcje] [parametry] [plik]...\n"
 "\n"
 
-#: src/libvlc.c:1189 src/misc/configuration.c:961
+#: src/libvlc.c:1196 src/misc/configuration.c:961
 msgid "string"
 msgstr "napis"
 
-#: src/libvlc.c:1206 src/misc/configuration.c:946
+#: src/libvlc.c:1213 src/misc/configuration.c:946
 msgid "integer"
 msgstr "liczba ca³kowita"
 
-#: src/libvlc.c:1209 src/misc/configuration.c:953
+#: src/libvlc.c:1216 src/misc/configuration.c:953
 msgid "float"
 msgstr "liczba zmiennoprz."
 
-#: src/libvlc.c:1215
+#: src/libvlc.c:1222
 msgid " (default enabled)"
 msgstr " (domy¶lnie w³±czone)"
 
-#: src/libvlc.c:1216
+#: src/libvlc.c:1223
 msgid " (default disabled)"
 msgstr " (domy¶lnie wy³±czone)"
 
-#: src/libvlc.c:1332 src/libvlc.c:1387 src/libvlc.c:1411
+#: src/libvlc.c:1339 src/libvlc.c:1394 src/libvlc.c:1418
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
@@ -238,11 +238,11 @@ msgstr ""
 "\n"
 "Naci¶nij klawisz ENTER aby kontynuowaæ...\n"
 
-#: src/libvlc.c:1360
+#: src/libvlc.c:1367
 msgid "[module]              [description]\n"
 msgstr "[modu³]               [opis]\n"
 
-#: src/libvlc.c:1405
+#: src/libvlc.c:1412
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -1089,15 +1089,15 @@ msgstr "Interfejs"
 #: modules/demux/ogg.c:554 modules/demux/ogg.c:813 modules/demux/ogg.c:986
 #: modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m:354 modules/gui/macosx/output.m:150
+#: modules/gui/macosx/intf.m:377 modules/gui/macosx/output.m:155
 msgid "Audio"
 msgstr "D¼wiêk"
 
 #: src/libvlc.h:473 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:893 modules/gui/gtk/gnome_interface.c:1099
-#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:365
-#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:140
+#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:388
+#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:144
 #: modules/misc/dummy/dummy.c:83 modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "Obraz"
@@ -1129,8 +1129,8 @@ msgstr "CPU"
 #: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
-#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:297
-#: modules/gui/macosx/intf.m:385 modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:408 modules/gui/wxwindows/interface.cpp:352
 #: modules/gui/wxwindows/playlist.cpp:102
 msgid "Playlist"
 msgstr "Lista odtwarzania"
@@ -1173,13 +1173,45 @@ msgstr "Wy
 msgid "boolean"
 msgstr "zm. logiczna"
 
-#: src/video_output/video_output.c:382 modules/gui/beos/VideoOutput.cpp:1138
+#: src/video_output/video_output.c:384 modules/gui/beos/VideoOutput.cpp:1138
 #: modules/gui/macosx/controls.m:342 modules/gui/macosx/controls.m:486
-#: modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/intf.m:393
 #, fuzzy
 msgid "Fullscreen"
 msgstr "Pe³_ny ekran"
 
+#: src/video_output/video_output.c:395 modules/gui/gtk/gnome_interface.c:183
+#: modules/gui/gtk/gnome_interface.c:966 modules/gui/gtk/gtk_interface.c:553
+#: modules/gui/gtk/gtk_interface.c:1349 modules/gui/macosx/controls.m:526
+#: modules/gui/macosx/intf.m:401 modules/gui/macosx/intf.m:402
+#: modules/video_filter/deinterlace/deinterlace.c:81
+#, fuzzy
+msgid "Deinterlace"
+msgstr "Tryb antyprzeplotowy"
+
+#: src/video_output/video_output.c:399
+#, fuzzy
+msgid "Discard"
+msgstr "Dysk"
+
+#: src/video_output/video_output.c:401
+msgid "Blend"
+msgstr ""
+
+#: src/video_output/video_output.c:403
+#, fuzzy
+msgid "Mean"
+msgstr "Pionowa"
+
+#: src/video_output/video_output.c:405
+msgid "Bob"
+msgstr ""
+
+#: src/video_output/video_output.c:407
+#, fuzzy
+msgid "Linear"
+msgstr "liczba ca³kowita"
+
 #: modules/access/cdda.c:86 modules/access/file.c:69 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
 #: modules/access/v4l/v4l.c:64
@@ -1321,6 +1353,26 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
+#: modules/access_output/dummy.c:56
+#, fuzzy
+msgid "Dummy stream ouput"
+msgstr "wyj¶cie obrazu w skali szaro¶ci"
+
+#: modules/access_output/file.c:58
+#, fuzzy
+msgid "File stream ouput"
+msgstr "wyj¶cie obrazu w skali szaro¶ci"
+
+#: modules/access_output/http.c:54
+#, fuzzy
+msgid "HTTP stream ouput"
+msgstr "wyj¶cie obrazu w skali szaro¶ci"
+
+#: modules/access_output/udp.c:73
+#, fuzzy
+msgid "UDP stream ouput"
+msgstr "wyj¶cie obrazu w skali szaro¶ci"
+
 #: modules/access/satellite/satellite.c:41
 #, fuzzy
 msgid "Satellite default transponder frequency"
@@ -1418,35 +1470,6 @@ msgstr "modu
 msgid "VCD input"
 msgstr "modu³ wej¶cia VCD"
 
-#: modules/access/vlcs.c:131 modules/misc/sap.c:131
-msgid "SAP"
-msgstr ""
-
-#: modules/access/vlcs.c:134
-#, fuzzy
-msgid "SAP interface module"
-msgstr "modu³ interfejsu"
-
-#: modules/access_output/dummy.c:56
-#, fuzzy
-msgid "Dummy stream ouput"
-msgstr "wyj¶cie obrazu w skali szaro¶ci"
-
-#: modules/access_output/file.c:58
-#, fuzzy
-msgid "File stream ouput"
-msgstr "wyj¶cie obrazu w skali szaro¶ci"
-
-#: modules/access_output/http.c:54
-#, fuzzy
-msgid "HTTP stream ouput"
-msgstr "wyj¶cie obrazu w skali szaro¶ci"
-
-#: modules/access_output/udp.c:73
-#, fuzzy
-msgid "UDP stream ouput"
-msgstr "wyj¶cie obrazu w skali szaro¶ci"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr ""
@@ -1609,13 +1632,13 @@ msgstr "modu
 msgid "Audio device"
 msgstr "urz±dzenie VCD"
 
-#: modules/audio_output/alsa.c:159 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:161 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:371
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:201 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:203 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:387
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1784,23 +1807,148 @@ msgstr "modu
 msgid "AAC audio decoder (using libfaad2)"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:154
-msgid "ffmpeg"
+#: modules/codec/ffmpeg/ffmpeg.c:86
+msgid "Direct rendering"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:88
+msgid "Error resilience"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:90
+msgid ""
+"ffmpeg can make errors resiliences.          \n"
+"Nevertheless, with buggy encoder (like ISO MPEG-4 encoder from M$) this will "
+"produce a lot of errors.\n"
+"Valid range is -1 to 99 (-1 disable all errors resiliences)."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:95
+msgid "Workaround bugs"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:97
+msgid ""
+"Try to fix some bugs\n"
+"1  autodetect\n"
+"2  old msmpeg4\n"
+"4  xvid interlaced\n"
+"8  ump4 \n"
+"16 no padding\n"
+"32 ac vlc64 Qpel chroma"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:106
+msgid "Hurry up"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:108
+msgid ""
+"Allow the decoder to partially decode or skip frame(s) when there not enough "
+"time.\n"
+" It's usefull with low CPU power but it could produce broken pictures."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:112
+#, fuzzy
+msgid "Truncated stream"
+msgstr "Odtwarza strumieñ"
+
+#: modules/codec/ffmpeg/ffmpeg.c:113
+msgid "truncated stream -1:auto,0:disable,:1:enable"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:115
+#, fuzzy
+msgid "Post processing quality"
+msgstr "modu³ kompensacji ruchu"
+
+#: modules/codec/ffmpeg/ffmpeg.c:117
+msgid ""
+"Quality of post processing\n"
+"Valid range is 0 to 6"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:120
+msgid "Ffmpeg postproc filter chains"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:157
-msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgid "Ffmpeg postprocessing module"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:159
+msgid "Auto-level Post processing quality"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:161
+msgid ""
+"Post processing quality is selected upon time left but no more than "
+"requested quality\n"
+"Not yet implemented !"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:165
+msgid "Force vertical luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:166
+msgid "Force vertical luminance deblocking (override other settings)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:168
-msgid "Post processing"
+msgid "Force horizontal luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:169
+msgid "Force horizontal luminance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:171
+msgid "Force vertical chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:172
+msgid "Force vertical chrominance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:174
+msgid "Force horizontal chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:175
+msgid "Force horizontal chrominance deblocking (override other settings)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:177
-msgid "ffmpeg postprocessing module"
+msgid "Force luminance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:178
+msgid "Force luminance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:180
+msgid "Force chrominance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:181
+msgid "Force chrominance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:184
+msgid "ffmpeg"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:204
+#: modules/codec/ffmpeg/ffmpeg.c:187
+msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:195
+msgid "Post processing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:215
 msgid "ffmpeg chroma conversion"
 msgstr ""
 
@@ -1824,7 +1972,7 @@ msgstr "modu
 msgid "flac audio decoder"
 msgstr "wybierz dekoder d¼wiêku AC3"
 
-#: modules/codec/libmpeg2.c:89
+#: modules/codec/libmpeg2.c:90
 #, fuzzy
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr "modu³ dekodera obrazu MPEG I/II"
@@ -1843,15 +1991,15 @@ msgstr ""
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr "modu³ dekodera obrazu MPEG I/II"
 
-#: modules/codec/mpeg_video/idct/idct.c:41
-msgid "IDCT"
-msgstr ""
-
 #: modules/codec/mpeg_video/idct/idctaltivec.c:45
 #, fuzzy
 msgid "AltiVec IDCT"
 msgstr "modu³ AltiVec IDCT"
 
+#: modules/codec/mpeg_video/idct/idct.c:41
+msgid "IDCT"
+msgstr ""
+
 #: modules/codec/mpeg_video/idct/idctclassic.c:41
 #, fuzzy
 msgid "classic IDCT"
@@ -1867,11 +2015,6 @@ msgstr "modu
 msgid "MMX EXT IDCT"
 msgstr "modu³ MMX EXT IDCT"
 
-#: modules/codec/mpeg_video/motion/motion.c:42
-#, fuzzy
-msgid "motion compensation"
-msgstr "modu³ kompensacji ruchu"
-
 #: modules/codec/mpeg_video/motion/motion3dnow.c:44
 #, fuzzy
 msgid "3D Now! motion compensation"
@@ -1882,6 +2025,11 @@ msgstr "modu
 msgid "AltiVec motion compensation"
 msgstr "modu³ kompensacji ruchu AltiVec"
 
+#: modules/codec/mpeg_video/motion/motion.c:42
+#, fuzzy
+msgid "motion compensation"
+msgstr "modu³ kompensacji ruchu"
+
 #: modules/codec/mpeg_video/motion/motionmmx.c:45
 #, fuzzy
 msgid "MMX motion compensation"
@@ -2074,20 +2222,20 @@ msgstr "Informacje o..."
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
 #: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
-#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:879
-#: modules/gui/macosx/intf.m:880 modules/gui/macosx/intf.m:881
-#: modules/gui/wxwindows/interface.cpp:810
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:902
+#: modules/gui/macosx/intf.m:903 modules/gui/macosx/intf.m:904
+#: modules/gui/wxwindows/interface.cpp:811
 msgid "Pause"
 msgstr "Wstrzymaj"
 
 #: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
 #: modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
-#: modules/gui/macosx/intf.m:300 modules/gui/macosx/intf.m:338
-#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:886
-#: modules/gui/macosx/intf.m:887 modules/gui/macosx/intf.m:888
-#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:348
-#: modules/gui/wxwindows/interface.cpp:815
+#: modules/gui/macosx/intf.m:323 modules/gui/macosx/intf.m:361
+#: modules/gui/macosx/intf.m:422 modules/gui/macosx/intf.m:909
+#: modules/gui/macosx/intf.m:910 modules/gui/macosx/intf.m:911
+#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:816
 msgid "Play"
 msgstr "Odtwórz"
 
@@ -2145,8 +2293,8 @@ msgstr ""
 #: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:821
 #: modules/demux/ogg.c:994 modules/gui/gtk/gnome_interface.c:148
 #: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
-#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:360
-#: modules/gui/macosx/intf.m:361
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:384
 msgid "Channels"
 msgstr "Kana³y"
 
@@ -2172,7 +2320,7 @@ msgstr "Liczba wierszy"
 #: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:554
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:813 modules/demux/ogg.c:893 modules/demux/ogg.c:986
-#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:130
+#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134
 msgid "Type"
 msgstr ""
 
@@ -2833,7 +2981,7 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:201
 #: modules/gui/beos/InterfaceWindow.cpp:300
 #: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:304 modules/gui/macosx/prefs.m:75
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/prefs.m:75
 #: modules/gui/wxwindows/preferences.cpp:229
 #, fuzzy
 msgid "Preferences"
@@ -2843,7 +2991,7 @@ msgstr "_Preferencje..."
 #: modules/gui/beos/InterfaceWindow.cpp:298
 #: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
 #: modules/gui/kde/info.cpp:9 modules/gui/kde/messages.cpp:8
-#: modules/gui/macosx/intf.m:310 modules/gui/macosx/intf.m:387
+#: modules/gui/macosx/intf.m:333 modules/gui/macosx/intf.m:410
 #: modules/gui/wxwindows/messages.cpp:79
 msgid "Messages"
 msgstr "Komunikaty"
@@ -2858,16 +3006,16 @@ msgstr "Komunikaty"
 #: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
 #: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
 #: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:264
-#: modules/gui/macosx/output.m:121 modules/gui/macosx/output.m:194
-#: modules/gui/macosx/output.m:279 modules/gui/wxwindows/interface.cpp:335
+#: modules/gui/macosx/output.m:125 modules/gui/macosx/output.m:200
+#: modules/gui/macosx/output.m:285 modules/gui/wxwindows/interface.cpp:336
 #: modules/gui/wxwindows/open.cpp:276 modules/gui/wxwindows/streamout.cpp:340
 msgid "File"
 msgstr "Plik"
 
 #: modules/gui/beos/InterfaceWindow.cpp:240
 #: modules/gui/beos/PlayListWindow.cpp:84
-#: modules/gui/gtk/gnome_interface.c:2179
-#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332
 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677
 msgid "Open File"
 msgstr "Otwórz plik"
@@ -2890,7 +3038,7 @@ msgid "About"
 msgstr "Informacje o..."
 
 #: modules/gui/beos/InterfaceWindow.cpp:256 modules/gui/kde/interface.cpp:93
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/intf.m:377
+#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:400
 #, fuzzy
 msgid "Subtitles"
 msgstr "_Podtytu³y"
@@ -2930,8 +3078,8 @@ msgid "Speed"
 msgstr "Zaznaczone"
 
 #: modules/gui/beos/InterfaceWindow.cpp:286 modules/gui/macosx/controls.m:422
-#: modules/gui/macosx/intf.m:299 modules/gui/macosx/intf.m:341
-#: modules/gui/wxwindows/interface.cpp:357
+#: modules/gui/macosx/intf.m:322 modules/gui/macosx/intf.m:364
+#: modules/gui/wxwindows/interface.cpp:358
 #, fuzzy
 msgid "Slower"
 msgstr "Zwolnij"
@@ -2941,13 +3089,13 @@ msgid "Normal"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:290 modules/gui/macosx/controls.m:421
-#: modules/gui/macosx/intf.m:302 modules/gui/macosx/intf.m:340
-#: modules/gui/wxwindows/interface.cpp:359
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/wxwindows/interface.cpp:360
 #, fuzzy
 msgid "Faster"
 msgstr "Przyspiesz"
 
-#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:381
+#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:404
 msgid "Window"
 msgstr ""
 
@@ -2961,7 +3109,7 @@ msgstr "Lista odtwarzania"
 #: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
 #: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
 #: modules/gui/gtk/preferences.c:605 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:117
+#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:121
 #: modules/gui/wxwindows/fileinfo.cpp:96
 #: modules/gui/wxwindows/messages.cpp:102 modules/gui/wxwindows/open.cpp:267
 #: modules/gui/wxwindows/preferences.cpp:250
@@ -2984,18 +3132,18 @@ msgstr "Klient VideoLAN"
 msgid "Drop files to play"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:167
+#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:169
 #: modules/gui/wxwindows/playlist.cpp:154
 #, fuzzy
 msgid "Close"
 msgstr "Nic"
 
-#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:330
+#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:353
 #, fuzzy
 msgid "Edit"
 msgstr "W_yjd¼"
 
-#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:335
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:358
 #: modules/gui/macosx/playlist.m:180
 #, fuzzy
 msgid "Select All"
@@ -3050,24 +3198,24 @@ msgstr "Nazwa"
 #: modules/gui/beos/PreferencesWindow.cpp:44
 #: modules/gui/beos/PreferencesWindow.cpp:46
 #: modules/gui/beos/PreferencesWindow.cpp:98
-#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:607
-#: modules/gui/macosx/prefs.m:615 modules/gui/macosx/prefs.m:685
+#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:690
+#: modules/gui/macosx/prefs.m:698 modules/gui/macosx/prefs.m:768
 msgid "Modules"
 msgstr "Modu³y"
 
-#: modules/gui/beos/PreferencesWindow.cpp:220
+#: modules/gui/beos/PreferencesWindow.cpp:219
 #: modules/gui/gtk/preferences.c:609
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: modules/gui/beos/PreferencesWindow.cpp:225
+#: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
-#: modules/gui/macosx/output.m:332 modules/gui/macosx/prefs.m:76
+#: modules/gui/macosx/output.m:338 modules/gui/macosx/prefs.m:76
 #: modules/gui/wxwindows/preferences.cpp:254
 msgid "Save"
 msgstr "Zapisz"
 
-#: modules/gui/beos/PreferencesWindow.cpp:229
+#: modules/gui/beos/PreferencesWindow.cpp:228
 #, fuzzy
 msgid "Defaults"
 msgstr "Usuñ"
@@ -3108,6 +3256,7 @@ msgid "Take Screen Shot"
 msgstr ""
 
 #: modules/gui/beos/VlcWrapper.cpp:185 modules/gui/gtk/menu.c:733
+#: modules/gui/macosx/prefs.m:348
 msgid "None"
 msgstr "Nic"
 
@@ -3135,8 +3284,8 @@ msgstr "Modu
 msgid "VLC media player"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:652
-#: modules/gui/wxwindows/preferences.cpp:965
+#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:663
+#: modules/gui/wxwindows/preferences.cpp:967
 #: modules/gui/wxwindows/subtitles.cpp:196
 #, fuzzy
 msgid "Open file"
@@ -3164,8 +3313,8 @@ msgstr "Odtwarza strumie
 #: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
 #: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
 #: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:435
-#: modules/gui/macosx/intf.m:301 modules/gui/macosx/intf.m:339
-#: modules/gui/macosx/intf.m:400 modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
+#: modules/gui/macosx/intf.m:423 modules/gui/wxwindows/interface.cpp:347
 msgid "Stop"
 msgstr "Zatrzymaj"
 
@@ -3199,7 +3348,7 @@ msgstr "UDP Multicast"
 
 #: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
 #: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:160
-#: modules/gui/macosx/output.m:124 modules/gui/wxwindows/open.cpp:445
+#: modules/gui/macosx/output.m:128 modules/gui/wxwindows/open.cpp:456
 #: modules/gui/wxwindows/streamout.cpp:380
 msgid "Address"
 msgstr "Adres"
@@ -3209,13 +3358,13 @@ msgstr "Adres"
 #: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
 #: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
 #: modules/gui/macosx/open.m:159 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:125 modules/gui/wxwindows/open.cpp:430
-#: modules/gui/wxwindows/open.cpp:453 modules/gui/wxwindows/streamout.cpp:390
+#: modules/gui/macosx/output.m:129 modules/gui/wxwindows/open.cpp:441
+#: modules/gui/wxwindows/open.cpp:464 modules/gui/wxwindows/streamout.cpp:390
 msgid "Port"
 msgstr "Port"
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:127
-#: modules/gui/macosx/output.m:221 modules/gui/macosx/output.m:289
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:131
+#: modules/gui/macosx/output.m:227 modules/gui/macosx/output.m:295
 #: modules/gui/wxwindows/streamout.cpp:341
 msgid "HTTP"
 msgstr "HTTP"
@@ -3304,10 +3453,10 @@ msgid ""
 "from local or network sources."
 msgstr ""
 
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
+#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100
 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
@@ -3317,6 +3466,70 @@ msgstr ""
 msgid "Error loading pixmap file: %s"
 msgstr ""
 
+#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
+#, fuzzy
+msgid "Gtk2 interface"
+msgstr "Modu³ interfejsu Gtk+"
+
+#: modules/gui/gtk2/gnome2_interface.c:31
+#, fuzzy
+msgid "_New"
+msgstr "_Widok"
+
+#: modules/gui/gtk2/gnome2_interface.c:87
+msgid "gnome2"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:112
+msgid "button4"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:122
+#: modules/gui/gtk2/gtk2_interface.c:183
+msgid "button3"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337
+#, fuzzy
+msgid "Save File"
+msgstr "Wybierz plik"
+
+#: modules/gui/gtk2/gtk2_interface.c:67
+#, fuzzy
+msgid "window1"
+msgstr "Aktywne okna"
+
+#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147
+#: modules/gui/gtk/gtk_interface.c:1373
+msgid "_File"
+msgstr "_Plik"
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+#, fuzzy
+msgid "_Edit"
+msgstr "W_yjd¼"
+
+#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268
+msgid "_View"
+msgstr "_Widok"
+
+#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569
+msgid "_Help"
+msgstr "_Pomoc"
+
+#: modules/gui/gtk2/gtk2_interface.c:146
+#, fuzzy
+msgid "_About"
+msgstr "Informacje o..."
+
+#: modules/gui/gtk2/gtk2_interface.c:163
+msgid "button1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:173
+msgid "button2"
+msgstr ""
+
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 #, fuzzy
 msgid "Show tooltips"
@@ -3365,7 +3578,7 @@ msgstr "_Otw
 #: modules/gui/gtk/gnome_interface.c:20 modules/gui/gtk/gnome_interface.c:504
 #: modules/gui/gtk/gnome_interface.c:986 modules/gui/gtk/gtk_interface.c:173
 #: modules/gui/gtk/gtk_interface.c:619 modules/gui/gtk/gtk_interface.c:1399
-#: modules/gui/wxwindows/interface.cpp:230
+#: modules/gui/wxwindows/interface.cpp:231
 #, fuzzy
 msgid "Open a file"
 msgstr "Otwiera plik"
@@ -3467,25 +3680,25 @@ msgstr "Wybiera kana
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:909
 #: modules/gui/gtk/gtk_interface.c:452 modules/gui/gtk/gtk_interface.c:1253
-#: modules/gui/macosx/intf.m:355
+#: modules/gui/macosx/intf.m:378
 msgid "Volume Up"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:916
 #: modules/gui/gtk/gtk_interface.c:459 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:356
+#: modules/gui/macosx/intf.m:379
 msgid "Volume Down"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:923
 #: modules/gui/gtk/gtk_interface.c:466 modules/gui/gtk/gtk_interface.c:1267
-#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:357
+#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:380
 msgid "Mute"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:155 modules/gui/gtk/gnome_interface.c:938
 #: modules/gui/gtk/gtk_interface.c:488 modules/gui/gtk/gtk_interface.c:1289
-#: modules/gui/macosx/intf.m:362 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:385 modules/gui/macosx/intf.m:386
 #, fuzzy
 msgid "Device"
 msgstr "urz±dzenie DVD"
@@ -3505,19 +3718,10 @@ msgstr "Wybiera kana
 msgid "_Fullscreen"
 msgstr "Pe³_ny ekran"
 
-#: modules/gui/gtk/gnome_interface.c:183 modules/gui/gtk/gnome_interface.c:966
-#: modules/gui/gtk/gtk_interface.c:553 modules/gui/gtk/gtk_interface.c:1349
-#: modules/gui/macosx/controls.m:526 modules/gui/macosx/intf.m:378
-#: modules/gui/macosx/intf.m:379
-#: modules/video_filter/deinterlace/deinterlace.c:81
-#, fuzzy
-msgid "Deinterlace"
-msgstr "Tryb antyprzeplotowy"
-
 #: modules/gui/gtk/gnome_interface.c:190 modules/gui/gtk/gnome_interface.c:973
 #: modules/gui/gtk/gtk_interface.c:560 modules/gui/gtk/gtk_interface.c:1356
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/intf.m:375
-#: modules/gui/macosx/output.m:120 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/intf.m:397 modules/gui/macosx/intf.m:398
+#: modules/gui/macosx/output.m:124 modules/gui/macosx/vout.m:199
 #, fuzzy
 msgid "Screen"
 msgstr "Pe³_ny ekran"
@@ -3536,18 +3740,18 @@ msgstr "Obraz"
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
 #: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2005
 #: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:142
-#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:337
+#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:338
 #: modules/gui/wxwindows/open.cpp:278
 msgid "Disc"
 msgstr "Dysk"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:339
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Net"
 msgstr "Sieæ"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:343
 msgid "Sat"
 msgstr "Satelita"
 
@@ -3609,7 +3813,7 @@ msgstr "Otw
 #: modules/gui/gtk/gnome_interface.c:1063 modules/gui/gtk/gtk_interface.c:758
 #: modules/gui/gtk/gtk_interface.c:844 modules/gui/gtk/gtk_interface.c:888
 #: modules/gui/gtk/gtk_interface.c:1173
-#: modules/gui/wxwindows/interface.cpp:353
+#: modules/gui/wxwindows/interface.cpp:354
 msgid "Prev"
 msgstr "Poprz"
 
@@ -3622,8 +3826,8 @@ msgstr "Poprzedni plik"
 #: modules/gui/gtk/gnome_interface.c:1056 modules/gui/gtk/gtk_interface.c:769
 #: modules/gui/gtk/gtk_interface.c:852 modules/gui/gtk/gtk_interface.c:896
 #: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:443
-#: modules/gui/macosx/intf.m:303 modules/gui/macosx/intf.m:343
-#: modules/gui/macosx/intf.m:401 modules/gui/wxwindows/interface.cpp:355
+#: modules/gui/macosx/intf.m:326 modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:424 modules/gui/wxwindows/interface.cpp:356
 msgid "Next"
 msgstr "Nast"
 
@@ -3722,8 +3926,8 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
 #: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
 #: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:173
-#: modules/gui/macosx/output.m:123 modules/gui/wxwindows/open.cpp:246
-#: modules/gui/wxwindows/open.cpp:343
+#: modules/gui/macosx/output.m:127 modules/gui/wxwindows/open.cpp:246
+#: modules/gui/wxwindows/open.cpp:354
 #: modules/gui/wxwindows/preferences.cpp:778
 #: modules/gui/wxwindows/streamout.cpp:367
 #: modules/gui/wxwindows/subtitles.cpp:107
@@ -3731,24 +3935,24 @@ msgid "Browse..."
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:368
+#: modules/gui/wxwindows/open.cpp:379
 msgid "Disc type"
 msgstr "Typ p³yty"
 
 #: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
 #: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:488
-#: modules/gui/wxwindows/open.cpp:362
+#: modules/gui/wxwindows/open.cpp:373
 msgid "DVD"
 msgstr "DVD"
 
 #: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
 #: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:382
-#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:363
+#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:374
 msgid "VCD"
 msgstr "VCD"
 
 #: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:374
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:385
 msgid "Device name"
 msgstr "Nazwa urz±dzenia"
 
@@ -3759,25 +3963,25 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:547
-#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:409
+#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:420
 msgid "UDP/RTP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
 #: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:548
-#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:421
 #, fuzzy
 msgid "UDP/RTP Multicast"
 msgstr "UDP Multicast"
 
 #: modules/gui/gtk/gnome_interface.c:1727 modules/gui/gtk/gtk_interface.c:2042
 #: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:549
-#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:411
+#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:422
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:467
+#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:478
 msgid "URL"
 msgstr "URL"
 
@@ -3828,7 +4032,7 @@ msgid "fps"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:116
+#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:120
 #: modules/gui/wxwindows/open.cpp:201 modules/gui/wxwindows/open.cpp:223
 #, fuzzy
 msgid "Settings..."
@@ -3909,14 +4113,14 @@ msgid "Destination Target: "
 msgstr "Otwiera plik"
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:128 modules/gui/macosx/output.m:231
-#: modules/gui/macosx/output.m:290 modules/gui/wxwindows/streamout.cpp:342
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/output.m:237
+#: modules/gui/macosx/output.m:296 modules/gui/wxwindows/streamout.cpp:342
 msgid "UDP"
 msgstr "UDP"
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:129 modules/gui/macosx/output.m:241
-#: modules/gui/macosx/output.m:292 modules/gui/wxwindows/streamout.cpp:343
+#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:298 modules/gui/wxwindows/streamout.cpp:343
 msgid "RTP"
 msgstr "RPT"
 
@@ -3939,8 +4143,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:135 modules/gui/macosx/output.m:273
-#: modules/gui/macosx/output.m:319
+#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:279
+#: modules/gui/macosx/output.m:325
 msgid "AVI"
 msgstr ""
 
@@ -3958,11 +4162,6 @@ msgstr ""
 msgid "Gtk+ interface"
 msgstr "Modu³ interfejsu Gtk+"
 
-#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
-#: modules/gui/gtk2/gtk2_interface.c:77
-msgid "_File"
-msgstr "_Plik"
-
 #: modules/gui/gtk/gtk_interface.c:238
 msgid "_Close"
 msgstr ""
@@ -3980,10 +4179,6 @@ msgstr "W_yjd
 msgid "Exit the program"
 msgstr "Wychodzi z programu"
 
-#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132
-msgid "_View"
-msgstr "_Widok"
-
 #: modules/gui/gtk/gtk_interface.c:294
 msgid "Hide the main interface window"
 msgstr "Ukrywa g³ówne okno interfejsu"
@@ -4004,10 +4199,6 @@ msgstr "_Preferencje..."
 msgid "Configure the application"
 msgstr "Konfiguruje t± aplikacjê"
 
-#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139
-msgid "_Help"
-msgstr "_Pomoc"
-
 #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435
 msgid "_About..."
 msgstr "_Informacje o..."
@@ -4116,57 +4307,6 @@ msgstr "Skonfiguruj"
 msgid "Selected:"
 msgstr "Wybrano:"
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-#, fuzzy
-msgid "Gtk2 interface"
-msgstr "Modu³ interfejsu Gtk+"
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-#, fuzzy
-msgid "_New"
-msgstr "_Widok"
-
-#: modules/gui/gtk2/gnome2_interface.c:87
-msgid "gnome2"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:112
-msgid "button4"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:122
-#: modules/gui/gtk2/gtk2_interface.c:183
-msgid "button3"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:331
-#, fuzzy
-msgid "Save File"
-msgstr "Wybierz plik"
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-#, fuzzy
-msgid "window1"
-msgstr "Aktywne okna"
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-#, fuzzy
-msgid "_Edit"
-msgstr "W_yjd¼"
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-#, fuzzy
-msgid "_About"
-msgstr "Informacje o..."
-
-#: modules/gui/gtk2/gtk2_interface.c:163
-msgid "button1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:173
-msgid "button2"
-msgstr ""
-
 #: modules/gui/kde/interface.cpp:88
 msgid "Languages"
 msgstr ""
@@ -4198,239 +4338,239 @@ msgstr "Komunikaty"
 msgid "Plugins"
 msgstr ""
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:315
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:338
 msgid "About VLC media player"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:344 modules/gui/macosx/controls.m:487
-#: modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:389
 msgid "Half Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:346 modules/gui/macosx/controls.m:488
-#: modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:390
 msgid "Normal Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:348 modules/gui/macosx/controls.m:489
-#: modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/intf.m:391
 msgid "Double Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:491
 #: modules/gui/macosx/controls.m:498 modules/gui/macosx/controls.m:520
-#: modules/gui/macosx/intf.m:371
+#: modules/gui/macosx/intf.m:394
 msgid "Float On Top"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:490
-#: modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/intf.m:392
 #, fuzzy
 msgid "Fit To Screen"
 msgstr "Pe³_ny ekran"
 
-#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:298
-#: modules/gui/macosx/intf.m:342 modules/gui/macosx/intf.m:402
+#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:321
+#: modules/gui/macosx/intf.m:365 modules/gui/macosx/intf.m:425
 #, fuzzy
 msgid "Previous"
 msgstr "Poprzedni plik"
 
-#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:344
+#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:367
 msgid "Loop"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:345
+#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:368
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:346
+#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:369
 #, fuzzy
 msgid "Step Backward"
 msgstr "Przechodzi wstecz"
 
-#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:386
-#: modules/gui/macosx/intf.m:411
+#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:434
 msgid "Info"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:293
+#: modules/gui/macosx/intf.m:316
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:305
+#: modules/gui/macosx/intf.m:328
 msgid "Volume"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:306
+#: modules/gui/macosx/intf.m:329
 #, fuzzy
 msgid "Position"
 msgstr "Polaryzacja"
 
-#: modules/gui/macosx/intf.m:312
+#: modules/gui/macosx/intf.m:335
 msgid "Open CrashLog"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:316
+#: modules/gui/macosx/intf.m:339
 #, fuzzy
 msgid "Preferences..."
 msgstr "_Preferencje..."
 
-#: modules/gui/macosx/intf.m:317
+#: modules/gui/macosx/intf.m:340
 msgid "Hide VLC"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:318
+#: modules/gui/macosx/intf.m:341
 #, fuzzy
 msgid "Hide Others"
 msgstr "U_kryj interfejs"
 
-#: modules/gui/macosx/intf.m:319
+#: modules/gui/macosx/intf.m:342
 msgid "Show All"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:343
 #, fuzzy
 msgid "Quit VLC"
 msgstr "Informacje o..."
 
-#: modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/intf.m:345
 #, fuzzy
 msgid "1:File"
 msgstr "1:Plik"
 
-#: modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:346
 #, fuzzy
 msgid "Open..."
 msgstr "Otwórz plik"
 
-#: modules/gui/macosx/intf.m:324
+#: modules/gui/macosx/intf.m:347
 #, fuzzy
 msgid "Open File..."
 msgstr "_Otwórz plik..."
 
-#: modules/gui/macosx/intf.m:325
+#: modules/gui/macosx/intf.m:348
 #, fuzzy
 msgid "Open Disc..."
 msgstr "Otwórz _p³ytê..."
 
-#: modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:349
 #, fuzzy
 msgid "Open Network..."
 msgstr "Otwórz sieæ"
 
-#: modules/gui/macosx/intf.m:327
+#: modules/gui/macosx/intf.m:350
 #, fuzzy
 msgid "Open Recent"
 msgstr "Otwórz strumieñ"
 
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/intf.m:1291
+#: modules/gui/macosx/intf.m:351 modules/gui/macosx/intf.m:1314
 msgid "Clear Menu"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:331
+#: modules/gui/macosx/intf.m:354
 msgid "Cut"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:332
+#: modules/gui/macosx/intf.m:355
 #, fuzzy
 msgid "Copy"
 msgstr "Usuñ"
 
-#: modules/gui/macosx/intf.m:333
+#: modules/gui/macosx/intf.m:356
 #, fuzzy
 msgid "Paste"
 msgstr "Wstrzymaj"
 
-#: modules/gui/macosx/intf.m:334
+#: modules/gui/macosx/intf.m:357
 msgid "Clear"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:337
+#: modules/gui/macosx/intf.m:360
 msgid "Controls"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:358 modules/gui/macosx/intf.m:359
+#: modules/gui/macosx/intf.m:381 modules/gui/macosx/intf.m:382
 #, fuzzy
 msgid "Audio Track"
 msgstr "D¼wiêk"
 
-#: modules/gui/macosx/intf.m:372 modules/gui/macosx/intf.m:373
+#: modules/gui/macosx/intf.m:395 modules/gui/macosx/intf.m:396
 #, fuzzy
 msgid "Video Track"
 msgstr "Obraz"
 
-#: modules/gui/macosx/intf.m:382
+#: modules/gui/macosx/intf.m:405
 msgid "Minimize Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:406
 #, fuzzy
 msgid "Close Window"
 msgstr "Otwiera okno komunikatów"
 
-#: modules/gui/macosx/intf.m:384
+#: modules/gui/macosx/intf.m:407
 msgid "Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:389
+#: modules/gui/macosx/intf.m:412
 msgid "Bring All to Front"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:391
+#: modules/gui/macosx/intf.m:414
 #, fuzzy
 msgid "Help"
 msgstr "_Pomoc"
 
-#: modules/gui/macosx/intf.m:392
+#: modules/gui/macosx/intf.m:415
 #, fuzzy
 msgid "ReadMe..."
 msgstr "Komunikaty..."
 
-#: modules/gui/macosx/intf.m:393
+#: modules/gui/macosx/intf.m:416
 #, fuzzy
 msgid "Online Documentation"
 msgstr "modu³ kompensacji ruchu"
 
-#: modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/intf.m:417
 msgid "Report a Bug"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/intf.m:418
 #, fuzzy
 msgid "VideoLAN Website"
 msgstr "Klient VideoLAN"
 
-#: modules/gui/macosx/intf.m:396
+#: modules/gui/macosx/intf.m:419
 msgid "License"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:405
+#: modules/gui/macosx/intf.m:428
 msgid "Error"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:406
+#: modules/gui/macosx/intf.m:429
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:407
+#: modules/gui/macosx/intf.m:430
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:408
+#: modules/gui/macosx/intf.m:431
 #, fuzzy
 msgid "Open Messages Window"
 msgstr "Otwiera okno komunikatów"
 
-#: modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:432
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4512,63 +4652,57 @@ msgstr ""
 msgid "Open VIDEO_TS Directory"
 msgstr ""
 
-#: modules/gui/macosx/output.m:115
+#: modules/gui/macosx/output.m:119
 #, fuzzy
 msgid "Advanced output:"
 msgstr "modu³ d¼wiêkowy ALSA"
 
-#: modules/gui/macosx/output.m:119
+#: modules/gui/macosx/output.m:123
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:122 modules/gui/macosx/output.m:210
-#: modules/gui/macosx/output.m:285
+#: modules/gui/macosx/output.m:126 modules/gui/macosx/output.m:216
+#: modules/gui/macosx/output.m:291
 #, fuzzy
 msgid "Stream"
 msgstr "Zatrzymuje strumieñ"
 
-#: modules/gui/macosx/output.m:126
+#: modules/gui/macosx/output.m:130
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132 modules/gui/wxwindows/streamout.cpp:437
+#: modules/gui/macosx/output.m:136 modules/gui/wxwindows/streamout.cpp:437
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:133
+#: modules/gui/macosx/output.m:137
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:134 modules/gui/macosx/output.m:275
-#: modules/gui/macosx/output.m:317
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:281
+#: modules/gui/macosx/output.m:323
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:274
-#: modules/gui/macosx/output.m:321
+#: modules/gui/macosx/output.m:140 modules/gui/macosx/output.m:280
+#: modules/gui/macosx/output.m:327
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:276
-#: modules/gui/macosx/output.m:323
+#: modules/gui/macosx/output.m:141 modules/gui/macosx/output.m:282
+#: modules/gui/macosx/output.m:329
 msgid "mp4"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139
+#: modules/gui/macosx/output.m:143
 #, fuzzy
 msgid "Transcode options"
 msgstr "Wstrzymuje strumieñ"
 
-#: modules/gui/macosx/output.m:149 modules/gui/macosx/output.m:153
-msgid "Bitrate (bps)"
-msgstr ""
-
-#: modules/gui/macosx/output.m:151
-msgid "mpga"
-msgstr ""
-
-#: modules/gui/macosx/output.m:152
-msgid "a52 "
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:158
+#: modules/gui/wxwindows/streamout.cpp:512
+#: modules/gui/wxwindows/streamout.cpp:549
+msgid "Bitrate (kb/s)"
 msgstr ""
 
 #: modules/gui/macosx/prefs.m:78 modules/gui/wxwindows/preferences.cpp:256
@@ -4580,12 +4714,6 @@ msgstr "Wybierz plik"
 msgid "Advanced"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:143 modules/gui/macosx/prefs.m:341
-#: modules/gui/macosx/prefs.m:368
-#, fuzzy
-msgid "Auto"
-msgstr "Autorzy"
-
 #: modules/gui/ncurses/ncurses.c:66
 #, fuzzy
 msgid "ncurses interface"
@@ -4601,33 +4729,33 @@ msgstr "Ta opcja wymusza wyj
 msgid "Qt interface"
 msgstr "modu³ interfejsu Qt"
 
-#: modules/gui/skins/src/skin_main.cpp:251
-#: modules/gui/skins/src/vlcproc.cpp:338
+#: modules/gui/skins/src/skin_main.cpp:239
+#: modules/gui/skins/src/vlcproc.cpp:339
 #, fuzzy
 msgid "Open a skin file"
 msgstr "Otwiera plik"
 
-#: modules/gui/skins/src/skin_main.cpp:292
-#: modules/gui/skins/src/skin_main.cpp:293
+#: modules/gui/skins/src/skin_main.cpp:280
+#: modules/gui/skins/src/skin_main.cpp:281
 msgid "Last skin actually used"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:294
-#: modules/gui/skins/src/skin_main.cpp:295
+#: modules/gui/skins/src/skin_main.cpp:282
+#: modules/gui/skins/src/skin_main.cpp:283
 msgid "Config of last used skin"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:296
-#: modules/gui/skins/src/skin_main.cpp:297
+#: modules/gui/skins/src/skin_main.cpp:284
+#: modules/gui/skins/src/skin_main.cpp:285
 msgid "Show application in system tray"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:298
-#: modules/gui/skins/src/skin_main.cpp:299
+#: modules/gui/skins/src/skin_main.cpp:286
+#: modules/gui/skins/src/skin_main.cpp:287
 msgid "Show application in taskbar"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:310
+#: modules/gui/skins/src/skin_main.cpp:298
 #, fuzzy
 msgid "Skinnable Interface"
 msgstr "Prze³±cz _Interfejs"
@@ -4637,203 +4765,203 @@ msgstr "Prze
 msgid "FileInfo"
 msgstr "_Otwórz plik..."
 
-#: modules/gui/wxwindows/interface.cpp:231
+#: modules/gui/wxwindows/interface.cpp:232
 #, fuzzy
 msgid "Open a DVD or (S)VCD"
 msgstr "Otwiera DVD lub VCD"
 
-#: modules/gui/wxwindows/interface.cpp:232
+#: modules/gui/wxwindows/interface.cpp:233
 #, fuzzy
 msgid "Open a network stream"
 msgstr "Wybiera strumieñ sieciowy"
 
-#: modules/gui/wxwindows/interface.cpp:233
+#: modules/gui/wxwindows/interface.cpp:234
 #, fuzzy
 msgid "Open a satellite stream"
 msgstr "Otwiera kartê satelitarn±"
 
-#: modules/gui/wxwindows/interface.cpp:234
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:235
+#: modules/gui/wxwindows/interface.cpp:236
 #, fuzzy
 msgid "Exit this program"
 msgstr "Wychodzi z programu"
 
-#: modules/gui/wxwindows/interface.cpp:237
+#: modules/gui/wxwindows/interface.cpp:238
 #, fuzzy
 msgid "Open the playlist"
 msgstr "Otwiera okno listy odtwarzania"
 
-#: modules/gui/wxwindows/interface.cpp:238
+#: modules/gui/wxwindows/interface.cpp:239
 #, fuzzy
 msgid "Show the program logs"
 msgstr "Wybiera program"
 
-#: modules/gui/wxwindows/interface.cpp:239
+#: modules/gui/wxwindows/interface.cpp:240
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:241
+#: modules/gui/wxwindows/interface.cpp:242
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:243
+#: modules/gui/wxwindows/interface.cpp:244
 #, fuzzy
 msgid "About this program"
 msgstr "Wychodzi z programu"
 
-#: modules/gui/wxwindows/interface.cpp:247
+#: modules/gui/wxwindows/interface.cpp:248
 #, fuzzy
 msgid "&Open File..."
 msgstr "_Otwórz plik..."
 
-#: modules/gui/wxwindows/interface.cpp:249
+#: modules/gui/wxwindows/interface.cpp:250
 #, fuzzy
 msgid "Open &Disc..."
 msgstr "Otwórz _p³ytê..."
 
-#: modules/gui/wxwindows/interface.cpp:251
+#: modules/gui/wxwindows/interface.cpp:252
 #, fuzzy
 msgid "&Network Stream..."
 msgstr "_Strumieñ sieciowy..."
 
-#: modules/gui/wxwindows/interface.cpp:254
+#: modules/gui/wxwindows/interface.cpp:255
 #, fuzzy
 msgid "&Satellite Stream..."
 msgstr "_Strumieñ sieciowy..."
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:260
 #, fuzzy
 msgid "&Eject Disc"
 msgstr "_Wysuñ p³ytê"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:264
 #, fuzzy
 msgid "E&xit"
 msgstr "W_yjd¼"
 
-#: modules/gui/wxwindows/interface.cpp:267
+#: modules/gui/wxwindows/interface.cpp:268
 #, fuzzy
 msgid "&Playlist..."
 msgstr "Lista odtwarzania..."
 
-#: modules/gui/wxwindows/interface.cpp:269
+#: modules/gui/wxwindows/interface.cpp:270
 #, fuzzy
-msgid "&Logs..."
-msgstr "Otwórz _p³ytê..."
+msgid "&Messages..."
+msgstr "Komunikaty..."
 
-#: modules/gui/wxwindows/interface.cpp:270
+#: modules/gui/wxwindows/interface.cpp:271
 #, fuzzy
 msgid "&File info..."
 msgstr "_Otwórz plik..."
 
-#: modules/gui/wxwindows/interface.cpp:275
+#: modules/gui/wxwindows/interface.cpp:276
 #, fuzzy
 msgid "&Preferences..."
 msgstr "_Preferencje..."
 
-#: modules/gui/wxwindows/interface.cpp:292
+#: modules/gui/wxwindows/interface.cpp:293
 #, fuzzy
 msgid "&About..."
 msgstr "_Informacje o..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:297
 #, fuzzy
 msgid "&File"
 msgstr "Plik"
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:298
 #, fuzzy
 msgid "&View"
 msgstr "_Widok"
 
-#: modules/gui/wxwindows/interface.cpp:298
+#: modules/gui/wxwindows/interface.cpp:299
 #, fuzzy
 msgid "&Settings"
 msgstr "U_stawienia"
 
-#: modules/gui/wxwindows/interface.cpp:299
-#: modules/gui/wxwindows/interface.cpp:476
-#: modules/gui/wxwindows/interface.cpp:524
+#: modules/gui/wxwindows/interface.cpp:300
+#: modules/gui/wxwindows/interface.cpp:478
+#: modules/gui/wxwindows/interface.cpp:526
 #, fuzzy
 msgid "&Audio"
 msgstr "D¼wiêk"
 
-#: modules/gui/wxwindows/interface.cpp:300
-#: modules/gui/wxwindows/interface.cpp:495
-#: modules/gui/wxwindows/interface.cpp:528
+#: modules/gui/wxwindows/interface.cpp:301
+#: modules/gui/wxwindows/interface.cpp:497
+#: modules/gui/wxwindows/interface.cpp:530
 #, fuzzy
 msgid "&Video"
 msgstr "Obraz"
 
-#: modules/gui/wxwindows/interface.cpp:301
-#: modules/gui/wxwindows/interface.cpp:514
-#: modules/gui/wxwindows/interface.cpp:532
+#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:516
+#: modules/gui/wxwindows/interface.cpp:534
 #, fuzzy
 msgid "&Navigation"
 msgstr "_Nawigacja"
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:303
 #, fuzzy
 msgid "&Help"
 msgstr "_Pomoc"
 
-#: modules/gui/wxwindows/interface.cpp:318
+#: modules/gui/wxwindows/interface.cpp:319
 #, fuzzy
 msgid "Stop current playlist item"
 msgstr "Otwiera okno listy odtwarzania"
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:320
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:320
+#: modules/gui/wxwindows/interface.cpp:321
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:321
+#: modules/gui/wxwindows/interface.cpp:322
 #: modules/gui/wxwindows/playlist.cpp:351
 #, fuzzy
 msgid "Open playlist"
 msgstr "Otwórz listê"
 
-#: modules/gui/wxwindows/interface.cpp:322
+#: modules/gui/wxwindows/interface.cpp:323
 #, fuzzy
 msgid "Previous playlist item"
 msgstr "Poprzedni plik"
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:324
 #, fuzzy
 msgid "Next playlist item"
 msgstr "Otwiera okno listy odtwarzania"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:325
 #, fuzzy
 msgid "Play slower"
 msgstr "Zwalnia odtwarzanie"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:326
 #, fuzzy
 msgid "Play faster"
 msgstr "Przyspiesza odtwarzanie"
 
-#: modules/gui/wxwindows/interface.cpp:560
+#: modules/gui/wxwindows/interface.cpp:561
 #, fuzzy
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr "modu³ interfejsu Win32"
 
-#: modules/gui/wxwindows/interface.cpp:561
+#: modules/gui/wxwindows/interface.cpp:562
 #, fuzzy
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr "(c) 1996-2003 Zespó³ VideoLAN"
 
-#: modules/gui/wxwindows/interface.cpp:562
+#: modules/gui/wxwindows/interface.cpp:563
 #, fuzzy
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
@@ -4843,7 +4971,7 @@ msgstr ""
 "Zespó³ VideoLAN <videolan@videolan.org>\n"
 "http://www.videolan.org/"
 
-#: modules/gui/wxwindows/interface.cpp:564
+#: modules/gui/wxwindows/interface.cpp:565
 #, fuzzy
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
@@ -4852,7 +4980,7 @@ msgstr ""
 "Klient VideoLAN, odtwarzacz DVD, MPEG i DivX. Program potrafi odtwarzaæ MPEG "
 "i MPEG2 z pliku lub ze ¼ród³a sieciowego."
 
-#: modules/gui/wxwindows/interface.cpp:568
+#: modules/gui/wxwindows/interface.cpp:569
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "Informacje o..."
@@ -4867,12 +4995,12 @@ msgstr "U_stawienia"
 msgid "Video menu"
 msgstr "U_stawienia"
 
-#: modules/gui/wxwindows/menus.cpp:139
+#: modules/gui/wxwindows/menus.cpp:141
 #, fuzzy
 msgid "Input menu"
 msgstr "Wej¶cie"
 
-#: modules/gui/wxwindows/menus.cpp:329
+#: modules/gui/wxwindows/menus.cpp:334
 msgid "Empty"
 msgstr ""
 
@@ -4909,16 +5037,16 @@ msgstr "Wstrzymuje strumie
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:361
+#: modules/gui/wxwindows/open.cpp:372
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:364
+#: modules/gui/wxwindows/open.cpp:375
 #, fuzzy
 msgid "CD Audio"
 msgstr "D¼wiêk"
 
-#: modules/gui/wxwindows/open.cpp:837 modules/gui/wxwindows/streamout.cpp:640
+#: modules/gui/wxwindows/open.cpp:848 modules/gui/wxwindows/streamout.cpp:640
 #, fuzzy
 msgid "Save file"
 msgstr "Wybierz plik"
@@ -4996,8 +5124,9 @@ msgid "No configuration options available"
 msgstr "Wy¶wietlanie podpowiedzi dla opcji konfiguracji."
 
 #: modules/gui/wxwindows/preferences.cpp:865
-msgid "Advanced..."
-msgstr ""
+#, fuzzy
+msgid "Advanced options"
+msgstr "modu³ d¼wiêkowy ALSA"
 
 #: modules/gui/wxwindows/streamout.cpp:166
 msgid "Stream output MRL"
@@ -5039,11 +5168,6 @@ msgstr "Czas trwania"
 msgid "Video codec"
 msgstr "urz±dzenie VCD"
 
-#: modules/gui/wxwindows/streamout.cpp:512
-#: modules/gui/wxwindows/streamout.cpp:549
-msgid "Bitrate (kb/s)"
-msgstr ""
-
 #: modules/gui/wxwindows/streamout.cpp:543
 #, fuzzy
 msgid "Audio codec"
@@ -5184,6 +5308,11 @@ msgstr ""
 "\n"
 "U¿ywanie wtyczku interfejsu zapisu do dziennika..."
 
+#: modules/misc/memcpy/memcpyaltivec.c:52
+#, fuzzy
+msgid "AltiVec memcpy"
+msgstr "modu³ AltiVec memcpy"
+
 #: modules/misc/memcpy/memcpy.c:81
 #, fuzzy
 msgid "libc memcpy"
@@ -5204,11 +5333,6 @@ msgstr "modu
 msgid "MMX EXT memcpy"
 msgstr "modu³ MMX EXT memcpy"
 
-#: modules/misc/memcpy/memcpyaltivec.c:52
-#, fuzzy
-msgid "AltiVec memcpy"
-msgstr "modu³ AltiVec memcpy"
-
 #: modules/misc/network/ipv4.c:85
 msgid "IPv4 network abstraction layer"
 msgstr "sieciowa warstwa abstrakcji IPv4"
@@ -5222,6 +5346,10 @@ msgstr "sieciowa warstwa abstrakcji IPv6"
 msgid "Qt Embedded GUI helper"
 msgstr "modu³ demux"
 
+#: modules/misc/sap.c:131
+msgid "SAP"
+msgstr ""
+
 #: modules/misc/sap.c:134
 #, fuzzy
 msgid "SAP interface"
@@ -5356,7 +5484,7 @@ msgid "Set image contrast"
 msgstr ""
 
 #: modules/video_filter/adjust.c:61
-msgid "Set the image contrast. Defaults to 1"
+msgid "Set the image contrast, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:62
@@ -5372,7 +5500,7 @@ msgid "Set image saturation"
 msgstr ""
 
 #: modules/video_filter/adjust.c:65
-msgid "Set the image saturation. Defaults to 1"
+msgid "Set the image saturation, between 0 and 3. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:66
@@ -5380,7 +5508,7 @@ msgid "Set image brightness"
 msgstr ""
 
 #: modules/video_filter/adjust.c:67
-msgid "Set the image brightness. Defaults to 1"
+msgid "Set the image brightness, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:71
@@ -5425,7 +5553,9 @@ msgid "Crop geometry"
 msgstr ""
 
 #: modules/video_filter/crop.c:55
-msgid "Set the geometry of the zone to crop"
+msgid ""
+"Set the geometry of the zone to crop. This is set as width x heigth + left "
+"offset + top offset."
 msgstr ""
 
 #: modules/video_filter/crop.c:57
@@ -5747,11 +5877,21 @@ msgstr "u
 msgid "Use shared memory to communicate between VLC and the X server."
 msgstr "U¿ywa pamiêæ wspó³dzielon± do komunikacji pomiêdzy VLC a serwerem X"
 
-#: modules/video_output/x11/x11.c:62
+#: modules/video_output/x11/x11.c:61 modules/video_output/x11/xvideo.c:72
+msgid "choose the screen to be used for fullscreen mode."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:63 modules/video_output/x11/xvideo.c:74
+msgid ""
+"Choose the screen you want to use in fullscreen mode. For instance set it to "
+"0 for first screen, 1 for the second."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:67
 msgid "X11"
 msgstr ""
 
-#: modules/video_output/x11/x11.c:68
+#: modules/video_output/x11/x11.c:76
 #, fuzzy
 msgid "X11 video output"
 msgstr "wyj¶cie obrazu w trybie overlay"
@@ -5781,12 +5921,12 @@ msgstr ""
 "próbowania polepszenia wydajno¶ci przez u¿ycie najbardziej wydajnego "
 "formatu. "
 
-#: modules/video_output/x11/xvideo.c:73
+#: modules/video_output/x11/xvideo.c:78
 #, fuzzy
 msgid "XVideo"
 msgstr "Obraz"
 
-#: modules/video_output/x11/xvideo.c:81
+#: modules/video_output/x11/xvideo.c:90
 #, fuzzy
 msgid "XVideo extension video output"
 msgstr "modu³ rozszerzenia XVideo"
@@ -5836,6 +5976,18 @@ msgstr "modu
 msgid "xosd interface"
 msgstr "modu³ interfejsu"
 
+#, fuzzy
+#~ msgid "SAP interface module"
+#~ msgstr "modu³ interfejsu"
+
+#, fuzzy
+#~ msgid "Auto"
+#~ msgstr "Autorzy"
+
+#, fuzzy
+#~ msgid "&Logs..."
+#~ msgstr "Otwórz _p³ytê..."
+
 #, fuzzy
 #~ msgid "Display identifier"
 #~ msgstr "identyfikator ekranu"
diff --git a/po/ru.po b/po/ru.po
index 61b82ace9c..947b6e948a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-05-24 14:40+0200\n"
+"POT-Creation-Date: 2003-05-27 23:43+0200\n"
 "PO-Revision-Date: 2001-02-19 19:58+03:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -25,7 +25,7 @@ msgid "Audio channels"
 msgstr ""
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:165 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:358
 #, fuzzy
@@ -114,7 +114,7 @@ msgstr "
 
 #: src/input/input_programs.c:94 modules/gui/gtk/gnome_interface.c:1078
 #: modules/gui/gtk/gtk_interface.c:1199 modules/gui/kde/interface.cpp:142
-#: modules/gui/macosx/intf.m:347 modules/gui/macosx/intf.m:348
+#: modules/gui/macosx/intf.m:370 modules/gui/macosx/intf.m:371
 msgid "Program"
 msgstr ""
 
@@ -122,18 +122,18 @@ msgstr ""
 #: modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
-#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:349
-#: modules/gui/macosx/intf.m:350 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:382
+#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:372
+#: modules/gui/macosx/intf.m:373 modules/gui/macosx/open.m:149
+#: modules/gui/wxwindows/open.cpp:393
 msgid "Title"
 msgstr ""
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
 #: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
-#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:351
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:388
+#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:374
+#: modules/gui/macosx/intf.m:375 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:399
 msgid "Chapter"
 msgstr ""
 
@@ -185,7 +185,7 @@ msgstr "
 msgid "Previous Chapter"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: src/input/input_programs.c:668
+#: src/input/input_programs.c:668 src/video_output/video_output.c:397
 msgid "Disable"
 msgstr ""
 
@@ -198,44 +198,44 @@ msgstr ""
 msgid "C"
 msgstr "ru"
 
-#: src/libvlc.c:301 src/libvlc.c:1357
+#: src/libvlc.c:301 src/libvlc.c:1364
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
 "\n"
 msgstr ""
 
-#: src/libvlc.c:1189 src/misc/configuration.c:961
+#: src/libvlc.c:1196 src/misc/configuration.c:961
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:1206 src/misc/configuration.c:946
+#: src/libvlc.c:1213 src/misc/configuration.c:946
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:1209 src/misc/configuration.c:953
+#: src/libvlc.c:1216 src/misc/configuration.c:953
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:1215
+#: src/libvlc.c:1222
 msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:1216
+#: src/libvlc.c:1223
 msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:1332 src/libvlc.c:1387 src/libvlc.c:1411
+#: src/libvlc.c:1339 src/libvlc.c:1394 src/libvlc.c:1418
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
 msgstr ""
 
-#: src/libvlc.c:1360
+#: src/libvlc.c:1367
 msgid "[module]              [description]\n"
 msgstr ""
 
-#: src/libvlc.c:1405
+#: src/libvlc.c:1412
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -955,15 +955,15 @@ msgstr ""
 #: modules/demux/ogg.c:554 modules/demux/ogg.c:813 modules/demux/ogg.c:986
 #: modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m:354 modules/gui/macosx/output.m:150
+#: modules/gui/macosx/intf.m:377 modules/gui/macosx/output.m:155
 msgid "Audio"
 msgstr ""
 
 #: src/libvlc.h:473 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:893 modules/gui/gtk/gnome_interface.c:1099
-#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:365
-#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:140
+#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:388
+#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:144
 #: modules/misc/dummy/dummy.c:83 modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr ""
@@ -994,8 +994,8 @@ msgstr ""
 #: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
-#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:297
-#: modules/gui/macosx/intf.m:385 modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:408 modules/gui/wxwindows/interface.cpp:352
 #: modules/gui/wxwindows/playlist.cpp:102
 msgid "Playlist"
 msgstr "óÐÉÓÏË ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
@@ -1038,12 +1038,41 @@ msgstr ""
 msgid "boolean"
 msgstr ""
 
-#: src/video_output/video_output.c:382 modules/gui/beos/VideoOutput.cpp:1138
+#: src/video_output/video_output.c:384 modules/gui/beos/VideoOutput.cpp:1138
 #: modules/gui/macosx/controls.m:342 modules/gui/macosx/controls.m:486
-#: modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/intf.m:393
 msgid "Fullscreen"
 msgstr ""
 
+#: src/video_output/video_output.c:395 modules/gui/gtk/gnome_interface.c:183
+#: modules/gui/gtk/gnome_interface.c:966 modules/gui/gtk/gtk_interface.c:553
+#: modules/gui/gtk/gtk_interface.c:1349 modules/gui/macosx/controls.m:526
+#: modules/gui/macosx/intf.m:401 modules/gui/macosx/intf.m:402
+#: modules/video_filter/deinterlace/deinterlace.c:81
+msgid "Deinterlace"
+msgstr ""
+
+#: src/video_output/video_output.c:399
+#, fuzzy
+msgid "Discard"
+msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
+
+#: src/video_output/video_output.c:401
+msgid "Blend"
+msgstr ""
+
+#: src/video_output/video_output.c:403
+msgid "Mean"
+msgstr ""
+
+#: src/video_output/video_output.c:405
+msgid "Bob"
+msgstr ""
+
+#: src/video_output/video_output.c:407
+msgid "Linear"
+msgstr ""
+
 #: modules/access/cdda.c:86 modules/access/file.c:69 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
 #: modules/access/v4l/v4l.c:64
@@ -1177,6 +1206,26 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
+#: modules/access_output/dummy.c:56
+#, fuzzy
+msgid "Dummy stream ouput"
+msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
+
+#: modules/access_output/file.c:58
+#, fuzzy
+msgid "File stream ouput"
+msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
+
+#: modules/access_output/http.c:54
+#, fuzzy
+msgid "HTTP stream ouput"
+msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
+
+#: modules/access_output/udp.c:73
+#, fuzzy
+msgid "UDP stream ouput"
+msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr ""
@@ -1262,35 +1311,6 @@ msgstr ""
 msgid "VCD input"
 msgstr ""
 
-#: modules/access/vlcs.c:131 modules/misc/sap.c:131
-msgid "SAP"
-msgstr ""
-
-#: modules/access/vlcs.c:134
-#, fuzzy
-msgid "SAP interface module"
-msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
-
-#: modules/access_output/dummy.c:56
-#, fuzzy
-msgid "Dummy stream ouput"
-msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
-
-#: modules/access_output/file.c:58
-#, fuzzy
-msgid "File stream ouput"
-msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
-
-#: modules/access_output/http.c:54
-#, fuzzy
-msgid "HTTP stream ouput"
-msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
-
-#: modules/access_output/udp.c:73
-#, fuzzy
-msgid "UDP stream ouput"
-msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr ""
@@ -1440,13 +1460,13 @@ msgstr ""
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:159 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:161 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:371
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:201 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:203 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:387
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1597,23 +1617,147 @@ msgstr ""
 msgid "AAC audio decoder (using libfaad2)"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:154
-msgid "ffmpeg"
+#: modules/codec/ffmpeg/ffmpeg.c:86
+msgid "Direct rendering"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:88
+msgid "Error resilience"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:90
+msgid ""
+"ffmpeg can make errors resiliences.          \n"
+"Nevertheless, with buggy encoder (like ISO MPEG-4 encoder from M$) this will "
+"produce a lot of errors.\n"
+"Valid range is -1 to 99 (-1 disable all errors resiliences)."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:95
+msgid "Workaround bugs"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:97
+msgid ""
+"Try to fix some bugs\n"
+"1  autodetect\n"
+"2  old msmpeg4\n"
+"4  xvid interlaced\n"
+"8  ump4 \n"
+"16 no padding\n"
+"32 ac vlc64 Qpel chroma"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:106
+msgid "Hurry up"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:108
+msgid ""
+"Allow the decoder to partially decode or skip frame(s) when there not enough "
+"time.\n"
+" It's usefull with low CPU power but it could produce broken pictures."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:112
+#, fuzzy
+msgid "Truncated stream"
+msgstr "÷ÏÓÐÒÏÉÚ×ÅÓÔÉ ÐÏÔÏË"
+
+#: modules/codec/ffmpeg/ffmpeg.c:113
+msgid "truncated stream -1:auto,0:disable,:1:enable"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:115
+msgid "Post processing quality"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:117
+msgid ""
+"Quality of post processing\n"
+"Valid range is 0 to 6"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:120
+msgid "Ffmpeg postproc filter chains"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:157
-msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgid "Ffmpeg postprocessing module"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:159
+msgid "Auto-level Post processing quality"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:161
+msgid ""
+"Post processing quality is selected upon time left but no more than "
+"requested quality\n"
+"Not yet implemented !"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:165
+msgid "Force vertical luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:166
+msgid "Force vertical luminance deblocking (override other settings)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:168
-msgid "Post processing"
+msgid "Force horizontal luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:169
+msgid "Force horizontal luminance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:171
+msgid "Force vertical chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:172
+msgid "Force vertical chrominance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:174
+msgid "Force horizontal chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:175
+msgid "Force horizontal chrominance deblocking (override other settings)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:177
-msgid "ffmpeg postprocessing module"
+msgid "Force luminance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:178
+msgid "Force luminance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:180
+msgid "Force chrominance deringing"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:204
+#: modules/codec/ffmpeg/ffmpeg.c:181
+msgid "Force chrominance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:184
+msgid "ffmpeg"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:187
+msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:195
+msgid "Post processing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:215
 msgid "ffmpeg chroma conversion"
 msgstr ""
 
@@ -1633,7 +1777,7 @@ msgstr ""
 msgid "flac audio decoder"
 msgstr ""
 
-#: modules/codec/libmpeg2.c:89
+#: modules/codec/libmpeg2.c:90
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr ""
 
@@ -1649,14 +1793,14 @@ msgstr ""
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr ""
 
-#: modules/codec/mpeg_video/idct/idct.c:41
-msgid "IDCT"
-msgstr ""
-
 #: modules/codec/mpeg_video/idct/idctaltivec.c:45
 msgid "AltiVec IDCT"
 msgstr ""
 
+#: modules/codec/mpeg_video/idct/idct.c:41
+msgid "IDCT"
+msgstr ""
+
 #: modules/codec/mpeg_video/idct/idctclassic.c:41
 msgid "classic IDCT"
 msgstr ""
@@ -1669,10 +1813,6 @@ msgstr ""
 msgid "MMX EXT IDCT"
 msgstr ""
 
-#: modules/codec/mpeg_video/motion/motion.c:42
-msgid "motion compensation"
-msgstr ""
-
 #: modules/codec/mpeg_video/motion/motion3dnow.c:44
 msgid "3D Now! motion compensation"
 msgstr ""
@@ -1681,6 +1821,10 @@ msgstr ""
 msgid "AltiVec motion compensation"
 msgstr ""
 
+#: modules/codec/mpeg_video/motion/motion.c:42
+msgid "motion compensation"
+msgstr ""
+
 #: modules/codec/mpeg_video/motion/motionmmx.c:45
 msgid "MMX motion compensation"
 msgstr ""
@@ -1845,20 +1989,20 @@ msgstr ""
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
 #: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
-#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:879
-#: modules/gui/macosx/intf.m:880 modules/gui/macosx/intf.m:881
-#: modules/gui/wxwindows/interface.cpp:810
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:902
+#: modules/gui/macosx/intf.m:903 modules/gui/macosx/intf.m:904
+#: modules/gui/wxwindows/interface.cpp:811
 msgid "Pause"
 msgstr "ðÁÕÚÁ"
 
 #: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
 #: modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
-#: modules/gui/macosx/intf.m:300 modules/gui/macosx/intf.m:338
-#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:886
-#: modules/gui/macosx/intf.m:887 modules/gui/macosx/intf.m:888
-#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:348
-#: modules/gui/wxwindows/interface.cpp:815
+#: modules/gui/macosx/intf.m:323 modules/gui/macosx/intf.m:361
+#: modules/gui/macosx/intf.m:422 modules/gui/macosx/intf.m:909
+#: modules/gui/macosx/intf.m:910 modules/gui/macosx/intf.m:911
+#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:816
 msgid "Play"
 msgstr "÷ÏÓÐÒ."
 
@@ -1912,8 +2056,8 @@ msgstr ""
 #: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:821
 #: modules/demux/ogg.c:994 modules/gui/gtk/gnome_interface.c:148
 #: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
-#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:360
-#: modules/gui/macosx/intf.m:361
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:384
 msgid "Channels"
 msgstr ""
 
@@ -1938,7 +2082,7 @@ msgstr "
 #: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:554
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:813 modules/demux/ogg.c:893 modules/demux/ogg.c:986
-#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:130
+#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134
 msgid "Type"
 msgstr ""
 
@@ -2570,7 +2714,7 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:201
 #: modules/gui/beos/InterfaceWindow.cpp:300
 #: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:304 modules/gui/macosx/prefs.m:75
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/prefs.m:75
 #: modules/gui/wxwindows/preferences.cpp:229
 msgid "Preferences"
 msgstr ""
@@ -2579,7 +2723,7 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:298
 #: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
 #: modules/gui/kde/info.cpp:9 modules/gui/kde/messages.cpp:8
-#: modules/gui/macosx/intf.m:310 modules/gui/macosx/intf.m:387
+#: modules/gui/macosx/intf.m:333 modules/gui/macosx/intf.m:410
 #: modules/gui/wxwindows/messages.cpp:79
 msgid "Messages"
 msgstr ""
@@ -2594,8 +2738,8 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
 #: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
 #: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:264
-#: modules/gui/macosx/output.m:121 modules/gui/macosx/output.m:194
-#: modules/gui/macosx/output.m:279 modules/gui/wxwindows/interface.cpp:335
+#: modules/gui/macosx/output.m:125 modules/gui/macosx/output.m:200
+#: modules/gui/macosx/output.m:285 modules/gui/wxwindows/interface.cpp:336
 #: modules/gui/wxwindows/open.cpp:276 modules/gui/wxwindows/streamout.cpp:340
 #, fuzzy
 msgid "File"
@@ -2603,8 +2747,8 @@ msgstr "
 
 #: modules/gui/beos/InterfaceWindow.cpp:240
 #: modules/gui/beos/PlayListWindow.cpp:84
-#: modules/gui/gtk/gnome_interface.c:2179
-#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332
 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677
 msgid "Open File"
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ"
@@ -2627,7 +2771,7 @@ msgid "About"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:256 modules/gui/kde/interface.cpp:93
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/intf.m:377
+#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:400
 msgid "Subtitles"
 msgstr ""
 
@@ -2663,8 +2807,8 @@ msgid "Speed"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:286 modules/gui/macosx/controls.m:422
-#: modules/gui/macosx/intf.m:299 modules/gui/macosx/intf.m:341
-#: modules/gui/wxwindows/interface.cpp:357
+#: modules/gui/macosx/intf.m:322 modules/gui/macosx/intf.m:364
+#: modules/gui/wxwindows/interface.cpp:358
 #, fuzzy
 msgid "Slower"
 msgstr "íÅÄÌÅÎÎÏ"
@@ -2674,13 +2818,13 @@ msgid "Normal"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:290 modules/gui/macosx/controls.m:421
-#: modules/gui/macosx/intf.m:302 modules/gui/macosx/intf.m:340
-#: modules/gui/wxwindows/interface.cpp:359
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/wxwindows/interface.cpp:360
 #, fuzzy
 msgid "Faster"
 msgstr "âÙÓÔÒÏ"
 
-#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:381
+#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:404
 msgid "Window"
 msgstr ""
 
@@ -2694,7 +2838,7 @@ msgstr "
 #: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
 #: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
 #: modules/gui/gtk/preferences.c:605 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:117
+#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:121
 #: modules/gui/wxwindows/fileinfo.cpp:96
 #: modules/gui/wxwindows/messages.cpp:102 modules/gui/wxwindows/open.cpp:267
 #: modules/gui/wxwindows/preferences.cpp:250
@@ -2717,16 +2861,16 @@ msgstr "
 msgid "Drop files to play"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:167
+#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:169
 #: modules/gui/wxwindows/playlist.cpp:154
 msgid "Close"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:330
+#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:353
 msgid "Edit"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:335
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:358
 #: modules/gui/macosx/playlist.m:180
 #, fuzzy
 msgid "Select All"
@@ -2780,24 +2924,24 @@ msgstr ""
 #: modules/gui/beos/PreferencesWindow.cpp:44
 #: modules/gui/beos/PreferencesWindow.cpp:46
 #: modules/gui/beos/PreferencesWindow.cpp:98
-#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:607
-#: modules/gui/macosx/prefs.m:615 modules/gui/macosx/prefs.m:685
+#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:690
+#: modules/gui/macosx/prefs.m:698 modules/gui/macosx/prefs.m:768
 msgid "Modules"
 msgstr "íÏÄÕÌÉ"
 
-#: modules/gui/beos/PreferencesWindow.cpp:220
+#: modules/gui/beos/PreferencesWindow.cpp:219
 #: modules/gui/gtk/preferences.c:609
 msgid "Apply"
 msgstr ""
 
-#: modules/gui/beos/PreferencesWindow.cpp:225
+#: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
-#: modules/gui/macosx/output.m:332 modules/gui/macosx/prefs.m:76
+#: modules/gui/macosx/output.m:338 modules/gui/macosx/prefs.m:76
 #: modules/gui/wxwindows/preferences.cpp:254
 msgid "Save"
 msgstr ""
 
-#: modules/gui/beos/PreferencesWindow.cpp:229
+#: modules/gui/beos/PreferencesWindow.cpp:228
 msgid "Defaults"
 msgstr ""
 
@@ -2835,6 +2979,7 @@ msgid "Take Screen Shot"
 msgstr ""
 
 #: modules/gui/beos/VlcWrapper.cpp:185 modules/gui/gtk/menu.c:733
+#: modules/gui/macosx/prefs.m:348
 msgid "None"
 msgstr ""
 
@@ -2861,8 +3006,8 @@ msgstr ""
 msgid "VLC media player"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:652
-#: modules/gui/wxwindows/preferences.cpp:965
+#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:663
+#: modules/gui/wxwindows/preferences.cpp:967
 #: modules/gui/wxwindows/subtitles.cpp:196
 #, fuzzy
 msgid "Open file"
@@ -2890,8 +3035,8 @@ msgstr "
 #: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
 #: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
 #: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:435
-#: modules/gui/macosx/intf.m:301 modules/gui/macosx/intf.m:339
-#: modules/gui/macosx/intf.m:400 modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
+#: modules/gui/macosx/intf.m:423 modules/gui/wxwindows/interface.cpp:347
 msgid "Stop"
 msgstr "óÔÏÐ"
 
@@ -2923,7 +3068,7 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
 #: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:160
-#: modules/gui/macosx/output.m:124 modules/gui/wxwindows/open.cpp:445
+#: modules/gui/macosx/output.m:128 modules/gui/wxwindows/open.cpp:456
 #: modules/gui/wxwindows/streamout.cpp:380
 msgid "Address"
 msgstr ""
@@ -2933,13 +3078,13 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
 #: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
 #: modules/gui/macosx/open.m:159 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:125 modules/gui/wxwindows/open.cpp:430
-#: modules/gui/wxwindows/open.cpp:453 modules/gui/wxwindows/streamout.cpp:390
+#: modules/gui/macosx/output.m:129 modules/gui/wxwindows/open.cpp:441
+#: modules/gui/wxwindows/open.cpp:464 modules/gui/wxwindows/streamout.cpp:390
 msgid "Port"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:127
-#: modules/gui/macosx/output.m:221 modules/gui/macosx/output.m:289
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:131
+#: modules/gui/macosx/output.m:227 modules/gui/macosx/output.m:295
 #: modules/gui/wxwindows/streamout.cpp:341
 msgid "HTTP"
 msgstr ""
@@ -3020,10 +3165,10 @@ msgid ""
 "from local or network sources."
 msgstr ""
 
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
+#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100
 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
@@ -3033,6 +3178,67 @@ msgstr ""
 msgid "Error loading pixmap file: %s"
 msgstr ""
 
+#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
+#, fuzzy
+msgid "Gtk2 interface"
+msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
+
+#: modules/gui/gtk2/gnome2_interface.c:31
+msgid "_New"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:87
+msgid "gnome2"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:112
+msgid "button4"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:122
+#: modules/gui/gtk2/gtk2_interface.c:183
+msgid "button3"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337
+#, fuzzy
+msgid "Save File"
+msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
+
+#: modules/gui/gtk2/gtk2_interface.c:67
+msgid "window1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147
+#: modules/gui/gtk/gtk_interface.c:1373
+msgid "_File"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+msgid "_Edit"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268
+msgid "_View"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569
+msgid "_Help"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:146
+#, fuzzy
+msgid "_About"
+msgstr "íÏÄÕÌÉ..."
+
+#: modules/gui/gtk2/gtk2_interface.c:163
+msgid "button1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:173
+msgid "button2"
+msgstr ""
+
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr ""
@@ -3076,7 +3282,7 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:20 modules/gui/gtk/gnome_interface.c:504
 #: modules/gui/gtk/gnome_interface.c:986 modules/gui/gtk/gtk_interface.c:173
 #: modules/gui/gtk/gtk_interface.c:619 modules/gui/gtk/gtk_interface.c:1399
-#: modules/gui/wxwindows/interface.cpp:230
+#: modules/gui/wxwindows/interface.cpp:231
 #, fuzzy
 msgid "Open a file"
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ"
@@ -3182,25 +3388,25 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:909
 #: modules/gui/gtk/gtk_interface.c:452 modules/gui/gtk/gtk_interface.c:1253
-#: modules/gui/macosx/intf.m:355
+#: modules/gui/macosx/intf.m:378
 msgid "Volume Up"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:916
 #: modules/gui/gtk/gtk_interface.c:459 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:356
+#: modules/gui/macosx/intf.m:379
 msgid "Volume Down"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:923
 #: modules/gui/gtk/gtk_interface.c:466 modules/gui/gtk/gtk_interface.c:1267
-#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:357
+#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:380
 msgid "Mute"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:155 modules/gui/gtk/gnome_interface.c:938
 #: modules/gui/gtk/gtk_interface.c:488 modules/gui/gtk/gtk_interface.c:1289
-#: modules/gui/macosx/intf.m:362 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:385 modules/gui/macosx/intf.m:386
 msgid "Device"
 msgstr ""
 
@@ -3219,18 +3425,10 @@ msgstr ""
 msgid "_Fullscreen"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:183 modules/gui/gtk/gnome_interface.c:966
-#: modules/gui/gtk/gtk_interface.c:553 modules/gui/gtk/gtk_interface.c:1349
-#: modules/gui/macosx/controls.m:526 modules/gui/macosx/intf.m:378
-#: modules/gui/macosx/intf.m:379
-#: modules/video_filter/deinterlace/deinterlace.c:81
-msgid "Deinterlace"
-msgstr ""
-
 #: modules/gui/gtk/gnome_interface.c:190 modules/gui/gtk/gnome_interface.c:973
 #: modules/gui/gtk/gtk_interface.c:560 modules/gui/gtk/gtk_interface.c:1356
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/intf.m:375
-#: modules/gui/macosx/output.m:120 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/intf.m:397 modules/gui/macosx/intf.m:398
+#: modules/gui/macosx/output.m:124 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr ""
 
@@ -3247,19 +3445,19 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
 #: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2005
 #: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:142
-#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:337
+#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:338
 #: modules/gui/wxwindows/open.cpp:278
 msgid "Disc"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:339
+#: modules/gui/wxwindows/interface.cpp:340
 #, fuzzy
 msgid "Net"
 msgstr "óÌÅÄ."
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:343
 msgid "Sat"
 msgstr ""
 
@@ -3323,7 +3521,7 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:1063 modules/gui/gtk/gtk_interface.c:758
 #: modules/gui/gtk/gtk_interface.c:844 modules/gui/gtk/gtk_interface.c:888
 #: modules/gui/gtk/gtk_interface.c:1173
-#: modules/gui/wxwindows/interface.cpp:353
+#: modules/gui/wxwindows/interface.cpp:354
 msgid "Prev"
 msgstr "ðÒÅÄ."
 
@@ -3336,8 +3534,8 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:1056 modules/gui/gtk/gtk_interface.c:769
 #: modules/gui/gtk/gtk_interface.c:852 modules/gui/gtk/gtk_interface.c:896
 #: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:443
-#: modules/gui/macosx/intf.m:303 modules/gui/macosx/intf.m:343
-#: modules/gui/macosx/intf.m:401 modules/gui/wxwindows/interface.cpp:355
+#: modules/gui/macosx/intf.m:326 modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:424 modules/gui/wxwindows/interface.cpp:356
 msgid "Next"
 msgstr "óÌÅÄ."
 
@@ -3438,8 +3636,8 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
 #: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
 #: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:173
-#: modules/gui/macosx/output.m:123 modules/gui/wxwindows/open.cpp:246
-#: modules/gui/wxwindows/open.cpp:343
+#: modules/gui/macosx/output.m:127 modules/gui/wxwindows/open.cpp:246
+#: modules/gui/wxwindows/open.cpp:354
 #: modules/gui/wxwindows/preferences.cpp:778
 #: modules/gui/wxwindows/streamout.cpp:367
 #: modules/gui/wxwindows/subtitles.cpp:107
@@ -3447,24 +3645,24 @@ msgid "Browse..."
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:368
+#: modules/gui/wxwindows/open.cpp:379
 msgid "Disc type"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
 #: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:488
-#: modules/gui/wxwindows/open.cpp:362
+#: modules/gui/wxwindows/open.cpp:373
 msgid "DVD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
 #: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:382
-#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:363
+#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:374
 msgid "VCD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:374
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:385
 msgid "Device name"
 msgstr ""
 
@@ -3475,24 +3673,24 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:547
-#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:409
+#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:420
 msgid "UDP/RTP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
 #: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:548
-#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:421
 msgid "UDP/RTP Multicast"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1727 modules/gui/gtk/gtk_interface.c:2042
 #: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:549
-#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:411
+#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:422
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:467
+#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:478
 msgid "URL"
 msgstr ""
 
@@ -3542,7 +3740,7 @@ msgid "fps"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:116
+#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:120
 #: modules/gui/wxwindows/open.cpp:201 modules/gui/wxwindows/open.cpp:223
 msgid "Settings..."
 msgstr ""
@@ -3622,14 +3820,14 @@ msgid "Destination Target: "
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:128 modules/gui/macosx/output.m:231
-#: modules/gui/macosx/output.m:290 modules/gui/wxwindows/streamout.cpp:342
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/output.m:237
+#: modules/gui/macosx/output.m:296 modules/gui/wxwindows/streamout.cpp:342
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:129 modules/gui/macosx/output.m:241
-#: modules/gui/macosx/output.m:292 modules/gui/wxwindows/streamout.cpp:343
+#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:298 modules/gui/wxwindows/streamout.cpp:343
 msgid "RTP"
 msgstr ""
 
@@ -3651,8 +3849,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:135 modules/gui/macosx/output.m:273
-#: modules/gui/macosx/output.m:319
+#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:279
+#: modules/gui/macosx/output.m:325
 msgid "AVI"
 msgstr ""
 
@@ -3670,11 +3868,6 @@ msgstr ""
 msgid "Gtk+ interface"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
-#: modules/gui/gtk2/gtk2_interface.c:77
-msgid "_File"
-msgstr ""
-
 #: modules/gui/gtk/gtk_interface.c:238
 msgid "_Close"
 msgstr ""
@@ -3692,10 +3885,6 @@ msgstr ""
 msgid "Exit the program"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132
-msgid "_View"
-msgstr ""
-
 #: modules/gui/gtk/gtk_interface.c:294
 #, fuzzy
 msgid "Hide the main interface window"
@@ -3717,10 +3906,6 @@ msgstr ""
 msgid "Configure the application"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139
-msgid "_Help"
-msgstr ""
-
 #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435
 #, fuzzy
 msgid "_About..."
@@ -3831,54 +4016,6 @@ msgstr ""
 msgid "Selected:"
 msgstr ""
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-#, fuzzy
-msgid "Gtk2 interface"
-msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-msgid "_New"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:87
-msgid "gnome2"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:112
-msgid "button4"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:122
-#: modules/gui/gtk2/gtk2_interface.c:183
-msgid "button3"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:331
-#, fuzzy
-msgid "Save File"
-msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-msgid "window1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-msgid "_Edit"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-#, fuzzy
-msgid "_About"
-msgstr "íÏÄÕÌÉ..."
-
-#: modules/gui/gtk2/gtk2_interface.c:163
-msgid "button1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:173
-msgid "button2"
-msgstr ""
-
 #: modules/gui/kde/interface.cpp:88
 msgid "Languages"
 msgstr ""
@@ -3909,228 +4046,228 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:315
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:338
 msgid "About VLC media player"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:344 modules/gui/macosx/controls.m:487
-#: modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:389
 msgid "Half Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:346 modules/gui/macosx/controls.m:488
-#: modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:390
 msgid "Normal Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:348 modules/gui/macosx/controls.m:489
-#: modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/intf.m:391
 msgid "Double Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:491
 #: modules/gui/macosx/controls.m:498 modules/gui/macosx/controls.m:520
-#: modules/gui/macosx/intf.m:371
+#: modules/gui/macosx/intf.m:394
 msgid "Float On Top"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:490
-#: modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/intf.m:392
 msgid "Fit To Screen"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:298
-#: modules/gui/macosx/intf.m:342 modules/gui/macosx/intf.m:402
+#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:321
+#: modules/gui/macosx/intf.m:365 modules/gui/macosx/intf.m:425
 #, fuzzy
 msgid "Previous"
 msgstr "ðÒÅÄÙÄÕÝÉÊ ÆÁÊÌ"
 
-#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:344
+#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:367
 msgid "Loop"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:345
+#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:368
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:346
+#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:369
 #, fuzzy
 msgid "Step Backward"
 msgstr "÷ÅÒÎÕÔØÓÑ ÎÁÚÁÄ"
 
-#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:386
-#: modules/gui/macosx/intf.m:411
+#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:434
 msgid "Info"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:293
+#: modules/gui/macosx/intf.m:316
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:305
+#: modules/gui/macosx/intf.m:328
 msgid "Volume"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:306
+#: modules/gui/macosx/intf.m:329
 msgid "Position"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:312
+#: modules/gui/macosx/intf.m:335
 msgid "Open CrashLog"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:316
+#: modules/gui/macosx/intf.m:339
 msgid "Preferences..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:317
+#: modules/gui/macosx/intf.m:340
 msgid "Hide VLC"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:318
+#: modules/gui/macosx/intf.m:341
 msgid "Hide Others"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:319
+#: modules/gui/macosx/intf.m:342
 msgid "Show All"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:343
 msgid "Quit VLC"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/intf.m:345
 #, fuzzy
 msgid "1:File"
 msgstr "1:óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:346
 #, fuzzy
 msgid "Open..."
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ"
 
-#: modules/gui/macosx/intf.m:324
+#: modules/gui/macosx/intf.m:347
 #, fuzzy
 msgid "Open File..."
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ..."
 
-#: modules/gui/macosx/intf.m:325
+#: modules/gui/macosx/intf.m:348
 #, fuzzy
 msgid "Open Disc..."
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ..."
 
-#: modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:349
 #, fuzzy
 msgid "Open Network..."
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/macosx/intf.m:327
+#: modules/gui/macosx/intf.m:350
 #, fuzzy
 msgid "Open Recent"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/intf.m:1291
+#: modules/gui/macosx/intf.m:351 modules/gui/macosx/intf.m:1314
 msgid "Clear Menu"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:331
+#: modules/gui/macosx/intf.m:354
 msgid "Cut"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:332
+#: modules/gui/macosx/intf.m:355
 msgid "Copy"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:333
+#: modules/gui/macosx/intf.m:356
 #, fuzzy
 msgid "Paste"
 msgstr "ðÁÕÚÁ"
 
-#: modules/gui/macosx/intf.m:334
+#: modules/gui/macosx/intf.m:357
 msgid "Clear"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:337
+#: modules/gui/macosx/intf.m:360
 msgid "Controls"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:358 modules/gui/macosx/intf.m:359
+#: modules/gui/macosx/intf.m:381 modules/gui/macosx/intf.m:382
 msgid "Audio Track"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:372 modules/gui/macosx/intf.m:373
+#: modules/gui/macosx/intf.m:395 modules/gui/macosx/intf.m:396
 msgid "Video Track"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:382
+#: modules/gui/macosx/intf.m:405
 msgid "Minimize Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:406
 #, fuzzy
 msgid "Close Window"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/macosx/intf.m:384
+#: modules/gui/macosx/intf.m:407
 msgid "Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:389
+#: modules/gui/macosx/intf.m:412
 msgid "Bring All to Front"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:391
+#: modules/gui/macosx/intf.m:414
 msgid "Help"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:392
+#: modules/gui/macosx/intf.m:415
 msgid "ReadMe..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:393
+#: modules/gui/macosx/intf.m:416
 msgid "Online Documentation"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/intf.m:417
 msgid "Report a Bug"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/intf.m:418
 #, fuzzy
 msgid "VideoLAN Website"
 msgstr "ëÌÉÅÎÔ VideoLAN"
 
-#: modules/gui/macosx/intf.m:396
+#: modules/gui/macosx/intf.m:419
 msgid "License"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:405
+#: modules/gui/macosx/intf.m:428
 msgid "Error"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:406
+#: modules/gui/macosx/intf.m:429
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:407
+#: modules/gui/macosx/intf.m:430
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:408
+#: modules/gui/macosx/intf.m:431
 #, fuzzy
 msgid "Open Messages Window"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:432
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4210,63 +4347,57 @@ msgstr ""
 msgid "Open VIDEO_TS Directory"
 msgstr ""
 
-#: modules/gui/macosx/output.m:115
+#: modules/gui/macosx/output.m:119
 #, fuzzy
 msgid "Advanced output:"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/macosx/output.m:119
+#: modules/gui/macosx/output.m:123
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:122 modules/gui/macosx/output.m:210
-#: modules/gui/macosx/output.m:285
+#: modules/gui/macosx/output.m:126 modules/gui/macosx/output.m:216
+#: modules/gui/macosx/output.m:291
 #, fuzzy
 msgid "Stream"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/macosx/output.m:126
+#: modules/gui/macosx/output.m:130
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132 modules/gui/wxwindows/streamout.cpp:437
+#: modules/gui/macosx/output.m:136 modules/gui/wxwindows/streamout.cpp:437
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:133
+#: modules/gui/macosx/output.m:137
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:134 modules/gui/macosx/output.m:275
-#: modules/gui/macosx/output.m:317
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:281
+#: modules/gui/macosx/output.m:323
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:274
-#: modules/gui/macosx/output.m:321
+#: modules/gui/macosx/output.m:140 modules/gui/macosx/output.m:280
+#: modules/gui/macosx/output.m:327
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:276
-#: modules/gui/macosx/output.m:323
+#: modules/gui/macosx/output.m:141 modules/gui/macosx/output.m:282
+#: modules/gui/macosx/output.m:329
 msgid "mp4"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139
+#: modules/gui/macosx/output.m:143
 #, fuzzy
 msgid "Transcode options"
 msgstr "ðÒÉÏÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/macosx/output.m:149 modules/gui/macosx/output.m:153
-msgid "Bitrate (bps)"
-msgstr ""
-
-#: modules/gui/macosx/output.m:151
-msgid "mpga"
-msgstr ""
-
-#: modules/gui/macosx/output.m:152
-msgid "a52 "
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:158
+#: modules/gui/wxwindows/streamout.cpp:512
+#: modules/gui/wxwindows/streamout.cpp:549
+msgid "Bitrate (kb/s)"
 msgstr ""
 
 #: modules/gui/macosx/prefs.m:78 modules/gui/wxwindows/preferences.cpp:256
@@ -4278,12 +4409,6 @@ msgstr "
 msgid "Advanced"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:143 modules/gui/macosx/prefs.m:341
-#: modules/gui/macosx/prefs.m:368
-#, fuzzy
-msgid "Auto"
-msgstr "íÏÄÕÌÉ..."
-
 #: modules/gui/ncurses/ncurses.c:66
 #, fuzzy
 msgid "ncurses interface"
@@ -4298,33 +4423,33 @@ msgstr ""
 msgid "Qt interface"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/skins/src/skin_main.cpp:251
-#: modules/gui/skins/src/vlcproc.cpp:338
+#: modules/gui/skins/src/skin_main.cpp:239
+#: modules/gui/skins/src/vlcproc.cpp:339
 #, fuzzy
 msgid "Open a skin file"
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ"
 
-#: modules/gui/skins/src/skin_main.cpp:292
-#: modules/gui/skins/src/skin_main.cpp:293
+#: modules/gui/skins/src/skin_main.cpp:280
+#: modules/gui/skins/src/skin_main.cpp:281
 msgid "Last skin actually used"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:294
-#: modules/gui/skins/src/skin_main.cpp:295
+#: modules/gui/skins/src/skin_main.cpp:282
+#: modules/gui/skins/src/skin_main.cpp:283
 msgid "Config of last used skin"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:296
-#: modules/gui/skins/src/skin_main.cpp:297
+#: modules/gui/skins/src/skin_main.cpp:284
+#: modules/gui/skins/src/skin_main.cpp:285
 msgid "Show application in system tray"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:298
-#: modules/gui/skins/src/skin_main.cpp:299
+#: modules/gui/skins/src/skin_main.cpp:286
+#: modules/gui/skins/src/skin_main.cpp:287
 msgid "Show application in taskbar"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:310
+#: modules/gui/skins/src/skin_main.cpp:298
 #, fuzzy
 msgid "Skinnable Interface"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
@@ -4334,198 +4459,198 @@ msgstr "
 msgid "FileInfo"
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ..."
 
-#: modules/gui/wxwindows/interface.cpp:231
+#: modules/gui/wxwindows/interface.cpp:232
 msgid "Open a DVD or (S)VCD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:232
+#: modules/gui/wxwindows/interface.cpp:233
 #, fuzzy
 msgid "Open a network stream"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/wxwindows/interface.cpp:233
+#: modules/gui/wxwindows/interface.cpp:234
 #, fuzzy
 msgid "Open a satellite stream"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/wxwindows/interface.cpp:234
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:235
+#: modules/gui/wxwindows/interface.cpp:236
 msgid "Exit this program"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:237
+#: modules/gui/wxwindows/interface.cpp:238
 #, fuzzy
 msgid "Open the playlist"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/wxwindows/interface.cpp:238
+#: modules/gui/wxwindows/interface.cpp:239
 msgid "Show the program logs"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:239
+#: modules/gui/wxwindows/interface.cpp:240
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:241
+#: modules/gui/wxwindows/interface.cpp:242
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:243
+#: modules/gui/wxwindows/interface.cpp:244
 msgid "About this program"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:247
+#: modules/gui/wxwindows/interface.cpp:248
 #, fuzzy
 msgid "&Open File..."
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ..."
 
-#: modules/gui/wxwindows/interface.cpp:249
+#: modules/gui/wxwindows/interface.cpp:250
 #, fuzzy
 msgid "Open &Disc..."
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ..."
 
-#: modules/gui/wxwindows/interface.cpp:251
+#: modules/gui/wxwindows/interface.cpp:252
 #, fuzzy
 msgid "&Network Stream..."
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/wxwindows/interface.cpp:254
+#: modules/gui/wxwindows/interface.cpp:255
 #, fuzzy
 msgid "&Satellite Stream..."
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:260
 #, fuzzy
 msgid "&Eject Disc"
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:264
 msgid "E&xit"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:267
+#: modules/gui/wxwindows/interface.cpp:268
 #, fuzzy
 msgid "&Playlist..."
 msgstr "óÐÉÓÏË ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ..."
 
-#: modules/gui/wxwindows/interface.cpp:269
+#: modules/gui/wxwindows/interface.cpp:270
 #, fuzzy
-msgid "&Logs..."
+msgid "&Messages..."
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ..."
 
-#: modules/gui/wxwindows/interface.cpp:270
+#: modules/gui/wxwindows/interface.cpp:271
 #, fuzzy
 msgid "&File info..."
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ..."
 
-#: modules/gui/wxwindows/interface.cpp:275
+#: modules/gui/wxwindows/interface.cpp:276
 msgid "&Preferences..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:292
+#: modules/gui/wxwindows/interface.cpp:293
 #, fuzzy
 msgid "&About..."
 msgstr "íÏÄÕÌÉ..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:297
 #, fuzzy
 msgid "&File"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:298
 msgid "&View"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:298
+#: modules/gui/wxwindows/interface.cpp:299
 #, fuzzy
 msgid "&Settings"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/gui/wxwindows/interface.cpp:299
-#: modules/gui/wxwindows/interface.cpp:476
-#: modules/gui/wxwindows/interface.cpp:524
+#: modules/gui/wxwindows/interface.cpp:300
+#: modules/gui/wxwindows/interface.cpp:478
+#: modules/gui/wxwindows/interface.cpp:526
 msgid "&Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:300
-#: modules/gui/wxwindows/interface.cpp:495
-#: modules/gui/wxwindows/interface.cpp:528
+#: modules/gui/wxwindows/interface.cpp:301
+#: modules/gui/wxwindows/interface.cpp:497
+#: modules/gui/wxwindows/interface.cpp:530
 msgid "&Video"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:301
-#: modules/gui/wxwindows/interface.cpp:514
-#: modules/gui/wxwindows/interface.cpp:532
+#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:516
+#: modules/gui/wxwindows/interface.cpp:534
 msgid "&Navigation"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:303
 msgid "&Help"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:318
+#: modules/gui/wxwindows/interface.cpp:319
 #, fuzzy
 msgid "Stop current playlist item"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:320
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:320
+#: modules/gui/wxwindows/interface.cpp:321
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:321
+#: modules/gui/wxwindows/interface.cpp:322
 #: modules/gui/wxwindows/playlist.cpp:351
 #, fuzzy
 msgid "Open playlist"
 msgstr "ïÔËÒÙÔØ ÓÐÉÓÏË ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/wxwindows/interface.cpp:322
+#: modules/gui/wxwindows/interface.cpp:323
 #, fuzzy
 msgid "Previous playlist item"
 msgstr "ðÒÅÄÙÄÕÝÉÊ ÆÁÊÌ"
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:324
 #, fuzzy
 msgid "Next playlist item"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:325
 #, fuzzy
 msgid "Play slower"
 msgstr "÷ÏÓÐÒÏÉÚ×ÏÄÉÔØ ÍÅÄÌÅÎÎÅÅ"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:326
 #, fuzzy
 msgid "Play faster"
 msgstr "÷ÏÓÐÒÏÉÚ×ÏÄÉÔØ ÂÙÓÔÒÅÅ"
 
-#: modules/gui/wxwindows/interface.cpp:560
+#: modules/gui/wxwindows/interface.cpp:561
 #, fuzzy
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/wxwindows/interface.cpp:561
+#: modules/gui/wxwindows/interface.cpp:562
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:562
+#: modules/gui/wxwindows/interface.cpp:563
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:564
+#: modules/gui/wxwindows/interface.cpp:565
 #, fuzzy
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
@@ -4534,7 +4659,7 @@ msgstr ""
 "üÔÏ ËÌÉÅÎÔ VideoLAN, DVD, MPEG É DivX-ÐÒÏÉÇÒÙ×ÁÔÅÌÑ. ÷Ù ÍÏÖÅÔÅ ×ÏÓÐÒÏÉÚ×ÅÓÔÉ "
 "MPEG É MPEG-2 ÆÁÊÌÙ ÉÚ ÆÁÊÌÁ ÉÌÉ Ó ÉÓÔÏÞÎÉËÁ × ÓÅÔÉ."
 
-#: modules/gui/wxwindows/interface.cpp:568
+#: modules/gui/wxwindows/interface.cpp:569
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "íÏÄÕÌÉ..."
@@ -4547,11 +4672,11 @@ msgstr ""
 msgid "Video menu"
 msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:139
+#: modules/gui/wxwindows/menus.cpp:141
 msgid "Input menu"
 msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:329
+#: modules/gui/wxwindows/menus.cpp:334
 msgid "Empty"
 msgstr ""
 
@@ -4588,15 +4713,15 @@ msgstr "
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:361
+#: modules/gui/wxwindows/open.cpp:372
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:364
+#: modules/gui/wxwindows/open.cpp:375
 msgid "CD Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:837 modules/gui/wxwindows/streamout.cpp:640
+#: modules/gui/wxwindows/open.cpp:848 modules/gui/wxwindows/streamout.cpp:640
 #, fuzzy
 msgid "Save file"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
@@ -4669,8 +4794,9 @@ msgid "No configuration options available"
 msgstr ""
 
 #: modules/gui/wxwindows/preferences.cpp:865
-msgid "Advanced..."
-msgstr ""
+#, fuzzy
+msgid "Advanced options"
+msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
 #: modules/gui/wxwindows/streamout.cpp:166
 msgid "Stream output MRL"
@@ -4711,11 +4837,6 @@ msgstr ""
 msgid "Video codec"
 msgstr "ëÌÉÅÎÔ VideoLAN"
 
-#: modules/gui/wxwindows/streamout.cpp:512
-#: modules/gui/wxwindows/streamout.cpp:549
-msgid "Bitrate (kb/s)"
-msgstr ""
-
 #: modules/gui/wxwindows/streamout.cpp:543
 #, fuzzy
 msgid "Audio codec"
@@ -4836,6 +4957,10 @@ msgstr "
 msgid "Using the logger interface plugin..."
 msgstr ""
 
+#: modules/misc/memcpy/memcpyaltivec.c:52
+msgid "AltiVec memcpy"
+msgstr ""
+
 #: modules/misc/memcpy/memcpy.c:81
 msgid "libc memcpy"
 msgstr ""
@@ -4852,10 +4977,6 @@ msgstr ""
 msgid "MMX EXT memcpy"
 msgstr ""
 
-#: modules/misc/memcpy/memcpyaltivec.c:52
-msgid "AltiVec memcpy"
-msgstr ""
-
 #: modules/misc/network/ipv4.c:85
 msgid "IPv4 network abstraction layer"
 msgstr ""
@@ -4868,6 +4989,10 @@ msgstr ""
 msgid "Qt Embedded GUI helper"
 msgstr ""
 
+#: modules/misc/sap.c:131
+msgid "SAP"
+msgstr ""
+
 #: modules/misc/sap.c:134
 #, fuzzy
 msgid "SAP interface"
@@ -4996,7 +5121,7 @@ msgid "Set image contrast"
 msgstr ""
 
 #: modules/video_filter/adjust.c:61
-msgid "Set the image contrast. Defaults to 1"
+msgid "Set the image contrast, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:62
@@ -5012,7 +5137,7 @@ msgid "Set image saturation"
 msgstr ""
 
 #: modules/video_filter/adjust.c:65
-msgid "Set the image saturation. Defaults to 1"
+msgid "Set the image saturation, between 0 and 3. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:66
@@ -5020,7 +5145,7 @@ msgid "Set image brightness"
 msgstr ""
 
 #: modules/video_filter/adjust.c:67
-msgid "Set the image brightness. Defaults to 1"
+msgid "Set the image brightness, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:71
@@ -5062,7 +5187,9 @@ msgid "Crop geometry"
 msgstr ""
 
 #: modules/video_filter/crop.c:55
-msgid "Set the geometry of the zone to crop"
+msgid ""
+"Set the geometry of the zone to crop. This is set as width x heigth + left "
+"offset + top offset."
 msgstr ""
 
 #: modules/video_filter/crop.c:57
@@ -5341,11 +5468,21 @@ msgstr ""
 msgid "Use shared memory to communicate between VLC and the X server."
 msgstr ""
 
-#: modules/video_output/x11/x11.c:62
+#: modules/video_output/x11/x11.c:61 modules/video_output/x11/xvideo.c:72
+msgid "choose the screen to be used for fullscreen mode."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:63 modules/video_output/x11/xvideo.c:74
+msgid ""
+"Choose the screen you want to use in fullscreen mode. For instance set it to "
+"0 for first screen, 1 for the second."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:67
 msgid "X11"
 msgstr ""
 
-#: modules/video_output/x11/x11.c:68
+#: modules/video_output/x11/x11.c:76
 msgid "X11 video output"
 msgstr ""
 
@@ -5369,11 +5506,11 @@ msgid ""
 "to improve performances by using the most efficient one."
 msgstr ""
 
-#: modules/video_output/x11/xvideo.c:73
+#: modules/video_output/x11/xvideo.c:78
 msgid "XVideo"
 msgstr ""
 
-#: modules/video_output/x11/xvideo.c:81
+#: modules/video_output/x11/xvideo.c:90
 msgid "XVideo extension video output"
 msgstr ""
 
@@ -5418,6 +5555,14 @@ msgstr ""
 msgid "xosd interface"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
+#, fuzzy
+#~ msgid "SAP interface module"
+#~ msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
+
+#, fuzzy
+#~ msgid "Auto"
+#~ msgstr "íÏÄÕÌÉ..."
+
 #, fuzzy
 #~ msgid "File read"
 #~ msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
diff --git a/po/sv.po b/po/sv.po
index e6e89d3736..1b1e8bc0d0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-05-24 14:40+0200\n"
+"POT-Creation-Date: 2003-05-27 23:43+0200\n"
 "PO-Revision-Date: 2002-07-23 23:00+0200\n"
 "Last-Translator: Joel Arvidsson <dogai@privat.utfors.se>\n"
 "Language-Team: \n"
@@ -27,7 +27,7 @@ msgid "Audio channels"
 msgstr "Kanal:"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:165 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:358
 #, fuzzy
@@ -116,7 +116,7 @@ msgstr "F
 
 #: src/input/input_programs.c:94 modules/gui/gtk/gnome_interface.c:1078
 #: modules/gui/gtk/gtk_interface.c:1199 modules/gui/kde/interface.cpp:142
-#: modules/gui/macosx/intf.m:347 modules/gui/macosx/intf.m:348
+#: modules/gui/macosx/intf.m:370 modules/gui/macosx/intf.m:371
 msgid "Program"
 msgstr ""
 
@@ -124,18 +124,18 @@ msgstr ""
 #: modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
-#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:349
-#: modules/gui/macosx/intf.m:350 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:382
+#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:372
+#: modules/gui/macosx/intf.m:373 modules/gui/macosx/open.m:149
+#: modules/gui/wxwindows/open.cpp:393
 msgid "Title"
 msgstr "Titel"
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
 #: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
-#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:351
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:388
+#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:374
+#: modules/gui/macosx/intf.m:375 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:399
 msgid "Chapter"
 msgstr "Kapitel"
 
@@ -187,7 +187,7 @@ msgstr "Kapitel"
 msgid "Previous Chapter"
 msgstr "Kapitel"
 
-#: src/input/input_programs.c:668
+#: src/input/input_programs.c:668 src/video_output/video_output.c:397
 msgid "Disable"
 msgstr ""
 
@@ -200,44 +200,44 @@ msgstr ""
 msgid "C"
 msgstr "sv"
 
-#: src/libvlc.c:301 src/libvlc.c:1357
+#: src/libvlc.c:301 src/libvlc.c:1364
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
 "\n"
 msgstr ""
 
-#: src/libvlc.c:1189 src/misc/configuration.c:961
+#: src/libvlc.c:1196 src/misc/configuration.c:961
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:1206 src/misc/configuration.c:946
+#: src/libvlc.c:1213 src/misc/configuration.c:946
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:1209 src/misc/configuration.c:953
+#: src/libvlc.c:1216 src/misc/configuration.c:953
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:1215
+#: src/libvlc.c:1222
 msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:1216
+#: src/libvlc.c:1223
 msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:1332 src/libvlc.c:1387 src/libvlc.c:1411
+#: src/libvlc.c:1339 src/libvlc.c:1394 src/libvlc.c:1418
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
 msgstr ""
 
-#: src/libvlc.c:1360
+#: src/libvlc.c:1367
 msgid "[module]              [description]\n"
 msgstr ""
 
-#: src/libvlc.c:1405
+#: src/libvlc.c:1412
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -955,15 +955,15 @@ msgstr ""
 #: modules/demux/ogg.c:554 modules/demux/ogg.c:813 modules/demux/ogg.c:986
 #: modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m:354 modules/gui/macosx/output.m:150
+#: modules/gui/macosx/intf.m:377 modules/gui/macosx/output.m:155
 msgid "Audio"
 msgstr ""
 
 #: src/libvlc.h:473 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:893 modules/gui/gtk/gnome_interface.c:1099
-#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:365
-#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:140
+#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:388
+#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:144
 #: modules/misc/dummy/dummy.c:83 modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr ""
@@ -994,8 +994,8 @@ msgstr ""
 #: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
-#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:297
-#: modules/gui/macosx/intf.m:385 modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:408 modules/gui/wxwindows/interface.cpp:352
 #: modules/gui/wxwindows/playlist.cpp:102
 msgid "Playlist"
 msgstr ""
@@ -1038,12 +1038,41 @@ msgstr ""
 msgid "boolean"
 msgstr ""
 
-#: src/video_output/video_output.c:382 modules/gui/beos/VideoOutput.cpp:1138
+#: src/video_output/video_output.c:384 modules/gui/beos/VideoOutput.cpp:1138
 #: modules/gui/macosx/controls.m:342 modules/gui/macosx/controls.m:486
-#: modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/intf.m:393
 msgid "Fullscreen"
 msgstr "Helskärm"
 
+#: src/video_output/video_output.c:395 modules/gui/gtk/gnome_interface.c:183
+#: modules/gui/gtk/gnome_interface.c:966 modules/gui/gtk/gtk_interface.c:553
+#: modules/gui/gtk/gtk_interface.c:1349 modules/gui/macosx/controls.m:526
+#: modules/gui/macosx/intf.m:401 modules/gui/macosx/intf.m:402
+#: modules/video_filter/deinterlace/deinterlace.c:81
+msgid "Deinterlace"
+msgstr ""
+
+#: src/video_output/video_output.c:399
+#, fuzzy
+msgid "Discard"
+msgstr "Skiva"
+
+#: src/video_output/video_output.c:401
+msgid "Blend"
+msgstr ""
+
+#: src/video_output/video_output.c:403
+msgid "Mean"
+msgstr ""
+
+#: src/video_output/video_output.c:405
+msgid "Bob"
+msgstr ""
+
+#: src/video_output/video_output.c:407
+msgid "Linear"
+msgstr ""
+
 #: modules/access/cdda.c:86 modules/access/file.c:69 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
 #: modules/access/v4l/v4l.c:64
@@ -1178,6 +1207,26 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
+#: modules/access_output/dummy.c:56
+#, fuzzy
+msgid "Dummy stream ouput"
+msgstr "Paus"
+
+#: modules/access_output/file.c:58
+#, fuzzy
+msgid "File stream ouput"
+msgstr "Paus"
+
+#: modules/access_output/http.c:54
+#, fuzzy
+msgid "HTTP stream ouput"
+msgstr "Paus"
+
+#: modules/access_output/udp.c:73
+#, fuzzy
+msgid "UDP stream ouput"
+msgstr "Paus"
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr ""
@@ -1262,35 +1311,6 @@ msgstr ""
 msgid "VCD input"
 msgstr ""
 
-#: modules/access/vlcs.c:131 modules/misc/sap.c:131
-msgid "SAP"
-msgstr ""
-
-#: modules/access/vlcs.c:134
-#, fuzzy
-msgid "SAP interface module"
-msgstr "Göm andra"
-
-#: modules/access_output/dummy.c:56
-#, fuzzy
-msgid "Dummy stream ouput"
-msgstr "Paus"
-
-#: modules/access_output/file.c:58
-#, fuzzy
-msgid "File stream ouput"
-msgstr "Paus"
-
-#: modules/access_output/http.c:54
-#, fuzzy
-msgid "HTTP stream ouput"
-msgstr "Paus"
-
-#: modules/access_output/udp.c:73
-#, fuzzy
-msgid "UDP stream ouput"
-msgstr "Paus"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr ""
@@ -1440,13 +1460,13 @@ msgstr ""
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:159 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:161 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:371
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:201 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:203 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:387
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1597,23 +1617,147 @@ msgstr ""
 msgid "AAC audio decoder (using libfaad2)"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:154
-msgid "ffmpeg"
+#: modules/codec/ffmpeg/ffmpeg.c:86
+msgid "Direct rendering"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:88
+msgid "Error resilience"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:90
+msgid ""
+"ffmpeg can make errors resiliences.          \n"
+"Nevertheless, with buggy encoder (like ISO MPEG-4 encoder from M$) this will "
+"produce a lot of errors.\n"
+"Valid range is -1 to 99 (-1 disable all errors resiliences)."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:95
+msgid "Workaround bugs"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:97
+msgid ""
+"Try to fix some bugs\n"
+"1  autodetect\n"
+"2  old msmpeg4\n"
+"4  xvid interlaced\n"
+"8  ump4 \n"
+"16 no padding\n"
+"32 ac vlc64 Qpel chroma"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:106
+msgid "Hurry up"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:108
+msgid ""
+"Allow the decoder to partially decode or skip frame(s) when there not enough "
+"time.\n"
+" It's usefull with low CPU power but it could produce broken pictures."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:112
+#, fuzzy
+msgid "Truncated stream"
+msgstr "Spela upp"
+
+#: modules/codec/ffmpeg/ffmpeg.c:113
+msgid "truncated stream -1:auto,0:disable,:1:enable"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:115
+msgid "Post processing quality"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:117
+msgid ""
+"Quality of post processing\n"
+"Valid range is 0 to 6"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:120
+msgid "Ffmpeg postproc filter chains"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:157
-msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgid "Ffmpeg postprocessing module"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:159
+msgid "Auto-level Post processing quality"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:161
+msgid ""
+"Post processing quality is selected upon time left but no more than "
+"requested quality\n"
+"Not yet implemented !"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:165
+msgid "Force vertical luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:166
+msgid "Force vertical luminance deblocking (override other settings)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:168
-msgid "Post processing"
+msgid "Force horizontal luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:169
+msgid "Force horizontal luminance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:171
+msgid "Force vertical chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:172
+msgid "Force vertical chrominance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:174
+msgid "Force horizontal chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:175
+msgid "Force horizontal chrominance deblocking (override other settings)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:177
-msgid "ffmpeg postprocessing module"
+msgid "Force luminance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:178
+msgid "Force luminance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:180
+msgid "Force chrominance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:181
+msgid "Force chrominance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:184
+msgid "ffmpeg"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:187
+msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:195
+msgid "Post processing"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:204
+#: modules/codec/ffmpeg/ffmpeg.c:215
 msgid "ffmpeg chroma conversion"
 msgstr ""
 
@@ -1633,7 +1777,7 @@ msgstr ""
 msgid "flac audio decoder"
 msgstr ""
 
-#: modules/codec/libmpeg2.c:89
+#: modules/codec/libmpeg2.c:90
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr ""
 
@@ -1649,14 +1793,14 @@ msgstr ""
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr ""
 
-#: modules/codec/mpeg_video/idct/idct.c:41
-msgid "IDCT"
-msgstr ""
-
 #: modules/codec/mpeg_video/idct/idctaltivec.c:45
 msgid "AltiVec IDCT"
 msgstr ""
 
+#: modules/codec/mpeg_video/idct/idct.c:41
+msgid "IDCT"
+msgstr ""
+
 #: modules/codec/mpeg_video/idct/idctclassic.c:41
 msgid "classic IDCT"
 msgstr ""
@@ -1669,10 +1813,6 @@ msgstr ""
 msgid "MMX EXT IDCT"
 msgstr ""
 
-#: modules/codec/mpeg_video/motion/motion.c:42
-msgid "motion compensation"
-msgstr ""
-
 #: modules/codec/mpeg_video/motion/motion3dnow.c:44
 msgid "3D Now! motion compensation"
 msgstr ""
@@ -1681,6 +1821,10 @@ msgstr ""
 msgid "AltiVec motion compensation"
 msgstr ""
 
+#: modules/codec/mpeg_video/motion/motion.c:42
+msgid "motion compensation"
+msgstr ""
+
 #: modules/codec/mpeg_video/motion/motionmmx.c:45
 msgid "MMX motion compensation"
 msgstr ""
@@ -1848,20 +1992,20 @@ msgstr "Avsluta VLC"
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
 #: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
-#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:879
-#: modules/gui/macosx/intf.m:880 modules/gui/macosx/intf.m:881
-#: modules/gui/wxwindows/interface.cpp:810
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:902
+#: modules/gui/macosx/intf.m:903 modules/gui/macosx/intf.m:904
+#: modules/gui/wxwindows/interface.cpp:811
 msgid "Pause"
 msgstr "Paus"
 
 #: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
 #: modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
-#: modules/gui/macosx/intf.m:300 modules/gui/macosx/intf.m:338
-#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:886
-#: modules/gui/macosx/intf.m:887 modules/gui/macosx/intf.m:888
-#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:348
-#: modules/gui/wxwindows/interface.cpp:815
+#: modules/gui/macosx/intf.m:323 modules/gui/macosx/intf.m:361
+#: modules/gui/macosx/intf.m:422 modules/gui/macosx/intf.m:909
+#: modules/gui/macosx/intf.m:910 modules/gui/macosx/intf.m:911
+#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:816
 msgid "Play"
 msgstr "Spela upp"
 
@@ -1915,8 +2059,8 @@ msgstr ""
 #: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:821
 #: modules/demux/ogg.c:994 modules/gui/gtk/gnome_interface.c:148
 #: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
-#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:360
-#: modules/gui/macosx/intf.m:361
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:384
 #, fuzzy
 msgid "Channels"
 msgstr "Kanal:"
@@ -1942,7 +2086,7 @@ msgstr "Paus"
 #: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:554
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:813 modules/demux/ogg.c:893 modules/demux/ogg.c:986
-#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:130
+#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134
 msgid "Type"
 msgstr ""
 
@@ -2583,7 +2727,7 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:201
 #: modules/gui/beos/InterfaceWindow.cpp:300
 #: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:304 modules/gui/macosx/prefs.m:75
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/prefs.m:75
 #: modules/gui/wxwindows/preferences.cpp:229
 msgid "Preferences"
 msgstr ""
@@ -2592,7 +2736,7 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:298
 #: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
 #: modules/gui/kde/info.cpp:9 modules/gui/kde/messages.cpp:8
-#: modules/gui/macosx/intf.m:310 modules/gui/macosx/intf.m:387
+#: modules/gui/macosx/intf.m:333 modules/gui/macosx/intf.m:410
 #: modules/gui/wxwindows/messages.cpp:79
 msgid "Messages"
 msgstr ""
@@ -2607,16 +2751,16 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
 #: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
 #: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:264
-#: modules/gui/macosx/output.m:121 modules/gui/macosx/output.m:194
-#: modules/gui/macosx/output.m:279 modules/gui/wxwindows/interface.cpp:335
+#: modules/gui/macosx/output.m:125 modules/gui/macosx/output.m:200
+#: modules/gui/macosx/output.m:285 modules/gui/wxwindows/interface.cpp:336
 #: modules/gui/wxwindows/open.cpp:276 modules/gui/wxwindows/streamout.cpp:340
 msgid "File"
 msgstr "Arkiv"
 
 #: modules/gui/beos/InterfaceWindow.cpp:240
 #: modules/gui/beos/PlayListWindow.cpp:84
-#: modules/gui/gtk/gnome_interface.c:2179
-#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332
 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677
 msgid "Open File"
 msgstr "Öppna fil"
@@ -2639,7 +2783,7 @@ msgid "About"
 msgstr "Om VLC"
 
 #: modules/gui/beos/InterfaceWindow.cpp:256 modules/gui/kde/interface.cpp:93
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/intf.m:377
+#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:400
 msgid "Subtitles"
 msgstr "Undertext"
 
@@ -2677,8 +2821,8 @@ msgid "Speed"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:286 modules/gui/macosx/controls.m:422
-#: modules/gui/macosx/intf.m:299 modules/gui/macosx/intf.m:341
-#: modules/gui/wxwindows/interface.cpp:357
+#: modules/gui/macosx/intf.m:322 modules/gui/macosx/intf.m:364
+#: modules/gui/wxwindows/interface.cpp:358
 msgid "Slower"
 msgstr "Slow Motion"
 
@@ -2687,13 +2831,13 @@ msgid "Normal"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:290 modules/gui/macosx/controls.m:421
-#: modules/gui/macosx/intf.m:302 modules/gui/macosx/intf.m:340
-#: modules/gui/wxwindows/interface.cpp:359
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/wxwindows/interface.cpp:360
 #, fuzzy
 msgid "Faster"
 msgstr "Spola framåt"
 
-#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:381
+#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:404
 msgid "Window"
 msgstr "Fönster"
 
@@ -2707,7 +2851,7 @@ msgstr "Spola fram
 #: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
 #: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
 #: modules/gui/gtk/preferences.c:605 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:117
+#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:121
 #: modules/gui/wxwindows/fileinfo.cpp:96
 #: modules/gui/wxwindows/messages.cpp:102 modules/gui/wxwindows/open.cpp:267
 #: modules/gui/wxwindows/preferences.cpp:250
@@ -2729,17 +2873,17 @@ msgstr "Markera allt"
 msgid "Drop files to play"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:167
+#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:169
 #: modules/gui/wxwindows/playlist.cpp:154
 #, fuzzy
 msgid "Close"
 msgstr "Radera"
 
-#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:330
+#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:353
 msgid "Edit"
 msgstr "Redigera"
 
-#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:335
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:358
 #: modules/gui/macosx/playlist.m:180
 msgid "Select All"
 msgstr "Markera allt"
@@ -2792,24 +2936,24 @@ msgstr ""
 #: modules/gui/beos/PreferencesWindow.cpp:44
 #: modules/gui/beos/PreferencesWindow.cpp:46
 #: modules/gui/beos/PreferencesWindow.cpp:98
-#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:607
-#: modules/gui/macosx/prefs.m:615 modules/gui/macosx/prefs.m:685
+#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:690
+#: modules/gui/macosx/prefs.m:698 modules/gui/macosx/prefs.m:768
 msgid "Modules"
 msgstr ""
 
-#: modules/gui/beos/PreferencesWindow.cpp:220
+#: modules/gui/beos/PreferencesWindow.cpp:219
 #: modules/gui/gtk/preferences.c:609
 msgid "Apply"
 msgstr ""
 
-#: modules/gui/beos/PreferencesWindow.cpp:225
+#: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
-#: modules/gui/macosx/output.m:332 modules/gui/macosx/prefs.m:76
+#: modules/gui/macosx/output.m:338 modules/gui/macosx/prefs.m:76
 #: modules/gui/wxwindows/preferences.cpp:254
 msgid "Save"
 msgstr ""
 
-#: modules/gui/beos/PreferencesWindow.cpp:229
+#: modules/gui/beos/PreferencesWindow.cpp:228
 msgid "Defaults"
 msgstr ""
 
@@ -2847,6 +2991,7 @@ msgid "Take Screen Shot"
 msgstr ""
 
 #: modules/gui/beos/VlcWrapper.cpp:185 modules/gui/gtk/menu.c:733
+#: modules/gui/macosx/prefs.m:348
 msgid "None"
 msgstr ""
 
@@ -2873,8 +3018,8 @@ msgstr ""
 msgid "VLC media player"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:652
-#: modules/gui/wxwindows/preferences.cpp:965
+#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:663
+#: modules/gui/wxwindows/preferences.cpp:967
 #: modules/gui/wxwindows/subtitles.cpp:196
 #, fuzzy
 msgid "Open file"
@@ -2901,8 +3046,8 @@ msgstr "Spela upp"
 #: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
 #: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
 #: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:435
-#: modules/gui/macosx/intf.m:301 modules/gui/macosx/intf.m:339
-#: modules/gui/macosx/intf.m:400 modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
+#: modules/gui/macosx/intf.m:423 modules/gui/wxwindows/interface.cpp:347
 msgid "Stop"
 msgstr "Stopp"
 
@@ -2934,7 +3079,7 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
 #: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:160
-#: modules/gui/macosx/output.m:124 modules/gui/wxwindows/open.cpp:445
+#: modules/gui/macosx/output.m:128 modules/gui/wxwindows/open.cpp:456
 #: modules/gui/wxwindows/streamout.cpp:380
 msgid "Address"
 msgstr "Adress"
@@ -2944,13 +3089,13 @@ msgstr "Adress"
 #: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
 #: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
 #: modules/gui/macosx/open.m:159 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:125 modules/gui/wxwindows/open.cpp:430
-#: modules/gui/wxwindows/open.cpp:453 modules/gui/wxwindows/streamout.cpp:390
+#: modules/gui/macosx/output.m:129 modules/gui/wxwindows/open.cpp:441
+#: modules/gui/wxwindows/open.cpp:464 modules/gui/wxwindows/streamout.cpp:390
 msgid "Port"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:127
-#: modules/gui/macosx/output.m:221 modules/gui/macosx/output.m:289
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:131
+#: modules/gui/macosx/output.m:227 modules/gui/macosx/output.m:295
 #: modules/gui/wxwindows/streamout.cpp:341
 msgid "HTTP"
 msgstr ""
@@ -3033,10 +3178,10 @@ msgid ""
 "from local or network sources."
 msgstr ""
 
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
+#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100
 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
@@ -3046,6 +3191,69 @@ msgstr ""
 msgid "Error loading pixmap file: %s"
 msgstr ""
 
+#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
+#, fuzzy
+msgid "Gtk2 interface"
+msgstr "Göm andra"
+
+#: modules/gui/gtk2/gnome2_interface.c:31
+msgid "_New"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:87
+msgid "gnome2"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:112
+msgid "button4"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:122
+#: modules/gui/gtk2/gtk2_interface.c:183
+msgid "button3"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337
+#, fuzzy
+msgid "Save File"
+msgstr "Nästa file"
+
+#: modules/gui/gtk2/gtk2_interface.c:67
+#, fuzzy
+msgid "window1"
+msgstr "Fönster"
+
+#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147
+#: modules/gui/gtk/gtk_interface.c:1373
+msgid "_File"
+msgstr "_Fil"
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+#, fuzzy
+msgid "_Edit"
+msgstr "Redigera"
+
+#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268
+msgid "_View"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569
+msgid "_Help"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:146
+#, fuzzy
+msgid "_About"
+msgstr "Om VLC"
+
+#: modules/gui/gtk2/gtk2_interface.c:163
+msgid "button1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:173
+msgid "button2"
+msgstr ""
+
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr ""
@@ -3089,7 +3297,7 @@ msgstr "_
 #: modules/gui/gtk/gnome_interface.c:20 modules/gui/gtk/gnome_interface.c:504
 #: modules/gui/gtk/gnome_interface.c:986 modules/gui/gtk/gtk_interface.c:173
 #: modules/gui/gtk/gtk_interface.c:619 modules/gui/gtk/gtk_interface.c:1399
-#: modules/gui/wxwindows/interface.cpp:230
+#: modules/gui/wxwindows/interface.cpp:231
 #, fuzzy
 msgid "Open a file"
 msgstr "Öppna fil"
@@ -3192,25 +3400,25 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:909
 #: modules/gui/gtk/gtk_interface.c:452 modules/gui/gtk/gtk_interface.c:1253
-#: modules/gui/macosx/intf.m:355
+#: modules/gui/macosx/intf.m:378
 msgid "Volume Up"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:916
 #: modules/gui/gtk/gtk_interface.c:459 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:356
+#: modules/gui/macosx/intf.m:379
 msgid "Volume Down"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:923
 #: modules/gui/gtk/gtk_interface.c:466 modules/gui/gtk/gtk_interface.c:1267
-#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:357
+#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:380
 msgid "Mute"
 msgstr "Stäng av ljudet"
 
 #: modules/gui/gtk/gnome_interface.c:155 modules/gui/gtk/gnome_interface.c:938
 #: modules/gui/gtk/gtk_interface.c:488 modules/gui/gtk/gtk_interface.c:1289
-#: modules/gui/macosx/intf.m:362 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:385 modules/gui/macosx/intf.m:386
 msgid "Device"
 msgstr ""
 
@@ -3229,18 +3437,10 @@ msgstr ""
 msgid "_Fullscreen"
 msgstr "_Helskärm"
 
-#: modules/gui/gtk/gnome_interface.c:183 modules/gui/gtk/gnome_interface.c:966
-#: modules/gui/gtk/gtk_interface.c:553 modules/gui/gtk/gtk_interface.c:1349
-#: modules/gui/macosx/controls.m:526 modules/gui/macosx/intf.m:378
-#: modules/gui/macosx/intf.m:379
-#: modules/video_filter/deinterlace/deinterlace.c:81
-msgid "Deinterlace"
-msgstr ""
-
 #: modules/gui/gtk/gnome_interface.c:190 modules/gui/gtk/gnome_interface.c:973
 #: modules/gui/gtk/gtk_interface.c:560 modules/gui/gtk/gtk_interface.c:1356
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/intf.m:375
-#: modules/gui/macosx/output.m:120 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/intf.m:397 modules/gui/macosx/intf.m:398
+#: modules/gui/macosx/output.m:124 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr "Helskärm"
 
@@ -3257,18 +3457,18 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
 #: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2005
 #: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:142
-#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:337
+#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:338
 #: modules/gui/wxwindows/open.cpp:278
 msgid "Disc"
 msgstr "Skiva"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:339
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Net"
 msgstr "Nätverk"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:343
 msgid "Sat"
 msgstr ""
 
@@ -3330,7 +3530,7 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1063 modules/gui/gtk/gtk_interface.c:758
 #: modules/gui/gtk/gtk_interface.c:844 modules/gui/gtk/gtk_interface.c:888
 #: modules/gui/gtk/gtk_interface.c:1173
-#: modules/gui/wxwindows/interface.cpp:353
+#: modules/gui/wxwindows/interface.cpp:354
 msgid "Prev"
 msgstr "Föregående objekt"
 
@@ -3343,8 +3543,8 @@ msgstr "F
 #: modules/gui/gtk/gnome_interface.c:1056 modules/gui/gtk/gtk_interface.c:769
 #: modules/gui/gtk/gtk_interface.c:852 modules/gui/gtk/gtk_interface.c:896
 #: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:443
-#: modules/gui/macosx/intf.m:303 modules/gui/macosx/intf.m:343
-#: modules/gui/macosx/intf.m:401 modules/gui/wxwindows/interface.cpp:355
+#: modules/gui/macosx/intf.m:326 modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:424 modules/gui/wxwindows/interface.cpp:356
 msgid "Next"
 msgstr "Nästa objekt"
 
@@ -3440,8 +3640,8 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
 #: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
 #: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:173
-#: modules/gui/macosx/output.m:123 modules/gui/wxwindows/open.cpp:246
-#: modules/gui/wxwindows/open.cpp:343
+#: modules/gui/macosx/output.m:127 modules/gui/wxwindows/open.cpp:246
+#: modules/gui/wxwindows/open.cpp:354
 #: modules/gui/wxwindows/preferences.cpp:778
 #: modules/gui/wxwindows/streamout.cpp:367
 #: modules/gui/wxwindows/subtitles.cpp:107
@@ -3449,24 +3649,24 @@ msgid "Browse..."
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:368
+#: modules/gui/wxwindows/open.cpp:379
 msgid "Disc type"
 msgstr "Skiva typ"
 
 #: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
 #: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:488
-#: modules/gui/wxwindows/open.cpp:362
+#: modules/gui/wxwindows/open.cpp:373
 msgid "DVD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
 #: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:382
-#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:363
+#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:374
 msgid "VCD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:374
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:385
 msgid "Device name"
 msgstr ""
 
@@ -3477,24 +3677,24 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:547
-#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:409
+#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:420
 msgid "UDP/RTP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
 #: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:548
-#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:421
 msgid "UDP/RTP Multicast"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1727 modules/gui/gtk/gtk_interface.c:2042
 #: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:549
-#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:411
+#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:422
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:467
+#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:478
 msgid "URL"
 msgstr ""
 
@@ -3544,7 +3744,7 @@ msgid "fps"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:116
+#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:120
 #: modules/gui/wxwindows/open.cpp:201 modules/gui/wxwindows/open.cpp:223
 msgid "Settings..."
 msgstr ""
@@ -3621,14 +3821,14 @@ msgid "Destination Target: "
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:128 modules/gui/macosx/output.m:231
-#: modules/gui/macosx/output.m:290 modules/gui/wxwindows/streamout.cpp:342
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/output.m:237
+#: modules/gui/macosx/output.m:296 modules/gui/wxwindows/streamout.cpp:342
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:129 modules/gui/macosx/output.m:241
-#: modules/gui/macosx/output.m:292 modules/gui/wxwindows/streamout.cpp:343
+#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:298 modules/gui/wxwindows/streamout.cpp:343
 msgid "RTP"
 msgstr ""
 
@@ -3651,8 +3851,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:135 modules/gui/macosx/output.m:273
-#: modules/gui/macosx/output.m:319
+#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:279
+#: modules/gui/macosx/output.m:325
 msgid "AVI"
 msgstr ""
 
@@ -3670,11 +3870,6 @@ msgstr ""
 msgid "Gtk+ interface"
 msgstr "Göm andra"
 
-#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
-#: modules/gui/gtk2/gtk2_interface.c:77
-msgid "_File"
-msgstr "_Fil"
-
 #: modules/gui/gtk/gtk_interface.c:238
 msgid "_Close"
 msgstr ""
@@ -3691,10 +3886,6 @@ msgstr "_Avsluta"
 msgid "Exit the program"
 msgstr "Avsluta VLC"
 
-#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132
-msgid "_View"
-msgstr ""
-
 #: modules/gui/gtk/gtk_interface.c:294
 msgid "Hide the main interface window"
 msgstr ""
@@ -3715,10 +3906,6 @@ msgstr ""
 msgid "Configure the application"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139
-msgid "_Help"
-msgstr ""
-
 #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435
 msgid "_About..."
 msgstr "_Om VLC..."
@@ -3826,56 +4013,6 @@ msgstr ""
 msgid "Selected:"
 msgstr ""
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-#, fuzzy
-msgid "Gtk2 interface"
-msgstr "Göm andra"
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-msgid "_New"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:87
-msgid "gnome2"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:112
-msgid "button4"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:122
-#: modules/gui/gtk2/gtk2_interface.c:183
-msgid "button3"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:331
-#, fuzzy
-msgid "Save File"
-msgstr "Nästa file"
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-#, fuzzy
-msgid "window1"
-msgstr "Fönster"
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-#, fuzzy
-msgid "_Edit"
-msgstr "Redigera"
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-#, fuzzy
-msgid "_About"
-msgstr "Om VLC"
-
-#: modules/gui/gtk2/gtk2_interface.c:163
-msgid "button1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:173
-msgid "button2"
-msgstr ""
-
 #: modules/gui/kde/interface.cpp:88
 #, fuzzy
 msgid "Languages"
@@ -3907,231 +4044,231 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:315
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:338
 msgid "About VLC media player"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:344 modules/gui/macosx/controls.m:487
-#: modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:389
 msgid "Half Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:346 modules/gui/macosx/controls.m:488
-#: modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:390
 msgid "Normal Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:348 modules/gui/macosx/controls.m:489
-#: modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/intf.m:391
 msgid "Double Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:491
 #: modules/gui/macosx/controls.m:498 modules/gui/macosx/controls.m:520
-#: modules/gui/macosx/intf.m:371
+#: modules/gui/macosx/intf.m:394
 msgid "Float On Top"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:490
-#: modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/intf.m:392
 #, fuzzy
 msgid "Fit To Screen"
 msgstr "Helskärm"
 
-#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:298
-#: modules/gui/macosx/intf.m:342 modules/gui/macosx/intf.m:402
+#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:321
+#: modules/gui/macosx/intf.m:365 modules/gui/macosx/intf.m:425
 #, fuzzy
 msgid "Previous"
 msgstr "Föregående fil"
 
-#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:344
+#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:367
 msgid "Loop"
 msgstr "Repetera"
 
-#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:345
+#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:368
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:346
+#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:369
 #, fuzzy
 msgid "Step Backward"
 msgstr "Föregående objekt"
 
-#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:386
-#: modules/gui/macosx/intf.m:411
+#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:434
 msgid "Info"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:293
+#: modules/gui/macosx/intf.m:316
 #, fuzzy
 msgid "VLC - Controller"
 msgstr "Kontroller"
 
-#: modules/gui/macosx/intf.m:305
+#: modules/gui/macosx/intf.m:328
 msgid "Volume"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:306
+#: modules/gui/macosx/intf.m:329
 msgid "Position"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:312
+#: modules/gui/macosx/intf.m:335
 msgid "Open CrashLog"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:316
+#: modules/gui/macosx/intf.m:339
 msgid "Preferences..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:317
+#: modules/gui/macosx/intf.m:340
 msgid "Hide VLC"
 msgstr "Göm VLC"
 
-#: modules/gui/macosx/intf.m:318
+#: modules/gui/macosx/intf.m:341
 msgid "Hide Others"
 msgstr "Göm andra"
 
-#: modules/gui/macosx/intf.m:319
+#: modules/gui/macosx/intf.m:342
 msgid "Show All"
 msgstr "Visa alla"
 
-#: modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:343
 #, fuzzy
 msgid "Quit VLC"
 msgstr "Avsluta VLC"
 
-#: modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/intf.m:345
 #, fuzzy
 msgid "1:File"
 msgstr "1:Arkiv"
 
-#: modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:346
 #, fuzzy
 msgid "Open..."
 msgstr "Öppna fil"
 
-#: modules/gui/macosx/intf.m:324
+#: modules/gui/macosx/intf.m:347
 #, fuzzy
 msgid "Open File..."
 msgstr "_Öppna fil..."
 
-#: modules/gui/macosx/intf.m:325
+#: modules/gui/macosx/intf.m:348
 #, fuzzy
 msgid "Open Disc..."
 msgstr "_Öppna skiva..."
 
-#: modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:349
 #, fuzzy
 msgid "Open Network..."
 msgstr "Öppna nätverk"
 
-#: modules/gui/macosx/intf.m:327
+#: modules/gui/macosx/intf.m:350
 #, fuzzy
 msgid "Open Recent"
 msgstr "Öppna nätverk"
 
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/intf.m:1291
+#: modules/gui/macosx/intf.m:351 modules/gui/macosx/intf.m:1314
 #, fuzzy
 msgid "Clear Menu"
 msgstr "Radera"
 
-#: modules/gui/macosx/intf.m:331
+#: modules/gui/macosx/intf.m:354
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: modules/gui/macosx/intf.m:332
+#: modules/gui/macosx/intf.m:355
 msgid "Copy"
 msgstr "Kopiera"
 
-#: modules/gui/macosx/intf.m:333
+#: modules/gui/macosx/intf.m:356
 msgid "Paste"
 msgstr "Klistra in"
 
-#: modules/gui/macosx/intf.m:334
+#: modules/gui/macosx/intf.m:357
 msgid "Clear"
 msgstr "Radera"
 
-#: modules/gui/macosx/intf.m:337
+#: modules/gui/macosx/intf.m:360
 msgid "Controls"
 msgstr "Kontroller"
 
-#: modules/gui/macosx/intf.m:358 modules/gui/macosx/intf.m:359
+#: modules/gui/macosx/intf.m:381 modules/gui/macosx/intf.m:382
 msgid "Audio Track"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:372 modules/gui/macosx/intf.m:373
+#: modules/gui/macosx/intf.m:395 modules/gui/macosx/intf.m:396
 msgid "Video Track"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:382
+#: modules/gui/macosx/intf.m:405
 #, fuzzy
 msgid "Minimize Window"
 msgstr "Minimera"
 
-#: modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:406
 #, fuzzy
 msgid "Close Window"
 msgstr "Fönster"
 
-#: modules/gui/macosx/intf.m:384
+#: modules/gui/macosx/intf.m:407
 #, fuzzy
 msgid "Controller"
 msgstr "Kontroller"
 
-#: modules/gui/macosx/intf.m:389
+#: modules/gui/macosx/intf.m:412
 msgid "Bring All to Front"
 msgstr "Lägg alla överst"
 
-#: modules/gui/macosx/intf.m:391
+#: modules/gui/macosx/intf.m:414
 msgid "Help"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:392
+#: modules/gui/macosx/intf.m:415
 msgid "ReadMe..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:393
+#: modules/gui/macosx/intf.m:416
 msgid "Online Documentation"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/intf.m:417
 msgid "Report a Bug"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/intf.m:418
 msgid "VideoLAN Website"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:396
+#: modules/gui/macosx/intf.m:419
 msgid "License"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:405
+#: modules/gui/macosx/intf.m:428
 msgid "Error"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:406
+#: modules/gui/macosx/intf.m:429
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:407
+#: modules/gui/macosx/intf.m:430
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:408
+#: modules/gui/macosx/intf.m:431
 msgid "Open Messages Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:432
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4210,63 +4347,57 @@ msgstr ""
 msgid "Open VIDEO_TS Directory"
 msgstr ""
 
-#: modules/gui/macosx/output.m:115
+#: modules/gui/macosx/output.m:119
 #, fuzzy
 msgid "Advanced output:"
 msgstr "Paus"
 
-#: modules/gui/macosx/output.m:119
+#: modules/gui/macosx/output.m:123
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:122 modules/gui/macosx/output.m:210
-#: modules/gui/macosx/output.m:285
+#: modules/gui/macosx/output.m:126 modules/gui/macosx/output.m:216
+#: modules/gui/macosx/output.m:291
 #, fuzzy
 msgid "Stream"
 msgstr "Stopp"
 
-#: modules/gui/macosx/output.m:126
+#: modules/gui/macosx/output.m:130
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132 modules/gui/wxwindows/streamout.cpp:437
+#: modules/gui/macosx/output.m:136 modules/gui/wxwindows/streamout.cpp:437
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:133
+#: modules/gui/macosx/output.m:137
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:134 modules/gui/macosx/output.m:275
-#: modules/gui/macosx/output.m:317
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:281
+#: modules/gui/macosx/output.m:323
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:274
-#: modules/gui/macosx/output.m:321
+#: modules/gui/macosx/output.m:140 modules/gui/macosx/output.m:280
+#: modules/gui/macosx/output.m:327
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:276
-#: modules/gui/macosx/output.m:323
+#: modules/gui/macosx/output.m:141 modules/gui/macosx/output.m:282
+#: modules/gui/macosx/output.m:329
 msgid "mp4"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139
+#: modules/gui/macosx/output.m:143
 #, fuzzy
 msgid "Transcode options"
 msgstr "Paus"
 
-#: modules/gui/macosx/output.m:149 modules/gui/macosx/output.m:153
-msgid "Bitrate (bps)"
-msgstr ""
-
-#: modules/gui/macosx/output.m:151
-msgid "mpga"
-msgstr ""
-
-#: modules/gui/macosx/output.m:152
-msgid "a52 "
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:158
+#: modules/gui/wxwindows/streamout.cpp:512
+#: modules/gui/wxwindows/streamout.cpp:549
+msgid "Bitrate (kb/s)"
 msgstr ""
 
 #: modules/gui/macosx/prefs.m:78 modules/gui/wxwindows/preferences.cpp:256
@@ -4278,12 +4409,6 @@ msgstr "Markera allt"
 msgid "Advanced"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:143 modules/gui/macosx/prefs.m:341
-#: modules/gui/macosx/prefs.m:368
-#, fuzzy
-msgid "Auto"
-msgstr "Om VLC"
-
 #: modules/gui/ncurses/ncurses.c:66
 #, fuzzy
 msgid "ncurses interface"
@@ -4298,33 +4423,33 @@ msgstr ""
 msgid "Qt interface"
 msgstr "Göm andra"
 
-#: modules/gui/skins/src/skin_main.cpp:251
-#: modules/gui/skins/src/vlcproc.cpp:338
+#: modules/gui/skins/src/skin_main.cpp:239
+#: modules/gui/skins/src/vlcproc.cpp:339
 #, fuzzy
 msgid "Open a skin file"
 msgstr "Öppna fil"
 
-#: modules/gui/skins/src/skin_main.cpp:292
-#: modules/gui/skins/src/skin_main.cpp:293
+#: modules/gui/skins/src/skin_main.cpp:280
+#: modules/gui/skins/src/skin_main.cpp:281
 msgid "Last skin actually used"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:294
-#: modules/gui/skins/src/skin_main.cpp:295
+#: modules/gui/skins/src/skin_main.cpp:282
+#: modules/gui/skins/src/skin_main.cpp:283
 msgid "Config of last used skin"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:296
-#: modules/gui/skins/src/skin_main.cpp:297
+#: modules/gui/skins/src/skin_main.cpp:284
+#: modules/gui/skins/src/skin_main.cpp:285
 msgid "Show application in system tray"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:298
-#: modules/gui/skins/src/skin_main.cpp:299
+#: modules/gui/skins/src/skin_main.cpp:286
+#: modules/gui/skins/src/skin_main.cpp:287
 msgid "Show application in taskbar"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:310
+#: modules/gui/skins/src/skin_main.cpp:298
 #, fuzzy
 msgid "Skinnable Interface"
 msgstr "Göm andra"
@@ -4334,205 +4459,205 @@ msgstr "G
 msgid "FileInfo"
 msgstr "_Öppna fil..."
 
-#: modules/gui/wxwindows/interface.cpp:231
+#: modules/gui/wxwindows/interface.cpp:232
 #, fuzzy
 msgid "Open a DVD or (S)VCD"
 msgstr "Öppna skiva"
 
-#: modules/gui/wxwindows/interface.cpp:232
+#: modules/gui/wxwindows/interface.cpp:233
 #, fuzzy
 msgid "Open a network stream"
 msgstr "_Öppna nätverk..."
 
-#: modules/gui/wxwindows/interface.cpp:233
+#: modules/gui/wxwindows/interface.cpp:234
 msgid "Open a satellite stream"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:234
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:235
+#: modules/gui/wxwindows/interface.cpp:236
 #, fuzzy
 msgid "Exit this program"
 msgstr "Avsluta VLC"
 
-#: modules/gui/wxwindows/interface.cpp:237
+#: modules/gui/wxwindows/interface.cpp:238
 msgid "Open the playlist"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:238
+#: modules/gui/wxwindows/interface.cpp:239
 #, fuzzy
 msgid "Show the program logs"
 msgstr "Avsluta VLC"
 
-#: modules/gui/wxwindows/interface.cpp:239
+#: modules/gui/wxwindows/interface.cpp:240
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:241
+#: modules/gui/wxwindows/interface.cpp:242
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:243
+#: modules/gui/wxwindows/interface.cpp:244
 #, fuzzy
 msgid "About this program"
 msgstr "Avsluta VLC"
 
-#: modules/gui/wxwindows/interface.cpp:247
+#: modules/gui/wxwindows/interface.cpp:248
 #, fuzzy
 msgid "&Open File..."
 msgstr "_Öppna fil..."
 
-#: modules/gui/wxwindows/interface.cpp:249
+#: modules/gui/wxwindows/interface.cpp:250
 #, fuzzy
 msgid "Open &Disc..."
 msgstr "_Öppna skiva..."
 
-#: modules/gui/wxwindows/interface.cpp:251
+#: modules/gui/wxwindows/interface.cpp:252
 #, fuzzy
 msgid "&Network Stream..."
 msgstr "_Öppna nätverk..."
 
-#: modules/gui/wxwindows/interface.cpp:254
+#: modules/gui/wxwindows/interface.cpp:255
 #, fuzzy
 msgid "&Satellite Stream..."
 msgstr "_Öppna nätverk..."
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:260
 #, fuzzy
 msgid "&Eject Disc"
 msgstr "_Mata ut skiva"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:264
 #, fuzzy
 msgid "E&xit"
 msgstr "_Avsluta"
 
-#: modules/gui/wxwindows/interface.cpp:267
+#: modules/gui/wxwindows/interface.cpp:268
 msgid "&Playlist..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:269
+#: modules/gui/wxwindows/interface.cpp:270
 #, fuzzy
-msgid "&Logs..."
+msgid "&Messages..."
 msgstr "_Öppna skiva..."
 
-#: modules/gui/wxwindows/interface.cpp:270
+#: modules/gui/wxwindows/interface.cpp:271
 #, fuzzy
 msgid "&File info..."
 msgstr "_Öppna fil..."
 
-#: modules/gui/wxwindows/interface.cpp:275
+#: modules/gui/wxwindows/interface.cpp:276
 msgid "&Preferences..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:292
+#: modules/gui/wxwindows/interface.cpp:293
 #, fuzzy
 msgid "&About..."
 msgstr "_Om VLC..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:297
 #, fuzzy
 msgid "&File"
 msgstr "Arkiv"
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:298
 msgid "&View"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:298
+#: modules/gui/wxwindows/interface.cpp:299
 #, fuzzy
 msgid "&Settings"
 msgstr "Markera allt"
 
-#: modules/gui/wxwindows/interface.cpp:299
-#: modules/gui/wxwindows/interface.cpp:476
-#: modules/gui/wxwindows/interface.cpp:524
+#: modules/gui/wxwindows/interface.cpp:300
+#: modules/gui/wxwindows/interface.cpp:478
+#: modules/gui/wxwindows/interface.cpp:526
 #, fuzzy
 msgid "&Audio"
 msgstr "_Nästa objekt"
 
-#: modules/gui/wxwindows/interface.cpp:300
-#: modules/gui/wxwindows/interface.cpp:495
-#: modules/gui/wxwindows/interface.cpp:528
+#: modules/gui/wxwindows/interface.cpp:301
+#: modules/gui/wxwindows/interface.cpp:497
+#: modules/gui/wxwindows/interface.cpp:530
 msgid "&Video"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:301
-#: modules/gui/wxwindows/interface.cpp:514
-#: modules/gui/wxwindows/interface.cpp:532
+#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:516
+#: modules/gui/wxwindows/interface.cpp:534
 msgid "&Navigation"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:303
 msgid "&Help"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:318
+#: modules/gui/wxwindows/interface.cpp:319
 msgid "Stop current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:320
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:320
+#: modules/gui/wxwindows/interface.cpp:321
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:321
+#: modules/gui/wxwindows/interface.cpp:322
 #: modules/gui/wxwindows/playlist.cpp:351
 #, fuzzy
 msgid "Open playlist"
 msgstr "Öppna skiva"
 
-#: modules/gui/wxwindows/interface.cpp:322
+#: modules/gui/wxwindows/interface.cpp:323
 #, fuzzy
 msgid "Previous playlist item"
 msgstr "Föregående fil"
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:324
 msgid "Next playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:325
 #, fuzzy
 msgid "Play slower"
 msgstr "Slow Motion"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:326
 #, fuzzy
 msgid "Play faster"
 msgstr "Spola framåt"
 
-#: modules/gui/wxwindows/interface.cpp:560
+#: modules/gui/wxwindows/interface.cpp:561
 #, fuzzy
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr "Göm andra"
 
-#: modules/gui/wxwindows/interface.cpp:561
+#: modules/gui/wxwindows/interface.cpp:562
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:562
+#: modules/gui/wxwindows/interface.cpp:563
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:564
+#: modules/gui/wxwindows/interface.cpp:565
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
 "It can play MPEG and MPEG2 files from a file or from a network source."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:568
+#: modules/gui/wxwindows/interface.cpp:569
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "Om VLC"
@@ -4546,11 +4671,11 @@ msgstr "_N
 msgid "Video menu"
 msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:139
+#: modules/gui/wxwindows/menus.cpp:141
 msgid "Input menu"
 msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:329
+#: modules/gui/wxwindows/menus.cpp:334
 msgid "Empty"
 msgstr ""
 
@@ -4587,16 +4712,16 @@ msgstr "Paus"
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:361
+#: modules/gui/wxwindows/open.cpp:372
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:364
+#: modules/gui/wxwindows/open.cpp:375
 #, fuzzy
 msgid "CD Audio"
 msgstr "_Nästa objekt"
 
-#: modules/gui/wxwindows/open.cpp:837 modules/gui/wxwindows/streamout.cpp:640
+#: modules/gui/wxwindows/open.cpp:848 modules/gui/wxwindows/streamout.cpp:640
 #, fuzzy
 msgid "Save file"
 msgstr "Nästa file"
@@ -4671,8 +4796,9 @@ msgid "No configuration options available"
 msgstr ""
 
 #: modules/gui/wxwindows/preferences.cpp:865
-msgid "Advanced..."
-msgstr ""
+#, fuzzy
+msgid "Advanced options"
+msgstr "Paus"
 
 #: modules/gui/wxwindows/streamout.cpp:166
 msgid "Stream output MRL"
@@ -4712,11 +4838,6 @@ msgstr ""
 msgid "Video codec"
 msgstr "Göm andra"
 
-#: modules/gui/wxwindows/streamout.cpp:512
-#: modules/gui/wxwindows/streamout.cpp:549
-msgid "Bitrate (kb/s)"
-msgstr ""
-
 #: modules/gui/wxwindows/streamout.cpp:543
 #, fuzzy
 msgid "Audio codec"
@@ -4836,6 +4957,10 @@ msgstr "G
 msgid "Using the logger interface plugin..."
 msgstr ""
 
+#: modules/misc/memcpy/memcpyaltivec.c:52
+msgid "AltiVec memcpy"
+msgstr ""
+
 #: modules/misc/memcpy/memcpy.c:81
 msgid "libc memcpy"
 msgstr ""
@@ -4852,10 +4977,6 @@ msgstr ""
 msgid "MMX EXT memcpy"
 msgstr ""
 
-#: modules/misc/memcpy/memcpyaltivec.c:52
-msgid "AltiVec memcpy"
-msgstr ""
-
 #: modules/misc/network/ipv4.c:85
 msgid "IPv4 network abstraction layer"
 msgstr ""
@@ -4868,6 +4989,10 @@ msgstr ""
 msgid "Qt Embedded GUI helper"
 msgstr ""
 
+#: modules/misc/sap.c:131
+msgid "SAP"
+msgstr ""
+
 #: modules/misc/sap.c:134
 #, fuzzy
 msgid "SAP interface"
@@ -4996,7 +5121,7 @@ msgid "Set image contrast"
 msgstr ""
 
 #: modules/video_filter/adjust.c:61
-msgid "Set the image contrast. Defaults to 1"
+msgid "Set the image contrast, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:62
@@ -5012,7 +5137,7 @@ msgid "Set image saturation"
 msgstr ""
 
 #: modules/video_filter/adjust.c:65
-msgid "Set the image saturation. Defaults to 1"
+msgid "Set the image saturation, between 0 and 3. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:66
@@ -5020,7 +5145,7 @@ msgid "Set image brightness"
 msgstr ""
 
 #: modules/video_filter/adjust.c:67
-msgid "Set the image brightness. Defaults to 1"
+msgid "Set the image brightness, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:71
@@ -5063,7 +5188,9 @@ msgid "Crop geometry"
 msgstr ""
 
 #: modules/video_filter/crop.c:55
-msgid "Set the geometry of the zone to crop"
+msgid ""
+"Set the geometry of the zone to crop. This is set as width x heigth + left "
+"offset + top offset."
 msgstr ""
 
 #: modules/video_filter/crop.c:57
@@ -5341,11 +5468,21 @@ msgstr ""
 msgid "Use shared memory to communicate between VLC and the X server."
 msgstr ""
 
-#: modules/video_output/x11/x11.c:62
+#: modules/video_output/x11/x11.c:61 modules/video_output/x11/xvideo.c:72
+msgid "choose the screen to be used for fullscreen mode."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:63 modules/video_output/x11/xvideo.c:74
+msgid ""
+"Choose the screen you want to use in fullscreen mode. For instance set it to "
+"0 for first screen, 1 for the second."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:67
 msgid "X11"
 msgstr ""
 
-#: modules/video_output/x11/x11.c:68
+#: modules/video_output/x11/x11.c:76
 msgid "X11 video output"
 msgstr ""
 
@@ -5369,11 +5506,11 @@ msgid ""
 "to improve performances by using the most efficient one."
 msgstr ""
 
-#: modules/video_output/x11/xvideo.c:73
+#: modules/video_output/x11/xvideo.c:78
 msgid "XVideo"
 msgstr ""
 
-#: modules/video_output/x11/xvideo.c:81
+#: modules/video_output/x11/xvideo.c:90
 msgid "XVideo extension video output"
 msgstr ""
 
@@ -5418,6 +5555,14 @@ msgstr ""
 msgid "xosd interface"
 msgstr "Göm andra"
 
+#, fuzzy
+#~ msgid "SAP interface module"
+#~ msgstr "Göm andra"
+
+#, fuzzy
+#~ msgid "Auto"
+#~ msgstr "Om VLC"
+
 #, fuzzy
 #~ msgid "&Title:"
 #~ msgstr "Titel:"
diff --git a/po/vlc.pot b/po/vlc.pot
index c327cbebb2..c4a0f01562 100644
--- a/po/vlc.pot
+++ b/po/vlc.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-05-24 14:40+0200\n"
+"POT-Creation-Date: 2003-05-27 23:43+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"
@@ -27,7 +27,7 @@ msgid "Audio channels"
 msgstr ""
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:165 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:358
 msgid "Stereo"
@@ -114,7 +114,7 @@ msgstr ""
 
 #: src/input/input_programs.c:94 modules/gui/gtk/gnome_interface.c:1078
 #: modules/gui/gtk/gtk_interface.c:1199 modules/gui/kde/interface.cpp:142
-#: modules/gui/macosx/intf.m:347 modules/gui/macosx/intf.m:348
+#: modules/gui/macosx/intf.m:370 modules/gui/macosx/intf.m:371
 msgid "Program"
 msgstr ""
 
@@ -122,18 +122,18 @@ msgstr ""
 #: modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
-#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:349
-#: modules/gui/macosx/intf.m:350 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:382
+#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:372
+#: modules/gui/macosx/intf.m:373 modules/gui/macosx/open.m:149
+#: modules/gui/wxwindows/open.cpp:393
 msgid "Title"
 msgstr ""
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
 #: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
-#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:351
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:388
+#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:374
+#: modules/gui/macosx/intf.m:375 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:399
 msgid "Chapter"
 msgstr ""
 
@@ -179,7 +179,7 @@ msgstr ""
 msgid "Previous Chapter"
 msgstr ""
 
-#: src/input/input_programs.c:668
+#: src/input/input_programs.c:668 src/video_output/video_output.c:397
 msgid "Disable"
 msgstr ""
 
@@ -192,44 +192,44 @@ msgstr ""
 msgid "C"
 msgstr ""
 
-#: src/libvlc.c:301 src/libvlc.c:1357
+#: src/libvlc.c:301 src/libvlc.c:1364
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
 "\n"
 msgstr ""
 
-#: src/libvlc.c:1189 src/misc/configuration.c:961
+#: src/libvlc.c:1196 src/misc/configuration.c:961
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:1206 src/misc/configuration.c:946
+#: src/libvlc.c:1213 src/misc/configuration.c:946
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:1209 src/misc/configuration.c:953
+#: src/libvlc.c:1216 src/misc/configuration.c:953
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:1215
+#: src/libvlc.c:1222
 msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:1216
+#: src/libvlc.c:1223
 msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:1332 src/libvlc.c:1387 src/libvlc.c:1411
+#: src/libvlc.c:1339 src/libvlc.c:1394 src/libvlc.c:1418
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
 msgstr ""
 
-#: src/libvlc.c:1360
+#: src/libvlc.c:1367
 msgid "[module]              [description]\n"
 msgstr ""
 
-#: src/libvlc.c:1405
+#: src/libvlc.c:1412
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -931,15 +931,15 @@ msgstr ""
 #: modules/demux/ogg.c:554 modules/demux/ogg.c:813 modules/demux/ogg.c:986
 #: modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m:354 modules/gui/macosx/output.m:150
+#: modules/gui/macosx/intf.m:377 modules/gui/macosx/output.m:155
 msgid "Audio"
 msgstr ""
 
 #: src/libvlc.h:473 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:893 modules/gui/gtk/gnome_interface.c:1099
-#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:365
-#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:140
+#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:388
+#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:144
 #: modules/misc/dummy/dummy.c:83 modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr ""
@@ -970,8 +970,8 @@ msgstr ""
 #: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
-#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:297
-#: modules/gui/macosx/intf.m:385 modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:408 modules/gui/wxwindows/interface.cpp:352
 #: modules/gui/wxwindows/playlist.cpp:102
 msgid "Playlist"
 msgstr ""
@@ -1014,12 +1014,40 @@ msgstr ""
 msgid "boolean"
 msgstr ""
 
-#: src/video_output/video_output.c:382 modules/gui/beos/VideoOutput.cpp:1138
+#: src/video_output/video_output.c:384 modules/gui/beos/VideoOutput.cpp:1138
 #: modules/gui/macosx/controls.m:342 modules/gui/macosx/controls.m:486
-#: modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/intf.m:393
 msgid "Fullscreen"
 msgstr ""
 
+#: src/video_output/video_output.c:395 modules/gui/gtk/gnome_interface.c:183
+#: modules/gui/gtk/gnome_interface.c:966 modules/gui/gtk/gtk_interface.c:553
+#: modules/gui/gtk/gtk_interface.c:1349 modules/gui/macosx/controls.m:526
+#: modules/gui/macosx/intf.m:401 modules/gui/macosx/intf.m:402
+#: modules/video_filter/deinterlace/deinterlace.c:81
+msgid "Deinterlace"
+msgstr ""
+
+#: src/video_output/video_output.c:399
+msgid "Discard"
+msgstr ""
+
+#: src/video_output/video_output.c:401
+msgid "Blend"
+msgstr ""
+
+#: src/video_output/video_output.c:403
+msgid "Mean"
+msgstr ""
+
+#: src/video_output/video_output.c:405
+msgid "Bob"
+msgstr ""
+
+#: src/video_output/video_output.c:407
+msgid "Linear"
+msgstr ""
+
 #: modules/access/cdda.c:86 modules/access/file.c:69 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
 #: modules/access/v4l/v4l.c:64
@@ -1151,6 +1179,22 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
+#: modules/access_output/dummy.c:56
+msgid "Dummy stream ouput"
+msgstr ""
+
+#: modules/access_output/file.c:58
+msgid "File stream ouput"
+msgstr ""
+
+#: modules/access_output/http.c:54
+msgid "HTTP stream ouput"
+msgstr ""
+
+#: modules/access_output/udp.c:73
+msgid "UDP stream ouput"
+msgstr ""
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr ""
@@ -1235,30 +1279,6 @@ msgstr ""
 msgid "VCD input"
 msgstr ""
 
-#: modules/access/vlcs.c:131 modules/misc/sap.c:131
-msgid "SAP"
-msgstr ""
-
-#: modules/access/vlcs.c:134
-msgid "SAP interface module"
-msgstr ""
-
-#: modules/access_output/dummy.c:56
-msgid "Dummy stream ouput"
-msgstr ""
-
-#: modules/access_output/file.c:58
-msgid "File stream ouput"
-msgstr ""
-
-#: modules/access_output/http.c:54
-msgid "HTTP stream ouput"
-msgstr ""
-
-#: modules/access_output/udp.c:73
-msgid "UDP stream ouput"
-msgstr ""
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr ""
@@ -1408,13 +1428,13 @@ msgstr ""
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:159 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:161 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:371
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:201 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:203 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:387
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1562,23 +1582,146 @@ msgstr ""
 msgid "AAC audio decoder (using libfaad2)"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:154
-msgid "ffmpeg"
+#: modules/codec/ffmpeg/ffmpeg.c:86
+msgid "Direct rendering"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:88
+msgid "Error resilience"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:90
+msgid ""
+"ffmpeg can make errors resiliences.          \n"
+"Nevertheless, with buggy encoder (like ISO MPEG-4 encoder from M$) this will "
+"produce a lot of errors.\n"
+"Valid range is -1 to 99 (-1 disable all errors resiliences)."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:95
+msgid "Workaround bugs"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:97
+msgid ""
+"Try to fix some bugs\n"
+"1  autodetect\n"
+"2  old msmpeg4\n"
+"4  xvid interlaced\n"
+"8  ump4 \n"
+"16 no padding\n"
+"32 ac vlc64 Qpel chroma"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:106
+msgid "Hurry up"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:108
+msgid ""
+"Allow the decoder to partially decode or skip frame(s) when there not enough "
+"time.\n"
+" It's usefull with low CPU power but it could produce broken pictures."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:112
+msgid "Truncated stream"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:113
+msgid "truncated stream -1:auto,0:disable,:1:enable"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:115
+msgid "Post processing quality"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:117
+msgid ""
+"Quality of post processing\n"
+"Valid range is 0 to 6"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:120
+msgid "Ffmpeg postproc filter chains"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:157
-msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgid "Ffmpeg postprocessing module"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:159
+msgid "Auto-level Post processing quality"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:161
+msgid ""
+"Post processing quality is selected upon time left but no more than "
+"requested quality\n"
+"Not yet implemented !"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:165
+msgid "Force vertical luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:166
+msgid "Force vertical luminance deblocking (override other settings)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:168
-msgid "Post processing"
+msgid "Force horizontal luminance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:169
+msgid "Force horizontal luminance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:171
+msgid "Force vertical chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:172
+msgid "Force vertical chrominance deblocking (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:174
+msgid "Force horizontal chrominance deblocking"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:175
+msgid "Force horizontal chrominance deblocking (override other settings)"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:177
-msgid "ffmpeg postprocessing module"
+msgid "Force luminance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:178
+msgid "Force luminance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:180
+msgid "Force chrominance deringing"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:181
+msgid "Force chrominance deringing (override other settings)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:184
+msgid "ffmpeg"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:187
+msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:195
+msgid "Post processing"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:204
+#: modules/codec/ffmpeg/ffmpeg.c:215
 msgid "ffmpeg chroma conversion"
 msgstr ""
 
@@ -1598,7 +1741,7 @@ msgstr ""
 msgid "flac audio decoder"
 msgstr ""
 
-#: modules/codec/libmpeg2.c:89
+#: modules/codec/libmpeg2.c:90
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr ""
 
@@ -1614,14 +1757,14 @@ msgstr ""
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr ""
 
-#: modules/codec/mpeg_video/idct/idct.c:41
-msgid "IDCT"
-msgstr ""
-
 #: modules/codec/mpeg_video/idct/idctaltivec.c:45
 msgid "AltiVec IDCT"
 msgstr ""
 
+#: modules/codec/mpeg_video/idct/idct.c:41
+msgid "IDCT"
+msgstr ""
+
 #: modules/codec/mpeg_video/idct/idctclassic.c:41
 msgid "classic IDCT"
 msgstr ""
@@ -1634,10 +1777,6 @@ msgstr ""
 msgid "MMX EXT IDCT"
 msgstr ""
 
-#: modules/codec/mpeg_video/motion/motion.c:42
-msgid "motion compensation"
-msgstr ""
-
 #: modules/codec/mpeg_video/motion/motion3dnow.c:44
 msgid "3D Now! motion compensation"
 msgstr ""
@@ -1646,6 +1785,10 @@ msgstr ""
 msgid "AltiVec motion compensation"
 msgstr ""
 
+#: modules/codec/mpeg_video/motion/motion.c:42
+msgid "motion compensation"
+msgstr ""
+
 #: modules/codec/mpeg_video/motion/motionmmx.c:45
 msgid "MMX motion compensation"
 msgstr ""
@@ -1807,20 +1950,20 @@ msgstr ""
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
 #: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
-#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:879
-#: modules/gui/macosx/intf.m:880 modules/gui/macosx/intf.m:881
-#: modules/gui/wxwindows/interface.cpp:810
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:902
+#: modules/gui/macosx/intf.m:903 modules/gui/macosx/intf.m:904
+#: modules/gui/wxwindows/interface.cpp:811
 msgid "Pause"
 msgstr ""
 
 #: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
 #: modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
-#: modules/gui/macosx/intf.m:300 modules/gui/macosx/intf.m:338
-#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:886
-#: modules/gui/macosx/intf.m:887 modules/gui/macosx/intf.m:888
-#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:348
-#: modules/gui/wxwindows/interface.cpp:815
+#: modules/gui/macosx/intf.m:323 modules/gui/macosx/intf.m:361
+#: modules/gui/macosx/intf.m:422 modules/gui/macosx/intf.m:909
+#: modules/gui/macosx/intf.m:910 modules/gui/macosx/intf.m:911
+#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:816
 msgid "Play"
 msgstr ""
 
@@ -1874,8 +2017,8 @@ msgstr ""
 #: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:821
 #: modules/demux/ogg.c:994 modules/gui/gtk/gnome_interface.c:148
 #: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
-#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:360
-#: modules/gui/macosx/intf.m:361
+#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:384
 msgid "Channels"
 msgstr ""
 
@@ -1899,7 +2042,7 @@ msgstr ""
 #: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:554
 #: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
 #: modules/demux/ogg.c:813 modules/demux/ogg.c:893 modules/demux/ogg.c:986
-#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:130
+#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:134
 msgid "Type"
 msgstr ""
 
@@ -2515,7 +2658,7 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:201
 #: modules/gui/beos/InterfaceWindow.cpp:300
 #: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:304 modules/gui/macosx/prefs.m:75
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/prefs.m:75
 #: modules/gui/wxwindows/preferences.cpp:229
 msgid "Preferences"
 msgstr ""
@@ -2524,7 +2667,7 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:298
 #: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
 #: modules/gui/kde/info.cpp:9 modules/gui/kde/messages.cpp:8
-#: modules/gui/macosx/intf.m:310 modules/gui/macosx/intf.m:387
+#: modules/gui/macosx/intf.m:333 modules/gui/macosx/intf.m:410
 #: modules/gui/wxwindows/messages.cpp:79
 msgid "Messages"
 msgstr ""
@@ -2539,16 +2682,16 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
 #: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
 #: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:264
-#: modules/gui/macosx/output.m:121 modules/gui/macosx/output.m:194
-#: modules/gui/macosx/output.m:279 modules/gui/wxwindows/interface.cpp:335
+#: modules/gui/macosx/output.m:125 modules/gui/macosx/output.m:200
+#: modules/gui/macosx/output.m:285 modules/gui/wxwindows/interface.cpp:336
 #: modules/gui/wxwindows/open.cpp:276 modules/gui/wxwindows/streamout.cpp:340
 msgid "File"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:240
 #: modules/gui/beos/PlayListWindow.cpp:84
-#: modules/gui/gtk/gnome_interface.c:2179
-#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:332
 #: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677
 msgid "Open File"
 msgstr ""
@@ -2569,7 +2712,7 @@ msgid "About"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:256 modules/gui/kde/interface.cpp:93
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/intf.m:377
+#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:400
 msgid "Subtitles"
 msgstr ""
 
@@ -2602,8 +2745,8 @@ msgid "Speed"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:286 modules/gui/macosx/controls.m:422
-#: modules/gui/macosx/intf.m:299 modules/gui/macosx/intf.m:341
-#: modules/gui/wxwindows/interface.cpp:357
+#: modules/gui/macosx/intf.m:322 modules/gui/macosx/intf.m:364
+#: modules/gui/wxwindows/interface.cpp:358
 msgid "Slower"
 msgstr ""
 
@@ -2612,12 +2755,12 @@ msgid "Normal"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:290 modules/gui/macosx/controls.m:421
-#: modules/gui/macosx/intf.m:302 modules/gui/macosx/intf.m:340
-#: modules/gui/wxwindows/interface.cpp:359
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/wxwindows/interface.cpp:360
 msgid "Faster"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:381
+#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:404
 msgid "Window"
 msgstr ""
 
@@ -2630,7 +2773,7 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
 #: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
 #: modules/gui/gtk/preferences.c:605 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:117
+#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:121
 #: modules/gui/wxwindows/fileinfo.cpp:96
 #: modules/gui/wxwindows/messages.cpp:102 modules/gui/wxwindows/open.cpp:267
 #: modules/gui/wxwindows/preferences.cpp:250
@@ -2651,16 +2794,16 @@ msgstr ""
 msgid "Drop files to play"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:167
+#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:169
 #: modules/gui/wxwindows/playlist.cpp:154
 msgid "Close"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:330
+#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:353
 msgid "Edit"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:335
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:358
 #: modules/gui/macosx/playlist.m:180
 msgid "Select All"
 msgstr ""
@@ -2710,24 +2853,24 @@ msgstr ""
 #: modules/gui/beos/PreferencesWindow.cpp:44
 #: modules/gui/beos/PreferencesWindow.cpp:46
 #: modules/gui/beos/PreferencesWindow.cpp:98
-#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:607
-#: modules/gui/macosx/prefs.m:615 modules/gui/macosx/prefs.m:685
+#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:690
+#: modules/gui/macosx/prefs.m:698 modules/gui/macosx/prefs.m:768
 msgid "Modules"
 msgstr ""
 
-#: modules/gui/beos/PreferencesWindow.cpp:220
+#: modules/gui/beos/PreferencesWindow.cpp:219
 #: modules/gui/gtk/preferences.c:609
 msgid "Apply"
 msgstr ""
 
-#: modules/gui/beos/PreferencesWindow.cpp:225
+#: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
-#: modules/gui/macosx/output.m:332 modules/gui/macosx/prefs.m:76
+#: modules/gui/macosx/output.m:338 modules/gui/macosx/prefs.m:76
 #: modules/gui/wxwindows/preferences.cpp:254
 msgid "Save"
 msgstr ""
 
-#: modules/gui/beos/PreferencesWindow.cpp:229
+#: modules/gui/beos/PreferencesWindow.cpp:228
 msgid "Defaults"
 msgstr ""
 
@@ -2764,6 +2907,7 @@ msgid "Take Screen Shot"
 msgstr ""
 
 #: modules/gui/beos/VlcWrapper.cpp:185 modules/gui/gtk/menu.c:733
+#: modules/gui/macosx/prefs.m:348
 msgid "None"
 msgstr ""
 
@@ -2789,8 +2933,8 @@ msgstr ""
 msgid "VLC media player"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:652
-#: modules/gui/wxwindows/preferences.cpp:965
+#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:663
+#: modules/gui/wxwindows/preferences.cpp:967
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr ""
@@ -2814,8 +2958,8 @@ msgstr ""
 #: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
 #: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
 #: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:435
-#: modules/gui/macosx/intf.m:301 modules/gui/macosx/intf.m:339
-#: modules/gui/macosx/intf.m:400 modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
+#: modules/gui/macosx/intf.m:423 modules/gui/wxwindows/interface.cpp:347
 msgid "Stop"
 msgstr ""
 
@@ -2846,7 +2990,7 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
 #: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:160
-#: modules/gui/macosx/output.m:124 modules/gui/wxwindows/open.cpp:445
+#: modules/gui/macosx/output.m:128 modules/gui/wxwindows/open.cpp:456
 #: modules/gui/wxwindows/streamout.cpp:380
 msgid "Address"
 msgstr ""
@@ -2856,13 +3000,13 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
 #: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
 #: modules/gui/macosx/open.m:159 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:125 modules/gui/wxwindows/open.cpp:430
-#: modules/gui/wxwindows/open.cpp:453 modules/gui/wxwindows/streamout.cpp:390
+#: modules/gui/macosx/output.m:129 modules/gui/wxwindows/open.cpp:441
+#: modules/gui/wxwindows/open.cpp:464 modules/gui/wxwindows/streamout.cpp:390
 msgid "Port"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:127
-#: modules/gui/macosx/output.m:221 modules/gui/macosx/output.m:289
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:131
+#: modules/gui/macosx/output.m:227 modules/gui/macosx/output.m:295
 #: modules/gui/wxwindows/streamout.cpp:341
 msgid "HTTP"
 msgstr ""
@@ -2941,10 +3085,10 @@ msgid ""
 "from local or network sources."
 msgstr ""
 
-#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
+#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60
+#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
+#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100
 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
-#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
-#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
@@ -2954,6 +3098,64 @@ msgstr ""
 msgid "Error loading pixmap file: %s"
 msgstr ""
 
+#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
+msgid "Gtk2 interface"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:31
+msgid "_New"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:87
+msgid "gnome2"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:112
+msgid "button4"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:122
+#: modules/gui/gtk2/gtk2_interface.c:183
+msgid "button3"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337
+msgid "Save File"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:67
+msgid "window1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147
+#: modules/gui/gtk/gtk_interface.c:1373
+msgid "_File"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+msgid "_Edit"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268
+msgid "_View"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569
+msgid "_Help"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:146
+msgid "_About"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:163
+msgid "button1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:173
+msgid "button2"
+msgstr ""
+
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr ""
@@ -2996,7 +3198,7 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:20 modules/gui/gtk/gnome_interface.c:504
 #: modules/gui/gtk/gnome_interface.c:986 modules/gui/gtk/gtk_interface.c:173
 #: modules/gui/gtk/gtk_interface.c:619 modules/gui/gtk/gtk_interface.c:1399
-#: modules/gui/wxwindows/interface.cpp:230
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Open a file"
 msgstr ""
 
@@ -3096,25 +3298,25 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:909
 #: modules/gui/gtk/gtk_interface.c:452 modules/gui/gtk/gtk_interface.c:1253
-#: modules/gui/macosx/intf.m:355
+#: modules/gui/macosx/intf.m:378
 msgid "Volume Up"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:916
 #: modules/gui/gtk/gtk_interface.c:459 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:356
+#: modules/gui/macosx/intf.m:379
 msgid "Volume Down"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:923
 #: modules/gui/gtk/gtk_interface.c:466 modules/gui/gtk/gtk_interface.c:1267
-#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:357
+#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:380
 msgid "Mute"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:155 modules/gui/gtk/gnome_interface.c:938
 #: modules/gui/gtk/gtk_interface.c:488 modules/gui/gtk/gtk_interface.c:1289
-#: modules/gui/macosx/intf.m:362 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:385 modules/gui/macosx/intf.m:386
 msgid "Device"
 msgstr ""
 
@@ -3133,18 +3335,10 @@ msgstr ""
 msgid "_Fullscreen"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:183 modules/gui/gtk/gnome_interface.c:966
-#: modules/gui/gtk/gtk_interface.c:553 modules/gui/gtk/gtk_interface.c:1349
-#: modules/gui/macosx/controls.m:526 modules/gui/macosx/intf.m:378
-#: modules/gui/macosx/intf.m:379
-#: modules/video_filter/deinterlace/deinterlace.c:81
-msgid "Deinterlace"
-msgstr ""
-
 #: modules/gui/gtk/gnome_interface.c:190 modules/gui/gtk/gnome_interface.c:973
 #: modules/gui/gtk/gtk_interface.c:560 modules/gui/gtk/gtk_interface.c:1356
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/intf.m:375
-#: modules/gui/macosx/output.m:120 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/intf.m:397 modules/gui/macosx/intf.m:398
+#: modules/gui/macosx/output.m:124 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr ""
 
@@ -3161,18 +3355,18 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
 #: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2005
 #: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:142
-#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:337
+#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:338
 #: modules/gui/wxwindows/open.cpp:278
 msgid "Disc"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:339
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Net"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:343
 msgid "Sat"
 msgstr ""
 
@@ -3234,7 +3428,7 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1063 modules/gui/gtk/gtk_interface.c:758
 #: modules/gui/gtk/gtk_interface.c:844 modules/gui/gtk/gtk_interface.c:888
 #: modules/gui/gtk/gtk_interface.c:1173
-#: modules/gui/wxwindows/interface.cpp:353
+#: modules/gui/wxwindows/interface.cpp:354
 msgid "Prev"
 msgstr ""
 
@@ -3246,8 +3440,8 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1056 modules/gui/gtk/gtk_interface.c:769
 #: modules/gui/gtk/gtk_interface.c:852 modules/gui/gtk/gtk_interface.c:896
 #: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:443
-#: modules/gui/macosx/intf.m:303 modules/gui/macosx/intf.m:343
-#: modules/gui/macosx/intf.m:401 modules/gui/wxwindows/interface.cpp:355
+#: modules/gui/macosx/intf.m:326 modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:424 modules/gui/wxwindows/interface.cpp:356
 msgid "Next"
 msgstr ""
 
@@ -3343,8 +3537,8 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
 #: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
 #: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:173
-#: modules/gui/macosx/output.m:123 modules/gui/wxwindows/open.cpp:246
-#: modules/gui/wxwindows/open.cpp:343
+#: modules/gui/macosx/output.m:127 modules/gui/wxwindows/open.cpp:246
+#: modules/gui/wxwindows/open.cpp:354
 #: modules/gui/wxwindows/preferences.cpp:778
 #: modules/gui/wxwindows/streamout.cpp:367
 #: modules/gui/wxwindows/subtitles.cpp:107
@@ -3352,24 +3546,24 @@ msgid "Browse..."
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:368
+#: modules/gui/wxwindows/open.cpp:379
 msgid "Disc type"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
 #: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:488
-#: modules/gui/wxwindows/open.cpp:362
+#: modules/gui/wxwindows/open.cpp:373
 msgid "DVD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
 #: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:382
-#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:363
+#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:374
 msgid "VCD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:374
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:385
 msgid "Device name"
 msgstr ""
 
@@ -3380,24 +3574,24 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:547
-#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:409
+#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:420
 msgid "UDP/RTP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
 #: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:548
-#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:421
 msgid "UDP/RTP Multicast"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1727 modules/gui/gtk/gtk_interface.c:2042
 #: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:549
-#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:411
+#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:422
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:467
+#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:478
 msgid "URL"
 msgstr ""
 
@@ -3445,7 +3639,7 @@ msgid "fps"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:116
+#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:120
 #: modules/gui/wxwindows/open.cpp:201 modules/gui/wxwindows/open.cpp:223
 msgid "Settings..."
 msgstr ""
@@ -3522,14 +3716,14 @@ msgid "Destination Target: "
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:128 modules/gui/macosx/output.m:231
-#: modules/gui/macosx/output.m:290 modules/gui/wxwindows/streamout.cpp:342
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/output.m:237
+#: modules/gui/macosx/output.m:296 modules/gui/wxwindows/streamout.cpp:342
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:129 modules/gui/macosx/output.m:241
-#: modules/gui/macosx/output.m:292 modules/gui/wxwindows/streamout.cpp:343
+#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:298 modules/gui/wxwindows/streamout.cpp:343
 msgid "RTP"
 msgstr ""
 
@@ -3550,8 +3744,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:135 modules/gui/macosx/output.m:273
-#: modules/gui/macosx/output.m:319
+#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:279
+#: modules/gui/macosx/output.m:325
 msgid "AVI"
 msgstr ""
 
@@ -3568,11 +3762,6 @@ msgstr ""
 msgid "Gtk+ interface"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
-#: modules/gui/gtk2/gtk2_interface.c:77
-msgid "_File"
-msgstr ""
-
 #: modules/gui/gtk/gtk_interface.c:238
 msgid "_Close"
 msgstr ""
@@ -3589,10 +3778,6 @@ msgstr ""
 msgid "Exit the program"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132
-msgid "_View"
-msgstr ""
-
 #: modules/gui/gtk/gtk_interface.c:294
 msgid "Hide the main interface window"
 msgstr ""
@@ -3613,10 +3798,6 @@ msgstr ""
 msgid "Configure the application"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139
-msgid "_Help"
-msgstr ""
-
 #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435
 msgid "_About..."
 msgstr ""
@@ -3721,51 +3902,6 @@ msgstr ""
 msgid "Selected:"
 msgstr ""
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-msgid "Gtk2 interface"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-msgid "_New"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:87
-msgid "gnome2"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:112
-msgid "button4"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:122
-#: modules/gui/gtk2/gtk2_interface.c:183
-msgid "button3"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:331
-msgid "Save File"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-msgid "window1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-msgid "_Edit"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-msgid "_About"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:163
-msgid "button1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:173
-msgid "button2"
-msgstr ""
-
 #: modules/gui/kde/interface.cpp:88
 msgid "Languages"
 msgstr ""
@@ -3795,216 +3931,216 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:315
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:338
 msgid "About VLC media player"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:344 modules/gui/macosx/controls.m:487
-#: modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/intf.m:389
 msgid "Half Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:346 modules/gui/macosx/controls.m:488
-#: modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:390
 msgid "Normal Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:348 modules/gui/macosx/controls.m:489
-#: modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/intf.m:391
 msgid "Double Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:491
 #: modules/gui/macosx/controls.m:498 modules/gui/macosx/controls.m:520
-#: modules/gui/macosx/intf.m:371
+#: modules/gui/macosx/intf.m:394
 msgid "Float On Top"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:490
-#: modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/intf.m:392
 msgid "Fit To Screen"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:298
-#: modules/gui/macosx/intf.m:342 modules/gui/macosx/intf.m:402
+#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:321
+#: modules/gui/macosx/intf.m:365 modules/gui/macosx/intf.m:425
 msgid "Previous"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:344
+#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:367
 msgid "Loop"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:345
+#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:368
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:346
+#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:369
 msgid "Step Backward"
 msgstr ""
 
-#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:386
-#: modules/gui/macosx/intf.m:411
+#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:434
 msgid "Info"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:293
+#: modules/gui/macosx/intf.m:316
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:305
+#: modules/gui/macosx/intf.m:328
 msgid "Volume"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:306
+#: modules/gui/macosx/intf.m:329
 msgid "Position"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:312
+#: modules/gui/macosx/intf.m:335
 msgid "Open CrashLog"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:316
+#: modules/gui/macosx/intf.m:339
 msgid "Preferences..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:317
+#: modules/gui/macosx/intf.m:340
 msgid "Hide VLC"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:318
+#: modules/gui/macosx/intf.m:341
 msgid "Hide Others"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:319
+#: modules/gui/macosx/intf.m:342
 msgid "Show All"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:343
 msgid "Quit VLC"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/intf.m:345
 msgid "1:File"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:346
 msgid "Open..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:324
+#: modules/gui/macosx/intf.m:347
 msgid "Open File..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:325
+#: modules/gui/macosx/intf.m:348
 msgid "Open Disc..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:349
 msgid "Open Network..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:327
+#: modules/gui/macosx/intf.m:350
 msgid "Open Recent"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/intf.m:1291
+#: modules/gui/macosx/intf.m:351 modules/gui/macosx/intf.m:1314
 msgid "Clear Menu"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:331
+#: modules/gui/macosx/intf.m:354
 msgid "Cut"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:332
+#: modules/gui/macosx/intf.m:355
 msgid "Copy"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:333
+#: modules/gui/macosx/intf.m:356
 msgid "Paste"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:334
+#: modules/gui/macosx/intf.m:357
 msgid "Clear"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:337
+#: modules/gui/macosx/intf.m:360
 msgid "Controls"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:358 modules/gui/macosx/intf.m:359
+#: modules/gui/macosx/intf.m:381 modules/gui/macosx/intf.m:382
 msgid "Audio Track"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:372 modules/gui/macosx/intf.m:373
+#: modules/gui/macosx/intf.m:395 modules/gui/macosx/intf.m:396
 msgid "Video Track"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:382
+#: modules/gui/macosx/intf.m:405
 msgid "Minimize Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:406
 msgid "Close Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:384
+#: modules/gui/macosx/intf.m:407
 msgid "Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:389
+#: modules/gui/macosx/intf.m:412
 msgid "Bring All to Front"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:391
+#: modules/gui/macosx/intf.m:414
 msgid "Help"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:392
+#: modules/gui/macosx/intf.m:415
 msgid "ReadMe..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:393
+#: modules/gui/macosx/intf.m:416
 msgid "Online Documentation"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/intf.m:417
 msgid "Report a Bug"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/intf.m:418
 msgid "VideoLAN Website"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:396
+#: modules/gui/macosx/intf.m:419
 msgid "License"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:405
+#: modules/gui/macosx/intf.m:428
 msgid "Error"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:406
+#: modules/gui/macosx/intf.m:429
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:407
+#: modules/gui/macosx/intf.m:430
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:408
+#: modules/gui/macosx/intf.m:431
 msgid "Open Messages Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:432
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1277
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4079,60 +4215,54 @@ msgstr ""
 msgid "Open VIDEO_TS Directory"
 msgstr ""
 
-#: modules/gui/macosx/output.m:115
+#: modules/gui/macosx/output.m:119
 msgid "Advanced output:"
 msgstr ""
 
-#: modules/gui/macosx/output.m:119
+#: modules/gui/macosx/output.m:123
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:122 modules/gui/macosx/output.m:210
-#: modules/gui/macosx/output.m:285
+#: modules/gui/macosx/output.m:126 modules/gui/macosx/output.m:216
+#: modules/gui/macosx/output.m:291
 msgid "Stream"
 msgstr ""
 
-#: modules/gui/macosx/output.m:126
+#: modules/gui/macosx/output.m:130
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132 modules/gui/wxwindows/streamout.cpp:437
+#: modules/gui/macosx/output.m:136 modules/gui/wxwindows/streamout.cpp:437
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:133
+#: modules/gui/macosx/output.m:137
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:134 modules/gui/macosx/output.m:275
-#: modules/gui/macosx/output.m:317
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:281
+#: modules/gui/macosx/output.m:323
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:274
-#: modules/gui/macosx/output.m:321
+#: modules/gui/macosx/output.m:140 modules/gui/macosx/output.m:280
+#: modules/gui/macosx/output.m:327
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:276
-#: modules/gui/macosx/output.m:323
+#: modules/gui/macosx/output.m:141 modules/gui/macosx/output.m:282
+#: modules/gui/macosx/output.m:329
 msgid "mp4"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139
+#: modules/gui/macosx/output.m:143
 msgid "Transcode options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:149 modules/gui/macosx/output.m:153
-msgid "Bitrate (bps)"
-msgstr ""
-
-#: modules/gui/macosx/output.m:151
-msgid "mpga"
-msgstr ""
-
-#: modules/gui/macosx/output.m:152
-msgid "a52 "
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:158
+#: modules/gui/wxwindows/streamout.cpp:512
+#: modules/gui/wxwindows/streamout.cpp:549
+msgid "Bitrate (kb/s)"
 msgstr ""
 
 #: modules/gui/macosx/prefs.m:78 modules/gui/wxwindows/preferences.cpp:256
@@ -4143,11 +4273,6 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:143 modules/gui/macosx/prefs.m:341
-#: modules/gui/macosx/prefs.m:368
-msgid "Auto"
-msgstr ""
-
 #: modules/gui/ncurses/ncurses.c:66
 msgid "ncurses interface"
 msgstr ""
@@ -4160,32 +4285,32 @@ msgstr ""
 msgid "Qt interface"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:251
-#: modules/gui/skins/src/vlcproc.cpp:338
+#: modules/gui/skins/src/skin_main.cpp:239
+#: modules/gui/skins/src/vlcproc.cpp:339
 msgid "Open a skin file"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:292
-#: modules/gui/skins/src/skin_main.cpp:293
+#: modules/gui/skins/src/skin_main.cpp:280
+#: modules/gui/skins/src/skin_main.cpp:281
 msgid "Last skin actually used"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:294
-#: modules/gui/skins/src/skin_main.cpp:295
+#: modules/gui/skins/src/skin_main.cpp:282
+#: modules/gui/skins/src/skin_main.cpp:283
 msgid "Config of last used skin"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:296
-#: modules/gui/skins/src/skin_main.cpp:297
+#: modules/gui/skins/src/skin_main.cpp:284
+#: modules/gui/skins/src/skin_main.cpp:285
 msgid "Show application in system tray"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:298
-#: modules/gui/skins/src/skin_main.cpp:299
+#: modules/gui/skins/src/skin_main.cpp:286
+#: modules/gui/skins/src/skin_main.cpp:287
 msgid "Show application in taskbar"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:310
+#: modules/gui/skins/src/skin_main.cpp:298
 msgid "Skinnable Interface"
 msgstr ""
 
@@ -4193,183 +4318,183 @@ msgstr ""
 msgid "FileInfo"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:231
+#: modules/gui/wxwindows/interface.cpp:232
 msgid "Open a DVD or (S)VCD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:232
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Open a network stream"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:233
+#: modules/gui/wxwindows/interface.cpp:234
 msgid "Open a satellite stream"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:234
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:235
+#: modules/gui/wxwindows/interface.cpp:236
 msgid "Exit this program"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:237
+#: modules/gui/wxwindows/interface.cpp:238
 msgid "Open the playlist"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:238
+#: modules/gui/wxwindows/interface.cpp:239
 msgid "Show the program logs"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:239
+#: modules/gui/wxwindows/interface.cpp:240
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:241
+#: modules/gui/wxwindows/interface.cpp:242
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:243
+#: modules/gui/wxwindows/interface.cpp:244
 msgid "About this program"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:247
+#: modules/gui/wxwindows/interface.cpp:248
 msgid "&Open File..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:249
+#: modules/gui/wxwindows/interface.cpp:250
 msgid "Open &Disc..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:251
+#: modules/gui/wxwindows/interface.cpp:252
 msgid "&Network Stream..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:254
+#: modules/gui/wxwindows/interface.cpp:255
 msgid "&Satellite Stream..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:260
 msgid "&Eject Disc"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:264
 msgid "E&xit"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:267
+#: modules/gui/wxwindows/interface.cpp:268
 msgid "&Playlist..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:269
-msgid "&Logs..."
+#: modules/gui/wxwindows/interface.cpp:270
+msgid "&Messages..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:270
+#: modules/gui/wxwindows/interface.cpp:271
 msgid "&File info..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:275
+#: modules/gui/wxwindows/interface.cpp:276
 msgid "&Preferences..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:292
+#: modules/gui/wxwindows/interface.cpp:293
 msgid "&About..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:297
 msgid "&File"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:298
 msgid "&View"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:298
+#: modules/gui/wxwindows/interface.cpp:299
 msgid "&Settings"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:299
-#: modules/gui/wxwindows/interface.cpp:476
-#: modules/gui/wxwindows/interface.cpp:524
+#: modules/gui/wxwindows/interface.cpp:300
+#: modules/gui/wxwindows/interface.cpp:478
+#: modules/gui/wxwindows/interface.cpp:526
 msgid "&Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:300
-#: modules/gui/wxwindows/interface.cpp:495
-#: modules/gui/wxwindows/interface.cpp:528
+#: modules/gui/wxwindows/interface.cpp:301
+#: modules/gui/wxwindows/interface.cpp:497
+#: modules/gui/wxwindows/interface.cpp:530
 msgid "&Video"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:301
-#: modules/gui/wxwindows/interface.cpp:514
-#: modules/gui/wxwindows/interface.cpp:532
+#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:516
+#: modules/gui/wxwindows/interface.cpp:534
 msgid "&Navigation"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:303
 msgid "&Help"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:318
+#: modules/gui/wxwindows/interface.cpp:319
 msgid "Stop current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:320
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:320
+#: modules/gui/wxwindows/interface.cpp:321
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:321
+#: modules/gui/wxwindows/interface.cpp:322
 #: modules/gui/wxwindows/playlist.cpp:351
 msgid "Open playlist"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:322
+#: modules/gui/wxwindows/interface.cpp:323
 msgid "Previous playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:324
 msgid "Next playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:325
 msgid "Play slower"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:326
 msgid "Play faster"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:560
+#: modules/gui/wxwindows/interface.cpp:561
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:561
+#: modules/gui/wxwindows/interface.cpp:562
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:562
+#: modules/gui/wxwindows/interface.cpp:563
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:564
+#: modules/gui/wxwindows/interface.cpp:565
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
 "It can play MPEG and MPEG2 files from a file or from a network source."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:568
+#: modules/gui/wxwindows/interface.cpp:569
 #, c-format
 msgid "About %s"
 msgstr ""
@@ -4382,11 +4507,11 @@ msgstr ""
 msgid "Video menu"
 msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:139
+#: modules/gui/wxwindows/menus.cpp:141
 msgid "Input menu"
 msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:329
+#: modules/gui/wxwindows/menus.cpp:334
 msgid "Empty"
 msgstr ""
 
@@ -4421,15 +4546,15 @@ msgstr ""
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:361
+#: modules/gui/wxwindows/open.cpp:372
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:364
+#: modules/gui/wxwindows/open.cpp:375
 msgid "CD Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:837 modules/gui/wxwindows/streamout.cpp:640
+#: modules/gui/wxwindows/open.cpp:848 modules/gui/wxwindows/streamout.cpp:640
 msgid "Save file"
 msgstr ""
 
@@ -4496,7 +4621,7 @@ msgid "No configuration options available"
 msgstr ""
 
 #: modules/gui/wxwindows/preferences.cpp:865
-msgid "Advanced..."
+msgid "Advanced options"
 msgstr ""
 
 #: modules/gui/wxwindows/streamout.cpp:166
@@ -4534,11 +4659,6 @@ msgstr ""
 msgid "Video codec"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:512
-#: modules/gui/wxwindows/streamout.cpp:549
-msgid "Bitrate (kb/s)"
-msgstr ""
-
 #: modules/gui/wxwindows/streamout.cpp:543
 msgid "Audio codec"
 msgstr ""
@@ -4653,6 +4773,10 @@ msgstr ""
 msgid "Using the logger interface plugin..."
 msgstr ""
 
+#: modules/misc/memcpy/memcpyaltivec.c:52
+msgid "AltiVec memcpy"
+msgstr ""
+
 #: modules/misc/memcpy/memcpy.c:81
 msgid "libc memcpy"
 msgstr ""
@@ -4669,10 +4793,6 @@ msgstr ""
 msgid "MMX EXT memcpy"
 msgstr ""
 
-#: modules/misc/memcpy/memcpyaltivec.c:52
-msgid "AltiVec memcpy"
-msgstr ""
-
 #: modules/misc/network/ipv4.c:85
 msgid "IPv4 network abstraction layer"
 msgstr ""
@@ -4685,6 +4805,10 @@ msgstr ""
 msgid "Qt Embedded GUI helper"
 msgstr ""
 
+#: modules/misc/sap.c:131
+msgid "SAP"
+msgstr ""
+
 #: modules/misc/sap.c:134
 msgid "SAP interface"
 msgstr ""
@@ -4806,7 +4930,7 @@ msgid "Set image contrast"
 msgstr ""
 
 #: modules/video_filter/adjust.c:61
-msgid "Set the image contrast. Defaults to 1"
+msgid "Set the image contrast, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:62
@@ -4822,7 +4946,7 @@ msgid "Set image saturation"
 msgstr ""
 
 #: modules/video_filter/adjust.c:65
-msgid "Set the image saturation. Defaults to 1"
+msgid "Set the image saturation, between 0 and 3. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:66
@@ -4830,7 +4954,7 @@ msgid "Set image brightness"
 msgstr ""
 
 #: modules/video_filter/adjust.c:67
-msgid "Set the image brightness. Defaults to 1"
+msgid "Set the image brightness, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:71
@@ -4870,7 +4994,9 @@ msgid "Crop geometry"
 msgstr ""
 
 #: modules/video_filter/crop.c:55
-msgid "Set the geometry of the zone to crop"
+msgid ""
+"Set the geometry of the zone to crop. This is set as width x heigth + left "
+"offset + top offset."
 msgstr ""
 
 #: modules/video_filter/crop.c:57
@@ -5139,11 +5265,21 @@ msgstr ""
 msgid "Use shared memory to communicate between VLC and the X server."
 msgstr ""
 
-#: modules/video_output/x11/x11.c:62
+#: modules/video_output/x11/x11.c:61 modules/video_output/x11/xvideo.c:72
+msgid "choose the screen to be used for fullscreen mode."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:63 modules/video_output/x11/xvideo.c:74
+msgid ""
+"Choose the screen you want to use in fullscreen mode. For instance set it to "
+"0 for first screen, 1 for the second."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:67
 msgid "X11"
 msgstr ""
 
-#: modules/video_output/x11/x11.c:68
+#: modules/video_output/x11/x11.c:76
 msgid "X11 video output"
 msgstr ""
 
@@ -5167,11 +5303,11 @@ msgid ""
 "to improve performances by using the most efficient one."
 msgstr ""
 
-#: modules/video_output/x11/xvideo.c:73
+#: modules/video_output/x11/xvideo.c:78
 msgid "XVideo"
 msgstr ""
 
-#: modules/video_output/x11/xvideo.c:81
+#: modules/video_output/x11/xvideo.c:90
 msgid "XVideo extension video output"
 msgstr ""
 
-- 
2.39.2