macosx: save 19 l10n strings by replacing them with already present strings from other modules

modules/gui/macosx/ConvertAndSave.m

@@ -184,10 +184,10 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
     [_customize_aud_codec_lbl setStringValue: _NS("Codec")];
     [_customize_aud_bitrate_lbl setStringValue: _NS("Bitrate")];
     [_customize_aud_channels_lbl setStringValue: _NS("Channels")];
-    [_customize_aud_samplerate_lbl setStringValue: _NS("Sample Rate")];
+    [_customize_aud_samplerate_lbl setStringValue: _NS("Samplerate")];
     [_customize_subs_ckb setTitle: _NS("Subtitles")];
     [_customize_subs_overlay_ckb setTitle: _NS("Overlay subtitles on the video")];
-    [_stream_ok_btn setTitle:_NS("Close")];
+    [_stream_ok_btn setTitle:_NS("OK")];
     [_stream_destination_lbl setStringValue:_NS("Stream Destination")];
     [_stream_announcement_lbl setStringValue:_NS("Stream Announcement")];
     [_stream_type_lbl setStringValue:_NS("Type")];

modules/gui/macosx/VideoEffects.m

@@ -159,7 +159,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
     [o_watereffect_ckb setTitle:_NS("Water effect")];
     [o_waves_ckb setTitle:_NS("Waves")];
     [o_psychedelic_ckb setTitle:_NS("Psychedelic")];
-    [o_anaglyph_ckb setTitle:_NS("Anaglyph 3D")];
+    [o_anaglyph_ckb setTitle:_NS("Anaglyph")];
 
     [o_addtext_ckb setTitle:_NS("Add text")];
     [o_addtext_text_lbl setStringValue:_NS("Text")];

modules/gui/macosx/macosx.m

@@ -107,16 +107,16 @@ void WindowClose  (vout_window_t *);
 
 #define LOCK_ASPECT_RATIO_TEXT N_("Lock Aspect Ratio")
 
-#define JUMPBUTTONS_TEXT N_("Shows playlist item control buttons")
+#define JUMPBUTTONS_TEXT N_("Show Previous & Next Buttons")
 #define JUMPBUTTONS_LONGTEXT N_("Shows the previous and next buttons in the main window.")
 
-#define PLAYMODEBUTTONS_TEXT N_("Show play mode control buttons")
+#define PLAYMODEBUTTONS_TEXT N_("Show Shuffle & Repeat Buttons")
 #define PLAYMODEBUTTONS_LONGTEXT N_("Shows the shuffle and repeat buttons in the main window.")
 
-#define EFFECTSBUTTON_TEXT N_("Show audio effects button")
+#define EFFECTSBUTTON_TEXT N_("Show Audio Effects Button")
 #define EFFECTSBUTTON_LONGTEXT N_("Shows the audio effects button in the main window.")
 
-#define SIDEBAR_TEXT N_("Show sidebar")
+#define SIDEBAR_TEXT N_("Show Sidebar")
 #define SIDEBAR_LONGTEXT N_("Shows a sidebar in the main window listing media sources.")
 
 #define ITUNES_TEXT N_("Pause iTunes during VLC playback")
@@ -145,7 +145,7 @@ vlc_module_begin()
         add_bool("macosx-show-effects-button", false, EFFECTSBUTTON_TEXT, EFFECTSBUTTON_LONGTEXT, false)
         add_bool("macosx-show-sidebar", true, SIDEBAR_TEXT, SIDEBAR_LONGTEXT, false)
 
-    set_section(N_("Behaviour"), 0)
+    set_section(N_("Behavior"), 0)
         add_bool("macosx-autoplay", true, AUTOPLAY_OSX_TEST, AUTOPLAY_OSX_LONGTEXT, false)
         add_bool("macosx-recentitems", true, RECENT_ITEMS_TEXT, RECENT_ITEMS_LONGTEXT, false)
         add_bool("macosx-fspanel", true, FSPANEL_TEXT, FSPANEL_LONGTEXT, false)

modules/gui/macosx/open.m

@@ -204,12 +204,12 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [o_capture_mode_pop addItemWithTitle: _NS("Screen")];
     [o_capture_mode_pop addItemWithTitle: @"EyeTV"];
     [o_screen_long_lbl setStringValue: _NS("This input allows you to save, stream or display your current screen contents.")];
-    [o_screen_fps_lbl setStringValue: _NS("Frames per Second:")];
-    [o_screen_screen_lbl setStringValue: _NS("Screen:")];
-    [o_screen_left_lbl setStringValue: _NS("Subscreen left:")];
-    [o_screen_top_lbl setStringValue: _NS("Subscreen top:")];
-    [o_screen_width_lbl setStringValue: _NS("Subscreen width:")];
-    [o_screen_height_lbl setStringValue: _NS("Subscreen height:")];
+    [o_screen_fps_lbl setStringValue: [NSString stringWithFormat:@"%@:",_NS("Frames per Second")]];
+    [o_screen_screen_lbl setStringValue: [NSString stringWithFormat:@"%@:",_NS("Screen")]];
+    [o_screen_left_lbl setStringValue: [NSString stringWithFormat:@"%@:",_NS("Subscreen left")]];
+    [o_screen_top_lbl setStringValue: [NSString stringWithFormat:@"%@:",_NS("Subscreen top")]];
+    [o_screen_width_lbl setStringValue: [NSString stringWithFormat:@"%@:",_NS("Subscreen width")]];
+    [o_screen_height_lbl setStringValue: [NSString stringWithFormat:@"%@:",_NS("Subscreen height")]];
     [o_screen_follow_mouse_ckb setTitle: _NS("Follow the mouse")];
     [o_screen_qtk_audio_ckb setTitle: _NS("Capture Audio")];
     [o_eyetv_currentChannel_lbl setStringValue: _NS("Current channel:")];
@@ -220,8 +220,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [o_eyetv_noInstanceLong_lbl setStringValue: _NS("VLC could not connect to EyeTV.\nMake sure that you installed VLC's EyeTV plugin.")];
     [o_eyetv_launchEyeTV_btn setTitle: _NS("Launch EyeTV now")];
     [o_eyetv_getPlugin_btn setTitle: _NS("Download Plugin")];
-    [o_capture_width_lbl setStringValue: _NS("Image width:")];
-    [o_capture_height_lbl setStringValue: _NS("Image height:")];
+    [o_capture_width_lbl setStringValue: [NSString stringWithFormat:@"%@:",_NS("Image width")]];
+    [o_capture_height_lbl setStringValue: [NSString stringWithFormat:@"%@:",_NS("Image height")]];
 
     [self qtkvideoDevices];
     [o_qtk_video_device_pop removeAllItems];
@@ -351,7 +351,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
     module_config_t * p_item;
     intf_thread_t * p_intf = VLCIntf;
 
-    [o_file_sub_ckbox setTitle: _NS("Load subtitle file:")];
+    [o_file_sub_ckbox setTitle: _NS("Add Subtitle File:")];
     [o_file_sub_path_lbl setStringValue: _NS("Choose a file")];
     [o_file_sub_path_lbl setHidden: NO];
     [o_file_sub_path_fld setStringValue: @""];

modules/gui/macosx/output.m

@@ -169,9 +169,9 @@
     [o_transcode_audio_channels addItemsWithObjectValues: o_a_channels];
 
     [o_misc_lbl setTitle: _NS("Stream Announcing")];
-    [o_sap_chkbox setTitle: _NS("SAP announce")];
-    [o_rtsp_chkbox setTitle: _NS("RTSP announce")];
-    [o_http_chkbox setTitle:_NS("HTTP announce")];
+    [o_sap_chkbox setTitle: _NS("SAP Announcement")];
+    [o_rtsp_chkbox setTitle: _NS("RTSP Announcement")];
+    [o_http_chkbox setTitle:_NS("HTTP Announcement")];
     [o_file_chkbox setTitle:_NS("Export SDP as file")];
 
     [o_channel_name_lbl setStringValue: _NS("Channel Name")];
@@ -542,15 +542,15 @@
                 [o_mode isEqualToString: @"RTP"]];
 
     if ([o_mode isEqualToString: @"RTP"]) {
-/*        if ([[sender title] isEqualToString: _NS("SAP announce")]) {
+/*        if ([[sender title] isEqualToString: _NS("SAP Announcement")]) {
             [o_rtsp_chkbox setState:NSOffState];
             [o_http_chkbox setState:NSOffState];
         }*/
-        if ([[sender title] isEqualToString:_NS("RTSP announce")]) {
+        if ([[sender title] isEqualToString:_NS("RTSP Announcement")]) {
 //            [o_sap_chkbox setState:NSOffState];
             [o_http_chkbox setState:NSOffState];
             [o_file_chkbox setState:NSOffState];
-        } else if ([[sender title] isEqualToString:_NS("HTTP announce")]) {
+        } else if ([[sender title] isEqualToString:_NS("HTTP Announcement")]) {
 //            [o_sap_chkbox setState:NSOffState];
             [o_rtsp_chkbox setState:NSOffState];
             [o_file_chkbox setState:NSOffState];

modules/gui/macosx/playlistinfo.m

@@ -159,9 +159,9 @@ static VLCInfo *_o_sharedInstance = nil;
 - (void)initMediaPanelStats
 {
     //Initializing Input Variables
-    [o_read_bytes_txt setStringValue: [NSString stringWithFormat:@"%.1f KiB", (float)0]];
+    [o_read_bytes_txt setStringValue: [NSString stringWithFormat:_NS("%.1f KiB"), (float)0]];
     [o_input_bitrate_txt setStringValue: [NSString stringWithFormat:@"%6.0f kb/s", (float)0]];
-    [o_demux_bytes_txt setStringValue: [NSString stringWithFormat:@"%.1f KiB", (float)0]];
+    [o_demux_bytes_txt setStringValue: [NSString stringWithFormat:_NS("%.1f KiB"), (float)0]];
     [o_demux_bitrate_txt setStringValue: [NSString stringWithFormat:@"%6.0f kb/s", (float)0]];
 
     //Initializing Video Variables
@@ -171,7 +171,7 @@ static VLCInfo *_o_sharedInstance = nil;
 
     //Initializing Output Variables
     [o_sent_packets_txt setIntValue: 0];
-    [o_sent_bytes_txt setStringValue: [NSString stringWithFormat:@"%.1f KiB", (float)0]];
+    [o_sent_bytes_txt setStringValue: [NSString stringWithFormat:_NS("%.1f KiB"), (float)0]];
     [o_sent_bitrate_txt setStringValue: [NSString stringWithFormat:@"%6.0f kb/s", (float)0]];
 
     //Initializing Audio Variables

modules/gui/macosx/simple_prefs.m

@@ -244,17 +244,17 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
     [o_osd_encoding_txt setStringValue: _NS("Default Encoding")];
     [o_osd_font_box setTitle: _NS("Display Settings")];
     [o_osd_font_btn setTitle: _NS("Choose...")];
-    [o_osd_font_color_txt setStringValue: _NS("Font Color")];
-    [o_osd_font_size_txt setStringValue: _NS("Font Size")];
+    [o_osd_font_color_txt setStringValue: _NS("Font color")];
+    [o_osd_font_size_txt setStringValue: _NS("Font size")];
     [o_osd_font_txt setStringValue: _NS("Font")];
-    [o_osd_lang_box setTitle: _NS("Subtitle Languages")];
-    [o_osd_lang_txt setStringValue: _NS("Preferred Subtitle Language")];
+    [o_osd_lang_box setTitle: _NS("Subtitle languages")];
+    [o_osd_lang_txt setStringValue: _NS("Preferred subtitle language")];
     [o_osd_osd_box setTitle: _NS("On Screen Display")];
     [o_osd_osd_ckb setTitle: _NS("Enable OSD")];
     [o_osd_opacity_txt setStringValue: _NS("Opacity")];
-    [o_osd_forcebold_ckb setTitle: _NS("Force Bold")];
-    [o_osd_outline_color_txt setStringValue: _NS("Outline Color")];
-    [o_osd_outline_thickness_txt setStringValue: _NS("Outline Thickness")];
+    [o_osd_forcebold_ckb setTitle: _NS("Force bold")];
+    [o_osd_outline_color_txt setStringValue: _NS("Outline color")];
+    [o_osd_outline_thickness_txt setStringValue: _NS("Outline thickness")];
 
     /* video */
     [o_video_black_ckb setTitle: _NS("Black screens in Fullscreen mode")];

modules/gui/macosx/wizard.m

@@ -403,7 +403,7 @@ static VLCWizard *_o_sharedInstance = nil;
                               "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")];
+    [o_t6_ckb_sap setTitle: _NS("SAP Announcement")];
     [o_t6_btn_mrInfo_sap setTitle: _NS("More Info")];
     [o_t6_ckb_local setTitle: _NS("Local playback")];
     [o_t6_btn_mrInfo_local setTitle: _NS("More Info")];
@@ -435,7 +435,7 @@ static VLCWizard *_o_sharedInstance = nil;
         stringByAppendingString: @":"]];
     [o_t8_txt_partExtract setStringValue: [_NS("Partial Extract")
         stringByAppendingString: @":"]];
-    [o_t8_txt_sap setStringValue: [_NS("SAP Announce")
+    [o_t8_txt_sap setStringValue: [_NS("SAP Announcement")
         stringByAppendingString: @":"]];
     [o_t8_txt_saveFileTo setStringValue: [_NS("Save file to")
         stringByAppendingString: @":"]];
@@ -1808,7 +1808,7 @@ static VLCWizard *_o_sharedInstance = nil;
 - (IBAction)t6_mrInfo_sap:(id)sender
 {
     /* show a sheet for the help */
-    NSBeginInformationalAlertSheet(_NS("SAP Announce"),
+    NSBeginInformationalAlertSheet(_NS("SAP Announcement"),
         _NS("OK"), @"", @"", o_wizard_window, nil, nil, nil, nil, @"%@",
         _NS("When streaming using UDP, the streams can be "
         "announced using the SAP/SDP announcing protocol. This "