Reformat argp docstring in accordance with the new argp guidelines. Remove unne…

…eded translators comment.

@@ -33,11 +33,9 @@
 
 const char *program_version = "GNU dotlock (" PACKAGE_STRING ")";
 static char doc[] =
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-N_("GNU dotlock -- lock mail spool files\
-\v\
-Returns 0 on success, 3 if locking the file fails because\
+N_("GNU dotlock -- lock mail spool files")
+"\v"
+N_("Returns 0 on success, 3 if locking the file fails because\
  it's already locked, and 1 if some other kind of error occurred.");
 
 static char args_doc[] = N_("FILE");

@@ -50,11 +50,9 @@ void notify_biff (mu_mailbox_t mbox, char *name, size_t size);
 
 const char *program_version = "mail.local (" PACKAGE_STRING ")";
 static char doc[] =
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-N_("GNU mail.local -- the local MDA\
-\v\
-Debug flags are:\n\
+N_("GNU mail.local -- the local MDA")
+"\v"
+N_("Debug flags are:\n\
   g - guimb stack traces\n\
   T - mailutils traces (MU_DEBUG_TRACE)\n\
   P - network protocols (MU_DEBUG_PROT)\n\

@@ -47,11 +47,9 @@
 
 const char *program_version = "mail.remote (" PACKAGE_STRING ")";
 static char doc[] =
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-N_("GNU mail.remote -- pseudo-sendmail interface for mail delivery\n\
-\v\
-This is a simple drop-in replacement for sendmail to forward mail directly\n\
+N_("GNU mail.remote -- pseudo-sendmail interface for mail delivery\n")
+"\v"
+N_("This is a simple drop-in replacement for sendmail to forward mail directly\n\
 to an SMTP gateway.\n\
 You should always specify your SMTP gateway using --mailer option\n\
 (the best place to do so is in your configuration file).\n\

@@ -26,8 +26,8 @@
 #include <sys/stat.h>
 
 const char *program_version = "ali (" PACKAGE_STRING ")";
-static char doc[] = N_("GNU MH ali\v"
-"Options marked with `*' are not yet implemented.\n"
+static char doc[] = N_("GNU MH ali")"\v"
+N_("Options marked with `*' are not yet implemented.\n"
 "Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("aliases ...");
 

@@ -21,10 +21,8 @@
 #include <mh.h>
 
 const char *program_version = "anno (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH anno\v\
-Options marked with `*' are not yet implemented.\n\
+static char doc[] = N_("GNU MH anno")"\v"
+N_("Options marked with `*' are not yet implemented.\n\
 Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[msg [msg...]]");
 

@@ -24,10 +24,8 @@
 #include <obstack.h>
 
 const char *program_version = "burst (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH burst\v\
-Options marked with `*' are not yet implemented.\n\
+static char doc[] = N_("GNU MH burst")"\v"
+N_("Options marked with `*' are not yet implemented.\n\
 Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = "[msgs]";
 

@@ -23,8 +23,8 @@
 #include <sys/stat.h>
 
 const char *program_version = "comp (" PACKAGE_STRING ")";
-static char doc[] = N_("GNU MH comp\v"
-"Options marked with `*' are not yet implemented.\n"
+static char doc[] = N_("GNU MH comp")"\v"
+N_("Options marked with `*' are not yet implemented.\n"
 "Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = "[msg]";
 

@@ -22,10 +22,8 @@
 #include <mh.h>
 
 const char *program_version = "fmtcheck (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH fmtcheck\v\
-Use -help to obtain the list of traditional MH options.");
+static char doc[] = N_("GNU MH fmtcheck")"\v"
+N_("Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = "";
 
 /* GNU options */

@@ -35,10 +35,8 @@
 #include <obstack.h>
 
 const char *program_version = "folder (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH folder\v\
-Use -help to obtain the list of traditional MH options.");
+static char doc[] = N_("GNU MH folder")"\v"
+N_("Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[action] [msg]");
 
 static struct argp_option options[] = {

@@ -21,10 +21,8 @@
 #include <mh.h>
 
 const char *program_version = "forw (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH forw\v\
-Options marked with `*' are not yet implemented.\n\
+static char doc[] = N_("GNU MH forw")"\v"
+N_("Options marked with `*' are not yet implemented.\n\
 Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = "[msgs]";
 

@@ -22,10 +22,8 @@
 #include <mh.h>
 
 const char *program_version = "inc (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH inc\v\
-Use -help to obtain the list of traditional MH options.");
+static char doc[] = N_("GNU MH inc")"\v"
+N_("Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[+folder]");
 
 /* GNU options */

@@ -19,10 +19,8 @@
 #include <mh.h>
 
 const char *program_version = "install-mh (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH install-mh\v\
-Use -help to obtain the list of traditional MH options.");
+static char doc[] = N_("GNU MH install-mh")"\v"
+N_("Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = "";
 
 /* GNU options */

@@ -19,10 +19,8 @@
 #include <mh.h>
 
 const char *program_version = "mark (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH mark\v\
-Use -help to obtain the list of traditional MH options.");
+static char doc[] = N_("GNU MH mark")"\v"
+N_("Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = "[msgs...]";
 
 /* GNU options */

@@ -23,10 +23,8 @@
 #include <unistd.h>
 
 const char *program_version = "mhl (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH mhl\v\
-Use -help to obtain the list of traditional MH options.");
+static char doc[] = N_("GNU MH mhl")"\v"
+N_("Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[files]");
 
 /* GNU options */

@@ -26,10 +26,8 @@
 #include <obstack.h>
 
 const char *program_version = "mhn (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH mhn\v\
-Options marked with `*' are not yet implemented.\n\
+static char doc[] = N_("GNU MH mhn")"\v"
+N_("Options marked with `*' are not yet implemented.\n\
 Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = "[msgs]";
 

@@ -21,8 +21,8 @@
 #include <mh.h>
 
 const char *program_version = "mhparam (" PACKAGE_STRING ")";
-static char doc[] = N_("GNU MH mhparam\v"
-"Use -help to obtain the list of traditional MH options.");
+static char doc[] = N_("GNU MH mhparam")"\v"
+N_("Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[components]");
 
 /* GNU options */

@@ -21,10 +21,8 @@
 #include <mh.h>
 
 const char *program_version = "mhpath (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH mhpath\v\
-Use -help to obtain the list of traditional MH options.");
+static char doc[] = N_("GNU MH mhpath")"\v"
+N_("Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[+folder] [msgs]");
 
 /* GNU options */

@@ -27,10 +27,8 @@
 #include <obstack.h>
 
 const char *program_version = "pick (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH pick\v\
-Options marked with `*' are not yet implemented.\n\
+static char doc[] = N_("GNU MH pick")"\v"
+N_("Options marked with `*' are not yet implemented.\n\
 Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[messages]");
 

@@ -26,10 +26,8 @@
 #include <fcntl.h>
 
 const char *program_version = "refile (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH refile\v\
-Options marked with `*' are not yet implemented.\n\
+static char doc[] = N_("GNU MH refile")"\v"
+N_("Options marked with `*' are not yet implemented.\n\
 Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("messages folder [folder...]");
 

@@ -24,10 +24,8 @@
 #include <unistd.h>
 
 const char *program_version = "reply (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH repl\v\
-Options marked with `*' are not yet implemented.\n\
+static char doc[] = N_("GNU MH repl")"\v"
+N_("Options marked with `*' are not yet implemented.\n\
 Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[+folder] [msg]");
 

@@ -30,10 +30,8 @@
 #include <dirent.h>
 
 const char *program_version = "rmf (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH rmf\v\
-Use -help to obtain the list of traditional MH options.");
+static char doc[] = N_("GNU MH rmf")"\v"
+N_("Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[+folder]");
 
 /* GNU options */

@@ -21,10 +21,8 @@
 #include <mh.h>
 
 const char *program_version = "rmm (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH rmm\v\
-Use -help to obtain the list of traditional MH options.");
+static char doc[] = N_("GNU MH rmm")"\v"
+N_("Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[+folder] [msgs]");
 
 /* GNU options */

@@ -29,10 +29,8 @@
 #include <mailutils/observer.h>
 
 const char *program_version = "scan (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH scan\v\
-Use -help to obtain the list of traditional MH options.");
+static char doc[] = N_("GNU MH scan")"\v"
+N_("Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[+folder] [msgs]");
 
 /* GNU options */

@@ -25,10 +25,8 @@
 #include <pwd.h>
 
 const char *program_version = "send (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH send\v\
-Options marked with `*' are not yet implemented.\n\
+static char doc[] = N_("GNU MH send")"\v"
+N_("Options marked with `*' are not yet implemented.\n\
 Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("file [file...]");
 

@@ -24,8 +24,8 @@
 #include <signal.h>
 
 const char *program_version = "sortm (" PACKAGE_STRING ")";
-static char doc[] = N_("GNU MH sortm\v"
-"Use -help to obtain the list of traditional MH options.");
+static char doc[] = N_("GNU MH sortm")"\v"
+N_("Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = N_("[msgs]");
 
 #define ARG_QUICKSORT 1024

@@ -19,10 +19,8 @@
 #include <mh.h>
 
 const char *program_version = "whom (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-static char doc[] = N_("GNU MH whom\v\
-Use -help to obtain the list of traditional MH options.");
+static char doc[] = N_("GNU MH whom")"\v"
+N_("Use -help to obtain the list of traditional MH options.");
 static char args_doc[] = "[file]";
 
 /* GNU options */

@@ -26,8 +26,6 @@
 #include <sys/wait.h>
 
 const char *program_version = "mimeview (" PACKAGE_STRING ")";
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
 static char doc[] = N_("GNU mimeview -- display files, using mailcap mechanism.\
 Default mime.types file is ") DEFAULT_CUPS_CONFDIR "/mime.types"
 N_("\n\nDebug flags are:\n\

@@ -49,11 +49,9 @@
 const char *program_version = "sieve (" PACKAGE_STRING ")";
 
 static char doc[] =
-/* TRANSLATORS: Please, preserve the vertical tabulation (^K character)
-   in this message */
-N_("GNU sieve -- a mail filtering tool\n\
-\v\
-Debug flags:\n\
+N_("GNU sieve -- a mail filtering tool\n")
+"\v"
+N_("Debug flags:\n\
   g - main parser traces\n\
   T - mailutils traces (MU_DEBUG_TRACE)\n\
   P - network protocols (MU_DEBUG_PROT)\n\