Update.

2002-05-06  Jungshik Shin  <jshin@mailaps.org>

	* charmaps/UTF-8: Fix wcwidth for Hangul Conjoining medial vowels
	and trailing consonant.
	* charmaps/GB18030: Likewise

4 files changed, 2608 insertions, 1600 deletions

diff --git a/debug/pcprofiledump.c b/debug/pcprofiledump.c
index 858fed2b85..6d3a2c7354 100644
--- a/debug/pcprofiledump.c
+++ b/debug/pcprofiledump.c
@@ -1,5 +1,5 @@
 /* Dump information generated by PC profiling.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
 
@@ -18,7 +18,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-/* This is mainly and example.  It shows how programs which want to use
+/* This is mainly an example.  It shows how programs which want to use
    the information should read the file.  */
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -49,6 +49,7 @@
 /* Definitions of arguments for argp functions.  */
 static const struct argp_option options[] =
 {
+  { "unbuffered", 'u', NULL, 0, N_("Don't buffer output") },
   { NULL, 0, NULL, 0, NULL }
 };
 
@@ -61,10 +62,13 @@ static const char args_doc[] = N_("[FILE]");
 /* Function to print some extra text in the help message.  */
 static char *more_help (int key, const char *text, void *input);
 
+/* Prototype for option handler.  */
+static error_t parse_opt (int key, char *arg, struct argp_state *state);
+
 /* Data structure to communicate with argp functions.  */
 static struct argp argp =
 {
-  options, NULL, args_doc, doc, NULL, more_help
+  options, parse_opt, args_doc, doc, NULL, more_help
 };
 
 
@@ -171,6 +175,20 @@ main (int argc, char *argv[])
   return 0;
 }
 
+static error_t
+parse_opt (int key, char *arg, struct argp_state *state)
+{
+  switch (key)
+    {
+    case 'u':
+      setbuf (stdout, NULL);
+      break;
+    default:
+      return ARGP_ERR_UNKNOWN;
+    }
+  return 0;
+}
+
 static char *
 more_help (int key, const char *text, void *input)
 {
diff --git a/debug/xtrace.sh b/debug/xtrace.sh
index a613e4eb80..941852f104 100755
--- a/debug/xtrace.sh
+++ b/debug/xtrace.sh
@@ -23,20 +23,26 @@ pcprofiledump=@BINDIR@/pcprofiledump
 
 # Print usage message.
 do_usage() {
-  echo >&2 $"Try \`xtrace --help' for more information."
+  printf $"Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\n"
+  exit 0
+}
+
+# Refer to --help option.
+help_info() {
+  printf >&2 $"Try \`xtrace --help' for more information.\n"
   exit 1
 }
 
 # Message for missing argument.
 do_missing_arg() {
-  echo >&2 $"xtrace: option \`$1' requires an argument"
-  do_usage
+  printf >&2 $"xtrace: option \`$1' requires an argument.\n"
+  help_info
 }
 
 # Print help message
 do_help() {
-  echo $"Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...
-Trace execution of program by printing currently executed function.
+  printf $"Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\n"
+  printf $"Trace execution of program by printing currently executed function.
 
      --data=FILE          Don't run the program, just print the data from FILE.
 
@@ -47,7 +53,7 @@ Trace execution of program by printing currently executed function.
 Mandatory arguments to long options are also mandatory for any corresponding
 short options.
 
-Report bugs using the \`glibcbug' script to <bugs@gnu.org>."
+Report bugs using the \`glibcbug' script to <bugs@gnu.org>.\n"
   exit 0
 }
 
@@ -60,7 +66,7 @@ Written by Ulrich Drepper."
   exit 0
 }
 
-# Print out function name, file, and line number is a nice formatted way.
+# Print out function name, file, and line number in a nicely formatted way.
 format_line() {
   fct=$1
   file=${2%%:*}
@@ -100,23 +106,20 @@ while test $# -gt 0; do
   -? | --h | --he | --hel | --help)
     do_help
     ;;
-  --v | --ve | --ver | --vers | --versi | --versio | --version)
+  -V | --v | --ve | --ver | --vers | --versi | --versio | --version)
     do_version
     ;;
+  --u | --us | --usa | --usag | --usage)
+    do_usage
+    ;;
   --)
     # Stop processing arguments.
     shift
     break
     ;;
-  --help)
-    do_help
-    ;;
-  --version)
-    do_version
-    ;;
   --*)
-    echo >&2 $"xtrace: unrecognized option \`$1'"
-    do_usage
+    printf >&2 $"xtrace: unrecognized option \`$1'\n"
+    help_info
     ;;
   *)
     # Unknown option.  This means the rest is the program name and parameters.
@@ -128,25 +131,25 @@ done
 
 # See whether any arguments are left.
 if test $# -eq 0; then
-  echo >&2 $"No program name given"
-  do_usage
+  printf >&2 $"No program name given\n"
+  help_info
 fi
 
 # Determine the program name and check whether it exists.
 program=$1
 shift
 if test ! -f "$program"; then
-  echo >2& $"executable \`$program' not found"
-  do_usage
+  printf >2& $"executable \`$program' not found\n"
+  help_info
 fi
 if test ! -x "$program"; then
-  echo >&2 $"\`$program' is no executable"
-  do_usage
+  printf >&2 $"\`$program' is no executable\n"
+  help_info
 fi
 
 # We have two modes.  If a data file is given simply print the included data.
 printf "%-20s  %-*s  %6s\n" Function $(expr $COLUMNS - 30) File Line
-for i in $(seq 1 $COLUMNS); do echo -n -; done; echo
+for i in $(seq 1 $COLUMNS); do printf -; done; printf '\n'
 if test -n "$data"; then
   $pcprofiledump "$data" |
   sed 's/this = \([^,]*\).*/\1/' |
@@ -158,21 +161,26 @@ if test -n "$data"; then
     fi
   done
 else
-  fifo=$(mktemp -u ${TMPDIR:-/tmp}/xprof.XXXXXX)
+  fifo=$(mktemp -u ${TMPDIR:-/tmp}/xtrace.XXXXXX)
   mkfifo -m 0600 $fifo || exit 1
+  trap 'rm $fifo; exit 1' SIGINT SIGTERM SIGPIPE
+
   # Now start the program and let it write to the FIFO.
-  $TERMINAL_PROG -T "xtrace - $program $*" -e /bin/sh -c "LD_PRELOAD=$pcprofileso PCPROFILE_OUTPUT=$fifo $program $*; read $fifo" &
+  $TERMINAL_PROG -T "xtrace - $program $*" -e /bin/sh -c "LD_PRELOAD=$pcprofileso PCPROFILE_OUTPUT=$fifo $program $*; read < $fifo" &
   termpid=$!
-  $pcprofiledump $fifo |
-  sed 's/this = \([^,]*\).*/\1/' |
-  addr2line -fC -e $program |
+  $pcprofiledump -u $fifo |
+  while read line; do
+     echo $line |
+     sed 's/this = \([^,]*\).*/\1/' |
+     addr2line -fC -e $program
+  done |
   while read fct; do
     read file
     if test "$fct" != '??' -a "$file" != '??:0'; then
       format_line $fct $file
     fi
   done
-  read -p "Press return to end the program."
+  read -p "Press return here to close $TERMINAL_PROG($program)."
   echo > $fifo
   rm $fifo
 fi
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 5e8cc65f33..66bc4b4aec 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-06  Jungshik Shin  <jshin@mailaps.org>
+
+	* charmaps/UTF-8: Fix wcwidth for Hangul Conjoining medial vowels
+	and trailing consonant.
+	* charmaps/GB18030: Likewise
+
 2002-04-21  Bruno Haible  <bruno@clisp.org>
 
 	* charmaps/GB18030: Add Unicode planes 1 (scripts, symbols), 2 (CJK),
diff --git a/po/de.po b/po/de.po
index 6f3a714d1b..48c96573b3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,85 +1,109 @@
 # German translation of the GNU-libc-messages.
-# Copyright (C) 1996 Free Software Foundation, Inc.
+# Copyright © 1996, 2002 Free Software Foundation, Inc.
+# Karl Eichwalder <ke@suse.de>, 2002.
 # Jochen Hein <jochen@jochen.org>, 1996-2000.
 #
+# Fragen:
+# =======
+# Group bei NIS etc. mit Gruppe übersetzen (oder Group lassen)?
+# logfile - Protokolldatei
+# shared object - Shared Object / Shared-Object
+# short Read - ...
+# range - Bereich / Intervall
+# locking, lock - Locking, Sperren
+#
+# Nach Doppelpunkt Großschreibung?  Beispiel:
+#   msgid "%1$s: definition does not end with `END %1$s'"
+#   msgstr "%1$s: Die Definition ist nicht durch »END %1$s« abgeschlossen"
+#
+# Klein/Groß?  Beispiel:
+#   msgid "DATAFILE [OUTFILE]"
+#   msgstr "DATENDATEI [AUSGABEDATEI]"
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU libc 2.1.3\n"
-"POT-Creation-Date: 2000-02-16 10:39-0800\n"
-"PO-Revision-Date: 2000-02-23 05:03+01:00\n"
-"Last-Translator: Jochen Hein <jochen@jochen.org>\n"
+"Project-Id-Version: GNU libc 2.2.5\n"
+"POT-Creation-Date: 2001-08-17 13:03-0700\n"
+"PO-Revision-Date: 2002-05-04 16:52+0200\n"
+"Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: nis/nis_print.c:273
+#: locale/programs/ld-monetary.c:278
+#, c-format
+msgid "\t\t\t\t\t\t\t      %s: value for field `%s' must be in range %d...%d"
+msgstr "\t\t\t\t\t\t\t      %s: Wert für Feld »%s« muss im Intervall %d...%d sein"
+
+#: nis/nis_print.c:277
 msgid "\t\tAccess Rights : "
 msgstr "\t\tZugriffsrechte : "
 
-#: nis/nis_print.c:271
+#: nis/nis_print.c:275
 msgid "\t\tAttributes    : "
 msgstr "\t\tAttribute      : "
 
-#: sunrpc/rpc_main.c:1414
+#: sunrpc/rpc_main.c:1427
 #, c-format
 msgid "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] infile\n"
 msgstr "\t%s [-abkCLNTM][-DName[=Wert]] [-i Größe] [-I [-K Sekunden]] [-Y Pfad] Eingabedatei\n"
 
-#: sunrpc/rpc_main.c:1416
+#: sunrpc/rpc_main.c:1429
 #, c-format
 msgid "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
 msgstr "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o Ausgabedatei] [Eingabedatei]\n"
 
-#: sunrpc/rpc_main.c:1419
+#: sunrpc/rpc_main.c:1432
 #, c-format
 msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
 msgstr "\t%s [-n Netz-ID]* [-o Ausgabedatei] [Eingabedatei]\n"
 
-#: sunrpc/rpc_main.c:1418
+#: sunrpc/rpc_main.c:1431
 #, c-format
 msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
 msgstr "\t%s [-s Netz-Typ]* [-o Ausgabedatei] [Eingabedatei]\n"
 
-#: nis/nis_print.c:235
+#: nis/nis_print.c:239
 msgid "\tAccess rights: "
 msgstr "\tZugriffsrechte : "
 
-#: nis/nis_print.c:293
+#: nis/nis_print.c:297
 #, c-format
 msgid "\tEntry data of type %s\n"
 msgstr "\tDateneingabe vom Typ %s\n"
 
-#: nis/nis_print.c:171
+#: nis/nis_print.c:175
 #, c-format
 msgid "\tName       : %s\n"
 msgstr "\tName         : %s\n"
 
-#: nis/nis_print.c:172
+#: nis/nis_print.c:176
 msgid "\tPublic Key : "
 msgstr "\tPublic Key   : "
 
-#: nis/nis_print.c:234
+#: nis/nis_print.c:238
 #, c-format
 msgid "\tType         : %s\n"
 msgstr "\tTyp            : %s\n"
 
-#: nis/nis_print.c:201
+#: nis/nis_print.c:205
 #, c-format
 msgid "\tUniversal addresses (%u)\n"
 msgstr "\tUniverselle Adressen (%u)\n"
 
-#: nis/nis_print.c:269
+#: nis/nis_print.c:273
 #, c-format
 msgid "\t[%d]\tName          : %s\n"
 msgstr "\t[%d]\tName          : %s\n"
 
-#: nis/nis_print.c:296
+#: nis/nis_print.c:300
 #, c-format
 msgid "\t[%u] - [%u bytes] "
 msgstr "\t[%u] - [%u Bytes] "
 
-#: nscd/nscd_stat.c:153
+#: nscd/nscd_stat.c:154
+#, c-format
 msgid ""
 "\n"
 "%s cache:\n"
@@ -109,14 +133,22 @@ msgstr ""
 "%15ld%% Cache-Hit Verhältnis\n"
 "%15s  Prüfe /etc/%s auf Änderungen\n"
 
-#: nis/nis_print.c:251
-msgid "\nGroup Members :\n"
-msgstr "\nGruppen Mitglieder :\n"
+#: nis/nis_print.c:255
+msgid ""
+"\n"
+"Group Members :\n"
+msgstr ""
+"\n"
+"Gruppen Mitglieder :\n"
 
 # einfach "Lebenszeit" (?) -ke-
-#: nis/nis_print.c:322
-msgid "\nTime to Live  : "
-msgstr "\nTime to Live        : "
+#: nis/nis_print.c:326
+msgid ""
+"\n"
+"Time to Live  : "
+msgstr ""
+"\n"
+"Time to Live        : "
 
 #: sunrpc/rpcinfo.c:679
 msgid "       rpcinfo -b prognum versnum\n"
@@ -134,60 +166,60 @@ msgstr "       rpcinfo -p [ Rechner ]\n"
 msgid "       rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n"
 msgstr "       rpcinfo [ -n Portnummer ] -t Rechner Programmnummer [ Versionsnummer ]\n"
 
-#: nscd/nscd_stat.c:145 nscd/nscd_stat.c:147
+#: nscd/nscd_stat.c:146 nscd/nscd_stat.c:148
 msgid "      no"
 msgstr "      nein"
 
-#: nscd/nscd_stat.c:145 nscd/nscd_stat.c:147
+#: nscd/nscd_stat.c:146 nscd/nscd_stat.c:148
 msgid "     yes"
 msgstr "     ja"
 
-#: nis/nis_print.c:348
+#: nis/nis_print.c:352
 #, c-format
 msgid "    Data Length = %u\n"
 msgstr "    Länge der Daten = %u\n"
 
-#: nis/nis_print_group_entry.c:121
+#: nis/nis_print_group_entry.c:123
 msgid "    Explicit members:\n"
 msgstr "    Explizite Mitglieder:\n"
 
-#: nis/nis_print_group_entry.c:145 nis/nis_print_group_entry.c:161
+#: nis/nis_print_group_entry.c:147 nis/nis_print_group_entry.c:163
 msgid "    Explicit nonmembers:\n"
 msgstr "    Explizite Nicht-Mitglieder:\n"
 
-#: nis/nis_print_group_entry.c:129
+#: nis/nis_print_group_entry.c:131
 msgid "    Implicit members:\n"
 msgstr "    Implizite Mitglieder:\n"
 
-#: nis/nis_print_group_entry.c:153
+#: nis/nis_print_group_entry.c:155
 msgid "    Implicit nonmembers:\n"
 msgstr "    Implizite Nicht-Mitglieder:\n"
 
-#: nis/nis_print_group_entry.c:126
+#: nis/nis_print_group_entry.c:128
 msgid "    No explicit members\n"
 msgstr "    Keine expliziten Mitglieder\n"
 
-#: nis/nis_print_group_entry.c:150
+#: nis/nis_print_group_entry.c:152
 msgid "    No explicit nonmembers\n"
 msgstr "    Keine expliziten Nicht-Mitglieder\n"
 
-#: nis/nis_print_group_entry.c:134
+#: nis/nis_print_group_entry.c:136
 msgid "    No implicit members\n"
 msgstr "    Keine impliziten Mitglieder\n"
 
-#: nis/nis_print_group_entry.c:158
+#: nis/nis_print_group_entry.c:160
 msgid "    No implicit nonmembers\n"
 msgstr "    Keine impliziten Nicht-Mitglieder\n"
 
-#: nis/nis_print_group_entry.c:142
+#: nis/nis_print_group_entry.c:144
 msgid "    No recursive members\n"
 msgstr "    Keine rekursiven Mitglieder\n"
 
-#: nis/nis_print_group_entry.c:166
+#: nis/nis_print_group_entry.c:168
 msgid "    No recursive nonmembers\n"
 msgstr "    Keine rekursiven Nicht-Mitglieder\n"
 
-#: nis/nis_print_group_entry.c:137
+#: nis/nis_print_group_entry.c:139
 msgid "    Recursive members:\n"
 msgstr "    Rekursive Mitglieder:\n"
 
@@ -195,307 +227,843 @@ msgstr "    Rekursive Mitglieder:\n"
 msgid "   program vers proto   port\n"
 msgstr "   Program Vers Proto   Port\n"
 
-#: argp/argp-help.c:1573
+#: argp/argp-help.c:1572
 msgid "  or: "
 msgstr "  oder: "
 
-#: timezone/zic.c:423
+#: elf/ldconfig.c:457
+msgid " (SKIPPED)\n"
+msgstr " (ÜBERSPRUNGEN)\n"
+
+#: elf/ldconfig.c:455
+msgid " (changed)\n"
+msgstr " (geändert)\n"
+
+#: timezone/zic.c:427
 #, c-format
 msgid " (rule from \"%s\", line %d)"
 msgstr " (Regel aus Datei »%s«, Zeile %d)"
 
-#: argp/argp-help.c:1585
+#: argp/argp-help.c:1584
 msgid " [OPTION...]"
 msgstr " [Option...]"
 
-#: locale/programs/ld-collate.c:370 locale/programs/ld-ctype.c:1476
-msgid " done\n"
-msgstr " fertig\n"
-
-#: timezone/zic.c:420
+#: timezone/zic.c:424
 #, c-format
 msgid "\"%s\", line %d: %s"
 msgstr "»%s«, Zeile %d: %s"
 
-#: timezone/zic.c:984
+#: timezone/zic.c:989
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "»Zone %s«-Zeile und die Option »-l« schliessen sich aus"
 
-#: timezone/zic.c:992
+#: timezone/zic.c:997
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "»Zone %s«-Zeile und die Option »-p« schliessen sich aus"
 
-#: sunrpc/rpc_main.c:1399
+#: sunrpc/rpc_main.c:1412
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr "»infile« ist für die Template-Generierungs-Flags erforderlich\n"
 
-#: argp/argp-help.c:210
+#: argp/argp-help.c:209
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: ARGP_HELP_FMT Parameter verlangt einen Wert"
 
-#: argp/argp-help.c:219
+#: argp/argp-help.c:218
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: Unbekannter ARGP_HELP_FMT Parameter"
 
-#: timezone/zic.c:794
+#: locale/programs/ld-address.c:581 locale/programs/ld-collate.c:2612 locale/programs/ld-collate.c:3740 locale/programs/ld-ctype.c:2112 locale/programs/ld-ctype.c:2849 locale/programs/ld-identification.c:448 locale/programs/ld-measurement.c:237 locale/programs/ld-messages.c:331 locale/programs/ld-monetary.c:936 locale/programs/ld-name.c:305 locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:238 locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1199
+#, c-format
+msgid "%1$s: definition does not end with `END %1$s'"
+msgstr "%1$s: Die Definition ist nicht durch »END %1$s« abgeschlossen"
+
+#: elf/cache.c:190 elf/cache.c:200
+#, c-format
+msgid "%d libs found in cache `%s'\n"
+msgstr "%d Bibliotheken im Cache »%s« gefunden\n"
+
+#: timezone/zic.c:799
 #, c-format
 msgid "%s in ruleless zone"
 msgstr "%s in einer regellosen Zone"
 
-#: assert/assert.c:51
+#: elf/../sysdeps/generic/readelflib.c:67
+#, c-format
+msgid "%s is a 32 bit ELF file.\n"
+msgstr "%s ist eine 32-Bit ELF-Datei.\n"
+
+#: elf/../sysdeps/generic/readelflib.c:69
+#, c-format
+msgid "%s is a 64 bit ELF file.\n"
+msgstr "%s ist eine 64-Bit ELF-Datei.\n"
+
+#: elf/../sysdeps/unix/sysv/linux/i386/readelflib.c:49
+#, c-format
+msgid "%s is for unknown machine %d.\n"
+msgstr "%s bezieht sich auf die unbekannte Maschine %d.\n"
+
+#: elf/ldconfig.c:326
+#, c-format
+msgid "%s is not a known library type"
+msgstr "%s ist ein unbekannter Bibliothekstyp"
+
+#: elf/../sysdeps/generic/readelflib.c:78
+#, c-format
+msgid "%s is not a shared object file (Type: %d).\n"
+msgstr "%s ist keine Shared-Object-Datei (Typ: %d).\n"
+
+#: elf/ldconfig.c:424
+#, c-format
+msgid "%s is not a symbolic link\n"
+msgstr "%s ist kein symbolischer Link\n"
+
+#: elf/readlib.c:155
+#, c-format
+msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
+msgstr "%s ist keine ELF-Datei - sie weist falsche »magische Bytes« am Beginn auf.\n"
+
+#: assert/assert.c:54
 #, c-format
 msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
 msgstr "%s%s%s:%u: %s%sZusicherung »%s« nicht erfüllt.\n"
 
-#: assert/assert-perr.c:52
+#: assert/assert-perr.c:56
 #, c-format
 msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
 msgstr "%s%s%s:%u: %s%sNicht erwarteter Fehler: %s.\n"
 
-#: stdio-common/psignal.c:47
+#: stdio-common/psignal.c:62
 #, c-format
 msgid "%s%sUnknown signal %d\n"
 msgstr "%s%sUnbekanntes Signal %d\n"
 
 # Ob diese Übersetzung so korrekt ist? - jh
 # definitiv nicht, aber hoffentlich ist es so besser - Klaus Espenlaub
-#: timezone/zic.c:2229
+#: timezone/zic.c:2234
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: Vorzeichenerweiterung von %d fehlgeschlagen\n"
 
-#: locale/programs/charmap.c:261
+#: locale/programs/charmap.c:331
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
-msgstr "%s: »<mb_cur_max>« muß größer als »<mb_cur_min>« sein\n"
+msgstr "%s: »<mb_cur_max>« muss größer als »<mb_cur_min>« sein\n"
 
-#: sunrpc/rpc_main.c:421
+#: sunrpc/rpc_main.c:423
 #, c-format
 msgid "%s: C preprocessor failed with exit code %d\n"
-msgstr "%s: C Präprozessor fehlgeschlagen mit Exit-Code %d\n"
+msgstr "%s: C-Präprozessor fehlgeschlagen mit Exit-Code %d\n"
 
-#: sunrpc/rpc_main.c:418
+#: sunrpc/rpc_main.c:420
 #, c-format
 msgid "%s: C preprocessor failed with signal %d\n"
-msgstr "%s: C Präprozessor fehlgeschlagen mit Signal %d\n"
+msgstr "%s: C-Präprozessor fehlgeschlagen mit Signal %d\n"
 
-#: timezone/zic.c:1495
+#: timezone/zic.c:1500
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: Kann »%s« nicht erzeugen: %s\n"
 
-#: timezone/zic.c:2207
+#: timezone/zic.c:2212
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: Kann das Verzeichnis »%s« nicht erzeugen: %s\n"
 
-#: timezone/zic.c:646
+#: timezone/zic.c:651
 #, c-format
 msgid "%s: Can't link from %s to %s: %s\n"
 msgstr "%s: Kann nicht von »%s« nach »%s« linken: %s\n"
 
-#: timezone/zic.c:820
+#: timezone/zic.c:825
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr "%s: Kann die Datei »%s« nicht öffnen: %s\n"
 
-#: timezone/zic.c:1485
+#: timezone/zic.c:1490
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s: Kann »%s« nicht löschen: %s\n"
 
-#: timezone/zic.c:631
+#: timezone/zic.c:636
 #, c-format
 msgid "%s: Can't unlink  %s: %s\n"
 msgstr "%s: Kann den Verzeichniseintrag »%s« nicht löschen (unlink): %s\n"
 
-#: timezone/zic.c:889
+#: timezone/zic.c:894
 #, c-format
 msgid "%s: Error closing %s: %s\n"
 msgstr "%s: Fehler beim Schließen der Datei »%s«: %s\n"
 
-#: timezone/zic.c:882
+#: timezone/zic.c:887
 #, c-format
 msgid "%s: Error reading %s\n"
 msgstr "%s: Fehler beim Lesen der Datei »%s«\n"
 
-#: timezone/zdump.c:266
-#, c-format
-msgid "%s: Error writing "
-msgstr "%s: Fehler beim Schreiben "
-
-#: timezone/zic.c:1561
+#: timezone/zic.c:1566
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s: Fehler beim Schreiben der Datei »%s«\n"
 
-#: timezone/zic.c:867
+#: timezone/zic.c:872
 #, c-format
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr "%s: Schalt-Zeile in einer nicht-Schaltsekunden-Datei »%s«\n"
 
-#: timezone/zic.c:361
+#: timezone/zic.c:365
 #, c-format
 msgid "%s: Memory exhausted: %s\n"
 msgstr "%s: Kein Hauptspeicher mehr verfügbar: %s\n"
 
-#: timezone/zic.c:526
+#: timezone/zic.c:531
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s: Mehr als eine »-L« Option angegeben\n"
 
-#: timezone/zic.c:486
+#: timezone/zic.c:491
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s: Mehr als eine »-d« Option angegeben\n"
 
-#: timezone/zic.c:496
+#: timezone/zic.c:501
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s: Mehr als eine »-l« Option angegeben\n"
 
-#: timezone/zic.c:506
+#: timezone/zic.c:511
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s: Mehr als eine »-p« Option angegeben\n"
 
-#: timezone/zic.c:516
+#: timezone/zic.c:521
 #, c-format
 msgid "%s: More than one -y option specified\n"