Update.

	* stdlib/stdlib.h (drand48_data): Make available only for
	__USE_MISC.  Rename elements to protect namespace.  Change type
	and position of a and init element.
	* stdlib/drand48-iter.c: Don't handle unsigned short > 16 bit
	differently.  Adjust for drand48_data change.  Don't compute a here,
	it comes from drand48_data.
	* stdlib/lcong48_r.c: Don't handle unsigned short > 16 bit
	differently.  Adjust for drand48_data change.  Compute a here.
	* stdlib/srand48_r.c: Likewise.
	* stdlib/drand48.c: Adjust for drand48_data change.
	* stdlib/lrand48.c: Likewise.
	* stdlib/mrand48.c: Likewise.
	* stdlib/seek48.c: Likewise.
	* stdlib/drand48_r.c: Likewise.
	* stdlib/lrand48_r.c: Likewise.
	* stdlib/mrand48_r.c: Likewise.
	* stdlib/seed48_r.c: Likewise.  Don't handle unsigned short > 16 bit
	differently.
	* stdlib/erand48_r.c: Don't handle unsigned short > 16 bit differently.
	* stdlib/jrand48_r.c: Likewise.

16 files changed, 636 insertions, 633 deletions

diff --git a/ChangeLog b/ChangeLog
index 6524ea14ca..cc18981aef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
 2001-01-21  Ulrich Drepper  <drepper@redhat.com>
 
+	* stdlib/stdlib.h (drand48_data): Make available only for
+	__USE_MISC.  Rename elements to protect namespace.  Change type
+	and position of a and init element.
+	* stdlib/drand48-iter.c: Don't handle unsigned short > 16 bit
+	differently.  Adjust for drand48_data change.  Don't compute a here,
+	it comes from drand48_data.
+	* stdlib/lcong48_r.c: Don't handle unsigned short > 16 bit
+	differently.  Adjust for drand48_data change.  Compute a here.
+	* stdlib/srand48_r.c: Likewise.
+	* stdlib/drand48.c: Adjust for drand48_data change.
+	* stdlib/lrand48.c: Likewise.
+	* stdlib/mrand48.c: Likewise.
+	* stdlib/seek48.c: Likewise.
+	* stdlib/drand48_r.c: Likewise.
+	* stdlib/lrand48_r.c: Likewise.
+	* stdlib/mrand48_r.c: Likewise.
+	* stdlib/seed48_r.c: Likewise.  Don't handle unsigned short > 16 bit
+	differently.
+	* stdlib/erand48_r.c: Don't handle unsigned short > 16 bit differently.
+	* stdlib/jrand48_r.c: Likewise.
+
 	* po/sv.po: Update from translation team.
 
 2001-01-21  Andreas Jaeger  <aj@suse.de>
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