summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libsieve/actions.c42
-rw-r--r--libsieve/comparator.c18
-rw-r--r--libsieve/prog.c28
-rw-r--r--libsieve/require.c12
-rw-r--r--libsieve/runtime.c14
-rw-r--r--libsieve/sieve.l32
-rw-r--r--libsieve/sieve.y16
-rw-r--r--libsieve/tests.c24
-rw-r--r--libsieve/util.c10
-rw-r--r--mailbox/message.c19
-rw-r--r--mailbox/mu_argp.c86
-rw-r--r--mailbox/muerrno.c77
12 files changed, 190 insertions, 188 deletions
diff --git a/libsieve/actions.c b/libsieve/actions.c
index 8a8591eb5..a7637605d 100644
--- a/libsieve/actions.c
+++ b/libsieve/actions.c
@@ -1,18 +1,18 @@
-/* GNU mailutils - a suite of utilities for electronic mail
+/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
- This program is distributed in the hope that it will be useful,
+ GNU Mailutils is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software
+ along with GNU Mailutils; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
@@ -46,7 +46,7 @@ sieve_action_keep (sieve_machine_t mach, list_t args, list_t tags)
int
sieve_action_discard (sieve_machine_t mach, list_t args, list_t tags)
{
- sieve_log_action (mach, "DISCARD", "marking as deleted");
+ sieve_log_action (mach, "DISCARD", _("marking as deleted"));
if (sieve_is_dry_run (mach))
return 0;
sieve_mark_deleted (mach->msg, 1);
@@ -60,17 +60,17 @@ 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, _("fileinto: can't get filename!"));
sieve_abort (mach);
}
- sieve_log_action (mach, "FILEINTO", "delivering into %s", val->v.string);
+ sieve_log_action (mach, "FILEINTO", _("delivering into %s"), val->v.string);
if (sieve_is_dry_run (mach))
return 0;
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, _("fileinto: cannot save to mailbox: %s"),
mu_errstring (rc));
else
sieve_mark_deleted (mach->msg, 1);
@@ -236,7 +236,7 @@ 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, _("reject: can't get text!"));
sieve_abort (mach);
}
sieve_log_action (mach, "REJECT", NULL);
@@ -252,7 +252,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
if (rc)
{
sieve_error (mach,
- "%d: reject - can't create to address <%s>: %s\n",
+ _("%d: reject - can't create to address <%s>: %s\n"),
sieve_get_message_num (mach),
addrtext, mu_errstring (rc));
free (addrtext);
@@ -264,7 +264,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
if (rc)
{
sieve_error (mach,
- "%d: reject - can't create from address <%s>: %s\n",
+ _("%d: reject - can't create from address <%s>: %s\n"),
sieve_get_message_num (mach),
sieve_get_daemon_email (mach),
mu_errstring (rc));
@@ -278,7 +278,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
mailer_get_url (mailer, &url);
sieve_error (mach,
- "%d: reject - can't open mailer %s: %s\n",
+ _("%d: reject - can't open mailer %s: %s\n"),
sieve_get_message_num (mach),
url_to_string (url),
mu_errstring (rc));
@@ -353,7 +353,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
sieve_value_t *val = sieve_value_get (args, 0);
if (!val)
{
- sieve_error (mach, "redirect: can't get address!");
+ sieve_error (mach, _("redirect: can't get address!"));
sieve_abort (mach);
}
@@ -361,20 +361,20 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
if (rc)
{
sieve_error (mach,
- "%d: redirect - parsing to `%s' failed: %s\n",
+ _("%d: redirect - parsing to `%s' failed: %s\n"),
sieve_get_message_num (mach),
val->v.string, mu_errstring (rc));
return 1;
}
- sieve_log_action (mach, "REDIRECT", "to %s", val->v.string);
+ sieve_log_action (mach, "REDIRECT", _("to %s"), val->v.string);
if (sieve_is_dry_run (mach))
return 0;
msg = sieve_get_message (mach);
if (check_redirect_loop (msg))
{
- sieve_error (mach, "%d: Redirection loop detected",
+ sieve_error (mach, _("%d: Redirection loop detected"),
sieve_get_message_num (mach));
goto end;
}
@@ -383,7 +383,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
if (rc)
{
sieve_error (mach,
- "%d: redirect - can't get envelope sender: %s\n",
+ _("%d: redirect - can't get envelope sender: %s\n"),
sieve_get_message_num (mach), mu_errstring (rc));
goto end;
}
@@ -392,7 +392,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
if (rc)
{
sieve_error (mach,
- "%d: redirect - can't create from address <%s>: %s\n",
+ _("%d: redirect - can't create from address <%s>: %s\n"),
sieve_get_message_num (mach),
fromaddr, mu_errstring (rc));
free (fromaddr);
@@ -404,7 +404,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: can't copy message: %s"),
sieve_get_message_num (mach),
mu_errstring (rc));
goto end;
@@ -419,7 +419,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: can't get my email address"),
sieve_get_message_num (mach));
goto end;
}
@@ -431,7 +431,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
mailer_get_url (mailer, &url);
sieve_error (mach,
- "%d: redirect - can't open mailer %s: %s\n",
+ _("%d: redirect - can't open mailer %s: %s\n"),
sieve_get_message_num (mach),
url_to_string (url),
mu_errstring (rc));
diff --git a/libsieve/comparator.c b/libsieve/comparator.c
index 0d8a0ab58..2f3ab1be6 100644
--- a/libsieve/comparator.c
+++ b/libsieve/comparator.c
@@ -1,18 +1,18 @@
-/* GNU mailutils - a suite of utilities for electronic mail
+/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
- This program is distributed in the hope that it will be useful,
+ GNU Mailutils is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software
+ along with GNU Mailutils; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
@@ -165,12 +165,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;
}
@@ -234,7 +234,7 @@ sieve_match_part_checker (const char *name, list_t tags, list_t args)
if (err)
{
sieve_compile_error (sieve_filename, sieve_line_num,
- "match type specified twice in call to `%s'",
+ _("match type specified twice in call to `%s'"),
name);
return 1;
}
@@ -256,8 +256,8 @@ sieve_match_part_checker (const char *name, list_t tags, list_t args)
if (!compfun)
{
sieve_compile_error (sieve_filename, sieve_line_num,
- "comparator `%s' is incompatible with match type `%s' in call to `%s'",
- compname, match ? match->tag : "is", name);
+ _("comparator `%s' is incompatible with match type `%s' in call to `%s'"),
+ compname, match ? match->tag : _("is"), name);
return 1;
}
diff --git a/libsieve/prog.c b/libsieve/prog.c
index a1588d410..e6367c85b 100644
--- a/libsieve/prog.c
+++ b/libsieve/prog.c
@@ -1,18 +1,18 @@
-/* GNU mailutils - a suite of utilities for electronic mail
+/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
- This program is distributed in the hope that it will be useful,
+ GNU Mailutils is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software
+ along with GNU Mailutils; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
@@ -35,7 +35,7 @@ sieve_code (sieve_op_t *op)
if (!newprog)
{
sieve_compile_error (sieve_filename, sieve_line_num,
- "out of memory!");
+ _("out of memory!"));
return 1;
}
sieve_machine->prog = newprog;
@@ -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",
+ _("can't create iterator: %s"),
mu_errstring (rc));
return 1;
}
@@ -173,7 +173,7 @@ sieve_code_command (sieve_register_t *reg, list_t arglist)
if (!tag)
{
sieve_compile_error (sieve_filename, sieve_line_num,
- "invalid tag name `%s' for `%s'",
+ _("invalid tag name `%s' for `%s'"),
val->v.string, reg->name);
err = 1;
break;
@@ -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: can't create tag list: %s"),
mu_errstring (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: can't create check list: %s"),
mu_errstring (rc));
err = 1;
break;
@@ -218,7 +218,7 @@ sieve_code_command (sieve_register_t *reg, list_t arglist)
else if (*exp_arg == SVT_VOID)
{
sieve_compile_error (sieve_filename, sieve_line_num,
- "too many arguments in call to `%s'",
+ _("too many arguments in call to `%s'"),
reg->name);
err = 1;
break;
@@ -239,11 +239,11 @@ sieve_code_command (sieve_register_t *reg, list_t arglist)
else
{
sieve_compile_error (sieve_filename, sieve_line_num,
- "type mismatch in argument %d to `%s'",
+ _("type mismatch in argument %d to `%s'"),
exp_arg - reg->req_args + 1,
reg->name);
sieve_compile_error (sieve_filename, sieve_line_num,
- "Expected %s but passed %s",
+ _("Expected %s but passed %s"),
sieve_type_str (*exp_arg),
sieve_type_str (val->type));
err = 1;
@@ -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",
+ _("can't create arg list: %s"),
mu_errstring (rc));
err = 1;
break;
@@ -272,7 +272,7 @@ sieve_code_command (sieve_register_t *reg, list_t arglist)
if (*exp_arg != SVT_VOID)
{
sieve_compile_error (sieve_filename, sieve_line_num,
- "too few arguments in call to `%s'",
+ _("too few arguments in call to `%s'"),
reg->name);
err = 1;
}
diff --git a/libsieve/require.c b/libsieve/require.c
index 67e0d2db7..cccc05e59 100644
--- a/libsieve/require.c
+++ b/libsieve/require.c
@@ -1,18 +1,18 @@
-/* GNU mailutils - a suite of utilities for electronic mail
+/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
- This program is distributed in the hope that it will be useful,
+ GNU Mailutils is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software
+ along with GNU Mailutils; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
@@ -35,7 +35,7 @@ sieve_require (list_t slist)
if (status)
{
sieve_compile_error (sieve_filename, sieve_line_num,
- "cannot create iterator: %s",
+ _("cannot create iterator: %s"),
mu_errstring (status));
return;
}
@@ -69,7 +69,7 @@ sieve_require (list_t slist)
if (reqfn (sieve_machine, name))
{
sieve_compile_error (sieve_filename, sieve_line_num,
- "source for the required %s %s is not available",
+ _("source for the required %s %s is not available"),
text,
name);
}
diff --git a/libsieve/runtime.c b/libsieve/runtime.c
index 07febbc2d..d40be7c15 100644
--- a/libsieve/runtime.c
+++ b/libsieve/runtime.c
@@ -1,18 +1,18 @@
-/* GNU mailutils - a suite of utilities for electronic mail
+/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
- This program is distributed in the hope that it will be useful,
+ GNU Mailutils is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software
+ along with GNU Mailutils; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
@@ -87,7 +87,7 @@ instr_push (sieve_machine_t mach)
if (!mach->stack && list_create (&mach->stack))
{
- sieve_error (mach, "can't create stack");
+ sieve_error (mach, _("can't create stack"));
sieve_abort (mach);
}
list_prepend (mach->stack, (void*) mach->reg);
@@ -105,7 +105,7 @@ instr_pop (sieve_machine_t mach)
if (!mach->stack || list_is_empty (mach->stack))
{
- sieve_error (mach, "stack underflow");
+ sieve_error (mach, _("stack underflow"));
sieve_abort (mach);
}
list_get (mach->stack, 0, (void **)&mach->reg);
@@ -314,7 +314,7 @@ sieve_mailbox (sieve_machine_t mach, mailbox_t mbox)
mach->msgno = 0;
rc = mailbox_scan (mbox, 1, &total);
if (rc)
- sieve_error (mach, "mailbox_scan: %s", mu_errstring (errno));
+ sieve_error (mach, _("mailbox_scan: %s"), mu_errstring (errno));
observable_detach (observable, observer);
observer_destroy (&observer, mach);
diff --git a/libsieve/sieve.l b/libsieve/sieve.l
index 6ec18bd5d..5c5d57ad5 100644
--- a/libsieve/sieve.l
+++ b/libsieve/sieve.l
@@ -1,19 +1,19 @@
%{
-/* GNU mailutils - a suite of utilities for electronic mail
+/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
- This program is distributed in the hope that it will be useful,
+ GNU Mailutils is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software
+ along with GNU Mailutils; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
@@ -122,7 +122,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 ();
}
@@ -224,25 +224,25 @@ 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));
+ _("can't stat `%s': %s"), name, strerror (errno));
return 1;
}
if (sieve_filename && st.st_ino == sieve_source_inode)
{
- yyerror ("recursive inclusion");
+ yyerror (_("recursive inclusion"));
return 1;
}
if (ctx = ctx_lookup (st.st_ino))
{
- yyerror ("recursive inclusion");
+ yyerror (_("recursive inclusion"));
if (ctx->prev)
sieve_compile_error (ctx->prev->filename, ctx->prev->line,
- "`%s' already included here",
+ _("`%s' already included here"),
name);
else
sieve_compile_error (sieve_filename, sieve_line_num,
- "`%s' already included at top level",
+ _("`%s' already included at top level"),
name);
return 1;
}
@@ -251,7 +251,7 @@ push_source (const char *name)
if (!fp)
{
sieve_compile_error (sieve_filename, sieve_line_num,
- "can't open `%s': %s", name, strerror (errno));
+ _("can't open `%s': %s"), name, strerror (errno));
return 1;
}
@@ -420,7 +420,7 @@ get_file_name (char *p, char *endp, int *usepath)
break;
default:
- yyerror ("preprocessor syntax");
+ yyerror (_("preprocessor syntax"));
return NULL;
}
@@ -429,7 +429,7 @@ get_file_name (char *p, char *endp, int *usepath)
if (*p != exp)
{
- yyerror ("missing closing quote in preprocessor statement");
+ yyerror (_("missing closing quote in preprocessor statement"));
return NULL;
}
@@ -582,7 +582,7 @@ multiline_add (char *s)
s = strdup (multiline_strip_tabs (yytext));
if (!s)
{
- yyerror ("not enough memory");
+ yyerror (_("not enough memory"));
exit (1);
}
}
@@ -622,7 +622,7 @@ multiline_begin ()
multiline_delimiter = strdup (".");
if (!multiline_delimiter)
{
- yyerror ("not enough memory");
+ yyerror (_("not enough memory"));
exit (1);
}
}
@@ -679,7 +679,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/sieve.y b/libsieve/sieve.y
index ccb584c33..331f06e94 100644
--- a/libsieve/sieve.y
+++ b/libsieve/sieve.y
@@ -1,19 +1,19 @@
%{
-/* GNU mailutils - a suite of utilities for electronic mail
+/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
- This program is distributed in the hope that it will be useful,
+ GNU Mailutils is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software
+ along with GNU Mailutils; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
@@ -226,11 +226,11 @@ test : command
if (!reg)
sieve_compile_error (sieve_filename, sieve_line_num,
- "unknown test: %s",
+ _("unknown test: %s"),
$1.ident);
else if (!reg->required)
sieve_compile_error (sieve_filename, sieve_line_num,
- "test `%s' has not been required",
+ _("test `%s' has not been required"),
$1.ident);
else if (sieve_code_test (reg, $1.args))
YYERROR;
@@ -252,11 +252,11 @@ action : command
$$ = sieve_machine->pc;
if (!reg)
sieve_compile_error (sieve_filename, sieve_line_num,
- "unknown action: %s",
+ _("unknown action: %s"),
$1.ident);
else if (!reg->required)
sieve_compile_error (sieve_filename, sieve_line_num,
- "action `%s' has not been required",
+ _("action `%s' has not been required"),
$1.ident);
else if (sieve_code_action (reg, $1.args))
YYERROR;
diff --git a/libsieve/tests.c b/libsieve/tests.c
index 6823d6491..c025a744d 100644
--- a/libsieve/tests.c
+++ b/libsieve/tests.c
@@ -1,18 +1,18 @@
-/* GNU mailutils - a suite of utilities for electronic mail
+/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
- This program is distributed in the hope that it will be useful,
+ GNU Mailutils is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software
+ along with GNU Mailutils; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
@@ -101,13 +101,13 @@ 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, _("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, _("address: can't get argument 2"));
sieve_abort (mach);
}
@@ -141,13 +141,13 @@ 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, _("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, _("header: can't get argument 2"));
sieve_abort (mach);
}
@@ -221,13 +221,13 @@ 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");
+ sieve_error (mach, _("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, _("header: can't get argument 2"));
sieve_abort (mach);
}
@@ -249,7 +249,7 @@ 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, _("size: can't get argument!"));
sieve_abort (mach);
}
@@ -303,7 +303,7 @@ 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, _("exists: can't get argument!"));
sieve_abort (mach);
}
diff --git a/libsieve/util.c b/libsieve/util.c
index 7145611a6..39ae85f91 100644
--- a/libsieve/util.c
+++ b/libsieve/util.c
@@ -1,18 +1,18 @@
-/* GNU mailutils - a suite of utilities for electronic mail
+/* GNU Mailutils -- a suite of utilities for electronic mail
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
- This program is distributed in the hope that it will be useful,
+ GNU Mailutils is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software
+ along with GNU Mailutils; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
@@ -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;
diff --git a/mailbox/message.c b/mailbox/message.c
index 6e6244bdc..5f109c5b9 100644
--- a/mailbox/message.c
+++ b/mailbox/message.c
@@ -1,18 +1,18 @@
-/* GNU mailutils - a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+/* GNU Mailutils -- a suite of utilities for electronic mail
+ Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU General Library Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
- This program is distributed in the hope that it will be useful,
+ GNU Mailutils is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
- along with this program; if not, write to the Free Software
+ along with GNU Mailutils; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
@@ -48,6 +48,7 @@
#include <mailutils/observer.h>
#include <mailutils/stream.h>
#include <mailutils/mu_auth.h>
+#include <mailutils/nls.h>
#define MESSAGE_MODIFIED 0x10000;
@@ -1064,7 +1065,7 @@ message_save_to_mailbox (message_t msg, ticket_t ticket, mu_debug_t debug,
if ((rc = mailbox_create_default (&to, toname)))
{
mu_debug_print (debug, MU_DEBUG_TRACE,
- "mailbox_create_default (%s) failed: %s\n", toname,
+ _("mailbox_create_default (%s) failed: %s\n"), toname,
mu_errstring (rc));
goto end;
}
@@ -1095,7 +1096,7 @@ message_save_to_mailbox (message_t msg, ticket_t ticket, mu_debug_t debug,
if ((rc = mailbox_open (to, MU_STREAM_WRITE | MU_STREAM_CREAT)))
{
mu_debug_print (debug, MU_DEBUG_TRACE,
- "mailbox_open (%s) failed: %s\n", toname,
+ _("mailbox_open (%s) failed: %s\n"), toname,
mu_errstring (rc));
goto end;
}
@@ -1103,7 +1104,7 @@ message_save_to_mailbox (message_t msg, ticket_t ticket, mu_debug_t debug,
if ((rc = mailbox_append_message (to, msg)))
{
mu_debug_print (debug, MU_DEBUG_TRACE,
- "mailbox_append_message (%s) failed: %s\n", toname,
+ _("mailbox_append_message (%s) failed: %s\n"), toname,
mu_errstring (rc));
goto end;
}
@@ -1115,7 +1116,7 @@ end:
if ((rc = mailbox_close (to)))
{
mu_debug_print (debug, MU_DEBUG_TRACE,
- "mailbox_close (%s) failed: %s\n", toname,
+ _("mailbox_close (%s) failed: %s\n"), toname,
mu_errstring (rc));
}
}
diff --git a/mailbox/mu_argp.c b/mailbox/mu_argp.c
index 10c0a6436..9490ac144 100644
--- a/mailbox/mu_argp.c
+++ b/mailbox/mu_argp.c
@@ -1,18 +1,18 @@
-/* GNU mailutils - a suite of utilities for electronic mail
- Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+/* GNU Mailutils -- a suite of utilities for electronic mail
+ Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ GNU Mailutils is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
- This program is distributed in the hope that it will be useful,
+ GNU Mailutils is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
- along with this program; if not, write to the Free Software
+ along with GNU Mailutils; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifdef HAVE_CONFIG_H
@@ -41,7 +41,7 @@
#include <mailutils/locker.h>
#include <mailutils/mailer.h>
#include <mailutils/mailbox.h>
-
+#include <mailutils/nls.h>
#include <mailutils/argcv.h>
#define ARG_LOG_FACILITY 1
@@ -53,47 +53,47 @@ const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
static struct argp_option mu_common_argp_options[] =
{
- { NULL, 0, NULL, 0, "Common options", 0},
+ { NULL, 0, NULL, 0, N_("Common options"), 0},
{ "show-config-options", ARG_SHOW_OPTIONS, NULL, OPTION_HIDDEN,
- "Show compilation options", 0 },
+ N_("Show compilation options"), 0 },
{ NULL, 0, NULL, 0, NULL, 0 }
};
/* Option to print the license. */
static struct argp_option mu_license_argp_option[] = {
- { "license", ARG_LICENSE, NULL, 0, "Print license and exit", -2 },
+ { "license", ARG_LICENSE, NULL, 0, N_("Print license and exit"), -2 },</