summaryrefslogtreecommitdiff
path: root/mail
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 /mail
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.
Diffstat (limited to 'mail')
-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
14 files changed, 55 insertions, 51 deletions
diff --git a/mail/alt.c b/mail/alt.c
index a07b49ea8..38e6754dd 100644
--- a/mail/alt.c
+++ b/mail/alt.c
@@ -60,7 +60,7 @@ mail_set_my_name (char *name)
struct passwd *pw = getpwuid (getuid ());
if (!pw)
{
- util_error (_("can't determine my username"));
+ util_error (_("Cannot determine my username"));
exit (1);
}
name = pw->pw_name;
@@ -69,7 +69,8 @@ mail_set_my_name (char *name)
my_email = mu_get_user_email (name);
if (!my_email)
{
- util_error(_("can't determine my email address: %s"), mu_strerror (errno));
+ util_error(_("Cannot determine my email address: %s"),
+ mu_strerror (errno));
exit (1);
}
}
diff --git a/mail/copy.c b/mail/copy.c
index ce86a04f9..2749f82de 100644
--- a/mail/copy.c
+++ b/mail/copy.c
@@ -65,7 +65,7 @@ mail_copy0 (int argc, char **argv, int mark)
if (mailbox_create_default (&mbx, filename)
|| mailbox_open (mbx, MU_STREAM_WRITE | MU_STREAM_CREAT))
{
- util_error (_("can't create mailbox %s"), filename);
+ util_error (_("Cannot create mailbox %s"), filename);
free (filename);
msgset_free (msglist);
return 1;
@@ -80,7 +80,7 @@ mail_copy0 (int argc, char **argv, int mark)
status = mailbox_append_message (mbx, msg);
if (status)
{
- util_error (_("can't append message: %s"), mu_strerror (status));
+ util_error (_("Cannot append message: %s"), mu_strerror (status));
break;
}
diff --git a/mail/decode.c b/mail/decode.c
index 6b2bd18bb..33ecb890f 100644
--- a/mail/decode.c
+++ b/mail/decode.c
@@ -142,7 +142,7 @@ display_part_header (FILE *out, const msgset_t *msgset,
fprintf (out, "\n");
fprintf (out, _("| Type=%s\n"), type);
- fprintf (out, _("| encoding=%s\n"), encoding);
+ fprintf (out, _("| Encoding=%s\n"), encoding);
fputc ('+', out);
for (i = 0; (int)i <= size; i++)
fputc ('-', out);
diff --git a/mail/file.c b/mail/file.c
index d1ced5b25..a141af350 100644
--- a/mail/file.c
+++ b/mail/file.c
@@ -88,7 +88,7 @@ mail_file (int argc, char **argv)
|| (status = mailbox_open (newbox, MU_STREAM_RDWR)) != 0)
{
mailbox_destroy (&newbox);
- util_error(_("can't open mailbox %s: %s"), name, mu_strerror (status));
+ util_error(_("Cannot open mailbox %s: %s"), name, mu_strerror (status));
free (name);
return 1;
}
@@ -122,7 +122,7 @@ mail_file (int argc, char **argv)
}
else
{
- util_error(_("%s takes only one arg"), argv[0]);
+ util_error(_("%s takes only one argument"), argv[0]);
}
return 1;
}
diff --git a/mail/if.c b/mail/if.c
index fc959b294..532e6f1fb 100644
--- a/mail/if.c
+++ b/mail/if.c
@@ -52,7 +52,7 @@ _cond_push(int val)
if (!_cond_stack)
{
- util_error(_("not enough memory"));
+ util_error(_("Not enough memory"));
exit (EXIT_FAILURE);
}
_cond_stack[_cond_level++] = val;
@@ -63,7 +63,7 @@ _cond_pop()
{
if (_cond_level == 0)
{
- util_error(_("internal error: condition stack underflow"));
+ util_error(_("Internal error: condition stack underflow"));
abort();
}
return _cond_stack[--_cond_level];
@@ -92,7 +92,7 @@ mail_if (int argc, char **argv)
if (argv[1][1] != 0)
{
- util_error(_("valid if arguments are: s | r | t"));
+ util_error(_("Valid if arguments are: s | r | t"));
return 1;
}
@@ -116,7 +116,7 @@ mail_if (int argc, char **argv)
cond = isatty (fileno (stdout));
break;
default:
- util_error(_("valid if arguments are: s | r | t"));
+ util_error(_("Valid if arguments are: s | r | t"));
return 1;
}
}
diff --git a/mail/mail.c b/mail/mail.c
index f7087baf7..206389335 100644
--- a/mail/mail.c
+++ b/mail/mail.c
@@ -398,14 +398,14 @@ main (int argc, char **argv)
rc = mailbox_create_default (&mbox, NULL);
if (rc != 0)
{
- util_error (_("Can not create mailbox for %s: %s"), args.user,
+ util_error (_("Cannot create mailbox for %s: %s"), args.user,
mu_strerror (rc));
exit (EXIT_FAILURE);
}
}
else if ((rc = mailbox_create_default (&mbox, args.file)) != 0)
{
- util_error (_("Can not create mailbox %s: %s"), args.file,
+ util_error (_("Cannot create mailbox %s: %s"), args.file,
mu_strerror (rc));
exit (EXIT_FAILURE);
}
@@ -422,7 +422,7 @@ main (int argc, char **argv)
{
url_t url = NULL;
mailbox_get_url (mbox, &url);
- util_error (_("Can not open mailbox %s: %s"),
+ util_error (_("Cannot open mailbox %s: %s"),
url_to_string (url), mu_strerror (rc));
mailbox_destroy (&mbox);
exit (EXIT_FAILURE);
@@ -436,7 +436,7 @@ main (int argc, char **argv)
{
url_t url = NULL;
mailbox_get_url (mbox, &url);
- util_error (_("Can not read mailbox %s: %s"),
+ util_error (_("Cannot read mailbox %s: %s"),
url_to_string (url), mu_strerror (rc));
exit (EXIT_FAILURE);
}
diff --git a/mail/mailline.c b/mail/mailline.c
index 3c827c6a3..b9f4174e4 100644
--- a/mail/mailline.c
+++ b/mail/mailline.c
@@ -398,7 +398,7 @@ ml_reread (const char *prompt, char **text)
if (!line)
{
- util_error (_("not enough memory to edit the line"));
+ util_error (_("Not enough memory to edit the line"));
return -1;
}
@@ -426,7 +426,7 @@ ml_reread (const char *prompt, char **text)
if ((p = realloc (line, line_size + LINE_INC)) == NULL)
{
fputs ("\n", stdout);
- util_error (_("not enough memory to edit the line"));
+ util_error (_("Not enough memory to edit the line"));
break;
}
else
@@ -473,7 +473,7 @@ ml_reread (const char *prompt, char **text)
if ((p = realloc (line, line_size + LINE_INC)) == NULL)
{
fputs ("\n", stdout);
- util_error (_("not enough memory to edit the line"));
+ util_error (_("Not enough memory to edit the line"));
break;
}
else
@@ -509,7 +509,7 @@ ml_reread (const char *prompt, char **text)
if ((p = realloc (line, line_size + LINE_INC)) == NULL)
{
fputs ("\n", stdout);
- util_error (_("not enough memory to edit the line"));
+ util_error (_("Not enough memory to edit the line"));
break;
}
else
diff --git a/mail/quit.c b/mail/quit.c
index 1049fa173..8e1b70b03 100644
--- a/mail/quit.c
+++ b/mail/quit.c
@@ -108,14 +108,14 @@ mail_mbox_commit ()
|| mailbox_open (dest_mbox,
MU_STREAM_WRITE | MU_STREAM_CREAT))
{
- util_error (_("can't create mailbox %s"), name);
+ util_error (_("Cannot create mailbox %s"), name);
return 1;
}
}
status = mailbox_append_message (dest_mbox, msg);
if (status)
- util_error (_("can't append message: %s"), mu_strerror (status));
+ util_error (_("Cannot append message: %s"), mu_strerror (status));
else
{
attribute_set_deleted (attr);
diff --git a/mail/send.c b/mail/send.c
index ca1526ab9..9a0b78264 100644
--- a/mail/send.c
+++ b/mail/send.c
@@ -221,7 +221,7 @@ compose_header_set (compose_env_t * env, char *name, char *value, int mode)
if (!env->header
&& (status = header_create (&env->header, NULL, 0, NULL)) != 0)
{
- util_error (_("can't create header: %s"), mu_strerror (status));
+ util_error (_("Cannot create header: %s"), mu_strerror (status));
return status;
}
@@ -304,7 +304,7 @@ mail_send0 (compose_env_t * env, int save_to)
if (fd == -1)
{
- util_error (_("Can not open temporary file"));
+ util_error (_("Cannot open temporary file"));
return 1;
}
@@ -395,7 +395,7 @@ mail_send0 (compose_env_t * env, int save_to)
}
else
{
- util_error (_("can't parse escape sequence"));
+ util_error (_("Cannot parse escape sequence"));
}
argcv_free (argc, argv);
@@ -420,7 +420,7 @@ mail_send0 (compose_env_t * env, int save_to)
if (!fp)
{
- util_error (_("can't open file %s: %s"), getenv ("DEAD"),
+ util_error (_("Cannot open file %s: %s"), getenv ("DEAD"),
strerror (errno));
}
else
@@ -531,14 +531,14 @@ mail_send0 (compose_env_t * env, int save_to)
{
status = mailbox_append_message (mbx, msg);
if (status)
- util_error (_("can't append message: %s"),
+ util_error (_("Cannot append message: %s"),
mu_strerror (status));
mailbox_close (mbx);
}
mailbox_destroy (&mbx);
}
if (status)
- util_error (_("can't create mailbox %s"), env->outfiles[i]);
+ util_error (_("Cannot create mailbox %s"), env->outfiles[i]);
}
}
}
@@ -574,7 +574,7 @@ mail_send0 (compose_env_t * env, int save_to)
msg_to_pipe (sendmail, msg);
}
else
- util_error (_("variable sendmail not set: no mailer"));
+ util_error (_("Variable sendmail not set: no mailer"));
}
message_destroy (&msg, NULL);
remove (filename);
diff --git a/mail/source.c b/mail/source.c
index 519b93ca3..53818f39d 100644
--- a/mail/source.c
+++ b/mail/source.c
@@ -47,6 +47,7 @@ mail_source (int argc, char **argv)
if (argc != 2)
{
+ /* TRANSLATORS: 'source' is a command name. Do not translate it! */
util_error (_("source requires an argument"));
return 1;
}
@@ -55,7 +56,7 @@ mail_source (int argc, char **argv)
if (!fp)
{
if (errno != ENOENT)
- util_error(_("can't open `%s': %s"), argv[1], strerror(errno));
+ util_error(_("Cannot open `%s': %s"), argv[1], strerror(errno));
return 1;
}
diff --git a/mail/unalias.c b/mail/unalias.c
index 1259e09f3..d46b327df 100644
--- a/mail/unalias.c
+++ b/mail/unalias.c
@@ -26,6 +26,7 @@ mail_unalias (int argc, char **argv)
{
if (argc == 1)
{
+ /* TRANSLATORS: 'unalias' is a command name. Do not translate it! */
util_error (_("unalias requires at least one argument"));
return 1;
}
diff --git a/mail/util.c b/mail/util.c
index 9a5ff6c04..f80fe9878 100644
--- a/mail/util.c
+++ b/mail/util.c
@@ -611,7 +611,7 @@ util_get_homedir ()
if (!homedir)
{
/* Shouldn't happen, but one never knows */
- util_error (_("can't get homedir"));
+ util_error (_("Cannot get homedir"));
exit (EXIT_FAILURE);
}
return homedir;
@@ -673,14 +673,14 @@ util_get_sender (int msgno, int strip)
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_aget_email (addr, 1, &buf))
{
- util_error (_("can't determine sender name (msg %d)"), msgno);
+ util_error (_("Cannot determine sender name (msg %d)"), msgno);
address_destroy (&addr);
return NULL;
}
@@ -747,7 +747,7 @@ util_slist_add (list_t *list, char *value)
if ((p = strdup(value)) == NULL)
{
- util_error(_("not enough memory\n"));
+ util_error(_("Not enough memory"));
return;
}
list_append (*list, p);
@@ -923,7 +923,7 @@ util_save_outgoing (message_t msg, char *savefile)
outfile = fopen (filename, "a");
if (!outfile)
{
- util_error(_("can't open save file %s: %s"),
+ util_error(_("Cannot open save file %s: %s"),
filename, strerror (errno));
}
else
@@ -940,7 +940,7 @@ util_save_outgoing (message_t msg, char *savefile)
if (!bsize)
{
- util_error(_("not enough memory for creating save file"));
+ util_error(_("Not enough memory for creating save file"));
}
else
{
@@ -1050,7 +1050,7 @@ util_descend_subparts (message_t mesg, msgset_t *msgset, message_t *part)
{
if (message_unencapsulate (mesg, &submsg, NULL))
{
- util_error (_("can't unencapsulate message/part"));
+ util_error (_("Cannot unencapsulate message/part"));
return 1;
}
mesg = submsg;
@@ -1059,14 +1059,14 @@ util_descend_subparts (message_t mesg, msgset_t *msgset, message_t *part)
message_get_num_parts (mesg, &nparts);
if (nparts < msgset->msg_part[i])
{
- util_error (_("no such (sub)part in the message: %d"),
+ util_error (_("No such (sub)part in the message: %d"),
msgset->msg_part[i]);
return 1;
}
if (message_get_part (mesg, msgset->msg_part[i], &submsg))
{
- util_error (_("can't get (sub)part from the message: %d"),
+ util_error (_("Cannot get (sub)part from the message: %d"),
msgset->msg_part[i]);
return 1;
}
@@ -1190,7 +1190,7 @@ util_header_expand (header_t *phdr)
rc = header_create (&hdr, "", 0, NULL);
if (rc)
{
- util_error (_("can't create temporary header: %s"), mu_strerror (rc));
+ util_error (_("Cannot create temporary header: %s"), mu_strerror (rc));
return 1;
}
@@ -1231,10 +1231,10 @@ util_header_expand (header_t *phdr)
{
errcnt++;
if (exp)
- util_error (_("can't parse address `%s' (while expanding `%s'): %s"),
+ util_error (_("Cannot parse address `%s' (while expanding `%s'): %s"),
exp, p, mu_strerror (rc));
else
- util_error (_("can't parse address `%s': %s"),
+ util_error (_("Cannot parse address `%s': %s"),
p, mu_strerror (rc));
}
@@ -1287,7 +1287,7 @@ util_get_message (mailbox_t mbox, size_t msgno, message_t *msg)
status = mailbox_get_message (mbox, msgno, msg);
if (status)
{
- util_error (_("can't get message %lu: %s"),
+ util_error (_("Cannot get message %lu: %s"),
(unsigned long) msgno, mu_strerror (status));
return status;
}
@@ -1384,7 +1384,7 @@ util_rfc2047_decode (char **value)
if (rc)
{
if (util_getenv (NULL, "verbose", Mail_env_boolean, 0) == 0)
- mu_error (_("Can't decode line `%s': %s"), *value, mu_strerror (rc));
+ mu_error (_("Cannot decode line `%s': %s"), *value, mu_strerror (rc));
}
else
{
diff --git a/mail/var.c b/mail/var.c
index f959e8b02..b97546e19 100644
--- a/mail/var.c
+++ b/mail/var.c
@@ -55,7 +55,7 @@ parse_headers (FILE *fp, compose_env_t *env)
if ((status = header_create (&header, NULL, 0, NULL)) != 0)
{
- util_error (_("can't create header: %s"), mu_strerror (status));
+ util_error (_("Cannot create header: %s"), mu_strerror (status));
return 1;
}
@@ -248,7 +248,7 @@ var_sign (int argc ARG_UNUSED, char **argv, compose_env_t *env ARG_UNUSED)
if (!fp)
{
- util_error (_("can't open %s: %s"), name, strerror (errno));
+ util_error (_("Cannot open %s: %s"), name, strerror (errno));
free (name);
}
@@ -547,7 +547,7 @@ var_read (int argc, char **argv, compose_env_t *env ARG_UNUSED)
inf = fopen (filename, "r");
if (!inf)
{
- util_error (_("can't open %s: %s\n"), filename, strerror (errno));
+ util_error (_("Cannot open %s: %s\n"), filename, strerror (errno));
free (filename);
return 1;
}
@@ -602,7 +602,7 @@ var_write (int argc, char **argv, compose_env_t *env)
if (!fp)
{
- util_error (_("can't open %s: %s\n"), filename, strerror (errno));
+ util_error (_("Cannot open %s: %s\n"), filename, strerror (errno));
free (filename);
return 1;
}
@@ -632,6 +632,7 @@ var_pipe (int argc, char **argv, compose_env_t *env)
if (argc == 1)
{
+ /* TRANSLATORS: 'pipe' is a command name. Do not translate it! */
util_error (_("pipe: no command specified"));
return 1;
}
@@ -676,7 +677,7 @@ var_pipe (int argc, char **argv, compose_env_t *env)
xargv[i] = argv[i + 1];
xargv[i] = NULL;
execvp (xargv[0], xargv);
- util_error (_("cannot exec process `%s': %s"), xargv[0], strerror (errno));
+ util_error (_("Cannot exec process `%s': %s"), xargv[0], strerror (errno));
exit (1);
}
else
@@ -709,14 +710,14 @@ var_pipe (int argc, char **argv, compose_env_t *env)
waitpid (pid, &status, 0);
if (!WIFEXITED (status))
{
- util_error (_("child terminated abnormally: %d"), WEXITSTATUS (status));
+ util_error (_("Child terminated abnormally: %d"), WEXITSTATUS (status));
}
else
{
struct stat st;
if (fstat (fd, &st))
{
- util_error (_("can't stat output file: %s"), strerror (errno));
+ util_error (_("Cannot stat output file: %s"), strerror (errno));
}
else if (st.st_size > 0)
rc = 0;
diff --git a/mail/z.c b/mail/z.c
index da9668acc..d0242cce5 100644
--- a/mail/z.c
+++ b/mail/z.c
@@ -84,7 +84,7 @@ z_parse_args(int argc, char **argv,
{
if (dir == D_NONE)
{
- util_error (_("argument not applicable for z."));
+ util_error (_("Argument not applicable for z"));
return 1;
}

Return to:

Send suggestions and report system problems to the System administrator.