Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 504ef5f4 504ef5f42376716fa3dd50b8ab4243a87c34b164 by Sergey Poznyakoff
Options

Add translators comment

1 parent d4cca7e4
Inline Side-by-side
Showing 6 changed files with 65 additions and 10 deletions
......@@ -50,6 +50,9 @@ append_arg (char *arg)
static struct argp_option options[] = {
{NULL, 0, NULL, 0,
/* TRANSLATORS: (command-line) is the name of Guile function. Do not
translate it.
*/
N_("The following switches stop argument processing, and pass all\n"
"remaining arguments as the value of (command-line):"), 1},
{"code", 'c', N_("EXPR"), 0, N_("Execute given scheme expression."), 1},
......
......@@ -60,7 +60,10 @@ sieve_action_fileinto (sieve_machine_t mach, list_t args, list_t tags)
sieve_value_t *val = sieve_value_get (args, 0);
if (!val)
{
sieve_error (mach, _("fileinto: can't get filename!"));
sieve_error (mach,
/* TRANSLATORS: 'fileinto' is the name of a Sieve action.
Do not translate it! */
_("fileinto: can't get filename!"));
sieve_abort (mach);
}
sieve_log_action (mach, "FILEINTO", _("delivering into %s"), val->v.string);
......@@ -70,7 +73,10 @@ sieve_action_fileinto (sieve_machine_t mach, list_t args, list_t tags)
rc = message_save_to_mailbox (mach->msg, mach->ticket, mach->mu_debug,
val->v.string);
if (rc)
sieve_error (mach, _("fileinto: cannot save to mailbox: %s"),
sieve_error (mach,
/* TRANSLATORS: 'fileinto' is the name of a Sieve action.
Do not translate it! */
_("fileinto: cannot save to mailbox: %s"),
mu_strerror (rc));
else
sieve_mark_deleted (mach->msg, 1);
......@@ -239,7 +245,10 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
sieve_value_t *val = sieve_value_get (args, 0);
if (!val)
{
sieve_error (mach, _("reject: can't get text!"));
sieve_error (mach,
/* TRANSLATORS: 'reject' is the name of a Sieve action.
Do not translate it! */
_("reject: can't get text!"));
sieve_abort (mach);
}
sieve_log_action (mach, "REJECT", NULL);
......@@ -255,6 +264,8 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
if (rc)
{
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"),
sieve_get_message_num (mach),
addrtext, mu_strerror (rc));
......@@ -267,6 +278,8 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
if (rc)
{
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"),
sieve_get_message_num (mach),
sieve_get_daemon_email (mach),
......@@ -281,6 +294,8 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
mailer_get_url (mailer, &url);
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"),
sieve_get_message_num (mach),
url_to_string (url),
......@@ -356,6 +371,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
sieve_value_t *val = sieve_value_get (args, 0);
if (!val)
{
/* TRANSLATORS: 'redirect' is the name of a Sieve action.
Do not translate it! */
sieve_error (mach, _("redirect: can't get address!"));
sieve_abort (mach);
}
......@@ -364,6 +381,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
if (rc)
{
sieve_error (mach,
/* TRANSLATORS: 'redirect' is the name of a Sieve action.
Do not translate it! */
_("%d: redirect - parsing to `%s' failed: %s\n"),
sieve_get_message_num (mach),
val->v.string, mu_strerror (rc));
......@@ -386,6 +405,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
if (rc)
{
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"),
sieve_get_message_num (mach), mu_strerror (rc));
goto end;
......@@ -395,6 +416,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
if (rc)
{
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"),
sieve_get_message_num (mach),
fromaddr, mu_strerror (rc));
......@@ -434,6 +457,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
mailer_get_url (mailer, &url);
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"),
sieve_get_message_num (mach),
url_to_string (url),
......
......@@ -270,6 +270,7 @@ sieve_match_part_checker (const char *name, list_t tags, list_t args)
if (comp && strcmp (comp->arg->v.string, "i;ascii-numeric"))
{
sieve_compile_error (sieve_filename, sieve_line_num,
/* TRANSLATORS: Do not translate ':count'. It is the name of a Sieve tag */
_("comparator %s is incompatible with :count in call to `%s'"),
comp->arg->v.string,
name);
......
......@@ -127,13 +127,19 @@ sieve_test_address (sieve_machine_t mach, list_t args, list_t tags)
h = sieve_value_get (args, 0);
if (!h)
{
sieve_error (mach, _("address: can't get argument 1"));
sieve_error (mach,
/* TRANSLATORS: 'address' is the name of a Sieve test.
Do not translate it! */
_("address: can't get argument 1"));
sieve_abort (mach);
}
v = sieve_value_get (args, 1);
if (!v)
{
sieve_error (mach, _("address: can't get argument 2"));
sieve_error (mach,
/* TRANSLATORS: 'address' is the name of a Sieve test.
Do not translate it! */
_("address: can't get argument 2"));
sieve_abort (mach);
}
......@@ -193,13 +199,19 @@ sieve_test_header (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"));
sieve_error (mach,
/* TRANSLATORS: 'header' is the name of a Sieve test.
Do not translate it! */
_("header: can't get argument 1"));
sieve_abort (mach);
}
v = sieve_value_get (args, 1);
if (!v)
{
sieve_error (mach, _("header: can't get argument 2"));
sieve_error (mach,
/* TRANSLATORS: 'header' is the name of a Sieve test.
Do not translate it! */
_("header: can't get argument 2"));
sieve_abort (mach);
}
......@@ -286,7 +298,10 @@ sieve_test_envelope (sieve_machine_t mach, list_t args, list_t tags)
v = sieve_value_get (args, 1);
if (!v)
{
sieve_error (mach, _("header: can't get argument 2"));
sieve_error (mach,
/* TRANSLATORS: 'header' is the name of a Sieve test.
Do not translate it! */
_("header: can't get argument 2"));
sieve_abort (mach);
}
......@@ -309,7 +324,10 @@ sieve_test_size (sieve_machine_t mach, list_t args, list_t tags)
sieve_value_t *val = sieve_value_get (args, 0);
if (!val)
{
sieve_error (mach, _("size: can't get argument!"));
sieve_error (mach,
/* TRANSLATORS: 'size' is the name of a Sieve test.
Do not translate it! */
_("size: can't get argument!"));
sieve_abort (mach);
}
......@@ -366,7 +384,10 @@ sieve_test_exists (sieve_machine_t mach, list_t args, list_t tags)
val = sieve_value_get (args, 0);
if (!val)
{
sieve_error (mach, _("exists: can't get argument!"));
sieve_error (mach,
/* TRANSLATORS: 'size' is the name of a Sieve test.
Do not translate it! */
_("exists: can't get argument!"));
sieve_abort (mach);
}
......
......@@ -85,6 +85,7 @@ mail_if (int argc, char **argv)
if (argc != 2)
{
/* TRANSLATORS: 'if' is the function name. Do not translate it */
util_error(_("if requires an argument: s | r | t"));
return 1;
}
......@@ -131,6 +132,7 @@ mail_else (int argc ARG_UNUSED, char **argv ARG_UNUSED)
if (_cond_level == 0)
{
/* TRANSLATORS: 'else' and 'if' are function names. Do not translate them */
util_error(_("else without matching if"));
return 1;
}
......@@ -146,6 +148,7 @@ mail_endif (int argc ARG_UNUSED, char **argv ARG_UNUSED)
{
if (_cond_level == 0)
{
/* TRANSLATORS: 'endif' and 'if' are function names. Do not translate them */
util_error(_("endif without matching if"));
return 1;
}
......
......@@ -446,6 +446,8 @@ fill_pass (struct action_data *ap)
if (!p)
exit (1);
ap->passwd = strdup (p);
/* TRANSLATORS: Please try to format this string so that it has
the same length as the translation of 'Password:' above */
p = getpass (_("Confirm :"));
if (strcmp (ap->passwd, p) == 0)
break;
......