Updated to fedora-glibc-2_3-20050704T1133

10 files changed, 1549 insertions, 1377 deletions

diff --git a/ChangeLog b/ChangeLog
index 4f92b79be9..755fcd6965 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2005-04-27  Roland McGrath  <roland@redhat.com>
+
+	[BZ #877]
+	* posix/unistd.h: Remove __nonnull from acct decl.
+
+2005-04-14  Roland McGrath  <roland@redhat.com>
+
+	[BZ #253]
+	* po/libc.pot: Regenerated.
+
+	* MakeTAGS ($P/$(domain).pot): Depend on distinfo file as well.
+	(extract): Filter-out distinfo file name.
+
+	[BZ #253]
+	* MakeTAGS (text-srcs): Match %.bash.in files too.
+
+	[BZ #253]
+	* nscd/Makefile (all-nscd-modules): New variable, include selinux
+	module regardless of configuration.
+	(distribute): Use that instead of $(nscd-modules).
+
+2005-04-14  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #851]
+	* posix/execvp.c (execvp): Use file name including path when
+	trying to run it with shell.
+	* posix/Makefile: Add rules to build and run tst-execvp3.
+	* posix/tst-execvp3.c: New file.
+
+2005-04-07  Roland McGrath  <roland@redhat.com>
+
+	* po/libc.pot: Regenerated.
+
 2005-04-05  Roland McGrath  <roland@redhat.com>
 
 	* NEWS, version.h (VERSION): 2.3.5.
diff --git a/MakeTAGS b/MakeTAGS
index bee41252ee..fff6851c91 100644
--- a/MakeTAGS
+++ b/MakeTAGS
@@ -1,5 +1,5 @@
 # Make the TAGS files.
-# Copyright (C) 1992,1994,1995,1996,1998,2002,2003
+# Copyright (C) 1992,1994,1995,1996,1998,2002,2003,2005
 #	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
@@ -146,12 +146,13 @@ endif
 define extract
 @rm -f $@.new
 $(XGETTEXT) --keyword=_ --keyword=N_ --add-comments=TRANS  --sort-by-file \
-	    --omit-header -E -n -d - $(XGETTEXTFLAGS-$(@F)) > $@.new $^
+	    --omit-header -E -n -d - $(XGETTEXTFLAGS-$(@F)) > $@.new \
+	    $(filter-out $(objpfx)distinfo,$^)
 mv -f $@.new $@
 endef
 
-text-srcs := $(filter %.c %.h %.cc %.C,$(tags_sources))
-$P/$(domain).pot: $(text-srcs)
+text-srcs := $(filter %.c %.h %.cc %.C %.bash.in,$(tags_sources))
+$P/$(domain).pot: $(objpfx)distinfo $(text-srcs)
 ifeq (,$(text-srcs))
 	cp /dev/null $@
 else
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 4223a62200..5c9f791034 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,7 +3,5 @@ glibc-branch := fedora-2_3
 glibc-base := glibc-2_3-branch
 DIST_BRANCH := FC-3
 COLLECTION := dist-fc3-updates-candidate
-releases-url := ftp://sources.redhat.com/pub/glibc/releases
-fedora-2_3-sync-date := 2005-04-07 02:42 UTC
-fedora-2_3-sync-tag := glibc-2_3_5
-upstream := 2.3.5
+fedora-2_3-sync-date := 2005-07-04 11:33 UTC
+fedora-2_3-sync-tag := fedora-glibc-2_3-20050704T1133
diff --git a/nscd/Makefile b/nscd/Makefile
index 23feca4273..75a9d434f4 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1998, 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1998,2000,2002,2003,2004,2005 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -51,6 +51,7 @@ otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
 	     $(resolvobjdir)/libresolv.a
 endif
 
+all-nscd-modules := $(nscd-modules) selinux
 ifeq (yes,$(have-selinux))
 nscd-modules += selinux
 selinux-LIBS := -lselinux
@@ -59,7 +60,7 @@ endif
 LDLIBS-nscd = $(selinux-LIBS)
 
 distribute := nscd.h nscd-client.h dbg_log.h \
-	      $(addsuffix .c, $(filter-out xmalloc, $(nscd-modules))) \
+	      $(addsuffix .c, $(filter-out xmalloc,$(all-nscd-modules))) \
 	      nscd_nischeck.c nscd.conf nscd.init nscd_proto.h \
 	      nscd-types.h
 
diff --git a/po/.cvsignore b/po/.cvsignore
index f3acb7df82..02da896169 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -41,6 +41,9 @@ crypt.pot
 argp.pot
 linuxthreads_db.pot
 linuxthreads.pot
+nptl_db.pot
+nptl.pot
+libidn.pot
 soft-fp.pot
 resolv.pot
 nss.pot
diff --git a/po/libc.pot b/po/libc.pot
index cd4f561738..88172d2bf4 100644
--- a/po/libc.pot
+++ b/po/libc.pot
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.3.2\n"
-"POT-Creation-Date: 2003-02-22 15:34-0800\n"
+"Project-Id-Version: libc 2.3.6\n"
+"POT-Creation-Date: 2005-04-14 23:31-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -59,9 +59,8 @@ msgstr ""
 #. TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
 #. TRANS or blocked.  Thus, your program will never actually see @code{EPIPE}
 #. TRANS unless it has handled or blocked @code{SIGPIPE}.
-#: sysdeps/generic/siglist.h:39 stdio-common/../sysdeps/gnu/errlist.c:351
+#: sysdeps/generic/siglist.h:39 stdio-common/../sysdeps/gnu/errlist.c:359
 #: stdio-common/../sysdeps/unix/siglist.c:39
-#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:62
 msgid "Broken pipe"
 msgstr ""
 
@@ -178,12 +177,12 @@ msgstr ""
 msgid "cannot read header from `%s'"
 msgstr ""
 
-#: iconv/iconv_charmap.c:159 iconv/iconv_prog.c:293 catgets/gencat.c:288
+#: iconv/iconv_charmap.c:159 iconv/iconv_prog.c:295 catgets/gencat.c:289
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr ""
 
-#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:311
+#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:313
 #, c-format
 msgid "error while closing input `%s'"
 msgstr ""
@@ -193,16 +192,16 @@ msgstr ""
 msgid "illegal input sequence at position %Zd"
 msgstr ""
 
-#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:503
+#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:523
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr ""
 
-#: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:543 iconv/iconv_prog.c:546
-#: iconv/iconv_prog.c:582
+#: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:543 iconv/iconv_prog.c:566
+#: iconv/iconv_prog.c:602
 msgid "error while reading the input"
 msgstr ""
 
-#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:564
+#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:584
 msgid "unable to allocate buffer for input"
 msgstr ""
 
@@ -254,48 +253,50 @@ msgstr ""
 msgid "[FILE...]"
 msgstr ""
 
-#: iconv/iconv_prog.c:199
+#: iconv/iconv_prog.c:201
 msgid "cannot open output file"
 msgstr ""
 
-#: iconv/iconv_prog.c:241
+#: iconv/iconv_prog.c:243
 #, c-format
 msgid "conversion from `%s' and to `%s' are not supported"
 msgstr ""
 
-#: iconv/iconv_prog.c:246
+#: iconv/iconv_prog.c:248
 #, c-format
 msgid "conversion from `%s' is not supported"
 msgstr ""
 
-#: iconv/iconv_prog.c:253
+#: iconv/iconv_prog.c:255
 #, c-format
 msgid "conversion to `%s' is not supported"
 msgstr ""
 
-#: iconv/iconv_prog.c:257
+#: iconv/iconv_prog.c:259
 #, c-format
 msgid "conversion from `%s' to `%s' is not supported"
 msgstr ""
 
-#: iconv/iconv_prog.c:263
+#: iconv/iconv_prog.c:265
 msgid "failed to start conversion processing"
 msgstr ""
 
-#: iconv/iconv_prog.c:358
+#: iconv/iconv_prog.c:359
 msgid "error while closing output file"
 msgstr ""
 
-#: iconv/iconv_prog.c:407 iconv/iconvconfig.c:357 locale/programs/locale.c:274
+#: iconv/iconv_prog.c:408 iconv/iconvconfig.c:381
 #: locale/programs/localedef.c:372 catgets/gencat.c:233
-#: malloc/memusagestat.c:602 debug/pcprofiledump.c:199
-msgid "Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"
+#: malloc/memusagestat.c:524 nss/getent.c:787 debug/pcprofiledump.c:199
+msgid ""
+"For bug reporting instructions, please see:\n"
+"<http://www.gnu.org/software/libc/bugs.html>.\n"
 msgstr ""
 
-#: iconv/iconv_prog.c:421 iconv/iconvconfig.c:371 locale/programs/locale.c:287
-#: locale/programs/localedef.c:386 catgets/gencat.c:246 posix/getconf.c:910
-#: nss/getent.c:74 nscd/nscd.c:330 nscd/nscd_nischeck.c:90 elf/ldconfig.c:271
-#: elf/sprof.c:349
+#: iconv/iconv_prog.c:423 iconv/iconvconfig.c:396 locale/programs/locale.c:276
+#: locale/programs/localedef.c:388 catgets/gencat.c:247 posix/getconf.c:963
+#: nss/getent.c:82 nscd/nscd.c:394 nscd/nscd_nischeck.c:90 elf/ldconfig.c:278
+#: elf/ldd.bash.in:39 elf/sprof.c:355
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -303,33 +304,33 @@ msgid ""
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 
-#: iconv/iconv_prog.c:426 iconv/iconvconfig.c:376 locale/programs/locale.c:292
-#: locale/programs/localedef.c:391 catgets/gencat.c:251 posix/getconf.c:915
-#: nss/getent.c:79 nscd/nscd.c:335 nscd/nscd_nischeck.c:95 elf/ldconfig.c:276
-#: elf/sprof.c:355
+#: iconv/iconv_prog.c:428 iconv/iconvconfig.c:401 locale/programs/locale.c:281
+#: locale/programs/localedef.c:393 catgets/gencat.c:252 posix/getconf.c:968
+#: nss/getent.c:87 nscd/nscd.c:399 nscd/nscd_nischeck.c:95 elf/ldconfig.c:283
+#: elf/sprof.c:361
 #, c-format
 msgid "Written by %s.\n"
 msgstr ""
 
-#: iconv/iconv_prog.c:456 iconv/iconv_prog.c:482
+#: iconv/iconv_prog.c:468 iconv/iconv_prog.c:494
 msgid "conversion stopped due to problem in writing the output"
 msgstr ""
 
-#: iconv/iconv_prog.c:499
+#: iconv/iconv_prog.c:519
 #, c-format
 msgid "illegal input sequence at position %ld"
 msgstr ""
 
-#: iconv/iconv_prog.c:507
+#: iconv/iconv_prog.c:527
 msgid "internal error (illegal descriptor)"
 msgstr ""
 
-#: iconv/iconv_prog.c:510
+#: iconv/iconv_prog.c:530
 #, c-format
 msgid "unknown iconv() error %d"
 msgstr ""
 
-#: iconv/iconv_prog.c:753
+#: iconv/iconv_prog.c:776
 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"
@@ -339,27 +340,41 @@ msgid ""
 "  "
 msgstr ""
 
-#: iconv/iconvconfig.c:110
+#: iconv/iconvconfig.c:111
 msgid "Create fastloading iconv module configuration file."
 msgstr ""
 
-#: iconv/iconvconfig.c:114
+#: iconv/iconvconfig.c:115
 msgid "[DIR...]"
 msgstr ""
 
-#: iconv/iconvconfig.c:126
+#: iconv/iconvconfig.c:128
 msgid "Prefix used for all file accesses"
 msgstr ""
 
-#: iconv/iconvconfig.c:327 locale/programs/localedef.c:292
+#: iconv/iconvconfig.c:129
+msgid ""
+"Put output in FILE instead of installed location (--prefix does not apply to "
+"FILE)"
+msgstr ""
+
+#: iconv/iconvconfig.c:133
+msgid "Do not search standard directories, only those on the command line"
+msgstr ""
+
+#: iconv/iconvconfig.c:302
+msgid "Directory arguments required when using --nostdlib"
+msgstr ""
+
+#: iconv/iconvconfig.c:344 locale/programs/localedef.c:292
 msgid "no output file produced because warning were issued"
 msgstr ""
 
-#: iconv/iconvconfig.c:405
+#: iconv/iconvconfig.c:430
 msgid "while inserting in search tree"
 msgstr ""
 
-#: iconv/iconvconfig.c:1204
+#: iconv/iconvconfig.c:1238
 msgid "cannot generate output file"
 msgstr ""
 
@@ -368,165 +383,165 @@ msgstr ""
 msgid "cannot read character map directory `%s'"
 msgstr ""
 
-#: locale/programs/charmap.c:135
+#: locale/programs/charmap.c:138
 #, c-format
 msgid "character map file `%s' not found"
 msgstr ""
 
-#: locale/programs/charmap.c:193
+#: locale/programs/charmap.c:196
 #, c-format
 msgid "default character map file `%s' not found"
 msgstr ""
 
-#: locale/programs/charmap.c:255
+#: locale/programs/charmap.c:259
 #, c-format
 msgid ""
 "character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
 msgstr ""
 
-#: locale/programs/charmap.c:332
+#: locale/programs/charmap.c:338
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr ""
 
-#: locale/programs/charmap.c:352 locale/programs/charmap.c:369
-#: locale/programs/repertoire.c:175
+#: locale/programs/charmap.c:358 locale/programs/charmap.c:375
+#: locale/programs/repertoire.c:176
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr ""
 
-#: locale/programs/charmap.c:353
+#: locale/programs/charmap.c:359
 msgid "invalid definition"
 msgstr ""
 
-#: locale/programs/charmap.c:370 locale/programs/locfile.c:126
-#: locale/programs/locfile.c:153 locale/programs/repertoire.c:176
+#: locale/programs/charmap.c:376 locale/programs/locfile.c:127
+#: locale/programs/locfile.c:154 locale/programs/repertoire.c:177
 msgid "bad argument"
 msgstr ""
 
-#: locale/programs/charmap.c:398
+#: locale/programs/charmap.c:404
 #, c-format
 msgid "duplicate definition of <%s>"
 msgstr ""
 
-#: locale/programs/charmap.c:405
+#: locale/programs/charmap.c:411
 #, c-format
 msgid "value for <%s> must be 1 or greater"
 msgstr ""
 
-#: locale/programs/charmap.c:417
+#: locale/programs/charmap.c:423
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr ""
 
-#: locale/programs/charmap.c:440 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:446 locale/programs/repertoire.c:185
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr ""
 
-#: locale/programs/charmap.c:466
+#: locale/programs/charmap.c:472
 msgid "character sets with locking states are not supported"
 msgstr ""
 
-#: locale/programs/charmap.c:493 locale/programs/charmap.c:547
-#: locale/programs/charmap.c:579 locale/programs/charmap.c:673
-#: locale/programs/charmap.c:728 locale/programs/charmap.c:769
-#: locale/programs/charmap.c:810
+#: locale/programs/charmap.c:499 locale/programs/charmap.c:553
+#: locale/programs/charmap.c:585 locale/programs/charmap.c:679
+#: locale/programs/charmap.c:734 locale/programs/charmap.c:775
+#: locale/programs/charmap.c:816
 #, c-format
 msgid "syntax error in %s definition: %s"
 msgstr ""
 
-#: locale/programs/charmap.c:494 locale/programs/charmap.c:674
-#: locale/programs/charmap.c:770 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:500 locale/programs/charmap.c:680
+#: locale/programs/charmap.c:776 locale/programs/repertoire.c:232
 msgid "no symbolic name given"
 msgstr ""
 
-#: locale/programs/charmap.c:548
+#: locale/programs/charmap.c:554
 msgid "invalid encoding given"
 msgstr ""
 
-#: locale/programs/charmap.c:557
+#: locale/programs/charmap.c:563
 msgid "too few bytes in character encoding"
 msgstr ""
 
-#: locale/programs/charmap.c:559
+#: locale/programs/charmap.c:565
 msgid "too many bytes in character encoding"
 msgstr ""
 
-#: locale/programs/charmap.c:581 locale/programs/charmap.c:729
-#: locale/programs/charmap.c:812 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:587 locale/programs/charmap.c:735
+#: locale/programs/charmap.c:818 locale/programs/repertoire.c:298
 msgid "no symbolic name given for end of range"
 msgstr ""
 
-#: locale/programs/charmap.c:605 locale/programs/locfile.h:96
-#: locale/programs/repertoire.c:314
+#: locale/programs/charmap.c:611 locale/programs/locfile.c:819
+#: locale/programs/repertoire.c:315
 #, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr ""
 
-#: locale/programs/charmap.c:638
+#: locale/programs/charmap.c:644
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr ""
 
-#: locale/programs/charmap.c:646 locale/programs/charmap.c:709
+#: locale/programs/charmap.c:652 locale/programs/charmap.c:715
 #, c-format
 msgid "value for %s must be an integer"
 msgstr ""
 
-#: locale/programs/charmap.c:837
+#: locale/programs/charmap.c:843
 #, c-format
 msgid "%s: error in state machine"
 msgstr ""
 
-#: locale/programs/charmap.c:845 locale/programs/ld-address.c:605
-#: locale/programs/ld-collate.c:2635 locale/programs/ld-collate.c:3793
-#: locale/programs/ld-ctype.c:2216 locale/programs/ld-ctype.c:2977
+#: locale/programs/charmap.c:851 locale/programs/ld-address.c:605
+#: locale/programs/ld-collate.c:2650 locale/programs/ld-collate.c:3818
+#: locale/programs/ld-ctype.c:2226 locale/programs/ld-ctype.c:2995
 #: locale/programs/ld-identification.c:469
 #: locale/programs/ld-measurement.c:255 locale/programs/ld-messages.c:349
-#: locale/programs/ld-monetary.c:952 locale/programs/ld-name.c:324
+#: locale/programs/ld-monetary.c:958 locale/programs/ld-name.c:324
 #: locale/programs/ld-numeric.c:392 locale/programs/ld-paper.c:258
-#: locale/programs/ld-telephone.c:330 locale/programs/ld-time.c:1217
-#: locale/programs/locfile.h:103 locale/programs/repertoire.c:325
+#: locale/programs/ld-telephone.c:330 locale/programs/ld-time.c:1220
+#: locale/programs/locfile.c:826 locale/programs/repertoire.c:326
 #, c-format
 msgid "%s: premature end of file"
 msgstr ""
 
-#: locale/programs/charmap.c:864 locale/programs/charmap.c:875
+#: locale/programs/charmap.c:870 locale/programs/charmap.c:881
 #, c-format
 msgid "unknown character `%s'"
 msgstr ""
 
-#: locale/programs/charmap.c:883
+#: locale/programs/charmap.c:889
 #, c-format
 msgid ""
 "number of bytes for byte sequence of beginning and end of range not the "
 "same: %d vs %d"
 msgstr ""
 
-#: locale/programs/charmap.c:987 locale/programs/ld-collate.c:2915
-#: locale/programs/repertoire.c:420
+#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:2930
+#: locale/programs/repertoire.c:421
 msgid "invalid names for character range"
 msgstr ""
 
-#: locale/programs/charmap.c:999 locale/programs/repertoire.c:432
+#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:433
 msgid "hexadecimal range format should use only capital characters"
 msgstr ""
 
-#: locale/programs/charmap.c:1017
+#: locale/programs/charmap.c:1023
 #, c-format
 msgid "<%s> and <%s> are illegal names for range"
 msgstr ""
 
-#: locale/programs/charmap.c:1023
+#: locale/programs/charmap.c:1029
 msgid "upper limit in range is not higher then lower limit"
 msgstr ""
 
-#: locale/programs/charmap.c:1081
+#: locale/programs/charmap.c:1087
 msgid "resulting bytes for range not representable."
 msgstr ""
 
-#: locale/programs/ld-address.c:134 locale/programs/ld-collate.c:1519
-#: locale/programs/ld-ctype.c:416 locale/programs/ld-identification.c:134
+#: locale/programs/ld-address.c:134 locale/programs/ld-collate.c:1534
+#: locale/programs/ld-ctype.c:421 locale/programs/ld-identification.c:134
 #: locale/programs/ld-measurement.c:95 locale/programs/ld-messages.c:98
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:95
 #: locale/programs/ld-numeric.c:99 locale/programs/ld-paper.c:92
@@ -540,8 +555,8 @@ msgstr ""
 #: locale/programs/ld-address.c:290 locale/programs/ld-address.c:309
 #: locale/programs/ld-address.c:322 locale/programs/ld-identification.c:147
 #: locale/programs/ld-measurement.c:106 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:106
+#: locale/programs/ld-monetary.c:250 locale/programs/ld-monetary.c:266
+#: locale/programs/ld-monetary.c:278 locale/programs/ld-name.c:106
 #: locale/programs/ld-name.c:143 locale/programs/ld-numeric.c:113
 #: locale/programs/ld-numeric.c:127 locale/programs/ld-paper.c:103
 #: locale/programs/ld-paper.c:112 locale/programs/ld-telephone.c:106
@@ -585,522 +600,522 @@ msgid "%s: numeric country code `%d' not valid"
 msgstr ""
 
 #: locale/programs/ld-address.c:497 locale/programs/ld-address.c:534
-#: locale/programs/ld-address.c:572 locale/programs/ld-ctype.c:2592
+#: locale/programs/ld-address.c:572 locale/programs/ld-ctype.c:2602
 #: locale/programs/ld-identification.c:365
 #: locale/programs/ld-measurement.c:222 locale/programs/ld-messages.c:302
-#: locale/programs/ld-monetary.c:694 locale/programs/ld-monetary.c:729
-#: locale/programs/ld-monetary.c:770 locale/programs/ld-name.c:281
+#: locale/programs/ld-monetary.c:700 locale/programs/ld-monetary.c:735
+#: locale/programs/ld-monetary.c:776 locale/programs/ld-name.c:281
 #: locale/programs/ld-numeric.c:264 locale/programs/ld-paper.c:225
-#: locale/programs/ld-telephone.c:289 locale/programs/ld-time.c:1106
-#: locale/programs/ld-time.c:1148
+#: locale/programs/ld-telephone.c:289 locale/programs/ld-time.c:1109
+#: locale/programs/ld-time.c:1151
 #, c-format
 msgid "%s: field `%s' declared more than once"
 msgstr ""
 
 #: locale/programs/ld-address.c:501 locale/programs/ld-address.c:539
 #: locale/programs/ld-identification.c:369 locale/programs/ld-messages.c:312
-#: locale/programs/ld-monetary.c:698 locale/programs/ld-monetary.c:733
+#: locale/programs/ld-monetary.c:704 locale/programs/ld-monetary.c:739
 #: locale/programs/ld-name.c:285 locale/programs/ld-numeric.c:268
-#: locale/programs/ld-telephone.c:293 locale/programs/ld-time.c:1000
-#: locale/programs/ld-time.c:1069 locale/programs/ld-time.c:1111
+#: locale/programs/ld-telephone.c:293 locale/programs/ld-time.c:1003
+#: locale/programs/ld-time.c:1072 locale/programs/ld-time.c:1114
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr ""
 
-#: locale/programs/ld-address.c:586 locale/programs/ld-collate.c:3775
-#: locale/programs/ld-ctype.c:2957 locale/programs/ld-identification.c:450
+#: locale/programs/ld-address.c:586 locale/programs/ld-collate.c:3800
+#: locale/programs/ld-ctype.c:2975 locale/programs/ld-identification.c:450
 #: locale/programs/ld-measurement.c:236 locale/programs/ld-messages.c:331
-#: locale/programs/ld-monetary.c:934 locale/programs/ld-name.c:306