Commit d0588ae7 authored by Christophe Massiot's avatar Christophe Massiot

* modules/gui/macosx/open.m: Removed channel server support

* po/*: Updated po files just before the 0.5.1 release
* modules/audio_filter/resampler/linear.c: fixed an initialization bug
parent 89c82172
$Id: NEWS,v 1.17 2003/02/15 20:02:16 jpsaman Exp $
$Id: NEWS,v 1.18 2003/02/16 01:29:39 massiot Exp $
Changes between 0.5.0 and 0.5.1:
--------------------------------
......@@ -39,6 +39,7 @@ Mac OS X port:
* added half, normal and double video window menu items
* new step forward/step backward commands
* the dock should no longer be visible in fullscreen mode
* the Mac OS X binary is now compiled with Ogg/theora support
* vlc.app is now VLC.app
Win32 port:
......
......@@ -23,9 +23,10 @@
</array>
<key>IBOpenObjects</key>
<array>
<integer>636</integer>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
<string>6G30</string>
<string>6I32</string>
</dict>
</plist>
......@@ -2,7 +2,7 @@
* linear.c : linear interpolation resampler
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: linear.c,v 1.7 2002/12/13 01:50:31 gbazin Exp $
* $Id: linear.c,v 1.8 2003/02/16 01:29:40 massiot Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Sigmund Augdal <sigmunau@idi.ntnu.no>
......@@ -86,7 +86,7 @@ static int Create( vlc_object_t *p_this )
return VLC_ENOMEM;
}
p_filter->p_sys->p_prev_sample = malloc(
p_filter->input.i_physical_channels * sizeof(int32_t) );
aout_FormatNbChannels( &p_filter->input ) * sizeof(int32_t) );
if( p_filter->p_sys->p_prev_sample == NULL )
{
msg_Err( p_filter, "out of memory" );
......
......@@ -2,7 +2,7 @@
* open.h: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: open.h,v 1.10 2003/02/05 02:31:27 hartman Exp $
* $Id: open.h,v 1.11 2003/02/16 01:29:40 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -75,11 +75,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
IBOutlet id o_net_udpm_port;
IBOutlet id o_net_udpm_port_lbl;
IBOutlet id o_net_udpm_port_stp;
IBOutlet id o_net_cs_addr;
IBOutlet id o_net_cs_addr_lbl;
IBOutlet id o_net_cs_port;
IBOutlet id o_net_cs_port_lbl;
IBOutlet id o_net_cs_port_stp;
IBOutlet id o_net_http_url;
IBOutlet id o_net_http_url_lbl;
......
......@@ -2,7 +2,7 @@
* open.m: MacOS X plugin for vlc
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: open.m,v 1.22 2003/02/09 19:28:43 massiot Exp $
* $Id: open.m,v 1.23 2003/02/16 01:29:40 massiot Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -192,19 +192,14 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
[o_net_udp_port_lbl setStringValue: _NS("Port")];
[o_net_udpm_addr_lbl setStringValue: _NS("Address")];
[o_net_udpm_port_lbl setStringValue: _NS("Port")];
[o_net_cs_addr_lbl setStringValue: _NS("Address")];
[o_net_cs_port_lbl setStringValue: _NS("Port")];
[o_net_http_url_lbl setStringValue: _NS("URL")];
[[o_net_mode cellAtRow:0 column:0] setTitle: _NS("UDP/RTP")];
[[o_net_mode cellAtRow:1 column:0] setTitle: _NS("UDP/RTP Multicast")];
[[o_net_mode cellAtRow:2 column:0] setTitle: _NS("Channel server")];
[[o_net_mode cellAtRow:3 column:0] setTitle: _NS("HTTP/FTP/MMS")];
[[o_net_mode cellAtRow:2 column:0] setTitle: _NS("HTTP/FTP/MMS")];
[o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )];
[o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )];
[o_net_cs_port setIntValue: config_GetInt( p_intf, "channel-port" )];
[o_net_cs_port_stp setIntValue: config_GetInt( p_intf, "channel-port" )];
[o_sout_cbox setTitle: _NS("Stream output")];
[o_sout_mrl_lbl setTitle: _NS("Stream output MRL")];
......@@ -254,14 +249,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
selector: @selector(openNetInfoChanged:)
name: NSControlTextDidChangeNotification
object: o_net_udpm_port];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(openNetInfoChanged:)
name: NSControlTextDidChangeNotification
object: o_net_cs_addr];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(openNetInfoChanged:)
name: NSControlTextDidChangeNotification
object: o_net_cs_port];
[[NSNotificationCenter defaultCenter] addObserver: self
selector: @selector(openNetInfoChanged:)
name: NSControlTextDidChangeNotification
......@@ -597,14 +584,12 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
NSString *o_mode;
BOOL b_udp = FALSE;
BOOL b_udpm = FALSE;
BOOL b_cs = FALSE;
BOOL b_http = FALSE;
o_mode = [[o_net_mode selectedCell] title];
if( [o_mode isEqualToString: _NS("UDP/RTP")] ) b_udp = TRUE;
else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] ) b_udpm = TRUE;
else if( [o_mode isEqualToString: _NS("Channel server")] ) b_cs = TRUE;
else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] ) b_http = TRUE;
[o_net_udp_port setEnabled: b_udp];
......@@ -612,9 +597,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
[o_net_udpm_addr setEnabled: b_udpm];
[o_net_udpm_port setEnabled: b_udpm];
[o_net_udpm_port_stp setEnabled: b_udpm];
[o_net_cs_addr setEnabled: b_cs];
[o_net_cs_port setEnabled: b_cs];
[o_net_cs_port_stp setEnabled: b_cs];
[o_net_http_url setEnabled: b_http];
[self openNetInfoChanged: nil];
......@@ -632,10 +614,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
{
[o_net_udpm_port setIntValue: [o_net_udpm_port_stp intValue]];
}
else if( i_tag == 2 )
{
[o_net_cs_port setIntValue: [o_net_cs_port_stp intValue]];
}
[self openNetInfoChanged: nil];
}
......@@ -643,15 +621,11 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
- (void)openNetInfoChanged:(NSNotification *)o_notification
{
NSString *o_mode;
vlc_bool_t b_channel;
NSString *o_mrl_string = [NSString string];
intf_thread_t * p_intf = [NSApp getIntf];
o_mode = [[o_net_mode selectedCell] title];
b_channel = (vlc_bool_t)[o_mode isEqualToString: _NS("Channel server")];
config_PutInt( p_intf, "network-channel", b_channel );
if( [o_mode isEqualToString: _NS("UDP/RTP")] )
{
int i_port = [o_net_udp_port intValue];
......@@ -677,25 +651,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
[o_mrl_string stringByAppendingFormat: @":%i", i_port];
}
}
else if( [o_mode isEqualToString: _NS("Channel server")] )
{
NSString *o_addr = [o_net_cs_addr stringValue];
int i_port = [o_net_cs_port intValue];
if( p_intf->p_vlc->p_channel == NULL )
{
network_ChannelCreate( p_intf );
}
config_PutPsz( p_intf, "channel-server", [o_addr lossyCString] );
if( i_port < 65536 )
{
config_PutInt( p_intf, "channel-port", i_port );
}
/* FIXME: we should use a playlist server instead */
o_mrl_string = [NSString stringWithString: @"udp://"];
}
else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] )
{
NSString *o_url = [o_net_http_url stringValue];
......
This diff is collapsed.
......@@ -17,7 +17,7 @@
msgid ""
msgstr ""
"Project-Id-Version: vlc\n"
"POT-Creation-Date: 2003-02-10 22:48+0100\n"
"POT-Creation-Date: 2003-02-16 02:27+0100\n"
"PO-Revision-Date: 2002-04-22 09:56+0200\n"
"Last-Translator: Samuel Hocevar <sam@zoy.org>\n"
"Language-Team: \n"
......@@ -26,49 +26,49 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. Translate "C" to the language code: "fr", "en_GB", "nl", "ru"...
#: src/libvlc.c:253
#: src/libvlc.c:254
msgid "C"
msgstr "en_GB"
#. Usage
#: src/libvlc.c:296 src/libvlc.c:1275
#: src/libvlc.c:297 src/libvlc.c:1306
#, c-format
msgid ""
"Usage: %s [options] [items]...\n"
"\n"
msgstr ""
#: src/libvlc.c:1132 src/misc/configuration.c:916
#: src/libvlc.c:1138 src/misc/configuration.c:916
msgid "string"
msgstr ""
#: src/libvlc.c:1150 src/misc/configuration.c:901
#: src/libvlc.c:1155 src/misc/configuration.c:901
msgid "integer"
msgstr ""
#: src/libvlc.c:1153 src/misc/configuration.c:908
#: src/libvlc.c:1158 src/misc/configuration.c:908
msgid "float"
msgstr ""
#: src/libvlc.c:1159
#: src/libvlc.c:1164
msgid " (default enabled)"
msgstr ""
#: src/libvlc.c:1160
#: src/libvlc.c:1165
msgid " (default disabled)"
msgstr ""
#: src/libvlc.c:1250 src/libvlc.c:1305 src/libvlc.c:1329
#: src/libvlc.c:1281 src/libvlc.c:1336 src/libvlc.c:1360
msgid ""
"\n"
"Press the RETURN key to continue...\n"
msgstr ""
#: src/libvlc.c:1278
#: src/libvlc.c:1309
msgid "[module] [description]\n"
msgstr ""
#: src/libvlc.c:1323
#: src/libvlc.c:1354
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"
......@@ -776,21 +776,21 @@ msgid "Interface"
msgstr ""
#. Audio options
#: modules/audio_output/file.c:108 modules/gui/gtk/gnome_interface.c:1133
#: modules/gui/gtk/gtk_interface.c:1260 modules/gui/macosx/intf.m:332
#: src/libvlc.h:441
#: src/libvlc.h:441 modules/audio_output/file.c:108
#: modules/gui/gtk/gnome_interface.c:1133 modules/gui/gtk/gtk_interface.c:1260
#: modules/gui/macosx/intf.m:332
msgid "Audio"
msgstr ""
#. Video options
#: modules/gui/gtk/gnome_interface.c:1140 modules/gui/gtk/gtk_interface.c:1337
#: modules/gui/macosx/intf.m:339 modules/misc/dummy/dummy.c:64
#: modules/video_output/directx/directx.c:107 src/libvlc.h:458
#: src/libvlc.h:458 modules/gui/gtk/gnome_interface.c:1140
#: modules/gui/gtk/gtk_interface.c:1337 modules/gui/macosx/intf.m:339
#: modules/misc/dummy/dummy.c:64 modules/video_output/directx/directx.c:107
msgid "Video"
msgstr ""
#. Input options
#: modules/access/satellite/satellite.c:66 src/libvlc.h:478
#: src/libvlc.h:478 modules/access/satellite/satellite.c:66
msgid "Input"
msgstr ""
......@@ -804,9 +804,9 @@ msgid "Encoders"
msgstr ""
#. Stream output options
#: modules/gui/gtk/gnome_interface.c:2149 modules/gui/gtk/gtk_interface.c:2468
#: modules/gui/gtk/gtk_interface.c:3150 modules/gui/macosx/open.m:209
#: modules/gui/win32/strings.cpp:221 src/libvlc.h:519
#: src/libvlc.h:519 modules/gui/gtk/gnome_interface.c:2149
#: modules/gui/gtk/gtk_interface.c:2468 modules/gui/gtk/gtk_interface.c:3150
#: modules/gui/macosx/open.m:204 modules/gui/win32/strings.cpp:221
msgid "Stream output"
msgstr ""
......@@ -816,17 +816,17 @@ msgid "CPU"
msgstr ""
#. Playlist options
#: modules/gui/gtk/gnome_interface.c:648
#: src/libvlc.h:544 modules/gui/gtk/gnome_interface.c:648
#: modules/gui/gtk/gnome_interface.c:2500
#: 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:275
#: modules/gui/macosx/intf.m:351 modules/gui/win32/strings.cpp:120
#: modules/gui/win32/strings.cpp:180 src/libvlc.h:544
#: modules/gui/win32/strings.cpp:180
msgid "Playlist"
msgstr ""
#. Misc options
#: modules/audio_filter/converter/a52tofloat32.c:85
#: src/libvlc.h:551 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:69
......@@ -836,7 +836,7 @@ msgstr ""
#: modules/video_filter/distort.c:65 modules/video_filter/motionblur.c:58
#: modules/video_filter/transform.c:63 modules/video_filter/wall.c:66
#: modules/video_output/fb.c:68 modules/video_output/ggi.c:62
#: modules/video_output/mga/xmga.c:104 src/libvlc.h:551
#: modules/video_output/mga/xmga.c:104
msgid "Miscellaneous"
msgstr ""
......@@ -872,12 +872,12 @@ msgstr ""
msgid "Reverse stereo"
msgstr ""
#: modules/audio_output/alsa.c:182 modules/audio_output/alsa.c:333
#: modules/audio_output/oss.c:208 modules/audio_output/oss.c:317
#: modules/audio_output/sdl.c:114 modules/audio_output/sdl.c:177
#: modules/audio_output/sdl.c:188 modules/audio_output/sdl.c:194
#: modules/audio_output/waveout.c:362 src/audio_output/output.c:77
#: src/audio_output/output.c:103 src/audio_output/output.c:132
#: src/audio_output/output.c:77 src/audio_output/output.c:103
#: src/audio_output/output.c:132 modules/audio_output/alsa.c:182
#: modules/audio_output/alsa.c:333 modules/audio_output/oss.c:208
#: modules/audio_output/oss.c:317 modules/audio_output/sdl.c:114
#: modules/audio_output/sdl.c:177 modules/audio_output/sdl.c:188
#: modules/audio_output/sdl.c:194 modules/audio_output/waveout.c:375
msgid "Stereo"
msgstr ""
......@@ -1164,7 +1164,7 @@ msgstr ""
#. Open the device
#: modules/audio_output/alsa.c:126 modules/audio_output/alsa.c:314
#: modules/audio_output/oss.c:152 modules/audio_output/oss.c:298
#: modules/audio_output/waveout.c:208 modules/audio_output/waveout.c:315
#: modules/audio_output/waveout.c:207 modules/audio_output/waveout.c:328
msgid "A/52 over S/PDIF"
msgstr ""
......@@ -1172,19 +1172,19 @@ msgstr ""
#: modules/audio_output/oss.c:227 modules/audio_output/oss.c:323
#: modules/audio_output/sdl.c:119 modules/audio_output/sdl.c:178
#: modules/audio_output/sdl.c:190 modules/audio_output/sdl.c:198
#: modules/audio_output/waveout.c:376
#: modules/audio_output/waveout.c:389
msgid "Mono"
msgstr ""
#: modules/audio_output/alsa.c:318 modules/audio_output/oss.c:187
#: modules/audio_output/oss.c:302 modules/audio_output/waveout.c:226
#: modules/audio_output/waveout.c:331
#: modules/audio_output/oss.c:302 modules/audio_output/waveout.c:234
#: modules/audio_output/waveout.c:344
msgid "5.1"
msgstr ""
#: modules/audio_output/alsa.c:326 modules/audio_output/oss.c:196
#: modules/audio_output/oss.c:310 modules/audio_output/waveout.c:233
#: modules/audio_output/waveout.c:348
#: modules/audio_output/oss.c:310 modules/audio_output/waveout.c:241
#: modules/audio_output/waveout.c:361
msgid "2 Front 2 Rear"
msgstr ""
......@@ -1582,9 +1582,9 @@ msgstr ""
msgid "VLC media player"
msgstr ""
#: modules/gui/familiar/interface.c:90 modules/gui/macosx/controls.m:580
#: modules/gui/macosx/open.m:387 modules/gui/macosx/open.m:423
#: modules/gui/macosx/open.m:584 modules/gui/macosx/open.m:846
#: modules/gui/familiar/interface.c:90 modules/gui/macosx/open.m:374
#: modules/gui/macosx/open.m:410 modules/gui/macosx/open.m:571
#: modules/gui/macosx/open.m:801 modules/gui/macosx/controls.m:580
msgid "Open"
msgstr ""
......@@ -1611,8 +1611,8 @@ msgstr ""
#: modules/gui/familiar/interface.c:131 modules/gui/gtk/gnome_interface.c:607
#: 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:810
#: modules/gui/macosx/intf.m:811 modules/gui/macosx/intf.m:812
#: modules/gui/gtk/gtk_interface.c:1160 modules/gui/macosx/intf.m:852
#: modules/gui/macosx/intf.m:853 modules/gui/macosx/intf.m:854
#: modules/gui/win32/strings.cpp:102
msgid "Pause"
msgstr ""
......@@ -1625,8 +1625,8 @@ msgstr ""
#: modules/gui/familiar/interface.c:144 modules/gui/gtk/gnome_interface.c:595
#: modules/gui/gtk/gnome_interface.c:1054 modules/gui/gtk/gtk_interface.c:703
#: modules/gui/macosx/intf.m:278 modules/gui/macosx/intf.m:317
#: modules/gui/macosx/intf.m:363 modules/gui/macosx/intf.m:817
#: modules/gui/macosx/intf.m:818 modules/gui/macosx/intf.m:819
#: modules/gui/macosx/intf.m:363 modules/gui/macosx/intf.m:859
#: modules/gui/macosx/intf.m:860 modules/gui/macosx/intf.m:861
#: modules/gui/macosx/playlist.m:122 modules/gui/win32/strings.cpp:100
#: modules/gui/win32/strings.cpp:204
msgid "Play"
......@@ -1638,9 +1638,9 @@ msgstr ""
#: modules/gui/familiar/interface.c:157 modules/gui/gtk/gnome_interface.c:571
#: modules/gui/gtk/gnome_interface.c:1068 modules/gui/gtk/gtk_interface.c:681
#: modules/gui/gtk/gtk_interface.c:1168 modules/gui/macosx/controls.m:695
#: modules/gui/macosx/intf.m:279 modules/gui/macosx/intf.m:318
#: modules/gui/macosx/intf.m:364 modules/gui/win32/strings.cpp:104
#: modules/gui/gtk/gtk_interface.c:1168 modules/gui/macosx/intf.m:279
#: modules/gui/macosx/intf.m:318 modules/gui/macosx/intf.m:364
#: modules/gui/macosx/controls.m:695 modules/gui/win32/strings.cpp:104
msgid "Stop"
msgstr ""
......@@ -1696,7 +1696,7 @@ msgid "Media"
msgstr ""
#: modules/gui/familiar/interface.c:348 modules/gui/gtk/preferences.c:592
#: modules/gui/gtk/preferences.c:609 modules/gui/macosx/open.m:758
#: modules/gui/gtk/preferences.c:609 modules/gui/macosx/open.m:713
#: modules/gui/win32/strings.cpp:213
msgid "Save"
msgstr ""
......@@ -1709,7 +1709,7 @@ msgstr ""
#: modules/gui/familiar/interface.c:368 modules/gui/gtk/gtk_interface.c:2510
#: modules/gui/gtk/gtk_interface.c:2761 modules/gui/gtk/gtk_interface.c:2992
#: modules/gui/gtk/gtk_interface.c:3373 modules/gui/gtk/preferences.c:613
#: modules/gui/macosx/open.m:170 modules/gui/macosx/prefs.m:580
#: modules/gui/macosx/prefs.m:580 modules/gui/macosx/open.m:170
#: 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
......@@ -1914,7 +1914,7 @@ msgstr ""
#: modules/gui/gtk/gnome_interface.c:140 modules/gui/gtk/gnome_interface.c:964
#: modules/gui/gtk/gtk_interface.c:471 modules/gui/gtk/gtk_interface.c:1308
#: modules/gui/macosx/controls.m:742 modules/gui/macosx/intf.m:335
#: modules/gui/macosx/intf.m:335 modules/gui/macosx/controls.m:742
msgid "Mute"
msgstr ""
......@@ -1947,8 +1947,8 @@ msgstr ""
#: modules/gui/gtk/gnome_interface.c:183
#: modules/gui/gtk/gnome_interface.c:1007 modules/gui/gtk/gtk_interface.c:558
#: modules/gui/gtk/gtk_interface.c:1390 modules/gui/macosx/controls.m:766
#: modules/gui/macosx/intf.m:345
#: modules/gui/gtk/gtk_interface.c:1390 modules/gui/macosx/intf.m:345
#: modules/gui/macosx/controls.m:766
msgid "Deinterlace"
msgstr ""
......@@ -1974,8 +1974,8 @@ msgstr ""
#: modules/gui/gtk/gtk_interface.c:1932 modules/gui/gtk/gtk_interface.c:2849
#: modules/gui/gtk/gtk_interface.c:2966 modules/gui/gtk/gtk_interface.c:3218
#: modules/gui/macosx/intf.m:301 modules/gui/macosx/open.m:172
#: modules/gui/macosx/open.m:211 modules/gui/macosx/open.m:326
#: modules/gui/macosx/open.m:777 modules/gui/macosx/open.m:811
#: modules/gui/macosx/open.m:206 modules/gui/macosx/open.m:313
#: modules/gui/macosx/open.m:732 modules/gui/macosx/open.m:766
#: modules/gui/win32/strings.cpp:93 modules/gui/win32/strings.cpp:226
msgid "File"
msgstr ""
......@@ -1985,7 +1985,7 @@ msgstr ""
#: modules/gui/gtk/gnome_interface.c:2383 modules/gui/gtk/gtk_interface.c:634
#: 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:173
#: modules/gui/macosx/open.m:330 modules/gui/win32/strings.cpp:43
#: modules/gui/macosx/open.m:317 modules/gui/win32/strings.cpp:43
#: modules/gui/win32/strings.cpp:95
msgid "Disc"
msgstr ""
......@@ -2070,9 +2070,9 @@ msgstr ""
#: modules/gui/gtk/gnome_interface.c:672
#: modules/gui/gtk/gnome_interface.c:1097 modules/gui/gtk/gtk_interface.c:774
#: modules/gui/gtk/gtk_interface.c:857 modules/gui/gtk/gtk_interface.c:901
#: modules/gui/gtk/gtk_interface.c:1207 modules/gui/macosx/controls.m:703
#: modules/gui/macosx/intf.m:281 modules/gui/macosx/intf.m:322
#: modules/gui/macosx/intf.m:365 modules/gui/win32/strings.cpp:114
#: modules/gui/gtk/gtk_interface.c:1207 modules/gui/macosx/intf.m:281
#: modules/gui/macosx/intf.m:322 modules/gui/macosx/intf.m:365
#: modules/gui/macosx/controls.m:703 modules/gui/win32/strings.cpp:114
#: modules/gui/win32/strings.cpp:134 modules/gui/win32/strings.cpp:138
msgid "Next"
msgstr ""
......@@ -2186,7 +2186,7 @@ msgstr ""
#: modules/gui/gtk/gnome_interface.c:2105 modules/gui/gtk/gtk_interface.c:1925
#: modules/gui/gtk/gtk_interface.c:2422 modules/gui/macosx/open.m:176
#: modules/gui/macosx/open.m:179 modules/gui/macosx/open.m:185
#: modules/gui/macosx/open.m:215 modules/gui/win32/strings.cpp:229
#: modules/gui/macosx/open.m:210 modules/gui/win32/strings.cpp:229
#: modules/gui/win32/strings.cpp:248
msgid "Browse..."
msgstr ""
......@@ -2197,13 +2197,13 @@ msgid "Disc type"
msgstr ""
#: modules/gui/gtk/gnome_interface.c:1653 modules/gui/gtk/gtk_interface.c:1968
#: modules/gui/macosx/open.m:189 modules/gui/macosx/open.m:545
#: modules/gui/macosx/open.m:189 modules/gui/macosx/open.m:532
msgid "DVD"
msgstr ""
#: modules/gui/gtk/gnome_interface.c:1661 modules/gui/gtk/gtk_interface.c:1976
#: modules/gui/macosx/open.m:190 modules/gui/macosx/open.m:454
#: modules/gui/macosx/open.m:537
#: modules/gui/macosx/open.m:190 modules/gui/macosx/open.m:441
#: modules/gui/macosx/open.m:524
msgid "VCD"
msgstr ""
......@@ -2231,27 +2231,25 @@ msgid "Use DVD menus"
msgstr ""
#: modules/gui/gtk/gnome_interface.c:1755 modules/gui/gtk/gtk_interface.c:2070
#: modules/gui/macosx/open.m:199 modules/gui/macosx/open.m:605
#: modules/gui/macosx/open.m:655 modules/gui/win32/strings.cpp:169
#: modules/gui/macosx/open.m:197 modules/gui/macosx/open.m:591
#: modules/gui/macosx/open.m:629 modules/gui/win32/strings.cpp:169
msgid "UDP/RTP"
msgstr ""
#: modules/gui/gtk/gnome_interface.c:1765 modules/gui/gtk/gtk_interface.c:2080
#: modules/gui/macosx/open.m:200 modules/gui/macosx/open.m:606
#: modules/gui/macosx/open.m:667 modules/gui/win32/strings.cpp:170
#: modules/gui/macosx/open.m:198 modules/gui/macosx/open.m:592
#: modules/gui/macosx/open.m:641 modules/gui/win32/strings.cpp:170
msgid "UDP/RTP Multicast"
msgstr ""
#: modules/gui/gtk/gnome_interface.c:1775 modules/gui/gtk/gtk_interface.c:2090
#: modules/gui/macosx/open.m:201 modules/gui/macosx/open.m:607
#: modules/gui/macosx/open.m:652 modules/gui/macosx/open.m:680
#: modules/gui/win32/strings.cpp:171
msgid "Channel server"
msgstr ""
#: modules/gui/gtk/gnome_interface.c:1785 modules/gui/gtk/gtk_interface.c:2100
#: modules/gui/macosx/open.m:202 modules/gui/macosx/open.m:608
#: modules/gui/macosx/open.m:699 modules/gui/win32/strings.cpp:172
#: modules/gui/macosx/open.m:199 modules/gui/macosx/open.m:593
#: modules/gui/macosx/open.m:654 modules/gui/win32/strings.cpp:172
msgid "HTTP/FTP/MMS"
msgstr ""
......@@ -2261,27 +2259,26 @@ msgstr ""
#: modules/gui/gtk/gnome_interface.c:3028 modules/gui/gtk/gtk_interface.c:2110
#: 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:192
#: modules/gui/macosx/open.m:194 modules/gui/macosx/open.m:196
#: modules/gui/macosx/open.m:217
#: modules/gui/macosx/open.m:194 modules/gui/macosx/open.m:212
msgid "Port"
msgstr ""
#: 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:193
#: modules/gui/macosx/open.m:195 modules/gui/macosx/open.m:216
#: modules/gui/macosx/open.m:211
msgid "Address"
msgstr ""
#: modules/gui/gtk/gnome_interface.c:1827 modules/gui/gtk/gtk_interface.c:2142
#: modules/gui/macosx/open.m:197
#: modules/gui/macosx/open.m:195
msgid "URL"
msgstr ""
#: 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:174
#: modules/gui/macosx/open.m:334
#: modules/gui/macosx/open.m:321
msgid "Network"
msgstr ""
......@@ -2329,8 +2326,8 @@ msgstr ""
msgid "Settings..."
msgstr ""
#: modules/gui/gtk/gnome_interface.c:2295 modules/gui/macosx/open.m:386
#: modules/gui/macosx/open.m:422 modules/gui/macosx/open.m:845
#: modules/gui/gtk/gnome_interface.c:2295 modules/gui/macosx/open.m:373
#: modules/gui/macosx/open.m:409 modules/gui/macosx/open.m:800
msgid "Open File"
msgstr ""
......@@ -2423,13 +2420,13 @@ msgid "Destination Target: "
msgstr ""
#: modules/gui/gtk/gnome_interface.c:2973 modules/gui/gtk/gtk_interface.c:3228
#: modules/gui/macosx/open.m:212 modules/gui/macosx/open.m:778
#: modules/gui/macosx/open.m:816 modules/gui/win32/strings.cpp:227
#: modules/gui/macosx/open.m:207 modules/gui/macosx/open.m:733
#: modules/gui/macosx/open.m:771 modules/gui/win32/strings.cpp:227
msgid "UDP"
msgstr ""
#: modules/gui/gtk/gnome_interface.c:2983 modules/gui/gtk/gtk_interface.c:3238
#: modules/gui/macosx/open.m:213 modules/gui/macosx/open.m:779
#: modules/gui/macosx/open.m:208 modules/gui/macosx/open.m:734
#: modules/gui/win32/strings.cpp:228
msgid "RTP"
msgstr ""
......@@ -2445,18 +2442,18 @@ msgid "Address:"
msgstr ""
#: modules/gui/gtk/gnome_interface.c:3072 modules/gui/gtk/gtk_interface.c:3317
#: modules/gui/macosx/open.m:221 modules/gui/win32/strings.cpp:232
#: modules/gui/macosx/open.m:216 modules/gui/win32/strings.cpp:232
msgid "TS"
msgstr ""
#: modules/gui/gtk/gnome_interface.c:3080 modules/gui/gtk/gtk_interface.c:3325
#: modules/gui/macosx/open.m:220 modules/gui/macosx/open.m:749
#: modules/gui/macosx/open.m:808 modules/gui/win32/strings.cpp:231
#: modules/gui/macosx/open.m:215 modules/gui/macosx/open.m:704
#: modules/gui/macosx/open.m:763 modules/gui/win32/strings.cpp:231
msgid "PS"
msgstr ""
#: modules/gui/gtk/gnome_interface.c:3088 modules/gui/gtk/gtk_interface.c:3333
#: modules/gui/macosx/open.m:219 modules/gui/macosx/open.m:807
#: modules/gui/macosx/open.m:214 modules/gui/macosx/open.m:762
msgid "AVI"
msgstr ""
......@@ -2548,8 +2545,8 @@ msgstr ""
#: modules/gui/gtk/gtk_interface.c:1702 modules/gui/gtk/gtk_interface.c:2503
#: modules/gui/gtk/gtk_interface.c:2754 modules/gui/gtk/gtk_interface.c:2985
#: modules/gui/gtk/gtk_interface.c:3092 modules/gui/gtk/gtk_interface.c:3366
#: modules/gui/gtk/preferences.c:601 modules/gui/macosx/open.m:169
#: modules/gui/macosx/prefs.m:576 modules/gui/macosx/prefs.m:791
#: modules/gui/gtk/preferences.c:601 modules/gui/macosx/prefs.m:576
#: modules/gui/macosx/prefs.m:791 modules/gui/macosx/open.m:169
#: 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
......@@ -2677,18 +2674,18 @@ msgstr ""
msgid "VLC - Controller"
msgstr ""
#: modules/gui/macosx/controls.m:702 modules/gui/macosx/intf.m:276
#: modules/gui/macosx/intf.m:321 modules/gui/macosx/intf.m:366
#: modules/gui/macosx/intf.m:276 modules/gui/macosx/intf.m:321
#: modules/gui/macosx/intf.m:366 modules/gui/macosx/controls.m:702
msgid "Previous"
msgstr ""
#: modules/gui/macosx/controls.m:682 modules/gui/macosx/intf.m:277
#: modules/gui/macosx/intf.m:320
#: modules/gui/macosx/intf.m:277 modules/gui/macosx/intf.m:320
#: modules/gui/macosx/controls.m:682
msgid "Slower"
msgstr ""
#: modules/gui/macosx/controls.m:681 modules/gui/macosx/intf.m:280
#: modules/gui/macosx/intf.m:319
#: modules/gui/macosx/intf.m:280 modules/gui/macosx/intf.m:319
#: modules/gui/macosx/controls.m:681
msgid "Faster"
msgstr ""
......@@ -2754,7 +2751,7 @@ msgid "Open Recent"
msgstr ""
#. Recent Items Menu
#: modules/gui/macosx/intf.m:307 modules/gui/macosx/intf.m:1457
#: modules/gui/macosx/intf.m:307 modules/gui/macosx/intf.m:1499
msgid "Clear Menu"
msgstr ""
......@@ -2786,15 +2783,15 @@ msgstr ""
msgid "Controls"
msgstr ""
#: modules/gui/macosx/controls.m:721 modules/gui/macosx/intf.m:323
#: modules/gui/macosx/intf.m:323 mo