summaryrefslogtreecommitdiff
path: root/sieve
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 /sieve
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 'sieve')
-rw-r--r--sieve/sieve.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sieve/sieve.c b/sieve/sieve.c
index e361d40c3..d0ffe5c55 100644
--- a/sieve/sieve.c
+++ b/sieve/sieve.c
@@ -142,13 +142,13 @@ parser (int key, char *arg, struct argp_state *state)
log_facility = 0;
break;
case 'e':
rc = mu_set_user_email (arg);
if (rc)
- argp_error (state, _("invalid email: %s"), mu_strerror (rc));
+ argp_error (state, _("Invalid email: %s"), mu_strerror (rc));
break;
case 'n':
opts->sieve_debug |= MU_SIEVE_DRY_RUN;
break;
@@ -163,13 +163,13 @@ parser (int key, char *arg, struct argp_state *state)
case 'D':
opts->compile_only = 2;
break;
case 'f':
if (opts->mbox)
- argp_error (state, _("only one MBOX can be specified"));
+ argp_error (state, _("Only one MBOX can be specified"));
opts->mbox = strdup (arg);
break;
case 't':
free (opts->tickets);
opts->tickets = mu_tilde_expansion (arg, "/", NULL);
@@ -217,13 +217,13 @@ parser (int key, char *arg, struct argp_state *state)
case ARG_LINE_INFO:
sieve_print_locus = is_true_p (arg);
break;
case ARGP_KEY_ARG:
if (opts->script)
- argp_error (state, _("only one SCRIPT can be specified"));
+ argp_error (state, _("Only one SCRIPT can be specified"));
opts->script = mu_tilde_expansion (arg, "/", NULL);
break;
case ARGP_KEY_NO_ARGS:
argp_error (state, _("SCRIPT must be specified"));
@@ -368,13 +368,13 @@ main (int argc, char *argv[])
mu_register_all_formats ();
/* Sieve interpreter setup. */
rc = sieve_machine_init (&mach, NULL);
if (rc)
{
- mu_error (_("can't initialize sieve machine: %s"), mu_strerror (rc));
+ mu_error (_("Cannot initialize sieve machine: %s"), mu_strerror (rc));
return 1;
}
if (log_facility)
{
openlog ("sieve", LOG_PID, log_facility);
@@ -496,13 +496,13 @@ main (int argc, char *argv[])
rc = mailbox_open (mbox, MU_STREAM_READ);
else
rc = mailbox_open (mbox, MU_STREAM_RDWR);
if (rc != 0)
{
- mu_error (_("open on %s failed: %s"),
+ mu_error (_("Opening mailbox `%s' failed: %s"),
opts.mbox ? opts.mbox : _("default"), mu_strerror (rc));
mailbox_destroy (&mbox);
goto cleanup;
}
/* Process the mailbox */
@@ -515,13 +515,13 @@ cleanup:
/* A message won't be marked deleted unless the script executed
succesfully on it, so we always do an expunge, it will delete
any messages that were marked DELETED even if execution failed
on a later message. */
if ((e = mailbox_expunge (mbox)) != 0)
- mu_error (_("expunge on %s failed: %s"),
+ mu_error (_("Expunge on mailbox `%s' failed: %s"),
opts.mbox ? opts.mbox : _("default"), mu_strerror (e));
if (e && !rc)
rc = e;
}

Return to:

Send suggestions and report system problems to the System administrator.