2nd control review (except telnet)

diff --git a/modules/control/gestures.c b/modules/control/gestures.c
index 4a37955d1b651f11a4413c3ae423a3ba7ce7778d..a6cc59e41d513cbca8ded9de8143a79efe5f6b31 100644 (file)
--- a/modules/control/gestures.c
+++ b/modules/control/gestures.c
@@ -80,7 +80,7 @@ static void RunIntf        ( intf_thread_t *p_intf );
 
 #define BUTTON_TEXT N_( "Trigger button" )
 #define BUTTON_LONGTEXT N_( \
-    "You can set the trigger button for mouse gestures here." )
+    "Trigger button for mouse gestures." )
 
 static char *button_list[] = { "left", "middle", "right" };
 static char *button_list_text[] = { N_("Left"), N_("Middle"), N_("Right") };

diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index 255ca0da327a40ab06bf2a9abfbcd7529090643d..2e492348ba6658373d6eac109e511c213bb8deb5 100644 (file)
--- a/modules/control/http/http.c
+++ b/modules/control/http/http.c
@@ -33,26 +33,29 @@ static void Close( vlc_object_t * );
 
 #define HOST_TEXT N_( "Host address" )
 #define HOST_LONGTEXT N_( \
-    "Address and port the http interface will bind to" )
+    "Address and port the HTTP interface will listen on. It defaults to " \
+    "all network interfaces (0.0.0.0)." \
+    " If you want the telnet interface to be available only on the local " \
+    "machine, enter 127.0.0.1" )
 #define SRC_TEXT N_( "Source directory" )
 #define SRC_LONGTEXT N_( "Source directory" )
 #define CHARSET_TEXT N_( "Charset" )
 #define CHARSET_LONGTEXT N_( \
-        "Charset declared in Content-Type header (default UTF-8)" )
+        "Charset declared in Content-Type header (default UTF-8)." )
 #define HANDLERS_TEXT N_( "Handlers" )
 #define HANDLERS_LONGTEXT N_( \
         "List of handler extensions and executable paths (for instance: " \
-        "php=/usr/bin/php,pl=/usr/bin/perl)" )
+        "php=/usr/bin/php,pl=/usr/bin/perl)." )
 #define CERT_TEXT N_( "Certificate file" )
 #define CERT_LONGTEXT N_( "HTTP interface x509 PEM certificate file " \
-                          "(enables SSL)" )
+                          "(enables SSL)." )
 #define KEY_TEXT N_( "Private key file" )
-#define KEY_LONGTEXT N_( "HTTP interface x509 PEM 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" )
+                        "certificates file." )
 #define CRL_TEXT N_( "CRL file" )
-#define CRL_LONGTEXT N_( "HTTP interace Certificates Revocation List file" )
+#define CRL_LONGTEXT N_( "HTTP interace Certificates Revocation List file." )
 
 vlc_module_begin();
     set_shortname( _("HTTP"));

diff --git a/modules/control/netsync.c b/modules/control/netsync.c
index e7956e2d8cde6c0549b34dc213b8144cd9342e01..6aeb4b14f7db2482f05054f82ce0944e9ae9862b 100644 (file)
--- a/modules/control/netsync.c
+++ b/modules/control/netsync.c
@@ -56,12 +56,12 @@ static void Close   ( vlc_object_t * );
 
 static mtime_t GetClockRef( intf_thread_t *, mtime_t );
 
-#define NETSYNC_TEXT N_( "Act as master for network synchronisation" )
-#define NETSYNC_LONGTEXT N_( "Specify if this client should " \
-  "act as the master client for the network synchronisation." )
+#define NETSYNC_TEXT N_( "Act as master" )
+#define NETSYNC_LONGTEXT N_( "Should " \
+  "act as the master client for the network synchronisation?" )
 
 #define MIP_TEXT N_( "Master client ip address" )
-#define MIP_LONGTEXT N_( "Specify the ip address of " \
+#define MIP_LONGTEXT N_( "IP address of " \
   "the master client used for the network synchronisation." )
 
 vlc_module_begin();

diff --git a/modules/control/ntservice.c b/modules/control/ntservice.c
index 2aa7bce98059289f1b3670a85bb06512bca2ed09..aeba86e729124997b321432e5d0dcdad47e129eb 100644 (file)
--- a/modules/control/ntservice.c
+++ b/modules/control/ntservice.c
@@ -38,21 +38,21 @@ static void Close   ( vlc_object_t * );
 
 #define INSTALL_TEXT N_( "Install Windows Service" )
 #define INSTALL_LONGTEXT N_( \
-    "If enabled the interface will install the Service and exit." )
+    "Install the Service and exit." )
 #define UNINSTALL_TEXT N_( "Uninstall Windows Service" )
 #define UNINSTALL_LONGTEXT N_( \
-    "If enabled the interface will uninstall the Service and exit." )
+    "Uninstall the Service and exit." )
 #define NAME_TEXT N_( "Display name of the Service" )
 #define NAME_LONGTEXT N_( \
     "Change the display name of the Service." )
 #define OPTIONS_TEXT N_("Configuration options")
 #define OPTIONS_LONGTEXT N_( \
-    "Specify configuration options that will be " \
+    "Configuration options that will be " \
     "used by the Service (eg. --foo=bar --no-foobar). It should be specified "\
     "at install time so the Service is properly configured.")
 #define EXTRAINTF_TEXT N_("Extra interface modules")
 #define EXTRAINTF_LONGTEXT N_( \
-    "Select additional interfaces spawned by the " \
+    "Additional interfaces spawned by the " \
     "Service. It should be specified at install time so the Service is " \
     "properly configured. Use a comma separated list of interface modules. " \
     "(common values are: logger, sap, rc, http)")

diff --git a/modules/control/showintf.c b/modules/control/showintf.c
index cd7fcf512ae25734cb0245048429affb58caabc6..1a98e7a1c2c355343e3881f60e0fe42c6011d419 100644 (file)
--- a/modules/control/showintf.c
+++ b/modules/control/showintf.c
@@ -60,7 +60,7 @@ static int  MouseEvent( vlc_object_t *, char const *,
  * Module descriptor
  *****************************************************************************/
 #define THRESHOLD_TEXT N_( "Threshold" )
-#define THRESHOLD_LONGTEXT N_( "Height of the zone triggering the interface" )
+#define THRESHOLD_LONGTEXT N_( "Height of the zone triggering the interface." )
 
 vlc_module_begin();
     set_shortname( "Showintf" );

diff --git a/modules/control/telnet.c b/modules/control/telnet.c
index cfa482d211e21ec8c95082877ba997237858b54f..7b832068dc2822c2b3f0cb17562aaa9f4a9a7e83 100644 (file)
--- a/modules/control/telnet.c
+++ b/modules/control/telnet.c
@@ -72,7 +72,7 @@ static void Close( vlc_object_t * );
 #define TELNETHOST_TEXT N_( "Telnet interface listen host" )
 #define TELNETHOST_LONGTEXT N_( "This is the host on which the telnet " \
     "interface will listen. It defaults to all network interfaces (0.0.0.0)." \
-    " I you want the telnet interface to be available only on the local " \
+    " If you want the telnet interface to be available only on the local " \
     "machine, enter 127.0.0.1" )
 #define TELNETPORT_TEXT N_( "Telnet interface port" )
 #define TELNETPORT_LONGTEXT N_( "This is the TCP port on which the telnet " \