* m4/vlc.m4: output all modules to vlc-config, not just those who define

[vlc] / po / en_GB.po

diff --git a/po/en_GB.po b/po/en_GB.po
index 295bebc316b12714c9eff6bf9ea5beecae9d75e5..5cf51ab05057d056bddda66597c2fdf415aafa7b 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -17,7 +17,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-05-24 14:40+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-01 15:53+0200\n"
 "PO-Revision-Date: 2002-04-22 09:56+0200\n"
 "Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
 "Language-Team: \n"
@@ -25,19 +26,20 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: include/interface.h:72
+#: include/vlc_interface.h:72
 msgid ""
 "\n"
 "Warning: if you can't access the GUI anymore, open a dos command box, go to "
-"the directory where you installed VLC and run \"vlc -I win32\"\n"
+"the directory where you installed VLC and run \"vlc -I wxwin\"\n"
 msgstr ""
 
 #: src/audio_output/output.c:104 src/audio_output/output.c:131
+#: modules/gui/macosx/intf.m:384 modules/gui/macosx/intf.m:385
 msgid "Audio channels"
 msgstr ""
 
 #: src/audio_output/output.c:107 src/audio_output/output.c:142
-#: modules/audio_output/alsa.c:165 modules/audio_output/directx.c:423
+#: modules/audio_output/alsa.c:167 modules/audio_output/directx.c:423
 #: modules/audio_output/oss.c:202 modules/audio_output/sdl.c:181
 #: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:358
 msgid "Stereo"
@@ -124,26 +126,26 @@ msgstr ""
 
 #: src/input/input_programs.c:94 modules/gui/gtk/gnome_interface.c:1078
 #: modules/gui/gtk/gtk_interface.c:1199 modules/gui/kde/interface.cpp:142
-#: modules/gui/macosx/intf.m:347 modules/gui/macosx/intf.m:348
+#: modules/gui/macosx/intf.m:371 modules/gui/macosx/intf.m:372
 msgid "Program"
 msgstr "Programme"
 
 #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696
-#: modules/gui/beos/MediaControlView.cpp:1258
+#: modules/demux/mkv.cpp:2392 modules/gui/beos/MediaControlView.cpp:1258
 #: modules/gui/gtk/gnome_interface.c:1650 modules/gui/gtk/gtk_interface.c:1956
 #: modules/gui/gtk/menu.c:1402 modules/gui/gtk/menu.c:1423
-#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:349
-#: modules/gui/macosx/intf.m:350 modules/gui/macosx/open.m:149
-#: modules/gui/wxwindows/open.cpp:382
+#: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:373
+#: modules/gui/macosx/intf.m:374 modules/gui/macosx/open.m:149
+#: modules/gui/wxwindows/open.cpp:393
 msgid "Title"
 msgstr ""
 
 #: src/input/input_programs.c:102 modules/gui/beos/MediaControlView.cpp:1259
 #: modules/gui/gtk/gnome_interface.c:1640 modules/gui/gtk/gtk_interface.c:1946
 #: modules/gui/gtk/menu.c:1019 modules/gui/gtk/menu.c:1432
-#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:351
-#: modules/gui/macosx/intf.m:352 modules/gui/macosx/open.m:150
-#: modules/gui/wxwindows/open.cpp:388
+#: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:375
+#: modules/gui/macosx/intf.m:376 modules/gui/macosx/open.m:150
+#: modules/gui/wxwindows/open.cpp:399
 msgid "Chapter"
 msgstr ""
 
@@ -151,15 +153,18 @@ msgstr ""
 msgid "Navigation"
 msgstr ""
 
-#: src/input/input_programs.c:110
+#: src/input/input_programs.c:110 modules/gui/macosx/intf.m:396
+#: modules/gui/macosx/intf.m:397
 msgid "Video track"
 msgstr ""
 
-#: src/input/input_programs.c:113
+#: src/input/input_programs.c:113 modules/gui/macosx/intf.m:382
+#: modules/gui/macosx/intf.m:383
 msgid "Audio track"
 msgstr ""
 
-#: src/input/input_programs.c:116
+#: src/input/input_programs.c:116 modules/gui/macosx/intf.m:400
+#: modules/gui/macosx/intf.m:401
 msgid "Subtitles track"
 msgstr ""
 
@@ -189,7 +194,7 @@ msgstr ""
 msgid "Previous Chapter"
 msgstr ""
 
-#: src/input/input_programs.c:668
+#: src/input/input_programs.c:668 src/video_output/video_output.c:401
 msgid "Disable"
 msgstr ""
 
@@ -198,48 +203,48 @@ msgstr ""
 msgid "Track %i"
 msgstr ""
 
-#: src/libvlc.c:258 src/libvlc.c:345
+#: src/libvlc.c:262 src/libvlc.c:349
 msgid "C"
 msgstr "en_GB"
 
-#: src/libvlc.c:301 src/libvlc.c:1357
+#: src/libvlc.c:305 src/libvlc.c:1368
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
 "\n"
 msgstr ""
 
-#: src/libvlc.c:1189 src/misc/configuration.c:961
+#: src/libvlc.c:1200 src/misc/configuration.c:965
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:1206 src/misc/configuration.c:946
+#: src/libvlc.c:1217 src/misc/configuration.c:946
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:1209 src/misc/configuration.c:953
+#: src/libvlc.c:1220 src/misc/configuration.c:955
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:1215
+#: src/libvlc.c:1226
 msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:1216
+#: src/libvlc.c:1227
 msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:1332 src/libvlc.c:1387 src/libvlc.c:1411
+#: src/libvlc.c:1343 src/libvlc.c:1398 src/libvlc.c:1422
 msgid ""
 "\n"
 "Press the RETURN key to continue...\n"
 msgstr ""
 
-#: src/libvlc.c:1360
+#: src/libvlc.c:1371
 msgid "[module]              [description]\n"
 msgstr ""
 
-#: src/libvlc.c:1405
+#: src/libvlc.c:1416
 msgid ""
 "This program comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute it under the terms of the GNU General Public License;\n"
@@ -251,11 +256,11 @@ msgstr ""
 "see the file named COPYING for details.\n"
 "Written by the VideoLAN team at École Centrale, Paris.\n"
 
-#: src/libvlc.h:40
+#: src/libvlc.h:41
 msgid "Interface module"
 msgstr ""
 
-#: src/libvlc.h:42
+#: src/libvlc.h:43
 msgid ""
 "This option allows you to select the interface used by VLC. The default "
 "behavior is to automatically select the best module available."
@@ -263,50 +268,51 @@ msgstr ""
 "This option allows you to select the interface used by VLC. The default "
 "behaviour is to automatically select the best module available."
 
-#: src/libvlc.h:46
+#: src/libvlc.h:47
 msgid "Extra interface modules"
 msgstr ""
 
-#: src/libvlc.h:48
+#: src/libvlc.h:49
 msgid ""
 "This option allows you to select additional interfaces used by VLC. They "
 "will be launched in the background in addition to the default interface. Use "
-"a comma separated list of interface modules."
+"a comma separated list of interface modules. (common values are: logger,"
+"gestures,sap,rc,http,screensaver)"
 msgstr ""
 
-#: src/libvlc.h:52
+#: src/libvlc.h:54
 msgid "Verbosity (0,1,2)"
 msgstr ""
 
-#: src/libvlc.h:54
+#: src/libvlc.h:56
 msgid ""
 "This options sets the verbosity level (0=only errors and standard messages, "
 "1=warnings, 2=debug)."
 msgstr ""
 
-#: src/libvlc.h:57
+#: src/libvlc.h:59
 msgid "Be quiet"
 msgstr ""
 
-#: src/libvlc.h:59
+#: src/libvlc.h:61
 msgid "This options turns off all warning and information messages."
 msgstr ""
 
-#: src/libvlc.h:61 modules/gui/beos/InterfaceWindow.cpp:255
+#: src/libvlc.h:63 modules/gui/beos/InterfaceWindow.cpp:255
 msgid "Language"
 msgstr ""
 
-#: src/libvlc.h:62
+#: src/libvlc.h:64
 msgid ""
 "This option allows you to set the language of the interface. The system "
 "language is auto-detected if \"auto\" is specified here."
 msgstr ""
 
-#: src/libvlc.h:66
+#: src/libvlc.h:68
 msgid "Color messages"
 msgstr "Colour messages"
 
-#: src/libvlc.h:68
+#: src/libvlc.h:70
 msgid ""
 "When this option is turned on, the messages sent to the console will be "
 "colorized. Your terminal needs Linux color support for this to work."
@@ -314,41 +320,41 @@ msgstr ""
 "When this option is turned on, the messages sent to the console will be "
 "colourised. Your terminal needs Linux colour support for this to work."
 
-#: src/libvlc.h:71
+#: src/libvlc.h:73
 msgid "Show advanced options"
 msgstr ""
 
-#: src/libvlc.h:73
+#: src/libvlc.h:75
 msgid ""
-"When this option is turned on, the interfaces will show all the available "
-"options, including those that most users should never touch"
+"When this option is turned on, the preferences and/or interfaces  will show "
+"all the available options, including those that most users should never touch"
 msgstr ""
 
-#: src/libvlc.h:76
+#: src/libvlc.h:79
 msgid "Interface default search path"
 msgstr ""
 
-#: src/libvlc.h:78
+#: src/libvlc.h:81
 msgid ""
 "This option allows you to set the default path that the interface will open "
 "when looking for a file."
 msgstr ""
 
-#: src/libvlc.h:81
+#: src/libvlc.h:84
 msgid "Plugin search path"
 msgstr ""
 
-#: src/libvlc.h:83
+#: src/libvlc.h:86
 msgid ""
 "This option allows you to specify an additional path for VLC to look for its "
 "plugins."
 msgstr ""
 
-#: src/libvlc.h:86
+#: src/libvlc.h:89
 msgid "Audio output module"
 msgstr ""
 
-#: src/libvlc.h:88
+#: src/libvlc.h:91
 msgid ""
 "This option allows you to select the audio output method used by VLC. The "
 "default behavior is to automatically select the best method available."
@@ -356,99 +362,99 @@ msgstr ""
 "This option allows you to select the audio output method used by VLC. The "
 "default behaviour is to automatically select the best method available."
 
-#: src/libvlc.h:92
+#: src/libvlc.h:95
 msgid "Enable audio"
 msgstr ""
 
-#: src/libvlc.h:94
+#: src/libvlc.h:97
 msgid ""
 "You can completely disable the audio output. In this case the audio decoding "
-"stage won't be done, and it will save some processing power."
+"will not take place, and it will save some processing power."
 msgstr ""
 
-#: src/libvlc.h:97
+#: src/libvlc.h:100
 msgid "Force mono audio"
 msgstr ""
 
-#: src/libvlc.h:98
+#: src/libvlc.h:101
 msgid "This will force a mono audio output"
 msgstr ""
 
-#: src/libvlc.h:100
+#: src/libvlc.h:103
 msgid "Audio output volume"
 msgstr ""
 
-#: src/libvlc.h:102
+#: src/libvlc.h:105
 msgid ""
 "You can set the default audio output volume here, in a range from 0 to 1024."
 msgstr ""
 
-#: src/libvlc.h:105
+#: src/libvlc.h:108
 msgid "Audio output saved volume"
 msgstr ""
 
-#: src/libvlc.h:107
+#: src/libvlc.h:110
 msgid "This saves the audio output volume when you select mute."
 msgstr ""
 
-#: src/libvlc.h:109
+#: src/libvlc.h:112
 msgid "Audio output frequency (Hz)"
 msgstr ""
 
-#: src/libvlc.h:111
+#: src/libvlc.h:114
 msgid ""
 "You can force the audio output frequency here. Common values are -1 "
 "(default), 48000, 44100, 32000, 22050, 16000, 11025, 8000."
 msgstr ""
 
-#: src/libvlc.h:115
+#: src/libvlc.h:118
 msgid "High quality audio resampling"
 msgstr ""
 
-#: src/libvlc.h:117
+#: src/libvlc.h:120
 msgid ""
 "High quality audio resampling can be processor intensive so you can disable "
 "it and a cheaper resampling algorithm will be used instead."
 msgstr ""
 
-#: src/libvlc.h:121
+#: src/libvlc.h:124
 msgid "Compensate desynchronization of audio (in ms)"
 msgstr ""
 
-#: src/libvlc.h:123
+#: src/libvlc.h:126
 msgid ""
 "This option allows you to delay the audio output. This can be handy if you "
 "notice a lag between the video and the audio."
 msgstr ""
 
-#: src/libvlc.h:126
+#: src/libvlc.h:129
 msgid "Use the S/PDIF audio output when available"
 msgstr ""
 
-#: src/libvlc.h:128
+#: src/libvlc.h:131
 msgid ""
 "This option allows you to use the S/PDIF audio output by default when your "
 "hardware supports it as well as the audio stream being played."
 msgstr ""
 
-#: src/libvlc.h:131
+#: src/libvlc.h:134
 msgid "Headphone virtual spatialization effect"
 msgstr ""
 
-#: src/libvlc.h:133
+#: src/libvlc.h:136
 msgid ""
-"This effect gives you the feeling that you stands in a real room with a "
+"This effect gives you the feeling that you are standing in a room with a "
 "complete 5.1 speaker set when using only a headphone, providing a more "
 "realistic sound experience. It should also be more comfortable and less "
 "tiring when listening to music for long periods of time.\n"
 "It works with any source format from mono to 5.1."
 msgstr ""
 
-#: src/libvlc.h:140
+#: src/libvlc.h:143
 msgid "Video output module"
 msgstr ""
 
-#: src/libvlc.h:142
+#: src/libvlc.h:145
 msgid ""
 "This option allows you to select the video output method used by VLC. The "
 "default behavior is to automatically select the best method available."
@@ -456,49 +462,49 @@ msgstr ""
 "This option allows you to select the video output method used by VLC. The "
 "default behaviour is to automatically select the best method available."
 
-#: src/libvlc.h:146
+#: src/libvlc.h:149
 msgid "Enable video"
 msgstr ""
 
-#: src/libvlc.h:148
+#: src/libvlc.h:151
 msgid ""
 "You can completely disable the video output. In this case the video decoding "
-"stage won't be done, which will save some processing power."
+"stage will not take place, which will save some processing power."
 msgstr ""
 
-#: src/libvlc.h:151
+#: src/libvlc.h:154
 msgid "Video width"
 msgstr ""
 
-#: src/libvlc.h:153
+#: src/libvlc.h:156
 msgid ""
-"You can enforce the video width here. By default VLC will adapt to the video "
-"characteristics."
+"You can enforce the video width here. By default (-1) VLC will adapt to the "
+"video characteristics."
 msgstr ""
 
-#: src/libvlc.h:156
+#: src/libvlc.h:159
 msgid "Video height"
 msgstr ""
 
-#: src/libvlc.h:158
+#: src/libvlc.h:161
 msgid ""
-"You can enforce the video height here. By default VLC will adapt to the "
+"You can enforce the video height here. By default (-1) VLC will adapt to the "
 "video characteristics."
 msgstr ""
 
-#: src/libvlc.h:161
+#: src/libvlc.h:164
 msgid "Zoom video"
 msgstr ""
 
-#: src/libvlc.h:163
+#: src/libvlc.h:166
 msgid "You can zoom the video by the specified factor."
 msgstr ""
 
-#: src/libvlc.h:165
+#: src/libvlc.h:168
 msgid "Grayscale video output"
 msgstr "Greyscale video output"
 
-#: src/libvlc.h:167
+#: src/libvlc.h:170
 msgid ""
 "When enabled, the color information from the video won't be decoded (this "
 "can also allow you to save some processing power)."
@@ -506,50 +512,50 @@ msgstr ""
 "When enabled, the colour information from the video won't be decoded (this "
 "can also allow you to save some processing power)."
 
-#: src/libvlc.h:170
+#: src/libvlc.h:173
 msgid "Fullscreen video output"
 msgstr ""
 
-#: src/libvlc.h:172
+#: src/libvlc.h:175
 msgid ""
 "If this option is enabled, VLC will always start a video in fullscreen mode."
 msgstr ""
 
-#: src/libvlc.h:175
+#: src/libvlc.h:178
 msgid "Overlay video output"
 msgstr ""
 
-#: src/libvlc.h:177
+#: src/libvlc.h:180
 msgid ""
 "If enabled, VLC will try to take advantage of the overlay capabilities of "
-"your graphic card."
+"your graphics card."
 msgstr ""
 
-#: src/libvlc.h:180
+#: src/libvlc.h:183
 msgid "Force SPU position"
 msgstr ""
 
-#: src/libvlc.h:182
+#: src/libvlc.h:185
 msgid ""
 "You can use this option to place the subtitles under the movie, instead of "
 "over the movie. Try several positions."
 msgstr ""
 
-#: src/libvlc.h:185
+#: src/libvlc.h:188
 msgid "Video filter module"
 msgstr ""
 
-#: src/libvlc.h:187
+#: src/libvlc.h:190
 msgid ""
 "This will allow you to add a post-processing filter to enhance the picture "
 "quality, for instance deinterlacing, or to clone or distort the video window."
 msgstr ""
 
-#: src/libvlc.h:191
+#: src/libvlc.h:194
 msgid "Source aspect ratio"
 msgstr ""
 
-#: src/libvlc.h:193
+#: src/libvlc.h:196
 msgid ""
 "This will force the source aspect ratio. For instance, some DVDs claim to be "
 "16:9 while they are actually 4:3. This can also be used as a hint for VLC "
@@ -558,11 +564,11 @@ msgid ""
 "(1.25, 1.3333, etc.) expressing pixel squareness."
 msgstr ""
 
-#: src/libvlc.h:201
+#: src/libvlc.h:204
 msgid "Destination aspect ratio"
 msgstr ""
 
-#: src/libvlc.h:203
+#: src/libvlc.h:206
 msgid ""
 "This will force the destination pixel size. By default VLC assumes your "
 "pixels are square, unless your hardware has a way to tell it otherwise. This "
@@ -571,128 +577,129 @@ msgid ""
 "squareness."
 msgstr ""
 
-#: src/libvlc.h:210
+#: src/libvlc.h:213
 msgid "Server port"
 msgstr ""
 
-#: src/libvlc.h:212
+#: src/libvlc.h:215
 msgid "This is the port used for UDP streams. By default, we chose 1234."
 msgstr ""
 
-#: src/libvlc.h:214
+#: src/libvlc.h:217
 msgid "MTU of the network interface"
 msgstr ""
 
-#: src/libvlc.h:216
+#: src/libvlc.h:219
 msgid ""
 "This is the typical size of UDP packets that we expect. On Ethernet it is "
 "usually 1500."
 msgstr ""
 
-#: src/libvlc.h:219
+#: src/libvlc.h:222
 msgid "Network interface address"
 msgstr ""
 
-#: src/libvlc.h:221
+#: src/libvlc.h:224
 msgid ""
 "If you have several interfaces on your machine and use the multicast "
 "solution, you will probably have to indicate the IP address of your "
 "multicasting interface here."
 msgstr ""
 
-#: src/libvlc.h:225
+#: src/libvlc.h:228
 msgid "Time to live"
 msgstr ""
 
-#: src/libvlc.h:227
+#: src/libvlc.h:230
 msgid ""
 "Indicate here the Time To Live of the multicast packets sent by the stream "
 "output."
 msgstr ""
 
-#: src/libvlc.h:230
+#: src/libvlc.h:233
 msgid "Choose program (SID)"
 msgstr "Choose programme (SID)"
 
-#: src/libvlc.h:232
+#: src/libvlc.h:235
 msgid "Choose the program to select by giving its Service ID."
 msgstr "Choose the programme to select by giving its Service ID."
 
-#: src/libvlc.h:234
+#: src/libvlc.h:237
 msgid "Choose audio"
 msgstr ""
 
-#: src/libvlc.h:236
-msgid "Give the default type of audio you want to use in a DVD."
+#: src/libvlc.h:239
+msgid ""
+"Give the default type of audio you want to use in a DVD. (Developers only)"
 msgstr ""
 
-#: src/libvlc.h:238
+#: src/libvlc.h:242
 msgid "Choose channel"
 msgstr ""
 
-#: src/libvlc.h:240
+#: src/libvlc.h:244
 msgid ""
 "Give the stream number of the audio channel you want to use in a DVD (from 1 "
 "to n)."
 msgstr ""
 
-#: src/libvlc.h:243
+#: src/libvlc.h:247
 msgid "Choose subtitles"
 msgstr ""
 
-#: src/libvlc.h:245
+#: src/libvlc.h:249
 msgid ""
 "Give the stream number of the subtitle channel you want to use in a DVD "
 "(from 1 to n)."
 msgstr ""
 
-#: src/libvlc.h:248
+#: src/libvlc.h:252
 msgid "DVD device"
 msgstr ""
 
-#: src/libvlc.h:251
+#: src/libvlc.h:255
 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.h:255
+#: src/libvlc.h:259
 msgid "This is the default DVD device to use."
 msgstr ""
 
-#: src/libvlc.h:258
+#: src/libvlc.h:262
 msgid "VCD device"
 msgstr ""
 
-#: src/libvlc.h:260
+#: src/libvlc.h:264
 msgid "This is the default VCD device to use."
 msgstr ""
 
-#: src/libvlc.h:262
+#: src/libvlc.h:266
 msgid "Force IPv6"
 msgstr ""
 
-#: src/libvlc.h:264
+#: src/libvlc.h:268
 msgid ""
 "If you check this box, IPv6 will be used by default for all UDP and HTTP "
 "connections."
 msgstr ""
 
-#: src/libvlc.h:267
+#: src/libvlc.h:271
 msgid "Force IPv4"
 msgstr ""
 
-#: src/libvlc.h:269
+#: src/libvlc.h:273
 msgid ""
 "If you check this box, IPv4 will be used by default for all UDP and HTTP "
 "connections."
 msgstr ""
 
-#: src/libvlc.h:272
+#: src/libvlc.h:276
 msgid "Choose preferred codec list"
 msgstr ""
 
-#: src/libvlc.h:274
+#: src/libvlc.h:278
 msgid ""
 "This allows you to select the order in which VLC will choose its codecs. For "
 "instance, 'a52old,a52,any' will try the old a52 codec before the new one. "
@@ -701,229 +708,229 @@ msgid ""
 "sure there is a fallback for the types you didn't specify."
 msgstr ""
 
-#: src/libvlc.h:281
+#: src/libvlc.h:285
 msgid "Choose preferred video encoder list"
 msgstr ""
 
-#: src/libvlc.h:283 src/libvlc.h:287
+#: src/libvlc.h:287 src/libvlc.h:291
 msgid ""
 "This allows you to select the order in which VLC will choose its codecs. "
 msgstr ""
 
-#: src/libvlc.h:285
+#: src/libvlc.h:289
 msgid "Choose preferred audio encoder list"
 msgstr ""
 
-#: src/libvlc.h:290
+#: src/libvlc.h:294
 msgid "Choose a stream output"
 msgstr ""
 
-#: src/libvlc.h:292
+#: src/libvlc.h:296
 msgid "Empty if no stream output."
 msgstr ""
 
-#: src/libvlc.h:294
+#: src/libvlc.h:298
 msgid "Display while streaming"
 msgstr ""
 
-#: src/libvlc.h:296
+#: src/libvlc.h:300
 msgid "This allows you to play the stream while streaming it."
 msgstr ""
 
-#: src/libvlc.h:298
+#: src/libvlc.h:302
 msgid "Enable video stream output"
 msgstr ""
 
-#: src/libvlc.h:300 src/libvlc.h:313
+#: src/libvlc.h:304 src/libvlc.h:317
 msgid ""
 "This allows you to choose if the video stream should be redirected to the "
 "stream output facility when this last one is enabled."
 msgstr ""
 
-#: src/libvlc.h:303
+#: src/libvlc.h:307
 msgid "Video encoding codec"
 msgstr ""
 
-#: src/libvlc.h:305
+#: src/libvlc.h:309
 msgid "This allows you to force video encoding"
 msgstr ""
 
-#: src/libvlc.h:307
+#: src/libvlc.h:311
 msgid "Video bitrate encoding (kB/s)"
 msgstr ""
 
-#: src/libvlc.h:309
+#: src/libvlc.h:313
 msgid "This allows you to specify video bitrate in kB/s."
 msgstr ""
 
-#: src/libvlc.h:311
+#: src/libvlc.h:315
 msgid "Enable audio stream output"
 msgstr ""
 
-#: src/libvlc.h:316
+#: src/libvlc.h:320
 msgid "Audio encoding codec"
 msgstr ""
 
-#: src/libvlc.h:318
+#: src/libvlc.h:322
 msgid "This allows you to force audio encoding"
 msgstr ""
 
-#: src/libvlc.h:320
+#: src/libvlc.h:324
 msgid "Audio bitrate encoding (kB/s)"
 msgstr ""
 
-#: src/libvlc.h:322
+#: src/libvlc.h:326
 msgid "This allows you to specify audio bitrate in kB/s."
 msgstr ""
 
-#: src/libvlc.h:324
+#: src/libvlc.h:328
 msgid "Choose preferred packetizer list"
 msgstr "Choose preferred packetiser list"
 
-#: src/libvlc.h:326
+#: src/libvlc.h:330
 msgid ""
 "This allows you to select the order in which VLC will choose its packetizers."
 msgstr ""
 "This allows you to select the order in which VLC will choose its packetisers."
 
-#: src/libvlc.h:329
+#: src/libvlc.h:333
 msgid "Mux module"
 msgstr ""
 
-#: src/libvlc.h:331
+#: src/libvlc.h:335
 msgid "This is a legacy entry to let you configure mux modules"
 msgstr ""
 
-#: src/libvlc.h:333
+#: src/libvlc.h:337
 msgid "Access output module"
 msgstr ""
 
-#: src/libvlc.h:335
+#: src/libvlc.h:339
 msgid "This is a legacy entry to let you configure access output modules"
 msgstr ""
 
-#: src/libvlc.h:338
+#: src/libvlc.h:342
 msgid "Enable CPU MMX support"
 msgstr ""
 
-#: src/libvlc.h:340
+#: src/libvlc.h:344
 msgid ""
 "If your processor supports the MMX instructions set, VLC can take advantage "
 "of them."
 msgstr ""
 
-#: src/libvlc.h:343
+#: src/libvlc.h:347
 msgid "Enable CPU 3D Now! support"
 msgstr ""
 
-#: src/libvlc.h:345
+#: src/libvlc.h:349
 msgid ""
 "If your processor supports the 3D Now! instructions set, VLC can take "
 "advantage of them."
 msgstr ""
 
-#: src/libvlc.h:348
+#: src/libvlc.h:352
 msgid "Enable CPU MMX EXT support"
 msgstr ""
 
-#: src/libvlc.h:350
+#: src/libvlc.h:354
 msgid ""
 "If your processor supports the MMX EXT instructions set, VLC can take "
 "advantage of them."
 msgstr ""
 
-#: src/libvlc.h:353
+#: src/libvlc.h:357
 msgid "Enable CPU SSE support"
 msgstr ""
 
-#: src/libvlc.h:355
+#: src/libvlc.h:359
 msgid ""
 "If your processor supports the SSE instructions set, VLC can take advantage "
 "of them."
 msgstr ""
 
-#: src/libvlc.h:358
+#: src/libvlc.h:362
 msgid "Enable CPU AltiVec support"
 msgstr ""
 
-#: src/libvlc.h:360
+#: src/libvlc.h:364
 msgid ""
 "If your processor supports the AltiVec instructions set, VLC can take "
 "advantage of them."
 msgstr ""
 
-#: src/libvlc.h:363
+#: src/libvlc.h:367
 msgid "Play files randomly forever"
 msgstr ""
 
-#: src/libvlc.h:365
+#: src/libvlc.h:369
 msgid ""
 "When selected, VLC will randomly play files in the playlist until "
 "interrupted."
 msgstr ""
 
-#: src/libvlc.h:368
+#: src/libvlc.h:372
 msgid "Enqueue items in playlist"
 msgstr ""
 
-#: src/libvlc.h:370
+#: src/libvlc.h:374
 msgid ""
 "If you want VLC to add items to the playlist as you open them, then enable "
 "this option."
 msgstr ""
 
-#: src/libvlc.h:373
+#: src/libvlc.h:377
 msgid "Loop playlist on end"
 msgstr ""
 
-#: src/libvlc.h:375
+#: src/libvlc.h:379
 msgid ""
 "If you want VLC to keep playing the playlist indefinitely then enable this "
 "option."
 msgstr ""
 
-#: src/libvlc.h:378
+#: src/libvlc.h:382
 msgid "Memory copy module"
 msgstr ""
 
-#: src/libvlc.h:380
+#: src/libvlc.h:384
 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.h:383
+#: src/libvlc.h:387
 msgid "Access module"
 msgstr ""
 
-#: src/libvlc.h:385
+#: src/libvlc.h:389
 msgid "This is a legacy entry to let you configure access modules"
 msgstr ""
 
-#: src/libvlc.h:387
+#: src/libvlc.h:391
 msgid "Demux module"
 msgstr ""
 
-#: src/libvlc.h:389
+#: src/libvlc.h:393
 msgid "This is a legacy entry to let you configure demux modules"
 msgstr ""
 
-#: src/libvlc.h:391
+#: src/libvlc.h:395
 msgid "Fast mutex on NT/2K/XP (developers only)"
 msgstr ""
 
-#: src/libvlc.h:393
+#: src/libvlc.h:397
 msgid ""
 "On Windows NT/2K/XP we use a slow mutex implementation but which allows us "
 "to correctely implement condition variables. You can also use the faster "
 "Win9x implementation but you might experience problems with it."
 msgstr ""
 
-#: src/libvlc.h:398
+#: src/libvlc.h:402
 msgid "Condition variables implementation for Win9x (developers only)"
 msgstr ""
 
-#: src/libvlc.h:401
+#: src/libvlc.h:405
 msgid ""
 "On Windows 9x/Me we use a fast but not correct condition variables "
 "implementation (more precisely there is a possibility for a race condition "
@@ -932,7 +939,7 @@ msgid ""
 "the default and the fastest), 1 and 2."
 msgstr ""
 
-#: src/libvlc.h:409
+#: src/libvlc.h:413
 msgid ""
 "\n"
 "Playlist items:\n"
@@ -947,61 +954,62 @@ msgid ""
 "  vlc:quit                       quit VLC\n"
 msgstr ""
 
-#: src/libvlc.h:439 modules/misc/dummy/dummy.c:60
+#: src/libvlc.h:443 modules/misc/dummy/dummy.c:58
 msgid "Interface"
 msgstr ""
 
-#: src/libvlc.h:454 modules/audio_output/coreaudio.c:224
+#: src/libvlc.h:458 modules/audio_output/coreaudio.c:227
 #: modules/audio_output/file.c:108 modules/demux/asf/asf.c:228
-#: modules/demux/ogg.c:554 modules/demux/ogg.c:813 modules/demux/ogg.c:986
-#: modules/gui/beos/InterfaceWindow.cpp:259
+#: modules/demux/mkv.cpp:2443 modules/demux/ogg.c:557 modules/demux/ogg.c:829
+#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m:354 modules/gui/macosx/output.m:150
+#: modules/gui/macosx/intf.m:378 modules/gui/macosx/output.m:155
 msgid "Audio"
 msgstr ""
 
-#: src/libvlc.h:473 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1203
-#: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
-#: modules/demux/ogg.c:893 modules/gui/gtk/gnome_interface.c:1099
-#: modules/gui/gtk/gtk_interface.c:1296 modules/gui/macosx/intf.m:365
-#: modules/gui/macosx/macosx.m:66 modules/gui/macosx/output.m:140
-#: modules/misc/dummy/dummy.c:83 modules/video_output/directx/directx.c:112
+#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1208
+#: modules/demux/mkv.cpp:2459 modules/demux/ogg.c:629 modules/demux/ogg.c:669
+#: modules/demux/ogg.c:734 modules/demux/ogg.c:909
+#: modules/gui/gtk/gnome_interface.c:1099 modules/gui/gtk/gtk_interface.c:1296
+#: modules/gui/macosx/intf.m:389 modules/gui/macosx/macosx.m:68
+#: modules/gui/macosx/output.m:144 modules/misc/dummy/dummy.c:81
+#: modules/video_output/directx/directx.c:112
 msgid "Video"
 msgstr ""
 
-#: src/libvlc.h:493 modules/access/satellite/satellite.c:66
+#: src/libvlc.h:499 modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr ""
 
-#: src/libvlc.h:516
+#: src/libvlc.h:521
 msgid "Decoders"
 msgstr ""
 
-#: src/libvlc.h:519
+#: src/libvlc.h:524
 msgid "Encoders"
 msgstr ""
 
-#: src/libvlc.h:524 modules/gui/gtk/gnome_interface.c:2042
+#: src/libvlc.h:529 modules/gui/gtk/gnome_interface.c:2042
 #: modules/gui/gtk/gtk_interface.c:2361 modules/gui/gtk/gtk_interface.c:3034
-#: modules/gui/wxwindows/open.cpp:218 modules/gui/wxwindows/streamout.cpp:151
+#: modules/gui/wxwindows/open.cpp:218 modules/gui/wxwindows/streamout.cpp:155
 msgid "Stream output"
 msgstr ""
 
-#: src/libvlc.h:543
+#: src/libvlc.h:549
 msgid "CPU"
 msgstr ""
 
-#: src/libvlc.h:555 modules/gui/beos/InterfaceWindow.cpp:206
+#: src/libvlc.h:561 modules/gui/beos/InterfaceWindow.cpp:206
 #: modules/gui/familiar/interface.c:610 modules/gui/gtk/gnome_interface.c:643
 #: modules/gui/gtk/gnome_interface.c:2384
 #: modules/gui/gtk/gnome_interface.c:2409 modules/gui/gtk/gtk_interface.c:747
-#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:297
-#: modules/gui/macosx/intf.m:385 modules/gui/wxwindows/interface.cpp:351
+#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:321
+#: modules/gui/macosx/intf.m:409 modules/gui/wxwindows/interface.cpp:374
 #: modules/gui/wxwindows/playlist.cpp:102
 msgid "Playlist"
 msgstr ""
 
-#: src/libvlc.h:561 modules/audio_filter/converter/a52tofloat32.c:85
+#: src/libvlc.h:567 modules/audio_filter/converter/a52tofloat32.c:85
 #: modules/audio_filter/converter/mpgatofixed32.c:60
 #: modules/codec/a52old/a52old.c:59 modules/codec/mpeg_video/parser.c:84
 #: modules/demux/mpeg/ts.c:118 modules/gui/familiar/familiar.c:70
@@ -1011,27 +1019,27 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/libvlc.h:574
+#: src/libvlc.h:580
 msgid "main program"
 msgstr "main program"
 
-#: src/libvlc.h:580
+#: src/libvlc.h:586
 msgid "print help"
 msgstr ""
 
-#: src/libvlc.h:582
+#: src/libvlc.h:588
 msgid "print detailed help"
 msgstr ""
 
-#: src/libvlc.h:585
+#: src/libvlc.h:591
 msgid "print a list of available modules"
 msgstr ""
 
-#: src/libvlc.h:587
+#: src/libvlc.h:593
 msgid "print help on module"
 msgstr ""
 
-#: src/libvlc.h:590
+#: src/libvlc.h:596
 msgid "print version information"
 msgstr ""
 
@@ -1039,15 +1047,43 @@ msgstr ""
 msgid "boolean"
 msgstr ""
 
-#: src/video_output/video_output.c:382 modules/gui/beos/VideoOutput.cpp:1138
-#: modules/gui/macosx/controls.m:342 modules/gui/macosx/controls.m:486
-#: modules/gui/macosx/intf.m:370
+#: src/video_output/video_output.c:388 modules/gui/beos/VideoOutput.cpp:1151
+#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:356
+#: modules/gui/macosx/controls.m:698 modules/gui/macosx/intf.m:394
 msgid "Fullscreen"
 msgstr ""
 
-#: modules/access/cdda.c:86 modules/access/file.c:69 modules/access/ftp.c:86
+#: src/video_output/video_output.c:399 modules/gui/gtk/gnome_interface.c:183
+#: modules/gui/gtk/gnome_interface.c:966 modules/gui/gtk/gtk_interface.c:553
+#: modules/gui/gtk/gtk_interface.c:1349 modules/gui/macosx/intf.m:402
+#: modules/gui/macosx/intf.m:403
+#: modules/video_filter/deinterlace/deinterlace.c:81
+msgid "Deinterlace"
+msgstr ""
+
+#: src/video_output/video_output.c:403
+msgid "Discard"
+msgstr ""
+
+#: src/video_output/video_output.c:405
+msgid "Blend"
+msgstr ""
+
+#: src/video_output/video_output.c:407
+msgid "Mean"
+msgstr ""
+
+#: src/video_output/video_output.c:409
+msgid "Bob"
+msgstr ""
+
+#: src/video_output/video_output.c:411
+msgid "Linear"
+msgstr ""
+
+#: modules/access/cdda.c:86 modules/access/file.c:72 modules/access/ftp.c:86
 #: modules/access/http.c:80 modules/access/mms/mms.c:57
-#: modules/access/v4l/v4l.c:64
+#: modules/access/v4l/v4l.c:67
 msgid "Caching value in ms"
 msgstr ""
 
@@ -1117,17 +1153,17 @@ msgstr ""
 msgid "DVD input (using libdvdread)"
 msgstr ""
 
-#: modules/access/file.c:71
+#: modules/access/file.c:74
 msgid ""
 "Allows you to modify the default caching value for file streams. This value "
 "should be set in miliseconds units."
 msgstr ""
 
-#: modules/access/file.c:75
+#: modules/access/file.c:78
 msgid "Standard filesystem file input"
 msgstr ""
 
-#: modules/access/file.c:76
+#: modules/access/file.c:79
 msgid "file"
 msgstr ""
 
@@ -1176,6 +1212,10 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
+#: modules/access/pvr/pvr.c:74
+msgid "Hauppauge PVR cards input"
+msgstr ""
+
 #: modules/access/satellite/satellite.c:41
 msgid "Satellite default transponder frequency"
 msgstr ""
@@ -1220,11 +1260,11 @@ msgstr ""
 msgid "slp"
 msgstr ""
 
-#: modules/access/udp.c:72
+#: modules/access/udp.c:72 modules/access_output/udp.c:74
 msgid "caching value in ms"
 msgstr ""
 
-#: modules/access/udp.c:74
+#: modules/access/udp.c:74 modules/access_output/udp.c:76
 msgid ""
 "Allows you to modify the default caching value for udp streams. This value "
 "should be set in miliseconds units."
@@ -1238,21 +1278,21 @@ msgstr ""
 msgid "udp"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:66
+#: modules/access/v4l/v4l.c:69
 msgid ""
 "Allows you to modify the default caching value for v4l streams. This value "
 "should be set in miliseconds units."
 msgstr ""
 
-#: modules/access/v4l/v4l.c:70
+#: modules/access/v4l/v4l.c:73
 msgid "Video4Linux input"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:71
+#: modules/access/v4l/v4l.c:74
 msgid "v4l"
 msgstr ""
 
-#: modules/access/v4l/v4l.c:79
+#: modules/access/v4l/v4l.c:82
 msgid "Video4Linux demuxer"
 msgstr ""
 
@@ -1260,7 +1300,7 @@ msgstr ""
 msgid "VCD input"
 msgstr ""
 
-#: modules/access/vlcs.c:131 modules/misc/sap.c:131
+#: modules/access/vlcs.c:131 modules/misc/sap.c:142
 msgid "SAP"
 msgstr ""
 
@@ -1272,7 +1312,7 @@ msgstr ""
 msgid "Dummy stream ouput"
 msgstr ""
 
-#: modules/access_output/file.c:58
+#: modules/access_output/file.c:66
 msgid "File stream ouput"
 msgstr ""
 
@@ -1280,10 +1320,14 @@ msgstr ""
 msgid "HTTP stream ouput"
 msgstr ""
 
-#: modules/access_output/udp.c:73
+#: modules/access_output/udp.c:80
 msgid "UDP stream ouput"
 msgstr ""
 
+#: modules/access_output/udp.c:81
+msgid "udp stream output"
+msgstr ""
+
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr ""
@@ -1427,19 +1471,20 @@ msgid "ALSA audio output"
 msgstr ""
 
 #: modules/audio_output/alsa.c:110 modules/audio_output/coreaudio.c:218
-#: modules/audio_output/coreaudio.c:1470 modules/audio_output/directx.c:377
+#: modules/audio_output/coreaudio.c:1473 modules/audio_output/directx.c:377
 #: modules/audio_output/oss.c:129 modules/audio_output/sdl.c:176
 #: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:309
+#: modules/gui/macosx/intf.m:386 modules/gui/macosx/intf.m:387
 msgid "Audio device"
 msgstr ""
 
-#: modules/audio_output/alsa.c:159 modules/audio_output/directx.c:435
+#: modules/audio_output/alsa.c:161 modules/audio_output/directx.c:435
 #: modules/audio_output/oss.c:222 modules/audio_output/sdl.c:182
 #: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:371
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:201 modules/audio_output/directx.c:478
+#: modules/audio_output/alsa.c:203 modules/audio_output/directx.c:478
 #: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:387
 msgid "A/52 over S/PDIF"
 msgstr ""
@@ -1448,7 +1493,14 @@ msgstr ""
 msgid "aRts audio output"
 msgstr ""
 
-#: modules/audio_output/coreaudio.c:221
+#: modules/audio_output/coreaudio.c:219
+msgid ""
+"Choose a number corresponding to the number of an audio device, as listed in "
+"your 'audio device' menu. This device will then be used by default for audio "
+"playback."
+msgstr ""
+
+#: modules/audio_output/coreaudio.c:224
 msgid "CoreAudio output"
 msgstr ""
 
@@ -1466,7 +1518,7 @@ msgstr ""
 msgid "2 Front 2 Rear"
 msgstr ""
 
-#: modules/audio_output/esd.c:64
+#: modules/audio_output/esd.c:66
 msgid "EsounD audio output"
 msgstr ""
 
@@ -1587,11 +1639,77 @@ msgstr ""
 msgid "AAC audio decoder (using libfaad2)"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:154
-msgid "ffmpeg"
+#: modules/codec/ffmpeg/ffmpeg.c:84
+msgid "Direct rendering"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:86
+msgid "Error resilience"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:88
+msgid ""
+"ffmpeg can make errors resiliences.          \n"
+"Nevertheless, with a buggy encoder (like ISO MPEG-4 encoder from M$) this "
+"will produce a lot of errors.\n"
+"Valid range is -1 to 99 (-1 disables all errors resiliences)."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:93
+msgid "Workaround bugs"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:95
+msgid ""
+"Try to fix some bugs\n"
+"1  autodetect\n"
+"2  old msmpeg4\n"
+"4  xvid interlaced\n"
+"8  ump4 \n"
+"16 no padding\n"
+"32 ac vlc\n"
+"64 Qpel chroma"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:104
+msgid "Hurry up"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:106
+msgid ""
+"Allow the decoder to partially decode or skip frame(s) when there is not "
+"enough time. It's useful with low CPU power but it can produce distorted "
+"pictures."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:110
+msgid "Truncated stream"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:111
+msgid "truncated stream -1:auto,0:disable,:1:enable"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:113
+msgid "Post processing quality"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:115
+msgid ""
+"Quality of post processing. Valid range is 0 to 6\n"
+"Higher levels require considerable more CPU power, but produce better "
+"looking pictures."
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:119
+msgid "Ffmpeg postproc filter chains"
 msgstr ""
 
 #: modules/codec/ffmpeg/ffmpeg.c:157
+msgid "ffmpeg"
+msgstr ""
+
+#: modules/codec/ffmpeg/ffmpeg.c:160
 msgid "ffmpeg audio/video decoder((MS)MPEG4,SVQ1,H263,WMV,WMA)"
 msgstr ""
 
@@ -1599,11 +1717,7 @@ msgstr ""
 msgid "Post processing"
 msgstr ""
 
-#: modules/codec/ffmpeg/ffmpeg.c:177
-msgid "ffmpeg postprocessing module"
-msgstr ""
-
-#: modules/codec/ffmpeg/ffmpeg.c:204
+#: modules/codec/ffmpeg/ffmpeg.c:179
 msgid "ffmpeg chroma conversion"
 msgstr ""
 
@@ -1623,11 +1737,11 @@ msgstr ""
 msgid "flac audio decoder"
 msgstr ""
 
-#: modules/codec/libmpeg2.c:89
+#: modules/codec/libmpeg2.c:94
 msgid "MPEG I/II video decoder (using libmpeg2)"
 msgstr ""
 
-#: modules/codec/lpcm.c:90
+#: modules/codec/lpcm.c:95
 msgid "linear PCM audio parser"
 msgstr ""
 
@@ -1761,7 +1875,7 @@ msgstr ""
 msgid "Tarkin decoder module"
 msgstr ""
 
-#: modules/codec/theora.c:84
+#: modules/codec/theora.c:85
 msgid "Theora video decoder"
 msgstr ""
 
@@ -1837,20 +1951,20 @@ msgstr ""
 #: modules/control/lirc/lirc.c:297 modules/control/lirc/lirc.c:323
 #: modules/gui/familiar/interface.c:177 modules/gui/gtk/gnome_interface.c:602
 #: modules/gui/gtk/gnome_interface.c:1020 modules/gui/gtk/gtk_interface.c:709
-#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:879
-#: modules/gui/macosx/intf.m:880 modules/gui/macosx/intf.m:881
-#: modules/gui/wxwindows/interface.cpp:810
+#: modules/gui/gtk/gtk_interface.c:1119 modules/gui/macosx/intf.m:924
+#: modules/gui/macosx/intf.m:925 modules/gui/macosx/intf.m:926
+#: modules/gui/wxwindows/interface.cpp:842
 msgid "Pause"
 msgstr ""
 
 #: modules/control/lirc/lirc.c:310 modules/gui/familiar/interface.c:190
 #: modules/gui/gtk/gnome_interface.c:590
 #: modules/gui/gtk/gnome_interface.c:1013 modules/gui/gtk/gtk_interface.c:698
-#: modules/gui/macosx/intf.m:300 modules/gui/macosx/intf.m:338
-#: modules/gui/macosx/intf.m:399 modules/gui/macosx/intf.m:886
-#: modules/gui/macosx/intf.m:887 modules/gui/macosx/intf.m:888
-#: modules/gui/macosx/playlist.m:178 modules/gui/wxwindows/interface.cpp:348
-#: modules/gui/wxwindows/interface.cpp:815
+#: modules/gui/macosx/intf.m:324 modules/gui/macosx/intf.m:362
+#: modules/gui/macosx/intf.m:423 modules/gui/macosx/intf.m:931
+#: modules/gui/macosx/intf.m:932 modules/gui/macosx/intf.m:933
+#: modules/gui/macosx/playlist.m:194 modules/gui/wxwindows/interface.cpp:371
+#: modules/gui/wxwindows/interface.cpp:848
 msgid "Play"
 msgstr ""
 
@@ -1901,18 +2015,17 @@ msgid "Layer"
 msgstr ""
 
 #: modules/demux/aac/demux.c:562 modules/demux/asf/asf.c:275
-#: modules/demux/avi/avi.c:1171 modules/demux/ogg.c:821
-#: modules/demux/ogg.c:994 modules/gui/gtk/gnome_interface.c:148
-#: modules/gui/gtk/gnome_interface.c:931 modules/gui/gtk/gtk_interface.c:481
-#: modules/gui/gtk/gtk_interface.c:1282 modules/gui/macosx/intf.m:360
-#: modules/gui/macosx/intf.m:361
+#: modules/demux/avi/avi.c:1176 modules/demux/mkv.cpp:2447
+#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
+#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931
+#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282
 msgid "Channels"
 msgstr ""
 
 #: modules/demux/aac/demux.c:564 modules/demux/asf/asf.c:277
-#: modules/demux/avi/avi.c:1173 modules/demux/mpeg/audio.c:632
-#: modules/demux/ogg.c:556 modules/demux/ogg.c:655 modules/demux/ogg.c:816
-#: modules/demux/ogg.c:989
+#: modules/demux/avi/avi.c:1178 modules/demux/mkv.cpp:2451
+#: modules/demux/mpeg/audio.c:632 modules/demux/ogg.c:559
+#: modules/demux/ogg.c:671 modules/demux/ogg.c:832 modules/demux/ogg.c:1005
 msgid "Sample Rate"
 msgstr ""
 
@@ -1920,24 +2033,27 @@ msgstr ""
 msgid "ASF v1.0 demuxer (file only)"
 msgstr ""
 
-#: modules/demux/asf/asf.c:165
+#: modules/demux/asf/asf.c:165 modules/demux/mkv.cpp:2410
 msgid "Number of streams"
 msgstr ""
 
 #: modules/demux/asf/asf.c:228 modules/demux/asf/asf.c:302
-#: modules/demux/avi/avi.c:1167 modules/demux/avi/avi.c:1203
-#: modules/demux/avi/avi.c:1234 modules/demux/ogg.c:554
-#: modules/demux/ogg.c:613 modules/demux/ogg.c:653 modules/demux/ogg.c:718
-#: modules/demux/ogg.c:813 modules/demux/ogg.c:893 modules/demux/ogg.c:986
-#: modules/gui/familiar/interface.c:370 modules/gui/macosx/output.m:130
+#: modules/demux/avi/avi.c:1172 modules/demux/avi/avi.c:1208
+#: modules/demux/avi/avi.c:1239 modules/demux/mkv.cpp:2443
+#: modules/demux/mkv.cpp:2459 modules/demux/mkv.cpp:2475
+#: modules/demux/ogg.c:557 modules/demux/ogg.c:629 modules/demux/ogg.c:669
+#: modules/demux/ogg.c:734 modules/demux/ogg.c:829 modules/demux/ogg.c:909
+#: modules/demux/ogg.c:1002 modules/gui/familiar/interface.c:370
+#: modules/gui/macosx/output.m:134
 msgid "Type"
 msgstr ""
 
 #: modules/demux/asf/asf.c:260 modules/demux/asf/asf.c:318
-#: modules/demux/avi/avi.c:1169 modules/demux/avi/avi.c:1204
-#: modules/demux/ogg.c:555 modules/demux/ogg.c:614 modules/demux/ogg.c:654
-#: modules/demux/ogg.c:719 modules/demux/ogg.c:814 modules/demux/ogg.c:894
-#: modules/demux/ogg.c:987
+#: modules/demux/avi/avi.c:1174 modules/demux/avi/avi.c:1209
+#: modules/demux/mkv.cpp:2444 modules/demux/mkv.cpp:2460
+#: modules/demux/mkv.cpp:2476 modules/demux/ogg.c:558 modules/demux/ogg.c:630
+#: modules/demux/ogg.c:670 modules/demux/ogg.c:735 modules/demux/ogg.c:830
+#: modules/demux/ogg.c:910 modules/demux/ogg.c:1003
 msgid "Codec"
 msgstr ""
 
@@ -1945,7 +2061,8 @@ msgstr ""
 msgid "Avg. byterate"
 msgstr ""
 
-#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1175
+#: modules/demux/asf/asf.c:282 modules/demux/avi/avi.c:1180
+#: modules/demux/mkv.cpp:2455
 msgid "Bits Per Sample"
 msgstr ""
 
@@ -1953,7 +2070,8 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1206
+#: modules/demux/asf/asf.c:335 modules/demux/avi/avi.c:1211
+#: modules/demux/mkv.cpp:2463
 msgid "Resolution"
 msgstr ""
 
@@ -1961,7 +2079,7 @@ msgstr ""
 msgid "Planes"
 msgstr ""
 
-#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1212
+#: modules/demux/asf/asf.c:339 modules/demux/avi/avi.c:1217
 msgid "Bits Per Pixel"
 msgstr ""
 
@@ -2026,24 +2144,24 @@ msgstr ""
 msgid "AVI demuxer"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1096
+#: modules/demux/avi/avi.c:1101
 msgid "Avi"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1097
+#: modules/demux/avi/avi.c:1102
 msgid "Number of Streams"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1098
+#: modules/demux/avi/avi.c:1103
 msgid "Flags"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1209 modules/demux/ogg.c:615
-#: modules/demux/ogg.c:721 modules/demux/ogg.c:896
+#: modules/demux/avi/avi.c:1214 modules/demux/ogg.c:631
+#: modules/demux/ogg.c:737 modules/demux/ogg.c:912
 msgid "Frame Rate"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1234
+#: modules/demux/avi/avi.c:1239
 msgid "Unknown"
 msgstr ""
 
@@ -2063,10 +2181,78 @@ msgstr ""
 msgid "flac demuxer"
 msgstr ""
 
-#: modules/demux/m3u.c:65
+#: modules/demux/m3u.c:63
 msgid "playlist metademux"
 msgstr ""
 
+#: modules/demux/mkv.cpp:94
+msgid "mkv-demuxer"
+msgstr ""
+
+#: modules/demux/mkv.cpp:96 modules/demux/mkv.cpp:97
+msgid "Seek based on percent not time"
+msgstr ""
+
+#: modules/demux/mkv.cpp:99
+msgid "mka/mkv stream demuxer"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2387 modules/gui/gtk/gnome_interface.c:2436
+#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:148
+msgid "Duration"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2396
+msgid "Date UTC"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2400
+msgid "Segment Filename"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2404
+msgid "Muxing Application"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2408
+msgid "Writing Application"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2421 modules/gui/beos/PlayListWindow.cpp:144
+#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
+#: modules/gui/kde/pluginsbox.cpp:45
+msgid "Name"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2425
+msgid "Codec Name"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2429
+msgid "Codec Setting"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2433
+msgid "Codec Info"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2437
+msgid "Codec Download"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2467
+msgid "Display Resolution"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2471
+msgid "Frame Per Second"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2475 modules/gui/gtk/gnome_interface.c:1963
+#: modules/gui/gtk/gtk_interface.c:2278
+msgid "Subtitle"
+msgstr ""
+
 #: modules/demux/mp4/mp4.c:59
 msgid "MP4 demuxer"
 msgstr ""
@@ -2137,40 +2323,40 @@ msgstr ""
 msgid "ISO 13818-1 MPEG Transport Stream input (libdvbpsi)"
 msgstr ""
 
-#: modules/demux/ogg.c:187
+#: modules/demux/ogg.c:188
 msgid "ogg stream demuxer"
 msgstr ""
 
-#: modules/demux/ogg.c:555
+#: modules/demux/ogg.c:558
 msgid "Vorbis"
 msgstr ""
 
-#: modules/demux/ogg.c:558 modules/demux/ogg.c:617 modules/demux/ogg.c:657
-#: modules/demux/ogg.c:818 modules/demux/ogg.c:991
+#: modules/demux/ogg.c:563 modules/demux/ogg.c:633 modules/demux/ogg.c:673
+#: modules/demux/ogg.c:834 modules/demux/ogg.c:1007
 msgid "Bit Rate"
 msgstr ""
 
-#: modules/demux/ogg.c:614
+#: modules/demux/ogg.c:630
 msgid "Theora"
 msgstr ""
 
-#: modules/demux/ogg.c:654
+#: modules/demux/ogg.c:670
 msgid "tarkin"
 msgstr ""
 
-#: modules/demux/ogg.c:723 modules/demux/ogg.c:898
+#: modules/demux/ogg.c:739 modules/demux/ogg.c:914
 msgid "Bit Count"
 msgstr ""
 
-#: modules/demux/ogg.c:725 modules/demux/ogg.c:900
+#: modules/demux/ogg.c:741 modules/demux/ogg.c:916
 msgid "Width"
 msgstr ""
 
-#: modules/demux/ogg.c:727 modules/demux/ogg.c:902
+#: modules/demux/ogg.c:743 modules/demux/ogg.c:918
 msgid "Height"
 msgstr ""
 
-#: modules/demux/ogg.c:823 modules/demux/ogg.c:996
+#: modules/demux/ogg.c:839 modules/demux/ogg.c:1012
 msgid "Bits per Sample"
 msgstr ""
 
@@ -2526,7 +2712,7 @@ msgstr ""
 msgid "XviD video encoder (MPEG-4)"
 msgstr ""
 
-#: modules/gui/beos/BeOS.cpp:53
+#: modules/gui/beos/BeOS.cpp:55
 msgid "BeOS standard API interface"
 msgstr ""
 
@@ -2543,18 +2729,18 @@ msgid "Yes"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:201
-#: modules/gui/beos/InterfaceWindow.cpp:300
+#: modules/gui/beos/InterfaceWindow.cpp:308
 #: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
-#: modules/gui/macosx/intf.m:304 modules/gui/macosx/prefs.m:75
-#: modules/gui/wxwindows/preferences.cpp:229
+#: modules/gui/macosx/intf.m:328 modules/gui/macosx/prefs.m:77
+#: modules/gui/wxwindows/preferences.cpp:233
 msgid "Preferences"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:211
-#: modules/gui/beos/InterfaceWindow.cpp:298
+#: modules/gui/beos/InterfaceWindow.cpp:306
 #: modules/gui/gtk/gnome_interface.c:2692 modules/gui/gtk/gtk_interface.c:2947
 #: modules/gui/kde/info.cpp:9 modules/gui/kde/messages.cpp:8
-#: modules/gui/macosx/intf.m:310 modules/gui/macosx/intf.m:387
+#: modules/gui/macosx/intf.m:334 modules/gui/macosx/intf.m:411
 #: modules/gui/wxwindows/messages.cpp:79
 msgid "Messages"
 msgstr ""
@@ -2569,9 +2755,9 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
 #: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
 #: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:264
-#: modules/gui/macosx/output.m:121 modules/gui/macosx/output.m:194
-#: modules/gui/macosx/output.m:279 modules/gui/wxwindows/interface.cpp:335
-#: modules/gui/wxwindows/open.cpp:276 modules/gui/wxwindows/streamout.cpp:340
+#: modules/gui/macosx/output.m:125 modules/gui/macosx/output.m:200
+#: modules/gui/macosx/output.m:285 modules/gui/wxwindows/interface.cpp:358
+#: modules/gui/wxwindows/open.cpp:276 modules/gui/wxwindows/streamout.cpp:347
 msgid "File"
 msgstr ""
 
@@ -2599,7 +2785,6 @@ msgid "About"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:256 modules/gui/kde/interface.cpp:93
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/intf.m:377
 msgid "Subtitles"
 msgstr ""
 
@@ -2631,49 +2816,33 @@ msgstr ""
 msgid "Speed"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:286 modules/gui/macosx/controls.m:422
-#: modules/gui/macosx/intf.m:299 modules/gui/macosx/intf.m:341
-#: modules/gui/wxwindows/interface.cpp:357
-msgid "Slower"
-msgstr ""
-
-#: modules/gui/beos/InterfaceWindow.cpp:287
-msgid "Normal"
-msgstr ""
-
-#: modules/gui/beos/InterfaceWindow.cpp:290 modules/gui/macosx/controls.m:421
-#: modules/gui/macosx/intf.m:302 modules/gui/macosx/intf.m:340
-#: modules/gui/wxwindows/interface.cpp:359
-msgid "Faster"
-msgstr ""
-
-#: modules/gui/beos/InterfaceWindow.cpp:295 modules/gui/macosx/intf.m:381
+#: modules/gui/beos/InterfaceWindow.cpp:303 modules/gui/macosx/intf.m:405
 msgid "Window"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:296
+#: modules/gui/beos/InterfaceWindow.cpp:304
 msgid "Play List"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:356
+#: modules/gui/beos/InterfaceWindow.cpp:364
 #: modules/gui/gtk/gtk_interface.c:1661 modules/gui/gtk/gtk_interface.c:2396
 #: modules/gui/gtk/gtk_interface.c:2638 modules/gui/gtk/gtk_interface.c:2869
 #: modules/gui/gtk/gtk_interface.c:2976 modules/gui/gtk/gtk_interface.c:3250
-#: modules/gui/gtk/preferences.c:605 modules/gui/macosx/open.m:138
-#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:117
+#: modules/gui/gtk/preferences.c:606 modules/gui/macosx/open.m:138
+#: modules/gui/macosx/open.m:179 modules/gui/macosx/output.m:121
 #: modules/gui/wxwindows/fileinfo.cpp:96
-#: modules/gui/wxwindows/messages.cpp:102 modules/gui/wxwindows/open.cpp:267
-#: modules/gui/wxwindows/preferences.cpp:250
-#: modules/gui/wxwindows/streamout.cpp:194
+#: modules/gui/wxwindows/messages.cpp:101 modules/gui/wxwindows/open.cpp:267
+#: modules/gui/wxwindows/preferences.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:198
 #: modules/gui/wxwindows/subtitles.cpp:149
 msgid "OK"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:364
+#: modules/gui/beos/InterfaceWindow.cpp:372
 msgid "VideoLAN Client: Open Media Files"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:368
+#: modules/gui/beos/InterfaceWindow.cpp:376
 msgid "VideoLAN Client: Open Subtitle File"
 msgstr ""
 
@@ -2681,17 +2850,17 @@ msgstr ""
 msgid "Drop files to play"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:167
+#: modules/gui/beos/PlayListWindow.cpp:93
 #: modules/gui/wxwindows/playlist.cpp:154
 msgid "Close"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:330
+#: modules/gui/beos/PlayListWindow.cpp:98 modules/gui/macosx/intf.m:354
 msgid "Edit"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:335
-#: modules/gui/macosx/playlist.m:180
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:359
+#: modules/gui/macosx/playlist.m:196
 msgid "Select All"
 msgstr ""
 
@@ -2731,73 +2900,67 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:144
-#: modules/gui/familiar/interface.c:362 modules/gui/gtk/preferences.c:325
-#: modules/gui/kde/pluginsbox.cpp:45
-msgid "Name"
-msgstr ""
-
 #: modules/gui/beos/PreferencesWindow.cpp:44
 #: modules/gui/beos/PreferencesWindow.cpp:46
 #: modules/gui/beos/PreferencesWindow.cpp:98
-#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:607
-#: modules/gui/macosx/prefs.m:615 modules/gui/macosx/prefs.m:685
+#: modules/gui/gtk/gnome_interface.c:2216 modules/gui/macosx/prefs.m:806
+#: modules/gui/macosx/prefs.m:814 modules/gui/macosx/prefs.m:884
 msgid "Modules"
 msgstr ""
 
-#: modules/gui/beos/PreferencesWindow.cpp:220
-#: modules/gui/gtk/preferences.c:609
+#: modules/gui/beos/PreferencesWindow.cpp:219
+#: modules/gui/gtk/preferences.c:610
 msgid "Apply"
 msgstr ""
 
-#: modules/gui/beos/PreferencesWindow.cpp:225
-#: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
-#: modules/gui/macosx/output.m:332 modules/gui/macosx/prefs.m:76
-#: modules/gui/wxwindows/preferences.cpp:254
+#: modules/gui/beos/PreferencesWindow.cpp:224
+#: modules/gui/gtk/preferences.c:597 modules/gui/gtk/preferences.c:614
+#: modules/gui/macosx/output.m:338 modules/gui/macosx/prefs.m:78
+#: modules/gui/wxwindows/preferences.cpp:257
 msgid "Save"
 msgstr ""
 
-#: modules/gui/beos/PreferencesWindow.cpp:229
+#: modules/gui/beos/PreferencesWindow.cpp:228
 msgid "Defaults"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1125
+#: modules/gui/beos/VideoOutput.cpp:1138
 msgid "Show Interface"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1129
+#: modules/gui/beos/VideoOutput.cpp:1142
 msgid "50%"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1132
+#: modules/gui/beos/VideoOutput.cpp:1145
 msgid "100%"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1135
+#: modules/gui/beos/VideoOutput.cpp:1148
 msgid "200%"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1145
+#: modules/gui/beos/VideoOutput.cpp:1158
 msgid "Vertical Sync"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1149
+#: modules/gui/beos/VideoOutput.cpp:1162
 msgid "Correct Aspect Ratio"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1178
+#: modules/gui/beos/VideoOutput.cpp:1191
 msgid "Stay On Top"
 msgstr ""
 
-#: modules/gui/beos/VideoOutput.cpp:1184
+#: modules/gui/beos/VideoOutput.cpp:1197
 msgid "Take Screen Shot"
 msgstr ""
 
-#: modules/gui/beos/VlcWrapper.cpp:185 modules/gui/gtk/menu.c:733
+#: modules/gui/beos/VlcWrapper.cpp:165 modules/gui/gtk/menu.c:733
 msgid "None"
 msgstr ""
 
-#: modules/gui/beos/VlcWrapper.cpp:198
+#: modules/gui/beos/VlcWrapper.cpp:178
 msgid "<unknown>"
 msgstr ""
 
@@ -2819,8 +2982,8 @@ msgstr ""
 msgid "VLC media player"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:652
-#: modules/gui/wxwindows/preferences.cpp:965
+#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:668
+#: modules/gui/wxwindows/preferences.cpp:1026
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr ""
@@ -2843,9 +3006,9 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:203 modules/gui/gtk/gnome_interface.c:566
 #: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:676
-#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:435
-#: modules/gui/macosx/intf.m:301 modules/gui/macosx/intf.m:339
-#: modules/gui/macosx/intf.m:400 modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:647
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:424 modules/gui/wxwindows/interface.cpp:369
 msgid "Stop"
 msgstr ""
 
@@ -2862,7 +3025,7 @@ msgid "Forward stream"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:285 modules/gui/gtk/gnome_interface.c:2345
-#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:182
+#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:198
 msgid "Add"
 msgstr ""
 
@@ -2871,13 +3034,13 @@ msgid "MRL :"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:394
-msgid "UDP/RTP (Adress when Multicast)"
+msgid "UDP/RTP (Address when Multicast)"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:412 modules/gui/gtk/gnome_interface.c:1747
 #: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:160
-#: modules/gui/macosx/output.m:124 modules/gui/wxwindows/open.cpp:445
-#: modules/gui/wxwindows/streamout.cpp:380
+#: modules/gui/macosx/output.m:128 modules/gui/wxwindows/open.cpp:456
+#: modules/gui/wxwindows/streamout.cpp:387
 msgid "Address"
 msgstr ""
 
@@ -2886,14 +3049,14 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
 #: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
 #: modules/gui/macosx/open.m:159 modules/gui/macosx/open.m:161
-#: modules/gui/macosx/output.m:125 modules/gui/wxwindows/open.cpp:430
-#: modules/gui/wxwindows/open.cpp:453 modules/gui/wxwindows/streamout.cpp:390
+#: modules/gui/macosx/output.m:129 modules/gui/wxwindows/open.cpp:441
+#: modules/gui/wxwindows/open.cpp:464 modules/gui/wxwindows/streamout.cpp:398
 msgid "Port"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:127
-#: modules/gui/macosx/output.m:221 modules/gui/macosx/output.m:289
-#: modules/gui/wxwindows/streamout.cpp:341
+#: modules/gui/familiar/interface.c:478 modules/gui/macosx/output.m:131
+#: modules/gui/macosx/output.m:227 modules/gui/macosx/output.m:295
+#: modules/gui/wxwindows/streamout.cpp:348
 msgid "HTTP"
 msgstr ""
 
@@ -3026,7 +3189,7 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:20 modules/gui/gtk/gnome_interface.c:504
 #: modules/gui/gtk/gnome_interface.c:986 modules/gui/gtk/gtk_interface.c:173
 #: modules/gui/gtk/gtk_interface.c:619 modules/gui/gtk/gtk_interface.c:1399
-#: modules/gui/wxwindows/interface.cpp:230
+#: modules/gui/wxwindows/interface.cpp:253
 msgid "Open a file"
 msgstr ""
 
@@ -3126,25 +3289,24 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:126 modules/gui/gtk/gnome_interface.c:909
 #: modules/gui/gtk/gtk_interface.c:452 modules/gui/gtk/gtk_interface.c:1253
-#: modules/gui/macosx/intf.m:355
+#: modules/gui/macosx/intf.m:379
 msgid "Volume Up"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:133 modules/gui/gtk/gnome_interface.c:916
 #: modules/gui/gtk/gtk_interface.c:459 modules/gui/gtk/gtk_interface.c:1260
-#: modules/gui/macosx/intf.m:356
+#: modules/gui/macosx/intf.m:380
 msgid "Volume Down"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:923
 #: modules/gui/gtk/gtk_interface.c:466 modules/gui/gtk/gtk_interface.c:1267
-#: modules/gui/macosx/controls.m:482 modules/gui/macosx/intf.m:357
+#: modules/gui/macosx/controls.m:694 modules/gui/macosx/intf.m:381
 msgid "Mute"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:155 modules/gui/gtk/gnome_interface.c:938
 #: modules/gui/gtk/gtk_interface.c:488 modules/gui/gtk/gtk_interface.c:1289
-#: modules/gui/macosx/intf.m:362 modules/gui/macosx/intf.m:363
 msgid "Device"
 msgstr ""
 
@@ -3163,18 +3325,9 @@ msgstr ""
 msgid "_Fullscreen"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:183 modules/gui/gtk/gnome_interface.c:966
-#: modules/gui/gtk/gtk_interface.c:553 modules/gui/gtk/gtk_interface.c:1349
-#: modules/gui/macosx/controls.m:526 modules/gui/macosx/intf.m:378
-#: modules/gui/macosx/intf.m:379
-#: modules/video_filter/deinterlace/deinterlace.c:81
-msgid "Deinterlace"
-msgstr ""
-
 #: modules/gui/gtk/gnome_interface.c:190 modules/gui/gtk/gnome_interface.c:973
 #: modules/gui/gtk/gtk_interface.c:560 modules/gui/gtk/gtk_interface.c:1356
-#: modules/gui/macosx/intf.m:374 modules/gui/macosx/intf.m:375
-#: modules/gui/macosx/output.m:120 modules/gui/macosx/vout.m:199
+#: modules/gui/macosx/output.m:124 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr ""
 
@@ -3191,18 +3344,18 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2267 modules/gui/gtk/gtk_interface.c:629
 #: modules/gui/gtk/gtk_interface.c:816 modules/gui/gtk/gtk_interface.c:2005
 #: modules/gui/gtk/gtk_interface.c:2726 modules/gui/macosx/open.m:142
-#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:337
+#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:360
 #: modules/gui/wxwindows/open.cpp:278
 msgid "Disc"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:527 modules/gui/gtk/gtk_interface.c:640
-#: modules/gui/wxwindows/interface.cpp:339
+#: modules/gui/wxwindows/interface.cpp:362
 msgid "Net"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:539 modules/gui/gtk/gtk_interface.c:651
-#: modules/gui/wxwindows/interface.cpp:342
+#: modules/gui/wxwindows/interface.cpp:365
 msgid "Sat"
 msgstr ""
 
@@ -3264,7 +3417,7 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1063 modules/gui/gtk/gtk_interface.c:758
 #: modules/gui/gtk/gtk_interface.c:844 modules/gui/gtk/gtk_interface.c:888
 #: modules/gui/gtk/gtk_interface.c:1173
-#: modules/gui/wxwindows/interface.cpp:353
+#: modules/gui/wxwindows/interface.cpp:376
 msgid "Prev"
 msgstr ""
 
@@ -3275,9 +3428,9 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:667
 #: modules/gui/gtk/gnome_interface.c:1056 modules/gui/gtk/gtk_interface.c:769
 #: modules/gui/gtk/gtk_interface.c:852 modules/gui/gtk/gtk_interface.c:896
-#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:443
-#: modules/gui/macosx/intf.m:303 modules/gui/macosx/intf.m:343
-#: modules/gui/macosx/intf.m:401 modules/gui/wxwindows/interface.cpp:355
+#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:655
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:378
 msgid "Next"
 msgstr ""
 
@@ -3373,33 +3526,33 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
 #: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
 #: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:173
-#: modules/gui/macosx/output.m:123 modules/gui/wxwindows/open.cpp:246
-#: modules/gui/wxwindows/open.cpp:343
-#: modules/gui/wxwindows/preferences.cpp:778
-#: modules/gui/wxwindows/streamout.cpp:367
+#: modules/gui/macosx/output.m:127 modules/gui/macosx/prefs.m:464
+#: modules/gui/wxwindows/open.cpp:246 modules/gui/wxwindows/open.cpp:354
+#: modules/gui/wxwindows/preferences.cpp:829
+#: modules/gui/wxwindows/streamout.cpp:374
 #: modules/gui/wxwindows/subtitles.cpp:107
 msgid "Browse..."
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1586 modules/gui/gtk/gtk_interface.c:1901
-#: modules/gui/wxwindows/open.cpp:368
+#: modules/gui/wxwindows/open.cpp:379
 msgid "Disc type"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1605 modules/gui/gtk/gtk_interface.c:1920
 #: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:488
-#: modules/gui/wxwindows/open.cpp:362
+#: modules/gui/wxwindows/open.cpp:373
 msgid "DVD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1613 modules/gui/gtk/gtk_interface.c:1928
 #: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:382
-#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:363
+#: modules/gui/macosx/open.m:472 modules/gui/wxwindows/open.cpp:374
 msgid "VCD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1621 modules/gui/gtk/gtk_interface.c:1936
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:374
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:385
 msgid "Device name"
 msgstr ""
 
@@ -3410,24 +3563,24 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:547
-#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:409
+#: modules/gui/macosx/open.m:585 modules/gui/wxwindows/open.cpp:420
 msgid "UDP/RTP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1717 modules/gui/gtk/gtk_interface.c:2032
 #: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:548
-#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/open.m:597 modules/gui/wxwindows/open.cpp:421
 msgid "UDP/RTP Multicast"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1727 modules/gui/gtk/gtk_interface.c:2042
 #: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:549
-#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:411
+#: modules/gui/macosx/open.m:610 modules/gui/wxwindows/open.cpp:422
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1759 modules/gui/gtk/gtk_interface.c:2074
-#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:467
+#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:478
 msgid "URL"
 msgstr ""
 
@@ -3460,10 +3613,6 @@ msgstr ""
 msgid "Satellite"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:1963 modules/gui/gtk/gtk_interface.c:2278
-msgid "Subtitle"
-msgstr ""
-
 #: modules/gui/gtk/gnome_interface.c:2005 modules/gui/gtk/gtk_interface.c:2322
 #: modules/gui/macosx/open.m:175
 msgid "delay"
@@ -3475,7 +3624,7 @@ msgid "fps"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:116
+#: modules/gui/macosx/open.m:172 modules/gui/macosx/output.m:120
 #: modules/gui/wxwindows/open.cpp:201 modules/gui/wxwindows/open.cpp:223
 msgid "Settings..."
 msgstr ""
@@ -3509,12 +3658,12 @@ msgid "Invert"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2333 modules/gui/gtk/preferences.c:382
-#: modules/gui/kde/pluginsbox.cpp:48
+#: modules/gui/kde/pluginsbox.cpp:48 modules/gui/macosx/prefs.m:199
 msgid "Select"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2352 modules/gui/gtk/gtk_interface.c:2754
-#: modules/gui/macosx/playlist.m:179 modules/gui/macosx/playlist.m:183
+#: modules/gui/macosx/playlist.m:195 modules/gui/macosx/playlist.m:199
 msgid "Delete"
 msgstr ""
 
@@ -3522,11 +3671,6 @@ msgstr ""
 msgid "Selection"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:2436 modules/gui/gtk/gtk_interface.c:2857
-#: modules/gui/wxwindows/playlist.cpp:148
-msgid "Duration"
-msgstr ""
-
 #: modules/gui/gtk/gnome_interface.c:2588
 msgid "Jump to: "
 msgstr ""
@@ -3552,14 +3696,14 @@ msgid "Destination Target: "
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2857 modules/gui/gtk/gtk_interface.c:3112
-#: modules/gui/macosx/output.m:128 modules/gui/macosx/output.m:231
-#: modules/gui/macosx/output.m:290 modules/gui/wxwindows/streamout.cpp:342
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/output.m:237
+#: modules/gui/macosx/output.m:296 modules/gui/wxwindows/streamout.cpp:349
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2867 modules/gui/gtk/gtk_interface.c:3122
-#: modules/gui/macosx/output.m:129 modules/gui/macosx/output.m:241
-#: modules/gui/macosx/output.m:292 modules/gui/wxwindows/streamout.cpp:343
+#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:298 modules/gui/wxwindows/streamout.cpp:350
 msgid "RTP"
 msgstr ""
 
@@ -3580,8 +3724,8 @@ msgid "PS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2972 modules/gui/gtk/gtk_interface.c:3217
-#: modules/gui/macosx/output.m:135 modules/gui/macosx/output.m:273
-#: modules/gui/macosx/output.m:319
+#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:279
+#: modules/gui/macosx/output.m:325
 msgid "AVI"
 msgstr ""
 
@@ -3697,10 +3841,10 @@ msgstr ""
 
 #: modules/gui/gtk/gtk_interface.c:2403 modules/gui/gtk/gtk_interface.c:2645
 #: modules/gui/gtk/gtk_interface.c:2876 modules/gui/gtk/gtk_interface.c:3257
-#: modules/gui/gtk/preferences.c:617 modules/gui/macosx/open.m:139
-#: modules/gui/macosx/prefs.m:77 modules/gui/wxwindows/open.cpp:270
-#: modules/gui/wxwindows/preferences.cpp:253
-#: modules/gui/wxwindows/streamout.cpp:197
+#: modules/gui/gtk/preferences.c:618 modules/gui/macosx/open.m:139
+#: modules/gui/macosx/prefs.m:79 modules/gui/wxwindows/open.cpp:270
+#: modules/gui/wxwindows/preferences.cpp:256
+#: modules/gui/wxwindows/streamout.cpp:201
 #: modules/gui/wxwindows/subtitles.cpp:152
 msgid "Cancel"
 msgstr ""
@@ -3772,7 +3916,7 @@ msgstr ""
 msgid "button3"
 msgstr ""
 
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:331
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337
 msgid "Save File"
 msgstr ""
 
@@ -3821,248 +3965,257 @@ msgid "Messages:"
 msgstr ""
 
 #: modules/gui/kde/preferences.cpp:95
-#: modules/gui/wxwindows/preferences.cpp:395
+#: modules/gui/wxwindows/preferences.cpp:398
 msgid "Plugins"
 msgstr ""
 
-#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:315
+#: modules/gui/macosx/about.m:73 modules/gui/macosx/intf.m:339
 msgid "About VLC media player"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:344 modules/gui/macosx/controls.m:487
-#: modules/gui/macosx/intf.m:366
+#: modules/gui/macosx/controls.m:358 modules/gui/macosx/controls.m:699
+#: modules/gui/macosx/intf.m:390
 msgid "Half Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:346 modules/gui/macosx/controls.m:488
-#: modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/controls.m:360 modules/gui/macosx/controls.m:700
+#: modules/gui/macosx/intf.m:391
 msgid "Normal Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:348 modules/gui/macosx/controls.m:489
-#: modules/gui/macosx/intf.m:368
+#: modules/gui/macosx/controls.m:362 modules/gui/macosx/controls.m:701
+#: modules/gui/macosx/intf.m:392
 msgid "Double Size"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:350 modules/gui/macosx/controls.m:491
-#: modules/gui/macosx/controls.m:498 modules/gui/macosx/controls.m:520
-#: modules/gui/macosx/intf.m:371
+#: modules/gui/macosx/controls.m:364 modules/gui/macosx/controls.m:703
+#: modules/gui/macosx/controls.m:710 modules/gui/macosx/intf.m:395
 msgid "Float On Top"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:352 modules/gui/macosx/controls.m:490
-#: modules/gui/macosx/intf.m:369
+#: modules/gui/macosx/controls.m:366 modules/gui/macosx/controls.m:702
+#: modules/gui/macosx/intf.m:393
 msgid "Fit To Screen"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:442 modules/gui/macosx/intf.m:298
-#: modules/gui/macosx/intf.m:342 modules/gui/macosx/intf.m:402
+#: modules/gui/macosx/controls.m:633 modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:382
+msgid "Faster"
+msgstr ""
+
+#: modules/gui/macosx/controls.m:634 modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:380
+msgid "Slower"
+msgstr ""
+
+#: modules/gui/macosx/controls.m:654 modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/intf.m:366 modules/gui/macosx/intf.m:426
 msgid "Previous"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:461 modules/gui/macosx/intf.m:344
+#: modules/gui/macosx/controls.m:673 modules/gui/macosx/intf.m:368
 msgid "Loop"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:468 modules/gui/macosx/intf.m:345
+#: modules/gui/macosx/controls.m:680 modules/gui/macosx/intf.m:369
 msgid "Step Forward"
 msgstr ""
 
-#: modules/gui/macosx/controls.m:469 modules/gui/macosx/intf.m:346
+#: modules/gui/macosx/controls.m:681 modules/gui/macosx/intf.m:370
 msgid "Step Backward"
 msgstr ""
 
-#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:386
-#: modules/gui/macosx/intf.m:411
+#: modules/gui/macosx/info.m:172 modules/gui/macosx/intf.m:410
+#: modules/gui/macosx/intf.m:435
 msgid "Info"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:293
+#: modules/gui/macosx/intf.m:317
 msgid "VLC - Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:305
+#: modules/gui/macosx/intf.m:329 modules/gui/wxwindows/interface.cpp:910
+#: modules/gui/wxwindows/timer.cpp:154
 msgid "Volume"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:306
+#: modules/gui/macosx/intf.m:330
 msgid "Position"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:312
+#: modules/gui/macosx/intf.m:336
 msgid "Open CrashLog"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:316
+#: modules/gui/macosx/intf.m:340
 msgid "Preferences..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:317
+#: modules/gui/macosx/intf.m:341
 msgid "Hide VLC"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:318
+#: modules/gui/macosx/intf.m:342
 msgid "Hide Others"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:319
+#: modules/gui/macosx/intf.m:343
 msgid "Show All"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:320
+#: modules/gui/macosx/intf.m:344
 msgid "Quit VLC"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:322
+#: modules/gui/macosx/intf.m:346
 msgid "1:File"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:347
 msgid "Open..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:324
+#: modules/gui/macosx/intf.m:348
 msgid "Open File..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:325
+#: modules/gui/macosx/intf.m:349
 msgid "Open Disc..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:350
 msgid "Open Network..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:327
+#: modules/gui/macosx/intf.m:351
 msgid "Open Recent"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:328 modules/gui/macosx/intf.m:1291
+#: modules/gui/macosx/intf.m:352 modules/gui/macosx/intf.m:1205
 msgid "Clear Menu"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:331
+#: modules/gui/macosx/intf.m:355
 msgid "Cut"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:332
+#: modules/gui/macosx/intf.m:356
 msgid "Copy"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:333
+#: modules/gui/macosx/intf.m:357
 msgid "Paste"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:334
+#: modules/gui/macosx/intf.m:358
 msgid "Clear"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:337
+#: modules/gui/macosx/intf.m:361
 msgid "Controls"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:358 modules/gui/macosx/intf.m:359
-msgid "Audio Track"
-msgstr ""
-
-#: modules/gui/macosx/intf.m:372 modules/gui/macosx/intf.m:373
-msgid "Video Track"
+#: modules/gui/macosx/intf.m:398 modules/gui/macosx/intf.m:399
+#: modules/gui/macosx/macosx.m:47 modules/gui/macosx/vout.m:188
+msgid "Video device"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:382
+#: modules/gui/macosx/intf.m:406
 msgid "Minimize Window"
 msgstr "Minimise Window"
 
-#: modules/gui/macosx/intf.m:383
+#: modules/gui/macosx/intf.m:407
 msgid "Close Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:384
+#: modules/gui/macosx/intf.m:408
 msgid "Controller"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:389
+#: modules/gui/macosx/intf.m:413
 msgid "Bring All to Front"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:391
+#: modules/gui/macosx/intf.m:415
 msgid "Help"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:392
+#: modules/gui/macosx/intf.m:416
 msgid "ReadMe..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:393
+#: modules/gui/macosx/intf.m:417
 msgid "Online Documentation"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/intf.m:418
 msgid "Report a Bug"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/intf.m:419
 msgid "VideoLAN Website"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:396
+#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1198
 msgid "License"
 msgstr "Licence"
 
-#: modules/gui/macosx/intf.m:405
+#: modules/gui/macosx/intf.m:429
 msgid "Error"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:406
+#: modules/gui/macosx/intf.m:430
 msgid ""
 "An error has occurred which probably prevented the execution of your request:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:407
+#: modules/gui/macosx/intf.m:431
 msgid "If you believe that it is a bug, please follow the instructions at:"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:408
+#: modules/gui/macosx/intf.m:432
 msgid "Open Messages Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:409
+#: modules/gui/macosx/intf.m:433
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1162
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1254
+#: modules/gui/macosx/intf.m:1162
 msgid ""
 "Either you are running Mac OS X pre 10.2 or you haven't experienced any "
 "heavy crashes yet."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:47 modules/gui/macosx/vout.m:188
-msgid "Video device"
+#: modules/gui/macosx/macosx.m:48
+msgid ""
+"Choose a number corresponding to a screen in you video device selection menu "
+"and this screen will be used by default as the screen for 'fullscreen'."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:49
+#: modules/gui/macosx/macosx.m:52
 msgid "Opaqueness"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:51
+#: modules/gui/macosx/macosx.m:54
 msgid ""
 "Set the transparency of the video output. 1 is non-transparent (default) 0 "
 "is fully transparent."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:54
-msgid "Altijd op de Voorgrond"
+#: modules/gui/macosx/macosx.m:57
+msgid "Always float on top"
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:56
+#: modules/gui/macosx/macosx.m:59
 msgid "Let the video window float on top of other windows."
 msgstr ""
 
-#: modules/gui/macosx/macosx.m:59
+#: modules/gui/macosx/macosx.m:62
 msgid "MacOS X interface, sound and video"
 msgstr ""
 
@@ -4109,73 +4262,79 @@ msgstr ""
 msgid "Open VIDEO_TS Directory"
 msgstr ""
 
-#: modules/gui/macosx/output.m:115
+#: modules/gui/macosx/output.m:119
 msgid "Advanced output:"
 msgstr ""
 
-#: modules/gui/macosx/output.m:119
+#: modules/gui/macosx/output.m:123
 msgid "Output Options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:122 modules/gui/macosx/output.m:210
-#: modules/gui/macosx/output.m:285
+#: modules/gui/macosx/output.m:126 modules/gui/macosx/output.m:216
+#: modules/gui/macosx/output.m:291
 msgid "Stream"
 msgstr ""
 
-#: modules/gui/macosx/output.m:126
+#: modules/gui/macosx/output.m:130
 msgid "TTL"
 msgstr ""
 
-#: modules/gui/macosx/output.m:132 modules/gui/wxwindows/streamout.cpp:437
+#: modules/gui/macosx/output.m:136 modules/gui/wxwindows/streamout.cpp:446
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/output.m:133
+#: modules/gui/macosx/output.m:137
 msgid "MPEG TS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:134 modules/gui/macosx/output.m:275
-#: modules/gui/macosx/output.m:317
+#: modules/gui/macosx/output.m:138 modules/gui/macosx/output.m:281
+#: modules/gui/macosx/output.m:323
 msgid "MPEG PS"
 msgstr ""
 
-#: modules/gui/macosx/output.m:136 modules/gui/macosx/output.m:274
-#: modules/gui/macosx/output.m:321
+#: modules/gui/macosx/output.m:140 modules/gui/macosx/output.m:280
+#: modules/gui/macosx/output.m:327
 msgid "Ogg"
 msgstr ""
 
-#: modules/gui/macosx/output.m:137 modules/gui/macosx/output.m:276
-#: modules/gui/macosx/output.m:323
-msgid "mp4"
+#: modules/gui/macosx/output.m:143
+msgid "Transcode options"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139
-msgid "Transcode options"
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:158
+#: modules/gui/wxwindows/streamout.cpp:521
+#: modules/gui/wxwindows/streamout.cpp:558
+msgid "Bitrate (kb/s)"
 msgstr ""
 
-#: modules/gui/macosx/output.m:149 modules/gui/macosx/output.m:153
-msgid "Bitrate (bps)"
+#: modules/gui/macosx/output.m:282 modules/gui/macosx/output.m:329
+msgid "mp4"
 msgstr ""
 
-#: modules/gui/macosx/output.m:151
-msgid "mpga"
+#: modules/gui/macosx/prefs.m:80 modules/gui/wxwindows/preferences.cpp:259
+msgid "Reset All"
 msgstr ""
 
-#: modules/gui/macosx/output.m:152
-msgid "a52 "
+#: modules/gui/macosx/prefs.m:81
+msgid "Advanced"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:78 modules/gui/wxwindows/preferences.cpp:256
-msgid "Reset All"
+#: modules/gui/macosx/prefs.m:170
+msgid "Reset Preferences"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:79
-msgid "Advanced"
+#: modules/gui/macosx/prefs.m:172 modules/gui/wxwindows/preferences.cpp:316
+msgid ""
+"Beware this will reset your VLC Media Player config file.\n"
+"Are you sure you want to continue?"
 msgstr ""
 
-#: modules/gui/macosx/prefs.m:143 modules/gui/macosx/prefs.m:341
-#: modules/gui/macosx/prefs.m:368
-msgid "Auto"
+#: modules/gui/macosx/prefs.m:198
+msgid "Select file or directory"
+msgstr ""
+
+#: modules/gui/macosx/prefs.m:408 modules/gui/wxwindows/preferences.cpp:767
+msgid "Default"
 msgstr ""
 
 #: modules/gui/ncurses/ncurses.c:66
@@ -4190,32 +4349,32 @@ msgstr ""
 msgid "Qt interface"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:251
-#: modules/gui/skins/src/vlcproc.cpp:338
+#: modules/gui/skins/src/dialogs.cpp:363
+#: modules/gui/skins/src/skin_main.cpp:300
 msgid "Open a skin file"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:292
-#: modules/gui/skins/src/skin_main.cpp:293
+#: modules/gui/skins/src/skin_main.cpp:349
+#: modules/gui/skins/src/skin_main.cpp:350
 msgid "Last skin actually used"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:294
-#: modules/gui/skins/src/skin_main.cpp:295
+#: modules/gui/skins/src/skin_main.cpp:351
+#: modules/gui/skins/src/skin_main.cpp:352
 msgid "Config of last used skin"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:296
-#: modules/gui/skins/src/skin_main.cpp:297
+#: modules/gui/skins/src/skin_main.cpp:353
+#: modules/gui/skins/src/skin_main.cpp:354
 msgid "Show application in system tray"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:298
-#: modules/gui/skins/src/skin_main.cpp:299
+#: modules/gui/skins/src/skin_main.cpp:355
+#: modules/gui/skins/src/skin_main.cpp:356
 msgid "Show application in taskbar"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:310
+#: modules/gui/skins/src/skin_main.cpp:367
 msgid "Skinnable Interface"
 msgstr ""
 
@@ -4223,164 +4382,164 @@ msgstr ""
 msgid "FileInfo"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:231
+#: modules/gui/wxwindows/interface.cpp:254
 msgid "Open a DVD or (S)VCD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:232
+#: modules/gui/wxwindows/interface.cpp:255
 msgid "Open a network stream"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:233
+#: modules/gui/wxwindows/interface.cpp:256
 msgid "Open a satellite stream"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:234
+#: modules/gui/wxwindows/interface.cpp:257
 msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:235
+#: modules/gui/wxwindows/interface.cpp:258
 msgid "Exit this program"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:237
+#: modules/gui/wxwindows/interface.cpp:260
 msgid "Open the playlist"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:238
+#: modules/gui/wxwindows/interface.cpp:261
 msgid "Show the program logs"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:239
+#: modules/gui/wxwindows/interface.cpp:262
 msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:241
+#: modules/gui/wxwindows/interface.cpp:264
 msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:243
+#: modules/gui/wxwindows/interface.cpp:266
 msgid "About this program"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:247
+#: modules/gui/wxwindows/interface.cpp:270
 msgid "&Open File..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:249
+#: modules/gui/wxwindows/interface.cpp:272
 msgid "Open &Disc..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:251
+#: modules/gui/wxwindows/interface.cpp:274
 msgid "&Network Stream..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:254
+#: modules/gui/wxwindows/interface.cpp:277
 msgid "&Satellite Stream..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:259
+#: modules/gui/wxwindows/interface.cpp:282
 msgid "&Eject Disc"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:263
+#: modules/gui/wxwindows/interface.cpp:286
 msgid "E&xit"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:267
+#: modules/gui/wxwindows/interface.cpp:290
 msgid "&Playlist..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:269
-msgid "&Logs..."
+#: modules/gui/wxwindows/interface.cpp:292
+msgid "&Messages..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:270
+#: modules/gui/wxwindows/interface.cpp:293
 msgid "&File info..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:275
+#: modules/gui/wxwindows/interface.cpp:298
 msgid "&Preferences..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:292
+#: modules/gui/wxwindows/interface.cpp:315
 msgid "&About..."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:296
+#: modules/gui/wxwindows/interface.cpp:319
 msgid "&File"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:297
+#: modules/gui/wxwindows/interface.cpp:320
 msgid "&View"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:298
+#: modules/gui/wxwindows/interface.cpp:321
 msgid "&Settings"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:299
-#: modules/gui/wxwindows/interface.cpp:476
-#: modules/gui/wxwindows/interface.cpp:524
+#: modules/gui/wxwindows/interface.cpp:322
+#: modules/gui/wxwindows/interface.cpp:509
+#: modules/gui/wxwindows/interface.cpp:557
 msgid "&Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:300
-#: modules/gui/wxwindows/interface.cpp:495
+#: modules/gui/wxwindows/interface.cpp:323
 #: modules/gui/wxwindows/interface.cpp:528
+#: modules/gui/wxwindows/interface.cpp:561
 msgid "&Video"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:301
-#: modules/gui/wxwindows/interface.cpp:514
-#: modules/gui/wxwindows/interface.cpp:532
+#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:547
+#: modules/gui/wxwindows/interface.cpp:565
 msgid "&Navigation"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:325
 msgid "&Help"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:318
+#: modules/gui/wxwindows/interface.cpp:341
 msgid "Stop current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:319
+#: modules/gui/wxwindows/interface.cpp:342
 msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:320
+#: modules/gui/wxwindows/interface.cpp:343
 msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:321
+#: modules/gui/wxwindows/interface.cpp:344
 #: modules/gui/wxwindows/playlist.cpp:351
 msgid "Open playlist"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:322
+#: modules/gui/wxwindows/interface.cpp:345
 msgid "Previous playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:323
+#: modules/gui/wxwindows/interface.cpp:346
 msgid "Next playlist item"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:347
 msgid "Play slower"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:348
 msgid "Play faster"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:560
+#: modules/gui/wxwindows/interface.cpp:592
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:561
+#: modules/gui/wxwindows/interface.cpp:593
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
@@ -4388,41 +4547,45 @@ msgstr ""
 "© 1996-2003 the VideoLAN team\n"
 "\n"
 
-#: modules/gui/wxwindows/interface.cpp:562
+#: modules/gui/wxwindows/interface.cpp:594
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:564
+#: modules/gui/wxwindows/interface.cpp:596
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player.\n"
 "It can play MPEG and MPEG2 files from a file or from a network source."
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:568
+#: modules/gui/wxwindows/interface.cpp:600
 #, c-format
 msgid "About %s"
 msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:107
+#: modules/gui/wxwindows/menus.cpp:111
 msgid "Audio menu"
 msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:123
+#: modules/gui/wxwindows/menus.cpp:127
 msgid "Video menu"
 msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:139
+#: modules/gui/wxwindows/menus.cpp:145
 msgid "Input menu"
 msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:329
+#: modules/gui/wxwindows/menus.cpp:173
+msgid "Close Menu"
+msgstr ""
+
+#: modules/gui/wxwindows/menus.cpp:337
 msgid "Empty"
 msgstr ""
 
-#: modules/gui/wxwindows/messages.cpp:107
+#: modules/gui/wxwindows/messages.cpp:106
 msgid "Verbose"
 msgstr ""
 
@@ -4453,15 +4616,15 @@ msgstr ""
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:361
+#: modules/gui/wxwindows/open.cpp:372
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:364
+#: modules/gui/wxwindows/open.cpp:375
 msgid "CD Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:837 modules/gui/wxwindows/streamout.cpp:640
+#: modules/gui/wxwindows/open.cpp:854 modules/gui/wxwindows/streamout.cpp:649
 msgid "Save file"
 msgstr ""
 
@@ -4509,69 +4672,54 @@ msgstr ""
 msgid "Save playlist"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:313
-msgid ""
-"Beware this will reset your VLC Media Player config file.\n"
-"Are you sure you want to continue?"
-msgstr ""
-
-#: modules/gui/wxwindows/preferences.cpp:315
+#: modules/gui/wxwindows/preferences.cpp:318
 msgid "Reset config file"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:718
-msgid "Default"
-msgstr ""
-
-#: modules/gui/wxwindows/preferences.cpp:844
+#: modules/gui/wxwindows/preferences.cpp:898
 msgid "No configuration options available"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:865
-msgid "Advanced..."
+#: modules/gui/wxwindows/preferences.cpp:919
+msgid "Advanced options"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:166
+#: modules/gui/wxwindows/streamout.cpp:170
 msgid "Stream output MRL"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:170
+#: modules/gui/wxwindows/streamout.cpp:174
 msgid "Destination Target:"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:173
+#: modules/gui/wxwindows/streamout.cpp:177
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:333
+#: modules/gui/wxwindows/streamout.cpp:340
 msgid "Output Methods"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:339
+#: modules/gui/wxwindows/streamout.cpp:346
 msgid "Play locally"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:363
+#: modules/gui/wxwindows/streamout.cpp:370
 msgid "Filename"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:475
+#: modules/gui/wxwindows/streamout.cpp:484
 msgid "Transcoding options"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:506
+#: modules/gui/wxwindows/streamout.cpp:515
 msgid "Video codec"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:512
-#: modules/gui/wxwindows/streamout.cpp:549
-msgid "Bitrate (kb/s)"
-msgstr ""
-
-#: modules/gui/wxwindows/streamout.cpp:543
+#: modules/gui/wxwindows/streamout.cpp:552
 msgid "Audio codec"
 msgstr ""
 
@@ -4621,30 +4769,26 @@ msgid ""
 msgstr ""
 
 #: modules/misc/dummy/dummy.c:53
-msgid "dummy functions"
-msgstr ""
-
-#: modules/misc/dummy/dummy.c:56
 msgid "dummy interface function"
 msgstr ""
 
-#: modules/misc/dummy/dummy.c:64
+#: modules/misc/dummy/dummy.c:62
 msgid "dummy access function"
 msgstr ""
 
-#: modules/misc/dummy/dummy.c:68
+#: modules/misc/dummy/dummy.c:66
 msgid "dummy demux function"
 msgstr ""
 
-#: modules/misc/dummy/dummy.c:72
+#: modules/misc/dummy/dummy.c:70
 msgid "dummy decoder function"
 msgstr ""
 
-#: modules/misc/dummy/dummy.c:76
+#: modules/misc/dummy/dummy.c:74
 msgid "dummy audio output function"
 msgstr ""
 
-#: modules/misc/dummy/dummy.c:80
+#: modules/misc/dummy/dummy.c:78
 msgid "dummy video output function"
 msgstr ""
 
@@ -4709,15 +4853,25 @@ msgstr ""
 msgid "IPv4 network abstraction layer"
 msgstr ""
 
-#: modules/misc/network/ipv6.c:80
+#: modules/misc/network/ipv6.c:86
 msgid "IPv6 network abstraction layer"
 msgstr ""
 
 #: modules/misc/qte_main.cpp:66
+msgid "Run as standalone Qt/Embedded Gui Server"
+msgstr ""
+
+#: modules/misc/qte_main.cpp:67
+msgid ""
+"Use this option to run as standalone Qt/Embedded Gui Server. This option is "
+"equivalent to the -qws option from normal Qt."
+msgstr ""
+
+#: modules/misc/qte_main.cpp:71
 msgid "Qt Embedded GUI helper"
 msgstr ""
 
-#: modules/misc/sap.c:134
+#: modules/misc/sap.c:161
 msgid "SAP interface"
 msgstr ""
 
@@ -4757,7 +4911,7 @@ msgstr ""
 msgid "TS muxer (libdvbpsi)"
 msgstr ""
 
-#: modules/mux/ogg.c:54
+#: modules/mux/ogg.c:55
 msgid "Ogg/ogm muxer"
 msgstr ""
 
@@ -4781,10 +4935,14 @@ msgstr "MPEG4 Video packetiser"
 msgid "MPEG-I/II audio packetizer"
 msgstr "MPEG-I/II audio packetiser"
 
-#: modules/packetizer/mpegvideo.c:73
+#: modules/packetizer/mpegvideo.c:88
 msgid "MPEG-I/II video packetizer"
 msgstr "MPEG-I/II video packetiser"
 
+#: modules/packetizer/vorbis.c:89
+msgid "Vorbis audio packetizer"
+msgstr "Vorbis audio packetiser"
+
 #: modules/stream_out/display.c:50
 msgid "Display stream"
 msgstr ""
@@ -4801,11 +4959,11 @@ msgstr ""
 msgid "ES stream"
 msgstr ""
 
-#: modules/stream_out/standard.c:49
+#: modules/stream_out/standard.c:51
 msgid "Standard stream"
 msgstr ""
 
-#: modules/stream_out/transcode.c:63
+#: modules/stream_out/transcode.c:68
 msgid "Transcode stream"
 msgstr ""
 
@@ -4838,7 +4996,7 @@ msgid "Set image contrast"
 msgstr ""
 
 #: modules/video_filter/adjust.c:61
-msgid "Set the image contrast. Defaults to 1"
+msgid "Set the image contrast, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:62
@@ -4854,7 +5012,7 @@ msgid "Set image saturation"
 msgstr ""
 
 #: modules/video_filter/adjust.c:65
-msgid "Set the image saturation. Defaults to 1"
+msgid "Set the image saturation, between 0 and 3. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:66
@@ -4862,7 +5020,7 @@ msgid "Set image brightness"
 msgstr ""
 
 #: modules/video_filter/adjust.c:67
-msgid "Set the image brightness. Defaults to 1"
+msgid "Set the image brightness, between 0 and 2. Defaults to 1"
 msgstr ""
 
 #: modules/video_filter/adjust.c:71
@@ -4902,7 +5060,9 @@ msgid "Crop geometry"
 msgstr ""
 
 #: modules/video_filter/crop.c:55
-msgid "Set the geometry of the zone to crop"
+msgid ""
+"Set the geometry of the zone to crop. This is set as width x heigth + left "
+"offset + top offset."
 msgstr ""
 
 #: modules/video_filter/crop.c:57
@@ -4961,27 +5121,27 @@ msgstr ""
 msgid "motion blur filter"
 msgstr ""
 
-#: modules/video_filter/osd_text.c:66 modules/visualization/xosd/xosd.c:71
+#: modules/video_filter/osd_text.c:64 modules/visualization/xosd/xosd.c:71
 msgid "Font"
 msgstr ""
 
-#: modules/video_filter/osd_text.c:67
+#: modules/video_filter/osd_text.c:65
 msgid "Filename of Font"
 msgstr ""
 
-#: modules/video_filter/osd_text.c:68
+#: modules/video_filter/osd_text.c:66
 msgid "Font size"
 msgstr ""
 
-#: modules/video_filter/osd_text.c:69
+#: modules/video_filter/osd_text.c:67
 msgid "The size of the fonts used by the osd module"
 msgstr ""
 
-#: modules/video_filter/osd_text.c:72
+#: modules/video_filter/osd_text.c:70
 msgid "OSD"
 msgstr ""
 
-#: modules/video_filter/osd_text.c:75
+#: modules/video_filter/osd_text.c:73
 msgid "osd text filter"
 msgstr ""
 
@@ -5171,11 +5331,21 @@ msgstr ""
 msgid "Use shared memory to communicate between VLC and the X server."
 msgstr ""
 
-#: modules/video_output/x11/x11.c:62
+#: modules/video_output/x11/x11.c:61 modules/video_output/x11/xvideo.c:72
+msgid "choose the screen to be used for fullscreen mode."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:63 modules/video_output/x11/xvideo.c:74
+msgid ""
+"Choose the screen you want to use in fullscreen mode. For instance set it to "
+"0 for first screen, 1 for the second."
+msgstr ""
+
+#: modules/video_output/x11/x11.c:67
 msgid "X11"
 msgstr ""
 
-#: modules/video_output/x11/x11.c:68
+#: modules/video_output/x11/x11.c:76
 msgid "X11 video output"
 msgstr ""
 
@@ -5199,11 +5369,11 @@ msgid ""
 "to improve performances by using the most efficient one."
 msgstr ""
 
-#: modules/video_output/x11/xvideo.c:73
+#: modules/video_output/x11/xvideo.c:78
 msgid "XVideo"
 msgstr ""
 
-#: modules/video_output/x11/xvideo.c:81
+#: modules/video_output/x11/xvideo.c:90
 msgid "XVideo extension video output"
 msgstr ""
 
@@ -5239,11 +5409,11 @@ msgstr ""
 msgid "Font used to display text in the xosd output"
 msgstr ""
 
-#: modules/visualization/xosd/xosd.c:76
+#: modules/visualization/xosd/xosd.c:75
 msgid "XOSD module"
 msgstr ""
 
-#: modules/visualization/xosd/xosd.c:83
+#: modules/visualization/xosd/xosd.c:82
 msgid "xosd interface"
 msgstr ""