aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-14 00:57:30 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-14 00:57:30 +0000
commit7e3399b393acab468d6ea8b13f6a187db6c8de24 (patch)
treed8c66d0489bfda4ea81fbc5cc0237355ce14b515
parent319d719d86e2278ecca219c099c5d6d343a576a1 (diff)
downloadglibc-7e3399b393acab468d6ea8b13f6a187db6c8de24.tar.xz
glibc-7e3399b393acab468d6ea8b13f6a187db6c8de24.zip
Update.
* nss/Makefile: Remove rules to build and distribute nss_db. * sysdeps/generic/alphasort64.c: Remove unnecessary versioning. * sysdeps/generic/scandir64.c: Likewise. * sysdeps/generic/versionsort64.c: Likewise. 2000-08-13 Ulrich Drepper <drepper@redhat.com>
-rw-r--r--ChangeLog8
-rw-r--r--nss/Makefile28
-rw-r--r--po/libc.pot347
-rw-r--r--sysdeps/generic/alphasort64.c11
-rw-r--r--sysdeps/generic/scandir64.c22
-rw-r--r--sysdeps/generic/versionsort64.c11
6 files changed, 189 insertions, 238 deletions
diff --git a/ChangeLog b/ChangeLog
index 8fa44431ec..0a34eb6622 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
2000-08-13 Ulrich Drepper <drepper@redhat.com>
+
+ * nss/Makefile: Remove rules to build and distribute nss_db.
+
+ * sysdeps/generic/alphasort64.c: Remove unnecessary versioning.
+ * sysdeps/generic/scandir64.c: Likewise.
+ * sysdeps/generic/versionsort64.c: Likewise.
+
+2000-08-13 Ulrich Drepper <drepper@redhat.com>
Benjamin Koznik <bkoz@redhat.com>
* libio/fileops.c: Merge with libstdc++-v3.
diff --git a/nss/Makefile b/nss/Makefile
index 18538d0b24..4edae25c2e 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -24,8 +24,7 @@ subdir := nss
headers := nss.h
distribute := nsswitch.h XXX-lookup.c getXXbyYY.c getXXbyYY_r.c \
getXXent.c getXXent_r.c databases.def \
- nsswitch.conf db-Makefile digits_dots.c \
- function.def
+ nsswitch.conf digits_dots.c function.def
# This is the trivial part which goes into libc itself.
routines = nsswitch $(addsuffix -lookup,$(databases))
@@ -36,8 +35,8 @@ routines = nsswitch $(addsuffix -lookup,$(databases))
databases = proto service hosts network grp pwd rpc ethers \
spwd netgrp key alias
-others := getent makedb
-install-bin := getent makedb
+others := getent
+install-bin := getent
tests = test-netdb
@@ -49,7 +48,7 @@ otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
endif
# Specify rules for the nss_* modules. We have some services.
-services := files db
+services := files
extra-libs = $(services:%=libnss_%)
# These libraries will be built in the `others' pass rather than
@@ -64,34 +63,15 @@ vpath %.c $(subdir-dirs)
libnss_files-routines := $(addprefix files-,$(databases))
distribute += files-XXX.c files-parse.c
-libnss_db-dbs := $(addprefix db-,$(filter-out hosts network key,\
- $(databases)))
-libnss_db-routines := $(libnss_db-dbs) db-open
-generated += $(filter-out db-alias.c db-netgrp.c, \
- $(addsuffix .c,$(libnss_db-dbs)))
-distribute += $(addprefix nss_db/, db-XXX.c nss_db.h dummy-db.h)
-
-
-$(objpfx)makedb: $(objpfx)db-open.o $(libdl)
# Build static module if requested
ifneq ($(build-static-nss),yes)
libnss_files-inhibit-o = $(filter-out .os,$(object-suffixes))
endif
-libnss_db-inhibit-o = $(filter-out .os,$(object-suffixes))
include ../Rules
-$(objpfx)libnss_db.so: $(objpfx)libnss_files.so $(libdl)
-
-$(libnss_db-dbs:%=$(objpfx)%.c): $(objpfx)db-%.c: nss_files/files-%.c
- @rm -f $@.new
- (echo '#define EXTERN_PARSER';\
- echo '#define GENERIC "../nss_db/db-XXX.c"';\
- echo '#include <$<>') > $@.new
- mv -f $@.new $@
-
ifeq (yes,$(build-static-nss))
$(objpfx)getent: $(objpfx)libnss_files.a
endif
diff --git a/po/libc.pot b/po/libc.pot
index d4e9becd07..22dcecd61e 100644
--- a/po/libc.pot
+++ b/po/libc.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: libc 2.1.92\n"
-"POT-Creation-Date: 2000-08-02 22:07-0700\n"
+"POT-Creation-Date: 2000-08-13 14:59-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"
@@ -200,7 +200,7 @@ msgstr ""
msgid " (changed)\n"
msgstr ""
-#: timezone/zic.c:423
+#: timezone/zic.c:421
#, c-format
msgid " (rule from \"%s\", line %d)"
msgstr ""
@@ -209,21 +209,21 @@ msgstr ""
msgid " [OPTION...]"
msgstr ""
-#: locale/programs/ld-collate.c:1712 locale/programs/ld-ctype.c:4046
+#: locale/programs/ld-collate.c:1720 locale/programs/ld-ctype.c:4046
msgid " done\n"
msgstr ""
-#: timezone/zic.c:420
+#: timezone/zic.c:418
#, c-format
msgid "\"%s\", line %d: %s"
msgstr ""
-#: timezone/zic.c:984
+#: timezone/zic.c:982
#, c-format
msgid "\"Zone %s\" line and -l option are mutually exclusive"
msgstr ""
-#: timezone/zic.c:992
+#: timezone/zic.c:990
#, c-format
msgid "\"Zone %s\" line and -p option are mutually exclusive"
msgstr ""
@@ -242,8 +242,8 @@ msgstr ""
msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
msgstr ""
-#: locale/programs/ld-address.c:576 locale/programs/ld-collate.c:2727
-#: locale/programs/ld-collate.c:3820 locale/programs/ld-ctype.c:2743
+#: locale/programs/ld-address.c:576 locale/programs/ld-collate.c:2735
+#: locale/programs/ld-collate.c:3844 locale/programs/ld-ctype.c:2743
#: 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
@@ -258,7 +258,7 @@ msgstr ""
msgid "%d libs found in cache `%s'\n"
msgstr ""
-#: timezone/zic.c:794
+#: timezone/zic.c:792
#, c-format
msgid "%s in ruleless zone"
msgstr ""
@@ -308,7 +308,7 @@ msgstr ""
msgid "%s%sUnknown signal %d\n"
msgstr ""
-#: timezone/zic.c:2229
+#: timezone/zic.c:2227
#, c-format
msgid "%s: %d did not sign extend correctly\n"
msgstr ""
@@ -328,42 +328,42 @@ msgstr ""
msgid "%s: C preprocessor failed with signal %d\n"
msgstr ""
-#: timezone/zic.c:1495
+#: timezone/zic.c:1493
#, c-format
msgid "%s: Can't create %s: %s\n"
msgstr ""
-#: timezone/zic.c:2207
+#: timezone/zic.c:2205
#, c-format
msgid "%s: Can't create directory %s: %s\n"
msgstr ""
-#: timezone/zic.c:646
+#: timezone/zic.c:644
#, c-format
msgid "%s: Can't link from %s to %s: %s\n"
msgstr ""
-#: timezone/zic.c:820
+#: timezone/zic.c:818
#, c-format
msgid "%s: Can't open %s: %s\n"
msgstr ""
-#: timezone/zic.c:1485
+#: timezone/zic.c:1483
#, c-format
msgid "%s: Can't remove %s: %s\n"
msgstr ""
-#: timezone/zic.c:631
+#: timezone/zic.c:629
#, c-format
msgid "%s: Can't unlink %s: %s\n"
msgstr ""
-#: timezone/zic.c:889
+#: timezone/zic.c:887
#, c-format
msgid "%s: Error closing %s: %s\n"
msgstr ""
-#: timezone/zic.c:882
+#: timezone/zic.c:880
#, c-format
msgid "%s: Error reading %s\n"
msgstr ""
@@ -373,42 +373,42 @@ msgstr ""
msgid "%s: Error writing "
msgstr ""
-#: timezone/zic.c:1561
+#: timezone/zic.c:1559
#, c-format
msgid "%s: Error writing %s\n"
msgstr ""
-#: timezone/zic.c:867
+#: timezone/zic.c:865
#, c-format
msgid "%s: Leap line in non leap seconds file %s\n"
msgstr ""
-#: timezone/zic.c:361
+#: timezone/zic.c:359
#, c-format
msgid "%s: Memory exhausted: %s\n"
msgstr ""
-#: timezone/zic.c:526
+#: timezone/zic.c:524
#, c-format
msgid "%s: More than one -L option specified\n"
msgstr ""
-#: timezone/zic.c:486
+#: timezone/zic.c:484
#, c-format
msgid "%s: More than one -d option specified\n"
msgstr ""
-#: timezone/zic.c:496
+#: timezone/zic.c:494
#, c-format
msgid "%s: More than one -l option specified\n"
msgstr ""
-#: timezone/zic.c:506
+#: timezone/zic.c:504
#, c-format
msgid "%s: More than one -p option specified\n"
msgstr ""
-#: timezone/zic.c:516
+#: timezone/zic.c:514
#, c-format
msgid "%s: More than one -y option specified\n"
msgstr ""
@@ -418,13 +418,13 @@ msgstr ""
msgid "%s: Too many arguments\n"
msgstr ""
-#: locale/programs/ld-collate.c:423 locale/programs/ld-collate.c:449
-#: locale/programs/ld-collate.c:465
+#: locale/programs/ld-collate.c:426 locale/programs/ld-collate.c:452
+#: locale/programs/ld-collate.c:468
#, c-format
msgid "%s: `%s' mentioned more than once in definition of weight %d"
msgstr ""
-#: locale/programs/ld-collate.c:1282
+#: locale/programs/ld-collate.c:1290
#, c-format
msgid "%s: `%s' must be a charater"
msgstr ""
@@ -440,36 +440,36 @@ msgstr ""
msgid "%s: `-1' must be last entry in `%s' field"
msgstr ""
-#: locale/programs/ld-collate.c:413 locale/programs/ld-collate.c:439
+#: locale/programs/ld-collate.c:416 locale/programs/ld-collate.c:442
#, c-format
msgid "%s: `forward' and `backward' are mutually excluding each other"
msgstr ""
-#: locale/programs/ld-collate.c:1475
+#: locale/programs/ld-collate.c:1483
#, c-format
msgid ""
"%s: `position' must be used for a specific level in all sections or none"
msgstr ""
-#: locale/programs/ld-collate.c:1082
+#: locale/programs/ld-collate.c:1090
#, 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:1040
+#: locale/programs/ld-collate.c:1048
#, c-format
msgid ""
"%s: byte sequences of first and last character must have the same length"
msgstr ""
-#: locale/programs/ld-collate.c:3742
+#: locale/programs/ld-collate.c:3766
#, c-format
msgid "%s: cannot have `%s' as end of ellipsis range"
msgstr ""
-#: locale/programs/ld-collate.c:3421
+#: locale/programs/ld-collate.c:3432
#, c-format
msgid "%s: cannot reorder after %.*s: symbol not known"
msgstr ""
@@ -503,7 +503,7 @@ msgstr ""
msgid "%s: character `%s' not defined while needed as default value"
msgstr ""
-#: timezone/zic.c:1928
+#: timezone/zic.c:1926
#, c-format
msgid "%s: command was '%s', result was %d\n"
msgstr ""
@@ -529,22 +529,22 @@ msgstr ""
msgid "%s: duplicate category version definition"
msgstr ""
-#: locale/programs/ld-collate.c:2845
+#: locale/programs/ld-collate.c:2853
#, c-format
msgid "%s: duplicate declaration of section `%s'"
msgstr ""
-#: locale/programs/ld-collate.c:2809
+#: locale/programs/ld-collate.c:2817
#, c-format
msgid "%s: duplicate definition of `%s'"
msgstr ""
-#: locale/programs/ld-collate.c:3792
+#: locale/programs/ld-collate.c:3816
#, c-format
msgid "%s: empty category description not allowed"
msgstr ""
-#: locale/programs/ld-collate.c:717
+#: locale/programs/ld-collate.c:720
#, c-format
msgid "%s: empty weight string not allowed"
msgstr ""
@@ -610,7 +610,7 @@ msgstr ""
msgid "%s: illegal option -- %c\n"
msgstr ""
-#: locale/programs/ld-address.c:573 locale/programs/ld-collate.c:3818
+#: locale/programs/ld-address.c:573 locale/programs/ld-collate.c:3842
#: locale/programs/ld-ctype.c:2740 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
@@ -635,7 +635,7 @@ msgstr ""
msgid "%s: invalid number for offset in string %Zd in `era' field"
msgstr ""
-#: locale/programs/ld-collate.c:3269
+#: locale/programs/ld-collate.c:3280
#, c-format
msgid "%s: invalid number of sorting rules"
msgstr ""
@@ -665,18 +665,18 @@ msgstr ""
msgid "%s: language abbreviation `%s' not defined"
msgstr ""
-#: locale/programs/ld-collate.c:3347 locale/programs/ld-collate.c:3460
-#: locale/programs/ld-collate.c:3796
+#: locale/programs/ld-collate.c:3358 locale/programs/ld-collate.c:3471
+#: locale/programs/ld-collate.c:3820
#, c-format
msgid "%s: missing `order_end' keyword"
msgstr ""
-#: locale/programs/ld-collate.c:3474 locale/programs/ld-collate.c:3808
+#: locale/programs/ld-collate.c:3485 locale/programs/ld-collate.c:3832
#, c-format
msgid "%s: missing `reorder-end' keyword"
msgstr ""
-#: locale/programs/ld-collate.c:3811
+#: locale/programs/ld-collate.c:3835
#, c-format
msgid "%s: missing `reorder-sections-end' keyword"
msgstr ""
@@ -691,12 +691,12 @@ msgstr ""
msgid "%s: missing era name in string %Zd in `era' field"
msgstr ""
-#: locale/programs/ld-collate.c:3247
+#: locale/programs/ld-collate.c:3258
#, c-format
msgid "%s: multiple order definitions for section `%s'"
msgstr ""
-#: locale/programs/ld-collate.c:3295
+#: locale/programs/ld-collate.c:3306
#, c-format
msgid "%s: multiple order definitions for unnamed section"
msgstr ""
@@ -711,7 +711,7 @@ msgstr ""
msgid "%s: no identification for category `%s'"
msgstr ""
-#: locale/programs/ld-collate.c:557
+#: locale/programs/ld-collate.c:560
#, c-format
msgid "%s: not enough sorting rules"
msgstr ""
@@ -761,17 +761,17 @@ msgstr ""
msgid "%s: option requires an argument -- %c\n"
msgstr ""
-#: locale/programs/ld-collate.c:1273 locale/programs/ld-collate.c:3755
+#: locale/programs/ld-collate.c:1281 locale/programs/ld-collate.c:3779
#, c-format
msgid "%s: order for `%.*s' already defined at %s:%Zu"
msgstr ""
-#: locale/programs/ld-collate.c:3409
+#: locale/programs/ld-collate.c:3420
#, c-format
msgid "%s: order for collating element %.*s not yet defined"
msgstr ""
-#: locale/programs/ld-collate.c:3390
+#: locale/programs/ld-collate.c:3401
#, c-format
msgid "%s: order for collating symbol %.*s not yet defined"
msgstr ""
@@ -781,13 +781,13 @@ msgstr ""
msgid "%s: output would overwrite %s\n"
msgstr ""
-#: timezone/zic.c:874 timezone/zic.c:1288 timezone/zic.c:1313
+#: timezone/zic.c:872 timezone/zic.c:1286 timezone/zic.c:1311
#, c-format
msgid "%s: panic: Invalid l_value %d\n"
msgstr ""
#: locale/programs/charmap.c:801 locale/programs/ld-address.c:592
-#: locale/programs/ld-collate.c:2724 locale/programs/ld-collate.c:3836
+#: locale/programs/ld-collate.c:2732 locale/programs/ld-collate.c:3860
#: locale/programs/ld-ctype.c:2760 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
@@ -798,7 +798,7 @@ msgstr ""
msgid "%s: premature end of file"
msgstr ""
-#: locale/programs/ld-collate.c:3508 locale/programs/ld-collate.c:3680
+#: locale/programs/ld-collate.c:3519 locale/programs/ld-collate.c:3704
#, c-format
msgid "%s: section `%.*s' not known"
msgstr ""
@@ -813,20 +813,20 @@ msgstr ""
msgid "%s: stopping date is invalid in string %Zd in `era' field"
msgstr ""
-#: locale/programs/ld-collate.c:1207
+#: locale/programs/ld-collate.c:1215
#, c-format
msgid "%s: symbolic range ellipsis must not be direct followed by `order_end'"
msgstr ""
-#: locale/programs/ld-collate.c:1203
+#: locale/programs/ld-collate.c:1211
#, 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:484
-#: locale/programs/ld-collate.c:536 locale/programs/ld-collate.c:827
-#: locale/programs/ld-collate.c:840 locale/programs/ld-collate.c:2715
-#: locale/programs/ld-collate.c:3827 locale/programs/ld-ctype.c:1815
+#: locale/programs/ld-address.c:583 locale/programs/ld-collate.c:487
+#: locale/programs/ld-collate.c:539 locale/programs/ld-collate.c:830
+#: locale/programs/ld-collate.c:843 locale/programs/ld-collate.c:2723
+#: locale/programs/ld-collate.c:3851 locale/programs/ld-ctype.c:1815
#: locale/programs/ld-ctype.c:2599 locale/programs/ld-ctype.c:2751
#: locale/programs/ld-identification.c:447
#: locale/programs/ld-measurement.c:239 locale/programs/ld-messages.c:333
@@ -867,9 +867,9 @@ msgstr ""
msgid "%s: terminology language code `%s' not defined"
msgstr ""
-#: locale/programs/ld-collate.c:1014
+#: locale/programs/ld-collate.c:1021
#, c-format
-msgid "%s: the start end the end symbol of a range must stand for characters"
+msgid "%s: the start and the end symbol of a range must stand for characters"
msgstr ""
#: locale/programs/ld-time.c:462
@@ -877,12 +877,12 @@ msgstr ""
msgid "%s: third operand for value of field `%s' must not be larger than %d"
msgstr ""
-#: locale/programs/ld-collate.c:521
+#: locale/programs/ld-collate.c:524
#, c-format
msgid "%s: too many rules; first entry only had %d"
msgstr ""
-#: locale/programs/ld-collate.c:868
+#: locale/programs/ld-collate.c:871
#, c-format
msgid "%s: too many values"
msgstr ""
@@ -897,17 +897,17 @@ msgstr ""
msgid "%s: unable to open %s: %m\n"
msgstr ""
-#: locale/programs/ld-collate.c:2982
+#: locale/programs/ld-collate.c:2991
#, c-format
msgid "%s: unknown character in collating symbol name"
msgstr ""
-#: locale/programs/ld-collate.c:3111
+#: locale/programs/ld-collate.c:3122
#, c-format
msgid "%s: unknown character in equivalent definition name"
msgstr ""
-#: locale/programs/ld-collate.c:3124
+#: locale/programs/ld-collate.c:3135
#, c-format
msgid "%s: unknown character in equivalent definition value"
msgstr ""
@@ -917,12 +917,12 @@ msgstr ""
msgid "%s: unknown character in field `%s'"
msgstr ""
-#: locale/programs/ld-collate.c:3221
+#: locale/programs/ld-collate.c:3232
#, c-format
msgid "%s: unknown section name `%s'"
msgstr ""
-#: locale/programs/ld-collate.c:3134
+#: locale/programs/ld-collate.c:3145
#, c-format
msgid "%s: unknown symbol `%s' in equivalent definition"
msgstr ""
@@ -937,12 +937,11 @@ msgstr ""
msgid "%s: unrecognized option `--%s'\n"
msgstr ""
-#: timezone/zic.c:445
+#: timezone/zic.c:443
#, c-format
msgid ""
-"%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] [ -d "
-"directory ]\n"
-"\t[ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
+"%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
+"\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
msgstr ""
#: timezone/zdump.c:174
@@ -987,7 +986,7 @@ msgstr ""
msgid "%s: values of field `%s' must not be larger than %d"
msgstr ""
-#: locale/programs/ld-collate.c:812
+#: locale/programs/ld-collate.c:815
#, c-format
msgid "%s: weights must use the same ellipsis symbol as the name"
msgstr ""
@@ -1212,7 +1211,7 @@ msgstr ""
msgid "Bad value for ai_flags"
msgstr ""
-#: locale/programs/localedef.c:99
+#: locale/programs/localedef.c:104
msgid "Be strictly POSIX conform"
msgstr ""
@@ -1452,7 +1451,7 @@ msgstr ""
msgid "Communication error on send"
msgstr ""
-#: locale/programs/localedef.c:107
+#: locale/programs/localedef.c:112
msgid "Compile locale specification"
msgstr ""
@@ -1465,7 +1464,7 @@ msgstr ""
msgid "Computing table size for character classes might take a while..."
msgstr ""
-#: locale/programs/ld-collate.c:1648
+#: locale/programs/ld-collate.c:1656
msgid "Computing table size for collation table might take a while..."
msgstr ""
@@ -1509,7 +1508,7 @@ msgstr ""
#: catgets/gencat.c:237 elf/ldconfig.c:252 elf/sprof.c:355
#: iconv/iconv_prog.c:351 locale/programs/locale.c:267
-#: locale/programs/localedef.c:303 nscd/nscd.c:287 nscd/nscd_nischeck.c:90
+#: locale/programs/localedef.c:311 nscd/nscd.c:287 nscd/nscd_nischeck.c:90
#: nss/getent.c:66 nss/makedb.c:244 posix/getconf.c:751
#, c-format
msgid ""
@@ -1527,11 +1526,11 @@ msgstr ""
msgid "Create C header file NAME containing symbol definitions"
msgstr ""
-#: locale/programs/localedef.c:98
+#: locale/programs/localedef.c:102
msgid "Create old-style tables"
msgstr ""
-#: locale/programs/localedef.c:97
+#: locale/programs/localedef.c:101
msgid "Create output even if warning messages were issued"
msgstr ""
@@ -1892,11 +1891,11 @@ msgstr ""
msgid "Exec format error"
msgstr ""
-#: locale/programs/localedef.c:185
+#: locale/programs/localedef.c:190
msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
msgstr ""
-#: locale/programs/localedef.c:93
+#: locale/programs/localedef.c:97
msgid "FILE contains mapping from symbolic names to UCS4 values"
msgstr ""
@@ -2179,7 +2178,7 @@ msgstr ""
msgid "Information:"
msgstr ""
-#: locale/programs/localedef.c:88
+#: locale/programs/localedef.c:92
msgid "Input Files:"
msgstr ""
@@ -2469,7 +2468,7 @@ msgstr ""
msgid "Must specify user name for server-user option"
msgstr ""
-#: catgets/gencat.c:107 catgets/gencat.c:111 locale/programs/localedef.c:110
+#: catgets/gencat.c:107 catgets/gencat.c:111 locale/programs/localedef.c:115
#: nscd/nscd.c:83 nss/makedb.c:61
msgid "NAME"
msgstr ""
@@ -2615,7 +2614,7 @@ msgstr ""
msgid "No data available"
msgstr ""
-#: locale/programs/ld-address.c:131 locale/programs/ld-collate.c:1460
+#: locale/programs/ld-address.c:131 locale/programs/ld-collate.c:1468
#: locale/programs/ld-ctype.c:385 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
@@ -2659,7 +2658,7 @@ msgstr ""
msgid "No more records in map database"
msgstr ""
-#: posix/regex.c:5936
+#: posix/regex.c:5948
msgid "No previous regular expression"
msgstr ""
@@ -2851,7 +2850,7 @@ msgstr ""
msgid "Object with same name exists"
msgstr ""
-#: timezone/zic.c:2023
+#: timezone/zic.c:2021
msgid "Odd number of quotation marks"
msgstr ""
@@ -2926,6 +2925,10 @@ msgstr ""
msgid "Option not supported by protocol"
msgstr ""
+#: locale/programs/localedef.c:103
+msgid "Optional output file prefix"
+msgstr ""
+
#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:93
msgid "Out of stream resources"
msgstr ""
@@ -2934,7 +2937,7 @@ msgstr ""
msgid "Out of streams resources"
msgstr ""
-#: iconv/iconv_prog.c:60 locale/programs/localedef.c:95
+#: iconv/iconv_prog.c:60 locale/programs/localedef.c:99
msgid "Output control:"
msgstr ""
<