about summary refs log tree commit diff
path: root/po/libc.pot
diff options
context:
space:
mode:
Diffstat (limited to 'po/libc.pot')
-rw-r--r--po/libc.pot1062
1 files changed, 554 insertions, 508 deletions
diff --git a/po/libc.pot b/po/libc.pot
index 7c4e64201d..f7a345259b 100644
--- a/po/libc.pot
+++ b/po/libc.pot
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.1.93\n"
-"POT-Creation-Date: 2000-09-09 01:06-0700\n"
+"Project-Id-Version: libc 2.2.1\n"
+"POT-Creation-Date: 2001-01-21 08:03-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+DIST\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,24 +22,24 @@ msgstr ""
 msgid "\t\tAttributes    : "
 msgstr ""
 
-#: sunrpc/rpc_main.c:1424
+#: sunrpc/rpc_main.c:1425
 #, c-format
 msgid ""
 "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] "
 "infile\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1426
+#: sunrpc/rpc_main.c:1427
 #, c-format
 msgid "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1429
+#: sunrpc/rpc_main.c:1430
 #, c-format
 msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1428
+#: sunrpc/rpc_main.c:1429
 #, c-format
 msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
 msgstr ""
@@ -188,15 +188,15 @@ msgstr ""
 msgid "   program vers proto   port\n"
 msgstr ""
 
-#: argp/argp-help.c:1568
+#: argp/argp-help.c:1572
 msgid "  or: "
 msgstr ""
 
-#: elf/ldconfig.c:389
+#: elf/ldconfig.c:448
 msgid " (SKIPPED)\n"
 msgstr ""
 
-#: elf/ldconfig.c:387
+#: elf/ldconfig.c:446
 msgid " (changed)\n"
 msgstr ""
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid " (rule from \"%s\", line %d)"
 msgstr ""
 
-#: argp/argp-help.c:1580
+#: argp/argp-help.c:1584
 msgid " [OPTION...]"
 msgstr ""
 
@@ -214,72 +214,77 @@ msgstr ""
 msgid "\"%s\", line %d: %s"
 msgstr ""
 
-#: timezone/zic.c:982
+#: timezone/zic.c:983
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr ""
 
-#: timezone/zic.c:990
+#: timezone/zic.c:991
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1409
+#: sunrpc/rpc_main.c:1410
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr ""
 
-#: argp/argp-help.c:205
+#: argp/argp-help.c:209
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr ""
 
-#: argp/argp-help.c:214
+#: argp/argp-help.c:218
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr ""
 
-#: locale/programs/ld-address.c:576 locale/programs/ld-collate.c:2568
-#: locale/programs/ld-collate.c:3688 locale/programs/ld-ctype.c:2095
-#: locale/programs/ld-ctype.c:2820 locale/programs/ld-identification.c:440
+#: locale/programs/ld-address.c:576 locale/programs/ld-collate.c:2593
+#: locale/programs/ld-collate.c:3719 locale/programs/ld-ctype.c:2110
+#: locale/programs/ld-ctype.c:2847 locale/programs/ld-identification.c:440
 #: locale/programs/ld-measurement.c:232 locale/programs/ld-messages.c:326
 #: locale/programs/ld-monetary.c:934 locale/programs/ld-name.c:300
 #: locale/programs/ld-numeric.c:370 locale/programs/ld-paper.c:233
-#: locale/programs/ld-telephone.c:308 locale/programs/ld-time.c:1151
+#: locale/programs/ld-telephone.c:308 locale/programs/ld-time.c:1172
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
 msgstr ""
 
-#: elf/cache.c:160 elf/cache.c:170
+#: elf/cache.c:165 elf/cache.c:175
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr ""
 
-#: timezone/zic.c:792
+#: timezone/zic.c:793
 #, c-format
 msgid "%s in ruleless zone"
 msgstr ""
 
-#: elf/../sysdeps/generic/readelflib.c:64
+#: elf/../sysdeps/generic/readelflib.c:65
 #, c-format
 msgid "%s is a 32 bit ELF file.\n"
 msgstr ""
 
-#: elf/../sysdeps/generic/readelflib.c:66
+#: elf/../sysdeps/generic/readelflib.c:67
 #, c-format
 msgid "%s is a 64 bit ELF file.\n"
 msgstr ""
 
-#: elf/ldconfig.c:287
+#: elf/../sysdeps/unix/sysv/linux/i386/readelflib.c:48
+#, c-format
+msgid "%s is for unknown machine %d.\n"
+msgstr ""
+
+#: elf/ldconfig.c:329
 #, c-format
 msgid "%s is not a known library type"
 msgstr ""
 
-#: elf/../sysdeps/generic/readelflib.c:75
+#: elf/../sysdeps/generic/readelflib.c:76
 #, c-format
 msgid "%s is not a shared object file (Type: %d).\n"
 msgstr ""
 
-#: elf/ldconfig.c:356
+#: elf/ldconfig.c:415
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr ""
@@ -304,77 +309,77 @@ msgstr ""
 msgid "%s%sUnknown signal %d\n"
 msgstr ""
 
-#: timezone/zic.c:2227
+#: timezone/zic.c:2228
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr ""
 
-#: locale/programs/charmap.c:289
+#: locale/programs/charmap.c:326
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:422
+#: sunrpc/rpc_main.c:423
 #, c-format
 msgid "%s: C preprocessor failed with exit code %d\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:419
+#: sunrpc/rpc_main.c:420
 #, c-format
 msgid "%s: C preprocessor failed with signal %d\n"
 msgstr ""
 
-#: timezone/zic.c:1493
+#: timezone/zic.c:1494
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:2205
+#: timezone/zic.c:2206
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:644
+#: timezone/zic.c:645
 #, c-format
 msgid "%s: Can't link from %s to %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:818
+#: timezone/zic.c:819
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:1483
+#: timezone/zic.c:1484
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:629
+#: timezone/zic.c:630
 #, c-format
 msgid "%s: Can't unlink  %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:887
+#: timezone/zic.c:888
 #, c-format
 msgid "%s: Error closing %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:880
+#: timezone/zic.c:881
 #, c-format
 msgid "%s: Error reading %s\n"
 msgstr ""
 
-#: timezone/zdump.c:266
+#: timezone/zdump.c:267
 #, c-format
 msgid "%s: Error writing "
 msgstr ""
 
-#: timezone/zic.c:1559
+#: timezone/zic.c:1560
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr ""
 
-#: timezone/zic.c:865
+#: timezone/zic.c:866
 #, c-format
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr ""
@@ -384,43 +389,43 @@ msgstr ""
 msgid "%s: Memory exhausted: %s\n"
 msgstr ""
 
-#: timezone/zic.c:524
+#: timezone/zic.c:525
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr ""
 
-#: timezone/zic.c:484
+#: timezone/zic.c:485
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr ""
 
-#: timezone/zic.c:494
+#: timezone/zic.c:495
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr ""
 
-#: timezone/zic.c:504
+#: timezone/zic.c:505
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr ""
 
-#: timezone/zic.c:514
+#: timezone/zic.c:515
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr ""
 
-#: argp/argp-parse.c:640
+#: argp/argp-parse.c:646
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr ""
 
-#: locale/programs/ld-collate.c:447 locale/programs/ld-collate.c:473
-#: locale/programs/ld-collate.c:489
+#: locale/programs/ld-collate.c:457 locale/programs/ld-collate.c:483
+#: locale/programs/ld-collate.c:499
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1312
+#: locale/programs/ld-collate.c:1323
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr ""
@@ -436,86 +441,91 @@ msgstr ""
 msgid "%s: `-1' must be last entry in `%s' field"
 msgstr ""
 
-#: locale/programs/ld-collate.c:437 locale/programs/ld-collate.c:463
+#: locale/programs/ld-collate.c:447 locale/programs/ld-collate.c:473
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1503
+#: locale/programs/ld-collate.c:1515
 #, c-format
 msgid ""
 "%s: `position' must be used for a specific level in all sections or none"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1112
+#: locale/programs/ld-ctype.c:2635 locale/programs/ld-ctype.c:2775
+#, c-format
+msgid "%s: `translit_start' section does not end with `translit_end'"
+msgstr ""
+
+#: locale/programs/ld-collate.c:1123
 #, c-format
 msgid ""
 "%s: byte sequence of first character of sequence is not lower than that of "
 "the last character"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1070
+#: locale/programs/ld-collate.c:1081
 #, c-format
 msgid ""
 "%s: byte sequences of first and last character must have the same length"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3610
+#: locale/programs/ld-collate.c:3642
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3276
+#: locale/programs/ld-collate.c:3308
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2881 locale/programs/ld-ctype.c:2965
-#: locale/programs/ld-ctype.c:2985 locale/programs/ld-ctype.c:3006
-#: locale/programs/ld-ctype.c:3027 locale/programs/ld-ctype.c:3048
-#: locale/programs/ld-ctype.c:3069 locale/programs/ld-ctype.c:3109
-#: locale/programs/ld-ctype.c:3130 locale/programs/ld-ctype.c:3197
+#: locale/programs/ld-ctype.c:2910 locale/programs/ld-ctype.c:2994
+#: locale/programs/ld-ctype.c:3014 locale/programs/ld-ctype.c:3035
+#: locale/programs/ld-ctype.c:3056 locale/programs/ld-ctype.c:3077
+#: locale/programs/ld-ctype.c:3098 locale/programs/ld-ctype.c:3138
+#: locale/programs/ld-ctype.c:3159 locale/programs/ld-ctype.c:3226
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3241 locale/programs/ld-ctype.c:3266
+#: locale/programs/ld-ctype.c:3270 locale/programs/ld-ctype.c:3295
 #, c-format
 msgid ""
 "%s: character `%s' needed as default value not representable with one byte"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2876
+#: locale/programs/ld-ctype.c:2905
 #, c-format
 msgid "%s: character `%s' not defined in charmap while needed as default value"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2960 locale/programs/ld-ctype.c:2980
-#: locale/programs/ld-ctype.c:3022 locale/programs/ld-ctype.c:3043
-#: locale/programs/ld-ctype.c:3064 locale/programs/ld-ctype.c:3104
-#: locale/programs/ld-ctype.c:3125 locale/programs/ld-ctype.c:3192
-#: locale/programs/ld-ctype.c:3234 locale/programs/ld-ctype.c:3259
+#: locale/programs/ld-ctype.c:2989 locale/programs/ld-ctype.c:3009
+#: locale/programs/ld-ctype.c:3051 locale/programs/ld-ctype.c:3072
+#: locale/programs/ld-ctype.c:3093 locale/programs/ld-ctype.c:3133
+#: locale/programs/ld-ctype.c:3154 locale/programs/ld-ctype.c:3221
+#: locale/programs/ld-ctype.c:3263 locale/programs/ld-ctype.c:3288
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr ""
 
-#: timezone/zic.c:1926
+#: timezone/zic.c:1927
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr ""
 
-#: locale/programs/ld-time.c:223
+#: locale/programs/ld-time.c:225
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not '+' nor '-'"
 msgstr ""
 
-#: locale/programs/ld-time.c:235
+#: locale/programs/ld-time.c:237
 #, c-format
 msgid ""
 "%s: direction flag in string %Zd in `era' field is not a single character"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2706
+#: locale/programs/ld-ctype.c:2727
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr ""
@@ -525,39 +535,39 @@ msgstr ""
 msgid "%s: duplicate category version definition"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2686
+#: locale/programs/ld-collate.c:2711
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2650
+#: locale/programs/ld-collate.c:2675
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3660
+#: locale/programs/ld-collate.c:3691
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr ""
 
-#: locale/programs/ld-collate.c:743
+#: locale/programs/ld-collate.c:755
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr ""
 
-#: locale/programs/charmap.c:794
+#: locale/programs/charmap.c:831
 #, c-format
 msgid "%s: error in state machine"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2468
+#: locale/programs/ld-ctype.c:2483
 #, c-format
 msgid "%s: field `%s' declared more than once"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1510 locale/programs/ld-ctype.c:1635
-#: locale/programs/ld-ctype.c:1741 locale/programs/ld-ctype.c:2331
-#: locale/programs/ld-ctype.c:3300
+#: locale/programs/ld-ctype.c:1525 locale/programs/ld-ctype.c:1650
+#: locale/programs/ld-ctype.c:1756 locale/programs/ld-ctype.c:2346
+#: locale/programs/ld-ctype.c:3329
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr ""
@@ -586,32 +596,32 @@ msgstr ""
 msgid "%s: field `%s' undefined"
 msgstr ""
 
-#: locale/programs/ld-time.c:256
+#: locale/programs/ld-time.c:258
 #, c-format
 msgid "%s: garbage at end of offset value in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:316
+#: locale/programs/ld-time.c:318
 #, c-format
 msgid "%s: garbage at end of starting date in string %Zd in `era' field "
 msgstr ""
 
-#: locale/programs/ld-time.c:393
+#: locale/programs/ld-time.c:395
 #, c-format
 msgid "%s: garbage at end of stopping date in string %Zd in `era' field"
 msgstr ""
 
-#: posix/getopt.c:794
+#: posix/getopt.c:795
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: locale/programs/ld-address.c:573 locale/programs/ld-collate.c:3686
-#: locale/programs/ld-ctype.c:2817 locale/programs/ld-identification.c:437
+#: locale/programs/ld-address.c:573 locale/programs/ld-collate.c:3717
+#: locale/programs/ld-ctype.c:2844 locale/programs/ld-identification.c:437
 #: locale/programs/ld-measurement.c:229 locale/programs/ld-messages.c:324
 #: locale/programs/ld-monetary.c:932 locale/programs/ld-name.c:298
 #: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:231
-#: locale/programs/ld-telephone.c:306 locale/programs/ld-time.c:1149
+#: locale/programs/ld-telephone.c:306 locale/programs/ld-time.c:1170
 #, c-format
 msgid "%s: incomplete `END' line"
 msgstr ""
@@ -626,27 +636,27 @@ msgstr ""
 msgid "%s: invalid escape sequence in field `%s'"
 msgstr ""
 
-#: locale/programs/ld-time.c:248
+#: locale/programs/ld-time.c:250
 #, c-format
 msgid "%s: invalid number for offset in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3113
+#: locale/programs/ld-collate.c:3143
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr ""
 
-#: posix/getopt.c:797
+#: posix/getopt.c:798
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: locale/programs/ld-time.c:307
+#: locale/programs/ld-time.c:309
 #, c-format
 msgid "%s: invalid starting date in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:384
+#: locale/programs/ld-time.c:386
 #, c-format
 msgid "%s: invalid stopping date in string %Zd in `era' field"
 msgstr ""
@@ -661,38 +671,38 @@ msgstr ""
 msgid "%s: language abbreviation `%s' not defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3191 locale/programs/ld-collate.c:3314
-#: locale/programs/ld-collate.c:3664
+#: locale/programs/ld-collate.c:3223 locale/programs/ld-collate.c:3346
+#: locale/programs/ld-collate.c:3695
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3328 locale/programs/ld-collate.c:3676
+#: locale/programs/ld-collate.c:3360 locale/programs/ld-collate.c:3707
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3679
+#: locale/programs/ld-collate.c:3710
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr ""
 
-#: locale/programs/ld-time.c:433
+#: locale/programs/ld-time.c:435
 #, c-format
 msgid "%s: missing era format in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:421
+#: locale/programs/ld-time.c:423
 #, c-format
 msgid "%s: missing era name in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3091
+#: locale/programs/ld-collate.c:3119
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3139
+#: locale/programs/ld-collate.c:3169
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr ""
@@ -707,12 +717,12 @@ msgstr ""
 msgid "%s: no identification for category `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2732
+#: locale/programs/ld-ctype.c:2753
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
 msgstr ""
 
-#: locale/programs/ld-collate.c:581
+#: locale/programs/ld-collate.c:591
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr ""
@@ -722,144 +732,139 @@ msgstr ""
 msgid "%s: numeric country code `%d' not valid"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2673
-#, c-format
-msgid "%s: only one `include' instruction allowed"
-msgstr ""
-
-#: posix/getopt.c:717
+#: posix/getopt.c:718
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: posix/getopt.c:687
+#: posix/getopt.c:688
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: posix/getopt.c:735 posix/getopt.c:908
+#: posix/getopt.c:736 posix/getopt.c:909
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: posix/getopt.c:712
+#: posix/getopt.c:713
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: posix/getopt.c:892
+#: posix/getopt.c:893
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: posix/getopt.c:874
+#: posix/getopt.c:875
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: posix/getopt.c:827 posix/getopt.c:957
+#: posix/getopt.c:828 posix/getopt.c:958
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1303 locale/programs/ld-collate.c:3623
+#: locale/programs/ld-collate.c:1314 locale/programs/ld-collate.c:3654
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3265
+#: locale/programs/ld-collate.c:3297
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3249
+#: locale/programs/ld-collate.c:3281
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr ""
 
-#: sunrpc/rpc_main.c:288
+#: sunrpc/rpc_main.c:289
 #, c-format
 msgid "%s: output would overwrite %s\n"
 msgstr ""
 
-#: timezone/zic.c:872 timezone/zic.c:1286 timezone/zic.c:1311
+#: timezone/zic.c:873 timezone/zic.c:1287 timezone/zic.c:1312
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr ""
 
-#: locale/programs/charmap.c:801 locale/programs/ld-address.c:592
-#: locale/programs/ld-collate.c:2565 locale/programs/ld-collate.c:3704
-#: locale/programs/ld-ctype.c:2092 locale/programs/ld-ctype.c:2837
+#: locale/programs/charmap.c:838 locale/programs/ld-address.c:592
+#: locale/programs/ld-collate.c:2590 locale/programs/ld-collate.c:3735
+#: locale/programs/ld-ctype.c:2107 locale/programs/ld-ctype.c:2864
 #: locale/programs/ld-identification.c:456
 #: locale/programs/ld-measurement.c:248 locale/programs/ld-messages.c:342
 #: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:316
 #: locale/programs/ld-numeric.c:386 locale/programs/ld-paper.c:249
-#: locale/programs/ld-telephone.c:324 locale/programs/ld-time.c:1167
+#: locale/programs/ld-telephone.c:324 locale/programs/ld-time.c:1188
 #: locale/programs/locfile.h:103 locale/programs/repertoire.c:325
 #, c-format
 msgid "%s: premature end of file"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3362 locale/programs/ld-collate.c:3548
+#: locale/programs/ld-collate.c:3394 locale/programs/ld-collate.c:3580
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr ""
 
-#: locale/programs/ld-time.c:335
+#: locale/programs/ld-time.c:337
 #, c-format
 msgid "%s: starting date is invalid in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:412
+#: locale/programs/ld-time.c:414
 #, c-format
 msgid "%s: stopping date is invalid in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1237
+#: locale/programs/ld-collate.c:1248
 #, c-format
 msgid "%s: symbolic range ellipsis must not be direct followed by `order_end'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1233
+#: locale/programs/ld-collate.c:1244
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr ""
 
-#: locale/programs/ld-address.c:583 locale/programs/ld-collate.c:508
-#: locale/programs/ld-collate.c:560 locale/programs/ld-collate.c:853
-#: locale/programs/ld-collate.c:866 locale/programs/ld-collate.c:2556
-#: locale/programs/ld-collate.c:3695 locale/programs/ld-ctype.c:1825
-#: locale/programs/ld-ctype.c:2083 locale/programs/ld-ctype.c:2652
-#: locale/programs/ld-ctype.c:2828 locale/programs/ld-identification.c:447
+#: locale/programs/ld-address.c:583 locale/programs/ld-collate.c:518
+#: locale/programs/ld-collate.c:570 locale/programs/ld-collate.c:865
+#: locale/programs/ld-collate.c:878 locale/programs/ld-collate.c:2581
+#: locale/programs/ld-collate.c:3726 locale/programs/ld-ctype.c:1840
+#: locale/programs/ld-ctype.c:2098 locale/programs/ld-ctype.c:2673
+#: locale/programs/ld-ctype.c:2855 locale/programs/ld-identification.c:447
 #: locale/programs/ld-measurement.c:239 locale/programs/ld-messages.c:333
 #: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:307
 #: locale/programs/ld-numeric.c:377 locale/programs/ld-paper.c:240
-#: locale/programs/ld-telephone.c:315 locale/programs/ld-time.c:1158
+#: locale/programs/ld-telephone.c:315 locale/programs/ld-time.c:1179
 #, c-format
 msgid "%s: syntax error"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2163
+#: locale/programs/ld-ctype.c:2178
 #, c-format
 msgid "%s: syntax error in definition of new character class"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2178
+#: locale/programs/ld-ctype.c:2193
 #, c-format
 msgid "%s: syntax error in definition of new character map"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3653
+#: locale/programs/ld-ctype.c:3735
 #, c-format
 msgid "%s: table for class \"%s\": %lu bytes\n"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3721
+#: locale/programs/ld-ctype.c:3803
 #, c-format
 msgid "%s: table for map \"%s\": %lu bytes\n"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3829
+#: locale/programs/ld-ctype.c:3935
 #, c-format
 msgid "%s: table for width: %lu bytes\n"
 msgstr ""
@@ -869,72 +874,72 @@ msgstr ""
 msgid "%s: terminology language code `%s' not defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1043
+#: locale/programs/ld-collate.c:1054
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr ""
 
-#: locale/programs/ld-time.c:462
+#: locale/programs/ld-time.c:464
 #, c-format
 msgid "%s: third operand for value of field `%s' must not be larger than %d"
 msgstr ""
 
-#: locale/programs/ld-collate.c:545
+#: locale/programs/ld-collate.c:555
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr ""
 
-#: locale/programs/ld-collate.c:894
+#: locale/programs/ld-collate.c:906
 #, c-format
 msgid "%s: too many values"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3859
+#: locale/programs/ld-ctype.c:3639
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
 msgstr ""
 
-#: sunrpc/rpc_main.c:295
+#: sunrpc/rpc_main.c:296
 #, c-format
 msgid "%s: unable to open %s: %m\n"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2824
+#: locale/programs/ld-collate.c:2849
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2955
+#: locale/programs/ld-collate.c:2981
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2968
+#: locale/programs/ld-collate.c:2994
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr ""
 
-#: locale/programs/ld-time.c:1020
+#: locale/programs/ld-time.c:1040
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3065
+#: locale/programs/ld-collate.c:3091
 #, c-format
 msgid "%s: unknown section name `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2978
+#: locale/programs/ld-collate.c:3004
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr ""
 
-#: posix/getopt.c:768
+#: posix/getopt.c:769
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: posix/getopt.c:764
+#: posix/getopt.c:765
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
@@ -946,7 +951,7 @@ msgid ""
 "\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
 msgstr ""
 
-#: timezone/zdump.c:174
+#: timezone/zdump.c:175
 #, c-format
 msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr ""
@@ -978,31 +983,31 @@ msgstr ""
 msgid "%s: values for field `%s' must be smaller than 127"
 msgstr ""
 
-#: locale/programs/ld-time.c:486
+#: locale/programs/ld-time.c:488
 #, c-format
 msgid "%s: values for field `%s' must not be larger than %d"
 msgstr ""
 
-#: locale/programs/ld-time.c:470 locale/programs/ld-time.c:478
+#: locale/programs/ld-time.c:472 locale/programs/ld-time.c:480
 #, c-format
 msgid "%s: values of field `%s' must not be larger than %d"
 msgstr ""
 
-#: locale/programs/ld-collate.c:838
+#: locale/programs/ld-collate.c:850
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr ""
 
-#: sunrpc/rpc_main.c:307
+#: sunrpc/rpc_main.c:308
 #, c-format
 msgid "%s: while writing output %s: %m"
 msgstr ""
 
-#: argp/argp-parse.c:164
+#: argp/argp-parse.c:170
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr ""
 
-#: argp/argp-parse.c:781
+#: argp/argp-parse.c:787
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr ""
 
@@ -1024,11 +1029,11 @@ msgstr ""
 msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
 msgstr ""
 
-#: catgets/gencat.c:267
+#: catgets/gencat.c:282
 msgid "*standard input*"
 msgstr ""
 
-#: catgets/gencat.c:121
+#: catgets/gencat.c:125
 msgid ""
 "-o OUTPUT-FILE [INPUT-FILE]...\n"
 "[OUTPUT-FILE [INPUT-FILE]...]"
@@ -1048,7 +1053,7 @@ msgstr ""
 msgid "; why = "
 msgstr ""
 
-#: locale/programs/charmap.c:962
+#: locale/programs/charmap.c:999
 #, c-format
 msgid "<%s> and <%s> are illegal names for range"
 msgstr ""
@@ -1058,12 +1063,12 @@ msgstr ""
 msgid "<%s> and <%s> are invalid names for range"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:556 locale/programs/ld-ctype.c:591
+#: locale/programs/ld-ctype.c:565 locale/programs/ld-ctype.c:600
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:544 locale/programs/ld-ctype.c:580
+#: locale/programs/ld-ctype.c:553 locale/programs/ld-ctype.c:589
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr ""
@@ -1125,6 +1130,10 @@ msgstr ""
 msgid "Anode table overflow"
 msgstr ""
 
+#: intl/tst-gettext2.c:37
+msgid "Another string for testing."
+msgstr ""
+
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:37
 msgid "Arg list too long"
 msgstr ""
@@ -1274,15 +1283,10 @@ msgstr ""
 msgid "Can't bind to server which serves this domain"
 msgstr ""
 
-#: elf/ldconfig.c:778
+#: elf/ldconfig.c:934
 msgid "Can't chdir to /"
 msgstr ""
 
-#: elf/ldconfig.c:775
-#, c-format
-msgid "Can't chroot to %s"
-msgstr ""
-
 #: nis/ypclnt.c:804
 msgid "Can't communicate with portmapper"
 msgstr ""
@@ -1295,47 +1299,57 @@ msgstr ""
 msgid "Can't communicate with ypserv"
 msgstr ""
 
-#: elf/cache.c:353
+#: elf/cache.c:359
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr ""
 
-#: elf/ldconfig.c:381
+#: elf/ldconfig.c:502
+#, c-format
+msgid "Can't find %s"
+msgstr ""
+
+#: elf/ldconfig.c:440
 #, c-format
 msgid "Can't link %s to %s"
 msgstr ""
 
-#: elf/ldconfig.c:439 elf/ldconfig.c:563
+#: elf/ldconfig.c:518 elf/ldconfig.c:672
 #, c-format
 msgid "Can't lstat %s"
 msgstr ""
 
-#: elf/cache.c:103
+#: elf/cache.c:108 elf/ldconfig.c:955
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr ""
 
-#: elf/ldconfig.c:716
+#: elf/ldconfig.c:976
+#, c-format
+msgid "Can't open cache file directory %s\n"
+msgstr ""
+
+#: elf/ldconfig.c:865
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr ""
 
-#: elf/ldconfig.c:528
+#: elf/ldconfig.c:621
 #, c-format
 msgid "Can't open directory %s"
 msgstr ""
 
-#: elf/cache.c:347
+#: elf/cache.c:353
 #, c-format
 msgid "Can't remove old temporary cache file %s"
 msgstr ""
 
-#: elf/ldconfig.c:346
+#: elf/ldconfig.c:405
 #, c-format
 msgid "Can't stat %s\n"
 msgstr ""
 
-#: elf/ldconfig.c:375
+#: elf/ldconfig.c:434
 #, c-format
 msgid "Can't unlink %s"
 msgstr ""
@@ -1367,7 +1381,7 @@ msgstr ""
 msgid "Cannot fstat file %s.\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1414
+#: sunrpc/rpc_main.c:1415
 msgid "Cannot have more than one file generation flag!\n"
 msgstr ""
 
@@ -1380,7 +1394,7 @@ msgstr ""
 msgid "Cannot receive reply to broadcast"
 msgstr ""
 
-#: sunrpc/pmap_clnt.c:134
+#: sunrpc/pmap_clnt.c:136
 msgid "Cannot register service"
 msgstr ""
 
@@ -1401,27 +1415,27 @@ msgstr ""
 msgid "Cannot set socket option SO_BROADCAST"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1194
+#: sunrpc/rpc_main.c:1195
 msgid "Cannot specify more than one input file!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1371
+#: sunrpc/rpc_main.c:1372
 msgid "Cannot use netid flag with inetd flag!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1383
+#: sunrpc/rpc_main.c:1384
 msgid "Cannot use netid flag without TIRPC!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1390
+#: sunrpc/rpc_main.c:1391
 msgid "Cannot use table flags with newstyle!\n"
 msgstr ""
 
-#: elf/ldconfig.c:129
+#: elf/ldconfig.c:131
 msgid "Change to and use ROOT as root directory"
 msgstr ""
 
-#: elf/cache.c:384
+#: elf/cache.c:390
 #, c-format
 msgid "Changing access rights of %s to 0644 failed"
 msgstr ""
@@ -1462,7 +1476,7 @@ msgstr ""
 msgid "Computer bought the farm"
 msgstr ""
 
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:141
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr ""
 
@@ -1496,10 +1510,10 @@ msgstr ""
 msgid "Convert encoding of given files from one encoding to another."
 msgstr ""
 
-#: catgets/gencat.c:237 elf/ldconfig.c:252 elf/sprof.c:355
-#: iconv/iconv_prog.c:351 locale/programs/locale.c:267
+#: catgets/gencat.c:246 elf/ldconfig.c:264 elf/sprof.c:355
+#: iconv/iconv_prog.c:351 locale/programs/locale.c:269
 #: locale/programs/localedef.c:311 nscd/nscd.c:287 nscd/nscd_nischeck.c:90
-#: nss/getent.c:66 posix/getconf.c:751
+#: nss/getent.c:63 posix/getconf.c:751
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -1512,7 +1526,7 @@ msgstr ""
 msgid "Could not create log file \"%s\""
 msgstr ""
 
-#: catgets/gencat.c:108
+#: catgets/gencat.c:112
 msgid "Create C header file NAME containing symbol definitions"
 msgstr ""
 
@@ -1555,7 +1569,7 @@ msgstr ""
 msgid "DNS"
 msgstr ""
 
-#: elf/dl-open.c:108
+#: elf/dl-open.c:189
 msgid "DST not allowed in SUID/SGID programs"
 msgstr ""
 
@@ -1595,15 +1609,6 @@ msgstr ""
 msgid "Device not a stream"
 msgstr ""
 
-#. TRANS No such device or address.  The system tried to use the device
-#. TRANS represented by a file you specified, and it couldn't find the device.
-#. TRANS This can mean that the device file was installed incorrectly, or that
-#. TRANS the physical device is missing or not correctly attached to the
-#. TRANS computer.
-#: stdio-common/../sysdeps/gnu/errlist.c:62
-msgid "Device not configured"
-msgstr ""
-
 #. TRANS Resource busy; a system resource that can't be shared is already in use.
 #. TRANS For example, if you try to delete a file that is the root of a currently
 #. TRANS mounted filesystem, you get this error.
@@ -1641,7 +1646,7 @@ msgstr ""
 msgid "Do not fork and display messages on the current tty"
 msgstr ""
 
-#: catgets/gencat.c:110
+#: catgets/gencat.c:114
 msgid "Do not use existing catalog, force new output file"
 msgstr ""
 
@@ -1649,11 +1654,11 @@ msgstr ""
 msgid "Domain not bound"
 msgstr ""
 
-#: elf/ldconfig.c:127
+#: elf/ldconfig.c:129
 msgid "Don't build cache"
 msgstr ""
 
-#: elf/ldconfig.c:128
+#: elf/ldconfig.c:130
 msgid "Don't generate links"
 msgstr ""
 
@@ -1661,43 +1666,31 @@ msgstr ""
 msgid "Dump information generated by PC profiling."
 msgstr ""
 
-#: elf/dl-load.c:848
-msgid "ELF file ABI version invalid."
-msgstr ""
-
-#: elf/dl-load.c:846
-msgid "ELF file OS ABI invalid."
-msgstr ""
-
-#: elf/dl-load.c:830
-msgid "ELF file class not 32-bit"
-msgstr ""
-
-#: elf/dl-load.c:832
-msgid "ELF file class not 64-bit"
+#: elf/dl-load.c:1290
+msgid "ELF file ABI version invalid"
 msgstr ""
 
-#: elf/dl-load.c:855
-msgid "ELF file machine architecture does not match"
+#: elf/dl-load.c:1287
+msgid "ELF file OS ABI invalid"
 msgstr ""
 
-#: elf/dl-load.c:853
+#: elf/dl-load.c:1296
 msgid "ELF file version does not match current one"
 msgstr ""
 
-#: elf/dl-load.c:842
+#: elf/dl-load.c:1283
 msgid "ELF file version ident does not match current one"
 msgstr ""
 
-#: elf/dl-load.c:858
+#: elf/dl-load.c:1307
 msgid "ELF file's phentsize not the expected size"
 msgstr ""
 
-#: elf/dl-load.c:931
+#: elf/dl-load.c:876
 msgid "ELF load command address/offset not properly aligned"
 msgstr ""
 
-#: elf/dl-load.c:928
+#: elf/dl-load.c:873
 msgid "ELF load command alignment not page-aligned"
 msgstr ""
 
@@ -1717,6 +1710,11 @@ msgstr ""
 msgid "Entry/table type mismatch"
 msgstr ""
 
+#: nss/getent.c:127 nss/getent.c:292
+#, c-format
+msgid "Enumeration not supported on %s\n"
+msgstr ""
+
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:30
 msgid "Error 0"
 msgstr ""
@@ -1907,7 +1905,7 @@ msgstr ""
 msgid "File exists"
 msgstr ""
 
-#: elf/cache.c:119 elf/cache.c:129
+#: elf/cache.c:124 elf/cache.c:134
 msgid "File is not a cache file.\n"
 msgstr ""
 
@@ -1941,6 +1939,10 @@ msgstr ""
 msgid "File too large"
 msgstr ""
 
+#: intl/tst-gettext2.c:36
+msgid "First string for testing."
+msgstr ""
+
 #: nis/nis_error.c:38
 msgid "First/next chain broken"
 msgstr ""
@@ -1949,7 +1951,7 @@ msgstr ""
 msgid "Floating point exception"
 msgstr ""
 
-#: elf/ldconfig.c:134
+#: elf/ldconfig.c:136
 msgid "Format to use: new, old or compat (default)"
 msgstr ""
 
@@ -1970,7 +1972,7 @@ msgstr ""
 msgid "GROUP\n"
 msgstr ""
 
-#: argp/argp-help.c:226
+#: argp/argp-help.c:230
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr ""
@@ -1979,7 +1981,7 @@ msgstr ""
 msgid "Generate graphic from memory profiling data"
 msgstr ""
 
-#: catgets/gencat.c:116
+#: catgets/gencat.c:120
 msgid ""
 "Generate message catalog.\\vIf INPUT-FILE is -, input is read from standard "
 "input.  If OUTPUT-FILE\n"
@@ -1992,7 +1994,7 @@ msgid ""
 "calls)"
 msgstr ""
 
-#: elf/ldconfig.c:126
+#: elf/ldconfig.c:128
 msgid "Generate verbose messages"
 msgstr ""
 
@@ -2000,15 +2002,15 @@ msgstr ""
 msgid "Generic system error"
 msgstr ""
 
-#: locale/programs/locale.c:75
+#: locale/programs/locale.c:77
 msgid "Get locale-specific information."
 msgstr ""
 
-#: argp/argp-parse.c:88
+#: argp/argp-parse.c:94
 msgid "Give a short usage message"
 msgstr ""
 
-#: argp/argp-parse.c:87
+#: argp/argp-parse.c:93
 msgid "Give this help list"
 msgstr ""
 
@@ -2031,7 +2033,7 @@ msgstr ""
 msgid "Group entry for \"%s.%s\" group:\n"
 msgstr ""
 
-#: argp/argp-parse.c:91
+#: argp/argp-parse.c:97
 msgid "Hang for SECS seconds (default 3600)"
 msgstr ""
 
@@ -2039,7 +2041,7 @@ msgstr ""
 msgid "Hangup"
 msgstr ""
 
-#: nscd/grpcache.c:252
+#: nscd/grpcache.c:253
 #, c-format
 msgid "Haven't found \"%d\" in group cache!"
 msgstr ""
@@ -2049,7 +2051,7 @@ msgstr ""
 msgid "Haven't found \"%d\" in password cache!"
 msgstr ""
 
-#: nscd/grpcache.c:213
+#: nscd/grpcache.c:214
 #, c-format
 msgid "Haven't found \"%s\" in group cache!"
 msgstr ""
@@ -2096,7 +2098,7 @@ msgstr ""
 msgid "Identifier removed"
 msgstr ""
 
-#: elf/ldconfig.c:446
+#: elf/ldconfig.c:525
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr ""
@@ -2157,7 +2159,7 @@ msgstr ""
 msgid "Input Files:"
 msgstr ""
 
-#: elf/readlib.c:92
+#: elf/ldconfig.c:698 elf/readlib.c:92
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr ""
@@ -2206,11 +2208,11 @@ msgstr ""
 msgid "Invalid argument"
 msgstr ""
 
-#: posix/regex.c:1098
+#: posix/regex.c:1102
 msgid "Invalid back reference"
 msgstr ""
 
-#: posix/regex.c:1092
+#: posix/regex.c:1096
 msgid "Invalid character class name"
 msgstr ""
 
@@ -2222,11 +2224,11 @@ msgstr ""
 msgid "Invalid client verifier"
 msgstr ""
 
-#: posix/regex.c:1089
+#: posix/regex.c:1093
 msgid "Invalid collation character"
 msgstr ""
 
-#: posix/regex.c:1110
+#: posix/regex.c:1114
 msgid "Invalid content of \\{\\}"
 msgstr ""
 
@@ -2251,15 +2253,15 @@ msgstr ""
 msgid "Invalid or incomplete multibyte or wide character"
 msgstr ""
 
-#: posix/regex.c:1119
+#: posix/regex.c:1123
 msgid "Invalid preceding regular expression"
 msgstr ""
 
-#: posix/regex.c:1113
+#: posix/regex.c:1117
 msgid "Invalid range end"
 msgstr ""
 
-#: posix/regex.c:1086
+#: posix/regex.c:1090
 msgid "Invalid regular expression"
 msgstr ""
 
@@ -2376,13 +2378,13 @@ msgstr ""
 msgid "Malformed name, or illegal name"
 msgstr ""
 
-#: argp/argp-help.c:1181
+#: argp/argp-help.c:1185
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
 msgstr ""
 
-#: elf/ldconfig.c:133
+#: elf/ldconfig.c:135
 msgid "Manually link individual libraries."
 msgstr ""
 
@@ -2398,7 +2400,7 @@ msgstr ""
 msgid "Memory allocation failure"
 msgstr ""
 
-#: posix/regex.c:1116
+#: posix/regex.c:1120
 msgid "Memory exhausted"
 msgstr ""
 
@@ -2430,7 +2432,7 @@ msgstr ""
 msgid "Modify operation failed"
 msgstr ""
 
-#: locale/programs/locale.c:68
+#: locale/programs/locale.c:70
 msgid "Modify output format:"
 msgstr ""
 
@@ -2443,12 +2445,12 @@ msgstr ""
 msgid "Must specify user name for server-user option"
 msgstr ""
 
-#: catgets/gencat.c:107 catgets/gencat.c:111 locale/programs/localedef.c:115
+#: catgets/gencat.c:111 catgets/gencat.c:115 locale/programs/localedef.c:115
 #: nscd/nscd.c:83
 msgid "NAME"
 msgstr ""
 
-#: locale/programs/locale.c:78
+#: locale/programs/locale.c:80
 msgid ""
 "NAME\n"
 "[-a|-m]"
@@ -2576,7 +2578,7 @@ msgstr ""
 msgid "No buffer space available"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:416
+#: locale/programs/ld-ctype.c:425
 msgid "No character set name specified in charmap"
 msgstr ""
 
@@ -2593,12 +2595,12 @@ msgstr ""
 msgid "No data available"
 msgstr ""
 
-#: locale/programs/ld-address.c:131 locale/programs/ld-collate.c:1488
-#: locale/programs/ld-ctype.c:398 locale/programs/ld-identification.c:132
+#: locale/programs/ld-address.c:131 locale/programs/ld-collate.c:1500
+#: locale/programs/ld-ctype.c:407 locale/programs/ld-identification.c:132
 #: locale/programs/ld-measurement.c:93 locale/programs/ld-messages.c:98
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
 #: locale/programs/ld-numeric.c:99 locale/programs/ld-paper.c:91
-#: locale/programs/ld-telephone.c:94 locale/programs/ld-time.c:158
+#: locale/programs/ld-telephone.c:94 locale/programs/ld-time.c:160
 #, c-format
 msgid "No definition for %s category found"
 msgstr ""
@@ -2607,7 +2609,7 @@ msgstr ""
 msgid "No file space on server"
 msgstr ""
 
-#: elf/ldconfig.c:454
+#: elf/ldconfig.c:532
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr ""
@@ -2620,7 +2622,7 @@ msgstr ""
 msgid "No locks available"
 msgstr ""
 
-#: posix/regex.c:1083
+#: posix/regex.c:1087
 msgid "No match"
 msgstr ""
 
@@ -2637,7 +2639,7 @@ msgstr ""
 msgid "No more records in map database"
 msgstr ""
 
-#: posix/regex.c:5948
+#: posix/regex.c:5955
 msgid "No previous regular expression"
 msgstr ""
 
@@ -2669,6 +2671,12 @@ msgstr ""
 msgid "No such device"
 msgstr ""
 
+#. TRANS No such device or address.  The system tried to use the device
+#. TRANS represented by a file you specified, and it couldn't find the device.
+#. TRANS This can mean that the device file was installed incorrectly, or that
+#. TRANS the physical device is missing or not correctly attached to the
+#. TRANS computer.
+#: stdio-common/../sysdeps/gnu/errlist.c:62
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:36
 msgid "No such device or address"
 msgstr ""
@@ -2825,11 +2833,11 @@ msgstr ""
 msgid "Object with same name exists"
 msgstr ""
 
-#: timezone/zic.c:2021
+#: timezone/zic.c:2022
 msgid "Odd number of quotation marks"
 msgstr ""
 
-#: elf/ldconfig.c:132
+#: elf/ldconfig.c:134
 msgid ""
 "Only process directories specified on the command line.  Don't build cache."
 msgstr ""
@@ -2947,7 +2955,7 @@ msgstr ""
 msgid "Passed object is not the same object on server"
 msgstr ""
 
-#: elf/ldconfig.c:310
+#: elf/ldconfig.c:287
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr ""
@@ -2963,11 +2971,11 @@ msgstr ""
 msgid "Power failure"
 msgstr ""
 
-#: posix/regex.c:1122
+#: posix/regex.c:1126
 msgid "Premature end of regular expression"
 msgstr ""
 
-#: elf/ldconfig.c:125
+#: elf/ldconfig.c:127
 msgid "Print cache"
 msgstr ""
 
@@ -2979,7 +2987,7 @@ msgstr ""
 msgid "Print more messages"
 msgstr ""
 
-#: argp/argp-parse.c:148
+#: argp/argp-parse.c:154
 msgid "Print program version"
 msgstr ""
 
@@ -3153,7 +3161,7 @@ msgstr ""
 msgid "RSA (%d bits)\n"
 msgstr ""
 
-#: elf/dl-sym.c:65 elf/dl-sym.c:114
+#: elf/dl-sym.c:68 elf/dl-sym.c:125
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr ""
 
@@ -3176,7 +3184,7 @@ msgstr ""
 msgid "Real-time signal %d"
 msgstr ""
 
-#: posix/regex.c:1125
+#: posix/regex.c:1129
 msgid "Regular expression too big"
 msgstr ""
 
@@ -3194,7 +3202,7 @@ msgstr ""
 msgid "Remove password or make file unreadable by others."
 msgstr ""
 
-#: elf/cache.c:388
+#: elf/cache.c:394
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr ""
@@ -3208,13 +3216,13 @@ msgstr ""
 msgid "Replicate :\n"
 msgstr ""
 
-#: argp/argp-help.c:1635
+#: argp/argp-help.c:1639
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr ""
 
-#: catgets/gencat.c:224 debug/pcprofiledump.c:181 iconv/iconv_prog.c:337
-#: locale/programs/locale.c:254 locale/programs/localedef.c:297
+#: catgets/gencat.c:233 debug/pcprofiledump.c:181 iconv/iconv_prog.c:337
+#: locale/programs/locale.c:256 locale/programs/localedef.c:297
 #: malloc/memusagestat.c:602
 msgid "Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"
 msgstr ""
@@ -3326,7 +3334,7 @@ msgstr ""
 msgid "Servname not supported for ai_socktype"
 msgstr ""
 
-#: argp/argp-parse.c:89
+#: argp/argp-parse.c:95
 msgid "Set the program name"
 msgstr ""
 
@@ -3416,11 +3424,15 @@ msgstr ""
 msgid "Structure needs cleaning"
 msgstr ""
 
-#: nis/nis_error.c:29 nis/ypclnt.c:786 nis/ypclnt.c:860 posix/regex.c:1080
+#: nis/nis_error.c:29 nis/ypclnt.c:786 nis/ypclnt.c:860 posix/regex.c:1084
 #: stdio-common/../sysdeps/gnu/errlist.c:20
 msgid "Success"
 msgstr ""
 
+#: nss/getent.c:703
+msgid "Supported databases:"
+msgstr ""
+
 #: locale/programs/localedef.c:106
 msgid "Suppress warnings and information messages"
 msgstr ""
@@ -3433,7 +3445,7 @@ msgstr ""
 msgid "System error"
 msgstr ""
 
-#: locale/programs/locale.c:63
+#: locale/programs/locale.c:65
 msgid "System information:"
 msgstr ""
 
@@ -3495,7 +3507,7 @@ msgid ""
 "  "
 msgstr ""
 
-#: sunrpc/rpc_main.c:1363
+#: sunrpc/rpc_main.c:1364
 msgid "This implementation doesn't support newstyle or MT-safe code!\n"
 msgstr ""
 
@@ -3573,7 +3585,7 @@ msgstr ""
 msgid "Trace/breakpoint trap"
 msgstr ""
 
-#: posix/regex.c:1095
+#: posix/regex.c:1099
 msgid "Trailing backslash"
 msgstr ""
 
@@ -3600,7 +3612,7 @@ msgstr ""
 msgid "Transport endpoint is not connected"
 msgstr ""
 
-#: argp/argp-help.c:1607
+#: argp/argp-help.c:1611
 #, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr ""
@@ -3640,7 +3652,7 @@ msgstr ""
 msgid "Unknown .netrc keyword %s"
 msgstr ""
 
-#: elf/../sysdeps/generic/readelflib.c:68
+#: elf/../sysdeps/generic/readelflib.c:69
 #, c-format
 msgid "Unknown ELFCLASS in file %s.\n"
 msgstr ""
@@ -3649,7 +3661,7 @@ msgstr ""
 msgid "Unknown NIS error code"
 msgstr ""
 
-#: nss/getent.c:513
+#: nss/getent.c:771
 #, c-format
 msgid "Unknown database: %s\n"
 msgstr ""
@@ -3690,7 +3702,7 @@ msgstr ""
 msgid "Unknown signal %d"
 msgstr ""
 
-#: misc/error.c:108 timezone/zic.c:384
+#: misc/error.c:114 timezone/zic.c:384
 msgid "Unknown system error"
 msgstr ""
 
@@ -3698,19 +3710,19 @@ msgstr ""
 msgid "Unknown ypbind error"
 msgstr ""
 
-#: posix/regex.c:1104
+#: posix/regex.c:1108
 msgid "Unmatched ( or \\("
 msgstr ""
 
-#: posix/regex.c:1128
+#: posix/regex.c:1132
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: posix/regex.c:1101
+#: posix/regex.c:1105
 msgid "Unmatched [ or [^"
 msgstr ""
 
-#: posix/regex.c:1107
+#: posix/regex.c:1111
 msgid "Unmatched \\{"
 msgstr ""
 
@@ -3723,7 +3735,7 @@ msgstr ""
 msgid "Urgent I/O condition"
 msgstr ""
 
-#: argp/argp-help.c:1564
+#: argp/argp-help.c:1568
 msgid "Usage:"
 msgstr ""
 
@@ -3736,11 +3748,11 @@ msgstr ""
 msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
 msgstr ""
 
-#: elf/ldconfig.c:130
+#: elf/ldconfig.c:132
 msgid "Use CACHE as cache file"
 msgstr ""
 
-#: elf/ldconfig.c:131
+#: elf/ldconfig.c:133
 msgid "Use CONF as configuration file"
 msgstr ""
 
@@ -3765,7 +3777,7 @@ msgstr ""
 msgid "Virtual timer expired"
 msgstr ""
 
-#: timezone/zic.c:1925
+#: timezone/zic.c:1926
 msgid "Wild result from command execution"
 msgstr ""
 
@@ -3773,38 +3785,38 @@ msgstr ""
 msgid "Window changed"
 msgstr ""
 
-#: locale/programs/locale.c:67
+#: locale/programs/locale.c:69
 msgid "Write names of available charmaps"
 msgstr ""
 
-#: locale/programs/locale.c:65
+#: locale/programs/locale.c:67
 msgid "Write names of available locales"
 msgstr ""
 
-#: locale/programs/locale.c:69
+#: locale/programs/locale.c:71
 msgid "Write names of selected categories"
 msgstr ""
 
-#: locale/programs/locale.c:70
+#: locale/programs/locale.c:72
 msgid "Write names of selected keywords"
 msgstr ""
 
-#: catgets/gencat.c:111
+#: catgets/gencat.c:115
 msgid "Write output to file NAME"
 msgstr ""
 
-#: elf/cache.c:360 elf/cache.c:369 elf/cache.c:373
+#: elf/cache.c:366 elf/cache.c:375 elf/cache.c:379
 msgid "Writing of cache data failed"
 msgstr ""
 
-#: elf/cache.c:377
+#: elf/cache.c:383
 msgid "Writing of cache data failed."
 msgstr ""
 
-#: catgets/gencat.c:242 elf/ldconfig.c:257 elf/sprof.c:361
-#: iconv/iconv_prog.c:356 locale/programs/locale.c:272
+#: catgets/gencat.c:251 elf/ldconfig.c:269 elf/sprof.c:361
+#: iconv/iconv_prog.c:356 locale/programs/locale.c:274
 #: locale/programs/localedef.c:316 nscd/nscd.c:292 nscd/nscd_nischeck.c:95
-#: nss/getent.c:71 posix/getconf.c:756
+#: nss/getent.c:68 posix/getconf.c:756
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
@@ -3835,7 +3847,7 @@ msgstr ""
 msgid "You really blew it this time"
 msgstr ""
 
-#: timezone/zic.c:1087
+#: timezone/zic.c:1088
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr ""
 
@@ -3851,33 +3863,33 @@ msgstr ""
 msgid "__get_myaddress: ioctl (get interface configuration)"
 msgstr ""
 
-#: locale/programs/ld-collate.c:407
+#: locale/programs/ld-collate.c:417
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr ""
 
-#: locale/programs/ld-collate.c:400
+#: locale/programs/ld-collate.c:410
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr ""
 
-#: locale/programs/ld-collate.c:384
+#: locale/programs/ld-collate.c:394
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr ""
 
-#: locale/programs/ld-collate.c:393
+#: locale/programs/ld-collate.c:403
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr ""
 
-#: locale/programs/charmap.c:562 locale/programs/locfile.h:96
+#: locale/programs/charmap.c:599 locale/programs/locfile.h:96
 #: locale/programs/repertoire.c:314
 #, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1257 locale/programs/ld-ctype.c:1441
+#: locale/programs/ld-collate.c:1268 locale/programs/ld-ctype.c:1454
 #, c-format
 msgid "`%s' and `%.*s' are no valid names for symbolic range"
 msgstr ""
@@ -3887,7 +3899,7 @@ msgstr ""
 msgid "`%s' is no correct profile data file for `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:682
+#: locale/programs/ld-ctype.c:691
 msgid "`digit' category has not entries in groups of ten"
 msgstr ""
 
@@ -3903,7 +3915,7 @@ msgstr ""
 msgid "already running"
 msgstr ""
 
-#: locale/programs/charmap.c:397 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:434 locale/programs/repertoire.c:184
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr ""
@@ -3921,7 +3933,7 @@ msgstr ""
 msgid "authunix_create: out of memory\n"
 msgstr ""
 
-#: locale/programs/charmap.c:327 locale/programs/locfile.c:118
+#: locale/programs/charmap.c:364 locale/programs/locfile.c:118
 #: locale/programs/locfile.c:145 locale/programs/repertoire.c:176
 msgid "bad argument"
 msgstr ""
@@ -3930,11 +3942,11 @@ msgstr ""
 msgid "bad owner"
 msgstr ""
 
-#: timezone/zic.c:1209
+#: timezone/zic.c:1210
 msgid "blank FROM field on Link line"
 msgstr ""
 
-#: timezone/zic.c:1213
+#: timezone/zic.c:1214
 msgid "blank TO field on Link line"
 msgstr ""
 
@@ -3954,11 +3966,6 @@ msgstr ""
 msgid "broadcast: ioctl (get interface flags)"
 msgstr ""
 
-#: elf/ldconfig.c:557
-#, c-format
-msgid "buffer for snprintf too small for %s/%s--file is ignored\n"
-msgstr ""
-
 #: sunrpc/svc_udp.c:528
 msgid "cache_set: could not allocate new rpc_buffer"
 msgstr ""
@@ -3971,7 +3978,7 @@ msgstr ""
 msgid "cache_set: victim not found"
 msgstr ""
 
-#: timezone/zic.c:1750
+#: timezone/zic.c:1751
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr ""
 
@@ -3989,15 +3996,15 @@ msgstr ""
 msgid "cannot add already read locale `%s' a second time"
 msgstr ""
 
-#: elf/dl-deps.c:459
+#: elf/dl-deps.c:470
 msgid "cannot allocate dependency list"
 msgstr ""
 
-#: elf/dl-load.c:1086
+#: elf/dl-load.c:1031
 msgid "cannot allocate memory for program header"
 msgstr ""
 
-#: elf/dl-load.c:319
+#: elf/dl-load.c:339
 msgid "cannot allocate name record"
 msgstr ""
 
@@ -4005,7 +4012,7 @@ msgstr ""
 msgid "cannot allocate symbol data"
 msgstr ""
 
-#: elf/dl-deps.c:485
+#: elf/dl-deps.c:501
 msgid "cannot allocate symbol search list"
 msgstr ""
 
@@ -4013,20 +4020,20 @@ msgstr ""
 msgid "cannot allocate version reference table"
 msgstr ""
 
-#: elf/dl-load.c:1055
+#: elf/dl-load.c:1000
 msgid "cannot change memory protections"
 msgstr ""
 
-#: elf/dl-load.c:513
+#: elf/dl-load.c:533
 msgid "cannot create RUNPATH/RPATH copy"
 msgstr ""
 
-#: elf/dl-load.c:398 elf/dl-load.c:498 elf/dl-load.c:526 elf/dl-load.c:573
-#: elf/dl-load.c:665
+#: elf/dl-load.c:418 elf/dl-load.c:518 elf/dl-load.c:546 elf/dl-load.c:593
+#: elf/dl-load.c:685
 msgid "cannot create cache for search path"
 msgstr ""
 
-#: elf/dl-support.c:141
+#: elf/dl-support.c:191
 msgid "cannot create capability list"
 msgstr ""
 
@@ -4038,19 +4045,23 @@ msgstr ""
 msgid "cannot create internal descriptors"
 msgstr ""
 
-#: elf/dl-load.c:563
+#: elf/dl-load.c:583
 msgid "cannot create search path array"
 msgstr ""
 
-#: elf/dl-load.c:1191
+#: elf/dl-load.c:1137
 msgid "cannot create searchlist"
 msgstr ""
 
-#: elf/dl-load.c:876 elf/dl-load.c:1607
+#: elf/dl-load.c:822 elf/dl-load.c:1682
 msgid "cannot create shared object descriptor"
 msgstr ""
 
-#: elf/dl-load.c:1005
+#: catgets/gencat.c:1316
+msgid "cannot determine escape character"
+msgstr ""
+
+#: elf/dl-load.c:950
 msgid "cannot dynamically load executable"
 msgstr ""
 
@@ -4059,20 +4070,20 @@ msgstr ""
 msgid "cannot enable socket to accept connections: %s"
 msgstr ""
 
-#: elf/dl-open.c:270
+#: elf/dl-open.c:121
 msgid "cannot extend global scope"
 msgstr ""
 
-#: sunrpc/rpc_main.c:342
+#: sunrpc/rpc_main.c:343
 #, c-format
 msgid "cannot find C preprocessor: %s \n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:350
+#: sunrpc/rpc_main.c:351
 msgid "cannot find any C preprocessor (cpp)\n"
 msgstr ""
 
-#: nscd/connections.c:224
+#: nscd/connections.c:225
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr ""
@@ -4081,11 +4092,15 @@ msgstr ""
 msgid "cannot load profiling data"
 msgstr ""
 
+#: elf/dl-deps.c:586
+msgid "cannot load shared object file"
+msgstr ""
+
 #: elf/dl-reloc.c:63
 msgid "cannot make segment writable for relocation"
 msgstr ""
 
-#: elf/dl-load.c:1071
+#: elf/dl-load.c:1016
 msgid "cannot map zero-fill pages"
 msgstr ""
 
@@ -4102,7 +4117,7 @@ msgstr ""
 msgid "cannot open input file"
 msgstr ""
 
-#: catgets/gencat.c:273 iconv/iconv_prog.c:225
+#: catgets/gencat.c:288 iconv/iconv_prog.c:225
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr ""
@@ -4117,7 +4132,7 @@ msgstr ""
 msgid "cannot open output file"
 msgstr ""
 
-#: catgets/gencat.c:780 catgets/gencat.c:821
+#: catgets/gencat.c:944 catgets/gencat.c:985
 #, c-format
 msgid "cannot open output file `%s'"
 msgstr ""
@@ -4127,7 +4142,7 @@ msgstr ""
 msgid "cannot open output file `%s' for category `%s'"
 msgstr ""
 
-#: elf/dl-load.c:1620
+#: elf/dl-load.c:1695
 msgid "cannot open shared object file"
 msgstr ""
 
@@ -4136,11 +4151,11 @@ msgstr ""
 msgid "cannot open socket: %s"
 msgstr ""
 
-#: elf/dl-load.c:868
+#: elf/dl-load.c:814
 msgid "cannot open zero fill device"
 msgstr ""
 
-#: locale/programs/locale.c:462
+#: locale/programs/charmap-dir.c:61
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr ""
@@ -4149,7 +4164,7 @@ msgstr ""
 msgid "cannot read configuration file; this is fatal"
 msgstr ""
 
-#: elf/dl-load.c:805 elf/dl-load.c:893
+#: elf/dl-load.c:838 elf/dl-load.c:1244
 msgid "cannot read file data"
 msgstr ""
 
@@ -4162,7 +4177,7 @@ msgstr ""
 msgid "cannot read header from `%s'"
 msgstr ""
 
-#: locale/programs/locale.c:306
+#: locale/programs/locale.c:308
 #, c-format
 msgid "cannot read locale directory `%s'"
 msgstr ""
@@ -4175,7 +4190,7 @@ msgstr ""
 msgid "cannot safe new repertoire map"
 msgstr ""
 
-#: elf/dl-load.c:774
+#: elf/dl-load.c:776
 msgid "cannot stat shared object"
 msgstr ""
 
@@ -4189,7 +4204,7 @@ msgstr ""
 msgid "cannot write output files to `%s'"
 msgstr ""
 
-#: nscd/connections.c:260 nscd/connections.c:281
+#: nscd/connections.c:261 nscd/connections.c:282
 #, c-format
 msgid "cannot write result: %s"
 msgstr ""
@@ -4199,51 +4214,57 @@ msgstr ""
 msgid "cannot write statistics: %s"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:500
+#: locale/programs/ld-ctype.c:509
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:515
+#: locale/programs/ld-ctype.c:524
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:570
+#: locale/programs/ld-ctype.c:579
 msgid "character <SP> not defined in character map"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:444
+#: locale/programs/ld-ctype.c:453
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:458
+#: locale/programs/ld-ctype.c:467
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3001
+#: locale/programs/ld-ctype.c:3030
 #, c-format
 msgid "character `%s' not defined while needed as default value"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1206
+#: locale/programs/ld-ctype.c:1215
 #, c-format
 msgid "character class `%s' already defined"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1238
+#: locale/programs/ld-ctype.c:1247
 #, c-format
 msgid "character map `%s' already defined"
 msgstr ""
 
-#: locale/programs/charmap.c:119
+#: locale/programs/charmap.c:249
+#, c-format
+msgid ""
+"character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
+msgstr ""
+
+#: locale/programs/charmap.c:135
 #, c-format
 msgid "character map file `%s' not found"
 msgstr ""
 
-#: locale/programs/charmap.c:423
+#: locale/programs/charmap.c:460
 msgid "character sets with locking states are not supported"
 msgstr ""
 
@@ -4259,7 +4280,7 @@ msgstr ""
 msgid "clnttcp_create: out of memory\n"
 msgstr ""
 
-#: sunrpc/clnt_udp.c:126 sunrpc/clnt_udp.c:136
+#: sunrpc/clnt_udp.c:131 sunrpc/clnt_udp.c:141
 msgid "clntudp_create: out of memory\n"
 msgstr ""
 
@@ -4276,6 +4297,10 @@ msgstr ""
 msgid "conversion from `%s' to `%s' not supported"
 msgstr ""
 
+#: catgets/gencat.c:1290
+msgid "conversion modules not available"
+msgstr ""
+
 #: locale/programs/ld-monetary.c:900
 msgid "conversion rate value cannot be zero"
 msgstr ""
@@ -4293,48 +4318,48 @@ msgstr ""
 msgid "couldn't register prog %ld vers %ld\n"
 msgstr ""
 
-#: nss/getent.c:50
+#: nss/getent.c:51
 msgid "database [key ...]"
 msgstr ""
 
-#: locale/programs/charmap.c:213
+#: locale/programs/charmap.c:192
 #, c-format
 msgid "default character map file `%s' not found"
 msgstr ""
 
-#: locale/programs/charmap.c:355
+#: locale/programs/charmap.c:392
 #, c-format
 msgid "duplicate definition of <%s>"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3017
+#: locale/programs/ld-collate.c:3043
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr ""
 
-#: catgets/gencat.c:389
+#: catgets/gencat.c:430
 msgid "duplicate set definition"
 msgstr ""
 
-#: timezone/zic.c:1002
+#: timezone/zic.c:1003
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2542
+#: locale/programs/ld-ctype.c:2557
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr ""
 
-#: catgets/gencat.c:556
+#: catgets/gencat.c:631
 msgid "duplicated message identifier"
 msgstr ""
 
-#: catgets/gencat.c:528
+#: catgets/gencat.c:603
 msgid "duplicated message number"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2353
+#: locale/programs/ld-ctype.c:2368
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr ""
 
@@ -4342,7 +4367,7 @@ msgstr ""
 msgid "empty char string"
 msgstr ""
 
-#: elf/dl-open.c:142
+#: elf/dl-open.c:223
 msgid "empty dynamic string token substitution"
 msgstr ""
 
@@ -4370,12 +4395,12 @@ msgstr ""
 msgid "encoding of original text"
 msgstr ""
 
-#: nscd/connections.c:360 nscd/connections.c:452
+#: nscd/connections.c:361 nscd/connections.c:453
 #, c-format
 msgid "error getting callers id: %s"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2987
+#: locale/programs/ld-collate.c:3013
 msgid "error while adding equivalent collating symbol"
 msgstr ""
 
@@ -4400,7 +4425,7 @@ msgstr ""
 msgid "expect string argument for `copy'"
 msgstr ""
 
-#: timezone/zic.c:892
+#: timezone/zic.c:893
 msgid "expected continuation line not found"
 msgstr ""
 
@@ -4413,7 +4438,7 @@ msgstr ""
 msgid "failed to load symbol data"
 msgstr ""
 
-#: elf/dl-load.c:759
+#: elf/dl-load.c:763
 msgid "failed to map segment from shared object"
 msgstr ""
 
@@ -4436,20 +4461,24 @@ msgstr ""
 
 #. TRANS: the file will not be removed; this is an
 #. TRANS: informative message.
-#: sunrpc/rpc_main.c:1149
+#: sunrpc/rpc_main.c:1150
 #, c-format
 msgid "file `%s' already exists and may be overwritten\n"
 msgstr ""
 
+#: elf/dl-load.c:1244
+msgid "file too short"
+msgstr ""
+
 #: inet/rcmd.c:422
 msgid "fstat failed"
 msgstr ""
 
-#: locale/programs/linereader.c:376
+#: locale/programs/linereader.c:383
 msgid "garbage at end of character code specification"
 msgstr ""
 
-#: locale/programs/linereader.c:265
+#: locale/programs/linereader.c:271
 msgid "garbage at end of number"
 msgstr ""
 
@@ -4465,16 +4494,16 @@ msgstr ""
 msgid "get_myaddress: ioctl (get interface configuration)"
 msgstr ""
 
-#: nss/getent.c:54
+#: nss/getent.c:702
 msgid "getent - get entries from administrative database."
 msgstr ""
 
-#: nscd/connections.c:219
+#: nscd/connections.c:220
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr ""
 
-#: timezone/zic.c:636
+#: timezone/zic.c:637
 msgid "hard link failed, symbolic link used"
 msgstr ""
 
@@ -4482,15 +4511,15 @@ msgstr ""
 msgid "hard linked somewhere"
 msgstr ""
 
-#: locale/programs/charmap.c:944 locale/programs/repertoire.c:430
+#: locale/programs/charmap.c:981 locale/programs/repertoire.c:430
 msgid "hexadecimal range format should use only capital characters"
 msgstr ""
 
-#: timezone/zic.c:1186
+#: timezone/zic.c:1187
 msgid "illegal CORRECTION field on Leap line"
 msgstr ""
 
-#: timezone/zic.c:1190
+#: timezone/zic.c:1191
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr ""
 
@@ -4498,7 +4527,7 @@ msgstr ""
 msgid "illegal character in file: "
 msgstr ""
 
-#: locale/programs/linereader.c:588
+#: locale/programs/linereader.c:595
 msgid "illegal escape sequence at end of string"
 msgstr ""
 
@@ -4507,21 +4536,21 @@ msgstr ""
 msgid "illegal input sequence at position %ld"
 msgstr ""
 
-#: sunrpc/rpc_main.c:462
+#: sunrpc/rpc_main.c:463
 #, c-format
 msgid "illegal nettype :`%s'\n"
 msgstr ""
 
-#: catgets/gencat.c:362 catgets/gencat.c:439
+#: catgets/gencat.c:403 catgets/gencat.c:480
 msgid "illegal set number"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1212
+#: locale/programs/ld-ctype.c:1221
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1244
+#: locale/programs/ld-ctype.c:1253
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr ""
@@ -4530,11 +4559,11 @@ msgstr ""
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr ""
 
-#: timezone/zic.c:849
+#: timezone/zic.c:850
 msgid "input line of unknown type"
 msgstr ""
 
-#: elf/dl-load.c:849
+#: elf/dl-load.c:1291
 msgid "internal error"
 msgstr ""
 
@@ -4542,68 +4571,76 @@ msgstr ""
 msgid "internal error (illegal descriptor)"
 msgstr ""
 
-#: timezone/zic.c:1812
+#: timezone/zic.c:1813
 msgid "internal error - addtype called with bad isdst"
 msgstr ""
 
-#: timezone/zic.c:1820
+#: timezone/zic.c:1821
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr ""
 
-#: timezone/zic.c:1816
+#: timezone/zic.c:1817
 msgid "internal error - addtype called with bad ttisstd"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:471 locale/programs/ld-ctype.c:527
+#: locale/programs/ld-ctype.c:480 locale/programs/ld-ctype.c:536
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr ""
 
-#: elf/dl-load.c:826
+#: elf/dl-load.c:1264
 msgid "invalid ELF header"
 msgstr ""
 
-#: timezone/zic.c:1058
+#: timezone/zic.c:1059
 msgid "invalid UTC offset"
 msgstr ""
 
-#: timezone/zic.c:1061
+#: timezone/zic.c:1062
 msgid "invalid abbreviation format"
 msgstr ""
 
-#: timezone/zic.c:1151 timezone/zic.c:1363 timezone/zic.c:1377
+#: catgets/gencat.c:687
+msgid "invalid character: message ignored"
+msgstr ""
+
+#: timezone/zic.c:1152 timezone/zic.c:1364 timezone/zic.c:1378
 msgid "invalid day of month"
 msgstr ""
 
-#: locale/programs/charmap.c:310
+#: locale/programs/charmap.c:347
 msgid "invalid definition"
 msgstr ""
 
-#: locale/programs/charmap.c:505
+#: locale/programs/charmap.c:542
 msgid "invalid encoding given"
 msgstr ""
 
-#: timezone/zic.c:1315
+#: timezone/zic.c:1316
 msgid "invalid ending year"
 msgstr ""
 
-#: locale/programs/linereader.c:526
+#: catgets/gencat.c:1147 locale/programs/linereader.c:533
 msgid "invalid escape sequence"
 msgstr ""
 
-#: timezone/zic.c:1123
+#: timezone/zic.c:1124
 msgid "invalid leaping year"
 msgstr ""
 
-#: elf/dl-open.c:348
+#: catgets/gencat.c:726
+msgid "invalid line"
+msgstr ""
+
+#: elf/dl-open.c:371
 msgid "invalid mode for dlopen()"
 msgstr ""
 
-#: timezone/zic.c:1138 timezone/zic.c:1241
+#: timezone/zic.c:1139 timezone/zic.c:1242
 msgid "invalid month name"
 msgstr ""
 
-#: locale/programs/charmap.c:932 locale/programs/ld-collate.c:2843
+#: locale/programs/charmap.c:969 locale/programs/ld-collate.c:2869
 #: locale/programs/repertoire.c:418
 msgid "invalid names for character range"
 msgstr ""
@@ -4612,48 +4649,53 @@ msgstr ""
 msgid "invalid pointer size"
 msgstr ""
 
-#: timezone/zic.c:957
+#: catgets/gencat.c:549
+msgid "invalid quote character"
+msgstr ""
+
+#: timezone/zic.c:958
 msgid "invalid saved time"
 msgstr ""
 
-#: timezone/zic.c:1290
+#: timezone/zic.c:1291
 msgid "invalid starting year"
 msgstr ""
 
-#: timezone/zic.c:1167 timezone/zic.c:1270
+#: timezone/zic.c:1168 timezone/zic.c:1271
 msgid "invalid time of day"
 msgstr ""
 
-#: timezone/zic.c:1368
+#: timezone/zic.c:1369
 msgid "invalid weekday name"
 msgstr ""
 
-#: nscd/connections.c:469
-msgid "key length in request too long: %zd"
+#: nscd/connections.c:470
+#, c-format
+msgid "key length in request too long: %d"
 msgstr ""
 
-#: elf/ldconfig.c:606
+#: elf/ldconfig.c:738
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr ""
 
-#: elf/ldconfig.c:600
+#: elf/ldconfig.c:732
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr ""
 
-#: elf/ldconfig.c:603
+#: elf/ldconfig.c:735
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr ""
 
-#: elf/ldconfig.c:633
+#: elf/ldconfig.c:765
 #, c-format
 msgid ""
 "libraries %s and %s in directory %s have same soname but different type."
 msgstr ""
 
-#: timezone/zic.c:829
+#: timezone/zic.c:830
 msgid "line too long"
 msgstr ""
 
@@ -4677,7 +4719,7 @@ msgstr ""
 msgid "make output graphic VALUE pixel wide"
 msgstr ""
 
-#: catgets/gencat.c:625
+#: catgets/gencat.c:780
 msgid "malformed line ignored"
 msgstr ""
 
@@ -4698,7 +4740,7 @@ msgid "memory clobbered past end of allocated block\n"
 msgstr ""
 
 #: locale/programs/locfile.c:334 locale/programs/xmalloc.c:70
-#: malloc/obstack.c:471 posix/getconf.c:809
+#: malloc/obstack.c:477 posix/getconf.c:809
 msgid "memory exhausted"
 msgstr ""
 
@@ -4706,15 +4748,15 @@ msgstr ""
 msgid "memory is consistent, library is buggy\n"
 msgstr ""
 
-#: elf/cache.c:115
+#: elf/cache.c:120
 msgid "mmap of cache file failed.\n"
 msgstr ""
 
-#: elf/../sysdeps/generic/readelflib.c:107
+#: elf/../sysdeps/generic/readelflib.c:108
 msgid "more than one dynamic segment\n"
 msgstr ""
 
-#: timezone/zic.c:952
+#: timezone/zic.c:953
 msgid "nameless rule"
 msgstr ""
 
@@ -4763,11 +4805,11 @@ msgstr ""
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr ""
 
-#: timezone/zic.c:2141
+#: timezone/zic.c:2142
 msgid "no day in month matches rule"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1743
+#: locale/programs/ld-collate.c:1757
 msgid "no definition of `UNDEFINED'"
 msgstr ""
 
@@ -4777,7 +4819,7 @@ msgid ""
 "no filename for profiling data given and shared object `%s' has no soname"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:730
+#: locale/programs/ld-ctype.c:739
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr ""
 
@@ -4785,7 +4827,7 @@ msgstr ""
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3320
+#: locale/programs/ld-ctype.c:3349
 msgid "no output digits defined and none of the standard names in the charmap"
 msgstr ""
 
@@ -4793,25 +4835,25 @@ msgstr ""
 msgid "no output file produced because warning were issued"
 msgstr ""
 
-#: locale/programs/charmap.c:451 locale/programs/charmap.c:631
-#: locale/programs/charmap.c:727 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:488 locale/programs/charmap.c:668
+#: locale/programs/charmap.c:764 locale/programs/repertoire.c:231
 msgid "no symbolic name given"
 msgstr ""
 
-#: locale/programs/charmap.c:538 locale/programs/charmap.c:686
-#: locale/programs/charmap.c:769 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:575 locale/programs/charmap.c:723
+#: locale/programs/charmap.c:806 locale/programs/repertoire.c:297
 msgid "no symbolic name given for end of range"
 msgstr ""
 
-#: locale/programs/linereader.c:634
+#: locale/programs/linereader.c:641
 msgid "non-symbolic character value should not be used"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:795
+#: locale/programs/ld-ctype.c:804
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:812
+#: locale/programs/ld-ctype.c:821
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr ""
 
@@ -4831,7 +4873,7 @@ msgstr ""
 msgid "nscd not running!\n"
 msgstr ""
 
-#: elf/dl-load.c:1106
+#: elf/dl-load.c:1051
 msgid "object file has no dynamic section"
 msgstr ""
 
@@ -4839,11 +4881,15 @@ msgstr ""
 msgid "omit invalid characters from output"
 msgstr ""
 
-#: locale/programs/charmap.c:595
+#: elf/dl-load.c:1311
+msgid "only ET_DYN and ET_EXEC can be loaded"
+msgstr ""
+
+#: locale/programs/charmap.c:632
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr ""
 
-#: locale/programs/ld-collate.c:994 locale/programs/ld-collate.c:1164
+#: locale/programs/ld-collate.c:1005 locale/programs/ld-collate.c:1175
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr ""
@@ -4868,7 +4914,7 @@ msgstr ""
 msgid "poll: protocol failure in circuit setup\n"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1934 locale/programs/ld-ctype.c:1985
+#: locale/programs/ld-ctype.c:1949 locale/programs/ld-ctype.c:2000
 msgid "premature end of `translit_ignore' definition"
 msgstr ""
 
@@ -4876,7 +4922,7 @@ msgstr ""
 msgid "preprocessor error"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2710
+#: locale/programs/ld-ctype.c:2731
 msgid "previous definition was here"
 msgstr ""
 
@@ -4933,7 +4979,7 @@ msgstr ""
 msgid "registerrpc: out of memory\n"
 msgstr ""
 
-#: timezone/zic.c:1873
+#: timezone/zic.c:1874
 msgid "repeated leap second moment"
 msgstr ""
 
@@ -4942,15 +4988,15 @@ msgstr ""
 msgid "repertoire map file `%s' not found"
 msgstr ""
 
-#: locale/programs/charmap.c:1026
+#: locale/programs/charmap.c:1063
 msgid "resulting bytes for range not representable."
 msgstr ""
 
-#: sunrpc/rpc_main.c:1116
+#: sunrpc/rpc_main.c:1117
 msgid "rpcgen: arglist coding error\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1104
+#: sunrpc/rpc_main.c:1105
 msgid "rpcgen: too many defines\n"
 msgstr ""
 
@@ -4978,29 +5024,29 @@ msgstr ""
 msgid "rpcinfo: can't contact portmapper"
 msgstr ""
 
-#: timezone/zic.c:742 timezone/zic.c:744
+#: timezone/zic.c:743 timezone/zic.c:745
 msgid "same rule name in multiple files"
 msgstr ""
 
-#: elf/dl-load.c:1171
+#: elf/dl-load.c:1116
 msgid "shared object cannot be dlopen()ed"
 msgstr ""
 
-#: elf/dl-close.c:59
+#: elf/dl-close.c:63
 msgid "shared object not open"
 msgstr ""
 
-#: nscd/connections.c:481
+#: nscd/connections.c:482
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr ""
 
-#: nscd/connections.c:435
+#: nscd/connections.c:436
 #, c-format
 msgid "short read while reading request: %s"
 msgstr ""
 
-#: nscd/grpcache.c:192 nscd/hstcache.c:278 nscd/pwdcache.c:189
+#: nscd/grpcache.c:193 nscd/hstcache.c:278 nscd/pwdcache.c:189
 #, c-format
 msgid "short write in %s: %s"
 msgstr ""
@@ -5009,27 +5055,27 @@ msgstr ""
 msgid "socket: protocol failure in circuit setup\n"
 msgstr ""
 
-#: timezone/zic.c:813
+#: timezone/zic.c:814
 msgid "standard input"
 msgstr ""
 
-#: timezone/zdump.c:268
+#: timezone/zdump.c:269
 msgid "standard output"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1665
+#: locale/programs/ld-ctype.c:1680
 msgid "start and end character sequence of range must have the same length"
 msgstr ""
 
-#: timezone/zic.c:1324
+#: timezone/zic.c:1325
 msgid "starting year greater than ending year"
 msgstr ""
 
-#: timezone/zic.c:1296 timezone/zic.c:1321
+#: timezone/zic.c:1297 timezone/zic.c:1322
 msgid "starting year too high to be represented"
 msgstr ""
 
-#: timezone/zic.c:1294 timezone/zic.c:1319
+#: timezone/zic.c:1295 timezone/zic.c:1320
 msgid "starting year too low to be represented"
 msgstr ""
 
@@ -5053,15 +5099,15 @@ msgstr ""
 msgid "svc_tcp: makefd_xprt: out of memory\n"
 msgstr ""
 
-#: sunrpc/svc_unix.c:136
+#: sunrpc/svc_unix.c:137
 msgid "svc_unix.c - AF_UNIX socket creation problem"
 msgstr ""
 
-#: sunrpc/svc_unix.c:152
+#: sunrpc/svc_unix.c:153
 msgid "svc_unix.c - cannot getsockname or listen"
 msgstr ""
 
-#: sunrpc/svc_unix.c:202 sunrpc/svc_unix.c:208
+#: sunrpc/svc_unix.c:203 sunrpc/svc_unix.c:209
 msgid "svc_unix: makefd_xprt: out of memory\n"
 msgstr ""
 
@@ -5085,49 +5131,49 @@ msgstr ""
 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
 msgstr ""
 
-#: sunrpc/svc_unix.c:161 sunrpc/svc_unix.c:169
+#: sunrpc/svc_unix.c:162 sunrpc/svc_unix.c:170
 msgid "svcunix_create: out of memory\n"
 msgstr ""
 
-#: locale/programs/linereader.c:738
+#: locale/programs/linereader.c:745
 #, c-format
 msgid "symbol `%.*s' not in charmap"
 msgstr ""
 
-#: locale/programs/linereader.c:759
+#: locale/programs/linereader.c:766
 #, c-format
 msgid "symbol `%.*s' not in repertoire map"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1605 locale/programs/ld-collate.c:1703
+#: locale/programs/ld-collate.c:1617 locale/programs/ld-collate.c:1716
 #, c-format
 msgid "symbol `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1602 locale/programs/ld-collate.c:1700
+#: locale/programs/ld-collate.c:1614 locale/programs/ld-collate.c:1713
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1527
+#: locale/programs/ld-collate.c:1539
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1940 locale/programs/ld-ctype.c:1991
-#: locale/programs/ld-ctype.c:2033
+#: locale/programs/ld-ctype.c:1955 locale/programs/ld-ctype.c:2006
+#: locale/programs/ld-ctype.c:2048
 msgid "syntax error"
 msgstr ""
 
-#: locale/programs/charmap.c:450 locale/programs/charmap.c:504
-#: locale/programs/charmap.c:536 locale/programs/charmap.c:630
-#: locale/programs/charmap.c:685 locale/programs/charmap.c:726
-#: locale/programs/charmap.c:767
+#: locale/programs/charmap.c:487 locale/programs/charmap.c:541
+#: locale/programs/charmap.c:573 locale/programs/charmap.c:667
+#: locale/programs/charmap.c:722 locale/programs/charmap.c:763
+#: locale/programs/charmap.c:804
 #, c-format
 msgid "syntax error in %s definition: %s"
 msgstr ""
 
-#: locale/programs/charmap.c:309 locale/programs/charmap.c:326
+#: locale/programs/charmap.c:346 locale/programs/charmap.c:363
 #: locale/programs/repertoire.c:175
 #, c-format
 msgid "syntax error in prolog: %s"
@@ -5147,52 +5193,52 @@ msgstr ""
 msgid "target encoding not specified using `-t'"
 msgstr ""
 
-#: catgets/gencat.c:391 catgets/gencat.c:530 catgets/gencat.c:559
+#: catgets/gencat.c:432 catgets/gencat.c:605 catgets/gencat.c:634
 msgid "this is the first definition"
 msgstr ""
 
-#: timezone/zic.c:1156
+#: timezone/zic.c:1157
 msgid "time before zero"
 msgstr ""
 
-#: timezone/zic.c:1164 timezone/zic.c:2041 timezone/zic.c:2060
+#: timezone/zic.c:1165 timezone/zic.c:2042 timezone/zic.c:2061
 msgid "time overflow"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1538 locale/programs/ld-ctype.c:2014
+#: locale/programs/ld-ctype.c:1553 locale/programs/ld-ctype.c:2029
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1672
+#: locale/programs/ld-ctype.c:1687
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr ""
 
-#: locale/programs/charmap.c:514
+#: locale/programs/charmap.c:551
 msgid "too few bytes in character encoding"
 msgstr ""
 
-#: locale/programs/charmap.c:516
+#: locale/programs/charmap.c:553
 msgid "too many bytes in character encoding"
 msgstr ""
 
-#: timezone/zic.c:1867
+#: timezone/zic.c:1868
 msgid "too many leap seconds"
 msgstr ""
 
-#: timezone/zic.c:1839
+#: timezone/zic.c:1840
 msgid "too many local time types"
 msgstr ""
 
-#: timezone/zic.c:1793
+#: timezone/zic.c:1794
 msgid "too many transitions?!"
 msgstr ""
 
-#: timezone/zic.c:2164
+#: timezone/zic.c:2165
 msgid "too many, or too long, time zone abbreviations"
 msgstr ""
 
-#: locale/programs/linereader.h:156
+#: locale/programs/linereader.h:157
 msgid "trailing garbage at end of line"
 msgstr ""
 
@@ -5201,7 +5247,7 @@ msgstr ""
 msgid "trouble replying to prog %d\n"
 msgstr ""
 
-#: timezone/zic.c:1331
+#: timezone/zic.c:1332
 msgid "typed single year"
 msgstr ""
 
@@ -5217,12 +5263,12 @@ msgstr ""
 msgid "undefined"
 msgstr ""
 
-#: locale/programs/charmap.c:819 locale/programs/charmap.c:830
+#: locale/programs/charmap.c:856 locale/programs/charmap.c:867
 #, c-format
 msgid "unknown character `%s'"
 msgstr ""
 
-#: catgets/gencat.c:488
+#: catgets/gencat.c:562
 #, c-format
 msgid "unknown directive `%s': line ignored"
 msgstr ""
@@ -5232,20 +5278,20 @@ msgstr ""
 msgid "unknown iconv() error %d"
 msgstr ""
 
-#: catgets/gencat.c:467
+#: catgets/gencat.c:508
 #, c-format
 msgid "unknown set `%s'"
 msgstr ""
 
-#: timezone/zic.c:785
+#: timezone/zic.c:786
 msgid "unruly zone"
 msgstr ""
 
-#: catgets/gencat.c:977
+#: catgets/gencat.c:1169
 msgid "unterminated message"
 msgstr ""
 
-#: locale/programs/linereader.c:592 locale/programs/linereader.c:777
+#: locale/programs/linereader.c:599 locale/programs/linereader.c:784
 msgid "unterminated string"
 msgstr ""
 
@@ -5253,11 +5299,11 @@ msgstr ""
 msgid "unterminated string constant"
 msgstr ""
 
-#: locale/programs/linereader.c:462
+#: locale/programs/linereader.c:469
 msgid "unterminated symbolic name"
 msgstr ""
 
-#: locale/programs/charmap.c:968
+#: locale/programs/charmap.c:1005
 msgid "upper limit in range is not higher then lower limit"
 msgstr ""
 
@@ -5265,26 +5311,26 @@ msgstr ""
 msgid "upper limit in range is not smaller then lower limit"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1423
+#: sunrpc/rpc_main.c:1424
 #, c-format
 msgid "usage: %s infile\n"
 msgstr ""
 
-#: timezone/zic.c:2107
+#: timezone/zic.c:2108
 msgid "use of 2/29 in non leap-year"
 msgstr ""
 
-#: locale/programs/charmap.c:603 locale/programs/charmap.c:666
+#: locale/programs/charmap.c:640 locale/programs/charmap.c:703
 #, c-format
 msgid "value for %s must be an integer"
 msgstr ""
 
-#: locale/programs/charmap.c:362
+#: locale/programs/charmap.c:399
 #, c-format
 msgid "value for <%s> must be 1 or greater"
 msgstr ""
 
-#: locale/programs/charmap.c:374
+#: locale/programs/charmap.c:411
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr ""
@@ -5293,12 +5339,12 @@ msgstr ""
 msgid "warning: "
 msgstr ""
 
-#: nscd/connections.c:426
+#: nscd/connections.c:427
 #, c-format
 msgid "while accepting connection: %s"
 msgstr ""
 
-#: nscd/grpcache.c:149 nscd/hstcache.c:165 nscd/pwdcache.c:143
+#: nscd/grpcache.c:150 nscd/hstcache.c:165 nscd/pwdcache.c:143
 msgid "while allocating cache entry"
 msgstr ""
 
@@ -5306,15 +5352,15 @@ msgstr ""
 msgid "while allocating hash table entry"
 msgstr ""
 
-#: nscd/grpcache.c:99 nscd/hstcache.c:108 nscd/pwdcache.c:106
+#: nscd/grpcache.c:100 nscd/hstcache.c:108 nscd/pwdcache.c:106
 msgid "while allocating key copy"
 msgstr ""
 
-#: catgets/gencat.c:1007
+#: catgets/gencat.c:1199
 msgid "while opening old catalog file"
 msgstr ""
 
-#: locale/programs/locale.c:359
+#: locale/programs/locale.c:361
 msgid "while preparing output"
 msgstr ""
 
@@ -5322,17 +5368,17 @@ msgstr ""
 msgid "while stat'ing profiling data file"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2377
+#: locale/programs/ld-ctype.c:2392
 msgid ""
 "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2391
+#: locale/programs/ld-ctype.c:2406
 msgid ""
 "with character code range values one must use the absolute ellipsis `...'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2362
+#: locale/programs/ld-ctype.c:2377
 msgid ""
 "with symbolic name range values the absolute ellipsis `...' must not be used"
 msgstr ""
@@ -5345,27 +5391,27 @@ msgstr ""
 msgid "writeable by other than owner"
 msgstr ""
 
-#: nscd/nscd.c:123 nscd/nscd_nischeck.c:64 nss/getent.c:400
+#: nscd/nscd.c:123 nscd/nscd_nischeck.c:64 nss/getent.c:761
 msgid "wrong number of arguments"
 msgstr ""
 
-#: timezone/zic.c:1114
+#: timezone/zic.c:1115
 msgid "wrong number of fields on Leap line"
 msgstr ""
 
-#: timezone/zic.c:1205
+#: timezone/zic.c:1206
 msgid "wrong number of fields on Link line"
 msgstr ""
 
-#: timezone/zic.c:948
+#: timezone/zic.c:949
 msgid "wrong number of fields on Rule line"
 msgstr ""
 
-#: timezone/zic.c:1018
+#: timezone/zic.c:1019
 msgid "wrong number of fields on Zone continuation line"
 msgstr ""
 
-#: timezone/zic.c:976
+#: timezone/zic.c:977
 msgid "wrong number of fields on Zone line"
 msgstr ""