* backport of [11257] to trunk

modules/access/vcdx/vcd.c

@@ -122,7 +122,7 @@ vlc_module_begin();
 	      NULL,
               N_("Use track length as maximum unit in seek?"),
               N_("If set, the length of the seek bar is the track rather than "
-		 "the length of an entry"),
+		 "the length of an entry."),
               VLC_FALSE );
 
     add_bool( MODULE_STRING "-extended-info", 0, NULL,
@@ -134,13 +134,13 @@ vlc_module_begin();
     add_string( MODULE_STRING "-author-format",
                 "%v - %F disc %c of %C",
                 NULL,
-                N_("Format to use in playlist \"author\""),
+                N_("Format to use in the playlist's \"author\" field."),
                 VCD_TITLE_FMT_LONGTEXT, VLC_TRUE );
 
     add_string( MODULE_STRING "-title-format",
                 "%I %N %L%S - %M %A %v - disc %c of %C %F",
                 NULL,
-                N_("Format to use in playlist \"title\" field"),
+                N_("Format to use in the playlist's \"title\" field."),
                 VCD_TITLE_FMT_LONGTEXT, VLC_FALSE );
 
 vlc_module_end();

modules/codec/x264.c

@@ -70,7 +70,7 @@ static void Close( vlc_object_t * );
 #define VBV_MAXRATE_LONGTEXT N_( "Sets a maximum local bitrate in kbits/s.")
 
 #define VBV_BUFSIZE_TEXT N_("Averaging period for the maximum local bitrate")
-#define VBV_BUFSIZE_LONGTEXT N_( "Sets an averaging preiod for the maximum " \
+#define VBV_BUFSIZE_LONGTEXT N_( "Sets an averaging period for the maximum " \
     "local bitrate, in kbits/s.")
 
 #define VBV_INIT_TEXT N_("Initial buffer occupancy")

modules/demux/mkv.cpp

@@ -381,7 +381,7 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_shortname( _("Matroska") );
+    set_shortname( "Matroska" );
     set_description( _("Matroska stream demuxer" ) );
     set_capability( "demux2", 50 );
     set_callbacks( Open, Close );
@@ -390,19 +390,19 @@ vlc_module_begin();
 
     add_bool( "mkv-use-ordered-chapters", 1, NULL,
             N_("Ordered chapters"),
-            N_("Play ordered chapters as specified in the segment"), VLC_TRUE );
+            N_("Play ordered chapters as specified in the segment."), VLC_TRUE );
 
     add_bool( "mkv-use-chapter-codec", 1, NULL,
             N_("Chapter codecs"),
-            N_("Use chapter codecs found in the segment"), VLC_TRUE );
+            N_("Use chapter codecs found in the segment."), VLC_TRUE );
 
     add_bool( "mkv-seek-percent", 0, NULL,
-            N_("Seek based on percent not time"),
-            N_("Seek based on percent not time"), VLC_TRUE );
+            N_("Seek based on percent not time."),
+            N_("Seek based on percent not time."), VLC_TRUE );
 
     add_bool( "mkv-use-dummy", 0, NULL,
             N_("Dummy Elements"),
-            N_("Read and discard unknown EBML elements (not good for broken files)"), VLC_TRUE );
+            N_("Read and discard unknown EBML elements (not good for broken files)."), VLC_TRUE );
 
     add_shortcut( "mka" );
     add_shortcut( "mkv" );

modules/demux/ty.c

@@ -66,7 +66,7 @@ static int Control(demux_t *, int, va_list);
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_shortname( _("TY") );
+    set_shortname( "TY" );
     set_description(_("TY Stream audio/video demux"));
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );

modules/mux/mpjpeg.c

@@ -46,7 +46,7 @@ static void Close  ( vlc_object_t * );
 #define SOUT_CFG_PREFIX "sout-mpjpeg-"
 
 vlc_module_begin();
-    set_shortname( _("MPJPEG"));
+    set_shortname( "MPJPEG" );
     set_description( _("Multipart jpeg muxer") );
     set_capability( "sout mux", 5 );
     add_string( SOUT_CFG_PREFIX "separator", "--myboundary", NULL,

modules/services_discovery/sap.c

@@ -81,14 +81,14 @@ static const char ipv6_scopes[] = "12456789ABCDE";
 #define SAP_IPV4_TEXT N_( "IPv4-SAP listening" )
 #define SAP_IPV4_LONGTEXT N_( \
       "Set this if you want the SAP module to listen to IPv4 announces " \
-      "on the standard address" )
+      "on the standard address." )
 #define SAP_IPV6_TEXT N_( "IPv6-SAP listening" )
 #define SAP_IPV6_LONGTEXT N_( \
       "Set this if you want the SAP module to listen to IPv6 announces " \
-      "on the standard address" )
+      "on the standard address." )
 #define SAP_SCOPE_TEXT N_( "IPv6 SAP scope" )
 #define SAP_SCOPE_LONGTEXT N_( \
-       "Sets the scope for IPv6 announces (default is 8)" )
+       "Sets the scope for IPv6 announces (default is 8)." )
 #define SAP_TIMEOUT_TEXT N_( "SAP timeout (seconds)" )
 #define SAP_TIMEOUT_LONGTEXT N_( \
        "Sets the time before SAP items get deleted if no new announce " \
@@ -96,14 +96,14 @@ static const char ipv6_scopes[] = "12456789ABCDE";
 #define SAP_PARSE_TEXT N_( "Try to parse the SAP" )
 #define SAP_PARSE_LONGTEXT N_( \
        "When SAP can it will try to parse the SAP. If you don't select " \
-       "this, all announces will be parsed by the livedotcom module" )
+       "this, all announces will be parsed by the livedotcom module." )
 #define SAP_STRICT_TEXT N_( "SAP Strict mode" )
 #define SAP_STRICT_LONGTEXT N_( \
        "When this is set, the SAP parser will discard some non-compliant " \
-       "announces" )
+       "announces." )
 #define SAP_CACHE_TEXT N_("Use SAP cache")
 #define SAP_CACHE_LONGTEXT N_( \
-       "If this option is selected, a SAP caching mechanism will be used." \
+       "If this option is selected, a SAP caching mechanism will be used. " \
        "This will result in lower SAP startup time, but you could end up " \
         "with items corresponding to legacy streams." )
 

modules/stream_out/es.c

@@ -75,7 +75,7 @@ static void     Close   ( vlc_object_t * );
 #define SOUT_CFG_PREFIX "sout-es-"
 
 vlc_module_begin();
-    set_shortname( _("ES"));
+    set_shortname( "ES" );
     set_description( _("Elementary stream output") );
     set_capability( "sout stream", 50 );
     add_shortcut( "es" );

modules/video_filter/deinterlace.c

@@ -106,7 +106,7 @@ static int FilterCallback ( vlc_object_t *, char const *,
 
 static char *mode_list[] = { "discard", "blend", "mean", "bob", "linear", "x" };
 static char *mode_list_text[] = { N_("Discard"), N_("Blend"), N_("Mean"),
-                                  N_("Bob"), N_("Linear"), N_("X") };
+                                  N_("Bob"), N_("Linear"), "X" };
 
 vlc_module_begin();
     set_description( _("Deinterlacing video filter") );

modules/video_output/caca.c

@@ -51,7 +51,7 @@ static void Display   ( vout_thread_t *, picture_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_shortname( _("Caca"));
+    set_shortname( "Caca" );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VOUT );
     set_description( _("Color ASCII art video output") );

modules/video_output/directx/directx.c

@@ -141,7 +141,7 @@ static char *ppsz_dev[] = { "" };
 static char *ppsz_dev_text[] = { N_("Default") };
 
 vlc_module_begin();
-    set_shortname( _("DirectX") );
+    set_shortname( "DirectX" );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VOUT );
     add_bool( "directx-hw-yuv", 1, NULL, HW_YUV_TEXT, HW_YUV_LONGTEXT,

modules/video_output/directx/glwin32.c

@@ -61,7 +61,7 @@ static void GLSwapBuffers( vout_thread_t * );
 vlc_module_begin();
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VOUT );
-    set_shortname( _("OpenGL" ) );
+    set_shortname( "OpenGL" );
     set_description( _("OpenGL video output") );
     set_capability( "opengl provider", 100 );
     add_shortcut( "glwin32" );

modules/video_output/fb.c

@@ -70,7 +70,7 @@ static void GfxMode        ( int i_tty );
     "for rendering (usually /dev/fb0).")
 
 vlc_module_begin();
-    set_shortname( _("Fb"));
+    set_shortname( "FB" );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VOUT );
     add_file( FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT,

modules/video_output/image.c

@@ -57,7 +57,7 @@ static void Display   ( vout_thread_t *, picture_t * );
                             "will have the form prefixNUMBER.format" )
 
 static char *psz_format_list[] = { "png" };
-static char *psz_format_list_text[] = { N_("PNG") };
+static char *psz_format_list_text[] = { "PNG" };
 
 vlc_module_begin( );
     set_shortname( _( "Image file" ) );

modules/video_output/x11/glx.c

@@ -109,7 +109,7 @@ static void SwitchContext( vout_thread_t * );
     "set it to 0 for first screen, 1 for the second.")
 
 vlc_module_begin();
-    set_shortname( N_("OpenGL") );
+    set_shortname( "OpenGL" );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VOUT );
     set_description( _("OpenGL video output") );

modules/video_output/x11/x11.c

@@ -64,7 +64,7 @@ extern void E_(Deactivate) ( vlc_object_t * );
     "set it to 0 for first screen, 1 for the second.")
 
 vlc_module_begin();
-    set_shortname( N_("X11") );
+    set_shortname( "X11" );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VOUT );
     add_string( "x11-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE );

modules/video_output/x11/xvideo.c

@@ -75,7 +75,7 @@ extern void E_(Deactivate) ( vlc_object_t * );
     "set it to 0 for first screen, 1 for the second.")
 
 vlc_module_begin();
-    set_shortname( N_("XVideo") );
+    set_shortname( "XVideo" );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VOUT );
     add_string( "xvideo-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE );