Commit c8d4e9b9 authored by Christophe Massiot's avatar Christophe Massiot

* modules/gui/macosx/*: Fixed localization bugs

* po/fr.po: Updated French translation
* extras/MacOSX/vlc.pbproj/project.pbxproj: Version is 0.5.0
parent 7f4b5f89
...@@ -340,13 +340,13 @@ ...@@ -340,13 +340,13 @@
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>VLC Media Player</string> <string>VLC media player</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>BNDL</string> <string>BNDL</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>VLC#</string> <string>VLC#</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>0.5.0-test3</string> <string>0.5.0</string>
<key>NSMainNibFile</key> <key>NSMainNibFile</key>
<string>MainMenu</string> <string>MainMenu</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin * intf.m: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * Copyright (C) 2002-2003 VideoLAN
* $Id: intf.m,v 1.42 2003/01/31 02:53:52 jlj Exp $ * $Id: intf.m,v 1.43 2003/02/01 23:46:24 massiot Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -955,7 +955,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) ...@@ -955,7 +955,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
p_input->stream.pp_programs[i]->i_number ); p_input->stream.pp_programs[i]->i_number );
psz_title[sizeof(psz_title) - 1] = '\0'; psz_title[sizeof(psz_title) - 1] = '\0';
o_menu_title = [NSString stringWithCString: psz_title]; o_menu_title = [NSApp localizedString: psz_title];
o_item = [o_program addItemWithTitle: o_menu_title o_item = [o_program addItemWithTitle: o_menu_title
action: pf_toggle_program keyEquivalent: @""]; action: pf_toggle_program keyEquivalent: @""];
...@@ -997,7 +997,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) ...@@ -997,7 +997,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
p_input->stream.pp_areas[i]->i_part_nb ); p_input->stream.pp_areas[i]->i_part_nb );
psz_title[sizeof(psz_title) - 1] = '\0'; psz_title[sizeof(psz_title) - 1] = '\0';
o_menu_title = [NSString stringWithCString: psz_title]; o_menu_title = [NSApp localizedString: psz_title];
o_item = [o_title addItemWithTitle: o_menu_title o_item = [o_title addItemWithTitle: o_menu_title
action: pf_toggle_title keyEquivalent: @""]; action: pf_toggle_title keyEquivalent: @""];
...@@ -1039,7 +1039,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) ...@@ -1039,7 +1039,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
snprintf( psz_title, sizeof(psz_title), "Chapter %d", i + 1 ); snprintf( psz_title, sizeof(psz_title), "Chapter %d", i + 1 );
psz_title[sizeof(psz_title) - 1] = '\0'; psz_title[sizeof(psz_title) - 1] = '\0';
o_menu_title = [NSString stringWithCString: psz_title]; o_menu_title = [NSApp localizedString: psz_title];
o_item = [o_chapter addItemWithTitle: o_menu_title o_item = [o_chapter addItemWithTitle: o_menu_title
action: pf_toggle_chapter keyEquivalent: @""]; action: pf_toggle_chapter keyEquivalent: @""];
...@@ -1186,17 +1186,17 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) ...@@ -1186,17 +1186,17 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
if( *ES->psz_desc ) if( *ES->psz_desc )
{ {
o_title = [NSString stringWithCString: ES->psz_desc]; o_title = [NSApp localizedString: ES->psz_desc];
} }
else else
{ {
char psz_title[ 256 ]; char psz_title[ 256 ];
snprintf( psz_title, sizeof(psz_title), "Language 0x%x", snprintf( psz_title, sizeof(psz_title), _("Language 0x%x"),
ES->i_id ); ES->i_id );
psz_title[sizeof(psz_title) - 1] = '\0'; psz_title[sizeof(psz_title) - 1] = '\0';
o_title = [NSString stringWithCString: psz_title]; o_title = [NSApp localizedString: psz_title];
} }
o_lmi = [o_menu addItemWithTitle: o_title o_lmi = [o_menu addItemWithTitle: o_title
...@@ -1253,8 +1253,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) ...@@ -1253,8 +1253,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
NSMenuItem * o_lmi; NSMenuItem * o_lmi;
NSString * o_title; NSString * o_title;
o_title = [NSString stringWithCString: o_title = [NSApp localizedString: val.p_list->p_values[i].psz_string];
val.p_list->p_values[i].psz_string];
o_lmi = [o_menu addItemWithTitle: o_title o_lmi = [o_menu addItemWithTitle: o_title
action: pf_callback keyEquivalent: @""]; action: pf_callback keyEquivalent: @""];
/* FIXME: this isn't 64-bit clean ! */ /* FIXME: this isn't 64-bit clean ! */
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* open.m: MacOS X plugin for vlc * open.m: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: open.m,v 1.17 2003/01/31 02:53:52 jlj Exp $ * $Id: open.m,v 1.18 2003/02/01 23:46:24 massiot Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -182,7 +182,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) ...@@ -182,7 +182,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
[o_disc_device_lbl setStringValue: _NS("Device name")]; [o_disc_device_lbl setStringValue: _NS("Device name")];
[o_disc_title_lbl setStringValue: _NS("Title")]; [o_disc_title_lbl setStringValue: _NS("Title")];
[o_disc_chapter_lbl setStringValue: _NS("Chapter")]; [o_disc_chapter_lbl setStringValue: _NS("Chapter")];
[o_disc_videots_btn_browse setStringValue: _NS("Browse...")]; [o_disc_videots_btn_browse setTitle: _NS("Browse...")];
[o_disc_dvd_menus setTitle: _NS("Use DVD menus (EXPERIMENTAL)")]; [o_disc_dvd_menus setTitle: _NS("Use DVD menus (EXPERIMENTAL)")];
[[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS folder")]; [[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS folder")];
...@@ -212,7 +212,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) ...@@ -212,7 +212,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
[[o_sout_access cellAtRow:1 column:0] setTitle: _NS("UDP")]; [[o_sout_access cellAtRow:1 column:0] setTitle: _NS("UDP")];
[[o_sout_access cellAtRow:2 column:0] setTitle: _NS("RTP")]; [[o_sout_access cellAtRow:2 column:0] setTitle: _NS("RTP")];
[o_sout_file_btn_browse setStringValue: _NS("Browse...")]; [o_sout_file_btn_browse setTitle: _NS("Browse...")];
[o_sout_udp_addr_lbl setStringValue: _NS("Address")]; [o_sout_udp_addr_lbl setStringValue: _NS("Address")];
[o_sout_udp_port_lbl setStringValue: _NS("Port")]; [o_sout_udp_port_lbl setStringValue: _NS("Port")];
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment