summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--comsat/comsat.c2
-rw-r--r--dotlock/dotlock.c6
-rw-r--r--frm/frm.c2
-rw-r--r--guimb/main.c14
-rw-r--r--imap4d/imap4d.c4
-rw-r--r--libsieve/argp.c4
-rw-r--r--mail.local/main.c12
-rw-r--r--mail.remote/mail.remote.c2
-rw-r--r--mail/mail.c6
-rw-r--r--mailbox/mu_argp.c18
-rw-r--r--mailbox/mu_auth.c5
-rw-r--r--mh/fmtcheck.c4
-rw-r--r--mh/folder.c22
-rw-r--r--mh/inc.c18
-rw-r--r--mh/mhpath.c2
-rw-r--r--mh/refile.c10
-rw-r--r--mh/repl.c24
-rw-r--r--mh/rmf.c4
-rw-r--r--mh/rmm.c2
-rw-r--r--mh/scan.c16
-rw-r--r--pop3d/popauth.c8
-rw-r--r--readmsg/readmsg.c4
-rw-r--r--sieve/sieve.c8
23 files changed, 102 insertions, 95 deletions
diff --git a/comsat/comsat.c b/comsat/comsat.c
index b68728778..9b9b99f66 100644
--- a/comsat/comsat.c
+++ b/comsat/comsat.c
@@ -55,7 +55,7 @@ static char doc[] = "GNU comsatd";
static struct argp_option options[] =
{
- {"config", 'c', "FILE", 0, N_("Read configuration from FILE"), 0},
+ {"config", 'c', N_("FILE"), 0, N_("Read configuration from FILE"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};
diff --git a/dotlock/dotlock.c b/dotlock/dotlock.c
index 533220348..c882256e6 100644
--- a/dotlock/dotlock.c
+++ b/dotlock/dotlock.c
@@ -44,16 +44,16 @@ static struct argp_option options[] = {
{"unlock", 'u', NULL, 0,
N_("Unlock"), 0},
- {"force", 'f', "MINUTES", OPTION_ARG_OPTIONAL,
+ {"force", 'f', N_("MINUTES"), OPTION_ARG_OPTIONAL,
N_("Forcibly break an existing lock older than a certain time"), 0},
- {"retry", 'r', "RETRIES", OPTION_ARG_OPTIONAL,
+ {"retry", 'r', N_("RETRIES"), OPTION_ARG_OPTIONAL,
N_("Retry the lock a few times"), 0},
{"debug", 'd', NULL, 0,
N_("Print details of failure reasons to stderr"), 0},
- {"test", 'T', "PROGRAM", OPTION_HIDDEN,
+ {"test", 'T', N_("PROGRAM"), OPTION_HIDDEN,
N_("Test external dotlocker"), 0},
{NULL, 0, NULL, 0, NULL, 0}
diff --git a/frm/frm.c b/frm/frm.c
index 3ac1a604d..87994a385 100644
--- a/frm/frm.c
+++ b/frm/frm.c
@@ -65,7 +65,7 @@ static char doc[] = N_("GNU frm -- display From: lines");
static struct argp_option options[] = {
{"debug", 'd', NULL, 0, N_("Enable debugging output"), 0},
- {"field", 'f', "NAME", 0, N_("Header field to display"), 0},
+ {"field", 'f', N_("NAME"), 0, N_("Header field to display"), 0},
{"to", 'l', NULL, 0, N_("Include the To: information"), 0},
{"number", 'n', NULL, 0, N_("Display message numbers"), 0},
{"Quiet", 'Q', NULL, 0, N_("Very quiet"), 0},
diff --git a/guimb/main.c b/guimb/main.c
index a046e612e..2439ddaf9 100644
--- a/guimb/main.c
+++ b/guimb/main.c
@@ -53,20 +53,20 @@ static struct argp_option options[] = {
{NULL, 0, NULL, 0,
N_("The following switches stop argument processing, and pass all\n"
"remaining arguments as the value of (command-line):"), 1},
- {"code", 'c', "EXPR", 0, N_("Execute given scheme expression."), 1},
- {"source", 's', "PROGFILE", 0,
+ {"code", 'c', N_("EXPR"), 0, N_("Execute given scheme expression."), 1},
+ {"source", 's', N_("PROGFILE"), 0,
N_("Load Scheme source code from PROGFILE, and exit"), 1},
{NULL, 0, NULL, 0,
N_("The following options do not change the order of options parsing:"), 2},
- {"expression", 'e', "EXPR", 0, N_("Execute given scheme expression."), 2},
- {"file", 'f', "PROGFILE", 0,
+ {"expression", 'e', N_("EXPR"), 0, N_("Execute given scheme expression."), 2},
+ {"file", 'f', N_("PROGFILE"), 0,
N_("Load Scheme source code from PROGFILE, and exit"), 2},
{NULL, 0, NULL, 0, N_("Other options:"), 3},
{"debug", 'd', NULL, 0, N_("Start with debugging evaluator and backtraces."), 3},
- {"guile-arg", 'g', "ARG", 0,
+ {"guile-arg", 'g', N_("ARG"), 0,
N_("Append ARG to the command line passed to Guile"), 3},
- {"mailbox", 'M', "NAME", 0, N_("Set default mailbox name"), 3},
- {"user", 'u', "NAME", OPTION_ARG_OPTIONAL,
+ {"mailbox", 'M', N_("NAME"), 0, N_("Set default mailbox name"), 3},
+ {"user", 'u', N_("NAME"), OPTION_ARG_OPTIONAL,
N_("Act as local MDA for user NAME"), 3},
{0, 0, 0, 0}
};
diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c
index becff4494..e763b6022 100644
--- a/imap4d/imap4d.c
+++ b/imap4d/imap4d.c
@@ -41,9 +41,9 @@ static char doc[] = N_("GNU imap4d -- the IMAP4D daemon");
static struct argp_option options[] =
{
- {"other-namespace", 'O', "PATHLIST", 0,
+ {"other-namespace", 'O', N_("PATHLIST"), 0,
N_("set the `other' namespace"), 0},
- {"shared-namespace", 'S', "PATHLIST", 0,
+ {"shared-namespace", 'S', N_("PATHLIST"), 0,
N_("set the `shared' namespace"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};
diff --git a/libsieve/argp.c b/libsieve/argp.c
index 36c766da6..b5a975669 100644
--- a/libsieve/argp.c
+++ b/libsieve/argp.c
@@ -30,9 +30,9 @@ static error_t sieve_argp_parser __P((int key, char *arg,
/* Options used by programs that use extended authentication mechanisms. */
static struct argp_option sieve_argp_option[] = {
- { "includedir", 'I', "DIR", 0,
+ { "includedir", 'I', N_("DIR"), 0,
"Append directory DIR to the list of directories searched for include files", 0 },
- { "libdir", 'L', "DIR", 0,
+ { "libdir", 'L', N_("DIR"), 0,
"Append directory DIR to the list of directories searched for library files", 0 },
{ NULL, 0, NULL, 0, NULL, 0 }
};
diff --git a/mail.local/main.c b/mail.local/main.c
index 12e193544..6d03000d5 100644
--- a/mail.local/main.c
+++ b/mail.local/main.c
@@ -64,22 +64,22 @@ static struct argp_option options[] =
N_("Don't return errors when delivering to multiple recipients"), 0 },
{ "ex-quota-tempfail", ARG_QUOTA_TEMPFAIL, NULL, 0,
N_("Return temporary failure if disk or mailbox quota is exceeded"), 0 },
- { "from", 'f', "EMAIL", 0,
+ { "from", 'f', N_("EMAIL"), 0,
N_("Specify the sender's name") },
{ NULL, 'r', NULL, OPTION_ALIAS, NULL },
#ifdef USE_DBM
- { "quota-db", 'q', "FILE", 0,
+ { "quota-db", 'q', N_("FILE"), 0,
N_("Specify path to quota database"), 0 },
#endif
- { "sieve", 'S', "PATTERN", 0,
+ { "sieve", 'S', N_("PATTERN"), 0,
N_("Set name pattern for user-defined sieve mail filters"), 0 },
#ifdef WITH_GUILE
- { "source", 's', "PATTERN", 0,
+ { "source", 's', N_("PATTERN"), 0,
N_("Set name pattern for user-defined mail filters"), 0 },
#endif
- { "debug", 'x', "FLAGS", 0,
+ { "debug", 'x', N_("FLAGS"), 0,
N_("Enable debugging"), 0 },
- { "timeout", 't', "NUMBER", 0,
+ { "timeout", 't', N_("NUMBER"), 0,
N_("Set timeout for acquiring the lockfile") },
{ NULL, 0, NULL, 0, NULL, 0 }
};
diff --git a/mail.remote/mail.remote.c b/mail.remote/mail.remote.c
index a6af6e5b0..0d94304f9 100644
--- a/mail.remote/mail.remote.c
+++ b/mail.remote/mail.remote.c
@@ -72,7 +72,7 @@ N_("GNU mail.remote -- pseudo-sendmail interface for mail delivery\n"
"the data part of the protocol transaction will also be printed to stdout.\n");
static struct argp_option options[] = {
- {"from", 'f', "ADDR", 0, N_("Override the default from address\n")},
+ {"from", 'f', N_("ADDR"), 0, N_("Override the default from address\n")},
{"debug", 'd', NULL, 0, N_("Enable debugging output")},
{ 0, 'o', "OPT", OPTION_HIDDEN, N_("Ignored for sendmail compatibility")},
{0}
diff --git a/mail/mail.c b/mail/mail.c
index da329db59..5c4f5b272 100644
--- a/mail/mail.c
+++ b/mail/mail.c
@@ -31,7 +31,7 @@ static char args_doc[] = N_("[address...]");
static struct argp_option options[] = {
{"exist", 'e', 0, 0, N_("Return true if mail exists"), 0},
- {"file", 'f', "FILE", OPTION_ARG_OPTIONAL,
+ {"file", 'f', N_("FILE"), OPTION_ARG_OPTIONAL,
N_("Operate on mailbox FILE (default ~/mbox)"), 0},
{"byname", 'F', 0, 0, N_("Save messages according to sender"), 0},
{"headers", 'H', 0, 0, N_("Write a header summary and exit"), 0},
@@ -41,9 +41,9 @@ static struct argp_option options[] = {
{"print", 'p', 0, 0, N_("Print all mail to standard output"), 0},
{"quit", 'q', 0, 0, N_("Cause interrupts to terminate program"), 0},
{"read", 'r', 0, 0, N_("Same as -p"), 0},
- {"subject", 's', "SUBJ", 0, N_("Send a message with a Subject of SUBJ"), 0},
+ {"subject", 's', N_("SUBJ"), 0, N_("Send a message with a Subject of SUBJ"), 0},
{"to", 't', 0, 0, N_("Precede message by a list of addresses"), 0},
- {"user", 'u', "USER", 0, N_("Operate on USER's mailbox"), 0},
+ {"user", 'u', N_("USER"), 0, N_("Operate on USER's mailbox"), 0},
{NULL, 0, NULL, OPTION_DOC,
N_("Note: Argument to --file (-f) option is optional. If it is present, "
"it must follow the short option immediately, without any intervening "
diff --git a/mailbox/mu_argp.c b/mailbox/mu_argp.c
index 9490ac144..60d6b2ef4 100644
--- a/mailbox/mu_argp.c
+++ b/mailbox/mu_argp.c
@@ -67,32 +67,32 @@ static struct argp_option mu_license_argp_option[] = {
/* Options used by programs that access mailboxes. */
static struct argp_option mu_mailbox_argp_option[] = {
- {"mail-spool", 'm', "URL", 0,
+ {"mail-spool", 'm', N_("URL"), 0,
N_("Use specified URL as a mailspool directory"), 0},
- {"lock-flags", ARG_LOCK_FLAGS, "FLAGS", 0,
+ {"lock-flags", ARG_LOCK_FLAGS, N_("FLAGS"), 0,
N_("Default locker flags (E=external, R=retry, T=time, P=pid)"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};
/* Options used by programs that do address mapping. */
static struct argp_option mu_address_argp_option[] = {
- {"email-addr", 'E', "EMAIL", 0,
+ {"email-addr", 'E', N_("EMAIL"), 0,
N_("Set current user's email address (default is loginname@defaultdomain)"), 0},
- {"email-domain", 'D', "DOMAIN", 0,
+ {"email-domain", 'D', N_("DOMAIN"), 0,
N_("Set domain for unqualified user names (default is this host)"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};
/* Options used by programs that send mail. */
static struct argp_option mu_mailer_argp_option[] = {
- {"mailer", 'M', "MAILER", 0,
+ {"mailer", 'M', N_("MAILER"), 0,
N_("Use specified URL as the default mailer"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};
/* Options used by programs that log to syslog. */
static struct argp_option mu_logging_argp_option[] = {
- {"log-facility", ARG_LOG_FACILITY, "FACILITY", 0,
+ {"log-facility", ARG_LOG_FACILITY, N_("FACILITY"), 0,
N_("Output logs to syslog FACILITY"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};
@@ -100,13 +100,13 @@ static struct argp_option mu_logging_argp_option[] = {
/* Options used by programs that become daemons. */
static struct argp_option mu_daemon_argp_option[] = {
- {"daemon", 'd', "NUMBER", OPTION_ARG_OPTIONAL,
+ {"daemon", 'd', N_("NUMBER"), OPTION_ARG_OPTIONAL,
N_("Runs in daemon mode with a maximum of NUMBER children")},
{"inetd", 'i', 0, 0,
N_("Run in inetd mode"), 0},
- {"port", 'p', "PORT", 0,
+ {"port", 'p', N_("PORT"), 0,
N_("Listen on specified port number"), 0},
- {"timeout", 't', "NUMBER", 0,
+ {"timeout", 't', N_("NUMBER"), 0,
N_("Set idle timeout value to NUMBER seconds"), 0},
{"transcript", 'x', NULL, 0,
N_("output session transcript via syslog"), 0},
diff --git a/mailbox/mu_auth.c b/mailbox/mu_auth.c
index 1be44819a..15ce355f0 100644
--- a/mailbox/mu_auth.c
+++ b/mailbox/mu_auth.c
@@ -46,6 +46,7 @@
#include <mailutils/argp.h>
#include <mailutils/mu_auth.h>
#include <mailutils/error.h>
+#include <mailutils/nls.h>
/*#define DEBUG(c) do { printf c; printf("\n"); } while (0)*/
#define DEBUG(c)
@@ -205,9 +206,9 @@ static error_t mu_auth_argp_parser __P((int key, char *arg,
/* Options used by programs that use extended authentication mechanisms. */
static struct argp_option mu_auth_argp_option[] = {
- { "authentication", ARG_AUTHENTICATION, "MODLIST", 0,
+ { "authentication", ARG_AUTHENTICATION, N_("MODLIST"), 0,
"Set list of modules to be used for authentication", 0 },
- { "authorization", ARG_AUTHORIZATION, "MODLIST", 0,
+ { "authorization", ARG_AUTHORIZATION, N_("MODLIST"), 0,
"Set list of modules to be used for authorization", 0 },
{ NULL, 0, NULL, 0, NULL, 0 }
};
diff --git a/mh/fmtcheck.c b/mh/fmtcheck.c
index 2efa01255..52dcbf436 100644
--- a/mh/fmtcheck.c
+++ b/mh/fmtcheck.c
@@ -25,8 +25,8 @@ static char args_doc[] = "";
/* GNU options */
static struct argp_option options[] = {
- {"form", 'F', "FILE", 0, N_("Read format from given file")},
- {"format", 't', "FORMAT", 0, N_("Use this format string")},
+ {"form", 'F', N_("FILE"), 0, N_("Read format from given file")},
+ {"format", 't', N_("FORMAT"), 0, N_("Use this format string")},
{"dump", 'd', NULL, 0, N_("Dump the listing of compiled format code")},
{ N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
diff --git a/mh/folder.c b/mh/folder.c
index f30f3f9a7..915da26a3 100644
--- a/mh/folder.c
+++ b/mh/folder.c
@@ -43,7 +43,7 @@ static struct argp_option options[] = {
{N_("Actions are:"), 0, 0, OPTION_DOC, "", 0 },
{"print", 'p', NULL, 0, N_("List the folders (default)"), 1 },
{"list", 'l', NULL, 0, N_("List the contents of the folder stack"), 1},
- {"push", ARG_PUSH, "FOLDER", OPTION_ARG_OPTIONAL,
+ {"push", ARG_PUSH, N_("FOLDER"), OPTION_ARG_OPTIONAL,
N_("Push the folder on the folder stack. If FOLDER is specified, it is pushed. "
"Otherwise, if a folder is given in the command line (via + or --folder), "
"it is pushed on stack. Otherwise, the current folder and the top of the folder "
@@ -51,14 +51,20 @@ static struct argp_option options[] = {
{"pop", ARG_POP, NULL, 0, N_("Pop the folder off the folder stack"), 1},
{N_("Options are:"), 0, 0, OPTION_DOC, "", 2 },
- {"folder", 'f', "FOLDER", 0, N_("Specify folder to operate upon"), 3},
+ {"folder", 'f', N_("FOLDER"), 0, N_("Specify folder to operate upon"), 3},
{"all", 'a', NULL, 0, N_("List all folders"), 3},
- {"create", 'c', "BOOL", OPTION_ARG_OPTIONAL, N_("Create non-existing folders"), 3},
- {"fast", 'F', "BOOL", OPTION_ARG_OPTIONAL, N_("List only the folder names"), 3},
- {"header", 'h', "BOOL", OPTION_ARG_OPTIONAL, N_("Print the header line"), 3},
- {"recurse", 'r', "BOOL", OPTION_ARG_OPTIONAL, N_("Scan folders recursively"), 3},
- {"total", 't', "BOOL", OPTION_ARG_OPTIONAL, N_("Output the total statistics"), 3},
- { N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "", 4 },
+ {"create", 'c', N_("BOOL"), OPTION_ARG_OPTIONAL,
+ N_("Create non-existing folders"), 3},
+ {"fast", 'F', N_("BOOL"), OPTION_ARG_OPTIONAL,
+ N_("List only the folder names"), 3},
+ {"header", 'h', N_("BOOL"), OPTION_ARG_OPTIONAL,
+ N_("Print the header line"), 3},
+ {"recurse", 'r', N_("BOOL"), OPTION_ARG_OPTIONAL,
+ N_("Scan folders recursively"), 3},
+ {"total", 't', N_("BOOL"), OPTION_ARG_OPTIONAL,
+ N_("Output the total statistics"), 3},
+ { N_("\nUse -help switch to obtain the list of traditional MH options. "),
+ 0, 0, OPTION_DOC, "", 4 },
{NULL},
};
diff --git a/mh/inc.c b/mh/inc.c
index b0179e270..4e4d1f977 100644
--- a/mh/inc.c
+++ b/mh/inc.c
@@ -25,17 +25,17 @@ static char args_doc[] = N_("[+folder]");
/* GNU options */
static struct argp_option options[] = {
- {"file", 'i', "FILE", 0, N_("Incorporate mail from named file")},
- {"folder", 'f', "FOLDER", 0, N_("Specify folder to incorporate mail to")},
- {"audit", 'a', "FILE", 0, N_("Enable audit")},
+ {"file", 'i', N_("FILE"), 0, N_("Incorporate mail from named file")},
+ {"folder", 'f', N_("FOLDER"), 0, N_("Specify folder to incorporate mail to")},
+ {"audit", 'a', N_("FILE"), 0, N_("Enable audit")},
{"noaudit", 'n', 0, 0, N_("Disable audit")},
- {"changecur", 'c', "BOOL", OPTION_ARG_OPTIONAL,
+ {"changecur", 'c', N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Mark first incorporated message as current (default)")},
- {"form", 'F', "FILE", 0, N_("Read format from given file")},
- {"format", 't', "FORMAT", 0, N_("Use this format string")},
- {"truncate", 'T', "BOOL", OPTION_ARG_OPTIONAL,
+ {"form", 'F', N_("FILE"), 0, N_("Read format from given file")},
+ {"format", 't', N_("FORMAT"), 0, N_("Use this format string")},
+ {"truncate", 'T', N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Truncate source mailbox after incorporating (default)")},
- {"width", 'w', "NUMBER", 0, N_("Set output width")},
+ {"width", 'w', N_("NUMBER"), 0, N_("Set output width")},
{"quiet", 'q', 0, 0, N_("Be quiet")},
{"license", 'l', 0, 0, N_("Display software license"), -1},
@@ -46,7 +46,7 @@ static struct argp_option options[] = {
/* Traditional MH options */
struct mh_option mh_option[] = {
- {"audit", 5, 'a', MH_OPT_ARG, "audit-file"},
+ {"audit", 5, 'a', MH_OPT_ARG, "audit-file" },
{"noaudit", 3, 'n', 0, },
{"changecur", 1, 'c',MH_OPT_BOOL},
{"file", 2, 'i', MH_OPT_ARG, "input-file"},
diff --git a/mh/mhpath.c b/mh/mhpath.c
index 1497bb296..5914c1fb4 100644
--- a/mh/mhpath.c
+++ b/mh/mhpath.c
@@ -25,7 +25,7 @@ static char args_doc[] = N_("[+folder] [msgs]");
/* GNU options */
static struct argp_option options[] = {
- {"folder", 'f', "FOLDER", 0, N_("Specify folder to operate upon")},
+ {"folder", 'f', N_("FOLDER"), 0, N_("Specify folder to operate upon")},
{ N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
{ 0 }
};
diff --git a/mh/refile.c b/mh/refile.c
index 6e4abcdb9..fe3f8385c 100644
--- a/mh/refile.c
+++ b/mh/refile.c
@@ -30,16 +30,16 @@ static char args_doc[] = N_("messages folder [folder...]");
/* GNU options */
static struct argp_option options[] = {
- {"folder", 'f', "FOLDER", 0, N_("Specify folder to operate upon")},
+ {"folder", 'f', N_("FOLDER"), 0, N_("Specify folder to operate upon")},
{"draft", 'd', NULL, 0, N_("Use <mh-dir>/draft as the source message")},
- {"link", 'l', "BOOL", OPTION_ARG_OPTIONAL,
+ {"link", 'l', N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("(not implemented) Preserve the source folder copy")},
- {"preserve", 'p', "BOOL", OPTION_ARG_OPTIONAL,
+ {"preserve", 'p', N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("(not implemented) Try to preserve message sequence numbers")},
- {"source", 's', "FOLDER", 0,
+ {"source", 's', N_("FOLDER"), 0,
N_("Specify source folder. FOLDER will became the current folder after the program exits.")},
{"src", 0, NULL, OPTION_ALIAS, NULL},
- {"file", 'F', "FILE", 0, N_("Use FILE as the source message")},
+ {"file", 'F', N_("FILE"), 0, N_("Use FILE as the source message")},
{ N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
{ 0 }
};
diff --git a/mh/repl.c b/mh/repl.c
index 13416a71b..bd2a0b28f 100644
--- a/mh/repl.c
+++ b/mh/repl.c
@@ -34,27 +34,27 @@ static char args_doc[] = N_("[+folder] [msg]");
/* GNU options */
static struct argp_option options[] = {
- {"annotate", 'a', "BOOL", OPTION_ARG_OPTIONAL,
+ {"annotate", 'a', N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Add Replied: header to the message being replied to")},
- {"draftfolder", 'd', "FOLDER", 0,
+ {"draftfolder", 'd', N_("FOLDER"), 0,
N_("Invoke the draftfolder facility")},
- {"draftmessage" , 'm', "MSG", 0,
+ {"draftmessage" , 'm', N_("MSG"), 0,
N_("Invoke the draftmessage facility")},
{"cc", 'c', "{all|to|cc|me}", 0,
N_("Specify whom to place on the Cc: list of the reply")},
{"nocc", 'n', "{all|to|cc|me}", 0,
N_("Specify whom to remove from the Cc: list of the reply")},
- {"folder", 'f', "FOLDER", 0, N_("Specify folder to operate upon")},
- {"editor", 'e', "PROG", 0, N_("Set the editor program to use")},
+ {"folder", 'f', N_("FOLDER"), 0, N_("Specify folder to operate upon")},
+ {"editor", 'e', N_("PROG"), 0, N_("Set the editor program to use")},
{"noedit", ARG_NOEDIT, 0, 0, N_("Suppress the initial edit")},
- {"fcc", ARG_FCC, "FOLDER", 0, N_("Set the folder to receive Fcc's.")},
- {"filter", ARG_FILTER, "PROG", 0,
+ {"fcc", ARG_FCC, N_("FOLDER"), 0, N_("Set the folder to receive Fcc's.")},
+ {"filter", ARG_FILTER, N_("PROG"), 0,
N_("Set the filter program to preprocess the body of the message being replied")},
- {"form", 'F', "FILE", 0, N_("Read format from given file")},
- {"inplace", ARG_INPLACE, "BOOL", 0, N_("Annotate the message in place")},
- {"query", ARG_QUERY, "BOOL", 0, N_("Query for addresses to place in To: and Cc: lists")},
- {"width", 'w', "NUMBER", 0, N_("Set output width")},
- {"whatnowproc", ARG_WHATNOWPROC, "PROG", 0,
+ {"form", 'F', N_("FILE"), 0, N_("Read format from given file")},
+ {"inplace", ARG_INPLACE, N_("BOOL"), 0, N_("Annotate the message in place")},
+ {"query", ARG_QUERY, N_("BOOL"), 0, N_("Query for addresses to place in To: and Cc: lists")},
+ {"width", 'w', N_("NUMBER"), 0, N_("Set output width")},
+ {"whatnowproc", ARG_WHATNOWPROC, N_("PROG"), 0,
N_("Set the replacement for whatnow program")},
{ N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
{ 0 }
diff --git a/mh/rmf.c b/mh/rmf.c
index b5c305f55..31870f534 100644
--- a/mh/rmf.c
+++ b/mh/rmf.c
@@ -34,8 +34,8 @@ static char args_doc[] = N_("[+folder]");
/* GNU options */
static struct argp_option options[] = {
- {"folder", 'f', "FOLDER", 0, N_("Specify the folder to delete")},
- {"interactive", 'i', "BOOL", OPTION_ARG_OPTIONAL,
+ {"folder", 'f', N_("FOLDER"), 0, N_("Specify the folder to delete")},
+ {"interactive", 'i', N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Interactive mode: ask for confirmation before removing each folder")},
{"recursive", 'r', NULL, 0, N_("Recursively delete all subfolders")},
{ N_("\nUse -help switch to obtain the list of traditional MH options. "), 0, 0, OPTION_DOC, "" },
diff --git a/mh/rmm.c b/mh/rmm.c
index 491a4d509..09db00133 100644
--- a/mh/rmm.c
+++ b/mh/rmm.c
@@ -25,7 +25,7 @@ static char args_doc[] = N_("[+folder] [msgs]");
/* GNU options */
static struct argp_option options[] = {
- {"folder", 'f', "FOLDER", 0, N_("Specify folder to operate upon")},
+ {"folder", 'f', N_("FOLDER"), 0, N_("Specify folder to operate upon")},
{ N_("\nUse -help switch to obtain the list of traditional MH options. "),
0, 0, OPTION_DOC, "" },
{ 0 }
diff --git a/mh/scan.c b/mh/scan.c
index 3e3bf2c13..c73672b9f 100644
--- a/mh/scan.c
+++ b/mh/scan.c
@@ -31,15 +31,15 @@ static char args_doc[] = N_("[+folder] [msgs]");
/* GNU options */
static struct argp_option options[] = {
- {"folder", 'f', "FOLDER", 0, N_("Specify folder to scan")},
- {"clear", 'c', "BOOL", OPTION_ARG_OPTIONAL,
+ {"folder", 'f', N_("FOLDER"), 0, N_("Specify folder to scan")},
+ {"clear", 'c', N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Clear screen after displaying the list")},
- {"form", 'F', "FILE", 0, N_("Read format from given file")},
- {"format", 't', "FORMAT", 0, N_("Use this format string")},
- {"header", 'H', "BOOL", OPTION_ARG_OPTIONAL, N_("Display header")},
- {"width", 'w', "NUMBER", 0, N_("Set output width")},
- {"reverse", 'r', "BOOL", OPTION_ARG_OPTIONAL, N_("List messages in reverse order")},
- {"file", 'i', "FILE", 0, N_("[Not yet implemented]")},
+ {"form", 'F', N_("FILE"), 0, N_("Read format from given file")},
+ {"format", 't', N_("FORMAT"), 0, N_("Use this format string")},
+ {"header", 'H', N_("BOOL"), OPTION_ARG_OPTIONAL, N_("Display header")},
+ {"width", 'w', N_("NUMBER"), 0, N_("Set output width")},
+ {"reverse", 'r', N_("BOOL"), OPTION_ARG_OPTIONAL, N_("List messages in reverse order")},
+ {"file", 'i', N_("FILE"), 0, N_("[Not yet implemented]")},
{"license", 'l', 0, 0, N_("Display software license"), -1},
diff --git a/pop3d/popauth.c b/pop3d/popauth.c
index b666caac9..6f26e4f42 100644
--- a/pop3d/popauth.c
+++ b/pop3d/popauth.c
@@ -75,10 +75,10 @@ static struct argp_option options[] =
" For a user: --modify --username <username>\n"), 2 },
{ NULL, 0, NULL, 0, N_("Options are:"), 3 },
- { "file", 'f', "FILE", 0, N_("Read input from FILE (default stdin)"), 3 },
- { "output", 'o', "FILE", 0, N_("Direct output to file"), 3 },
- { "password", 'p', "STRING", 0, N_("Specify user's password"), 3 },
- { "user", 'u', "USERNAME", 0, N_("Specify user name"), 3 },
+ { "file", 'f', N_("FILE"), 0, N_("Read input from FILE (default stdin)"), 3 },
+ { "output", 'o', N_("FILE"), 0, N_("Direct output to file"), 3 },
+ { "password", 'p', N_("STRING"), 0, N_("Specify user's password"), 3 },
+ { "user", 'u', N_("USERNAME"), 0, N_("Specify user name"), 3 },
{ NULL, }
};
diff --git a/readmsg/readmsg.c b/readmsg/readmsg.c
index 6237cafa0..9de23d813 100644
--- a/readmsg/readmsg.c
+++ b/readmsg/readmsg.c
@@ -37,9 +37,9 @@ static struct argp_option options[] =
{
{ "debug", 'd', 0, 0, N_("Display debugging information"), 1 },
{ "header", 'h', 0, 0, N_("Display entire header"), 1 },
- { "weedlist", 'w', "LIST", 0,
+ { "weedlist", 'w', N_("LIST"), 0,
N_("List of header names separated by whitespace or commas"), 1 },
- { "folder", 'f', "FOLDER", 0, N_("Folder to use"), 1 },
+ { "folder", 'f', N_("FOLDER"), 0, N_("Folder to use"), 1 },
{ "no-header", 'n', 0, 0, N_("Exclude all headers"), 1 },
{ "form-feeds", 'p', 0, 0, N_("Output formfeeds between messages"), 1 },
{ "show-all-match", 'a', NULL, 0,
diff --git a/sieve/sieve.c b/sieve/sieve.c
index 986ca8398..bfa6c2e89 100644
--- a/sieve/sieve.c
+++ b/sieve/sieve.c
@@ -73,19 +73,19 @@ static struct argp_option options[] =
{"dump", 'D', 0, 0,
N_("Compile script, dump disassembled sieve code to terminal and exit"), 0 },
- {"mbox-url", 'f', "MBOX", 0,
+ {"mbox-url", 'f', N_("MBOX"), 0,
N_("Mailbox to sieve (defaults to user's mail spool)"), 0},
- {"ticket", 't', "TICKET", 0,
+ {"ticket", 't', N_("TICKET"), 0,
N_("Ticket file for mailbox authentication"), 0},
- {"debug", 'd', "FLAGS", OPTION_ARG_OPTIONAL,
+ {"debug", 'd', N_("FLAGS"), OPTION_ARG_OPTIONAL,
N_("Debug flags (defaults to \"" D_DEFAULT "\")"), 0},
{"verbose", 'v', NULL, 0,
N_("Log all actions"), 0},
- {"email", 'e', "ADDRESS", 0,
+ {"email", 'e', N_("ADDRESS"), 0,
N_("Override user email address"), 0},
{0}

Return to:

Send suggestions and report system problems to the System administrator.