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