* bootstrap:

[vlc] / po / vlc.pot

diff --git a/po/vlc.pot b/po/vlc.pot
index 47efc05c379c3dcaa5bc1b880be94c56596db86e..e984b3fedd0b4614506916918d0214f9d10f645f 100644 (file)
--- a/po/vlc.pot
+++ b/po/vlc.pot
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-05-19 23:01+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2003-07-16 17:11+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,21 +16,22 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\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:173 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
+#: modules/audio_output/sdl.c:198 modules/audio_output/waveout.c:386
 msgid "Stereo"
 msgstr ""
 
@@ -114,44 +116,45 @@ 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/win32/strings.cpp:85
+#: modules/gui/macosx/intf.m:371 modules/gui/macosx/intf.m:372
 msgid "Program"
 msgstr ""
 
 #: src/input/input_programs.c:98 modules/demux/asf/libasf.c:696
-#: modules/gui/beos/MediaControlView.cpp:1258
+#: modules/demux/mkv.cpp:2394 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:381
+#: 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:387
+#: 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 ""
 
 #: src/input/input_programs.c:106 modules/gui/beos/InterfaceWindow.cpp:271
-#: modules/gui/win32/strings.cpp:84
 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 ""
 
@@ -181,7 +184,7 @@ msgstr ""
 msgid "Previous Chapter"
 msgstr ""
 
-#: src/input/input_programs.c:668
+#: src/input/input_programs.c:668 src/video_output/video_output.c:407
 msgid "Disable"
 msgstr ""
 
@@ -190,48 +193,48 @@ msgstr ""
 msgid "Track %i"
 msgstr ""
 
-#: src/libvlc.c:255 src/libvlc.c:342
+#: src/libvlc.c:262 src/libvlc.c:349
 msgid "C"
 msgstr ""
 
-#: src/libvlc.c:298 src/libvlc.c:1351
+#: src/libvlc.c:305 src/libvlc.c:1368
 #, c-format
 msgid ""
 "Usage: %s [options] [items]...\n"
 "\n"
 msgstr ""
 
-#: src/libvlc.c:1183 src/misc/configuration.c:961
+#: src/libvlc.c:1200 src/misc/configuration.c:965
 msgid "string"
 msgstr ""
 
-#: src/libvlc.c:1200 src/misc/configuration.c:946
+#: src/libvlc.c:1217 src/misc/configuration.c:946
 msgid "integer"
 msgstr ""
 
-#: src/libvlc.c:1203 src/misc/configuration.c:953
+#: src/libvlc.c:1220 src/misc/configuration.c:955
 msgid "float"
 msgstr ""
 
-#: src/libvlc.c:1209
+#: src/libvlc.c:1226
 msgid " (default enabled)"
 msgstr ""
 
-#: src/libvlc.c:1210
+#: src/libvlc.c:1227
 msgid " (default disabled)"
 msgstr ""
 
-#: src/libvlc.c:1326 src/libvlc.c:1381 src/libvlc.c:1405
+#: 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:1354
+#: src/libvlc.c:1371
 msgid "[module]              [description]\n"
 msgstr ""
 
-#: src/libvlc.c:1399
+#: 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"
@@ -239,306 +242,296 @@ msgid ""
 "Written by the VideoLAN team at Ecole Centrale, Paris.\n"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: 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
-#: modules/gui/win32/strings.cpp:86
+#: 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 ""
 
-#: 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."
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: src/libvlc.h:146
+#: src/libvlc.h:149
 msgid "Enable video"
 msgstr ""
 
-#: src/libvlc.h:148
-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."
-msgstr ""
-
 #: src/libvlc.h:151
-msgid "Display identifier"
-msgstr ""
-
-#: src/libvlc.h:153
 msgid ""
-"This is the local display port that will be used for X11 drawing. For "
-"instance :0.1."
+"You can completely disable the video output. In this case the video decoding "
+"stage will not take place, which will save some processing power."
 msgstr ""
 
-#: src/libvlc.h:156
+#: src/libvlc.h:154
 msgid "Video width"
 msgstr ""
 
-#: src/libvlc.h:158
+#: 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:161
+#: src/libvlc.h:159
 msgid "Video height"
 msgstr ""
 
-#: src/libvlc.h:163
+#: 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:166
+#: src/libvlc.h:164
 msgid "Zoom video"
 msgstr ""
 
-#: src/libvlc.h:168
+#: src/libvlc.h:166
 msgid "You can zoom the video by the specified factor."
 msgstr ""
 
-#: src/libvlc.h:170
+#: src/libvlc.h:168
 msgid "Grayscale video output"
 msgstr ""
 
-#: src/libvlc.h:172
+#: 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)."
 msgstr ""
 
-#: src/libvlc.h:175
+#: src/libvlc.h:173
 msgid "Fullscreen video output"
 msgstr ""
 
-#: src/libvlc.h:177
+#: src/libvlc.h:175
 msgid ""
 "If this option is enabled, VLC will always start a video in fullscreen mode."
 msgstr ""
 
-#: src/libvlc.h:180
+#: src/libvlc.h:178
 msgid "Overlay video output"
 msgstr ""
 
-#: src/libvlc.h:182
+#: 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:185
+#: src/libvlc.h:183
 msgid "Force SPU position"
 msgstr ""
 
-#: src/libvlc.h:187
+#: 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:190
+#: src/libvlc.h:188
 msgid "Video filter module"
 msgstr ""
 
-#: src/libvlc.h:192
+#: 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:196
+#: src/libvlc.h:194
 msgid "Source aspect ratio"
 msgstr ""
 
-#: src/libvlc.h:198
+#: 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 "
@@ -547,11 +540,11 @@ msgid ""
 "(1.25, 1.3333, etc.) expressing pixel squareness."
 msgstr ""
 
-#: src/libvlc.h:206
+#: src/libvlc.h:204
 msgid "Destination aspect ratio"
 msgstr ""
 
-#: src/libvlc.h:208
+#: 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 "
@@ -560,128 +553,129 @@ msgid ""
 "squareness."
 msgstr ""
 
-#: src/libvlc.h:215
+#: src/libvlc.h:213
 msgid "Server port"
 msgstr ""
 
-#: src/libvlc.h:217
+#: src/libvlc.h:215
 msgid "This is the port used for UDP streams. By default, we chose 1234."
 msgstr ""
 
-#: src/libvlc.h:219
+#: src/libvlc.h:217
 msgid "MTU of the network interface"
 msgstr ""
 
-#: src/libvlc.h:221
+#: 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:224
+#: src/libvlc.h:222
 msgid "Network interface address"
 msgstr ""
 
-#: src/libvlc.h:226
+#: 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:230
+#: src/libvlc.h:228
 msgid "Time to live"
 msgstr ""
 
-#: src/libvlc.h:232
+#: src/libvlc.h:230
 msgid ""
 "Indicate here the Time To Live of the multicast packets sent by the stream "
 "output."
 msgstr ""
 
-#: src/libvlc.h:235
+#: src/libvlc.h:233
 msgid "Choose program (SID)"
 msgstr ""
 
-#: src/libvlc.h:237
+#: src/libvlc.h:235
 msgid "Choose the program to select by giving its Service ID."
 msgstr ""
 
-#: src/libvlc.h:239
+#: src/libvlc.h:237
 msgid "Choose audio"
 msgstr ""
 
-#: src/libvlc.h:241
-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:243
+#: src/libvlc.h:242
 msgid "Choose channel"
 msgstr ""
 
-#: src/libvlc.h:245
+#: 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:248
+#: src/libvlc.h:247
 msgid "Choose subtitles"
 msgstr ""
 
-#: src/libvlc.h:250
+#: 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:253
+#: src/libvlc.h:252
 msgid "DVD device"
 msgstr ""
 
-#: src/libvlc.h:256
+#: 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:260
+#: src/libvlc.h:259
 msgid "This is the default DVD device to use."
 msgstr ""
 
-#: src/libvlc.h:263
+#: src/libvlc.h:262
 msgid "VCD device"
 msgstr ""
 
-#: src/libvlc.h:265
+#: src/libvlc.h:264
 msgid "This is the default VCD device to use."
 msgstr ""
 
-#: src/libvlc.h:267
+#: src/libvlc.h:266
 msgid "Force IPv6"
 msgstr ""
 
-#: src/libvlc.h:269
+#: 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:272
+#: src/libvlc.h:271
 msgid "Force IPv4"
 msgstr ""
 
-#: src/libvlc.h:274
+#: 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:277
+#: src/libvlc.h:276
 msgid "Choose preferred codec list"
 msgstr ""
 
-#: src/libvlc.h:279
+#: 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. "
@@ -690,236 +684,228 @@ msgid ""
 "sure there is a fallback for the types you didn't specify."
 msgstr ""
 
-#: src/libvlc.h:286
+#: src/libvlc.h:285
 msgid "Choose preferred video encoder list"
 msgstr ""
 
-#: src/libvlc.h:288 src/libvlc.h:292
+#: 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:290
+#: src/libvlc.h:289
 msgid "Choose preferred audio encoder list"
 msgstr ""
 
-#: src/libvlc.h:295
+#: src/libvlc.h:294
 msgid "Choose a stream output"
 msgstr ""
 
-#: src/libvlc.h:297
+#: src/libvlc.h:296
 msgid "Empty if no stream output."
 msgstr ""
 
-#: src/libvlc.h:299
+#: src/libvlc.h:298
 msgid "Display while streaming"
 msgstr ""
 
-#: src/libvlc.h:301
+#: src/libvlc.h:300
 msgid "This allows you to play the stream while streaming it."
 msgstr ""
 
-#: src/libvlc.h:303
+#: src/libvlc.h:302
 msgid "Enable video stream output"
 msgstr ""
 
-#: src/libvlc.h:305 src/libvlc.h:318
+#: 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:308
+#: src/libvlc.h:307
 msgid "Video encoding codec"
 msgstr ""
 
-#: src/libvlc.h:310
+#: src/libvlc.h:309
 msgid "This allows you to force video encoding"
 msgstr ""
 
-#: src/libvlc.h:312
+#: src/libvlc.h:311
 msgid "Video bitrate encoding (kB/s)"
 msgstr ""
 
-#: src/libvlc.h:314
+#: src/libvlc.h:313
 msgid "This allows you to specify video bitrate in kB/s."
 msgstr ""
 
-#: src/libvlc.h:316
+#: src/libvlc.h:315
 msgid "Enable audio stream output"
 msgstr ""
 
-#: src/libvlc.h:321
+#: src/libvlc.h:320
 msgid "Audio encoding codec"
 msgstr ""
 
-#: src/libvlc.h:323
+#: src/libvlc.h:322
 msgid "This allows you to force audio encoding"
 msgstr ""
 
-#: src/libvlc.h:325
+#: src/libvlc.h:324
 msgid "Audio bitrate encoding (kB/s)"
 msgstr ""
 
-#: src/libvlc.h:327
+#: src/libvlc.h:326
 msgid "This allows you to specify audio bitrate in kB/s."
 msgstr ""
 
-#: src/libvlc.h:329
+#: src/libvlc.h:328
 msgid "Choose preferred packetizer list"
 msgstr ""
 
-#: src/libvlc.h:331
+#: src/libvlc.h:330
 msgid ""
 "This allows you to select the order in which VLC will choose its packetizers."
 msgstr ""
 
-#: src/libvlc.h:334
+#: src/libvlc.h:333
 msgid "Mux module"
 msgstr ""
 
-#: src/libvlc.h:336
+#: src/libvlc.h:335
 msgid "This is a legacy entry to let you configure mux modules"
 msgstr ""
 
-#: src/libvlc.h:338
+#: src/libvlc.h:337
 msgid "Access output module"
 msgstr ""
 
-#: src/libvlc.h:340
+#: src/libvlc.h:339
 msgid "This is a legacy entry to let you configure access output modules"
 msgstr ""
 
-#: src/libvlc.h:343
+#: src/libvlc.h:342
 msgid "Enable CPU MMX support"
 msgstr ""
 
-#: src/libvlc.h:345
+#: src/libvlc.h:344
 msgid ""
 "If your processor supports the MMX instructions set, VLC can take advantage "
 "of them."
 msgstr ""
 
-#: src/libvlc.h:348
+#: src/libvlc.h:347
 msgid "Enable CPU 3D Now! support"
 msgstr ""
 
-#: src/libvlc.h:350
+#: src/libvlc.h:349
 msgid ""
 "If your processor supports the 3D Now! instructions set, VLC can take "
 "advantage of them."
 msgstr ""
 
-#: src/libvlc.h:353
+#: src/libvlc.h:352
 msgid "Enable CPU MMX EXT support"
 msgstr ""
 
-#: src/libvlc.h:355
+#: src/libvlc.h:354
 msgid ""
 "If your processor supports the MMX EXT instructions set, VLC can take "
 "advantage of them."
 msgstr ""
 
-#: src/libvlc.h:358
+#: src/libvlc.h:357
 msgid "Enable CPU SSE support"
 msgstr ""
 
-#: src/libvlc.h:360
+#: src/libvlc.h:359
 msgid ""
 "If your processor supports the SSE instructions set, VLC can take advantage "
 "of them."
 msgstr ""
 
-#: src/libvlc.h:363
+#: src/libvlc.h:362
 msgid "Enable CPU AltiVec support"
 msgstr ""
 
-#: src/libvlc.h:365
+#: src/libvlc.h:364
 msgid ""
 "If your processor supports the AltiVec instructions set, VLC can take "
 "advantage of them."
 msgstr ""
 
-#: src/libvlc.h:368
+#: src/libvlc.h:367
 msgid "Play files randomly forever"
 msgstr ""
 
-#: src/libvlc.h:370
+#: src/libvlc.h:369
 msgid ""
 "When selected, VLC will randomly play files in the playlist until "
 "interrupted."
 msgstr ""
 
-#: src/libvlc.h:373
-msgid "Launch playlist on startup"
-msgstr ""
-
-#: src/libvlc.h:375
-msgid "If you want VLC to start playing on startup, then enable this option."
-msgstr ""
-
-#: src/libvlc.h:377
+#: src/libvlc.h:372
 msgid "Enqueue items in playlist"
 msgstr ""
 
-#: src/libvlc.h:379
+#: 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:382
+#: src/libvlc.h:377
 msgid "Loop playlist on end"
 msgstr ""
 
-#: src/libvlc.h:384
+#: src/libvlc.h:379
 msgid ""
 "If you want VLC to keep playing the playlist indefinitely then enable this "
 "option."
 msgstr ""
 
-#: src/libvlc.h:387
+#: src/libvlc.h:382
 msgid "Memory copy module"
 msgstr ""
 
-#: src/libvlc.h:389
+#: 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:392
+#: src/libvlc.h:387
 msgid "Access module"
 msgstr ""
 
-#: src/libvlc.h:394
+#: src/libvlc.h:389
 msgid "This is a legacy entry to let you configure access modules"
 msgstr ""
 
-#: src/libvlc.h:396
+#: src/libvlc.h:391
 msgid "Demux module"
 msgstr ""
 
-#: src/libvlc.h:398
+#: src/libvlc.h:393
 msgid "This is a legacy entry to let you configure demux modules"
 msgstr ""
 
-#: src/libvlc.h:400
-msgid "Dast mutex on NT/2K/XP (developers only)"
+#: src/libvlc.h:395
+msgid "Fast mutex on NT/2K/XP (developers only)"
 msgstr ""
 
-#: src/libvlc.h:402
+#: 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:407
+#: src/libvlc.h:402
 msgid "Condition variables implementation for Win9x (developers only)"
 msgstr ""
 
-#: src/libvlc.h:410
+#: 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 "
@@ -928,11 +914,7 @@ msgid ""
 "the default and the fastest), 1 and 2."
 msgstr ""
 
-#: src/libvlc.h:418
-msgid "Real-time priority"
-msgstr ""
-
-#: src/libvlc.h:420
+#: src/libvlc.h:413
 msgid ""
 "\n"
 "Playlist items:\n"
@@ -947,94 +929,92 @@ msgid ""
 "  vlc:quit                       quit VLC\n"
 msgstr ""
 
-#: src/libvlc.h:450 modules/misc/dummy/dummy.c:60
+#: src/libvlc.h:443 modules/misc/dummy/dummy.c:58
 msgid "Interface"
 msgstr ""
 
-#: src/libvlc.h:465 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:2445 modules/demux/ogg.c:557 modules/demux/ogg.c:829
+#: modules/demux/ogg.c:1002 modules/gui/beos/InterfaceWindow.cpp:259
 #: modules/gui/gtk/gnome_interface.c:1092 modules/gui/gtk/gtk_interface.c:1219
-#: modules/gui/macosx/intf.m: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:484 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:108
+#: src/libvlc.h:477 modules/demux/asf/asf.c:302 modules/demux/avi/avi.c:1208
+#: modules/demux/mkv.cpp:2461 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:504 modules/access/satellite/satellite.c:66
+#: src/libvlc.h:499 modules/access/satellite/satellite.c:66
 msgid "Input"
 msgstr ""
 
-#: src/libvlc.h:527
+#: src/libvlc.h:521
 msgid "Decoders"
 msgstr ""
 
-#: src/libvlc.h:530
+#: src/libvlc.h:524
 msgid "Encoders"
 msgstr ""
 
-#: src/libvlc.h:535 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/win32/strings.cpp:221 modules/gui/wxwindows/open.cpp:217
-#: modules/gui/wxwindows/streamout.cpp:151
+#: modules/gui/wxwindows/open.cpp:218 modules/gui/wxwindows/streamout.cpp:174
 msgid "Stream output"
 msgstr ""
 
-#: src/libvlc.h:554
+#: src/libvlc.h:549
 msgid "CPU"
 msgstr ""
 
-#: src/libvlc.h:566 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/win32/strings.cpp:120
-#: modules/gui/win32/strings.cpp:180 modules/gui/wxwindows/interface.cpp:351
-#: modules/gui/wxwindows/playlist.cpp:102
+#: modules/gui/gtk/gtk_interface.c:2697 modules/gui/macosx/intf.m:321
+#: modules/gui/macosx/intf.m:409 modules/gui/wxwindows/interface.cpp:380
+#: modules/gui/wxwindows/playlist.cpp:104
 msgid "Playlist"
 msgstr ""
 
-#: src/libvlc.h:573 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
-#: modules/gui/win32/win32.cpp:312 modules/misc/logger/logger.c:89
-#: modules/video_filter/motionblur.c:58 modules/video_filter/transform.c:63
-#: modules/video_filter/wall.c:66 modules/video_output/ggi.c:62
-#: modules/video_output/mga/xmga.c:102
+#: modules/misc/logger/logger.c:89 modules/video_filter/motionblur.c:58
+#: modules/video_filter/transform.c:63 modules/video_filter/wall.c:66
+#: modules/video_output/ggi.c:62 modules/video_output/mga/xmga.c:102
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/libvlc.h:586
+#: src/libvlc.h:580
 msgid "main program"
 msgstr ""
 
-#: src/libvlc.h:592
+#: src/libvlc.h:586
 msgid "print help"
 msgstr ""
 
-#: src/libvlc.h:594
+#: src/libvlc.h:588
 msgid "print detailed help"
 msgstr ""
 
-#: src/libvlc.h:597
+#: src/libvlc.h:591
 msgid "print a list of available modules"
 msgstr ""
 
-#: src/libvlc.h:599
+#: src/libvlc.h:593
 msgid "print help on module"
 msgstr ""
 
-#: src/libvlc.h:602
+#: src/libvlc.h:596
 msgid "print version information"
 msgstr ""
 
@@ -1042,9 +1022,43 @@ msgstr ""
 msgid "boolean"
 msgstr ""
 
-#: modules/access/cdda.c:86 modules/access/file.c:69 modules/access/ftp.c:86
+#: src/video_output/video_output.c:394 modules/gui/beos/VideoOutput.cpp:1151
+#: modules/gui/macosx/applescript.m:122 modules/gui/macosx/controls.m:348
+#: modules/gui/macosx/controls.m:690 modules/gui/macosx/intf.m:394
+msgid "Fullscreen"
+msgstr ""
+
+#: src/video_output/video_output.c:405 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:409
+msgid "Discard"
+msgstr ""
+
+#: src/video_output/video_output.c:411
+msgid "Blend"
+msgstr ""
+
+#: src/video_output/video_output.c:413
+msgid "Mean"
+msgstr ""
+
+#: src/video_output/video_output.c:415
+msgid "Bob"
+msgstr ""
+
+#: src/video_output/video_output.c:417
+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 ""
 
@@ -1114,17 +1128,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 ""
 
@@ -1173,20 +1187,8 @@ msgstr ""
 msgid "Microsoft Media Server (MMS) input"
 msgstr ""
 
-#: modules/access_output/dummy.c:56
-msgid "Dummy stream ouput"
-msgstr ""
-
-#: modules/access_output/file.c:58
-msgid "File stream ouput"
-msgstr ""
-
-#: modules/access_output/http.c:54
-msgid "HTTP stream ouput"
-msgstr ""
-
-#: modules/access_output/udp.c:73
-msgid "UDP stream ouput"
+#: modules/access/pvr/pvr.c:74
+msgid "Hauppauge PVR cards input"
 msgstr ""
 
 #: modules/access/satellite/satellite.c:41
@@ -1233,11 +1235,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."
@@ -1251,21 +1253,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 ""
 
@@ -1273,6 +1275,26 @@ msgstr ""
 msgid "VCD input"
 msgstr ""
 
+#: modules/access_output/dummy.c:56
+msgid "Dummy stream ouput"
+msgstr ""
+
+#: modules/access_output/file.c:66
+msgid "File stream ouput"
+msgstr ""
+
+#: modules/access_output/http.c:54
+msgid "HTTP stream ouput"
+msgstr ""
+
+#: modules/access_output/udp.c:80
+msgid "UDP stream ouput"
+msgstr ""
+
+#: modules/access_output/udp.c:81
+msgid "udp stream output"
+msgstr ""
+
 #: modules/audio_filter/channel_mixer/headphone.c:48
 msgid "Characteristic dimension"
 msgstr ""
@@ -1403,34 +1425,44 @@ msgstr ""
 msgid "trivial audio mixer"
 msgstr ""
 
-#: modules/audio_output/alsa.c:91
+#: modules/audio_output/alsa.c:97
 msgid "ALSA"
 msgstr ""
 
-#: modules/audio_output/alsa.c:93
+#: modules/audio_output/alsa.c:99
 msgid "ALSA device name"
 msgstr ""
 
-#: modules/audio_output/alsa.c:94
+#: modules/audio_output/alsa.c:100
 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/alsa.c:116 modules/audio_output/coreaudio.c:218
+#: modules/audio_output/coreaudio.c:1473 modules/audio_output/directx.c:377
 #: modules/audio_output/oss.c:129 modules/audio_output/sdl.c:176
-#: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:309
-#: modules/gui/win32/strings.cpp:58
+#: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:337
+#: 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:167 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
+#: modules/audio_output/sdl.c:201 modules/audio_output/waveout.c:399
 msgid "Mono"
 msgstr ""
 
-#: modules/audio_output/alsa.c:201 modules/audio_output/directx.c:478
-#: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:387
+#: modules/audio_output/alsa.c:180 modules/audio_output/directx.c:409
+#: modules/audio_output/oss.c:178 modules/audio_output/waveout.c:371
+msgid "2 Front 2 Rear"
+msgstr ""
+
+#: modules/audio_output/alsa.c:186 modules/audio_output/directx.c:391
+#: modules/audio_output/oss.c:167 modules/audio_output/waveout.c:352
+msgid "5.1"
+msgstr ""
+
+#: modules/audio_output/alsa.c:208 modules/audio_output/directx.c:478
+#: modules/audio_output/oss.c:246 modules/audio_output/waveout.c:415
 msgid "A/52 over S/PDIF"
 msgstr ""
 
@@ -1438,7 +1470,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 ""
 
@@ -1446,17 +1485,7 @@ msgstr ""
 msgid "DirectX audio output"
 msgstr ""
 
-#: modules/audio_output/directx.c:391 modules/audio_output/oss.c:167
-#: modules/audio_output/waveout.c:324
-msgid "5.1"
-msgstr ""
-
-#: modules/audio_output/directx.c:409 modules/audio_output/oss.c:178
-#: modules/audio_output/waveout.c:343
-msgid "2 Front 2 Rear"
-msgstr ""
-
-#: modules/audio_output/esd.c:64
+#: modules/audio_output/esd.c:66
 msgid "EsounD audio output"
 msgstr ""
 
@@ -1517,7 +1546,7 @@ msgstr ""
 msgid "Simple DirectMedia Layer audio output"
 msgstr ""
 
-#: modules/audio_output/waveout.c:124
+#: modules/audio_output/waveout.c:135
 msgid "Win32 waveOut extension output"
 msgstr ""
 
@@ -1554,7 +1583,7 @@ msgid "3D Now! A52 IMDCT module"
 msgstr ""
 
 #: modules/codec/adpcm.c:92
-msgid "ADPCM audio deocder"
+msgid "ADPCM audio decoder"
 msgstr ""
 
 #: modules/codec/araw.c:69
@@ -1577,11 +1606,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 ""
 
@@ -1589,11 +1684,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 ""
 
@@ -1613,11 +1704,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 ""
 
@@ -1629,14 +1720,14 @@ msgstr ""
 msgid "MPEG I/II layer 1/2 audio decoder"
 msgstr ""
 
-#: modules/codec/mpeg_video/idct/idctaltivec.c:45
-msgid "AltiVec IDCT"
-msgstr ""
-
 #: modules/codec/mpeg_video/idct/idct.c:41
 msgid "IDCT"
 msgstr ""
 
+#: modules/codec/mpeg_video/idct/idctaltivec.c:45
+msgid "AltiVec IDCT"
+msgstr ""
+
 #: modules/codec/mpeg_video/idct/idctclassic.c:41
 msgid "classic IDCT"
 msgstr ""
@@ -1649,6 +1740,10 @@ msgstr ""
 msgid "MMX EXT IDCT"
 msgstr ""
 
+#: modules/codec/mpeg_video/motion/motion.c:42
+msgid "motion compensation"
+msgstr ""
+
 #: modules/codec/mpeg_video/motion/motion3dnow.c:44
 msgid "3D Now! motion compensation"
 msgstr ""
@@ -1657,10 +1752,6 @@ msgstr ""
 msgid "AltiVec motion compensation"
 msgstr ""
 
-#: modules/codec/mpeg_video/motion/motion.c:42
-msgid "motion compensation"
-msgstr ""
-
 #: modules/codec/mpeg_video/motion/motionmmx.c:45
 msgid "MMX motion compensation"
 msgstr ""
@@ -1716,6 +1807,10 @@ msgstr ""
 msgid "MPEG I/II video decoder"
 msgstr ""
 
+#: modules/codec/quicktime.c:65
+msgid "QuickTime library decoder"
+msgstr ""
+
 #: modules/codec/rawvideo.c:65
 msgid "Pseudo Raw Video decoder"
 msgstr ""
@@ -1730,11 +1825,19 @@ msgid ""
 "will be used to display them."
 msgstr ""
 
+#: modules/codec/spudec/spudec.c:55
+msgid "subtitle text encoding"
+msgstr ""
+
 #: modules/codec/spudec/spudec.c:56
+msgid "change the encoding used in text subtitles"
+msgstr ""
+
+#: modules/codec/spudec/spudec.c:59
 msgid "subtitles"
 msgstr ""
 
-#: modules/codec/spudec/spudec.c:65
+#: modules/codec/spudec/spudec.c:72
 msgid "subtitles decoder"
 msgstr ""
 
@@ -1742,7 +1845,7 @@ msgstr ""
 msgid "Tarkin decoder module"
 msgstr ""
 
-#: modules/codec/theora.c:84
+#: modules/codec/theora.c:85
 msgid "Theora video decoder"
 msgstr ""
 
@@ -1758,6 +1861,14 @@ msgstr ""
 msgid "Xvid video decoder"
 msgstr ""
 
+#: modules/control/corba/corba.c:614
+msgid "Corba control"
+msgstr ""
+
+#: modules/control/corba/corba.c:615
+msgid "corba control module"
+msgstr ""
+
 #: modules/control/gestures.c:77
 msgid "Motion threshold"
 msgstr ""
@@ -1782,31 +1893,26 @@ msgstr ""
 msgid "mouse gestures control interface"
 msgstr ""
 
-#: modules/control/http.c:74
-msgid "HTTP interface bind port"
+#: modules/control/http.c:123
+msgid "Host address"
 msgstr ""
 
-#: modules/control/http.c:76
-msgid ""
-"You can set the port on which the http interface will accept connections"
+#: modules/control/http.c:125
+msgid "You can set the address and port on which the http interface will bind"
 msgstr ""
 
-#: modules/control/http.c:77
-msgid "HTTP interface bind address"
+#: modules/control/http.c:126 modules/control/http.c:127
+msgid "Source directory"
 msgstr ""
 
-#: modules/control/http.c:79
-msgid "You can set the address on which the http interface will bind"
+#: modules/control/http.c:130
+msgid "HTTP remote control interface"
 msgstr ""
 
-#: modules/control/http.c:82
+#: modules/control/http.c:131
 msgid "HTTP remote control"
 msgstr ""
 
-#: modules/control/http.c:85
-msgid "HTTP remote control interface"
-msgstr ""
-
 #: modules/control/lirc/lirc.c:64
 msgid "infrared remote control interface"
 msgstr ""
@@ -1818,21 +1924,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:880
-#: modules/gui/macosx/intf.m:881 modules/gui/macosx/intf.m:882
-#: modules/gui/win32/strings.cpp:102 modules/gui/wxwindows/interface.cpp:806
+#: 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:877
 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:398 modules/gui/macosx/intf.m:887
-#: modules/gui/macosx/intf.m:888 modules/gui/macosx/intf.m:889
-#: modules/gui/macosx/playlist.m:172 modules/gui/win32/strings.cpp:100
-#: modules/gui/win32/strings.cpp:204 modules/gui/wxwindows/interface.cpp:348
-#: modules/gui/wxwindows/interface.cpp:811
+#: 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:377
+#: modules/gui/wxwindows/interface.cpp:883
 msgid "Play"
 msgstr ""
 
@@ -1883,18 +1988,18 @@ 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/gui/win32/strings.cpp:81
+#: modules/demux/avi/avi.c:1176 modules/demux/mkv.cpp:2449
+#: modules/demux/ogg.c:561 modules/demux/ogg.c:837 modules/demux/ogg.c:1010
+#: modules/gui/gtk/gnome_interface.c:148 modules/gui/gtk/gnome_interface.c:931
+#: modules/gui/gtk/gtk_interface.c:481 modules/gui/gtk/gtk_interface.c:1282
+#: modules/gui/wxwindows/streamout.cpp:658
 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:2453
+#: 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 ""
 
@@ -1902,24 +2007,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:2412
 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:2445
+#: modules/demux/mkv.cpp:2461 modules/demux/mkv.cpp:2477
+#: 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:2446 modules/demux/mkv.cpp:2462
+#: modules/demux/mkv.cpp:2478 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 ""
 
@@ -1927,7 +2035,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:2457
 msgid "Bits Per Sample"
 msgstr ""
 
@@ -1935,7 +2044,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:2465
 msgid "Resolution"
 msgstr ""
 
@@ -1943,7 +2053,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 ""
 
@@ -2008,24 +2118,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 ""
 
@@ -2045,10 +2155,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:2389 modules/gui/gtk/gnome_interface.c:2436
+#: modules/gui/gtk/gtk_interface.c:2857 modules/gui/wxwindows/playlist.cpp:151
+msgid "Duration"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2398
+msgid "Date UTC"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2402
+msgid "Segment Filename"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2406
+msgid "Muxing Application"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2410
+msgid "Writing Application"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2423 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:2427
+msgid "Codec Name"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2431
+msgid "Codec Setting"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2435
+msgid "Codec Info"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2439
+msgid "Codec Download"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2469
+msgid "Display Resolution"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2473
+msgid "Frame Per Second"
+msgstr ""
+
+#: modules/demux/mkv.cpp:2477 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 ""
@@ -2119,40 +2297,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 ""
 
@@ -2160,7 +2338,7 @@ msgstr ""
 msgid "raw dv demuxer"
 msgstr ""
 
-#: modules/demux/util/id3.c:46
+#: modules/demux/util/id3.c:44
 msgid "Simple id3 tag skipper"
 msgstr ""
 
@@ -2488,7 +2666,7 @@ msgstr ""
 msgid "id3 tag parser using libid3tag"
 msgstr ""
 
-#: modules/demux/util/sub.c:72
+#: modules/demux/util/sub.c:67
 msgid "Text subtitles demux"
 msgstr ""
 
@@ -2508,7 +2686,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 ""
 
@@ -2525,19 +2703,19 @@ 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:192
-#: modules/gui/win32/strings.cpp:211 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/win32/strings.cpp:153 modules/gui/wxwindows/messages.cpp:79
+#: modules/gui/macosx/intf.m:334 modules/gui/macosx/intf.m:411
+#: modules/gui/wxwindows/messages.cpp:83
 msgid "Messages"
 msgstr ""
 
@@ -2550,24 +2728,23 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2847 modules/gui/gtk/gtk_interface.c:618
 #: modules/gui/gtk/gtk_interface.c:1884 modules/gui/gtk/gtk_interface.c:2733
 #: modules/gui/gtk/gtk_interface.c:2850 modules/gui/gtk/gtk_interface.c:3102
-#: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:263
-#: modules/gui/macosx/output.m:121 modules/gui/macosx/output.m:194
-#: modules/gui/macosx/output.m:279 modules/gui/win32/strings.cpp:93
-#: modules/gui/win32/strings.cpp:226 modules/gui/wxwindows/interface.cpp:335
-#: modules/gui/wxwindows/open.cpp:275 modules/gui/wxwindows/streamout.cpp:345
+#: modules/gui/macosx/open.m:141 modules/gui/macosx/open.m:264
+#: modules/gui/macosx/output.m:125 modules/gui/macosx/output.m:200
+#: modules/gui/macosx/output.m:285 modules/gui/wxwindows/interface.cpp:364
+#: modules/gui/wxwindows/open.cpp:276 modules/gui/wxwindows/streamout.cpp:380
 msgid "File"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:240
 #: modules/gui/beos/PlayListWindow.cpp:84
-#: modules/gui/gtk2/gnome2_interface.c:113
-#: modules/gui/gtk/gnome_interface.c:2179 modules/gui/macosx/open.m:331
-#: modules/gui/macosx/open.m:614 modules/gui/macosx/open.m:661
+#: modules/gui/gtk/gnome_interface.c:2179
+#: modules/gui/gtk2/gnome2_interface.c:113 modules/gui/macosx/open.m:332
+#: modules/gui/macosx/open.m:630 modules/gui/macosx/open.m:677
 msgid "Open File"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:243
-#: modules/gui/beos/PlayListWindow.cpp:89 modules/gui/win32/strings.cpp:19
+#: modules/gui/beos/PlayListWindow.cpp:89
 msgid "Open Disc"
 msgstr ""
 
@@ -2578,13 +2755,10 @@ msgstr ""
 #: modules/gui/beos/InterfaceWindow.cpp:249
 #: modules/gui/familiar/interface.c:231 modules/gui/familiar/interface.c:232
 #: modules/gui/familiar/interface.c:765 modules/gui/gtk/gtk_interface.c:1580
-#: modules/gui/win32/strings.cpp:7
 msgid "About"
 msgstr ""
 
 #: modules/gui/beos/InterfaceWindow.cpp:256 modules/gui/kde/interface.cpp:93
-#: modules/gui/macosx/intf.m:376 modules/gui/macosx/intf.m:377
-#: modules/gui/win32/strings.cpp:87
 msgid "Subtitles"
 msgstr ""
 
@@ -2616,54 +2790,32 @@ 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"
+#: modules/gui/beos/InterfaceWindow.cpp:303 modules/gui/macosx/intf.m:405
+msgid "Window"
 msgstr ""
 
-#: modules/gui/beos/InterfaceWindow.cpp:287
-msgid "Normal"
+#: modules/gui/beos/InterfaceWindow.cpp:304
+msgid "Play List"
 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
-msgid "Window"
-msgstr ""
-
-#: modules/gui/beos/InterfaceWindow.cpp:296
-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:178 modules/gui/macosx/output.m:117
-#: modules/gui/macosx/prefs.m:587 modules/gui/macosx/prefs.m:750
-#: modules/gui/win32/strings.cpp:13 modules/gui/win32/strings.cpp:26
-#: modules/gui/win32/strings.cpp:154 modules/gui/win32/strings.cpp:173
-#: modules/gui/win32/strings.cpp:183 modules/gui/win32/strings.cpp:214
-#: modules/gui/win32/strings.cpp:233 modules/gui/win32/strings.cpp:249
-#: modules/gui/wxwindows/fileinfo.cpp:96
-#: modules/gui/wxwindows/messages.cpp:102 modules/gui/wxwindows/open.cpp:266
-#: modules/gui/wxwindows/preferences.cpp:250
-#: modules/gui/wxwindows/streamout.cpp:194
+#: 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/open.cpp:267
+#: modules/gui/wxwindows/preferences.cpp:253
+#: modules/gui/wxwindows/streamout.cpp:220
 #: 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 ""
 
@@ -2671,17 +2823,19 @@ msgstr ""
 msgid "Drop files to play"
 msgstr ""
 
-#: modules/gui/beos/PlayListWindow.cpp:93 modules/gui/wxwindows/menus.cpp:165
-#: modules/gui/wxwindows/playlist.cpp:154
+#: modules/gui/beos/PlayListWindow.cpp:93
+#: modules/gui/wxwindows/fileinfo.cpp:96
+#: modules/gui/wxwindows/messages.cpp:106
+#: modules/gui/wxwindows/playlist.cpp:157
 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:174
+#: modules/gui/beos/PlayListWindow.cpp:100 modules/gui/macosx/intf.m:359
+#: modules/gui/macosx/playlist.m:196
 msgid "Select All"
 msgstr ""
 
@@ -2721,79 +2875,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/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/win32/strings.cpp:212
+#: 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:329 modules/gui/win32/strings.cpp:213
-#: 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:1138 modules/gui/macosx/controls.m:342
-#: modules/gui/macosx/controls.m:486 modules/gui/macosx/intf.m:370
-msgid "Fullscreen"
-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/macosx/prefs.m:403 modules/gui/macosx/prefs.m:432
-#: modules/gui/macosx/prefs.m:684 modules/gui/macosx/prefs.m:713
+#: 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 ""
 
@@ -2811,13 +2953,14 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:99 modules/gui/familiar/interface.c:732
 #: modules/gui/gtk/gnome_interface.c:274 modules/gui/gtk/gtk_interface.c:121
-#: modules/gui/gtk/gtk_interface.c:1595 modules/gui/win32/strings.cpp:8
-#: modules/gui/win32/strings.cpp:34
+#: modules/gui/gtk/gtk_interface.c:1595
 msgid "VLC media player"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:603
-#: modules/gui/wxwindows/preferences.cpp:965
+#: modules/gui/familiar/interface.c:124
+#: modules/gui/wxwindows/interface.cpp:665 modules/gui/wxwindows/open.cpp:668
+#: modules/gui/wxwindows/playlist.cpp:377
+#: modules/gui/wxwindows/preferences.cpp:1026
 #: modules/gui/wxwindows/subtitles.cpp:196
 msgid "Open file"
 msgstr ""
@@ -2830,24 +2973,23 @@ msgstr ""
 msgid "Rewind stream"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:178 modules/gui/win32/strings.cpp:103
+#: modules/gui/familiar/interface.c:178
 msgid "Pause stream"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:191 modules/gui/win32/strings.cpp:101
+#: modules/gui/familiar/interface.c:191
 msgid "Play stream"
 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:399 modules/gui/win32/strings.cpp:104
-#: modules/gui/wxwindows/interface.cpp:346
+#: modules/gui/gtk/gtk_interface.c:1127 modules/gui/macosx/controls.m:639
+#: modules/gui/macosx/intf.m:325 modules/gui/macosx/intf.m:363
+#: modules/gui/macosx/intf.m:424 modules/gui/wxwindows/interface.cpp:375
 msgid "Stop"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:204 modules/gui/win32/strings.cpp:105
+#: modules/gui/familiar/interface.c:204
 msgid "Stop stream"
 msgstr ""
 
@@ -2860,7 +3002,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:176
+#: modules/gui/gtk/gtk_interface.c:2712 modules/gui/macosx/playlist.m:198
 msgid "Add"
 msgstr ""
 
@@ -2869,13 +3011,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:159
-#: modules/gui/macosx/output.m:124 modules/gui/wxwindows/open.cpp:444
-#: modules/gui/wxwindows/streamout.cpp:385
+#: modules/gui/gtk/gtk_interface.c:2062 modules/gui/macosx/open.m:160
+#: modules/gui/macosx/output.m:128 modules/gui/wxwindows/open.cpp:456
+#: modules/gui/wxwindows/streamout.cpp:420
 msgid "Address"
 msgstr ""
 
@@ -2883,15 +3025,15 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1786
 #: modules/gui/gtk/gnome_interface.c:2912 modules/gui/gtk/gtk_interface.c:2052
 #: modules/gui/gtk/gtk_interface.c:2101 modules/gui/gtk/gtk_interface.c:3225
-#: modules/gui/macosx/open.m:158 modules/gui/macosx/open.m:160
-#: modules/gui/macosx/output.m:125 modules/gui/wxwindows/open.cpp:429
-#: modules/gui/wxwindows/open.cpp:452 modules/gui/wxwindows/streamout.cpp:395
+#: modules/gui/macosx/open.m:159 modules/gui/macosx/open.m:161
+#: modules/gui/macosx/output.m:129 modules/gui/wxwindows/open.cpp:441
+#: modules/gui/wxwindows/open.cpp:464 modules/gui/wxwindows/streamout.cpp:431
 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:346
+#: 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:381
 msgid "HTTP"
 msgstr ""
 
@@ -2906,7 +3048,7 @@ msgstr ""
 #: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1830
 #: modules/gui/gtk/gnome_interface.c:2281 modules/gui/gtk/gtk_interface.c:2145
 #: modules/gui/gtk/gtk_interface.c:2740 modules/gui/macosx/open.m:143
-#: modules/gui/macosx/open.m:271 modules/gui/wxwindows/open.cpp:279
+#: modules/gui/macosx/open.m:272 modules/gui/wxwindows/open.cpp:280
 msgid "Network"
 msgstr ""
 
@@ -2956,7 +3098,6 @@ msgstr ""
 
 #: modules/gui/familiar/interface.c:711 modules/gui/gtk/gnome_interface.c:1361
 #: modules/gui/gtk/gtk_interface.c:1603 modules/gui/kde/kde.cpp:111
-#: modules/gui/win32/strings.cpp:9
 msgid "(c) 1996-2003 the VideoLAN team"
 msgstr ""
 
@@ -2970,10 +3111,10 @@ msgid ""
 "from local or network sources."
 msgstr ""
 
-#: modules/gui/familiar/support.c:121 modules/gui/gtk2/gnome2_support.c:60
-#: modules/gui/gtk2/gnome2_support.c:85 modules/gui/gtk2/gtk2_support.c:90
-#: modules/gui/gtk2/gtk2_support.c:114 modules/gui/gtk/gnome_support.c:100
+#: modules/gui/familiar/support.c:121 modules/gui/gtk/gnome_support.c:100
 #: modules/gui/gtk/gnome_support.c:138 modules/gui/gtk/gtk_support.c:121
+#: modules/gui/gtk2/gnome2_support.c:60 modules/gui/gtk2/gnome2_support.c:85
+#: modules/gui/gtk2/gtk2_support.c:90 modules/gui/gtk2/gtk2_support.c:114
 #, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
@@ -2983,64 +3124,6 @@ msgstr ""
 msgid "Error loading pixmap file: %s"
 msgstr ""
 
-#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
-msgid "Gtk2 interface"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:31
-msgid "_New"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:87
-msgid "gnome2"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:112
-msgid "button4"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:122
-#: modules/gui/gtk2/gtk2_interface.c:183
-msgid "button3"
-msgstr ""
-
-#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:328
-msgid "Save File"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:67
-msgid "window1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:77 modules/gui/gtk/gtk_interface.c:147
-#: modules/gui/gtk/gtk_interface.c:1373
-msgid "_File"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:109
-msgid "_Edit"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:132 modules/gui/gtk/gtk_interface.c:268
-msgid "_View"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:139 modules/gui/gtk/gtk_interface.c:569
-msgid "_Help"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:146
-msgid "_About"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:163
-msgid "button1"
-msgstr ""
-
-#: modules/gui/gtk2/gtk2_interface.c:173
-msgid "button2"
-msgstr ""
-
 #: modules/gui/gtk/gnome.c:55 modules/gui/gtk/gtk.c:57
 msgid "Show tooltips"
 msgstr ""
@@ -3083,7 +3166,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/win32/strings.cpp:94 modules/gui/wxwindows/interface.cpp:230
+#: modules/gui/wxwindows/interface.cpp:257
 msgid "Open a file"
 msgstr ""
 
@@ -3095,7 +3178,6 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:27 modules/gui/gtk/gnome_interface.c:516
 #: modules/gui/gtk/gnome_interface.c:993 modules/gui/gtk/gtk_interface.c:188
 #: modules/gui/gtk/gtk_interface.c:630 modules/gui/gtk/gtk_interface.c:1411
-#: modules/gui/win32/strings.cpp:96
 msgid "Open a DVD or VCD"
 msgstr ""
 
@@ -3107,7 +3189,6 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:34 modules/gui/gtk/gnome_interface.c:528
 #: modules/gui/gtk/gnome_interface.c:1000 modules/gui/gtk/gtk_interface.c:203
 #: modules/gui/gtk/gtk_interface.c:641 modules/gui/gtk/gtk_interface.c:1423
-#: modules/gui/win32/strings.cpp:98
 msgid "Select a network stream"
 msgstr ""
 
@@ -3116,8 +3197,7 @@ msgid "_Eject Disc"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:42 modules/gui/gtk/gnome_interface.c:579
-#: modules/gui/gtk/gtk_interface.c:226 modules/gui/win32/strings.cpp:106
-#: modules/gui/win32/strings.cpp:107
+#: modules/gui/gtk/gtk_interface.c:226
 msgid "Eject disc"
 msgstr ""
 
@@ -3130,7 +3210,6 @@ msgid "Progr_am"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:65 modules/gui/gtk/gtk_interface.c:315
-#: modules/gui/win32/strings.cpp:63
 msgid "Choose the program"
 msgstr ""
 
@@ -3138,7 +3217,7 @@ msgstr ""
 msgid "_Title"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:72 modules/gui/win32/strings.cpp:65
+#: modules/gui/gtk/gnome_interface.c:72
 msgid "Choose title"
 msgstr ""
 
@@ -3146,7 +3225,7 @@ msgstr ""
 msgid "_Chapter"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:79 modules/gui/win32/strings.cpp:67
+#: modules/gui/gtk/gnome_interface.c:79
 msgid "Choose chapter"
 msgstr ""
 
@@ -3155,7 +3234,6 @@ msgid "_Playlist..."
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:87 modules/gui/gtk/gtk_interface.c:360
-#: modules/gui/win32/strings.cpp:121
 msgid "Open the playlist window"
 msgstr ""
 
@@ -3168,12 +3246,11 @@ msgid "Open the module manager"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:100 modules/gui/gtk/gtk_interface.c:375
-#: modules/gui/kde/interface.cpp:133 modules/gui/win32/strings.cpp:128
+#: modules/gui/kde/interface.cpp:133
 msgid "Messages..."
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:101 modules/gui/gtk/gtk_interface.c:381
-#: modules/gui/win32/strings.cpp:129
 msgid "Open the messages window"
 msgstr ""
 
@@ -3183,33 +3260,30 @@ msgid "_Language"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:119 modules/gui/gtk/gnome_interface.c:902
-#: modules/gui/gtk/gtk_interface.c:442 modules/gui/win32/strings.cpp:60
-#: modules/gui/win32/strings.cpp:71
+#: modules/gui/gtk/gtk_interface.c:442
 msgid "Select audio channel"
 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:686 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
-#: modules/gui/win32/strings.cpp:80
 msgid "Device"
 msgstr ""
 
@@ -3219,7 +3293,7 @@ msgid "_Subtitles"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:168 modules/gui/gtk/gnome_interface.c:951
-#: modules/gui/gtk/gtk_interface.c:524 modules/gui/win32/strings.cpp:73
+#: modules/gui/gtk/gtk_interface.c:524
 msgid "Select subtitles channel"
 msgstr ""
 
@@ -3228,19 +3302,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:202
-#: modules/gui/win32/strings.cpp:83
+#: modules/gui/macosx/output.m:124 modules/gui/macosx/vout.m:199
 msgid "Screen"
 msgstr ""
 
@@ -3257,19 +3321,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:267 modules/gui/win32/strings.cpp:43
-#: modules/gui/win32/strings.cpp:95 modules/gui/wxwindows/interface.cpp:337
-#: modules/gui/wxwindows/open.cpp:277
+#: modules/gui/macosx/open.m:268 modules/gui/wxwindows/interface.cpp:366
+#: 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/win32/strings.cpp:97 modules/gui/wxwindows/interface.cpp:339
+#: modules/gui/wxwindows/interface.cpp:368
 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:371
 msgid "Sat"
 msgstr ""
 
@@ -3279,7 +3342,7 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:553
 #: modules/gui/gtk/gnome_interface.c:1034 modules/gui/gtk/gtk_interface.c:664
-#: modules/gui/gtk/gtk_interface.c:1134 modules/gui/win32/strings.cpp:99
+#: modules/gui/gtk/gtk_interface.c:1134
 msgid "Back"
 msgstr ""
 
@@ -3305,7 +3368,7 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:617
 #: modules/gui/gtk/gnome_interface.c:1041 modules/gui/gtk/gtk_interface.c:723
-#: modules/gui/gtk/gtk_interface.c:1142 modules/gui/win32/strings.cpp:108
+#: modules/gui/gtk/gtk_interface.c:1142
 msgid "Slow"
 msgstr ""
 
@@ -3315,7 +3378,7 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:630
 #: modules/gui/gtk/gnome_interface.c:1048 modules/gui/gtk/gtk_interface.c:735
-#: modules/gui/gtk/gtk_interface.c:1150 modules/gui/win32/strings.cpp:110
+#: modules/gui/gtk/gtk_interface.c:1150
 msgid "Fast"
 msgstr ""
 
@@ -3330,25 +3393,21 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:655
 #: 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/win32/strings.cpp:112
-#: modules/gui/win32/strings.cpp:132 modules/gui/win32/strings.cpp:136
-#: modules/gui/wxwindows/interface.cpp:353
+#: modules/gui/gtk/gtk_interface.c:1173
+#: modules/gui/wxwindows/interface.cpp:382
 msgid "Prev"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:656 modules/gui/gtk/gtk_interface.c:759
-#: modules/gui/win32/strings.cpp:113
 msgid "Previous file"
 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:400 modules/gui/win32/strings.cpp:114
-#: modules/gui/win32/strings.cpp:134 modules/gui/win32/strings.cpp:138
-#: modules/gui/wxwindows/interface.cpp:355
+#: modules/gui/gtk/gtk_interface.c:1166 modules/gui/macosx/controls.m:647
+#: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:367
+#: modules/gui/macosx/intf.m:425 modules/gui/wxwindows/interface.cpp:384
 msgid "Next"
 msgstr ""
 
@@ -3357,33 +3416,30 @@ msgid "Next File"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:732 modules/gui/gtk/gtk_interface.c:830
-#: modules/gui/win32/strings.cpp:44
 msgid "Title:"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:752 modules/gui/win32/strings.cpp:133
+#: modules/gui/gtk/gnome_interface.c:752
 msgid "Select previous title"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:775 modules/gui/gtk/gtk_interface.c:874
-#: modules/gui/win32/strings.cpp:45
 msgid "Chapter:"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:795 modules/gui/win32/strings.cpp:137
+#: modules/gui/gtk/gnome_interface.c:795
 msgid "Select previous chapter"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:803 modules/gui/win32/strings.cpp:139
+#: modules/gui/gtk/gnome_interface.c:803
 msgid "Select next chapter"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:811 modules/gui/gtk/gtk_interface.c:911
-#: modules/gui/win32/strings.cpp:41
 msgid "No server"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:959 modules/gui/win32/strings.cpp:125
+#: modules/gui/gtk/gnome_interface.c:959
 msgid "Toggle fullscreen mode"
 msgstr ""
 
@@ -3412,12 +3468,11 @@ msgid "Toggle _Interface"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1115 modules/gui/gtk/gtk_interface.c:1455
-#: modules/gui/win32/strings.cpp:88
 msgid "Playlist..."
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1363 modules/gui/gtk/gtk_interface.c:1646
-#: modules/gui/kde/kde.cpp:108 modules/gui/win32/strings.cpp:10
+#: modules/gui/kde/kde.cpp:108
 msgid ""
 "This is the VideoLAN Client, a DVD, MPEG and DivX player. It can play MPEG "
 "and MPEG2 files from a file or from a network source."
@@ -3428,17 +3483,17 @@ msgid "Open Stream"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1476 modules/gui/gtk/gtk_interface.c:1791
-#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:169
+#: modules/gui/macosx/open.m:135 modules/gui/wxwindows/open.cpp:170
 msgid "Media Resource Locator (MRL)"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1498 modules/gui/gtk/gtk_interface.c:1813
-#: modules/gui/wxwindows/open.cpp:173
+#: modules/gui/wxwindows/open.cpp:174
 msgid "Open Target:"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1518 modules/gui/gtk/gtk_interface.c:1833
-#: modules/gui/wxwindows/open.cpp:188
+#: modules/gui/wxwindows/open.cpp:189
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -3447,35 +3502,34 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1562
 #: modules/gui/gtk/gnome_interface.c:1998 modules/gui/gtk/gtk_interface.c:1877
 #: modules/gui/gtk/gtk_interface.c:2315 modules/gui/macosx/open.m:145
-#: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:172
-#: modules/gui/macosx/output.m:123 modules/gui/win32/strings.cpp:229
-#: modules/gui/win32/strings.cpp:248 modules/gui/wxwindows/open.cpp:245
-#: modules/gui/wxwindows/open.cpp:342
-#: modules/gui/wxwindows/preferences.cpp:778
-#: modules/gui/wxwindows/streamout.cpp:372
+#: modules/gui/macosx/open.m:151 modules/gui/macosx/open.m:173
+#: 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:407
 #: 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/win32/strings.cpp:25 modules/gui/wxwindows/open.cpp:367
+#: 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:472
-#: modules/gui/wxwindows/open.cpp:361
+#: modules/gui/macosx/open.m:155 modules/gui/macosx/open.m:488
+#: 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:381
-#: modules/gui/macosx/open.m:464 modules/gui/wxwindows/open.cpp:362
+#: modules/gui/macosx/open.m:156 modules/gui/macosx/open.m:382
+#: 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:373
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:385
 msgid "Device name"
 msgstr ""
 
@@ -3485,28 +3539,25 @@ msgid "Use DVD menus"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1707 modules/gui/gtk/gtk_interface.c:2022
-#: modules/gui/macosx/open.m:163 modules/gui/macosx/open.m:531
-#: modules/gui/macosx/open.m:569 modules/gui/win32/strings.cpp:169
-#: modules/gui/wxwindows/open.cpp:408
+#: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:547
+#: 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:164 modules/gui/macosx/open.m:532
-#: modules/gui/macosx/open.m:581 modules/gui/win32/strings.cpp:170
-#: modules/gui/wxwindows/open.cpp:409
+#: modules/gui/macosx/open.m:165 modules/gui/macosx/open.m:548
+#: 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:165 modules/gui/macosx/open.m:533
-#: modules/gui/macosx/open.m:594 modules/gui/win32/strings.cpp:172
-#: modules/gui/wxwindows/open.cpp:410
+#: modules/gui/macosx/open.m:166 modules/gui/macosx/open.m:549
+#: 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:161 modules/gui/wxwindows/open.cpp:466
+#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:478
 msgid "URL"
 msgstr ""
 
@@ -3535,27 +3586,23 @@ msgid "Horizontal"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1956 modules/gui/gtk/gtk_interface.c:2271
-#: modules/gui/wxwindows/open.cpp:282
+#: modules/gui/wxwindows/open.cpp:283
 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:174
+#: modules/gui/macosx/open.m:175
 msgid "delay"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2020 modules/gui/gtk/gtk_interface.c:2338
-#: modules/gui/macosx/open.m:176
+#: modules/gui/macosx/open.m:177
 msgid "fps"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2049 modules/gui/gtk/gtk_interface.c:2369
-#: modules/gui/macosx/open.m:171 modules/gui/macosx/output.m:116
-#: modules/gui/wxwindows/open.cpp:200 modules/gui/wxwindows/open.cpp:222
+#: 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 ""
 
@@ -3567,12 +3614,11 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2288
 #: modules/gui/gtk/gnome_interface.c:2429 modules/gui/gtk/gtk_interface.c:2747
-#: modules/gui/wxwindows/playlist.cpp:147
+#: modules/gui/wxwindows/playlist.cpp:150
 msgid "Url"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2300 modules/gui/gtk/gtk_interface.c:2768
-#: modules/gui/win32/strings.cpp:202
 msgid "All"
 msgstr ""
 
@@ -3580,23 +3626,21 @@ msgstr ""
 msgid "Item"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:2319 modules/gui/win32/strings.cpp:198
-#: modules/video_filter/crop.c:61
+#: modules/gui/gtk/gnome_interface.c:2319 modules/video_filter/crop.c:61
 msgid "Crop"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:2326 modules/gui/win32/strings.cpp:196
+#: modules/gui/gtk/gnome_interface.c:2326
 msgid "Invert"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2333 modules/gui/gtk/preferences.c:382
-#: modules/gui/kde/pluginsbox.cpp:48 modules/gui/macosx/prefs.m:400
+#: 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:173 modules/gui/macosx/playlist.m:177
-#: modules/gui/win32/strings.cpp:200
+#: modules/gui/macosx/playlist.m:195 modules/gui/macosx/playlist.m:199
 msgid "Delete"
 msgstr ""
 
@@ -3604,11 +3648,6 @@ msgstr ""
 msgid "Selection"
 msgstr ""
 
-#: modules/gui/gtk/gnome_interface.c:2436 modules/gui/gtk/gtk_interface.c:2857
-#: modules/gui/win32/strings.cpp:182 modules/gui/wxwindows/playlist.cpp:148
-msgid "Duration"
-msgstr ""
-
 #: modules/gui/gtk/gnome_interface.c:2588
 msgid "Jump to: "
 msgstr ""
@@ -3634,16 +3673,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/win32/strings.cpp:227
-#: modules/gui/wxwindows/streamout.cpp:347
+#: modules/gui/macosx/output.m:132 modules/gui/macosx/output.m:237
+#: modules/gui/macosx/output.m:296 modules/gui/wxwindows/streamout.cpp:382
 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/win32/strings.cpp:228
-#: modules/gui/wxwindows/streamout.cpp:348
+#: modules/gui/macosx/output.m:133 modules/gui/macosx/output.m:247
+#: modules/gui/macosx/output.m:298 modules/gui/wxwindows/streamout.cpp:383
 msgid "RTP"
 msgstr ""
 
@@ -3652,24 +3689,20 @@ msgid "Path:"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2887 modules/gui/gtk/gtk_interface.c:3157
-#: modules/gui/win32/strings.cpp:166 modules/gui/win32/strings.cpp:167
-#: modules/gui/win32/strings.cpp:224
 msgid "Address:"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2956 modules/gui/gtk/gtk_interface.c:3201
-#: modules/gui/win32/strings.cpp:232
 msgid "TS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2964 modules/gui/gtk/gtk_interface.c:3209
-#: modules/gui/win32/strings.cpp:231
 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:316
+#: modules/gui/macosx/output.m:139 modules/gui/macosx/output.m:279
+#: modules/gui/macosx/output.m:325
 msgid "AVI"
 msgstr ""
 
@@ -3686,6 +3719,11 @@ msgstr ""
 msgid "Gtk+ interface"
 msgstr ""
 
+#: modules/gui/gtk/gtk_interface.c:147 modules/gui/gtk/gtk_interface.c:1373
+#: modules/gui/gtk2/gtk2_interface.c:77
+msgid "_File"
+msgstr ""
+
 #: modules/gui/gtk/gtk_interface.c:238
 msgid "_Close"
 msgstr ""
@@ -3698,11 +3736,15 @@ msgstr ""
 msgid "E_xit"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:261 modules/gui/win32/strings.cpp:123
+#: modules/gui/gtk/gtk_interface.c:261
 msgid "Exit the program"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:294 modules/gui/win32/strings.cpp:53
+#: modules/gui/gtk/gtk_interface.c:268 modules/gui/gtk2/gtk2_interface.c:132
+msgid "_View"
+msgstr ""
+
+#: modules/gui/gtk/gtk_interface.c:294
 msgid "Hide the main interface window"
 msgstr ""
 
@@ -3718,15 +3760,19 @@ msgstr ""
 msgid "_Preferences..."
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:411 modules/gui/win32/strings.cpp:127
+#: modules/gui/gtk/gtk_interface.c:411
 msgid "Configure the application"
 msgstr ""
 
+#: modules/gui/gtk/gtk_interface.c:569 modules/gui/gtk2/gtk2_interface.c:139
+msgid "_Help"
+msgstr ""
+
 #: modules/gui/gtk/gtk_interface.c:587 modules/gui/gtk/gtk_interface.c:1435
 msgid "_About..."
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:595 modules/gui/win32/strings.cpp:131
+#: modules/gui/gtk/gtk_interface.c:595
 msgid "About this application"
 msgstr ""
 
@@ -3738,11 +3784,11 @@ msgstr ""
 msgid "Authors"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:1626 modules/gui/win32/strings.cpp:11
+#: modules/gui/gtk/gtk_interface.c:1626
 msgid "the VideoLAN team <videolan@videolan.org>"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:150
+#: modules/gui/gtk/gtk_interface.c:1777 modules/gui/wxwindows/open.cpp:151
 msgid "Open Target"
 msgstr ""
 
@@ -3750,15 +3796,15 @@ msgstr ""
 msgid "Use a subtitles file"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:2306 modules/gui/win32/strings.cpp:241
+#: modules/gui/gtk/gtk_interface.c:2306
 msgid "Select a subtitles file"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:2336 modules/gui/win32/strings.cpp:244
+#: modules/gui/gtk/gtk_interface.c:2336
 msgid "Set the delay (in seconds)"
 msgstr ""
 
-#: modules/gui/gtk/gtk_interface.c:2352 modules/gui/win32/strings.cpp:246
+#: modules/gui/gtk/gtk_interface.c:2352
 msgid "Set the number of Frames Per Second"
 msgstr ""
 
@@ -3772,13 +3818,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:591 modules/gui/win32/strings.cpp:27
-#: modules/gui/win32/strings.cpp:174 modules/gui/win32/strings.cpp:215
-#: modules/gui/win32/strings.cpp:234 modules/gui/win32/strings.cpp:250
-#: modules/gui/wxwindows/open.cpp:269
-#: 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:223
 #: modules/gui/wxwindows/subtitles.cpp:152
 msgid "Cancel"
 msgstr ""
@@ -3821,7 +3864,7 @@ msgstr ""
 msgid "Chapter %d"
 msgstr ""
 
-#: modules/gui/gtk/preferences.c:371 modules/gui/macosx/prefs.m:383
+#: modules/gui/gtk/preferences.c:371
 msgid "Configure"
 msgstr ""
 
@@ -3829,6 +3872,51 @@ msgstr ""
 msgid "Selected:"
 msgstr ""
 
+#: modules/gui/gtk2/gnome2.c:54 modules/gui/gtk2/gtk2.c:55
+msgid "Gtk2 interface"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:31
+msgid "_New"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:87
+msgid "gnome2"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:112
+msgid "button4"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:122
+#: modules/gui/gtk2/gtk2_interface.c:183
+msgid "button3"
+msgstr ""
+
+#: modules/gui/gtk2/gnome2_interface.c:123 modules/gui/macosx/output.m:337
+msgid "Save File"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:67
+msgid "window1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:109
+msgid "_Edit"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:146
+msgid "_About"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:163
+msgid "button1"
+msgstr ""
+
+#: modules/gui/gtk2/gtk2_interface.c:173
+msgid "button2"
+msgstr ""
+
 #: modules/gui/kde/interface.cpp:88
 msgid "Languages"
 msgstr ""
@@ -3853,245 +3941,258 @@ msgstr ""
 msgid "Messages:"
 msgstr ""
 
-#: modules/gui/kde/preferences.cpp:95
-#: modules/gui/wxwindows/preferences.cpp:395
+#: modules/gui/kde/preferences.cpp:96
+#: 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:350 modules/gui/macosx/controls.m:691
+#: 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:352 modules/gui/macosx/controls.m:692
+#: 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:354 modules/gui/macosx/controls.m:693
+#: 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:356 modules/gui/macosx/controls.m:695
+#: modules/gui/macosx/controls.m:702 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:358 modules/gui/macosx/controls.m:694
+#: 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:401
+#: modules/gui/macosx/controls.m:625 modules/gui/macosx/intf.m:326
+#: modules/gui/macosx/intf.m:364 modules/gui/wxwindows/interface.cpp:388
+msgid "Faster"
+msgstr ""
+
+#: modules/gui/macosx/controls.m:626 modules/gui/macosx/intf.m:323
+#: modules/gui/macosx/intf.m:365 modules/gui/wxwindows/interface.cpp:386
+msgid "Slower"
+msgstr ""
+
+#: modules/gui/macosx/controls.m:646 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:665 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:672 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:673 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:410
+#: 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:945
+#: 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/win32/strings.cpp:126
+#: 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/win32/strings.cpp:90
+#: modules/gui/macosx/intf.m:348
 msgid "Open File..."
 msgstr ""
 
-#: modules/gui/macosx/intf.m:325 modules/gui/win32/strings.cpp:91
+#: 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:1295
+#: 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 modules/gui/wxwindows/messages.cpp:111
 msgid "Clear"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:337 modules/gui/win32/strings.cpp:77
+#: 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 ""
 
-#: 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:418
 msgid "Report a Bug"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:394
+#: modules/gui/macosx/intf.m:419
 msgid "VideoLAN Website"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:395
+#: modules/gui/macosx/intf.m:420 modules/gui/macosx/intf.m:1198
 msgid "License"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:404
+#: modules/gui/macosx/intf.m:429
 msgid "Error"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:405
+#: 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:406
+#: 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:407
+#: modules/gui/macosx/intf.m:432
 msgid "Open Messages Window"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:408
+#: modules/gui/macosx/intf.m:433
 msgid "Dismiss"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1258
+#: modules/gui/macosx/intf.m:1162
 msgid "No CrashLog found"
 msgstr ""
 
-#: modules/gui/macosx/intf.m:1258
+#: 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:191
-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 "Float on top"
+#: 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 ""
 
@@ -4107,91 +4208,110 @@ msgstr ""
 msgid "Treat as a pipe rather than as a file"
 msgstr ""
 
-#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:370
+#: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:371
 msgid "VIDEO_TS folder"
 msgstr ""
 
-#: modules/gui/macosx/open.m:170
+#: modules/gui/macosx/open.m:157 modules/gui/macosx/open.m:389
+#: modules/gui/macosx/open.m:480
+msgid "Audio CD"
+msgstr ""
+
+#: modules/gui/macosx/open.m:171
 msgid "Load subtitles file:"
 msgstr ""
 
-#: modules/gui/macosx/open.m:173
+#: modules/gui/macosx/open.m:174
 msgid "Override"
 msgstr ""
 
-#: modules/gui/macosx/open.m:332 modules/gui/macosx/open.m:511
-#: modules/gui/macosx/open.m:615 modules/gui/macosx/open.m:662
+#: modules/gui/macosx/open.m:333 modules/gui/macosx/open.m:527
+#: modules/gui/macosx/open.m:631 modules/gui/macosx/open.m:678
 msgid "Open"
 msgstr ""
 
-#: modules/gui/macosx/open.m:415 modules/gui/macosx/open.m:467
-#: modules/gui/macosx/open.m:475
+#: modules/gui/macosx/open.m:423 modules/gui/macosx/open.m:475
+#: modules/gui/macosx/open.m:483 modules/gui/macosx/open.m:491
 msgid "No %@s found"
 msgstr ""
 
-#: modules/gui/macosx/open.m:510
+#: modules/gui/macosx/open.m:526
 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:442
+#: modules/gui/macosx/output.m:136 modules/gui/wxwindows/streamout.cpp:526
 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:314
+#: 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:318
+#: 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:320
+#: modules/gui/macosx/output.m:143
+msgid "Transcode options"
+msgstr ""
+
+#: modules/gui/macosx/output.m:153 modules/gui/macosx/output.m:158
+#: modules/gui/wxwindows/streamout.cpp:604
+#: modules/gui/wxwindows/streamout.cpp:652
+msgid "Bitrate (kb/s)"
+msgstr ""
+
+#: modules/gui/macosx/output.m:282 modules/gui/macosx/output.m:329
 msgid "mp4"
 msgstr ""
 
-#: modules/gui/macosx/output.m:139
-msgid "Transcode options"
+#: modules/gui/macosx/prefs.m:80 modules/gui/wxwindows/preferences.cpp:259
+msgid "Reset All"
 msgstr ""
 
-#: modules/gui/macosx/output.m:149 modules/gui/macosx/output.m:153
-msgid "Bitrate (bps)"
+#: modules/gui/macosx/prefs.m:81
+msgid "Advanced"
 msgstr ""
 
-#: modules/gui/macosx/output.m:151
-msgid "mpga"
+#: modules/gui/macosx/prefs.m:170
+msgid "Reset Preferences"
 msgstr ""
 
-#: modules/gui/macosx/output.m:152
-msgid "a52 "
+#: 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:599 modules/gui/macosx/prefs.m:803
-#: modules/gui/macosx/prefs.m:825
-msgid "Advanced"
+#: 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
@@ -4206,749 +4326,403 @@ 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:336
+#: modules/gui/skins/src/skin_main.cpp:292
 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:341
+#: modules/gui/skins/src/skin_main.cpp:342
 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:343
+#: modules/gui/skins/src/skin_main.cpp:344
 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:345
+#: modules/gui/skins/src/skin_main.cpp:346
 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:347
+#: modules/gui/skins/src/skin_main.cpp:348
 msgid "Show application in taskbar"
 msgstr ""
 
-#: modules/gui/skins/src/skin_main.cpp:310
+#: modules/gui/skins/src/skin_main.cpp:359
 msgid "Skinnable Interface"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:12
-msgid "Version x.y.z"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:20
-msgid "Device &name:"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:21
-msgid "&Menus"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:22
-msgid "Starting position"
+#: modules/gui/wxwindows/fileinfo.cpp:77
+msgid "FileInfo"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:23
-msgid "&Title:"
+#: modules/gui/wxwindows/interface.cpp:258
+msgid "Open a DVD or (S)VCD"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:24
-msgid "&Chapter:"
+#: modules/gui/wxwindows/interface.cpp:259
+msgid "Open a network stream"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:28
-msgid "F:\\"
+#: modules/gui/wxwindows/interface.cpp:260
+msgid "Open a satellite stream"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:35
-msgid "ToolBar"
+#: modules/gui/wxwindows/interface.cpp:261
+msgid "Eject the DVD/CD"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:36
-msgid "ToolButtonSep1"
+#: modules/gui/wxwindows/interface.cpp:262
+msgid "Exit this program"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:37
-msgid "ToolButtonSep2"
+#: modules/gui/wxwindows/interface.cpp:264
+msgid "Open the playlist"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:38
-msgid "ToolButtonSep3"
+#: modules/gui/wxwindows/interface.cpp:265
+msgid "Show the program logs"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:39
-msgid "File read"
+#: modules/gui/wxwindows/interface.cpp:266
+msgid "Show information about the file being played"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:40
-msgid "Channel:"
+#: modules/gui/wxwindows/interface.cpp:268
+msgid "Go to the preferences menu"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:42
-msgid "Go!"
+#: modules/gui/wxwindows/interface.cpp:270
+msgid "About this program"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:46
-msgid "0:00:00"
+#: modules/gui/wxwindows/interface.cpp:274
+msgid "Simple &Open ..."
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:47 modules/gui/wxwindows/interface.cpp:296
-msgid "&File"
+#: modules/gui/wxwindows/interface.cpp:276
+msgid "Open &File..."
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:48
-msgid "Open &file..."
+#: modules/gui/wxwindows/interface.cpp:278
+msgid "Open &Disc..."
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:49
-msgid "Open &disc..."
+#: modules/gui/wxwindows/interface.cpp:280
+msgid "Open &Network Stream..."
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:50
-msgid "&Network stream..."
+#: modules/gui/wxwindows/interface.cpp:283
+msgid "Open &Satellite Stream..."
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:51 modules/gui/wxwindows/interface.cpp:297
-msgid "&View"
+#: modules/gui/wxwindows/interface.cpp:288
+msgid "&Eject Disc"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:52
-msgid "&Hide interface"
+#: modules/gui/wxwindows/interface.cpp:292
+msgid "E&xit"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:54 modules/gui/wxwindows/interface.cpp:267
+#: modules/gui/wxwindows/interface.cpp:296
 msgid "&Playlist..."
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:55
-msgid "&Add interface"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:56
-msgid "Spawn a new interface"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:57
-msgid "&Controls"
+#: modules/gui/wxwindows/interface.cpp:298
+msgid "&Messages..."
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:59
-msgid "C&hannels"
+#: modules/gui/wxwindows/interface.cpp:299
+msgid "&File info..."
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:61
-msgid "Sc&reen"
+#: modules/gui/wxwindows/interface.cpp:304
+msgid "&Preferences..."
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:62
-msgid "&Program"
+#: modules/gui/wxwindows/interface.cpp:321
+msgid "&About..."
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:64
-msgid "&Title"
+#: modules/gui/wxwindows/interface.cpp:325
+msgid "&File"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:66
-msgid "&Chapter"
+#: modules/gui/wxwindows/interface.cpp:326
+msgid "&View"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:68
-msgid "&Angle"
+#: modules/gui/wxwindows/interface.cpp:327
+msgid "&Settings"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:69
-msgid "Select angle"
+#: modules/gui/wxwindows/interface.cpp:328
+#: modules/gui/wxwindows/interface.cpp:515
+#: modules/gui/wxwindows/interface.cpp:563
+msgid "&Audio"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:70
-msgid "&Language"
+#: modules/gui/wxwindows/interface.cpp:329
+#: modules/gui/wxwindows/interface.cpp:534
+#: modules/gui/wxwindows/interface.cpp:567
+msgid "&Video"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:72
-msgid "&Subtitles"
+#: modules/gui/wxwindows/interface.cpp:330
+#: modules/gui/wxwindows/interface.cpp:553
+#: modules/gui/wxwindows/interface.cpp:571
+msgid "&Navigation"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:74 modules/gui/wxwindows/interface.cpp:302
+#: modules/gui/wxwindows/interface.cpp:331
 msgid "&Help"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:75
-msgid "Close this popup"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:76
-msgid "Show interface"
+#: modules/gui/wxwindows/interface.cpp:347
+msgid "Stop current playlist item"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:78
-msgid "&Jump..."
+#: modules/gui/wxwindows/interface.cpp:348
+msgid "Play current playlist item"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:79
-msgid "Audio settings"
+#: modules/gui/wxwindows/interface.cpp:349
+msgid "Pause current playlist item"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:82
-msgid "Video settings"
+#: modules/gui/wxwindows/interface.cpp:350
+#: modules/gui/wxwindows/playlist.cpp:354
+msgid "Open playlist"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:89
-msgid "New stream"
+#: modules/gui/wxwindows/interface.cpp:351
+msgid "Previous playlist item"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:92
-msgid "Network Stream..."
+#: modules/gui/wxwindows/interface.cpp:352
+msgid "Next playlist item"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:109 modules/gui/wxwindows/interface.cpp:324
+#: modules/gui/wxwindows/interface.cpp:353
 msgid "Play slower"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:111 modules/gui/wxwindows/interface.cpp:325
+#: modules/gui/wxwindows/interface.cpp:354
 msgid "Play faster"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:115
-msgid "Next file"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:116
-msgid "&Stream output..."
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:117
-msgid "Open the stream output"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:118
-msgid "&Add subtitles..."
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:119
-msgid "Add a subtitle file"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:122
-msgid "Exit"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:124
-msgid "&Fullscreen"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:130
-msgid "About..."
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:135
-msgid "Select next title"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:140
-msgid "Volume &Up"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:141
-msgid "Increase the volume"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:142
-msgid "Volume &Down"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:143
-msgid "Decrease the volume"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:144
-msgid "&Mute"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:145
-msgid "Toggle mute"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:146
-msgid "Always on top..."
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:147
-msgid "Set the window on top"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:155
-msgid "&Copy text"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:161
-msgid "Open network"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:162
-msgid "Network mode"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:163 modules/gui/win32/strings.cpp:164
-#: modules/gui/win32/strings.cpp:165 modules/gui/win32/strings.cpp:223
-msgid "Port:"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:168
-msgid "URL:"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:171
-msgid "Channel server"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:181 modules/gui/wxwindows/streamout.cpp:368
-msgid "Filename"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:184
-msgid "&Add"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:185
-msgid "&File..."
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:186
-msgid "&Disc..."
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:187
-msgid "&Network..."
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:188
-msgid "&Url"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:189 modules/gui/wxwindows/playlist.cpp:124
-msgid "&Delete"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:190 modules/gui/win32/strings.cpp:191
-#: modules/gui/wxwindows/playlist.cpp:130
-msgid "&Selection"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:192
-msgid "&Invert selection"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:193
-msgid "&Crop selection"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:194
-msgid "&Delete selection"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:195
-msgid "Delete &all"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:197
-msgid "Invert selection"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:199
-msgid "Crop selection"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:201
-msgid "Delete selection"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:203
-msgid "Delete all items"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:205
-msgid "Play the selected stream"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:222
-msgid "Stream output MRL (Media Resource Locator)"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:225
-msgid "file/ts://"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:230
-msgid "239.239.0.1"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:240
-msgid "Add subtitles"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:242
-msgid "Delay:"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:243
-msgid "FPS:"
-msgstr ""
-
-#: modules/gui/win32/strings.cpp:245 modules/gui/win32/strings.cpp:247
-msgid "0.0"
-msgstr ""
-
-#: modules/gui/win32/win32.cpp:302
-msgid "Maximum number of lines in the log window"
-msgstr ""
-
-#: modules/gui/win32/win32.cpp:304
-msgid ""
-"You can set the maximum number of lines that the log window will display."
-msgstr ""
-
-#: modules/gui/win32/win32.cpp:305
-msgid " Enter -1 if you want to keep all messages."
-msgstr ""
-
-#: modules/gui/win32/win32.cpp:306
-msgid "Display text under images in the toolbar"
-msgstr ""
-
-#: modules/gui/win32/win32.cpp:308
-msgid "Check this option if you want to display the caption of the buttons in "
-msgstr ""
-
-#: modules/gui/win32/win32.cpp:309
-msgid "the toolbar. Beware, the display may be messed up"
-msgstr ""
-
-#: modules/gui/win32/win32.cpp:317
-msgid "Native Windows interface"
-msgstr ""
-
-#: modules/gui/wxwindows/fileinfo.cpp:77
-msgid "FileInfo"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:231
-msgid "Open a DVD or (S)VCD"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:232
-msgid "Open a network stream"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:233
-msgid "Open a satellite stream"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:234
-msgid "Eject the DVD/CD"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:235
-msgid "Exit this program"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:237
-msgid "Open the playlist"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:238
-msgid "Show the program logs"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:239
-msgid "Show information about the file being played"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:241
-msgid "Go to the preferences menu"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:243
-msgid "About this program"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:247
-msgid "&Open File..."
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:249
-msgid "Open &Disc..."
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:251
-msgid "&Network Stream..."
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:254
-msgid "&Satellite Stream..."
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:259
-msgid "&Eject Disc"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:263
-msgid "E&xit"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:269
-msgid "&Logs..."
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:270
-msgid "&File info..."
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:275
-msgid "&Preferences..."
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:292
-msgid "&About..."
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:298
-msgid "&Settings"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:299
-#: modules/gui/wxwindows/interface.cpp:472
-#: modules/gui/wxwindows/interface.cpp:520
-msgid "&Audio"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:300
-#: modules/gui/wxwindows/interface.cpp:491
-#: modules/gui/wxwindows/interface.cpp:524
-msgid "&Video"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:301
-#: modules/gui/wxwindows/interface.cpp:510
-#: modules/gui/wxwindows/interface.cpp:528
-msgid "&Navigation"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:318
-msgid "Stop current playlist item"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:319
-msgid "Play current playlist item"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:320
-msgid "Pause current playlist item"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:321
-#: modules/gui/wxwindows/playlist.cpp:351
-msgid "Open playlist"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:322
-msgid "Previous playlist item"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:323
-msgid "Next playlist item"
-msgstr ""
-
-#: modules/gui/wxwindows/interface.cpp:556
+#: modules/gui/wxwindows/interface.cpp:598
 msgid ""
 " (wxWindows interface)\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:557
+#: modules/gui/wxwindows/interface.cpp:599
 msgid ""
 "(C) 1996-2003 - the VideoLAN Team\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:558
+#: modules/gui/wxwindows/interface.cpp:600
 msgid ""
 "The VideoLAN team <videolan@videolan.org>\n"
 "http://www.videolan.org/\n"
 "\n"
 msgstr ""
 
-#: modules/gui/wxwindows/interface.cpp:560
+#: modules/gui/wxwindows/interface.cpp:602
 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:564
+#: modules/gui/wxwindows/interface.cpp:606
 #, 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:137
+#: modules/gui/wxwindows/menus.cpp:145
 msgid "Input menu"
 msgstr ""
 
-#: modules/gui/wxwindows/menus.cpp:325
+#: 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:116
+msgid "Save As..."
+msgstr ""
+
+#: modules/gui/wxwindows/messages.cpp:121
 msgid "Verbose"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:177
+#: modules/gui/wxwindows/messages.cpp:222
+msgid "Save Messages As a file..."
+msgstr ""
+
+#: modules/gui/wxwindows/open.cpp:178
 msgid ""
 "You can use this field directly by typing the full MRL you want to open.\n"
 "Alternatively, the field will be filled automatically when you use the "
 "controls below."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:194 modules/gui/wxwindows/subtitles.cpp:98
+#: modules/gui/wxwindows/open.cpp:195 modules/gui/wxwindows/subtitles.cpp:98
 msgid "Subtitles file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:195
+#: modules/gui/wxwindows/open.cpp:196
 msgid "Load an additional subtitles file. Currently only works with AVI files."
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:218
+#: modules/gui/wxwindows/open.cpp:219
 msgid "Use VLC as a stream server"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:238
+#: modules/gui/wxwindows/open.cpp:239
 msgid "Capture input stream"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:240
+#: modules/gui/wxwindows/open.cpp:241
 msgid "Capture the stream you are playing to a file"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:360
+#: modules/gui/wxwindows/open.cpp:372
 msgid "DVD (menus support)"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:363
+#: modules/gui/wxwindows/open.cpp:375
 msgid "CD Audio"
 msgstr ""
 
-#: modules/gui/wxwindows/open.cpp:774 modules/gui/wxwindows/streamout.cpp:726
+#: modules/gui/wxwindows/open.cpp:854 modules/gui/wxwindows/streamout.cpp:776
 msgid "Save file"
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:115
+#: modules/gui/wxwindows/playlist.cpp:117
+msgid "&Simple Add..."
+msgstr ""
+
+#: modules/gui/wxwindows/playlist.cpp:118
 msgid "&Add MRL..."
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:116
+#: modules/gui/wxwindows/playlist.cpp:119
 msgid "&Open Playlist..."
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:117
+#: modules/gui/wxwindows/playlist.cpp:120
 msgid "&Save Playlist..."
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:119
+#: modules/gui/wxwindows/playlist.cpp:122
 msgid "&Close"
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:123
+#: modules/gui/wxwindows/playlist.cpp:126
 msgid "&Invert"
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:125
-msgid "&Select All"
+#: modules/gui/wxwindows/playlist.cpp:127
+msgid "&Delete"
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:129
-msgid "&Manage"
+#: modules/gui/wxwindows/playlist.cpp:128
+msgid "&Select All"
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:226
-msgid "no info"
+#: modules/gui/wxwindows/playlist.cpp:132
+msgid "&Manage"
 msgstr ""
 
-#: modules/gui/wxwindows/playlist.cpp:330
-msgid "Save playlist"
+#: modules/gui/wxwindows/playlist.cpp:133
+msgid "&Selection"
 msgstr ""
 
-#: modules/gui/wxwindows/preferences.cpp:256
-msgid "Reset All"
+#: modules/gui/wxwindows/playlist.cpp:229
+msgid "no info"
 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?"
+#: modules/gui/wxwindows/playlist.cpp:333
+msgid "Save playlist"
 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:189
 msgid "Stream output MRL"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:170
+#: modules/gui/wxwindows/streamout.cpp:193
 msgid "Destination Target:"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:173
+#: modules/gui/wxwindows/streamout.cpp:196
 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:338
+#: modules/gui/wxwindows/streamout.cpp:373
 msgid "Output Methods"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:344
+#: modules/gui/wxwindows/streamout.cpp:379
 msgid "Play locally"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:480
-msgid "Transcoding options"
+#: modules/gui/wxwindows/streamout.cpp:403
+msgid "Filename"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:511
-msgid "Video codec"
+#: modules/gui/wxwindows/streamout.cpp:479
+msgid "Miscellaneous Options"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:517
-#: modules/gui/wxwindows/streamout.cpp:554
-msgid "Bitrate (kb/s)"
+#: modules/gui/wxwindows/streamout.cpp:491
+msgid "SAP Announce"
 msgstr ""
 
-#: modules/gui/wxwindows/streamout.cpp:548
+#: modules/gui/wxwindows/streamout.cpp:493
+msgid "Channel Name "
+msgstr ""
+
+#: modules/gui/wxwindows/streamout.cpp:564
+msgid "Transcoding options"
+msgstr ""
+
+#: modules/gui/wxwindows/streamout.cpp:597
+msgid "Video codec"
+msgstr ""
+
+#: modules/gui/wxwindows/streamout.cpp:644
 msgid "Audio codec"
 msgstr ""
 
@@ -4998,42 +4772,66 @@ 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 ""
 
+#: modules/misc/dummy/dummy.c:84
+msgid "dummy font renderer function"
+msgstr ""
+
 #: modules/misc/dummy/interface.c:52
 msgid "Using the dummy interface plugin..."
 msgstr ""
 
+#: modules/misc/freetype.c:56 modules/visualization/xosd/xosd.c:71
+msgid "Font"
+msgstr ""
+
+#: modules/misc/freetype.c:57
+msgid "Filename of Font"
+msgstr ""
+
+#: modules/misc/freetype.c:58
+msgid "Font size"
+msgstr ""
+
+#: modules/misc/freetype.c:59
+msgid "The size of the fonts used by the osd module"
+msgstr ""
+
+#: modules/misc/freetype.c:62
+msgid "Fonts"
+msgstr ""
+
+#: modules/misc/freetype.c:65
+msgid "freetype2 font renderer"
+msgstr ""
+
 #: modules/misc/gtk_main.c:60
 msgid "Gtk+ GUI helper"
 msgstr ""
 
-#: modules/misc/httpd.c:95
+#: modules/misc/httpd.c:94
 msgid "HTTP 1.0 daemon"
 msgstr ""
 
@@ -5062,10 +4860,6 @@ msgstr ""
 msgid "Using the logger interface plugin..."
 msgstr ""
 
-#: modules/misc/memcpy/memcpyaltivec.c:52
-msgid "AltiVec memcpy"
-msgstr ""
-
 #: modules/misc/memcpy/memcpy.c:81
 msgid "libc memcpy"
 msgstr ""
@@ -5082,23 +4876,65 @@ msgstr ""
 msgid "MMX EXT memcpy"
 msgstr ""
 
+#: modules/misc/memcpy/memcpyaltivec.c:52
+msgid "AltiVec memcpy"
+msgstr ""
+
 #: modules/misc/network/ipv4.c:85
 msgid "IPv4 network abstraction layer"
 msgstr ""
 
-#: 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:131
+#: modules/misc/sap.c:144 modules/misc/sap.c:145
+msgid "SAP multicast address"
+msgstr ""
+
+#: modules/misc/sap.c:146
+msgid "No IPv4-SAP listening"
+msgstr ""
+
+#: modules/misc/sap.c:147
+msgid "Set this if you do not want SAP to listen for IPv4 announces"
+msgstr ""
+
+#: modules/misc/sap.c:148
+msgid "IPv6-SAP listening"
+msgstr ""
+
+#: modules/misc/sap.c:149
+msgid "Set this if you want SAP to listen for IPv6 announces"
+msgstr ""
+
+#: modules/misc/sap.c:150
+msgid "IPv6 SAP scope"
+msgstr ""
+
+#: modules/misc/sap.c:151
+msgid "Sets the scope for IPv6 announces (default is 8)"
+msgstr ""
+
+#: modules/misc/sap.c:154
 msgid "SAP"
 msgstr ""
 
-#: modules/misc/sap.c:134
+#: modules/misc/sap.c:167
 msgid "SAP interface"
 msgstr ""
 
@@ -5126,7 +4962,7 @@ msgstr ""
 msgid "MP4/MOV muxer"
 msgstr ""
 
-#: modules/mux/mpeg/ps.c:77
+#: modules/mux/mpeg/ps.c:79
 msgid "PS muxer"
 msgstr ""
 
@@ -5138,7 +4974,7 @@ msgstr ""
 msgid "TS muxer (libdvbpsi)"
 msgstr ""
 
-#: modules/mux/ogg.c:54
+#: modules/mux/ogg.c:55
 msgid "Ogg/ogm muxer"
 msgstr ""
 
@@ -5162,10 +4998,14 @@ msgstr ""
 msgid "MPEG-I/II audio packetizer"
 msgstr ""
 
-#: modules/packetizer/mpegvideo.c:73
+#: modules/packetizer/mpegvideo.c:88
 msgid "MPEG-I/II video packetizer"
 msgstr ""
 
+#: modules/packetizer/vorbis.c:89
+msgid "Vorbis audio packetizer"
+msgstr ""
+
 #: modules/stream_out/display.c:50
 msgid "Display stream"
 msgstr ""
@@ -5182,11 +5022,11 @@ msgstr ""
 msgid "ES stream"
 msgstr ""
 
-#: modules/stream_out/standard.c:47
+#: modules/stream_out/standard.c:51
 msgid "Standard stream"
 msgstr ""
 
-#: modules/stream_out/transcode.c:63
+#: modules/stream_out/transcode.c:71
 msgid "Transcode stream"
 msgstr ""
 
@@ -5219,7 +5059,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
@@ -5235,7 +5075,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
@@ -5243,7 +5083,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
@@ -5283,7 +5123,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
@@ -5330,40 +5172,52 @@ msgstr ""
 msgid "invert video filter"
 msgstr ""
 
-#: modules/video_filter/motionblur.c:54
-msgid "Blur factor"
+#: modules/video_filter/logo.c:58
+msgid "Logo File"
 msgstr ""
 
-#: modules/video_filter/motionblur.c:55
-msgid "The degree of blurring from 1 to 127"
+#: modules/video_filter/logo.c:59
+msgid "It must be a PNG in RGBA 8bits (for now)"
 msgstr ""
 
-#: modules/video_filter/motionblur.c:60
-msgid "motion blur filter"
+#: modules/video_filter/logo.c:60
+msgid "x postion of the logo"
 msgstr ""
 
-#: modules/video_filter/osd_text.c:66 modules/visualization/xosd/xosd.c:71
-msgid "Font"
+#: modules/video_filter/logo.c:61 modules/video_filter/logo.c:63
+msgid "You can move the logo by left-clicking on it"
 msgstr ""
 
-#: modules/video_filter/osd_text.c:67
-msgid "Filename of Font"
+#: modules/video_filter/logo.c:62
+msgid "y position of the logo"
 msgstr ""
 
-#: modules/video_filter/osd_text.c:68
-msgid "Font size"
+#: modules/video_filter/logo.c:64
+msgid "transparency of the logo"
 msgstr ""
 
-#: modules/video_filter/osd_text.c:69
-msgid "The size of the fonts used by the osd module"
+#: modules/video_filter/logo.c:65
+msgid "You can change it by middle-clicking and moving mouse left or right"
 msgstr ""
 
-#: modules/video_filter/osd_text.c:72
-msgid "OSD"
+#: modules/video_filter/logo.c:68
+msgid "logo"
 msgstr ""
 
-#: modules/video_filter/osd_text.c:75
-msgid "osd text filter"
+#: modules/video_filter/logo.c:73
+msgid "logo video filter"
+msgstr ""
+
+#: modules/video_filter/motionblur.c:54
+msgid "Blur factor"
+msgstr ""
+
+#: modules/video_filter/motionblur.c:55
+msgid "The degree of blurring from 1 to 127"
+msgstr ""
+
+#: modules/video_filter/motionblur.c:60
+msgid "motion blur filter"
 msgstr ""
 
 #: modules/video_filter/transform.c:57
@@ -5411,29 +5265,30 @@ msgstr ""
 msgid "ASCII-art video output"
 msgstr ""
 
-#: modules/video_output/directx/directx.c:90
+#: modules/video_output/directx/directx.c:94
+#: modules/video_output/directx/directx.c:225
 msgid "Always on top"
 msgstr ""
 
-#: modules/video_output/directx/directx.c:91
+#: modules/video_output/directx/directx.c:95
 msgid "Place the directx window on top of other windows"
 msgstr ""
 
-#: modules/video_output/directx/directx.c:92
+#: modules/video_output/directx/directx.c:96
 msgid "Use hardware YUV->RGB conversions"
 msgstr ""
 
-#: modules/video_output/directx/directx.c:94
+#: modules/video_output/directx/directx.c:98
 msgid ""
 "Try to use hardware acceleration for YUV->RGB conversions. This option "
 "doesn't have any effect when using overlays."
 msgstr ""
 
-#: modules/video_output/directx/directx.c:96
+#: modules/video_output/directx/directx.c:100
 msgid "Use video buffers in system memory"
 msgstr ""
 
-#: modules/video_output/directx/directx.c:98
+#: modules/video_output/directx/directx.c:102
 msgid ""
 "Create video buffers in system memory instead of video memory. This isn't "
 "recommended as usually using video memory allows to benefit from more "
@@ -5441,17 +5296,17 @@ msgid ""
 "doesn't have any effect when using overlays."
 msgstr ""
 
-#: modules/video_output/directx/directx.c:102
+#: modules/video_output/directx/directx.c:106
 msgid "Use triple buffering for overlays"
 msgstr ""
 
-#: modules/video_output/directx/directx.c:104
+#: modules/video_output/directx/directx.c:108
 msgid ""
 "Try to use triple bufferring when using YUV overlays. That results in much "
 "better video quality (no flickering)."
 msgstr ""
 
-#: modules/video_output/directx/directx.c:113
+#: modules/video_output/directx/directx.c:117
 msgid "DirectX video output"
 msgstr ""
 
@@ -5551,11 +5406,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 ""
 
@@ -5579,11 +5444,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 ""
 
@@ -5619,10 +5484,10 @@ 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 ""