diff -ur bash-3.2.orig/builtins/bind.def bash-3.2.new/builtins/bind.def --- bash-3.2.orig/builtins/bind.def 2003-12-19 23:56:34.000000000 +0100 +++ bash-3.2.new/builtins/bind.def 2006-11-24 20:05:42.000000000 +0100 @@ -310,7 +310,7 @@ function = rl_named_function (name); if (function == 0) { - builtin_error ("`%s': unknown function name", name); + builtin_error (_("`%s': unknown function name"), name); return EXECUTION_FAILURE; } diff -ur bash-3.2.orig/builtins/hash.def bash-3.2.new/builtins/hash.def --- bash-3.2.orig/builtins/hash.def 2006-02-21 20:59:45.000000000 +0100 +++ bash-3.2.new/builtins/hash.def 2006-11-24 20:05:42.000000000 +0100 @@ -158,7 +158,7 @@ #ifdef EISDIR builtin_error ("%s: %s", pathname, strerror (EISDIR)); #else - builtin_error ("%s: is a directory", pathname); + builtin_error (_("%s: is a directory"), pathname); #endif opt = EXECUTION_FAILURE; } diff -ur bash-3.2.orig/builtins/inlib.def bash-3.2.new/builtins/inlib.def --- bash-3.2.orig/builtins/inlib.def 2002-03-19 20:20:49.000000000 +0100 +++ bash-3.2.new/builtins/inlib.def 2006-11-24 20:05:42.000000000 +0100 @@ -64,7 +64,7 @@ if (status.all != status_$ok) { - builtin_error ("%s: inlib failed", list->word->word); + builtin_error (_("%s: inlib failed"), list->word->word); return_value = EXECUTION_FAILURE; } diff -ur bash-3.2.orig/builtins/printf.def bash-3.2.new/builtins/printf.def --- bash-3.2.orig/builtins/printf.def 2006-09-18 14:48:42.000000000 +0200 +++ bash-3.2.new/builtins/printf.def 2006-11-24 20:05:42.000000000 +0100 @@ -540,7 +540,7 @@ printf_erange (s) char *s; { - builtin_error ("warning: %s: %s", s, strerror(ERANGE)); + builtin_error (_("warning: %s: %s"), s, strerror(ERANGE)); } /* We duplicate a lot of what printf(3) does here. */ diff -ur bash-3.2.orig/builtins/pushd.def bash-3.2.new/builtins/pushd.def --- bash-3.2.orig/builtins/pushd.def 2006-03-06 15:41:33.000000000 +0100 +++ bash-3.2.new/builtins/pushd.def 2006-11-24 20:05:42.000000000 +0100 @@ -483,9 +483,9 @@ char *arg; { if (offset == 0) - builtin_error ("directory stack empty"); + builtin_error (_("directory stack is empty")); else - sh_erange (arg, "directory stack index"); + sh_erange (arg, _("directory stack index")); } static void diff -ur bash-3.2.orig/builtins/test.def bash-3.2.new/builtins/test.def --- bash-3.2.orig/builtins/test.def 2002-04-04 21:48:17.000000000 +0200 +++ bash-3.2.new/builtins/test.def 2006-11-24 20:05:42.000000000 +0100 @@ -131,7 +131,7 @@ { if (this_command_name[0] == '[' && !this_command_name[1]) { - builtin_error ("missing `]'"); + builtin_error (_("missing `]'")); return (EX_BADUSAGE); } diff -ur bash-3.2.orig/builtins/ulimit.def bash-3.2.new/builtins/ulimit.def --- bash-3.2.orig/builtins/ulimit.def 2006-03-23 21:51:51.000000000 +0100 +++ bash-3.2.new/builtins/ulimit.def 2006-11-24 20:05:42.000000000 +0100 @@ -675,7 +675,7 @@ if (get_limit (i, &softlim, &hardlim) == 0) printone (i, (mode & LIMIT_SOFT) ? softlim : hardlim, 1); else if (errno != EINVAL) - builtin_error ("%s: cannot get limit: %s", limits[i].description, + builtin_error (_("%s: cannot get limit: %s"), limits[i].description, strerror (errno)); } } @@ -740,7 +740,7 @@ for (retval = i = 0; limits[i].option > 0; i++) if (set_limit (i, newlim, mode) < 0) { - builtin_error ("%s: cannot modify limit: %s", limits[i].description, + builtin_error (_("%s: cannot modify limit: %s"), limits[i].description, strerror (errno)); retval = 1; } diff -ur bash-3.2.orig/lib/malloc/malloc.c bash-3.2.new/lib/malloc/malloc.c --- bash-3.2.orig/lib/malloc/malloc.c 2005-10-26 14:09:29.000000000 +0200 +++ bash-3.2.new/lib/malloc/malloc.c 2006-11-24 20:05:42.000000000 +0100 @@ -312,7 +312,7 @@ int line; { fprintf (stderr, _("\r\nmalloc: %s:%d: assertion botched\r\n"), - file ? file : "unknown", line); + file ? file : _("unknown"), line); #ifdef MALLOC_REGISTER if (mem != NULL && malloc_register) mregister_describe_mem (mem, stderr); diff -ur bash-3.2.orig/lib/malloc/watch.c bash-3.2.new/lib/malloc/watch.c --- bash-3.2.orig/lib/malloc/watch.c 2003-12-20 01:22:30.000000000 +0100 +++ bash-3.2.new/lib/malloc/watch.c 2006-11-24 20:05:42.000000000 +0100 @@ -53,10 +53,10 @@ else tag = _("bug: unknown operation"); - fprintf (stderr, _("malloc: watch alert: %p %s "), addr, tag); + fprintf (stderr, _("malloc: watch alert: %p %s"), addr, tag); if (data != (unsigned long)-1) - fprintf (stderr, "(size %lu) ", data); - fprintf (stderr, "from '%s:%d'\n", file ? file : "unknown", line); + fprintf (stderr, _(" (size %lu)"), data); + fprintf (stderr, _(" from '%s:%d'\n"), file ? file : _("unknown"), line); } void diff -ur bash-3.2.orig/shell.c bash-3.2.new/shell.c --- bash-3.2.orig/shell.c 2006-05-17 14:46:54.000000000 +0200 +++ bash-3.2.new/shell.c 2006-11-24 20:05:42.000000000 +0100 @@ -1416,7 +1416,7 @@ } else if (sample_len > 0 && (check_binary_file (sample, sample_len))) { - internal_error ("%s: cannot execute binary file", filename); + internal_error (_("%s: cannot execute binary file"), filename); exit (EX_BINARY_FILE); } /* Now rewind the file back to the beginning. */ diff -ur bash-3.2.orig/subst.c bash-3.2.new/subst.c --- bash-3.2.orig/subst.c 2006-09-19 14:35:09.000000000 +0200 +++ bash-3.2.new/subst.c 2006-11-24 20:05:42.000000000 +0100 @@ -4364,7 +4364,7 @@ { if (sh_unset_nodelay_mode (fd) < 0) { - sys_error (_("cannout reset nodelay mode for fd %d"), fd); + sys_error (_("cannot reset nodelay mode for fd %d"), fd); exit (127); } }