From b8f24b4c0db5345a8ca47ad1dc0b6cb53d07e14b Mon Sep 17 00:00:00 2001 From: Benjamin Pracht Date: Sun, 19 Mar 2006 12:57:26 +0000 Subject: [PATCH] * First string review of the OSX interface --- modules/gui/macosx/bookmarks.m | 24 ++--- modules/gui/macosx/controls.m | 4 +- modules/gui/macosx/equalizer.m | 8 +- modules/gui/macosx/extended.m | 33 ++++--- modules/gui/macosx/interaction.m | 2 +- modules/gui/macosx/intf.m | 8 +- modules/gui/macosx/macosx.m | 32 +++---- modules/gui/macosx/open.m | 8 +- modules/gui/macosx/playlist.m | 5 +- modules/gui/macosx/playlistinfo.m | 2 +- modules/gui/macosx/prefs.m | 15 ++-- modules/gui/macosx/update.m | 13 +-- modules/gui/macosx/voutgl.m | 5 +- modules/gui/macosx/voutqt.m | 14 +-- modules/gui/macosx/wizard.m | 143 +++++++++++++++--------------- 15 files changed, 158 insertions(+), 158 deletions(-) diff --git a/modules/gui/macosx/bookmarks.m b/modules/gui/macosx/bookmarks.m index e37e7fa415..68b778f360 100644 --- a/modules/gui/macosx/bookmarks.m +++ b/modules/gui/macosx/bookmarks.m @@ -98,16 +98,16 @@ static VLCBookmarks *_o_sharedInstance = nil; [[[o_tbl_dataTable tableColumnWithIdentifier:@"description"] headerCell] \ setStringValue: _NS("Description")]; [[[o_tbl_dataTable tableColumnWithIdentifier:@"size_offset"] headerCell] \ - setStringValue: _NS("Size offset")]; + setStringValue: _NS("Position")]; [[[o_tbl_dataTable tableColumnWithIdentifier:@"time_offset"] headerCell] \ - setStringValue: _NS("Time offset")]; + setStringValue: _NS("Time")]; /* edit window */ [o_edit_btn_ok setTitle: _NS("OK")]; [o_edit_btn_cancel setTitle: _NS("Cancel")]; [o_edit_lbl_name setStringValue: _NS("Name")]; [o_edit_lbl_time setStringValue: _NS("Time")]; - [o_edit_lbl_bytes setStringValue: _NS("Bytes")]; + [o_edit_lbl_bytes setStringValue: _NS("Position")]; } - (void)showBookmarks @@ -232,7 +232,7 @@ static VLCBookmarks *_o_sharedInstance = nil; { NSBeginCriticalAlertSheet(_NS("No input"), _NS("OK"), \ @"", @"", 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.")); return; } @@ -240,8 +240,9 @@ static VLCBookmarks *_o_sharedInstance = nil; { NSBeginCriticalAlertSheet(_NS("Input has changed"), _NS("OK"), \ @"", @"", o_bookmarks_window, nil, nil, nil, nil, _NS("Input " \ - "has changed, unable to save bookmark. Use \"Pause\" while " \ - "editing bookmarks to keep the same input.")); + "has changed, unable to save bookmark. Suspending playback with " \ + "\"Pause\" while editing bookmarks to ensure to keep the same " \ + "input.")); vlc_object_release( p_input ); return; } @@ -267,7 +268,7 @@ static VLCBookmarks *_o_sharedInstance = nil; if( input_Control( p_input, INPUT_CHANGE_BOOKMARK, pp_bookmarks[i], i ) \ != VLC_SUCCESS ) { - msg_Warn( p_intf, "VLCBookmarks: changing bookmark failed"); + msg_Warn( p_intf, "Unable to change the bookmark"); vlc_object_release( p_input ); return; } @@ -290,7 +291,7 @@ static VLCBookmarks *_o_sharedInstance = nil; { NSBeginAlertSheet(_NS("Invalid selection"), _NS("OK"), \ @"", @"", o_bookmarks_window, nil, nil, nil, nil, _NS("" \ - "You have to select two bookmarks.")); + "Two bookmarks have to be selected.")); return; } input_thread_t *p_input = @@ -334,7 +335,7 @@ static VLCBookmarks *_o_sharedInstance = nil; &i_bookmarks ) != VLC_SUCCESS ) { 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; } msg_Dbg(p_intf, "calling wizard"); @@ -473,8 +474,9 @@ static VLCBookmarks *_o_sharedInstance = nil; { /* may not happen, but just in case */ vlc_object_release( p_input ); - msg_Err(p_intf, "VLCBookmarks: unknown table column identifier " \ - "(%s) while updating table", [[theTableColumn identifier] \ + msg_Err(p_intf, "unknown table column identifier (%s) while" \ + "updating the bookmark table", [[theTableColumn identifier] \ + UTF8String] ); return @"unknown identifier"; } diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m index ffecbac769..5fb81cb3e5 100644 --- a/modules/gui/macosx/controls.m +++ b/modules/gui/macosx/controls.m @@ -44,11 +44,11 @@ - (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_ok_btn setTitle: _NS("OK")]; [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 diff --git a/modules/gui/macosx/equalizer.m b/modules/gui/macosx/equalizer.m index 659ce9f9d8..3f70d7e063 100644 --- a/modules/gui/macosx/equalizer.m +++ b/modules/gui/macosx/equalizer.m @@ -139,11 +139,11 @@ static vlc_bool_t GetFiltersStatus( intf_thread_t *p_intf, int i; [o_btn_equalizer setToolTip: _NS("Equalizer")]; [o_ckb_2pass setTitle: _NS("2 Pass")]; - [o_ckb_2pass setToolTip: _NS("If you enable this settting, the " - "equalizer filter will be applied twice. The effect will be sharper.")]; + [o_ckb_2pass setToolTip: _NS("Apply the" + "equalizer filter twice. The effect will be sharper.")]; [o_ckb_enable setTitle: _NS("Enable")]; - [o_ckb_enable setToolTip: _NS("Enable the equalizer. You can either " - "manually change the bands or use a preset.")]; + [o_ckb_enable setToolTip: _NS("Enable the equalizer. Bands can be set " + "manually or using a preset.")]; [o_fld_preamp setStringValue: _NS("Preamp")]; [o_popup_presets removeAllItems]; diff --git a/modules/gui/macosx/extended.m b/modules/gui/macosx/extended.m index ddc46b4159..e0b0daefec 100644 --- a/modules/gui/macosx/extended.m +++ b/modules/gui/macosx/extended.m @@ -88,16 +88,17 @@ static VLCExtended *_o_sharedInstance = nil; [o_ckb_distortion setTitle: _NS("Distortion")]; [o_ckb_distortion setToolTip: _NS("Adds distorsion effects")]; [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 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 setToolTip: _NS("Inverts the image colors")]; [o_ckb_trnsform setTitle: _NS("Transformation")]; [o_ckb_trnsform setToolTip: _NS("Rotates or flips the image")]; [o_ckb_vlme_norm setTitle: _NS("Volume normalization")]; [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 setToolTip: _NS("This filter gives the feeling of a " \ "5.1 speaker set when using a headphone.")]; @@ -305,8 +306,7 @@ static VLCExtended *_o_sharedInstance = nil; { config_PutFloat( p_intf , "saturation" , [o_sld_saturation floatValue] / 100); } else { - msg_Warn( p_intf, "cannot find adjust-image-subfilter related to " \ - "moved slider"); + msg_Warn( p_intf, "the corresponding subfilter coundn't be found" ); } } else { vlc_value_t val; @@ -336,8 +336,7 @@ static VLCExtended *_o_sharedInstance = nil; var_Set( p_vout, "saturation", val ); config_PutFloat( p_intf , "saturation" , [o_sld_saturation floatValue] / 100); } else { - msg_Warn( p_intf, "cannot find adjust-image-subfilter related to " \ - "moved slider"); + msg_Warn( p_intf, "the corresponding subfilter coundn't be found" ); } vlc_object_release( p_vout ); } @@ -600,13 +599,12 @@ static VLCExtended *_o_sharedInstance = nil; { /* show info sheet */ NSBeginInformationalAlertSheet(_NS("More information"), _NS("OK"), @"", @"", \ - o_extended_window, nil, nil, nil, nil, _NS("Select the video effects " \ - "filters to apply. You must restart the stream for these settings to " \ - "take effect.\nTo configure the filters, go to the Preferences, and " \ - "go to Modules/Video Filters. You can then configure each filter.\n" \ - "If you want fine control over the filters ( to choose the order in " \ - "which they are applied ), you need to enter manually a filters " \ - "string (Preferences / Video / Filters).")); + o_extended_window, nil, nil, nil, nil, _NS("This panel allows to " \ + "select video effects filters to apply.\n" \ + "The filters can be configured indivudually in the Preferences, in " \ + "the subsections of Video/Filters\n." \ + "To choose the order in which the filter are applied, a filter " \ + "option string can be set in the Preferences, Video / Filters section.")); } @@ -779,10 +777,9 @@ static VLCExtended *_o_sharedInstance = nil; if (returnedValue != 0) { - msg_Err(p_playlist, "VLCExtended: error while saving the " \ - "preferences of '%s' (%i)", [[theModules objectAtIndex: x] \ - UTF8String] , returnedValue); - + msg_Err(p_playlist, "Unable to save the preferences of the " \ + "extended control attribute '%s' (%i)", + [[theModules objectAtIndex: x] UTF8String] , returnedValue); [theModules release]; vlc_object_release( p_playlist ); diff --git a/modules/gui/macosx/interaction.m b/modules/gui/macosx/interaction.m index f5128077ee..9f602c32cf 100644 --- a/modules/gui/macosx/interaction.m +++ b/modules/gui/macosx/interaction.m @@ -113,7 +113,7 @@ int i = 0; id o_window = NULL; if( !p_dialog ) - msg_Err( p_intf, "serious issue (p_dialog == nil)" ); + msg_Err( p_intf, "No available interaction framework" ); if( !nib_interact_loaded ) { diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 3903fbec9b..c44477d95d 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -596,12 +596,12 @@ static VLCMain *_o_sharedMainInstance = nil; /* error panel */ [o_error setTitle: _NS("Error")]; [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, " \ "please follow the instructions at:")]; [o_err_btn_msgs setTitle: _NS("Open Messages Window")]; [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")]; } @@ -672,7 +672,7 @@ static VLCMain *_o_sharedMainInstance = nil; psz_string = malloc( [o_data length] + 1 ); [o_data getBytes: psz_string]; 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 ); } else @@ -1730,7 +1730,7 @@ static VLCMain *_o_sharedMainInstance = nil; } 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.") ); } } diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m index 19b2b9debe..c23243b891 100644 --- a/modules/gui/macosx/macosx.m +++ b/modules/gui/macosx/macosx.m @@ -47,14 +47,14 @@ void E_(CloseVideoGL) ( vlc_object_t * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -#define EMBEDDED_TEXT N_("Use embedded video output") -#define EMBEDDED_LONGTEXT N_("Disable this if you want the video output to " \ - "be opened in a separate window instead of in the control window.") +#define EMBEDDED_TEXT N_("Embedded video output") +#define EMBEDDED_LONGTEXT N_("If enabled the video output will " \ + "be displayed in the controller window instead of a in separate window.") #define VDEV_TEXT N_("Video device") -#define VDEV_LONGTEXT N_("Choose a number corresponding to " \ - "a screen in you video device selection menu and this screen " \ - "will be used by default as the screen for 'fullscreen'.") +#define VDEV_LONGTEXT N_("Number of the screen to use by default to display " \ + "videos in 'fullscreen'. The screen number correspondance can be found in "\ + "the video device selection menu.") #define OPAQUENESS_TEXT N_("Opaqueness") #define OPAQUENESS_LONGTEXT N_( \ @@ -62,26 +62,26 @@ void E_(CloseVideoGL) ( vlc_object_t * ); "0 is fully transparent.") #define STRETCH_TEXT N_("Stretch video to fill window") -#define STRETCH_LONGTEXT N_("Instead of keeping the aspect ratio " \ - "of the movie when resizing the video, stretch the video " \ - "to fill the entire window." ) +#define STRETCH_LONGTEXT N_("Stretch the video to fill the entire window when "\ + "resizing the video instead of keeping the aspect ratio and "\ + "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 " \ "necessary in order to fill the screen without black " \ "borders (OpenGL only)." ) #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_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_LONGTEXT N_("Keeps the selections in the " \ - "wizard for one session of VLC, so you do not need to choose them " \ - "over and over again for similar purposes.") +#define WIZARD_OPTIONS_SAVING_TEXT N_("Remember wizard options") +#define WIZARD_OPTIONS_SAVING_LONGTEXT N_("Remember the options in the " \ + "wizard during one session of VLC.") vlc_module_begin(); set_description( _("Mac OS X interface") ); diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index 0e27c657df..b97bf6c4dc 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -170,7 +170,7 @@ static VLCOpen *_o_sharedMainInstance = nil; [o_disc_videots_btn_browse setTitle: _NS("Browse...")]; [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:2 column:0] setTitle: _NS("VCD")]; [[o_disc_type cellAtRow:3 column:0] setTitle: _NS("Audio CD")]; @@ -240,7 +240,7 @@ static VLCOpen *_o_sharedMainInstance = nil; [o_file_sub_ckbox setTitle: _NS("Load subtitles file:")]; [o_file_sub_btn_settings setTitle: _NS("Settings...")]; [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_stp setEnabled: NO]; [o_file_sub_fps_lbl setStringValue: _NS("fps")]; @@ -249,7 +249,7 @@ static VLCOpen *_o_sharedMainInstance = nil; [o_file_sub_encoding_pop removeAllItems]; [o_file_sub_size_lbl setStringValue: _NS("Font size")]; [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_ok_btn setStringValue: _NS("OK")]; [o_file_sub_font_box setTitle: _NS("Font Properties")]; @@ -475,7 +475,7 @@ static VLCOpen *_o_sharedMainInstance = nil; 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; } diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index aa51b209eb..162ebdb4db 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -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_selectall setTitle: _NS("Select All")]; [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_author setTitle: _NS("Sort Node by Author")]; [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*/ FIND_ANYWHERE ); if( !p_playlist ) { - msg_Err( VLCIntf, "Uh Oh! Unable to find playlist!" ); return; } @@ -1489,7 +1488,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ _("Empty Folder"), p_playlist->p_general ); if(! p_item ) - msg_Warn( VLCIntf, "node creation failed, fix VLC!" ); + msg_Warn( VLCIntf, "node creation failed" ); playlist_ViewUpdate( p_playlist, VIEW_CATEGORY ); diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/playlistinfo.m index c09b181618..5230a84593 100644 --- a/modules/gui/macosx/playlistinfo.m +++ b/modules/gui/macosx/playlistinfo.m @@ -356,7 +356,7 @@ input_thread_t * p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, FIND_ANYWHERE ); - if( [[o_mi title] isEqualToString: _NS("Info")] ) + if( [[o_mi title] isEqualToString: _NS("Information")] ) { if( p_input == NULL ) { diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m index 5b30b7aa45..002adf6eb1 100644 --- a/modules/gui/macosx/prefs.m +++ b/modules/gui/macosx/prefs.m @@ -142,7 +142,7 @@ static VLCPrefs *_o_sharedMainInstance = nil; 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 preferences.\n" + _NS("Beware this will reset the VLC media player preferences.\n" "Are you sure you want to continue?") ); } @@ -293,7 +293,7 @@ static VLCTreeItem *o_root_item = nil; if( p_module == NULL ) { msg_Err( p_intf, - "could not find the main module in our preferences" ); + "could not load the preferences" ); return nil; } if( i_index < p_list->i_count ) @@ -544,7 +544,7 @@ static VLCTreeItem *o_root_item = nil; { if( !p_item ) { - msg_Err( p_intf, "null item found" ); + msg_Err( p_intf, "invalid preference item found" ); break; } switch(p_item->i_type) @@ -595,8 +595,7 @@ static VLCTreeItem *o_root_item = nil; } if( p_parser == NULL ) { - msg_Err( p_intf, "could not find the main module in our " - "preferences" ); + msg_Err( p_intf, "could not load preferences" ); return o_view; } p_item = (p_parser->p_config + i_object_category); @@ -611,7 +610,7 @@ static VLCTreeItem *o_root_item = nil; p_item++; if( !p_item ) { - msg_Err( p_intf, "null item found" ); + msg_Err( p_intf, "invalid preference item found" ); break; } switch( p_item->i_type ) @@ -702,8 +701,8 @@ static VLCTreeItem *o_root_item = nil; [o_label setBordered: NO]; [o_label setEditable: NO]; [o_label setSelectable: NO]; - [o_label setStringValue: _NS("Some options are available but " \ - "hidden. Check \"Advanced\" to see them.")]; + [o_label setStringValue: _NS("Some options are hidden. " \ + "Check \"Advanced\" to display them.")]; [o_label setFont:[NSFont systemFontOfSize:10]]; [o_label sizeToFit]; [o_view addSubview:o_label]; diff --git a/modules/gui/macosx/update.m b/modules/gui/macosx/update.m index e0c210c020..cf4add5634 100644 --- a/modules/gui/macosx/update.m +++ b/modules/gui/macosx/update.m @@ -81,7 +81,7 @@ static VLCUpdate *_o_sharedInstance = nil; - (void)initStrings { /* 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_okay setTitle: _NS("OK")]; } @@ -89,7 +89,7 @@ static VLCUpdate *_o_sharedInstance = nil; - (void)showUpdateWindow { /* 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_releaseNote setString: @""]; @@ -177,7 +177,8 @@ static VLCUpdate *_o_sharedInstance = nil; (int)((p_uit->file.l_size / 1024) / 1024) ); [o_fld_currentVersionAndSize setStringValue: [NSString \ 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 \ / 1024) / 1024)]]; @@ -191,7 +192,7 @@ static VLCUpdate *_o_sharedInstance = nil; { /* our version is outdated, let the user download the new * release */ - [o_fld_status setStringValue: _NS("Your version of VLC " \ + [o_fld_status setStringValue: _NS("This version of VLC " \ "is outdated.")]; [o_btn_DownloadNow setEnabled: YES]; msg_Dbg( p_intf, "this version of VLC is outdated" ); @@ -204,8 +205,8 @@ static VLCUpdate *_o_sharedInstance = nil; } else if(! releaseChecked ) { - [o_fld_status setStringValue: _NS("Your version of VLC " \ - "is up-to-date.")]; + [o_fld_status setStringValue: _NS("This version of VLC " \ + "is latest available.")]; [o_btn_DownloadNow setEnabled: NO]; msg_Dbg( p_intf, "current version is up-to-date" ); releaseChecked = YES; diff --git a/modules/gui/macosx/voutgl.m b/modules/gui/macosx/voutgl.m index d4e468be7c..8b3c89ed20 100644 --- a/modules/gui/macosx/voutgl.m +++ b/modules/gui/macosx/voutgl.m @@ -81,7 +81,8 @@ int E_(OpenVideoGL) ( vlc_object_t * p_this ) 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 ); } msg_Dbg( p_vout, "display is Quartz Extreme accelerated" ); @@ -259,7 +260,7 @@ static void Unlock( vout_thread_t * p_vout ) if( !fmt ) { - msg_Warn( p_vout, "Cannot create NSOpenGLPixelFormat" ); + msg_Warn( p_vout, "Could not create OpenGL video output" ); return nil; } diff --git a/modules/gui/macosx/voutqt.m b/modules/gui/macosx/voutqt.m index cd11dc2e39..305155bb7b 100644 --- a/modules/gui/macosx/voutqt.m +++ b/modules/gui/macosx/voutqt.m @@ -151,7 +151,7 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this ) 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 ); DisposeHandle( (Handle)p_vout->p_sys->h_img_descr ); free( p_vout->p_sys ); @@ -189,7 +189,7 @@ int E_(OpenVideoQT) ( vlc_object_t *p_this ) } 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 ) @@ -294,7 +294,7 @@ static int InitVideo ( vout_thread_t *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 ); } @@ -433,7 +433,7 @@ static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic ) p_pic->p_sys->i_size, 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 { @@ -524,7 +524,7 @@ static int CoToggleFullscreen( vout_thread_t *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 ); } @@ -669,7 +669,7 @@ static int QTCreateSequence( vout_thread_t *p_vout ) codecLosslessQuality, bestSpeedCodec ) ) ) { - msg_Err( p_vout, "DecompressSequenceBeginS failed: %d", err ); + msg_Err( p_vout, "Failed to initialize QT: DecompressSequenceBeginS failed: %d", err ); return( 1 ); } @@ -777,7 +777,7 @@ static int QTNewPicture( vout_thread_t *p_vout, picture_t *p_pic ) default: /* Unknown chroma, tell the guy to get lost */ 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_pic->i_planes = 0; return( -1 ); diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m index d3c3f9dc68..36966bc2dc 100644 --- a/modules/gui/macosx/wizard.m +++ b/modules/gui/macosx/wizard.m @@ -206,7 +206,7 @@ static VLCWizard *_o_sharedInstance = nil; o_s16l = [NSArray arrayWithObjects: @"Uncompressed, integer", @"s16l", \ _NS("Uncompressed audio samples (useable with WAV)"), @"MUX_WAV", \ @"-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", \ @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", @"-1", nil]; o_dummyAud = [NSArray arrayWithObjects: @"Dummy", @"dummy", \ @@ -256,15 +256,15 @@ static VLCWizard *_o_sharedInstance = nil; NSArray * o_rtp_uni; NSArray * o_rtp_multi; o_http = [NSArray arrayWithObjects: @"http", @"HTTP", _NS("Enter the local " \ - "addresses you want to listen to. Do not enter anything if you want to " \ - "listen to all adresses or if you don't understand. This is generally " \ + "addresses you want to listen requests on. Do not enter anything if " \ + "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 " \ "http://yourip:8080 by default.") , _NS("Use this to stream to several " \ - "computers. This method is less efficient, as the server needs to send " \ - "the stream several times."), nil]; + "computers. This method is not the most efficient, as the server needs "\ + "to send the stream several times, but generally the most compatible"), nil]; o_mms = [NSArray arrayWithObjects: @"mmsh", @"MMS", _NS("Enter the local " \ - "addresses you want to listen to. Do not enter anything if you want to " \ - "listen to all adresses or if you don't understand. This is generally " \ + "addresses you want to listen requests on. Do not enter anything if " \ + "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 " \ "mms://yourip:8080 by default."), _NS("Use this to stream to several " \ "computers using the Microsoft MMS protocol. This protocol is used as " \ @@ -280,17 +280,17 @@ static VLCWizard *_o_sharedInstance = nil; "enter an address beginning with 239.255."), _NS("Use this to stream " \ "to a dynamic group of computers on a multicast-enabled network. This " \ "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 " \ "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 " \ "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, " \ "enter an address beginning with 239.255."), _NS("Use this to stream " \ "to a dynamic group of computers on a multicast-enabled network. This " \ "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_udp_uni, o_udp_multi, o_rtp_uni, o_rtp_multi, nil]; } @@ -366,13 +366,14 @@ static VLCWizard *_o_sharedInstance = nil; /* page one ("Hello") */ [o_t1_txt_title setStringValue: _NS("Streaming/Transcoding Wizard")]; - [o_t1_txt_text setStringValue: _NS("This wizard helps you to stream, " \ - "transcode or save a stream.")]; + [o_t1_txt_text setStringValue: _NS("This wizard allows to configure " \ + "simple streaming or transcoding setups.")]; [o_t1_btn_mrInfo_strmg 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 " \ "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 " \ "to network")]; [[o_t1_matrix_strmgOrTrnscd cellAtRow:1 column:0] setTitle: _NS("" \ @@ -392,20 +393,20 @@ static VLCWizard *_o_sharedInstance = nil; setStringValue: _NS("Author")]; [o_t2_box_prtExtrct setTitle: _NS("Partial Extract")]; [o_t2_ckb_enblPartExtrct setTitle: _NS("Enable")]; - [o_t2_ckb_enblPartExtrct setToolTip: _NS("Use this to read only a part of "\ - "the stream. You must be able to control the incoming stream " \ - "(for example, a file or a disc, but not an UDP network stream.) " \ - "Enter the starting and ending times (in seconds).")]; + [o_t2_ckb_enblPartExtrct setToolTip: _NS("This can be used to read only a "\ + "part of the stream. It must be possible to control the incoming "\ + "stream (for example, a file or a disc, but not an UDP network stream.) " \ + "The starting and ending times can be given in seconds.")]; [o_t2_txt_prtExtrctFrom setStringValue: _NS("From")]; [o_t2_txt_prtExtrctTo setStringValue: _NS("To")]; /* page three ("Streaming 1") */ [o_t3_txt_title setStringValue: _NS("Streaming")]; - [o_t3_txt_text setStringValue: _NS("In this page, you will select how " \ - "your input stream will be sent.")]; + [o_t3_txt_text setStringValue: _NS("This page allows to select how " \ + "the input stream will be sent.")]; [o_t3_box_dest setTitle: _NS("Destination")]; [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.")]; [[o_t3_matrix_stmgMhd cellAtRow:0 column:0] setTitle: _NS("UDP Unicast")]; [[o_t3_matrix_stmgMhd cellAtRow:0 column:1] setTitle: _NS("UDP Multicast")]; @@ -414,30 +415,30 @@ static VLCWizard *_o_sharedInstance = nil; /* page four ("Transcode 1") */ [o_t4_title setStringValue: _NS("Transcode")]; - [o_t4_text setStringValue: _NS("If you want to change the compression " \ - "format of the audio or video tracks, fill in this page. (If you only " \ - "want to change the container format, proceed to next page.)")]; + [o_t4_text setStringValue: _NS("This page allows to change the compression " \ + "format of the audio or video tracks. To change only " \ + "the container format, proceed to next page.")]; [o_t4_box_audio setTitle: _NS("Audio")]; [o_t4_box_video setTitle: _NS("Video")]; [o_t4_ckb_audio setTitle: _NS("Transcode audio")]; [o_t4_ckb_video setTitle: _NS("Transcode video")]; [o_t4_txt_videoBitrate setStringValue: _NS("Bitrate (kb/s)")]; [o_t4_txt_videoCodec setStringValue: _NS("Codec")]; - [o_t4_txt_hintAudio setStringValue: _NS("If your stream has audio and you " \ - "want to transcode it, enable this.")]; - [o_t4_txt_hintVideo setStringValue: _NS("If your stream has video and you " \ - "want to transcode it, enable this.")]; + [o_t4_txt_hintAudio setStringValue: _NS("Enabling this allows to transcode "\ + "the audio track if one is present in the stream.")]; + [o_t4_txt_hintVideo setStringValue: _NS("Enabling this allows to transcode "\ + "the video track if one is present in the stream.")]; /* page five ("Encap") */ [o_t5_title setStringValue: _NS("Encapsulation format")]; - [o_t5_text setStringValue: _NS("In this page, you will select how the " \ - "stream will be encapsulated. Depending on the choices you made, all " \ - "formats won't be available.")]; + [o_t5_text setStringValue: _NS("This page allows to select how the " \ + "stream will be encapsulated. Depending on previously chosen settings " + "all formats won't be available.")]; /* page six ("Streaming 2") */ [o_t6_title setStringValue: _NS("Additional streaming options")]; - [o_t6_text setStringValue: _NS("In this page, you will define a few " \ - "additional parameters for your stream.")]; + [o_t6_text setStringValue: _NS("In this page, a few " \ + "additional streaming parameters can be set.")]; [o_t6_txt_ttl setStringValue: _NS("Time-To-Live (TTL)")]; [o_t6_btn_mrInfo_ttl setTitle: _NS("More Info")]; [o_t6_ckb_sap setTitle: _NS("SAP Announce")]; @@ -447,16 +448,16 @@ static VLCWizard *_o_sharedInstance = nil; /* page seven ("Transcode 2") */ [o_t7_title setStringValue: _NS("Additional transcode options")]; - [o_t7_text setStringValue: _NS("In this page, you will define a few " \ - "additional parameters for your transcoding.")]; + [o_t7_text setStringValue: _NS("In this page, a few " \ + "additional transcoding parameters can be set.")]; [o_t7_txt_saveFileTo setStringValue: _NS("Select the file to save to")]; [o_t7_btn_chooseFile setTitle: _NS("Choose...")]; [o_t7_ckb_local setTitle: _NS("Local playback")]; [o_t7_btn_mrInfo_local setTitle: _NS("More Info")]; /* page eight ("Summary") */ - [o_t8_txt_text setStringValue: _NS("This page lists all your selections. " \ - "Click \"Finish\" to start your streaming or transcoding.")]; + [o_t8_txt_text setStringValue: _NS("This page lists all the settings." \ + "Click \"Finish\" to start streaming or transcoding.")]; [o_t8_txt_title setStringValue: _NS("Summary")]; [o_t8_txt_destination setStringValue: [_NS("Destination") \ stringByAppendingString: @":"]]; @@ -628,9 +629,8 @@ static VLCWizard *_o_sharedInstance = nil; /* show a sheet that the user didn't select a file */ NSBeginInformationalAlertSheet(_NS("No input selected"), \ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ - _NS("You have selected neither a new stream nor a valid " \ - "playlist item. VLC is unable to guess, which input you " \ - "want use.\n\nChoose one before going to the next page.")); + _NS("No new stream or valid playlist item has been selected.\n\n" \ + "Choose one before going to the next page.")); } } else if ([[[o_tab_pageHolder selectedTabViewItem] label] isEqualToString: \ @@ -694,8 +694,8 @@ static VLCWizard *_o_sharedInstance = nil; /* complain to the user that "" is no valid dest. */ NSBeginInformationalAlertSheet(_NS("No valid destination"), \ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ - _NS("You need to enter a valid destination you want to "\ - "stream to. Enter either a Unicast-IP or a Multicast-IP." \ + _NS("A valid destination has to be selected "\ + "Enter either a Unicast-IP or a Multicast-IP." \ "\n\nIf you don't know what this means, have a look at " \ "the VLC Streaming HOWTO and the help texts in this " \ "window.")); @@ -1086,9 +1086,9 @@ static VLCWizard *_o_sharedInstance = nil; } else { /* show a sheet that the selected codecs are not compatible */ 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: " \ - "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.")); } @@ -1113,7 +1113,7 @@ static VLCWizard *_o_sharedInstance = nil; if( [[o_userSelections objectForKey:@"pathToStrm"] count] > 1 ) { [o_t7_txt_saveFileTo setStringValue: - _NS("Select the folder to save to")]; + _NS("Select the directory to save to")]; } else { @@ -1166,20 +1166,20 @@ static VLCWizard *_o_sharedInstance = nil; if( [[o_userSelections objectForKey:@"pathToStrm"] count] > 1 ) NSBeginInformationalAlertSheet(_NS("No folder selected"), \ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ - [NSString stringWithFormat: @"%@\n\n%@", _NS("You you " \ - "need to select a folder, you want to save your files to."), - _NS("Enter either a valid path or choose a location " \ - "through the button's dialog-box.")]); + [NSString stringWithFormat: @"%@\n\n%@", _NS("A directory " + "where to save the files has to be selected"), + _NS("Enter either a valid path or use the \"Choose...\" " \ + "button to select a location.")]); else NSBeginInformationalAlertSheet(_NS("No file selected"), \ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ - [NSString stringWithFormat: @"%@\n\n%@", _NS("You you " \ - "need to select a file, you want to save to."), - _NS("Enter either a valid path or choose a location " \ - "through the button's dialog-box.")]); + [NSString stringWithFormat: @"%@\n\n%@", _NS("A file " \ + "where to save the stream has to be selected."), + _NS("Enter either a valid path or use the \"Choose\" " \ + "button to select a location")]); } else { /* create a string containing the requested suffix for later usage */ - NSString * theEncapFormat = [[o_encapFormats objectAtIndex: \ + NSString * theEncapFormat = [[o_encapFormats objectAtIndex: \ [[o_userSelections objectForKey:@"encapFormat"] intValue]] \ objectAtIndex:0]; if( theEncapFormat == @"ps" ) @@ -1220,9 +1220,9 @@ static VLCWizard *_o_sharedInstance = nil; additionalInt += 1; } if( additionalInt >= 100 ) - msg_Err( VLCIntf, "your destination folder is " \ - "cluttered with files with the same name. " \ - "clean up a bit and try again." ); + msg_Err( VLCIntf, "Files with the same name are " \ + "already present in the destination directory. " \ + "Delete these files or choose a different directory." ); } [tempArray addObject: [tempString retain]]; x += 1; @@ -1302,7 +1302,7 @@ static VLCWizard *_o_sharedInstance = nil; vlc_object_release(p_playlist); } 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 */ @@ -1623,7 +1623,7 @@ static VLCWizard *_o_sharedInstance = nil; /* show a sheet for the help */ NSBeginInformationalAlertSheet(_NS("Stream to network"), \ _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 @@ -1631,11 +1631,11 @@ static VLCWizard *_o_sharedInstance = nil; /* show a sheet for the help */ NSBeginInformationalAlertSheet(_NS("Transcode/Save to file"), \ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ - _NS("Use this to save a stream to a file. You "\ - "have the possibility to reencode the stream. You can save whatever "\ - "VLC can read.\nPlease notice that VLC is not very suited " \ - "for file to file transcoding. You should use its transcoding " \ - "features to save network streams, for example.")); + _NS("This allows to save a stream to a file. The "\ + "can be reencoded on the fly. Whatever "\ + "VLC can read can be saved.\nPlease note that VLC is not very suited " \ + "for file to file transcoding. Its transcoding " \ + "features are however useful to save network streams, for example.")); } - (IBAction)t2_addNewStream:(id)sender @@ -1756,7 +1756,7 @@ static VLCWizard *_o_sharedInstance = nil; { /* enable/disable the respective items */ if([o_t4_ckb_audio state] == NSOnState) - { + [o_t4_pop_audioCodec setEnabled:YES]; [o_t4_pop_audioBitrate setEnabled:YES]; [o_t4_txt_hintAudio setStringValue: _NS("Select your audio codec. "\ @@ -1764,8 +1764,8 @@ static VLCWizard *_o_sharedInstance = nil; } else { [o_t4_pop_audioCodec setEnabled:NO]; [o_t4_pop_audioBitrate setEnabled:NO]; - [o_t4_txt_hintAudio setStringValue: _NS("If your stream has audio " \ - "and you want to transcode it, enable this.")]; + [o_t4_txt_hintAudio setStringValue: _NS("Enabling this allows to transcode " \ + "the audio track if one is present in the stream.")]; } } @@ -1781,8 +1781,9 @@ static VLCWizard *_o_sharedInstance = nil; } else { [o_t4_pop_videoCodec setEnabled:NO]; [o_t4_pop_videoBitrate setEnabled:NO]; - [o_t4_txt_hintVideo setStringValue: _NS("If your stream has video " \ - "and you want to transcode it, enable this.")]; + [o_t4_txt_hintVideo setStringValue: _NS("Enabling this allows to transcode " \ + "the video track if one is present in the stream.")]; + } } @@ -1810,7 +1811,7 @@ static VLCWizard *_o_sharedInstance = nil; /* show a sheet for the help */ NSBeginInformationalAlertSheet(_NS("Time-To-Live (TTL)"), \ _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 " \ "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.")); @@ -1821,8 +1822,8 @@ static VLCWizard *_o_sharedInstance = nil; /* show a sheet for the help */ NSBeginInformationalAlertSheet(_NS("SAP Announce"), \ _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, \ - _NS("When streaming using UDP, you can " \ - "announce your streams using the SAP/SDP announcing protocol. This " \ + _NS("When streaming using UDP, the streams can be " \ + "announced using the SAP/SDP announcing protocol. This " \ "way, the clients won't have to type in the multicast address, it " \ "will appear in their playlist if they enable the SAP extra " \ "interface.\nIf you want to give a name to your stream, enter it " \ -- 2.39.5