diff --git a/ChangeLog b/ChangeLog
index 1065883..ceb8333 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-01-10  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* po/libc.pot: Regenerate.
+
 2018-01-10  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #22636]
diff --git a/po/libc.pot b/po/libc.pot
index 6a08ce4..108a370 100644
--- a/po/libc.pot
+++ b/po/libc.pot
@@ -5,8 +5,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.25.90\n"
-"POT-Creation-Date: 2017-07-25 12:32+0530\n"
+"Project-Id-Version: libc 2.26.9000\n"
+"POT-Creation-Date: 2018-01-10 15:00+0000\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"
@@ -137,9 +137,9 @@ msgid ""
 msgstr ""
 
 #: catgets/gencat.c:229 debug/pcprofiledump.c:209 elf/ldconfig.c:308
-#: elf/pldd.c:252 elf/sln.c:77 elf/sprof.c:372 iconv/iconv_prog.c:408
-#: iconv/iconvconfig.c:379 locale/programs/locale.c:277
-#: locale/programs/localedef.c:366 login/programs/pt_chown.c:89
+#: elf/pldd.c:252 elf/sln.c:77 elf/sprof.c:372 iconv/iconv_prog.c:405
+#: iconv/iconvconfig.c:379 locale/programs/locale.c:275
+#: locale/programs/localedef.c:427 login/programs/pt_chown.c:89
 #: malloc/memusagestat.c:563 nss/getent.c:913 nss/makedb.c:369
 #: posix/getconf.c:503 sysdeps/unix/sysv/linux/lddlibc4.c:61
 #, c-format
@@ -150,8 +150,8 @@ msgstr ""
 
 #: catgets/gencat.c:245 debug/pcprofiledump.c:225 debug/xtrace.sh:64
 #: elf/ldconfig.c:324 elf/ldd.bash.in:38 elf/pldd.c:268 elf/sotruss.sh:75
-#: elf/sprof.c:389 iconv/iconv_prog.c:425 iconv/iconvconfig.c:396
-#: locale/programs/locale.c:294 locale/programs/localedef.c:392
+#: elf/sprof.c:389 iconv/iconv_prog.c:422 iconv/iconvconfig.c:396
+#: locale/programs/locale.c:292 locale/programs/localedef.c:453
 #: login/programs/pt_chown.c:63 malloc/memusage.sh:71 malloc/memusagestat.c:581
 #: nscd/nscd.c:509 nss/getent.c:86 nss/makedb.c:385 posix/getconf.c:485
 #: sysdeps/unix/sysv/linux/lddlibc4.c:68
@@ -163,9 +163,9 @@ msgid ""
 msgstr ""
 
 #: catgets/gencat.c:250 debug/pcprofiledump.c:230 debug/xtrace.sh:68
-#: elf/ldconfig.c:329 elf/pldd.c:273 elf/sprof.c:395 iconv/iconv_prog.c:430
-#: iconv/iconvconfig.c:401 locale/programs/locale.c:299
-#: locale/programs/localedef.c:397 malloc/memusage.sh:75
+#: elf/ldconfig.c:329 elf/pldd.c:273 elf/sprof.c:395 iconv/iconv_prog.c:427
+#: iconv/iconvconfig.c:401 locale/programs/locale.c:297
+#: locale/programs/localedef.c:458 malloc/memusage.sh:75
 #: malloc/memusagestat.c:586 nscd/nscd.c:514 nss/getent.c:91 nss/makedb.c:390
 #: posix/getconf.c:490
 #, c-format
@@ -176,7 +176,7 @@ msgstr ""
 msgid "*standard input*"
 msgstr ""
 
-#: catgets/gencat.c:287 iconv/iconv_charmap.c:167 iconv/iconv_prog.c:293
+#: catgets/gencat.c:287 iconv/iconv_charmap.c:167 iconv/iconv_prog.c:290
 #: nss/makedb.c:246
 #, c-format
 msgid "cannot open input file `%s'"
@@ -369,7 +369,7 @@ msgstr ""
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ""
 
-#: elf/cache.c:157 elf/ldconfig.c:1341
+#: elf/cache.c:157 elf/ldconfig.c:1332
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr ""
@@ -409,47 +409,47 @@ msgstr ""
 msgid "Renaming of %s to %s failed"
 msgstr ""
 
-#: elf/dl-close.c:397 elf/dl-open.c:478
+#: elf/dl-close.c:399 elf/dl-open.c:425
 msgid "cannot create scope list"
 msgstr ""
 
-#: elf/dl-close.c:837
+#: elf/dl-close.c:839
 msgid "shared object not open"
 msgstr ""
 
-#: elf/dl-deps.c:112
+#: elf/dl-deps.c:111
 msgid "DST not allowed in SUID/SGID programs"
 msgstr ""
 
-#: elf/dl-deps.c:125
+#: elf/dl-deps.c:124
 msgid "empty dynamic string token substitution"
 msgstr ""
 
-#: elf/dl-deps.c:131
+#: elf/dl-deps.c:130
 #, c-format
 msgid ""
 "cannot load auxiliary `%s' because of empty dynamic string token "
 "substitution\n"
 msgstr ""
 
-#: elf/dl-deps.c:467
+#: elf/dl-deps.c:442
 msgid "cannot allocate dependency list"
 msgstr ""
 
-#: elf/dl-deps.c:504 elf/dl-deps.c:564
+#: elf/dl-deps.c:479 elf/dl-deps.c:539
 msgid "cannot allocate symbol search list"
 msgstr ""
 
-#: elf/dl-deps.c:544
+#: elf/dl-deps.c:519
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr ""
 
-#: elf/dl-error-skeleton.c:87
-msgid "DYNAMIC LINKER BUG!!!"
+#: elf/dl-error-skeleton.c:80
+msgid "error while loading shared libraries"
 msgstr ""
 
-#: elf/dl-error-skeleton.c:136
-msgid "error while loading shared libraries"
+#: elf/dl-error-skeleton.c:113
+msgid "DYNAMIC LINKER BUG!!!"
 msgstr ""
 
 #: elf/dl-fptr.c:88 sysdeps/hppa/dl-fptr.c:95
@@ -464,143 +464,143 @@ msgstr ""
 msgid "internal error: symidx out of range of fptr table"
 msgstr ""
 
-#: elf/dl-hwcaps.c:191 elf/dl-hwcaps.c:203
+#: elf/dl-hwcaps.c:202 elf/dl-hwcaps.c:214
 msgid "cannot create capability list"
 msgstr ""
 
-#: elf/dl-load.c:412
+#: elf/dl-load.c:369
 msgid "cannot allocate name record"
 msgstr ""
 
-#: elf/dl-load.c:497 elf/dl-load.c:613 elf/dl-load.c:696 elf/dl-load.c:815
+#: elf/dl-load.c:455 elf/dl-load.c:568 elf/dl-load.c:657 elf/dl-load.c:753
 msgid "cannot create cache for search path"
 msgstr ""
 
-#: elf/dl-load.c:588
+#: elf/dl-load.c:551
 msgid "cannot create RUNPATH/RPATH copy"
 msgstr ""
 
-#: elf/dl-load.c:682
+#: elf/dl-load.c:644
 msgid "cannot create search path array"
 msgstr ""
 
-#: elf/dl-load.c:888
+#: elf/dl-load.c:825
 msgid "cannot stat shared object"
 msgstr ""
 
-#: elf/dl-load.c:965
+#: elf/dl-load.c:902
 msgid "cannot open zero fill device"
 msgstr ""
 
-#: elf/dl-load.c:1012 elf/dl-load.c:2172
+#: elf/dl-load.c:949 elf/dl-load.c:2125
 msgid "cannot create shared object descriptor"
 msgstr ""
 
-#: elf/dl-load.c:1031 elf/dl-load.c:1556 elf/dl-load.c:1668
+#: elf/dl-load.c:968 elf/dl-load.c:1499 elf/dl-load.c:1611
 msgid "cannot read file data"
 msgstr ""
 
-#: elf/dl-load.c:1071
+#: elf/dl-load.c:1014
 msgid "ELF load command alignment not page-aligned"
 msgstr ""
 
-#: elf/dl-load.c:1078
+#: elf/dl-load.c:1021
 msgid "ELF load command address/offset not properly aligned"
 msgstr ""
 
-#: elf/dl-load.c:1163
+#: elf/dl-load.c:1106
 msgid "object file has no loadable segments"
 msgstr ""
 
-#: elf/dl-load.c:1172 elf/dl-load.c:1648
+#: elf/dl-load.c:1115 elf/dl-load.c:1591
 msgid "cannot dynamically load executable"
 msgstr ""
 
-#: elf/dl-load.c:1193
+#: elf/dl-load.c:1136
 msgid "object file has no dynamic section"
 msgstr ""
 
-#: elf/dl-load.c:1216
+#: elf/dl-load.c:1159
 msgid "shared object cannot be dlopen()ed"
 msgstr ""
 
-#: elf/dl-load.c:1229
+#: elf/dl-load.c:1172
 msgid "cannot allocate memory for program header"
 msgstr ""
 
-#: elf/dl-load.c:1245 elf/dl-open.c:195
+#: elf/dl-load.c:1188 elf/dl-open.c:193
 msgid "invalid caller"
 msgstr ""
 
-#: elf/dl-load.c:1268 elf/dl-load.h:130
+#: elf/dl-load.c:1211 elf/dl-load.h:130
 msgid "cannot change memory protections"
 msgstr ""
 
-#: elf/dl-load.c:1288
+#: elf/dl-load.c:1231
 msgid "cannot enable executable stack as shared object requires"
 msgstr ""
 
-#: elf/dl-load.c:1301
+#: elf/dl-load.c:1244
 msgid "cannot close file descriptor"
 msgstr ""
 
-#: elf/dl-load.c:1556
+#: elf/dl-load.c:1499
 msgid "file too short"
 msgstr ""
 
-#: elf/dl-load.c:1591
+#: elf/dl-load.c:1534
 msgid "invalid ELF header"
 msgstr ""
 
-#: elf/dl-load.c:1603
+#: elf/dl-load.c:1546
 msgid "ELF file data encoding not big-endian"
 msgstr ""
 
-#: elf/dl-load.c:1605
+#: elf/dl-load.c:1548
 msgid "ELF file data encoding not little-endian"
 msgstr ""
 
-#: elf/dl-load.c:1609
+#: elf/dl-load.c:1552
 msgid "ELF file version ident does not match current one"
 msgstr ""
 
-#: elf/dl-load.c:1613
+#: elf/dl-load.c:1556
 msgid "ELF file OS ABI invalid"
 msgstr ""
 
-#: elf/dl-load.c:1616
+#: elf/dl-load.c:1559
 msgid "ELF file ABI version invalid"
 msgstr ""
 
-#: elf/dl-load.c:1619
+#: elf/dl-load.c:1562
 msgid "nonzero padding in e_ident"
 msgstr ""
 
-#: elf/dl-load.c:1622
+#: elf/dl-load.c:1565
 msgid "internal error"
 msgstr ""
 
-#: elf/dl-load.c:1629
+#: elf/dl-load.c:1572
 msgid "ELF file version does not match current one"
 msgstr ""
 
-#: elf/dl-load.c:1637
+#: elf/dl-load.c:1580
 msgid "only ET_DYN and ET_EXEC can be loaded"
 msgstr ""
 
-#: elf/dl-load.c:1653
+#: elf/dl-load.c:1596
 msgid "ELF file's phentsize not the expected size"
 msgstr ""
 
-#: elf/dl-load.c:2191
+#: elf/dl-load.c:2144
 msgid "wrong ELF class: ELFCLASS64"
 msgstr ""
 
-#: elf/dl-load.c:2192
+#: elf/dl-load.c:2145
 msgid "wrong ELF class: ELFCLASS32"
 msgstr ""
 
-#: elf/dl-load.c:2195
+#: elf/dl-load.c:2148
 msgid "cannot open shared object file"
 msgstr ""
 
@@ -612,68 +612,68 @@ msgstr ""
 msgid "cannot map zero-fill pages"
 msgstr ""
 
-#: elf/dl-lookup.c:849
+#: elf/dl-lookup.c:834
 msgid "relocation error"
 msgstr ""
 
-#: elf/dl-lookup.c:875
+#: elf/dl-lookup.c:857
 msgid "symbol lookup error"
 msgstr ""
 
-#: elf/dl-open.c:102
+#: elf/dl-open.c:101
 msgid "cannot extend global scope"
 msgstr ""
 
-#: elf/dl-open.c:528
+#: elf/dl-open.c:475
 msgid "TLS generation counter wrapped!  Please report this."
 msgstr ""
 
-#: elf/dl-open.c:592
+#: elf/dl-open.c:539
 msgid "invalid mode for dlopen()"
 msgstr ""
 
-#: elf/dl-open.c:609
+#: elf/dl-open.c:556
 msgid "no more namespaces available for dlmopen()"
 msgstr ""
 
-#: elf/dl-open.c:633
+#: elf/dl-open.c:580
 msgid "invalid target namespace in dlmopen()"
 msgstr ""
 
-#: elf/dl-reloc.c:121
+#: elf/dl-reloc.c:120
 msgid "cannot allocate memory in static TLS block"
 msgstr ""
 
-#: elf/dl-reloc.c:206
+#: elf/dl-reloc.c:205
 msgid "cannot make segment writable for relocation"
 msgstr ""
 
-#: elf/dl-reloc.c:277
+#: elf/dl-reloc.c:276
 #, c-format
 msgid "%s: out of memory to store relocation results for %s\n"
 msgstr ""
 
-#: elf/dl-reloc.c:293
+#: elf/dl-reloc.c:292
 msgid "cannot restore segment prot after reloc"
 msgstr ""
 
-#: elf/dl-reloc.c:324
+#: elf/dl-reloc.c:323
 msgid "cannot apply additional memory protection after relocation"
 msgstr ""
 
-#: elf/dl-sym.c:153
+#: elf/dl-sym.c:136
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr ""
 
-#: elf/dl-tls.c:940
+#: elf/dl-tls.c:931
 msgid "cannot create TLS data structures"
 msgstr ""
 
-#: elf/dl-version.c:166
+#: elf/dl-version.c:148
 msgid "version lookup error"
 msgstr ""
 
-#: elf/dl-version.c:296
+#: elf/dl-version.c:279
 msgid "cannot allocate version reference table"
 msgstr ""
 
@@ -790,7 +790,7 @@ msgstr ""
 msgid "Can't find %s"
 msgstr ""
 
-#: elf/ldconfig.c:603 elf/ldconfig.c:776 elf/ldconfig.c:835 elf/ldconfig.c:869
+#: elf/ldconfig.c:603 elf/ldconfig.c:769 elf/ldconfig.c:825 elf/ldconfig.c:857
 #, c-format
 msgid "Cannot lstat %s"
 msgstr ""
@@ -810,89 +810,89 @@ msgstr ""
 msgid "Can't open directory %s"
 msgstr ""
 
-#: elf/ldconfig.c:794 elf/ldconfig.c:856 elf/readlib.c:97
+#: elf/ldconfig.c:787 elf/ldconfig.c:845 elf/readlib.c:97
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr ""
 
-#: elf/ldconfig.c:801
+#: elf/ldconfig.c:794
 #, c-format
 msgid "Cannot stat %s"
 msgstr ""
 
-#: elf/ldconfig.c:952
+#: elf/ldconfig.c:939
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr ""
 
-#: elf/ldconfig.c:955
+#: elf/ldconfig.c:942
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr ""
 
-#: elf/ldconfig.c:958
+#: elf/ldconfig.c:945
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr ""
 
-#: elf/ldconfig.c:986
+#: elf/ldconfig.c:973
 #, c-format
 msgid ""
 "libraries %s and %s in directory %s have same soname but different type."
 msgstr ""
 
-#: elf/ldconfig.c:1095
+#: elf/ldconfig.c:1082
 #, c-format
 msgid "Warning: ignoring configuration file that cannot be opened: %s"
 msgstr ""
 
-#: elf/ldconfig.c:1161
+#: elf/ldconfig.c:1148
 #, c-format
 msgid "%s:%u: bad syntax in hwcap line"
 msgstr ""
 
-#: elf/ldconfig.c:1167
+#: elf/ldconfig.c:1154
 #, c-format
 msgid "%s:%u: hwcap index %lu above maximum %u"
 msgstr ""
 
-#: elf/ldconfig.c:1174 elf/ldconfig.c:1182
+#: elf/ldconfig.c:1161 elf/ldconfig.c:1169
 #, c-format
 msgid "%s:%u: hwcap index %lu already defined as %s"
 msgstr ""
 
-#: elf/ldconfig.c:1185
+#: elf/ldconfig.c:1172
 #, c-format
 msgid "%s:%u: duplicate hwcap %lu %s"
 msgstr ""
 
-#: elf/ldconfig.c:1207
+#: elf/ldconfig.c:1194
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr ""
 
-#: elf/ldconfig.c:1214 locale/programs/xmalloc.c:63 malloc/obstack.c:416
+#: elf/ldconfig.c:1201 locale/programs/xmalloc.c:63 malloc/obstack.c:416
 #: malloc/obstack.c:418 posix/getconf.c:458 posix/getconf.c:697
 #, c-format
 msgid "memory exhausted"
 msgstr ""
 
-#: elf/ldconfig.c:1246
+#: elf/ldconfig.c:1233
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr ""
 
-#: elf/ldconfig.c:1290
+#: elf/ldconfig.c:1281
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr ""
 
-#: elf/ldconfig.c:1320
+#: elf/ldconfig.c:1311
 #, c-format
 msgid "Can't chdir to /"
 msgstr ""
 
-#: elf/ldconfig.c:1361
+#: elf/ldconfig.c:1352
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr ""
@@ -943,15 +943,15 @@ msgstr ""
 msgid "warning: you do not have execution permission for"
 msgstr ""
 
-#: elf/ldd.bash.in:182
+#: elf/ldd.bash.in:170
 msgid "\tnot a dynamic executable"
 msgstr ""
 
-#: elf/ldd.bash.in:190
+#: elf/ldd.bash.in:178
 msgid "exited with unknown exit code"
 msgstr ""
 
-#: elf/ldd.bash.in:195
+#: elf/ldd.bash.in:183
 msgid "error: you do not have read permission for"
 msgstr ""
 
@@ -1297,12 +1297,12 @@ msgstr ""
 msgid "cannot allocate symbol data"
 msgstr ""
 
-#: iconv/iconv_charmap.c:141 iconv/iconv_prog.c:448
+#: iconv/iconv_charmap.c:141 iconv/iconv_prog.c:445
 #, c-format
 msgid "cannot open output file"
 msgstr ""
 
-#: iconv/iconv_charmap.c:187 iconv/iconv_prog.c:311
+#: iconv/iconv_charmap.c:187 iconv/iconv_prog.c:308
 #, c-format
 msgid "error while closing input `%s'"
 msgstr ""
@@ -1312,18 +1312,18 @@ msgstr ""
 msgid "illegal input sequence at position %Zd"
 msgstr ""
 
-#: iconv/iconv_charmap.c:454 iconv/iconv_prog.c:539
+#: iconv/iconv_charmap.c:454 iconv/iconv_prog.c:536
 #, c-format
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr ""
 
-#: iconv/iconv_charmap.c:499 iconv/iconv_charmap.c:535 iconv/iconv_prog.c:582
-#: iconv/iconv_prog.c:618
+#: iconv/iconv_charmap.c:499 iconv/iconv_charmap.c:535 iconv/iconv_prog.c:579
+#: iconv/iconv_prog.c:615
 #, c-format
 msgid "error while reading the input"
 msgstr ""
 
-#: iconv/iconv_charmap.c:517 iconv/iconv_prog.c:600
+#: iconv/iconv_charmap.c:517 iconv/iconv_prog.c:597
 #, c-format
 msgid "unable to allocate buffer for input"
 msgstr ""
@@ -1348,7 +1348,7 @@ msgstr ""
 msgid "list all known coded character sets"
 msgstr ""
 
-#: iconv/iconv_prog.c:64 locale/programs/localedef.c:123
+#: iconv/iconv_prog.c:64 locale/programs/localedef.c:120
 msgid "Output control:"
 msgstr ""
 
@@ -1357,8 +1357,8 @@ msgid "omit invalid characters from output"
 msgstr ""
 
 #: iconv/iconv_prog.c:66 iconv/iconvconfig.c:128
-#: locale/programs/localedef.c:116 locale/programs/localedef.c:118
-#: locale/programs/localedef.c:120 locale/programs/localedef.c:140
+#: locale/programs/localedef.c:113 locale/programs/localedef.c:115
+#: locale/programs/localedef.c:117 locale/programs/localedef.c:144
 #: malloc/memusagestat.c:56
 msgid "FILE"
 msgstr ""
@@ -1383,57 +1383,57 @@ msgstr ""
 msgid "[FILE...]"
 msgstr ""
 
-#: iconv/iconv_prog.c:233
+#: iconv/iconv_prog.c:230
 #, c-format
 msgid "conversions from `%s' and to `%s' are not supported"
 msgstr ""
 
-#: iconv/iconv_prog.c:238
+#: iconv/iconv_prog.c:235
 #, c-format
 msgid "conversion from `%s' is not supported"
 msgstr ""
 
-#: iconv/iconv_prog.c:245
+#: iconv/iconv_prog.c:242
 #, c-format
 msgid "conversion to `%s' is not supported"
 msgstr ""
 
-#: iconv/iconv_prog.c:249
+#: iconv/iconv_prog.c:246
 #, c-format
 msgid "conversion from `%s' to `%s' is not supported"
 msgstr ""
 
-#: iconv/iconv_prog.c:259
+#: iconv/iconv_prog.c:256
 #, c-format
 msgid "failed to start conversion processing"
 msgstr ""
 
-#: iconv/iconv_prog.c:357
+#: iconv/iconv_prog.c:354
 #, c-format
 msgid "error while closing output file"
 msgstr ""
 
-#: iconv/iconv_prog.c:458
+#: iconv/iconv_prog.c:455
 #, c-format
 msgid "conversion stopped due to problem in writing the output"
 msgstr ""
 
-#: iconv/iconv_prog.c:535
+#: iconv/iconv_prog.c:532
 #, c-format
 msgid "illegal input sequence at position %ld"
 msgstr ""
 
-#: iconv/iconv_prog.c:543
+#: iconv/iconv_prog.c:540
 #, c-format
 msgid "internal error (illegal descriptor)"
 msgstr ""
 
-#: iconv/iconv_prog.c:546
+#: iconv/iconv_prog.c:543
 #, c-format
 msgid "unknown iconv() error %d"
 msgstr ""
 
-#: iconv/iconv_prog.c:791
+#: iconv/iconv_prog.c:786
 msgid ""
 "The following list contains all the coded character sets known.  This does\n"
 "not necessarily mean that all combinations of these names can be used for\n"
@@ -1451,7 +1451,7 @@ msgstr ""
 msgid "[DIR...]"
 msgstr ""
 
-#: iconv/iconvconfig.c:126 locale/programs/localedef.c:126
+#: iconv/iconvconfig.c:126 locale/programs/localedef.c:123
 msgid "PATH"
 msgstr ""
 
@@ -1474,7 +1474,7 @@ msgstr ""
 msgid "Directory arguments required when using --nostdlib"
 msgstr ""
 
-#: iconv/iconvconfig.c:341 locale/programs/localedef.c:287
+#: iconv/iconvconfig.c:341
 #, c-format
 msgid "no output file produced because warnings were issued"
 msgstr ""
@@ -1484,7 +1484,7 @@ msgstr ""
 msgid "while inserting in search tree"
 msgstr ""
 
-#: iconv/iconvconfig.c:1239
+#: iconv/iconvconfig.c:1238
 #, c-format
 msgid "cannot generate output file"
 msgstr ""
@@ -1575,7 +1575,7 @@ msgstr ""
 msgid "Character out of range for UTF-8"
 msgstr ""
 
-#: locale/programs/charmap-dir.c:57
+#: locale/programs/charmap-dir.c:56
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr ""
@@ -1585,913 +1585,901 @@ msgstr ""
 msgid "character map file `%s' not found"
 msgstr ""
 
-#: locale/programs/charmap.c:195
+#: locale/programs/charmap.c:196
 #, c-format
 msgid "default character map file `%s' not found"
 msgstr ""
 
-#: locale/programs/charmap.c:258
+#: locale/programs/charmap.c:265
 #, c-format
 msgid ""
-"character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
+"character map `%s' is not ASCII compatible, locale not ISO C compliant [--no-"
+"warnings=ascii]"
 msgstr ""
 
-#: locale/programs/charmap.c:337
+#: locale/programs/charmap.c:343
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr ""
 
-#: locale/programs/charmap.c:357 locale/programs/charmap.c:374
-#: locale/programs/repertoire.c:174
+#: locale/programs/charmap.c:363 locale/programs/charmap.c:380
+#: locale/programs/repertoire.c:173
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr ""
 
-#: locale/programs/charmap.c:358
+#: locale/programs/charmap.c:364
 msgid "invalid definition"
 msgstr ""
 
-#: locale/programs/charmap.c:375 locale/programs/locfile.c:131
-#: locale/programs/locfile.c:158 locale/programs/repertoire.c:175
+#: locale/programs/charmap.c:381 locale/programs/locfile.c:131
+#: locale/programs/locfile.c:158 locale/programs/repertoire.c:174
 msgid "bad argument"
 msgstr ""
 
-#: locale/programs/charmap.c:403
+#: locale/programs/charmap.c:408
 #, c-format
 msgid "duplicate definition of <%s>"
 msgstr ""
 
-#: locale/programs/charmap.c:410
+#: locale/programs/charmap.c:415
 #, c-format
 msgid "value for <%s> must be 1 or greater"
 msgstr ""
 
-#: locale/programs/charmap.c:422
+#: locale/programs/charmap.c:427
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr ""
 
-#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183
+#: locale/programs/charmap.c:450 locale/programs/repertoire.c:182
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr ""
 
-#: locale/programs/charmap.c:471
+#: locale/programs/charmap.c:476
 msgid "character sets with locking states are not supported"
 msgstr ""
 
-#: locale/programs/charmap.c:498 locale/programs/charmap.c:552
-#: locale/programs/charmap.c:584 locale/programs/charmap.c:678
-#: locale/programs/charmap.c:733 locale/programs/charmap.c:774
-#: locale/programs/charmap.c:815
+#: locale/programs/charmap.c:503 locale/programs/charmap.c:557
+#: locale/programs/charmap.c:589 locale/programs/charmap.c:683
+#: locale/programs/charmap.c:738 locale/programs/charmap.c:779
+#: locale/programs/charmap.c:820
 #, c-format
 msgid "syntax error in %s definition: %s"
 msgstr ""
 
-#: locale/programs/charmap.c:499 locale/programs/charmap.c:679
-#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230
+#: locale/programs/charmap.c:504 locale/programs/charmap.c:684
+#: locale/programs/charmap.c:780 locale/programs/repertoire.c:229
 msgid "no symbolic name given"
 msgstr ""
 
-#: locale/programs/charmap.c:553
+#: locale/programs/charmap.c:558
 msgid "invalid encoding given"
 msgstr ""
 
-#: locale/programs/charmap.c:562
+#: locale/programs/charmap.c:567
 msgid "too few bytes in character encoding"
 msgstr ""
 
-#: locale/programs/charmap.c:564
+#: locale/programs/charmap.c:569
 msgid "too many bytes in character encoding"
 msgstr ""
 
-#: locale/programs/charmap.c:586 locale/programs/charmap.c:734
-#: locale/programs/charmap.c:817 locale/programs/repertoire.c:296
+#: locale/programs/charmap.c:591 locale/programs/charmap.c:739
+#: locale/programs/charmap.c:822 locale/programs/repertoire.c:295
 msgid "no symbolic name given for end of range"
 msgstr ""
 
-#: locale/programs/charmap.c:610 locale/programs/ld-address.c:528
-#: locale/programs/ld-collate.c:2626 locale/programs/ld-collate.c:3784
-#: locale/programs/ld-ctype.c:2128 locale/programs/ld-ctype.c:2840
-#: locale/programs/ld-identification.c:399 locale/programs/ld-measurement.c:215
-#: locale/programs/ld-messages.c:298 locale/programs/ld-monetary.c:740
-#: locale/programs/ld-name.c:264 locale/programs/ld-numeric.c:326
-#: locale/programs/ld-paper.c:214 locale/programs/ld-telephone.c:278
-#: locale/programs/ld-time.c:947 locale/programs/repertoire.c:313
+#: locale/programs/charmap.c:615 locale/programs/ld-address.c:524
+#: locale/programs/ld-collate.c:2616 locale/programs/ld-collate.c:3774
+#: locale/programs/ld-ctype.c:2117 locale/programs/ld-ctype.c:2829
+#: locale/programs/ld-identification.c:397 locale/programs/ld-measurement.c:213
+#: locale/programs/ld-messages.c:295 locale/programs/ld-monetary.c:748
+#: locale/programs/ld-name.c:262 locale/programs/ld-numeric.c:325
+#: locale/programs/ld-paper.c:212 locale/programs/ld-telephone.c:276
+#: locale/programs/ld-time.c:934 locale/programs/repertoire.c:312
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
 msgstr ""
 
-#: locale/programs/charmap.c:643
+#: locale/programs/charmap.c:648
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr ""
 
-#: locale/programs/charmap.c:651 locale/programs/charmap.c:714
+#: locale/programs/charmap.c:656 locale/programs/charmap.c:719
 #, c-format
 msgid "value for %s must be an integer"
 msgstr ""
 
-#: locale/programs/charmap.c:842
+#: locale/programs/charmap.c:847
 #, c-format
 msgid "%s: error in state machine"
 msgstr ""
 
-#: locale/programs/charmap.c:850 locale/programs/ld-address.c:544
-#: locale/programs/ld-collate.c:2623 locale/programs/ld-collate.c:3977
-#: locale/programs/ld-ctype.c:2125 locale/programs/ld-ctype.c:2857
-#: locale/programs/ld-identification.c:415 locale/programs/ld-measurement.c:231
-#: locale/programs/ld-messages.c:314 locale/programs/ld-monetary.c:756
-#: locale/programs/ld-name.c:280 locale/programs/ld-numeric.c:342
-#: locale/programs/ld-paper.c:230 locale/programs/ld-telephone.c:294
-#: locale/programs/ld-time.c:963 locale/programs/locfile.c:1000
-#: locale/programs/repertoire.c:324
+#: locale/programs/charmap.c:855 locale/programs/ld-address.c:540
+#: locale/programs/ld-collate.c:2613 locale/programs/ld-collate.c:3967
+#: locale/programs/ld-ctype.c:2114 locale/programs/ld-ctype.c:2846
+#: locale/programs/ld-identification.c:413 locale/programs/ld-measurement.c:229
+#: locale/programs/ld-messages.c:311 locale/programs/ld-monetary.c:764
+#: locale/programs/ld-name.c:278 locale/programs/ld-numeric.c:341
+#: locale/programs/ld-paper.c:228 locale/programs/ld-telephone.c:292
+#: locale/programs/ld-time.c:950 locale/programs/locfile.c:997
+#: locale/programs/repertoire.c:323
 #, c-format
 msgid "%s: premature end of file"
 msgstr ""
 
-#: locale/programs/charmap.c:869 locale/programs/charmap.c:880
+#: locale/programs/charmap.c:874 locale/programs/charmap.c:885
 #, c-format
 msgid "unknown character `%s'"
 msgstr ""
 
-#: locale/programs/charmap.c:888
+#: locale/programs/charmap.c:893
 #, 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:993 locale/programs/ld-collate.c:2903
-#: locale/programs/repertoire.c:419
+#: locale/programs/charmap.c:998 locale/programs/ld-collate.c:2893
+#: locale/programs/repertoire.c:418
 msgid "invalid names for character range"
 msgstr ""
 
-#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431
+#: locale/programs/charmap.c:1010 locale/programs/repertoire.c:430
 msgid "hexadecimal range format should use only capital characters"
 msgstr ""
 
-#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449
+#: locale/programs/charmap.c:1028 locale/programs/repertoire.c:448
 #, c-format
 msgid "<%s> and <%s> are invalid names for range"
 msgstr ""
 
-#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456
+#: locale/programs/charmap.c:1034 locale/programs/repertoire.c:455
 msgid "upper limit in range is smaller than lower limit"
 msgstr ""
 
-#: locale/programs/charmap.c:1087
+#: locale/programs/charmap.c:1092
 msgid "resulting bytes for range not representable."
 msgstr ""
 
-#: locale/programs/ld-address.c:135 locale/programs/ld-collate.c:1565
-#: locale/programs/ld-ctype.c:431 locale/programs/ld-identification.c:133
-#: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
-#: locale/programs/ld-monetary.c:193 locale/programs/ld-name.c:94
-#: locale/programs/ld-numeric.c:98 locale/programs/ld-paper.c:91
-#: locale/programs/ld-telephone.c:94 locale/programs/ld-time.c:159
+#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1563
+#: locale/programs/ld-ctype.c:430 locale/programs/ld-identification.c:131
+#: locale/programs/ld-measurement.c:92 locale/programs/ld-messages.c:96
+#: locale/programs/ld-monetary.c:192 locale/programs/ld-name.c:93
+#: locale/programs/ld-numeric.c:97 locale/programs/ld-paper.c:89
+#: locale/programs/ld-telephone.c:92 locale/programs/ld-time.c:158
 #, c-format
 msgid "No definition for %s category found"
 msgstr ""
 
-#: locale/programs/ld-address.c:146 locale/programs/ld-address.c:184
-#: locale/programs/ld-address.c:202 locale/programs/ld-address.c:231
-#: locale/programs/ld-address.c:303 locale/programs/ld-address.c:322
-#: locale/programs/ld-address.c:335 locale/programs/ld-identification.c:146
-#: locale/programs/ld-measurement.c:105 locale/programs/ld-monetary.c:205
-#: locale/programs/ld-monetary.c:249 locale/programs/ld-monetary.c:265
-#: locale/programs/ld-monetary.c:277 locale/programs/ld-name.c:105
-#: locale/programs/ld-name.c:142 locale/programs/ld-numeric.c:112
-#: locale/programs/ld-numeric.c:126 locale/programs/ld-paper.c:102
-#: locale/programs/ld-paper.c:111 locale/programs/ld-telephone.c:105
-#: locale/programs/ld-telephone.c:162 locale/programs/ld-time.c:175
-#: locale/programs/ld-time.c:196
+#: locale/programs/ld-address.c:144 locale/programs/ld-address.c:182
+#: locale/programs/ld-address.c:199 locale/programs/ld-address.c:228
+#: locale/programs/ld-address.c:300 locale/programs/ld-address.c:319
+#: locale/programs/ld-address.c:331 locale/programs/ld-identification.c:144
+#: locale/programs/ld-measurement.c:103 locale/programs/ld-monetary.c:204
+#: locale/programs/ld-monetary.c:258 locale/programs/ld-monetary.c:274
+#: locale/programs/ld-monetary.c:286 locale/programs/ld-name.c:104
+#: locale/programs/ld-name.c:141 locale/programs/ld-numeric.c:111
+#: locale/programs/ld-numeric.c:125 locale/programs/ld-paper.c:100
+#: locale/programs/ld-paper.c:109 locale/programs/ld-telephone.c:103
+#: locale/programs/ld-telephone.c:160 locale/programs/ld-time.c:174
+#: locale/programs/ld-time.c:195
 #, c-format
 msgid "%s: field `%s' not defined"
 msgstr ""
 
-#: locale/programs/ld-address.c:158 locale/programs/ld-address.c:210
-#: locale/programs/ld-address.c:240 locale/programs/ld-address.c:278
-#: locale/programs/ld-name.c:117 locale/programs/ld-telephone.c:117
+#: locale/programs/ld-address.c:156 locale/programs/ld-address.c:207
+#: locale/programs/ld-address.c:237 locale/programs/ld-address.c:275
+#: locale/programs/ld-name.c:116 locale/programs/ld-telephone.c:115
 #, c-format
 msgid "%s: field `%s' must not be empty"
 msgstr ""
 
-#: locale/programs/ld-address.c:170
+#: locale/programs/ld-address.c:168
 #, c-format
 msgid "%s: invalid escape `%%%c' sequence in field `%s'"
 msgstr ""
 
-#: locale/programs/ld-address.c:221
+#: locale/programs/ld-address.c:218
 #, c-format
 msgid "%s: terminology language code `%s' not defined"
 msgstr ""
 
-#: locale/programs/ld-address.c:246
+#: locale/programs/ld-address.c:243
 #, c-format
 msgid "%s: field `%s' must not be defined"
 msgstr ""
 
-#: locale/programs/ld-address.c:260 locale/programs/ld-address.c:289
+#: locale/programs/ld-address.c:257 locale/programs/ld-address.c:286
 #, c-format
 msgid "%s: language abbreviation `%s' not defined"
 msgstr ""
 
-#: locale/programs/ld-address.c:267 locale/programs/ld-address.c:295
-#: locale/programs/ld-address.c:329 locale/programs/ld-address.c:341
+#: locale/programs/ld-address.c:264 locale/programs/ld-address.c:292
+#: locale/programs/ld-address.c:325 locale/programs/ld-address.c:337
 #, c-format
 msgid "%s: `%s' value does not match `%s' value"
 msgstr ""
 
-#: locale/programs/ld-address.c:314
+#: locale/programs/ld-address.c:311
 #, c-format
 msgid "%s: numeric country code `%d' not valid"
 msgstr ""
 
-#: locale/programs/ld-address.c:436 locale/programs/ld-address.c:473
-#: locale/programs/ld-address.c:511 locale/programs/ld-ctype.c:2489
-#: locale/programs/ld-identification.c:311 locale/programs/ld-measurement.c:198
-#: locale/programs/ld-messages.c:267 locale/programs/ld-monetary.c:495
-#: locale/programs/ld-monetary.c:530 locale/programs/ld-monetary.c:571
-#: locale/programs/ld-name.c:237 locale/programs/ld-numeric.c:218
-#: locale/programs/ld-paper.c:197 locale/programs/ld-telephone.c:253
-#: locale/programs/ld-time.c:852 locale/programs/ld-time.c:894
+#: locale/programs/ld-address.c:432 locale/programs/ld-address.c:469
+#: locale/programs/ld-address.c:507 locale/programs/ld-ctype.c:2478
+#: locale/programs/ld-identification.c:309 locale/programs/ld-measurement.c:196
+#: locale/programs/ld-messages.c:264 locale/programs/ld-monetary.c:503
+#: locale/programs/ld-monetary.c:538 locale/programs/ld-monetary.c:579
+#: locale/programs/ld-name.c:235 locale/programs/ld-numeric.c:217
+#: locale/programs/ld-paper.c:195 locale/programs/ld-telephone.c:251
+#: locale/programs/ld-time.c:839 locale/programs/ld-time.c:881
 #, c-format
 msgid "%s: field `%s' declared more than once"
 msgstr ""
 
-#: locale/programs/ld-address.c:440 locale/programs/ld-address.c:478
-#: locale/programs/ld-identification.c:315 locale/programs/ld-messages.c:277
-#: locale/programs/ld-monetary.c:499 locale/programs/ld-monetary.c:534
-#: locale/programs/ld-name.c:241 locale/programs/ld-numeric.c:222
-#: locale/programs/ld-telephone.c:257 locale/programs/ld-time.c:746
-#: locale/programs/ld-time.c:815 locale/programs/ld-time.c:857
+#: locale/programs/ld-address.c:436 locale/programs/ld-address.c:474
+#: locale/programs/ld-identification.c:313 locale/programs/ld-messages.c:274
+#: locale/programs/ld-monetary.c:507 locale/programs/ld-monetary.c:542
+#: locale/programs/ld-name.c:239 locale/programs/ld-numeric.c:221
+#: locale/programs/ld-telephone.c:255 locale/programs/ld-time.c:733
+#: locale/programs/ld-time.c:802 locale/programs/ld-time.c:844
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr ""
 
-#: locale/programs/ld-address.c:525 locale/programs/ld-collate.c:3782
-#: locale/programs/ld-ctype.c:2837 locale/programs/ld-identification.c:396
-#: locale/programs/ld-measurement.c:212 locale/programs/ld-messages.c:296
-#: locale/programs/ld-monetary.c:738 locale/programs/ld-name.c:262
-#: locale/programs/ld-numeric.c:324 locale/programs/ld-paper.c:212
-#: locale/programs/ld-telephone.c:276 locale/programs/ld-time.c:945
+#: locale/programs/ld-address.c:521 locale/programs/ld-collate.c:3772
+#: locale/programs/ld-ctype.c:2826 locale/programs/ld-identification.c:394
+#: locale/programs/ld-measurement.c:210 locale/programs/ld-messages.c:293
+#: locale/programs/ld-monetary.c:746 locale/programs/ld-name.c:260
+#: locale/programs/ld-numeric.c:323 locale/programs/ld-paper.c:210
+#: locale/programs/ld-telephone.c:274 locale/programs/ld-time.c:932
 #, c-format
 msgid "%s: incomplete `END' line"
 msgstr ""
 
-#: locale/programs/ld-address.c:535 locale/programs/ld-collate.c:551
-#: locale/programs/ld-collate.c:603 locale/programs/ld-collate.c:899
-#: locale/programs/ld-collate.c:912 locale/programs/ld-collate.c:2592
-#: locale/programs/ld-collate.c:2613 locale/programs/ld-collate.c:3967
-#: locale/programs/ld-ctype.c:1857 locale/programs/ld-ctype.c:2115
-#: locale/programs/ld-ctype.c:2687 locale/programs/ld-ctype.c:2848
-#: locale/programs/ld-identification.c:406 locale/programs/ld-measurement.c:222
-#: locale/programs/ld-messages.c:305 locale/programs/ld-monetary.c:747
-#: locale/programs/ld-name.c:271 locale/programs/ld-numeric.c:333
-#: locale/programs/ld-paper.c:221 locale/programs/ld-telephone.c:285
-#: locale/programs/ld-time.c:954
+#: locale/programs/ld-address.c:531 locale/programs/ld-collate.c:550
+#: locale/programs/ld-collate.c:602 locale/programs/ld-collate.c:898
+#: locale/programs/ld-collate.c:911 locale/programs/ld-collate.c:2582
+#: locale/programs/ld-collate.c:2603 locale/programs/ld-collate.c:3957
+#: locale/programs/ld-ctype.c:1846 locale/programs/ld-ctype.c:2104
+#: locale/programs/ld-ctype.c:2676 locale/programs/ld-ctype.c:2837
+#: locale/programs/ld-identification.c:404 locale/programs/ld-measurement.c:220
+#: locale/programs/ld-messages.c:302 locale/programs/ld-monetary.c:755
+#: locale/programs/ld-name.c:269 locale/programs/ld-numeric.c:332
+#: locale/programs/ld-paper.c:219 locale/programs/ld-telephone.c:283
+#: locale/programs/ld-time.c:941
 #, c-format
 msgid "%s: syntax error"
 msgstr ""
 
-#: locale/programs/ld-collate.c:426
+#: locale/programs/ld-collate.c:425
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr ""
 
-#: locale/programs/ld-collate.c:435
+#: locale/programs/ld-collate.c:434
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr ""
 
-#: locale/programs/ld-collate.c:442
+#: locale/programs/ld-collate.c:441
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr ""
 
-#: locale/programs/ld-collate.c:449
+#: locale/programs/ld-collate.c:448
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr ""
 
-#: locale/programs/ld-collate.c:480 locale/programs/ld-collate.c:506
+#: locale/programs/ld-collate.c:479 locale/programs/ld-collate.c:505
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr ""
 
-#: locale/programs/ld-collate.c:490 locale/programs/ld-collate.c:516
-#: locale/programs/ld-collate.c:532
+#: locale/programs/ld-collate.c:489 locale/programs/ld-collate.c:515
+#: locale/programs/ld-collate.c:531
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr ""
 
-#: locale/programs/ld-collate.c:588
+#: locale/programs/ld-collate.c:587
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr ""
 
-#: locale/programs/ld-collate.c:624
+#: locale/programs/ld-collate.c:623
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr ""
 
-#: locale/programs/ld-collate.c:789
+#: locale/programs/ld-collate.c:788
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr ""
 
-#: locale/programs/ld-collate.c:884
+#: locale/programs/ld-collate.c:883
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr ""
 
-#: locale/programs/ld-collate.c:940
+#: locale/programs/ld-collate.c:939
 #, c-format
 msgid "%s: too many values"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1060 locale/programs/ld-collate.c:1235
+#: locale/programs/ld-collate.c:1059 locale/programs/ld-collate.c:1234
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1110
+#: locale/programs/ld-collate.c:1109
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1137
+#: locale/programs/ld-collate.c:1136
 #, c-format
 msgid ""
 "%s: byte sequences of first and last character must have the same length"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1179
+#: locale/programs/ld-collate.c:1178
 #, c-format
 msgid ""
 "%s: byte sequence of first character of range is not lower than that of the "
 "last character"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1304
+#: locale/programs/ld-collate.c:1303
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1308
+#: locale/programs/ld-collate.c:1307
 #, c-format
 msgid ""
 "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1328 locale/programs/ld-ctype.c:1374
+#: locale/programs/ld-collate.c:1327 locale/programs/ld-ctype.c:1363
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1378 locale/programs/ld-collate.c:3718
+#: locale/programs/ld-collate.c:1377 locale/programs/ld-collate.c:3708
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1387
+#: locale/programs/ld-collate.c:1386
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1582
+#: locale/programs/ld-collate.c:1580
 #, c-format
 msgid ""
 "%s: `position' must be used for a specific level in all sections or none"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1607
+#: locale/programs/ld-collate.c:1604
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1683 locale/programs/ld-collate.c:1789
+#: locale/programs/ld-collate.c:1680 locale/programs/ld-collate.c:1785
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1687 locale/programs/ld-collate.c:1793
+#: locale/programs/ld-collate.c:1684 locale/programs/ld-collate.c:1789
 #, c-format
 msgid "symbol `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:1833
-#, c-format
-msgid "no definition of `UNDEFINED'"
-msgstr ""
-
-#: locale/programs/ld-collate.c:1862
-#, c-format
+#: locale/programs/ld-collate.c:1852
 msgid "too many errors; giving up"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2518 locale/programs/ld-collate.c:3906
+#: locale/programs/ld-collate.c:2508 locale/programs/ld-collate.c:3896
 #, c-format
 msgid "%s: nested conditionals not supported"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2536
+#: locale/programs/ld-collate.c:2526
 #, c-format
 msgid "%s: more than one 'else'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2711
+#: locale/programs/ld-collate.c:2701
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2747
+#: locale/programs/ld-collate.c:2737
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:2883
+#: locale/programs/ld-collate.c:2873
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3012
+#: locale/programs/ld-collate.c:3002
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3023
+#: locale/programs/ld-collate.c:3013
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3033
+#: locale/programs/ld-collate.c:3023
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3042
+#: locale/programs/ld-collate.c:3032
 msgid "error while adding equivalent collating symbol"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3080
+#: locale/programs/ld-collate.c:3070
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3128
+#: locale/programs/ld-collate.c:3118
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3157
+#: locale/programs/ld-collate.c:3147
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3185
+#: locale/programs/ld-collate.c:3175
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3212
+#: locale/programs/ld-collate.c:3202
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3267 locale/programs/ld-collate.c:3397
-#: locale/programs/ld-collate.c:3760
+#: locale/programs/ld-collate.c:3257 locale/programs/ld-collate.c:3387
+#: locale/programs/ld-collate.c:3750
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3330
+#: locale/programs/ld-collate.c:3320
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3348
+#: locale/programs/ld-collate.c:3338
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3359
+#: locale/programs/ld-collate.c:3349
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3411 locale/programs/ld-collate.c:3772
+#: locale/programs/ld-collate.c:3401 locale/programs/ld-collate.c:3762
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3445 locale/programs/ld-collate.c:3643
+#: locale/programs/ld-collate.c:3435 locale/programs/ld-collate.c:3633
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3510
+#: locale/programs/ld-collate.c:3500
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3706
+#: locale/programs/ld-collate.c:3696
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3756
+#: locale/programs/ld-collate.c:3746
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3775
+#: locale/programs/ld-collate.c:3765
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3939
+#: locale/programs/ld-collate.c:3929
 #, c-format
 msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
 msgstr ""
 
-#: locale/programs/ld-collate.c:3957
+#: locale/programs/ld-collate.c:3947
 #, c-format
 msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:450
-#, c-format
+#: locale/programs/ld-ctype.c:448
 msgid "No character set name specified in charmap"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:479
+#: locale/programs/ld-ctype.c:476
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:494
+#: locale/programs/ld-ctype.c:490
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:508 locale/programs/ld-ctype.c:566
+#: locale/programs/ld-ctype.c:504 locale/programs/ld-ctype.c:560
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:537
+#: locale/programs/ld-ctype.c:532
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:553
+#: locale/programs/ld-ctype.c:547
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:583 locale/programs/ld-ctype.c:621
+#: locale/programs/ld-ctype.c:576 locale/programs/ld-ctype.c:611
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:595 locale/programs/ld-ctype.c:632
+#: locale/programs/ld-ctype.c:587 locale/programs/ld-ctype.c:621
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:610
-#, c-format
+#: locale/programs/ld-ctype.c:601
 msgid "character <SP> not defined in character map"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:746
-#, c-format
+#: locale/programs/ld-ctype.c:735
 msgid "`digit' category has not entries in groups of ten"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:795
-#, c-format
+#: locale/programs/ld-ctype.c:784
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:860
-#, c-format
+#: locale/programs/ld-ctype.c:849
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:877
-#, c-format
+#: locale/programs/ld-ctype.c:866
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1142
+#: locale/programs/ld-ctype.c:1131
 #, c-format
 msgid "character class `%s' already defined"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1148
+#: locale/programs/ld-ctype.c:1137
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1174
+#: locale/programs/ld-ctype.c:1163
 #, c-format
 msgid "character map `%s' already defined"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1180
+#: locale/programs/ld-ctype.c:1169
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1445 locale/programs/ld-ctype.c:1570
-#: locale/programs/ld-ctype.c:1676 locale/programs/ld-ctype.c:2352
-#: locale/programs/ld-ctype.c:3324
+#: locale/programs/ld-ctype.c:1434 locale/programs/ld-ctype.c:1559
+#: locale/programs/ld-ctype.c:1665 locale/programs/ld-ctype.c:2341
+#: locale/programs/ld-ctype.c:3299
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1473 locale/programs/ld-ctype.c:2047
+#: locale/programs/ld-ctype.c:1462 locale/programs/ld-ctype.c:2036
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1600
+#: locale/programs/ld-ctype.c:1589
 msgid "start and end character sequence of range must have the same length"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1607
+#: locale/programs/ld-ctype.c:1596
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1967 locale/programs/ld-ctype.c:2018
+#: locale/programs/ld-ctype.c:1956 locale/programs/ld-ctype.c:2007
 msgid "premature end of `translit_ignore' definition"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:1973 locale/programs/ld-ctype.c:2024
-#: locale/programs/ld-ctype.c:2066
+#: locale/programs/ld-ctype.c:1962 locale/programs/ld-ctype.c:2013
+#: locale/programs/ld-ctype.c:2055
 msgid "syntax error"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2199
+#: locale/programs/ld-ctype.c:2188
 #, c-format
 msgid "%s: syntax error in definition of new character class"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2214
+#: locale/programs/ld-ctype.c:2203
 #, c-format
 msgid "%s: syntax error in definition of new character map"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2374
+#: locale/programs/ld-ctype.c:2363
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2383
+#: locale/programs/ld-ctype.c:2372
 msgid ""
 "with symbolic name range values the absolute ellipsis `...' must not be used"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2398
+#: locale/programs/ld-ctype.c:2387
 msgid ""
 "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2412
+#: locale/programs/ld-ctype.c:2401
 msgid ""
 "with character code range values one must use the absolute ellipsis `...'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2563
+#: locale/programs/ld-ctype.c:2552
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2649 locale/programs/ld-ctype.c:2793
+#: locale/programs/ld-ctype.c:2638 locale/programs/ld-ctype.c:2782
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2744
+#: locale/programs/ld-ctype.c:2733
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2749
+#: locale/programs/ld-ctype.c:2738
 msgid "previous definition was here"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2771
+#: locale/programs/ld-ctype.c:2760
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2889 locale/programs/ld-ctype.c:2986
-#: locale/programs/ld-ctype.c:3006 locale/programs/ld-ctype.c:3027
-#: locale/programs/ld-ctype.c:3048 locale/programs/ld-ctype.c:3069
-#: locale/programs/ld-ctype.c:3090 locale/programs/ld-ctype.c:3130
-#: locale/programs/ld-ctype.c:3151 locale/programs/ld-ctype.c:3216
-#: locale/programs/ld-ctype.c:3258 locale/programs/ld-ctype.c:3283
+#: locale/programs/ld-ctype.c:2877 locale/programs/ld-ctype.c:2973
+#: locale/programs/ld-ctype.c:2992 locale/programs/ld-ctype.c:3012
+#: locale/programs/ld-ctype.c:3032 locale/programs/ld-ctype.c:3052
+#: locale/programs/ld-ctype.c:3072 locale/programs/ld-ctype.c:3111
+#: locale/programs/ld-ctype.c:3131 locale/programs/ld-ctype.c:3195
+#: locale/programs/ld-ctype.c:3236 locale/programs/ld-ctype.c:3259
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:2894 locale/programs/ld-ctype.c:2991
-#: locale/programs/ld-ctype.c:3011 locale/programs/ld-ctype.c:3032
-#: 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:3221
+#: locale/programs/ld-ctype.c:2882 locale/programs/ld-ctype.c:2978
+#: locale/programs/ld-ctype.c:2997 locale/programs/ld-ctype.c:3017
+#: locale/programs/ld-ctype.c:3037 locale/programs/ld-ctype.c:3057
+#: locale/programs/ld-ctype.c:3077 locale/programs/ld-ctype.c:3116
+#: locale/programs/ld-ctype.c:3136 locale/programs/ld-ctype.c:3200
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3265 locale/programs/ld-ctype.c:3290
+#: locale/programs/ld-ctype.c:3242 locale/programs/ld-ctype.c:3265
 #, c-format
 msgid ""
 "%s: character `%s' needed as default value not representable with one byte"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3346
-#, c-format
+#: locale/programs/ld-ctype.c:3321
 msgid "no output digits defined and none of the standard names in the charmap"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3595
+#: locale/programs/ld-ctype.c:3570
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3695
+#: locale/programs/ld-ctype.c:3669
 #, c-format
-msgid "%s: table for class \"%s\": %lu bytes\n"
+msgid "%s: table for class \"%s\": %lu bytes"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3760
+#: locale/programs/ld-ctype.c:3733
 #, c-format
-msgid "%s: table for map \"%s\": %lu bytes\n"
+msgid "%s: table for map \"%s\": %lu bytes"
 msgstr ""
 
-#: locale/programs/ld-ctype.c:3885
+#: locale/programs/ld-ctype.c:3857
 #, c-format
-msgid "%s: table for width: %lu bytes\n"
+msgid "%s: table for width: %lu bytes"
 msgstr ""
 
-#: locale/programs/ld-identification.c:175
+#: locale/programs/ld-identification.c:173
 #, c-format
 msgid "%s: no identification for category `%s'"
 msgstr ""
 
-#: locale/programs/ld-identification.c:199
+#: locale/programs/ld-identification.c:197
 #, c-format
 msgid "%s: unknown standard `%s' for category `%s'"
 msgstr ""
 
-#: locale/programs/ld-identification.c:382
+#: locale/programs/ld-identification.c:380
 #, c-format
 msgid "%s: duplicate category version definition"
 msgstr ""
 
-#: locale/programs/ld-measurement.c:113
+#: locale/programs/ld-measurement.c:111
 #, c-format
 msgid "%s: invalid value for field `%s'"
 msgstr ""
 
-#: locale/programs/ld-messages.c:114 locale/programs/ld-messages.c:148
+#: locale/programs/ld-messages.c:113 locale/programs/ld-messages.c:146
 #, c-format
 msgid "%s: field `%s' undefined"
 msgstr ""
 
-#: locale/programs/ld-messages.c:121 locale/programs/ld-messages.c:155
-#: locale/programs/ld-monetary.c:255 locale/programs/ld-numeric.c:118
+#: locale/programs/ld-messages.c:119 locale/programs/ld-messages.c:152
+#: locale/programs/ld-monetary.c:264 locale/programs/ld-numeric.c:117
 #, c-format
 msgid "%s: value for field `%s' must not be an empty string"
 msgstr ""
 
-#: locale/programs/ld-messages.c:137 locale/programs/ld-messages.c:171
+#: locale/programs/ld-messages.c:135 locale/programs/ld-messages.c:168
 #, c-format
 msgid "%s: no correct regular expression for field `%s': %s"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:223
+#: locale/programs/ld-monetary.c:228
 #, c-format
 msgid "%s: value of field `int_curr_symbol' has wrong length"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:236
+#: locale/programs/ld-monetary.c:245
 #, c-format
 msgid ""
 "%s: value of field `int_curr_symbol' does not correspond to a valid name in "
-"ISO 4217"
+"ISO 4217 [--no-warnings=intcurrsym]"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:284 locale/programs/ld-monetary.c:314
+#: locale/programs/ld-monetary.c:293 locale/programs/ld-monetary.c:322
 #, c-format
 msgid "%s: value for field `%s' must be in range %d...%d"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:541 locale/programs/ld-numeric.c:229
+#: locale/programs/ld-monetary.c:549 locale/programs/ld-numeric.c:228
 #, c-format
 msgid "%s: value for field `%s' must be a single character"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:638 locale/programs/ld-numeric.c:273
+#: locale/programs/ld-monetary.c:646 locale/programs/ld-numeric.c:272
 #, c-format
 msgid "%s: `-1' must be last entry in `%s' field"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:660 locale/programs/ld-numeric.c:290
+#: locale/programs/ld-monetary.c:668 locale/programs/ld-numeric.c:289
 #, c-format
 msgid "%s: values for field `%s' must be smaller than 127"
 msgstr ""
 
-#: locale/programs/ld-monetary.c:706
+#: locale/programs/ld-monetary.c:714
 msgid "conversion rate value cannot be zero"
 msgstr ""
 
-#: locale/programs/ld-name.c:129 locale/programs/ld-telephone.c:126
-#: locale/programs/ld-telephone.c:149
+#: locale/programs/ld-name.c:128 locale/programs/ld-telephone.c:124
+#: locale/programs/ld-telephone.c:147
 #, c-format
 msgid "%s: invalid escape sequence in field `%s'"
 msgstr ""
 
-#: locale/programs/ld-time.c:247
+#: locale/programs/ld-time.c:245
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not '+' nor '-'"
 msgstr ""
 
-#: locale/programs/ld-time.c:258
+#: locale/programs/ld-time.c:255
 #, c-format
 msgid ""
 "%s: direction flag in string %Zd in `era' field is not a single character"
 msgstr ""
 
-#: locale/programs/ld-time.c:271
+#: locale/programs/ld-time.c:267
 #, c-format
 msgid "%s: invalid number for offset in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:279
+#: locale/programs/ld-time.c:274
 #, c-format
 msgid "%s: garbage at end of offset value in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:330
+#: locale/programs/ld-time.c:324
 #, c-format
 msgid "%s: invalid starting date in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:339
+#: locale/programs/ld-time.c:332
 #, c-format
 msgid "%s: garbage at end of starting date in string %Zd in `era' field "
 msgstr ""
 
-#: locale/programs/ld-time.c:358
+#: locale/programs/ld-time.c:350
 #, c-format
 msgid "%s: starting date is invalid in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:407 locale/programs/ld-time.c:435
+#: locale/programs/ld-time.c:398 locale/programs/ld-time.c:424
 #, c-format
 msgid "%s: invalid stopping date in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:416
+#: locale/programs/ld-time.c:406
 #, c-format
 msgid "%s: garbage at end of stopping date in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:444
+#: locale/programs/ld-time.c:432
 #, c-format
 msgid "%s: missing era name in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:456
+#: locale/programs/ld-time.c:443
 #, c-format
 msgid "%s: missing era format in string %Zd in `era' field"
 msgstr ""
 
-#: locale/programs/ld-time.c:501
+#: locale/programs/ld-time.c:488
 #, c-format
 msgid "%s: third operand for value of field `%s' must not be larger than %d"
 msgstr ""
 
-#: locale/programs/ld-time.c:509 locale/programs/ld-time.c:517
-#: locale/programs/ld-time.c:525
+#: locale/programs/ld-time.c:496 locale/programs/ld-time.c:504
+#: locale/programs/ld-time.c:512
 #, c-format
 msgid "%s: values for field `%s' must not be larger than %d"
 msgstr ""
 
-#: locale/programs/ld-time.c:730
+#: locale/programs/ld-time.c:717
 #, c-format
 msgid "%s: too few values for field `%s'"
 msgstr ""
 
-#: locale/programs/ld-time.c:775
+#: locale/programs/ld-time.c:762
 msgid "extra trailing semicolon"
 msgstr ""
 
-#: locale/programs/ld-time.c:778
+#: locale/programs/ld-time.c:765
 #, c-format
 msgid "%s: too many values for field `%s'"
 msgstr ""
@@ -2516,20 +2504,16 @@ msgstr ""
 msgid "illegal escape sequence at end of string"
 msgstr ""
 
-#: locale/programs/linereader.c:627 locale/programs/linereader.c:855
+#: locale/programs/linereader.c:627 locale/programs/linereader.c:847
 msgid "unterminated string"
 msgstr ""
 
-#: locale/programs/linereader.c:669
-msgid "non-symbolic character value should not be used"
-msgstr ""
-
-#: locale/programs/linereader.c:816
+#: locale/programs/linereader.c:808
 #, c-format
 msgid "symbol `%.*s' not in charmap"
 msgstr ""
 
-#: locale/programs/linereader.c:837
+#: locale/programs/linereader.c:829
 #, c-format
 msgid "symbol `%.*s' not in repertoire map"
 msgstr ""
@@ -2539,174 +2523,193 @@ msgstr ""
 msgid "unknown name \"%s\""
 msgstr ""
 
-#: locale/programs/locale.c:72
+#: locale/programs/locale.c:70
 msgid "System information:"
 msgstr ""
 
-#: locale/programs/locale.c:74
+#: locale/programs/locale.c:72
 msgid "Write names of available locales"
 msgstr ""
 
-#: locale/programs/locale.c:76
+#: locale/programs/locale.c:74
 msgid "Write names of available charmaps"
 msgstr ""
 
-#: locale/programs/locale.c:77
+#: locale/programs/locale.c:75
 msgid "Modify output format:"
 msgstr ""
 
-#: locale/programs/locale.c:78
+#: locale/programs/locale.c:76
 msgid "Write names of selected categories"
 msgstr ""
 
-#: locale/programs/locale.c:79
+#: locale/programs/locale.c:77
 msgid "Write names of selected keywords"
 msgstr ""
 
-#: locale/programs/locale.c:80
+#: locale/programs/locale.c:78
 msgid "Print more information"
 msgstr ""
 
-#: locale/programs/locale.c:85
+#: locale/programs/locale.c:83
 msgid "Get locale-specific information."
 msgstr ""
 
-#: locale/programs/locale.c:88
+#: locale/programs/locale.c:86
 msgid ""
 "NAME\n"
 "[-a|-m]"
 msgstr ""
 
-#: locale/programs/locale.c:192
+#: locale/programs/locale.c:190
 #, c-format
 msgid "Cannot set LC_CTYPE to default locale"
 msgstr ""
 
-#: locale/programs/locale.c:194
+#: locale/programs/locale.c:192
 #, c-format
 msgid "Cannot set LC_MESSAGES to default locale"
 msgstr ""
 
-#: locale/programs/locale.c:207
+#: locale/programs/locale.c:205
 #, c-format
 msgid "Cannot set LC_COLLATE to default locale"
 msgstr ""
 
-#: locale/programs/locale.c:223
+#: locale/programs/locale.c:221
 #, c-format
 msgid "Cannot set LC_ALL to default locale"
 msgstr ""
 
-#: locale/programs/locale.c:525
+#: locale/programs/locale.c:521
 #, c-format
 msgid "while preparing output"
 msgstr ""
 
-#: locale/programs/localedef.c:115
+#: locale/programs/localedef.c:112
 msgid "Input Files:"
 msgstr ""
 
-#: locale/programs/localedef.c:117
+#: locale/programs/localedef.c:114
 msgid "Symbolic character names defined in FILE"
 msgstr ""
 
-#: locale/programs/localedef.c:119
+#: locale/programs/localedef.c:116
 msgid "Source definitions are found in FILE"
 msgstr ""
 
-#: locale/programs/localedef.c:121
+#: locale/programs/localedef.c:118
 msgid "FILE contains mapping from symbolic names to UCS4 values"
 msgstr ""
 
-#: locale/programs/localedef.c:125
+#: locale/programs/localedef.c:122
 msgid "Create output even if warning messages were issued"
 msgstr ""
 
-#: locale/programs/localedef.c:126
+#: locale/programs/localedef.c:123
 msgid "Optional output file prefix"
 msgstr ""
 
-#: locale/programs/localedef.c:127
+#: locale/programs/localedef.c:124
 msgid "Strictly conform to POSIX"
 msgstr ""
 
-#: locale/programs/localedef.c:129
+#: locale/programs/localedef.c:126
 msgid "Suppress warnings and information messages"
 msgstr ""
 
-#: locale/programs/localedef.c:130
+#: locale/programs/localedef.c:127
 msgid "Print more messages"
 msgstr ""
 
-#: locale/programs/localedef.c:131
+#: locale/programs/localedef.c:128 locale/programs/localedef.c:131
+msgid "<warnings>"
+msgstr ""
+
+#: locale/programs/localedef.c:129
+msgid ""
+"Comma-separated list of warnings to disable; supported warnings are: ascii, "
+"intcurrsym"
+msgstr ""
+
+#: locale/programs/localedef.c:132
+msgid ""
+"Comma-separated list of warnings to enable; supported warnings are: ascii, "
+"intcurrsym"
+msgstr ""
+
+#: locale/programs/localedef.c:135
 msgid "Archive control:"
 msgstr ""
 
-#: locale/programs/localedef.c:133
+#: locale/programs/localedef.c:137
 msgid "Don't add new data to archive"
 msgstr ""
 
-#: locale/programs/localedef.c:135
+#: locale/programs/localedef.c:139
 msgid "Add locales named by parameters to archive"
 msgstr ""
 
-#: locale/programs/localedef.c:136
+#: locale/programs/localedef.c:140
 msgid "Replace existing archive content"
 msgstr ""
 
-#: locale/programs/localedef.c:138
+#: locale/programs/localedef.c:142
 msgid "Remove locales named by parameters from archive"
 msgstr ""
 
-#: locale/programs/localedef.c:139
+#: locale/programs/localedef.c:143
 msgid "List content of archive"
 msgstr ""
 
-#: locale/programs/localedef.c:141
+#: locale/programs/localedef.c:145
 msgid "locale.alias file to consult when making archive"
 msgstr ""
 
-#: locale/programs/localedef.c:143
+#: locale/programs/localedef.c:147
 msgid "Generate little-endian output"
 msgstr ""
 
-#: locale/programs/localedef.c:145
+#: locale/programs/localedef.c:149
 msgid "Generate big-endian output"
 msgstr ""
 
-#: locale/programs/localedef.c:150
+#: locale/programs/localedef.c:154
 msgid "Compile locale specification"
 msgstr ""
 
-#: locale/programs/localedef.c:153
+#: locale/programs/localedef.c:157
 msgid ""
 "NAME\n"
 "[--add-to-archive|--delete-from-archive] FILE...\n"
 "--list-archive [FILE]"
 msgstr ""
 
-#: locale/programs/localedef.c:228
+#: locale/programs/localedef.c:232
 #, c-format
 msgid "cannot create directory for output files"
 msgstr ""
 
-#: locale/programs/localedef.c:239
-#, c-format
+#: locale/programs/localedef.c:243
 msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
 msgstr ""
 
-#: locale/programs/localedef.c:253 locale/programs/localedef.c:269
-#: locale/programs/localedef.c:602 locale/programs/localedef.c:622
+#: locale/programs/localedef.c:257 locale/programs/localedef.c:273
+#: locale/programs/localedef.c:663 locale/programs/localedef.c:683
 #, c-format
 msgid "cannot open locale definition file `%s'"
 msgstr ""
 
-#: locale/programs/localedef.c:281
+#: locale/programs/localedef.c:297
 #, c-format
 msgid "cannot write output files to `%s'"
 msgstr ""
 
-#: locale/programs/localedef.c:370
+#: locale/programs/localedef.c:303
+msgid "no output file produced because errors were issued"
+msgstr ""
+
+#: locale/programs/localedef.c:431
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
@@ -2715,12 +2718,11 @@ msgid ""
 "%s"
 msgstr ""
 
-#: locale/programs/localedef.c:570
-#, c-format
+#: locale/programs/localedef.c:631
 msgid "circular dependencies between locale definitions"
 msgstr ""
 
-#: locale/programs/localedef.c:576
+#: locale/programs/localedef.c:637
 #, c-format
 msgid "cannot add already read locale `%s' a second time"
 msgstr ""
@@ -2757,7 +2759,6 @@ msgid "cannot change mode of new locale archive"
 msgstr ""
 
 #: locale/programs/locarchive.c:324
-#, c-format
 msgid "cannot read data from locale archive"
 msgstr ""
 
@@ -2843,17 +2844,17 @@ msgstr ""
 msgid "cannot open directory \"%s\": %s: ignored"
 msgstr ""
 
-#: locale/programs/locarchive.c:1442
+#: locale/programs/locarchive.c:1438
 #, c-format
 msgid "incomplete set of locale files in \"%s\""
 msgstr ""
 
-#: locale/programs/locarchive.c:1506
+#: locale/programs/locarchive.c:1502
 #, c-format
 msgid "cannot read all files in \"%s\": ignored"
 msgstr ""
 
-#: locale/programs/locarchive.c:1576
+#: locale/programs/locarchive.c:1572
 #, c-format
 msgid "locale \"%s\" not in archive"
 msgstr ""
@@ -2867,54 +2868,53 @@ msgstr ""
 msgid "syntax error: not inside a locale definition section"
 msgstr ""
 
-#: locale/programs/locfile.c:800
+#: locale/programs/locfile.c:799
 #, c-format
 msgid "cannot open output file `%s' for category `%s'"
 msgstr ""
 
-#: locale/programs/locfile.c:824
+#: locale/programs/locfile.c:822
 #, c-format
 msgid "failure while writing data for category `%s'"
 msgstr ""
 
-#: locale/programs/locfile.c:920
+#: locale/programs/locfile.c:917
 #, c-format
 msgid "cannot create output file `%s' for category `%s'"
 msgstr ""
 
-#: locale/programs/locfile.c:956
+#: locale/programs/locfile.c:953
 msgid "expecting string argument for `copy'"
 msgstr ""
 
-#: locale/programs/locfile.c:960
+#: locale/programs/locfile.c:957
 msgid "locale name should consist only of portable characters"
 msgstr ""
 
-#: locale/programs/locfile.c:979
+#: locale/programs/locfile.c:976
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr ""
 
-#: locale/programs/locfile.c:993
+#: locale/programs/locfile.c:990
 #, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr ""
 
-#: locale/programs/repertoire.c:229 locale/programs/repertoire.c:270
-#: locale/programs/repertoire.c:295
+#: locale/programs/repertoire.c:228 locale/programs/repertoire.c:269
+#: locale/programs/repertoire.c:294
 #, c-format
 msgid "syntax error in repertoire map definition: %s"
 msgstr ""
 
-#: locale/programs/repertoire.c:271
+#: locale/programs/repertoire.c:270
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr ""
 
-#: locale/programs/repertoire.c:331
-#, c-format
+#: locale/programs/repertoire.c:330
 msgid "cannot save new repertoire map"
 msgstr ""
 
-#: locale/programs/repertoire.c:342
+#: locale/programs/repertoire.c:341
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr ""
@@ -3851,173 +3851,173 @@ msgstr ""
 msgid "cannot handle old request version %d; current version is %d"
 msgstr ""
 
-#: nscd/connections.c:1090
+#: nscd/connections.c:1091
 #, c-format
 msgid "request from %ld not handled due to missing permission"
 msgstr ""
 
-#: nscd/connections.c:1095
+#: nscd/connections.c:1096
 #, c-format
 msgid "request from '%s' [%ld] not handled due to missing permission"
 msgstr ""
 
-#: nscd/connections.c:1100
+#: nscd/connections.c:1101
 msgid "request not handled due to missing permission"
 msgstr ""
 
-#: nscd/connections.c:1138 nscd/connections.c:1191
+#: nscd/connections.c:1139 nscd/connections.c:1192
 #, c-format
 msgid "cannot write result: %s"
 msgstr ""
 
-#: nscd/connections.c:1282
+#: nscd/connections.c:1283
 #, c-format
 msgid "error getting caller's id: %s"
 msgstr ""
 
-#: nscd/connections.c:1342
+#: nscd/connections.c:1343
 #, c-format
 msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1356
+#: nscd/connections.c:1357
 #, c-format
 msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1396
+#: nscd/connections.c:1397
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1406
+#: nscd/connections.c:1407
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1419
+#: nscd/connections.c:1420
 #, c-format
 msgid "cannot change to old working directory: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1465
+#: nscd/connections.c:1466
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr ""
 
-#: nscd/connections.c:1474
+#: nscd/connections.c:1475
 #, c-format
 msgid "cannot change current working directory to \"/\": %s"
 msgstr ""
 
-#: nscd/connections.c:1657
+#: nscd/connections.c:1658
 #, c-format
 msgid "short read while reading request: %s"
 msgstr ""
 
-#: nscd/connections.c:1690
+#: nscd/connections.c:1691
 #, c-format
 msgid "key length in request too long: %d"
 msgstr ""
 
-#: nscd/connections.c:1703
+#: nscd/connections.c:1704
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr ""
 
-#: nscd/connections.c:1713
+#: nscd/connections.c:1714
 #, c-format
 msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr ""
 
-#: nscd/connections.c:1718
+#: nscd/connections.c:1719
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr ""
 
-#: nscd/connections.c:1858
+#: nscd/connections.c:1859
 #, c-format
 msgid "ignored inotify event for `%s` (file exists)"
 msgstr ""
 
-#: nscd/connections.c:1863
+#: nscd/connections.c:1864
 #, c-format
 msgid "monitored file `%s` was %s, removing watch"
 msgstr ""
 
-#: nscd/connections.c:1871 nscd/connections.c:1913
+#: nscd/connections.c:1872 nscd/connections.c:1914
 #, c-format
 msgid "failed to remove file watch `%s`: %s"
 msgstr ""
 
-#: nscd/connections.c:1886
+#: nscd/connections.c:1887
 #, c-format
 msgid "monitored file `%s` was written to"
 msgstr ""
 
-#: nscd/connections.c:1910
+#: nscd/connections.c:1911
 #, c-format
 msgid "monitored parent directory `%s` was %s, removing watch on `%s`"
 msgstr ""
 
-#: nscd/connections.c:1936
+#: nscd/connections.c:1937
 #, c-format
 msgid "monitored file `%s` was %s, adding watch"
 msgstr ""
 
-#: nscd/connections.c:1948
+#: nscd/connections.c:1949
 #, c-format
 msgid "failed to add file watch `%s`: %s"
 msgstr ""
 
-#: nscd/connections.c:2126 nscd/connections.c:2291
+#: nscd/connections.c:2127 nscd/connections.c:2292
 #, c-format
 msgid "disabled inotify-based monitoring after read error %d"
 msgstr ""
 
-#: nscd/connections.c:2406
+#: nscd/connections.c:2407
 msgid "could not initialize conditional variable"
 msgstr ""
 
-#: nscd/connections.c:2414
+#: nscd/connections.c:2415
 msgid "could not start clean-up thread; terminating"
 msgstr ""
 
-#: nscd/connections.c:2428
+#: nscd/connections.c:2429
 msgid "could not start any worker thread; terminating"
 msgstr ""
 
-#: nscd/connections.c:2483 nscd/connections.c:2485 nscd/connections.c:2501
-#: nscd/connections.c:2511 nscd/connections.c:2529 nscd/connections.c:2540
-#: nscd/connections.c:2550
+#: nscd/connections.c:2484 nscd/connections.c:2486 nscd/connections.c:2502
+#: nscd/connections.c:2512 nscd/connections.c:2530 nscd/connections.c:2541
+#: nscd/connections.c:2551
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr ""
 
-#: nscd/connections.c:2503
+#: nscd/connections.c:2504
 msgid "initial getgrouplist failed"
 msgstr ""
 
-#: nscd/connections.c:2512
+#: nscd/connections.c:2513
 msgid "getgrouplist failed"
 msgstr ""
 
-#: nscd/connections.c:2530
+#: nscd/connections.c:2531
 msgid "setgroups failed"
 msgstr ""
 
-#: nscd/grpcache.c:416 nscd/hstcache.c:432 nscd/initgrcache.c:411
+#: nscd/grpcache.c:416 nscd/hstcache.c:432 nscd/initgrcache.c:416
 #: nscd/pwdcache.c:394 nscd/servicescache.c:338
 #, c-format
 msgid "short write in %s: %s"
 msgstr ""
 
-#: nscd/grpcache.c:461 nscd/initgrcache.c:78
+#: nscd/grpcache.c:461 nscd/initgrcache.c:84
 #, c-format
 msgid "Haven't found \"%s\" in group cache!"
 msgstr ""
 
-#: nscd/grpcache.c:463 nscd/initgrcache.c:80
+#: nscd/grpcache.c:463 nscd/initgrcache.c:86
 #, c-format
 msgid "Reloading \"%s\" in group cache!"
 msgstr ""
@@ -4138,7 +4138,7 @@ msgstr ""
 msgid "Could not create log file"
 msgstr ""
 
-#: nscd/nscd.c:355 nscd/nscd_stat.c:194
+#: nscd/nscd.c:355 nscd/nscd_stat.c:209
 #, c-format
 msgid "write incomplete"
 msgstr ""
@@ -4153,7 +4153,7 @@ msgstr ""
 msgid "invalidation failed"
 msgstr ""
 
-#: nscd/nscd.c:417 nscd/nscd.c:442 nscd/nscd_stat.c:175
+#: nscd/nscd.c:417 nscd/nscd.c:442 nscd/nscd_stat.c:190
 #, c-format
 msgid "Only root is allowed to use this option!"
 msgstr ""
@@ -4233,35 +4233,35 @@ msgstr ""
 msgid "maximum file size for %s database too small"
 msgstr ""
 
-#: nscd/nscd_stat.c:144
+#: nscd/nscd_stat.c:159
 #, c-format
 msgid "cannot write statistics: %s"
 msgstr ""
 
-#: nscd/nscd_stat.c:159
+#: nscd/nscd_stat.c:174
 msgid "yes"
 msgstr ""
 
-#: nscd/nscd_stat.c:160
+#: nscd/nscd_stat.c:175
 msgid "no"
 msgstr ""
 
-#: nscd/nscd_stat.c:171
+#: nscd/nscd_stat.c:186
 #, c-format
 msgid "Only root or %s is allowed to use this option!"
 msgstr ""
 
-#: nscd/nscd_stat.c:182
+#: nscd/nscd_stat.c:197
 #, c-format
 msgid "nscd not running!\n"
 msgstr ""
 
-#: nscd/nscd_stat.c:206
+#: nscd/nscd_stat.c:221
 #, c-format
 msgid "cannot read statistics data"
 msgstr ""
 
-#: nscd/nscd_stat.c:209
+#: nscd/nscd_stat.c:224
 #, c-format
 msgid ""
 "nscd configuration:\n"
@@ -4269,27 +4269,27 @@ msgid ""
 "%15d  server debug level\n"
 msgstr ""
 
-#: nscd/nscd_stat.c:233
+#: nscd/nscd_stat.c:248
 #, c-format
 msgid "%3ud %2uh %2um %2lus  server runtime\n"
 msgstr ""
 
-#: nscd/nscd_stat.c:236
+#: nscd/nscd_stat.c:251
 #, c-format
 msgid "    %2uh %2um %2lus  server runtime\n"
 msgstr ""
 
-#: nscd/nscd_stat.c:238
+#: nscd/nscd_stat.c:253
 #, c-format
 msgid "        %2um %2lus  server runtime\n"
 msgstr ""
 
-#: nscd/nscd_stat.c:240
+#: nscd/nscd_stat.c:255
 #, c-format
 msgid "            %2lus  server runtime\n"
 msgstr ""
 
-#: nscd/nscd_stat.c:242
+#: nscd/nscd_stat.c:257
 #, c-format
 msgid ""
 "%15d  current number of threads\n"
@@ -4300,7 +4300,7 @@ msgid ""
 "%15u  reload count\n"
 msgstr ""
 
-#: nscd/nscd_stat.c:277
+#: nscd/nscd_stat.c:292
 #, c-format
 msgid ""
 "\n"
@@ -4726,11 +4726,11 @@ msgstr ""
 msgid "Unmatched ) or \\)"
 msgstr ""
 
-#: posix/regcomp.c:673
+#: posix/regcomp.c:675
 msgid "No previous regular expression"
 msgstr ""
 
-#: posix/wordexp.c:1822
+#: posix/wordexp.c:1803
 msgid "parameter null or not set"
 msgstr ""
 
@@ -4927,44 +4927,44 @@ msgstr ""
 msgid "Device disconnected"
 msgstr ""
 
-#: stdio-common/psiginfo.c:139
+#: stdio-common/psiginfo.c:140
 msgid "Signal sent by kill()"
 msgstr ""
 
-#: stdio-common/psiginfo.c:142
+#: stdio-common/psiginfo.c:143
 msgid "Signal sent by sigqueue()"
 msgstr ""
 
-#: stdio-common/psiginfo.c:145
+#: stdio-common/psiginfo.c:146
 msgid "Signal generated by the expiration of a timer"
 msgstr ""
 
-#: stdio-common/psiginfo.c:148
+#: stdio-common/psiginfo.c:149
 msgid "Signal generated by the completion of an asynchronous I/O request"
 msgstr ""
 
-#: stdio-common/psiginfo.c:152
+#: stdio-common/psiginfo.c:153
 msgid "Signal generated by the arrival of a message on an empty message queue"
 msgstr ""
 
-#: stdio-common/psiginfo.c:157
+#: stdio-common/psiginfo.c:158
 msgid "Signal sent by tkill()"
 msgstr ""
 
-#: stdio-common/psiginfo.c:162
+#: stdio-common/psiginfo.c:163
 msgid ""
 "Signal generated by the completion of an asynchronous name lookup request"
 msgstr ""
 
-#: stdio-common/psiginfo.c:168
+#: stdio-common/psiginfo.c:169
 msgid "Signal generated by the completion of an I/O request"
 msgstr ""
 
-#: stdio-common/psiginfo.c:174
+#: stdio-common/psiginfo.c:175
 msgid "Signal sent by the kernel"
 msgstr ""
 
-#: stdio-common/psiginfo.c:198
+#: stdio-common/psiginfo.c:199
 #, c-format
 msgid "Unknown signal %d\n"
 msgstr ""
@@ -4997,14 +4997,14 @@ msgid "Unknown signal %d"
 msgstr ""
 
 #: sunrpc/auth_unix.c:112 sunrpc/clnt_tcp.c:124 sunrpc/clnt_udp.c:139
-#: sunrpc/clnt_unix.c:125 sunrpc/svc_tcp.c:189 sunrpc/svc_tcp.c:234
-#: sunrpc/svc_udp.c:161 sunrpc/svc_unix.c:189 sunrpc/svc_unix.c:230
+#: sunrpc/clnt_unix.c:125 sunrpc/svc_tcp.c:189 sunrpc/svc_tcp.c:233
+#: sunrpc/svc_udp.c:161 sunrpc/svc_unix.c:189 sunrpc/svc_unix.c:229
 #: sunrpc/xdr.c:628 sunrpc/xdr.c:788 sunrpc/xdr_array.c:102
 #: sunrpc/xdr_rec.c:153 sunrpc/xdr_ref.c:79
 msgid "out of memory\n"
 msgstr ""
 
-#: sunrpc/auth_unix.c:350
+#: sunrpc/auth_unix.c:349
 msgid "auth_unix.c: Fatal marshalling problem"
 msgstr ""
 
@@ -5143,23 +5143,23 @@ msgstr ""
 msgid "Cannot register service"
 msgstr ""
 
-#: sunrpc/pmap_rmt.c:245
+#: sunrpc/pmap_rmt.c:244
 msgid "Cannot create socket for broadcast rpc"
 msgstr ""
 
-#: sunrpc/pmap_rmt.c:252
+#: sunrpc/pmap_rmt.c:251
 msgid "Cannot set socket option SO_BROADCAST"
 msgstr ""
 
-#: sunrpc/pmap_rmt.c:304
+#: sunrpc/pmap_rmt.c:303
 msgid "Cannot send broadcast packet"
 msgstr ""
 
-#: sunrpc/pmap_rmt.c:329
+#: sunrpc/pmap_rmt.c:328
 msgid "Broadcast poll problem"
 msgstr ""
 
-#: sunrpc/pmap_rmt.c:342
+#: sunrpc/pmap_rmt.c:341
 msgid "Cannot receive reply to broadcast"
 msgstr ""
 
