Commit 691bd529 authored by Thomas Roessler's avatar Thomas Roessler

Adding gettext support, based on the patch by Marco d'Itri.

parent dea307bb
This diff is collapsed.
## Process this file with automake to produce Makefile.in
## Use aclocal; automake --foreign
EXTRA_PROGRAMS = mutt_dotlock
bin_PROGRAMS = mutt @DOTLOCK_TARGET@
mutt_SOURCES = addrbook.c alias.c attach.c browser.c buffy.c color.c \
commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
edit.c enter.c flags.c init.c filter.c from.c getdomain.c \
handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \
main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c \
postpone.c query.c recvattach.c rfc822.c \
rfc1524.c rfc2047.c score.c send.c sendlib.c signal.c sort.c \
status.c system.c thread.c charset.c history.c lib.c
mutt_LDADD = @MUTT_LIB_OBJECTS@
mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@
EXTRA_mutt_SOURCES = pgp.c pgpinvoke.c pgpkey.c pgppubring.c sha1dgst.c \
gnupgparse.c resize.c snprintf.c dotlock.c pop.c imap.c socket.c
BUILT_SOURCES = mutt_dotlock.c
mutt_dotlock.c: dotlock.c
cp dotlock.c mutt_dotlock.c
LDADD = @LIBOBJS@ @INTLLIBS@
SUBDIRS = doc intl po
OPS=$(srcdir)/OPS $(srcdir)/OPS.PGP
keymap_defs.h: $(OPS)
$(srcdir)/gen_defs $(OPS) > keymap_defs.h
reldate:
echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > $(srcdir)/reldate.h
This diff is collapsed.
/* Is this the international version? */
#undef SUBVERSION
/* The "real" version string */
#undef VERSION
/* The package name */
#undef PACKAGE
/* Where to put l10n data */
#undef MUTTLOCALEDIR
/* Where to put other shared data */
#undef SHAREDIR
/* Enable debugging info */
#define DEBUG
......@@ -111,3 +125,17 @@
/* Does your system have the fchdir() call? */
#undef HAVE_FCHDIR
/* Define if your locale.h file contains LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
/* Define to 1 if NLS is requested. */
#undef ENABLE_NLS
/* Define as 1 if you have catgets and don't want to use GNU gettext. */
#undef HAVE_CATGETS
/* Define as 1 if you have gettext and don't want to use GNU gettext. */
#undef HAVE_GETTEXT
#undef HAVE_STPCPY
This diff is collapsed.
......@@ -128,7 +128,7 @@ void mutt_alias_menu (char *buf, size_t buflen, ALIAS *aliases)
if (!aliases)
{
mutt_error ("You have no aliases!");
mutt_error _("You have no aliases!");
return;
}
......@@ -140,7 +140,7 @@ void mutt_alias_menu (char *buf, size_t buflen, ALIAS *aliases)
menu->search = alias_search;
menu->tag = alias_tag;
menu->menu = MENU_ALIAS;
menu->title = "Aliases";
menu->title = _("Aliases");
menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_ALIAS, AliasHelp);
/* count the number of aliases */
......
......@@ -188,13 +188,14 @@ void mutt_create_alias (ENVELOPE *cur, ADDRESS *iadr)
else
buf[0] = '\0';
if (mutt_get_field ("Alias as: ", buf, sizeof (buf), 0) != 0 || !buf[0])
/* add a new alias */
if (mutt_get_field (_("Alias as: "), buf, sizeof (buf), 0) != 0 || !buf[0])
return;
/* check to see if the user already has an alias defined */
if (mutt_lookup_alias (buf))
{
mutt_error ("You already have an alias defined with that name!");
mutt_error _("You already have an alias defined with that name!");
return;
}
......@@ -208,7 +209,7 @@ void mutt_create_alias (ENVELOPE *cur, ADDRESS *iadr)
do
{
if (mutt_get_field ("Address: ", buf, sizeof (buf), 0) != 0 || !buf[0])
if (mutt_get_field (_("Address: "), buf, sizeof (buf), 0) != 0 || !buf[0])
{
mutt_free_alias (&new);
return;
......@@ -224,7 +225,7 @@ void mutt_create_alias (ENVELOPE *cur, ADDRESS *iadr)
else
buf[0] = 0;
if (mutt_get_field ("Personal name: ", buf, sizeof (buf), 0) != 0)
if (mutt_get_field (_("Personal name: "), buf, sizeof (buf), 0) != 0)
{
mutt_free_alias (&new);
return;
......@@ -233,7 +234,7 @@ void mutt_create_alias (ENVELOPE *cur, ADDRESS *iadr)
buf[0] = 0;
rfc822_write_address (buf, sizeof (buf), new->addr);
snprintf (prompt, sizeof (prompt), "[%s = %s] Accept?", new->name, buf);
snprintf (prompt, sizeof (prompt), _("[%s = %s] Accept?"), new->name, buf);
if (mutt_yesorno (prompt, 1) != 1)
{
mutt_free_alias (&new);
......@@ -250,7 +251,7 @@ void mutt_create_alias (ENVELOPE *cur, ADDRESS *iadr)
Aliases = new;
strfcpy (buf, NONULL (AliasFile), sizeof (buf));
if (mutt_get_field ("Save to file: ", buf, sizeof (buf), M_FILE) != 0)
if (mutt_get_field (_("Save to file: "), buf, sizeof (buf), M_FILE) != 0)
return;
mutt_expand_path (buf, sizeof (buf));
if ((rc = fopen (buf, "a")))
......@@ -261,7 +262,7 @@ void mutt_create_alias (ENVELOPE *cur, ADDRESS *iadr)
write_safe_address (rc, buf);
fputc ('\n', rc);
fclose (rc);
mutt_message ("Alias added.");
mutt_message _("Alias added.");
}
else
mutt_perror (buf);
......
......@@ -108,7 +108,7 @@ int mutt_compose_attachment (BODY *a)
a->filename, newfile));
if (safe_symlink (a->filename, newfile) == -1)
{
if (!mutt_yesorno ("Can't match nametemplate, continue?", 1))
if (!mutt_yesorno (_("Can't match nametemplate, continue?"), 1))
goto bailout;
}
unlink_newfile = 1;
......@@ -120,7 +120,7 @@ int mutt_compose_attachment (BODY *a)
command, sizeof (command)))
{
/* For now, editing requires a file, no piping */
mutt_error ("Mailcap compose entry requires %%s");
mutt_error _("Mailcap compose entry requires %%s");
}
else
{
......@@ -134,7 +134,7 @@ int mutt_compose_attachment (BODY *a)
if ((fp = safe_fopen (a->filename, "r")) == NULL)
{
mutt_perror ("Failure to open file to parse headers.");
mutt_perror _("Failure to open file to parse headers.");
goto bailout;
}
......@@ -165,7 +165,7 @@ int mutt_compose_attachment (BODY *a)
mutt_mktemp (tempfile);
if ((tfp = safe_fopen (tempfile, "w")) == NULL)
{
mutt_perror ("Failure to open file to strip headers.");
mutt_perror _("Failure to open file to strip headers.");
goto bailout;
}
mutt_copy_stream (fp, tfp);
......@@ -183,7 +183,8 @@ int mutt_compose_attachment (BODY *a)
else
{
rfc1524_free_entry (&entry);
mutt_message ("No mailcap compose entry for %s, creating empty file.",type);
mutt_message (_("No mailcap compose entry for %s, creating empty file."),
type);
return 1;
}
......@@ -230,7 +231,7 @@ int mutt_edit_attachment (BODY *a)
a->filename, newfile));
if (safe_symlink (a->filename, newfile) == -1)
{
if (!mutt_yesorno ("Can't match nametemplate, continue?", 1))
if (!mutt_yesorno (_("Can't match nametemplate, continue?"), 1))
goto bailout;
}
unlink_newfile = 1;
......@@ -242,7 +243,7 @@ int mutt_edit_attachment (BODY *a)
command, sizeof (command)))
{
/* For now, editing requires a file, no piping */
mutt_error ("Mailcap Edit entry requires %%s");
mutt_error _("Mailcap Edit entry requires %%s");
}
else
{
......@@ -260,7 +261,7 @@ int mutt_edit_attachment (BODY *a)
else
{
rfc1524_free_entry (&entry);
mutt_error ("No mailcap edit entry for %s",type);
mutt_error (_("No mailcap edit entry for %s"),type);
return 0;
}
......@@ -328,7 +329,7 @@ int mutt_view_attachment (FILE *fp, BODY *a, int flag)
{
/* fallback to view as text */
rfc1524_free_entry (&entry);
mutt_error ("No matching mailcap entry found. Viewing as text.");
mutt_error _("No matching mailcap entry found. Viewing as text.");
flag = M_AS_TEXT;
use_mailcap = 0;
}
......@@ -341,7 +342,7 @@ int mutt_view_attachment (FILE *fp, BODY *a, int flag)
{
if (!entry->command)
{
mutt_error ("MIME type not defined. Cannot view attachment.");
mutt_error _("MIME type not defined. Cannot view attachment.");
goto return_error;
}
strfcpy (command, entry->command, sizeof (command));
......@@ -362,7 +363,7 @@ int mutt_view_attachment (FILE *fp, BODY *a, int flag)
/* send case: the file is already there */
if (safe_symlink (a->filename, tempfile) == -1)
{
if (mutt_yesorno ("Can't match nametemplate, continue?", 1) == M_YES)
if (mutt_yesorno (_("Can't match nametemplate, continue?"), 1) == M_YES)
strfcpy (tempfile, a->filename, sizeof (tempfile));
else
goto return_error;
......@@ -432,7 +433,7 @@ int mutt_view_attachment (FILE *fp, BODY *a, int flag)
fclose (pagerfp);
if (tempfp)
fclose (tempfp);
mutt_error ("Cannot create filter");
mutt_error _("Cannot create filter");
goto return_error;
}
......@@ -638,7 +639,7 @@ int mutt_save_attachment (FILE *fp, BODY *m, char *path, int flags, HEADER *hdr)
chflags = CH_FROM;
chflags |= (ctx.magic == M_MAILDIR ? CH_NOSTATUS : CH_UPDATE);
if ((r = _mutt_copy_message (msg->fp, fp, hn, hn->content, 0, chflags)) == 0)
mutt_message("Attachment saved.");
mutt_message _("Attachment saved.");
mx_close_message (&msg);
mx_close_mailbox(&ctx);
......@@ -691,7 +692,7 @@ int mutt_save_attachment (FILE *fp, BODY *m, char *path, int flags, HEADER *hdr)
if (mutt_copy_stream (ofp, nfp) == -1)
{
mutt_error ("Write fault!");
mutt_error _("Write fault!");
fclose (ofp);
fclose (nfp);
return (-1);
......@@ -809,7 +810,7 @@ int mutt_print_attachment (FILE *fp, BODY *a)
{
if (safe_symlink(a->filename, newfile) == -1)
{
if (mutt_yesorno ("Can't match nametemplate, continue?", 1) != M_YES)
if (mutt_yesorno (_("Can't match nametemplate, continue?"), 1) != M_YES)
{
rfc1524_free_entry (&entry);
return 0;
......@@ -893,7 +894,7 @@ int mutt_print_attachment (FILE *fp, BODY *a)
}
else
{
mutt_error ("I don't know how to print that!");
mutt_error _("I don't know how to print that!");
return 0;
}
}
......@@ -341,7 +341,7 @@ static int examine_directory (MUTTMENU *menu, struct browser_state *state,
if (!S_ISDIR (s.st_mode))
{
mutt_error ("%s is not a directory", d);
mutt_error (_("%s is not a directory."), d);
return (-1);
}
......@@ -444,12 +444,12 @@ static void init_menu (struct browser_state *state, MUTTMENU *menu, char *title,
menu->current = 0;
if (buffy)
snprintf (title, titlelen, "Mailboxes [%d]", mutt_buffy_check (0));
snprintf (title, titlelen, _("Mailboxes [%d]"), mutt_buffy_check (0));
else
{
strfcpy (path, LastDir, sizeof (path));
mutt_pretty_mailbox (path);
snprintf (title, titlelen, "Directory [%s], File mask: %s",
snprintf (title, titlelen, _("Directory [%s], File mask: %s"),
path, Mask.pattern);
}
menu->redraw = REDRAW_FULL;
......@@ -533,7 +533,7 @@ void mutt_select_file (char *f, size_t flen, int buffy)
if (!state.entrylen)
{
mutt_error ("No files match the file mask");
mutt_error _("No files match the file mask");
break;
}
......@@ -640,7 +640,7 @@ void mutt_select_file (char *f, size_t flen, int buffy)
buf[len]='/';
}
if (mutt_get_field ("Chdir to: ", buf, sizeof (buf), M_FILE) == 0 &&
if (mutt_get_field (_("Chdir to: "), buf, sizeof (buf), M_FILE) == 0 &&
buf[0])
{
buffy = 0;
......@@ -659,14 +659,14 @@ void mutt_select_file (char *f, size_t flen, int buffy)
}
else
{
mutt_error ("Error scanning directory.");
mutt_error _("Error scanning directory.");
destroy_state (&state);
mutt_menuDestroy (&menu);
return;
}
}
else
mutt_error ("%s is not a directory.", buf);
mutt_error (_("%s is not a directory."), buf);
}
else
mutt_perror (buf);
......@@ -677,7 +677,7 @@ void mutt_select_file (char *f, size_t flen, int buffy)
case OP_ENTER_MASK:
strfcpy (buf, Mask.pattern, sizeof (buf));
if (mutt_get_field ("File Mask: ", buf, sizeof (buf), 0) == 0)
if (mutt_get_field (_("File Mask: "), buf, sizeof (buf), 0) == 0)
{
regex_t *rx = (regex_t *) safe_malloc (sizeof (regex_t));
char *s = buf;
......@@ -716,14 +716,14 @@ void mutt_select_file (char *f, size_t flen, int buffy)
init_menu (&state, menu, title, sizeof (title), buffy);
else
{
mutt_error ("Error scanning directory.");
mutt_error _("Error scanning directory.");
mutt_menuDestroy (&menu);
return;
}
killPrefix = 0;
if (!state.entrylen)
{
mutt_error ("No files match the file mask");
mutt_error _("No files match the file mask");
break;
}
}
......@@ -741,9 +741,10 @@ void mutt_select_file (char *f, size_t flen, int buffy)
if (i == OP_SORT_REVERSE)
{
reverse = SORT_REVERSE;
addstr ("Reverse ");
addstr _("Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? ");
} else {
addstr _("Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? ");
}
addstr ("Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? ");
clrtoeol ();
while ((i = mutt_getch ()) != EOF && i != 'a' && i != 'd' && i != 'z'
......@@ -799,7 +800,7 @@ void mutt_select_file (char *f, size_t flen, int buffy)
case OP_BROWSER_NEW_FILE:
snprintf (buf, sizeof (buf), "%s/", LastDir);
if (mutt_get_field ("New file name: ", buf, sizeof (buf), M_FILE) == 0)
if (mutt_get_field (_("New file name: "), buf, sizeof (buf), M_FILE) == 0)
{
strfcpy (f, buf, flen);
destroy_state (&state);
......@@ -812,7 +813,7 @@ void mutt_select_file (char *f, size_t flen, int buffy)
case OP_BROWSER_VIEW_FILE:
if (!state.entrylen)
{
mutt_error ("No files match the file mask");
mutt_error _("No files match the file mask");
break;
}
......@@ -820,7 +821,7 @@ void mutt_select_file (char *f, size_t flen, int buffy)
(S_ISLNK (state.entry[menu->current].mode) &&
link_is_dir (state.entry[menu->current].name)))
{
mutt_error ("Can't view a directory");
mutt_error _("Can't view a directory");
break;
}
else
......@@ -838,7 +839,7 @@ void mutt_select_file (char *f, size_t flen, int buffy)
menu->redraw = REDRAW_FULL;
}
else
mutt_error ("Error trying to view file");
mutt_error _("Error trying to view file");
}
}
}
......
......@@ -354,7 +354,7 @@ int mutt_buffy_notify (void)
{
strfcpy (path, tmp->path, sizeof (path));
mutt_pretty_mailbox (path);
mutt_message ("New mail in %s.", path);
mutt_message (_("New mail in %s."), path);
tmp->notified = 1;
BuffyNotify--;
return (1);
......
......@@ -303,13 +303,13 @@ parse_color_name (const char *s, int *col, int *attr, int brite, BUFFER *err)
if (!*s || *eptr || *col < 0 ||
(*col >= COLORS && !option(OPTNOCURSES) && has_colors()))
{
snprintf (err->data, err->dsize, "%s: color not supported by term", s);
snprintf (err->data, err->dsize, _("%s: color not supported by term"), s);
return (-1);
}
}
else if ((*col = mutt_getvaluebyname (s, Colors)) == -1)
{
snprintf (err->data, err->dsize, "%s: no such color", s);
snprintf (err->data, err->dsize, _("%s: no such color"), s);
return (-1);
}
......@@ -355,14 +355,14 @@ _mutt_parse_uncolor (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err,
if ((object = mutt_getvaluebyname (buf->data, Fields)) == -1)
{
snprintf (err->data, err->dsize, "%s: no such object", buf->data);
snprintf (err->data, err->dsize, _("%s: no such object"), buf->data);
return (-1);
}
if (strncmp (buf->data, "index", 5) != 0)
{
snprintf (err->data, err->dsize,
"%s: command valid only for index object",
_("%s: command valid only for index object"),
parse_uncolor ? "uncolor" : "unmono");
return (-1);
}
......@@ -370,7 +370,7 @@ _mutt_parse_uncolor (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err,
if (!MoreArgs (s))
{
snprintf (err->data, err->dsize,
"%s: too few arguments", parse_uncolor ? "uncolor" : "unmono");
_("%s: too few arguments"), parse_uncolor ? "uncolor" : "unmono");
return (-1);
}
......@@ -526,7 +526,7 @@ parse_object(BUFFER *buf, BUFFER *s, int *o, int *ql, BUFFER *err)
if(!MoreArgs(s))
{
strfcpy(err->data, "Missing arguments.", err->dsize);
strfcpy(err->data, _("Missing arguments."), err->dsize);
return -1;
}
......@@ -538,7 +538,7 @@ parse_object(BUFFER *buf, BUFFER *s, int *o, int *ql, BUFFER *err)
*ql = strtol(buf->data + 6, &eptr, 10);
if(*eptr || q_level < 0)
{
snprintf(err->data, err->dsize, "%s: no such object", buf->data);
snprintf(err->data, err->dsize, _("%s: no such object"), buf->data);
return -1;
}
}
......@@ -549,7 +549,7 @@ parse_object(BUFFER *buf, BUFFER *s, int *o, int *ql, BUFFER *err)
}
else if ((*o = mutt_getvaluebyname (buf->data, Fields)) == -1)
{
snprintf (err->data, err->dsize, "%s: no such object", buf->data);
snprintf (err->data, err->dsize, _("%s: no such object"), buf->data);
return (-1);
}
......@@ -565,7 +565,7 @@ parse_color_pair(BUFFER *buf, BUFFER *s, int *fg, int *bg, int *attr, BUFFER *er
{
if (! MoreArgs (s))
{
strfcpy (err->data, "color: too few arguments", err->dsize);
strfcpy (err->data, _("color: too few arguments"), err->dsize);
return (-1);
}
......@@ -576,7 +576,7 @@ parse_color_pair(BUFFER *buf, BUFFER *s, int *fg, int *bg, int *attr, BUFFER *er
if (! MoreArgs (s))
{
strfcpy (err->data, "color: too few arguments", err->dsize);
strfcpy (err->data, _("color: too few arguments"), err->dsize);
return (-1);
}
......@@ -599,7 +599,7 @@ parse_attr_spec(BUFFER *buf, BUFFER *s, int *fg, int *bg, int *attr, BUFFER *err
if (! MoreArgs (s))
{
strfcpy (err->data, "mono: too few arguments", err->dsize);
strfcpy (err->data, _("mono: too few arguments"), err->dsize);
return (-1);
}
......@@ -619,7 +619,7 @@ parse_attr_spec(BUFFER *buf, BUFFER *s, int *fg, int *bg, int *attr, BUFFER *err
*attr = A_NORMAL; /* needs use = instead of |= to clear other bits */
else
{
snprintf (err->data, err->dsize, "%s: no such attribute", buf->data);
snprintf (err->data, err->dsize, _("%s: no such attribute"), buf->data);
return (-1);
}
......@@ -659,7 +659,7 @@ _mutt_parse_color (BUFFER *buf, BUFFER *s, BUFFER *err,
{
if (!MoreArgs (s))
{
strfcpy (err->data, "too few arguments", err->dsize);
strfcpy (err->data, _("too few arguments"), err->dsize);
return (-1);
}
......@@ -668,7 +668,7 @@ _mutt_parse_color (BUFFER *buf, BUFFER *s, BUFFER *err,
if (MoreArgs (s))
{
strfcpy (err->data, "too many arguments", err->dsize);
strfcpy (err->data, _("too many arguments"), err->dsize);
return (-1);
}
......@@ -682,7 +682,7 @@ _mutt_parse_color (BUFFER *buf, BUFFER *s, BUFFER *err,
if (has_colors() && use_default_colors () != OK
&& (fg == COLOR_DEFAULT || bg == COLOR_DEFAULT))
{
strfcpy (err->data, "default colors not supported", err->dsize);
strfcpy (err->data, _("default colors not supported"), err->dsize);
return (-1);
}
# endif /* HAVE_USE_DEFAULT_COLORS */
......
......@@ -118,7 +118,8 @@ int mutt_display_message (HEADER *cur)
if (is_mmnoask (buf))
rc = M_YES;
else
rc = query_quadoption (OPT_USEMAILCAP, "Display message using mailcap?");
rc = query_quadoption (OPT_USEMAILCAP,
_("Display message using mailcap?"));
if (rc < 0)
return 0;
else if (rc == M_YES)
......@@ -149,15 +150,15 @@ int mutt_display_message (HEADER *cur)
return 0;
cmflags |= M_CM_VERIFY;
mutt_message ("Invoking PGP...");
mutt_message _("Invoking PGP...");
}
else if (cur->pgp & PGPSIGN)
{
/* find out whether or not the verify signature */
if (query_quadoption (OPT_VERIFYSIG, "Verify PGP signature?") == M_YES)
if (query_quadoption (OPT_VERIFYSIG, _("Verify PGP signature?")) == M_YES)
{
cmflags |= M_CM_VERIFY;
mutt_message ("Invoking PGP...");
mutt_message _("Invoking PGP...");
}
}
}
......@@ -172,7 +173,7 @@ int mutt_display_message (HEADER *cur)
mutt_mktemp (tempfile);
if ((fpout = safe_fopen (tempfile, "w")) == NULL)
{
mutt_error ("Could not create temporary file!");
mutt_error _("Could not create temporary file!");
return (0);
}
......@@ -220,7 +221,7 @@ int mutt_display_message (HEADER *cur)
mutt_set_flag (Context, cur, M_READ, 1);
if (option (OPTPROMPTAFTER))
{
mutt_ungetch (mutt_any_key_to_continue ("Command: "));
mutt_ungetch (mutt_any_key_to_continue _("Command: "));
rc = km_dokey (MENU_PAGER);
}
else
......@@ -237,6 +238,7 @@ void ci_bounce_message (HEADER *h, int *redraw)
ADDRESS *adr = NULL;
int rc;
/* FIXME i18n */
snprintf (prompt, sizeof(prompt), "Bounce %smessage%s to: ",
h ? "" : "tagged ", h ? "" : "s");
rc = mutt_get_field (prompt, buf, sizeof (buf), M_ALIAS);
......@@ -252,7 +254,7 @@ void ci_bounce_message (HEADER *h, int *redraw)
if (!(adr = rfc822_parse_adrlist (adr, buf)))
{
mutt_error ("Error parsing address!");
mutt_error _("Error parsing address!");
return;
}
......@@ -262,7 +264,7 @@ void ci_bounce_message (HEADER *h, int *redraw)
rfc822_write_address (buf, sizeof (buf), adr);
snprintf (prompt, (COLS > sizeof(prompt) ? sizeof(prompt) : COLS) - 13,
"Bounce message%s to %s", (h ? "" : "s"), buf);
(h ? _("Bounce message to %s") : _("Bounce messages to %s")), buf);
strcat(prompt, "...?");
if (mutt_yesorno (prompt, 1) != 1)
{
......@@ -273,7 +275,7 @@ void ci_bounce_message (HEADER *h, int *redraw)
mutt_bounce_message (h, adr);
rfc822_free_address (&adr);
mutt_message ("Message%s bounced.", h ? "" : "s");
mutt_message (h ? _("Message bounced.") : _("Messages bounced."));
}
void mutt_pipe_message_to_state (HEADER *h, STATE *s)
......@@ -293,8 +295,8 @@ int mutt_pipe_message (HEADER *h)
pid_t thepid;
buffer[0] = 0;
if (mutt_get_field ("Pipe to command: ", buffer, sizeof (buffer), M_CMD) != 0 ||
!buffer[0])
if (mutt_get_field (_("Pipe to command: "), buffer, sizeof (buffer), M_CMD)
!= 0 || !buffer[0])
return 0;
mutt_expand_path (buffer, sizeof (buffer));
......@@ -397,8 +399,9 @@ int mutt_select_sort (int reverse)
while (!Sort)
{
mvprintw (LINES - 1, 0,
"%sSort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: ",
reverse ? "Rev-" : "");
reverse ?
_("Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: ") :
_("Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "));
ch = mutt_getch ();
if (ch == ERR || CI_is_return (ch))
{
......@@ -453,7 +456,7 @@ void mutt_shell_escape (void)
char buf[LONG_STRING];
buf[0] = 0;
if (mutt_get_field ("Shell command: ", buf, sizeof (buf), M_CMD) == 0)
if (mutt_get_field (_("Shell command: "), buf, sizeof (buf), M_CMD) == 0)
{
if (!buf[0] && Shell)
strfcpy (buf, Shell, sizeof (buf));
......@@ -569,10 +572,10 @@ int mutt_save_message (HEADER *h, int delete, int decode, int decrypt, int *redr
*redraw = 0;
snprintf (prompt, sizeof (prompt), "%s%s to mailbox",
decode ? (delete ? "Decode-save" : "Decode-copy") :
(decrypt ? (delete ? "Decrypt-save" : "Decrypt-copy"):
(delete ? "Save" : "Copy")), h ? "" : " tagged");
snprintf (prompt, sizeof (prompt), _("%s%s to mailbox"),
decode ? (delete ? _("Decode-save") : _("Decode-copy")) :
(decrypt ? (delete ? _("Decrypt-save") : _("Decrypt-copy")):
(delete ? _("Save") : _("Copy"))), h ? "" : _(" tagged"));
if (h)
{
......@@ -641,7 +644,7 @@ int mutt_save_message (HEADER *h, int delete, int decode, int decrypt, int *redr
return -1;
#endif
mutt_message ("Copying to %s...", buf);
mutt_message (_("Copying to %s..."), buf);
if (mx_open_mailbox (buf, M_APPEND, &ctx) != NULL)
{
......@@ -713,7 +716,8 @@ void mutt_print_message (HEADER *h)
FILE *fp;
if (query_quadoption (OPT_PRINT,
h ? "Print message?" : "Print tagged messages?") != M_YES)
h ? _("Print message?") : _("Print tagged messages?"))
!= M_YES)
return;
endwin ();
if ((thepid = mutt_create_filter (NONULL(PrintCmd), &fp, NULL, NULL)) == -1)
......@@ -739,10 +743,10 @@ void mutt_print_message (HEADER *h)
fclose (fp);
if (mutt_wait_filter (thepid) || option (OPTWAITKEY))
mutt_any_key_to_continue (NULL);
mutt_message ("Message%s printed", (count > 1) ? "s" : "");
mutt_message ((count > 1) ? _("Message printed") : _("Messages printed"));
}
void mutt_version (void)
{
mutt_message ("Mutt %s (%s)", VERSION, ReleaseDate);
mutt_message ("Mutt %s (%s)", MUTT_VERSION, ReleaseDate);
}
This diff is collapsed.
/* config.h.in. Generated automatically from configure.in by autoheader. */