more media list unit tests

[vlc] / po / vlc.pot

diff --git a/po/vlc.pot b/po/vlc.pot
index 1e16270ab272c365efb094f34923be053a11ad99..7d70a3aec95887cb7d3c12223136c26e0435685e 100644 (file)
--- a/po/vlc.pot
+++ b/po/vlc.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: vlc 0.9.0-git\n"
 "Report-Msgid-Bugs-To: vlc-devel@videolan.org\n"
-"POT-Creation-Date: 2008-01-25 20:37-0800\n"
+"POT-Creation-Date: 2008-03-08 00:49+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,8 +31,8 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: include/vlc_config_cat.h:43
-#: modules/gui/qt4/components/simple_preferences.cpp:71
+#: include/vlc_config_cat.h:43 modules/gui/macosx/simple_prefs.m:90
+#: modules/gui/qt4/components/simple_preferences.cpp:73
 #: modules/misc/dummy/dummy.c:67
 msgid "Interface"
 msgstr ""
@@ -66,12 +66,12 @@ msgid "Hotkeys settings"
 msgstr ""
 
 #: include/vlc_config_cat.h:58 src/input/es_out.c:2049
-#: src/libvlc-module.c:1412 modules/gui/beos/InterfaceWindow.cpp:284
-#: modules/gui/macosx/extended.m:70 modules/gui/macosx/intf.m:673
+#: src/libvlc-module.c:1414 modules/gui/beos/InterfaceWindow.cpp:284
+#: modules/gui/macosx/extended.m:69 modules/gui/macosx/intf.m:703
 #: modules/gui/macosx/output.m:170 modules/gui/macosx/playlistinfo.m:97
-#: modules/gui/macosx/wizard.m:378
-#: modules/gui/qt4/components/info_panels.cpp:517
-#: modules/gui/qt4/components/simple_preferences.cpp:73
+#: modules/gui/macosx/simple_prefs.m:106 modules/gui/macosx/wizard.m:378
+#: modules/gui/qt4/components/info_panels.cpp:519
+#: modules/gui/qt4/components/simple_preferences.cpp:75
 #: modules/gui/qt4/ui/sout.ui:631
 #: modules/gui/wxwidgets/dialogs/infopanels.cpp:338
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:852
@@ -84,7 +84,7 @@ msgid "Audio settings"
 msgstr ""
 
 #: include/vlc_config_cat.h:61 include/vlc_config_cat.h:62
-#: modules/gui/qt4/components/simple_preferences.cpp:198
+#: modules/gui/qt4/components/simple_preferences.cpp:200
 msgid "General audio settings"
 msgstr ""
 
@@ -98,7 +98,7 @@ msgid "Audio filters are used to postprocess the audio stream."
 msgstr ""
 
 #: include/vlc_config_cat.h:68 src/audio_output/input.c:92
-#: modules/gui/macosx/intf.m:683 modules/gui/macosx/intf.m:684
+#: modules/gui/macosx/intf.m:713 modules/gui/macosx/intf.m:714
 msgid "Visualizations"
 msgstr ""
 
@@ -114,10 +114,10 @@ msgstr ""
 msgid "These are general settings for audio output modules."
 msgstr ""
 
-#: include/vlc_config_cat.h:75 src/libvlc-module.c:1790
+#: include/vlc_config_cat.h:75 src/libvlc-module.c:1793
 #: modules/gui/qt4/ui/sout.ui:758
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:578
-#: modules/gui/wxwidgets/menus.cpp:286 modules/stream_out/transcode.c:289
+#: modules/gui/wxwidgets/menus.cpp:276 modules/stream_out/transcode.c:289
 msgid "Miscellaneous"
 msgstr ""
 
@@ -126,11 +126,12 @@ msgid "Miscellaneous audio settings and modules."
 msgstr ""
 
 #: include/vlc_config_cat.h:79 src/input/es_out.c:2077
-#: src/libvlc-module.c:1460 modules/gui/macosx/extended.m:69
-#: modules/gui/macosx/intf.m:686 modules/gui/macosx/output.m:160
-#: modules/gui/macosx/playlistinfo.m:86 modules/gui/macosx/wizard.m:379
-#: modules/gui/qt4/components/info_panels.cpp:518
-#: modules/gui/qt4/components/simple_preferences.cpp:74
+#: src/libvlc-module.c:1462 modules/gui/macosx/extended.m:68
+#: modules/gui/macosx/intf.m:716 modules/gui/macosx/output.m:160
+#: modules/gui/macosx/playlistinfo.m:86 modules/gui/macosx/simple_prefs.m:122
+#: modules/gui/macosx/wizard.m:379
+#: modules/gui/qt4/components/info_panels.cpp:520
+#: modules/gui/qt4/components/simple_preferences.cpp:76
 #: modules/gui/qt4/ui/sout.ui:542
 #: modules/gui/wxwidgets/dialogs/infopanels.cpp:292
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:813
@@ -144,7 +145,7 @@ msgid "Video settings"
 msgstr ""
 
 #: include/vlc_config_cat.h:82 include/vlc_config_cat.h:83
-#: modules/gui/qt4/components/simple_preferences.cpp:168
+#: modules/gui/qt4/components/simple_preferences.cpp:170
 msgid "General video settings"
 msgstr ""
 
@@ -233,7 +234,7 @@ msgstr ""
 msgid "General input settings. Use with care."
 msgstr ""
 
-#: include/vlc_config_cat.h:135 src/libvlc-module.c:1716
+#: include/vlc_config_cat.h:135 src/libvlc-module.c:1719
 #: modules/gui/qt4/dialogs/sout.cpp:44
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:152
 msgid "Stream output"
@@ -321,14 +322,13 @@ msgstr ""
 msgid "VLC's implementation of Video On Demand"
 msgstr ""
 
-#: include/vlc_config_cat.h:186 src/libvlc-module.c:1860
+#: include/vlc_config_cat.h:186 src/libvlc-module.c:1863
 #: src/playlist/engine.c:115 modules/demux/playlist/playlist.c:71
 #: modules/demux/playlist/playlist.c:72
 #: modules/gui/beos/InterfaceWindow.cpp:233
-#: modules/gui/beos/InterfaceWindow.cpp:327 modules/gui/macosx/intf.m:618
+#: modules/gui/beos/InterfaceWindow.cpp:327 modules/gui/macosx/intf.m:648
 #: modules/gui/pda/pda_interface.c:1262
 #: modules/gui/qt4/dialogs/playlist.cpp:48
-#: modules/gui/qt4/main_interface.cpp:137
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:208
 #: modules/gui/wxwidgets/interface.cpp:696
 #: modules/gui/wxwidgets/interface.cpp:707
@@ -345,7 +345,7 @@ msgstr ""
 msgid "General playlist behaviour"
 msgstr ""
 
-#: include/vlc_config_cat.h:192 modules/gui/macosx/playlist.m:444
+#: include/vlc_config_cat.h:192 modules/gui/macosx/playlist.m:446
 msgid "Services discovery"
 msgstr ""
 
@@ -355,7 +355,7 @@ msgid ""
 "playlist."
 msgstr ""
 
-#: include/vlc_config_cat.h:197 src/libvlc-module.c:1675
+#: include/vlc_config_cat.h:197 src/libvlc-module.c:1678
 #: modules/gui/macosx/prefs.m:125
 msgid "Advanced"
 msgstr ""
@@ -462,7 +462,7 @@ msgstr ""
 msgid "Select one or more files to open"
 msgstr ""
 
-#: include/vlc_intf_strings.h:41 modules/gui/macosx/intf.m:717
+#: include/vlc_intf_strings.h:41 modules/gui/macosx/intf.m:747
 msgid "Media Information..."
 msgstr ""
 
@@ -470,7 +470,7 @@ msgstr ""
 msgid "Codec Information..."
 msgstr ""
 
-#: include/vlc_intf_strings.h:43 modules/gui/macosx/intf.m:718
+#: include/vlc_intf_strings.h:43 modules/gui/macosx/intf.m:748
 msgid "Messages..."
 msgstr ""
 
@@ -482,7 +482,7 @@ msgstr ""
 msgid "Go to specific time..."
 msgstr ""
 
-#: include/vlc_intf_strings.h:46 modules/gui/macosx/intf.m:715
+#: include/vlc_intf_strings.h:46 modules/gui/macosx/intf.m:745
 msgid "Bookmarks..."
 msgstr ""
 
@@ -495,20 +495,20 @@ msgid "About..."
 msgstr ""
 
 #: include/vlc_intf_strings.h:52 modules/gui/macosx/embeddedwindow.m:50
-#: modules/gui/macosx/embeddedwindow.m:136 modules/gui/macosx/intf.m:611
-#: modules/gui/macosx/intf.m:654 modules/gui/macosx/intf.m:733
-#: modules/gui/macosx/intf.m:740 modules/gui/macosx/intf.m:1633
-#: modules/gui/macosx/intf.m:1634 modules/gui/macosx/intf.m:1635
-#: modules/gui/macosx/intf.m:1636 modules/gui/macosx/playlist.m:436
+#: modules/gui/macosx/embeddedwindow.m:136 modules/gui/macosx/intf.m:641
+#: modules/gui/macosx/intf.m:684 modules/gui/macosx/intf.m:763
+#: modules/gui/macosx/intf.m:770 modules/gui/macosx/intf.m:1679
+#: modules/gui/macosx/intf.m:1680 modules/gui/macosx/intf.m:1681
+#: modules/gui/macosx/intf.m:1682 modules/gui/macosx/playlist.m:438
 #: modules/gui/pda/pda_interface.c:260 modules/gui/pda/pda_interface.c:261
-#: modules/gui/qt4/components/interface_widgets.cpp:523
-#: modules/gui/qt4/menus.cpp:516 modules/gui/qt4/menus.cpp:520
+#: modules/gui/qt4/components/interface_widgets.cpp:552
+#: modules/gui/qt4/menus.cpp:505 modules/gui/qt4/menus.cpp:509
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:280
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:289
 #: modules/gui/wxwidgets/interface.cpp:694
 #: modules/gui/wxwidgets/interface.cpp:705
 #: modules/gui/wxwidgets/interface.cpp:1244
-#: modules/gui/wxwidgets/menus.cpp:270 modules/gui/wxwidgets/menus.cpp:281
+#: modules/gui/wxwidgets/menus.cpp:260 modules/gui/wxwidgets/menus.cpp:271
 msgid "Play"
 msgstr ""
 
@@ -516,11 +516,11 @@ msgstr ""
 msgid "Fetch information"
 msgstr ""
 
-#: include/vlc_intf_strings.h:54 modules/gui/macosx/playlist.m:437
+#: include/vlc_intf_strings.h:54 modules/gui/macosx/playlist.m:439
 #: modules/gui/pda/pda_interface.c:1252
 #: modules/gui/qt4/dialogs/bookmarks.cpp:45
 #: modules/gui/qt4/ui/podcast_configuration.ui:59
-#: modules/gui/qt4/ui/streampanel.ui:50
+#: modules/gui/qt4/ui/streampanel.ui:41
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:284
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:291
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:106
@@ -536,7 +536,7 @@ msgid "Sort"
 msgstr ""
 
 #: include/vlc_intf_strings.h:57
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:1577
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1580
 msgid "Add node"
 msgstr ""
 
@@ -552,7 +552,7 @@ msgstr ""
 msgid "Open Folder..."
 msgstr ""
 
-#: include/vlc_intf_strings.h:64 src/libvlc-module.c:1106
+#: include/vlc_intf_strings.h:64 src/libvlc-module.c:1102
 msgid "Repeat all"
 msgstr ""
 
@@ -564,8 +564,8 @@ msgstr ""
 msgid "No repeat"
 msgstr ""
 
-#: include/vlc_intf_strings.h:68 src/libvlc-module.c:1305
-#: modules/gui/macosx/controls.m:920 modules/gui/macosx/intf.m:660
+#: include/vlc_intf_strings.h:68 src/libvlc-module.c:1307
+#: modules/gui/macosx/controls.m:919 modules/gui/macosx/intf.m:690
 msgid "Random"
 msgstr ""
 
@@ -621,7 +621,7 @@ msgid ""
 "them."
 msgstr ""
 
-#: include/vlc_intf_strings.h:93 modules/gui/macosx/extended.m:83
+#: include/vlc_intf_strings.h:93 modules/gui/macosx/extended.m:82
 #: modules/gui/wxwidgets/extrapanel.cpp:151
 msgid "Image clone"
 msgstr ""
@@ -630,7 +630,7 @@ msgstr ""
 msgid "Clone the image"
 msgstr ""
 
-#: include/vlc_intf_strings.h:96 modules/gui/qt4/ui/video_effects.ui:404
+#: include/vlc_intf_strings.h:96 modules/gui/qt4/ui/video_effects.ui:332
 msgid "Magnification"
 msgstr ""
 
@@ -640,7 +640,7 @@ msgid ""
 "be magnified."
 msgstr ""
 
-#: include/vlc_intf_strings.h:100 modules/gui/qt4/ui/video_effects.ui:536
+#: include/vlc_intf_strings.h:100 modules/gui/qt4/ui/video_effects.ui:446
 msgid "Waves"
 msgstr ""
 
@@ -709,7 +709,7 @@ msgid ""
 "b> VLC media player.</p></body></html>"
 msgstr ""
 
-#: include/vlc_meta.h:167 modules/gui/macosx/playlist.m:1088
+#: include/vlc_meta.h:167 modules/gui/macosx/playlist.m:1090
 msgid "Meta-information"
 msgstr ""
 
@@ -733,8 +733,8 @@ msgid "The maximum number of filters (%d) was reached."
 msgstr ""
 
 #: src/audio_output/input.c:94 src/audio_output/input.c:138
-#: src/input/es_out.c:453 src/libvlc-module.c:546
-#: src/video_output/video_output.c:416 modules/codec/ffmpeg/postprocess.c:96
+#: src/input/es_out.c:453 src/libvlc-module.c:542
+#: src/video_output/video_output.c:416 modules/codec/ffmpeg/postprocess.c:98
 msgid "Disable"
 msgstr ""
 
@@ -757,7 +757,7 @@ msgid "Equalizer"
 msgstr ""
 
 #: src/audio_output/input.c:157 src/libvlc-module.c:276
-#: modules/gui/macosx/extended.m:71 modules/gui/wxwidgets/extrapanel.cpp:394
+#: modules/gui/macosx/extended.m:70 modules/gui/wxwidgets/extrapanel.cpp:394
 msgid "Audio filters"
 msgstr ""
 
@@ -766,8 +766,8 @@ msgid "Replay gain"
 msgstr ""
 
 #: src/audio_output/output.c:102 src/audio_output/output.c:129
-#: modules/access/vcdx/info.c:122 modules/gui/macosx/intf.m:679
-#: modules/gui/macosx/intf.m:680
+#: modules/access/vcdx/info.c:122 modules/gui/macosx/intf.m:709
+#: modules/gui/macosx/intf.m:710
 msgid "Audio Channels"
 msgstr ""
 
@@ -777,29 +777,29 @@ msgstr ""
 #: modules/audio_output/alsa.c:225 modules/audio_output/directx.c:466
 #: modules/audio_output/oss.c:205 modules/audio_output/portaudio.c:410
 #: modules/audio_output/sdl.c:183 modules/audio_output/sdl.c:200
-#: modules/audio_output/waveout.c:421 modules/codec/twolame.c:70
+#: modules/audio_output/waveout.c:520 modules/codec/twolame.c:70
 msgid "Stereo"
 msgstr ""
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:143
 #: src/libvlc-module.c:361 src/libvlc-module.c:404
-#: modules/audio_filter/channel_mixer/mono.c:101 modules/codec/dvbsub.c:74
+#: modules/audio_filter/channel_mixer/mono.c:100 modules/codec/dvbsub.c:74
 #: modules/codec/subtitles/subsdec.c:99 modules/codec/zvbi.c:98
 #: modules/control/gestures.c:91 modules/gui/fbosd.c:167
-#: modules/gui/qt4/ui/video_effects.ui:704
-#: modules/gui/qt4/ui/video_effects.ui:902 modules/video_filter/logo.c:99
-#: modules/video_filter/marq.c:128 modules/video_filter/mosaic.c:174
+#: modules/gui/qt4/ui/video_effects.ui:590
+#: modules/gui/qt4/ui/video_effects.ui:758 modules/video_filter/logo.c:99
+#: modules/video_filter/marq.c:133 modules/video_filter/mosaic.c:171
 #: modules/video_filter/osdmenu.c:84 modules/video_filter/rss.c:166
 msgid "Left"
 msgstr ""
 
 #: src/audio_output/output.c:109 src/audio_output/output.c:145
 #: src/libvlc-module.c:361 src/libvlc-module.c:404
-#: modules/audio_filter/channel_mixer/mono.c:101 modules/codec/dvbsub.c:74
+#: modules/audio_filter/channel_mixer/mono.c:100 modules/codec/dvbsub.c:74
 #: modules/codec/subtitles/subsdec.c:99 modules/codec/zvbi.c:98
 #: modules/control/gestures.c:91 modules/gui/fbosd.c:167
-#: modules/video_filter/logo.c:99 modules/video_filter/marq.c:128
-#: modules/video_filter/mosaic.c:174 modules/video_filter/osdmenu.c:84
+#: modules/video_filter/logo.c:99 modules/video_filter/marq.c:133
+#: modules/video_filter/mosaic.c:171 modules/video_filter/osdmenu.c:84
 #: modules/video_filter/rss.c:166
 msgid "Right"
 msgstr ""
@@ -812,44 +812,23 @@ msgstr ""
 msgid "Reverse stereo"
 msgstr ""
 
-#: src/config/chain.c:336 src/misc/variables.c:1115
-#, c-format
-msgid ""
-"playlist item is making use of the following unsafe option '%s', which may "
-"be harmful if used in a malicious way, authorize it ?"
-msgstr ""
-
-#: src/config/chain.c:337 src/misc/variables.c:1116
-msgid "WARNING: Unsafe Playlist"
-msgstr ""
-
-#: src/config/chain.c:337 src/misc/variables.c:1116
-#: modules/gui/macosx/update.m:111
-msgid "Yes"
-msgstr ""
-
-#: src/config/chain.c:337 src/misc/variables.c:1116
-#: modules/gui/macosx/update.m:111
-msgid "No"
-msgstr ""
-
-#: src/config/file.c:561
+#: src/config/file.c:558
 msgid "key"
 msgstr ""
 
-#: src/config/file.c:570
+#: src/config/file.c:567
 msgid "boolean"
 msgstr ""
 
-#: src/config/file.c:570 src/libvlc-common.c:1502
+#: src/config/file.c:567 src/libvlc-common.c:1500
 msgid "integer"
 msgstr ""
 
-#: src/config/file.c:579 src/libvlc-common.c:1529
+#: src/config/file.c:576 src/libvlc-common.c:1527
 msgid "float"
 msgstr ""
 
-#: src/config/file.c:602 src/libvlc-common.c:1483
+#: src/config/file.c:599 src/libvlc-common.c:1481
 msgid "string"
 msgstr ""
 
@@ -929,19 +908,19 @@ msgid ""
 "there is no way for you to fix this."
 msgstr ""
 
-#: src/input/decoder.c:163 src/input/decoder.c:175 src/input/decoder.c:377
-#: modules/codec/ffmpeg/encoder.c:219 modules/codec/ffmpeg/encoder.c:227
-#: modules/codec/ffmpeg/encoder.c:239 modules/codec/ffmpeg/encoder.c:600
-#: modules/codec/ffmpeg/encoder.c:609 modules/stream_out/es.c:370
+#: src/input/decoder.c:164 src/input/decoder.c:176 src/input/decoder.c:378
+#: modules/codec/ffmpeg/encoder.c:221 modules/codec/ffmpeg/encoder.c:229
+#: modules/codec/ffmpeg/encoder.c:241 modules/codec/ffmpeg/encoder.c:615
+#: modules/codec/ffmpeg/encoder.c:624 modules/stream_out/es.c:370
 #: modules/stream_out/es.c:384
 msgid "Streaming / Transcoding failed"
 msgstr ""
 
-#: src/input/decoder.c:164
+#: src/input/decoder.c:165
 msgid "VLC could not open the packetizer module."
 msgstr ""
 
-#: src/input/decoder.c:176 src/input/decoder.c:378
+#: src/input/decoder.c:177 src/input/decoder.c:379
 msgid "VLC could not open the decoder module."
 msgstr ""
 
@@ -958,8 +937,8 @@ msgid "%s [%s %d]"
 msgstr ""
 
 #: src/input/es_out.c:665 src/input/es_out.c:667 src/input/var.c:132
-#: src/libvlc-module.c:579 modules/gui/macosx/intf.m:666
-#: modules/gui/macosx/intf.m:667
+#: src/libvlc-module.c:575 modules/gui/macosx/intf.m:696
+#: modules/gui/macosx/intf.m:697
 msgid "Program"
 msgstr ""
 
@@ -979,7 +958,7 @@ msgstr ""
 msgid "Closed captions 4"
 msgstr ""
 
-#: src/input/es_out.c:2036 modules/codec/faad.c:360
+#: src/input/es_out.c:2036 modules/codec/faad.c:359
 #, c-format
 msgid "Stream %d"
 msgstr ""
@@ -993,22 +972,22 @@ msgstr ""
 
 #: src/input/es_out.c:2041 src/input/meta.c:58 src/libvlc-module.c:168
 #: modules/gui/beos/InterfaceWindow.cpp:280
-#: modules/gui/qt4/ui/sprefs_interface.ui:19
+#: modules/gui/qt4/ui/sprefs_interface.ui:25
 msgid "Language"
 msgstr ""
 
 #: src/input/es_out.c:2049 src/input/es_out.c:2077 src/input/es_out.c:2104
-#: modules/gui/macosx/output.m:153 modules/gui/qt4/ui/sprefs_audio.ui:114
+#: modules/gui/macosx/output.m:153 modules/gui/qt4/ui/sprefs_audio.ui:164
 msgid "Type"
 msgstr ""
 
-#: src/input/es_out.c:2052 modules/codec/faad.c:364
+#: src/input/es_out.c:2052 modules/codec/faad.c:363
 #: modules/gui/macosx/output.m:176 modules/gui/qt4/ui/sout.ui:690
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:857
 msgid "Channels"
 msgstr ""
 
-#: src/input/es_out.c:2057 modules/codec/faad.c:366
+#: src/input/es_out.c:2057 modules/codec/faad.c:365
 msgid "Sample rate"
 msgstr ""
 
@@ -1022,7 +1001,7 @@ msgid "Bits per sample"
 msgstr ""
 
 #: src/input/es_out.c:2069 modules/access_output/shout.c:90
-#: modules/access/pvr.c:96 modules/gui/qt4/components/open_panels.cpp:704
+#: modules/access/pvr.c:96 modules/gui/qt4/components/open_panels.cpp:809
 msgid "Bitrate"
 msgstr ""
 
@@ -1047,36 +1026,36 @@ msgstr ""
 msgid "Subtitle"
 msgstr ""
 
-#: src/input/input.c:2320
+#: src/input/input.c:2310
 msgid "Your input can't be opened"
 msgstr ""
 
-#: src/input/input.c:2321
+#: src/input/input.c:2311
 #, c-format
 msgid "VLC is unable to open the MRL '%s'. Check the log for details."
 msgstr ""
 
-#: src/input/input.c:2420
+#: src/input/input.c:2409
 msgid "VLC can't recognize the input's format"
 msgstr ""
 
-#: src/input/input.c:2421
+#: src/input/input.c:2410
 #, c-format
 msgid "The format of '%s' cannot be detected. Have a look the log for details."
 msgstr ""
 
 #: src/input/meta.c:47 src/input/var.c:143
-#: modules/gui/beos/MediaControlView.cpp:1237 modules/gui/macosx/intf.m:668
-#: modules/gui/macosx/intf.m:669 modules/gui/macosx/open.m:170
+#: modules/gui/beos/MediaControlView.cpp:1237 modules/gui/macosx/intf.m:698
+#: modules/gui/macosx/intf.m:699 modules/gui/macosx/open.m:170
 #: modules/gui/macosx/playlistinfo.m:57 modules/gui/macosx/wizard.m:348
-#: modules/gui/qt4/components/open_panels.cpp:297
-#: modules/gui/qt4/ui/open_disk.ui:184
+#: modules/gui/qt4/components/open_panels.cpp:298
+#: modules/gui/qt4/ui/open_disk.ui:191
 #: modules/gui/wxwidgets/dialogs/open.cpp:761
 #: modules/gui/wxwidgets/dialogs/open.cpp:1662 modules/mux/asf.c:51
 msgid "Title"
 msgstr ""
 
-#: src/input/meta.c:48 modules/gui/macosx/playlist.m:1088
+#: src/input/meta.c:48 modules/gui/macosx/playlist.m:1090
 msgid "Artist"
 msgstr ""
 
@@ -1096,7 +1075,7 @@ msgstr ""
 msgid "Track number"
 msgstr ""
 
-#: src/input/meta.c:53 modules/gui/macosx/bookmarks.m:97
+#: src/input/meta.c:53 modules/gui/macosx/bookmarks.m:96
 #: modules/gui/qt4/dialogs/bookmarks.cpp:57
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:195
 msgid "Description"
@@ -1120,7 +1099,7 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: src/input/meta.c:59 modules/misc/notify/notify.c:281
+#: src/input/meta.c:59 modules/misc/notify/notify.c:290
 msgid "Now Playing"
 msgstr ""
 
@@ -1144,13 +1123,13 @@ msgstr ""
 msgid "Bookmark"
 msgstr ""
 
-#: src/input/var.c:138 src/libvlc-module.c:585
+#: src/input/var.c:138 src/libvlc-module.c:581
 msgid "Programs"
 msgstr ""
 
 #: src/input/var.c:149 modules/gui/beos/MediaControlView.cpp:1238
-#: modules/gui/macosx/intf.m:670 modules/gui/macosx/intf.m:671
-#: modules/gui/macosx/open.m:171 modules/gui/qt4/ui/open_disk.ui:158
+#: modules/gui/macosx/intf.m:700 modules/gui/macosx/intf.m:701
+#: modules/gui/macosx/open.m:171 modules/gui/qt4/ui/open_disk.ui:165
 #: modules/gui/wxwidgets/dialogs/open.cpp:766
 msgid "Chapter"
 msgstr ""
@@ -1160,159 +1139,177 @@ msgstr ""
 msgid "Navigation"
 msgstr ""
 
-#: src/input/var.c:170 modules/gui/macosx/intf.m:694
-#: modules/gui/macosx/intf.m:695
+#: src/input/var.c:170 modules/gui/macosx/intf.m:724
+#: modules/gui/macosx/intf.m:725
 msgid "Video Track"
 msgstr ""
 
-#: src/input/var.c:176 modules/gui/macosx/intf.m:677
-#: modules/gui/macosx/intf.m:678
+#: src/input/var.c:176 modules/gui/macosx/intf.m:707
+#: modules/gui/macosx/intf.m:708
 msgid "Audio Track"
 msgstr ""
 
-#: src/input/var.c:182 modules/gui/macosx/intf.m:702
-#: modules/gui/macosx/intf.m:703
+#: src/input/var.c:182 modules/gui/macosx/intf.m:732
+#: modules/gui/macosx/intf.m:733
 msgid "Subtitles Track"
 msgstr ""
 
-#: src/input/var.c:264
+#: src/input/var.c:269
 msgid "Next title"
 msgstr ""
 
-#: src/input/var.c:269
+#: src/input/var.c:274
 msgid "Previous title"
 msgstr ""
 
-#: src/input/var.c:292
+#: src/input/var.c:297
 #, c-format
 msgid "Title %i"
 msgstr ""
 
-#: src/input/var.c:315 src/input/var.c:375
+#: src/input/var.c:320 src/input/var.c:380
 #, c-format
 msgid "Chapter %i"
 msgstr ""
 
-#: src/input/var.c:354 modules/gui/beos/InterfaceWindow.cpp:292
-#: modules/gui/qt4/components/interface_widgets.cpp:629
+#: src/input/var.c:359 modules/gui/beos/InterfaceWindow.cpp:292
+#: modules/gui/qt4/components/interface_widgets.cpp:663
 #: modules/gui/wxwidgets/input_manager.cpp:287
 msgid "Next chapter"
 msgstr ""
 
-#: src/input/var.c:359 modules/gui/beos/InterfaceWindow.cpp:291
-#: modules/gui/qt4/components/interface_widgets.cpp:628
+#: src/input/var.c:364 modules/gui/beos/InterfaceWindow.cpp:291
+#: modules/gui/qt4/components/interface_widgets.cpp:662
 #: modules/gui/wxwidgets/input_manager.cpp:286
 msgid "Previous chapter"
 msgstr ""
 
-#: src/input/vlm.c:2286 src/input/vlm.c:2627
+#: src/input/vlm.c:2283 src/input/vlm.c:2624
 #, c-format
 msgid "Media: %s"
 msgstr ""
 
 #: src/interface/interaction.c:270 src/interface/interaction.c:368
-#: modules/demux/avi/avi.c:596 modules/gui/beos/InterfaceWindow.cpp:161
-#: modules/gui/macosx/bookmarks.m:105 modules/gui/macosx/controls.m:58
+#: modules/demux/avi/avi.c:671 modules/gui/beos/InterfaceWindow.cpp:161
+#: modules/gui/macosx/bookmarks.m:104 modules/gui/macosx/controls.m:58
 #: modules/gui/macosx/interaction.m:128 modules/gui/macosx/interaction.m:132
 #: modules/gui/macosx/interaction.m:135 modules/gui/macosx/open.m:160
 #: modules/gui/macosx/playlistinfo.m:60 modules/gui/macosx/prefs.m:123
-#: modules/gui/macosx/prefs.m:143 modules/gui/macosx/wizard.m:320
-#: modules/gui/qt4/components/open_panels.cpp:1090
-#: modules/gui/qt4/components/preferences_widgets.cpp:1186
+#: modules/gui/macosx/prefs.m:143 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/macosx/wizard.m:320
+#: modules/gui/qt4/components/open_panels.cpp:1101
+#: modules/gui/qt4/components/preferences_widgets.cpp:1283
 #: modules/gui/qt4/dialogs/podcast_configuration.cpp:38
 msgid "Cancel"
 msgstr ""
 
 #: src/interface/interaction.c:367
-#: modules/gui/qt4/components/open_panels.cpp:1089
-#: modules/gui/qt4/main_interface.cpp:524
+#: modules/gui/qt4/components/open_panels.cpp:1100
+#: modules/gui/qt4/main_interface.cpp:544
 msgid "Ok"
 msgstr ""
 
-#: src/interface/interface.c:227
-msgid "Switch interface"
-msgstr ""
-
-#: src/interface/interface.c:254 modules/gui/macosx/intf.m:629
-#: modules/gui/macosx/intf.m:630
+#: src/interface/interface.c:211 modules/gui/macosx/intf.m:659
+#: modules/gui/macosx/intf.m:660
 msgid "Add Interface"
 msgstr ""
 
-#: src/interface/interface.c:260
+#: src/interface/interface.c:217
 msgid "Telnet Interface"
 msgstr ""
 
-#: src/interface/interface.c:263
+#: src/interface/interface.c:220
 msgid "Web Interface"
 msgstr ""
 
-#: src/interface/interface.c:266
+#: src/interface/interface.c:223
 msgid "Debug logging"
 msgstr ""
 
-#: src/interface/interface.c:269
+#: src/interface/interface.c:226
 msgid "Mouse Gestures"
 msgstr ""
 
-#: src/libvlc-common.c:285 src/libvlc-common.c:420 src/modules/cache.c:192
+#: src/libvlc-common.c:280 src/libvlc-common.c:415 src/modules/cache.c:192
 #: src/modules/cache.c:505
 msgid "C"
 msgstr ""
 
-#: src/libvlc-common.c:1070
+#: src/libvlc-common.c:1064
 msgid ""
 "Running vlc with the default interface. Use 'cvlc' to use vlc without "
 "interface."
 msgstr ""
 
-#: src/libvlc-common.c:1542
+#: src/libvlc-common.c:1540
 msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc-common.c:1543
+#: src/libvlc-common.c:1541
 msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc-common.c:1700
+#: src/libvlc-common.c:1700 src/libvlc-common.c:1703
 msgid "Note:"
 msgstr ""
 
-#: src/libvlc-common.c:1701
+#: src/libvlc-common.c:1701 src/libvlc-common.c:1704
 msgid "add --advanced to your command line to see advanced options."
 msgstr ""
 
-#: src/libvlc-common.c:1804
+#: src/libvlc-common.c:1808
 #, c-format
 msgid "VLC version %s\n"
 msgstr ""
 
-#: src/libvlc-common.c:1805
+#: src/libvlc-common.c:1809
 #, c-format
 msgid "Compiled by %s@%s.%s\n"
 msgstr ""
 
-#: src/libvlc-common.c:1807
+#: src/libvlc-common.c:1811
 #, c-format
 msgid "Compiler: %s\n"
 msgstr ""
 
-#: src/libvlc-common.c:1809
+#: src/libvlc-common.c:1813
 #, c-format
-msgid "Based upon svn changeset [%s]\n"
+msgid "Based upon Git commit [%s]\n"
 msgstr ""
 
-#: src/libvlc-common.c:1840
+#: src/libvlc-common.c:1849
 msgid ""
 "\n"
 "Dumped content to vlc-help.txt file.\n"
 msgstr ""
 
-#: src/libvlc-common.c:1860
+#: src/libvlc-common.c:1869
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
 msgstr ""
 
+#: src/libvlc.h:140 src/libvlc-module.c:1310 src/libvlc-module.c:1311
+#: src/libvlc-module.c:2339 src/video_output/vout_intf.c:304
+msgid "Zoom"
+msgstr ""
+
+#: src/libvlc.h:141 src/libvlc-module.c:1236 src/video_output/vout_intf.c:202
+msgid "1:4 Quarter"
+msgstr ""
+
+#: src/libvlc.h:142 src/libvlc-module.c:1237 src/video_output/vout_intf.c:203
+msgid "1:2 Half"
+msgstr ""
+
+#: src/libvlc.h:143 src/libvlc-module.c:1238 src/video_output/vout_intf.c:204
+msgid "1:1 Original"
+msgstr ""
+
+#: src/libvlc.h:144 src/libvlc-module.c:1239 src/video_output/vout_intf.c:205
+msgid "2:1 Double"
+msgstr ""
+
 #: src/libvlc-module.c:83 src/libvlc-module.c:273 modules/access/bda/bda.c:62
 msgid "Auto"
 msgstr ""
@@ -1654,7 +1651,7 @@ msgid ""
 "played)."
 msgstr ""
 
-#: src/libvlc-module.c:260 modules/gui/qt4/ui/sprefs_audio.ui:62
+#: src/libvlc-module.c:260 modules/gui/qt4/ui/sprefs_audio.ui:99
 msgid "Use S/PDIF when available"
 msgstr ""
 
@@ -1664,7 +1661,7 @@ msgid ""
 "audio stream being played."
 msgstr ""
 
-#: src/libvlc-module.c:265 modules/gui/qt4/ui/sprefs_audio.ui:36
+#: src/libvlc-module.c:265 modules/gui/qt4/ui/sprefs_audio.ui:113
 msgid "Force detection of Dolby Surround"
 msgstr ""
 
@@ -1677,7 +1674,7 @@ msgid ""
 msgstr ""
 
 #: src/libvlc-module.c:273 modules/access/bda/bda.c:62
-#: modules/gui/qt4/components/interface_widgets.cpp:450
+#: modules/gui/qt4/components/interface_widgets.cpp:479
 msgid "On"
 msgstr ""
 
@@ -1732,8 +1729,8 @@ msgid "Protect against sound clipping"
 msgstr ""
 
 #: src/libvlc-module.c:305 modules/access/dshow/dshow.cpp:77
-#: modules/access/dshow/dshow.cpp:79 modules/codec/ffmpeg/ffmpeg.c:72
-#: modules/gui/qt4/components/interface_widgets.cpp:206
+#: modules/access/dshow/dshow.cpp:79 modules/codec/ffmpeg/ffmpeg.c:74
+#: modules/gui/qt4/components/interface_widgets.cpp:235
 #: modules/video_output/opengl.c:124 modules/video_output/opengl.c:180
 msgid "None"
 msgstr ""
@@ -1742,7 +1739,7 @@ msgstr ""
 #: modules/access/cdda/info.c:816 modules/access/cdda/info.c:858
 #: modules/access/vcdx/access.c:476 modules/access/vcdx/info.c:290
 #: modules/access/vcdx/info.c:291
-#: modules/gui/qt4/components/open_panels.cpp:321
+#: modules/gui/qt4/components/open_panels.cpp:322
 #: modules/gui/wxwidgets/dialogs/open.cpp:1709
 #: modules/gui/wxwidgets/dialogs/open.cpp:1727
 msgid "Track"
@@ -1844,59 +1841,59 @@ msgid ""
 msgstr ""
 
 #: src/libvlc-module.c:361 src/libvlc-module.c:404
-#: modules/audio_filter/channel_mixer/mono.c:101 modules/codec/dvbsub.c:74
+#: modules/audio_filter/channel_mixer/mono.c:100 modules/codec/dvbsub.c:74
 #: modules/codec/subtitles/subsdec.c:99 modules/codec/zvbi.c:98
 #: modules/gui/fbosd.c:167 modules/video_filter/logo.c:99
-#: modules/video_filter/marq.c:128 modules/video_filter/mosaic.c:174
+#: modules/video_filter/marq.c:133 modules/video_filter/mosaic.c:171
 #: modules/video_filter/osdmenu.c:84 modules/video_filter/rss.c:166
 msgid "Center"
 msgstr ""
 
 #: src/libvlc-module.c:361 src/libvlc-module.c:404 modules/codec/dvbsub.c:74
 #: modules/codec/zvbi.c:98 modules/gui/fbosd.c:167
-#: modules/gui/qt4/ui/video_effects.ui:697
-#: modules/gui/qt4/ui/video_effects.ui:909 modules/video_filter/logo.c:99
-#: modules/video_filter/marq.c:128 modules/video_filter/mosaic.c:174
+#: modules/gui/qt4/ui/video_effects.ui:583
+#: modules/gui/qt4/ui/video_effects.ui:765 modules/video_filter/logo.c:99
+#: modules/video_filter/marq.c:133 modules/video_filter/mosaic.c:171
 #: modules/video_filter/osdmenu.c:84 modules/video_filter/rss.c:166
 msgid "Top"
 msgstr ""
 
 #: src/libvlc-module.c:361 src/libvlc-module.c:404 modules/codec/dvbsub.c:74
 #: modules/codec/zvbi.c:98 modules/gui/fbosd.c:167
-#: modules/video_filter/logo.c:99 modules/video_filter/marq.c:128
-#: modules/video_filter/mosaic.c:174 modules/video_filter/osdmenu.c:84
+#: modules/video_filter/logo.c:99 modules/video_filter/marq.c:133
+#: modules/video_filter/mosaic.c:171 modules/video_filter/osdmenu.c:84
 #: modules/video_filter/rss.c:166
 msgid "Bottom"
 msgstr ""
 
 #: src/libvlc-module.c:362 src/libvlc-module.c:405 modules/codec/dvbsub.c:75
 #: modules/codec/zvbi.c:99 modules/gui/fbosd.c:168
-#: modules/video_filter/logo.c:100 modules/video_filter/marq.c:129
-#: modules/video_filter/mosaic.c:175 modules/video_filter/osdmenu.c:85
+#: modules/video_filter/logo.c:100 modules/video_filter/marq.c:134
+#: modules/video_filter/mosaic.c:172 modules/video_filter/osdmenu.c:85
 #: modules/video_filter/rss.c:167
 msgid "Top-Left"
 msgstr ""
 
 #: src/libvlc-module.c:362 src/libvlc-module.c:405 modules/codec/dvbsub.c:75
 #: modules/codec/zvbi.c:99 modules/gui/fbosd.c:168
-#: modules/video_filter/logo.c:100 modules/video_filter/marq.c:129
-#: modules/video_filter/mosaic.c:175 modules/video_filter/osdmenu.c:85
+#: modules/video_filter/logo.c:100 modules/video_filter/marq.c:134
+#: modules/video_filter/mosaic.c:172 modules/video_filter/osdmenu.c:85
 #: modules/video_filter/rss.c:167
 msgid "Top-Right"
 msgstr ""
 
 #: src/libvlc-module.c:362 src/libvlc-module.c:405 modules/codec/dvbsub.c:75
 #: modules/codec/zvbi.c:99 modules/gui/fbosd.c:168
-#: modules/video_filter/logo.c:100 modules/video_filter/marq.c:129
-#: modules/video_filter/mosaic.c:175 modules/video_filter/osdmenu.c:85
+#: modules/video_filter/logo.c:100 modules/video_filter/marq.c:134
+#: modules/video_filter/mosaic.c:172 modules/video_filter/osdmenu.c:85
 #: modules/video_filter/rss.c:167
 msgid "Bottom-Left"
 msgstr ""
 
 #: src/libvlc-module.c:362 src/libvlc-module.c:405 modules/codec/dvbsub.c:75
 #: modules/codec/zvbi.c:99 modules/gui/fbosd.c:168
-#: modules/video_filter/logo.c:100 modules/video_filter/marq.c:129
-#: modules/video_filter/mosaic.c:175 modules/video_filter/osdmenu.c:85
+#: modules/video_filter/logo.c:100 modules/video_filter/marq.c:134
+#: modules/video_filter/mosaic.c:172 modules/video_filter/osdmenu.c:85
 #: modules/video_filter/rss.c:167
 msgid "Bottom-Right"
 msgstr ""
@@ -1945,7 +1942,7 @@ msgid ""
 "to render video directly). VLC will try to use it by default."
 msgstr ""
 
-#: src/libvlc-module.c:386 src/video_output/vout_intf.c:429
+#: src/libvlc-module.c:386 src/video_output/vout_intf.c:432
 #: modules/gui/qt4/ui/sprefs_video.ui:68
 msgid "Always on top"
 msgstr ""
@@ -2184,50 +2181,44 @@ msgid ""
 "channel."
 msgstr ""
 
-#: src/libvlc-module.c:525
-msgid ""
-"If you live in France, it is not allowed to workaround any Digital "
-"Restrictions Management measure."
-msgstr ""
-
-#: src/libvlc-module.c:528
+#: src/libvlc-module.c:524
 msgid "Clock reference average counter"
 msgstr ""
 
-#: src/libvlc-module.c:530
+#: src/libvlc-module.c:526
 msgid ""
 "When using the PVR input (or a very irregular source), you should set this "
 "to 10000."
 msgstr ""
 
-#: src/libvlc-module.c:533
+#: src/libvlc-module.c:529
 msgid "Clock synchronisation"
 msgstr ""
 
-#: src/libvlc-module.c:535
+#: src/libvlc-module.c:531
 msgid ""
 "It is possible to disable the input clock synchronisation for real-time "
 "sources. Use this if you experience jerky playback of network streams."
 msgstr ""
 
-#: src/libvlc-module.c:539 modules/control/netsync.c:81
+#: src/libvlc-module.c:535 modules/control/netsync.c:81
 msgid "Network synchronisation"
 msgstr ""
 
-#: src/libvlc-module.c:540
+#: src/libvlc-module.c:536
 msgid ""
 "This allows you to remotely synchronise clocks for server and client. The "
 "detailed settings are available in Advanced / Network Sync."
 msgstr ""
 
-#: src/libvlc-module.c:546 src/libvlc-module.c:1133
+#: src/libvlc-module.c:542 src/libvlc-module.c:1129
 #: src/video_output/vout_intf.c:213 src/video_output/vout_intf.c:231
 #: modules/access/dshow/dshow.cpp:77 modules/access/dshow/dshow.cpp:79
 #: modules/access/dshow/dshow.cpp:82 modules/access/dshow/dshow.cpp:88
 #: modules/access/v4l2/v4l2.c:245 modules/audio_output/alsa.c:104
 #: modules/gui/fbosd.c:174 modules/gui/macosx/prefs_widgets.m:1277
-#: modules/gui/macosx/sfilters.m:120 modules/gui/macosx/vout.m:203
-#: modules/gui/qt4/components/preferences_widgets.cpp:520
+#: modules/gui/macosx/sfilters.m:119 modules/gui/macosx/vout.m:203
+#: modules/gui/qt4/components/preferences_widgets.cpp:555
 #: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:269
 #: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:319
 #: modules/video_filter/marq.c:58 modules/video_filter/rss.c:65
@@ -2235,8 +2226,8 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: src/libvlc-module.c:546 modules/gui/macosx/equalizer.m:162
-#: modules/gui/macosx/extended.m:102 modules/gui/macosx/wizard.m:352
+#: src/libvlc-module.c:542 modules/gui/macosx/equalizer.m:162
+#: modules/gui/macosx/extended.m:101 modules/gui/macosx/wizard.m:352
 #: modules/gui/qt4/ui/equalizer.ui:36 modules/gui/qt4/ui/vlm.ui:67
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:620
 #: modules/gui/wxwidgets/extrapanel.cpp:220
@@ -2244,195 +2235,195 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
-#: src/libvlc-module.c:548 modules/misc/notify/growl.c:66
+#: src/libvlc-module.c:544 modules/misc/notify/growl_udp.c:65
 msgid "UDP port"
 msgstr ""
 
-#: src/libvlc-module.c:550
+#: src/libvlc-module.c:546
 msgid "This is the default port used for UDP streams. Default is 1234."
 msgstr ""
 
-#: src/libvlc-module.c:552
+#: src/libvlc-module.c:548
 msgid "MTU of the network interface"
 msgstr ""
 
-#: src/libvlc-module.c:554
+#: src/libvlc-module.c:550
 msgid ""
 "This is the maximum application-layer packet size that can be transmitted "
 "over the network (in bytes)."
 msgstr ""
 
-#: src/libvlc-module.c:559 modules/stream_out/rtp.c:113
+#: src/libvlc-module.c:555 modules/stream_out/rtp.c:113
 msgid "Hop limit (TTL)"
 msgstr ""
 
-#: src/libvlc-module.c:561
+#: src/libvlc-module.c:557
 msgid ""
 "This is the hop limit (also known as \"Time-To-Live\" or TTL) of the "
 "multicast packets sent by the stream output (-1 = use operating system built-"
 "in default)."
 msgstr ""
 
-#: src/libvlc-module.c:565
+#: src/libvlc-module.c:561
 msgid "Multicast output interface"
 msgstr ""
 
-#: src/libvlc-module.c:567
+#: src/libvlc-module.c:563
 msgid "Default multicast interface. This overrides the routing table."
 msgstr ""
 
-#: src/libvlc-module.c:569
+#: src/libvlc-module.c:565
 msgid "IPv4 multicast output interface address"
 msgstr ""
 
-#: src/libvlc-module.c:571
+#: src/libvlc-module.c:567
 msgid ""
 "IPv4 adress for the default multicast interface. This overrides the routing "
 "table."
 msgstr ""
 
-#: src/libvlc-module.c:574
+#: src/libvlc-module.c:570
 msgid "DiffServ Code Point"
 msgstr ""
 
-#: src/libvlc-module.c:575
+#: src/libvlc-module.c:571
 msgid ""
 "Differentiated Services Code Point for outgoing UDP streams (or IPv4 Type Of "
 "Service, or IPv6 Traffic Class). This is used for network Quality of Service."
 msgstr ""
 
-#: src/libvlc-module.c:581
+#: src/libvlc-module.c:577
 msgid ""
 "Choose the program to select by giving its Service ID. Only use this option "
 "if you want to read a multi-program stream (like DVB streams for example)."
 msgstr ""
 
-#: src/libvlc-module.c:587
+#: src/libvlc-module.c:583
 msgid ""
 "Choose the programs to select by giving a comma-separated list of Service "
 "IDs (SIDs). Only use this option if you want to read a multi-program stream "
 "(like DVB streams for example)."
 msgstr ""
 
-#: src/libvlc-module.c:593 modules/gui/qt4/ui/open_disk.ui:219
+#: src/libvlc-module.c:589 modules/gui/qt4/ui/open_disk.ui:226
 #: modules/gui/wxwidgets/dialogs/open.cpp:780
 msgid "Audio track"
 msgstr ""
 
-#: src/libvlc-module.c:595
+#: src/libvlc-module.c:591
 msgid "Stream number of the audio track to use (from 0 to n)."
 msgstr ""
 
-#: src/libvlc-module.c:598 modules/gui/qt4/ui/open_disk.ui:248
+#: src/libvlc-module.c:594 modules/gui/qt4/ui/open_disk.ui:255
 #: modules/gui/wxwidgets/dialogs/open.cpp:772
 msgid "Subtitles track"
 msgstr ""
 
-#: src/libvlc-module.c:600
+#: src/libvlc-module.c:596
 msgid "Stream number of the subtitle track to use (from 0 to n)."
 msgstr ""
 
-#: src/libvlc-module.c:603
+#: src/libvlc-module.c:599
 msgid "Audio language"
 msgstr ""
 
-#: src/libvlc-module.c:605
+#: src/libvlc-module.c:601
 msgid ""
 "Language of the audio track you want to use (comma separated, two or three "
 "letter country code)."
 msgstr ""
 
-#: src/libvlc-module.c:608
+#: src/libvlc-module.c:604
 msgid "Subtitle language"
 msgstr ""
 
-#: src/libvlc-module.c:610
+#: src/libvlc-module.c:606
 msgid ""
 "Language of the subtitle track you want to use (comma separated, two or tree "
 "letter country code)."
 msgstr ""
 
-#: src/libvlc-module.c:614
+#: src/libvlc-module.c:610
 msgid "Audio track ID"
 msgstr ""
 
-#: src/libvlc-module.c:616
+#: src/libvlc-module.c:612
 msgid "Stream ID of the audio track to use."
 msgstr ""
 
-#: src/libvlc-module.c:618
+#: src/libvlc-module.c:614
 msgid "Subtitles track ID"
 msgstr ""
 
-#: src/libvlc-module.c:620
+#: src/libvlc-module.c:616
 msgid "Stream ID of the subtitle track to use."
 msgstr ""
 
-#: src/libvlc-module.c:622
+#: src/libvlc-module.c:618
 msgid "Input repetitions"
 msgstr ""
 
-#: src/libvlc-module.c:624
+#: src/libvlc-module.c:620
 msgid "Number of time the same input will be repeated"
 msgstr ""
 
-#: src/libvlc-module.c:626
+#: src/libvlc-module.c:622
 msgid "Start time"
 msgstr ""
 
-#: src/libvlc-module.c:628
+#: src/libvlc-module.c:624
 msgid "The stream will start at this position (in seconds)."
 msgstr ""
 
-#: src/libvlc-module.c:630
+#: src/libvlc-module.c:626
 msgid "Stop time"
 msgstr ""
 
-#: src/libvlc-module.c:632
+#: src/libvlc-module.c:628
 msgid "The stream will stop at this position (in seconds)."
 msgstr ""
 
-#: src/libvlc-module.c:634
+#: src/libvlc-module.c:630
 msgid "Run time"
 msgstr ""
 
-#: src/libvlc-module.c:636
+#: src/libvlc-module.c:632
 msgid "The stream will run this duration (in seconds)."
 msgstr ""
 
-#: src/libvlc-module.c:638
+#: src/libvlc-module.c:634
 msgid "Input list"
 msgstr ""
 
-#: src/libvlc-module.c:640
+#: src/libvlc-module.c:636
 msgid ""
 "You can give a comma-separated list of inputs that will be concatenated "
 "together after the normal one."
 msgstr ""
 
-#: src/libvlc-module.c:643
+#: src/libvlc-module.c:639
 msgid "Input slave (experimental)"
 msgstr ""
 
-#: src/libvlc-module.c:645
+#: src/libvlc-module.c:641
 msgid ""
 "This allows you to play from several inputs at the same time. This feature "
 "is experimental, not all formats are supported. Use a '#' separated list of "
 "inputs."
 msgstr ""
 
-#: src/libvlc-module.c:649
+#: src/libvlc-module.c:645
 msgid "Bookmarks list for a stream"
 msgstr ""
 
-#: src/libvlc-module.c:651
+#: src/libvlc-module.c:647
 msgid ""
 "You can manually give a list of bookmarks for a stream in the form "
 "\"{name=bookmark-name,time=optional-time-offset,bytes=optional-byte-offset},"
 "{...}\""
 msgstr ""
 
-#: src/libvlc-module.c:657
+#: src/libvlc-module.c:653
 msgid ""
 "These options allow you to modify the behavior of the subpictures subsystem. "
 "You can for example enable subpictures filters (logo, etc.). Enable these "
@@ -2440,71 +2431,71 @@ msgid ""
 "section. You can also set many miscellaneous subpictures options."
 msgstr ""
 
-#: src/libvlc-module.c:663
+#: src/libvlc-module.c:659
 msgid "Force subtitle position"
 msgstr ""
 
-#: src/libvlc-module.c:665
+#: src/libvlc-module.c:661
 msgid ""
 "You can use this option to place the subtitles under the movie, instead of "
 "over the movie. Try several positions."
 msgstr ""
 
-#: src/libvlc-module.c:668
+#: src/libvlc-module.c:664
 msgid "Enable sub-pictures"
 msgstr ""
 
-#: src/libvlc-module.c:670
+#: src/libvlc-module.c:666
 msgid "You can completely disable the sub-picture processing."
 msgstr ""
 
-#: src/libvlc-module.c:672 src/libvlc-module.c:1553 src/text/iso-639_def.h:143
-#: modules/gui/qt4/ui/sprefs_subtitles.ui:25
+#: src/libvlc-module.c:668 src/libvlc-module.c:1558 src/text/iso-639_def.h:143
+#: modules/gui/qt4/ui/sprefs_subtitles.ui:22
 #: modules/stream_out/transcode.c:285
 msgid "On Screen Display"
 msgstr ""
 
-#: src/libvlc-module.c:674
+#: src/libvlc-module.c:670
 msgid ""
 "VLC can display messages on the video. This is called OSD (On Screen "
 "Display)."
 msgstr ""
 
-#: src/libvlc-module.c:677
+#: src/libvlc-module.c:673
 msgid "Text rendering module"
 msgstr ""
 
-#: src/libvlc-module.c:679
+#: src/libvlc-module.c:675
 msgid ""
 "VLC normally uses Freetype for rendering, but this allows you to use svg for "
 "instance."
 msgstr ""
 
-#: src/libvlc-module.c:681
+#: src/libvlc-module.c:677
 msgid "Subpictures filter module"
 msgstr ""
 
-#: src/libvlc-module.c:683
+#: src/libvlc-module.c:679
 msgid ""
 "This adds so-called \"subpicture filters\". These filters overlay some "
 "images or text over the video (like a logo, arbitrary text...)."
 msgstr ""
 
-#: src/libvlc-module.c:686
+#: src/libvlc-module.c:682
 msgid "Autodetect subtitle files"
 msgstr ""
 
-#: src/libvlc-module.c:688
+#: src/libvlc-module.c:684
 msgid ""
 "Automatically detect a subtitle file, if no subtitle filename is specified "
 "(based on the filename of the movie)."
 msgstr ""
 
-#: src/libvlc-module.c:691
+#: src/libvlc-module.c:687
 msgid "Subtitle autodetection fuzziness"
 msgstr ""
 
-#: src/libvlc-module.c:693
+#: src/libvlc-module.c:689
 msgid ""
 "This determines how fuzzy subtitle and movie filename matching will be. "
 "Options are:\n"
@@ -2515,467 +2506,467 @@ msgid ""
 "4 = subtitle file matching the movie name exactly"
 msgstr ""
 
-#: src/libvlc-module.c:701
+#: src/libvlc-module.c:697
 msgid "Subtitle autodetection paths"
 msgstr ""
 
-#: src/libvlc-module.c:703
+#: src/libvlc-module.c:699
 msgid ""
 "Look for a subtitle file in those paths too, if your subtitle file was not "
 "found in the current directory."
 msgstr ""
 
-#: src/libvlc-module.c:706
+#: src/libvlc-module.c:702
 msgid "Use subtitle file"
 msgstr ""
 
-#: src/libvlc-module.c:708
+#: src/libvlc-module.c:704
 msgid ""
 "Load this subtitle file. To be used when autodetect cannot detect your "
 "subtitle file."
 msgstr ""
 
-#: src/libvlc-module.c:711
+#: src/libvlc-module.c:707
 msgid "DVD device"
 msgstr ""
 
-#: src/libvlc-module.c:714
+#: src/libvlc-module.c:710
 msgid ""
 "This is the default DVD drive (or file) to use. Don't forget the colon after "
 "the drive letter (eg. D:)"
 msgstr ""
 
-#: src/libvlc-module.c:718
+#: src/libvlc-module.c:714
 msgid "This is the default DVD device to use."
 msgstr ""
 
-#: src/libvlc-module.c:721
+#: src/libvlc-module.c:717
 msgid "VCD device"
 msgstr ""
 
-#: src/libvlc-module.c:724
+#: src/libvlc-module.c:720
 msgid ""
 "This is the default VCD device to use. If you don't specify anything, we'll "
 "scan for a suitable CD-ROM device."
 msgstr ""
 
-#: src/libvlc-module.c:728
+#: src/libvlc-module.c:724
 msgid "This is the default VCD device to use."
 msgstr ""
 
-#: src/libvlc-module.c:731
+#: src/libvlc-module.c:727
 msgid "Audio CD device"
 msgstr ""
 
-#: src/libvlc-module.c:734
+#: src/libvlc-module.c:730
 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."
 msgstr ""
 
-#: src/libvlc-module.c:738
+#: src/libvlc-module.c:734
 msgid "This is the default Audio CD device to use."
 msgstr ""
 
-#: src/libvlc-module.c:741 modules/gui/qt4/ui/open_net.ui:127
+#: src/libvlc-module.c:737 modules/gui/qt4/ui/open_net.ui:127
 #: modules/gui/wxwidgets/dialogs/open.cpp:842
 msgid "Force IPv6"
 msgstr ""
 
-#: src/libvlc-module.c:743
+#: src/libvlc-module.c:739
 msgid "IPv6 will be used by default for all connections."
 msgstr ""
 
-#: src/libvlc-module.c:745
+#: src/libvlc-module.c:741
 msgid "Force IPv4"
 msgstr ""
 
-#: src/libvlc-module.c:747
+#: src/libvlc-module.c:743
 msgid "IPv4 will be used by default for all connections."
 msgstr ""
 
-#: src/libvlc-module.c:749
+#: src/libvlc-module.c:745
 msgid "TCP connection timeout"
 msgstr ""
 
-#: src/libvlc-module.c:751
+#: src/libvlc-module.c:747
 msgid "Default TCP connection timeout (in milliseconds). "
 msgstr ""
 
-#: src/libvlc-module.c:753
+#: src/libvlc-module.c:749
 msgid "SOCKS server"
 msgstr ""
 
-#: src/libvlc-module.c:755
+#: src/libvlc-module.c:751
 msgid ""
 "SOCKS proxy server to use. This must be of the form address:port. It will be "
 "used for all TCP connections"
 msgstr ""
 
-#: src/libvlc-module.c:758
+#: src/libvlc-module.c:754
 msgid "SOCKS user name"
 msgstr ""
 
-#: src/libvlc-module.c:760
+#: src/libvlc-module.c:756
 msgid "User name to be used for connection to the SOCKS proxy."
 msgstr ""
 
-#: src/libvlc-module.c:762
+#: src/libvlc-module.c:758
 msgid "SOCKS password"
 msgstr ""
 
-#: src/libvlc-module.c:764
+#: src/libvlc-module.c:760
 msgid "Password to be used for connection to the SOCKS proxy."
 msgstr ""
 
-#: src/libvlc-module.c:766
+#: src/libvlc-module.c:762
 msgid "Title metadata"
 msgstr ""
 
-#: src/libvlc-module.c:768
+#: src/libvlc-module.c:764
 msgid "Allows you to specify a \"title\" metadata for an input."
 msgstr ""
 
-#: src/libvlc-module.c:770
+#: src/libvlc-module.c:766
 msgid "Author metadata"
 msgstr ""
 
-#: src/libvlc-module.c:772
+#: src/libvlc-module.c:768
 msgid "Allows you to specify an \"author\" metadata for an input."
 msgstr ""
 
-#: src/libvlc-module.c:774
+#: src/libvlc-module.c:770
 msgid "Artist metadata"
 msgstr ""
 
-#: src/libvlc-module.c:776
+#: src/libvlc-module.c:772
 msgid "Allows you to specify an \"artist\" metadata for an input."
 msgstr ""
 
-#: src/libvlc-module.c:778
+#: src/libvlc-module.c:774
 msgid "Genre metadata"
 msgstr ""
 
-#: src/libvlc-module.c:780
+#: src/libvlc-module.c:776
 msgid "Allows you to specify a \"genre\" metadata for an input."
 msgstr ""
 
-#: src/libvlc-module.c:782
+#: src/libvlc-module.c:778
 msgid "Copyright metadata"
 msgstr ""
 
-#: src/libvlc-module.c:784
+#: src/libvlc-module.c:780
 msgid "Allows you to specify a \"copyright\" metadata for an input."
 msgstr ""
 
-#: src/libvlc-module.c:786
+#: src/libvlc-module.c:782
 msgid "Description metadata"
 msgstr ""
 
-#: src/libvlc-module.c:788
+#: src/libvlc-module.c:784
 msgid "Allows you to specify a \"description\" metadata for an input."
 msgstr ""
 
-#: src/libvlc-module.c:790
+#: src/libvlc-module.c:786
 msgid "Date metadata"
 msgstr ""
 
-#: src/libvlc-module.c:792
+#: src/libvlc-module.c:788
 msgid "Allows you to specify a \"date\" metadata for an input."
 msgstr ""
 
-#: src/libvlc-module.c:794
+#: src/libvlc-module.c:790
 msgid "URL metadata"
 msgstr ""
 
-#: src/libvlc-module.c:796
+#: src/libvlc-module.c:792
 msgid "Allows you to specify a \"url\" metadata for an input."
 msgstr ""
 
-#: src/libvlc-module.c:800
+#: src/libvlc-module.c:796
 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 "
 "can break playback of all your streams."
 msgstr ""
 
-#: src/libvlc-module.c:804
+#: src/libvlc-module.c:800
 msgid "Preferred decoders list"
 msgstr ""
 
-#: src/libvlc-module.c:806
+#: src/libvlc-module.c:802
 msgid ""
 "List of codecs that VLC will use in priority. For instance, 'dummy,a52' will "
 "try the dummy and a52 codecs before trying the other ones. Only advanced "
 "users should alter this option as it can break playback of all your streams."
 msgstr ""
 
-#: src/libvlc-module.c:811
+#: src/libvlc-module.c:807
 msgid "Preferred encoders list"
 msgstr ""
 
-#: src/libvlc-module.c:813
+#: src/libvlc-module.c:809
 msgid ""
 "This allows you to select a list of encoders that VLC will use in priority."
 msgstr ""
 
-#: src/libvlc-module.c:816
+#: src/libvlc-module.c:812
 msgid "Prefer system plugins over vlc"
 msgstr ""
 
-#: src/libvlc-module.c:818
+#: src/libvlc-module.c:814
 msgid ""
 "Indicates whether VLC will prefer native plugins installed on system over "
 "VLC owns plugins whenever a choice is available."
 msgstr ""
 
-#: src/libvlc-module.c:827
+#: src/libvlc-module.c:823
 msgid ""
 "These options allow you to set default global options for the stream output "
 "subsystem."
 msgstr ""
 
-#: src/libvlc-module.c:830
+#: src/libvlc-module.c:826
 msgid "Default stream output chain"
 msgstr ""
 
-#: src/libvlc-module.c:832
+#: src/libvlc-module.c:828
 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-module.c:836
+#: src/libvlc-module.c:832
 msgid "Enable streaming of all ES"
 msgstr ""
 
-#: src/libvlc-module.c:838
+#: src/libvlc-module.c:834
 msgid "Stream all elementary streams (video, audio and subtitles)"
 msgstr ""
 
-#: src/libvlc-module.c:840
+#: src/libvlc-module.c:836
 msgid "Display while streaming"
 msgstr ""
 
-#: src/libvlc-module.c:842
+#: src/libvlc-module.c:838
 msgid "Play locally the stream while streaming it."
 msgstr ""
 
-#: src/libvlc-module.c:844
+#: src/libvlc-module.c:840
 msgid "Enable video stream output"
 msgstr ""
 
-#: src/libvlc-module.c:846
+#: src/libvlc-module.c:842
 msgid ""
 "Choose whether the video stream should be redirected to the stream output "
 "facility when this last one is enabled."
 msgstr ""
 
-#: src/libvlc-module.c:849
+#: src/libvlc-module.c:845
 msgid "Enable audio stream output"
 msgstr ""
 
-#: src/libvlc-module.c:851
+#: src/libvlc-module.c:847
 msgid ""
 "Choose whether the audio stream should be redirected to the stream output "
 "facility when this last one is enabled."
 msgstr ""
 
-#: src/libvlc-module.c:854
+#: src/libvlc-module.c:850
 msgid "Enable SPU stream output"
 msgstr ""
 
-#: src/libvlc-module.c:856
+#: src/libvlc-module.c:852
 msgid ""
 "Choose whether the SPU streams should be redirected to the stream output "
 "facility when this last one is enabled."
 msgstr ""
 
-#: src/libvlc-module.c:859
+#: src/libvlc-module.c:855
 msgid "Keep stream output open"
 msgstr ""
 
-#: src/libvlc-module.c:861
+#: src/libvlc-module.c:857
 msgid ""
 "This allows you to keep an unique stream output instance across multiple "
 "playlist item (automatically insert the gather stream output if not "
 "specified)"
 msgstr ""
 
-#: src/libvlc-module.c:865
+#: src/libvlc-module.c:861
 msgid "Stream output muxer caching (ms)"
 msgstr ""
 
-#: src/libvlc-module.c:867
+#: src/libvlc-module.c:863
 msgid ""
 "This allow you to configure the initial caching amount for stream output  "
 "muxer. This value should be set in milliseconds."
 msgstr ""
 
-#: src/libvlc-module.c:870
+#: src/libvlc-module.c:866
 msgid "Preferred packetizer list"
 msgstr ""
 
-#: src/libvlc-module.c:872
+#: src/libvlc-module.c:868
 msgid ""
 "This allows you to select the order in which VLC will choose its packetizers."
 msgstr ""
 
-#: src/libvlc-module.c:875
+#: src/libvlc-module.c:871
 msgid "Mux module"
 msgstr ""
 
-#: src/libvlc-module.c:877
+#: src/libvlc-module.c:873
 msgid "This is a legacy entry to let you configure mux modules"
 msgstr ""
 
-#: src/libvlc-module.c:879
+#: src/libvlc-module.c:875
 msgid "Access output module"
 msgstr ""
 
-#: src/libvlc-module.c:881
+#: src/libvlc-module.c:877
 msgid "This is a legacy entry to let you configure access output modules"
 msgstr ""
 
-#: src/libvlc-module.c:883
+#: src/libvlc-module.c:879
 msgid "Control SAP flow"
 msgstr ""
 
-#: src/libvlc-module.c:885
+#: src/libvlc-module.c:881
 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."
 msgstr ""
 
-#: src/libvlc-module.c:889
+#: src/libvlc-module.c:885
 msgid "SAP announcement interval"
 msgstr ""
 
-#: src/libvlc-module.c:891
+#: src/libvlc-module.c:887
 msgid ""
 "When the SAP flow control is disabled, this lets you set the fixed interval "
 "between SAP announcements."
 msgstr ""
 
-#: src/libvlc-module.c:900
+#: src/libvlc-module.c:896
 msgid ""
 "These options allow you to enable special CPU optimizations. You should "
 "always leave all these enabled."
 msgstr ""
 
-#: src/libvlc-module.c:903
+#: src/libvlc-module.c:899
 msgid "Enable FPU support"
 msgstr ""
 
-#: src/libvlc-module.c:905
+#: src/libvlc-module.c:901
 msgid ""
 "If your processor has a floating point calculation unit, VLC can take "
 "advantage of it."
 msgstr ""
 
-#: src/libvlc-module.c:908
+#: src/libvlc-module.c:904
 msgid "Enable CPU MMX support"
 msgstr ""
 
-#: src/libvlc-module.c:910
+#: src/libvlc-module.c:906
 msgid ""
 "If your processor supports the MMX instructions set, VLC can take advantage "
 "of them."
 msgstr ""
 
-#: src/libvlc-module.c:913
+#: src/libvlc-module.c:909
 msgid "Enable CPU 3D Now! support"
 msgstr ""
 
-#: src/libvlc-module.c:915
+#: src/libvlc-module.c:911
 msgid ""
 "If your processor supports the 3D Now! instructions set, VLC can take "
 "advantage of them."
 msgstr ""
 
-#: src/libvlc-module.c:918
+#: src/libvlc-module.c:914
 msgid "Enable CPU MMX EXT support"
 msgstr ""
 
-#: src/libvlc-module.c:920
+#: src/libvlc-module.c:916
 msgid ""
 "If your processor supports the MMX EXT instructions set, VLC can take "
 "advantage of them."
 msgstr ""
 
-#: src/libvlc-module.c:923
+#: src/libvlc-module.c:919
 msgid "Enable CPU SSE support"
 msgstr ""
 
-#: src/libvlc-module.c:925
+#: src/libvlc-module.c:921
 msgid ""
 "If your processor supports the SSE instructions set, VLC can take advantage "
 "of them."
 msgstr ""
 
-#: src/libvlc-module.c:928
+#: src/libvlc-module.c:924
 msgid "Enable CPU SSE2 support"
 msgstr ""
 
-#: src/libvlc-module.c:930
+#: src/libvlc-module.c:926
 msgid ""
 "If your processor supports the SSE2 instructions set, VLC can take advantage "
 "of them."
 msgstr ""
 
-#: src/libvlc-module.c:933
+#: src/libvlc-module.c:929
 msgid "Enable CPU AltiVec support"
 msgstr ""
 
-#: src/libvlc-module.c:935
+#: src/libvlc-module.c:931
 msgid ""
 "If your processor supports the AltiVec instructions set, VLC can take "
 "advantage of them."
 msgstr ""
 
-#: src/libvlc-module.c:940
+#: src/libvlc-module.c:936
 msgid ""
 "These options allow you to select default modules. Leave these alone unless "
 "you really know what you are doing."
 msgstr ""
 
-#: src/libvlc-module.c:943
+#: src/libvlc-module.c:939
 msgid "Memory copy module"
 msgstr ""
 
-#: src/libvlc-module.c:945
+#: src/libvlc-module.c:941
 msgid ""
 "You can select which memory copy module you want to use. By default VLC will "
 "select the fastest one supported by your hardware."
 msgstr ""
 
-#: src/libvlc-module.c:948
+#: src/libvlc-module.c:944
 msgid "Access module"
 msgstr ""
 
-#: src/libvlc-module.c:950
+#: src/libvlc-module.c:946
 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-module.c:954
+#: src/libvlc-module.c:950
 msgid "Access filter module"
 msgstr ""
 
-#: src/libvlc-module.c:956
+#: src/libvlc-module.c:952
 msgid ""
 "Access filters are used to modify the stream that is being read. This is "
 "used for instance for timeshifting."
 msgstr ""
 
-#: src/libvlc-module.c:959
+#: src/libvlc-module.c:955
 msgid "Demux module"
 msgstr ""
 
-#: src/libvlc-module.c:961
+#: src/libvlc-module.c:957
 msgid ""
 "Demultiplexers are used to separate the \"elementary\" streams (like audio "
 "and video streams). You can use it if the correct demuxer is not "
@@ -2983,11 +2974,11 @@ msgid ""
 "you really know what you are doing."
 msgstr ""
 
-#: src/libvlc-module.c:966
+#: src/libvlc-module.c:962
 msgid "Allow real-time priority"
 msgstr ""
 
-#: src/libvlc-module.c:968
+#: src/libvlc-module.c:964
 msgid ""
 "Running VLC in real-time priority will allow for much more precise "
 "scheduling and yield better, especially when streaming content. It can "
@@ -2995,116 +2986,116 @@ msgid ""
 "only activate this if you know what you're doing."
 msgstr ""
 
-#: src/libvlc-module.c:974
+#: src/libvlc-module.c:970
 msgid "Adjust VLC priority"
 msgstr ""
 
-#: src/libvlc-module.c:976
+#: src/libvlc-module.c:972
 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 "
 "VLC instances."
 msgstr ""
 
-#: src/libvlc-module.c:980
+#: src/libvlc-module.c:976
 msgid "Minimize number of threads"
 msgstr ""
 
-#: src/libvlc-module.c:982
+#: src/libvlc-module.c:978
 msgid "This option minimizes the number of threads needed to run VLC."
 msgstr ""
 
-#: src/libvlc-module.c:984
+#: src/libvlc-module.c:980
 msgid "Policy for handling unsafe options."
 msgstr ""
 
-#: src/libvlc-module.c:986
+#: src/libvlc-module.c:982
 msgid ""
 "This option dictates the default policy when processing options which may be "
 "harmful when used in a malicious way."
 msgstr ""
 
-#: src/libvlc-module.c:990
+#: src/libvlc-module.c:986
 msgid "Block"
 msgstr ""
 
-#: src/libvlc-module.c:990
+#: src/libvlc-module.c:986
 msgid "Allow"
 msgstr ""
 
-#: src/libvlc-module.c:990
+#: src/libvlc-module.c:986
 msgid "Prompt"
 msgstr ""
 
-#: src/libvlc-module.c:992
+#: src/libvlc-module.c:988
 msgid "Modules search path"
 msgstr ""
 
-#: src/libvlc-module.c:994
+#: src/libvlc-module.c:990
 msgid "Additional path for VLC to look for its modules."
 msgstr ""
 
-#: src/libvlc-module.c:996
+#: src/libvlc-module.c:992
 msgid "VLM configuration file"
 msgstr ""
 
-#: src/libvlc-module.c:998
+#: src/libvlc-module.c:994
 msgid "Read a VLM configuration file as soon as VLM is started."
 msgstr ""
 
-#: src/libvlc-module.c:1000
+#: src/libvlc-module.c:996
 msgid "Use a plugins cache"
 msgstr ""
 
-#: src/libvlc-module.c:1002
+#: src/libvlc-module.c:998
 msgid "Use a plugins cache which will greatly improve the startup time of VLC."
 msgstr ""
 
-#: src/libvlc-module.c:1004
+#: src/libvlc-module.c:1000
 msgid "Collect statistics"
 msgstr ""
 
-#: src/libvlc-module.c:1006
+#: src/libvlc-module.c:1002
 msgid "Collect miscellaneous statistics."
 msgstr ""
 
-#: src/libvlc-module.c:1008
+#: src/libvlc-module.c:1004
 msgid "Run as daemon process"
 msgstr ""
 
-#: src/libvlc-module.c:1010
+#: src/libvlc-module.c:1006
 msgid "Runs VLC as a background daemon process."
 msgstr ""
 
-#: src/libvlc-module.c:1012
+#: src/libvlc-module.c:1008
 msgid "Write process id to file"
 msgstr ""
 
-#: src/libvlc-module.c:1014
+#: src/libvlc-module.c:1010
 msgid "Writes process id into specified file."
 msgstr ""
 
-#: src/libvlc-module.c:1016
+#: src/libvlc-module.c:1012
 msgid "Log to file"
 msgstr ""
 
-#: src/libvlc-module.c:1018
+#: src/libvlc-module.c:1014
 msgid "Log all VLC messages to a text file."
 msgstr ""
 
-#: src/libvlc-module.c:1020
+#: src/libvlc-module.c:1016
 msgid "Log to syslog"
 msgstr ""
 
-#: src/libvlc-module.c:1022
+#: src/libvlc-module.c:1018
 msgid "Log all VLC messages to syslog (UNIX systems)."
 msgstr ""
 
-#: src/libvlc-module.c:1024
+#: src/libvlc-module.c:1020
 msgid "Allow only one running instance"
 msgstr ""
 
-#: src/libvlc-module.c:1026
+#: src/libvlc-module.c:1022
 msgid ""
 "Allowing only one running instance of VLC can sometimes be useful, for "
 "example if you associated VLC with some media types and you don't want a new "
@@ -3113,7 +3104,7 @@ msgid ""
 "running instance or enqueue it."
 msgstr ""
 
-#: src/libvlc-module.c:1034
+#: src/libvlc-module.c:1030
 msgid ""
 "Allowing only one running instance of VLC can sometimes be useful, for "
 "example if you associated VLC with some media types and you don't want a new "
@@ -3123,27 +3114,27 @@ msgid ""
 "active and the running instance of VLC to use D-Bus control interface."
 msgstr ""
 
-#: src/libvlc-module.c:1042
+#: src/libvlc-module.c:1038
 msgid "VLC is started from file association"
 msgstr ""
 
-#: src/libvlc-module.c:1044
+#: src/libvlc-module.c:1040
 msgid "Tell VLC that it is being launched due to a file association in the OS"
 msgstr ""
 
-#: src/libvlc-module.c:1047
+#: src/libvlc-module.c:1043
 msgid "One instance when started from file"
 msgstr ""
 
-#: src/libvlc-module.c:1049
+#: src/libvlc-module.c:1045
 msgid "Allow only one running instance when started from file."
 msgstr ""
 
-#: src/libvlc-module.c:1051
+#: src/libvlc-module.c:1047
 msgid "Increase the priority of the process"
 msgstr ""
 
-#: src/libvlc-module.c:1053
+#: src/libvlc-module.c:1049
 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 "
@@ -3153,876 +3144,871 @@ msgid ""
 "machine."
 msgstr ""
 
-#: src/libvlc-module.c:1061
+#: src/libvlc-module.c:1057
 msgid "Enqueue items to playlist when in one instance mode"
 msgstr ""
 
-#: src/libvlc-module.c:1063
+#: src/libvlc-module.c:1059
 msgid ""
 "When using the one instance only option, enqueue items to playlist and keep "
 "playing current item."
 msgstr ""
 
-#: src/libvlc-module.c:1072
+#: src/libvlc-module.c:1068
 msgid ""
 "These options define the behavior of the playlist. Some of them can be "
 "overridden in the playlist dialog box."
 msgstr ""
 
-#: src/libvlc-module.c:1075
+#: src/libvlc-module.c:1071
 msgid "Automatically preparse files"
 msgstr ""
 
-#: src/libvlc-module.c:1077
+#: src/libvlc-module.c:1073
 msgid ""
 "Automatically preparse files added to the playlist (to retrieve some "
 "metadata)."
 msgstr ""
 
-#: src/libvlc-module.c:1080
+#: src/libvlc-module.c:1076
 msgid "Authorise meta information fetching"
 msgstr ""
 
-#: src/libvlc-module.c:1082
+#: src/libvlc-module.c:1078
 msgid ""
 "Specify if you want to attempt to fetch files'meta informations using the "
 "network."
 msgstr ""
 
-#: src/libvlc-module.c:1085
+#: src/libvlc-module.c:1081
 msgid "Album art policy"
 msgstr ""
 
-#: src/libvlc-module.c:1087
+#: src/libvlc-module.c:1083
 msgid "Choose how album art will be downloaded."
 msgstr ""
 
-#: src/libvlc-module.c:1093
+#: src/libvlc-module.c:1089
 msgid "Manual download only"
 msgstr ""
 
-#: src/libvlc-module.c:1094
+#: src/libvlc-module.c:1090
 msgid "When track starts playing"
 msgstr ""
 
-#: src/libvlc-module.c:1095
+#: src/libvlc-module.c:1091
 msgid "As soon as track is added"
 msgstr ""
 
-#: src/libvlc-module.c:1097
+#: src/libvlc-module.c:1093
 msgid "Services discovery modules"
 msgstr ""
 
-#: src/libvlc-module.c:1099
+#: src/libvlc-module.c:1095
 msgid ""
 "Specifies the services discovery modules to load, separated by semi-colons. "
 "Typical values are sap, hal, ..."
 msgstr ""
 
-#: src/libvlc-module.c:1102
+#: src/libvlc-module.c:1098
 msgid "Play files randomly forever"
 msgstr ""
 
-#: src/libvlc-module.c:1104
+#: src/libvlc-module.c:1100
 msgid "VLC will randomly play files in the playlist until interrupted."
 msgstr ""
 
-#: src/libvlc-module.c:1108
+#: src/libvlc-module.c:1104
 msgid "VLC will keep playing the playlist indefinitely."
 msgstr ""
 
-#: src/libvlc-module.c:1110
+#: src/libvlc-module.c:1106
 msgid "Repeat current item"
 msgstr ""
 
-#: src/libvlc-module.c:1112
+#: src/libvlc-module.c:1108
 msgid "VLC will keep playing the current playlist item."
 msgstr ""
 
-#: src/libvlc-module.c:1114
+#: src/libvlc-module.c:1110
 msgid "Play and stop"
 msgstr ""
 
-#: src/libvlc-module.c:1116
+#: src/libvlc-module.c:1112
 msgid "Stop the playlist after each played playlist item."
 msgstr ""
 
-#: src/libvlc-module.c:1118
+#: src/libvlc-module.c:1114
 msgid "Play and exit"
 msgstr ""
 
-#: src/libvlc-module.c:1120
+#: src/libvlc-module.c:1116
 msgid "Exit if there are no more items in the playlist."
 msgstr ""
 
-#: src/libvlc-module.c:1122
+#: src/libvlc-module.c:1118
 msgid "Use media library"
 msgstr ""
 
-#: src/libvlc-module.c:1124
+#: src/libvlc-module.c:1120
 msgid ""
 "The media library is automatically saved and reloaded each time you start "
 "VLC."
 msgstr ""
 
-#: src/libvlc-module.c:1127
+#: src/libvlc-module.c:1123
 msgid "Use playlist tree"
 msgstr ""
 
-#: src/libvlc-module.c:1129
+#: src/libvlc-module.c:1125
 msgid ""
 "The playlist can use a tree to categorize some items, like the contents of a "
 "directory. \"Default\" means that the tree will only be used when really "
 "needed."
 msgstr ""
 
-#: src/libvlc-module.c:1133
+#: src/libvlc-module.c:1129
 msgid "Always"
 msgstr ""
 
-#: src/libvlc-module.c:1133
+#: src/libvlc-module.c:1129
 msgid "Never"
 msgstr ""
 
-#: src/libvlc-module.c:1142
+#: src/libvlc-module.c:1138
 msgid "These settings are the global VLC key bindings, known as \"hotkeys\"."
 msgstr ""
 
-#: src/libvlc-module.c:1145 src/video_output/vout_intf.c:442
+#: src/libvlc-module.c:1141 src/video_output/vout_intf.c:445
 #: modules/gui/beos/VideoOutput.cpp:1058 modules/gui/macosx/controls.m:456
-#: modules/gui/macosx/controls.m:509 modules/gui/macosx/controls.m:962
-#: modules/gui/macosx/controls.m:992 modules/gui/macosx/embeddedwindow.m:49
-#: modules/gui/macosx/intf.m:615 modules/gui/macosx/intf.m:691
-#: modules/gui/macosx/intf.m:747
-#: modules/gui/qt4/components/interface_widgets.cpp:539
+#: modules/gui/macosx/controls.m:509 modules/gui/macosx/controls.m:961
+#: modules/gui/macosx/controls.m:991 modules/gui/macosx/embeddedwindow.m:49
+#: modules/gui/macosx/intf.m:645 modules/gui/macosx/intf.m:721
+#: modules/gui/macosx/intf.m:777
+#: modules/gui/qt4/components/interface_widgets.cpp:568
 #: modules/gui/qt4/ui/sprefs_video.ui:61
 msgid "Fullscreen"
 msgstr ""
 
-#: src/libvlc-module.c:1146
+#: src/libvlc-module.c:1142
 msgid "Select the hotkey to use to swap fullscreen state."
 msgstr ""
 
-#: src/libvlc-module.c:1147
+#: src/libvlc-module.c:1143
 msgid "Leave fullscreen"
 msgstr ""
 
-#: src/libvlc-module.c:1148
+#: src/libvlc-module.c:1144
 msgid "Select the hotkey to use to leave fullscreen state."
 msgstr ""
 
-#: src/libvlc-module.c:1149
+#: src/libvlc-module.c:1145
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:83
 #: modules/gui/wxwidgets/interface.cpp:1532
 msgid "Play/Pause"
 msgstr ""
 
-#: src/libvlc-module.c:1150
+#: src/libvlc-module.c:1146
 msgid "Select the hotkey to use to swap paused state."
 msgstr ""
 
-#: src/libvlc-module.c:1151
+#: src/libvlc-module.c:1147
 msgid "Pause only"
 msgstr ""
 
-#: src/libvlc-module.c:1152
+#: src/libvlc-module.c:1148
 msgid "Select the hotkey to use to pause."
 msgstr ""
 
-#: src/libvlc-module.c:1153
+#: src/libvlc-module.c:1149
 msgid "Play only"
 msgstr ""
 
-#: src/libvlc-module.c:1154
+#: src/libvlc-module.c:1150
 msgid "Select the hotkey to use to play."
 msgstr ""
 
-#: src/libvlc-module.c:1155 modules/control/hotkeys.c:676
-#: modules/gui/macosx/controls.m:894 modules/gui/macosx/intf.m:656
-#: modules/gui/qt4/components/interface_widgets.cpp:392
+#: src/libvlc-module.c:1151 modules/control/hotkeys.c:694
+#: modules/gui/macosx/controls.m:893 modules/gui/macosx/intf.m:686
+#: modules/gui/qt4/components/interface_widgets.cpp:421
 #: modules/gui/wxwidgets/interface.cpp:712
 msgid "Faster"
 msgstr ""
 
-#: src/libvlc-module.c:1156
+#: src/libvlc-module.c:1152
 msgid "Select the hotkey to use for fast forward playback."
 msgstr ""
 
-#: src/libvlc-module.c:1157 modules/control/hotkeys.c:682
-#: modules/gui/macosx/controls.m:895 modules/gui/macosx/intf.m:657
-#: modules/gui/qt4/components/interface_widgets.cpp:385
+#: src/libvlc-module.c:1153 modules/control/hotkeys.c:700
+#: modules/gui/macosx/controls.m:894 modules/gui/macosx/intf.m:687
+#: modules/gui/qt4/components/interface_widgets.cpp:414
 #: modules/gui/wxwidgets/interface.cpp:711
 msgid "Slower"
 msgstr ""
 
-#: src/libvlc-module.c:1158
+#: src/libvlc-module.c:1154
 msgid "Select the hotkey to use for slow motion playback."
 msgstr ""
 
-#: src/libvlc-module.c:1159 modules/control/hotkeys.c:659
-#: modules/gui/macosx/about.m:190 modules/gui/macosx/controls.m:915
-#: modules/gui/macosx/intf.m:614 modules/gui/macosx/intf.m:659
-#: modules/gui/macosx/intf.m:735 modules/gui/macosx/intf.m:743
+#: src/libvlc-module.c:1155 modules/control/hotkeys.c:677
+#: modules/gui/macosx/about.m:190 modules/gui/macosx/controls.m:914
+#: modules/gui/macosx/intf.m:644 modules/gui/macosx/intf.m:689
+#: modules/gui/macosx/intf.m:765 modules/gui/macosx/intf.m:773
 #: modules/gui/macosx/wizard.m:309 modules/gui/macosx/wizard.m:321
 #: modules/gui/macosx/wizard.m:1617
-#: modules/gui/qt4/components/interface_widgets.cpp:526
-#: modules/gui/qt4/menus.cpp:527 modules/gui/qt4/ui/streampanel.ui:129
+#: modules/gui/qt4/components/interface_widgets.cpp:555
+#: modules/gui/qt4/menus.cpp:516 modules/gui/qt4/ui/streampanel.ui:108
 #: modules/gui/wxwidgets/interface.cpp:710
 #: modules/gui/wxwidgets/interface.cpp:1537
-#: modules/gui/wxwidgets/menus.cpp:265 modules/misc/notify/notify.c:295
+#: modules/gui/wxwidgets/menus.cpp:255 modules/misc/notify/notify.c:304
 msgid "Next"
 msgstr ""
 
-#: src/libvlc-module.c:1160
+#: src/libvlc-module.c:1156
 msgid "Select the hotkey to use to skip to the next item in the playlist."
 msgstr ""
 
-#: src/libvlc-module.c:1161 modules/control/hotkeys.c:665
-#: modules/gui/macosx/about.m:191 modules/gui/macosx/controls.m:914
-#: modules/gui/macosx/intf.m:609 modules/gui/macosx/intf.m:658
-#: modules/gui/macosx/intf.m:736 modules/gui/macosx/intf.m:742
-#: modules/gui/qt4/components/interface_widgets.cpp:525
-#: modules/gui/qt4/menus.cpp:525 modules/gui/wxwidgets/interface.cpp:709
+#: src/libvlc-module.c:1157 modules/control/hotkeys.c:683
+#: modules/gui/macosx/about.m:191 modules/gui/macosx/controls.m:913
+#: modules/gui/macosx/intf.m:639 modules/gui/macosx/intf.m:688
+#: modules/gui/macosx/intf.m:766 modules/gui/macosx/intf.m:772
+#: modules/gui/qt4/components/interface_widgets.cpp:554
+#: modules/gui/qt4/menus.cpp:514 modules/gui/wxwidgets/interface.cpp:709
 #: modules/gui/wxwidgets/interface.cpp:1536
-#: modules/gui/wxwidgets/menus.cpp:264 modules/misc/notify/notify.c:293
+#: modules/gui/wxwidgets/menus.cpp:254 modules/misc/notify/notify.c:302
 msgid "Previous"
 msgstr ""
 
-#: src/libvlc-module.c:1162
+#: src/libvlc-module.c:1158
 msgid "Select the hotkey to use to skip to the previous item in the playlist."
 msgstr ""
 
-#: src/libvlc-module.c:1163 modules/gui/macosx/controls.m:906
-#: modules/gui/macosx/intf.m:612 modules/gui/macosx/intf.m:655
-#: modules/gui/macosx/intf.m:734 modules/gui/macosx/intf.m:741
+#: src/libvlc-module.c:1159 modules/gui/macosx/controls.m:905
+#: modules/gui/macosx/intf.m:642 modules/gui/macosx/intf.m:685
+#: modules/gui/macosx/intf.m:764 modules/gui/macosx/intf.m:771
 #: modules/gui/pda/pda_interface.c:272 modules/gui/pda/pda_interface.c:273
-#: modules/gui/qt4/components/interface_widgets.cpp:527
-#: modules/gui/qt4/menus.cpp:523 modules/gui/qt4/ui/streampanel.ui:122
+#: modules/gui/qt4/components/interface_widgets.cpp:556
+#: modules/gui/qt4/menus.cpp:512 modules/gui/qt4/ui/streampanel.ui:101
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:88
 #: modules/gui/wxwidgets/interface.cpp:693
 #: modules/gui/wxwidgets/interface.cpp:704
 #: modules/gui/wxwidgets/interface.cpp:1538
-#: modules/gui/wxwidgets/menus.cpp:263 modules/misc/notify/xosd.c:232
+#: modules/gui/wxwidgets/menus.cpp:253 modules/misc/notify/xosd.c:232
 msgid "Stop"
 msgstr ""
 
-#: src/libvlc-module.c:1164
+#: src/libvlc-module.c:1160
 msgid "Select the hotkey to stop playback."
 msgstr ""
 
-#: src/libvlc-module.c:1165 modules/gui/fbosd.c:132 modules/gui/fbosd.c:201
-#: modules/gui/macosx/bookmarks.m:99 modules/gui/macosx/bookmarks.m:108
-#: modules/gui/macosx/embeddedwindow.m:51 modules/gui/macosx/intf.m:617
-#: modules/gui/qt4/ui/video_effects.ui:854 modules/video_filter/marq.c:145
+#: src/libvlc-module.c:1161 modules/gui/fbosd.c:132 modules/gui/fbosd.c:201
+#: modules/gui/macosx/bookmarks.m:98 modules/gui/macosx/bookmarks.m:107
+#: modules/gui/macosx/embeddedwindow.m:51 modules/gui/macosx/intf.m:647
+#: modules/gui/qt4/ui/video_effects.ui:716 modules/video_filter/marq.c:150
 #: modules/video_filter/rss.c:192
 msgid "Position"
 msgstr ""
 
-#: src/libvlc-module.c:1166
+#: src/libvlc-module.c:1162
 msgid "Select the hotkey to display the position."
 msgstr ""
 
-#: src/libvlc-module.c:1168
+#: src/libvlc-module.c:1164
 msgid "Very short backwards jump"
 msgstr ""
 
-#: src/libvlc-module.c:1170
+#: src/libvlc-module.c:1166
 msgid "Select the hotkey to make a very short backwards jump."
 msgstr ""
 
-#: src/libvlc-module.c:1171
+#: src/libvlc-module.c:1167
 msgid "Short backwards jump"
 msgstr ""
 
-#: src/libvlc-module.c:1173
+#: src/libvlc-module.c:1169
 msgid "Select the hotkey to make a short backwards jump."
 msgstr ""
 
-#: src/libvlc-module.c:1174
+#: src/libvlc-module.c:1170
 msgid "Medium backwards jump"
 msgstr ""
 
-#: src/libvlc-module.c:1176
+#: src/libvlc-module.c:1172
 msgid "Select the hotkey to make a medium backwards jump."
 msgstr ""
 
-#: src/libvlc-module.c:1177
+#: src/libvlc-module.c:1173
 msgid "Long backwards jump"
 msgstr ""
 
-#: src/libvlc-module.c:1179
+#: src/libvlc-module.c:1175
 msgid "Select the hotkey to make a long backwards jump."
 msgstr ""
 
-#: src/libvlc-module.c:1181
+#: src/libvlc-module.c:1177
 msgid "Very short forward jump"
 msgstr ""
 
-#: src/libvlc-module.c:1183
+#: src/libvlc-module.c:1179
 msgid "Select the hotkey to make a very short forward jump."
 msgstr ""
 
-#: src/libvlc-module.c:1184
+#: src/libvlc-module.c:1180
 msgid "Short forward jump"
 msgstr ""
 
-#: src/libvlc-module.c:1186
+#: src/libvlc-module.c:1182
 msgid "Select the hotkey to make a short forward jump."
 msgstr ""
 
-#: src/libvlc-module.c:1187
+#: src/libvlc-module.c:1183
 msgid "Medium forward jump"
 msgstr ""
 
-#: src/libvlc-module.c:1189
+#: src/libvlc-module.c:1185
 msgid "Select the hotkey to make a medium forward jump."
 msgstr ""
 
-#: src/libvlc-module.c:1190
+#: src/libvlc-module.c:1186
 msgid "Long forward jump"
 msgstr ""
 
-#: src/libvlc-module.c:1192
+#: src/libvlc-module.c:1188
 msgid "Select the hotkey to make a long forward jump."
 msgstr ""
 
-#: src/libvlc-module.c:1194
+#: src/libvlc-module.c:1190
 msgid "Very short jump length"
 msgstr ""
 
-#: src/libvlc-module.c:1195
+#: src/libvlc-module.c:1191
 msgid "Very short jump length, in seconds."
 msgstr ""
 
-#: src/libvlc-module.c:1196
+#: src/libvlc-module.c:1192
 msgid "Short jump length"
 msgstr ""
 
-#: src/libvlc-module.c:1197
+#: src/libvlc-module.c:1193
 msgid "Short jump length, in seconds."
 msgstr ""
 
-#: src/libvlc-module.c:1198
+#: src/libvlc-module.c:1194
 msgid "Medium jump length"
 msgstr ""
 
-#: src/libvlc-module.c:1199
+#: src/libvlc-module.c:1195
 msgid "Medium jump length, in seconds."
 msgstr ""
 
-#: src/libvlc-module.c:1200
+#: src/libvlc-module.c:1196
 msgid "Long jump length"
 msgstr ""
 
-#: src/libvlc-module.c:1201
+#: src/libvlc-module.c:1197
 msgid "Long jump length, in seconds."
 msgstr ""
 
-#: src/libvlc-module.c:1203 modules/control/hotkeys.c:244
-#: modules/gui/beos/InterfaceWindow.cpp:278 modules/gui/macosx/intf.m:779
-#: modules/gui/qt4/menus.cpp:553
+#: src/libvlc-module.c:1199 modules/control/hotkeys.c:244
+#: modules/gui/beos/InterfaceWindow.cpp:278 modules/gui/macosx/intf.m:809
+#: modules/gui/qt4/menus.cpp:542
 msgid "Quit"
 msgstr ""
 
-#: src/libvlc-module.c:1204
+#: src/libvlc-module.c:1200
 msgid "Select the hotkey to quit the application."
 msgstr ""
 
-#: src/libvlc-module.c:1205
+#: src/libvlc-module.c:1201
 msgid "Navigate up"
 msgstr ""
 
-#: src/libvlc-module.c:1206
+#: src/libvlc-module.c:1202
 msgid "Select the key to move the selector up in DVD menus."
 msgstr ""
 
-#: src/libvlc-module.c:1207
+#: src/libvlc-module.c:1203
 msgid "Navigate down"
 msgstr ""
 
-#: src/libvlc-module.c:1208
+#: src/libvlc-module.c:1204
 msgid "Select the key to move the selector down in DVD menus."
 msgstr ""
 
-#: src/libvlc-module.c:1209
+#: src/libvlc-module.c:1205
 msgid "Navigate left"
 msgstr ""
 
-#: src/libvlc-module.c:1210
+#: src/libvlc-module.c:1206
 msgid "Select the key to move the selector left in DVD menus."
 msgstr ""
 
-#: src/libvlc-module.c:1211
+#: src/libvlc-module.c:1207
 msgid "Navigate right"
 msgstr ""
 
-#: src/libvlc-module.c:1212
+#: src/libvlc-module.c:1208
 msgid "Select the key to move the selector right in DVD menus."
 msgstr ""
 
-#: src/libvlc-module.c:1213
+#: src/libvlc-module.c:1209
 msgid "Activate"
 msgstr ""
 
-#: src/libvlc-module.c:1214
+#: src/libvlc-module.c:1210
 msgid "Select the key to activate selected item in DVD menus."
 msgstr ""
 
-#: src/libvlc-module.c:1215
+#: src/libvlc-module.c:1211
 msgid "Go to the DVD menu"
 msgstr ""
 
-#: src/libvlc-module.c:1216
+#: src/libvlc-module.c:1212
 msgid "Select the key to take you to the DVD menu"
 msgstr ""
 
-#: src/libvlc-module.c:1217
+#: src/libvlc-module.c:1213
 msgid "Select previous DVD title"
 msgstr ""
 
-#: src/libvlc-module.c:1218
+#: src/libvlc-module.c:1214
 msgid "Select the key to choose the previous title from the DVD"
 msgstr ""
 
-#: src/libvlc-module.c:1219
+#: src/libvlc-module.c:1215
 msgid "Select next DVD title"
 msgstr ""
 
-#: src/libvlc-module.c:1220
+#: src/libvlc-module.c:1216
 msgid "Select the key to choose the next title from the DVD"
 msgstr ""
 
-#: src/libvlc-module.c:1221
+#: src/libvlc-module.c:1217
 msgid "Select prev DVD chapter"
 msgstr ""
 
-#: src/libvlc-module.c:1222
+#: src/libvlc-module.c:1218
 msgid "Select the key to choose the previous chapter from the DVD"
 msgstr ""
 
-#: src/libvlc-module.c:1223
+#: src/libvlc-module.c:1219
 msgid "Select next DVD chapter"
 msgstr ""
 
-#: src/libvlc-module.c:1224
+#: src/libvlc-module.c:1220
 msgid "Select the key to choose the next chapter from the DVD"
 msgstr ""
 
-#: src/libvlc-module.c:1225
+#: src/libvlc-module.c:1221
 msgid "Volume up"
 msgstr ""
 
-#: src/libvlc-module.c:1226
+#: src/libvlc-module.c:1222
 msgid "Select the key to increase audio volume."
 msgstr ""
 
-#: src/libvlc-module.c:1227
+#: src/libvlc-module.c:1223
 msgid "Volume down"
 msgstr ""
 
-#: src/libvlc-module.c:1228
+#: src/libvlc-module.c:1224
 msgid "Select the key to decrease audio volume."
 msgstr ""
 
-#: src/libvlc-module.c:1229 modules/access/v4l2/v4l2.c:194
-#: modules/gui/macosx/controls.m:952 modules/gui/macosx/intf.m:676
-#: modules/gui/macosx/intf.m:737 modules/gui/macosx/intf.m:746
-#: modules/gui/qt4/components/interface_widgets.cpp:566
+#: src/libvlc-module.c:1225 modules/access/v4l2/v4l2.c:194
+#: modules/gui/macosx/controls.m:951 modules/gui/macosx/intf.m:706
+#: modules/gui/macosx/intf.m:767 modules/gui/macosx/intf.m:776
+#: modules/gui/qt4/components/interface_widgets.cpp:595
 msgid "Mute"
 msgstr ""
 
-#: src/libvlc-module.c:1230
+#: src/libvlc-module.c:1226
 msgid "Select the key to mute audio."
 msgstr ""
 
-#: src/libvlc-module.c:1231
+#: src/libvlc-module.c:1227
 msgid "Subtitle delay up"
 msgstr ""
 
-#: src/libvlc-module.c:1232
+#: src/libvlc-module.c:1228
 msgid "Select the key to increase the subtitle delay."
 msgstr ""
 
-#: src/libvlc-module.c:1233
+#: src/libvlc-module.c:1229
 msgid "Subtitle delay down"
 msgstr ""
 
-#: src/libvlc-module.c:1234
+#: src/libvlc-module.c:1230
 msgid "Select the key to decrease the subtitle delay."
 msgstr ""
 
-#: src/libvlc-module.c:1235
+#: src/libvlc-module.c:1231
 msgid "Audio delay up"
 msgstr ""
 
-#: src/libvlc-module.c:1236
+#: src/libvlc-module.c:1232
 msgid "Select the key to increase the audio delay."
 msgstr ""
 
-#: src/libvlc-module.c:1237
+#: src/libvlc-module.c:1233
 msgid "Audio delay down"
 msgstr ""
 
-#: src/libvlc-module.c:1238
+#: src/libvlc-module.c:1234
 msgid "Select the key to decrease the audio delay."
 msgstr ""
 
-#: src/libvlc-module.c:1239
+#: src/libvlc-module.c:1241
 msgid "Play playlist bookmark 1"
 msgstr ""
 
-#: src/libvlc-module.c:1240
+#: src/libvlc-module.c:1242
 msgid "Play playlist bookmark 2"
 msgstr ""
 
-#: src/libvlc-module.c:1241
+#: src/libvlc-module.c:1243
 msgid "Play playlist bookmark 3"
 msgstr ""
 
-#: src/libvlc-module.c:1242
+#: src/libvlc-module.c:1244
 msgid "Play playlist bookmark 4"
 msgstr ""
 
-#: src/libvlc-module.c:1243
+#: src/libvlc-module.c:1245
 msgid "Play playlist bookmark 5"
 msgstr ""
 
-#: src/libvlc-module.c:1244
+#: src/libvlc-module.c:1246
 msgid "Play playlist bookmark 6"
 msgstr ""
 
-#: src/libvlc-module.c:1245
+#: src/libvlc-module.c:1247
 msgid "Play playlist bookmark 7"
 msgstr ""
 
-#: src/libvlc-module.c:1246
+#: src/libvlc-module.c:1248
 msgid "Play playlist bookmark 8"
 msgstr ""
 
-#: src/libvlc-module.c:1247
+#: src/libvlc-module.c:1249
 msgid "Play playlist bookmark 9"
 msgstr ""
 
-#: src/libvlc-module.c:1248
+#: src/libvlc-module.c:1250
 msgid "Play playlist bookmark 10"
 msgstr ""
 
-#: src/libvlc-module.c:1249
+#: src/libvlc-module.c:1251
 msgid "Select the key to play this bookmark."
 msgstr ""
 
-#: src/libvlc-module.c:1250
+#: src/libvlc-module.c:1252
 msgid "Set playlist bookmark 1"
 msgstr ""
 
-#: src/libvlc-module.c:1251
+#: src/libvlc-module.c:1253
 msgid "Set playlist bookmark 2"
 msgstr ""
 
-#: src/libvlc-module.c:1252
+#: src/libvlc-module.c:1254
 msgid "Set playlist bookmark 3"
 msgstr ""
 
-#: src/libvlc-module.c:1253
+#: src/libvlc-module.c:1255
 msgid "Set playlist bookmark 4"
 msgstr ""
 
-#: src/libvlc-module.c:1254
+#: src/libvlc-module.c:1256
 msgid "Set playlist bookmark 5"
 msgstr ""
 
-#: src/libvlc-module.c:1255
+#: src/libvlc-module.c:1257
 msgid "Set playlist bookmark 6"
 msgstr ""
 
-#: src/libvlc-module.c:1256
+#: src/libvlc-module.c:1258
 msgid "Set playlist bookmark 7"
 msgstr ""
 
-#: src/libvlc-module.c:1257
+#: src/libvlc-module.c:1259
 msgid "Set playlist bookmark 8"
 msgstr ""
 
-#: src/libvlc-module.c:1258
+#: src/libvlc-module.c:1260
 msgid "Set playlist bookmark 9"
 msgstr ""
 
-#: src/libvlc-module.c:1259
+#: src/libvlc-module.c:1261
 msgid "Set playlist bookmark 10"
 msgstr ""
 
-#: src/libvlc-module.c:1260
+#: src/libvlc-module.c:1262
 msgid "Select the key to set this playlist bookmark."
 msgstr ""
 
-#: src/libvlc-module.c:1262 modules/control/hotkeys.c:87
+#: src/libvlc-module.c:1264 modules/control/hotkeys.c:87
 msgid "Playlist bookmark 1"
 msgstr ""
 
-#: src/libvlc-module.c:1263 modules/control/hotkeys.c:88
+#: src/libvlc-module.c:1265 modules/control/hotkeys.c:88
 msgid "Playlist bookmark 2"
 msgstr ""
 
-#: src/libvlc-module.c:1264 modules/control/hotkeys.c:89
+#: src/libvlc-module.c:1266 modules/control/hotkeys.c:89
 msgid "Playlist bookmark 3"
 msgstr ""
 
-#: src/libvlc-module.c:1265 modules/control/hotkeys.c:90
+#: src/libvlc-module.c:1267 modules/control/hotkeys.c:90
 msgid "Playlist bookmark 4"
 msgstr ""
 
-#: src/libvlc-module.c:1266 modules/control/hotkeys.c:91
+#: src/libvlc-module.c:1268 modules/control/hotkeys.c:91
 msgid "Playlist bookmark 5"
 msgstr ""
 
-#: src/libvlc-module.c:1267 modules/control/hotkeys.c:92
+#: src/libvlc-module.c:1269 modules/control/hotkeys.c:92
 msgid "Playlist bookmark 6"
 msgstr ""
 
-#: src/libvlc-module.c:1268 modules/control/hotkeys.c:93
+#: src/libvlc-module.c:1270 modules/control/hotkeys.c:93
 msgid "Playlist bookmark 7"
 msgstr ""
 
-#: src/libvlc-module.c:1269 modules/control/hotkeys.c:94
+#: src/libvlc-module.c:1271 modules/control/hotkeys.c:94
 msgid "Playlist bookmark 8"
 msgstr ""
 
-#: src/libvlc-module.c:1270 modules/control/hotkeys.c:95
+#: src/libvlc-module.c:1272 modules/control/hotkeys.c:95
 msgid "Playlist bookmark 9"
 msgstr ""
 
-#: src/libvlc-module.c:1271 modules/control/hotkeys.c:96
+#: src/libvlc-module.c:1273 modules/control/hotkeys.c:96
 msgid "Playlist bookmark 10"
 msgstr ""
 
-#: src/libvlc-module.c:1273
+#: src/libvlc-module.c:1275
 msgid "This allows you to define playlist bookmarks."
 msgstr ""
 
-#: src/libvlc-module.c:1275
+#: src/libvlc-module.c:1277
 msgid "Go back in browsing history"
 msgstr ""
 
-#: src/libvlc-module.c:1276
+#: src/libvlc-module.c:1278
 msgid ""
 "Select the key to go back (to the previous media item) in the browsing "
 "history."
 msgstr ""
 
-#: src/libvlc-module.c:1277
+#: src/libvlc-module.c:1279
 msgid "Go forward in browsing history"
 msgstr ""
 
-#: src/libvlc-module.c:1278
+#: src/libvlc-module.c:1280
 msgid ""
 "Select the key to go forward (to the next media item) in the browsing "
 "history."
 msgstr ""
 
-#: src/libvlc-module.c:1280
+#: src/libvlc-module.c:1282
 msgid "Cycle audio track"
 msgstr ""
 
-#: src/libvlc-module.c:1281
+#: src/libvlc-module.c:1283
 msgid "Cycle through the available audio tracks(languages)."
 msgstr ""
 
-#: src/libvlc-module.c:1282
+#: src/libvlc-module.c:1284
 msgid "Cycle subtitle track"
 msgstr ""
 
-#: src/libvlc-module.c:1283
+#: src/libvlc-module.c:1285
 msgid "Cycle through the available subtitle tracks."
 msgstr ""
 
-#: src/libvlc-module.c:1284
+#: src/libvlc-module.c:1286
 msgid "Cycle source aspect ratio"
 msgstr ""
 
-#: src/libvlc-module.c:1285
+#: src/libvlc-module.c:1287
 msgid "Cycle through a predefined list of source aspect ratios."
 msgstr ""
 
-#: src/libvlc-module.c:1286
+#: src/libvlc-module.c:1288
 msgid "Cycle video crop"
 msgstr ""
 
-#: src/libvlc-module.c:1287
+#: src/libvlc-module.c:1289
 msgid "Cycle through a predefined list of crop formats."
 msgstr ""
 
-#: src/libvlc-module.c:1288
+#: src/libvlc-module.c:1290
 msgid "Cycle deinterlace modes"
 msgstr ""
 
-#: src/libvlc-module.c:1289
+#: src/libvlc-module.c:1291
 msgid "Cycle through deinterlace modes."
 msgstr ""
 
-#: src/libvlc-module.c:1290
+#: src/libvlc-module.c:1292
 msgid "Show interface"
 msgstr ""
 
-#: src/libvlc-module.c:1291
+#: src/libvlc-module.c:1293
 msgid "Raise the interface above all other windows."
 msgstr ""
 
-#: src/libvlc-module.c:1292
+#: src/libvlc-module.c:1294
 msgid "Hide interface"
 msgstr ""
 
-#: src/libvlc-module.c:1293
+#: src/libvlc-module.c:1295
 msgid "Lower the interface below all other windows."
 msgstr ""
 
-#: src/libvlc-module.c:1294
+#: src/libvlc-module.c:1296
 msgid "Take video snapshot"
 msgstr ""
 
-#: src/libvlc-module.c:1295
+#: src/libvlc-module.c:1297
 msgid "Takes a video snapshot and writes it to disk."
 msgstr ""
 
-#: src/libvlc-module.c:1297 modules/access_filter/record.c:55
+#: src/libvlc-module.c:1299 modules/access_filter/record.c:55
 #: modules/access_filter/record.c:56
-#: modules/gui/qt4/components/interface_widgets.cpp:278
+#: modules/gui/qt4/components/interface_widgets.cpp:307
 #: modules/gui/qt4/ui/sprefs_input.ui:176
 msgid "Record"
 msgstr ""
 
-#: src/libvlc-module.c:1298
+#: src/libvlc-module.c:1300
 msgid "Record access filter start/stop."
 msgstr ""
 
-#: src/libvlc-module.c:1299 modules/access_filter/dump.c:53
+#: src/libvlc-module.c:1301 modules/access_filter/dump.c:53
 #: modules/access_filter/dump.c:54 modules/gui/qt4/ui/sprefs_input.ui:183
 msgid "Dump"
 msgstr ""
 
-#: src/libvlc-module.c:1300
+#: src/libvlc-module.c:1302
 msgid "Media dump access filter trigger."
 msgstr ""
 
-#: src/libvlc-module.c:1302
+#: src/libvlc-module.c:1304
 msgid "Normal/Repeat/Loop"
 msgstr ""
 
-#: src/libvlc-module.c:1303
+#: src/libvlc-module.c:1305
 msgid "Toggle Normal/Repeat/Loop playlist modes"
 msgstr ""
 
-#: src/libvlc-module.c:1306
+#: src/libvlc-module.c:1308
 msgid "Toggle random playlist playback"
 msgstr ""
 
-#: src/libvlc-module.c:1308 src/libvlc-module.c:1309
-#: src/video_output/vout_intf.c:304
-msgid "Zoom"
-msgstr ""
-
-#: src/libvlc-module.c:1311 src/libvlc-module.c:1312
+#: src/libvlc-module.c:1313 src/libvlc-module.c:1314
 msgid "Un-Zoom"
 msgstr ""
 
-#: src/libvlc-module.c:1314 src/libvlc-module.c:1315
+#: src/libvlc-module.c:1316 src/libvlc-module.c:1317
 msgid "Crop one pixel from the top of the video"
 msgstr ""
 
-#: src/libvlc-module.c:1316 src/libvlc-module.c:1317
+#: src/libvlc-module.c:1318 src/libvlc-module.c:1319
 msgid "Uncrop one pixel from the top of the video"
 msgstr ""
 
-#: src/libvlc-module.c:1319 src/libvlc-module.c:1320
+#: src/libvlc-module.c:1321 src/libvlc-module.c:1322
 msgid "Crop one pixel from the left of the video"
 msgstr ""
 
-#: src/libvlc-module.c:1321 src/libvlc-module.c:1322
+#: src/libvlc-module.c:1323 src/libvlc-module.c:1324
 msgid "Uncrop one pixel from the left of the video"
 msgstr ""
 
-#: src/libvlc-module.c:1324 src/libvlc-module.c:1325
+#: src/libvlc-module.c:1326 src/libvlc-module.c:1327
 msgid "Crop one pixel from the bottom of the video"
 msgstr ""
 
-#: src/libvlc-module.c:1326 src/libvlc-module.c:1327
+#: src/libvlc-module.c:1328 src/libvlc-module.c:1329
 msgid "Uncrop one pixel from the bottom of the video"
 msgstr ""
 
-#: src/libvlc-module.c:1329 src/libvlc-module.c:1330
+#: src/libvlc-module.c:1331 src/libvlc-module.c:1332
 msgid "Crop one pixel from the right of the video"
 msgstr ""
 
-#: src/libvlc-module.c:1331 src/libvlc-module.c:1332
+#: src/libvlc-module.c:1333 src/libvlc-module.c:1334
 msgid "Uncrop one pixel from the right of the video"
 msgstr ""
 
-#: src/libvlc-module.c:1334
+#: src/libvlc-module.c:1336
 msgid "Toggle wallpaper mode in video output"
 msgstr ""
 
-#: src/libvlc-module.c:1336
+#: src/libvlc-module.c:1338
 msgid ""
 "Toggle wallpaper mode in video output. Only works with the directx video "
 "output for the time being."
 msgstr ""
 
-#: src/libvlc-module.c:1339
+#: src/libvlc-module.c:1341
 msgid "Display OSD menu on top of video output"
 msgstr ""
 
-#: src/libvlc-module.c:1340
+#: src/libvlc-module.c:1342
 msgid "Display OSDmenu on top of video output"
 msgstr ""
 
-#: src/libvlc-module.c:1341
+#: src/libvlc-module.c:1343
 msgid "Do not display OSD menu on video output"
 msgstr ""
 
-#: src/libvlc-module.c:1342
+#: src/libvlc-module.c:1344
 msgid "Do not display OSDmenu on top of video output"
 msgstr ""
 
-#: src/libvlc-module.c:1343
+#: src/libvlc-module.c:1345
 msgid "Highlight widget on the right"
 msgstr ""
 
-#: src/libvlc-module.c:1345
+#: src/libvlc-module.c:1347
 msgid "Move OSD menu highlight to the widget on the right"
 msgstr ""
 
-#: src/libvlc-module.c:1346
+#: src/libvlc-module.c:1348
 msgid "Highlight widget on the left"
 msgstr ""
 
-#: src/libvlc-module.c:1348
+#: src/libvlc-module.c:1350
 msgid "Move OSD menu highlight to the widget on the left"
 msgstr ""
 
-#: src/libvlc-module.c:1349
+#: src/libvlc-module.c:1351
 msgid "Highlight widget on top"
 msgstr ""
 
-#: src/libvlc-module.c:1351
+#: src/libvlc-module.c:1353
 msgid "Move OSD menu highlight to the widget on top"
 msgstr ""
 
-#: src/libvlc-module.c:1352
+#: src/libvlc-module.c:1354
 msgid "Highlight widget below"
 msgstr ""
 
-#: src/libvlc-module.c:1354
+#: src/libvlc-module.c:1356
 msgid "Move OSD menu highlight to the widget below"
 msgstr ""
 
-#: src/libvlc-module.c:1355
+#: src/libvlc-module.c:1357
 msgid "Select current widget"
 msgstr ""
 
-#: src/libvlc-module.c:1357
+#: src/libvlc-module.c:1359
 msgid "Selecting current widget performs the associated action."
 msgstr ""
 
-#: src/libvlc-module.c:1360
+#: src/libvlc-module.c:1362
 #, c-format
 msgid ""
 "Usage: %s [options] [stream] ...\n"
@@ -4052,207 +4038,221 @@ msgid ""
 "  [dvd://][device][@raw_device]  DVD device\n"
 "  [vcd://][device]               VCD device\n"
 "  [cdda://][device]              Audio CD device\n"
-"  udp:[[<source address>]@[<bind address>][:<bind port>]]\n"
+"  udp://[[<source address>]@[<bind address>][:<bind port>]]\n"
 "                                 UDP stream sent by a streaming server\n"
-"  vlc:pause:<seconds>            Special item to pause the playlist for a "
+"  vlc://pause:<seconds>          Special item to pause the playlist for a "
 "certain time\n"
-"  vlc:quit                       Special item to quit VLC\n"
+"  vlc://quit                     Special item to quit VLC\n"
 msgstr ""
 
-#: src/libvlc-module.c:1493 src/video_output/vout_intf.c:448
-#: modules/gui/macosx/controls.m:494 modules/gui/macosx/controls.m:961
-#: modules/gui/macosx/intf.m:693 modules/gui/macosx/intf.m:748
+#: src/libvlc-module.c:1498 src/video_output/vout_intf.c:451
+#: modules/gui/macosx/controls.m:494 modules/gui/macosx/controls.m:960
+#: modules/gui/macosx/intf.m:723 modules/gui/macosx/intf.m:778
 #: modules/video_output/snapshot.c:79
 msgid "Snapshot"
 msgstr ""
 
-#: src/libvlc-module.c:1511
+#: src/libvlc-module.c:1516
 msgid "Window properties"
 msgstr ""
 
-#: src/libvlc-module.c:1554
+#: src/libvlc-module.c:1559
 msgid "Subpictures"
 msgstr ""
 
-#: src/libvlc-module.c:1561 modules/codec/subtitles/subsdec.c:114
+#: src/libvlc-module.c:1566 modules/codec/subtitles/subsdec.c:114
 #: modules/demux/subtitle.c:68 modules/gui/beos/InterfaceWindow.cpp:281
-#: modules/gui/qt4/components/simple_preferences.cpp:75
 #: modules/gui/qt4/ui/sout.ui:717 modules/gui/qt4/ui/sout.ui:723
 msgid "Subtitles"
 msgstr ""
 
-#: src/libvlc-module.c:1578 modules/stream_out/transcode.c:155
+#: src/libvlc-module.c:1583 modules/stream_out/transcode.c:155
 msgid "Overlays"
 msgstr ""
 
-#: src/libvlc-module.c:1586
-msgid "France"
-msgstr ""
-
-#: src/libvlc-module.c:1588
+#: src/libvlc-module.c:1591
 msgid "Track settings"
 msgstr ""
 
-#: src/libvlc-module.c:1610
+#: src/libvlc-module.c:1613
 msgid "Playback control"
 msgstr ""
 
-#: src/libvlc-module.c:1627
+#: src/libvlc-module.c:1630
 msgid "Default devices"
 msgstr ""
 
-#: src/libvlc-module.c:1636
+#: src/libvlc-module.c:1639
 msgid "Network settings"
 msgstr ""
 
-#: src/libvlc-module.c:1648
+#: src/libvlc-module.c:1651
 msgid "Socks proxy"
 msgstr ""
 
-#: src/libvlc-module.c:1657
+#: src/libvlc-module.c:1660
 msgid "Metadata"
 msgstr ""
 
-#: src/libvlc-module.c:1687
+#: src/libvlc-module.c:1690
 msgid "Decoders"
 msgstr ""
 
-#: src/libvlc-module.c:1694 modules/access/v4l2/v4l2.c:91
+#: src/libvlc-module.c:1697 modules/access/v4l2/v4l2.c:91
 #: modules/gui/macosx/playlistinfo.m:80
-#: modules/gui/qt4/components/info_panels.cpp:519
+#: modules/gui/qt4/components/info_panels.cpp:521
 #: modules/gui/wxwidgets/dialogs/infopanels.cpp:267
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:379
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:106
 msgid "Input"
 msgstr ""
 
-#: src/libvlc-module.c:1734
+#: src/libvlc-module.c:1737
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:523
 msgid "VLM"
 msgstr ""
 
-#: src/libvlc-module.c:1767
+#: src/libvlc-module.c:1770
 msgid "CPU"
 msgstr ""
 
-#: src/libvlc-module.c:1789
+#: src/libvlc-module.c:1792
 msgid "Special modules"
 msgstr ""
 
-#: src/libvlc-module.c:1795
+#: src/libvlc-module.c:1798
 msgid "Plugins"
 msgstr ""
 
-#: src/libvlc-module.c:1804
+#: src/libvlc-module.c:1807
 msgid "Performance options"
 msgstr ""
 
-#: src/libvlc-module.c:1809
+#: src/libvlc-module.c:1812
 msgid "Security options"
 msgstr ""
 
-#: src/libvlc-module.c:1961
+#: src/libvlc-module.c:1964
 msgid "Hot keys"
 msgstr ""
 
-#: src/libvlc-module.c:2325
+#: src/libvlc-module.c:2349
 msgid "Jump sizes"
 msgstr ""
 
-#: src/libvlc-module.c:2402
+#: src/libvlc-module.c:2426
 msgid "print help for VLC (can be combined with --advanced and --help-verbose)"
 msgstr ""
 
-#: src/libvlc-module.c:2405
+#: src/libvlc-module.c:2429
 msgid ""
 "print help for VLC and all its modules (can be combined with --advanced and "
 "--help-verbose)"
 msgstr ""
 
-#: src/libvlc-module.c:2408
+#: src/libvlc-module.c:2432
 msgid "ask for extra verbosity when displaying help"
 msgstr ""
 
-#: src/libvlc-module.c:2410
+#: src/libvlc-module.c:2434
 msgid "print a list of available modules"
 msgstr ""
 
-#: src/libvlc-module.c:2412
+#: src/libvlc-module.c:2436
 msgid "print a list of available modules with extra detail"
 msgstr ""
 
-#: src/libvlc-module.c:2414
+#: src/libvlc-module.c:2438
 msgid ""
 "print help on a specific module (can be combined with --advanced and --help-"
 "verbose)"
 msgstr ""
 
-#: src/libvlc-module.c:2417
+#: src/libvlc-module.c:2441
 msgid "save the current command line options in the config"
 msgstr ""
 
-#: src/libvlc-module.c:2419
+#: src/libvlc-module.c:2443
 msgid "reset the current config to the default values"
 msgstr ""
 
-#: src/libvlc-module.c:2421
+#: src/libvlc-module.c:2445
 msgid "use alternate config file"
 msgstr ""
 
-#: src/libvlc-module.c:2423
+#: src/libvlc-module.c:2447
 msgid "resets the current plugins cache"
 msgstr ""
 
-#: src/libvlc-module.c:2425
+#: src/libvlc-module.c:2449
 msgid "print version information"
 msgstr ""
 
-#: src/libvlc-module.c:2476
+#: src/libvlc-module.c:2500
 msgid "main program"
 msgstr ""
 
-#: src/misc/update.c:1326
+#: src/misc/update.c:1363
 msgid "File can not be verified"
 msgstr ""
 
-#: src/misc/update.c:1327
+#: src/misc/update.c:1364
 #, c-format
 msgid ""
 "It was not possible to downlaod a cryptographic signature for downloaded "
 "file \"%s\", and so VLC deleted it."
 msgstr ""
 
-#: src/misc/update.c:1338
+#: src/misc/update.c:1375
 msgid "Invalid signature"
 msgstr ""
 
-#: src/misc/update.c:1339
+#: src/misc/update.c:1376
 #, c-format
 msgid ""
 "The cryptographic signature for downloaded file \"%s\" was invalid and "
 "couldn't be used to securely verify it, and so VLC deleted it."
 msgstr ""
 
-#: src/misc/update.c:1351
+#: src/misc/update.c:1388
 msgid "File not verifiable"
 msgstr ""
 
-#: src/misc/update.c:1352
+#: src/misc/update.c:1389
 #, c-format
 msgid ""
 "It was not possible to securely verify downloaded file \"%s\", and so VLC "
 "deleted it."
 msgstr ""
 
-#: src/misc/update.c:1363 src/misc/update.c:1375
+#: src/misc/update.c:1400 src/misc/update.c:1412
 msgid "File corrupted"
 msgstr ""
 
-#: src/misc/update.c:1364 src/misc/update.c:1376
+#: src/misc/update.c:1401 src/misc/update.c:1413
 #, c-format
 msgid "Downloaded file \"%s\" was corrupted, and so VLC deleted it."
 msgstr ""
 
+#: src/misc/variables.c:1114
+#, c-format
+msgid ""
+"playlist item is making use of the following unsafe option '%s', which may "
+"be harmful if used in a malicious way, authorize it ?"
+msgstr ""
+
+#: src/misc/variables.c:1115
+msgid "WARNING: Unsafe Playlist"
+msgstr ""
+
+#: src/misc/variables.c:1115 modules/gui/macosx/update.m:92
+msgid "Yes"
+msgstr ""
+
+#: src/misc/variables.c:1115 modules/gui/macosx/update.m:92
+msgid "No"
+msgstr ""
+
 #: src/playlist/tree.c:65 modules/access/bda/bda.c:61
 #: modules/access/bda/bda.c:113 modules/access/bda/bda.c:121
 #: modules/access/bda/bda.c:128 modules/access/bda/bda.c:134
@@ -4829,8 +4829,8 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: src/video_output/video_output.c:414 modules/gui/macosx/intf.m:704
-#: modules/gui/macosx/intf.m:705 modules/video_filter/deinterlace.c:124
+#: src/video_output/video_output.c:414 modules/gui/macosx/intf.m:734
+#: modules/gui/macosx/intf.m:735 modules/video_filter/deinterlace.c:124
 msgid "Deinterlace"
 msgstr ""
 
@@ -4854,30 +4854,14 @@ msgstr ""
 msgid "Linear"
 msgstr ""
 
-#: src/video_output/vout_intf.c:202
-msgid "1:4 Quarter"
-msgstr ""
-
-#: src/video_output/vout_intf.c:203
-msgid "1:2 Half"
-msgstr ""
-
-#: src/video_output/vout_intf.c:204
-msgid "1:1 Original"
-msgstr ""
-
-#: src/video_output/vout_intf.c:205
-msgid "2:1 Double"
-msgstr ""
-
-#: src/video_output/vout_intf.c:337 modules/gui/macosx/intf.m:698
-#: modules/gui/macosx/intf.m:699 modules/video_filter/crop.c:104
+#: src/video_output/vout_intf.c:337 modules/gui/macosx/intf.m:728
+#: modules/gui/macosx/intf.m:729 modules/video_filter/crop.c:104
 #: modules/video_output/x11/xvmc.c:132
 msgid "Crop"
 msgstr ""
 
-#: src/video_output/vout_intf.c:398 modules/gui/macosx/intf.m:696
-#: modules/gui/macosx/intf.m:697
+#: src/video_output/vout_intf.c:401 modules/gui/macosx/intf.m:726
+#: modules/gui/macosx/intf.m:727
 msgid "Aspect-ratio"
 msgstr ""
 
@@ -4885,7 +4869,7 @@ msgstr ""
 #: modules/access/dshow/dshow.cpp:94 modules/access/dvb/access.c:77
 #: modules/access/dv.c:70 modules/access/dvdnav.c:70
 #: modules/access/dvdread.c:64 modules/access/fake.c:42
-#: modules/access/file.c:85 modules/access/ftp.c:56
+#: modules/access/file.c:82 modules/access/ftp.c:56
 #: modules/access/gnomevfs.c:46 modules/access/http.c:62
 #: modules/access/jack.c:61 modules/access/mms/mms.c:48
 #: modules/access/pvr.c:59 modules/access/screen/screen.c:38
@@ -4901,7 +4885,7 @@ msgid ""
 msgstr ""
 
 #: modules/access/bda/bda.c:44 modules/access/dvb/access.c:82
-#: modules/gui/qt4/components/open_panels.cpp:731
+#: modules/gui/qt4/components/open_panels.cpp:836
 msgid "Adapter card to tune"
 msgstr ""
 
@@ -4916,8 +4900,8 @@ msgid "Device number to use on adapter"
 msgstr ""
 
 #: modules/access/bda/bda.c:51 modules/access/dvb/access.c:88
-#: modules/gui/qt4/components/open_panels.cpp:753
-#: modules/gui/qt4/components/open_panels.cpp:840
+#: modules/gui/qt4/components/open_panels.cpp:595
+#: modules/gui/qt4/components/open_panels.cpp:858
 msgid "Transponder/multiplex frequency"
 msgstr ""
 
@@ -5285,7 +5269,7 @@ msgid "Audio CD - Track %i"
 msgstr ""
 
 #: modules/access/cdda/cdda.c:42 modules/access/directory.c:82
-#: modules/codec/x264.c:358 modules/codec/x264.c:364 modules/codec/x264.c:369
+#: modules/codec/x264.c:377 modules/codec/x264.c:383 modules/codec/x264.c:388
 msgid "none"
 msgstr ""
 
@@ -5508,7 +5492,7 @@ msgstr ""
 
 #: modules/access/cdda/info.c:329 modules/access/cdda/info.c:397
 #: modules/gui/macosx/playlist.m:128
-#: modules/gui/qt4/components/playlist/playlist_item.cpp:123
+#: modules/gui/qt4/components/playlist/playlist_item.cpp:128
 #: modules/gui/qt4/qt4.hpp:42
 msgid "Duration"
 msgstr ""
@@ -5605,8 +5589,8 @@ msgid ""
 msgstr ""
 
 #: modules/access/dshow/dshow.cpp:98 modules/access/v4l.c:80
-#: modules/gui/qt4/components/open_panels.cpp:541
-#: modules/gui/qt4/components/open_panels.cpp:586
+#: modules/gui/qt4/components/open_panels.cpp:646
+#: modules/gui/qt4/components/open_panels.cpp:681
 msgid "Video device name"
 msgstr ""
 
@@ -5617,8 +5601,8 @@ msgid ""
 msgstr ""
 
 #: modules/access/dshow/dshow.cpp:103 modules/access/v4l2/v4l2.c:168
-#: modules/access/v4l.c:84 modules/gui/qt4/components/open_panels.cpp:547
-#: modules/gui/qt4/components/open_panels.cpp:592
+#: modules/access/v4l.c:84 modules/gui/qt4/components/open_panels.cpp:652
+#: modules/gui/qt4/components/open_panels.cpp:687
 msgid "Audio device name"
 msgstr ""
 
@@ -5629,7 +5613,7 @@ msgid ""
 msgstr ""
 
 #: modules/access/dshow/dshow.cpp:108
-#: modules/gui/qt4/components/open_panels.cpp:805
+#: modules/gui/qt4/components/open_panels.cpp:560
 msgid "Video size"
 msgstr ""
 
@@ -5757,7 +5741,8 @@ msgid "DirectShow input"
 msgstr ""
 
 #: modules/access/dshow/dshow.cpp:178 modules/access/dshow/dshow.cpp:183
-#: modules/audio_output/alsa.c:113 modules/video_output/msw/directx.c:176
+#: modules/audio_output/alsa.c:113 modules/audio_output/waveout.c:176
+#: modules/video_output/msw/directx.c:176
 msgid "Refresh list"
 msgstr ""
 
@@ -6042,47 +6027,37 @@ msgstr ""
 msgid "Fake input"
 msgstr ""
 
-#: modules/access/file.c:87
+#: modules/access/file.c:84
 msgid "Caching value for files. This value should be set in milliseconds."
 msgstr ""
 
-#: modules/access/file.c:89
-msgid "Concatenate with additional files"
-msgstr ""
-
-#: modules/access/file.c:91
-msgid ""
-"Play split files as if they were part of a unique file. You need to specify "
-"a comma-separated list of files."
-msgstr ""
-
-#: modules/access/file.c:95
+#: modules/access/file.c:88
 msgid "File input"
 msgstr ""
 
-#: modules/access/file.c:96 modules/access_output/file.c:71
+#: modules/access/file.c:89 modules/access_output/file.c:71
 #: modules/audio_output/file.c:112 modules/gui/beos/InterfaceWindow.cpp:265
 #: modules/gui/beos/MediaControlView.cpp:1236
 #: modules/gui/beos/PlayListWindow.cpp:88 modules/gui/macosx/open.m:162
 #: modules/gui/macosx/open.m:405 modules/gui/macosx/output.m:142
 #: modules/gui/macosx/output.m:230 modules/gui/macosx/output.m:369
 #: modules/gui/pda/pda_interface.c:364 modules/gui/qt4/ui/sout.ui:50
-#: modules/gui/qt4/ui/sprefs_audio.ui:221
+#: modules/gui/qt4/ui/sprefs_audio.ui:283
 #: modules/gui/wxwidgets/dialogs/open.cpp:503
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:471
 msgid "File"
 msgstr ""
 
-#: modules/access/file.c:322 modules/access/file.c:410
-#: modules/access/file.c:565 modules/access/file.c:581
+#: modules/access/file.c:275 modules/access/file.c:407
+#: modules/access/file.c:423 modules/access/mmap.c:216
 msgid "File reading failed"
 msgstr ""
 
-#: modules/access/file.c:323 modules/access/file.c:411
+#: modules/access/file.c:276 modules/access/mmap.c:217
 msgid "VLC could not read the file."
 msgstr ""
 
-#: modules/access/file.c:566 modules/access/file.c:582
+#: modules/access/file.c:408 modules/access/file.c:424
 #, c-format
 msgid "VLC could not open the file \"%s\"."
 msgstr ""
@@ -6098,7 +6073,7 @@ msgid ""
 msgstr ""
 
 #: modules/access_filter/bandwidth.c:44
-#: modules/gui/qt4/components/open_panels.cpp:859
+#: modules/gui/qt4/components/open_panels.cpp:614
 msgid "Bandwidth"
 msgstr ""
 
@@ -6308,7 +6283,7 @@ msgstr ""
 msgid "HTTP authentication"
 msgstr ""
 
-#: modules/access/http.c:351 modules/demux/live555.cpp:551
+#: modules/access/http.c:351 modules/demux/live555.cpp:571
 msgid "Please enter a valid login name and a password."
 msgstr ""
 
@@ -6342,7 +6317,23 @@ msgstr ""
 msgid "JACK Input"
 msgstr ""
 
-#: modules/access/mms/mms.c:50
+#: modules/access/mmap.c:41
+msgid "Use file memory mapping"
+msgstr ""
+
+#: modules/access/mmap.c:43
+msgid "Try to use memory mapping to read files and block devices."
+msgstr ""
+
+#: modules/access/mmap.c:53
+msgid "MMap"
+msgstr ""
+
+#: modules/access/mmap.c:54
+msgid "Memory-mapped file input"
+msgstr ""
+
+#: modules/access/mms/mms.c:50
 msgid ""
 "Caching value for MMS streams. This value should be set in milliseconds."
 msgstr ""
@@ -6389,7 +6380,7 @@ msgstr ""
 msgid "File stream output"
 msgstr ""
 
-#: modules/access_output/http.c:64 modules/gui/qt4/ui/sprefs_audio.ui:300
+#: modules/access_output/http.c:64 modules/gui/qt4/ui/sprefs_audio.ui:362
 #: modules/misc/audioscrobbler.c:131
 msgid "Username"
 msgstr ""
@@ -6400,8 +6391,8 @@ msgstr ""
 
 #: modules/access_output/http.c:67 modules/control/telnet.c:86
 #: modules/gui/qt4/dialogs/interaction.cpp:97
-#: modules/gui/qt4/ui/sprefs_audio.ui:307 modules/misc/audioscrobbler.c:133
-#: modules/misc/notify/growl.c:64
+#: modules/gui/qt4/ui/sprefs_audio.ui:369 modules/misc/audioscrobbler.c:133
+#: modules/misc/notify/growl_udp.c:63
 msgid "Password"
 msgstr ""
 
@@ -6539,7 +6530,7 @@ msgid "IceCAST output"
 msgstr ""
 
 #: modules/access_output/udp.c:66 modules/access/rtsp/access.c:45
-#: modules/demux/live555.cpp:64
+#: modules/demux/live555.cpp:65
 msgid "Caching value (ms)"
 msgstr ""
 
@@ -6578,9 +6569,9 @@ msgid ""
 "milliseconds."
 msgstr ""
 
-#: modules/access/pvr.c:64 modules/gui/qt4/ui/sprefs_audio.ui:137
-#: modules/gui/qt4/ui/sprefs_audio.ui:169
-#: modules/gui/qt4/ui/sprefs_audio.ui:195
+#: modules/access/pvr.c:64 modules/gui/qt4/ui/sprefs_audio.ui:190
+#: modules/gui/qt4/ui/sprefs_audio.ui:225
+#: modules/gui/qt4/ui/sprefs_audio.ui:254
 msgid "Device"
 msgstr ""
 
@@ -6597,8 +6588,8 @@ msgid "PVR radio device"
 msgstr ""
 
 #: modules/access/pvr.c:70 modules/access/v4l.c:99
-#: modules/gui/qt4/components/open_panels.cpp:554
-#: modules/gui/qt4/components/open_panels.cpp:688
+#: modules/gui/qt4/components/open_panels.cpp:694
+#: modules/gui/qt4/components/open_panels.cpp:793
 msgid "Norm"
 msgstr ""
 
@@ -6608,7 +6599,7 @@ msgstr ""
 
 #: modules/access/pvr.c:74 modules/access/v4l2/v4l2.c:100
 #: modules/access/v4l.c:105 modules/demux/rawvid.c:47
-#: modules/video_filter/mosaic.c:98
+#: modules/video_filter/mosaic.c:95
 msgid "Width"
 msgstr ""
 
@@ -6618,7 +6609,7 @@ msgstr ""
 
 #: modules/access/pvr.c:78 modules/access/v4l2/v4l2.c:103
 #: modules/access/v4l.c:108 modules/demux/rawvid.c:51
-#: modules/video_filter/mosaic.c:96
+#: modules/video_filter/mosaic.c:93
 msgid "Height"
 msgstr ""
 
@@ -6627,8 +6618,8 @@ msgid "Height of the stream to capture (-1 for autodetection)."
 msgstr ""
 
 #: modules/access/pvr.c:82 modules/access/v4l2/v4l2.c:229
-#: modules/access/v4l.c:92 modules/gui/qt4/components/open_panels.cpp:561
-#: modules/gui/qt4/components/open_panels.cpp:695
+#: modules/access/v4l.c:92 modules/gui/qt4/components/open_panels.cpp:701
+#: modules/gui/qt4/components/open_panels.cpp:800
 msgid "Frequency"
 msgstr ""
 
@@ -6688,7 +6679,7 @@ msgid "Bitmask that will get used by the audio part of the card."
 msgstr ""
 
 #: modules/access/pvr.c:109 modules/access/v4l2/v4l2.c:188
-#: modules/access/vcdx/info.c:101 modules/gui/macosx/intf.m:616
+#: modules/access/vcdx/info.c:101 modules/gui/macosx/intf.m:646
 #: modules/gui/wxwidgets/interface.cpp:1402
 msgid "Volume"
 msgstr ""
@@ -6857,7 +6848,7 @@ msgid "UDP/RTP input"
 msgstr ""
 
 #: modules/access/v4l2/v4l2.c:78 modules/gui/macosx/open.m:169
-#: modules/gui/qt4/components/open_panels.cpp:675
+#: modules/gui/qt4/components/open_panels.cpp:780
 #: modules/gui/wxwidgets/dialogs/open.cpp:724
 msgid "Device name"
 msgstr ""
@@ -6869,8 +6860,8 @@ msgid ""
 msgstr ""
 
 #: modules/access/v4l2/v4l2.c:82
-#: modules/gui/qt4/components/open_panels.cpp:599
-#: modules/stream_out/standard.c:88
+#: modules/gui/qt4/components/open_panels.cpp:659
+#: modules/stream_out/standard.c:87
 msgid "Standard"
 msgstr ""
 
@@ -6923,8 +6914,9 @@ msgid "Reset controls to defaults provided by the v4l2 driver."
 msgstr ""
 
 #: modules/access/v4l2/v4l2.c:113 modules/access/v4l.c:111
-#: modules/gui/macosx/extended.m:103 modules/gui/qt4/ui/video_effects.ui:242
+#: modules/gui/macosx/extended.m:102 modules/gui/qt4/ui/video_effects.ui:194
 #: modules/gui/wxwidgets/extrapanel.cpp:238
+#: modules/video_filter/atmo/atmo.cpp:192
 msgid "Brightness"
 msgstr ""
 
@@ -6933,7 +6925,7 @@ msgid "Brightness of the video input (if supported by the v4l2 driver)."
 msgstr ""
 
 #: modules/access/v4l2/v4l2.c:116 modules/access/v4l.c:120
-#: modules/gui/macosx/extended.m:104 modules/gui/qt4/ui/video_effects.ui:235
+#: modules/gui/macosx/extended.m:103 modules/gui/qt4/ui/video_effects.ui:187
 #: modules/gui/wxwidgets/extrapanel.cpp:233
 msgid "Contrast"
 msgstr ""
@@ -6942,9 +6934,9 @@ msgstr ""
 msgid "Contrast of the video input (if supported by the v4l2 driver)."
 msgstr ""
 
-#: modules/access/v4l2/v4l2.c:119 modules/gui/macosx/extended.m:107
-#: modules/gui/qt4/ui/video_effects.ui:249
-#: modules/gui/qt4/ui/video_effects.ui:367
+#: modules/access/v4l2/v4l2.c:119 modules/gui/macosx/extended.m:106
+#: modules/gui/qt4/ui/video_effects.ui:201
+#: modules/gui/qt4/ui/video_effects.ui:301
 #: modules/gui/wxwidgets/extrapanel.cpp:243
 msgid "Saturation"
 msgstr ""
@@ -6954,7 +6946,7 @@ msgid "Saturation of the video input (if supported by the v4l2 driver)."
 msgstr ""
 
 #: modules/access/v4l2/v4l2.c:122 modules/access/v4l.c:114
-#: modules/gui/macosx/extended.m:106 modules/gui/qt4/ui/video_effects.ui:256
+#: modules/gui/macosx/extended.m:105 modules/gui/qt4/ui/video_effects.ui:208
 #: modules/gui/wxwidgets/extrapanel.cpp:228
 msgid "Hue"
 msgstr ""
@@ -7007,8 +6999,8 @@ msgstr ""
 msgid "Blue balance of the video input (if supported by the v4l2 driver)."
 msgstr ""
 
-#: modules/access/v4l2/v4l2.c:142 modules/gui/macosx/extended.m:105
-#: modules/gui/qt4/ui/video_effects.ui:228
+#: modules/access/v4l2/v4l2.c:142 modules/gui/macosx/extended.m:104
+#: modules/gui/qt4/ui/video_effects.ui:180
 #: modules/gui/wxwidgets/extrapanel.cpp:248
 msgid "Gamma"
 msgstr ""
@@ -7203,7 +7195,7 @@ msgstr ""
 #: modules/access/v4l2/v4l2.c:257 modules/audio_output/alsa.c:188
 #: modules/audio_output/directx.c:479 modules/audio_output/oss.c:225
 #: modules/audio_output/portaudio.c:402 modules/audio_output/sdl.c:184
-#: modules/audio_output/sdl.c:203 modules/audio_output/waveout.c:434
+#: modules/audio_output/sdl.c:203 modules/audio_output/waveout.c:535
 msgid "Mono"
 msgstr ""
 
@@ -7308,10 +7300,10 @@ msgid "Hue of the video input."
 msgstr ""
 
 #: modules/access/v4l.c:117 modules/gui/fbosd.c:146
-#: modules/gui/qt4/ui/video_effects.ui:304
-#: modules/gui/qt4/ui/video_effects.ui:374
-#: modules/gui/qt4/ui/video_effects.ui:646 modules/misc/notify/xosd.c:82
-#: modules/video_filter/colorthres.c:51 modules/video_filter/marq.c:114
+#: modules/gui/qt4/ui/video_effects.ui:244
+#: modules/gui/qt4/ui/video_effects.ui:308
+#: modules/gui/qt4/ui/video_effects.ui:544 modules/misc/notify/xosd.c:82
+#: modules/video_filter/colorthres.c:51 modules/video_filter/marq.c:119
 #: modules/video_filter/rss.c:149
 msgid "Color"
 msgstr ""
@@ -7394,7 +7386,7 @@ msgstr ""
 #: modules/access/vcdx/access.c:285 modules/access/vcdx/access.c:368
 #: modules/access/vcdx/access.c:694 modules/access/vcdx/info.c:294
 #: modules/access/vcdx/info.c:295
-#: modules/gui/qt4/components/open_panels.cpp:309
+#: modules/gui/qt4/components/open_panels.cpp:310
 msgid "Entry"
 msgstr ""
 
@@ -7416,7 +7408,7 @@ msgstr ""
 msgid "VCD Format"
 msgstr ""
 
-#: modules/access/vcdx/info.c:96 modules/gui/qt4/dialogs/messages.cpp:170
+#: modules/access/vcdx/info.c:96 modules/gui/qt4/dialogs/messages.cpp:259
 msgid "Application"
 msgstr ""
 
@@ -7599,40 +7591,40 @@ msgstr ""
 msgid "Headphone effect"
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/mono.c:89
+#: modules/audio_filter/channel_mixer/mono.c:88
 msgid "Use downmix algorithm"
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/mono.c:90
+#: modules/audio_filter/channel_mixer/mono.c:89
 msgid ""
 "This option selects a stereo to mono downmix algorithm that is used in the "
 "headphone channel mixer. Itgives the effect of standing in a room full of "
 "speakers."
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/mono.c:94
+#: modules/audio_filter/channel_mixer/mono.c:93
 msgid "Select channel to keep"
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/mono.c:95
+#: modules/audio_filter/channel_mixer/mono.c:94
 msgid ""
 "This option silences all other channels except the selected channel. Choose "
 "one from (0=left, 1=right, 2=rear left, 3=rear right, 4=center, 5=left front)"
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/mono.c:101
+#: modules/audio_filter/channel_mixer/mono.c:100
 msgid "Left rear"
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/mono.c:101
+#: modules/audio_filter/channel_mixer/mono.c:100
 msgid "Right rear"
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/mono.c:102
+#: modules/audio_filter/channel_mixer/mono.c:101
 msgid "Left front"
 msgstr ""
 
-#: modules/audio_filter/channel_mixer/mono.c:114
+#: modules/audio_filter/channel_mixer/mono.c:113
 msgid "Audio filter for stereo to mono conversion"
 msgstr ""
 
@@ -7849,7 +7841,7 @@ msgid ""
 msgstr ""
 
 #: modules/audio_filter/normvol.c:82 modules/audio_filter/normvol.c:83
-#: modules/gui/qt4/ui/sprefs_audio.ui:260
+#: modules/gui/qt4/ui/sprefs_audio.ui:322
 msgid "Volume normalizer"
 msgstr ""
 
@@ -7931,7 +7923,7 @@ msgstr ""
 msgid "spatializer"
 msgstr ""
 
-#: modules/audio_mixer/float32.c:48
+#: modules/audio_mixer/float32.c:49
 msgid "Float32 audio mixer"
 msgstr ""
 
@@ -7939,7 +7931,7 @@ msgstr ""
 msgid "Dummy S/PDIF audio mixer"
 msgstr ""
 
-#: modules/audio_mixer/trivial.c:48
+#: modules/audio_mixer/trivial.c:49
 msgid "Trivial audio mixer"
 msgstr ""
 
@@ -7959,19 +7951,19 @@ msgstr ""
 #: modules/audio_output/auhal.c:974 modules/audio_output/directx.c:402
 #: modules/audio_output/oss.c:132 modules/audio_output/portaudio.c:396
 #: modules/audio_output/sdl.c:178 modules/audio_output/sdl.c:196
-#: modules/audio_output/waveout.c:372 modules/gui/macosx/intf.m:681
-#: modules/gui/macosx/intf.m:682
+#: modules/audio_output/waveout.c:465 modules/gui/macosx/intf.m:711
+#: modules/gui/macosx/intf.m:712
 msgid "Audio Device"
 msgstr ""
 
 #: modules/audio_output/alsa.c:201 modules/audio_output/directx.c:452
 #: modules/audio_output/oss.c:181 modules/audio_output/portaudio.c:421
-#: modules/audio_output/waveout.c:406
+#: modules/audio_output/waveout.c:503
 msgid "2 Front 2 Rear"
 msgstr ""
 
 #: modules/audio_output/alsa.c:249 modules/audio_output/directx.c:525
-#: modules/audio_output/oss.c:249 modules/audio_output/waveout.c:450
+#: modules/audio_output/oss.c:249 modules/audio_output/waveout.c:553
 msgid "A/52 over S/PDIF"
 msgstr ""
 
@@ -7998,7 +7990,7 @@ msgstr ""
 msgid "The audio device \"%s\" is already in use."
 msgstr ""
 
-#: modules/audio_output/alsa.c:958
+#: modules/audio_output/alsa.c:960
 msgid "Unknown soundcard"
 msgstr ""
 
@@ -8047,11 +8039,11 @@ msgid ""
 "default device appears as 0 AND another number)."
 msgstr ""
 
-#: modules/audio_output/directx.c:210 modules/audio_output/waveout.c:138
+#: modules/audio_output/directx.c:210 modules/audio_output/waveout.c:154
 msgid "Use float32 output"
 msgstr ""
 
-#: modules/audio_output/directx.c:212 modules/audio_output/waveout.c:140
+#: modules/audio_output/directx.c:212 modules/audio_output/waveout.c:156
 msgid ""
 "The option allows you to enable or disable the high-quality float32 audio "
 "output mode (which is not well supported by some soundcards)."
@@ -8168,15 +8160,50 @@ msgstr ""
 msgid "PORTAUDIO audio output"
 msgstr ""
 
+#: modules/audio_output/pulse.c:58 modules/gui/macosx/intf.m:636
+#: modules/gui/macosx/intf.m:1595 modules/gui/pda/pda_interface.c:210
+#: modules/gui/pda/pda_interface.c:1353 modules/gui/qt4/main_interface.cpp:389
+#: modules/gui/qt4/main_interface.cpp:393
+#: modules/gui/qt4/main_interface.cpp:955
+#: modules/gui/qt4/main_interface.cpp:957
+#: modules/gui/qt4/main_interface.cpp:1021
+#: modules/gui/qt4/main_interface.cpp:1036
+#: modules/gui/qt4/main_interface.cpp:1043
+#: modules/gui/qt4/main_interface.cpp:1060
+msgid "VLC media player"
+msgstr ""
+
+#: modules/audio_output/pulse.c:94
+msgid "Pulseaudio audio output"
+msgstr ""
+
 #: modules/audio_output/sdl.c:68
 msgid "Simple DirectMedia Layer audio output"
 msgstr ""
 
-#: modules/audio_output/waveout.c:145
+#: modules/audio_output/waveout.c:147
+msgid "Microsoft Soundmapper"
+msgstr ""
+
+#: modules/audio_output/waveout.c:158
+msgid "Select Audio Device"
+msgstr ""
+
+#: modules/audio_output/waveout.c:159
+msgid ""
+"Select special Audio device, or let windows decide (default), change needs "
+"VLC restart to apply."
+msgstr ""
+
+#: modules/audio_output/waveout.c:162
+msgid "Default Audio Device"
+msgstr ""
+
+#: modules/audio_output/waveout.c:166
 msgid "Win32 waveOut extension output"
 msgstr ""
 
-#: modules/audio_output/waveout.c:387
+#: modules/audio_output/waveout.c:482
 msgid "5.1"
 msgstr ""
 
@@ -8220,11 +8247,11 @@ msgstr ""
 msgid "CMML annotations decoder"
 msgstr ""
 
-#: modules/codec/csri.c:70
+#: modules/codec/csri.c:66
 msgid "Subtitles (advanced)"
 msgstr ""
 
-#: modules/codec/csri.c:71
+#: modules/codec/csri.c:67
 msgid "Wrapper for subtitle renderers using CSRI/asa"
 msgstr ""
 
@@ -8324,11 +8351,11 @@ msgstr ""
 msgid "AAC audio decoder (using libfaad2)"
 msgstr ""
 
-#: modules/codec/faad.c:362
+#: modules/codec/faad.c:361
 msgid "AAC extension"
 msgstr ""
 
-#: modules/codec/faad.c:366
+#: modules/codec/faad.c:365
 #, c-format
 msgid "%d Hz"
 msgstr ""
@@ -8360,7 +8387,7 @@ msgstr ""
 msgid "Output video height."
 msgstr ""
 
-#: modules/codec/fake.c:64 modules/video_filter/mosaic.c:138
+#: modules/codec/fake.c:64 modules/video_filter/mosaic.c:135
 msgid "Keep aspect ratio"
 msgstr ""
 
@@ -8404,151 +8431,151 @@ msgstr ""
 msgid "Fake video decoder"
 msgstr ""
 
-#: modules/codec/ffmpeg/encoder.c:220
+#: modules/codec/ffmpeg/encoder.c:222
 #, c-format
 msgid "\"%s\" is no video encoder."
 msgstr ""
 
-#: modules/codec/ffmpeg/encoder.c:228
+#: modules/codec/ffmpeg/encoder.c:230
 #, c-format
 msgid "\"%s\" is no audio encoder."
 msgstr ""
 
-#: modules/codec/ffmpeg/encoder.c:240
+#: modules/codec/ffmpeg/encoder.c:242
 #, c-format
 msgid "VLC could not find encoder \"%s\"."
 msgstr ""
 
-#: modules/codec/ffmpeg/encoder.c:601 modules/codec/ffmpeg/encoder.c:610
+#: modules/codec/ffmpeg/encoder.c:616 modules/codec/ffmpeg/encoder.c:625
 msgid "VLC could not open the encoder."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:72
+#: modules/codec/ffmpeg/ffmpeg.c:74
 msgid "Non-ref"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:72
+#: modules/codec/ffmpeg/ffmpeg.c:74
 msgid "Bidir"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:72
+#: modules/codec/ffmpeg/ffmpeg.c:74
 msgid "Non-key"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:72 modules/gui/qt4/dialogs/preferences.cpp:67
+#: modules/codec/ffmpeg/ffmpeg.c:74 modules/gui/qt4/dialogs/preferences.cpp:67
 msgid "All"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:75
+#: modules/codec/ffmpeg/ffmpeg.c:77
 msgid "rd"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:75
+#: modules/codec/ffmpeg/ffmpeg.c:77
 msgid "bits"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:75
+#: modules/codec/ffmpeg/ffmpeg.c:77
 msgid "simple"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:80 modules/codec/ffmpeg/scale.c:76
+#: modules/codec/ffmpeg/ffmpeg.c:82 modules/codec/ffmpeg/scale.c:80
 msgid "Fast bilinear"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:80 modules/codec/ffmpeg/scale.c:76
+#: modules/codec/ffmpeg/ffmpeg.c:82 modules/codec/ffmpeg/scale.c:80
 msgid "Bilinear"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:80 modules/codec/ffmpeg/scale.c:76
+#: modules/codec/ffmpeg/ffmpeg.c:82 modules/codec/ffmpeg/scale.c:80
 msgid "Bicubic (good quality)"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:81 modules/codec/ffmpeg/scale.c:77
+#: modules/codec/ffmpeg/ffmpeg.c:83 modules/codec/ffmpeg/scale.c:81
 msgid "Experimental"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:81 modules/codec/ffmpeg/scale.c:77
+#: modules/codec/ffmpeg/ffmpeg.c:83 modules/codec/ffmpeg/scale.c:81
 msgid "Nearest neighbour (bad quality)"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:82 modules/codec/ffmpeg/scale.c:78
+#: modules/codec/ffmpeg/ffmpeg.c:84 modules/codec/ffmpeg/scale.c:82
 msgid "Area"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:82 modules/codec/ffmpeg/scale.c:78
+#: modules/codec/ffmpeg/ffmpeg.c:84 modules/codec/ffmpeg/scale.c:82
 msgid "Luma bicubic / chroma bilinear"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:82 modules/codec/ffmpeg/scale.c:78
+#: modules/codec/ffmpeg/ffmpeg.c:84 modules/codec/ffmpeg/scale.c:82
 msgid "Gauss"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:83 modules/codec/ffmpeg/scale.c:79
+#: modules/codec/ffmpeg/ffmpeg.c:85 modules/codec/ffmpeg/scale.c:83
 msgid "SincR"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:83 modules/codec/ffmpeg/scale.c:79
+#: modules/codec/ffmpeg/ffmpeg.c:85 modules/codec/ffmpeg/scale.c:83
 msgid "Lanczos"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:83 modules/codec/ffmpeg/scale.c:79
+#: modules/codec/ffmpeg/ffmpeg.c:85 modules/codec/ffmpeg/scale.c:83
 msgid "Bicubic spline"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:89
+#: modules/codec/ffmpeg/ffmpeg.c:91
 msgid ""
 "Various audio and video decoders/encodersdelivered by the FFmpeg library. "
 "This includes (MS)MPEG4, DivX, SV1,H261, H263, H264, WMV, WMA, AAC, AMR, DV, "
 "MJPEG and other codecs"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:100
+#: modules/codec/ffmpeg/ffmpeg.c:102
 msgid ""
 "AltiVec FFmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:104
+#: modules/codec/ffmpeg/ffmpeg.c:106
 msgid "FFmpeg audio/video decoders/encoders"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:108
+#: modules/codec/ffmpeg/ffmpeg.c:110
 msgid "Decoding"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:142
+#: modules/codec/ffmpeg/ffmpeg.c:144
 #: modules/gui/wxwidgets/dialogs/subtitles.cpp:97
 msgid "Encoding"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:143
+#: modules/codec/ffmpeg/ffmpeg.c:145
 msgid "FFmpeg audio/video encoder"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:202
+#: modules/codec/ffmpeg/ffmpeg.c:204
 msgid "FFmpeg demuxer"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:208
+#: modules/codec/ffmpeg/ffmpeg.c:210
 msgid "FFmpeg muxer"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:218 modules/video_filter/scale.c:58
+#: modules/codec/ffmpeg/ffmpeg.c:220 modules/video_filter/scale.c:58
 msgid "Video scaling filter"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:231
+#: modules/codec/ffmpeg/ffmpeg.c:233
 msgid "FFmpeg video filter"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:237
+#: modules/codec/ffmpeg/ffmpeg.c:239
 msgid "FFmpeg crop padd filter"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:244
+#: modules/codec/ffmpeg/ffmpeg.c:246
 msgid "FFmpeg chroma conversion"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:250
+#: modules/codec/ffmpeg/ffmpeg.c:252
 msgid "FFmpeg deinterlace video filter"
 msgstr ""
 
@@ -8803,7 +8830,7 @@ msgid ""
 "same qscale for I and P frames)."
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.h:240 modules/codec/x264.c:297
+#: modules/codec/ffmpeg/ffmpeg.h:240 modules/codec/x264.c:309
 #: modules/demux/mod.c:74
 msgid "Noise reduction"
 msgstr ""
@@ -8958,16 +8985,16 @@ msgstr ""
 msgid "Force use of ffmpeg muxer."
 msgstr ""
 
-#: modules/codec/ffmpeg/postprocess.c:90 modules/gui/macosx/intf.m:706
-#: modules/gui/macosx/intf.m:707
+#: modules/codec/ffmpeg/postprocess.c:92 modules/gui/macosx/intf.m:736
+#: modules/gui/macosx/intf.m:737
 msgid "Post processing"
 msgstr ""
 
-#: modules/codec/ffmpeg/postprocess.c:98
+#: modules/codec/ffmpeg/postprocess.c:100
 msgid "1 (Lowest)"
 msgstr ""
 
-#: modules/codec/ffmpeg/postprocess.c:108
+#: modules/codec/ffmpeg/postprocess.c:110
 msgid "6 (Highest)"
 msgstr ""
 
@@ -9059,11 +9086,11 @@ msgstr ""
 msgid "Speex audio encoder"
 msgstr ""
 
-#: modules/codec/speex.c:772 modules/codec/speex.c:789
+#: modules/codec/speex.c:771 modules/codec/speex.c:788
 msgid "Speex comment"
 msgstr ""
 
-#: modules/codec/speex.c:772 modules/gui/qt4/ui/video_effects.ui:639
+#: modules/codec/speex.c:771 modules/gui/qt4/ui/video_effects.ui:537
 msgid "Mode"
 msgstr ""
 
@@ -9297,21 +9324,21 @@ msgstr ""
 msgid "Vorbis comment"
 msgstr ""
 
-#: modules/codec/x264.c:48
+#: modules/codec/x264.c:51
 msgid "Maximum GOP size"
 msgstr ""
 
-#: modules/codec/x264.c:49
+#: modules/codec/x264.c:52
 msgid ""
 "Sets maximum interval between IDR-frames.Larger values save bits, thus "
 "improving quality for a given bitrate at the cost of seeking precision."
 msgstr ""
 
-#: modules/codec/x264.c:53
+#: modules/codec/x264.c:56
 msgid "Minimum GOP size"
 msgstr ""
 
-#: modules/codec/x264.c:54
+#: modules/codec/x264.c:57
 msgid ""
 "Sets minimum interval between IDR-frames. In H.264, I-frames do not "
 "necessarily bound a closed GOP because it is allowable for a P-frame to be "
@@ -9323,11 +9350,11 @@ msgid ""
 "frames, but do not start a new GOP."
 msgstr ""
 
-#: modules/codec/x264.c:63
+#: modules/codec/x264.c:66
 msgid "Extra I-frames aggressivity"
 msgstr ""
 
-#: modules/codec/x264.c:64
+#: modules/codec/x264.c:67
 msgid ""
 "Scene-cut detection. Controls how aggressively to insert extra I-frames. "
 "With small values of scenecut, the codec often has to force an I-frame when "
@@ -9338,218 +9365,218 @@ msgid ""
 "1 to 100."
 msgstr ""
 
-#: modules/codec/x264.c:75
+#: modules/codec/x264.c:78
 msgid "Faster, less precise scenecut detection"
 msgstr ""
 
-#: modules/codec/x264.c:76
+#: modules/codec/x264.c:79
 msgid ""
 "Faster, less precise scenecut detection. Required and implied by multi-"
 "threading."
 msgstr ""
 
-#: modules/codec/x264.c:80
+#: modules/codec/x264.c:83
 msgid "B-frames between I and P"
 msgstr ""
 
-#: modules/codec/x264.c:81
+#: modules/codec/x264.c:84
 msgid "Number of consecutive B-frames between I and P-frames. Range 1 to 16."
 msgstr ""
 
-#: modules/codec/x264.c:84
+#: modules/codec/x264.c:87
 msgid "Adaptive B-frame decision"
 msgstr ""
 
-#: modules/codec/x264.c:85
+#: modules/codec/x264.c:88
 msgid ""
 "Force the specified number of consecutive B-frames to be used, except "
 "possibly before an I-frame."
 msgstr ""
 
-#: modules/codec/x264.c:88
+#: modules/codec/x264.c:91
 msgid "Influence (bias) B-frames usage"
 msgstr ""
 
-#: modules/codec/x264.c:89
+#: modules/codec/x264.c:92
 msgid ""
 "Bias the choice to use B-frames. Positive values cause more B-frames, "
 "negative values cause less B-frames."
 msgstr ""
 
-#: modules/codec/x264.c:92
+#: modules/codec/x264.c:95
 msgid "Keep some B-frames as references"
 msgstr ""
 
-#: modules/codec/x264.c:93
+#: modules/codec/x264.c:96
 msgid ""
 "Allows B-frames to be used as references for predicting other frames. Keeps "
 "the middle of 2+ consecutive B-frames as a reference, and reorders frame "
 "appropriately."
 msgstr ""
 
-#: modules/codec/x264.c:97
+#: modules/codec/x264.c:100
 msgid "CABAC"
 msgstr ""
 
-#: modules/codec/x264.c:98
+#: modules/codec/x264.c:101
 msgid ""
 "CABAC (Context-Adaptive Binary Arithmetic Coding). Slightly slows down "
 "encoding and decoding, but should save 10 to 15% bitrate."
 msgstr ""
 
-#: modules/codec/x264.c:102
+#: modules/codec/x264.c:105
 msgid "Number of reference frames"
 msgstr ""
 
-#: modules/codec/x264.c:103
+#: modules/codec/x264.c:106
 msgid ""
 "Number of previous frames used as predictors. This is effective in Anime, "
 "but seems to make little difference in live-action source material. Some "
 "decoders are unable to deal with large frameref values. Range 1 to 16."
 msgstr ""
 
-#: modules/codec/x264.c:108
+#: modules/codec/x264.c:111
 msgid "Skip loop filter"
 msgstr ""
 
-#: modules/codec/x264.c:109
+#: modules/codec/x264.c:112
 msgid "Deactivate the deblocking loop filter (decreases quality)."
 msgstr ""
 
-#: modules/codec/x264.c:111
+#: modules/codec/x264.c:114
 msgid "Loop filter AlphaC0 and Beta parameters alpha:beta"
 msgstr ""
 
-#: modules/codec/x264.c:112
+#: modules/codec/x264.c:115
 msgid ""
 "Loop filter AlphaC0 and Beta parameters. Range -6 to 6 for both alpha and "
 "beta parameters. -6 means light filter, 6 means strong."
 msgstr ""
 
-#: modules/codec/x264.c:116
+#: modules/codec/x264.c:119
 msgid "H.264 level"
 msgstr ""
 
-#: modules/codec/x264.c:117
+#: modules/codec/x264.c:120
 msgid ""
 "Specify H.264 level (as defined by Annex A of the standard). Levels are not "
 "enforced; it's up to the user to select a level compatible with the rest of "
 "the encoding options. Range 1 to 5.1 (10 to 51 is also allowed)."
 msgstr ""
 
-#: modules/codec/x264.c:126
+#: modules/codec/x264.c:129
 msgid "Interlaced mode"
 msgstr ""
 
-#: modules/codec/x264.c:127
+#: modules/codec/x264.c:130
 msgid "Pure-interlaced mode."
 msgstr ""
 
-#: modules/codec/x264.c:132
+#: modules/codec/x264.c:135
 msgid "Set QP"
 msgstr ""
 
-#: modules/codec/x264.c:133
+#: modules/codec/x264.c:136
 msgid ""
 "This selects the quantizer to use. Lower values result in better fidelity, "
 "but higher bitrates. 26 is a good default value. Range 0 (lossless) to 51."
 msgstr ""
 
-#: modules/codec/x264.c:137
+#: modules/codec/x264.c:140
 msgid "Quality-based VBR"
 msgstr ""
 
-#: modules/codec/x264.c:138
+#: modules/codec/x264.c:141
 msgid "1-pass Quality-based VBR. Range 0 to 51."
 msgstr ""
 
-#: modules/codec/x264.c:140
+#: modules/codec/x264.c:143
 msgid "Min QP"
 msgstr ""
 
-#: modules/codec/x264.c:141
+#: modules/codec/x264.c:144
 msgid "Minimum quantizer parameter. 15 to 35 seems to be a useful range."
 msgstr ""
 
-#: modules/codec/x264.c:144
+#: modules/codec/x264.c:147
 msgid "Max QP"
 msgstr ""
 
-#: modules/codec/x264.c:145
+#: modules/codec/x264.c:148
 msgid "Maximum quantizer parameter."
 msgstr ""
 
-#: modules/codec/x264.c:147
+#: modules/codec/x264.c:150
 msgid "Max QP step"
 msgstr ""
 
-#: modules/codec/x264.c:148
+#: modules/codec/x264.c:151
 msgid "Max QP step between frames."
 msgstr ""
 
-#: modules/codec/x264.c:150
+#: modules/codec/x264.c:153
 msgid "Average bitrate tolerance"
 msgstr ""
 
-#: modules/codec/x264.c:151
+#: modules/codec/x264.c:154
 msgid "Allowed variance in average bitrate (in kbits/s)."
 msgstr ""
 
-#: modules/codec/x264.c:154
+#: modules/codec/x264.c:157
 msgid "Max local bitrate"
 msgstr ""
 
-#: modules/codec/x264.c:155
+#: modules/codec/x264.c:158
 msgid "Sets a maximum local bitrate (in kbits/s)."
 msgstr ""
 
-#: modules/codec/x264.c:157
+#: modules/codec/x264.c:160
 msgid "VBV buffer"
 msgstr ""
 
-#: modules/codec/x264.c:158
+#: modules/codec/x264.c:161
 msgid "Averaging period for the maximum local bitrate (in kbits)."
 msgstr ""
 
-#: modules/codec/x264.c:161
+#: modules/codec/x264.c:164
 msgid "Initial VBV buffer occupancy"
 msgstr ""
 
-#: modules/codec/x264.c:162
+#: modules/codec/x264.c:165
 msgid ""
 "Sets the initial buffer occupancy as a fraction of the buffer size. Range "
 "0.0 to 1.0."
 msgstr ""
 
-#: modules/codec/x264.c:166
+#: modules/codec/x264.c:169
 msgid "QP factor between I and P"
 msgstr ""
 
-#: modules/codec/x264.c:167
+#: modules/codec/x264.c:170
 msgid "QP factor between I and P. Range 1.0 to 2.0."
 msgstr ""
 
-#: modules/codec/x264.c:170
+#: modules/codec/x264.c:173
 msgid "QP factor between P and B"
 msgstr ""
 
-#: modules/codec/x264.c:171
+#: modules/codec/x264.c:174
 msgid "QP factor between P and B. Range 1.0 to 2.0."
 msgstr ""
 
-#: modules/codec/x264.c:173
+#: modules/codec/x264.c:176
 msgid "QP difference between chroma and luma"
 msgstr ""
 
-#: modules/codec/x264.c:174
+#: modules/codec/x264.c:177
 msgid "QP difference between chroma and luma."
 msgstr ""
 
-#: modules/codec/x264.c:176
+#: modules/codec/x264.c:179
 msgid "Multipass ratecontrol"
 msgstr ""
 
-#: modules/codec/x264.c:177
+#: modules/codec/x264.c:180
 msgid ""
 "Multipass ratecontrol:\n"
 " - 1: First pass, creates stats file\n"
@@ -9557,35 +9584,35 @@ msgid ""
 " - 3: Nth pass, overwrites stats file\n"
 msgstr ""
 
-#: modules/codec/x264.c:182
+#: modules/codec/x264.c:185
 msgid "QP curve compression"
 msgstr ""
 
-#: modules/codec/x264.c:183
+#: modules/codec/x264.c:186
 msgid "QP curve compression. Range 0.0 (CBR) to 1.0 (QCP)."
 msgstr ""
 
-#: modules/codec/x264.c:185 modules/codec/x264.c:189
+#: modules/codec/x264.c:188 modules/codec/x264.c:192
 msgid "Reduce fluctuations in QP"
 msgstr ""
 
-#: modules/codec/x264.c:186
+#: modules/codec/x264.c:189
 msgid ""
 "This reduces the fluctuations in QP before curve compression. Temporally "
 "blurs complexity."
 msgstr ""
 
-#: modules/codec/x264.c:190
+#: modules/codec/x264.c:193
 msgid ""
 "This reduces the fluctations in QP after curve compression. Temporally blurs "
 "quants."
 msgstr ""
 
-#: modules/codec/x264.c:195
+#: modules/codec/x264.c:198
 msgid "Partitions to consider"
 msgstr ""
 
-#: modules/codec/x264.c:196
+#: modules/codec/x264.c:199
 msgid ""
 "Partitions to consider in analyse mode: \n"
 " - none  : \n"
@@ -9596,148 +9623,158 @@ msgid ""
 "(p4x4 requires p8x8. i8x8 requires 8x8dct)."
 msgstr ""
 
-#: modules/codec/x264.c:204
+#: modules/codec/x264.c:207
 msgid "Direct MV prediction mode"
 msgstr ""
 
-#: modules/codec/x264.c:205
+#: modules/codec/x264.c:208
 msgid "Direct MV prediction mode."
 msgstr ""
 
-#: modules/codec/x264.c:208
+#: modules/codec/x264.c:211
 msgid "Direct prediction size"
 msgstr ""
 
-#: modules/codec/x264.c:209
+#: modules/codec/x264.c:212
 msgid ""
 "Direct prediction size:  -  0: 4x4\n"
 " -  1: 8x8\n"
 " - -1: smallest possible according to level\n"
 msgstr ""
 
-#: modules/codec/x264.c:215
+#: modules/codec/x264.c:218
 msgid "Weighted prediction for B-frames"
 msgstr ""
 
-#: modules/codec/x264.c:216
+#: modules/codec/x264.c:219
 msgid "Weighted prediction for B-frames."
 msgstr ""
 
-#: modules/codec/x264.c:218
+#: modules/codec/x264.c:221
 msgid "Integer pixel motion estimation method"
 msgstr ""
 
-#: modules/codec/x264.c:219
+#: modules/codec/x264.c:223
 msgid ""
 "Selects the motion estimation algorithm:  - dia: diamond search, radius 1 "
 "(fast)\n"
 " - hex: hexagonal search, radius 2\n"
 " - umh: uneven multi-hexagon search (better but slower)\n"
 " - esa: exhaustive search (extremely slow, primarily for testing)\n"
+" - tesa: hadamard exhaustive search (extremely slow, primarily for testing)\n"
 msgstr ""
 
-#: modules/codec/x264.c:226
+#: modules/codec/x264.c:230
+msgid ""
+"Selects the motion estimation algorithm:  - dia: diamond search, radius 1 "
+"(fast)\n"
+" - hex: hexagonal search, radius 2\n"
+" - umh: uneven multi-hexagon search (better but slower)\n"
+" - esa: exhaustive search (extremely slow, primarily for testing)\n"
+msgstr ""
+
+#: modules/codec/x264.c:238
 msgid "Maximum motion vector search range"
 msgstr ""
 
-#: modules/codec/x264.c:227
+#: modules/codec/x264.c:239
 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 and 32. Range 0 to 64."
 msgstr ""
 
-#: modules/codec/x264.c:232
+#: modules/codec/x264.c:244
 msgid "Maximum motion vector length"
 msgstr ""
 
-#: modules/codec/x264.c:233
+#: modules/codec/x264.c:245
 msgid ""
 "Maximum motion vector length in pixels. -1 is automatic, based on level."
 msgstr ""
 
-#: modules/codec/x264.c:238
+#: modules/codec/x264.c:250
 msgid "Minimum buffer space between threads"
 msgstr ""
 
-#: modules/codec/x264.c:239
+#: modules/codec/x264.c:251
 msgid ""
 "Minimum buffer space between threads. -1 is automatic, based on number of "
 "threads."
 msgstr ""
 
-#: modules/codec/x264.c:243
+#: modules/codec/x264.c:255
 msgid "Subpixel motion estimation and partition decision quality"
 msgstr ""
 
-#: modules/codec/x264.c:247
+#: modules/codec/x264.c:259
 msgid ""
 "This parameter controls quality versus speed tradeoffs involved in the "
 "motion estimation decision process (lower = quicker and higher = better "
 "quality). Range 1 to 7."
 msgstr ""
 
-#: modules/codec/x264.c:252
+#: modules/codec/x264.c:264
 msgid ""
 "This parameter controls quality versus speed tradeoffs involved in the "
 "motion estimation decision process (lower = quicker and higher = better "
 "quality). Range 1 to 6."
 msgstr ""
 
-#: modules/codec/x264.c:257
+#: modules/codec/x264.c:269
 msgid ""
 "This parameter controls quality versus speed tradeoffs involved in the "
 "motion estimation decision process (lower = quicker and higher = better "
 "quality). Range 1 to 5."
 msgstr ""
 
-#: modules/codec/x264.c:262
+#: modules/codec/x264.c:274
 msgid "RD based mode decision for B-frames"
 msgstr ""
 
-#: modules/codec/x264.c:263
+#: modules/codec/x264.c:275
 msgid "RD based mode decision for B-frames. This requires subme 6 (or higher)."
 msgstr ""
 
-#: modules/codec/x264.c:266
+#: modules/codec/x264.c:278
 msgid "Decide references on a per partition basis"
 msgstr ""
 
-#: modules/codec/x264.c:267
+#: modules/codec/x264.c:279
 msgid ""
 "Allows each 8x8 or 16x8 partition to independently select a reference frame, "
 "as opposed to only one ref per macroblock."
 msgstr ""
 
-#: modules/codec/x264.c:271
+#: modules/codec/x264.c:283
 msgid "Chroma in motion estimation"
 msgstr ""
 
-#: modules/codec/x264.c:272
+#: modules/codec/x264.c:284
 msgid "Chroma ME for subpel and mode decision in P-frames."
 msgstr ""
 
-#: modules/codec/x264.c:275
+#: modules/codec/x264.c:287
 msgid "Jointly optimize both MVs in B-frames"
 msgstr ""
 
-#: modules/codec/x264.c:276
+#: modules/codec/x264.c:288
 msgid "Joint bidirectional motion refinement."
 msgstr ""
 
-#: modules/codec/x264.c:278
+#: modules/codec/x264.c:290
 msgid "Adaptive spatial transform size"
 msgstr ""
 
-#: modules/codec/x264.c:280
+#: modules/codec/x264.c:292
 msgid "SATD-based decision for 8x8 transform in inter-MBs."
 msgstr ""
 
-#: modules/codec/x264.c:282
+#: modules/codec/x264.c:294
 msgid "Trellis RD quantization"
 msgstr ""
 
-#: modules/codec/x264.c:283
+#: modules/codec/x264.c:295
 msgid ""
 "Trellis RD quantization: \n"
 " - 0: disabled\n"
@@ -9746,172 +9783,176 @@ msgid ""
 "This requires CABAC."
 msgstr ""
 
-#: modules/codec/x264.c:289
+#: modules/codec/x264.c:301
 msgid "Early SKIP detection on P-frames"
 msgstr ""
 
-#: modules/codec/x264.c:290
+#: modules/codec/x264.c:302
 msgid "Early SKIP detection on P-frames."
 msgstr ""
 
-#: modules/codec/x264.c:292
+#: modules/codec/x264.c:304
 msgid "Coefficient thresholding on P-frames"
 msgstr ""
 
-#: modules/codec/x264.c:293
+#: modules/codec/x264.c:305
 msgid ""
 "Coefficient thresholding on P-frames.Eliminate dct blocks containing only a "
 "small single coefficient."
 msgstr ""
 
-#: modules/codec/x264.c:298
+#: modules/codec/x264.c:310
 msgid ""
 "Dct-domain noise reduction. Adaptive pseudo-deadzone. 10 to 1000 seems to be "
 "a useful range."
 msgstr ""
 
-#: modules/codec/x264.c:302
+#: modules/codec/x264.c:314
 msgid "Inter luma quantization deadzone"
 msgstr ""
 
-#: modules/codec/x264.c:303
+#: modules/codec/x264.c:315
 msgid "Set the size of the inter luma quantization deadzone. Range 0 to 32."
 msgstr ""
 
-#: modules/codec/x264.c:306
+#: modules/codec/x264.c:318
 msgid "Intra luma quantization deadzone"
 msgstr ""
 
-#: modules/codec/x264.c:307
+#: modules/codec/x264.c:319
 msgid "Set the size of the intra luma quantization deadzone. Range 0 to 32."
 msgstr ""
 
-#: modules/codec/x264.c:314
+#: modules/codec/x264.c:326
 msgid "Non-deterministic optimizations when threaded"
 msgstr ""
 
-#: modules/codec/x264.c:315
+#: modules/codec/x264.c:327
 msgid "Slightly improve quality of SMP, at the cost of repeatability."
 msgstr ""
 
-#: modules/codec/x264.c:319
+#: modules/codec/x264.c:331
 msgid "CPU optimizations"
 msgstr ""
 
-#: modules/codec/x264.c:320
+#: modules/codec/x264.c:332
 msgid "Use assembler CPU optimizations."
 msgstr ""
 
-#: modules/codec/x264.c:322
+#: modules/codec/x264.c:334
 msgid "Filename for 2 pass stats file"
 msgstr ""
 
-#: modules/codec/x264.c:323
+#: modules/codec/x264.c:335
 msgid "Filename for 2 pass stats file for multi-pass encoding."
 msgstr ""
 
-#: modules/codec/x264.c:325
+#: modules/codec/x264.c:337
 msgid "PSNR computation"
 msgstr ""
 
-#: modules/codec/x264.c:326
+#: modules/codec/x264.c:338
 msgid ""
 "Compute and print PSNR stats. This has no effect on the actual encoding "
 "quality."
 msgstr ""
 
-#: modules/codec/x264.c:329
+#: modules/codec/x264.c:341
 msgid "SSIM computation"
 msgstr ""
 
-#: modules/codec/x264.c:330
+#: modules/codec/x264.c:342
 msgid ""
 "Compute and print SSIM stats. This has no effect on the actual encoding "
 "quality."
 msgstr ""
 
-#: modules/codec/x264.c:333
+#: modules/codec/x264.c:345
 msgid "Quiet mode"
 msgstr ""
 
-#: modules/codec/x264.c:334
+#: modules/codec/x264.c:346
 msgid "Quiet mode."
 msgstr ""
 
-#: modules/codec/x264.c:336 modules/gui/macosx/playlistinfo.m:64
-#: modules/gui/qt4/ui/streampanel.ui:31
+#: modules/codec/x264.c:348 modules/gui/macosx/playlistinfo.m:64
+#: modules/gui/qt4/ui/streampanel.ui:28
 #: modules/gui/wxwidgets/dialogs/fileinfo.cpp:85
 msgid "Statistics"
 msgstr ""
 
-#: modules/codec/x264.c:337
+#: modules/codec/x264.c:349
 msgid "Print stats for each frame."
 msgstr ""
 
-#: modules/codec/x264.c:340
+#: modules/codec/x264.c:352
 msgid "SPS and PPS id numbers"
 msgstr ""
 
-#: modules/codec/x264.c:341
+#: modules/codec/x264.c:353
 msgid ""
 "Set SPS and PPS id numbers to allow concatenating streams with different "
 "settings."
 msgstr ""
 
-#: modules/codec/x264.c:345
+#: modules/codec/x264.c:357
 msgid "Access unit delimiters"
 msgstr ""
 
-#: modules/codec/x264.c:346
+#: modules/codec/x264.c:358
 msgid "Generate access unit delimiter NAL units."
 msgstr ""
 
-#: modules/codec/x264.c:352
+#: modules/codec/x264.c:364 modules/codec/x264.c:371
 msgid "dia"
 msgstr ""
 
-#: modules/codec/x264.c:352
+#: modules/codec/x264.c:364 modules/codec/x264.c:371
 msgid "hex"
 msgstr ""
 
-#: modules/codec/x264.c:352
+#: modules/codec/x264.c:364 modules/codec/x264.c:371
 msgid "umh"
 msgstr ""
 
-#: modules/codec/x264.c:352
+#: modules/codec/x264.c:364 modules/codec/x264.c:371
 msgid "esa"
 msgstr ""
 
-#: modules/codec/x264.c:358
+#: modules/codec/x264.c:371
+msgid "tesa"
+msgstr ""
+
+#: modules/codec/x264.c:377
 msgid "fast"
 msgstr ""
 
-#: modules/codec/x264.c:358
+#: modules/codec/x264.c:377
 msgid "normal"
 msgstr ""
 
-#: modules/codec/x264.c:358
+#: modules/codec/x264.c:377
 msgid "slow"
 msgstr ""
 
-#: modules/codec/x264.c:358
+#: modules/codec/x264.c:377
 msgid "all"
 msgstr ""
 
-#: modules/codec/x264.c:364 modules/codec/x264.c:369
+#: modules/codec/x264.c:383 modules/codec/x264.c:388
 msgid "spatial"
 msgstr ""
 
-#: modules/codec/x264.c:364 modules/codec/x264.c:369
+#: modules/codec/x264.c:383 modules/codec/x264.c:388
 msgid "temporal"
 msgstr ""
 
-#: modules/codec/x264.c:364 modules/gui/pda/pda_interface.c:741
-#: modules/video_filter/mosaic.c:170
+#: modules/codec/x264.c:383 modules/gui/pda/pda_interface.c:741
+#: modules/video_filter/mosaic.c:167
 msgid "auto"
 msgstr ""
 
-#: modules/codec/x264.c:373
+#: modules/codec/x264.c:392
 msgid "H.264/MPEG4 AVC encoder (using x264 library)"
 msgstr ""
 
@@ -9958,11 +9999,11 @@ msgstr ""
 msgid "VBI and Teletext decoder"
 msgstr ""
 
-#: modules/control/dbus.c:88
+#: modules/control/dbus.c:103
 msgid "dbus"
 msgstr ""
 
-#: modules/control/dbus.c:91
+#: modules/control/dbus.c:106
 msgid "D-Bus control interface"
 msgstr ""
 
@@ -9999,7 +10040,7 @@ msgid "Define playlist bookmarks."
 msgstr ""
 
 #: modules/control/hotkeys.c:100
-#: modules/gui/qt4/components/simple_preferences.cpp:79
+#: modules/gui/qt4/components/simple_preferences.cpp:81
 msgid "Hotkeys"
 msgstr ""
 
@@ -10007,51 +10048,51 @@ msgstr ""
 msgid "Hotkeys management interface"
 msgstr ""
 
-#: modules/control/hotkeys.c:486
+#: modules/control/hotkeys.c:504
 #, c-format
 msgid "Audio track: %s"
 msgstr ""
 
-#: modules/control/hotkeys.c:501 modules/control/hotkeys.c:530
+#: modules/control/hotkeys.c:519 modules/control/hotkeys.c:548
 #, c-format
 msgid "Subtitle track: %s"
 msgstr ""
 
-#: modules/control/hotkeys.c:501
+#: modules/control/hotkeys.c:519
 msgid "N/A"
 msgstr ""
 
-#: modules/control/hotkeys.c:554
+#: modules/control/hotkeys.c:572
 #, c-format
 msgid "Aspect ratio: %s"
 msgstr ""
 
-#: modules/control/hotkeys.c:580
+#: modules/control/hotkeys.c:598
 #, c-format
 msgid "Crop: %s"
 msgstr ""
 
-#: modules/control/hotkeys.c:606
+#: modules/control/hotkeys.c:624
 #, c-format
 msgid "Deinterlace mode: %s"
 msgstr ""
 
-#: modules/control/hotkeys.c:636
+#: modules/control/hotkeys.c:654
 #, c-format
 msgid "Zoom mode: %s"
 msgstr ""
 
-#: modules/control/hotkeys.c:717 modules/control/hotkeys.c:727
+#: modules/control/hotkeys.c:735 modules/control/hotkeys.c:745
 #, c-format
 msgid "Subtitle delay %i ms"
 msgstr ""
 
-#: modules/control/hotkeys.c:737 modules/control/hotkeys.c:747
+#: modules/control/hotkeys.c:755 modules/control/hotkeys.c:765
 #, c-format
 msgid "Audio delay %i ms"
 msgstr ""
 
-#: modules/control/hotkeys.c:982
+#: modules/control/hotkeys.c:1002
 #, c-format
 msgid "Volume %d%%"
 msgstr ""
@@ -10138,8 +10179,8 @@ msgstr ""
 msgid "Infrared remote control interface"
 msgstr ""
 
-#: modules/control/lirc.c:187 modules/control/rc.c:1882
-#: modules/control/rc.c:1921
+#: modules/control/lirc.c:187 modules/control/rc.c:1889
+#: modules/control/rc.c:1928
 msgid "Please provide one of the following parameters:"
 msgstr ""
 
@@ -10225,503 +10266,495 @@ msgstr ""
 msgid "Windows Service interface"
 msgstr ""
 
-#: modules/control/rc.c:160
+#: modules/control/rc.c:159
 msgid "Show stream position"
 msgstr ""
 
-#: modules/control/rc.c:161
+#: modules/control/rc.c:160
 msgid ""
 "Show the current position in seconds within the stream from time to time."
 msgstr ""
 
-#: modules/control/rc.c:164
+#: modules/control/rc.c:163
 msgid "Fake TTY"
 msgstr ""
 
-#: modules/control/rc.c:165
+#: modules/control/rc.c:164
 msgid "Force the rc module to use stdin as if it was a TTY."
 msgstr ""
 
-#: modules/control/rc.c:167
+#: modules/control/rc.c:166
 msgid "UNIX socket command input"
 msgstr ""
 
-#: modules/control/rc.c:168
+#: modules/control/rc.c:167
 msgid "Accept commands over a Unix socket rather than stdin."
 msgstr ""
 
-#: modules/control/rc.c:171
+#: modules/control/rc.c:170
 msgid "TCP command input"
 msgstr ""
 
-#: modules/control/rc.c:172
+#: modules/control/rc.c:171
 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:176 modules/misc/dummy/dummy.c:51
+#: modules/control/rc.c:175 modules/misc/dummy/dummy.c:51
 msgid "Do not open a DOS command box interface"
 msgstr ""
 
-#: modules/control/rc.c:178
+#: modules/control/rc.c:177
 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:185
+#: modules/control/rc.c:184
 msgid "RC"
 msgstr ""
 
-#: modules/control/rc.c:188
+#: modules/control/rc.c:187
 msgid "Remote control interface"
 msgstr ""
 
-#: modules/control/rc.c:341
+#: modules/control/rc.c:339
 msgid "Remote control interface initialized. Type `help' for help."
 msgstr ""
 
-#: modules/control/rc.c:828
+#: modules/control/rc.c:819
 #, c-format
 msgid "Unknown command `%s'. Type `help' for help."
 msgstr ""
 
-#: modules/control/rc.c:861
+#: modules/control/rc.c:852
 msgid "+----[ Remote control commands ]"
 msgstr ""
 
-#: modules/control/rc.c:863
+#: modules/control/rc.c:854
 msgid "| add XYZ  . . . . . . . . . . . . add XYZ to playlist"
 msgstr ""
 
-#: modules/control/rc.c:864
+#: modules/control/rc.c:855
 msgid "| enqueue XYZ  . . . . . . . . . queue XYZ to playlist"
 msgstr ""
 
-#: modules/control/rc.c:865
+#: modules/control/rc.c:856
 msgid "| playlist . . . . .  show items currently in playlist"
 msgstr ""
 
-#: modules/control/rc.c:866
+#: modules/control/rc.c:857
 msgid "| play . . . . . . . . . . . . . . . . . . play stream"
 msgstr ""
 
-#: modules/control/rc.c:867
+#: modules/control/rc.c:858
 msgid "| stop . . . . . . . . . . . . . . . . . . stop stream"
 msgstr ""
 
-#: modules/control/rc.c:868
+#: modules/control/rc.c:859
 msgid "| next . . . . . . . . . . . . . .  next playlist item"
 msgstr ""
 
-#: modules/control/rc.c:869
+#: modules/control/rc.c:860
 msgid "| prev . . . . . . . . . . . .  previous playlist item"
 msgstr ""
 
-#: modules/control/rc.c:870
+#: modules/control/rc.c:861
 msgid "| goto . . . . . . . . . . . . . .  goto item at index"
 msgstr ""
 
-#: modules/control/rc.c:871
+#: modules/control/rc.c:862
 msgid "| repeat [on|off] . . . .  toggle playlist item repeat"
 msgstr ""
 
-#: modules/control/rc.c:872
+#: modules/control/rc.c:863
 msgid "| loop [on|off] . . . . . . . . . toggle playlist loop"
 msgstr ""
 
-#: modules/control/rc.c:873
+#: modules/control/rc.c:864
 msgid "| random [on|off] . . . . . . .  toggle random jumping"
 msgstr ""
 
-#: modules/control/rc.c:874
+#: modules/control/rc.c:865
 msgid "| clear . . . . . . . . . . . . . . clear the playlist"
 msgstr ""
 
-#: modules/control/rc.c:875
+#: modules/control/rc.c:866
 msgid "| status . . . . . . . . . . . current playlist status"
 msgstr ""
 
-#: modules/control/rc.c:876
+#: modules/control/rc.c:867
 msgid "| title [X]  . . . . . . set/get title in current item"
 msgstr ""
 
-#: modules/control/rc.c:877
+#: modules/control/rc.c:868
 msgid "| title_n  . . . . . . . .  next title in current item"
 msgstr ""
 
-#: modules/control/rc.c:878
+#: modules/control/rc.c:869
 msgid "| title_p  . . . . . .  previous title in current item"
 msgstr ""
 
-#: modules/control/rc.c:879
+#: modules/control/rc.c:870
 msgid "| chapter [X]  . . . . set/get chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:880
+#: modules/control/rc.c:871
 msgid "| chapter_n  . . . . . .  next chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:881
+#: modules/control/rc.c:872
 msgid "| chapter_p  . . . .  previous chapter in current item"
 msgstr ""
 
-#: modules/control/rc.c:883
+#: modules/control/rc.c:874
 msgid "| seek X . . . seek in seconds, for instance `seek 12'"
 msgstr ""
 
-#: modules/control/rc.c:884
+#: modules/control/rc.c:875
 msgid "| pause  . . . . . . . . . . . . . . . .  toggle pause"
 msgstr ""
 
-#: modules/control/rc.c:885
+#: modules/control/rc.c:876
 msgid "| fastforward  . . . . . . . .  .  set to maximum rate"
 msgstr ""
 
-#: modules/control/rc.c:886
+#: modules/control/rc.c:877
 msgid "| rewind  . . . . . . . . . . . .  set to minimum rate"
 msgstr ""
 
-#: modules/control/rc.c:887
+#: modules/control/rc.c:878
 msgid "| faster . . . . . . . . . .  faster playing of stream"
 msgstr ""
 
-#: modules/control/rc.c:888
+#: modules/control/rc.c:879
 msgid "| slower . . . . . . . . . .  slower playing of stream"
 msgstr ""
 
-#: modules/control/rc.c:889
+#: modules/control/rc.c:880
 msgid "| normal . . . . . . . . . .  normal playing of stream"
 msgstr ""
 
-#: modules/control/rc.c:890
+#: modules/control/rc.c:881
 msgid "| f [on|off] . . . . . . . . . . . . toggle fullscreen"
 msgstr ""
 
-#: modules/control/rc.c:891
+#: modules/control/rc.c:882
 msgid "| info . . . . .  information about the current stream"
 msgstr ""
 
-#: modules/control/rc.c:892
+#: modules/control/rc.c:883
 msgid "| stats  . . . . . . . .  show statistical information"
 msgstr ""
 
-#: modules/control/rc.c:893
+#: modules/control/rc.c:884
 msgid "| get_time . . seconds elapsed since stream's beginning"
 msgstr ""
 
-#: modules/control/rc.c:894
+#: modules/control/rc.c:885
 msgid "| is_playing . . . .  1 if a stream plays, 0 otherwise"
 msgstr ""
 
-#: modules/control/rc.c:895
+#: modules/control/rc.c:886
 msgid "| get_title . . . . .  the title of the current stream"
 msgstr ""
 
-#: modules/control/rc.c:896
+#: modules/control/rc.c:887
 msgid "| get_length . . . .  the length of the current stream"
 msgstr ""
 
-#: modules/control/rc.c:898
+#: modules/control/rc.c:889
 msgid "| volume [X] . . . . . . . . . .  set/get audio volume"
 msgstr ""
 
-#: modules/control/rc.c:899
+#: modules/control/rc.c:890
 msgid "| volup [X]  . . . . . . .  raise audio volume X steps"
 msgstr ""
 
-#: modules/control/rc.c:900
+#: modules/control/rc.c:891
 msgid "| voldown [X]  . . . . . .  lower audio volume X steps"
 msgstr ""
 
-#: modules/control/rc.c:901
+#: modules/control/rc.c:892
 msgid "| adev [X] . . . . . . . . . . .  set/get audio device"
 msgstr ""
 
-#: modules/control/rc.c:902
+#: modules/control/rc.c:893
 msgid "| achan [X]. . . . . . . . . .  set/get audio channels"
 msgstr ""
 
-#: modules/control/rc.c:903
+#: modules/control/rc.c:894
 msgid "| atrack [X] . . . . . . . . . . . set/get audio track"
 msgstr ""
 
-#: modules/control/rc.c:904
+#: modules/control/rc.c:895
 msgid "| vtrack [X] . . . . . . . . . . . set/get video track"
 msgstr ""
 
-#: modules/control/rc.c:905
+#: modules/control/rc.c:896
 msgid "| vratio [X]  . . . . . . . set/get video aspect ratio"
 msgstr ""
 
-#: modules/control/rc.c:906
+#: modules/control/rc.c:897
 msgid "| vcrop [X]  . . . . . . . . . . .  set/get video crop"
 msgstr ""
 
-#: modules/control/rc.c:907
+#: modules/control/rc.c:898
 msgid "| vzoom [X]  . . . . . . . . . . .  set/get video zoom"
 msgstr ""
 
-#: modules/control/rc.c:908
+#: modules/control/rc.c:899
 msgid "| snapshot . . . . . . . . . . . . take video snapshot"
 msgstr ""
 
-#: modules/control/rc.c:909
+#: modules/control/rc.c:900
 msgid "| strack [X] . . . . . . . . . set/get subtitles track"
 msgstr ""
 
-#: modules/control/rc.c:910
+#: modules/control/rc.c:901
 msgid "| key [hotkey name] . . . . . .  simulate hotkey press"
 msgstr ""
 
-#: modules/control/rc.c:911
+#: modules/control/rc.c:902
 msgid "| menu . . [on|off|up|down|left|right|select] use menu"
 msgstr ""
 
-#: modules/control/rc.c:916
+#: modules/control/rc.c:907
 msgid "| @name marq-marquee  STRING  . . overlay STRING in video"
 msgstr ""
 
-#: modules/control/rc.c:917
+#: modules/control/rc.c:908
 msgid "| @name marq-x X . . . . . . . . . . . .offset from left"
 msgstr ""
 
-#: modules/control/rc.c:918
+#: modules/control/rc.c:909
 msgid "| @name marq-y Y . . . . . . . . . . . . offset from top"
 msgstr ""
 
-#: modules/control/rc.c:919
+#: modules/control/rc.c:910
 msgid "| @name marq-position #. . .  .relative position control"
 msgstr ""
 
-#: modules/control/rc.c:920
+#: modules/control/rc.c:911
 msgid "| @name marq-color # . . . . . . . . . . font color, RGB"
 msgstr ""
 
-#: modules/control/rc.c:921
+#: modules/control/rc.c:912
 msgid "| @name marq-opacity # . . . . . . . . . . . . . opacity"
 msgstr ""
 
-#: modules/control/rc.c:922
+#: modules/control/rc.c:913
 msgid "| @name marq-timeout T. . . . . . . . . . timeout, in ms"
 msgstr ""
 
-#: modules/control/rc.c:923
+#: modules/control/rc.c:914
 msgid "| @name marq-size # . . . . . . . . font size, in pixels"
 msgstr ""
 
-#: modules/control/rc.c:925
+#: modules/control/rc.c:916
 msgid "| @name logo-file STRING . . .the overlay file path/name"
 msgstr ""
 
-#: modules/control/rc.c:926
+#: modules/control/rc.c:917
 msgid "| @name logo-x X . . . . . . . . . . . .offset from left"
 msgstr ""
 
-#: modules/control/rc.c:927
+#: modules/control/rc.c:918
 msgid "| @name logo-y Y . . . . . . . . . . . . offset from top"
 msgstr ""
 
-#: modules/control/rc.c:928
+#: modules/control/rc.c:919
 msgid "| @name logo-position #. . . . . . . . relative position"
 msgstr ""
 
-#: modules/control/rc.c:929
+#: modules/control/rc.c:920
 msgid "| @name logo-transparency #. . . . . . . . .transparency"
 msgstr ""
 
-#: modules/control/rc.c:931
+#: modules/control/rc.c:922
 msgid "| @name mosaic-alpha # . . . . . . . . . . . . . . alpha"
 msgstr ""
 
-#: modules/control/rc.c:932
+#: modules/control/rc.c:923
 msgid "| @name mosaic-height #. . . . . . . . . . . . . .height"
 msgstr ""
 
-#: modules/control/rc.c:933
+#: modules/control/rc.c:924
 msgid "| @name mosaic-width # . . . . . . . . . . . . . . width"
 msgstr ""
 
-#: modules/control/rc.c:934
+#: modules/control/rc.c:925
 msgid "| @name mosaic-xoffset # . . . .top left corner position"
 msgstr ""
 
-#: modules/control/rc.c:935
+#: modules/control/rc.c:926
 msgid "| @name mosaic-yoffset # . . . .top left corner position"
 msgstr ""
 
-#: modules/control/rc.c:936
+#: modules/control/rc.c:927
 msgid "| @name mosaic-offsets x,y(,x,y)*. . . . list of offsets"
 msgstr ""
 
-#: modules/control/rc.c:937
+#: modules/control/rc.c:928
 msgid "| @name mosaic-align 0..2,4..6,8..10. . .mosaic alignment"
 msgstr ""
 
-#: modules/control/rc.c:938
+#: modules/control/rc.c:929
 msgid "| @name mosaic-vborder # . . . . . . . . vertical border"
 msgstr ""
 
-#: modules/control/rc.c:939
+#: modules/control/rc.c:930
 msgid "| @name mosaic-hborder # . . . . . . . horizontal border"
 msgstr ""
 
-#: modules/control/rc.c:940
+#: modules/control/rc.c:931
 msgid "| @name mosaic-position {0=auto,1=fixed} . . . .position"
 msgstr ""
 
-#: modules/control/rc.c:941
+#: modules/control/rc.c:932
 msgid "| @name mosaic-rows #. . . . . . . . . . .number of rows"
 msgstr ""
 
-#: modules/control/rc.c:942
+#: modules/control/rc.c:933
 msgid "| @name mosaic-cols #. . . . . . . . . . .number of cols"
 msgstr ""
 
-#: modules/control/rc.c:943
+#: modules/control/rc.c:934
 msgid "| @name mosaic-order id(,id)* . . . . order of pictures "
 msgstr ""
 
-#: modules/control/rc.c:944
+#: modules/control/rc.c:935
 msgid "| @name mosaic-keep-aspect-ratio {0,1} . . .aspect ratio"
 msgstr ""
 
-#: modules/control/rc.c:947
+#: modules/control/rc.c:938
 msgid ""
 "| check-updates [newer] [equal] [older]\n"
 "|               [undef] [info] [source] [binary] [plugin]"
 msgstr ""
 
-#: modules/control/rc.c:952
+#: modules/control/rc.c:943
 msgid "| help . . . . . . . . . . . . . . . this help message"
 msgstr ""
 
-#: modules/control/rc.c:953
+#: modules/control/rc.c:944
 msgid "| longhelp . . . . . . . . . . . a longer help message"
 msgstr ""
 
-#: modules/control/rc.c:954
+#: modules/control/rc.c:945
 msgid "| logout . . . . . . .  exit (if in socket connection)"
 msgstr ""
 
-#: modules/control/rc.c:955
+#: modules/control/rc.c:946
 msgid "| quit . . . . . . . . . . . . . . . . . . .  quit vlc"
 msgstr ""
 
-#: modules/control/rc.c:957
+#: modules/control/rc.c:948
 msgid "+----[ end of help ]"
 msgstr ""
 
-#: modules/control/rc.c:1066
+#: modules/control/rc.c:1064
 msgid "Press menu select or pause to continue."
 msgstr ""
 
-#: modules/control/rc.c:1302 modules/control/rc.c:1552
-#: modules/control/rc.c:1622 modules/control/rc.c:1798
-#: modules/control/rc.c:1897
+#: modules/control/rc.c:1301 modules/control/rc.c:1555
+#: modules/control/rc.c:1626 modules/control/rc.c:1804
+#: modules/control/rc.c:1904
 msgid "Type 'menu select' or 'pause' to continue."
 msgstr ""
 
-#: modules/control/rc.c:1397
+#: modules/control/rc.c:1396
 msgid "Error: `goto' needs an argument greater than zero."
 msgstr ""
 
-#: modules/control/rc.c:1408
+#: modules/control/rc.c:1407
 #, c-format
 msgid "Playlist has only %d elements"
 msgstr ""
 
-#: modules/control/rc.c:1947
-msgid "statistics update on"
-msgstr ""
-
-#: modules/control/rc.c:1949
-msgid "statistics update off"
-msgstr ""
-
-#: modules/control/rc.c:1956
+#: modules/control/rc.c:1962
 msgid "Unknown command!"
 msgstr ""
 
-#: modules/control/rc.c:1972
+#: modules/control/rc.c:1978
 msgid "+-[Incoming]"
 msgstr ""
 
-#: modules/control/rc.c:1973
+#: modules/control/rc.c:1979
 #, c-format
 msgid "| input bytes read : %8.0f kB"
 msgstr ""
 
-#: modules/control/rc.c:1975
+#: modules/control/rc.c:1981
 #, c-format
 msgid "| input bitrate    :   %6.0f kb/s"
 msgstr ""
 
-#: modules/control/rc.c:1977
+#: modules/control/rc.c:1983
 #, c-format
 msgid "| demux bytes read : %8.0f kB"
 msgstr ""
 
-#: modules/control/rc.c:1979
+#: modules/control/rc.c:1985
 #, c-format
 msgid "| demux bitrate    :   %6.0f kb/s"
 msgstr ""
 
-#: modules/control/rc.c:1983
+#: modules/control/rc.c:1989
 msgid "+-[Video Decoding]"
 msgstr ""
 
-#: modules/control/rc.c:1984
+#: modules/control/rc.c:1990
 #, c-format
 msgid "| video decoded    :    %5i"
 msgstr ""
 
-#: modules/control/rc.c:1986
+#: modules/control/rc.c:1992
 #, c-format
 msgid "| frames displayed :    %5i"
 msgstr ""
 
-#: modules/control/rc.c:1988
+#: modules/control/rc.c:1994
 #, c-format
 msgid "| frames lost      :    %5i"
 msgstr ""
 
-#: modules/control/rc.c:1992
+#: modules/control/rc.c:1998
 msgid "+-[Audio Decoding]"
 msgstr ""
 
-#: modules/control/rc.c:1993
+#: modules/control/rc.c:1999
 #, c-format
 msgid "| audio decoded    :    %5i"
 msgstr ""
 
-#: modules/control/rc.c:1995
+#: modules/control/rc.c:2001
 #, c-format
 msgid "| buffers played   :    %5i"
 msgstr ""
 
-#: modules/control/rc.c:1997
+#: modules/control/rc.c:2003
 #, c-format
 msgid "| buffers lost     :    %5i"
 msgstr ""
 
-#: modules/control/rc.c:2001
+#: modules/control/rc.c:2007
 msgid "+-[Streaming]"
 msgstr ""
 
-#: modules/control/rc.c:2002
+#: modules/control/rc.c:2008
 #, c-format
 msgid "| packets sent     :    %5i"
 msgstr ""
 
-#: modules/control/rc.c:2003
+#: modules/control/rc.c:2009
 #, c-format
 msgid "| bytes sent       : %8.0f kB"
 msgstr ""
 
-#: modules/control/rc.c:2005
+#: modules/control/rc.c:2011
 #, c-format
 msgid "| sending bitrate  :   %6.0f kb/s"
 msgstr ""
@@ -10783,11 +10816,11 @@ msgstr ""
 msgid "ASF v1.0 demuxer"
 msgstr ""
 
-#: modules/demux/asf/asf.c:170
+#: modules/demux/asf/asf.c:177
 msgid "Could not demux ASF stream"
 msgstr ""
 
-#: modules/demux/asf/asf.c:171
+#: modules/demux/asf/asf.c:178
 msgid "VLC failed to load the ASF header."
 msgstr ""
 
@@ -10829,11 +10862,11 @@ msgstr ""
 msgid "AVI demuxer"
 msgstr ""
 
-#: modules/demux/avi/avi.c:592
+#: modules/demux/avi/avi.c:667
 msgid "AVI Index"
 msgstr ""
 
-#: modules/demux/avi/avi.c:593
+#: modules/demux/avi/avi.c:668
 msgid ""
 "This AVI file is broken. Seeking will not work correctly.\n"
 "Do you want to try to repair it?\n"
@@ -10841,15 +10874,15 @@ msgid ""
 "This might take a long time."
 msgstr ""
 
-#: modules/demux/avi/avi.c:596
+#: modules/demux/avi/avi.c:671
 msgid "Repair"
 msgstr ""
 
-#: modules/demux/avi/avi.c:596
+#: modules/demux/avi/avi.c:671
 msgid "Don't repair"
 msgstr ""
 
-#: modules/demux/avi/avi.c:2310 modules/demux/avi/avi.c:2333
+#: modules/demux/avi/avi.c:2386 modules/demux/avi/avi.c:2409
 msgid "Fixing AVI Index..."
 msgstr ""
 
@@ -10889,75 +10922,75 @@ msgstr ""
 msgid "GME demuxer (Game_Music_Emu)"
 msgstr ""
 
-#: modules/demux/live555.cpp:66
+#: modules/demux/live555.cpp:67
 msgid ""
 "Allows you to modify the default caching value for RTSP streams. This value "
 "should be set in millisecond units."
 msgstr ""
 
-#: modules/demux/live555.cpp:69
+#: modules/demux/live555.cpp:70
 msgid "Kasenna RTSP dialect"
 msgstr ""
 
-#: modules/demux/live555.cpp:70
+#: modules/demux/live555.cpp:71
 msgid ""
 "Kasenna servers use an old and unstandard dialect of RTSP. When you set this "
 "parameter, VLC will try this dialect for communication. In this mode you "
 "cannot connect to normal RTSP servers."
 msgstr ""
 
-#: modules/demux/live555.cpp:74
+#: modules/demux/live555.cpp:75
 msgid "RTSP user name"
 msgstr ""
 
-#: modules/demux/live555.cpp:75
+#: modules/demux/live555.cpp:76
 msgid ""
 "Allows you to modify the user name that will be used for authenticating the "
 "connection."
 msgstr ""
 
-#: modules/demux/live555.cpp:77
+#: modules/demux/live555.cpp:78
 msgid "RTSP password"
 msgstr ""
 
-#: modules/demux/live555.cpp:78
+#: modules/demux/live555.cpp:79
 msgid "Allows you to modify the password that will be used for the connection."
 msgstr ""
 
-#: modules/demux/live555.cpp:82
+#: modules/demux/live555.cpp:83
 msgid "RTP/RTSP/SDP demuxer (using Live555)"
 msgstr ""
 
-#: modules/demux/live555.cpp:92
+#: modules/demux/live555.cpp:93
 msgid "RTSP/RTP access and demux"
 msgstr ""
 
-#: modules/demux/live555.cpp:98 modules/demux/live555.cpp:99
+#: modules/demux/live555.cpp:99 modules/demux/live555.cpp:100
 #: modules/gui/qt4/ui/sprefs_input.ui:153
 msgid "Use RTP over RTSP (TCP)"
 msgstr ""
 
-#: modules/demux/live555.cpp:101
+#: modules/demux/live555.cpp:102
 msgid "Client port"
 msgstr ""
 
-#: modules/demux/live555.cpp:102
+#: modules/demux/live555.cpp:103
 msgid "Port to use for the RTP source of the session"
 msgstr ""
 
-#: modules/demux/live555.cpp:104 modules/demux/live555.cpp:105
+#: modules/demux/live555.cpp:105 modules/demux/live555.cpp:106
 msgid "Tunnel RTSP and RTP over HTTP"
 msgstr ""
 
-#: modules/demux/live555.cpp:107
+#: modules/demux/live555.cpp:108
 msgid "HTTP tunnel port"
 msgstr ""
 
-#: modules/demux/live555.cpp:108
+#: modules/demux/live555.cpp:109
 msgid "Port to use for tunneling the RTSP/RTP over HTTP."
 msgstr ""
 
-#: modules/demux/live555.cpp:550
+#: modules/demux/live555.cpp:570
 msgid "RTSP authentication"
 msgstr ""
 
@@ -11328,7 +11361,7 @@ msgstr ""
 msgid "Force chroma. This is a four character string."
 msgstr ""
 
-#: modules/demux/rawvid.c:58 modules/stream_out/switcher.c:89
+#: modules/demux/rawvid.c:58 modules/stream_out/switcher.c:91
 msgid "Aspect ratio"
 msgstr ""
 
@@ -11348,39 +11381,55 @@ msgstr ""
 msgid "SMF demuxer"
 msgstr ""
 
-#: modules/demux/subtitle.c:52
+#: modules/demux/subtitle_asa.c:55 modules/demux/subtitle.c:52
 msgid "Apply a delay to all subtitles (in 1/10s, eg 100 means 10s)."
 msgstr ""
 
-#: modules/demux/subtitle.c:54
+#: modules/demux/subtitle_asa.c:57
 msgid ""
-"Override the normal frames per second settings. This will only work with "
-"MicroDVD and SubRIP (SRT) subtitles."
+"Override the normal frames per second settings. This will only affect frame-"
+"based subtitle formats without a fixed value."
 msgstr ""
 
-#: modules/demux/subtitle.c:57
+#: modules/demux/subtitle_asa.c:60
 msgid ""
-"Force the subtiles format. Valid values are : \"microdvd\", \"subrip\",  "
-"\"ssa1\", \"ssa2-4\", \"ass\", \"vplayer\" \"sami\", \"dvdsubtitle\", \"mpl2"
-"\" and \"auto\" (meaning autodetection, this should always work)."
+"Force the subtiles format. Use \"auto\", the set of supported values varies."
+msgstr ""
+
+#: modules/demux/subtitle_asa.c:63
+msgid "Subtitles (asa demuxer)"
 msgstr ""
 
-#: modules/demux/subtitle.c:69
+#: modules/demux/subtitle_asa.c:64 modules/demux/subtitle.c:69
 msgid "Text subtitles parser"
 msgstr ""
 
-#: modules/demux/subtitle.c:74 modules/gui/wxwidgets/dialogs/subtitles.cpp:202
+#: modules/demux/subtitle_asa.c:69 modules/demux/subtitle.c:74
+#: modules/gui/wxwidgets/dialogs/subtitles.cpp:202
 msgid "Frames per second"
 msgstr ""
 
-#: modules/demux/subtitle.c:77
+#: modules/demux/subtitle_asa.c:72 modules/demux/subtitle.c:77
 msgid "Subtitles delay"
 msgstr ""
 
-#: modules/demux/subtitle.c:79
+#: modules/demux/subtitle_asa.c:74 modules/demux/subtitle.c:79
 msgid "Subtitles format"
 msgstr ""
 
+#: modules/demux/subtitle.c:54
+msgid ""
+"Override the normal frames per second settings. This will only work with "
+"MicroDVD and SubRIP (SRT) subtitles."
+msgstr ""
+
+#: modules/demux/subtitle.c:57
+msgid ""
+"Force the subtiles format. Valid values are : \"microdvd\", \"subrip\",  "
+"\"ssa1\", \"ssa2-4\", \"ass\", \"vplayer\" \"sami\", \"dvdsubtitle\", \"mpl2"
+"\" and \"auto\" (meaning autodetection, this should always work)."
+msgstr ""
+
 #: modules/demux/ts.c:95
 msgid "Extra PMT"
 msgstr ""
@@ -11482,51 +11531,51 @@ msgstr ""
 msgid "MPEG Transport Stream demuxer"
 msgstr ""
 
-#: modules/demux/ts.c:3321
+#: modules/demux/ts.c:3320
 msgid "Teletext subtitles"
 msgstr ""
 
-#: modules/demux/ts.c:3331
+#: modules/demux/ts.c:3330
 msgid "Teletext hearing impaired subtitles"
 msgstr ""
 
-#: modules/demux/ts.c:3426
+#: modules/demux/ts.c:3425
 msgid "subtitles"
 msgstr ""
 
-#: modules/demux/ts.c:3430
+#: modules/demux/ts.c:3429
 msgid "4:3 subtitles"
 msgstr ""
 
-#: modules/demux/ts.c:3434
+#: modules/demux/ts.c:3433
 msgid "16:9 subtitles"
 msgstr ""
 
-#: modules/demux/ts.c:3438
+#: modules/demux/ts.c:3437
 msgid "2.21:1 subtitles"
 msgstr ""
 
-#: modules/demux/ts.c:3442 modules/demux/ts.c:3594 modules/demux/ts.c:3635
+#: modules/demux/ts.c:3441 modules/demux/ts.c:3593 modules/demux/ts.c:3634
 msgid "hearing impaired"
 msgstr ""
 
-#: modules/demux/ts.c:3446
+#: modules/demux/ts.c:3445
 msgid "4:3 hearing impaired"
 msgstr ""
 
-#: modules/demux/ts.c:3450
+#: modules/demux/ts.c:3449
 msgid "16:9 hearing impaired"
 msgstr ""
 
-#: modules/demux/ts.c:3454
+#: modules/demux/ts.c:3453
 msgid "2.21:1 hearing impaired"
 msgstr ""
 
-#: modules/demux/ts.c:3590 modules/demux/ts.c:3631
+#: modules/demux/ts.c:3589 modules/demux/ts.c:3630
 msgid "clean effects"
 msgstr ""
 
-#: modules/demux/ts.c:3598 modules/demux/ts.c:3639
+#: modules/demux/ts.c:3597 modules/demux/ts.c:3638
 msgid "visual impaired commentary"
 msgstr ""
 
@@ -11581,9 +11630,9 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:161 modules/gui/macosx/open.m:478
 #: modules/gui/macosx/open.m:669 modules/gui/macosx/open.m:782
 #: modules/gui/macosx/open.m:931 modules/gui/qt4/dialogs/open.cpp:72
-#: modules/gui/qt4/menus.cpp:537 modules/gui/wxwidgets/interface.cpp:692
-#: modules/gui/wxwidgets/interface.cpp:703 modules/gui/wxwidgets/menus.cpp:355
-#: modules/gui/wxwidgets/menus.cpp:411
+#: modules/gui/qt4/menus.cpp:526 modules/gui/wxwidgets/interface.cpp:692
+#: modules/gui/wxwidgets/interface.cpp:703 modules/gui/wxwidgets/menus.cpp:345
+#: modules/gui/wxwidgets/menus.cpp:401
 msgid "Open"
 msgstr ""
 
@@ -11595,8 +11644,9 @@ msgid "Preferences"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:239
-#: modules/gui/beos/InterfaceWindow.cpp:330 modules/gui/macosx/intf.m:621
-#: modules/gui/qt4/dialogs/messages.cpp:43
+#: modules/gui/beos/InterfaceWindow.cpp:330 modules/gui/macosx/intf.m:651
+#: modules/gui/qt4/dialogs/messages.cpp:48
+#: modules/gui/qt4/dialogs/messages.cpp:66
 #: modules/gui/wxwidgets/dialogs/messages.cpp:47
 msgid "Messages"
 msgstr ""
@@ -11620,8 +11670,8 @@ msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:274
 #: modules/gui/pda/pda_interface.c:298 modules/gui/pda/pda_interface.c:299
-#: modules/gui/pda/pda_interface.c:1360 modules/gui/qt4/dialogs/help.cpp:85
-#: modules/gui/qt4/dialogs/help.cpp:160
+#: modules/gui/pda/pda_interface.c:1360 modules/gui/qt4/dialogs/help.cpp:90
+#: modules/gui/qt4/dialogs/help.cpp:165
 msgid "About"
 msgstr ""
 
@@ -11645,24 +11695,24 @@ msgstr ""
 msgid "Speed"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:325 modules/gui/macosx/intf.m:709
+#: modules/gui/beos/InterfaceWindow.cpp:325 modules/gui/macosx/intf.m:739
 msgid "Window"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:406 modules/gui/macosx/bookmarks.m:104
-#: modules/gui/macosx/bookmarks.m:227 modules/gui/macosx/bookmarks.m:235
-#: modules/gui/macosx/bookmarks.m:284 modules/gui/macosx/bookmarks.m:294
-#: modules/gui/macosx/controls.m:59 modules/gui/macosx/extended.m:622
+#: modules/gui/beos/InterfaceWindow.cpp:406 modules/gui/macosx/bookmarks.m:103
+#: modules/gui/macosx/bookmarks.m:226 modules/gui/macosx/bookmarks.m:234
+#: modules/gui/macosx/bookmarks.m:283 modules/gui/macosx/bookmarks.m:293
+#: modules/gui/macosx/controls.m:59 modules/gui/macosx/extended.m:621
 #: modules/gui/macosx/interaction.m:133 modules/gui/macosx/interaction.m:134
 #: modules/gui/macosx/interaction.m:174 modules/gui/macosx/open.m:159
 #: modules/gui/macosx/open.m:285 modules/gui/macosx/output.m:138
-#: modules/gui/macosx/playlistinfo.m:59 modules/gui/macosx/update.m:89
+#: modules/gui/macosx/playlistinfo.m:59 modules/gui/macosx/update.m:63
 #: modules/gui/macosx/wizard.m:599 modules/gui/macosx/wizard.m:663
 #: modules/gui/macosx/wizard.m:1055 modules/gui/macosx/wizard.m:1140
 #: modules/gui/macosx/wizard.m:1147 modules/gui/macosx/wizard.m:1672
 #: modules/gui/macosx/wizard.m:1680 modules/gui/macosx/wizard.m:1861
 #: modules/gui/macosx/wizard.m:1872 modules/gui/macosx/wizard.m:1885
-#: modules/gui/qt4/components/preferences_widgets.cpp:1185
+#: modules/gui/qt4/components/preferences_widgets.cpp:1282
 #: modules/gui/qt4/dialogs/podcast_configuration.cpp:37
 #: modules/gui/wxwidgets/dialogs/preferences.cpp:205
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:416
@@ -11686,19 +11736,19 @@ msgid "playlist"
 msgstr ""
 
 #: modules/gui/beos/PlayListWindow.cpp:99
-#: modules/gui/qt4/dialogs/extended.cpp:72 modules/gui/qt4/dialogs/vlm.cpp:132
+#: modules/gui/qt4/dialogs/extended.cpp:81 modules/gui/qt4/dialogs/vlm.cpp:139
 msgid "Close"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:104 modules/gui/macosx/bookmarks.m:93
-#: modules/gui/macosx/intf.m:646
+#: modules/gui/beos/PlayListWindow.cpp:104 modules/gui/macosx/bookmarks.m:92
+#: modules/gui/macosx/intf.m:676
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:165
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_streampanel.cpp:101
 msgid "Edit"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:106 modules/gui/macosx/intf.m:651
-#: modules/gui/macosx/playlist.m:439
+#: modules/gui/beos/PlayListWindow.cpp:106 modules/gui/macosx/intf.m:681
+#: modules/gui/macosx/playlist.m:441
 msgid "Select All"
 msgstr ""
 
@@ -11722,7 +11772,7 @@ msgstr ""
 msgid "Randomize"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:130 modules/gui/macosx/bookmarks.m:95
+#: modules/gui/beos/PlayListWindow.cpp:130 modules/gui/macosx/bookmarks.m:94
 msgid "Remove"
 msgstr ""
 
@@ -11738,7 +11788,7 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:150 modules/gui/macosx/bookmarks.m:106
+#: modules/gui/beos/PlayListWindow.cpp:150 modules/gui/macosx/bookmarks.m:105
 #: modules/gui/macosx/playlist.m:126
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:97
 #: modules/gui/wxwidgets/dialogs/infopanels.cpp:72
@@ -11752,7 +11802,7 @@ msgid "Apply"
 msgstr ""
 
 #: modules/gui/beos/PreferencesWindow.cpp:257 modules/gui/macosx/output.m:526
-#: modules/gui/macosx/playlist.m:658 modules/gui/macosx/prefs.m:122
+#: modules/gui/macosx/playlist.m:660 modules/gui/macosx/prefs.m:122
 #: modules/gui/qt4/ui/vlm.ui:197
 msgid "Save"
 msgstr ""
@@ -11823,8 +11873,8 @@ msgid ""
 "fully opaque (255). (from 0 for full transparency to 255 for full opacity)"
 msgstr ""
 
-#: modules/gui/fbosd.c:123 modules/gui/qt4/ui/video_effects.ui:861
-#: modules/misc/logger.c:117 modules/video_filter/marq.c:82
+#: modules/gui/fbosd.c:123 modules/gui/qt4/ui/video_effects.ui:723
+#: modules/misc/logger.c:117 modules/video_filter/marq.c:83
 msgid "Text"
 msgstr ""
 
@@ -11857,29 +11907,29 @@ msgid ""
 "g. 6=top-right)."
 msgstr ""
 
-#: modules/gui/fbosd.c:138 modules/misc/freetype.c:117
-#: modules/misc/win32text.c:63 modules/video_filter/marq.c:107
+#: modules/gui/fbosd.c:138 modules/misc/freetype.c:112
+#: modules/misc/win32text.c:63 modules/video_filter/marq.c:112
 #: modules/video_filter/rss.c:141
 msgid "Opacity"
 msgstr ""
 
-#: modules/gui/fbosd.c:139 modules/video_filter/marq.c:108
+#: modules/gui/fbosd.c:139 modules/video_filter/marq.c:113
 msgid ""
 "Opacity (inverse of transparency) of overlayed text. 0 = transparent, 255 = "
 "totally opaque. "
 msgstr ""
 
-#: modules/gui/fbosd.c:142 modules/video_filter/marq.c:110
+#: modules/gui/fbosd.c:142 modules/video_filter/marq.c:115
 #: modules/video_filter/rss.c:145
 msgid "Font size, pixels"
 msgstr ""
 
-#: modules/gui/fbosd.c:143 modules/video_filter/marq.c:111
+#: modules/gui/fbosd.c:143 modules/video_filter/marq.c:116
 #: modules/video_filter/rss.c:146
 msgid "Font size, in pixels. Default is -1 (use default font size)."
 msgstr ""
 
-#: modules/gui/fbosd.c:147 modules/video_filter/marq.c:115
+#: modules/gui/fbosd.c:147 modules/video_filter/marq.c:120
 #: modules/video_filter/rss.c:150
 msgid ""
 "Color of the text that will be rendered on the video. This must be an "
@@ -11916,111 +11966,111 @@ msgid ""
 "All rendered images and text will be displayed on the overlay framebuffer."
 msgstr ""
 
-#: modules/gui/fbosd.c:174 modules/gui/macosx/sfilters.m:121
-#: modules/misc/freetype.c:154 modules/misc/win32text.c:86
+#: modules/gui/fbosd.c:174 modules/gui/macosx/sfilters.m:120
+#: modules/misc/freetype.c:149 modules/misc/win32text.c:86
 #: modules/video_filter/marq.c:58 modules/video_filter/rss.c:65
 msgid "Black"
 msgstr ""
 
-#: modules/gui/fbosd.c:175 modules/gui/macosx/sfilters.m:122
-#: modules/misc/freetype.c:154 modules/misc/win32text.c:86
+#: modules/gui/fbosd.c:175 modules/gui/macosx/sfilters.m:121
+#: modules/misc/freetype.c:149 modules/misc/win32text.c:86
 #: modules/video_filter/marq.c:59 modules/video_filter/rss.c:66
 msgid "Gray"
 msgstr ""
 
-#: modules/gui/fbosd.c:175 modules/gui/macosx/sfilters.m:123
-#: modules/misc/freetype.c:154 modules/misc/win32text.c:86
+#: modules/gui/fbosd.c:175 modules/gui/macosx/sfilters.m:122
+#: modules/misc/freetype.c:149 modules/misc/win32text.c:86
 #: modules/video_filter/marq.c:59 modules/video_filter/rss.c:66
 msgid "Silver"
 msgstr ""
 
-#: modules/gui/fbosd.c:175 modules/gui/macosx/sfilters.m:124
-#: modules/misc/freetype.c:154 modules/misc/win32text.c:86
+#: modules/gui/fbosd.c:175 modules/gui/macosx/sfilters.m:123
+#: modules/misc/freetype.c:149 modules/misc/win32text.c:86
 #: modules/video_filter/marq.c:59 modules/video_filter/rss.c:66
 msgid "White"
 msgstr ""
 
-#: modules/gui/fbosd.c:175 modules/gui/macosx/sfilters.m:125
-#: modules/misc/freetype.c:154 modules/misc/win32text.c:86
+#: modules/gui/fbosd.c:175 modules/gui/macosx/sfilters.m:124
+#: modules/misc/freetype.c:149 modules/misc/win32text.c:86
 #: modules/video_filter/marq.c:59 modules/video_filter/rss.c:66
 msgid "Maroon"
 msgstr ""
 
-#: modules/gui/fbosd.c:175 modules/gui/macosx/sfilters.m:126
-#: modules/misc/freetype.c:155 modules/misc/win32text.c:87
+#: modules/gui/fbosd.c:175 modules/gui/macosx/sfilters.m:125
+#: modules/misc/freetype.c:150 modules/misc/win32text.c:87
 #: modules/video_filter/colorthres.c:60 modules/video_filter/marq.c:59
 #: modules/video_filter/rss.c:66
 msgid "Red"
 msgstr ""
 
-#: modules/gui/fbosd.c:176 modules/gui/macosx/sfilters.m:127
-#: modules/misc/freetype.c:155 modules/misc/win32text.c:87
+#: modules/gui/fbosd.c:176 modules/gui/macosx/sfilters.m:126
+#: modules/misc/freetype.c:150 modules/misc/win32text.c:87
 #: modules/video_filter/colorthres.c:60 modules/video_filter/marq.c:60
 #: modules/video_filter/rss.c:67
 msgid "Fuchsia"
 msgstr ""
 
-#: modules/gui/fbosd.c:176 modules/gui/macosx/sfilters.m:128
-#: modules/misc/freetype.c:155 modules/misc/win32text.c:87
+#: modules/gui/fbosd.c:176 modules/gui/macosx/sfilters.m:127
+#: modules/misc/freetype.c:150 modules/misc/win32text.c:87
 #: modules/video_filter/colorthres.c:60 modules/video_filter/marq.c:60
 #: modules/video_filter/rss.c:67
 msgid "Yellow"
 msgstr ""
 
-#: modules/gui/fbosd.c:176 modules/gui/macosx/sfilters.m:129
-#: modules/misc/freetype.c:155 modules/misc/win32text.c:87
+#: modules/gui/fbosd.c:176 modules/gui/macosx/sfilters.m:128
+#: modules/misc/freetype.c:150 modules/misc/win32text.c:87
 #: modules/video_filter/marq.c:60 modules/video_filter/rss.c:67
 msgid "Olive"
 msgstr ""
 
-#: modules/gui/fbosd.c:176 modules/gui/macosx/sfilters.m:130
-#: modules/misc/freetype.c:155 modules/misc/win32text.c:87
+#: modules/gui/fbosd.c:176 modules/gui/macosx/sfilters.m:129
+#: modules/misc/freetype.c:150 modules/misc/win32text.c:87
 #: modules/video_filter/marq.c:60 modules/video_filter/rss.c:67
 msgid "Green"
 msgstr ""
 
-#: modules/gui/fbosd.c:177 modules/gui/macosx/sfilters.m:131
-#: modules/misc/freetype.c:155 modules/misc/win32text.c:87
+#: modules/gui/fbosd.c:177 modules/gui/macosx/sfilters.m:130
+#: modules/misc/freetype.c:150 modules/misc/win32text.c:87
 #: modules/video_filter/marq.c:61 modules/video_filter/rss.c:68
 msgid "Teal"
 msgstr ""
 
-#: modules/gui/fbosd.c:177 modules/gui/macosx/sfilters.m:132
-#: modules/misc/freetype.c:156 modules/misc/win32text.c:88
+#: modules/gui/fbosd.c:177 modules/gui/macosx/sfilters.m:131
+#: modules/misc/freetype.c:151 modules/misc/win32text.c:88
 #: modules/video_filter/colorthres.c:60 modules/video_filter/marq.c:61
 #: modules/video_filter/rss.c:68
 msgid "Lime"
 msgstr ""
 
-#: modules/gui/fbosd.c:177 modules/gui/macosx/sfilters.m:133
-#: modules/misc/freetype.c:156 modules/misc/win32text.c:88
+#: modules/gui/fbosd.c:177 modules/gui/macosx/sfilters.m:132
+#: modules/misc/freetype.c:151 modules/misc/win32text.c:88
 #: modules/video_filter/marq.c:61 modules/video_filter/rss.c:68
 msgid "Purple"
 msgstr ""
 
-#: modules/gui/fbosd.c:177 modules/gui/macosx/sfilters.m:134
-#: modules/misc/freetype.c:156 modules/misc/win32text.c:88
+#: modules/gui/fbosd.c:177 modules/gui/macosx/sfilters.m:133
+#: modules/misc/freetype.c:151 modules/misc/win32text.c:88
 #: modules/video_filter/marq.c:61 modules/video_filter/rss.c:68
 msgid "Navy"
 msgstr ""
 
-#: modules/gui/fbosd.c:177 modules/gui/macosx/sfilters.m:135
-#: modules/misc/freetype.c:156 modules/misc/win32text.c:88
+#: modules/gui/fbosd.c:177 modules/gui/macosx/sfilters.m:134
+#: modules/misc/freetype.c:151 modules/misc/win32text.c:88
 #: modules/video_filter/colorthres.c:60 modules/video_filter/marq.c:61
 #: modules/video_filter/rss.c:68
 msgid "Blue"
 msgstr ""
 
-#: modules/gui/fbosd.c:178 modules/gui/macosx/sfilters.m:136
-#: modules/misc/freetype.c:156 modules/misc/win32text.c:88
+#: modules/gui/fbosd.c:178 modules/gui/macosx/sfilters.m:135
+#: modules/misc/freetype.c:151 modules/misc/win32text.c:88
 #: modules/video_filter/colorthres.c:60 modules/video_filter/marq.c:62
 #: modules/video_filter/rss.c:69
 msgid "Aqua"
 msgstr ""
 
-#: modules/gui/fbosd.c:209 modules/gui/qt4/ui/sprefs_subtitles.ui:155
-#: modules/misc/freetype.c:110 modules/misc/notify/xosd.c:80
-#: modules/misc/win32text.c:56 modules/video_filter/marq.c:151
+#: modules/gui/fbosd.c:209 modules/gui/qt4/ui/sprefs_subtitles.ui:132
+#: modules/misc/freetype.c:105 modules/misc/notify/xosd.c:80
+#: modules/misc/win32text.c:56 modules/video_filter/marq.c:156
 #: modules/video_filter/rss.c:198
 msgid "Font"
 msgstr ""
@@ -12033,13 +12083,13 @@ msgstr ""
 msgid "GNU/Linux osd/overlay framebuffer interface"
 msgstr ""
 
-#: modules/gui/macosx/about.m:86 modules/gui/macosx/intf.m:625
+#: modules/gui/macosx/about.m:86 modules/gui/macosx/intf.m:655
 msgid "About VLC media player"
 msgstr ""
 
 #: modules/gui/macosx/about.m:91
 #, c-format
-msgid "Compiled by %s, based on SVN revision %s"
+msgid "Compiled by %s, based on Git commit %s"
 msgstr ""
 
 #: modules/gui/macosx/about.m:95
@@ -12052,7 +12102,7 @@ msgid "VLC was brought to you by:"
 msgstr ""
 
 #: modules/gui/macosx/about.m:113 modules/gui/macosx/about.m:176
-#: modules/gui/macosx/intf.m:726 modules/gui/qt4/dialogs/help.cpp:163
+#: modules/gui/macosx/intf.m:756 modules/gui/qt4/dialogs/help.cpp:168
 msgid "License"
 msgstr ""
 
@@ -12064,83 +12114,83 @@ msgstr ""
 msgid "Index"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:90
+#: modules/gui/macosx/bookmarks.m:89
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:139
 msgid "Bookmarks"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:91 modules/gui/qt4/dialogs/bookmarks.cpp:44
+#: modules/gui/macosx/bookmarks.m:90 modules/gui/qt4/dialogs/bookmarks.cpp:44
 #: modules/gui/qt4/ui/podcast_configuration.ui:49
 #: modules/gui/qt4/ui/vlm.ui:183
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:159
 msgid "Add"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:92 modules/gui/macosx/intf.m:650
-#: modules/gui/qt4/components/playlist/standardpanel.cpp:159
-#: modules/gui/qt4/components/preferences_widgets.cpp:1028
+#: modules/gui/macosx/bookmarks.m:91 modules/gui/macosx/intf.m:680
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:160
+#: modules/gui/qt4/components/preferences_widgets.cpp:1125
 #: modules/gui/qt4/dialogs/bookmarks.cpp:46 modules/gui/qt4/ui/vlm.ui:190
 #: modules/gui/wxwidgets/dialogs/messages.cpp:77
 msgid "Clear"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:94 modules/gui/qt4/dialogs/bookmarks.cpp:47
+#: modules/gui/macosx/bookmarks.m:93 modules/gui/qt4/dialogs/bookmarks.cpp:47
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:167
 #: modules/video_filter/extract.c:74
 msgid "Extract"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:101 modules/gui/macosx/bookmarks.m:107
-#: modules/gui/macosx/sfilters.m:72 modules/gui/pda/pda.c:284
+#: modules/gui/macosx/bookmarks.m:100 modules/gui/macosx/bookmarks.m:106
+#: modules/gui/macosx/sfilters.m:71 modules/gui/pda/pda.c:284
 #: modules/gui/qt4/dialogs/bookmarks.cpp:59
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:99
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:198
 msgid "Time"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:134 modules/gui/macosx/playlist.m:654
+#: modules/gui/macosx/bookmarks.m:133 modules/gui/macosx/playlist.m:656
 msgid "Untitled"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:227
+#: modules/gui/macosx/bookmarks.m:226
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:445
 msgid "No input"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:228
+#: modules/gui/macosx/bookmarks.m:227
 msgid ""
 "No input found. A stream must be playing or paused for bookmarks to work."
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:235
+#: modules/gui/macosx/bookmarks.m:234
 msgid "Input has changed"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:236
+#: modules/gui/macosx/bookmarks.m:235
 msgid ""
 "Input has changed, unable to save bookmark. Suspending playback with \"Pause"
 "\" while editing bookmarks to ensure to keep the same input."
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:284 modules/gui/macosx/wizard.m:1055
+#: modules/gui/macosx/bookmarks.m:283 modules/gui/macosx/wizard.m:1055
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:348
 msgid "Invalid selection"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:286
+#: modules/gui/macosx/bookmarks.m:285
 msgid "Two bookmarks have to be selected."
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:294
+#: modules/gui/macosx/bookmarks.m:293
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:358
 msgid "No input found"
 msgstr ""
 
-#: modules/gui/macosx/bookmarks.m:296
+#: modules/gui/macosx/bookmarks.m:295
 msgid "The stream must be playing or paused for bookmarks to work."
 msgstr ""
 
-#: modules/gui/macosx/controls.m:57 modules/gui/macosx/controls.m:943
+#: modules/gui/macosx/controls.m:57 modules/gui/macosx/controls.m:942
 msgid "Jump To Time"
 msgstr ""
 
@@ -12161,13 +12211,13 @@ msgid "Random Off"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:280 modules/gui/macosx/controls.m:340
-#: modules/gui/macosx/controls.m:927 modules/gui/macosx/intf.m:661
+#: modules/gui/macosx/controls.m:926 modules/gui/macosx/intf.m:691
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:54
 msgid "Repeat One"
 msgstr ""
 
 #: modules/gui/macosx/controls.m:296 modules/gui/macosx/controls.m:369
-#: modules/gui/macosx/controls.m:934 modules/gui/macosx/intf.m:662
+#: modules/gui/macosx/controls.m:933 modules/gui/macosx/intf.m:692
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:53
 msgid "Repeat All"
 msgstr ""
@@ -12177,56 +12227,56 @@ msgstr ""
 msgid "Repeat Off"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:480 modules/gui/macosx/controls.m:957
-#: modules/gui/macosx/intf.m:687
+#: modules/gui/macosx/controls.m:480 modules/gui/macosx/controls.m:956
+#: modules/gui/macosx/intf.m:717
 msgid "Half Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:482 modules/gui/macosx/controls.m:958
-#: modules/gui/macosx/intf.m:688
+#: modules/gui/macosx/controls.m:482 modules/gui/macosx/controls.m:957
+#: modules/gui/macosx/intf.m:718
 msgid "Normal Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:484 modules/gui/macosx/controls.m:959
-#: modules/gui/macosx/intf.m:689
+#: modules/gui/macosx/controls.m:484 modules/gui/macosx/controls.m:958
+#: modules/gui/macosx/intf.m:719
 msgid "Double Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:486 modules/gui/macosx/controls.m:963
-#: modules/gui/macosx/controls.m:974 modules/gui/macosx/intf.m:692
+#: modules/gui/macosx/controls.m:486 modules/gui/macosx/controls.m:962
+#: modules/gui/macosx/controls.m:973 modules/gui/macosx/intf.m:722
 msgid "Float on Top"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:488 modules/gui/macosx/controls.m:960
-#: modules/gui/macosx/intf.m:690
+#: modules/gui/macosx/controls.m:488 modules/gui/macosx/controls.m:959
+#: modules/gui/macosx/intf.m:720
 msgid "Fit to Screen"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:941 modules/gui/macosx/intf.m:663
+#: modules/gui/macosx/controls.m:940 modules/gui/macosx/intf.m:693
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:942 modules/gui/macosx/intf.m:664
+#: modules/gui/macosx/controls.m:941 modules/gui/macosx/intf.m:694
 msgid "Step Backward"
 msgstr ""
 
-#: modules/gui/macosx/embeddedwindow.m:47 modules/gui/macosx/intf.m:610
+#: modules/gui/macosx/embeddedwindow.m:47 modules/gui/macosx/intf.m:640
 #: modules/gui/pda/pda_interface.c:236 modules/gui/pda/pda_interface.c:237
 msgid "Rewind"
 msgstr ""
 
-#: modules/gui/macosx/embeddedwindow.m:48 modules/gui/macosx/intf.m:613
+#: modules/gui/macosx/embeddedwindow.m:48 modules/gui/macosx/intf.m:643
 msgid "Fast Forward"
 msgstr ""
 
-#: modules/gui/macosx/embeddedwindow.m:130 modules/gui/macosx/intf.m:1623
-#: modules/gui/macosx/intf.m:1624 modules/gui/macosx/intf.m:1625
-#: modules/gui/macosx/intf.m:1626 modules/gui/pda/pda_interface.c:248
-#: modules/gui/pda/pda_interface.c:249 modules/gui/qt4/menus.cpp:513
+#: modules/gui/macosx/embeddedwindow.m:130 modules/gui/macosx/intf.m:1669
+#: modules/gui/macosx/intf.m:1670 modules/gui/macosx/intf.m:1671
+#: modules/gui/macosx/intf.m:1672 modules/gui/pda/pda_interface.c:248
+#: modules/gui/pda/pda_interface.c:249 modules/gui/qt4/menus.cpp:502
 #: modules/gui/wxwidgets/interface.cpp:695
 #: modules/gui/wxwidgets/interface.cpp:706
 #: modules/gui/wxwidgets/interface.cpp:1238
-#: modules/gui/wxwidgets/menus.cpp:272 modules/misc/notify/xosd.c:237
+#: modules/gui/wxwidgets/menus.cpp:262 modules/misc/notify/xosd.c:237
 msgid "Pause"
 msgstr ""
 
@@ -12246,129 +12296,129 @@ msgstr ""
 msgid "Preamp"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:68 modules/gui/wxwidgets/extrapanel.cpp:1216
+#: modules/gui/macosx/extended.m:67 modules/gui/wxwidgets/extrapanel.cpp:1216
 msgid "Extended controls"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:72 modules/gui/qt4/ui/video_effects.ui:977
+#: modules/gui/macosx/extended.m:71 modules/gui/qt4/ui/video_effects.ui:827
 #: modules/gui/wxwidgets/extrapanel.cpp:304
 msgid "Video filters"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:73 modules/gui/wxwidgets/extrapanel.cpp:208
+#: modules/gui/macosx/extended.m:72 modules/gui/wxwidgets/extrapanel.cpp:208
 msgid "Image adjustment"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:74
+#: modules/gui/macosx/extended.m:73
 msgid "Shows more information about the available video filters."
 msgstr ""
 
-#: modules/gui/macosx/extended.m:75 modules/video_filter/wave.c:53
+#: modules/gui/macosx/extended.m:74 modules/video_filter/wave.c:53
 msgid "Wave"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:76 modules/video_filter/ripple.c:52
+#: modules/gui/macosx/extended.m:75 modules/video_filter/ripple.c:52
 msgid "Ripple"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:77 modules/gui/qt4/ui/video_effects.ui:550
+#: modules/gui/macosx/extended.m:76 modules/gui/qt4/ui/video_effects.ui:460
 #: modules/meta_engine/id3genres.h:95 modules/video_filter/psychedelic.c:53
 msgid "Psychedelic"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:78 modules/gui/qt4/ui/video_effects.ui:621
+#: modules/gui/macosx/extended.m:77 modules/gui/qt4/ui/video_effects.ui:525
 #: modules/video_filter/gradient.c:73 modules/video_filter/gradient.c:79
 msgid "Gradient"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:79
+#: modules/gui/macosx/extended.m:78
 msgid "General editing filters"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:80
+#: modules/gui/macosx/extended.m:79
 msgid "Distortion filters"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:81
+#: modules/gui/macosx/extended.m:80
 msgid "Blur"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:82 modules/gui/wxwidgets/extrapanel.cpp:154
+#: modules/gui/macosx/extended.m:81 modules/gui/wxwidgets/extrapanel.cpp:154
 msgid "Adds motion blurring to the image"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:84
+#: modules/gui/macosx/extended.m:83
 msgid "Creates several copies of the Video output window"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:86
+#: modules/gui/macosx/extended.m:85
 msgid "Image cropping"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:87
+#: modules/gui/macosx/extended.m:86
 msgid "Crops a defined part of the image"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:88
+#: modules/gui/macosx/extended.m:87 modules/gui/qt4/ui/video_effects.ui:261
 msgid "Invert colors"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:89 modules/gui/wxwidgets/extrapanel.cpp:153
+#: modules/gui/macosx/extended.m:88 modules/gui/wxwidgets/extrapanel.cpp:153
 msgid "Inverts the colors of the image"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:90 modules/gui/wxwidgets/extrapanel.cpp:155
+#: modules/gui/macosx/extended.m:89 modules/gui/wxwidgets/extrapanel.cpp:155
 #: modules/video_filter/transform.c:75
 msgid "Transformation"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:91 modules/gui/wxwidgets/extrapanel.cpp:155
+#: modules/gui/macosx/extended.m:90 modules/gui/wxwidgets/extrapanel.cpp:155
 msgid "Rotates or flips the image"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:92
+#: modules/gui/macosx/extended.m:91
 msgid "Interactive Zoom"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:93
+#: modules/gui/macosx/extended.m:92
 msgid "Enables an interactive Zoom feature"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:94 modules/gui/wxwidgets/extrapanel.cpp:405
+#: modules/gui/macosx/extended.m:93 modules/gui/wxwidgets/extrapanel.cpp:405
 msgid "Volume normalization"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:95
+#: modules/gui/macosx/extended.m:94
 msgid "Prevents the audio output from going over a predefined value."
 msgstr ""
 
-#: modules/gui/macosx/extended.m:97 modules/gui/wxwidgets/extrapanel.cpp:400
+#: modules/gui/macosx/extended.m:96 modules/gui/wxwidgets/extrapanel.cpp:400
 msgid "Headphone virtualization"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:98 modules/gui/wxwidgets/extrapanel.cpp:401
+#: modules/gui/macosx/extended.m:97 modules/gui/wxwidgets/extrapanel.cpp:401
 msgid "Imitates the effect of surround sound when using headphones."
 msgstr ""
 
-#: modules/gui/macosx/extended.m:100 modules/gui/wxwidgets/extrapanel.cpp:410
+#: modules/gui/macosx/extended.m:99 modules/gui/wxwidgets/extrapanel.cpp:410
 msgid "Maximum level"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:101 modules/gui/wxwidgets/extrapanel.cpp:225
+#: modules/gui/macosx/extended.m:100 modules/gui/wxwidgets/extrapanel.cpp:225
 #: modules/gui/wxwidgets/extrapanel.cpp:485
 msgid "Restore Defaults"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:108 modules/gui/macosx/macosx.m:62
-#: modules/gui/macosx/sfilters.m:79 modules/gui/macosx/sfilters.m:90
+#: modules/gui/macosx/extended.m:107 modules/gui/macosx/macosx.m:59
+#: modules/gui/macosx/sfilters.m:78 modules/gui/macosx/sfilters.m:89
 msgid "Opaqueness"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:621
+#: modules/gui/macosx/extended.m:620
 msgid "About the video filters"
 msgstr ""
 
-#: modules/gui/macosx/extended.m:630
+#: modules/gui/macosx/extended.m:629
 msgid ""
 "This panel allows on-the-fly selection of various video effects.\n"
 "These filters can be configured individually in the Preferences, in the "
@@ -12399,309 +12449,287 @@ msgstr ""
 msgid "Remaining time: %i seconds"
 msgstr ""
 
-#: modules/gui/macosx/interaction.m:389
+#: modules/gui/macosx/interaction.m:398
 msgid "Errors and Warnings"
 msgstr ""
 
-#: modules/gui/macosx/interaction.m:390
+#: modules/gui/macosx/interaction.m:399
 msgid "Clean up"
 msgstr ""
 
-#: modules/gui/macosx/interaction.m:391
+#: modules/gui/macosx/interaction.m:400
 msgid "Show Details"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:605
+#: modules/gui/macosx/intf.m:635
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:606 modules/gui/macosx/intf.m:1549
-#: modules/gui/pda/pda_interface.c:210 modules/gui/pda/pda_interface.c:1353
-#: modules/gui/qt4/main_interface.cpp:374
-#: modules/gui/qt4/main_interface.cpp:378
-#: modules/gui/qt4/main_interface.cpp:915
-#: modules/gui/qt4/main_interface.cpp:917
-#: modules/gui/qt4/main_interface.cpp:981
-#: modules/gui/qt4/main_interface.cpp:996
-#: modules/gui/qt4/main_interface.cpp:1003
-#: modules/gui/qt4/main_interface.cpp:1020
-msgid "VLC media player"
-msgstr ""
-
-#: modules/gui/macosx/intf.m:622
+#: modules/gui/macosx/intf.m:652
 msgid "Open CrashLog..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:627
+#: modules/gui/macosx/intf.m:657
 msgid "Check for Update..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:628 modules/gui/qt4/menus.cpp:317
+#: modules/gui/macosx/intf.m:658 modules/gui/qt4/menus.cpp:317
 msgid "Preferences..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:631
+#: modules/gui/macosx/intf.m:661
 msgid "Services"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:632
+#: modules/gui/macosx/intf.m:662
 msgid "Hide VLC"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:633
+#: modules/gui/macosx/intf.m:663
 msgid "Hide Others"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:634
+#: modules/gui/macosx/intf.m:664
 msgid "Show All"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:635 modules/gui/wxwidgets/interface.cpp:1530
+#: modules/gui/macosx/intf.m:665 modules/gui/wxwidgets/interface.cpp:1530
 msgid "Quit VLC"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:637
+#: modules/gui/macosx/intf.m:667
 msgid "1:File"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:638
+#: modules/gui/macosx/intf.m:668
 msgid "Open File..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:639
+#: modules/gui/macosx/intf.m:669
 msgid "Quick Open File..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:640
+#: modules/gui/macosx/intf.m:670
 msgid "Open Disc..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:641
+#: modules/gui/macosx/intf.m:671
 msgid "Open Network..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:642
+#: modules/gui/macosx/intf.m:672
 msgid "Open Recent"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:643 modules/gui/macosx/intf.m:2203
+#: modules/gui/macosx/intf.m:673 modules/gui/macosx/intf.m:2256
 msgid "Clear Menu"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:644
+#: modules/gui/macosx/intf.m:674
 msgid "Streaming/Exporting Wizard..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:647
+#: modules/gui/macosx/intf.m:677
 msgid "Cut"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:648
+#: modules/gui/macosx/intf.m:678
 msgid "Copy"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:649
+#: modules/gui/macosx/intf.m:679
 msgid "Paste"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:653
+#: modules/gui/macosx/intf.m:683
 msgid "Playback"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:674 modules/gui/macosx/intf.m:744
+#: modules/gui/macosx/intf.m:704 modules/gui/macosx/intf.m:774
 msgid "Volume Up"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:675 modules/gui/macosx/intf.m:745
+#: modules/gui/macosx/intf.m:705 modules/gui/macosx/intf.m:775
 msgid "Volume Down"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:700 modules/gui/macosx/intf.m:701
+#: modules/gui/macosx/intf.m:730 modules/gui/macosx/intf.m:731
 #: modules/gui/macosx/vout.m:197
 msgid "Video Device"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:710
+#: modules/gui/macosx/intf.m:740
 msgid "Minimize Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:711
+#: modules/gui/macosx/intf.m:741
 msgid "Close Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:712
+#: modules/gui/macosx/intf.m:742
 msgid "Controller..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:713
+#: modules/gui/macosx/intf.m:743
 msgid "Equalizer..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:714
+#: modules/gui/macosx/intf.m:744
 msgid "Extended Controls..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:716 modules/gui/qt4/menus.cpp:257
+#: modules/gui/macosx/intf.m:746 modules/gui/qt4/menus.cpp:257
 msgid "Playlist..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:719
+#: modules/gui/macosx/intf.m:749
 msgid "Errors and Warnings..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:721
+#: modules/gui/macosx/intf.m:751
 msgid "Bring All to Front"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:723 modules/gui/qt4/dialogs/help.cpp:58
-#: modules/gui/qt4/menus.cpp:550
+#: modules/gui/macosx/intf.m:753 modules/gui/qt4/dialogs/help.cpp:58
+#: modules/gui/qt4/menus.cpp:539
 msgid "Help"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:724
+#: modules/gui/macosx/intf.m:754
 msgid "VLC media player Help..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:725
+#: modules/gui/macosx/intf.m:755
 msgid "ReadMe / FAQ..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:727
+#: modules/gui/macosx/intf.m:757
 msgid "Online Documentation..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:728
+#: modules/gui/macosx/intf.m:758
 msgid "VideoLAN Website..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:729
+#: modules/gui/macosx/intf.m:759
 msgid "Make a donation..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:730
+#: modules/gui/macosx/intf.m:760
 msgid "Online Forum..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:750
+#: modules/gui/macosx/intf.m:780
 msgid "Media Information"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:778
+#: modules/gui/macosx/intf.m:808
 msgid "Your version of Mac OS X is not supported"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:782
+#: modules/gui/macosx/intf.m:812
 msgid "VLC media player requires Mac OS X 10.4 or higher."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1372
+#: modules/gui/macosx/intf.m:1418
 #, c-format
 msgid "Volume: %d%%"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:2040
+#: modules/gui/macosx/intf.m:2093
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:2040
+#: modules/gui/macosx/intf.m:2093
 msgid "Couldn't find any trace of a previous crash."
 msgstr ""
 
 #: modules/gui/macosx/macosx.m:54
-msgid "Embedded video output"
-msgstr ""
-
-#: modules/gui/macosx/macosx.m:55
-msgid ""
-"Display the video in the controller window instead of a in separate window."
-msgstr ""
-
-#: modules/gui/macosx/macosx.m:57
 msgid "Video device"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:58
+#: modules/gui/macosx/macosx.m:55
 msgid ""
 "Number of the screen to use by default to display videos in 'fullscreen'. "
 "The screen number correspondance can be found in the video device selection "
 "menu."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:63
+#: modules/gui/macosx/macosx.m:60
 msgid ""
 "Set the transparency of the video output. 1 is non-transparent (default) 0 "
 "is fully transparent."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:66
+#: modules/gui/macosx/macosx.m:63
 msgid "Stretch video to fill window"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:67
+#: modules/gui/macosx/macosx.m:64
 msgid ""
 "Stretch the video to fill the entire window when resizing the video instead "
 "of keeping the aspect ratio and displaying black borders."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:71
+#: modules/gui/macosx/macosx.m:68
 msgid "Black screens in fullscreen"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:72
+#: modules/gui/macosx/macosx.m:69
 msgid "In fullscreen mode, keep screen where there is no video displayed black"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:75
+#: modules/gui/macosx/macosx.m:72
 msgid "Use as Desktop Background"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:76
+#: modules/gui/macosx/macosx.m:73
 msgid ""
 "Use the video as the Desktop Background Desktop icons cannot be interacted "
 "with in this mode."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:79
+#: modules/gui/macosx/macosx.m:76
 msgid "Show Fullscreen controller"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:80
+#: modules/gui/macosx/macosx.m:77
 msgid "Shows a lucent controller when moving the mouse in fullscreen mode."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:83
+#: modules/gui/macosx/macosx.m:80
 msgid "Auto-playback of new items"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:84
+#: modules/gui/macosx/macosx.m:81
 msgid "Start playback of new items immediately once they were added."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:87
+#: modules/gui/macosx/macosx.m:84
 msgid "Keep Recent Items"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:88
+#: modules/gui/macosx/macosx.m:85
 msgid ""
 "By default, VLC keeps a list of the last 10 items. This feature can be "
 "disabled here."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:91
+#: modules/gui/macosx/macosx.m:88
 msgid "Keep current Equalizer settings"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:92
+#: modules/gui/macosx/macosx.m:89
 msgid ""
 "By default, VLC keeps the last equalizer settings before termination. This "
 "feature can be disabled here."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:96
+#: modules/gui/macosx/macosx.m:93
 msgid "Mac OS X interface"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:113
+#: modules/gui/macosx/macosx.m:108
 msgid "Quartz video"
 msgstr ""
 
@@ -12715,20 +12743,20 @@ msgstr ""
 
 #: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:172
 #: modules/gui/macosx/open.m:273 modules/gui/macosx/output.m:145
-#: modules/gui/macosx/prefs_widgets.m:1169 modules/gui/macosx/sfilters.m:75
-#: modules/gui/qt4/components/preferences_widgets.cpp:258
+#: modules/gui/macosx/prefs_widgets.m:1169 modules/gui/macosx/sfilters.m:74
+#: modules/gui/qt4/components/preferences_widgets.cpp:257
 #: modules/gui/qt4/ui/open_disk.ui:62 modules/gui/qt4/ui/open_file.ui:181
 #: modules/gui/qt4/ui/open.ui:147 modules/gui/qt4/ui/sout.ui:77
-#: modules/gui/qt4/ui/sprefs_audio.ui:205
-#: modules/gui/qt4/ui/sprefs_audio.ui:231
+#: modules/gui/qt4/ui/sprefs_audio.ui:264
+#: modules/gui/qt4/ui/sprefs_audio.ui:293
 #: modules/gui/qt4/ui/sprefs_input.ui:36
-#: modules/gui/qt4/ui/sprefs_interface.ui:70
-#: modules/gui/qt4/ui/sprefs_subtitles.ui:145
+#: modules/gui/qt4/ui/sprefs_interface.ui:168
+#: modules/gui/qt4/ui/sprefs_subtitles.ui:122
 #: modules/gui/qt4/ui/sprefs_video.ui:158
 #: modules/gui/wince/preferences_widgets.cpp:509
 #: modules/gui/wxwidgets/dialogs/open.cpp:632
 #: modules/gui/wxwidgets/dialogs/open.cpp:666
-#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:682
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:701
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:501
 #: modules/gui/wxwidgets/dialogs/subtitles.cpp:82
 msgid "Browse..."
@@ -12791,12 +12819,12 @@ msgstr ""
 #: modules/gui/macosx/open.m:275
 #: modules/gui/wxwidgets/dialogs/subtitles.cpp:215
 #: modules/stream_out/bridge.c:44 modules/stream_out/display.c:44
-#: modules/video_filter/mosaic.c:158
+#: modules/video_filter/mosaic.c:155
 msgid "Delay"
 msgstr ""
 
 #: modules/gui/macosx/open.m:277
-#: modules/gui/qt4/components/info_panels.cpp:536
+#: modules/gui/qt4/components/info_panels.cpp:538
 msgid "FPS"
 msgstr ""
 
@@ -12804,7 +12832,7 @@ msgstr ""
 msgid "Subtitles encoding"
 msgstr ""
 
-#: modules/gui/macosx/open.m:281 modules/gui/qt4/ui/sprefs_subtitles.ui:138
+#: modules/gui/macosx/open.m:281 modules/gui/qt4/ui/sprefs_subtitles.ui:115
 msgid "Font size"
 msgstr ""
 
@@ -12926,7 +12954,7 @@ msgid "Save File"
 msgstr ""
 
 #: modules/gui/macosx/playlistinfo.m:55 modules/gui/macosx/playlistinfo.m:347
-#: modules/gui/macosx/playlist.m:440
+#: modules/gui/macosx/playlist.m:442
 msgid "Information"
 msgstr ""
 
@@ -12947,43 +12975,43 @@ msgid "Advanced Information"
 msgstr ""
 
 #: modules/gui/macosx/playlistinfo.m:81
-#: modules/gui/qt4/components/info_panels.cpp:522
+#: modules/gui/qt4/components/info_panels.cpp:524
 msgid "Read at media"
 msgstr ""
 
 #: modules/gui/macosx/playlistinfo.m:82
-#: modules/gui/qt4/components/info_panels.cpp:524
+#: modules/gui/qt4/components/info_panels.cpp:526
 msgid "Input bitrate"
 msgstr ""
 
 #: modules/gui/macosx/playlistinfo.m:83
-#: modules/gui/qt4/components/info_panels.cpp:526
+#: modules/gui/qt4/components/info_panels.cpp:528
 msgid "Demuxed"
 msgstr ""
 
 #: modules/gui/macosx/playlistinfo.m:84
-#: modules/gui/qt4/components/info_panels.cpp:527
+#: modules/gui/qt4/components/info_panels.cpp:529
 msgid "Stream bitrate"
 msgstr ""
 
 #: modules/gui/macosx/playlistinfo.m:87 modules/gui/macosx/playlistinfo.m:98
-#: modules/gui/qt4/components/info_panels.cpp:530
-#: modules/gui/qt4/components/info_panels.cpp:544
+#: modules/gui/qt4/components/info_panels.cpp:532
+#: modules/gui/qt4/components/info_panels.cpp:546
 msgid "Decoded blocks"
 msgstr ""
 
 #: modules/gui/macosx/playlistinfo.m:88
-#: modules/gui/qt4/components/info_panels.cpp:532
+#: modules/gui/qt4/components/info_panels.cpp:534
 msgid "Displayed frames"
 msgstr ""
 
 #: modules/gui/macosx/playlistinfo.m:89
-#: modules/gui/qt4/components/info_panels.cpp:534
+#: modules/gui/qt4/components/info_panels.cpp:536
 msgid "Lost frames"
 msgstr ""
 
 #: modules/gui/macosx/playlistinfo.m:92 modules/gui/macosx/wizard.m:361
-#: modules/gui/qt4/components/info_panels.cpp:520
+#: modules/gui/qt4/components/info_panels.cpp:522
 #: modules/gui/wxwidgets/dialogs/infopanels.cpp:316
 #: modules/gui/wxwidgets/dialogs/wizard.cpp:139
 #: modules/video_filter/deinterlace.c:139
@@ -12991,12 +13019,12 @@ msgid "Streaming"
 msgstr ""
 
 #: modules/gui/macosx/playlistinfo.m:93
-#: modules/gui/qt4/components/info_panels.cpp:538
+#: modules/gui/qt4/components/info_panels.cpp:540
 msgid "Sent packets"
 msgstr ""
 
 #: modules/gui/macosx/playlistinfo.m:94
-#: modules/gui/qt4/components/info_panels.cpp:539
+#: modules/gui/qt4/components/info_panels.cpp:541
 msgid "Sent bytes"
 msgstr ""
 
@@ -13005,82 +13033,82 @@ msgid "Send rate"
 msgstr ""
 
 #: modules/gui/macosx/playlistinfo.m:99
-#: modules/gui/qt4/components/info_panels.cpp:546
+#: modules/gui/qt4/components/info_panels.cpp:548
 msgid "Played buffers"
 msgstr ""
 
 #: modules/gui/macosx/playlistinfo.m:100
-#: modules/gui/qt4/components/info_panels.cpp:548
+#: modules/gui/qt4/components/info_panels.cpp:550
 msgid "Lost buffers"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:435
+#: modules/gui/macosx/playlist.m:437
 msgid "Save Playlist..."
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:438
+#: modules/gui/macosx/playlist.m:440
 msgid "Expand Node"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:441
+#: modules/gui/macosx/playlist.m:443
 msgid "Get Stream Information"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:442
+#: modules/gui/macosx/playlist.m:444
 msgid "Sort Node by Name"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:443
+#: modules/gui/macosx/playlist.m:445
 msgid "Sort Node by Author"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:445 modules/gui/macosx/playlist.m:485
-#: modules/gui/macosx/playlist.m:1372
+#: modules/gui/macosx/playlist.m:447 modules/gui/macosx/playlist.m:487
+#: modules/gui/macosx/playlist.m:1374
 msgid "No items in the playlist"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:447
+#: modules/gui/macosx/playlist.m:449
 msgid "Search in Playlist"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:448
+#: modules/gui/macosx/playlist.m:450
 msgid "Add Folder to Playlist"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:450
+#: modules/gui/macosx/playlist.m:452
 msgid "File Format:"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:451
+#: modules/gui/macosx/playlist.m:453
 msgid "Extended M3U"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:452
+#: modules/gui/macosx/playlist.m:454
 msgid "XML Shareable Playlist Format (XSPF)"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:479 modules/gui/macosx/playlist.m:1365
+#: modules/gui/macosx/playlist.m:481 modules/gui/macosx/playlist.m:1367
 #, c-format
 msgid "%i items in the playlist"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:487 modules/gui/macosx/playlist.m:1376
+#: modules/gui/macosx/playlist.m:489 modules/gui/macosx/playlist.m:1378
 msgid "1 item in the playlist"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:657
+#: modules/gui/macosx/playlist.m:659
 msgid "Save Playlist"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:1333
+#: modules/gui/macosx/playlist.m:1335
 msgid "New Node"
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:1334
+#: modules/gui/macosx/playlist.m:1336
 msgid "Please enter a name for the new node."
 msgstr ""
 
-#: modules/gui/macosx/playlist.m:1342
+#: modules/gui/macosx/playlist.m:1344
 msgid "Empty Folder"
 msgstr ""
 
@@ -13089,22 +13117,23 @@ msgstr ""
 msgid "Reset All"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:143 modules/gui/qt4/dialogs/preferences.cpp:335
+#: modules/gui/macosx/prefs.m:143 modules/gui/macosx/simple_prefs.m:416
+#: modules/gui/qt4/dialogs/preferences.cpp:335
 #: modules/gui/wxwidgets/dialogs/preferences.cpp:296
 msgid "Reset Preferences"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:144
+#: modules/gui/macosx/prefs.m:144 modules/gui/macosx/simple_prefs.m:417
 msgid "Continue"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:146
+#: modules/gui/macosx/prefs.m:146 modules/gui/macosx/simple_prefs.m:419
 msgid ""
 "Beware this will reset the VLC media player preferences.\n"
 "Are you sure you want to continue?"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:729
+#: modules/gui/macosx/prefs.m:730
 msgid "Some options are hidden. Check \"Advanced\" to display them."
 msgstr ""
 
@@ -13122,109 +13151,178 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:70
+#: modules/gui/macosx/sfilters.m:69
 msgid "Subpicture Filters"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:71 modules/gui/qt4/ui/video_effects.ui:938
+#: modules/gui/macosx/sfilters.m:70 modules/gui/qt4/ui/video_effects.ui:794
 msgid "Logo"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:73 modules/video_filter/marq.c:138
+#: modules/gui/macosx/sfilters.m:72 modules/video_filter/marq.c:143
 msgid "Marquee"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:74
+#: modules/gui/macosx/sfilters.m:73
 msgid "Save settings"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:76 modules/gui/macosx/sfilters.m:80
-#: modules/gui/macosx/sfilters.m:87
+#: modules/gui/macosx/sfilters.m:75 modules/gui/macosx/sfilters.m:79
+#: modules/gui/macosx/sfilters.m:86
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:400
 msgid "Enabled"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:77
+#: modules/gui/macosx/sfilters.m:76
 msgid "Image:"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:78 modules/gui/macosx/sfilters.m:85
-#: modules/gui/macosx/sfilters.m:93
+#: modules/gui/macosx/sfilters.m:77 modules/gui/macosx/sfilters.m:84
+#: modules/gui/macosx/sfilters.m:92
 msgid "Position:"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:81
+#: modules/gui/macosx/sfilters.m:80
 msgid "Timestamp:"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:82 modules/gui/macosx/sfilters.m:94
+#: modules/gui/macosx/sfilters.m:81 modules/gui/macosx/sfilters.m:93
 #: modules/gui/pda/pda_interface.c:609 modules/gui/qt4/ui/open_file.ui:90
 msgid "Size:"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:83 modules/gui/macosx/sfilters.m:88
+#: modules/gui/macosx/sfilters.m:82 modules/gui/macosx/sfilters.m:87
 msgid "Color:"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:84
+#: modules/gui/macosx/sfilters.m:83
 msgid "Opaqueness:"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:86 modules/gui/macosx/sfilters.m:95
+#: modules/gui/macosx/sfilters.m:85 modules/gui/macosx/sfilters.m:94
 msgid "(in pixels)"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:89
+#: modules/gui/macosx/sfilters.m:88
 msgid "Marquee:"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:91
+#: modules/gui/macosx/sfilters.m:90
 msgid "Timeout:"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:92
+#: modules/gui/macosx/sfilters.m:91
 msgid "ms"
 msgstr ""
 
-#: modules/gui/macosx/sfilters.m:202 modules/gui/macosx/sfilters.m:233
+#: modules/gui/macosx/sfilters.m:201 modules/gui/macosx/sfilters.m:231
 msgid "Not Available"
 msgstr ""
 
-#: modules/gui/macosx/update.m:87
+#: modules/gui/macosx/simple_prefs.m:91 modules/gui/macosx/simple_prefs.m:93
+#: modules/gui/qt4/components/simple_preferences.cpp:410
+msgid "Interface settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:107 modules/gui/macosx/simple_prefs.m:109
+msgid "General Audio settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:123 modules/gui/macosx/simple_prefs.m:125
+msgid "General Video settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:138
+#: modules/gui/qt4/components/simple_preferences.cpp:77
+msgid "Subtitles & OSD"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:139 modules/gui/macosx/simple_prefs.m:141
+#: modules/gui/qt4/components/simple_preferences.cpp:472
+msgid "Subtitles & OSD settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:154
+msgid "Input & Codecs"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:155 modules/gui/macosx/simple_prefs.m:157
+msgid "Input & Codec settings"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:319 modules/gui/macosx/simple_prefs.m:359
+msgid "Custom"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:319
+msgid "Lowest latency"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:319
+msgid "Low latency"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:319
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1399
+#: modules/gui/wxwidgets/wxwidgets.cpp:115 modules/misc/freetype.c:127
+#: modules/misc/win32text.c:78
+msgid "Normal"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:320
+msgid "High latency"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:320
+msgid "Higher latency"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:763
+msgid "Choose the folder to save your video snapshots to."
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:765 modules/gui/macosx/simple_prefs.m:811
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:384
+#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:395
+#: modules/gui/wxwidgets/dialogs/wizard.cpp:122
+msgid "Choose"
+msgstr ""
+
+#: modules/gui/macosx/simple_prefs.m:809
+msgid "Choose the font to display your Subtitles with."
+msgstr ""
+
+#: modules/gui/macosx/update.m:61
 msgid "Check for Updates"
 msgstr ""
 
-#: modules/gui/macosx/update.m:88
+#: modules/gui/macosx/update.m:62
 msgid "Download now"
 msgstr ""
 
-#: modules/gui/macosx/update.m:90
+#: modules/gui/macosx/update.m:64
 msgid "Automatically check for updates"
 msgstr ""
 
-#: modules/gui/macosx/update.m:110
+#: modules/gui/macosx/update.m:91
 msgid "Do you want VLC to check for updates automatically?"
 msgstr ""
 
-#: modules/gui/macosx/update.m:111
+#: modules/gui/macosx/update.m:92
 msgid "You can change this option in VLC's update window later on."
 msgstr ""
 
-#: modules/gui/macosx/update.m:132
-msgid "Checking for Updates..."
-msgstr ""
-
-#: modules/gui/macosx/update.m:235
-#, c-format
-msgid "The latest VLC media player release is %s (%i MB to download)."
+#: modules/gui/macosx/update.m:174
+msgid "This version of VLC is the latest available."
 msgstr ""
 
-#: modules/gui/macosx/update.m:250
+#: modules/gui/macosx/update.m:180
 msgid "This version of VLC is outdated."
 msgstr ""
 
-#: modules/gui/macosx/update.m:268 modules/gui/macosx/update.m:316
-msgid "This version of VLC is the latest available."
+#: modules/gui/macosx/update.m:182
+#, c-format
+msgid "The current release is %d.%d.%d%c."
 msgstr ""
 
 #: modules/gui/macosx/wizard.m:113
@@ -14494,8 +14592,8 @@ msgstr ""
 msgid "Announce Channel:"
 msgstr ""
 
-#: modules/gui/pda/pda_interface.c:1247 modules/gui/qt4/dialogs/help.cpp:199
-#: modules/gui/qt4/menus.cpp:479 modules/gui/qt4/ui/video_effects.ui:998
+#: modules/gui/pda/pda_interface.c:1247 modules/gui/qt4/dialogs/help.cpp:205
+#: modules/gui/qt4/ui/video_effects.ui:848
 msgid "Update"
 msgstr ""
 
@@ -14543,80 +14641,80 @@ msgstr ""
 msgid "QNX RTOS video and audio output"
 msgstr ""
 
-#: modules/gui/qt4/components/extended_panels.cpp:901
-#: modules/gui/qt4/components/extended_panels.cpp:959
+#: modules/gui/qt4/components/extended_panels.cpp:902
+#: modules/gui/qt4/components/extended_panels.cpp:960
 msgid "Preamp\n"
 msgstr ""
 
-#: modules/gui/qt4/components/extended_panels.cpp:901
-#: modules/gui/qt4/components/extended_panels.cpp:959
+#: modules/gui/qt4/components/extended_panels.cpp:902
+#: modules/gui/qt4/components/extended_panels.cpp:960
 msgid "dB"
 msgstr ""
 
-#: modules/gui/qt4/components/info_panels.cpp:347
+#: modules/gui/qt4/components/info_panels.cpp:349
 msgid "Extra metadata and other information are shown in this panel.\n"
 msgstr ""
 
-#: modules/gui/qt4/components/info_panels.cpp:419
+#: modules/gui/qt4/components/info_panels.cpp:421
 msgid ""
 "Information about what your media or stream is made of.\n"
 " Muxer, Audio and Video Codecs, Subtitles are shown."
 msgstr ""
 
-#: modules/gui/qt4/components/info_panels.cpp:493
+#: modules/gui/qt4/components/info_panels.cpp:495
 msgid ""
 "Various statistics about the current media or stream.\n"
 " Played and streamed info are shown."
 msgstr ""
 
-#: modules/gui/qt4/components/info_panels.cpp:541
+#: modules/gui/qt4/components/info_panels.cpp:543
 msgid "Sent bitrates"
 msgstr ""
 
-#: modules/gui/qt4/components/interface_widgets.cpp:204
+#: modules/gui/qt4/components/interface_widgets.cpp:233
 msgid "Current visualization:"
 msgstr ""
 
-#: modules/gui/qt4/components/interface_widgets.cpp:261
+#: modules/gui/qt4/components/interface_widgets.cpp:290
 msgid "A to B"
 msgstr ""
 
-#: modules/gui/qt4/components/interface_widgets.cpp:270
+#: modules/gui/qt4/components/interface_widgets.cpp:299
 msgid "Frame by Frame"
 msgstr ""
 
-#: modules/gui/qt4/components/interface_widgets.cpp:285
+#: modules/gui/qt4/components/interface_widgets.cpp:314
 msgid "Take a snapshot"
 msgstr ""
 
-#: modules/gui/qt4/components/interface_widgets.cpp:455
+#: modules/gui/qt4/components/interface_widgets.cpp:484
 msgid "Transparent"
 msgstr ""
 
-#: modules/gui/qt4/components/interface_widgets.cpp:547
+#: modules/gui/qt4/components/interface_widgets.cpp:576
 msgid "Show playlist"
 msgstr ""
 
-#: modules/gui/qt4/components/interface_widgets.cpp:552
+#: modules/gui/qt4/components/interface_widgets.cpp:581
 msgid "Extended Settings"
 msgstr ""
 
-#: modules/gui/qt4/components/interface_widgets.cpp:627
+#: modules/gui/qt4/components/interface_widgets.cpp:661
 #: modules/gui/wxwidgets/input_manager.cpp:285
 msgid "Menu"
 msgstr ""
 
-#: modules/gui/qt4/components/interface_widgets.cpp:630
+#: modules/gui/qt4/components/interface_widgets.cpp:664
 #: modules/gui/wxwidgets/input_manager.cpp:288
 msgid "Previous track"
 msgstr ""
 
-#: modules/gui/qt4/components/interface_widgets.cpp:631
+#: modules/gui/qt4/components/interface_widgets.cpp:665
 #: modules/gui/wxwidgets/input_manager.cpp:289
 msgid "Next track"
 msgstr ""
 
-#: modules/gui/qt4/components/interface_widgets.cpp:790
+#: modules/gui/qt4/components/interface_widgets.cpp:826
 msgid "Revert to normal play speed"
 msgstr ""
 
@@ -14637,154 +14735,146 @@ msgstr ""
 msgid "Open subtitles file"
 msgstr ""
 
-#: modules/gui/qt4/components/open_panels.cpp:386
+#: modules/gui/qt4/components/open_panels.cpp:387
 msgid "Open a device or a VIDEO_TS directory"
 msgstr ""
 
-#: modules/gui/qt4/components/open_panels.cpp:622
+#: modules/gui/qt4/components/open_panels.cpp:581
+#: modules/gui/qt4/components/open_panels.cpp:837
+msgid "DVB Type:"
+msgstr ""
+
+#: modules/gui/qt4/components/open_panels.cpp:605
+#: modules/gui/qt4/components/open_panels.cpp:867
+msgid "Transponder symbol rate"
+msgstr ""
+
+#: modules/gui/qt4/components/open_panels.cpp:727
 msgid "Channels :"
 msgstr ""
 
-#: modules/gui/qt4/components/open_panels.cpp:635
+#: modules/gui/qt4/components/open_panels.cpp:740
 msgid "Selected ports :"
 msgstr ""
 
-#: modules/gui/qt4/components/open_panels.cpp:638
+#: modules/gui/qt4/components/open_panels.cpp:743
 msgid ".*"
 msgstr ""
 
-#: modules/gui/qt4/components/open_panels.cpp:643
+#: modules/gui/qt4/components/open_panels.cpp:748
 msgid "Input caching :"
 msgstr ""
 
-#: modules/gui/qt4/components/open_panels.cpp:653
+#: modules/gui/qt4/components/open_panels.cpp:758
 msgid "Use VLC pace"
 msgstr ""
 
-#: modules/gui/qt4/components/open_panels.cpp:657
+#: modules/gui/qt4/components/open_panels.cpp:762
 msgid "Auto connnection"
 msgstr ""
 
-#: modules/gui/qt4/components/open_panels.cpp:681
+#: modules/gui/qt4/components/open_panels.cpp:786
 msgid "Radio device name"
 msgstr ""
 
-#: modules/gui/qt4/components/open_panels.cpp:732
-#: modules/gui/qt4/components/open_panels.cpp:826
-msgid "DVB Type:"
-msgstr ""
-
-#: modules/gui/qt4/components/open_panels.cpp:762
-#: modules/gui/qt4/components/open_panels.cpp:850
-msgid "Transponder symbol rate"
-msgstr ""
-
-#: modules/gui/qt4/components/open_panels.cpp:1067
+#: modules/gui/qt4/components/open_panels.cpp:1073
 #: modules/gui/qt4/ui/open_capture.ui:61
 #: modules/gui/wxwidgets/dialogs/open.cpp:259
 msgid "Advanced options..."
 msgstr ""
 
-#: modules/gui/qt4/components/playlist/playlist.cpp:62
+#: modules/gui/qt4/components/playlist/playlist.cpp:73
 msgid "Double click to get the media informations"
 msgstr ""
 
-#: modules/gui/qt4/components/playlist/standardpanel.cpp:140
-msgid "X"
+#: modules/gui/qt4/components/playlist/standardpanel.cpp:141
+msgid "Show the current item"
 msgstr ""
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:303
+#: modules/gui/qt4/components/preferences_widgets.cpp:302
 msgid "Select File"
 msgstr ""
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:332
+#: modules/gui/qt4/components/preferences_widgets.cpp:331
 msgid "Select Directory"
 msgstr ""
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1014
+#: modules/gui/qt4/components/preferences_widgets.cpp:1111
 msgid "Select an action to change the associated hotkey"
 msgstr ""
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1022
+#: modules/gui/qt4/components/preferences_widgets.cpp:1119
 msgid "Action"
 msgstr ""
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1023
+#: modules/gui/qt4/components/preferences_widgets.cpp:1120
 msgid "Shortcut"
 msgstr ""
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1029
+#: modules/gui/qt4/components/preferences_widgets.cpp:1126
 msgid "Set"
 msgstr ""
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1140
+#: modules/gui/qt4/components/preferences_widgets.cpp:1237
 msgid "Unset"
 msgstr ""
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1178
+#: modules/gui/qt4/components/preferences_widgets.cpp:1275
 msgid "Hotkey for "
 msgstr ""
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1181
+#: modules/gui/qt4/components/preferences_widgets.cpp:1278
 msgid "Press the new keys for "
 msgstr ""
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1206
+#: modules/gui/qt4/components/preferences_widgets.cpp:1303
 msgid "Warning: the key is already assigned to \""
 msgstr ""
 
-#: modules/gui/qt4/components/preferences_widgets.cpp:1226
-#: modules/gui/qt4/components/preferences_widgets.cpp:1234
+#: modules/gui/qt4/components/preferences_widgets.cpp:1323
+#: modules/gui/qt4/components/preferences_widgets.cpp:1331
 msgid "Key: "
 msgstr ""
 
-#: modules/gui/qt4/components/simple_preferences.cpp:77
+#: modules/gui/qt4/components/simple_preferences.cpp:79
 msgid "Input and Codecs"
 msgstr ""
 
-#: modules/gui/qt4/components/simple_preferences.cpp:295
+#: modules/gui/qt4/components/simple_preferences.cpp:309
 msgid "Input & Codecs settings"
 msgstr ""
 
-#: modules/gui/qt4/components/simple_preferences.cpp:301
+#: modules/gui/qt4/components/simple_preferences.cpp:315
 msgid ""
 "If this property is blank, then you have\n"
 "values for DVD, VCD, and CDDA.\n"
 "You can define a unique one or set that inthe advanced preferences"
 msgstr ""
 
-#: modules/gui/qt4/components/simple_preferences.cpp:396
-msgid "Interface settings"
-msgstr ""
-
-#: modules/gui/qt4/components/simple_preferences.cpp:443
-msgid "Subtitles & OSD settings"
-msgstr ""
-
-#: modules/gui/qt4/components/simple_preferences.cpp:468
+#: modules/gui/qt4/components/simple_preferences.cpp:497
 msgid "Configure Hotkeys"
 msgstr ""
 
-#: modules/gui/qt4/components/simple_preferences.cpp:670
+#: modules/gui/qt4/components/simple_preferences.cpp:706
 #: modules/gui/qt4/dialogs_provider.hpp:54
 msgid "Audio Files"
 msgstr ""
 
-#: modules/gui/qt4/components/simple_preferences.cpp:671
+#: modules/gui/qt4/components/simple_preferences.cpp:707
 #: modules/gui/qt4/dialogs_provider.hpp:49
 msgid "Video Files"
 msgstr ""
 
-#: modules/gui/qt4/components/simple_preferences.cpp:672
+#: modules/gui/qt4/components/simple_preferences.cpp:708
 #: modules/gui/qt4/dialogs_provider.hpp:59
 msgid "Playlist Files"
 msgstr ""
 
-#: modules/gui/qt4/components/simple_preferences.cpp:719
+#: modules/gui/qt4/components/simple_preferences.cpp:755
 msgid "&Apply"
 msgstr ""
 
-#: modules/gui/qt4/components/simple_preferences.cpp:720
+#: modules/gui/qt4/components/simple_preferences.cpp:756
 #: modules/gui/qt4/dialogs/gototime.cpp:51
 #: modules/gui/qt4/dialogs/open.cpp:108
 #: modules/gui/qt4/dialogs/preferences.cpp:80
@@ -14815,10 +14905,10 @@ msgstr ""
 msgid "Errors"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/errors.cpp:50 modules/gui/qt4/dialogs/help.cpp:64
-#: modules/gui/qt4/dialogs/help.cpp:92 modules/gui/qt4/dialogs/help.cpp:204
+#: modules/gui/qt4/dialogs/errors.cpp:50 modules/gui/qt4/dialogs/help.cpp:65
+#: modules/gui/qt4/dialogs/help.cpp:97 modules/gui/qt4/dialogs/help.cpp:209
 #: modules/gui/qt4/dialogs/mediainfo.cpp:77
-#: modules/gui/qt4/dialogs/messages.cpp:47
+#: modules/gui/qt4/dialogs/messages.cpp:82
 #: modules/gui/wxwidgets/dialogs/fileinfo.cpp:93
 #: modules/gui/wxwidgets/dialogs/interaction.cpp:192
 #: modules/gui/wxwidgets/dialogs/messages.cpp:72
@@ -14828,7 +14918,8 @@ msgid "&Close"
 msgstr ""
 
 #: modules/gui/qt4/dialogs/errors.cpp:51
-#: modules/gui/qt4/dialogs/messages.cpp:48
+#: modules/gui/qt4/dialogs/messages.cpp:84
+#: modules/gui/qt4/dialogs/messages.cpp:128
 #: modules/gui/wxwidgets/dialogs/bookmarks.cpp:163
 #: modules/gui/wxwidgets/dialogs/interaction.cpp:190
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:412
@@ -14843,23 +14934,23 @@ msgstr ""
 msgid "Adjustments and Effects"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/extended.cpp:53
+#: modules/gui/qt4/dialogs/extended.cpp:54
 msgid "Graphic Equalizer"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/extended.cpp:56
+#: modules/gui/qt4/dialogs/extended.cpp:57
 msgid "Spatializer"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/extended.cpp:59
+#: modules/gui/qt4/dialogs/extended.cpp:60
 msgid "Audio effects"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/extended.cpp:62
+#: modules/gui/qt4/dialogs/extended.cpp:71
 msgid "Video Effects"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/extended.cpp:67
+#: modules/gui/qt4/dialogs/extended.cpp:76
 msgid "v4l2 controls"
 msgstr ""
 
@@ -14875,11 +14966,11 @@ msgstr ""
 msgid "Go to time:"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:97
+#: modules/gui/qt4/dialogs/help.cpp:102
 msgid "VLC media player "
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:112
+#: modules/gui/qt4/dialogs/help.cpp:117
 msgid ""
 "VLC media player is a free media player, encoder and streamer that can read "
 "from files, CDs, DVDs, network streams, capture cards and even more!\n"
@@ -14887,64 +14978,64 @@ msgid ""
 "\n"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:116
+#: modules/gui/qt4/dialogs/help.cpp:121
 msgid ""
 "This version of VLC was compiled by:\n"
 " "
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:120 modules/gui/wince/interface.cpp:505
+#: modules/gui/qt4/dialogs/help.cpp:125 modules/gui/wince/interface.cpp:505
 #: modules/gui/wxwidgets/interface.cpp:961
-msgid "Based on SVN revision: "
+msgid "Based on Git commit: "
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:121
+#: modules/gui/qt4/dialogs/help.cpp:126
 msgid ""
 "You are using the Qt4 Interface.\n"
 "\n"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:122
+#: modules/gui/qt4/dialogs/help.cpp:127
 msgid "Copyright (c) "
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:143
+#: modules/gui/qt4/dialogs/help.cpp:148
 msgid ""
 "We would like to thank the whole community, the testers, our users and the "
 "following people (and the missing ones...) for their collaboration to "
 "provide the best software."
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:161
+#: modules/gui/qt4/dialogs/help.cpp:166
 msgid "Authors"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:162
+#: modules/gui/qt4/dialogs/help.cpp:167
 msgid "Thanks"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:205
+#: modules/gui/qt4/dialogs/help.cpp:210
 msgid "&Update List"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:211
+#: modules/gui/qt4/dialogs/help.cpp:216
 msgid "Checking for the update..."
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:249
+#: modules/gui/qt4/dialogs/help.cpp:259
 msgid "Select a directory ..."
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:281
+#: modules/gui/qt4/dialogs/help.cpp:291
 msgid "There is a new version of vlc :\n"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:284
+#: modules/gui/qt4/dialogs/help.cpp:295
 msgid "You have the latest version of vlc"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/help.cpp:287
-msgid "An error occure while checking for updates"
+#: modules/gui/qt4/dialogs/help.cpp:299
+msgid "An error occured while checking for updates"
 msgstr ""
 
 #: modules/gui/qt4/dialogs/interaction.cpp:93
@@ -14979,19 +15070,31 @@ msgstr ""
 msgid "Location :"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/messages.cpp:49
+#: modules/gui/qt4/dialogs/messages.cpp:78
+msgid "Modules tree"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/messages.cpp:85
 msgid "&Save as..."
 msgstr ""
 
-#: modules/gui/qt4/dialogs/messages.cpp:58
+#: modules/gui/qt4/dialogs/messages.cpp:93
 msgid "Verbosity Level"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/messages.cpp:162
+#: modules/gui/qt4/dialogs/messages.cpp:119
+msgid "&Update"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/messages.cpp:251
 msgid "Choose a filename to save the logs under..."
 msgstr ""
 
-#: modules/gui/qt4/dialogs/messages.cpp:171
+#: modules/gui/qt4/dialogs/messages.cpp:253
+msgid "Texts / Logs (*.log *.txt);; All (*.*) "
+msgstr ""
+
+#: modules/gui/qt4/dialogs/messages.cpp:260
 msgid ""
 "Cannot write file %1:\n"
 "%2."
@@ -15036,7 +15139,7 @@ msgid "&Convert / Save"
 msgstr ""
 
 #: modules/gui/qt4/dialogs/preferences.cpp:65
-#: modules/gui/qt4/ui/video_effects.ui:41
+#: modules/gui/qt4/ui/video_effects.ui:17
 msgid "Basic"
 msgstr ""
 
@@ -15057,19 +15160,19 @@ msgid ""
 "Are you sure you want to continue?"
 msgstr ""
 
-#: modules/gui/qt4/dialogs_provider.cpp:367
+#: modules/gui/qt4/dialogs_provider.cpp:376
 msgid "Open playlist file"
 msgstr ""
 
-#: modules/gui/qt4/dialogs_provider.cpp:378
+#: modules/gui/qt4/dialogs_provider.cpp:387
 msgid "Choose a filename to save playlist"
 msgstr ""
 
-#: modules/gui/qt4/dialogs_provider.cpp:380
+#: modules/gui/qt4/dialogs_provider.cpp:389
 msgid "XSPF playlist (*.xspf);; "
 msgstr ""
 
-#: modules/gui/qt4/dialogs_provider.cpp:381
+#: modules/gui/qt4/dialogs_provider.cpp:390
 msgid "M3U playlist (*.m3u);; Any (*.*) "
 msgstr ""
 
@@ -15101,35 +15204,55 @@ msgstr ""
 msgid "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv)"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/vlm.cpp:82
+#: modules/gui/qt4/dialogs/vlm.cpp:83
 msgid "Hours/Minutes/Seconds:"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/vlm.cpp:84
+#: modules/gui/qt4/dialogs/vlm.cpp:85
 msgid "Day Month Year:"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/vlm.cpp:86
+#: modules/gui/qt4/dialogs/vlm.cpp:87
 msgid "Repeat:"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/vlm.cpp:88
+#: modules/gui/qt4/dialogs/vlm.cpp:89
 msgid "Repeat delay:"
 msgstr ""
 
-#: modules/gui/qt4/dialogs/vlm.cpp:113
+#: modules/gui/qt4/dialogs/vlm.cpp:114
 msgid " days"
 msgstr ""
 
-#: modules/gui/qt4/main_interface.cpp:471
+#: modules/gui/qt4/dialogs/vlm.cpp:133
+msgid "Import"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/vlm.cpp:136
+msgid "Export"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/vlm.cpp:263
+msgid "Choose a filename to save the VLM configuration..."
+msgstr ""
+
+#: modules/gui/qt4/dialogs/vlm.cpp:265 modules/gui/qt4/dialogs/vlm.cpp:284
+msgid "VLM conf (*.vlm) ;; All (*.*)"
+msgstr ""
+
+#: modules/gui/qt4/dialogs/vlm.cpp:282
+msgid "Choose a VLM configuration file to open..."
+msgstr ""
+
+#: modules/gui/qt4/main_interface.cpp:488
 msgid "Privacy and Network policies"
 msgstr ""
 
-#: modules/gui/qt4/main_interface.cpp:475
+#: modules/gui/qt4/main_interface.cpp:492
 msgid "Privacy and Network Warning"
 msgstr ""
 
-#: modules/gui/qt4/main_interface.cpp:478
+#: modules/gui/qt4/main_interface.cpp:495
 msgid ""
 "<p>The <i>VideoLAN Team</i> doesn't like when an application goes online "
 "without authorization.</p>\n"
@@ -15142,11 +15265,11 @@ msgid ""
 "access on the web.</p>\n"
 msgstr ""
 
-#: modules/gui/qt4/main_interface.cpp:982
+#: modules/gui/qt4/main_interface.cpp:1022
 msgid "Control menu for the player"
 msgstr ""
 
-#: modules/gui/qt4/main_interface.cpp:1031
+#: modules/gui/qt4/main_interface.cpp:1071
 #: modules/gui/wxwidgets/input_manager.cpp:270
 msgid "Paused"
 msgstr ""
@@ -15183,16 +15306,16 @@ msgstr ""
 msgid "&Open File..."
 msgstr ""
 
-#: modules/gui/qt4/menus.cpp:202 modules/gui/qt4/menus.cpp:540
+#: modules/gui/qt4/menus.cpp:202 modules/gui/qt4/menus.cpp:529
 #: modules/gui/wxwidgets/menus.cpp:133
 msgid "Open &Disc..."
 msgstr ""
 
-#: modules/gui/qt4/menus.cpp:204 modules/gui/qt4/menus.cpp:542
+#: modules/gui/qt4/menus.cpp:204 modules/gui/qt4/menus.cpp:531
 msgid "Open &Network..."
 msgstr ""
 
-#: modules/gui/qt4/menus.cpp:206 modules/gui/qt4/menus.cpp:544
+#: modules/gui/qt4/menus.cpp:206 modules/gui/qt4/menus.cpp:533
 #: modules/gui/wxwidgets/menus.cpp:135
 msgid "Open &Capture Device..."
 msgstr ""
@@ -15205,7 +15328,7 @@ msgstr ""
 msgid "Conve&rt / Save..."
 msgstr ""
 
-#: modules/gui/qt4/menus.cpp:218 modules/gui/qt4/menus.cpp:724
+#: modules/gui/qt4/menus.cpp:218 modules/gui/qt4/menus.cpp:713
 msgid "&Quit"
 msgstr ""
 
@@ -15253,180 +15376,183 @@ msgstr ""
 msgid "Visualizations selector"
 msgstr ""
 
-#: modules/gui/qt4/menus.cpp:338
-msgid "Switch to skins"
-msgstr ""
-
-#: modules/gui/qt4/menus.cpp:343
-msgid "Switch to WxWidgets"
+#: modules/gui/qt4/menus.cpp:465
+msgid "Help..."
 msgstr ""
 
-#: modules/gui/qt4/menus.cpp:476
-msgid "Help..."
+#: modules/gui/qt4/menus.cpp:468
+msgid "Check for updates..."
 msgstr ""
 
-#: modules/gui/qt4/menus.cpp:534
+#: modules/gui/qt4/menus.cpp:523
 msgid "Tools"
 msgstr ""
 
-#: modules/gui/qt4/menus.cpp:538 modules/gui/wxwidgets/menus.cpp:131
+#: modules/gui/qt4/menus.cpp:527 modules/gui/wxwidgets/menus.cpp:131
 msgid "Open &File..."
 msgstr ""
 
-#: modules/gui/qt4/menus.cpp:708
+#: modules/gui/qt4/menus.cpp:697
 msgid "Hide VLC media player in taskbar"
 msgstr ""
 
-#: modules/gui/qt4/menus.cpp:714
+#: modules/gui/qt4/menus.cpp:703
 msgid "Show VLC media player"
 msgstr ""
 
-#: modules/gui/qt4/menus.cpp:722
+#: modules/gui/qt4/menus.cpp:711
 msgid "&Open Media"
 msgstr ""
 
-#: modules/gui/qt4/menus.cpp:756 modules/gui/wxwidgets/menus.cpp:579
-#: modules/gui/wxwidgets/menus.cpp:606
+#: modules/gui/qt4/menus.cpp:745 modules/gui/wxwidgets/menus.cpp:568
+#: modules/gui/wxwidgets/menus.cpp:594
 msgid "Empty"
 msgstr ""
 
 #: modules/gui/qt4/qt4.cpp:59
-msgid "Always show an area for information when no video is played"
-msgstr ""
-
-#: modules/gui/qt4/qt4.cpp:61
-msgid ""
-"Start VLC with a cone image, and use this zone to show information as "
-"lyrics, album arts or visualisation  when there is no video track."
-msgstr ""
-
-#: modules/gui/qt4/qt4.cpp:66
 msgid "Show advanced prefs over simple ones"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:67
+#: modules/gui/qt4/qt4.cpp:60
 msgid ""
 "Show advanced preferences and not simple preferences when opening the "
 "preferences dialog."
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:71 modules/gui/skins2/src/skin_main.cpp:437
+#: modules/gui/qt4/qt4.cpp:64 modules/gui/skins2/src/skin_main.cpp:437
 #: modules/gui/wxwidgets/wxwidgets.cpp:102
 msgid "Systray icon"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:72
+#: modules/gui/qt4/qt4.cpp:65
 msgid ""
 "Show an icon in the systray allowing you to control VLC media player for "
 "basic actions"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:76
+#: modules/gui/qt4/qt4.cpp:69
 msgid "Start VLC with only a systray icon"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:77
+#: modules/gui/qt4/qt4.cpp:70
 msgid ""
 "When you launch VLC with that option, VLC will start with just an icon "
 "inyour taskbar"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:81
+#: modules/gui/qt4/qt4.cpp:74
 msgid "Show playing item name in window title"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:82
+#: modules/gui/qt4/qt4.cpp:75
 msgid "Show the name of the song or video in the controler window title"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:85
+#: modules/gui/qt4/qt4.cpp:78
 msgid "Path to use in openfile dialog"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:87
+#: modules/gui/qt4/qt4.cpp:80
 msgid "Show notification popup on track change"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:89
+#: modules/gui/qt4/qt4.cpp:82
 msgid ""
 "Show a notification popup with the artist and track name when the current "
 "playlist item changes, when VLC is minimized or hidden."
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:92 modules/gui/wxwidgets/dialogs/open.cpp:264
+#: modules/gui/qt4/qt4.cpp:85 modules/gui/wxwidgets/dialogs/open.cpp:264
 #: modules/gui/wxwidgets/dialogs/open.cpp:275
 #: modules/gui/wxwidgets/dialogs/open.cpp:421
 #: modules/gui/wxwidgets/dialogs/preferences.cpp:217
 msgid "Advanced options"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:93
+#: modules/gui/qt4/qt4.cpp:86
 msgid "Show all the advanced options in the dialogs"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:96
+#: modules/gui/qt4/qt4.cpp:89
 msgid "Windows opacity between 0.1 and 1."
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:97
+#: modules/gui/qt4/qt4.cpp:90
 msgid ""
 "Sets the windows opacity between 0.1 and 1 for main interface, playlist and "
 "extended panel. This option only works with Windows and X11 with composite "
 "extensions."
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:102
-msgid "Define what columns to show in playlist window"
-msgstr ""
-
-#: modules/gui/qt4/qt4.cpp:103
-msgid ""
-"Enter the sum of the options that you want: \n"
-"Title: 1; Duration: 2; Artist: 4; Genre: 8; Copyright: 16; Collection/album: "
-"32; Rating: 256."
-msgstr ""
-
-#: modules/gui/qt4/qt4.cpp:107
+#: modules/gui/qt4/qt4.cpp:95
 msgid "Show unimportant error and warnings dialogs"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:108
-msgid "Start in minimal view (menus hidden)."
-msgstr ""
-
-#: modules/gui/qt4/qt4.cpp:110
+#: modules/gui/qt4/qt4.cpp:97
 msgid "Activate the updates availability notification"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:111
+#: modules/gui/qt4/qt4.cpp:98
 msgid ""
 "Activate the automatic notification of new versions of the software. It runs "
 "once a week."
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:114
+#: modules/gui/qt4/qt4.cpp:100
+msgid "Number of days between two update checks"
+msgstr ""
+
+#: modules/gui/qt4/qt4.cpp:102
 msgid "Allow the volume to be set to 400%"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:115
+#: modules/gui/qt4/qt4.cpp:103
 msgid ""
 "Allow the volume to have range from 0% to 400%, instead of 0% to 200%. This "
 "option can distort the audio, since it uses software amplification."
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:120
+#: modules/gui/qt4/qt4.cpp:108
+msgid "Automatically save the volume on exit"
+msgstr ""
+
+#: modules/gui/qt4/qt4.cpp:110
 msgid "Use non native buttons and volume slider"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:122
+#: modules/gui/qt4/qt4.cpp:112
 msgid "Ask for network policy at start"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:124
+#: modules/gui/qt4/qt4.cpp:115
 msgid "Show the opening dialog view in detail mode"
 msgstr ""
 
-#: modules/gui/qt4/qt4.cpp:128
+#: modules/gui/qt4/qt4.cpp:117
+msgid "Selection of the starting mode and look "
+msgstr ""
+
+#: modules/gui/qt4/qt4.cpp:118
+msgid ""
+"Start VLC with:\n"
+" - normal mode\n"
+" - a zone always present to show informationas lyrics, album arts...\n"
+" - minimal mode with limited controls"
+msgstr ""
+
+#: modules/gui/qt4/qt4.cpp:124
+msgid "Classic look"
+msgstr ""
+
+#: modules/gui/qt4/qt4.cpp:125
+msgid "Complete look with information area"
+msgstr ""
+
+#: modules/gui/qt4/qt4.cpp:126
+msgid "Minimal look with no menus"
+msgstr ""
+
+#: modules/gui/qt4/qt4.cpp:135
 msgid "Qt interface"
 msgstr ""
 
@@ -15479,11 +15605,11 @@ msgstr ""
 msgid "No DVD Menus"
 msgstr ""
 
-#: modules/gui/qt4/ui/open_disk.ui:152
+#: modules/gui/qt4/ui/open_disk.ui:159
 msgid "Starting position"
 msgstr ""
 
-#: modules/gui/qt4/ui/open_disk.ui:213
+#: modules/gui/qt4/ui/open_disk.ui:220
 msgid "Audio and Subtitles"
 msgstr ""
 
@@ -15618,11 +15744,13 @@ msgid "Encapsulation"
 msgstr ""
 
 #: modules/gui/qt4/ui/sout.ui:536
-msgid "Video Codec"
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:768
+msgid "Video codec"
 msgstr ""
 
 #: modules/gui/qt4/ui/sout.ui:625
-msgid "Audio Codec"
+#: modules/gui/wxwidgets/dialogs/streamout.cpp:838
+msgid "Audio codec"
 msgstr ""
 
 #: modules/gui/qt4/ui/sout.ui:740
@@ -15646,31 +15774,39 @@ msgstr ""
 msgid "General Audio"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_audio.ui:69
-msgid "Preferred audio language"
+#: modules/gui/qt4/ui/sprefs_audio.ui:36
+msgid "Default volume"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_audio.ui:95
-msgid "Default volume"
+#: modules/gui/qt4/ui/sprefs_audio.ui:77
+msgid "256 corresponds to 100%, 1024 to 400%"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_audio.ui:106
+msgid "Save volume on exit"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_audio.ui:139
+msgid "Preferred audio language"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_audio.ui:244
+#: modules/gui/qt4/ui/sprefs_audio.ui:306
 msgid "Effects"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_audio.ui:253
+#: modules/gui/qt4/ui/sprefs_audio.ui:315
 msgid "Headphone surround effect"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_audio.ui:267
-msgid "Visualisation"
+#: modules/gui/qt4/ui/sprefs_audio.ui:329
+msgid "Visualization"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_audio.ui:284
+#: modules/gui/qt4/ui/sprefs_audio.ui:346
 msgid "Last.fm"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_audio.ui:290
+#: modules/gui/qt4/ui/sprefs_audio.ui:352
 msgid "Enable last.fm submission"
 msgstr ""
 
@@ -15714,103 +15850,106 @@ msgstr ""
 msgid "Access Filter"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:29
+#: modules/gui/qt4/ui/sprefs_interface.ui:35
 msgid "Native or Skins"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:77
-msgid "Skin File"
+#: modules/gui/qt4/ui/sprefs_interface.ui:41
+msgid "Native"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:90
+#: modules/gui/qt4/ui/sprefs_interface.ui:51
 msgid "This is VLC's default interface, with a native look and feel."
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:106
-msgid "Native"
+#: modules/gui/qt4/ui/sprefs_interface.ui:73
+msgid "Display Mode"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:113
-#: modules/gui/skins2/src/skin_main.cpp:469
-msgid "Skins"
+#: modules/gui/qt4/ui/sprefs_interface.ui:90
+msgid "Integrate video in interface"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:120
-msgid "Always display the video"
+#: modules/gui/qt4/ui/sprefs_interface.ui:104
+#: modules/gui/skins2/src/skin_main.cpp:469
+msgid "Skins"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:127
-msgid "Integrate video in interface"
+#: modules/gui/qt4/ui/sprefs_interface.ui:158
+msgid "Skin File"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:137
+#: modules/gui/qt4/ui/sprefs_interface.ui:178
 msgid "Instances"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:143
+#: modules/gui/qt4/ui/sprefs_interface.ui:184
 msgid "Allow only one instance"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:150
+#: modules/gui/qt4/ui/sprefs_interface.ui:191
 msgid "Enqueue files in playlist when in one instance mode"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:157
+#: modules/gui/qt4/ui/sprefs_interface.ui:198
 msgid "File associations:"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:170
+#: modules/gui/qt4/ui/sprefs_interface.ui:211
 msgid "Association Setup"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:180
+#: modules/gui/qt4/ui/sprefs_interface.ui:221
 msgid "Privacy / Network Interaction"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:186
+#: modules/gui/qt4/ui/sprefs_interface.ui:227
 msgid "Album art download policy"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:196
+#: modules/gui/qt4/ui/sprefs_interface.ui:237
+msgid "Fetch the metadata from the Internet"
+msgstr ""
+
+#: modules/gui/qt4/ui/sprefs_interface.ui:244
 msgid "Activate update notifier"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:203
-msgid "Fetch the metadata from the Internet"
+#: modules/gui/qt4/ui/sprefs_interface.ui:261
+msgid "Network policy"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_interface.ui:51
+#: modules/gui/qt4/ui/sprefs_interface.ui:120
 msgid ""
 "This is VLC's skinnable interface. You can download skins at &lt;a href="
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_subtitles.ui:37
+#: modules/gui/qt4/ui/sprefs_subtitles.ui:28
 msgid "Enable OSD"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_subtitles.ui:61
+#: modules/gui/qt4/ui/sprefs_subtitles.ui:50
 msgid "Subtitles languages"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_subtitles.ui:73
-msgid "Subtitles preferred language"
+#: modules/gui/qt4/ui/sprefs_subtitles.ui:56
+msgid "Preferred Subtitle language"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_subtitles.ui:93
+#: modules/gui/qt4/ui/sprefs_subtitles.ui:76
 msgid "Default Encoding"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_subtitles.ui:103
+#: modules/gui/qt4/ui/sprefs_subtitles.ui:86
 msgid "Display Settings"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_subtitles.ui:118
-#: modules/video_output/opengl.c:172
+#: modules/gui/qt4/ui/sprefs_subtitles.ui:95 modules/video_output/opengl.c:172
 msgid "Effect"
 msgstr ""
 
-#: modules/gui/qt4/ui/sprefs_subtitles.ui:128
-msgid "Font Color"
+#: modules/gui/qt4/ui/sprefs_subtitles.ui:105
+msgid "Font color"
 msgstr ""
 
 #: modules/gui/qt4/ui/sprefs_video.ui:36 modules/stream_out/display.c:53
@@ -15859,204 +15998,200 @@ msgstr ""
 msgid "Sequential numbering"
 msgstr ""
 
-#: modules/gui/qt4/ui/streampanel.ui:57
+#: modules/gui/qt4/ui/streampanel.ui:48
 msgid "Edit settings"
 msgstr ""
 
-#: modules/gui/qt4/ui/streampanel.ui:67
+#: modules/gui/qt4/ui/streampanel.ui:58
 msgid "Control"
 msgstr ""
 
-#: modules/gui/qt4/ui/streampanel.ui:79
+#: modules/gui/qt4/ui/streampanel.ui:64
 msgid "Run manually"
 msgstr ""
 
-#: modules/gui/qt4/ui/streampanel.ui:86
+#: modules/gui/qt4/ui/streampanel.ui:71
 msgid "Setup schedule"
 msgstr ""
 
-#: modules/gui/qt4/ui/streampanel.ui:93
+#: modules/gui/qt4/ui/streampanel.ui:78
 msgid "Run on schedule"
 msgstr ""
 
-#: modules/gui/qt4/ui/streampanel.ui:103
+#: modules/gui/qt4/ui/streampanel.ui:88
 msgid "Status"
 msgstr ""
 
-#: modules/gui/qt4/ui/streampanel.ui:115
+#: modules/gui/qt4/ui/streampanel.ui:94
 msgid "P/P"
 msgstr ""
 
-#: modules/gui/qt4/ui/streampanel.ui:136
+#: modules/gui/qt4/ui/streampanel.ui:115
 msgid "Prev"
 msgstr ""
 
-#: modules/gui/qt4/ui/streampanel.ui:153
-msgid "Add input"
+#: modules/gui/qt4/ui/streampanel.ui:132
+msgid "Add Input"
 msgstr ""
 
-#: modules/gui/qt4/ui/streampanel.ui:160
-msgid "Edit input"
+#: modules/gui/qt4/ui/streampanel.ui:139
+msgid "Edit Input"
 msgstr ""
 
-#: modules/gui/qt4/ui/streampanel.ui:167
-msgid "Clear list"
+#: modules/gui/qt4/ui/streampanel.ui:146
+msgid "Clear List"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:53
+#: modules/gui/qt4/ui/video_effects.ui:23
 msgid "Transform"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:77
+#: modules/gui/qt4/ui/video_effects.ui:41
 msgid "Sharpen"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:95
+#: modules/gui/qt4/ui/video_effects.ui:53
 msgid "Sigma"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:130 modules/video_filter/adjust.c:81
+#: modules/gui/qt4/ui/video_effects.ui:88 modules/video_filter/adjust.c:81
 msgid "Image adjust"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:263 modules/video_filter/adjust.c:64
+#: modules/gui/qt4/ui/video_effects.ui:215 modules/video_filter/adjust.c:64
 msgid "Brightness threshold"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:274
+#: modules/gui/qt4/ui/video_effects.ui:226
 msgid "Color fun"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:286
+#: modules/gui/qt4/ui/video_effects.ui:232
 msgid "Color extraction"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:321
-msgid "Color invert"
-msgstr ""
-
-#: modules/gui/qt4/ui/video_effects.ui:328
+#: modules/gui/qt4/ui/video_effects.ui:268
 #: modules/video_filter/colorthres.c:66
 msgid "Color threshold"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:346
+#: modules/gui/qt4/ui/video_effects.ui:280
 msgid "Similarity"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:392
+#: modules/gui/qt4/ui/video_effects.ui:326
 msgid "Some random name"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:411 modules/video_filter/rotate.c:65
+#: modules/gui/qt4/ui/video_effects.ui:339 modules/video_filter/rotate.c:65
 msgid "Rotate"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:451
+#: modules/gui/qt4/ui/video_effects.ui:373
 msgid "Angle"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:461
+#: modules/gui/qt4/ui/video_effects.ui:383
 msgid "Puzzle game"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:499
+#: modules/gui/qt4/ui/video_effects.ui:415
 msgid "Black slot"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:506
-#: modules/gui/qt4/ui/video_effects.ui:793
+#: modules/gui/qt4/ui/video_effects.ui:422
+#: modules/gui/qt4/ui/video_effects.ui:667
 msgid "Columns"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:513
-#: modules/gui/qt4/ui/video_effects.ui:786
+#: modules/gui/qt4/ui/video_effects.ui:429
+#: modules/gui/qt4/ui/video_effects.ui:660
 msgid "Rows"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:524
+#: modules/gui/qt4/ui/video_effects.ui:440
 msgid "Image modification"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:543
+#: modules/gui/qt4/ui/video_effects.ui:453
 msgid "Water effect"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:557 modules/meta_engine/id3genres.h:67
+#: modules/gui/qt4/ui/video_effects.ui:467 modules/meta_engine/id3genres.h:67
 #: modules/video_filter/noise.c:52
 msgid "Noise"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:564
+#: modules/gui/qt4/ui/video_effects.ui:474
 msgid "Motion detect"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:571
+#: modules/gui/qt4/ui/video_effects.ui:481
 #: modules/video_filter/motionblur.c:58
 msgid "Motion blur"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:589
+#: modules/gui/qt4/ui/video_effects.ui:493
 msgid "Factor"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:653
+#: modules/gui/qt4/ui/video_effects.ui:551
 msgid "Cartoon"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:667
+#: modules/gui/qt4/ui/video_effects.ui:565
 msgid "Find a name"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:679
+#: modules/gui/qt4/ui/video_effects.ui:571
 msgid "Logo erase"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:720
+#: modules/gui/qt4/ui/video_effects.ui:606
 msgid "Mask"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:730 modules/video_filter/clone.c:70
+#: modules/gui/qt4/ui/video_effects.ui:616 modules/video_filter/clone.c:70
 msgid "Clone"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:748 modules/video_filter/clone.c:57
+#: modules/gui/qt4/ui/video_effects.ui:628 modules/video_filter/clone.c:57
 msgid "Number of clones"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:768
+#: modules/gui/qt4/ui/video_effects.ui:648
 msgid "Wall"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:824
+#: modules/gui/qt4/ui/video_effects.ui:698
 msgid "Overlay"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:836
+#: modules/gui/qt4/ui/video_effects.ui:704
 msgid "Add text"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:877
+#: modules/gui/qt4/ui/video_effects.ui:739
 msgid "Add logo"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:895 modules/video_filter/mosaic.c:91
+#: modules/gui/qt4/ui/video_effects.ui:751 modules/video_filter/mosaic.c:88
 msgid "Transparency"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:952
+#: modules/gui/qt4/ui/video_effects.ui:808
 msgid "Advanced video filter controls"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:967
+#: modules/gui/qt4/ui/video_effects.ui:817
 msgid "Subpicture filters"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:984
+#: modules/gui/qt4/ui/video_effects.ui:834
 msgid "Vout filters"
 msgstr ""
 
-#: modules/gui/qt4/ui/video_effects.ui:991
+#: modules/gui/qt4/ui/video_effects.ui:841
 msgid "Reset"
 msgstr ""
 
@@ -16231,12 +16366,12 @@ msgid ""
 msgstr ""
 
 #: modules/gui/wince/preferences_widgets.cpp:524
-#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:697
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:716
 msgid "Choose directory"
 msgstr ""
 
 #: modules/gui/wince/preferences_widgets.cpp:533
-#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:706
+#: modules/gui/wxwidgets/dialogs/preferences_widgets.cpp:725
 msgid "Choose file"
 msgstr ""
 
@@ -16611,21 +16746,15 @@ msgstr ""
 msgid "Can't save"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:1399
-#: modules/gui/wxwidgets/wxwidgets.cpp:115 modules/misc/freetype.c:132
-#: modules/misc/win32text.c:78
-msgid "Normal"
-msgstr ""
-
 #: modules/gui/wxwidgets/dialogs/playlist.cpp:1400
 msgid "One level"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:1576
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1579
 msgid "Please enter node name"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/playlist.cpp:1577
+#: modules/gui/wxwidgets/dialogs/playlist.cpp:1580
 msgid "New node"
 msgstr ""
 
@@ -16666,7 +16795,7 @@ msgid "MMSH"
 msgstr ""
 
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:474
-#: modules/stream_out/rtp.c:145
+#: modules/stream_out/rtp.c:147
 msgid "RTP"
 msgstr ""
 
@@ -16679,15 +16808,7 @@ msgid "Channel name"
 msgstr ""
 
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:606
-msgid "Select all elementary streams"
-msgstr ""
-
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:768
-msgid "Video codec"
-msgstr ""
-
-#: modules/gui/wxwidgets/dialogs/streamout.cpp:838
-msgid "Audio codec"
+msgid "Select all elementary streams"
 msgstr ""
 
 #: modules/gui/wxwidgets/dialogs/streamout.cpp:888
@@ -16754,12 +16875,6 @@ msgstr ""
 msgid "New broadcast"
 msgstr ""
 
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:384
-#: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:395
-#: modules/gui/wxwidgets/dialogs/wizard.cpp:122
-msgid "Choose"
-msgstr ""
-
 #: modules/gui/wxwidgets/dialogs/vlm/vlm_panel.cpp:416
 msgid "Create"
 msgstr ""
@@ -17704,32 +17819,32 @@ msgstr ""
 msgid "Dummy font renderer function"
 msgstr ""
 
-#: modules/misc/freetype.c:111 modules/misc/win32text.c:57
+#: modules/misc/freetype.c:106 modules/misc/win32text.c:57
 msgid "Filename for the font you want to use"
 msgstr ""
 
-#: modules/misc/freetype.c:112 modules/misc/win32text.c:58
+#: modules/misc/freetype.c:107 modules/misc/win32text.c:58
 msgid "Font size in pixels"
 msgstr ""
 
-#: modules/misc/freetype.c:113 modules/misc/win32text.c:59
+#: modules/misc/freetype.c:108 modules/misc/win32text.c:59
 msgid ""
 "This is the default size of the fonts that will be rendered on the video. If "
 "set to something different than 0 this option will override the relative "
 "font size."
 msgstr ""
 
-#: modules/misc/freetype.c:118 modules/misc/win32text.c:64
+#: modules/misc/freetype.c:113 modules/misc/win32text.c:64
 msgid ""
 "The opacity (inverse of transparency) of the text that will be rendered on "
 "the video. 0 = transparent, 255 = totally opaque. "
 msgstr ""
 
-#: modules/misc/freetype.c:121 modules/misc/win32text.c:67
+#: modules/misc/freetype.c:116 modules/misc/win32text.c:67
 msgid "Text default color"
 msgstr ""
 
-#: modules/misc/freetype.c:122 modules/misc/win32text.c:68
+#: modules/misc/freetype.c:117 modules/misc/win32text.c:68
 msgid ""
 "The color of the text that will be rendered on the video. This must be an "
 "hexadecimal (like HTML colors). The first two chars are for red, then green, "
@@ -17737,69 +17852,69 @@ msgid ""
 "(red + green), #FFFFFF = white"
 msgstr ""
 
-#: modules/misc/freetype.c:126 modules/misc/win32text.c:72
+#: modules/misc/freetype.c:121 modules/misc/win32text.c:72
 msgid "Relative font size"
 msgstr ""
 
-#: modules/misc/freetype.c:127 modules/misc/win32text.c:73
+#: modules/misc/freetype.c:122 modules/misc/win32text.c:73
 msgid ""
 "This is the relative default size of the fonts that will be rendered on the "
 "video. If absolute font size is set, relative size will be overriden."
 msgstr ""
 
-#: modules/misc/freetype.c:132 modules/misc/win32text.c:78
+#: modules/misc/freetype.c:127 modules/misc/win32text.c:78
 msgid "Smaller"
 msgstr ""
 
-#: modules/misc/freetype.c:132 modules/misc/win32text.c:78
+#: modules/misc/freetype.c:127 modules/misc/win32text.c:78
 msgid "Small"
 msgstr ""
 
-#: modules/misc/freetype.c:133 modules/misc/win32text.c:79
+#: modules/misc/freetype.c:128 modules/misc/win32text.c:79
 msgid "Large"
 msgstr ""
 
-#: modules/misc/freetype.c:133 modules/misc/win32text.c:79
+#: modules/misc/freetype.c:128 modules/misc/win32text.c:79
 msgid "Larger"
 msgstr ""
 
-#: modules/misc/freetype.c:134
+#: modules/misc/freetype.c:129
 msgid "Use YUVP renderer"
 msgstr ""
 
-#: modules/misc/freetype.c:135
+#: modules/misc/freetype.c:130
 msgid ""
 "This renders the font using \"paletized YUV\". This option is only needed if "
 "you want to encode into DVB subtitles"
 msgstr ""
 
-#: modules/misc/freetype.c:137
+#: modules/misc/freetype.c:132
 msgid "Font Effect"
 msgstr ""
 
-#: modules/misc/freetype.c:138
+#: modules/misc/freetype.c:133
 msgid ""
 "It is possible to apply effects to the rendered text to improve its "
 "readability."
 msgstr ""
 
-#: modules/misc/freetype.c:146
+#: modules/misc/freetype.c:141
 msgid "Background"
 msgstr ""
 
-#: modules/misc/freetype.c:146
+#: modules/misc/freetype.c:141
 msgid "Outline"
 msgstr ""
 
-#: modules/misc/freetype.c:147
+#: modules/misc/freetype.c:142
 msgid "Fat Outline"
 msgstr ""
 
-#: modules/misc/freetype.c:159 modules/misc/win32text.c:91
+#: modules/misc/freetype.c:154 modules/misc/win32text.c:91
 msgid "Text renderer"
 msgstr ""
 
-#: modules/misc/freetype.c:160
+#: modules/misc/freetype.c:155
 msgid "Freetype2 font renderer"
 msgstr ""
 
@@ -17944,26 +18059,34 @@ msgstr ""
 msgid "MMX EXT memcpy"
 msgstr ""
 
-#: modules/misc/notify/growl.c:60
+#: modules/misc/notify/growl.m:95
+msgid "Growl Notification Plugin"
+msgstr ""
+
+#: modules/misc/notify/growl.m:279
+msgid "Now playing"
+msgstr ""
+
+#: modules/misc/notify/growl_udp.c:59
 msgid "Server"
 msgstr ""
 
-#: modules/misc/notify/growl.c:61
+#: modules/misc/notify/growl_udp.c:60
 msgid ""
 "This is the host to which Growl notifications will be sent. By default, "
 "notifications are sent locally."
 msgstr ""
 
-#: modules/misc/notify/growl.c:65
+#: modules/misc/notify/growl_udp.c:64
 msgid "Growl password on the Growl server."
 msgstr ""
 
-#: modules/misc/notify/growl.c:67
+#: modules/misc/notify/growl_udp.c:66
 msgid "Growl UDP port on the Growl server."
 msgstr ""
 
-#: modules/misc/notify/growl.c:73
-msgid "Growl Notification Plugin"
+#: modules/misc/notify/growl_udp.c:72
+msgid "Growl UDP Notification Plugin"
 msgstr ""
 
 #: modules/misc/notify/msn.c:66 modules/misc/notify/telepathy.c:66
@@ -18477,7 +18600,7 @@ msgstr ""
 msgid "H.264 video packetizer"
 msgstr ""
 
-#: modules/packetizer/mpeg4audio.c:183
+#: modules/packetizer/mpeg4audio.c:182
 msgid "MPEG4 audio packetizer"
 msgstr ""
 
@@ -18507,13 +18630,13 @@ msgstr ""
 msgid "Bonjour services"
 msgstr ""
 
-#: modules/services_discovery/bonjour.c:306
+#: modules/services_discovery/bonjour.c:315
 msgid "Bonjour"
 msgstr ""
 
 #: modules/services_discovery/hal.c:163
 #: modules/services_discovery/upnp_cc.cpp:86
-#: modules/services_discovery/upnp_intel.cpp:292
+#: modules/services_discovery/upnp_intel.cpp:291
 msgid "Devices"
 msgstr ""
 
@@ -18613,15 +18736,15 @@ msgstr ""
 msgid "SDP Descriptions parser"
 msgstr ""
 
-#: modules/services_discovery/sap.c:884 modules/services_discovery/sap.c:889
+#: modules/services_discovery/sap.c:885 modules/services_discovery/sap.c:890
 msgid "Session"
 msgstr ""
 
-#: modules/services_discovery/sap.c:884
+#: modules/services_discovery/sap.c:885
 msgid "Tool"
 msgstr ""
 
-#: modules/services_discovery/sap.c:889
+#: modules/services_discovery/sap.c:890
 msgid "User"
 msgstr ""
 
@@ -18666,7 +18789,7 @@ msgstr ""
 msgid "Universal Plug'n'Play discovery"
 msgstr ""
 
-#: modules/services_discovery/upnp_intel.cpp:263
+#: modules/services_discovery/upnp_intel.cpp:262
 msgid "Universal Plug'n'Play discovery ( Intel SDK )"
 msgstr ""
 
@@ -18741,7 +18864,7 @@ msgstr ""
 msgid "Duplicate stream output"
 msgstr ""
 
-#: modules/stream_out/es.c:40 modules/stream_out/standard.c:41
+#: modules/stream_out/es.c:40 modules/stream_out/standard.c:40
 msgid "Output access method"
 msgstr ""
 
@@ -18765,7 +18888,7 @@ msgstr ""
 msgid "This is the output access method that will be used for video."
 msgstr ""
 
-#: modules/stream_out/es.c:51 modules/stream_out/standard.c:44
+#: modules/stream_out/es.c:51 modules/stream_out/standard.c:43
 msgid "Output muxer"
 msgstr ""
 
@@ -18890,7 +19013,7 @@ msgid ""
 "is to use no muxer (standard RTP stream)."
 msgstr ""
 
-#: modules/stream_out/rtp.c:81 modules/stream_out/standard.c:50
+#: modules/stream_out/rtp.c:81 modules/stream_out/standard.c:49
 msgid "Session name"
 msgstr ""
 
@@ -18900,42 +19023,42 @@ msgid ""
 "Descriptor)."
 msgstr ""
 
-#: modules/stream_out/rtp.c:85 modules/stream_out/standard.c:60
+#: modules/stream_out/rtp.c:85 modules/stream_out/standard.c:59
 msgid "Session description"
 msgstr ""
 
-#: modules/stream_out/rtp.c:87 modules/stream_out/standard.c:62
+#: modules/stream_out/rtp.c:87 modules/stream_out/standard.c:61
 msgid ""
 "This allows you to give a short description with details about the stream, "
 "that will be announced in the SDP (Session Descriptor)."
 msgstr ""
 
-#: modules/stream_out/rtp.c:89 modules/stream_out/standard.c:64
+#: modules/stream_out/rtp.c:89 modules/stream_out/standard.c:63
 msgid "Session URL"
 msgstr ""
 
-#: modules/stream_out/rtp.c:91 modules/stream_out/standard.c:66
+#: modules/stream_out/rtp.c:91 modules/stream_out/standard.c:65
 msgid ""
 "This allows you to give an URL with more details about the stream (often the "
 "website of the streaming organization), that will be announced in the SDP "
 "(Session Descriptor)."
 msgstr ""
 
-#: modules/stream_out/rtp.c:94 modules/stream_out/standard.c:69
+#: modules/stream_out/rtp.c:94 modules/stream_out/standard.c:68
 msgid "Session email"
 msgstr ""
 
-#: modules/stream_out/rtp.c:96 modules/stream_out/standard.c:71
+#: modules/stream_out/rtp.c:96 modules/stream_out/standard.c:70
 msgid ""
 "This allows you to give a contact mail address for the stream, that will be "
 "announced in the SDP (Session Descriptor)."
 msgstr ""
 
-#: modules/stream_out/rtp.c:98 modules/stream_out/standard.c:73
+#: modules/stream_out/rtp.c:98 modules/stream_out/standard.c:72
 msgid "Session phone number"
 msgstr ""
 
-#: modules/stream_out/rtp.c:100 modules/stream_out/standard.c:75
+#: modules/stream_out/rtp.c:100 modules/stream_out/standard.c:74
 msgid ""
 "This allows you to give a contact telephone number for the stream, that will "
 "be announced in the SDP (Session Descriptor)."
@@ -18981,146 +19104,130 @@ msgid ""
 msgstr ""
 
 #: modules/stream_out/rtp.c:124
-msgid "DCCP transport"
+msgid "Transport protocol"
 msgstr ""
 
 #: modules/stream_out/rtp.c:126
-msgid "This enables DCCP instead of UDP as a transport for RTP."
-msgstr ""
-
-#: modules/stream_out/rtp.c:127
-msgid "TCP transport"
-msgstr ""
-
-#: modules/stream_out/rtp.c:129
-msgid "This enables TCP instead of UDP as a transport for RTP."
-msgstr ""
-
-#: modules/stream_out/rtp.c:130
-msgid "UDP-Lite transport"
-msgstr ""
-
-#: modules/stream_out/rtp.c:132
-msgid "This enables UDP-Lite instead of UDP as a transport for RTP."
+msgid "This selects which transport protocol to use for RTP."
 msgstr ""
 
-#: modules/stream_out/rtp.c:134
+#: modules/stream_out/rtp.c:136
 msgid "MP4A LATM"
 msgstr ""
 
-#: modules/stream_out/rtp.c:136
+#: modules/stream_out/rtp.c:138
 msgid "This allows you to stream MPEG4 LATM audio streams (see RFC3016)."
 msgstr ""
 
-#: modules/stream_out/rtp.c:146
+#: modules/stream_out/rtp.c:148
 msgid "RTP stream output"
 msgstr ""
 
-#: modules/stream_out/standard.c:43
+#: modules/stream_out/standard.c:42
 msgid "Output method to use for the stream."
 msgstr ""
 
-#: modules/stream_out/standard.c:46
+#: modules/stream_out/standard.c:45
 msgid "Muxer to use for the stream."
 msgstr ""
 
-#: modules/stream_out/standard.c:47
+#: modules/stream_out/standard.c:46
 msgid "Output destination"
 msgstr ""
 
-#: modules/stream_out/standard.c:49
+#: modules/stream_out/standard.c:48
 msgid "Destination (URL) to use for the stream."
 msgstr ""
 
-#: modules/stream_out/standard.c:52
+#: modules/stream_out/standard.c:51
 msgid ""
 "This allows you to specify a name for the session, that will be announced if "
 "you choose to use SAP."
 msgstr ""
 
-#: modules/stream_out/standard.c:55
+#: modules/stream_out/standard.c:54
 msgid "Session groupname"
 msgstr ""
 
-#: modules/stream_out/standard.c:57
+#: modules/stream_out/standard.c:56
 msgid ""
 "This allows you to specify a group for the session, that will be announced "
 "if you choose to use SAP."
 msgstr ""
 
-#: modules/stream_out/standard.c:79
+#: modules/stream_out/standard.c:78
 msgid "SAP announcing"
 msgstr ""
 
-#: modules/stream_out/standard.c:80
+#: modules/stream_out/standard.c:79
 msgid "Announce this session with SAP."
 msgstr ""
 
-#: modules/stream_out/standard.c:89
+#: modules/stream_out/standard.c:88
 msgid "Standard stream output"
 msgstr ""
 
-#: modules/stream_out/switcher.c:83
+#: modules/stream_out/switcher.c:85
 msgid "Files"
 msgstr ""
 
-#: modules/stream_out/switcher.c:85
+#: modules/stream_out/switcher.c:87
 msgid "Full paths of the files separated by colons."
 msgstr ""
 
-#: modules/stream_out/switcher.c:86
+#: modules/stream_out/switcher.c:88
 msgid "Sizes"
 msgstr ""
 
-#: modules/stream_out/switcher.c:88
+#: modules/stream_out/switcher.c:90
 msgid "List of sizes separated by colons (720x576:480x576)."
 msgstr ""
 
-#: modules/stream_out/switcher.c:91
+#: modules/stream_out/switcher.c:93
 msgid "Aspect ratio (4:3, 16:9)."
 msgstr ""
 
-#: modules/stream_out/switcher.c:92
+#: modules/stream_out/switcher.c:94
 msgid "Command UDP port"
 msgstr ""
 
-#: modules/stream_out/switcher.c:94
+#: modules/stream_out/switcher.c:96
 msgid "UDP port to listen to for commands."
 msgstr ""
 
-#: modules/stream_out/switcher.c:95
+#: modules/stream_out/switcher.c:97
 msgid "Command"
 msgstr ""
 
-#: modules/stream_out/switcher.c:97
+#: modules/stream_out/switcher.c:99
 msgid "Initial command to execute."
 msgstr ""
 
-#: modules/stream_out/switcher.c:98
+#: modules/stream_out/switcher.c:100
 msgid "GOP size"
 msgstr ""
 
-#: modules/stream_out/switcher.c:100
+#: modules/stream_out/switcher.c:102
 msgid "Number of P frames between two I frames."
 msgstr ""
 
-#: modules/stream_out/switcher.c:101
+#: modules/stream_out/switcher.c:103
 msgid "Quantizer scale"
 msgstr ""
 
-#: modules/stream_out/switcher.c:103
+#: modules/stream_out/switcher.c:105
 msgid "Fixed quantizer scale to use."
 msgstr ""
 
-#: modules/stream_out/switcher.c:104
+#: modules/stream_out/switcher.c:106
 msgid "Mute audio"
 msgstr ""
 
-#: modules/stream_out/switcher.c:106
+#: modules/stream_out/switcher.c:108
 msgid "Mute audio when command is not 0."
 msgstr ""
 
-#: modules/stream_out/switcher.c:109
+#: modules/stream_out/switcher.c:111
 msgid "MPEG2 video switcher stream output"
 msgstr ""
 
@@ -19525,6 +19632,400 @@ msgstr ""
 msgid "Alpha mask"
 msgstr ""
 
+#: modules/video_filter/atmo/atmo.cpp:119
+msgid ""
+"This module allows to control an so called AtmoLight device which is "
+"connected to your computer.\n"
+"AtmoLight is the homebrew version of that what Philips calls AmbiLight.\n"
+"If you need further informations feel free to visit us at\n"
+"\n"
+"http://www.vdr-wiki.de/wiki/index.php/Atmo-plugin\n"
+"http://www.vdr-wiki.de/wiki/index.php/AtmoWin\n"
+"\n"
+"there you will find detailed descriptions how to build it for your self and "
+"where you can get the required parts and so on.\n"
+" There you can also see pictures and some movies showing such a device in "
+"live action..."
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:132
+msgid "Save Debug Frames"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:133
+msgid "Writes every 128th miniframe to a folder."
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:134
+msgid "Debug Frame Folder"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:135
+msgid "defines the path where the debugframes should be saved"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:139
+msgid "Extracted Image Width"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:140
+msgid ""
+"defines the width of the mini image for further processing (64 is default)"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:143
+msgid "Extracted Image Height"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:144
+msgid ""
+"defines the height of the mini image for further processing (48 is default)"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:147
+msgid "use Pause Color"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:148
+msgid ""
+"use the color defined below if the user paused the video.(have light to get "
+"another beer?)"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:150
+msgid "Pause-Red"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:151
+msgid "the red component of pause color"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:152
+msgid "Pause-Green"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:153
+msgid "the green component of pause color"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:154
+msgid "Pause-Blue"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:155
+msgid "the blue component of pause color"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:156
+msgid "Pause-Fadesteps"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:157
+msgid ""
+"Number of steps to change current color to pause color (each step takes 40ms)"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:160
+msgid "End-Red"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:161
+msgid "the red component of the shutdown color"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:162
+msgid "End-Green"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:163
+msgid "the green component of the shutdown color"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:164
+msgid "End-Blue"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:165
+msgid "the blue component of the shutdown color"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:166
+msgid "End-Fadesteps"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:167
+msgid ""
+"Number of steps to change current color to end color for dimming up the "
+"light in cinema style... (each step takes 40ms)"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:171
+msgid "Use Software White adjust"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:172
+msgid ""
+"Should the buildin driver do a white adjust or you LED stripes? recommend."
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:174
+msgid "White Red"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:175
+msgid "Red value of a pure white on your LED stripes."
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:177
+msgid "White Green"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:178
+msgid "Green value of a pure white on your LED stripes."
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:180
+msgid "White Blue"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:181
+msgid "Blue value of a pure white on your LED stripes."
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:184
+msgid "Serial Port/Device"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:185
+msgid ""
+"Name of the serial port where the AtmoLight controller is attached to\n"
+" on Windows usually something like COM1 or COM2 on Linux /dev/ttyS01 f.e."
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:189
+msgid "Edge Weightning"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:190
+msgid ""
+"increasing this value will result in color more depending on the border of "
+"the frame"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:193
+msgid "overall Brightness of you LED stripes"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:194
+msgid "Darkness Limit"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:195
+msgid ""
+"pixels with a saturation lower than this will be ignored should be greater "
+"than one for letterboxed videos"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:198
+msgid "Hue windowing"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:199
+#: modules/video_filter/atmo/atmo.cpp:201
+msgid "used for statistics"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:200
+msgid "Sat windowing"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:203
+msgid "Filter length [ms]"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:204
+msgid "Time it takes until a color is complete changed, removes flickering"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:206
+msgid "Filter threshold"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:207
+msgid "How much a color must changed, for an imediate color change"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:209
+msgid "Filter Smoothness %"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:210
+msgid "Filter Smoothness"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:212
+msgid "Filtermode"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:213
+msgid "kind of filtering which should be use to calcuate the color output"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:221
+msgid "No Filtering"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:222
+msgid "Combined"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:223
+msgid "Percent"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:226
+msgid "Framedelay"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:227
+msgid ""
+"helps to get video out and light effects insync values around 20ms should do "
+"the trick"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:231
+msgid "Channel summary"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:232
+msgid "Channel left"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:233
+msgid "Channel right"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:234
+msgid "Channel top"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:235
+msgid "Channel bottom"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:237
+msgid "maps the hardware channel X to logical channel Y to fix wrong wiring:-)"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:248
+msgid "disabled"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:249
+msgid "summary"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:250
+msgid "left"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:251
+msgid "right"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:252
+msgid "top"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:253
+msgid "bottom"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:256
+msgid "summary gradient"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:257
+msgid "left gradient"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:258
+msgid "right gradient"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:259
+msgid "top gradient"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:260
+msgid "bottom gradient"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:261
+msgid ""
+"defines a small bitmap with 64x48 pixels, containing a grayscale gradient"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:265
+msgid "Filename of AtmoWinA.exe"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:266
+msgid ""
+"if you wan't that the AtmoLight control software is launched by\n"
+"VLC enter the complete Filename of AtmoWinA.exe here"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:269
+msgid "Use buildin AtmoLight"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:270
+msgid ""
+"VideoLan will directly use your AtmoLight hardware without running the "
+"external AtmoWinA.exe Userspace driver."
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:281
+msgid "AtmoLight Filter"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:283
+msgid "AtmoLight"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:290
+msgid "Choose between the buildin AtmoLight driver or the external"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:309
+msgid "Enter connection of your AtmoLight hardware"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:318
+msgid "Illuminate the room with this color on pause"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:334
+msgid "Illuminate the room with this color on shutdown"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:350
+msgid "Settings only for buildin Live Video Processor"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:387
+msgid "Change channel assignment (fixes wrong wiring)"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:416
+msgid "Adjust the white light to your LED stripes"
+msgstr ""
+
+#: modules/video_filter/atmo/atmo.cpp:438
+msgid "Change gradients"
+msgstr ""
+
 #: modules/video_filter/blend.c:99
 msgid "Video pictures blending"
 msgstr ""
@@ -19923,7 +20424,7 @@ msgstr ""
 msgid "Magnify/Zoom interactive video filter"
 msgstr ""
 
-#: modules/video_filter/marq.c:84
+#: modules/video_filter/marq.c:85
 msgid ""
 "Marquee text to display. (Available format strings: Time related: %Y = year, "
 "%m = month, %d = day, %H = hour, %M = minute, %S = second, ... Meta data "
@@ -19936,195 +20437,205 @@ msgid ""
 "publisher, $V = volume, $_ = new line) "
 msgstr ""
 
-#: modules/video_filter/marq.c:99 modules/video_filter/rss.c:137
+#: modules/video_filter/marq.c:100 modules/video_filter/rss.c:137
 msgid "X offset"
 msgstr ""
 
-#: modules/video_filter/marq.c:100 modules/video_filter/rss.c:138
+#: modules/video_filter/marq.c:101 modules/video_filter/rss.c:138
 msgid "X offset, from the left screen edge."
 msgstr ""
 
-#: modules/video_filter/marq.c:101 modules/video_filter/rss.c:139
+#: modules/video_filter/marq.c:102 modules/video_filter/rss.c:139
 msgid "Y offset"
 msgstr ""
 
-#: modules/video_filter/marq.c:102 modules/video_filter/rss.c:140
+#: modules/video_filter/marq.c:103 modules/video_filter/rss.c:140
 msgid "Y offset, down from the top."
 msgstr ""
 
-#: modules/video_filter/marq.c:103
+#: modules/video_filter/marq.c:104
 msgid "Timeout"
 msgstr ""
 
-#: modules/video_filter/marq.c:104
+#: modules/video_filter/marq.c:105
 msgid ""
 "Number of milliseconds the marquee must remain displayed. Default value is 0 "
 "(remains forever)."
 msgstr ""
 
-#: modules/video_filter/marq.c:120
+#: modules/video_filter/marq.c:108
+msgid "Refresh period in ms"
+msgstr ""
+
+#: modules/video_filter/marq.c:109
+msgid ""
+"Number of milliseconds between string updates. This is mainly usefull when "
+"using meta data or time format string sequences."
+msgstr ""
+
+#: modules/video_filter/marq.c:125
 msgid "Marquee position"
 msgstr ""
 
-#: modules/video_filter/marq.c:122
+#: modules/video_filter/marq.c:127
 msgid ""
 "You can enforce the marquee position on the video (0=center, 1=left, "
 "2=right, 4=top, 8=bottom, you can also use combinations of these values, eg "
 "6 = top-right)."
 msgstr ""
 
-#: modules/video_filter/marq.c:161 modules/video_filter/rss.c:207
+#: modules/video_filter/marq.c:166 modules/video_filter/rss.c:207
 msgid "Misc"
 msgstr ""
 
-#: modules/video_filter/marq.c:165
+#: modules/video_filter/marq.c:172
 msgid "Marquee display"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:93
+#: modules/video_filter/mosaic.c:90
 msgid ""
 "Transparency of the mosaic foreground pictures. 0 means transparent, 255 "
 "opaque (default)."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:97
+#: modules/video_filter/mosaic.c:94
 msgid "Total height of the mosaic, in pixels."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:99
+#: modules/video_filter/mosaic.c:96
 msgid "Total width of the mosaic, in pixels."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:101
+#: modules/video_filter/mosaic.c:98
 msgid "Top left corner X coordinate"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:103
+#: modules/video_filter/mosaic.c:100
 msgid "X Coordinate of the top-left corner of the mosaic."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:104
+#: modules/video_filter/mosaic.c:101
 msgid "Top left corner Y coordinate"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:106
+#: modules/video_filter/mosaic.c:103
 msgid "Y Coordinate of the top-left corner of the mosaic."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:108
+#: modules/video_filter/mosaic.c:105
 msgid "Border width"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:110
+#: modules/video_filter/mosaic.c:107
 msgid "Width in pixels of the border between miniatures."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:111
+#: modules/video_filter/mosaic.c:108
 msgid "Border height"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:113
+#: modules/video_filter/mosaic.c:110
 msgid "Height in pixels of the border between miniatures."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:115
+#: modules/video_filter/mosaic.c:112
 msgid "Mosaic alignment"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:117
+#: modules/video_filter/mosaic.c:114
 msgid ""
 "You can enforce the mosaic alignment on the video (0=center, 1=left, "
 "2=right, 4=top, 8=bottom, you can also use combinations of these values, eg "
 "6 = top-right)."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:121
+#: modules/video_filter/mosaic.c:118
 msgid "Positioning method"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:123
+#: modules/video_filter/mosaic.c:120
 msgid ""
 "Positioning method for the mosaic. auto: automatically choose the best "
 "number of rows and columns. fixed: use the user-defined number of rows and "
 "columns. offsets: use the user-defined offsets for each image."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:128 modules/video_filter/panoramix.c:84
+#: modules/video_filter/mosaic.c:125 modules/video_filter/panoramix.c:84
 #: modules/video_filter/wall.c:59
 msgid "Number of rows"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:130
+#: modules/video_filter/mosaic.c:127
 msgid ""
 "Number of image rows in the mosaic (only used if positionning method is set "
 "to \"fixed\")."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:133 modules/video_filter/panoramix.c:80
+#: modules/video_filter/mosaic.c:130 modules/video_filter/panoramix.c:80
 #: modules/video_filter/wall.c:55
 msgid "Number of columns"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:135
+#: modules/video_filter/mosaic.c:132
 msgid ""
 "Number of image columns in the mosaic (only used if positionning method is "
 "set to \"fixed\"."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:140
+#: modules/video_filter/mosaic.c:137
 msgid "Keep the original aspect ratio when resizing mosaic elements."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:142
+#: modules/video_filter/mosaic.c:139
 msgid "Keep original size"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:144
+#: modules/video_filter/mosaic.c:141
 msgid "Keep the original size of mosaic elements."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:146
+#: modules/video_filter/mosaic.c:143
 msgid "Elements order"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:148
+#: modules/video_filter/mosaic.c:145
 msgid ""
 "You can enforce the order of the elements on the mosaic. You must give a "
 "comma-separated list of picture ID(s).These IDs are assigned in the \"mosaic-"
 "bridge\" module."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:152
+#: modules/video_filter/mosaic.c:149
 msgid "Offsets in order"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:154
+#: modules/video_filter/mosaic.c:151
 msgid ""
 "You can enforce the (x,y) offsets of the elements on the mosaic (only used "
 "if positioning method is set to \"offsets\"). You must give a comma-"
 "separated list of coordinates (eg: 10,10,150,10)."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:160
+#: modules/video_filter/mosaic.c:157
 msgid ""
 "Pictures coming from the mosaic elements will be delayed according to this "
 "value (in milliseconds). For high values you will need to raise caching at "
 "input."
 msgstr ""
 
-#: modules/video_filter/mosaic.c:170
+#: modules/video_filter/mosaic.c:167
 msgid "fixed"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:170
+#: modules/video_filter/mosaic.c:167
 msgid "offsets"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:180
+#: modules/video_filter/mosaic.c:177
 msgid "Mosaic video sub filter"
 msgstr ""
 
-#: modules/video_filter/mosaic.c:181
+#: modules/video_filter/mosaic.c:178
 msgid "Mosaic"
 msgstr ""