summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2006-09-10 12:48:15 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2006-09-10 12:48:15 +0000
commit1491b258c75b403d3f68897a639ee6d290f0fb67 (patch)
tree6bc5771a687640baacfefa18ff21c9a75aa138fe
parenta104de8d21b41fe28555317e552e77b6265f8ddc (diff)
downloadmailutils-1491b258c75b403d3f68897a639ee6d290f0fb67.tar.gz
mailutils-1491b258c75b403d3f68897a639ee6d290f0fb67.tar.bz2
Reformat argp docstring in accordance with the new argp guidelines. Remove unneeded translators comment.
-rw-r--r--dotlock/dotlock.c8
-rw-r--r--mail.local/main.c8
-rw-r--r--mail.remote/mail.remote.c8
-rw-r--r--mh/ali.c4
-rw-r--r--mh/anno.c6
-rw-r--r--mh/burst.c6
-rw-r--r--mh/comp.c4
-rw-r--r--mh/fmtcheck.c6
-rw-r--r--mh/folder.c6
-rw-r--r--mh/forw.c6
-rw-r--r--mh/inc.c6
-rw-r--r--mh/install-mh.c6
-rw-r--r--mh/mark.c6
-rw-r--r--mh/mhl.c6
-rw-r--r--mh/mhn.c6
-rw-r--r--mh/mhparam.c4
-rw-r--r--mh/mhpath.c6
-rw-r--r--mh/pick.c6
-rw-r--r--mh/refile.c6
-rw-r--r--mh/repl.c6
-rw-r--r--mh/rmf.c6
-rw-r--r--mh/rmm.c6
-rw-r--r--mh/scan.c6
-rw-r--r--mh/send.c6
-rw-r--r--mh/sortm.c4
-rw-r--r--mh/whom.c6
-rw-r--r--mimeview/mimeview.c2
-rw-r--r--sieve/sieve.c8
28 files changed, 58 insertions, 106 deletions
diff --git a/dotlock/dotlock.c b/dotlock/dotlock.c
index 9049532b4..e56973667 100644
--- a/dotlock/dotlock.c
+++ b/dotlock/dotlock.c
@@ -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");
diff --git a/mail.local/main.c b/mail.local/main.c
index 9bc6259ae..49c7b75a8 100644
--- a/mail.local/main.c
+++ b/mail.local/main.c
@@ -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\
diff --git a/mail.remote/mail.remote.c b/mail.remote/mail.remote.c
index 3d53e78a2..783abc10f 100644
--- a/mail.remote/mail.remote.c
+++ b/mail.remote/mail.remote.c
@@ -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\
diff --git a/mh/ali.c b/mh/ali.c
index 537e60941..0e3f1928a 100644
--- a/mh/ali.c
+++ b/mh/ali.c
@@ -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 ...");
diff --git a/mh/anno.c b/mh/anno.c
index fab4e499c..32a3ae8be 100644
--- a/mh/anno.c
+++ b/mh/anno.c
@@ -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...]]");
diff --git a/mh/burst.c b/mh/burst.c
index 42924e658..ebd9e8ca4 100644
--- a/mh/burst.c
+++ b/mh/burst.c
@@ -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]";
diff --git a/mh/comp.c b/mh/comp.c
index f4c5d86c1..3f1b42ef4 100644
--- a/mh/comp.c
+++ b/mh/comp.c
@@ -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]";
diff --git a/mh/fmtcheck.c b/mh/fmtcheck.c
index bf7dd6165..18f934e8d 100644
--- a/mh/fmtcheck.c
+++ b/mh/fmtcheck.c
@@ -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 */
diff --git a/mh/folder.c b/mh/folder.c
index db15324bd..41cb73bbb 100644
--- a/mh/folder.c
+++ b/mh/folder.c
@@ -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[] = {
diff --git a/mh/forw.c b/mh/forw.c
index 8202b6ee4..23809d072 100644
--- a/mh/forw.c
+++ b/mh/forw.c
@@ -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]";
diff --git a/mh/inc.c b/mh/inc.c
index 4602a430b..c118d1e26 100644
--- a/mh/inc.c
+++ b/mh/inc.c
@@ -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 */
diff --git a/mh/install-mh.c b/mh/install-mh.c
index 234a67b76..dcf1b3a8c 100644
--- a/mh/install-mh.c
+++ b/mh/install-mh.c
@@ -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 */
diff --git a/mh/mark.c b/mh/mark.c
index 47cca762b..bb3583cfe 100644
--- a/mh/mark.c
+++ b/mh/mark.c
@@ -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 */
diff --git a/mh/mhl.c b/mh/mhl.c
index 5dad85cb2..cc425a690 100644
--- a/mh/mhl.c
+++ b/mh/mhl.c
@@ -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 */
diff --git a/mh/mhn.c b/mh/mhn.c
index 1ea66bed5..bfc8c4da1 100644
--- a/mh/mhn.c
+++ b/mh/mhn.c
@@ -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]";
diff --git a/mh/mhparam.c b/mh/mhparam.c
index cff70bc61..e69463520 100644
--- a/mh/mhparam.c
+++ b/mh/mhparam.c
@@ -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 */
diff --git a/mh/mhpath.c b/mh/mhpath.c
index 31951ed2f..1b7079438 100644
--- a/mh/mhpath.c
+++ b/mh/mhpath.c
@@ -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 */
diff --git a/mh/pick.c b/mh/pick.c
index 052d41cd3..78d457e93 100644
--- a/mh/pick.c
+++ b/mh/pick.c
@@ -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]");
diff --git a/mh/refile.c b/mh/refile.c
index bd518c8da..69f45f3f9 100644
--- a/mh/refile.c
+++ b/mh/refile.c
@@ -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...]");
diff --git a/mh/repl.c b/mh/repl.c
index c47bf83a6..f6a1901d6 100644
--- a/mh/repl.c
+++ b/mh/repl.c
@@ -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]");
diff --git a/mh/rmf.c b/mh/rmf.c
index db9929a37..2362082fd 100644
--- a/mh/rmf.c
+++ b/mh/rmf.c
@@ -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 */
diff --git a/mh/rmm.c b/mh/rmm.c
index a2562fbaa..27b5f6c45 100644
--- a/mh/rmm.c
+++ b/mh/rmm.c
@@ -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 */
diff --git a/mh/scan.c b/mh/scan.c
index 0b6a1c3f7..0a8fcc0e3 100644
--- a/mh/scan.c
+++ b/mh/scan.c
@@ -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 */
diff --git a/mh/send.c b/mh/send.c
index e32494aea..c169a0650 100644
--- a/mh/send.c
+++ b/mh/send.c
@@ -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...]");
diff --git a/mh/sortm.c b/mh/sortm.c
index 118e94dd3..0fdfb6c9e 100644
--- a/mh/sortm.c
+++ b/mh/sortm.c
@@ -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
diff --git a/mh/whom.c b/mh/whom.c
index eb60de8e0..84d0f562f 100644
--- a/mh/whom.c
+++ b/mh/whom.c
@@ -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 */
diff --git a/mimeview/mimeview.c b/mimeview/mimeview.c
index 765125ee1..7f28dcef9 100644
--- a/mimeview/mimeview.c
+++ b/mimeview/mimeview.c
@@ -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\
diff --git a/sieve/sieve.c b/sieve/sieve.c
index 545b0418c..d3f8f3690 100644
--- a/sieve/sieve.c
+++ b/sieve/sieve.c
@@ -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\

Return to:

Send suggestions and report system problems to the System administrator.