* Bumped up revision number to 0.5.3-test2

* modules/access_output/udp.c: Now supports IPv6 IP addresses (patch
  courtesy of Alexis Guillard)
* po/*: Updated po files to send out to the translators
* Mac OS X port: Cosmetics

configure.ac.in

 dnl Autoconf settings for vlc
 
-AC_INIT(vlc,0.5.3-test1)
+AC_INIT(vlc,0.5.3-test2)
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Natalya"
@@ -12,7 +12,7 @@ AC_CANONICAL_SYSTEM
 
 dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
 dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.5.3-test1)
+AM_INIT_AUTOMAKE(vlc,0.5.3-test2)
 AM_CONFIG_HEADER(config.h)
 
 dnl

extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib

@@ -21,6 +21,10 @@
 	<array>
 		<integer>977</integer>
 	</array>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>636</integer>
+	</array>
 	<key>IBSystem Version</key>
 	<string>6I32</string>
 </dict>

extras/MacOSX/vlc.pbproj/project.pbxproj

@@ -367,7 +367,7 @@
 	<key>CFBundleExecutable</key>
 	<string>VLC</string>
 	<key>CFBundleGetInfoString</key>
-	<string>VLC media player 0.5.3-test1, Copyright (c) 1996-2003 VideoLAN.</string>
+	<string>VLC media player 0.5.3-test2, Copyright (c) 1996-2003 VideoLAN.</string>
 	<key>CFBundleIconFile</key>
 	<string>vlc.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -379,7 +379,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.5.3-test1</string>
+	<string>0.5.3-test2</string>
 	<key>CFBundleSignature</key>
 	<string>VLC#</string>
 	<key>CFBundleURLTypes</key>
@@ -426,7 +426,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>0.5.3-test1</string>
+	<string>0.5.3-test2</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSMainNibFile</key>

modules/access_output/udp.c

@@ -2,7 +2,7 @@
  * udp.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: udp.c,v 1.6 2003/03/11 19:02:30 fenrir Exp $
+ * $Id: udp.c,v 1.7 2003/04/01 22:29:41 massiot Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -142,6 +142,13 @@ static int Open( vlc_object_t *p_this )
     psz_dst_addr = psz_parser;
     i_dst_port = 0;
 
+    if ( *psz_parser == '[' )
+    {
+        while( *psz_parser && *psz_parser != ']' )
+        {
+            psz_parser++;
+        }
+    }
     while( *psz_parser && *psz_parser != ':' )
     {
         psz_parser++;

modules/gui/macosx/open.m

@@ -2,7 +2,7 @@
  * open.m: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: open.m,v 1.26 2003/03/26 03:13:30 hartman Exp $
+ * $Id: open.m,v 1.27 2003/04/01 22:29:41 massiot Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -182,7 +182,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
 
     [o_sout_cbox setTitle: _NS("Stream output:")];
     [o_sout_btn_ok setTitle: _NS("OK")];
-    [o_sout_settings setTitle: _NS("Settings")];
+    [o_sout_settings setTitle: _NS("Settings...")];
     [o_sout_mrl_lbl setTitle: _NS("Stream output MRL")];
     
     [o_sout_access_lbl setTitle: _NS("Output Method")];
@@ -202,7 +202,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     [[o_sout_mux cellAtRow:0 column:3] setTitle: _NS("Ogg")];
     
     [o_file_sub_ckbox setTitle: _NS("Load subtitles file:")];
-    [o_file_sub_btn_settings setTitle: _NS("Settings")];
+    [o_file_sub_btn_settings setTitle: _NS("Settings...")];
     [o_file_sub_btn_browse setTitle: _NS("Browse...")];
     [o_file_sub_override setTitle: _NS("Override")];
     [o_file_sub_delay_lbl setStringValue: _NS("delay")];

po/en_GB.po

@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vlc\n"
-"POT-Creation-Date: 2003-04-01 00:36+0200\n"
+"POT-Creation-Date: 2003-04-02 00:02+0200\n"
 "PO-Revision-Date: 2002-04-22 09:56+0200\n"
 "Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
 "Language-Team: \n"
@@ -831,7 +831,8 @@ msgstr ""
 
 #: src/libvlc.h:537 modules/gui/gtk/gnome_interface.c:2149
 #: modules/gui/gtk/gtk_interface.c:2468 modules/gui/gtk/gtk_interface.c:3150
-#: modules/gui/win32/strings.cpp:221
+#: modules/gui/win32/strings.cpp:221 modules/gui/wxwindows/open.cpp:177
+#: modules/gui/wxwindows/streamout.cpp:129
 msgid "Stream output"
 msgstr ""
 
@@ -845,7 +846,7 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2525 modules/gui/gtk/gtk_interface.c:752
 #: modules/gui/gtk/gtk_interface.c:2813 modules/gui/macosx/intf.m:281
 #: modules/gui/macosx/intf.m:356 modules/gui/win32/strings.cpp:120
-#: modules/gui/win32/strings.cpp:180 modules/gui/wxwindows/interface.cpp:290
+#: modules/gui/win32/strings.cpp:180 modules/gui/wxwindows/interface.cpp:289
 msgid "Playlist"
 msgstr ""
 
@@ -1235,9 +1236,8 @@ msgstr ""
 msgid "audio filter for bandlimited interpolation resampling"
 msgstr ""
 
-#: modules/audio_filter/resampler/coreaudio.c:63
-#: modules/audio_filter/resampler/ugly.c:46
-msgid "audio filter for ugly resampling"
+#: modules/audio_filter/resampler/coreaudio.c:64
+msgid "audio filter using CoreAudio for resampling"
 msgstr ""
 
 #: modules/audio_filter/resampler/linear.c:59
@@ -1248,6 +1248,10 @@ msgstr ""
 msgid "audio filter for trivial resampling"
 msgstr ""
 
+#: modules/audio_filter/resampler/ugly.c:46
+msgid "audio filter for ugly resampling"
+msgstr ""
+
 #: modules/audio_mixer/float32.c:45
 msgid "float32 audio mixer"
 msgstr ""
@@ -1656,7 +1660,7 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1061 modules/gui/gtk/gtk_interface.c:714
 #: modules/gui/gtk/gtk_interface.c:1160 modules/gui/macosx/intf.m:869
 #: modules/gui/macosx/intf.m:870 modules/gui/macosx/intf.m:871
-#: modules/gui/win32/strings.cpp:102 modules/gui/wxwindows/interface.cpp:616
+#: modules/gui/win32/strings.cpp:102 modules/gui/wxwindows/interface.cpp:607
 msgid "Pause"
 msgstr ""
 
@@ -1667,8 +1671,8 @@ msgstr ""
 #: modules/gui/macosx/intf.m:369 modules/gui/macosx/intf.m:876
 #: modules/gui/macosx/intf.m:877 modules/gui/macosx/intf.m:878
 #: modules/gui/macosx/playlist.m:172 modules/gui/win32/strings.cpp:100
-#: modules/gui/win32/strings.cpp:204 modules/gui/wxwindows/interface.cpp:287
-#: modules/gui/wxwindows/interface.cpp:621
+#: modules/gui/win32/strings.cpp:204 modules/gui/wxwindows/interface.cpp:286
+#: modules/gui/wxwindows/interface.cpp:612
 msgid "Play"
 msgstr ""
 
@@ -1782,23 +1786,19 @@ msgstr ""
 msgid "Planes"
 msgstr ""
 
-#: modules/demux/asf/asf.c:326
-msgid "Bits per pixel"
-msgstr ""
-
-#: modules/demux/asf/asf.c:328
-msgid "Compression Rate"
+#: modules/demux/asf/asf.c:326 modules/demux/avi/avi.c:1049
+msgid "Bits Per Pixel"
 msgstr ""
 
-#: modules/demux/asf/asf.c:330
+#: modules/demux/asf/asf.c:329
 msgid "Image Size"
 msgstr ""
 
-#: modules/demux/asf/asf.c:332
+#: modules/demux/asf/asf.c:331
 msgid "X pixels per meter"
 msgstr ""
 
-#: modules/demux/asf/asf.c:334
+#: modules/demux/asf/asf.c:333
 msgid "Y pixels per meter"
 msgstr ""
 
@@ -1839,10 +1839,6 @@ msgstr ""
 msgid "Frame Rate"
 msgstr ""
 
-#: modules/demux/avi/avi.c:1049
-msgid "Bits Per Pixel"
-msgstr ""
-
 #: modules/demux/avi/avi.c:1071
 msgid "Unknown"
 msgstr ""
@@ -1961,11 +1957,6 @@ msgstr ""
 msgid "Height"
 msgstr ""
 
-#: modules/demux/ogg.c:813
-#, c-format
-msgid "%.4s"
-msgstr ""
-
 #: modules/demux/ogg.c:822 modules/demux/ogg.c:995
 msgid "Bits per Sample"
 msgstr ""
@@ -2021,15 +2012,15 @@ msgstr ""
 msgid "VLC media player"
 msgstr ""
 
-#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:573
-#: modules/gui/wxwindows/preferences.cpp:842
+#: modules/gui/familiar/interface.c:124 modules/gui/wxwindows/open.cpp:574
+#: modules/gui/wxwindows/preferences.cpp:847
 #: modules/gui/skins/src/vlcproc.cpp:383
 msgid "Open file"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:149 modules/gui/familiar/interface.c:150
 #: modules/gui/macosx/intf.m:288 modules/gui/macosx/prefs.m:191
-#: modules/gui/win32/strings.cpp:211 modules/gui/wxwindows/preferences.cpp:220
+#: modules/gui/win32/strings.cpp:211 modules/gui/wxwindows/preferences.cpp:222
 msgid "Preferences"
 msgstr ""
 
@@ -2054,7 +2045,7 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:1168 modules/gui/macosx/intf.m:285
 #: modules/gui/macosx/intf.m:323 modules/gui/macosx/intf.m:370
 #: modules/gui/macosx/controls.m:653 modules/gui/win32/strings.cpp:104
-#: modules/gui/wxwindows/interface.cpp:285
+#: modules/gui/wxwindows/interface.cpp:284
 msgid "Stop"
 msgstr ""
 
@@ -2099,20 +2090,20 @@ msgstr ""
 #: modules/gui/macosx/open.m:154 modules/gui/macosx/open.m:189
 #: modules/gui/macosx/open.m:318 modules/gui/macosx/open.m:721
 #: modules/gui/macosx/open.m:757 modules/gui/win32/strings.cpp:93
-#: modules/gui/win32/strings.cpp:226 modules/gui/wxwindows/interface.cpp:274
-#: modules/gui/wxwindows/open.cpp:232 modules/gui/wxwindows/streamout.cpp:258
+#: modules/gui/win32/strings.cpp:226 modules/gui/wxwindows/interface.cpp:273
+#: modules/gui/wxwindows/open.cpp:233 modules/gui/wxwindows/streamout.cpp:259
 msgid "File"
 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:1805
 #: modules/gui/gtk/gnome_interface.c:1817 modules/gui/gtk/gtk_interface.c:2120
 #: modules/gui/gtk/gtk_interface.c:2132 modules/gui/macosx/open.m:172
-#: modules/gui/macosx/open.m:195 modules/gui/wxwindows/open.cpp:394
-#: modules/gui/wxwindows/open.cpp:416 modules/gui/wxwindows/streamout.cpp:294
+#: modules/gui/macosx/open.m:195 modules/gui/wxwindows/open.cpp:395
+#: modules/gui/wxwindows/open.cpp:417 modules/gui/wxwindows/streamout.cpp:295
 msgid "Address"
 msgstr ""
 
@@ -2123,13 +2114,13 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:2185 modules/gui/gtk/gtk_interface.c:2196
 #: modules/gui/gtk/gtk_interface.c:3341 modules/gui/macosx/open.m:171
 #: modules/gui/macosx/open.m:173 modules/gui/macosx/open.m:196
-#: modules/gui/wxwindows/open.cpp:379 modules/gui/wxwindows/open.cpp:402
-#: modules/gui/wxwindows/open.cpp:424 modules/gui/wxwindows/streamout.cpp:303
+#: modules/gui/wxwindows/open.cpp:380 modules/gui/wxwindows/open.cpp:403
+#: modules/gui/wxwindows/open.cpp:425 modules/gui/wxwindows/streamout.cpp:304
 msgid "Port"
 msgstr ""
 
 #: modules/gui/familiar/interface.c:478 modules/gui/macosx/open.m:190
-#: modules/gui/macosx/open.m:762 modules/gui/wxwindows/streamout.cpp:259
+#: modules/gui/macosx/open.m:762 modules/gui/wxwindows/streamout.cpp:260
 msgid "HTTP"
 msgstr ""
 
@@ -2144,7 +2135,7 @@ msgstr ""
 #: modules/gui/familiar/interface.c:516 modules/gui/gtk/gnome_interface.c:1937
 #: modules/gui/gtk/gnome_interface.c:2397 modules/gui/gtk/gtk_interface.c:2252
 #: modules/gui/gtk/gtk_interface.c:2856 modules/gui/macosx/open.m:156
-#: modules/gui/macosx/open.m:326 modules/gui/wxwindows/open.cpp:236
+#: modules/gui/macosx/open.m:326 modules/gui/wxwindows/open.cpp:237
 msgid "Network"
 msgstr ""
 
@@ -2261,7 +2252,7 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:20 modules/gui/gtk/gnome_interface.c:509
 #: modules/gui/gtk/gnome_interface.c:1027 modules/gui/gtk/gtk_interface.c:178
 #: modules/gui/gtk/gtk_interface.c:624 modules/gui/gtk/gtk_interface.c:1440
-#: modules/gui/win32/strings.cpp:94 modules/gui/wxwindows/interface.cpp:194
+#: modules/gui/win32/strings.cpp:94 modules/gui/wxwindows/interface.cpp:193
 msgid "Open a file"
 msgstr ""
 
@@ -2434,18 +2425,18 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:821 modules/gui/gtk/gtk_interface.c:2053
 #: modules/gui/gtk/gtk_interface.c:2842 modules/gui/macosx/open.m:155
 #: modules/gui/macosx/open.m:322 modules/gui/win32/strings.cpp:43
-#: modules/gui/win32/strings.cpp:95 modules/gui/wxwindows/interface.cpp:276
-#: modules/gui/wxwindows/open.cpp:234
+#: modules/gui/win32/strings.cpp:95 modules/gui/wxwindows/interface.cpp:275
+#: modules/gui/wxwindows/open.cpp:235
 msgid "Disc"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:532 modules/gui/gtk/gtk_interface.c:645
-#: modules/gui/win32/strings.cpp:97 modules/gui/wxwindows/interface.cpp:278
+#: modules/gui/win32/strings.cpp:97 modules/gui/wxwindows/interface.cpp:277
 msgid "Net"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:544 modules/gui/gtk/gtk_interface.c:656
-#: modules/gui/wxwindows/interface.cpp:281
+#: modules/gui/wxwindows/interface.cpp:280
 msgid "Sat"
 msgstr ""
 
@@ -2508,7 +2499,7 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:849 modules/gui/gtk/gtk_interface.c:893
 #: modules/gui/gtk/gtk_interface.c:1214 modules/gui/win32/strings.cpp:112
 #: modules/gui/win32/strings.cpp:132 modules/gui/win32/strings.cpp:136
-#: modules/gui/wxwindows/interface.cpp:292
+#: modules/gui/wxwindows/interface.cpp:291
 msgid "Prev"
 msgstr ""
 
@@ -2524,7 +2515,7 @@ msgstr ""
 #: modules/gui/macosx/intf.m:327 modules/gui/macosx/intf.m:371
 #: modules/gui/macosx/controls.m:661 modules/gui/win32/strings.cpp:114
 #: modules/gui/win32/strings.cpp:134 modules/gui/win32/strings.cpp:138
-#: modules/gui/wxwindows/interface.cpp:294
+#: modules/gui/wxwindows/interface.cpp:293
 msgid "Next"
 msgstr ""
 
@@ -2619,17 +2610,17 @@ msgid "Open Stream"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1524 modules/gui/gtk/gtk_interface.c:1839
-#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:155
+#: modules/gui/macosx/open.m:148 modules/gui/wxwindows/open.cpp:156
 msgid "Media Resource Locator (MRL)"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1546 modules/gui/gtk/gtk_interface.c:1861
-#: modules/gui/wxwindows/open.cpp:159
+#: modules/gui/wxwindows/open.cpp:160
 msgid "Open Target:"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1566 modules/gui/gtk/gtk_interface.c:1881
-#: modules/gui/wxwindows/open.cpp:170
+#: modules/gui/wxwindows/open.cpp:171
 msgid ""
 "Alternatively, you can build an MRL using one of the following predefined "
 "targets:"
@@ -2640,46 +2631,46 @@ msgstr ""
 #: modules/gui/gtk/gtk_interface.c:2422 modules/gui/macosx/open.m:158
 #: modules/gui/macosx/open.m:164 modules/gui/macosx/open.m:194
 #: modules/gui/macosx/open.m:206 modules/gui/win32/strings.cpp:229
-#: modules/gui/win32/strings.cpp:248 modules/gui/wxwindows/open.cpp:203
-#: modules/gui/wxwindows/open.cpp:293
-#: modules/gui/wxwindows/preferences.cpp:656
-#: modules/gui/wxwindows/streamout.cpp:283
+#: modules/gui/win32/strings.cpp:248 modules/gui/wxwindows/open.cpp:204
+#: modules/gui/wxwindows/open.cpp:294
+#: modules/gui/wxwindows/preferences.cpp:661
+#: modules/gui/wxwindows/streamout.cpp:284
 msgid "Browse..."
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1634 modules/gui/gtk/gtk_interface.c:1949
-#: modules/gui/win32/strings.cpp:25 modules/gui/wxwindows/open.cpp:316
+#: modules/gui/win32/strings.cpp:25 modules/gui/wxwindows/open.cpp:317
 msgid "Disc type"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1653 modules/gui/gtk/gtk_interface.c:1968
 #: modules/gui/macosx/open.m:168 modules/gui/macosx/open.m:527
-#: modules/gui/wxwindows/open.cpp:311
+#: modules/gui/wxwindows/open.cpp:312
 msgid "DVD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1661 modules/gui/gtk/gtk_interface.c:1976
 #: modules/gui/macosx/open.m:169 modules/gui/macosx/open.m:436
-#: modules/gui/macosx/open.m:519 modules/gui/wxwindows/open.cpp:313
+#: modules/gui/macosx/open.m:519 modules/gui/wxwindows/open.cpp:314
 msgid "VCD"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1669 modules/gui/gtk/gtk_interface.c:1984
-#: modules/gui/macosx/open.m:161
+#: modules/gui/macosx/open.m:161 modules/gui/wxwindows/open.cpp:323
 msgid "Device name"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1688 modules/gui/gtk/gtk_interface.c:1994
 #: modules/gui/gtk/menu.c:1007 modules/gui/gtk/menu.c:1375
 #: modules/gui/kde/interface.cpp:146 modules/gui/macosx/intf.m:333
-#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:336
+#: modules/gui/macosx/open.m:163 modules/gui/wxwindows/open.cpp:337
 msgid "Chapter"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1698 modules/gui/gtk/gtk_interface.c:2004
 #: modules/gui/gtk/menu.c:1345 modules/gui/gtk/menu.c:1366
 #: modules/gui/kde/interface.cpp:144 modules/gui/macosx/intf.m:332
-#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:330
+#: modules/gui/macosx/open.m:162 modules/gui/wxwindows/open.cpp:331
 msgid "Title"
 msgstr ""
 
@@ -2690,31 +2681,31 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:1755 modules/gui/gtk/gtk_interface.c:2070
 #: modules/gui/macosx/open.m:176 modules/gui/macosx/open.m:586
 #: modules/gui/macosx/open.m:624 modules/gui/win32/strings.cpp:169
-#: modules/gui/wxwindows/open.cpp:357
+#: modules/gui/wxwindows/open.cpp:358
 msgid "UDP/RTP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1765 modules/gui/gtk/gtk_interface.c:2080
 #: modules/gui/macosx/open.m:177 modules/gui/macosx/open.m:587
 #: modules/gui/macosx/open.m:636 modules/gui/win32/strings.cpp:170
-#: modules/gui/wxwindows/open.cpp:358
+#: modules/gui/wxwindows/open.cpp:359
 msgid "UDP/RTP Multicast"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1775 modules/gui/gtk/gtk_interface.c:2090
-#: modules/gui/win32/strings.cpp:171 modules/gui/wxwindows/open.cpp:359
+#: modules/gui/win32/strings.cpp:171 modules/gui/wxwindows/open.cpp:360
 msgid "Channel server"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1785 modules/gui/gtk/gtk_interface.c:2100
 #: modules/gui/macosx/open.m:178 modules/gui/macosx/open.m:588
 #: modules/gui/macosx/open.m:649 modules/gui/win32/strings.cpp:172
-#: modules/gui/wxwindows/open.cpp:360
+#: modules/gui/wxwindows/open.cpp:361
 msgid "HTTP/FTP/MMS"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:1827 modules/gui/gtk/gtk_interface.c:2142
-#: modules/gui/macosx/open.m:174 modules/gui/wxwindows/open.cpp:438
+#: modules/gui/macosx/open.m:174 modules/gui/wxwindows/open.cpp:439
 msgid "URL"
 msgstr ""
 
@@ -2743,7 +2734,7 @@ msgid "Horizontal"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2063 modules/gui/gtk/gtk_interface.c:2378
-#: modules/gui/wxwindows/open.cpp:239
+#: modules/gui/wxwindows/open.cpp:240
 msgid "Satellite"
 msgstr ""
 
@@ -2762,7 +2753,8 @@ msgid "fps"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2156 modules/gui/gtk/gtk_interface.c:2476
-#: modules/gui/wxwindows/open.cpp:180
+#: modules/gui/macosx/open.m:185 modules/gui/macosx/open.m:205
+#: modules/gui/wxwindows/open.cpp:181
 msgid "Settings..."
 msgstr ""
 
@@ -2783,7 +2775,7 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2404
 #: modules/gui/gtk/gnome_interface.c:2545 modules/gui/gtk/gtk_interface.c:2863
-#: modules/gui/wxwindows/playlist.cpp:135
+#: modules/gui/wxwindows/playlist.cpp:136
 msgid "Url"
 msgstr ""
 
@@ -2821,7 +2813,7 @@ msgid "Selection"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2552 modules/gui/gtk/gtk_interface.c:2973
-#: modules/gui/win32/strings.cpp:182 modules/gui/wxwindows/playlist.cpp:136
+#: modules/gui/win32/strings.cpp:182 modules/gui/wxwindows/playlist.cpp:137
 msgid "Duration"
 msgstr ""
 
@@ -2858,13 +2850,13 @@ msgstr ""
 #: modules/gui/gtk/gnome_interface.c:2973 modules/gui/gtk/gtk_interface.c:3228
 #: modules/gui/macosx/open.m:191 modules/gui/macosx/open.m:722
 #: modules/gui/macosx/open.m:768 modules/gui/win32/strings.cpp:227
-#: modules/gui/wxwindows/streamout.cpp:260
+#: modules/gui/wxwindows/streamout.cpp:261
 msgid "UDP"
 msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:2983 modules/gui/gtk/gtk_interface.c:3238
 #: modules/gui/macosx/open.m:192 modules/gui/macosx/open.m:723
-#: modules/gui/win32/strings.cpp:228 modules/gui/wxwindows/streamout.cpp:261
+#: modules/gui/win32/strings.cpp:228 modules/gui/wxwindows/streamout.cpp:262
 msgid "RTP"
 msgstr ""
 
@@ -2890,7 +2882,7 @@ msgstr ""
 
 #: modules/gui/gtk/gnome_interface.c:3088 modules/gui/gtk/gtk_interface.c:3333
 #: modules/gui/macosx/open.m:201 modules/gui/macosx/open.m:691
-#: modules/gui/macosx/open.m:752 modules/gui/wxwindows/streamout.cpp:348
+#: modules/gui/macosx/open.m:752 modules/gui/wxwindows/streamout.cpp:349
 msgid "AVI"
 msgstr ""
 
@@ -2988,11 +2980,11 @@ msgstr ""
 #: 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/open.cpp:224
-#: modules/gui/wxwindows/fileinfo.cpp:85 modules/gui/wxwindows/messages.cpp:94
-#: modules/gui/wxwindows/playlist.cpp:141
-#: modules/gui/wxwindows/preferences.cpp:240
-#: modules/gui/wxwindows/streamout.cpp:165
+#: modules/gui/win32/strings.cpp:249 modules/gui/wxwindows/open.cpp:225
+#: modules/gui/wxwindows/fileinfo.cpp:91 modules/gui/wxwindows/messages.cpp:95
+#: modules/gui/wxwindows/playlist.cpp:142
+#: modules/gui/wxwindows/preferences.cpp:243
+#: modules/gui/wxwindows/streamout.cpp:166
 msgid "OK"
 msgstr ""
 
@@ -3030,9 +3022,9 @@ msgstr ""
 #: modules/gui/macosx/prefs.m:739 modules/gui/macosx/open.m:152
 #: 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:226
-#: modules/gui/wxwindows/preferences.cpp:242
-#: modules/gui/wxwindows/streamout.cpp:167
+#: modules/gui/win32/strings.cpp:250 modules/gui/wxwindows/open.cpp:227
+#: modules/gui/wxwindows/preferences.cpp:245
+#: modules/gui/wxwindows/streamout.cpp:168
 msgid "Cancel"
 msgstr ""
 
@@ -3094,7 +3086,7 @@ msgstr ""
 
 #: modules/gui/gtk/preferences.c:596 modules/gui/gtk/preferences.c:613
 #: modules/gui/macosx/open.m:702 modules/gui/win32/strings.cpp:213
-#: modules/gui/wxwindows/preferences.cpp:243
+#: modules/gui/wxwindows/preferences.cpp:246
 msgid "Save"
 msgstr ""
 
@@ -3385,33 +3377,29 @@ msgstr ""
 msgid "Stream output:"
 msgstr ""
 
-#: modules/gui/macosx/open.m:185 modules/gui/macosx/open.m:205
-msgid "Settings"
-msgstr ""
-
-#: modules/gui/macosx/open.m:186
+#: modules/gui/macosx/open.m:186 modules/gui/wxwindows/streamout.cpp:144
 msgid "Stream output MRL"
 msgstr ""
 
-#: modules/gui/macosx/open.m:188 modules/gui/wxwindows/streamout.cpp:252
+#: modules/gui/macosx/open.m:188 modules/gui/wxwindows/streamout.cpp:253
 msgid "Output Method"
 msgstr ""
 
-#: modules/gui/macosx/open.m:198 modules/gui/wxwindows/streamout.cpp:340
+#: modules/gui/macosx/open.m:198 modules/gui/wxwindows/streamout.cpp:341
 msgid "Encapsulation Method"
 msgstr ""
 
-#: modules/gui/macosx/open.m:199 modules/gui/wxwindows/streamout.cpp:346
+#: modules/gui/macosx/open.m:199 modules/gui/wxwindows/streamout.cpp:347
 msgid "MPEG TS"
 msgstr ""
 
 #: modules/gui/macosx/open.m:200 modules/gui/macosx/open.m:689
-#: modules/gui/macosx/open.m:754 modules/gui/wxwindows/streamout.cpp:347
+#: modules/gui/macosx/open.m:754 modules/gui/wxwindows/streamout.cpp:348
 msgid "MPEG PS"
 msgstr ""
 
 #: modules/gui/macosx/open.m:202 modules/gui/macosx/open.m:693
-#: modules/gui/macosx/open.m:753 modules/gui/wxwindows/streamout.cpp:349
+#: modules/gui/macosx/open.m:753 modules/gui/wxwindows/streamout.cpp:350
 msgid "Ogg"
 msgstr ""
 
@@ -3548,7 +3536,7 @@ msgstr ""
 msgid "0:00:00"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:47 modules/gui/wxwindows/interface.cpp:243
+#: modules/gui/win32/strings.cpp:47 modules/gui/wxwindows/interface.cpp:242
 msgid "&File"
 msgstr ""
 
@@ -3564,7 +3552,7 @@ msgstr ""
 msgid "&Network stream..."
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:51 modules/gui/wxwindows/interface.cpp:244
+#: modules/gui/win32/strings.cpp:51 modules/gui/wxwindows/interface.cpp:243
 msgid "&View"
 msgstr ""
 
@@ -3572,7 +3560,7 @@ msgstr ""
 msgid "&Hide interface"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:54 modules/gui/wxwindows/interface.cpp:226
+#: modules/gui/win32/strings.cpp:54 modules/gui/wxwindows/interface.cpp:225
 msgid "&Playlist..."
 msgstr ""
 
@@ -3624,11 +3612,11 @@ msgstr ""
 msgid "&Language"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:72 modules/gui/wxwindows/interface.cpp:233
+#: modules/gui/win32/strings.cpp:72 modules/gui/wxwindows/interface.cpp:232
 msgid "&Subtitles"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:74 modules/gui/wxwindows/interface.cpp:246
+#: modules/gui/win32/strings.cpp:74 modules/gui/wxwindows/interface.cpp:245
 msgid "&Help"
 msgstr ""
 
@@ -3761,7 +3749,7 @@ msgstr ""
 msgid "URL:"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:181 modules/gui/wxwindows/streamout.cpp:279
+#: modules/gui/win32/strings.cpp:181 modules/gui/wxwindows/streamout.cpp:280
 msgid "Filename"
 msgstr ""
 
@@ -3785,12 +3773,12 @@ msgstr ""
 msgid "&Url"
 msgstr ""
 
-#: modules/gui/win32/strings.cpp:189 modules/gui/wxwindows/playlist.cpp:112
+#: modules/gui/win32/strings.cpp:189 modules/gui/wxwindows/playlist.cpp:113
 msgid "&Delete"
 msgstr ""
 
 #: modules/gui/win32/strings.cpp:190 modules/gui/win32/strings.cpp:191
-#: modules/gui/wxwindows/playlist.cpp:118
+#: modules/gui/wxwindows/playlist.cpp:119