Merge string fixes

modules/access_output/http.c

@@ -53,14 +53,23 @@ static void Close( vlc_object_t * );
                          "requested to access the stream." )
 #define MIME_TEXT N_("Mime")
 #define MIME_LONGTEXT N_("Allows you to give the mime returned by the server." )
+
 #define CERT_TEXT N_( "Certificate file" )
-#define CERT_LONGTEXT N_( "HTTP/SSL stream output x509 PEM certificate file" )
+#define CERT_LONGTEXT N_( "Path to the x509 PEM certificate file that will "\
+                          "be used by the HTTP/SSL stream output" )
 #define KEY_TEXT N_( "Private key file" )
-#define KEY_LONGTEXT N_( "HTTP/SSL stream output x509 PEM private key file" )
+#define KEY_LONGTEXT N_( "Path to the x509 PEM private key file that will " \
+                         " be used by the HTTP/SSL stream output. Leave " \
+                         "empty if you don't have one." )
 #define CA_TEXT N_( "Root CA file" )
-#define CA_LONGTEXT N_( "HTTP/SSL stream output x509 PEM trusted root CA certificates file" )
+#define CA_LONGTEXT N_( "Path to the x509 PEM trusted root CA certificates " \
+                        "(certificate authority) file that will be used by " \
+                        "the HTTP/SSL stream output. Leave empty if you " \
+                        "don't have one." )
 #define CRL_TEXT N_( "CRL file" )
-#define CRL_LONGTEXT N_( "HTTP/SSL stream output Certificates Revocation List file" )
+#define CRL_LONGTEXT N_( "Path to the x509 PEM Certificates Revocation List " \
+                         "file that will be HTTP/SSL stream output. Leave " \
+                         "empty if you don't have one." )
 
 vlc_module_begin();
     set_description( _("HTTP stream output") );
@@ -68,13 +77,20 @@ vlc_module_begin();
     add_shortcut( "http" );
     add_shortcut( "https" );
     add_shortcut( "mmsh" );
-    add_string( SOUT_CFG_PREFIX "user", "", NULL, USER_TEXT, USER_LONGTEXT, VLC_TRUE );
-    add_string( SOUT_CFG_PREFIX "pwd", "", NULL, PASS_TEXT, PASS_LONGTEXT, VLC_TRUE );
-    add_string( SOUT_CFG_PREFIX "mime", "", NULL, MIME_TEXT, MIME_LONGTEXT, VLC_TRUE );
-    add_string( SOUT_CFG_PREFIX "cert", "vlc.pem", NULL, CERT_TEXT, CERT_LONGTEXT, VLC_TRUE );
-    add_string( SOUT_CFG_PREFIX "key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT, VLC_TRUE );
-    add_string( SOUT_CFG_PREFIX "ca", NULL, NULL, CA_TEXT, CA_LONGTEXT, VLC_TRUE );
-    add_string( SOUT_CFG_PREFIX "crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT, VLC_TRUE );
+    add_string( SOUT_CFG_PREFIX "user", "", NULL,
+                USER_TEXT, USER_LONGTEXT, VLC_TRUE );
+    add_string( SOUT_CFG_PREFIX "pwd", "", NULL,
+                PASS_TEXT, PASS_LONGTEXT, VLC_TRUE );
+    add_string( SOUT_CFG_PREFIX "mime", "", NULL,
+                MIME_TEXT, MIME_LONGTEXT, VLC_TRUE );
+    add_string( SOUT_CFG_PREFIX "cert", "vlc.pem", NULL,
+                CERT_TEXT, CERT_LONGTEXT, VLC_TRUE );
+    add_string( SOUT_CFG_PREFIX "key", NULL, NULL,
+                KEY_TEXT, KEY_LONGTEXT, VLC_TRUE );
+    add_string( SOUT_CFG_PREFIX "ca", NULL, NULL,
+                CA_TEXT, CA_LONGTEXT, VLC_TRUE );
+    add_string( SOUT_CFG_PREFIX "crl", NULL, NULL,
+                CRL_TEXT, CRL_LONGTEXT, VLC_TRUE );
     set_callbacks( Open, Close );
 vlc_module_end();
 

modules/codec/x264.c

@@ -63,8 +63,8 @@ static void Close( vlc_object_t * );
 #define ANALYSE_LONGTEXT N_( "This selects the analysing mode.")
 
 #define KEYINT_TEXT N_("Sets maximum interval between I frames")
-#define KEYINT_LONGTEXT N_( "Larger values save bits, thus improve quality, " \
-    "at the cost of seeking precision." )
+#define KEYINT_LONGTEXT N_( "Larger values save bits, thus improve quality "\
+    "for a given bitrate, at the cost of seeking precision." )
 
 #define IDRINT_TEXT N_("IDR frames")
 #define IDRINT_LONGTEXT N_("In H.264, I-Frames do not necessarily bound a " \

modules/control/http.c

@@ -79,11 +79,13 @@ static void Close( vlc_object_t * );
 #define SRC_TEXT N_( "Source directory" )
 #define SRC_LONGTEXT N_( "Source directory" )
 #define CERT_TEXT N_( "Certificate file" )
-#define CERT_LONGTEXT N_( "HTTP interface x509 PEM certificate file (enables SSL)" )
+#define CERT_LONGTEXT N_( "HTTP interface x509 PEM certificate file " \
+                          "(enables SSL)" )
 #define KEY_TEXT N_( "Private key file" )
 #define KEY_LONGTEXT N_( "HTTP interface x509 PEM private key file" )
 #define CA_TEXT N_( "Root CA file" )
-#define CA_LONGTEXT N_( "HTTP interface x509 PEM trusted root CA certificates file" )
+#define CA_LONGTEXT N_( "HTTP interface x509 PEM trusted root CA " \
+                        "certificates file" )
 #define CRL_TEXT N_( "CRL file" )
 #define CRL_LONGTEXT N_( "HTTP interace Certificates Revocation List file" )
 

modules/misc/gnutls.c

@@ -29,7 +29,7 @@
  * - client-side server cert validation (?).
  */
 
- 
+
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
@@ -53,7 +53,7 @@ static void Close( vlc_object_t * );
 
 #define DH_BITS_TEXT N_("Diffie-Hellman prime bits")
 #define DH_BITS_LONGTEXT N_( \
-    "Allows you to modify the Diffie-Hellman prime's number of bits" \
+    "Allows you to modify the Diffie-Hellman prime's number of bits " \
     "(used for TLS or SSL-based server-side encryption)." )
 
 vlc_module_begin();
@@ -585,7 +585,7 @@ static int gcry_vlc_mutex_unlock (void **lock)
     return vlc_mutex_unlock ((vlc_mutex_t *)*lock);
 }
 
-static struct gcry_thread_cbs gcry_threads_vlc =                        
+static struct gcry_thread_cbs gcry_threads_vlc =
 {
     GCRY_THREAD_OPTION_USER,
     NULL,