* backport of the most important changes from [11379]

diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c
index 8e24f0b7648da626f3b6ac9f8f13fe76ca052fb8..17dcb1d51c3acbf00ac87d2d746c9ba30bcf2e45 100644 (file)
--- a/modules/access/vcdx/vcd.c
+++ b/modules/access/vcdx/vcd.c
@@ -127,7 +127,7 @@ vlc_module_begin();
 
     add_bool( MODULE_STRING "-extended-info", 0, NULL,
               N_("Show extended VCD info?"),
-              N_("Show the maximum about of information under Stream and "
+              N_("Show the maximum amount of information under Stream and "
                  "Media Info. Shows for example playback control navigation."),
               VLC_FALSE );
 

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index 05078e28699d78bdd83098ba3fea15be496aa661..403d4807ae7fea4694d407821d8c8262d2abe21f 100644 (file)
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -46,7 +46,7 @@ static void Close( vlc_object_t * );
 #define HOST_TEXT N_( "Host address" )
 #define HOST_LONGTEXT N_( \
     "You can set the address, port and path the rtsp interface will bind to." \
-    ".\n Syntax is address:port/path. Default is to bind to localhost address"\
+    "\n Syntax is address:port/path. Default is to bind to localhost address "\
     "on port 554, with no path. Use 0.0.0.0 to bind to all addresses." )
 vlc_module_begin();
     set_shortname( _("RTSP VoD" ) );

diff --git a/modules/mux/mpjpeg.c b/modules/mux/mpjpeg.c
index a3034a2978aa1c70570ae9bdc42a0e47c6e6197a..ae396e91623a689d0120b80285f58adfeec6c54f 100644 (file)
--- a/modules/mux/mpjpeg.c
+++ b/modules/mux/mpjpeg.c
@@ -31,7 +31,7 @@
 
 #define SEPARATOR_TEXT N_( "Multipart separator string" )
 #define SEPARATOR_LONGTEXT N_( "Multipart strings like MPJPEG use a " \
-                               "separator string betwen content pieces. "\
+                               "separator string between content pieces. "\
                                "You can select this string. Default is "\
                                "--myboundary" )