summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2005-01-04 17:16:42 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2005-01-04 17:16:42 +0000
commitd56fde2d16113fa30b68379d40c4087cf2fd84e5 (patch)
tree1a1d1a4d5c84342ba9dd05026f6e22dc7a869602
parentbd178bb676dcbb88aacd25293ebb7c098be98a31 (diff)
downloadmailutils-d56fde2d16113fa30b68379d40c4087cf2fd84e5.tar.gz
mailutils-d56fde2d16113fa30b68379d40c4087cf2fd84e5.tar.bz2
Revise error messages for accordance with GNU standards:
begin messages with a capital letter, unless they are prefixed with `file:line:' or their exact look is important due to compatibility reasons. Do not end messages with a period. Avoid using contracted negations.
-rw-r--r--auth/sql.c8
-rw-r--r--auth/tls.c2
-rw-r--r--comsat/action.c6
-rw-r--r--comsat/cfg.c8
-rw-r--r--comsat/comsat.c38
-rw-r--r--dotlock/dotlock.c11
-rw-r--r--frm/frm.c14
-rw-r--r--from/from.c8
-rw-r--r--guimb/collect.c12
-rw-r--r--guimb/main.c2
-rw-r--r--guimb/util.c4
-rw-r--r--imap4d/auth_gss.c4
-rw-r--r--imap4d/imap4d.c12
-rw-r--r--imap4d/list.c2
-rw-r--r--imap4d/signal.c2
-rw-r--r--imap4d/util.c10
-rw-r--r--libsieve/actions.c22
-rw-r--r--libsieve/comparator.c4
-rw-r--r--libsieve/prog.c14
-rw-r--r--libsieve/runtime.c2
-rw-r--r--libsieve/sieve.l12
-rw-r--r--libsieve/tests.c17
-rw-r--r--libsieve/util.c2
-rw-r--r--mail.local/mailquota.c10
-rw-r--r--mail.local/main.c39
-rw-r--r--mail.local/script.c2
-rw-r--r--mail/alt.c5
-rw-r--r--mail/copy.c4
-rw-r--r--mail/decode.c2
-rw-r--r--mail/file.c4
-rw-r--r--mail/if.c8
-rw-r--r--mail/mail.c8
-rw-r--r--mail/mailline.c8
-rw-r--r--mail/quit.c4
-rw-r--r--mail/send.c14
-rw-r--r--mail/source.c3
-rw-r--r--mail/unalias.c1
-rw-r--r--mail/util.c28
-rw-r--r--mail/var.c15
-rw-r--r--mail/z.c2
-rw-r--r--mailbox/mailutils-config.c7
-rw-r--r--mailbox/mu_argp.c18
-rw-r--r--messages/messages.c12
-rw-r--r--mh/fmtcheck.c2
-rw-r--r--mh/folder.c6
-rw-r--r--mh/forw.c4
-rw-r--r--mh/inc.c12
-rw-r--r--mh/mark.c2
-rw-r--r--mh/mh_argp.c2
-rw-r--r--mh/mh_ctx.c4
-rw-r--r--mh/mh_fmtgram.y4
-rw-r--r--mh/mh_format.c1
-rw-r--r--mh/mh_init.c40
-rw-r--r--mh/mh_list.c8
-rw-r--r--mh/mh_msgset.c8
-rw-r--r--mh/mh_whom.c4
-rw-r--r--mh/mhl.c10
-rw-r--r--mh/mhn.c34
-rw-r--r--mh/pick.c6
-rw-r--r--mh/refile.c16
-rw-r--r--mh/repl.c8
-rw-r--r--mh/rmf.c6
-rw-r--r--mh/scan.c2
-rw-r--r--mh/send.c10
-rw-r--r--movemail/movemail.c4
-rw-r--r--pop3d/apop.c8
-rw-r--r--pop3d/extra.c4
-rw-r--r--pop3d/lock.c4
-rw-r--r--pop3d/pop3d.c4
-rw-r--r--pop3d/popauth.c34
-rw-r--r--pop3d/signal.c2
-rw-r--r--readmsg/readmsg.c4
-rw-r--r--sieve/sieve.c12
73 files changed, 341 insertions, 334 deletions
diff --git a/auth/sql.c b/auth/sql.c
index ba3673bbe..4d78b39d5 100644
--- a/auth/sql.c
+++ b/auth/sql.c
@@ -317,7 +317,7 @@ mu_auth_sql_by_name (struct mu_auth_data **return_data,
if (status)
{
- mu_error (_("cannot store SQL result: %s"),
+ mu_error (_("Cannot store SQL result: %s"),
(status == MU_ERR_SQL) ? mu_sql_strerror (conn) :
mu_strerror (status));
mu_sql_connection_destroy (&conn);
@@ -451,7 +451,7 @@ mu_auth_sql_by_uid (struct mu_auth_data **return_data,
if (status)
{
- mu_error (_("cannot store SQL result: %s"),
+ mu_error (_("Cannot store SQL result: %s"),
(status == MU_ERR_SQL) ? mu_sql_strerror (conn) :
mu_strerror (status));
mu_sql_connection_destroy (&conn);
@@ -581,7 +581,7 @@ mu_sql_authenticate (struct mu_auth_data **return_data ARG_UNUSED,
if (status)
{
- mu_error (_("cannot store SQL result: %s"),
+ mu_error (_("Cannot store SQL result: %s"),
(status == MU_ERR_SQL) ? mu_sql_strerror (conn) :
mu_strerror (status));
mu_sql_connection_destroy (&conn);
@@ -591,7 +591,7 @@ mu_sql_authenticate (struct mu_auth_data **return_data ARG_UNUSED,
status = mu_sql_get_column (conn, 0, 0, &sql_pass);
if (status)
{
- mu_error (_("cannot get password from SQL: %s"),
+ mu_error (_("Cannot get password from SQL: %s"),
(status == MU_ERR_SQL) ? mu_sql_strerror (conn) :
mu_strerror (status));
mu_sql_release_result (conn);
diff --git a/auth/tls.c b/auth/tls.c
index 905d299ad..07e2737d9 100644
--- a/auth/tls.c
+++ b/auth/tls.c
@@ -185,7 +185,7 @@ mu_check_tls_environment (void)
}
if ((st.st_mode & S_IRWXG) || (st.st_mode & S_IRWXO))
{
- mu_error (_("Wrong permissions on %s. Set 0600."), ssl_key);
+ mu_error (_("Wrong permissions on %s. Set 0600"), ssl_key);
return 0;
}
}
diff --git a/comsat/action.c b/comsat/action.c
index a624a38c7..18ae379be 100644
--- a/comsat/action.c
+++ b/comsat/action.c
@@ -274,14 +274,14 @@ action_exec (FILE *tty, int line, int argc, char **argv)
if (stat (argv[0], &stb))
{
- syslog (LOG_ERR, _("%s:.biffrc:%d: can't stat %s: %s"),
+ syslog (LOG_ERR, _("%s:.biffrc:%d: cannot stat %s: %s"),
username, line, argv[0], strerror (errno));
return;
}
if (stb.st_mode & (S_ISUID|S_ISGID))
{
- syslog (LOG_ERR, _("%s:.biffrc:%d: won't execute set[ug]id programs"),
+ syslog (LOG_ERR, _("%s:.biffrc:%d: will not execute set[ug]id programs"),
username, line);
return;
}
@@ -295,7 +295,7 @@ action_exec (FILE *tty, int line, int argc, char **argv)
dup2 (fileno (tty), 2);
fclose (tty);
execv (argv[0], argv);
- syslog (LOG_ERR, _("can't execute %s: %s"), argv[0], strerror (errno));
+ syslog (LOG_ERR, _("Cannot execute %s: %s"), argv[0], strerror (errno));
exit (0);
}
}
diff --git a/comsat/cfg.c b/comsat/cfg.c
index 2a1649cda..eaa65a3a7 100644
--- a/comsat/cfg.c
+++ b/comsat/cfg.c
@@ -111,7 +111,7 @@ netdef_parse (char *str)
netdef = malloc (sizeof *netdef);
if (!netdef)
{
- syslog (LOG_ERR, _("out of memory"));
+ syslog (LOG_ERR, _("Out of memory"));
exit (1);
}
@@ -136,7 +136,7 @@ read_config (const char *config_file)
fp = fopen (config_file, "r");
if (!fp)
{
- syslog (LOG_ERR, _("can't open config file %s: %m"), config_file);
+ syslog (LOG_ERR, _("Cannot open config file %s: %m"), config_file);
return;
}
@@ -206,7 +206,7 @@ read_config (const char *config_file)
netdef_t *cur = netdef_parse (argv[i]);
if (!cur)
{
- syslog (LOG_ERR, _("%s:%d: can't parse netdef: %s"),
+ syslog (LOG_ERR, _("%s:%d: cannot parse netdef: %s"),
config_file, line, argv[i]);
continue;
}
@@ -222,7 +222,7 @@ read_config (const char *config_file)
acl = malloc (sizeof *acl);
if (!acl)
{
- syslog (LOG_CRIT, _("out of memory"));
+ syslog (LOG_CRIT, _("Out of memory"));
exit (1);
}
acl->next = NULL;
diff --git a/comsat/comsat.c b/comsat/comsat.c
index bc21117de..84fdedaea 100644
--- a/comsat/comsat.c
+++ b/comsat/comsat.c
@@ -179,10 +179,10 @@ main(int argc, char **argv)
static RETSIGTYPE
sig_hup (int sig)
{
- syslog (LOG_NOTICE, _("restarting"));
+ syslog (LOG_NOTICE, _("Restarting"));
if (xargv[0][0] != '/')
- syslog (LOG_ERR, _("can't restart: not started with absolute pathname"));
+ syslog (LOG_ERR, _("Cannot restart: program must be invoked using absolute pathname"));
else
execvp (xargv[0], xargv);
@@ -216,7 +216,7 @@ comsat_daemon_init (void)
first three one, in, out, err. Do not do the chdir("/"). */
if (daemon (1, 0) < 0)
{
- perror (_("failed to become a daemon"));
+ perror (_("Failed to become a daemon"));
exit (EXIT_FAILURE);
}
}
@@ -288,8 +288,8 @@ comsat_daemon (int port)
delay = overflow_delay_time << (overflow_count + 1);
syslog (LOG_NOTICE,
- ngettext ("too many requests: pausing for %u second",
- "too many requests: pausing for %u seconds",
+ ngettext ("Too many requests: pausing for %u second",
+ "Too many requests: pausing for %u seconds",
delay),
delay);
sleep (delay);
@@ -349,8 +349,8 @@ comsat_main (int fd)
}
syslog (LOG_INFO,
- ngettext ("received %d byte from %s",
- "received %d bytes from %s", rdlen),
+ ngettext ("Received %d byte from %s",
+ "Received %d bytes from %s", rdlen),
rdlen, inet_ntoa (sin_from.sin_addr));
buffer[rdlen] = 0;
@@ -359,7 +359,7 @@ comsat_main (int fd)
p = strchr (buffer, '@');
if (!p)
{
- syslog (LOG_ERR, _("malformed input: %s"), buffer);
+ syslog (LOG_ERR, _("Malformed input: %s"), buffer);
return 1;
}
*p++ = 0;
@@ -374,7 +374,7 @@ comsat_main (int fd)
break;
default:
if (!isspace (*endp))
- syslog (LOG_ERR, _("malformed input: %s@%s (near %s)"), buffer, p, endp);
+ syslog (LOG_ERR, _("Malformed input: %s@%s (near %s)"), buffer, p, endp);
}
if (find_user (buffer, tty) != SUCCESS)
@@ -440,7 +440,7 @@ notify_user (const char *user, const char *device, const char *path, off_t offse
change_user (user);
if ((fp = fopen (device, "w")) == NULL)
{
- syslog (LOG_ERR, _("can't open device %s: %m"), device);
+ syslog (LOG_ERR, _("Cannot open device %s: %m"), device);
exit (0);
}
@@ -456,21 +456,21 @@ notify_user (const char *user, const char *device, const char *path, off_t offse
if ((status = mailbox_create (&mbox, path)) != 0
|| (status = mailbox_open (mbox, MU_STREAM_READ)) != 0)
{
- syslog (LOG_ERR, _("can't open mailbox %s: %s"),
+ syslog (LOG_ERR, _("Cannot open mailbox %s: %s"),
path, mu_strerror (status));
return;
}
if ((status = mailbox_get_stream (mbox, &stream)))
{
- syslog (LOG_ERR, _("can't get stream for mailbox %s: %s"),
+ syslog (LOG_ERR, _("Cannot get stream for mailbox %s: %s"),
path, mu_strerror (status));
return;
}
if ((status = stream_size (stream, &size)))
{
- syslog (LOG_ERR, _("can't get stream size (mailbox %s): %s"),
+ syslog (LOG_ERR, _("Cannot get stream size (mailbox %s): %s"),
path, mu_strerror (status));
return;
}
@@ -487,14 +487,14 @@ notify_user (const char *user, const char *device, const char *path, off_t offse
if ((status = mailbox_create (&tmp, "/dev/null")) != 0
|| (status = mailbox_open (tmp, MU_STREAM_READ)) != 0)
{
- syslog (LOG_ERR, _("can't create temporary mailbox: %s"),
+ syslog (LOG_ERR, _("Cannot create temporary mailbox: %s"),
mu_strerror (status));
return;
}
if ((status = memory_stream_create (&stream, 0, 0)))
{
- syslog (LOG_ERR, _("can't create temporary stream: %s"),
+ syslog (LOG_ERR, _("Cannot create temporary stream: %s"),
mu_strerror (status));
return;
}
@@ -541,7 +541,7 @@ find_user (const char *name, char *tty)
if (strncmp (ftty, PATH_TTY_PFX, strlen (PATH_TTY_PFX)))
{
/* An attempt to break security... */
- syslog (LOG_ALERT, _("bad line name in utmp record: %s"), ftty);
+ syslog (LOG_ALERT, _("Bad line name in utmp record: %s"), ftty);
return NOT_HERE;
}
@@ -549,7 +549,7 @@ find_user (const char *name, char *tty)
{
if (!S_ISCHR (statb.st_mode))
{
- syslog (LOG_ALERT, _("not a character device: %s"), ftty);
+ syslog (LOG_ALERT, _("Not a character device: %s"), ftty);
return NOT_HERE;
}
@@ -582,7 +582,7 @@ change_user (const char *user)
pw = getpwnam (user);
if (!pw)
{
- syslog (LOG_CRIT, _("no such user: %s"), user);
+ syslog (LOG_CRIT, _("No such user: %s"), user);
exit (1);
}
@@ -602,7 +602,7 @@ mailbox_path (const char *user)
if (!auth)
{
- syslog (LOG_ALERT, _("user nonexistent: %s"), user);
+ syslog (LOG_ALERT, _("User nonexistent: %s"), user);
return NULL;
}
diff --git a/dotlock/dotlock.c b/dotlock/dotlock.c
index 98b052baf..40f0d5281 100644
--- a/dotlock/dotlock.c
+++ b/dotlock/dotlock.c
@@ -54,9 +54,6 @@ static struct argp_option options[] = {
{"debug", 'd', NULL, 0,
N_("Print details of failure reasons to stderr"), 0},
- {"test", 'T', N_("PROGRAM"), OPTION_HIDDEN,
- N_("Test external dotlocker"), 0},
-
{NULL, 0, NULL, 0, NULL, 0}
};
@@ -112,7 +109,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;
@@ -148,7 +145,7 @@ main (int argc, char *argv[])
if ((err = locker_create (&locker, file, flags)))
{
if (debug)
- fprintf (stderr, _("locker create failed: %s\n"), mu_strerror (err));
+ fprintf (stderr, _("Creating locker failed: %s\n"), mu_strerror (err));
return MU_DL_EX_ERROR;
}
@@ -174,8 +171,8 @@ main (int argc, char *argv[])
if (debug && err)
fprintf (stderr,
- unlock ? _("unlocking the file %s failed: %s\n") :
- _("locking the file %s failed: %s\n"),
+ unlock ? _("Unlocking the file %s failed: %s\n") :
+ _("Locking the file %s failed: %s\n"),
file, mu_strerror (err));
switch (err)
diff --git a/frm/frm.c b/frm/frm.c
index 2828146e4..52dd331de 100644
--- a/frm/frm.c
+++ b/frm/frm.c
@@ -212,7 +212,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
be_quiet += 2;
if (freopen ("/dev/null", "w", stdout) == NULL)
{
- perror (_("Can not be very quiet"));
+ perror (_("Cannot be very quiet"));
exit (3);
}
break;
@@ -303,7 +303,7 @@ rfc2047_decode_wrapper (char *buf, size_t buflen)
if (rc)
{
if (dbug)
- mu_error (_("Can't decode line `%s': %s"),
+ mu_error (_("Cannot decode line `%s': %s"),
buf, mu_strerror (rc));
return strdup (buf);
}
@@ -504,7 +504,7 @@ frm_abort (mailbox_t *mbox)
{
url_t url;
- mu_error (_("Couldn't close <%s>: %s."),
+ mu_error (_("Could not close <%s>: %s."),
url_to_string (url), mu_strerror (status));
exit (3);
}
@@ -531,7 +531,7 @@ frm (char *mailbox_name)
status = mailbox_create_default (&mbox, mailbox_name);
if (status != 0)
{
- mu_error (_("Couldn't create mailbox <%s>: %s."),
+ mu_error (_("Could not create mailbox <%s>: %s."),
mailbox_name ? mailbox_name : _("default"),
mu_strerror (status));
exit (3);
@@ -551,7 +551,7 @@ frm (char *mailbox_name)
/* nothing to do */;
else if (status != 0)
{
- mu_error (_("Couldn't open mailbox <%s>: %s."),
+ mu_error (_("Could not open mailbox <%s>: %s."),
url_to_string (url), mu_strerror (status));
frm_abort (&mbox);
}
@@ -570,7 +570,7 @@ frm (char *mailbox_name)
status = mailbox_scan (mbox, 1, &total);
if (status != 0)
{
- mu_error (_("Couldn't scan mailbox <%s>: %s."),
+ mu_error (_("Could not scan mailbox <%s>: %s."),
url_to_string (url), mu_strerror (status));
frm_abort (&mbox);
}
@@ -580,7 +580,7 @@ frm (char *mailbox_name)
if ((status = mailbox_close (mbox)) != 0)
{
- mu_error (_("Couldn't close <%s>: %s."),
+ mu_error (_("Could not close <%s>: %s."),
url_to_string (url), mu_strerror (status));
exit (3);
}
diff --git a/from/from.c b/from/from.c
index 9d0a60454..344c8c8ba 100644
--- a/from/from.c
+++ b/from/from.c
@@ -131,7 +131,7 @@ rfc2047_decode_wrapper (char *buf, size_t buflen)
if (rc)
{
if (debug)
- mu_error (_("Can't decode line `%s': %s"),
+ mu_error (_("Cannot decode line `%s': %s"),
buf, mu_strerror (rc));
return strdup (buf);
}
@@ -169,7 +169,7 @@ main (int argc, char **argv)
status = mailbox_create_default (&mbox, mailbox_name);
if (status != 0)
{
- mu_error (_("Couldn't create mailbox <%s>: %s."),
+ mu_error (_("Could not create mailbox <%s>: %s."),
mailbox_name ? mailbox_name : _("default"),
mu_strerror (status));
exit (1);
@@ -186,7 +186,7 @@ main (int argc, char **argv)
status = mailbox_open (mbox, MU_STREAM_READ);
if (status != 0)
{
- mu_error (_("Couldn't open mailbox <%s>: %s."),
+ mu_error (_("Could not open mailbox <%s>: %s."),
mailbox_name, mu_strerror (status));
exit (1);
}
@@ -244,7 +244,7 @@ main (int argc, char **argv)
status = mailbox_close (mbox);
if (status != 0)
{
- mu_error (_("Couldn't close <%s>: %s."),
+ mu_error (_("Could not close <%s>: %s."),
mailbox_name, mu_strerror (status));
}
diff --git a/guimb/collect.c b/guimb/collect.c
index 6b63ff790..7bf1ae8b9 100644
--- a/guimb/collect.c
+++ b/guimb/collect.c
@@ -31,14 +31,14 @@ collect_open_default ()
asprintf (&default_mailbox, "%s%s", mu_path_maildir, user_name);
if (!default_mailbox)
{
- util_error (_("not enough memory"));
+ util_error (_("Not enough memory"));
exit (1);
}
}
if (mailbox_create (&mbox, default_mailbox) != 0
|| mailbox_open (mbox, MU_STREAM_RDWR) != 0)
{
- util_error (_("can't open default mailbox %s: %s"),
+ util_error (_("Cannot open default mailbox %s: %s"),
default_mailbox, mu_strerror (errno));
exit (1);
}
@@ -82,7 +82,7 @@ collect_append_file (char *name)
fp = fopen (name, "r");
if (!fp)
{
- util_error (_("can't open input file %s: %s"), name, strerror (errno));
+ util_error (_("Cannot open input file %s: %s"), name, strerror (errno));
return -1;
}
}
@@ -110,7 +110,7 @@ collect_create_mailbox ()
if (mailbox_create (&mbox, temp_filename) != 0
|| mailbox_open (mbox, MU_STREAM_READ) != 0)
{
- util_error (_("can't create temp mailbox %s: %s"),
+ util_error (_("Cannot create temp mailbox %s: %s"),
temp_filename, strerror (errno));
unlink (temp_filename);
exit (1);
@@ -121,7 +121,7 @@ collect_create_mailbox ()
if (nmesg == 0)
{
- util_error (_("input format not recognized"));
+ util_error (_("Input format not recognized"));
exit (1);
}
}
@@ -146,7 +146,7 @@ collect_output ()
|| mailbox_open (outbox, MU_STREAM_RDWR|MU_STREAM_CREAT) != 0)
{
mailbox_destroy (&outbox);
- fprintf (stderr, _("guimb: can't open output mailbox %s: %s\n"),
+ fprintf (stderr, _("Cannot open output mailbox %s: %s\n"),
default_mailbox, strerror (errno));
return 1;
}
diff --git a/guimb/main.c b/guimb/main.c
index 5135fde9e..c7a7b8104 100644
--- a/guimb/main.c
+++ b/guimb/main.c
@@ -41,7 +41,7 @@ append_arg (char *arg)
g_argv = realloc (g_argv, g_size * sizeof (g_argv[0]));
if (!g_argv)
{
- util_error (_("not enough memory"));
+ util_error (_("Not enough memory"));
exit (1);
}
}
diff --git a/guimb/util.c b/guimb/util.c
index a2d9803d8..344468a15 100644
--- a/guimb/util.c
+++ b/guimb/util.c
@@ -47,14 +47,14 @@ util_get_sender (int msgno)
if (envelope_sender (env, buffer, sizeof (buffer), NULL)
|| address_create (&addr, buffer))
{
- util_error (_("can't determine sender name (msg %d)"), msgno);
+ util_error (_("Cannot determine sender name (msg %d)"), msgno);
return NULL;
}
}
if (address_get_email (addr, 1, buffer, sizeof (buffer), NULL))
{
- util_error (_("can't determine sender name (msg %d)"), msgno);
+ util_error (_("Cannot determine sender name (msg %d)"), msgno);
address_destroy (&addr);
return NULL;
}
diff --git a/imap4d/auth_gss.c b/imap4d/auth_gss.c
index 8e50605f0..0e637660f 100644
--- a/imap4d/auth_gss.c
+++ b/imap4d/auth_gss.c
@@ -250,7 +250,7 @@ auth_gssapi (struct imap4d_command *command,
if ((mec