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 /dotlock | |
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 'dotlock')
-rw-r--r-- | dotlock/dotlock.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/dotlock/dotlock.c b/dotlock/dotlock.c index 882b1de02..8d9098b56 100644 --- a/dotlock/dotlock.c +++ b/dotlock/dotlock.c @@ -1,6 +1,6 @@ /* GNU Mailutils -- a suite of utilities for electronic mail Copyright (C) 1999, 2000, 2001, 2002, 2005, - 2007, 2008 Free Software Foundation, Inc. + 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 @@ -100,7 +100,7 @@ parse_opt (int key, char *arg, struct argp_state *state) case ARGP_KEY_ARG: if (file) - argp_error (state, _("Only one FILE can be specified")); + argp_error (state, _("only one FILE can be specified")); file = arg; break; @@ -178,7 +178,7 @@ main (int argc, char *argv[]) if ((err = mu_locker_create (&locker, file, flags))) { if (debug) - fprintf (stderr, _("Creating locker failed: %s\n"), mu_strerror (err)); + mu_diag_funcall (MU_DIAG_ERROR, "mu_locker_create", NULL, err); return MU_DL_EX_ERROR; } @@ -201,10 +201,9 @@ main (int argc, char *argv[]) mu_locker_destroy (&locker); if (debug && err) - fprintf (stderr, - unlock ? _("Unlocking the file %s failed: %s\n") : - _("Locking the file %s failed: %s\n"), - file, mu_strerror (err)); + mu_error (unlock ? _("unlocking the file %s failed: %s") : + _("locking the file %s failed: %s"), + file, mu_strerror (err)); switch (err) { |