Skip to content

V
vlc-gpu
Commit b8f24b4c authored by Benjamin Pracht's avatar Benjamin Pracht
Browse files
Options

* First string review of the OSX interface

parent 9741e855
Show whitespace changes
Inline Side-by-side
Showing with 158 additions and 158 deletions
modules/gui/macosx/bookmarks.m
View file @ b8f24b4c
...@@ -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";
} }
......
modules/gui/macosx/controls.m
View file @ b8f24b4c
...@@ -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
......
modules/gui/macosx/equalizer.m
View file @ b8f24b4c
...@@ -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];
......
modules/gui/macosx/extended.m
View file @ b8f24b4c
...@@ -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 );
......
modules/gui/macosx/interaction.m
View file @ b8f24b4c
...@@ -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 )
{ {
......
modules/gui/macosx/intf.m
View file @ b8f24b4c
...@@ -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.") );
} }
} }
......
modules/gui/macosx/macosx.m
View file @ b8f24b4c
...@@ -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") );
......
modules/gui/macosx/open.m
View file @ b8f24b4c
...@@ -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;
} }
......
modules/gui/macosx/playlist.m
View file @ b8f24b4c
...@@ -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 );
......
modules/gui/macosx/playlistinfo.m
View file @ b8f24b4c
...@@ -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 )
{ {
......
modules/gui/macosx/prefs.m
View file @ b8f24b4c
...@@ -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];
......
modules/gui/macosx/update.m
View file @ b8f24b4c
...@@ -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: _NS("OK")]; [o_btn_okay setTitle: _NS("OK")];
} }
...@@ -89,7 +89,7 @@ static VLCUpdate *_o_sharedInstance = nil; ...@@ -89,7 +89,7 @@ static VLCUpdate *_o_sharedInstance = nil;
- (void)showUpdateWindow - (void)showUpdateWindow
{ {
/* show the window and check for a potential update */ /* show the window and check for a potential update */
[o_fld_status setStringValue: _NS("Checking for Update...")]; [o_fld_status setStringValue: _NS("Checking for Updates...")];
[o_fld_currentVersionAndSize setStringValue: @""]; [o_fld_currentVersionAndSize setStringValue: @""];
[o_fld_releaseNote setString: @""]; [o_fld_releaseNote setString: @""];
...@@ -177,7 +177,8 @@ static VLCUpdate *_o_sharedInstance = nil; ...@@ -177,7 +177,8 @@ static VLCUpdate *_o_sharedInstance = nil;
(int)((p_uit->file.l_size / 1024) / 1024) ); (int)((p_uit->file.l_size / 1024) / 1024) );
[o_fld_currentVersionAndSize setStringValue: [NSString \ [o_fld_currentVersionAndSize setStringValue: [NSString \
stringWithFormat: \ stringWithFormat: \
_NS("The current release is %s (%i MB to download)."), \ _NS("The latest VLC media player release " \
"is %s (%i MB to download)."), \
p_uit->release.psz_version, ((p_uit->file.l_size \ p_uit->release.psz_version, ((p_uit->file.l_size \
/ 1024) / 1024)]]; / 1024) / 1024)]];
...@@ -191,7 +192,7 @@ static VLCUpdate *_o_sharedInstance = nil; ...@@ -191,7 +192,7 @@ static VLCUpdate *_o_sharedInstance = nil;
{ {
/* our version is outdated, let the user download the new /* our version is outdated, let the user download the new
* release */ * release */
[o_fld_status setStringValue: _NS("Your version of VLC " \ [o_fld_status setStringValue: _NS("This version of VLC " \
"is outdated.")]; "is outdated.")];
[o_btn_DownloadNow setEnabled: YES]; [o_btn_DownloadNow setEnabled: YES];
msg_Dbg( p_intf, "this version of VLC is outdated" ); msg_Dbg( p_intf, "this version of VLC is outdated" );
...@@ -204,8 +205,8 @@ static VLCUpdate *_o_sharedInstance = nil; ...@@ -204,8 +205,8 @@ static VLCUpdate *_o_sharedInstance = nil;
} }
else if(! releaseChecked ) else if(! releaseChecked )
{ {
[o_fld_status setStringValue: _NS("Your version of VLC " \ [o_fld_status setStringValue: _NS("This version of VLC " \
"is up-to-date.")]; "is latest available.")];
[o_btn_DownloadNow setEnabled: NO]; [o_btn_DownloadNow setEnabled: NO];
msg_Dbg( p_intf, "current version is up-to-date" ); msg_Dbg( p_intf, "current version is up-to-date" );
releaseChecked = YES; releaseChecked = YES;
......
modules/gui/macosx/voutgl.m
View file @ b8f24b4c
...@@ -81,7 +81,8 @@ int E_(OpenVideoGL) ( vlc_object_t * p_this ) ...@@ -81,7 +81,8 @@ int E_(OpenVideoGL) ( vlc_object_t * p_this )
if( !CGDisplayUsesOpenGLAcceleration( kCGDirectMainDisplay ) ) if( !CGDisplayUsesOpenGLAcceleration( kCGDirectMainDisplay ) )
{ {
msg_Warn( p_vout, "no hardware acceleration" ); msg_Warn( p_vout, "no OpenGL hardware acceleration found. "
"Video display will be slow" );
return( 1 ); return( 1 );
} }
msg_Dbg( p_vout, "display is Quartz Extreme accelerated" ); msg_Dbg( p_vout, "display is Quartz Extreme accelerated" );
...@@ -259,7 +260,7 @@ static void Unlock( vout_thread_t * p_vout ) ...@@ -259,7 +260,7 @@ static void Unlock( vout_thread_t * p_vout )
if( !fmt ) if( !fmt )
{ {
msg_Warn( p_vout, "Cannot create NSOpenGLPixelFormat" ); msg_Warn( p_vout, "Could not create OpenGL video output" );
return nil; return nil;
} }
......
modules/gui/macosx/voutqt.m
View file @ b8f24b4c
...@@ -151,7 +151,7 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this ) ...@@ -151,7 +151,7 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this )
if( ( err = EnterMovies() ) != noErr ) if( ( err = EnterMovies() ) != noErr )
{ {
msg_Err( p_vout, "EnterMovies failed: %d", err ); msg_Err( p_vout, "QT initialization failed: EnterMovies failed: %d", err );
free( p_vout->p_sys->p_matrix ); free( p_vout->p_sys->p_matrix );
DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); DisposeHandle( (Handle)p_vout->p_sys->h_img_descr );
free( p_vout->p_sys ); free( p_vout->p_sys );
...@@ -189,7 +189,7 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this ) ...@@ -189,7 +189,7 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this )
} }
else else
{ {
msg_Err( p_vout, "failed to find an appropriate codec" ); msg_Err( p_vout, "QT doesn't support any appropriate chroma" );
} }
if( p_vout->p_sys->img_dc == 0 ) if( p_vout->p_sys->img_dc == 0 )
...@@ -294,7 +294,7 @@ static int InitVideo ( vout_thread_t *p_vout ) ...@@ -294,7 +294,7 @@ static int InitVideo ( vout_thread_t *p_vout )
if( QTCreateSequence( p_vout ) ) if( QTCreateSequence( p_vout ) )
{ {
msg_Err( p_vout, "unable to create sequence" ); msg_Err( p_vout, "unable to initialize QT: QTCreateSequence failed" );
return( 1 ); return( 1 );
} }
...@@ -433,7 +433,7 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -433,7 +433,7 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic )
p_pic->p_sys->i_size, p_pic->p_sys->i_size,
codecFlagUseImageBuffer, &flags, NULL, NULL ) != noErr ) ) codecFlagUseImageBuffer, &flags, NULL, NULL ) != noErr ) )
{ {
msg_Warn( p_vout, "DecompressSequenceFrameWhen failed: %d", err ); msg_Warn( p_vout, "QT failed to display the frame sequence: %d", err );
} }
else else
{ {
...@@ -524,7 +524,7 @@ static int CoToggleFullscreen( vout_thread_t *p_vout ) ...@@ -524,7 +524,7 @@ static int CoToggleFullscreen( vout_thread_t *p_vout )
if( QTCreateSequence( p_vout ) ) if( QTCreateSequence( p_vout ) )
{ {
msg_Err( p_vout, "unable to create sequence" ); msg_Err( p_vout, "unable to initialize QT: QTCreateSequence failed" );
return( 1 ); return( 1 );
} }
...@@ -669,7 +669,7 @@ static int QTCreateSequence( vout_thread_t *p_vout ) ...@@ -669,7 +669,7 @@ static int QTCreateSequence( vout_thread_t *p_vout )
codecLosslessQuality, codecLosslessQuality,
bestSpeedCodec ) ) ) bestSpeedCodec ) ) )
{ {
msg_Err( p_vout, "DecompressSequenceBeginS failed: %d", err ); msg_Err( p_vout, "Failed to initialize QT: DecompressSequenceBeginS failed: %d", err );
return( 1 ); return( 1 );
} }
...@@ -777,7 +777,7 @@ static int QTNewPicture( vout_thread_t *p_vout, picture_t *p_pic ) ...@@ -777,7 +777,7 @@ static int QTNewPicture( vout_thread_t *p_vout, picture_t *p_pic )
default: default:
/* Unknown chroma, tell the guy to get lost */ /* Unknown chroma, tell the guy to get lost */
free( p_pic->p_sys ); free( p_pic->p_sys );
msg_Err( p_vout, "never heard of chroma 0x%.8x (%4.4s)", msg_Err( p_vout, "Unknown chroma format 0x%.8x (%4.4s)",
p_vout->output.i_chroma, (char*)&p_vout->output.i_chroma ); p_vout->output.i_chroma, (char*)&p_vout->output.i_chroma );
p_pic->i_planes = 0; p_pic->i_planes = 0;
return( -1 ); return( -1 );
......
modules/gui/macosx/wizard.m
View file @ b8f24b4c
...@@ -206,7 +206,7 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -206,7 +206,7 @@ static VLCWizard *_o_sharedInstance = nil;
o_s16l = [NSArray arrayWithObjects: @"Uncompressed, integer", @"s16l", \ o_s16l = [NSArray arrayWithObjects: @"Uncompressed, integer", @"s16l", \
_NS("Uncompressed audio samples (useable with WAV)"), @"MUX_WAV", \ _NS("Uncompressed audio samples (useable with WAV)"), @"MUX_WAV", \
@"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil];
o_fl32 = [NSArray arrayWithObjects: @"Uncompressed, floating", @"fl32", \ o_fl32 = [NSArray arrayWithObjects: @"Uncompressed, floating point", @"fl32", \
_NS("Uncompressed audio samples (useable with WAV)"), @"MUX_WAV", \ _NS("Uncompressed audio samples (useable with WAV)"), @"MUX_WAV", \
@"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil];
o_dummyAud = [NSArray arrayWithObjects: @"Dummy", @"dummy", \ o_dummyAud = [NSArray arrayWithObjects: @"Dummy", @"dummy", \
...@@ -256,15 +256,15 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -256,15 +256,15 @@ static VLCWizard *_o_sharedInstance = nil;
NSArray * o_rtp_uni; NSArray * o_rtp_uni;
NSArray * o_rtp_multi; NSArray * o_rtp_multi;
o_http = [NSArray arrayWithObjects: @"http", @"HTTP", _NS("Enter the local " \ o_http = [NSArray arrayWithObjects: @"http", @"HTTP", _NS("Enter the local " \
"addresses you want to listen to. Do not enter anything if you want to " \ "addresses you want to listen requests on. Do not enter anything if " \
"listen to all adresses or if you don't understand. This is generally " \ "you want to listen on all the network interfaces. This is generally " \
"the best thing to do. Other computers can then access the stream at " \ "the best thing to do. Other computers can then access the stream at " \
"http://yourip:8080 by default.") , _NS("Use this to stream to several " \ "http://yourip:8080 by default.") , _NS("Use this to stream to several " \
"computers. This method is less efficient, as the server needs to send " \ "computers. This method is not the most efficient, as the server needs "\
"the stream several times."), nil]; "to send the stream several times, but generally the most compatible"), nil];
o_mms = [NSArray arrayWithObjects: @"mmsh", @"MMS", _NS("Enter the local " \ o_mms = [NSArray arrayWithObjects: @"mmsh", @"MMS", _NS("Enter the local " \
"addresses you want to listen to. Do not enter anything if you want to " \ "addresses you want to listen requests on. Do not enter anything if " \
"listen to all adresses or if you don't understand. This is generally " \ "you want to listen on all the network interfaces. This is generally " \
"the best thing to do. Other computers can then access the stream at " \ "the best thing to do. Other computers can then access the stream at " \
"mms://yourip:8080 by default."), _NS("Use this to stream to several " \ "mms://yourip:8080 by default."), _NS("Use this to stream to several " \
"computers using the Microsoft MMS protocol. This protocol is used as " \ "computers using the Microsoft MMS protocol. This protocol is used as " \
...@@ -280,17 +280,17 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -280,17 +280,17 @@ static VLCWizard *_o_sharedInstance = nil;
"enter an address beginning with 239.255."), _NS("Use this to stream " \ "enter an address beginning with 239.255."), _NS("Use this to stream " \
"to a dynamic group of computers on a multicast-enabled network. This " \ "to a dynamic group of computers on a multicast-enabled network. This " \
"is the most efficient method to stream to several computers, but it " \ "is the most efficient method to stream to several computers, but it " \
"does not work over Internet."), nil]; "won't work over the Internet."), nil];
o_rtp_uni = [NSArray arrayWithObjects: @"rtp", @"RTP-Unicast", _NS("Enter the " \ o_rtp_uni = [NSArray arrayWithObjects: @"rtp", @"RTP-Unicast", _NS("Enter the " \
"address of the computer to stream to.") , _NS("Use this to stream " \ "address of the computer to stream to.") , _NS("Use this to stream " \
"to a single computer."), nil]; "to a single computer. RTP headers will be added to the stream"), nil];
o_rtp_multi = [NSArray arrayWithObjects: @"rtp", @"RTP-Multicast", _NS("Enter " \ o_rtp_multi = [NSArray arrayWithObjects: @"rtp", @"RTP-Multicast", _NS("Enter " \
"the multicast address to stream to in this field. This must be an IP " \ "the multicast address to stream to in this field. This must be an IP " \
"address between 224.0.0.0 and 239.255.255.255. For a private use, " \ "address between 224.0.0.0 and 239.255.255.255. For a private use, " \
"enter an address beginning with 239.255."), _NS("Use this to stream " \ "enter an address beginning with 239.255."), _NS("Use this to stream " \
"to a dynamic group of computers on a multicast-enabled network. This " \ "to a dynamic group of computers on a multicast-enabled network. This " \
"is the most efficient method to stream to several computers, but it " \ "is the most efficient method to stream to several computers, but it " \
"does not work over Internet."), nil]; "won't work over Internet. RTP headers will be added to the stream"), nil];
o_strmgMthds = [[NSArray alloc] initWithObjects: o_http, o_mms, \ o_strmgMthds = [[NSArray alloc] initWithObjects: o_http, o_mms, \
o_udp_uni, o_udp_multi, o_rtp_uni, o_rtp_multi, nil]; o_udp_uni, o_udp_multi, o_rtp_uni, o_rtp_multi, nil];
} }
...@@ -366,13 +366,14 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -366,13 +366,14 @@ static VLCWizard *_o_sharedInstance = nil;
/* page one ("Hello") */ /* page one ("Hello") */
[o_t1_txt_title setStringValue: _NS("Streaming/Transcoding Wizard")]; [o_t1_txt_title setStringValue: _NS("Streaming/Transcoding Wizard")];
[o_t1_txt_text setStringValue: _NS("This wizard helps you to stream, " \ [o_t1_txt_text setStringValue: _NS("This wizard allows to configure " \
"transcode or save a stream.")]; "simple streaming or transcoding setups.")];
[o_t1_btn_mrInfo_strmg setTitle: _NS("More Info")]; [o_t1_btn_mrInfo_strmg setTitle: _NS("More Info")];
[o_t1_btn_mrInfo_trnscd setTitle: _NS("More Info")]; [o_t1_btn_mrInfo_trnscd setTitle: _NS("More Info")];
[o_t1_txt_notice setStringValue: _NS("This wizard only gives access to " \ [o_t1_txt_notice setStringValue: _NS("This wizard only gives access to " \
"a small subset of VLC's streaming and transcoding capabilities. " \ "a small subset of VLC's streaming and transcoding capabilities. " \
"Use the Open and Stream Output dialogs to get all of them.")]; "The Open and 'Saving/Streaming' dialogs will give access to more " \
"features.")];
[[o_t1_matrix_strmgOrTrnscd cellAtRow:0 column:0] setTitle: _NS("Stream " \ [[o_t1_matrix_strmgOrTrnscd cellAtRow:0 column:0] setTitle: _NS("Stream " \
"to network")]; "to network")];
[[o_t1_matrix_strmgOrTrnscd cellAtRow:1 column:0] setTitle: _NS("" \ [[o_t1_matrix_strmgOrTrnscd cellAtRow:1 column:0] setTitle: _NS("" \
...@@ -392,20 +393,20 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -392,20 +393,20 @@ static VLCWizard *_o_sharedInstance = nil;
setStringValue: _NS("Author")]; setStringValue: _NS("Author")];
[o_t2_box_prtExtrct setTitle: _NS("Partial Extract")]; [o_t2_box_prtExtrct setTitle: _NS("Partial Extract")];
[o_t2_ckb_enblPartExtrct setTitle: _NS("Enable")]; [o_t2_ckb_enblPartExtrct setTitle: _NS("Enable")];
[o_t2_ckb_enblPartExtrct setToolTip: _NS("Use this to read only a part of "\ [o_t2_ckb_enblPartExtrct setToolTip: _NS("This can be used to read only a "\
"the stream. You must be able to control the incoming stream " \ "part of the stream. It must be possible to control the incoming "\
"(for example, a file or a disc, but not an UDP network stream.) " \ "stream (for example, a file or a disc, but not an UDP network stream.) " \
"Enter the starting and ending times (in seconds).")]; "The starting and ending times can be given in seconds.")];
[o_t2_txt_prtExtrctFrom setStringValue: _NS("From")]; [o_t2_txt_prtExtrctFrom setStringValue: _NS("From")];
[o_t2_txt_prtExtrctTo setStringValue: _NS("To")]; [o_t2_txt_prtExtrctTo setStringValue: _NS("To")];
/* page three ("Streaming 1") */ /* page three ("Streaming 1") */
[o_t3_txt_title setStringValue: _NS("Streaming")]; [o_t3_txt_title setStringValue: _NS("Streaming")];
[o_t3_txt_text setStringValue: _NS("In this page, you will select how " \ [o_t3_txt_text setStringValue: _NS("This page allows to select how " \
"your input stream will be sent.")]; "the input stream will be sent.")];
[o_t3_box_dest setTitle: _NS("Destination")]; [o_t3_box_dest setTitle: _NS("Destination")];
[o_t3_box_strmgMthd setTitle: _NS("Streaming method")]; [o_t3_box_strmgMthd setTitle: _NS("Streaming method")];
[o_t3_txt_destInfo setStringValue: _NS("Enter the address of the computer " \ [o_t3_txt_destInfo setStringValue: _NS("Address of the computer " \
"to stream to.")]; "to stream to.")];
[[o_t3_matrix_stmgMhd cellAtRow:0 column:0] setTitle: _NS("UDP Unicast")]; [[o_t3_matrix_stmgMhd cellAtRow:0 column:0] setTitle: _NS("UDP Unicast")];
[[o_t3_matrix_stmgMhd cellAtRow:0 column:1] setTitle: _NS("UDP Multicast")]; [[o_t3_matrix_stmgMhd cellAtRow:0 column:1] setTitle: _NS("UDP Multicast")];
...@@ -414,30 +415,30 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -414,30 +415,30 @@ static VLCWizard *_o_sharedInstance = nil;
/* page four ("Transcode 1") */ /* page four ("Transcode 1") */
[o_t4_title setStringValue: _NS("Transcode")]; [o_t4_title setStringValue: _NS("Transcode")];
[o_t4_text setStringValue: _NS("If you want to change the compression " \ [o_t4_text setStringValue: _NS("This page allows to change the compression " \
"format of the audio or video tracks, fill in this page. (If you only " \ "format of the audio or video tracks. To change only " \
"want to change the container format, proceed to next page.)")]; "the container format, proceed to next page.")];
[o_t4_box_audio setTitle: _NS("Audio")]; [o_t4_box_audio setTitle: _NS("Audio")];
[o_t4_box_video setTitle: _NS("Video")]; [o_t4_box_video setTitle: _NS("Video")];
[o_t4_ckb_audio setTitle: _NS("Transcode audio")]; [o_t4_ckb_audio setTitle: _NS("Transcode audio")];
[o_t4_ckb_video setTitle: _NS("Transcode video")]; [o_t4_ckb_video setTitle: _NS("Transcode video")];
[o_t4_txt_videoBitrate setStringValue: _NS("Bitrate (kb/s)")]; [o_t4_txt_videoBitrate setStringValue: _NS("Bitrate (kb/s)")];
[o_t4_txt_videoCodec setStringValue: _NS("Codec")]; [o_t4_txt_videoCodec setStringValue: _NS("Codec")];
[o_t4_txt_hintAudio setStringValue: _NS("If your stream has audio and you " \ [o_t4_txt_hintAudio setStringValue: _NS("Enabling this allows to transcode "\
"want to transcode it, enable this.")]; "the audio track if one is present in the stream.")];
[o_t4_txt_hintVideo setStringValue: _NS("If your stream has video and you " \ [o_t4_txt_hintVideo setStringValue: _NS("Enabling this allows to transcode "\
"want to transcode it, enable this.")]; "the video track if one is present in the stream.")];
/* page five ("Encap") */ /* page five ("Encap") */
[o_t5_title setStringValue: _NS("Encapsulation format")]; [o_t5_title setStringValue: _NS("Encapsulation format")];
[o_t5_text setStringValue: _NS("In this page, you will select how the " \ [o_t5_text setStringValue: _NS("This page allows to select how the " \
"stream will be encapsulated. Depending on the choices you made, all " \ "stream will be encapsulated. Depending on previously chosen settings "
"formats won't be available.")]; "all formats won't be available.")];
/* page six ("Streaming 2") */ /* page six ("Streaming 2") */
[o_t6_title setStringValue: _NS("Additional streaming options")]; [o_t6_title setStringValue: _NS("Additional streaming options")];
[o_t6_text setStringValue: _NS("In this page, you will define a few " \ [o_t6_text setStringValue: _NS("In this page, a few " \
"additional parameters for your stream.")]; "additional streaming parameters can be set.")];
[o_t6_txt_ttl setStringValue: _NS("Time-To-Live (TTL)")]; [o_t6_txt_ttl setStringValue: _NS("Time-To-Live (TTL)")];
[o_t6_btn_mrInfo_ttl setTitle: _NS("More Info")]; [o_t6_btn_mrInfo_ttl setTitle: _NS("More Info")];
[o_t6_ckb_sap setTitle: _NS("SAP Announce")]; [o_t6_ckb_sap setTitle: _NS("SAP Announce")];
...@@ -447,16 +448,16 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -447,16 +448,16 @@ static VLCWizard *_o_sharedInstance = nil;
/* page seven ("Transcode 2") */ /* page seven ("Transcode 2") */
[o_t7_title setStringValue: _NS("Additional transcode options")]; [o_t7_title setStringValue: _NS("Additional transcode options")];
[o_t7_text setStringValue: _NS("In this page, you will define a few " \ [o_t7_text setStringValue: _NS("In this page, a few " \
"additional parameters for your transcoding.")]; "additional transcoding parameters can be set.")];
[o_t7_txt_saveFileTo setStringValue: _NS("Select the file to save to")]; [o_t7_txt_saveFileTo setStringValue: _NS("Select the file to save to")];
[o_t7_btn_chooseFile setTitle: _NS("Choose...")]; [o_t7_btn_chooseFile setTitle: _NS("Choose...")];
[o_t7_ckb_local setTitle: _NS("Local playback")]; [o_t7_ckb_local setTitle: _NS("Local playback")];
[o_t7_btn_mrInfo_local setTitle: _NS("More Info")]; [o_t7_btn_mrInfo_local setTitle: _NS("More Info")];
/* page eight ("Summary") */ /* page eight ("Summary") */
[o_t8_txt_text setStringValue: _NS("This page lists all your selections. " \ [o_t8_txt_text setStringValue: _NS("This page lists all the settings." \
"Click \"Finish\" to start your streaming or transcoding.")]; "Click \"Finish\" to start streaming or transcoding.")];
[o_t8_txt_title setStringValue: _NS("Summary")]; [o_t8_txt_title setStringValue: _NS("Summary")];
[o_t8_txt_destination setStringValue: [_NS("Destination") \ [o_t8_txt_destination setStringValue: [_NS("Destination") \
stringByAppendingString: @":"]]; stringByAppendingString: @":"]];
...@@ -628,9 +629,8 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -628,9 +629,8 @@ static VLCWizard *_o_sharedInstance = nil;
/* show a sheet that the user didn't select a file */ /* show a sheet that the user didn't select a file */
NSBeginInformationalAlertSheet(_NS("No input selected"), \ NSBeginInformationalAlertSheet(_NS("No input selected"), \
_NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \
_NS("You have selected neither a new stream nor a valid " \ _NS("No new stream or valid playlist item has been selected.\n\n" \
"playlist item. VLC is unable to guess, which input you " \ "Choose one before going to the next page."));
"want use.\n\nChoose one before going to the next page."));
} }
} }
else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: \ else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: \
...@@ -694,8 +694,8 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -694,8 +694,8 @@ static VLCWizard *_o_sharedInstance = nil;
/* complain to the user that "" is no valid dest. */ /* complain to the user that "" is no valid dest. */
NSBeginInformationalAlertSheet(_NS("No valid destination"), \ NSBeginInformationalAlertSheet(_NS("No valid destination"), \
_NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \
_NS("You need to enter a valid destination you want to "\ _NS("A valid destination has to be selected "\
"stream to. Enter either a Unicast-IP or a Multicast-IP." \ "Enter either a Unicast-IP or a Multicast-IP." \
"\n\nIf you don't know what this means, have a look at " \ "\n\nIf you don't know what this means, have a look at " \
"the VLC Streaming HOWTO and the help texts in this " \ "the VLC Streaming HOWTO and the help texts in this " \
"window.")); "window."));
...@@ -1086,9 +1086,9 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -1086,9 +1086,9 @@ static VLCWizard *_o_sharedInstance = nil;
} else { } else {
/* show a sheet that the selected codecs are not compatible */ /* show a sheet that the selected codecs are not compatible */
NSBeginInformationalAlertSheet(_NS("Invalid selection"), _NS("OK"), \ NSBeginInformationalAlertSheet(_NS("Invalid selection"), _NS("OK"), \
@"", @"", o_wizard_window, nil, nil, nil, nil, _NS("Your " \ @"", @"", o_wizard_window, nil, nil, nil, nil, _NS("The " \
"chosen codecs are not compatible with each other. For example: " \ "chosen codecs are not compatible with each other. For example: " \
"you cannot mix uncompressed audio with any video codec.\n\n" \ "It is impossibleto mix uncompressed audio with any video codec.\n\n" \
"Correct your selection and try again.")); "Correct your selection and try again."));
} }
...@@ -1113,7 +1113,7 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -1113,7 +1113,7 @@ static VLCWizard *_o_sharedInstance = nil;
if( [[o_userSelections objectForKey:@"pathToStrm"] count] > 1 ) if( [[o_userSelections objectForKey:@"pathToStrm"] count] > 1 )
{ {
[o_t7_txt_saveFileTo setStringValue: [o_t7_txt_saveFileTo setStringValue:
_NS("Select the folder to save to")]; _NS("Select the directory to save to")];
} }
else else
{ {
...@@ -1166,17 +1166,17 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -1166,17 +1166,17 @@ static VLCWizard *_o_sharedInstance = nil;
if( [[o_userSelections objectForKey:@"pathToStrm"] count] > 1 ) if( [[o_userSelections objectForKey:@"pathToStrm"] count] > 1 )
NSBeginInformationalAlertSheet(_NS("No folder selected"), \ NSBeginInformationalAlertSheet(_NS("No folder selected"), \
_NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \
[NSString stringWithFormat: @"%@\n\n%@", _NS("You you " \ [NSString stringWithFormat: @"%@\n\n%@", _NS("A directory "
"need to select a folder, you want to save your files to."), "where to save the files has to be selected"),
_NS("Enter either a valid path or choose a location " \ _NS("Enter either a valid path or use the \"Choose...\" " \
"through the button's dialog-box.")]); "button to select a location.")]);
else else
NSBeginInformationalAlertSheet(_NS("No file selected"), \ NSBeginInformationalAlertSheet(_NS("No file selected"), \
_NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \
[NSString stringWithFormat: @"%@\n\n%@", _NS("You you " \ [NSString stringWithFormat: @"%@\n\n%@", _NS("A file " \
"need to select a file, you want to save to."), "where to save the stream has to be selected."),
_NS("Enter either a valid path or choose a location " \ _NS("Enter either a valid path or use the \"Choose\" " \
"through the button's dialog-box.")]); "button to select a location")]);
} else { } else {
/* create a string containing the requested suffix for later usage */ /* create a string containing the requested suffix for later usage */
NSString * theEncapFormat = [[o_encapFormats objectAtIndex: \ NSString * theEncapFormat = [[o_encapFormats objectAtIndex: \
...@@ -1220,9 +1220,9 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -1220,9 +1220,9 @@ static VLCWizard *_o_sharedInstance = nil;
additionalInt += 1; additionalInt += 1;
} }
if( additionalInt >= 100 ) if( additionalInt >= 100 )
msg_Err( VLCIntf, "your destination folder is " \ msg_Err( VLCIntf, "Files with the same name are " \
"cluttered with files with the same name. " \ "already present in the destination directory. " \
"clean up a bit and try again." ); "Delete these files or choose a different directory." );
} }
[tempArray addObject: [tempString retain]]; [tempArray addObject: [tempString retain]];
x += 1; x += 1;
...@@ -1302,7 +1302,7 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -1302,7 +1302,7 @@ static VLCWizard *_o_sharedInstance = nil;
vlc_object_release(p_playlist); vlc_object_release(p_playlist);
} else { } else {
msg_Err( p_intf, "Uh Oh! Unable to find playlist!" ); msg_Err( p_intf, "unable to find playlist" );
} }
/* close the window, since we are done */ /* close the window, since we are done */
...@@ -1623,7 +1623,7 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -1623,7 +1623,7 @@ static VLCWizard *_o_sharedInstance = nil;
/* show a sheet for the help */ /* show a sheet for the help */
NSBeginInformationalAlertSheet(_NS("Stream to network"), \ NSBeginInformationalAlertSheet(_NS("Stream to network"), \
_NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \
_NS("Use this to stream on a network.")); _NS("This allows to stream on a network."));
} }
- (IBAction)t1_mrInfo_transcode:(id)sender - (IBAction)t1_mrInfo_transcode:(id)sender
...@@ -1631,11 +1631,11 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -1631,11 +1631,11 @@ static VLCWizard *_o_sharedInstance = nil;
/* show a sheet for the help */ /* show a sheet for the help */
NSBeginInformationalAlertSheet(_NS("Transcode/Save to file"), \ NSBeginInformationalAlertSheet(_NS("Transcode/Save to file"), \
_NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \
_NS("Use this to save a stream to a file. You "\ _NS("This allows to save a stream to a file. The "\
"have the possibility to reencode the stream. You can save whatever "\ "can be reencoded on the fly. Whatever "\
"VLC can read.\nPlease notice that VLC is not very suited " \ "VLC can read can be saved.\nPlease note that VLC is not very suited " \
"for file to file transcoding. You should use its transcoding " \ "for file to file transcoding. Its transcoding " \
"features to save network streams, for example.")); "features are however useful to save network streams, for example."));
} }
- (IBAction)t2_addNewStream:(id)sender - (IBAction)t2_addNewStream:(id)sender
...@@ -1756,7 +1756,7 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -1756,7 +1756,7 @@ static VLCWizard *_o_sharedInstance = nil;
{ {
/* enable/disable the respective items */ /* enable/disable the respective items */
if([o_t4_ckb_audio state] == NSOnState) if([o_t4_ckb_audio state] == NSOnState)
{
[o_t4_pop_audioCodec setEnabled:YES]; [o_t4_pop_audioCodec setEnabled:YES];
[o_t4_pop_audioBitrate setEnabled:YES]; [o_t4_pop_audioBitrate setEnabled:YES];
[o_t4_txt_hintAudio setStringValue: _NS("Select your audio codec. "\ [o_t4_txt_hintAudio setStringValue: _NS("Select your audio codec. "\
...@@ -1764,8 +1764,8 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -1764,8 +1764,8 @@ static VLCWizard *_o_sharedInstance = nil;
} else { } else {
[o_t4_pop_audioCodec setEnabled:NO]; [o_t4_pop_audioCodec setEnabled:NO];
[o_t4_pop_audioBitrate setEnabled:NO]; [o_t4_pop_audioBitrate setEnabled:NO];
[o_t4_txt_hintAudio setStringValue: _NS("If your stream has audio " \ [o_t4_txt_hintAudio setStringValue: _NS("Enabling this allows to transcode " \
"and you want to transcode it, enable this.")]; "the audio track if one is present in the stream.")];
} }
} }
...@@ -1781,8 +1781,9 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -1781,8 +1781,9 @@ static VLCWizard *_o_sharedInstance = nil;
} else { } else {
[o_t4_pop_videoCodec setEnabled:NO]; [o_t4_pop_videoCodec setEnabled:NO];
[o_t4_pop_videoBitrate setEnabled:NO]; [o_t4_pop_videoBitrate setEnabled:NO];
[o_t4_txt_hintVideo setStringValue: _NS("If your stream has video " \ [o_t4_txt_hintVideo setStringValue: _NS("Enabling this allows to transcode " \
"and you want to transcode it, enable this.")]; "the video track if one is present in the stream.")];
} }
} }
...@@ -1810,7 +1811,7 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -1810,7 +1811,7 @@ static VLCWizard *_o_sharedInstance = nil;
/* show a sheet for the help */ /* show a sheet for the help */
NSBeginInformationalAlertSheet(_NS("Time-To-Live (TTL)"), \ NSBeginInformationalAlertSheet(_NS("Time-To-Live (TTL)"), \
_NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \
_NS("Define the TTL (Time-To-Live) of the stream. "\ _NS("This allows to define the TTL (Time-To-Live) of the stream. "\
"This parameter is the maximum number of routers your stream can " \ "This parameter is the maximum number of routers your stream can " \
"go through. If you don't know what it means, or if you want to " \ "go through. If you don't know what it means, or if you want to " \
"stream on your local network only, leave this setting to 1.")); "stream on your local network only, leave this setting to 1."));
...@@ -1821,8 +1822,8 @@ static VLCWizard *_o_sharedInstance = nil; ...@@ -1821,8 +1822,8 @@ static VLCWizard *_o_sharedInstance = nil;
/* show a sheet for the help */ /* show a sheet for the help */
NSBeginInformationalAlertSheet(_NS("SAP Announce"), \ NSBeginInformationalAlertSheet(_NS("SAP Announce"), \
_NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \
_NS("When streaming using UDP, you can " \ _NS("When streaming using UDP, the streams can be " \
"announce your streams using the SAP/SDP announcing protocol. This " \ "announced using the SAP/SDP announcing protocol. This " \
"way, the clients won't have to type in the multicast address, it " \ "way, the clients won't have to type in the multicast address, it " \
"will appear in their playlist if they enable the SAP extra " \ "will appear in their playlist if they enable the SAP extra " \
"interface.\nIf you want to give a name to your stream, enter it " \ "interface.\nIf you want to give a name to your stream, enter it " \
......
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