diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-08-25 19:23:12 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-08-25 19:23:55 +0300 |
commit | 2141acfb58732dab8cdb6ffff18550c0ebf016b5 (patch) | |
tree | 0f6668ed42e48d6b8e81498c553c72ce96e16d7f /mh | |
parent | 8619a1cb3b5a4b84b365571b711cf792e12ab620 (diff) | |
download | mailutils-2141acfb58732dab8cdb6ffff18550c0ebf016b5.tar.gz mailutils-2141acfb58732dab8cdb6ffff18550c0ebf016b5.tar.bz2 |
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
Diffstat (limited to 'mh')
-rw-r--r-- | mh/ali.c | 14 | ||||
-rw-r--r-- | mh/anno.c | 14 | ||||
-rw-r--r-- | mh/burst.c | 16 | ||||
-rw-r--r-- | mh/comp.c | 28 | ||||
-rw-r--r-- | mh/fmtcheck.c | 12 | ||||
-rw-r--r-- | mh/folder.c | 30 | ||||
-rw-r--r-- | mh/forw.c | 38 | ||||
-rw-r--r-- | mh/inc.c | 22 | ||||
-rw-r--r-- | mh/install-mh.c | 6 | ||||
-rw-r--r-- | mh/mark.c | 16 | ||||
-rw-r--r-- | mh/mh_init.c | 12 | ||||
-rw-r--r-- | mh/mhl.c | 18 | ||||
-rw-r--r-- | mh/mhn.c | 34 | ||||
-rw-r--r-- | mh/mhparam.c | 6 | ||||
-rw-r--r-- | mh/mhpath.c | 6 | ||||
-rw-r--r-- | mh/pick.c | 44 | ||||
-rw-r--r-- | mh/refile.c | 23 | ||||
-rw-r--r-- | mh/repl.c | 44 | ||||
-rw-r--r-- | mh/rmf.c | 10 | ||||
-rw-r--r-- | mh/rmm.c | 6 | ||||
-rw-r--r-- | mh/scan.c | 18 | ||||
-rw-r--r-- | mh/send.c | 40 | ||||
-rw-r--r-- | mh/sortm.c | 34 | ||||
-rw-r--r-- | mh/whatnow.c | 16 | ||||
-rw-r--r-- | mh/whom.c | 16 |
25 files changed, 266 insertions, 257 deletions
@@ -1,6 +1,6 @@ /* GNU Mailutils -- a suite of utilities for electronic mail Copyright (C) 2003, 2004, 2005, 2006, 2007, - 2008 Free Software Foundation, Inc. + 2008, 2009 Free Software Foundation, Inc. GNU Mailutils is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,17 +35,17 @@ static char args_doc[] = N_("aliases ..."); /* GNU options */ static struct argp_option options[] = { {"alias", ARG_ALIAS, N_("FILE"), 0, - N_("Use the additional alias FILE")}, + N_("use the additional alias FILE")}, {"noalias", ARG_NOALIAS, NULL, 0, - N_("Do not read the system alias file") }, + N_("do not read the system alias file") }, {"list", ARG_LIST, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("List each address on a separate line") }, + N_("list each address on a separate line") }, {"normalize", ARG_NORMALIZE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Try to determine the official hostname for each address") }, + N_("try to determine the official hostname for each address") }, {"user", ARG_USER, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("List the aliases that expand to given addresses") }, + N_("list the aliases that expand to given addresses") }, {"license", ARG_LICENSE, 0, 0, - N_("Display software license"), -1}, + N_("display software license"), -1}, { 0 } }; @@ -1,5 +1,5 @@ /* GNU Mailutils -- a suite of utilities for electronic mail - Copyright (C) 2003, 2005, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2003, 2005, 2007, 2008, 2009 Free Software Foundation, Inc. GNU Mailutils is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,19 +29,19 @@ static char args_doc[] = N_("[msg [msg...]]"); /* GNU options */ static struct argp_option options[] = { {"folder", ARG_FOLDER, N_("FOLDER"), 0, - N_("Specify folder to operate upon")}, + N_("specify folder to operate upon")}, {"inplace", ARG_INPLACE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("* Annotate the message in place")}, + N_("* annotate the message in place")}, {"noinplace", ARG_NOINPLACE, NULL, OPTION_HIDDEN, "" }, {"date", ARG_DATE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Add FIELD: Date header") }, + N_("add FIELD: date header") }, {"nodate", ARG_NODATE, NULL, OPTION_HIDDEN, "" }, {"component", ARG_COMPONENT, N_("FIELD"), 0, - N_("Add this FIELD to the message header") }, + N_("add this FIELD to the message header") }, {"text", ARG_TEXT, N_("STRING"), 0, - N_("Field value for the component") }, + N_("field value for the component") }, {"license", ARG_LICENSE, 0, 0, - N_("Display software license"), -1}, + N_("display software license"), -1}, { NULL } }; diff --git a/mh/burst.c b/mh/burst.c index 1c0c796df..e78f55c2a 100644 --- a/mh/burst.c +++ b/mh/burst.c @@ -1,5 +1,5 @@ /* GNU Mailutils -- a suite of utilities for electronic mail - Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. GNU Mailutils is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,23 +32,23 @@ static char args_doc[] = "[msgs]"; /* GNU options */ static struct argp_option options[] = { {"folder", ARG_FOLDER, N_("FOLDER"), 0, - N_("Specify folder to operate upon")}, + N_("specify folder to operate upon")}, {"inplace", ARG_INPLACE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Replace the source message with the table of contents, insert extracted messages after it") }, + N_("replace the source message with the table of contents, insert extracted messages after it") }, {"noinplace", ARG_NOINPLACE, 0, OPTION_HIDDEN, ""}, {"quiet", ARG_QUIET, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Be quiet about the messages that are not in digest format") }, + N_("be quiet about the messages that are not in digest format") }, {"noquiet", ARG_NOQUIET, 0, OPTION_HIDDEN, ""}, {"verbose", ARG_VERBOSE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Verbosely list the actions taken") }, + N_("verbosely list the actions taken") }, {"noverbose", ARG_NOVERBOSE, 0, OPTION_HIDDEN, ""}, {"recursive", ARG_RECURSIVE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Recursively expand MIME messages") }, + N_("recursively expand MIME messages") }, {"norecursive", ARG_NORECURSIVE, 0, OPTION_HIDDEN, ""}, {"length", ARG_LENGTH, N_("NUMBER"), 0, - N_("Set minimal length of digest encapsulation boundary (default 1)") }, + N_("set minimal length of digest encapsulation boundary (default 1)") }, {"license", ARG_LICENSE, 0, 0, - N_("Display software license"), -1}, + N_("display software license"), -1}, { NULL } }; @@ -1,6 +1,6 @@ /* GNU Mailutils -- a suite of utilities for electronic mail Copyright (C) 2003, 2005, 2006, 2007, - 2008 Free Software Foundation, Inc. + 2008, 2009 Free Software Foundation, Inc. GNU Mailutils is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,32 +32,32 @@ static char args_doc[] = "[msg]"; /* GNU options */ static struct argp_option options[] = { {"build", ARG_BUILD, 0, 0, - N_("Build the draft and quit immediately.")}, + N_("build the draft and quit immediately.")}, {"draftfolder", ARG_DRAFTFOLDER, N_("FOLDER"), 0, - N_("Specify the folder for message drafts")}, + N_("specify the folder for message drafts")}, {"nodraftfolder", ARG_NODRAFTFOLDER, 0, 0, - N_("Undo the effect of the last --draftfolder option")}, + N_("undo the effect of the last --draftfolder option")}, {"draftmessage" , ARG_DRAFTMESSAGE, N_("MSG"), 0, - N_("Invoke the draftmessage facility")}, + N_("invoke the draftmessage facility")}, {"folder", ARG_FOLDER, N_("FOLDER"), 0, - N_("Specify folder to operate upon")}, + N_("specify folder to operate upon")}, {"file", ARG_FILE, N_("FILE"), 0, - N_("Use FILE as the message draft")}, + N_("use FILE as the message draft")}, {"editor", ARG_EDITOR, N_("PROG"), 0, - N_("Set the editor program to use")}, + N_("set the editor program to use")}, {"noedit", ARG_NOEDIT, 0, 0, - N_("Suppress the initial edit")}, + N_("suppress the initial edit")}, {"form", ARG_FORM, N_("FILE"), 0, - N_("Read format from given file")}, + N_("read format from given file")}, {"whatnowproc", ARG_WHATNOWPROC, N_("PROG"), 0, - N_("* Set the replacement for whatnow program")}, + N_("* set the replacement for whatnow program")}, {"nowhatnowproc", ARG_NOWHATNOWPROC, NULL, 0, - N_("* Ignore whatnowproc variable. Use standard `whatnow' shell instead.")}, + N_("* ignore whatnowproc variable. Use standard `whatnow' shell instead.")}, {"use", ARG_USE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Use draft file preserved after the last session") }, + N_("use draft file preserved after the last session") }, {"nouse", ARG_NOUSE, NULL, OPTION_HIDDEN, ""}, {"license", ARG_LICENSE, 0, 0, - N_("Display software license"), -1}, + N_("display software license"), -1}, { 0 } }; diff --git a/mh/fmtcheck.c b/mh/fmtcheck.c index 51491c0bb..ae8ea5381 100644 --- a/mh/fmtcheck.c +++ b/mh/fmtcheck.c @@ -1,6 +1,6 @@ /* GNU Mailutils -- a suite of utilities for electronic mail Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, - 2006, 2007, 2008 Free Software Foundation, Inc. + 2006, 2007, 2008, 2009 Free Software Foundation, Inc. GNU Mailutils is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,15 +29,15 @@ static char args_doc[] = ""; /* GNU options */ static struct argp_option options[] = { {"form", ARG_FORM, N_("FILE"), 0, - N_("Read format from given file")}, + N_("read format from given file")}, {"format", ARG_FORMAT, N_("FORMAT"), 0, - N_("Use this format string")}, + N_("use this format string")}, {"dump", ARG_DUMP, NULL, 0, - N_("Dump the listing of compiled format code")}, + N_("dump the listing of compiled format code")}, { "debug", ARG_DEBUG, NULL, 0, - N_("Enable parser debugging output"),}, + N_("enable parser debugging output"),}, {"license", ARG_LICENSE, 0, 0, - N_("Display software license"), -1}, + N_("display software license"), -1}, { 0 } }; diff --git a/mh/folder.c b/mh/folder.c index 0e6ad015e..1d51f52a4 100644 --- a/mh/folder.c +++ b/mh/folder.c @@ -42,47 +42,47 @@ static char args_doc[] = N_("[action] [msg]"); static struct argp_option options[] = { {N_("Actions are:"), 0, 0, OPTION_DOC, NULL, 0 }, {"print", ARG_PRINT, NULL, 0, - N_("List the folders (default)"), 1 }, + N_("list the folders (default)"), 1 }, {"list", ARG_LIST, NULL, 0, - N_("List the contents of the folder stack"), 1}, + N_("list the contents of the folder stack"), 1}, {"pack", ARG_PACK, N_("NUMBER"), OPTION_ARG_OPTIONAL, - N_("Remove holes in message numbering. Begin numbering from NUMBER (default: first message number)"), 1}, + N_("remove holes in message numbering, begin numbering from NUMBER (default: first message number)"), 1}, {"push", ARG_PUSH, N_("FOLDER"), OPTION_ARG_OPTIONAL, - N_("Push the folder on the folder stack. If FOLDER is specified, it is pushed. " + N_("push the folder on the folder stack. If FOLDER is specified, it is pushed. " "Otherwise, if a folder is given in the command line (via + or --folder), " "it is pushed on stack. Otherwise, the current folder and the top of the folder " "stack are exchanged"), 1}, {"pop", ARG_POP, NULL, 0, - N_("Pop the folder off the folder stack"), 1}, + N_("pop the folder off the folder stack"), 1}, {N_("Options are:"), 0, 0, OPTION_DOC, NULL, 2 }, {"folder", ARG_FOLDER, N_("FOLDER"), 0, - N_("Specify folder to operate upon"), 3}, + N_("specify folder to operate upon"), 3}, {"all", ARG_ALL, NULL, 0, - N_("List all folders"), 3}, + N_("list all folders"), 3}, {"create", ARG_CREATE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Create non-existing folders"), 3}, + N_("create non-existing folders"), 3}, {"nocreate", ARG_NOCREATE, NULL, OPTION_HIDDEN, ""}, {"fast", ARG_FAST, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("List only the folder names"), 3}, + N_("list only the folder names"), 3}, {"nofast", ARG_NOFAST, NULL, OPTION_HIDDEN, ""}, {"header", ARG_HEADER, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Print the header line"), 3}, + N_("print the header line"), 3}, {"noheader", ARG_NOHEADER, NULL, OPTION_HIDDEN, ""}, {"recurse",ARG_RECURSIVE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Scan folders recursively"), 3}, + N_("scan folders recursively"), 3}, {"norecurse", ARG_NORECURSIVE, NULL, OPTION_HIDDEN, ""}, {"total", ARG_TOTAL, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Output the total statistics"), 3}, + N_("output the total statistics"), 3}, {"nototal", ARG_NOTOTAL, NULL, OPTION_HIDDEN, ""}, {"verbose", ARG_VERBOSE, NULL, 0, - N_("Verbosely list actions taken"), 3}, + N_("verbosely list actions taken"), 3}, {"dry-run", ARG_DRY_RUN, NULL, 0, - N_("Do nothing, print what would be done (with --pack)"), 3}, + N_("do nothing, print what would be done (with --pack)"), 3}, {"license", ARG_LICENSE, 0, 0, - N_("Display software license"), -1}, + N_("display software license"), -1}, {NULL}, }; @@ -30,48 +30,48 @@ static char args_doc[] = "[msgs]"; /* GNU options */ static struct argp_option options[] = { {"annotate", ARG_ANNOTATE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Add Forwarded: header to each forwarded message")}, + N_("add Forwarded: header to each forwarded message")}, {"build", ARG_BUILD, 0, 0, - N_("Build the draft and quit immediately")}, + N_("build the draft and quit immediately")}, {"draftfolder", ARG_DRAFTFOLDER, N_("FOLDER"), 0, - N_("Specify the folder for message drafts")}, + N_("specify the folder for message drafts")}, {"nodraftfolder", ARG_NODRAFTFOLDER, 0, 0, - N_("Undo the effect of the last --draftfolder option")}, + N_("undo the effect of the last --draftfolder option")}, {"draftmessage" , ARG_DRAFTMESSAGE, N_("MSG"), 0, - N_("Invoke the draftmessage facility")}, + N_("invoke the draftmessage facility")}, {"folder", ARG_FOLDER, N_("FOLDER"), 0, - N_("Specify folder to operate upon")}, + N_("specify folder to operate upon")}, {"editor", ARG_EDITOR, N_("PROG"), 0, - N_("Set the editor program to use")}, + N_("set the editor program to use")}, {"noedit", ARG_NOEDIT, 0, 0, - N_("Suppress the initial edit")}, + N_("suppress the initial edit")}, {"format", ARG_FORMAT, N_("BOOL"), 0, - N_("Format messages")}, + N_("format messages")}, {"noformat", ARG_NOFORMAT, NULL, 0, - N_("Undo the effect of the last --format option") }, + N_("undo the effect of the last --format option") }, {"form", ARG_FORM, N_("FILE"), 0, - N_("Read format from given file")}, + N_("read format from given file")}, {"filter", ARG_FILTER, N_("FILE"), 0, - N_("Use filter FILE to preprocess the body of the message") }, + N_("use filter FILE to preprocess the body of the message") }, {"nofilter", ARG_NOFILTER, NULL, 0, - N_("Undo the effect of the last --filter option") }, + N_("undo the effect of the last --filter option") }, {"inplace", ARG_INPLACE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("* Annotate the message in place")}, + N_("* annotate the message in place")}, {"noinplace", ARG_NOINPLACE, 0, OPTION_HIDDEN, "" }, {"mime", ARG_MIME, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Use MIME encapsulation") }, + N_("use MIME encapsulation") }, {"nomime", ARG_NOMIME, NULL, OPTION_HIDDEN, "" }, {"width", ARG_WIDTH, N_("NUMBER"), 0, N_("Set output width")}, {"whatnowproc", ARG_WHATNOWPROC, N_("PROG"), 0, - N_("* Set the replacement for whatnow program")}, + N_("* set the replacement for whatnow program")}, {"nowhatnowproc", ARG_NOWHATNOWPROC, NULL, 0, - N_("* Ignore whatnowproc variable. Use standard `whatnow' shell instead")}, + N_("* ignore whatnowproc variable, use standard `whatnow' shell instead")}, {"use", ARG_USE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Use draft file preserved after the last session") }, + N_("use draft file preserved after the last session") }, {"nouse", ARG_NOUSE, N_("BOOL"), OPTION_HIDDEN, "" }, {"license", ARG_LICENSE, 0, 0, - N_("Display software license"), -1}, + N_("display software license"), -1}, {NULL}, }; @@ -29,29 +29,29 @@ static char args_doc[] = N_("[+folder]"); /* GNU options */ static struct argp_option options[] = { {"file", ARG_FILE, N_("FILE"), 0, - N_("Incorporate mail from named file")}, + N_("incorporate mail from named file")}, {"folder", ARG_FOLDER, N_("FOLDER"), 0, - N_("Specify folder to incorporate mail to")}, + N_("specify folder to incorporate mail to")}, {"audit", ARG_AUDIT, N_("FILE"), 0, - N_("Enable audit")}, + N_("enable audit")}, {"noaudit", ARG_NOAUDIT, 0, 0, - N_("Disable audit")}, + N_("disable audit")}, {"changecur", ARG_CHANGECUR, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Mark first incorporated message as current (default)")}, + N_("mark first incorporated message as current (default)")}, {"nochangecur", ARG_NOCHANGECUR, NULL, OPTION_HIDDEN, ""}, {"form", ARG_FORM, N_("FILE"), 0, - N_("Read format from given file")}, + N_("read format from given file")}, {"format", ARG_FORMAT, N_("FORMAT"), 0, - N_("Use this format string")}, + N_("use this format string")}, {"truncate", ARG_TRUNCATE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Truncate source mailbox after incorporating (default)")}, + N_("truncate source mailbox after incorporating (default)")}, {"notruncate", ARG_NOTRUNCATE, NULL, OPTION_HIDDEN, ""}, {"width", ARG_WIDTH, N_("NUMBER"), 0, - N_("Set output width")}, + N_("set output width")}, {"quiet", ARG_QUIET, 0, 0, - N_("Be quiet")}, + N_("be quiet")}, {"license", ARG_LICENSE, 0, 0, - N_("Display software license"), -1}, + N_("display software license"), -1}, { 0 } }; diff --git a/mh/install-mh.c b/mh/install-mh.c index ae15451f8..0104ea089 100644 --- a/mh/install-mh.c +++ b/mh/install-mh.c @@ -1,5 +1,5 @@ /* GNU Mailutils -- a suite of utilities for electronic mail - Copyright (C) 2003, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2003, 2007, 2008, 2009 Free Software Foundation, Inc. GNU Mailutils is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,10 +25,10 @@ static char args_doc[] = ""; /* GNU options */ static struct argp_option options[] = { - {"auto", ARG_AUTO, NULL, 0, N_("Do not ask for anything")}, + {"auto", ARG_AUTO, NULL, 0, N_("do not ask for anything")}, {"compat", ARG_COMPAT, NULL, OPTION_HIDDEN, ""}, {"license", ARG_LICENSE, 0, 0, - N_("Display software license"), -1}, + N_("display software license"), -1}, {NULL} }; @@ -27,23 +27,23 @@ static char args_doc[] = "[msgs...]"; /* GNU options */ static struct argp_option options[] = { {"folder", ARG_FOLDER, N_("FOLDER"), 0, - N_("Specify folder to operate upon")}, + N_("specify folder to operate upon")}, {"sequence", ARG_SEQUENCE, N_("NAME"), 0, - N_("Specify sequence name to operate upon")}, + N_("specify sequence name to operate upon")}, {"add", ARG_ADD, NULL, 0, - N_("Add messages to the sequence")}, + N_("add messages to the sequence")}, {"delete", ARG_DELETE, NULL, 0, - N_("Delete messages from the sequence")}, + N_("delete messages from the sequence")}, {"list", ARG_LIST, NULL, 0, - N_("List the sequences")}, + N_("list the sequences")}, {"public", ARG_PUBLIC, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Create public sequence")}, + N_("create public sequence")}, {"nopublic", ARG_NOPUBLIC, NULL, OPTION_HIDDEN, "" }, {"zero", ARG_ZERO, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Empty the sequence before adding messages")}, + N_("empty the sequence before adding messages")}, {"nozero", ARG_NOZERO, NULL, OPTION_HIDDEN, "" }, {"license", ARG_LICENSE, 0, 0, - N_("Display software license"), -1}, + N_("display software license"), -1}, {NULL} }; diff --git a/mh/mh_init.c b/mh/mh_init.c index 820d6f62d..3cb48c899 100644 --- a/mh/mh_init.c +++ b/mh/mh_init.c @@ -284,7 +284,9 @@ mh_check_folder (const char *pathname, int confirm) { if (errno == ENOENT) { - if (!confirm || mh_getyn (_("create folder \"%s\""), p)) + /* TRANSLATORS: This is a question and will be followed + by question mark on output. */ + if (!confirm || mh_getyn (_("Create folder \"%s\""), p)) return mh_makedir (p); else return 1; @@ -642,7 +644,7 @@ _file_to_message (const char *file_name) if (stat (file_name, &st) < 0) { - mu_error (_("cannot stat file %s: %s"), file_name, strerror (errno)); + mu_diag_funcall (MU_DIAG_ERROR, "stat", file_name, errno); return NULL; } @@ -709,14 +711,20 @@ mh_real_install (char *name, int automode) { size_t n = 0; + /* TRANSLATORS: This is a question and will be followed + by question mark on output. */ if (mh_getyn_interactive (_("Do you need help"))) mh_install_help (mhdir); + /* TRANSLATORS: This is a question and will be followed + by question mark on output. */ if (!mh_getyn_interactive (_("Do you want the standard MH path \"%s\""), mhdir)) { int local; char *p; + /* TRANSLATORS: This is a question and will be followed + by question mark on output. */ local = mh_getyn_interactive (_("Do you want a path below your login directory")); if (local) printf (_("What is the path? ")); @@ -30,25 +30,25 @@ static char args_doc[] = N_("[files]"); /* GNU options */ static struct argp_option options[] = { {"folder", ARG_FOLDER, N_("FOLDER"), 0, - N_("Specify folder to operate upon")}, + N_("specify folder to operate upon")}, { "bell", ARG_BELL, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Ring the bell at the end of each output page") }, + N_("ring the bell at the end of each output page") }, {"nobell", ARG_NOBELL, NULL, OPTION_HIDDEN, "" }, { "clear", ARG_CLEAR, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Clear the screen after each page of output")}, + N_("clear the screen after each page of output")}, {"noclear", ARG_NOCLEAR, NULL, OPTION_HIDDEN, "" }, {"form", ARG_FORM, N_("FILE"), 0, - N_("Read format from given file")}, + N_("read format from given file")}, {"width", ARG_WIDTH, N_("NUMBER"), 0, - N_("Set output width")}, + N_("set output width")}, {"length", ARG_LENGTH, N_("NUMBER"), 0, - N_("Set output screen length")}, + N_("set output screen length")}, {"moreproc", ARG_MOREPROC, N_("PROG"), 0, - N_("Use given PROG instead of the default") }, + N_("use given PROG instead of the default") }, {"nomoreproc", ARG_NOMOREPROC, NULL, 0, - N_("Disable use of moreproc program") }, + N_("disable use of moreproc program") }, {"license", ARG_LICENSE, 0, 0, - N_("Display software license"), -1}, + N_("display software license"), -1}, { NULL } }; @@ -34,59 +34,59 @@ static char args_doc[] = "[msgs]"; static struct argp_option options[] = { {"folder", ARG_FOLDER, N_("FOLDER"), 0, - N_("Specify folder to operate upon"), 0}, + N_("specify folder to operate upon"), 0}, {"file", ARG_FILE, N_("FILE"), 0, - N_("Specify file to operate upon"), 0}, + N_("specify file to operate upon"), 0}, {N_("MIME editing options"), 0, NULL, OPTION_DOC, NULL, 5}, {"compose", ARG_COMPOSE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Compose the MIME message (default)"), 6}, + N_("compose the MIME message (default)"), 6}, {"nocompose", ARG_NOCOMPOSE, NULL, OPTION_HIDDEN, "", 6}, {N_("Listing options"), 0, NULL, OPTION_DOC, NULL, 0}, {"list", ARG_LIST, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("List the table of contents"), 11 }, + N_("list the table of contents"), 11 }, {"nolist", ARG_NOLIST, NULL, OPTION_HIDDEN, "", 11 }, {"headers", ARG_HEADER, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Print the banner above the listing"), 12}, + N_("print the banner above the listing"), 12}, {"noheaders", ARG_NOHEADERS, NULL, OPTION_HIDDEN, "", 12 }, {"realsize", ARG_REALSIZE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("List the decoded sizes"), 12}, + N_("list the decoded sizes"), 12}, {"norealsize", ARG_NOREALSIZE, NULL, OPTION_HIDDEN, "", 12 }, {N_("Display options"), 0, NULL, OPTION_DOC, NULL, 20}, {"show", ARG_SHOW, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Display the contents of the messages"), 21}, + N_("display the contents of the messages"), 21}, {"noshow", ARG_NOSHOW, NULL, OPTION_HIDDEN, "", 21 }, {"serialonly", ARG_SERIALONLY, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("* Display messages serially"), 22}, + N_("* display messages serially"), 22}, {"noserialonly", ARG_NOSERIALONLY, NULL, OPTION_HIDDEN, "", 22 }, {"form", ARG_FORM, N_("FILE"), 0, - N_("Read mhl format from FILE"), 22}, + N_("read mhl format from FILE"), 22}, {"pause", ARG_PAUSE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Pause prior to displaying content"), 22}, + N_("pause prior to displaying content"), 22}, {"nopause", ARG_NOPAUSE, NULL, OPTION_HIDDEN, "", 22 }, {N_("Saving options"), 0, NULL, OPTION_DOC, NULL, 30}, {"store", ARG_STORE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Store the contents of the messages on disk"), 31}, + N_("store the contents of the messages on disk"), 31}, {"nostore", ARG_NOSTORE, NULL, OPTION_HIDDEN, "", 31 }, {"auto", ARG_AUTO, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Use filenames from the content headers"), 31}, + N_("use filenames from the content headers"), 31}, {"noauto", ARG_NOAUTO, NULL, OPTION_HIDDEN, "", 31 }, {N_("Other options"), 0, NULL, OPTION_DOC, NULL, 40}, {"part", ARG_PART, N_("PART"), 0, - N_("Limit the scope of the operation to the given part"), 41}, + N_("limit the scope of the operation to the given part"), 41}, {"type", ARG_TYPE, N_("CONTENT"), 0, - N_("Operate on message part with given multipart content"), 41 }, + N_("operate on message part with given multipart content"), 41 }, {"verbose", ARG_VERBOSE, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Print additional information"), 41 }, + N_("print additional information"), 41 }, {"noverbose", ARG_NOVERBOSE, NULL, OPTION_HIDDEN, "", 41 }, {"quiet", ARG_QUIET, 0, 0, - N_("Be quiet")}, + N_("be quiet")}, {"license", ARG_LICENSE, 0, 0, - N_("Display software license"), -1}, + N_("display software license"), -1}, {NULL} }; diff --git a/mh/mhparam.c b/mh/mhparam.c index bd4895378..ad56c43ec 100644 --- a/mh/mhparam.c +++ b/mh/mhparam.c @@ -28,11 +28,11 @@ static char args_doc[] = N_("[components]"); /* GNU options */ static struct argp_option options[] = { {"all", ARG_ALL, NULL, 0, - N_("Display all components from the MH profile. All other arguments are ignored")}, + N_("display all components from the MH profile. All other arguments are ignored")}, {"component", ARG_COMPONENT, N_("BOOL"), OPTION_ARG_OPTIONAL, - N_("Always display the component name") }, + N_("always display the component name") }, {"license", ARG_LICENSE, 0, 0, - N_("Display software license"), -1}, + N_("display software license"), -1}, { 0 } }; diff --git a/mh/mhpath.c b/mh/mhpath.c index 53f32e35a..13d5b1d91 100644 --- a/mh/mhpath.c +++ b/mh/mhpath.c @@ -1,5 +1,5 @@ /* GNU Mailutils -- a suite of utilities for electronic mail - Copyright (C) 2002, 2005, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 2007, 2008, 2009 Free Software Foundation, Inc. GNU Mailutils is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,9 +28,9 @@ static char args_doc[] = N_("[+folder] [msgs]"); /* GNU options */ static struct argp_option options[] = { {"folder", ARG_FOLDER, N_("FOLDER"), 0, - N_("Specify folder to operate upon")}, + N_("specify folder to operate upon")}, {"license", ARG_LICENSE, 0, 0, - N_("Display software license"), -1}, + N_("display software license"), -1}, { 0 } }; @@ -36,63 +36,63 @@ static char args_doc[] = N_("[messages]"); /* GNU options */ static struct argp_option options[] = { {"folder", ARG_FOLDER, N_("FOLDER"), 0, - N_("Specify folder to operate upon"), 0}, + N_("specify folder to operate upon"), 0}, {N_("Specifying search patterns:"), 0, NULL, OPTION_DOC, NULL, 0}, {"component", ARG_COMPONENT, N_("FIELD"), 0, - N_("Search the named header field"), 1}, + N_("search the named header field"), 1}, {"pattern", ARG_PATTERN, N_("STRING"), 0, - N_("A pattern to look for"), 1}, + N_("set pattern to look for"), 1}, {"search", 0, NULL, OPTION_ALIAS, NULL, 1}, {"cflags", ARG_CFLAGS, N_("STRING"), 0, - N_("Flags controlling the type of regular expressions. STRING must consist of one or more of the following letters: B=basic, E=extended, I=ignore case, C=case sensitive. Default is \"EI\". The flags remain in effect until the next occurrence of --cflags option. The option must occur right before --pattern or --component option (or its alias).") }, + N_("flags controlling the type of regular expressions. STRING must consist of one or more of the following letters: B=basic, E=extended, I=ignore case, C=case sensitive. Default is \"EI\". The flags remain in effect until the next occurrence of --cflags option. The option must occur right before --pattern or --component option (or its alias).") }, {"cc", ARG_CC, N_("STRING"), 0, - N_("Same as --component cc --pattern STRIN |