* backport of [11257] to trunk

diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c
index 7c924d5065a5b5703512529558fafa8472c38f6d..8e24f0b7648da626f3b6ac9f8f13fe76ca052fb8 100644 (file)
--- a/modules/access/vcdx/vcd.c
+++ b/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();

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index c63b8b6a5ce72e24e62ea248d43c9bff61e1779d..747dafbcc2a0fb76970e25b228a58a257a6728f2 100644 (file)
--- a/modules/codec/x264.c
+++ b/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")

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 7451e941d3c5f54cfd4a462185b48296cc892632..5bf78efaa6fd563cf13ab4afcbb3fc3f71f851a7 100644 (file)
--- a/modules/demux/mkv.cpp
+++ b/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" );

diff --git a/modules/demux/ty.c b/modules/demux/ty.c
index b2f797b9467783d1ecb21b2cf0fc0aaac26b80ed..fabe124986ddd062c162aebc5ac0d6d875add44a 100644 (file)
--- a/modules/demux/ty.c
+++ b/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 );

diff --git a/modules/mux/mpjpeg.c b/modules/mux/mpjpeg.c
index 746a1281f9a7494d546454721af2bb3e3e383108..a3034a2978aa1c70570ae9bdc42a0e47c6e6197a 100644 (file)
--- a/modules/mux/mpjpeg.c
+++ b/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,

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index e18f05c39fa3dc746f0fe449f97b85c9734d238c..f671119be7d27f96528585ae5d0c66f536cc32f0 100644 (file)
--- a/modules/services_discovery/sap.c
+++ b/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." )
 

diff --git a/modules/stream_out/es.c b/modules/stream_out/es.c
index eaebd379f8d39647afc4475c72edc08f01df8e8e..34fc63d342116ec94fb479f2d1cf48c597b05ce8 100644 (file)
--- a/modules/stream_out/es.c
+++ b/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" );

diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
index 6bbd614db6191f11209b4bb8b91e434a309333ca..cb852280437b76273baea039333e32d3323ebe4b 100644 (file)
--- a/modules/video_filter/deinterlace.c
+++ b/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") );

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 013338e90ea82aacaea027eef7a72a35be993d67..6f57e49e387dd8f8885eea9479a59d9dd30f1603 100644 (file)
--- a/modules/video_output/caca.c
+++ b/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") );

diff --git a/modules/video_output/directx/directx.c b/modules/video_output/directx/directx.c
index de5010a84fa0adb3392b5873921af7bbf19d2935..25ad98c2c223e8b71c6ff619c6a3c6ccf66f62d9 100644 (file)
--- a/modules/video_output/directx/directx.c
+++ b/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,

diff --git a/modules/video_output/directx/glwin32.c b/modules/video_output/directx/glwin32.c
index 41cbbddc82d622e74e5d1a43bd51061bf7893457..fddb20394ad751ff4f797b69e92b360047ca6137 100644 (file)
--- a/modules/video_output/directx/glwin32.c
+++ b/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" );

diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index 2d20a8870ed42681ff7e10c4bebc50ed2c3b1050..0cca7d4338d1cff4fa7171161921c44eeac4b515 100644 (file)
--- a/modules/video_output/fb.c
+++ b/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,

diff --git a/modules/video_output/image.c b/modules/video_output/image.c
index b5ae3bab3e1db3992702a507b8409fb7aa3bbfcd..6c47f09e860f0ddc4310325b74bb20d1f034868c 100644 (file)
--- a/modules/video_output/image.c
+++ b/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" ) );

diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c
index 591ab405d52bea1c9cc45304cfca373ace74f00b..82836f7c234655c38305cd265ced1e7363d6b3ca 100644 (file)
--- a/modules/video_output/x11/glx.c
+++ b/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") );

diff --git a/modules/video_output/x11/x11.c b/modules/video_output/x11/x11.c
index 1ea480fbb414b33618682bf22682f39aab1138de..bd4c69bd9fd4a8eb21bf29ac4f0af162dfa05acc 100644 (file)
--- a/modules/video_output/x11/x11.c
+++ b/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 );

diff --git a/modules/video_output/x11/xvideo.c b/modules/video_output/x11/xvideo.c
index ebadb3c2159f557db3fc57067f8b33f256b47fa7..4a971fbab96acc17b99ca138ddccaf87b94e187f 100644 (file)
--- a/modules/video_output/x11/xvideo.c
+++ b/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 );