diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-08-25 10:31:59 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-08-25 10:31:59 +0300 |
commit | 8619a1cb3b5a4b84b365571b711cf792e12ab620 (patch) | |
tree | 2932c275c7d31826f79d5fef7ab962a4101819ff /guimb/collect.c | |
parent | 0c606c74e0195d00bb1410114e7b871c08c2a7f0 (diff) | |
download | mailutils-8619a1cb3b5a4b84b365571b711cf792e12ab620.tar.gz mailutils-8619a1cb3b5a4b84b365571b711cf792e12ab620.tar.bz2 |
Change error messages to comply with the GNU standards.
The string MESSAGE should not begin with a capital letter when it
follows a program name and/or file name, because that isn't the
beginning of a sentence. (The sentence conceptually starts at the
beginning of the line.) Also, it should not end with a period.
* include/mailutils/diag.h (mu_diag_funcall): New prototype.
* mailbox/diag.c: New function.
* comsat/action.c, comsat/comsat.c, comsat/oldcfg.c,
config/mailutils-config.c, configure.ac, dotlock/dotlock.c,
frm/common.c, frm/from.c, guimb/collect.c, guimb/main.c,
guimb/util.c, imap4d/auth_gsasl.c, imap4d/auth_gss.c, imap4d/bye.c,
imap4d/close.c, imap4d/imap4d.c, imap4d/login.c, imap4d/preauth.c,
imap4d/signal.c, imap4d/starttls.c, imap4d/util.c, lib/mailcap.c,
lib/tcpwrap.c, libmu_argp/mu_argp.c, libmu_auth/ldap.c,
libmu_auth/radius.c, libmu_auth/sql.c, libmu_auth/tls.c,
libmu_cfg/acl.c, libmu_cfg/common.c, libmu_cfg/init.c,
libmu_cfg/ldap.c, libmu_cfg/sql.c, libmu_sieve/actions.c,
libmu_sieve/comparator.c, libmu_sieve/extensions/moderator.c,
libmu_sieve/prog.c, libmu_sieve/sieve.l, libproto/imap/folder.c,
libproto/mbox/mbox.c, maidag/deliver.c, maidag/lmtp.c,
maidag/maidag.c, maidag/mailquota.c, maidag/mailtmp.c,
maidag/script.c, mail/alias.c, mail/cd.c, mailbox/cfg_lexer.l,
mailbox/cfg_parser.y, mailbox/file_stream.c, mailbox/gocs.c,
mailbox/msrv.c, mailbox/mutil.c, mailbox/registrar.c,
messages/messages.c, mh/folder.c, mh/forw.c, mh/inc.c, mh/mark.c,
mh/mh_ctx.c, mh/mh_fmtgram.y, mh/mh_format.c, mh/mh_init.c,
mh/mh_list.c, mh/mh_msgset.c, mh/mh_whatnow.c, mh/mh_whom.c,
mh/mhl.c, mh/mhn.c, mh/pick.c, mh/refile.c, mh/repl.c, mh/rmf.c,
mh/scan.c, mh/send.c, mimeview/mimetypes.l, mimeview/mimeview.c,
movemail/movemail.c, pop3d/apop.c, pop3d/bulletin.c, pop3d/extra.c,
pop3d/lock.c, pop3d/logindelay.c, pop3d/pop3d.c, pop3d/popauth.c,
pop3d/quit.c, pop3d/signal.c, pop3d/user.c, readmsg/readmsg.c,
sieve/sieve.c: Fix error messages.
Diffstat (limited to 'guimb/collect.c')
-rw-r--r-- | guimb/collect.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/guimb/collect.c b/guimb/collect.c index 8839d98a3..4b94c620f 100644 --- a/guimb/collect.c +++ b/guimb/collect.c @@ -33,7 +33,7 @@ collect_open_default () int rc = mu_construct_user_mailbox_url (&default_mailbox, user_name); if (rc) { - util_error (_("Cannot construct default mailbox URL: %s"), + util_error (_("cannot construct default mailbox URL: %s"), mu_strerror (rc)); exit (1); } @@ -41,7 +41,7 @@ collect_open_default () if (mu_mailbox_create (&mbox, default_mailbox) != 0 || mu_mailbox_open (mbox, MU_STREAM_RDWR) != 0) { - util_error (_("Cannot open default mailbox %s: %s"), + util_error (_("cannot open default mailbox %s: %s"), default_mailbox, mu_strerror (errno)); exit (1); } @@ -85,7 +85,7 @@ collect_append_file (char *name) fp = fopen (name, "r"); if (!fp) { - util_error (_("Cannot open input file %s: %s"), name, strerror (errno)); + util_error (_("cannot open input file %s: %s"), name, strerror (errno)); return -1; } } @@ -113,7 +113,7 @@ collect_create_mailbox () if (mu_mailbox_create (&mbox, temp_filename) != 0 || mu_mailbox_open (mbox, MU_STREAM_READ) != 0) { - util_error (_("Cannot create temp mailbox %s: %s"), + util_error (_("cannot create temp mailbox %s: %s"), temp_filename, strerror (errno)); unlink (temp_filename); exit (1); @@ -124,7 +124,7 @@ collect_create_mailbox () if (nmesg == 0) { - util_error (_("Input format not recognized")); + util_error (_("input format not recognized")); exit (1); } } @@ -149,8 +149,8 @@ collect_output () || mu_mailbox_open (outbox, MU_STREAM_RDWR|MU_STREAM_CREAT) != 0) { mu_mailbox_destroy (&outbox); - fprintf (stderr, _("Cannot open output mailbox %s: %s\n"), - default_mailbox, strerror (errno)); + mu_error (_("cannot open output mailbox %s: %s"), + default_mailbox, strerror (errno)); return 1; } |