aboutsummaryrefslogtreecommitdiff
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<