about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--manual/filesys.texi4
-rw-r--r--po/libc.pot1475
2 files changed, 782 insertions, 697 deletions
diff --git a/manual/filesys.texi b/manual/filesys.texi
index d3f8d3f8cf..5eba3e262c 100644
--- a/manual/filesys.texi
+++ b/manual/filesys.texi
@@ -1138,7 +1138,7 @@ call @code{readlink} again.  Here is an example:
 
 @smallexample
 char *
-readlink_malloc (char *filename)
+readlink_malloc (const char *filename)
 @{
   int size = 100;
 
@@ -1146,6 +1146,8 @@ readlink_malloc (char *filename)
     @{
       char *buffer = (char *) xmalloc (size);
       int nchars = readlink (filename, buffer, size);
+      if (nchars < 0)
+        return NULL;
       if (nchars < size)
         return buffer;
       free (buffer);
diff --git a/po/libc.pot b/po/libc.pot
index f7a345259b..909548ed25 100644
--- a/po/libc.pot
+++ b/po/libc.pot
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.2.1\n"
-"POT-Creation-Date: 2001-01-21 08:03-0800\n"
+"Project-Id-Version: libc 2.2.4\n"
+"POT-Creation-Date: 2001-08-13 15:08-0700\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"
@@ -14,75 +14,81 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: nis/nis_print.c:274
+#: locale/programs/ld-monetary.c:278
+#, c-format
+msgid "\t\t\t\t\t\t\t      %s: value for field `%s' must be in range %d...%d"
+msgstr ""
+
+#: nis/nis_print.c:277
 msgid "\t\tAccess Rights : "
 msgstr ""
 
-#: nis/nis_print.c:272
+#: nis/nis_print.c:275
 msgid "\t\tAttributes    : "
 msgstr ""
 
-#: sunrpc/rpc_main.c:1425
+#: sunrpc/rpc_main.c:1427
 #, c-format
 msgid ""
 "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] "
 "infile\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1427
+#: sunrpc/rpc_main.c:1429
 #, c-format
 msgid "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1430
+#: sunrpc/rpc_main.c:1432
 #, c-format
 msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1429
+#: sunrpc/rpc_main.c:1431
 #, c-format
 msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
 msgstr ""
 
-#: nis/nis_print.c:236
+#: nis/nis_print.c:239
 msgid "\tAccess rights: "
 msgstr ""
 
-#: nis/nis_print.c:294
+#: nis/nis_print.c:297
 #, c-format
 msgid "\tEntry data of type %s\n"
 msgstr ""
 
-#: nis/nis_print.c:172
+#: nis/nis_print.c:175
 #, c-format
 msgid "\tName       : %s\n"
 msgstr ""
 
-#: nis/nis_print.c:173
+#: nis/nis_print.c:176
 msgid "\tPublic Key : "
 msgstr ""
 
-#: nis/nis_print.c:235
+#: nis/nis_print.c:238
 #, c-format
 msgid "\tType         : %s\n"
 msgstr ""
 
-#: nis/nis_print.c:202
+#: nis/nis_print.c:205
 #, c-format
 msgid "\tUniversal addresses (%u)\n"
 msgstr ""
 
-#: nis/nis_print.c:270
+#: nis/nis_print.c:273
 #, c-format
 msgid "\t[%d]\tName          : %s\n"
 msgstr ""
 
-#: nis/nis_print.c:297
+#: nis/nis_print.c:300
 #, c-format
 msgid "\t[%u] - [%u bytes] "
 msgstr ""
 
 #: nscd/nscd_stat.c:154
+#, c-format
 msgid ""
 "\n"
 "%s cache:\n"
@@ -99,13 +105,13 @@ msgid ""
 "%15s  check /etc/%s for changes\n"
 msgstr ""
 
-#: nis/nis_print.c:252
+#: nis/nis_print.c:255
 msgid ""
 "\n"
 "Group Members :\n"
 msgstr ""
 
-#: nis/nis_print.c:323
+#: nis/nis_print.c:326
 msgid ""
 "\n"
 "Time to Live  : "
@@ -135,7 +141,7 @@ msgstr ""
 msgid "     yes"
 msgstr ""
 
-#: nis/nis_print.c:349
+#: nis/nis_print.c:352
 #, c-format
 msgid "    Data Length = %u\n"
 msgstr ""
@@ -192,15 +198,15 @@ msgstr ""
 msgid "  or: "
 msgstr ""
 
-#: elf/ldconfig.c:448
+#: elf/ldconfig.c:457
 msgid " (SKIPPED)\n"
 msgstr ""
 
-#: elf/ldconfig.c:446
+#: elf/ldconfig.c:455
 msgid " (changed)\n"
 msgstr ""
 
-#: timezone/zic.c:421
+#: timezone/zic.c:427
 #, c-format
 msgid " (rule from \"%s\", line %d)"
 msgstr ""
@@ -209,22 +215,22 @@ msgstr ""
 msgid " [OPTION...]"
 msgstr ""
 
-#: timezone/zic.c:418
+#: timezone/zic.c:424
 #, c-format
 msgid "\"%s\", line %d: %s"
 msgstr ""
 
-#: timezone/zic.c:983
+#: timezone/zic.c:989
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr ""
 
-#: timezone/zic.c:991
+#: timezone/zic.c:997
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1410
+#: sunrpc/rpc_main.c:1412
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr ""
 
@@ -238,58 +244,58 @@ msgstr ""
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr ""
 
-#: 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:1172
+#: locale/programs/ld-address.c:581 locale/programs/ld-collate.c:2612
+#: locale/programs/ld-collate.c:3740 locale/programs/ld-ctype.c:2112
+#: locale/programs/ld-ctype.c:2849 locale/programs/ld-identification.c:448
+#: locale/programs/ld-measurement.c:237 locale/programs/ld-messages.c:331
+#: locale/programs/ld-monetary.c:936 locale/programs/ld-name.c:305
+#: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:238
+#: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1199
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
 msgstr ""
 
-#: elf/cache.c:165 elf/cache.c:175
+#: elf/cache.c:190 elf/cache.c:200
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr ""
 
-#: timezone/zic.c:793
+#: timezone/zic.c:799
 #, c-format
 msgid "%s in ruleless zone"
 msgstr ""
 
-#: elf/../sysdeps/generic/readelflib.c:65
+#: elf/../sysdeps/generic/readelflib.c:67
 #, c-format
 msgid "%s is a 32 bit ELF file.\n"
 msgstr ""
 
-#: elf/../sysdeps/generic/readelflib.c:67
+#: elf/../sysdeps/generic/readelflib.c:69
 #, c-format
 msgid "%s is a 64 bit ELF file.\n"
 msgstr ""
 
-#: elf/../sysdeps/unix/sysv/linux/i386/readelflib.c:48
+#: elf/../sysdeps/unix/sysv/linux/i386/readelflib.c:49
 #, c-format
 msgid "%s is for unknown machine %d.\n"
 msgstr ""
 
-#: elf/ldconfig.c:329
+#: elf/ldconfig.c:326
 #, c-format
 msgid "%s is not a known library type"
 msgstr ""
 
-#: elf/../sysdeps/generic/readelflib.c:76
+#: elf/../sysdeps/generic/readelflib.c:78
 #, c-format
 msgid "%s is not a shared object file (Type: %d).\n"
 msgstr ""
 
-#: elf/ldconfig.c:415
+#: elf/ldconfig.c:424
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr ""
 
-#: elf/readlib.c:157
+#: elf/readlib.c:155
 #, c-format
 msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
 msgstr ""
@@ -309,12 +315,12 @@ msgstr ""
 msgid "%s%sUnknown signal %d\n"
 msgstr ""
 
-#: timezone/zic.c:2228
+#: timezone/zic.c:2234
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr ""
 
-#: locale/programs/charmap.c:326
+#: locale/programs/charmap.c:331
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr ""
@@ -329,87 +335,82 @@ msgstr ""
 msgid "%s: C preprocessor failed with signal %d\n"
 msgstr ""
 
-#: timezone/zic.c:1494
+#: timezone/zic.c:1500
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:2206
+#: timezone/zic.c:2212
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:645
+#: timezone/zic.c:651
 #, c-format
 msgid "%s: Can't link from %s to %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:819
+#: timezone/zic.c:825
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:1484
+#: timezone/zic.c:1490
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:630
+#: timezone/zic.c:636
 #, c-format
 msgid "%s: Can't unlink  %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:888
+#: timezone/zic.c:894
 #, c-format
 msgid "%s: Error closing %s: %s\n"
 msgstr ""
 
-#: timezone/zic.c:881
+#: timezone/zic.c:887
 #, c-format
 msgid "%s: Error reading %s\n"
 msgstr ""
 
-#: timezone/zdump.c:267
-#, c-format
-msgid "%s: Error writing "
-msgstr ""
-
-#: timezone/zic.c:1560
+#: timezone/zic.c:1566
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr ""
 
-#: timezone/zic.c:866
+#: timezone/zic.c:872
 #, c-format
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr ""
 
-#: timezone/zic.c:359
+#: timezone/zic.c:365
 #, c-format
 msgid "%s: Memory exhausted: %s\n"
 msgstr ""
 
-#: timezone/zic.c:525
+#: timezone/zic.c:531
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr ""
 
-#: timezone/zic.c:485
+#: timezone/zic.c:491
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr ""
 
-#: timezone/zic.c:495
+#: timezone/zic.c:501
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr ""
 
-#: timezone/zic.c:505
+#: timezone/zic.c:511
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr ""
 
-#: timezone/zic.c:515
+#: timezone/zic.c:521
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr ""
@@ -425,7 +426,7 @@ msgstr ""
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1323
+#: locale/programs/ld-collate.c:1336
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr ""
@@ -436,7 +437,7 @@ msgstr ""
 msgid "%s: `%s' value does not match `%s' value"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:835 locale/programs/ld-numeric.c:313
+#: locale/programs/ld-monetary.c:837 locale/programs/ld-numeric.c:318
 #, c-format
 msgid "%s: `-1' must be last entry in `%s' field"
 msgstr ""
@@ -446,106 +447,106 @@ msgstr ""
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1515
+#: locale/programs/ld-collate.c:1528
 #, c-format
 msgid ""
 "%s: `position' must be used for a specific level in all sections or none"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2635 locale/programs/ld-ctype.c:2775
+#: locale/programs/ld-ctype.c:2637 locale/programs/ld-ctype.c:2777
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1123
+#: locale/programs/ld-collate.c:1136
 #, 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:1081
+#: locale/programs/ld-collate.c:1094
 #, c-format
 msgid ""
 "%s: byte sequences of first and last character must have the same length"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3642
+#: locale/programs/ld-collate.c:3663
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3308
+#: locale/programs/ld-collate.c:3327
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr ""
 
-#: 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
+#: locale/programs/ld-ctype.c:2912 locale/programs/ld-ctype.c:2996
+#: locale/programs/ld-ctype.c:3016 locale/programs/ld-ctype.c:3037
+#: locale/programs/ld-ctype.c:3058 locale/programs/ld-ctype.c:3079
+#: locale/programs/ld-ctype.c:3100 locale/programs/ld-ctype.c:3140
+#: locale/programs/ld-ctype.c:3161 locale/programs/ld-ctype.c:3228
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3270 locale/programs/ld-ctype.c:3295
+#: locale/programs/ld-ctype.c:3272 locale/programs/ld-ctype.c:3297
 #, c-format
 msgid ""
 "%s: character `%s' needed as default value not representable with one byte"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2905
+#: locale/programs/ld-ctype.c:2907
 #, c-format
 msgid "%s: character `%s' not defined in charmap while needed as default value"
 msgstr ""
 
-#: 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
+#: locale/programs/ld-ctype.c:2991 locale/programs/ld-ctype.c:3011
+#: locale/programs/ld-ctype.c:3053 locale/programs/ld-ctype.c:3074
+#: locale/programs/ld-ctype.c:3095 locale/programs/ld-ctype.c:3135
+#: locale/programs/ld-ctype.c:3156 locale/programs/ld-ctype.c:3223
+#: locale/programs/ld-ctype.c:3265 locale/programs/ld-ctype.c:3290
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr ""
 
-#: timezone/zic.c:1927
+#: timezone/zic.c:1933
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr ""
 
-#: locale/programs/ld-time.c:225
+#: locale/programs/ld-time.c:246
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not '+' nor '-'"
 msgstr ""
 
-#: locale/programs/ld-time.c:237
+#: locale/programs/ld-time.c:258
 #, c-format
 msgid ""
 "%s: direction flag in string %Zd in `era' field is not a single character"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2727
+#: locale/programs/ld-ctype.c:2729
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr ""
 
-#: locale/programs/ld-identification.c:423
+#: locale/programs/ld-identification.c:431
 #, c-format
 msgid "%s: duplicate category version definition"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2711
+#: locale/programs/ld-collate.c:2730
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2675
+#: locale/programs/ld-collate.c:2694
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3691
+#: locale/programs/ld-collate.c:3712
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr ""
@@ -555,19 +556,27 @@ msgstr ""
 msgid "%s: empty weight string not allowed"
 msgstr ""
 
-#: locale/programs/charmap.c:831
+#: locale/programs/charmap.c:836
 #, c-format
 msgid "%s: error in state machine"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2483
+#: locale/programs/ld-address.c:489 locale/programs/ld-address.c:526
+#: locale/programs/ld-address.c:564 locale/programs/ld-ctype.c:2485
+#: locale/programs/ld-identification.c:360
+#: locale/programs/ld-measurement.c:220 locale/programs/ld-messages.c:300
+#: locale/programs/ld-monetary.c:694 locale/programs/ld-monetary.c:729
+#: locale/programs/ld-monetary.c:770 locale/programs/ld-name.c:278
+#: locale/programs/ld-numeric.c:263 locale/programs/ld-paper.c:221
+#: locale/programs/ld-telephone.c:288 locale/programs/ld-time.c:1104
+#: locale/programs/ld-time.c:1146
 #, c-format
 msgid "%s: field `%s' declared more than once"
 msgstr ""
 
-#: 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
+#: locale/programs/ld-ctype.c:1526 locale/programs/ld-ctype.c:1651
+#: locale/programs/ld-ctype.c:1757 locale/programs/ld-ctype.c:2348
+#: locale/programs/ld-ctype.c:3331
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr ""
@@ -579,14 +588,18 @@ msgstr ""
 msgid "%s: field `%s' must not be empty"
 msgstr ""
 
-#: locale/programs/ld-address.c:142 locale/programs/ld-address.c:197
-#: locale/programs/ld-address.c:224 locale/programs/ld-address.c:284
-#: locale/programs/ld-address.c:303 locale/programs/ld-address.c:315
-#: locale/programs/ld-measurement.c:104 locale/programs/ld-monetary.c:244
-#: locale/programs/ld-monetary.c:260 locale/programs/ld-name.c:104
-#: locale/programs/ld-numeric.c:113 locale/programs/ld-numeric.c:127
-#: locale/programs/ld-paper.c:101 locale/programs/ld-paper.c:109
-#: locale/programs/ld-telephone.c:105
+#: locale/programs/ld-address.c:142 locale/programs/ld-address.c:180
+#: locale/programs/ld-address.c:197 locale/programs/ld-address.c:224
+#: locale/programs/ld-address.c:284 locale/programs/ld-address.c:303
+#: locale/programs/ld-address.c:315 locale/programs/ld-identification.c:145
+#: locale/programs/ld-measurement.c:104 locale/programs/ld-monetary.c:206
+#: locale/programs/ld-monetary.c:244 locale/programs/ld-monetary.c:260
+#: locale/programs/ld-monetary.c:272 locale/programs/ld-name.c:104
+#: locale/programs/ld-name.c:141 locale/programs/ld-numeric.c:113
+#: locale/programs/ld-numeric.c:127 locale/programs/ld-paper.c:101
+#: locale/programs/ld-paper.c:109 locale/programs/ld-telephone.c:105
+#: locale/programs/ld-telephone.c:163 locale/programs/ld-time.c:175
+#: locale/programs/ld-time.c:195
 #, c-format
 msgid "%s: field `%s' not defined"
 msgstr ""
@@ -596,37 +609,38 @@ msgstr ""
 msgid "%s: field `%s' undefined"
 msgstr ""
 
-#: locale/programs/ld-time.c:258
+#: locale/programs/ld-time.c:279
 #, c-format
 msgid "%s: garbage at end of offset value in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:318
+#: locale/programs/ld-time.c:339
 #, c-format
 msgid "%s: garbage at end of starting date in string %Zd in `era' field "
 msgstr ""
 
-#: locale/programs/ld-time.c:395
+#: locale/programs/ld-time.c:416
 #, c-format
 msgid "%s: garbage at end of stopping date in string %Zd in `era' field"
 msgstr ""
 
-#: posix/getopt.c:795
+#: posix/getopt.c:788
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: 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:1170
+#: locale/programs/ld-address.c:578 locale/programs/ld-collate.c:3738
+#: locale/programs/ld-ctype.c:2846 locale/programs/ld-identification.c:445
+#: locale/programs/ld-measurement.c:234 locale/programs/ld-messages.c:329
+#: locale/programs/ld-monetary.c:934 locale/programs/ld-name.c:303
+#: locale/programs/ld-numeric.c:373 locale/programs/ld-paper.c:236
+#: locale/programs/ld-telephone.c:311 locale/programs/ld-time.c:1197
 #, c-format
 msgid "%s: incomplete `END' line"
 msgstr ""
 
 #: locale/programs/ld-address.c:166
+#, c-format
 msgid "%s: invalid escape `%%%c' sequence in field `%s'"
 msgstr ""
 
@@ -636,27 +650,27 @@ msgstr ""
 msgid "%s: invalid escape sequence in field `%s'"
 msgstr ""
 
-#: locale/programs/ld-time.c:250
+#: locale/programs/ld-time.c:271
 #, c-format
 msgid "%s: invalid number for offset in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3143
+#: locale/programs/ld-collate.c:3162
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr ""
 
-#: posix/getopt.c:798
+#: posix/getopt.c:791
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: locale/programs/ld-time.c:309
+#: locale/programs/ld-time.c:330
 #, c-format
 msgid "%s: invalid starting date in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:386
+#: locale/programs/ld-time.c:407
 #, c-format
 msgid "%s: invalid stopping date in string %Zd in `era' field"
 msgstr ""
@@ -671,38 +685,38 @@ msgstr ""
 msgid "%s: language abbreviation `%s' not defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3223 locale/programs/ld-collate.c:3346
-#: locale/programs/ld-collate.c:3695
+#: locale/programs/ld-collate.c:3242 locale/programs/ld-collate.c:3365
+#: locale/programs/ld-collate.c:3716
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3360 locale/programs/ld-collate.c:3707
+#: locale/programs/ld-collate.c:3379 locale/programs/ld-collate.c:3728
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3710
+#: locale/programs/ld-collate.c:3731
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr ""
 
-#: locale/programs/ld-time.c:435
+#: locale/programs/ld-time.c:456
 #, c-format
 msgid "%s: missing era format in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:423
+#: locale/programs/ld-time.c:444
 #, c-format
 msgid "%s: missing era name in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3119
+#: locale/programs/ld-collate.c:3138
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3169
+#: locale/programs/ld-collate.c:3188
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr ""
@@ -717,7 +731,7 @@ msgstr ""
 msgid "%s: no identification for category `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2753
+#: locale/programs/ld-ctype.c:2755
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
 msgstr ""
@@ -732,52 +746,52 @@ msgstr ""
 msgid "%s: numeric country code `%d' not valid"
 msgstr ""
 
-#: posix/getopt.c:718
+#: posix/getopt.c:711
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: posix/getopt.c:688
+#: posix/getopt.c:681
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: posix/getopt.c:736 posix/getopt.c:909
+#: posix/getopt.c:729 posix/getopt.c:902
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: posix/getopt.c:713
+#: posix/getopt.c:706
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: posix/getopt.c:893
+#: posix/getopt.c:886
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: posix/getopt.c:875
+#: posix/getopt.c:868
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: posix/getopt.c:828 posix/getopt.c:958
+#: posix/getopt.c:821 posix/getopt.c:951
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1314 locale/programs/ld-collate.c:3654
+#: locale/programs/ld-collate.c:1327 locale/programs/ld-collate.c:3675
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3297
+#: locale/programs/ld-collate.c:3316
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3281
+#: locale/programs/ld-collate.c:3300
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr ""
@@ -787,84 +801,85 @@ msgstr ""
 msgid "%s: output would overwrite %s\n"
 msgstr ""
 
-#: timezone/zic.c:873 timezone/zic.c:1287 timezone/zic.c:1312
+#: timezone/zic.c:879 timezone/zic.c:1293 timezone/zic.c:1318
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr ""
 
-#: 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:1188
+#: locale/programs/charmap.c:843 locale/programs/ld-address.c:597
+#: locale/programs/ld-collate.c:2609 locale/programs/ld-collate.c:3756
+#: locale/programs/ld-ctype.c:2109 locale/programs/ld-ctype.c:2866
+#: locale/programs/ld-identification.c:464
+#: locale/programs/ld-measurement.c:253 locale/programs/ld-messages.c:347
+#: locale/programs/ld-monetary.c:952 locale/programs/ld-name.c:321
+#: locale/programs/ld-numeric.c:391 locale/programs/ld-paper.c:254
+#: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1215
 #: locale/programs/locfile.h:103 locale/programs/repertoire.c:325
 #, c-format
 msgid "%s: premature end of file"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3394 locale/programs/ld-collate.c:3580
+#: locale/programs/ld-collate.c:3413 locale/programs/ld-collate.c:3601
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr ""
 
-#: locale/programs/ld-time.c:337
+#: locale/programs/ld-time.c:358
 #, c-format
 msgid "%s: starting date is invalid in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:414
+#: locale/programs/ld-time.c:435
 #, c-format
 msgid "%s: stopping date is invalid in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1248
+#: locale/programs/ld-collate.c:1261
 #, c-format
-msgid "%s: symbolic range ellipsis must not be direct followed by `order_end'"
+msgid ""
+"%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1244
+#: locale/programs/ld-collate.c:1257
 #, 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:518
+#: locale/programs/ld-address.c:588 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:1179
+#: locale/programs/ld-collate.c:878 locale/programs/ld-collate.c:2599
+#: locale/programs/ld-collate.c:3747 locale/programs/ld-ctype.c:1841
+#: locale/programs/ld-ctype.c:2099 locale/programs/ld-ctype.c:2675
+#: locale/programs/ld-ctype.c:2857 locale/programs/ld-identification.c:455
+#: locale/programs/ld-measurement.c:244 locale/programs/ld-messages.c:338
+#: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:312
+#: locale/programs/ld-numeric.c:382 locale/programs/ld-paper.c:245
+#: locale/programs/ld-telephone.c:320 locale/programs/ld-time.c:1206
 #, c-format
 msgid "%s: syntax error"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2178
+#: locale/programs/ld-ctype.c:2180
 #, c-format
 msgid "%s: syntax error in definition of new character class"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2193
+#: locale/programs/ld-ctype.c:2195
 #, c-format
 msgid "%s: syntax error in definition of new character map"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3735
+#: locale/programs/ld-ctype.c:3737
 #, c-format
 msgid "%s: table for class \"%s\": %lu bytes\n"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3803
+#: locale/programs/ld-ctype.c:3805
 #, c-format
 msgid "%s: table for map \"%s\": %lu bytes\n"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3935
+#: locale/programs/ld-ctype.c:3937
 #, c-format
 msgid "%s: table for width: %lu bytes\n"
 msgstr ""
@@ -874,16 +889,21 @@ msgstr ""
 msgid "%s: terminology language code `%s' not defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1054
+#: locale/programs/ld-collate.c:1067
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr ""
 
-#: locale/programs/ld-time.c:464
+#: locale/programs/ld-time.c:485
 #, c-format
 msgid "%s: third operand for value of field `%s' must not be larger than %d"
 msgstr ""
 
+#: locale/programs/ld-time.c:983
+#, c-format
+msgid "%s: too few values for field `%s'"
+msgstr ""
+
 #: locale/programs/ld-collate.c:555
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
@@ -894,7 +914,12 @@ msgstr ""
 msgid "%s: too many values"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3639
+#: locale/programs/ld-time.c:1030
+#, c-format
+msgid "%s: too many values for field `%s'"
+msgstr ""
+
+#: locale/programs/ld-ctype.c:3641
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
 msgstr ""
@@ -904,47 +929,52 @@ msgstr ""
 msgid "%s: unable to open %s: %m\n"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2849
+#: locale/programs/ld-collate.c:2868
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2981
+#: locale/programs/ld-collate.c:3000
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2994
+#: locale/programs/ld-collate.c:3013
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr ""
 
-#: locale/programs/ld-time.c:1040
+#: locale/programs/ld-address.c:493 locale/programs/ld-address.c:531
+#: locale/programs/ld-identification.c:364 locale/programs/ld-messages.c:310
+#: locale/programs/ld-monetary.c:698 locale/programs/ld-monetary.c:733
+#: locale/programs/ld-name.c:282 locale/programs/ld-numeric.c:267
+#: locale/programs/ld-telephone.c:292 locale/programs/ld-time.c:999
+#: locale/programs/ld-time.c:1067 locale/programs/ld-time.c:1109
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3091
+#: locale/programs/ld-collate.c:3110
 #, c-format
 msgid "%s: unknown section name `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3004
+#: locale/programs/ld-collate.c:3023
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr ""
 
-#: posix/getopt.c:769
+#: posix/getopt.c:762
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: posix/getopt.c:765
+#: posix/getopt.c:758
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: timezone/zic.c:443
+#: timezone/zic.c:449
 #, c-format
 msgid ""
 "%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
@@ -956,6 +986,16 @@ msgstr ""
 msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr ""
 
+#: locale/programs/ld-monetary.c:740 locale/programs/ld-numeric.c:274
+#, c-format
+msgid "%s: value for field `%s' must be a single character"
+msgstr ""
+
+#: locale/programs/ld-monetary.c:308
+#, c-format
+msgid "%s: value for field `%s' must be in range %d...%d"
+msgstr ""
+
 #: locale/programs/ld-messages.c:121 locale/programs/ld-messages.c:154
 #, c-format
 msgid "%s: value for field `%s' must not be an empty string"
@@ -978,17 +1018,17 @@ msgstr ""
 msgid "%s: value of field `int_curr_symbol' has wrong length"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:857 locale/programs/ld-numeric.c:334
+#: locale/programs/ld-monetary.c:859 locale/programs/ld-numeric.c:339
 #, c-format
 msgid "%s: values for field `%s' must be smaller than 127"
 msgstr ""
 
-#: locale/programs/ld-time.c:488
+#: locale/programs/ld-time.c:509
 #, c-format
 msgid "%s: values for field `%s' must not be larger than %d"
 msgstr ""
 
-#: locale/programs/ld-time.c:472 locale/programs/ld-time.c:480
+#: locale/programs/ld-time.c:493 locale/programs/ld-time.c:501
 #, c-format
 msgid "%s: values of field `%s' must not be larger than %d"
 msgstr ""
@@ -1011,11 +1051,11 @@ msgstr ""
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr ""
 
-#: nis/nis_print.c:130
+#: nis/nis_print.c:133
 msgid "(Unknown object)\n"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:125
+#: sunrpc/clnt_perr.c:132
 #, c-format
 msgid "(unknown authentication error - %d)"
 msgstr ""
@@ -1033,6 +1073,11 @@ msgstr ""
 msgid "*standard input*"
 msgstr ""
 
+#: elf/cache.c:105
+#, c-format
+msgid ", OS ABI: %s %d.%d.%d"
+msgstr ""
+
 #: catgets/gencat.c:125
 msgid ""
 "-o OUTPUT-FILE [INPUT-FILE]...\n"
@@ -1044,16 +1089,16 @@ msgstr ""
 msgid ".lib section in a.out corrupted"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:111 sunrpc/clnt_perr.c:132
+#: sunrpc/clnt_perr.c:118 sunrpc/clnt_perr.c:139
 #, c-format
 msgid "; low version = %lu, high version = %lu"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:118
+#: sunrpc/clnt_perr.c:125
 msgid "; why = "
 msgstr ""
 
-#: locale/programs/charmap.c:999
+#: locale/programs/charmap.c:1004
 #, c-format
 msgid "<%s> and <%s> are illegal names for range"
 msgstr ""
@@ -1063,12 +1108,12 @@ msgstr ""
 msgid "<%s> and <%s> are invalid names for range"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:565 locale/programs/ld-ctype.c:600
+#: locale/programs/ld-ctype.c:573 locale/programs/ld-ctype.c:608
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:553 locale/programs/ld-ctype.c:589
+#: locale/programs/ld-ctype.c:561 locale/programs/ld-ctype.c:597
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr ""
@@ -1084,7 +1129,7 @@ msgstr ""
 msgid "Aborted"
 msgstr ""
 
-#: nis/nis_print.c:321
+#: nis/nis_print.c:324
 msgid "Access Rights : "
 msgstr ""
 
@@ -1122,6 +1167,10 @@ msgstr ""
 msgid "Alarm clock"
 msgstr ""
 
+#: posix/../sysdeps/posix/gai_strerror.c:45
+msgid "All requests done"
+msgstr ""
+
 #: malloc/memusagestat.c:57
 msgid "Also draw graph for total memory consumption"
 msgstr ""
@@ -1130,7 +1179,7 @@ msgstr ""
 msgid "Anode table overflow"
 msgstr ""
 
-#: intl/tst-gettext2.c:37
+#: intl/tst-gettext2.c:38
 msgid "Another string for testing."
 msgstr ""
 
@@ -1162,7 +1211,7 @@ msgstr ""
 msgid "Attempting to link in too many shared libraries"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:329
+#: sunrpc/clnt_perr.c:338
 msgid "Authentication OK"
 msgstr ""
 
@@ -1171,7 +1220,7 @@ msgstr ""
 msgid "Authentication error"
 msgstr ""
 
-#: nis/nis_print.c:106
+#: nis/nis_print.c:109
 msgid "BOGUS OBJECT\n"
 msgstr ""
 
@@ -1226,7 +1275,7 @@ msgstr ""
 msgid "Be strictly POSIX conform"
 msgstr ""
 
-#: nis/nis_print.c:302
+#: nis/nis_print.c:305
 msgid "Binary data\n"
 msgstr ""
 
@@ -1258,10 +1307,6 @@ msgstr ""
 msgid "Bus error"
 msgstr ""
 
-#: nis/nis_print.c:46
-msgid "CDS"
-msgstr ""
-
 #: stdio-common/../sysdeps/unix/siglist.c:50 sysdeps/generic/siglist.h:50
 msgid "CPU time limit exceeded"
 msgstr ""
@@ -1279,77 +1324,82 @@ msgstr ""
 msgid "Can not exec a shared library directly"
 msgstr ""
 
-#: nis/ypclnt.c:792
+#: nis/ypclnt.c:794
 msgid "Can't bind to server which serves this domain"
 msgstr ""
 
-#: elf/ldconfig.c:934
+#: elf/ldconfig.c:1008
 msgid "Can't chdir to /"
 msgstr ""
 
-#: nis/ypclnt.c:804
+#: nis/ypclnt.c:806
 msgid "Can't communicate with portmapper"
 msgstr ""
 
-#: nis/ypclnt.c:806
+#: nis/ypclnt.c:808
 msgid "Can't communicate with ypbind"
 msgstr ""
 
-#: nis/ypclnt.c:808
+#: nis/ypclnt.c:810
 msgid "Can't communicate with ypserv"
 msgstr ""
 
-#: elf/cache.c:359
+#: elf/cache.c:394
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr ""
 
-#: elf/ldconfig.c:502
+#: elf/ldconfig.c:512
 #, c-format
 msgid "Can't find %s"
 msgstr ""
 
-#: elf/ldconfig.c:440
+#: elf/ldconfig.c:449
 #, c-format
 msgid "Can't link %s to %s"
 msgstr ""
 
-#: elf/ldconfig.c:518 elf/ldconfig.c:672
+#: elf/ldconfig.c:528
 #, c-format
 msgid "Can't lstat %s"
 msgstr ""
 
-#: elf/cache.c:108 elf/ldconfig.c:955
+#: elf/cache.c:131 elf/ldconfig.c:1029
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr ""
 
-#: elf/ldconfig.c:976
+#: elf/ldconfig.c:1050
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr ""
 
-#: elf/ldconfig.c:865
+#: elf/ldconfig.c:924
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr ""
 
-#: elf/ldconfig.c:621
+#: elf/ldconfig.c:634
 #, c-format
 msgid "Can't open directory %s"
 msgstr ""
 
-#: elf/cache.c:353
+#: elf/cache.c:387
 #, c-format
 msgid "Can't remove old temporary cache file %s"
 msgstr ""
 
-#: elf/ldconfig.c:405
+#: elf/ldconfig.c:344
+#, c-format
+msgid "Can't stat %s"
+msgstr ""
+
+#: elf/ldconfig.c:414
 #, c-format
 msgid "Can't stat %s\n"
 msgstr ""
 
-#: elf/ldconfig.c:434
+#: elf/ldconfig.c:443
 #, c-format
 msgid "Can't unlink %s"
 msgstr ""
@@ -1376,16 +1426,21 @@ msgstr ""
 msgid "Cannot exec a shared library directly"
 msgstr ""
 
-#: elf/readlib.c:98
+#: elf/readlib.c:99
 #, c-format
 msgid "Cannot fstat file %s.\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1415
+#: sunrpc/rpc_main.c:1417
 msgid "Cannot have more than one file generation flag!\n"
 msgstr ""
 
-#: elf/readlib.c:117
+#: elf/ldconfig.c:689 elf/ldconfig.c:732
+#, c-format
+msgid "Cannot lstat %s"
+msgstr ""
+
+#: elf/readlib.c:118
 #, c-format
 msgid "Cannot mmap file %s.\n"
 msgstr ""
@@ -1419,25 +1474,30 @@ msgstr ""
 msgid "Cannot specify more than one input file!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1372
+#: elf/ldconfig.c:701
+#, c-format
+msgid "Cannot stat %s"
+msgstr ""
+
+#: sunrpc/rpc_main.c:1374
 msgid "Cannot use netid flag with inetd flag!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1384
+#: sunrpc/rpc_main.c:1386
 msgid "Cannot use netid flag without TIRPC!\n"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1391
+#: sunrpc/rpc_main.c:1393
 msgid "Cannot use table flags with newstyle!\n"
 msgstr ""
 
-#: elf/ldconfig.c:131
+#: elf/ldconfig.c:126
 msgid "Change to and use ROOT as root directory"
 msgstr ""
 
-#: elf/cache.c:390
+#: elf/cache.c:426
 #, c-format
-msgid "Changing access rights of %s to 0644 failed"
+msgid "Changing access rights of %s to %#o failed"
 msgstr ""
 
 #: stdio-common/../sysdeps/gnu/errlist.c:689
@@ -1445,7 +1505,7 @@ msgstr ""
 msgid "Channel number out of range"
 msgstr ""
 
-#: nis/nis_print.c:265
+#: nis/nis_print.c:268
 #, c-format
 msgid "Character Separator : %c\n"
 msgstr ""
@@ -1454,11 +1514,11 @@ msgstr ""
 msgid "Child exited"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:348
+#: sunrpc/clnt_perr.c:357
 msgid "Client credential too weak"
 msgstr ""
 
-#: nis/nis_print.c:267
+#: nis/nis_print.c:270
 msgid "Columns             :\n"
 msgstr ""
 
@@ -1476,7 +1536,7 @@ msgstr ""
 msgid "Computer bought the farm"
 msgstr ""
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:136
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr ""
 
@@ -1506,14 +1566,14 @@ msgstr ""
 msgid "Continued"
 msgstr ""
 
-#: iconv/iconv_prog.c:69
+#: iconv/iconv_prog.c:73
 msgid "Convert encoding of given files from one encoding to another."
 msgstr ""
 
-#: catgets/gencat.c:246 elf/ldconfig.c:264 elf/sprof.c:355
-#: iconv/iconv_prog.c:351 locale/programs/locale.c:269
+#: catgets/gencat.c:246 elf/ldconfig.c:259 elf/sprof.c:355
+#: iconv/iconv_prog.c:393 iconv/iconvconfig.c:335 locale/programs/locale.c:281
 #: locale/programs/localedef.c:311 nscd/nscd.c:287 nscd/nscd_nischeck.c:90
-#: nss/getent.c:63 posix/getconf.c:751
+#: nss/getent.c:63 posix/getconf.c:904
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -1530,6 +1590,10 @@ msgstr ""
 msgid "Create C header file NAME containing symbol definitions"
 msgstr ""
 
+#: iconv/iconvconfig.c:110
+msgid "Create fastloading iconv module configuration file."
+msgstr ""
+
 #: locale/programs/localedef.c:102
 msgid "Create old-style tables"
 msgstr ""
@@ -1538,7 +1602,7 @@ msgstr ""
 msgid "Create output even if warning messages were issued"
 msgstr ""
 
-#: nis/nis_print.c:326
+#: nis/nis_print.c:329
 #, c-format
 msgid "Creation Time : %s"
 msgstr ""
@@ -1557,19 +1621,11 @@ msgstr ""
 msgid "DES entry for netname %s not unique\n"
 msgstr ""
 
-#: nis/nis_print.c:112
+#: nis/nis_print.c:115
 msgid "DIRECTORY\n"
 msgstr ""
 
-#: nis/nis_print.c:42
-msgid "DNANS"
-msgstr ""
-
-#: nis/nis_print.c:38
-msgid "DNS"
-msgstr ""
-
-#: elf/dl-open.c:189
+#: elf/dl-deps.c:101 elf/dl-open.c:188
 msgid "DST not allowed in SUID/SGID programs"
 msgstr ""
 
@@ -1581,7 +1637,7 @@ msgstr ""
 msgid "Database for table does not exist"
 msgstr ""
 
-#: nis/ypclnt.c:818
+#: nis/ypclnt.c:820
 msgid "Database is busy"
 msgstr ""
 
@@ -1589,7 +1645,7 @@ msgstr ""
 msgid "Deadlock situation detected/avoided"
 msgstr ""
 
-#: nis/nis_print.c:226
+#: nis/nis_print.c:229
 msgid "Default Access rights :\n"
 msgstr ""
 
@@ -1616,12 +1672,12 @@ msgstr ""
 msgid "Device or resource busy"
 msgstr ""
 
-#: nis/nis_print.c:180
+#: nis/nis_print.c:183
 #, c-format
 msgid "Diffie-Hellmann (%d bits)\n"
 msgstr ""
 
-#: nis/nis_print.c:318
+#: nis/nis_print.c:321
 #, c-format
 msgid "Directory     : %s\n"
 msgstr ""
@@ -1650,15 +1706,15 @@ msgstr ""
 msgid "Do not use existing catalog, force new output file"
 msgstr ""
 
-#: nis/ypclnt.c:864
+#: nis/ypclnt.c:866
 msgid "Domain not bound"
 msgstr ""
 
-#: elf/ldconfig.c:129
+#: elf/ldconfig.c:124
 msgid "Don't build cache"
 msgstr ""
 
-#: elf/ldconfig.c:130
+#: elf/ldconfig.c:125
 msgid "Don't generate links"
 msgstr ""
 
@@ -1666,31 +1722,31 @@ msgstr ""
 msgid "Dump information generated by PC profiling."
 msgstr ""
 
-#: elf/dl-load.c:1290
+#: elf/dl-load.c:1293
 msgid "ELF file ABI version invalid"
 msgstr ""
 
-#: elf/dl-load.c:1287
+#: elf/dl-load.c:1290
 msgid "ELF file OS ABI invalid"
 msgstr ""
 
-#: elf/dl-load.c:1296
+#: elf/dl-load.c:1299
 msgid "ELF file version does not match current one"
 msgstr ""
 
-#: elf/dl-load.c:1283
+#: elf/dl-load.c:1286
 msgid "ELF file version ident does not match current one"
 msgstr ""
 
-#: elf/dl-load.c:1307
+#: elf/dl-load.c:1305
 msgid "ELF file's phentsize not the expected size"
 msgstr ""
 
-#: elf/dl-load.c:876
+#: elf/dl-load.c:884
 msgid "ELF load command address/offset not properly aligned"
 msgstr ""
 
-#: elf/dl-load.c:873
+#: elf/dl-load.c:881
 msgid "ELF load command alignment not page-aligned"
 msgstr ""
 
@@ -1698,11 +1754,11 @@ msgstr ""
 msgid "EMT trap"
 msgstr ""
 
-#: nis/nis_print.c:121
+#: nis/nis_print.c:124
 msgid "ENTRY\n"
 msgstr ""
 
-#: nis/nis_print.c:300
+#: nis/nis_print.c:303
 msgid "Encrypted data\n"
 msgstr ""
 
@@ -1856,7 +1912,11 @@ msgstr ""
 msgid "Error while talking to callback proc"
 msgstr ""
 
-#: inet/ruserpass.c:181
+#: timezone/zdump.c:268
+msgid "Error writing standard output"
+msgstr ""
+
+#: inet/ruserpass.c:184
 msgid "Error: .netrc file is readable by others."
 msgstr ""
 
@@ -1879,7 +1939,7 @@ msgstr ""
 msgid "FILE contains mapping from symbolic names to UCS4 values"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:356
+#: sunrpc/clnt_perr.c:365
 msgid "Failed (unspecified error)"
 msgstr ""
 
@@ -1888,7 +1948,7 @@ msgstr ""
 msgid "Failed to look up user '%s' to run server as"
 msgstr ""
 
-#: elf/readlib.c:108
+#: elf/readlib.c:109
 #, c-format
 msgid "File %s is too small, not checked."
 msgstr ""
@@ -1905,7 +1965,7 @@ msgstr ""
 msgid "File exists"
 msgstr ""
 
-#: elf/cache.c:124 elf/cache.c:134
+#: elf/cache.c:147 elf/cache.c:157
 msgid "File is not a cache file.\n"
 msgstr ""
 
@@ -1939,7 +1999,7 @@ msgstr ""
 msgid "File too large"
 msgstr ""
 
-#: intl/tst-gettext2.c:36
+#: intl/tst-gettext2.c:37
 msgid "First string for testing."
 msgstr ""
 
@@ -1951,7 +2011,7 @@ msgstr ""
 msgid "Floating point exception"
 msgstr ""
 
-#: elf/ldconfig.c:136
+#: elf/ldconfig.c:131
 msgid "Format to use: new, old or compat (default)"
 msgstr ""
 
@@ -1968,7 +2028,7 @@ msgstr ""
 msgid "Function not implemented"
 msgstr ""
 
-#: nis/nis_print.c:115
+#: nis/nis_print.c:118
 msgid "GROUP\n"
 msgstr ""
 
@@ -1994,7 +2054,7 @@ msgid ""
 "calls)"
 msgstr ""
 
-#: elf/ldconfig.c:128
+#: elf/ldconfig.c:123
 msgid "Generate verbose messages"
 msgstr ""
 
@@ -2002,7 +2062,7 @@ msgstr ""
 msgid "Generic system error"
 msgstr ""
 
-#: locale/programs/locale.c:77
+#: locale/programs/locale.c:86
 msgid "Get locale-specific information."
 msgstr ""
 
@@ -2019,12 +2079,12 @@ msgstr ""
 msgid "Gratuitous error"
 msgstr ""
 
-#: nis/nis_print.c:320
+#: nis/nis_print.c:323
 #, c-format
 msgid "Group         : %s\n"
 msgstr ""
 
-#: nis/nis_print.c:249
+#: nis/nis_print.c:252
 msgid "Group Flags :"
 msgstr ""
 
@@ -2089,16 +2149,12 @@ msgstr ""
 msgid "IOT trap"
 msgstr ""
 
-#: nis/nis_print.c:36
-msgid "IVY"
-msgstr ""
-
 #: stdio-common/../sysdeps/gnu/errlist.c:645
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:66
 msgid "Identifier removed"
 msgstr ""
 
-#: elf/ldconfig.c:525
+#: elf/ldconfig.c:535
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr ""
@@ -2151,7 +2207,7 @@ msgstr ""
 msgid "Information request"
 msgstr ""
 
-#: iconv/iconv_prog.c:58
+#: iconv/iconv_prog.c:62
 msgid "Information:"
 msgstr ""
 
@@ -2159,12 +2215,12 @@ msgstr ""
 msgid "Input Files:"
 msgstr ""
 
-#: elf/ldconfig.c:698 elf/readlib.c:92
+#: elf/ldconfig.c:754 elf/readlib.c:93
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr ""
 
-#: iconv/iconv_prog.c:55
+#: iconv/iconv_prog.c:59
 msgid "Input/Output format specification:"
 msgstr ""
 
@@ -2173,11 +2229,11 @@ msgstr ""
 msgid "Input/output error"
 msgstr ""
 
-#: nis/ypclnt.c:798
+#: nis/ypclnt.c:800
 msgid "Internal NIS error"
 msgstr ""
 
-#: nis/ypclnt.c:862
+#: nis/ypclnt.c:864
 msgid "Internal ypbind error"
 msgstr ""
 
@@ -2185,6 +2241,10 @@ msgstr ""
 msgid "Interrupt"
 msgstr ""
 
+#: posix/../sysdeps/posix/gai_strerror.c:46
+msgid "Interrupted by a signal"
+msgstr ""
+
 #. TRANS Interrupted function call; an asynchronous signal occurred and prevented
 #. TRANS completion of the call.  When this happens, you should try the call
 #. TRANS again.
@@ -2208,27 +2268,27 @@ msgstr ""
 msgid "Invalid argument"
 msgstr ""
 
-#: posix/regex.c:1102
+#: posix/regex.c:1380
 msgid "Invalid back reference"
 msgstr ""
 
-#: posix/regex.c:1096
+#: posix/regex.c:1374
 msgid "Invalid character class name"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:332
+#: sunrpc/clnt_perr.c:341
 msgid "Invalid client credential"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:340
+#: sunrpc/clnt_perr.c:349
 msgid "Invalid client verifier"
 msgstr ""
 
-#: posix/regex.c:1093
+#: posix/regex.c:1371
 msgid "Invalid collation character"
 msgstr ""
 
-#: posix/regex.c:1114
+#: posix/regex.c:1392
 msgid "Invalid content of \\{\\}"
 msgstr ""
 
@@ -2253,15 +2313,15 @@ msgstr ""
 msgid "Invalid or incomplete multibyte or wide character"
 msgstr ""
 
-#: posix/regex.c:1123
+#: posix/regex.c:1401
 msgid "Invalid preceding regular expression"
 msgstr ""
 
-#: posix/regex.c:1117
+#: posix/regex.c:1395
 msgid "Invalid range end"
 msgstr ""
 
-#: posix/regex.c:1090
+#: posix/regex.c:1368
 msgid "Invalid regular expression"
 msgstr ""
 
@@ -2273,7 +2333,7 @@ msgstr ""
 msgid "Invalid request descriptor"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:352
+#: sunrpc/clnt_perr.c:361
 msgid "Invalid server verifier"
 msgstr ""
 
@@ -2301,7 +2361,7 @@ msgstr ""
 msgid "Is a named type file"
 msgstr ""
 
-#: nis/nis_print.c:188
+#: nis/nis_print.c:191
 msgid "Kerberos.\n"
 msgstr ""
 
@@ -2309,7 +2369,7 @@ msgstr ""
 msgid "Killed"
 msgstr ""
 
-#: nis/nis_print.c:124
+#: nis/nis_print.c:127
 msgid "LINK\n"
 msgstr ""
 
@@ -2352,20 +2412,20 @@ msgstr ""
 msgid "Link points to illegal name"
 msgstr ""
 
-#: nis/nis_print.c:283
+#: nis/nis_print.c:286
 msgid "Linked Object Type : "
 msgstr ""
 
-#: nis/nis_print.c:285
+#: nis/nis_print.c:288
 #, c-format
 msgid "Linked to : %s\n"
 msgstr ""
 
-#: nis/ypclnt.c:810
+#: nis/ypclnt.c:812
 msgid "Local domain name not set"
 msgstr ""
 
-#: nis/ypclnt.c:800
+#: nis/ypclnt.c:802
 msgid "Local resource allocation failure"
 msgstr ""
 
@@ -2384,11 +2444,11 @@ msgid ""
 "optional for any corresponding short options."
 msgstr ""
 
-#: elf/ldconfig.c:135
+#: elf/ldconfig.c:130
 msgid "Manually link individual libraries."
 msgstr ""
 
-#: nis/nis_print.c:169
+#: nis/nis_print.c:172
 msgid "Master Server :\n"
 msgstr ""
 
@@ -2400,7 +2460,7 @@ msgstr ""
 msgid "Memory allocation failure"
 msgstr ""
 
-#: posix/regex.c:1120
+#: posix/regex.c:1398
 msgid "Memory exhausted"
 msgstr ""
 
@@ -2419,7 +2479,7 @@ msgstr ""
 msgid "Missing or malformed attribute"
 msgstr ""
 
-#: nis/nis_print.c:328
+#: nis/nis_print.c:331
 #, c-format
 msgid "Mod. Time     : %s"
 msgstr ""
@@ -2432,7 +2492,7 @@ msgstr ""
 msgid "Modify operation failed"
 msgstr ""
 
-#: locale/programs/locale.c:70
+#: locale/programs/locale.c:78
 msgid "Modify output format:"
 msgstr ""
 
@@ -2450,21 +2510,17 @@ msgstr ""
 msgid "NAME"
 msgstr ""
 
-#: locale/programs/locale.c:80
+#: locale/programs/locale.c:89
 msgid ""
 "NAME\n"
 "[-a|-m]"
 msgstr ""
 
-#: nis/nis_print.c:32
-msgid "NIS"
-msgstr ""
-
-#: nis/ypclnt.c:814
+#: nis/ypclnt.c:816
 msgid "NIS client/server version mismatch - can't supply service"
 msgstr ""
 
-#: nis/ypclnt.c:812
+#: nis/ypclnt.c:814
 msgid "NIS map database is bad"
 msgstr ""
 
@@ -2480,7 +2536,7 @@ msgstr ""
 msgid "NIS+ service is unavailable or not installed"
 msgstr ""
 
-#: nis/nis_print.c:109
+#: nis/nis_print.c:112
 msgid "NO OBJECT\n"
 msgstr ""
 
@@ -2488,7 +2544,7 @@ msgstr ""
 msgid "NUMBER"
 msgstr ""
 
-#: nis/nis_print.c:163
+#: nis/nis_print.c:166
 #, c-format
 msgid "Name : `%s'\n"
 msgstr ""
@@ -2578,7 +2634,7 @@ msgstr ""
 msgid "No buffer space available"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:425
+#: locale/programs/ld-ctype.c:433
 msgid "No character set name specified in charmap"
 msgstr ""
 
@@ -2595,8 +2651,8 @@ msgstr ""
 msgid "No data available"
 msgstr ""
 
-#: 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-address.c:131 locale/programs/ld-collate.c:1513
+#: locale/programs/ld-ctype.c:415 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
@@ -2609,7 +2665,7 @@ msgstr ""
 msgid "No file space on server"
 msgstr ""
 
-#: elf/ldconfig.c:532
+#: elf/ldconfig.c:543
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr ""
@@ -2622,7 +2678,7 @@ msgstr ""
 msgid "No locks available"
 msgstr ""
 
-#: posix/regex.c:1087
+#: posix/regex.c:1365
 msgid "No match"
 msgstr ""
 
@@ -2635,11 +2691,11 @@ msgstr ""
 msgid "No message of desired type"
 msgstr ""
 
-#: nis/ypclnt.c:802
+#: nis/ypclnt.c:804
 msgid "No more records in map database"
 msgstr ""
 
-#: posix/regex.c:5955
+#: posix/regex.c:7919
 msgid "No previous regular expression"
 msgstr ""
 
@@ -2689,11 +2745,11 @@ msgstr ""
 msgid "No such file or directory"
 msgstr ""
 
-#: nis/ypclnt.c:796
+#: nis/ypclnt.c:798
 msgid "No such key in map"
 msgstr ""
 
-#: nis/ypclnt.c:794
+#: nis/ypclnt.c:796
 msgid "No such map in server's domain"
 msgstr ""
 
@@ -2711,7 +2767,7 @@ msgstr ""
 msgid "Non-recoverable failure in name resolution"
 msgstr ""
 
-#: nis/nis_print.c:177
+#: nis/nis_print.c:180
 msgid "None.\n"
 msgstr ""
 
@@ -2778,12 +2834,12 @@ msgstr ""
 msgid "Not supported"
 msgstr ""
 
-#: nis/nis_print.c:264
+#: nis/nis_print.c:267
 #, c-format
 msgid "Number of Columns   : %d\n"
 msgstr ""
 
-#: nis/nis_print.c:363
+#: nis/nis_print.c:366
 #, c-format
 msgid "Number of objects : %u\n"
 msgstr ""
@@ -2806,17 +2862,17 @@ msgstr ""
 msgid "Numerical result out of range"
 msgstr ""
 
-#: nis/nis_print.c:367
+#: nis/nis_print.c:370
 #, c-format
 msgid "Object #%d:\n"
 msgstr ""
 
-#: nis/nis_print.c:317
+#: nis/nis_print.c:320
 #, c-format
 msgid "Object Name   : %s\n"
 msgstr ""
 
-#: nis/nis_print.c:329
+#: nis/nis_print.c:332
 msgid "Object Type   : "
 msgstr ""
 
@@ -2833,11 +2889,11 @@ msgstr ""
 msgid "Object with same name exists"
 msgstr ""
 
-#: timezone/zic.c:2022
+#: timezone/zic.c:2028
 msgid "Odd number of quotation marks"
 msgstr ""
 
-#: elf/ldconfig.c:134
+#: elf/ldconfig.c:129
 msgid ""
 "Only process directories specified on the command line.  Don't build cache."
 msgstr ""
@@ -2920,7 +2976,7 @@ msgstr ""
 msgid "Out of streams resources"
 msgstr ""
 
-#: iconv/iconv_prog.c:60 locale/programs/localedef.c:99
+#: iconv/iconv_prog.c:64 locale/programs/localedef.c:99
 msgid "Output control:"
 msgstr ""
 
@@ -2928,12 +2984,12 @@ msgstr ""
 msgid "Output selection:"
 msgstr ""
 
-#: nis/nis_print.c:319
+#: nis/nis_print.c:322
 #, c-format
 msgid "Owner         : %s\n"
 msgstr ""
 
-#: nis/nis_print.c:127
+#: nis/nis_print.c:130
 msgid "PRIVATE\n"
 msgstr ""
 
@@ -2955,13 +3011,13 @@ msgstr ""
 msgid "Passed object is not the same object on server"
 msgstr ""
 
-#: elf/ldconfig.c:287
+#: elf/ldconfig.c:282
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr ""
 
 #. TRANS Permission denied; the file permissions do not allow the attempted operation.
-#: nis/nis_error.c:39 nis/ypclnt.c:816
+#: nis/nis_error.c:39 nis/ypclnt.c:818
 #: stdio-common/../sysdeps/gnu/errlist.c:109
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:43
 msgid "Permission denied"
@@ -2971,11 +3027,11 @@ msgstr ""
 msgid "Power failure"
 msgstr ""
 
-#: posix/regex.c:1126
+#: posix/regex.c:1404
 msgid "Premature end of regular expression"
 msgstr ""
 
-#: elf/ldconfig.c:127
+#: elf/ldconfig.c:122
 msgid "Print cache"
 msgstr ""
 
@@ -2983,6 +3039,10 @@ msgstr ""
 msgid "Print current configuration statistic"
 msgstr ""
 
+#: locale/programs/locale.c:81
+msgid "Print more information"
+msgstr ""
+
 #: locale/programs/localedef.c:107
 msgid "Print more messages"
 msgstr ""
@@ -2999,6 +3059,10 @@ msgstr ""
 msgid "Probably not found"
 msgstr ""
 
+#: posix/../sysdeps/posix/gai_strerror.c:42
+msgid "Processing request in progress"
+msgstr ""
+
 #: stdio-common/../sysdeps/unix/siglist.c:53 sysdeps/generic/siglist.h:53
 msgid "Profiling timer expired"
 msgstr ""
@@ -3056,7 +3120,7 @@ msgstr ""
 msgid "RPC bad procedure for program"
 msgstr ""
 
-#: nis/ypclnt.c:790
+#: nis/ypclnt.c:792
 msgid "RPC failure on NIS operation"
 msgstr ""
 
@@ -3080,88 +3144,88 @@ msgstr ""
 msgid "RPC version wrong"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:271
+#: sunrpc/clnt_perr.c:278
 msgid "RPC: (unknown error code)"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:190
+#: sunrpc/clnt_perr.c:197
 msgid "RPC: Authentication error"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:170
+#: sunrpc/clnt_perr.c:177
 msgid "RPC: Can't decode result"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:166
+#: sunrpc/clnt_perr.c:173
 msgid "RPC: Can't encode arguments"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:230
+#: sunrpc/clnt_perr.c:237
 msgid "RPC: Failed (unspecified error)"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:186
+#: sunrpc/clnt_perr.c:193
 msgid "RPC: Incompatible versions of RPC"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:222
+#: sunrpc/clnt_perr.c:229
 msgid "RPC: Port mapper failure"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:202
+#: sunrpc/clnt_perr.c:209
 msgid "RPC: Procedure unavailable"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:226
+#: sunrpc/clnt_perr.c:233
 msgid "RPC: Program not registered"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:194
+#: sunrpc/clnt_perr.c:201
 msgid "RPC: Program unavailable"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:198
+#: sunrpc/clnt_perr.c:205
 msgid "RPC: Program/version mismatch"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:210
+#: sunrpc/clnt_perr.c:217
 msgid "RPC: Remote system error"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:206
+#: sunrpc/clnt_perr.c:213
 msgid "RPC: Server can't decode arguments"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:163
+#: sunrpc/clnt_perr.c:170
 msgid "RPC: Success"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:182
+#: sunrpc/clnt_perr.c:189
 msgid "RPC: Timed out"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:178
+#: sunrpc/clnt_perr.c:185
 msgid "RPC: Unable to receive"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:174
+#: sunrpc/clnt_perr.c:181
 msgid "RPC: Unable to send"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:214
+#: sunrpc/clnt_perr.c:221
 msgid "RPC: Unknown host"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:218
+#: sunrpc/clnt_perr.c:225
 msgid "RPC: Unknown protocol"
 msgstr ""
 
-#: nis/nis_print.c:185
+#: nis/nis_print.c:188
 #, c-format
 msgid "RSA (%d bits)\n"
 msgstr ""
 
-#: elf/dl-sym.c:68 elf/dl-sym.c:125
+#: elf/dl-sym.c:72 elf/dl-sym.c:134
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr ""
 
@@ -3184,7 +3248,7 @@ msgstr ""
 msgid "Real-time signal %d"
 msgstr ""
 
-#: posix/regex.c:1129
+#: posix/regex.c:1407
 msgid "Regular expression too big"
 msgstr ""
 
@@ -3198,11 +3262,11 @@ msgstr ""
 msgid "Remote address changed"
 msgstr ""
 
-#: inet/ruserpass.c:182
+#: inet/ruserpass.c:185
 msgid "Remove password or make file unreadable by others."
 msgstr ""
 
-#: elf/cache.c:394
+#: elf/cache.c:431
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr ""
@@ -3212,7 +3276,7 @@ msgstr ""
 msgid "Reopening shared object `%s' failed"
 msgstr ""
 
-#: nis/nis_print.c:171
+#: nis/nis_print.c:174
 msgid "Replicate :\n"
 msgstr ""
 
@@ -3221,16 +3285,24 @@ msgstr ""
 msgid "Report bugs to %s.\n"
 msgstr ""
 
-#: 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
+#: catgets/gencat.c:233 debug/pcprofiledump.c:181 iconv/iconv_prog.c:379
+#: iconv/iconvconfig.c:321 locale/programs/locale.c:268
+#: locale/programs/localedef.c:297 malloc/memusagestat.c:602
 msgid "Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"
 msgstr ""
 
-#: nis/ypclnt.c:788
+#: nis/ypclnt.c:790
 msgid "Request arguments bad"
 msgstr ""
 
+#: posix/../sysdeps/posix/gai_strerror.c:43
+msgid "Request canceled"
+msgstr ""
+
+#: posix/../sysdeps/posix/gai_strerror.c:44
+msgid "Request not canceled"
+msgstr ""
+
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:171
 msgid "Reserved for future use"
 msgstr ""
@@ -3301,11 +3373,7 @@ msgstr ""
 msgid "SHOBJ [PROFDATA]"
 msgstr ""
 
-#: nis/nis_print.c:34
-msgid "SUNYP"
-msgstr ""
-
-#: nis/nis_print.c:266
+#: nis/nis_print.c:269
 #, c-format
 msgid "Search Path         : %s\n"
 msgstr ""
@@ -3322,11 +3390,11 @@ msgstr ""
 msgid "Server out of memory"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:336
+#: sunrpc/clnt_perr.c:345
 msgid "Server rejected credential"
 msgstr ""
 
-#: sunrpc/clnt_perr.c:344
+#: sunrpc/clnt_perr.c:353
 msgid "Server rejected verifier"
 msgstr ""
 
@@ -3394,7 +3462,7 @@ msgstr ""
 msgid "Start NUMBER threads"
 msgstr ""
 
-#: nis/nis_print.c:362
+#: nis/nis_print.c:365
 #, c-format
 msgid "Status            : %s\n"
 msgstr ""
@@ -3424,7 +3492,7 @@ msgstr ""
 msgid "Structure needs cleaning"
 msgstr ""
 
-#: nis/nis_error.c:29 nis/ypclnt.c:786 nis/ypclnt.c:860 posix/regex.c:1084
+#: nis/nis_error.c:29 nis/ypclnt.c:788 nis/ypclnt.c:862 posix/regex.c:1362
 #: stdio-common/../sysdeps/gnu/errlist.c:20
 msgid "Success"
 msgstr ""
@@ -3445,11 +3513,11 @@ msgstr ""
 msgid "System error"
 msgstr ""
 
-#: locale/programs/locale.c:65
+#: locale/programs/locale.c:73
 msgid "System information:"
 msgstr ""
 
-#: nis/ypclnt.c:866
+#: nis/ypclnt.c:868
 msgid "System resource allocation failure"
 msgstr ""
 
@@ -3466,7 +3534,7 @@ msgstr ""
 msgid "TABLE"
 msgstr ""
 
-#: nis/nis_print.c:118
+#: nis/nis_print.c:121
 msgid "TABLE\n"
 msgstr ""
 
@@ -3474,7 +3542,7 @@ msgstr ""
 msgid "TABLE,yes"
 msgstr ""
 
-#: nis/nis_print.c:263
+#: nis/nis_print.c:266
 #, c-format
 msgid "Table Type          : %s\n"
 msgstr ""
@@ -3497,7 +3565,7 @@ msgstr ""
 msgid "Text file busy"
 msgstr ""
 
-#: iconv/iconv_prog.c:627
+#: iconv/iconv_prog.c:680
 msgid ""
 "The following list contain all the coded character sets known.  This does\n"
 "not necessarily mean that all combinations of these names can be used for\n"
@@ -3507,11 +3575,11 @@ msgid ""
 "  "
 msgstr ""
 
-#: sunrpc/rpc_main.c:1364
+#: sunrpc/rpc_main.c:1365
 msgid "This implementation doesn't support newstyle or MT-safe code!\n"
 msgstr ""
 
-#: nis/nis_print.c:224
+#: nis/nis_print.c:227
 msgid "Time to live : "
 msgstr ""
 
@@ -3585,7 +3653,7 @@ msgstr ""
 msgid "Trace/breakpoint trap"
 msgstr ""
 
-#: posix/regex.c:1099
+#: posix/regex.c:1377
 msgid "Trailing backslash"
 msgstr ""
 
@@ -3617,12 +3685,12 @@ msgstr ""
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr ""
 
-#: nis/nis_print.c:164
+#: nis/nis_print.c:167
 #, c-format
 msgid "Type : %s\n"
 msgstr ""
 
-#: nis/nis_print.c:48
+#: nis/nis_print.c:51
 msgid "UNKNOWN"
 msgstr ""
 
@@ -3642,31 +3710,35 @@ msgstr ""
 msgid "Unable to create process on server"
 msgstr ""
 
-#: nis/nis_print.c:191
+#: nis/nis_print.c:194
 #, c-format
 msgid "Unknown (type = %d, bits = %d)\n"
 msgstr ""
 
-#: inet/ruserpass.c:274
+#: inet/ruserpass.c:277
 #, c-format
 msgid "Unknown .netrc keyword %s"
 msgstr ""
 
-#: elf/../sysdeps/generic/readelflib.c:69
+#: elf/../sysdeps/generic/readelflib.c:71
 #, c-format
 msgid "Unknown ELFCLASS in file %s.\n"
 msgstr ""
 
-#: nis/ypclnt.c:820
+#: nis/ypclnt.c:822
 msgid "Unknown NIS error code"
 msgstr ""
 
+#: elf/cache.c:101
+msgid "Unknown OS"
+msgstr ""
+
 #: nss/getent.c:771
 #, c-format
 msgid "Unknown database: %s\n"
 msgstr ""
 
-#: posix/../sysdeps/posix/gai_strerror.c:52
+#: posix/../sysdeps/posix/gai_strerror.c:57
 msgid "Unknown error"
 msgstr ""
 
@@ -3702,31 +3774,31 @@ msgstr ""
 msgid "Unknown signal %d"
 msgstr ""
 
-#: misc/error.c:114 timezone/zic.c:384
+#: misc/error.c:113 timezone/zic.c:390
 msgid "Unknown system error"
 msgstr ""
 
-#: nis/ypclnt.c:868
+#: nis/ypclnt.c:870
 msgid "Unknown ypbind error"
 msgstr ""
 
-#: posix/regex.c:1108
+#: posix/regex.c:1386
 msgid "Unmatched ( or \\("
 msgstr ""
 
-#: posix/regex.c:1132
+#: posix/regex.c:1410
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: posix/regex.c:1105
+#: posix/regex.c:1383
 msgid "Unmatched [ or [^"
 msgstr ""
 
-#: posix/regex.c:1111
+#: posix/regex.c:1389
 msgid "Unmatched \\{"
 msgstr ""
 
-#: posix/getconf.c:819
+#: posix/getconf.c:1006
 #, c-format
 msgid "Unrecognized variable `%s'"
 msgstr ""
@@ -3739,20 +3811,20 @@ msgstr ""
 msgid "Usage:"
 msgstr ""
 
-#: posix/getconf.c:731
+#: posix/getconf.c:883
 #, c-format
-msgid "Usage: %s variable_name [pathname]\n"
+msgid "Usage: %s [-v specification] variable_name [pathname]\n"
 msgstr ""
 
 #: sunrpc/rpcinfo.c:674
 msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
 msgstr ""
 
-#: elf/ldconfig.c:132
+#: elf/ldconfig.c:127
 msgid "Use CACHE as cache file"
 msgstr ""
 
-#: elf/ldconfig.c:133
+#: elf/ldconfig.c:128
 msgid "Use CONF as configuration file"
 msgstr ""
 
@@ -3777,7 +3849,7 @@ msgstr ""
 msgid "Virtual timer expired"
 msgstr ""
 
-#: timezone/zic.c:1926
+#: timezone/zic.c:1932
 msgid "Wild result from command execution"
 msgstr ""
 
@@ -3785,19 +3857,19 @@ msgstr ""
 msgid "Window changed"
 msgstr ""
 
-#: locale/programs/locale.c:69
+#: locale/programs/locale.c:77
 msgid "Write names of available charmaps"
 msgstr ""
 
-#: locale/programs/locale.c:67
+#: locale/programs/locale.c:75
 msgid "Write names of available locales"
 msgstr ""
 
-#: locale/programs/locale.c:71
+#: locale/programs/locale.c:79
 msgid "Write names of selected categories"
 msgstr ""
 
-#: locale/programs/locale.c:72
+#: locale/programs/locale.c:80
 msgid "Write names of selected keywords"
 msgstr ""
 
@@ -3805,18 +3877,18 @@ msgstr ""
 msgid "Write output to file NAME"
 msgstr ""
 
-#: elf/cache.c:366 elf/cache.c:375 elf/cache.c:379
+#: elf/cache.c:402 elf/cache.c:411 elf/cache.c:415
 msgid "Writing of cache data failed"
 msgstr ""
 
-#: elf/cache.c:383
+#: elf/cache.c:419
 msgid "Writing of cache data failed."
 msgstr ""
 
-#: catgets/gencat.c:251 elf/ldconfig.c:269 elf/sprof.c:361
-#: iconv/iconv_prog.c:356 locale/programs/locale.c:274
+#: catgets/gencat.c:251 elf/ldconfig.c:264 elf/sprof.c:361
+#: iconv/iconv_prog.c:398 iconv/iconvconfig.c:340 locale/programs/locale.c:286
 #: locale/programs/localedef.c:316 nscd/nscd.c:292 nscd/nscd_nischeck.c:95
-#: nss/getent.c:68 posix/getconf.c:756
+#: nss/getent.c:68 posix/getconf.c:909
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
@@ -3825,14 +3897,6 @@ msgstr ""
 msgid "Wrong medium type"
 msgstr ""
 
-#: nis/nis_print.c:40
-msgid "X500"
-msgstr ""
-
-#: nis/nis_print.c:44
-msgid "XCHS"
-msgstr ""
-
 #: nis/ypclnt.c:174
 #, c-format
 msgid "YPBINDPROC_DOMAIN: %s\n"
@@ -3847,11 +3911,15 @@ msgstr ""
 msgid "You really blew it this time"
 msgstr ""
 
-#: timezone/zic.c:1088
+#: timezone/zic.c:1094
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr ""
 
-#: iconv/iconv_prog.c:73
+#: iconv/iconvconfig.c:114
+msgid "[DIR...]"
+msgstr ""
+
+#: iconv/iconv_prog.c:77
 msgid "[FILE...]"
 msgstr ""
 
@@ -3883,13 +3951,13 @@ msgstr ""
 msgid "`%.*s' already defined in repertoire"
 msgstr ""
 
-#: locale/programs/charmap.c:599 locale/programs/locfile.h:96
+#: locale/programs/charmap.c:604 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:1268 locale/programs/ld-ctype.c:1454
+#: locale/programs/ld-collate.c:1281 locale/programs/ld-ctype.c:1455
 #, c-format
 msgid "`%s' and `%.*s' are no valid names for symbolic range"
 msgstr ""
@@ -3899,7 +3967,7 @@ msgstr ""
 msgid "`%s' is no correct profile data file for `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:691
+#: locale/programs/ld-ctype.c:699
 msgid "`digit' category has not entries in groups of ten"
 msgstr ""
 
@@ -3915,12 +3983,12 @@ msgstr ""
 msgid "already running"
 msgstr ""
 
-#: locale/programs/charmap.c:434 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:439 locale/programs/repertoire.c:184
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr ""
 
-#: locale/programs/locfile.c:124
+#: locale/programs/locfile.c:126
 #, c-format
 msgid "argument to `%s' must be a single character"
 msgstr ""
@@ -3933,28 +4001,28 @@ msgstr ""
 msgid "authunix_create: out of memory\n"
 msgstr ""
 
-#: locale/programs/charmap.c:364 locale/programs/locfile.c:118
-#: locale/programs/locfile.c:145 locale/programs/repertoire.c:176
+#: locale/programs/charmap.c:369 locale/programs/locfile.c:120
+#: locale/programs/locfile.c:147 locale/programs/repertoire.c:176
 msgid "bad argument"
 msgstr ""
 
-#: inet/rcmd.c:424
+#: inet/rcmd.c:425
 msgid "bad owner"
 msgstr ""
 
-#: timezone/zic.c:1210
+#: timezone/zic.c:1216
 msgid "blank FROM field on Link line"
 msgstr ""
 
-#: timezone/zic.c:1214
+#: timezone/zic.c:1220
 msgid "blank TO field on Link line"
 msgstr ""
 
-#: malloc/mcheck.c:291
+#: malloc/mcheck.c:302
 msgid "block freed twice\n"
 msgstr ""
 
-#: malloc/mcheck.c:294
+#: malloc/mcheck.c:305
 msgid "bogus mcheck_status, library is buggy\n"
 msgstr ""
 
@@ -3978,11 +4046,11 @@ msgstr ""
 msgid "cache_set: victim not found"
 msgstr ""
 
-#: timezone/zic.c:1751
+#: timezone/zic.c:1757
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr ""
 
-#: sunrpc/svc_simple.c:76
+#: sunrpc/svc_simple.c:85
 #, c-format
 msgid "can't reassign procedure number %ld\n"
 msgstr ""
@@ -3996,15 +4064,15 @@ msgstr ""
 msgid "cannot add already read locale `%s' a second time"
 msgstr ""
 
-#: elf/dl-deps.c:470
+#: elf/dl-deps.c:454
 msgid "cannot allocate dependency list"
 msgstr ""
 
-#: elf/dl-load.c:1031
+#: elf/dl-load.c:1039
 msgid "cannot allocate memory for program header"
 msgstr ""
 
-#: elf/dl-load.c:339
+#: elf/dl-load.c:348
 msgid "cannot allocate name record"
 msgstr ""
 
@@ -4012,31 +4080,27 @@ msgstr ""
 msgid "cannot allocate symbol data"
 msgstr ""
 
-#: elf/dl-deps.c:501
+#: elf/dl-deps.c:484
 msgid "cannot allocate symbol search list"
 msgstr ""
 
-#: elf/dl-version.c:291
+#: elf/dl-version.c:292
 msgid "cannot allocate version reference table"
 msgstr ""
 
-#: elf/dl-load.c:1000
+#: elf/dl-load.c:1008
 msgid "cannot change memory protections"
 msgstr ""
 
-#: elf/dl-load.c:533
+#: elf/dl-load.c:540
 msgid "cannot create RUNPATH/RPATH copy"
 msgstr ""
 
-#: 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
+#: elf/dl-load.c:456 elf/dl-load.c:525 elf/dl-load.c:553 elf/dl-load.c:600
+#: elf/dl-load.c:693
 msgid "cannot create cache for search path"
 msgstr ""
 
-#: elf/dl-support.c:191
-msgid "cannot create capability list"
-msgstr ""
-
 #: elf/sprof.c:715 elf/sprof.c:773
 msgid "cannot create internal descriptor"
 msgstr ""
@@ -4045,23 +4109,28 @@ msgstr ""
 msgid "cannot create internal descriptors"
 msgstr ""
 
-#: elf/dl-load.c:583
+#: locale/programs/locfile.c:693
+#, c-format
+msgid "cannot create output file `%s' for category `%s'"
+msgstr ""
+
+#: elf/dl-load.c:590
 msgid "cannot create search path array"
 msgstr ""
 
-#: elf/dl-load.c:1137
+#: elf/dl-load.c:1125
 msgid "cannot create searchlist"
 msgstr ""
 
-#: elf/dl-load.c:822 elf/dl-load.c:1682
+#: elf/dl-load.c:830 elf/dl-load.c:1724
 msgid "cannot create shared object descriptor"
 msgstr ""
 
-#: catgets/gencat.c:1316
+#: catgets/gencat.c:1315
 msgid "cannot determine escape character"
 msgstr ""
 
-#: elf/dl-load.c:950
+#: elf/dl-load.c:958
 msgid "cannot dynamically load executable"
 msgstr ""
 
@@ -4083,7 +4152,11 @@ msgstr ""
 msgid "cannot find any C preprocessor (cpp)\n"
 msgstr ""
 
-#: nscd/connections.c:225
+#: iconv/iconvconfig.c:1159
+msgid "cannot generate output file"
+msgstr ""
+
+#: nscd/connections.c:227
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr ""
@@ -4092,19 +4165,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
+#: elf/dl-reloc.c:62
 msgid "cannot make segment writable for relocation"
 msgstr ""
 
-#: elf/dl-load.c:1016
+#: elf/dl-load.c:1024
 msgid "cannot map zero-fill pages"
 msgstr ""
 
-#: inet/rcmd.c:420
+#: inet/rcmd.c:421
 msgid "cannot open"
 msgstr ""
 
@@ -4117,7 +4186,7 @@ msgstr ""
 msgid "cannot open input file"
 msgstr ""
 
-#: catgets/gencat.c:288 iconv/iconv_prog.c:225
+#: catgets/gencat.c:288 iconv/iconv_charmap.c:159 iconv/iconv_prog.c:265
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr ""
@@ -4128,21 +4197,21 @@ msgstr ""
 msgid "cannot open locale definition file `%s'"
 msgstr ""
 
-#: iconv/iconv_prog.c:194
+#: iconv/iconv_prog.c:209
 msgid "cannot open output file"
 msgstr ""
 
-#: catgets/gencat.c:944 catgets/gencat.c:985
+#: catgets/gencat.c:949 catgets/gencat.c:990
 #, c-format
 msgid "cannot open output file `%s'"
 msgstr ""
 
-#: locale/programs/locfile.c:381
+#: locale/programs/locfile.c:571
 #, c-format
 msgid "cannot open output file `%s' for category `%s'"
 msgstr ""
 
-#: elf/dl-load.c:1695
+#: elf/dl-load.c:1737
 msgid "cannot open shared object file"
 msgstr ""
 
@@ -4151,7 +4220,7 @@ msgstr ""
 msgid "cannot open socket: %s"
 msgstr ""
 
-#: elf/dl-load.c:814
+#: elf/dl-load.c:822
 msgid "cannot open zero fill device"
 msgstr ""
 
@@ -4164,7 +4233,7 @@ msgstr ""
 msgid "cannot read configuration file; this is fatal"
 msgstr ""
 
-#: elf/dl-load.c:838 elf/dl-load.c:1244
+#: elf/dl-load.c:846 elf/dl-load.c:1247 elf/dl-load.c:1319 elf/dl-load.c:1333
 msgid "cannot read file data"
 msgstr ""
 
@@ -4177,11 +4246,6 @@ msgstr ""
 msgid "cannot read header from `%s'"
 msgstr ""
 
-#: locale/programs/locale.c:308
-#, c-format
-msgid "cannot read locale directory `%s'"
-msgstr ""
-
 #: nscd/nscd_stat.c:128
 msgid "cannot read statistics data"
 msgstr ""
@@ -4190,7 +4254,7 @@ msgstr ""
 msgid "cannot safe new repertoire map"
 msgstr ""
 
-#: elf/dl-load.c:776
+#: elf/dl-load.c:784
 msgid "cannot stat shared object"
 msgstr ""
 
@@ -4204,7 +4268,7 @@ msgstr ""
 msgid "cannot write output files to `%s'"
 msgstr ""
 
-#: nscd/connections.c:261 nscd/connections.c:282
+#: nscd/connections.c:265 nscd/connections.c:287
 #, c-format
 msgid "cannot write result: %s"
 msgstr ""
@@ -4214,77 +4278,81 @@ msgstr ""
 msgid "cannot write statistics: %s"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:509
+#: locale/programs/ld-ctype.c:517
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:524
+#: locale/programs/ld-ctype.c:532
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:579
+#: locale/programs/ld-ctype.c:587
 msgid "character <SP> not defined in character map"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:453
+#: locale/programs/ld-ctype.c:461
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:467
+#: locale/programs/ld-ctype.c:475
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3030
+#: locale/programs/ld-ctype.c:3032
 #, c-format
 msgid "character `%s' not defined while needed as default value"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1215
+#: locale/programs/ld-ctype.c:1223
 #, c-format
 msgid "character class `%s' already defined"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1247
+#: locale/programs/ld-ctype.c:1255
 #, c-format
 msgid "character map `%s' already defined"
 msgstr ""
 
-#: locale/programs/charmap.c:249
+#: locale/programs/charmap.c:254
 #, c-format
 msgid ""
 "character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
 msgstr ""
 
-#: locale/programs/charmap.c:135
+#: locale/programs/charmap.c:140
 #, c-format
 msgid "character map file `%s' not found"
 msgstr ""
 
-#: locale/programs/charmap.c:460
+#: locale/programs/charmap.c:465
 msgid "character sets with locking states are not supported"
 msgstr ""
 
+#: intl/tst-codeset.c:40 intl/tst-codeset.c:50
+msgid "cheese"
+msgstr ""
+
 #: locale/programs/localedef.c:482
 msgid "circular dependencies between locale definitions"
 msgstr ""
 
-#: sunrpc/clnt_raw.c:111
+#: sunrpc/clnt_raw.c:115
 msgid "clnt_raw.c - Fatal header serialization error."
 msgstr ""
 
-#: sunrpc/clnt_tcp.c:126 sunrpc/clnt_tcp.c:134
+#: sunrpc/clnt_tcp.c:127 sunrpc/clnt_tcp.c:136
 msgid "clnttcp_create: out of memory\n"
 msgstr ""
 
-#: sunrpc/clnt_udp.c:131 sunrpc/clnt_udp.c:141
+#: sunrpc/clnt_udp.c:132 sunrpc/clnt_udp.c:143
 msgid "clntudp_create: out of memory\n"
 msgstr ""
 
-#: sunrpc/clnt_unix.c:124 sunrpc/clnt_unix.c:132
+#: sunrpc/clnt_unix.c:125 sunrpc/clnt_unix.c:134
 msgid "clntunix_create: out of memory\n"
 msgstr ""
 
@@ -4292,28 +4360,28 @@ msgstr ""
 msgid "constant or identifier expected"
 msgstr ""
 
-#: iconv/iconv_prog.c:182
+#: iconv/iconv_prog.c:231
 #, c-format
 msgid "conversion from `%s' to `%s' not supported"
 msgstr ""
 
-#: catgets/gencat.c:1290
+#: catgets/gencat.c:1289
 msgid "conversion modules not available"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:900
+#: locale/programs/ld-monetary.c:902
 msgid "conversion rate value cannot be zero"
 msgstr ""
 
-#: iconv/iconv_prog.c:385 iconv/iconv_prog.c:410
+#: iconv/iconv_prog.c:427 iconv/iconv_prog.c:452
 msgid "conversion stopped due to problem in writing the output"
 msgstr ""
 
-#: sunrpc/svc_simple.c:84
+#: sunrpc/svc_simple.c:93
 msgid "couldn't create an rpc server\n"
 msgstr ""
 
-#: sunrpc/svc_simple.c:92
+#: sunrpc/svc_simple.c:101
 #, c-format
 msgid "couldn't register prog %ld vers %ld\n"
 msgstr ""
@@ -4322,17 +4390,17 @@ msgstr ""
 msgid "database [key ...]"
 msgstr ""
 
-#: locale/programs/charmap.c:192
+#: locale/programs/charmap.c:197
 #, c-format
 msgid "default character map file `%s' not found"
 msgstr ""
 
-#: locale/programs/charmap.c:392
+#: locale/programs/charmap.c:397
 #, c-format
 msgid "duplicate definition of <%s>"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3043
+#: locale/programs/ld-collate.c:3062
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr ""
@@ -4341,12 +4409,12 @@ msgstr ""
 msgid "duplicate set definition"
 msgstr ""
 
-#: timezone/zic.c:1003
+#: timezone/zic.c:1009
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2557
+#: locale/programs/ld-ctype.c:2559
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr ""
@@ -4359,7 +4427,7 @@ msgstr ""
 msgid "duplicated message number"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2368
+#: locale/programs/ld-ctype.c:2370
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr ""
 
@@ -4367,10 +4435,14 @@ msgstr ""
 msgid "empty char string"
 msgstr ""
 
-#: elf/dl-open.c:223
+#: elf/dl-open.c:219
 msgid "empty dynamic string token substitution"
 msgstr ""
 
+#: elf/dl-deps.c:113
+msgid "empty dynamics string token substitution"
+msgstr ""
+
 #: sunrpc/svc_udp.c:454
 msgid "enablecache: cache already enabled"
 msgstr ""
@@ -4387,29 +4459,29 @@ msgstr ""
 msgid "enablecache: could not allocate cache fifo"
 msgstr ""
 
-#: iconv/iconv_prog.c:57
+#: iconv/iconv_prog.c:61
 msgid "encoding for output"
 msgstr ""
 
-#: iconv/iconv_prog.c:56
+#: iconv/iconv_prog.c:60
 msgid "encoding of original text"
 msgstr ""
 
-#: nscd/connections.c:361 nscd/connections.c:453
+#: nscd/connections.c:366 nscd/connections.c:460
 #, c-format
 msgid "error getting callers id: %s"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3013
+#: locale/programs/ld-collate.c:3032
 msgid "error while adding equivalent collating symbol"
 msgstr ""
 
-#: iconv/iconv_prog.c:242
+#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:283
 #, c-format
 msgid "error while closing input `%s'"
 msgstr ""
 
-#: iconv/iconv_prog.c:288
+#: iconv/iconv_prog.c:330
 msgid "error while closing output file"
 msgstr ""
 
@@ -4417,7 +4489,8 @@ msgstr ""
 msgid "error while closing the profiling data file"
 msgstr ""
 
-#: iconv/iconv_prog.c:474 iconv/iconv_prog.c:505
+#: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:538 iconv/iconv_prog.c:516
+#: iconv/iconv_prog.c:547
 msgid "error while reading the input"
 msgstr ""
 
@@ -4425,10 +4498,14 @@ msgstr ""
 msgid "expect string argument for `copy'"
 msgstr ""
 
-#: timezone/zic.c:893
+#: timezone/zic.c:899
 msgid "expected continuation line not found"
 msgstr ""
 
+#: locale/programs/ld-time.c:1027
+msgid "extra trailing semicolon"
+msgstr ""
+
 #: elf/sprof.c:404
 #, c-format
 msgid "failed to load shared object `%s'"
@@ -4438,7 +4515,7 @@ msgstr ""
 msgid "failed to load symbol data"
 msgstr ""
 
-#: elf/dl-load.c:763
+#: elf/dl-load.c:771
 msgid "failed to map segment from shared object"
 msgstr ""
 
@@ -4446,17 +4523,18 @@ msgstr ""
 msgid "failed to mmap the profiling data file"
 msgstr ""
 
-#: iconv/iconv_prog.c:186
+#: iconv/iconv_prog.c:235
 msgid "failed to start conversion processing"
 msgstr ""
 
-#: locale/programs/locfile.c:406
+#: locale/programs/locfile.c:596
 #, c-format
 msgid "failure while writing data for category `%s'"
 msgstr ""
 
-#: nis/nis_call.c:156
-msgid "fcntl: F_SETFD"
+#: elf/../sysdeps/generic/readelflib.c:35
+#, c-format
+msgid "file %s is truncated\n"
 msgstr ""
 
 #. TRANS: the file will not be removed; this is an
@@ -4466,19 +4544,19 @@ msgstr ""
 msgid "file `%s' already exists and may be overwritten\n"
 msgstr ""
 
-#: elf/dl-load.c:1244
+#: elf/dl-load.c:1247
 msgid "file too short"
 msgstr ""
 
-#: inet/rcmd.c:422
+#: inet/rcmd.c:423
 msgid "fstat failed"
 msgstr ""
 
-#: locale/programs/linereader.c:383
+#: locale/programs/linereader.c:388
 msgid "garbage at end of character code specification"
 msgstr ""
 
-#: locale/programs/linereader.c:271
+#: locale/programs/linereader.c:276
 msgid "garbage at end of number"
 msgstr ""
 
@@ -4498,28 +4576,28 @@ msgstr ""
 msgid "getent - get entries from administrative database."
 msgstr ""
 
-#: nscd/connections.c:220
+#: nscd/connections.c:221
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr ""
 
-#: timezone/zic.c:637
+#: timezone/zic.c:643
 msgid "hard link failed, symbolic link used"
 msgstr ""
 
-#: inet/rcmd.c:428
+#: inet/rcmd.c:429
 msgid "hard linked somewhere"
 msgstr ""
 
-#: locale/programs/charmap.c:981 locale/programs/repertoire.c:430
+#: locale/programs/charmap.c:986 locale/programs/repertoire.c:430
 msgid "hexadecimal range format should use only capital characters"
 msgstr ""
 
-#: timezone/zic.c:1187
+#: timezone/zic.c:1193
 msgid "illegal CORRECTION field on Leap line"
 msgstr ""
 
-#: timezone/zic.c:1191
+#: timezone/zic.c:1197
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr ""
 
@@ -4527,11 +4605,16 @@ msgstr ""
 msgid "illegal character in file: "
 msgstr ""
 
-#: locale/programs/linereader.c:595
+#: locale/programs/linereader.c:600
 msgid "illegal escape sequence at end of string"
 msgstr ""
 
-#: iconv/iconv_prog.c:427
+#: iconv/iconv_charmap.c:443
+#, c-format
+msgid "illegal input sequence at position %Zd"
+msgstr ""
+
+#: iconv/iconv_prog.c:469
 #, c-format
 msgid "illegal input sequence at position %ld"
 msgstr ""
@@ -4545,102 +4628,102 @@ msgstr ""
 msgid "illegal set number"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1221
+#: locale/programs/ld-ctype.c:1229
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1253
+#: locale/programs/ld-ctype.c:1261
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr ""
 
-#: iconv/iconv_prog.c:431
+#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:473
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr ""
 
-#: timezone/zic.c:850
+#: timezone/zic.c:856
 msgid "input line of unknown type"
 msgstr ""
 
-#: elf/dl-load.c:1291
+#: elf/dl-load.c:1294
 msgid "internal error"
 msgstr ""
 
-#: iconv/iconv_prog.c:435
+#: iconv/iconv_prog.c:477
 msgid "internal error (illegal descriptor)"
 msgstr ""
 
-#: timezone/zic.c:1813
+#: timezone/zic.c:1819
 msgid "internal error - addtype called with bad isdst"
 msgstr ""
 
-#: timezone/zic.c:1821
+#: timezone/zic.c:1827
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr ""
 
-#: timezone/zic.c:1817
+#: timezone/zic.c:1823
 msgid "internal error - addtype called with bad ttisstd"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:480 locale/programs/ld-ctype.c:536
+#: locale/programs/ld-ctype.c:488 locale/programs/ld-ctype.c:544
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr ""
 
-#: elf/dl-load.c:1264
+#: elf/dl-load.c:1267
 msgid "invalid ELF header"
 msgstr ""
 
-#: timezone/zic.c:1059
+#: timezone/zic.c:1065
 msgid "invalid UTC offset"
 msgstr ""
 
-#: timezone/zic.c:1062
+#: timezone/zic.c:1068
 msgid "invalid abbreviation format"
 msgstr ""
 
-#: catgets/gencat.c:687
+#: catgets/gencat.c:688
 msgid "invalid character: message ignored"
 msgstr ""
 
-#: timezone/zic.c:1152 timezone/zic.c:1364 timezone/zic.c:1378
+#: timezone/zic.c:1158 timezone/zic.c:1370 timezone/zic.c:1384
 msgid "invalid day of month"
 msgstr ""
 
-#: locale/programs/charmap.c:347
+#: locale/programs/charmap.c:352
 msgid "invalid definition"
 msgstr ""
 
-#: locale/programs/charmap.c:542
+#: locale/programs/charmap.c:547
 msgid "invalid encoding given"
 msgstr ""
 
-#: timezone/zic.c:1316
+#: timezone/zic.c:1322
 msgid "invalid ending year"
 msgstr ""
 
-#: catgets/gencat.c:1147 locale/programs/linereader.c:533
+#: catgets/gencat.c:1152 locale/programs/linereader.c:538
 msgid "invalid escape sequence"
 msgstr ""
 
-#: timezone/zic.c:1124
+#: timezone/zic.c:1130
 msgid "invalid leaping year"
 msgstr ""
 
-#: catgets/gencat.c:726
+#: catgets/gencat.c:731
 msgid "invalid line"
 msgstr ""
 
-#: elf/dl-open.c:371
+#: elf/dl-open.c:349
 msgid "invalid mode for dlopen()"
 msgstr ""
 
-#: timezone/zic.c:1139 timezone/zic.c:1242
+#: timezone/zic.c:1145 timezone/zic.c:1248
 msgid "invalid month name"
 msgstr ""
 
-#: locale/programs/charmap.c:969 locale/programs/ld-collate.c:2869
+#: locale/programs/charmap.c:974 locale/programs/ld-collate.c:2888
 #: locale/programs/repertoire.c:418
 msgid "invalid names for character range"
 msgstr ""
@@ -4653,53 +4736,53 @@ msgstr ""
 msgid "invalid quote character"
 msgstr ""
 
-#: timezone/zic.c:958
+#: timezone/zic.c:964
 msgid "invalid saved time"
 msgstr ""
 
-#: timezone/zic.c:1291
+#: timezone/zic.c:1297
 msgid "invalid starting year"
 msgstr ""
 
-#: timezone/zic.c:1168 timezone/zic.c:1271
+#: timezone/zic.c:1174 timezone/zic.c:1277
 msgid "invalid time of day"
 msgstr ""
 
-#: timezone/zic.c:1369
+#: timezone/zic.c:1375
 msgid "invalid weekday name"
 msgstr ""
 
-#: nscd/connections.c:470
+#: nscd/connections.c:479
 #, c-format
 msgid "key length in request too long: %d"
 msgstr ""
 
-#: elf/ldconfig.c:738
+#: elf/ldconfig.c:794
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr ""
 
-#: elf/ldconfig.c:732
+#: elf/ldconfig.c:788
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr ""
 
-#: elf/ldconfig.c:735
+#: elf/ldconfig.c:791
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr ""
 
-#: elf/ldconfig.c:765
+#: elf/ldconfig.c:821
 #, c-format
 msgid ""
 "libraries %s and %s in directory %s have same soname but different type."
 msgstr ""
 
-#: timezone/zic.c:830
+#: timezone/zic.c:836
 msgid "line too long"
 msgstr ""
 
-#: iconv/iconv_prog.c:59
+#: iconv/iconv_prog.c:63
 msgid "list all known coded character sets"
 msgstr ""
 
@@ -4707,7 +4790,7 @@ msgstr ""
 msgid "locale name should consist only of portable characters"
 msgstr ""
 
-#: inet/rcmd.c:413
+#: inet/rcmd.c:414
 msgid "lstat failed"
 msgstr ""
 
@@ -4719,7 +4802,11 @@ msgstr ""
 msgid "make output graphic VALUE pixel wide"
 msgstr ""
 
-#: catgets/gencat.c:780
+#: stdlib/../sysdeps/unix/sysv/linux/ia64/makecontext.c:63
+msgid "makecontext: does not know how to handle more than 8 arguments\n"
+msgstr ""
+
+#: catgets/gencat.c:785
 msgid "malformed line ignored"
 msgstr ""
 
@@ -4731,39 +4818,34 @@ msgstr ""
 msgid "mapping of section headers failed"
 msgstr ""
 
-#: malloc/mcheck.c:285
+#: malloc/mcheck.c:296
 msgid "memory clobbered before allocated block\n"
 msgstr ""
 
-#: malloc/mcheck.c:288
+#: malloc/mcheck.c:299
 msgid "memory clobbered past end of allocated block\n"
 msgstr ""
 
-#: locale/programs/locfile.c:334 locale/programs/xmalloc.c:70
-#: malloc/obstack.c:477 posix/getconf.c:809
+#: locale/programs/xmalloc.c:70 malloc/obstack.c:484 posix/getconf.c:996
 msgid "memory exhausted"
 msgstr ""
 
-#: malloc/mcheck.c:282
+#: malloc/mcheck.c:293
 msgid "memory is consistent, library is buggy\n"
 msgstr ""
 
-#: elf/cache.c:120
+#: elf/cache.c:143
 msgid "mmap of cache file failed.\n"
 msgstr ""
 
-#: elf/../sysdeps/generic/readelflib.c:108
+#: elf/../sysdeps/generic/readelflib.c:110
 msgid "more than one dynamic segment\n"
 msgstr ""
 
-#: timezone/zic.c:953
+#: timezone/zic.c:959
 msgid "nameless rule"
 msgstr ""
 
-#: iconv/iconv_prog.c:139
-msgid "neither original nor target encoding specified"
-msgstr ""
-
 #: nis/nss_nisplus/nisplus-publickey.c:281
 #: nis/nss_nisplus/nisplus-publickey.c:287
 #: nis/nss_nisplus/nisplus-publickey.c:346
@@ -4796,7 +4878,7 @@ msgstr ""
 msgid "netname2user: should not have uid 0"
 msgstr ""
 
-#: sunrpc/svc_simple.c:159
+#: sunrpc/svc_simple.c:168
 #, c-format
 msgid "never registered prog %d\n"
 msgstr ""
@@ -4805,11 +4887,11 @@ msgstr ""
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr ""
 
-#: timezone/zic.c:2142
+#: timezone/zic.c:2148
 msgid "no day in month matches rule"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1757
+#: locale/programs/ld-collate.c:1770
 msgid "no definition of `UNDEFINED'"
 msgstr ""
 
@@ -4819,7 +4901,7 @@ msgid ""
 "no filename for profiling data given and shared object `%s' has no soname"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:739
+#: locale/programs/ld-ctype.c:747
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr ""
 
@@ -4827,37 +4909,37 @@ msgstr ""
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3349
+#: locale/programs/ld-ctype.c:3351
 msgid "no output digits defined and none of the standard names in the charmap"
 msgstr ""
 
-#: locale/programs/localedef.c:236
+#: iconv/iconvconfig.c:308 locale/programs/localedef.c:236
 msgid "no output file produced because warning were issued"
 msgstr ""
 
-#: locale/programs/charmap.c:488 locale/programs/charmap.c:668
-#: locale/programs/charmap.c:764 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:493 locale/programs/charmap.c:673
+#: locale/programs/charmap.c:769 locale/programs/repertoire.c:231
 msgid "no symbolic name given"
 msgstr ""
 
-#: locale/programs/charmap.c:575 locale/programs/charmap.c:723
-#: locale/programs/charmap.c:806 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:580 locale/programs/charmap.c:728
+#: locale/programs/charmap.c:811 locale/programs/repertoire.c:297
 msgid "no symbolic name given for end of range"
 msgstr ""
 
-#: locale/programs/linereader.c:641
+#: locale/programs/linereader.c:646
 msgid "non-symbolic character value should not be used"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:804
+#: locale/programs/ld-ctype.c:812
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:821
+#: locale/programs/ld-ctype.c:829
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr ""
 
-#: inet/rcmd.c:415
+#: inet/rcmd.c:416
 msgid "not regular file"
 msgstr ""
 
@@ -4873,36 +4955,32 @@ msgstr ""
 msgid "nscd not running!\n"
 msgstr ""
 
-#: elf/dl-load.c:1051
+#: elf/dl-load.c:1059
 msgid "object file has no dynamic section"
 msgstr ""
 
-#: iconv/iconv_prog.c:61
+#: iconv/iconv_prog.c:65
 msgid "omit invalid characters from output"
 msgstr ""
 
-#: elf/dl-load.c:1311
+#: elf/dl-load.c:1309
 msgid "only ET_DYN and ET_EXEC can be loaded"
 msgstr ""
 
-#: locale/programs/charmap.c:632
+#: locale/programs/charmap.c:637
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1005 locale/programs/ld-collate.c:1175
+#: locale/programs/ld-collate.c:1018 locale/programs/ld-collate.c:1188
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr ""
 
-#: iconv/iconv_prog.c:141
-msgid "original encoding not specified using `-f'"
-msgstr ""
-
-#: inet/ruserpass.c:167 inet/ruserpass.c:190
+#: inet/ruserpass.c:170 inet/ruserpass.c:193
 msgid "out of memory"
 msgstr ""
 
-#: iconv/iconv_prog.c:62
+#: iconv/iconv_prog.c:66
 msgid "output file"
 msgstr ""
 
@@ -4910,19 +4988,19 @@ msgstr ""
 msgid "pmap_getmaps rpc problem"
 msgstr ""
 
-#: inet/rcmd.c:233
+#: inet/rcmd.c:234
 msgid "poll: protocol failure in circuit setup\n"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1949 locale/programs/ld-ctype.c:2000
+#: locale/programs/ld-ctype.c:1950 locale/programs/ld-ctype.c:2001
 msgid "premature end of `translit_ignore' definition"
 msgstr ""
 
-#: sunrpc/rpc_scan.c:524 sunrpc/rpc_scan.c:534
+#: sunrpc/rpc_scan.c:525 sunrpc/rpc_scan.c:535
 msgid "preprocessor error"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2731
+#: locale/programs/ld-ctype.c:2733
 msgid "previous definition was here"
 msgstr ""
 
@@ -4930,7 +5008,7 @@ msgstr ""
 msgid "print list of count paths and their number of use"
 msgstr ""
 
-#: iconv/iconv_prog.c:64
+#: iconv/iconv_prog.c:68
 msgid "print progress information"
 msgstr ""
 
@@ -4956,30 +5034,30 @@ msgstr ""
 msgid "program %lu version %lu ready and waiting\n"
 msgstr ""
 
-#: inet/rcmd.c:270
+#: inet/rcmd.c:271
 #, c-format
 msgid "rcmd: %s: short read"
 msgstr ""
 
-#: inet/rcmd.c:230
+#: inet/rcmd.c:231
 #, c-format
 msgid "rcmd: poll (setting up stderr): %m\n"
 msgstr ""
 
-#: inet/rcmd.c:158
+#: inet/rcmd.c:159
 msgid "rcmd: socket: All ports in use\n"
 msgstr ""
 
-#: inet/rcmd.c:220
+#: inet/rcmd.c:221
 #, c-format
 msgid "rcmd: write (setting up stderr): %m\n"
 msgstr ""
 
-#: sunrpc/svc_simple.c:99
+#: sunrpc/svc_simple.c:108
 msgid "registerrpc: out of memory\n"
 msgstr ""
 
-#: timezone/zic.c:1874
+#: timezone/zic.c:1880
 msgid "repeated leap second moment"
 msgstr ""
 
@@ -4988,7 +5066,7 @@ msgstr ""
 msgid "repertoire map file `%s' not found"
 msgstr ""
 
-#: locale/programs/charmap.c:1063
+#: locale/programs/charmap.c:1068
 msgid "resulting bytes for range not representable."
 msgstr ""
 
@@ -5024,24 +5102,24 @@ msgstr ""
 msgid "rpcinfo: can't contact portmapper"
 msgstr ""
 
-#: timezone/zic.c:743 timezone/zic.c:745
+#: timezone/zic.c:749 timezone/zic.c:751
 msgid "same rule name in multiple files"
 msgstr ""
 
-#: elf/dl-load.c:1116
+#: elf/dl-load.c:1104
 msgid "shared object cannot be dlopen()ed"
 msgstr ""
 
-#: elf/dl-close.c:63
+#: elf/dl-close.c:61
 msgid "shared object not open"
 msgstr ""
 
-#: nscd/connections.c:482
+#: nscd/connections.c:493
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr ""
 
-#: nscd/connections.c:436
+#: nscd/connections.c:443
 #, c-format
 msgid "short read while reading request: %s"
 msgstr ""
@@ -5051,35 +5129,31 @@ msgstr ""
 msgid "short write in %s: %s"
 msgstr ""
 
-#: inet/rcmd.c:260
+#: inet/rcmd.c:261
 msgid "socket: protocol failure in circuit setup\n"
 msgstr ""
 
-#: timezone/zic.c:814
+#: timezone/zic.c:820
 msgid "standard input"
 msgstr ""
 
-#: timezone/zdump.c:269
-msgid "standard output"
-msgstr ""
-
-#: locale/programs/ld-ctype.c:1680
+#: locale/programs/ld-ctype.c:1681
 msgid "start and end character sequence of range must have the same length"
 msgstr ""
 
-#: timezone/zic.c:1325
+#: timezone/zic.c:1331
 msgid "starting year greater than ending year"
 msgstr ""
 
-#: timezone/zic.c:1297 timezone/zic.c:1322
+#: timezone/zic.c:1303 timezone/zic.c:1328
 msgid "starting year too high to be represented"
 msgstr ""
 
-#: timezone/zic.c:1295 timezone/zic.c:1320
+#: timezone/zic.c:1301 timezone/zic.c:1326
 msgid "starting year too low to be represented"
 msgstr ""
 
-#: iconv/iconv_prog.c:63
+#: iconv/iconv_prog.c:67
 msgid "suppress warnings"
 msgstr ""
 
@@ -5087,31 +5161,31 @@ msgstr ""
 msgid "svc_run: - poll failed"
 msgstr ""
 
-#: sunrpc/svc_tcp.c:161
+#: sunrpc/svc_tcp.c:170
 msgid "svc_tcp.c - cannot getsockname or listen"
 msgstr ""
 
-#: sunrpc/svc_tcp.c:146
+#: sunrpc/svc_tcp.c:155
 msgid "svc_tcp.c - tcp socket creation problem"
 msgstr ""
 
-#: sunrpc/svc_tcp.c:210 sunrpc/svc_tcp.c:216
+#: sunrpc/svc_tcp.c:219 sunrpc/svc_tcp.c:225
 msgid "svc_tcp: makefd_xprt: out of memory\n"
 msgstr ""
 
-#: sunrpc/svc_unix.c:137
+#: sunrpc/svc_unix.c:146
 msgid "svc_unix.c - AF_UNIX socket creation problem"
 msgstr ""
 
-#: sunrpc/svc_unix.c:153
+#: sunrpc/svc_unix.c:162
 msgid "svc_unix.c - cannot getsockname or listen"
 msgstr ""
 
-#: sunrpc/svc_unix.c:203 sunrpc/svc_unix.c:209
+#: sunrpc/svc_unix.c:212 sunrpc/svc_unix.c:218
 msgid "svc_unix: makefd_xprt: out of memory\n"
 msgstr ""
 
-#: sunrpc/svc_tcp.c:169 sunrpc/svc_tcp.c:177
+#: sunrpc/svc_tcp.c:178 sunrpc/svc_tcp.c:186
 msgid "svctcp_create: out of memory\n"
 msgstr ""
 
@@ -5131,49 +5205,49 @@ msgstr ""
 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
 msgstr ""
 
-#: sunrpc/svc_unix.c:162 sunrpc/svc_unix.c:170
+#: sunrpc/svc_unix.c:171 sunrpc/svc_unix.c:179
 msgid "svcunix_create: out of memory\n"
 msgstr ""
 
-#: locale/programs/linereader.c:745
+#: locale/programs/linereader.c:750
 #, c-format
 msgid "symbol `%.*s' not in charmap"
 msgstr ""
 
-#: locale/programs/linereader.c:766
+#: locale/programs/linereader.c:771
 #, c-format
 msgid "symbol `%.*s' not in repertoire map"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1617 locale/programs/ld-collate.c:1716
+#: locale/programs/ld-collate.c:1630 locale/programs/ld-collate.c:1729
 #, c-format
 msgid "symbol `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1614 locale/programs/ld-collate.c:1713
+#: locale/programs/ld-collate.c:1627 locale/programs/ld-collate.c:1726
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1539
+#: locale/programs/ld-collate.c:1552
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1955 locale/programs/ld-ctype.c:2006
-#: locale/programs/ld-ctype.c:2048
+#: locale/programs/ld-ctype.c:1956 locale/programs/ld-ctype.c:2007
+#: locale/programs/ld-ctype.c:2049
 msgid "syntax error"
 msgstr ""
 
-#: 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
+#: locale/programs/charmap.c:492 locale/programs/charmap.c:546
+#: locale/programs/charmap.c:578 locale/programs/charmap.c:672
+#: locale/programs/charmap.c:727 locale/programs/charmap.c:768
+#: locale/programs/charmap.c:809
 #, c-format
 msgid "syntax error in %s definition: %s"
 msgstr ""
 
-#: locale/programs/charmap.c:346 locale/programs/charmap.c:363
+#: locale/programs/charmap.c:351 locale/programs/charmap.c:368
 #: locale/programs/repertoire.c:175
 #, c-format
 msgid "syntax error in prolog: %s"
@@ -5185,73 +5259,69 @@ msgstr ""
 msgid "syntax error in repertoire map definition: %s"
 msgstr ""
 
-#: locale/programs/locfile.c:243
+#: locale/programs/locfile.c:245
 msgid "syntax error: not inside a locale definition section"
 msgstr ""
 
-#: iconv/iconv_prog.c:143
-msgid "target encoding not specified using `-t'"
-msgstr ""
-
 #: catgets/gencat.c:432 catgets/gencat.c:605 catgets/gencat.c:634
 msgid "this is the first definition"
 msgstr ""
 
-#: timezone/zic.c:1157
+#: timezone/zic.c:1163
 msgid "time before zero"
 msgstr ""
 
-#: timezone/zic.c:1165 timezone/zic.c:2042 timezone/zic.c:2061
+#: timezone/zic.c:1171 timezone/zic.c:2048 timezone/zic.c:2067
 msgid "time overflow"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1553 locale/programs/ld-ctype.c:2029
+#: locale/programs/ld-ctype.c:1554 locale/programs/ld-ctype.c:2030
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1687
+#: locale/programs/ld-ctype.c:1688
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr ""
 
-#: locale/programs/charmap.c:551
+#: locale/programs/charmap.c:556
 msgid "too few bytes in character encoding"
 msgstr ""
 
-#: locale/programs/charmap.c:553
+#: locale/programs/charmap.c:558
 msgid "too many bytes in character encoding"
 msgstr ""
 
-#: timezone/zic.c:1868
+#: timezone/zic.c:1874
 msgid "too many leap seconds"
 msgstr ""
 
-#: timezone/zic.c:1840
+#: timezone/zic.c:1846
 msgid "too many local time types"
 msgstr ""
 
-#: timezone/zic.c:1794
+#: timezone/zic.c:1800
 msgid "too many transitions?!"
 msgstr ""
 
-#: timezone/zic.c:2165
+#: timezone/zic.c:2171
 msgid "too many, or too long, time zone abbreviations"
 msgstr ""
 
-#: locale/programs/linereader.h:157
+#: locale/programs/linereader.h:160
 msgid "trailing garbage at end of line"
 msgstr ""
 
-#: sunrpc/svc_simple.c:151
+#: sunrpc/svc_simple.c:160
 #, c-format
 msgid "trouble replying to prog %d\n"
 msgstr ""
 
-#: timezone/zic.c:1332
+#: timezone/zic.c:1338
 msgid "typed single year"
 msgstr ""
 
-#: iconv/iconv_prog.c:491
+#: iconv/iconv_charmap.c:524 iconv/iconv_prog.c:533
 msgid "unable to allocate buffer for input"
 msgstr ""
 
@@ -5259,11 +5329,15 @@ msgstr ""
 msgid "unable to free arguments"
 msgstr ""
 
-#: posix/getconf.c:781 posix/getconf.c:797
+#: posix/getconf.c:968 posix/getconf.c:984
 msgid "undefined"
 msgstr ""
 
-#: locale/programs/charmap.c:856 locale/programs/charmap.c:867
+#: elf/cache.c:69
+msgid "unknown"
+msgstr ""
+
+#: locale/programs/charmap.c:861 locale/programs/charmap.c:872
 #, c-format
 msgid "unknown character `%s'"
 msgstr ""
@@ -5273,7 +5347,7 @@ msgstr ""
 msgid "unknown directive `%s': line ignored"
 msgstr ""
 
-#: iconv/iconv_prog.c:438
+#: iconv/iconv_prog.c:480
 #, c-format
 msgid "unknown iconv() error %d"
 msgstr ""
@@ -5283,15 +5357,20 @@ msgstr ""
 msgid "unknown set `%s'"
 msgstr ""
 
-#: timezone/zic.c:786
+#: posix/getconf.c:941
+#, c-format
+msgid "unknown specification \"%s\""
+msgstr ""
+
+#: timezone/zic.c:792
 msgid "unruly zone"
 msgstr ""
 
-#: catgets/gencat.c:1169
+#: catgets/gencat.c:1174
 msgid "unterminated message"
 msgstr ""
 
-#: locale/programs/linereader.c:599 locale/programs/linereader.c:784
+#: locale/programs/linereader.c:604 locale/programs/linereader.c:789
 msgid "unterminated string"
 msgstr ""
 
@@ -5299,11 +5378,11 @@ msgstr ""
 msgid "unterminated string constant"
 msgstr ""
 
-#: locale/programs/linereader.c:469
+#: locale/programs/linereader.c:474
 msgid "unterminated symbolic name"
 msgstr ""
 
-#: locale/programs/charmap.c:1005
+#: locale/programs/charmap.c:1010
 msgid "upper limit in range is not higher then lower limit"
 msgstr ""
 
@@ -5311,35 +5390,35 @@ msgstr ""
 msgid "upper limit in range is not smaller then lower limit"
 msgstr ""
 
-#: sunrpc/rpc_main.c:1424
+#: sunrpc/rpc_main.c:1426
 #, c-format
 msgid "usage: %s infile\n"
 msgstr ""
 
-#: timezone/zic.c:2108
+#: timezone/zic.c:2114
 msgid "use of 2/29 in non leap-year"
 msgstr ""
 
-#: locale/programs/charmap.c:640 locale/programs/charmap.c:703
+#: locale/programs/charmap.c:645 locale/programs/charmap.c:708
 #, c-format
 msgid "value for %s must be an integer"
 msgstr ""
 
-#: locale/programs/charmap.c:399
+#: locale/programs/charmap.c:404
 #, c-format
 msgid "value for <%s> must be 1 or greater"
 msgstr ""
 
-#: locale/programs/charmap.c:411
+#: locale/programs/charmap.c:416
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr ""
 
-#: timezone/zic.c:433
+#: timezone/zic.c:439
 msgid "warning: "
 msgstr ""
 
-#: nscd/connections.c:427
+#: nscd/connections.c:432
 #, c-format
 msgid "while accepting connection: %s"
 msgstr ""
@@ -5356,11 +5435,15 @@ msgstr ""
 msgid "while allocating key copy"
 msgstr ""
 
-#: catgets/gencat.c:1199
+#: iconv/iconvconfig.c:369
+msgid "while inserting in search tree"
+msgstr ""
+
+#: catgets/gencat.c:1198
 msgid "while opening old catalog file"
 msgstr ""
 
-#: locale/programs/locale.c:361
+#: locale/programs/locale.c:353
 msgid "while preparing output"
 msgstr ""
 
@@ -5368,17 +5451,17 @@ msgstr ""
 msgid "while stat'ing profiling data file"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2392
+#: locale/programs/ld-ctype.c:2394
 msgid ""
 "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2406
+#: locale/programs/ld-ctype.c:2408
 msgid ""
 "with character code range values one must use the absolute ellipsis `...'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2377
+#: locale/programs/ld-ctype.c:2379
 msgid ""
 "with symbolic name range values the absolute ellipsis `...' must not be used"
 msgstr ""
@@ -5387,7 +5470,7 @@ msgstr ""
 msgid "write incomplete"
 msgstr ""
 
-#: inet/rcmd.c:426
+#: inet/rcmd.c:427
 msgid "writeable by other than owner"
 msgstr ""
 
@@ -5395,23 +5478,23 @@ msgstr ""
 msgid "wrong number of arguments"
 msgstr ""
 
-#: timezone/zic.c:1115
+#: timezone/zic.c:1121
 msgid "wrong number of fields on Leap line"
 msgstr ""
 
-#: timezone/zic.c:1206
+#: timezone/zic.c:1212
 msgid "wrong number of fields on Link line"
 msgstr ""
 
-#: timezone/zic.c:949
+#: timezone/zic.c:955
 msgid "wrong number of fields on Rule line"
 msgstr ""
 
-#: timezone/zic.c:1019
+#: timezone/zic.c:1025
 msgid "wrong number of fields on Zone continuation line"
 msgstr ""
 
-#: timezone/zic.c:977
+#: timezone/zic.c:983
 msgid "wrong number of fields on Zone line"
 msgstr ""
 
@@ -5423,10 +5506,10 @@ msgstr ""
 msgid "xdrrec_create: out of memory\n"
 msgstr ""
 
-#: nis/ypclnt.c:907
+#: nis/ypclnt.c:909
 msgid "yp_update: cannot convert host to netname\n"
 msgstr ""
 
-#: nis/ypclnt.c:919
+#: nis/ypclnt.c:921
 msgid "yp_update: cannot get server address\n"
 msgstr ""