l10n string fixes

Note that _protocol abbreviations_ and friends are not localisable!

modules/access/dshow/dshow.cpp

@@ -162,7 +162,7 @@ static const char *const ppsz_amtuner_mode_text[] = { N_("Default"),
 
 #define AUDIO_CHANNELS_TEXT N_("Number of audio channels")
 #define AUDIO_CHANNELS_LONGTEXT N_( \
-    "Select audio input format with the given number of audio channesl (if non 0)" )
+    "Select audio input format with the given number of audio channels (if non 0)" )
 
 #define AUDIO_SAMPLERATE_TEXT N_("Audio sample rate")
 #define AUDIO_SAMPLERATE_LONGTEXT N_( \

modules/access/http.c

@@ -97,7 +97,7 @@ static void Close( vlc_object_t * );
 vlc_module_begin();
     set_description( N_("HTTP input") );
     set_capability( "access", 0 );
-    set_shortname( N_( "HTTP(S)" ) );
+    set_shortname( "HTTP(S)" );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 

modules/access/rtmp/access.c

@@ -50,7 +50,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_description( N_("RTMP input") );
-    set_shortname( N_("RTMP") );
+    set_shortname( "RTMP" );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 

modules/access/screen/screen.c

@@ -62,15 +62,15 @@
 
 #define WIDTH_TEXT N_( "Subscreen width" )
 #define WIDTH_LONGTEXT N_( \
-    "Subscreen width." )
+    "Subscreen width" )
 
 #define HEIGHT_TEXT N_( "Subscreen height" )
 #define HEIGHT_LONGTEXT N_( \
-    "Subscreen height."  )
+    "Subscreen height"  )
 
 #define FOLLOW_MOUSE_TEXT N_( "Follow the mouse" )
 #define FOLLOW_MOUSE_LONGTEXT N_( \
-    "Follow the mouse when capturing a subscreen" )
+    "Follow the mouse when capturing a subscreen." )
 #endif
 
 static int  Open ( vlc_object_t * );

modules/access_output/rtmp.c

@@ -53,7 +53,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_description( N_("RTMP stream output") );
-    set_shortname( N_("RTMP" ) );
+    set_shortname( "RTMP" );
     set_capability( "sout access", 50 );
     set_category( CAT_SOUT );
     set_subcategory( SUBCAT_SOUT_STREAM );

modules/audio_output/waveout.c

@@ -476,7 +476,7 @@ static void Probe( aout_instance_t * p_aout )
             == VLC_SUCCESS )
         {
             val.i_int = AOUT_VAR_5_1;
-            text.psz_string = (char *)N_("5.1");
+            text.psz_string = "5.1";
             var_Change( p_aout, "audio-device",
                         VLC_VAR_ADDCHOICE, &val, &text );
             msg_Dbg( p_aout, "device supports 5.1 channels" );

modules/codec/subtitles/subsusf.c

@@ -48,7 +48,7 @@ static subpicture_region_t *LoadEmbeddedImage( decoder_t *p_dec, subpicture_t *p
 
 vlc_module_begin();
     set_capability( "decoder", 40 );
-    set_shortname( N_("USFSubs"));
+    set_shortname( "USFSubs" );
     set_description( N_("USF subtitles decoder") );
     set_callbacks( OpenDecoder, CloseDecoder );
     set_category( CAT_INPUT );

modules/demux/rtp.c

@@ -79,7 +79,7 @@ static void Close (vlc_object_t *);
  * Module descriptor
  */
 vlc_module_begin ();
-    set_shortname (_("RTP"));
+    set_shortname ( "RTP" );
     set_description (_("(Experimental) Real-Time Protocol demuxer"));
     set_category (CAT_INPUT);
     set_subcategory (SUBCAT_INPUT_DEMUX);

modules/demux/ty.c

@@ -56,7 +56,7 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_shortname( N_("TY") );
+    set_shortname( "TY" );
     set_description(N_("TY Stream audio/video demux"));
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );

modules/gui/macosx/open.m

@@ -182,8 +182,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [o_disc_dvd_menus setTitle: _NS("No DVD menus")];
 
     [[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:1 column:0] setTitle: @"DVD"];
+    [[o_disc_type cellAtRow:2 column:0] setTitle: @"VCD"];
     [[o_disc_type cellAtRow:3 column:0] setTitle: _NS("Audio CD")];
 
     [o_net_udp_port_lbl setStringValue: _NS("Port")];
@@ -191,9 +191,9 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [o_net_udpm_port_lbl setStringValue: _NS("Port")];
     [o_net_http_url_lbl setStringValue: _NS("URL")];
 
-    [[o_net_mode cellAtRow:0 column:0] setTitle: _NS("UDP/RTP")];
+    [[o_net_mode cellAtRow:0 column:0] setTitle: @"UDP/RTP"];
     [[o_net_mode cellAtRow:1 column:0] setTitle: _NS("UDP/RTP Multicast")];
-    [[o_net_mode cellAtRow:2 column:0] setTitle: _NS("HTTP/FTP/MMS/RTSP")];
+    [[o_net_mode cellAtRow:2 column:0] setTitle: @"HTTP/FTP/MMS/RTSP"];
     [o_net_timeshift_ckbox setTitle: _NS("Allow timeshifting")];
 
     [o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )];

modules/stream_out/rtp.c

@@ -158,7 +158,7 @@ static void Close( vlc_object_t * );
 #define MAX_EMPTY_BLOCKS 200
 
 vlc_module_begin();
-    set_shortname( N_("RTP"));
+    set_shortname( "RTP" );
     set_description( N_("RTP stream output") );
     set_capability( "sout stream", 0 );
     add_shortcut( "rtp" );

src/libvlc-module.c

@@ -1352,9 +1352,9 @@ static const char *const ppsz_albumart_descriptions[] =
     "video output for the time being." )
 
 #define MENU_ON_KEY_TEXT N_("Display OSD menu on top of video output")
-#define MENU_ON_KEY_LONGTEXT N_("Display OSDmenu on top of video output")
+#define MENU_ON_KEY_LONGTEXT N_("Display OSD menu on top of video output")
 #define MENU_OFF_KEY_TEXT N_("Do not display OSD menu on video output")
-#define MENU_OFF_KEY_LONGTEXT N_("Do not display OSDmenu on top of video output")
+#define MENU_OFF_KEY_LONGTEXT N_("Do not display OSD menu on top of video output")
 #define MENU_RIGHT_KEY_TEXT N_("Highlight widget on the right")
 #define MENU_RIGHT_KEY_LONGTEXT N_( \
         "Move OSD menu highlight to the widget on the right")

src/misc/update.c

@@ -1576,9 +1576,9 @@ static void update_DownloadReal( update_download_thread_t *p_udt )
     {
         utf8_unlink( psz_destfile );
 
-        intf_UserFatal( p_udt, true, _("File can not be verified"),
+        intf_UserFatal( p_udt, true, _("File could not be verified"),
             _("It was not possible to download a cryptographic signature for "
-              "downloaded file \"%s\", and so VLC deleted it."),
+              "the downloaded file \"%s\". Thus, it was deleted."),
             psz_destfile );
         msg_Err( p_udt, "Couldn't download signature of downloaded file" );
         goto end;
@@ -1589,9 +1589,9 @@ static void update_DownloadReal( update_download_thread_t *p_udt )
         utf8_unlink( psz_destfile );
         msg_Err( p_udt, "Invalid signature issuer" );
         intf_UserFatal( p_udt, true, _("Invalid signature"),
-            _("The cryptographic signature for downloaded file \"%s\" was "
-              "invalid and couldn't be used to securely verify it, and so "
-              "VLC deleted it."),
+            _("The cryptographic signature for the downloaded file \"%s\" was "
+              "invalid and could not be used to securely verify it. Thus, the "
+              "file was deleted."),
             psz_destfile );
         goto end;
     }
@@ -1601,9 +1601,9 @@ static void update_DownloadReal( update_download_thread_t *p_udt )
         utf8_unlink( psz_destfile );
         msg_Err( p_udt, "Invalid signature type" );
         intf_UserFatal( p_udt, true, _("Invalid signature"),
-            _("The cryptographic signature for downloaded file \"%s\" was "
-              "invalid and couldn't be used to securely verify it, and so "
-              "VLC deleted it."),
+            _("The cryptographic signature for the downloaded file \"%s\" was "
+              "invalid and could not be used to securely verify it. Thus, the "
+              "file was deleted."),,
             psz_destfile );
         goto end;
     }
@@ -1614,8 +1614,8 @@ static void update_DownloadReal( update_download_thread_t *p_udt )
         msg_Err( p_udt, "Unable to hash %s", psz_destfile );
         utf8_unlink( psz_destfile );
         intf_UserFatal( p_udt, true, _("File not verifiable"),
-            _("It was not possible to securely verify downloaded file \"%s\", "
-              "and so VLC deleted it."),
+            _("It was not possible to securely verify the downloaded file"
+              " \"%s\". Thus, it was VLC deleted."),
             psz_destfile );
 
         goto end;
@@ -1626,7 +1626,7 @@ static void update_DownloadReal( update_download_thread_t *p_udt )
     {
         utf8_unlink( psz_destfile );
         intf_UserFatal( p_udt, true, _("File corrupted"),
-            _("Downloaded file \"%s\" was corrupted, and so VLC deleted it."),
+            _("Downloaded file \"%s\" was corrupted. Thus, it was deleted."),
              psz_destfile );
         msg_Err( p_udt, "Bad SHA1 hash for %s", psz_destfile );
         free( p_hash );
@@ -1638,7 +1638,7 @@ static void update_DownloadReal( update_download_thread_t *p_udt )
     {
         utf8_unlink( psz_destfile );
         intf_UserFatal( p_udt, true, _("File corrupted"),
-            _("Downloaded file \"%s\" was corrupted, and so VLC deleted it."),
+            _("Downloaded file \"%s\" was corrupted. Thus, it was deleted."),
              psz_destfile );
         msg_Err( p_udt, "BAD SIGNATURE for %s", psz_destfile );
         free( p_hash );