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

54 files changed, 480 insertions, 482 deletions

diff --git a/comsat/comsat.c b/comsat/comsat.c
index 1353eb10f..725685f5e 100644
--- a/comsat/comsat.c
+++ b/comsat/comsat.c
@@ -62,12 +62,12 @@ static struct argp_option options[] =
 {
   { "config", 'c', N_("FILE"), OPTION_HIDDEN, "", 0 },
   { "convert-config", 'C', N_("FILE"), 0,
-    N_("Convert the configuration FILE to new format."), 0 },
-  { "test", 't', NULL, 0, N_("Run in test mode"), 0 },
-  { "foreground", OPT_FOREGROUND, 0, 0, N_("Remain in foreground."), 0},
-  { "inetd",  'i', 0, 0, N_("Run in inetd mode"), 0 },
+    N_("convert the configuration FILE to new format"), 0 },
+  { "test", 't', NULL, 0, N_("run in test mode"), 0 },
+  { "foreground", OPT_FOREGROUND, 0, 0, N_("remain in foreground"), 0},
+  { "inetd",  'i', 0, 0, N_("run in inetd mode"), 0 },
   { "daemon", 'd', N_("NUMBER"), OPTION_ARG_OPTIONAL,
-    N_("Runs in daemon mode with a maximum of NUMBER children"), 0 },
+    N_("runs in daemon mode with a maximum of NUMBER children"), 0 },
   { NULL, 0, NULL, 0, NULL, 0 }
 };
 
@@ -120,7 +120,7 @@ int test_mode;
 
 struct mu_cfg_param comsat_cfg_param[] = {
   { "allow-biffrc", mu_cfg_bool, &allow_biffrc, 0, NULL,
-    N_("Read .biffrc file from the user home directory") },
+    N_("Read .biffrc file from the user home directory.") },
   { "require-tty", mu_cfg_bool, &require_tty, 0, NULL,
     N_("Notify only if the user is logged on one of the ttys.") },
   { "max-lines", mu_cfg_int, &maxlines, 0, NULL,
diff --git a/config/mailutils-config.c b/config/mailutils-config.c
index e4037d42c..c5007a9fe 100644
--- a/config/mailutils-config.c
+++ b/config/mailutils-config.c
@@ -26,23 +26,21 @@
 #include "mailutils/libargp.h"
 
 const char *program_version = "mailutils-config (" PACKAGE_STRING ")";
-static char doc[] = N_("GNU mailutils-config -- Display compiler and loader options needed for building a program with mailutils");
+static char doc[] = N_("GNU mailutils-config -- display compiler and loader options needed for building a program with mailutils");
 static char args_doc[] = N_("[arg...]");
 
 static struct argp_option options[] = {
   {"compile", 'c', NULL,   0,
-   N_("Print C compiler flags to compile with"), 0},
+   N_("print C compiler flags to compile with"), 0},
   {"link",    'l', NULL,   0,
-   N_("Print libraries to link with. Possible arguments are: auth, guile, "
+   N_("print libraries to link with; possible arguments are: auth, guile, "
       "mbox, mh, maildir, mailer, imap, pop, sieve and all"), 0},
   {"info", 'i', NULL, 0,
-   N_("Print a list of configuration options used to build mailutils. If arguments "
-   "are given, they are interpreted as a list of configuration options to check "
-   "for. In this case the program prints those options from this list that "
-   "have been defined. It exits with zero status if all of the "
-   "specified options are defined. Otherwise, the exit status is 1."), 0},
+   N_("print a list of configuration options used to build mailutils; "
+      "oprional arguments are interpreted as a list of configuration "
+      "options to check for"), 0},
   {"verbose", 'v', NULL, 0,
-   N_("Increase output verbosity"), 0},
+   N_("increase output verbosity"), 0},
   {0, 0, 0, 0}
 };
 
diff --git a/dotlock/dotlock.c b/dotlock/dotlock.c
index 8d9098b56..dd98b6877 100644
--- a/dotlock/dotlock.c
+++ b/dotlock/dotlock.c
@@ -44,16 +44,16 @@ static char args_doc[] = N_("FILE");
 
 static struct argp_option options[] = {
   {"unlock", 'u', NULL, 0,
-   N_("Unlock"), 0},
+   N_("unlock"), 0},
 
   {"force", 'f', N_("MINUTES"), OPTION_ARG_OPTIONAL,
-   N_("Forcibly break an existing lock older than a certain time"), 0},
+   N_("forcibly break an existing lock older than a certain time"), 0},
 
   {"retry", 'r', N_("RETRIES"), OPTION_ARG_OPTIONAL,
-   N_("Retry the lock a few times"), 0},
+   N_("retry the lock a few times"), 0},
 
   {"debug", 'd', NULL, 0,
-   N_("Print details of failure reasons to stderr"), 0},
+   N_("print details of failure reasons to stderr"), 0},
 
   {NULL, 0, NULL, 0, NULL, 0}
 };
diff --git a/frm/frm.c b/frm/frm.c
index 7856983c1..30483e838 100644
--- a/frm/frm.c
+++ b/frm/frm.c
@@ -1,6 +1,6 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
    Copyright (C) 1999, 2000, 2001, 2002, 2003,
-   2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+   2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
 
    GNU Mailutils is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -39,29 +39,19 @@ static struct attr_tab {
   int code;        /* Corresponding IS_.* flag */
   size_t len;      /* Minimum abbreviation length */
 } attr_tab[] = {
-  /* TRANSLATORS: See comment marked [frm status] below */
-  { N_("new"), IS_NEW, 0 },
-  /* TRANSLATORS: See comment marked [frm status] below */
-  { N_("old"), IS_OLD, 0 },
-  /* TRANSLATORS: See comment marked [frm status] below */
-  { N_("unread"), IS_OLD, 0 },
-  /* TRANSLATORS: See comment marked [frm status] below */
-  { N_("read"), IS_READ, 0 },
+  { "new", IS_NEW, 0 },
+  { "old", IS_OLD, 0 },
+  { "unread", IS_OLD, 0 },
+  { "read", IS_READ, 0 },
   { NULL }
 };
 
 static char attr_help[] =
-/* TRANSLATORS: [frm status]
-   
-   1) Please make sure the words "new", "unread", "old" and
-   "read" are translated exactly as in four preceeding messages.
-   
-   2) If possible, select such translations for these words, that
-   differ by the first letter.
-*/
-N_("Select messages with the specific attribute. STATUS is one \
-of the following: new, unread, old (same as unread) or read. Any unambiguous \
-abbreviation of those is also accepted.");
+/* TRANSLATORS: Please do *not* translate the words "new", "unread",
+   "old" and "read". They are keywords. */
+N_("select messages with the specific attribute: \
+new, unread, old (same as unread) or read (or any unambiguous \
+abbreviation of these)");
 
 
 /* Attribute table handling */
@@ -74,7 +64,7 @@ prepare_attrs (void)
 
   for (p = attr_tab; p->name; p++)
     {
-      const char *name = gettext (p->name);
+      const char *name = p->name;
       size_t len = strlen (name);
       size_t n = 1;
 
@@ -82,7 +72,7 @@ prepare_attrs (void)
 	{
 	  if (p != q)
 	    {
-	      const char *str = gettext (q->name);
+	      const char *str = q->name;
 	      size_t slen = strlen (str);
 
 	      if (memcmp (name, str, n) == 0)
@@ -112,7 +102,7 @@ decode_attr (char *arg)
   
   for (p = attr_tab; p->name; p++)
     {
-      const char *str = gettext (p->name);
+      const char *str = p->name;
       if (str[0] == arg[0])
 	{
 	  if (len < p->len)
@@ -133,15 +123,15 @@ decode_attr (char *arg)
 
 
 static struct argp_option options[] = {
-  {"debug",  'd', NULL,   0, N_("Enable debugging output"), 0},
-  {"field",  'f', N_("NAME"), 0, N_("Header field to display"), 0},
-  {"to",     'l', NULL,   0, N_("Include the To: information"), 0},
-  {"number", 'n', NULL,   0, N_("Display message numbers"), 0},
-  {"Quiet",  'Q', NULL,   0, N_("Very quiet"), 0},
-  {"query",  'q', NULL,   0, N_("Print a message if the mailbox contains some unread mail"), 0},
-  {"summary",'S', NULL,   0, N_("Print a summary of messages"), 0},
+  {"debug",  'd', NULL,   0, N_("enable debugging output"), 0},
+  {"field",  'f', N_("NAME"), 0, N_("header field to display"), 0},
+  {"to",     'l', NULL,   0, N_("include the To: information"), 0},
+  {"number", 'n', NULL,   0, N_("display message numbers"), 0},
+  {"Quiet",  'Q', NULL,   0, N_("very quiet"), 0},
+  {"query",  'q', NULL,   0, N_("print a message if the mailbox contains some unread mail"), 0},
+  {"summary",'S', NULL,   0, N_("print a summary of messages"), 0},
   {"status", 's', N_("STATUS"), 0, attr_help, 0},
-  {"align",  't', NULL,   0, N_("Tidy mode: align subject lines"), 0},
+  {"align",  't', NULL,   0, N_("tidy mode: align subject lines"), 0},
   {0, 0, 0, 0}
 };
 
diff --git a/frm/from.c b/frm/from.c
index aac7bd631..20c829469 100644
--- a/frm/from.c
+++ b/frm/from.c
@@ -26,12 +26,12 @@ const char *program_version = "from (" PACKAGE_STRING ")";
 static char doc[] = N_("GNU from -- display from and subject");
 
 static struct argp_option options[] = {
-  {"count",  'c', NULL,   0, N_("Just print a count of messages and exit")},
+  {"count",  'c', NULL,   0, N_("just print a count of messages and exit")},
   {"sender", 's', N_("ADDRESS"), 0,
-   N_("Print only mail from addresses containing the supplied string") },
+   N_("print only mail from addresses containing the supplied string") },
   {"file",   'f', N_("FILE"), 0,
-   N_("Read mail from FILE") },
-  {"debug",  'd', NULL,   0, N_("Enable debugging output"), 0},
+   N_("read mail from FILE") },
+  {"debug",  'd', NULL,   0, N_("enable debugging output"), 0},
   {0, 0, 0, 0}
 };
 
@@ -132,7 +132,7 @@ main (int argc, char **argv)
     {
       if (mailbox_name)
 	{
-	  mu_error (_("Both --from option and user name are specified"));
+	  mu_error (_("both --from option and user name are specified"));
 	  exit (1);
 	}
 
diff --git a/guimb/main.c b/guimb/main.c
index 24aa04154..23d472f35 100644
--- a/guimb/main.c
+++ b/guimb/main.c
@@ -57,21 +57,21 @@ static struct argp_option options[] = {
    */
    N_("The following switches stop argument processing, and pass all\n"
    "remaining arguments as the value of (command-line):"), 1},
-  {"code", 'c', N_("EXPR"), 0, N_("Execute given scheme expression."), 1},
+  {"code", 'c', N_("EXPR"), 0, N_("execute given scheme expression"), 1},
   {"source", 's', N_("PROGFILE"), 0,
-   N_("Load Scheme source code from PROGFILE, and exit"), 1},
+   N_("load Scheme source code from PROGFILE and exit"), 1},
   {NULL, 0, NULL, 0,
    N_("The following options do not change the order of options parsing:"), 2},
-  {"expression", 'e', N_("EXPR"), 0, N_("Execute given scheme expression."), 2},
+  {"expression", 'e', N_("EXPR"), 0, N_("execute given scheme expression"), 2},
   {"file", 'f', N_("PROGFILE"), 0,
-   N_("Load Scheme source code from PROGFILE, and exit"), 2},
+   N_("load Scheme source code from PROGFILE and exit"), 2},
   {NULL, 0, NULL, 0, N_("Other options:"), 3},
-  {"debug", 'd', NULL, 0, N_("Start with debugging evaluator and backtraces."), 3},
+  {"debug", 'd', NULL, 0, N_("start with debugging evaluator and backtraces"), 3},
   {"guile-arg", 'g', N_("ARG"), 0,
-   N_("Append ARG to the command line passed to Guile"), 3},
-  {"mailbox", 'M', N_("NAME"), 0, N_("Set default mailbox name"), 3},
+   N_("append ARG to the command line passed to Guile"), 3},
+  {"mailbox", 'M', N_("NAME"), 0, N_("set default mailbox name"), 3},
   {"user", 'u', N_("NAME"), OPTION_ARG_OPTIONAL,
-   N_("Act as local MDA for user NAME"), 3},
+   N_("act as local MDA for user NAME"), 3},
   {0, 0, 0, 0}
 };
 
@@ -124,7 +124,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
 const char *program_version = "guimb (" PACKAGE_STRING ")";
 static char doc[] =
-N_("GNU guimb -- Process the contents of the specified mailboxes "
+N_("GNU guimb -- process contents of the specified mailboxes "
 "using a Scheme program or expression.");
 static char args_doc[] = N_("[mailbox...]");
 
diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c
index 1f8cb64aa..55917fae0 100644
--- a/imap4d/imap4d.c
+++ b/imap4d/imap4d.c
@@ -64,25 +64,25 @@ static char doc[] = N_("GNU imap4d -- the IMAP4D daemon");
 #define OPT_FOREGROUND      260
 
 static struct argp_option options[] = {
-  { "foreground", OPT_FOREGROUND, 0, 0, N_("Remain in foreground."), 0},
-  { "inetd",  'i', 0, 0, N_("Run in inetd mode"), 0},
+  { "foreground", OPT_FOREGROUND, 0, 0, N_("remain in foreground"), 0},
+  { "inetd",  'i', 0, 0, N_("run in inetd mode"), 0},
   { "daemon", 'd', N_("NUMBER"), OPTION_ARG_OPTIONAL,
-    N_("Runs in daemon mode with a maximum of NUMBER children"), 0 },
+    N_("runs in daemon mode with a maximum of NUMBER children"), 0 },
 
   {"other-namespace", 'O', N_("PATHLIST"), OPTION_HIDDEN,
-   N_("Set the `other' namespace"), 0},
+   N_("set the `other' namespace"), 0},
   {"shared-namespace", 'S', N_("PATHLIST"), OPTION_HIDDEN,
-   N_("Set the `shared' namespace"), 0},
+   N_("set the `shared' namespace"), 0},
   {"login-disabled", OPT_LOGIN_DISABLED, NULL, OPTION_HIDDEN,
-   N_("Disable LOGIN command")},
+   N_("disable LOGIN command")},
   {"create-home-dir", OPT_CREATE_HOME_DIR, N_("MODE"),
    OPTION_ARG_OPTIONAL|OPTION_HIDDEN,
-   N_("Create home directory, if it does not exist")},
+   N_("create home directory, if it does not exist")},
   {"preauth", OPT_PREAUTH, NULL, 0,
-   N_("Start in preauth mode") },
+   N_("start in preauth mode") },
 #ifdef WITH_TLS
   {"tls-required", OPT_TLS_REQUIRED, NULL, OPTION_HIDDEN,
-   N_("Always require STARTTLS before entering authentication phase")},
+   N_("always require STARTTLS before entering authentication phase")},
 #endif
   {NULL, 0, NULL, 0, NULL, 0}
 };
@@ -299,7 +299,7 @@ cb_mailbox_mode (mu_debug_t debug, void *data, mu_config_value_t *val)
 
 static struct mu_cfg_param imap4d_cfg_param[] = {
   { "homedir", mu_cfg_string, &modify_homedir, 0, NULL,
-    N_("Modify home directory") },
+    N_("Modify home directory.") },
   { "personal-namespace", MU_CFG_LIST_OF(mu_cfg_string), &namespace[NS_PRIVATE],
     0, NULL, 
     N_("Set personal namespace.") },
diff --git a/libmu_argp/auth.c b/libmu_argp/auth.c
index 32be741ab..fabacf71f 100644
--- a/libmu_argp/auth.c
+++ b/libmu_argp/auth.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -41,15 +41,15 @@ static error_t mu_auth_argp_parser (int key, char *arg,
 /* Options used by programs that use extended authentication mechanisms. */
 static struct argp_option mu_auth_argp_option[] = {
   { "authentication", OPT_AUTHENTICATION, N_("MODLIST"), OPTION_HIDDEN,
-    N_("Set the list of modules to be used for authentication"), 0 },
+    N_("set the list of modules to be used for authentication"), 0 },
   { "authorization", OPT_AUTHORIZATION, N_("MODLIST"), OPTION_HIDDEN,
-    N_("Set list of modules to be used for authorization"), 0 },
+    N_("set list of modules to be used for authorization"), 0 },
   { "clear-authorization", OPT_CLEAR_AUTHORIZATION, NULL, OPTION_HIDDEN,
-    N_("Clear the list of authorization modules"), 0 },
+    N_("clear the list of authorization modules"), 0 },
   { "clear-authentication", OPT_CLEAR_AUTHENTICATION, NULL, OPTION_HIDDEN,
-    N_("Clear the list of authentication modules"), 0 },
+    N_("clear the list of authentication modules"), 0 },
   { "debug-auth", OPT_DEBUG_AUTH, NULL, 0,
-    N_("Debug authentication functions") },
+    N_("debug authentication functions") },
   { NULL,      0, NULL, 0, NULL, 0 }
 };
 
diff --git a/libmu_argp/common.c b/libmu_argp/common.c
index d2972d9a6..a9d9e7d93 100644
--- a/libmu_argp/common.c
+++ b/libmu_argp/common.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -55,23 +55,23 @@ static struct argp_option mu_common_argp_options[] =
 {
   { NULL, 0, NULL, 0, N_("Common options"), 0},
   { "show-config-options", OPT_SHOW_OPTIONS, NULL, 0,
-    N_("Show compilation options"), 0 },
+    N_("show compilation options"), 0 },
   { "config-help", OPT_HELP_CONFIG, NULL, 0,
-    N_("Show configuration file summary"), 0 },
+    N_("show configuration file summary"), 0 },
   { "no-user-config", OPT_NO_USER_RCFILE, NULL, 0,
-    N_("Do not load user configuration file"), 0 },
+    N_("do not load user configuration file"), 0 },
   { "no-user-rcfile", 0, NULL, OPTION_ALIAS, NULL },
   { "no-site-config", OPT_NO_SITE_RCFILE, NULL, 0,
-    N_("Do not load site configuration file"), 0 },
+    N_("do not load site configuration file"), 0 },
   { "no-site-rcfile", 0, NULL, OPTION_ALIAS, NULL },
   { "config-file", OPT_RCFILE, N_("FILE"), 0,
-    N_("Load this configuration file"), 0, },
+    N_("load this configuration file"), 0, },
   { "rcfile", 0, NULL, OPTION_ALIAS, NULL },
   { "config-verbose", OPT_RCFILE_VERBOSE, NULL, 0,
-    N_("Verbosely log parsing of the configuration files"), 0 },
+    N_("verbosely log parsing of the configuration files"), 0 },
   { "rcfile-verbose", 0, NULL, OPTION_ALIAS, NULL },
   { "config-lint", OPT_RCFILE_LINT, NULL, 0,
-    N_("Check configuration file syntax and exit"), 0 },
+    N_("check configuration file syntax and exit"), 0 },
   { "rcfile-lint", 0, NULL, OPTION_ALIAS, NULL },
   { NULL, 0, NULL, 0, NULL, 0 }
 };
@@ -139,7 +139,7 @@ struct mu_cmdline_capa mu_common_cmdline = {
 
 static struct argp_option mu_logging_argp_option[] = {
   {"log-facility", OPT_LOG_FACILITY, N_("FACILITY"), 0,
-   N_("Output logs to syslog FACILITY"), 0},
+   N_("output logs to syslog FACILITY"), 0},
   { NULL,      0, NULL, 0, NULL, 0 }
 };
 
@@ -192,7 +192,7 @@ struct mu_cmdline_capa mu_logging_cmdline = {
 
 /* Option to print the license. */
 static struct argp_option mu_license_argp_option[] = {
-  { "license", OPT_LICENSE, NULL, 0, N_("Print license and exit"), -2 },
+  { "license", OPT_LICENSE, NULL, 0, N_("print license and exit"), -2 },
   { NULL,      0, NULL, 0, NULL, 0 }
 };
 
@@ -236,13 +236,13 @@ struct mu_cmdline_capa mu_license_cmdline = {
 /* Options used by programs that access mailboxes. */
 static struct argp_option mu_mailbox_argp_option[] = {
   { "mail-spool", 'm', N_("URL"), OPTION_HIDDEN,
-    N_("Use specified URL as a mailspool directory"), 0 },
+    N_("use specified URL as a mailspool directory"), 0 },
   { "mailbox-pattern", OPT_MAILBOX_PATTERN, N_("pat"), OPTION_HIDDEN,
     "", 0 },
   { "mailbox-type", OPT_MAILBOX_TYPE, N_("PROTO"), OPTION_HIDDEN,
-    N_("Default mailbox type to use"), 0 },
+    N_("default mailbox type to use"), 0 },
   { "mail-folder", OPT_MAIL_FOLDER, N_("DIR"), OPTION_HIDDEN,
-    N_("Default user mail folder"), 0 },
+    N_("default user mail folder"), 0 },
   { NULL }
 };
 
@@ -308,16 +308,16 @@ struct mu_cmdline_capa mu_mailbox_cmdline = {
 /* Options used by programs that access mailboxes. */
 static struct argp_option mu_locking_argp_option[] = {
   {"lock-flags", OPT_LOCK_FLAGS, N_("FLAGS"), OPTION_HIDDEN,
-   N_("Default locker flags (E=external, R=retry, T=time, P=pid)"), 0},
+   N_("default locker flags (E=external, R=retry, T=time, P=pid)"), 0},
   {"lock-retry-timeout", OPT_LOCK_RETRY_TIMEOUT, N_("SECONDS"), OPTION_HIDDEN,
-   N_("Set timeout for acquiring the lockfile") },
+   N_("set timeout for acquiring the lockfile") },
   {"lock-retry-count", OPT_LOCK_RETRY_COUNT, N_("NUMBER"), OPTION_HIDDEN,
-   N_("Set the maximum number of times to retry acquiring the lockfile") },
+   N_("set the maximum number of times to retry acquiring the lockfile") },
   {"lock-expire-timeout", OPT_LOCK_EXPIRE_TIMEOUT, N_("SECONDS"),
    OPTION_HIDDEN,
-   N_("Number of seconds after which the lock expires"), },
+   N_("number of seconds after which the lock expires"), },
   {"external-locker", OPT_LOCK_EXTERNAL_PROGRAM, N_("PATH"), OPTION_HIDDEN,
-   N_("Set full path to the external locker program") },
+   N_("set full path to the external locker program") },
   { NULL,      0, NULL, 0, NULL, 0 }
 };
 
@@ -386,9 +386,9 @@ struct mu_cmdline_capa mu_locking_cmdline = {
 /* Options used by programs that do address mapping. */
 static struct argp_option mu_address_argp_option[] = {
   {"email-addr", 'E', N_("EMAIL"), OPTION_HIDDEN,
-   N_("Set current user's email address (default is loginname@defaultdomain)"), 0},
+   N_("set current user's email address (default is loginname@defaultdomain)"), 0},
   {"email-domain", 'D', N_("DOMAIN"), OPTION_HIDDEN,
-   N_("Set domain for unqualified user names (default is this host)"), 0},
+   N_("set domain for unqualified user names (default is this host)"), 0},
   { NULL,      0, NULL, 0, NULL, 0 }
 };
 
@@ -445,7 +445,7 @@ struct mu_cmdline_capa mu_address_cmdline = {
 /* Options used by programs that send mail. */
 static struct argp_option mu_mailer_argp_option[] = {
   {"mailer", 'M', N_("MAILER"), 0,
-   N_("Use specified URL as the default mailer"), 0},
+   N_("use specified URL as the default mailer"), 0},
   { NULL,      0, NULL, 0, NULL, 0 }
 };
 
@@ -495,9 +495,9 @@ struct mu_cmdline_capa mu_mailer_cmdline = {
 static struct argp_option mu_debug_argp_options[] = 
 {
   { "debug-level", OPT_DEBUG_LEVEL, N_("LEVEL"), 0,
-    N_("Set Mailutils debugging level"), 0 },
+    N_("set Mailutils debugging level"), 0 },
   { "debug-line-info", OPT_LINE_INFO, NULL, 0,
-    N_("Show source info with debugging messages"), 0 },
+    N_("show source info with debugging messages"), 0 },
   { NULL }
 };
 
diff --git a/libmu_argp/gsasl.c b/libmu_argp/gsasl.c
index 598b6ce1b..e7d6996d6 100644
--- a/libmu_argp/gsasl.c
+++ b/libmu_argp/gsasl.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -26,7 +26,7 @@
 
 static struct argp_option _gsasl_argp_options[] = {
   {"cram-passwd", OPT_CRAM_PASSWD, N_("FILE"), OPTION_HIDDEN,
-   N_("Specify password file for CRAM-MD5 authentication"), 0},
+   N_("specify password file for CRAM-MD5 authentication"), 0},
   { NULL,      0, NULL, 0, NULL, 0 }
 };
 
diff --git a/libmu_argp/pam.c b/libmu_argp/pam.c
index 711aa31cc..d53a37d41 100644
--- a/libmu_argp/pam.c
+++ b/libmu_argp/pam.c
@@ -1,5 +1,5 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -52,7 +52,7 @@ mu_pam_argp_parser (int key, char *arg, struct argp_state *state)
 
 static struct argp_option mu_pam_argp_option[] = {
   { "pam-service", OPT_PAM_SERVICE, N_(