From: Carlo Calabrò Date: Sun, 25 Jan 2004 17:01:57 +0000 (+0000) Subject: String Review round one, Mac OS X interface. X-Git-Tag: 0.7.1~366 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f5932b756eba0ddac3b84740d0b94e6869b99b28;p=vlc String Review round one, Mac OS X interface. --- diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h index b40a926216..750f834590 100644 --- a/modules/gui/macosx/controls.h +++ b/modules/gui/macosx/controls.h @@ -1,8 +1,8 @@ /***************************************************************************** - * controls.h: MacOS X interface plugin + * controls.h: MacOS X interface module ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: controls.h,v 1.8 2003/12/11 19:34:47 hartman Exp $ + * $Id: controls.h,v 1.9 2004/01/25 17:01:57 murray Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m index 06018f6824..3952dc8e26 100644 --- a/modules/gui/macosx/controls.m +++ b/modules/gui/macosx/controls.m @@ -1,8 +1,8 @@ /***************************************************************************** - * controls.m: MacOS X interface plugin + * controls.m: MacOS X interface module ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: controls.m,v 1.59 2003/12/15 19:25:56 bigben Exp $ + * $Id: controls.m,v 1.60 2004/01/25 17:01:57 murray Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -170,11 +170,11 @@ var_Set( p_playlist, "random", val ); if( val.b_bool ) { - vout_OSDMessage( (vlc_object_t *)p_intf, _( "Shuffle On" ) ); + vout_OSDMessage( (vlc_object_t *)p_intf, _( "Random On" ) ); } else { - vout_OSDMessage( (vlc_object_t *)p_intf, _( "Shuffle Off" ) ); + vout_OSDMessage( (vlc_object_t *)p_intf, _( "Random Off" ) ); } p_intf->p_sys->b_playlist_update = VLC_TRUE; @@ -198,7 +198,7 @@ var_Set( p_playlist, "repeat", val ); if( val.b_bool ) { - vout_OSDMessage( (vlc_object_t *)p_intf, _( "Repeat On" ) ); + vout_OSDMessage( (vlc_object_t *)p_intf, _( "Repeat All" ) ); } else { @@ -226,11 +226,11 @@ var_Set( p_playlist, "loop", val ); if( val.b_bool ) { - vout_OSDMessage( (vlc_object_t *)p_intf, _( "Loop On" ) ); + vout_OSDMessage( (vlc_object_t *)p_intf, _( "Repeat One" ) ); } else { - vout_OSDMessage( (vlc_object_t *)p_intf, _( "Loop Off" ) ); + vout_OSDMessage( (vlc_object_t *)p_intf, _( "Repeat Off" ) ); } p_intf->p_sys->b_playlist_update = VLC_TRUE; @@ -348,9 +348,9 @@ [o_window scaleWindowWithFactor: 1.0]; else if( [o_title isEqualToString: _NS("Double Size") ] ) [o_window scaleWindowWithFactor: 2.0]; - else if( [o_title isEqualToString: _NS("Float On Top") ] ) + else if( [o_title isEqualToString: _NS("Float on Top") ] ) [o_window toggleFloatOnTop]; - else if( [o_title isEqualToString: _NS("Fit To Screen") ] ) + else if( [o_title isEqualToString: _NS("Fit to Screen") ] ) { if( ![o_window isZoomed] ) [o_window performZoom:self]; @@ -662,21 +662,21 @@ } } } - else if( [[o_mi title] isEqualToString: _NS("Shuffle")] ) + else if( [[o_mi title] isEqualToString: _NS("Random")] ) { int i_state; var_Get( p_playlist, "random", &val ); i_state = val.b_bool ? NSOnState : NSOffState; [o_mi setState: i_state]; } - else if( [[o_mi title] isEqualToString: _NS("Repeat Item")] ) + else if( [[o_mi title] isEqualToString: _NS("Repeat One")] ) { int i_state; var_Get( p_playlist, "repeat", &val ); i_state = val.b_bool ? NSOnState : NSOffState; [o_mi setState: i_state]; } - else if( [[o_mi title] isEqualToString: _NS("Repeat Playlist")] ) + else if( [[o_mi title] isEqualToString: _NS("Repeat All")] ) { int i_state; var_Get( p_playlist, "loop", &val ); @@ -705,15 +705,15 @@ [[o_mi title] isEqualToString: _NS("Half Size")] || [[o_mi title] isEqualToString: _NS("Normal Size")] || [[o_mi title] isEqualToString: _NS("Double Size")] || - [[o_mi title] isEqualToString: _NS("Fit To Screen")] || - [[o_mi title] isEqualToString: _NS("Float On Top")] ) + [[o_mi title] isEqualToString: _NS("Fit to Screen")] || + [[o_mi title] isEqualToString: _NS("Float on Top")] ) { id o_window; NSArray *o_windows = [NSApp orderedWindows]; NSEnumerator *o_enumerator = [o_windows objectEnumerator]; bEnabled = FALSE; - if ( [[o_mi title] isEqualToString: _NS("Float On Top")] ) + if ( [[o_mi title] isEqualToString: _NS("Float on Top")] ) { int i_state = config_GetInt( p_playlist, "video-on-top" ) ? NSOnState : NSOffState; diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index fbd57b05d3..e591bb76b2 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -1,8 +1,8 @@ /***************************************************************************** - * intf.h: MacOS X interface plugin + * intf.h: MacOS X interface module ***************************************************************************** * Copyright (C) 2002-2004 VideoLAN - * $Id: intf.h,v 1.55 2004/01/09 22:11:04 hartman Exp $ + * $Id: intf.h,v 1.56 2004/01/25 17:01:57 murray Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index d91d5bbf09..bae6271afc 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -1,8 +1,8 @@ /***************************************************************************** - * intf.m: MacOS X interface plugin + * intf.m: MacOS X interface module ***************************************************************************** * Copyright (C) 2002-2004 VideoLAN - * $Id: intf.m,v 1.113 2004/01/09 22:11:04 hartman Exp $ + * $Id: intf.m,v 1.114 2004/01/25 17:01:57 murray Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -438,7 +438,7 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) - (void)initStrings { [o_window setTitle: _NS("VLC - Controller")]; - [o_scrollfield setStringValue: _NS("VLC Media Player")]; + [o_scrollfield setStringValue: _NS("VLC media player")]; /* button controls */ [o_btn_prev setToolTip: _NS("Previous")]; @@ -485,9 +485,9 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) [o_mi_slower setTitle: _NS("Slower")]; [o_mi_previous setTitle: _NS("Previous")]; [o_mi_next setTitle: _NS("Next")]; - [o_mi_random setTitle: _NS("Shuffle")]; - [o_mi_repeat setTitle: _NS("Repeat Item")]; - [o_mi_loop setTitle: _NS("Repeat Playlist")]; + [o_mi_random setTitle: _NS("Random")]; + [o_mi_repeat setTitle: _NS("Repeat One")]; + [o_mi_loop setTitle: _NS("Repeat All")]; [o_mi_fwd setTitle: _NS("Step Forward")]; [o_mi_bwd setTitle: _NS("Step Backward")]; [o_mi_program setTitle: _NS("Program")]; @@ -501,12 +501,12 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) [o_mi_vol_up setTitle: _NS("Volume Up")]; [o_mi_vol_down setTitle: _NS("Volume Down")]; [o_mi_mute setTitle: _NS("Mute")]; - [o_mi_audiotrack setTitle: _NS("Audio track")]; - [o_mu_audiotrack setTitle: _NS("Audio track")]; - [o_mi_channels setTitle: _NS("Audio channels")]; - [o_mu_channels setTitle: _NS("Audio channels")]; - [o_mi_device setTitle: _NS("Audio device")]; - [o_mu_device setTitle: _NS("Audio device")]; + [o_mi_audiotrack setTitle: _NS("Audio Track")]; + [o_mu_audiotrack setTitle: _NS("Audio Track")]; + [o_mi_channels setTitle: _NS("Audio Channels")]; + [o_mu_channels setTitle: _NS("Audio Channels")]; + [o_mi_device setTitle: _NS("Audio Device")]; + [o_mu_device setTitle: _NS("Audio Device")]; [o_mi_visual setTitle: _NS("Visualizations")]; [o_mu_visual setTitle: _NS("Visualizations")]; @@ -514,15 +514,15 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) [o_mi_half_window setTitle: _NS("Half Size")]; [o_mi_normal_window setTitle: _NS("Normal Size")]; [o_mi_double_window setTitle: _NS("Double Size")]; - [o_mi_fittoscreen setTitle: _NS("Fit To Screen")]; + [o_mi_fittoscreen setTitle: _NS("Fit to Screen")]; [o_mi_fullscreen setTitle: _NS("Fullscreen")]; - [o_mi_floatontop setTitle: _NS("Float On Top")]; - [o_mi_videotrack setTitle: _NS("Video track")]; - [o_mu_videotrack setTitle: _NS("Video track")]; - [o_mi_screen setTitle: _NS("Video device")]; - [o_mu_screen setTitle: _NS("Video device")]; - [o_mi_subtitle setTitle: _NS("Subtitles track")]; - [o_mu_subtitle setTitle: _NS("Subtitles track")]; + [o_mi_floatontop setTitle: _NS("Float on Top")]; + [o_mi_videotrack setTitle: _NS("Video Track")]; + [o_mu_videotrack setTitle: _NS("Video Track")]; + [o_mi_screen setTitle: _NS("Video Device")]; + [o_mu_screen setTitle: _NS("Video Device")]; + [o_mi_subtitle setTitle: _NS("Subtitles Track")]; + [o_mu_subtitle setTitle: _NS("Subtitles Track")]; [o_mi_deinterlace setTitle: _NS("Deinterlace")]; [o_mu_deinterlace setTitle: _NS("Deinterlace")]; diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m index 4b5ddd4356..54185c1a12 100644 --- a/modules/gui/macosx/macosx.m +++ b/modules/gui/macosx/macosx.m @@ -1,8 +1,8 @@ /***************************************************************************** - * macosx.m: MacOS X plugin for vlc + * macosx.m: MacOS X module for vlc ***************************************************************************** * Copyright (C) 2001-2003 VideoLAN - * $Id: macosx.m,v 1.16 2003/12/08 19:50:22 gbazin Exp $ + * $Id: macosx.m,v 1.17 2004/01/25 17:01:57 murray Exp $ * * Authors: Colin Delacroix * Eugenio Jarosiewicz diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h index 7ede14b702..961573ca68 100644 --- a/modules/gui/macosx/open.h +++ b/modules/gui/macosx/open.h @@ -1,8 +1,8 @@ /***************************************************************************** - * open.h: MacOS X plugin for vlc + * open.h: MacOS X module for vlc ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: open.h,v 1.16 2003/10/19 23:12:16 hartman Exp $ + * $Id: open.h,v 1.17 2004/01/25 17:01:57 murray Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index 8b66a5d1a6..b95d03143e 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -1,8 +1,8 @@ /***************************************************************************** - * open.m: MacOS X plugin for vlc + * open.m: MacOS X module for vlc ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: open.m,v 1.41 2003/11/06 18:35:19 hartman Exp $ + * $Id: open.m,v 1.42 2004/01/25 17:01:57 murray Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -464,7 +464,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) o_videots = [o_disc_videots_folder stringValue]; b_menus = [o_disc_dvd_menus state]; - if ( [o_type isEqualToString: _NS("VCD")] ) + if ( [o_type isEqualToString: @"VCD"] ) { if ( [o_device isEqualToString: [NSString stringWithFormat: _NS("No %@s found"), o_type]] ) @@ -480,7 +480,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) o_mrl_string = [NSString stringWithFormat: @"cdda://%@", o_device]; } - else if ( [o_type isEqualToString: _NS("DVD")] ) + else if ( [o_type isEqualToString: @"DVD"] ) { if ( [o_device isEqualToString: [NSString stringWithFormat: _NS("No %@s found"), o_type]] ) @@ -539,9 +539,9 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) 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("HTTP/FTP/MMS")] ) b_http = TRUE; + if( [o_mode isEqualToString: @"UDP/RTP"] ) b_udp = TRUE; + else if( [o_mode isEqualToString: @"UDP/RTP Multicast"] ) b_udpm = TRUE; + else if( [o_mode isEqualToString: @"HTTP/FTP/MMS"] ) b_http = TRUE; [o_net_udp_port setEnabled: b_udp]; [o_net_udp_port_stp setEnabled: b_udp]; @@ -577,7 +577,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) o_mode = [[o_net_mode selectedCell] title]; - if( [o_mode isEqualToString: _NS("UDP/RTP")] ) + if( [o_mode isEqualToString: @"UDP/RTP"] ) { int i_port = [o_net_udp_port intValue]; @@ -589,7 +589,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) [o_mrl_string stringByAppendingFormat: @"@:%i", i_port]; } } - else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] ) + else if( [o_mode isEqualToString: @"UDP/RTP Multicast"] ) { NSString *o_addr = [o_net_udpm_addr stringValue]; int i_port = [o_net_udpm_port intValue]; @@ -602,7 +602,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ) [o_mrl_string stringByAppendingFormat: @":%i", i_port]; } } - else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS")] ) + else if( [o_mode isEqualToString: @"HTTP/FTP/MMS"] ) { NSString *o_url = [o_net_http_url stringValue]; diff --git a/modules/gui/macosx/output.m b/modules/gui/macosx/output.m index c0469c2c2f..de00078e9d 100644 --- a/modules/gui/macosx/output.m +++ b/modules/gui/macosx/output.m @@ -2,7 +2,7 @@ * output.m: MacOS X Output Dialog ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: output.m,v 1.17 2003/12/11 16:00:09 hartman Exp $ + * $Id: output.m,v 1.18 2004/01/25 17:01:57 murray Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot @@ -135,11 +135,11 @@ [o_btn_browse setTitle: _NS("Browse...")]; [o_stream_address_lbl setStringValue: _NS("Address")]; [o_stream_port_lbl setStringValue: _NS("Port")]; - [o_stream_ttl_lbl setStringValue: _NS("TTL")]; - [[o_stream_type itemAtIndex: 0] setTitle: _NS("HTTP")]; - [[o_stream_type itemAtIndex: 1] setTitle: _NS("MMSH")]; - [[o_stream_type itemAtIndex: 2] setTitle: _NS("UDP")]; - [[o_stream_type itemAtIndex: 3] setTitle: _NS("RTP")]; + [o_stream_ttl_lbl setStringValue: @"TTL"]; + [[o_stream_type itemAtIndex: 0] setTitle: @"HTTP"]; + [[o_stream_type itemAtIndex: 1] setTitle: @"MMSH"]; + [[o_stream_type itemAtIndex: 2] setTitle: @"UDP"]; + [[o_stream_type itemAtIndex: 3] setTitle: @"RTP"]; [o_stream_type_lbl setStringValue: _NS("Type")]; [o_mux_lbl setStringValue: _NS("Encapsulation Method")]; @@ -238,7 +238,7 @@ o_mode = [o_stream_type titleOfSelectedItem]; - if( [o_mode isEqualToString: _NS("HTTP")] ) + if( [o_mode isEqualToString: @"HTTP"] ) { [o_stream_address setEnabled: YES]; [o_stream_ttl setEnabled: NO]; @@ -251,7 +251,7 @@ [[o_mux_selector itemAtIndex: 6] setEnabled: NO]; [[o_mux_selector itemAtIndex: 7] setEnabled: NO]; } - else if( [o_mode isEqualToString: _NS("MMSH")] ) + else if( [o_mode isEqualToString: @"MMSH"] ) { [o_stream_address setEnabled: YES]; [o_stream_ttl setEnabled: NO]; @@ -265,7 +265,7 @@ [[o_mux_selector itemAtIndex: 6] setEnabled: NO]; [[o_mux_selector itemAtIndex: 7] setEnabled: NO]; } - else if( [o_mode isEqualToString: _NS("UDP")] ) + else if( [o_mode isEqualToString: @"UDP"] ) { [o_stream_address setEnabled: YES]; [o_stream_ttl setEnabled: YES]; @@ -281,7 +281,7 @@ [o_slp_chkbox setEnabled: YES]; [o_channel_name setEnabled: YES]; } - else if( [o_mode isEqualToString: _NS("RTP")] ) + else if( [o_mode isEqualToString: @"RTP"] ) { [o_stream_address setEnabled: YES]; [o_stream_ttl setEnabled: YES]; @@ -316,13 +316,13 @@ o_mode = [[o_method selectedCell] title]; o_mux = [o_mux_selector titleOfSelectedItem]; - if ( [o_mux isEqualToString: _NS("AVI")] ) o_mux_string = @"avi"; - else if ( [o_mux isEqualToString: _NS("Ogg")] ) o_mux_string = @"ogg"; - else if ( [o_mux isEqualToString: _NS("MPEG PS")] ) o_mux_string = @"ps"; - else if ( [o_mux isEqualToString: _NS("MPEG 4")] ) o_mux_string = @"mp4"; - else if ( [o_mux isEqualToString: _NS("MPEG 1")] ) o_mux_string = @"mpeg1"; - else if ( [o_mux isEqualToString: _NS("Quicktime")] ) o_mux_string = @"mov"; - else if ( [o_mux isEqualToString: _NS("ASF")] ) o_mux_string = @"asf"; + if ( [o_mux isEqualToString: @"AVI"] ) o_mux_string = @"avi"; + else if ( [o_mux isEqualToString: @"Ogg"] ) o_mux_string = @"ogg"; + else if ( [o_mux isEqualToString: @"MPEG PS"] ) o_mux_string = @"ps"; + else if ( [o_mux isEqualToString: @"MPEG 4"] ) o_mux_string = @"mp4"; + else if ( [o_mux isEqualToString: @"MPEG 1"] ) o_mux_string = @"mpeg1"; + else if ( [o_mux isEqualToString: @"Quicktime"] ) o_mux_string = @"mov"; + else if ( [o_mux isEqualToString: @"ASF"] ) o_mux_string = @"asf"; else o_mux_string = @"ts"; if( [o_mode isEqualToString: _NS("File")] ) @@ -347,14 +347,14 @@ o_mode = [o_stream_type titleOfSelectedItem]; o_announce = @""; - if ( [o_mode isEqualToString: _NS("HTTP")] ) + if ( [o_mode isEqualToString: @"HTTP"] ) o_mode = @"http"; - else if ( [o_mode isEqualToString: _NS("MMSH")] ) + else if ( [o_mode isEqualToString: @"MMSH"] ) { - if ( [o_mux isEqualToString: _NS("ASF")] ) o_mux_string = @"asfh"; + if ( [o_mux isEqualToString: @"ASF"] ) o_mux_string = @"asfh"; o_mode = @"mmsh"; } - else if ( [o_mode isEqualToString: _NS("UDP")] ) + else if ( [o_mode isEqualToString: @"UDP"] ) { o_mode = @"udp"; if( [o_sap_chkbox state] == NSOnState ) @@ -373,7 +373,7 @@ o_announce = [o_announce stringByAppendingString: @",slp"]; } } - else if ( [o_mode isEqualToString: _NS("RTP")] ) + else if ( [o_mode isEqualToString: @"RTP"] ) o_mode = @"rtp"; [o_mrl_string appendFormat: @@ -398,19 +398,19 @@ { NSSavePanel *o_save_panel = [NSSavePanel savePanel]; NSString *o_mux_string; - if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: _NS("MPEG PS")] ) + if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: @"MPEG PS"] ) o_mux_string = @"vob"; - else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: _NS("MPEG 1")] ) + else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: @"MPEG 1"] ) o_mux_string = @"mpg"; - else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: _NS("AVI")] ) + else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: @"AVI"] ) o_mux_string = @"avi"; - else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: _NS("ASF")] ) + else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: @"ASF"] ) o_mux_string = @"asf"; - else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: _NS("Ogg")] ) + else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: @"Ogg"] ) o_mux_string = @"ogm"; - else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: _NS("MPEG 4")] ) + else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: @"MPEG 4"] ) o_mux_string = @"mp4"; - else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: _NS("Quicktime")] ) + else if ( [[o_mux_selector titleOfSelectedItem] isEqualToString: @"Quicktime"] ) o_mux_string = @"mov"; else o_mux_string = @"ts"; diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h index 7e38344fbe..08e8e79fc3 100644 --- a/modules/gui/macosx/playlist.h +++ b/modules/gui/macosx/playlist.h @@ -1,8 +1,8 @@ /***************************************************************************** - * playlist.h: MacOS X interface plugin + * playlist.h: MacOS X interface module ***************************************************************************** * Copyright (C) 2002-2004 VideoLAN - * $Id: playlist.h,v 1.19 2004/01/15 23:59:21 bigben Exp $ + * $Id: playlist.h,v 1.20 2004/01/25 17:01:57 murray Exp $ * * Authors: Jon Lech Johansen * Derk-Jan Hartman diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index 8f90490fb4..90df9a1b14 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -1,8 +1,8 @@ /***************************************************************************** - * playlist.m: MacOS X interface plugin + * playlist.m: MacOS X interface module ***************************************************************************** * Copyright (C) 2002-2004 VideoLAN - * $Id: playlist.m,v 1.54 2004/01/20 15:34:43 hartman Exp $ + * $Id: playlist.m,v 1.55 2004/01/25 17:01:57 murray Exp $ * * Authors: Jon Lech Johansen * Derk-Jan Hartman @@ -169,9 +169,9 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ [[o_tc_name headerCell] setStringValue:_NS("Name")]; [[o_tc_author headerCell] setStringValue:_NS("Author")]; [[o_tc_duration headerCell] setStringValue:_NS("Duration")]; - [o_random_ckb setTitle: _NS("Shuffle")]; - [o_loop_ckb setTitle: _NS("Repeat Playlist")]; - [o_repeat_ckb setTitle: _NS("Repeat Item")]; + [o_random_ckb setTitle: _NS("Random")]; + [o_loop_ckb setTitle: _NS("Repeat All")]; + [o_repeat_ckb setTitle: _NS("Repeat One")]; [o_search_button setTitle: _NS("Search")]; [o_btn_playlist setToolTip: _NS("Playlist")]; } diff --git a/modules/gui/macosx/prefs.h b/modules/gui/macosx/prefs.h index 3400f2e271..c77f3bcd5e 100644 --- a/modules/gui/macosx/prefs.h +++ b/modules/gui/macosx/prefs.h @@ -1,8 +1,8 @@ /***************************************************************************** - * prefs.h: MacOS X plugin for vlc + * prefs.h: MacOS X module for vlc ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: prefs.h,v 1.12 2003/11/11 23:50:41 hartman Exp $ + * $Id: prefs.h,v 1.13 2004/01/25 17:01:57 murray Exp $ * * Authors: Jon Lech Johansen * diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m index 3d2b807afa..1eee2557d7 100644 --- a/modules/gui/macosx/prefs.m +++ b/modules/gui/macosx/prefs.m @@ -1,8 +1,8 @@ /***************************************************************************** - * prefs.m: MacOS X plugin for vlc + * prefs.m: MacOS X module for vlc ***************************************************************************** * Copyright (C) 2002-2003 VideoLAN - * $Id: prefs.m,v 1.36 2003/12/22 14:32:56 sam Exp $ + * $Id: prefs.m,v 1.37 2004/01/25 17:01:57 murray Exp $ * * Authors: Jon Lech Johansen * Derk-Jan Hartman @@ -204,7 +204,7 @@ { NSBeginInformationalAlertSheet(_NS("Reset Preferences"), _NS("Cancel"), _NS("Continue"), nil, o_prefs_window, self, @selector(sheetDidEnd: returnCode: contextInfo:), NULL, nil, - _NS("Beware this will reset your VLC Media Player config file.\n" + _NS("Beware this will reset your VLC media player preferences.\n" "Are you sure you want to continue?") ); } @@ -892,7 +892,7 @@ static VLCTreeItem *o_root_item = nil; module_config_t *p_item; int i_index,j; - /* List the plugins */ + /* List the modules */ p_list = vlc_list_find( p_intf, VLC_OBJECT_MODULE, FIND_ANYWHERE ); if( !p_list ) return nil; @@ -909,7 +909,7 @@ static VLCTreeItem *o_root_item = nil; } if( p_module == NULL ) { - msg_Err( p_intf, "Could not find the main module in our prefs" ); + msg_Err( p_intf, "could not find the main module in our preferences" ); return nil; } if( i_index < p_list->i_count ) @@ -936,7 +936,7 @@ static VLCTreeItem *o_root_item = nil; } while( p_item->i_type != CONFIG_HINT_END && p_item++ ); - /* Add the plugins item */ + /* Add the modules item */ [o_children addObject:[[VLCTreeItem alloc] initWithName: _NS("Modules") ID: 0 parent:self]]; } @@ -957,7 +957,7 @@ static VLCTreeItem *o_root_item = nil; if( !strcmp( p_module->psz_object_name, "main" ) ) continue; - /* Exclude empty plugins */ + /* Exclude empty modules */ p_item = p_module->p_config; if( !p_item ) continue; do @@ -1027,7 +1027,7 @@ static VLCTreeItem *o_root_item = nil; if( !strcmp( p_module->psz_object_name, "main" ) ) continue; - /* Exclude empty plugins */ + /* Exclude empty modules */ p_item = p_module->p_config; if( !p_item ) continue; do diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h index bbab2f8b6a..2f5a006504 100644 --- a/modules/gui/macosx/vout.h +++ b/modules/gui/macosx/vout.h @@ -1,8 +1,8 @@ /***************************************************************************** - * vout.h: MacOS X interface plugin + * vout.h: MacOS X interface module ***************************************************************************** * Copyright (C) 2001-2003 VideoLAN - * $Id: vout.h,v 1.16 2003/11/15 22:42:16 hartman Exp $ + * $Id: vout.h,v 1.17 2004/01/25 17:01:57 murray Exp $ * * Authors: Colin Delacroix * Florian G. Pflug diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m index 4c2210d728..c80e0b1c05 100644 --- a/modules/gui/macosx/vout.m +++ b/modules/gui/macosx/vout.m @@ -1,8 +1,8 @@ /***************************************************************************** - * vout.m: MacOS X video output plugin + * vout.m: MacOS X video output module ***************************************************************************** * Copyright (C) 2001-2003 VideoLAN - * $Id: vout.m,v 1.68 2003/12/22 17:08:22 bigben Exp $ + * $Id: vout.m,v 1.69 2004/01/25 17:01:57 murray Exp $ * * Authors: Colin Delacroix * Florian G. Pflug