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 /movemail | |
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 'movemail')
-rw-r--r-- | movemail/movemail.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/movemail/movemail.c b/movemail/movemail.c index 8b01a92b8..1f0d2a0f4 100644 --- a/movemail/movemail.c +++ b/movemail/movemail.c @@ -40,17 +40,17 @@ static char args_doc[] = N_("inbox-url destfile [POP-password]"); #define OPT_EMACS 256 static struct argp_option options[] = { - { "preserve", 'p', NULL, 0, N_("Preserve the source mailbox") }, + { "preserve", 'p', NULL, 0, N_("preserve the source mailbox") }, { "keep-messages", 0, NULL, OPTION_ALIAS, NULL }, - { "reverse", 'r', NULL, 0, N_("Reverse the sorting order") }, + { "reverse", 'r', NULL, 0, N_("reverse the sorting order") }, { "emacs", OPT_EMACS, NULL, 0, - N_("Output information used by Emacs rmail interface") }, + N_("output information used by Emacs rmail interface") }, { "uidl", 'u', NULL, 0, - N_("Use UIDLs to avoid downloading the same message twice") }, + N_("use UIDLs to avoid downloading the same message twice") }, { "verbose", 'v', NULL, 0, - N_("Increase verbosity level") }, + N_("increase verbosity level") }, { "owner", 'P', N_("MODELIST"), 0, - N_("Control mailbox ownership") }, + N_("control mailbox ownership") }, { NULL, 0, NULL, 0, NULL, 0 } }; @@ -431,7 +431,7 @@ move_message (mu_mailbox_t src, mu_mailbox_t dst, size_t msgno) } if ((rc = mu_mailbox_append_message (dst, msg)) != 0) { - mu_error (_("cannot append message %lu: %s\n"), + mu_error (_("cannot append message %lu: %s"), (unsigned long) msgno, mu_strerror (rc)); return rc; } @@ -498,8 +498,7 @@ get_mbox_owner_id (mu_mailbox_t mbox, mu_url_t url, struct user_id *id) die (mbox, _("cannot get path"), rc); if (stat (s, &st)) { - mu_error (_("cannot stat mailbox `%s': %s"), s, - mu_strerror (errno)); + mu_diag_funcall (MU_DIAG_ERROR, "stat", s, errno); exit (1); } id->uid = st.st_uid; @@ -551,7 +550,10 @@ guess_mbox_owner (mu_mailbox_t mbox, struct user_id *id) rc = mu_mailbox_get_url (mbox, &url); if (rc) - die (mbox, _("cannot get url"), rc); + { + mu_diag_funcall (MU_DIAG_ERROR, "mu_mailbox_get_url", NULL, rc); + exit (1); + } rc = 1; for (meth = so_methods; rc == 1 && meth < so_methods + so_method_num; meth++) @@ -772,7 +774,7 @@ main (int argc, char **argv) if (src_uidl_list && !msgno_in_list (src_uidl_list, i)) { if (verbose_option > 1) - mu_diag_output (MU_DIAG_INFO, _("Ignoring message %lu"), + mu_diag_output (MU_DIAG_INFO, _("ignoring message %lu"), (unsigned long) i); continue; } |