summaryrefslogtreecommitdiff
path: root/libsieve
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 /libsieve
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 'libsieve')
-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
7 files changed, 37 insertions, 36 deletions
diff --git a/libsieve/actions.c b/libsieve/actions.c
index f5267089b..4dfef506e 100644
--- a/libsieve/actions.c
+++ b/libsieve/actions.c
@@ -63,7 +63,7 @@ sieve_action_fileinto (sieve_machine_t mach, list_t args, list_t tags)
sieve_error (mach,
/* TRANSLATORS: 'fileinto' is the name of a Sieve action.
Do not translate it! */
- _("fileinto: can't get filename!"));
+ _("fileinto: cannot get filename!"));
sieve_abort (mach);
}
sieve_log_action (mach, "FILEINTO", _("delivering into %s"), val->v.string);
@@ -248,7 +248,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
sieve_error (mach,
/* TRANSLATORS: 'reject' is the name of a Sieve action.
Do not translate it! */
- _("reject: can't get text!"));
+ _("reject: cannot get text!"));
sieve_abort (mach);
}
sieve_log_action (mach, "REJECT", NULL);
@@ -266,7 +266,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
sieve_error (mach,
/* TRANSLATORS: 'reject' is the name of a Sieve action.
Do not translate it! */
- _("%d: reject - can't create to address <%s>: %s\n"),
+ _("%d: reject - cannot create to address <%s>: %s\n"),
sieve_get_message_num (mach),
addrtext, mu_strerror (rc));
free (addrtext);
@@ -280,7 +280,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
sieve_error (mach,
/* TRANSLATORS: 'reject' is the name of a Sieve action.
Do not translate it! */
- _("%d: reject - can't create from address <%s>: %s\n"),
+ _("%d: reject - cannot create from address <%s>: %s\n"),
sieve_get_message_num (mach),
sieve_get_daemon_email (mach),
mu_strerror (rc));
@@ -296,7 +296,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
sieve_error (mach,
/* TRANSLATORS: 'reject' is the name of a Sieve action.
Do not translate it! */
- _("%d: reject - can't open mailer %s: %s\n"),
+ _("%d: reject - cannot open mailer %s: %s\n"),
sieve_get_message_num (mach),
url_to_string (url),
mu_strerror (rc));
@@ -373,7 +373,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
{
/* TRANSLATORS: 'redirect' is the name of a Sieve action.
Do not translate it! */
- sieve_error (mach, _("redirect: can't get address!"));
+ sieve_error (mach, _("redirect: cannot get address!"));
sieve_abort (mach);
}
@@ -407,7 +407,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
sieve_error (mach,
/* TRANSLATORS: 'redirect' is the name of a Sieve action.
Do not translate it! */
- _("%d: redirect - can't get envelope sender: %s\n"),
+ _("%d: redirect - cannot get envelope sender: %s\n"),
sieve_get_message_num (mach), mu_strerror (rc));
goto end;
}
@@ -418,7 +418,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
sieve_error (mach,
/* TRANSLATORS: 'redirect' is the name of a Sieve action.
Do not translate it! */
- _("%d: redirect - can't create from address <%s>: %s\n"),
+ _("%d: redirect - cannot create from address <%s>: %s\n"),
sieve_get_message_num (mach),
fromaddr, mu_strerror (rc));
free (fromaddr);
@@ -430,7 +430,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
rc = message_create_copy (&newmsg, msg);
if (rc)
{
- sieve_error (mach, _("%d: can't copy message: %s"),
+ sieve_error (mach, _("%d: cannot copy message: %s"),
sieve_get_message_num (mach),
mu_strerror (rc));
goto end;
@@ -445,7 +445,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
}
else
{
- sieve_error (mach, _("%d: can't get my email address"),
+ sieve_error (mach, _("%d: cannot get my email address"),
sieve_get_message_num (mach));
goto end;
}
@@ -459,7 +459,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
sieve_error (mach,
/* TRANSLATORS: 'redirect' is the name of a Sieve action.
Do not translate it! */
- _("%d: redirect - can't open mailer %s: %s\n"),
+ _("%d: redirect - cannot open mailer %s: %s\n"),
sieve_get_message_num (mach),
url_to_string (url),
mu_strerror (rc));
diff --git a/libsieve/comparator.c b/libsieve/comparator.c
index 5c7676bac..1e803a491 100644
--- a/libsieve/comparator.c
+++ b/libsieve/comparator.c
@@ -167,12 +167,12 @@ _regex_compile (void *item, void *data)
{
regerror (rc, preg, errbuf, size);
sieve_compile_error (sieve_filename, sieve_line_num,
- _("regex error: %s"), errbuf);
+ _("Regex error: %s"), errbuf);
free (errbuf);
}
else
sieve_compile_error (sieve_filename, sieve_line_num,
- _("regex error"));
+ _("Regex error"));
return rc;
}
diff --git a/libsieve/prog.c b/libsieve/prog.c
index 5382bc038..36113c667 100644
--- a/libsieve/prog.c
+++ b/libsieve/prog.c
@@ -154,7 +154,7 @@ sieve_code_command (sieve_register_t *reg, list_t arglist)
if (rc)
{
sieve_compile_error (sieve_filename, sieve_line_num,
- _("can't create iterator: %s"),
+ _("cannot create iterator: %s"),
mu_strerror (rc));
return 1;
}
@@ -182,7 +182,7 @@ sieve_code_command (sieve_register_t *reg, list_t arglist)
if (!tag_list && (rc = list_create (&tag_list)))
{
sieve_compile_error (sieve_filename, sieve_line_num,
- _("%s:%d: can't create tag list: %s"),
+ _("%s:%d: cannot create tag list: %s"),
mu_strerror (rc));
err = 1;
break;
@@ -206,7 +206,7 @@ sieve_code_command (sieve_register_t *reg, list_t arglist)
if (!chk_list && (rc = list_create (&chk_list)))
{
sieve_compile_error (sieve_filename, sieve_line_num,
- _("%s:%d: can't create check list: %s"),
+ _("%s:%d: cannot create check list: %s"),
mu_strerror (rc));
err = 1;
break;
@@ -243,9 +243,9 @@ sieve_code_command (sieve_register_t *reg, list_t arglist)
exp_arg - reg->req_args + 1,
reg->name);
sieve_compile_error (sieve_filename, sieve_line_num,
- _("Expected %s but passed %s"),
- sieve_type_str (*exp_arg),
- sieve_type_str (val->type));
+ _("expected %s but passed %s"),
+ sieve_type_str (*exp_arg),
+ sieve_type_str (val->type));
err = 1;
break;
}
@@ -254,7 +254,7 @@ sieve_code_command (sieve_register_t *reg, list_t arglist)
if (!arg_list && (rc = list_create (&arg_list)))
{
sieve_compile_error (sieve_filename, sieve_line_num,
- _("can't create arg list: %s"),
+ _("cannot create arg list: %s"),
mu_strerror (rc));
err = 1;
break;
diff --git a/libsieve/runtime.c b/libsieve/runtime.c
index 2e29e6965..4352c98cb 100644
--- a/libsieve/runtime.c
+++ b/libsieve/runtime.c
@@ -118,7 +118,7 @@ instr_push (sieve_machine_t mach)
if (!mach->stack && list_create (&mach->stack))
{
- sieve_error (mach, _("can't create stack"));
+ sieve_error (mach, _("cannot create stack"));
sieve_abort (mach);
}
list_prepend (mach->stack, (void*) mach->reg);
diff --git a/libsieve/sieve.l b/libsieve/sieve.l
index ca214578c..6c7d4e8ad 100644
--- a/libsieve/sieve.l
+++ b/libsieve/sieve.l
@@ -127,7 +127,7 @@ lex_set_buffer (FILE *fp)
if (!buf)
{
- sieve_compile_error (sieve_filename, sieve_line_num, _("not enough memory"));
+ sieve_compile_error (sieve_filename, sieve_line_num, _("Not enough memory"));
abort ();
}
@@ -229,7 +229,7 @@ push_source (const char *name)
if (stat (name, &st))
{
sieve_compile_error (sieve_filename, sieve_line_num,
- _("can't stat `%s': %s"), name, strerror (errno));
+ _("cannot stat `%s': %s"), name, strerror (errno));
return 1;
}
@@ -256,7 +256,7 @@ push_source (const char *name)
if (!fp)
{
sieve_compile_error (sieve_filename, sieve_line_num,
- _("can't open `%s': %s"), name, strerror (errno));
+ _("cannot open `%s': %s"), name, strerror (errno));
return 1;
}
@@ -598,7 +598,7 @@ line_add (char *text, size_t len)
s = malloc (len + 1);
if (!s)
{
- yyerror (_("not enough memory"));
+ yyerror (_("Not enough memory"));
exit (1);
}
memcpy (s, text, len);
@@ -662,7 +662,7 @@ multiline_begin ()
multiline_delimiter = strdup (".");
if (!multiline_delimiter)
{
- yyerror (_("not enough memory"));
+ yyerror (_("Not enough memory"));
exit (1);
}
}
@@ -716,7 +716,7 @@ ident (const char *text)
yylval.string = strdup (text);
if (!yylval.string)
{
- yyerror (_("not enough memory"));
+ yyerror (_("Not enough memory"));
exit (1);
}
}
diff --git a/libsieve/tests.c b/libsieve/tests.c
index 4cd588625..77385d761 100644
--- a/libsieve/tests.c
+++ b/libsieve/tests.c
@@ -130,7 +130,7 @@ sieve_test_address (sieve_machine_t mach, list_t args, list_t tags)
sieve_error (mach,
/* TRANSLATORS: 'address' is the name of a Sieve test.
Do not translate it! */
- _("address: can't get argument 1"));
+ _("address: cannot get argument 1"));
sieve_abort (mach);
}
v = sieve_value_get (args, 1);
@@ -139,7 +139,7 @@ sieve_test_address (sieve_machine_t mach, list_t args, list_t tags)
sieve_error (mach,
/* TRANSLATORS: 'address' is the name of a Sieve test.
Do not translate it! */
- _("address: can't get argument 2"));
+ _("address: cannot get argument 2"));
sieve_abort (mach);
}
@@ -202,7 +202,7 @@ sieve_test_header (sieve_machine_t mach, list_t args, list_t tags)
sieve_error (mach,
/* TRANSLATORS: 'header' is the name of a Sieve test.
Do not translate it! */
- _("header: can't get argument 1"));
+ _("header: cannot get argument 1"));
sieve_abort (mach);
}
v = sieve_value_get (args, 1);
@@ -211,7 +211,7 @@ sieve_test_header (sieve_machine_t mach, list_t args, list_t tags)
sieve_error (mach,
/* TRANSLATORS: 'header' is the name of a Sieve test.
Do not translate it! */
- _("header: can't get argument 2"));
+ _("header: cannot get argument 2"));
sieve_abort (mach);
}
@@ -292,7 +292,8 @@ sieve_test_envelope (sieve_machine_t mach, list_t args, list_t tags)
h = sieve_value_get (args, 0);
if (!h)
{
- sieve_error (mach, _("header: can't get argument 1"));
+ /* TRANSLATORS: 'header' is the name of a Sieve test. Do not translate it! */
+ sieve_error (mach, _("header: cannot get argument 1"));
sieve_abort (mach);
}
v = sieve_value_get (args, 1);
@@ -301,7 +302,7 @@ sieve_test_envelope (sieve_machine_t mach, list_t args, list_t tags)
sieve_error (mach,
/* TRANSLATORS: 'header' is the name of a Sieve test.
Do not translate it! */
- _("header: can't get argument 2"));
+ _("header: cannot get argument 2"));
sieve_abort (mach);
}
@@ -327,7 +328,7 @@ sieve_test_size (sieve_machine_t mach, list_t args, list_t tags)
sieve_error (mach,
/* TRANSLATORS: 'size' is the name of a Sieve test.
Do not translate it! */
- _("size: can't get argument!"));
+ _("size: cannot get argument!"));
sieve_abort (mach);
}
@@ -387,7 +388,7 @@ sieve_test_exists (sieve_machine_t mach, list_t args, list_t tags)
sieve_error (mach,
/* TRANSLATORS: 'size' is the name of a Sieve test.
Do not translate it! */
- _("exists: can't get argument!"));
+ _("exists: cannot get argument!"));
sieve_abort (mach);
}
diff --git a/libsieve/util.c b/libsieve/util.c
index 46998d742..264030797 100644
--- a/libsieve/util.c
+++ b/libsieve/util.c
@@ -171,7 +171,7 @@ sieve_value_create (sieve_data_type type, void *data)
default:
sieve_compile_error (sieve_filename, sieve_line_num,
- _("Invalid data type"));
+ _("invalid data type"));
abort ();
}
return val;

Return to:

Send suggestions and report system problems to the System administrator.