From: Gildas Bazin <gbazin@videolan.org>
Date: Tue, 29 Jul 2003 17:43:00 +0000 (+0000)
Subject: * configure.ac: bumped version number to 0.6.1.
X-Git-Tag: 0.6.1~11
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=42b0d32617ae3fb3cf6210b3ed012ec821314dad;p=vlc

* configure.ac: bumped version number to 0.6.1.
    Enabled matroska support by default.
* extras/MacOSX/*: bumped version number to 0.6.1.
* INSTALL.win32: instructions update.
* share/Makefile.am: included the html files for the http interface.
* po/*: ran ./toolbox --update-po.
---

diff --git a/INSTALL.win32 b/INSTALL.win32
index fc93bdb0ce..a99e0edaf2 100644
--- a/INSTALL.win32
+++ b/INSTALL.win32
@@ -1,4 +1,4 @@
-$Id: INSTALL.win32,v 1.18 2003/07/25 13:24:29 gbazin Exp $
+$Id: INSTALL.win32,v 1.19 2003/07/29 17:42:58 gbazin Exp $
 
 INSTALL file for the Windows9x/Me/NT4/2k/XP version of the VLC media player
 
@@ -86,10 +86,10 @@ http://www.videolan.org/pub/testing/contrib/
 We also provide a package with all the libraries already compiled so it is
 actually really easy to compile a full-featured version of vlc (these compiled
 libraries will only work with mingw or cygwin):
-http://www.videolan.org/pub/testing/win32/contrib-20030725-win32-bin.tar.bz2
+http://www.videolan.org/pub/testing/win32/contrib-20030729-win32-bin.tar.bz2
 All you need to do is extract it in your root directory (the include files
 and libraries will be put in /usr/win32). You can do this with the following
-command: "tar xjvf contrib-20030725-win32-bin.tar.bz2 -C /"
+command: "tar xjvf contrib-20030729-win32-bin.tar.bz2 -C /"
 
 A complete list of the libraries on which we depend can be found here:
 http://developers.videolan.org/vlc/
@@ -149,6 +149,7 @@ lines:
   LDFLAGS=-L/usr/win32/lib \
   ./configure \
       --disable-sdl --disable-gtk \
+      --disable-mkv \
       --enable-nls \
       --enable-ffmpeg --with-ffmpeg-mp3lame \
       --enable-faad \
diff --git a/configure.ac b/configure.ac
index f02e9e867e..799338d0d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.45 2003/07/28 21:41:20 massiot Exp $
+dnl $Id: configure.ac,v 1.46 2003/07/29 17:42:58 gbazin Exp $
 
-AC_INIT(vlc,0.6.1-test1)
+AC_INIT(vlc,0.6.1)
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Trevelyan"
@@ -13,7 +13,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.1-test1)
+AM_INIT_AUTOMAKE(vlc,0.6.1)
 AM_CONFIG_HEADER(config.h)
 
 dnl
@@ -1403,8 +1403,8 @@ dnl
 dnl  matroska demux plugin
 dnl
 AC_ARG_ENABLE(mkv,
-  [  --enable-mkv            Matroska demux support (default disabled)])
-if test "${enable_mkv}" = "yes"
+  [  --enable-mkv            Matroska demux support (default enabled)])
+if test "${enable_mkv}" != "no"
 then
 AC_LANG_PUSH(C++)
   dnl matroska headers include ebml headers directly... pouah that stinks
diff --git a/extras/MacOSX/Resources/English.lproj/InfoPlist.strings b/extras/MacOSX/Resources/English.lproj/InfoPlist.strings
index 3373fee330..f70620ac14 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.1-test1";
-CFBundleGetInfoString = "VLC media player 0.6.1-test1, Copyright (c) 1996-2003 VideoLAN.";
+CFBundleShortVersionString = "0.6.1";
+CFBundleGetInfoString = "VLC media player 0.6.1, 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 fef72a8133..9d0fe38705 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.1-test1, Copyright (c) 1996-2003 VideoLAN.</string>
+	<string>VLC media player 0.6.1, 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.1-test1</string>
+	<string>0.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>VLC#</string>
 	<key>CFBundleURLTypes</key>
@@ -474,7 +474,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>0.6.1-test1</string>
+	<string>0.6.1</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSMainNibFile</key>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 06352e8483..ab641bf30e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -21,30 +21,30 @@ 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_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_error.h
+include/vlc/input.h
 include/vlc_interface.h
+include/vlc/intf.h
 include/vlc_messages.h
 include/vlc_objects.h
 include/vlc_playlist.h
-include/vlc_threads.h
+include/vlc/sout.h
 include/vlc_threads_funcs.h
+include/vlc_threads.h
 include/vlc_video.h
+include/vlc/vlc.h
+include/vlc/vout.h
 include/vout_synchro.h
 include/win32_specific.h
 src/audio_output/common.c
@@ -56,9 +56,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
@@ -104,18 +104,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
@@ -131,6 +125,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
@@ -144,6 +144,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/pvr/pvr.c
 modules/access/pvr/videodev2.h
 modules/access/satellite/access.c
@@ -158,10 +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_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
@@ -204,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
@@ -244,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
@@ -273,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
@@ -386,6 +386,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
@@ -416,22 +430,6 @@ 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/common.h
 modules/gui/kde/disc.cpp
 modules/gui/kde/disc.h
@@ -452,6 +450,8 @@ modules/gui/kde/pluginsbox.cpp
 modules/gui/kde/pluginsbox.h
 modules/gui/kde/preferences.cpp
 modules/gui/kde/preferences.h
+modules/gui/kde/QConfigItem.cpp
+modules/gui/kde/QConfigItem.h
 modules/gui/kde/slider.cpp
 modules/gui/kde/slider.h
 modules/gui/macosx/about.h
@@ -585,6 +585,7 @@ modules/gui/skins/x11/x11_timer.cpp
 modules/gui/skins/x11/x11_timer.h
 modules/gui/skins/x11/x11_window.cpp
 modules/gui/skins/x11/x11_window.h
+modules/gui/wxwindows/control.cpp
 modules/gui/wxwindows/dialogs.cpp
 modules/gui/wxwindows/fileinfo.cpp
 modules/gui/wxwindows/interface.cpp
@@ -611,8 +612,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
@@ -644,11 +645,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 c9a86ca133..3fd603d363 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc 0.73.3\n"
-"POT-Creation-Date: 2003-07-24 00:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-29 19:02+0200\n"
 "PO-Revision-Date: 2002-04-18 23:38+0100\n"
 "Last-Translator: Felix Kühne <fk@aenneburghardt.de>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: include/vlc_interface.h:105
 #, fuzzy
@@ -34,7 +34,7 @@ msgid "Audio channels"
 msgstr "Tonkanäle"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:179 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:386
 msgid "Stereo"
@@ -130,8 +130,8 @@ msgstr "Programm"
 #: 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:373
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:404
+#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:406
 msgid "Title"
 msgstr "Titel"
 
@@ -139,8 +139,8 @@ msgstr "Titel"
 #: 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:375
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
+#: modules/gui/wxwindows/open.cpp:412
 msgid "Chapter"
 msgstr "Kapitel"
 
@@ -1119,7 +1119,7 @@ msgstr "Oberfl
 #: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
 #: modules/demux/ogg.c:1002 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:378 modules/gui/macosx/output.m:164
+#: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "Ton"
 
@@ -1128,7 +1128,7 @@ msgstr "Ton"
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:909
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
-#: modules/gui/macosx/output.m:158 modules/misc/dummy/dummy.c:81
+#: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
 #: modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "Bild"
@@ -1147,7 +1147,7 @@ msgstr "Encoder"
 
 #: src/libvlc.h:547 modules/gui/gtk/gnome_interface.c:2042
 #: modules/gui/gtk/gtk_interface.c:2361 modules/gui/gtk/gtk_interface.c:3034
-#: modules/gui/wxwindows/open.cpp:221 modules/gui/wxwindows/streamout.cpp:175
+#: modules/gui/wxwindows/open.cpp:194 modules/gui/wxwindows/streamout.cpp:171
 msgid "Stream output"
 msgstr "Stream-Ausgabe"
 
@@ -1161,7 +1161,7 @@ msgstr "Prozessor"
 #: 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:321
 #: modules/gui/macosx/intf.m:409 modules/gui/pda/interface.c:612
-#: modules/gui/wxwindows/interface.cpp:378
+#: modules/gui/wxwindows/interface.cpp:345
 #: modules/gui/wxwindows/playlist.cpp:104
 msgid "Playlist"
 msgstr "Wiedergabeliste"
@@ -1206,8 +1206,8 @@ msgid "boolean"
 msgstr "boolesch"
 
 #: src/video_output/video_output.c:406 modules/gui/beos/VideoOutput.cpp:1151
-#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:348
-#: modules/gui/macosx/controls.m:690 modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:350
+#: modules/gui/macosx/controls.m:692 modules/gui/macosx/intf.m:394
 msgid "Fullscreen"
 msgstr "Vollbild"
 
@@ -1241,7 +1241,7 @@ msgstr "Linear"
 
 #: modules/access/cdda.c:86 modules/access/file.c:72 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
-#: modules/access/v4l/v4l.c:67
+#: modules/access/v4l/v4l.c:66
 msgid "Caching value in ms"
 msgstr "Zwischenspeicher-Wert in ms"
 
@@ -1397,6 +1397,39 @@ 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:66
+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:74 modules/access/udp.c:72
+msgid "caching value in ms"
+msgstr "zwischenspeichern des Werts in ms"
+
+#: modules/access_output/udp.c:76 modules/access/udp.c:74
+msgid ""
+"Allows you to modify the default caching value for udp streams. This value "
+"should be set in miliseconds units."
+msgstr ""
+"Erlaubt Ihnen den Standard-Zwischenspeicher-Wert für UDP streams zu ändern. "
+"Dieser Wert sollte in Millisekunden sein."
+
+#: modules/access_output/udp.c:80
+msgid "UDP stream ouput"
+msgstr "UDP-Streamausgabe"
+
+#: modules/access_output/udp.c:81
+#, fuzzy
+msgid "udp stream output"
+msgstr "Stream-Ausgabe benutzen"
+
 #: modules/access/pvr/pvr.c:75
 msgid "Hauppauge PVR cards input"
 msgstr "Hauppauge PVR-Karten Input"
@@ -1445,18 +1478,6 @@ msgstr "SLP Input"
 msgid "slp"
 msgstr "slp"
 
-#: modules/access/udp.c:72 modules/access_output/udp.c:74
-msgid "caching value in ms"
-msgstr "zwischenspeichern des Werts in ms"
-
-#: modules/access/udp.c:74 modules/access_output/udp.c:76
-msgid ""
-"Allows you to modify the default caching value for udp streams. This value "
-"should be set in miliseconds units."
-msgstr ""
-"Erlaubt Ihnen den Standard-Zwischenspeicher-Wert für UDP streams zu ändern. "
-"Dieser Wert sollte in Millisekunden sein."
-
 #: modules/access/udp.c:78
 msgid "UDP/RTP input"
 msgstr "UDP/RTP Input"
@@ -1465,7 +1486,7 @@ msgstr "UDP/RTP Input"
 msgid "udp"
 msgstr "UDP"
 
-#: modules/access/v4l/v4l.c:69
+#: modules/access/v4l/v4l.c:68
 msgid ""
 "Allows you to modify the default caching value for v4l streams. This value "
 "should be set in miliseconds units."
@@ -1473,15 +1494,15 @@ msgstr ""
 "Erlaubt Ihnen den Standard-Zwischenspeicher-Wert für v4l-Streams zu ändern. "
 "Dieser Wert sollte in Millisekunden sein."
 
-#: modules/access/v4l/v4l.c:73
+#: modules/access/v4l/v4l.c:72
 msgid "Video4Linux input"
 msgstr "Video4Linux Input"
 
-#: modules/access/v4l/v4l.c:74
+#: modules/access/v4l/v4l.c:73
 msgid "v4l"
 msgstr "v4l"
 
-#: modules/access/v4l/v4l.c:82
+#: modules/access/v4l/v4l.c:81
 msgid "Video4Linux demuxer"
 msgstr "Video4Linux Demuxer"
 
@@ -1489,27 +1510,6 @@ msgstr "Video4Linux Demuxer"
 msgid "VCD input"
 msgstr "VCD Input"
 
-#: modules/access_output/dummy.c:56
-msgid "Dummy stream ouput"
-msgstr "Dummy-Streamausgabe"
-
-#: modules/access_output/file.c:66
-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:80
-msgid "UDP stream ouput"
-msgstr "UDP-Streamausgabe"
-
-#: modules/access_output/udp.c:81
-#, fuzzy
-msgid "udp stream output"
-msgstr "Stream-Ausgabe benutzen"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr "Charakteristische Dimension"
@@ -1658,7 +1658,7 @@ msgstr "ALSA Ger
 msgid "ALSA audio output"
 msgstr "ALSA Tonausgabe"
 
-#: modules/audio_output/alsa.c:116 modules/audio_output/coreaudio.c:218
+#: modules/audio_output/alsa.c:117 modules/audio_output/coreaudio.c:218
 #: modules/audio_output/coreaudio.c:1473 modules/audio_output/directx.c:377
 #: modules/audio_output/oss.c:129 modules/audio_output/sdl.c:176
 #: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:337
@@ -1666,23 +1666,23 @@ msgstr "ALSA Tonausgabe"
 msgid "Audio device"
 msgstr "Tonausgang"
 
-#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:173 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:399
 msgid "Mono"
 msgstr "Mono"
 
-#: modules/audio_output/alsa.c:180 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr "2 Vorder- und 2 Rückseiten"
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr "5.1"
 
-#: modules/audio_output/alsa.c:208 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr "A/52 über S/PDIF"
@@ -1961,14 +1961,14 @@ msgstr "MPEG audio layer I/II/III parser"
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr "MPEG I/II layer 1/2 - Tondekoder"
 
-#: 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"
@@ -1981,10 +1981,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"
@@ -1993,6 +1989,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"
@@ -2237,9 +2237,9 @@ 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:924
-#: modules/gui/macosx/intf.m:925 modules/gui/macosx/intf.m:926
-#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:797
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
+#: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
+#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:685
 msgid "Pause"
 msgstr "Pause"
 
@@ -2247,11 +2247,11 @@ msgstr "Pause"
 #: 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:324 modules/gui/macosx/intf.m:362
-#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:931
-#: modules/gui/macosx/intf.m:932 modules/gui/macosx/intf.m:933
+#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
+#: modules/gui/macosx/intf.m:929 modules/gui/macosx/intf.m:930
 #: modules/gui/macosx/playlist.m:194 modules/gui/pda/interface.c:192
-#: modules/gui/wxwindows/interface.cpp:375
-#: modules/gui/wxwindows/interface.cpp:803
+#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:691
 msgid "Play"
 msgstr "Wiedergabe"
 
@@ -2306,7 +2306,7 @@ msgstr "Layer"
 #: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
 #: 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/output.m:170 modules/gui/wxwindows/streamout.cpp:667
+#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr "Kanäle"
 
@@ -2332,7 +2332,7 @@ msgstr "Anzahl der Streams"
 #: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
 #: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:147 modules/gui/pda/interface.c:372
+#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr "Typ"
 
@@ -3074,19 +3074,19 @@ msgstr "Meldungen"
 #: modules/gui/gtk/gnome_interface.c:2847 modules/gui/gtk/gtk_interface.c:618
 #: 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:138 modules/gui/macosx/output.m:218
-#: modules/gui/macosx/output.m:310 modules/gui/pda/interface.c:380
-#: modules/gui/wxwindows/interface.cpp:362 modules/gui/wxwindows/open.cpp:279
-#: modules/gui/wxwindows/streamout.cpp:384
+#: modules/gui/macosx/open.m:142 modules/gui/macosx/open.m:263
+#: modules/gui/macosx/output.m:130 modules/gui/macosx/output.m:208
+#: modules/gui/macosx/output.m:300 modules/gui/pda/interface.c:380
+#: modules/gui/wxwindows/interface.cpp:329 modules/gui/wxwindows/open.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:385
 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/macosx/open.m:630 modules/gui/macosx/open.m:677
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:331
+#: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:676
 msgid "Open File"
 msgstr "Datei öffnen"
 
@@ -3147,11 +3147,11 @@ msgstr "Wiedergabeliste"
 #: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
 #: 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:606 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:134
-#: modules/gui/wxwindows/open.cpp:270
+#: modules/gui/gtk/preferences.c:606 modules/gui/macosx/open.m:139
+#: modules/gui/macosx/open.m:180 modules/gui/macosx/output.m:126
+#: modules/gui/wxwindows/open.cpp:244 modules/gui/wxwindows/open.cpp:971
 #: modules/gui/wxwindows/preferences.cpp:253
-#: modules/gui/wxwindows/streamout.cpp:221
+#: modules/gui/wxwindows/streamout.cpp:217
 #: modules/gui/wxwindows/subtitles.cpp:149
 msgid "OK"
 msgstr "OK"
@@ -3235,7 +3235,7 @@ msgstr "
 
 #: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:597 modules/gui/gtk/preferences.c:614
-#: modules/gui/macosx/output.m:375 modules/gui/macosx/prefs.m:78
+#: modules/gui/macosx/output.m:365 modules/gui/macosx/prefs.m:78
 #: modules/gui/wxwindows/preferences.cpp:257
 msgid "Save"
 msgstr "Speichern"
@@ -3305,8 +3305,8 @@ msgid "VLC media player"
 msgstr "VLC media Player"
 
 #: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:700
-#: modules/gui/wxwindows/preferences.cpp:1026
+#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr "Datei öffnen"
@@ -3329,10 +3329,10 @@ 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:639
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:641
 #: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
 #: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Stop"
 msgstr "Stopp"
 
@@ -3364,9 +3364,9 @@ msgid "UDP/RTP (Address when Multicast)"
 msgstr "UDP/RTP (Adresse falls 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:141 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:467 modules/gui/wxwindows/streamout.cpp:424
+#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
+#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
+#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
 msgid "Address"
 msgstr "Adresse"
 
@@ -3374,16 +3374,16 @@ msgstr "Adresse"
 #: modules/gui/gtk/gnome_interface.c:1786
 #: 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:142 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:452 modules/gui/wxwindows/open.cpp:475
-#: modules/gui/wxwindows/streamout.cpp:435
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
 msgid "Port"
 msgstr "Port"
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:144
-#: modules/gui/macosx/output.m:246 modules/gui/macosx/output.m:321
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:385
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
+#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
 msgid "HTTP"
 msgstr "HTTP"
 
@@ -3397,9 +3397,9 @@ msgstr "MMS"
 
 #: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
 #: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:143
-#: modules/gui/macosx/open.m:272 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:283
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
 msgid "Network"
 msgstr "Netzwerk"
 
@@ -3465,10 +3465,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
 #: modules/gui/pda/support.c:121
 #, c-format
 msgid "Couldn't find pixmap file: %s"
@@ -3480,6 +3480,64 @@ 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
+msgid "Gtk2 interface"
+msgstr "Gtk2 Oberfläche"
+
+#: modules/gui/gtk2/gnome2_interface.c:31
+msgid "_New"
+msgstr "_Neu"
+
+#: modules/gui/gtk2/gnome2_interface.c:87
+msgid "gnome2"
+msgstr "gnome2"
+
+#: modules/gui/gtk2/gnome2_interface.c:112
+msgid "button4"
+msgstr "button4"
+
+#: modules/gui/gtk2/gnome2_interface.c:122
+#: modules/gui/gtk2/gtk2_interface.c:183
+msgid "button3"
+msgstr "button3"
+
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:364
+msgid "Save File"
+msgstr "Datei sichern"
+
+#: modules/gui/gtk2/gtk2_interface.c:67
+msgid "window1"
+msgstr "Fenster 1"
+
+#: 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
+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
+msgid "_About"
+msgstr "_Über..."
+
+#: modules/gui/gtk2/gtk2_interface.c:163
+msgid "button1"
+msgstr "button1"
+
+#: modules/gui/gtk2/gtk2_interface.c:173
+msgid "button2"
+msgstr "button2"
+
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr "Hilfetexte anzeigen"
@@ -3522,7 +3580,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:255
+#: modules/gui/wxwindows/interface.cpp:222
 msgid "Open a file"
 msgstr "Datei öffnen"
 
@@ -3634,7 +3692,7 @@ 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:686 modules/gui/macosx/intf.m:381
+#: modules/gui/macosx/controls.m:688 modules/gui/macosx/intf.m:381
 msgid "Mute"
 msgstr "Ton aus"
 
@@ -3660,7 +3718,7 @@ msgstr "Vollbildmodus"
 
 #: 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/output.m:137 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/output.m:129 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr "Bildschirm"
 
@@ -3676,19 +3734,19 @@ msgstr "_Video"
 #: modules/gui/gtk/gnome_interface.c:1690
 #: 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:364
-#: modules/gui/wxwindows/open.cpp:281
+#: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:143
+#: modules/gui/macosx/open.m:267 modules/gui/wxwindows/interface.cpp:331
+#: modules/gui/wxwindows/open.cpp:255
 msgid "Disc"
 msgstr "Volume"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:366
+#: modules/gui/wxwindows/interface.cpp:333
 msgid "Net"
 msgstr "Netzwerk"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:369
+#: modules/gui/wxwindows/interface.cpp:336
 msgid "Sat"
 msgstr "Satellit"
 
@@ -3750,7 +3808,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:380
+#: modules/gui/wxwindows/interface.cpp:347
 msgid "Prev"
 msgstr "Vorher"
 
@@ -3761,9 +3819,9 @@ msgstr "Vorherige Datei"
 #: modules/gui/gtk/gnome_interface.c:667
 #: 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:647
+#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:649
 #: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
-#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:382
+#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:349
 msgid "Next"
 msgstr "Nächstes Objekt"
 
@@ -3841,17 +3899,17 @@ msgid "Open Stream"
 msgstr "Stream öffnen"
 
 #: modules/gui/gtk/gnome_interface.c:1476 modules/gui/gtk/gtk_interface.c:1791
-#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:173
+#: modules/gui/macosx/open.m:136 modules/gui/wxwindows/open.cpp:169
 msgid "Media Resource Locator (MRL)"
 msgstr "Medien-Finder (MRL)"
 
 #: modules/gui/gtk/gnome_interface.c:1498 modules/gui/gtk/gtk_interface.c:1813
-#: modules/gui/wxwindows/open.cpp:177
+#: modules/gui/wxwindows/open.cpp:173
 msgid "Open Target:"
 msgstr "Ziel öffnen:"
 
 #: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:192
+#: modules/gui/wxwindows/open.cpp:188
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -3861,63 +3919,63 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1562
 #: 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:140 modules/gui/macosx/prefs.m:464
-#: modules/gui/wxwindows/open.cpp:249 modules/gui/wxwindows/open.cpp:365
-#: modules/gui/wxwindows/preferences.cpp:829
-#: modules/gui/wxwindows/streamout.cpp:411
+#: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:152 modules/gui/macosx/open.m:174
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/prefs.m:464
+#: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
+#: modules/gui/wxwindows/preferences.cpp:832
+#: modules/gui/wxwindows/streamout.cpp:412
 #: modules/gui/wxwindows/subtitles.cpp:107
 msgid "Browse..."
 msgstr "Durchsuchen..."
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:390
+#: modules/gui/wxwindows/open.cpp:392
 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:384
+#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:487
+#: modules/gui/wxwindows/open.cpp:386
 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:385
+#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:381
+#: modules/gui/macosx/open.m:471 modules/gui/wxwindows/open.cpp:387
 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:396
+#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:398
 msgid "Device name"
 msgstr "Gerätename"
 
 #: modules/gui/gtk/gnome_interface.c:1660 modules/gui/gtk/gtk_interface.c:1996
-#: modules/gui/macosx/open.m:152
+#: modules/gui/macosx/open.m:153
 msgid "Use DVD menus"
 msgstr "DVD-Menüs benutzen"
 
 #: 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:431
+#: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:546
+#: modules/gui/macosx/open.m:584 modules/gui/wxwindows/open.cpp:433
 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:432
+#: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:547
+#: modules/gui/macosx/open.m:596 modules/gui/wxwindows/open.cpp:434
 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:433
+#: modules/gui/macosx/open.m:167 modules/gui/macosx/open.m:548
+#: modules/gui/macosx/open.m:609 modules/gui/wxwindows/open.cpp:435
 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:489
+#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr "URL"
 
@@ -3946,23 +4004,23 @@ msgid "Horizontal"
 msgstr "Horizontal"
 
 #: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
-#: modules/gui/wxwindows/open.cpp:286
+#: modules/gui/wxwindows/open.cpp:260
 msgid "Satellite"
 msgstr "Satellit"
 
 #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322
-#: modules/gui/macosx/open.m:175
+#: modules/gui/macosx/open.m:176
 msgid "delay"
 msgstr "verspätet"
 
 #: modules/gui/gtk/gnome_interface.c:2020 modules/gui/gtk/gtk_interface.c:2338
-#: modules/gui/macosx/open.m:177
+#: modules/gui/macosx/open.m:178
 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:133
-#: modules/gui/wxwindows/open.cpp:204 modules/gui/wxwindows/open.cpp:226
+#: modules/gui/macosx/open.m:173 modules/gui/macosx/output.m:125
+#: modules/gui/wxwindows/open.cpp:199 modules/gui/wxwindows/open.cpp:354
 msgid "Settings..."
 msgstr "Einstellungen..."
 
@@ -4035,14 +4093,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:145 modules/gui/macosx/output.m:257
-#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:386
+#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:313 modules/gui/wxwindows/streamout.cpp:387
 msgid "UDP"
 msgstr "UDP"
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:270
-#: modules/gui/macosx/output.m:333 modules/gui/wxwindows/streamout.cpp:387
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:260
+#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:388
 msgid "RTP"
 msgstr "RTP"
 
@@ -4063,8 +4121,8 @@ msgid "PS"
 msgstr "PS"
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:303
-#: modules/gui/macosx/output.m:362
+#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:293
+#: modules/gui/macosx/output.m:352
 msgid "AVI"
 msgstr "AVI"
 
@@ -4081,11 +4139,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"
@@ -4102,10 +4155,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"
@@ -4126,10 +4175,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..."
@@ -4150,7 +4195,7 @@ msgstr "Autoren"
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr "Das VideoLAN Team <videolan@videolan.org>"
 
-#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:154
+#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:150
 msgid "Open Target"
 msgstr "Ziel öffnen"
 
@@ -4180,10 +4225,11 @@ msgstr "Stream-Ausgaben-Einstellungen"
 
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
-#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:139
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:273
+#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
+#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/wxwindows/open.cpp:974
 #: modules/gui/wxwindows/preferences.cpp:256
-#: modules/gui/wxwindows/streamout.cpp:224
+#: modules/gui/wxwindows/streamout.cpp:220
 #: modules/gui/wxwindows/subtitles.cpp:152
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -4234,51 +4280,6 @@ msgstr "Einstellen"
 msgid "Selected:"
 msgstr "Ausgewählt:"
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-msgid "Gtk2 interface"
-msgstr "Gtk2 Oberfläche"
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-msgid "_New"
-msgstr "_Neu"
-
-#: modules/gui/gtk2/gnome2_interface.c:87
-msgid "gnome2"
-msgstr "gnome2"
-
-#: modules/gui/gtk2/gnome2_interface.c:112
-msgid "button4"
-msgstr "button4"
-
-#: modules/gui/gtk2/gnome2_interface.c:122
-#: modules/gui/gtk2/gtk2_interface.c:183
-msgid "button3"
-msgstr "button3"
-
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:374
-msgid "Save File"
-msgstr "Datei sichern"
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-msgid "window1"
-msgstr "Fenster 1"
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-msgid "_Edit"
-msgstr "_Bearbeiten"
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-msgid "_About"
-msgstr "_Über..."
-
-#: modules/gui/gtk2/gtk2_interface.c:163
-msgid "button1"
-msgstr "button1"
-
-#: modules/gui/gtk2/gtk2_interface.c:173
-msgid "button2"
-msgstr "button2"
-
 #: modules/gui/kde/interface.cpp:88
 msgid "Languages"
 msgstr "Sprachen"
@@ -4312,55 +4313,55 @@ msgstr "Plug-Ins"
 msgid "About VLC media player"
 msgstr "Über VLC media player"
 
-#: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:691
+#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:693
 #: modules/gui/macosx/intf.m:390
 msgid "Half Size"
 msgstr "Halbe Größe"
 
-#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:692
+#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:694
 #: modules/gui/macosx/intf.m:391
 msgid "Normal Size"
 msgstr "Normale Größe"
 
-#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:693
+#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
 #: modules/gui/macosx/intf.m:392
 msgid "Double Size"
 msgstr "Doppelte Größe"
 
-#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
-#: modules/gui/macosx/controls.m:702 modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:697
+#: modules/gui/macosx/controls.m:704 modules/gui/macosx/intf.m:395
 msgid "Float On Top"
 msgstr "Immer im Vordergrund"
 
-#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:694
+#: modules/gui/macosx/controls.m:360 modules/gui/macosx/controls.m:696
 #: modules/gui/macosx/intf.m:393
 msgid "Fit To Screen"
 msgstr "An Bildschirm anpassen"
 
-#: modules/gui/macosx/controls.m:625 modules/gui/macosx/intf.m:326
-#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:386
+#: modules/gui/macosx/controls.m:627 modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:353
 msgid "Faster"
 msgstr "Schneller"
 
-#: modules/gui/macosx/controls.m:626 modules/gui/macosx/intf.m:323
-#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:384
+#: modules/gui/macosx/controls.m:628 modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:351
 msgid "Slower"
 msgstr "Langsamer"
 
-#: modules/gui/macosx/controls.m:646 modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/controls.m:648 modules/gui/macosx/intf.m:322
 #: modules/gui/macosx/intf.m:366 modules/gui/macosx/intf.m:426
 msgid "Previous"
 msgstr "Vorheriges Objekt"
 
-#: modules/gui/macosx/controls.m:665 modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/controls.m:667 modules/gui/macosx/intf.m:368
 msgid "Loop"
 msgstr "Wiederholen"
 
-#: modules/gui/macosx/controls.m:672 modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/controls.m:674 modules/gui/macosx/intf.m:369
 msgid "Step Forward"
 msgstr "Ein Stück vorwärts"
 
-#: modules/gui/macosx/controls.m:673 modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/controls.m:675 modules/gui/macosx/intf.m:370
 msgid "Step Backward"
 msgstr "Ein Stück rückwärts"
 
@@ -4373,8 +4374,8 @@ msgstr "Information"
 msgid "VLC - Controller"
 msgstr "VLC - Steuerung"
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:868
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
 msgid "Volume"
 msgstr "Lautstärke"
 
@@ -4430,7 +4431,7 @@ msgstr "Netzwerk 
 msgid "Open Recent"
 msgstr "Benutzte Dokumente"
 
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1205
+#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1202
 msgid "Clear Menu"
 msgstr "Menü löschen"
 
@@ -4495,7 +4496,7 @@ msgstr "Einen Fehler melden..."
 msgid "VideoLAN Website"
 msgstr "VideoLAN Website"
 
-#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1198
+#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1195
 msgid "License"
 msgstr "Lizenz"
 
@@ -4524,11 +4525,11 @@ msgstr "Meldungsfenster 
 msgid "Dismiss"
 msgstr "Ignorieren"
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid "No CrashLog found"
 msgstr "Kein CrashLog gefunden"
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4568,110 +4569,110 @@ msgstr "Plaziert das Video-Fenster 
 msgid "MacOS X interface, sound and video"
 msgstr "MacOS X Oberfläche, Ton und Bild"
 
-#: modules/gui/macosx/open.m:134
+#: modules/gui/macosx/open.m:135
 msgid "Open Source"
 msgstr "Quelle öffnen"
 
-#: modules/gui/macosx/open.m:136
+#: modules/gui/macosx/open.m:137
 msgid "Only enqueue in playlist, do not play"
 msgstr "Nur an die Wiedergabeliste anhängen, nicht abspielen"
 
-#: modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:147
 msgid "Treat as a pipe rather than as a file"
 msgstr "Eher als Stream/Pipe, statt als Datei behandeln"
 
-#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:371
+#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:370
 msgid "VIDEO_TS folder"
 msgstr "'VIDEO_TS' Ordner"
 
-#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:389
-#: modules/gui/macosx/open.m:480
+#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:388
+#: modules/gui/macosx/open.m:479
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: modules/gui/macosx/open.m:171
+#: modules/gui/macosx/open.m:172
 msgid "Load subtitles file:"
 msgstr "Untertitel-Datei laden:"
 
-#: modules/gui/macosx/open.m:174
+#: modules/gui/macosx/open.m:175
 msgid "Override"
 msgstr "Aufheben"
 
-#: modules/gui/macosx/open.m:333 modules/gui/macosx/open.m:527
-#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:678
+#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:677
 msgid "Open"
 msgstr "Öffnen"
 
-#: modules/gui/macosx/open.m:423 modules/gui/macosx/open.m:475
-#: modules/gui/macosx/open.m:483 modules/gui/macosx/open.m:491
+#: modules/gui/macosx/open.m:422 modules/gui/macosx/open.m:474
+#: modules/gui/macosx/open.m:482 modules/gui/macosx/open.m:490
 msgid "No %@s found"
 msgstr "Keine %@s gefunden"
 
-#: modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:525
 msgid "Open VIDEO_TS Directory"
 msgstr "VIDEO_TS Ordner öffnen"
 
-#: modules/gui/macosx/output.m:132
+#: modules/gui/macosx/output.m:124
 msgid "Advanced output:"
 msgstr "Erweiterte Ausgabe:"
 
-#: modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:128
 msgid "Output Options"
 msgstr "Ausgabe-Optionen"
 
-#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:235
-#: modules/gui/macosx/output.m:316
+#: modules/gui/macosx/output.m:131 modules/gui/macosx/output.m:225
+#: modules/gui/macosx/output.m:306
 msgid "Stream"
 msgstr "Stream"
 
-#: modules/gui/macosx/output.m:143
+#: modules/gui/macosx/output.m:135
 msgid "TTL"
 msgstr "TTL"
 
-#: modules/gui/macosx/output.m:149 modules/gui/wxwindows/streamout.cpp:530
+#: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr "Verkapslungsmethode"
 
-#: modules/gui/macosx/output.m:150
+#: modules/gui/macosx/output.m:142
 msgid "MPEG TS"
 msgstr "MPEG TS"
 
-#: modules/gui/macosx/output.m:151 modules/gui/macosx/output.m:305
-#: modules/gui/macosx/output.m:358
+#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:295
+#: modules/gui/macosx/output.m:348
 msgid "MPEG PS"
 msgstr "MPEG PS"
 
-#: modules/gui/macosx/output.m:152 modules/gui/macosx/output.m:307
-#: modules/gui/macosx/output.m:360
+#: modules/gui/macosx/output.m:144 modules/gui/macosx/output.m:297
+#: modules/gui/macosx/output.m:350
 #, fuzzy
 msgid "MPEG1"
 msgstr "MPEG TS"
 
-#: modules/gui/macosx/output.m:154 modules/gui/macosx/output.m:304
-#: modules/gui/macosx/output.m:364
+#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:294
+#: modules/gui/macosx/output.m:354
 msgid "Ogg"
 msgstr "Ogg"
 
-#: modules/gui/macosx/output.m:157
+#: modules/gui/macosx/output.m:149
 msgid "Transcode options"
 msgstr "Umschlüsselungsoptionen"
 
-#: modules/gui/macosx/output.m:161 modules/gui/macosx/output.m:167
-#: modules/gui/wxwindows/streamout.cpp:609
-#: modules/gui/wxwindows/streamout.cpp:661
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:159
+#: modules/gui/wxwindows/streamout.cpp:610
+#: modules/gui/wxwindows/streamout.cpp:662
 msgid "Bitrate (kb/s)"
 msgstr "Datenrate (KB/s)"
 
-#: modules/gui/macosx/output.m:174 modules/gui/wxwindows/streamout.cpp:483
+#: modules/gui/macosx/output.m:166 modules/gui/wxwindows/streamout.cpp:484
 #, fuzzy
 msgid "Miscellaneous Options"
 msgstr "Sonstiges"
 
-#: modules/gui/macosx/output.m:175
+#: modules/gui/macosx/output.m:167
 msgid "Announce streams via SAP Channel:"
 msgstr ""
 
-#: modules/gui/macosx/output.m:306 modules/gui/macosx/output.m:366
+#: modules/gui/macosx/output.m:296 modules/gui/macosx/output.m:356
 msgid "mp4"
 msgstr "mp4"
 
@@ -4757,166 +4758,166 @@ msgstr "mit Skins anpassbare Oberfl
 msgid "FileInfo"
 msgstr "Datei-Info"
 
-#: modules/gui/wxwindows/interface.cpp:256
+#: modules/gui/wxwindows/interface.cpp:223
 msgid "Open a DVD or (S)VCD"
 msgstr "Eine DVD oder (S)VCD öffnen"
 
-#: modules/gui/wxwindows/interface.cpp:257
+#: modules/gui/wxwindows/interface.cpp:224
 msgid "Open a network stream"
 msgstr "Netzwerk Stream öffnen"
 
-#: modules/gui/wxwindows/interface.cpp:258
+#: modules/gui/wxwindows/interface.cpp:225
 msgid "Open a satellite stream"
 msgstr "Einen Satelliten-Stream öffnen"
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:226
 msgid "Eject the DVD/CD"
 msgstr "Die DVD/CD auswerfen"
 
-#: modules/gui/wxwindows/interface.cpp:260
+#: modules/gui/wxwindows/interface.cpp:227
 msgid "Exit this program"
 msgstr "Dieses Programm verlassen"
 
-#: modules/gui/wxwindows/interface.cpp:262
+#: modules/gui/wxwindows/interface.cpp:229
 msgid "Open the playlist"
 msgstr "Die Wiedergabeliste öffnen"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:230
 msgid "Show the program logs"
 msgstr "Die Programm-Logs anzeigen"
 
-#: modules/gui/wxwindows/interface.cpp:264
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Show information about the file being played"
 msgstr "Informationen über die abgespielte Datei anzeigen"
 
-#: modules/gui/wxwindows/interface.cpp:266
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Go to the preferences menu"
 msgstr "Zum Preferences-Menü gehen"
 
-#: modules/gui/wxwindows/interface.cpp:268
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "About this program"
 msgstr "Über dieses Programm"
 
-#: modules/gui/wxwindows/interface.cpp:272 modules/gui/wxwindows/menus.cpp:108
+#: modules/gui/wxwindows/interface.cpp:239 modules/gui/wxwindows/menus.cpp:108
 #, fuzzy
 msgid "Simple &Open ..."
 msgstr "Datei &öffnen..."
 
-#: modules/gui/wxwindows/interface.cpp:274 modules/gui/wxwindows/menus.cpp:109
+#: modules/gui/wxwindows/interface.cpp:241 modules/gui/wxwindows/menus.cpp:109
 #, fuzzy
 msgid "Open &File..."
 msgstr "Datei öffnen..."
 
-#: modules/gui/wxwindows/interface.cpp:276 modules/gui/wxwindows/menus.cpp:110
+#: modules/gui/wxwindows/interface.cpp:243 modules/gui/wxwindows/menus.cpp:110
 msgid "Open &Disc..."
 msgstr "&Volume öffnen..."
 
-#: modules/gui/wxwindows/interface.cpp:278 modules/gui/wxwindows/menus.cpp:111
+#: modules/gui/wxwindows/interface.cpp:245 modules/gui/wxwindows/menus.cpp:111
 #, fuzzy
 msgid "Open &Network Stream..."
 msgstr "&Netzwerk Stream..."
 
-#: modules/gui/wxwindows/interface.cpp:281
+#: modules/gui/wxwindows/interface.cpp:248
 #, fuzzy
 msgid "Open &Satellite Stream..."
 msgstr "&Sateliten-Stream..."
 
-#: modules/gui/wxwindows/interface.cpp:286
+#: modules/gui/wxwindows/interface.cpp:253
 msgid "&Eject Disc"
 msgstr "Volume &auswerfen"
 
-#: modules/gui/wxwindows/interface.cpp:290
+#: modules/gui/wxwindows/interface.cpp:257
 msgid "E&xit"
 msgstr "&Verlassen"
 
-#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:261
 msgid "&Playlist..."
 msgstr "&Wiedergabeliste..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:263
 msgid "&Messages..."
 msgstr "&Meldungen..."
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:264
 msgid "&File info..."
 msgstr "&Datei-Info..."
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:269
 msgid "&Preferences..."
 msgstr "&Einstellungen..."
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:286
 msgid "&About..."
 msgstr "&Über..."
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:290
 msgid "&File"
 msgstr "&Datei"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:291
 msgid "&View"
 msgstr "&Ansicht"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:292
 msgid "&Settings"
 msgstr "&Einstellungen"
 
-#: modules/gui/wxwindows/interface.cpp:326
-#: modules/gui/wxwindows/interface.cpp:482
-#: modules/gui/wxwindows/interface.cpp:530
+#: modules/gui/wxwindows/interface.cpp:293
+#: modules/gui/wxwindows/interface.cpp:414
+#: modules/gui/wxwindows/interface.cpp:462
 msgid "&Audio"
 msgstr "&Ton"
 
-#: modules/gui/wxwindows/interface.cpp:327
-#: modules/gui/wxwindows/interface.cpp:501
-#: modules/gui/wxwindows/interface.cpp:534
+#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:433
+#: modules/gui/wxwindows/interface.cpp:466
 msgid "&Video"
 msgstr "&Bild"
 
-#: modules/gui/wxwindows/interface.cpp:328
-#: modules/gui/wxwindows/interface.cpp:520
-#: modules/gui/wxwindows/interface.cpp:538
+#: modules/gui/wxwindows/interface.cpp:295
+#: modules/gui/wxwindows/interface.cpp:452
+#: modules/gui/wxwindows/interface.cpp:470
 msgid "&Navigation"
 msgstr "&Navigation"
 
-#: modules/gui/wxwindows/interface.cpp:329
+#: modules/gui/wxwindows/interface.cpp:296
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: modules/gui/wxwindows/interface.cpp:345
+#: modules/gui/wxwindows/interface.cpp:312
 msgid "Stop current playlist item"
 msgstr "Aktuelles Wiedergabelistenobjekt stoppen"
 
-#: modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/wxwindows/interface.cpp:313
 msgid "Play current playlist item"
 msgstr "Aktuelles Wiedergabelistenobjekt abspielen"
 
-#: modules/gui/wxwindows/interface.cpp:347
+#: modules/gui/wxwindows/interface.cpp:314
 msgid "Pause current playlist item"
 msgstr "Aktuelles Wiedergabelistenobjekt anhalten"
 
-#: modules/gui/wxwindows/interface.cpp:348
+#: modules/gui/wxwindows/interface.cpp:315
 #: modules/gui/wxwindows/playlist.cpp:353
 msgid "Open playlist"
 msgstr "Wiedergabeliste öffnen"
 
-#: modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:316
 msgid "Previous playlist item"
 msgstr "Vorheriges Wiedergabelistenobjekt"
 
-#: modules/gui/wxwindows/interface.cpp:350
+#: modules/gui/wxwindows/interface.cpp:317
 msgid "Next playlist item"
 msgstr "Nächstes Wiedergabelistenobjekt"
 
-#: modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/wxwindows/interface.cpp:318
 msgid "Play slower"
 msgstr "Langsamer abspielen"
 
-#: modules/gui/wxwindows/interface.cpp:352
+#: modules/gui/wxwindows/interface.cpp:319
 msgid "Play faster"
 msgstr "Schneller abspielen"
 
-#: modules/gui/wxwindows/interface.cpp:574
+#: modules/gui/wxwindows/interface.cpp:506
 msgid ""
 " (wxWindows interface)\n"
 "\n"
@@ -4924,7 +4925,7 @@ msgstr ""
 " (wxWindows Oberfläche)\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:575
+#: modules/gui/wxwindows/interface.cpp:507
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
@@ -4932,7 +4933,7 @@ msgstr ""
 "(c) 1996-2003 - das VideoLAN Team\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:576
+#: modules/gui/wxwindows/interface.cpp:508
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
@@ -4941,7 +4942,7 @@ msgstr ""
 "Das VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 
-#: modules/gui/wxwindows/interface.cpp:578
+#: modules/gui/wxwindows/interface.cpp:510
 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."
@@ -4950,7 +4951,7 @@ msgstr ""
 "Er kann MPEG und MPEG2 Dateien lokal oder von einer Quelle im Netzwerk "
 "abspielen."
 
-#: modules/gui/wxwindows/interface.cpp:582
+#: modules/gui/wxwindows/interface.cpp:514
 #, c-format
 msgid "About %s"
 msgstr "Über %s"
@@ -4988,7 +4989,7 @@ msgstr "Wortreich"
 msgid "Save Messages As a file..."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:181
+#: modules/gui/wxwindows/open.cpp:177
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
@@ -4999,39 +5000,44 @@ msgstr ""
 "Ansonsten wird das Feld automatisch gefüllt, indem Sie die Kontrollen unten "
 "benutzen."
 
-#: modules/gui/wxwindows/open.cpp:198 modules/gui/wxwindows/subtitles.cpp:98
-msgid "Subtitles file"
-msgstr "Untertitel-Datei"
-
-#: modules/gui/wxwindows/open.cpp:199
-msgid "Load an additional subtitles file. Currently only works with AVI files."
-msgstr ""
-"Eine zusätzliche Untertitel-Datei laden. Läuft derzeit nur mit AVI-Dateien"
-
-#: modules/gui/wxwindows/open.cpp:222
+#: modules/gui/wxwindows/open.cpp:195
 msgid "Use VLC as a stream server"
 msgstr "VLC als Stream-Server benutzen"
 
-#: modules/gui/wxwindows/open.cpp:242
+#: modules/gui/wxwindows/open.cpp:216
 msgid "Capture input stream"
 msgstr "Stream-Input festhalten"
 
-#: modules/gui/wxwindows/open.cpp:244
+#: modules/gui/wxwindows/open.cpp:218
 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:383
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+msgid "Subtitles file"
+msgstr "Untertitel-Datei"
+
+#: modules/gui/wxwindows/open.cpp:349
+msgid "Load an additional subtitles file. Currently only works with AVI files."
+msgstr ""
+"Eine zusätzliche Untertitel-Datei laden. Läuft derzeit nur mit AVI-Dateien"
+
+#: modules/gui/wxwindows/open.cpp:385
 msgid "DVD (menus support)"
 msgstr "DVD (Menü-Unterstützung)"
 
-#: modules/gui/wxwindows/open.cpp:386
+#: modules/gui/wxwindows/open.cpp:388
 msgid "CD Audio"
 msgstr "Audio-CD"
 
-#: modules/gui/wxwindows/open.cpp:886 modules/gui/wxwindows/streamout.cpp:785
+#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
 msgid "Save file"
 msgstr "Datei sichern"
 
+#: modules/gui/wxwindows/open.cpp:953
+#, fuzzy
+msgid "Advanced open options"
+msgstr "Erweiterte Optionen"
+
 #: modules/gui/wxwindows/playlist.cpp:116
 #, fuzzy
 msgid "&Simple Add..."
@@ -5085,23 +5091,23 @@ msgstr "Wiedergabeliste speichern"
 msgid "Reset config file"
 msgstr "Einstellungsdatei zurücksetzen"
 
-#: modules/gui/wxwindows/preferences.cpp:898
+#: modules/gui/wxwindows/preferences.cpp:901
 msgid "No configuration options available"
 msgstr "Keine Konfigurationsoptionen verfügbar"
 
-#: modules/gui/wxwindows/preferences.cpp:919
+#: modules/gui/wxwindows/preferences.cpp:922
 msgid "Advanced options"
 msgstr "Erweiterte Optionen"
 
-#: modules/gui/wxwindows/streamout.cpp:190
+#: modules/gui/wxwindows/streamout.cpp:186
 msgid "Stream output MRL"
 msgstr "Stream-Ausgabe-MRL"
 
-#: modules/gui/wxwindows/streamout.cpp:194
+#: modules/gui/wxwindows/streamout.cpp:190
 msgid "Destination Target:"
 msgstr "Ziel:"
 
-#: modules/gui/wxwindows/streamout.cpp:197
+#: modules/gui/wxwindows/streamout.cpp:193
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
@@ -5112,36 +5118,36 @@ msgstr ""
 "Ansonsten wird das Feld automatisch gefüllt, indem Sie die Kontrollen unten "
 "benutzen."
 
-#: modules/gui/wxwindows/streamout.cpp:377
+#: modules/gui/wxwindows/streamout.cpp:378
 msgid "Output Methods"
 msgstr "Ausgabemethoden"
 
-#: modules/gui/wxwindows/streamout.cpp:383
+#: modules/gui/wxwindows/streamout.cpp:384
 msgid "Play locally"
 msgstr "Lokal abspielen"
 
-#: modules/gui/wxwindows/streamout.cpp:407
+#: modules/gui/wxwindows/streamout.cpp:408
 msgid "Filename"
 msgstr "Dateiname"
 
-#: modules/gui/wxwindows/streamout.cpp:495
+#: modules/gui/wxwindows/streamout.cpp:496
 msgid "SAP Announce"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:497
+#: modules/gui/wxwindows/streamout.cpp:498
 #, fuzzy
 msgid "Channel Name "
 msgstr "Channel-Server"
 
-#: modules/gui/wxwindows/streamout.cpp:569
+#: modules/gui/wxwindows/streamout.cpp:570
 msgid "Transcoding options"
 msgstr "Umkodierungsoptionen"
 
-#: modules/gui/wxwindows/streamout.cpp:602
+#: modules/gui/wxwindows/streamout.cpp:603
 msgid "Video codec"
 msgstr "Bild-Codec"
 
-#: modules/gui/wxwindows/streamout.cpp:649
+#: modules/gui/wxwindows/streamout.cpp:650
 msgid "Audio codec"
 msgstr "Ton-Codec"
 
@@ -5235,28 +5241,28 @@ msgstr "Dummy Obefl
 msgid "Using the dummy interface plugin..."
 msgstr "Das Dummy-Benutzeroberflächen-PlugIn benutzen..."
 
-#: modules/misc/freetype.c:65 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr "Schrift"
 
-#: modules/misc/freetype.c:66
+#: modules/misc/freetype.c:68
 msgid "Filename of Font"
 msgstr "Dateiname der Schrift"
 
-#: modules/misc/freetype.c:67
+#: modules/misc/freetype.c:69
 msgid "Font size"
 msgstr "Schriftgröße"
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:70
 msgid "The size of the fonts used by the osd module"
 msgstr "Die Schriftgröße, die vom osd-Modul benutzt wird"
 
-#: modules/misc/freetype.c:71
+#: modules/misc/freetype.c:73
 #, fuzzy
 msgid "Fonts"
 msgstr "Schrift"
 
-#: modules/misc/freetype.c:74
+#: modules/misc/freetype.c:76
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5295,6 +5301,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"
@@ -5311,10 +5321,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"
diff --git a/po/en_GB.po b/po/en_GB.po
index 60db25b448..c6b08f268f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -17,14 +17,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-07-24 00:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-29 19:02+0200\n"
 "PO-Revision-Date: 2002-04-22 09:56+0200\n"
 "Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: include/vlc_interface.h:105
 msgid ""
@@ -39,7 +39,7 @@ msgid "Audio channels"
 msgstr ""
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:179 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:386
 msgid "Stereo"
@@ -135,8 +135,8 @@ msgstr "Programme"
 #: 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:373
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:404
+#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:406
 msgid "Title"
 msgstr ""
 
@@ -144,8 +144,8 @@ msgstr ""
 #: 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:375
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
+#: modules/gui/wxwindows/open.cpp:412
 msgid "Chapter"
 msgstr ""
 
@@ -991,7 +991,7 @@ msgstr ""
 #: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
 #: modules/demux/ogg.c:1002 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:378 modules/gui/macosx/output.m:164
+#: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr ""
 
@@ -1000,7 +1000,7 @@ msgstr ""
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:909
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
-#: modules/gui/macosx/output.m:158 modules/misc/dummy/dummy.c:81
+#: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
 #: modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr ""
@@ -1019,7 +1019,7 @@ msgstr ""
 
 #: src/libvlc.h:547 modules/gui/gtk/gnome_interface.c:2042
 #: modules/gui/gtk/gtk_interface.c:2361 modules/gui/gtk/gtk_interface.c:3034
-#: modules/gui/wxwindows/open.cpp:221 modules/gui/wxwindows/streamout.cpp:175
+#: modules/gui/wxwindows/open.cpp:194 modules/gui/wxwindows/streamout.cpp:171
 msgid "Stream output"
 msgstr ""
 
@@ -1033,7 +1033,7 @@ msgstr ""
 #: 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:321
 #: modules/gui/macosx/intf.m:409 modules/gui/pda/interface.c:612
-#: modules/gui/wxwindows/interface.cpp:378
+#: modules/gui/wxwindows/interface.cpp:345
 #: modules/gui/wxwindows/playlist.cpp:104
 msgid "Playlist"
 msgstr ""
@@ -1078,8 +1078,8 @@ msgid "boolean"
 msgstr ""
 
 #: src/video_output/video_output.c:406 modules/gui/beos/VideoOutput.cpp:1151
-#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:348
-#: modules/gui/macosx/controls.m:690 modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:350
+#: modules/gui/macosx/controls.m:692 modules/gui/macosx/intf.m:394
 msgid "Fullscreen"
 msgstr ""
 
@@ -1113,7 +1113,7 @@ msgstr ""
 
 #: modules/access/cdda.c:86 modules/access/file.c:72 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
-#: modules/access/v4l/v4l.c:67
+#: modules/access/v4l/v4l.c:66
 msgid "Caching value in ms"
 msgstr ""
 
@@ -1242,6 +1242,36 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
+#: modules/access_output/dummy.c:56
+msgid "Dummy stream ouput"
+msgstr ""
+
+#: modules/access_output/file.c:66
+msgid "File stream ouput"
+msgstr ""
+
+#: modules/access_output/http.c:54
+msgid "HTTP stream ouput"
+msgstr ""
+
+#: modules/access_output/udp.c:74 modules/access/udp.c:72
+msgid "caching value in ms"
+msgstr ""
+
+#: modules/access_output/udp.c:76 modules/access/udp.c:74
+msgid ""
+"Allows you to modify the default caching value for udp streams. This value "
+"should be set in miliseconds units."
+msgstr ""
+
+#: modules/access_output/udp.c:80
+msgid "UDP stream ouput"
+msgstr ""
+
+#: modules/access_output/udp.c:81
+msgid "udp stream output"
+msgstr ""
+
 #: modules/access/pvr/pvr.c:75
 msgid "Hauppauge PVR cards input"
 msgstr ""
@@ -1290,16 +1320,6 @@ msgstr ""
 msgid "slp"
 msgstr ""
 
-#: modules/access/udp.c:72 modules/access_output/udp.c:74
-msgid "caching value in ms"
-msgstr ""
-
-#: modules/access/udp.c:74 modules/access_output/udp.c:76
-msgid ""
-"Allows you to modify the default caching value for udp streams. This value "
-"should be set in miliseconds units."
-msgstr ""
-
 #: modules/access/udp.c:78
 msgid "UDP/RTP input"
 msgstr ""
@@ -1308,21 +1328,21 @@ msgstr ""
 msgid "udp"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:69
+#: modules/access/v4l/v4l.c:68
 msgid ""
 "Allows you to modify the default caching value for v4l streams. This value "
 "should be set in miliseconds units."
 msgstr ""
 
-#: modules/access/v4l/v4l.c:73
+#: modules/access/v4l/v4l.c:72
 msgid "Video4Linux input"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:74
+#: modules/access/v4l/v4l.c:73
 msgid "v4l"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:82
+#: modules/access/v4l/v4l.c:81
 msgid "Video4Linux demuxer"
 msgstr ""
 
@@ -1330,26 +1350,6 @@ msgstr ""
 msgid "VCD input"
 msgstr ""
 
-#: modules/access_output/dummy.c:56
-msgid "Dummy stream ouput"
-msgstr ""
-
-#: modules/access_output/file.c:66
-msgid "File stream ouput"
-msgstr ""
-
-#: modules/access_output/http.c:54
-msgid "HTTP stream ouput"
-msgstr ""
-
-#: modules/access_output/udp.c:80
-msgid "UDP stream ouput"
-msgstr ""
-
-#: modules/access_output/udp.c:81
-msgid "udp stream output"
-msgstr ""
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr ""
@@ -1492,7 +1492,7 @@ msgstr ""
 msgid "ALSA audio output"
 msgstr ""
 
-#: modules/audio_output/alsa.c:116 modules/audio_output/coreaudio.c:218
+#: modules/audio_output/alsa.c:117 modules/audio_output/coreaudio.c:218
 #: modules/audio_output/coreaudio.c:1473 modules/audio_output/directx.c:377
 #: modules/audio_output/oss.c:129 modules/audio_output/sdl.c:176
 #: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:337
@@ -1500,23 +1500,23 @@ msgstr ""
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:173 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:399
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:180 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:208 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1775,14 +1775,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 ""
@@ -1795,10 +1795,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 ""
@@ -1807,6 +1803,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,9 +2029,9 @@ 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:924
-#: modules/gui/macosx/intf.m:925 modules/gui/macosx/intf.m:926
-#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:797
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
+#: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
+#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:685
 msgid "Pause"
 msgstr ""
 
@@ -2039,11 +2039,11 @@ msgstr ""
 #: 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:324 modules/gui/macosx/intf.m:362
-#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:931
-#: modules/gui/macosx/intf.m:932 modules/gui/macosx/intf.m:933
+#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
+#: modules/gui/macosx/intf.m:929 modules/gui/macosx/intf.m:930
 #: modules/gui/macosx/playlist.m:194 modules/gui/pda/interface.c:192
-#: modules/gui/wxwindows/interface.cpp:375
-#: modules/gui/wxwindows/interface.cpp:803
+#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:691
 msgid "Play"
 msgstr ""
 
@@ -2098,7 +2098,7 @@ msgstr ""
 #: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
 #: 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/output.m:170 modules/gui/wxwindows/streamout.cpp:667
+#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr ""
 
@@ -2124,7 +2124,7 @@ msgstr ""
 #: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
 #: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:147 modules/gui/pda/interface.c:372
+#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr ""
 
@@ -2848,19 +2848,19 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2847 modules/gui/gtk/gtk_interface.c:618
 #: 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:138 modules/gui/macosx/output.m:218
-#: modules/gui/macosx/output.m:310 modules/gui/pda/interface.c:380
-#: modules/gui/wxwindows/interface.cpp:362 modules/gui/wxwindows/open.cpp:279
-#: modules/gui/wxwindows/streamout.cpp:384
+#: modules/gui/macosx/open.m:142 modules/gui/macosx/open.m:263
+#: modules/gui/macosx/output.m:130 modules/gui/macosx/output.m:208
+#: modules/gui/macosx/output.m:300 modules/gui/pda/interface.c:380
+#: modules/gui/wxwindows/interface.cpp:329 modules/gui/wxwindows/open.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:385
 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/macosx/open.m:630 modules/gui/macosx/open.m:677
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:331
+#: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:676
 msgid "Open File"
 msgstr ""
 
@@ -2921,11 +2921,11 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
 #: 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:606 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:134
-#: modules/gui/wxwindows/open.cpp:270
+#: modules/gui/gtk/preferences.c:606 modules/gui/macosx/open.m:139
+#: modules/gui/macosx/open.m:180 modules/gui/macosx/output.m:126
+#: modules/gui/wxwindows/open.cpp:244 modules/gui/wxwindows/open.cpp:971
 #: modules/gui/wxwindows/preferences.cpp:253
-#: modules/gui/wxwindows/streamout.cpp:221
+#: modules/gui/wxwindows/streamout.cpp:217
 #: modules/gui/wxwindows/subtitles.cpp:149
 msgid "OK"
 msgstr ""
@@ -3009,7 +3009,7 @@ msgstr ""
 
 #: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:597 modules/gui/gtk/preferences.c:614
-#: modules/gui/macosx/output.m:375 modules/gui/macosx/prefs.m:78
+#: modules/gui/macosx/output.m:365 modules/gui/macosx/prefs.m:78
 #: modules/gui/wxwindows/preferences.cpp:257
 msgid "Save"
 msgstr ""
@@ -3078,8 +3078,8 @@ msgid "VLC media player"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:700
-#: modules/gui/wxwindows/preferences.cpp:1026
+#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr ""
@@ -3102,10 +3102,10 @@ 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:639
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:641
 #: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
 #: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Stop"
 msgstr ""
 
@@ -3136,9 +3136,9 @@ msgid "UDP/RTP (Address when Multicast)"
 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:141 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:467 modules/gui/wxwindows/streamout.cpp:424
+#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
+#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
+#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
 msgid "Address"
 msgstr ""
 
@@ -3146,16 +3146,16 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1786
 #: 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:142 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:452 modules/gui/wxwindows/open.cpp:475
-#: modules/gui/wxwindows/streamout.cpp:435
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
 msgid "Port"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:144
-#: modules/gui/macosx/output.m:246 modules/gui/macosx/output.m:321
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:385
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
+#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
 msgid "HTTP"
 msgstr ""
 
@@ -3169,9 +3169,9 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
 #: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:143
-#: modules/gui/macosx/open.m:272 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:283
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
 msgid "Network"
 msgstr ""
 
@@ -3235,10 +3235,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
 #: modules/gui/pda/support.c:121
 #, c-format
 msgid "Couldn't find pixmap file: %s"
@@ -3250,6 +3250,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:364
+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 ""
@@ -3292,7 +3350,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:255
+#: modules/gui/wxwindows/interface.cpp:222
 msgid "Open a file"
 msgstr ""
 
@@ -3404,7 +3462,7 @@ 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:686 modules/gui/macosx/intf.m:381
+#: modules/gui/macosx/controls.m:688 modules/gui/macosx/intf.m:381
 msgid "Mute"
 msgstr ""
 
@@ -3430,7 +3488,7 @@ 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/output.m:137 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/output.m:129 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr ""
 
@@ -3446,19 +3504,19 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1690
 #: 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:364
-#: modules/gui/wxwindows/open.cpp:281
+#: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:143
+#: modules/gui/macosx/open.m:267 modules/gui/wxwindows/interface.cpp:331
+#: modules/gui/wxwindows/open.cpp:255
 msgid "Disc"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:366
+#: modules/gui/wxwindows/interface.cpp:333
 msgid "Net"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:369
+#: modules/gui/wxwindows/interface.cpp:336
 msgid "Sat"
 msgstr ""
 
@@ -3520,7 +3578,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:380
+#: modules/gui/wxwindows/interface.cpp:347
 msgid "Prev"
 msgstr ""
 
@@ -3531,9 +3589,9 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:667
 #: 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:647
+#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:649
 #: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
-#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:382
+#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:349
 msgid "Next"
 msgstr ""
 
@@ -3609,17 +3667,17 @@ msgid "Open Stream"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1476 modules/gui/gtk/gtk_interface.c:1791
-#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:173
+#: modules/gui/macosx/open.m:136 modules/gui/wxwindows/open.cpp:169
 msgid "Media Resource Locator (MRL)"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1498 modules/gui/gtk/gtk_interface.c:1813
-#: modules/gui/wxwindows/open.cpp:177
+#: modules/gui/wxwindows/open.cpp:173
 msgid "Open Target:"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:192
+#: modules/gui/wxwindows/open.cpp:188
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -3627,63 +3685,63 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1562
 #: 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:140 modules/gui/macosx/prefs.m:464
-#: modules/gui/wxwindows/open.cpp:249 modules/gui/wxwindows/open.cpp:365
-#: modules/gui/wxwindows/preferences.cpp:829
-#: modules/gui/wxwindows/streamout.cpp:411
+#: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:152 modules/gui/macosx/open.m:174
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/prefs.m:464
+#: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
+#: modules/gui/wxwindows/preferences.cpp:832
+#: modules/gui/wxwindows/streamout.cpp:412
 #: modules/gui/wxwindows/subtitles.cpp:107
 msgid "Browse..."
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:390
+#: modules/gui/wxwindows/open.cpp:392
 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:384
+#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:487
+#: modules/gui/wxwindows/open.cpp:386
 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:385
+#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:381
+#: modules/gui/macosx/open.m:471 modules/gui/wxwindows/open.cpp:387
 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:396
+#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:398
 msgid "Device name"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1660 modules/gui/gtk/gtk_interface.c:1996
-#: modules/gui/macosx/open.m:152
+#: modules/gui/macosx/open.m:153
 msgid "Use DVD menus"
 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:431
+#: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:546
+#: modules/gui/macosx/open.m:584 modules/gui/wxwindows/open.cpp:433
 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:432
+#: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:547
+#: modules/gui/macosx/open.m:596 modules/gui/wxwindows/open.cpp:434
 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:433
+#: modules/gui/macosx/open.m:167 modules/gui/macosx/open.m:548
+#: modules/gui/macosx/open.m:609 modules/gui/wxwindows/open.cpp:435
 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:489
+#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr ""
 
@@ -3712,23 +3770,23 @@ msgid "Horizontal"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
-#: modules/gui/wxwindows/open.cpp:286
+#: modules/gui/wxwindows/open.cpp:260
 msgid "Satellite"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322
-#: modules/gui/macosx/open.m:175
+#: modules/gui/macosx/open.m:176
 msgid "delay"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2020 modules/gui/gtk/gtk_interface.c:2338
-#: modules/gui/macosx/open.m:177
+#: modules/gui/macosx/open.m:178
 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:133
-#: modules/gui/wxwindows/open.cpp:204 modules/gui/wxwindows/open.cpp:226
+#: modules/gui/macosx/open.m:173 modules/gui/macosx/output.m:125
+#: modules/gui/wxwindows/open.cpp:199 modules/gui/wxwindows/open.cpp:354
 msgid "Settings..."
 msgstr ""
 
@@ -3799,14 +3857,14 @@ msgid "Destination Target: "
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:257
-#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:386
+#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:313 modules/gui/wxwindows/streamout.cpp:387
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:270
-#: modules/gui/macosx/output.m:333 modules/gui/wxwindows/streamout.cpp:387
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:260
+#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:388
 msgid "RTP"
 msgstr ""
 
@@ -3827,8 +3885,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:303
-#: modules/gui/macosx/output.m:362
+#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:293
+#: modules/gui/macosx/output.m:352
 msgid "AVI"
 msgstr ""
 
@@ -3845,11 +3903,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 ""
@@ -3866,10 +3919,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 ""
@@ -3890,10 +3939,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 ""
@@ -3914,7 +3959,7 @@ msgstr ""
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:154
+#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:150
 msgid "Open Target"
 msgstr ""
 
@@ -3944,10 +3989,11 @@ msgstr ""
 
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
-#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:139
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:273
+#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
+#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/wxwindows/open.cpp:974
 #: modules/gui/wxwindows/preferences.cpp:256
-#: modules/gui/wxwindows/streamout.cpp:224
+#: modules/gui/wxwindows/streamout.cpp:220
 #: modules/gui/wxwindows/subtitles.cpp:152
 msgid "Cancel"
 msgstr ""
@@ -3998,51 +4044,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:374
-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 ""
@@ -4076,55 +4077,55 @@ msgstr ""
 msgid "About VLC media player"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:691
+#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:693
 #: modules/gui/macosx/intf.m:390
 msgid "Half Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:692
+#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:694
 #: modules/gui/macosx/intf.m:391
 msgid "Normal Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:693
+#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
 #: modules/gui/macosx/intf.m:392
 msgid "Double Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
-#: modules/gui/macosx/controls.m:702 modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:697
+#: modules/gui/macosx/controls.m:704 modules/gui/macosx/intf.m:395
 msgid "Float On Top"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:694
+#: modules/gui/macosx/controls.m:360 modules/gui/macosx/controls.m:696
 #: modules/gui/macosx/intf.m:393
 msgid "Fit To Screen"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:625 modules/gui/macosx/intf.m:326
-#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:386
+#: modules/gui/macosx/controls.m:627 modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:353
 msgid "Faster"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:626 modules/gui/macosx/intf.m:323
-#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:384
+#: modules/gui/macosx/controls.m:628 modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:351
 msgid "Slower"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:646 modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/controls.m:648 modules/gui/macosx/intf.m:322
 #: modules/gui/macosx/intf.m:366 modules/gui/macosx/intf.m:426
 msgid "Previous"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:665 modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/controls.m:667 modules/gui/macosx/intf.m:368
 msgid "Loop"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:672 modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/controls.m:674 modules/gui/macosx/intf.m:369
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:673 modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/controls.m:675 modules/gui/macosx/intf.m:370
 msgid "Step Backward"
 msgstr ""
 
@@ -4137,8 +4138,8 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:868
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
 msgid "Volume"
 msgstr ""
 
@@ -4194,7 +4195,7 @@ msgstr ""
 msgid "Open Recent"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1205
+#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1202
 msgid "Clear Menu"
 msgstr ""
 
@@ -4259,7 +4260,7 @@ msgstr ""
 msgid "VideoLAN Website"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1198
+#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1195
 msgid "License"
 msgstr "Licence"
 
@@ -4284,11 +4285,11 @@ msgstr ""
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4322,108 +4323,108 @@ msgstr ""
 msgid "MacOS X interface, sound and video"
 msgstr ""
 
-#: modules/gui/macosx/open.m:134
+#: modules/gui/macosx/open.m:135
 msgid "Open Source"
 msgstr ""
 
-#: modules/gui/macosx/open.m:136
+#: modules/gui/macosx/open.m:137
 msgid "Only enqueue in playlist, do not play"
 msgstr ""
 
-#: modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:147
 msgid "Treat as a pipe rather than as a file"
 msgstr ""
 
-#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:371
+#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:370
 msgid "VIDEO_TS folder"
 msgstr ""
 
-#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:389
-#: modules/gui/macosx/open.m:480
+#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:388
+#: modules/gui/macosx/open.m:479
 msgid "Audio CD"
 msgstr ""
 
-#: modules/gui/macosx/open.m:171
+#: modules/gui/macosx/open.m:172
 msgid "Load subtitles file:"
 msgstr ""
 
-#: modules/gui/macosx/open.m:174
+#: modules/gui/macosx/open.m:175
 msgid "Override"
 msgstr ""
 
-#: modules/gui/macosx/open.m:333 modules/gui/macosx/open.m:527
-#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:678
+#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:677
 msgid "Open"
 msgstr ""
 
-#: modules/gui/macosx/open.m:423 modules/gui/macosx/open.m:475
-#: modules/gui/macosx/open.m:483 modules/gui/macosx/open.m:491
+#: modules/gui/macosx/open.m:422 modules/gui/macosx/open.m:474
+#: modules/gui/macosx/open.m:482 modules/gui/macosx/open.m:490
 msgid "No %@s found"
 msgstr ""
 
-#: modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:525
 msgid "Open VIDEO_TS Directory"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132
+#: modules/gui/macosx/output.m:124
 msgid "Advanced output:"
 msgstr ""
 
-#: modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:128
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:235
-#: modules/gui/macosx/output.m:316
+#: modules/gui/macosx/output.m:131 modules/gui/macosx/output.m:225
+#: modules/gui/macosx/output.m:306
 msgid "Stream"
 msgstr ""
 
-#: modules/gui/macosx/output.m:143
+#: modules/gui/macosx/output.m:135
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:149 modules/gui/wxwindows/streamout.cpp:530
+#: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:150
+#: modules/gui/macosx/output.m:142
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:151 modules/gui/macosx/output.m:305
-#: modules/gui/macosx/output.m:358
+#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:295
+#: modules/gui/macosx/output.m:348
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:152 modules/gui/macosx/output.m:307
-#: modules/gui/macosx/output.m:360
+#: modules/gui/macosx/output.m:144 modules/gui/macosx/output.m:297
+#: modules/gui/macosx/output.m:350
 msgid "MPEG1"
 msgstr ""
 
-#: modules/gui/macosx/output.m:154 modules/gui/macosx/output.m:304
-#: modules/gui/macosx/output.m:364
+#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:294
+#: modules/gui/macosx/output.m:354
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:157
+#: modules/gui/macosx/output.m:149
 msgid "Transcode options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:161 modules/gui/macosx/output.m:167
-#: modules/gui/wxwindows/streamout.cpp:609
-#: modules/gui/wxwindows/streamout.cpp:661
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:159
+#: modules/gui/wxwindows/streamout.cpp:610
+#: modules/gui/wxwindows/streamout.cpp:662
 msgid "Bitrate (kb/s)"
 msgstr ""
 
-#: modules/gui/macosx/output.m:174 modules/gui/wxwindows/streamout.cpp:483
+#: modules/gui/macosx/output.m:166 modules/gui/wxwindows/streamout.cpp:484
 msgid "Miscellaneous Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:175
+#: modules/gui/macosx/output.m:167
 msgid "Announce streams via SAP Channel:"
 msgstr ""
 
-#: modules/gui/macosx/output.m:306 modules/gui/macosx/output.m:366
+#: modules/gui/macosx/output.m:296 modules/gui/macosx/output.m:356
 msgid "mp4"
 msgstr ""
 
@@ -4505,168 +4506,168 @@ msgstr ""
 msgid "FileInfo"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:256
+#: modules/gui/wxwindows/interface.cpp:223
 msgid "Open a DVD or (S)VCD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:257
+#: modules/gui/wxwindows/interface.cpp:224
 msgid "Open a network stream"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:258
+#: modules/gui/wxwindows/interface.cpp:225
 msgid "Open a satellite stream"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:226
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:260
+#: modules/gui/wxwindows/interface.cpp:227
 msgid "Exit this program"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:262
+#: modules/gui/wxwindows/interface.cpp:229
 msgid "Open the playlist"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:230
 msgid "Show the program logs"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:264
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:266
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:268
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "About this program"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:272 modules/gui/wxwindows/menus.cpp:108
+#: modules/gui/wxwindows/interface.cpp:239 modules/gui/wxwindows/menus.cpp:108
 msgid "Simple &Open ..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:274 modules/gui/wxwindows/menus.cpp:109
+#: modules/gui/wxwindows/interface.cpp:241 modules/gui/wxwindows/menus.cpp:109
 msgid "Open &File..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:276 modules/gui/wxwindows/menus.cpp:110
+#: modules/gui/wxwindows/interface.cpp:243 modules/gui/wxwindows/menus.cpp:110
 msgid "Open &Disc..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:278 modules/gui/wxwindows/menus.cpp:111
+#: modules/gui/wxwindows/interface.cpp:245 modules/gui/wxwindows/menus.cpp:111
 msgid "Open &Network Stream..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:281
+#: modules/gui/wxwindows/interface.cpp:248
 msgid "Open &Satellite Stream..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:286
+#: modules/gui/wxwindows/interface.cpp:253
 msgid "&Eject Disc"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:290
+#: modules/gui/wxwindows/interface.cpp:257
 msgid "E&xit"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:261
 msgid "&Playlist..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:263
 msgid "&Messages..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:264
 msgid "&File info..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:269
 msgid "&Preferences..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:286
 msgid "&About..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:290
 msgid "&File"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:291
 msgid "&View"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:292
 msgid "&Settings"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:326
-#: modules/gui/wxwindows/interface.cpp:482
-#: modules/gui/wxwindows/interface.cpp:530
+#: modules/gui/wxwindows/interface.cpp:293
+#: modules/gui/wxwindows/interface.cpp:414
+#: modules/gui/wxwindows/interface.cpp:462
 msgid "&Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:327
-#: modules/gui/wxwindows/interface.cpp:501
-#: modules/gui/wxwindows/interface.cpp:534
+#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:433
+#: modules/gui/wxwindows/interface.cpp:466
 msgid "&Video"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:328
-#: modules/gui/wxwindows/interface.cpp:520
-#: modules/gui/wxwindows/interface.cpp:538
+#: modules/gui/wxwindows/interface.cpp:295
+#: modules/gui/wxwindows/interface.cpp:452
+#: modules/gui/wxwindows/interface.cpp:470
 msgid "&Navigation"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:329
+#: modules/gui/wxwindows/interface.cpp:296
 msgid "&Help"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:345
+#: modules/gui/wxwindows/interface.cpp:312
 msgid "Stop current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/wxwindows/interface.cpp:313
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:347
+#: modules/gui/wxwindows/interface.cpp:314
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:348
+#: modules/gui/wxwindows/interface.cpp:315
 #: modules/gui/wxwindows/playlist.cpp:353
 msgid "Open playlist"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:316
 msgid "Previous playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:350
+#: modules/gui/wxwindows/interface.cpp:317
 msgid "Next playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/wxwindows/interface.cpp:318
 msgid "Play slower"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:352
+#: modules/gui/wxwindows/interface.cpp:319
 msgid "Play faster"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:574
+#: modules/gui/wxwindows/interface.cpp:506
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:575
+#: modules/gui/wxwindows/interface.cpp:507
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
@@ -4674,20 +4675,20 @@ msgstr ""
 "© 1996-2003 the VideoLAN team\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:576
+#: modules/gui/wxwindows/interface.cpp:508
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:578
+#: modules/gui/wxwindows/interface.cpp:510
 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:582
+#: modules/gui/wxwindows/interface.cpp:514
 #, c-format
 msgid "About %s"
 msgstr ""
@@ -4724,45 +4725,49 @@ msgstr ""
 msgid "Save Messages As a file..."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:181
+#: modules/gui/wxwindows/open.cpp:177
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:198 modules/gui/wxwindows/subtitles.cpp:98
-msgid "Subtitles file"
+#: modules/gui/wxwindows/open.cpp:195
+msgid "Use VLC as a stream server"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:199
-msgid "Load an additional subtitles file. Currently only works with AVI files."
+#: modules/gui/wxwindows/open.cpp:216
+msgid "Capture input stream"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:222
-msgid "Use VLC as a stream server"
+#: modules/gui/wxwindows/open.cpp:218
+msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:242
-msgid "Capture input stream"
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+msgid "Subtitles file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:244
-msgid "Capture the stream you are playing to a file"
+#: modules/gui/wxwindows/open.cpp:349
+msgid "Load an additional subtitles file. Currently only works with AVI files."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:383
+#: modules/gui/wxwindows/open.cpp:385
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:386
+#: modules/gui/wxwindows/open.cpp:388
 msgid "CD Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:886 modules/gui/wxwindows/streamout.cpp:785
+#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
 msgid "Save file"
 msgstr ""
 
+#: modules/gui/wxwindows/open.cpp:953
+msgid "Advanced open options"
+msgstr ""
+
 #: modules/gui/wxwindows/playlist.cpp:116
 msgid "&Simple Add..."
 msgstr ""
@@ -4815,58 +4820,58 @@ msgstr ""
 msgid "Reset config file"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:898
+#: modules/gui/wxwindows/preferences.cpp:901
 msgid "No configuration options available"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:919
+#: modules/gui/wxwindows/preferences.cpp:922
 msgid "Advanced options"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:190
+#: modules/gui/wxwindows/streamout.cpp:186
 msgid "Stream output MRL"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:194
+#: modules/gui/wxwindows/streamout.cpp:190
 msgid "Destination Target:"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:197
+#: modules/gui/wxwindows/streamout.cpp:193
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:377
+#: modules/gui/wxwindows/streamout.cpp:378
 msgid "Output Methods"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:383
+#: modules/gui/wxwindows/streamout.cpp:384
 msgid "Play locally"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:407
+#: modules/gui/wxwindows/streamout.cpp:408
 msgid "Filename"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:495
+#: modules/gui/wxwindows/streamout.cpp:496
 msgid "SAP Announce"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:497
+#: modules/gui/wxwindows/streamout.cpp:498
 msgid "Channel Name "
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:569
+#: modules/gui/wxwindows/streamout.cpp:570
 msgid "Transcoding options"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:602
+#: modules/gui/wxwindows/streamout.cpp:603
 msgid "Video codec"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:649
+#: modules/gui/wxwindows/streamout.cpp:650
 msgid "Audio codec"
 msgstr ""
 
@@ -4951,27 +4956,27 @@ msgstr ""
 msgid "Using the dummy interface plugin..."
 msgstr ""
 
-#: modules/misc/freetype.c:65 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr ""
 
-#: modules/misc/freetype.c:66
+#: modules/misc/freetype.c:68
 msgid "Filename of Font"
 msgstr ""
 
-#: modules/misc/freetype.c:67
+#: modules/misc/freetype.c:69
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:70
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:71
+#: modules/misc/freetype.c:73
 msgid "Fonts"
 msgstr ""
 
-#: modules/misc/freetype.c:74
+#: modules/misc/freetype.c:76
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5008,6 +5013,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 ""
@@ -5024,10 +5033,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 ""
diff --git a/po/fr.po b/po/fr.po
index a53f7a0aef..f6b4ef7852 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-07-24 00:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-29 19:02+0200\n"
 "PO-Revision-Date: 2001-12-10 13:32+0100\n"
 "Last-Translator: Jean-Pierre Kuypers <Kuypers@sri.ucl.ac.be> 2003-07-27\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: include/vlc_interface.h:105
 msgid ""
@@ -32,7 +32,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:173 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:179 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:386
 msgid "Stereo"
@@ -128,8 +128,8 @@ msgstr "Programme"
 #: 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:373
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:404
+#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:406
 msgid "Title"
 msgstr "Titre"
 
@@ -137,8 +137,8 @@ msgstr "Titre"
 #: 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:375
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
+#: modules/gui/wxwindows/open.cpp:412
 msgid "Chapter"
 msgstr "Chapitre"
 
@@ -279,8 +279,8 @@ msgid ""
 msgstr ""
 "Cette option permet de choisir des interfaces supplémentaires à utiliser. "
 "Elles seront lancées en tâche de fond en plus de l'interface prédéfini. "
-"Utilisez une liste de modules séparés par des virgules. "
-"(Les valeurs courantes sont logger, gestures, sap, rc, http, screensaver.)"
+"Utilisez une liste de modules séparés par des virgules. (Les valeurs "
+"courantes sont logger, gestures, sap, rc, http, screensaver.)"
 
 #: src/libvlc.h:55
 msgid "Verbosity (0,1,2)"
@@ -462,8 +462,8 @@ msgid ""
 "used by default when possible (ie. if your hardware supports it as well as "
 "the audio stream being played)"
 msgstr ""
-"Cette option permet de fixer le mode des canaux de sortie audio à utiliser "
-"a priori si possible (i.e. si le matériel en est capable, de même que le flux "
+"Cette option permet de fixer le mode des canaux de sortie audio à utiliser a "
+"priori si possible (i.e. si le matériel en est capable, de même que le flux "
 "audio à jouer)."
 
 #: src/libvlc.h:136
@@ -1121,7 +1121,7 @@ msgstr "Interface"
 #: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
 #: modules/demux/ogg.c:1002 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:378 modules/gui/macosx/output.m:164
+#: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "Audio"
 
@@ -1130,7 +1130,7 @@ msgstr "Audio"
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:909
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
-#: modules/gui/macosx/output.m:158 modules/misc/dummy/dummy.c:81
+#: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
 #: modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "Vidéo"
@@ -1149,7 +1149,7 @@ msgstr "Encodeurs"
 
 #: src/libvlc.h:547 modules/gui/gtk/gnome_interface.c:2042
 #: modules/gui/gtk/gtk_interface.c:2361 modules/gui/gtk/gtk_interface.c:3034
-#: modules/gui/wxwindows/open.cpp:221 modules/gui/wxwindows/streamout.cpp:175
+#: modules/gui/wxwindows/open.cpp:194 modules/gui/wxwindows/streamout.cpp:171
 msgid "Stream output"
 msgstr "Flux de sortie"
 
@@ -1163,7 +1163,7 @@ msgstr "Processeur"
 #: 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:321
 #: modules/gui/macosx/intf.m:409 modules/gui/pda/interface.c:612
-#: modules/gui/wxwindows/interface.cpp:378
+#: modules/gui/wxwindows/interface.cpp:345
 #: modules/gui/wxwindows/playlist.cpp:104
 msgid "Playlist"
 msgstr "Liste de lecture"
@@ -1208,8 +1208,8 @@ msgid "boolean"
 msgstr "Booléen"
 
 #: src/video_output/video_output.c:406 modules/gui/beos/VideoOutput.cpp:1151
-#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:348
-#: modules/gui/macosx/controls.m:690 modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:350
+#: modules/gui/macosx/controls.m:692 modules/gui/macosx/intf.m:394
 msgid "Fullscreen"
 msgstr "Plein écran"
 
@@ -1243,7 +1243,7 @@ msgstr "Lin
 
 #: modules/access/cdda.c:86 modules/access/file.c:72 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
-#: modules/access/v4l/v4l.c:67
+#: modules/access/v4l/v4l.c:66
 msgid "Caching value in ms"
 msgstr "Taille de la cache en ms"
 
@@ -1385,6 +1385,38 @@ 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:66
+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:74 modules/access/udp.c:72
+msgid "caching value in ms"
+msgstr "Taille de la cache en ms"
+
+#: modules/access_output/udp.c:76 modules/access/udp.c:74
+msgid ""
+"Allows you to modify the default caching value for udp streams. This value "
+"should be set in miliseconds units."
+msgstr ""
+"Cette option permet de modifier la taille de la cache pour les flux UDP. "
+"Cette valeur est en millisecondes"
+
+#: modules/access_output/udp.c:80
+msgid "UDP stream ouput"
+msgstr "Flux de sortie UDP"
+
+#: modules/access_output/udp.c:81
+msgid "udp stream output"
+msgstr ""
+
 #: modules/access/pvr/pvr.c:75
 msgid "Hauppauge PVR cards input"
 msgstr ""
@@ -1433,18 +1465,6 @@ msgstr "Entr
 msgid "slp"
 msgstr ""
 
-#: modules/access/udp.c:72 modules/access_output/udp.c:74
-msgid "caching value in ms"
-msgstr "Taille de la cache en ms"
-
-#: modules/access/udp.c:74 modules/access_output/udp.c:76
-msgid ""
-"Allows you to modify the default caching value for udp streams. This value "
-"should be set in miliseconds units."
-msgstr ""
-"Cette option permet de modifier la taille de la cache pour les flux UDP. "
-"Cette valeur est en millisecondes"
-
 #: modules/access/udp.c:78
 msgid "UDP/RTP input"
 msgstr "Lecture UDP/RTP"
@@ -1453,7 +1473,7 @@ msgstr "Lecture UDP/RTP"
 msgid "udp"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:69
+#: modules/access/v4l/v4l.c:68
 msgid ""
 "Allows you to modify the default caching value for v4l streams. This value "
 "should be set in miliseconds units."
@@ -1461,15 +1481,15 @@ msgstr ""
 "Cette option permet de modifier la taille de la cache pour les flux v4l. "
 "Cette valeur est en millisecondes."
 
-#: modules/access/v4l/v4l.c:73
+#: modules/access/v4l/v4l.c:72
 msgid "Video4Linux input"
 msgstr "Lecture Video4Linux"
 
-#: modules/access/v4l/v4l.c:74
+#: modules/access/v4l/v4l.c:73
 msgid "v4l"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:82
+#: modules/access/v4l/v4l.c:81
 msgid "Video4Linux demuxer"
 msgstr "Lecture Video4Linux"
 
@@ -1477,26 +1497,6 @@ msgstr "Lecture Video4Linux"
 msgid "VCD input"
 msgstr "Lecture VCD"
 
-#: modules/access_output/dummy.c:56
-msgid "Dummy stream ouput"
-msgstr "Flux de sortie muet"
-
-#: modules/access_output/file.c:66
-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:80
-msgid "UDP stream ouput"
-msgstr "Flux de sortie UDP"
-
-#: modules/access_output/udp.c:81
-msgid "udp stream output"
-msgstr ""
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr "Dimension caractéristique"
@@ -1646,7 +1646,7 @@ msgstr "Nom du p
 msgid "ALSA audio output"
 msgstr "Sortie audio ALSA"
 
-#: modules/audio_output/alsa.c:116 modules/audio_output/coreaudio.c:218
+#: modules/audio_output/alsa.c:117 modules/audio_output/coreaudio.c:218
 #: modules/audio_output/coreaudio.c:1473 modules/audio_output/directx.c:377
 #: modules/audio_output/oss.c:129 modules/audio_output/sdl.c:176
 #: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:337
@@ -1654,23 +1654,23 @@ msgstr "Sortie audio ALSA"
 msgid "Audio device"
 msgstr "Périphérique audio"
 
-#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:173 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:399
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:180 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:208 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1947,14 +1947,14 @@ msgstr "Parseur MPEG audio couches I/II/III"
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr "Décodeur audio MPEG I/II layer 1/2"
 
-#: 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"
@@ -1967,10 +1967,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!"
@@ -1979,6 +1975,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"
@@ -2213,9 +2213,9 @@ 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:924
-#: modules/gui/macosx/intf.m:925 modules/gui/macosx/intf.m:926
-#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:797
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
+#: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
+#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:685
 msgid "Pause"
 msgstr "Suspendre"
 
@@ -2223,11 +2223,11 @@ msgstr "Suspendre"
 #: 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:324 modules/gui/macosx/intf.m:362
-#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:931
-#: modules/gui/macosx/intf.m:932 modules/gui/macosx/intf.m:933
+#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
+#: modules/gui/macosx/intf.m:929 modules/gui/macosx/intf.m:930
 #: modules/gui/macosx/playlist.m:194 modules/gui/pda/interface.c:192
-#: modules/gui/wxwindows/interface.cpp:375
-#: modules/gui/wxwindows/interface.cpp:803
+#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:691
 msgid "Play"
 msgstr "Lire"
 
@@ -2283,7 +2283,7 @@ msgstr "Couche"
 #: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
 #: 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/output.m:170 modules/gui/wxwindows/streamout.cpp:667
+#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr "Canaux"
 
@@ -2309,7 +2309,7 @@ msgstr "Nombre de flux"
 #: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
 #: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:147 modules/gui/pda/interface.c:372
+#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr ""
 
@@ -3035,19 +3035,19 @@ msgstr "Messages"
 #: modules/gui/gtk/gnome_interface.c:2847 modules/gui/gtk/gtk_interface.c:618
 #: 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:138 modules/gui/macosx/output.m:218
-#: modules/gui/macosx/output.m:310 modules/gui/pda/interface.c:380
-#: modules/gui/wxwindows/interface.cpp:362 modules/gui/wxwindows/open.cpp:279
-#: modules/gui/wxwindows/streamout.cpp:384
+#: modules/gui/macosx/open.m:142 modules/gui/macosx/open.m:263
+#: modules/gui/macosx/output.m:130 modules/gui/macosx/output.m:208
+#: modules/gui/macosx/output.m:300 modules/gui/pda/interface.c:380
+#: modules/gui/wxwindows/interface.cpp:329 modules/gui/wxwindows/open.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:385
 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/macosx/open.m:630 modules/gui/macosx/open.m:677
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:331
+#: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:676
 msgid "Open File"
 msgstr "Ouvrir un fichier"
 
@@ -3108,11 +3108,11 @@ msgstr "Liste de lecture"
 #: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
 #: 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:606 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:134
-#: modules/gui/wxwindows/open.cpp:270
+#: modules/gui/gtk/preferences.c:606 modules/gui/macosx/open.m:139
+#: modules/gui/macosx/open.m:180 modules/gui/macosx/output.m:126
+#: modules/gui/wxwindows/open.cpp:244 modules/gui/wxwindows/open.cpp:971
 #: modules/gui/wxwindows/preferences.cpp:253
-#: modules/gui/wxwindows/streamout.cpp:221
+#: modules/gui/wxwindows/streamout.cpp:217
 #: modules/gui/wxwindows/subtitles.cpp:149
 msgid "OK"
 msgstr ""
@@ -3196,7 +3196,7 @@ msgstr "Appliquer"
 
 #: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:597 modules/gui/gtk/preferences.c:614
-#: modules/gui/macosx/output.m:375 modules/gui/macosx/prefs.m:78
+#: modules/gui/macosx/output.m:365 modules/gui/macosx/prefs.m:78
 #: modules/gui/wxwindows/preferences.cpp:257
 msgid "Save"
 msgstr "Enregistrer"
@@ -3265,8 +3265,8 @@ msgid "VLC media player"
 msgstr "Lecteur multimédia VLC"
 
 #: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:700
-#: modules/gui/wxwindows/preferences.cpp:1026
+#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr "Ouvrir un fichier"
@@ -3289,10 +3289,10 @@ 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:639
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:641
 #: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
 #: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Stop"
 msgstr "Stop"
 
@@ -3323,9 +3323,9 @@ msgid "UDP/RTP (Address when Multicast)"
 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:141 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:467 modules/gui/wxwindows/streamout.cpp:424
+#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
+#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
+#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
 msgid "Address"
 msgstr "Adresse"
 
@@ -3333,16 +3333,16 @@ msgstr "Adresse"
 #: modules/gui/gtk/gnome_interface.c:1786
 #: 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:142 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:452 modules/gui/wxwindows/open.cpp:475
-#: modules/gui/wxwindows/streamout.cpp:435
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
 msgid "Port"
 msgstr "Port"
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:144
-#: modules/gui/macosx/output.m:246 modules/gui/macosx/output.m:321
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:385
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
+#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
 msgid "HTTP"
 msgstr "HTTP"
 
@@ -3356,9 +3356,9 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
 #: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:143
-#: modules/gui/macosx/open.m:272 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:283
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
 msgid "Network"
 msgstr "Réseau"
 
@@ -3422,10 +3422,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
 #: modules/gui/pda/support.c:121
 #, c-format
 msgid "Couldn't find pixmap file: %s"
@@ -3437,6 +3437,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 "Interface Gtk+"
+
+#: modules/gui/gtk2/gnome2_interface.c:31
+msgid "_New"
+msgstr "_Nouveau"
+
+#: 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:364
+msgid "Save File"
+msgstr "Enregistrer le fichier"
+
+#: 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 "_Fichier"
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+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
+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
 msgid "Show tooltips"
 msgstr "Afficher les bulles d'aide"
@@ -3481,7 +3539,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:255
+#: modules/gui/wxwindows/interface.cpp:222
 msgid "Open a file"
 msgstr "Ouvre un fichier"
 
@@ -3593,7 +3651,7 @@ 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:686 modules/gui/macosx/intf.m:381
+#: modules/gui/macosx/controls.m:688 modules/gui/macosx/intf.m:381
 msgid "Mute"
 msgstr "Muet"
 
@@ -3619,7 +3677,7 @@ msgstr "Plein 
 
 #: 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/output.m:137 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/output.m:129 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr "Écran"
 
@@ -3635,19 +3693,19 @@ msgstr "_Vid
 #: modules/gui/gtk/gnome_interface.c:1690
 #: 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:364
-#: modules/gui/wxwindows/open.cpp:281
+#: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:143
+#: modules/gui/macosx/open.m:267 modules/gui/wxwindows/interface.cpp:331
+#: modules/gui/wxwindows/open.cpp:255
 msgid "Disc"
 msgstr "Disque"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:366
+#: modules/gui/wxwindows/interface.cpp:333
 msgid "Net"
 msgstr "Réseau"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:369
+#: modules/gui/wxwindows/interface.cpp:336
 msgid "Sat"
 msgstr "Sat"
 
@@ -3709,7 +3767,7 @@ msgstr "Ouvrir 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:380
+#: modules/gui/wxwindows/interface.cpp:347
 msgid "Prev"
 msgstr "Précédent"
 
@@ -3720,9 +3778,9 @@ msgstr "Fichier pr
 #: modules/gui/gtk/gnome_interface.c:667
 #: 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:647
+#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:649
 #: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
-#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:382
+#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:349
 msgid "Next"
 msgstr "Suivant"
 
@@ -3800,17 +3858,17 @@ msgid "Open Stream"
 msgstr "Ouvrir un flux"
 
 #: modules/gui/gtk/gnome_interface.c:1476 modules/gui/gtk/gtk_interface.c:1791
-#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:173
+#: modules/gui/macosx/open.m:136 modules/gui/wxwindows/open.cpp:169
 msgid "Media Resource Locator (MRL)"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1498 modules/gui/gtk/gtk_interface.c:1813
-#: modules/gui/wxwindows/open.cpp:177
+#: modules/gui/wxwindows/open.cpp:173
 msgid "Open Target:"
 msgstr "Ouvrir le flux:"
 
 #: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:192
+#: modules/gui/wxwindows/open.cpp:188
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -3820,63 +3878,63 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1562
 #: 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:140 modules/gui/macosx/prefs.m:464
-#: modules/gui/wxwindows/open.cpp:249 modules/gui/wxwindows/open.cpp:365
-#: modules/gui/wxwindows/preferences.cpp:829
-#: modules/gui/wxwindows/streamout.cpp:411
+#: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:152 modules/gui/macosx/open.m:174
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/prefs.m:464
+#: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
+#: modules/gui/wxwindows/preferences.cpp:832
+#: modules/gui/wxwindows/streamout.cpp:412
 #: modules/gui/wxwindows/subtitles.cpp:107
 msgid "Browse..."
 msgstr "Parcourir..."
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:390
+#: modules/gui/wxwindows/open.cpp:392
 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:384
+#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:487
+#: modules/gui/wxwindows/open.cpp:386
 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:385
+#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:381
+#: modules/gui/macosx/open.m:471 modules/gui/wxwindows/open.cpp:387
 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:396
+#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:398
 msgid "Device name"
 msgstr "Nom du périphérique"
 
 #: modules/gui/gtk/gnome_interface.c:1660 modules/gui/gtk/gtk_interface.c:1996
-#: modules/gui/macosx/open.m:152
+#: modules/gui/macosx/open.m:153
 msgid "Use DVD menus"
 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:431
+#: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:546
+#: modules/gui/macosx/open.m:584 modules/gui/wxwindows/open.cpp:433
 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:432
+#: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:547
+#: modules/gui/macosx/open.m:596 modules/gui/wxwindows/open.cpp:434
 msgid "UDP/RTP Multicast"
 msgstr "Multidiff. 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:433
+#: modules/gui/macosx/open.m:167 modules/gui/macosx/open.m:548
+#: modules/gui/macosx/open.m:609 modules/gui/wxwindows/open.cpp:435
 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:489
+#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr ""
 
@@ -3905,23 +3963,23 @@ msgid "Horizontal"
 msgstr "Horizontale"
 
 #: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
-#: modules/gui/wxwindows/open.cpp:286
+#: modules/gui/wxwindows/open.cpp:260
 msgid "Satellite"
 msgstr "Satellite"
 
 #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322
-#: modules/gui/macosx/open.m:175
+#: modules/gui/macosx/open.m:176
 msgid "delay"
 msgstr "Délai"
 
 #: modules/gui/gtk/gnome_interface.c:2020 modules/gui/gtk/gtk_interface.c:2338
-#: modules/gui/macosx/open.m:177
+#: modules/gui/macosx/open.m:178
 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:133
-#: modules/gui/wxwindows/open.cpp:204 modules/gui/wxwindows/open.cpp:226
+#: modules/gui/macosx/open.m:173 modules/gui/macosx/output.m:125
+#: modules/gui/wxwindows/open.cpp:199 modules/gui/wxwindows/open.cpp:354
 msgid "Settings..."
 msgstr "Paramètres..."
 
@@ -3994,14 +4052,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:145 modules/gui/macosx/output.m:257
-#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:386
+#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:313 modules/gui/wxwindows/streamout.cpp:387
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:270
-#: modules/gui/macosx/output.m:333 modules/gui/wxwindows/streamout.cpp:387
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:260
+#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:388
 msgid "RTP"
 msgstr ""
 
@@ -4022,8 +4080,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:303
-#: modules/gui/macosx/output.m:362
+#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:293
+#: modules/gui/macosx/output.m:352
 msgid "AVI"
 msgstr ""
 
@@ -4040,11 +4098,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"
@@ -4061,10 +4114,6 @@ msgstr "Quitter"
 msgid "Exit the program"
 msgstr "Quitter 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"
@@ -4085,10 +4134,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..."
@@ -4109,7 +4154,7 @@ msgstr "Auteurs"
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr "L'équipe VideoLAN <videolan@videolan.org>"
 
-#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:154
+#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:150
 msgid "Open Target"
 msgstr "Ouvrir un flux"
 
@@ -4139,10 +4184,11 @@ msgstr "Configuration du flux de sortie"
 
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
-#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:139
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:273
+#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
+#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/wxwindows/open.cpp:974
 #: modules/gui/wxwindows/preferences.cpp:256
-#: modules/gui/wxwindows/streamout.cpp:224
+#: modules/gui/wxwindows/streamout.cpp:220
 #: modules/gui/wxwindows/subtitles.cpp:152
 msgid "Cancel"
 msgstr "Annuler"
@@ -4193,51 +4239,6 @@ msgstr "Configurer"
 msgid "Selected:"
 msgstr "Sélectionné :"
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-msgid "Gtk2 interface"
-msgstr "Interface Gtk+"
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-msgid "_New"
-msgstr "_Nouveau"
-
-#: 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:374
-msgid "Save File"
-msgstr "Enregistrer le fichier"
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-msgid "window1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-msgid "_Edit"
-msgstr "_Édition"
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-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"
@@ -4271,55 +4272,55 @@ msgstr "Modules"
 msgid "About VLC media player"
 msgstr "À propos du lecteur multimédia VLC"
 
-#: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:691
+#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:693
 #: modules/gui/macosx/intf.m:390
 msgid "Half Size"
 msgstr "Taille 50 %"
 
-#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:692
+#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:694
 #: modules/gui/macosx/intf.m:391
 msgid "Normal Size"
 msgstr "Taille 100 %"
 
-#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:693
+#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
 #: modules/gui/macosx/intf.m:392
 msgid "Double Size"
 msgstr "Taille 200 %"
 
-#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
-#: modules/gui/macosx/controls.m:702 modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:697
+#: modules/gui/macosx/controls.m:704 modules/gui/macosx/intf.m:395
 msgid "Float On Top"
 msgstr "Flotter au-dessus"
 
-#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:694
+#: modules/gui/macosx/controls.m:360 modules/gui/macosx/controls.m:696
 #: modules/gui/macosx/intf.m:393
 msgid "Fit To Screen"
 msgstr "Ajuster à l'écran"
 
-#: modules/gui/macosx/controls.m:625 modules/gui/macosx/intf.m:326
-#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:386
+#: modules/gui/macosx/controls.m:627 modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:353
 msgid "Faster"
 msgstr "Accélérer"
 
-#: modules/gui/macosx/controls.m:626 modules/gui/macosx/intf.m:323
-#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:384
+#: modules/gui/macosx/controls.m:628 modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:351
 msgid "Slower"
 msgstr "Ralentir"
 
-#: modules/gui/macosx/controls.m:646 modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/controls.m:648 modules/gui/macosx/intf.m:322
 #: modules/gui/macosx/intf.m:366 modules/gui/macosx/intf.m:426
 msgid "Previous"
 msgstr "Précédent"
 
-#: modules/gui/macosx/controls.m:665 modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/controls.m:667 modules/gui/macosx/intf.m:368
 msgid "Loop"
 msgstr "Tout répéter"
 
-#: modules/gui/macosx/controls.m:672 modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/controls.m:674 modules/gui/macosx/intf.m:369
 msgid "Step Forward"
 msgstr "Avancer"
 
-#: modules/gui/macosx/controls.m:673 modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/controls.m:675 modules/gui/macosx/intf.m:370
 msgid "Step Backward"
 msgstr "Reculer"
 
@@ -4332,8 +4333,8 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr "VLC - Contrôleur"
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:868
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
 msgid "Volume"
 msgstr ""
 
@@ -4389,7 +4390,7 @@ msgstr "Ouvrir un flux r
 msgid "Open Recent"
 msgstr "Ouvrir un flux récent"
 
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1205
+#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1202
 msgid "Clear Menu"
 msgstr "Tout effacer"
 
@@ -4454,7 +4455,7 @@ msgstr "Rapporter un probl
 msgid "VideoLAN Website"
 msgstr "Site web de VideoLAN"
 
-#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1198
+#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1195
 msgid "License"
 msgstr "Licence"
 
@@ -4483,11 +4484,11 @@ msgstr "Ouvrir la fen
 msgid "Dismiss"
 msgstr "Fermer"
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid "No CrashLog found"
 msgstr "Aucun CrashLog trouvé"
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4523,108 +4524,108 @@ msgstr "Place la fen
 msgid "MacOS X interface, sound and video"
 msgstr ""
 
-#: modules/gui/macosx/open.m:134
+#: modules/gui/macosx/open.m:135
 msgid "Open Source"
 msgstr "Ouvrir un flux"
 
-#: modules/gui/macosx/open.m:136
+#: modules/gui/macosx/open.m:137
 msgid "Only enqueue in playlist, do not play"
 msgstr "Ajouter les fichiers en fin de liste de lecture sans les jouer"
 
-#: modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:147
 msgid "Treat as a pipe rather than as a file"
 msgstr "Considérer comme un tuyau plutôt que comme un fichier"
 
-#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:371
+#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:370
 msgid "VIDEO_TS folder"
 msgstr "Dossier VIDEO_TS"
 
-#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:389
-#: modules/gui/macosx/open.m:480
+#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:388
+#: modules/gui/macosx/open.m:479
 msgid "Audio CD"
 msgstr "CD audio"
 
-#: modules/gui/macosx/open.m:171
+#: modules/gui/macosx/open.m:172
 msgid "Load subtitles file:"
 msgstr "Fichier de sous-titres :"
 
-#: modules/gui/macosx/open.m:174
+#: modules/gui/macosx/open.m:175
 msgid "Override"
 msgstr "Remplacer"
 
-#: modules/gui/macosx/open.m:333 modules/gui/macosx/open.m:527
-#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:678
+#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:677
 msgid "Open"
 msgstr "Ouvrir"
 
-#: modules/gui/macosx/open.m:423 modules/gui/macosx/open.m:475
-#: modules/gui/macosx/open.m:483 modules/gui/macosx/open.m:491
+#: modules/gui/macosx/open.m:422 modules/gui/macosx/open.m:474
+#: modules/gui/macosx/open.m:482 modules/gui/macosx/open.m:490
 msgid "No %@s found"
 msgstr "Aucun %@ trouvé"
 
-#: modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:525
 msgid "Open VIDEO_TS Directory"
 msgstr "Ouvrir un dossier VIDEO_TS"
 
-#: modules/gui/macosx/output.m:132
+#: modules/gui/macosx/output.m:124
 msgid "Advanced output:"
 msgstr "Options de sortie avancées :"
 
-#: modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:128
 msgid "Output Options"
 msgstr "Options de sortie"
 
-#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:235
-#: modules/gui/macosx/output.m:316
+#: modules/gui/macosx/output.m:131 modules/gui/macosx/output.m:225
+#: modules/gui/macosx/output.m:306
 msgid "Stream"
 msgstr "Flux"
 
-#: modules/gui/macosx/output.m:143
+#: modules/gui/macosx/output.m:135
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:149 modules/gui/wxwindows/streamout.cpp:530
+#: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr "Méthode d'encapsulation"
 
-#: modules/gui/macosx/output.m:150
+#: modules/gui/macosx/output.m:142
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:151 modules/gui/macosx/output.m:305
-#: modules/gui/macosx/output.m:358
+#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:295
+#: modules/gui/macosx/output.m:348
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:152 modules/gui/macosx/output.m:307
-#: modules/gui/macosx/output.m:360
+#: modules/gui/macosx/output.m:144 modules/gui/macosx/output.m:297
+#: modules/gui/macosx/output.m:350
 msgid "MPEG1"
 msgstr ""
 
-#: modules/gui/macosx/output.m:154 modules/gui/macosx/output.m:304
-#: modules/gui/macosx/output.m:364
+#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:294
+#: modules/gui/macosx/output.m:354
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:157
+#: modules/gui/macosx/output.m:149
 msgid "Transcode options"
 msgstr "Options de transcodage"
 
-#: modules/gui/macosx/output.m:161 modules/gui/macosx/output.m:167
-#: modules/gui/wxwindows/streamout.cpp:609
-#: modules/gui/wxwindows/streamout.cpp:661
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:159
+#: modules/gui/wxwindows/streamout.cpp:610
+#: modules/gui/wxwindows/streamout.cpp:662
 msgid "Bitrate (kb/s)"
 msgstr "Débit (kbps)"
 
-#: modules/gui/macosx/output.m:174 modules/gui/wxwindows/streamout.cpp:483
+#: modules/gui/macosx/output.m:166 modules/gui/wxwindows/streamout.cpp:484
 msgid "Miscellaneous Options"
 msgstr "Options diverses"
 
-#: modules/gui/macosx/output.m:175
+#: modules/gui/macosx/output.m:167
 msgid "Announce streams via SAP Channel:"
 msgstr "Annoncer le flux via un canal SAP :"
 
-#: modules/gui/macosx/output.m:306 modules/gui/macosx/output.m:366
+#: modules/gui/macosx/output.m:296 modules/gui/macosx/output.m:356
 msgid "mp4"
 msgstr ""
 
@@ -4708,166 +4709,166 @@ msgstr "Interface skinnable"
 msgid "FileInfo"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:256
+#: modules/gui/wxwindows/interface.cpp:223
 msgid "Open a DVD or (S)VCD"
 msgstr "Ouvre un DVD ou un (S)VCD"
 
-#: modules/gui/wxwindows/interface.cpp:257
+#: modules/gui/wxwindows/interface.cpp:224
 msgid "Open a network stream"
 msgstr "Sélectionne un flux réseau"
 
-#: modules/gui/wxwindows/interface.cpp:258
+#: modules/gui/wxwindows/interface.cpp:225
 msgid "Open a satellite stream"
 msgstr "Ouvrir une carte satellite"
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:226
 msgid "Eject the DVD/CD"
 msgstr "Éjecter le DVD/CD"
 
-#: modules/gui/wxwindows/interface.cpp:260
+#: modules/gui/wxwindows/interface.cpp:227
 msgid "Exit this program"
 msgstr "Quitter le programme"
 
-#: modules/gui/wxwindows/interface.cpp:262
+#: modules/gui/wxwindows/interface.cpp:229
 msgid "Open the playlist"
 msgstr "Ouvrir la liste de lecture"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:230
 msgid "Show the program logs"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:264
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Show information about the file being played"
 msgstr "Afficher les détails sur le fichier en cours"
 
-#: modules/gui/wxwindows/interface.cpp:266
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:268
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "About this program"
 msgstr "À propos de ce programme"
 
-#: modules/gui/wxwindows/interface.cpp:272 modules/gui/wxwindows/menus.cpp:108
+#: modules/gui/wxwindows/interface.cpp:239 modules/gui/wxwindows/menus.cpp:108
 #, fuzzy
 msgid "Simple &Open ..."
 msgstr "&Ouvrir un fichier..."
 
-#: modules/gui/wxwindows/interface.cpp:274 modules/gui/wxwindows/menus.cpp:109
+#: modules/gui/wxwindows/interface.cpp:241 modules/gui/wxwindows/menus.cpp:109
 #, fuzzy
 msgid "Open &File..."
 msgstr "Ouvrir un fichier..."
 
-#: modules/gui/wxwindows/interface.cpp:276 modules/gui/wxwindows/menus.cpp:110
+#: modules/gui/wxwindows/interface.cpp:243 modules/gui/wxwindows/menus.cpp:110
 msgid "Open &Disc..."
 msgstr "Ouvrir un &disque..."
 
-#: modules/gui/wxwindows/interface.cpp:278 modules/gui/wxwindows/menus.cpp:111
+#: modules/gui/wxwindows/interface.cpp:245 modules/gui/wxwindows/menus.cpp:111
 #, fuzzy
 msgid "Open &Network Stream..."
 msgstr "&Flux réseau..."
 
-#: modules/gui/wxwindows/interface.cpp:281
+#: modules/gui/wxwindows/interface.cpp:248
 #, fuzzy
 msgid "Open &Satellite Stream..."
 msgstr "Flux &satellite..."
 
-#: modules/gui/wxwindows/interface.cpp:286
+#: modules/gui/wxwindows/interface.cpp:253
 msgid "&Eject Disc"
 msgstr "Éjecter le disque"
 
-#: modules/gui/wxwindows/interface.cpp:290
+#: modules/gui/wxwindows/interface.cpp:257
 msgid "E&xit"
 msgstr "Quitter"
 
-#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:261
 msgid "&Playlist..."
 msgstr "Liste de lecture..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:263
 msgid "&Messages..."
 msgstr "&Messages..."
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:264
 msgid "&File info..."
 msgstr "&Infos fichier..."
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:269
 msgid "&Preferences..."
 msgstr "&Préférences..."
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:286
 msgid "&About..."
 msgstr "&À propos..."
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:290
 msgid "&File"
 msgstr "&Fichier"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:291
 msgid "&View"
 msgstr "&Vue"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:292
 msgid "&Settings"
 msgstr "&Paramètres"
 
-#: modules/gui/wxwindows/interface.cpp:326
-#: modules/gui/wxwindows/interface.cpp:482
-#: modules/gui/wxwindows/interface.cpp:530
+#: modules/gui/wxwindows/interface.cpp:293
+#: modules/gui/wxwindows/interface.cpp:414
+#: modules/gui/wxwindows/interface.cpp:462
 msgid "&Audio"
 msgstr "&Audio"
 
-#: modules/gui/wxwindows/interface.cpp:327
-#: modules/gui/wxwindows/interface.cpp:501
-#: modules/gui/wxwindows/interface.cpp:534
+#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:433
+#: modules/gui/wxwindows/interface.cpp:466
 msgid "&Video"
 msgstr "&Vidéo"
 
-#: modules/gui/wxwindows/interface.cpp:328
-#: modules/gui/wxwindows/interface.cpp:520
-#: modules/gui/wxwindows/interface.cpp:538
+#: modules/gui/wxwindows/interface.cpp:295
+#: modules/gui/wxwindows/interface.cpp:452
+#: modules/gui/wxwindows/interface.cpp:470
 msgid "&Navigation"
 msgstr "&Navigation"
 
-#: modules/gui/wxwindows/interface.cpp:329
+#: modules/gui/wxwindows/interface.cpp:296
 msgid "&Help"
 msgstr "&Aide"
 
-#: modules/gui/wxwindows/interface.cpp:345
+#: modules/gui/wxwindows/interface.cpp:312
 msgid "Stop current playlist item"
 msgstr "Arrête l'élément de liste de lecture en cours"
 
-#: modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/wxwindows/interface.cpp:313
 msgid "Play current playlist item"
 msgstr "Joue l'élément de liste de lecture en cours"
 
-#: modules/gui/wxwindows/interface.cpp:347
+#: modules/gui/wxwindows/interface.cpp:314
 msgid "Pause current playlist item"
 msgstr "Suspend l'élément de liste de lecture en cours"
 
-#: modules/gui/wxwindows/interface.cpp:348
+#: modules/gui/wxwindows/interface.cpp:315
 #: modules/gui/wxwindows/playlist.cpp:353
 msgid "Open playlist"
 msgstr "Ouvre la liste de lecture"
 
-#: modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:316
 msgid "Previous playlist item"
 msgstr "Fichier précédent"
 
-#: modules/gui/wxwindows/interface.cpp:350
+#: modules/gui/wxwindows/interface.cpp:317
 msgid "Next playlist item"
 msgstr "Fichier suivant"
 
-#: modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/wxwindows/interface.cpp:318
 msgid "Play slower"
 msgstr "Jouer plus lentement"
 
-#: modules/gui/wxwindows/interface.cpp:352
+#: modules/gui/wxwindows/interface.cpp:319
 msgid "Play faster"
 msgstr "Jouer plus rapidement"
 
-#: modules/gui/wxwindows/interface.cpp:574
+#: modules/gui/wxwindows/interface.cpp:506
 msgid ""
 " (wxWindows interface)\n"
 "\n"
@@ -4875,7 +4876,7 @@ msgstr ""
 "(interface wxWindows)\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:575
+#: modules/gui/wxwindows/interface.cpp:507
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
@@ -4883,7 +4884,7 @@ msgstr ""
 "© 1996-2003 l'équipe VideoLAN\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:576
+#: modules/gui/wxwindows/interface.cpp:508
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
@@ -4892,7 +4893,7 @@ msgstr ""
 "L'équipe VideoLAN <videolan@videolan.org>\n"
 "<http://www.videolan.org/>\n"
 
-#: modules/gui/wxwindows/interface.cpp:578
+#: modules/gui/wxwindows/interface.cpp:510
 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."
@@ -4900,7 +4901,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:582
+#: modules/gui/wxwindows/interface.cpp:514
 #, c-format
 msgid "About %s"
 msgstr "À propos de %s"
@@ -4937,45 +4938,50 @@ msgstr "Verbeux"
 msgid "Save Messages As a file..."
 msgstr "Enregistrer les messages dans un document..."
 
-#: modules/gui/wxwindows/open.cpp:181
+#: modules/gui/wxwindows/open.cpp:177
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:198 modules/gui/wxwindows/subtitles.cpp:98
-msgid "Subtitles file"
-msgstr "Fichier de sous-titres"
-
-#: modules/gui/wxwindows/open.cpp:199
-msgid "Load an additional subtitles file. Currently only works with AVI files."
-msgstr ""
-
-#: modules/gui/wxwindows/open.cpp:222
+#: modules/gui/wxwindows/open.cpp:195
 msgid "Use VLC as a stream server"
 msgstr "Utiliser VLC comme serveur de flux"
 
-#: modules/gui/wxwindows/open.cpp:242
+#: modules/gui/wxwindows/open.cpp:216
 msgid "Capture input stream"
 msgstr "Capturer le flux entrant"
 
-#: modules/gui/wxwindows/open.cpp:244
+#: modules/gui/wxwindows/open.cpp:218
 msgid "Capture the stream you are playing to a file"
 msgstr "Capturer le flux joué dans un fichier"
 
-#: modules/gui/wxwindows/open.cpp:383
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+msgid "Subtitles file"
+msgstr "Fichier de sous-titres"
+
+#: modules/gui/wxwindows/open.cpp:349
+msgid "Load an additional subtitles file. Currently only works with AVI files."
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:385
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:386
+#: modules/gui/wxwindows/open.cpp:388
 msgid "CD Audio"
 msgstr "CD audio"
 
-#: modules/gui/wxwindows/open.cpp:886 modules/gui/wxwindows/streamout.cpp:785
+#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
 msgid "Save file"
 msgstr "Enregistrer le fichier"
 
+#: modules/gui/wxwindows/open.cpp:953
+#, fuzzy
+msgid "Advanced open options"
+msgstr "Options avancées"
+
 #: modules/gui/wxwindows/playlist.cpp:116
 #, fuzzy
 msgid "&Simple Add..."
@@ -5029,58 +5035,58 @@ msgstr "Enregistrer la liste de lecture"
 msgid "Reset config file"
 msgstr "Réinitialiser le fichier de configuration"
 
-#: modules/gui/wxwindows/preferences.cpp:898
+#: modules/gui/wxwindows/preferences.cpp:901
 msgid "No configuration options available"
 msgstr "Pas d'option de configuration disponible"
 
-#: modules/gui/wxwindows/preferences.cpp:919
+#: modules/gui/wxwindows/preferences.cpp:922
 msgid "Advanced options"
 msgstr "Options avancées"
 
-#: modules/gui/wxwindows/streamout.cpp:190
+#: modules/gui/wxwindows/streamout.cpp:186
 msgid "Stream output MRL"
 msgstr "MRL du flux de sortie"
 
-#: modules/gui/wxwindows/streamout.cpp:194
+#: modules/gui/wxwindows/streamout.cpp:190
 msgid "Destination Target:"
 msgstr "Destination:"
 
-#: modules/gui/wxwindows/streamout.cpp:197
+#: modules/gui/wxwindows/streamout.cpp:193
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:377
+#: modules/gui/wxwindows/streamout.cpp:378
 msgid "Output Methods"
 msgstr "Méthode de sortie"
 
-#: modules/gui/wxwindows/streamout.cpp:383
+#: modules/gui/wxwindows/streamout.cpp:384
 msgid "Play locally"
 msgstr "Jouer en local"
 
-#: modules/gui/wxwindows/streamout.cpp:407
+#: modules/gui/wxwindows/streamout.cpp:408
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: modules/gui/wxwindows/streamout.cpp:495
+#: modules/gui/wxwindows/streamout.cpp:496
 msgid "SAP Announce"
 msgstr "Annonce SAP"
 
-#: modules/gui/wxwindows/streamout.cpp:497
+#: modules/gui/wxwindows/streamout.cpp:498
 msgid "Channel Name "
 msgstr "Nom du canal"
 
-#: modules/gui/wxwindows/streamout.cpp:569
+#: modules/gui/wxwindows/streamout.cpp:570
 msgid "Transcoding options"
 msgstr "Options de transcodage"
 
-#: modules/gui/wxwindows/streamout.cpp:602
+#: modules/gui/wxwindows/streamout.cpp:603
 msgid "Video codec"
 msgstr "Codec vidéo"
 
-#: modules/gui/wxwindows/streamout.cpp:649
+#: modules/gui/wxwindows/streamout.cpp:650
 msgid "Audio codec"
 msgstr "Codec audio"
 
@@ -5172,27 +5178,27 @@ msgstr "fonctions d'interface qui ne font rien"
 msgid "Using the dummy interface plugin..."
 msgstr "Utilisation du module d'interface qui ne fait rien..."
 
-#: modules/misc/freetype.c:65 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr "Police"
 
-#: modules/misc/freetype.c:66
+#: modules/misc/freetype.c:68
 msgid "Filename of Font"
 msgstr "Nom de la police de caractères utilisée par le module osd"
 
-#: modules/misc/freetype.c:67
+#: modules/misc/freetype.c:69
 msgid "Font size"
 msgstr "Taille"
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:70
 msgid "The size of the fonts used by the osd module"
 msgstr "Taille de caractères utilisée par le module osd"
 
-#: modules/misc/freetype.c:71
+#: modules/misc/freetype.c:73
 msgid "Fonts"
 msgstr "Polices"
 
-#: modules/misc/freetype.c:74
+#: modules/misc/freetype.c:76
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5230,6 +5236,10 @@ msgstr "Module d'interface fichier journal"
 msgid "Using the logger interface plugin..."
 msgstr "Utiliser le module d'interface fichier journal..."
 
+#: modules/misc/memcpy/memcpyaltivec.c:52
+msgid "AltiVec memcpy"
+msgstr "Module de memcpy optimisé AltiVec"
+
 #: modules/misc/memcpy/memcpy.c:81
 msgid "libc memcpy"
 msgstr "Module de memcpy pour libc"
@@ -5246,10 +5256,6 @@ msgstr "Module de memcpy optimis
 msgid "MMX EXT memcpy"
 msgstr "Module de memcpy optimisé MMMEXT"
 
-#: modules/misc/memcpy/memcpyaltivec.c:52
-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"
diff --git a/po/it.po b/po/it.po
index 08e4ce928c..005d63f542 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-07-24 00:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-29 19:02+0200\n"
 "PO-Revision-Date: 2003-07-24 15:00+0100\n"
 "Last-Translator: Vella Bruno\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: include/vlc_interface.h:105
 msgid ""
@@ -28,7 +28,7 @@ msgid "Audio channels"
 msgstr "Canali audio"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:179 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:386
 msgid "Stereo"
@@ -124,8 +124,8 @@ msgstr "Programma"
 #: 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:373
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:404
+#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:406
 msgid "Title"
 msgstr "Titolo"
 
@@ -133,8 +133,8 @@ msgstr "Titolo"
 #: 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:375
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
+#: modules/gui/wxwindows/open.cpp:412
 msgid "Chapter"
 msgstr "Capitolo"
 
@@ -1088,7 +1088,7 @@ msgstr "Interfaccia"
 #: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
 #: modules/demux/ogg.c:1002 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:378 modules/gui/macosx/output.m:164
+#: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "Audio"
 
@@ -1097,7 +1097,7 @@ msgstr "Audio"
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:909
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
-#: modules/gui/macosx/output.m:158 modules/misc/dummy/dummy.c:81
+#: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
 #: modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "Video"
@@ -1116,7 +1116,7 @@ msgstr "Encoder"
 
 #: src/libvlc.h:547 modules/gui/gtk/gnome_interface.c:2042
 #: modules/gui/gtk/gtk_interface.c:2361 modules/gui/gtk/gtk_interface.c:3034
-#: modules/gui/wxwindows/open.cpp:221 modules/gui/wxwindows/streamout.cpp:175
+#: modules/gui/wxwindows/open.cpp:194 modules/gui/wxwindows/streamout.cpp:171
 msgid "Stream output"
 msgstr "Uscita sorgente"
 
@@ -1130,7 +1130,7 @@ msgstr "CPU"
 #: 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:321
 #: modules/gui/macosx/intf.m:409 modules/gui/pda/interface.c:612
-#: modules/gui/wxwindows/interface.cpp:378
+#: modules/gui/wxwindows/interface.cpp:345
 #: modules/gui/wxwindows/playlist.cpp:104
 msgid "Playlist"
 msgstr "Playlist"
@@ -1175,8 +1175,8 @@ msgid "boolean"
 msgstr "booleana"
 
 #: src/video_output/video_output.c:406 modules/gui/beos/VideoOutput.cpp:1151
-#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:348
-#: modules/gui/macosx/controls.m:690 modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:350
+#: modules/gui/macosx/controls.m:692 modules/gui/macosx/intf.m:394
 msgid "Fullscreen"
 msgstr "A schermo pieno"
 
@@ -1210,7 +1210,7 @@ msgstr ""
 
 #: modules/access/cdda.c:86 modules/access/file.c:72 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
-#: modules/access/v4l/v4l.c:67
+#: modules/access/v4l/v4l.c:66
 msgid "Caching value in ms"
 msgstr "Valore caching in ms"
 
@@ -1349,6 +1349,38 @@ 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:66
+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:74 modules/access/udp.c:72
+msgid "caching value in ms"
+msgstr "valore caching in ms"
+
+#: modules/access_output/udp.c:76 modules/access/udp.c:74
+msgid ""
+"Allows you to modify the default caching value for udp streams. This value "
+"should be set in miliseconds units."
+msgstr ""
+"Ti permette di modificare il valore di caching preimpostato per le sorgenti "
+"udp. Questo valore deve essere impostato in millisecondi."
+
+#: modules/access_output/udp.c:80
+msgid "UDP stream ouput"
+msgstr "uscita sorgente UDP"
+
+#: modules/access_output/udp.c:81
+msgid "udp stream output"
+msgstr "uscita sorgente udp"
+
 #: modules/access/pvr/pvr.c:75
 msgid "Hauppauge PVR cards input"
 msgstr ""
@@ -1397,18 +1429,6 @@ msgstr "ingresso SLP"
 msgid "slp"
 msgstr "slp"
 
-#: modules/access/udp.c:72 modules/access_output/udp.c:74
-msgid "caching value in ms"
-msgstr "valore caching in ms"
-
-#: modules/access/udp.c:74 modules/access_output/udp.c:76
-msgid ""
-"Allows you to modify the default caching value for udp streams. This value "
-"should be set in miliseconds units."
-msgstr ""
-"Ti permette di modificare il valore di caching preimpostato per le sorgenti "
-"udp. Questo valore deve essere impostato in millisecondi."
-
 #: modules/access/udp.c:78
 msgid "UDP/RTP input"
 msgstr "ingresso UDP/RTP"
@@ -1417,7 +1437,7 @@ msgstr "ingresso UDP/RTP"
 msgid "udp"
 msgstr "udp"
 
-#: modules/access/v4l/v4l.c:69
+#: modules/access/v4l/v4l.c:68
 msgid ""
 "Allows you to modify the default caching value for v4l streams. This value "
 "should be set in miliseconds units."
@@ -1425,15 +1445,15 @@ msgstr ""
 "Ti permette di modificare il valore di caching preimpostato per le sorgenti "
 "v4l. Questo valore deve essere impostato in millisecondi."
 
-#: modules/access/v4l/v4l.c:73
+#: modules/access/v4l/v4l.c:72
 msgid "Video4Linux input"
 msgstr "ingresso Video4Linux"
 
-#: modules/access/v4l/v4l.c:74
+#: modules/access/v4l/v4l.c:73
 msgid "v4l"
 msgstr "v4l"
 
-#: modules/access/v4l/v4l.c:82
+#: modules/access/v4l/v4l.c:81
 msgid "Video4Linux demuxer"
 msgstr ""
 
@@ -1441,26 +1461,6 @@ msgstr ""
 msgid "VCD input"
 msgstr "ingresso VCD"
 
-#: modules/access_output/dummy.c:56
-msgid "Dummy stream ouput"
-msgstr "uscita sorgente dummy"
-
-#: modules/access_output/file.c:66
-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:80
-msgid "UDP stream ouput"
-msgstr "uscita sorgente UDP"
-
-#: modules/access_output/udp.c:81
-msgid "udp stream output"
-msgstr "uscita sorgente udp"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr "Dimensione caratteristica"
@@ -1605,7 +1605,7 @@ msgstr "nome periferica ALSA"
 msgid "ALSA audio output"
 msgstr "uscita audio ALSA"
 
-#: modules/audio_output/alsa.c:116 modules/audio_output/coreaudio.c:218
+#: modules/audio_output/alsa.c:117 modules/audio_output/coreaudio.c:218
 #: modules/audio_output/coreaudio.c:1473 modules/audio_output/directx.c:377
 #: modules/audio_output/oss.c:129 modules/audio_output/sdl.c:176
 #: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:337
@@ -1613,23 +1613,23 @@ msgstr "uscita audio ALSA"
 msgid "Audio device"
 msgstr "Periferica audio"
 
-#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:173 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:399
 msgid "Mono"
 msgstr "Mono"
 
-#: modules/audio_output/alsa.c:180 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr "2 Anteriori 2 Posteriori"
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr "5.1"
 
-#: modules/audio_output/alsa.c:208 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1888,14 +1888,14 @@ msgstr ""
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr "Decodifica audio MPEG I/II layer 1/2"
 
-#: 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 ""
@@ -1908,10 +1908,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 ""
@@ -1920,6 +1916,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 ""
@@ -2137,9 +2137,9 @@ 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:924
-#: modules/gui/macosx/intf.m:925 modules/gui/macosx/intf.m:926
-#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:797
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
+#: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
+#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:685
 msgid "Pause"
 msgstr "Pausa"
 
@@ -2147,11 +2147,11 @@ msgstr "Pausa"
 #: 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:324 modules/gui/macosx/intf.m:362
-#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:931
-#: modules/gui/macosx/intf.m:932 modules/gui/macosx/intf.m:933
+#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
+#: modules/gui/macosx/intf.m:929 modules/gui/macosx/intf.m:930
 #: modules/gui/macosx/playlist.m:194 modules/gui/pda/interface.c:192
-#: modules/gui/wxwindows/interface.cpp:375
-#: modules/gui/wxwindows/interface.cpp:803
+#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:691
 msgid "Play"
 msgstr "Riproduci"
 
@@ -2206,7 +2206,7 @@ msgstr "Livello"
 #: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
 #: 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/output.m:170 modules/gui/wxwindows/streamout.cpp:667
+#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr "Canali"
 
@@ -2232,7 +2232,7 @@ msgstr "Numero di sorgenti"
 #: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
 #: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:147 modules/gui/pda/interface.c:372
+#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr "Tipo"
 
@@ -2956,19 +2956,19 @@ msgstr "Messaggi"
 #: modules/gui/gtk/gnome_interface.c:2847 modules/gui/gtk/gtk_interface.c:618
 #: 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:138 modules/gui/macosx/output.m:218
-#: modules/gui/macosx/output.m:310 modules/gui/pda/interface.c:380
-#: modules/gui/wxwindows/interface.cpp:362 modules/gui/wxwindows/open.cpp:279
-#: modules/gui/wxwindows/streamout.cpp:384
+#: modules/gui/macosx/open.m:142 modules/gui/macosx/open.m:263
+#: modules/gui/macosx/output.m:130 modules/gui/macosx/output.m:208
+#: modules/gui/macosx/output.m:300 modules/gui/pda/interface.c:380
+#: modules/gui/wxwindows/interface.cpp:329 modules/gui/wxwindows/open.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:385
 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/macosx/open.m:630 modules/gui/macosx/open.m:677
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:331
+#: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:676
 msgid "Open File"
 msgstr "Apri File"
 
@@ -3029,11 +3029,11 @@ msgstr "Riproduci Lista"
 #: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
 #: 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:606 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:134
-#: modules/gui/wxwindows/open.cpp:270
+#: modules/gui/gtk/preferences.c:606 modules/gui/macosx/open.m:139
+#: modules/gui/macosx/open.m:180 modules/gui/macosx/output.m:126
+#: modules/gui/wxwindows/open.cpp:244 modules/gui/wxwindows/open.cpp:971
 #: modules/gui/wxwindows/preferences.cpp:253
-#: modules/gui/wxwindows/streamout.cpp:221
+#: modules/gui/wxwindows/streamout.cpp:217
 #: modules/gui/wxwindows/subtitles.cpp:149
 msgid "OK"
 msgstr "OK"
@@ -3117,7 +3117,7 @@ msgstr "Applica"
 
 #: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:597 modules/gui/gtk/preferences.c:614
-#: modules/gui/macosx/output.m:375 modules/gui/macosx/prefs.m:78
+#: modules/gui/macosx/output.m:365 modules/gui/macosx/prefs.m:78
 #: modules/gui/wxwindows/preferences.cpp:257
 msgid "Save"
 msgstr "Registra"
@@ -3188,8 +3188,8 @@ msgid "VLC media player"
 msgstr "VLC media player"
 
 #: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:700
-#: modules/gui/wxwindows/preferences.cpp:1026
+#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr "Apri file"
@@ -3212,10 +3212,10 @@ 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:639
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:641
 #: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
 #: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Stop"
 msgstr "Interrompi"
 
@@ -3246,9 +3246,9 @@ msgid "UDP/RTP (Address when Multicast)"
 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:141 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:467 modules/gui/wxwindows/streamout.cpp:424
+#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
+#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
+#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
 msgid "Address"
 msgstr "Indirizzo"
 
@@ -3256,16 +3256,16 @@ msgstr "Indirizzo"
 #: modules/gui/gtk/gnome_interface.c:1786
 #: 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:142 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:452 modules/gui/wxwindows/open.cpp:475
-#: modules/gui/wxwindows/streamout.cpp:435
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
 msgid "Port"
 msgstr "Porta"
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:144
-#: modules/gui/macosx/output.m:246 modules/gui/macosx/output.m:321
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:385
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
+#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
 msgid "HTTP"
 msgstr "HTTP"
 
@@ -3279,9 +3279,9 @@ msgstr "MMS"
 
 #: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
 #: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:143
-#: modules/gui/macosx/open.m:272 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:283
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
 msgid "Network"
 msgstr "Rete"
 
@@ -3345,10 +3345,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
 #: modules/gui/pda/support.c:121
 #, c-format
 msgid "Couldn't find pixmap file: %s"
@@ -3360,6 +3360,64 @@ 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
+msgid "Gtk2 interface"
+msgstr "Interfaccia Gtk2"
+
+#: modules/gui/gtk2/gnome2_interface.c:31
+msgid "_New"
+msgstr "_Nuovo"
+
+#: 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:364
+msgid "Save File"
+msgstr "Registra File"
+
+#: 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 "Archivio"
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+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
+msgid "_About"
+msgstr "Info su"
+
+#: 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 "Mostra suggerimenti"
@@ -3402,7 +3460,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:255
+#: modules/gui/wxwindows/interface.cpp:222
 msgid "Open a file"
 msgstr "Apri un File"
 
@@ -3514,7 +3572,7 @@ 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:686 modules/gui/macosx/intf.m:381
+#: modules/gui/macosx/controls.m:688 modules/gui/macosx/intf.m:381
 msgid "Mute"
 msgstr "Muto"
 
@@ -3540,7 +3598,7 @@ msgstr "A schermo pieno"
 
 #: 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/output.m:137 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/output.m:129 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr "Schermo"
 
@@ -3556,19 +3614,19 @@ msgstr "_Video"
 #: modules/gui/gtk/gnome_interface.c:1690
 #: 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:364
-#: modules/gui/wxwindows/open.cpp:281
+#: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:143
+#: modules/gui/macosx/open.m:267 modules/gui/wxwindows/interface.cpp:331
+#: modules/gui/wxwindows/open.cpp:255
 msgid "Disc"
 msgstr "Disco"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:366
+#: modules/gui/wxwindows/interface.cpp:333
 msgid "Net"
 msgstr "Rete"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:369
+#: modules/gui/wxwindows/interface.cpp:336
 msgid "Sat"
 msgstr "Sat"
 
@@ -3630,7 +3688,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:380
+#: modules/gui/wxwindows/interface.cpp:347
 msgid "Prev"
 msgstr "Precedente"
 
@@ -3641,9 +3699,9 @@ msgstr "File Precedente"
 #: modules/gui/gtk/gnome_interface.c:667
 #: 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:647
+#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:649
 #: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
-#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:382
+#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:349
 msgid "Next"
 msgstr "Successivo"
 
@@ -3719,17 +3777,17 @@ msgid "Open Stream"
 msgstr "Apri Sorgente"
 
 #: modules/gui/gtk/gnome_interface.c:1476 modules/gui/gtk/gtk_interface.c:1791
-#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:173
+#: modules/gui/macosx/open.m:136 modules/gui/wxwindows/open.cpp:169
 msgid "Media Resource Locator (MRL)"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1498 modules/gui/gtk/gtk_interface.c:1813
-#: modules/gui/wxwindows/open.cpp:177
+#: modules/gui/wxwindows/open.cpp:173
 msgid "Open Target:"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:192
+#: modules/gui/wxwindows/open.cpp:188
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -3737,63 +3795,63 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1562
 #: 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:140 modules/gui/macosx/prefs.m:464
-#: modules/gui/wxwindows/open.cpp:249 modules/gui/wxwindows/open.cpp:365
-#: modules/gui/wxwindows/preferences.cpp:829
-#: modules/gui/wxwindows/streamout.cpp:411
+#: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:152 modules/gui/macosx/open.m:174
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/prefs.m:464
+#: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
+#: modules/gui/wxwindows/preferences.cpp:832
+#: modules/gui/wxwindows/streamout.cpp:412
 #: modules/gui/wxwindows/subtitles.cpp:107
 msgid "Browse..."
 msgstr "Sfoglia..."
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:390
+#: modules/gui/wxwindows/open.cpp:392
 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:384
+#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:487
+#: modules/gui/wxwindows/open.cpp:386
 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:385
+#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:381
+#: modules/gui/macosx/open.m:471 modules/gui/wxwindows/open.cpp:387
 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:396
+#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:398
 msgid "Device name"
 msgstr "Nome Periferica"
 
 #: modules/gui/gtk/gnome_interface.c:1660 modules/gui/gtk/gtk_interface.c:1996
-#: modules/gui/macosx/open.m:152
+#: modules/gui/macosx/open.m:153
 msgid "Use DVD menus"
 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:431
+#: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:546
+#: modules/gui/macosx/open.m:584 modules/gui/wxwindows/open.cpp:433
 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:432
+#: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:547
+#: modules/gui/macosx/open.m:596 modules/gui/wxwindows/open.cpp:434
 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:433
+#: modules/gui/macosx/open.m:167 modules/gui/macosx/open.m:548
+#: modules/gui/macosx/open.m:609 modules/gui/wxwindows/open.cpp:435
 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:489
+#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr "URL"
 
@@ -3822,23 +3880,23 @@ msgid "Horizontal"
 msgstr "Orizzontale"
 
 #: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
-#: modules/gui/wxwindows/open.cpp:286
+#: modules/gui/wxwindows/open.cpp:260
 msgid "Satellite"
 msgstr "Satellite"
 
 #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322
-#: modules/gui/macosx/open.m:175
+#: modules/gui/macosx/open.m:176
 msgid "delay"
 msgstr "pausa"
 
 #: modules/gui/gtk/gnome_interface.c:2020 modules/gui/gtk/gtk_interface.c:2338
-#: modules/gui/macosx/open.m:177
+#: modules/gui/macosx/open.m:178
 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:133
-#: modules/gui/wxwindows/open.cpp:204 modules/gui/wxwindows/open.cpp:226
+#: modules/gui/macosx/open.m:173 modules/gui/macosx/output.m:125
+#: modules/gui/wxwindows/open.cpp:199 modules/gui/wxwindows/open.cpp:354
 msgid "Settings..."
 msgstr "Impostazioni..."
 
@@ -3909,14 +3967,14 @@ msgid "Destination Target: "
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:257
-#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:386
+#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:313 modules/gui/wxwindows/streamout.cpp:387
 msgid "UDP"
 msgstr "UDP"
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:270
-#: modules/gui/macosx/output.m:333 modules/gui/wxwindows/streamout.cpp:387
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:260
+#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:388
 msgid "RTP"
 msgstr "RTP"
 
@@ -3937,8 +3995,8 @@ msgid "PS"
 msgstr "PS"
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:303
-#: modules/gui/macosx/output.m:362
+#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:293
+#: modules/gui/macosx/output.m:352
 msgid "AVI"
 msgstr "AVI"
 
@@ -3955,11 +4013,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"
@@ -3976,10 +4029,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"
@@ -4000,10 +4049,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..."
@@ -4024,7 +4069,7 @@ msgstr "Autori"
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr "il team VideoLAN <videolan@videolan.org>"
 
-#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:154
+#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:150
 msgid "Open Target"
 msgstr ""
 
@@ -4054,10 +4099,11 @@ msgstr "Configurazione uscita sorgente "
 
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
-#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:139
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:273
+#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
+#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/wxwindows/open.cpp:974
 #: modules/gui/wxwindows/preferences.cpp:256
-#: modules/gui/wxwindows/streamout.cpp:224
+#: modules/gui/wxwindows/streamout.cpp:220
 #: modules/gui/wxwindows/subtitles.cpp:152
 msgid "Cancel"
 msgstr "Annulla"
@@ -4108,51 +4154,6 @@ msgstr "Configura"
 msgid "Selected:"
 msgstr "Selezionato:"
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-msgid "Gtk2 interface"
-msgstr "Interfaccia Gtk2"
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-msgid "_New"
-msgstr "_Nuovo"
-
-#: 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:374
-msgid "Save File"
-msgstr "Registra File"
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-msgid "window1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-msgid "_Edit"
-msgstr "Composizione"
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-msgid "_About"
-msgstr "Info su"
-
-#: 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 "Lingue"
@@ -4186,55 +4187,55 @@ msgstr ""
 msgid "About VLC media player"
 msgstr "Info su VLC media player"
 
-#: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:691
+#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:693
 #: modules/gui/macosx/intf.m:390
 msgid "Half Size"
 msgstr "Dimensione Dimezzata"
 
-#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:692
+#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:694
 #: modules/gui/macosx/intf.m:391
 msgid "Normal Size"
 msgstr "Dimensione Normale"
 
-#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:693
+#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
 #: modules/gui/macosx/intf.m:392
 msgid "Double Size"
 msgstr "Dimensione Doppia"
 
-#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
-#: modules/gui/macosx/controls.m:702 modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:697
+#: modules/gui/macosx/controls.m:704 modules/gui/macosx/intf.m:395
 msgid "Float On Top"
 msgstr "In Primo Piano"
 
-#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:694
+#: modules/gui/macosx/controls.m:360 modules/gui/macosx/controls.m:696
 #: modules/gui/macosx/intf.m:393
 msgid "Fit To Screen"
 msgstr "Adegua A Schermo"
 
-#: modules/gui/macosx/controls.m:625 modules/gui/macosx/intf.m:326
-#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:386
+#: modules/gui/macosx/controls.m:627 modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:353
 msgid "Faster"
 msgstr "Veloce"
 
-#: modules/gui/macosx/controls.m:626 modules/gui/macosx/intf.m:323
-#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:384
+#: modules/gui/macosx/controls.m:628 modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:351
 msgid "Slower"
 msgstr "Lento"
 
-#: modules/gui/macosx/controls.m:646 modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/controls.m:648 modules/gui/macosx/intf.m:322
 #: modules/gui/macosx/intf.m:366 modules/gui/macosx/intf.m:426
 msgid "Previous"
 msgstr "Precedente"
 
-#: modules/gui/macosx/controls.m:665 modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/controls.m:667 modules/gui/macosx/intf.m:368
 msgid "Loop"
 msgstr "Ripeti"
 
-#: modules/gui/macosx/controls.m:672 modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/controls.m:674 modules/gui/macosx/intf.m:369
 msgid "Step Forward"
 msgstr "Vai Avanti"
 
-#: modules/gui/macosx/controls.m:673 modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/controls.m:675 modules/gui/macosx/intf.m:370
 msgid "Step Backward"
 msgstr "Vai Indietro"
 
@@ -4247,8 +4248,8 @@ msgstr "Informazioni"
 msgid "VLC - Controller"
 msgstr "Pannello - VLC"
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:868
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
 msgid "Volume"
 msgstr "Volume"
 
@@ -4304,7 +4305,7 @@ msgstr "Apri Rete..."
 msgid "Open Recent"
 msgstr "Apri Recenti"
 
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1205
+#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1202
 msgid "Clear Menu"
 msgstr "Cancella Menu"
 
@@ -4369,7 +4370,7 @@ msgstr "Segnala Un Errore"
 msgid "VideoLAN Website"
 msgstr "Sito Web VideoLAN"
 
-#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1198
+#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1195
 msgid "License"
 msgstr "Licenza"
 
@@ -4394,11 +4395,11 @@ msgstr "Apri la finestra messaggi"
 msgid "Dismiss"
 msgstr "Chiudi"
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid "No CrashLog found"
 msgstr "Nessun Rapporto Crash trovato"
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4434,108 +4435,108 @@ msgstr ""
 msgid "MacOS X interface, sound and video"
 msgstr "interfaccia MacOS X, suono e video"
 
-#: modules/gui/macosx/open.m:134
+#: modules/gui/macosx/open.m:135
 msgid "Open Source"
 msgstr "Apri Sorgente"
 
-#: modules/gui/macosx/open.m:136
+#: modules/gui/macosx/open.m:137
 msgid "Only enqueue in playlist, do not play"
 msgstr "Accoda solo nella playlist, non riprodurre"
 
-#: modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:147
 msgid "Treat as a pipe rather than as a file"
 msgstr ""
 
-#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:371
+#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:370
 msgid "VIDEO_TS folder"
 msgstr "cartella VIDEO_TS"
 
-#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:389
-#: modules/gui/macosx/open.m:480
+#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:388
+#: modules/gui/macosx/open.m:479
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: modules/gui/macosx/open.m:171
+#: modules/gui/macosx/open.m:172
 msgid "Load subtitles file:"
 msgstr "Carica file sottotitoli:"
 
-#: modules/gui/macosx/open.m:174
+#: modules/gui/macosx/open.m:175
 msgid "Override"
 msgstr ""
 
-#: modules/gui/macosx/open.m:333 modules/gui/macosx/open.m:527
-#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:678
+#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:677
 msgid "Open"
 msgstr "Apri"
 
-#: modules/gui/macosx/open.m:423 modules/gui/macosx/open.m:475
-#: modules/gui/macosx/open.m:483 modules/gui/macosx/open.m:491
+#: modules/gui/macosx/open.m:422 modules/gui/macosx/open.m:474
+#: modules/gui/macosx/open.m:482 modules/gui/macosx/open.m:490
 msgid "No %@s found"
 msgstr "Nessun %@ trovato"
 
-#: modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:525
 msgid "Open VIDEO_TS Directory"
 msgstr "Apri Cartella VIDEO_TS"
 
-#: modules/gui/macosx/output.m:132
+#: modules/gui/macosx/output.m:124
 msgid "Advanced output:"
 msgstr "Uscita avanzata:"
 
-#: modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:128
 msgid "Output Options"
 msgstr "Opzioni Uscita"
 
-#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:235
-#: modules/gui/macosx/output.m:316
+#: modules/gui/macosx/output.m:131 modules/gui/macosx/output.m:225
+#: modules/gui/macosx/output.m:306
 msgid "Stream"
 msgstr "Sorgente"
 
-#: modules/gui/macosx/output.m:143
+#: modules/gui/macosx/output.m:135
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:149 modules/gui/wxwindows/streamout.cpp:530
+#: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr "Metodo Incapsulazione"
 
-#: modules/gui/macosx/output.m:150
+#: modules/gui/macosx/output.m:142
 msgid "MPEG TS"
 msgstr "MPEG TS"
 
-#: modules/gui/macosx/output.m:151 modules/gui/macosx/output.m:305
-#: modules/gui/macosx/output.m:358
+#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:295
+#: modules/gui/macosx/output.m:348
 msgid "MPEG PS"
 msgstr "MPEG PS"
 
-#: modules/gui/macosx/output.m:152 modules/gui/macosx/output.m:307
-#: modules/gui/macosx/output.m:360
+#: modules/gui/macosx/output.m:144 modules/gui/macosx/output.m:297
+#: modules/gui/macosx/output.m:350
 msgid "MPEG1"
 msgstr "MPEG1"
 
-#: modules/gui/macosx/output.m:154 modules/gui/macosx/output.m:304
-#: modules/gui/macosx/output.m:364
+#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:294
+#: modules/gui/macosx/output.m:354
 msgid "Ogg"
 msgstr "Ogg"
 
-#: modules/gui/macosx/output.m:157
+#: modules/gui/macosx/output.m:149
 msgid "Transcode options"
 msgstr "Opzioni Transcodifica"
 
-#: modules/gui/macosx/output.m:161 modules/gui/macosx/output.m:167
-#: modules/gui/wxwindows/streamout.cpp:609
-#: modules/gui/wxwindows/streamout.cpp:661
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:159
+#: modules/gui/wxwindows/streamout.cpp:610
+#: modules/gui/wxwindows/streamout.cpp:662
 msgid "Bitrate (kb/s)"
 msgstr ""
 
-#: modules/gui/macosx/output.m:174 modules/gui/wxwindows/streamout.cpp:483
+#: modules/gui/macosx/output.m:166 modules/gui/wxwindows/streamout.cpp:484
 msgid "Miscellaneous Options"
 msgstr "Opzioni Varie"
 
-#: modules/gui/macosx/output.m:175
+#: modules/gui/macosx/output.m:167
 msgid "Announce streams via SAP Channel:"
 msgstr "Annuncia sorgenti via Canale SAP:"
 
-#: modules/gui/macosx/output.m:306 modules/gui/macosx/output.m:366
+#: modules/gui/macosx/output.m:296 modules/gui/macosx/output.m:356
 msgid "mp4"
 msgstr ""
 
@@ -4619,168 +4620,168 @@ msgstr ""
 msgid "FileInfo"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:256
+#: modules/gui/wxwindows/interface.cpp:223
 msgid "Open a DVD or (S)VCD"
 msgstr "Apri un DVD o (S)VCD"
 
-#: modules/gui/wxwindows/interface.cpp:257
+#: modules/gui/wxwindows/interface.cpp:224
 msgid "Open a network stream"
 msgstr "Apri una sorgente di rete"
 
-#: modules/gui/wxwindows/interface.cpp:258
+#: modules/gui/wxwindows/interface.cpp:225
 msgid "Open a satellite stream"
 msgstr "Apri una sorgente satellite"
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:226
 msgid "Eject the DVD/CD"
 msgstr "Espelli il DVD/CD"
 
-#: modules/gui/wxwindows/interface.cpp:260
+#: modules/gui/wxwindows/interface.cpp:227
 msgid "Exit this program"
 msgstr "Esci da questo programma"
 
-#: modules/gui/wxwindows/interface.cpp:262
+#: modules/gui/wxwindows/interface.cpp:229
 msgid "Open the playlist"
 msgstr "Apri la playlist"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:230
 msgid "Show the program logs"
 msgstr "Mostra i resoconti del programma"
 
-#: modules/gui/wxwindows/interface.cpp:264
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Show information about the file being played"
 msgstr "Mostra le informazioni sul file in riproduzione"
 
-#: modules/gui/wxwindows/interface.cpp:266
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Go to the preferences menu"
 msgstr "Vai al menu preferenze"
 
-#: modules/gui/wxwindows/interface.cpp:268
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "About this program"
 msgstr "Informazioni su questo programma"
 
-#: modules/gui/wxwindows/interface.cpp:272 modules/gui/wxwindows/menus.cpp:108
+#: modules/gui/wxwindows/interface.cpp:239 modules/gui/wxwindows/menus.cpp:108
 msgid "Simple &Open ..."
 msgstr "Apri Semplice..."
 
-#: modules/gui/wxwindows/interface.cpp:274 modules/gui/wxwindows/menus.cpp:109
+#: modules/gui/wxwindows/interface.cpp:241 modules/gui/wxwindows/menus.cpp:109
 msgid "Open &File..."
 msgstr "Apri &File..."
 
-#: modules/gui/wxwindows/interface.cpp:276 modules/gui/wxwindows/menus.cpp:110
+#: modules/gui/wxwindows/interface.cpp:243 modules/gui/wxwindows/menus.cpp:110
 msgid "Open &Disc..."
 msgstr "Apri &Disco..."
 
-#: modules/gui/wxwindows/interface.cpp:278 modules/gui/wxwindows/menus.cpp:111
+#: modules/gui/wxwindows/interface.cpp:245 modules/gui/wxwindows/menus.cpp:111
 msgid "Open &Network Stream..."
 msgstr "Apri Sorgente Rete..."
 
-#: modules/gui/wxwindows/interface.cpp:281
+#: modules/gui/wxwindows/interface.cpp:248
 msgid "Open &Satellite Stream..."
 msgstr "Apri Sorgente &Satellite..."
 
-#: modules/gui/wxwindows/interface.cpp:286
+#: modules/gui/wxwindows/interface.cpp:253
 msgid "&Eject Disc"
 msgstr "&Espelli Disco"
 
-#: modules/gui/wxwindows/interface.cpp:290
+#: modules/gui/wxwindows/interface.cpp:257
 msgid "E&xit"
 msgstr "Esci"
 
-#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:261
 msgid "&Playlist..."
 msgstr "&Playlist..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:263
 msgid "&Messages..."
 msgstr "&Messaggi..."
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:264
 msgid "&File info..."
 msgstr "Informazioni &File..."
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:269
 msgid "&Preferences..."
 msgstr "&Preferenze..."
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:286
 msgid "&About..."
 msgstr "Info su..."
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:290
 msgid "&File"
 msgstr "&Archivio"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:291
 msgid "&View"
 msgstr "&Vista"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:292
 msgid "&Settings"
 msgstr "Impo&stazioni"
 
-#: modules/gui/wxwindows/interface.cpp:326
-#: modules/gui/wxwindows/interface.cpp:482
-#: modules/gui/wxwindows/interface.cpp:530
+#: modules/gui/wxwindows/interface.cpp:293
+#: modules/gui/wxwindows/interface.cpp:414
+#: modules/gui/wxwindows/interface.cpp:462
 msgid "&Audio"
 msgstr "&Audio"
 
-#: modules/gui/wxwindows/interface.cpp:327
-#: modules/gui/wxwindows/interface.cpp:501
-#: modules/gui/wxwindows/interface.cpp:534
+#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:433
+#: modules/gui/wxwindows/interface.cpp:466
 msgid "&Video"
 msgstr "&Video"
 
-#: modules/gui/wxwindows/interface.cpp:328
-#: modules/gui/wxwindows/interface.cpp:520
-#: modules/gui/wxwindows/interface.cpp:538
+#: modules/gui/wxwindows/interface.cpp:295
+#: modules/gui/wxwindows/interface.cpp:452
+#: modules/gui/wxwindows/interface.cpp:470
 msgid "&Navigation"
 msgstr "&Navigazione"
 
-#: modules/gui/wxwindows/interface.cpp:329
+#: modules/gui/wxwindows/interface.cpp:296
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: modules/gui/wxwindows/interface.cpp:345
+#: modules/gui/wxwindows/interface.cpp:312
 msgid "Stop current playlist item"
 msgstr "Interrompi lÕelemento playlist corrente"
 
-#: modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/wxwindows/interface.cpp:313
 msgid "Play current playlist item"
 msgstr "Riproduci lÕelemento playlist corrente"
 
-#: modules/gui/wxwindows/interface.cpp:347
+#: modules/gui/wxwindows/interface.cpp:314
 msgid "Pause current playlist item"
 msgstr "Metti in pausa lÕelemento playlist corrente"
 
-#: modules/gui/wxwindows/interface.cpp:348
+#: modules/gui/wxwindows/interface.cpp:315
 #: modules/gui/wxwindows/playlist.cpp:353
 msgid "Open playlist"
 msgstr "Apri playlist"
 
-#: modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:316
 msgid "Previous playlist item"
 msgstr "Elemento playlist precedente"
 
-#: modules/gui/wxwindows/interface.cpp:350
+#: modules/gui/wxwindows/interface.cpp:317
 msgid "Next playlist item"
 msgstr "Elemento playlist successivo"
 
-#: modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/wxwindows/interface.cpp:318
 msgid "Play slower"
 msgstr "Riproduci Lento"
 
-#: modules/gui/wxwindows/interface.cpp:352
+#: modules/gui/wxwindows/interface.cpp:319
 msgid "Play faster"
 msgstr "Riproduci Veloce"
 
-#: modules/gui/wxwindows/interface.cpp:574
+#: modules/gui/wxwindows/interface.cpp:506
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:575
+#: modules/gui/wxwindows/interface.cpp:507
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
@@ -4788,7 +4789,7 @@ msgstr ""
 "(C) 1996-2003 - il Team VideoLAN\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:576
+#: modules/gui/wxwindows/interface.cpp:508
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
@@ -4798,13 +4799,13 @@ msgstr ""
 "http://www.videolan.org/\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:578
+#: modules/gui/wxwindows/interface.cpp:510
 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:582
+#: modules/gui/wxwindows/interface.cpp:514
 #, c-format
 msgid "About %s"
 msgstr "Info su %s"
@@ -4841,45 +4842,50 @@ msgstr ""
 msgid "Save Messages As a file..."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:181
+#: modules/gui/wxwindows/open.cpp:177
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:198 modules/gui/wxwindows/subtitles.cpp:98
-msgid "Subtitles file"
-msgstr "File sottotitoli"
-
-#: modules/gui/wxwindows/open.cpp:199
-msgid "Load an additional subtitles file. Currently only works with AVI files."
-msgstr ""
-
-#: modules/gui/wxwindows/open.cpp:222
+#: modules/gui/wxwindows/open.cpp:195
 msgid "Use VLC as a stream server"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:242
+#: modules/gui/wxwindows/open.cpp:216
 msgid "Capture input stream"
 msgstr "Cattura ingresso sorgente"
 
-#: modules/gui/wxwindows/open.cpp:244
+#: modules/gui/wxwindows/open.cpp:218
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:383
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+msgid "Subtitles file"
+msgstr "File sottotitoli"
+
+#: modules/gui/wxwindows/open.cpp:349
+msgid "Load an additional subtitles file. Currently only works with AVI files."
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:385
 msgid "DVD (menus support)"
 msgstr "DVD (supporto menu)"
 
-#: modules/gui/wxwindows/open.cpp:386
+#: modules/gui/wxwindows/open.cpp:388
 msgid "CD Audio"
 msgstr "CD Audio"
 
-#: modules/gui/wxwindows/open.cpp:886 modules/gui/wxwindows/streamout.cpp:785
+#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
 msgid "Save file"
 msgstr "Registra file"
 
+#: modules/gui/wxwindows/open.cpp:953
+#, fuzzy
+msgid "Advanced open options"
+msgstr "Opzioni avanzate"
+
 #: modules/gui/wxwindows/playlist.cpp:116
 msgid "&Simple Add..."
 msgstr "&Aggiungi Semplice..."
@@ -4932,58 +4938,58 @@ msgstr "Registra playlist"
 msgid "Reset config file"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:898
+#: modules/gui/wxwindows/preferences.cpp:901
 msgid "No configuration options available"
 msgstr "Nessuna opzione configurazione disponibile."
 
-#: modules/gui/wxwindows/preferences.cpp:919
+#: modules/gui/wxwindows/preferences.cpp:922
 msgid "Advanced options"
 msgstr "Opzioni avanzate"
 
-#: modules/gui/wxwindows/streamout.cpp:190
+#: modules/gui/wxwindows/streamout.cpp:186
 msgid "Stream output MRL"
 msgstr "Uscita sorgente MRL"
 
-#: modules/gui/wxwindows/streamout.cpp:194
+#: modules/gui/wxwindows/streamout.cpp:190
 msgid "Destination Target:"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:197
+#: modules/gui/wxwindows/streamout.cpp:193
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:377
+#: modules/gui/wxwindows/streamout.cpp:378
 msgid "Output Methods"
 msgstr "Metodi Uscita"
 
-#: modules/gui/wxwindows/streamout.cpp:383
+#: modules/gui/wxwindows/streamout.cpp:384
 msgid "Play locally"
 msgstr "Riproduci localmente"
 
-#: modules/gui/wxwindows/streamout.cpp:407
+#: modules/gui/wxwindows/streamout.cpp:408
 msgid "Filename"
 msgstr "Nome file"
 
-#: modules/gui/wxwindows/streamout.cpp:495
+#: modules/gui/wxwindows/streamout.cpp:496
 msgid "SAP Announce"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:497
+#: modules/gui/wxwindows/streamout.cpp:498
 msgid "Channel Name "
 msgstr "Nome Canale "
 
-#: modules/gui/wxwindows/streamout.cpp:569
+#: modules/gui/wxwindows/streamout.cpp:570
 msgid "Transcoding options"
 msgstr "Opzioni transcodifica"
 
-#: modules/gui/wxwindows/streamout.cpp:602
+#: modules/gui/wxwindows/streamout.cpp:603
 msgid "Video codec"
 msgstr "Codifica video"
 
-#: modules/gui/wxwindows/streamout.cpp:649
+#: modules/gui/wxwindows/streamout.cpp:650
 msgid "Audio codec"
 msgstr "Codifica audio"
 
@@ -5068,27 +5074,27 @@ msgstr "funzione generatore font dummy"
 msgid "Using the dummy interface plugin..."
 msgstr ""
 
-#: modules/misc/freetype.c:65 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr "Carattere"
 
-#: modules/misc/freetype.c:66
+#: modules/misc/freetype.c:68
 msgid "Filename of Font"
 msgstr "Nome file Carattere"
 
-#: modules/misc/freetype.c:67
+#: modules/misc/freetype.c:69
 msgid "Font size"
 msgstr "Dimensione carattere"
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:70
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:71
+#: modules/misc/freetype.c:73
 msgid "Fonts"
 msgstr "Caratteri"
 
-#: modules/misc/freetype.c:74
+#: modules/misc/freetype.c:76
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5125,6 +5131,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 ""
@@ -5141,10 +5151,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 ""
diff --git a/po/ja.po b/po/ja.po
index 5e852e6e32..69e5604d63 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,14 +4,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-07-24 00:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-29 19:02+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: include/vlc_interface.h:105
 #, fuzzy
@@ -32,7 +32,7 @@ msgid "Audio channels"
 msgstr "¥ª¡¼¥Ç¥£¥ª¡¦¥Á¥ã¥ó¥Í¥ë¤ÎÁªÂò"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:179 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:386
 msgid "Stereo"
@@ -129,8 +129,8 @@ msgstr "
 #: 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:373
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:404
+#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:406
 msgid "Title"
 msgstr "¥¿¥¤¥È¥ë"
 
@@ -138,8 +138,8 @@ msgstr "
 #: 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:375
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
+#: modules/gui/wxwindows/open.cpp:412
 msgid "Chapter"
 msgstr "¥Á¥ã¥×¥¿¡¼"
 
@@ -1161,7 +1161,7 @@ msgstr "
 #: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
 #: modules/demux/ogg.c:1002 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:378 modules/gui/macosx/output.m:164
+#: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
@@ -1170,7 +1170,7 @@ msgstr "
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:909
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
-#: modules/gui/macosx/output.m:158 modules/misc/dummy/dummy.c:81
+#: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
 #: modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "¥Ó¥Ç¥ª"
@@ -1190,7 +1190,7 @@ msgstr "
 
 #: src/libvlc.h:547 modules/gui/gtk/gnome_interface.c:2042
 #: modules/gui/gtk/gtk_interface.c:2361 modules/gui/gtk/gtk_interface.c:3034
-#: modules/gui/wxwindows/open.cpp:221 modules/gui/wxwindows/streamout.cpp:175
+#: modules/gui/wxwindows/open.cpp:194 modules/gui/wxwindows/streamout.cpp:171
 msgid "Stream output"
 msgstr "¥¹¥È¥ê¡¼¥à½ÐÎÏ"
 
@@ -1204,7 +1204,7 @@ msgstr ""
 #: 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:321
 #: modules/gui/macosx/intf.m:409 modules/gui/pda/interface.c:612
-#: modules/gui/wxwindows/interface.cpp:378
+#: modules/gui/wxwindows/interface.cpp:345
 #: modules/gui/wxwindows/playlist.cpp:104
 msgid "Playlist"
 msgstr "¥ê¥¹¥È"
@@ -1249,8 +1249,8 @@ msgid "boolean"
 msgstr "¿¿µ¶ÃÍ"
 
 #: src/video_output/video_output.c:406 modules/gui/beos/VideoOutput.cpp:1151
-#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:348
-#: modules/gui/macosx/controls.m:690 modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:350
+#: modules/gui/macosx/controls.m:692 modules/gui/macosx/intf.m:394
 msgid "Fullscreen"
 msgstr "Á´²èÌ̲½"
 
@@ -1287,7 +1287,7 @@ msgstr "
 
 #: modules/access/cdda.c:86 modules/access/file.c:72 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
-#: modules/access/v4l/v4l.c:67
+#: modules/access/v4l/v4l.c:66
 #, fuzzy
 msgid "Caching value in ms"
 msgstr "¥­¥ã¥Ã¥·¥ó¥°ÃÍ (ms)"
@@ -1453,6 +1453,43 @@ 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:66
+#, fuzzy
+msgid "File stream ouput"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
+
+#: modules/access_output/http.c:54
+#, fuzzy
+msgid "HTTP stream ouput"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
+
+#: modules/access_output/udp.c:74 modules/access/udp.c:72
+msgid "caching value in ms"
+msgstr "¥­¥ã¥Ã¥·¥ó¥°ÃÍ (ms)"
+
+#: modules/access_output/udp.c:76 modules/access/udp.c:74
+msgid ""
+"Allows you to modify the default caching value for udp streams. This value "
+"should be set in miliseconds units."
+msgstr ""
+"udp¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°Ãͤ¬Êѹ¹²Äǽ¤Ç¤¹¡£Ã±°Ì¤Ï¥ß¥êÉäǻØ"
+"Äꤷ¤Þ¤¹¡£"
+
+#: modules/access_output/udp.c:80
+#, fuzzy
+msgid "UDP stream ouput"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
+
+#: modules/access_output/udp.c:81
+#, fuzzy
+msgid "udp stream output"
+msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
+
 #: modules/access/pvr/pvr.c:75
 msgid "Hauppauge PVR cards input"
 msgstr ""
@@ -1510,18 +1547,6 @@ msgstr ""
 msgid "slp"
 msgstr ""
 
-#: modules/access/udp.c:72 modules/access_output/udp.c:74
-msgid "caching value in ms"
-msgstr "¥­¥ã¥Ã¥·¥ó¥°ÃÍ (ms)"
-
-#: modules/access/udp.c:74 modules/access_output/udp.c:76
-msgid ""
-"Allows you to modify the default caching value for udp streams. This value "
-"should be set in miliseconds units."
-msgstr ""
-"udp¥¹¥È¥ê¡¼¥à¤Ç»ÈÍѤµ¤ì¤ë´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°Ãͤ¬Êѹ¹²Äǽ¤Ç¤¹¡£Ã±°Ì¤Ï¥ß¥êÉäǻØ"
-"Äꤷ¤Þ¤¹¡£"
-
 #: modules/access/udp.c:78
 #, fuzzy
 msgid "UDP/RTP input"
@@ -1531,23 +1556,23 @@ msgstr "UDP
 msgid "udp"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:69
+#: modules/access/v4l/v4l.c:68
 #, fuzzy
 msgid ""
 "Allows you to modify the default caching value for v4l streams. This value "
 "should be set in miliseconds units."
 msgstr "¥Õ¥¡¥¤¥ë¡¦¥¹¥È¥ê¡¼¥à¤Î´ûÄê¤Î¥­¥ã¥Ã¥·¥ó¥°ÃͤòÊѹ¹¤Ç¤­¤Þ¤¹¡£Ã±°Ì¤Ï¥ß¥êÉÃ"
 
-#: modules/access/v4l/v4l.c:73
+#: modules/access/v4l/v4l.c:72
 #, fuzzy
 msgid "Video4Linux input"
 msgstr "Video4LinuxÆþÎϥ⥸¥å¡¼¥ë"
 
-#: modules/access/v4l/v4l.c:74
+#: modules/access/v4l/v4l.c:73
 msgid "v4l"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:82
+#: modules/access/v4l/v4l.c:81
 #, fuzzy
 msgid "Video4Linux demuxer"
 msgstr "Video4LinuxÆþÎϥ⥸¥å¡¼¥ë"
@@ -1557,31 +1582,6 @@ msgstr "Video4Linux
 msgid "VCD input"
 msgstr "VCDÆþÎϥ⥸¥å¡¼¥ë"
 
-#: modules/access_output/dummy.c:56
-#, fuzzy
-msgid "Dummy stream ouput"
-msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
-
-#: modules/access_output/file.c:66
-#, fuzzy
-msgid "File stream ouput"
-msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
-
-#: modules/access_output/http.c:54
-#, fuzzy
-msgid "HTTP stream ouput"
-msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
-
-#: modules/access_output/udp.c:80
-#, fuzzy
-msgid "UDP stream ouput"
-msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
-
-#: modules/access_output/udp.c:81
-#, fuzzy
-msgid "udp stream output"
-msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏÀè¤ÎÁªÂò"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 #, fuzzy
 msgid "Characteristic dimension"
@@ -1747,7 +1747,7 @@ msgstr "ALSA
 msgid "ALSA audio output"
 msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/audio_output/alsa.c:116 modules/audio_output/coreaudio.c:218
+#: modules/audio_output/alsa.c:117 modules/audio_output/coreaudio.c:218
 #: modules/audio_output/coreaudio.c:1473 modules/audio_output/directx.c:377
 #: modules/audio_output/oss.c:129 modules/audio_output/sdl.c:176
 #: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:337
@@ -1756,23 +1756,23 @@ msgstr "ALSA
 msgid "Audio device"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:173 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:399
 msgid "Mono"
 msgstr "¥â¥Î¥é¥ë"
 
-#: modules/audio_output/alsa.c:180 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr "¥Õ¥í¥ó¥È 2, ¥ê¥¢ 2"
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:208 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -2060,15 +2060,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"
@@ -2084,11 +2084,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"
@@ -2099,6 +2094,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"
@@ -2351,9 +2351,9 @@ 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:924
-#: modules/gui/macosx/intf.m:925 modules/gui/macosx/intf.m:926
-#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:797
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
+#: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
+#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:685
 msgid "Pause"
 msgstr "°ì»þÄä»ß"
 
@@ -2361,11 +2361,11 @@ msgstr "
 #: 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:324 modules/gui/macosx/intf.m:362
-#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:931
-#: modules/gui/macosx/intf.m:932 modules/gui/macosx/intf.m:933
+#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
+#: modules/gui/macosx/intf.m:929 modules/gui/macosx/intf.m:930
 #: modules/gui/macosx/playlist.m:194 modules/gui/pda/interface.c:192
-#: modules/gui/wxwindows/interface.cpp:375
-#: modules/gui/wxwindows/interface.cpp:803
+#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:691
 msgid "Play"
 msgstr "ºÆÀ¸"
 
@@ -2425,7 +2425,7 @@ msgstr ""
 #: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
 #: 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/output.m:170 modules/gui/wxwindows/streamout.cpp:667
+#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr "¥Á¥ã¥ó¥Í¥ë"
 
@@ -2453,7 +2453,7 @@ msgstr "
 #: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
 #: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:147 modules/gui/pda/interface.c:372
+#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr "¥¿¥¤¥×"
 
@@ -3240,19 +3240,19 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:2847 modules/gui/gtk/gtk_interface.c:618
 #: 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:138 modules/gui/macosx/output.m:218
-#: modules/gui/macosx/output.m:310 modules/gui/pda/interface.c:380
-#: modules/gui/wxwindows/interface.cpp:362 modules/gui/wxwindows/open.cpp:279
-#: modules/gui/wxwindows/streamout.cpp:384
+#: modules/gui/macosx/open.m:142 modules/gui/macosx/open.m:263
+#: modules/gui/macosx/output.m:130 modules/gui/macosx/output.m:208
+#: modules/gui/macosx/output.m:300 modules/gui/pda/interface.c:380
+#: modules/gui/wxwindows/interface.cpp:329 modules/gui/wxwindows/open.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:385
 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/macosx/open.m:630 modules/gui/macosx/open.m:677
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:331
+#: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:676
 msgid "Open File"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
@@ -3322,11 +3322,11 @@ msgstr "
 #: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
 #: 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:606 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:134
-#: modules/gui/wxwindows/open.cpp:270
+#: modules/gui/gtk/preferences.c:606 modules/gui/macosx/open.m:139
+#: modules/gui/macosx/open.m:180 modules/gui/macosx/output.m:126
+#: modules/gui/wxwindows/open.cpp:244 modules/gui/wxwindows/open.cpp:971
 #: modules/gui/wxwindows/preferences.cpp:253
-#: modules/gui/wxwindows/streamout.cpp:221
+#: modules/gui/wxwindows/streamout.cpp:217
 #: modules/gui/wxwindows/subtitles.cpp:149
 msgid "OK"
 msgstr ""
@@ -3414,7 +3414,7 @@ msgstr "Ŭ
 
 #: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:597 modules/gui/gtk/preferences.c:614
-#: modules/gui/macosx/output.m:375 modules/gui/macosx/prefs.m:78
+#: modules/gui/macosx/output.m:365 modules/gui/macosx/prefs.m:78
 #: modules/gui/wxwindows/preferences.cpp:257
 msgid "Save"
 msgstr "Êݸ"
@@ -3490,8 +3490,8 @@ msgid "VLC media player"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:700
-#: modules/gui/wxwindows/preferences.cpp:1026
+#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
@@ -3514,10 +3514,10 @@ 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:639
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:641
 #: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
 #: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Stop"
 msgstr "Ää»ß"
 
@@ -3549,9 +3549,9 @@ msgid "UDP/RTP (Address when Multicast)"
 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:141 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:467 modules/gui/wxwindows/streamout.cpp:424
+#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
+#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
+#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
 msgid "Address"
 msgstr "¥Û¥¹¥È̾/¥¢¥É¥ì¥¹"
 
@@ -3559,16 +3559,16 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:1786
 #: 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:142 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:452 modules/gui/wxwindows/open.cpp:475
-#: modules/gui/wxwindows/streamout.cpp:435
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
 msgid "Port"
 msgstr "¥Ý¡¼¥ÈÈÖ¹æ"
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:144
-#: modules/gui/macosx/output.m:246 modules/gui/macosx/output.m:321
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:385
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
+#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
 msgid "HTTP"
 msgstr ""
 
@@ -3582,9 +3582,9 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
 #: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:143
-#: modules/gui/macosx/open.m:272 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:283
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
 msgid "Network"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯"
 
@@ -3656,10 +3656,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
 #: modules/gui/pda/support.c:121
 #, c-format
 msgid "Couldn't find pixmap file: %s"
@@ -3671,6 +3671,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:364
+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"
@@ -3719,7 +3782,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:255
+#: modules/gui/wxwindows/interface.cpp:222
 #, fuzzy
 msgid "Open a file"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
@@ -3834,7 +3897,7 @@ 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:686 modules/gui/macosx/intf.m:381
+#: modules/gui/macosx/controls.m:688 modules/gui/macosx/intf.m:381
 msgid "Mute"
 msgstr "¥ß¥å¡¼¥È¤¹¤ë"
 
@@ -3860,7 +3923,7 @@ 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/output.m:137 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/output.m:129 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr "¥¹¥¯¥ê¡¼¥ó"
 
@@ -3877,19 +3940,19 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:1690
 #: 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:364
-#: modules/gui/wxwindows/open.cpp:281
+#: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:143
+#: modules/gui/macosx/open.m:267 modules/gui/wxwindows/interface.cpp:331
+#: modules/gui/wxwindows/open.cpp:255
 msgid "Disc"
 msgstr "¥Ç¥£¥¹¥¯"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:366
+#: modules/gui/wxwindows/interface.cpp:333
 msgid "Net"
 msgstr "Network"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:369
+#: modules/gui/wxwindows/interface.cpp:336
 msgid "Sat"
 msgstr "±ÒÀ±"
 
@@ -3951,7 +4014,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:380
+#: modules/gui/wxwindows/interface.cpp:347
 msgid "Prev"
 msgstr "Á°"
 
@@ -3963,9 +4026,9 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:667
 #: 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:647
+#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:649
 #: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
-#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:382
+#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:349
 msgid "Next"
 msgstr "¼¡"
 
@@ -4044,17 +4107,17 @@ msgid "Open Stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ò³«¤¯"
 
 #: modules/gui/gtk/gnome_interface.c:1476 modules/gui/gtk/gtk_interface.c:1791
-#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:173
+#: modules/gui/macosx/open.m:136 modules/gui/wxwindows/open.cpp:169
 msgid "Media Resource Locator (MRL)"
 msgstr "¥á¥Ç¥£¥¢¡¦¥ê¥½¡¼¥¹¡¦¥í¥±¡¼¥¿ (MRL)"
 
 #: modules/gui/gtk/gnome_interface.c:1498 modules/gui/gtk/gtk_interface.c:1813
-#: modules/gui/wxwindows/open.cpp:177
+#: modules/gui/wxwindows/open.cpp:173
 msgid "Open Target:"
 msgstr "¥¿¡¼¥²¥Ã¥È¤ò³«¤¯"
 
 #: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:192
+#: modules/gui/wxwindows/open.cpp:188
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -4064,63 +4127,63 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1562
 #: 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:140 modules/gui/macosx/prefs.m:464
-#: modules/gui/wxwindows/open.cpp:249 modules/gui/wxwindows/open.cpp:365
-#: modules/gui/wxwindows/preferences.cpp:829
-#: modules/gui/wxwindows/streamout.cpp:411
+#: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:152 modules/gui/macosx/open.m:174
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/prefs.m:464
+#: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
+#: modules/gui/wxwindows/preferences.cpp:832
+#: modules/gui/wxwindows/streamout.cpp:412
 #: modules/gui/wxwindows/subtitles.cpp:107
 msgid "Browse..."
 msgstr "¥Ö¥é¥¦¥º..."
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:390
+#: modules/gui/wxwindows/open.cpp:392
 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:384
+#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:487
+#: modules/gui/wxwindows/open.cpp:386
 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:385
+#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:381
+#: modules/gui/macosx/open.m:471 modules/gui/wxwindows/open.cpp:387
 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:396
+#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:398
 msgid "Device name"
 msgstr "¥Ç¥Ð¥¤¥¹Ì¾"
 
 #: modules/gui/gtk/gnome_interface.c:1660 modules/gui/gtk/gtk_interface.c:1996
-#: modules/gui/macosx/open.m:152
+#: modules/gui/macosx/open.m:153
 msgid "Use DVD menus"
 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:431
+#: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:546
+#: modules/gui/macosx/open.m:584 modules/gui/wxwindows/open.cpp:433
 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:432
+#: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:547
+#: modules/gui/macosx/open.m:596 modules/gui/wxwindows/open.cpp:434
 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:433
+#: modules/gui/macosx/open.m:167 modules/gui/macosx/open.m:548
+#: modules/gui/macosx/open.m:609 modules/gui/wxwindows/open.cpp:435
 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:489
+#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr ""
 
@@ -4149,24 +4212,24 @@ msgid "Horizontal"
 msgstr "¿åÊ¿"
 
 #: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
-#: modules/gui/wxwindows/open.cpp:286
+#: modules/gui/wxwindows/open.cpp:260
 msgid "Satellite"
 msgstr "±ÒÀ±"
 
 #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322
-#: modules/gui/macosx/open.m:175
+#: modules/gui/macosx/open.m:176
 #, fuzzy
 msgid "delay"
 msgstr "ºÆÀ¸"
 
 #: modules/gui/gtk/gnome_interface.c:2020 modules/gui/gtk/gtk_interface.c:2338
-#: modules/gui/macosx/open.m:177
+#: modules/gui/macosx/open.m:178
 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:133
-#: modules/gui/wxwindows/open.cpp:204 modules/gui/wxwindows/open.cpp:226
+#: modules/gui/macosx/open.m:173 modules/gui/macosx/output.m:125
+#: modules/gui/wxwindows/open.cpp:199 modules/gui/wxwindows/open.cpp:354
 #, fuzzy
 msgid "Settings..."
 msgstr "ÀßÄê(_S)"
@@ -4242,14 +4305,14 @@ msgid "Destination Target: "
 msgstr "Á÷¿®Àè¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:257
-#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:386
+#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:313 modules/gui/wxwindows/streamout.cpp:387
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:270
-#: modules/gui/macosx/output.m:333 modules/gui/wxwindows/streamout.cpp:387
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:260
+#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:388
 msgid "RTP"
 msgstr ""
 
@@ -4272,8 +4335,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:303
-#: modules/gui/macosx/output.m:362
+#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:293
+#: modules/gui/macosx/output.m:352
 msgid "AVI"
 msgstr ""
 
@@ -4291,11 +4354,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)"
@@ -4312,10 +4370,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 "¥¤¥ó¥¿¥Õ¥§¡¼¥¹¥¦¥£¥ó¥É¥¦¤ò±£¤¹"
@@ -4336,10 +4390,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)..."
@@ -4360,7 +4410,7 @@ msgstr "
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:154
+#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:150
 msgid "Open Target"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
@@ -4394,10 +4444,11 @@ msgstr "
 
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
-#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:139
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:273
+#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
+#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/wxwindows/open.cpp:974
 #: modules/gui/wxwindows/preferences.cpp:256
-#: modules/gui/wxwindows/streamout.cpp:224
+#: modules/gui/wxwindows/streamout.cpp:220
 #: modules/gui/wxwindows/subtitles.cpp:152
 msgid "Cancel"
 msgstr "¥­¥ã¥ó¥»¥ë"
@@ -4448,56 +4499,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:374
-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 "¸À¸ì"
@@ -4534,58 +4535,58 @@ msgstr ""
 msgid "About VLC media player"
 msgstr "VLC¥á¥Ç¥£¥¢¡¦¥×¥ì¥¤¥ä¡¼¤Ë¤Ä¤¤¤Æ"
 
-#: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:691
+#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:693
 #: modules/gui/macosx/intf.m:390
 #, fuzzy
 msgid "Half Size"
 msgstr "¥µ¥¤¥º"
 
-#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:692
+#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:694
 #: modules/gui/macosx/intf.m:391
 msgid "Normal Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:693
+#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
 #: modules/gui/macosx/intf.m:392
 msgid "Double Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
-#: modules/gui/macosx/controls.m:702 modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:697
+#: modules/gui/macosx/controls.m:704 modules/gui/macosx/intf.m:395
 msgid "Float On Top"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:694
+#: modules/gui/macosx/controls.m:360 modules/gui/macosx/controls.m:696
 #: modules/gui/macosx/intf.m:393
 #, fuzzy
 msgid "Fit To Screen"
 msgstr "¥¹¥¯¥ê¡¼¥ó"
 
-#: modules/gui/macosx/controls.m:625 modules/gui/macosx/intf.m:326
-#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:386
+#: modules/gui/macosx/controls.m:627 modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:353
 msgid "Faster"
 msgstr "ÁáÁ÷¤ê"
 
-#: modules/gui/macosx/controls.m:626 modules/gui/macosx/intf.m:323
-#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:384
+#: modules/gui/macosx/controls.m:628 modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:351
 msgid "Slower"
 msgstr "¥¹¥í¡¼"
 
-#: modules/gui/macosx/controls.m:646 modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/controls.m:648 modules/gui/macosx/intf.m:322
 #: modules/gui/macosx/intf.m:366 modules/gui/macosx/intf.m:426
 msgid "Previous"
 msgstr "Á°¤Î¥Õ¥¡¥¤¥ë"
 
-#: modules/gui/macosx/controls.m:665 modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/controls.m:667 modules/gui/macosx/intf.m:368
 msgid "Loop"
 msgstr "¥ë¡¼¥×"
 
-#: modules/gui/macosx/controls.m:672 modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/controls.m:674 modules/gui/macosx/intf.m:369
 #, fuzzy
 msgid "Step Forward"
 msgstr "žÁ÷"
 
-#: modules/gui/macosx/controls.m:673 modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/controls.m:675 modules/gui/macosx/intf.m:370
 #, fuzzy
 msgid "Step Backward"
 msgstr "µÕžºÆÀ¸"
@@ -4600,8 +4601,8 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr "¥³¥ó¥È¥í¡¼¥ë"
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:868
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
 #, fuzzy
 msgid "Volume"
 msgstr "¥Ü¥ê¥å¡¼¥à¤ò¾å¤²¤ë"
@@ -4660,7 +4661,7 @@ msgstr "
 msgid "Open Recent"
 msgstr "ºÇ¶á»È¤Ã¤¿¹àÌܤò³«¤¯"
 
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1205
+#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1202
 msgid "Clear Menu"
 msgstr "¥á¥Ë¥å¡¼¤ò¥¯¥ê¥¢¤¹¤ë"
 
@@ -4731,7 +4732,7 @@ msgstr ""
 msgid "VideoLAN Website"
 msgstr "VideoLAN¥¯¥é¥¤¥¢¥ó¥È"
 
-#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1198
+#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1195
 msgid "License"
 msgstr "¥é¥¤¥»¥ó¥¹"
 
@@ -4758,12 +4759,12 @@ msgstr "
 msgid "Dismiss"
 msgstr "¤ä¤êľ¤·"
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 #, fuzzy
 msgid "No CrashLog found"
 msgstr "%@s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4798,115 +4799,115 @@ msgstr "
 msgid "MacOS X interface, sound and video"
 msgstr ""
 
-#: modules/gui/macosx/open.m:134
+#: modules/gui/macosx/open.m:135
 msgid "Open Source"
 msgstr "¥½¡¼¥¹¤ò³«¤¯"
 
-#: modules/gui/macosx/open.m:136
+#: modules/gui/macosx/open.m:137
 #, fuzzy
 msgid "Only enqueue in playlist, do not play"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Ç¥×¥ì¥¤¥ê¥¹¥È¤ËÄɲÃ"
 
-#: modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:147
 msgid "Treat as a pipe rather than as a file"
 msgstr "¥Õ¥¡¥¤¥ë¤È¤·¤Æ¤Ç¤Ï¤Ê¤¯¡¢¥Ñ¥¤¥×¤È¤·¤Æ°·¤¦"
 
-#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:371
+#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:370
 msgid "VIDEO_TS folder"
 msgstr "VIDEO_TS¥Õ¥©¥ë¥À"
 
-#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:389
-#: modules/gui/macosx/open.m:480
+#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:388
+#: modules/gui/macosx/open.m:479
 #, fuzzy
 msgid "Audio CD"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/macosx/open.m:171
+#: modules/gui/macosx/open.m:172
 #, fuzzy
 msgid "Load subtitles file:"
 msgstr "»úËë"
 
-#: modules/gui/macosx/open.m:174
+#: modules/gui/macosx/open.m:175
 msgid "Override"
 msgstr ""
 
-#: modules/gui/macosx/open.m:333 modules/gui/macosx/open.m:527
-#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:678
+#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:677
 msgid "Open"
 msgstr "³«¤¯"
 
-#: modules/gui/macosx/open.m:423 modules/gui/macosx/open.m:475
-#: modules/gui/macosx/open.m:483 modules/gui/macosx/open.m:491
+#: modules/gui/macosx/open.m:422 modules/gui/macosx/open.m:474
+#: modules/gui/macosx/open.m:482 modules/gui/macosx/open.m:490
 msgid "No %@s found"
 msgstr "%@s ¤Ï¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:525
 msgid "Open VIDEO_TS Directory"
 msgstr "VIDEO_TS¥Ç¥£¥ì¥¯¥È¥ê¤ò³«¤¯"
 
-#: modules/gui/macosx/output.m:132
+#: modules/gui/macosx/output.m:124
 #, fuzzy
 msgid "Advanced output:"
 msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:128
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:235
-#: modules/gui/macosx/output.m:316
+#: modules/gui/macosx/output.m:131 modules/gui/macosx/output.m:225
+#: modules/gui/macosx/output.m:306
 #, fuzzy
 msgid "Stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤ÎÄä»ß"
 
-#: modules/gui/macosx/output.m:143
+#: modules/gui/macosx/output.m:135
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:149 modules/gui/wxwindows/streamout.cpp:530
+#: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:150
+#: modules/gui/macosx/output.m:142
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:151 modules/gui/macosx/output.m:305
-#: modules/gui/macosx/output.m:358
+#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:295
+#: modules/gui/macosx/output.m:348
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:152 modules/gui/macosx/output.m:307
-#: modules/gui/macosx/output.m:360
+#: modules/gui/macosx/output.m:144 modules/gui/macosx/output.m:297
+#: modules/gui/macosx/output.m:350
 msgid "MPEG1"
 msgstr ""
 
-#: modules/gui/macosx/output.m:154 modules/gui/macosx/output.m:304
-#: modules/gui/macosx/output.m:364
+#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:294
+#: modules/gui/macosx/output.m:354
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:157
+#: modules/gui/macosx/output.m:149
 #, fuzzy
 msgid "Transcode options"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
 
-#: modules/gui/macosx/output.m:161 modules/gui/macosx/output.m:167
-#: modules/gui/wxwindows/streamout.cpp:609
-#: modules/gui/wxwindows/streamout.cpp:661
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:159
+#: modules/gui/wxwindows/streamout.cpp:610
+#: modules/gui/wxwindows/streamout.cpp:662
 msgid "Bitrate (kb/s)"
 msgstr ""
 
-#: modules/gui/macosx/output.m:174 modules/gui/wxwindows/streamout.cpp:483
+#: modules/gui/macosx/output.m:166 modules/gui/wxwindows/streamout.cpp:484
 #, fuzzy
 msgid "Miscellaneous Options"
 msgstr "¤½¤Î¾"
 
-#: modules/gui/macosx/output.m:175
+#: modules/gui/macosx/output.m:167
 msgid "Announce streams via SAP Channel:"
 msgstr ""
 
-#: modules/gui/macosx/output.m:306 modules/gui/macosx/output.m:366
+#: modules/gui/macosx/output.m:296 modules/gui/macosx/output.m:356
 msgid "mp4"
 msgstr ""
 
@@ -4999,214 +5000,214 @@ msgstr "
 msgid "FileInfo"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
 
-#: modules/gui/wxwindows/interface.cpp:256
+#: modules/gui/wxwindows/interface.cpp:223
 #, fuzzy
 msgid "Open a DVD or (S)VCD"
 msgstr "DVD¤Þ¤¿¤ÏVCD¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:257
+#: modules/gui/wxwindows/interface.cpp:224
 #, fuzzy
 msgid "Open a network stream"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à¤òÁªÂò¤¹¤ë"
 
-#: modules/gui/wxwindows/interface.cpp:258
+#: modules/gui/wxwindows/interface.cpp:225
 #, fuzzy
 msgid "Open a satellite stream"
 msgstr "±ÒÀ±¥«¡¼¥É¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:226
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:260
+#: modules/gui/wxwindows/interface.cpp:227
 #, fuzzy
 msgid "Exit this program"
 msgstr "¥×¥í¥°¥é¥à¤Î½ªÎ»"
 
-#: modules/gui/wxwindows/interface.cpp:262
+#: modules/gui/wxwindows/interface.cpp:229
 #, fuzzy
 msgid "Open the playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:230
 #, fuzzy
 msgid "Show the program logs"
 msgstr "¥×¥í¥°¥é¥à¤ÎÁªÂò"
 
-#: modules/gui/wxwindows/interface.cpp:264
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:266
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:268
+#: modules/gui/wxwindows/interface.cpp:235
 #, fuzzy
 msgid "About this program"
 msgstr "¥×¥í¥°¥é¥à¤Î½ªÎ»"
 
-#: modules/gui/wxwindows/interface.cpp:272 modules/gui/wxwindows/menus.cpp:108
+#: modules/gui/wxwindows/interface.cpp:239 modules/gui/wxwindows/menus.cpp:108
 #, fuzzy
 msgid "Simple &Open ..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
 
-#: modules/gui/wxwindows/interface.cpp:274 modules/gui/wxwindows/menus.cpp:109
+#: modules/gui/wxwindows/interface.cpp:241 modules/gui/wxwindows/menus.cpp:109
 #, fuzzy
 msgid "Open &File..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯..."
 
-#: modules/gui/wxwindows/interface.cpp:276 modules/gui/wxwindows/menus.cpp:110
+#: modules/gui/wxwindows/interface.cpp:243 modules/gui/wxwindows/menus.cpp:110
 #, fuzzy
 msgid "Open &Disc..."
 msgstr "¥Ç¥£¥¹¥¯¤ò³«¤¯..."
 
-#: modules/gui/wxwindows/interface.cpp:278 modules/gui/wxwindows/menus.cpp:111
+#: modules/gui/wxwindows/interface.cpp:245 modules/gui/wxwindows/menus.cpp:111
 #, fuzzy
 msgid "Open &Network Stream..."
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à(_N)..."
 
-#: modules/gui/wxwindows/interface.cpp:281
+#: modules/gui/wxwindows/interface.cpp:248
 #, fuzzy
 msgid "Open &Satellite Stream..."
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¹¥È¥ê¡¼¥à(_N)..."
 
-#: modules/gui/wxwindows/interface.cpp:286
+#: modules/gui/wxwindows/interface.cpp:253
 #, fuzzy
 msgid "&Eject Disc"
 msgstr "¥Ç¥£¥¹¥¯¤Î¼è½Ð¤·(_E)"
 
-#: modules/gui/wxwindows/interface.cpp:290
+#: modules/gui/wxwindows/interface.cpp:257
 #, fuzzy
 msgid "E&xit"
 msgstr "½ªÎ»(_x)"
 
-#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:261
 #, fuzzy
 msgid "&Playlist..."
 msgstr "¥×¥ì¥¤¥ê¥¹¥È..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:263
 #, fuzzy
 msgid "&Messages..."
 msgstr "¥á¥Ã¥»¡¼¥¸..."
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:264
 #, fuzzy
 msgid "&File info..."
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯(_O)..."
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:269
 #, fuzzy
 msgid "&Preferences..."
 msgstr "ÀßÄê(_P)..."
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:286
 #, fuzzy
 msgid "&About..."
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ(_A)..."
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:290
 #, fuzzy
 msgid "&File"
 msgstr "¥Õ¥¡¥¤¥ë"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:291
 #, fuzzy
 msgid "&View"
 msgstr "ɽ¼¨(_V)"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:292
 #, fuzzy
 msgid "&Settings"
 msgstr "ÀßÄê(_S)"
 
-#: modules/gui/wxwindows/interface.cpp:326
-#: modules/gui/wxwindows/interface.cpp:482
-#: modules/gui/wxwindows/interface.cpp:530
+#: modules/gui/wxwindows/interface.cpp:293
+#: modules/gui/wxwindows/interface.cpp:414
+#: modules/gui/wxwindows/interface.cpp:462
 #, fuzzy
 msgid "&Audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/wxwindows/interface.cpp:327
-#: modules/gui/wxwindows/interface.cpp:501
-#: modules/gui/wxwindows/interface.cpp:534
+#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:433
+#: modules/gui/wxwindows/interface.cpp:466
 #, fuzzy
 msgid "&Video"
 msgstr "¥Ó¥Ç¥ª"
 
-#: modules/gui/wxwindows/interface.cpp:328
-#: modules/gui/wxwindows/interface.cpp:520
-#: modules/gui/wxwindows/interface.cpp:538
+#: modules/gui/wxwindows/interface.cpp:295
+#: modules/gui/wxwindows/interface.cpp:452
+#: modules/gui/wxwindows/interface.cpp:470
 #, fuzzy
 msgid "&Navigation"
 msgstr "¥Ê¥Ó¥²¡¼¥·¥ç¥ó(_N)"
 
-#: modules/gui/wxwindows/interface.cpp:329
+#: modules/gui/wxwindows/interface.cpp:296
 #, fuzzy
 msgid "&Help"
 msgstr "¥Ø¥ë¥×(_H)"
 
-#: modules/gui/wxwindows/interface.cpp:345
+#: modules/gui/wxwindows/interface.cpp:312
 #, fuzzy
 msgid "Stop current playlist item"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/wxwindows/interface.cpp:313
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:347
+#: modules/gui/wxwindows/interface.cpp:314
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:348
+#: modules/gui/wxwindows/interface.cpp:315
 #: modules/gui/wxwindows/playlist.cpp:353
 #, fuzzy
 msgid "Open playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:316
 #, fuzzy
 msgid "Previous playlist item"
 msgstr "Á°¤Î¥Õ¥¡¥¤¥ë"
 
-#: modules/gui/wxwindows/interface.cpp:350
+#: modules/gui/wxwindows/interface.cpp:317
 #, fuzzy
 msgid "Next playlist item"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤ò³«¤¯"
 
-#: modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/wxwindows/interface.cpp:318
 #, fuzzy
 msgid "Play slower"
 msgstr "¥¹¥í¡¼ºÆÀ¸"
 
-#: modules/gui/wxwindows/interface.cpp:352
+#: modules/gui/wxwindows/interface.cpp:319
 #, fuzzy
 msgid "Play faster"
 msgstr "ÁáÁ÷¤êºÆÀ¸"
 
-#: modules/gui/wxwindows/interface.cpp:574
+#: modules/gui/wxwindows/interface.cpp:506
 #, fuzzy
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr "¥Í¥¤¥Æ¥£¥ÖWindows¥¤¥ó¥¿¥Õ¥§¡¼¥¹"
 
-#: modules/gui/wxwindows/interface.cpp:575
+#: modules/gui/wxwindows/interface.cpp:507
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:576
+#: modules/gui/wxwindows/interface.cpp:508
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:578
+#: modules/gui/wxwindows/interface.cpp:510
 #, fuzzy
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
@@ -5215,7 +5216,7 @@ msgstr ""
 "¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤ÏDVD¤ª¤è¤Ó¡¢MPEG¤òºÆÀ¸¤¹¤ëVideoLAN¥¯¥é¥¤¥¢¥ó¥È¤Ç¤¹¡£\n"
 "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¡¢¥Í¥Ã¥È¥ï¡¼¥¯¤«¤éMPEG¤ÈMPEG 2¥Ç¡¼¥¿¤òºÆÀ¸¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£"
 
-#: modules/gui/wxwindows/interface.cpp:582
+#: modules/gui/wxwindows/interface.cpp:514
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "VideoLAN¤Ë¤Ä¤¤¤Æ"
@@ -5257,49 +5258,54 @@ msgstr ""
 msgid "Save Messages As a file..."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:181
+#: modules/gui/wxwindows/open.cpp:177
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:198 modules/gui/wxwindows/subtitles.cpp:98
-#, fuzzy
-msgid "Subtitles file"
-msgstr "»úËë"
-
-#: modules/gui/wxwindows/open.cpp:199
-msgid "Load an additional subtitles file. Currently only works with AVI files."
-msgstr ""
-
-#: modules/gui/wxwindows/open.cpp:222
+#: modules/gui/wxwindows/open.cpp:195
 msgid "Use VLC as a stream server"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:242
+#: modules/gui/wxwindows/open.cpp:216
 #, fuzzy
 msgid "Capture input stream"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î°ì»þÄä»ß"
 
-#: modules/gui/wxwindows/open.cpp:244
+#: modules/gui/wxwindows/open.cpp:218
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:383
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#, fuzzy
+msgid "Subtitles file"
+msgstr "»úËë"
+
+#: modules/gui/wxwindows/open.cpp:349
+msgid "Load an additional subtitles file. Currently only works with AVI files."
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:385
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:386
+#: modules/gui/wxwindows/open.cpp:388
 #, fuzzy
 msgid "CD Audio"
 msgstr "¥ª¡¼¥Ç¥£¥ª"
 
-#: modules/gui/wxwindows/open.cpp:886 modules/gui/wxwindows/streamout.cpp:785
+#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
 #, fuzzy
 msgid "Save file"
 msgstr "¥Õ¥¡¥¤¥ë¤ÎÊݸ"
 
+#: modules/gui/wxwindows/open.cpp:953
+#, fuzzy
+msgid "Advanced open options"
+msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
+
 #: modules/gui/wxwindows/playlist.cpp:116
 #, fuzzy
 msgid "&Simple Add..."
@@ -5362,66 +5368,66 @@ msgstr "
 msgid "Reset config file"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:898
+#: modules/gui/wxwindows/preferences.cpp:901
 #, fuzzy
 msgid "No configuration options available"
 msgstr "¥³¥ó¥Õ¥£¥°¥ì¡¼¥·¥ç¥ó¡¦¥ª¥×¥·¥ç¥ó¤Ë¥Ä¡¼¥ë¥Á¥Ã¥×¤òɽ¼¨"
 
-#: modules/gui/wxwindows/preferences.cpp:919
+#: modules/gui/wxwindows/preferences.cpp:922
 #, fuzzy
 msgid "Advanced options"
 msgstr "ALSA¥ª¡¼¥Ç¥£¥ª¡¦¥â¥¸¥å¡¼¥ë"
 
-#: modules/gui/wxwindows/streamout.cpp:190
+#: modules/gui/wxwindows/streamout.cpp:186
 msgid "Stream output MRL"
 msgstr "¥¹¥È¥ê¡¼¥à¤Î½ÐÎÏMRL"
 
-#: modules/gui/wxwindows/streamout.cpp:194
+#: modules/gui/wxwindows/streamout.cpp:190
 #, fuzzy
 msgid "Destination Target:"
 msgstr "Á÷¿®Àè¤Î¥¢¥¹¥Ú¥¯¥È¡¦¥ì¥·¥ª"
 
-#: modules/gui/wxwindows/streamout.cpp:197
+#: modules/gui/wxwindows/streamout.cpp:193
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:377
+#: modules/gui/wxwindows/streamout.cpp:378
 msgid "Output Methods"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:383
+#: modules/gui/wxwindows/streamout.cpp:384
 #, fuzzy
 msgid "Play locally"
 msgstr "¥¹¥í¡¼ºÆÀ¸"
 
-#: modules/gui/wxwindows/streamout.cpp:407
+#: modules/gui/wxwindows/streamout.cpp:408
 #, fuzzy
 msgid "Filename"
 msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
 
-#: modules/gui/wxwindows/streamout.cpp:495
+#: modules/gui/wxwindows/streamout.cpp:496
 msgid "SAP Announce"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:497
+#: modules/gui/wxwindows/streamout.cpp:498
 #, fuzzy
 msgid "Channel Name "
 msgstr "¥Á¥ã¥ó¥Í¥ë¡¦¥µ¡¼¥Ð¡¼"
 
-#: modules/gui/wxwindows/streamout.cpp:569
+#: modules/gui/wxwindows/streamout.cpp:570
 #, fuzzy
 msgid "Transcoding options"
 msgstr "»ý³´ü´Ö"
 
-#: modules/gui/wxwindows/streamout.cpp:602
+#: modules/gui/wxwindows/streamout.cpp:603
 #, fuzzy
 msgid "Video codec"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
 
-#: modules/gui/wxwindows/streamout.cpp:649
+#: modules/gui/wxwindows/streamout.cpp:650
 #, fuzzy
 msgid "Audio codec"
 msgstr "DVD¥Ç¥Ð¥¤¥¹"
@@ -5523,30 +5529,30 @@ msgstr "
 msgid "Using the dummy interface plugin..."
 msgstr "¥À¥ß¡¼¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¦¥×¥é¥°¥¤¥ó¤ò»ÈÍѤ·¤Þ¤¹¡£"
 
-#: modules/misc/freetype.c:65 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
 #, fuzzy
 msgid "Font"
 msgstr "¥Õ¥©¥ó¥È"
 
-#: modules/misc/freetype.c:66
+#: modules/misc/freetype.c:68
 #, fuzzy
 msgid "Filename of Font"
 msgstr "¥í¥°¡¦¥Õ¥¡¥¤¥ë̾"
 
-#: modules/misc/freetype.c:67
+#: modules/misc/freetype.c:69
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:70
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:71
+#: modules/misc/freetype.c:73
 #, fuzzy
 msgid "Fonts"
 msgstr "¥Õ¥©¥ó¥È"
 
-#: modules/misc/freetype.c:74
+#: modules/misc/freetype.c:76
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5588,6 +5594,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"
@@ -5608,11 +5619,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¥Í¥Ã¥È¥ï¡¼¥¯Ãê¾Ý¥ì¥¤¥ä"
diff --git a/po/nl.po b/po/nl.po
index dde814fda5..68b23b8a29 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-07-24 00:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-29 19:02+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 "X-Generator: KBabel 0.8\n"
 
 #: include/vlc_interface.h:105
@@ -25,8 +25,8 @@ msgid ""
 msgstr ""
 "\n"
 "Waarschuwing: als de interface niet meer toegankelijk is open dan een dos "
-"commando omgeving en ga naar de directory waar VLC is geinstalleerd. Voer daar "
-"het commando \"vlc -I win32\" uit.\n"
+"commando omgeving en ga naar de directory waar VLC is geinstalleerd. Voer "
+"daar het commando \"vlc -I win32\" uit.\n"
 
 #: src/audio_output/output.c:104 src/audio_output/output.c:131
 #: modules/gui/macosx/intf.m:384 modules/gui/macosx/intf.m:385
@@ -34,7 +34,7 @@ msgid "Audio channels"
 msgstr "Audio kanalen"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:179 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:386
 msgid "Stereo"
@@ -130,8 +130,8 @@ msgstr "Programma"
 #: 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:373
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:404
+#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:406
 msgid "Title"
 msgstr "Titel"
 
@@ -139,8 +139,8 @@ msgstr "Titel"
 #: 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:375
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
+#: modules/gui/wxwindows/open.cpp:412
 msgid "Chapter"
 msgstr "Hoofdstuk"
 
@@ -462,9 +462,9 @@ msgid ""
 "used by default when possible (ie. if your hardware supports it as well as "
 "the audio stream being played)"
 msgstr ""
-"Deze optie laat u het aantal kanalen instellen voor audio output, indien "
-"dat mogelijk is. (dus als zowel uw hardware als de audio die u afspeelt "
-"dit ondersteunen."
+"Deze optie laat u het aantal kanalen instellen voor audio output, indien dat "
+"mogelijk is. (dus als zowel uw hardware als de audio die u afspeelt dit "
+"ondersteunen."
 
 #: src/libvlc.h:136
 msgid "Use the S/PDIF audio output when available"
@@ -1121,7 +1121,7 @@ msgstr "Interface"
 #: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
 #: modules/demux/ogg.c:1002 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:378 modules/gui/macosx/output.m:164
+#: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "Audio"
 
@@ -1130,7 +1130,7 @@ msgstr "Audio"
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:909
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
-#: modules/gui/macosx/output.m:158 modules/misc/dummy/dummy.c:81
+#: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
 #: modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "Video"
@@ -1149,7 +1149,7 @@ msgstr "Encoders"
 
 #: src/libvlc.h:547 modules/gui/gtk/gnome_interface.c:2042
 #: modules/gui/gtk/gtk_interface.c:2361 modules/gui/gtk/gtk_interface.c:3034
-#: modules/gui/wxwindows/open.cpp:221 modules/gui/wxwindows/streamout.cpp:175
+#: modules/gui/wxwindows/open.cpp:194 modules/gui/wxwindows/streamout.cpp:171
 msgid "Stream output"
 msgstr "Stream uitvoer"
 
@@ -1163,7 +1163,7 @@ msgstr "CPU"
 #: 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:321
 #: modules/gui/macosx/intf.m:409 modules/gui/pda/interface.c:612
-#: modules/gui/wxwindows/interface.cpp:378
+#: modules/gui/wxwindows/interface.cpp:345
 #: modules/gui/wxwindows/playlist.cpp:104
 msgid "Playlist"
 msgstr "Afspeellijst"
@@ -1208,8 +1208,8 @@ msgid "boolean"
 msgstr "boolean"
 
 #: src/video_output/video_output.c:406 modules/gui/beos/VideoOutput.cpp:1151
-#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:348
-#: modules/gui/macosx/controls.m:690 modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:350
+#: modules/gui/macosx/controls.m:692 modules/gui/macosx/intf.m:394
 msgid "Fullscreen"
 msgstr "Volledig scherm"
 
@@ -1243,7 +1243,7 @@ msgstr "Linear"
 
 #: modules/access/cdda.c:86 modules/access/file.c:72 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
-#: modules/access/v4l/v4l.c:67
+#: modules/access/v4l/v4l.c:66
 msgid "Caching value in ms"
 msgstr "Buffergrootte in ms"
 
@@ -1400,6 +1400,38 @@ 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:66
+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:74 modules/access/udp.c:72
+msgid "caching value in ms"
+msgstr "buffer grootte in ms"
+
+#: modules/access_output/udp.c:76 modules/access/udp.c:74
+msgid ""
+"Allows you to modify the default caching value for udp streams. This value "
+"should be set in miliseconds units."
+msgstr ""
+"Wijzig de standaard buffer grootte voor udp stromen. Deze waarde wordt in "
+"miliseconden opgegeven."
+
+#: modules/access_output/udp.c:80
+msgid "UDP stream ouput"
+msgstr "UDP stream uitvoer"
+
+#: modules/access_output/udp.c:81
+msgid "udp stream output"
+msgstr "udp stream uitvoer"
+
 #: modules/access/pvr/pvr.c:75
 msgid "Hauppauge PVR cards input"
 msgstr "Invoer van Hauppage PVR kaarten"
@@ -1448,18 +1480,6 @@ msgstr "SLP invoer"
 msgid "slp"
 msgstr "slp"
 
-#: modules/access/udp.c:72 modules/access_output/udp.c:74
-msgid "caching value in ms"
-msgstr "buffer grootte in ms"
-
-#: modules/access/udp.c:74 modules/access_output/udp.c:76
-msgid ""
-"Allows you to modify the default caching value for udp streams. This value "
-"should be set in miliseconds units."
-msgstr ""
-"Wijzig de standaard buffer grootte voor udp stromen. Deze waarde wordt in "
-"miliseconden opgegeven."
-
 #: modules/access/udp.c:78
 msgid "UDP/RTP input"
 msgstr "UDP/RTP invoer"
@@ -1468,7 +1488,7 @@ msgstr "UDP/RTP invoer"
 msgid "udp"
 msgstr "udp"
 
-#: modules/access/v4l/v4l.c:69
+#: modules/access/v4l/v4l.c:68
 msgid ""
 "Allows you to modify the default caching value for v4l streams. This value "
 "should be set in miliseconds units."
@@ -1476,15 +1496,15 @@ msgstr ""
 "Wijzig de standaard buffer grootte voor v4l bronnen. Deze waarde wordt in "
 "milliseconden opgegeven."
 
-#: modules/access/v4l/v4l.c:73
+#: modules/access/v4l/v4l.c:72
 msgid "Video4Linux input"
 msgstr "Video4Linux invoer"
 
-#: modules/access/v4l/v4l.c:74
+#: modules/access/v4l/v4l.c:73
 msgid "v4l"
 msgstr "v4l"
 
-#: modules/access/v4l/v4l.c:82
+#: modules/access/v4l/v4l.c:81
 msgid "Video4Linux demuxer"
 msgstr "Video4Linux demuxer"
 
@@ -1492,26 +1512,6 @@ msgstr "Video4Linux demuxer"
 msgid "VCD input"
 msgstr "VCD input"
 
-#: modules/access_output/dummy.c:56
-msgid "Dummy stream ouput"
-msgstr "Dummy stream uitvoer"
-
-#: modules/access_output/file.c:66
-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:80
-msgid "UDP stream ouput"
-msgstr "UDP stream uitvoer"
-
-#: modules/access_output/udp.c:81
-msgid "udp stream output"
-msgstr "udp stream uitvoer"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr "Karakteristieke dimensie"
@@ -1660,7 +1660,7 @@ msgstr "ALSA apparaatnaam"
 msgid "ALSA audio output"
 msgstr "ALSA audio uitvoer"
 
-#: modules/audio_output/alsa.c:116 modules/audio_output/coreaudio.c:218
+#: modules/audio_output/alsa.c:117 modules/audio_output/coreaudio.c:218
 #: modules/audio_output/coreaudio.c:1473 modules/audio_output/directx.c:377
 #: modules/audio_output/oss.c:129 modules/audio_output/sdl.c:176
 #: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:337
@@ -1668,23 +1668,23 @@ msgstr "ALSA audio uitvoer"
 msgid "Audio device"
 msgstr "Audio apparaat"
 
-#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:173 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:399
 msgid "Mono"
 msgstr "Mono"
 
-#: modules/audio_output/alsa.c:180 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr "2 Voor 2 Achter"
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr "5.1"
 
-#: modules/audio_output/alsa.c:208 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr "A/52 over S/PDIF"
@@ -1966,14 +1966,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"
@@ -1986,10 +1986,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"
@@ -1998,6 +1994,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"
@@ -2195,8 +2195,9 @@ msgstr "Repeteertijd"
 msgid ""
 "the time waited before the action is repeated if it is still trigeredin "
 "miscroseconds"
-msgstr "De hoeveelheid microseconden dat wordt gewacht voordat the actie "
-"wordt herhaald"
+msgstr ""
+"De hoeveelheid microseconden dat wordt gewacht voordat the actie wordt "
+"herhaald"
 
 #: modules/control/joystick.c:147
 msgid "Wait before repeat time"
@@ -2235,9 +2236,9 @@ 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:924
-#: modules/gui/macosx/intf.m:925 modules/gui/macosx/intf.m:926
-#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:797
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
+#: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
+#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:685
 msgid "Pause"
 msgstr "Pauze"
 
@@ -2245,11 +2246,11 @@ msgstr "Pauze"
 #: 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:324 modules/gui/macosx/intf.m:362
-#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:931
-#: modules/gui/macosx/intf.m:932 modules/gui/macosx/intf.m:933
+#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
+#: modules/gui/macosx/intf.m:929 modules/gui/macosx/intf.m:930
 #: modules/gui/macosx/playlist.m:194 modules/gui/pda/interface.c:192
-#: modules/gui/wxwindows/interface.cpp:375
-#: modules/gui/wxwindows/interface.cpp:803
+#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:691
 msgid "Play"
 msgstr "Start"
 
@@ -2304,7 +2305,7 @@ msgstr "Laag"
 #: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
 #: 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/output.m:170 modules/gui/wxwindows/streamout.cpp:667
+#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr "Kanalen"
 
@@ -2330,7 +2331,7 @@ msgstr "Aantal streams"
 #: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
 #: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:147 modules/gui/pda/interface.c:372
+#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr "Type"
 
@@ -3059,19 +3060,19 @@ msgstr "Berichten"
 #: modules/gui/gtk/gnome_interface.c:2847 modules/gui/gtk/gtk_interface.c:618
 #: 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:138 modules/gui/macosx/output.m:218
-#: modules/gui/macosx/output.m:310 modules/gui/pda/interface.c:380
-#: modules/gui/wxwindows/interface.cpp:362 modules/gui/wxwindows/open.cpp:279
-#: modules/gui/wxwindows/streamout.cpp:384
+#: modules/gui/macosx/open.m:142 modules/gui/macosx/open.m:263
+#: modules/gui/macosx/output.m:130 modules/gui/macosx/output.m:208
+#: modules/gui/macosx/output.m:300 modules/gui/pda/interface.c:380
+#: modules/gui/wxwindows/interface.cpp:329 modules/gui/wxwindows/open.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:385
 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/macosx/open.m:630 modules/gui/macosx/open.m:677
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:331
+#: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:676
 msgid "Open File"
 msgstr "Open Bestand"
 
@@ -3132,11 +3133,11 @@ msgstr "Speel Lijst"
 #: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
 #: 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:606 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:134
-#: modules/gui/wxwindows/open.cpp:270
+#: modules/gui/gtk/preferences.c:606 modules/gui/macosx/open.m:139
+#: modules/gui/macosx/open.m:180 modules/gui/macosx/output.m:126
+#: modules/gui/wxwindows/open.cpp:244 modules/gui/wxwindows/open.cpp:971
 #: modules/gui/wxwindows/preferences.cpp:253
-#: modules/gui/wxwindows/streamout.cpp:221
+#: modules/gui/wxwindows/streamout.cpp:217
 #: modules/gui/wxwindows/subtitles.cpp:149
 msgid "OK"
 msgstr "OK"
@@ -3220,7 +3221,7 @@ msgstr "Pas Toe"
 
 #: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:597 modules/gui/gtk/preferences.c:614
-#: modules/gui/macosx/output.m:375 modules/gui/macosx/prefs.m:78
+#: modules/gui/macosx/output.m:365 modules/gui/macosx/prefs.m:78
 #: modules/gui/wxwindows/preferences.cpp:257
 msgid "Save"
 msgstr "Opslaan"
@@ -3291,8 +3292,8 @@ msgid "VLC media player"
 msgstr "VLC media speler"
 
 #: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:700
-#: modules/gui/wxwindows/preferences.cpp:1026
+#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr "Open een bestand"
@@ -3315,10 +3316,10 @@ 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:639
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:641
 #: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
 #: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Stop"
 msgstr "Stop"
 
@@ -3349,9 +3350,9 @@ msgid "UDP/RTP (Address when Multicast)"
 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:141 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:467 modules/gui/wxwindows/streamout.cpp:424
+#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
+#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
+#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
 msgid "Address"
 msgstr "Adres"
 
@@ -3359,16 +3360,16 @@ msgstr "Adres"
 #: modules/gui/gtk/gnome_interface.c:1786
 #: 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:142 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:452 modules/gui/wxwindows/open.cpp:475
-#: modules/gui/wxwindows/streamout.cpp:435
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
 msgid "Port"
 msgstr "Poort"
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:144
-#: modules/gui/macosx/output.m:246 modules/gui/macosx/output.m:321
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:385
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
+#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
 msgid "HTTP"
 msgstr "HTTP"
 
@@ -3382,9 +3383,9 @@ msgstr "MMS"
 
 #: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
 #: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:143
-#: modules/gui/macosx/open.m:272 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:283
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
 msgid "Network"
 msgstr "Netwerk"
 
@@ -3450,10 +3451,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
 #: modules/gui/pda/support.c:121
 #, c-format
 msgid "Couldn't find pixmap file: %s"
@@ -3465,6 +3466,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:364
+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"
@@ -3509,7 +3568,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:255
+#: modules/gui/wxwindows/interface.cpp:222
 msgid "Open a file"
 msgstr "Open een bestand"
 
@@ -3621,7 +3680,7 @@ 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:686 modules/gui/macosx/intf.m:381
+#: modules/gui/macosx/controls.m:688 modules/gui/macosx/intf.m:381
 msgid "Mute"
 msgstr "Geluid Stil"
 
@@ -3647,7 +3706,7 @@ msgstr "Volledig Scherm"
 
 #: 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/output.m:137 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/output.m:129 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr "Scherm"
 
@@ -3663,19 +3722,19 @@ msgstr "_Video"
 #: modules/gui/gtk/gnome_interface.c:1690
 #: 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:364
-#: modules/gui/wxwindows/open.cpp:281
+#: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:143
+#: modules/gui/macosx/open.m:267 modules/gui/wxwindows/interface.cpp:331
+#: modules/gui/wxwindows/open.cpp:255
 msgid "Disc"
 msgstr "Disk"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:366
+#: modules/gui/wxwindows/interface.cpp:333
 msgid "Net"
 msgstr "Net"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:369
+#: modules/gui/wxwindows/interface.cpp:336
 msgid "Sat"
 msgstr "Sat"
 
@@ -3737,7 +3796,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:380
+#: modules/gui/wxwindows/interface.cpp:347
 msgid "Prev"
 msgstr "Vorige"
 
@@ -3748,9 +3807,9 @@ msgstr "Vorig Bestand"
 #: modules/gui/gtk/gnome_interface.c:667
 #: 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:647
+#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:649
 #: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
-#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:382
+#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:349
 msgid "Next"
 msgstr "Volgende"
 
@@ -3828,17 +3887,17 @@ msgid "Open Stream"
 msgstr "Open Stroom"
 
 #: modules/gui/gtk/gnome_interface.c:1476 modules/gui/gtk/gtk_interface.c:1791
-#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:173
+#: modules/gui/macosx/open.m:136 modules/gui/wxwindows/open.cpp:169
 msgid "Media Resource Locator (MRL)"
 msgstr "Media Resource Locater (MRL)"
 
 #: modules/gui/gtk/gnome_interface.c:1498 modules/gui/gtk/gtk_interface.c:1813
-#: modules/gui/wxwindows/open.cpp:177
+#: modules/gui/wxwindows/open.cpp:173
 msgid "Open Target:"
 msgstr "Open Doel locatie:"
 
 #: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:192
+#: modules/gui/wxwindows/open.cpp:188
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -3846,63 +3905,63 @@ msgstr "Bouw een MRL met behulp van de volgende voorgedefinieerde doelen:"
 
 #: modules/gui/gtk/gnome_interface.c:1562
 #: 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:140 modules/gui/macosx/prefs.m:464
-#: modules/gui/wxwindows/open.cpp:249 modules/gui/wxwindows/open.cpp:365
-#: modules/gui/wxwindows/preferences.cpp:829
-#: modules/gui/wxwindows/streamout.cpp:411
+#: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:152 modules/gui/macosx/open.m:174
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/prefs.m:464
+#: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
+#: modules/gui/wxwindows/preferences.cpp:832
+#: modules/gui/wxwindows/streamout.cpp:412
 #: modules/gui/wxwindows/subtitles.cpp:107
 msgid "Browse..."
 msgstr "Blader..."
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:390
+#: modules/gui/wxwindows/open.cpp:392
 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:384
+#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:487
+#: modules/gui/wxwindows/open.cpp:386
 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:385
+#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:381
+#: modules/gui/macosx/open.m:471 modules/gui/wxwindows/open.cpp:387
 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:396
+#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:398
 msgid "Device name"
 msgstr "Apparaat naam"
 
 #: modules/gui/gtk/gnome_interface.c:1660 modules/gui/gtk/gtk_interface.c:1996
-#: modules/gui/macosx/open.m:152
+#: modules/gui/macosx/open.m:153
 msgid "Use DVD menus"
 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:431
+#: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:546
+#: modules/gui/macosx/open.m:584 modules/gui/wxwindows/open.cpp:433
 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:432
+#: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:547
+#: modules/gui/macosx/open.m:596 modules/gui/wxwindows/open.cpp:434
 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:433
+#: modules/gui/macosx/open.m:167 modules/gui/macosx/open.m:548
+#: modules/gui/macosx/open.m:609 modules/gui/wxwindows/open.cpp:435
 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:489
+#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr "URL"
 
@@ -3931,23 +3990,23 @@ msgid "Horizontal"
 msgstr "Horizontaal"
 
 #: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
-#: modules/gui/wxwindows/open.cpp:286
+#: modules/gui/wxwindows/open.cpp:260
 msgid "Satellite"
 msgstr "Satelliet"
 
 #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322
-#: modules/gui/macosx/open.m:175
+#: modules/gui/macosx/open.m:176
 msgid "delay"
 msgstr "vertraging"
 
 #: modules/gui/gtk/gnome_interface.c:2020 modules/gui/gtk/gtk_interface.c:2338
-#: modules/gui/macosx/open.m:177
+#: modules/gui/macosx/open.m:178
 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:133
-#: modules/gui/wxwindows/open.cpp:204 modules/gui/wxwindows/open.cpp:226
+#: modules/gui/macosx/open.m:173 modules/gui/macosx/output.m:125
+#: modules/gui/wxwindows/open.cpp:199 modules/gui/wxwindows/open.cpp:354
 msgid "Settings..."
 msgstr "Instellingen..."
 
@@ -4019,14 +4078,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:145 modules/gui/macosx/output.m:257
-#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:386
+#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:313 modules/gui/wxwindows/streamout.cpp:387
 msgid "UDP"
 msgstr "UDP"
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:270
-#: modules/gui/macosx/output.m:333 modules/gui/wxwindows/streamout.cpp:387
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:260
+#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:388
 msgid "RTP"
 msgstr "RTP"
 
@@ -4047,8 +4106,8 @@ msgid "PS"
 msgstr "PS"
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:303
-#: modules/gui/macosx/output.m:362
+#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:293
+#: modules/gui/macosx/output.m:352
 msgid "AVI"
 msgstr "AVI"
 
@@ -4065,11 +4124,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"
@@ -4086,10 +4140,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"
@@ -4110,10 +4160,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..."
@@ -4134,7 +4180,7 @@ msgstr "Auteurs"
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr "het VideoLAN team <videolan@videolan.org>"
 
-#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:154
+#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:150
 msgid "Open Target"
 msgstr "Open Doel"
 
@@ -4164,10 +4210,11 @@ msgstr "Stream uitvoer configurtie"
 
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
-#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:139
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:273
+#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
+#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/wxwindows/open.cpp:974
 #: modules/gui/wxwindows/preferences.cpp:256
-#: modules/gui/wxwindows/streamout.cpp:224
+#: modules/gui/wxwindows/streamout.cpp:220
 #: modules/gui/wxwindows/subtitles.cpp:152
 msgid "Cancel"
 msgstr "Annuleer"
@@ -4218,51 +4265,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:374
-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"
@@ -4296,55 +4298,55 @@ msgstr "Plugins"
 msgid "About VLC media player"
 msgstr "Over VLC media speler"
 
-#: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:691
+#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:693
 #: modules/gui/macosx/intf.m:390
 msgid "Half Size"
 msgstr "Halve grootte"
 
-#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:692
+#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:694
 #: modules/gui/macosx/intf.m:391
 msgid "Normal Size"
 msgstr "Normale grootte"
 
-#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:693
+#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
 #: modules/gui/macosx/intf.m:392
 msgid "Double Size"
 msgstr "Dubbele grootte"
 
-#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
-#: modules/gui/macosx/controls.m:702 modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:697
+#: modules/gui/macosx/controls.m:704 modules/gui/macosx/intf.m:395
 msgid "Float On Top"
 msgstr "Altijd op de Voorgrond"
 
-#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:694
+#: modules/gui/macosx/controls.m:360 modules/gui/macosx/controls.m:696
 #: modules/gui/macosx/intf.m:393
 msgid "Fit To Screen"
 msgstr "Vul Scherm"
 
-#: modules/gui/macosx/controls.m:625 modules/gui/macosx/intf.m:326
-#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:386
+#: modules/gui/macosx/controls.m:627 modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:353
 msgid "Faster"
 msgstr "Sneller"
 
-#: modules/gui/macosx/controls.m:626 modules/gui/macosx/intf.m:323
-#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:384
+#: modules/gui/macosx/controls.m:628 modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:351
 msgid "Slower"
 msgstr "Langzamer"
 
-#: modules/gui/macosx/controls.m:646 modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/controls.m:648 modules/gui/macosx/intf.m:322
 #: modules/gui/macosx/intf.m:366 modules/gui/macosx/intf.m:426
 msgid "Previous"
 msgstr "Vorige"
 
-#: modules/gui/macosx/controls.m:665 modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/controls.m:667 modules/gui/macosx/intf.m:368
 msgid "Loop"
 msgstr "Herhaal"
 
-#: modules/gui/macosx/controls.m:672 modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/controls.m:674 modules/gui/macosx/intf.m:369
 msgid "Step Forward"
 msgstr "Stap vooruit"
 
-#: modules/gui/macosx/controls.m:673 modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/controls.m:675 modules/gui/macosx/intf.m:370
 msgid "Step Backward"
 msgstr "Stap terug"
 
@@ -4357,8 +4359,8 @@ msgstr "Info"
 msgid "VLC - Controller"
 msgstr "VLC - Bedieningspaneel"
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:868
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
 msgid "Volume"
 msgstr "Volume"
 
@@ -4414,7 +4416,7 @@ msgstr "Open netwerk..."
 msgid "Open Recent"
 msgstr "Open laatste"
 
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1205
+#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1202
 msgid "Clear Menu"
 msgstr "Wis menu"
 
@@ -4479,7 +4481,7 @@ msgstr "Rapporteer een fout"
 msgid "VideoLAN Website"
 msgstr "VideoLAN Website"
 
-#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1198
+#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1195
 msgid "License"
 msgstr "Licentie"
 
@@ -4508,11 +4510,11 @@ msgstr "Open het berichten venster"
 msgid "Dismiss"
 msgstr "Dismiss"
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid "No CrashLog found"
 msgstr "Geen CrashLog gevonden"
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4550,108 +4552,108 @@ msgstr "Plaats het video venster altijd boven alle andere vensters"
 msgid "MacOS X interface, sound and video"
 msgstr "MacOS X interface, sound en video"
 
-#: modules/gui/macosx/open.m:134
+#: modules/gui/macosx/open.m:135
 msgid "Open Source"
 msgstr "Open Bron"
 
-#: modules/gui/macosx/open.m:136
+#: modules/gui/macosx/open.m:137
 msgid "Only enqueue in playlist, do not play"
 msgstr "Enkel in speellijst plaatsen, speel niet af."
 
-#: modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:147
 msgid "Treat as a pipe rather than as a file"
 msgstr "Beschouw bestand als een pipe"
 
-#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:371
+#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:370
 msgid "VIDEO_TS folder"
 msgstr "VIDEO_TS map"
 
-#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:389
-#: modules/gui/macosx/open.m:480
+#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:388
+#: modules/gui/macosx/open.m:479
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: modules/gui/macosx/open.m:171
+#: modules/gui/macosx/open.m:172
 msgid "Load subtitles file:"
 msgstr "Gebruik ondertiteling in bestand:"
 
-#: modules/gui/macosx/open.m:174
+#: modules/gui/macosx/open.m:175
 msgid "Override"
 msgstr "Gebruik"
 
-#: modules/gui/macosx/open.m:333 modules/gui/macosx/open.m:527
-#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:678
+#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:677
 msgid "Open"
 msgstr "Open"
 
-#: modules/gui/macosx/open.m:423 modules/gui/macosx/open.m:475
-#: modules/gui/macosx/open.m:483 modules/gui/macosx/open.m:491
+#: modules/gui/macosx/open.m:422 modules/gui/macosx/open.m:474
+#: modules/gui/macosx/open.m:482 modules/gui/macosx/open.m:490
 msgid "No %@s found"
 msgstr "Geen %@s gevonden"
 
-#: modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:525
 msgid "Open VIDEO_TS Directory"
 msgstr "Open VIDEO_TS map"
 
-#: modules/gui/macosx/output.m:132
+#: modules/gui/macosx/output.m:124
 msgid "Advanced output:"
 msgstr "Geavanceerde uitvoer:"
 
-#: modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:128
 msgid "Output Options"
 msgstr "Uitvoer Opties"
 
-#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:235
-#: modules/gui/macosx/output.m:316
+#: modules/gui/macosx/output.m:131 modules/gui/macosx/output.m:225
+#: modules/gui/macosx/output.m:306
 msgid "Stream"
 msgstr "Stream"
 
-#: modules/gui/macosx/output.m:143
+#: modules/gui/macosx/output.m:135
 msgid "TTL"
 msgstr "TTL"
 
-#: modules/gui/macosx/output.m:149 modules/gui/wxwindows/streamout.cpp:530
+#: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr "Inkapseling Methode"
 
-#: modules/gui/macosx/output.m:150
+#: modules/gui/macosx/output.m:142
 msgid "MPEG TS"
 msgstr "MPEG TS"
 
-#: modules/gui/macosx/output.m:151 modules/gui/macosx/output.m:305
-#: modules/gui/macosx/output.m:358
+#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:295
+#: modules/gui/macosx/output.m:348
 msgid "MPEG PS"
 msgstr "MPEG PS"
 
-#: modules/gui/macosx/output.m:152 modules/gui/macosx/output.m:307
-#: modules/gui/macosx/output.m:360
+#: modules/gui/macosx/output.m:144 modules/gui/macosx/output.m:297
+#: modules/gui/macosx/output.m:350
 msgid "MPEG1"
 msgstr "MPEG1"
 
-#: modules/gui/macosx/output.m:154 modules/gui/macosx/output.m:304
-#: modules/gui/macosx/output.m:364
+#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:294
+#: modules/gui/macosx/output.m:354
 msgid "Ogg"
 msgstr "Ogg"
 
-#: modules/gui/macosx/output.m:157
+#: modules/gui/macosx/output.m:149
 msgid "Transcode options"
 msgstr "Transcode opties"
 
-#: modules/gui/macosx/output.m:161 modules/gui/macosx/output.m:167
-#: modules/gui/wxwindows/streamout.cpp:609
-#: modules/gui/wxwindows/streamout.cpp:661
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:159
+#: modules/gui/wxwindows/streamout.cpp:610
+#: modules/gui/wxwindows/streamout.cpp:662
 msgid "Bitrate (kb/s)"
 msgstr "Bitrate (kb/s)"
 
-#: modules/gui/macosx/output.m:174 modules/gui/wxwindows/streamout.cpp:483
+#: modules/gui/macosx/output.m:166 modules/gui/wxwindows/streamout.cpp:484
 msgid "Miscellaneous Options"
 msgstr "Overige Opties"
 
-#: modules/gui/macosx/output.m:175
+#: modules/gui/macosx/output.m:167
 msgid "Announce streams via SAP Channel:"
 msgstr "Streams via SAP kanaal verkondingen:"
 
-#: modules/gui/macosx/output.m:306 modules/gui/macosx/output.m:366
+#: modules/gui/macosx/output.m:296 modules/gui/macosx/output.m:356
 msgid "mp4"
 msgstr "mp4"
 
@@ -4736,162 +4738,162 @@ msgstr "Interface met Skins"
 msgid "FileInfo"
 msgstr "&Bestand info..."
 
-#: modules/gui/wxwindows/interface.cpp:256
+#: modules/gui/wxwindows/interface.cpp:223
 msgid "Open a DVD or (S)VCD"
 msgstr "Open een DVD of (S)VCD"
 
-#: modules/gui/wxwindows/interface.cpp:257
+#: modules/gui/wxwindows/interface.cpp:224
 msgid "Open a network stream"
 msgstr "Selecteer een Netwerk Stream"
 
-#: modules/gui/wxwindows/interface.cpp:258
+#: modules/gui/wxwindows/interface.cpp:225
 msgid "Open a satellite stream"
 msgstr "Open een satelliet kaart"
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:226
 msgid "Eject the DVD/CD"
 msgstr "Verwijder de DVD/CD"
 
-#: modules/gui/wxwindows/interface.cpp:260
+#: modules/gui/wxwindows/interface.cpp:227
 msgid "Exit this program"
 msgstr "Sluit programma af"
 
-#: modules/gui/wxwindows/interface.cpp:262
+#: modules/gui/wxwindows/interface.cpp:229
 msgid "Open the playlist"
 msgstr "Open de speellijst"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:230
 msgid "Show the program logs"
 msgstr "Toon de logs van het programma"
 
-#: modules/gui/wxwindows/interface.cpp:264
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Show information about the file being played"
 msgstr "Toon informatie van het bestand dat gespeeld word."
 
-#: modules/gui/wxwindows/interface.cpp:266
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Go to the preferences menu"
 msgstr "Ga naar het voorkeuren menu"
 
-#: modules/gui/wxwindows/interface.cpp:268
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "About this program"
 msgstr "Over dit programma"
 
-#: modules/gui/wxwindows/interface.cpp:272 modules/gui/wxwindows/menus.cpp:108
+#: modules/gui/wxwindows/interface.cpp:239 modules/gui/wxwindows/menus.cpp:108
 msgid "Simple &Open ..."
 msgstr "Simpel &Open Bestand..."
 
-#: modules/gui/wxwindows/interface.cpp:274 modules/gui/wxwindows/menus.cpp:109
+#: modules/gui/wxwindows/interface.cpp:241 modules/gui/wxwindows/menus.cpp:109
 msgid "Open &File..."
 msgstr "Open &Bestand..."
 
-#: modules/gui/wxwindows/interface.cpp:276 modules/gui/wxwindows/menus.cpp:110
+#: modules/gui/wxwindows/interface.cpp:243 modules/gui/wxwindows/menus.cpp:110
 msgid "Open &Disc..."
 msgstr "Open &Disk..."
 
-#: modules/gui/wxwindows/interface.cpp:278 modules/gui/wxwindows/menus.cpp:111
+#: modules/gui/wxwindows/interface.cpp:245 modules/gui/wxwindows/menus.cpp:111
 msgid "Open &Network Stream..."
 msgstr "Open &Netwerk Stream..."
 
-#: modules/gui/wxwindows/interface.cpp:281
+#: modules/gui/wxwindows/interface.cpp:248
 msgid "Open &Satellite Stream..."
 msgstr "Open &Sateliet Stream..."
 
-#: modules/gui/wxwindows/interface.cpp:286
+#: modules/gui/wxwindows/interface.cpp:253
 msgid "&Eject Disc"
 msgstr "V&erwijder Disk"
 
-#: modules/gui/wxwindows/interface.cpp:290
+#: modules/gui/wxwindows/interface.cpp:257
 msgid "E&xit"
 msgstr "Af&sluiten"
 
-#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:261
 msgid "&Playlist..."
 msgstr "&Speellijst..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:263
 msgid "&Messages..."
 msgstr "Berichten..."
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:264
 msgid "&File info..."
 msgstr "&Bestand info..."
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:269
 msgid "&Preferences..."
 msgstr "&Voorkeuren..."
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:286
 msgid "&About..."
 msgstr "&Over..."
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:290
 msgid "&File"
 msgstr "&Bestand"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:291
 msgid "&View"
 msgstr "&Toon"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:292
 msgid "&Settings"
 msgstr "&Instellingen"
 
-#: modules/gui/wxwindows/interface.cpp:326
-#: modules/gui/wxwindows/interface.cpp:482
-#: modules/gui/wxwindows/interface.cpp:530
+#: modules/gui/wxwindows/interface.cpp:293
+#: modules/gui/wxwindows/interface.cpp:414
+#: modules/gui/wxwindows/interface.cpp:462
 msgid "&Audio"
 msgstr "&Audio"
 
-#: modules/gui/wxwindows/interface.cpp:327
-#: modules/gui/wxwindows/interface.cpp:501
-#: modules/gui/wxwindows/interface.cpp:534
+#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:433
+#: modules/gui/wxwindows/interface.cpp:466
 msgid "&Video"
 msgstr "&Video"
 
-#: modules/gui/wxwindows/interface.cpp:328
-#: modules/gui/wxwindows/interface.cpp:520
-#: modules/gui/wxwindows/interface.cpp:538
+#: modules/gui/wxwindows/interface.cpp:295
+#: modules/gui/wxwindows/interface.cpp:452
+#: modules/gui/wxwindows/interface.cpp:470
 msgid "&Navigation"
 msgstr "&Navigatie"
 
-#: modules/gui/wxwindows/interface.cpp:329
+#: modules/gui/wxwindows/interface.cpp:296
 msgid "&Help"
 msgstr "&Help"
 
-#: modules/gui/wxwindows/interface.cpp:345
+#: modules/gui/wxwindows/interface.cpp:312
 msgid "Stop current playlist item"
 msgstr "Stop het het huidige speellijst item"
 
-#: modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/wxwindows/interface.cpp:313
 msgid "Play current playlist item"
 msgstr "Speel het huidige speellijst item af"
 
-#: modules/gui/wxwindows/interface.cpp:347
+#: modules/gui/wxwindows/interface.cpp:314
 msgid "Pause current playlist item"
 msgstr "Pauzeer het huidige speellijst item"
 
-#: modules/gui/wxwindows/interface.cpp:348
+#: modules/gui/wxwindows/interface.cpp:315
 #: modules/gui/wxwindows/playlist.cpp:353
 msgid "Open playlist"
 msgstr "Open speellijst"
 
-#: modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:316
 msgid "Previous playlist item"
 msgstr "Vorige speellijst item"
 
-#: modules/gui/wxwindows/interface.cpp:350
+#: modules/gui/wxwindows/interface.cpp:317
 msgid "Next playlist item"
 msgstr "Volgende speellijst item"
 
-#: modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/wxwindows/interface.cpp:318
 msgid "Play slower"
 msgstr "Speel langzamer"
 
-#: modules/gui/wxwindows/interface.cpp:352
+#: modules/gui/wxwindows/interface.cpp:319
 msgid "Play faster"
 msgstr "Speel Sneller"
 
-#: modules/gui/wxwindows/interface.cpp:574
+#: modules/gui/wxwindows/interface.cpp:506
 msgid ""
 " (wxWindows interface)\n"
 "\n"
@@ -4899,7 +4901,7 @@ msgstr ""
 " (wxWindows interface)\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:575
+#: modules/gui/wxwindows/interface.cpp:507
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
@@ -4907,7 +4909,7 @@ msgstr ""
 "© 1996-2003 het VideoLAN team\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:576
+#: modules/gui/wxwindows/interface.cpp:508
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
@@ -4917,7 +4919,7 @@ msgstr ""
 "http://www.videolan.org/\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:578
+#: modules/gui/wxwindows/interface.cpp:510
 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."
@@ -4926,7 +4928,7 @@ msgstr ""
 "Het kan MPEG-1 en MPEG-2 multimedia bestanden spelen van een bestand of "
 "netwerk locatie."
 
-#: modules/gui/wxwindows/interface.cpp:582
+#: modules/gui/wxwindows/interface.cpp:514
 #, c-format
 msgid "About %s"
 msgstr "Over %s"
@@ -4963,47 +4965,52 @@ msgstr "Detail"
 msgid "Save Messages As a file..."
 msgstr "Bewaar berichten als een bestand..."
 
-#: modules/gui/wxwindows/open.cpp:181
+#: modules/gui/wxwindows/open.cpp:177
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:198 modules/gui/wxwindows/subtitles.cpp:98
-msgid "Subtitles file"
-msgstr "Ondertitelingsbestand"
-
-#: modules/gui/wxwindows/open.cpp:199
-msgid "Load an additional subtitles file. Currently only works with AVI files."
-msgstr ""
-"Laad een appart bestand met ondertiteling. Werkt op dit moment enkel met AVI "
-"en Ogg videos."
-
-#: modules/gui/wxwindows/open.cpp:222
+#: modules/gui/wxwindows/open.cpp:195
 msgid "Use VLC as a stream server"
 msgstr "Gebruik VLC als stream server"
 
-#: modules/gui/wxwindows/open.cpp:242
+#: modules/gui/wxwindows/open.cpp:216
 msgid "Capture input stream"
 msgstr "Opnemen van de stream"
 
-#: modules/gui/wxwindows/open.cpp:244
+#: modules/gui/wxwindows/open.cpp:218
 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:383
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+msgid "Subtitles file"
+msgstr "Ondertitelingsbestand"
+
+#: modules/gui/wxwindows/open.cpp:349
+msgid "Load an additional subtitles file. Currently only works with AVI files."
+msgstr ""
+"Laad een appart bestand met ondertiteling. Werkt op dit moment enkel met AVI "
+"en Ogg videos."
+
+#: modules/gui/wxwindows/open.cpp:385
 msgid "DVD (menus support)"
 msgstr "DVD (menu ondersteuning)"
 
-#: modules/gui/wxwindows/open.cpp:386
+#: modules/gui/wxwindows/open.cpp:388
 msgid "CD Audio"
 msgstr "CD Audio"
 
-#: modules/gui/wxwindows/open.cpp:886 modules/gui/wxwindows/streamout.cpp:785
+#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
 msgid "Save file"
 msgstr "Bewaar bestand"
 
+#: modules/gui/wxwindows/open.cpp:953
+#, fuzzy
+msgid "Advanced open options"
+msgstr "Toon geavanceerde opties"
+
 #: modules/gui/wxwindows/playlist.cpp:116
 msgid "&Simple Add..."
 msgstr "&Simpel Voeg Toe..."
@@ -5056,58 +5063,58 @@ msgstr "Bewaar speellijst"
 msgid "Reset config file"
 msgstr "Standaardwaarden"
 
-#: modules/gui/wxwindows/preferences.cpp:898
+#: modules/gui/wxwindows/preferences.cpp:901
 msgid "No configuration options available"
 msgstr "Geen configuratie opties beschikbaar"
 
-#: modules/gui/wxwindows/preferences.cpp:919
+#: modules/gui/wxwindows/preferences.cpp:922
 msgid "Advanced options"
 msgstr "Toon geavanceerde opties"
 
-#: modules/gui/wxwindows/streamout.cpp:190
+#: modules/gui/wxwindows/streamout.cpp:186
 msgid "Stream output MRL"
 msgstr "Stroom output MRL"
 
-#: modules/gui/wxwindows/streamout.cpp:194
+#: modules/gui/wxwindows/streamout.cpp:190
 msgid "Destination Target:"
 msgstr "Doel: "
 
-#: modules/gui/wxwindows/streamout.cpp:197
+#: modules/gui/wxwindows/streamout.cpp:193
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:377
+#: modules/gui/wxwindows/streamout.cpp:378
 msgid "Output Methods"
 msgstr "Uitvoer Methodes"
 
-#: modules/gui/wxwindows/streamout.cpp:383
+#: modules/gui/wxwindows/streamout.cpp:384
 msgid "Play locally"
 msgstr "Speel lokaal"
 
-#: modules/gui/wxwindows/streamout.cpp:407
+#: modules/gui/wxwindows/streamout.cpp:408
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: modules/gui/wxwindows/streamout.cpp:495
+#: modules/gui/wxwindows/streamout.cpp:496
 msgid "SAP Announce"
 msgstr "SAP Aankondigingen"
 
-#: modules/gui/wxwindows/streamout.cpp:497
+#: modules/gui/wxwindows/streamout.cpp:498
 msgid "Channel Name "
 msgstr "Naam Kanaal"
 
-#: modules/gui/wxwindows/streamout.cpp:569
+#: modules/gui/wxwindows/streamout.cpp:570
 msgid "Transcoding options"
 msgstr "Transcoding opties"
 
-#: modules/gui/wxwindows/streamout.cpp:602
+#: modules/gui/wxwindows/streamout.cpp:603
 msgid "Video codec"
 msgstr "Video codec"
 
-#: modules/gui/wxwindows/streamout.cpp:649
+#: modules/gui/wxwindows/streamout.cpp:650
 msgid "Audio codec"
 msgstr "Audio codec"
 
@@ -5200,28 +5207,28 @@ msgstr "dummy font renderer functie"
 msgid "Using the dummy interface plugin..."
 msgstr "Gebruik de dummy interface plugin..."
 
-#: modules/misc/freetype.c:65 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr "Lettertype"
 
-#: modules/misc/freetype.c:66
+#: modules/misc/freetype.c:68
 msgid "Filename of Font"
 msgstr "Bestandsnaam van Lettertype"
 
-#: modules/misc/freetype.c:67
+#: modules/misc/freetype.c:69
 msgid "Font size"
 msgstr "Lettertype grootte"
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:70
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 "De grootte van de lettertypen die zal worden gebruikt voor de OSD module"
 
-#: modules/misc/freetype.c:71
+#: modules/misc/freetype.c:73
 msgid "Fonts"
 msgstr "Lettertypen"
 
-#: modules/misc/freetype.c:74
+#: modules/misc/freetype.c:76
 msgid "freetype2 font renderer"
 msgstr "freetype2 lettertype renderer"
 
@@ -5260,6 +5267,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"
@@ -5276,10 +5287,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"
@@ -5603,8 +5610,9 @@ msgstr "transparantie van het logo"
 
 #: modules/video_filter/logo.c:65
 msgid "You can change it by middle-clicking and moving mouse left or right"
-msgstr "Je kunt het veranderen door met de middelste muisknop te klikken "
-"en naar rechts of links te slepen"
+msgstr ""
+"Je kunt het veranderen door met de middelste muisknop te klikken en naar "
+"rechts of links te slepen"
 
 #: modules/video_filter/logo.c:68
 msgid "logo"
@@ -5848,8 +5856,8 @@ 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 ""
-"Kies het scherm dat je in de volledig scherm modus wilt gebruiken. Bijvoorbeeld: "
-"0 voor het eerste scherm, 1 for het tweede."
+"Kies het scherm dat je in de volledig scherm modus wilt gebruiken. "
+"Bijvoorbeeld: 0 voor het eerste scherm, 1 for het tweede."
 
 #: modules/video_output/x11/x11.c:67
 msgid "X11"
diff --git a/po/no.po b/po/no.po
index 6f797e5b5e..c84867a96e 100644
--- a/po/no.po
+++ b/po/no.po
@@ -4,14 +4,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-07-24 00:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-29 19:02+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: include/vlc_interface.h:105
 #, fuzzy
@@ -32,7 +32,7 @@ msgid "Audio channels"
 msgstr "Velg lydkanal"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:179 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:386
 msgid "Stereo"
@@ -130,8 +130,8 @@ msgstr "Avslutt programmet"
 #: 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:373
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:404
+#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:406
 msgid "Title"
 msgstr "Tittel"
 
@@ -139,8 +139,8 @@ msgstr "Tittel"
 #: 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:375
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
+#: modules/gui/wxwindows/open.cpp:412
 msgid "Chapter"
 msgstr "Kapittel"
 
@@ -1188,7 +1188,7 @@ msgstr "Grensesnitt"
 #: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
 #: modules/demux/ogg.c:1002 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:378 modules/gui/macosx/output.m:164
+#: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "Lyd"
 
@@ -1197,7 +1197,7 @@ msgstr "Lyd"
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:909
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
-#: modules/gui/macosx/output.m:158 modules/misc/dummy/dummy.c:81
+#: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
 #: modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "Video"
@@ -1217,7 +1217,7 @@ msgstr ""
 # , fuzzy
 #: src/libvlc.h:547 modules/gui/gtk/gnome_interface.c:2042
 #: modules/gui/gtk/gtk_interface.c:2361 modules/gui/gtk/gtk_interface.c:3034
-#: modules/gui/wxwindows/open.cpp:221 modules/gui/wxwindows/streamout.cpp:175
+#: modules/gui/wxwindows/open.cpp:194 modules/gui/wxwindows/streamout.cpp:171
 #, fuzzy
 msgid "Stream output"
 msgstr "Standard output:"
@@ -1232,7 +1232,7 @@ msgstr ""
 #: 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:321
 #: modules/gui/macosx/intf.m:409 modules/gui/pda/interface.c:612
-#: modules/gui/wxwindows/interface.cpp:378
+#: modules/gui/wxwindows/interface.cpp:345
 #: modules/gui/wxwindows/playlist.cpp:104
 msgid "Playlist"
 msgstr "Spilleliste"
@@ -1277,8 +1277,8 @@ msgid "boolean"
 msgstr "boolsk"
 
 #: src/video_output/video_output.c:406 modules/gui/beos/VideoOutput.cpp:1151
-#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:348
-#: modules/gui/macosx/controls.m:690 modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:350
+#: modules/gui/macosx/controls.m:692 modules/gui/macosx/intf.m:394
 #, fuzzy
 msgid "Fullscreen"
 msgstr "_Fullskjerm"
@@ -1316,7 +1316,7 @@ msgstr "heltall"
 
 #: modules/access/cdda.c:86 modules/access/file.c:72 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
-#: modules/access/v4l/v4l.c:67
+#: modules/access/v4l/v4l.c:66
 msgid "Caching value in ms"
 msgstr ""
 
@@ -1448,6 +1448,41 @@ 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:66
+#, 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:74 modules/access/udp.c:72
+msgid "caching value in ms"
+msgstr ""
+
+#: modules/access_output/udp.c:76 modules/access/udp.c:74
+msgid ""
+"Allows you to modify the default caching value for udp streams. This value "
+"should be set in miliseconds units."
+msgstr ""
+
+#: modules/access_output/udp.c:80
+#, fuzzy
+msgid "UDP stream ouput"
+msgstr "Standard output:"
+
+#: modules/access_output/udp.c:81
+#, fuzzy
+msgid "udp stream output"
+msgstr "Standard output:"
+
 #: modules/access/pvr/pvr.c:75
 msgid "Hauppauge PVR cards input"
 msgstr ""
@@ -1497,16 +1532,6 @@ msgstr ""
 msgid "slp"
 msgstr ""
 
-#: modules/access/udp.c:72 modules/access_output/udp.c:74
-msgid "caching value in ms"
-msgstr ""
-
-#: modules/access/udp.c:74 modules/access_output/udp.c:76
-msgid ""
-"Allows you to modify the default caching value for udp streams. This value "
-"should be set in miliseconds units."
-msgstr ""
-
 #: modules/access/udp.c:78
 msgid "UDP/RTP input"
 msgstr ""
@@ -1515,22 +1540,22 @@ msgstr ""
 msgid "udp"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:69
+#: modules/access/v4l/v4l.c:68
 msgid ""
 "Allows you to modify the default caching value for v4l streams. This value "
 "should be set in miliseconds units."
 msgstr ""
 
-#: modules/access/v4l/v4l.c:73
+#: modules/access/v4l/v4l.c:72
 #, fuzzy
 msgid "Video4Linux input"
 msgstr "Standard grensesnitt: "
 
-#: modules/access/v4l/v4l.c:74
+#: modules/access/v4l/v4l.c:73
 msgid "v4l"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:82
+#: modules/access/v4l/v4l.c:81
 #, fuzzy
 msgid "Video4Linux demuxer"
 msgstr "Standard grensesnitt: "
@@ -1539,31 +1564,6 @@ msgstr "Standard grensesnitt: "
 msgid "VCD input"
 msgstr ""
 
-#: modules/access_output/dummy.c:56
-#, fuzzy
-msgid "Dummy stream ouput"
-msgstr "Standard output:"
-
-#: modules/access_output/file.c:66
-#, 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:80
-#, fuzzy
-msgid "UDP stream ouput"
-msgstr "Standard output:"
-
-#: modules/access_output/udp.c:81
-#, fuzzy
-msgid "udp stream output"
-msgstr "Standard output:"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 #, fuzzy
 msgid "Characteristic dimension"
@@ -1711,7 +1711,7 @@ msgstr "Navn p
 msgid "ALSA audio output"
 msgstr "Lydeksport volum"
 
-#: modules/audio_output/alsa.c:116 modules/audio_output/coreaudio.c:218
+#: modules/audio_output/alsa.c:117 modules/audio_output/coreaudio.c:218
 #: modules/audio_output/coreaudio.c:1473 modules/audio_output/directx.c:377
 #: modules/audio_output/oss.c:129 modules/audio_output/sdl.c:176
 #: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:337
@@ -1719,23 +1719,23 @@ msgstr "Lydeksport volum"
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:173 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:399
 msgid "Mono"
 msgstr "Mono"
 
-#: modules/audio_output/alsa.c:180 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr "2 Front 2 Bak"
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:208 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -2009,14 +2009,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 ""
@@ -2029,10 +2029,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 ""
@@ -2041,6 +2037,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 ""
@@ -2276,9 +2276,9 @@ 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:924
-#: modules/gui/macosx/intf.m:925 modules/gui/macosx/intf.m:926
-#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:797
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
+#: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
+#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:685
 msgid "Pause"
 msgstr "Pause"
 
@@ -2286,11 +2286,11 @@ msgstr "Pause"
 #: 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:324 modules/gui/macosx/intf.m:362
-#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:931
-#: modules/gui/macosx/intf.m:932 modules/gui/macosx/intf.m:933
+#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
+#: modules/gui/macosx/intf.m:929 modules/gui/macosx/intf.m:930
 #: modules/gui/macosx/playlist.m:194 modules/gui/pda/interface.c:192
-#: modules/gui/wxwindows/interface.cpp:375
-#: modules/gui/wxwindows/interface.cpp:803
+#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:691
 msgid "Play"
 msgstr "Spill"
 
@@ -2347,7 +2347,7 @@ msgstr ""
 #: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
 #: 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/output.m:170 modules/gui/wxwindows/streamout.cpp:667
+#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr "Kanaler"
 
@@ -2374,7 +2374,7 @@ msgstr "Stopp str
 #: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
 #: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:147 modules/gui/pda/interface.c:372
+#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr ""
 
@@ -3144,19 +3144,19 @@ msgstr "Beskjeder"
 #: modules/gui/gtk/gnome_interface.c:2847 modules/gui/gtk/gtk_interface.c:618
 #: 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:138 modules/gui/macosx/output.m:218
-#: modules/gui/macosx/output.m:310 modules/gui/pda/interface.c:380
-#: modules/gui/wxwindows/interface.cpp:362 modules/gui/wxwindows/open.cpp:279
-#: modules/gui/wxwindows/streamout.cpp:384
+#: modules/gui/macosx/open.m:142 modules/gui/macosx/open.m:263
+#: modules/gui/macosx/output.m:130 modules/gui/macosx/output.m:208
+#: modules/gui/macosx/output.m:300 modules/gui/pda/interface.c:380
+#: modules/gui/wxwindows/interface.cpp:329 modules/gui/wxwindows/open.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:385
 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/macosx/open.m:630 modules/gui/macosx/open.m:677
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:331
+#: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:676
 msgid "Open File"
 msgstr "Åpne fil"
 
@@ -3226,11 +3226,11 @@ msgstr "Spilleliste"
 #: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
 #: 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:606 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:134
-#: modules/gui/wxwindows/open.cpp:270
+#: modules/gui/gtk/preferences.c:606 modules/gui/macosx/open.m:139
+#: modules/gui/macosx/open.m:180 modules/gui/macosx/output.m:126
+#: modules/gui/wxwindows/open.cpp:244 modules/gui/wxwindows/open.cpp:971
 #: modules/gui/wxwindows/preferences.cpp:253
-#: modules/gui/wxwindows/streamout.cpp:221
+#: modules/gui/wxwindows/streamout.cpp:217
 #: modules/gui/wxwindows/subtitles.cpp:149
 msgid "OK"
 msgstr "OK"
@@ -3321,7 +3321,7 @@ msgstr "Bruk"
 
 #: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:597 modules/gui/gtk/preferences.c:614
-#: modules/gui/macosx/output.m:375 modules/gui/macosx/prefs.m:78
+#: modules/gui/macosx/output.m:365 modules/gui/macosx/prefs.m:78
 #: modules/gui/wxwindows/preferences.cpp:257
 #, fuzzy
 msgid "Save"
@@ -3397,8 +3397,8 @@ msgid "VLC media player"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:700
-#: modules/gui/wxwindows/preferences.cpp:1026
+#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
 #: modules/gui/wxwindows/subtitles.cpp:196
 #, fuzzy
 msgid "Open file"
@@ -3425,10 +3425,10 @@ 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:639
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:641
 #: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
 #: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Stop"
 msgstr "Stopp"
 
@@ -3460,9 +3460,9 @@ msgid "UDP/RTP (Address when Multicast)"
 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:141 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:467 modules/gui/wxwindows/streamout.cpp:424
+#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
+#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
+#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
 msgid "Address"
 msgstr "Adresse"
 
@@ -3470,16 +3470,16 @@ msgstr "Adresse"
 #: modules/gui/gtk/gnome_interface.c:1786
 #: 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:142 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:452 modules/gui/wxwindows/open.cpp:475
-#: modules/gui/wxwindows/streamout.cpp:435
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
 msgid "Port"
 msgstr "Port"
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:144
-#: modules/gui/macosx/output.m:246 modules/gui/macosx/output.m:321
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:385
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
+#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
 msgid "HTTP"
 msgstr ""
 
@@ -3494,9 +3494,9 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
 #: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:143
-#: modules/gui/macosx/open.m:272 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:283
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
 msgid "Network"
 msgstr "Nettverk"
 
@@ -3565,10 +3565,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
 #: modules/gui/pda/support.c:121
 #, c-format
 msgid "Couldn't find pixmap file: %s"
@@ -3580,6 +3580,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:364
+#, 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 ""
@@ -3623,7 +3686,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:255
+#: modules/gui/wxwindows/interface.cpp:222
 #, fuzzy
 msgid "Open a file"
 msgstr "Åpne en fil"
@@ -3740,7 +3803,7 @@ 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:686 modules/gui/macosx/intf.m:381
+#: modules/gui/macosx/controls.m:688 modules/gui/macosx/intf.m:381
 msgid "Mute"
 msgstr ""
 
@@ -3767,7 +3830,7 @@ msgstr "_Fullskjerm"
 
 #: 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/output.m:137 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/output.m:129 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr "Fullskjerm"
 
@@ -3783,19 +3846,19 @@ msgstr "_Video"
 #: modules/gui/gtk/gnome_interface.c:1690
 #: 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:364
-#: modules/gui/wxwindows/open.cpp:281
+#: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:143
+#: modules/gui/macosx/open.m:267 modules/gui/wxwindows/interface.cpp:331
+#: modules/gui/wxwindows/open.cpp:255
 msgid "Disc"
 msgstr "Disk"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:366
+#: modules/gui/wxwindows/interface.cpp:333
 msgid "Net"
 msgstr "Nett"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:369
+#: modules/gui/wxwindows/interface.cpp:336
 msgid "Sat"
 msgstr ""
 
@@ -3859,7 +3922,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:380
+#: modules/gui/wxwindows/interface.cpp:347
 msgid "Prev"
 msgstr "Forrige"
 
@@ -3871,9 +3934,9 @@ msgstr "Forrige fil"
 #: modules/gui/gtk/gnome_interface.c:667
 #: 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:647
+#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:649
 #: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
-#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:382
+#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:349
 msgid "Next"
 msgstr "Neste"
 
@@ -3954,18 +4017,18 @@ msgid "Open Stream"
 msgstr "Stopp strøm"
 
 #: modules/gui/gtk/gnome_interface.c:1476 modules/gui/gtk/gtk_interface.c:1791
-#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:173
+#: modules/gui/macosx/open.m:136 modules/gui/wxwindows/open.cpp:169
 msgid "Media Resource Locator (MRL)"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1498 modules/gui/gtk/gtk_interface.c:1813
-#: modules/gui/wxwindows/open.cpp:177
+#: modules/gui/wxwindows/open.cpp:173
 #, fuzzy
 msgid "Open Target:"
 msgstr "Stopp strøm"
 
 #: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:192
+#: modules/gui/wxwindows/open.cpp:188
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -3973,64 +4036,64 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1562
 #: 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:140 modules/gui/macosx/prefs.m:464
-#: modules/gui/wxwindows/open.cpp:249 modules/gui/wxwindows/open.cpp:365
-#: modules/gui/wxwindows/preferences.cpp:829
-#: modules/gui/wxwindows/streamout.cpp:411
+#: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:152 modules/gui/macosx/open.m:174
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/prefs.m:464
+#: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
+#: modules/gui/wxwindows/preferences.cpp:832
+#: modules/gui/wxwindows/streamout.cpp:412
 #: modules/gui/wxwindows/subtitles.cpp:107
 #, fuzzy
 msgid "Browse..."
 msgstr "Utforsk"
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:390
+#: modules/gui/wxwindows/open.cpp:392
 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:384
+#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:487
+#: modules/gui/wxwindows/open.cpp:386
 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:385
+#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:381
+#: modules/gui/macosx/open.m:471 modules/gui/wxwindows/open.cpp:387
 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:396
+#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:398
 msgid "Device name"
 msgstr "Navn på enhet"
 
 #: modules/gui/gtk/gnome_interface.c:1660 modules/gui/gtk/gtk_interface.c:1996
-#: modules/gui/macosx/open.m:152
+#: modules/gui/macosx/open.m:153
 msgid "Use DVD menus"
 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:431
+#: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:546
+#: modules/gui/macosx/open.m:584 modules/gui/wxwindows/open.cpp:433
 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:432
+#: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:547
+#: modules/gui/macosx/open.m:596 modules/gui/wxwindows/open.cpp:434
 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:433
+#: modules/gui/macosx/open.m:167 modules/gui/macosx/open.m:548
+#: modules/gui/macosx/open.m:609 modules/gui/wxwindows/open.cpp:435
 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:489
+#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr ""
 
@@ -4061,25 +4124,25 @@ msgid "Horizontal"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
-#: modules/gui/wxwindows/open.cpp:286
+#: modules/gui/wxwindows/open.cpp:260
 #, fuzzy
 msgid "Satellite"
 msgstr "Åpne spilleliste-vinduet"
 
 #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322
-#: modules/gui/macosx/open.m:175
+#: modules/gui/macosx/open.m:176
 #, fuzzy
 msgid "delay"
 msgstr "Spill"
 
 #: modules/gui/gtk/gnome_interface.c:2020 modules/gui/gtk/gtk_interface.c:2338
-#: modules/gui/macosx/open.m:177
+#: modules/gui/macosx/open.m:178
 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:133
-#: modules/gui/wxwindows/open.cpp:204 modules/gui/wxwindows/open.cpp:226
+#: modules/gui/macosx/open.m:173 modules/gui/macosx/output.m:125
+#: modules/gui/wxwindows/open.cpp:199 modules/gui/wxwindows/open.cpp:354
 #, fuzzy
 msgid "Settings..."
 msgstr "_Innstillinger"
@@ -4156,14 +4219,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:145 modules/gui/macosx/output.m:257
-#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:386
+#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:313 modules/gui/wxwindows/streamout.cpp:387
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:270
-#: modules/gui/macosx/output.m:333 modules/gui/wxwindows/streamout.cpp:387
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:260
+#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:388
 msgid "RTP"
 msgstr "RTP"
 
@@ -4186,8 +4249,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:303
-#: modules/gui/macosx/output.m:362
+#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:293
+#: modules/gui/macosx/output.m:352
 msgid "AVI"
 msgstr ""
 
@@ -4205,11 +4268,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 ""
@@ -4227,10 +4285,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"
@@ -4251,10 +4305,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..."
@@ -4275,7 +4325,7 @@ msgstr "Forfattere"
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:154
+#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:150
 #, fuzzy
 msgid "Open Target"
 msgstr "Stopp strøm"
@@ -4310,10 +4360,11 @@ msgstr "Standard output:"
 
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
-#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:139
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:273
+#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
+#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/wxwindows/open.cpp:974
 #: modules/gui/wxwindows/preferences.cpp:256
-#: modules/gui/wxwindows/streamout.cpp:224
+#: modules/gui/wxwindows/streamout.cpp:220
 #: modules/gui/wxwindows/subtitles.cpp:152
 msgid "Cancel"
 msgstr "Avbryt"
@@ -4365,56 +4416,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:374
-#, 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 ""
@@ -4450,59 +4451,59 @@ msgstr ""
 msgid "About VLC media player"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:691
+#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:693
 #: modules/gui/macosx/intf.m:390
 msgid "Half Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:692
+#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:694
 #: modules/gui/macosx/intf.m:391
 msgid "Normal Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:693
+#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
 #: modules/gui/macosx/intf.m:392
 msgid "Double Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
-#: modules/gui/macosx/controls.m:702 modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:697
+#: modules/gui/macosx/controls.m:704 modules/gui/macosx/intf.m:395
 msgid "Float On Top"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:694
+#: modules/gui/macosx/controls.m:360 modules/gui/macosx/controls.m:696
 #: modules/gui/macosx/intf.m:393
 #, fuzzy
 msgid "Fit To Screen"
 msgstr "Fullskjerm"
 
-#: modules/gui/macosx/controls.m:625 modules/gui/macosx/intf.m:326
-#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:386
+#: modules/gui/macosx/controls.m:627 modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:353
 #, fuzzy
 msgid "Faster"
 msgstr "Fort"
 
-#: modules/gui/macosx/controls.m:626 modules/gui/macosx/intf.m:323
-#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:384
+#: modules/gui/macosx/controls.m:628 modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:351
 #, fuzzy
 msgid "Slower"
 msgstr "Sakte"
 
-#: modules/gui/macosx/controls.m:646 modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/controls.m:648 modules/gui/macosx/intf.m:322
 #: modules/gui/macosx/intf.m:366 modules/gui/macosx/intf.m:426
 #, fuzzy
 msgid "Previous"
 msgstr "Forrige fil"
 
-#: modules/gui/macosx/controls.m:665 modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/controls.m:667 modules/gui/macosx/intf.m:368
 msgid "Loop"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:672 modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/controls.m:674 modules/gui/macosx/intf.m:369
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:673 modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/controls.m:675 modules/gui/macosx/intf.m:370
 #, fuzzy
 msgid "Step Backward"
 msgstr "Gå tilbake"
@@ -4516,8 +4517,8 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:868
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
 msgid "Volume"
 msgstr ""
 
@@ -4583,7 +4584,7 @@ msgstr "
 msgid "Open Recent"
 msgstr "Stopp strøm"
 
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1205
+#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1202
 msgid "Clear Menu"
 msgstr ""
 
@@ -4654,7 +4655,7 @@ msgstr ""
 msgid "VideoLAN Website"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1198
+#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1195
 msgid "License"
 msgstr ""
 
@@ -4680,11 +4681,11 @@ msgstr "
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4718,117 +4719,117 @@ msgstr ""
 msgid "MacOS X interface, sound and video"
 msgstr ""
 
-#: modules/gui/macosx/open.m:134
+#: modules/gui/macosx/open.m:135
 #, fuzzy
 msgid "Open Source"
 msgstr "Stopp strøm"
 
-#: modules/gui/macosx/open.m:136
+#: modules/gui/macosx/open.m:137
 #, fuzzy
 msgid "Only enqueue in playlist, do not play"
 msgstr "Legg til i kø som standard"
 
-#: modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:147
 msgid "Treat as a pipe rather than as a file"
 msgstr ""
 
-#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:371
+#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:370
 msgid "VIDEO_TS folder"
 msgstr ""
 
-#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:389
-#: modules/gui/macosx/open.m:480
+#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:388
+#: modules/gui/macosx/open.m:479
 #, fuzzy
 msgid "Audio CD"
 msgstr "Lyd"
 
-#: modules/gui/macosx/open.m:171
+#: modules/gui/macosx/open.m:172
 #, fuzzy
 msgid "Load subtitles file:"
 msgstr "_Teksting"
 
-#: modules/gui/macosx/open.m:174
+#: modules/gui/macosx/open.m:175
 msgid "Override"
 msgstr ""
 
-#: modules/gui/macosx/open.m:333 modules/gui/macosx/open.m:527
-#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:678
+#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:677
 #, fuzzy
 msgid "Open"
 msgstr "Åpne fil"
 
-#: modules/gui/macosx/open.m:423 modules/gui/macosx/open.m:475
-#: modules/gui/macosx/open.m:483 modules/gui/macosx/open.m:491
+#: modules/gui/macosx/open.m:422 modules/gui/macosx/open.m:474
+#: modules/gui/macosx/open.m:482 modules/gui/macosx/open.m:490
 msgid "No %@s found"
 msgstr ""
 
-#: modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:525
 msgid "Open VIDEO_TS Directory"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132
+#: modules/gui/macosx/output.m:124
 #, fuzzy
 msgid "Advanced output:"
 msgstr "Lydeksport volum"
 
-#: modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:128
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:235
-#: modules/gui/macosx/output.m:316
+#: modules/gui/macosx/output.m:131 modules/gui/macosx/output.m:225
+#: modules/gui/macosx/output.m:306
 #, fuzzy
 msgid "Stream"
 msgstr "Stopp strøm"
 
-#: modules/gui/macosx/output.m:143
+#: modules/gui/macosx/output.m:135
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:149 modules/gui/wxwindows/streamout.cpp:530
+#: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:150
+#: modules/gui/macosx/output.m:142
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:151 modules/gui/macosx/output.m:305
-#: modules/gui/macosx/output.m:358
+#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:295
+#: modules/gui/macosx/output.m:348
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:152 modules/gui/macosx/output.m:307
-#: modules/gui/macosx/output.m:360
+#: modules/gui/macosx/output.m:144 modules/gui/macosx/output.m:297
+#: modules/gui/macosx/output.m:350
 msgid "MPEG1"
 msgstr ""
 
-#: modules/gui/macosx/output.m:154 modules/gui/macosx/output.m:304
-#: modules/gui/macosx/output.m:364
+#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:294
+#: modules/gui/macosx/output.m:354
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:157
+#: modules/gui/macosx/output.m:149
 #, fuzzy
 msgid "Transcode options"
 msgstr "Pause strøm"
 
-#: modules/gui/macosx/output.m:161 modules/gui/macosx/output.m:167
-#: modules/gui/wxwindows/streamout.cpp:609
-#: modules/gui/wxwindows/streamout.cpp:661
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:159
+#: modules/gui/wxwindows/streamout.cpp:610
+#: modules/gui/wxwindows/streamout.cpp:662
 msgid "Bitrate (kb/s)"
 msgstr ""
 
-#: modules/gui/macosx/output.m:174 modules/gui/wxwindows/streamout.cpp:483
+#: modules/gui/macosx/output.m:166 modules/gui/wxwindows/streamout.cpp:484
 #, fuzzy
 msgid "Miscellaneous Options"
 msgstr "Forskjellig"
 
-#: modules/gui/macosx/output.m:175
+#: modules/gui/macosx/output.m:167
 msgid "Announce streams via SAP Channel:"
 msgstr ""
 
-#: modules/gui/macosx/output.m:306 modules/gui/macosx/output.m:366
+#: modules/gui/macosx/output.m:296 modules/gui/macosx/output.m:356
 msgid "mp4"
 msgstr ""
 
@@ -4920,215 +4921,215 @@ msgstr "Grensesnitt"
 msgid "FileInfo"
 msgstr "_Åpne fil..."
 
-#: modules/gui/wxwindows/interface.cpp:256
+#: modules/gui/wxwindows/interface.cpp:223
 #, fuzzy
 msgid "Open a DVD or (S)VCD"
 msgstr "Åpne en DVD eller VCD"
 
-#: modules/gui/wxwindows/interface.cpp:257
+#: modules/gui/wxwindows/interface.cpp:224
 #, fuzzy
 msgid "Open a network stream"
 msgstr "Velg en nettverksstrøm"
 
-#: modules/gui/wxwindows/interface.cpp:258
+#: modules/gui/wxwindows/interface.cpp:225
 #, fuzzy
 msgid "Open a satellite stream"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:226
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:260
+#: modules/gui/wxwindows/interface.cpp:227
 #, fuzzy
 msgid "Exit this program"
 msgstr "Avslutt programmet"
 
-#: modules/gui/wxwindows/interface.cpp:262
+#: modules/gui/wxwindows/interface.cpp:229
 #, fuzzy
 msgid "Open the playlist"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:230
 #, fuzzy
 msgid "Show the program logs"
 msgstr "Avslutt programmet"
 
-#: modules/gui/wxwindows/interface.cpp:264
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:266
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:268
+#: modules/gui/wxwindows/interface.cpp:235
 #, fuzzy
 msgid "About this program"
 msgstr "Avslutt programmet"
 
-#: modules/gui/wxwindows/interface.cpp:272 modules/gui/wxwindows/menus.cpp:108
+#: modules/gui/wxwindows/interface.cpp:239 modules/gui/wxwindows/menus.cpp:108
 #, fuzzy
 msgid "Simple &Open ..."
 msgstr "_Åpne fil..."
 
-#: modules/gui/wxwindows/interface.cpp:274 modules/gui/wxwindows/menus.cpp:109
+#: modules/gui/wxwindows/interface.cpp:241 modules/gui/wxwindows/menus.cpp:109
 #, fuzzy
 msgid "Open &File..."
 msgstr "_Åpne fil..."
 
-#: modules/gui/wxwindows/interface.cpp:276 modules/gui/wxwindows/menus.cpp:110
+#: modules/gui/wxwindows/interface.cpp:243 modules/gui/wxwindows/menus.cpp:110
 #, fuzzy
 msgid "Open &Disc..."
 msgstr "Åpne en _disk"
 
-#: modules/gui/wxwindows/interface.cpp:278 modules/gui/wxwindows/menus.cpp:111
+#: modules/gui/wxwindows/interface.cpp:245 modules/gui/wxwindows/menus.cpp:111
 #, fuzzy
 msgid "Open &Network Stream..."
 msgstr "_Nettverksstrøm"
 
-#: modules/gui/wxwindows/interface.cpp:281
+#: modules/gui/wxwindows/interface.cpp:248
 #, fuzzy
 msgid "Open &Satellite Stream..."
 msgstr "_Nettverksstrøm"
 
-#: modules/gui/wxwindows/interface.cpp:286
+#: modules/gui/wxwindows/interface.cpp:253
 #, fuzzy
 msgid "&Eject Disc"
 msgstr "Løs ut disk"
 
-#: modules/gui/wxwindows/interface.cpp:290
+#: modules/gui/wxwindows/interface.cpp:257
 #, fuzzy
 msgid "E&xit"
 msgstr "_Avslutt"
 
-#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:261
 #, fuzzy
 msgid "&Playlist..."
 msgstr "Spilleliste..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:263
 #, fuzzy
 msgid "&Messages..."
 msgstr "Beskjeder..."
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:264
 #, fuzzy
 msgid "&File info..."
 msgstr "_Åpne fil..."
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:269
 #, fuzzy
 msgid "&Preferences..."
 msgstr "_Preferanser..."
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:286
 #, fuzzy
 msgid "&About..."
 msgstr "_Om..."
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:290
 #, fuzzy
 msgid "&File"
 msgstr "Fil"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:291
 #, fuzzy
 msgid "&View"
 msgstr "_Vis"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:292
 #, fuzzy
 msgid "&Settings"
 msgstr "_Innstillinger"
 
-#: modules/gui/wxwindows/interface.cpp:326
-#: modules/gui/wxwindows/interface.cpp:482
-#: modules/gui/wxwindows/interface.cpp:530
+#: modules/gui/wxwindows/interface.cpp:293
+#: modules/gui/wxwindows/interface.cpp:414
+#: modules/gui/wxwindows/interface.cpp:462
 #, fuzzy
 msgid "&Audio"
 msgstr "Lyd"
 
-#: modules/gui/wxwindows/interface.cpp:327
-#: modules/gui/wxwindows/interface.cpp:501
-#: modules/gui/wxwindows/interface.cpp:534
+#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:433
+#: modules/gui/wxwindows/interface.cpp:466
 #, fuzzy
 msgid "&Video"
 msgstr "Video"
 
-#: modules/gui/wxwindows/interface.cpp:328
-#: modules/gui/wxwindows/interface.cpp:520
-#: modules/gui/wxwindows/interface.cpp:538
+#: modules/gui/wxwindows/interface.cpp:295
+#: modules/gui/wxwindows/interface.cpp:452
+#: modules/gui/wxwindows/interface.cpp:470
 #, fuzzy
 msgid "&Navigation"
 msgstr "_Navigasjon"
 
-#: modules/gui/wxwindows/interface.cpp:329
+#: modules/gui/wxwindows/interface.cpp:296
 #, fuzzy
 msgid "&Help"
 msgstr "_Hjelp"
 
-#: modules/gui/wxwindows/interface.cpp:345
+#: modules/gui/wxwindows/interface.cpp:312
 #, fuzzy
 msgid "Stop current playlist item"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/wxwindows/interface.cpp:313
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:347
+#: modules/gui/wxwindows/interface.cpp:314
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:348
+#: modules/gui/wxwindows/interface.cpp:315
 #: modules/gui/wxwindows/playlist.cpp:353
 #, fuzzy
 msgid "Open playlist"
 msgstr "Åpne Spilleliste"
 
-#: modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:316
 #, fuzzy
 msgid "Previous playlist item"
 msgstr "Forrige fil"
 
-#: modules/gui/wxwindows/interface.cpp:350
+#: modules/gui/wxwindows/interface.cpp:317
 #, fuzzy
 msgid "Next playlist item"
 msgstr "Åpne spilleliste-vinduet"
 
-#: modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/wxwindows/interface.cpp:318
 #, fuzzy
 msgid "Play slower"
 msgstr "Spill saktere"
 
-#: modules/gui/wxwindows/interface.cpp:352
+#: modules/gui/wxwindows/interface.cpp:319
 #, fuzzy
 msgid "Play faster"
 msgstr "Spill fortere"
 
-#: modules/gui/wxwindows/interface.cpp:574
+#: modules/gui/wxwindows/interface.cpp:506
 #, fuzzy
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr "Standard grensesnitt: "
 
-#: modules/gui/wxwindows/interface.cpp:575
+#: modules/gui/wxwindows/interface.cpp:507
 #, fuzzy
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr "© 1996-2003 the VideoLAN team"
 
-#: modules/gui/wxwindows/interface.cpp:576
+#: modules/gui/wxwindows/interface.cpp:508
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:578
+#: modules/gui/wxwindows/interface.cpp:510
 #, fuzzy
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
@@ -5137,7 +5138,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:582
+#: modules/gui/wxwindows/interface.cpp:514
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "Om"
@@ -5178,49 +5179,54 @@ msgstr ""
 msgid "Save Messages As a file..."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:181
+#: modules/gui/wxwindows/open.cpp:177
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:198 modules/gui/wxwindows/subtitles.cpp:98
-#, fuzzy
-msgid "Subtitles file"
-msgstr "_Teksting"
-
-#: modules/gui/wxwindows/open.cpp:199
-msgid "Load an additional subtitles file. Currently only works with AVI files."
-msgstr ""
-
-#: modules/gui/wxwindows/open.cpp:222
+#: modules/gui/wxwindows/open.cpp:195
 msgid "Use VLC as a stream server"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:242
+#: modules/gui/wxwindows/open.cpp:216
 #, fuzzy
 msgid "Capture input stream"
 msgstr "Pause strøm"
 
-#: modules/gui/wxwindows/open.cpp:244
+#: modules/gui/wxwindows/open.cpp:218
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:383
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#, fuzzy
+msgid "Subtitles file"
+msgstr "_Teksting"
+
+#: modules/gui/wxwindows/open.cpp:349
+msgid "Load an additional subtitles file. Currently only works with AVI files."
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:385
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:386
+#: modules/gui/wxwindows/open.cpp:388
 #, fuzzy
 msgid "CD Audio"
 msgstr "Lyd"
 
-#: modules/gui/wxwindows/open.cpp:886 modules/gui/wxwindows/streamout.cpp:785
+#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
 #, fuzzy
 msgid "Save file"
 msgstr "Velg fil"
 
+#: modules/gui/wxwindows/open.cpp:953
+#, fuzzy
+msgid "Advanced open options"
+msgstr "vis avanserte alternativer"
+
 #: modules/gui/wxwindows/playlist.cpp:116
 #, fuzzy
 msgid "&Simple Add..."
@@ -5282,66 +5288,66 @@ msgstr "
 msgid "Reset config file"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:898
+#: modules/gui/wxwindows/preferences.cpp:901
 msgid "No configuration options available"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:919
+#: modules/gui/wxwindows/preferences.cpp:922
 #, fuzzy
 msgid "Advanced options"
 msgstr "vis avanserte alternativer"
 
-#: modules/gui/wxwindows/streamout.cpp:190
+#: modules/gui/wxwindows/streamout.cpp:186
 #, fuzzy
 msgid "Stream output MRL"
 msgstr "Standard output:"
 
-#: modules/gui/wxwindows/streamout.cpp:194
+#: modules/gui/wxwindows/streamout.cpp:190
 #, fuzzy
 msgid "Destination Target:"
 msgstr "Stopp strøm"
 
-#: modules/gui/wxwindows/streamout.cpp:197
+#: modules/gui/wxwindows/streamout.cpp:193
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:377
+#: modules/gui/wxwindows/streamout.cpp:378
 msgid "Output Methods"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:383
+#: modules/gui/wxwindows/streamout.cpp:384
 #, fuzzy
 msgid "Play locally"
 msgstr "Spill saktere"
 
-#: modules/gui/wxwindows/streamout.cpp:407
+#: modules/gui/wxwindows/streamout.cpp:408
 #, fuzzy
 msgid "Filename"
 msgstr "Fil"
 
-#: modules/gui/wxwindows/streamout.cpp:495
+#: modules/gui/wxwindows/streamout.cpp:496
 msgid "SAP Announce"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:497
+#: modules/gui/wxwindows/streamout.cpp:498
 #, fuzzy
 msgid "Channel Name "
 msgstr "Kanaltjener:"
 
-#: modules/gui/wxwindows/streamout.cpp:569
+#: modules/gui/wxwindows/streamout.cpp:570
 #, fuzzy
 msgid "Transcoding options"
 msgstr "vis avanserte alternativer"
 
-#: modules/gui/wxwindows/streamout.cpp:602
+#: modules/gui/wxwindows/streamout.cpp:603
 #, fuzzy
 msgid "Video codec"
 msgstr "lydenhet"
 
-#: modules/gui/wxwindows/streamout.cpp:649
+#: modules/gui/wxwindows/streamout.cpp:650
 #, fuzzy
 msgid "Audio codec"
 msgstr "Standard grensesnitt: "
@@ -5438,30 +5444,30 @@ msgstr "Skjul grensesnittvinduet"
 msgid "Using the dummy interface plugin..."
 msgstr "Skjul grensesnittvinduet"
 
-#: modules/misc/freetype.c:65 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
 #, fuzzy
 msgid "Font"
 msgstr "skrifttype"
 
-#: modules/misc/freetype.c:66
+#: modules/misc/freetype.c:68
 #, fuzzy
 msgid "Filename of Font"
 msgstr "Fil"
 
-#: modules/misc/freetype.c:67
+#: modules/misc/freetype.c:69
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:70
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:71
+#: modules/misc/freetype.c:73
 #, fuzzy
 msgid "Fonts"
 msgstr "skrifttype"
 
-#: modules/misc/freetype.c:74
+#: modules/misc/freetype.c:76
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5500,6 +5506,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 ""
@@ -5516,10 +5526,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 ""
diff --git a/po/pl.po b/po/pl.po
index 30ce28ec09..ca12a130fa 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-07-24 00:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-29 19:02+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: include/vlc_interface.h:105
 msgid ""
@@ -28,7 +28,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:173 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:179 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:386
 #, fuzzy
@@ -126,8 +126,8 @@ msgstr "Program"
 #: 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:373
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:404
+#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:406
 msgid "Title"
 msgstr "Tytu³"
 
@@ -135,8 +135,8 @@ msgstr "Tytu
 #: 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:375
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
+#: modules/gui/wxwindows/open.cpp:412
 msgid "Chapter"
 msgstr "Rozdzia³"
 
@@ -1129,7 +1129,7 @@ msgstr "Interfejs"
 #: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
 #: modules/demux/ogg.c:1002 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:378 modules/gui/macosx/output.m:164
+#: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr "D¼wiêk"
 
@@ -1138,7 +1138,7 @@ msgstr "D
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:909
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
-#: modules/gui/macosx/output.m:158 modules/misc/dummy/dummy.c:81
+#: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
 #: modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr "Obraz"
@@ -1158,7 +1158,7 @@ msgstr "Dekodery"
 
 #: src/libvlc.h:547 modules/gui/gtk/gnome_interface.c:2042
 #: modules/gui/gtk/gtk_interface.c:2361 modules/gui/gtk/gtk_interface.c:3034
-#: modules/gui/wxwindows/open.cpp:221 modules/gui/wxwindows/streamout.cpp:175
+#: modules/gui/wxwindows/open.cpp:194 modules/gui/wxwindows/streamout.cpp:171
 msgid "Stream output"
 msgstr ""
 
@@ -1172,7 +1172,7 @@ msgstr "CPU"
 #: 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:321
 #: modules/gui/macosx/intf.m:409 modules/gui/pda/interface.c:612
-#: modules/gui/wxwindows/interface.cpp:378
+#: modules/gui/wxwindows/interface.cpp:345
 #: modules/gui/wxwindows/playlist.cpp:104
 msgid "Playlist"
 msgstr "Lista odtwarzania"
@@ -1217,8 +1217,8 @@ msgid "boolean"
 msgstr "zm. logiczna"
 
 #: src/video_output/video_output.c:406 modules/gui/beos/VideoOutput.cpp:1151
-#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:348
-#: modules/gui/macosx/controls.m:690 modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:350
+#: modules/gui/macosx/controls.m:692 modules/gui/macosx/intf.m:394
 #, fuzzy
 msgid "Fullscreen"
 msgstr "Pe³_ny ekran"
@@ -1257,7 +1257,7 @@ msgstr "liczba ca
 
 #: modules/access/cdda.c:86 modules/access/file.c:72 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
-#: modules/access/v4l/v4l.c:67
+#: modules/access/v4l/v4l.c:66
 msgid "Caching value in ms"
 msgstr ""
 
@@ -1396,6 +1396,41 @@ 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:66
+#, 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:74 modules/access/udp.c:72
+msgid "caching value in ms"
+msgstr ""
+
+#: modules/access_output/udp.c:76 modules/access/udp.c:74
+msgid ""
+"Allows you to modify the default caching value for udp streams. This value "
+"should be set in miliseconds units."
+msgstr ""
+
+#: modules/access_output/udp.c:80
+#, fuzzy
+msgid "UDP stream ouput"
+msgstr "wyj¶cie obrazu w skali szaro¶ci"
+
+#: modules/access_output/udp.c:81
+#, fuzzy
+msgid "udp stream output"
+msgstr "wyj¶cie obrazu w skali szaro¶ci"
+
 #: modules/access/pvr/pvr.c:75
 msgid "Hauppauge PVR cards input"
 msgstr ""
@@ -1453,16 +1488,6 @@ msgstr ""
 msgid "slp"
 msgstr ""
 
-#: modules/access/udp.c:72 modules/access_output/udp.c:74
-msgid "caching value in ms"
-msgstr ""
-
-#: modules/access/udp.c:74 modules/access_output/udp.c:76
-msgid ""
-"Allows you to modify the default caching value for udp streams. This value "
-"should be set in miliseconds units."
-msgstr ""
-
 #: modules/access/udp.c:78
 #, fuzzy
 msgid "UDP/RTP input"
@@ -1472,22 +1497,22 @@ msgstr "UDP Multicast"
 msgid "udp"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:69
+#: modules/access/v4l/v4l.c:68
 msgid ""
 "Allows you to modify the default caching value for v4l streams. This value "
 "should be set in miliseconds units."
 msgstr ""
 
-#: modules/access/v4l/v4l.c:73
+#: modules/access/v4l/v4l.c:72
 #, fuzzy
 msgid "Video4Linux input"
 msgstr "modu³ wej¶cia VCD"
 
-#: modules/access/v4l/v4l.c:74
+#: modules/access/v4l/v4l.c:73
 msgid "v4l"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:82
+#: modules/access/v4l/v4l.c:81
 #, fuzzy
 msgid "Video4Linux demuxer"
 msgstr "modu³ wej¶cia VCD"
@@ -1497,31 +1522,6 @@ msgstr "modu
 msgid "VCD input"
 msgstr "modu³ wej¶cia VCD"
 
-#: modules/access_output/dummy.c:56
-#, fuzzy
-msgid "Dummy stream ouput"
-msgstr "wyj¶cie obrazu w skali szaro¶ci"
-
-#: modules/access_output/file.c:66
-#, 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:80
-#, fuzzy
-msgid "UDP stream ouput"
-msgstr "wyj¶cie obrazu w skali szaro¶ci"
-
-#: modules/access_output/udp.c:81
-#, fuzzy
-msgid "udp stream output"
-msgstr "wyj¶cie obrazu w skali szaro¶ci"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr ""
@@ -1676,7 +1676,7 @@ msgstr "Nazwa urz
 msgid "ALSA audio output"
 msgstr "modu³ d¼wiêkowy ALSA"
 
-#: modules/audio_output/alsa.c:116 modules/audio_output/coreaudio.c:218
+#: modules/audio_output/alsa.c:117 modules/audio_output/coreaudio.c:218
 #: modules/audio_output/coreaudio.c:1473 modules/audio_output/directx.c:377
 #: modules/audio_output/oss.c:129 modules/audio_output/sdl.c:176
 #: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:337
@@ -1685,23 +1685,23 @@ msgstr "modu
 msgid "Audio device"
 msgstr "urz±dzenie VCD"
 
-#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:173 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:399
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:180 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:208 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1990,15 +1990,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"
@@ -2014,11 +2014,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"
@@ -2029,6 +2024,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"
@@ -2282,9 +2282,9 @@ 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:924
-#: modules/gui/macosx/intf.m:925 modules/gui/macosx/intf.m:926
-#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:797
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
+#: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
+#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:685
 msgid "Pause"
 msgstr "Wstrzymaj"
 
@@ -2292,11 +2292,11 @@ msgstr "Wstrzymaj"
 #: 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:324 modules/gui/macosx/intf.m:362
-#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:931
-#: modules/gui/macosx/intf.m:932 modules/gui/macosx/intf.m:933
+#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
+#: modules/gui/macosx/intf.m:929 modules/gui/macosx/intf.m:930
 #: modules/gui/macosx/playlist.m:194 modules/gui/pda/interface.c:192
-#: modules/gui/wxwindows/interface.cpp:375
-#: modules/gui/wxwindows/interface.cpp:803
+#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:691
 msgid "Play"
 msgstr "Odtwórz"
 
@@ -2355,7 +2355,7 @@ msgstr ""
 #: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
 #: 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/output.m:170 modules/gui/wxwindows/streamout.cpp:667
+#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr "Kana³y"
 
@@ -2383,7 +2383,7 @@ msgstr "Liczba wierszy"
 #: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
 #: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:147 modules/gui/pda/interface.c:372
+#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr ""
 
@@ -3164,19 +3164,19 @@ msgstr "Komunikaty"
 #: modules/gui/gtk/gnome_interface.c:2847 modules/gui/gtk/gtk_interface.c:618
 #: 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:138 modules/gui/macosx/output.m:218
-#: modules/gui/macosx/output.m:310 modules/gui/pda/interface.c:380
-#: modules/gui/wxwindows/interface.cpp:362 modules/gui/wxwindows/open.cpp:279
-#: modules/gui/wxwindows/streamout.cpp:384
+#: modules/gui/macosx/open.m:142 modules/gui/macosx/open.m:263
+#: modules/gui/macosx/output.m:130 modules/gui/macosx/output.m:208
+#: modules/gui/macosx/output.m:300 modules/gui/pda/interface.c:380
+#: modules/gui/wxwindows/interface.cpp:329 modules/gui/wxwindows/open.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:385
 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/macosx/open.m:630 modules/gui/macosx/open.m:677
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:331
+#: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:676
 msgid "Open File"
 msgstr "Otwórz plik"
 
@@ -3246,11 +3246,11 @@ msgstr "Lista odtwarzania"
 #: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
 #: 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:606 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:134
-#: modules/gui/wxwindows/open.cpp:270
+#: modules/gui/gtk/preferences.c:606 modules/gui/macosx/open.m:139
+#: modules/gui/macosx/open.m:180 modules/gui/macosx/output.m:126
+#: modules/gui/wxwindows/open.cpp:244 modules/gui/wxwindows/open.cpp:971
 #: modules/gui/wxwindows/preferences.cpp:253
-#: modules/gui/wxwindows/streamout.cpp:221
+#: modules/gui/wxwindows/streamout.cpp:217
 #: modules/gui/wxwindows/subtitles.cpp:149
 msgid "OK"
 msgstr "OK"
@@ -3343,7 +3343,7 @@ msgstr "Zastosuj"
 
 #: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:597 modules/gui/gtk/preferences.c:614
-#: modules/gui/macosx/output.m:375 modules/gui/macosx/prefs.m:78
+#: modules/gui/macosx/output.m:365 modules/gui/macosx/prefs.m:78
 #: modules/gui/wxwindows/preferences.cpp:257
 msgid "Save"
 msgstr "Zapisz"
@@ -3418,8 +3418,8 @@ msgid "VLC media player"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:700
-#: modules/gui/wxwindows/preferences.cpp:1026
+#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
 #: modules/gui/wxwindows/subtitles.cpp:196
 #, fuzzy
 msgid "Open file"
@@ -3446,10 +3446,10 @@ 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:639
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:641
 #: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
 #: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Stop"
 msgstr "Zatrzymaj"
 
@@ -3483,9 +3483,9 @@ msgid "UDP/RTP (Address when Multicast)"
 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:141 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:467 modules/gui/wxwindows/streamout.cpp:424
+#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
+#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
+#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
 msgid "Address"
 msgstr "Adres"
 
@@ -3493,16 +3493,16 @@ msgstr "Adres"
 #: modules/gui/gtk/gnome_interface.c:1786
 #: 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:142 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:452 modules/gui/wxwindows/open.cpp:475
-#: modules/gui/wxwindows/streamout.cpp:435
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
 msgid "Port"
 msgstr "Port"
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:144
-#: modules/gui/macosx/output.m:246 modules/gui/macosx/output.m:321
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:385
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
+#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
 msgid "HTTP"
 msgstr "HTTP"
 
@@ -3517,9 +3517,9 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
 #: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:143
-#: modules/gui/macosx/open.m:272 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:283
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
 msgid "Network"
 msgstr "Sieæ"
 
@@ -3592,10 +3592,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
 #: modules/gui/pda/support.c:121
 #, c-format
 msgid "Couldn't find pixmap file: %s"
@@ -3607,6 +3607,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:364
+#, 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"
@@ -3655,7 +3719,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:255
+#: modules/gui/wxwindows/interface.cpp:222
 #, fuzzy
 msgid "Open a file"
 msgstr "Otwiera plik"
@@ -3769,7 +3833,7 @@ 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:686 modules/gui/macosx/intf.m:381
+#: modules/gui/macosx/controls.m:688 modules/gui/macosx/intf.m:381
 msgid "Mute"
 msgstr ""
 
@@ -3796,7 +3860,7 @@ msgstr "Pe
 
 #: 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/output.m:137 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/output.m:129 modules/gui/macosx/vout.m:199
 #, fuzzy
 msgid "Screen"
 msgstr "Pe³_ny ekran"
@@ -3814,19 +3878,19 @@ msgstr "Obraz"
 #: modules/gui/gtk/gnome_interface.c:1690
 #: 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:364
-#: modules/gui/wxwindows/open.cpp:281
+#: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:143
+#: modules/gui/macosx/open.m:267 modules/gui/wxwindows/interface.cpp:331
+#: modules/gui/wxwindows/open.cpp:255
 msgid "Disc"
 msgstr "Dysk"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:366
+#: modules/gui/wxwindows/interface.cpp:333
 msgid "Net"
 msgstr "Sieæ"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:369
+#: modules/gui/wxwindows/interface.cpp:336
 msgid "Sat"
 msgstr "Satelita"
 
@@ -3888,7 +3952,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:380
+#: modules/gui/wxwindows/interface.cpp:347
 msgid "Prev"
 msgstr "Poprz"
 
@@ -3900,9 +3964,9 @@ msgstr "Poprzedni plik"
 #: modules/gui/gtk/gnome_interface.c:667
 #: 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:647
+#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:649
 #: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
-#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:382
+#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:349
 msgid "Next"
 msgstr "Nast"
 
@@ -3980,18 +4044,18 @@ msgid "Open Stream"
 msgstr "Otwórz strumieñ"
 
 #: modules/gui/gtk/gnome_interface.c:1476 modules/gui/gtk/gtk_interface.c:1791
-#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:173
+#: modules/gui/macosx/open.m:136 modules/gui/wxwindows/open.cpp:169
 msgid "Media Resource Locator (MRL)"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1498 modules/gui/gtk/gtk_interface.c:1813
-#: modules/gui/wxwindows/open.cpp:177
+#: modules/gui/wxwindows/open.cpp:173
 #, fuzzy
 msgid "Open Target:"
 msgstr "Otwiera plik"
 
 #: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:192
+#: modules/gui/wxwindows/open.cpp:188
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -3999,64 +4063,64 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1562
 #: 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:140 modules/gui/macosx/prefs.m:464
-#: modules/gui/wxwindows/open.cpp:249 modules/gui/wxwindows/open.cpp:365
-#: modules/gui/wxwindows/preferences.cpp:829
-#: modules/gui/wxwindows/streamout.cpp:411
+#: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:152 modules/gui/macosx/open.m:174
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/prefs.m:464
+#: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
+#: modules/gui/wxwindows/preferences.cpp:832
+#: modules/gui/wxwindows/streamout.cpp:412
 #: modules/gui/wxwindows/subtitles.cpp:107
 msgid "Browse..."
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:390
+#: modules/gui/wxwindows/open.cpp:392
 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:384
+#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:487
+#: modules/gui/wxwindows/open.cpp:386
 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:385
+#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:381
+#: modules/gui/macosx/open.m:471 modules/gui/wxwindows/open.cpp:387
 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:396
+#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:398
 msgid "Device name"
 msgstr "Nazwa urz±dzenia"
 
 #: modules/gui/gtk/gnome_interface.c:1660 modules/gui/gtk/gtk_interface.c:1996
-#: modules/gui/macosx/open.m:152
+#: modules/gui/macosx/open.m:153
 msgid "Use DVD menus"
 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:431
+#: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:546
+#: modules/gui/macosx/open.m:584 modules/gui/wxwindows/open.cpp:433
 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:432
+#: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:547
+#: modules/gui/macosx/open.m:596 modules/gui/wxwindows/open.cpp:434
 #, 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:433
+#: modules/gui/macosx/open.m:167 modules/gui/macosx/open.m:548
+#: modules/gui/macosx/open.m:609 modules/gui/wxwindows/open.cpp:435
 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:489
+#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr "URL"
 
@@ -4085,25 +4149,25 @@ msgid "Horizontal"
 msgstr "Pozioma"
 
 #: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
-#: modules/gui/wxwindows/open.cpp:286
+#: modules/gui/wxwindows/open.cpp:260
 #, fuzzy
 msgid "Satellite"
 msgstr "Otwórz kartê satelitarn±"
 
 #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322
-#: modules/gui/macosx/open.m:175
+#: modules/gui/macosx/open.m:176
 #, fuzzy
 msgid "delay"
 msgstr "Odtwórz"
 
 #: modules/gui/gtk/gnome_interface.c:2020 modules/gui/gtk/gtk_interface.c:2338
-#: modules/gui/macosx/open.m:177
+#: modules/gui/macosx/open.m:178
 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:133
-#: modules/gui/wxwindows/open.cpp:204 modules/gui/wxwindows/open.cpp:226
+#: modules/gui/macosx/open.m:173 modules/gui/macosx/output.m:125
+#: modules/gui/wxwindows/open.cpp:199 modules/gui/wxwindows/open.cpp:354
 #, fuzzy
 msgid "Settings..."
 msgstr "U_stawienia"
@@ -4178,14 +4242,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:145 modules/gui/macosx/output.m:257
-#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:386
+#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:313 modules/gui/wxwindows/streamout.cpp:387
 msgid "UDP"
 msgstr "UDP"
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:270
-#: modules/gui/macosx/output.m:333 modules/gui/wxwindows/streamout.cpp:387
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:260
+#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:388
 msgid "RTP"
 msgstr "RPT"
 
@@ -4208,8 +4272,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:303
-#: modules/gui/macosx/output.m:362
+#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:293
+#: modules/gui/macosx/output.m:352
 msgid "AVI"
 msgstr ""
 
@@ -4227,11 +4291,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 ""
@@ -4249,10 +4308,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"
@@ -4273,10 +4328,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..."
@@ -4297,7 +4348,7 @@ msgstr "Autorzy"
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr "Zespó³ VideoLAN <videolan@videolan.org>"
 
-#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:154
+#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:150
 #, fuzzy
 msgid "Open Target"
 msgstr "Otwórz strumieñ"
@@ -4331,10 +4382,11 @@ msgstr ""
 
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
-#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:139
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:273
+#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
+#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/wxwindows/open.cpp:974
 #: modules/gui/wxwindows/preferences.cpp:256
-#: modules/gui/wxwindows/streamout.cpp:224
+#: modules/gui/wxwindows/streamout.cpp:220
 #: modules/gui/wxwindows/subtitles.cpp:152
 msgid "Cancel"
 msgstr "Anuluj"
@@ -4385,57 +4437,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:374
-#, 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 ""
@@ -4471,59 +4472,59 @@ msgstr ""
 msgid "About VLC media player"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:691
+#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:693
 #: modules/gui/macosx/intf.m:390
 msgid "Half Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:692
+#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:694
 #: modules/gui/macosx/intf.m:391
 msgid "Normal Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:693
+#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
 #: modules/gui/macosx/intf.m:392
 msgid "Double Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
-#: modules/gui/macosx/controls.m:702 modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:697
+#: modules/gui/macosx/controls.m:704 modules/gui/macosx/intf.m:395
 msgid "Float On Top"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:694
+#: modules/gui/macosx/controls.m:360 modules/gui/macosx/controls.m:696
 #: modules/gui/macosx/intf.m:393
 #, fuzzy
 msgid "Fit To Screen"
 msgstr "Pe³_ny ekran"
 
-#: modules/gui/macosx/controls.m:625 modules/gui/macosx/intf.m:326
-#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:386
+#: modules/gui/macosx/controls.m:627 modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:353
 #, fuzzy
 msgid "Faster"
 msgstr "Przyspiesz"
 
-#: modules/gui/macosx/controls.m:626 modules/gui/macosx/intf.m:323
-#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:384
+#: modules/gui/macosx/controls.m:628 modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:351
 #, fuzzy
 msgid "Slower"
 msgstr "Zwolnij"
 
-#: modules/gui/macosx/controls.m:646 modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/controls.m:648 modules/gui/macosx/intf.m:322
 #: modules/gui/macosx/intf.m:366 modules/gui/macosx/intf.m:426
 #, fuzzy
 msgid "Previous"
 msgstr "Poprzedni plik"
 
-#: modules/gui/macosx/controls.m:665 modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/controls.m:667 modules/gui/macosx/intf.m:368
 msgid "Loop"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:672 modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/controls.m:674 modules/gui/macosx/intf.m:369
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:673 modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/controls.m:675 modules/gui/macosx/intf.m:370
 #, fuzzy
 msgid "Step Backward"
 msgstr "Przechodzi wstecz"
@@ -4537,8 +4538,8 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:868
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
 msgid "Volume"
 msgstr ""
 
@@ -4604,7 +4605,7 @@ msgstr "Otw
 msgid "Open Recent"
 msgstr "Otwórz strumieñ"
 
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1205
+#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1202
 msgid "Clear Menu"
 msgstr ""
 
@@ -4677,7 +4678,7 @@ msgstr ""
 msgid "VideoLAN Website"
 msgstr "Klient VideoLAN"
 
-#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1198
+#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1195
 msgid "License"
 msgstr ""
 
@@ -4703,11 +4704,11 @@ msgstr "Otwiera okno komunikat
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4742,117 +4743,117 @@ msgstr "Wybierz liczb
 msgid "MacOS X interface, sound and video"
 msgstr ""
 
-#: modules/gui/macosx/open.m:134
+#: modules/gui/macosx/open.m:135
 #, fuzzy
 msgid "Open Source"
 msgstr "Otwórz strumieñ"
 
-#: modules/gui/macosx/open.m:136
+#: modules/gui/macosx/open.m:137
 #, fuzzy
 msgid "Only enqueue in playlist, do not play"
 msgstr "kolejkowanie obiektów listy odtwarzania"
 
-#: modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:147
 msgid "Treat as a pipe rather than as a file"
 msgstr ""
 
-#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:371
+#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:370
 msgid "VIDEO_TS folder"
 msgstr ""
 
-#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:389
-#: modules/gui/macosx/open.m:480
+#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:388
+#: modules/gui/macosx/open.m:479
 #, fuzzy
 msgid "Audio CD"
 msgstr "D¼wiêk"
 
-#: modules/gui/macosx/open.m:171
+#: modules/gui/macosx/open.m:172
 #, fuzzy
 msgid "Load subtitles file:"
 msgstr "_Podtytu³y"
 
-#: modules/gui/macosx/open.m:174
+#: modules/gui/macosx/open.m:175
 msgid "Override"
 msgstr ""
 
-#: modules/gui/macosx/open.m:333 modules/gui/macosx/open.m:527
-#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:678
+#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:677
 #, fuzzy
 msgid "Open"
 msgstr "Otwórz plik"
 
-#: modules/gui/macosx/open.m:423 modules/gui/macosx/open.m:475
-#: modules/gui/macosx/open.m:483 modules/gui/macosx/open.m:491
+#: modules/gui/macosx/open.m:422 modules/gui/macosx/open.m:474
+#: modules/gui/macosx/open.m:482 modules/gui/macosx/open.m:490
 msgid "No %@s found"
 msgstr ""
 
-#: modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:525
 msgid "Open VIDEO_TS Directory"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132
+#: modules/gui/macosx/output.m:124
 #, fuzzy
 msgid "Advanced output:"
 msgstr "modu³ d¼wiêkowy ALSA"
 
-#: modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:128
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:235
-#: modules/gui/macosx/output.m:316
+#: modules/gui/macosx/output.m:131 modules/gui/macosx/output.m:225
+#: modules/gui/macosx/output.m:306
 #, fuzzy
 msgid "Stream"
 msgstr "Zatrzymuje strumieñ"
 
-#: modules/gui/macosx/output.m:143
+#: modules/gui/macosx/output.m:135
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:149 modules/gui/wxwindows/streamout.cpp:530
+#: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:150
+#: modules/gui/macosx/output.m:142
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:151 modules/gui/macosx/output.m:305
-#: modules/gui/macosx/output.m:358
+#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:295
+#: modules/gui/macosx/output.m:348
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:152 modules/gui/macosx/output.m:307
-#: modules/gui/macosx/output.m:360
+#: modules/gui/macosx/output.m:144 modules/gui/macosx/output.m:297
+#: modules/gui/macosx/output.m:350
 msgid "MPEG1"
 msgstr ""
 
-#: modules/gui/macosx/output.m:154 modules/gui/macosx/output.m:304
-#: modules/gui/macosx/output.m:364
+#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:294
+#: modules/gui/macosx/output.m:354
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:157
+#: modules/gui/macosx/output.m:149
 #, fuzzy
 msgid "Transcode options"
 msgstr "Wstrzymuje strumieñ"
 
-#: modules/gui/macosx/output.m:161 modules/gui/macosx/output.m:167
-#: modules/gui/wxwindows/streamout.cpp:609
-#: modules/gui/wxwindows/streamout.cpp:661
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:159
+#: modules/gui/wxwindows/streamout.cpp:610
+#: modules/gui/wxwindows/streamout.cpp:662
 msgid "Bitrate (kb/s)"
 msgstr ""
 
-#: modules/gui/macosx/output.m:174 modules/gui/wxwindows/streamout.cpp:483
+#: modules/gui/macosx/output.m:166 modules/gui/wxwindows/streamout.cpp:484
 #, fuzzy
 msgid "Miscellaneous Options"
 msgstr "Ró¿ne"
 
-#: modules/gui/macosx/output.m:175
+#: modules/gui/macosx/output.m:167
 msgid "Announce streams via SAP Channel:"
 msgstr ""
 
-#: modules/gui/macosx/output.m:306 modules/gui/macosx/output.m:366
+#: modules/gui/macosx/output.m:296 modules/gui/macosx/output.m:356
 msgid "mp4"
 msgstr ""
 
@@ -4945,208 +4946,208 @@ msgstr "Prze
 msgid "FileInfo"
 msgstr "_Otwórz plik..."
 
-#: modules/gui/wxwindows/interface.cpp:256
+#: modules/gui/wxwindows/interface.cpp:223
 #, fuzzy
 msgid "Open a DVD or (S)VCD"
 msgstr "Otwiera DVD lub VCD"
 
-#: modules/gui/wxwindows/interface.cpp:257
+#: modules/gui/wxwindows/interface.cpp:224
 #, fuzzy
 msgid "Open a network stream"
 msgstr "Wybiera strumieñ sieciowy"
 
-#: modules/gui/wxwindows/interface.cpp:258
+#: modules/gui/wxwindows/interface.cpp:225
 #, fuzzy
 msgid "Open a satellite stream"
 msgstr "Otwiera kartê satelitarn±"
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:226
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:260
+#: modules/gui/wxwindows/interface.cpp:227
 #, fuzzy
 msgid "Exit this program"
 msgstr "Wychodzi z programu"
 
-#: modules/gui/wxwindows/interface.cpp:262
+#: modules/gui/wxwindows/interface.cpp:229
 #, fuzzy
 msgid "Open the playlist"
 msgstr "Otwiera okno listy odtwarzania"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:230
 #, fuzzy
 msgid "Show the program logs"
 msgstr "Wybiera program"
 
-#: modules/gui/wxwindows/interface.cpp:264
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:266
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:268
+#: modules/gui/wxwindows/interface.cpp:235
 #, fuzzy
 msgid "About this program"
 msgstr "Wychodzi z programu"
 
-#: modules/gui/wxwindows/interface.cpp:272 modules/gui/wxwindows/menus.cpp:108
+#: modules/gui/wxwindows/interface.cpp:239 modules/gui/wxwindows/menus.cpp:108
 #, fuzzy
 msgid "Simple &Open ..."
 msgstr "_Otwórz plik..."
 
-#: modules/gui/wxwindows/interface.cpp:274 modules/gui/wxwindows/menus.cpp:109
+#: modules/gui/wxwindows/interface.cpp:241 modules/gui/wxwindows/menus.cpp:109
 #, fuzzy
 msgid "Open &File..."
 msgstr "_Otwórz plik..."
 
-#: modules/gui/wxwindows/interface.cpp:276 modules/gui/wxwindows/menus.cpp:110
+#: modules/gui/wxwindows/interface.cpp:243 modules/gui/wxwindows/menus.cpp:110
 #, fuzzy
 msgid "Open &Disc..."
 msgstr "Otwórz _p³ytê..."
 
-#: modules/gui/wxwindows/interface.cpp:278 modules/gui/wxwindows/menus.cpp:111
+#: modules/gui/wxwindows/interface.cpp:245 modules/gui/wxwindows/menus.cpp:111
 #, fuzzy
 msgid "Open &Network Stream..."
 msgstr "_Strumieñ sieciowy..."
 
-#: modules/gui/wxwindows/interface.cpp:281
+#: modules/gui/wxwindows/interface.cpp:248
 #, fuzzy
 msgid "Open &Satellite Stream..."
 msgstr "_Strumieñ sieciowy..."
 
-#: modules/gui/wxwindows/interface.cpp:286
+#: modules/gui/wxwindows/interface.cpp:253
 #, fuzzy
 msgid "&Eject Disc"
 msgstr "_Wysuñ p³ytê"
 
-#: modules/gui/wxwindows/interface.cpp:290
+#: modules/gui/wxwindows/interface.cpp:257
 #, fuzzy
 msgid "E&xit"
 msgstr "W_yjd¼"
 
-#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:261
 #, fuzzy
 msgid "&Playlist..."
 msgstr "Lista odtwarzania..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:263
 #, fuzzy
 msgid "&Messages..."
 msgstr "Komunikaty..."
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:264
 #, fuzzy
 msgid "&File info..."
 msgstr "_Otwórz plik..."
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:269
 #, fuzzy
 msgid "&Preferences..."
 msgstr "_Preferencje..."
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:286
 #, fuzzy
 msgid "&About..."
 msgstr "_Informacje o..."
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:290
 #, fuzzy
 msgid "&File"
 msgstr "Plik"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:291
 #, fuzzy
 msgid "&View"
 msgstr "_Widok"
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:292
 #, fuzzy
 msgid "&Settings"
 msgstr "U_stawienia"
 
-#: modules/gui/wxwindows/interface.cpp:326
-#: modules/gui/wxwindows/interface.cpp:482
-#: modules/gui/wxwindows/interface.cpp:530
+#: modules/gui/wxwindows/interface.cpp:293
+#: modules/gui/wxwindows/interface.cpp:414
+#: modules/gui/wxwindows/interface.cpp:462
 #, fuzzy
 msgid "&Audio"
 msgstr "D¼wiêk"
 
-#: modules/gui/wxwindows/interface.cpp:327
-#: modules/gui/wxwindows/interface.cpp:501
-#: modules/gui/wxwindows/interface.cpp:534
+#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:433
+#: modules/gui/wxwindows/interface.cpp:466
 #, fuzzy
 msgid "&Video"
 msgstr "Obraz"
 
-#: modules/gui/wxwindows/interface.cpp:328
-#: modules/gui/wxwindows/interface.cpp:520
-#: modules/gui/wxwindows/interface.cpp:538
+#: modules/gui/wxwindows/interface.cpp:295
+#: modules/gui/wxwindows/interface.cpp:452
+#: modules/gui/wxwindows/interface.cpp:470
 #, fuzzy
 msgid "&Navigation"
 msgstr "_Nawigacja"
 
-#: modules/gui/wxwindows/interface.cpp:329
+#: modules/gui/wxwindows/interface.cpp:296
 #, fuzzy
 msgid "&Help"
 msgstr "_Pomoc"
 
-#: modules/gui/wxwindows/interface.cpp:345
+#: modules/gui/wxwindows/interface.cpp:312
 #, fuzzy
 msgid "Stop current playlist item"
 msgstr "Otwiera okno listy odtwarzania"
 
-#: modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/wxwindows/interface.cpp:313
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:347
+#: modules/gui/wxwindows/interface.cpp:314
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:348
+#: modules/gui/wxwindows/interface.cpp:315
 #: modules/gui/wxwindows/playlist.cpp:353
 #, fuzzy
 msgid "Open playlist"
 msgstr "Otwórz listê"
 
-#: modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:316
 #, fuzzy
 msgid "Previous playlist item"
 msgstr "Poprzedni plik"
 
-#: modules/gui/wxwindows/interface.cpp:350
+#: modules/gui/wxwindows/interface.cpp:317
 #, fuzzy
 msgid "Next playlist item"
 msgstr "Otwiera okno listy odtwarzania"
 
-#: modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/wxwindows/interface.cpp:318
 #, fuzzy
 msgid "Play slower"
 msgstr "Zwalnia odtwarzanie"
 
-#: modules/gui/wxwindows/interface.cpp:352
+#: modules/gui/wxwindows/interface.cpp:319
 #, fuzzy
 msgid "Play faster"
 msgstr "Przyspiesza odtwarzanie"
 
-#: modules/gui/wxwindows/interface.cpp:574
+#: modules/gui/wxwindows/interface.cpp:506
 #, fuzzy
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr "modu³ interfejsu Win32"
 
-#: modules/gui/wxwindows/interface.cpp:575
+#: modules/gui/wxwindows/interface.cpp:507
 #, fuzzy
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr "(c) 1996-2003 Zespó³ VideoLAN"
 
-#: modules/gui/wxwindows/interface.cpp:576
+#: modules/gui/wxwindows/interface.cpp:508
 #, fuzzy
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
@@ -5156,7 +5157,7 @@ msgstr ""
 "Zespó³ VideoLAN <videolan@videolan.org>\n"
 "http://www.videolan.org/"
 
-#: modules/gui/wxwindows/interface.cpp:578
+#: modules/gui/wxwindows/interface.cpp:510
 #, fuzzy
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
@@ -5165,7 +5166,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:582
+#: modules/gui/wxwindows/interface.cpp:514
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "Informacje o..."
@@ -5207,49 +5208,54 @@ msgstr ""
 msgid "Save Messages As a file..."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:181
+#: modules/gui/wxwindows/open.cpp:177
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:198 modules/gui/wxwindows/subtitles.cpp:98
-#, fuzzy
-msgid "Subtitles file"
-msgstr "_Podtytu³y"
-
-#: modules/gui/wxwindows/open.cpp:199
-msgid "Load an additional subtitles file. Currently only works with AVI files."
-msgstr ""
-
-#: modules/gui/wxwindows/open.cpp:222
+#: modules/gui/wxwindows/open.cpp:195
 msgid "Use VLC as a stream server"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:242
+#: modules/gui/wxwindows/open.cpp:216
 #, fuzzy
 msgid "Capture input stream"
 msgstr "Wstrzymuje strumieñ"
 
-#: modules/gui/wxwindows/open.cpp:244
+#: modules/gui/wxwindows/open.cpp:218
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:383
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#, fuzzy
+msgid "Subtitles file"
+msgstr "_Podtytu³y"
+
+#: modules/gui/wxwindows/open.cpp:349
+msgid "Load an additional subtitles file. Currently only works with AVI files."
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:385
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:386
+#: modules/gui/wxwindows/open.cpp:388
 #, fuzzy
 msgid "CD Audio"
 msgstr "D¼wiêk"
 
-#: modules/gui/wxwindows/open.cpp:886 modules/gui/wxwindows/streamout.cpp:785
+#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
 #, fuzzy
 msgid "Save file"
 msgstr "Wybierz plik"
 
+#: modules/gui/wxwindows/open.cpp:953
+#, fuzzy
+msgid "Advanced open options"
+msgstr "modu³ d¼wiêkowy ALSA"
+
 #: modules/gui/wxwindows/playlist.cpp:116
 #, fuzzy
 msgid "&Simple Add..."
@@ -5311,66 +5317,66 @@ msgstr "Otw
 msgid "Reset config file"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:898
+#: modules/gui/wxwindows/preferences.cpp:901
 #, fuzzy
 msgid "No configuration options available"
 msgstr "Wy¶wietlanie podpowiedzi dla opcji konfiguracji."
 
-#: modules/gui/wxwindows/preferences.cpp:919
+#: modules/gui/wxwindows/preferences.cpp:922
 #, fuzzy
 msgid "Advanced options"
 msgstr "modu³ d¼wiêkowy ALSA"
 
-#: modules/gui/wxwindows/streamout.cpp:190
+#: modules/gui/wxwindows/streamout.cpp:186
 msgid "Stream output MRL"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:194
+#: modules/gui/wxwindows/streamout.cpp:190
 #, fuzzy
 msgid "Destination Target:"
 msgstr "Otwiera plik"
 
-#: modules/gui/wxwindows/streamout.cpp:197
+#: modules/gui/wxwindows/streamout.cpp:193
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:377
+#: modules/gui/wxwindows/streamout.cpp:378
 msgid "Output Methods"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:383
+#: modules/gui/wxwindows/streamout.cpp:384
 #, fuzzy
 msgid "Play locally"
 msgstr "Zwalnia odtwarzanie"
 
-#: modules/gui/wxwindows/streamout.cpp:407
+#: modules/gui/wxwindows/streamout.cpp:408
 #, fuzzy
 msgid "Filename"
 msgstr "nazwa pliku dziennika"
 
-#: modules/gui/wxwindows/streamout.cpp:495
+#: modules/gui/wxwindows/streamout.cpp:496
 msgid "SAP Announce"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:497
+#: modules/gui/wxwindows/streamout.cpp:498
 #, fuzzy
 msgid "Channel Name "
 msgstr "Serwer kana³ów"
 
-#: modules/gui/wxwindows/streamout.cpp:569
+#: modules/gui/wxwindows/streamout.cpp:570
 #, fuzzy
 msgid "Transcoding options"
 msgstr "Czas trwania"
 
-#: modules/gui/wxwindows/streamout.cpp:602
+#: modules/gui/wxwindows/streamout.cpp:603
 #, fuzzy
 msgid "Video codec"
 msgstr "urz±dzenie VCD"
 
-#: modules/gui/wxwindows/streamout.cpp:649
+#: modules/gui/wxwindows/streamout.cpp:650
 #, fuzzy
 msgid "Audio codec"
 msgstr "urz±dzenie VCD"
@@ -5475,30 +5481,30 @@ msgstr ""
 "\n"
 "U¿ywanie wtyczku interfejsu zapisu do dziennika..."
 
-#: modules/misc/freetype.c:65 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
 #, fuzzy
 msgid "Font"
 msgstr "liczba zmiennoprz."
 
-#: modules/misc/freetype.c:66
+#: modules/misc/freetype.c:68
 #, fuzzy
 msgid "Filename of Font"
 msgstr "nazwa pliku dziennika"
 
-#: modules/misc/freetype.c:67
+#: modules/misc/freetype.c:69
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:70
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:71
+#: modules/misc/freetype.c:73
 #, fuzzy
 msgid "Fonts"
 msgstr "liczba zmiennoprz."
 
-#: modules/misc/freetype.c:74
+#: modules/misc/freetype.c:76
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5542,6 +5548,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"
@@ -5562,11 +5573,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"
diff --git a/po/ru.po b/po/ru.po
index f9cb7f4588..8079ae4993 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-07-24 00:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-29 19:02+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: include/vlc_interface.h:105
 msgid ""
@@ -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:173 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:179 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:386
 #, fuzzy
@@ -125,8 +125,8 @@ msgstr ""
 #: 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:373
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:404
+#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:406
 msgid "Title"
 msgstr ""
 
@@ -134,8 +134,8 @@ msgstr ""
 #: 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:375
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
+#: modules/gui/wxwindows/open.cpp:412
 msgid "Chapter"
 msgstr ""
 
@@ -987,7 +987,7 @@ msgstr ""
 #: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
 #: modules/demux/ogg.c:1002 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:378 modules/gui/macosx/output.m:164
+#: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr ""
 
@@ -996,7 +996,7 @@ msgstr ""
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:909
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
-#: modules/gui/macosx/output.m:158 modules/misc/dummy/dummy.c:81
+#: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
 #: modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr ""
@@ -1015,7 +1015,7 @@ msgstr ""
 
 #: src/libvlc.h:547 modules/gui/gtk/gnome_interface.c:2042
 #: modules/gui/gtk/gtk_interface.c:2361 modules/gui/gtk/gtk_interface.c:3034
-#: modules/gui/wxwindows/open.cpp:221 modules/gui/wxwindows/streamout.cpp:175
+#: modules/gui/wxwindows/open.cpp:194 modules/gui/wxwindows/streamout.cpp:171
 msgid "Stream output"
 msgstr ""
 
@@ -1029,7 +1029,7 @@ msgstr ""
 #: 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:321
 #: modules/gui/macosx/intf.m:409 modules/gui/pda/interface.c:612
-#: modules/gui/wxwindows/interface.cpp:378
+#: modules/gui/wxwindows/interface.cpp:345
 #: modules/gui/wxwindows/playlist.cpp:104
 msgid "Playlist"
 msgstr "óÐÉÓÏË ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
@@ -1074,8 +1074,8 @@ msgid "boolean"
 msgstr ""
 
 #: src/video_output/video_output.c:406 modules/gui/beos/VideoOutput.cpp:1151
-#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:348
-#: modules/gui/macosx/controls.m:690 modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:350
+#: modules/gui/macosx/controls.m:692 modules/gui/macosx/intf.m:394
 msgid "Fullscreen"
 msgstr ""
 
@@ -1110,7 +1110,7 @@ msgstr ""
 
 #: modules/access/cdda.c:86 modules/access/file.c:72 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
-#: modules/access/v4l/v4l.c:67
+#: modules/access/v4l/v4l.c:66
 msgid "Caching value in ms"
 msgstr ""
 
@@ -1241,6 +1241,41 @@ 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:66
+#, fuzzy
+msgid "File stream ouput"
+msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
+
+#: modules/access_output/http.c:54
+#, fuzzy
+msgid "HTTP stream ouput"
+msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
+
+#: modules/access_output/udp.c:74 modules/access/udp.c:72
+msgid "caching value in ms"
+msgstr ""
+
+#: modules/access_output/udp.c:76 modules/access/udp.c:74
+msgid ""
+"Allows you to modify the default caching value for udp streams. This value "
+"should be set in miliseconds units."
+msgstr ""
+
+#: modules/access_output/udp.c:80
+#, fuzzy
+msgid "UDP stream ouput"
+msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
+
+#: modules/access_output/udp.c:81
+#, fuzzy
+msgid "udp stream output"
+msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
+
 #: modules/access/pvr/pvr.c:75
 msgid "Hauppauge PVR cards input"
 msgstr ""
@@ -1290,16 +1325,6 @@ msgstr ""
 msgid "slp"
 msgstr ""
 
-#: modules/access/udp.c:72 modules/access_output/udp.c:74
-msgid "caching value in ms"
-msgstr ""
-
-#: modules/access/udp.c:74 modules/access_output/udp.c:76
-msgid ""
-"Allows you to modify the default caching value for udp streams. This value "
-"should be set in miliseconds units."
-msgstr ""
-
 #: modules/access/udp.c:78
 msgid "UDP/RTP input"
 msgstr ""
@@ -1308,21 +1333,21 @@ msgstr ""
 msgid "udp"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:69
+#: modules/access/v4l/v4l.c:68
 msgid ""
 "Allows you to modify the default caching value for v4l streams. This value "
 "should be set in miliseconds units."
 msgstr ""
 
-#: modules/access/v4l/v4l.c:73
+#: modules/access/v4l/v4l.c:72
 msgid "Video4Linux input"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:74
+#: modules/access/v4l/v4l.c:73
 msgid "v4l"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:82
+#: modules/access/v4l/v4l.c:81
 msgid "Video4Linux demuxer"
 msgstr ""
 
@@ -1330,31 +1355,6 @@ msgstr ""
 msgid "VCD input"
 msgstr ""
 
-#: modules/access_output/dummy.c:56
-#, fuzzy
-msgid "Dummy stream ouput"
-msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
-
-#: modules/access_output/file.c:66
-#, fuzzy
-msgid "File stream ouput"
-msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
-
-#: modules/access_output/http.c:54
-#, fuzzy
-msgid "HTTP stream ouput"
-msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
-
-#: modules/access_output/udp.c:80
-#, fuzzy
-msgid "UDP stream ouput"
-msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
-
-#: modules/access_output/udp.c:81
-#, fuzzy
-msgid "udp stream output"
-msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr ""
@@ -1497,7 +1497,7 @@ msgstr ""
 msgid "ALSA audio output"
 msgstr ""
 
-#: modules/audio_output/alsa.c:116 modules/audio_output/coreaudio.c:218
+#: modules/audio_output/alsa.c:117 modules/audio_output/coreaudio.c:218
 #: modules/audio_output/coreaudio.c:1473 modules/audio_output/directx.c:377
 #: modules/audio_output/oss.c:129 modules/audio_output/sdl.c:176
 #: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:337
@@ -1505,23 +1505,23 @@ msgstr ""
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:173 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:399
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:180 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:208 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1784,14 +1784,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 ""
@@ -1804,10 +1804,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 ""
@@ -1816,6 +1812,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 ""
@@ -2037,9 +2037,9 @@ 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:924
-#: modules/gui/macosx/intf.m:925 modules/gui/macosx/intf.m:926
-#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:797
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
+#: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
+#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:685
 msgid "Pause"
 msgstr "ðÁÕÚÁ"
 
@@ -2047,11 +2047,11 @@ msgstr "
 #: 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:324 modules/gui/macosx/intf.m:362
-#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:931
-#: modules/gui/macosx/intf.m:932 modules/gui/macosx/intf.m:933
+#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
+#: modules/gui/macosx/intf.m:929 modules/gui/macosx/intf.m:930
 #: modules/gui/macosx/playlist.m:194 modules/gui/pda/interface.c:192
-#: modules/gui/wxwindows/interface.cpp:375
-#: modules/gui/wxwindows/interface.cpp:803
+#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:691
 msgid "Play"
 msgstr "÷ÏÓÐÒ."
 
@@ -2106,7 +2106,7 @@ msgstr ""
 #: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
 #: 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/output.m:170 modules/gui/wxwindows/streamout.cpp:667
+#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr ""
 
@@ -2133,7 +2133,7 @@ msgstr "
 #: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
 #: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:147 modules/gui/pda/interface.c:372
+#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr ""
 
@@ -2876,20 +2876,20 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2847 modules/gui/gtk/gtk_interface.c:618
 #: 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:138 modules/gui/macosx/output.m:218
-#: modules/gui/macosx/output.m:310 modules/gui/pda/interface.c:380
-#: modules/gui/wxwindows/interface.cpp:362 modules/gui/wxwindows/open.cpp:279
-#: modules/gui/wxwindows/streamout.cpp:384
+#: modules/gui/macosx/open.m:142 modules/gui/macosx/open.m:263
+#: modules/gui/macosx/output.m:130 modules/gui/macosx/output.m:208
+#: modules/gui/macosx/output.m:300 modules/gui/pda/interface.c:380
+#: modules/gui/wxwindows/interface.cpp:329 modules/gui/wxwindows/open.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:385
 #, fuzzy
 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/macosx/open.m:630 modules/gui/macosx/open.m:677
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:331
+#: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:676
 msgid "Open File"
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ"
 
@@ -2956,11 +2956,11 @@ msgstr "
 #: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
 #: 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:606 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:134
-#: modules/gui/wxwindows/open.cpp:270
+#: modules/gui/gtk/preferences.c:606 modules/gui/macosx/open.m:139
+#: modules/gui/macosx/open.m:180 modules/gui/macosx/output.m:126
+#: modules/gui/wxwindows/open.cpp:244 modules/gui/wxwindows/open.cpp:971
 #: modules/gui/wxwindows/preferences.cpp:253
-#: modules/gui/wxwindows/streamout.cpp:221
+#: modules/gui/wxwindows/streamout.cpp:217
 #: modules/gui/wxwindows/subtitles.cpp:149
 msgid "OK"
 msgstr ""
@@ -3050,7 +3050,7 @@ msgstr ""
 
 #: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:597 modules/gui/gtk/preferences.c:614
-#: modules/gui/macosx/output.m:375 modules/gui/macosx/prefs.m:78
+#: modules/gui/macosx/output.m:365 modules/gui/macosx/prefs.m:78
 #: modules/gui/wxwindows/preferences.cpp:257
 msgid "Save"
 msgstr ""
@@ -3121,8 +3121,8 @@ msgid "VLC media player"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:700
-#: modules/gui/wxwindows/preferences.cpp:1026
+#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
 #: modules/gui/wxwindows/subtitles.cpp:196
 #, fuzzy
 msgid "Open file"
@@ -3149,10 +3149,10 @@ 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:639
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:641
 #: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
 #: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Stop"
 msgstr "óÔÏÐ"
 
@@ -3184,9 +3184,9 @@ msgid "UDP/RTP (Address when Multicast)"
 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:141 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:467 modules/gui/wxwindows/streamout.cpp:424
+#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
+#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
+#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
 msgid "Address"
 msgstr ""
 
@@ -3194,16 +3194,16 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1786
 #: 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:142 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:452 modules/gui/wxwindows/open.cpp:475
-#: modules/gui/wxwindows/streamout.cpp:435
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
 msgid "Port"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:144
-#: modules/gui/macosx/output.m:246 modules/gui/macosx/output.m:321
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:385
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
+#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
 msgid "HTTP"
 msgstr ""
 
@@ -3217,9 +3217,9 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
 #: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:143
-#: modules/gui/macosx/open.m:272 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:283
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
 msgid "Network"
 msgstr ""
 
@@ -3285,10 +3285,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
 #: modules/gui/pda/support.c:121
 #, c-format
 msgid "Couldn't find pixmap file: %s"
@@ -3300,6 +3300,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:364
+#, 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 ""
@@ -3343,7 +3404,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:255
+#: modules/gui/wxwindows/interface.cpp:222
 #, fuzzy
 msgid "Open a file"
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ"
@@ -3461,7 +3522,7 @@ 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:686 modules/gui/macosx/intf.m:381
+#: modules/gui/macosx/controls.m:688 modules/gui/macosx/intf.m:381
 msgid "Mute"
 msgstr ""
 
@@ -3487,7 +3548,7 @@ 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/output.m:137 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/output.m:129 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr ""
 
@@ -3503,20 +3564,20 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1690
 #: 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:364
-#: modules/gui/wxwindows/open.cpp:281
+#: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:143
+#: modules/gui/macosx/open.m:267 modules/gui/wxwindows/interface.cpp:331
+#: modules/gui/wxwindows/open.cpp:255
 msgid "Disc"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:366
+#: modules/gui/wxwindows/interface.cpp:333
 #, fuzzy
 msgid "Net"
 msgstr "óÌÅÄ."
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:369
+#: modules/gui/wxwindows/interface.cpp:336
 msgid "Sat"
 msgstr ""
 
@@ -3580,7 +3641,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:380
+#: modules/gui/wxwindows/interface.cpp:347
 msgid "Prev"
 msgstr "ðÒÅÄ."
 
@@ -3592,9 +3653,9 @@ msgstr "
 #: modules/gui/gtk/gnome_interface.c:667
 #: 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:647
+#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:649
 #: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
-#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:382
+#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:349
 msgid "Next"
 msgstr "óÌÅÄ."
 
@@ -3674,18 +3735,18 @@ msgid "Open Stream"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
 #: modules/gui/gtk/gnome_interface.c:1476 modules/gui/gtk/gtk_interface.c:1791
-#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:173
+#: modules/gui/macosx/open.m:136 modules/gui/wxwindows/open.cpp:169
 msgid "Media Resource Locator (MRL)"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1498 modules/gui/gtk/gtk_interface.c:1813
-#: modules/gui/wxwindows/open.cpp:177
+#: modules/gui/wxwindows/open.cpp:173
 #, fuzzy
 msgid "Open Target:"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
 #: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:192
+#: modules/gui/wxwindows/open.cpp:188
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -3693,63 +3754,63 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1562
 #: 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:140 modules/gui/macosx/prefs.m:464
-#: modules/gui/wxwindows/open.cpp:249 modules/gui/wxwindows/open.cpp:365
-#: modules/gui/wxwindows/preferences.cpp:829
-#: modules/gui/wxwindows/streamout.cpp:411
+#: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:152 modules/gui/macosx/open.m:174
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/prefs.m:464
+#: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
+#: modules/gui/wxwindows/preferences.cpp:832
+#: modules/gui/wxwindows/streamout.cpp:412
 #: modules/gui/wxwindows/subtitles.cpp:107
 msgid "Browse..."
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:390
+#: modules/gui/wxwindows/open.cpp:392
 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:384
+#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:487
+#: modules/gui/wxwindows/open.cpp:386
 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:385
+#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:381
+#: modules/gui/macosx/open.m:471 modules/gui/wxwindows/open.cpp:387
 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:396
+#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:398
 msgid "Device name"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1660 modules/gui/gtk/gtk_interface.c:1996
-#: modules/gui/macosx/open.m:152
+#: modules/gui/macosx/open.m:153
 msgid "Use DVD menus"
 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:431
+#: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:546
+#: modules/gui/macosx/open.m:584 modules/gui/wxwindows/open.cpp:433
 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:432
+#: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:547
+#: modules/gui/macosx/open.m:596 modules/gui/wxwindows/open.cpp:434
 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:433
+#: modules/gui/macosx/open.m:167 modules/gui/macosx/open.m:548
+#: modules/gui/macosx/open.m:609 modules/gui/wxwindows/open.cpp:435
 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:489
+#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr ""
 
@@ -3778,25 +3839,25 @@ msgid "Horizontal"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
-#: modules/gui/wxwindows/open.cpp:286
+#: modules/gui/wxwindows/open.cpp:260
 #, fuzzy
 msgid "Satellite"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
 #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322
-#: modules/gui/macosx/open.m:175
+#: modules/gui/macosx/open.m:176
 #, fuzzy
 msgid "delay"
 msgstr "÷ÏÓÐÒ."
 
 #: modules/gui/gtk/gnome_interface.c:2020 modules/gui/gtk/gtk_interface.c:2338
-#: modules/gui/macosx/open.m:177
+#: modules/gui/macosx/open.m:178
 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:133
-#: modules/gui/wxwindows/open.cpp:204 modules/gui/wxwindows/open.cpp:226
+#: modules/gui/macosx/open.m:173 modules/gui/macosx/output.m:125
+#: modules/gui/wxwindows/open.cpp:199 modules/gui/wxwindows/open.cpp:354
 msgid "Settings..."
 msgstr ""
 
@@ -3870,14 +3931,14 @@ msgid "Destination Target: "
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:257
-#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:386
+#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:313 modules/gui/wxwindows/streamout.cpp:387
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:270
-#: modules/gui/macosx/output.m:333 modules/gui/wxwindows/streamout.cpp:387
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:260
+#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:388
 msgid "RTP"
 msgstr ""
 
@@ -3899,8 +3960,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:303
-#: modules/gui/macosx/output.m:362
+#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:293
+#: modules/gui/macosx/output.m:352
 msgid "AVI"
 msgstr ""
 
@@ -3918,11 +3979,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 ""
@@ -3940,10 +3996,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"
@@ -3965,10 +4017,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..."
@@ -3990,7 +4038,7 @@ msgstr ""
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:154
+#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:150
 #, fuzzy
 msgid "Open Target"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
@@ -4024,10 +4072,11 @@ msgstr ""
 
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
-#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:139
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:273
+#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
+#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/wxwindows/open.cpp:974
 #: modules/gui/wxwindows/preferences.cpp:256
-#: modules/gui/wxwindows/streamout.cpp:224
+#: modules/gui/wxwindows/streamout.cpp:220
 #: modules/gui/wxwindows/subtitles.cpp:152
 msgid "Cancel"
 msgstr ""
@@ -4079,54 +4128,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:374
-#, 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 ""
@@ -4161,58 +4162,58 @@ msgstr ""
 msgid "About VLC media player"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:691
+#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:693
 #: modules/gui/macosx/intf.m:390
 msgid "Half Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:692
+#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:694
 #: modules/gui/macosx/intf.m:391
 msgid "Normal Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:693
+#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
 #: modules/gui/macosx/intf.m:392
 msgid "Double Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
-#: modules/gui/macosx/controls.m:702 modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:697
+#: modules/gui/macosx/controls.m:704 modules/gui/macosx/intf.m:395
 msgid "Float On Top"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:694
+#: modules/gui/macosx/controls.m:360 modules/gui/macosx/controls.m:696
 #: modules/gui/macosx/intf.m:393
 msgid "Fit To Screen"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:625 modules/gui/macosx/intf.m:326
-#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:386
+#: modules/gui/macosx/controls.m:627 modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:353
 #, fuzzy
 msgid "Faster"
 msgstr "âÙÓÔÒÏ"
 
-#: modules/gui/macosx/controls.m:626 modules/gui/macosx/intf.m:323
-#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:384
+#: modules/gui/macosx/controls.m:628 modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:351
 #, fuzzy
 msgid "Slower"
 msgstr "íÅÄÌÅÎÎÏ"
 
-#: modules/gui/macosx/controls.m:646 modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/controls.m:648 modules/gui/macosx/intf.m:322
 #: modules/gui/macosx/intf.m:366 modules/gui/macosx/intf.m:426
 #, fuzzy
 msgid "Previous"
 msgstr "ðÒÅÄÙÄÕÝÉÊ ÆÁÊÌ"
 
-#: modules/gui/macosx/controls.m:665 modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/controls.m:667 modules/gui/macosx/intf.m:368
 msgid "Loop"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:672 modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/controls.m:674 modules/gui/macosx/intf.m:369
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:673 modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/controls.m:675 modules/gui/macosx/intf.m:370
 #, fuzzy
 msgid "Step Backward"
 msgstr "÷ÅÒÎÕÔØÓÑ ÎÁÚÁÄ"
@@ -4226,8 +4227,8 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:868
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
 msgid "Volume"
 msgstr ""
 
@@ -4289,7 +4290,7 @@ msgstr "
 msgid "Open Recent"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1205
+#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1202
 msgid "Clear Menu"
 msgstr ""
 
@@ -4358,7 +4359,7 @@ msgstr ""
 msgid "VideoLAN Website"
 msgstr "ëÌÉÅÎÔ VideoLAN"
 
-#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1198
+#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1195
 msgid "License"
 msgstr ""
 
@@ -4384,11 +4385,11 @@ msgstr "
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4422,115 +4423,115 @@ msgstr ""
 msgid "MacOS X interface, sound and video"
 msgstr ""
 
-#: modules/gui/macosx/open.m:134
+#: modules/gui/macosx/open.m:135
 #, fuzzy
 msgid "Open Source"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/macosx/open.m:136
+#: modules/gui/macosx/open.m:137
 msgid "Only enqueue in playlist, do not play"
 msgstr ""
 
-#: modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:147
 msgid "Treat as a pipe rather than as a file"
 msgstr ""
 
-#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:371
+#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:370
 msgid "VIDEO_TS folder"
 msgstr ""
 
-#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:389
-#: modules/gui/macosx/open.m:480
+#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:388
+#: modules/gui/macosx/open.m:479
 #, fuzzy
 msgid "Audio CD"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/macosx/open.m:171
+#: modules/gui/macosx/open.m:172
 #, fuzzy
 msgid "Load subtitles file:"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/gui/macosx/open.m:174
+#: modules/gui/macosx/open.m:175
 msgid "Override"
 msgstr ""
 
-#: modules/gui/macosx/open.m:333 modules/gui/macosx/open.m:527
-#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:678
+#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:677
 #, fuzzy
 msgid "Open"
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ"
 
-#: modules/gui/macosx/open.m:423 modules/gui/macosx/open.m:475
-#: modules/gui/macosx/open.m:483 modules/gui/macosx/open.m:491
+#: modules/gui/macosx/open.m:422 modules/gui/macosx/open.m:474
+#: modules/gui/macosx/open.m:482 modules/gui/macosx/open.m:490
 msgid "No %@s found"
 msgstr ""
 
-#: modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:525
 msgid "Open VIDEO_TS Directory"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132
+#: modules/gui/macosx/output.m:124
 #, fuzzy
 msgid "Advanced output:"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:128
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:235
-#: modules/gui/macosx/output.m:316
+#: modules/gui/macosx/output.m:131 modules/gui/macosx/output.m:225
+#: modules/gui/macosx/output.m:306
 #, fuzzy
 msgid "Stream"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/macosx/output.m:143
+#: modules/gui/macosx/output.m:135
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:149 modules/gui/wxwindows/streamout.cpp:530
+#: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:150
+#: modules/gui/macosx/output.m:142
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:151 modules/gui/macosx/output.m:305
-#: modules/gui/macosx/output.m:358
+#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:295
+#: modules/gui/macosx/output.m:348
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:152 modules/gui/macosx/output.m:307
-#: modules/gui/macosx/output.m:360
+#: modules/gui/macosx/output.m:144 modules/gui/macosx/output.m:297
+#: modules/gui/macosx/output.m:350
 msgid "MPEG1"
 msgstr ""
 
-#: modules/gui/macosx/output.m:154 modules/gui/macosx/output.m:304
-#: modules/gui/macosx/output.m:364
+#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:294
+#: modules/gui/macosx/output.m:354
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:157
+#: modules/gui/macosx/output.m:149
 #, fuzzy
 msgid "Transcode options"
 msgstr "ðÒÉÏÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/macosx/output.m:161 modules/gui/macosx/output.m:167
-#: modules/gui/wxwindows/streamout.cpp:609
-#: modules/gui/wxwindows/streamout.cpp:661
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:159
+#: modules/gui/wxwindows/streamout.cpp:610
+#: modules/gui/wxwindows/streamout.cpp:662
 msgid "Bitrate (kb/s)"
 msgstr ""
 
-#: modules/gui/macosx/output.m:174 modules/gui/wxwindows/streamout.cpp:483
+#: modules/gui/macosx/output.m:166 modules/gui/wxwindows/streamout.cpp:484
 msgid "Miscellaneous Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:175
+#: modules/gui/macosx/output.m:167
 msgid "Announce streams via SAP Channel:"
 msgstr ""
 
-#: modules/gui/macosx/output.m:306 modules/gui/macosx/output.m:366
+#: modules/gui/macosx/output.m:296 modules/gui/macosx/output.m:356
 msgid "mp4"
 msgstr ""
 
@@ -4619,203 +4620,203 @@ msgstr "
 msgid "FileInfo"
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ..."
 
-#: modules/gui/wxwindows/interface.cpp:256
+#: modules/gui/wxwindows/interface.cpp:223
 msgid "Open a DVD or (S)VCD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:257
+#: modules/gui/wxwindows/interface.cpp:224
 #, fuzzy
 msgid "Open a network stream"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/wxwindows/interface.cpp:258
+#: modules/gui/wxwindows/interface.cpp:225
 #, fuzzy
 msgid "Open a satellite stream"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:226
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:260
+#: modules/gui/wxwindows/interface.cpp:227
 msgid "Exit this program"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:262
+#: modules/gui/wxwindows/interface.cpp:229
 #, fuzzy
 msgid "Open the playlist"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:230
 msgid "Show the program logs"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:264
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:266
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:268
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "About this program"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:272 modules/gui/wxwindows/menus.cpp:108
+#: modules/gui/wxwindows/interface.cpp:239 modules/gui/wxwindows/menus.cpp:108
 #, fuzzy
 msgid "Simple &Open ..."
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ..."
 
-#: modules/gui/wxwindows/interface.cpp:274 modules/gui/wxwindows/menus.cpp:109
+#: modules/gui/wxwindows/interface.cpp:241 modules/gui/wxwindows/menus.cpp:109
 #, fuzzy
 msgid "Open &File..."
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ..."
 
-#: modules/gui/wxwindows/interface.cpp:276 modules/gui/wxwindows/menus.cpp:110
+#: modules/gui/wxwindows/interface.cpp:243 modules/gui/wxwindows/menus.cpp:110
 #, fuzzy
 msgid "Open &Disc..."
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ..."
 
-#: modules/gui/wxwindows/interface.cpp:278 modules/gui/wxwindows/menus.cpp:111
+#: modules/gui/wxwindows/interface.cpp:245 modules/gui/wxwindows/menus.cpp:111
 #, fuzzy
 msgid "Open &Network Stream..."
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/wxwindows/interface.cpp:281
+#: modules/gui/wxwindows/interface.cpp:248
 #, fuzzy
 msgid "Open &Satellite Stream..."
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/wxwindows/interface.cpp:286
+#: modules/gui/wxwindows/interface.cpp:253
 #, fuzzy
 msgid "&Eject Disc"
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ"
 
-#: modules/gui/wxwindows/interface.cpp:290
+#: modules/gui/wxwindows/interface.cpp:257
 msgid "E&xit"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:261
 #, fuzzy
 msgid "&Playlist..."
 msgstr "óÐÉÓÏË ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ..."
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:263
 #, fuzzy
 msgid "&Messages..."
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ..."
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:264
 #, fuzzy
 msgid "&File info..."
 msgstr "ïÔËÒÙÔØ ÆÁÊÌ..."
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:269
 msgid "&Preferences..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:286
 #, fuzzy
 msgid "&About..."
 msgstr "íÏÄÕÌÉ..."
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:290
 #, fuzzy
 msgid "&File"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:291
 msgid "&View"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:292
 #, fuzzy
 msgid "&Settings"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/gui/wxwindows/interface.cpp:326
-#: modules/gui/wxwindows/interface.cpp:482
-#: modules/gui/wxwindows/interface.cpp:530
+#: modules/gui/wxwindows/interface.cpp:293
+#: modules/gui/wxwindows/interface.cpp:414
+#: modules/gui/wxwindows/interface.cpp:462
 msgid "&Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:327
-#: modules/gui/wxwindows/interface.cpp:501
-#: modules/gui/wxwindows/interface.cpp:534
+#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:433
+#: modules/gui/wxwindows/interface.cpp:466
 msgid "&Video"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:328
-#: modules/gui/wxwindows/interface.cpp:520
-#: modules/gui/wxwindows/interface.cpp:538
+#: modules/gui/wxwindows/interface.cpp:295
+#: modules/gui/wxwindows/interface.cpp:452
+#: modules/gui/wxwindows/interface.cpp:470
 msgid "&Navigation"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:329
+#: modules/gui/wxwindows/interface.cpp:296
 msgid "&Help"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:345
+#: modules/gui/wxwindows/interface.cpp:312
 #, fuzzy
 msgid "Stop current playlist item"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/wxwindows/interface.cpp:313
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:347
+#: modules/gui/wxwindows/interface.cpp:314
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:348
+#: modules/gui/wxwindows/interface.cpp:315
 #: modules/gui/wxwindows/playlist.cpp:353
 #, fuzzy
 msgid "Open playlist"
 msgstr "ïÔËÒÙÔØ ÓÐÉÓÏË ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:316
 #, fuzzy
 msgid "Previous playlist item"
 msgstr "ðÒÅÄÙÄÕÝÉÊ ÆÁÊÌ"
 
-#: modules/gui/wxwindows/interface.cpp:350
+#: modules/gui/wxwindows/interface.cpp:317
 #, fuzzy
 msgid "Next playlist item"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/wxwindows/interface.cpp:318
 #, fuzzy
 msgid "Play slower"
 msgstr "÷ÏÓÐÒÏÉÚ×ÏÄÉÔØ ÍÅÄÌÅÎÎÅÅ"
 
-#: modules/gui/wxwindows/interface.cpp:352
+#: modules/gui/wxwindows/interface.cpp:319
 #, fuzzy
 msgid "Play faster"
 msgstr "÷ÏÓÐÒÏÉÚ×ÏÄÉÔØ ÂÙÓÔÒÅÅ"
 
-#: modules/gui/wxwindows/interface.cpp:574
+#: modules/gui/wxwindows/interface.cpp:506
 #, fuzzy
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/gui/wxwindows/interface.cpp:575
+#: modules/gui/wxwindows/interface.cpp:507
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:576
+#: modules/gui/wxwindows/interface.cpp:508
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:578
+#: modules/gui/wxwindows/interface.cpp:510
 #, fuzzy
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
@@ -4824,7 +4825,7 @@ msgstr ""
 "üÔÏ ËÌÉÅÎÔ VideoLAN, DVD, MPEG É DivX-ÐÒÏÉÇÒÙ×ÁÔÅÌÑ. ÷Ù ÍÏÖÅÔÅ ×ÏÓÐÒÏÉÚ×ÅÓÔÉ "
 "MPEG É MPEG-2 ÆÁÊÌÙ ÉÚ ÆÁÊÌÁ ÉÌÉ Ó ÉÓÔÏÞÎÉËÁ × ÓÅÔÉ."
 
-#: modules/gui/wxwindows/interface.cpp:582
+#: modules/gui/wxwindows/interface.cpp:514
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "íÏÄÕÌÉ..."
@@ -4863,48 +4864,53 @@ msgstr ""
 msgid "Save Messages As a file..."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:181
+#: modules/gui/wxwindows/open.cpp:177
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:198 modules/gui/wxwindows/subtitles.cpp:98
-#, fuzzy
-msgid "Subtitles file"
-msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
-
-#: modules/gui/wxwindows/open.cpp:199
-msgid "Load an additional subtitles file. Currently only works with AVI files."
-msgstr ""
-
-#: modules/gui/wxwindows/open.cpp:222
+#: modules/gui/wxwindows/open.cpp:195
 msgid "Use VLC as a stream server"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:242
+#: modules/gui/wxwindows/open.cpp:216
 #, fuzzy
 msgid "Capture input stream"
 msgstr "ðÒÉÏÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/wxwindows/open.cpp:244
+#: modules/gui/wxwindows/open.cpp:218
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:383
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#, fuzzy
+msgid "Subtitles file"
+msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
+
+#: modules/gui/wxwindows/open.cpp:349
+msgid "Load an additional subtitles file. Currently only works with AVI files."
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:385
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:386
+#: modules/gui/wxwindows/open.cpp:388
 msgid "CD Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:886 modules/gui/wxwindows/streamout.cpp:785
+#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
 #, fuzzy
 msgid "Save file"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
+#: modules/gui/wxwindows/open.cpp:953
+#, fuzzy
+msgid "Advanced open options"
+msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
+
 #: modules/gui/wxwindows/playlist.cpp:116
 #, fuzzy
 msgid "&Simple Add..."
@@ -4963,63 +4969,63 @@ msgstr "
 msgid "Reset config file"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:898
+#: modules/gui/wxwindows/preferences.cpp:901
 msgid "No configuration options available"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:919
+#: modules/gui/wxwindows/preferences.cpp:922
 #, fuzzy
 msgid "Advanced options"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/wxwindows/streamout.cpp:190
+#: modules/gui/wxwindows/streamout.cpp:186
 msgid "Stream output MRL"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:194
+#: modules/gui/wxwindows/streamout.cpp:190
 #, fuzzy
 msgid "Destination Target:"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
 
-#: modules/gui/wxwindows/streamout.cpp:197
+#: modules/gui/wxwindows/streamout.cpp:193
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:377
+#: modules/gui/wxwindows/streamout.cpp:378
 msgid "Output Methods"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:383
+#: modules/gui/wxwindows/streamout.cpp:384
 #, fuzzy
 msgid "Play locally"
 msgstr "÷ÏÓÐÒÏÉÚ×ÏÄÉÔØ ÍÅÄÌÅÎÎÅÅ"
 
-#: modules/gui/wxwindows/streamout.cpp:407
+#: modules/gui/wxwindows/streamout.cpp:408
 #, fuzzy
 msgid "Filename"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/gui/wxwindows/streamout.cpp:495
+#: modules/gui/wxwindows/streamout.cpp:496
 msgid "SAP Announce"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:497
+#: modules/gui/wxwindows/streamout.cpp:498
 msgid "Channel Name "
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:569
+#: modules/gui/wxwindows/streamout.cpp:570
 msgid "Transcoding options"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:602
+#: modules/gui/wxwindows/streamout.cpp:603
 #, fuzzy
 msgid "Video codec"
 msgstr "ëÌÉÅÎÔ VideoLAN"
 
-#: modules/gui/wxwindows/streamout.cpp:649
+#: modules/gui/wxwindows/streamout.cpp:650
 #, fuzzy
 msgid "Audio codec"
 msgstr "ïÓÔÁÎÏ×ÉÔØ ÐÏÔÏË"
@@ -5110,28 +5116,28 @@ msgstr "
 msgid "Using the dummy interface plugin..."
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÐÉÓËÁ ÄÌÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: modules/misc/freetype.c:65 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr ""
 
-#: modules/misc/freetype.c:66
+#: modules/misc/freetype.c:68
 #, fuzzy
 msgid "Filename of Font"
 msgstr "óÌÅÄÕÀÝÉÊ ÆÁÊÌ"
 
-#: modules/misc/freetype.c:67
+#: modules/misc/freetype.c:69
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:70
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:71
+#: modules/misc/freetype.c:73
 msgid "Fonts"
 msgstr ""
 
-#: modules/misc/freetype.c:74
+#: modules/misc/freetype.c:76
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5169,6 +5175,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 ""
@@ -5185,10 +5195,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 ""
diff --git a/po/sv.po b/po/sv.po
index 1d388b40ca..68c9f61a7e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,14 +6,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-07-24 00:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-29 19:02+0200\n"
 "PO-Revision-Date: 2002-07-23 23:00+0200\n"
 "Last-Translator: Joel Arvidsson <dogai@privat.utfors.se>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 
 #: include/vlc_interface.h:105
 msgid ""
@@ -29,7 +29,7 @@ msgid "Audio channels"
 msgstr "Kanal:"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:179 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:386
 #, fuzzy
@@ -127,8 +127,8 @@ msgstr ""
 #: 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:373
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:404
+#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:406
 msgid "Title"
 msgstr "Titel"
 
@@ -136,8 +136,8 @@ msgstr "Titel"
 #: 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:375
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
+#: modules/gui/wxwindows/open.cpp:412
 msgid "Chapter"
 msgstr "Kapitel"
 
@@ -987,7 +987,7 @@ msgstr ""
 #: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
 #: modules/demux/ogg.c:1002 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:378 modules/gui/macosx/output.m:164
+#: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr ""
 
@@ -996,7 +996,7 @@ msgstr ""
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:909
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
-#: modules/gui/macosx/output.m:158 modules/misc/dummy/dummy.c:81
+#: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
 #: modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr ""
@@ -1015,7 +1015,7 @@ msgstr ""
 
 #: src/libvlc.h:547 modules/gui/gtk/gnome_interface.c:2042
 #: modules/gui/gtk/gtk_interface.c:2361 modules/gui/gtk/gtk_interface.c:3034
-#: modules/gui/wxwindows/open.cpp:221 modules/gui/wxwindows/streamout.cpp:175
+#: modules/gui/wxwindows/open.cpp:194 modules/gui/wxwindows/streamout.cpp:171
 msgid "Stream output"
 msgstr ""
 
@@ -1029,7 +1029,7 @@ msgstr ""
 #: 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:321
 #: modules/gui/macosx/intf.m:409 modules/gui/pda/interface.c:612
-#: modules/gui/wxwindows/interface.cpp:378
+#: modules/gui/wxwindows/interface.cpp:345
 #: modules/gui/wxwindows/playlist.cpp:104
 msgid "Playlist"
 msgstr ""
@@ -1074,8 +1074,8 @@ msgid "boolean"
 msgstr ""
 
 #: src/video_output/video_output.c:406 modules/gui/beos/VideoOutput.cpp:1151
-#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:348
-#: modules/gui/macosx/controls.m:690 modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:350
+#: modules/gui/macosx/controls.m:692 modules/gui/macosx/intf.m:394
 msgid "Fullscreen"
 msgstr "Helskärm"
 
@@ -1110,7 +1110,7 @@ msgstr ""
 
 #: modules/access/cdda.c:86 modules/access/file.c:72 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
-#: modules/access/v4l/v4l.c:67
+#: modules/access/v4l/v4l.c:66
 msgid "Caching value in ms"
 msgstr ""
 
@@ -1242,6 +1242,41 @@ 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:66
+#, 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:74 modules/access/udp.c:72
+msgid "caching value in ms"
+msgstr ""
+
+#: modules/access_output/udp.c:76 modules/access/udp.c:74
+msgid ""
+"Allows you to modify the default caching value for udp streams. This value "
+"should be set in miliseconds units."
+msgstr ""
+
+#: modules/access_output/udp.c:80
+#, fuzzy
+msgid "UDP stream ouput"
+msgstr "Paus"
+
+#: modules/access_output/udp.c:81
+#, fuzzy
+msgid "udp stream output"
+msgstr "Paus"
+
 #: modules/access/pvr/pvr.c:75
 msgid "Hauppauge PVR cards input"
 msgstr ""
@@ -1290,16 +1325,6 @@ msgstr ""
 msgid "slp"
 msgstr ""
 
-#: modules/access/udp.c:72 modules/access_output/udp.c:74
-msgid "caching value in ms"
-msgstr ""
-
-#: modules/access/udp.c:74 modules/access_output/udp.c:76
-msgid ""
-"Allows you to modify the default caching value for udp streams. This value "
-"should be set in miliseconds units."
-msgstr ""
-
 #: modules/access/udp.c:78
 msgid "UDP/RTP input"
 msgstr ""
@@ -1308,21 +1333,21 @@ msgstr ""
 msgid "udp"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:69
+#: modules/access/v4l/v4l.c:68
 msgid ""
 "Allows you to modify the default caching value for v4l streams. This value "
 "should be set in miliseconds units."
 msgstr ""
 
-#: modules/access/v4l/v4l.c:73
+#: modules/access/v4l/v4l.c:72
 msgid "Video4Linux input"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:74
+#: modules/access/v4l/v4l.c:73
 msgid "v4l"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:82
+#: modules/access/v4l/v4l.c:81
 msgid "Video4Linux demuxer"
 msgstr ""
 
@@ -1330,31 +1355,6 @@ msgstr ""
 msgid "VCD input"
 msgstr ""
 
-#: modules/access_output/dummy.c:56
-#, fuzzy
-msgid "Dummy stream ouput"
-msgstr "Paus"
-
-#: modules/access_output/file.c:66
-#, 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:80
-#, fuzzy
-msgid "UDP stream ouput"
-msgstr "Paus"
-
-#: modules/access_output/udp.c:81
-#, fuzzy
-msgid "udp stream output"
-msgstr "Paus"
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr ""
@@ -1497,7 +1497,7 @@ msgstr ""
 msgid "ALSA audio output"
 msgstr ""
 
-#: modules/audio_output/alsa.c:116 modules/audio_output/coreaudio.c:218
+#: modules/audio_output/alsa.c:117 modules/audio_output/coreaudio.c:218
 #: modules/audio_output/coreaudio.c:1473 modules/audio_output/directx.c:377
 #: modules/audio_output/oss.c:129 modules/audio_output/sdl.c:176
 #: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:337
@@ -1505,23 +1505,23 @@ msgstr ""
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:173 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:399
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:180 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:208 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1784,14 +1784,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 ""
@@ -1804,10 +1804,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 ""
@@ -1816,6 +1812,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 ""
@@ -2041,9 +2041,9 @@ 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:924
-#: modules/gui/macosx/intf.m:925 modules/gui/macosx/intf.m:926
-#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:797
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
+#: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
+#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:685
 msgid "Pause"
 msgstr "Paus"
 
@@ -2051,11 +2051,11 @@ msgstr "Paus"
 #: 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:324 modules/gui/macosx/intf.m:362
-#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:931
-#: modules/gui/macosx/intf.m:932 modules/gui/macosx/intf.m:933
+#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
+#: modules/gui/macosx/intf.m:929 modules/gui/macosx/intf.m:930
 #: modules/gui/macosx/playlist.m:194 modules/gui/pda/interface.c:192
-#: modules/gui/wxwindows/interface.cpp:375
-#: modules/gui/wxwindows/interface.cpp:803
+#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:691
 msgid "Play"
 msgstr "Spela upp"
 
@@ -2110,7 +2110,7 @@ msgstr ""
 #: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
 #: 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/output.m:170 modules/gui/wxwindows/streamout.cpp:667
+#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
 #, fuzzy
 msgid "Channels"
 msgstr "Kanal:"
@@ -2138,7 +2138,7 @@ msgstr "Paus"
 #: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
 #: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:147 modules/gui/pda/interface.c:372
+#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr ""
 
@@ -2897,19 +2897,19 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2847 modules/gui/gtk/gtk_interface.c:618
 #: 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:138 modules/gui/macosx/output.m:218
-#: modules/gui/macosx/output.m:310 modules/gui/pda/interface.c:380
-#: modules/gui/wxwindows/interface.cpp:362 modules/gui/wxwindows/open.cpp:279
-#: modules/gui/wxwindows/streamout.cpp:384
+#: modules/gui/macosx/open.m:142 modules/gui/macosx/open.m:263
+#: modules/gui/macosx/output.m:130 modules/gui/macosx/output.m:208
+#: modules/gui/macosx/output.m:300 modules/gui/pda/interface.c:380
+#: modules/gui/wxwindows/interface.cpp:329 modules/gui/wxwindows/open.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:385
 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/macosx/open.m:630 modules/gui/macosx/open.m:677
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:331
+#: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:676
 msgid "Open File"
 msgstr "Öppna fil"
 
@@ -2978,11 +2978,11 @@ msgstr "Spola fram
 #: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
 #: 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:606 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:134
-#: modules/gui/wxwindows/open.cpp:270
+#: modules/gui/gtk/preferences.c:606 modules/gui/macosx/open.m:139
+#: modules/gui/macosx/open.m:180 modules/gui/macosx/output.m:126
+#: modules/gui/wxwindows/open.cpp:244 modules/gui/wxwindows/open.cpp:971
 #: modules/gui/wxwindows/preferences.cpp:253
-#: modules/gui/wxwindows/streamout.cpp:221
+#: modules/gui/wxwindows/streamout.cpp:217
 #: modules/gui/wxwindows/subtitles.cpp:149
 msgid "OK"
 msgstr ""
@@ -3071,7 +3071,7 @@ msgstr ""
 
 #: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:597 modules/gui/gtk/preferences.c:614
-#: modules/gui/macosx/output.m:375 modules/gui/macosx/prefs.m:78
+#: modules/gui/macosx/output.m:365 modules/gui/macosx/prefs.m:78
 #: modules/gui/wxwindows/preferences.cpp:257
 msgid "Save"
 msgstr ""
@@ -3142,8 +3142,8 @@ msgid "VLC media player"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:700
-#: modules/gui/wxwindows/preferences.cpp:1026
+#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
 #: modules/gui/wxwindows/subtitles.cpp:196
 #, fuzzy
 msgid "Open file"
@@ -3169,10 +3169,10 @@ 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:639
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:641
 #: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
 #: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Stop"
 msgstr "Stopp"
 
@@ -3204,9 +3204,9 @@ msgid "UDP/RTP (Address when Multicast)"
 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:141 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:467 modules/gui/wxwindows/streamout.cpp:424
+#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
+#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
+#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
 msgid "Address"
 msgstr "Adress"
 
@@ -3214,16 +3214,16 @@ msgstr "Adress"
 #: modules/gui/gtk/gnome_interface.c:1786
 #: 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:142 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:452 modules/gui/wxwindows/open.cpp:475
-#: modules/gui/wxwindows/streamout.cpp:435
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
 msgid "Port"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:144
-#: modules/gui/macosx/output.m:246 modules/gui/macosx/output.m:321
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:385
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
+#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
 msgid "HTTP"
 msgstr ""
 
@@ -3237,9 +3237,9 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
 #: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:143
-#: modules/gui/macosx/open.m:272 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:283
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
 msgid "Network"
 msgstr "Nätverk"
 
@@ -3307,10 +3307,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
 #: modules/gui/pda/support.c:121
 #, c-format
 msgid "Couldn't find pixmap file: %s"
@@ -3322,6 +3322,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:364
+#, 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 ""
@@ -3365,7 +3428,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:255
+#: modules/gui/wxwindows/interface.cpp:222
 #, fuzzy
 msgid "Open a file"
 msgstr "Öppna fil"
@@ -3480,7 +3543,7 @@ 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:686 modules/gui/macosx/intf.m:381
+#: modules/gui/macosx/controls.m:688 modules/gui/macosx/intf.m:381
 msgid "Mute"
 msgstr "Stäng av ljudet"
 
@@ -3506,7 +3569,7 @@ msgstr "_Helsk
 
 #: 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/output.m:137 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/output.m:129 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr "Helskärm"
 
@@ -3522,19 +3585,19 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1690
 #: 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:364
-#: modules/gui/wxwindows/open.cpp:281
+#: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:143
+#: modules/gui/macosx/open.m:267 modules/gui/wxwindows/interface.cpp:331
+#: modules/gui/wxwindows/open.cpp:255
 msgid "Disc"
 msgstr "Skiva"
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:366
+#: modules/gui/wxwindows/interface.cpp:333
 msgid "Net"
 msgstr "Nätverk"
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:369
+#: modules/gui/wxwindows/interface.cpp:336
 msgid "Sat"
 msgstr ""
 
@@ -3596,7 +3659,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:380
+#: modules/gui/wxwindows/interface.cpp:347
 msgid "Prev"
 msgstr "Föregående objekt"
 
@@ -3608,9 +3671,9 @@ msgstr "F
 #: modules/gui/gtk/gnome_interface.c:667
 #: 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:647
+#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:649
 #: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
-#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:382
+#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:349
 msgid "Next"
 msgstr "Nästa objekt"
 
@@ -3686,17 +3749,17 @@ msgid "Open Stream"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1476 modules/gui/gtk/gtk_interface.c:1791
-#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:173
+#: modules/gui/macosx/open.m:136 modules/gui/wxwindows/open.cpp:169
 msgid "Media Resource Locator (MRL)"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1498 modules/gui/gtk/gtk_interface.c:1813
-#: modules/gui/wxwindows/open.cpp:177
+#: modules/gui/wxwindows/open.cpp:173
 msgid "Open Target:"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:192
+#: modules/gui/wxwindows/open.cpp:188
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -3704,63 +3767,63 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1562
 #: 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:140 modules/gui/macosx/prefs.m:464
-#: modules/gui/wxwindows/open.cpp:249 modules/gui/wxwindows/open.cpp:365
-#: modules/gui/wxwindows/preferences.cpp:829
-#: modules/gui/wxwindows/streamout.cpp:411
+#: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:152 modules/gui/macosx/open.m:174
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/prefs.m:464
+#: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
+#: modules/gui/wxwindows/preferences.cpp:832
+#: modules/gui/wxwindows/streamout.cpp:412
 #: modules/gui/wxwindows/subtitles.cpp:107
 msgid "Browse..."
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:390
+#: modules/gui/wxwindows/open.cpp:392
 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:384
+#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:487
+#: modules/gui/wxwindows/open.cpp:386
 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:385
+#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:381
+#: modules/gui/macosx/open.m:471 modules/gui/wxwindows/open.cpp:387
 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:396
+#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:398
 msgid "Device name"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1660 modules/gui/gtk/gtk_interface.c:1996
-#: modules/gui/macosx/open.m:152
+#: modules/gui/macosx/open.m:153
 msgid "Use DVD menus"
 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:431
+#: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:546
+#: modules/gui/macosx/open.m:584 modules/gui/wxwindows/open.cpp:433
 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:432
+#: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:547
+#: modules/gui/macosx/open.m:596 modules/gui/wxwindows/open.cpp:434
 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:433
+#: modules/gui/macosx/open.m:167 modules/gui/macosx/open.m:548
+#: modules/gui/macosx/open.m:609 modules/gui/wxwindows/open.cpp:435
 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:489
+#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr ""
 
@@ -3789,24 +3852,24 @@ msgid "Horizontal"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
-#: modules/gui/wxwindows/open.cpp:286
+#: modules/gui/wxwindows/open.cpp:260
 msgid "Satellite"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322
-#: modules/gui/macosx/open.m:175
+#: modules/gui/macosx/open.m:176
 #, fuzzy
 msgid "delay"
 msgstr "Spela upp"
 
 #: modules/gui/gtk/gnome_interface.c:2020 modules/gui/gtk/gtk_interface.c:2338
-#: modules/gui/macosx/open.m:177
+#: modules/gui/macosx/open.m:178
 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:133
-#: modules/gui/wxwindows/open.cpp:204 modules/gui/wxwindows/open.cpp:226
+#: modules/gui/macosx/open.m:173 modules/gui/macosx/output.m:125
+#: modules/gui/wxwindows/open.cpp:199 modules/gui/wxwindows/open.cpp:354
 msgid "Settings..."
 msgstr ""
 
@@ -3877,14 +3940,14 @@ msgid "Destination Target: "
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:257
-#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:386
+#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:313 modules/gui/wxwindows/streamout.cpp:387
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:270
-#: modules/gui/macosx/output.m:333 modules/gui/wxwindows/streamout.cpp:387
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:260
+#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:388
 msgid "RTP"
 msgstr ""
 
@@ -3907,8 +3970,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:303
-#: modules/gui/macosx/output.m:362
+#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:293
+#: modules/gui/macosx/output.m:352
 msgid "AVI"
 msgstr ""
 
@@ -3926,11 +3989,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 ""
@@ -3947,10 +4005,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 ""
@@ -3971,10 +4025,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..."
@@ -3995,7 +4045,7 @@ msgstr ""
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:154
+#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:150
 msgid "Open Target"
 msgstr ""
 
@@ -4028,10 +4078,11 @@ msgstr ""
 
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
-#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:139
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:273
+#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
+#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/wxwindows/open.cpp:974
 #: modules/gui/wxwindows/preferences.cpp:256
-#: modules/gui/wxwindows/streamout.cpp:224
+#: modules/gui/wxwindows/streamout.cpp:220
 #: modules/gui/wxwindows/subtitles.cpp:152
 msgid "Cancel"
 msgstr "Avbryt"
@@ -4082,56 +4133,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:374
-#, 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"
@@ -4167,58 +4168,58 @@ msgstr ""
 msgid "About VLC media player"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:691
+#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:693
 #: modules/gui/macosx/intf.m:390
 msgid "Half Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:692
+#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:694
 #: modules/gui/macosx/intf.m:391
 msgid "Normal Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:693
+#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
 #: modules/gui/macosx/intf.m:392
 msgid "Double Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
-#: modules/gui/macosx/controls.m:702 modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:697
+#: modules/gui/macosx/controls.m:704 modules/gui/macosx/intf.m:395
 msgid "Float On Top"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:694
+#: modules/gui/macosx/controls.m:360 modules/gui/macosx/controls.m:696
 #: modules/gui/macosx/intf.m:393
 #, fuzzy
 msgid "Fit To Screen"
 msgstr "Helskärm"
 
-#: modules/gui/macosx/controls.m:625 modules/gui/macosx/intf.m:326
-#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:386
+#: modules/gui/macosx/controls.m:627 modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:353
 #, fuzzy
 msgid "Faster"
 msgstr "Spola framåt"
 
-#: modules/gui/macosx/controls.m:626 modules/gui/macosx/intf.m:323
-#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:384
+#: modules/gui/macosx/controls.m:628 modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:351
 msgid "Slower"
 msgstr "Slow Motion"
 
-#: modules/gui/macosx/controls.m:646 modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/controls.m:648 modules/gui/macosx/intf.m:322
 #: modules/gui/macosx/intf.m:366 modules/gui/macosx/intf.m:426
 #, fuzzy
 msgid "Previous"
 msgstr "Föregående fil"
 
-#: modules/gui/macosx/controls.m:665 modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/controls.m:667 modules/gui/macosx/intf.m:368
 msgid "Loop"
 msgstr "Repetera"
 
-#: modules/gui/macosx/controls.m:672 modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/controls.m:674 modules/gui/macosx/intf.m:369
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:673 modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/controls.m:675 modules/gui/macosx/intf.m:370
 #, fuzzy
 msgid "Step Backward"
 msgstr "Föregående objekt"
@@ -4233,8 +4234,8 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr "Kontroller"
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:868
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
 msgid "Volume"
 msgstr ""
 
@@ -4297,7 +4298,7 @@ msgstr "
 msgid "Open Recent"
 msgstr "Öppna nätverk"
 
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1205
+#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1202
 #, fuzzy
 msgid "Clear Menu"
 msgstr "Radera"
@@ -4366,7 +4367,7 @@ msgstr ""
 msgid "VideoLAN Website"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1198
+#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1195
 msgid "License"
 msgstr ""
 
@@ -4391,11 +4392,11 @@ msgstr ""
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4429,115 +4430,115 @@ msgstr ""
 msgid "MacOS X interface, sound and video"
 msgstr ""
 
-#: modules/gui/macosx/open.m:134
+#: modules/gui/macosx/open.m:135
 #, fuzzy
 msgid "Open Source"
 msgstr "Öppna nätverk"
 
-#: modules/gui/macosx/open.m:136
+#: modules/gui/macosx/open.m:137
 msgid "Only enqueue in playlist, do not play"
 msgstr ""
 
-#: modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:147
 msgid "Treat as a pipe rather than as a file"
 msgstr ""
 
-#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:371
+#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:370
 msgid "VIDEO_TS folder"
 msgstr ""
 
-#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:389
-#: modules/gui/macosx/open.m:480
+#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:388
+#: modules/gui/macosx/open.m:479
 #, fuzzy
 msgid "Audio CD"
 msgstr "_Nästa objekt"
 
-#: modules/gui/macosx/open.m:171
+#: modules/gui/macosx/open.m:172
 #, fuzzy
 msgid "Load subtitles file:"
 msgstr "Undertext"
 
-#: modules/gui/macosx/open.m:174
+#: modules/gui/macosx/open.m:175
 msgid "Override"
 msgstr ""
 
-#: modules/gui/macosx/open.m:333 modules/gui/macosx/open.m:527
-#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:678
+#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:677
 #, fuzzy
 msgid "Open"
 msgstr "Öppna fil"
 
-#: modules/gui/macosx/open.m:423 modules/gui/macosx/open.m:475
-#: modules/gui/macosx/open.m:483 modules/gui/macosx/open.m:491
+#: modules/gui/macosx/open.m:422 modules/gui/macosx/open.m:474
+#: modules/gui/macosx/open.m:482 modules/gui/macosx/open.m:490
 msgid "No %@s found"
 msgstr ""
 
-#: modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:525
 msgid "Open VIDEO_TS Directory"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132
+#: modules/gui/macosx/output.m:124
 #, fuzzy
 msgid "Advanced output:"
 msgstr "Paus"
 
-#: modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:128
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:235
-#: modules/gui/macosx/output.m:316
+#: modules/gui/macosx/output.m:131 modules/gui/macosx/output.m:225
+#: modules/gui/macosx/output.m:306
 #, fuzzy
 msgid "Stream"
 msgstr "Stopp"
 
-#: modules/gui/macosx/output.m:143
+#: modules/gui/macosx/output.m:135
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:149 modules/gui/wxwindows/streamout.cpp:530
+#: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:150
+#: modules/gui/macosx/output.m:142
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:151 modules/gui/macosx/output.m:305
-#: modules/gui/macosx/output.m:358
+#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:295
+#: modules/gui/macosx/output.m:348
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:152 modules/gui/macosx/output.m:307
-#: modules/gui/macosx/output.m:360
+#: modules/gui/macosx/output.m:144 modules/gui/macosx/output.m:297
+#: modules/gui/macosx/output.m:350
 msgid "MPEG1"
 msgstr ""
 
-#: modules/gui/macosx/output.m:154 modules/gui/macosx/output.m:304
-#: modules/gui/macosx/output.m:364
+#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:294
+#: modules/gui/macosx/output.m:354
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:157
+#: modules/gui/macosx/output.m:149
 #, fuzzy
 msgid "Transcode options"
 msgstr "Paus"
 
-#: modules/gui/macosx/output.m:161 modules/gui/macosx/output.m:167
-#: modules/gui/wxwindows/streamout.cpp:609
-#: modules/gui/wxwindows/streamout.cpp:661
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:159
+#: modules/gui/wxwindows/streamout.cpp:610
+#: modules/gui/wxwindows/streamout.cpp:662
 msgid "Bitrate (kb/s)"
 msgstr ""
 
-#: modules/gui/macosx/output.m:174 modules/gui/wxwindows/streamout.cpp:483
+#: modules/gui/macosx/output.m:166 modules/gui/wxwindows/streamout.cpp:484
 msgid "Miscellaneous Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:175
+#: modules/gui/macosx/output.m:167
 msgid "Announce streams via SAP Channel:"
 msgstr ""
 
-#: modules/gui/macosx/output.m:306 modules/gui/macosx/output.m:366
+#: modules/gui/macosx/output.m:296 modules/gui/macosx/output.m:356
 msgid "mp4"
 msgstr ""
 
@@ -4626,210 +4627,210 @@ msgstr "G
 msgid "FileInfo"
 msgstr "_Öppna fil..."
 
-#: modules/gui/wxwindows/interface.cpp:256
+#: modules/gui/wxwindows/interface.cpp:223
 #, fuzzy
 msgid "Open a DVD or (S)VCD"
 msgstr "Öppna skiva"
 
-#: modules/gui/wxwindows/interface.cpp:257
+#: modules/gui/wxwindows/interface.cpp:224
 #, fuzzy
 msgid "Open a network stream"
 msgstr "_Öppna nätverk..."
 
-#: modules/gui/wxwindows/interface.cpp:258
+#: modules/gui/wxwindows/interface.cpp:225
 msgid "Open a satellite stream"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:226
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:260
+#: modules/gui/wxwindows/interface.cpp:227
 #, fuzzy
 msgid "Exit this program"
 msgstr "Avsluta VLC"
 
-#: modules/gui/wxwindows/interface.cpp:262
+#: modules/gui/wxwindows/interface.cpp:229
 msgid "Open the playlist"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:230
 #, fuzzy
 msgid "Show the program logs"
 msgstr "Avsluta VLC"
 
-#: modules/gui/wxwindows/interface.cpp:264
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:266
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:268
+#: modules/gui/wxwindows/interface.cpp:235
 #, fuzzy
 msgid "About this program"
 msgstr "Avsluta VLC"
 
-#: modules/gui/wxwindows/interface.cpp:272 modules/gui/wxwindows/menus.cpp:108
+#: modules/gui/wxwindows/interface.cpp:239 modules/gui/wxwindows/menus.cpp:108
 #, fuzzy
 msgid "Simple &Open ..."
 msgstr "_Öppna fil..."
 
-#: modules/gui/wxwindows/interface.cpp:274 modules/gui/wxwindows/menus.cpp:109
+#: modules/gui/wxwindows/interface.cpp:241 modules/gui/wxwindows/menus.cpp:109
 #, fuzzy
 msgid "Open &File..."
 msgstr "_Öppna fil..."
 
-#: modules/gui/wxwindows/interface.cpp:276 modules/gui/wxwindows/menus.cpp:110
+#: modules/gui/wxwindows/interface.cpp:243 modules/gui/wxwindows/menus.cpp:110
 #, fuzzy
 msgid "Open &Disc..."
 msgstr "_Öppna skiva..."
 
-#: modules/gui/wxwindows/interface.cpp:278 modules/gui/wxwindows/menus.cpp:111
+#: modules/gui/wxwindows/interface.cpp:245 modules/gui/wxwindows/menus.cpp:111
 #, fuzzy
 msgid "Open &Network Stream..."
 msgstr "_Öppna nätverk..."
 
-#: modules/gui/wxwindows/interface.cpp:281
+#: modules/gui/wxwindows/interface.cpp:248
 #, fuzzy
 msgid "Open &Satellite Stream..."
 msgstr "_Öppna nätverk..."
 
-#: modules/gui/wxwindows/interface.cpp:286
+#: modules/gui/wxwindows/interface.cpp:253
 #, fuzzy
 msgid "&Eject Disc"
 msgstr "_Mata ut skiva"
 
-#: modules/gui/wxwindows/interface.cpp:290
+#: modules/gui/wxwindows/interface.cpp:257
 #, fuzzy
 msgid "E&xit"
 msgstr "_Avsluta"
 
-#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:261
 msgid "&Playlist..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:263
 #, fuzzy
 msgid "&Messages..."
 msgstr "_Öppna skiva..."
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:264
 #, fuzzy
 msgid "&File info..."
 msgstr "_Öppna fil..."
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:269
 msgid "&Preferences..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:286
 #, fuzzy
 msgid "&About..."
 msgstr "_Om VLC..."
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:290
 #, fuzzy
 msgid "&File"
 msgstr "Arkiv"
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:291
 msgid "&View"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:292
 #, fuzzy
 msgid "&Settings"
 msgstr "Markera allt"
 
-#: modules/gui/wxwindows/interface.cpp:326
-#: modules/gui/wxwindows/interface.cpp:482
-#: modules/gui/wxwindows/interface.cpp:530
+#: modules/gui/wxwindows/interface.cpp:293
+#: modules/gui/wxwindows/interface.cpp:414
+#: modules/gui/wxwindows/interface.cpp:462
 #, fuzzy
 msgid "&Audio"
 msgstr "_Nästa objekt"
 
-#: modules/gui/wxwindows/interface.cpp:327
-#: modules/gui/wxwindows/interface.cpp:501
-#: modules/gui/wxwindows/interface.cpp:534
+#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:433
+#: modules/gui/wxwindows/interface.cpp:466
 msgid "&Video"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:328
-#: modules/gui/wxwindows/interface.cpp:520
-#: modules/gui/wxwindows/interface.cpp:538
+#: modules/gui/wxwindows/interface.cpp:295
+#: modules/gui/wxwindows/interface.cpp:452
+#: modules/gui/wxwindows/interface.cpp:470
 msgid "&Navigation"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:329
+#: modules/gui/wxwindows/interface.cpp:296
 msgid "&Help"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:345
+#: modules/gui/wxwindows/interface.cpp:312
 msgid "Stop current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/wxwindows/interface.cpp:313
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:347
+#: modules/gui/wxwindows/interface.cpp:314
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:348
+#: modules/gui/wxwindows/interface.cpp:315
 #: modules/gui/wxwindows/playlist.cpp:353
 #, fuzzy
 msgid "Open playlist"
 msgstr "Öppna skiva"
 
-#: modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:316
 #, fuzzy
 msgid "Previous playlist item"
 msgstr "Föregående fil"
 
-#: modules/gui/wxwindows/interface.cpp:350
+#: modules/gui/wxwindows/interface.cpp:317
 msgid "Next playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/wxwindows/interface.cpp:318
 #, fuzzy
 msgid "Play slower"
 msgstr "Slow Motion"
 
-#: modules/gui/wxwindows/interface.cpp:352
+#: modules/gui/wxwindows/interface.cpp:319
 #, fuzzy
 msgid "Play faster"
 msgstr "Spola framåt"
 
-#: modules/gui/wxwindows/interface.cpp:574
+#: modules/gui/wxwindows/interface.cpp:506
 #, fuzzy
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr "Göm andra"
 
-#: modules/gui/wxwindows/interface.cpp:575
+#: modules/gui/wxwindows/interface.cpp:507
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:576
+#: modules/gui/wxwindows/interface.cpp:508
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:578
+#: modules/gui/wxwindows/interface.cpp:510
 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:582
+#: modules/gui/wxwindows/interface.cpp:514
 #, fuzzy, c-format
 msgid "About %s"
 msgstr "Om VLC"
@@ -4869,49 +4870,54 @@ msgstr ""
 msgid "Save Messages As a file..."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:181
+#: modules/gui/wxwindows/open.cpp:177
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:198 modules/gui/wxwindows/subtitles.cpp:98
-#, fuzzy
-msgid "Subtitles file"
-msgstr "Undertext"
-
-#: modules/gui/wxwindows/open.cpp:199
-msgid "Load an additional subtitles file. Currently only works with AVI files."
-msgstr ""
-
-#: modules/gui/wxwindows/open.cpp:222
+#: modules/gui/wxwindows/open.cpp:195
 msgid "Use VLC as a stream server"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:242
+#: modules/gui/wxwindows/open.cpp:216
 #, fuzzy
 msgid "Capture input stream"
 msgstr "Paus"
 
-#: modules/gui/wxwindows/open.cpp:244
+#: modules/gui/wxwindows/open.cpp:218
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:383
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+#, fuzzy
+msgid "Subtitles file"
+msgstr "Undertext"
+
+#: modules/gui/wxwindows/open.cpp:349
+msgid "Load an additional subtitles file. Currently only works with AVI files."
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:385
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:386
+#: modules/gui/wxwindows/open.cpp:388
 #, fuzzy
 msgid "CD Audio"
 msgstr "_Nästa objekt"
 
-#: modules/gui/wxwindows/open.cpp:886 modules/gui/wxwindows/streamout.cpp:785
+#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
 #, fuzzy
 msgid "Save file"
 msgstr "Nästa file"
 
+#: modules/gui/wxwindows/open.cpp:953
+#, fuzzy
+msgid "Advanced open options"
+msgstr "Paus"
+
 #: modules/gui/wxwindows/playlist.cpp:116
 #, fuzzy
 msgid "&Simple Add..."
@@ -4972,63 +4978,63 @@ msgstr "
 msgid "Reset config file"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:898
+#: modules/gui/wxwindows/preferences.cpp:901
 msgid "No configuration options available"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:919
+#: modules/gui/wxwindows/preferences.cpp:922
 #, fuzzy
 msgid "Advanced options"
 msgstr "Paus"
 
-#: modules/gui/wxwindows/streamout.cpp:190
+#: modules/gui/wxwindows/streamout.cpp:186
 msgid "Stream output MRL"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:194
+#: modules/gui/wxwindows/streamout.cpp:190
 msgid "Destination Target:"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:197
+#: modules/gui/wxwindows/streamout.cpp:193
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:377
+#: modules/gui/wxwindows/streamout.cpp:378
 msgid "Output Methods"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:383
+#: modules/gui/wxwindows/streamout.cpp:384
 #, fuzzy
 msgid "Play locally"
 msgstr "Slow Motion"
 
-#: modules/gui/wxwindows/streamout.cpp:407
+#: modules/gui/wxwindows/streamout.cpp:408
 #, fuzzy
 msgid "Filename"
 msgstr "Arkiv"
 
-#: modules/gui/wxwindows/streamout.cpp:495
+#: modules/gui/wxwindows/streamout.cpp:496
 msgid "SAP Announce"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:497
+#: modules/gui/wxwindows/streamout.cpp:498
 #, fuzzy
 msgid "Channel Name "
 msgstr "Kanalserver"
 
-#: modules/gui/wxwindows/streamout.cpp:569
+#: modules/gui/wxwindows/streamout.cpp:570
 msgid "Transcoding options"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:602
+#: modules/gui/wxwindows/streamout.cpp:603
 #, fuzzy
 msgid "Video codec"
 msgstr "Göm andra"
 
-#: modules/gui/wxwindows/streamout.cpp:649
+#: modules/gui/wxwindows/streamout.cpp:650
 #, fuzzy
 msgid "Audio codec"
 msgstr "_Nästa objekt"
@@ -5117,29 +5123,29 @@ msgstr ""
 msgid "Using the dummy interface plugin..."
 msgstr ""
 
-#: modules/misc/freetype.c:65 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr ""
 
-#: modules/misc/freetype.c:66
+#: modules/misc/freetype.c:68
 #, fuzzy
 msgid "Filename of Font"
 msgstr "Arkiv"
 
-#: modules/misc/freetype.c:67
+#: modules/misc/freetype.c:69
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:70
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:71
+#: modules/misc/freetype.c:73
 #, fuzzy
 msgid "Fonts"
 msgstr "Kontroller"
 
-#: modules/misc/freetype.c:74
+#: modules/misc/freetype.c:76
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -5177,6 +5183,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 ""
@@ -5193,10 +5203,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 ""
diff --git a/po/vlc.pot b/po/vlc.pot
index 2880e8c866..31e29b8f93 100644
--- a/po/vlc.pot
+++ b/po/vlc.pot
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-07-24 00:53+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-29 19:02+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"
@@ -28,7 +29,7 @@ msgid "Audio channels"
 msgstr ""
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:173 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:179 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:386
 msgid "Stereo"
@@ -124,8 +125,8 @@ msgstr ""
 #: 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:373
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:404
+#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:406
 msgid "Title"
 msgstr ""
 
@@ -133,8 +134,8 @@ msgstr ""
 #: 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:375
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:151
+#: modules/gui/wxwindows/open.cpp:412
 msgid "Chapter"
 msgstr ""
 
@@ -962,7 +963,7 @@ msgstr ""
 #: modules/demux/mkv.cpp:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
 #: modules/demux/ogg.c:1002 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:378 modules/gui/macosx/output.m:164
+#: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:156
 msgid "Audio"
 msgstr ""
 
@@ -971,7 +972,7 @@ msgstr ""
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:909
 #: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
 #: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
-#: modules/gui/macosx/output.m:158 modules/misc/dummy/dummy.c:81
+#: modules/gui/macosx/output.m:150 modules/misc/dummy/dummy.c:81
 #: modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr ""
@@ -990,7 +991,7 @@ msgstr ""
 
 #: src/libvlc.h:547 modules/gui/gtk/gnome_interface.c:2042
 #: modules/gui/gtk/gtk_interface.c:2361 modules/gui/gtk/gtk_interface.c:3034
-#: modules/gui/wxwindows/open.cpp:221 modules/gui/wxwindows/streamout.cpp:175
+#: modules/gui/wxwindows/open.cpp:194 modules/gui/wxwindows/streamout.cpp:171
 msgid "Stream output"
 msgstr ""
 
@@ -1004,7 +1005,7 @@ msgstr ""
 #: 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:321
 #: modules/gui/macosx/intf.m:409 modules/gui/pda/interface.c:612
-#: modules/gui/wxwindows/interface.cpp:378
+#: modules/gui/wxwindows/interface.cpp:345
 #: modules/gui/wxwindows/playlist.cpp:104
 msgid "Playlist"
 msgstr ""
@@ -1049,8 +1050,8 @@ msgid "boolean"
 msgstr ""
 
 #: src/video_output/video_output.c:406 modules/gui/beos/VideoOutput.cpp:1151
-#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:348
-#: modules/gui/macosx/controls.m:690 modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:350
+#: modules/gui/macosx/controls.m:692 modules/gui/macosx/intf.m:394
 msgid "Fullscreen"
 msgstr ""
 
@@ -1084,7 +1085,7 @@ msgstr ""
 
 #: modules/access/cdda.c:86 modules/access/file.c:72 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
-#: modules/access/v4l/v4l.c:67
+#: modules/access/v4l/v4l.c:66
 msgid "Caching value in ms"
 msgstr ""
 
@@ -1213,6 +1214,36 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
+#: modules/access_output/dummy.c:56
+msgid "Dummy stream ouput"
+msgstr ""
+
+#: modules/access_output/file.c:66
+msgid "File stream ouput"
+msgstr ""
+
+#: modules/access_output/http.c:54
+msgid "HTTP stream ouput"
+msgstr ""
+
+#: modules/access_output/udp.c:74 modules/access/udp.c:72
+msgid "caching value in ms"
+msgstr ""
+
+#: modules/access_output/udp.c:76 modules/access/udp.c:74
+msgid ""
+"Allows you to modify the default caching value for udp streams. This value "
+"should be set in miliseconds units."
+msgstr ""
+
+#: modules/access_output/udp.c:80
+msgid "UDP stream ouput"
+msgstr ""
+
+#: modules/access_output/udp.c:81
+msgid "udp stream output"
+msgstr ""
+
 #: modules/access/pvr/pvr.c:75
 msgid "Hauppauge PVR cards input"
 msgstr ""
@@ -1261,16 +1292,6 @@ msgstr ""
 msgid "slp"
 msgstr ""
 
-#: modules/access/udp.c:72 modules/access_output/udp.c:74
-msgid "caching value in ms"
-msgstr ""
-
-#: modules/access/udp.c:74 modules/access_output/udp.c:76
-msgid ""
-"Allows you to modify the default caching value for udp streams. This value "
-"should be set in miliseconds units."
-msgstr ""
-
 #: modules/access/udp.c:78
 msgid "UDP/RTP input"
 msgstr ""
@@ -1279,21 +1300,21 @@ msgstr ""
 msgid "udp"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:69
+#: modules/access/v4l/v4l.c:68
 msgid ""
 "Allows you to modify the default caching value for v4l streams. This value "
 "should be set in miliseconds units."
 msgstr ""
 
-#: modules/access/v4l/v4l.c:73
+#: modules/access/v4l/v4l.c:72
 msgid "Video4Linux input"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:74
+#: modules/access/v4l/v4l.c:73
 msgid "v4l"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:82
+#: modules/access/v4l/v4l.c:81
 msgid "Video4Linux demuxer"
 msgstr ""
 
@@ -1301,26 +1322,6 @@ msgstr ""
 msgid "VCD input"
 msgstr ""
 
-#: modules/access_output/dummy.c:56
-msgid "Dummy stream ouput"
-msgstr ""
-
-#: modules/access_output/file.c:66
-msgid "File stream ouput"
-msgstr ""
-
-#: modules/access_output/http.c:54
-msgid "HTTP stream ouput"
-msgstr ""
-
-#: modules/access_output/udp.c:80
-msgid "UDP stream ouput"
-msgstr ""
-
-#: modules/access_output/udp.c:81
-msgid "udp stream output"
-msgstr ""
-
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr ""
@@ -1463,7 +1464,7 @@ msgstr ""
 msgid "ALSA audio output"
 msgstr ""
 
-#: modules/audio_output/alsa.c:116 modules/audio_output/coreaudio.c:218
+#: modules/audio_output/alsa.c:117 modules/audio_output/coreaudio.c:218
 #: modules/audio_output/coreaudio.c:1473 modules/audio_output/directx.c:377
 #: modules/audio_output/oss.c:129 modules/audio_output/sdl.c:176
 #: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:337
@@ -1471,23 +1472,23 @@ msgstr ""
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:173 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:399
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:180 modules/audio_output/directx.c:409
+#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:409
 #: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:391
+#: modules/audio_output/alsa.c:192 modules/audio_output/directx.c:391
 #: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:208 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:219 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1746,14 +1747,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 ""
@@ -1766,10 +1767,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 ""
@@ -1778,6 +1775,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 ""
@@ -1995,9 +1996,9 @@ 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:924
-#: modules/gui/macosx/intf.m:925 modules/gui/macosx/intf.m:926
-#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:797
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:921
+#: modules/gui/macosx/intf.m:922 modules/gui/macosx/intf.m:923
+#: modules/gui/pda/interface.c:179 modules/gui/wxwindows/interface.cpp:685
 msgid "Pause"
 msgstr ""
 
@@ -2005,11 +2006,11 @@ msgstr ""
 #: 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:324 modules/gui/macosx/intf.m:362
-#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:931
-#: modules/gui/macosx/intf.m:932 modules/gui/macosx/intf.m:933
+#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:928
+#: modules/gui/macosx/intf.m:929 modules/gui/macosx/intf.m:930
 #: modules/gui/macosx/playlist.m:194 modules/gui/pda/interface.c:192
-#: modules/gui/wxwindows/interface.cpp:375
-#: modules/gui/wxwindows/interface.cpp:803
+#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:691
 msgid "Play"
 msgstr ""
 
@@ -2064,7 +2065,7 @@ msgstr ""
 #: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
 #: 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/output.m:170 modules/gui/wxwindows/streamout.cpp:667
+#: modules/gui/macosx/output.m:162 modules/gui/wxwindows/streamout.cpp:668
 msgid "Channels"
 msgstr ""
 
@@ -2090,7 +2091,7 @@ msgstr ""
 #: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
 #: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
 #: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
-#: modules/gui/macosx/output.m:147 modules/gui/pda/interface.c:372
+#: modules/gui/macosx/output.m:139 modules/gui/pda/interface.c:372
 msgid "Type"
 msgstr ""
 
@@ -2814,19 +2815,19 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2847 modules/gui/gtk/gtk_interface.c:618
 #: 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:138 modules/gui/macosx/output.m:218
-#: modules/gui/macosx/output.m:310 modules/gui/pda/interface.c:380
-#: modules/gui/wxwindows/interface.cpp:362 modules/gui/wxwindows/open.cpp:279
-#: modules/gui/wxwindows/streamout.cpp:384
+#: modules/gui/macosx/open.m:142 modules/gui/macosx/open.m:263
+#: modules/gui/macosx/output.m:130 modules/gui/macosx/output.m:208
+#: modules/gui/macosx/output.m:300 modules/gui/pda/interface.c:380
+#: modules/gui/wxwindows/interface.cpp:329 modules/gui/wxwindows/open.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:385
 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/macosx/open.m:630 modules/gui/macosx/open.m:677
+#: modules/gui/gtk2/gnome2_interface.c:113
+#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:331
+#: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:676
 msgid "Open File"
 msgstr ""
 
@@ -2887,11 +2888,11 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
 #: 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:606 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:134
-#: modules/gui/wxwindows/open.cpp:270
+#: modules/gui/gtk/preferences.c:606 modules/gui/macosx/open.m:139
+#: modules/gui/macosx/open.m:180 modules/gui/macosx/output.m:126
+#: modules/gui/wxwindows/open.cpp:244 modules/gui/wxwindows/open.cpp:971
 #: modules/gui/wxwindows/preferences.cpp:253
-#: modules/gui/wxwindows/streamout.cpp:221
+#: modules/gui/wxwindows/streamout.cpp:217
 #: modules/gui/wxwindows/subtitles.cpp:149
 msgid "OK"
 msgstr ""
@@ -2975,7 +2976,7 @@ msgstr ""
 
 #: modules/gui/beos/PreferencesWindow.cpp:224
 #: modules/gui/gtk/preferences.c:597 modules/gui/gtk/preferences.c:614
-#: modules/gui/macosx/output.m:375 modules/gui/macosx/prefs.m:78
+#: modules/gui/macosx/output.m:365 modules/gui/macosx/prefs.m:78
 #: modules/gui/wxwindows/preferences.cpp:257
 msgid "Save"
 msgstr ""
@@ -3044,8 +3045,8 @@ msgid "VLC media player"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:124 modules/gui/pda/interface.c:126
-#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:700
-#: modules/gui/wxwindows/preferences.cpp:1026
+#: modules/gui/wxwindows/dialogs.cpp:268 modules/gui/wxwindows/open.cpp:709
+#: modules/gui/wxwindows/preferences.cpp:1029
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr ""
@@ -3068,10 +3069,10 @@ 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:639
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:641
 #: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
 #: modules/gui/macosx/intf.m:424 modules/gui/pda/interface.c:205
-#: modules/gui/wxwindows/interface.cpp:373
+#: modules/gui/wxwindows/interface.cpp:340
 msgid "Stop"
 msgstr ""
 
@@ -3102,9 +3103,9 @@ msgid "UDP/RTP (Address when Multicast)"
 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:141 modules/gui/pda/interface.c:414
-#: modules/gui/wxwindows/open.cpp:467 modules/gui/wxwindows/streamout.cpp:424
+#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:161
+#: modules/gui/macosx/output.m:133 modules/gui/pda/interface.c:414
+#: modules/gui/wxwindows/open.cpp:469 modules/gui/wxwindows/streamout.cpp:425
 msgid "Address"
 msgstr ""
 
@@ -3112,16 +3113,16 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1786
 #: 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:142 modules/gui/pda/interface.c:425
-#: modules/gui/wxwindows/open.cpp:452 modules/gui/wxwindows/open.cpp:475
-#: modules/gui/wxwindows/streamout.cpp:435
+#: modules/gui/macosx/open.m:160 modules/gui/macosx/open.m:162
+#: modules/gui/macosx/output.m:134 modules/gui/pda/interface.c:425
+#: modules/gui/wxwindows/open.cpp:454 modules/gui/wxwindows/open.cpp:477
+#: modules/gui/wxwindows/streamout.cpp:436
 msgid "Port"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:144
-#: modules/gui/macosx/output.m:246 modules/gui/macosx/output.m:321
-#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:385
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:236 modules/gui/macosx/output.m:311
+#: modules/gui/pda/interface.c:480 modules/gui/wxwindows/streamout.cpp:386
 msgid "HTTP"
 msgstr ""
 
@@ -3135,9 +3136,9 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
 #: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
-#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:143
-#: modules/gui/macosx/open.m:272 modules/gui/pda/interface.c:518
-#: modules/gui/wxwindows/open.cpp:283
+#: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:144
+#: modules/gui/macosx/open.m:271 modules/gui/pda/interface.c:518
+#: modules/gui/wxwindows/open.cpp:257
 msgid "Network"
 msgstr ""
 
@@ -3201,10 +3202,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
 #: modules/gui/pda/support.c:121
 #, c-format
 msgid "Couldn't find pixmap file: %s"
@@ -3216,6 +3217,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:364
+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 ""
@@ -3258,7 +3317,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:255
+#: modules/gui/wxwindows/interface.cpp:222
 msgid "Open a file"
 msgstr ""
 
@@ -3370,7 +3429,7 @@ 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:686 modules/gui/macosx/intf.m:381
+#: modules/gui/macosx/controls.m:688 modules/gui/macosx/intf.m:381
 msgid "Mute"
 msgstr ""
 
@@ -3396,7 +3455,7 @@ 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/output.m:137 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/output.m:129 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr ""
 
@@ -3412,19 +3471,19 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1690
 #: 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:364
-#: modules/gui/wxwindows/open.cpp:281
+#: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:143
+#: modules/gui/macosx/open.m:267 modules/gui/wxwindows/interface.cpp:331
+#: modules/gui/wxwindows/open.cpp:255
 msgid "Disc"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:366
+#: modules/gui/wxwindows/interface.cpp:333
 msgid "Net"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:369
+#: modules/gui/wxwindows/interface.cpp:336
 msgid "Sat"
 msgstr ""
 
@@ -3486,7 +3545,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:380
+#: modules/gui/wxwindows/interface.cpp:347
 msgid "Prev"
 msgstr ""
 
@@ -3497,9 +3556,9 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:667
 #: 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:647
+#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:649
 #: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
-#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:382
+#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:349
 msgid "Next"
 msgstr ""
 
@@ -3575,17 +3634,17 @@ msgid "Open Stream"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1476 modules/gui/gtk/gtk_interface.c:1791
-#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:173
+#: modules/gui/macosx/open.m:136 modules/gui/wxwindows/open.cpp:169
 msgid "Media Resource Locator (MRL)"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1498 modules/gui/gtk/gtk_interface.c:1813
-#: modules/gui/wxwindows/open.cpp:177
+#: modules/gui/wxwindows/open.cpp:173
 msgid "Open Target:"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:192
+#: modules/gui/wxwindows/open.cpp:188
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -3593,63 +3652,63 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1562
 #: 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:140 modules/gui/macosx/prefs.m:464
-#: modules/gui/wxwindows/open.cpp:249 modules/gui/wxwindows/open.cpp:365
-#: modules/gui/wxwindows/preferences.cpp:829
-#: modules/gui/wxwindows/streamout.cpp:411
+#: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:152 modules/gui/macosx/open.m:174
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/prefs.m:464
+#: modules/gui/wxwindows/open.cpp:223 modules/gui/wxwindows/open.cpp:341
+#: modules/gui/wxwindows/preferences.cpp:832
+#: modules/gui/wxwindows/streamout.cpp:412
 #: modules/gui/wxwindows/subtitles.cpp:107
 msgid "Browse..."
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:390
+#: modules/gui/wxwindows/open.cpp:392
 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:384
+#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:487
+#: modules/gui/wxwindows/open.cpp:386
 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:385
+#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:381
+#: modules/gui/macosx/open.m:471 modules/gui/wxwindows/open.cpp:387
 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:396
+#: modules/gui/macosx/open.m:149 modules/gui/wxwindows/open.cpp:398
 msgid "Device name"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1660 modules/gui/gtk/gtk_interface.c:1996
-#: modules/gui/macosx/open.m:152
+#: modules/gui/macosx/open.m:153
 msgid "Use DVD menus"
 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:431
+#: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:546
+#: modules/gui/macosx/open.m:584 modules/gui/wxwindows/open.cpp:433
 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:432
+#: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:547
+#: modules/gui/macosx/open.m:596 modules/gui/wxwindows/open.cpp:434
 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:433
+#: modules/gui/macosx/open.m:167 modules/gui/macosx/open.m:548
+#: modules/gui/macosx/open.m:609 modules/gui/wxwindows/open.cpp:435
 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:489
+#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:492
 msgid "URL"
 msgstr ""
 
@@ -3678,23 +3737,23 @@ msgid "Horizontal"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
-#: modules/gui/wxwindows/open.cpp:286
+#: modules/gui/wxwindows/open.cpp:260
 msgid "Satellite"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322
-#: modules/gui/macosx/open.m:175
+#: modules/gui/macosx/open.m:176
 msgid "delay"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2020 modules/gui/gtk/gtk_interface.c:2338
-#: modules/gui/macosx/open.m:177
+#: modules/gui/macosx/open.m:178
 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:133
-#: modules/gui/wxwindows/open.cpp:204 modules/gui/wxwindows/open.cpp:226
+#: modules/gui/macosx/open.m:173 modules/gui/macosx/output.m:125
+#: modules/gui/wxwindows/open.cpp:199 modules/gui/wxwindows/open.cpp:354
 msgid "Settings..."
 msgstr ""
 
@@ -3765,14 +3824,14 @@ msgid "Destination Target: "
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:257
-#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:386
+#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:313 modules/gui/wxwindows/streamout.cpp:387
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:270
-#: modules/gui/macosx/output.m:333 modules/gui/wxwindows/streamout.cpp:387
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:260
+#: modules/gui/macosx/output.m:323 modules/gui/wxwindows/streamout.cpp:388
 msgid "RTP"
 msgstr ""
 
@@ -3793,8 +3852,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:303
-#: modules/gui/macosx/output.m:362
+#: modules/gui/macosx/output.m:145 modules/gui/macosx/output.m:293
+#: modules/gui/macosx/output.m:352
 msgid "AVI"
 msgstr ""
 
@@ -3811,11 +3870,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 ""
@@ -3832,10 +3886,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 ""
@@ -3856,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 ""
@@ -3880,7 +3926,7 @@ msgstr ""
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:154
+#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:150
 msgid "Open Target"
 msgstr ""
 
@@ -3910,10 +3956,11 @@ msgstr ""
 
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
-#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:139
-#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:273
+#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:140
+#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:247
+#: modules/gui/wxwindows/open.cpp:974
 #: modules/gui/wxwindows/preferences.cpp:256
-#: modules/gui/wxwindows/streamout.cpp:224
+#: modules/gui/wxwindows/streamout.cpp:220
 #: modules/gui/wxwindows/subtitles.cpp:152
 msgid "Cancel"
 msgstr ""
@@ -3964,51 +4011,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:374
-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 ""
@@ -4042,55 +4044,55 @@ msgstr ""
 msgid "About VLC media player"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:691
+#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:693
 #: modules/gui/macosx/intf.m:390
 msgid "Half Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:692
+#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:694
 #: modules/gui/macosx/intf.m:391
 msgid "Normal Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:354 modules/gui/macosx/controls.m:693
+#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
 #: modules/gui/macosx/intf.m:392
 msgid "Double Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:356 modules/gui/macosx/controls.m:695
-#: modules/gui/macosx/controls.m:702 modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:697
+#: modules/gui/macosx/controls.m:704 modules/gui/macosx/intf.m:395
 msgid "Float On Top"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:694
+#: modules/gui/macosx/controls.m:360 modules/gui/macosx/controls.m:696
 #: modules/gui/macosx/intf.m:393
 msgid "Fit To Screen"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:625 modules/gui/macosx/intf.m:326
-#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:386
+#: modules/gui/macosx/controls.m:627 modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:353
 msgid "Faster"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:626 modules/gui/macosx/intf.m:323
-#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:384
+#: modules/gui/macosx/controls.m:628 modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:351
 msgid "Slower"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:646 modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/controls.m:648 modules/gui/macosx/intf.m:322
 #: modules/gui/macosx/intf.m:366 modules/gui/macosx/intf.m:426
 msgid "Previous"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:665 modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/controls.m:667 modules/gui/macosx/intf.m:368
 msgid "Loop"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:672 modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/controls.m:674 modules/gui/macosx/intf.m:369
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:673 modules/gui/macosx/intf.m:370
+#: modules/gui/macosx/controls.m:675 modules/gui/macosx/intf.m:370
 msgid "Step Backward"
 msgstr ""
 
@@ -4103,8 +4105,8 @@ msgstr ""
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:868
-#: modules/gui/wxwindows/timer.cpp:131
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/control.cpp:160
+#: modules/gui/wxwindows/control.cpp:370
 msgid "Volume"
 msgstr ""
 
@@ -4160,7 +4162,7 @@ msgstr ""
 msgid "Open Recent"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1205
+#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1202
 msgid "Clear Menu"
 msgstr ""
 
@@ -4225,7 +4227,7 @@ msgstr ""
 msgid "VideoLAN Website"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1198
+#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1195
 msgid "License"
 msgstr ""
 
@@ -4250,11 +4252,11 @@ msgstr ""
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1162
+#: modules/gui/macosx/intf.m:1159
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
@@ -4288,108 +4290,108 @@ msgstr ""
 msgid "MacOS X interface, sound and video"
 msgstr ""
 
-#: modules/gui/macosx/open.m:134
+#: modules/gui/macosx/open.m:135
 msgid "Open Source"
 msgstr ""
 
-#: modules/gui/macosx/open.m:136
+#: modules/gui/macosx/open.m:137
 msgid "Only enqueue in playlist, do not play"
 msgstr ""
 
-#: modules/gui/macosx/open.m:146
+#: modules/gui/macosx/open.m:147
 msgid "Treat as a pipe rather than as a file"
 msgstr ""
 
-#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:371
+#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:370
 msgid "VIDEO_TS folder"
 msgstr ""
 
-#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:389
-#: modules/gui/macosx/open.m:480
+#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:388
+#: modules/gui/macosx/open.m:479
 msgid "Audio CD"
 msgstr ""
 
-#: modules/gui/macosx/open.m:171
+#: modules/gui/macosx/open.m:172
 msgid "Load subtitles file:"
 msgstr ""
 
-#: modules/gui/macosx/open.m:174
+#: modules/gui/macosx/open.m:175
 msgid "Override"
 msgstr ""
 
-#: modules/gui/macosx/open.m:333 modules/gui/macosx/open.m:527
-#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:678
+#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:677
 msgid "Open"
 msgstr ""
 
-#: modules/gui/macosx/open.m:423 modules/gui/macosx/open.m:475
-#: modules/gui/macosx/open.m:483 modules/gui/macosx/open.m:491
+#: modules/gui/macosx/open.m:422 modules/gui/macosx/open.m:474
+#: modules/gui/macosx/open.m:482 modules/gui/macosx/open.m:490
 msgid "No %@s found"
 msgstr ""
 
-#: modules/gui/macosx/open.m:526
+#: modules/gui/macosx/open.m:525
 msgid "Open VIDEO_TS Directory"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132
+#: modules/gui/macosx/output.m:124
 msgid "Advanced output:"
 msgstr ""
 
-#: modules/gui/macosx/output.m:136
+#: modules/gui/macosx/output.m:128
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:235
-#: modules/gui/macosx/output.m:316
+#: modules/gui/macosx/output.m:131 modules/gui/macosx/output.m:225
+#: modules/gui/macosx/output.m:306
 msgid "Stream"
 msgstr ""
 
-#: modules/gui/macosx/output.m:143
+#: modules/gui/macosx/output.m:135
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:149 modules/gui/wxwindows/streamout.cpp:530
+#: modules/gui/macosx/output.m:141 modules/gui/wxwindows/streamout.cpp:531
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:150
+#: modules/gui/macosx/output.m:142
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:151 modules/gui/macosx/output.m:305
-#: modules/gui/macosx/output.m:358
+#: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:295
+#: modules/gui/macosx/output.m:348
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:152 modules/gui/macosx/output.m:307
-#: modules/gui/macosx/output.m:360
+#: modules/gui/macosx/output.m:144 modules/gui/macosx/output.m:297
+#: modules/gui/macosx/output.m:350
 msgid "MPEG1"
 msgstr ""
 
-#: modules/gui/macosx/output.m:154 modules/gui/macosx/output.m:304
-#: modules/gui/macosx/output.m:364
+#: modules/gui/macosx/output.m:146 modules/gui/macosx/output.m:294
+#: modules/gui/macosx/output.m:354
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:157
+#: modules/gui/macosx/output.m:149
 msgid "Transcode options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:161 modules/gui/macosx/output.m:167
-#: modules/gui/wxwindows/streamout.cpp:609
-#: modules/gui/wxwindows/streamout.cpp:661
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:159
+#: modules/gui/wxwindows/streamout.cpp:610
+#: modules/gui/wxwindows/streamout.cpp:662
 msgid "Bitrate (kb/s)"
 msgstr ""
 
-#: modules/gui/macosx/output.m:174 modules/gui/wxwindows/streamout.cpp:483
+#: modules/gui/macosx/output.m:166 modules/gui/wxwindows/streamout.cpp:484
 msgid "Miscellaneous Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:175
+#: modules/gui/macosx/output.m:167
 msgid "Announce streams via SAP Channel:"
 msgstr ""
 
-#: modules/gui/macosx/output.m:306 modules/gui/macosx/output.m:366
+#: modules/gui/macosx/output.m:296 modules/gui/macosx/output.m:356
 msgid "mp4"
 msgstr ""
 
@@ -4471,187 +4473,187 @@ msgstr ""
 msgid "FileInfo"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:256
+#: modules/gui/wxwindows/interface.cpp:223
 msgid "Open a DVD or (S)VCD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:257
+#: modules/gui/wxwindows/interface.cpp:224
 msgid "Open a network stream"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:258
+#: modules/gui/wxwindows/interface.cpp:225
 msgid "Open a satellite stream"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:226
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:260
+#: modules/gui/wxwindows/interface.cpp:227
 msgid "Exit this program"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:262
+#: modules/gui/wxwindows/interface.cpp:229
 msgid "Open the playlist"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:230
 msgid "Show the program logs"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:264
+#: modules/gui/wxwindows/interface.cpp:231
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:266
+#: modules/gui/wxwindows/interface.cpp:233
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:268
+#: modules/gui/wxwindows/interface.cpp:235
 msgid "About this program"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:272 modules/gui/wxwindows/menus.cpp:108
+#: modules/gui/wxwindows/interface.cpp:239 modules/gui/wxwindows/menus.cpp:108
 msgid "Simple &Open ..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:274 modules/gui/wxwindows/menus.cpp:109
+#: modules/gui/wxwindows/interface.cpp:241 modules/gui/wxwindows/menus.cpp:109
 msgid "Open &File..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:276 modules/gui/wxwindows/menus.cpp:110
+#: modules/gui/wxwindows/interface.cpp:243 modules/gui/wxwindows/menus.cpp:110
 msgid "Open &Disc..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:278 modules/gui/wxwindows/menus.cpp:111
+#: modules/gui/wxwindows/interface.cpp:245 modules/gui/wxwindows/menus.cpp:111
 msgid "Open &Network Stream..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:281
+#: modules/gui/wxwindows/interface.cpp:248
 msgid "Open &Satellite Stream..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:286
+#: modules/gui/wxwindows/interface.cpp:253
 msgid "&Eject Disc"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:290
+#: modules/gui/wxwindows/interface.cpp:257
 msgid "E&xit"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:261
 msgid "&Playlist..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:263
 msgid "&Messages..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:264
 msgid "&File info..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:269
 msgid "&Preferences..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:286
 msgid "&About..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:290
 msgid "&File"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:291
 msgid "&View"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:292
 msgid "&Settings"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:326
-#: modules/gui/wxwindows/interface.cpp:482
-#: modules/gui/wxwindows/interface.cpp:530
+#: modules/gui/wxwindows/interface.cpp:293
+#: modules/gui/wxwindows/interface.cpp:414
+#: modules/gui/wxwindows/interface.cpp:462
 msgid "&Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:327
-#: modules/gui/wxwindows/interface.cpp:501
-#: modules/gui/wxwindows/interface.cpp:534
+#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:433
+#: modules/gui/wxwindows/interface.cpp:466
 msgid "&Video"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:328
-#: modules/gui/wxwindows/interface.cpp:520
-#: modules/gui/wxwindows/interface.cpp:538
+#: modules/gui/wxwindows/interface.cpp:295
+#: modules/gui/wxwindows/interface.cpp:452
+#: modules/gui/wxwindows/interface.cpp:470
 msgid "&Navigation"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:329
+#: modules/gui/wxwindows/interface.cpp:296
 msgid "&Help"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:345
+#: modules/gui/wxwindows/interface.cpp:312
 msgid "Stop current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/wxwindows/interface.cpp:313
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:347
+#: modules/gui/wxwindows/interface.cpp:314
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:348
+#: modules/gui/wxwindows/interface.cpp:315
 #: modules/gui/wxwindows/playlist.cpp:353
 msgid "Open playlist"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:349
+#: modules/gui/wxwindows/interface.cpp:316
 msgid "Previous playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:350
+#: modules/gui/wxwindows/interface.cpp:317
 msgid "Next playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/wxwindows/interface.cpp:318
 msgid "Play slower"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:352
+#: modules/gui/wxwindows/interface.cpp:319
 msgid "Play faster"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:574
+#: modules/gui/wxwindows/interface.cpp:506
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:575
+#: modules/gui/wxwindows/interface.cpp:507
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:576
+#: modules/gui/wxwindows/interface.cpp:508
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:578
+#: modules/gui/wxwindows/interface.cpp:510
 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:582
+#: modules/gui/wxwindows/interface.cpp:514
 #, c-format
 msgid "About %s"
 msgstr ""
@@ -4688,45 +4690,49 @@ msgstr ""
 msgid "Save Messages As a file..."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:181
+#: modules/gui/wxwindows/open.cpp:177
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:198 modules/gui/wxwindows/subtitles.cpp:98
-msgid "Subtitles file"
+#: modules/gui/wxwindows/open.cpp:195
+msgid "Use VLC as a stream server"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:199
-msgid "Load an additional subtitles file. Currently only works with AVI files."
+#: modules/gui/wxwindows/open.cpp:216
+msgid "Capture input stream"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:222
-msgid "Use VLC as a stream server"
+#: modules/gui/wxwindows/open.cpp:218
+msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:242
-msgid "Capture input stream"
+#: modules/gui/wxwindows/open.cpp:348 modules/gui/wxwindows/subtitles.cpp:98
+msgid "Subtitles file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:244
-msgid "Capture the stream you are playing to a file"
+#: modules/gui/wxwindows/open.cpp:349
+msgid "Load an additional subtitles file. Currently only works with AVI files."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:383
+#: modules/gui/wxwindows/open.cpp:385
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:386
+#: modules/gui/wxwindows/open.cpp:388
 msgid "CD Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:886 modules/gui/wxwindows/streamout.cpp:785
+#: modules/gui/wxwindows/open.cpp:900 modules/gui/wxwindows/streamout.cpp:784
 msgid "Save file"
 msgstr ""
 
+#: modules/gui/wxwindows/open.cpp:953
+msgid "Advanced open options"
+msgstr ""
+
 #: modules/gui/wxwindows/playlist.cpp:116
 msgid "&Simple Add..."
 msgstr ""
@@ -4779,58 +4785,58 @@ msgstr ""
 msgid "Reset config file"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:898
+#: modules/gui/wxwindows/preferences.cpp:901
 msgid "No configuration options available"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:919
+#: modules/gui/wxwindows/preferences.cpp:922
 msgid "Advanced options"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:190
+#: modules/gui/wxwindows/streamout.cpp:186
 msgid "Stream output MRL"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:194
+#: modules/gui/wxwindows/streamout.cpp:190
 msgid "Destination Target:"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:197
+#: modules/gui/wxwindows/streamout.cpp:193
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:377
+#: modules/gui/wxwindows/streamout.cpp:378
 msgid "Output Methods"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:383
+#: modules/gui/wxwindows/streamout.cpp:384
 msgid "Play locally"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:407
+#: modules/gui/wxwindows/streamout.cpp:408
 msgid "Filename"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:495
+#: modules/gui/wxwindows/streamout.cpp:496
 msgid "SAP Announce"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:497
+#: modules/gui/wxwindows/streamout.cpp:498
 msgid "Channel Name "
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:569
+#: modules/gui/wxwindows/streamout.cpp:570
 msgid "Transcoding options"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:602
+#: modules/gui/wxwindows/streamout.cpp:603
 msgid "Video codec"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:649
+#: modules/gui/wxwindows/streamout.cpp:650
 msgid "Audio codec"
 msgstr ""
 
@@ -4915,27 +4921,27 @@ msgstr ""
 msgid "Using the dummy interface plugin..."
 msgstr ""
 
-#: modules/misc/freetype.c:65 modules/visualization/xosd/xosd.c:71
+#: modules/misc/freetype.c:67 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr ""
 
-#: modules/misc/freetype.c:66
+#: modules/misc/freetype.c:68
 msgid "Filename of Font"
 msgstr ""
 
-#: modules/misc/freetype.c:67
+#: modules/misc/freetype.c:69
 msgid "Font size"
 msgstr ""
 
-#: modules/misc/freetype.c:68
+#: modules/misc/freetype.c:70
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/misc/freetype.c:71
+#: modules/misc/freetype.c:73
 msgid "Fonts"
 msgstr ""
 
-#: modules/misc/freetype.c:74
+#: modules/misc/freetype.c:76
 msgid "freetype2 font renderer"
 msgstr ""
 
@@ -4972,6 +4978,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 ""
@@ -4988,10 +4998,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 ""
diff --git a/share/Makefile.am b/share/Makefile.am
index 6b38ca04d2..4198f5783d 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -13,7 +13,9 @@ dist_pkgdata_DATA = \
 	$(NULL)
 
 nobase_dist_pkgdata_DATA = \
-	$(DIST_skins)
+	$(DIST_skins) \
+	$(DIST_http) \
+	$(NULL)
 
 DIST_fonts = \
 	$(NULL)
@@ -122,5 +124,13 @@ DIST_skins = \
 	skins/default/pause4.bmp \
 	skins/default/playlist3.bmp \
 	skins/default/prev3.bmp \
-	skins/default/stop1.bmp
+	skins/default/stop1.bmp \
+	$(NULL)
 
+DIST_http = \
+	http/index.html \
+	http/info.html \
+	http/admin/index.html \
+	http/admin/browse.html \
+	http/admin/.access \
+	$(NULL)