Commit b8f24b4c authored by bigben's avatar bigben

* First string review of the OSX interface

parent 9741e855
...@@ -98,16 +98,16 @@ static VLCBookmarks *_o_sharedInstance = nil; ...@@ -98,16 +98,16 @@ static VLCBookmarks *_o_sharedInstance = nil;
[[[o_tbl_dataTable tableColumnWithIdentifier:@"description"] headerCell] \ [[[o_tbl_dataTable tableColumnWithIdentifier:@"description"] headerCell] \
setStringValue: _NS("Description")]; setStringValue: _NS("Description")];
[[[o_tbl_dataTable tableColumnWithIdentifier:@"size_offset"] headerCell] \ [[[o_tbl_dataTable tableColumnWithIdentifier:@"size_offset"] headerCell] \
setStringValue: _NS("Size offset")]; setStringValue: _NS("Position")];
[[[o_tbl_dataTable tableColumnWithIdentifier:@"time_offset"] headerCell] \ [[[o_tbl_dataTable tableColumnWithIdentifier:@"time_offset"] headerCell] \
setStringValue: _NS("Time offset")]; setStringValue: _NS("Time")];
/* edit window */ /* edit window */
[o_edit_btn_ok setTitle: _NS("OK")]; [o_edit_btn_ok setTitle: _NS("OK")];
[o_edit_btn_cancel setTitle: _NS("Cancel")]; [o_edit_btn_cancel setTitle: _NS("Cancel")];
[o_edit_lbl_name setStringValue: _NS("Name")]; [o_edit_lbl_name setStringValue: _NS("Name")];
[o_edit_lbl_time setStringValue: _NS("Time")]; [o_edit_lbl_time setStringValue: _NS("Time")];
[o_edit_lbl_bytes setStringValue: _NS("Bytes")]; [o_edit_lbl_bytes setStringValue: _NS("Position")];
} }
- (void)showBookmarks - (void)showBookmarks
...@@ -232,7 +232,7 @@ static VLCBookmarks *_o_sharedInstance = nil; ...@@ -232,7 +232,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
{ {
NSBeginCriticalAlertSheet(_NS("No input"), _NS("OK"), \ NSBeginCriticalAlertSheet(_NS("No input"), _NS("OK"), \
@"", @"", o_bookmarks_window, nil, nil, nil, nil, _NS("No " \ @"", @"", o_bookmarks_window, nil, nil, nil, nil, _NS("No " \
"input found. The stream must be playing or paused for " \ "input found. A stream must be playing or paused for " \
"bookmarks to work.")); "bookmarks to work."));
return; return;
} }
...@@ -240,8 +240,9 @@ static VLCBookmarks *_o_sharedInstance = nil; ...@@ -240,8 +240,9 @@ static VLCBookmarks *_o_sharedInstance = nil;
{ {
NSBeginCriticalAlertSheet(_NS("Input has changed"), _NS("OK"), \ NSBeginCriticalAlertSheet(_NS("Input has changed"), _NS("OK"), \
@"", @"", o_bookmarks_window, nil, nil, nil, nil, _NS("Input " \ @"", @"", o_bookmarks_window, nil, nil, nil, nil, _NS("Input " \
"has changed, unable to save bookmark. Use \"Pause\" while " \ "has changed, unable to save bookmark. Suspending playback with " \
"editing bookmarks to keep the same input.")); "\"Pause\" while editing bookmarks to ensure to keep the same " \
"input."));
vlc_object_release( p_input ); vlc_object_release( p_input );
return; return;
} }
...@@ -267,7 +268,7 @@ static VLCBookmarks *_o_sharedInstance = nil; ...@@ -267,7 +268,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
if( input_Control( p_input, INPUT_CHANGE_BOOKMARK, pp_bookmarks[i], i ) \ if( input_Control( p_input, INPUT_CHANGE_BOOKMARK, pp_bookmarks[i], i ) \
!= VLC_SUCCESS ) != VLC_SUCCESS )
{ {
msg_Warn( p_intf, "VLCBookmarks: changing bookmark failed"); msg_Warn( p_intf, "Unable to change the bookmark");
vlc_object_release( p_input ); vlc_object_release( p_input );
return; return;
} }
...@@ -290,7 +291,7 @@ static VLCBookmarks *_o_sharedInstance = nil; ...@@ -290,7 +291,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
{ {
NSBeginAlertSheet(_NS("Invalid selection"), _NS("OK"), \ NSBeginAlertSheet(_NS("Invalid selection"), _NS("OK"), \
@"", @"", o_bookmarks_window, nil, nil, nil, nil, _NS("" \ @"", @"", o_bookmarks_window, nil, nil, nil, nil, _NS("" \
"You have to select two bookmarks.")); "Two bookmarks have to be selected."));
return; return;
} }
input_thread_t *p_input = input_thread_t *p_input =
...@@ -334,7 +335,7 @@ static VLCBookmarks *_o_sharedInstance = nil; ...@@ -334,7 +335,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
&i_bookmarks ) != VLC_SUCCESS ) &i_bookmarks ) != VLC_SUCCESS )
{ {
vlc_object_release( p_input ); vlc_object_release( p_input );
msg_Err(p_intf, "bookmarks couldn't be retrieved from core"); msg_Err(p_intf, "already defined bookmarks couldn't be retrieved");
return; return;
} }
msg_Dbg(p_intf, "calling wizard"); msg_Dbg(p_intf, "calling wizard");
...@@ -473,8 +474,9 @@ static VLCBookmarks *_o_sharedInstance = nil; ...@@ -473,8 +474,9 @@ static VLCBookmarks *_o_sharedInstance = nil;
{ {
/* may not happen, but just in case */ /* may not happen, but just in case */
vlc_object_release( p_input ); vlc_object_release( p_input );
msg_Err(p_intf, "VLCBookmarks: unknown table column identifier " \ msg_Err(p_intf, "unknown table column identifier (%s) while" \
"(%s) while updating table", [[theTableColumn identifier] \ "updating the bookmark table", [[theTableColumn identifier] \
UTF8String] ); UTF8String] );
return @"unknown identifier"; return @"unknown identifier";
} }
......
...@@ -44,11 +44,11 @@ ...@@ -44,11 +44,11 @@
- (void)awakeFromNib - (void)awakeFromNib
{ {
[o_specificTime_mi setTitle: _NS("Go To Position")]; [o_specificTime_mi setTitle: _NS("Jump To Time")];
[o_specificTime_cancel_btn setTitle: _NS("Cancel")]; [o_specificTime_cancel_btn setTitle: _NS("Cancel")];
[o_specificTime_ok_btn setTitle: _NS("OK")]; [o_specificTime_ok_btn setTitle: _NS("OK")];
[o_specificTime_sec_lbl setStringValue: _NS("sec.")]; [o_specificTime_sec_lbl setStringValue: _NS("sec.")];
[o_specificTime_goTo_lbl setStringValue: _NS("Go to specific position")]; [o_specificTime_goTo_lbl setStringValue: _NS("Jump to time")];
} }
- (IBAction)play:(id)sender - (IBAction)play:(id)sender
......
...@@ -139,11 +139,11 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, ...@@ -139,11 +139,11 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf,
int i; int i;
[o_btn_equalizer setToolTip: _NS("Equalizer")]; [o_btn_equalizer setToolTip: _NS("Equalizer")];
[o_ckb_2pass setTitle: _NS("2 Pass")]; [o_ckb_2pass setTitle: _NS("2 Pass")];
[o_ckb_2pass setToolTip: _NS("If you enable this settting, the " [o_ckb_2pass setToolTip: _NS("Apply the"
"equalizer filter will be applied twice. The effect will be sharper.")]; "equalizer filter twice. The effect will be sharper.")];
[o_ckb_enable setTitle: _NS("Enable")]; [o_ckb_enable setTitle: _NS("Enable")];
[o_ckb_enable setToolTip: _NS("Enable the equalizer. You can either " [o_ckb_enable setToolTip: _NS("Enable the equalizer. Bands can be set "
"manually change the bands or use a preset.")]; "manually or using a preset.")];
[o_fld_preamp setStringValue: _NS("Preamp")]; [o_fld_preamp setStringValue: _NS("Preamp")];
[o_popup_presets removeAllItems]; [o_popup_presets removeAllItems];
......
...@@ -88,16 +88,17 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -88,16 +88,17 @@ static VLCExtended *_o_sharedInstance = nil;
[o_ckb_distortion setTitle: _NS("Distortion")]; [o_ckb_distortion setTitle: _NS("Distortion")];
[o_ckb_distortion setToolTip: _NS("Adds distorsion effects")]; [o_ckb_distortion setToolTip: _NS("Adds distorsion effects")];
[o_ckb_imgClone setTitle: _NS("Image clone")]; [o_ckb_imgClone setTitle: _NS("Image clone")];
[o_ckb_imgClone setToolTip: _NS("Creates several clones of the image")]; [o_ckb_imgClone setToolTip: _NS("Creates several copies of the Video " \
"output window" )];
[o_ckb_imgCrop setTitle: _NS("Image cropping")]; [o_ckb_imgCrop setTitle: _NS("Image cropping")];
[o_ckb_imgCrop setToolTip: _NS("Crops the image")]; [o_ckb_imgCrop setToolTip: _NS("Crops a defined part of the image")];
[o_ckb_imgInvers setTitle: _NS("Image inversion")]; [o_ckb_imgInvers setTitle: _NS("Image inversion")];
[o_ckb_imgInvers setToolTip: _NS("Inverts the image colors")]; [o_ckb_imgInvers setToolTip: _NS("Inverts the image colors")];
[o_ckb_trnsform setTitle: _NS("Transformation")]; [o_ckb_trnsform setTitle: _NS("Transformation")];
[o_ckb_trnsform setToolTip: _NS("Rotates or flips the image")]; [o_ckb_trnsform setToolTip: _NS("Rotates or flips the image")];
[o_ckb_vlme_norm setTitle: _NS("Volume normalization")]; [o_ckb_vlme_norm setTitle: _NS("Volume normalization")];
[o_ckb_vlme_norm setToolTip: _NS("This filters prevents the audio output " \ [o_ckb_vlme_norm setToolTip: _NS("This filters prevents the audio output " \
"power from going over a defined value.")]; "level from exceeding a defined value.")];
[o_ckb_hdphnVirt setTitle: _NS("Headphone virtualization")]; [o_ckb_hdphnVirt setTitle: _NS("Headphone virtualization")];
[o_ckb_hdphnVirt setToolTip: _NS("This filter gives the feeling of a " \ [o_ckb_hdphnVirt setToolTip: _NS("This filter gives the feeling of a " \
"5.1 speaker set when using a headphone.")]; "5.1 speaker set when using a headphone.")];
...@@ -305,8 +306,7 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -305,8 +306,7 @@ static VLCExtended *_o_sharedInstance = nil;
{ {
config_PutFloat( p_intf , "saturation" , [o_sld_saturation floatValue] / 100); config_PutFloat( p_intf , "saturation" , [o_sld_saturation floatValue] / 100);
} else { } else {
msg_Warn( p_intf, "cannot find adjust-image-subfilter related to " \ msg_Warn( p_intf, "the corresponding subfilter coundn't be found" );
"moved slider");
} }
} else { } else {
vlc_value_t val; vlc_value_t val;
...@@ -336,8 +336,7 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -336,8 +336,7 @@ static VLCExtended *_o_sharedInstance = nil;
var_Set( p_vout, "saturation", val ); var_Set( p_vout, "saturation", val );
config_PutFloat( p_intf , "saturation" , [o_sld_saturation floatValue] / 100); config_PutFloat( p_intf , "saturation" , [o_sld_saturation floatValue] / 100);
} else { } else {
msg_Warn( p_intf, "cannot find adjust-image-subfilter related to " \ msg_Warn( p_intf, "the corresponding subfilter coundn't be found" );
"moved slider");
} }
vlc_object_release( p_vout ); vlc_object_release( p_vout );
} }
...@@ -600,13 +599,12 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -600,13 +599,12 @@ static VLCExtended *_o_sharedInstance = nil;
{ {
/* show info sheet */ /* show info sheet */
NSBeginInformationalAlertSheet(_NS("More information"), _NS("OK"), @"", @"", \ NSBeginInformationalAlertSheet(_NS("More information"), _NS("OK"), @"", @"", \
o_extended_window, nil, nil, nil, nil, _NS("Select the video effects " \ o_extended_window, nil, nil, nil, nil, _NS("This panel allows to " \
"filters to apply. You must restart the stream for these settings to " \ "select video effects filters to apply.\n" \
"take effect.\nTo configure the filters, go to the Preferences, and " \ "The filters can be configured indivudually in the Preferences, in " \
"go to Modules/Video Filters. You can then configure each filter.\n" \ "the subsections of Video/Filters\n." \
"If you want fine control over the filters ( to choose the order in " \ "To choose the order in which the filter are applied, a filter " \
"which they are applied ), you need to enter manually a filters " \ "option string can be set in the Preferences, Video / Filters section."));
"string (Preferences / Video / Filters)."));
} }
...@@ -779,10 +777,9 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -779,10 +777,9 @@ static VLCExtended *_o_sharedInstance = nil;
if (returnedValue != 0) if (returnedValue != 0)
{ {
msg_Err(p_playlist, "VLCExtended: error while saving the " \ msg_Err(p_playlist, "Unable to save the preferences of the " \
"preferences of '%s' (%i)", [[theModules objectAtIndex: x] \ "extended control attribute '%s' (%i)",
UTF8String] , returnedValue); [[theModules objectAtIndex: x] UTF8String] , returnedValue);
[theModules release]; [theModules release];
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
......
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
int i = 0; int i = 0;
id o_window = NULL; id o_window = NULL;
if( !p_dialog ) if( !p_dialog )
msg_Err( p_intf, "serious issue (p_dialog == nil)" ); msg_Err( p_intf, "No available interaction framework" );
if( !nib_interact_loaded ) if( !nib_interact_loaded )
{ {
......
...@@ -596,12 +596,12 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -596,12 +596,12 @@ static VLCMain *_o_sharedMainInstance = nil;
/* error panel */ /* error panel */
[o_error setTitle: _NS("Error")]; [o_error setTitle: _NS("Error")];
[o_err_lbl setStringValue: _NS("An error has occurred which probably " \ [o_err_lbl setStringValue: _NS("An error has occurred which probably " \
"prevented the execution of your request:")]; "prevented the proper execution of the program:")];
[o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, " \ [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, " \
"please follow the instructions at:")]; "please follow the instructions at:")];
[o_err_btn_msgs setTitle: _NS("Open Messages Window")]; [o_err_btn_msgs setTitle: _NS("Open Messages Window")];
[o_err_btn_dismiss setTitle: _NS("Dismiss")]; [o_err_btn_dismiss setTitle: _NS("Dismiss")];
[o_err_ckbk_surpress setTitle: _NS("Suppress further errors")]; [o_err_ckbk_surpress setTitle: _NS("Do not display further errors")];
[o_info_window setTitle: _NS("Information")]; [o_info_window setTitle: _NS("Information")];
} }
...@@ -672,7 +672,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -672,7 +672,7 @@ static VLCMain *_o_sharedMainInstance = nil;
psz_string = malloc( [o_data length] + 1 ); psz_string = malloc( [o_data length] + 1 );
[o_data getBytes: psz_string]; [o_data getBytes: psz_string];
psz_string[ [o_data length] ] = '\0'; psz_string[ [o_data length] ] = '\0';
msg_Err( VLCIntf, "cannot convert to wanted encoding: %s", msg_Err( VLCIntf, "cannot convert to the requested encoding: %s",
psz_string ); psz_string );
} }
else else
...@@ -1730,7 +1730,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1730,7 +1730,7 @@ static VLCMain *_o_sharedMainInstance = nil;
} }
else else
{ {
NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("You haven't experienced any heavy crashes yet.") ); NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("Couldn't find any trace of a previous crash.") );
} }
} }
......
...@@ -47,14 +47,14 @@ void E_(CloseVideoGL) ( vlc_object_t * ); ...@@ -47,14 +47,14 @@ void E_(CloseVideoGL) ( vlc_object_t * );
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
#define EMBEDDED_TEXT N_("Use embedded video output") #define EMBEDDED_TEXT N_("Embedded video output")
#define EMBEDDED_LONGTEXT N_("Disable this if you want the video output to " \ #define EMBEDDED_LONGTEXT N_("If enabled the video output will " \
"be opened in a separate window instead of in the control window.") "be displayed in the controller window instead of a in separate window.")
#define VDEV_TEXT N_("Video device") #define VDEV_TEXT N_("Video device")
#define VDEV_LONGTEXT N_("Choose a number corresponding to " \ #define VDEV_LONGTEXT N_("Number of the screen to use by default to display " \
"a screen in you video device selection menu and this screen " \ "videos in 'fullscreen'. The screen number correspondance can be found in "\
"will be used by default as the screen for 'fullscreen'.") "the video device selection menu.")
#define OPAQUENESS_TEXT N_("Opaqueness") #define OPAQUENESS_TEXT N_("Opaqueness")
#define OPAQUENESS_LONGTEXT N_( \ #define OPAQUENESS_LONGTEXT N_( \
...@@ -62,26 +62,26 @@ void E_(CloseVideoGL) ( vlc_object_t * ); ...@@ -62,26 +62,26 @@ void E_(CloseVideoGL) ( vlc_object_t * );
"0 is fully transparent.") "0 is fully transparent.")
#define STRETCH_TEXT N_("Stretch video to fill window") #define STRETCH_TEXT N_("Stretch video to fill window")
#define STRETCH_LONGTEXT N_("Instead of keeping the aspect ratio " \ #define STRETCH_LONGTEXT N_("Stretch the video to fill the entire window when "\
"of the movie when resizing the video, stretch the video " \ "resizing the video instead of keeping the aspect ratio and "\
"to fill the entire window." ) "displaying black borders.")
#define FILL_TEXT N_("Fill fullscreen") #define FILL_TEXT N_("Crop borders in fullscreen")
#define FILL_LONGTEXT N_("In fullscreen mode, crop the picture if " \ #define FILL_LONGTEXT N_("In fullscreen mode, crop the picture if " \
"necessary in order to fill the screen without black " \ "necessary in order to fill the screen without black " \
"borders (OpenGL only)." ) "borders (OpenGL only)." )
#define BLACK_TEXT N_("Black screens in fullscreen") #define BLACK_TEXT N_("Black screens in fullscreen")
#define BLACK_LONGTEXT N_("In fullscreen mode, black non-video screens." ) #define BLACK_LONGTEXT N_("In fullscreen mode, keep screen where there is no " \
"video displayed black" )
#define BACKGROUND_TEXT N_("Use as Desktop Background") #define BACKGROUND_TEXT N_("Use as Desktop Background")
#define BACKGROUND_LONGTEXT N_("Use the video as the Desktop Background " \ #define BACKGROUND_LONGTEXT N_("Use the video as the Desktop Background " \
"of the Finder. Desktop icons cannot be interacted with in this mode." ) "Desktop icons cannot be interacted with in this mode." )
#define WIZARD_OPTIONS_SAVING_TEXT N_("Keep wizard selections") #define WIZARD_OPTIONS_SAVING_TEXT N_("Remember wizard options")
#define WIZARD_OPTIONS_SAVING_LONGTEXT N_("Keeps the selections in the " \ #define WIZARD_OPTIONS_SAVING_LONGTEXT N_("Remember the options in the " \
"wizard for one session of VLC, so you do not need to choose them " \ "wizard during one session of VLC.")
"over and over again for similar purposes.")
vlc_module_begin(); vlc_module_begin();
set_description( _("Mac OS X interface") ); set_description( _("Mac OS X interface") );
......
...@@ -170,7 +170,7 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -170,7 +170,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_disc_videots_btn_browse setTitle: _NS("Browse...")]; [o_disc_videots_btn_browse setTitle: _NS("Browse...")];
[o_disc_dvd_menus setTitle: _NS("Use DVD menus")]; [o_disc_dvd_menus setTitle: _NS("Use DVD menus")];
[[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS folder")]; [[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS directory")];
[[o_disc_type cellAtRow:1 column:0] setTitle: _NS("DVD")]; [[o_disc_type cellAtRow:1 column:0] setTitle: _NS("DVD")];
[[o_disc_type cellAtRow:2 column:0] setTitle: _NS("VCD")]; [[o_disc_type cellAtRow:2 column:0] setTitle: _NS("VCD")];
[[o_disc_type cellAtRow:3 column:0] setTitle: _NS("Audio CD")]; [[o_disc_type cellAtRow:3 column:0] setTitle: _NS("Audio CD")];
...@@ -240,7 +240,7 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -240,7 +240,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_file_sub_ckbox setTitle: _NS("Load subtitles file:")]; [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_btn_browse setTitle: _NS("Browse...")];
[o_file_sub_override setTitle: _NS("Override")]; [o_file_sub_override setTitle: _NS("Override parametters")];
[o_file_sub_delay_lbl setStringValue: _NS("delay")]; [o_file_sub_delay_lbl setStringValue: _NS("delay")];
[o_file_sub_delay_stp setEnabled: NO]; [o_file_sub_delay_stp setEnabled: NO];
[o_file_sub_fps_lbl setStringValue: _NS("fps")]; [o_file_sub_fps_lbl setStringValue: _NS("fps")];
...@@ -249,7 +249,7 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -249,7 +249,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_file_sub_encoding_pop removeAllItems]; [o_file_sub_encoding_pop removeAllItems];
[o_file_sub_size_lbl setStringValue: _NS("Font size")]; [o_file_sub_size_lbl setStringValue: _NS("Font size")];
[o_file_sub_size_pop removeAllItems]; [o_file_sub_size_pop removeAllItems];
[o_file_sub_align_lbl setStringValue: _NS("Subtitles justification")]; [o_file_sub_align_lbl setStringValue: _NS("Subtitles alignment")];
[o_file_sub_align_pop removeAllItems]; [o_file_sub_align_pop removeAllItems];
[o_file_sub_ok_btn setStringValue: _NS("OK")]; [o_file_sub_ok_btn setStringValue: _NS("OK")];
[o_file_sub_font_box setTitle: _NS("Font Properties")]; [o_file_sub_font_box setTitle: _NS("Font Properties")];
...@@ -475,7 +475,7 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -475,7 +475,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
o_type = [[o_disc_type selectedCell] title]; o_type = [[o_disc_type selectedCell] title];
if ( [o_type isEqualToString: _NS("VIDEO_TS folder")] ) if ( [o_type isEqualToString: _NS("VIDEO_TS directory")] )
{ {
b_device = 0; b_menus = 1; b_device = 0; b_menus = 1;
} }
......
...@@ -481,7 +481,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ ...@@ -481,7 +481,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
[o_mi_recursive_expand setTitle: _NS("Expand Node")]; [o_mi_recursive_expand setTitle: _NS("Expand Node")];
[o_mi_selectall setTitle: _NS("Select All")]; [o_mi_selectall setTitle: _NS("Select All")];
[o_mi_info setTitle: _NS("Information")]; [o_mi_info setTitle: _NS("Information")];
[o_mi_preparse setTitle: _NS("Preparse")]; [o_mi_preparse setTitle: _NS("Get Stream Information")];
[o_mi_sort_name setTitle: _NS("Sort Node by Name")]; [o_mi_sort_name setTitle: _NS("Sort Node by Name")];
[o_mi_sort_author setTitle: _NS("Sort Node by Author")]; [o_mi_sort_author setTitle: _NS("Sort Node by Author")];
[o_mi_services setTitle: _NS("Services discovery")]; [o_mi_services setTitle: _NS("Services discovery")];
...@@ -1481,7 +1481,6 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ ...@@ -1481,7 +1481,6 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
FIND_ANYWHERE ); FIND_ANYWHERE );
if( !p_playlist ) if( !p_playlist )
{ {
msg_Err( VLCIntf, "Uh Oh! Unable to find playlist!" );
return; return;
} }
...@@ -1489,7 +1488,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ ...@@ -1489,7 +1488,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
_("Empty Folder"), p_playlist->p_general ); _("Empty Folder"), p_playlist->p_general );
if(! p_item ) if(! p_item )
msg_Warn( VLCIntf, "node creation failed, fix VLC!" ); msg_Warn( VLCIntf, "node creation failed" );
playlist_ViewUpdate( p_playlist, VIEW_CATEGORY ); playlist_ViewUpdate( p_playlist, VIEW_CATEGORY );
......
...@@ -356,7 +356,7 @@ ...@@ -356,7 +356,7 @@
input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
FIND_ANYWHERE ); FIND_ANYWHERE );
if( [[o_mi title] isEqualToString: _NS("Info")] ) if( [[o_mi title] isEqualToString: _NS("Information")] )
{ {
if( p_input == NULL ) if( p_input == NULL )
{ {
......
...@@ -142,7 +142,7 @@ static VLCPrefs *_o_sharedMainInstance = nil; ...@@ -142,7 +142,7 @@ static VLCPrefs *_o_sharedMainInstance = nil;
NSBeginInformationalAlertSheet(_NS("Reset Preferences"), _NS("Cancel"), NSBeginInformationalAlertSheet(_NS("Reset Preferences"), _NS("Cancel"),
_NS("Continue"), nil, o_prefs_window, self, _NS("Continue"), nil, o_prefs_window, self,
@selector(sheetDidEnd: returnCode: contextInfo:), NULL, nil, @selector(sheetDidEnd: returnCode: contextInfo:), NULL, nil,
_NS("Beware this will reset your VLC media player preferences.\n" _NS("Beware this will reset the VLC media player preferences.\n"
"Are you sure you want to continue?") ); "Are you sure you want to continue?") );
} }
...@@ -293,7 +293,7 @@ static VLCTreeItem *o_root_item = nil; ...@@ -293,7 +293,7 @@ static VLCTreeItem *o_root_item = nil;
if( p_module == NULL ) if( p_module == NULL )
{ {
msg_Err( p_intf, msg_Err( p_intf,
"could not find the main module in our preferences" ); "could not load the preferences" );
return nil; return nil;
} }
if( i_index < p_list->i_count ) if( i_index < p_list->i_count )
...@@ -544,7 +544,7 @@ static VLCTreeItem *o_root_item = nil; ...@@ -544,7 +544,7 @@ static VLCTreeItem *o_root_item = nil;
{ {
if( !p_item ) if( !p_item )
{ {
msg_Err( p_intf, "null item found" ); msg_Err( p_intf, "invalid preference item found" );
break; break;
} }
switch(p_item->i_type) switch(p_item->i_type)
...@@ -595,8 +595,7 @@ static VLCTreeItem *o_root_item = nil; ...@@ -595,8 +595,7 @@ static VLCTreeItem *o_root_item = nil;
} }
if( p_parser == NULL ) if( p_parser == NULL )
{ {
msg_Err( p_intf, "could not find the main module in our " msg_Err( p_intf, "could not load preferences" );
"preferences" );
return o_view; return o_view;
} }
p_item = (p_parser->p_config + i_object_category); p_item = (p_parser->p_config + i_object_category);
...@@ -611,7 +610,7 @@ static VLCTreeItem *o_root_item = nil; ...@@ -611,7 +610,7 @@ static VLCTreeItem *o_root_item = nil;
p_item++; p_item++;
if( !p_item ) if( !p_item )
{ {
msg_Err( p_intf, "null item found" ); msg_Err( p_intf, "invalid preference item found" );
break; break;
} }
switch( p_item->i_type ) switch( p_item->i_type )
...@@ -702,8 +701,8 @@ static VLCTreeItem *o_root_item = nil; ...@@ -702,8 +701,8 @@ static VLCTreeItem *o_root_item = nil;
[o_label setBordered: NO]; [o_label setBordered: NO];
[o_label setEditable: NO]; [o_label setEditable: NO];
[o_label setSelectable: NO]; [o_label setSelectable: NO];
[o_label setStringValue: _NS("Some options are available but " \ [o_label setStringValue: _NS("Some options are hidden. " \
"hidden. Check \"Advanced\" to see them.")]; "Check \"Advanced\" to display them.")];
[o_label setFont:[NSFont systemFontOfSize:10]]; [o_label setFont:[NSFont systemFontOfSize:10]];
[o_label sizeToFit]; [o_label sizeToFit];
[o_view addSubview:o_label]; [o_view addSubview:o_label];
......
...@@ -81,7 +81,7 @@ static VLCUpdate *_o_sharedInstance = nil; ...@@ -81,7 +81,7 @@ static VLCUpdate *_o_sharedInstance = nil;
- (void)initStrings - (void)initStrings
{ {
/* translate strings to the user's language */ /* translate strings to the user's language */
[o_update_window setTitle: _NS("Check for Update")]; [o_update_window setTitle: _NS("Check for Updates")];
[o_btn_DownloadNow setTitle: _NS("Download now")]; [o_btn_DownloadNow setTitle: _NS("Download now")];
[o_btn_okay setTitle: _