Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 2141acfb 2141acfb58732dab8cdb6ffff18550c0ebf016b5 by Sergey Poznyakoff
Options

Fix help messages. 

Option descriptions in `--help' output do not constitute
conceptual sentences. Therefore, they should not begin
with a capital letter, nor end with a final point.

Affected files:

comsat/comsat.c, config/mailutils-config.c, dotlock/dotlock.c,
frm/frm.c, frm/from.c, guimb/main.c, imap4d/imap4d.c,
libmu_argp/auth.c, libmu_argp/common.c, libmu_argp/gsasl.c,
libmu_argp/pam.c, libmu_argp/radius.c, libmu_argp/sieve.c,
libmu_argp/sql.c, libmu_argp/tls.c, libmu_argp/virtdomain.c,
libmu_auth/sql.c, libmu_cfg/sql.c, maidag/maidag.c,
maidag/mailquota.c, maidag/mailtmp.c, mail/mail.c,
messages/messages.c, mh/ali.c, mh/anno.c, mh/burst.c, mh/comp.c,
mh/fmtcheck.c, mh/folder.c, mh/forw.c, mh/inc.c, mh/install-mh.c,
mh/mark.c, mh/mh_init.c, mh/mhl.c, mh/mhn.c, mh/mhparam.c,
mh/mhpath.c, mh/pick.c, mh/refile.c, mh/repl.c, mh/rmf.c, mh/rmm.c,
mh/scan.c, mh/send.c, mh/sortm.c, mh/whatnow.c, mh/whom.c,
mimeview/mimeview.c, movemail/movemail.c, pop3d/pop3d.c,
pop3d/popauth.c, readmsg/readmsg.c, sieve/sieve.c
1 parent 8619a1cb
Inline Side-by-side
Showing 54 changed files with 479 additions and 481 deletions
......@@ -62,12 +62,12 @@ static struct argp_option options[] =
{
{ "config", 'c', N_("FILE"), OPTION_HIDDEN, "", 0 },
{ "convert-config", 'C', N_("FILE"), 0,
N_("Convert the configuration FILE to new format."), 0 },
{ "test", 't', NULL, 0, N_("Run in test mode"), 0 },
{ "foreground", OPT_FOREGROUND, 0, 0, N_("Remain in foreground."), 0},
{ "inetd", 'i', 0, 0, N_("Run in inetd mode"), 0 },
N_("convert the configuration FILE to new format"), 0 },
{ "test", 't', NULL, 0, N_("run in test mode"), 0 },
{ "foreground", OPT_FOREGROUND, 0, 0, N_("remain in foreground"), 0},
{ "inetd", 'i', 0, 0, N_("run in inetd mode"), 0 },
{ "daemon", 'd', N_("NUMBER"), OPTION_ARG_OPTIONAL,
N_("Runs in daemon mode with a maximum of NUMBER children"), 0 },
N_("runs in daemon mode with a maximum of NUMBER children"), 0 },
{ NULL, 0, NULL, 0, NULL, 0 }
};
......@@ -120,7 +120,7 @@ int test_mode;
struct mu_cfg_param comsat_cfg_param[] = {
{ "allow-biffrc", mu_cfg_bool, &allow_biffrc, 0, NULL,
N_("Read .biffrc file from the user home directory") },
N_("Read .biffrc file from the user home directory.") },
{ "require-tty", mu_cfg_bool, &require_tty, 0, NULL,
N_("Notify only if the user is logged on one of the ttys.") },
{ "max-lines", mu_cfg_int, &maxlines, 0, NULL,
......
......@@ -26,23 +26,21 @@
#include "mailutils/libargp.h"
const char *program_version = "mailutils-config (" PACKAGE_STRING ")";
static char doc[] = N_("GNU mailutils-config -- Display compiler and loader options needed for building a program with mailutils");
static char doc[] = N_("GNU mailutils-config -- display compiler and loader options needed for building a program with mailutils");
static char args_doc[] = N_("[arg...]");
static struct argp_option options[] = {
{"compile", 'c', NULL, 0,
N_("Print C compiler flags to compile with"), 0},
N_("print C compiler flags to compile with"), 0},
{"link", 'l', NULL, 0,
N_("Print libraries to link with. Possible arguments are: auth, guile, "
N_("print libraries to link with; possible arguments are: auth, guile, "
"mbox, mh, maildir, mailer, imap, pop, sieve and all"), 0},
{"info", 'i', NULL, 0,
N_("Print a list of configuration options used to build mailutils. If arguments "
"are given, they are interpreted as a list of configuration options to check "
"for. In this case the program prints those options from this list that "
"have been defined. It exits with zero status if all of the "
"specified options are defined. Otherwise, the exit status is 1."), 0},
N_("print a list of configuration options used to build mailutils; "
"oprional arguments are interpreted as a list of configuration "
"options to check for"), 0},
{"verbose", 'v', NULL, 0,
N_("Increase output verbosity"), 0},
N_("increase output verbosity"), 0},
{0, 0, 0, 0}
};
......
......@@ -44,16 +44,16 @@ static char args_doc[] = N_("FILE");
static struct argp_option options[] = {
{"unlock", 'u', NULL, 0,
N_("Unlock"), 0},
N_("unlock"), 0},
{"force", 'f', N_("MINUTES"), OPTION_ARG_OPTIONAL,
N_("Forcibly break an existing lock older than a certain time"), 0},
N_("forcibly break an existing lock older than a certain time"), 0},
{"retry", 'r', N_("RETRIES"), OPTION_ARG_OPTIONAL,
N_("Retry the lock a few times"), 0},
N_("retry the lock a few times"), 0},
{"debug", 'd', NULL, 0,
N_("Print details of failure reasons to stderr"), 0},
N_("print details of failure reasons to stderr"), 0},
{NULL, 0, NULL, 0, NULL, 0}
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002, 2003,
2004, 2005, 2007, 2008 Free Software Foundation, Inc.
2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -39,29 +39,19 @@ static struct attr_tab {
int code; /* Corresponding IS_.* flag */
size_t len; /* Minimum abbreviation length */
} attr_tab[] = {
/* TRANSLATORS: See comment marked [frm status] below */
{ N_("new"), IS_NEW, 0 },
/* TRANSLATORS: See comment marked [frm status] below */
{ N_("old"), IS_OLD, 0 },
/* TRANSLATORS: See comment marked [frm status] below */
{ N_("unread"), IS_OLD, 0 },
/* TRANSLATORS: See comment marked [frm status] below */
{ N_("read"), IS_READ, 0 },
{ "new", IS_NEW, 0 },
{ "old", IS_OLD, 0 },
{ "unread", IS_OLD, 0 },
{ "read", IS_READ, 0 },
{ NULL }
};
static char attr_help[] =
/* TRANSLATORS: [frm status]
1) Please make sure the words "new", "unread", "old" and
"read" are translated exactly as in four preceeding messages.
2) If possible, select such translations for these words, that
differ by the first letter.
*/
N_("Select messages with the specific attribute. STATUS is one \
of the following: new, unread, old (same as unread) or read. Any unambiguous \
abbreviation of those is also accepted.");
/* TRANSLATORS: Please do *not* translate the words "new", "unread",
"old" and "read". They are keywords. */
N_("select messages with the specific attribute: \
new, unread, old (same as unread) or read (or any unambiguous \
abbreviation of these)");
/* Attribute table handling */
......@@ -74,7 +64,7 @@ prepare_attrs (void)
for (p = attr_tab; p->name; p++)
{
const char *name = gettext (p->name);
const char *name = p->name;
size_t len = strlen (name);
size_t n = 1;
......@@ -82,7 +72,7 @@ prepare_attrs (void)
{
if (p != q)
{
const char *str = gettext (q->name);
const char *str = q->name;
size_t slen = strlen (str);
if (memcmp (name, str, n) == 0)
......@@ -112,7 +102,7 @@ decode_attr (char *arg)
for (p = attr_tab; p->name; p++)
{
const char *str = gettext (p->name);
const char *str = p->name;
if (str[0] == arg[0])
{
if (len < p->len)
......@@ -133,15 +123,15 @@ decode_attr (char *arg)
static struct argp_option options[] = {
{"debug", 'd', NULL, 0, N_("Enable debugging output"), 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},
{"query", 'q', NULL, 0, N_("Print a message if the mailbox contains some unread mail"), 0},
{"summary",'S', NULL, 0, N_("Print a summary of messages"), 0},
{"debug", 'd', NULL, 0, N_("enable debugging output"), 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},
{"query", 'q', NULL, 0, N_("print a message if the mailbox contains some unread mail"), 0},
{"summary",'S', NULL, 0, N_("print a summary of messages"), 0},
{"status", 's', N_("STATUS"), 0, attr_help, 0},
{"align", 't', NULL, 0, N_("Tidy mode: align subject lines"), 0},
{"align", 't', NULL, 0, N_("tidy mode: align subject lines"), 0},
{0, 0, 0, 0}
};
......
......@@ -26,12 +26,12 @@ const char *program_version = "from (" PACKAGE_STRING ")";
static char doc[] = N_("GNU from -- display from and subject");
static struct argp_option options[] = {
{"count", 'c', NULL, 0, N_("Just print a count of messages and exit")},
{"count", 'c', NULL, 0, N_("just print a count of messages and exit")},
{"sender", 's', N_("ADDRESS"), 0,
N_("Print only mail from addresses containing the supplied string") },
N_("print only mail from addresses containing the supplied string") },
{"file", 'f', N_("FILE"), 0,
N_("Read mail from FILE") },
{"debug", 'd', NULL, 0, N_("Enable debugging output"), 0},
N_("read mail from FILE") },
{"debug", 'd', NULL, 0, N_("enable debugging output"), 0},
{0, 0, 0, 0}
};
......@@ -132,7 +132,7 @@ main (int argc, char **argv)
{
if (mailbox_name)
{
mu_error (_("Both --from option and user name are specified"));
mu_error (_("both --from option and user name are specified"));
exit (1);
}
......
......@@ -57,21 +57,21 @@ static struct argp_option options[] = {
*/
N_("The following switches stop argument processing, and pass all\n"
"remaining arguments as the value of (command-line):"), 1},
{"code", 'c', N_("EXPR"), 0, N_("Execute given scheme expression."), 1},
{"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},
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', N_("EXPR"), 0, N_("Execute given scheme expression."), 2},
{"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},
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},
{"debug", 'd', NULL, 0, N_("start with debugging evaluator and backtraces"), 3},
{"guile-arg", 'g', N_("ARG"), 0,
N_("Append ARG to the command line passed to Guile"), 3},
{"mailbox", 'M', N_("NAME"), 0, N_("Set default mailbox name"), 3},
N_("append ARG to the command line passed to Guile"), 3},
{"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},
N_("act as local MDA for user NAME"), 3},
{0, 0, 0, 0}
};
......@@ -124,7 +124,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
const char *program_version = "guimb (" PACKAGE_STRING ")";
static char doc[] =
N_("GNU guimb -- Process the contents of the specified mailboxes "
N_("GNU guimb -- process contents of the specified mailboxes "
"using a Scheme program or expression.");
static char args_doc[] = N_("[mailbox...]");
......
......@@ -64,25 +64,25 @@ static char doc[] = N_("GNU imap4d -- the IMAP4D daemon");
#define OPT_FOREGROUND 260
static struct argp_option options[] = {
{ "foreground", OPT_FOREGROUND, 0, 0, N_("Remain in foreground."), 0},
{ "inetd", 'i', 0, 0, N_("Run in inetd mode"), 0},
{ "foreground", OPT_FOREGROUND, 0, 0, N_("remain in foreground"), 0},
{ "inetd", 'i', 0, 0, N_("run in inetd mode"), 0},
{ "daemon", 'd', N_("NUMBER"), OPTION_ARG_OPTIONAL,
N_("Runs in daemon mode with a maximum of NUMBER children"), 0 },
N_("runs in daemon mode with a maximum of NUMBER children"), 0 },
{"other-namespace", 'O', N_("PATHLIST"), OPTION_HIDDEN,
N_("Set the `other' namespace"), 0},
N_("set the `other' namespace"), 0},
{"shared-namespace", 'S', N_("PATHLIST"), OPTION_HIDDEN,
N_("Set the `shared' namespace"), 0},
N_("set the `shared' namespace"), 0},
{"login-disabled", OPT_LOGIN_DISABLED, NULL, OPTION_HIDDEN,
N_("Disable LOGIN command")},
N_("disable LOGIN command")},
{"create-home-dir", OPT_CREATE_HOME_DIR, N_("MODE"),
OPTION_ARG_OPTIONAL|OPTION_HIDDEN,
N_("Create home directory, if it does not exist")},
N_("create home directory, if it does not exist")},
{"preauth", OPT_PREAUTH, NULL, 0,
N_("Start in preauth mode") },
N_("start in preauth mode") },
#ifdef WITH_TLS
{"tls-required", OPT_TLS_REQUIRED, NULL, OPTION_HIDDEN,
N_("Always require STARTTLS before entering authentication phase")},
N_("always require STARTTLS before entering authentication phase")},
#endif
{NULL, 0, NULL, 0, NULL, 0}
};
......@@ -299,7 +299,7 @@ cb_mailbox_mode (mu_debug_t debug, void *data, mu_config_value_t *val)
static struct mu_cfg_param imap4d_cfg_param[] = {
{ "homedir", mu_cfg_string, &modify_homedir, 0, NULL,
N_("Modify home directory") },
N_("Modify home directory.") },
{ "personal-namespace", MU_CFG_LIST_OF(mu_cfg_string), &namespace[NS_PRIVATE],
0, NULL,
N_("Set personal namespace.") },
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2007 Free Software Foundation, Inc.
Copyright (C) 2007, 2009 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
......@@ -41,15 +41,15 @@ static error_t mu_auth_argp_parser (int key, char *arg,
/* Options used by programs that use extended authentication mechanisms. */
static struct argp_option mu_auth_argp_option[] = {
{ "authentication", OPT_AUTHENTICATION, N_("MODLIST"), OPTION_HIDDEN,
N_("Set the list of modules to be used for authentication"), 0 },
N_("set the list of modules to be used for authentication"), 0 },
{ "authorization", OPT_AUTHORIZATION, N_("MODLIST"), OPTION_HIDDEN,
N_("Set list of modules to be used for authorization"), 0 },
N_("set list of modules to be used for authorization"), 0 },
{ "clear-authorization", OPT_CLEAR_AUTHORIZATION, NULL, OPTION_HIDDEN,
N_("Clear the list of authorization modules"), 0 },
N_("clear the list of authorization modules"), 0 },
{ "clear-authentication", OPT_CLEAR_AUTHENTICATION, NULL, OPTION_HIDDEN,
N_("Clear the list of authentication modules"), 0 },
N_("clear the list of authentication modules"), 0 },
{ "debug-auth", OPT_DEBUG_AUTH, NULL, 0,
N_("Debug authentication functions") },
N_("debug authentication functions") },
{ NULL, 0, NULL, 0, NULL, 0 }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2007, 2008 Free Software Foundation, Inc.
Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
......@@ -55,23 +55,23 @@ static struct argp_option mu_common_argp_options[] =
{
{ NULL, 0, NULL, 0, N_("Common options"), 0},
{ "show-config-options", OPT_SHOW_OPTIONS, NULL, 0,
N_("Show compilation options"), 0 },
N_("show compilation options"), 0 },
{ "config-help", OPT_HELP_CONFIG, NULL, 0,
N_("Show configuration file summary"), 0 },
N_("show configuration file summary"), 0 },
{ "no-user-config", OPT_NO_USER_RCFILE, NULL, 0,
N_("Do not load user configuration file"), 0 },
N_("do not load user configuration file"), 0 },
{ "no-user-rcfile", 0, NULL, OPTION_ALIAS, NULL },
{ "no-site-config", OPT_NO_SITE_RCFILE, NULL, 0,
N_("Do not load site configuration file"), 0 },
N_("do not load site configuration file"), 0 },
{ "no-site-rcfile", 0, NULL, OPTION_ALIAS, NULL },
{ "config-file", OPT_RCFILE, N_("FILE"), 0,
N_("Load this configuration file"), 0, },
N_("load this configuration file"), 0, },
{ "rcfile", 0, NULL, OPTION_ALIAS, NULL },
{ "config-verbose", OPT_RCFILE_VERBOSE, NULL, 0,
N_("Verbosely log parsing of the configuration files"), 0 },
N_("verbosely log parsing of the configuration files"), 0 },
{ "rcfile-verbose", 0, NULL, OPTION_ALIAS, NULL },
{ "config-lint", OPT_RCFILE_LINT, NULL, 0,
N_("Check configuration file syntax and exit"), 0 },
N_("check configuration file syntax and exit"), 0 },
{ "rcfile-lint", 0, NULL, OPTION_ALIAS, NULL },
{ NULL, 0, NULL, 0, NULL, 0 }
};
......@@ -139,7 +139,7 @@ struct mu_cmdline_capa mu_common_cmdline = {
static struct argp_option mu_logging_argp_option[] = {
{"log-facility", OPT_LOG_FACILITY, N_("FACILITY"), 0,
N_("Output logs to syslog FACILITY"), 0},
N_("output logs to syslog FACILITY"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};
......@@ -192,7 +192,7 @@ struct mu_cmdline_capa mu_logging_cmdline = {
/* Option to print the license. */
static struct argp_option mu_license_argp_option[] = {
{ "license", OPT_LICENSE, NULL, 0, N_("Print license and exit"), -2 },
{ "license", OPT_LICENSE, NULL, 0, N_("print license and exit"), -2 },
{ NULL, 0, NULL, 0, NULL, 0 }
};
......@@ -236,13 +236,13 @@ struct mu_cmdline_capa mu_license_cmdline = {
/* Options used by programs that access mailboxes. */
static struct argp_option mu_mailbox_argp_option[] = {
{ "mail-spool", 'm', N_("URL"), OPTION_HIDDEN,
N_("Use specified URL as a mailspool directory"), 0 },
N_("use specified URL as a mailspool directory"), 0 },
{ "mailbox-pattern", OPT_MAILBOX_PATTERN, N_("pat"), OPTION_HIDDEN,
"", 0 },
{ "mailbox-type", OPT_MAILBOX_TYPE, N_("PROTO"), OPTION_HIDDEN,
N_("Default mailbox type to use"), 0 },
N_("default mailbox type to use"), 0 },
{ "mail-folder", OPT_MAIL_FOLDER, N_("DIR"), OPTION_HIDDEN,
N_("Default user mail folder"), 0 },
N_("default user mail folder"), 0 },
{ NULL }
};
......@@ -308,16 +308,16 @@ struct mu_cmdline_capa mu_mailbox_cmdline = {
/* Options used by programs that access mailboxes. */
static struct argp_option mu_locking_argp_option[] = {
{"lock-flags", OPT_LOCK_FLAGS, N_("FLAGS"), OPTION_HIDDEN,
N_("Default locker flags (E=external, R=retry, T=time, P=pid)"), 0},
N_("default locker flags (E=external, R=retry, T=time, P=pid)"), 0},
{"lock-retry-timeout", OPT_LOCK_RETRY_TIMEOUT, N_("SECONDS"), OPTION_HIDDEN,
N_("Set timeout for acquiring the lockfile") },
N_("set timeout for acquiring the lockfile") },
{"lock-retry-count", OPT_LOCK_RETRY_COUNT, N_("NUMBER"), OPTION_HIDDEN,
N_("Set the maximum number of times to retry acquiring the lockfile") },
N_("set the maximum number of times to retry acquiring the lockfile") },
{"lock-expire-timeout", OPT_LOCK_EXPIRE_TIMEOUT, N_("SECONDS"),
OPTION_HIDDEN,
N_("Number of seconds after which the lock expires"), },
N_("number of seconds after which the lock expires"), },
{"external-locker", OPT_LOCK_EXTERNAL_PROGRAM, N_("PATH"), OPTION_HIDDEN,
N_("Set full path to the external locker program") },
N_("set full path to the external locker program") },
{ NULL, 0, NULL, 0, NULL, 0 }
};
......@@ -386,9 +386,9 @@ struct mu_cmdline_capa mu_locking_cmdline = {
/* Options used by programs that do address mapping. */
static struct argp_option mu_address_argp_option[] = {
{"email-addr", 'E', N_("EMAIL"), OPTION_HIDDEN,
N_("Set current user's email address (default is loginname@defaultdomain)"), 0},
N_("set current user's email address (default is loginname@defaultdomain)"), 0},
{"email-domain", 'D', N_("DOMAIN"), OPTION_HIDDEN,
N_("Set domain for unqualified user names (default is this host)"), 0},
N_("set domain for unqualified user names (default is this host)"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};
......@@ -445,7 +445,7 @@ struct mu_cmdline_capa mu_address_cmdline = {
/* Options used by programs that send mail. */
static struct argp_option mu_mailer_argp_option[] = {
{"mailer", 'M', N_("MAILER"), 0,
N_("Use specified URL as the default mailer"), 0},
N_("use specified URL as the default mailer"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};
......@@ -495,9 +495,9 @@ struct mu_cmdline_capa mu_mailer_cmdline = {
static struct argp_option mu_debug_argp_options[] =
{
{ "debug-level", OPT_DEBUG_LEVEL, N_("LEVEL"), 0,
N_("Set Mailutils debugging level"), 0 },
N_("set Mailutils debugging level"), 0 },
{ "debug-line-info", OPT_LINE_INFO, NULL, 0,
N_("Show source info with debugging messages"), 0 },
N_("show source info with debugging messages"), 0 },
{ NULL }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2007 Free Software Foundation, Inc.
Copyright (C) 2007, 2009 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
......@@ -26,7 +26,7 @@
static struct argp_option _gsasl_argp_options[] = {
{"cram-passwd", OPT_CRAM_PASSWD, N_("FILE"), OPTION_HIDDEN,
N_("Specify password file for CRAM-MD5 authentication"), 0},
N_("specify password file for CRAM-MD5 authentication"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2007 Free Software Foundation, Inc.
Copyright (C) 2007, 2009 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
......@@ -52,7 +52,7 @@ mu_pam_argp_parser (int key, char *arg, struct argp_state *state)
static struct argp_option mu_pam_argp_option[] = {
{ "pam-service", OPT_PAM_SERVICE, N_("STRING"), OPTION_HIDDEN,
N_("Use STRING as PAM service name"), 0},
N_("use STRING as PAM service name"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2007 Free Software Foundation, Inc.
Copyright (C) 2007, 2009 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
......@@ -32,13 +32,13 @@ enum {
static struct argp_option mu_radius_argp_option[] = {
{ "radius-auth-request", OPT_AUTH_REQUEST, N_("REQUEST"), OPTION_HIDDEN,
N_("Radius request to authenitcate the user"), 0 },
N_("radius request to authenitcate the user"), 0 },
{ "radius-getpwnam-request", OPT_GETPWNAM_REQUEST, N_("REQUEST"), OPTION_HIDDEN,
N_("Radius request to retrieve a passwd entry based on username"), 0 },
N_("radius request to retrieve a passwd entry based on username"), 0 },
{ "radius-getpwuid-request", OPT_GETPWUID_REQUEST, N_("REQUEST"), OPTION_HIDDEN,
N_("Radius request to retrieve a passwd entry based on UID"), 0 },
N_("radius request to retrieve a passwd entry based on UID"), 0 },
{ "radius-directory", OPT_RADIUS_DIR, N_("DIR"), OPTION_HIDDEN,
N_("Set name of the radius configuration directory"), 0 },
N_("set name of the radius configuration directory"), 0 },
{ NULL }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002, 2005,
2007 Free Software Foundation, Inc.
2007, 2009 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
......@@ -30,13 +30,13 @@ enum {
static struct argp_option sieve_argp_option[] = {
{ "includedir", 'I', N_("DIR"), 0,
N_("Append directory DIR to the list of directories searched for include files"), 0 },
N_("append DIR to the list of directories searched for include files"), 0 },
{ "libdir", 'L', N_("DIR"), 0,
N_("Append directory DIR to the list of directories searched for library files"), 0 },
N_("append DIR to the list of directories searched for library files"), 0 },
{ "clear-include-path", OPT_CLEAR_INCLUDE_PATH, NULL, 0,
N_("Clear Sieve include path"), 0 },
N_("clear Sieve include path"), 0 },
{ "clear-library-path", OPT_CLEAR_LIBRARY_PATH, NULL, 0,
N_("Clear Sieve library path"), 0 },
N_("clear Sieve library path"), 0 },
{ "clearpath", 0, NULL, OPTION_ALIAS, NULL },
{ NULL, 0, NULL, 0, NULL, 0 }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2007 Free Software Foundation, Inc.
Copyright (C) 2007, 2009 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
......@@ -38,7 +38,7 @@ enum {
static struct argp_option mu_sql_argp_option[] = {
{"sql-interface", OPT_SQL_INTERFACE, N_("NAME"), OPTION_HIDDEN,
N_("Type of SQL interface to use"), },
N_("type of SQL interface to use"), },
{"sql-getpwnam", OPT_SQL_GETPWNAM, N_("QUERY"), OPTION_HIDDEN,
N_("SQL query to retrieve a passwd entry based on username"), 0},
{"sql-getpwuid", OPT_SQL_GETPWUID, N_("QUERY"), OPTION_HIDDEN,
......@@ -46,19 +46,19 @@ static struct argp_option mu_sql_argp_option[] = {
{"sql-getpass", OPT_SQL_GETPASS, N_("QUERY"), OPTION_HIDDEN,
N_("SQL query to retrieve a password from the database"), 0},
{"sql-host", OPT_SQL_HOST, N_("HOSTNAME"), OPTION_HIDDEN,
N_("Name or IP of MySQL server to connect to"), 0},
N_("name or IP of MySQL server to connect to"), 0},
{"sql-user", OPT_SQL_USER, N_("NAME"), OPTION_HIDDEN,
N_("SQL user name"), 0},
{"sql-passwd", OPT_SQL_PASSWD, N_("STRING"), OPTION_HIDDEN,
N_("SQL connection password"), 0},
{"sql-db", OPT_SQL_DB, N_("STRING"), OPTION_HIDDEN,
N_("Name of the database to connect to"), 0},
N_("name of the database to connect to"), 0},
{"sql-port", OPT_SQL_PORT, N_("NUMBER"), OPTION_HIDDEN,
N_("Port to use"), 0},
N_("port to use"), 0},
{"sql-password-type", OPT_SQL_MU_PASSWORD_TYPE, N_("STRING"), OPTION_HIDDEN,
N_("Type of password returned by --sql-getpass query. STRING is one of: plain, hash, scrambled"), 0},
N_("type of password returned by --sql-getpass query. STRING is one of: plain, hash, scrambled"), 0},
{"sql-field-map", OPT_SQL_FIELD_MAP, N_("MAP"), OPTION_HIDDEN,
N_("Declare a name translation map for SQL fields in results of sql-getpwnam and "
N_("declare a name translation map for SQL fields in results of sql-getpwnam and "
"sql-getpwuid queries"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2007 Free Software Foundation, Inc.
Copyright (C) 2007, 2009 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
......@@ -31,13 +31,13 @@ enum {
static struct argp_option _tls_argp_options[] = {
{"ssl-cert", OPT_SSL_CERT, N_("FILE"), OPTION_HIDDEN,
N_("Specify SSL certificate file"), 0},
N_("specify SSL certificate file"), 0},
{"ssl-key", OPT_SSL_KEY, N_("FILE"), OPTION_HIDDEN,
N_("Specify SSL certificate key"), },
N_("specify SSL certificate key"), },
{"ssl-cafile", OPT_SSL_CAFILE, N_("FILE"), OPTION_HIDDEN,
N_("Specify trusted CAs file"), 0},
N_("specify trusted CAs file"), 0},
{"tls", OPT_TLS, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Enable TLS support") },
N_("enable TLS support") },
{NULL, 0, NULL, 0, NULL, 0}
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2007 Free Software Foundation, Inc.
Copyright (C) 2007, 2009 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
......@@ -51,7 +51,7 @@ mu_virt_argp_parser (int key, char *arg, struct argp_state *state)
static struct argp_option mu_virt_argp_option[] = {
{ "virtual-passwd-dir", OPT_PWDDIR, N_("DIR"), OPTION_HIDDEN,
N_("Search for virtual passwd file in DIR"), 0},
N_("search for virtual passwd file in DIR"), 0},
{ NULL, 0, NULL, 0, NULL, 0 }
};
......
......@@ -362,7 +362,7 @@ mu_auth_sql_by_name (struct mu_auth_data **return_data,
if (status)
{
mu_error (_("SQL Query failed: %s"),
mu_error (_("SQL query failed: %s"),
(status == MU_ERR_SQL) ? mu_sql_strerror (conn) :
mu_strerror (status));
mu_sql_connection_destroy (&conn);
......@@ -446,7 +446,7 @@ mu_auth_sql_by_uid (struct mu_auth_data **return_data,
if (status)
{
mu_error (_("SQL Query failed: %s"),
mu_error (_("SQL query failed: %s"),
(status == MU_ERR_SQL) ? mu_sql_strerror (conn) :
mu_strerror (status));
mu_sql_connection_destroy (&conn);
......@@ -522,7 +522,7 @@ mu_sql_getpass (const char *username, char **passwd)
if (status)
{
mu_error (_("SQL Query failed: %s"),
mu_error (_("SQL query failed: %s"),
(status == MU_ERR_SQL) ? mu_sql_strerror (conn) :
mu_strerror (status));
mu_sql_connection_destroy (&conn);
......
......@@ -36,7 +36,7 @@ cb_password_type (mu_debug_t debug, void *data, mu_config_value_t *val)
if (mu_sql_decode_password_type (val->v.string, &sql_settings.password_type))
mu_cfg_format_error (debug, MU_DEBUG_ERROR,
_("Unknown password type `%s'"),
_("unknown password type `%s'"),
val->v.string);
return 0;
}
......
......@@ -79,21 +79,21 @@ static struct argp_option options[] =
{ NULL, 0, NULL, 0,
N_("General options"), GRID },
{ "foreground", FOREGROUND_OPTION, 0, 0, N_("Remain in foreground."),
{ "foreground", FOREGROUND_OPTION, 0, 0, N_("remain in foreground"),
GRID + 1 },
{ "inetd", 'i', 0, 0, N_("Run in inetd mode"), GRID + 1 },
{ "inetd", 'i', 0, 0, N_("run in inetd mode"), GRID + 1 },
{ "daemon", 'd', N_("NUMBER"), OPTION_ARG_OPTIONAL,
N_("Runs in daemon mode with a maximum of NUMBER children"), GRID + 1 },
{ "url", URL_OPTION, 0, 0, N_("Deliver to given URLs"), GRID + 1 },
N_("runs in daemon mode with a maximum of NUMBER children"), GRID + 1 },
{ "url", URL_OPTION, 0, 0, N_("deliver to given URLs"), GRID + 1 },
{ "from", 'f', N_("EMAIL"), 0,
N_("Specify the sender's name"), GRID + 1 },
N_("specify the sender's name"), GRID + 1 },
{ NULL, 'r', NULL, OPTION_ALIAS, NULL },
{ "lmtp", LMTP_OPTION, N_("URL"), OPTION_ARG_OPTIONAL,
N_("Operate in LMTP mode"), GRID + 1 },
N_("operate in LMTP mode"), GRID + 1 },
{ "debug", 'x', N_("FLAGS"), 0,
N_("Enable debugging"), GRID + 1 },
N_("enable debugging"), GRID + 1 },
{ "stderr", STDERR_OPTION, NULL, 0,
N_("Log to standard error"), GRID + 1 },
N_("log to standard error"), GRID + 1 },
#undef GRID
#define GRID 2
......@@ -101,12 +101,12 @@ static struct argp_option options[] =
N_("Scripting options"), GRID },
{ "language", 'l', N_("STRING"), 0,
N_("Define scripting language for the next --script option"),
N_("define scripting language for the next --script option"),
GRID + 1 },
{ "script", 's', N_("PATTERN"), 0,
N_("Set name pattern for user-defined mail filter"), GRID + 1 },
N_("set name pattern for user-defined mail filter"), GRID + 1 },
{ "message-id-header", MESSAGE_ID_HEADER_OPTION, N_("STRING"), 0,
N_("Use this header to identify messages when logging Sieve actions"),
N_("use this header to identify messages when logging Sieve actions"),
GRID + 1 },
#undef GRID
{ NULL, 0, NULL, 0, NULL, 0 }
......@@ -215,7 +215,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
case 'r':
case 'f':
if (sender_address != NULL)
argp_error (state, _("Multiple --from options"));
argp_error (state, _("multiple --from options"));
sender_address = arg;
break;
......
......@@ -194,7 +194,7 @@ sql_retrieve_quota (char *name, mu_off_t *quota)
if (status)
{
mu_error (_("SQL Query failed: %s"),
mu_error (_("SQL query failed: %s"),
(status == MU_ERR_SQL) ? mu_sql_strerror (conn) :
mu_strerror (status));
mu_sql_connection_destroy (&conn);
......
......@@ -138,7 +138,7 @@ mail_tmp_finish (struct mail_tmp *mtmp, mu_mailbox_t *mbox)
if (status)
{
errno = status;
maidag_error (_("Error writing temporary file: %s"),
maidag_error (_("error writing temporary file: %s"),
mu_strerror (status));
mu_stream_destroy (&mtmp->stream, mu_stream_get_owner (mtmp->stream));
return status;
......
......@@ -41,26 +41,26 @@ static struct argp_option options[] = {
{ NULL, 'f', NULL, OPTION_HIDDEN, NULL, 0 },
{"file", F_OPTION, "FILE", OPTION_ARG_OPTIONAL|OPTION_HIDDEN, 0},
{"exist", 'e', NULL, 0, N_("Return true if mail exists"), 0},
{"byname", 'F', NULL, 0, N_("Save messages according to sender"), 0},
{"headers", 'H', NULL, 0, N_("Write a header summary and exit"), 0},
{"ignore", 'i', NULL, 0, N_("Ignore interrupts"), 0},
{"norc", 'n', NULL, 0, N_("Do not read the system mailrc file"), 0},
{"exist", 'e', NULL, 0, N_("return true if mail exists"), 0},
{"byname", 'F', NULL, 0, N_("save messages according to sender"), 0},
{"headers", 'H', NULL, 0, N_("write a header summary and exit"), 0},
{"ignore", 'i', NULL, 0, N_("ignore interrupts"), 0},
{"norc", 'n', NULL, 0, N_("do not read the system mailrc file"), 0},
{"nosum", 'N', NULL, 0,
N_("Do not display initial header summary"), 0},
{"print", 'p', NULL, 0, N_("Print all mail to standard output"), 0},
N_("do not display initial header summary"), 0},
{"print", 'p', NULL, 0, N_("print all mail to standard output"), 0},
{"read", 'r', NULL, OPTION_ALIAS },
{"quit", 'q', NULL, 0,
N_("Cause interrupts to terminate program"), 0},
N_("cause interrupts to terminate program"), 0},
{"subject", 's', N_("SUBJ"), 0,
N_("Send a message with the given SUBJECT"), 0},
N_("send a message with the given SUBJECT"), 0},
{"to", 't', NULL, 0,
N_("Precede message by a list of addresses"), 0},
{"user", 'u', N_("USER"), 0, N_("Operate on USER's mailbox"), 0},
N_("precede message by a list of addresses"), 0},
{"user", 'u', N_("USER"), 0, N_("operate on USER's mailbox"), 0},
{"append", 'a', N_("HEADER: VALUE"), 0,
N_("Append given header to the message being sent"), 0},
N_("append given header to the message being sent"), 0},
{"exec", 'E', N_("COMMAND"), 0,
N_("Execute COMMAND"), 0 },
N_("execute COMMAND"), 0 },
{ NULL, 0, NULL, 0, NULL, 0 }
};
......
......@@ -39,8 +39,8 @@ static struct argp_option options[] = {
{ NULL, 0, NULL, 0,
/* TRANSLATORS: 'messages' is a program name. Do not translate it! */
N_("messages specific switches:"), 0},
{"quiet", 'q', 0, 0, N_("Only display number of messages")},
{"silent", 's', 0, 0, N_("Same as -q")},
{"quiet", 'q', NULL, 0, N_("only display number of messages")},
{"silent", 's', NULL, OPTION_ALIAS, NULL },
{ 0 }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2003, 2004, 2005, 2006, 2007,
2008 Free Software Foundation, Inc.
2008, 2009 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -35,17 +35,17 @@ static char args_doc[] = N_("aliases ...");
/* GNU options */
static struct argp_option options[] = {
{"alias", ARG_ALIAS, N_("FILE"), 0,
N_("Use the additional alias FILE")},
N_("use the additional alias FILE")},
{"noalias", ARG_NOALIAS, NULL, 0,
N_("Do not read the system alias file") },
N_("do not read the system alias file") },
{"list", ARG_LIST, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("List each address on a separate line") },
N_("list each address on a separate line") },
{"normalize", ARG_NORMALIZE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Try to determine the official hostname for each address") },
N_("try to determine the official hostname for each address") },
{"user", ARG_USER, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("List the aliases that expand to given addresses") },
N_("list the aliases that expand to given addresses") },
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ 0 }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2003, 2005, 2007, 2008 Free Software Foundation, Inc.
Copyright (C) 2003, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -29,19 +29,19 @@ static char args_doc[] = N_("[msg [msg...]]");
/* GNU options */
static struct argp_option options[] = {
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify folder to operate upon")},
N_("specify folder to operate upon")},
{"inplace", ARG_INPLACE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("* Annotate the message in place")},
N_("* annotate the message in place")},
{"noinplace", ARG_NOINPLACE, NULL, OPTION_HIDDEN, "" },
{"date", ARG_DATE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Add FIELD: Date header") },
N_("add FIELD: date header") },
{"nodate", ARG_NODATE, NULL, OPTION_HIDDEN, "" },
{"component", ARG_COMPONENT, N_("FIELD"), 0,
N_("Add this FIELD to the message header") },
N_("add this FIELD to the message header") },
{"text", ARG_TEXT, N_("STRING"), 0,
N_("Field value for the component") },
N_("field value for the component") },
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ NULL }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -32,23 +32,23 @@ static char args_doc[] = "[msgs]";
/* GNU options */
static struct argp_option options[] = {
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify folder to operate upon")},
N_("specify folder to operate upon")},
{"inplace", ARG_INPLACE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Replace the source message with the table of contents, insert extracted messages after it") },
N_("replace the source message with the table of contents, insert extracted messages after it") },
{"noinplace", ARG_NOINPLACE, 0, OPTION_HIDDEN, ""},
{"quiet", ARG_QUIET, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Be quiet about the messages that are not in digest format") },
N_("be quiet about the messages that are not in digest format") },
{"noquiet", ARG_NOQUIET, 0, OPTION_HIDDEN, ""},
{"verbose", ARG_VERBOSE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Verbosely list the actions taken") },
N_("verbosely list the actions taken") },
{"noverbose", ARG_NOVERBOSE, 0, OPTION_HIDDEN, ""},
{"recursive", ARG_RECURSIVE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Recursively expand MIME messages") },
N_("recursively expand MIME messages") },
{"norecursive", ARG_NORECURSIVE, 0, OPTION_HIDDEN, ""},
{"length", ARG_LENGTH, N_("NUMBER"), 0,
N_("Set minimal length of digest encapsulation boundary (default 1)") },
N_("set minimal length of digest encapsulation boundary (default 1)") },
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ NULL }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2003, 2005, 2006, 2007,
2008 Free Software Foundation, Inc.
2008, 2009 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -32,32 +32,32 @@ static char args_doc[] = "[msg]";
/* GNU options */
static struct argp_option options[] = {
{"build", ARG_BUILD, 0, 0,
N_("Build the draft and quit immediately.")},
N_("build the draft and quit immediately.")},
{"draftfolder", ARG_DRAFTFOLDER, N_("FOLDER"), 0,
N_("Specify the folder for message drafts")},
N_("specify the folder for message drafts")},
{"nodraftfolder", ARG_NODRAFTFOLDER, 0, 0,
N_("Undo the effect of the last --draftfolder option")},
N_("undo the effect of the last --draftfolder option")},
{"draftmessage" , ARG_DRAFTMESSAGE, N_("MSG"), 0,
N_("Invoke the draftmessage facility")},
N_("invoke the draftmessage facility")},
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify folder to operate upon")},
N_("specify folder to operate upon")},
{"file", ARG_FILE, N_("FILE"), 0,
N_("Use FILE as the message draft")},
N_("use FILE as the message draft")},
{"editor", ARG_EDITOR, N_("PROG"), 0,
N_("Set the editor program to use")},
N_("set the editor program to use")},
{"noedit", ARG_NOEDIT, 0, 0,
N_("Suppress the initial edit")},
N_("suppress the initial edit")},
{"form", ARG_FORM, N_("FILE"), 0,
N_("Read format from given file")},
N_("read format from given file")},
{"whatnowproc", ARG_WHATNOWPROC, N_("PROG"), 0,
N_("* Set the replacement for whatnow program")},
N_("* set the replacement for whatnow program")},
{"nowhatnowproc", ARG_NOWHATNOWPROC, NULL, 0,
N_("* Ignore whatnowproc variable. Use standard `whatnow' shell instead.")},
N_("* ignore whatnowproc variable. Use standard `whatnow' shell instead.")},
{"use", ARG_USE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Use draft file preserved after the last session") },
N_("use draft file preserved after the last session") },
{"nouse", ARG_NOUSE, NULL, OPTION_HIDDEN, ""},
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ 0 }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005,
2006, 2007, 2008 Free Software Foundation, Inc.
2006, 2007, 2008, 2009 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -29,15 +29,15 @@ static char args_doc[] = "";
/* GNU options */
static struct argp_option options[] = {
{"form", ARG_FORM, N_("FILE"), 0,
N_("Read format from given file")},
N_("read format from given file")},
{"format", ARG_FORMAT, N_("FORMAT"), 0,
N_("Use this format string")},
N_("use this format string")},
{"dump", ARG_DUMP, NULL, 0,
N_("Dump the listing of compiled format code")},
N_("dump the listing of compiled format code")},
{ "debug", ARG_DEBUG, NULL, 0,
N_("Enable parser debugging output"),},
N_("enable parser debugging output"),},
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ 0 }
};
......
......@@ -42,47 +42,47 @@ static char args_doc[] = N_("[action] [msg]");
static struct argp_option options[] = {
{N_("Actions are:"), 0, 0, OPTION_DOC, NULL, 0 },
{"print", ARG_PRINT, NULL, 0,
N_("List the folders (default)"), 1 },
N_("list the folders (default)"), 1 },
{"list", ARG_LIST, NULL, 0,
N_("List the contents of the folder stack"), 1},
N_("list the contents of the folder stack"), 1},
{"pack", ARG_PACK, N_("NUMBER"), OPTION_ARG_OPTIONAL,
N_("Remove holes in message numbering. Begin numbering from NUMBER (default: first message number)"), 1},
N_("remove holes in message numbering, begin numbering from NUMBER (default: first message number)"), 1},
{"push", ARG_PUSH, N_("FOLDER"), OPTION_ARG_OPTIONAL,
N_("Push the folder on the folder stack. If FOLDER is specified, it is pushed. "
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 "
"stack are exchanged"), 1},
{"pop", ARG_POP, NULL, 0,
N_("Pop the folder off the folder stack"), 1},
N_("pop the folder off the folder stack"), 1},
{N_("Options are:"), 0, 0, OPTION_DOC, NULL, 2 },
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify folder to operate upon"), 3},
N_("specify folder to operate upon"), 3},
{"all", ARG_ALL, NULL, 0,
N_("List all folders"), 3},
N_("list all folders"), 3},
{"create", ARG_CREATE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Create non-existing folders"), 3},
N_("create non-existing folders"), 3},
{"nocreate", ARG_NOCREATE, NULL, OPTION_HIDDEN, ""},
{"fast", ARG_FAST, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("List only the folder names"), 3},
N_("list only the folder names"), 3},
{"nofast", ARG_NOFAST, NULL, OPTION_HIDDEN, ""},
{"header", ARG_HEADER, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Print the header line"), 3},
N_("print the header line"), 3},
{"noheader", ARG_NOHEADER, NULL, OPTION_HIDDEN, ""},
{"recurse",ARG_RECURSIVE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Scan folders recursively"), 3},
N_("scan folders recursively"), 3},
{"norecurse", ARG_NORECURSIVE, NULL, OPTION_HIDDEN, ""},
{"total", ARG_TOTAL, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Output the total statistics"), 3},
N_("output the total statistics"), 3},
{"nototal", ARG_NOTOTAL, NULL, OPTION_HIDDEN, ""},
{"verbose", ARG_VERBOSE, NULL, 0,
N_("Verbosely list actions taken"), 3},
N_("verbosely list actions taken"), 3},
{"dry-run", ARG_DRY_RUN, NULL, 0,
N_("Do nothing, print what would be done (with --pack)"), 3},
N_("do nothing, print what would be done (with --pack)"), 3},
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{NULL},
};
......
......@@ -30,48 +30,48 @@ static char args_doc[] = "[msgs]";
/* GNU options */
static struct argp_option options[] = {
{"annotate", ARG_ANNOTATE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Add Forwarded: header to each forwarded message")},
N_("add Forwarded: header to each forwarded message")},
{"build", ARG_BUILD, 0, 0,
N_("Build the draft and quit immediately")},
N_("build the draft and quit immediately")},
{"draftfolder", ARG_DRAFTFOLDER, N_("FOLDER"), 0,
N_("Specify the folder for message drafts")},
N_("specify the folder for message drafts")},
{"nodraftfolder", ARG_NODRAFTFOLDER, 0, 0,
N_("Undo the effect of the last --draftfolder option")},
N_("undo the effect of the last --draftfolder option")},
{"draftmessage" , ARG_DRAFTMESSAGE, N_("MSG"), 0,
N_("Invoke the draftmessage facility")},
N_("invoke the draftmessage facility")},
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify folder to operate upon")},
N_("specify folder to operate upon")},
{"editor", ARG_EDITOR, N_("PROG"), 0,
N_("Set the editor program to use")},
N_("set the editor program to use")},
{"noedit", ARG_NOEDIT, 0, 0,
N_("Suppress the initial edit")},
N_("suppress the initial edit")},
{"format", ARG_FORMAT, N_("BOOL"), 0,
N_("Format messages")},
N_("format messages")},
{"noformat", ARG_NOFORMAT, NULL, 0,
N_("Undo the effect of the last --format option") },
N_("undo the effect of the last --format option") },
{"form", ARG_FORM, N_("FILE"), 0,
N_("Read format from given file")},
N_("read format from given file")},
{"filter", ARG_FILTER, N_("FILE"), 0,
N_("Use filter FILE to preprocess the body of the message") },
N_("use filter FILE to preprocess the body of the message") },
{"nofilter", ARG_NOFILTER, NULL, 0,
N_("Undo the effect of the last --filter option") },
N_("undo the effect of the last --filter option") },
{"inplace", ARG_INPLACE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("* Annotate the message in place")},
N_("* annotate the message in place")},
{"noinplace", ARG_NOINPLACE, 0, OPTION_HIDDEN, "" },
{"mime", ARG_MIME, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Use MIME encapsulation") },
N_("use MIME encapsulation") },
{"nomime", ARG_NOMIME, NULL, OPTION_HIDDEN, "" },
{"width", ARG_WIDTH, N_("NUMBER"), 0, N_("Set output width")},
{"whatnowproc", ARG_WHATNOWPROC, N_("PROG"), 0,
N_("* Set the replacement for whatnow program")},
N_("* set the replacement for whatnow program")},
{"nowhatnowproc", ARG_NOWHATNOWPROC, NULL, 0,
N_("* Ignore whatnowproc variable. Use standard `whatnow' shell instead")},
N_("* ignore whatnowproc variable, use standard `whatnow' shell instead")},
{"use", ARG_USE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Use draft file preserved after the last session") },
N_("use draft file preserved after the last session") },
{"nouse", ARG_NOUSE, N_("BOOL"), OPTION_HIDDEN, "" },
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{NULL},
};
......
......@@ -29,29 +29,29 @@ static char args_doc[] = N_("[+folder]");
/* GNU options */
static struct argp_option options[] = {
{"file", ARG_FILE, N_("FILE"), 0,
N_("Incorporate mail from named file")},
N_("incorporate mail from named file")},
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify folder to incorporate mail to")},
N_("specify folder to incorporate mail to")},
{"audit", ARG_AUDIT, N_("FILE"), 0,
N_("Enable audit")},
N_("enable audit")},
{"noaudit", ARG_NOAUDIT, 0, 0,
N_("Disable audit")},
N_("disable audit")},
{"changecur", ARG_CHANGECUR, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Mark first incorporated message as current (default)")},
N_("mark first incorporated message as current (default)")},
{"nochangecur", ARG_NOCHANGECUR, NULL, OPTION_HIDDEN, ""},
{"form", ARG_FORM, N_("FILE"), 0,
N_("Read format from given file")},
N_("read format from given file")},
{"format", ARG_FORMAT, N_("FORMAT"), 0,
N_("Use this format string")},
N_("use this format string")},
{"truncate", ARG_TRUNCATE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Truncate source mailbox after incorporating (default)")},
N_("truncate source mailbox after incorporating (default)")},
{"notruncate", ARG_NOTRUNCATE, NULL, OPTION_HIDDEN, ""},
{"width", ARG_WIDTH, N_("NUMBER"), 0,
N_("Set output width")},
N_("set output width")},
{"quiet", ARG_QUIET, 0, 0,
N_("Be quiet")},
N_("be quiet")},
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ 0 }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
Copyright (C) 2003, 2007, 2008, 2009 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -25,10 +25,10 @@ static char args_doc[] = "";
/* GNU options */
static struct argp_option options[] = {
{"auto", ARG_AUTO, NULL, 0, N_("Do not ask for anything")},
{"auto", ARG_AUTO, NULL, 0, N_("do not ask for anything")},
{"compat", ARG_COMPAT, NULL, OPTION_HIDDEN, ""},
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{NULL}
};
......
......@@ -27,23 +27,23 @@ static char args_doc[] = "[msgs...]";
/* GNU options */
static struct argp_option options[] = {
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify folder to operate upon")},
N_("specify folder to operate upon")},
{"sequence", ARG_SEQUENCE, N_("NAME"), 0,
N_("Specify sequence name to operate upon")},
N_("specify sequence name to operate upon")},
{"add", ARG_ADD, NULL, 0,
N_("Add messages to the sequence")},
N_("add messages to the sequence")},
{"delete", ARG_DELETE, NULL, 0,
N_("Delete messages from the sequence")},
N_("delete messages from the sequence")},
{"list", ARG_LIST, NULL, 0,
N_("List the sequences")},
N_("list the sequences")},
{"public", ARG_PUBLIC, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Create public sequence")},
N_("create public sequence")},
{"nopublic", ARG_NOPUBLIC, NULL, OPTION_HIDDEN, "" },
{"zero", ARG_ZERO, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Empty the sequence before adding messages")},
N_("empty the sequence before adding messages")},
{"nozero", ARG_NOZERO, NULL, OPTION_HIDDEN, "" },
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{NULL}
};
......
......@@ -284,7 +284,9 @@ mh_check_folder (const char *pathname, int confirm)
{
if (errno == ENOENT)
{
if (!confirm || mh_getyn (_("create folder \"%s\""), p))
/* TRANSLATORS: This is a question and will be followed
by question mark on output. */
if (!confirm || mh_getyn (_("Create folder \"%s\""), p))
return mh_makedir (p);
else
return 1;
......@@ -642,7 +644,7 @@ _file_to_message (const char *file_name)
if (stat (file_name, &st) < 0)
{
mu_error (_("cannot stat file %s: %s"), file_name, strerror (errno));
mu_diag_funcall (MU_DIAG_ERROR, "stat", file_name, errno);
return NULL;
}
......@@ -709,14 +711,20 @@ mh_real_install (char *name, int automode)
{
size_t n = 0;
/* TRANSLATORS: This is a question and will be followed
by question mark on output. */
if (mh_getyn_interactive (_("Do you need help")))
mh_install_help (mhdir);
/* TRANSLATORS: This is a question and will be followed
by question mark on output. */
if (!mh_getyn_interactive (_("Do you want the standard MH path \"%s\""), mhdir))
{
int local;
char *p;
/* TRANSLATORS: This is a question and will be followed
by question mark on output. */
local = mh_getyn_interactive (_("Do you want a path below your login directory"));
if (local)
printf (_("What is the path? "));
......
......@@ -30,25 +30,25 @@ static char args_doc[] = N_("[files]");
/* GNU options */
static struct argp_option options[] = {
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify folder to operate upon")},
N_("specify folder to operate upon")},
{ "bell", ARG_BELL, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Ring the bell at the end of each output page") },
N_("ring the bell at the end of each output page") },
{"nobell", ARG_NOBELL, NULL, OPTION_HIDDEN, "" },
{ "clear", ARG_CLEAR, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Clear the screen after each page of output")},
N_("clear the screen after each page of output")},
{"noclear", ARG_NOCLEAR, NULL, OPTION_HIDDEN, "" },
{"form", ARG_FORM, N_("FILE"), 0,
N_("Read format from given file")},
N_("read format from given file")},
{"width", ARG_WIDTH, N_("NUMBER"), 0,
N_("Set output width")},
N_("set output width")},
{"length", ARG_LENGTH, N_("NUMBER"), 0,
N_("Set output screen length")},
N_("set output screen length")},
{"moreproc", ARG_MOREPROC, N_("PROG"), 0,
N_("Use given PROG instead of the default") },
N_("use given PROG instead of the default") },
{"nomoreproc", ARG_NOMOREPROC, NULL, 0,
N_("Disable use of moreproc program") },
N_("disable use of moreproc program") },
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ NULL }
};
......
......@@ -34,59 +34,59 @@ static char args_doc[] = "[msgs]";
static struct argp_option options[] = {
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify folder to operate upon"), 0},
N_("specify folder to operate upon"), 0},
{"file", ARG_FILE, N_("FILE"), 0,
N_("Specify file to operate upon"), 0},
N_("specify file to operate upon"), 0},
{N_("MIME editing options"), 0, NULL, OPTION_DOC, NULL, 5},
{"compose", ARG_COMPOSE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Compose the MIME message (default)"), 6},
N_("compose the MIME message (default)"), 6},
{"nocompose", ARG_NOCOMPOSE, NULL, OPTION_HIDDEN, "", 6},
{N_("Listing options"), 0, NULL, OPTION_DOC, NULL, 0},
{"list", ARG_LIST, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("List the table of contents"), 11 },
N_("list the table of contents"), 11 },
{"nolist", ARG_NOLIST, NULL, OPTION_HIDDEN, "", 11 },
{"headers", ARG_HEADER, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Print the banner above the listing"), 12},
N_("print the banner above the listing"), 12},
{"noheaders", ARG_NOHEADERS, NULL, OPTION_HIDDEN, "", 12 },
{"realsize", ARG_REALSIZE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("List the decoded sizes"), 12},
N_("list the decoded sizes"), 12},
{"norealsize", ARG_NOREALSIZE, NULL, OPTION_HIDDEN, "", 12 },
{N_("Display options"), 0, NULL, OPTION_DOC, NULL, 20},
{"show", ARG_SHOW, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Display the contents of the messages"), 21},
N_("display the contents of the messages"), 21},
{"noshow", ARG_NOSHOW, NULL, OPTION_HIDDEN, "", 21 },
{"serialonly", ARG_SERIALONLY, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("* Display messages serially"), 22},
N_("* display messages serially"), 22},
{"noserialonly", ARG_NOSERIALONLY, NULL, OPTION_HIDDEN, "", 22 },
{"form", ARG_FORM, N_("FILE"), 0,
N_("Read mhl format from FILE"), 22},
N_("read mhl format from FILE"), 22},
{"pause", ARG_PAUSE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Pause prior to displaying content"), 22},
N_("pause prior to displaying content"), 22},
{"nopause", ARG_NOPAUSE, NULL, OPTION_HIDDEN, "", 22 },
{N_("Saving options"), 0, NULL, OPTION_DOC, NULL, 30},
{"store", ARG_STORE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Store the contents of the messages on disk"), 31},
N_("store the contents of the messages on disk"), 31},
{"nostore", ARG_NOSTORE, NULL, OPTION_HIDDEN, "", 31 },
{"auto", ARG_AUTO, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Use filenames from the content headers"), 31},
N_("use filenames from the content headers"), 31},
{"noauto", ARG_NOAUTO, NULL, OPTION_HIDDEN, "", 31 },
{N_("Other options"), 0, NULL, OPTION_DOC, NULL, 40},
{"part", ARG_PART, N_("PART"), 0,
N_("Limit the scope of the operation to the given part"), 41},
N_("limit the scope of the operation to the given part"), 41},
{"type", ARG_TYPE, N_("CONTENT"), 0,
N_("Operate on message part with given multipart content"), 41 },
N_("operate on message part with given multipart content"), 41 },
{"verbose", ARG_VERBOSE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Print additional information"), 41 },
N_("print additional information"), 41 },
{"noverbose", ARG_NOVERBOSE, NULL, OPTION_HIDDEN, "", 41 },
{"quiet", ARG_QUIET, 0, 0,
N_("Be quiet")},
N_("be quiet")},
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{NULL}
};
......
......@@ -28,11 +28,11 @@ static char args_doc[] = N_("[components]");
/* GNU options */
static struct argp_option options[] = {
{"all", ARG_ALL, NULL, 0,
N_("Display all components from the MH profile. All other arguments are ignored")},
N_("display all components from the MH profile. All other arguments are ignored")},
{"component", ARG_COMPONENT, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Always display the component name") },
N_("always display the component name") },
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ 0 }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2002, 2005, 2007, 2008 Free Software Foundation, Inc.
Copyright (C) 2002, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -28,9 +28,9 @@ static char args_doc[] = N_("[+folder] [msgs]");
/* GNU options */
static struct argp_option options[] = {
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify folder to operate upon")},
N_("specify folder to operate upon")},
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ 0 }
};
......
......@@ -36,63 +36,63 @@ static char args_doc[] = N_("[messages]");
/* GNU options */
static struct argp_option options[] = {
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify folder to operate upon"), 0},
N_("specify folder to operate upon"), 0},
{N_("Specifying search patterns:"), 0, NULL, OPTION_DOC, NULL, 0},
{"component", ARG_COMPONENT, N_("FIELD"), 0,
N_("Search the named header field"), 1},
N_("search the named header field"), 1},
{"pattern", ARG_PATTERN, N_("STRING"), 0,
N_("A pattern to look for"), 1},
N_("set pattern to look for"), 1},
{"search", 0, NULL, OPTION_ALIAS, NULL, 1},
{"cflags", ARG_CFLAGS, N_("STRING"), 0,
N_("Flags controlling the type of regular expressions. STRING must consist of one or more of the following letters: B=basic, E=extended, I=ignore case, C=case sensitive. Default is \"EI\". The flags remain in effect until the next occurrence of --cflags option. The option must occur right before --pattern or --component option (or its alias).") },
N_("flags controlling the type of regular expressions. STRING must consist of one or more of the following letters: B=basic, E=extended, I=ignore case, C=case sensitive. Default is \"EI\". The flags remain in effect until the next occurrence of --cflags option. The option must occur right before --pattern or --component option (or its alias).") },
{"cc", ARG_CC, N_("STRING"), 0,
N_("Same as --component cc --pattern STRING"), 1},
N_("same as --component cc --pattern STRING"), 1},
{"date", ARG_DATE, N_("STRING"), 0,
N_("Same as --component date --pattern STRING"), 1},
N_("same as --component date --pattern STRING"), 1},
{"from", ARG_FROM, N_("STRING"), 0,
N_("Same as --component from --pattern STRING"), 1},
N_("same as --component from --pattern STRING"), 1},
{"subject", ARG_SUBJECT, N_("STRING"), 0,
N_("Same as --component subject --pattern STRING"), 1},
N_("same as --component subject --pattern STRING"), 1},
{"to", ARG_TO, N_("STRING"), 0,
N_("Same as --component to --pattern STRING"), 1},
N_("same as --component to --pattern STRING"), 1},
{N_("Date constraint operations:"), 0, NULL, OPTION_DOC, NULL, 1},
{"datefield",ARG_DATEFIELD, N_("STRING"), 0,
N_("Search in the named date header field (default is `Date:')"), 2},
N_("search in the named date header field (default is `Date:')"), 2},
{"after", ARG_AFTER, N_("DATE"), 0,
N_("Match messages after the given date"), 2},
N_("match messages after the given date"), 2},
{"before", ARG_BEFORE, N_("DATE"), 0,
N_("Match messages before the given date"), 2},
N_("match messages before the given date"), 2},
{N_("Logical operations and grouping:"), 0, NULL, OPTION_DOC, NULL, 2},
{"and", ARG_AND, NULL, 0,
N_("Logical AND (default)"), 3 },
N_("logical AND (default)"), 3 },
{"or", ARG_OR, NULL, 0,
N_("Logical OR"), 3 },
N_("logical OR"), 3 },
{"not", ARG_NOT, NULL, 0,
N_("Logical NOT"), 3},
N_("logical NOT"), 3},
{"lbrace", ARG_LBRACE, NULL, 0,
N_("Open group"), 3},
N_("open group"), 3},
{"(", 0, NULL, OPTION_ALIAS, NULL, 3},
{"rbrace", ARG_RBRACE, NULL, 0,
N_("Close group"), 3},
N_("close group"), 3},
{")", 0, NULL, OPTION_ALIAS, NULL, 3},
{N_("Operations over the selected messages:"), 0, NULL, OPTION_DOC, NULL, 3},
{"list", ARG_LIST, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("List the numbers of the selected messages (default)"), 4},
N_("list the numbers of the selected messages (default)"), 4},
{"nolist", ARG_NOLIST, NULL, OPTION_HIDDEN, "", 4 },
{"sequence", ARG_SEQUENCE, N_("NAME"), 0,
N_("Add matching messages to the given sequence"), 4},
N_("add matching messages to the given sequence"), 4},
{"public", ARG_PUBLIC, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Create public sequence"), 4},
N_("create public sequence"), 4},
{"nopublic", ARG_NOPUBLIC, NULL, OPTION_HIDDEN, "", 4 },
{"zero", ARG_ZERO, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Empty the sequence before adding messages"), 4},
N_("empty the sequence before adding messages"), 4},
{"nozero", ARG_NOZERO, NULL, OPTION_HIDDEN, "", 4 },
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{NULL},
};
......
......@@ -35,20 +35,20 @@ static char args_doc[] = N_("messages folder [folder...]");
/* GNU options */
static struct argp_option options[] = {
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify folder to operate upon")},
N_("specify folder to operate upon")},
{"draft", ARG_DRAFT, NULL, 0,
N_("Use <mh-dir>/draft as the source message")},
N_("use <mh-dir>/draft as the source message")},
{"copy", ARG_LINK, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Preserve the source folder copy")},
N_("preserve the source folder copy")},
{"link", 0, NULL, OPTION_ALIAS, NULL},
{"preserve", ARG_PRESERVE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("* Try to preserve message sequence numbers")},
N_("* try to preserve message sequence numbers")},
{"source", ARG_SOURCE, N_("FOLDER"), 0,
N_("Specify source folder. FOLDER will become the current folder after the program exits")},
N_("specify source folder; it will become the current folder after the program exits")},
{"src", 0, NULL, OPTION_ALIAS, NULL},
{"file", ARG_FILE, N_("FILE"), 0, N_("Use FILE as the source message")},
{"file", ARG_FILE, N_("FILE"), 0, N_("use FILE as the source message")},
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ 0 }
};
......@@ -82,6 +82,7 @@ add_folder (const char *folder)
void
open_folders ()
{
int rc;
mu_iterator_t itr;
if (!folder_name_list)
......@@ -90,15 +91,15 @@ open_folders ()
exit (1);
}
if (mu_list_create (&folder_mbox_list))
if ((rc = mu_list_create (&folder_mbox_list)) != 0)
{
mu_error (_("cannot create folder list"));
mu_diag_funcall (MU_DIAG_ERROR, "mu_list_create", NULL, rc);
exit (1);
}
if (mu_list_get_iterator (folder_name_list, &itr))
if ((rc = mu_list_get_iterator (folder_name_list, &itr)) != 0)
{
mu_error (_("cannot create iterator"));
mu_diag_funcall (MU_DIAG_ERROR, "mu_list_get_iterator", NULL, rc);
exit (1);
}
......
......@@ -34,42 +34,42 @@ static char args_doc[] = N_("[+folder] [msg]");
/* GNU options */
static struct argp_option options[] = {
{"annotate", ARG_ANNOTATE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Add Replied: header to the message being replied to")},
N_("add Replied: header to the message being replied to")},
{"build", ARG_BUILD, 0, 0,
N_("Build the draft and quit immediately.")},
N_("build the draft and quit immediately")},
{"draftfolder", ARG_DRAFTFOLDER, N_("FOLDER"), 0,
N_("Specify the folder for message drafts")},
N_("specify the folder for message drafts")},
{"nodraftfolder", ARG_NODRAFTFOLDER, 0, 0,
N_("Undo the effect of the last --draftfolder option")},
N_("undo the effect of the last --draftfolder option")},
{"draftmessage" , ARG_DRAFTMESSAGE, N_("MSG"), 0,
N_("Invoke the draftmessage facility")},
N_("invoke the draftmessage facility")},
{"cc", ARG_CC, "{all|to|cc|me}", 0,
N_("Specify whom to place on the Cc: list of the reply")},
N_("specify whom to place on the Cc: list of the reply")},
{"nocc", ARG_NOCC, "{all|to|cc|me}", 0,
N_("Specify whom to remove from the Cc: list of the reply")},
{"folder", ARG_FOLDER, N_("FOLDER"), 0, N_("Specify folder to operate upon")},
N_("specify whom to remove from the Cc: list of the reply")},
{"folder", ARG_FOLDER, N_("FOLDER"), 0, N_("specify folder to operate upon")},
{"group", ARG_GROUP, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Construct a group or followup reply") },
{"editor", ARG_EDITOR, N_("PROG"), 0, N_("Set the editor program to use")},
{"noedit", ARG_NOEDIT, 0, 0, N_("Suppress the initial edit")},
{"fcc", ARG_FCC, N_("FOLDER"), 0, N_("Set the folder to receive Fcc's")},
N_("construct a group or followup reply") },
{"editor", ARG_EDITOR, N_("PROG"), 0, N_("set the editor program to use")},
{"noedit", ARG_NOEDIT, 0, 0, N_("suppress the initial edit")},
{"fcc", ARG_FCC, N_("FOLDER"), 0, N_("set the folder to receive Fcc's")},
{"filter", ARG_FILTER, N_("MHL-FILTER"), 0,
N_("Set the mhl filter to preprocess the body of the message being replied")},
{"form", ARG_FORM, N_("FILE"), 0, N_("Read format from given file")},
N_("set the mhl filter to preprocess the body of the message being replied")},
{"form", ARG_FORM, N_("FILE"), 0, N_("read format from given file")},
{"format", ARG_FORMAT, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Include a copy of the message being replied. The message will be processed using either the default filter \"mhl.reply\", or the filter specified by --filter option") },
N_("include a copy of the message being replied; the message will be processed using either the default filter \"mhl.reply\", or the filter specified by --filter option") },
{"inplace", ARG_INPLACE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("* Annotate the message in place")},
N_("* annotate the message in place")},
{"query", ARG_QUERY, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Query for addresses to place in To: and Cc: lists")},
{"width", ARG_WIDTH, N_("NUMBER"), 0, N_("Set output width")},
N_("query for addresses to place in To: and Cc: lists")},
{"width", ARG_WIDTH, N_("NUMBER"), 0, N_("set output width")},
{"whatnowproc", ARG_WHATNOWPROC, N_("PROG"), 0,
N_("* Set the replacement for whatnow program")},
N_("* set the replacement for whatnow program")},
{"nowhatnowproc", ARG_NOWHATNOWPROC, NULL, 0,
N_("* Ignore whatnowproc variable. Use standard `whatnow' shell instead.")},
{"use", ARG_USE, N_("BOOL"), OPTION_ARG_OPTIONAL, N_("Use draft file preserved after the last session") },
N_("* ignore whatnowproc variable; use standard `whatnow' shell instead")},
{"use", ARG_USE, N_("BOOL"), OPTION_ARG_OPTIONAL, N_("use draft file preserved after the last session") },
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ 0 }
};
......
......@@ -38,15 +38,15 @@ static char args_doc[] = N_("[+folder]");
/* GNU options */
static struct argp_option options[] = {
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify the folder to delete")},
N_("specify the folder to delete")},
{"interactive", ARG_INTERACTIVE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Interactive mode: ask for confirmation before removing each folder")},
N_("interactive mode: ask for confirmation before removing each folder")},
{"nointeractive", ARG_NOINTERACTIVE, NULL, OPTION_HIDDEN, ""},
{"recursive", ARG_RECURSIVE, NULL, 0,
N_("Recursively delete all subfolders")},
N_("recursively delete all subfolders")},
{"norecursive", ARG_NORECURSIVE, NULL, OPTION_HIDDEN, ""},
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ 0 }
};
......@@ -160,7 +160,7 @@ rmf (const char *name)
{
if (unlink (p))
{
mu_error (_("cannot unlink %s: %s"), p, strerror (errno));
mu_diag_funcall (MU_DIAG_ERROR, "unlink", p, errno);
failures++;
}
}
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2002, 2005, 2007, 2008 Free Software Foundation, Inc.
Copyright (C) 2002, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -28,9 +28,9 @@ static char args_doc[] = N_("[+folder] [msgs]");
/* GNU options */
static struct argp_option options[] = {
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify folder to operate upon")},
N_("specify folder to operate upon")},
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ 0 }
};
......
......@@ -36,26 +36,26 @@ static char args_doc[] = N_("[+folder] [msgs]");
/* GNU options */
static struct argp_option options[] = {
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify folder to scan")},
N_("specify folder to scan")},
{"clear", ARG_CLEAR, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Clear screen after displaying the list")},
N_("clear screen after displaying the list")},
{"noclear", ARG_NOCLEAR, NULL, OPTION_HIDDEN, ""},
{"form", ARG_FORM, N_("FILE"), 0,
N_("Read format from given file")},
N_("read format from given file")},
{"format", ARG_FORMAT, N_("FORMAT"), 0,
N_("Use this format string")},
N_("use this format string")},
{"header", ARG_HEADER, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Display header")},
N_("display header")},
{"width", ARG_WIDTH, N_("NUMBER"), 0,
N_("Set output width")},
N_("set output width")},
{"reverse", ARG_REVERSE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("List messages in reverse order")},
N_("list messages in reverse order")},
{"noreverse", ARG_NOREVERSE, NULL, OPTION_HIDDEN, ""},
{"file", ARG_FILE, N_("FILE"), 0,
N_("[Not yet implemented]")},
N_("[not yet implemented]")},
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ 0 }
};
......
......@@ -34,51 +34,51 @@ static char args_doc[] = N_("file [file...]");
/* GNU options */
static struct argp_option options[] = {
{"alias", ARG_ALIAS, N_("FILE"), 0,
N_("Specify additional alias file") },
N_("specify additional alias file") },
{"draft", ARG_DRAFT, NULL, 0,
N_("Use prepared draft") },
N_("use prepared draft") },
{"draftfolder", ARG_DRAFTFOLDER, N_("FOLDER"), 0,
N_("Specify the folder for message drafts") },
N_("specify the folder for message drafts") },
{"draftmessage", ARG_DRAFTMESSAGE, NULL, 0,
N_("Treat the arguments as a list of messages from the draftfolder") },
N_("treat the arguments as a list of messages from the draftfolder") },
{"nodraftfolder", ARG_NODRAFTFOLDER, NULL, 0,
N_("Undo the effect of the last --draftfolder option") },
N_("undo the effect of the last --draftfolder option") },
{"filter", ARG_FILTER, N_("FILE"), 0,
N_("* Use filter FILE to preprocess the body of the message") },
N_("* use filter FILE to preprocess the body of the message") },
{"nofilter", ARG_NOFILTER, NULL, 0,
N_("* Undo the effect of the last --filter option") },
N_("* undo the effect of the last --filter option") },
{"format", ARG_FORMAT, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("* Reformat To: and Cc: addresses") },
N_("* reformat To: and Cc: addresses") },
{"noformat", ARG_NOFORMAT, NULL, OPTION_HIDDEN, "" },
{"forward", ARG_FORWARD, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("* In case of failure forward the draft along with the failure notice to the sender") },
N_("* in case of failure forward the draft along with the failure notice to the sender") },
{"noforward", ARG_NOFORWARD, NULL, OPTION_HIDDEN, "" },
{"mime", ARG_MIME, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("* Use MIME encapsulation") },
N_("* use MIME encapsulation") },
{"nomime", ARG_NOMIME, NULL, OPTION_HIDDEN, "" },
{"msgid", ARG_MSGID, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Add Message-ID: field") },
N_("add Message-ID: field") },
{"nomsgid", ARG_NOMSGID, NULL, OPTION_HIDDEN, ""},
{"push", ARG_PUSH, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Run in the backround.") },
N_("run in the backround") },
{"nopush", ARG_NOPUSH, NULL, OPTION_HIDDEN, "" },
{"preserve", ARG_PRESERVE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Keep draft files") },
N_("keep draft files") },
{"keep", 0, NULL, OPTION_ALIAS, NULL},
{"split", ARG_SPLIT, N_("SECONDS"), 0,
N_("Split the draft into several partial messages and send them with SECONDS interval") },
N_("split the draft into several partial messages and send them with SECONDS interval") },
{"chunksize", ARG_CHUNKSIZE, N_("NUMBER"), 0,
N_("Set the size of chunk for --split (in bytes)") },
N_("set the size of chunk for --split (in bytes)") },
{"verbose", ARG_VERBOSE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Print the transcript of interactions with the transport system") },
N_("print the transcript of interactions with the transport system") },
{"noverbose", ARG_NOVERBOSE, NULL, OPTION_HIDDEN, "" },
{"watch", ARG_WATCH, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Monitor the delivery of mail") },
N_("monitor the delivery of mail") },
{"nowatch", ARG_NOWATCH, NULL, OPTION_HIDDEN, "" },
{"width", ARG_WIDTH, N_("NUMBER"), 0,
N_("* Make header fields no longer than NUMBER columns") },
N_("* make header fields no longer than NUMBER columns") },
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ 0 }
};
......@@ -610,7 +610,7 @@ backup_file (const char *file_name)
WATCH ((_("Renaming %s to %s"), file_name, new_name));
if (unlink (new_name) && errno != ENOENT)
mu_error (_("cannot unlink file `%s': %s"), new_name, mu_strerror (errno));
mu_diag_funcall (MU_DIAG_ERROR, "unlink", new_name, errno);
else if (rename (file_name, new_name))
mu_error (_("cannot rename `%s' to `%s': %s"),
file_name, new_name, mu_strerror (errno));
......
......@@ -35,49 +35,49 @@ static char args_doc[] = N_("[msgs]");
/* GNU options */
static struct argp_option options[] = {
{"folder", ARG_FOLDER, N_("FOLDER"), 0,
N_("Specify folder to operate upon")},
N_("specify folder to operate upon")},
{N_("Setting sort keys:"), 0, NULL, OPTION_DOC, NULL, 0},
{"datefield", ARG_DATEFIELD, N_("STRING"), 0,
N_("Sort on the date field (default `Date:')"), 10},
N_("sort on the date field (default `Date:')"), 10},
{"nodatefield", ARG_NODATEFIELD, NULL, 0,
N_("Undo the effect of the last --datefield option"), 10},
N_("undo the effect of the last --datefield option"), 10},
{"limit", ARG_LIMIT, N_("DAYS"), 0,
N_("Consider two datefields equal if their difference lies within the given nuber of DAYS."), 11},
N_("consider two datefields equal if their difference lies within the given nuber of DAYS."), 11},
{"nolimit", ARG_NOLIMIT, NULL, 0,
N_("Undo the effect of the last --limit option"), 11},
N_("undo the effect of the last --limit option"), 11},
{"textfield", ARG_TEXTFIELD, N_("STRING"), 0,
N_("Sort on the text field"), 15},
N_("sort on the text field"), 15},
{"notextfield", ARG_NOTEXTFIELD, NULL, 0,
N_("Undo the effect of the last --textfield option"), 15},
N_("undo the effect of the last --textfield option"), 15},
{"numfield", ARG_NUMFIELD, N_("STRING"), 0,
N_("Sort on the numeric field"), 16},
N_("sort on the numeric field"), 16},
{N_("Actions:"), 0, NULL, OPTION_DOC, NULL, 16},
{"reorder", ARG_REORDER, 0, 0,
N_("Reorder the messages (default)"), 20 },
N_("reorder the messages (default)"), 20 },
{"dry-run", ARG_DRY_RUN, 0, 0,
N_("Do not do anything, only show what would have been done"), 20 },
N_("do not do anything, only show what would have been done"), 20 },
{"list", ARG_LIST, 0, 0,
N_("List the sorted messages"), 20 },
N_("list the sorted messages"), 20 },
{"form", ARG_FORM, N_("FILE"), 0,
N_("Read format from given file"), 23},
N_("read format from given file"), 23},
{"format", ARG_FORMAT, N_("FORMAT"), 0,
N_("Use this format string"), 23},
N_("use this format string"), 23},
{"verbose", ARG_VERBOSE, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Verbosely list executed actions"), 30 },
N_("verbosely list executed actions"), 30 },
{"noverbose", ARG_NOVERBOSE, NULL, OPTION_HIDDEN, "" },
{N_("Select sort algorithm:"), 0, NULL, OPTION_DOC, NULL, 30},
{"shell", ARG_SHELL, 0, 0,
N_("Use shell algorithm"), 40 },
N_("use shell algorithm"), 40 },
{"quicksort", ARG_QUICKSORT, 0, 0,
N_("Use quicksort algorithm (default)"), 40 },
N_("use quicksort algorithm (default)"), 40 },
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ NULL },
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2003, 2008 Free Software Foundation, Inc.
Copyright (C) 2003, 2008, 2009 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -27,17 +27,17 @@ static char args_doc[] = N_("[FILE]");
/* GNU options */
static struct argp_option options[] = {
{"draftfolder", ARG_DRAFTFOLDER, N_("FOLDER"), 0,
N_("Specify the folder for message drafts")},
N_("specify the folder for message drafts")},
{"nodraftfolder", ARG_NODRAFTFOLDER, 0, 0,
N_("Undo the effect of the last --draftfolder option")},
N_("undo the effect of the last --draftfolder option")},
{"draftmessage" , ARG_DRAFTMESSAGE, N_("MSG"), 0,
N_("Invoke the draftmessage facility")},
{"editor", ARG_EDITOR, N_("PROG"), 0, N_("Set the editor program to use")},
{"noedit", ARG_NOEDIT, 0, 0, N_("Suppress the initial edit")},
{"prompt", ARG_PROMPT, N_("STRING"), 0, N_("Set the prompt")},
N_("invoke the draftmessage facility")},
{"editor", ARG_EDITOR, N_("PROG"), 0, N_("set the editor program to use")},
{"noedit", ARG_NOEDIT, 0, 0, N_("suppress the initial edit")},
{"prompt", ARG_PROMPT, N_("STRING"), 0, N_("set the prompt")},
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{ NULL }
};
......
/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc.
Copyright (C) 2003, 2007, 2008, 2009 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -26,21 +26,21 @@ static char args_doc[] = "[file]";
/* GNU options */
static struct argp_option options[] = {
{"alias", ARG_ALIAS, N_("FILE"), 0,
N_("Specify additional alias file") },
N_("specify additional alias file") },
{"draft", ARG_DRAFT, NULL, 0,
N_("Use prepared draft") },
N_("use prepared draft") },
{"draftfolder", ARG_DRAFTFOLDER, N_("FOLDER"), 0,
N_("Specify the folder for message drafts") },
N_("specify the folder for message drafts") },
{"draftmessage", ARG_DRAFTMESSAGE, NULL, 0,
N_("Treat the arguments as a list of messages from the draftfolder") },
N_("treat the arguments as a list of messages from the draftfolder") },
{"nodraftfolder", ARG_NODRAFTFOLDER, NULL, 0,
N_("Undo the effect of the last --draftfolder option") },
N_("undo the effect of the last --draftfolder option") },
{"check", ARG_CHECK, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Check if addresses are deliverable") },
N_("check if addresses are deliverable") },
{"nocheck", ARG_NOCHECK, NULL, OPTION_HIDDEN, "" },
{"license", ARG_LICENSE, 0, 0,
N_("Display software license"), -1},
N_("display software license"), -1},
{NULL}
};
......
......@@ -43,18 +43,18 @@ N_("\n\nDebug flags are:\n\
static struct argp_option options[] = {
{"no-ask", 'a', N_("TYPE-LIST"), OPTION_ARG_OPTIONAL,
N_("Do not ask for confirmation before displaying files. If TYPE-LIST is given, do not ask for confirmation before displaying such files whose MIME type matches one of the patterns from TYPE-LIST"), 0},
N_("do not ask for confirmation before displaying files, or, if TYPE-LIST is given, do not ask for confirmation before displaying such files whose MIME type matches one of the patterns from TYPE-LIST"), 0},
{"no-interactive", 'h', NULL, 0,
N_("Disable interactive mode"), 0 },
N_("disable interactive mode"), 0 },
{"print", 0, NULL, OPTION_ALIAS, NULL, 0 },
{"debug", 'd', N_("FLAGS"), OPTION_ARG_OPTIONAL,
N_("Enable debugging output"), 0},
N_("enable debugging output"), 0},
{"mimetypes", 't', N_("FILE"), 0,
N_("Use this mime.types file"), 0},
N_("use this mime.types file"), 0},
{"dry-run", 'n', NULL, 0,
N_("Do not do anything, just print what whould be done"), 0},
N_("do not do anything, just print what whould be done"), 0},
{"metamail", OPT_METAMAIL, N_("FILE"), OPTION_ARG_OPTIONAL,
N_("Use metamail to display files"), 0},
N_("use metamail to display files"), 0},
{0, 0, 0, 0}
};
......
......@@ -40,17 +40,17 @@ static char args_doc[] = N_("inbox-url destfile [POP-password]");
#define OPT_EMACS 256
static struct argp_option options[] = {
{ "preserve", 'p', NULL, 0, N_("Preserve the source mailbox") },
{ "preserve", 'p', NULL, 0, N_("preserve the source mailbox") },
{ "keep-messages", 0, NULL, OPTION_ALIAS, NULL },
{ "reverse", 'r', NULL, 0, N_("Reverse the sorting order") },
{ "reverse", 'r', NULL, 0, N_("reverse the sorting order") },
{ "emacs", OPT_EMACS, NULL, 0,
N_("Output information used by Emacs rmail interface") },
N_("output information used by Emacs rmail interface") },
{ "uidl", 'u', NULL, 0,
N_("Use UIDLs to avoid downloading the same message twice") },
N_("use UIDLs to avoid downloading the same message twice") },
{ "verbose", 'v', NULL, 0,
N_("Increase verbosity level") },
N_("increase verbosity level") },
{ "owner", 'P', N_("MODELIST"), 0,
N_("Control mailbox ownership") },
N_("control mailbox ownership") },
{ NULL, 0, NULL, 0, NULL, 0 }
};
......@@ -431,7 +431,7 @@ move_message (mu_mailbox_t src, mu_mailbox_t dst, size_t msgno)
}
if ((rc = mu_mailbox_append_message (dst, msg)) != 0)
{
mu_error (_("cannot append message %lu: %s\n"),
mu_error (_("cannot append message %lu: %s"),
(unsigned long) msgno, mu_strerror (rc));
return rc;
}
......@@ -498,8 +498,7 @@ get_mbox_owner_id (mu_mailbox_t mbox, mu_url_t url, struct user_id *id)
die (mbox, _("cannot get path"), rc);
if (stat (s, &st))
{
mu_error (_("cannot stat mailbox `%s': %s"), s,
mu_strerror (errno));
mu_diag_funcall (MU_DIAG_ERROR, "stat", s, errno);
exit (1);
}
id->uid = st.st_uid;
......@@ -551,7 +550,10 @@ guess_mbox_owner (mu_mailbox_t mbox, struct user_id *id)
rc = mu_mailbox_get_url (mbox, &url);
if (rc)
die (mbox, _("cannot get url"), rc);
{
mu_diag_funcall (MU_DIAG_ERROR, "mu_mailbox_get_url", NULL, rc);
exit (1);
}
rc = 1;
for (meth = so_methods; rc == 1 && meth < so_methods + so_method_num; meth++)
......@@ -772,7 +774,7 @@ main (int argc, char **argv)
if (src_uidl_list && !msgno_in_list (src_uidl_list, i))
{
if (verbose_option > 1)
mu_diag_output (MU_DIAG_INFO, _("Ignoring message %lu"),
mu_diag_output (MU_DIAG_INFO, _("ignoring message %lu"),
(unsigned long) i);
continue;
}
......
......@@ -67,41 +67,41 @@ static char doc[] = N_("GNU pop3d -- the POP3 daemon");
static struct argp_option options[] = {
#define GRP 0
{ "foreground", OPT_FOREGROUND, 0, 0, N_("Remain in foreground."), GRP+1},
{ "inetd", 'i', 0, 0, N_("Run in inetd mode"), GRP+1},
{ "foreground", OPT_FOREGROUND, 0, 0, N_("remain in foreground"), GRP+1},
{ "inetd", 'i', 0, 0, N_("run in inetd mode"), GRP+1},
{ "daemon", 'd', N_("NUMBER"), OPTION_ARG_OPTIONAL,
N_("Runs in daemon mode with a maximum of NUMBER children"), GRP+1 },
N_("runs in daemon mode with a maximum of NUMBER children"), GRP+1 },
#undef GRP
#define GRP 5
{"undelete", 'u', NULL, OPTION_HIDDEN,
N_("Undelete all messages on startup"), GRP+1},
N_("undelete all messages on startup"), GRP+1},
{"expire", OPT_EXPIRE, N_("DAYS"), OPTION_HIDDEN,
N_("Expire read messages after the given number of days"), GRP+1},
N_("expire read messages after the given number of days"), GRP+1},
{"delete-expired", OPT_EXPIRE_ON_EXIT, NULL, OPTION_HIDDEN,
N_("Delete expired messages upon closing the mailbox"), GRP+1},
N_("delete expired messages upon closing the mailbox"), GRP+1},
#ifdef WITH_TLS
{"tls-required", OPT_TLS_REQUIRED, NULL, OPTION_HIDDEN,
N_("Always require STLS before entering authentication phase")},
N_("always require STLS before entering authentication phase")},
#endif
#undef GRP
#define GRP 10
#ifdef ENABLE_LOGIN_DELAY
{"login-delay", OPT_LOGIN_DELAY, N_("SECONDS"), OPTION_HIDDEN,
N_("Allowed delay between two successive logins"), GRP+1},
N_("allowed delay between two successive logins"), GRP+1},
{"stat-file", OPT_STAT_FILE, N_("FILENAME"), OPTION_HIDDEN,
N_("Name of login statistics file"), GRP+1},
N_("name of login statistics file"), GRP+1},
#endif
#undef GRP
#define GRP 20
{ "bulletin-source", OPT_BULLETIN_SOURCE, N_("MBOX"), OPTION_HIDDEN,
N_("Set source mailbox to get bulletins from"), GRP+1 },
N_("set source mailbox to get bulletins from"), GRP+1 },
#ifdef USE_DBM
{ "bulletin-db", OPT_BULLETIN_DB, N_("FILE"), OPTION_HIDDEN,
N_("Set the bulletin database file name"), GRP+1 },
N_("set the bulletin database file name"), GRP+1 },
#endif
#undef GRP
......@@ -459,8 +459,7 @@ main (int argc, char **argv)
}
else
{
mu_error (_("error getting mail group: %s"),
mu_strerror (errno));
mu_diag_funcall (MU_DIAG_ERROR, "getgrnam", "mail", errno);
exit (EX_OSERR);
}
}
......
......@@ -68,11 +68,11 @@ void (*argp_program_version_hook) (FILE *stream, struct argp_state *state) =
static struct argp_option options[] =
{
{ NULL, 0, NULL, 0, N_("Actions are:"), 1 },
{ "add", 'a', 0, 0, N_("Add user"), 1 },
{ "modify", 'm', 0, 0, N_("Modify user's record (change password)"), 1 },
{ "delete", 'd', 0, 0, N_("Delete user's record"), 1 },
{ "list", 'l', 0, 0, N_("List the contents of DBM file"), 1 },
{ "create", 'c', 0, 0, N_("Create the DBM from a plaintext file"), 1 },
{ "add", 'a', 0, 0, N_("add user"), 1 },
{ "modify", 'm', 0, 0, N_("modify user's record (change password)"), 1 },
{ "delete", 'd', 0, 0, N_("delete user's record"), 1 },
{ "list", 'l', 0, 0, N_("list the contents of DBM file"), 1 },
{ "create", 'c', 0, 0, N_("create the DBM from a plaintext file"), 1 },
{ NULL, 0, NULL, 0,
N_("Default action is:\n"
......@@ -80,11 +80,11 @@ static struct argp_option options[] =
" For a user: --modify --username <username>\n"), 2 },
{ NULL, 0, NULL, 0, N_("Options are:"), 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 },
{ "permissions", 'P', N_("PERM"), 0, N_("Force given permissions on the database"), 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 },
{ "permissions", 'P', N_("PERM"), 0, N_("force given permissions on the database"), 3 },
{ NULL, }
};
......@@ -294,7 +294,7 @@ action_list (struct action_data *ap)
fp = fopen (ap->output_name, "w");
if (!fp)
{
mu_error (_("Cannot create file %s: %s"), ap->output_name, mu_strerror (errno));
mu_error (_("cannot create file %s: %s"), ap->output_name, mu_strerror (errno));
return 1;
}
}
......@@ -375,7 +375,7 @@ action_create (struct action_data *ap)
ap->output_name = APOP_PASSFILE;
if (mu_dbm_open (ap->output_name, &db, MU_STREAM_CREAT, permissions))
{
mu_error (_("Cannot create %s: %s"), ap->output_name, mu_strerror (errno));
mu_error (_("cannot create database %s: %s"), ap->output_name, mu_strerror (errno));
return 1;
}
......
......@@ -39,15 +39,15 @@ static error_t readmsg_parse_opt (int key, char *arg, struct argp_state *astate
static struct argp_option options[] =
{
{ "debug", 'd', 0, 0, N_("Display debugging information"), 1 },
{ "header", 'h', 0, 0, N_("Display entire header"), 1 },
{ "debug", 'd', 0, 0, N_("display debugging information"), 1 },
{ "header", 'h', 0, 0, N_("display entire header"), 1 },
{ "weedlist", 'w', N_("LIST"), 0,
N_("List of header names separated by whitespace or commas"), 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 },
N_("list of header names separated by whitespace or commas"), 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,
N_("Print all messages matching pattern, not only the first"), 1 },
N_("print all messages matching pattern, not only the first"), 1 },
{0, 0, 0, 0}
};
......
......@@ -68,37 +68,37 @@ N_("Debug flags:\n\
static struct argp_option options[] =
{
{"no-actions", 'n', 0, 0,
N_("Do not execute any actions, just print what would be done"), 0},
N_("do not execute any actions, just print what would be done"), 0},
{"dry-run", 0, NULL, OPTION_ALIAS, NULL },
{"keep-going", 'k', 0, 0,
N_("Keep on going if execution fails on a message"), 0},
N_("keep on going if execution fails on a message"), 0},
{"compile-only", 'c', 0, 0,
N_("Compile script and exit"), 0},
N_("compile script and exit"), 0},
{"dump", 'D', 0, 0,
N_("Compile script, dump disassembled sieve code to terminal and exit"), 0 },
N_("compile script, dump disassembled sieve code to terminal and exit"), 0 },
{"mbox-url", 'f', N_("MBOX"), 0,
N_("Mailbox to sieve (defaults to user's mail spool)"), 0},
N_("mailbox to sieve (defaults to user's mail spool)"), 0},
{"ticket", 't', N_("TICKET"), 0,
N_("Ticket file for user authentication"), 0},
N_("ticket file for user authentication"), 0},
{"debug", 'd', N_("FLAGS"), OPTION_ARG_OPTIONAL,
N_("Debug flags (defaults to \"" D_DEFAULT "\")"), 0},
N_("debug flags (defaults to \"" D_DEFAULT "\")"), 0},
{"verbose", 'v', NULL, 0,
N_("Log all actions"), 0},
N_("log all actions"), 0},
{"line-info", ARG_LINE_INFO, N_("BOOL"), OPTION_ARG_OPTIONAL,
N_("Print source location along with action logs (default)") },
N_("print source location along with action logs (default)") },
{"email", 'e', N_("ADDRESS"), 0,
N_("Override user email address"), 0},
N_("override user email address"), 0},
{"no-program-name", ARG_NO_PROGRAM_NAME, NULL, 0,
N_("Do not prefix diagnostic messages with the program name"), 0},
N_("do not prefix diagnostic messages with the program name"), 0},
{0}
};
......