about summary refs log tree commit diff
path: root/po/zh_TW.po
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2001-04-26 06:51:00 +0000
committerAndreas Jaeger <aj@suse.de>2001-04-26 06:51:00 +0000
commit736d48a0cc4c6801d0856d9ac69c8cd33f5f2afc (patch)
tree8d756de6c361c8030c32c7552095a60a01c1e8b5 /po/zh_TW.po
parentc3fa6e3dc7db4a926f65be9855a077da9babd5b6 (diff)
downloadglibc-736d48a0cc4c6801d0856d9ac69c8cd33f5f2afc.tar.gz
glibc-736d48a0cc4c6801d0856d9ac69c8cd33f5f2afc.tar.xz
glibc-736d48a0cc4c6801d0856d9ac69c8cd33f5f2afc.zip
Update from taiwanese translation team.
Diffstat (limited to 'po/zh_TW.po')
-rw-r--r--po/zh_TW.po1313
1 files changed, 649 insertions, 664 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2fcc273021..cfdbaaadc1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,12 +1,12 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 # Tung-Han Hsieh <thhsieh@linux.org.tw>, 2000
 # Yuan-Chung Cheng <platin@ch.ntu.edu.tw>, 2000
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libc 2.1.90\n"
-"POT-Creation-Date: 2000-08-01 00:45-0400\n"
+"POT-Creation-Date: 2001-01-21 08:03-0800\n"
 "PO-Revision-Date: 2000-08-DA HO:MI+DIST\n"
 "Last-Translator: Tung-Han Hsieh <thhsieh@linux.org.tw>\n"
 "                 Yuan-Chung Cheng <platin@ch.ntu.edu.tw>\n"
@@ -23,24 +23,27 @@ msgstr "\t\t¦s¨úÅv­­ : "
 msgid "\t\tAttributes    : "
 msgstr "\t\tÄÝ©Ê     : "
 
-#: sunrpc/rpc_main.c:1430
+#: sunrpc/rpc_main.c:1425
 #, c-format
 msgid ""
 "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] "
 "infile\n"
-msgstr "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] infile\n"
+msgstr ""
+"\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] "
+"infile\n"
 
-#: sunrpc/rpc_main.c:1432
+#: sunrpc/rpc_main.c:1427
 #, c-format
 msgid "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
-msgstr "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
+msgstr ""
+"\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
 
-#: sunrpc/rpc_main.c:1435
+#: sunrpc/rpc_main.c:1430
 #, c-format
 msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
 msgstr "\t%s [-n netid]* [-o outfile] [infile]\n"
 
-#: sunrpc/rpc_main.c:1434
+#: sunrpc/rpc_main.c:1429
 #, c-format
 msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
 msgstr "\t%s [-s nettype]* [-o outfile] [infile]\n"
@@ -206,102 +209,103 @@ msgstr "    »¼°jªº¦¨­û:\n"
 msgid "   program vers proto   port\n"
 msgstr "   µ{¦¡±Ä¥Îªº¨ó©w³s±µªú\n"
 
-#: argp/argp-help.c:1568
+#: argp/argp-help.c:1572
 msgid "  or: "
 msgstr "  ©ÎªÌ: "
 
-#: elf/ldconfig.c:389
+#: elf/ldconfig.c:448
 msgid " (SKIPPED)\n"
 msgstr " (©¿²¤)\n"
 
-#: elf/ldconfig.c:387
+#: elf/ldconfig.c:446
 msgid " (changed)\n"
 msgstr " (¤w§ïÅÜ)\n"
 
-#: timezone/zic.c:423
+#: timezone/zic.c:421
 #, c-format
 msgid " (rule from \"%s\", line %d)"
 msgstr " (³W«h¨Ó¦Û \"%s\", ²Ä %d ¦æ)"
 
-#: argp/argp-help.c:1580
+#: argp/argp-help.c:1584
 msgid " [OPTION...]"
 msgstr " [°Ñ¼Æ...]"
 
-#: locale/programs/ld-collate.c:1712 locale/programs/ld-ctype.c:4039
-msgid " done\n"
-msgstr " §¹¦¨\n"
-
-#: timezone/zic.c:420
+#: timezone/zic.c:418
 #, c-format
 msgid "\"%s\", line %d: %s"
 msgstr "\"%s\", ²Ä %d ¦æ: %s"
 
-#: timezone/zic.c:984
+#: timezone/zic.c:983
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "\"°Ï¬q %s\" ¦æ©M -l ¿ï¶µ¬O¤¬¥¸ªº"
 
-#: timezone/zic.c:992
+#: timezone/zic.c:991
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "\"°Ï¬q %s\" ¦æ©M -p ¿ï¶µ¬O¤¬¥¸ªº"
 
-#: sunrpc/rpc_main.c:1415
+#: sunrpc/rpc_main.c:1410
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr "\"infile\" ¬O¼Ëª©²£¥ÍºX¼Ð©Ò»Ýªº\n"
 
-#: argp/argp-help.c:205
+#: argp/argp-help.c:209
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: ARGP_HELP_FMT °Ñ¼Æ»Ý­n¤@­Ó­È"
 
-#: argp/argp-help.c:214
+#: argp/argp-help.c:218
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: ¥¼ª¾ªº ARGP_HELP_FMT °Ñ¼Æ"
 
-#: locale/programs/ld-address.c:576 locale/programs/ld-collate.c:2727
-#: locale/programs/ld-collate.c:3820 locale/programs/ld-ctype.c:2736
-#: locale/programs/ld-identification.c:440
+#: locale/programs/ld-address.c:576 locale/programs/ld-collate.c:2593
+#: locale/programs/ld-collate.c:3719 locale/programs/ld-ctype.c:2110
+#: locale/programs/ld-ctype.c:2847 locale/programs/ld-identification.c:440
 #: locale/programs/ld-measurement.c:232 locale/programs/ld-messages.c:326
 #: locale/programs/ld-monetary.c:934 locale/programs/ld-name.c:300
 #: locale/programs/ld-numeric.c:370 locale/programs/ld-paper.c:233
-#: locale/programs/ld-telephone.c:308 locale/programs/ld-time.c:1151
+#: locale/programs/ld-telephone.c:308 locale/programs/ld-time.c:1172
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
 msgstr "%1$s: ©w¸q¨Ã¨S¦³¥H `END %1$s' °µ¬°µ²§ô"
 
-#: elf/cache.c:160 elf/cache.c:170
+#: elf/cache.c:165 elf/cache.c:175
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "%d ¨ç¦¡®w¦b§Ö¨ú `%s' ¤¤§ä¨ì\n"
 
-#: timezone/zic.c:794
+#: timezone/zic.c:793
 #, c-format
 msgid "%s in ruleless zone"
 msgstr "%s ¦b¨S¦³³W«hªº°Ï¬q"
 
-#: elf/../sysdeps/generic/readelflib.c:64
+#: elf/../sysdeps/generic/readelflib.c:65
 #, c-format
 msgid "%s is a 32 bit ELF file.\n"
 msgstr "%s ¬O¤@­Ó 32 ¦ì¤¸ªº ELF ÀɮסC\n"
 
-#: elf/../sysdeps/generic/readelflib.c:66
+#: elf/../sysdeps/generic/readelflib.c:67
 #, c-format
 msgid "%s is a 64 bit ELF file.\n"
 msgstr "%s ¬O¤@­Ó 64 ¦ì¤¸ªº ELF ÀɮסC\n"
 
-#: elf/ldconfig.c:287
+#: elf/../sysdeps/unix/sysv/linux/i386/readelflib.c:48
+#, c-format
+msgid "%s is for unknown machine %d.\n"
+msgstr "%s ¬Oµ¹¥¼ª¾ªº¾÷¾¹ %d¡C\n"
+
+#: elf/ldconfig.c:329
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s ¤£¬O¤@­Ó¤wª¾ªº¨ç¦¡®w«¬ºA"
 
-#: elf/../sysdeps/generic/readelflib.c:75
+#: elf/../sysdeps/generic/readelflib.c:76
 #, c-format
 msgid "%s is not a shared object file (Type: %d).\n"
 msgstr "%s ¤£¬O¤@­Ó¦@¥Î¥ØªºÀÉ («¬ºA: %d)¡C\n"
 
-#: elf/ldconfig.c:356
+#: elf/ldconfig.c:415
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s ¤£¬O¤@­Ó²Å¸¹³s±µÀÉ\n"
@@ -326,125 +330,125 @@ msgstr "%s%s%s:%u: %s%sµLªk¹w®Æªº¿ù»~: %s¡C\n"
 msgid "%s%sUnknown signal %d\n"
 msgstr "%s%s¥¼ª¾ªº°T¸¹ %d\n"
 
-#: timezone/zic.c:2229
+#: timezone/zic.c:2228
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: %d µLªk¥¿½T¦a©µ®i°T¸¹\n"
 
-#: locale/programs/charmap.c:289
+#: locale/programs/charmap.c:326
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max> ¥²¶·¤j©ó <mb_cur_min>\n"
 
-#: sunrpc/rpc_main.c:422
+#: sunrpc/rpc_main.c:423
 #, c-format
 msgid "%s: C preprocessor failed with exit code %d\n"
 msgstr "%s: C «e¸m³B²z¾¹¥¢®Ä¡A¨äµ²§ô½X¬° %d\n"
 
-#: sunrpc/rpc_main.c:419
+#: sunrpc/rpc_main.c:420
 #, c-format
 msgid "%s: C preprocessor failed with signal %d\n"
 msgstr "%s: C «e¸m³B²z¾¹¥¢®Ä¡A¨ä°T¸¹­È¬° %d\n"
 
-#: timezone/zic.c:1495
+#: timezone/zic.c:1494
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: µLªk²£¥Í %s: %s\n"
 
-#: timezone/zic.c:2207
+#: timezone/zic.c:2206
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: µLªk«Ø¥ß¥Ø¿ý %s: %s\n"
 
-#: timezone/zic.c:646
+#: timezone/zic.c:645
 #, c-format
 msgid "%s: Can't link from %s to %s: %s\n"
 msgstr "%s: µLªk±q %s ³sµ²¨ì %s: %s\n"
 
-#: timezone/zic.c:820
+#: timezone/zic.c:819
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr "%s: µLªk¶}±Ò %s: %s\n"
 
-#: timezone/zic.c:1485
+#: timezone/zic.c:1484
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s: µLªk²¾°£ %s: %s\n"
 
-#: timezone/zic.c:631
+#: timezone/zic.c:630
 #, c-format
 msgid "%s: Can't unlink  %s: %s\n"
 msgstr "%s: µLªk¨ú®ø³sµ² %s: %s\n"
 
-#: timezone/zic.c:889
+#: timezone/zic.c:888
 #, c-format
 msgid "%s: Error closing %s: %s\n"
 msgstr "%s: Ãö³¬¿ù»~ %s: %s\n"
 
-#: timezone/zic.c:882
+#: timezone/zic.c:881
 #, c-format
 msgid "%s: Error reading %s\n"
 msgstr "%s: Ū¨ú¿ù»~ %s\n"
 
-#: timezone/zdump.c:266
+#: timezone/zdump.c:267
 #, c-format
 msgid "%s: Error writing "
 msgstr "%s: ¼g¤J¿ù»~ "
 
-#: timezone/zic.c:1561
+#: timezone/zic.c:1560
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s: ¼g¤J¿ù»~ %s\n"
 
-#: timezone/zic.c:867
+#: timezone/zic.c:866
 #, c-format
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr "%s: ¶|®É³]©w¦æ (leap line) ¥X²{¦b¤£§t¶|¬íªº³]©wÀÉ %s ¤¤\n"
 
-#: timezone/zic.c:361
+#: timezone/zic.c:359
 #, c-format
 msgid "%s: Memory exhausted: %s\n"
 msgstr "%s: °O¾ÐÅé¤w¥Î§¹: %s\n"
 
-#: timezone/zic.c:526
+#: timezone/zic.c:525
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s: ±z¨Ï¥Î¤F¶W¹L¤@­Ó -L ¿ï¶µ\n"
 
-#: timezone/zic.c:486
+#: timezone/zic.c:485
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s: ±z¨Ï¥Î¤F¶W¹L¤@­Ó -d ¿ï¶µ\n"
 
-#: timezone/zic.c:496
+#: timezone/zic.c:495
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s: ±z¨Ï¥Î¤F¶W¹L¤@­Ó -l ¿ï¶µ\n"
 
-#: timezone/zic.c:506
+#: timezone/zic.c:505
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s: ±z¨Ï¥Î¤F¶W¹L¤@­Ó -p ¿ï¶µ\n"
 
-#: timezone/zic.c:516
+#: timezone/zic.c:515
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr "%s: ±z¨Ï¥Î¤F¶W¹L¤@­Ó -y ¿ï¶µ\n"
 
-#: argp/argp-parse.c:640
+#: argp/argp-parse.c:646
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: ¤Ó¦hªº¤Þ¼Æ\n"
 
-#: locale/programs/ld-collate.c:423 locale/programs/ld-collate.c:449
-#: locale/programs/ld-collate.c:465
+#: locale/programs/ld-collate.c:457 locale/programs/ld-collate.c:483
+#: locale/programs/ld-collate.c:499
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s: `%s' ¤£¥u¤@¦¸¦a¦bÅv­« %d ¤¤³Q´£¨ì"
 
-#: locale/programs/ld-collate.c:1282
+#: locale/programs/ld-collate.c:1323
 #, c-format
-msgid "%s: `%s' must be a charater"
+msgid "%s: `%s' must be a character"
 msgstr "%s: `%s' ¥²¶·¬O¤@­Ó¦r¤¸"
 
 #: locale/programs/ld-address.c:248 locale/programs/ld-address.c:276
@@ -458,86 +462,91 @@ msgstr "%s: `%s' ­È»P `%s' ­È¤£²Å¦X"
 msgid "%s: `-1' must be last entry in `%s' field"
 msgstr "%s: `-1' ¦b `%s' Äæ¦ì¤¤¥²¶·¬O³Ì«á¤@­Ó¶µ¥Ø"
 
-#: locale/programs/ld-collate.c:413 locale/programs/ld-collate.c:439
+#: locale/programs/ld-collate.c:447 locale/programs/ld-collate.c:473
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: `forward' ¥H¤Î `backward' ©¼¦¹¤¬¬Û±Æ¥¸"
 
-#: locale/programs/ld-collate.c:1475
+#: locale/programs/ld-collate.c:1515
 #, c-format
 msgid ""
 "%s: `position' must be used for a specific level in all sections or none"
 msgstr "%s: `position' ¥²¶·¦b©Ò¦³°Ï¶ô¸Ì¯S©wªºµ¥¯Å¤¤¨Ï¥Î¡A§_«h¤£¯à¨Ï¥Î"
 
-#: locale/programs/ld-collate.c:1082
+#: locale/programs/ld-ctype.c:2635 locale/programs/ld-ctype.c:2775
+#, c-format
+msgid "%s: `translit_start' section does not end with `translit_end'"
+msgstr "%s: `translit_start' ¤p¸`¨Ã¨S¦³¥H `translit_end' °µ¬°µ²§ô"
+
+#: locale/programs/ld-collate.c:1123
 #, c-format
 msgid ""
 "%s: byte sequence of first character of sequence is not lower than that of "
 "the last character"
 msgstr "%s: ²Ä¤@­Ó¦r¤¸§Ç¦Cªº¦ì¤¸²Õ§Ç¦C¨Ã¨S¦³§C©ó³Ì«á¤@­Ó¦r¤¸ªº¦ì¤¸²Õ§Ç¦C"
 
-#: locale/programs/ld-collate.c:1040
+#: locale/programs/ld-collate.c:1081
 #, c-format
 msgid ""
 "%s: byte sequences of first and last character must have the same length"
 msgstr "%s: ²Ä¤@­Ó»P³Ì«á¤@­Ó¦r¤¸ªº¦ì¤¸²Õ§Ç¦C¥²¶·¦³¬Û¦Pªºªø«×"
 
-#: locale/programs/ld-collate.c:3742
+#: locale/programs/ld-collate.c:3642
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: µLªk¥Î `%s' °µ¬°¬Ù²¤°Ï¬qªºµ²§À"
 
-#: locale/programs/ld-collate.c:3421
+#: locale/programs/ld-collate.c:3308
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: µLªk­«·s±Æ¦C¦b %.*s ¤§«á: ¥¼ª¾ªº²Å¸¹"
 
-#: locale/programs/ld-ctype.c:2797 locale/programs/ld-ctype.c:2881
-#: locale/programs/ld-ctype.c:2901 locale/programs/ld-ctype.c:2922
-#: locale/programs/ld-ctype.c:2943 locale/programs/ld-ctype.c:2964
-#: locale/programs/ld-ctype.c:2985 locale/programs/ld-ctype.c:3025
-#: locale/programs/ld-ctype.c:3046 locale/programs/ld-ctype.c:3113
+#: locale/programs/ld-ctype.c:2910 locale/programs/ld-ctype.c:2994
+#: locale/programs/ld-ctype.c:3014 locale/programs/ld-ctype.c:3035
+#: locale/programs/ld-ctype.c:3056 locale/programs/ld-ctype.c:3077
+#: locale/programs/ld-ctype.c:3098 locale/programs/ld-ctype.c:3138
+#: locale/programs/ld-ctype.c:3159 locale/programs/ld-ctype.c:3226
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr "%s: ¦r¶°¹ï·Óªí¤¤ªº¦r¤¸ `%s' µLªkªí¥Ü¬°³æ¤@¦ì¤¸²Õ"
 
-#: locale/programs/ld-ctype.c:3157 locale/programs/ld-ctype.c:3182
+#: locale/programs/ld-ctype.c:3270 locale/programs/ld-ctype.c:3295
 #, c-format
 msgid ""
 "%s: character `%s' needed as default value not representable with one byte"
 msgstr "%s: °µ¬°¹w³]­È©Ò»Ýªº¦r¤¸ `%s' µLªkªí¥Ü¬°³æ¤@¦ì¤¸²Õ"
 
-#: locale/programs/ld-ctype.c:2792
+#: locale/programs/ld-ctype.c:2905
 #, c-format
 msgid "%s: character `%s' not defined in charmap while needed as default value"
 msgstr "%s: ¦r¤¸ `%s' ¦b¦r¶°¹ï·Óªí¤¤¨S¦³©w¸q¡A¦ý¥¦¬O¥²»Ýªº¹w³]­È"
 
-#: locale/programs/ld-ctype.c:2876 locale/programs/ld-ctype.c:2896
-#: locale/programs/ld-ctype.c:2938 locale/programs/ld-ctype.c:2959
-#: locale/programs/ld-ctype.c:2980 locale/programs/ld-ctype.c:3020
-#: locale/programs/ld-ctype.c:3041 locale/programs/ld-ctype.c:3108
-#: locale/programs/ld-ctype.c:3150 locale/programs/ld-ctype.c:3175
+#: locale/programs/ld-ctype.c:2989 locale/programs/ld-ctype.c:3009
+#: locale/programs/ld-ctype.c:3051 locale/programs/ld-ctype.c:3072
+#: locale/programs/ld-ctype.c:3093 locale/programs/ld-ctype.c:3133
+#: locale/programs/ld-ctype.c:3154 locale/programs/ld-ctype.c:3221
+#: locale/programs/ld-ctype.c:3263 locale/programs/ld-ctype.c:3288
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr "%s: ¦r¤¸ `%s' ¨S¦³©w¸q¡A¦ý¥¦¬O¥²»Ýªº¹w³]­È"
 
-#: timezone/zic.c:1928
+#: timezone/zic.c:1927
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s: ¿é¤J©R¥O¬° '%s', µ²ªG¬° %d\n"
 
-#: locale/programs/ld-time.c:223
+#: locale/programs/ld-time.c:225
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not '+' nor '-'"
 msgstr "%s: ¦b `era' Äæ¦ìªº¦r¦ê %Zd ¤¤¡A¤è¦VºX¼Ð¬J¤£¬O '+' ¤]¤£¬O '-'"
 
-#: locale/programs/ld-time.c:235
+#: locale/programs/ld-time.c:237
 #, c-format
 msgid ""
 "%s: direction flag in string %Zd in `era' field is not a single character"
 msgstr "%s: ¦b `era' Äæ¦ìªº¦r¦ê %Zd ¤¤¡A¤è¦VºX¼Ð¤£¬O¤@­Ó³æ¤@¦r¤¸"
 
-#: locale/programs/ld-ctype.c:2643
+#: locale/programs/ld-ctype.c:2727
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr "%s: ­«½Æªº `default_missing' ©w¸q"
@@ -547,39 +556,39 @@ msgstr "%s: ­«½Æªº `default_missing' ©w¸q"
 msgid "%s: duplicate category version definition"
 msgstr "%s: ­«½ÆªºÃþ§Oª©¥»©w¸q"
 
-#: locale/programs/ld-collate.c:2845
+#: locale/programs/ld-collate.c:2711
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: ­«½Æªº `%s' °Ï¶ô«Å§i"
 
-#: locale/programs/ld-collate.c:2809
+#: locale/programs/ld-collate.c:2675
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: ­«½Æªº©w¸q `%s'"
 
-#: locale/programs/ld-collate.c:3792
+#: locale/programs/ld-collate.c:3691
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: ªÅ¥ÕªºÃþ§O´y­z¬O¤£¤¹³\ªº"
 
-#: locale/programs/ld-collate.c:717
+#: locale/programs/ld-collate.c:755
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: ªÅ¥ÕªºÅv­«¦r¦ê¬O¤£¤¹³\ªº"
 
-#: locale/programs/charmap.c:794
+#: locale/programs/charmap.c:831
 #, c-format
 msgid "%s: error in state machine"
 msgstr "%s: ª¬ºA¾÷¿ù»~"
 
-#: locale/programs/ld-ctype.c:2411
+#: locale/programs/ld-ctype.c:2483
 #, c-format
 msgid "%s: field `%s' declared more than once"
 msgstr "%s: `%s' Äæ¦ì¤£¥u¤@¦¸¦a«Å§i"
 
-#: locale/programs/ld-ctype.c:1493 locale/programs/ld-ctype.c:1618
-#: locale/programs/ld-ctype.c:1724 locale/programs/ld-ctype.c:2274
-#: locale/programs/ld-ctype.c:3216
+#: locale/programs/ld-ctype.c:1525 locale/programs/ld-ctype.c:1650
+#: locale/programs/ld-ctype.c:1756 locale/programs/ld-ctype.c:2346
+#: locale/programs/ld-ctype.c:3329
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr "%s: `%s' Äæ¦ì¨S¦³ºë½T¥]§t¤Q­Ó¶µ¥Ø"
@@ -608,32 +617,32 @@ msgstr "%s: Äæ¦ì `%s' ¨S¦³©w¸q"
 msgid "%s: field `%s' undefined"
 msgstr "%s: Äæ¦ì `%s' ¨S¦³©w¸q"
 
-#: locale/programs/ld-time.c:256
+#: locale/programs/ld-time.c:258
 #, c-format
 msgid "%s: garbage at end of offset value in string %Zd in `era' field"
 msgstr "%s: µL¥Îªº¸ê®Æ¡A¦b `era' Äæ¦ì¡B¦r¦ê %Zd ¤¤¥½§Àªº¦ì²¾­È"
 
-#: locale/programs/ld-time.c:316
+#: locale/programs/ld-time.c:318
 #, c-format
 msgid "%s: garbage at end of starting date in string %Zd in `era' field "
 msgstr "%s: µL¥Îªº¸ê®Æ¡A¦b `era' Äæ¦ì¡B¦r¦ê %Zd ¤¤¥½§Àªº°_©l¤é´Á"
 
-#: locale/programs/ld-time.c:393
+#: locale/programs/ld-time.c:395
 #, c-format
 msgid "%s: garbage at end of stopping date in string %Zd in `era' field"
 msgstr "%s: µL¥Îªº¸ê®Æ¡A¦b `era' °Ï°ì¡B¦r¦ê %Zd ¤¤¥½§Àªºµ²§ô¤é´Á"
 
-#: posix/getopt.c:791
+#: posix/getopt.c:795
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ¤£¦Xªkªº¿ï¶µ -- %c\n"
 
-#: locale/programs/ld-address.c:573 locale/programs/ld-collate.c:3818
-#: locale/programs/ld-ctype.c:2733 locale/programs/ld-identification.c:437
+#: locale/programs/ld-address.c:573 locale/programs/ld-collate.c:3717
+#: locale/programs/ld-ctype.c:2844 locale/programs/ld-identification.c:437
 #: locale/programs/ld-measurement.c:229 locale/programs/ld-messages.c:324
 #: locale/programs/ld-monetary.c:932 locale/programs/ld-name.c:298
 #: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:231
-#: locale/programs/ld-telephone.c:306 locale/programs/ld-time.c:1149
+#: locale/programs/ld-telephone.c:306 locale/programs/ld-time.c:1170
 #, c-format
 msgid "%s: incomplete `END' line"
 msgstr "%s: ¤£§¹¾ãªº `END' ¦æ"
@@ -648,27 +657,27 @@ msgstr "%s: ¤£¾A¥Îªº¸õ²æ§Ç¦C `%%%c', ¦bÄæ¦ì `%s' ¤¤"
 msgid "%s: invalid escape sequence in field `%s'"
 msgstr "%s: ¦bÄæ¦ì `%s' ¤¤ªº¸õ²æ§Ç¦C¤£¾A¥Î"
 
-#: locale/programs/ld-time.c:248
+#: locale/programs/ld-time.c:250
 #, c-format
 msgid "%s: invalid number for offset in string %Zd in `era' field"
 msgstr "%s: ¦b `era' Äæ¦ì¡B¦r¦ê %Zd ¤¤ªº¦ì²¾¼Æ¦r¤£¾A¥Î"
 
-#: locale/programs/ld-collate.c:3269
+#: locale/programs/ld-collate.c:3143
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: ¤£¾A¥Îªº±Æ§Ç³W«h¼Æ¥Ø"
 
-#: posix/getopt.c:794
+#: posix/getopt.c:798
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ¤£¾A¥Îªº¿ï¶µ -- %c\n"
 
-#: locale/programs/ld-time.c:307
+#: locale/programs/ld-time.c:309
 #, c-format
 msgid "%s: invalid starting date in string %Zd in `era' field"
 msgstr "%s: ¦b `era' Äæ¦ì¡B¦r¦ê %Zd ¤¤ªº°_©l¤é´Á¤£¾A¥Î"
 
-#: locale/programs/ld-time.c:384
+#: locale/programs/ld-time.c:386
 #, c-format
 msgid "%s: invalid stopping date in string %Zd in `era' field"
 msgstr "%s: ¦b `era' Äæ¦ì¡B¦r¦ê %Zd ¤¤ªºµ²§ô¤é´Á¤£¾A¥Î"
@@ -683,38 +692,38 @@ msgstr "%s: ¦bÄæ¦ì `%s' ¤¤ªº­È¤£¾A¥Î"
 msgid "%s: language abbreviation `%s' not defined"
 msgstr "%s: »y¨¥ÁY¼g `%s' ¨S¦³©w¸q"
 
-#: locale/programs/ld-collate.c:3347 locale/programs/ld-collate.c:3460
-#: locale/programs/ld-collate.c:3796
+#: locale/programs/ld-collate.c:3223 locale/programs/ld-collate.c:3346
+#: locale/programs/ld-collate.c:3695
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: ¯Ê¤Ö `order_end' ÃöÁä¦r"
 
-#: locale/programs/ld-collate.c:3474 locale/programs/ld-collate.c:3808
+#: locale/programs/ld-collate.c:3360 locale/programs/ld-collate.c:3707
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: ¯Ê¤Ö `reorder-end' ÃöÁä¦r"
 
-#: locale/programs/ld-collate.c:3811
+#: locale/programs/ld-collate.c:3710
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: ¯Ê¤Ö `reorder-sections-end' ÃöÁä¦r"
 
-#: locale/programs/ld-time.c:433
+#: locale/programs/ld-time.c:435
 #, c-format
 msgid "%s: missing era format in string %Zd in `era' field"
 msgstr "%s: ¯Ê¤Ö era ®æ¦¡¡A¦b `era' Äæ¦ì¡B¦r¦ê %Zd ¤¤"
 
-#: locale/programs/ld-time.c:421
+#: locale/programs/ld-time.c:423
 #, c-format
 msgid "%s: missing era name in string %Zd in `era' field"
 msgstr "%s: ¯Ê¤Ö era ¦WºÙ¡A¦b `era' Äæ¦ì¡B¦r¦ê %Zd ¤¤"
 
-#: locale/programs/ld-collate.c:3247
+#: locale/programs/ld-collate.c:3119
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: `%s' °Ï¶ô¤¤¦³¦h­Ó¶¶§Ç©w¸q"
 
-#: locale/programs/ld-collate.c:3295
+#: locale/programs/ld-collate.c:3169
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: ¥¼©R¦Wªº°Ï¶ô¤¤¦³¦h­Ó¶¶§Ç©w¸q"
@@ -729,7 +738,12 @@ msgstr "%s: ¨S¦³µ¹Äæ¦ì `%s' ¥¿½Tªº±`³Wªí¥Ü¦¡¡G %s"
 msgid "%s: no identification for category `%s'"
 msgstr "%s: Ãþ§O `%s' ¨S¦³»{ÃÒ"
 
-#: locale/programs/ld-collate.c:557
+#: locale/programs/ld-ctype.c:2753
+#, c-format
+msgid "%s: no representable `default_missing' definition found"
+msgstr "%s: §ä¤£¨ì¥iªí¥Ü¬° `default_missing' ªº©w¸q"
+
+#: locale/programs/ld-collate.c:591
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: ±Æ§Ç³W«h¤£¨¬"
@@ -739,143 +753,139 @@ msgstr "%s: ±Æ§Ç³W«h¤£¨¬"
 msgid "%s: numeric country code `%d' not valid"
 msgstr "%s: °ê®a¼Æ¦r¥N½X `%d' ¿ù»~"
 
-#: locale/programs/ld-ctype.c:2613
-#, c-format
-msgid "%s: only one `include' instruction allowed"
-msgstr "%s: ¥u¤¹³\¤@­Ó `include' «ü¥O"
-
-#: posix/getopt.c:714
+#: posix/getopt.c:718
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ¿ï¶µ `%c%s' ¤£¤¹³\ªþ¥[¤Þ¼Æ\n"
 
-#: posix/getopt.c:684
+#: posix/getopt.c:688
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ¿ï¶µ `%s' §t¸q¤£²M\n"
 
-#: posix/getopt.c:732 posix/getopt.c:905
+#: posix/getopt.c:736 posix/getopt.c:909
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ¿ï¶µ `%s' »Ý­n¤@­Ó¤Þ¼Æ\n"
 
-#: posix/getopt.c:709
+#: posix/getopt.c:713
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ¿ï¶µ `--%s' ¤£¤¹³\ªþ¥[¤Þ¼Æ\n"
 
-#: posix/getopt.c:889
+#: posix/getopt.c:893
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ¿ï¶µ `-W %s' ¤£¤¹³\ªþ¥[¤Þ¼Æ\n"
 
-#: posix/getopt.c:871
+#: posix/getopt.c:875
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ¿ï¶µ `-W %s' §t¸q¤£²M\n"
 
-#: posix/getopt.c:824 posix/getopt.c:954
+#: posix/getopt.c:828 posix/getopt.c:958
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ¿ï¶µ»Ý­n¤@­Ó¤Þ¼Æ -- %c\n"
 
-#: locale/programs/ld-collate.c:1273 locale/programs/ld-collate.c:3755
+#: locale/programs/ld-collate.c:1314 locale/programs/ld-collate.c:3654
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: `%.*s' ªº¶¶§Ç¤w¦b %s:%Zu ¤¤©w¸q"
 
-#: locale/programs/ld-collate.c:3409
+#: locale/programs/ld-collate.c:3297
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: ¹ï·Ó¤¸¯À %.*s ªº¶¶§Ç©|¥¼©w¸q"
 
-#: locale/programs/ld-collate.c:3390
+#: locale/programs/ld-collate.c:3281
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: ¹ï·Ó²Å¸¹ %.*s ªº¶¶§Ç©|¥¼©w¸q"
 
-#: sunrpc/rpc_main.c:288
+#: sunrpc/rpc_main.c:289
 #, c-format
 msgid "%s: output would overwrite %s\n"
 msgstr "%s: ¿é¥X±N·|Âл\ %s\n"
 
-#: timezone/zic.c:874 timezone/zic.c:1288 timezone/zic.c:1313
+#: timezone/zic.c:873 timezone/zic.c:1287 timezone/zic.c:1312
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: ÄY­«¿ù»~: ¿ù»~ªº¥ª­È (l_value) %d\n"
 
-#: locale/programs/charmap.c:801 locale/programs/ld-address.c:592
-#: locale/programs/ld-collate.c:2724 locale/programs/ld-collate.c:3836
-#: locale/programs/ld-ctype.c:2753 locale/programs/ld-identification.c:456
+#: locale/programs/charmap.c:838 locale/programs/ld-address.c:592
+#: locale/programs/ld-collate.c:2590 locale/programs/ld-collate.c:3735
+#: locale/programs/ld-ctype.c:2107 locale/programs/ld-ctype.c:2864
+#: locale/programs/ld-identification.c:456
 #: locale/programs/ld-measurement.c:248 locale/programs/ld-messages.c:342
 #: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:316
 #: locale/programs/ld-numeric.c:386 locale/programs/ld-paper.c:249
-#: locale/programs/ld-telephone.c:324 locale/programs/ld-time.c:1167
+#: locale/programs/ld-telephone.c:324 locale/programs/ld-time.c:1188
 #: locale/programs/locfile.h:103 locale/programs/repertoire.c:325
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s: ¥¼§¹¦¨¤w¹FÀɮתº¥½§À"
 
-#: locale/programs/ld-collate.c:3508 locale/programs/ld-collate.c:3680
+#: locale/programs/ld-collate.c:3394 locale/programs/ld-collate.c:3580
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: ¥¼ª¾ªº°Ï¶ô `%.*s'"
 
-#: locale/programs/ld-time.c:335
+#: locale/programs/ld-time.c:337
 #, c-format
 msgid "%s: starting date is invalid in string %Zd in `era' field"
 msgstr "%s: ¦b `era' °Ï°ìªº¦r¦ê %Zd ¤¤ªº±Ò©l¤é´Á¬O¤£¾A¥Îªº"
 
-#: locale/programs/ld-time.c:412
+#: locale/programs/ld-time.c:414
 #, c-format
 msgid "%s: stopping date is invalid in string %Zd in `era' field"
 msgstr "%s: ¦b `era' °Ï°ìªº¦r¦ê %Zd ¤¤ªºµ²§ô¤é´Á¬O¤£¾A¥Îªº"
 
-#: locale/programs/ld-collate.c:1207
+#: locale/programs/ld-collate.c:1248
 #, c-format
 msgid "%s: symbolic range ellipsis must not be direct followed by `order_end'"
 msgstr "%s: ²Å¸¹½d³òªº¬Ù²¤¤£¥i¥Hª½±µ¦b `order_end' ¤§«e"
 
-#: locale/programs/ld-collate.c:1203
+#: locale/programs/ld-collate.c:1244
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: ²Å¸¹½d³òªº¬Ù²¤¤£¥i¥Hª½±µ¦b `order_start' ¤§«á"
 
-#: locale/programs/ld-address.c:583 locale/programs/ld-collate.c:484
-#: locale/programs/ld-collate.c:536 locale/programs/ld-collate.c:827
-#: locale/programs/ld-collate.c:840 locale/programs/ld-collate.c:2715
-#: locale/programs/ld-collate.c:3827 locale/programs/ld-ctype.c:1808
-#: locale/programs/ld-ctype.c:2592 locale/programs/ld-ctype.c:2744
-#: locale/programs/ld-identification.c:447
+#: locale/programs/ld-address.c:583 locale/programs/ld-collate.c:518
+#: locale/programs/ld-collate.c:570 locale/programs/ld-collate.c:865
+#: locale/programs/ld-collate.c:878 locale/programs/ld-collate.c:2581
+#: locale/programs/ld-collate.c:3726 locale/programs/ld-ctype.c:1840
+#: locale/programs/ld-ctype.c:2098 locale/programs/ld-ctype.c:2673
+#: locale/programs/ld-ctype.c:2855 locale/programs/ld-identification.c:447
 #: locale/programs/ld-measurement.c:239 locale/programs/ld-messages.c:333
 #: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:307
 #: locale/programs/ld-numeric.c:377 locale/programs/ld-paper.c:240
-#: locale/programs/ld-telephone.c:315 locale/programs/ld-time.c:1158
+#: locale/programs/ld-telephone.c:315 locale/programs/ld-time.c:1179
 #, c-format
 msgid "%s: syntax error"
 msgstr "%s: »yªk¿ù»~"
 
-#: locale/programs/ld-ctype.c:2106
+#: locale/programs/ld-ctype.c:2178
 #, c-format
 msgid "%s: syntax error in definition of new character class"
 msgstr "%s: ¦b©w¸q·s¦r¤¸Ãþ§O®É»yªk¿ù»~"
 
-#: locale/programs/ld-ctype.c:2121
+#: locale/programs/ld-ctype.c:2193
 #, c-format
 msgid "%s: syntax error in definition of new character map"
 msgstr "%s: ¦b©w¸q·s¦r¤¸¹ïÀ³®É»yªk¿ù»~"
 
-#: locale/programs/ld-ctype.c:4131
+#: locale/programs/ld-ctype.c:3735
 #, c-format
 msgid "%s: table for class \"%s\": %lu bytes\n"
 msgstr "%s: Ãþ§O \"%s\" ªí®æ: %lu ¦ì¤¸²Õ\n"
 
-#: locale/programs/ld-ctype.c:4221
+#: locale/programs/ld-ctype.c:3803
 #, c-format
 msgid "%s: table for map \"%s\": %lu bytes\n"
 msgstr "%s: ¹ï¬Mªí \"%s\" ªí®æ: %lu ¦ì¤¸²Õ\n"
 
-#: locale/programs/ld-ctype.c:4453
+#: locale/programs/ld-ctype.c:3935
 #, c-format
 msgid "%s: table for width: %lu bytes\n"
 msgstr "%s: ¼e«×ªí®æ: %lu ¦ì¤¸²Õ\n"
@@ -885,88 +895,86 @@ msgstr "%s: ¼e«×ªí®æ: %lu ¦ì¤¸²Õ\n"
 msgid "%s: terminology language code `%s' not defined"
 msgstr "%s: ³N»y»y¨¥½s½X `%s' ¥¼©w¸q"
 
-#: locale/programs/ld-collate.c:1014
+#: locale/programs/ld-collate.c:1054
 #, c-format
-msgid "%s: the start end the end symbol of a range must stand for characters"
+msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: ±Ò©l»Pµ²§ô²Å¸¹½d³ò¥²¶·¥Nªí¦r¤¸"
 
-#: locale/programs/ld-time.c:462
+#: locale/programs/ld-time.c:464
 #, c-format
 msgid "%s: third operand for value of field `%s' must not be larger than %d"
 msgstr "%s: Äæ¦ì `%s' ­Èªº²Ä¤T­Ó¹Bºâ¤¸¤£¥i¥H¤ñ %d ¤j"
 
-#: locale/programs/ld-collate.c:521
+#: locale/programs/ld-collate.c:555
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: ¤Ó¦h³W«h¡F²Ä¤@­Ó¶µ¥Ø¥u¥]§t %d"
 
-#: locale/programs/ld-collate.c:868
+#: locale/programs/ld-collate.c:906
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: ¤Ó¦hÅܼƭÈ"
 
-#: locale/programs/ld-ctype.c:4483
+#: locale/programs/ld-ctype.c:3639
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
-msgstr "%s: locale `%s' ªº­µÄ¶¸ê®Æ¤£¦s¦b"
+msgstr "%s: °Ï°ì¤Æ¸ê®Æ®w (locale) `%s' ªº­µÄ¶¸ê®Æ¤£¦s¦b"
 
-#: sunrpc/rpc_main.c:295
+#: sunrpc/rpc_main.c:296
 #, c-format
 msgid "%s: unable to open %s: %m\n"
 msgstr "%s: µLªk¶}±Ò %s: %m\n"
 
-#: locale/programs/ld-collate.c:2982
+#: locale/programs/ld-collate.c:2849
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: ¥¼ª¾ªº¦r¤¸¦b¹ï·Ó²Å¸¹¦WºÙ¤¤"
 
-#: locale/programs/ld-collate.c:3111
+#: locale/programs/ld-collate.c:2981
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: ¥¼ª¾ªº¦r¤¸¦b¦P¸q©w¸q¦WºÙ¤¤"
 
-#: locale/programs/ld-collate.c:3124
+#: locale/programs/ld-collate.c:2994
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: ¥¼ª¾ªº¦r¤¸¦b¦P¸q©w¸q­È¤¤"
 
-#: locale/programs/ld-time.c:1020
+#: locale/programs/ld-time.c:1040
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: ¥¼ª¾ªº¦r¤¸¦bÄæ¦ì `%s' ¤¤"
 
-#: locale/programs/ld-collate.c:3221
+#: locale/programs/ld-collate.c:3091
 #, c-format
 msgid "%s: unknown section name `%s'"
 msgstr "%s: ¥¼ª¾ªº°Ï¶ô¦WºÙ `%s'"
 
-#: locale/programs/ld-collate.c:3134
+#: locale/programs/ld-collate.c:3004
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: ¥¼ª¾ªº²Å¸¹ `%s' ¦b¦P¸q©w¸q¤¤"
 
-#: posix/getopt.c:765
+#: posix/getopt.c:769
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
 
-#: posix/getopt.c:761
+#: posix/getopt.c:765
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ¥¼ª¾ªº¿ï¶µ `--%s'\n"
 
-#: timezone/zic.c:445
+#: timezone/zic.c:443
 #, c-format
 msgid ""
-"%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] [ -d "
-"directory ]\n"
-"\t[ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
+"%s: usage is %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
+"\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
 msgstr ""
-"%s: ¨Ï¥Î¤è¦¡: %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] [ -d "
-"directory ]\n"
-"\t[ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
+"%s: ¨Ï¥Î¤è¦¡: %s [ -s ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
+"\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
 
-#: timezone/zdump.c:174
+#: timezone/zdump.c:175
 #, c-format
 msgid "%s: usage is %s [ -v ] [ -c cutoff ] zonename ...\n"
 msgstr "%s: ¨Ï¥Î¤è¦¡: %s [ -v ] [ -c cutoff ] zonename ...\n"
@@ -998,31 +1006,31 @@ msgstr "%s: Äæ¦ì `int_curr_symbol' ­Èªºªø«×¿ù»~"
 msgid "%s: values for field `%s' must be smaller than 127"
 msgstr "%s: Äæ¦ì `%s' ªº­È¥²¶·¤p©ó 127"
 
-#: locale/programs/ld-time.c:486
+#: locale/programs/ld-time.c:488
 #, c-format
 msgid "%s: values for field `%s' must not be larger than %d"
 msgstr "%s: Äæ¦ì `%s' ªº­È¤£¥i¥H¤j©ó %d"
 
-#: locale/programs/ld-time.c:470 locale/programs/ld-time.c:478
+#: locale/programs/ld-time.c:472 locale/programs/ld-time.c:480
 #, c-format
 msgid "%s: values of field `%s' must not be larger than %d"
 msgstr "%s: Äæ¦ì `%s' ªº­È¤£¥i¥H¤j©ó %d"
 
-#: locale/programs/ld-collate.c:812
+#: locale/programs/ld-collate.c:850
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: Åv­«¥²¶·¨Ï¥Î»P¦WºÙ¬Û¦Pªº¬Ù²¤²Å¸¹"
 
-#: sunrpc/rpc_main.c:307
+#: sunrpc/rpc_main.c:308
 #, c-format
 msgid "%s: while writing output %s: %m"
 msgstr "%s: ·í¦b¼g¥X¿é¥X %s ®É: %m"
 
-#: argp/argp-parse.c:164
+#: argp/argp-parse.c:170
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(µ{¦¡¿ù»~) ¨S¦³»{±oªºª©¥»!?"
 
-#: argp/argp-parse.c:781
+#: argp/argp-parse.c:787
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(µ{¦¡¿ù»~) ¿ï¶µÀ³¸Ó¤w¸g¥iÅGÃÑ!?"
 
@@ -1044,11 +1052,11 @@ msgstr "(¥¼ª¾)"
 msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
 msgstr "*** ÀÉ®× `%s' ³Qµô°Å¤F: µLªk°µ¸Ô²Óªº¤ÀªR\n"
 
-#: catgets/gencat.c:267
+#: catgets/gencat.c:282
 msgid "*standard input*"
 msgstr "*¼Ð·Ç¿é¤J*"
 
-#: catgets/gencat.c:121
+#: catgets/gencat.c:125
 msgid ""
 "-o OUTPUT-FILE [INPUT-FILE]...\n"
 "[OUTPUT-FILE [INPUT-FILE]...]"
@@ -1070,7 +1078,7 @@ msgstr "; §Cª©¥» = %lu, °ªª©¥» = %lu"
 msgid "; why = "
 msgstr "; ­ì¦] = "
 
-#: locale/programs/charmap.c:962
+#: locale/programs/charmap.c:999
 #, c-format
 msgid "<%s> and <%s> are illegal names for range"
 msgstr "<%s> ¥H¤Î <%s> ¬O¤£¦Xªkªº½d³ò¦WºÙ"
@@ -1080,12 +1088,12 @@ msgstr "<%s> ¥H¤Î <%s> ¬O¤£¦Xªkªº½d³ò¦WºÙ"
 msgid "<%s> and <%s> are invalid names for range"
 msgstr "<%s> ¥H¤Î <%s> ¬O¤£¾A¥Îªº½d³ò¦WºÙ"
 
-#: locale/programs/ld-ctype.c:542 locale/programs/ld-ctype.c:577
+#: locale/programs/ld-ctype.c:565 locale/programs/ld-ctype.c:600
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr "<SP> ¦r¤¸¤£¥i¥H¦bÃþ§O `%s' ¤¤"
 
-#: locale/programs/ld-ctype.c:530 locale/programs/ld-ctype.c:566
+#: locale/programs/ld-ctype.c:553 locale/programs/ld-ctype.c:589
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr "<SP> ¦r¤¸¤£¦bÃþ§O `%s' ¤¤"
@@ -1147,6 +1155,10 @@ msgstr "¦P®É¹ïÁ`°O¾ÐÅé®É¥Î¶q§@¹Ï"
 msgid "Anode table overflow"
 msgstr "Anode ªí®æ·¸¥X"
 
+#: intl/tst-gettext2.c:37
+msgid "Another string for testing."
+msgstr "¥t¤@­Ó¨ü´ú¸Õªº¦r¦ê¡C"
+
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:37
 msgid "Arg list too long"
 msgstr "Arg ¦ê¦C¤Óªø"
@@ -1235,7 +1247,7 @@ msgstr "¿ù»~ªº¨t²Î©I¥s"
 msgid "Bad value for ai_flags"
 msgstr "¿ù»~ªº ai_flags ­È"
 
-#: locale/programs/localedef.c:99
+#: locale/programs/localedef.c:104
 msgid "Be strictly POSIX conform"
 msgstr "ÄY®æ¿í±q POSIX"
 
@@ -1296,15 +1308,10 @@ msgstr "µLªkª½±µ°õ¦æ¤À¨É¨ç¦¡®w"
 msgid "Can't bind to server which serves this domain"
 msgstr "µLªk»PªA°È©ó¦¹ºô°ìªº¦øªA¾¹Ápô"
 
-#: elf/ldconfig.c:778
+#: elf/ldconfig.c:934
 msgid "Can't chdir to /"
 msgstr "µLªkÅܧó¥Ø¿ý¨ì /"
 
-#: elf/ldconfig.c:775
-#, c-format
-msgid "Can't chroot to %s"
-msgstr "µLªkÅܧó®Ú¸ô®|¨ì %s"
-
 #: nis/ypclnt.c:804
 msgid "Can't communicate with portmapper"
 msgstr "µLªk»P portmapper ³q°T"
@@ -1317,47 +1324,57 @@ msgstr "µLªk»P ypbind ³q°T"
 msgid "Can't communicate with ypserv"
 msgstr "µLªk»P ypserv ³q°T"
 
-#: elf/cache.c:353
+#: elf/cache.c:359
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "µLªk²£¥Í¼È®Éªº§Ö¨úÀÉ %s"
 
-#: elf/ldconfig.c:381
+#: elf/ldconfig.c:502
+#, c-format
+msgid "Can't find %s"
+msgstr "§ä¤£¨ì %s"
+
+#: elf/ldconfig.c:440
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "µLªk±q %s ³sµ²¨ì %s"
 
-#: elf/ldconfig.c:439 elf/ldconfig.c:563
+#: elf/ldconfig.c:518 elf/ldconfig.c:672
 #, c-format
 msgid "Can't lstat %s"
 msgstr "µLªk lstat %s"
 
-#: elf/cache.c:103
+#: elf/cache.c:108 elf/ldconfig.c:955
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "µLªk¶}±Ò§Ö¨úÀÉ %s\n"
 
-#: elf/ldconfig.c:716
+#: elf/ldconfig.c:976
+#, c-format
+msgid "Can't open cache file directory %s\n"
+msgstr "µLªk¶}±Ò§Ö¨úÀɮץؿý %s\n"
+
+#: elf/ldconfig.c:865
 #, c-format
 msgid "Can't open configuration file %s"
 msgstr "µLªk¶}±Ò³]©wÀÉ %s"
 
-#: elf/ldconfig.c:528
+#: elf/ldconfig.c:621
 #, c-format
 msgid "Can't open directory %s"
 msgstr "µLªk¶}±Ò¥Ø¿ý %s"
 
-#: elf/cache.c:347
+#: elf/cache.c:353
 #, c-format
 msgid "Can't remove old temporary cache file %s"
 msgstr "µLªk§R°£Âªº¼È®É§Ö¨úÀÉ %s"
 
-#: elf/ldconfig.c:346
+#: elf/ldconfig.c:405
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "µLªk stat %s\n"
 
-#: elf/ldconfig.c:375
+#: elf/ldconfig.c:434
 #, c-format
 msgid "Can't unlink %s"
 msgstr "µLªk¨ú®ø³sµ² %s"
@@ -1389,7 +1406,7 @@ msgstr "¤£¯àª½±µ°õ¦æ¤@­Ó¤À¨É¨ç¦¡®w"
 msgid "Cannot fstat file %s.\n"
 msgstr "µLªk fstat ÀÉ®× %s¡C\n"
 
-#: sunrpc/rpc_main.c:1420
+#: sunrpc/rpc_main.c:1415
 msgid "Cannot have more than one file generation flag!\n"
 msgstr "µLªk¨Ï¥Î¶W¹L¤@­ÓªºÀɮײ£¥ÍºX¼Ð!\n"
 
@@ -1402,7 +1419,7 @@ msgstr "µLªk mmap ÀÉ®× %s¡C\n"
 msgid "Cannot receive reply to broadcast"
 msgstr "µLªk±µ¨ü¼s¼½«áªº¦^À³"
 
-#: sunrpc/pmap_clnt.c:134
+#: sunrpc/pmap_clnt.c:136
 msgid "Cannot register service"
 msgstr "µLªkµù¥UªA°È"
 
@@ -1423,27 +1440,27 @@ msgstr "µLªk¶Ç°e¼s¼½«Ê¥]"
 msgid "Cannot set socket option SO_BROADCAST"
 msgstr "µLªk³]©w socket ¿ï¶µ SO_BROADCAST"
 
-#: sunrpc/rpc_main.c:1198
+#: sunrpc/rpc_main.c:1195
 msgid "Cannot specify more than one input file!\n"
 msgstr "µLªk«ü©w¶W¹L¤@­Ó¿é¤JÀÉ!\n"
 
-#: sunrpc/rpc_main.c:1377
+#: sunrpc/rpc_main.c:1372
 msgid "Cannot use netid flag with inetd flag!\n"
 msgstr "µLªk±N netid ºX¼Ð»P inetd ºX¼Ð¤@°_¨Ï¥Î!\n"
 
-#: sunrpc/rpc_main.c:1389
+#: sunrpc/rpc_main.c:1384
 msgid "Cannot use netid flag without TIRPC!\n"
 msgstr "µLªk¦b¨S¦³ TIRPC ®É¨Ï¥Î netid ºX¼Ð!\n"
 
-#: sunrpc/rpc_main.c:1396
+#: sunrpc/rpc_main.c:1391
 msgid "Cannot use table flags with newstyle!\n"
 msgstr "µLªk±Nªí®æºX¼Ð»P newstyle ¤@°_¨Ï¥Î!\n"
 
-#: elf/ldconfig.c:129
+#: elf/ldconfig.c:131
 msgid "Change to and use ROOT as root directory"
 msgstr "ÅÜ´«¨ì ROOT ¥Ø¿ý¨Ã¥H¥¦°µ¬°®Ú¥Ø¿ý"
 
-#: elf/cache.c:384
+#: elf/cache.c:390
 #, c-format
 msgid "Changing access rights of %s to 0644 failed"
 msgstr "§ó§ï %s ªº¦s¨úÅv­­¬° 0644 ¥¢±Ñ"
@@ -1475,9 +1492,9 @@ msgstr "¦æ             :\n"
 msgid "Communication error on send"
 msgstr "¦b¶Ç°e®É³q°T¿ù»~"
 
-#: locale/programs/localedef.c:107
+#: locale/programs/localedef.c:112
 msgid "Compile locale specification"
-msgstr "½sĶ locale ³]©w"
+msgstr "½sĶ°Ï°ì¤Æ¸ê®Æ®w (locale) ³]©w"
 
 # This is error EIEIO, errno 104
 #
@@ -1516,15 +1533,7 @@ msgstr "½sĶ locale ³]©w"
 msgid "Computer bought the farm"
 msgstr "³o¥x¹q¸£¶R¤F¤@¶ô¦aÅo"
 
-#: locale/programs/ld-ctype.c:3995
-msgid "Computing table size for character classes might take a while..."
-msgstr "¥¿¦b­pºâ¦r¤¸Ãþ§Oªºªí®æ¤j¤p¡A¥i¯à­nªáÂI®É¶¡ ..."
-
-#: locale/programs/ld-collate.c:1648
-msgid "Computing table size for collation table might take a while..."
-msgstr "¥¿¦b­pºâ¹ï·Óªí®æ¤j¤p¡A¥i¯à­nªáÂI®É¶¡ ..."
-
-#: elf/ldconfig.c:139
+#: elf/ldconfig.c:141
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr "³]©w°õ¦æ®É´Á°ÊºA³s±µ"
 
@@ -1558,20 +1567,17 @@ msgstr "Ä~Äò"
 msgid "Convert encoding of given files from one encoding to another."
 msgstr "±qµ¹©wªºÀɮתº¦r¤¸½s½XÂà´«¨ì¥t¤@­Ó"
 
-#: nss/makedb.c:60
-msgid "Convert key to lower case"
-msgstr "±N key Âà´«¦¨¤p¼g"
-
-#: catgets/gencat.c:237 elf/ldconfig.c:252 elf/sprof.c:355
-#: iconv/iconv_prog.c:351 locale/programs/locale.c:267
-#: locale/programs/localedef.c:303 nscd/nscd.c:287 nscd/nscd_nischeck.c:90
-#: nss/getent.c:66 nss/makedb.c:244 posix/getconf.c:751
+#: catgets/gencat.c:246 elf/ldconfig.c:264 elf/sprof.c:355
+#: iconv/iconv_prog.c:351 locale/programs/locale.c:269
+#: locale/programs/localedef.c:311 nscd/nscd.c:287 nscd/nscd_nischeck.c:90
+#: nss/getent.c:63 posix/getconf.c:751
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
-msgstr "ª©Åv (C) %s ¦Û¥Ñ³nÅé°òª÷·|\n"
+msgstr ""
+"ª©Åv (C) %s ¦Û¥Ñ³nÅé°òª÷·|\n"
 "³o¬O¤@­Ó¦Û¥Ñ³nÅé¡F½Ð¨£·½©l½Xªº±ÂÅv±ø´Ú¡C³oùبS¦³¾á«O¡F¬Æ¦Ü¤]¨S¦³±M¬°¾P\n"
 "°â©ÎªÌ¾A¦X¬Y¨Ç¯S®í¥Øªº¡C\n"
 
@@ -1580,22 +1586,18 @@ msgstr "ª©Åv (C) %s ¦Û¥Ñ³nÅé°òª÷·|\n"
 msgid "Could not create log file \"%s\""
 msgstr "µLªk²£¥Í°T®§ÀÉ \"%s\""
 
-#: catgets/gencat.c:108
+#: catgets/gencat.c:112
 msgid "Create C header file NAME containing symbol definitions"
 msgstr "²£¥Íªº C ¼ÐÀYÀɦW¤º§t²Å¸¹©w¸q"
 
-#: locale/programs/localedef.c:98
+#: locale/programs/localedef.c:102
 msgid "Create old-style tables"
 msgstr "²£¥Í®榡ªºªí®æ"
 
-#: locale/programs/localedef.c:97
+#: locale/programs/localedef.c:101
 msgid "Create output even if warning messages were issued"
 msgstr "²£¥Í¿é¥X§Y¨Ï¬O¦³Äµ§i°T®§"
 
-#: nss/makedb.c:70
-msgid "Create simple DB database from textual input."
-msgstr "¥Ñ¥»¤åªº¿é¤J²£¥Í²³æªº DB ¸ê®Æ®w"
-
 #: nis/nis_print.c:326
 #, c-format
 msgid "Creation Time : %s"
@@ -1627,7 +1629,7 @@ msgstr "DNANS"
 msgid "DNS"
 msgstr "DNS"
 
-#: elf/dl-open.c:106
+#: elf/dl-open.c:189
 msgid "DST not allowed in SUID/SGID programs"
 msgstr "DST ¤£¤¹³\¦b SUID/SGID ªºµ{¦¡¤¤"
 
@@ -1667,15 +1669,6 @@ msgstr "¸Ë¸m¦£¸L¤¤"
 msgid "Device not a stream"
 msgstr "¸Ë¸m¤£¬O¸ê®Æ¬y"
 
-#. TRANS No such device or address.  The system tried to use the device
-#. TRANS represented by a file you specified, and it couldn't find the device.
-#. TRANS This can mean that the device file was installed incorrectly, or that
-#. TRANS the physical device is missing or not correctly attached to the
-#. TRANS computer.
-#: stdio-common/../sysdeps/gnu/errlist.c:62
-msgid "Device not configured"
-msgstr "¸Ë¸m©|¥¼³]©w´Nºü"
-
 #. TRANS Resource busy; a system resource that can't be shared is already in use.
 #. TRANS For example, if you try to delete a file that is the root of a currently
 #. TRANS mounted filesystem, you get this error.
@@ -1713,11 +1706,7 @@ msgstr "µwºÐ quota º¡¤F"
 msgid "Do not fork and display messages on the current tty"
 msgstr "¤£¦b¥Ø«eªº tty ²£¥Í¤l¦æµ{ (fork) ¥H¤ÎÅã¥Ü°T®§"
 
-#: nss/makedb.c:63
-msgid "Do not print messages while building database"
-msgstr "¤£¦b«Ø¥ß¸ê®Æ®w®É¦L¥X°T®§"
-
-#: catgets/gencat.c:110
+#: catgets/gencat.c:114
 msgid "Do not use existing catalog, force new output file"
 msgstr "¤£¨Ï¥Î²{¦sªº catalog, ±j¨î¨Ï¥Î·sªº¿é¥XÀÉ"
 
@@ -1725,11 +1714,11 @@ msgstr "¤£¨Ï¥Î²{¦sªº catalog, ±j¨î¨Ï¥Î·sªº¿é¥XÀÉ"
 msgid "Domain not bound"
 msgstr "ºô°ì§ä¤£¨ì"
 
-#: elf/ldconfig.c:127
+#: elf/ldconfig.c:129
 msgid "Don't build cache"
 msgstr "¤£«Ø¥ß§Ö¨ú"
 
-#: elf/ldconfig.c:128
+#: elf/ldconfig.c:130
 msgid "Don't generate links"
 msgstr "¤£²£¥Í³sµ²"
 
@@ -1737,43 +1726,31 @@ msgstr "¤£²£¥Í³sµ²"
 msgid "Dump information generated by PC profiling."
 msgstr "±N²£¥Í©ó PC ´ú³tµû¦ôªº¸ê®Æ¶É¨ø¥X¨Ó"
 
-#: elf/dl-load.c:811
-msgid "ELF file ABI version invalid."
+#: elf/dl-load.c:1290
+msgid "ELF file ABI version invalid"
 msgstr "ELF ÀÉ ABI ª©¥»¤£¾A¥Î"
 
-#: elf/dl-load.c:809
-msgid "ELF file OS ABI invalid."
+#: elf/dl-load.c:1287
+msgid "ELF file OS ABI invalid"
 msgstr "ELF ÀÉ OS ABI ª©¥»¤£¾A¥Î"
 
-#: elf/dl-load.c:793
-msgid "ELF file class not 32-bit"
-msgstr "ELF ÀÉÃþ§O¤£¬O 32 ¦ì¤¸"
-
-#: elf/dl-load.c:795
-msgid "ELF file class not 64-bit"
-msgstr "ELF ÀÉÃþ§O¤£¬O 64 ¦ì¤¸"
-
-#: elf/dl-load.c:818
-msgid "ELF file machine architecture does not match"
-msgstr "ELF ÀɪºµwÅéµ²ºc¸ê®Æ¤£²Å¦X"
-
-#: elf/dl-load.c:816
-msgid "ELF file version does not not match current one"
+#: elf/dl-load.c:1296
+msgid "ELF file version does not match current one"
 msgstr "ELF Àɪ©¥»¤£²Å¦X¥Ø«eªºª©¥»"
 
-#: elf/dl-load.c:805
+#: elf/dl-load.c:1283
 msgid "ELF file version ident does not match current one"
 msgstr "ELF Àɪ©¥» ident ¤£²Å¦X¥Ø«e©Ò¨Ï¥Îªº"
 
-#: elf/dl-load.c:821
+#: elf/dl-load.c:1307
 msgid "ELF file's phentsize not the expected size"
 msgstr "ELF Àɪº phentsize ¨Ã¤£¬O¹w´Á¤¤ªº¤j¤p"
 
-#: elf/dl-load.c:894
+#: elf/dl-load.c:876
 msgid "ELF load command address/offset not properly aligned"
 msgstr "ELF ¸ü¤J©R¥O¦ì§}/¦ì²¾¨Ã¨S¦³¾A·í¦a¹ï»ô"
 
-#: elf/dl-load.c:891
+#: elf/dl-load.c:873
 msgid "ELF load command alignment not page-aligned"
 msgstr "ELF ¸ü¤J©R¥O¹ï»ô¨Ã¨S¦³«ö·Ó°O¾ÐÅé¤À­¶ (page) ¹ï»ô"
 
@@ -1793,6 +1770,11 @@ msgstr "½s½X¸ê®Æ\n"
 msgid "Entry/table type mismatch"
 msgstr "¶µ¥Ø/ªí®æ§ÎºA¤£²Å"
 
+#: nss/getent.c:127 nss/getent.c:292
+#, c-format
+msgid "Enumeration not supported on %s\n"
+msgstr "¦¹¶µ¥Ø¦b %s ¤¤¤£³Q¤ä´©\n"
+
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:30
 msgid "Error 0"
 msgstr "²Ä 0 ¸¹¿ù»~"
@@ -1925,7 +1907,7 @@ msgstr "RPC ¤l¨t²Î¿ù»~"
 msgid "Error in accessing NIS+ cold start file.  Is NIS+ installed?"
 msgstr "¦s¨ú NIS+ ­ì©l±Ò°ÊÀÉ¿ù»~¡C¦³¦w¸Ë NIS+ ¶Ü¡H"
 
-#: string/../sysdeps/mach/_strerror.c:57
+#: string/../sysdeps/mach/_strerror.c:58
 #: sysdeps/mach/hurd/mips/dl-machine.c:68
 msgid "Error in unknown error system: "
 msgstr "¥¼ª¾°ÝÃD¨t²Î¿ù»~: "
@@ -1949,11 +1931,11 @@ msgstr "¥æ´«¤w¥R¨¬"
 msgid "Exec format error"
 msgstr "¥i°õ¦æÀɮ榡¿ù»~"
 
-#: locale/programs/localedef.c:185
+#: locale/programs/localedef.c:190
 msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
 msgstr "ÄY­«¿ù»~: ¨t²Î¨S¦³©w¸q `_POSIX2_LOCALEDEF'"
 
-#: locale/programs/localedef.c:93
+#: locale/programs/localedef.c:97
 msgid "FILE contains mapping from symbolic names to UCS4 values"
 msgstr "ÀÉ®× FILE ¤º§t²Å¸¹¦W»P UCS4 ½s½X¤§¶¡ªº¹ï¬M"
 
@@ -1983,7 +1965,7 @@ msgstr "ÀÉ®×±Ô­z¶µ³B©ó¿ù»~ª¬ºA"
 msgid "File exists"
 msgstr "Àɮפw¦s¦b"
 
-#: elf/cache.c:119 elf/cache.c:129
+#: elf/cache.c:124 elf/cache.c:134
 msgid "File is not a cache file.\n"
 msgstr "ÀɮרëD§Ö¨úÀÉ¡C\n"
 
@@ -2017,6 +1999,10 @@ msgstr "Àɮתí¤wº¡"
 msgid "File too large"
 msgstr "ÀɮפӤj"
 
+#: intl/tst-gettext2.c:36
+msgid "First string for testing."
+msgstr "²Ä¤@­Ó¦r¦ê±µ¨ü´ú¸Õ¡C"
+
 #: nis/nis_error.c:38
 msgid "First/next chain broken"
 msgstr "²Ä¤@­Ó/¤U¤@­Ó§Ç¦CÃa±¼¤F"
@@ -2025,7 +2011,7 @@ msgstr "²Ä¤@­Ó/¤U¤@­Ó§Ç¦CÃa±¼¤F"
 msgid "Floating point exception"
 msgstr "¯BÂI¼Æ¥X¿ù"
 
-#: elf/ldconfig.c:134
+#: elf/ldconfig.c:136
 msgid "Format to use: new, old or compat (default)"
 msgstr "±N¨Ï¥Î®æ¦¡: ·s¡B©άۮe (¹w³])"
 
@@ -2046,7 +2032,7 @@ msgstr "¥\¯à¨S¦³¹ê§@"
 msgid "GROUP\n"
 msgstr "¸s²Õ\n"
 
-#: argp/argp-help.c:226
+#: argp/argp-help.c:230
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "ARGP_HELP_FMT ¤¤µL¥Îªº¸ê°T: %s"
@@ -2055,7 +2041,7 @@ msgstr "ARGP_HELP_FMT ¤¤µL¥Îªº¸ê°T: %s"
 msgid "Generate graphic from memory profiling data"
 msgstr "±q°O¾ÐÅé©Ê¯à´ú¸Õ¸ê®Æ²£¥Í¹Ï¹³"
 
-#: catgets/gencat.c:116
+#: catgets/gencat.c:120
 msgid ""
 "Generate message catalog.\\vIf INPUT-FILE is -, input is read from standard "
 "input.  If OUTPUT-FILE\n"
@@ -2068,10 +2054,9 @@ msgstr ""
 msgid ""
 "Generate output linear to time (default is linear to number of function "
 "calls)"
-msgstr ""
-"²£¥Í¿é¥X»P®É¶¡§e½u©ÊÃö«Y (¹w³]¬O»P¨ç¦¡©I¥s¼Æ¥Ø§e½u©ÊÃö«Y)"
+msgstr "²£¥Í¿é¥X»P®É¶¡§e½u©ÊÃö«Y (¹w³]¬O»P¨ç¦¡©I¥s¼Æ¥Ø§e½u©ÊÃö«Y)"
 
-#: elf/ldconfig.c:126
+#: elf/ldconfig.c:128
 msgid "Generate verbose messages"
 msgstr "²£¥Í§ó¦hªº°T®§"
 
@@ -2079,15 +2064,15 @@ msgstr "²£¥Í§ó¦hªº°T®§"
 msgid "Generic system error"
 msgstr "¤@¯ë¨t²Î¿ù»~"
 
-#: locale/programs/locale.c:75
+#: locale/programs/locale.c:77
 msgid "Get locale-specific information."
-msgstr "¨ú±o locale ¯S©wªº¸ê°T"
+msgstr "¨ú±o°Ï°ì¤Æ¸ê®Æ®w (locale) ¯S©wªº¸ê°T"
 
-#: argp/argp-parse.c:88
+#: argp/argp-parse.c:94
 msgid "Give a short usage message"
 msgstr "µ¹¥X²µuªº¨Ï¥Î°T®§"
 
-#: argp/argp-parse.c:87
+#: argp/argp-parse.c:93
 msgid "Give this help list"
 msgstr "µ¹¥X³o­Ó¨Ï¥Î¤è¦¡¦Cªí"
 
@@ -2110,7 +2095,7 @@ msgstr "¸s²ÕºX¼Ð :"
 msgid "Group entry for \"%s.%s\" group:\n"
 msgstr "¸s²Õ \"%s.%s\" ¸s²Õ¶µ¥Ø:\n"
 
-#: argp/argp-parse.c:91
+#: argp/argp-parse.c:97
 msgid "Hang for SECS seconds (default 3600)"
 msgstr "SECS ¬í«á±¾Â_ (¹w³]¬O 3600)"
 
@@ -2118,7 +2103,7 @@ msgstr "SECS ¬í«á±¾Â_ (¹w³]¬O 3600)"
 msgid "Hangup"
 msgstr "±¾Â_"
 
-#: nscd/grpcache.c:252
+#: nscd/grpcache.c:253
 #, c-format
 msgid "Haven't found \"%d\" in group cache!"
 msgstr "©|¥¼¦b¸s²Õ§Ö¨ú¤¤§ä¨ì \"%d\"!"
@@ -2128,7 +2113,7 @@ msgstr "©|¥¼¦b¸s²Õ§Ö¨ú¤¤§ä¨ì \"%d\"!"
 msgid "Haven't found \"%d\" in password cache!"
 msgstr "©|¥¼¦b±K½X§Ö¨ú¤¤§ä¨ì \"%d\"!"
 
-#: nscd/grpcache.c:213
+#: nscd/grpcache.c:214
 #, c-format
 msgid "Haven't found \"%s\" in group cache!"
 msgstr "©|¥¼¦b¸s²Õ§Ö¨ú¤¤§ä¨ì \"%s\"!"
@@ -2162,16 +2147,6 @@ msgstr "I/O ¿ù»~"
 msgid "I/O possible"
 msgstr "I/O ¥i¦æ"
 
-#: nss/makedb.c:73
-msgid ""
-"INPUT-FILE OUTPUT-FILE\n"
-"-o OUTPUT-FILE INPUT-FILE\n"
-"-u INPUT-FILE"
-msgstr ""
-"¿é¤JÀɮצWºÙ  ¿é¥XÀɮצWºÙ\n"
-"-o ¿é¥XÀɮצWºÙ ¿é¤JÀɮצWºÙ\n"
-"-u ¿é¥XÀɮצWºÙ"
-
 #: stdio-common/../sysdeps/unix/siglist.c:32
 msgid "IOT trap"
 msgstr "IOT ³´¨À"
@@ -2185,7 +2160,7 @@ msgstr "IVY"
 msgid "Identifier removed"
 msgstr "ÃѧO²Å¸¹²¾°£"
 
-#: elf/ldconfig.c:446
+#: elf/ldconfig.c:525
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "©¿²¤ÀÉ®× %s ¦]¬°¥¦¤£¬O¤@­Ó¥¿±`ªºÀɮסC"
@@ -2242,11 +2217,11 @@ msgstr "»Ý­n¸ê®Æ"
 msgid "Information:"
 msgstr "¸ê®Æ:"
 
-#: locale/programs/localedef.c:88
+#: locale/programs/localedef.c:92
 msgid "Input Files:"
 msgstr "¿é¤JÀÉ:"
 
-#: elf/readlib.c:92
+#: elf/ldconfig.c:698 elf/readlib.c:92
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "¿é¤JÀÉ %s §ä¤£¨ì¡C\n"
@@ -2295,11 +2270,11 @@ msgstr "¤¤Â_ªº¨t²Î©I¥s¥²¶·­«·s±Ò°Ê"
 msgid "Invalid argument"
 msgstr "¤£¾A¥Îªº¤Þ¼Æ"
 
-#: posix/regex.c:1098
+#: posix/regex.c:1102
 msgid "Invalid back reference"
 msgstr "¤£¾A¥Îªº«á³¡¯Á¤Þ"
 
-#: posix/regex.c:1092
+#: posix/regex.c:1096
 msgid "Invalid character class name"
 msgstr "¤£¾A¥Îªº¦r¤¸Ãþ§O¦W"
 
@@ -2311,11 +2286,11 @@ msgstr "¤£¾A¥Îªº½Ð¨DºÝ¨­¥÷»{ÃÒ"
 msgid "Invalid client verifier"
 msgstr "¤£¾A¥Îªº½Ð¨DºÝ»{ÃÒ"
 
-#: posix/regex.c:1089
+#: posix/regex.c:1093
 msgid "Invalid collation character"
 msgstr "¤£¾A¥Îªº¹ï·Ó¦r¤¸"
 
-#: posix/regex.c:1110
+#: posix/regex.c:1114
 msgid "Invalid content of \\{\\}"
 msgstr "¤£¾A¥Îªº \\{\\} ¤º®e"
 
@@ -2340,15 +2315,15 @@ msgstr "¤£¾A¥Îªº¹B§@ª«¥ó"
 msgid "Invalid or incomplete multibyte or wide character"
 msgstr "¤£¾A¥Î©Î¤£§¹¾ãªº¦h¦ì¤¸²Õ¦r¤¸©Î¼e¦r¤¸"
 
-#: posix/regex.c:1119
+#: posix/regex.c:1123
 msgid "Invalid preceding regular expression"
 msgstr "¤£¾A¥Îªº«e¸m±`³Wªí¥Ü¦¡"
 
-#: posix/regex.c:1113
+#: posix/regex.c:1117
 msgid "Invalid range end"
 msgstr "¤£¾A¥Îªº½d³òµ²§ô"
 
-#: posix/regex.c:1086
+#: posix/regex.c:1090
 msgid "Invalid regular expression"
 msgstr "¤£¾A¥Îªº±`³Wªí¥Ü¦¡"
 
@@ -2465,14 +2440,13 @@ msgstr "¾÷¾¹¤£¦bºô¸ô¤¤"
 msgid "Malformed name, or illegal name"
 msgstr "©_©Çªº¦W¦r¡A©Î¤£¦Xªkªº¦W¦r"
 
-#: argp/argp-help.c:1181
+#: argp/argp-help.c:1185
 msgid ""
 "Mandatory or optional arguments to long options are also mandatory or "
 "optional for any corresponding short options."
-msgstr ""
-"ªø¿ï¶µªº¥²¶·©Î¥i¿ï¥Îªº¤Þ¼Æ¤]¬O¬Û¹ïÀ³µu¿ï¶µªº¥²¶·©Î¥i¿ï¥Îªº¤Þ¼Æ¡C"
+msgstr "ªø¿ï¶µªº¥²¶·©Î¥i¿ï¥Îªº¤Þ¼Æ¤]¬O¬Û¹ïÀ³µu¿ï¶µªº¥²¶·©Î¥i¿ï¥Îªº¤Þ¼Æ¡C"
 
-#: elf/ldconfig.c:133
+#: elf/ldconfig.c:135
 msgid "Manually link individual libraries."
 msgstr "¤â°Ê­Ó§O³sµ²¨ç¦¡®w"
 
@@ -2488,7 +2462,7 @@ msgstr "¥D­n¦øªA¾¹¦£¸L¤¤¡A­«·s¶i¦æ§¹¾ã¸ê®Æ¶É¨ø±Æµ{¡C"
 msgid "Memory allocation failure"
 msgstr "°O¾ÐÅé°t¸m¥¢±Ñ"
 
-#: posix/regex.c:1116
+#: posix/regex.c:1120
 msgid "Memory exhausted"
 msgstr "°O¾ÐÅé¥Î§¹¤F"
 
@@ -2520,7 +2494,7 @@ msgstr "­×§ï¥¢±Ñ"
 msgid "Modify operation failed"
 msgstr "­×§ï¹B§@¤è¦¡¥¢±Ñ"
 
-#: locale/programs/locale.c:68
+#: locale/programs/locale.c:70
 msgid "Modify output format:"
 msgstr "­×§ï¿é¥X®æ¦¡:"
 
@@ -2533,12 +2507,12 @@ msgstr "¹Á¸Õ Multihop"
 msgid "Must specify user name for server-user option"
 msgstr "¥²¶·¬°¦øªA¾¹¨Ï¥ÎªÌ¿ï¶µ«ü©w¨Ï¥ÎªÌ¦WºÙ"
 
-#: catgets/gencat.c:107 catgets/gencat.c:111 locale/programs/localedef.c:110
-#: nscd/nscd.c:83 nss/makedb.c:61
+#: catgets/gencat.c:111 catgets/gencat.c:115 locale/programs/localedef.c:115
+#: nscd/nscd.c:83
 msgid "NAME"
 msgstr "¦WºÙ"
 
-#: locale/programs/locale.c:78
+#: locale/programs/locale.c:80
 msgid ""
 "NAME\n"
 "[-a|-m]"
@@ -2668,6 +2642,10 @@ msgstr "¨S¦³¶§·¥"
 msgid "No buffer space available"
 msgstr "¨S¦³¥i¥Îªº½w½ÄªÅ¶¡¤F"
 
+#: locale/programs/ld-ctype.c:425
+msgid "No character set name specified in charmap"
+msgstr "¦b¦r¤¸¹ïÀ³ (charmap) ¤¤¨S¦³³]©w¦r¶°¦WºÙ"
+
 #. TRANS There are no child processes.  This error happens on operations that are
 #. TRANS supposed to manipulate child processes, when there aren't any processes
 #. TRANS to manipulate.
@@ -2681,12 +2659,12 @@ msgstr "¨S¦³¤lµ{§Ç¦s¦b"
 msgid "No data available"
 msgstr "¨S¦³¥i¥Îªº¸ê®Æ"
 
-#: locale/programs/ld-address.c:131 locale/programs/ld-collate.c:1460
-#: locale/programs/ld-ctype.c:384 locale/programs/ld-identification.c:132
+#: locale/programs/ld-address.c:131 locale/programs/ld-collate.c:1500
+#: locale/programs/ld-ctype.c:407 locale/programs/ld-identification.c:132
 #: locale/programs/ld-measurement.c:93 locale/programs/ld-messages.c:98
 #: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
 #: locale/programs/ld-numeric.c:99 locale/programs/ld-paper.c:91
-#: locale/programs/ld-telephone.c:94 locale/programs/ld-time.c:158
+#: locale/programs/ld-telephone.c:94 locale/programs/ld-time.c:160
 #, c-format
 msgid "No definition for %s category found"
 msgstr "§ä¤£¨ì %s Ãþ§Oªº©w¸q"
@@ -2695,7 +2673,7 @@ msgstr "§ä¤£¨ì %s Ãþ§Oªº©w¸q"
 msgid "No file space on server"
 msgstr "¦øªA¾¹¤W¨S¦³ÀɮתŶ¡"
 
-#: elf/ldconfig.c:454
+#: elf/ldconfig.c:532
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "¥Ñ©ó§ä¤£¨ì %s ªº¦@¥Îª«¥ó¦WºÙ¡A³sµ²¨Ã¥¼³Q«Ø¥ß"
@@ -2708,7 +2686,7 @@ msgstr "¥Ñ©ó§ä¤£¨ì %s ªº¦@¥Îª«¥ó¦WºÙ¡A³sµ²¨Ã¥¼³Q«Ø¥ß"
 msgid "No locks available"
 msgstr "µLªkÂê©w¸ê®Æ"
 
-#: posix/regex.c:1083
+#: posix/regex.c:1087
 msgid "No match"
 msgstr "¨S¦³²Å¦Xªº¶µ¥Ø"
 
@@ -2725,7 +2703,7 @@ msgstr "¨S¦³²Å¦X»Ý¨D®æ¦¡ªº°T®§"
 msgid "No more records in map database"
 msgstr "¦b¹ï¬Mªí¸ê®Æ®w¤¤¨S¦³¨ä¥L¬ö¿ý¤F"
 
-#: posix/regex.c:5936
+#: posix/regex.c:5955
 msgid "No previous regular expression"
 msgstr "¥ý«e¨Ã¥¼¨Ï¥Î¹L±`³Wªí¥Ü¦¡"
 
@@ -2757,6 +2735,12 @@ msgstr "¸Ë¸m¤W¤wµL¦h¾lªÅ¶¡"
 msgid "No such device"
 msgstr "¨S¦³¦¹¤@¸Ë¸m"
 
+#. TRANS No such device or address.  The system tried to use the device
+#. TRANS represented by a file you specified, and it couldn't find the device.
+#. TRANS This can mean that the device file was installed incorrectly, or that
+#. TRANS the physical device is missing or not correctly attached to the
+#. TRANS computer.
+#: stdio-common/../sysdeps/gnu/errlist.c:62
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:36
 msgid "No such device or address"
 msgstr "¨S¦³¦¹¤@¸Ë¸m©Î¦ì§}"
@@ -2783,10 +2767,6 @@ msgstr "¦b¦øªA¾¹ªº»â°ì¸ê®Æ¤¤§ä¤£¨ì¦¹¤@¹ï¬Mªí"
 msgid "No such process"
 msgstr "¨S¦³¦¹¤@µ{§Ç"
 
-#: nss/makedb.c:142
-msgid "No usable database library found."
-msgstr "§ä¤£¨ì¥i¥Îªº¸ê®Æ®w¬ÛÃö¨ç¦¡®w"
-
 #: nis/nis_error.c:61
 msgid "Non NIS+ namespace encountered"
 msgstr "¾D¹J¹H¤Ï NIS+ ©R¦W³W«hªº¦WºÙ"
@@ -2917,11 +2897,11 @@ msgstr "¥Ø¼ÐÀɮצì©ó»·ºÝ"
 msgid "Object with same name exists"
 msgstr "¦P¦Wªº¥Ø¼Ð¤w¸g¦s¦b"
 
-#: timezone/zic.c:2023
+#: timezone/zic.c:2022
 msgid "Odd number of quotation marks"
 msgstr "¤Þ¸¹¼Æ¥Ø¬°©_¼Æ"
 
-#: elf/ldconfig.c:132
+#: elf/ldconfig.c:134
 msgid ""
 "Only process directories specified on the command line.  Don't build cache."
 msgstr "¥u³B²z¦b©R¥O¦C¤Þ¼Æ¤¤¦³«ü©wªº¥Ø¿ý¡A¤£«Ø¥ß§Ö¨úÀɮסC"
@@ -2992,6 +2972,10 @@ msgstr "¾Þ§@±N·|¼È°±"
 msgid "Option not supported by protocol"
 msgstr "³q°T¨ó©w¨Ã¤£¤ä´©¦¹°Ñ¼Æ"
 
+#: locale/programs/localedef.c:103
+msgid "Optional output file prefix"
+msgstr "¥i¦³¥iµLªº¿é¥XÀɸô®|"
+
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:93
 msgid "Out of stream resources"
 msgstr "¸ê®Æ¬y¸ê·½¥ÎºÉ"
@@ -3000,7 +2984,7 @@ msgstr "¸ê®Æ¬y¸ê·½¥ÎºÉ"
 msgid "Out of streams resources"
 msgstr "©Ò¦³¸ê®Æ¬yªº¸ê·½³£¤w¥ÎºÉ"
 
-#: iconv/iconv_prog.c:60 locale/programs/localedef.c:95
+#: iconv/iconv_prog.c:60 locale/programs/localedef.c:99
 msgid "Output control:"
 msgstr "¿é¥X±±¨î:"
 
@@ -3035,7 +3019,7 @@ msgstr "³¡¥÷¦¨¥\"
 msgid "Passed object is not the same object on server"
 msgstr "¸g¹Lªºª«¥ó»P¦øªA¾¹¤Wªº¨Ã¤£¬Û¦P"
 
-#: elf/ldconfig.c:310
+#: elf/ldconfig.c:287
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "¸ô®| `%s' ¨Ï¥Î¶W¹L¤@¦¸"
@@ -3051,27 +3035,23 @@ msgstr "©Úµ´¤£²ÅÅv­­ªº¾Þ§@"
 msgid "Power failure"
 msgstr "¹q·½ÄY­«¿ù»~"
 
-#: posix/regex.c:1122
+#: posix/regex.c:1126
 msgid "Premature end of regular expression"
 msgstr "±`³Wªí¥Ü¦¡¤Ó¦­µ²§ô¤F"
 
-#: elf/ldconfig.c:125
+#: elf/ldconfig.c:127
 msgid "Print cache"
 msgstr "¦C¦L§Ö¨ú"
 
-#: nss/makedb.c:65
-msgid "Print content of database file, one entry a line"
-msgstr "¦L¥X¸ê®Æ®wÀɮתº¤º®e¡A¨C­Ó¶µ¥Ø¤@¦æ"
-
 #: nscd/nscd.c:89
 msgid "Print current configuration statistic"
 msgstr "¦L¥X¥Ø«eªº²ÕºA²Î­p"
 
-#: locale/programs/localedef.c:102
+#: locale/programs/localedef.c:107
 msgid "Print more messages"
 msgstr "¦L¥X§ó¦hªº°T®§"
 
-#: argp/argp-parse.c:148
+#: argp/argp-parse.c:154
 msgid "Print program version"
 msgstr "¦L¥Xµ{¦¡ª©¥»"
 
@@ -3245,7 +3225,7 @@ msgstr "RPC: ¥¼ª¾ªº¨ó©w"
 msgid "RSA (%d bits)\n"
 msgstr "RSA (%d ¦ì¤¸)\n"
 
-#: elf/dl-sym.c:66 elf/dl-sym.c:116
+#: elf/dl-sym.c:68 elf/dl-sym.c:125
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "µ{¦¡½X©Ò¨Ï¥Îªº RTLD_NEXT ¨S¦³°ÊºA¸ü¤J"
 
@@ -3268,7 +3248,7 @@ msgstr "°ßŪªºÀɮרt²Î"
 msgid "Real-time signal %d"
 msgstr "§Y®Éªº°T¸¹ %d"
 
-#: posix/regex.c:1125
+#: posix/regex.c:1129
 msgid "Regular expression too big"
 msgstr "¥¿³Wªí¥Ü¦¡¤Óªø¤F"
 
@@ -3286,7 +3266,7 @@ msgstr "»·ºÝ¦ì§}§ïÅܤF"
 msgid "Remove password or make file unreadable by others."
 msgstr "²¾°£±K½X©ÎÅý¥L¤HµLªkŪ¨úÀÉ®×"
 
-#: elf/cache.c:388
+#: elf/cache.c:394
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "±N %s §ï¦W¬° %s ¥¢±Ñ"
@@ -3300,14 +3280,14 @@ msgstr "­«·s¶}±Ò¦@¥Î¥ØªºÀÉ %s ¥¢±Ñ"
 msgid "Replicate :\n"
 msgstr "½Æ»s :\n"
 
-#: argp/argp-help.c:1635
+#: argp/argp-help.c:1639
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "½Ð±Nµ{¦¡°ÝÃD¦^³ø¦Ü %s¡C\n"
 
-#: catgets/gencat.c:224 debug/pcprofiledump.c:181 iconv/iconv_prog.c:337
-#: locale/programs/locale.c:254 locale/programs/localedef.c:289
-#: malloc/memusagestat.c:602 nss/makedb.c:231
+#: catgets/gencat.c:233 debug/pcprofiledump.c:181 iconv/iconv_prog.c:337
+#: locale/programs/locale.c:256 locale/programs/localedef.c:297
+#: malloc/memusagestat.c:602
 msgid "Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"
 msgstr "½Ð¨Ï¥Î `glibcbug' §å¦¸µ{¦¡±N°ÝÃD¦^³ø¦Ü <bugs@gnu.org>¡C\n"
 
@@ -3418,7 +3398,7 @@ msgstr "¦øªA¾¹©Úµ´»{ÃÒ"
 msgid "Servname not supported for ai_socktype"
 msgstr "¤£¤ä´© ai_socktype ªº¦øªA¦WºÙ"
 
-#: argp/argp-parse.c:89
+#: argp/argp-parse.c:95
 msgid "Set the program name"
 msgstr "³]©wµ{¦¡¦WºÙ"
 
@@ -3452,7 +3432,7 @@ msgstr "³nÅé³y¦¨³s½u¤¤Â_"
 msgid "Sorry. You are not root\n"
 msgstr "¤£¦n·N«ä¡A§A¨Ã¤£¬O root ¨Ï¥ÎªÌ\n"
 
-#: locale/programs/localedef.c:91
+#: locale/programs/localedef.c:95
 msgid "Source definitions are found in FILE"
 msgstr "­ì©l¸ê®Æ©w¸q¦bÀÉ®× FILE ¤¤"
 
@@ -3508,16 +3488,20 @@ msgstr "¸ê®Æ¬yºÞ½u¿ù»~"
 msgid "Structure needs cleaning"
 msgstr "µ²ºc»Ý­n²M²z"
 
-#: nis/nis_error.c:29 nis/ypclnt.c:786 nis/ypclnt.c:860 posix/regex.c:1080
+#: nis/nis_error.c:29 nis/ypclnt.c:786 nis/ypclnt.c:860 posix/regex.c:1084
 #: stdio-common/../sysdeps/gnu/errlist.c:20
 msgid "Success"
 msgstr "¦¨¥\"
 
-#: locale/programs/localedef.c:101
+#: nss/getent.c:703
+msgid "Supported databases:"
+msgstr "¤ä´©ªº¸ê®Æ®w:"
+
+#: locale/programs/localedef.c:106
 msgid "Suppress warnings and information messages"
 msgstr "©¿²¤Äµ§i»P´£¥Ü°T®§"
 
-#: locale/programs/localedef.c:90
+#: locale/programs/localedef.c:94
 msgid "Symbolic character names defined in FILE"
 msgstr "²Å¸¹¦r¤¸ªº¦WºÙ©w¸q¦bÀÉ®× FILE ¤¤"
 
@@ -3525,7 +3509,7 @@ msgstr "²Å¸¹¦r¤¸ªº¦WºÙ©w¸q¦bÀÉ®× FILE ¤¤"
 msgid "System error"
 msgstr "¨t²Î¿ù»~"
 
-#: locale/programs/locale.c:63
+#: locale/programs/locale.c:65
 msgid "System information:"
 msgstr "¨t²Î¬ÛÃö¸ê°T:"
 
@@ -3533,7 +3517,7 @@ msgstr "¨t²Î¬ÛÃö¸ê°T:"
 msgid "System resource allocation failure"
 msgstr "¨t²Î¸ê·½°t¸m¥¢±Ñ"
 
-#: locale/programs/localedef.c:284
+#: locale/programs/localedef.c:292
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
@@ -3588,12 +3572,15 @@ msgid ""
 "the FROM and TO command line parameters.  One coded character set can be\n"
 "listed with several different names (aliases).\n"
 "\n"
+"  "
 msgstr ""
 "¥H¤Uªº¦Cªí¥]§t©Ò¦³¤wª¾ªº½s½X¦r¶°¡A¦ý³o¤£¥Nªí©Ò¦³ªº¦r¶°¦WºÙ²Õ¦X¬Ò¥i¥Î©ó\n"
 "©R¥O¦Cªº \"¨Ó·½\" ¥H¤Î \"¥Øªº\" ¤Þ¼Æ¡C¤@­Ó½s½X¦r¶°¥i¥H¥Î´X­Ó¤£¦Pªº¦WºÙ\n"
 "¨Óªí¥Ü (§Y \"°Î¦W\")¡C\n"
+"\n"
+"  "
 
-#: sunrpc/rpc_main.c:1369
+#: sunrpc/rpc_main.c:1364
 msgid "This implementation doesn't support newstyle or MT-safe code!\n"
 msgstr "¦¹¹ê§@¤è¦¡¤£¤ä´©·sªº§Î¦¡©Î¦h¦w¥þ°õ¦æ§Çªºµ{¦¡!\n"
 
@@ -3671,7 +3658,7 @@ msgstr "¤Ó¦h¨Ï¥ÎªÌ"
 msgid "Trace/breakpoint trap"
 msgstr "°lÂÜ»P¤¤Â_ÂI³´¨À"
 
-#: posix/regex.c:1095
+#: posix/regex.c:1099
 msgid "Trailing backslash"
 msgstr "§ÀºÝªº¤Ï±×½u"
 
@@ -3698,7 +3685,7 @@ msgstr "¶Ç¿éªº¨âºÝ¤w¸g§¹¦¨³s½u¤F"
 msgid "Transport endpoint is not connected"
 msgstr "¶Ç¿éªº¨âºÝ©|¥¼³s½u"
 
-#: argp/argp-help.c:1607
+#: argp/argp-help.c:1611
 #, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "½Ð¸ÕµÛ¥Î `%s --help' ©Î `%s --usage' ¨ÓÀò±o§ó¦h¬ÛÃö°T®§¡C\n"
@@ -3738,7 +3725,7 @@ msgstr "¥¼ª¾ªº (§ÎºA = %d¡A¦ì¤¸ = %d)\n"
 msgid "Unknown .netrc keyword %s"
 msgstr "¥¼ª¾ªº .netrc ÃöÁä¦r %s"
 
-#: elf/../sysdeps/generic/readelflib.c:68
+#: elf/../sysdeps/generic/readelflib.c:69
 #, c-format
 msgid "Unknown ELFCLASS in file %s.\n"
 msgstr "ÀÉ®× %s ¤¤¥¼ª¾ªº ELFCLASS¡C\n"
@@ -3747,7 +3734,7 @@ msgstr "ÀÉ®× %s ¤¤¥¼ª¾ªº ELFCLASS¡C\n"
 msgid "Unknown NIS error code"
 msgstr "¥¼ª¾ªº NIS ¿ù»~½X"
 
-#: nss/getent.c:513
+#: nss/getent.c:771
 #, c-format
 msgid "Unknown database: %s\n"
 msgstr "¥¼ª¾ªº¸ê®Æ®w: %s\n"
@@ -3757,7 +3744,7 @@ msgid "Unknown error"
 msgstr "¥¼ª¾ªº¿ù»~"
 
 #: string/../sysdeps/generic/_strerror.c:48
-#: string/../sysdeps/mach/_strerror.c:87
+#: string/../sysdeps/mach/_strerror.c:88
 #: sysdeps/mach/hurd/mips/dl-machine.c:83
 msgid "Unknown error "
 msgstr "¥¼ª¾ªº¿ù»~ "
@@ -3788,7 +3775,7 @@ msgstr "¥¼ª¾ªº¦øªA¾¹¿ù»~"
 msgid "Unknown signal %d"
 msgstr "¥¼ª¾ªº°T¸¹ %d"
 
-#: misc/error.c:108 timezone/zic.c:386
+#: misc/error.c:114 timezone/zic.c:384
 msgid "Unknown system error"
 msgstr "¥¼ª¾ªº¨t²Î¿ù»~"
 
@@ -3796,19 +3783,19 @@ msgstr "¥¼ª¾ªº¨t²Î¿ù»~"
 msgid "Unknown ypbind error"
 msgstr "¥¼ª¾ªº ypbind ¿ù»~"
 
-#: posix/regex.c:1104
+#: posix/regex.c:1108
 msgid "Unmatched ( or \\("
 msgstr "( ©Î \\( ¤£¯à¤Ç°t"
 
-#: posix/regex.c:1128
+#: posix/regex.c:1132
 msgid "Unmatched ) or \\)"
 msgstr ") ©Î \\) ¤£¯à¤Ç°t"
 
-#: posix/regex.c:1101
+#: posix/regex.c:1105
 msgid "Unmatched [ or [^"
 msgstr "[ ©Î [^ ¤£¯à¤Ç°t"
 
-#: posix/regex.c:1107
+#: posix/regex.c:1111
 msgid "Unmatched \\{"
 msgstr "\\{ ¤£¯à¤Ç°t"
 
@@ -3821,7 +3808,7 @@ msgstr "µLªkÃѧOªºÅÜ¼Æ `%s'"
 msgid "Urgent I/O condition"
 msgstr "ºò«æªº¿é¥X¤Jª¬ºA"
 
-#: argp/argp-help.c:1564
+#: argp/argp-help.c:1568
 msgid "Usage:"
 msgstr "¨Ï¥Î¤è¦¡:"
 
@@ -3834,11 +3821,11 @@ msgstr "¨Ï¥Î¤è¦¡: %s variable_name [pathname]\n"
 msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
 msgstr "¨Ï¥Î¤è¦¡: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
 
-#: elf/ldconfig.c:130
+#: elf/ldconfig.c:132
 msgid "Use CACHE as cache file"
 msgstr "¨Ï¥Î CACHE ·í§@§Ö¨úÀÉ®×"
 
-#: elf/ldconfig.c:131
+#: elf/ldconfig.c:133
 msgid "Use CONF as configuration file"
 msgstr "¨Ï¥Î CONF ·í§@³]©wÀÉ"
 
@@ -3863,7 +3850,7 @@ msgstr "¦³©w¸qªº¸ê®Æ«¬§O­È¤Ó¤j"
 msgid "Virtual timer expired"
 msgstr "µêÀÀ­p®É¾¹¤w¹L®É¨ú®ø¤F"
 
-#: timezone/zic.c:1927
+#: timezone/zic.c:1926
 msgid "Wild result from command execution"
 msgstr "©R¥O°õ¦æ¾É¦Ü©_©Çªºµ²ªG"
 
@@ -3871,38 +3858,38 @@ msgstr "©R¥O°õ¦æ¾É¦Ü©_©Çªºµ²ªG"
 msgid "Window changed"
 msgstr "½d³ò§ïÅܤF"
 
-#: locale/programs/locale.c:67
+#: locale/programs/locale.c:69
 msgid "Write names of available charmaps"
 msgstr "¼g¥X¦s¦bªº¦r¶°¹ï·Óªí¦WºÙ"
 
-#: locale/programs/locale.c:65
+#: locale/programs/locale.c:67
 msgid "Write names of available locales"
-msgstr "¼g¥X¦s¦bªº°Ï°ì¤Æ¸ê®Æ®w¦WºÙ"
+msgstr "¼g¥X¦s¦bªº°Ï°ì¤Æ¸ê®Æ®w (locale) ¦WºÙ"
 
-#: locale/programs/locale.c:69
+#: locale/programs/locale.c:71
 msgid "Write names of selected categories"
 msgstr "¼g¥X¿ï¨úªºÃþ§O¦WºÙ"
 
-#: locale/programs/locale.c:70
+#: locale/programs/locale.c:72
 msgid "Write names of selected keywords"
 msgstr "¼g¥X¿ï¨úªºÃöÁä¦r¦WºÙ"
 
-#: catgets/gencat.c:111 nss/makedb.c:61
+#: catgets/gencat.c:115
 msgid "Write output to file NAME"
 msgstr "±N¿é¥X¼g¨ìÀÉ®× NAME ¤¤"
 
-#: elf/cache.c:360 elf/cache.c:369 elf/cache.c:373
+#: elf/cache.c:366 elf/cache.c:375 elf/cache.c:379
 msgid "Writing of cache data failed"
 msgstr "¼g¤J§Ö¨ú¸ê®Æ®Éµo¥Í¿ù»~"
 
-#: elf/cache.c:377
+#: elf/cache.c:383
 msgid "Writing of cache data failed."
 msgstr "¼g¤J§Ö¨ú¸ê®Æ®Éµo¥Í¿ù»~"
 
-#: catgets/gencat.c:242 elf/ldconfig.c:257 elf/sprof.c:361
-#: iconv/iconv_prog.c:356 locale/programs/locale.c:272
-#: locale/programs/localedef.c:308 nscd/nscd.c:292 nscd/nscd_nischeck.c:95
-#: nss/getent.c:71 nss/makedb.c:249 posix/getconf.c:756
+#: catgets/gencat.c:251 elf/ldconfig.c:269 elf/sprof.c:361
+#: iconv/iconv_prog.c:356 locale/programs/locale.c:274
+#: locale/programs/localedef.c:316 nscd/nscd.c:292 nscd/nscd_nischeck.c:95
+#: nss/getent.c:68 posix/getconf.c:756
 #, c-format
 msgid "Written by %s.\n"
 msgstr "¥Ñ %s ¨Ó¼g¥X¡C\n"
@@ -3933,7 +3920,7 @@ msgstr "¬Oªº¡A42 ´N¬O¦s¦bªº·N¸q"
 msgid "You really blew it this time"
 msgstr "³o¦¸¯uªº³Q±z¥´±Ñ¤F"
 
-#: timezone/zic.c:1089
+#: timezone/zic.c:1088
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr "®É°Ï±µÄò¦æªºµ²§ô®É¶¡¤£¦b¤W¤@¦æªºµ²§ô®É¶¡¤§«á"
 
@@ -3949,33 +3936,33 @@ msgstr "[FILE]"
 msgid "__get_myaddress: ioctl (get interface configuration)"
 msgstr "__get_myaddress: ioctl (¨ú±o¤¶­±²ÕºA)"
 
-#: locale/programs/ld-collate.c:383
+#: locale/programs/ld-collate.c:417
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "`%.*s' ¤w³Q©w¸q¬°¹ï·Ó¤¸¯À"
 
-#: locale/programs/ld-collate.c:376
+#: locale/programs/ld-collate.c:410
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "`%.*s' ¤w³Q©w¸q¬°¹ï·Ó²Å¸¹"
 
-#: locale/programs/ld-collate.c:360
+#: locale/programs/ld-collate.c:394
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "`%.*s' ¦b¦r¶°¹ï·Óªí¤¤¤w¸g©w¸q¹L¤F"
 
-#: locale/programs/ld-collate.c:369
+#: locale/programs/ld-collate.c:403
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "`%.*s' ¦b½s½X¹ï¬MÀɤ¤¤w¸g³Q©w¸q¹L¤F"
 
-#: locale/programs/charmap.c:562 locale/programs/locfile.h:96
+#: locale/programs/charmap.c:599 locale/programs/locfile.h:96
 #: locale/programs/repertoire.c:314
 #, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "`%1$s' ©w¸q¨S¦³¥H `END %1$s' µ²§ô"
 
-#: locale/programs/ld-collate.c:1227 locale/programs/ld-ctype.c:1424
+#: locale/programs/ld-collate.c:1268 locale/programs/ld-ctype.c:1454
 #, c-format
 msgid "`%s' and `%.*s' are no valid names for symbolic range"
 msgstr "`%s' ©M `%.*s' ¬Ò«D²Å¸¹½d³ò¤¤¾A¥Îªº¦WºÙ"
@@ -3985,7 +3972,7 @@ msgstr "`%s' ©M `%.*s' ¬Ò«D²Å¸¹½d³ò¤¤¾A¥Îªº¦WºÙ"
 msgid "`%s' is no correct profile data file for `%s'"
 msgstr "`%s' ¤£¬O `%s' ¤¤¥¿½Tªº´ú³tµû¦ô¸ê®ÆÀÉ"
 
-#: locale/programs/ld-ctype.c:668
+#: locale/programs/ld-ctype.c:691
 msgid "`digit' category has not entries in groups of ten"
 msgstr "`digit' Ãþ§O¦b¸s²Õ \"¤Q\" ¤¤¨S¦³¶µ¥Ø"
 
@@ -4001,7 +3988,7 @@ msgstr "ai_socktype ¨S¦³¤ä´©"
 msgid "already running"
 msgstr "¤w¦b°õ¦æ"
 
-#: locale/programs/charmap.c:397 locale/programs/repertoire.c:184
+#: locale/programs/charmap.c:434 locale/programs/repertoire.c:184
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "µ¹ <%s> ªº¤Þ¼Æ¥²¶·¬O¤@­Ó³æ¦r¤¸"
@@ -4019,7 +4006,7 @@ msgstr "auth_none.c - ÄY­«ªº±Æ§Ç°ÝÃD"
 msgid "authunix_create: out of memory\n"
 msgstr "authunix_create: °O¾ÐÅ餣¨¬\n"
 
-#: locale/programs/charmap.c:327 locale/programs/locfile.c:118
+#: locale/programs/charmap.c:364 locale/programs/locfile.c:118
 #: locale/programs/locfile.c:145 locale/programs/repertoire.c:176
 msgid "bad argument"
 msgstr "¿ù»~ªº¤Þ¼Æ"
@@ -4028,11 +4015,11 @@ msgstr "¿ù»~ªº¤Þ¼Æ"
 msgid "bad owner"
 msgstr "¿ù»~ªº¾Ö¦³ªÌ"
 
-#: timezone/zic.c:1211
+#: timezone/zic.c:1210
 msgid "blank FROM field on Link line"
 msgstr "Link ¦æ¤¤ªÅ¥Õªº FROM Äæ¦ì"
 
-#: timezone/zic.c:1215
+#: timezone/zic.c:1214
 msgid "blank TO field on Link line"
 msgstr "Link ¦æ¤¤ªÅ¥Õªº TO Äæ¦ì"
 
@@ -4052,24 +4039,19 @@ msgstr "broadcast: ioctl (¨ú±o¤¶­±³]©w­È)"
 msgid "broadcast: ioctl (get interface flags)"
 msgstr "broadcast: ioctl (¨ú±o¤¶­±ºX¼Ð)"
 
-#: elf/ldconfig.c:557
-#, c-format
-msgid "buffer for snprintf too small for %s/%s--file is ignored\n"
-msgstr "µ¹ snprintf ªº½w½ÄªÅ¶¡¤Ó¤p¡AµLªk %s/%s--©¿²¤¦¹¤@ÀÉ®×\n"
-
-#: sunrpc/svc_udp.c:528 sunrpc/svc_udp6.c:447
+#: sunrpc/svc_udp.c:528
 msgid "cache_set: could not allocate new rpc_buffer"
 msgstr "cache_set: µLªk°t¸m·sªº»·ºÝµ{§Ç©I¥s½w½Ä°Ï (rpc_buffer)"
 
-#: sunrpc/svc_udp.c:522 sunrpc/svc_udp6.c:441
+#: sunrpc/svc_udp.c:522
 msgid "cache_set: victim alloc failed"
 msgstr "cache_set: victim °t¸m¥¢±Ñ"
 
-#: sunrpc/svc_udp.c:511 sunrpc/svc_udp6.c:430
+#: sunrpc/svc_udp.c:511
 msgid "cache_set: victim not found"
 msgstr "cache_set: §ä¤£¨ì victim"
 
-#: timezone/zic.c:1752
+#: timezone/zic.c:1751
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr "µLªk¨M©w¦bµ²§ô®É¶¡ (untiltime) ¥H«á¸Ó¨Ï¥Îªº®É°Ï²¼g"
 
@@ -4078,24 +4060,24 @@ msgstr "µLªk¨M©w¦bµ²§ô®É¶¡ (untiltime) ¥H«á¸Ó¨Ï¥Îªº®É°Ï²¼g"
 msgid "can't reassign procedure number %ld\n"
 msgstr "¤£¯à­«½Æ«ü©wµ{§Ç¸¹½X %ld\n"
 
-#: elf/dl-reloc.c:150
+#: elf/dl-reloc.c:152
 msgid "can't restore segment prot after reloc"
 msgstr "¦b reloc ¤§«áµLªk´_­ì segment port"
 
-#: locale/programs/localedef.c:477
+#: locale/programs/localedef.c:487
 #, c-format
 msgid "cannot add already read locale `%s' a second time"
-msgstr " `%s' °Ï°ì¸ê®Æ¤w¸g¥Î¹L¡A¤£¯à­«½Æ¥[¤J"
+msgstr " `%s' °Ï°ì¸ê®Æ (locale) ¤w¸g¥Î¹L¡A¤£¯à­«½Æ¥[¤J"
 
-#: elf/dl-deps.c:458
+#: elf/dl-deps.c:470
 msgid "cannot allocate dependency list"
 msgstr "µLªk°t¸m¬ÛÃö©Ê¦Cªí"
 
-#: elf/dl-load.c:1042
+#: elf/dl-load.c:1031
 msgid "cannot allocate memory for program header"
 msgstr "µLªk°t¸m°O¾ÐÅéµ¹µ{¦¡¼ÐÀY°Ï¨Ï¥Î"
 
-#: elf/dl-load.c:317
+#: elf/dl-load.c:339
 msgid "cannot allocate name record"
 msgstr "µLªk°t¸m¦WºÙ¬ö¿ý"
 
@@ -4103,7 +4085,7 @@ msgstr "µLªk°t¸m¦WºÙ¬ö¿ý"
 msgid "cannot allocate symbol data"
 msgstr "µLªk°t¸m¨ç¦¡²Å¸¹¸ê®Æ"
 
-#: elf/dl-deps.c:476
+#: elf/dl-deps.c:501
 msgid "cannot allocate symbol search list"
 msgstr "µLªk°t¸m²Å¸¹·j´M¦Cªí"
 
@@ -4111,20 +4093,20 @@ msgstr "µLªk°t¸m²Å¸¹·j´M¦Cªí"
 msgid "cannot allocate version reference table"
 msgstr "µLªk°t¸mª©¥»°Ñ·Óªí"
 
-#: elf/dl-load.c:1011
+#: elf/dl-load.c:1000
 msgid "cannot change memory protections"
 msgstr "µLªk§ïÅÜ°O¾ÐÅé«OÅ@ª¬ºA"
 
-#: elf/dl-load.c:489
+#: elf/dl-load.c:533
 msgid "cannot create RUNPATH/RPATH copy"
 msgstr "µLªk«Ø¥ß RUNPATH/RPATH ªº°Æ¥»"
 
-#: elf/dl-load.c:416 elf/dl-load.c:477 elf/dl-load.c:502 elf/dl-load.c:542
-#: elf/dl-load.c:634
+#: elf/dl-load.c:418 elf/dl-load.c:518 elf/dl-load.c:546 elf/dl-load.c:593
+#: elf/dl-load.c:685
 msgid "cannot create cache for search path"
 msgstr "µLªk¬°·j´M¸ô®|«Ø¥ß§Ö¨ú"
 
-#: elf/dl-support.c:139
+#: elf/dl-support.c:191
 msgid "cannot create capability list"
 msgstr "µLªk«Ø¥ß capability ¦Cªí"
 
@@ -4136,37 +4118,45 @@ msgstr "µLªk«Ø¥ß¤º³¡±Ô­z¶µ"
 msgid "cannot create internal descriptors"
 msgstr "µLªk«Ø¥ß¤º³¡±Ô­z¶µ"
 
-#: elf/dl-load.c:532
+#: elf/dl-load.c:583
 msgid "cannot create search path array"
 msgstr "µLªk«Ø¥ß·j´M¸ô®|°}¦C"
 
-#: elf/dl-load.c:1146
+#: elf/dl-load.c:1137
 msgid "cannot create searchlist"
 msgstr "µLªk«Ø¥ß·j´M¦Cªí"
 
-#: elf/dl-load.c:839 elf/dl-load.c:1559
+#: elf/dl-load.c:822 elf/dl-load.c:1682
 msgid "cannot create shared object descriptor"
 msgstr "µLªk«Ø¥ß¦@¥Î¥ØªºÀɱԭz¶µ"
 
+#: catgets/gencat.c:1316
+msgid "cannot determine escape character"
+msgstr "µLªk¨M©w¸õ²æ (escape) ¦r¤¸"
+
+#: elf/dl-load.c:950
+msgid "cannot dynamically load executable"
+msgstr "µLªk°ÊºA¸ü¤J°õ¦æÀÉ"
+
 #: nscd/connections.c:183
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "µLªk¶}±Ò socket ¨Ó±µ¨ü³s½u: %s"
 
-#: elf/dl-open.c:251
+#: elf/dl-open.c:121
 msgid "cannot extend global scope"
 msgstr "µLªk©µ®i¥þ°ìÅܼƪº§@¥Î°ì"
 
-#: sunrpc/rpc_main.c:342
+#: sunrpc/rpc_main.c:343
 #, c-format
 msgid "cannot find C preprocessor: %s \n"
 msgstr "§ä¤£¨ì C «e¸m³B²z¾¹: %s \n"
 
-#: sunrpc/rpc_main.c:350
+#: sunrpc/rpc_main.c:351
 msgid "cannot find any C preprocessor (cpp)\n"
 msgstr "§ä¤£¨ì¥ô¦ó C «e¸m³B²z¾¹ (cpp)\n"
 
-#: nscd/connections.c:224
+#: nscd/connections.c:225
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "¤£¯à³B²z %d ª©ªº½Ð¨D¡F¥Ø«e¨Ï¥Îªºª©¥»¬O %d"
@@ -4175,11 +4165,15 @@ msgstr "¤£¯à³B²z %d ª©ªº½Ð¨D¡F¥Ø«e¨Ï¥Îªºª©¥»¬O %d"
 msgid "cannot load profiling data"
 msgstr "µLªk¸ü¤J´ú¸Õ¸ê®Æ"
 
-#: elf/dl-reloc.c:62
+#: elf/dl-deps.c:586
+msgid "cannot load shared object file"
+msgstr "µLªk¸ü¤J¦@¥Î¥ØªºÀÉ"
+
+#: elf/dl-reloc.c:63
 msgid "cannot make segment writable for relocation"
 msgstr "¦b­«·s©w§}¥H«áµLªk±N°Ï¬q³]¬°¥i¼g¤Jª¬ºA"
 
-#: elf/dl-load.c:1027
+#: elf/dl-load.c:1016
 msgid "cannot map zero-fill pages"
 msgstr "µLªk¹ïÀ³¥H¹s¶ñº¡ªº¤À­¶°Ï"
 
@@ -4192,31 +4186,26 @@ msgstr "µLªk¶}±Ò"
 msgid "cannot open `%s'"
 msgstr "µLªk¶}±Ò `%s'"
 
-#: nss/makedb.c:149
-#, c-format
-msgid "cannot open database file `%s': %s"
-msgstr "µLªk¶}±Ò¸ê®Æ®wÀÉ®× `%s': %s"
-
 #: debug/pcprofiledump.c:96
 msgid "cannot open input file"
 msgstr "µLªk¶}±Ò¿é¤JÀÉ"
 
-#: catgets/gencat.c:273 iconv/iconv_prog.c:225 nss/makedb.c:170
+#: catgets/gencat.c:288 iconv/iconv_prog.c:225
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "µLªk¶}±Ò¿é¤JÀÉ `%s'"
 
-#: locale/programs/localedef.c:198 locale/programs/localedef.c:213
-#: locale/programs/localedef.c:503 locale/programs/localedef.c:523
+#: locale/programs/localedef.c:203 locale/programs/localedef.c:218
+#: locale/programs/localedef.c:513 locale/programs/localedef.c:533
 #, c-format
 msgid "cannot open locale definition file `%s'"
-msgstr "µLªk¶}±Ò°Ï°ì¸ê®Æ©w¸qÀÉ `%s'"
+msgstr "µLªk¶}±Ò°Ï°ì¤Æ¸ê®Æ®w (locale) ©w¸qÀÉ `%s'"
 
 #: iconv/iconv_prog.c:194
 msgid "cannot open output file"
 msgstr "µLªk¶}±Ò¿é¥XÀÉ"
 
-#: catgets/gencat.c:780 catgets/gencat.c:821 nss/makedb.c:183
+#: catgets/gencat.c:944 catgets/gencat.c:985
 #, c-format
 msgid "cannot open output file `%s'"
 msgstr "µLªk¶}±Ò¿é¥XÀÉ `%s'"
@@ -4226,7 +4215,7 @@ msgstr "µLªk¶}±Ò¿é¥XÀÉ `%s'"
 msgid "cannot open output file `%s' for category `%s'"
 msgstr "µLªk¶}±Ò¿é¥XÀÉ `%s' ¨ÑÃþ§O `%s' ¨Ï¥Î"
 
-#: elf/dl-load.c:1572
+#: elf/dl-load.c:1695
 msgid "cannot open shared object file"
 msgstr "µLªk¶}±Ò¦@¥Î¥ØªºÀÉ"
 
@@ -4235,11 +4224,11 @@ msgstr "µLªk¶}±Ò¦@¥Î¥ØªºÀÉ"
 msgid "cannot open socket: %s"
 msgstr "µLªk¶}±Ò socket: %s"
 
-#: elf/dl-load.c:831
+#: elf/dl-load.c:814
 msgid "cannot open zero fill device"
 msgstr "µLªk¶}±Ò¥H¹s¶ñº¡ªº¸Ë¸m"
 
-#: locale/programs/locale.c:462
+#: locale/programs/charmap-dir.c:61
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr "µLªkŪ¨ú¦r¶°¹ï·ÓÀɥؿý `%s'"
@@ -4248,7 +4237,7 @@ msgstr "µLªkŪ¨ú¦r¶°¹ï·ÓÀɥؿý `%s'"
 msgid "cannot read configuration file; this is fatal"
 msgstr "µLªkŪ¨ú³]©wÀÉ¡A³o¬O¤@­ÓÄY­«¿ù»~"
 
-#: elf/dl-load.c:768 elf/dl-load.c:856
+#: elf/dl-load.c:838 elf/dl-load.c:1244
 msgid "cannot read file data"
 msgstr "µLªkŪ¨úÀɮ׸ê®Æ"
 
@@ -4261,10 +4250,10 @@ msgstr "µLªkŪ¨ú¼ÐÀY¸ê®Æ"
 msgid "cannot read header from `%s'"
 msgstr "µLªk±q `%s' Ū¨ú¼ÐÀY¸ê®Æ"
 
-#: locale/programs/locale.c:306
+#: locale/programs/locale.c:308
 #, c-format
 msgid "cannot read locale directory `%s'"
-msgstr "µLªkŪ¨ú°Ï°ì¸ê®Æ¥Ø¿ý `%s'"
+msgstr "µLªkŪ¨ú°Ï°ì¸ê®Æ (locale) ¥Ø¿ý `%s'"
 
 #: nscd/nscd_stat.c:128
 msgid "cannot read statistics data"
@@ -4274,7 +4263,7 @@ msgstr "µLªkŪ¨ú²Î­p¸ê®Æ"
 msgid "cannot safe new repertoire map"
 msgstr "µLªkÀx¦s·sªº½s½X¹ï¬MÀÉ"
 
-#: elf/dl-load.c:737
+#: elf/dl-load.c:776
 msgid "cannot stat shared object"
 msgstr "µLªk stat ¦@¥Î¥ØªºÀÉ"
 
@@ -4283,12 +4272,12 @@ msgstr "µLªk stat ¦@¥Î¥ØªºÀÉ"
 msgid "cannot stat() file `%s': %s"
 msgstr "µLªk stat() ÀÉ®× `%s': %s"
 
-#: locale/programs/localedef.c:225
+#: locale/programs/localedef.c:230
 #, c-format
 msgid "cannot write output files to `%s'"
 msgstr "µLªk±N¿é¥XÀÉ®×¼g¤J `%s'"
 
-#: nscd/connections.c:260 nscd/connections.c:281
+#: nscd/connections.c:261 nscd/connections.c:282
 #, c-format
 msgid "cannot write result: %s"
 msgstr "µLªk¼g¤Jµ²ªG: %s"
@@ -4298,62 +4287,63 @@ msgstr "µLªk¼g¤Jµ²ªG: %s"
 msgid "cannot write statistics: %s"
 msgstr "µLªk¼g¤J²Î­p¸ê®Æ: %s"
 
-#: locale/programs/ld-ctype.c:486
+#: locale/programs/ld-ctype.c:509
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr "¦r¤¸ '%s' (©ñ¦bÃþ§O `%s' ¤§¤¤) ¥²¶·¦bÃþ§O `%s' ¸Ì­±"
 
-#: locale/programs/ld-ctype.c:501
+#: locale/programs/ld-ctype.c:524
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr "¦r¤¸ '%s' (©ñ¦bÃþ§O `%s' ¤§¤¤) ¤£¯à¦bÃþ§O `%s' ¸Ì­±"
 
-#: locale/programs/ld-ctype.c:556
+#: locale/programs/ld-ctype.c:579
 msgid "character <SP> not defined in character map"
 msgstr "¦r¤¸ <SP> ¦b¦r¶°¹ï·ÓÀɤ¤¨S¦³©w¸q"
 
-#: locale/programs/linereader.c:710
-#, c-format
-msgid "character <U%0*X> not in repertoire map"
-msgstr "¦r¤¸ <U%0*X> ¨Ã¤£¦b½s½X¹ï¬MÀɸ̭±"
-
-#: locale/programs/ld-ctype.c:430
+#: locale/programs/ld-ctype.c:453
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr "character L'\\u%0*x' (©ñ¦bÃþ§O `%s' ¤§¤¤) ¥²¶·¦bÃþ§O `%s' ¸Ì­±"
 
-#: locale/programs/ld-ctype.c:444
+#: locale/programs/ld-ctype.c:467
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr "character L'\\u%0*x' (©ñ¦bÃþ§O `%s' ¤§¤¤) ¤£¯à¦bÃþ§O `%s' ¸Ì­±"
 
-#: locale/programs/ld-ctype.c:2917
+#: locale/programs/ld-ctype.c:3030
 #, c-format
 msgid "character `%s' not defined while needed as default value"
 msgstr "¥²¶·¥Î¨Ó§@¬°¹w³]­Èªº¦r¤¸ `%s' ¨S¦³³Q©w¸q¨ì"
 
-#: locale/programs/ld-ctype.c:1205
+#: locale/programs/ld-ctype.c:1215
 #, c-format
 msgid "character class `%s' already defined"
 msgstr "¦r¤¸Ãþ§O `%s' ¤w¸g©w¸q¹L¤F"
 
-#: locale/programs/ld-ctype.c:1237
+#: locale/programs/ld-ctype.c:1247
 #, c-format
 msgid "character map `%s' already defined"
 msgstr "¦r¶°¹ï·ÓÀÉ `%s' ¤w¸g©w¸q¹L¤F"
 
-#: locale/programs/charmap.c:119
+#: locale/programs/charmap.c:249
+#, c-format
+msgid ""
+"character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
+msgstr "¦r¤¸¹ïÀ³ `%s' ¤£¬O ASCII ¬Û®e½X¡A°Ï°ì¤Æ¸ê®Æ®w¤£²Å¦X ISO C\n"
+
+#: locale/programs/charmap.c:135
 #, c-format
 msgid "character map file `%s' not found"
 msgstr "§ä¤£¨ì¦r¶°¹ï·ÓÀÉ `%s'"
 
-#: locale/programs/charmap.c:423
+#: locale/programs/charmap.c:460
 msgid "character sets with locking states are not supported"
 msgstr "¤£¤ä´©¨Ï¥Î locking ª¬ºAªº¦r¤¸¶°"
 
-#: locale/programs/localedef.c:472
+#: locale/programs/localedef.c:482
 msgid "circular dependencies between locale definitions"
-msgstr "¦³°Ï°ì¸ê®Æ¦b©w¸q®Éµo¥Í´`Àô¬ÛÃöªº±¡ªp"
+msgstr "¦³°Ï°ì¸ê®Æ (locale) ¦b©w¸q®Éµo¥Í´`Àô¬ÛÃöªº±¡ªp"
 
 #: sunrpc/clnt_raw.c:111
 msgid "clnt_raw.c - Fatal header serialization error."
@@ -4363,7 +4353,7 @@ msgstr "clnt_raw.c - ÄY­«ªº¼ÐÀY§Ç¦C¤Æ¿ù»~¡C"
 msgid "clnttcp_create: out of memory\n"
 msgstr "clnttcp_create: °O¾ÐÅ餣¨¬\n"
 
-#: sunrpc/clnt_udp.c:126 sunrpc/clnt_udp.c:136
+#: sunrpc/clnt_udp.c:131 sunrpc/clnt_udp.c:141
 msgid "clntudp_create: out of memory\n"
 msgstr "clntudp_create: °O¾ÐÅ餣¨¬\n"
 
@@ -4380,8 +4370,12 @@ msgstr "À³¸Ó­n¦³±`¼Æ©ÎÃѧO²Å¸¹¤~¹ï"
 msgid "conversion from `%s' to `%s' not supported"
 msgstr "¤£¤ä´©±q `%s' ¨ì `%s' ªºÂà´«"
 
+#: catgets/gencat.c:1290
+msgid "conversion modules not available"
+msgstr "Âà´«¼Ò²Õ¤£¦s¦b"
+
 #: locale/programs/ld-monetary.c:900
-msgid "conversion rate valze cannot be zero"
+msgid "conversion rate value cannot be zero"
 msgstr "Âà´«²vªº­È¤£¥i¥H¬O¹s"
 
 #: iconv/iconv_prog.c:385 iconv/iconv_prog.c:410
@@ -4397,52 +4391,48 @@ msgstr "¤£¯à²£¥Í»·ºÝµ{§Ç©I¥s¦øªAµ{¦¡\n"
 msgid "couldn't register prog %ld vers %ld\n"
 msgstr "¤£¯à±Nµ{¦¡ %ld µù¥U¨ì %ld\n"
 
-#: nss/getent.c:50
+#: nss/getent.c:51
 msgid "database [key ...]"
 msgstr "¸ê®Æ®w [Áä­È...]"
 
-#: locale/programs/charmap.c:213
+#: locale/programs/charmap.c:192
 #, c-format
 msgid "default character map file `%s' not found"
 msgstr "§ä¤£¨ì¹w³]ªº¦r¶°¹ï·ÓÀÉ `%s'"
 
-#: locale/programs/charmap.c:355
+#: locale/programs/charmap.c:392
 #, c-format
 msgid "duplicate definition of <%s>"
 msgstr "<%s> ªº©w¸q­«½Æ¤F"
 
-#: locale/programs/ld-collate.c:3173
+#: locale/programs/ld-collate.c:3043
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "±Ô­z `%s' ªº©w¸q­«½Æ¤F"
 
-#: nss/makedb.c:330
-msgid "duplicate key"
-msgstr "½Æ»sÁä­È"
-
-#: catgets/gencat.c:389
+#: catgets/gencat.c:430
 msgid "duplicate set definition"
 msgstr "½Æ»s¶°¦X©w¸q"
 
-#: timezone/zic.c:1004
+#: timezone/zic.c:1003
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "½Æ»s®É°Ï¦WºÙ %s (ÀÉ®× \"%s\", ²Ä %d ¦æ)"
 
-#: locale/programs/ld-ctype.c:2485
+#: locale/programs/ld-ctype.c:2557
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr "¹ï¬M `%s' ªº©w¸q­«½Æ¤F"
 
-#: catgets/gencat.c:556
+#: catgets/gencat.c:631
 msgid "duplicated message identifier"
 msgstr "­«½Æªº°T®§ÃѧO²Å¸¹"
 
-#: catgets/gencat.c:528
+#: catgets/gencat.c:603
 msgid "duplicated message number"
 msgstr "­«½Æªº°T®§½s¸¹"
 
-#: locale/programs/ld-ctype.c:2296
+#: locale/programs/ld-ctype.c:2368
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr "¬Ù²¤°Ï°ì¥²¶·¥Î¨â­Ó«¬§O¬Û¦Pªº¹Bºâ¤¸¼Ð¥Ü¥X¨Ó"
 
@@ -4450,23 +4440,23 @@ msgstr "¬Ù²¤°Ï°ì¥²¶·¥Î¨â­Ó«¬§O¬Û¦Pªº¹Bºâ¤¸¼Ð¥Ü¥X¨Ó"
 msgid "empty char string"
 msgstr "ªÅªº¦r¤¸¦r¦ê"
 
-#: elf/dl-open.c:140
+#: elf/dl-open.c:223
 msgid "empty dynamic string token substitution"
 msgstr "ªÅªº°ÊºA¦r¦ê°O¸¹´À´«"
 
-#: sunrpc/svc_udp.c:454 sunrpc/svc_udp6.c:373
+#: sunrpc/svc_udp.c:454
 msgid "enablecache: cache already enabled"
 msgstr "enablecache: §Ö¨ú¤w¸g¶}±Ò"
 
-#: sunrpc/svc_udp.c:460 sunrpc/svc_udp6.c:379
+#: sunrpc/svc_udp.c:460
 msgid "enablecache: could not allocate cache"
 msgstr "enablecache: µLªk°t¸m§Ö¨ú"
 
-#: sunrpc/svc_udp.c:468 sunrpc/svc_udp6.c:387
+#: sunrpc/svc_udp.c:468
 msgid "enablecache: could not allocate cache data"
 msgstr "enablecache: µLªk°t¸m§Ö¨ú¸ê®Æ"
 
-#: sunrpc/svc_udp.c:475 sunrpc/svc_udp6.c:394
+#: sunrpc/svc_udp.c:475
 msgid "enablecache: could not allocate cache fifo"
 msgstr "enablecache: µLªk°t¸m§Ö¨ú fifo ºÞ½u"
 
@@ -4478,12 +4468,12 @@ msgstr "¥Î¨Ó¿é¥Xªº½s½X"
 msgid "encoding of original text"
 msgstr "­ì©l¤å¦rªº½s½X"
 
-#: nscd/connections.c:360 nscd/connections.c:452
+#: nscd/connections.c:361 nscd/connections.c:453
 #, c-format
 msgid "error getting callers id: %s"
 msgstr "¨ú±o©I¥sµ{¦¡ÃѧO½X®Éµo¥Í¿ù»~: %s"
 
-#: locale/programs/ld-collate.c:3143
+#: locale/programs/ld-collate.c:3013
 msgid "error while adding equivalent collating symbol"
 msgstr "¥¿¦b¥[¤J¦P¸q¹ï·Ó²Å¸¹®Éµo¥Í¿ù»~"
 
@@ -4508,7 +4498,7 @@ msgstr "¥¿¦bŪ¤J¸ê®Æªº®É­Ôµo¥Í¿ù»~"
 msgid "expect string argument for `copy'"
 msgstr "`copy' ªº°Ñ¼ÆÀ³¸Ó¬O¦r¦ê¤~¹ï"
 
-#: timezone/zic.c:894
+#: timezone/zic.c:893
 msgid "expected continuation line not found"
 msgstr "§ä¤£¨ì¹w´Áªº±µÄò¦æ"
 
@@ -4521,7 +4511,7 @@ msgstr "¶}±Ò¦@¥Î¥ØªºÀÉ `%s' ¥¢±Ñ"
 msgid "failed to load symbol data"
 msgstr "¸ü¤J¨ç¦¡²Å¸¹¸ê®Æ¥¢±Ñ"
 
-#: elf/dl-load.c:722
+#: elf/dl-load.c:763
 msgid "failed to map segment from shared object"
 msgstr "±q¦@¥Î¥ØªºÀɤ¤¹ï¬M°Ï¬q¥¢±Ñ"
 
@@ -4544,20 +4534,24 @@ msgstr "fcntl: F_SETFD"
 
 #. TRANS: the file will not be removed; this is an
 #. TRANS: informative message.
-#: sunrpc/rpc_main.c:1153
+#: sunrpc/rpc_main.c:1150
 #, c-format
 msgid "file `%s' already exists and may be overwritten\n"
 msgstr "ÀÉ®× `%s' ¤w¸g¦s¦b¨Ã¦³¥i¯à·|³QÂл\±¼\n"
 
+#: elf/dl-load.c:1244
+msgid "file too short"
+msgstr "ÀɮפӤp"
+
 #: inet/rcmd.c:422
 msgid "fstat failed"
 msgstr "fstat ¥¢±Ñ"
 
-#: locale/programs/linereader.c:376
+#: locale/programs/linereader.c:383
 msgid "garbage at end of character code specification"
 msgstr "¦r¤¸½s½X³]©wµ²§ô¦ì¸mªºµL¥Î¸ê®Æ"
 
-#: locale/programs/linereader.c:265
+#: locale/programs/linereader.c:271
 msgid "garbage at end of number"
 msgstr "¸¹½Xµ²§ô¦ì¸mªºµL¥Î¸ê®Æ"
 
@@ -4573,16 +4567,16 @@ msgstr "±q°õ¦æ¦¸¼Æ»P¸g¾ú®É¶¡ªº¸ê®Æ¤¤²£¥Íª½±µªº´ú³tµ²ªG"
 msgid "get_myaddress: ioctl (get interface configuration)"
 msgstr "get_myaddress: ioctl (¨ú±o¤¶­±³]©w¸ê®Æ)"
 
-#: nss/getent.c:54
+#: nss/getent.c:702
 msgid "getent - get entries from administrative database."
 msgstr "getent - ±qºÞ²z¸ê®Æ®w¤¤¨ú±o¶µ¥Ø¤º®e¡C"
 
-#: nscd/connections.c:219
+#: nscd/connections.c:220
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "handle_request: ½Ð¨D¤w³Q±µ¨ü (ª©¥»¬° %d)"
 
-#: timezone/zic.c:638
+#: timezone/zic.c:637
 msgid "hard link failed, symbolic link used"
 msgstr "¹êÅé³sµ²¥¢±Ñ¡A¨Ï¥Î²Å¸¹³sµ²¥N´À"
 
@@ -4590,15 +4584,15 @@ msgstr "¹êÅé³sµ²¥¢±Ñ¡A¨Ï¥Î²Å¸¹³sµ²¥N´À"
 msgid "hard linked somewhere"
 msgstr "³Q¹êÅé³sµ²¨ì¬Y³B"
 
-#: locale/programs/charmap.c:944 locale/programs/repertoire.c:430
+#: locale/programs/charmap.c:981 locale/programs/repertoire.c:430
 msgid "hexadecimal range format should use only capital characters"
 msgstr "¦bªí¥Ü¤Q¤»¶i¦ìªº½d³ò®É¥u¯à¥Î¤j¼gªº­^¤å¦r¥Àªí¥Ü"
 
-#: timezone/zic.c:1188
+#: timezone/zic.c:1187
 msgid "illegal CORRECTION field on Leap line"
 msgstr "¦b¶|®É³]©w¦æ¤¤¦³¤£¦Xªkªº CORRECTION Äæ¦ì"
 
-#: timezone/zic.c:1192
+#: timezone/zic.c:1191
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "¦b¶|®É³]©w¦æ¤¤¦³¤£¦Xªkªº Rolling/Stationary Äæ¦ì"
 
@@ -4606,7 +4600,7 @@ msgstr "¦b¶|®É³]©w¦æ¤¤¦³¤£¦Xªkªº Rolling/Stationary Äæ¦ì"
 msgid "illegal character in file: "
 msgstr "Àɮפ¤¦³¤£¦Xªkªº¦r¤¸: "
 
-#: locale/programs/linereader.c:588
+#: locale/programs/linereader.c:595
 msgid "illegal escape sequence at end of string"
 msgstr "¦r¦êµ²§À¦³¤£¦Xªkªº¸õ²æ§Ç¦C"
 
@@ -4615,21 +4609,21 @@ msgstr "¦r¦êµ²§À¦³¤£¦Xªkªº¸õ²æ§Ç¦C"
 msgid "illegal input sequence at position %ld"
 msgstr "¦ì¸m %ld ¦³¤£¦Xªkªº¿é¤J§Ç¦C"
 
-#: sunrpc/rpc_main.c:466
+#: sunrpc/rpc_main.c:463
 #, c-format
 msgid "illegal nettype :`%s'\n"
 msgstr "¤£¦Xªkªº nettype :`%s'\n"
 
-#: catgets/gencat.c:362 catgets/gencat.c:439
+#: catgets/gencat.c:403 catgets/gencat.c:480
 msgid "illegal set number"
 msgstr "¤£¦Xªkªº¶°¦X½s¸¹"
 
-#: locale/programs/ld-ctype.c:1211
+#: locale/programs/ld-ctype.c:1221
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr "µ{¦¡¹ê§@ªº­­¨î: ¤£¯à¨Ï¥Î¶W¹L %Zd ­Ó¦r¶°Ãþ§O"
 
-#: locale/programs/ld-ctype.c:1243
+#: locale/programs/ld-ctype.c:1253
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr "µ{¦¡¹ê§@ªº­­¨î: ¤£¯à¨Ï¥Î¶W¹L %d ­Ó¦r¶°¹ï·ÓÀÉ"
@@ -4638,15 +4632,11 @@ msgstr "µ{¦¡¹ê§@ªº­­¨î: ¤£¯à¨Ï¥Î¶W¹L %d ­Ó¦r¶°¹ï·ÓÀÉ"
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr "½w½Ä°Ïµ²§À¦³¤£§¹¥þªº¦r¤¸©Î shift sequence"
 
-#: nss/makedb.c:151
-msgid "incorrectly formatted file"
-msgstr "¨S¦³¥¿½T®æ¦¡¤ÆªºÀÉ®×"
-
-#: timezone/zic.c:851
+#: timezone/zic.c:850
 msgid "input line of unknown type"
 msgstr "¤£©ú«¬§Oªº¿é¤J¦æ"
 
-#: elf/dl-load.c:812
+#: elf/dl-load.c:1291
 msgid "internal error"
 msgstr "¤º³¡¿ù»~"
 
@@ -4654,68 +4644,76 @@ msgstr "¤º³¡¿ù»~"
 msgid "internal error (illegal descriptor)"
 msgstr "¤º³¡¿ù»~ (¤£¦Xªkªº±Ô­z¶µ)"
 
-#: timezone/zic.c:1814
+#: timezone/zic.c:1813
 msgid "internal error - addtype called with bad isdst"
 msgstr "¤º³¡¿ù»~ - ¥Î¿ù»~ªº isdst ©I¥s addtype ¨ç¦¡"
 
-#: timezone/zic.c:1822
+#: timezone/zic.c:1821
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr "¤º³¡¿ù»~ - ¥Î¿ù»~ªº ttisgmt ©I¥s addtype ¨ç¦¡"
 
-#: timezone/zic.c:1818
+#: timezone/zic.c:1817
 msgid "internal error - addtype called with bad ttisstd"
 msgstr "¤º³¡¿ù»~ - ¥Î¿ù»~ªº ttisstd ©I¥s addtype ¨ç¦¡"
 
-#: locale/programs/ld-ctype.c:457 locale/programs/ld-ctype.c:513
+#: locale/programs/ld-ctype.c:480 locale/programs/ld-ctype.c:536
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr "%s ªº²Ä %u ¦æµo¥Í¤º³¡¿ù»~"
 
-#: elf/dl-load.c:789
+#: elf/dl-load.c:1264
 msgid "invalid ELF header"
 msgstr "µL®Äªº ELF ¼ÐÀY"
 
-#: timezone/zic.c:1060
+#: timezone/zic.c:1059
 msgid "invalid UTC offset"
 msgstr "µL®Äªº UTC ¦ì²¾­È"
 
-#: timezone/zic.c:1063
+#: timezone/zic.c:1062
 msgid "invalid abbreviation format"
 msgstr "µL®ÄªºÁY¼g®æ¦¡"
 
-#: timezone/zic.c:1153 timezone/zic.c:1365 timezone/zic.c:1379
+#: catgets/gencat.c:687
+msgid "invalid character: message ignored"
+msgstr "¤£¾A¥Îªº¦r¤¸: ©¿²¤¦¹°T®§"
+
+#: timezone/zic.c:1152 timezone/zic.c:1364 timezone/zic.c:1378
 msgid "invalid day of month"
 msgstr "µL®Äªº¤é´Á¼Æ¦r"
 
-#: locale/programs/charmap.c:310
+#: locale/programs/charmap.c:347
 msgid "invalid definition"
 msgstr "µL®Äªº©w¸q"
 
-#: locale/programs/charmap.c:505
+#: locale/programs/charmap.c:542
 msgid "invalid encoding given"
 msgstr "µ¹¤©ªº½s½X¬OµL®Äªº"
 
-#: timezone/zic.c:1317
+#: timezone/zic.c:1316
 msgid "invalid ending year"
 msgstr "µL®Äªºµ²§ô¦~¥÷"
 
-#: locale/programs/linereader.c:526
+#: catgets/gencat.c:1147 locale/programs/linereader.c:533
 msgid "invalid escape sequence"
 msgstr "µL®Äªº¸õ²æ§Ç¦C"
 
-#: timezone/zic.c:1125
+#: timezone/zic.c:1124
 msgid "invalid leaping year"
 msgstr "µL®Äªº¶|¦~"
 
-#: elf/dl-open.c:315
+#: catgets/gencat.c:726
+msgid "invalid line"
+msgstr "µL®Äªº¿é¤J¦C"
+
+#: elf/dl-open.c:371
 msgid "invalid mode for dlopen()"
 msgstr "µL®Äªº dlopen() ¼Ò¦¡"
 
-#: timezone/zic.c:1140 timezone/zic.c:1243
+#: timezone/zic.c:1139 timezone/zic.c:1242
 msgid "invalid month name"
 msgstr "µL®Äªº¤ë¥÷¦WºÙ"
 
-#: locale/programs/charmap.c:932 locale/programs/ld-collate.c:3001
+#: locale/programs/charmap.c:969 locale/programs/ld-collate.c:2869
 #: locale/programs/repertoire.c:418
 msgid "invalid names for character range"
 msgstr "µL®Äªº¦r¤¸½d³ò¦WºÙ"
@@ -4724,48 +4722,54 @@ msgstr "µL®Äªº¦r¤¸½d³ò¦WºÙ"
 msgid "invalid pointer size"
 msgstr "µL®Äªº«ü¼Ð¤j¤p"
 
-#: timezone/zic.c:959
+#: catgets/gencat.c:549
+msgid "invalid quote character"
+msgstr "¤£¾A¥Îªº¤Þ¥Î¦r¤¸"
+
+#: timezone/zic.c:958
 msgid "invalid saved time"
 msgstr "µL®Äªº¸`¬ù®É¶¡"
 
-#: timezone/zic.c:1292
+#: timezone/zic.c:1291
 msgid "invalid starting year"
 msgstr "µL®Äªº°_©l¦~¥÷"
 
-#: timezone/zic.c:1169 timezone/zic.c:1272
+#: timezone/zic.c:1168 timezone/zic.c:1271
 msgid "invalid time of day"
 msgstr "µL®Äªº®É¶¡¼Æ¦r"
 
-#: timezone/zic.c:1370
+#: timezone/zic.c:1369
 msgid "invalid weekday name"
 msgstr "µL®Äªº¤u§@¤é (weekday) ¦WºÙ"
 
-#: nscd/connections.c:469
-msgid "key length in request too long: %zd"
-msgstr "¦b¦¹½Ð¨D°T¸¹¤¤¨Ï¥ÎªºÁä­È¤Óªø¤F: %zd"
+#: nscd/connections.c:470
+#, c-format
+msgid "key length in request too long: %d"
+msgstr "¦b¦¹½Ð¨D¤¤¨Ï¥ÎªºÁä­È¤Óªø¤F: %d"
 
-#: elf/ldconfig.c:606
+#: elf/ldconfig.c:738
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "libc4 ¨ç¦¡®w %s Â\¿ù¥Ø¿ý¤F"
 
-#: elf/ldconfig.c:600
+#: elf/ldconfig.c:732
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "libc5 ¨ç¦¡®w %s Â\¿ù¥Ø¿ý¤F"
 
-#: elf/ldconfig.c:603
+#: elf/ldconfig.c:735
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "libc6 ¨ç¦¡®w %s Â\¿ù¥Ø¿ý¤F"
 
-#: elf/ldconfig.c:633
+#: elf/ldconfig.c:765
 #, c-format
 msgid ""
 "libraries %s and %s in directory %s have same soname but different type."
-msgstr "¨ç¦¡®w %s ¸ò %s (¦b¥Ø¿ý %s ©³¤U) ¦³¦@¦Pªº¦@¥Î¨ç¦¡®w¦WºÙ¡A¤£¹L¨ä®æ¦¡«o¤£¦P"
+msgstr ""
+"¨ç¦¡®w %s ¸ò %s (¦b¥Ø¿ý %s ©³¤U) ¦³¦@¦Pªº¦@¥Î¨ç¦¡®w¦WºÙ¡A¤£¹L¨ä®æ¦¡«o¤£¦P"
 
-#: timezone/zic.c:831
+#: timezone/zic.c:830
 msgid "line too long"
 msgstr "¦æªºªø«×¹Lªø"
 
@@ -4775,7 +4779,7 @@ msgstr "¦C¥X©Ò¦³¤wª¾ªº½s½X¦r¤¸¶°"
 
 #: locale/programs/locfile.h:63
 msgid "locale name should consist only of portable characters"
-msgstr "locale ªº¦WºÙÀ³¸Ó¥Îªx¥Î¦r¤¸ (portable characters) ²Õ¦¨"
+msgstr "°Ï°ì¤Æ¸ê®Æ®w (locale) ªº¦WºÙÀ³¸Ó¥Îªx¥Î¦r¤¸ (portable characters) ²Õ¦¨"
 
 #: inet/rcmd.c:413
 msgid "lstat failed"
@@ -4789,7 +4793,7 @@ msgstr "³]©w¿é¥Xªº¹Ï§Î°ª«×¬° VALUE ­Ó¹³¯À"
 msgid "make output graphic VALUE pixel wide"
 msgstr "³]©w¿é¥Xªº¹Ï§Î¼e«×¬° VALUE ­Ó¹³¯À"
 
-#: catgets/gencat.c:625
+#: catgets/gencat.c:780
 msgid "malformed line ignored"
 msgstr "©¿²¤©_©Çªº¦æ"
 
@@ -4810,7 +4814,7 @@ msgid "memory clobbered past end of allocated block\n"
 msgstr "°O¾ÐÅé¦b¸g¹L°t¸mªº°Ï¶ô§À³¡®É clobbered ¤F\n"
 
 #: locale/programs/locfile.c:334 locale/programs/xmalloc.c:70
-#: malloc/obstack.c:471 posix/getconf.c:809
+#: malloc/obstack.c:477 posix/getconf.c:809
 msgid "memory exhausted"
 msgstr "°O¾ÐÅé¯ÓºÉ"
 
@@ -4818,15 +4822,15 @@ msgstr "°O¾ÐÅé¯ÓºÉ"
 msgid "memory is consistent, library is buggy\n"
 msgstr "°O¾ÐÅ餺®e¤@­P¡A¨ç¦¡®w¦³°ÝÃD\n"
 
-#: elf/cache.c:115
+#: elf/cache.c:120
 msgid "mmap of cache file failed.\n"
 msgstr "§Ö¨úÀÉ®× mmap ¥¢±Ñ¡C\n"
 
-#: elf/../sysdeps/generic/readelflib.c:107
+#: elf/../sysdeps/generic/readelflib.c:108
 msgid "more than one dynamic segment\n"
 msgstr "¶W¹L¤@­Óªº°ÊºA°Ï¬q\n"
 
-#: timezone/zic.c:954
+#: timezone/zic.c:953
 msgid "nameless rule"
 msgstr "³W«h¨S¦³¦WºÙ"
 
@@ -4875,11 +4879,11 @@ msgstr "¤d¸U¤£­nµù¥Uµ{¦¡ %d\n"
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "¨S¦³µ¹©w <Uxxxx> ©Î <Uxxxxxxxx> ªº­È"
 
-#: timezone/zic.c:2143
+#: timezone/zic.c:2142
 msgid "no day in month matches rule"
 msgstr "¦b¤ë¥÷¸ê®Æ¤¤§ä¤£¨ì²Å¦X³W«hªº¤é¼Æ"
 
-#: locale/programs/ld-collate.c:1814
+#: locale/programs/ld-collate.c:1757
 msgid "no definition of `UNDEFINED'"
 msgstr "¨S¦³§ä¨ì `UNDEFINED' ªº©w¸q"
 
@@ -4889,7 +4893,7 @@ msgid ""
 "no filename for profiling data given and shared object `%s' has no soname"
 msgstr "¨S¦³µ¹¤©´ú¸Õ¸ê®ÆªºÀɦW¡A¦Ó¥B¦@¥Î¥ØªºÀÉ `%s' ¤]¨S¦³¦@¥Î¨ç¦¡®w¦WºÙ"
 
-#: locale/programs/ld-ctype.c:716
+#: locale/programs/ld-ctype.c:739
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr "¨S¦³©w¸q¿é¤J¼Æ¦r¡A¦b¦r¶°¹ï·ÓÀɤ¤¤]§ä¤£¨ì¬Û²Åªº¼Ð·Ç¦WºÙ"
 
@@ -4897,33 +4901,33 @@ msgstr "¨S¦³©w¸q¿é¤J¼Æ¦r¡A¦b¦r¶°¹ï·ÓÀɤ¤¤]§ä¤£¨ì¬Û²Åªº¼Ð·Ç¦WºÙ"
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr "¨Ï¥Î `copy' ªº®É­Ô¤£À³¸Ó¦A¥Î¨ì¥ô¦ó¨ä¥LªºÃöÁä¦r¤F"
 
-#: locale/programs/ld-ctype.c:3236
+#: locale/programs/ld-ctype.c:3349
 msgid "no output digits defined and none of the standard names in the charmap"
 msgstr "¨S¦³©w¸q¿é¥X¼Æ¦r¡A¦b¦r¶°¹ï·ÓÀɤ¤¤]§ä¤£¨ì¬Û²Åªº¼Ð·Ç¦WºÙ"
 
-#: locale/programs/localedef.c:231
+#: locale/programs/localedef.c:236
 msgid "no output file produced because warning were issued"
 msgstr "¦]¬°µo¥X¹Lĵ§i°T®§¡A©Ò¥H¨S¦³»s³y¥ô¦ó¿é¥XÀÉ"
 
-#: locale/programs/charmap.c:451 locale/programs/charmap.c:631
-#: locale/programs/charmap.c:727 locale/programs/repertoire.c:231
+#: locale/programs/charmap.c:488 locale/programs/charmap.c:668
+#: locale/programs/charmap.c:764 locale/programs/repertoire.c:231
 msgid "no symbolic name given"
 msgstr "¨S¦³µ¹¤©²Å¸¹¦WºÙ"
 
-#: locale/programs/charmap.c:538 locale/programs/charmap.c:686
-#: locale/programs/charmap.c:769 locale/programs/repertoire.c:297
+#: locale/programs/charmap.c:575 locale/programs/charmap.c:723
+#: locale/programs/charmap.c:806 locale/programs/repertoire.c:297
 msgid "no symbolic name given for end of range"
 msgstr "¨S¦³µ¹¦¹°Ïªº³Ì«á¤@­Ó¦r¤¸²Å¸¹¦WºÙ"
 
-#: locale/programs/linereader.c:634
+#: locale/programs/linereader.c:641
 msgid "non-symbolic character value should not be used"
 msgstr "«D²Å¸¹©Êªº¦r¤¸­È¤£À³¸Ó³Q¨Ï¥Î¤~¹ï"
 
-#: locale/programs/ld-ctype.c:781
+#: locale/programs/ld-ctype.c:804
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr "¦b¦r¶°¹ï·Óªí¤¤µLªk§ä¨ì¬Y¨Ç¦b `outdigit' ¤¤¥Î¨ìªº¦r¤¸"
 
-#: locale/programs/ld-ctype.c:798
+#: locale/programs/ld-ctype.c:821
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr "¦b½s½X¹ï¬MÀɤ¤µLªk§ä¨ì¬Y¨Ç¦b `outdigit' ¤¤¥Î¨ìªº¦r¤¸"
 
@@ -4946,7 +4950,7 @@ msgstr ""
 msgid "nscd not running!\n"
 msgstr "nscd ¨Ã¨S¦³¦b°õ¦æ!\n"
 
-#: elf/dl-load.c:1062
+#: elf/dl-load.c:1051
 msgid "object file has no dynamic section"
 msgstr "¦@¥Î¥ØªºÀɤ¤¨S¦³°ÊºA¸`°Ï"
 
@@ -4954,11 +4958,15 @@ msgstr "¦@¥Î¥ØªºÀɤ¤¨S¦³°ÊºA¸`°Ï"
 msgid "omit invalid characters from output"
 msgstr "¬Ù²¤µL®Ä¦r¤¸ªº¿é¥X"
 
-#: locale/programs/charmap.c:595
+#: elf/dl-load.c:1311
+msgid "only ET_DYN and ET_EXEC can be loaded"
+msgstr "¥u¦³ ET_DYN ¥H¤Î ET_EXEC ¥i¥H¸ü¤J"
+
+#: locale/programs/charmap.c:632
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr "¥u¦³ WIDTH ©w¸q¤~¯àª½±µ¼g¦b CHARMAP ©w¸q¤§«á"
 
-#: locale/programs/ld-collate.c:968 locale/programs/ld-collate.c:1134
+#: locale/programs/ld-collate.c:1005 locale/programs/ld-collate.c:1175
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "`%.*s' ªº¶¶§Ç¤w¸g¦b %s:%Zu ¸Ì­±©w¸q¤F"
@@ -4983,7 +4991,7 @@ msgstr "pmap_getmaps »·ºÝµ{§Ç©I¥s°ÝÃD"
 msgid "poll: protocol failure in circuit setup\n"
 msgstr "poll: ³q°T¨ó©w¦b³]©w½u¸ô®É¥¢®Ä\n"
 
-#: locale/programs/ld-ctype.c:1917 locale/programs/ld-ctype.c:1968
+#: locale/programs/ld-ctype.c:1949 locale/programs/ld-ctype.c:2000
 msgid "premature end of `translit_ignore' definition"
 msgstr "`translit_ignore' ©w¸q¨S¦³«ö®Éµ²§ô"
 
@@ -4991,7 +4999,7 @@ msgstr "`translit_ignore' ©w¸q¨S¦³«ö®Éµ²§ô"
 msgid "preprocessor error"
 msgstr "«e¸m³B²z¾¹¿ù»~"
 
-#: locale/programs/ld-ctype.c:2647
+#: locale/programs/ld-ctype.c:2731
 msgid "previous definition was here"
 msgstr "¥ý«eªº³]©w¦b¦¹"
 
@@ -5003,11 +5011,6 @@ msgstr "¦C¥X­p¼Æªº¸ô®|¥H¤Î¥¦­Ì¨Ï¥Îªº¦¸¼Æ"
 msgid "print progress information"
 msgstr "¦L¥Xµ{§Ç¬ÛÃö¸ê°T"
 
-#: nss/makedb.c:347
-#, c-format
-msgid "problems while reading `%s'"
-msgstr "¥¿¦bŪ¨ú `%s' ®Éµo¥Í°ÝÃD"
-
 #: elf/sprof.c:687
 #, c-format
 msgid "profiling data file `%s' does not match shared object `%s'"
@@ -5053,7 +5056,7 @@ msgstr "rcmd: write (¥¿¦b³]©w¼Ð·Ç¿ù»~¿é¥X): %m\n"
 msgid "registerrpc: out of memory\n"
 msgstr "registerrpc: °O¾ÐÅ餣¨¬\n"
 
-#: timezone/zic.c:1875
+#: timezone/zic.c:1874
 msgid "repeated leap second moment"
 msgstr "­«½Æªº¶|¬í³]©w"
 
@@ -5062,15 +5065,15 @@ msgstr "­«½Æªº¶|¬í³]©w"
 msgid "repertoire map file `%s' not found"
 msgstr "§ä¤£¨ì½s½X¹ï¬MÀÉ `%s'"
 
-#: locale/programs/charmap.c:1026
+#: locale/programs/charmap.c:1063
 msgid "resulting bytes for range not representable."
 msgstr "¥Î¨Ó©w¸q½d³òªº¦ì¤¸²ÕµLªk³Qªí­z¥X¨Ó"
 
-#: sunrpc/rpc_main.c:1120
+#: sunrpc/rpc_main.c:1117
 msgid "rpcgen: arglist coding error\n"
 msgstr "rpcgen: arglist ½s½X¿ù»~\n"
 
-#: sunrpc/rpc_main.c:1108
+#: sunrpc/rpc_main.c:1105
 msgid "rpcgen: too many defines\n"
 msgstr "rpcgen: ¤Ó¦h define ¤F\n"
 
@@ -5098,29 +5101,29 @@ msgstr "rpcinfo: ¼s¼½¥¢±Ñ: %s\n"
 msgid "rpcinfo: can't contact portmapper"
 msgstr "rpcinfo: µLªk«Ø¥ß¸ò portmapper ¤§¶¡ªº³s½u"
 
-#: timezone/zic.c:744 timezone/zic.c:746
+#: timezone/zic.c:743 timezone/zic.c:745
 msgid "same rule name in multiple files"
 msgstr "¦b¦h­ÓÀɮ׸̭±¦³¬Û¦Pªº³W«h¦WºÙ"
 
-#: elf/dl-load.c:1126
+#: elf/dl-load.c:1116
 msgid "shared object cannot be dlopen()ed"
 msgstr "¦@¥Î¥ØªºÀɵLªk³Q dlopen()"
 
-#: elf/dl-close.c:57
+#: elf/dl-close.c:63
 msgid "shared object not open"
 msgstr "¦@¥Î¥ØªºÀɮרS¦³¶}±Ò"
 
-#: nscd/connections.c:481
+#: nscd/connections.c:482
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "Ū¨ú½Ð¨DªºÁä­È®Éµo²{¿é¤J­È¹Lµu: %s"
 
-#: nscd/connections.c:435
+#: nscd/connections.c:436
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "Ū¨ú½Ð¨D®Éµo²{¿é¤J­È¹Lµu: %s"
 
-#: nscd/grpcache.c:192 nscd/hstcache.c:278 nscd/pwdcache.c:189
+#: nscd/grpcache.c:193 nscd/hstcache.c:278 nscd/pwdcache.c:189
 #, c-format
 msgid "short write in %s: %s"
 msgstr "¼g¤J %s ªº¸ê®Æ¹Lµu: %s"
@@ -5129,78 +5132,75 @@ msgstr "¼g¤J %s ªº¸ê®Æ¹Lµu: %s"
 msgid "socket: protocol failure in circuit setup\n"
 msgstr "socket: ³q°T¨ó©w¦b³]©w½u¸ô®É¥¢®Ä\n"
 
-#: timezone/zic.c:815
+#: timezone/zic.c:814
 msgid "standard input"
 msgstr "¼Ð·Ç¿é¤J"
 
-#: timezone/zdump.c:268
+#: timezone/zdump.c:269
 msgid "standard output"
 msgstr "¼Ð·Ç¿é¥X"
 
-#: locale/programs/ld-ctype.c:1648
+#: locale/programs/ld-ctype.c:1680
 msgid "start and end character sequence of range must have the same length"
 msgstr "±q°_©l¨ìµ²§ô¤§¶¡ªº¦r¤¸§Ç¦Cªø«×¸ò½s½X½d³ò¥²¶·¬Û¦P"
 
-#: timezone/zic.c:1326
+#: timezone/zic.c:1325
 msgid "starting year greater than ending year"
 msgstr "°_©l¦~¥÷¤ñµ²§ô¦~¥÷ÁÙ­n¤j"
 
-#: timezone/zic.c:1298 timezone/zic.c:1323
+#: timezone/zic.c:1297 timezone/zic.c:1322
 msgid "starting year too high to be represented"
 msgstr "°_©l¦~¥÷¤Ó°ª¡AµLªkªí¥Ü"
 
-#: timezone/zic.c:1296 timezone/zic.c:1321
+#: timezone/zic.c:1295 timezone/zic.c:1320
 msgid "starting year too low to be represented"
 msgstr "°_©l¦~¥÷¤Ó§C¡AµLªkªí¥Ü"
 
 #: iconv/iconv_prog.c:63
-msgid "supress warnings"
-msgstr "©¿²¤Äµ§i°T®§"
+msgid "suppress warnings"
+msgstr "°±¤î¿é¥Xĵ§i°T®§"
 
 #: sunrpc/svc_run.c:76
 msgid "svc_run: - poll failed"
 msgstr "svc_run: - poll ¥¢±Ñ"
 
-#: sunrpc/svc_tcp.c:161 sunrpc/svc_tcp6.c:161
+#: sunrpc/svc_tcp.c:161
 msgid "svc_tcp.c - cannot getsockname or listen"
 msgstr "svc_tcp.c - µLªk getsockname ©Î listen"
 
-#: sunrpc/svc_tcp.c:146 sunrpc/svc_tcp6.c:146
+#: sunrpc/svc_tcp.c:146
 msgid "svc_tcp.c - tcp socket creation problem"
 msgstr "svc_tcp.c - tcp socket «Ø¥ßµo¥Í°ÝÃD"
 
-#: sunrpc/svc_tcp.c:210 sunrpc/svc_tcp.c:216 sunrpc/svc_tcp6.c:210
-#: sunrpc/svc_tcp6.c:216
+#: sunrpc/svc_tcp.c:210 sunrpc/svc_tcp.c:216
 msgid "svc_tcp: makefd_xprt: out of memory\n"
 msgstr "svc_tcp: makefd_xprt: °O¾ÐÅ餣¨¬\n"
 
-#: sunrpc/svc_unix.c:136
+#: sunrpc/svc_unix.c:137
 msgid "svc_unix.c - AF_UNIX socket creation problem"
 msgstr "svc_unix.c - AF_UNIX socket «Ø¥ß¦³°ÝÃD"
 
-#: sunrpc/svc_unix.c:152
+#: sunrpc/svc_unix.c:153
 msgid "svc_unix.c - cannot getsockname or listen"
 msgstr "svc_unix.c - µLªk getsockname ©Î listen"
 
-#: sunrpc/svc_unix.c:202 sunrpc/svc_unix.c:208
+#: sunrpc/svc_unix.c:203 sunrpc/svc_unix.c:209
 msgid "svc_unix: makefd_xprt: out of memory\n"
 msgstr "svc_unix: makefd_xprt: °O¾ÐÅ餣¨¬\n"
 
-#: sunrpc/svc_tcp.c:169 sunrpc/svc_tcp.c:177 sunrpc/svc_tcp6.c:169
-#: sunrpc/svc_tcp6.c:177
+#: sunrpc/svc_tcp.c:169 sunrpc/svc_tcp.c:177
 msgid "svctcp_create: out of memory\n"
 msgstr "svctcp_create: °O¾ÐÅ餣¨¬\n"
 
-#: sunrpc/svc_udp.c:141 sunrpc/svc_udp6.c:136
+#: sunrpc/svc_udp.c:141
 msgid "svcudp_create - cannot getsockname"
 msgstr "svcudp_create - µLªk getsockname"
 
 #: sunrpc/svc_udp.c:149 sunrpc/svc_udp.c:155 sunrpc/svc_udp.c:161
-#: sunrpc/svc_udp6.c:144 sunrpc/svc_udp6.c:150 sunrpc/svc_udp6.c:156
 msgid "svcudp_create: out of memory\n"
 msgstr "svcudp_create: °O¾ÐÅ餣¨¬\n"
 
-#: sunrpc/svc_udp.c:127 sunrpc/svc_udp6.c:122
+#: sunrpc/svc_udp.c:127
 msgid "svcudp_create: socket creation problem"
 msgstr "svcudp_create: socket «Ø¥ß¦³°ÝÃD"
 
@@ -5208,54 +5208,49 @@ msgstr "svcudp_create: socket «Ø¥ß¦³°ÝÃD"
 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
 msgstr "svcudp_create: xp_pad ¤Ó¤p¥H­P©óµLªk IP_PKTINFO\n"
 
-#: sunrpc/svc_unix.c:161 sunrpc/svc_unix.c:169
+#: sunrpc/svc_unix.c:162 sunrpc/svc_unix.c:170
 msgid "svcunix_create: out of memory\n"
 msgstr "svcunix_create: °O¾ÐÅ餣¨¬\n"
 
-#: locale/programs/linereader.c:749
+#: locale/programs/linereader.c:745
 #, c-format
 msgid "symbol `%.*s' not in charmap"
 msgstr "²Å¸¹ `%.*s' ¨Ã¤£¦b¦r¶°¹ï·Óªí¤¤"
 
-#: locale/programs/linereader.c:770
+#: locale/programs/linereader.c:766
 #, c-format
 msgid "symbol `%.*s' not in repertoire map"
 msgstr "²Å¸¹ `%.*s' ¨Ã¤£¦b½s½X¹ï¬MÀɤ¤"
 
-#: locale/programs/ld-collate.c:1577 locale/programs/ld-collate.c:1778
+#: locale/programs/ld-collate.c:1617 locale/programs/ld-collate.c:1716
 #, c-format
 msgid "symbol `%s'"
 msgstr "²Å¸¹ `%s'"
 
-#: locale/programs/ld-collate.c:1574 locale/programs/ld-collate.c:1775
+#: locale/programs/ld-collate.c:1614 locale/programs/ld-collate.c:1713
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "¸ò²Å¸¹ `%s' ¦³¬Û¦Pªº½s½X: "
 
-#: locale/programs/ld-collate.c:1499
+#: locale/programs/ld-collate.c:1539
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "¨Ã¥¼©w¸q `%s' ²Å¸¹"
 
-#: locale/programs/linereader.c:725
-#, c-format
-msgid "symbol `%s' not in charmap"
-msgstr "²Å¸¹`%s' ¨Ã¤£¦b¦r¶°¹ï·Óªí¤¤"
-
-#: locale/programs/ld-ctype.c:1923 locale/programs/ld-ctype.c:1974
-#: locale/programs/ld-ctype.c:2016
+#: locale/programs/ld-ctype.c:1955 locale/programs/ld-ctype.c:2006
+#: locale/programs/ld-ctype.c:2048
 msgid "syntax error"
 msgstr "»yªk¿ù»~"
 
-#: locale/programs/charmap.c:450 locale/programs/charmap.c:504
-#: locale/programs/charmap.c:536 locale/programs/charmap.c:630
-#: locale/programs/charmap.c:685 locale/programs/charmap.c:726
-#: locale/programs/charmap.c:767
+#: locale/programs/charmap.c:487 locale/programs/charmap.c:541
+#: locale/programs/charmap.c:573 locale/programs/charmap.c:667
+#: locale/programs/charmap.c:722 locale/programs/charmap.c:763
+#: locale/programs/charmap.c:804
 #, c-format
 msgid "syntax error in %s definition: %s"
 msgstr "©w¸q %s ªº»yªk¿ù»~: %s"
 
-#: locale/programs/charmap.c:309 locale/programs/charmap.c:326
+#: locale/programs/charmap.c:346 locale/programs/charmap.c:363
 #: locale/programs/repertoire.c:175
 #, c-format
 msgid "syntax error in prolog: %s"
@@ -5269,58 +5264,58 @@ msgstr "½s½X¹ï¬MÀɤ¤ªº©w¸q¦³»yªk¿ù»~: %s"
 
 #: locale/programs/locfile.c:243
 msgid "syntax error: not inside a locale definition section"
-msgstr "»yªk¿ù»~: ¤£¯à¦b locale ©w¸q°Ï¶ô¸Ì­±¨Ï¥Î"
+msgstr "»yªk¿ù»~: ¤£¯à¦b°Ï°ì¤Æ¸ê®Æ®w (locale) ©w¸q°Ï¶ô¸Ì­±¨Ï¥Î"
 
 #: iconv/iconv_prog.c:143
 msgid "target encoding not specified using `-t'"
 msgstr "¨S¦³¥Î `-t' «ü©w¥Ø¼Ð½s½X"
 
-#: catgets/gencat.c:391 catgets/gencat.c:530 catgets/gencat.c:559
+#: catgets/gencat.c:432 catgets/gencat.c:605 catgets/gencat.c:634
 msgid "this is the first definition"
 msgstr "¦¹¬°²Ä¤@­Ó©w¸q"
 
-#: timezone/zic.c:1158
+#: timezone/zic.c:1157
 msgid "time before zero"
 msgstr "¦b¹s¤§«eªº®É¶¡"
 
-#: timezone/zic.c:1166 timezone/zic.c:2043 timezone/zic.c:2062
+#: timezone/zic.c:1165 timezone/zic.c:2042 timezone/zic.c:2061
 msgid "time overflow"
 msgstr "®É¶¡·¸¦ì"
 
-#: locale/programs/ld-ctype.c:1521 locale/programs/ld-ctype.c:1997
+#: locale/programs/ld-ctype.c:1553 locale/programs/ld-ctype.c:2029
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr "°Ï°ì©w¸qªºµ²§À­È <U%0*X> ¤ñ°_©l­È <U%0*X> ÁÙ­n¤p"
 
-#: locale/programs/ld-ctype.c:1655
+#: locale/programs/ld-ctype.c:1687
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr "¦r¤¸§Ç¦C©w¸qªºµ²§À­È¤ñ°_©l­ÈÁÙ­n¤p"
 
-#: locale/programs/charmap.c:514
+#: locale/programs/charmap.c:551
 msgid "too few bytes in character encoding"
 msgstr "¦r¤¸©w¸q¤¤ªº¦ì¤¸²Õ¤Ó¤Ö¤F"
 
-#: locale/programs/charmap.c:516
+#: locale/programs/charmap.c:553
 msgid "too many bytes in character encoding"
 msgstr "¦r¤¸©w¸q¤¤ªº¦ì¤¸²Õ¤Ó¦h¤F"
 
-#: timezone/zic.c:1869
+#: timezone/zic.c:1868
 msgid "too many leap seconds"
 msgstr "¤Ó¦h¶|¬í¤F"
 
-#: timezone/zic.c:1841
+#: timezone/zic.c:1840
 msgid "too many local time types"
 msgstr "¤Ó¦h¥»¦a®É¶¡®æ¦¡¤F"
 
-#: timezone/zic.c:1795
+#: timezone/zic.c:1794
 msgid "too many transitions?!"
 msgstr "¤Ó¦h®É¶¡Âà´«¤F?!"
 
-#: timezone/zic.c:2166
+#: timezone/zic.c:2165
 msgid "too many, or too long, time zone abbreviations"
 msgstr "®É°ÏÁY¼g¤Ó¦h©ÎªÌ¤Óªø¤F"
 
-#: locale/programs/linereader.h:156
+#: locale/programs/linereader.h:157
 msgid "trailing garbage at end of line"
 msgstr "¦æµ²§ÀªºµL¥Î¦r¤¸"
 
@@ -5329,7 +5324,7 @@ msgstr "¦æµ²§ÀªºµL¥Î¦r¤¸"
 msgid "trouble replying to prog %d\n"
 msgstr "¦^À³µ{¦¡ %d ®Éµo¥Í§xÃø\n"
 
-#: timezone/zic.c:1333
+#: timezone/zic.c:1332
 msgid "typed single year"
 msgstr "¿é¤Jªº¦~¥÷¬O¦P¤@¦~"
 
@@ -5345,12 +5340,12 @@ msgstr "µLªkÄÀ©ñ°Ñ¼Æ"
 msgid "undefined"
 msgstr "¥¼©w¸q"
 
-#: locale/programs/charmap.c:819 locale/programs/charmap.c:830
+#: locale/programs/charmap.c:856 locale/programs/charmap.c:867
 #, c-format
 msgid "unknown character `%s'"
 msgstr "¤£©úªº¦r¤¸ `%s'"
 
-#: catgets/gencat.c:488
+#: catgets/gencat.c:562
 #, c-format
 msgid "unknown directive `%s': line ignored"
 msgstr "¤£©úªº«ü¥O `%s': ¦¹¦æ©¿²¤"
@@ -5360,20 +5355,20 @@ msgstr "¤£©úªº«ü¥O `%s': ¦¹¦æ©¿²¤"
 msgid "unknown iconv() error %d"
 msgstr "¤£©úªº iconv() ¿ù»~ %d"
 
-#: catgets/gencat.c:467
+#: catgets/gencat.c:508
 #, c-format
 msgid "unknown set `%s'"
 msgstr "¤£©úªº¶°¦X `%s'"
 
-#: timezone/zic.c:787
+#: timezone/zic.c:786
 msgid "unruly zone"
 msgstr "¨S¦³³W«hªº®É°Ï"
 
-#: catgets/gencat.c:977
+#: catgets/gencat.c:1169
 msgid "unterminated message"
 msgstr "¨S¦³µ²§Àªº°T®§"
 
-#: locale/programs/linereader.c:592 locale/programs/linereader.c:788
+#: locale/programs/linereader.c:599 locale/programs/linereader.c:784
 msgid "unterminated string"
 msgstr "¨S¦³µ²§Àªº¦r¦ê"
 
@@ -5381,11 +5376,11 @@ msgstr "¨S¦³µ²§Àªº¦r¦ê"
 msgid "unterminated string constant"
 msgstr "¨S¦³µ²§Àªº¦r¦ê±`¼Æ"
 
-#: locale/programs/linereader.c:462
+#: locale/programs/linereader.c:469
 msgid "unterminated symbolic name"
 msgstr "¨S¦³µ²§Àªº²Å¸¹¦WºÙ"
 
-#: locale/programs/charmap.c:968
+#: locale/programs/charmap.c:1005
 msgid "upper limit in range is not higher then lower limit"
 msgstr "°Ï°ì©w¸q¤¤ªº³Ì¤j­È¨S¦³¤ñ³Ì¤p­ÈÁÙ­n¤j"
 
@@ -5393,40 +5388,40 @@ msgstr "°Ï°ì©w¸q¤¤ªº³Ì¤j­È¨S¦³¤ñ³Ì¤p­ÈÁÙ­n¤j"
 msgid "upper limit in range is not smaller then lower limit"
 msgstr "°Ï°ì©w¸q¤¤ªº³Ì¤j­È¨S¦³¤ñ³Ì¤p­ÈÁÙ­n¤p"
 
-#: sunrpc/rpc_main.c:1429
+#: sunrpc/rpc_main.c:1424
 #, c-format
 msgid "usage: %s infile\n"
 msgstr "¥Îªk: %s infile\n"
 
-#: timezone/zic.c:2109
+#: timezone/zic.c:2108
 msgid "use of 2/29 in non leap-year"
 msgstr "¦b«D¶|¦~®É¥Î¨ì 2/29 ¤é"
 
-#: locale/programs/charmap.c:603 locale/programs/charmap.c:666
+#: locale/programs/charmap.c:640 locale/programs/charmap.c:703
 #, c-format
 msgid "value for %s must be an integer"
 msgstr "%s ªº­È¥²¶·¬O¾ã¼Æ¤~¦æ"
 
-#: locale/programs/charmap.c:362
+#: locale/programs/charmap.c:399
 #, c-format
 msgid "value for <%s> must be 1 or greater"
 msgstr "<%s> ªº­È¥²¶·¬° 1 ©ÎªÌ§ó¤j"
 
-#: locale/programs/charmap.c:374
+#: locale/programs/charmap.c:411
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "<%s> ªº­È¥²¶·µ¥©ó©Î¤j©ó <%s> ªº­È"
 
-#: timezone/zic.c:435
+#: timezone/zic.c:433
 msgid "warning: "
 msgstr "ĵ§i: "
 
-#: nscd/connections.c:426
+#: nscd/connections.c:427
 #, c-format
 msgid "while accepting connection: %s"
 msgstr "¦b±µ¨ü³s½u®É: %s"
 
-#: nscd/grpcache.c:149 nscd/hstcache.c:165 nscd/pwdcache.c:143
+#: nscd/grpcache.c:150 nscd/hstcache.c:165 nscd/pwdcache.c:143
 msgid "while allocating cache entry"
 msgstr "¦b°t¸m§Ö¨ú¶µ¥Ø®É"
 
@@ -5434,41 +5429,33 @@ msgstr "¦b°t¸m§Ö¨ú¶µ¥Ø®É"
 msgid "while allocating hash table entry"
 msgstr "¦b°t¸m hash ªí®æ¶µ¥Ø®É"
 
-#: nscd/grpcache.c:99 nscd/hstcache.c:108 nscd/pwdcache.c:106
+#: nscd/grpcache.c:100 nscd/hstcache.c:108 nscd/pwdcache.c:106
 msgid "while allocating key copy"
 msgstr "¦b°t¸mÁä­È°Æ¥»®É"
 
-#: catgets/gencat.c:1007
+#: catgets/gencat.c:1199
 msgid "while opening old catalog file"
 msgstr "¦b¶}±ÒªºÃþ§OÀÉ®×®É"
 
-#: locale/programs/locale.c:359
+#: locale/programs/locale.c:361
 msgid "while preparing output"
 msgstr "¦b·Ç³Æ¿é¥X®É"
 
-#: nss/makedb.c:367 nss/makedb.c:384
-msgid "while reading database"
-msgstr "¦bŪ¨ú¸ê®Æ®w®É"
-
 #: elf/sprof.c:679
 msgid "while stat'ing profiling data file"
 msgstr "¦b¹ï´ú¸Õ¸ê®ÆÀɮ׶i¦æ²Î­pªº®É­Ô"
 
-#: nss/makedb.c:336
-msgid "while writing database file"
-msgstr "¦b¼g¤J¸ê®Æ®wÀÉ®×®É"
-
-#: locale/programs/ld-ctype.c:2320
+#: locale/programs/ld-ctype.c:2392
 msgid ""
 "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr "¥Î¨Ó«ü©w UCS ­Èªº½d³ò®É±o¥Î¤Q¤»¶i¦ìªí¥Üªº¬Ù²¤²Å¸¹ `..'"
 
-#: locale/programs/ld-ctype.c:2334
+#: locale/programs/ld-ctype.c:2406
 msgid ""
 "with character code range values one must use the absolute ellipsis `...'"
 msgstr "¥Î¨Ó«ü©w¦r¤¸½s½X­Èªº½d³ò®É±o¥Îµ´¹ï¦ì¸mªº¬Ù²¤²Å¸¹ `...'"
 
-#: locale/programs/ld-ctype.c:2305
+#: locale/programs/ld-ctype.c:2377
 msgid ""
 "with symbolic name range values the absolute ellipsis `...' must not be used"
 msgstr "¥Î²Å¸¹¦WºÙ¨Ó«ü©w¦r¤¸½s½X½d³ò®É¤£¥i¥H¥Îµ´¹ï¦ì¸mªº¬Ù²¤²Å¸¹ `...'"
@@ -5481,27 +5468,27 @@ msgstr "¼g¤J¤£§¹¥þ"
 msgid "writeable by other than owner"
 msgstr "¨Ï¥ÎªÌ¥H¥~ªº¤H¥ç¥i¼g¤J"
 
-#: nscd/nscd.c:123 nscd/nscd_nischeck.c:64 nss/getent.c:400 nss/makedb.c:123
+#: nscd/nscd.c:123 nscd/nscd_nischeck.c:64 nss/getent.c:761
 msgid "wrong number of arguments"
 msgstr "°Ñ¼Æ¼Æ¥Ø¤£¹ï"
 
-#: timezone/zic.c:1116
+#: timezone/zic.c:1115
 msgid "wrong number of fields on Leap line"
 msgstr "¶|®É³]©w¦æªºÄæ¦ì¼Æ¥Ø¿ù»~"
 
-#: timezone/zic.c:1207
+#: timezone/zic.c:1206
 msgid "wrong number of fields on Link line"
 msgstr "³sµ²³]©w¦æªºÄæ¦ì¼Æ¥Ø¿ù»~"
 
-#: timezone/zic.c:950
+#: timezone/zic.c:949
 msgid "wrong number of fields on Rule line"
 msgstr "³W«h³]©w¦æªºÄæ¦ì¼Æ¥Ø¿ù»~"
 
-#: timezone/zic.c:1020
+#: timezone/zic.c:1019
 msgid "wrong number of fields on Zone continuation line"
 msgstr "®É°Ï±µÄò¦æªºÄæ¦ì¼Æ¥Ø¤£¹ï"
 
-#: timezone/zic.c:978
+#: timezone/zic.c:977
 msgid "wrong number of fields on Zone line"
 msgstr "®É°Ï³]©w¦æªºÄæ¦ì¼Æ¥Ø¿ù»~"
 
@@ -5521,5 +5508,3 @@ msgstr "yp_update: µLªkÂà´«¥D¾÷ªººô¸ô¦WºÙ\n"
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: µLªk¨ú±o¦øªA¾¹¦ì§}\n"
 
-#~ msgid "%s: cannot get modification time"
-#~ msgstr ""