Fix faad contrib on Mac OS X

[vlc] / po / en_GB.po

diff --git a/po/en_GB.po b/po/en_GB.po
index e06e2d1485ca2c92ece4a2a94e040ded423d11f9..723d3dc649954e565781451eee7e18e9a786ca63 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -16,11 +16,14 @@
 #
 # See also http://www.gsu.edu/~wwwesl/egw/jones/spelling.htm
 #
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:371
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:377
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:387
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-26 16:46+0200\n"
+"POT-Creation-Date: 2005-11-30 19:46+0000\n"
 "PO-Revision-Date: 2002-04-22 09:56+0200\n"
 "Last-Translator: Sam Hocevar <sam@zoy.org>\n"
 "Language-Team: \n"
@@ -36,14 +39,14 @@ msgstr "VLC preferences"
 msgid "Click on \"Advanced Options\" to see all options."
 msgstr ""
 
-#: include/vlc_config_cat.h:36 src/input/input.c:1820 src/input/input.c:1880
-#: src/playlist/item.c:366 src/playlist/playlist.c:164
-#: modules/gui/wince/playlist.cpp:674
-#: modules/visualization/visual/visual.c:111
+#: include/vlc_config_cat.h:36 include/vlc_config_cat.h:122
+#: src/input/input.c:1868 src/input/input.c:1928 src/playlist/item.c:366
+#: src/playlist/playlist.c:164 modules/gui/wince/playlist.cpp:674
+#: modules/visualization/visual/visual.c:113
 msgid "General"
 msgstr ""
 
-#: include/vlc_config_cat.h:39 src/libvlc.h:1313 modules/misc/dummy/dummy.c:67
+#: include/vlc_config_cat.h:39 src/libvlc.h:1351 modules/misc/dummy/dummy.c:67
 msgid "Interface"
 msgstr ""
 
@@ -71,11 +74,12 @@ msgstr "Interface plugins settings"
 msgid "Hotkeys settings"
 msgstr "Audio encoders settings"
 
-#: include/vlc_config_cat.h:51 src/input/es_out.c:1546 src/libvlc.h:949
-#: modules/gui/beos/InterfaceWindow.cpp:263 modules/gui/macosx/extended.m:81
-#: modules/gui/macosx/intf.m:516 modules/gui/macosx/output.m:170
-#: modules/gui/macosx/wizard.m:400 modules/gui/wxwidgets/extrapanel.cpp:180
-#: modules/gui/wxwidgets/wizard.cpp:849 modules/stream_out/transcode.c:214
+#: include/vlc_config_cat.h:51 src/input/es_out.c:1546 src/libvlc.h:987
+#: modules/gui/beos/InterfaceWindow.cpp:280 modules/gui/macosx/extended.m:81
+#: modules/gui/macosx/intf.m:505 modules/gui/macosx/output.m:170
+#: modules/gui/macosx/wizard.m:404
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:855
+#: modules/gui/wxwidgets/extrapanel.cpp:181 modules/stream_out/transcode.c:214
 msgid "Audio"
 msgstr "Audio"
 
@@ -90,7 +94,7 @@ msgid "General audio settings"
 msgstr "General settings"
 
 #: include/vlc_config_cat.h:57 include/vlc_config_cat.h:82
-#: src/video_output/video_output.c:462
+#: src/video_output/video_output.c:398
 msgid "Filters"
 msgstr ""
 
@@ -98,12 +102,12 @@ msgstr ""
 msgid "Audio filters are used to postprocess the audio stream"
 msgstr ""
 
-#: include/vlc_config_cat.h:61 src/audio_output/input.c:77
-#: modules/gui/macosx/intf.m:526 modules/gui/macosx/intf.m:527
+#: include/vlc_config_cat.h:61 src/audio_output/input.c:78
+#: modules/gui/macosx/intf.m:515 modules/gui/macosx/intf.m:516
 msgid "Visualizations"
 msgstr "Visualisations"
 
-#: include/vlc_config_cat.h:63 src/audio_output/input.c:151
+#: include/vlc_config_cat.h:63 src/audio_output/input.c:152
 msgid "Audio visualizations"
 msgstr "Audio visualisations"
 
@@ -115,8 +119,8 @@ msgstr "Output modules"
 msgid "These are general settings for audio output modules."
 msgstr "These are general settings for audio output modules."
 
-#: include/vlc_config_cat.h:68 src/libvlc.h:1244 src/libvlc.h:1282
-#: src/libvlc.h:1324 modules/gui/wxwidgets/menus.cpp:310
+#: include/vlc_config_cat.h:68 src/libvlc.h:1282 src/libvlc.h:1320
+#: src/libvlc.h:1362 modules/gui/wxwidgets/menus.cpp:311
 #: modules/stream_out/transcode.c:243
 msgid "Miscellaneous"
 msgstr ""
@@ -125,11 +129,11 @@ msgstr ""
 msgid "Miscellaneous audio settings and modules"
 msgstr ""
 
-#: include/vlc_config_cat.h:72 src/input/es_out.c:1568 src/libvlc.h:984
-#: modules/gui/macosx/extended.m:80 modules/gui/macosx/intf.m:529
-#: modules/gui/macosx/output.m:160 modules/gui/macosx/wizard.m:401
-#: modules/gui/wxwidgets/extrapanel.cpp:178
-#: modules/gui/wxwidgets/wizard.cpp:810 modules/misc/dummy/dummy.c:97
+#: include/vlc_config_cat.h:72 src/input/es_out.c:1568 src/libvlc.h:1022
+#: modules/gui/macosx/extended.m:80 modules/gui/macosx/intf.m:518
+#: modules/gui/macosx/output.m:160 modules/gui/macosx/wizard.m:405
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:816
+#: modules/gui/wxwidgets/extrapanel.cpp:179 modules/misc/dummy/dummy.c:97
 #: modules/stream_out/transcode.c:174
 msgid "Video"
 msgstr "Video"
@@ -188,70 +192,72 @@ msgid "Access modules"
 msgstr "Access modules"
 
 #: include/vlc_config_cat.h:100
+#, fuzzy
 msgid ""
-"Settings related to the various access methods used by VLC.\n"
-"Common settings you may want to alter are HTTP proxy or caching settings."
+"Settings related to the various access methods used by VLC. Common settings "
+"you may want to alter are HTTP proxy or caching settings."
 msgstr ""
 "Settings related to the various access methods used by VLC.\n"
 "Common settings you may want to alter are HTTP proxy or caching settings."
 
 #: include/vlc_config_cat.h:104
-msgid "Access filter modules"
+#, fuzzy
+msgid "Access filters"
 msgstr "Access filter modules"
 
 #: include/vlc_config_cat.h:106
-msgid "Settings related to the various access filter used by VLC.\n"
+msgid ""
+"Access filters are special modules that allow advanced operations on the "
+"input side of VLC. You should not touch anything here unless you know what "
+"you are doing.\n"
 msgstr ""
 
-#: include/vlc_config_cat.h:108
+#: include/vlc_config_cat.h:110
 msgid "Demuxers"
 msgstr "Demuxers"
 
-#: include/vlc_config_cat.h:109
+#: include/vlc_config_cat.h:111
 msgid "Demuxers are used to separate audio and video streams"
 msgstr ""
 
-#: include/vlc_config_cat.h:111
+#: include/vlc_config_cat.h:113
 msgid "Video codecs"
 msgstr "Video codecs"
 
-#: include/vlc_config_cat.h:112
+#: include/vlc_config_cat.h:114
 msgid "Settings for the video-only decoders and encoders"
 msgstr ""
 
-#: include/vlc_config_cat.h:114
+#: include/vlc_config_cat.h:116
 #, fuzzy
 msgid "Audio codecs"
 msgstr "Audio encoder"
 
-#: include/vlc_config_cat.h:115
+#: include/vlc_config_cat.h:117
 msgid "Settings for the audio-only decoders and encoders"
 msgstr ""
 
-#: include/vlc_config_cat.h:117
+#: include/vlc_config_cat.h:119
 #, fuzzy
 msgid "Other codecs"
 msgstr "Stereo"
 
-#: include/vlc_config_cat.h:118
+#: include/vlc_config_cat.h:120
 msgid "Settings for audio+video and miscellaneous decoders and encoders"
 msgstr ""
 
-#: include/vlc_config_cat.h:120 include/vlc_config_cat.h:178 src/libvlc.h:1173
-#: modules/gui/macosx/prefs.m:124
-msgid "Advanced"
-msgstr ""
-
-#: include/vlc_config_cat.h:121
-msgid "Advanced input settings. Use with care."
-msgstr ""
+#: include/vlc_config_cat.h:123
+#, fuzzy
+msgid "General input settings. Use with care."
+msgstr "General settings"
 
-#: include/vlc_config_cat.h:124 src/libvlc.h:1192
-#: modules/gui/wxwidgets/open.cpp:453 modules/gui/wxwidgets/streamout.cpp:158
+#: include/vlc_config_cat.h:126 src/libvlc.h:1230
+#: modules/gui/wxwidgets/dialogs/open.cpp:448
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:152
 msgid "Stream output"
 msgstr ""
 
-#: include/vlc_config_cat.h:126
+#: include/vlc_config_cat.h:128
 msgid ""
 "Stream output is what allows VLC to act as a streaming server or to save "
 "incoming streams.\n"
@@ -262,16 +268,16 @@ msgid ""
 "duplicating, ..."
 msgstr ""
 
-#: include/vlc_config_cat.h:134
+#: include/vlc_config_cat.h:136
 #, fuzzy
 msgid "General stream output settings"
 msgstr "Keep stream output open"
 
-#: include/vlc_config_cat.h:136
+#: include/vlc_config_cat.h:138
 msgid "Muxers"
 msgstr ""
 
-#: include/vlc_config_cat.h:137
+#: include/vlc_config_cat.h:139
 msgid ""
 "Muxers are the encapsulation formats that are used to put all the elementary "
 "streams (video, audio, ...) together. This setting allows you to always "
@@ -279,23 +285,23 @@ msgid ""
 "You can also set default parameters for each muxer."
 msgstr ""
 
-#: include/vlc_config_cat.h:142
+#: include/vlc_config_cat.h:144
 #, fuzzy
 msgid "Access output"
 msgstr "UDP stream output"
 
-#: include/vlc_config_cat.h:143
+#: include/vlc_config_cat.h:145
 msgid ""
 "Access output are the ways the muxed streams are sent. This setting allows "
 "you to always force an access output. You should probably not do that.\n"
 "You can also set default parameters for each access output."
 msgstr ""
 
-#: include/vlc_config_cat.h:148
+#: include/vlc_config_cat.h:150
 msgid "Packetizers"
 msgstr "Packetisers"
 
-#: include/vlc_config_cat.h:149
+#: include/vlc_config_cat.h:151
 msgid ""
 "Packetizers are used to \"preprocess\" the elementary streams before muxing. "
 "This setting allows you to always force a packetizer. You should probably "
@@ -303,144 +309,149 @@ msgid ""
 "You can also set default parameters for each packetizer."
 msgstr ""
 
-#: include/vlc_config_cat.h:155
+#: include/vlc_config_cat.h:157
 msgid "Sout stream"
 msgstr "Sout stream"
 
-#: include/vlc_config_cat.h:156
+#: include/vlc_config_cat.h:158
 msgid ""
 "Sout stream modules allow to build a sout processing chain. Please refer to "
 "the Streaming Howto for more information. You can configure default options "
 "for each sout stream module here."
 msgstr ""
 
-#: include/vlc_config_cat.h:161 modules/services_discovery/sap.c:118
-#: modules/services_discovery/sap.c:338
+#: include/vlc_config_cat.h:163 modules/services_discovery/sap.c:117
 #, fuzzy
 msgid "SAP"
 msgstr "SDP"
 
-#: include/vlc_config_cat.h:162
+#: include/vlc_config_cat.h:164
 msgid ""
 "SAP is a way to publically announce streams that are being sent using "
 "multicast UDP or RTP."
 msgstr ""
 
-#: include/vlc_config_cat.h:165
+#: include/vlc_config_cat.h:167
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:66
 msgid "VOD"
 msgstr ""
 
-#: include/vlc_config_cat.h:166
+#: include/vlc_config_cat.h:168
 msgid "VLC's implementation of Video On Demand"
 msgstr ""
 
-#: include/vlc_config_cat.h:170 src/libvlc.h:1294
-#: modules/demux/playlist/playlist.c:48
-#: modules/gui/beos/InterfaceWindow.cpp:213
-#: modules/gui/beos/InterfaceWindow.cpp:305 modules/gui/macosx/intf.m:461
-#: modules/gui/macosx/intf.m:555 modules/gui/pda/pda_interface.c:1264
-#: modules/gui/wxwidgets/interface.cpp:492
-#: modules/gui/wxwidgets/playlist.cpp:196
+#: include/vlc_config_cat.h:172 src/libvlc.h:1332
+#: modules/demux/playlist/playlist.c:48 modules/demux/playlist/playlist.c:49
+#: modules/gui/beos/InterfaceWindow.cpp:230
+#: modules/gui/beos/InterfaceWindow.cpp:322 modules/gui/macosx/intf.m:450
+#: modules/gui/macosx/intf.m:544 modules/gui/pda/pda_interface.c:1264
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:195
+#: modules/gui/wxwidgets/interface.cpp:556
 msgid "Playlist"
 msgstr ""
 
-#: include/vlc_config_cat.h:171
+#: include/vlc_config_cat.h:173
 msgid ""
 "Settings related to playlist behaviour (playback mode, for example) and to "
 "modules that automatically add items to the playlist ('service discovery "
 "modules'"
 msgstr ""
 
-#: include/vlc_config_cat.h:173
+#: include/vlc_config_cat.h:175
 msgid "General playlist behaviour"
 msgstr ""
 
-#: include/vlc_config_cat.h:174 modules/gui/macosx/playlist.m:508
-#: modules/gui/wxwidgets/playlist.cpp:233
+#: include/vlc_config_cat.h:176 modules/gui/macosx/playlist.m:508
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:233
 #, fuzzy
 msgid "Services discovery"
 msgstr "Choose directory"
 
-#: include/vlc_config_cat.h:175
+#: include/vlc_config_cat.h:177
 msgid ""
 "Services discovery modules are modules that automatically add items to "
 "playlist"
 msgstr ""
 
-#: include/vlc_config_cat.h:179
-msgid "Advanced settings. Use with care."
+#: include/vlc_config_cat.h:180 src/libvlc.h:1194
+#: modules/gui/macosx/prefs.m:124
+msgid "Advanced"
 msgstr ""
 
 #: include/vlc_config_cat.h:181
+msgid "Advanced settings. Use with care."
+msgstr ""
+
+#: include/vlc_config_cat.h:183
 msgid "CPU features"
 msgstr ""
 
-#: include/vlc_config_cat.h:182
+#: include/vlc_config_cat.h:184
 msgid ""
 "From here you can choose to disable some CPU accelerations. You should "
 "probably not touch that."
 msgstr ""
 
-#: include/vlc_config_cat.h:184 modules/demux/util/id3genres.h:40
+#: include/vlc_config_cat.h:186 modules/demux/util/id3genres.h:40
 msgid "Other"
 msgstr ""
 
-#: include/vlc_config_cat.h:185
+#: include/vlc_config_cat.h:187
 #, fuzzy
 msgid "Other advanced settings"
 msgstr "Advanced options"
 
-#: include/vlc_config_cat.h:187 modules/gui/macosx/open.m:162
+#: include/vlc_config_cat.h:189 modules/gui/macosx/open.m:162
 #: modules/gui/macosx/open.m:379 modules/gui/pda/pda_interface.c:548
-#: modules/gui/wxwidgets/open.cpp:511
+#: modules/gui/wxwidgets/dialogs/open.cpp:506
 msgid "Network"
 msgstr ""
 
-#: include/vlc_config_cat.h:188
+#: include/vlc_config_cat.h:190
 msgid "These modules provide network functions to all other parts of VLC"
 msgstr ""
 
-#: include/vlc_config_cat.h:193
+#: include/vlc_config_cat.h:195
 msgid "Chroma modules settings"
 msgstr "Chroma modules settings"
 
-#: include/vlc_config_cat.h:194
+#: include/vlc_config_cat.h:196
 msgid "These settings affect chroma transformation modules."
 msgstr "These settings affect chroma transformation modules."
 
-#: include/vlc_config_cat.h:196
+#: include/vlc_config_cat.h:198
 #, fuzzy
 msgid "Packetizer modules settings"
 msgstr "Decoder modules settings"
 
-#: include/vlc_config_cat.h:197 include/vlc_config_cat.h:215
+#: include/vlc_config_cat.h:199 include/vlc_config_cat.h:217
 msgid " "
 msgstr " "
 
-#: include/vlc_config_cat.h:199
+#: include/vlc_config_cat.h:201
 #, fuzzy
 msgid "Encoders settings"
 msgstr "Audio encoders settings"
 
-#: include/vlc_config_cat.h:201
+#: include/vlc_config_cat.h:203
 #, fuzzy
 msgid "These are general settings for video/audio/subtitles encoding modules."
 msgstr "These are general settings for audio encoding modules."
 
-#: include/vlc_config_cat.h:205
+#: include/vlc_config_cat.h:207
 #, fuzzy
 msgid "Dialog providers settings"
 msgstr "Audio encoders settings"
 
-#: include/vlc_config_cat.h:207
+#: include/vlc_config_cat.h:209
 msgid "Dialog providers can be configured here."
 msgstr ""
 
-#: include/vlc_config_cat.h:209
+#: include/vlc_config_cat.h:211
 msgid "Subtitle demuxer settings"
 msgstr "Subtitle demuxer settings"
 
-#: include/vlc_config_cat.h:211
+#: include/vlc_config_cat.h:213
 msgid ""
 "In this section you can force the behavior of the subtitle demuxer, for "
 "example by setting the subtitles type or file name."
@@ -448,15 +459,15 @@ msgstr ""
 "In this section you can force the behaviour of the subtitle demuxer, for "
 "example by setting the subtitles type or file name."
 
-#: include/vlc_config_cat.h:214
+#: include/vlc_config_cat.h:216
 msgid "Video filters settings"
 msgstr "Video filters settings"
 
-#: include/vlc_config_cat.h:221
+#: include/vlc_config_cat.h:223
 msgid "No help available"
 msgstr "No help available"
 
-#: include/vlc_config_cat.h:222
+#: include/vlc_config_cat.h:224
 msgid "No help is available for these modules"
 msgstr "No help is available for these modules"
 
@@ -470,39 +481,18 @@ msgstr ""
 "Warning: if you can't access the GUI anymore, open a dos command box, go to "
 "the directory where you installed VLC and run \"vlc -I wxwin\"\n"
 
-#: include/vlc_interface.h:166
-#, fuzzy
-msgid ""
-"VLC is an open-source and cross-platform multimedia player for various audio "
-"and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, Ogg, etc.) as well as "
-"DVDs, VCDs, CD audio, and various streaming protocols.\n"
-"\n"
-"VLC is also a streaming server with transcoding capabilities (UDP unicast "
-"and multicast, HTTP, etc.) mainly designed for high-bandwidth networks.\n"
-"\n"
-"For more information, have a look at the web site."
-msgstr ""
-"VLC is an open-source and cross-platform multimedia player for various audio "
-"and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, Ogg, …) as well as "
-"DVDs, VCDs, CD audio, and various streaming protocols.\n"
-"\n"
-"VLC is also a streaming server with transcoding capabilities (UDP unicast "
-"and multicast, HTTP, …) mainly designed for high-bandwidth networks.\n"
-"\n"
-"For more information, have a look at the web site."
-
-#: include/vlc_meta.h:28 src/input/var.c:140
-#: modules/gui/beos/MediaControlView.cpp:1233 modules/gui/macosx/intf.m:511
-#: modules/gui/macosx/intf.m:512 modules/gui/macosx/open.m:168
-#: modules/gui/macosx/playlistinfo.m:55 modules/gui/macosx/wizard.m:370
-#: modules/gui/wxwidgets/open.cpp:740 modules/gui/wxwidgets/open.cpp:1599
-#: modules/mux/asf.c:48
+#: include/vlc_meta.h:28 src/input/var.c:136 modules/demux/mpc.c:53
+#: modules/gui/beos/MediaControlView.cpp:1233 modules/gui/macosx/intf.m:500
+#: modules/gui/macosx/intf.m:501 modules/gui/macosx/open.m:168
+#: modules/gui/macosx/playlistinfo.m:55 modules/gui/macosx/wizard.m:374
+#: modules/gui/wxwidgets/dialogs/open.cpp:735
+#: modules/gui/wxwidgets/dialogs/open.cpp:1598 modules/mux/asf.c:48
 msgid "Title"
 msgstr "Title"
 
-#: include/vlc_meta.h:29 src/input/input.c:1821
+#: include/vlc_meta.h:29 src/input/input.c:1869
 #: modules/gui/macosx/playlistinfo.m:56 modules/gui/macosx/playlist.m:133
-#: modules/gui/macosx/wizard.m:372 modules/gui/wince/playlist.cpp:674
+#: modules/gui/macosx/wizard.m:376 modules/gui/wince/playlist.cpp:674
 #: modules/mux/asf.c:51
 msgid "Author"
 msgstr "Author"
@@ -511,7 +501,8 @@ msgstr "Author"
 #: src/playlist/sort.c:328 modules/codec/vorbis.c:624
 #: modules/demux/playlist/m3u.c:210 modules/gui/macosx/playlistinfo.m:118
 #: modules/gui/macosx/playlistinfo.m:152 modules/gui/macosx/playlist.m:316
-#: modules/gui/macosx/playlist.m:1245 modules/gui/wxwidgets/playlist.cpp:492
+#: modules/gui/macosx/playlist.m:1245
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:496
 #: modules/misc/playlist/m3u.c:68 modules/services_discovery/daap.c:608
 msgid "Artist"
 msgstr "Artist"
@@ -525,7 +516,7 @@ msgid "Copyright"
 msgstr "Copyright"
 
 #: include/vlc_meta.h:33 modules/gui/macosx/bookmarks.m:99
-#: modules/gui/wxwidgets/bookmarks.cpp:257
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:195
 msgid "Description"
 msgstr "Description"
 
@@ -542,12 +533,12 @@ msgid "Setting"
 msgstr "Setting"
 
 #: include/vlc_meta.h:37 modules/gui/macosx/open.m:181
-#: modules/gui/wxwidgets/open.cpp:854
+#: modules/gui/wxwidgets/dialogs/open.cpp:849
 msgid "URL"
 msgstr "URL"
 
 #: include/vlc_meta.h:38 src/input/es_out.c:1538 src/libvlc.h:81
-#: modules/gui/beos/InterfaceWindow.cpp:259
+#: modules/gui/beos/InterfaceWindow.cpp:276
 msgid "Language"
 msgstr "Language"
 
@@ -648,65 +639,77 @@ msgstr "Codec Name"
 msgid "Codec Description"
 msgstr "Codec Description"
 
-#: src/audio_output/input.c:79 src/audio_output/input.c:125
-#: src/input/es_out.c:355 src/libvlc.h:320 src/video_output/video_output.c:438
+#: include/vlc/vlc.h:576
+msgid ""
+"This program comes with NO WARRANTY, to the extent permitted by law.\n"
+"You may redistribute it under the terms of the GNU General Public License;\n"
+"see the file named COPYING for details.\n"
+"Written by the VideoLAN team; see the AUTHORS file.\n"
+msgstr ""
+"This program comes with NO WARRANTY, to the extent permitted by law.\n"
+"You may redistribute it under the terms of the GNU General Public Licence;\n"
+"see the file named COPYING for details.\n"
+"Written by the VideoLAN team; see the AUTHORS file.\n"
+
+#: src/audio_output/input.c:80 src/audio_output/input.c:126
+#: src/input/es_out.c:355 src/libvlc.h:337 src/video_output/video_output.c:374
 #: modules/codec/ffmpeg/postprocess.c:94
 msgid "Disable"
 msgstr "Disable"
 
-#: src/audio_output/input.c:81 modules/visualization/visual/visual.c:127
+#: src/audio_output/input.c:82 modules/visualization/visual/visual.c:129
 #, fuzzy
 msgid "Spectrometer"
 msgstr "Spectrum"
 
-#: src/audio_output/input.c:83
+#: src/audio_output/input.c:84
 msgid "Scope"
 msgstr "Scope"
 
-#: src/audio_output/input.c:85
+#: src/audio_output/input.c:86
 msgid "Spectrum"
 msgstr "Spectrum"
 
-#: src/audio_output/input.c:122 modules/audio_filter/equalizer.c:66
+#: src/audio_output/input.c:123 modules/audio_filter/equalizer.c:66
 #: modules/gui/macosx/equalizer.m:140 modules/gui/macosx/equalizer.m:154
-#: modules/gui/macosx/intf.m:552 modules/gui/wxwidgets/extrapanel.cpp:179
+#: modules/gui/macosx/intf.m:541 modules/gui/wxwidgets/extrapanel.cpp:180
 msgid "Equalizer"
 msgstr "Equaliser"
 
-#: src/audio_output/input.c:144 src/libvlc.h:170
-#: modules/gui/macosx/extended.m:82 modules/gui/wxwidgets/extrapanel.cpp:392
+#: src/audio_output/input.c:145 src/libvlc.h:173
+#: modules/gui/macosx/extended.m:82 modules/gui/wxwidgets/extrapanel.cpp:393
 msgid "Audio filters"
 msgstr "Audio filters"
 
 #: src/audio_output/output.c:102 src/audio_output/output.c:129
-#: modules/access/vcdx/info.c:118 modules/gui/macosx/intf.m:522
-#: modules/gui/macosx/intf.m:523
+#: modules/access/vcdx/info.c:118 modules/gui/macosx/intf.m:511
+#: modules/gui/macosx/intf.m:512
 msgid "Audio Channels"
 msgstr "Audio Channels"
 
 #: src/audio_output/output.c:105 src/audio_output/output.c:140
-#: modules/access/v4l/v4l.c:125 modules/audio_output/alsa.c:190
-#: modules/audio_output/alsa.c:221 modules/audio_output/directx.c:476
+#: modules/access/v4l/v4l.c:125 modules/audio_output/alsa.c:191
+#: modules/audio_output/alsa.c:222 modules/audio_output/directx.c:467
 #: modules/audio_output/oss.c:205 modules/audio_output/portaudio.c:408
 #: modules/audio_output/sdl.c:184 modules/audio_output/sdl.c:201
-#: modules/audio_output/waveout.c:403
+#: modules/audio_output/waveout.c:420 modules/codec/twolame.c:66
 msgid "Stereo"
 msgstr "Stereo"
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:143
-#: src/libvlc.h:229 modules/codec/dvbsub.c:70 modules/codec/subsdec.c:84
+#: src/libvlc.h:232 modules/codec/dvbsub.c:70 modules/codec/subsdec.c:84
 #: modules/control/gestures.c:87 modules/video_filter/logo.c:85
 #: modules/video_filter/marq.c:106 modules/video_filter/mosaic.c:120
-#: modules/video_filter/osdmenu.c:76 modules/video_filter/rss.c:144
+#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:144
 #: modules/video_filter/time.c:96
 msgid "Left"
 msgstr "Left"
 
 #: src/audio_output/output.c:109 src/audio_output/output.c:145
-#: src/libvlc.h:229 modules/codec/dvbsub.c:70 modules/codec/subsdec.c:84
+#: src/libvlc.h:232 modules/codec/dvbsub.c:70 modules/codec/subsdec.c:84
 #: modules/control/gestures.c:87 modules/video_filter/logo.c:85
 #: modules/video_filter/marq.c:106 modules/video_filter/mosaic.c:120
-#: modules/video_filter/osdmenu.c:76 modules/video_filter/rss.c:144
+#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:144
 #: modules/video_filter/time.c:96
 msgid "Right"
 msgstr "Right"
@@ -787,21 +790,29 @@ msgid "Track %i"
 msgstr ""
 
 #: src/input/es_out.c:456 src/input/es_out.c:458 src/input/es_out.c:558
-#: src/input/es_out.c:565 src/input/var.c:129 modules/gui/macosx/intf.m:509
-#: modules/gui/macosx/intf.m:510
+#: src/input/es_out.c:565 src/input/var.c:125 modules/gui/macosx/intf.m:498
+#: modules/gui/macosx/intf.m:499
 msgid "Program"
 msgstr "Programme"
 
-#: src/input/es_out.c:459 src/input/es_out.c:627 src/input/input.c:222
-#: src/input/input.c:1823 src/playlist/sort.c:190 src/playlist/sort.c:193
+#: src/input/es_out.c:459 src/input/es_out.c:627 src/input/input.c:223
+#: src/input/input.c:1871 src/playlist/sort.c:190 src/playlist/sort.c:193
 #: src/playlist/sort.c:233 src/playlist/sort.c:236 src/playlist/sort.c:328
 #: src/playlist/sort.c:333 src/playlist/sort.c:338 modules/codec/vorbis.c:623
 #: modules/demux/playlist/b4s.c:324 modules/demux/playlist/b4s.c:332
 #: modules/demux/playlist/b4s.c:340 modules/demux/playlist/b4s.c:348
-#: modules/demux/playlist/m3u.c:209 modules/gui/macosx/playlistinfo.m:118
-#: modules/gui/macosx/playlistinfo.m:152 modules/gui/macosx/playlist.m:316
-#: modules/gui/macosx/playlist.m:1245 modules/gui/wxwidgets/playlist.cpp:491
-#: modules/gui/wxwidgets/timer.cpp:138 modules/gui/wxwidgets/timer.cpp:201
+#: modules/demux/playlist/m3u.c:209 modules/demux/playlist/podcast.c:289
+#: modules/demux/playlist/podcast.c:298 modules/demux/playlist/podcast.c:307
+#: modules/demux/playlist/podcast.c:316 modules/demux/playlist/podcast.c:325
+#: modules/demux/playlist/podcast.c:335 modules/demux/playlist/podcast.c:372
+#: modules/demux/playlist/podcast.c:380 modules/demux/playlist/podcast.c:388
+#: modules/demux/playlist/podcast.c:396 modules/demux/playlist/podcast.c:404
+#: modules/demux/playlist/podcast.c:412 modules/demux/playlist/podcast.c:420
+#: modules/demux/playlist/podcast.c:428 modules/demux/playlist/podcast.c:436
+#: modules/gui/macosx/playlistinfo.m:118 modules/gui/macosx/playlistinfo.m:152
+#: modules/gui/macosx/playlist.m:316 modules/gui/macosx/playlist.m:1245
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:495
+#: modules/gui/wxwidgets/main_slider_manager.cpp:72
 #: modules/misc/playlist/m3u.c:68 modules/services_discovery/daap.c:607
 #: modules/services_discovery/daap.c:609
 msgid "Meta-information"
@@ -812,8 +823,9 @@ msgstr ""
 msgid "Stream %d"
 msgstr "Stream %d"
 
-#: src/input/es_out.c:1535 modules/gui/macosx/wizard.m:405
-#: modules/gui/wxwidgets/wizard.cpp:819 modules/gui/wxwidgets/wizard.cpp:859
+#: src/input/es_out.c:1535 modules/gui/macosx/wizard.m:409
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:825
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:865
 msgid "Codec"
 msgstr "Codec"
 
@@ -823,7 +835,7 @@ msgid "Type"
 msgstr "Type"
 
 #: src/input/es_out.c:1549 modules/gui/macosx/output.m:176
-#: modules/gui/wxwidgets/streamout.cpp:821
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:855
 msgid "Channels"
 msgstr "Channels"
 
@@ -840,7 +852,7 @@ msgstr "%d Hz"
 msgid "Bits per sample"
 msgstr "Bits per sample"
 
-#: src/input/es_out.c:1562 modules/access/pvr/pvr.c:80
+#: src/input/es_out.c:1562 modules/access/pvr/pvr.c:83
 #: modules/demux/playlist/b4s.c:349
 msgid "Bitrate"
 msgstr "Bitrate"
@@ -866,77 +878,77 @@ msgstr "Frame rate"
 msgid "Subtitle"
 msgstr ""
 
-#: src/input/input.c:1834 src/input/input.c:1838
+#: src/input/input.c:1882 src/input/input.c:1886
 #: modules/gui/macosx/output.m:143 modules/gui/macosx/output.m:253
 #: modules/gui/macosx/output.m:395
 msgid "Stream"
 msgstr ""
 
-#: src/input/input.c:1880 src/playlist/item.c:366
+#: src/input/input.c:1928 src/playlist/item.c:366
 #: modules/access/cdda/info.c:325 modules/access/cdda/info.c:393
 #: modules/gui/macosx/playlist.m:134
 msgid "Duration"
 msgstr ""
 
-#: src/input/var.c:118
+#: src/input/var.c:115
 msgid "Bookmark"
 msgstr ""
 
-#: src/input/var.c:135
+#: src/input/var.c:131
 msgid "Programs"
 msgstr "Programmes"
 
-#: src/input/var.c:146 modules/gui/beos/MediaControlView.cpp:1234
-#: modules/gui/macosx/intf.m:513 modules/gui/macosx/intf.m:514
-#: modules/gui/macosx/open.m:169 modules/gui/wxwidgets/open.cpp:745
+#: src/input/var.c:142 modules/gui/beos/MediaControlView.cpp:1234
+#: modules/gui/macosx/intf.m:502 modules/gui/macosx/intf.m:503
+#: modules/gui/macosx/open.m:169 modules/gui/wxwidgets/dialogs/open.cpp:740
 msgid "Chapter"
 msgstr ""
 
-#: src/input/var.c:152 modules/access/vcdx/info.c:302
-#: modules/access/vcdx/info.c:303 modules/gui/beos/InterfaceWindow.cpp:274
+#: src/input/var.c:148 modules/access/vcdx/info.c:302
+#: modules/access/vcdx/info.c:303 modules/gui/beos/InterfaceWindow.cpp:291
 msgid "Navigation"
 msgstr ""
 
-#: src/input/var.c:168 modules/gui/macosx/intf.m:537
-#: modules/gui/macosx/intf.m:538
+#: src/input/var.c:163 modules/gui/macosx/intf.m:526
+#: modules/gui/macosx/intf.m:527
 msgid "Video Track"
 msgstr ""
 
-#: src/input/var.c:174 modules/gui/macosx/intf.m:520
-#: modules/gui/macosx/intf.m:521
+#: src/input/var.c:169 modules/gui/macosx/intf.m:509
+#: modules/gui/macosx/intf.m:510
 msgid "Audio Track"
 msgstr ""
 
-#: src/input/var.c:180 modules/gui/macosx/intf.m:541
-#: modules/gui/macosx/intf.m:542
+#: src/input/var.c:175 modules/gui/macosx/intf.m:530
+#: modules/gui/macosx/intf.m:531
 msgid "Subtitles Track"
 msgstr "Subtitles Track"
 
-#: src/input/var.c:263
+#: src/input/var.c:256
 msgid "Next title"
 msgstr ""
 
-#: src/input/var.c:268
+#: src/input/var.c:261
 msgid "Previous title"
 msgstr ""
 
-#: src/input/var.c:291
+#: src/input/var.c:284
 #, c-format
 msgid "Title %i"
 msgstr ""
 
-#: src/input/var.c:314 src/input/var.c:374
+#: src/input/var.c:307 src/input/var.c:367
 #, c-format
 msgid "Chapter %i"
 msgstr ""
 
-#: src/input/var.c:353 modules/gui/beos/InterfaceWindow.cpp:271
-#: modules/gui/wxwidgets/timer.cpp:225
+#: src/input/var.c:346 modules/gui/beos/InterfaceWindow.cpp:288
+#: modules/gui/wxwidgets/main_slider_manager.cpp:138
 msgid "Next chapter"
 msgstr ""
 
-#: src/input/var.c:358 modules/gui/beos/InterfaceWindow.cpp:270
-#: modules/gui/wxwidgets/timer.cpp:224
+#: src/input/var.c:351 modules/gui/beos/InterfaceWindow.cpp:287
+#: modules/gui/wxwidgets/main_slider_manager.cpp:137
 msgid "Previous chapter"
 msgstr ""
 
@@ -944,81 +956,68 @@ msgstr ""
 msgid "Switch interface"
 msgstr "Switch interface"
 
-#: src/interface/interface.c:353 modules/gui/macosx/intf.m:472
-#: modules/gui/macosx/intf.m:473
+#: src/interface/interface.c:353 modules/gui/macosx/intf.m:461
+#: modules/gui/macosx/intf.m:462
 msgid "Add Interface"
 msgstr "Add Interface"
 
-#: src/libvlc.c:324 src/libvlc.c:471 src/misc/modules.c:1677
+#: src/libvlc.c:325 src/libvlc.c:475 src/misc/modules.c:1677
 #: src/misc/modules.c:1981
 msgid "C"
 msgstr "en_GB"
 
-#: src/libvlc.c:341
+#: src/libvlc.c:342
 msgid "Help options"
 msgstr "Help options"
 
-#: src/libvlc.c:2193 src/misc/configuration.c:1265
+#: src/libvlc.c:2205 src/misc/configuration.c:1265
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:2210 src/misc/configuration.c:1229
+#: src/libvlc.c:2222 src/misc/configuration.c:1229
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:2228 src/misc/configuration.c:1254
+#: src/libvlc.c:2240 src/misc/configuration.c:1254
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:2234
+#: src/libvlc.c:2246
 msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:2235
+#: src/libvlc.c:2247
 msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:2417
+#: src/libvlc.c:2429
 #, fuzzy, c-format
 msgid "VLC version %s\n"
 msgstr "Stereo"
 
-#: src/libvlc.c:2418
+#: src/libvlc.c:2430
 #, c-format
 msgid "Compiled by %s@%s.%s\n"
 msgstr ""
 
-#: src/libvlc.c:2420
+#: src/libvlc.c:2432
 #, c-format
 msgid "Compiler: %s\n"
 msgstr ""
 
-#: src/libvlc.c:2422
+#: src/libvlc.c:2434
 #, c-format
 msgid "Based upon svn changeset [%s]\n"
 msgstr ""
 
-#: src/libvlc.c:2425
-#, c-format
-msgid ""
-"This program comes with NO WARRANTY, to the extent permitted by law.\n"
-"You may redistribute it under the terms of the GNU General Public License;\n"
-"see the file named COPYING for details.\n"
-"Written by the VideoLAN team; see the AUTHORS file.\n"
-msgstr ""
-"This program comes with NO WARRANTY, to the extent permitted by law.\n"
-"You may redistribute it under the terms of the GNU General Public Licence;\n"
-"see the file named COPYING for details.\n"
-"Written by the VideoLAN team; see the AUTHORS file.\n"
-
-#: src/libvlc.c:2454
+#: src/libvlc.c:2465
 #, c-format
 msgid ""
 "\n"
 "Dumped content to vlc-help.txt file.\n"
 msgstr ""
 
-#: src/libvlc.c:2478
+#: src/libvlc.c:2486
 #, c-format
 msgid ""
 "\n"
@@ -1027,7 +1026,7 @@ msgstr ""
 "\n"
 "Press the RETURN key to continue…\n"
 
-#: src/libvlc.h:34 src/libvlc.h:167
+#: src/libvlc.h:34 src/libvlc.h:170
 msgid "Auto"
 msgstr ""
 
@@ -1092,6 +1091,10 @@ msgstr ""
 msgid "Turkish"
 msgstr ""
 
+#: src/libvlc.h:34
+msgid "Simplified Chinese"
+msgstr ""
+
 #: src/libvlc.h:34
 msgid "Chinese Traditional"
 msgstr ""
@@ -1106,7 +1109,7 @@ msgstr ""
 "You can select the main interface, additional interface modules, and define "
 "various related options."
 
-#: src/libvlc.h:51 src/libvlc.h:1314
+#: src/libvlc.h:51 src/libvlc.h:1352
 msgid "Interface module"
 msgstr ""
 
@@ -1118,7 +1121,7 @@ msgstr ""
 "This option allows you to select the interface used by VLC.\n"
 "The default behaviour is to automatically select the best module available."
 
-#: src/libvlc.h:57 src/libvlc.h:1319 modules/control/ntservice.c:53
+#: src/libvlc.h:57 src/libvlc.h:1357 modules/control/ntservice.c:53
 msgid "Extra interface modules"
 msgstr ""
 
@@ -1164,12 +1167,12 @@ msgstr ""
 
 #: src/libvlc.h:77
 #, fuzzy
-msgid "Open MRL"
-msgstr "Options:"
+msgid "Default stream"
+msgstr "Sout stream"
 
 #: src/libvlc.h:79
 #, fuzzy
-msgid "This option allows you to open a default MRL on start-up."
+msgid "This option allows you to always open a default stream on start-up."
 msgstr ""
 "This option allows you to specify an additional path for VLC to look for its "
 "modules."
@@ -1255,8 +1258,9 @@ msgid "This will force a mono audio output."
 msgstr ""
 
 #: src/libvlc.h:118
-msgid "Audio output volume"
-msgstr ""
+#, fuzzy
+msgid "Default audio volume"
+msgstr "Next file"
 
 #: src/libvlc.h:120
 msgid ""
@@ -1357,34 +1361,36 @@ msgstr ""
 
 #: src/libvlc.h:164
 msgid ""
-"Use this when you know your stream is or is not encoded with Dolby Surround "
-"but fails to be detected as such."
+"Use this when you know your stream is (or is not) encoded with Dolby "
+"Surround but fails to be detected as such. And even if the stream is not "
+"actually encoded with Dolby Surround, turning on this option might enhance "
+"your experience, especially when combined with the Headphone Channel Mixer."
 msgstr ""
 
-#: src/libvlc.h:167
+#: src/libvlc.h:170
 msgid "On"
 msgstr ""
 
-#: src/libvlc.h:167
+#: src/libvlc.h:170
 msgid "Off"
 msgstr ""
 
-#: src/libvlc.h:172
+#: src/libvlc.h:175
 msgid ""
 "This allows you to add audio post processing filters, to modify the sound"
 msgstr ""
 "This allows you to add audio post processing filters, to modify the sound"
 
-#: src/libvlc.h:175
+#: src/libvlc.h:178
 msgid "Audio visualizations "
 msgstr "Audio visualisations "
 
-#: src/libvlc.h:177
+#: src/libvlc.h:180
 msgid "This allows you to add visualization modules (spectrum analyzer, etc.)."
 msgstr ""
 "This allows you to add visualisation modules (spectrum analyser, etc.)."
 
-#: src/libvlc.h:181
+#: src/libvlc.h:184
 msgid ""
 "These options allow you to modify the behavior of the video output "
 "subsystem. You can for example enable video filters (deinterlacing, image "
@@ -1397,11 +1403,11 @@ msgstr ""
 "adjusting, …). Enable these filters here and configure them in the \"video "
 "filters\" modules section. You can also set many miscellaneous video options."
 
-#: src/libvlc.h:187
+#: src/libvlc.h:190
 msgid "Video output module"
 msgstr ""
 
-#: src/libvlc.h:189
+#: src/libvlc.h:192
 msgid ""
 "This option allows you to select the video output method used by VLC. The "
 "default behavior is to automatically select the best method available."
@@ -1409,11 +1415,11 @@ msgstr ""
 "This option allows you to select the video output method used by VLC. The "
 "default behaviour is to automatically select the best method available."
 
-#: src/libvlc.h:193 modules/stream_out/display.c:39
+#: src/libvlc.h:196 modules/stream_out/display.c:39
 msgid "Enable video"
 msgstr ""
 
-#: src/libvlc.h:195
+#: src/libvlc.h:198
 msgid ""
 "You can completely disable the video output. In this case, the video "
 "decoding stage will not take place, thus saving some processing power."
@@ -1421,13 +1427,13 @@ msgstr ""
 "You can completely disable the video output. In this case, the video "
 "decoding stage will not take place, thus saving some processing power."
 
-#: src/libvlc.h:198 modules/codec/fake.c:47
-#: modules/stream_out/mosaic_bridge.c:104 modules/stream_out/transcode.c:70
+#: src/libvlc.h:201 modules/codec/fake.c:47
+#: modules/stream_out/mosaic_bridge.c:107 modules/stream_out/transcode.c:70
 #: modules/visualization/visual/visual.c:43
 msgid "Video width"
 msgstr ""
 
-#: src/libvlc.h:200
+#: src/libvlc.h:203
 msgid ""
 "You can enforce the video width here. By default (-1) VLC will adapt to the "
 "video characteristics."
@@ -1435,13 +1441,13 @@ msgstr ""
 "You can enforce the video width here. By default (-1) VLC will adapt to the "
 "video characteristics."
 
-#: src/libvlc.h:203 modules/codec/fake.c:50
-#: modules/stream_out/mosaic_bridge.c:107 modules/stream_out/transcode.c:73
+#: src/libvlc.h:206 modules/codec/fake.c:50
+#: modules/stream_out/mosaic_bridge.c:110 modules/stream_out/transcode.c:73
 #: modules/visualization/visual/visual.c:47
 msgid "Video height"
 msgstr ""
 
-#: src/libvlc.h:205
+#: src/libvlc.h:208
 msgid ""
 "You can enforce the video height here. By default (-1) VLC will adapt to the "
 "video characteristics."
@@ -1449,11 +1455,11 @@ msgstr ""
 "You can enforce the video height here. By default (-1) VLC will adapt to the "
 "video characteristics."
 
-#: src/libvlc.h:208
+#: src/libvlc.h:211
 msgid "Video x coordinate"
 msgstr ""
 
-#: src/libvlc.h:210
+#: src/libvlc.h:213
 msgid ""
 "You can enforce the position of the top left corner of the video window here "
 "(x coordinate)."
@@ -1461,11 +1467,11 @@ msgstr ""
 "You can enforce the position of the top left corner of the video window here "
 "(x coordinate)."
 
-#: src/libvlc.h:213
+#: src/libvlc.h:216
 msgid "Video y coordinate"
 msgstr ""
 
-#: src/libvlc.h:215
+#: src/libvlc.h:218
 msgid ""
 "You can enforce the position of the top left corner of the video window here "
 "(y coordinate)."
@@ -1473,19 +1479,19 @@ msgstr ""
 "You can enforce the position of the top left corner of the video window here "
 "(y coordinate)."
 
-#: src/libvlc.h:218
+#: src/libvlc.h:221
 msgid "Video title"
 msgstr "Video title"
 
-#: src/libvlc.h:220
+#: src/libvlc.h:223
 msgid "You can specify a custom video window title here."
 msgstr ""
 
-#: src/libvlc.h:222
+#: src/libvlc.h:225
 msgid "Video alignment"
 msgstr ""
 
-#: src/libvlc.h:224
+#: src/libvlc.h:227
 msgid ""
 "You can enforce the video alignment in its window. By default (0) it will be "
 "centered (0=center, 1=left, 2=right, 4=top, 8=bottom, you can also use "
@@ -1495,68 +1501,68 @@ msgstr ""
 "centred (0=centre, 1=left, 2=right, 4=top, 8=bottom, you can also use "
 "combinations of these values)."
 
-#: src/libvlc.h:229 modules/codec/dvbsub.c:70 modules/codec/subsdec.c:84
+#: src/libvlc.h:232 modules/codec/dvbsub.c:70 modules/codec/subsdec.c:84
 #: modules/video_filter/logo.c:85 modules/video_filter/marq.c:106
-#: modules/video_filter/mosaic.c:120 modules/video_filter/osdmenu.c:76
+#: modules/video_filter/mosaic.c:120 modules/video_filter/osdmenu.c:77
 #: modules/video_filter/rss.c:144 modules/video_filter/time.c:96
 msgid "Center"
 msgstr "Centre"
 
-#: src/libvlc.h:229 modules/codec/dvbsub.c:70 modules/video_filter/logo.c:85
+#: src/libvlc.h:232 modules/codec/dvbsub.c:70 modules/video_filter/logo.c:85
 #: modules/video_filter/marq.c:106 modules/video_filter/mosaic.c:120
-#: modules/video_filter/osdmenu.c:76 modules/video_filter/rss.c:144
+#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:144
 #: modules/video_filter/time.c:96
 msgid "Top"
 msgstr ""
 
-#: src/libvlc.h:229 modules/codec/dvbsub.c:70 modules/video_filter/logo.c:85
+#: src/libvlc.h:232 modules/codec/dvbsub.c:70 modules/video_filter/logo.c:85
 #: modules/video_filter/marq.c:106 modules/video_filter/mosaic.c:120
-#: modules/video_filter/osdmenu.c:76 modules/video_filter/rss.c:144
+#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:144
 #: modules/video_filter/time.c:96
 msgid "Bottom"
 msgstr ""
 
-#: src/libvlc.h:230 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:86
+#: src/libvlc.h:233 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:86
 #: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:121
-#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:145
+#: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:145
 #: modules/video_filter/time.c:97
 msgid "Top-Left"
 msgstr ""
 
-#: src/libvlc.h:230 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:86
+#: src/libvlc.h:233 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:86
 #: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:121
-#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:145
+#: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:145
 #: modules/video_filter/time.c:97
 msgid "Top-Right"
 msgstr ""
 
-#: src/libvlc.h:230 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:86
+#: src/libvlc.h:233 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:86
 #: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:121
-#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:145
+#: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:145
 #: modules/video_filter/time.c:97
 msgid "Bottom-Left"
 msgstr ""
 
-#: src/libvlc.h:230 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:86
+#: src/libvlc.h:233 modules/codec/dvbsub.c:71 modules/video_filter/logo.c:86
 #: modules/video_filter/marq.c:107 modules/video_filter/mosaic.c:121
-#: modules/video_filter/osdmenu.c:77 modules/video_filter/rss.c:145
+#: modules/video_filter/osdmenu.c:78 modules/video_filter/rss.c:145
 #: modules/video_filter/time.c:97
 msgid "Bottom-Right"
 msgstr ""
 
-#: src/libvlc.h:232
+#: src/libvlc.h:235
 msgid "Zoom video"
 msgstr ""
 
-#: src/libvlc.h:234
+#: src/libvlc.h:237
 msgid "You can zoom the video by the specified factor."
 msgstr ""
 
-#: src/libvlc.h:236
+#: src/libvlc.h:239
 msgid "Grayscale video output"
 msgstr "Greyscale video output"
 
-#: src/libvlc.h:238
+#: src/libvlc.h:241
 msgid ""
 "When enabled, the color information from the video won't be decoded (this "
 "can also allow you to save some processing power)."
@@ -1564,21 +1570,21 @@ msgstr ""
 "When enabled, the colour information from the video won't be decoded (this "
 "can also allow you to save some processing power)."
 
-#: src/libvlc.h:241
+#: src/libvlc.h:244
 msgid "Fullscreen video output"
 msgstr ""
 
-#: src/libvlc.h:243
+#: src/libvlc.h:246
 msgid ""
 "If this option is enabled, VLC will always start a video in fullscreen mode."
 msgstr ""
 "If this option is enabled, VLC will always start a video in fullscreen mode."
 
-#: src/libvlc.h:246
+#: src/libvlc.h:249
 msgid "Overlay video output"
 msgstr ""
 
-#: src/libvlc.h:248
+#: src/libvlc.h:251
 msgid ""
 "If enabled, VLC will try to take advantage of the overlay capabilities of "
 "your graphics card (hardware acceleration)."
@@ -1586,27 +1592,27 @@ msgstr ""
 "If enabled, VLC will try to take advantage of the overlay capabilities of "
 "your graphics card (hardware acceleration)."
 
-#: src/libvlc.h:251 src/video_output/vout_intf.c:218
+#: src/libvlc.h:254 src/video_output/vout_intf.c:316
 msgid "Always on top"
 msgstr ""
 
-#: src/libvlc.h:252
+#: src/libvlc.h:255
 msgid "Always place the video window on top of other windows."
 msgstr ""
 
-#: src/libvlc.h:255
+#: src/libvlc.h:258
 msgid "Disable screensaver"
 msgstr ""
 
-#: src/libvlc.h:256
+#: src/libvlc.h:259
 msgid "Disable the screensaver during video playback."
 msgstr ""
 
-#: src/libvlc.h:258
+#: src/libvlc.h:261
 msgid "Window decorations"
 msgstr ""
 
-#: src/libvlc.h:260
+#: src/libvlc.h:263
 #, fuzzy
 msgid ""
 "If this option is disabled, VLC will avoid creating window caption, frames, "
@@ -1614,11 +1620,11 @@ msgid ""
 msgstr ""
 "If this option is enabled, VLC will always start a video in fullscreen mode."
 
-#: src/libvlc.h:263
+#: src/libvlc.h:266
 msgid "Video filter module"
 msgstr ""
 
-#: src/libvlc.h:265
+#: src/libvlc.h:268
 msgid ""
 "This will allow you to add a post-processing filter to enhance the picture "
 "quality, for instance deinterlacing, or to clone or distort the video window."
@@ -1626,30 +1632,41 @@ msgstr ""
 "This will allow you to add a post-processing filter to enhance the picture "
 "quality, for instance deinterlacing, or to clone or distort the video window."
 
-#: src/libvlc.h:269
+#: src/libvlc.h:272
 msgid "Video snapshot directory"
 msgstr ""
 
-#: src/libvlc.h:271
+#: src/libvlc.h:274
 msgid ""
 "Allows you to specify the directory where the video snapshots will be stored."
 msgstr ""
 
-#: src/libvlc.h:274
+#: src/libvlc.h:277
 msgid "Video snapshot format"
 msgstr ""
 
-#: src/libvlc.h:276
+#: src/libvlc.h:279
 msgid ""
 "Allows you to specify the image format in which the video snapshots will be "
 "stored."
 msgstr ""
 
-#: src/libvlc.h:279
+#: src/libvlc.h:282
+#, fuzzy
+msgid "Video cropping"
+msgstr "Video crop left"
+
+#: src/libvlc.h:284
+msgid ""
+"This will force the cropping of the source video. Accepted formats are x:y "
+"(4:3, 16:9, etc.) expressing the global image aspect."
+msgstr ""
+
+#: src/libvlc.h:288
 msgid "Source aspect ratio"
 msgstr ""
 
-#: src/libvlc.h:281
+#: src/libvlc.h:290
 msgid ""
 "This will force the source aspect ratio. For instance, some DVDs claim to be "
 "16:9 while they are actually 4:3. This can also be used as a hint for VLC "
@@ -1663,37 +1680,50 @@ msgstr ""
 "y (4:3, 16:9, etc.) expressing the global image aspect, or a float value "
 "(1.25, 1.3333, etc.) expressing pixel squareness."
 
-#: src/libvlc.h:288
+#: src/libvlc.h:297
+msgid "Fix HDTV height"
+msgstr ""
+
+#: src/libvlc.h:299
+msgid ""
+"This option allows proper handling of HDTV-1080 video format even if broken "
+"encoder incorrectly set height to 1088 lines. Disable this option only if "
+"your video has non-standard format requiring all 1088 lines."
+msgstr ""
+
+#: src/libvlc.h:304
 #, fuzzy
-msgid "Monitor aspect ratio"
+msgid "Monitor pixel aspect ratio"
 msgstr "Codec setting"
 
-#: src/libvlc.h:290
+#: src/libvlc.h:306
 msgid ""
-"This will force the monitor aspect ratio. Most monitors have a 4:3.If you "
-"have a 16:9 screen, you will need to change this to 16:9 inorder to keep "
-"proportions."
+"This will force the monitor aspect ratio. Most monitors have square pixels "
+"(1:1). If you have a 16:9 screen, you might need to change this to 4:3 in "
+"order to keep proportions."
 msgstr ""
 
-#: src/libvlc.h:294
+#: src/libvlc.h:310
 msgid "Skip frames"
 msgstr ""
 
-#: src/libvlc.h:296
-msgid "Disable this option to disable frame drops on MPEG-2 streams."
+#: src/libvlc.h:312
+msgid ""
+"This option enables framedropping on MPEG2 stream. Framedropping occurs when "
+"your computer is not powerful enough"
 msgstr ""
 
-#: src/libvlc.h:298
+#: src/libvlc.h:315
 msgid "Quiet synchro"
 msgstr ""
 
-#: src/libvlc.h:300
+#: src/libvlc.h:317
 msgid ""
 "Enable this option to avoid flooding the message log with debug output from "
 "the video output synchro."
 msgstr ""
 
-#: src/libvlc.h:304
+#: src/libvlc.h:321
 msgid ""
 "These options allow you to modify the behavior of the input subsystem, such "
 "as the DVD or VCD device, the network interface settings or the subtitle "
@@ -1703,11 +1733,11 @@ msgstr ""
 "as the DVD or VCD device, the network interface settings or the subtitle "
 "channel."
 
-#: src/libvlc.h:308
+#: src/libvlc.h:325
 msgid "Clock reference average counter"
 msgstr ""
 
-#: src/libvlc.h:310
+#: src/libvlc.h:327
 msgid ""
 "When using the PVR input (or a very irregular source), you should set this "
 "to 10000."
@@ -1715,74 +1745,62 @@ msgstr ""
 "When using the PVR input (or a very irregular source), you should set this "
 "to 10000."
 
-#: src/libvlc.h:313
+#: src/libvlc.h:330
 msgid "Clock synchronisation"
 msgstr "Clock synchronisation"
 
-#: src/libvlc.h:315
+#: src/libvlc.h:332
 msgid ""
 "Allows you to enable/disable the input clock synchronisation for real-time "
 "sources."
 msgstr ""
 
-#: src/libvlc.h:320 modules/access/dshow/dshow.cpp:72
+#: src/libvlc.h:337 src/video_output/vout_intf.c:232
+#: src/video_output/vout_intf.c:293 modules/access/dshow/dshow.cpp:72
 #: modules/access/dshow/dshow.cpp:74 modules/access/dshow/dshow.cpp:77
 #: modules/audio_output/alsa.c:101 modules/gui/macosx/prefs_widgets.m:1292
 #: modules/gui/macosx/vout.m:174
-#: modules/gui/wxwidgets/preferences_widgets.cpp:285
-#: modules/gui/wxwidgets/preferences_widgets.cpp:335
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:275
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:325
 #: modules/video_filter/marq.c:52 modules/video_filter/rss.c:55
 #: modules/video_filter/time.c:52 modules/video_output/directx/directx.c:141
 msgid "Default"
 msgstr ""
 
-#: src/libvlc.h:320 modules/gui/macosx/equalizer.m:144
-#: modules/gui/macosx/extended.m:106 modules/gui/macosx/wizard.m:374
-#: modules/gui/wxwidgets/extrapanel.cpp:218
-#: modules/gui/wxwidgets/extrapanel.cpp:467
-#: modules/gui/wxwidgets/wizard.cpp:629
+#: src/libvlc.h:337 modules/gui/macosx/equalizer.m:144
+#: modules/gui/macosx/extended.m:106 modules/gui/macosx/wizard.m:378
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:624
+#: modules/gui/wxwidgets/extrapanel.cpp:219
+#: modules/gui/wxwidgets/extrapanel.cpp:468
 msgid "Enable"
 msgstr "Enable"
 
-#: src/libvlc.h:322
+#: src/libvlc.h:339
 msgid "UDP port"
 msgstr ""
 
-#: src/libvlc.h:324
+#: src/libvlc.h:341
 msgid "This is the port used for UDP streams. By default, we chose 1234."
 msgstr ""
 
-#: src/libvlc.h:326
+#: src/libvlc.h:343
 msgid "MTU of the network interface"
 msgstr ""
 
-#: src/libvlc.h:328
+#: src/libvlc.h:345
+#, fuzzy
 msgid ""
-"This is the typical size of UDP packets that we expect. On Ethernet it is "
-"usually 1500."
+"This is the maximum packet size that can be transmitted over network "
+"interface. On Ethernet it is usually 1500 bytes."
 msgstr ""
 "This is the typical size of UDP packets that we expect. On Ethernet it is "
 "usually 1500."
 
-#: src/libvlc.h:331
-msgid "Network interface address"
-msgstr ""
-
-#: src/libvlc.h:333
-msgid ""
-"If you have several interfaces on your machine and use the multicast "
-"solution, you will probably have to indicate the IP address of your "
-"multicasting interface here."
-msgstr ""
-"If you have several interfaces on your machine and use the multicast "
-"solution, you will probably have to indicate the IP address of your "
-"multicasting interface here."
-
-#: src/libvlc.h:337 modules/access_output/udp.c:80 modules/stream_out/rtp.c:77
+#: src/libvlc.h:348 modules/access_output/udp.c:80 modules/stream_out/rtp.c:80
 msgid "Time To Live"
 msgstr ""
 
-#: src/libvlc.h:339
+#: src/libvlc.h:350
 msgid ""
 "Indicate here the Time To Live of the multicast packets sent by the stream "
 "output."
@@ -1790,11 +1808,12 @@ msgstr ""
 "Indicate here the Time To Live of the multicast packets sent by the stream "
 "output."
 
-#: src/libvlc.h:342
-msgid "Choose program (SID)"
-msgstr "Choose programme (SID)"
+#: src/libvlc.h:353
+#, fuzzy
+msgid "Program to select"
+msgstr "Pseudo raw video decoder"
 
-#: src/libvlc.h:344
+#: src/libvlc.h:355
 msgid ""
 "Choose the program to select by giving its Service ID.\n"
 "Only use this option if you want to read a multi-program stream (like DVB "
@@ -1804,11 +1823,12 @@ msgstr ""
 "Only use this option if you want to read multi-programme stream (like DVB "
 "stream for example)."
 
-#: src/libvlc.h:348
-msgid "Choose programs"
-msgstr "Choose programmes"
+#: src/libvlc.h:359
+#, fuzzy
+msgid "Programs to select"
+msgstr "Pseudo raw video decoder"
 
-#: src/libvlc.h:350
+#: src/libvlc.h:361
 msgid ""
 "Choose the programs to select by giving a comma-separated list of SIDs.\n"
 "Only use this option if you want to read a multi-program stream (like DVB "
@@ -1818,84 +1838,90 @@ msgstr ""
 "Only use this option if you want to read a multi-programme stream (like DVB "
 "streams for example)."
 
-#: src/libvlc.h:355
-msgid "Choose audio track"
-msgstr "Choose audio track"
+#: src/libvlc.h:366 modules/gui/wxwidgets/dialogs/open.cpp:754
+#, fuzzy
+msgid "Audio track"
+msgstr "Subtitle track: %s"
 
-#: src/libvlc.h:357
+#: src/libvlc.h:368
 msgid "Give the stream number of the audio track you want to use(from 0 to n)."
 msgstr ""
 
-#: src/libvlc.h:360
-msgid "Choose subtitles track"
-msgstr "Choose subtitles track"
+#: src/libvlc.h:371 modules/gui/wxwidgets/dialogs/open.cpp:746
+#, fuzzy
+msgid "Subtitles track"
+msgstr "Subtitles Track"
 
-#: src/libvlc.h:362
+#: src/libvlc.h:373
 msgid ""
 "Give the stream number of the subtitle track you want to use (from 0 to n)."
 msgstr ""
 
-#: src/libvlc.h:365
-msgid "Choose audio language"
-msgstr ""
+#: src/libvlc.h:376
+#, fuzzy
+msgid "Audio language"
+msgstr "Language"
 
-#: src/libvlc.h:367
+#: src/libvlc.h:378
 msgid ""
 "Give the language of the audio track you want to use (comma separted, two or "
 "tree letter country code)."
 msgstr ""
 
-#: src/libvlc.h:370
-msgid "Choose subtitle language"
-msgstr ""
+#: src/libvlc.h:381
+#, fuzzy
+msgid "Subtitle language"
+msgstr "Subtitles Track"
 
-#: src/libvlc.h:372
+#: src/libvlc.h:383
 msgid ""
 "Give the language of the subtitle track you want to use (comma separted, two "
 "or tree letter country code)."
 msgstr ""
 
-#: src/libvlc.h:375
+#: src/libvlc.h:386
 msgid "Input repetitions"
 msgstr ""
 
-#: src/libvlc.h:376
+#: src/libvlc.h:387
 msgid "Number of time the same input will be repeated"
 msgstr ""
 
-#: src/libvlc.h:379 src/libvlc.h:380
+#: src/libvlc.h:390 src/libvlc.h:391
 msgid "Input start time (seconds)"
 msgstr ""
 
-#: src/libvlc.h:382 src/libvlc.h:383
+#: src/libvlc.h:393 src/libvlc.h:394
 msgid "Input stop time (seconds)"
 msgstr ""
 
-#: src/libvlc.h:385
+#: src/libvlc.h:396
 msgid "Input list"
 msgstr ""
 
-#: src/libvlc.h:386
+#: src/libvlc.h:397
+#, fuzzy
 msgid ""
 "Allows you to specify a comma-separated list of inputs that will be "
-"concatenated."
+"concatenated after the normal one."
 msgstr ""
+"Allows you to modify the user name that will be used for the connection."
 
-#: src/libvlc.h:389
+#: src/libvlc.h:400
 msgid "Input slave (experimental)"
 msgstr ""
 
-#: src/libvlc.h:390
+#: src/libvlc.h:401
 msgid ""
-"Allows you to play from several files at the same time. This feature is "
+"Allows you to play from several streams at the same time. This feature is "
 "experimental, not all formats are supported."
 msgstr ""
 
-#: src/libvlc.h:394
+#: src/libvlc.h:405
 msgid "Bookmarks list for a stream"
 msgstr ""
 
-#: src/libvlc.h:395
+#: src/libvlc.h:406
 msgid ""
 "You can specify a list of bookmarks for a stream in the form "
 "\"{name=bookmark-name,time=optional-time-offset,bytes=optional-byte-offset},"
@@ -1905,7 +1931,7 @@ msgstr ""
 "\"{name=bookmark-name,time=optional-time-offset,bytes=optional-byte-offset},"
 "{...}\""
 
-#: src/libvlc.h:400
+#: src/libvlc.h:411
 msgid ""
 "These options allow you to modify the behavior of the subpictures subsystem. "
 "You can for example enable subpictures filters (logo, etc.). Enable these "
@@ -1917,11 +1943,11 @@ msgstr ""
 "these filters here and configure them in the \"subpictures filters\" modules "
 "section. You can also set many miscellaneous subpictures options."
 
-#: src/libvlc.h:406
+#: src/libvlc.h:417
 msgid "Force subtitle position"
 msgstr ""
 
-#: src/libvlc.h:408
+#: src/libvlc.h:419
 msgid ""
 "You can use this option to place the subtitles under the movie, instead of "
 "over the movie. Try several positions."
@@ -1929,12 +1955,12 @@ msgstr ""
 "You can use this option to place the subtitles under the movie, instead of "
 "over the movie. Try several positions."
 
-#: src/libvlc.h:411 src/libvlc.h:1044 src/misc/iso-639_def.h:143
+#: src/libvlc.h:422 src/libvlc.h:1084 src/misc/iso-639_def.h:143
 #: modules/stream_out/transcode.c:239
 msgid "On Screen Display"
 msgstr ""
 
-#: src/libvlc.h:413
+#: src/libvlc.h:424
 msgid ""
 "VLC can display messages on the video. This is called OSD (On Screen "
 "Display). You can disable this feature here."
@@ -1942,31 +1968,31 @@ msgstr ""
 "VLC can display messages on the video. This is called OSD (On Screen "
 "Display). You can disable this feature here."
 
-#: src/libvlc.h:416
+#: src/libvlc.h:427
 msgid "Subpictures filter module"
 msgstr ""
 
-#: src/libvlc.h:418
+#: src/libvlc.h:429
 msgid ""
 "This will allow you to add a subpictures filter for instance to overlay a "
 "logo."
 msgstr ""
 
-#: src/libvlc.h:421
+#: src/libvlc.h:432
 msgid "Autodetect subtitle files"
 msgstr ""
 
-#: src/libvlc.h:423
+#: src/libvlc.h:434
 msgid ""
 "Automatically detect a subtitle file, if no subtitle filename is specified."
 msgstr ""
 "Automatically detect a subtitle file, if no subtitle filename is specified."
 
-#: src/libvlc.h:426
+#: src/libvlc.h:437
 msgid "Subtitle autodetection fuzziness"
 msgstr "Subtitle auto-detection fuzziness"
 
-#: src/libvlc.h:428
+#: src/libvlc.h:439
 msgid ""
 "This determines how fuzzy subtitle and movie filename matching will be. "
 "Options are:\n"
@@ -1984,11 +2010,11 @@ msgstr ""
 "3 = subtitle file matching the movie name with additional chars\n"
 "4 = subtitle file matching the movie name exactly"
 
-#: src/libvlc.h:436
+#: src/libvlc.h:447
 msgid "Subtitle autodetection paths"
 msgstr "Subtitle auto-detection paths"
 
-#: src/libvlc.h:438
+#: src/libvlc.h:449
 msgid ""
 "Look for a subtitle file in those paths too, if your subtitle file was not "
 "found in the current directory."
@@ -1996,11 +2022,11 @@ msgstr ""
 "Look for a subtitle file in those paths too, if your subtitle file was not "
 "found in the current directory."
 
-#: src/libvlc.h:441
+#: src/libvlc.h:452
 msgid "Use subtitle file"
 msgstr ""
 
-#: src/libvlc.h:443
+#: src/libvlc.h:454
 msgid ""
 "Load this subtitle file. To be used when autodetect cannot detect your "
 "subtitle file."
@@ -2008,11 +2034,11 @@ msgstr ""
 "Load this subtitle file. To be used when autodetect cannot detect your "
 "subtitle file."
 
-#: src/libvlc.h:446
+#: src/libvlc.h:457
 msgid "DVD device"
 msgstr ""
 
-#: src/libvlc.h:449
+#: src/libvlc.h:460
 msgid ""
 "This is the default DVD drive (or file) to use. Don't forget the colon after "
 "the drive letter (eg. D:)"
@@ -2020,15 +2046,15 @@ msgstr ""
 "This is the default DVD drive (or file) to use. Don't forget the colon after "
 "the drive letter (eg. D:)"
 
-#: src/libvlc.h:453
+#: src/libvlc.h:464
 msgid "This is the default DVD device to use."
 msgstr ""
 
-#: src/libvlc.h:456
+#: src/libvlc.h:467
 msgid "VCD device"
 msgstr ""
 
-#: src/libvlc.h:459
+#: src/libvlc.h:470
 msgid ""
 "This is the default VCD device to use. If you don't specify anything, we'll "
 "scan for a suitable CD-ROM device."
@@ -2036,15 +2062,15 @@ msgstr ""
 "This is the default VCD device to use. If you don't specify anything, we'll "
 "scan for a suitable CD-ROM device."
 
-#: src/libvlc.h:463
+#: src/libvlc.h:474
 msgid "This is the default VCD device to use."
 msgstr ""
 
-#: src/libvlc.h:466
+#: src/libvlc.h:477
 msgid "Audio CD device"
 msgstr "Audio CD device"
 
-#: src/libvlc.h:469
+#: src/libvlc.h:480
 msgid ""
 "This is the default Audio CD device to use. If you don't specify anything, "
 "we'll scan for a suitable CD-ROM device."
@@ -2052,15 +2078,15 @@ msgstr ""
 "This is the default Audio CD device to use. If you don't specify anything, "
 "we'll scan for a suitable CD-ROM device."
 
-#: src/libvlc.h:473
+#: src/libvlc.h:484
 msgid "This is the default Audio CD device to use."
 msgstr ""
 
-#: src/libvlc.h:476 modules/gui/wxwidgets/open.cpp:821
+#: src/libvlc.h:487 modules/gui/wxwidgets/dialogs/open.cpp:816
 msgid "Force IPv6"
 msgstr ""
 
-#: src/libvlc.h:478
+#: src/libvlc.h:489
 msgid ""
 "If you check this box, IPv6 will be used by default for all UDP and HTTP "
 "connections."
@@ -2068,11 +2094,11 @@ msgstr ""
 "If you check this box, IPv6 will be used by default for all UDP and HTTP "
 "connections."
 
-#: src/libvlc.h:481
+#: src/libvlc.h:492
 msgid "Force IPv4"
 msgstr ""
 
-#: src/libvlc.h:483
+#: src/libvlc.h:494
 msgid ""
 "If you check this box, IPv4 will be used by default for all UDP and HTTP "
 "connections."
@@ -2080,11 +2106,11 @@ msgstr ""
 "If you check this box, IPv4 will be used by default for all UDP and HTTP "
 "connections."
 
-#: src/libvlc.h:486
+#: src/libvlc.h:497
 msgid "TCP connection timeout in ms"
 msgstr ""
 
-#: src/libvlc.h:488
+#: src/libvlc.h:499
 #, fuzzy
 msgid ""
 "Allows you to modify the default TCP connection timeout. This value should "
@@ -2093,101 +2119,101 @@ msgstr ""
 "Allows you to modify the default caching value for v4l streams. This value "
 "should be set in millisecond units."
 
-#: src/libvlc.h:491
+#: src/libvlc.h:502
 msgid "SOCKS server"
 msgstr ""
 
-#: src/libvlc.h:493
+#: src/libvlc.h:504
 msgid ""
 "Allow you to specify a SOCKS server to use. It must be of the form address:"
 "port . It will be used for all TCP connections"
 msgstr ""
 
-#: src/libvlc.h:496
+#: src/libvlc.h:507
 msgid "SOCKS user name"
 msgstr ""
 
-#: src/libvlc.h:497
+#: src/libvlc.h:508
 msgid ""
 "Allows you to modify the user name that will be used for the connection to "
 "the SOCKS server."
 msgstr ""
 
-#: src/libvlc.h:500
+#: src/libvlc.h:511
 msgid "SOCKS password"
 msgstr ""
 
-#: src/libvlc.h:501
+#: src/libvlc.h:512
 msgid ""
 "Allows you to modify the password that will be used for the connection to "
 "the SOCKS server."
 msgstr ""
 
-#: src/libvlc.h:504
+#: src/libvlc.h:515
 msgid "Title metadata"
 msgstr ""
 
-#: src/libvlc.h:506
+#: src/libvlc.h:517
 msgid "Allows you to specify a \"title\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:508
+#: src/libvlc.h:519
 msgid "Author metadata"
 msgstr ""
 
-#: src/libvlc.h:510
+#: src/libvlc.h:521
 msgid "Allows you to specify an \"author\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:512
+#: src/libvlc.h:523
 msgid "Artist metadata"
 msgstr ""
 
-#: src/libvlc.h:514
+#: src/libvlc.h:525
 msgid "Allows you to specify an \"artist\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:516
+#: src/libvlc.h:527
 msgid "Genre metadata"
 msgstr ""
 
-#: src/libvlc.h:518
+#: src/libvlc.h:529
 msgid "Allows you to specify a \"genre\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:520
+#: src/libvlc.h:531
 msgid "Copyright metadata"
 msgstr ""
 
-#: src/libvlc.h:522
+#: src/libvlc.h:533
 msgid "Allows you to specify a \"copyright\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:524
+#: src/libvlc.h:535
 msgid "Description metadata"
 msgstr ""
 
-#: src/libvlc.h:526
+#: src/libvlc.h:537
 msgid "Allows you to specify a \"description\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:528
+#: src/libvlc.h:539
 msgid "Date metadata"
 msgstr ""
 
-#: src/libvlc.h:530
+#: src/libvlc.h:541
 msgid "Allows you to specify a \"date\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:532
+#: src/libvlc.h:543
 msgid "URL metadata"
 msgstr ""
 
-#: src/libvlc.h:534
+#: src/libvlc.h:545
 msgid "Allows you to specify a \"url\" metadata for an input."
 msgstr ""
 
-#: src/libvlc.h:537
+#: src/libvlc.h:548
 msgid ""
 "This option can be used to alter the way VLC selects its codecs "
 "(decompression methods). Only advanced users should alter this option as it "
@@ -2197,11 +2223,11 @@ msgstr ""
 "(decompression methods). Only advanced users should alter this option as it "
 "can break playback of all your streams."
 
-#: src/libvlc.h:541
+#: src/libvlc.h:552
 msgid "Preferred codecs list"
 msgstr "Preferred codecs list"
 
-#: src/libvlc.h:543
+#: src/libvlc.h:554
 msgid ""
 "This allows you to select a list of codecs that VLC will use in priority. "
 "For instance, 'dummy,a52' will try the dummy and a52 codecs before trying "
@@ -2211,17 +2237,17 @@ msgstr ""
 "For instance, 'dummy,a52' will try the dummy and a52 codecs before trying "
 "the other ones."
 
-#: src/libvlc.h:547
+#: src/libvlc.h:558
 msgid "Preferred encoders list"
 msgstr "Preferred encoders list"
 
-#: src/libvlc.h:549
+#: src/libvlc.h:560
 msgid ""
 "This allows you to select a list of encoders that VLC will use in priority"
 msgstr ""
 "This allows you to select a list of encoders that VLC will use in priority"
 
-#: src/libvlc.h:553
+#: src/libvlc.h:564
 msgid ""
 "These options allow you to set default global options for the stream output "
 "subsystem."
@@ -2229,38 +2255,38 @@ msgstr ""
 "These options allow you to set default global options for the stream output "
 "subsystem."
 
-#: src/libvlc.h:556
+#: src/libvlc.h:567
 msgid "Default stream output chain"
 msgstr ""
 
-#: src/libvlc.h:558
+#: src/libvlc.h:569
 msgid ""
 "You can enter here a default stream output chain. Refer to the documentation "
 "to learn how to build such chains.Warning: this chain will be enabled for "
 "all streams."
 msgstr ""
 
-#: src/libvlc.h:562
+#: src/libvlc.h:573
 msgid "Enable streaming of all ES"
 msgstr ""
 
-#: src/libvlc.h:564
+#: src/libvlc.h:575
 msgid "This allows you to stream all ES (video, audio and subtitles)"
 msgstr ""
 
-#: src/libvlc.h:566
+#: src/libvlc.h:577
 msgid "Display while streaming"
 msgstr ""
 
-#: src/libvlc.h:568
+#: src/libvlc.h:579
 msgid "This allows you to play the stream while streaming it."
 msgstr ""
 
-#: src/libvlc.h:570
+#: src/libvlc.h:581
 msgid "Enable video stream output"
 msgstr ""
 
-#: src/libvlc.h:572
+#: src/libvlc.h:583
 msgid ""
 "This allows you to choose if the video stream should be redirected to the "
 "stream output facility when this last one is enabled."
@@ -2268,11 +2294,11 @@ msgstr ""
 "This allows you to choose if the video stream should be redirected to the "
 "stream output facility when this last one is enabled."
 
-#: src/libvlc.h:575
+#: src/libvlc.h:586
 msgid "Enable audio stream output"
 msgstr ""
 
-#: src/libvlc.h:577
+#: src/libvlc.h:588
 #, fuzzy
 msgid ""
 "This allows you to choose if the audio stream should be redirected to the "
@@ -2281,11 +2307,11 @@ msgstr ""
 "This allows you to choose if the video stream should be redirected to the "
 "stream output facility when this last one is enabled."
 
-#: src/libvlc.h:580
+#: src/libvlc.h:591
 msgid "Keep stream output open"
 msgstr "Keep stream output open"
 
-#: src/libvlc.h:582
+#: src/libvlc.h:593
 msgid ""
 "This allows you to keep an unique stream output instance across multiple "
 "playlist item (automatically insert the gather stream output if not "
@@ -2295,37 +2321,37 @@ msgstr ""
 "playlist item (automatically insert the gather stream output if not "
 "specified)"
 
-#: src/libvlc.h:586
+#: src/libvlc.h:597
 msgid "Preferred packetizer list"
 msgstr "Preferred packetiser list"
 
-#: src/libvlc.h:588
+#: src/libvlc.h:599
 msgid ""
 "This allows you to select the order in which VLC will choose its packetizers."
 msgstr ""
 "This allows you to select the order in which VLC will choose its packetisers."
 
-#: src/libvlc.h:591
+#: src/libvlc.h:602
 msgid "Mux module"
 msgstr ""
 
-#: src/libvlc.h:593
+#: src/libvlc.h:604
 msgid "This is a legacy entry to let you configure mux modules"
 msgstr ""
 
-#: src/libvlc.h:595
+#: src/libvlc.h:606
 msgid "Access output module"
 msgstr ""
 
-#: src/libvlc.h:597
+#: src/libvlc.h:608
 msgid "This is a legacy entry to let you configure access output modules"
 msgstr ""
 
-#: src/libvlc.h:599
+#: src/libvlc.h:610
 msgid "Control SAP flow"
 msgstr ""
 
-#: src/libvlc.h:600
+#: src/libvlc.h:611
 msgid ""
 "If this option is enabled, the flow on the SAP multicast address will be "
 "controlled. This is needed if you want to make announcements on the MBone"
@@ -2333,11 +2359,11 @@ msgstr ""
 "If this option is enabled, the flow on the SAP multicast address will be "
 "controlled. This is needed if you want to make announcements on the MBone"
 
-#: src/libvlc.h:604
+#: src/libvlc.h:615
 msgid "SAP announcement interval"
 msgstr ""
 
-#: src/libvlc.h:605
+#: src/libvlc.h:616
 msgid ""
 "When the SAP flow control is disabled, this lets you set the fixed interval "
 "between SAP announcements"
@@ -2345,7 +2371,7 @@ msgstr ""
 "When the SAP flow control is disabled, this lets you set the fixed interval "
 "between SAP announcements"
 
-#: src/libvlc.h:609
+#: src/libvlc.h:620
 msgid ""
 "These options allow you to enable special CPU optimizations.\n"
 "You should always leave all these enabled."
@@ -2353,21 +2379,21 @@ msgstr ""
 "These options allow you to enable special CPU optimisations.\n"
 "You should always leave all these enabled."
 
-#: src/libvlc.h:612
+#: src/libvlc.h:623
 msgid "Enable FPU support"
 msgstr ""
 
-#: src/libvlc.h:614
+#: src/libvlc.h:625
 msgid ""
 "If your processor has a floating point calculation unit, VLC can take "
 "advantage of it."
 msgstr ""
 
-#: src/libvlc.h:617
+#: src/libvlc.h:628
 msgid "Enable CPU MMX support"
 msgstr ""
 
-#: src/libvlc.h:619
+#: src/libvlc.h:630
 msgid ""
 "If your processor supports the MMX instructions set, VLC can take advantage "
 "of them."
@@ -2375,11 +2401,11 @@ msgstr ""
 "If your processor supports the MMX instructions set, VLC can take advantage "
 "of them."
 
-#: src/libvlc.h:622
+#: src/libvlc.h:633
 msgid "Enable CPU 3D Now! support"
 msgstr ""
 
-#: src/libvlc.h:624
+#: src/libvlc.h:635
 msgid ""
 "If your processor supports the 3D Now! instructions set, VLC can take "
 "advantage of them."
@@ -2387,11 +2413,11 @@ msgstr ""
 "If your processor supports the 3D Now! instructions set, VLC can take "
 "advantage of them."
 
-#: src/libvlc.h:627
+#: src/libvlc.h:638
 msgid "Enable CPU MMX EXT support"
 msgstr ""
 
-#: src/libvlc.h:629
+#: src/libvlc.h:640
 msgid ""
 "If your processor supports the MMX EXT instructions set, VLC can take "
 "advantage of them."
@@ -2399,11 +2425,11 @@ msgstr ""
 "If your processor supports the MMX EXT instructions set, VLC can take "
 "advantage of them."
 
-#: src/libvlc.h:632
+#: src/libvlc.h:643
 msgid "Enable CPU SSE support"
 msgstr ""
 
-#: src/libvlc.h:634
+#: src/libvlc.h:645
 msgid ""
 "If your processor supports the SSE instructions set, VLC can take advantage "
 "of them."
@@ -2411,11 +2437,11 @@ msgstr ""
 "If your processor supports the SSE instructions set, VLC can take advantage "
 "of them."
 
-#: src/libvlc.h:637
+#: src/libvlc.h:648
 msgid "Enable CPU SSE2 support"
 msgstr ""
 
-#: src/libvlc.h:639
+#: src/libvlc.h:650
 msgid ""
 "If your processor supports the SSE2 instructions set, VLC can take advantage "
 "of them."
@@ -2423,11 +2449,11 @@ msgstr ""
 "If your processor supports the SSE2 instructions set, VLC can take advantage "
 "of them."
 
-#: src/libvlc.h:642
+#: src/libvlc.h:653
 msgid "Enable CPU AltiVec support"
 msgstr ""
 
-#: src/libvlc.h:644
+#: src/libvlc.h:655
 msgid ""
 "If your processor supports the AltiVec instructions set, VLC can take "
 "advantage of them."
@@ -2435,7 +2461,7 @@ msgstr ""
 "If your processor supports the AltiVec instructions set, VLC can take "
 "advantage of them."
 
-#: src/libvlc.h:648
+#: src/libvlc.h:659
 msgid ""
 "These options define the behavior of the playlist. Some of them can be "
 "overridden in the playlist dialog box."
@@ -2443,11 +2469,11 @@ msgstr ""
 "These options define the behaviour of the playlist. Some of them can be "
 "overridden in the playlist dialogue box."
 
-#: src/libvlc.h:651
+#: src/libvlc.h:662
 msgid "Services discovery modules"
 msgstr ""
 
-#: src/libvlc.h:653
+#: src/libvlc.h:664
 msgid ""
 "Specifies the services discovery modules to load, separated by semi-colons. "
 "Typical values are sap, hal, ..."
@@ -2455,11 +2481,11 @@ msgstr ""
 "Specifies the services discovery modules to load, separated by semicolons. "
 "Typical values are sap, hal, ..."
 
-#: src/libvlc.h:656
+#: src/libvlc.h:667
 msgid "Play files randomly forever"
 msgstr ""
 
-#: src/libvlc.h:658
+#: src/libvlc.h:669
 msgid ""
 "When selected, VLC will randomly play files in the playlist until "
 "interrupted."
@@ -2467,11 +2493,11 @@ msgstr ""
 "When selected, VLC will randomly play files in the playlist until "
 "interrupted."
 
-#: src/libvlc.h:661
+#: src/libvlc.h:672
 msgid "Repeat all"
 msgstr ""
 
-#: src/libvlc.h:663
+#: src/libvlc.h:674
 msgid ""
 "If you want VLC to keep playing the playlist indefinitely then enable this "
 "option."
@@ -2479,11 +2505,11 @@ msgstr ""
 "If you want VLC to keep playing the playlist indefinitely then enable this "
 "option."
 
-#: src/libvlc.h:666
+#: src/libvlc.h:677
 msgid "Repeat current item"
 msgstr ""
 
-#: src/libvlc.h:668
+#: src/libvlc.h:679
 msgid ""
 "When this is active, VLC will keep playing the current playlist item over "
 "and over again."
@@ -2491,15 +2517,15 @@ msgstr ""
 "When this is active, VLC will keep playing the current playlist item over "
 "and over again."
 
-#: src/libvlc.h:671
+#: src/libvlc.h:682
 msgid "Play and stop"
 msgstr ""
 
-#: src/libvlc.h:673
+#: src/libvlc.h:684
 msgid "Stop the playlist after each played playlist item. "
 msgstr ""
 
-#: src/libvlc.h:676
+#: src/libvlc.h:687
 msgid ""
 "These options allow you to select default modules. Leave these alone unless "
 "you really know what you are doing."
@@ -2507,11 +2533,11 @@ msgstr ""
 "These options allow you to select default modules. Leave these alone unless "
 "you really know what you are doing."
 
-#: src/libvlc.h:679
+#: src/libvlc.h:690
 msgid "Memory copy module"
 msgstr ""
 
-#: src/libvlc.h:681
+#: src/libvlc.h:692
 msgid ""
 "You can select which memory copy module you want to use. By default VLC will "
 "select the fastest one supported by your hardware."
@@ -2519,35 +2545,38 @@ msgstr ""
 "You can select which memory copy module you want to use. By default VLC will "
 "select the fastest one supported by your hardware."
 
-#: src/libvlc.h:684
+#: src/libvlc.h:695
 msgid "Access module"
 msgstr ""
 
-#: src/libvlc.h:686
-msgid "This is a legacy entry to let you configure access modules."
+#: src/libvlc.h:697
+msgid ""
+"This allows you to force an access module. You can use it if the correct "
+"access is not automatically detected. You should not set this as a global "
+"option unless you really know what you are doing."
 msgstr ""
 
-#: src/libvlc.h:688
+#: src/libvlc.h:701
 msgid "Access filter module"
 msgstr ""
 
-#: src/libvlc.h:690
+#: src/libvlc.h:703
 msgid "This is a legacy entry to let you configure access filter modules."
 msgstr ""
 
-#: src/libvlc.h:692
+#: src/libvlc.h:705
 msgid "Demux module"
 msgstr ""
 
-#: src/libvlc.h:694
+#: src/libvlc.h:707
 msgid "This is a legacy entry to let you configure demux modules."
 msgstr ""
 
-#: src/libvlc.h:696
+#: src/libvlc.h:709
 msgid "Allow real-time priority"
 msgstr ""
 
-#: src/libvlc.h:698
+#: src/libvlc.h:711
 msgid ""
 "Running VLC in real-time priority will allow for much more precise "
 "scheduling and yield better, especially when streaming content. It can "
@@ -2559,11 +2588,11 @@ msgstr ""
 "however lock up your whole machine, or make it very very slow. You should "
 "only activate this if you know what you're doing."
 
-#: src/libvlc.h:704
+#: src/libvlc.h:717
 msgid "Adjust VLC priority"
 msgstr ""
 
-#: src/libvlc.h:706
+#: src/libvlc.h:719
 msgid ""
 "This option adds an offset (positive or negative) to VLC default priorities. "
 "You can use it to tune VLC priority against other programs, or against other "
@@ -2573,19 +2602,19 @@ msgstr ""
 "You can use it to tune VLC priority against other programs, or against other "
 "VLC instances."
 
-#: src/libvlc.h:710
+#: src/libvlc.h:723
 msgid "Minimize number of threads"
 msgstr "Minimise number of threads"
 
-#: src/libvlc.h:712
+#: src/libvlc.h:725
 msgid "This option minimizes the number of threads needed to run VLC"
 msgstr "This option minimises the number of threads needed to run VLC"
 
-#: src/libvlc.h:714
+#: src/libvlc.h:727
 msgid "Modules search path"
 msgstr ""
 
-#: src/libvlc.h:716
+#: src/libvlc.h:729
 msgid ""
 "This option allows you to specify an additional path for VLC to look for its "
 "modules."
@@ -2593,12 +2622,12 @@ msgstr ""
 "This option allows you to specify an additional path for VLC to look for its "
 "modules."
 
-#: src/libvlc.h:719
+#: src/libvlc.h:732
 #, fuzzy
 msgid "VLM configuration file"
 msgstr "Advanced options..."
 
-#: src/libvlc.h:721
+#: src/libvlc.h:734
 #, fuzzy
 msgid ""
 "This option allows you to specify a VLM configuration file that will be read "
@@ -2607,29 +2636,29 @@ msgstr ""
 "This option allows you to specify an additional path for VLC to look for its "
 "modules."
 
-#: src/libvlc.h:724
+#: src/libvlc.h:737
 msgid "Use a plugins cache"
 msgstr ""
 
-#: src/libvlc.h:726
+#: src/libvlc.h:739
 msgid ""
 "This option allows you to use a plugins cache which will greatly improve the "
 "start time of VLC."
 msgstr ""
 
-#: src/libvlc.h:729
+#: src/libvlc.h:742
 msgid "Run as daemon process"
 msgstr ""
 
-#: src/libvlc.h:731
+#: src/libvlc.h:744
 msgid "Runs VLC as a background daemon process."
 msgstr ""
 
-#: src/libvlc.h:733
+#: src/libvlc.h:746
 msgid "Allow only one running instance"
 msgstr ""
 
-#: src/libvlc.h:735
+#: src/libvlc.h:748
 msgid ""
 "Allowing only one running instance of VLC can sometimes be useful, for "
 "instance if you associated VLC with some media types and you don't want a "
@@ -2643,21 +2672,21 @@ msgstr ""
 "explorer. This option will allow you to play the file with the already "
 "running instance or enqueue it."
 
-#: src/libvlc.h:742
+#: src/libvlc.h:755
 msgid "Enqueue items to playlist when in one instance mode"
 msgstr ""
 
-#: src/libvlc.h:744
+#: src/libvlc.h:757
 msgid ""
 "When using the one instance only option, enqueue items to playlist and keep "
 "playing current item."
 msgstr ""
 
-#: src/libvlc.h:747
+#: src/libvlc.h:760
 msgid "Increase the priority of the process"
 msgstr ""
 
-#: src/libvlc.h:749
+#: src/libvlc.h:762
 msgid ""
 "Increasing the priority of the process will very likely improve your playing "
 "experience as it allows VLC not to be disturbed by other applications that "
@@ -2673,11 +2702,11 @@ msgstr ""
 "the processor time and render the whole system unresponsive which might "
 "require a reboot of your machine."
 
-#: src/libvlc.h:756
+#: src/libvlc.h:769
 msgid "Fast mutex on NT/2K/XP (developers only)"
 msgstr ""
 
-#: src/libvlc.h:758
+#: src/libvlc.h:771
 msgid ""
 "On Windows NT/2K/XP we use a slow mutex implementation but which allows us "
 "to correctly implement condition variables. You can also use the faster "
@@ -2687,11 +2716,11 @@ msgstr ""
 "to correctly implement condition variables. You can also use the faster "
 "Win9x implementation but you might experience problems with it."
 
-#: src/libvlc.h:763
+#: src/libvlc.h:776
 msgid "Condition variables implementation for Win9x (developers only)"
 msgstr ""
 
-#: src/libvlc.h:766
+#: src/libvlc.h:779
 msgid ""
 "On Windows 9x/Me you can use a fast but incorrect condition variables "
 "implementation (more precisely there is a possibility for a race condition "
@@ -2705,416 +2734,483 @@ msgstr ""
 "robust. Currently you can choose between implementation 0 (which is the "
 "fastest but slightly incorrect), 1 (default) and 2."
 
-#: src/libvlc.h:774
+#: src/libvlc.h:787
 msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
 msgstr ""
 
-#: src/libvlc.h:777 src/video_output/vout_intf.c:227
+#: src/libvlc.h:790 src/video_output/vout_intf.c:325
 #: modules/gui/beos/VideoOutput.cpp:1057 modules/gui/macosx/applescript.m:121
 #: modules/gui/macosx/controls.m:306 modules/gui/macosx/controls.m:623
-#: modules/gui/macosx/controls.m:651 modules/gui/macosx/intf.m:458
-#: modules/gui/macosx/intf.m:534
+#: modules/gui/macosx/controls.m:651 modules/gui/macosx/intf.m:447
+#: modules/gui/macosx/intf.m:523
 msgid "Fullscreen"
 msgstr ""
 
-#: src/libvlc.h:778
+#: src/libvlc.h:791
 msgid "Select the hotkey to use to swap fullscreen state."
 msgstr ""
 
-#: src/libvlc.h:779 modules/gui/wxwidgets/interface.cpp:1565
+#: src/libvlc.h:792 modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:81
+#: modules/gui/wxwidgets/interface.cpp:1545
 msgid "Play/Pause"
 msgstr ""
 
-#: src/libvlc.h:780
+#: src/libvlc.h:793
 msgid "Select the hotkey to use to swap paused state."
 msgstr ""
 
-#: src/libvlc.h:781
+#: src/libvlc.h:794
 msgid "Pause only"
 msgstr ""
 
-#: src/libvlc.h:782
+#: src/libvlc.h:795
 msgid "Select the hotkey to use to pause."
 msgstr ""
 
-#: src/libvlc.h:783
+#: src/libvlc.h:796
 msgid "Play only"
 msgstr ""
 
-#: src/libvlc.h:784
+#: src/libvlc.h:797
 msgid "Select the hotkey to use to play."
 msgstr ""
 
-#: src/libvlc.h:785 modules/control/hotkeys.c:634
-#: modules/gui/macosx/controls.m:558 modules/gui/macosx/intf.m:499
+#: src/libvlc.h:798 modules/control/hotkeys.c:641
+#: modules/gui/macosx/controls.m:558 modules/gui/macosx/intf.m:488
 msgid "Faster"
 msgstr ""
 
-#: src/libvlc.h:786
+#: src/libvlc.h:799
 msgid "Select the hotkey to use for fast forward playback."
 msgstr ""
 
-#: src/libvlc.h:787 modules/control/hotkeys.c:641
-#: modules/gui/macosx/controls.m:559 modules/gui/macosx/intf.m:500
+#: src/libvlc.h:800 modules/control/hotkeys.c:648
+#: modules/gui/macosx/controls.m:559 modules/gui/macosx/intf.m:489
 msgid "Slower"
 msgstr ""
 
-#: src/libvlc.h:788
+#: src/libvlc.h:801
 msgid "Select the hotkey to use for slow motion playback."
 msgstr ""
 
-#: src/libvlc.h:789 modules/control/hotkeys.c:603
-#: modules/gui/macosx/controls.m:579 modules/gui/macosx/intf.m:457
-#: modules/gui/macosx/intf.m:502 modules/gui/macosx/intf.m:573
-#: modules/gui/macosx/wizard.m:302 modules/gui/macosx/wizard.m:344
-#: modules/gui/macosx/wizard.m:1344 modules/gui/wxwidgets/interface.cpp:1570
-#: modules/gui/wxwidgets/menus.cpp:286
+#: src/libvlc.h:802 modules/control/hotkeys.c:610
+#: modules/gui/macosx/controls.m:579 modules/gui/macosx/intf.m:446
+#: modules/gui/macosx/intf.m:491 modules/gui/macosx/intf.m:562
+#: modules/gui/macosx/wizard.m:306 modules/gui/macosx/wizard.m:348
+#: modules/gui/macosx/wizard.m:1398 modules/gui/wxwidgets/interface.cpp:1550
+#: modules/gui/wxwidgets/menus.cpp:287
 msgid "Next"
 msgstr ""
 
-#: src/libvlc.h:790
+#: src/libvlc.h:803
 msgid "Select the hotkey to use to skip to the next item in the playlist."
 msgstr ""
 
-#: src/libvlc.h:791 modules/control/hotkeys.c:614
-#: modules/gui/macosx/controls.m:578 modules/gui/macosx/intf.m:452
-#: modules/gui/macosx/intf.m:501 modules/gui/macosx/intf.m:574
-#: modules/gui/wxwidgets/interface.cpp:1569
-#: modules/gui/wxwidgets/menus.cpp:285
+#: src/libvlc.h:804 modules/control/hotkeys.c:621
+#: modules/gui/macosx/controls.m:578 modules/gui/macosx/intf.m:441
+#: modules/gui/macosx/intf.m:490 modules/gui/macosx/intf.m:563
+#: modules/gui/wxwidgets/interface.cpp:1549
+#: modules/gui/wxwidgets/menus.cpp:286
 msgid "Previous"
 msgstr ""
 
-#: src/libvlc.h:792
+#: src/libvlc.h:805
 msgid "Select the hotkey to use to skip to the previous item in the playlist."
 msgstr ""
 
-#: src/libvlc.h:793 modules/gui/macosx/controls.m:570
-#: modules/gui/macosx/intf.m:455 modules/gui/macosx/intf.m:498
-#: modules/gui/macosx/intf.m:572 modules/gui/pda/pda_interface.c:274
-#: modules/gui/pda/pda_interface.c:275 modules/gui/wxwidgets/interface.cpp:489
-#: modules/gui/wxwidgets/interface.cpp:1571
-#: modules/gui/wxwidgets/menus.cpp:284 modules/visualization/xosd.c:235
-#: modules/visualization/xosd.c:236
-#, c-format
+#: src/libvlc.h:806 modules/gui/macosx/controls.m:570
+#: modules/gui/macosx/intf.m:444 modules/gui/macosx/intf.m:487
+#: modules/gui/macosx/intf.m:561 modules/gui/pda/pda_interface.c:274
+#: modules/gui/pda/pda_interface.c:275
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:86
+#: modules/gui/wxwidgets/interface.cpp:553
+#: modules/gui/wxwidgets/interface.cpp:1551
+#: modules/gui/wxwidgets/menus.cpp:285 modules/visualization/xosd.c:235
 msgid "Stop"
 msgstr ""
 
-#: src/libvlc.h:794
+#: src/libvlc.h:807
 msgid "Select the hotkey to stop the playback."
 msgstr ""
 
-#: src/libvlc.h:795 modules/gui/macosx/intf.m:460
-#: modules/video_filter/marq.c:120 modules/video_filter/rss.c:158
+#: src/libvlc.h:808 modules/gui/macosx/intf.m:449
+#: modules/video_filter/marq.c:121 modules/video_filter/rss.c:158
 msgid "Position"
 msgstr ""
 
-#: src/libvlc.h:796
+#: src/libvlc.h:809
 msgid "Select the hotkey to display the position."
 msgstr ""
 
-#: src/libvlc.h:798
-msgid "Jump 3 seconds backwards"
+#: src/libvlc.h:811
+msgid "Very short backwards jump"
 msgstr ""
 
-#: src/libvlc.h:799
-msgid "Select the hotkey to jump 3 seconds backwards."
+#: src/libvlc.h:813
+#, fuzzy
+msgid "Select the hotkey to make a very short backwards jump."
 msgstr ""
+"Select the key to go back (to the previous media item) in the browsing "
+"history."
 
-#: src/libvlc.h:800
-msgid "Jump 10 seconds backwards"
-msgstr ""
+#: src/libvlc.h:814
+#, fuzzy
+msgid "Short backwards jump"
+msgstr "Go backward"
 
-#: src/libvlc.h:801
-msgid "Select the hotkey to jump 10 seconds backwards."
+#: src/libvlc.h:816
+#, fuzzy
+msgid "Select the hotkey to make a short backwards jump."
 msgstr ""
+"Select the key to go back (to the previous media item) in the browsing "
+"history."
 
-#: src/libvlc.h:803
-msgid "Jump 1 minute backwards"
+#: src/libvlc.h:818
+msgid "Medium backwards jump"
 msgstr ""
 
-#: src/libvlc.h:804
-msgid "Select the hotkey to jump 1 minute backwards."
+#: src/libvlc.h:820
+msgid "Select the hotkey to make a medium backwards jump."
 msgstr ""
 
-#: src/libvlc.h:805
-msgid "Jump 5 minutes backwards"
+#: src/libvlc.h:821
+#, fuzzy
+msgid "Long backwards jump"
+msgstr "Go backward"
+
+#: src/libvlc.h:823
+#, fuzzy
+msgid "Select the hotkey to make a long backwards jump."
 msgstr ""
+"Select the key to go back (to the previous media item) in the browsing "
+"history."
 
-#: src/libvlc.h:806
-msgid "Select the hotkey to jump 5 minutes backwards."
+#: src/libvlc.h:825
+msgid "Very short forward jump"
 msgstr ""
 
-#: src/libvlc.h:808
-msgid "Jump 3 seconds forward"
+#: src/libvlc.h:827
+#, fuzzy
+msgid "Select the hotkey to make a very short forward jump."
 msgstr ""
+"Select the key to go back (to the previous media item) in the browsing "
+"history."
 
-#: src/libvlc.h:809
-msgid "Select the hotkey to jump 3 seconds forward."
+#: src/libvlc.h:828
+msgid "Short forward jump"
 msgstr ""
 
-#: src/libvlc.h:810
-msgid "Jump 10 seconds forward"
+#: src/libvlc.h:830
+#, fuzzy
+msgid "Select the hotkey to make a short forward jump."
 msgstr ""
+"Select the key to go back (to the previous media item) in the browsing "
+"history."
 
-#: src/libvlc.h:811
-msgid "Select the hotkey to jump 10 seconds forward."
+#: src/libvlc.h:832
+msgid "Medium forward jump"
 msgstr ""
 
-#: src/libvlc.h:813
-msgid "Jump 1 minute forward"
+#: src/libvlc.h:834
+#, fuzzy
+msgid "Select the hotkey to make a medium forward jump."
 msgstr ""
+"Select the key to go back (to the previous media item) in the browsing "
+"history."
 
-#: src/libvlc.h:814
-msgid "Select the hotkey to jump 1 minute forward."
+#: src/libvlc.h:835
+msgid "Long forward jump"
 msgstr ""
 
-#: src/libvlc.h:815
-msgid "Jump 5 minutes forward"
+#: src/libvlc.h:837
+#, fuzzy
+msgid "Select the hotkey to make a long forward jump."
 msgstr ""
+"Select the key to go back (to the previous media item) in the browsing "
+"history."
 
-#: src/libvlc.h:816
-msgid "Select the hotkey to jump 5 minutes forward."
+#: src/libvlc.h:839
+msgid "Very short jump size"
+msgstr ""
+
+#: src/libvlc.h:840
+msgid "Very short jump \"size\", in seconds"
+msgstr ""
+
+#: src/libvlc.h:841
+msgid "Short jump size"
+msgstr ""
+
+#: src/libvlc.h:842
+msgid "Short jump \"size\", in seconds"
+msgstr ""
+
+#: src/libvlc.h:843
+msgid "Medium jump size"
+msgstr ""
+
+#: src/libvlc.h:844
+msgid "Medium jump \"size\", in seconds"
+msgstr ""
+
+#: src/libvlc.h:845
+msgid "Long jump size"
 msgstr ""
 
-#: src/libvlc.h:818 modules/control/hotkeys.c:271
-#: modules/gui/beos/InterfaceWindow.cpp:257
+#: src/libvlc.h:846
+msgid "Long jump \"size\", in seconds"
+msgstr ""
+
+#: src/libvlc.h:848 modules/control/hotkeys.c:275
+#: modules/gui/beos/InterfaceWindow.cpp:274
 msgid "Quit"
 msgstr ""
 
-#: src/libvlc.h:819
+#: src/libvlc.h:849
 msgid "Select the hotkey to quit the application."
 msgstr ""
 
-#: src/libvlc.h:820
+#: src/libvlc.h:850
 msgid "Navigate up"
 msgstr ""
 
-#: src/libvlc.h:821
+#: src/libvlc.h:851
 msgid "Select the key to move the selector up in DVD menus."
 msgstr ""
 
-#: src/libvlc.h:822
+#: src/libvlc.h:852
 msgid "Navigate down"
 msgstr ""
 
-#: src/libvlc.h:823
+#: src/libvlc.h:853
 msgid "Select the key to move the selector down in DVD menus."
 msgstr ""
 
-#: src/libvlc.h:824
+#: src/libvlc.h:854
 msgid "Navigate left"
 msgstr ""
 
-#: src/libvlc.h:825
+#: src/libvlc.h:855
 msgid "Select the key to move the selector left in DVD menus."
 msgstr ""
 
-#: src/libvlc.h:826
+#: src/libvlc.h:856
 msgid "Navigate right"
 msgstr ""
 
-#: src/libvlc.h:827
+#: src/libvlc.h:857
 msgid "Select the key to move the selector right in DVD menus."
 msgstr ""
 
-#: src/libvlc.h:828
+#: src/libvlc.h:858
 msgid "Activate"
 msgstr ""
 
-#: src/libvlc.h:829
+#: src/libvlc.h:859
 msgid "Select the key to activate selected item in DVD menus."
 msgstr ""
 
-#: src/libvlc.h:830
+#: src/libvlc.h:860
+msgid "Go to the DVD menu"
+msgstr ""
+
+#: src/libvlc.h:861
+#, fuzzy
+msgid "Select the key to take you to the DVD menu"
+msgstr ""
+"Select the key to go back (to the previous media item) in the browsing "
+"history."
+
+#: src/libvlc.h:862
 msgid "Select previous DVD title"
 msgstr ""
 
-#: src/libvlc.h:831
+#: src/libvlc.h:863
 #, fuzzy
 msgid "Select the key to choose the previous title from the DVD"
 msgstr ""
 "Select the key to go back (to the previous media item) in the browsing "
 "history."
 
-#: src/libvlc.h:832
+#: src/libvlc.h:864
 #, fuzzy
 msgid "Select next DVD title"
 msgstr "Next file"
 
-#: src/libvlc.h:833
+#: src/libvlc.h:865
 #, fuzzy
 msgid "Select the key to choose the next title from the DVD"
 msgstr ""
 "Select the key to go forward (to the next media item) in the browsing "
 "history."
 
-#: src/libvlc.h:834 src/libvlc.h:836
+#: src/libvlc.h:866 src/libvlc.h:868
 msgid "Select prev DVD chapter"
 msgstr ""
 
-#: src/libvlc.h:835
+#: src/libvlc.h:867
 #, fuzzy
 msgid "Select the key to choose the previous chapter from the DVD"
 msgstr ""
 "Select the key to go back (to the previous media item) in the browsing "
 "history."
 
-#: src/libvlc.h:837
+#: src/libvlc.h:869
 msgid "Select the key to choose the next chapter from the DVD"
 msgstr ""
 
-#: src/libvlc.h:838
+#: src/libvlc.h:870
 msgid "Volume up"
 msgstr ""
 
-#: src/libvlc.h:839
+#: src/libvlc.h:871
 msgid "Select the key to increase audio volume."
 msgstr ""
 
-#: src/libvlc.h:840
+#: src/libvlc.h:872
 msgid "Volume down"
 msgstr ""
 
-#: src/libvlc.h:841
+#: src/libvlc.h:873
 msgid "Select the key to decrease audio volume."
 msgstr ""
 
-#: src/libvlc.h:842 modules/gui/macosx/controls.m:613
-#: modules/gui/macosx/intf.m:519 modules/gui/macosx/intf.m:575
+#: src/libvlc.h:874 modules/gui/macosx/controls.m:613
+#: modules/gui/macosx/intf.m:508 modules/gui/macosx/intf.m:564
 msgid "Mute"
 msgstr ""
 
-#: src/libvlc.h:843
+#: src/libvlc.h:875
 msgid "Select the key to turn off audio volume."
 msgstr ""
 
-#: src/libvlc.h:844
+#: src/libvlc.h:876
 msgid "Subtitle delay up"
 msgstr "Subtitle delay up"
 
-#: src/libvlc.h:845
+#: src/libvlc.h:877
 msgid "Select the key to increase the subtitle delay."
 msgstr ""
 
-#: src/libvlc.h:846
+#: src/libvlc.h:878
 msgid "Subtitle delay down"
 msgstr "Subtitle delay down"
 
-#: src/libvlc.h:847
+#: src/libvlc.h:879
 msgid "Select the key to decrease the subtitle delay."
 msgstr ""
 
-#: src/libvlc.h:848
+#: src/libvlc.h:880
 #, fuzzy
 msgid "Audio delay up"
 msgstr "Subtitle delay up"
 
-#: src/libvlc.h:849
+#: src/libvlc.h:881
 msgid "Select the key to increase the audio delay."
 msgstr ""
 
-#: src/libvlc.h:850
+#: src/libvlc.h:882
 #, fuzzy
 msgid "Audio delay down"
 msgstr "Subtitle delay down"
 
-#: src/libvlc.h:851
+#: src/libvlc.h:883
 msgid "Select the key to decrease the audio delay."
 msgstr ""
 
-#: src/libvlc.h:852
+#: src/libvlc.h:884
 msgid "Play playlist bookmark 1"
 msgstr ""
 
-#: src/libvlc.h:853
+#: src/libvlc.h:885
 msgid "Play playlist bookmark 2"
 msgstr ""
 
-#: src/libvlc.h:854
+#: src/libvlc.h:886
 msgid "Play playlist bookmark 3"
 msgstr ""
 
-#: src/libvlc.h:855
+#: src/libvlc.h:887
 msgid "Play playlist bookmark 4"
 msgstr ""
 
-#: src/libvlc.h:856
+#: src/libvlc.h:888
 msgid "Play playlist bookmark 5"
 msgstr ""
 
-#: src/libvlc.h:857
+#: src/libvlc.h:889
 msgid "Play playlist bookmark 6"
 msgstr ""
 
-#: src/libvlc.h:858
+#: src/libvlc.h:890
 msgid "Play playlist bookmark 7"
 msgstr ""
 
-#: src/libvlc.h:859
+#: src/libvlc.h:891
 msgid "Play playlist bookmark 8"
 msgstr ""
 
-#: src/libvlc.h:860
+#: src/libvlc.h:892
 msgid "Play playlist bookmark 9"
 msgstr ""
 
-#: src/libvlc.h:861
+#: src/libvlc.h:893
 msgid "Play playlist bookmark 10"
 msgstr ""
 
-#: src/libvlc.h:862
+#: src/libvlc.h:894
 msgid "Select the key to play this bookmark."
 msgstr ""
 
-#: src/libvlc.h:863
+#: src/libvlc.h:895
 msgid "Set playlist bookmark 1"
 msgstr ""
 
-#: src/libvlc.h:864
+#: src/libvlc.h:896
 msgid "Set playlist bookmark 2"
 msgstr ""
 
-#: src/libvlc.h:865
+#: src/libvlc.h:897
 msgid "Set playlist bookmark 3"
 msgstr ""
 
-#: src/libvlc.h:866
+#: src/libvlc.h:898
 msgid "Set playlist bookmark 4"
 msgstr ""
 
-#: src/libvlc.h:867
+#: src/libvlc.h:899
 msgid "Set playlist bookmark 5"
 msgstr ""
 
-#: src/libvlc.h:868
+#: src/libvlc.h:900
 msgid "Set playlist bookmark 6"
 msgstr ""
 
-#: src/libvlc.h:869
+#: src/libvlc.h:901
 msgid "Set playlist bookmark 7"
 msgstr ""
 
-#: src/libvlc.h:870
+#: src/libvlc.h:902
 msgid "Set playlist bookmark 8"
 msgstr ""
 
-#: src/libvlc.h:871
+#: src/libvlc.h:903
 msgid "Set playlist bookmark 9"
 msgstr ""
 
-#: src/libvlc.h:872
+#: src/libvlc.h:904
 msgid "Set playlist bookmark 10"
 msgstr ""
 
-#: src/libvlc.h:873
+#: src/libvlc.h:905
 msgid "Select the key to set this playlist bookmark."
 msgstr ""
 
-#: src/libvlc.h:875
+#: src/libvlc.h:907
 msgid "Go back in browsing history"
 msgstr ""
 
-#: src/libvlc.h:876
+#: src/libvlc.h:908
 msgid ""
 "Select the key to go back (to the previous media item) in the browsing "
 "history."
@@ -3122,11 +3218,11 @@ msgstr ""
 "Select the key to go back (to the previous media item) in the browsing "
 "history."
 
-#: src/libvlc.h:877
+#: src/libvlc.h:909
 msgid "Go forward in browsing history"
 msgstr ""
 
-#: src/libvlc.h:878
+#: src/libvlc.h:910
 msgid ""
 "Select the key to go forward (to the next media item) in the browsing "
 "history."
@@ -3134,60 +3230,87 @@ msgstr ""
 "Select the key to go forward (to the next media item) in the browsing "
 "history."
 
-#: src/libvlc.h:880
+#: src/libvlc.h:912
 msgid "Cycle audio track"
 msgstr ""
 
-#: src/libvlc.h:881
+#: src/libvlc.h:913
 msgid "Cycle through the available audio tracks(languages)"
 msgstr ""
 
-#: src/libvlc.h:882
+#: src/libvlc.h:914
 #, fuzzy
 msgid "Cycle subtitle track"
 msgstr "Choose subtitle track"
 
-#: src/libvlc.h:883
+#: src/libvlc.h:915
 msgid "Cycle through the available subtitle tracks"
 msgstr ""
 
-#: src/libvlc.h:884
+#: src/libvlc.h:916
+#, fuzzy
+msgid "Cycle source aspect ratio"
+msgstr "Codec setting"
+
+#: src/libvlc.h:917
+msgid "Cycle through a predefined list of source aspect ratios"
+msgstr ""
+
+#: src/libvlc.h:918
+#, fuzzy
+msgid "Cycle video crop"
+msgstr "Greyscale video output"
+
+#: src/libvlc.h:919
+msgid "Cycle through a predefined list of crop formats"
+msgstr ""
+
+#: src/libvlc.h:920
+#, fuzzy
+msgid "Cycle deinterlace modes"
+msgstr "Deinterlace video"
+
+#: src/libvlc.h:921
+msgid "Cycle through all the deinterlace modes"
+msgstr ""
+
+#: src/libvlc.h:922
 #, fuzzy
 msgid "Show interface"
 msgstr "Add Interface"
 
-#: src/libvlc.h:885
+#: src/libvlc.h:923
 msgid "Raise the interface above all other windows"
 msgstr ""
 
-#: src/libvlc.h:886
+#: src/libvlc.h:924
 #, fuzzy
 msgid "Hide interface"
 msgstr "Add Interface"
 
-#: src/libvlc.h:887
+#: src/libvlc.h:925
 msgid "Lower the interface below all other windows"
 msgstr ""
 
-#: src/libvlc.h:888
+#: src/libvlc.h:926
 msgid "Take video snapshot"
 msgstr ""
 
-#: src/libvlc.h:889
+#: src/libvlc.h:927
 msgid "Takes a video snapshot and writes it to disk."
 msgstr ""
 
-#: src/libvlc.h:891 modules/access_filter/record.c:50
+#: src/libvlc.h:929 modules/access_filter/record.c:50
 #: modules/access_filter/record.c:51
 #, fuzzy
 msgid "Record"
 msgstr "Append to file"
 
-#: src/libvlc.h:892
+#: src/libvlc.h:930
 msgid "Record access filter start/stop."
 msgstr ""
 
-#: src/libvlc.h:896
+#: src/libvlc.h:934
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [playlistitems] ...\n"
@@ -3203,7 +3326,8 @@ msgid ""
 "            and that overrides previous settings.\n"
 "\n"
 "Playlistitem MRL syntax:\n"
-"  URL[@[title][:chapter][-[title][:chapter]]] [:option=value ...]\n"
+"  [[access][/demux]://]URL[@[title][:chapter][-[title][:chapter]]] [:"
+"option=value ...]\n"
 "\n"
 "  Many of the global --options can also be used as MRL specific :options.\n"
 "  Multiple :option=value pairs can be specified.\n"
@@ -3237,138 +3361,138 @@ msgstr ""
 "  vlc:pause                      pause execution of playlist items\n"
 "  vlc:quit                       quit VLC\n"
 
-#: src/libvlc.h:1004 src/video_output/vout_intf.c:239
+#: src/libvlc.h:1042 src/video_output/vout_intf.c:337
 #: modules/gui/macosx/controls.m:288 modules/gui/macosx/controls.m:622
-#: modules/gui/macosx/intf.m:536 modules/video_output/snapshot.c:75
+#: modules/gui/macosx/intf.m:525 modules/video_output/snapshot.c:75
 msgid "Snapshot"
 msgstr ""
 
-#: src/libvlc.h:1011
+#: src/libvlc.h:1049
 #, fuzzy
 msgid "Window properties"
 msgstr "Device properties"
 
-#: src/libvlc.h:1045
+#: src/libvlc.h:1085
 #, fuzzy
 msgid "Subpictures"
 msgstr "Subtitles Track"
 
-#: src/libvlc.h:1048 modules/codec/subsdec.c:92 modules/demux/subtitle.c:61
-#: modules/gui/beos/InterfaceWindow.cpp:260
+#: src/libvlc.h:1088 modules/codec/subsdec.c:92 modules/demux/subtitle.c:61
+#: modules/gui/beos/InterfaceWindow.cpp:277
 #, fuzzy
 msgid "Subtitles"
 msgstr "Subtitles Track"
 
-#: src/libvlc.h:1065
+#: src/libvlc.h:1105
 msgid "Overlays"
 msgstr ""
 
-#: src/libvlc.h:1072
-#, fuzzy
-msgid "Input"
-msgstr "&Shuffle Playlist"
-
-#: src/libvlc.h:1089
+#: src/libvlc.h:1113
 #, fuzzy
 msgid "Track settings"
 msgstr "Audio encoders settings"
 
-#: src/libvlc.h:1108
+#: src/libvlc.h:1131
 msgid "Playback control"
 msgstr ""
 
-#: src/libvlc.h:1123
+#: src/libvlc.h:1146
 #, fuzzy
 msgid "Default devices"
 msgstr "Next file"
 
-#: src/libvlc.h:1132
+#: src/libvlc.h:1155
 #, fuzzy
 msgid "Network settings"
 msgstr "Decoder modules settings"
 
-#: src/libvlc.h:1146
+#: src/libvlc.h:1167
 msgid "Socks proxy"
 msgstr ""
 
-#: src/libvlc.h:1155
+#: src/libvlc.h:1176
 msgid "Metadata"
 msgstr ""
 
-#: src/libvlc.h:1182
+#: src/libvlc.h:1203
 msgid "Decoders"
 msgstr ""
 
-#: src/libvlc.h:1228
+#: src/libvlc.h:1210 modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:375
+#, fuzzy
+msgid "Input"
+msgstr "&Shuffle Playlist"
+
+#: src/libvlc.h:1266
 #, fuzzy
 msgid "CPU"
 msgstr "TCP"
 
-#: src/libvlc.h:1243
+#: src/libvlc.h:1281
 #, fuzzy
 msgid "Special modules"
 msgstr "Audio output access method"
 
-#: src/libvlc.h:1249
+#: src/libvlc.h:1287
 msgid "Plugins"
 msgstr ""
 
-#: src/libvlc.h:1255
+#: src/libvlc.h:1293
 #, fuzzy
 msgid "Performance options"
 msgstr "Advanced options..."
 
-#: src/libvlc.h:1343
+#: src/libvlc.h:1381
 msgid "Hot keys"
 msgstr ""
 
-#: src/libvlc.h:1641
+#: src/libvlc.h:1704
 msgid "main program"
 msgstr "main program"
 
-#: src/libvlc.h:1648
+#: src/libvlc.h:1711
 msgid "print help for VLC (can be combined with --advanced)"
 msgstr ""
 
-#: src/libvlc.h:1650
+#: src/libvlc.h:1713
 msgid ""
 "print help for VLC and all it's modules (can be combined with --advanced)"
 msgstr ""
 
-#: src/libvlc.h:1652
+#: src/libvlc.h:1715
 #, fuzzy
 msgid "print help for the advanced options"
 msgstr "Advanced options"
 
-#: src/libvlc.h:1654
+#: src/libvlc.h:1717
 msgid "ask for extra verbosity when displaying help"
 msgstr ""
 
-#: src/libvlc.h:1656
+#: src/libvlc.h:1719
 msgid "print a list of available modules"
 msgstr ""
 
-#: src/libvlc.h:1658
+#: src/libvlc.h:1721
 msgid "print help on a specific module (can be combined with --advanced)"
 msgstr ""
 
-#: src/libvlc.h:1660
+#: src/libvlc.h:1723
 msgid "save the current command line options in the config"
 msgstr ""
 
-#: src/libvlc.h:1662
+#: src/libvlc.h:1725
 msgid "reset the current config to the default values"
 msgstr ""
 
-#: src/libvlc.h:1664
+#: src/libvlc.h:1727
 msgid "use alternate config file"
 msgstr ""
 
-#: src/libvlc.h:1666
+#: src/libvlc.h:1729
 msgid "resets the current plugins cache"
 msgstr ""
 
-#: src/libvlc.h:1668
+#: src/libvlc.h:1731
 msgid "print version information"
 msgstr ""
 
@@ -3988,7 +4112,7 @@ msgstr ""
 msgid "Zulu"
 msgstr ""
 
-#: src/misc/iso_lang.c:70 modules/gui/wxwidgets/preferences.cpp:965
+#: src/misc/iso_lang.c:70 modules/gui/wxwidgets/dialogs/preferences.cpp:960
 msgid "Unknown"
 msgstr ""
 
@@ -4012,60 +4136,69 @@ msgstr ""
 msgid "Undefined"
 msgstr ""
 
-#: src/video_output/video_output.c:436 modules/gui/macosx/intf.m:543
-#: modules/gui/macosx/intf.m:544 modules/video_filter/deinterlace.c:113
+#: src/video_output/video_output.c:372 modules/gui/macosx/intf.m:532
+#: modules/gui/macosx/intf.m:533 modules/video_filter/deinterlace.c:116
 msgid "Deinterlace"
 msgstr ""
 
-#: src/video_output/video_output.c:440 modules/video_filter/deinterlace.c:108
+#: src/video_output/video_output.c:376 modules/video_filter/deinterlace.c:111
 msgid "Discard"
 msgstr ""
 
-#: src/video_output/video_output.c:442 modules/video_filter/deinterlace.c:108
+#: src/video_output/video_output.c:378 modules/video_filter/deinterlace.c:111
 msgid "Blend"
 msgstr ""
 
-#: src/video_output/video_output.c:444 modules/video_filter/deinterlace.c:108
+#: src/video_output/video_output.c:380 modules/video_filter/deinterlace.c:111
 msgid "Mean"
 msgstr ""
 
-#: src/video_output/video_output.c:446 modules/video_filter/deinterlace.c:109
+#: src/video_output/video_output.c:382 modules/video_filter/deinterlace.c:112
 msgid "Bob"
 msgstr ""
 
-#: src/video_output/video_output.c:448 modules/video_filter/deinterlace.c:109
+#: src/video_output/video_output.c:384 modules/video_filter/deinterlace.c:112
 msgid "Linear"
 msgstr ""
 
-#: src/video_output/vout_intf.c:191
+#: src/video_output/vout_intf.c:198
 msgid "Zoom"
 msgstr ""
 
-#: src/video_output/vout_intf.c:203
+#: src/video_output/vout_intf.c:210
 msgid "1:4 Quarter"
 msgstr ""
 
-#: src/video_output/vout_intf.c:205
+#: src/video_output/vout_intf.c:212
 msgid "1:2 Half"
 msgstr ""
 
-#: src/video_output/vout_intf.c:207
+#: src/video_output/vout_intf.c:214
 msgid "1:1 Original"
 msgstr ""
 
-#: src/video_output/vout_intf.c:209
+#: src/video_output/vout_intf.c:216
 msgid "2:1 Double"
 msgstr ""
 
+#: src/video_output/vout_intf.c:227 modules/video_filter/crop.c:62
+msgid "Crop"
+msgstr ""
+
+#: src/video_output/vout_intf.c:288
+#, fuzzy
+msgid "Aspect-ratio"
+msgstr "Codec setting"
+
 #: modules/access/cdda.c:42 modules/access/dshow/dshow.cpp:79
-#: modules/access/dvb/access.c:67 modules/access/dvdnav.c:63
-#: modules/access/dvdread.c:61 modules/access/fake.c:40
-#: modules/access/file.c:80 modules/access/ftp.c:48
-#: modules/access/gnomevfs.c:43 modules/access/http.c:51
+#: modules/access/dvb/access.c:67 modules/access/dv.c:68
+#: modules/access/dvdnav.c:63 modules/access/dvdread.c:61
+#: modules/access/fake.c:40 modules/access/file.c:80 modules/access/ftp.c:48
+#: modules/access/gnomevfs.c:44 modules/access/http.c:51
 #: modules/access/mms/mms.c:46 modules/access/pvr/pvr.c:46
-#: modules/access/pvr/pvr.c:97 modules/access/screen/screen.c:37
-#: modules/access/smb.c:59 modules/access/tcp.c:37 modules/access/udp.c:42
-#: modules/access/v4l/v4l.c:73 modules/access/vcd/vcd.c:40
+#: modules/access/screen/screen.c:37 modules/access/smb.c:59
+#: modules/access/tcp.c:37 modules/access/udp.c:42 modules/access/v4l/v4l.c:73
+#: modules/access/vcd/vcd.c:40
 msgid "Caching value in ms"
 msgstr ""
 
@@ -4079,7 +4212,7 @@ msgstr ""
 
 #: modules/access/cdda.c:48 modules/gui/macosx/open.m:176
 #: modules/gui/macosx/open.m:496 modules/gui/macosx/open.m:587
-#: modules/gui/wxwidgets/open.cpp:682
+#: modules/gui/wxwidgets/dialogs/open.cpp:677
 #, fuzzy
 msgid "Audio CD"
 msgstr "Audio PID"
@@ -4103,7 +4236,7 @@ msgid "Audio CD - Track %i"
 msgstr "Subtitle track: %s"
 
 #: modules/access/cdda/cdda.c:42 modules/access/directory.c:77
-#: modules/codec/x264.c:125
+#: modules/codec/x264.c:156
 msgid "none"
 msgstr ""
 
@@ -4366,7 +4499,7 @@ msgstr ""
 #: modules/access/cdda/info.c:325 modules/access/cdda/info.c:330
 #: modules/access/cdda/info.c:334 modules/access/dvdread.c:84
 #: modules/access/vcdx/info.c:88 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/open.m:375 modules/gui/wxwidgets/open.cpp:509
+#: modules/gui/macosx/open.m:375 modules/gui/wxwidgets/dialogs/open.cpp:504
 msgid "Disc"
 msgstr ""
 
@@ -4379,9 +4512,10 @@ msgid "Tracks"
 msgstr ""
 
 #: modules/access/cdda/info.c:390 modules/access/cdda/info.c:810
-#: modules/access/cdda/info.c:857 modules/access/vcdx/info.c:286
-#: modules/access/vcdx/info.c:287 modules/gui/wxwidgets/open.cpp:1646
-#: modules/gui/wxwidgets/open.cpp:1664
+#: modules/access/cdda/info.c:857 modules/access/vcdx/access.c:472
+#: modules/access/vcdx/info.c:286 modules/access/vcdx/info.c:287
+#: modules/gui/wxwidgets/dialogs/open.cpp:1645
+#: modules/gui/wxwidgets/dialogs/open.cpp:1663
 msgid "Track"
 msgstr ""
 
@@ -4441,7 +4575,8 @@ msgid "Standard filesystem directory input"
 msgstr ""
 
 #: modules/access/dshow/dshow.cpp:72 modules/access/dshow/dshow.cpp:74
-#: modules/video_output/opengl.c:117
+#: modules/codec/ffmpeg/ffmpeg.c:75 modules/demux/mpc.c:53
+#: modules/video_output/opengl.c:129
 msgid "None"
 msgstr ""
 
@@ -4764,6 +4899,22 @@ msgstr ""
 msgid "DVB input with v4l2 support"
 msgstr ""
 
+#: modules/access/dv.c:70 modules/access/file.c:82
+msgid ""
+"Allows you to modify the default caching value for file streams. This value "
+"should be set in millisecond units."
+msgstr ""
+"Allows you to modify the default caching value for file streams. This value "
+"should be set in millisecond units."
+
+#: modules/access/dv.c:74
+msgid "Digital Video (Firewire/ieee1394)  input"
+msgstr ""
+
+#: modules/access/dv.c:75
+msgid "dv"
+msgstr ""
+
 #: modules/access/dvdnav.c:59 modules/access/dvdread.c:57
 msgid "DVD angle"
 msgstr ""
@@ -4867,7 +5018,7 @@ msgstr ""
 "Allows you to modify the default caching value for file streams. This value "
 "should be set in millisecond units."
 
-#: modules/access/fake.c:44 modules/access/pvr/pvr.c:69
+#: modules/access/fake.c:44 modules/access/pvr/pvr.c:72
 #: modules/access/v4l/v4l.c:136
 #, fuzzy
 msgid "Framerate"
@@ -4878,7 +5029,7 @@ msgid "Specifies the number of frames per second (eg. 24, 25, 29.97, 30)."
 msgstr ""
 
 #: modules/access/fake.c:47 modules/stream_out/bridge.c:36
-#: modules/stream_out/mosaic_bridge.c:100
+#: modules/stream_out/mosaic_bridge.c:103
 msgid "ID"
 msgstr ""
 
@@ -4908,14 +5059,6 @@ msgstr ""
 msgid "Fake input"
 msgstr "TCP input"
 
-#: modules/access/file.c:82
-msgid ""
-"Allows you to modify the default caching value for file streams. This value "
-"should be set in millisecond units."
-msgstr ""
-"Allows you to modify the default caching value for file streams. This value "
-"should be set in millisecond units."
-
 #: modules/access/file.c:84
 msgid "Concatenate with additional files"
 msgstr ""
@@ -4928,18 +5071,19 @@ msgstr ""
 "Allows you to play split files as if they were part of a unique file. "
 "Specify a comma-separated list of files."
 
-#: modules/access/file.c:90 modules/access/rtsp/access.c:46
+#: modules/access/file.c:90
 msgid "Standard filesystem file input"
 msgstr ""
 
 #: modules/access/file.c:91 modules/access_output/file.c:71
-#: modules/audio_output/file.c:111 modules/gui/beos/InterfaceWindow.cpp:244
+#: modules/audio_output/file.c:111 modules/gui/beos/InterfaceWindow.cpp:261
 #: modules/gui/beos/MediaControlView.cpp:1232
 #: modules/gui/beos/PlayListWindow.cpp:85 modules/gui/macosx/open.m:160
 #: modules/gui/macosx/open.m:371 modules/gui/macosx/output.m:142
 #: modules/gui/macosx/output.m:232 modules/gui/macosx/output.m:373
-#: modules/gui/pda/pda_interface.c:366 modules/gui/wxwidgets/open.cpp:507
-#: modules/gui/wxwidgets/streamout.cpp:439
+#: modules/gui/pda/pda_interface.c:366
+#: modules/gui/wxwidgets/dialogs/open.cpp:502
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:472
 #, fuzzy
 msgid "File"
 msgstr "Title"
@@ -5021,7 +5165,7 @@ msgstr ""
 msgid "FTP input"
 msgstr "TCP input"
 
-#: modules/access/gnomevfs.c:45
+#: modules/access/gnomevfs.c:46
 #, fuzzy
 msgid ""
 "Allows you to modify the default caching value for GnomeVFS streams.This "
@@ -5030,12 +5174,8 @@ msgstr ""
 "Allows you to modify the default caching value for FTP streams. This value "
 "should be set in millisecond units."
 
-#: modules/access/gnomevfs.c:49
-msgid "GnomeVFS filesystem file input"
-msgstr ""
-
 #: modules/access/gnomevfs.c:50
-msgid "GnomeVFS"
+msgid "GnomeVFS filesystem file input"
 msgstr ""
 
 #: modules/access/http.c:45
@@ -5087,17 +5227,18 @@ msgstr "Codec setting"
 
 #: modules/access/http.c:65
 msgid ""
-"Enable this option to read a file that is being constantly updated (for "
-"example, a JPG file on a server)"
+"This allows you to read a file that is being constantly updated (for "
+"example, a JPG file on a server).You should not globally enable this option "
+"as it will break all other types of HTTP streams."
 msgstr ""
 
-#: modules/access/http.c:69
+#: modules/access/http.c:71
 #, fuzzy
 msgid "HTTP input"
 msgstr "TCP input"
 
-#: modules/access/http.c:71
-msgid "HTTP/HTTPS"
+#: modules/access/http.c:73
+msgid "HTTP(S)"
 msgstr ""
 
 #: modules/access/mms/mms.c:48
@@ -5113,18 +5254,17 @@ msgid "Force selection of all streams"
 msgstr ""
 
 #: modules/access/mms/mms.c:53
-msgid "Select maximum bitrate stream"
-msgstr ""
+#, fuzzy
+msgid "Maximum bitrate"
+msgstr "Video bitrate"
 
 #: modules/access/mms/mms.c:55
-msgid "Always select the stream with the maximum bitrate."
-msgstr ""
-
-#: modules/access/mms/mms.c:58
-msgid "MMS"
+msgid ""
+"If this is set, the stream with the maximum bitrate under that limit      "
+"will be selected"
 msgstr ""
 
-#: modules/access/mms/mms.c:59
+#: modules/access/mms/mms.c:60
 msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
@@ -5228,7 +5368,7 @@ msgid "HTTP stream output"
 msgstr "HTTP stream output"
 
 #: modules/access_output/http.c:89 modules/control/http/http.c:58
-#: modules/gui/wxwidgets/streamout.cpp:440
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:473
 msgid "HTTP"
 msgstr ""
 
@@ -5266,11 +5406,6 @@ msgstr ""
 msgid "libshout (icecast) output"
 msgstr ""
 
-#: modules/access_output/shout.c:72
-#, fuzzy
-msgid "Shout"
-msgstr "Add Interface"
-
 #: modules/access_output/udp.c:75 modules/access/rtsp/access.c:40
 #: modules/demux/livedotcom.cpp:61
 msgid "Caching value (ms)"
@@ -5316,11 +5451,12 @@ msgstr ""
 msgid "UDP stream output"
 msgstr "UDP stream output"
 
-#: modules/access_output/udp.c:98 modules/gui/wxwidgets/streamout.cpp:442
+#: modules/access_output/udp.c:98
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:476
 msgid "UDP"
 msgstr "UDP"
 
-#: modules/access/pvr/pvr.c:48 modules/access/pvr/pvr.c:99
+#: modules/access/pvr/pvr.c:48
 #, fuzzy
 msgid ""
 "Allows you to modify the default caching value for pvr streams. This value "
@@ -5339,132 +5475,151 @@ msgstr "Video Device"
 msgid "PVR video device"
 msgstr "Video Device"
 
-#: modules/access/pvr/pvr.c:54 modules/access/v4l/v4l.c:96
+#: modules/access/pvr/pvr.c:54
+#, fuzzy
+msgid "Radio device"
+msgstr "Audio Device"
+
+#: modules/access/pvr/pvr.c:55
+#, fuzzy
+msgid "PVR radio device"
+msgstr "Video Device"
+
+#: modules/access/pvr/pvr.c:57 modules/access/v4l/v4l.c:96
 msgid "Norm"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:55 modules/access/v4l/v4l.c:98
+#: modules/access/pvr/pvr.c:58 modules/access/v4l/v4l.c:98
 msgid "Defines the norm of the stream (Automatic, SECAM, PAL, or NTSC)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:58 modules/access/v4l/v4l.c:102
+#: modules/access/pvr/pvr.c:61 modules/access/v4l/v4l.c:102
 msgid "Width"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:59 modules/access/v4l/v4l.c:103
+#: modules/access/pvr/pvr.c:62 modules/access/v4l/v4l.c:103
 msgid "Width of the stream to capture (-1 for autodetect)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:62 modules/access/v4l/v4l.c:105
+#: modules/access/pvr/pvr.c:65 modules/access/v4l/v4l.c:105
 #, fuzzy
 msgid "Height"
 msgstr "Right"
 
-#: modules/access/pvr/pvr.c:63 modules/access/v4l/v4l.c:106
+#: modules/access/pvr/pvr.c:66 modules/access/v4l/v4l.c:106
 msgid "Height of the stream to capture (-1 for autodetect)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:66 modules/access/v4l/v4l.c:89
+#: modules/access/pvr/pvr.c:69 modules/access/v4l/v4l.c:89
 msgid "Frequency"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:67 modules/access/v4l/v4l.c:91
+#: modules/access/pvr/pvr.c:70 modules/access/v4l/v4l.c:91
 msgid "Frequency to capture (in kHz), if applicable"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:70 modules/access/v4l/v4l.c:137
+#: modules/access/pvr/pvr.c:73 modules/access/v4l/v4l.c:137
 msgid "Framerate to capture, if applicable (-1 for autodetect)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:73
+#: modules/access/pvr/pvr.c:76
 msgid "Key interval"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:74
+#: modules/access/pvr/pvr.c:77
 msgid "Interval between keyframes (-1 for autodetect)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:76
+#: modules/access/pvr/pvr.c:79
 msgid "B Frames"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:77
+#: modules/access/pvr/pvr.c:80
 msgid ""
 "If this option is set, B-Frames will be used. Use this option to set the "
 "number of B-Frames."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:81
+#: modules/access/pvr/pvr.c:84
 msgid "Bitrate to use (-1 for default)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:83
+#: modules/access/pvr/pvr.c:86
 #, fuzzy
 msgid "Bitrate peak"
 msgstr "Bitrate"
 
-#: modules/access/pvr/pvr.c:84
+#: modules/access/pvr/pvr.c:87
 msgid "Peak bitrate in VBR mode"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:86
+#: modules/access/pvr/pvr.c:89
 msgid "Bitrate mode (vbr or cbr)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:87
+#: modules/access/pvr/pvr.c:90
 msgid "Bitrate mode to use"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:89
+#: modules/access/pvr/pvr.c:92
 #, fuzzy
 msgid "Audio bitmask"
 msgstr "Audio bitrate"
 
-#: modules/access/pvr/pvr.c:90
+#: modules/access/pvr/pvr.c:93
 msgid ""
 "This option allows setting of bitmask that will get used by the audio part "
 "of the card."
 msgstr ""
 
-#: modules/access/pvr/pvr.c:93 modules/access/v4l/v4l.c:92
+#: modules/access/pvr/pvr.c:96 modules/access/vcdx/info.c:97
+#: modules/gui/macosx/intf.m:448 modules/gui/wxwidgets/interface.cpp:1423
+msgid "Volume"
+msgstr ""
+
+#: modules/access/pvr/pvr.c:97
+msgid "This option allows setting of the audio volume (0-65535)."
+msgstr ""
+
+#: modules/access/pvr/pvr.c:100 modules/access/v4l/v4l.c:92
 #, fuzzy
 msgid "Channel"
 msgstr "Channels"
 
-#: modules/access/pvr/pvr.c:94 modules/access/v4l/v4l.c:94
+#: modules/access/pvr/pvr.c:101 modules/access/v4l/v4l.c:94
 msgid ""
 "Channel of the card to use (Usually, 0 = tuner, 1 = composite, 2 = svideo)"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:105 modules/access/v4l/v4l.c:143
+#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
 msgid "Automatic"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:105 modules/access/v4l/v4l.c:143
+#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
 msgid "SECAM"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:105 modules/access/v4l/v4l.c:143
+#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
 msgid "PAL"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:105 modules/access/v4l/v4l.c:143
+#: modules/access/pvr/pvr.c:107 modules/access/v4l/v4l.c:143
 msgid "NTSC"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:108
+#: modules/access/pvr/pvr.c:110
 msgid "vbr"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:108
+#: modules/access/pvr/pvr.c:110
 msgid "cbr"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:111
+#: modules/access/pvr/pvr.c:115
 msgid "PVR"
 msgstr ""
 
-#: modules/access/pvr/pvr.c:112
+#: modules/access/pvr/pvr.c:116
 msgid "MPEG Encoding cards input (with ivtv drivers)"
 msgstr ""
 
@@ -5477,7 +5632,7 @@ msgstr ""
 "Allows you to modify the default caching value for FTP streams. This value "
 "should be set in millisecond units."
 
-#: modules/access/rtsp/access.c:47
+#: modules/access/rtsp/access.c:46 modules/access/rtsp/access.c:47
 msgid "Real RTSP"
 msgstr ""
 
@@ -5573,14 +5728,27 @@ msgstr ""
 msgid "Allows growing the MTU if truncated packets are found"
 msgstr ""
 
-#: modules/access/udp.c:55 modules/gui/macosx/open.m:183
-#: modules/gui/macosx/open.m:654 modules/gui/macosx/open.m:692
-#: modules/gui/wxwidgets/open.cpp:784
+#: modules/access/udp.c:51
+msgid "RTP reordering timeout in ms"
+msgstr ""
+
+#: modules/access/udp.c:53
 #, fuzzy
-msgid "UDP/RTP"
+msgid ""
+"Allows you to modify the RTP reordering behaviour. RTP input will wait for "
+"late packets upto the specified timeout in milisecond units."
+msgstr ""
+"Allows you to modify the default caching value for v4l streams. This value "
+"should be set in millisecond units."
+
+#: modules/access/udp.c:61 modules/gui/macosx/open.m:183
+#: modules/gui/macosx/open.m:654 modules/gui/macosx/open.m:692
+#: modules/gui/wxwidgets/dialogs/open.cpp:779
+#, fuzzy
+msgid "UDP/RTP"
 msgstr "UDP/RTP input"
 
-#: modules/access/udp.c:56
+#: modules/access/udp.c:62
 msgid "UDP/RTP input"
 msgstr "UDP/RTP input"
 
@@ -5626,7 +5794,7 @@ msgid "Audio Channel to use, if there are several audio input"
 msgstr ""
 
 #: modules/access/v4l/v4l.c:108 modules/gui/macosx/extended.m:107
-#: modules/gui/wxwidgets/extrapanel.cpp:236
+#: modules/gui/wxwidgets/extrapanel.cpp:237
 msgid "Brightness"
 msgstr ""
 
@@ -5635,7 +5803,7 @@ msgid "Set the Brightness of the video input"
 msgstr ""
 
 #: modules/access/v4l/v4l.c:111 modules/gui/macosx/extended.m:110
-#: modules/gui/wxwidgets/extrapanel.cpp:226
+#: modules/gui/wxwidgets/extrapanel.cpp:227
 msgid "Hue"
 msgstr ""
 
@@ -5652,7 +5820,7 @@ msgid "Set the Color of the video input"
 msgstr ""
 
 #: modules/access/v4l/v4l.c:117 modules/gui/macosx/extended.m:108
-#: modules/gui/wxwidgets/extrapanel.cpp:231
+#: modules/gui/wxwidgets/extrapanel.cpp:232
 msgid "Contrast"
 msgstr ""
 
@@ -5718,7 +5886,7 @@ msgstr "Video"
 
 #: modules/access/vcd/vcd.c:46 modules/gui/macosx/open.m:175
 #: modules/gui/macosx/open.m:489 modules/gui/macosx/open.m:579
-#: modules/gui/wxwidgets/open.cpp:681
+#: modules/gui/wxwidgets/dialogs/open.cpp:676
 msgid "VCD"
 msgstr ""
 
@@ -5739,41 +5907,32 @@ msgstr ""
 msgid "The above message had unknown vcdimager log level"
 msgstr ""
 
-#: modules/access/vcdx/access.c:282 modules/access/vcdx/access.c:690
-#: modules/access/vcdx/info.c:290 modules/access/vcdx/info.c:291
+#: modules/access/vcdx/access.c:282 modules/access/vcdx/access.c:364
+#: modules/access/vcdx/access.c:690 modules/access/vcdx/info.c:290
+#: modules/access/vcdx/info.c:291
 msgid "Entry"
 msgstr ""
 
-#: modules/access/vcdx/access.c:364
-msgid "Entry "
-msgstr ""
-
 #: modules/access/vcdx/access.c:409 modules/access/vcdx/info.c:102
 msgid "Segments"
 msgstr ""
 
-#: modules/access/vcdx/access.c:428 modules/demux/mkv.cpp:4986
-msgid "Segment "
-msgstr ""
-
-#: modules/access/vcdx/access.c:472
-msgid "Track "
+#: modules/access/vcdx/access.c:428 modules/access/vcdx/access.c:709
+#: modules/access/vcdx/info.c:294 modules/access/vcdx/info.c:295
+#: modules/demux/mkv.cpp:5196
+msgid "Segment"
 msgstr ""
 
 #: modules/access/vcdx/access.c:533
-msgid "LID "
-msgstr ""
-
-#: modules/access/vcdx/access.c:709 modules/access/vcdx/info.c:294
-#: modules/access/vcdx/info.c:295
-msgid "Segment"
+msgid "LID"
 msgstr ""
 
 #: modules/access/vcdx/info.c:90
 msgid "VCD Format"
 msgstr ""
 
-#: modules/access/vcdx/info.c:91 modules/services_discovery/daap.c:610
+#: modules/access/vcdx/info.c:91 modules/demux/mpc.c:53
+#: modules/services_discovery/daap.c:610
 msgid "Album"
 msgstr ""
 
@@ -5798,11 +5957,6 @@ msgstr ""
 msgid "Volume Set"
 msgstr ""
 
-#: modules/access/vcdx/info.c:97 modules/gui/macosx/intf.m:459
-#: modules/gui/wxwidgets/interface.cpp:1443
-msgid "Volume"
-msgstr ""
-
 #: modules/access/vcdx/info.c:98
 msgid "Publisher"
 msgstr ""
@@ -5920,6 +6074,15 @@ msgstr ""
 msgid "Format to use in the playlist's \"title\" field."
 msgstr ""
 
+#: modules/audio_filter/channel_mixer/dolby.c:47
+msgid "Simple decoder for dolby surround encoded streams"
+msgstr ""
+
+#: modules/audio_filter/channel_mixer/dolby.c:48
+#, fuzzy
+msgid "Dolby surround decoder"
+msgstr "Dolby Surround"
+
 #: modules/audio_filter/channel_mixer/headphone.c:49
 msgid ""
 "This effect gives you the feeling that you are standing in a room with a "
@@ -5940,12 +6103,33 @@ msgstr ""
 "Headphone virtual spatialisation effect parameter: distance between front "
 "left speaker and listener in meters."
 
-#: modules/audio_filter/channel_mixer/headphone.c:61
+#: modules/audio_filter/channel_mixer/headphone.c:60
+msgid "Compensate delay"
+msgstr ""
+
+#: modules/audio_filter/channel_mixer/headphone.c:62
+msgid ""
+"The delay which is introduced by the physical algorithm may sometimes be "
+"disturbing for the lipsync. In that case, turn this on to compensate."
+msgstr ""
+
+#: modules/audio_filter/channel_mixer/headphone.c:66
+#, fuzzy
+msgid "No decoding of Dolby Surround"
+msgstr "Dolby Surround"
+
+#: modules/audio_filter/channel_mixer/headphone.c:68
+msgid ""
+"If this option is turned on (not recommended), Dolby Surround encoded "
+"streams won't be decoded before being processed by this filter."
+msgstr ""
+
+#: modules/audio_filter/channel_mixer/headphone.c:73
 #, fuzzy
 msgid "Headphone channel mixer with virtual spatialization effect"
 msgstr "headphone channel mixer with virtual spatialisation effect"
 
-#: modules/audio_filter/channel_mixer/headphone.c:62
+#: modules/audio_filter/channel_mixer/headphone.c:74
 #, fuzzy
 msgid "Headphone effect"
 msgstr "Next file"
@@ -5971,8 +6155,17 @@ msgid ""
 "playback will be more adapted to a movie theater or a listening room."
 msgstr ""
 
-#: modules/audio_filter/converter/a52tofloat32.c:104
-#: modules/audio_filter/converter/a52tofloat32.c:112
+#: modules/audio_filter/converter/a52tofloat32.c:101
+#, fuzzy
+msgid "Enable internal upmixing"
+msgstr "Enable interlaced encoding"
+
+#: modules/audio_filter/converter/a52tofloat32.c:103
+msgid "Enable the internal upmixing algorithm (not recommended)."
+msgstr ""
+
+#: modules/audio_filter/converter/a52tofloat32.c:107
+#: modules/audio_filter/converter/a52tofloat32.c:116
 msgid "ATSC A/52 (AC-3) audio decoder"
 msgstr ""
 
@@ -6231,7 +6424,8 @@ msgstr "Dummy S/PDIF audio mixer"
 msgid "Trivial audio mixer"
 msgstr "Float32 audio mixer"
 
-#: modules/audio_output/alsa.c:84 modules/codec/x264.c:124
+#: modules/audio_output/alsa.c:84 modules/codec/x264.c:149
+#: modules/codec/x264.c:155
 msgid "default"
 msgstr ""
 
@@ -6244,40 +6438,40 @@ msgstr "File audio output"
 msgid "ALSA Device Name"
 msgstr ""
 
-#: modules/audio_output/alsa.c:130 modules/audio_output/auhal.c:95
+#: modules/audio_output/alsa.c:128 modules/audio_output/auhal.c:95
 #: modules/audio_output/auhal.c:565 modules/audio_output/coreaudio.c:217
-#: modules/audio_output/directx.c:412 modules/audio_output/oss.c:132
+#: modules/audio_output/directx.c:403 modules/audio_output/oss.c:132
 #: modules/audio_output/portaudio.c:394 modules/audio_output/sdl.c:179
-#: modules/audio_output/sdl.c:197 modules/audio_output/waveout.c:354
-#: modules/gui/macosx/intf.m:524 modules/gui/macosx/intf.m:525
+#: modules/audio_output/sdl.c:197 modules/audio_output/waveout.c:371
+#: modules/gui/macosx/intf.m:513 modules/gui/macosx/intf.m:514
 msgid "Audio Device"
 msgstr "Audio Device"
 
-#: modules/audio_output/alsa.c:184 modules/audio_output/directx.c:489
+#: modules/audio_output/alsa.c:185 modules/audio_output/directx.c:480
 #: modules/audio_output/oss.c:225 modules/audio_output/portaudio.c:400
 #: modules/audio_output/sdl.c:185 modules/audio_output/sdl.c:204
-#: modules/audio_output/waveout.c:416
+#: modules/audio_output/waveout.c:433
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:197 modules/audio_output/directx.c:462
+#: modules/audio_output/alsa.c:198 modules/audio_output/directx.c:453
 #: modules/audio_output/oss.c:181 modules/audio_output/portaudio.c:419
-#: modules/audio_output/waveout.c:388
+#: modules/audio_output/waveout.c:405
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/alsa.c:203 modules/audio_output/directx.c:426
+#: modules/audio_output/alsa.c:204 modules/audio_output/directx.c:417
 #: modules/audio_output/oss.c:170 modules/audio_output/portaudio.c:435
-#: modules/audio_output/waveout.c:369
+#: modules/audio_output/waveout.c:386
 msgid "5.1"
 msgstr ""
 
-#: modules/audio_output/alsa.c:245 modules/audio_output/directx.c:535
-#: modules/audio_output/oss.c:249 modules/audio_output/waveout.c:432
+#: modules/audio_output/alsa.c:246 modules/audio_output/directx.c:526
+#: modules/audio_output/oss.c:249 modules/audio_output/waveout.c:449
 msgid "A/52 over S/PDIF"
 msgstr ""
 
-#: modules/audio_output/alsa.c:878
+#: modules/audio_output/alsa.c:926
 msgid "Unknown soundcard"
 msgstr ""
 
@@ -6303,34 +6497,34 @@ msgstr "File audio output"
 msgid "CoreAudio output"
 msgstr "Audio output URL"
 
-#: modules/audio_output/directx.c:213 modules/audio_output/portaudio.c:107
+#: modules/audio_output/directx.c:207 modules/audio_output/portaudio.c:107
 #, fuzzy
 msgid "Output device"
 msgstr "Next file"
 
-#: modules/audio_output/directx.c:215
+#: modules/audio_output/directx.c:209
 msgid ""
 "DirectX device number: 0 default device, 1..N device by number(Note that the "
 "default device appears as 0 AND another number)."
 msgstr ""
 
-#: modules/audio_output/directx.c:217 modules/audio_output/waveout.c:133
+#: modules/audio_output/directx.c:211 modules/audio_output/waveout.c:137
 #, fuzzy
 msgid "Use float32 output"
 msgstr "UDP stream output"
 
-#: modules/audio_output/directx.c:219 modules/audio_output/waveout.c:135
+#: modules/audio_output/directx.c:213 modules/audio_output/waveout.c:139
 msgid ""
 "The option allows you to enable or disable the high-quality float32 audio "
 "output mode (which is not well supported by some soundcards)."
 msgstr ""
 
-#: modules/audio_output/directx.c:223
+#: modules/audio_output/directx.c:217
 #, fuzzy
 msgid "DirectX audio output"
 msgstr "File audio output"
 
-#: modules/audio_output/directx.c:444 modules/audio_output/portaudio.c:427
+#: modules/audio_output/directx.c:435 modules/audio_output/portaudio.c:427
 msgid "3 Front 2 Rear"
 msgstr ""
 
@@ -6422,7 +6616,7 @@ msgstr "File audio output"
 msgid "Simple DirectMedia Layer audio output"
 msgstr ""
 
-#: modules/audio_output/waveout.c:140
+#: modules/audio_output/waveout.c:144
 msgid "Win32 waveOut extension output"
 msgstr ""
 
@@ -6571,13 +6765,13 @@ msgstr "Next file"
 msgid "Path of the image file when using the fake input."
 msgstr ""
 
-#: modules/codec/fake.c:49 modules/stream_out/mosaic_bridge.c:106
+#: modules/codec/fake.c:49 modules/stream_out/mosaic_bridge.c:109
 #: modules/stream_out/transcode.c:72
 #, fuzzy
 msgid "Allows you to specify the output video width."
 msgstr "Allows you to specify the maximum video quantiser scale."
 
-#: modules/codec/fake.c:52 modules/stream_out/mosaic_bridge.c:109
+#: modules/codec/fake.c:52 modules/stream_out/mosaic_bridge.c:112
 #: modules/stream_out/transcode.c:75
 #, fuzzy
 msgid "Allows you to specify the output video height."
@@ -6626,56 +6820,72 @@ msgstr ""
 msgid "Fake video decoder"
 msgstr "Theora video encoder"
 
-#: modules/codec/ffmpeg/ffmpeg.c:74
+#: modules/codec/ffmpeg/ffmpeg.c:75
+msgid "Non-ref"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:75
+msgid "Bidir"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:75
+msgid "Non-key"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:75
+msgid "All"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:78
 msgid "rd"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:74
+#: modules/codec/ffmpeg/ffmpeg.c:78
 msgid "bits"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:74
+#: modules/codec/ffmpeg/ffmpeg.c:78
 msgid "simple"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:85
+#: modules/codec/ffmpeg/ffmpeg.c:89
 #, fuzzy
 msgid ""
 "AltiVec ffmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 msgstr "ffmpeg audio/video encoder"
 
-#: modules/codec/ffmpeg/ffmpeg.c:89
+#: modules/codec/ffmpeg/ffmpeg.c:93
 #, fuzzy
 msgid "ffmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 msgstr "ffmpeg audio/video encoder"
 
-#: modules/codec/ffmpeg/ffmpeg.c:92
+#: modules/codec/ffmpeg/ffmpeg.c:96
 msgid "Decoding"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:120
+#: modules/codec/ffmpeg/ffmpeg.c:127
 msgid "ffmpeg chroma conversion"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:124
+#: modules/codec/ffmpeg/ffmpeg.c:131
 #, fuzzy
 msgid "Encoding"
 msgstr "Audio encoders settings"
 
-#: modules/codec/ffmpeg/ffmpeg.c:125
+#: modules/codec/ffmpeg/ffmpeg.c:132
 msgid "ffmpeg audio/video encoder"
 msgstr "ffmpeg audio/video encoder"
 
-#: modules/codec/ffmpeg/ffmpeg.c:183
+#: modules/codec/ffmpeg/ffmpeg.c:190
 msgid "ffmpeg demuxer"
 msgstr "ffmpeg demuxer"
 
-#: modules/codec/ffmpeg/ffmpeg.c:191
+#: modules/codec/ffmpeg/ffmpeg.c:198
 #, fuzzy
 msgid "ffmpeg video filter"
 msgstr "ffmpeg demuxer"
 
-#: modules/codec/ffmpeg/ffmpeg.c:197
+#: modules/codec/ffmpeg/ffmpeg.c:204
 #, fuzzy
 msgid "ffmpeg deinterlace video filter"
 msgstr "ffmpeg demuxer"
@@ -6713,7 +6923,7 @@ msgid ""
 "64 Qpel chroma"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:106 modules/codec/ffmpeg/ffmpeg.h:230
+#: modules/codec/ffmpeg/ffmpeg.h:106 modules/codec/ffmpeg/ffmpeg.h:235
 #: modules/stream_out/transcode.c:152
 msgid "Hurry up"
 msgstr ""
@@ -6769,14 +6979,24 @@ msgid "Will only decode a low resolution version of the video."
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.h:131
+msgid "Skip the loop filter for H.264 decoding"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.h:132
+msgid ""
+"Skipping the loop filter (aka deblocking) usually has a detrimental effect "
+"on quality. However for HDTV streams this provides a big speedup."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.h:136
 msgid "ffmpeg post processing filter chains"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:173
+#: modules/codec/ffmpeg/ffmpeg.h:178
 msgid "Ratio of key frames"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:174
+#: modules/codec/ffmpeg/ffmpeg.h:179
 #, fuzzy
 msgid ""
 "Allows you to specify the number of frames that will be coded for one key "
@@ -6784,11 +7004,11 @@ msgid ""
 msgstr ""
 "Allows you to modify the user name that will be used for the connection."
 
-#: modules/codec/ffmpeg/ffmpeg.h:177
+#: modules/codec/ffmpeg/ffmpeg.h:182
 msgid "Ratio of B frames"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:178
+#: modules/codec/ffmpeg/ffmpeg.h:183
 #, fuzzy
 msgid ""
 "Allows you to specify the number of B frames that will be coded between two "
@@ -6796,84 +7016,84 @@ msgid ""
 msgstr ""
 "Allows you to modify the user name that will be used for the connection."
 
-#: modules/codec/ffmpeg/ffmpeg.h:181
+#: modules/codec/ffmpeg/ffmpeg.h:186
 #, fuzzy
 msgid "Video bitrate tolerance"
 msgstr "Video bitrate"
 
-#: modules/codec/ffmpeg/ffmpeg.h:182
+#: modules/codec/ffmpeg/ffmpeg.h:187
 #, fuzzy
 msgid "Allows you to specify the video bitrate tolerance in kbit/s."
 msgstr "Allows you to specify the minimum video quantiser scale."
 
-#: modules/codec/ffmpeg/ffmpeg.h:185
+#: modules/codec/ffmpeg/ffmpeg.h:190
 msgid "Enable interlaced encoding"
 msgstr "Enable interlaced encoding"
 
-#: modules/codec/ffmpeg/ffmpeg.h:186
+#: modules/codec/ffmpeg/ffmpeg.h:191
 #, fuzzy
 msgid "Allows you to enable dedicated algorithms for interlaced frames."
 msgstr ""
 "Allows you to modify the user name that will be used for the connection."
 
-#: modules/codec/ffmpeg/ffmpeg.h:189
+#: modules/codec/ffmpeg/ffmpeg.h:194
 #, fuzzy
 msgid "Enable interlaced motion estimation"
 msgstr "Enable trellis quantisation"
 
-#: modules/codec/ffmpeg/ffmpeg.h:190
+#: modules/codec/ffmpeg/ffmpeg.h:195
 #, fuzzy
 msgid ""
 "Allows you to enable interlaced motion estimation algorithms. It requires "
 "more CPU."
 msgstr "Allows you to specify the minimum video quantiser scale."
 
-#: modules/codec/ffmpeg/ffmpeg.h:193
+#: modules/codec/ffmpeg/ffmpeg.h:198
 #, fuzzy
 msgid "Enable pre motion estimation"
 msgstr "Enable trellis quantisation"
 
-#: modules/codec/ffmpeg/ffmpeg.h:194
+#: modules/codec/ffmpeg/ffmpeg.h:199
 #, fuzzy
 msgid "Allows you to enable the pre motion estimation."
 msgstr "Allows you to specify the minimum video quantiser scale."
 
-#: modules/codec/ffmpeg/ffmpeg.h:197
+#: modules/codec/ffmpeg/ffmpeg.h:202
 #, fuzzy
 msgid "Enable strict rate control"
 msgstr "Enable interlaced encoding"
 
-#: modules/codec/ffmpeg/ffmpeg.h:198
+#: modules/codec/ffmpeg/ffmpeg.h:203
 #, fuzzy
 msgid "Allows you to enable the strict rate control algorithm."
 msgstr ""
 "Allows you to enable trellis quantisation (rate distortion for block "
 "coefficients)."
 
-#: modules/codec/ffmpeg/ffmpeg.h:201
+#: modules/codec/ffmpeg/ffmpeg.h:206
 msgid "Rate control buffer size"
 msgstr "Rate control buffer size"
 
-#: modules/codec/ffmpeg/ffmpeg.h:202
+#: modules/codec/ffmpeg/ffmpeg.h:207
 #, fuzzy
 msgid "Allows you to specify the rate control buffer size."
 msgstr ""
 "Allows you to modify the user name that will be used for the connection."
 
-#: modules/codec/ffmpeg/ffmpeg.h:205
+#: modules/codec/ffmpeg/ffmpeg.h:210
 msgid "Rate control buffer aggressiveness"
 msgstr "Rate control buffer aggressiveness"
 
-#: modules/codec/ffmpeg/ffmpeg.h:206
+#: modules/codec/ffmpeg/ffmpeg.h:211
 #, fuzzy
 msgid "Allows you to specify the rate control buffer aggressiveness."
 msgstr "Rate control buffer aggressiveness"
 
-#: modules/codec/ffmpeg/ffmpeg.h:209
+#: modules/codec/ffmpeg/ffmpeg.h:214
 msgid "I quantization factor"
 msgstr "I quantisation factor"
 
-#: modules/codec/ffmpeg/ffmpeg.h:210
+#: modules/codec/ffmpeg/ffmpeg.h:215
 msgid ""
 "Allows you to specify the quantization factor of I frames, compared with P "
 "frames (for instance 1.0 => same qscale for I and P frames)."
@@ -6881,22 +7101,22 @@ msgstr ""
 "Allows you to specify the quantisation factor of I frames, compared with P "
 "frames (for instance 1.0 => same qscale for I and P frames)."
 
-#: modules/codec/ffmpeg/ffmpeg.h:214 modules/demux/mod.c:54
+#: modules/codec/ffmpeg/ffmpeg.h:219 modules/demux/mod.c:54
 #, fuzzy
 msgid "Noise reduction"
 msgstr "Display resolution"
 
-#: modules/codec/ffmpeg/ffmpeg.h:215
+#: modules/codec/ffmpeg/ffmpeg.h:220
 msgid ""
 "Allows you to enable a simple noise reduction algorithm to lower the "
 "encoding length and bitrate, at the expense of lower quality frames."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:219
+#: modules/codec/ffmpeg/ffmpeg.h:224
 msgid "Enable MPEG4 quantization matrix"
 msgstr "Enable MPEG4 quantisation matrix"
 
-#: modules/codec/ffmpeg/ffmpeg.h:220
+#: modules/codec/ffmpeg/ffmpeg.h:225
 msgid ""
 "Allows you to use the MPEG4 quantization matrix for mpeg2 encoding. This "
 "generally yields a better looking picture, while still retaining the "
@@ -6906,17 +7126,17 @@ msgstr ""
 "generally yields a better looking picture, while still retaining the "
 "compatibility with standard MPEG-2 decoders."
 
-#: modules/codec/ffmpeg/ffmpeg.h:225
+#: modules/codec/ffmpeg/ffmpeg.h:230
 msgid "Quality level"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:226
+#: modules/codec/ffmpeg/ffmpeg.h:231
 msgid ""
 "Allows you to specify the quality level for the encoding of motions vectors "
 "(this can slow down the encoding very much)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:231
+#: modules/codec/ffmpeg/ffmpeg.h:236
 msgid ""
 "Allows you to specify if the encoder should make on-the-fly quality "
 "tradeoffs if your CPU can't keep up with the encoding rate. It will disable "
@@ -6928,27 +7148,27 @@ msgstr ""
 "trellis quantisation, then the rate distortion of motion vectors (hq), and "
 "raise the noise reduction threshold to ease the encoder's task."
 
-#: modules/codec/ffmpeg/ffmpeg.h:237
+#: modules/codec/ffmpeg/ffmpeg.h:242
 msgid "Minimum video quantizer scale"
 msgstr "Minimum video quantiser scale"
 
-#: modules/codec/ffmpeg/ffmpeg.h:238
+#: modules/codec/ffmpeg/ffmpeg.h:243
 msgid "Allows you to specify the minimum video quantizer scale."
 msgstr "Allows you to specify the minimum video quantiser scale."
 
-#: modules/codec/ffmpeg/ffmpeg.h:241
+#: modules/codec/ffmpeg/ffmpeg.h:246
 msgid "Maximum video quantizer scale"
 msgstr "Maximum video quantiser scale"
 
-#: modules/codec/ffmpeg/ffmpeg.h:242
+#: modules/codec/ffmpeg/ffmpeg.h:247
 msgid "Allows you to specify the maximum video quantizer scale."
 msgstr "Allows you to specify the maximum video quantiser scale."
 
-#: modules/codec/ffmpeg/ffmpeg.h:245
+#: modules/codec/ffmpeg/ffmpeg.h:250
 msgid "Enable trellis quantization"
 msgstr "Enable trellis quantisation"
 
-#: modules/codec/ffmpeg/ffmpeg.h:246
+#: modules/codec/ffmpeg/ffmpeg.h:251
 msgid ""
 "Allows you to enable trellis quantization (rate distortion for block "
 "coefficients)."
@@ -6956,87 +7176,87 @@ msgstr ""
 "Allows you to enable trellis quantisation (rate distortion for block "
 "coefficients)."
 
-#: modules/codec/ffmpeg/ffmpeg.h:249
+#: modules/codec/ffmpeg/ffmpeg.h:254
 #, fuzzy
 msgid "Use fixed video quantizer scale"
 msgstr "Minimum video quantiser scale"
 
-#: modules/codec/ffmpeg/ffmpeg.h:250
+#: modules/codec/ffmpeg/ffmpeg.h:255
 msgid ""
 "Allows you to specify a fixed video quantizer scale for VBR encoding "
 "(accepted values: 0.01 to 255.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:253
+#: modules/codec/ffmpeg/ffmpeg.h:258
 msgid "Strict standard compliance"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:254
+#: modules/codec/ffmpeg/ffmpeg.h:259
 msgid ""
 "Allows you to force a strict standard compliance when encoding (accepted "
 "values: -1, 0, 1)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:257
+#: modules/codec/ffmpeg/ffmpeg.h:262
 msgid "Luminance masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:258
+#: modules/codec/ffmpeg/ffmpeg.h:263
 msgid ""
 "Allows you to raise the quantizer for very bright macroblocks (default: 0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:261
+#: modules/codec/ffmpeg/ffmpeg.h:266
 msgid "Darkness masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:262
+#: modules/codec/ffmpeg/ffmpeg.h:267
 msgid ""
 "Allows you to raise the quantizer for very dark macroblocks (default: 0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:265
+#: modules/codec/ffmpeg/ffmpeg.h:270
 msgid "Motion masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:266
+#: modules/codec/ffmpeg/ffmpeg.h:271
 msgid ""
 "Allows you to raise the quantizer for macroblocks with a high temporal "
 "complexity (default: 0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:269
+#: modules/codec/ffmpeg/ffmpeg.h:274
 msgid "Border masking"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:270
+#: modules/codec/ffmpeg/ffmpeg.h:275
 msgid ""
 "Allows you to raise the quantizer for macroblocks at the border of the frame "
 "(default: 0.0)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:273
+#: modules/codec/ffmpeg/ffmpeg.h:278
 msgid "Luminance elimination"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:274
+#: modules/codec/ffmpeg/ffmpeg.h:279
 msgid ""
 "Eliminates luminance blocks when the PSNR isn't much changed (default: 0.0). "
 "The H264 specification recommends -4."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:278
+#: modules/codec/ffmpeg/ffmpeg.h:283
 msgid "Chrominance elimination"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:279
+#: modules/codec/ffmpeg/ffmpeg.h:284
 msgid ""
 "Eliminates chrominance blocks when the PSNR isn't much changed (default: "
 "0.0). The H264 specification recommends 7."
 msgstr ""
 
-#: modules/codec/ffmpeg/postprocess.c:88 modules/gui/macosx/intf.m:545
-#: modules/gui/macosx/intf.m:546
+#: modules/codec/ffmpeg/postprocess.c:88 modules/gui/macosx/intf.m:534
+#: modules/gui/macosx/intf.m:535
 msgid "Post processing"
 msgstr ""
 
@@ -7060,7 +7280,7 @@ msgstr "Flac audio encoder"
 msgid "Flac audio packetizer"
 msgstr "Flac audio packetiser"
 
-#: modules/codec/libmpeg2.c:94
+#: modules/codec/libmpeg2.c:96
 #, fuzzy
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr "MPEG-I/II video demuxer"
@@ -7127,11 +7347,11 @@ msgstr "Speex audio packetiser"
 msgid "Speex audio encoder"
 msgstr "Speex audio encoder"
 
-#: modules/codec/speex.c:551 modules/codec/speex.c:568
+#: modules/codec/speex.c:552 modules/codec/speex.c:569
 msgid "Speex comment"
 msgstr ""
 
-#: modules/codec/speex.c:551
+#: modules/codec/speex.c:552
 #, fuzzy
 msgid "Mode"
 msgstr "Codec"
@@ -7221,27 +7441,36 @@ msgstr ""
 msgid "Stereo mode"
 msgstr "Stereo"
 
-#: modules/codec/twolame.c:57
-msgid "[0=stereo, 1=dual-mono, 2=joint-stereo]"
+#: modules/codec/twolame.c:56
+msgid "Select how stereo streams will be handled"
 msgstr ""
 
-#: modules/codec/twolame.c:58
+#: modules/codec/twolame.c:57
 msgid "VBR mode"
 msgstr ""
 
-#: modules/codec/twolame.c:60
+#: modules/codec/twolame.c:59
 msgid "By default the encoding is CBR."
 msgstr ""
 
-#: modules/codec/twolame.c:61
+#: modules/codec/twolame.c:60
 msgid "Psycho-acoustic model"
 msgstr ""
 
-#: modules/codec/twolame.c:63
+#: modules/codec/twolame.c:62
 msgid "Integer from -1 (no model) to 4."
 msgstr ""
 
-#: modules/codec/twolame.c:67
+#: modules/codec/twolame.c:66
+msgid "Dual mono"
+msgstr ""
+
+#: modules/codec/twolame.c:66
+#, fuzzy
+msgid "Joint stereo"
+msgstr "Stereo"
+
+#: modules/codec/twolame.c:71
 #, fuzzy
 msgid "Libtwolame audio encoder"
 msgstr "Flac audio encoder"
@@ -7463,24 +7692,92 @@ msgid ""
 "quality)."
 msgstr ""
 
-#: modules/codec/x264.c:124
+#: modules/codec/x264.c:121
+msgid "Motion estimation algorithm."
+msgstr ""
+
+#: modules/codec/x264.c:122
+msgid ""
+"Selects the motion estimation algorithm:  dia - diamond (fastest) \n"
+" hex - hexagon (default setting) \n"
+" umh - uneven multi-hexagon (better but slower) \n"
+" esa - exhaustive search (extremely slow, primarily for testing) "
+msgstr ""
+
+#: modules/codec/x264.c:128
+msgid "Motion estimation search range."
+msgstr ""
+
+#: modules/codec/x264.c:129
+msgid ""
+"Maximum distance to search for motion estimation, measured from predicted "
+"position(s). Default of 16 is good for most footage, high motion sequences "
+"may benefit from settings between 24-32."
+msgstr ""
+
+#: modules/codec/x264.c:133
+msgid "Disable PSNR calculation."
+msgstr ""
+
+#: modules/codec/x264.c:134
+msgid ""
+"This has no effect on actual encoding quality, it just prevents the stats "
+"from being calculated (for speed)."
+msgstr ""
+
+#: modules/codec/x264.c:137
+msgid "Disable adaptive B-frames."
+msgstr ""
+
+#: modules/codec/x264.c:138
+msgid ""
+"If this is on, the specified number of consequtive B-frames will always be "
+"used, except possibly before an I-frame. "
+msgstr ""
+
+#: modules/codec/x264.c:141
+msgid "Bias the choice to use B-frames."
+msgstr ""
+
+#: modules/codec/x264.c:142
+msgid ""
+"Positive values cause more= B-frames, negative values cause less B-frames. "
+msgstr ""
+
+#: modules/codec/x264.c:149
+msgid "dia"
+msgstr ""
+
+#: modules/codec/x264.c:149
+msgid "hex"
+msgstr ""
+
+#: modules/codec/x264.c:149
+msgid "umh"
+msgstr ""
+
+#: modules/codec/x264.c:149
+msgid "esa"
+msgstr ""
+
+#: modules/codec/x264.c:155
 msgid "all"
 msgstr ""
 
-#: modules/codec/x264.c:124
+#: modules/codec/x264.c:155
 msgid "slow"
 msgstr ""
 
-#: modules/codec/x264.c:124
+#: modules/codec/x264.c:155
 msgid "normal"
 msgstr ""
 
-#: modules/codec/x264.c:125
+#: modules/codec/x264.c:156
 msgid "fast"
 msgstr ""
 
-#: modules/codec/x264.c:128
-msgid "h264 video encoder using x264 library"
+#: modules/codec/x264.c:159
+msgid "H264 encoder (using x264 library)"
 msgstr ""
 
 #: modules/control/corba/corba.c:687
@@ -7567,23 +7864,43 @@ msgstr ""
 
 #: modules/control/hotkeys.c:98
 #, fuzzy
+msgid "Hotkeys"
+msgstr "Audio encoders settings"
+
+#: modules/control/hotkeys.c:99
+#, fuzzy
 msgid "Hotkeys management interface"
 msgstr "Remote control interface"
 
-#: modules/control/hotkeys.c:552
+#: modules/control/hotkeys.c:481
 #, fuzzy, c-format
 msgid "Audio track: %s"
 msgstr "Subtitle track: %s"
 
-#: modules/control/hotkeys.c:566 modules/control/hotkeys.c:594
+#: modules/control/hotkeys.c:495 modules/control/hotkeys.c:523
 #, c-format
 msgid "Subtitle track: %s"
 msgstr "Subtitle track: %s"
 
-#: modules/control/hotkeys.c:566
+#: modules/control/hotkeys.c:495
 msgid "N/A"
 msgstr ""
 
+#: modules/control/hotkeys.c:547
+#, fuzzy, c-format
+msgid "Aspect ratio: %s"
+msgstr "Codec setting"
+
+#: modules/control/hotkeys.c:573
+#, c-format
+msgid "Crop: %s"
+msgstr ""
+
+#: modules/control/hotkeys.c:599
+#, fuzzy, c-format
+msgid "Deinterlace mode: %s"
+msgstr "Deinterlace video"
+
 #: modules/control/http/http.c:34 modules/misc/rtsp.c:46
 msgid "Host address"
 msgstr ""
@@ -7747,351 +8064,359 @@ msgstr "Video Device"
 msgid "Windows Service interface"
 msgstr "Windows Service interface"
 
-#: modules/control/rc.c:150
+#: modules/control/rc.c:151
 msgid "Show stream position"
 msgstr ""
 
-#: modules/control/rc.c:151
+#: modules/control/rc.c:152
 msgid ""
 "Show the current position in seconds within the stream from time to time."
 msgstr ""
 
-#: modules/control/rc.c:154
+#: modules/control/rc.c:155
 msgid "Fake TTY"
 msgstr ""
 
-#: modules/control/rc.c:155
+#: modules/control/rc.c:156
 msgid "Force the rc module to use stdin as if it was a TTY."
 msgstr ""
 
-#: modules/control/rc.c:157
+#: modules/control/rc.c:158
 #, fuzzy
 msgid "UNIX socket command input"
 msgstr "TCP input"
 
-#: modules/control/rc.c:158
+#: modules/control/rc.c:159
 msgid "Accept commands over a Unix socket rather than stdin."
 msgstr ""
 
-#: modules/control/rc.c:161
+#: modules/control/rc.c:162
 #, fuzzy
 msgid "TCP command input"
 msgstr "TCP input"
 
-#: modules/control/rc.c:162
+#: modules/control/rc.c:163
 msgid ""
 "Accept commands over a socket rather than stdin. You can set the address and "
 "port the interface will bind to."
 msgstr ""
 
-#: modules/control/rc.c:166 modules/misc/dummy/dummy.c:49
+#: modules/control/rc.c:167 modules/misc/dummy/dummy.c:49
 msgid "Do not open a DOS command box interface"
 msgstr ""
 
-#: modules/control/rc.c:168
+#: modules/control/rc.c:169
 msgid ""
 "By default the rc interface plugin will start a DOS command box. Enabling "
 "the quiet mode will not bring this command box but can also be pretty "
 "annoying when you want to stop VLC and no video window is open."
 msgstr ""
 
-#: modules/control/rc.c:175
+#: modules/control/rc.c:176
 #, fuzzy
 msgid "RC"
 msgstr "en_GB"
 
-#: modules/control/rc.c:178
+#: modules/control/rc.c:179
 msgid "Remote control interface"
 msgstr "Remote control interface"
 
-#: modules/control/rc.c:331
+#: modules/control/rc.c:332
 #, fuzzy
 msgid "Remote control interface initialized, `h' for help"
 msgstr "Remote control interface initialised, `h' for help\n"
 
-#: modules/control/rc.c:819
+#: modules/control/rc.c:840
 #, c-format
 msgid "unknown command `%s', type `help' for help"
 msgstr ""
 
-#: modules/control/rc.c:852
+#: modules/control/rc.c:873
 msgid "+----[ Remote control commands ]"
 msgstr ""
 
-#: modules/control/rc.c:854
+#: modules/control/rc.c:875
 msgid "| add XYZ  . . . . . . . . . . add XYZ to playlist"
 msgstr ""
 
-#: modules/control/rc.c:855
+#: modules/control/rc.c:876
 msgid "| playlist . . .  show items currently in playlist"
 msgstr ""
 
-#: modules/control/rc.c:856
+#: modules/control/rc.c:877
 msgid "| play . . . . . . . . . . . . . . . . play stream"
 msgstr ""
 
-#: modules/control/rc.c:857
+#: modules/control/rc.c:878
 msgid "| stop . . . . . . . . . . . . . . . . stop stream"
 msgstr ""
 
-#: modules/control/rc.c:858
+#: modules/control/rc.c:879
 msgid "| next . . . . . . . . . . . .  next playlist item"
 msgstr ""
 
-#: modules/control/rc.c:859
+#: modules/control/rc.c:880
 msgid "| prev . . . . . . . . . .  previous playlist item"
 msgstr ""
 
-#: modules/control/rc.c:860
+#: modules/control/rc.c:881
 msgid "| goto . . . . . . . . . . . .  goto item at index"
 msgstr ""
 
-#: modules/control/rc.c:861
+#: modules/control/rc.c:882
+msgid "| clear . . . . . . . . . . .   clear the playlist"
+msgstr ""
+
+#: modules/control/rc.c:883
+msgid "| status . . . . . . . . . current playlist status"
+msgstr ""
+
+#: modules/control/rc.c:884
 msgid "| title [X]  . . . . set/get title in current item"
 msgstr ""
 
-#: modules/control/rc.c:862
+#: modules/control/rc.c:885
 msgid "| title_n  . . . . . .  next title in current item"
 msgstr ""
 
-#: modules/control/rc.c:863
+#: modules/control/rc.c:886
 msgid "| title_p  . . . .  previous title in current item"
 msgstr ""
 
-#: modules/control/rc.c:864
+#: modules/control/rc.c:887
 msgid "| chapter [X]  . . set/get chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:865
+#: modules/control/rc.c:888
 msgid "| chapter_n  . . . .  next chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:866
+#: modules/control/rc.c:889
 msgid "| chapter_p  . .  previous chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:868
+#: modules/control/rc.c:891
 msgid "| seek X . seek in seconds, for instance `seek 12'"
 msgstr ""
 
-#: modules/control/rc.c:869
+#: modules/control/rc.c:892
 msgid "| pause  . . . . . . . . . . . . . .  toggle pause"
 msgstr ""
 
-#: modules/control/rc.c:870
+#: modules/control/rc.c:893
 msgid "| fastforward  . . . . . .  .  set to maximum rate"
 msgstr ""
 
-#: modules/control/rc.c:871
+#: modules/control/rc.c:894
 msgid "| rewind  . . . . . . . . . .  set to minimum rate"
 msgstr ""
 
-#: modules/control/rc.c:872
+#: modules/control/rc.c:895
 msgid "| faster . . . . . . . .  faster playing of stream"
 msgstr ""
 
-#: modules/control/rc.c:873
+#: modules/control/rc.c:896
 msgid "| slower . . . . . . . .  slower playing of stream"
 msgstr ""
 
-#: modules/control/rc.c:874
+#: modules/control/rc.c:897
 msgid "| normal . . . . . . . .  normal playing of stream"
 msgstr ""
 
-#: modules/control/rc.c:875
-msgid "| f  . . . . . . . . . . . . . . toggle fullscreen"
+#: modules/control/rc.c:898
+msgid "| f [on|off] . . . . . . . . . . toggle fullscreen"
 msgstr ""
 
-#: modules/control/rc.c:876
+#: modules/control/rc.c:899
 msgid "| info . . .  information about the current stream"
 msgstr ""
 
-#: modules/control/rc.c:878
+#: modules/control/rc.c:901
 msgid "| volume [X] . . . . . . . .  set/get audio volume"
 msgstr ""
 
-#: modules/control/rc.c:879
+#: modules/control/rc.c:902
 msgid "| volup [X]  . . . . .  raise audio volume X steps"
 msgstr ""
 
-#: modules/control/rc.c:880
+#: modules/control/rc.c:903
 msgid "| voldown [X]  . . . .  lower audio volume X steps"
 msgstr ""
 
-#: modules/control/rc.c:881
+#: modules/control/rc.c:904
 msgid "| adev [X] . . . . . . . . .  set/get audio device"
 msgstr ""
 
-#: modules/control/rc.c:882
+#: modules/control/rc.c:905
 msgid "| achan [X]. . . . . . . .  set/get audio channels"
 msgstr ""
 
-#: modules/control/rc.c:883
+#: modules/control/rc.c:906
 msgid "| menu [on|off|up|down|left|right|select] use menu"
 msgstr ""
 
-#: modules/control/rc.c:888
+#: modules/control/rc.c:911
 msgid "| marq-marquee STRING  . . overlay STRING in video"
 msgstr ""
 
-#: modules/control/rc.c:889
+#: modules/control/rc.c:912
 msgid "| marq-x X . . . . . . . . . . . .offset from left"
 msgstr ""
 
-#: modules/control/rc.c:890
+#: modules/control/rc.c:913
 msgid "| marq-y Y . . . . . . . . . . . . offset from top"
 msgstr ""
 
-#: modules/control/rc.c:891
+#: modules/control/rc.c:914
 msgid "| marq-position #. . .  .relative position control"
 msgstr ""
 
-#: modules/control/rc.c:892
+#: modules/control/rc.c:915
 msgid "| marq-color # . . . . . . . . . . font color, RGB"
 msgstr ""
 
-#: modules/control/rc.c:893
+#: modules/control/rc.c:916
 msgid "| marq-opacity # . . . . . . . . . . . . . opacity"
 msgstr ""
 
-#: modules/control/rc.c:894
+#: modules/control/rc.c:917
 msgid "| marq-timeout T. . . . . . . . . . timeout, in ms"
 msgstr ""
 
-#: modules/control/rc.c:895
+#: modules/control/rc.c:918
 msgid "| marq-size # . . . . . . . . font size, in pixels"
 msgstr ""
 
-#: modules/control/rc.c:897
+#: modules/control/rc.c:920
 msgid "| time-format STRING . . . overlay STRING in video"
 msgstr ""
 
-#: modules/control/rc.c:898
+#: modules/control/rc.c:921
 msgid "| time-x X . . . . . . . . . . . .offset from left"
 msgstr ""
 
-#: modules/control/rc.c:899
+#: modules/control/rc.c:922
 msgid "| time-y Y . . . . . . . . . . . . offset from top"
 msgstr ""
 
-#: modules/control/rc.c:900
+#: modules/control/rc.c:923
 msgid "| time-position #. . . . . . . . relative position"
 msgstr ""
 
-#: modules/control/rc.c:901
+#: modules/control/rc.c:924
 msgid "| time-color # . . . . . . . . . . font color, RGB"
 msgstr ""
 
-#: modules/control/rc.c:902
+#: modules/control/rc.c:925
 msgid "| time-opacity # . . . . . . . . . . . . . opacity"
 msgstr ""
 
-#: modules/control/rc.c:903
+#: modules/control/rc.c:926
 msgid "| time-size # . . . . . . . . font size, in pixels"
 msgstr ""
 
-#: modules/control/rc.c:905
+#: modules/control/rc.c:928
 msgid "| logo-file STRING . . . the overlay file path/name"
 msgstr ""
 
-#: modules/control/rc.c:906
+#: modules/control/rc.c:929
 msgid "| logo-x X . . . . . . . . . . . .offset from left"
 msgstr ""
 
-#: modules/control/rc.c:907
+#: modules/control/rc.c:930
 msgid "| logo-y Y . . . . . . . . . . . . offset from top"
 msgstr ""
 
-#: modules/control/rc.c:908
+#: modules/control/rc.c:931
 msgid "| logo-position #. . . . . . . . relative position"
 msgstr ""
 
-#: modules/control/rc.c:909
+#: modules/control/rc.c:932
 msgid "| logo-transparency #. . . . . . . . .transparency"
 msgstr ""
 
-#: modules/control/rc.c:911
+#: modules/control/rc.c:934
 msgid "| mosaic-alpha # . . . . . . . . . . . . . . alpha"
 msgstr ""
 
-#: modules/control/rc.c:912
+#: modules/control/rc.c:935
 msgid "| mosaic-height #. . . . . . . . . . . . . .height"
 msgstr ""
 
-#: modules/control/rc.c:913
+#: modules/control/rc.c:936
 msgid "| mosaic-width # . . . . . . . . . . . . . . width"
 msgstr ""
 
-#: modules/control/rc.c:914
+#: modules/control/rc.c:937
 msgid "| mosaic-xoffset # . . . .top left corner position"
 msgstr ""
 
-#: modules/control/rc.c:915
+#: modules/control/rc.c:938
 msgid "| mosaic-yoffset # . . . .top left corner position"
 msgstr ""
 
-#: modules/control/rc.c:916
+#: modules/control/rc.c:939
 msgid "| mosaic-align 0..2,4..6,8..10. . .mosaic alignment"
 msgstr ""
 
-#: modules/control/rc.c:917
+#: modules/control/rc.c:940
 msgid "| mosaic-vborder # . . . . . . . . vertical border"
 msgstr ""
 
-#: modules/control/rc.c:918
+#: modules/control/rc.c:941
 msgid "| mosaic-hborder # . . . . . . . horizontal border"
 msgstr ""
 
-#: modules/control/rc.c:919
+#: modules/control/rc.c:942
 msgid "| mosaic-position {0=auto,1=fixed} . . . .position"
 msgstr ""
 
-#: modules/control/rc.c:920
+#: modules/control/rc.c:943
 msgid "| mosaic-rows #. . . . . . . . . . .number of rows"
 msgstr ""
 
-#: modules/control/rc.c:921
+#: modules/control/rc.c:944
 msgid "| mosaic-cols #. . . . . . . . . . .number of cols"
 msgstr ""
 
-#: modules/control/rc.c:922
+#: modules/control/rc.c:945
 msgid "| mosaic-keep-aspect-ratio {0,1} . . .aspect ratio"
 msgstr ""
 
-#: modules/control/rc.c:925
+#: modules/control/rc.c:948
 msgid "| help . . . . . . . . . . . . . this help message"
 msgstr ""
 
-#: modules/control/rc.c:926
+#: modules/control/rc.c:949
 msgid "| longhelp . . . . . . . . . a longer help message"
 msgstr ""
 
-#: modules/control/rc.c:927
+#: modules/control/rc.c:950
 msgid "| logout . . . . .  exit (if in socket connection)"
 msgstr ""
 
-#: modules/control/rc.c:928
+#: modules/control/rc.c:951
 msgid "| quit . . . . . . . . . . . . . . . . .  quit vlc"
 msgstr ""
 
-#: modules/control/rc.c:930
+#: modules/control/rc.c:953
 msgid "+----[ end of help ]"
 msgstr ""
 
-#: modules/control/rc.c:1037 modules/control/rc.c:1211
-#: modules/control/rc.c:1688 modules/control/rc.c:1758
-#: modules/control/rc.c:1807 modules/control/rc.c:1906
+#: modules/control/rc.c:1060 modules/control/rc.c:1228
+#: modules/control/rc.c:1715 modules/control/rc.c:1785
+#: modules/control/rc.c:1834 modules/control/rc.c:1933
 msgid "press menu select or pause to continue"
 msgstr ""
 
-#: modules/control/rc.c:1348
+#: modules/control/rc.c:1375
 #, fuzzy
 msgid "press pause to continue"
 msgstr ""
 "\n"
 "Press the RETURN key to continue…\n"
 
-#: modules/control/rc.c:1891 modules/control/rc.c:1930
+#: modules/control/rc.c:1918 modules/control/rc.c:1957
 msgid "please provide one of the following paramaters"
 msgstr ""
 
@@ -8171,10 +8496,11 @@ msgstr ""
 
 #: modules/demux/avi/avi.c:45
 msgid ""
-"Recreate a index for the AVI file so we can seek trough it more reliably."
+"Recreate a index for the AVI file. Use this if your AVI file is damaged or "
+"incomplete (not seekable)"
 msgstr ""
 
-#: modules/demux/avi/avi.c:52
+#: modules/demux/avi/avi.c:53
 #, fuzzy
 msgid "AVI demuxer"
 msgstr "PS demuxer"
@@ -8225,7 +8551,7 @@ msgid ""
 msgstr ""
 
 #: modules/demux/livedotcom.cpp:72
-msgid "live.com (RTSP/RTP/SDP) demuxer"
+msgid "RTP/RTSP/SDP demuxer (using Live555.com)"
 msgstr ""
 
 #: modules/demux/livedotcom.cpp:81
@@ -8257,71 +8583,82 @@ msgstr ""
 msgid "JPEG camera demuxer"
 msgstr "MPEG-4 video demuxer"
 
-#: modules/demux/mkv.cpp:391
+#: modules/demux/mkv.cpp:394
 #, fuzzy
 msgid "Matroska stream demuxer"
 msgstr "MP4 stream demuxer"
 
-#: modules/demux/mkv.cpp:398
+#: modules/demux/mkv.cpp:401
 msgid "Ordered chapters"
 msgstr ""
 
-#: modules/demux/mkv.cpp:399
+#: modules/demux/mkv.cpp:402
 msgid "Play ordered chapters as specified in the segment."
 msgstr ""
 
-#: modules/demux/mkv.cpp:402
+#: modules/demux/mkv.cpp:405
 #, fuzzy
 msgid "Chapter codecs"
 msgstr "Stereo"
 
-#: modules/demux/mkv.cpp:403
+#: modules/demux/mkv.cpp:406
 msgid "Use chapter codecs found in the segment."
 msgstr ""
 
-#: modules/demux/mkv.cpp:406
+#: modules/demux/mkv.cpp:409
+#, fuzzy
+msgid "Preload Directory"
+msgstr "Choose directory"
+
+#: modules/demux/mkv.cpp:410
+msgid ""
+"Preload matroska files from the same family in the same directory (not good "
+"for broken files)."
+msgstr ""
+
+#: modules/demux/mkv.cpp:413
 msgid "Seek based on percent not time"
 msgstr ""
 
-#: modules/demux/mkv.cpp:407
+#: modules/demux/mkv.cpp:414
 msgid "Seek based on percent not time."
 msgstr ""
 
-#: modules/demux/mkv.cpp:410
+#: modules/demux/mkv.cpp:417
 msgid "Dummy Elements"
 msgstr ""
 
-#: modules/demux/mkv.cpp:411
+#: modules/demux/mkv.cpp:418
 msgid "Read and discard unknown EBML elements (not good for broken files)."
 msgstr ""
 
-#: modules/demux/mkv.cpp:3003
+#: modules/demux/mkv.cpp:3155
 msgid "---  DVD Menu"
 msgstr ""
 
-#: modules/demux/mkv.cpp:3009
+#: modules/demux/mkv.cpp:3161
 msgid "First Played"
 msgstr ""
 
-#: modules/demux/mkv.cpp:3011
+#: modules/demux/mkv.cpp:3163
 #, fuzzy
 msgid "Video Manager"
 msgstr "Video encoder"
 
-#: modules/demux/mkv.cpp:3017
+#: modules/demux/mkv.cpp:3169
 #, fuzzy
 msgid "----- Title"
 msgstr "Title"
 
-#: modules/demux/mkv.cpp:4714
+#: modules/demux/mkv.cpp:4924
 msgid "Segment filename"
 msgstr ""
 
-#: modules/demux/mkv.cpp:4718
+#: modules/demux/mkv.cpp:4928
 msgid "Muxing application"
 msgstr ""
 
-#: modules/demux/mkv.cpp:4722
+#: modules/demux/mkv.cpp:4932
 msgid "Writing application"
 msgstr ""
 
@@ -8390,10 +8727,19 @@ msgstr ""
 msgid "Surround delay in ms (usually 5-40ms)"
 msgstr ""
 
-#: modules/demux/mp4/mp4.c:50
+#: modules/demux/mp4/mp4.c:51
 msgid "MP4 stream demuxer"
 msgstr "MP4 stream demuxer"
 
+#: modules/demux/mpc.c:46 modules/demux/mpc.c:47
+msgid "Replay Gain type"
+msgstr ""
+
+#: modules/demux/mpc.c:57
+#, fuzzy
+msgid "MPC demuxer"
+msgstr "PS demuxer"
+
 #: modules/demux/mpeg/h264.c:40
 #, fuzzy
 msgid "Allows you to set the desired frame rate."
@@ -8454,10 +8800,6 @@ msgstr "Author"
 msgid "Automatically start the playlist when it's loaded.\n"
 msgstr ""
 
-#: modules/demux/playlist/playlist.c:49
-msgid "Old playlist open"
-msgstr ""
-
 #: modules/demux/playlist/playlist.c:55
 #, fuzzy
 msgid "Native playlist import"
@@ -8481,6 +8823,64 @@ msgstr "&Shuffle Playlist"
 msgid "DVB playlist import"
 msgstr "&Shuffle Playlist"
 
+#: modules/demux/playlist/playlist.c:83
+#, fuzzy
+msgid "Podcast playlist import"
+msgstr "&Shuffle Playlist"
+
+#: modules/demux/playlist/podcast.c:290
+msgid "Podcast Link"
+msgstr ""
+
+#: modules/demux/playlist/podcast.c:299
+#, fuzzy
+msgid "Podcast Copyright"
+msgstr "Copyright"
+
+#: modules/demux/playlist/podcast.c:308
+msgid "Podcast Category"
+msgstr ""
+
+#: modules/demux/playlist/podcast.c:317 modules/demux/playlist/podcast.c:405
+msgid "Podcast Keywords"
+msgstr ""
+
+#: modules/demux/playlist/podcast.c:326 modules/demux/playlist/podcast.c:413
+#, fuzzy
+msgid "Podcast Subtitle"
+msgstr "Subtitles Track"
+
+#: modules/demux/playlist/podcast.c:336 modules/demux/playlist/podcast.c:421
+msgid "Podcast Summary"
+msgstr ""
+
+#: modules/demux/playlist/podcast.c:373
+msgid "Podcast Publication Date"
+msgstr ""
+
+#: modules/demux/playlist/podcast.c:381
+#, fuzzy
+msgid "Podcast Author"
+msgstr "Author"
+
+#: modules/demux/playlist/podcast.c:389
+msgid "Podcast Subcategory"
+msgstr ""
+
+#: modules/demux/playlist/podcast.c:397
+#, fuzzy
+msgid "Podcast Duration"
+msgstr "Polarisation"
+
+#: modules/demux/playlist/podcast.c:429
+#, fuzzy
+msgid "Podcast Size"
+msgstr "Copy packetiser"
+
+#: modules/demux/playlist/podcast.c:437
+msgid "Podcast Type"
+msgstr ""
+
 #: modules/demux/ps.c:47 modules/demux/ps.c:55
 msgid "PS demuxer"
 msgstr "PS demuxer"
@@ -8508,7 +8908,7 @@ msgstr ""
 msgid "Text subtitles demux"
 msgstr "DVB subtitles decoder"
 
-#: modules/demux/subtitle.c:67 modules/gui/wxwidgets/subtitles.cpp:210
+#: modules/demux/subtitle.c:67 modules/gui/wxwidgets/dialogs/subtitles.cpp:200
 msgid "Frames per second"
 msgstr ""
 
@@ -8934,113 +9334,116 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:159 modules/gui/macosx/bookmarks.m:107
 #: modules/gui/macosx/open.m:158 modules/gui/macosx/playlistinfo.m:58
 #: modules/gui/macosx/prefs.m:122 modules/gui/macosx/prefs.m:142
-#: modules/gui/macosx/update.m:90 modules/gui/macosx/wizard.m:343
-#: modules/gui/wxwidgets/bookmarks.cpp:170
-#: modules/gui/wxwidgets/iteminfo.cpp:93 modules/gui/wxwidgets/open.cpp:329
-#: modules/gui/wxwidgets/open.cpp:498
-#: modules/gui/wxwidgets/preferences.cpp:212
-#: modules/gui/wxwidgets/streamout.cpp:204
-#: modules/gui/wxwidgets/subtitles.cpp:253
+#: modules/gui/macosx/wizard.m:347
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:108
+#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:80
+#: modules/gui/wxwidgets/dialogs/open.cpp:324
+#: modules/gui/wxwidgets/dialogs/open.cpp:493
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:205
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:198
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:243
 #, fuzzy
 msgid "Cancel"
 msgstr "Channels"
 
 #: modules/gui/beos/InterfaceWindow.cpp:159 modules/gui/macosx/open.m:440
 #: modules/gui/macosx/open.m:634 modules/gui/macosx/open.m:738
-#: modules/gui/macosx/open.m:784 modules/gui/wxwidgets/interface.cpp:488
-#: modules/gui/wxwidgets/menus.cpp:314
+#: modules/gui/macosx/open.m:784 modules/gui/wxwidgets/interface.cpp:552
+#: modules/gui/wxwidgets/menus.cpp:315
 msgid "Open"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:208
-#: modules/gui/beos/InterfaceWindow.cpp:309 modules/gui/macosx/prefs.m:120
-#: modules/gui/wxwidgets/preferences.cpp:189
+#: modules/gui/beos/InterfaceWindow.cpp:225
+#: modules/gui/beos/InterfaceWindow.cpp:326 modules/gui/macosx/prefs.m:120
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:182
 #, fuzzy
 msgid "Preferences"
 msgstr "VLC preferences"
 
-#: modules/gui/beos/InterfaceWindow.cpp:218
-#: modules/gui/beos/InterfaceWindow.cpp:307 modules/gui/macosx/intf.m:464
-#: modules/gui/macosx/intf.m:557 modules/gui/wxwidgets/messages.cpp:64
+#: modules/gui/beos/InterfaceWindow.cpp:235
+#: modules/gui/beos/InterfaceWindow.cpp:324 modules/gui/macosx/intf.m:453
+#: modules/gui/macosx/intf.m:546 modules/gui/wxwidgets/dialogs/messages.cpp:53
 #, fuzzy
 msgid "Messages"
 msgstr "Colour messages"
 
-#: modules/gui/beos/InterfaceWindow.cpp:246
+#: modules/gui/beos/InterfaceWindow.cpp:263
 #: modules/gui/beos/PlayListWindow.cpp:87 modules/gui/macosx/open.m:439
 #: modules/gui/macosx/open.m:737 modules/gui/macosx/open.m:783
-#: modules/gui/wxwidgets/dialogs.cpp:397 modules/gui/wxwidgets/open.cpp:1235
-#: modules/gui/wxwidgets/wizard.cpp:1277
+#: modules/gui/wxwidgets/dialogs.cpp:415
+#: modules/gui/wxwidgets/dialogs/open.cpp:1230
 #, fuzzy
 msgid "Open File"
 msgstr "Append to file"
 
-#: modules/gui/beos/InterfaceWindow.cpp:248
+#: modules/gui/beos/InterfaceWindow.cpp:265
 #: modules/gui/beos/PlayListWindow.cpp:92
 msgid "Open Disc"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:249
+#: modules/gui/beos/InterfaceWindow.cpp:266
 #, fuzzy
 msgid "Open Subtitles"
 msgstr "Subtitles Track"
 
-#: modules/gui/beos/InterfaceWindow.cpp:253
+#: modules/gui/beos/InterfaceWindow.cpp:270
 #: modules/gui/pda/pda_interface.c:300 modules/gui/pda/pda_interface.c:301
 #: modules/gui/pda/pda_interface.c:1362
 msgid "About"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:268
+#: modules/gui/beos/InterfaceWindow.cpp:285
 #, fuzzy
 msgid "Prev Title"
 msgstr "Title"
 
-#: modules/gui/beos/InterfaceWindow.cpp:269
+#: modules/gui/beos/InterfaceWindow.cpp:286
 #, fuzzy
 msgid "Next Title"
 msgstr "Next file"
 
-#: modules/gui/beos/InterfaceWindow.cpp:278
+#: modules/gui/beos/InterfaceWindow.cpp:295
 #, fuzzy
 msgid "Go to Title"
 msgstr "Video title"
 
-#: modules/gui/beos/InterfaceWindow.cpp:282
+#: modules/gui/beos/InterfaceWindow.cpp:299
 msgid "Go to Chapter"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:285
+#: modules/gui/beos/InterfaceWindow.cpp:302
 #, fuzzy
 msgid "Speed"
 msgstr "Scope"
 
-#: modules/gui/beos/InterfaceWindow.cpp:304 modules/gui/macosx/intf.m:548
+#: modules/gui/beos/InterfaceWindow.cpp:321 modules/gui/macosx/intf.m:537
 msgid "Window"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:381 modules/gui/macosx/bookmarks.m:106
+#: modules/gui/beos/InterfaceWindow.cpp:398 modules/gui/macosx/bookmarks.m:106
 #: modules/gui/macosx/bookmarks.m:233 modules/gui/macosx/bookmarks.m:241
 #: modules/gui/macosx/bookmarks.m:291 modules/gui/macosx/bookmarks.m:301
-#: modules/gui/macosx/extended.m:578 modules/gui/macosx/open.m:157
+#: modules/gui/macosx/extended.m:606 modules/gui/macosx/open.m:157
 #: modules/gui/macosx/open.m:254 modules/gui/macosx/output.m:138
-#: modules/gui/macosx/playlistinfo.m:57 modules/gui/macosx/update.m:92
-#: modules/gui/macosx/wizard.m:457 modules/gui/macosx/wizard.m:587
-#: modules/gui/macosx/wizard.m:653 modules/gui/macosx/wizard.m:1044
-#: modules/gui/macosx/wizard.m:1094 modules/gui/wxwidgets/bookmarks.cpp:167
-#: modules/gui/wxwidgets/iteminfo.cpp:90 modules/gui/wxwidgets/open.cpp:326
-#: modules/gui/wxwidgets/open.cpp:495
-#: modules/gui/wxwidgets/preferences.cpp:209
-#: modules/gui/wxwidgets/streamout.cpp:201
-#: modules/gui/wxwidgets/subtitles.cpp:250
+#: modules/gui/macosx/playlistinfo.m:57 modules/gui/macosx/wizard.m:467
+#: modules/gui/macosx/wizard.m:597 modules/gui/macosx/wizard.m:663
+#: modules/gui/macosx/wizard.m:1054 modules/gui/macosx/wizard.m:1120
+#: modules/gui/macosx/wizard.m:1674
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:105
+#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:77
+#: modules/gui/wxwidgets/dialogs/open.cpp:321
+#: modules/gui/wxwidgets/dialogs/open.cpp:490
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:202
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:195
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:240
 msgid "OK"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:389
+#: modules/gui/beos/InterfaceWindow.cpp:406
 msgid "VLC media player: Open Media Files"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:393
+#: modules/gui/beos/InterfaceWindow.cpp:410
 msgid "VLC media player: Open Subtitle File"
 msgstr ""
 
@@ -9053,17 +9456,21 @@ msgid "playlist"
 msgstr ""
 
 #: modules/gui/beos/PlayListWindow.cpp:96
-#: modules/gui/wxwidgets/messages.cpp:89
+#: modules/gui/wxwidgets/dialogs/messages.cpp:78
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:74
 #, fuzzy
 msgid "Close"
 msgstr "Codec"
 
 #: modules/gui/beos/PlayListWindow.cpp:101 modules/gui/macosx/bookmarks.m:95
-#: modules/gui/macosx/intf.m:489 modules/gui/wxwidgets/bookmarks.cpp:227
+#: modules/gui/macosx/intf.m:478
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:165
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:397
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:99
 msgid "Edit"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:103 modules/gui/macosx/intf.m:494
+#: modules/gui/beos/PlayListWindow.cpp:103 modules/gui/macosx/intf.m:483
 #: modules/gui/macosx/playlist.m:503
 msgid "Select All"
 msgstr ""
@@ -9089,7 +9496,7 @@ msgid "Randomize"
 msgstr "Randomise"
 
 #: modules/gui/beos/PlayListWindow.cpp:127 modules/gui/macosx/bookmarks.m:97
-#: modules/gui/wxwidgets/bookmarks.cpp:223
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:161
 msgid "Remove"
 msgstr ""
 
@@ -9107,8 +9514,11 @@ msgid "Path"
 msgstr ""
 
 #: modules/gui/beos/PlayListWindow.cpp:147 modules/gui/macosx/bookmarks.m:108
-#: modules/gui/macosx/playlist.m:132 modules/gui/wxwidgets/bookmarks.cpp:159
-#: modules/gui/wxwidgets/iteminfo.cpp:148 modules/gui/wxwidgets/wizard.cpp:590
+#: modules/gui/macosx/playlist.m:132
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:97
+#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:135
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:369
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:583
 msgid "Name"
 msgstr ""
 
@@ -9118,7 +9528,8 @@ msgstr ""
 
 #: modules/gui/beos/PreferencesWindow.cpp:254 modules/gui/macosx/output.m:538
 #: modules/gui/macosx/playlist.m:766 modules/gui/macosx/prefs.m:121
-#: modules/gui/wxwidgets/preferences.cpp:213
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:206
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:77
 msgid "Save"
 msgstr ""
 
@@ -9160,8 +9571,8 @@ msgstr ""
 msgid "Take Screen Shot"
 msgstr ""
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:468
-#: modules/gui/wxwidgets/interface.cpp:441
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:457
+#: modules/gui/wxwidgets/interface.cpp:485
 msgid "About VLC media player"
 msgstr ""
 
@@ -9170,41 +9581,47 @@ msgstr ""
 msgid "Compiled by %s, based on SVN revision %s"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:92 modules/gui/macosx/intf.m:554
-#: modules/gui/wxwidgets/bookmarks.cpp:201
+#: modules/gui/macosx/bookmarks.m:92 modules/gui/macosx/intf.m:543
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:139
 #, fuzzy
 msgid "Bookmarks"
 msgstr "Bookmark %i"
 
-#: modules/gui/macosx/bookmarks.m:93 modules/gui/wxwidgets/bookmarks.cpp:221
+#: modules/gui/macosx/bookmarks.m:93
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:159
 msgid "Add"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:94 modules/gui/macosx/intf.m:493
-#: modules/gui/wxwidgets/bookmarks.cpp:225
-#: modules/gui/wxwidgets/messages.cpp:94
+#: modules/gui/macosx/bookmarks.m:94 modules/gui/macosx/intf.m:482
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:163
+#: modules/gui/wxwidgets/dialogs/messages.cpp:83
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:399
 msgid "Clear"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:96 modules/gui/wxwidgets/bookmarks.cpp:229
+#: modules/gui/macosx/bookmarks.m:96
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:167
 msgid "Extract"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:101 modules/gui/wxwidgets/bookmarks.cpp:259
+#: modules/gui/macosx/bookmarks.m:101
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:197
 msgid "Size offset"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:103 modules/gui/wxwidgets/bookmarks.cpp:260
+#: modules/gui/macosx/bookmarks.m:103
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:198
 msgid "Time offset"
 msgstr ""
 
 #: modules/gui/macosx/bookmarks.m:109 modules/gui/pda/pda.c:281
-#: modules/gui/wxwidgets/bookmarks.cpp:161
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:99
 #, fuzzy
 msgid "Time"
 msgstr "Title"
 
-#: modules/gui/macosx/bookmarks.m:110 modules/gui/wxwidgets/bookmarks.cpp:163
+#: modules/gui/macosx/bookmarks.m:110
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:101
 msgid "Bytes"
 msgstr ""
 
@@ -9213,12 +9630,14 @@ msgstr ""
 msgid "Untitled"
 msgstr "Title"
 
-#: modules/gui/macosx/bookmarks.m:233 modules/gui/wxwidgets/bookmarks.cpp:505
+#: modules/gui/macosx/bookmarks.m:233
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:443
 #, fuzzy
 msgid "No input"
 msgstr "no input\n"
 
-#: modules/gui/macosx/bookmarks.m:234 modules/gui/wxwidgets/bookmarks.cpp:503
+#: modules/gui/macosx/bookmarks.m:234
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:441
 msgid ""
 "No input found. The stream must be playing or paused for bookmarks to work."
 msgstr ""
@@ -9227,28 +9646,29 @@ msgstr ""
 msgid "Input has changed"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:242 modules/gui/wxwidgets/bookmarks.cpp:511
+#: modules/gui/macosx/bookmarks.m:242
 msgid ""
-"Input has changed, unable to save bookmark. Use \"pause\" while editing "
+"Input has changed, unable to save bookmark. Use \"Pause\" while editing "
 "bookmarks to keep the same input."
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:291 modules/gui/macosx/wizard.m:1044
-#: modules/gui/wxwidgets/bookmarks.cpp:410
+#: modules/gui/macosx/bookmarks.m:291 modules/gui/macosx/wizard.m:1054
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:348
 msgid "Invalid selection"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:292 modules/gui/wxwidgets/bookmarks.cpp:409
-msgid "You must select two bookmarks"
+#: modules/gui/macosx/bookmarks.m:292
+msgid "You have to select two bookmarks."
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:301 modules/gui/wxwidgets/bookmarks.cpp:420
+#: modules/gui/macosx/bookmarks.m:301
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:358
 #, fuzzy
 msgid "No input found"
 msgstr "no input\n"
 
-#: modules/gui/macosx/bookmarks.m:302 modules/gui/wxwidgets/bookmarks.cpp:419
-msgid "The stream must be playing or paused for bookmarks to work"
+#: modules/gui/macosx/bookmarks.m:302
+msgid "The stream must be playing or paused for bookmarks to work."
 msgstr ""
 
 #: modules/gui/macosx/controls.m:126
@@ -9260,8 +9680,9 @@ msgid "Random Off"
 msgstr "Random Off"
 
 #: modules/gui/macosx/controls.m:158 modules/gui/macosx/controls.m:590
-#: modules/gui/macosx/intf.m:504 modules/gui/macosx/playlist.m:518
-#: modules/gui/macosx/playlist.m:1192 modules/gui/wxwidgets/playlist.cpp:53
+#: modules/gui/macosx/intf.m:493 modules/gui/macosx/playlist.m:518
+#: modules/gui/macosx/playlist.m:1192
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:52
 msgid "Repeat One"
 msgstr ""
 
@@ -9272,51 +9693,52 @@ msgid "Repeat Off"
 msgstr "Random Off"
 
 #: modules/gui/macosx/controls.m:190 modules/gui/macosx/controls.m:597
-#: modules/gui/macosx/intf.m:505 modules/gui/macosx/playlist.m:519
-#: modules/gui/macosx/playlist.m:1200 modules/gui/wxwidgets/playlist.cpp:52
+#: modules/gui/macosx/intf.m:494 modules/gui/macosx/playlist.m:519
+#: modules/gui/macosx/playlist.m:1200
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:51
 msgid "Repeat All"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:275 modules/gui/macosx/controls.m:618
-#: modules/gui/macosx/intf.m:530
+#: modules/gui/macosx/intf.m:519
 msgid "Half Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:277 modules/gui/macosx/controls.m:619
-#: modules/gui/macosx/intf.m:531
+#: modules/gui/macosx/intf.m:520
 msgid "Normal Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:279 modules/gui/macosx/controls.m:620
-#: modules/gui/macosx/intf.m:532
+#: modules/gui/macosx/intf.m:521
 msgid "Double Size"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:281 modules/gui/macosx/controls.m:624
-#: modules/gui/macosx/controls.m:635 modules/gui/macosx/intf.m:535
+#: modules/gui/macosx/controls.m:635 modules/gui/macosx/intf.m:524
 msgid "Float on Top"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:283 modules/gui/macosx/controls.m:621
-#: modules/gui/macosx/intf.m:533
+#: modules/gui/macosx/intf.m:522
 msgid "Fit to Screen"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:583 modules/gui/macosx/intf.m:503
+#: modules/gui/macosx/controls.m:583 modules/gui/macosx/intf.m:492
 #: modules/gui/macosx/playlist.m:512
 msgid "Random"
 msgstr "Random"
 
-#: modules/gui/macosx/controls.m:604 modules/gui/macosx/intf.m:506
+#: modules/gui/macosx/controls.m:604 modules/gui/macosx/intf.m:495
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:605 modules/gui/macosx/intf.m:507
+#: modules/gui/macosx/controls.m:605 modules/gui/macosx/intf.m:496
 #, fuzzy
 msgid "Step Backward"
 msgstr "Backwards"
 
-#: modules/gui/macosx/equalizer.m:141 modules/gui/wxwidgets/extrapanel.cpp:473
+#: modules/gui/macosx/equalizer.m:141 modules/gui/wxwidgets/extrapanel.cpp:474
 msgid "2 Pass"
 msgstr ""
 
@@ -9337,23 +9759,25 @@ msgstr ""
 msgid "Preamp"
 msgstr "Stream "
 
-#: modules/gui/macosx/extended.m:79 modules/gui/wxwidgets/extrapanel.cpp:1214
+#: modules/gui/macosx/extended.m:79 modules/gui/wxwidgets/extrapanel.cpp:1215
 msgid "Extended controls"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:83 modules/gui/wxwidgets/extrapanel.cpp:302
+#: modules/gui/macosx/extended.m:83 modules/gui/wxwidgets/extrapanel.cpp:303
 #, fuzzy
 msgid "Video filters"
 msgstr "Video title"
 
-#: modules/gui/macosx/extended.m:84 modules/gui/wxwidgets/extrapanel.cpp:206
+#: modules/gui/macosx/extended.m:84 modules/gui/wxwidgets/extrapanel.cpp:207
 msgid "Adjust Image"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:85 modules/gui/macosx/wizard.m:351
-#: modules/gui/macosx/wizard.m:352 modules/gui/macosx/wizard.m:422
-#: modules/gui/macosx/wizard.m:424 modules/gui/wxwidgets/wizard.cpp:477
-#: modules/gui/wxwidgets/wizard.cpp:484
+#: modules/gui/macosx/extended.m:85 modules/gui/macosx/wizard.m:355
+#: modules/gui/macosx/wizard.m:356 modules/gui/macosx/wizard.m:426
+#: modules/gui/macosx/wizard.m:428 modules/gui/macosx/wizard.m:430
+#: modules/gui/macosx/wizard.m:439
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:470
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:477
 msgid "More Info"
 msgstr ""
 
@@ -9366,7 +9790,7 @@ msgid "Creates a motion blurring on the image"
 msgstr ""
 
 #: modules/gui/macosx/extended.m:88 modules/gui/wxwidgets/extrapanel.cpp:151
-#: modules/video_filter/distort.c:67
+#: modules/video_filter/distort.c:78
 #, fuzzy
 msgid "Distortion"
 msgstr "Stereo"
@@ -9410,7 +9834,7 @@ msgstr "Visualisations"
 msgid "Rotates or flips the image"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:98 modules/gui/wxwidgets/extrapanel.cpp:403
+#: modules/gui/macosx/extended.m:98 modules/gui/wxwidgets/extrapanel.cpp:404
 #, fuzzy
 msgid "Volume normalization"
 msgstr "Visualisations"
@@ -9420,29 +9844,29 @@ msgid ""
 "This filters prevents the audio output power from going over a defined value."
 msgstr ""
 
-#: modules/gui/macosx/extended.m:101 modules/gui/wxwidgets/extrapanel.cpp:398
+#: modules/gui/macosx/extended.m:101 modules/gui/wxwidgets/extrapanel.cpp:399
 msgid "Headphone virtualization"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:102 modules/gui/wxwidgets/extrapanel.cpp:399
+#: modules/gui/macosx/extended.m:102 modules/gui/wxwidgets/extrapanel.cpp:400
 msgid ""
 "This filter gives the feeling of a 5.1 speaker set when using a headphone."
 msgstr ""
 
-#: modules/gui/macosx/extended.m:104 modules/gui/wxwidgets/extrapanel.cpp:408
+#: modules/gui/macosx/extended.m:104 modules/gui/wxwidgets/extrapanel.cpp:409
 msgid "Maximum level"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:105 modules/gui/wxwidgets/extrapanel.cpp:223
-#: modules/gui/wxwidgets/extrapanel.cpp:483
+#: modules/gui/macosx/extended.m:105 modules/gui/wxwidgets/extrapanel.cpp:224
+#: modules/gui/wxwidgets/extrapanel.cpp:484
 msgid "Restore Defaults"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:109 modules/gui/wxwidgets/extrapanel.cpp:246
+#: modules/gui/macosx/extended.m:109 modules/gui/wxwidgets/extrapanel.cpp:247
 msgid "Gamma"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:111 modules/gui/wxwidgets/extrapanel.cpp:241
+#: modules/gui/macosx/extended.m:111 modules/gui/wxwidgets/extrapanel.cpp:242
 #, fuzzy
 msgid "Saturation"
 msgstr "Polarisation"
@@ -9451,13 +9875,14 @@ msgstr "Polarisation"
 msgid "Opaqueness"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:578 modules/gui/wxwidgets/extrapanel.cpp:1011
-#: modules/gui/wxwidgets/wizard.cpp:506
+#: modules/gui/macosx/extended.m:606
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:499
+#: modules/gui/wxwidgets/extrapanel.cpp:1012
 #, fuzzy
 msgid "More information"
 msgstr "Visualisations"
 
-#: modules/gui/macosx/extended.m:579 modules/gui/wxwidgets/extrapanel.cpp:1001
+#: modules/gui/macosx/extended.m:607 modules/gui/wxwidgets/extrapanel.cpp:1002
 msgid ""
 "Select the video effects filters to apply. You must restart the stream for "
 "these settings to take effect.\n"
@@ -9468,240 +9893,235 @@ msgid ""
 "(Preferences / Video / Filters)."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:448
+#: modules/gui/macosx/intf.m:437
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:449 modules/gui/macosx/intf.m:863
-#: modules/gui/macosx/intf.m:1172 modules/gui/pda/pda_interface.c:212
+#: modules/gui/macosx/intf.m:438 modules/gui/macosx/intf.m:852
+#: modules/gui/macosx/intf.m:1161 modules/gui/pda/pda_interface.c:212
 #: modules/gui/pda/pda_interface.c:1355
 msgid "VLC media player"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:453 modules/gui/pda/pda_interface.c:238
+#: modules/gui/macosx/intf.m:442 modules/gui/pda/pda_interface.c:238
 #: modules/gui/pda/pda_interface.c:239
 msgid "Rewind"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:454 modules/gui/macosx/intf.m:497
-#: modules/gui/macosx/intf.m:571 modules/gui/macosx/intf.m:1271
-#: modules/gui/macosx/intf.m:1272 modules/gui/macosx/intf.m:1273
+#: modules/gui/macosx/intf.m:443 modules/gui/macosx/intf.m:486
+#: modules/gui/macosx/intf.m:560 modules/gui/macosx/intf.m:1260
+#: modules/gui/macosx/intf.m:1261 modules/gui/macosx/intf.m:1262
 #: modules/gui/macosx/playlist.m:500 modules/gui/pda/pda_interface.c:262
-#: modules/gui/pda/pda_interface.c:263 modules/gui/wxwidgets/interface.cpp:490
-#: modules/gui/wxwidgets/interface.cpp:1292
-#: modules/gui/wxwidgets/menus.cpp:291 modules/gui/wxwidgets/menus.cpp:305
-#: modules/gui/wxwidgets/playlist.cpp:267
-#: modules/gui/wxwidgets/playlist.cpp:275
+#: modules/gui/pda/pda_interface.c:263
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:267
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:275
+#: modules/gui/wxwidgets/interface.cpp:554
+#: modules/gui/wxwidgets/interface.cpp:1271
+#: modules/gui/wxwidgets/menus.cpp:292 modules/gui/wxwidgets/menus.cpp:306
 msgid "Play"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:456
+#: modules/gui/macosx/intf.m:445
 msgid "Fast Forward"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:465
+#: modules/gui/macosx/intf.m:454
 msgid "Open CrashLog"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:470
-msgid "Check for Update..."
-msgstr ""
-
-#: modules/gui/macosx/intf.m:471
+#: modules/gui/macosx/intf.m:460
 msgid "Preferences..."
 msgstr "Preferences…"
 
-#: modules/gui/macosx/intf.m:474
+#: modules/gui/macosx/intf.m:463
 msgid "Services"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:475
+#: modules/gui/macosx/intf.m:464
 msgid "Hide VLC"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:476
+#: modules/gui/macosx/intf.m:465
 #, fuzzy
 msgid "Hide Others"
 msgstr "Video title"
 
-#: modules/gui/macosx/intf.m:477
+#: modules/gui/macosx/intf.m:466
 msgid "Show All"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:478 modules/gui/wxwidgets/interface.cpp:1563
+#: modules/gui/macosx/intf.m:467 modules/gui/wxwidgets/interface.cpp:1543
 msgid "Quit VLC"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:480
+#: modules/gui/macosx/intf.m:469
 msgid "1:File"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:481
+#: modules/gui/macosx/intf.m:470
 msgid "Open File..."
 msgstr "Open File…"
 
-#: modules/gui/macosx/intf.m:482
+#: modules/gui/macosx/intf.m:471
 msgid "Quick Open File..."
 msgstr "Quick Open File…"
 
-#: modules/gui/macosx/intf.m:483
+#: modules/gui/macosx/intf.m:472
 msgid "Open Disc..."
 msgstr "Open Disc…"
 
-#: modules/gui/macosx/intf.m:484
+#: modules/gui/macosx/intf.m:473
 msgid "Open Network..."
 msgstr "Open Network…"
 
-#: modules/gui/macosx/intf.m:485
+#: modules/gui/macosx/intf.m:474
 msgid "Open Recent"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:486 modules/gui/macosx/intf.m:1769
+#: modules/gui/macosx/intf.m:475 modules/gui/macosx/intf.m:1789
 msgid "Clear Menu"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:487
+#: modules/gui/macosx/intf.m:476
 msgid "Streaming/Exporting Wizard..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:490
+#: modules/gui/macosx/intf.m:479
 msgid "Cut"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:491
+#: modules/gui/macosx/intf.m:480
 #, fuzzy
 msgid "Copy"
 msgstr "Copyright"
 
-#: modules/gui/macosx/intf.m:492
+#: modules/gui/macosx/intf.m:481
 #, fuzzy
 msgid "Paste"
 msgstr "Date"
 
-#: modules/gui/macosx/intf.m:496
+#: modules/gui/macosx/intf.m:485
 #, fuzzy
 msgid "Playback"
 msgstr "Backwards"
 
-#: modules/gui/macosx/intf.m:517
+#: modules/gui/macosx/intf.m:506
 msgid "Volume Up"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:518
+#: modules/gui/macosx/intf.m:507
 msgid "Volume Down"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:539 modules/gui/macosx/intf.m:540
+#: modules/gui/macosx/intf.m:528 modules/gui/macosx/intf.m:529
 #: modules/gui/macosx/vout.m:168
 msgid "Video Device"
 msgstr "Video Device"
 
-#: modules/gui/macosx/intf.m:549
+#: modules/gui/macosx/intf.m:538
 msgid "Minimize Window"
 msgstr "Minimise Window"
 
-#: modules/gui/macosx/intf.m:550
+#: modules/gui/macosx/intf.m:539
 msgid "Close Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:551
+#: modules/gui/macosx/intf.m:540
 msgid "Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:553
+#: modules/gui/macosx/intf.m:542
 #, fuzzy
 msgid "Extended Controls"
 msgstr "Text renderer settings"
 
-#: modules/gui/macosx/intf.m:556 modules/gui/macosx/intf.m:587
+#: modules/gui/macosx/intf.m:545 modules/gui/macosx/intf.m:576
 #: modules/gui/macosx/playlistinfo.m:202
-#: modules/gui/wxwidgets/playlist.cpp:272
-#: modules/gui/wxwidgets/playlist.cpp:278
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:272
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:278
 msgid "Info"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:559
+#: modules/gui/macosx/intf.m:548
 msgid "Bring All to Front"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:561
+#: modules/gui/macosx/intf.m:550
 msgid "Help"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:562
+#: modules/gui/macosx/intf.m:551
 msgid "ReadMe..."
 msgstr "ReadMe…"
 
-#: modules/gui/macosx/intf.m:563
+#: modules/gui/macosx/intf.m:552
 msgid "Online Documentation"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:564
+#: modules/gui/macosx/intf.m:553
 msgid "Report a Bug"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:565
+#: modules/gui/macosx/intf.m:554
 #, fuzzy
 msgid "VideoLAN Website"
 msgstr "Video bitrate"
 
-#: modules/gui/macosx/intf.m:566
+#: modules/gui/macosx/intf.m:555
 msgid "License"
 msgstr "Licence"
 
-#: modules/gui/macosx/intf.m:567
+#: modules/gui/macosx/intf.m:556
 msgid "Make a donation"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:568
+#: modules/gui/macosx/intf.m:557
 msgid "Online Forum"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:578 modules/gui/wxwidgets/wizard.cpp:87
+#: modules/gui/macosx/intf.m:567 modules/gui/wxwidgets/dialogs/wizard.cpp:80
 msgid "Error"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:579
+#: modules/gui/macosx/intf.m:568
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:581
+#: modules/gui/macosx/intf.m:570
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:583
+#: modules/gui/macosx/intf.m:572
 msgid "Open Messages Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:584
+#: modules/gui/macosx/intf.m:573
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:585
+#: modules/gui/macosx/intf.m:574
 msgid "Suppress further errors"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1032
+#: modules/gui/macosx/intf.m:1021
 #, c-format
 msgid "Volume: %d%%"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1263 modules/gui/macosx/intf.m:1264
-#: modules/gui/macosx/intf.m:1265 modules/gui/pda/pda_interface.c:250
-#: modules/gui/pda/pda_interface.c:251 modules/gui/wxwidgets/interface.cpp:491
-#: modules/gui/wxwidgets/interface.cpp:1286
-#: modules/gui/wxwidgets/menus.cpp:293 modules/visualization/xosd.c:241
-#: modules/visualization/xosd.c:242
-#, c-format
+#: modules/gui/macosx/intf.m:1252 modules/gui/macosx/intf.m:1253
+#: modules/gui/macosx/intf.m:1254 modules/gui/pda/pda_interface.c:250
+#: modules/gui/pda/pda_interface.c:251 modules/gui/wxwidgets/interface.cpp:555
+#: modules/gui/wxwidgets/interface.cpp:1265
+#: modules/gui/wxwidgets/menus.cpp:294 modules/visualization/xosd.c:240
 msgid "Pause"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1636
+#: modules/gui/macosx/intf.m:1656
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1636
+#: modules/gui/macosx/intf.m:1656
 msgid "You haven't experienced any heavy crashes yet."
 msgstr ""
 
@@ -9723,7 +10143,7 @@ msgid ""
 msgstr ""
 
 #: modules/gui/macosx/macosx.m:60
-msgid "Stretch Aspect Ratio"
+msgid "Stretch video to fill window"
 msgstr ""
 
 #: modules/gui/macosx/macosx.m:61
@@ -9766,7 +10186,7 @@ msgid "Open Source"
 msgstr ""
 
 #: modules/gui/macosx/open.m:155 modules/gui/wince/open.cpp:130
-#: modules/gui/wxwidgets/open.cpp:426
+#: modules/gui/wxwidgets/dialogs/open.cpp:421
 msgid "Media Resource Locator (MRL)"
 msgstr ""
 
@@ -9774,10 +10194,10 @@ msgstr ""
 #: modules/gui/macosx/open.m:242 modules/gui/macosx/output.m:145
 #: modules/gui/macosx/prefs_widgets.m:1183
 #: modules/gui/wince/preferences_widgets.cpp:512
-#: modules/gui/wxwidgets/open.cpp:636
-#: modules/gui/wxwidgets/preferences_widgets.cpp:670
-#: modules/gui/wxwidgets/streamout.cpp:468
-#: modules/gui/wxwidgets/subtitles.cpp:91
+#: modules/gui/wxwidgets/dialogs/open.cpp:631
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:660
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:502
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:81
 msgid "Browse..."
 msgstr "Browse…"
 
@@ -9785,7 +10205,7 @@ msgstr "Browse…"
 msgid "Treat as a pipe rather than as a file"
 msgstr ""
 
-#: modules/gui/macosx/open.m:167 modules/gui/wxwidgets/open.cpp:706
+#: modules/gui/macosx/open.m:167 modules/gui/wxwidgets/dialogs/open.cpp:701
 msgid "Device name"
 msgstr ""
 
@@ -9798,24 +10218,25 @@ msgid "VIDEO_TS folder"
 msgstr ""
 
 #: modules/gui/macosx/open.m:174 modules/gui/macosx/open.m:595
-#: modules/gui/wxwidgets/open.cpp:680
+#: modules/gui/wxwidgets/dialogs/open.cpp:675
 msgid "DVD"
 msgstr ""
 
 #: modules/gui/macosx/open.m:178 modules/gui/macosx/open.m:180
-#: modules/gui/macosx/output.m:147 modules/gui/wxwidgets/open.cpp:810
-#: modules/gui/wxwidgets/open.cpp:837 modules/gui/wxwidgets/streamout.cpp:498
-#: modules/stream_out/rtp.c:67
+#: modules/gui/macosx/output.m:147 modules/gui/wxwidgets/dialogs/open.cpp:805
+#: modules/gui/wxwidgets/dialogs/open.cpp:832
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:532 modules/stream_out/rtp.c:70
 msgid "Port"
 msgstr ""
 
 #: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:146
-#: modules/gui/wxwidgets/open.cpp:829 modules/gui/wxwidgets/streamout.cpp:487
+#: modules/gui/wxwidgets/dialogs/open.cpp:824
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:521
 msgid "Address"
 msgstr ""
 
 #: modules/gui/macosx/open.m:184 modules/gui/macosx/open.m:655
-#: modules/gui/macosx/open.m:704 modules/gui/wxwidgets/open.cpp:785
+#: modules/gui/macosx/open.m:704 modules/gui/wxwidgets/dialogs/open.cpp:780
 #, fuzzy
 msgid "UDP/RTP Multicast"
 msgstr "UDP/RTP input"
@@ -9825,7 +10246,7 @@ msgstr "UDP/RTP input"
 msgid "HTTP/FTP/MMS/RTSP"
 msgstr ""
 
-#: modules/gui/macosx/open.m:186 modules/gui/wxwidgets/open.cpp:803
+#: modules/gui/macosx/open.m:186 modules/gui/wxwidgets/dialogs/open.cpp:798
 msgid "Allow timeshifting"
 msgstr ""
 
@@ -9835,7 +10256,8 @@ msgid "Load subtitles file:"
 msgstr "Choose file"
 
 #: modules/gui/macosx/open.m:241 modules/gui/macosx/output.m:137
-#: modules/gui/wxwidgets/open.cpp:459 modules/gui/wxwidgets/open.cpp:648
+#: modules/gui/wxwidgets/dialogs/open.cpp:454
+#: modules/gui/wxwidgets/dialogs/open.cpp:643
 msgid "Settings..."
 msgstr "Settings…"
 
@@ -9851,7 +10273,8 @@ msgstr ""
 msgid "fps"
 msgstr ""
 
-#: modules/gui/macosx/open.m:248 modules/gui/wxwidgets/subtitles.cpp:105
+#: modules/gui/macosx/open.m:248
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:95
 #, fuzzy
 msgid "Subtitles encoding"
 msgstr "DVB subtitles decoder"
@@ -9890,15 +10313,18 @@ msgstr ""
 msgid "Output Options"
 msgstr "Options"
 
-#: modules/gui/macosx/output.m:141 modules/gui/wxwidgets/streamout.cpp:438
+#: modules/gui/macosx/output.m:141
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:471
 msgid "Play locally"
 msgstr ""
 
-#: modules/gui/macosx/output.m:144 modules/gui/wxwidgets/streamout.cpp:477
+#: modules/gui/macosx/output.m:144
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:511
 msgid "Dump raw input"
 msgstr ""
 
-#: modules/gui/macosx/output.m:155 modules/gui/wxwidgets/streamout.cpp:625
+#: modules/gui/macosx/output.m:155
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:659
 msgid "Encapsulation Method"
 msgstr ""
 
@@ -9908,14 +10334,17 @@ msgid "Transcode options"
 msgstr "Advanced options..."
 
 #: modules/gui/macosx/output.m:163 modules/gui/macosx/output.m:173
-#: modules/gui/macosx/wizard.m:404 modules/gui/wxwidgets/streamout.cpp:740
-#: modules/gui/wxwidgets/streamout.cpp:815
-#: modules/gui/wxwidgets/wizard.cpp:833 modules/gui/wxwidgets/wizard.cpp:872
+#: modules/gui/macosx/wizard.m:408
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:774
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:849
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:839
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:878
 #, fuzzy
 msgid "Bitrate (kb/s)"
 msgstr "Bitrate"
 
-#: modules/gui/macosx/output.m:166 modules/gui/wxwidgets/streamout.cpp:746
+#: modules/gui/macosx/output.m:166
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:780
 #, fuzzy
 msgid "Scale"
 msgstr "Scope"
@@ -9925,7 +10354,8 @@ msgstr "Scope"
 msgid "Stream Announcing"
 msgstr "Codec setting"
 
-#: modules/gui/macosx/output.m:181 modules/gui/wxwidgets/streamout.cpp:557
+#: modules/gui/macosx/output.m:181
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:591
 msgid "SAP announce"
 msgstr ""
 
@@ -9963,8 +10393,9 @@ msgstr ""
 msgid "Properties"
 msgstr "Properties"
 
-#: modules/gui/macosx/playlistinfo.m:54 modules/gui/wxwidgets/iteminfo.cpp:137
-#: modules/gui/wxwidgets/wizard.cpp:591
+#: modules/gui/macosx/playlistinfo.m:54
+#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:124
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:584
 #, fuzzy
 msgid "URI"
 msgstr "URL"
@@ -9974,8 +10405,9 @@ msgid "Save Playlist..."
 msgstr "Save Playlist…"
 
 #: modules/gui/macosx/playlist.m:501 modules/gui/pda/pda_interface.c:1254
-#: modules/gui/wxwidgets/playlist.cpp:271
-#: modules/gui/wxwidgets/playlist.cpp:277
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:271
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:277
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:104
 #, fuzzy
 msgid "Delete"
 msgstr "Date"
@@ -9984,8 +10416,9 @@ msgstr "Date"
 msgid "Expand Node"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:505 modules/gui/wxwidgets/playlist.cpp:269
-#: modules/gui/wxwidgets/playlist.cpp:276
+#: modules/gui/macosx/playlist.m:505
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:269
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:276
 #, fuzzy
 msgid "Preparse"
 msgstr "Date"
@@ -10000,12 +10433,13 @@ msgstr "Reverse stereo"
 msgid "Sort Node by Author"
 msgstr "Reverse stereo"
 
-#: modules/gui/macosx/playlist.m:510 modules/gui/macosx/playlist.m:1519
+#: modules/gui/macosx/playlist.m:510 modules/gui/macosx/playlist.m:1518
 #, fuzzy
-msgid "no items in playlist"
+msgid "No items in the playlist"
 msgstr "&Shuffle Playlist"
 
-#: modules/gui/macosx/playlist.m:514 modules/gui/wxwidgets/playlist.cpp:315
+#: modules/gui/macosx/playlist.m:514
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:315
 msgid "Search"
 msgstr ""
 
@@ -10023,22 +10457,23 @@ msgstr ""
 msgid "Save Playlist"
 msgstr "&Shuffle Playlist"
 
-#: modules/gui/macosx/playlist.m:1512 modules/gui/wxwidgets/playlist.cpp:581
-#: modules/gui/wxwidgets/playlist.cpp:793
-#, c-format
-msgid "%i items in playlist"
-msgstr ""
+#: modules/gui/macosx/playlist.m:1512
+#, fuzzy, c-format
+msgid "%i items in the playlist"
+msgstr "&Shuffle Playlist"
 
-#: modules/gui/macosx/playlist.m:1524
+#: modules/gui/macosx/playlist.m:1522
 #, fuzzy
-msgid "1 item in playlist"
+msgid "1 item in the playlist"
 msgstr "&Shuffle Playlist"
 
-#: modules/gui/macosx/prefs.m:123 modules/gui/wxwidgets/preferences.cpp:215
+#: modules/gui/macosx/prefs.m:123
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:208
 msgid "Reset All"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:142 modules/gui/wxwidgets/preferences.cpp:296
+#: modules/gui/macosx/prefs.m:142
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:289
 #, fuzzy
 msgid "Reset Preferences"
 msgstr "VLC preferences"
@@ -10048,13 +10483,14 @@ msgstr "VLC preferences"
 msgid "Continue"
 msgstr "Interlingue"
 
-#: modules/gui/macosx/prefs.m:145 modules/gui/wxwidgets/preferences.cpp:294
+#: modules/gui/macosx/prefs.m:145
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:287
 msgid ""
 "Beware this will reset your VLC media player preferences.\n"
 "Are you sure you want to continue?"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:703
+#: modules/gui/macosx/prefs.m:705
 msgid "Some options are available but hidden. Check \"Advanced\" to see them."
 msgstr ""
 
@@ -10072,36 +10508,6 @@ msgstr "Next file"
 msgid "Select"
 msgstr ""
 
-#: modules/gui/macosx/update.m:91
-msgid "Download now"
-msgstr ""
-
-#: modules/gui/macosx/update.m:93
-#, fuzzy
-msgid "Current version"
-msgstr "Stereo"
-
-#: modules/gui/macosx/update.m:95
-msgid "Released on"
-msgstr ""
-
-#: modules/gui/macosx/update.m:97 modules/gui/pda/pda.c:232
-msgid "Size"
-msgstr ""
-
-#: modules/gui/macosx/update.m:99
-#, fuzzy
-msgid "Your version"
-msgstr "Stereo"
-
-#: modules/gui/macosx/update.m:101
-msgid "Mirror"
-msgstr ""
-
-#: modules/gui/macosx/update.m:103
-msgid "Checking for update..."
-msgstr ""
-
 #: modules/gui/macosx/wizard.m:114
 msgid "MPEG-1 Video codec (usable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
 msgstr ""
@@ -10116,19 +10522,19 @@ msgid ""
 "RAW)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:126 modules/gui/wxwidgets/streamdata.h:66
+#: modules/gui/macosx/wizard.m:126 modules/gui/wxwidgets/streamdata.cpp:43
 msgid "DivX first version (useable with MPEG TS, MPEG1, ASF and OGG)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:130 modules/gui/wxwidgets/streamdata.h:70
+#: modules/gui/macosx/wizard.m:130 modules/gui/wxwidgets/streamdata.cpp:47
 msgid "DivX second version (useable with MPEG TS, MPEG1, ASF and OGG)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:134 modules/gui/wxwidgets/streamdata.h:73
+#: modules/gui/macosx/wizard.m:134 modules/gui/wxwidgets/streamdata.cpp:50
 msgid "DivX third version (useable with MPEG TS, MPEG1, ASF and OGG)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:138 modules/gui/wxwidgets/streamdata.h:76
+#: modules/gui/macosx/wizard.m:138 modules/gui/wxwidgets/streamdata.cpp:53
 msgid ""
 "H263 is a video codec optimized for videoconference (low rates, useable with "
 "MPEG TS)"
@@ -10147,76 +10553,76 @@ msgstr ""
 msgid "WMV (Windows Media Video) 2 (useable with MPEG TS, MPEG1, ASF and OGG)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:154 modules/gui/wxwidgets/streamdata.h:93
+#: modules/gui/macosx/wizard.m:154 modules/gui/wxwidgets/streamdata.cpp:70
 msgid ""
 "MJPEG consists of a series of JPEG pictures (useable with MPEG TS, MPEG1, "
 "ASF and OGG)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:158 modules/gui/wxwidgets/streamdata.h:96
+#: modules/gui/macosx/wizard.m:158 modules/gui/wxwidgets/streamdata.cpp:73
 msgid "Theora is a free general-purpose codec (useable with MPEG TS)"
 msgstr ""
 
 #: modules/gui/macosx/wizard.m:161 modules/gui/macosx/wizard.m:212
-#: modules/gui/wxwidgets/streamdata.h:99
-#: modules/gui/wxwidgets/streamdata.h:136
+#: modules/gui/wxwidgets/streamdata.cpp:76
+#: modules/gui/wxwidgets/streamdata.cpp:113
 msgid "Dummy codec (do not transcode, useable with all encapsulation formats)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:180 modules/gui/wxwidgets/streamdata.h:107
+#: modules/gui/macosx/wizard.m:180 modules/gui/wxwidgets/streamdata.cpp:84
 msgid ""
 "The standard MPEG audio (1/2) format (useable with MPEG PS, MPEG TS, MPEG1, "
 "ASF, OGG and RAW)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:184 modules/gui/wxwidgets/streamdata.h:111
+#: modules/gui/macosx/wizard.m:184 modules/gui/wxwidgets/streamdata.cpp:88
 msgid ""
 "MPEG Audio Layer 3 (useable with MPEG PS, MPEG TS, MPEG1, ASF, OGG and RAW)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:188 modules/gui/wxwidgets/streamdata.h:115
+#: modules/gui/macosx/wizard.m:188 modules/gui/wxwidgets/streamdata.cpp:92
 msgid "Audio format for MPEG4 (useable with MPEG TS and MPEG4)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:191 modules/gui/wxwidgets/streamdata.h:118
+#: modules/gui/macosx/wizard.m:191 modules/gui/wxwidgets/streamdata.cpp:95
 msgid ""
 "DVD audio format (useable with MPEG PS, MPEG TS, MPEG1, ASF, OGG and RAW)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:195 modules/gui/wxwidgets/streamdata.h:122
+#: modules/gui/macosx/wizard.m:195 modules/gui/wxwidgets/streamdata.cpp:99
 #, fuzzy
 msgid "Vorbis is a free audio codec (useable with OGG)"
 msgstr "Vorbis audio encoder"
 
-#: modules/gui/macosx/wizard.m:198 modules/gui/wxwidgets/streamdata.h:124
+#: modules/gui/macosx/wizard.m:198 modules/gui/wxwidgets/streamdata.cpp:101
 msgid "FLAC is a lossless audio codec (useable with OGG and RAW)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:202
-msgid "A free audio codec dedicated to compression of voice (useable with OGG"
+#: modules/gui/macosx/wizard.m:202 modules/gui/wxwidgets/streamdata.cpp:104
+msgid "A free audio codec dedicated to compression of voice (useable with OGG)"
 msgstr ""
 
 #: modules/gui/macosx/wizard.m:206 modules/gui/macosx/wizard.m:209
-#: modules/gui/wxwidgets/streamdata.h:130
-#: modules/gui/wxwidgets/streamdata.h:133
+#: modules/gui/wxwidgets/streamdata.cpp:107
+#: modules/gui/wxwidgets/streamdata.cpp:110
 msgid "Uncompressed audio samples (useable with WAV)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:234 modules/gui/wxwidgets/streamdata.h:185
+#: modules/gui/macosx/wizard.m:234 modules/gui/wxwidgets/streamdata.cpp:148
 #, fuzzy
 msgid "MPEG Program Stream"
 msgstr "ISO 13818-1 MPEG Programme Stream input"
 
-#: modules/gui/macosx/wizard.m:236 modules/gui/wxwidgets/streamdata.h:186
+#: modules/gui/macosx/wizard.m:236 modules/gui/wxwidgets/streamdata.cpp:149
 #, fuzzy
 msgid "MPEG Transport Stream"
 msgstr "ISO 13818-1 MPEG Transport Stream demuxstream"
 
-#: modules/gui/macosx/wizard.m:238 modules/gui/wxwidgets/streamdata.h:187
+#: modules/gui/macosx/wizard.m:238 modules/gui/wxwidgets/streamdata.cpp:150
 msgid "MPEG 1 Format"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:255 modules/gui/wxwidgets/streamdata.h:168
+#: modules/gui/macosx/wizard.m:256 modules/gui/wxwidgets/streamdata.cpp:137
 msgid ""
 "Enter the local addresses you want to listen to. Do not enter anything if "
 "you want to listen to all adresses or if you don't understand. This is "
@@ -10224,13 +10630,13 @@ msgid ""
 "at http://yourip:8080 by default."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:259 modules/gui/wxwidgets/streamdata.h:165
+#: modules/gui/macosx/wizard.m:260 modules/gui/wxwidgets/streamdata.cpp:134
 msgid ""
 "Use this to stream to several computers. This method is less efficient, as "
 "the server needs to send the stream several times."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:262
+#: modules/gui/macosx/wizard.m:263
 msgid ""
 "Enter the local addresses you want to listen to. Do not enter anything if "
 "you want to listen to all adresses or if you don't understand. This is "
@@ -10238,7 +10644,7 @@ msgid ""
 "at mms://yourip:8080 by default."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:266
+#: modules/gui/macosx/wizard.m:267
 msgid ""
 "Use this to stream to several computers using the Microsoft MMS protocol. "
 "This protocol is used as transport method by many Microsoft's softwares. "
@@ -10246,271 +10652,295 @@ msgid ""
 "encapsulated in HTTP)."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:271 modules/gui/macosx/wizard.m:388
-#: modules/gui/wxwidgets/streamdata.h:154
+#: modules/gui/macosx/wizard.m:272 modules/gui/macosx/wizard.m:282
+#: modules/gui/macosx/wizard.m:392 modules/gui/wxwidgets/streamdata.cpp:123
 msgid "Enter the address of the computer to stream to."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:272 modules/gui/macosx/wizard.m:392
-#: modules/gui/wxwidgets/streamdata.h:153
+#: modules/gui/macosx/wizard.m:273 modules/gui/macosx/wizard.m:283
+#: modules/gui/macosx/wizard.m:396 modules/gui/wxwidgets/streamdata.cpp:122
 msgid "Use this to stream to a single computer."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:274
+#: modules/gui/macosx/wizard.m:275
 msgid ""
 "Enter the multicast address to stream to in this field. This must be an IP "
 "address between 224.0.0.0 and 239.255.255.255. For a private use, enter an "
 "address beginning with 239.255."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:277 modules/gui/wxwidgets/streamdata.h:157
+#: modules/gui/macosx/wizard.m:278 modules/gui/wxwidgets/streamdata.cpp:126
 msgid ""
 "Use this to stream to a dynamic group of computers on a multicast-enabled "
 "network. This is the most efficient method to stream to several computers, "
 "but it does not work over Internet."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:342
+#: modules/gui/macosx/wizard.m:346
 #, fuzzy
 msgid "Back"
 msgstr "Backwards"
 
-#: modules/gui/macosx/wizard.m:345 modules/gui/macosx/wizard.m:348
-#: modules/gui/macosx/wizard.m:1117 modules/gui/wxwidgets/wizard.cpp:88
-#: modules/gui/wxwidgets/wizard.cpp:91 modules/gui/wxwidgets/wizard.cpp:1394
+#: modules/gui/macosx/wizard.m:349 modules/gui/macosx/wizard.m:352
+#: modules/gui/macosx/wizard.m:1143
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:81
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:84
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1400
 msgid "Streaming/Transcoding Wizard"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:349 modules/gui/wxwidgets/wizard.cpp:92
+#: modules/gui/macosx/wizard.m:353 modules/gui/wxwidgets/dialogs/wizard.cpp:85
 msgid "This wizard helps you to stream, transcode or save a stream."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:353 modules/gui/wxwidgets/wizard.cpp:98
+#: modules/gui/macosx/wizard.m:357 modules/gui/wxwidgets/dialogs/wizard.cpp:91
 msgid ""
 "This wizard only gives access to a small subset of VLC's streaming and "
 "transcoding capabilities. Use the Open and Stream Output dialogs to get all "
 "of them."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:356 modules/gui/macosx/wizard.m:501
-#: modules/gui/macosx/wizard.m:1399 modules/gui/wxwidgets/wizard.cpp:94
+#: modules/gui/macosx/wizard.m:360 modules/gui/macosx/wizard.m:511
+#: modules/gui/macosx/wizard.m:1453
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:87
 msgid "Stream to network"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:358 modules/gui/macosx/wizard.m:1411
-#: modules/gui/wxwidgets/wizard.cpp:96
+#: modules/gui/macosx/wizard.m:362 modules/gui/macosx/wizard.m:1465
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:89
 #, fuzzy
 msgid "Transcode/Save to file"
 msgstr "Greyscale video output"
 
-#: modules/gui/macosx/wizard.m:362 modules/gui/wxwidgets/wizard.cpp:107
+#: modules/gui/macosx/wizard.m:366
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:100
 #, fuzzy
 msgid "Choose input"
 msgstr "Choose file"
 
-#: modules/gui/macosx/wizard.m:363 modules/gui/wxwidgets/wizard.cpp:108
+#: modules/gui/macosx/wizard.m:367
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:101
 msgid "Choose here your input stream."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:365 modules/gui/macosx/wizard.m:535
-#: modules/gui/macosx/wizard.m:1448 modules/gui/wxwidgets/wizard.cpp:110
+#: modules/gui/macosx/wizard.m:369 modules/gui/macosx/wizard.m:545
+#: modules/gui/macosx/wizard.m:1502
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:103
 msgid "Select a stream"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:367 modules/gui/wxwidgets/wizard.cpp:111
+#: modules/gui/macosx/wizard.m:371
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:104
 msgid "Existing playlist item"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:368 modules/gui/macosx/wizard.m:431
-#: modules/gui/wxwidgets/wizard.cpp:573
+#: modules/gui/macosx/wizard.m:372 modules/gui/macosx/wizard.m:437
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:566
 msgid "Choose..."
 msgstr "Choose…"
 
-#: modules/gui/macosx/wizard.m:373 modules/gui/macosx/wizard.m:443
-#: modules/gui/wxwidgets/wizard.cpp:623
+#: modules/gui/macosx/wizard.m:377 modules/gui/macosx/wizard.m:451
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:618
 msgid "Partial Extract"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:375 modules/gui/wxwidgets/wizard.cpp:116
+#: modules/gui/macosx/wizard.m:379
 msgid ""
 "Use this to read only a part of the stream. You must be able to control the "
 "incoming stream (for example, a file or a disc, but not an UDP network "
-"stream.)\n"
-"Enter the starting and ending times (in seconds)."
+"stream.) Enter the starting and ending times (in seconds)."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:379 modules/gui/wxwidgets/wizard.cpp:634
+#: modules/gui/macosx/wizard.m:383
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:629
 msgid "From"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:380 modules/gui/wxwidgets/wizard.cpp:639
+#: modules/gui/macosx/wizard.m:384
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:634
 msgid "To"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:383 modules/gui/wxwidgets/wizard.cpp:139
+#: modules/gui/macosx/wizard.m:387
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:132
+#: modules/video_filter/deinterlace.c:131
 #, fuzzy
 msgid "Streaming"
 msgstr "Codec setting"
 
-#: modules/gui/macosx/wizard.m:384 modules/gui/wxwidgets/wizard.cpp:140
+#: modules/gui/macosx/wizard.m:388
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:133
 msgid "In this page, you will select how your input stream will be sent."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:386 modules/gui/macosx/wizard.m:437
-#: modules/gui/wxwidgets/wizard.cpp:1039 modules/stream_out/rtp.c:41
+#: modules/gui/macosx/wizard.m:390 modules/gui/macosx/wizard.m:445
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1045 modules/stream_out/rtp.c:44
 #, fuzzy
 msgid "Destination"
 msgstr "Description"
 
-#: modules/gui/macosx/wizard.m:387 modules/gui/macosx/wizard.m:449
-#: modules/gui/wxwidgets/wizard.cpp:1025
+#: modules/gui/macosx/wizard.m:391 modules/gui/macosx/wizard.m:457
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1031
 #, fuzzy
 msgid "Streaming method"
 msgstr "Codec setting"
 
-#: modules/gui/macosx/wizard.m:390 modules/gui/macosx/wizard.m:630
-#: modules/gui/wxwidgets/streamdata.h:153
+#: modules/gui/macosx/wizard.m:394 modules/gui/macosx/wizard.m:640
 #, fuzzy
 msgid "UDP Unicast"
 msgstr "UDP/RTP input"
 
-#: modules/gui/macosx/wizard.m:391 modules/gui/wxwidgets/streamdata.h:156
+#: modules/gui/macosx/wizard.m:395
 #, fuzzy
 msgid "UDP Multicast"
 msgstr "UDP/RTP input"
 
-#: modules/gui/macosx/wizard.m:396 modules/gui/pda/pda_interface.c:1221
-#: modules/gui/wxwidgets/wizard.cpp:125 modules/stream_out/transcode.c:167
+#: modules/gui/macosx/wizard.m:400 modules/gui/pda/pda_interface.c:1221
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:118
+#: modules/stream_out/transcode.c:167
 #, fuzzy
 msgid "Transcode"
 msgstr "Greyscale video output"
 
-#: modules/gui/macosx/wizard.m:397 modules/gui/wxwidgets/wizard.cpp:126
+#: modules/gui/macosx/wizard.m:401
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:119
 msgid ""
 "If you want to change the compression format of the audio or video tracks, "
 "fill in this page. (If you only want to change the container format, proceed "
 "to next page.)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:402 modules/gui/macosx/wizard.m:451
-#: modules/gui/wxwidgets/wizard.cpp:855
+#: modules/gui/macosx/wizard.m:406 modules/gui/macosx/wizard.m:459
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:861
 #, fuzzy
 msgid "Transcode audio"
 msgstr "Greyscale video output"
 
-#: modules/gui/macosx/wizard.m:403 modules/gui/macosx/wizard.m:453
-#: modules/gui/wxwidgets/wizard.cpp:816
+#: modules/gui/macosx/wizard.m:407 modules/gui/macosx/wizard.m:461
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:822
 #, fuzzy
 msgid "Transcode video"
 msgstr "Greyscale video output"
 
-#: modules/gui/macosx/wizard.m:406 modules/gui/macosx/wizard.m:1535
-#: modules/gui/wxwidgets/wizard.cpp:133
+#: modules/gui/macosx/wizard.m:410 modules/gui/macosx/wizard.m:1597
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:126
 msgid "If your stream has audio and you want to transcode it, enable this."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:408 modules/gui/macosx/wizard.m:1552
-#: modules/gui/wxwidgets/wizard.cpp:128
+#: modules/gui/macosx/wizard.m:412 modules/gui/macosx/wizard.m:1614
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:121
 msgid "If your stream has video and you want to transcode it, enable this."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:412 modules/gui/wxwidgets/wizard.cpp:148
+#: modules/gui/macosx/wizard.m:416
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:141
 msgid "Encapsulation format"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:413 modules/gui/wxwidgets/wizard.cpp:149
+#: modules/gui/macosx/wizard.m:417
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:142
 msgid ""
 "In this page, you will select how the stream will be encapsulated. Depending "
 "on the choices you made, all formats won't be available."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:418 modules/gui/wxwidgets/wizard.cpp:162
+#: modules/gui/macosx/wizard.m:422
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:155
 #, fuzzy
 msgid "Additional streaming options"
 msgstr "UDP stream output"
 
-#: modules/gui/macosx/wizard.m:419
+#: modules/gui/macosx/wizard.m:423
 msgid ""
 "In this page, you will define a few additional parameters for your stream."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:421 modules/gui/macosx/wizard.m:1579
-#: modules/gui/wxwidgets/streamout.cpp:573
-#: modules/gui/wxwidgets/wizard.cpp:1326
+#: modules/gui/macosx/wizard.m:425 modules/gui/macosx/wizard.m:1641
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:607
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1332
 msgid "Time-To-Live (TTL)"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:423 modules/gui/macosx/wizard.m:445
-#: modules/gui/macosx/wizard.m:1594 modules/gui/wxwidgets/wizard.cpp:1334
+#: modules/gui/macosx/wizard.m:427 modules/gui/macosx/wizard.m:453
+#: modules/gui/macosx/wizard.m:1656
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1340
 msgid "SAP Announce"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:427 modules/gui/wxwidgets/wizard.cpp:155
+#: modules/gui/macosx/wizard.m:429 modules/gui/macosx/wizard.m:438
+#: modules/gui/macosx/wizard.m:463 modules/gui/macosx/wizard.m:1673
+#, fuzzy
+msgid "Local playback"
+msgstr "Backwards"
+
+#: modules/gui/macosx/wizard.m:433
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:148
 msgid "Additional transcode options"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:428
+#: modules/gui/macosx/wizard.m:434
 msgid ""
-"In this page, you will define a few additionnal parameters for your "
+"In this page, you will define a few additional parameters for your "
 "transcoding."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:430 modules/gui/wxwidgets/wizard.cpp:1258
+#: modules/gui/macosx/wizard.m:436
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1264
 msgid "Select the file to save to"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:434
+#: modules/gui/macosx/wizard.m:442
 msgid ""
 "This page lists all your selections. Click \"Finish\" to start your "
 "streaming or transcoding."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:436
+#: modules/gui/macosx/wizard.m:444
 msgid "Summary"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:439
+#: modules/gui/macosx/wizard.m:447
 msgid "Encap. format"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:441
+#: modules/gui/macosx/wizard.m:449
 #, fuzzy
 msgid "Input stream"
 msgstr "Sout stream"
 
-#: modules/gui/macosx/wizard.m:447
+#: modules/gui/macosx/wizard.m:455
 #, fuzzy
 msgid "Save file to"
 msgstr "Next file"
 
-#: modules/gui/macosx/wizard.m:586
+#: modules/gui/macosx/wizard.m:596
 #, fuzzy
 msgid "No input selected"
 msgstr "no input\n"
 
-#: modules/gui/macosx/wizard.m:588
+#: modules/gui/macosx/wizard.m:598
 msgid ""
-"You selected neither a new stream nor a valid playlist item. VLC is unable "
-"to guess, which input you want use. \n"
+"You have selected neither a new stream nor a valid playlist item. VLC is "
+"unable to guess, which input you want use.\n"
 "\n"
-" Choose one before going to the next page."
+"Choose one before going to the next page."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:652
+#: modules/gui/macosx/wizard.m:662
 #, fuzzy
 msgid "No valid destination"
 msgstr "Description"
 
-#: modules/gui/macosx/wizard.m:654
+#: modules/gui/macosx/wizard.m:664
 msgid ""
 "You need to enter a valid destination you want to stream to. Enter either a "
 "Unicast-IP or a Multicast-IP.\n"
 "\n"
-" If you don't know what this means, have a look at the VLC Streaming HOWTO "
+"If you don't know what this means, have a look at the VLC Streaming HOWTO "
 "and the help texts in this window."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1045
+#: modules/gui/macosx/wizard.m:1055
 msgid ""
 "Your chosen codecs are not compatible with each other. For example: you "
 "cannot mix uncompressed audio with any video codec.\n"
@@ -10518,48 +10948,52 @@ msgid ""
 "Correct your selection and try again."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1094
+#: modules/gui/macosx/wizard.m:1120
 msgid "No file selected"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1095
+#: modules/gui/macosx/wizard.m:1121
 msgid ""
-"You you need to select a file, you want to save to. \n"
+"You you need to select a file, you want to save to.\n"
 "\n"
-" Enter either a valid path or choose a location through the button's dialog-"
+"Enter either a valid path or choose a location through the button's dialog-"
 "box."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1174
+#: modules/gui/macosx/wizard.m:1200
 msgid "Finish"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1179 modules/gui/macosx/wizard.m:1203
-#: modules/gui/macosx/wizard.m:1215 modules/gui/macosx/wizard.m:1227
+#: modules/gui/macosx/wizard.m:1205 modules/gui/macosx/wizard.m:1212
+#: modules/gui/macosx/wizard.m:1236 modules/gui/macosx/wizard.m:1248
+#: modules/gui/macosx/wizard.m:1260
 msgid "yes"
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1181
+#: modules/gui/macosx/wizard.m:1207 modules/gui/macosx/wizard.m:1219
+#: modules/gui/macosx/wizard.m:1238 modules/gui/macosx/wizard.m:1256
+#: modules/gui/macosx/wizard.m:1268
+msgid "no"
+msgstr ""
+
+#: modules/gui/macosx/wizard.m:1214
 msgid "from "
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1183 modules/video_chroma/i420_ymga.c:48
+#: modules/gui/macosx/wizard.m:1216 modules/video_chroma/i420_ymga.c:48
 #: modules/video_chroma/i420_ymga.c:51 modules/video_chroma/i420_yuy2.c:75
 #: modules/video_chroma/i420_yuy2.c:78 modules/video_chroma/i420_yuy2.c:86
 #: modules/video_chroma/i422_yuy2.c:63 modules/video_chroma/i422_yuy2.c:66
 msgid " to "
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1186 modules/gui/macosx/wizard.m:1205
-#: modules/gui/macosx/wizard.m:1223 modules/gui/macosx/wizard.m:1235
-msgid "no"
-msgstr ""
-
-#: modules/gui/macosx/wizard.m:1400 modules/gui/wxwidgets/wizard.cpp:95
+#: modules/gui/macosx/wizard.m:1454
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:88
 msgid "Use this to stream on a network."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1412 modules/gui/wxwidgets/wizard.cpp:102
+#: modules/gui/macosx/wizard.m:1466
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:95
 msgid ""
 "Use this to save a stream to a file. You have the possibility to reencode "
 "the stream. You can save whatever VLC can read.\n"
@@ -10567,15 +11001,18 @@ msgid ""
 "should use its transcoding features to save network streams, for example."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1530 modules/gui/wxwidgets/wizard.cpp:135
+#: modules/gui/macosx/wizard.m:1592
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:128
 msgid "Select your audio codec. Click one to get more information."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1547 modules/gui/wxwidgets/wizard.cpp:130
+#: modules/gui/macosx/wizard.m:1609
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:123
 msgid "Select your video codec. Click one to get more information."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1580 modules/gui/wxwidgets/wizard.cpp:166
+#: modules/gui/macosx/wizard.m:1642
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:159
 msgid ""
 "Define the TTL (Time-To-Live) of the stream. This parameter is the maximum "
 "number of routers your stream can go through. If you don't know what it "
@@ -10583,7 +11020,7 @@ msgid ""
 "setting to 1."
 msgstr ""
 
-#: modules/gui/macosx/wizard.m:1595
+#: modules/gui/macosx/wizard.m:1657
 msgid ""
 "When streaming using UDP, you can announce your streams using the SAP/SDP "
 "announcing protocol. This way, the clients won't have to type in the "
@@ -10593,6 +11030,15 @@ msgid ""
 "name will be used."
 msgstr ""
 
+#: modules/gui/macosx/wizard.m:1675
+msgid ""
+"When this option is enabled, the stream will be both played and transcoded/"
+"streamed.\n"
+"\n"
+"Note that this requires much more CPU power than simple transcoding or "
+"streaming."
+msgstr ""
+
 #: modules/gui/ncurses.c:93
 msgid "Filebrowser starting point"
 msgstr ""
@@ -10624,7 +11070,7 @@ msgid "PDA Linux Gtk2+ interface"
 msgstr ""
 
 #: modules/gui/pda/pda.c:220 modules/gui/pda/pda.c:275
-#: modules/gui/wxwidgets/streamout.cpp:464
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:498
 msgid "Filename"
 msgstr ""
 
@@ -10632,6 +11078,10 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
+#: modules/gui/pda/pda.c:232
+msgid "Size"
+msgstr ""
+
 #: modules/gui/pda/pda.c:238
 msgid "Owner"
 msgstr ""
@@ -11077,32 +11527,32 @@ msgstr ""
 msgid "QNX RTOS video and audio output"
 msgstr "File audio output"
 
-#: modules/gui/skins2/src/dialogs.cpp:228
+#: modules/gui/skins2/src/dialogs.cpp:223
 #, fuzzy
 msgid "Open a skin file"
 msgstr "Open subtitles file"
 
-#: modules/gui/skins2/src/dialogs.cpp:229
-msgid "Skin files (*.vlt)|*.vlt|Skin files (*.xml)|*.xml"
+#: modules/gui/skins2/src/dialogs.cpp:224
+msgid "Skin files (*.vlt;*.wsz)|*.vlt;*.wsz|Skin files (*.xml)|*.xml"
 msgstr ""
 
-#: modules/gui/skins2/src/dialogs.cpp:236
-#: modules/gui/wxwidgets/playlist.cpp:930
+#: modules/gui/skins2/src/dialogs.cpp:231
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:936
 #, fuzzy
 msgid "Open playlist"
 msgstr "&Shuffle Playlist"
 
-#: modules/gui/skins2/src/dialogs.cpp:237
+#: modules/gui/skins2/src/dialogs.cpp:232
 msgid "All playlists|*.pls;*.m3u;*.asx;*.b4s|M3U files|*.m3u"
 msgstr ""
 
-#: modules/gui/skins2/src/dialogs.cpp:244
-#: modules/gui/wxwidgets/playlist.cpp:914
+#: modules/gui/skins2/src/dialogs.cpp:239
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:920
 #, fuzzy
 msgid "Save playlist"
 msgstr "&Shuffle Playlist"
 
-#: modules/gui/skins2/src/dialogs.cpp:244
+#: modules/gui/skins2/src/dialogs.cpp:239
 msgid "M3U file|*.m3u"
 msgstr ""
 
@@ -11160,7 +11610,7 @@ msgid ""
 "\n"
 msgstr "Windows Service interface"
 
-#: modules/gui/wince/interface.cpp:497 modules/gui/wxwidgets/interface.cpp:867
+#: modules/gui/wince/interface.cpp:497 modules/gui/wxwidgets/interface.cpp:949
 #, fuzzy
 msgid ""
 "(c) 1996-2005 - the VideoLAN Team\n"
@@ -11169,31 +11619,42 @@ msgstr ""
 "© 1996-2004 - the VideoLAN Team\n"
 "\n"
 
-#: modules/gui/wince/interface.cpp:498 modules/gui/wxwidgets/interface.cpp:877
+#: modules/gui/wince/interface.cpp:498 modules/gui/wxwidgets/interface.cpp:950
+msgid "Compiled by "
+msgstr ""
+
+#: modules/gui/wince/interface.cpp:500 modules/gui/wxwidgets/interface.cpp:952
+msgid "Compiler: "
+msgstr ""
+
+#: modules/gui/wince/interface.cpp:501 modules/gui/wxwidgets/interface.cpp:953
+msgid "Based on SVN revision: "
+msgstr ""
+
+#: modules/gui/wince/interface.cpp:502
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
-"http://www.videolan.org/\n"
-"\n"
+"http://www.videolan.org/"
 msgstr ""
 
-#: modules/gui/wince/open.cpp:134 modules/gui/wxwidgets/open.cpp:430
+#: modules/gui/wince/open.cpp:134 modules/gui/wxwidgets/dialogs/open.cpp:425
 #, fuzzy
 msgid "Open:"
 msgstr "Options:"
 
-#: modules/gui/wince/open.cpp:146 modules/gui/wxwidgets/open.cpp:444
+#: modules/gui/wince/open.cpp:146 modules/gui/wxwidgets/dialogs/open.cpp:439
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
 msgstr ""
 
 #: modules/gui/wince/preferences_widgets.cpp:527
-#: modules/gui/wxwidgets/preferences_widgets.cpp:685
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:675
 msgid "Choose directory"
 msgstr "Choose directory"
 
 #: modules/gui/wince/preferences_widgets.cpp:536
-#: modules/gui/wxwidgets/preferences_widgets.cpp:694
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:684
 msgid "Choose file"
 msgstr "Choose file"
 
@@ -11217,820 +11678,919 @@ msgstr "Windows Service interface"
 msgid "WinCE dialogs provider"
 msgstr "wxWindows dialogues provider"
 
-#: modules/gui/wxwidgets/bookmarks.cpp:137
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:75
 msgid "Edit bookmark"
 msgstr ""
 
-#: modules/gui/wxwidgets/bookmarks.cpp:514
-msgid "Input has changed "
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:347
+msgid "You must select two bookmarks"
 msgstr ""
 
-#: modules/gui/wxwidgets/extrapanel.cpp:42
-msgid ""
-"If this setting is not zero, the bands will move together when you move one. "
-"The higher the value is, the more correlated their movement will be."
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:357
+msgid "The stream must be playing or paused for bookmarks to work"
 msgstr ""
 
-#: modules/gui/wxwidgets/extrapanel.cpp:272
-#, fuzzy
-msgid "Video Options"
-msgstr "Options"
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:449
+msgid ""
+"Input has changed, unable to save bookmark. Use \"pause\" while editing "
+"bookmarks to keep the same input."
+msgstr ""
 
-#: modules/gui/wxwidgets/extrapanel.cpp:286
-msgid "Aspect Ratio"
+#: modules/gui/wxwidgets/dialogs/bookmarks.cpp:452
+msgid "Input has changed "
 msgstr ""
 
-#: modules/gui/wxwidgets/extrapanel.cpp:319
-msgid "More info"
+#: modules/gui/wxwidgets/dialogs/fileinfo.cpp:53
+msgid "Stream and media info"
 msgstr ""
 
-#: modules/gui/wxwidgets/extrapanel.cpp:404
-msgid ""
-"This filter prevents the audio output power from going over a defined value."
+#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:57
+msgid "Playlist item info"
 msgstr ""
 
-#: modules/gui/wxwidgets/extrapanel.cpp:468
-msgid ""
-"Enable the equalizer. You can either manually change the bands or use a "
-"preset (Audio Menu->Equalizer)."
+#: modules/gui/wxwidgets/dialogs/iteminfo.cpp:116
+msgid "Item Info"
 msgstr ""
 
-#: modules/gui/wxwidgets/extrapanel.cpp:475
+#: modules/gui/wxwidgets/dialogs/messages.cpp:88
+msgid "Save As..."
+msgstr "Save As…"
+
+#: modules/gui/wxwidgets/dialogs/messages.cpp:206
+msgid "Save Messages As..."
+msgstr "Save Messages As…"
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:260
+msgid "Advanced options..."
+msgstr "Advanced options…"
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:265
+#: modules/gui/wxwidgets/dialogs/open.cpp:276
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:212
+msgid "Advanced options"
+msgstr "Advanced options"
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:280
+msgid "Options:"
+msgstr "Options:"
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:389
+#: modules/gui/wxwidgets/dialogs/open.cpp:397
+msgid "Open..."
+msgstr "Open…"
+
+#: modules/gui/wxwidgets/dialogs/open.cpp:428
 msgid ""
-"If you enable this setting, the equalizer filter will be applied twice. The "
-"effect will be sharper."
+"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/wxwidgets/fileinfo.cpp:59
-msgid "Stream and media info"
+#: modules/gui/wxwidgets/dialogs/open.cpp:449
+msgid "Use VLC as a server of streams"
 msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:406
-msgid "Quick &Open File...\tCtrl-O"
-msgstr "Quick &Open File…\tCtrl-O"
+#: modules/gui/wxwidgets/dialogs/open.cpp:475
+#, fuzzy
+msgid "Caching"
+msgstr "Rating"
 
-#: modules/gui/wxwidgets/interface.cpp:409
-msgid "Open &File...\tCtrl-F"
-msgstr "Open &File…\tCtrl-F"
+#: modules/gui/wxwidgets/dialogs/open.cpp:476
+msgid "Change the default caching value (in milliseconds)"
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:410
-#, fuzzy
-msgid "Open Dir&ectory...\tCtrl-E"
-msgstr "Open &File…\tCtrl-F"
+#: modules/gui/wxwidgets/dialogs/open.cpp:638
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:55
+msgid "Subtitle options"
+msgstr "Subtitle options"
 
-#: modules/gui/wxwidgets/interface.cpp:411
-msgid "Open &Disc...\tCtrl-D"
-msgstr "Open &Disc…\tCtrl-D"
+#: modules/gui/wxwidgets/dialogs/open.cpp:639
+msgid "Force options for separate subtitle files."
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:413
-msgid "Open &Network Stream...\tCtrl-N"
-msgstr "Open &Network Stream…\tCtrl-N"
+#: modules/gui/wxwidgets/dialogs/open.cpp:674
+msgid "DVD (menus)"
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:415
-#, fuzzy
-msgid "Open C&apture Device...\tCtrl-A"
-msgstr "Open &Capture Device…\tCtrl-C"
+#: modules/gui/wxwidgets/dialogs/open.cpp:680
+msgid "Disc type"
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:418
-msgid "&Wizard...\tCtrl-W"
-msgstr "&Wizard…\tCtrl-W"
+#: modules/gui/wxwidgets/dialogs/open.cpp:687
+msgid "Probe Disc(s)"
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:421
-msgid "E&xit\tCtrl-X"
+#: modules/gui/wxwidgets/dialogs/open.cpp:688
+msgid ""
+"Probe for a DVD, VCD or audio CD. First try the Device name entered for the "
+"selected Disc type (DVD, DVD Menu, VCD, audio CD). If that doesn't find "
+"media, try any device for the Disc type.  If that doesn't work, then try "
+"looking for CD-ROMs or DVD drives. The Disc type, Device name, and some "
+"parameter ranges are set based on media we find."
 msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:427
-msgid "&Playlist...\tCtrl-P"
-msgstr "&Playlist…\tCtrl-P"
+#: modules/gui/wxwidgets/dialogs/open.cpp:781
+msgid "HTTP/HTTPS/FTP/MMS"
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:429
-msgid "&Messages...\tCtrl-M"
-msgstr "&Messages…\tCtrl-M"
+#: modules/gui/wxwidgets/dialogs/open.cpp:782
+msgid "RTSP"
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:431
-msgid "Stream and Media &info...\tCtrl-I"
-msgstr "Stream and Media &info…\tCtrl-I"
+#: modules/gui/wxwidgets/dialogs/open.cpp:902
+msgid "Name of DVD device to read from."
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:443
-#: modules/gui/wxwidgets/updatevlc.cpp:104
-msgid "Check for updates ..."
+#: modules/gui/wxwidgets/dialogs/open.cpp:933
+msgid ""
+"Name of CD-ROM device to read Video CD from. If this field is left empty, we "
+"will scan for a CD-ROM with a VCD in it."
 msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:447
-#, fuzzy
-msgid "&File"
-msgstr "Title"
+#: modules/gui/wxwidgets/dialogs/open.cpp:942
+msgid "Name of CD-ROM device to read Video CD from."
+msgstr ""
 
-#: modules/gui/wxwidgets/interface.cpp:448
-#, fuzzy
-msgid "&View"
-msgstr "Video"
-
-#: modules/gui/wxwidgets/interface.cpp:449
-#, fuzzy
-msgid "&Settings"
-msgstr "Setting"
-
-#: modules/gui/wxwidgets/interface.cpp:450
-#, fuzzy
-msgid "&Audio"
-msgstr "Audio"
-
-#: modules/gui/wxwidgets/interface.cpp:451
-#, fuzzy
-msgid "&Video"
-msgstr "Video"
-
-#: modules/gui/wxwidgets/interface.cpp:452
-#, fuzzy
-msgid "&Navigation"
-msgstr "Polarisation"
-
-#: modules/gui/wxwidgets/interface.cpp:453
-msgid "&Help"
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:493
-msgid "Previous playlist item"
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:494
-msgid "Next playlist item"
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:495
-msgid "Play slower"
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:496
-msgid "Play faster"
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:803
-msgid "Extended &GUI\tCtrl-G"
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:807
-msgid "&Undock Ext. GUI"
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:811
-#, fuzzy
-msgid "&Bookmarks...\tCtrl-B"
-msgstr "&Bookmarks…"
-
-#: modules/gui/wxwidgets/interface.cpp:813
-#, fuzzy
-msgid "Preference&s...\tCtrl-S"
-msgstr "Preferences…"
-
-#: modules/gui/wxwidgets/interface.cpp:866
-#, fuzzy
-msgid ""
-" (wxWidgets interface)\n"
-"\n"
-msgstr "Windows Service interface"
-
-#: modules/gui/wxwidgets/interface.cpp:868
-msgid "Compiled by "
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:870
-msgid "Compiler: "
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:871
-msgid "Based on SVN revision: "
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:880
-#, c-format
-msgid "About %s"
-msgstr ""
-
-#: modules/gui/wxwidgets/interface.cpp:1574
-#, fuzzy
-msgid "Show/Hide interface"
-msgstr "Add Interface"
-
-#: modules/gui/wxwidgets/iteminfo.cpp:70
-msgid "Playlist item info"
-msgstr ""
-
-#: modules/gui/wxwidgets/iteminfo.cpp:129
-msgid "Item Info"
-msgstr ""
-
-#: modules/gui/wxwidgets/menus.cpp:131
-msgid "Quick &Open File..."
-msgstr "Quick &Open File…"
-
-#: modules/gui/wxwidgets/menus.cpp:132
-msgid "Open &File..."
-msgstr "Open &File…"
-
-#: modules/gui/wxwidgets/menus.cpp:133
-#, fuzzy
-msgid "Open D&irectory..."
-msgstr "Open &File…\tCtrl-F"
-
-#: modules/gui/wxwidgets/menus.cpp:134
-msgid "Open &Disc..."
-msgstr "Open &Disc…"
-
-#: modules/gui/wxwidgets/menus.cpp:135
-msgid "Open &Network Stream..."
-msgstr "Open &Network Stream…"
-
-#: modules/gui/wxwidgets/menus.cpp:136
-msgid "Open &Capture Device..."
-msgstr "Open &Capture Device…"
-
-#: modules/gui/wxwidgets/menus.cpp:143
-msgid "Media &Info..."
-msgstr "Media &Info…"
-
-#: modules/gui/wxwidgets/menus.cpp:144
-msgid "&Messages..."
-msgstr "&Messages…"
-
-#: modules/gui/wxwidgets/menus.cpp:145
-msgid "&Preferences..."
-msgstr "&Preferences…"
-
-#: modules/gui/wxwidgets/menus.cpp:564 modules/gui/wxwidgets/menus.cpp:591
-msgid "Empty"
-msgstr ""
-
-#: modules/gui/wxwidgets/messages.cpp:99
-msgid "Save As..."
-msgstr "Save As…"
-
-#: modules/gui/wxwidgets/messages.cpp:216
-msgid "Save Messages As..."
-msgstr "Save Messages As…"
-
-#: modules/gui/wxwidgets/open.cpp:265
-msgid "Advanced options..."
-msgstr "Advanced options…"
-
-#: modules/gui/wxwidgets/open.cpp:270 modules/gui/wxwidgets/open.cpp:281
-#: modules/gui/wxwidgets/preferences.cpp:219
-msgid "Advanced options"
-msgstr "Advanced options"
-
-#: modules/gui/wxwidgets/open.cpp:285
-msgid "Options:"
-msgstr "Options:"
-
-#: modules/gui/wxwidgets/open.cpp:394 modules/gui/wxwidgets/open.cpp:402
-msgid "Open..."
-msgstr "Open…"
-
-#: modules/gui/wxwidgets/open.cpp:433
-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/wxwidgets/open.cpp:454
-msgid "Use VLC as a server of streams"
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:480
-#, fuzzy
-msgid "Caching"
-msgstr "Rating"
-
-#: modules/gui/wxwidgets/open.cpp:481
-msgid "Change the default caching value (in milliseconds)"
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:643 modules/gui/wxwidgets/subtitles.cpp:65
-msgid "Subtitle options"
-msgstr "Subtitle options"
-
-#: modules/gui/wxwidgets/open.cpp:644
-msgid "Force options for separate subtitle files."
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:679
-msgid "DVD (menus)"
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:685
-msgid "Disc type"
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:692
-msgid "Probe Disc(s)"
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:693
-msgid ""
-"Probe for a DVD, VCD or audio CD. First try the Device name entered for the "
-"selected Disc type (DVD, DVD Menu, VCD, audio CD). If that doesn't find "
-"media, try any device for the Disc type.  If that doesn't work, then try "
-"looking for CD-ROMs or DVD drives. The Disc type, Device name, and some "
-"parameter ranges are set based on media we find."
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:751
-#, fuzzy
-msgid "Subtitles track"
-msgstr "Subtitles Track"
-
-#: modules/gui/wxwidgets/open.cpp:759
-#, fuzzy
-msgid "Audio track"
-msgstr "Subtitle track: %s"
-
-#: modules/gui/wxwidgets/open.cpp:786
-msgid "HTTP/HTTPS/FTP/MMS"
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:787
-msgid "RTSP"
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:907
-msgid "Name of DVD device to read from."
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:938
-msgid ""
-"Name of CD-ROM device to read Video CD from. If this field is left empty, we "
-"will scan for a CD-ROM with a VCD in it."
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:947
-msgid "Name of CD-ROM device to read Video CD from."
-msgstr ""
-
-#: modules/gui/wxwidgets/open.cpp:966
+#: modules/gui/wxwidgets/dialogs/open.cpp:961
 msgid ""
 "Name of CD-ROM device to read audio CD from. If this field is left empty, we "
 "will scan for a CD-ROM with an audio CD in it."
 msgstr ""
 
-#: modules/gui/wxwidgets/open.cpp:971
+#: modules/gui/wxwidgets/dialogs/open.cpp:966
 msgid "Name of CD-ROM device to read audio CD from."
 msgstr ""
 
-#: modules/gui/wxwidgets/open.cpp:1610
+#: modules/gui/wxwidgets/dialogs/open.cpp:1609
 #, fuzzy
 msgid "Title number."
 msgstr "Title"
 
-#: modules/gui/wxwidgets/open.cpp:1612
+#: modules/gui/wxwidgets/dialogs/open.cpp:1611
 msgid ""
 "DVD's can have up to 32 subtitles numbered 0..31. Note this is not the same "
 "thing as a subtitle name e.g. 'en'. If a value -1 is used, no subtitle will "
 "be shown."
 msgstr ""
 
-#: modules/gui/wxwidgets/open.cpp:1615
+#: modules/gui/wxwidgets/dialogs/open.cpp:1614
 msgid "Audio track number. DVD's can have up to 8 audio tracks numbered 0..7."
 msgstr ""
 
-#: modules/gui/wxwidgets/open.cpp:1636
+#: modules/gui/wxwidgets/dialogs/open.cpp:1635
 msgid "Playback control (PBC) usually starts with number 1."
 msgstr ""
 
-#: modules/gui/wxwidgets/open.cpp:1642
+#: modules/gui/wxwidgets/dialogs/open.cpp:1641
 msgid "The first entry (the beginning of the first MPEG track) is 0."
 msgstr ""
 
-#: modules/gui/wxwidgets/open.cpp:1647
+#: modules/gui/wxwidgets/dialogs/open.cpp:1646
 #, fuzzy
 msgid "Track number."
 msgstr "Title"
 
-#: modules/gui/wxwidgets/open.cpp:1653
+#: modules/gui/wxwidgets/dialogs/open.cpp:1652
 msgid ""
 "SVCD's can have up to 4 subtitles numbered 0..3. If a value -1 is used, no "
 "subtitle will be shown."
 msgstr ""
 
-#: modules/gui/wxwidgets/open.cpp:1655
+#: modules/gui/wxwidgets/dialogs/open.cpp:1654
 msgid ""
 "Audio track number. VCD's can have up to 2 audio tracks numbered 0 or 1. "
 msgstr ""
 
-#: modules/gui/wxwidgets/open.cpp:1667
+#: modules/gui/wxwidgets/dialogs/open.cpp:1666
 msgid ""
 "Audio CDs can have up to 100 tracks, the first track is usually 1. If 0 is "
 "given, then all tracks are played."
 msgstr ""
 
-#: modules/gui/wxwidgets/open.cpp:1671
+#: modules/gui/wxwidgets/dialogs/open.cpp:1670
 msgid "Audio CDs can have up to 100 tracks, the first track is usually 1."
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:51
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:50
 msgid "Shuffle"
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:229
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:229
 #, fuzzy
 msgid "&Simple Add File..."
 msgstr "&Simple Add…"
 
-#: modules/gui/wxwidgets/playlist.cpp:230
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:230
 msgid "Add &Directory..."
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:231
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:231
 msgid "&Add MRL..."
 msgstr "&Add MRL…"
 
-#: modules/gui/wxwidgets/playlist.cpp:236
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:236
 msgid "&Open Playlist..."
 msgstr "&Open Playlist…"
 
-#: modules/gui/wxwidgets/playlist.cpp:237
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:237
 msgid "&Save Playlist..."
 msgstr "&Save Playlist…"
 
-#: modules/gui/wxwidgets/playlist.cpp:239
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:239
 msgid "&Close"
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:243
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:243
 msgid "Sort by &title"
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:244
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:244
 #, fuzzy
 msgid "&Reverse sort by title"
 msgstr "Reverse stereo"
 
-#: modules/gui/wxwidgets/playlist.cpp:246
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:246
 msgid "&Shuffle Playlist"
 msgstr "&Shuffle Playlist"
 
-#: modules/gui/wxwidgets/playlist.cpp:250
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:250
 msgid "D&elete"
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:257
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:257
 #, fuzzy
 msgid "&Manage"
 msgstr "Language"
 
-#: modules/gui/wxwidgets/playlist.cpp:258
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:258
 msgid "S&ort"
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:259
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:259
 #, fuzzy
 msgid "&Selection"
 msgstr "Resolution"
 
-#: modules/gui/wxwidgets/playlist.cpp:260
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:260
 #, fuzzy
 msgid "&View items"
 msgstr "Video title"
 
-#: modules/gui/wxwidgets/playlist.cpp:268
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:268
 msgid "Play this branch"
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:270
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:270
 msgid "Sort this branch"
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:350
-#: modules/gui/wxwidgets/playlist.cpp:769
-#: modules/gui/wxwidgets/updatevlc.cpp:121
-#: modules/gui/wxwidgets/updatevlc.cpp:503
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:350
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:783
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:118
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:501
 msgid "root"
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:568
-#: modules/gui/wxwidgets/playlist.cpp:786
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:580
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:800
 #, c-format
 msgid "%i items in playlist (%i not shown)"
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:896
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:593
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:807
+#, c-format
+msgid "%i items in playlist"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:902
 msgid "M3U file"
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:902
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:908
 msgid "Playlist is empty"
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:902
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:908
 msgid "Can't save"
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:1219 modules/misc/freetype.c:100
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1231 modules/misc/freetype.c:100
 #: modules/misc/win32text.c:71
 msgid "Normal"
 msgstr ""
 
-#: modules/gui/wxwidgets/playlist.cpp:1221
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1233
 #, fuzzy
 msgid "Sorted by artist"
 msgstr "Reverse stereo"
 
-#: modules/gui/wxwidgets/playlist.cpp:1223
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1235
 #, fuzzy
 msgid "Sorted by Album"
 msgstr "Reverse stereo"
 
-#: modules/gui/wxwidgets/preferences.cpp:1014
+#: modules/gui/wxwidgets/dialogs/preferences.cpp:1009
 msgid ""
 "Some options are available but hidden. Check \"Advanced options\" to see "
 "them."
 msgstr ""
 
-#: modules/gui/wxwidgets/preferences_widgets.cpp:206
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:196
 msgid "Alt"
 msgstr ""
 
-#: modules/gui/wxwidgets/preferences_widgets.cpp:208
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:198
 msgid "Ctrl"
 msgstr ""
 
-#: modules/gui/wxwidgets/preferences_widgets.cpp:210
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:200
 msgid "Shift"
 msgstr ""
 
-#: modules/gui/wxwidgets/preferences_widgets.cpp:443
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:433
 msgid ""
 "Select modules that you want. To get more advanced control, you can also "
 "modify the resulting chain by yourself"
 msgstr ""
 
-#: modules/gui/wxwidgets/streamdata.h:54
-msgid "MPEG-1 Video codec (useable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
-msgstr ""
-
-#: modules/gui/wxwidgets/streamdata.h:58
-msgid "MPEG-2 Video codec (useable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
-msgstr ""
-
-#: modules/gui/wxwidgets/streamdata.h:62
-msgid ""
-"MPEG-4 Video codec (useable with MPEG PS, MPEG TS, MPEG1, ASF, MPEG4, OGG "
-"and RAW)"
-msgstr ""
-
-#: modules/gui/wxwidgets/streamdata.h:79
-#, fuzzy
-msgid "H264 is a new video codec (useable with MPEG TS and MPEG4)"
-msgstr "Destination video codec"
-
-#: modules/gui/wxwidgets/streamdata.h:82
-msgid "WMV (Windows Media Video) 7 (useable with MPEG TS, MPEG1, ASF and OGG)"
-msgstr ""
-
-#: modules/gui/wxwidgets/streamdata.h:85
-msgid "WMV (Windows Media Video) 8 (useable with MPEG TS, MPEG1, ASF and OGG)"
-msgstr ""
-
-#: modules/gui/wxwidgets/streamdata.h:89
-msgid "WMV (Windows Media Video) 9 (useable with MPEG TS, MPEG1, ASF and OGG)"
-msgstr ""
-
-#: modules/gui/wxwidgets/streamdata.h:127
-msgid "A free audio codec dedicated to compression of voice (useable with OGG)"
-msgstr ""
-
-#: modules/gui/wxwidgets/streamdata.h:160
-msgid ""
-"Enter the multicast address to stream to in this field. This must be an IP "
-"address between 224.0.0.0 an 239.255.255.255. For a private use, enter an "
-"address beginning with 239.255."
-msgstr ""
-
-#: modules/gui/wxwidgets/streamout.cpp:173
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:167
 #, fuzzy
 msgid "Stream output MRL"
 msgstr "UDP stream output"
 
-#: modules/gui/wxwidgets/streamout.cpp:177
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:171
 #, fuzzy
 msgid "Destination Target:"
 msgstr "Destination audio codec"
 
-#: modules/gui/wxwidgets/streamout.cpp:180
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:174
 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/wxwidgets/streamout.cpp:430
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:463
 #, fuzzy
 msgid "Output methods"
 msgstr "Audio output access method"
 
-#: modules/gui/wxwidgets/streamout.cpp:441
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:474
 msgid "MMSH"
 msgstr ""
 
-#: modules/gui/wxwidgets/streamout.cpp:545
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:475 modules/stream_out/rtp.c:90
+#, fuzzy
+msgid "RTP"
+msgstr "TCP"
+
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:579
 #, fuzzy
 msgid "Miscellaneous options"
 msgstr "Help options"
 
-#: modules/gui/wxwidgets/streamout.cpp:559
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:593
 #, fuzzy
 msgid "Group name"
 msgstr "Group packets"
 
-#: modules/gui/wxwidgets/streamout.cpp:566
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:600
 #, fuzzy
 msgid "Channel name"
 msgstr "Channels"
 
-#: modules/gui/wxwidgets/streamout.cpp:591
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:625
 #, fuzzy
 msgid "Select all elementary streams"
 msgstr "File stream output"
 
-#: modules/gui/wxwidgets/streamout.cpp:675
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:709
 #, fuzzy
 msgid "Transcoding options"
 msgstr "Advanced options..."
 
-#: modules/gui/wxwidgets/streamout.cpp:732
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:766
 #, fuzzy
 msgid "Video codec"
 msgstr "Video encoder"
 
-#: modules/gui/wxwidgets/streamout.cpp:802
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:836
 #, fuzzy
 msgid "Audio codec"
 msgstr "Audio encoder"
 
-#: modules/gui/wxwidgets/streamout.cpp:852
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:886
 #, fuzzy
 msgid "Subtitles codec"
 msgstr "DVB subtitles decoder"
 
-#: modules/gui/wxwidgets/streamout.cpp:861
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:895
 #, fuzzy
 msgid "Subtitles overlay"
 msgstr "Subtitle delay up"
 
-#: modules/gui/wxwidgets/streamout.cpp:974
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:1009
 #, fuzzy
 msgid "Save file"
 msgstr "Next file"
 
-#: modules/gui/wxwidgets/subtitles.cpp:82
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:72
 #, fuzzy
 msgid "Subtitles file"
 msgstr "Subtitles Track"
 
-#: modules/gui/wxwidgets/subtitles.cpp:137
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:127
 #, fuzzy
 msgid "Subtitles options"
 msgstr "Subtitle options"
 
-#: modules/gui/wxwidgets/subtitles.cpp:219
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:209
 msgid ""
 "Override frames per second. It will only work with MicroDVD and SubRIP "
 "subtitles."
 msgstr ""
 
-#: modules/gui/wxwidgets/subtitles.cpp:226 modules/stream_out/bridge.c:40
-#: modules/stream_out/display.c:41 modules/video_filter/mosaic.c:109
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:216
+#: modules/stream_out/bridge.c:40 modules/stream_out/display.c:41
+#: modules/video_filter/mosaic.c:109
 msgid "Delay"
 msgstr ""
 
-#: modules/gui/wxwidgets/subtitles.cpp:235
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:225
 #, fuzzy
 msgid "Set subtitle delay (in 1/10s)"
 msgstr "Subtitle delay down"
 
-#: modules/gui/wxwidgets/subtitles.cpp:294
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:284
 #, fuzzy
 msgid "Open file"
 msgstr "Append to file"
 
-#: modules/gui/wxwidgets/timer.cpp:156 modules/gui/wxwidgets/timer.cpp:337
-#, fuzzy
-msgid "Playing"
-msgstr "Rating"
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:101
+#: modules/gui/wxwidgets/interface.cpp:487
+msgid "Check for updates ..."
+msgstr ""
 
-#: modules/gui/wxwidgets/timer.cpp:176
-#, fuzzy
-msgid "Stopped"
-msgstr "Scope"
-
-#: modules/gui/wxwidgets/timer.cpp:223
-msgid "Menu"
-msgstr ""
-
-#: modules/gui/wxwidgets/timer.cpp:226
-msgid "Previous track"
-msgstr ""
-
-#: modules/gui/wxwidgets/timer.cpp:227
-msgid "Next track"
-msgstr ""
-
-#: modules/gui/wxwidgets/timer.cpp:333
-#, fuzzy
-msgid "Paused"
-msgstr "Date"
-
-#: modules/gui/wxwidgets/updatevlc.cpp:130
-msgid "Check for updates now !"
-msgstr ""
-
-#: modules/gui/wxwidgets/updatevlc.cpp:569
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:127
+msgid "Check for updates now !"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:567
 #, fuzzy
 msgid "type : "
 msgstr "Type"
 
-#: modules/gui/wxwidgets/updatevlc.cpp:571
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:569
 #, fuzzy
 msgid "URL : "
 msgstr "URL"
 
-#: modules/gui/wxwidgets/updatevlc.cpp:575
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:573
 #, fuzzy
 msgid "file size : "
 msgstr "Video title"
 
-#: modules/gui/wxwidgets/updatevlc.cpp:579
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:577
 msgid "file md5 hash : "
 msgstr ""
 
-#: modules/gui/wxwidgets/updatevlc.cpp:594
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:592
 #, fuzzy
 msgid "Choose a mirror"
 msgstr "Choose directory"
 
-#: modules/gui/wxwidgets/updatevlc.cpp:642
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:640
 #, fuzzy
 msgid "Save file ..."
 msgstr "Next file"
 
-#: modules/gui/wxwidgets/updatevlc.cpp:679
+#: modules/gui/wxwidgets/dialogs/updatevlc.cpp:677
 msgid "Downloading..."
 msgstr ""
 
-#: modules/gui/wxwidgets/wizard.cpp:97
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:65
+msgid "Broadcasts"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:76
+msgid "Load"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:215
+#, fuzzy
+msgid "Load configuration"
+msgstr "Advanced options..."
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:229
+#, fuzzy
+msgid "Save configuration"
+msgstr "Advanced options..."
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:245
+msgid "New broadcast"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:380
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:391
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:115
+#, fuzzy
+msgid "Choose"
+msgstr "Choose file"
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:385
+#, fuzzy
+msgid "Output"
+msgstr "Video output URL"
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:397
+#, fuzzy
+msgid "Create"
+msgstr "Sample rate"
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:402
+#, fuzzy
+msgid "Enabled"
+msgstr "Enable"
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:407
+msgid "Loop"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:510
+#, fuzzy
+msgid "VLM configuration"
+msgstr "Advanced options..."
+
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:544
+#, fuzzy
+msgid "VLM stream"
+msgstr "Codec setting"
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:90
 msgid "Use this to re-encode a stream and save it to a file."
 msgstr ""
 
-#: modules/gui/wxwidgets/wizard.cpp:100
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:93
 msgid "Use this to stream on a network"
 msgstr ""
 
-#: modules/gui/wxwidgets/wizard.cpp:113
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:106
 msgid "You must choose a stream"
 msgstr ""
 
-#: modules/gui/wxwidgets/wizard.cpp:114
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:107
 msgid "Uh Oh! Unable to find playlist !"
 msgstr ""
 
-#: modules/gui/wxwidgets/wizard.cpp:122
-#, fuzzy
-msgid "Choose"
-msgstr "Choose file"
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:109
+msgid ""
+"Use this to read only a part of the stream. You must be able to control the "
+"incoming stream (for example, a file or a disc, but not a RTP/UDP network "
+"stream.)\n"
+"Enter the starting and ending times (in seconds)."
+msgstr ""
 
-#: modules/gui/wxwidgets/wizard.cpp:143
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:136
 msgid "This does not appear to be a valid multicast address"
 msgstr ""
 
-#: modules/gui/wxwidgets/wizard.cpp:145
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:138
 msgid "You need to enter an address"
 msgstr ""
 
-#: modules/gui/wxwidgets/wizard.cpp:156
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:149
 msgid ""
 "In this page, you will define a few additionnal parameters for your "
 "transcoding"
 msgstr ""
 
-#: modules/gui/wxwidgets/wizard.cpp:159
-msgid "You must choose a file to save to"
-msgstr ""
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:152
+msgid "You must choose a file to save to"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:156
+msgid ""
+"In this page, you will define a few additionnal parameters for your stream"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:164
+msgid ""
+"When streaming using RTP, you can announce your streams using the SAP/SDP "
+"announcing protocol. This way, the clients won't have to type in the "
+"multicast address, it will appear in their playlist if they enable the SAP "
+"extra interface.\n"
+"If you want to give a name to your stream, enter it here, else, a default "
+"name will be used"
+msgstr ""
+
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:1283
+#, fuzzy
+msgid "Save to file"
+msgstr "Next file"
+
+#: modules/gui/wxwidgets/extrapanel.cpp:42
+msgid ""
+"If this setting is not zero, the bands will move together when you move one. "
+"The higher the value is, the more correlated their movement will be."
+msgstr ""
+
+#: modules/gui/wxwidgets/extrapanel.cpp:156 modules/video_filter/magnify.c:60
+msgid "Magnify"
+msgstr ""
+
+#: modules/gui/wxwidgets/extrapanel.cpp:156
+msgid "Magnifies part of the image"
+msgstr ""
+
+#: modules/gui/wxwidgets/extrapanel.cpp:273
+#, fuzzy
+msgid "Video Options"
+msgstr "Options"
+
+#: modules/gui/wxwidgets/extrapanel.cpp:287
+msgid "Aspect Ratio"
+msgstr ""
+
+#: modules/gui/wxwidgets/extrapanel.cpp:320
+msgid "More info"
+msgstr ""
+
+#: modules/gui/wxwidgets/extrapanel.cpp:405
+msgid ""
+"This filter prevents the audio output power from going over a defined value."
+msgstr ""
+
+#: modules/gui/wxwidgets/extrapanel.cpp:469
+msgid ""
+"Enable the equalizer. You can either manually change the bands or use a "
+"preset (Audio Menu->Equalizer)."
+msgstr ""
+
+#: modules/gui/wxwidgets/extrapanel.cpp:476
+msgid ""
+"If you enable this setting, the equalizer filter will be applied twice. The "
+"effect will be sharper."
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:448
+msgid "Quick &Open File...\tCtrl-O"
+msgstr "Quick &Open File…\tCtrl-O"
+
+#: modules/gui/wxwidgets/interface.cpp:451
+msgid "Open &File...\tCtrl-F"
+msgstr "Open &File…\tCtrl-F"
+
+#: modules/gui/wxwidgets/interface.cpp:452
+#, fuzzy
+msgid "Open Dir&ectory...\tCtrl-E"
+msgstr "Open &File…\tCtrl-F"
+
+#: modules/gui/wxwidgets/interface.cpp:453
+msgid "Open &Disc...\tCtrl-D"
+msgstr "Open &Disc…\tCtrl-D"
+
+#: modules/gui/wxwidgets/interface.cpp:455
+msgid "Open &Network Stream...\tCtrl-N"
+msgstr "Open &Network Stream…\tCtrl-N"
+
+#: modules/gui/wxwidgets/interface.cpp:457
+#, fuzzy
+msgid "Open C&apture Device...\tCtrl-A"
+msgstr "Open &Capture Device…\tCtrl-C"
+
+#: modules/gui/wxwidgets/interface.cpp:460
+msgid "&Wizard...\tCtrl-W"
+msgstr "&Wizard…\tCtrl-W"
+
+#: modules/gui/wxwidgets/interface.cpp:463
+msgid "E&xit\tCtrl-X"
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:469
+msgid "&Playlist...\tCtrl-P"
+msgstr "&Playlist…\tCtrl-P"
+
+#: modules/gui/wxwidgets/interface.cpp:471
+msgid "&Messages...\tCtrl-M"
+msgstr "&Messages…\tCtrl-M"
+
+#: modules/gui/wxwidgets/interface.cpp:473
+msgid "Stream and Media &info...\tCtrl-I"
+msgstr "Stream and Media &info…\tCtrl-I"
+
+#: modules/gui/wxwidgets/interface.cpp:475
+msgid "VLM Control...\tCtrl-V"
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:491
+#, fuzzy
+msgid "&File"
+msgstr "Title"
+
+#: modules/gui/wxwidgets/interface.cpp:492
+#, fuzzy
+msgid "&View"
+msgstr "Video"
+
+#: modules/gui/wxwidgets/interface.cpp:493
+#, fuzzy
+msgid "&Settings"
+msgstr "Setting"
+
+#: modules/gui/wxwidgets/interface.cpp:494
+#, fuzzy
+msgid "&Audio"
+msgstr "Audio"
+
+#: modules/gui/wxwidgets/interface.cpp:495
+#, fuzzy
+msgid "&Video"
+msgstr "Video"
+
+#: modules/gui/wxwidgets/interface.cpp:496
+#, fuzzy
+msgid "&Navigation"
+msgstr "Polarisation"
+
+#: modules/gui/wxwidgets/interface.cpp:497
+msgid "&Help"
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:557
+msgid "Previous playlist item"
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:558
+msgid "Next playlist item"
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:559
+msgid "Play slower"
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:560
+msgid "Play faster"
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:885
+msgid "Extended &GUI\tCtrl-G"
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:889
+msgid "&Undock Ext. GUI"
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:893
+#, fuzzy
+msgid "&Bookmarks...\tCtrl-B"
+msgstr "&Bookmarks…"
+
+#: modules/gui/wxwidgets/interface.cpp:895
+#, fuzzy
+msgid "Preference&s...\tCtrl-S"
+msgstr "Preferences…"
+
+#: modules/gui/wxwidgets/interface.cpp:948
+#, fuzzy
+msgid ""
+" (wxWidgets interface)\n"
+"\n"
+msgstr "Windows Service interface"
+
+#: modules/gui/wxwidgets/interface.cpp:959
+msgid ""
+"The VideoLAN team <videolan@videolan.org>\n"
+"http://www.videolan.org/\n"
+"\n"
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:962
+#, c-format
+msgid "About %s"
+msgstr ""
+
+#: modules/gui/wxwidgets/interface.cpp:1554
+#, fuzzy
+msgid "Show/Hide interface"
+msgstr "Add Interface"
+
+#: modules/gui/wxwidgets/main_slider_manager.cpp:97
+#: modules/gui/wxwidgets/timer.cpp:139
+#, fuzzy
+msgid "Playing"
+msgstr "Rating"
+
+#: modules/gui/wxwidgets/main_slider_manager.cpp:109
+#, fuzzy
+msgid "Stopped"
+msgstr "Scope"
+
+#: modules/gui/wxwidgets/main_slider_manager.cpp:136
+msgid "Menu"
+msgstr ""
+
+#: modules/gui/wxwidgets/main_slider_manager.cpp:139
+msgid "Previous track"
+msgstr ""
+
+#: modules/gui/wxwidgets/main_slider_manager.cpp:140
+msgid "Next track"
+msgstr ""
+
+#: modules/gui/wxwidgets/menus.cpp:132
+msgid "Quick &Open File..."
+msgstr "Quick &Open File…"
+
+#: modules/gui/wxwidgets/menus.cpp:133
+msgid "Open &File..."
+msgstr "Open &File…"
+
+#: modules/gui/wxwidgets/menus.cpp:134
+#, fuzzy
+msgid "Open D&irectory..."
+msgstr "Open &File…\tCtrl-F"
+
+#: modules/gui/wxwidgets/menus.cpp:135
+msgid "Open &Disc..."
+msgstr "Open &Disc…"
+
+#: modules/gui/wxwidgets/menus.cpp:136
+msgid "Open &Network Stream..."
+msgstr "Open &Network Stream…"
+
+#: modules/gui/wxwidgets/menus.cpp:137
+msgid "Open &Capture Device..."
+msgstr "Open &Capture Device…"
+
+#: modules/gui/wxwidgets/menus.cpp:144
+msgid "Media &Info..."
+msgstr "Media &Info…"
+
+#: modules/gui/wxwidgets/menus.cpp:145
+msgid "&Messages..."
+msgstr "&Messages…"
+
+#: modules/gui/wxwidgets/menus.cpp:146
+msgid "&Preferences..."
+msgstr "&Preferences…"
+
+#: modules/gui/wxwidgets/menus.cpp:565 modules/gui/wxwidgets/menus.cpp:592
+msgid "Empty"
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:31
+msgid "MPEG-1 Video codec (useable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:35
+msgid "MPEG-2 Video codec (useable with MPEG PS, MPEG TS, MPEG1, OGG and RAW)"
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:39
+msgid ""
+"MPEG-4 Video codec (useable with MPEG PS, MPEG TS, MPEG1, ASF, MPEG4, OGG "
+"and RAW)"
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:56
+#, fuzzy
+msgid "H264 is a new video codec (useable with MPEG TS and MPEG4)"
+msgstr "Destination video codec"
+
+#: modules/gui/wxwidgets/streamdata.cpp:59
+msgid "WMV (Windows Media Video) 7 (useable with MPEG TS, MPEG1, ASF and OGG)"
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:62
+msgid "WMV (Windows Media Video) 8 (useable with MPEG TS, MPEG1, ASF and OGG)"
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:66
+msgid "WMV (Windows Media Video) 9 (useable with MPEG TS, MPEG1, ASF and OGG)"
+msgstr ""
+
+#: modules/gui/wxwidgets/streamdata.cpp:122
+#, fuzzy
+msgid "RTP Unicast"
+msgstr "UDP/RTP input"
+
+#: modules/gui/wxwidgets/streamdata.cpp:125
+#, fuzzy
+msgid "RTP Multicast"
+msgstr "UDP/RTP input"
 
-#: modules/gui/wxwidgets/wizard.cpp:163
+#: modules/gui/wxwidgets/streamdata.cpp:129
 msgid ""
-"In this page, you will define a few additionnal parameters for your stream"
+"Enter the multicast address to stream to in this field. This must be an IP "
+"address between 224.0.0.0 an 239.255.255.255. For a private use, enter an "
+"address beginning with 239.255."
 msgstr ""
 
-#: modules/gui/wxwidgets/wizard.cpp:171
-msgid ""
-"When streaming using UDP, you can announce your streams using the SAP/SDP "
-"announcing protocol. This way, the clients won't have to type in the "
-"multicast address, it will appear in their playlist if they enable the SAP "
-"extra interface.\n"
-"If you want to give a name to your stream, enter it here, else, a default "
-"name will be used"
-msgstr ""
+#: modules/gui/wxwidgets/timer.cpp:135
+#, fuzzy
+msgid "Paused"
+msgstr "Date"
 
 #: modules/gui/wxwidgets/wxwidgets.cpp:89
 msgid "Show bookmarks dialog"
@@ -12042,37 +12602,42 @@ msgstr "Show bookmarks dialogue when the interface starts."
 
 #: modules/gui/wxwidgets/wxwidgets.cpp:92
 #: modules/gui/wxwidgets/wxwidgets.cpp:93
-msgid "Show taskbar entry"
+msgid "Show extended GUI"
 msgstr ""
 
 #: modules/gui/wxwidgets/wxwidgets.cpp:94
+#: modules/gui/wxwidgets/wxwidgets.cpp:95
+msgid "Show taskbar entry"
+msgstr ""
+
+#: modules/gui/wxwidgets/wxwidgets.cpp:96
 #, fuzzy
 msgid "Minimal interface"
 msgstr "Skinnable Interface"
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:95
+#: modules/gui/wxwidgets/wxwidgets.cpp:97
 msgid "Use minimal interface, no toolbar, few menus"
 msgstr ""
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:96
+#: modules/gui/wxwidgets/wxwidgets.cpp:98
 msgid "Size to video"
 msgstr ""
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:97
+#: modules/gui/wxwidgets/wxwidgets.cpp:99
 msgid "Resize VLC to match the video resolution"
 msgstr ""
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:98
-#: modules/gui/wxwidgets/wxwidgets.cpp:99
+#: modules/gui/wxwidgets/wxwidgets.cpp:100
+#: modules/gui/wxwidgets/wxwidgets.cpp:101
 msgid "Show systray icon"
 msgstr ""
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:108
+#: modules/gui/wxwidgets/wxwidgets.cpp:110
 #, fuzzy
 msgid "wxWidgets interface module"
 msgstr "Windows Service interface"
 
-#: modules/gui/wxwidgets/wxwidgets.cpp:145
+#: modules/gui/wxwidgets/wxwidgets.cpp:149
 #, fuzzy
 msgid "wxWidgets dialogs provider"
 msgstr "wxWindows dialogues provider"
@@ -12154,7 +12719,7 @@ msgid "Dummy font renderer function"
 msgstr ""
 
 #: modules/misc/freetype.c:83 modules/misc/win32text.c:54
-#: modules/video_filter/marq.c:125 modules/video_filter/rss.c:163
+#: modules/video_filter/marq.c:126 modules/video_filter/rss.c:164
 #: modules/visualization/xosd.c:73
 msgid "Font"
 msgstr ""
@@ -12174,7 +12739,6 @@ msgid ""
 msgstr ""
 
 #: modules/misc/freetype.c:89 modules/misc/win32text.c:60
-#: modules/video_filter/time.c:77
 msgid "Opacity, 0..255"
 msgstr ""
 
@@ -12387,34 +12951,40 @@ msgstr ""
 msgid "Gtk+ GUI helper"
 msgstr ""
 
-#: modules/misc/logger.c:95
+#: modules/misc/logger.c:107
 msgid "Text"
 msgstr ""
 
-#: modules/misc/logger.c:97
+#: modules/misc/logger.c:113
 msgid "Log format"
 msgstr ""
 
-#: modules/misc/logger.c:98
+#: modules/misc/logger.c:115
+msgid ""
+"Specify the log format. Available choices are \"text\" (default), \"html\", "
+"and \"syslog\"."
+msgstr ""
+
+#: modules/misc/logger.c:117
 msgid ""
 "Specify the log format. Available choices are \"text\" (default) and \"html"
 "\"."
 msgstr ""
 
-#: modules/misc/logger.c:103
+#: modules/misc/logger.c:123
 msgid "Logging"
 msgstr ""
 
-#: modules/misc/logger.c:104
+#: modules/misc/logger.c:124
 #, fuzzy
 msgid "File logging"
 msgstr "File logging interface"
 
-#: modules/misc/logger.c:106
+#: modules/misc/logger.c:126
 msgid "Log filename"
 msgstr ""
 
-#: modules/misc/logger.c:106
+#: modules/misc/logger.c:126
 msgid "Specify the log filename."
 msgstr ""
 
@@ -12438,6 +13008,35 @@ msgstr ""
 msgid "MMX EXT memcpy"
 msgstr ""
 
+#: modules/misc/msn.c:67
+msgid "MSN Title format string"
+msgstr ""
+
+#: modules/misc/msn.c:68
+msgid "MSN Title format string. {0} artist, {1} title, {2} album"
+msgstr ""
+
+#: modules/misc/msn.c:74
+msgid "MSN"
+msgstr ""
+
+#: modules/misc/msn.c:75
+msgid "MSN Title Plugin"
+msgstr ""
+
+#: modules/misc/msn.c:198
+#, fuzzy
+msgid "(no title)"
+msgstr "Title"
+
+#: modules/misc/msn.c:199
+msgid "(no artist)"
+msgstr ""
+
+#: modules/misc/msn.c:200
+msgid "(no album)"
+msgstr ""
+
 #: modules/misc/network/ipv4.c:94
 #, fuzzy
 msgid "Multicast output interface"
@@ -12487,7 +13086,7 @@ msgstr "Video"
 #: modules/misc/rtsp.c:48
 msgid ""
 "You can set the address, port and path the rtsp interface will bind to.\n"
-" Syntax is address:port/path. Default is to bind to any address on port 554, "
+"Syntax is address:port/path. Default is to bind to any address on port 554, "
 "with no path."
 msgstr ""
 
@@ -12892,108 +13491,132 @@ msgstr ""
 msgid "HAL device detection"
 msgstr ""
 
-#: modules/services_discovery/hal.c:127
+#: modules/services_discovery/hal.c:153
 #, fuzzy
 msgid "Devices"
 msgstr "Video Device"
 
-#: modules/services_discovery/sap.c:80
+#: modules/services_discovery/podcast.c:57
+msgid "Podcast URLs list"
+msgstr ""
+
+#: modules/services_discovery/podcast.c:58
+msgid "Podcast '|' (pipe) seperated URLs list"
+msgstr ""
+
+#: modules/services_discovery/podcast.c:62
+#, fuzzy
+msgid "Podcast Service Discovery"
+msgstr "Choose directory"
+
+#: modules/services_discovery/podcast.c:154
+#, fuzzy
+msgid "Podcast"
+msgstr "Date"
+
+#: modules/services_discovery/sap.c:79
 msgid "SAP multicast address"
 msgstr ""
 
-#: modules/services_discovery/sap.c:81
-msgid "Listen for SAP announces on another address"
+#: modules/services_discovery/sap.c:80
+msgid "Listen for SAP announcements on another address"
 msgstr ""
 
-#: modules/services_discovery/sap.c:82
+#: modules/services_discovery/sap.c:81
 msgid "IPv4-SAP listening"
 msgstr ""
 
-#: modules/services_discovery/sap.c:84
+#: modules/services_discovery/sap.c:83
 msgid ""
-"Set this if you want the SAP module to listen to IPv4 announces on the "
+"Set this if you want the SAP module to listen to IPv4 announcements on the "
 "standard address."
 msgstr ""
 
-#: modules/services_discovery/sap.c:86
+#: modules/services_discovery/sap.c:85
 msgid "IPv6-SAP listening"
 msgstr ""
 
-#: modules/services_discovery/sap.c:88
+#: modules/services_discovery/sap.c:87
 msgid ""
-"Set this if you want the SAP module to listen to IPv6 announces on the "
+"Set this if you want the SAP module to listen to IPv6 announcements on the "
 "standard address."
 msgstr ""
 
-#: modules/services_discovery/sap.c:90
+#: modules/services_discovery/sap.c:89
 msgid "IPv6 SAP scope"
 msgstr ""
 
-#: modules/services_discovery/sap.c:92
-msgid "Sets the scope for IPv6 announces (default is 8)."
+#: modules/services_discovery/sap.c:91
+msgid "Sets the scope for IPv6 announcements (default is 8)."
 msgstr ""
 
-#: modules/services_discovery/sap.c:93
+#: modules/services_discovery/sap.c:92
 msgid "SAP timeout (seconds)"
 msgstr ""
 
-#: modules/services_discovery/sap.c:95
+#: modules/services_discovery/sap.c:94
 msgid ""
-"Sets the time before SAP items get deleted if no new announce is received."
+"Sets the time before SAP items get deleted if no new announcement is "
+"received."
 msgstr ""
 
-#: modules/services_discovery/sap.c:97
+#: modules/services_discovery/sap.c:96
 msgid "Try to parse the SAP"
 msgstr ""
 
-#: modules/services_discovery/sap.c:99
+#: modules/services_discovery/sap.c:98
 #, fuzzy
 msgid ""
 "When SAP can it will try to parse the SAP. If you don't select this, all "
-"announces will be parsed by the livedotcom module."
+"announcements will be parsed by the livedotcom module."
 msgstr ""
 "When SAP can it will try to parse the SAP. Normal behaviour is to have "
 "livedotcom parse the announce."
 
-#: modules/services_discovery/sap.c:101
+#: modules/services_discovery/sap.c:100
 #, fuzzy
 msgid "SAP Strict mode"
 msgstr "Stereo"
 
-#: modules/services_discovery/sap.c:103
+#: modules/services_discovery/sap.c:102
 msgid ""
-"When this is set, the SAP parser will discard some non-compliant announces."
+"When this is set, the SAP parser will discard some non-compliant "
+"announcements."
 msgstr ""
 
-#: modules/services_discovery/sap.c:105
+#: modules/services_discovery/sap.c:104
 msgid "Use SAP cache"
 msgstr ""
 
-#: modules/services_discovery/sap.c:107
+#: modules/services_discovery/sap.c:106
 msgid ""
 "If this option is selected, a SAP caching mechanism will be used. This will "
 "result in lower SAP startup time, but you could end up with items "
 "corresponding to legacy streams."
 msgstr ""
 
-#: modules/services_discovery/sap.c:119
-msgid "SAP announces"
+#: modules/services_discovery/sap.c:118
+msgid "SAP Announcements"
 msgstr ""
 
-#: modules/services_discovery/sap.c:142
+#: modules/services_discovery/sap.c:141
 msgid "SDP file parser for UDP"
 msgstr ""
 
-#: modules/services_discovery/sap.c:791 modules/services_discovery/sap.c:796
+#: modules/services_discovery/sap.c:337
+msgid "Session Announcements (SAP)"
+msgstr ""
+
+#: modules/services_discovery/sap.c:790 modules/services_discovery/sap.c:795
 #, fuzzy
 msgid "Session"
 msgstr "Codec Description"
 
-#: modules/services_discovery/sap.c:792
+#: modules/services_discovery/sap.c:791
 msgid "Tool"
 msgstr ""
 
-#: modules/services_discovery/sap.c:797
+#: modules/services_discovery/sap.c:796
 msgid "User"
 msgstr ""
 
@@ -13010,11 +13633,6 @@ msgid "Shoutcast"
 msgstr ""
 
 #: modules/services_discovery/upnp.cpp:58
-#: modules/services_discovery/upnp.cpp:114
-msgid "UPnP"
-msgstr ""
-
-#: modules/services_discovery/upnp.cpp:59
 msgid "Universal Plug'n'Play discovery"
 msgstr ""
 
@@ -13074,7 +13692,7 @@ msgstr "Enable/disable video rendering."
 msgid "Introduces a delay in the display of the stream."
 msgstr ""
 
-#: modules/stream_out/display.c:50 modules/video_filter/deinterlace.c:118
+#: modules/stream_out/display.c:50 modules/video_filter/deinterlace.c:121
 msgid "Display"
 msgstr ""
 
@@ -13088,12 +13706,12 @@ msgstr "File stream output"
 msgid "Duplicate stream output"
 msgstr "File stream output"
 
-#: modules/stream_out/es.c:37 modules/stream_out/standard.c:43
+#: modules/stream_out/es.c:37 modules/stream_out/standard.c:42
 #, fuzzy
 msgid "Output access method"
 msgstr "Audio output access method"
 
-#: modules/stream_out/es.c:39 modules/stream_out/standard.c:45
+#: modules/stream_out/es.c:39 modules/stream_out/standard.c:44
 #, fuzzy
 msgid ""
 "Allows you to specify the output access method used for the streaming output."
@@ -13125,12 +13743,12 @@ msgid ""
 msgstr ""
 "Allows you to modify the user name that will be used for the connection."
 
-#: modules/stream_out/es.c:50 modules/stream_out/standard.c:47
+#: modules/stream_out/es.c:50 modules/stream_out/standard.c:46
 #, fuzzy
 msgid "Output muxer"
 msgstr "Video output muxer"
 
-#: modules/stream_out/es.c:52 modules/stream_out/rtp.c:52
+#: modules/stream_out/es.c:52 modules/stream_out/rtp.c:55
 #, fuzzy
 msgid "Allows you to specify the muxer used for the streaming output."
 msgstr ""
@@ -13156,13 +13774,12 @@ msgid "Allows you to specify the muxer used for the video streaming output."
 msgstr ""
 "Allows you to modify the user name that will be used for the connection."
 
-#: modules/stream_out/es.c:60 modules/stream_out/standard.c:51
+#: modules/stream_out/es.c:60
 #, fuzzy
 msgid "Output URL"
 msgstr "Video output URL"
 
-#: modules/stream_out/es.c:62 modules/stream_out/rtp.c:43
-#: modules/stream_out/standard.c:53
+#: modules/stream_out/es.c:62 modules/stream_out/rtp.c:46
 #, fuzzy
 msgid "Allows you to specify the output URL used for the streaming output."
 msgstr ""
@@ -13200,171 +13817,185 @@ msgstr "File stream output"
 msgid "Gathering stream output"
 msgstr "UDP stream output"
 
-#: modules/stream_out/mosaic_bridge.c:102
+#: modules/stream_out/mosaic_bridge.c:105
 msgid "Specify an identifier string for this subpicture"
 msgstr ""
 
-#: modules/stream_out/mosaic_bridge.c:110
+#: modules/stream_out/mosaic_bridge.c:113
 #, fuzzy
 msgid "Sample aspect ratio"
 msgstr "Codec setting"
 
-#: modules/stream_out/mosaic_bridge.c:112
+#: modules/stream_out/mosaic_bridge.c:115
 msgid "Sample aspect ratio of the destination (1:1, 3:4, 2:3)."
 msgstr ""
 
-#: modules/stream_out/mosaic_bridge.c:117
+#: modules/stream_out/mosaic_bridge.c:120
 msgid "Mosaic bridge"
 msgstr ""
 
-#: modules/stream_out/mosaic_bridge.c:118
+#: modules/stream_out/mosaic_bridge.c:121
 #, fuzzy
 msgid "Mosaic bridge stream output"
 msgstr "File stream output"
 
-#: modules/stream_out/rtp.c:44
+#: modules/stream_out/rtp.c:47
 msgid "SDP"
 msgstr "SDP"
 
-#: modules/stream_out/rtp.c:46
+#: modules/stream_out/rtp.c:49
 msgid ""
 "Allows you to specify the SDP used for the streaming output. You must use an "
 "url: http://location to access the SDP via HTTP, rtsp://location for RTSP "
 "access, and sap:// for the SDP to be announced via SAP."
 msgstr ""
 
-#: modules/stream_out/rtp.c:50
+#: modules/stream_out/rtp.c:53
 msgid "Muxer"
 msgstr ""
 
-#: modules/stream_out/rtp.c:54 modules/stream_out/standard.c:55
+#: modules/stream_out/rtp.c:57 modules/stream_out/standard.c:59
 msgid "Session name"
 msgstr ""
 
-#: modules/stream_out/rtp.c:56
+#: modules/stream_out/rtp.c:59
 #, fuzzy
 msgid "Allows you to specify the session name used for the streaming output."
 msgstr ""
 "Allows you to modify the user name that will be used for the connection."
 
-#: modules/stream_out/rtp.c:57
+#: modules/stream_out/rtp.c:60
 #, fuzzy
 msgid "Session description"
 msgstr "Codec Description"
 
-#: modules/stream_out/rtp.c:59
+#: modules/stream_out/rtp.c:62
 #, fuzzy
 msgid "Allows you to give a broader description of the stream."
 msgstr ""
 "Allows you to give a user name that will be requested to access the stream."
 
-#: modules/stream_out/rtp.c:60
+#: modules/stream_out/rtp.c:63
 msgid "Session URL"
 msgstr ""
 
-#: modules/stream_out/rtp.c:62
+#: modules/stream_out/rtp.c:65
 #, fuzzy
 msgid "Allows you to specify a URL with additional information on the stream."
 msgstr "Allows you to specify the minimum video quantiser scale."
 
-#: modules/stream_out/rtp.c:63
+#: modules/stream_out/rtp.c:66
 #, fuzzy
 msgid "Session email"
 msgstr "Codec Description"
 
-#: modules/stream_out/rtp.c:65
+#: modules/stream_out/rtp.c:68
 #, fuzzy
 msgid "Allows you to specify contact e-mail address for this session."
 msgstr "Allows you to specify the maximum video quantiser scale."
 
-#: modules/stream_out/rtp.c:69
+#: modules/stream_out/rtp.c:72
 #, fuzzy
 msgid "Allows you to specify the base port used for the RTP streaming."
 msgstr ""
 "Allows you to modify the user name that will be used for the connection."
 
-#: modules/stream_out/rtp.c:70
+#: modules/stream_out/rtp.c:73
 #, fuzzy
 msgid "Audio port"
 msgstr "Audio options"
 
-#: modules/stream_out/rtp.c:72
+#: modules/stream_out/rtp.c:75
 #, fuzzy
 msgid ""
 "Allows you to specify the default audio port used for the RTP streaming."
 msgstr ""
 "Allows you to modify the user agent that will be used for the connection."
 
-#: modules/stream_out/rtp.c:73
+#: modules/stream_out/rtp.c:76
 #, fuzzy
 msgid "Video port"
 msgstr "Video bitrate"
 
-#: modules/stream_out/rtp.c:75
+#: modules/stream_out/rtp.c:78
 #, fuzzy
 msgid ""
 "Allows you to specify the default video port used for the RTP streaming."
 msgstr "Allows you to specify the maximum video quantiser scale."
 
-#: modules/stream_out/rtp.c:79
+#: modules/stream_out/rtp.c:82
 #, fuzzy
 msgid "Allows you to specify the time to live for the output stream."
 msgstr ""
 "Allows you to modify the user name that will be used for the connection."
 
-#: modules/stream_out/rtp.c:87
-#, fuzzy
-msgid "RTP"
-msgstr "TCP"
-
-#: modules/stream_out/rtp.c:88
+#: modules/stream_out/rtp.c:91
 #, fuzzy
 msgid "RTP stream output"
 msgstr "HTTP stream output"
 
-#: modules/stream_out/standard.c:49
+#: modules/stream_out/standard.c:48
 #, fuzzy
 msgid ""
 "Allows you to specify the output muxer method used for the streaming output."
 msgstr ""
 "Allows you to modify the user name that will be used for the connection."
 
+#: modules/stream_out/standard.c:50
+#, fuzzy
+msgid "Output URL (deprecated)"
+msgstr "Next file"
+
+#: modules/stream_out/standard.c:52
+#, fuzzy
+msgid ""
+"Allows you to specify the output URL used for the streaming output."
+"Deprecated, use dst instead."
+msgstr ""
+"Allows you to modify the user name that will be used for the connection."
+
+#: modules/stream_out/standard.c:55
+#, fuzzy
+msgid "Output destination"
+msgstr "Description"
+
 #: modules/stream_out/standard.c:57
-msgid "Name of the session that will be announced with SAP or SLP"
+#, fuzzy
+msgid ""
+"Allows you to specify the output destination used for the streaming output."
+msgstr ""
+"Allows you to modify the user name that will be used for the connection."
+
+#: modules/stream_out/standard.c:61
+#, fuzzy
+msgid "Name of the session that will be announced with SAP"
 msgstr ""
+"Allows you to modify the user agent that will be used for the connection."
 
-#: modules/stream_out/standard.c:59
+#: modules/stream_out/standard.c:63
 #, fuzzy
 msgid "Session groupname"
 msgstr "Codec Description"
 
-#: modules/stream_out/standard.c:61
+#: modules/stream_out/standard.c:65
 #, fuzzy
 msgid "Name of the group that will be announced for the session"
 msgstr ""
 "Allows you to modify the user agent that will be used for the connection."
 
-#: modules/stream_out/standard.c:63
+#: modules/stream_out/standard.c:67
 msgid "SAP announcing"
 msgstr ""
 
-#: modules/stream_out/standard.c:64
+#: modules/stream_out/standard.c:68
 msgid "Announce this session with SAP"
 msgstr ""
 
-#: modules/stream_out/standard.c:66
-msgid "SLP announcing"
-msgstr ""
-
-#: modules/stream_out/standard.c:67
-msgid "Announce this session with SLP"
-msgstr ""
-
-#: modules/stream_out/standard.c:75
+#: modules/stream_out/standard.c:76
 msgid "Standard"
 msgstr ""
 
-#: modules/stream_out/standard.c:76
+#: modules/stream_out/standard.c:77
 #, fuzzy
 msgid "Standard stream output"
 msgstr "Transcode stream output"
@@ -13673,7 +14304,7 @@ msgid ""
 "video."
 msgstr ""
 
-#: modules/stream_out/transcode.c:135 modules/video_filter/osdmenu.c:117
+#: modules/stream_out/transcode.c:135 modules/video_filter/osdmenu.c:118
 msgid "OSD menu"
 msgstr ""
 
@@ -13858,47 +14489,70 @@ msgstr ""
 msgid "Crop video filter"
 msgstr "ffmpeg demuxer"
 
-#: modules/video_filter/crop.c:62
-msgid "Crop"
-msgstr ""
-
 #: modules/video_filter/deinterlace.c:102
+#: modules/video_filter/deinterlace.c:105
 #, fuzzy
 msgid "Deinterlace mode"
 msgstr "Deinterlace video"
 
 #: modules/video_filter/deinterlace.c:103
-msgid "You can choose the default deinterlace mode"
+msgid "Default deinterlace method to use for local playback"
 msgstr ""
 
-#: modules/video_filter/deinterlace.c:112
+#: modules/video_filter/deinterlace.c:106
 #, fuzzy
-msgid "Deinterlacing video filter"
-msgstr "ffmpeg demuxer"
+msgid "Default deinterlace methode to use for streaming"
+msgstr ""
+"Allows you to modify the user name that will be used for the connection."
 
-#: modules/video_filter/deinterlace.c:128
+#: modules/video_filter/deinterlace.c:115
 #, fuzzy
-msgid "Streamming"
-msgstr "Codec setting"
+msgid "Deinterlacing video filter"
+msgstr "ffmpeg demuxer"
 
-#: modules/video_filter/distort.c:59
+#: modules/video_filter/distort.c:64
 #, fuzzy
 msgid "Distort mode"
 msgstr "Stereo"
 
-#: modules/video_filter/distort.c:60
-msgid "Distort mode, one of \"wave\" and \"ripple\""
+#: modules/video_filter/distort.c:65
+msgid "Distort mode, one of \"wave\", \"ripple\", \"gradient\" and \"edge\""
+msgstr ""
+
+#: modules/video_filter/distort.c:67
+msgid "Gradient image type"
+msgstr ""
+
+#: modules/video_filter/distort.c:68
+msgid "Gradient image type (0 or 1)"
+msgstr ""
+
+#: modules/video_filter/distort.c:70
+#, fuzzy
+msgid "Apply cartoon effect"
+msgstr "Next file"
+
+#: modules/video_filter/distort.c:71
+msgid "Apply cartoon effect. Used by \"gradient\" and \"edge\"."
 msgstr ""
 
-#: modules/video_filter/distort.c:63
+#: modules/video_filter/distort.c:74
 msgid "Wave"
 msgstr ""
 
-#: modules/video_filter/distort.c:63
+#: modules/video_filter/distort.c:74
 msgid "Ripple"
 msgstr ""
 
-#: modules/video_filter/distort.c:66
+#: modules/video_filter/distort.c:74
+msgid "gradient"
+msgstr ""
+
+#: modules/video_filter/distort.c:74
+msgid "Edge"
+msgstr ""
+
+#: modules/video_filter/distort.c:77
 #, fuzzy
 msgid "Distort video filter"
 msgstr "ffmpeg demuxer"
@@ -13972,6 +14626,11 @@ msgstr ""
 msgid "Logo sub filter"
 msgstr "Choose file"
 
+#: modules/video_filter/magnify.c:59
+#, fuzzy
+msgid "Magnify/Zoom interactive video filter"
+msgstr "ffmpeg demuxer"
+
 #: modules/video_filter/marq.c:76
 msgid "Marquee text"
 msgstr ""
@@ -14011,6 +14670,7 @@ msgid ""
 msgstr ""
 
 #: modules/video_filter/marq.c:86 modules/video_filter/rss.c:124
+#: modules/video_filter/time.c:77
 msgid "Opacity"
 msgstr ""
 
@@ -14043,11 +14703,11 @@ msgstr ""
 msgid "Marquee"
 msgstr ""
 
-#: modules/video_filter/marq.c:134 modules/video_filter/rss.c:172
+#: modules/video_filter/marq.c:136 modules/video_filter/rss.c:173
 msgid "Misc"
 msgstr ""
 
-#: modules/video_filter/marq.c:138
+#: modules/video_filter/marq.c:140
 msgid "Marquee display sub filter"
 msgstr ""
 
@@ -14240,23 +14900,23 @@ msgstr ""
 #: modules/video_filter/osdmenu.c:65
 msgid ""
 "OSD menu pictures get a default timeout of 15 seconds added to their "
-"remaining time.This will ensure that they are at least the specified time "
+"remaining time. This will ensure that they are at least the specified time "
 "visible."
 msgstr ""
 
-#: modules/video_filter/osdmenu.c:68
+#: modules/video_filter/osdmenu.c:69
 msgid "Update speed of OSD menu"
 msgstr ""
 
-#: modules/video_filter/osdmenu.c:70
+#: modules/video_filter/osdmenu.c:71
 msgid ""
-"Update the OSD menu picture every 200ms (default). Shorten the update time "
-"for environments that experience transmissions errors. Be carefull with this "
+"Update the OSD menu picture every 200 ms (default). Shorten the update time "
+"for environments that experience transmissions errors. Be careful with this "
 "option because encoding OSD menu pictures is very computing intensive. The "
 "range is 0 - 1000 ms."
 msgstr ""
 
-#: modules/video_filter/osdmenu.c:116
+#: modules/video_filter/osdmenu.c:117
 msgid "On Screen Display menu subfilter"
 msgstr ""
 
@@ -14290,12 +14950,8 @@ msgid ""
 "will never be updated."
 msgstr ""
 
-#: modules/video_filter/rss.c:152
-msgid "RSS"
-msgstr ""
-
-#: modules/video_filter/rss.c:179
-msgid "RSS feed display sub filter"
+#: modules/video_filter/rss.c:180
+msgid "RSS feed display"
 msgstr ""
 
 #: modules/video_filter/rv32.c:52
@@ -14391,7 +15047,7 @@ msgstr ""
 msgid "Time overlay"
 msgstr ""
 
-#: modules/video_filter/time.c:119
+#: modules/video_filter/time.c:121
 msgid "Time display sub filter"
 msgstr ""
 
@@ -14452,17 +15108,15 @@ msgid "Element aspect ratio"
 msgstr "Codec setting"
 
 #: modules/video_filter/wall.c:66
-msgid ""
-"The aspect ratio of the individual displays building the display wall. If \"0"
-"\", the video outputs will be evenly divided."
+msgid "The aspect ratio of the individual displays building the display wall"
 msgstr ""
 
-#: modules/video_filter/wall.c:71
+#: modules/video_filter/wall.c:69
 #, fuzzy
 msgid "Wall video filter"
 msgstr "ffmpeg demuxer"
 
-#: modules/video_filter/wall.c:72
+#: modules/video_filter/wall.c:70
 msgid "Image wall"
 msgstr ""
 
@@ -14539,11 +15193,11 @@ msgstr ""
 msgid "DirectX video output"
 msgstr "HD1000 audio output"
 
-#: modules/video_output/directx/directx.c:301
+#: modules/video_output/directx/directx.c:302
 msgid "Wallpaper"
 msgstr ""
 
-#: modules/video_output/directx/glwin32.c:65 modules/video_output/opengl.c:123
+#: modules/video_output/directx/glwin32.c:65 modules/video_output/opengl.c:135
 #: modules/video_output/x11/glx.c:115
 #, fuzzy
 msgid "OpenGL video output"
@@ -14622,29 +15276,29 @@ msgstr "HD1000 audio output"
 msgid "Matrox Graphic Array video output"
 msgstr "Greyscale video output"
 
-#: modules/video_output/opengl.c:102 modules/video_output/opengl.c:106
+#: modules/video_output/opengl.c:114 modules/video_output/opengl.c:118
 msgid "OpenGL cube rotation speed"
 msgstr ""
 
-#: modules/video_output/opengl.c:107
+#: modules/video_output/opengl.c:119
 msgid "If the OpenGL cube effect is enabled, this controls its rotation speed."
 msgstr ""
 
-#: modules/video_output/opengl.c:110
+#: modules/video_output/opengl.c:122
 #, fuzzy
 msgid "Select effect"
 msgstr "Next file"
 
-#: modules/video_output/opengl.c:112
+#: modules/video_output/opengl.c:124
 #, fuzzy
 msgid "Allows you to select different visual effects."
 msgstr "Allows you to specify the minimum video quantiser scale."
 
-#: modules/video_output/opengl.c:117
+#: modules/video_output/opengl.c:129
 msgid "Cube"
 msgstr ""
 
-#: modules/video_output/opengl.c:117
+#: modules/video_output/opengl.c:129
 msgid "Transparent Cube"
 msgstr ""
 
@@ -14663,7 +15317,7 @@ msgstr ""
 msgid "QT Embedded video output"
 msgstr "Greyscale video output"
 
-#: modules/video_output/sdl.c:107
+#: modules/video_output/sdl.c:108
 msgid "Simple DirectMedia Layer video output"
 msgstr ""
 
@@ -14708,22 +15362,12 @@ msgstr ""
 msgid "SVGAlib video output"
 msgstr "Greyscale video output"
 
-#: modules/video_output/wingdi.c:216
-#, fuzzy
-msgid "Windows GAPI"
-msgstr "Greyscale video output"
-
-#: modules/video_output/wingdi.c:217
-#, fuzzy
-msgid "Windows GAPI video output"
-msgstr "Greyscale video output"
-
 #: modules/video_output/wingdi.c:220
 #, fuzzy
-msgid "Windows GDI"
+msgid "Windows GAPI video output"
 msgstr "Greyscale video output"
 
-#: modules/video_output/wingdi.c:221
+#: modules/video_output/wingdi.c:224
 #, fuzzy
 msgid "Windows GDI video output"
 msgstr "Greyscale video output"
@@ -14867,117 +15511,122 @@ msgid "Number of bands used by spectrum analyzer, should be 20 or 80."
 msgstr "Number of bands used by spectrum analyser, should be 20 or 80."
 
 #: modules/visualization/visual/visual.c:55
+#, fuzzy
+msgid "Number of bands used by the spectrometer, from 20 to 80."
+msgstr "Number of bands used by spectrum analyser, should be 20 or 80."
+
+#: modules/visualization/visual/visual.c:57
 msgid "Band separator"
 msgstr ""
 
-#: modules/visualization/visual/visual.c:57
+#: modules/visualization/visual/visual.c:59
 #, fuzzy
 msgid "Number of blank pixels between bands."
 msgstr "Number of threads"
 
-#: modules/visualization/visual/visual.c:59
+#: modules/visualization/visual/visual.c:61
 msgid "Amplification"
 msgstr ""
 
-#: modules/visualization/visual/visual.c:61
+#: modules/visualization/visual/visual.c:63
 msgid "This is a coefficient that modifies the height of the bands."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:63
+#: modules/visualization/visual/visual.c:65
 msgid "Enable peaks"
 msgstr ""
 
-#: modules/visualization/visual/visual.c:65
+#: modules/visualization/visual/visual.c:67
 msgid "Defines whether to draw peaks."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:67
+#: modules/visualization/visual/visual.c:69
 msgid "Enable original graphic spectrum"
 msgstr ""
 
-#: modules/visualization/visual/visual.c:69
+#: modules/visualization/visual/visual.c:71
 msgid "Defines whether to draw the original spectrum graphic routine."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:71
+#: modules/visualization/visual/visual.c:73
 #, fuzzy
 msgid "Enable bands"
 msgstr "visualiser"
 
-#: modules/visualization/visual/visual.c:73
+#: modules/visualization/visual/visual.c:75
 msgid "Defines whether to draw the bands."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:75
+#: modules/visualization/visual/visual.c:77
 #, fuzzy
 msgid "Enable base"
 msgstr "Enable"
 
-#: modules/visualization/visual/visual.c:77
+#: modules/visualization/visual/visual.c:79
 msgid "Defines whether to draw the base of the bands."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:79
+#: modules/visualization/visual/visual.c:81
 msgid "Base pixel radius"
 msgstr ""
 
-#: modules/visualization/visual/visual.c:81
+#: modules/visualization/visual/visual.c:83
 msgid "Defines radius size in pixels, of base of bands(beginning)."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:83
+#: modules/visualization/visual/visual.c:85
 #, fuzzy
 msgid "Spectral sections"
 msgstr "Resolution"
 
-#: modules/visualization/visual/visual.c:85
+#: modules/visualization/visual/visual.c:87
 msgid "Determines how many sections of spectrum will exist."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:87
+#: modules/visualization/visual/visual.c:89
 msgid "Peak height"
 msgstr ""
 
-#: modules/visualization/visual/visual.c:89
+#: modules/visualization/visual/visual.c:91
 msgid "This is the total pixel height of the peak items."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:91
+#: modules/visualization/visual/visual.c:93
 msgid "Peak extra width"
 msgstr ""
 
-#: modules/visualization/visual/visual.c:93
+#: modules/visualization/visual/visual.c:95
 msgid "Additions or subtractions of pixels on the peak width."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:95
+#: modules/visualization/visual/visual.c:97
 msgid "V-plane color"
 msgstr ""
 
-#: modules/visualization/visual/visual.c:97
+#: modules/visualization/visual/visual.c:99
 msgid "YUV-Color cube shifting across the V-plane ( 0 - 127 )."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:99
+#: modules/visualization/visual/visual.c:101
 #, fuzzy
 msgid "Number of stars"
 msgstr "Number of threads"
 
-#: modules/visualization/visual/visual.c:101
+#: modules/visualization/visual/visual.c:103
 msgid "Defines the number of stars to draw with random effect."
 msgstr ""
 
-#: modules/visualization/visual/visual.c:107
+#: modules/visualization/visual/visual.c:109
 #, fuzzy
 msgid "Visualizer"
 msgstr "visualiser filter"
 
-#: modules/visualization/visual/visual.c:110
+#: modules/visualization/visual/visual.c:112
 #, fuzzy
 msgid "Visualizer filter"
 msgstr "visualiser filter"
 
-#: modules/visualization/visual/visual.c:118
+#: modules/visualization/visual/visual.c:120
 #, fuzzy
 msgid "Spectrum analyser"
 msgstr "Spectrum"
@@ -15014,6 +15663,79 @@ msgstr ""
 msgid "XOSD interface"
 msgstr "XOSD interface"
 
+#, fuzzy
+#~ msgid ""
+#~ "VLC is an open-source and cross-platform multimedia player for various "
+#~ "audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, Ogg, etc.) as "
+#~ "well as DVDs, VCDs, CD audio, and various streaming protocols.\n"
+#~ "\n"
+#~ "VLC is also a streaming server with transcoding capabilities (UDP unicast "
+#~ "and multicast, HTTP, etc.) mainly designed for high-bandwidth networks.\n"
+#~ "\n"
+#~ "For more information, have a look at the web site."
+#~ msgstr ""
+#~ "VLC is an open-source and cross-platform multimedia player for various "
+#~ "audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, Ogg, …) as "
+#~ "well as DVDs, VCDs, CD audio, and various streaming protocols.\n"
+#~ "\n"
+#~ "VLC is also a streaming server with transcoding capabilities (UDP unicast "
+#~ "and multicast, HTTP, …) mainly designed for high-bandwidth networks.\n"
+#~ "\n"
+#~ "For more information, have a look at the web site."
+
+#, fuzzy
+#~ msgid "Shout"
+#~ msgstr "Add Interface"
+
+#, fuzzy
+#~ msgid "VC-1 decoder module"
+#~ msgstr "Decoder modules settings"
+
+#, fuzzy
+#~ msgid "Windows GAPI"
+#~ msgstr "Greyscale video output"
+
+#, fuzzy
+#~ msgid "Windows GDI"
+#~ msgstr "Greyscale video output"
+
+#, fuzzy
+#~ msgid "Open MRL"
+#~ msgstr "Options:"
+
+#~ msgid ""
+#~ "If you have several interfaces on your machine and use the multicast "
+#~ "solution, you will probably have to indicate the IP address of your "
+#~ "multicasting interface here."
+#~ msgstr ""
+#~ "If you have several interfaces on your machine and use the multicast "
+#~ "solution, you will probably have to indicate the IP address of your "
+#~ "multicasting interface here."
+
+#~ msgid "Choose program (SID)"
+#~ msgstr "Choose programme (SID)"
+
+#~ msgid "Choose programs"
+#~ msgstr "Choose programmes"
+
+#~ msgid "Choose audio track"
+#~ msgstr "Choose audio track"
+
+#~ msgid "Choose subtitles track"
+#~ msgstr "Choose subtitles track"
+
+#, fuzzy
+#~ msgid "Current version"
+#~ msgstr "Stereo"
+
+#, fuzzy
+#~ msgid "Your version"
+#~ msgstr "Stereo"
+
+#, fuzzy
+#~ msgid "Streamming"
+#~ msgstr "Codec setting"
+
 #~ msgid ""
 #~ "This allows you to choose a specific audio channel mixer. For instance, "
 #~ "you can use the \"headphone\" mixer that gives 5.1 feeling with a "
@@ -15162,13 +15884,6 @@ msgstr "XOSD interface"
 #~ msgid "_Video"
 #~ msgstr "Video"
 
-#~ msgid "Go backward"
-#~ msgstr "Go backward"
-
-#, fuzzy
-#~ msgid "Stop stream"
-#~ msgstr "Codec setting"
-
 #, fuzzy
 #~ msgid "Prev"
 #~ msgstr "Stream "
@@ -15314,10 +16029,6 @@ msgstr "XOSD interface"
 #~ msgid "Languages"
 #~ msgstr "Language"
 
-#, fuzzy
-#~ msgid "language"
-#~ msgstr "Language"
-
 #, fuzzy
 #~ msgid "Open &Disk"
 #~ msgstr "Open subtitles file"
@@ -15578,9 +16289,6 @@ msgstr "XOSD interface"
 #~ msgid "Audio filters can be set in the Audio section, and configured here."
 #~ msgstr "Audio filters can be set in the Audio section, and configured here."
 
-#~ msgid "Decoder modules settings"
-#~ msgstr "Decoder modules settings"
-
 #~ msgid ""
 #~ "In the Subsdec section you may want to set the text encoding of your "
 #~ "preferred subtitles."
@@ -15676,10 +16384,6 @@ msgstr "XOSD interface"
 #~ msgid "Track Artist"
 #~ msgstr "Artist"
 
-#, fuzzy
-#~ msgid "Program to decode"
-#~ msgstr "Pseudo raw video decoder"
-
 #~ msgid "Using the VLM interface plugin..."
 #~ msgstr "Using the VLM interface plugin…"