This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
GNU C Library master sources branch master updated. glibc-2.17-781-g3ee7e9f

From: aj at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 11 Jun 2013 07:01:01 -0000
Subject: GNU C Library master sources branch master updated. glibc-2.17-781-g3ee7e9f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  3ee7e9fe34a96cfbf2d39879c21eb36e70471ad1 (commit)
      from  a214aecf82a90b06d5587458c0d2d4f1c3ba8002 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3ee7e9fe34a96cfbf2d39879c21eb36e70471ad1

commit 3ee7e9fe34a96cfbf2d39879c21eb36e70471ad1
Author: Andreas Jaeger <aj@suse.de>
Date:   Tue Jun 11 08:49:00 2013 +0200

    Update Chinese (traditional) translation from translation project

diff --git a/ChangeLog b/ChangeLog
index ded27a8..6444a89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-11  Andreas Jaeger  <aj@suse.de>
+
+	* po/zh_TW.po: Update Chinese (traditional) translation from
+	translation project.
+
 2013-06-11  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	* include/time.h (__clock_gettime): Add libc_hidden_proto.
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 60e1ccd..0caea22 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,14 +4,14 @@
 # Tung-Han Hsieh <thhsieh@linux.org.tw>, 2000.
 # Yuan-Chung Cheng <platin@ch.ntu.edu.tw>, 2000.
 # Wei-Lun Chao <william.chao@ossii.com.tw>, 2005, 2008, 2011.
-# Wei-Lun Chao <chaoweilun@gmail.com>, 2012.
+# Wei-Lun Chao <bluebat@member.fsf.org>, 2012, 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.14\n"
-"POT-Creation-Date: 2011-05-31 00:06-0400\n"
-"PO-Revision-Date: 2012-02-09 18:09+0800\n"
-"Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
+"Project-Id-Version: libc 2.17-pre1\n"
+"POT-Creation-Date: 2012-12-07 15:10-0500\n"
+"PO-Revision-Date: 2013-06-11 08:59+0200\n"
+"Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -19,86 +19,86 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: argp/argp-help.c:228
+#: argp/argp-help.c:227
 #, c-format
 msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 msgstr "%.*s: ARGP_HELP_FMT å??æ?¸é??è¦?ä¸?å??å?¼"
 
-#: argp/argp-help.c:238
+#: argp/argp-help.c:237
 #, c-format
 msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 msgstr "%.*s: æ?ªç?¥ç?? ARGP_HELP_FMT å??æ?¸"
 
-#: argp/argp-help.c:251
+#: argp/argp-help.c:250
 #, c-format
 msgid "Garbage in ARGP_HELP_FMT: %s"
 msgstr "ARGP_HELP_FMT ä¸ç?¡ç?¨ç??è³?è¨?: %s"
 
-#: argp/argp-help.c:1215
+#: argp/argp-help.c:1214
 msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
 msgstr "é?·é?¸é ?ç??å¿?é ?æ??å?¯é?¸ç?¨ç??å¼?æ?¸ä¹?æ?¯ç?¸å°?æ??ç?é?¸é ?ç??å¿?é ?æ??å?¯é?¸ç?¨ç??å¼?æ?¸ã??"
 
-#: argp/argp-help.c:1601
+#: argp/argp-help.c:1600
 msgid "Usage:"
 msgstr "ä½¿ç?¨æ?¹å¼?:"
 
-#: argp/argp-help.c:1605
+#: argp/argp-help.c:1604
 msgid "  or: "
 msgstr "  æ??è??: "
 
-#: argp/argp-help.c:1617
+#: argp/argp-help.c:1616
 msgid " [OPTION...]"
-msgstr " [å??æ?¸...]"
+msgstr " [å??æ?¸â?¦]"
 
-#: argp/argp-help.c:1644
+#: argp/argp-help.c:1643
 #, c-format
 msgid "Try `%s --help' or `%s --usage' for more information.\n"
 msgstr "è«?è©¦è??ç?¨ `%s --help' æ?? `%s --usage' ä¾?ç?²å¾?æ?´å¤?ç?¸é??è¨?æ?¯ã??\n"
 
-#: argp/argp-help.c:1672
+#: argp/argp-help.c:1671
 #, c-format
 msgid "Report bugs to %s.\n"
 msgstr "è«?å°?ç¨?å¼?å??é¡?å??å ±è?³ %sã??\n"
 
-#: argp/argp-parse.c:102
+#: argp/argp-parse.c:101
 msgid "Give this help list"
 msgstr "çµ¦å?ºé??å??ä½¿ç?¨æ?¹å¼?å??è¡¨"
 
-#: argp/argp-parse.c:103
+#: argp/argp-parse.c:102
 msgid "Give a short usage message"
 msgstr "çµ¦å?ºç°¡ç?ç??ä½¿ç?¨è¨?æ?¯"
 
-#: argp/argp-parse.c:104
+#: argp/argp-parse.c:103
 msgid "Set the program name"
 msgstr "è¨å®?ç¨?å¼?å??ç¨±"
 
-#: argp/argp-parse.c:106
+#: argp/argp-parse.c:105
 msgid "Hang for SECS seconds (default 3600)"
 msgstr "SECS ç§?å¾?æ??æ?· (é ?è¨æ?¯ 3600)"
 
-#: argp/argp-parse.c:167
+#: argp/argp-parse.c:166
 msgid "Print program version"
 msgstr "å?°å?ºç¨?å¼?ç??æ?¬"
 
-#: argp/argp-parse.c:183
+#: argp/argp-parse.c:182
 msgid "(PROGRAM ERROR) No version known!?"
 msgstr "(ç¨?å¼?é?¯èª¤) æ²?æ??èª?å¾?ç??ç??æ?¬!?"
 
-#: argp/argp-parse.c:623
+#: argp/argp-parse.c:622
 #, c-format
 msgid "%s: Too many arguments\n"
 msgstr "%s: å¤ªå¤?ç??å¼?æ?¸\n"
 
-#: argp/argp-parse.c:766
+#: argp/argp-parse.c:765
 msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(ç¨?å¼?é?¯èª¤) é?¸é ?æ??è©²å·²ç¶?å?¯è¾¨è?!?"
 
-#: assert/assert-perr.c:37
+#: assert/assert-perr.c:36
 #, c-format
 msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
 msgstr "%s%s%s:%u: %s%sç?¡æ³?é ?æ??ç??é?¯èª¤: %sã??\n"
 
-#: assert/assert.c:105
+#: assert/assert.c:101
 #, c-format
 msgid ""
 "%s%s%s:%u: %s%sAssertion `%s' failed.\n"
@@ -107,23 +107,23 @@ msgstr ""
 "%s%s%s:%uï¼?%s%så??è¨ã??%sã??å¤±æ??ã??\n"
 "%n"
 
-#: catgets/gencat.c:110 catgets/gencat.c:114 nscd/nscd.c:100 nss/makedb.c:61
+#: catgets/gencat.c:109 catgets/gencat.c:113 nscd/nscd.c:115 nss/makedb.c:119
 msgid "NAME"
 msgstr "å??ç¨±"
 
-#: catgets/gencat.c:111
+#: catgets/gencat.c:110
 msgid "Create C header file NAME containing symbol definitions"
 msgstr "ç?¢ç??ç?? C æ¨?é æª?å??å?§å?«ç¬¦è??å®?ç¾©"
 
-#: catgets/gencat.c:113
+#: catgets/gencat.c:112
 msgid "Do not use existing catalog, force new output file"
 msgstr "ä¸?ä½¿ç?¨ç?¾å?ç?? catalog, å¼·å?¶ä½¿ç?¨æ?°ç??è¼¸å?ºæª?"
 
-#: catgets/gencat.c:114 nss/makedb.c:61
+#: catgets/gencat.c:113 nss/makedb.c:119
 msgid "Write output to file NAME"
 msgstr "å°?è¼¸å?ºå¯«å?°æª?æ¡? NAME ä¸"
 
-#: catgets/gencat.c:119
+#: catgets/gencat.c:118
 msgid ""
 "Generate message catalog.\vIf INPUT-FILE is -, input is read from standard input.  If OUTPUT-FILE\n"
 "is -, output is written to standard output.\n"
@@ -131,7 +131,7 @@ msgstr ""
 "ç?¢ç??è¨?æ?¯ catelogã??\\vå¦?æ??è¼¸å?¥æª?å??æ?¯ -, å°?å¾?æ¨?æº?è¼¸å?¥è®?å??è¼¸å?¥ã??\n"
 "å¦?æ??è¼¸å?ºæª?å??æ?¯ -, å??è¼¸å?ºå°?å¯«å?°æ¨?æº?è¼¸å?ºå?»ã??\n"
 
-#: catgets/gencat.c:124
+#: catgets/gencat.c:123
 msgid ""
 "-o OUTPUT-FILE [INPUT-FILE]...\n"
 "[OUTPUT-FILE [INPUT-FILE]...]"
@@ -139,28 +139,28 @@ msgstr ""
 "-o è¼¸å?ºæª?æ¡?å??ç¨± [è¼¸å?¥æª?æ¡?å??ç¨±]...\n"
 "[è¼¸å?ºæª?æ¡?å??ç¨± [è¼¸å?¥æª?æ¡?å??ç¨±]...]"
 
-#: catgets/gencat.c:232 debug/pcprofiledump.c:208 debug/xtrace.sh:58
-#: elf/ldconfig.c:302 elf/ldd.bash.in:56 elf/sln.c:86 elf/sotruss.ksh:49
-#: elf/sprof.c:371 iconv/iconv_prog.c:408 iconv/iconvconfig.c:380
-#: locale/programs/locale.c:278 locale/programs/localedef.c:371
-#: login/programs/pt_chown.c:92 malloc/memusage.sh:65
-#: malloc/memusagestat.c:539 nscd/nscd.c:415 nss/getent.c:918 nss/makedb.c:231
-#: posix/getconf.c:1122 sunrpc/rpc_main.c:1492 sunrpc/rpcinfo.c:691
-#: sysdeps/unix/sysv/linux/lddlibc4.c:62
+#: catgets/gencat.c:235 debug/pcprofiledump.c:208 elf/ldconfig.c:302
+#: elf/pldd.c:222 elf/sln.c:85 elf/sprof.c:371 iconv/iconv_prog.c:408
+#: iconv/iconvconfig.c:383 locale/programs/locale.c:279
+#: locale/programs/localedef.c:363 login/programs/pt_chown.c:88
+#: malloc/memusagestat.c:536 nscd/nscd.c:459 nss/getent.c:965 nss/makedb.c:371
+#: posix/getconf.c:1121 sunrpc/rpcinfo.c:691
+#: sysdeps/unix/sysv/linux/lddlibc4.c:61
+#, c-format
 msgid ""
 "For bug reporting instructions, please see:\n"
-"<http://www.gnu.org/software/libc/bugs.html>.\n"
+"%s.\n"
 msgstr ""
-"ç?¨æ?¼é?¯èª¤å ±å??æ??ä»¤ï¼?è«?å??ç??ï¼?\n"
-"<http://www.gnu.org/software/libc/bugs.html>ã??\n"
+"è¦?ç?¥é??é?¯èª¤å ±å??æ??ä»¤ï¼?è«?å??ç??ï¼?\n"
+"%sã??\n"
 
-#: catgets/gencat.c:246 debug/pcprofiledump.c:222 debug/xtrace.sh:66
-#: elf/ldconfig.c:316 elf/ldd.bash.in:39 elf/sotruss.ksh:76 elf/sprof.c:386
-#: iconv/iconv_prog.c:423 iconv/iconvconfig.c:395 locale/programs/locale.c:293
-#: locale/programs/localedef.c:387 login/programs/pt_chown.c:63
-#: malloc/memusage.sh:73 malloc/memusagestat.c:557 nscd/nscd.c:429
-#: nss/getent.c:87 nss/makedb.c:245 posix/getconf.c:1104
-#: sysdeps/unix/sysv/linux/lddlibc4.c:69
+#: catgets/gencat.c:251 debug/pcprofiledump.c:224 debug/xtrace.sh:64
+#: elf/ldconfig.c:318 elf/ldd.bash.in:38 elf/pldd.c:238 elf/sotruss.ksh:75
+#: elf/sprof.c:388 iconv/iconv_prog.c:425 iconv/iconvconfig.c:400
+#: locale/programs/locale.c:296 locale/programs/localedef.c:389
+#: login/programs/pt_chown.c:62 malloc/memusage.sh:71
+#: malloc/memusagestat.c:552 nscd/nscd.c:475 nss/getent.c:86 nss/makedb.c:387
+#: posix/getconf.c:1103 sysdeps/unix/sysv/linux/lddlibc4.c:68
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -171,35 +171,35 @@ msgstr ""
 "é??æ?¯ä¸?å??è?ªç?±è»?é«?ï¼?è«?è¦?æº?å§?ç¢¼ç??æ??æ¬?æ¢?æ¬¾ã??é??æ²?æ??æ??ä¿?ï¼?ç??è?³ä¹?æ²?æ??å°?ç?ºé?·\n"
 "å?®æ??è??é?©å??æ??äº?ç?¹æ®?ç?®ç??ã??\n"
 
-#: catgets/gencat.c:251 debug/pcprofiledump.c:227 debug/xtrace.sh:70
-#: elf/ldconfig.c:321 elf/sprof.c:392 iconv/iconv_prog.c:428
-#: iconv/iconvconfig.c:400 locale/programs/locale.c:298
-#: locale/programs/localedef.c:392 malloc/memusage.sh:77
-#: malloc/memusagestat.c:562 nscd/nscd.c:434 nss/getent.c:92 nss/makedb.c:250
-#: posix/getconf.c:1109
+#: catgets/gencat.c:256 debug/pcprofiledump.c:229 debug/xtrace.sh:68
+#: elf/ldconfig.c:323 elf/pldd.c:243 elf/sprof.c:394 iconv/iconv_prog.c:430
+#: iconv/iconvconfig.c:405 locale/programs/locale.c:301
+#: locale/programs/localedef.c:394 malloc/memusage.sh:75
+#: malloc/memusagestat.c:557 nscd/nscd.c:480 nss/getent.c:91 nss/makedb.c:392
+#: posix/getconf.c:1108
 #, c-format
 msgid "Written by %s.\n"
 msgstr "ä½?è?? %sã??\n"
 
-#: catgets/gencat.c:282
+#: catgets/gencat.c:287
 msgid "*standard input*"
 msgstr "*æ¨?æº?è¼¸å?¥*"
 
-#: catgets/gencat.c:288 iconv/iconv_charmap.c:170 iconv/iconv_prog.c:294
-#: nss/makedb.c:170
+#: catgets/gencat.c:293 iconv/iconv_charmap.c:169 iconv/iconv_prog.c:293
+#: nss/makedb.c:248
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "ç?¡æ³?é??å??è¼¸å?¥æª? `%s'"
 
-#: catgets/gencat.c:417 catgets/gencat.c:494
+#: catgets/gencat.c:422 catgets/gencat.c:497
 msgid "illegal set number"
 msgstr "ä¸?å??æ³?ç??é??å??ç·¨è??"
 
-#: catgets/gencat.c:444
+#: catgets/gencat.c:449
 msgid "duplicate set definition"
 msgstr "è¤?è£½é??å??å®?ç¾©"
 
-#: catgets/gencat.c:446 catgets/gencat.c:623 catgets/gencat.c:677
+#: catgets/gencat.c:451 catgets/gencat.c:623 catgets/gencat.c:675
 msgid "this is the first definition"
 msgstr "æ¤ç?ºç¬¬ä¸?å??å®?ç¾©"
 
@@ -221,90 +221,91 @@ msgstr "ä¸?æ??ç??æ??ä»¤ `%s': æ¤å??å¿½ç?¥"
 msgid "duplicated message number"
 msgstr "é??è¤?ç??è¨?æ?¯ç·¨è??"
 
-#: catgets/gencat.c:674
+#: catgets/gencat.c:672
 msgid "duplicated message identifier"
 msgstr "é??è¤?ç??è¨?æ?¯è?å?¥ç¬¦è??"
 
-#: catgets/gencat.c:731
+#: catgets/gencat.c:729
 msgid "invalid character: message ignored"
 msgstr "ä¸?é?©ç?¨ç??å?å??: å¿½ç?¥æ¤è¨?æ?¯"
 
-#: catgets/gencat.c:774
+#: catgets/gencat.c:772
 msgid "invalid line"
 msgstr "ç?¡æ??ç??è¼¸å?¥å??"
 
-#: catgets/gencat.c:828
+#: catgets/gencat.c:826
 msgid "malformed line ignored"
 msgstr "å¿½ç?¥å¥?æ?ªç??å??"
 
-#: catgets/gencat.c:992 catgets/gencat.c:1033 nss/makedb.c:183
+#: catgets/gencat.c:990 catgets/gencat.c:1031
 #, c-format
 msgid "cannot open output file `%s'"
 msgstr "ç?¡æ³?é??å??è¼¸å?ºæª? `%s'"
 
-#: catgets/gencat.c:1195 locale/programs/linereader.c:560
+#: catgets/gencat.c:1193 locale/programs/linereader.c:559
 msgid "invalid escape sequence"
 msgstr "ç?¡æ??ç??è·³è?«åº?å??"
 
-#: catgets/gencat.c:1217
+#: catgets/gencat.c:1215
 msgid "unterminated message"
 msgstr "æ²?æ??çµ?å°¾ç??è¨?æ?¯"
 
-#: catgets/gencat.c:1241
+#: catgets/gencat.c:1239
 #, c-format
 msgid "while opening old catalog file"
 msgstr "å?¨é??å??è??ç??é¡?å?¥æª?æ¡?æ??"
 
-#: catgets/gencat.c:1332
+#: catgets/gencat.c:1330
 #, c-format
 msgid "conversion modules not available"
 msgstr "è½?æ??æ¨¡çµ?ä¸?å?å?¨"
 
-#: catgets/gencat.c:1358
+#: catgets/gencat.c:1356
 #, c-format
 msgid "cannot determine escape character"
 msgstr "ç?¡æ³?æ±ºå®?è·³è?«å?å??"
 
-#: debug/pcprofiledump.c:53
+#: debug/pcprofiledump.c:52
 msgid "Don't buffer output"
 msgstr "ä¸?è¦?å°?è¼¸å?¥å?å?¥ç·©è¡?å??"
 
-#: debug/pcprofiledump.c:58
+#: debug/pcprofiledump.c:57
 msgid "Dump information generated by PC profiling."
 msgstr "å°?ç?¢ç??æ?¼ PC æ¸¬é??è©?ä¼°ç??è³?æ??å?¾å?¸å?ºä¾?"
 
-#: debug/pcprofiledump.c:61
+#: debug/pcprofiledump.c:60
 msgid "[FILE]"
 msgstr "[æª?æ¡?]"
 
-#: debug/pcprofiledump.c:108
+#: debug/pcprofiledump.c:107
 #, c-format
 msgid "cannot open input file"
 msgstr "ç?¡æ³?é??å??è¼¸å?¥æª?"
 
-#: debug/pcprofiledump.c:115
+#: debug/pcprofiledump.c:114
 #, c-format
 msgid "cannot read header"
 msgstr "ç?¡æ³?è®?å??æ¨?é è³?æ??"
 
-#: debug/pcprofiledump.c:179
+#: debug/pcprofiledump.c:178
 #, c-format
 msgid "invalid pointer size"
 msgstr "ç?¡æ??ç??æ??æ¨?å¤§å°?"
 
-#: debug/xtrace.sh:27 debug/xtrace.sh:45
+#: debug/xtrace.sh:26 debug/xtrace.sh:44
 msgid "Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n"
 msgstr "ç?¨æ³?ï¼?xtrace [é?¸é ?]â?¦ ç¨?å¼? [PROGRAMOPTION]â?¦\\n"
 
-#: debug/xtrace.sh:33 malloc/memusage.sh:27
-msgid "Try \\`%s --help' or `%s --usage' for more information.\\n"
-msgstr "è«?å??è©¦ \\ã??%s --helpã??æ??ã??%s --usageã??ä»¥ç?²å¾?æ?´å¤?è³?è¨?ã??\\n"
+#: debug/xtrace.sh:32 elf/sotruss.ksh:56 elf/sotruss.ksh:67
+#: elf/sotruss.ksh:135 malloc/memusage.sh:26
+msgid "Try \\`%s --help' or \\`%s --usage' for more information.\\n"
+msgstr "è«?å??è©¦ \\ã??%s --helpã??æ??\\ã??%s --usageã??ä»¥ç?²å¾?æ?´å¤?è³?è¨?ã??\\n"
 
-#: debug/xtrace.sh:39
+#: debug/xtrace.sh:38
 msgid "%s: option '%s' requires an argument.\\n"
 msgstr "%sï¼?é?¸é ?ã??%sã??é??è¦?ä¸?å??å¼?æ?¸.\\n"
 
-#: debug/xtrace.sh:46
+#: debug/xtrace.sh:45
 msgid ""
 "Trace execution of program by printing currently executed function.\n"
 "\n"
@@ -330,150 +331,159 @@ msgstr ""
 "ç?é?¸é ?ã??\n"
 "\n"
 
-#: debug/xtrace.sh:127
+#: debug/xtrace.sh:57 elf/ldd.bash.in:55 elf/sotruss.ksh:49
+#: malloc/memusage.sh:64
+msgid "For bug reporting instructions, please see:\\\\n%s.\\\\n"
+msgstr "è¦?ç?¥é??é?¯èª¤å ±å??æ??ä»¤ï¼?è«?å??ç??:\\\\n%s.\\\\n"
+
+#: debug/xtrace.sh:125
 msgid "xtrace: unrecognized option \\`$1'\\n"
 msgstr "xtraceï¼?ç?¡æ³?è¾¨è?ç??é?¸é ?ã??$1ã??\\n"
 
-#: debug/xtrace.sh:140
+#: debug/xtrace.sh:138
 msgid "No program name given\\n"
 msgstr "æ?ªçµ¦å®?ç¨?å¼?å??ç¨±\\n"
 
-#: debug/xtrace.sh:148
+#: debug/xtrace.sh:146
 #, sh-format
 msgid "executable \\`$program' not found\\n"
 msgstr "å?¯å?·è¡?æª?æ¡?ã??$programã??æ?¾ä¸?å?°\\n"
 
-#: debug/xtrace.sh:152
+#: debug/xtrace.sh:150
 #, sh-format
 msgid "\\`$program' is no executable\\n"
 msgstr "ã??$programã??ä¸?æ?¯å?¯å?·è¡?æª?æ¡?\\n"
 
-#: dlfcn/dlinfo.c:64
+#: dlfcn/dlinfo.c:63
 msgid "RTLD_SELF used in code not dynamically loaded"
 msgstr "ç¨?å¼?ç¢¼æ??ä½¿ç?¨ç?? RTLD_SELF æ²?æ??å??æ??è¼?å?¥"
 
-#: dlfcn/dlinfo.c:73
+#: dlfcn/dlinfo.c:72
 msgid "unsupported dlinfo request"
 msgstr "æ?ªæ?¯æ?´ç?? dlinfo è«?æ±?"
 
-#: dlfcn/dlmopen.c:64
+#: dlfcn/dlmopen.c:63
 msgid "invalid namespace"
 msgstr "ç?¡æ??ç??å?½å??ç©ºé??"
 
-#: dlfcn/dlmopen.c:69
+#: dlfcn/dlmopen.c:68
 msgid "invalid mode"
 msgstr "ç?¡æ??ç??æ¨¡å¼?"
 
-#: dlfcn/dlopen.c:65
+#: dlfcn/dlopen.c:64
 msgid "invalid mode parameter"
 msgstr "ç?¡æ??ç??æ¨¡å¼?å??æ?¸"
 
-#: elf/cache.c:69
+#: elf/cache.c:68
 msgid "unknown"
 msgstr "æ?ªç?¥"
 
-#: elf/cache.c:112
+#: elf/cache.c:121
 msgid "Unknown OS"
 msgstr "æ?ªç?¥ç??ä½?æ¥ç³»çµ±"
 
-#: elf/cache.c:117
+#: elf/cache.c:126
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", OS ABI: %s %d.%d.%d"
 
-#: elf/cache.c:134 elf/ldconfig.c:1305
+#: elf/cache.c:143 elf/ldconfig.c:1309
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "ç?¡æ³?é??å??å¿«å??æª? %s\n"
 
-#: elf/cache.c:148
+#: elf/cache.c:157
 #, c-format
 msgid "mmap of cache file failed.\n"
 msgstr "å¿«å??æª?æ¡? mmap å¤±æ??ã??\n"
 
-#: elf/cache.c:152 elf/cache.c:166
+#: elf/cache.c:161 elf/cache.c:175
 #, c-format
 msgid "File is not a cache file.\n"
 msgstr "æª?æ¡?ä¸¦é??å¿«å??æª?ã??\n"
 
-#: elf/cache.c:199 elf/cache.c:209
+#: elf/cache.c:208 elf/cache.c:218
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "%d å?½å¼?åº«å?¨å¿«å?? `%s' ä¸æ?¾å?°\n"
 
-#: elf/cache.c:403
+#: elf/cache.c:412
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "ç?¡æ³?ç?¢ç??æ?«æ??ç??å¿«å??æª? %s"
 
-#: elf/cache.c:411 elf/cache.c:421 elf/cache.c:425 elf/cache.c:430
+#: elf/cache.c:420 elf/cache.c:430 elf/cache.c:434 elf/cache.c:439
 #, c-format
 msgid "Writing of cache data failed"
 msgstr "å¯«å?¥å¿«å??è³?æ??æ??ç?¼ç??é?¯èª¤"
 
-#: elf/cache.c:435
+#: elf/cache.c:444
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr "æ?´æ?¹ %s ç??å?å??æ¬?é??ç?º %#o å¤±æ??"
 
-#: elf/cache.c:440
+#: elf/cache.c:449
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "å°? %s æ?¹å??ç?º %s å¤±æ??"
 
-#: elf/dl-close.c:387 elf/dl-open.c:397
+#: elf/dl-close.c:378 elf/dl-open.c:474
 msgid "cannot create scope list"
 msgstr "ç?¡æ³?å»ºç«?ä½?ç?¨å??å??è¡¨"
 
-#: elf/dl-close.c:767
+#: elf/dl-close.c:771
 msgid "shared object not open"
 msgstr "å?±ç?¨ç?®ç??æª?æ¡?æ²?æ??é??å??"
 
-#: elf/dl-deps.c:114
+#: elf/dl-deps.c:112
 msgid "DST not allowed in SUID/SGID programs"
 msgstr "DST ä¸?å??è¨±å?¨ SUID/SGID ç??ç¨?å¼?ä¸"
 
-#: elf/dl-deps.c:127
+#: elf/dl-deps.c:125
 msgid "empty dynamic string token substitution"
 msgstr "ç©ºç??å??æ??å?ä¸²å?çµ?æ?¿æ??"
 
-#: elf/dl-deps.c:133
+#: elf/dl-deps.c:131
 #, c-format
 msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
 msgstr "ç?±æ?¼ç©ºç??å??æ??å?ä¸²å?çµ?æ?¿æ??è??ç?¡æ³?è¼?å?¥å¤?é?¨ç?? `%s'\n"
 
-#: elf/dl-deps.c:474
+#: elf/dl-deps.c:483
 msgid "cannot allocate dependency list"
 msgstr "ç?¡æ³?é??ç½®ç?¸é??æ?§å??è¡¨"
 
-#: elf/dl-deps.c:514 elf/dl-deps.c:574
+#: elf/dl-deps.c:520 elf/dl-deps.c:580
 msgid "cannot allocate symbol search list"
 msgstr "ç?¡æ³?é??ç½®ç¬¦è??æ??å°?å??è¡¨"
 
-#: elf/dl-deps.c:554
+#: elf/dl-deps.c:560
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr "é??æ¿¾ç¨?å¼?ä¸?æ?¯æ?´è?? LD_TRACE_PRELINKING å?±ç?¨"
 
-#: elf/dl-error.c:77
+#: elf/dl-error.c:76
 msgid "DYNAMIC LINKER BUG!!!"
 msgstr "å??æ??é?£æ?¥ç¨?å¼?æ??å??é¡?!!!"
 
-#: elf/dl-error.c:124
+#: elf/dl-error.c:123
 msgid "error while loading shared libraries"
 msgstr "è¼?å?¥å?±ç?¨å?½å¼?åº«æ??ç?¼ç??é?¯èª¤"
 
-#: elf/dl-fptr.c:88
+#: elf/dl-fptr.c:87 ports/sysdeps/hppa/dl-fptr.c:93
 msgid "cannot map pages for fdesc table"
 msgstr "ç?¡æ³?å°?é ?é?¢å°?æ? æ?¼ fdesc è¡¨æ ¼"
 
-#: elf/dl-fptr.c:192
+#: elf/dl-fptr.c:191 ports/sysdeps/hppa/dl-fptr.c:206
 msgid "cannot map pages for fptr table"
 msgstr "ç?¡æ³?å°?é ?é?¢å°?æ? æ?¼ fptr è¡¨æ ¼"
 
-#: elf/dl-fptr.c:221
+#: elf/dl-fptr.c:220 ports/sysdeps/hppa/dl-fptr.c:235
 msgid "internal error: symidx out of range of fptr table"
 msgstr "å?§é?¨é?¯èª¤ï¼?symidx è¶?å?º fptr è¡¨æ ¼ç??ç¯?å??"
 
+#: elf/dl-hwcaps.c:173 elf/dl-hwcaps.c:185
+msgid "cannot create capability list"
+msgstr "ç?¡æ³?å»ºç«? capability å??è¡¨"
+
 #: elf/dl-load.c:471
 msgid "cannot allocate name record"
 msgstr "ç?¡æ³?é??ç½®å??ç¨±ç´?é??"
@@ -490,171 +500,171 @@ msgstr "ç?¡æ³?å»ºç«? RUNPATH/RPATH ç??å?¯æ?¬"
 msgid "cannot create search path array"
 msgstr "ç?¡æ³?å»ºç«?æ??å°?è·¯å¾?é?£å??"
 
-#: elf/dl-load.c:931
+#: elf/dl-load.c:934
 msgid "cannot stat shared object"
 msgstr "ç?¡æ³? stat å?±ç?¨ç?®ç??æª?"
 
-#: elf/dl-load.c:1009
+#: elf/dl-load.c:1012
 msgid "cannot open zero fill device"
 msgstr "ç?¡æ³?é??å??ä»¥é?¶å¡«æ»¿ç??è£?ç½®"
 
-#: elf/dl-load.c:1055 elf/dl-load.c:2313
+#: elf/dl-load.c:1059 elf/dl-load.c:2339
 msgid "cannot create shared object descriptor"
 msgstr "ç?¡æ³?å»ºç«?å?±ç?¨ç?®ç??æª?æ??è¿°é ?"
 
-#: elf/dl-load.c:1074 elf/dl-load.c:1730 elf/dl-load.c:1833
+#: elf/dl-load.c:1078 elf/dl-load.c:1751 elf/dl-load.c:1854
 msgid "cannot read file data"
 msgstr "ç?¡æ³?è®?å??æª?æ¡?è³?æ??"
 
-#: elf/dl-load.c:1120
+#: elf/dl-load.c:1124
 msgid "ELF load command alignment not page-aligned"
 msgstr "ELF è¼?å?¥å?½ä»¤å°?é½?ä¸¦æ²?æ??æ??ç?§è¨?æ?¶é«?å??é ? (page) å°?é½?"
 
-#: elf/dl-load.c:1127
+#: elf/dl-load.c:1131
 msgid "ELF load command address/offset not properly aligned"
 msgstr "ELF è¼?å?¥å?½ä»¤ä½?å??/ä½?ç§»ä¸¦æ²?æ??é?©ç?¶å?°å°?é½?"
 
-#: elf/dl-load.c:1210
+#: elf/dl-load.c:1216
 msgid "cannot allocate TLS data structures for initial thread"
 msgstr "ç?¡æ³?é??ç½® TLS è³?æ??çµ?æ§?ç?¨ä»¥èµ·å§?å?·è¡?ç·?"
 
-#: elf/dl-load.c:1233
+#: elf/dl-load.c:1239
 msgid "cannot handle TLS data"
 msgstr "ç?¡æ³?è??ç?? TLS è³?æ??"
 
-#: elf/dl-load.c:1252
+#: elf/dl-load.c:1258
 msgid "object file has no loadable segments"
-msgstr "ç?®ç??æª?ä¸æ²?æ??å?¯è¼?å?¥ç??ç¯?å??"
+msgstr "ç?®ç??æª?ä¸æ²?æ??å?¯è¼?å?¥ç??å??æ®µ"
 
-#: elf/dl-load.c:1288
+#: elf/dl-load.c:1294
 msgid "failed to map segment from shared object"
 msgstr "å¾?å?±ç?¨ç?®ç??æª?ä¸å°?æ? å??æ®µå¤±æ??"
 
-#: elf/dl-load.c:1314
+#: elf/dl-load.c:1320
 msgid "cannot dynamically load executable"
 msgstr "ç?¡æ³?å??æ??è¼?å?¥å?·è¡?æª?"
 
-#: elf/dl-load.c:1376
+#: elf/dl-load.c:1383
 msgid "cannot change memory protections"
 msgstr "ç?¡æ³?æ?¹è®?è¨?æ?¶é«?ä¿?è·ç??æ??"
 
-#: elf/dl-load.c:1395
+#: elf/dl-load.c:1402
 msgid "cannot map zero-fill pages"
 msgstr "ç?¡æ³?å°?æ??ä»¥é?¶å¡«æ»¿ç??å??é ?å??"
 
-#: elf/dl-load.c:1409
+#: elf/dl-load.c:1416
 msgid "object file has no dynamic section"
-msgstr "å?±ç?¨ç?®ç??æª?ä¸æ²?æ??å??æ??ç¯?å??"
+msgstr "å?±ç?¨ç?®ç??æª?ä¸æ²?æ??å??æ??å??æ®µ"
 
-#: elf/dl-load.c:1432
+#: elf/dl-load.c:1439
 msgid "shared object cannot be dlopen()ed"
 msgstr "å?±ç?¨ç?®ç??æª?ç?¡æ³?è¢« dlopen()"
 
-#: elf/dl-load.c:1445
+#: elf/dl-load.c:1452
 msgid "cannot allocate memory for program header"
 msgstr "ç?¡æ³?é??ç½®è¨?æ?¶é«?çµ¦ç¨?å¼?æ¨?é å??ä½¿ç?¨"
 
-#: elf/dl-load.c:1462 elf/dl-open.c:180
+#: elf/dl-load.c:1469 elf/dl-open.c:180
 msgid "invalid caller"
 msgstr "ç?¡æ??ç??å?¼å?«è??"
 
-#: elf/dl-load.c:1501
+#: elf/dl-load.c:1508
 msgid "cannot enable executable stack as shared object requires"
 msgstr "ç?¡æ³?é??å??å?¯å?·è¡?å ?ç??å??ç?ºå?±ç?¨ç?®ç??æª?"
 
-#: elf/dl-load.c:1514
+#: elf/dl-load.c:1521
 msgid "cannot close file descriptor"
 msgstr "ç?¡æ³?é??é??æª?æ¡?æ??è¿°ç¬¦è??"
 
-#: elf/dl-load.c:1730
+#: elf/dl-load.c:1751
 msgid "file too short"
 msgstr "æª?æ¡?å¤ªå°?"
 
-#: elf/dl-load.c:1766
+#: elf/dl-load.c:1787
 msgid "invalid ELF header"
 msgstr "ç?¡æ??ç?? ELF æ¨?é "
 
-#: elf/dl-load.c:1778
+#: elf/dl-load.c:1799
 msgid "ELF file data encoding not big-endian"
 msgstr "ELF æª?è³?æ??ç·¨ç¢¼ä¸¦é??å¤§å°¾åº?"
 
-#: elf/dl-load.c:1780
+#: elf/dl-load.c:1801
 msgid "ELF file data encoding not little-endian"
 msgstr "ELF æª?è³?æ??ç·¨ç¢¼ä¸¦é??å°?å°¾åº?"
 
-#: elf/dl-load.c:1784
+#: elf/dl-load.c:1805
 msgid "ELF file version ident does not match current one"
 msgstr "ELF æª?ç??æ?¬ ident ä¸?ç¬¦å??ç?®å??æ??ä½¿ç?¨ç??"
 
-#: elf/dl-load.c:1788
+#: elf/dl-load.c:1809
 msgid "ELF file OS ABI invalid"
 msgstr "ELF æª? OS ABI ç??æ?¬ä¸?é?©ç?¨"
 
-#: elf/dl-load.c:1791
+#: elf/dl-load.c:1812
 msgid "ELF file ABI version invalid"
 msgstr "ELF æª? ABI ç??æ?¬ä¸?é?©ç?¨"
 
-#: elf/dl-load.c:1794
+#: elf/dl-load.c:1815
 msgid "nonzero padding in e_ident"
 msgstr "å?¨ e_ident ä¸å¡«è£?é??é?¶å?¼"
 
-#: elf/dl-load.c:1797
+#: elf/dl-load.c:1818
 msgid "internal error"
 msgstr "å?§é?¨é?¯èª¤"
 
-#: elf/dl-load.c:1804
+#: elf/dl-load.c:1825
 msgid "ELF file version does not match current one"
 msgstr "ELF æª?ç??æ?¬ä¸?ç¬¦å??ç?®å??ç??ç??æ?¬"
 
-#: elf/dl-load.c:1812
+#: elf/dl-load.c:1833
 msgid "only ET_DYN and ET_EXEC can be loaded"
 msgstr "å?ªæ?? ET_DYN ä»¥å?? ET_EXEC å?¯ä»¥è¼?å?¥"
 
-#: elf/dl-load.c:1818
+#: elf/dl-load.c:1839
 msgid "ELF file's phentsize not the expected size"
 msgstr "ELF æª?ç?? phentsize ä¸¦ä¸?æ?¯é ?æ??ä¸ç??å¤§å°?"
 
-#: elf/dl-load.c:2332
+#: elf/dl-load.c:2358
 msgid "wrong ELF class: ELFCLASS64"
 msgstr "é?¯èª¤ ELF é¡?å?¥ï¼?ELFCLASS64"
 
-#: elf/dl-load.c:2333
+#: elf/dl-load.c:2359
 msgid "wrong ELF class: ELFCLASS32"
 msgstr "é?¯èª¤ ELF é¡?å?¥ï¼?ELFCLASS32"
 
-#: elf/dl-load.c:2336
+#: elf/dl-load.c:2362
 msgid "cannot open shared object file"
 msgstr "ç?¡æ³?é??å??å?±ç?¨ç?®ç??æª?"
 
-#: elf/dl-lookup.c:757
+#: elf/dl-lookup.c:757 ports/sysdeps/mips/dl-lookup.c:774
 msgid "relocation error"
 msgstr "é??å®?å??é?¯èª¤"
 
-#: elf/dl-lookup.c:785
+#: elf/dl-lookup.c:786 ports/sysdeps/mips/dl-lookup.c:803
 msgid "symbol lookup error"
 msgstr "ç¬¦è??æ?¥æ?¾é?¯èª¤"
 
-#: elf/dl-open.c:115
+#: elf/dl-open.c:110
 msgid "cannot extend global scope"
 msgstr "ç?¡æ³?å»¶å±?å?¨å??è®?æ?¸ç??ä½?ç?¨å??"
 
-#: elf/dl-open.c:440
+#: elf/dl-open.c:524
 msgid "TLS generation counter wrapped!  Please report this."
 msgstr "TLS ç?¢ç??è¨?æ?¸å?¨è¢«è½?æ??å?·è¡?ï¼? è«?å ±å??é??å??æ??æ³?ã??"
 
-#: elf/dl-open.c:462
+#: elf/dl-open.c:546
 msgid "cannot load any more object with static TLS"
 msgstr "ç?¡æ³?ä»¥é??æ?? TLS å??è¼?å?¥ä»»ä½?ç?©ä»¶"
 
-#: elf/dl-open.c:511
+#: elf/dl-open.c:599
 msgid "invalid mode for dlopen()"
 msgstr "ç?¡æ??ç?? dlopen() æ¨¡å¼?"
 
-#: elf/dl-open.c:528
+#: elf/dl-open.c:616
 msgid "no more namespaces available for dlmopen()"
 msgstr "ç?¡æ?´å¤?å?½å??ç©ºé??å?¯è¦?æ?¼ dlmopen ()"
 
-#: elf/dl-open.c:547
+#: elf/dl-open.c:634
 msgid "invalid target namespace in dlmopen()"
 msgstr "dlmopen() ä¸ç??ç?¡æ??ç?®æ¨?å?½å??ç©ºé??"
 
@@ -662,271 +672,267 @@ msgstr "dlmopen() ä¸ç??ç?¡æ??ç?®æ¨?å?½å??ç©ºé??"
 msgid "cannot allocate memory in static TLS block"
 msgstr "ç?¡æ³?å?¨é??æ?? TLS å??å¡?ä¸é??ç½®è¨?æ?¶é«?"
 
-#: elf/dl-reloc.c:212
+#: elf/dl-reloc.c:213
 msgid "cannot make segment writable for relocation"
 msgstr "å?¨é??æ?°å®?å??ä»¥å¾?ç?¡æ³?å°?å??æ®µè¨ç?ºå?¯å¯«å?¥ç??æ??"
 
-#: elf/dl-reloc.c:275
+#: elf/dl-reloc.c:276
 #, c-format
 msgid "%s: no PLTREL found in object %s\n"
 msgstr "%s: å?¨ç?®ç??æª? %s ä¸æ²?æ??æ?¾å?° PLTREL\n"
 
-#: elf/dl-reloc.c:286
+#: elf/dl-reloc.c:287
 #, c-format
 msgid "%s: out of memory to store relocation results for %s\n"
 msgstr "%s: è¨?æ?¶é«?ä¸?è¶³ä»¥å?²å?é??å®?å??çµ?æ??ç?¨æ?¼ %s\n"
 
-#: elf/dl-reloc.c:302
+#: elf/dl-reloc.c:303
 msgid "cannot restore segment prot after reloc"
 msgstr "å?¨ reloc ä¹?å¾?ç?¡æ³?å¾©å?? segment prot"
 
-#: elf/dl-reloc.c:331
+#: elf/dl-reloc.c:332
 msgid "cannot apply additional memory protection after relocation"
 msgstr "é??å®?å??ä¹?å¾?ç?¡æ³?å¥?ç?¨é¡?å¤?è¨?æ?¶é«?ä¿?è·"
 
-#: elf/dl-sym.c:162
+#: elf/dl-sym.c:163
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "ç¨?å¼?ç¢¼æ??ä½¿ç?¨ç?? RTLD_NEXT æ²?æ??å??æ??è¼?å?¥"
 
-#: elf/dl-sysdep.c:488 elf/dl-sysdep.c:500
-msgid "cannot create capability list"
-msgstr "ç?¡æ³?å»ºç«? capability å??è¡¨"
-
-#: elf/dl-tls.c:861
+#: elf/dl-tls.c:875
 msgid "cannot create TLS data structures"
 msgstr "ç?¡æ³?å»ºç«? TLS è³?æ??çµ?æ§?"
 
-#: elf/dl-version.c:172
+#: elf/dl-version.c:166
 msgid "version lookup error"
 msgstr "ç??æ?¬æ?¥æ?¾é?¯èª¤"
 
-#: elf/dl-version.c:303
+#: elf/dl-version.c:297
 msgid "cannot allocate version reference table"
 msgstr "ç?¡æ³?é??ç½®ç??æ?¬å??ç?§è¡¨"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:140
 msgid "Print cache"
 msgstr "å?°å?ºå¿«å??"
 
-#: elf/ldconfig.c:142
+#: elf/ldconfig.c:141
 msgid "Generate verbose messages"
 msgstr "ç?¢ç??æ?´å¤?ç??è¨?æ?¯"
 
-#: elf/ldconfig.c:143
+#: elf/ldconfig.c:142
 msgid "Don't build cache"
 msgstr "ä¸?å»ºç«?å¿«å??"
 
-#: elf/ldconfig.c:144
+#: elf/ldconfig.c:143
 msgid "Don't generate links"
 msgstr "ä¸?ç?¢ç??é?£çµ?"
 
-#: elf/ldconfig.c:145
+#: elf/ldconfig.c:144
 msgid "Change to and use ROOT as root directory"
 msgstr "è®?æ??å?° ROOT ç?®é??ä¸¦ä»¥å®?å??ç?ºæ ¹ç?®é??"
 
-#: elf/ldconfig.c:145
+#: elf/ldconfig.c:144
 msgid "ROOT"
 msgstr "ROOT"
 
-#: elf/ldconfig.c:146
+#: elf/ldconfig.c:145
 msgid "CACHE"
 msgstr "CACHE"
 
-#: elf/ldconfig.c:146
+#: elf/ldconfig.c:145
 msgid "Use CACHE as cache file"
 msgstr "ä½¿ç?¨ CACHE ç?¶ä½?å¿«å??æª?æ¡?"
 
-#: elf/ldconfig.c:147
+#: elf/ldconfig.c:146
 msgid "CONF"
 msgstr "CONF"
 
-#: elf/ldconfig.c:147
+#: elf/ldconfig.c:146
 msgid "Use CONF as configuration file"
 msgstr "ä½¿ç?¨ CONF ç?¶ä½?è¨å®?æª?"
 
-#: elf/ldconfig.c:148
+#: elf/ldconfig.c:147
 msgid "Only process directories specified on the command line.  Don't build cache."
 msgstr "å?ªè??ç??å?¨å?½ä»¤å??å¼?æ?¸ä¸æ??æ??å®?ç??ç?®é??ï¼?ä¸?å»ºç«?å¿«å??æª?æ¡?ã??"
 
-#: elf/ldconfig.c:149
+#: elf/ldconfig.c:148
 msgid "Manually link individual libraries."
 msgstr "æ??å??å??å?¥é?£çµ?å?½å¼?åº«"
 
-#: elf/ldconfig.c:150
+#: elf/ldconfig.c:149
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: elf/ldconfig.c:150
+#: elf/ldconfig.c:149
 msgid "Format to use: new, old or compat (default)"
 msgstr "å°?ä½¿ç?¨æ ¼å¼?: æ?°ã??è??æ??ç?¸å®¹ (é ?è¨)"
 
-#: elf/ldconfig.c:151
+#: elf/ldconfig.c:150
 msgid "Ignore auxiliary cache file"
 msgstr "å¿½ç?¥è¼?å?©è¨å??å¿«å??æª?æ¡?"
 
-#: elf/ldconfig.c:159
+#: elf/ldconfig.c:158
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr "è¨å®?å?·è¡?æ??æ??å??æ??é?£æ?¥"
 
-#: elf/ldconfig.c:339
+#: elf/ldconfig.c:341
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "è·¯å¾? `%s' ä½¿ç?¨è¶?é??ä¸?æ¬¡"
 
-#: elf/ldconfig.c:379
+#: elf/ldconfig.c:381
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s ä¸?æ?¯ä¸?å??å·²ç?¥ç??å?½å¼?åº«å??æ??"
 
-#: elf/ldconfig.c:407
+#: elf/ldconfig.c:409
 #, c-format
 msgid "Can't stat %s"
 msgstr "ç?¡æ³? stat %s"
 
-#: elf/ldconfig.c:481
+#: elf/ldconfig.c:483
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "ç?¡æ³? stat %s\n"
 
-#: elf/ldconfig.c:491
+#: elf/ldconfig.c:493
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s ä¸?æ?¯ä¸?å??ç¬¦è??é?£æ?¥æª?\n"
 
-#: elf/ldconfig.c:510
+#: elf/ldconfig.c:512
 #, c-format
 msgid "Can't unlink %s"
 msgstr "ç?¡æ³?å??æ¶?é?£çµ? %s"
 
-#: elf/ldconfig.c:516
+#: elf/ldconfig.c:518
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "ç?¡æ³?å¾? %s é?£çµ?å?° %s"
 
-#: elf/ldconfig.c:522
+#: elf/ldconfig.c:524
 msgid " (changed)\n"
 msgstr " (å·²æ?¹è®?)\n"
 
-#: elf/ldconfig.c:524
+#: elf/ldconfig.c:526
 msgid " (SKIPPED)\n"
 msgstr " (å·²å¿½ç?¥)\n"
 
-#: elf/ldconfig.c:579
+#: elf/ldconfig.c:581
 #, c-format
 msgid "Can't find %s"
 msgstr "æ?¾ä¸?å?° %s"
 
-#: elf/ldconfig.c:595 elf/ldconfig.c:768 elf/ldconfig.c:827 elf/ldconfig.c:861
+#: elf/ldconfig.c:597 elf/ldconfig.c:770 elf/ldconfig.c:829 elf/ldconfig.c:863
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "ç?¡æ³? lstat %s"
 
-#: elf/ldconfig.c:602
+#: elf/ldconfig.c:604
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "å¿½ç?¥æª?æ¡? %s å? ç?ºå®?ä¸?æ?¯ä¸?å??æ£å¸¸ç??æª?æ¡?ã??"
 
-#: elf/ldconfig.c:611
+#: elf/ldconfig.c:613
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "ç?±æ?¼æ?¾ä¸?å?° %s ç??å?±ç?¨ç?®ç??æª?å??ç¨±ï¼?é?£çµ?ä¸¦æ?ªè¢«å»ºç«?"
 
-#: elf/ldconfig.c:694
+#: elf/ldconfig.c:696
 #, c-format
 msgid "Can't open directory %s"
 msgstr "ç?¡æ³?é??å??ç?®é?? %s"
 
-#: elf/ldconfig.c:786 elf/ldconfig.c:848 elf/readlib.c:91
+#: elf/ldconfig.c:788 elf/ldconfig.c:850 elf/readlib.c:90
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "è¼¸å?¥æª? %s æ?¾ä¸?å?°ã??\n"
 
-#: elf/ldconfig.c:793
+#: elf/ldconfig.c:795
 #, c-format
 msgid "Cannot stat %s"
 msgstr "ç?¡æ³?é¡¯ç¤ºç??æ?? %s"
 
-#: elf/ldconfig.c:922
+#: elf/ldconfig.c:924
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "libc5 å?½å¼?åº« %s æ?ºé?¯ç?®é??äº?"
 
-#: elf/ldconfig.c:925
+#: elf/ldconfig.c:927
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "libc6 å?½å¼?åº« %s æ?ºé?¯ç?®é??äº?"
 
-#: elf/ldconfig.c:928
+#: elf/ldconfig.c:930
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "libc4 å?½å¼?åº« %s æ?ºé?¯ç?®é??äº?"
 
-#: elf/ldconfig.c:956
+#: elf/ldconfig.c:958
 #, c-format
 msgid "libraries %s and %s in directory %s have same soname but different type."
 msgstr "å?½å¼?åº« %s è·? %s (å?¨ç?®é?? %s åº?ä¸?) æ??å?±å??ç??å?±ç?¨å?½å¼?åº«å??ç¨±ï¼?ä¸?é??å?¶æ ¼å¼?å?»ä¸?å??"
 
-#: elf/ldconfig.c:1065
+#: elf/ldconfig.c:1067
 #, c-format
-msgid "Can't open configuration file %s"
-msgstr "ç?¡æ³?é??å??è¨å®?æª? %s"
+msgid "Warning: ignoring configuration file that cannot be opened: %s"
+msgstr "è¦å??ï¼?æ£å?¨å¿½ç?¥ç?¡æ³?é??å??ç??çµ?æ??æª?æ¡?ï¼?%s"
 
-#: elf/ldconfig.c:1129
+#: elf/ldconfig.c:1133
 #, c-format
 msgid "%s:%u: bad syntax in hwcap line"
 msgstr "%s:%u: å?¨ hwcap å??ä¸æ??ä¸?ç?¶ç??èª?æ³?"
 
-#: elf/ldconfig.c:1135
+#: elf/ldconfig.c:1139
 #, c-format
 msgid "%s:%u: hwcap index %lu above maximum %u"
-msgstr "%s:%u:hwcap ç´¢å¼? %lu ä»¥ä¸?ç??æ??å¤§å?¼ %u"
+msgstr "%s:%u: hwcap ç´¢å¼? %lu ä»¥ä¸?ç??æ??å¤§å?¼ %u"
 
-#: elf/ldconfig.c:1142 elf/ldconfig.c:1150
+#: elf/ldconfig.c:1146 elf/ldconfig.c:1154
 #, c-format
 msgid "%s:%u: hwcap index %lu already defined as %s"
 msgstr "%s:%u: hwcap ç´¢å¼? %lu å·²ç¶?è¢«å®?ç¾©ç?º %s"
 
-#: elf/ldconfig.c:1153
+#: elf/ldconfig.c:1157
 #, c-format
 msgid "%s:%u: duplicate hwcap %lu %s"
-msgstr "%s:%u:é??è£½ hwcap %lu %s"
+msgstr "%s:%u: é??è£½ hwcap %lu %s"
 
-#: elf/ldconfig.c:1175
+#: elf/ldconfig.c:1179
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr "é??è¦?çµ?å°?æª?æ¡?å??ç¨±ç?¨æ?¼çµ?æ??æª?æ¡?æ??æ£å?¨ä½¿ç?¨ -r"
 
-#: elf/ldconfig.c:1182 locale/programs/xmalloc.c:70 malloc/obstack.c:434
-#: malloc/obstack.c:436 posix/getconf.c:1077 posix/getconf.c:1297
+#: elf/ldconfig.c:1186 locale/programs/xmalloc.c:65 malloc/obstack.c:433
+#: malloc/obstack.c:435 posix/getconf.c:1076 posix/getconf.c:1296
 #, c-format
 msgid "memory exhausted"
 msgstr "è¨?æ?¶é«?è??ç?¡"
 
-#: elf/ldconfig.c:1214
+#: elf/ldconfig.c:1218
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr "%s:%u: ç?¡æ³?è®?å??ç?®é?? %s"
 
-#: elf/ldconfig.c:1258
+#: elf/ldconfig.c:1262
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr "ç?¨ä¾?å»ºç½®å¿«å??ç??ç?¸å°?è·¯å¾? `%s'"
 
-#: elf/ldconfig.c:1284
+#: elf/ldconfig.c:1288
 #, c-format
 msgid "Can't chdir to /"
 msgstr "ç?¡æ³?è®?æ?´ç?®é??å?° /"
 
-#: elf/ldconfig.c:1325
+#: elf/ldconfig.c:1329
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "ç?¡æ³?é??å??å¿«å??æª?æ¡?ç?®é?? %s\n"
 
-#: elf/ldd.bash.in:43
+#: elf/ldd.bash.in:42
 msgid "Written by %s and %s.\n"
 msgstr "ç?± %s å?? %s ç·¨å¯«ã??\n"
 
-#: elf/ldd.bash.in:48
+#: elf/ldd.bash.in:47
 msgid ""
 "Usage: ldd [OPTION]... FILE...\n"
 "      --help              print this help and exit\n"
@@ -939,110 +945,198 @@ msgstr ""
 "ç?¨æ³?ï¼?ldd [é?¸é ?]â?¦ æª?æ¡?â?¦\n"
 "      --help              å?°å?ºé??ä»½èªªæ??ç?¶å¾?é?¢é??\n"
 "      --version           å?°å?ºç??æ?¬è³?è¨?ç?¶å¾?é?¢é??\n"
-"  -d, --data-relocs       è??ç??è³?æ??é??å®?å??\n"
-"  -r, --function-relocs   è??ç??è³?æ??å??å?½å¼?é??å®?å??\n"
+"  -d, --data-relocs       è¡?ç¨?è³?æ??é??å®?å??\n"
+"  -r, --function-relocs   è¡?ç¨?è³?æ??å??å?½å¼?é??å®?å??\n"
 "  -u, --unused            å?°å?ºæ?ªä½¿ç?¨ç??ç?´æ?¥ç?¸ä¾?æ?§\n"
 "  -v, --verbose           å?°å?ºæ??æ??è³?è¨?\n"
 
-#: elf/ldd.bash.in:82
+#: elf/ldd.bash.in:80
 msgid "ldd: option \\`$1' is ambiguous"
 msgstr "lddï¼?é?¸é ?ã??$1ã??ç?ºæ¨¡ç¨?å?©å?¯ç??"
 
-#: elf/ldd.bash.in:89
+#: elf/ldd.bash.in:87
 msgid "unrecognized option"
 msgstr "ç?¡æ³?è¾¨è?ç??é?¸é ?"
 
-#: elf/ldd.bash.in:90 elf/ldd.bash.in:128
+#: elf/ldd.bash.in:88 elf/ldd.bash.in:126
 msgid "Try \\`ldd --help' for more information."
 msgstr "å??è©¦ã??ldd --helpã??ä»¥ç?²å¾?æ?´å¤?è³?è¨?ã??"
 
-#: elf/ldd.bash.in:127
+#: elf/ldd.bash.in:125
 msgid "missing file arguments"
 msgstr "ç¼ºå°?æª?æ¡?å¼?æ?¸"
 
 #. TRANS No such file or directory.  This is a ``file doesn't exist'' error
 #. TRANS for ordinary files that are referenced in contexts where they are
 #. TRANS expected to already exist.
-#: elf/ldd.bash.in:150 sysdeps/gnu/errlist.c:36
+#: elf/ldd.bash.in:148 sysdeps/gnu/errlist.c:36
 msgid "No such file or directory"
 msgstr "æ²?æ??æ¤ä¸?æª?æ¡?æ??ç?®é??"
 
-#: elf/ldd.bash.in:153 inet/rcmd.c:488
+#: elf/ldd.bash.in:151 inet/rcmd.c:488
 msgid "not regular file"
 msgstr "ä¸¦é??æ£å¸¸ç??æª?æ¡?"
 
-#: elf/ldd.bash.in:156
+#: elf/ldd.bash.in:154
 msgid "warning: you do not have execution permission for"
 msgstr "è¦å??ï¼?æ?¨æ²?æ??å?·è¡?æ¬?é??ç?¨æ?¼"
 
-#: elf/ldd.bash.in:185
+#: elf/ldd.bash.in:183
 msgid "\tnot a dynamic executable"
 msgstr "\tä¸?æ?¯å??æ??å?¯å?·è¡?æª?æ¡?"
 
-#: elf/ldd.bash.in:193
+#: elf/ldd.bash.in:191
 msgid "exited with unknown exit code"
 msgstr "é?¢é??ç??è??ä¸?æ??ç??é?¢é??ä»£ç¢¼"
 
-#: elf/ldd.bash.in:198
+#: elf/ldd.bash.in:196
 msgid "error: you do not have read permission for"
 msgstr "é?¯èª¤ï¼?æ?¨æ²?æ??è®?å??è¨±å?¯æ¬?ç?¨æ?¼"
 
-#: elf/readelflib.c:35
+#: elf/pldd-xx.c:105
+#, c-format
+msgid "cannot find program header of process"
+msgstr "æ?¾ä¸?å?°è¡?ç¨?ç??ç¨?å¼?æ¨?é "
+
+#: elf/pldd-xx.c:110
+#, c-format
+msgid "cannot read program header"
+msgstr "ç?¡æ³?è®?å??ç¨?å¼?æ¨?é "
+
+#: elf/pldd-xx.c:135
+#, c-format
+msgid "cannot read dynamic section"
+msgstr "ç?¡æ³?è®?å??å??æ??å??æ®µ"
+
+#: elf/pldd-xx.c:147
+#, c-format
+msgid "cannot read r_debug"
+msgstr "ç?¡æ³?è®?å?? r_debug"
+
+#: elf/pldd-xx.c:167
+#, c-format
+msgid "cannot read program interpreter"
+msgstr "ç?¡æ³?è®?å??ç¨?å¼?è§£è¯å?¨"
+
+#: elf/pldd-xx.c:196
+#, c-format
+msgid "cannot read link map"
+msgstr "ç?¡æ³?è®?å??é??çµ?æ? å°?"
+
+#: elf/pldd-xx.c:207
+#, c-format
+msgid "cannot read object name"
+msgstr "ç?¡æ³?è®?å??ç?©ä»¶å??ç¨±"
+
+#: elf/pldd.c:65
+msgid "List dynamic shared objects loaded into process."
+msgstr "å??å?ºå·²è¼?å?¥è¡?ç¨?ä¸ç??å??æ??å?±ç?¨ç?©ä»¶ã??"
+
+#: elf/pldd.c:69
+msgid "PID"
+msgstr "è¡?ç¨?è?å?¥è??"
+
+#: elf/pldd.c:100
+#, c-format
+msgid "Exactly one parameter with process ID required.\n"
+msgstr "é??è¦?å??å¥½ä¸?å??é??æ??è¡?ç¨?è?å?¥è??ç??å??æ?¸ã??\n"
+
+#: elf/pldd.c:112
+#, c-format
+msgid "invalid process ID '%s'"
+msgstr "ç?¡æ??ç??è¡?ç¨?è?å?¥è?? %s"
+
+#: elf/pldd.c:120
+#, c-format
+msgid "cannot open %s"
+msgstr "ç?¡æ³?é??å?? %s"
+
+#: elf/pldd.c:145
+#, c-format
+msgid "cannot open %s/task"
+msgstr "ç?¡æ³?é??å?? %s/ä»»å??"
+
+#: elf/pldd.c:148
+#, c-format
+msgid "cannot prepare reading %s/task"
+msgstr "ç?¡æ³?æº?å??è®?å?? %s/ä»»å??"
+
+#: elf/pldd.c:161
+#, c-format
+msgid "invalid thread ID '%s'"
+msgstr "ç?¡æ??ç??å?·è¡?ç·?è?å?¥è?? %s"
+
+#: elf/pldd.c:172
+#, c-format
+msgid "cannot attach to process %lu"
+msgstr "ç?¡æ³?é??å? å?°è¡?ç¨? %lu"
+
+#: elf/pldd.c:264
+#, c-format
+msgid "cannot get information about process %lu"
+msgstr "ç?¡æ³?ç?²å¾?è¡?ç¨? %lu ç??ç?¸é??è³?è¨?"
+
+#: elf/pldd.c:277
+#, c-format
+msgid "process %lu is no ELF program"
+msgstr "è¡?ç¨? %lu ä¸¦é?? ELF ç¨?å¼?"
+
+#: elf/readelflib.c:34
 #, c-format
 msgid "file %s is truncated\n"
 msgstr "æª?æ¡? %s å·²æ?ªç?\n"
 
-#: elf/readelflib.c:67
+#: elf/readelflib.c:66
 #, c-format
 msgid "%s is a 32 bit ELF file.\n"
 msgstr "%s æ?¯ä¸?å?? 32 ä½?å??ç?? ELF æª?æ¡?ã??\n"
 
-#: elf/readelflib.c:69
+#: elf/readelflib.c:68
 #, c-format
 msgid "%s is a 64 bit ELF file.\n"
 msgstr "%s æ?¯ä¸?å?? 64 ä½?å??ç?? ELF æª?æ¡?ã??\n"
 
-#: elf/readelflib.c:71
+#: elf/readelflib.c:70
 #, c-format
 msgid "Unknown ELFCLASS in file %s.\n"
 msgstr "æª?æ¡? %s ä¸æ?ªç?¥ç?? ELFCLASSã??\n"
 
-#: elf/readelflib.c:78
+#: elf/readelflib.c:77
 #, c-format
 msgid "%s is not a shared object file (Type: %d).\n"
 msgstr "%s ä¸?æ?¯ä¸?å??å?±ç?¨ç?®ç??æª? (å??æ??: %d)ã??\n"
 
-#: elf/readelflib.c:109
+#: elf/readelflib.c:108
 #, c-format
 msgid "more than one dynamic segment\n"
 msgstr "è¶?é??ä¸?å??ç??å??æ??å??æ®µ\n"
 
-#: elf/readlib.c:97
+#: elf/readlib.c:96
 #, c-format
 msgid "Cannot fstat file %s.\n"
 msgstr "ç?¡æ³? fstat æª?æ¡? %sã??\n"
 
-#: elf/readlib.c:108
+#: elf/readlib.c:107
 #, c-format
 msgid "File %s is empty, not checked."
 msgstr "æª?æ¡? %s ç?ºç©ºï¼?ä¸?å??æª¢æ?¥ã??"
 
-#: elf/readlib.c:114
+#: elf/readlib.c:113
 #, c-format
 msgid "File %s is too small, not checked."
 msgstr "æª?æ¡? %s å¤ªå°?ï¼?ä¸?å??æª¢æ?¥ã??"
 
-#: elf/readlib.c:124
+#: elf/readlib.c:123
 #, c-format
 msgid "Cannot mmap file %s.\n"
 msgstr "ç?¡æ³? mmap æª?æ¡? %sã??\n"
 
-#: elf/readlib.c:162
+#: elf/readlib.c:161
 #, c-format
 msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
 msgstr "%s ä¸?æ?¯ä¸?å?? ELF æª? - å?¶é??é ç??é?è¡?ä½?å??çµ?æ?¯é?¯ç??ã??\n"
 
-#: elf/sln.c:85
+#: elf/sln.c:84
 #, c-format
 msgid ""
 "Usage: sln src dest|file\n"
@@ -1051,339 +1145,341 @@ msgstr ""
 "ç?¨æ³?ï¼?sln å??å§?ç¢¼ ç?®ç??|æª?æ¡?\n"
 "\n"
 
-#: elf/sln.c:110
+#: elf/sln.c:109
 #, c-format
 msgid "%s: file open error: %m\n"
 msgstr "%sï¼?æª?æ¡?é??å??é?¯èª¤ï¼?%m\n"
 
-#: elf/sln.c:147
+#: elf/sln.c:146
 #, c-format
 msgid "No target in line %d\n"
 msgstr "æ²?æ??ç?®æ¨?æ?¼ç¬¬ %d å??\n"
 
-#: elf/sln.c:179
+#: elf/sln.c:178
 #, c-format
 msgid "%s: destination must not be a directory\n"
 msgstr "%sï¼?ç?®ç??å¿?é ?ä¸?æ?¯ç?®é??\n"
 
-#: elf/sln.c:185
+#: elf/sln.c:184
 #, c-format
 msgid "%s: failed to remove the old destination\n"
 msgstr "%sï¼?ç?¡æ³?ç§»é?¤è??ç??ç?®ç??\n"
 
-#: elf/sln.c:193
+#: elf/sln.c:192
 #, c-format
 msgid "%s: invalid destination: %s\n"
 msgstr "%sï¼?ç?¡æ??ç??ç?®ç??ï¼?%s\n"
 
-#: elf/sln.c:208 elf/sln.c:217
+#: elf/sln.c:207 elf/sln.c:216
 #, c-format
 msgid "Invalid link from \"%s\" to \"%s\": %s\n"
 msgstr "å¾?ã??%sã??å?°ã??%sã??ç??é??çµ?ç?¡æ??ï¼?%s\n"
 
-#: elf/sotruss.ksh:33
+#: elf/sotruss.ksh:32
 #, sh-format
 msgid ""
 "Usage: sotruss [OPTION...] [--] EXECUTABLE [EXECUTABLE-OPTION...]\n"
-"  -F, --from FROMLIST     trace calls from objects on FORMLIST\n"
-"  -T, --to TOLIST         trace calls to objects on TOLIST\n"
+"  -F, --from FROMLIST     Trace calls from objects on FROMLIST\n"
+"  -T, --to TOLIST         Trace calls to objects on TOLIST\n"
 "\n"
-"  -e, --exit              also show exits from the function calls\n"
-"  -f, --follow            trace child processes\n"
-"  -o, --output FILENAME   write output to FILENAME (or FILENAME.$PID in case\n"
+"  -e, --exit              Also show exits from the function calls\n"
+"  -f, --follow            Trace child processes\n"
+"  -o, --output FILENAME   Write output to FILENAME (or FILENAME.$PID in case\n"
 "\t\t\t  -f is also used) instead of standard error\n"
 "\n"
-"      --help              print this help and exit\n"
-"      --version           print version information and exit"
+"  -?, --help              Give this help list\n"
+"      --usage             Give a short usage message\n"
+"      --version           Print program version"
 msgstr ""
-"ç?¨æ³?ï¼?sotruss [é?¸é ?...] [--] å?¯å?·è¡?æª?æ¡? [EXECUTABLE-OPTION...]\n"
-"  -F, --from FROMLIST     è¿½è¹¤å¾?ç?©ä»¶ç??å?¼å?«æ?¼ FORMLIST\n"
-"  -T, --to TOLIST         è¿½è¹¤å?°ç?©ä»¶ç??å?¼å?«æ?¼ TOLIST\n"
+"ç?¨æ³?ï¼?sotruss [é?¸é ?â?¦] [--] å?¯å?·è¡?æª?æ¡? [EXECUTABLE-OPTION...]\n"
+"  -F, --from FROMLIST     è¿½è¹¤ä¾?è?ª FROMLIST ä¸?ç?©ä»¶ç??å?¼å?«\n"
+"  -T, --to TOLIST         è¿½è¹¤ä¾?è?ª TOLIST ä¸?ç?©ä»¶ç??å?¼å?«\n"
 "\n"
-"  -e, --exit              ä¹?é¡¯ç¤ºå¾?å?½å¼?å?¼å?«ç??é?¢é??\n"
-"  -f, --follow            è¿½è¹¤å?é?²ç¨?\n"
-"  -o, --output æª?å??       å¯«å?¥è¼¸å?ºå?°æª?å?? (æ?? FILENAME.$PID ç?¶\n"
-"\t\t\t -f ä¹?å??æ??ä½¿ç?¨) ä»¥ä»£æ?¿æ¨?æº?é?¯èª¤\n"
+"  -e, --exit              ä¹?é¡¯ç¤ºä¾?è?ªå?½å¼?ç??é?¢é??å?¼å?«\n"
+"  -f, --follow            è¿½è¹¤å?è¡?ç¨?\n"
+"  -o, --output æª?å??       å°?è¼¸å?ºå¯«å?¥ FILENAME (ç?¶å??æ??ä½¿ç?¨ -f æ??\n"
+"\t\t\t  å??ä½¿ç?¨ FILENAME.$PID) ä»¥ä»£æ?¿æ¨?æº?é?¯èª¤\n"
 "\n"
-"      --help              å?°å?ºé??ä»½èªªæ??ç?¶å¾?é?¢é??\n"
-"      --version           å?°å?ºç??æ?¬è³?è¨?ç?¶å¾?é?¢é??"
+"  -?, --help              çµ¦å?ºé??ä»½èªªæ??æ¸?å?®\n"
+"      --usage             çµ¦å?ºç°¡ç?ç?¨æ³?è¨?æ?¯\n"
+"      --version           å?°å?ºç¨?å¼?ç??æ?¬"
 
 #: elf/sotruss.ksh:46
 msgid "Mandatory arguments to long options are also mandatory for any corresponding\\nshort options.\\n"
 msgstr "é?·é?¸é ?ç??å¿?è¦?å¼?æ?¸å??æ¨£ä¹?æ?¯ç?¸å°?æ??ç?é?¸é ?ç??å¿?è¦?å¼?æ?¸ã??"
 
-#: elf/sotruss.ksh:56
+#: elf/sotruss.ksh:55
 msgid "%s: option requires an argument -- '%s'\\n"
 msgstr "%sï¼?é?¸é ?é??è¦?ä¸?å??å¼?æ?¸ --ã??%sã??\\n"
 
-#: elf/sotruss.ksh:57 elf/sotruss.ksh:68 elf/sotruss.ksh:134
-msgid "Try \\`%s --help' or \\`%s --usage' for more information.\\n"
-msgstr "è«?å??è©¦ \\ã??%s --helpã??æ??\\ã??%s --usageã??ä»¥ç?²å¾?æ?´å¤?è³?è¨?ã??\\n"
-
-#: elf/sotruss.ksh:62
+#: elf/sotruss.ksh:61
 msgid "%s: option is ambiguous; possibilities:"
 msgstr "%sï¼?é?¸é ?æ?¯æ¨¡ç¨?å?©å?¯ç??ï¼?å?¯è?½æ?¯ï¼?"
 
-#: elf/sotruss.ksh:80
+#: elf/sotruss.ksh:79
 msgid "Written by %s.\\n"
 msgstr "ä½?è?? %sã??\\n"
 
-#: elf/sotruss.ksh:87
+#: elf/sotruss.ksh:86
 msgid ""
 "Usage: %s [-ef] [-F FROMLIST] [-o FILENAME] [-T TOLIST] [--exit]\n"
-"\t    [--follow] [--from FROMLIST] [--output FILENAME] [--to TOLIST]\\n"
+"\t    [--follow] [--from FROMLIST] [--output FILENAME] [--to TOLIST]\n"
+"\t    [--help] [--usage] [--version] [--]\n"
+"\t    EXECUTABLE [EXECUTABLE-OPTION...]\\n"
 msgstr ""
 "ç?¨æ³?ï¼?%s [-ef] [-F FROMLIST] [-o FILENAME] [-T TOLIST] [--exit]\n"
-"\t    [--follow] [--from FROMLIST] [--output FILENAME] [--to TOLIST]\\n"
+"\t    [--follow] [--from FROMLIST] [--output æª?å??] [--to TOLIST]\n"
+"\t    [--help] [--usage] [--version] [--]\n"
+"\t    å?¯å?·è¡?æª?æ¡? [EXECUTABLE-OPTION...]\\n"
 
-#: elf/sotruss.ksh:133
+#: elf/sotruss.ksh:134
 msgid "%s: unrecognized option '%c%s'\\n"
 msgstr "%sï¼?ç?¡æ³?è¾¨è?ç??é?¸é ?ã??%c%sã??\\n"
 
-#: elf/sprof.c:77
+#: elf/sprof.c:76
 msgid "Output selection:"
 msgstr "è¼¸å?ºé?¸æ??:"
 
-#: elf/sprof.c:79
+#: elf/sprof.c:78
 msgid "print list of count paths and their number of use"
 msgstr "å??å?ºè¨?æ?¸ç??è·¯å¾?ä»¥å??å®?å??ä½¿ç?¨ç??æ¬¡æ?¸"
 
-#: elf/sprof.c:81
+#: elf/sprof.c:80
 msgid "generate flat profile with counts and ticks"
 msgstr "å¾?å?·è¡?æ¬¡æ?¸è??ç¶?æ·æ??é??ç??è³?æ??ä¸ç?¢ç??ç?´æ?¥ç??æ¸¬é??çµ?æ??"
 
-#: elf/sprof.c:82
+#: elf/sprof.c:81
 msgid "generate call graph"
 msgstr "ç?¢ç??å?½å¼?å?¼å?«å??å½¢"
 
-#: elf/sprof.c:89
+#: elf/sprof.c:88
 msgid "Read and display shared object profiling data."
 msgstr "è®?å??å??é¡¯ç¤ºå?±ç?¨ç?©ä»¶è¦?ç¯?è³?æ??ã??"
 
-#: elf/sprof.c:94
+#: elf/sprof.c:93
 msgid "SHOBJ [PROFDATA]"
 msgstr "SHOBJ [PROFDATA]"
 
-#: elf/sprof.c:431
+#: elf/sprof.c:432
 #, c-format
 msgid "failed to load shared object `%s'"
 msgstr "é??å??å?±ç?¨ç?®ç??æª? `%s' å¤±æ??"
 
-#: elf/sprof.c:440
+#: elf/sprof.c:441
 #, c-format
 msgid "cannot create internal descriptors"
 msgstr "ç?¡æ³?å»ºç«?å?§é?¨æ??è¿°é ?"
 
-#: elf/sprof.c:559
+#: elf/sprof.c:553
 #, c-format
 msgid "Reopening shared object `%s' failed"
 msgstr "é??æ?°é??å??å?±ç?¨ç?®ç??æª? %s å¤±æ??"
 
-#: elf/sprof.c:566 elf/sprof.c:660
+#: elf/sprof.c:560 elf/sprof.c:655
 #, c-format
 msgid "reading of section headers failed"
 msgstr "è®?å??å°?ç¯?æ¨?é æ??å¤±æ??"
 
-#: elf/sprof.c:574 elf/sprof.c:668
+#: elf/sprof.c:568 elf/sprof.c:663
 #, c-format
 msgid "reading of section header string table failed"
 msgstr "è®?å??å°?ç¯?æ¨?é å?ä¸²è¡¨æ ¼æ??å¤±æ??"
 
-#: elf/sprof.c:600
+#: elf/sprof.c:594
 #, c-format
 msgid "*** Cannot read debuginfo file name: %m\n"
 msgstr "*** ç?¡æ³?è®?å??é?¤é?¯è³?è¨?æª?æ¡?å??ç¨±ï¼?%m\n"
 
-#: elf/sprof.c:620
+#: elf/sprof.c:615
 #, c-format
 msgid "cannot determine file name"
 msgstr "ç?¡æ³?æ±ºå®?æª?æ¡?å??ç¨±"
 
-#: elf/sprof.c:653
+#: elf/sprof.c:648
 #, c-format
 msgid "reading of ELF header failed"
 msgstr "è®?å?? ELF æ¨?é æ??å¤±æ??"
 
-#: elf/sprof.c:689
+#: elf/sprof.c:684
 #, c-format
 msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
 msgstr "*** æª?æ¡? `%s' è¢«è£?å?ªäº?: ç?¡æ³?å??è©³ç´°ç??å??æ??\n"
 
-#: elf/sprof.c:719
+#: elf/sprof.c:714
 #, c-format
 msgid "failed to load symbol data"
 msgstr "è¼?å?¥å?½å¼?ç¬¦è??è³?æ??å¤±æ??"
 
-#: elf/sprof.c:784
+#: elf/sprof.c:779
 #, c-format
 msgid "cannot load profiling data"
 msgstr "ç?¡æ³?è¼?å?¥æ¸¬è©¦è³?æ??"
 
-#: elf/sprof.c:793
+#: elf/sprof.c:788
 #, c-format
 msgid "while stat'ing profiling data file"
 msgstr "å?¨å°?æ¸¬è©¦è³?æ??æª?æ¡?é?²è¡?çµ±è¨?ç??æ??å??"
 
-#: elf/sprof.c:801
+#: elf/sprof.c:796
 #, c-format
 msgid "profiling data file `%s' does not match shared object `%s'"
 msgstr "æ¸¬è©¦è³?æ??æª? `%s' è??å?±ç?¨ç?®ç??æª? `%s' ä¸?ç¬¦å??"
 
-#: elf/sprof.c:812
+#: elf/sprof.c:807
 #, c-format
 msgid "failed to mmap the profiling data file"
 msgstr "æ¸¬è©¦è³?æ??æª?æ¡? mmap å¤±æ??"
 
-#: elf/sprof.c:820
+#: elf/sprof.c:815
 #, c-format
 msgid "error while closing the profiling data file"
 msgstr "æ£å?¨é??é??æ¸¬è©¦è³?æ??æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 
-#: elf/sprof.c:829 elf/sprof.c:927
+#: elf/sprof.c:824 elf/sprof.c:922
 #, c-format
 msgid "cannot create internal descriptor"
 msgstr "ç?¡æ³?å»ºç«?å?§é?¨æ??è¿°é ?"
 
-#: elf/sprof.c:903
+#: elf/sprof.c:898
 #, c-format
 msgid "`%s' is no correct profile data file for `%s'"
 msgstr "`%s' ä¸?æ?¯ `%s' ä¸æ£ç¢ºç??æ¸¬é??è©?ä¼°è³?æ??æª?"
 
-#: elf/sprof.c:1084 elf/sprof.c:1142
+#: elf/sprof.c:1079 elf/sprof.c:1137
 #, c-format
 msgid "cannot allocate symbol data"
 msgstr "ç?¡æ³?é??ç½®å?½å¼?ç¬¦è??è³?æ??"
 
-#: iconv/iconv_charmap.c:142 iconv/iconv_prog.c:446
+#: iconv/iconv_charmap.c:143 iconv/iconv_prog.c:448
 #, c-format
 msgid "cannot open output file"
 msgstr "ç?¡æ³?é??å??è¼¸å?ºæª?"
 
-#: iconv/iconv_charmap.c:188 iconv/iconv_prog.c:312
+#: iconv/iconv_charmap.c:189 iconv/iconv_prog.c:311
 #, c-format
 msgid "error while closing input `%s'"
 msgstr "æ£å?¨é??é??è¼¸å?¥ `%s' ç??æ??å??ç?¼ç??é?¯èª¤"
 
-#: iconv/iconv_charmap.c:462
+#: iconv/iconv_charmap.c:463
 #, c-format
 msgid "illegal input sequence at position %Zd"
 msgstr "ä½?ç½® %Zd æ??ä¸?å??æ³?ç??è¼¸å?¥åº?å??"
 
-#: iconv/iconv_charmap.c:481 iconv/iconv_prog.c:537
+#: iconv/iconv_charmap.c:482 iconv/iconv_prog.c:539
 #, c-format
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr "ç·©è¡?å??çµ?å°¾æ??ä¸?å®?å?¨ç??å?å??æ?? shift sequence"
 
-#: iconv/iconv_charmap.c:526 iconv/iconv_charmap.c:562 iconv/iconv_prog.c:580
-#: iconv/iconv_prog.c:616
+#: iconv/iconv_charmap.c:527 iconv/iconv_charmap.c:563 iconv/iconv_prog.c:582
+#: iconv/iconv_prog.c:618
 #, c-format
 msgid "error while reading the input"
 msgstr "æ£å?¨è®?å?¥è³?æ??ç??æ??å??ç?¼ç??é?¯èª¤"
 
-#: iconv/iconv_charmap.c:544 iconv/iconv_prog.c:598
+#: iconv/iconv_charmap.c:545 iconv/iconv_prog.c:600
 #, c-format
 msgid "unable to allocate buffer for input"
 msgstr "ç?¡æ³?é??ç½®è¼¸å?¥ç?¨ç??ç·©è¡?å??"
 
-#: iconv/iconv_prog.c:60
+#: iconv/iconv_prog.c:59
 msgid "Input/Output format specification:"
 msgstr "è¼¸å?¥/è¼¸å?ºæ ¼å¼?è¨å®?:"
 
-#: iconv/iconv_prog.c:61
+#: iconv/iconv_prog.c:60
 msgid "encoding of original text"
 msgstr "å??å§?æ??å?ç??ç·¨ç¢¼"
 
-#: iconv/iconv_prog.c:62
+#: iconv/iconv_prog.c:61
 msgid "encoding for output"
 msgstr "ç?¨ä¾?è¼¸å?ºç??ç·¨ç¢¼"
 
-#: iconv/iconv_prog.c:63
+#: iconv/iconv_prog.c:62
 msgid "Information:"
 msgstr "è³?æ??:"
 
-#: iconv/iconv_prog.c:64
+#: iconv/iconv_prog.c:63
 msgid "list all known coded character sets"
 msgstr "å??å?ºæ??æ??å·²ç?¥ç??ç·¨ç¢¼å?å??é??"
 
-#: iconv/iconv_prog.c:65 locale/programs/localedef.c:127
+#: iconv/iconv_prog.c:64 locale/programs/localedef.c:126
 msgid "Output control:"
 msgstr "è¼¸å?ºæ?§å?¶:"
 
-#: iconv/iconv_prog.c:66
+#: iconv/iconv_prog.c:65
 msgid "omit invalid characters from output"
 msgstr "ç??ç?¥ç?¡æ??å?å??ç??è¼¸å?º"
 
-#: iconv/iconv_prog.c:67
+#: iconv/iconv_prog.c:66
 msgid "output file"
 msgstr "è¼¸å?ºæª?æ¡?"
 
-#: iconv/iconv_prog.c:68
+#: iconv/iconv_prog.c:67
 msgid "suppress warnings"
 msgstr "å??æ¢è¼¸å?ºè¦å??è¨?æ?¯"
 
-#: iconv/iconv_prog.c:69
+#: iconv/iconv_prog.c:68
 msgid "print progress information"
 msgstr "å?°å?ºç¨?åº?ç?¸é??è³?è¨?"
 
-#: iconv/iconv_prog.c:74
+#: iconv/iconv_prog.c:73
 msgid "Convert encoding of given files from one encoding to another."
 msgstr "å¾?çµ¦å®?ç??æª?æ¡?ç??å?å??ç·¨ç¢¼è½?æ??å?°å?¦ä¸?å??"
 
-#: iconv/iconv_prog.c:78
+#: iconv/iconv_prog.c:77
 msgid "[FILE...]"
-msgstr "[FILE...]"
+msgstr "[FILEâ?¦]"
 
-#: iconv/iconv_prog.c:234
+#: iconv/iconv_prog.c:233
 #, c-format
 msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "ä¸?æ?¯æ?´å¾? `%s' ä»¥å??å?° `%s' ç??è½?æ??"
 
-#: iconv/iconv_prog.c:239
+#: iconv/iconv_prog.c:238
 #, c-format
 msgid "conversion from `%s' is not supported"
 msgstr "ä¸?æ?¯æ?´å¾? `%s' ç??è½?æ??"
 
-#: iconv/iconv_prog.c:246
+#: iconv/iconv_prog.c:245
 #, c-format
 msgid "conversion to `%s' is not supported"
 msgstr "ä¸?æ?¯æ?´å?° `%s' ç??è½?æ??"
 
-#: iconv/iconv_prog.c:250
+#: iconv/iconv_prog.c:249
 #, c-format
 msgid "conversion from `%s' to `%s' is not supported"
 msgstr "ä¸?æ?¯æ?´å¾? `%s' å?° `%s' ç??è½?æ??"
 
-#: iconv/iconv_prog.c:260
+#: iconv/iconv_prog.c:259
 #, c-format
 msgid "failed to start conversion processing"
 msgstr "é??å§?è½?æ??ç¨?åº?å¤±æ??"
 
-#: iconv/iconv_prog.c:358
+#: iconv/iconv_prog.c:357
 #, c-format
 msgid "error while closing output file"
 msgstr "æ£å?¨é??é??è¼¸å?ºæª?æ¡?ç??æ??å??ç?¼ç??é?¯èª¤"
 
-#: iconv/iconv_prog.c:456
+#: iconv/iconv_prog.c:458
 #, c-format
 msgid "conversion stopped due to problem in writing the output"
 msgstr "å? å¯«å?¥è¼¸å?ºæ??ç?¼ç??é?¯èª¤è??å°?è?´è½?æ??å??æ¢"
 
-#: iconv/iconv_prog.c:533
+#: iconv/iconv_prog.c:535
 #, c-format
 msgid "illegal input sequence at position %ld"
 msgstr "ä½?ç½® %ld æ??ä¸?å??æ³?ç??è¼¸å?¥åº?å??"
 
-#: iconv/iconv_prog.c:541
+#: iconv/iconv_prog.c:543
 #, c-format
 msgid "internal error (illegal descriptor)"
 msgstr "å?§é?¨é?¯èª¤ (ä¸?å??æ³?ç??æ??è¿°é ?)"
 
-#: iconv/iconv_prog.c:544
+#: iconv/iconv_prog.c:546
 #, c-format
 msgid "unknown iconv() error %d"
 msgstr "ä¸?æ??ç?? iconv() é?¯èª¤ %d"
 
-#: iconv/iconv_prog.c:790
+#: iconv/iconv_prog.c:791
 msgid ""
 "The following list contain all the coded character sets known.  This does\n"
 "not necessarily mean that all combinations of these names can be used for\n"
@@ -1398,42 +1494,42 @@ msgstr ""
 "\n"
 "  "
 
-#: iconv/iconvconfig.c:110
+#: iconv/iconvconfig.c:109
 msgid "Create fastloading iconv module configuration file."
 msgstr "å»ºç«?å¿«é??è¼?å?¥ iconv æ¨¡çµ?ç??è¨å®?æª?æ¡?ã??"
 
-#: iconv/iconvconfig.c:114
+#: iconv/iconvconfig.c:113
 msgid "[DIR...]"
-msgstr "[ç?®é??...]"
+msgstr "[ç?®é??â?¦]"
 
-#: iconv/iconvconfig.c:127
+#: iconv/iconvconfig.c:126
 msgid "Prefix used for all file accesses"
 msgstr "ä½¿ç?¨æ?¼æ??æ??æª?æ¡?å?å??æ??ç??å??ç½®æ??å?"
 
-#: iconv/iconvconfig.c:128
+#: iconv/iconvconfig.c:127
 msgid "Put output in FILE instead of installed location (--prefix does not apply to FILE)"
 msgstr "å?¨ FILE ä¸ç½®æ?¾è¼¸å?ºä»¥ä»£æ?¿å·²å®?è£?ç??ä½?ç½® (--prefix ä¸?å¥?ç?¨å?° FILE)"
 
-#: iconv/iconvconfig.c:132
+#: iconv/iconvconfig.c:131
 msgid "Do not search standard directories, only those on the command line"
 msgstr "ä¸?æ??å°?æ¨?æº?ç?®é??ï¼?å?ªæ??é?£äº?å?¨ä¹?ä¸?å?½ä»¤å??"
 
-#: iconv/iconvconfig.c:301
+#: iconv/iconvconfig.c:303
 #, c-format
 msgid "Directory arguments required when using --nostdlib"
 msgstr "ç?®é??å¼?æ?¸å¿?è¦?é ?æ??æ£å?¨ä½¿ç?¨ --nostdlib"
 
-#: iconv/iconvconfig.c:343 locale/programs/localedef.c:291
+#: iconv/iconvconfig.c:345 locale/programs/localedef.c:287
 #, c-format
 msgid "no output file produced because warnings were issued"
 msgstr "å? ç?ºç?¼å?ºé??è¦å??è¨?æ?¯ï¼?æ??ä»¥æ²?æ??è£½é? ä»»ä½?è¼¸å?ºæª?"
 
-#: iconv/iconvconfig.c:429
+#: iconv/iconvconfig.c:434
 #, c-format
 msgid "while inserting in search tree"
 msgstr "ç?¶æ??å?¥æ?¼æ??å°?æ¨¹ä¹?ä¸"
 
-#: iconv/iconvconfig.c:1238
+#: iconv/iconvconfig.c:1243
 #, c-format
 msgid "cannot generate output file"
 msgstr "ç?¡æ³?ç?¢ç??è¼¸å?ºæª?"
@@ -1454,7 +1550,7 @@ msgstr "é?£æ?¥å?°ä½?å?? %s: "
 #: inet/rcmd.c:219
 #, c-format
 msgid "Trying %s...\n"
-msgstr "å??è©¦ %s...\n"
+msgstr "å??è©¦ %sâ?¦\n"
 
 #: inet/rcmd.c:255
 #, c-format
@@ -1520,952 +1616,952 @@ msgstr "ç§»é?¤å¯?ç¢¼æ??è®?ä»?äººç?¡æ³?è®?å??æª?æ¡?"
 msgid "Unknown .netrc keyword %s"
 msgstr "æ?ªç?¥ç?? .netrc é??é?µå? %s"
 
-#: libidn/nfkc.c:464
+#: libidn/nfkc.c:462
 msgid "Character out of range for UTF-8"
 msgstr "å?å??è¶?å?º UTF-8 ç¯?å??"
 
-#: locale/programs/charmap-dir.c:59
+#: locale/programs/charmap-dir.c:58
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr "ç?¡æ³?è®?å??å?é??å°?ç?§æª?ç?®é?? `%s'"
 
-#: locale/programs/charmap.c:138
+#: locale/programs/charmap.c:137
 #, c-format
 msgid "character map file `%s' not found"
 msgstr "æ?¾ä¸?å?°å?é??å°?ç?§æª? `%s'"
 
-#: locale/programs/charmap.c:195
+#: locale/programs/charmap.c:194
 #, c-format
 msgid "default character map file `%s' not found"
 msgstr "æ?¾ä¸?å?°é ?è¨ç??å?é??å°?ç?§æª? `%s'"
 
-#: locale/programs/charmap.c:258
+#: locale/programs/charmap.c:257
 #, c-format
 msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
 msgstr "å?å??å°?æ?? `%s' ä¸?æ?¯ ASCII ç?¸å®¹ç¢¼ï¼?å??å??å??è³?æ??åº«ä¸?ç¬¦å?? ISO C\n"
 
-#: locale/programs/charmap.c:337
+#: locale/programs/charmap.c:336
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max> å¿?é ?å¤§æ?¼ <mb_cur_min>\n"
 
-#: locale/programs/charmap.c:357 locale/programs/charmap.c:374
-#: locale/programs/repertoire.c:174
+#: locale/programs/charmap.c:356 locale/programs/charmap.c:373
+#: locale/programs/repertoire.c:173
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "prolog ä¸æ??èª?æ³?é?¯èª¤: %s"
 
-#: locale/programs/charmap.c:358
+#: locale/programs/charmap.c:357
 msgid "invalid definition"
 msgstr "ç?¡æ??ç??å®?ç¾©"
 
-#: locale/programs/charmap.c:375 locale/programs/locfile.c:126
-#: locale/programs/locfile.c:153 locale/programs/repertoire.c:175
+#: locale/programs/charmap.c:374 locale/programs/locfile.c:125
+#: locale/programs/locfile.c:152 locale/programs/repertoire.c:174
 msgid "bad argument"
 msgstr "é?¯èª¤ç??å¼?æ?¸"
 
-#: locale/programs/charmap.c:403
+#: locale/programs/charmap.c:402
 #, c-format
 msgid "duplicate definition of <%s>"
 msgstr "<%s> ç??å®?ç¾©é??è¤?äº?"
 
-#: locale/programs/charmap.c:410
+#: locale/programs/charmap.c:409
 #, c-format
 msgid "value for <%s> must be 1 or greater"
 msgstr "<%s> ç??å?¼å¿?é ?ç?º 1 æ??è??æ?´å¤§"
 
-#: locale/programs/charmap.c:422
+#: locale/programs/charmap.c:421
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "<%s> ç??å?¼å¿?é ?ç?æ?¼æ??å¤§æ?¼ <%s> ç??å?¼"
 
-#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183
+#: locale/programs/charmap.c:444 locale/programs/repertoire.c:182
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "çµ¦ <%s> ç??å¼?æ?¸å¿?é ?æ?¯ä¸?å??å?®å?å??"
 
-#: locale/programs/charmap.c:471
+#: locale/programs/charmap.c:470
 msgid "character sets with locking states are not supported"
 msgstr "ä¸?æ?¯æ?´ä½¿ç?¨ locking ç??æ??ç??å?å??é??"
 
-#: locale/programs/charmap.c:498 locale/programs/charmap.c:552
-#: locale/programs/charmap.c:584 locale/programs/charmap.c:678
-#: locale/programs/charmap.c:733 locale/programs/charmap.c:774
-#: locale/programs/charmap.c:815
+#: locale/programs/charmap.c:497 locale/programs/charmap.c:551
+#: locale/programs/charmap.c:583 locale/programs/charmap.c:677
+#: locale/programs/charmap.c:732 locale/programs/charmap.c:773
+#: locale/programs/charmap.c:814
 #, c-format
 msgid "syntax error in %s definition: %s"
 msgstr "å®?ç¾© %s ç??èª?æ³?é?¯èª¤: %s"
 
-#: locale/programs/charmap.c:499 locale/programs/charmap.c:679
-#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230
+#: locale/programs/charmap.c:498 locale/programs/charmap.c:678
+#: locale/programs/charmap.c:774 locale/programs/repertoire.c:229
 msgid "no symbolic name given"
 msgstr "æ²?æ??çµ¦äº?ç¬¦è??å??ç¨±"
 
-#: locale/programs/charmap.c:553
+#: locale/programs/charmap.c:552
 msgid "invalid encoding given"
 msgstr "çµ¦äº?ç??ç·¨ç¢¼æ?¯ç?¡æ??ç??"
 
-#: locale/programs/charmap.c:562
+#: locale/programs/charmap.c:561
 msgid "too few bytes in character encoding"
 msgstr "å?å??å®?ç¾©ä¸ç??ä½?å??çµ?å¤ªå°?äº?"
 
-#: locale/programs/charmap.c:564
+#: locale/programs/charmap.c:563
 msgid "too many bytes in character encoding"
 msgstr "å?å??å®?ç¾©ä¸ç??ä½?å??çµ?å¤ªå¤?äº?"
 
-#: locale/programs/charmap.c:586 locale/programs/charmap.c:734
-#: locale/programs/charmap.c:817 locale/programs/repertoire.c:296
+#: locale/programs/charmap.c:585 locale/programs/charmap.c:733
+#: locale/programs/charmap.c:816 locale/programs/repertoire.c:295
 msgid "no symbolic name given for end of range"
 msgstr "æ²?æ??çµ¦æ¤å??ç??æ??å¾?ä¸?å??å?å??ç¬¦è??å??ç¨±"
 
-#: locale/programs/charmap.c:610 locale/programs/ld-address.c:602
-#: locale/programs/ld-collate.c:2769 locale/programs/ld-collate.c:3927
-#: locale/programs/ld-ctype.c:2257 locale/programs/ld-ctype.c:3009
-#: locale/programs/ld-identification.c:452
-#: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
-#: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:307
-#: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:241
-#: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1221
-#: locale/programs/repertoire.c:313
+#: locale/programs/charmap.c:609 locale/programs/ld-address.c:601
+#: locale/programs/ld-collate.c:2766 locale/programs/ld-collate.c:3924
+#: locale/programs/ld-ctype.c:2255 locale/programs/ld-ctype.c:3006
+#: locale/programs/ld-identification.c:451
+#: locale/programs/ld-measurement.c:237 locale/programs/ld-messages.c:331
+#: locale/programs/ld-monetary.c:942 locale/programs/ld-name.c:306
+#: locale/programs/ld-numeric.c:367 locale/programs/ld-paper.c:240
+#: locale/programs/ld-telephone.c:312 locale/programs/ld-time.c:1220
+#: locale/programs/repertoire.c:312
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
 msgstr "%1$s: å®?ç¾©ä¸¦æ²?æ??ä»¥ `END %1$s' å??ç?ºçµ?æ??"
 
-#: locale/programs/charmap.c:643
+#: locale/programs/charmap.c:642
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr "å?ªæ?? WIDTH å®?ç¾©æ??è?½ç?´æ?¥å¯«å?¨ CHARMAP å®?ç¾©ä¹?å¾?"
 
-#: locale/programs/charmap.c:651 locale/programs/charmap.c:714
+#: locale/programs/charmap.c:650 locale/programs/charmap.c:713
 #, c-format
 msgid "value for %s must be an integer"
 msgstr "%s ç??å?¼å¿?é ?æ?¯æ?´æ?¸æ??è¡?"
 
-#: locale/programs/charmap.c:842
+#: locale/programs/charmap.c:841
 #, c-format
 msgid "%s: error in state machine"
 msgstr "%s: ç??æ??æ©?é?¯èª¤"
 
-#: locale/programs/charmap.c:850 locale/programs/ld-address.c:618
-#: locale/programs/ld-collate.c:2766 locale/programs/ld-collate.c:4120
-#: locale/programs/ld-ctype.c:2254 locale/programs/ld-ctype.c:3026
-#: locale/programs/ld-identification.c:468
-#: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
-#: locale/programs/ld-monetary.c:959 locale/programs/ld-name.c:323
-#: locale/programs/ld-numeric.c:384 locale/programs/ld-paper.c:257
-#: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1237
-#: locale/programs/locfile.c:826 locale/programs/repertoire.c:324
+#: locale/programs/charmap.c:849 locale/programs/ld-address.c:617
+#: locale/programs/ld-collate.c:2763 locale/programs/ld-collate.c:4117
+#: locale/programs/ld-ctype.c:2252 locale/programs/ld-ctype.c:3023
+#: locale/programs/ld-identification.c:467
+#: locale/programs/ld-measurement.c:253 locale/programs/ld-messages.c:347
+#: locale/programs/ld-monetary.c:958 locale/programs/ld-name.c:322
+#: locale/programs/ld-numeric.c:383 locale/programs/ld-paper.c:256
+#: locale/programs/ld-telephone.c:328 locale/programs/ld-time.c:1236
+#: locale/programs/locfile.c:825 locale/programs/repertoire.c:323
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s: æ?ªå®?æ??å·²é??æª?æ¡?ç??æ?«å°¾"
 
-#: locale/programs/charmap.c:869 locale/programs/charmap.c:880
+#: locale/programs/charmap.c:868 locale/programs/charmap.c:879
 #, c-format
 msgid "unknown character `%s'"
 msgstr "ä¸?æ??ç??å?å?? `%s'"
 
-#: locale/programs/charmap.c:888
+#: locale/programs/charmap.c:887
 #, c-format
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
 msgstr "å?¨ç¯?å??èµ·å§?è??çµ?æ??ç??ä½?å??çµ?åº?å??ä¸ï¼?ä½?å??çµ?ç??æ?¸ç?®ä¸¦ä¸?ä¸?è?´: %d vs %d"
 
-#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3046
-#: locale/programs/repertoire.c:419
+#: locale/programs/charmap.c:992 locale/programs/ld-collate.c:3043
+#: locale/programs/repertoire.c:418
 msgid "invalid names for character range"
 msgstr "ç?¡æ??ç??å?å??ç¯?å??å??ç¨±"
 
-#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431
+#: locale/programs/charmap.c:1004 locale/programs/repertoire.c:430
 msgid "hexadecimal range format should use only capital characters"
 msgstr "å?¨è¡¨ç¤ºå??å?é?²ä½?ç??ç¯?å??æ??å?ªè?½ç?¨å¤§å¯«ç??è?±æ??å?æ¯?è¡¨ç¤º"
 
-#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449
+#: locale/programs/charmap.c:1022 locale/programs/repertoire.c:448
 #, c-format
 msgid "<%s> and <%s> are invalid names for range"
 msgstr "<%s> ä»¥å?? <%s> æ?¯ä¸?é?©ç?¨ç??ç¯?å??å??ç¨±"
 
-#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456
+#: locale/programs/charmap.c:1028 locale/programs/repertoire.c:455
 msgid "upper limit in range is smaller than lower limit"
 msgstr "ç¯?å??ä¸ä¸?é??å°?æ?¼ä¸?é??"
 
-#: locale/programs/charmap.c:1087
+#: locale/programs/charmap.c:1086
 msgid "resulting bytes for range not representable."
 msgstr "ç?¨ä¾?å®?ç¾©ç¯?å??ç??ä½?å??çµ?ç?¡æ³?è¢«è¡¨è¿°å?ºä¾?"
 
-#: locale/programs/ld-address.c:135 locale/programs/ld-collate.c:1558
-#: locale/programs/ld-ctype.c:421 locale/programs/ld-identification.c:133
-#: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
-#: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:94
-#: locale/programs/ld-numeric.c:98 locale/programs/ld-paper.c:91
-#: locale/programs/ld-telephone.c:94 locale/programs/ld-time.c:159
+#: locale/programs/ld-address.c:134 locale/programs/ld-collate.c:1557
+#: locale/programs/ld-ctype.c:420 locale/programs/ld-identification.c:132
+#: locale/programs/ld-measurement.c:93 locale/programs/ld-messages.c:96
+#: locale/programs/ld-monetary.c:193 locale/programs/ld-name.c:93
+#: locale/programs/ld-numeric.c:97 locale/programs/ld-paper.c:90
+#: locale/programs/ld-telephone.c:93 locale/programs/ld-time.c:158
 #, c-format
 msgid "No definition for %s category found"
 msgstr "æ?¾ä¸?å?° %s é¡?å?¥ç??å®?ç¾©"
 
-#: locale/programs/ld-address.c:146 locale/programs/ld-address.c:184
-#: locale/programs/ld-address.c:202 locale/programs/ld-address.c:231
-#: locale/programs/ld-address.c:303 locale/programs/ld-address.c:322
-#: locale/programs/ld-address.c:335 locale/programs/ld-identification.c:146
-#: locale/programs/ld-measurement.c:105 locale/programs/ld-monetary.c:206
-#: locale/programs/ld-monetary.c:250 locale/programs/ld-monetary.c:266
-#: locale/programs/ld-monetary.c:278 locale/programs/ld-name.c:105
-#: locale/programs/ld-name.c:142 locale/programs/ld-numeric.c:112
-#: locale/programs/ld-numeric.c:126 locale/programs/ld-paper.c:102
-#: locale/programs/ld-paper.c:111 locale/programs/ld-telephone.c:105
-#: locale/programs/ld-telephone.c:162 locale/programs/ld-time.c:175
-#: locale/programs/ld-time.c:196
+#: locale/programs/ld-address.c:145 locale/programs/ld-address.c:183
+#: locale/programs/ld-address.c:201 locale/programs/ld-address.c:230
+#: locale/programs/ld-address.c:302 locale/programs/ld-address.c:321
+#: locale/programs/ld-address.c:334 locale/programs/ld-identification.c:145
+#: locale/programs/ld-measurement.c:104 locale/programs/ld-monetary.c:205
+#: locale/programs/ld-monetary.c:249 locale/programs/ld-monetary.c:265
+#: locale/programs/ld-monetary.c:277 locale/programs/ld-name.c:104
+#: locale/programs/ld-name.c:141 locale/programs/ld-numeric.c:111
+#: locale/programs/ld-numeric.c:125 locale/programs/ld-paper.c:101
+#: locale/programs/ld-paper.c:110 locale/programs/ld-telephone.c:104
+#: locale/programs/ld-telephone.c:161 locale/programs/ld-time.c:174
+#: locale/programs/ld-time.c:195
 #, c-format
 msgid "%s: field `%s' not defined"
 msgstr "%s: æ¬?ä½? `%s' æ²?æ??å®?ç¾©"
 
-#: locale/programs/ld-address.c:158 locale/programs/ld-address.c:210
-#: locale/programs/ld-address.c:240 locale/programs/ld-address.c:278
-#: locale/programs/ld-name.c:117 locale/programs/ld-telephone.c:117
+#: locale/programs/ld-address.c:157 locale/programs/ld-address.c:209
+#: locale/programs/ld-address.c:239 locale/programs/ld-address.c:277
+#: locale/programs/ld-name.c:116 locale/programs/ld-telephone.c:116
 #, c-format
 msgid "%s: field `%s' must not be empty"
 msgstr "%s: æ¬?ä½? `%s' ä¸?å?¯ä»¥ç©ºç?½"
 
-#: locale/programs/ld-address.c:170
+#: locale/programs/ld-address.c:169
 #, c-format
 msgid "%s: invalid escape `%%%c' sequence in field `%s'"
 msgstr "%s: ä¸?é?©ç?¨ç??è·³è?«åº?å?? `%%%c', å?¨æ¬?ä½? `%s' ä¸"
 
-#: locale/programs/ld-address.c:221
+#: locale/programs/ld-address.c:220
 #, c-format
 msgid "%s: terminology language code `%s' not defined"
 msgstr "%s: è¡?èª?èª?è¨?ç·¨ç¢¼ `%s' æ?ªå®?ç¾©"
 
-#: locale/programs/ld-address.c:246
+#: locale/programs/ld-address.c:245
 #, c-format
 msgid "%s: field `%s' must not be defined"
 msgstr "%s: æ¬?ä½?ã??%sã??å¿?é ?æ?ªè¢«å®?ç¾©"
 
-#: locale/programs/ld-address.c:260 locale/programs/ld-address.c:289
+#: locale/programs/ld-address.c:259 locale/programs/ld-address.c:288
 #, c-format
 msgid "%s: language abbreviation `%s' not defined"
 msgstr "%s: èª?è¨?ç¸®å¯« `%s' æ²?æ??å®?ç¾©"
 
-#: locale/programs/ld-address.c:267 locale/programs/ld-address.c:295
-#: locale/programs/ld-address.c:329 locale/programs/ld-address.c:341
+#: locale/programs/ld-address.c:266 locale/programs/ld-address.c:294
+#: locale/programs/ld-address.c:328 locale/programs/ld-address.c:340
 #, c-format
 msgid "%s: `%s' value does not match `%s' value"
 msgstr "%s: `%s' å?¼è?? `%s' å?¼ä¸?ç¬¦å??"
 
-#: locale/programs/ld-address.c:314
+#: locale/programs/ld-address.c:313
 #, c-format
 msgid "%s: numeric country code `%d' not valid"
 msgstr "%s: å??å®¶æ?¸å?ä»£ç¢¼ `%d' é?¯èª¤"
 
-#: locale/programs/ld-address.c:510 locale/programs/ld-address.c:547
-#: locale/programs/ld-address.c:585 locale/programs/ld-ctype.c:2633
-#: locale/programs/ld-identification.c:364
-#: locale/programs/ld-measurement.c:221 locale/programs/ld-messages.c:301
-#: locale/programs/ld-monetary.c:701 locale/programs/ld-monetary.c:736
-#: locale/programs/ld-monetary.c:777 locale/programs/ld-name.c:280
-#: locale/programs/ld-numeric.c:263 locale/programs/ld-paper.c:224
-#: locale/programs/ld-telephone.c:288 locale/programs/ld-time.c:1126
-#: locale/programs/ld-time.c:1168
+#: locale/programs/ld-address.c:509 locale/programs/ld-address.c:546
+#: locale/programs/ld-address.c:584 locale/programs/ld-ctype.c:2630
+#: locale/programs/ld-identification.c:363
+#: locale/programs/ld-measurement.c:220 locale/programs/ld-messages.c:300
+#: locale/programs/ld-monetary.c:700 locale/programs/ld-monetary.c:735
+#: locale/programs/ld-monetary.c:776 locale/programs/ld-name.c:279
+#: locale/programs/ld-numeric.c:262 locale/programs/ld-paper.c:223
+#: locale/programs/ld-telephone.c:287 locale/programs/ld-time.c:1125
+#: locale/programs/ld-time.c:1167
 #, c-format
 msgid "%s: field `%s' declared more than once"
 msgstr "%s: `%s' æ¬?ä½?ä¸?å?ªä¸?æ¬¡å?°å®£å??"
 
-#: locale/programs/ld-address.c:514 locale/programs/ld-address.c:552
-#: locale/programs/ld-identification.c:368 locale/programs/ld-messages.c:311
-#: locale/programs/ld-monetary.c:705 locale/programs/ld-monetary.c:740
-#: locale/programs/ld-name.c:284 locale/programs/ld-numeric.c:267
-#: locale/programs/ld-telephone.c:292 locale/programs/ld-time.c:1020
-#: locale/programs/ld-time.c:1089 locale/programs/ld-time.c:1131
+#: locale/programs/ld-address.c:513 locale/programs/ld-address.c:551
+#: locale/programs/ld-identification.c:367 locale/programs/ld-messages.c:310
+#: locale/programs/ld-monetary.c:704 locale/programs/ld-monetary.c:739
+#: locale/programs/ld-name.c:283 locale/programs/ld-numeric.c:266
+#: locale/programs/ld-telephone.c:291 locale/programs/ld-time.c:1019
+#: locale/programs/ld-time.c:1088 locale/programs/ld-time.c:1130
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: æ?ªç?¥ç??å?å??å?¨æ¬?ä½? `%s' ä¸"
 
-#: locale/programs/ld-address.c:599 locale/programs/ld-collate.c:3925
-#: locale/programs/ld-ctype.c:3006 locale/programs/ld-identification.c:449
-#: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
-#: locale/programs/ld-monetary.c:941 locale/programs/ld-name.c:305
-#: locale/programs/ld-numeric.c:366 locale/programs/ld-paper.c:239
-#: locale/programs/ld-telephone.c:311 locale/programs/ld-time.c:1219
+#: locale/programs/ld-address.c:598 locale/programs/ld-collate.c:3922
+#: locale/programs/ld-ctype.c:3003 locale/programs/ld-identification.c:448
+#: locale/programs/ld-measurement.c:234 locale/programs/ld-messages.c:329
+#: locale/programs/ld-monetary.c:940 locale/programs/ld-name.c:304
+#: locale/programs/ld-numeric.c:365 locale/programs/ld-paper.c:238
+#: locale/programs/ld-telephone.c:310 locale/programs/ld-time.c:1218
 #, c-format
 msgid "%s: incomplete `END' line"
 msgstr "%s: ä¸?å®?æ?´ç?? `END' å??"
 
-#: locale/programs/ld-address.c:609 locale/programs/ld-collate.c:544
-#: locale/programs/ld-collate.c:596 locale/programs/ld-collate.c:892
-#: locale/programs/ld-collate.c:905 locale/programs/ld-collate.c:2735
-#: locale/programs/ld-collate.c:2756 locale/programs/ld-collate.c:4110
-#: locale/programs/ld-ctype.c:1985 locale/programs/ld-ctype.c:2244
-#: locale/programs/ld-ctype.c:2831 locale/programs/ld-ctype.c:3017
-#: locale/programs/ld-identification.c:459
-#: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
-#: locale/programs/ld-monetary.c:950 locale/programs/ld-name.c:314
-#: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:248
-#: locale/programs/ld-telephone.c:320 locale/programs/ld-time.c:1228
+#: locale/programs/ld-address.c:608 locale/programs/ld-collate.c:543
+#: locale/programs/ld-collate.c:595 locale/programs/ld-collate.c:891
+#: locale/programs/ld-collate.c:904 locale/programs/ld-collate.c:2732
+#: locale/programs/ld-collate.c:2753 locale/programs/ld-collate.c:4107
+#: locale/programs/ld-ctype.c:1984 locale/programs/ld-ctype.c:2242
+#: locale/programs/ld-ctype.c:2828 locale/programs/ld-ctype.c:3014
+#: locale/programs/ld-identification.c:458
+#: locale/programs/ld-measurement.c:244 locale/programs/ld-messages.c:338
+#: locale/programs/ld-monetary.c:949 locale/programs/ld-name.c:313
+#: locale/programs/ld-numeric.c:374 locale/programs/ld-paper.c:247
+#: locale/programs/ld-telephone.c:319 locale/programs/ld-time.c:1227
 #, c-format
 msgid "%s: syntax error"
 msgstr "%s: èª?æ³?é?¯èª¤"
 
-#: locale/programs/ld-collate.c:419
+#: locale/programs/ld-collate.c:418
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "`%.*s' å?¨å?é??å°?ç?§è¡¨ä¸å·²ç¶?å®?ç¾©é??äº?"
 
-#: locale/programs/ld-collate.c:428
+#: locale/programs/ld-collate.c:427
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "`%.*s' å?¨ç·¨ç¢¼å°?æ? æª?ä¸å·²ç¶?è¢«å®?ç¾©é??äº?"
 
-#: locale/programs/ld-collate.c:435
+#: locale/programs/ld-collate.c:434
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "`%.*s' å·²è¢«å®?ç¾©ç?ºå°?ç?§ç¬¦è??"
 
-#: locale/programs/ld-collate.c:442
+#: locale/programs/ld-collate.c:441
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "`%.*s' å·²è¢«å®?ç¾©ç?ºå°?ç?§å??ç´ "
 
-#: locale/programs/ld-collate.c:473 locale/programs/ld-collate.c:499
+#: locale/programs/ld-collate.c:472 locale/programs/ld-collate.c:498
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: `forward' ä»¥å?? `backward' å½¼æ¤äº?ç?¸æ??æ?¥"
 
-#: locale/programs/ld-collate.c:483 locale/programs/ld-collate.c:509
-#: locale/programs/ld-collate.c:525
+#: locale/programs/ld-collate.c:482 locale/programs/ld-collate.c:508
+#: locale/programs/ld-collate.c:524
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s: `%s' ä¸?å?ªä¸?æ¬¡å?°å?¨æ¬?é?? %d ä¸è¢«æ??å?°"
 
-#: locale/programs/ld-collate.c:581
+#: locale/programs/ld-collate.c:580
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: å¤ªå¤?è¦?å??ï¼?ç¬¬ä¸?å??é ?ç?®å?ªå??å?« %d"
 
-#: locale/programs/ld-collate.c:617
+#: locale/programs/ld-collate.c:616
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: æ??åº?è¦?å??ä¸?è¶³"
 
-#: locale/programs/ld-collate.c:782
+#: locale/programs/ld-collate.c:781
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: ç©ºç?½ç??æ¬?é??å?ä¸²æ?¯ä¸?å??è¨±ç??"
 
-#: locale/programs/ld-collate.c:877
+#: locale/programs/ld-collate.c:876
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: æ¬?é??å¿?é ?ä½¿ç?¨è??å??ç¨±ç?¸å??ç??ç??ç?¥ç¬¦è??"
 
-#: locale/programs/ld-collate.c:933
+#: locale/programs/ld-collate.c:932
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: å¤ªå¤?è®?æ?¸å?¼"
 
-#: locale/programs/ld-collate.c:1053 locale/programs/ld-collate.c:1228
+#: locale/programs/ld-collate.c:1052 locale/programs/ld-collate.c:1227
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "`%.*s' ç??é ?åº?å·²ç¶?å?¨ %s:%Zu è£¡é?¢å®?ç¾©äº?"
 
-#: locale/programs/ld-collate.c:1103
+#: locale/programs/ld-collate.c:1102
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: å??å§?è??çµ?æ??ç¬¦è??ç¯?å??å¿?é ?ä»£è¡¨å?å??"
 
-#: locale/programs/ld-collate.c:1130
+#: locale/programs/ld-collate.c:1129
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 msgstr "%s: ç¬¬ä¸?å??è??æ??å¾?ä¸?å??å?å??ç??ä½?å??çµ?åº?å??å¿?é ?æ??ç?¸å??ç??é?·åº¦"
 
-#: locale/programs/ld-collate.c:1172
+#: locale/programs/ld-collate.c:1171
 #, c-format
 msgid "%s: byte sequence of first character of range is not lower than that of the last character"
 msgstr "%s: ç¯?å??é¦?å?å??ç??ä½?å??çµ?åº?å??æ²?æ??ä½?æ?¼æ?«å?å??ç??ä½?å??çµ?åº?å??"
 
-#: locale/programs/ld-collate.c:1297
+#: locale/programs/ld-collate.c:1296
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: ç¬¦è??ç¯?å??ç??ç??ç?¥ä¸?å?¯ä»¥ç?´æ?¥å?¨ `order_start' ä¹?å¾?"
 
-#: locale/programs/ld-collate.c:1301
+#: locale/programs/ld-collate.c:1300
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr "%s: ç¬¦è??ç¯?å??ç??ç??ç?¥ä¸?å?¯ä»¥ç?´æ?¥å?¨ `order_end' ä¹?å??"
 
-#: locale/programs/ld-collate.c:1321 locale/programs/ld-ctype.c:1502
+#: locale/programs/ld-collate.c:1320 locale/programs/ld-ctype.c:1501
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' å?? `%.*s' ç??é??ç¬¦è??ç¯?å??ä¸é?©ç?¨ç??å??ç¨±"
 
-#: locale/programs/ld-collate.c:1371 locale/programs/ld-collate.c:3861
+#: locale/programs/ld-collate.c:1370 locale/programs/ld-collate.c:3858
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: `%.*s' ç??é ?åº?å·²å?¨ %s:%Zu ä¸å®?ç¾©"
 
-#: locale/programs/ld-collate.c:1380
+#: locale/programs/ld-collate.c:1379
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: `%s' å¿?é ?æ?¯ä¸?å??å?å??"
 
-#: locale/programs/ld-collate.c:1575
+#: locale/programs/ld-collate.c:1574
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
 msgstr "%s: `position' å¿?é ?å?¨æ??æ??å??å¡?è£¡ç?¹å®?ç??ç?ç´?ä¸ä½¿ç?¨ï¼?å?¦å??ä¸?è?½ä½¿ç?¨"
 
-#: locale/programs/ld-collate.c:1600
+#: locale/programs/ld-collate.c:1599
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "ä¸¦æ?ªå®?ç¾© `%s' ç¬¦è??"
 
-#: locale/programs/ld-collate.c:1676 locale/programs/ld-collate.c:1782
+#: locale/programs/ld-collate.c:1675 locale/programs/ld-collate.c:1781
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "è·?ç¬¦è?? `%s' æ??ç?¸å??ç??ç·¨ç¢¼: "
 
-#: locale/programs/ld-collate.c:1680 locale/programs/ld-collate.c:1786
+#: locale/programs/ld-collate.c:1679 locale/programs/ld-collate.c:1785
 #, c-format
 msgid "symbol `%s'"
 msgstr "ç¬¦è?? `%s'"
 
-#: locale/programs/ld-collate.c:1828
+#: locale/programs/ld-collate.c:1827
 #, c-format
 msgid "no definition of `UNDEFINED'"
 msgstr "æ²?æ??æ?¾å?° `UNDEFINED' ç??å®?ç¾©"
 
-#: locale/programs/ld-collate.c:1857
+#: locale/programs/ld-collate.c:1856
 #, c-format
 msgid "too many errors; giving up"
 msgstr "ç?¼ç??å¤ªå¤?é?¯èª¤ï¼?æ?¾æ£?ä¸"
 
-#: locale/programs/ld-collate.c:2661 locale/programs/ld-collate.c:4049
+#: locale/programs/ld-collate.c:2658 locale/programs/ld-collate.c:4046
 #, c-format
 msgid "%s: nested conditionals not supported"
 msgstr "%s: ä¸?æ?¯æ?´å·¢ç??æ¢?ä»¶"
 
-#: locale/programs/ld-collate.c:2679
+#: locale/programs/ld-collate.c:2676
 #, c-format
 msgid "%s: more then one 'else'"
 msgstr "%s: ä½¿ç?¨å¤?æ?¼ä¸?å??ã??elseã??"
 
-#: locale/programs/ld-collate.c:2854
+#: locale/programs/ld-collate.c:2851
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: é??è¤?ç??å®?ç¾© `%s'"
 
-#: locale/programs/ld-collate.c:2890
+#: locale/programs/ld-collate.c:2887
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: é??è¤?ç?? `%s' å??å¡?å®£å??"
 
-#: locale/programs/ld-collate.c:3026
+#: locale/programs/ld-collate.c:3023
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: æ?ªç?¥ç??å?å??å?¨å°?ç?§ç¬¦è??å??ç¨±ä¸"
 
-#: locale/programs/ld-collate.c:3155
+#: locale/programs/ld-collate.c:3152
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: æ?ªç?¥ç??å?å??å?¨å??ç¾©å®?ç¾©å??ç¨±ä¸"
 
-#: locale/programs/ld-collate.c:3166
+#: locale/programs/ld-collate.c:3163
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: æ?ªç?¥ç??å?å??å?¨å??ç¾©å®?ç¾©å?¼ä¸"
 
-#: locale/programs/ld-collate.c:3176
+#: locale/programs/ld-collate.c:3173
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: æ?ªç?¥ç??ç¬¦è?? `%s' å?¨å??ç¾©å®?ç¾©ä¸"
 
-#: locale/programs/ld-collate.c:3185
+#: locale/programs/ld-collate.c:3182
 msgid "error while adding equivalent collating symbol"
 msgstr "æ£å?¨å? å?¥å??ç¾©å°?ç?§ç¬¦è??æ??ç?¼ç??é?¯èª¤"
 
-#: locale/programs/ld-collate.c:3223
+#: locale/programs/ld-collate.c:3220
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "æ??è¿° `%s' ç??å®?ç¾©é??è¤?äº?"
 
-#: locale/programs/ld-collate.c:3271
+#: locale/programs/ld-collate.c:3268
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr "%s: ä¸?æ??ç??ç¯?æ®µå??ç¨±ã??%.*sã??"
 
-#: locale/programs/ld-collate.c:3300
+#: locale/programs/ld-collate.c:3297
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: `%s' å??å¡?ä¸æ??å¤?å??é ?åº?å®?ç¾©"
 
-#: locale/programs/ld-collate.c:3328
+#: locale/programs/ld-collate.c:3325
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: ä¸?é?©ç?¨ç??æ??åº?è¦?å??æ?¸ç?®"
 
-#: locale/programs/ld-collate.c:3355
+#: locale/programs/ld-collate.c:3352
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: æ?ªå?½å??ç??å??å¡?ä¸æ??å¤?å??é ?åº?å®?ç¾©"
 
-#: locale/programs/ld-collate.c:3410 locale/programs/ld-collate.c:3540
-#: locale/programs/ld-collate.c:3903
+#: locale/programs/ld-collate.c:3407 locale/programs/ld-collate.c:3537
+#: locale/programs/ld-collate.c:3900
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: ç¼ºå°? `order_end' é??é?µå?"
 
-#: locale/programs/ld-collate.c:3473
+#: locale/programs/ld-collate.c:3470
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: å°?ç?§ç¬¦è?? %.*s ç??é ?åº?å°?æ?ªå®?ç¾©"
 
-#: locale/programs/ld-collate.c:3491
+#: locale/programs/ld-collate.c:3488
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: å°?ç?§å??ç´  %.*s ç??é ?åº?å°?æ?ªå®?ç¾©"
 
-#: locale/programs/ld-collate.c:3502
+#: locale/programs/ld-collate.c:3499
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: ç?¡æ³?é??æ?°æ??å??å?¨ %.*s ä¹?å¾?: æ?ªç?¥ç??ç¬¦è??"
 
-#: locale/programs/ld-collate.c:3554 locale/programs/ld-collate.c:3915
+#: locale/programs/ld-collate.c:3551 locale/programs/ld-collate.c:3912
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: ç¼ºå°? `reorder-end' é??é?µå?"
 
-#: locale/programs/ld-collate.c:3588 locale/programs/ld-collate.c:3786
+#: locale/programs/ld-collate.c:3585 locale/programs/ld-collate.c:3783
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: æ?ªç?¥ç??å??å¡? `%.*s'"
 
-#: locale/programs/ld-collate.c:3653
+#: locale/programs/ld-collate.c:3650
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: ä¸?ç?¶ç??ç¬¦è?? <%.*s>"
 
-#: locale/programs/ld-collate.c:3849
+#: locale/programs/ld-collate.c:3846
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: ç?¡æ³?ç?¨ `%s' å??ç?ºç??ç?¥å??æ®µç??çµ?å°¾"
 
-#: locale/programs/ld-collate.c:3899
+#: locale/programs/ld-collate.c:3896
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: ç©ºç?½ç??é¡?å?¥æ??è¿°æ?¯ä¸?å??è¨±ç??"
 
-#: locale/programs/ld-collate.c:3918
+#: locale/programs/ld-collate.c:3915
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: ç¼ºå°? `reorder-sections-end' é??é?µå?"
 
-#: locale/programs/ld-collate.c:4082
+#: locale/programs/ld-collate.c:4079
 #, c-format
 msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
 msgstr "%s:ã??%sã??è??ä¸?é??å?»å??ä¸ã??ifdefã??æ??ã??ifndefã??"
 
-#: locale/programs/ld-collate.c:4100
+#: locale/programs/ld-collate.c:4097
 #, c-format
 msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
 msgstr "%s:ã??endifã??è??ä¸?é??å?»å??ä¸ã??ifdefã??æ??ã??ifndefã??"
 
-#: locale/programs/ld-ctype.c:440
+#: locale/programs/ld-ctype.c:439
 #, c-format
 msgid "No character set name specified in charmap"
 msgstr "å?¨å?å??å°?æ?? (charmap) ä¸æ²?æ??è¨å®?å?é??å??ç¨±"
 
-#: locale/programs/ld-ctype.c:469
+#: locale/programs/ld-ctype.c:468
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr "character L'\\u%0*x' (æ?¾å?¨é¡?å?¥ `%s' ä¹?ä¸) å¿?é ?å?¨é¡?å?¥ `%s' è£¡é?¢"
 
-#: locale/programs/ld-ctype.c:484
+#: locale/programs/ld-ctype.c:483
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr "character L'\\u%0*x' (æ?¾å?¨é¡?å?¥ `%s' ä¹?ä¸) ä¸?è?½å?¨é¡?å?¥ `%s' è£¡é?¢"
 
-#: locale/programs/ld-ctype.c:498 locale/programs/ld-ctype.c:556
+#: locale/programs/ld-ctype.c:497 locale/programs/ld-ctype.c:555
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr "%s ç??ç¬¬ %u å??ç?¼ç??å?§é?¨é?¯èª¤"
 
-#: locale/programs/ld-ctype.c:527
+#: locale/programs/ld-ctype.c:526
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr "å?å?? '%s' (æ?¾å?¨é¡?å?¥ `%s' ä¹?ä¸) å¿?é ?å?¨é¡?å?¥ `%s' è£¡é?¢"
 
-#: locale/programs/ld-ctype.c:543
+#: locale/programs/ld-ctype.c:542
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr "å?å?? '%s' (æ?¾å?¨é¡?å?¥ `%s' ä¹?ä¸) ä¸?è?½å?¨é¡?å?¥ `%s' è£¡é?¢"
 
-#: locale/programs/ld-ctype.c:573 locale/programs/ld-ctype.c:611
+#: locale/programs/ld-ctype.c:572 locale/programs/ld-ctype.c:610
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr "<SP> å?å??ä¸?å?¨é¡?å?¥ `%s' ä¸"
 
-#: locale/programs/ld-ctype.c:585 locale/programs/ld-ctype.c:622
+#: locale/programs/ld-ctype.c:584 locale/programs/ld-ctype.c:621
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr "<SP> å?å??ä¸?å?¯ä»¥å?¨é¡?å?¥ `%s' ä¸"
 
-#: locale/programs/ld-ctype.c:600
+#: locale/programs/ld-ctype.c:599
 #, c-format
 msgid "character <SP> not defined in character map"
 msgstr "å?å?? <SP> å?¨å?é??å°?ç?§æª?ä¸æ²?æ??å®?ç¾©"
 
-#: locale/programs/ld-ctype.c:736
+#: locale/programs/ld-ctype.c:735
 #, c-format
 msgid "`digit' category has not entries in groups of ten"
 msgstr "`digit' é¡?å?¥å?¨ç¾¤çµ? \"å??\" ä¸æ²?æ??é ?ç?®"
 
-#: locale/programs/ld-ctype.c:785
+#: locale/programs/ld-ctype.c:784
 #, c-format
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr "æ²?æ??å®?ç¾©è¼¸å?¥æ?¸å?ï¼?å?¨å?é??å°?ç?§æª?ä¸ä¹?æ?¾ä¸?å?°ç?¸ç¬¦ç??æ¨?æº?å??ç¨±"
 
-#: locale/programs/ld-ctype.c:850
+#: locale/programs/ld-ctype.c:849
 #, c-format
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr "å?¨å?é??å°?ç?§è¡¨ä¸ç?¡æ³?æ?¾å?°æ??äº?å?¨ `outdigit' ä¸ç?¨å?°ç??å?å??"
 
-#: locale/programs/ld-ctype.c:867
+#: locale/programs/ld-ctype.c:866
 #, c-format
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr "å?¨ç·¨ç¢¼å°?æ? æª?ä¸ç?¡æ³?æ?¾å?°æ??äº?å?¨ `outdigit' ä¸ç?¨å?°ç??å?å??"
 
-#: locale/programs/ld-ctype.c:1270
+#: locale/programs/ld-ctype.c:1269
 #, c-format
 msgid "character class `%s' already defined"
 msgstr "å?å??é¡?å?¥ `%s' å·²ç¶?å®?ç¾©é??äº?"
 
-#: locale/programs/ld-ctype.c:1276
+#: locale/programs/ld-ctype.c:1275
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr "ç¨?å¼?å¯¦ä½?ç??é??å?¶: ä¸?è?½ä½¿ç?¨è¶?é?? %Zd å??å?é??é¡?å?¥"
 
-#: locale/programs/ld-ctype.c:1302
+#: locale/programs/ld-ctype.c:1301
 #, c-format
 msgid "character map `%s' already defined"
 msgstr "å?é??å°?ç?§æª? `%s' å·²ç¶?å®?ç¾©é??äº?"
 
-#: locale/programs/ld-ctype.c:1308
+#: locale/programs/ld-ctype.c:1307
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr "ç¨?å¼?å¯¦ä½?ç??é??å?¶: ä¸?è?½ä½¿ç?¨è¶?é?? %d å??å?é??å°?ç?§æª?"
 
-#: locale/programs/ld-ctype.c:1573 locale/programs/ld-ctype.c:1698
-#: locale/programs/ld-ctype.c:1804 locale/programs/ld-ctype.c:2496
-#: locale/programs/ld-ctype.c:3492
+#: locale/programs/ld-ctype.c:1572 locale/programs/ld-ctype.c:1697
+#: locale/programs/ld-ctype.c:1803 locale/programs/ld-ctype.c:2493
+#: locale/programs/ld-ctype.c:3489
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr "%s: `%s' æ¬?ä½?æ²?æ??ç²¾ç¢ºå??å?«å??å??é ?ç?®"
 
-#: locale/programs/ld-ctype.c:1601 locale/programs/ld-ctype.c:2175
+#: locale/programs/ld-ctype.c:1600 locale/programs/ld-ctype.c:2174
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr "å??å??å®?ç¾©ç??çµ?å°¾å?¼ <U%0*X> æ¯?èµ·å§?å?¼ <U%0*X> é??è¦?å°?"
 
-#: locale/programs/ld-ctype.c:1728
+#: locale/programs/ld-ctype.c:1727
 msgid "start and end character sequence of range must have the same length"
 msgstr "å¾?èµ·å§?å?°çµ?æ??ä¹?é??ç??å?å??åº?å??é?·åº¦è·?ç·¨ç¢¼ç¯?å??å¿?é ?ç?¸å??"
 
-#: locale/programs/ld-ctype.c:1735
+#: locale/programs/ld-ctype.c:1734
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr "å?å??åº?å??å®?ç¾©ç??çµ?å°¾å?¼æ¯?èµ·å§?å?¼é??è¦?å°?"
 
-#: locale/programs/ld-ctype.c:2095 locale/programs/ld-ctype.c:2146
+#: locale/programs/ld-ctype.c:2094 locale/programs/ld-ctype.c:2145
 msgid "premature end of `translit_ignore' definition"
 msgstr "`translit_ignore' å®?ç¾©æ²?æ??æ??æ??çµ?æ??"
 
-#: locale/programs/ld-ctype.c:2101 locale/programs/ld-ctype.c:2152
-#: locale/programs/ld-ctype.c:2194
+#: locale/programs/ld-ctype.c:2100 locale/programs/ld-ctype.c:2151
+#: locale/programs/ld-ctype.c:2193
 msgid "syntax error"
 msgstr "èª?æ³?é?¯èª¤"
 
-#: locale/programs/ld-ctype.c:2328
+#: locale/programs/ld-ctype.c:2326
 #, c-format
 msgid "%s: syntax error in definition of new character class"
 msgstr "%s: å?¨å®?ç¾©æ?°å?å??é¡?å?¥æ??èª?æ³?é?¯èª¤"
 
-#: locale/programs/ld-ctype.c:2343
+#: locale/programs/ld-ctype.c:2341
 #, c-format
 msgid "%s: syntax error in definition of new character map"
 msgstr "%s: å?¨å®?ç¾©æ?°å?å??å°?æ??æ??èª?æ³?é?¯èª¤"
 
-#: locale/programs/ld-ctype.c:2518
+#: locale/programs/ld-ctype.c:2515
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr "ç??ç?¥å??å??å¿?é ?ç?¨å?©å??å??å?¥ç?¸å??ç??é??ç®?å??æ¨?ç¤ºå?ºä¾?"
 
-#: locale/programs/ld-ctype.c:2527
+#: locale/programs/ld-ctype.c:2524
 msgid "with symbolic name range values the absolute ellipsis `...' must not be used"
-msgstr "ç?¨ç¬¦è??å??ç¨±ä¾?æ??å®?å?å??ç·¨ç¢¼ç¯?å??æ??ä¸?å?¯ä»¥ç?¨çµ?å°?ä½?ç½®ç??ç??ç?¥ç¬¦è?? `...'"
+msgstr "ç?¨ç¬¦è??å??ç¨±ä¾?æ??å®?å?å??ç·¨ç¢¼ç¯?å??æ??ä¸?å?¯ä»¥ç?¨çµ?å°?ä½?ç½®ç??ç??ç?¥ç¬¦è?? `â?¦'"
 
-#: locale/programs/ld-ctype.c:2542
+#: locale/programs/ld-ctype.c:2539
 msgid "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr "ç?¨ä¾?æ??å®? UCS å?¼ç??ç¯?å??æ??å¾?ç?¨å??å?é?²ä½?è¡¨ç¤ºç??ç??ç?¥ç¬¦è?? `..'"
 
-#: locale/programs/ld-ctype.c:2556
+#: locale/programs/ld-ctype.c:2553
 msgid "with character code range values one must use the absolute ellipsis `...'"
-msgstr "ç?¨ä¾?æ??å®?å?å??ç·¨ç¢¼å?¼ç??ç¯?å??æ??å¾?ç?¨çµ?å°?ä½?ç½®ç??ç??ç?¥ç¬¦è?? `...'"
+msgstr "ç?¨ä¾?æ??å®?å?å??ç·¨ç¢¼å?¼ç??ç¯?å??æ??å¾?ç?¨çµ?å°?ä½?ç½®ç??ç??ç?¥ç¬¦è?? `â?¦'"
 
-#: locale/programs/ld-ctype.c:2707
+#: locale/programs/ld-ctype.c:2704
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr "å°?æ?  `%s' ç??å®?ç¾©é??è¤?äº?"
 
-#: locale/programs/ld-ctype.c:2793 locale/programs/ld-ctype.c:2937
+#: locale/programs/ld-ctype.c:2790 locale/programs/ld-ctype.c:2934
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
 msgstr "%s: `translit_start' å°?ç¯?ä¸¦æ²?æ??ä»¥ `translit_end' å??ç?ºçµ?æ??"
 
-#: locale/programs/ld-ctype.c:2888
+#: locale/programs/ld-ctype.c:2885
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr "%s: é??è¤?ç?? `default_missing' å®?ç¾©"
 
-#: locale/programs/ld-ctype.c:2893
+#: locale/programs/ld-ctype.c:2890
 msgid "previous definition was here"
 msgstr "å??å??ç??è¨å®?å?¨æ¤"
 
-#: locale/programs/ld-ctype.c:2915
+#: locale/programs/ld-ctype.c:2912
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
 msgstr "%s: æ?¾ä¸?å?°å?¯è¡¨ç¤ºç?º `default_missing' ç??å®?ç¾©"
 
-#: locale/programs/ld-ctype.c:3068 locale/programs/ld-ctype.c:3152
-#: locale/programs/ld-ctype.c:3172 locale/programs/ld-ctype.c:3193
-#: locale/programs/ld-ctype.c:3214 locale/programs/ld-ctype.c:3235
-#: locale/programs/ld-ctype.c:3256 locale/programs/ld-ctype.c:3296
-#: locale/programs/ld-ctype.c:3317 locale/programs/ld-ctype.c:3384
-#: locale/programs/ld-ctype.c:3426 locale/programs/ld-ctype.c:3451
+#: locale/programs/ld-ctype.c:3065 locale/programs/ld-ctype.c:3149
+#: locale/programs/ld-ctype.c:3169 locale/programs/ld-ctype.c:3190
+#: locale/programs/ld-ctype.c:3211 locale/programs/ld-ctype.c:3232
+#: locale/programs/ld-ctype.c:3253 locale/programs/ld-ctype.c:3293
+#: locale/programs/ld-ctype.c:3314 locale/programs/ld-ctype.c:3381
+#: locale/programs/ld-ctype.c:3423 locale/programs/ld-ctype.c:3448
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr "%s: å?å?? `%s' æ²?æ??å®?ç¾©ï¼?ä½?å®?æ?¯å¿?é??ç??é ?è¨å?¼"
 
-#: locale/programs/ld-ctype.c:3073 locale/programs/ld-ctype.c:3157
-#: locale/programs/ld-ctype.c:3177 locale/programs/ld-ctype.c:3198
-#: locale/programs/ld-ctype.c:3219 locale/programs/ld-ctype.c:3240
-#: locale/programs/ld-ctype.c:3261 locale/programs/ld-ctype.c:3301
-#: locale/programs/ld-ctype.c:3322 locale/programs/ld-ctype.c:3389
+#: locale/programs/ld-ctype.c:3070 locale/programs/ld-ctype.c:3154
+#: locale/programs/ld-ctype.c:3174 locale/programs/ld-ctype.c:3195
+#: locale/programs/ld-ctype.c:3216 locale/programs/ld-ctype.c:3237
+#: locale/programs/ld-ctype.c:3258 locale/programs/ld-ctype.c:3298
+#: locale/programs/ld-ctype.c:3319 locale/programs/ld-ctype.c:3386
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr "%s: å?é??å°?ç?§è¡¨ä¸ç??å?å?? `%s' ç?¡æ³?è¡¨ç¤ºç?ºå?®ä¸?ä½?å??çµ?"
 
-#: locale/programs/ld-ctype.c:3433 locale/programs/ld-ctype.c:3458
+#: locale/programs/ld-ctype.c:3430 locale/programs/ld-ctype.c:3455
 #, c-format
 msgid "%s: character `%s' needed as default value not representable with one byte"
 msgstr "%s: å??ç?ºé ?è¨å?¼æ??é??ç??å?å?? `%s' ç?¡æ³?è¡¨ç¤ºç?ºå?®ä¸?ä½?å??çµ?"
 
-#: locale/programs/ld-ctype.c:3514
+#: locale/programs/ld-ctype.c:3511
 #, c-format
 msgid "no output digits defined and none of the standard names in the charmap"
 msgstr "æ²?æ??å®?ç¾©è¼¸å?ºæ?¸å?ï¼?å?¨å?é??å°?ç?§æª?ä¸ä¹?æ?¾ä¸?å?°ç?¸ç¬¦ç??æ¨?æº?å??ç¨±"
 
-#: locale/programs/ld-ctype.c:3805
+#: locale/programs/ld-ctype.c:3802
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
 msgstr "%s: èª?å??è³?æ??`%s' ç??é?³è¯è³?æ??ä¸?å?å?¨"
 
-#: locale/programs/ld-ctype.c:3906
+#: locale/programs/ld-ctype.c:3903
 #, c-format
 msgid "%s: table for class \"%s\": %lu bytes\n"
 msgstr "%s: é¡?å?¥ \"%s\" è¡¨æ ¼: %lu ä½?å??çµ?\n"
 
-#: locale/programs/ld-ctype.c:3975
+#: locale/programs/ld-ctype.c:3972
 #, c-format
 msgid "%s: table for map \"%s\": %lu bytes\n"
 msgstr "%s: å°?æ? è¡¨ \"%s\" è¡¨æ ¼: %lu ä½?å??çµ?\n"
 
-#: locale/programs/ld-ctype.c:4108
+#: locale/programs/ld-ctype.c:4105
 #, c-format
 msgid "%s: table for width: %lu bytes\n"
 msgstr "%s: å¯¬åº¦è¡¨æ ¼: %lu ä½?å??çµ?\n"
 
-#: locale/programs/ld-identification.c:170
+#: locale/programs/ld-identification.c:169
 #, c-format
 msgid "%s: no identification for category `%s'"
 msgstr "%s: é¡?å?¥ `%s' æ²?æ??èª?è?"
 
-#: locale/programs/ld-identification.c:435
+#: locale/programs/ld-identification.c:434
 #, c-format
 msgid "%s: duplicate category version definition"
 msgstr "%s: é??è¤?ç??é¡?å?¥ç??æ?¬å®?ç¾©"
 
-#: locale/programs/ld-measurement.c:113
+#: locale/programs/ld-measurement.c:112
 #, c-format
 msgid "%s: invalid value for field `%s'"
 msgstr "%s: å?¨æ¬?ä½? `%s' ä¸ç??å?¼ä¸?é?©ç?¨"
 
-#: locale/programs/ld-messages.c:114 locale/programs/ld-messages.c:148
+#: locale/programs/ld-messages.c:113 locale/programs/ld-messages.c:147
 #, c-format
 msgid "%s: field `%s' undefined"
 msgstr "%s: æ¬?ä½? `%s' æ²?æ??å®?ç¾©"
 
-#: locale/programs/ld-messages.c:121 locale/programs/ld-messages.c:155
-#: locale/programs/ld-monetary.c:256 locale/programs/ld-numeric.c:118
+#: locale/programs/ld-messages.c:120 locale/programs/ld-messages.c:154
+#: locale/programs/ld-monetary.c:255 locale/programs/ld-numeric.c:117
 #, c-format
 msgid "%s: value for field `%s' must not be an empty string"
 msgstr "%s: æ¬?ä½? `%s' å?¼ä¸?å?¯ä»¥æ?¯ç©ºå?ä¸²"
 
-#: locale/programs/ld-messages.c:137 locale/programs/ld-messages.c:171
+#: locale/programs/ld-messages.c:136 locale/programs/ld-messages.c:170
 #, c-format
 msgid "%s: no correct regular expression for field `%s': %s"
 msgstr "%s: æ²?æ??çµ¦æ¬?ä½? `%s' æ£ç¢ºç??å¸¸è¦?è¡¨ç¤ºå¼?ï¼? %s"
 
-#: locale/programs/ld-monetary.c:224
+#: locale/programs/ld-monetary.c:223
 #, c-format
 msgid "%s: value of field `int_curr_symbol' has wrong length"
 msgstr "%s: æ¬?ä½? `int_curr_symbol' å?¼ç??é?·åº¦é?¯èª¤"
 
-#: locale/programs/ld-monetary.c:237
+#: locale/programs/ld-monetary.c:236
 #, c-format
 msgid "%s: value of field `int_curr_symbol' does not correspond to a valid name in ISO 4217"
 msgstr "%s: æ¬?ä½? `int_curr_symbol' å?¼ä¸¦ä¸?æ?¯ ISO 4217 ä¸å??æ³?ç??å??ç¨±"
 
-#: locale/programs/ld-monetary.c:285 locale/programs/ld-monetary.c:315
+#: locale/programs/ld-monetary.c:284 locale/programs/ld-monetary.c:314
 #, c-format
 msgid "%s: value for field `%s' must be in range %d...%d"
-msgstr "%s: æ¬?ä½? `%s' ç??å?¼å¿?é ?å?¨ç¯?å?? %d...%d"
+msgstr "%s: æ¬?ä½? `%s' ç??å?¼å¿?é ?å?¨ç¯?å?? %dâ?¦%d"
 
-#: locale/programs/ld-monetary.c:747 locale/programs/ld-numeric.c:274
+#: locale/programs/ld-monetary.c:746 locale/programs/ld-numeric.c:273
 #, c-format
 msgid "%s: value for field `%s' must be a single character"
 msgstr "%s: æ¬?ä½? `%s' ç??å?¼å¿?é ?æ?¯å??å?®ä¸?å?å??"
 
-#: locale/programs/ld-monetary.c:844 locale/programs/ld-numeric.c:318
+#: locale/programs/ld-monetary.c:843 locale/programs/ld-numeric.c:317
 #, c-format
 msgid "%s: `-1' must be last entry in `%s' field"
 msgstr "%s: `-1' å?¨ `%s' æ¬?ä½?ä¸å¿?é ?æ?¯æ??å¾?ä¸?å??é ?ç?®"
 
-#: locale/programs/ld-monetary.c:866 locale/programs/ld-numeric.c:335
+#: locale/programs/ld-monetary.c:865 locale/programs/ld-numeric.c:334
 #, c-format
 msgid "%s: values for field `%s' must be smaller than 127"
 msgstr "%s: æ¬?ä½? `%s' ç??å?¼å¿?é ?å°?æ?¼ 127"
 
-#: locale/programs/ld-monetary.c:909
+#: locale/programs/ld-monetary.c:908
 msgid "conversion rate value cannot be zero"
 msgstr "è½?æ??ç??ç??å?¼ä¸?å?¯ä»¥æ?¯é?¶"
 
-#: locale/programs/ld-name.c:129 locale/programs/ld-telephone.c:126
-#: locale/programs/ld-telephone.c:149
+#: locale/programs/ld-name.c:128 locale/programs/ld-telephone.c:125
+#: locale/programs/ld-telephone.c:148
 #, c-format
 msgid "%s: invalid escape sequence in field `%s'"
 msgstr "%s: å?¨æ¬?ä½? `%s' ä¸ç??è·³è?«åº?å??ä¸?é?©ç?¨"
 
-#: locale/programs/ld-time.c:247
+#: locale/programs/ld-time.c:246
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not '+' nor '-'"
 msgstr "%s: å?¨ `era' æ¬?ä½?ç??å?ä¸² %Zd ä¸ï¼?æ?¹å??æ??æ¨?æ?¢ä¸?æ?¯ '+' ä¹?ä¸?æ?¯ '-'"
 
-#: locale/programs/ld-time.c:258
+#: locale/programs/ld-time.c:257
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not a single character"
 msgstr "%s: å?¨ `era' æ¬?ä½?ç??å?ä¸² %Zd ä¸ï¼?æ?¹å??æ??æ¨?ä¸?æ?¯ä¸?å??å?®ä¸?å?å??"
 
-#: locale/programs/ld-time.c:271
+#: locale/programs/ld-time.c:270
 #, c-format
 msgid "%s: invalid number for offset in string %Zd in `era' field"
 msgstr "%s: å?¨ `era' æ¬?ä½?ã??å?ä¸² %Zd ä¸ç??ä½?ç§»æ?¸å?ä¸?é?©ç?¨"
 
-#: locale/programs/ld-time.c:279
+#: locale/programs/ld-time.c:278
 #, c-format
 msgid "%s: garbage at end of offset value in string %Zd in `era' field"
 msgstr "%s: ç?¡ç?¨ç??è³?æ??ï¼?å?¨ `era' æ¬?ä½?ã??å?ä¸² %Zd ä¸æ?«å°¾ç??ä½?ç§»å?¼"
 
-#: locale/programs/ld-time.c:330
+#: locale/programs/ld-time.c:329
 #, c-format
 msgid "%s: invalid starting date in string %Zd in `era' field"
 msgstr "%s: å?¨ `era' æ¬?ä½?ã??å?ä¸² %Zd ä¸ç??èµ·å§?æ?¥æ??ä¸?é?©ç?¨"
 
-#: locale/programs/ld-time.c:339
+#: locale/programs/ld-time.c:338
 #, c-format
 msgid "%s: garbage at end of starting date in string %Zd in `era' field "
 msgstr "%s: ç?¡ç?¨ç??è³?æ??ï¼?å?¨ `era' æ¬?ä½?ã??å?ä¸² %Zd ä¸æ?«å°¾ç??èµ·å§?æ?¥æ??"
 
-#: locale/programs/ld-time.c:358
+#: locale/programs/ld-time.c:357
 #, c-format
 msgid "%s: starting date is invalid in string %Zd in `era' field"
 msgstr "%s: å?¨ `era' å??å??ç??å?ä¸² %Zd ä¸ç??å??å§?æ?¥æ??æ?¯ä¸?é?©ç?¨ç??"
 
-#: locale/programs/ld-time.c:407 locale/programs/ld-time.c:435
+#: locale/programs/ld-time.c:406 locale/programs/ld-time.c:434
 #, c-format
 msgid "%s: invalid stopping date in string %Zd in `era' field"
 msgstr "%s: å?¨ `era' æ¬?ä½?ã??å?ä¸² %Zd ä¸ç??çµ?æ??æ?¥æ??ä¸?é?©ç?¨"
 
-#: locale/programs/ld-time.c:416
+#: locale/programs/ld-time.c:415
 #, c-format
 msgid "%s: garbage at end of stopping date in string %Zd in `era' field"
 msgstr "%s: ç?¡ç?¨ç??è³?æ??ï¼?å?¨ `era' å??å??ã??å?ä¸² %Zd ä¸æ?«å°¾ç??çµ?æ??æ?¥æ??"
 
-#: locale/programs/ld-time.c:444
+#: locale/programs/ld-time.c:443
 #, c-format
 msgid "%s: missing era name in string %Zd in `era' field"
 msgstr "%s: ç¼ºå°? era å??ç¨±ï¼?å?¨ `era' æ¬?ä½?ã??å?ä¸² %Zd ä¸"
 
-#: locale/programs/ld-time.c:456
+#: locale/programs/ld-time.c:455
 #, c-format
 msgid "%s: missing era format in string %Zd in `era' field"
 msgstr "%s: ç¼ºå°? era æ ¼å¼?ï¼?å?¨ `era' æ¬?ä½?ã??å?ä¸² %Zd ä¸"
 
-#: locale/programs/ld-time.c:497
+#: locale/programs/ld-time.c:496
 #, c-format
 msgid "%s: third operand for value of field `%s' must not be larger than %d"
 msgstr "%s: æ¬?ä½? `%s' å?¼ç??ç¬¬ä¸?å??é??ç®?å??ä¸?å?¯ä»¥æ¯? %d å¤§"
 
-#: locale/programs/ld-time.c:505 locale/programs/ld-time.c:513
-#: locale/programs/ld-time.c:521
+#: locale/programs/ld-time.c:504 locale/programs/ld-time.c:512
+#: locale/programs/ld-time.c:520
 #, c-format
 msgid "%s: values for field `%s' must not be larger than %d"
 msgstr "%s: æ¬?ä½? `%s' ç??å?¼ä¸?å?¯ä»¥å¤§æ?¼ %d"
 
-#: locale/programs/ld-time.c:1004
+#: locale/programs/ld-time.c:1003
 #, c-format
 msgid "%s: too few values for field `%s'"
 msgstr "%s: æ¬?ä½? `%s' ä¸ç??å?¼å¤ªå°?"
 
-#: locale/programs/ld-time.c:1049
+#: locale/programs/ld-time.c:1048
 msgid "extra trailing semicolon"
 msgstr "å¤?å?ºç??å°¾ç«¯å??è??"
 
-#: locale/programs/ld-time.c:1052
+#: locale/programs/ld-time.c:1051
 #, c-format
 msgid "%s: too many values for field `%s'"
 msgstr "%s: æ¬?ä½? `%s' ä¸ç??å?¼å¤ªå¤?"
 
-#: locale/programs/linereader.c:130
+#: locale/programs/linereader.c:129
 msgid "trailing garbage at end of line"
 msgstr "å??çµ?å°¾ç??ç?¡ç?¨å?å??"
 
-#: locale/programs/linereader.c:298
+#: locale/programs/linereader.c:297
 msgid "garbage at end of number"
 msgstr "è??ç¢¼çµ?æ??ä½?ç½®ç??ç?¡ç?¨è³?æ??"
 
-#: locale/programs/linereader.c:410
+#: locale/programs/linereader.c:409
 msgid "garbage at end of character code specification"
 msgstr "å?å??ç·¨ç¢¼è¨å®?çµ?æ??ä½?ç½®ç??ç?¡ç?¨è³?æ??"
 
-#: locale/programs/linereader.c:496
+#: locale/programs/linereader.c:495
 msgid "unterminated symbolic name"
 msgstr "æ²?æ??çµ?å°¾ç??ç¬¦è??å??ç¨±"
 
-#: locale/programs/linereader.c:623
+#: locale/programs/linereader.c:622
 msgid "illegal escape sequence at end of string"
 msgstr "å?ä¸²çµ?å°¾æ??ä¸?å??æ³?ç??è·³è?«åº?å??"
 
-#: locale/programs/linereader.c:627 locale/programs/linereader.c:855
+#: locale/programs/linereader.c:626 locale/programs/linereader.c:854
 msgid "unterminated string"
 msgstr "æ²?æ??çµ?å°¾ç??å?ä¸²"
 
-#: locale/programs/linereader.c:669
+#: locale/programs/linereader.c:668
 msgid "non-symbolic character value should not be used"
 msgstr "é??ç¬¦è??æ?§ç??å?å??å?¼ä¸?æ??è©²è¢«ä½¿ç?¨æ??å°?"
 
-#: locale/programs/linereader.c:816
+#: locale/programs/linereader.c:815
 #, c-format
 msgid "symbol `%.*s' not in charmap"
 msgstr "ç¬¦è?? `%.*s' ä¸¦ä¸?å?¨å?é??å°?ç?§è¡¨ä¸"
 
-#: locale/programs/linereader.c:837
+#: locale/programs/linereader.c:836
 #, c-format
 msgid "symbol `%.*s' not in repertoire map"
 msgstr "ç¬¦è?? `%.*s' ä¸¦ä¸?å?¨ç·¨ç¢¼å°?æ? æª?ä¸"
 
-#: locale/programs/locale-spec.c:131
+#: locale/programs/locale-spec.c:130
 #, c-format
 msgid "unknown name \"%s\""
 msgstr "ä¸?æ??å??ç¨±ã??%sã??"
@@ -2530,84 +2626,84 @@ msgstr "ç?¡æ³?å°? LC_COLLATE è¨ç½®ç?ºé ?è¨ç??èª?å??"
 msgid "Cannot set LC_ALL to default locale"
 msgstr "ç?¡æ³?å°? LC_ALL è¨ç½®ç?ºé ?è¨ç??èª?å??"
 
-#: locale/programs/locale.c:518
+#: locale/programs/locale.c:521
 #, c-format
 msgid "while preparing output"
 msgstr "å?¨æº?å??è¼¸å?ºæ??"
 
-#: locale/programs/localedef.c:120
+#: locale/programs/localedef.c:119
 msgid "Input Files:"
 msgstr "è¼¸å?¥æª?:"
 
-#: locale/programs/localedef.c:122
+#: locale/programs/localedef.c:121
 msgid "Symbolic character names defined in FILE"
 msgstr "ç¬¦è??å?å??ç??å??ç¨±å®?ç¾©å?¨æª?æ¡? FILE ä¸"
 
-#: locale/programs/localedef.c:123
+#: locale/programs/localedef.c:122
 msgid "Source definitions are found in FILE"
 msgstr "å??å§?è³?æ??å®?ç¾©å?¨æª?æ¡? FILE ä¸"
 
-#: locale/programs/localedef.c:125
+#: locale/programs/localedef.c:124
 msgid "FILE contains mapping from symbolic names to UCS4 values"
 msgstr "æª?æ¡? FILE å?§å?«ç¬¦è??å??è?? UCS4 ç·¨ç¢¼ä¹?é??ç??å°?æ? "
 
-#: locale/programs/localedef.c:129
+#: locale/programs/localedef.c:128
 msgid "Create output even if warning messages were issued"
 msgstr "ç?¢ç??è¼¸å?ºå?³ä½¿æ?¯æ??è¦å??è¨?æ?¯"
 
-#: locale/programs/localedef.c:130
+#: locale/programs/localedef.c:129
 msgid "Create old-style tables"
 msgstr "ç?¢ç??è??æ ¼å¼?ç??è¡¨æ ¼"
 
-#: locale/programs/localedef.c:131
+#: locale/programs/localedef.c:130
 msgid "Optional output file prefix"
 msgstr "å?¯æ??å?¯ç?¡ç??è¼¸å?ºæª?è·¯å¾?"
 
-#: locale/programs/localedef.c:132
+#: locale/programs/localedef.c:131
 msgid "Be strictly POSIX conform"
 msgstr "å?´æ ¼é?µå¾? POSIX"
 
-#: locale/programs/localedef.c:134
+#: locale/programs/localedef.c:133
 msgid "Suppress warnings and information messages"
 msgstr "å¿½ç?¥è¦å??è??æ??ç¤ºè¨?æ?¯"
 
-#: locale/programs/localedef.c:135
+#: locale/programs/localedef.c:134
 msgid "Print more messages"
 msgstr "å?°å?ºæ?´å¤?ç??è¨?æ?¯"
 
-#: locale/programs/localedef.c:136
+#: locale/programs/localedef.c:135
 msgid "Archive control:"
 msgstr "ä¿?å?æª?æ?§å?¶:"
 
-#: locale/programs/localedef.c:138
+#: locale/programs/localedef.c:137
 msgid "Don't add new data to archive"
 msgstr "ä¸?è¦?å? å?¥æ?°è³?æ??å?°ä¿?å?æª?"
 
-#: locale/programs/localedef.c:140
+#: locale/programs/localedef.c:139
 msgid "Add locales named by parameters to archive"
 msgstr "è??ç?±å??æ?¸å? å?¥èª?å??å??ç¨±å?°ä¿?å?æª?"
 
-#: locale/programs/localedef.c:141
+#: locale/programs/localedef.c:140
 msgid "Replace existing archive content"
 msgstr "æ?¿æ??å·²æ??ç??ä¿?å?æª?å?§å®¹"
 
-#: locale/programs/localedef.c:143
+#: locale/programs/localedef.c:142
 msgid "Remove locales named by parameters from archive"
 msgstr "è??ç?±å??æ?¸å¾?ä¿?å?æª?ä¸å?ªé?¤èª?å??å??ç¨±"
 
-#: locale/programs/localedef.c:144
+#: locale/programs/localedef.c:143
 msgid "List content of archive"
 msgstr "å??å?ºä¿?å?æª?ç??å?§å®¹"
 
-#: locale/programs/localedef.c:146
+#: locale/programs/localedef.c:145
 msgid "locale.alias file to consult when making archive"
 msgstr "è£½ä½?ä¿?å?æª?æ??æ?¥é?± locale.alias æª?æ¡?"
 
-#: locale/programs/localedef.c:151
+#: locale/programs/localedef.c:150
 msgid "Compile locale specification"
 msgstr "ç·¨è¯èª?å??è³?æ??è¦?æ ¼"
 
-#: locale/programs/localedef.c:154
+#: locale/programs/localedef.c:153
 msgid ""
 "NAME\n"
 "[--add-to-archive|--delete-from-archive] FILE...\n"
@@ -2617,28 +2713,28 @@ msgstr ""
 "[--add-to-archive|--delete-from-archive] æª?æ¡?...\n"
 "--list-archive [æª?æ¡?]"
 
-#: locale/programs/localedef.c:232
+#: locale/programs/localedef.c:228
 #, c-format
 msgid "cannot create directory for output files"
 msgstr "ç?¡æ³?ç?ºè¼¸å?ºæª?å»ºç«?ç?®é??"
 
-#: locale/programs/localedef.c:243
+#: locale/programs/localedef.c:239
 #, c-format
 msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
 msgstr "å?´é??é?¯èª¤: ç³»çµ±æ²?æ??å®?ç¾© `_POSIX2_LOCALEDEF'"
 
-#: locale/programs/localedef.c:257 locale/programs/localedef.c:273
-#: locale/programs/localedef.c:599 locale/programs/localedef.c:619
+#: locale/programs/localedef.c:253 locale/programs/localedef.c:269
+#: locale/programs/localedef.c:601 locale/programs/localedef.c:621
 #, c-format
 msgid "cannot open locale definition file `%s'"
 msgstr "ç?¡æ³?é??å??èª?å??è³?æ??å®?ç¾©æª? `%s'"
 
-#: locale/programs/localedef.c:285
+#: locale/programs/localedef.c:281
 #, c-format
 msgid "cannot write output files to `%s'"
 msgstr "ç?¡æ³?å°?è¼¸å?ºæª?æ¡?å¯«å?¥ `%s'"
 
-#: locale/programs/localedef.c:366
+#: locale/programs/localedef.c:367
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
@@ -2651,206 +2747,207 @@ msgstr ""
 "\t\t      èª?å??è·¯å¾?   ï¼?%s\n"
 "%s"
 
-#: locale/programs/localedef.c:567
+#: locale/programs/localedef.c:569
 #, c-format
 msgid "circular dependencies between locale definitions"
 msgstr "æ??èª?å??è³?æ??å?¨å®?ç¾©æ??ç?¼ç??å¾ªç?°ç?¸é??ç??æ??æ³?"
 
-#: locale/programs/localedef.c:573
+#: locale/programs/localedef.c:575
 #, c-format
 msgid "cannot add already read locale `%s' a second time"
 msgstr " `%s' èª?å??è³?æ??å·²ç¶?ç?¨é??ï¼?ä¸?è?½é??è¤?å? å?¥"
 
-#: locale/programs/locarchive.c:92 locale/programs/locarchive.c:338
+#: locale/programs/locarchive.c:113 locale/programs/locarchive.c:347
+#: nss/makedb.c:290
 #, c-format
 msgid "cannot create temporary file"
 msgstr "ç?¡æ³?ç?¢ç??æ?«æ??æª?"
 
-#: locale/programs/locarchive.c:122 locale/programs/locarchive.c:384
+#: locale/programs/locarchive.c:143 locale/programs/locarchive.c:393
 #, c-format
 msgid "cannot initialize archive file"
 msgstr "ç?¡æ³?èµ·å§?ä¿?å?æª?"
 
-#: locale/programs/locarchive.c:129 locale/programs/locarchive.c:391
+#: locale/programs/locarchive.c:150 locale/programs/locarchive.c:400
 #, c-format
 msgid "cannot resize archive file"
 msgstr "ç?¡æ³?æ?¹è®?ä¿?å?æª?å¤§å°?"
 
-#: locale/programs/locarchive.c:152 locale/programs/locarchive.c:414
-#: locale/programs/locarchive.c:633
+#: locale/programs/locarchive.c:163 locale/programs/locarchive.c:413
+#: locale/programs/locarchive.c:619
 #, c-format
 msgid "cannot map archive header"
 msgstr "ç?¡æ³?è¨»è¨?ä¿?å?æª?è¡¨é "
 
-#: locale/programs/locarchive.c:174
+#: locale/programs/locarchive.c:185
 #, c-format
 msgid "failed to create new locale archive"
 msgstr "ç?¡æ³?å»ºç«?æ?°ç??èª?å??ä¿?å?æª?"
 
-#: locale/programs/locarchive.c:186
+#: locale/programs/locarchive.c:197
 #, c-format
 msgid "cannot change mode of new locale archive"
 msgstr "ç?¡æ³?æ?¹è®?æ?°ç??èª?å??è³?æ??ä¿?å?æª?ç??æ??"
 
-#: locale/programs/locarchive.c:285
+#: locale/programs/locarchive.c:296
 #, c-format
 msgid "cannot read data from locale archive"
 msgstr "ç?¡æ³?å¾?èª?å??æ¸æª?è®?å??è³?æ??"
 
-#: locale/programs/locarchive.c:318
+#: locale/programs/locarchive.c:327
 #, c-format
 msgid "cannot map locale archive file"
 msgstr "ç?¡æ³?æ? å°?èª?å??è³?æ??ä¿?å?æª?"
 
-#: locale/programs/locarchive.c:422
+#: locale/programs/locarchive.c:421
 #, c-format
 msgid "cannot lock new archive"
 msgstr "ç?¡æ³?é??å®?æ?°ç??ä¿?å?æª?"
 
-#: locale/programs/locarchive.c:488
+#: locale/programs/locarchive.c:485
 #, c-format
 msgid "cannot extend locale archive file"
 msgstr "ç?¡æ³?å»¶å±?èª?å??è³?æ??ä¿?å?æª?"
 
-#: locale/programs/locarchive.c:497
+#: locale/programs/locarchive.c:494
 #, c-format
 msgid "cannot change mode of resized locale archive"
 msgstr "ç?¡æ³?æ?¹è®?å·²è®?æ?´å¤§å°?ç??èª?å??è³?æ??ä¿?å?æª?ç??æ??"
 
-#: locale/programs/locarchive.c:505
+#: locale/programs/locarchive.c:502
 #, c-format
 msgid "cannot rename new archive"
 msgstr "ç?¡æ³?æ?´æ?¹æ?°ä¿?å?æª?å??ç¨±"
 
-#: locale/programs/locarchive.c:558
+#: locale/programs/locarchive.c:555
 #, c-format
 msgid "cannot open locale archive \"%s\""
 msgstr "ç?¡æ³?é??å??èª?å??è³?æ??ä¿?å?æª? \"%s\""
 
-#: locale/programs/locarchive.c:563
+#: locale/programs/locarchive.c:560
 #, c-format
 msgid "cannot stat locale archive \"%s\""
 msgstr "ç?¡æ³?çµ±è¨?èª?å??è³?æ??ä¿?å?æª? \"%s\""
 
-#: locale/programs/locarchive.c:582
+#: locale/programs/locarchive.c:579
 #, c-format
 msgid "cannot lock locale archive \"%s\""
 msgstr "ç?¡æ³?é??å®?èª?å??è³?æ??ä¿?å?æª? \"%s\""
 
-#: locale/programs/locarchive.c:605
+#: locale/programs/locarchive.c:602
 #, c-format
 msgid "cannot read archive header"
 msgstr "ç?¡æ³?è®?å??ä¿?å?æª?è¡¨é è³?æ??"
 
-#: locale/programs/locarchive.c:680
+#: locale/programs/locarchive.c:666
 #, c-format
 msgid "locale '%s' already exists"
 msgstr "èª?å??è³?æ?? `%s' å·²ç¶?å?å?¨"
 
-#: locale/programs/locarchive.c:942 locale/programs/locarchive.c:957
-#: locale/programs/locarchive.c:969 locale/programs/locarchive.c:981
-#: locale/programs/locfile.c:344
+#: locale/programs/locarchive.c:928 locale/programs/locarchive.c:943
+#: locale/programs/locarchive.c:955 locale/programs/locarchive.c:967
+#: locale/programs/locfile.c:343
 #, c-format
 msgid "cannot add to locale archive"
 msgstr "ç?¡æ³?å? å?¥èª?å??è³?æ??ä¿?å?æª?"
 
-#: locale/programs/locarchive.c:1139
+#: locale/programs/locarchive.c:1125
 #, c-format
 msgid "locale alias file `%s' not found"
 msgstr "æ?¾ä¸?å?°èª?å??è³?æ??å?¥å??æª? `%s'"
 
-#: locale/programs/locarchive.c:1289
+#: locale/programs/locarchive.c:1275
 #, c-format
 msgid "Adding %s\n"
 msgstr "å? å?¥ %s ä¸\n"
 
-#: locale/programs/locarchive.c:1295
+#: locale/programs/locarchive.c:1281
 #, c-format
 msgid "stat of \"%s\" failed: %s: ignored"
 msgstr "å??å¾? \"%s\" ç??è³?è¨?æ??å¤±æ??: %s: å·²å¿½ç?¥"
 
-#: locale/programs/locarchive.c:1301
+#: locale/programs/locarchive.c:1287
 #, c-format
 msgid "\"%s\" is no directory; ignored"
 msgstr "\"%s\" ä¸¦é??ç?®é??; å·²å¿½ç?¥"
 
-#: locale/programs/locarchive.c:1308
+#: locale/programs/locarchive.c:1294
 #, c-format
 msgid "cannot open directory \"%s\": %s: ignored"
 msgstr "ç?¡æ³?é??å??ç?®é?? \"%s\": %s: å·²å¿½ç?¥"
 
-#: locale/programs/locarchive.c:1380
+#: locale/programs/locarchive.c:1366
 #, c-format
 msgid "incomplete set of locale files in \"%s\""
 msgstr "ä¸?å®?æ?´ç??ä¸?çµ?èª?å??è³?æ??æª?æ¡?å?å?¨æ?¼ \"%s\" ä¹?ä¸"
 
-#: locale/programs/locarchive.c:1444
+#: locale/programs/locarchive.c:1430
 #, c-format
 msgid "cannot read all files in \"%s\": ignored"
 msgstr "ç?¡æ³?è®?å?? \"%s\" ä¸ç??æ??æ??æª?æ¡?: å·²å¿½ç?¥"
 
-#: locale/programs/locarchive.c:1514
+#: locale/programs/locarchive.c:1500
 #, c-format
 msgid "locale \"%s\" not in archive"
 msgstr "èª?å??è³?æ?? \"%s\" ä¸?å?¨ä¿?å?æª?ä¸"
 
-#: locale/programs/locfile.c:132
+#: locale/programs/locfile.c:131
 #, c-format
 msgid "argument to `%s' must be a single character"
 msgstr "çµ¦ `%s' ç??å¼?æ?¸å¿?é ?æ?¯ä¸?å??å?®å?å??"
 
-#: locale/programs/locfile.c:252
+#: locale/programs/locfile.c:251
 msgid "syntax error: not inside a locale definition section"
 msgstr "èª?æ³?é?¯èª¤: ä¸?è?½å?¨èª?å??è³?æ??å®?ç¾©å??å¡?è£¡é?¢ä½¿ç?¨"
 
-#: locale/programs/locfile.c:626
+#: locale/programs/locfile.c:625
 #, c-format
 msgid "cannot open output file `%s' for category `%s'"
 msgstr "ç?¡æ³?é??å??è¼¸å?ºæª? `%s' ä¾?é¡?å?¥ `%s' ä½¿ç?¨"
 
-#: locale/programs/locfile.c:650
+#: locale/programs/locfile.c:649
 #, c-format
 msgid "failure while writing data for category `%s'"
 msgstr "æ£å?¨ç?ºé¡?å?¥ `%s' å¯«å?¥è³?æ??æ??ç?¼ç??é?¯èª¤"
 
-#: locale/programs/locfile.c:746
+#: locale/programs/locfile.c:745
 #, c-format
 msgid "cannot create output file `%s' for category `%s'"
 msgstr "ç?¡æ³?å»ºç«?è¼¸å?ºæª? `%s' ä¾?é¡?å?¥ `%s' ä½¿ç?¨"
 
-#: locale/programs/locfile.c:782
+#: locale/programs/locfile.c:781
 msgid "expecting string argument for `copy'"
 msgstr "`copy' ç??å¼?æ?¸æ??è©²æ?¯å?ä¸²æ??å°?"
 
-#: locale/programs/locfile.c:786
+#: locale/programs/locfile.c:785
 msgid "locale name should consist only of portable characters"
 msgstr "èª?å??è³?æ??ç??å??ç¨±æ??è©²ä»¥å¸¸ç?¨å?å??çµ?æ??"
 
-#: locale/programs/locfile.c:805
+#: locale/programs/locfile.c:804
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr "ä½¿ç?¨ `copy' ç??æ??å??ä¸?æ??è©²å??ç?¨å?°ä»»ä½?å?¶ä»?ç??é??é?µå?äº?"
 
-#: locale/programs/locfile.c:819
+#: locale/programs/locfile.c:818
 #, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "`%1$s' å®?ç¾©æ²?æ??ä»¥ `END %1$s' çµ?æ??"
 
-#: locale/programs/repertoire.c:229 locale/programs/repertoire.c:270
-#: locale/programs/repertoire.c:295
+#: locale/programs/repertoire.c:228 locale/programs/repertoire.c:269
+#: locale/programs/repertoire.c:294
 #, c-format
 msgid "syntax error in repertoire map definition: %s"
 msgstr "ç·¨ç¢¼å°?æ? æª?ä¸ç??å®?ç¾©æ??èª?æ³?é?¯èª¤: %s"
 
-#: locale/programs/repertoire.c:271
+#: locale/programs/repertoire.c:270
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "æ²?æ??çµ¦å®? <Uxxxx> æ?? <Uxxxxxxxx> ç??å?¼"
 
-#: locale/programs/repertoire.c:331
+#: locale/programs/repertoire.c:330
 #, c-format
 msgid "cannot save new repertoire map"
 msgstr "ç?¡æ³?å?²å?æ?°ç??ç·¨ç¢¼å°?æ? æª?"
 
-#: locale/programs/repertoire.c:342
+#: locale/programs/repertoire.c:341
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr "æ?¾ä¸?å?°ç·¨ç¢¼å°?æ? æª? `%s'"
@@ -2860,7 +2957,7 @@ msgstr "æ?¾ä¸?å?°ç·¨ç¢¼å°?æ? æª? `%s'"
 msgid "Set the owner, group and access permission of the slave pseudo terminal corresponding to the master pseudo terminal passed on file descriptor `%d'.  This is the helper program for the `grantpt' function.  It is not intended to be run directly from the command line.\n"
 msgstr "è¨å®?æ??æ??è??ã??ç¾¤çµ?å??å?å??è¨±å?¯ç??å¾?å±¬ pseudo çµ?ç«¯æ©?ç?¸æ??å?°ä¸» pseudo çµ?ç«¯æ©?å?³é??æ?¼æª?æ¡?æ??è¿°ç¬¦è??ã??%dã??ã?? é??æ?¯è¼?å?©ç¨?å¼?ç¨?å¼?ç?¨æ?¼ã??grantptã??å?½å¼?ã?? å®?ä¸¦æ?ªé ?æ?³ç??ç?ºé??è¡?ç?´æ?¥ç??å?°å¾?å?½ä»¤å??ã??\n"
 
-#: login/programs/pt_chown.c:88
+#: login/programs/pt_chown.c:92
 #, c-format
 msgid ""
 "The owner is set to the current user, the group is set to `%s', and the access permission is set to `%o'.\n"
@@ -2871,41 +2968,41 @@ msgstr ""
 "\n"
 "%s"
 
-#: login/programs/pt_chown.c:192
+#: login/programs/pt_chown.c:198
 #, c-format
 msgid "too many arguments"
 msgstr "å¤ªå¤?å¼?æ?¸"
 
-#: login/programs/pt_chown.c:200
+#: login/programs/pt_chown.c:206
 #, c-format
 msgid "needs to be installed setuid `root'"
 msgstr "é??è¦?æ?¯å·²å®?è£?ç?? setuidã??æ ¹ã??"
 
-#: malloc/mcheck.c:350
+#: malloc/mcheck.c:348
 msgid "memory is consistent, library is buggy\n"
 msgstr "è¨?æ?¶é«?å?§å®¹ä¸?è?´ï¼?å?½å¼?åº«æ??å??é¡?\n"
 
-#: malloc/mcheck.c:353
+#: malloc/mcheck.c:351
 msgid "memory clobbered before allocated block\n"
 msgstr "è¨?æ?¶é«?å?¨é??ç½®å??å¡?ä¹?å??å°± clobbered äº?\n"
 
-#: malloc/mcheck.c:356
+#: malloc/mcheck.c:354
 msgid "memory clobbered past end of allocated block\n"
 msgstr "è¨?æ?¶é«?å?¨ç¶?é??é??ç½®ç??å??å¡?å°¾é?¨æ?? clobbered äº?\n"
 
-#: malloc/mcheck.c:359
+#: malloc/mcheck.c:357
 msgid "block freed twice\n"
 msgstr "æ¤å??å¡?è¢«ç?¨ free æ??ä»¤é??æ?¾äº?å?©æ¬¡\n"
 
-#: malloc/mcheck.c:362
+#: malloc/mcheck.c:360
 msgid "bogus mcheck_status, library is buggy\n"
 msgstr "è¨?æ?¶é«?æª¢æ?¥ç??æ?? (mcheck_ststus) æ??èª¤ï¼?æ?¨æ??ç?¨ç??å?½å¼?åº«æ??å??é¡?\n"
 
-#: malloc/memusage.sh:33
+#: malloc/memusage.sh:32
 msgid "%s: option '%s' requires an argument\\n"
 msgstr "%sï¼?é?¸é ?ã??%sã??é??è¦?ä¸?å??å¼?æ?¸\\n"
 
-#: malloc/memusage.sh:39
+#: malloc/memusage.sh:38
 msgid ""
 "Usage: memusage [OPTION]... PROGRAM [PROGRAMOPTION]...\n"
 "Profile memory usage of PROGRAM.\n"
@@ -2958,7 +3055,7 @@ msgstr ""
 "é?·é?¸é ?ç??å¿?è¦?å¼?æ?¸å??æ¨£ä¹?æ?¯ç?¸å°?æ??ç?é?¸é ?ç??å¿?è¦?å¼?æ?¸ã??\n"
 "\n"
 
-#: malloc/memusage.sh:101
+#: malloc/memusage.sh:99
 msgid ""
 "Syntax: memusage [--data=FILE] [--progname=NAME] [--png=FILE] [--unbuffered]\n"
 "\t    [--buffer=SIZE] [--no-timer] [--time-based] [--total]\n"
@@ -2970,59 +3067,59 @@ msgstr ""
 "\t   [--title=å?ä¸²] [--x-size=å¤§å°?] [--y-size=å¤§å°?]\n"
 "\t   ç¨?å¼? [PROGRAMOPTION]â?¦"
 
-#: malloc/memusage.sh:193
+#: malloc/memusage.sh:191
 msgid "memusage: option \\`${1##*=}' is ambiguous"
 msgstr "memusageï¼?é?¸é ? \\ã??${1##*=}ã??ç?ºæ¨¡ç¨?å?©å?¯ç??"
 
-#: malloc/memusage.sh:202
+#: malloc/memusage.sh:200
 msgid "memusage: unrecognized option \\`$1'"
 msgstr "memusageï¼?ç?¡æ³?è¾¨è?ç??é?¸é ?ã??$1ã??"
 
-#: malloc/memusage.sh:215
+#: malloc/memusage.sh:213
 msgid "No program name given"
 msgstr "æ?ªçµ¦å®?ç¨?å¼?å??ç¨±"
 
-#: malloc/memusagestat.c:57
+#: malloc/memusagestat.c:55
 msgid "Name output file"
 msgstr "å??ç¨±è¼¸å?ºæª?"
 
-#: malloc/memusagestat.c:58
+#: malloc/memusagestat.c:56
 msgid "Title string used in output graphic"
 msgstr "å?¨è¼¸å?ºç??å??å??ä¸ä½¿ç?¨æ??æ¨?é ç??å?ä¸²"
 
-#: malloc/memusagestat.c:59
+#: malloc/memusagestat.c:57
 msgid "Generate output linear to time (default is linear to number of function calls)"
 msgstr "ç?¢ç??è¼¸å?ºè??æ??é??å??ç·?æ?§é??ä¿? (é ?è¨æ?¯è??å?½å¼?å?¼å?«æ?¸ç?®å??ç·?æ?§é??ä¿?)"
 
-#: malloc/memusagestat.c:61
+#: malloc/memusagestat.c:59
 msgid "Also draw graph for total memory consumption"
 msgstr "å??æ??å°?ç¸½è¨?æ?¶é«?ç?¨é??ä½?å??"
 
-#: malloc/memusagestat.c:62
+#: malloc/memusagestat.c:60
 msgid "Make output graphic VALUE pixels wide"
 msgstr "å®?è£½è¼¸å?ºå??å½¢ç??å¯¬åº¦å??ç´  VALUE"
 
-#: malloc/memusagestat.c:63
+#: malloc/memusagestat.c:61
 msgid "Make output graphic VALUE pixels high"
 msgstr "å®?è£½è¼¸å?ºå??å½¢ç??é«?åº¦å??ç´  VALUE"
 
-#: malloc/memusagestat.c:68
+#: malloc/memusagestat.c:66
 msgid "Generate graphic from memory profiling data"
 msgstr "å¾?è¨?æ?¶é«?æ?§è?½æ¸¬è©¦è³?æ??ç?¢ç??å??å??"
 
-#: malloc/memusagestat.c:71
+#: malloc/memusagestat.c:69
 msgid "DATAFILE [OUTFILE]"
 msgstr "è³?æ??æª? [è¼¸å?ºæª?]"
 
-#: misc/error.c:118
+#: misc/error.c:117
 msgid "Unknown system error"
 msgstr "æ?ªç?¥ç??ç³»çµ±é?¯èª¤"
 
-#: nis/nis_callback.c:189
+#: nis/nis_callback.c:188
 msgid "unable to free arguments"
 msgstr "ç?¡æ³?é??æ?¾å??æ?¸"
 
-#: nis/nis_error.h:1 nis/ypclnt.c:833 nis/ypclnt.c:921 posix/regcomp.c:132
+#: nis/nis_error.h:1 nis/ypclnt.c:832 nis/ypclnt.c:920 posix/regcomp.c:131
 #: sysdeps/gnu/errlist.c:20
 msgid "Success"
 msgstr "æ??å??"
@@ -3064,7 +3161,7 @@ msgid "First/next chain broken"
 msgstr "ç¬¬ä¸?å??/ä¸?ä¸?å??åº?å??å£?æ??äº?"
 
 #. TRANS Permission denied; the file permissions do not allow the attempted operation.
-#: nis/nis_error.h:11 nis/ypclnt.c:878 sysdeps/gnu/errlist.c:157
+#: nis/nis_error.h:11 nis/ypclnt.c:877 sysdeps/gnu/errlist.c:157
 msgid "Permission denied"
 msgstr "æ??çµ?ä¸?ç¬¦æ¬?é??ç??æ??ä½?"
 
@@ -3216,128 +3313,128 @@ msgstr "ç?¡æ³?å?¨ä¼ºæ??å?¨ä¸?å»ºç«?å?·è¡?ç¨?åº?"
 msgid "Master server busy, full dump rescheduled."
 msgstr "ä¸»è¦?ä¼ºæ??å?¨å¿?ç¢?ä¸ï¼?é??æ?°é?²è¡?å®?æ?´è³?æ??å?¾å?¸æ??ç¨?ã??"
 
-#: nis/nis_local_names.c:122
+#: nis/nis_local_names.c:121
 #, c-format
 msgid "LOCAL entry for UID %d in directory %s not unique\n"
 msgstr "UID ç?º %d ç??é ?ç?®å?¨æ?¬å?°ç«¯ä¸ä¸¦ä¸?æ?¯å?¯ä¸?ç?? (å?¨ %s ç?®é??è£¡é?¢)\n"
 
-#: nis/nis_print.c:51
+#: nis/nis_print.c:50
 msgid "UNKNOWN"
 msgstr "ä¸?æ??"
 
-#: nis/nis_print.c:109
+#: nis/nis_print.c:108
 msgid "BOGUS OBJECT\n"
 msgstr "å??ç??ç?©ä»¶\n"
 
-#: nis/nis_print.c:112
+#: nis/nis_print.c:111
 msgid "NO OBJECT\n"
 msgstr "æ²?æ??ç?©ä»¶\n"
 
-#: nis/nis_print.c:115
+#: nis/nis_print.c:114
 msgid "DIRECTORY\n"
 msgstr "ç?®é??\n"
 
-#: nis/nis_print.c:118
+#: nis/nis_print.c:117
 msgid "GROUP\n"
 msgstr "ç¾¤çµ?\n"
 
-#: nis/nis_print.c:121
+#: nis/nis_print.c:120
 msgid "TABLE\n"
 msgstr "è¡¨æ ¼\n"
 
-#: nis/nis_print.c:124
+#: nis/nis_print.c:123
 msgid "ENTRY\n"
 msgstr "é ?ç?®\n"
 
-#: nis/nis_print.c:127
+#: nis/nis_print.c:126
 msgid "LINK\n"
 msgstr "é?£çµ?\n"
 
-#: nis/nis_print.c:130
+#: nis/nis_print.c:129
 msgid "PRIVATE\n"
 msgstr "ç§?æ??ç??\n"
 
-#: nis/nis_print.c:133
+#: nis/nis_print.c:132
 msgid "(Unknown object)\n"
 msgstr "(æ?ªç?¥ç??ç?©ä»¶)\n"
 
-#: nis/nis_print.c:167
+#: nis/nis_print.c:166
 #, c-format
 msgid "Name : `%s'\n"
 msgstr "å??ç¨± : `%s'\n"
 
-#: nis/nis_print.c:168
+#: nis/nis_print.c:167
 #, c-format
 msgid "Type : %s\n"
 msgstr "æ ¼å¼? : %s\n"
 
-#: nis/nis_print.c:173
+#: nis/nis_print.c:172
 msgid "Master Server :\n"
 msgstr "ä¸»è¦?ä¼ºæ??å?¨ :\n"
 
-#: nis/nis_print.c:175
+#: nis/nis_print.c:174
 msgid "Replicate :\n"
 msgstr "è¤?è£½ :\n"
 
-#: nis/nis_print.c:176
+#: nis/nis_print.c:175
 #, c-format
 msgid "\tName       : %s\n"
 msgstr "\tå??ç¨±       : %s\n"
 
-#: nis/nis_print.c:177
+#: nis/nis_print.c:176
 msgid "\tPublic Key : "
 msgstr "\tå?¬å?±é?°å?? : "
 
-#: nis/nis_print.c:181
+#: nis/nis_print.c:180
 msgid "None.\n"
 msgstr "ç?¡\n"
 
-#: nis/nis_print.c:184
+#: nis/nis_print.c:183
 #, c-format
 msgid "Diffie-Hellmann (%d bits)\n"
 msgstr "Diffie-Hellmann (%d ä½?å??)\n"
 
-#: nis/nis_print.c:189
+#: nis/nis_print.c:188
 #, c-format
 msgid "RSA (%d bits)\n"
 msgstr "RSA (%d ä½?å??)\n"
 
-#: nis/nis_print.c:192
+#: nis/nis_print.c:191
 msgid "Kerberos.\n"
 msgstr "Kerberos.\n"
 
-#: nis/nis_print.c:195
+#: nis/nis_print.c:194
 #, c-format
 msgid "Unknown (type = %d, bits = %d)\n"
 msgstr "æ?ªç?¥ç?? (å??æ?? = %dï¼?ä½?å?? = %d)\n"
 
-#: nis/nis_print.c:206
+#: nis/nis_print.c:205
 #, c-format
 msgid "\tUniversal addresses (%u)\n"
 msgstr "\tçµ?å°?ä½?å?? (%u)\n"
 
-#: nis/nis_print.c:228
+#: nis/nis_print.c:227
 msgid "Time to live : "
 msgstr "å?å?¨æ??é?? : "
 
-#: nis/nis_print.c:230
+#: nis/nis_print.c:229
 msgid "Default Access rights :\n"
 msgstr "é ?è¨ç??å?å??æ¬?é?? :\n"
 
-#: nis/nis_print.c:239
+#: nis/nis_print.c:238
 #, c-format
 msgid "\tType         : %s\n"
 msgstr "\tå??å?¥         : %s\n"
 
-#: nis/nis_print.c:240
+#: nis/nis_print.c:239
 msgid "\tAccess rights: "
 msgstr "\tå?å??æ¬?é??: "
 
-#: nis/nis_print.c:254
+#: nis/nis_print.c:253
 msgid "Group Flags :"
 msgstr "ç¾¤çµ?æ??æ¨? :"
 
-#: nis/nis_print.c:257
+#: nis/nis_print.c:256
 msgid ""
 "\n"
 "Group Members :\n"
@@ -3345,95 +3442,95 @@ msgstr ""
 "\n"
 "ç¾¤çµ?ç??æ??å?¡ :\n"
 
-#: nis/nis_print.c:269
+#: nis/nis_print.c:268
 #, c-format
 msgid "Table Type          : %s\n"
 msgstr "è¡¨æ ¼å½¢å¼?           : %s\n"
 
-#: nis/nis_print.c:270
+#: nis/nis_print.c:269
 #, c-format
 msgid "Number of Columns   : %d\n"
 msgstr "æ¬?ä½?ç??æ?¸ç?® : %d\n"
 
-#: nis/nis_print.c:271
+#: nis/nis_print.c:270
 #, c-format
 msgid "Character Separator : %c\n"
 msgstr "å?å??å??é??è?? : %c\n"
 
-#: nis/nis_print.c:272
+#: nis/nis_print.c:271
 #, c-format
 msgid "Search Path         : %s\n"
 msgstr "æ??å°?è·¯å¾?         : %s\n"
 
-#: nis/nis_print.c:273
+#: nis/nis_print.c:272
 msgid "Columns             :\n"
 msgstr "è¡?             :\n"
 
-#: nis/nis_print.c:276
+#: nis/nis_print.c:275
 #, c-format
 msgid "\t[%d]\tName          : %s\n"
 msgstr "\t[%d]\tå??ç¨±          : %s\n"
 
-#: nis/nis_print.c:278
+#: nis/nis_print.c:277
 msgid "\t\tAttributes    : "
 msgstr "\t\tå±¬æ?§     : "
 
-#: nis/nis_print.c:280
+#: nis/nis_print.c:279
 msgid "\t\tAccess Rights : "
 msgstr "\t\tå?å??æ¬?é?? : "
 
-#: nis/nis_print.c:290
+#: nis/nis_print.c:289
 msgid "Linked Object Type : "
 msgstr "é?£çµ?ç??ç?©ä»¶å??æ?? : "
 
-#: nis/nis_print.c:292
+#: nis/nis_print.c:291
 #, c-format
 msgid "Linked to : %s\n"
 msgstr "é?£çµ?å?° : %s\n"
 
-#: nis/nis_print.c:302
+#: nis/nis_print.c:301
 #, c-format
 msgid "\tEntry data of type %s\n"
 msgstr "\tå??å?¥ç?º %s ç??é ?ç?®è³?æ??\n"
 
-#: nis/nis_print.c:305
+#: nis/nis_print.c:304
 #, c-format
 msgid "\t[%u] - [%u bytes] "
 msgstr "\t[%u] - [%u ä½?å??çµ?] "
 
-#: nis/nis_print.c:308
+#: nis/nis_print.c:307
 msgid "Encrypted data\n"
 msgstr "ç·¨ç¢¼è³?æ??\n"
 
-#: nis/nis_print.c:310
+#: nis/nis_print.c:309
 msgid "Binary data\n"
 msgstr "äº?é?²ä½?è³?æ??\n"
 
-#: nis/nis_print.c:326
+#: nis/nis_print.c:325
 #, c-format
 msgid "Object Name   : %s\n"
 msgstr "ç?©ä»¶å??ç¨±   : %s\n"
 
-#: nis/nis_print.c:327
+#: nis/nis_print.c:326
 #, c-format
 msgid "Directory     : %s\n"
 msgstr "ç?®é??     : %s\n"
 
-#: nis/nis_print.c:328
+#: nis/nis_print.c:327
 #, c-format
 msgid "Owner         : %s\n"
 msgstr "æ??æ??è??       : %s\n"
 
-#: nis/nis_print.c:329
+#: nis/nis_print.c:328
 #, c-format
 msgid "Group         : %s\n"
 msgstr "ç¾¤çµ?         : %s\n"
 
-#: nis/nis_print.c:330
+#: nis/nis_print.c:329
 msgid "Access Rights : "
 msgstr "å?å??æ¬?é?? : "
 
-#: nis/nis_print.c:332
+#: nis/nis_print.c:331
 #, c-format
 msgid ""
 "\n"
@@ -3442,36 +3539,36 @@ msgstr ""
 "\n"
 "å?å?¨ç??æ??é?? : "
 
-#: nis/nis_print.c:335
+#: nis/nis_print.c:334
 #, c-format
 msgid "Creation Time : %s"
 msgstr "ç?¢ç??æ??é?? : %s"
 
-#: nis/nis_print.c:337
+#: nis/nis_print.c:336
 #, c-format
 msgid "Mod. Time     : %s"
 msgstr "ä¿®æ?¹æ??é??     : %s"
 
-#: nis/nis_print.c:338
+#: nis/nis_print.c:337
 msgid "Object Type   : "
 msgstr "ç?©ä»¶å??å?¥   : "
 
-#: nis/nis_print.c:358
+#: nis/nis_print.c:357
 #, c-format
 msgid "    Data Length = %u\n"
 msgstr "    è³?æ??é?·åº¦ = %u\n"
 
-#: nis/nis_print.c:372
+#: nis/nis_print.c:371
 #, c-format
 msgid "Status            : %s\n"
 msgstr "ç??æ??              : %s\n"
 
-#: nis/nis_print.c:373
+#: nis/nis_print.c:372
 #, c-format
 msgid "Number of objects : %u\n"
 msgstr "ç?©ä»¶ç??æ?¸ç?® : %u\n"
 
-#: nis/nis_print.c:377
+#: nis/nis_print.c:376
 #, c-format
 msgid "Object #%d:\n"
 msgstr "ç?®ç??æª? #%d:\n"
@@ -3529,510 +3626,539 @@ msgstr "    é??è¿´ç??é??æ??å?¡ï¼?\n"
 msgid "    No recursive nonmembers\n"
 msgstr "    æ²?æ??é??è¿´ç??é??æ??å?¡\n"
 
-#: nis/nss_nisplus/nisplus-publickey.c:101
-#: nis/nss_nisplus/nisplus-publickey.c:183
+#: nis/nss_nisplus/nisplus-publickey.c:100
+#: nis/nss_nisplus/nisplus-publickey.c:182
 #, c-format
 msgid "DES entry for netname %s not unique\n"
 msgstr "netname %s ç?? DES é ?ç?®ä¸¦ä¸?å?¯ä¸?\n"
 
-#: nis/nss_nisplus/nisplus-publickey.c:220
+#: nis/nss_nisplus/nisplus-publickey.c:219
 #, c-format
 msgid "netname2user: missing group id list in `%s'"
 msgstr "netname2userï¼?å?¨ã??%sã??ä¸ç¼ºå°?ç¾¤çµ?è?å?¥è??æ¸?å?®"
 
-#: nis/nss_nisplus/nisplus-publickey.c:302
-#: nis/nss_nisplus/nisplus-publickey.c:308
-#: nis/nss_nisplus/nisplus-publickey.c:373
-#: nis/nss_nisplus/nisplus-publickey.c:382
+#: nis/nss_nisplus/nisplus-publickey.c:301
+#: nis/nss_nisplus/nisplus-publickey.c:307
+#: nis/nss_nisplus/nisplus-publickey.c:372
+#: nis/nss_nisplus/nisplus-publickey.c:381
 #, c-format
 msgid "netname2user: (nis+ lookup): %s\n"
 msgstr "netname2user: (nis+ æ??å°?): %s\n"
 
-#: nis/nss_nisplus/nisplus-publickey.c:321
+#: nis/nss_nisplus/nisplus-publickey.c:320
 #, c-format
 msgid "netname2user: DES entry for %s in directory %s not unique"
 msgstr "netname2user: %s ç?? DES é ?ç?®å?¨ %s ç?®é??ä¸?ä¸¦ä¸?æ?¯å?¯ä¸?ç??"
 
-#: nis/nss_nisplus/nisplus-publickey.c:339
+#: nis/nss_nisplus/nisplus-publickey.c:338
 #, c-format
 msgid "netname2user: principal name `%s' too long"
 msgstr "netname2user: ä¸»è¦?å??ç¨± `%s' å¤ªé?·äº?"
 
-#: nis/nss_nisplus/nisplus-publickey.c:395
+#: nis/nss_nisplus/nisplus-publickey.c:394
 #, c-format
 msgid "netname2user: LOCAL entry for %s in directory %s not unique"
 msgstr "netname2user: %s ç??æ?¬å?°ç«¯é ?ç?®å?¨ %s ç?®é??ä¸?ä¸¦ä¸?æ?¯å?¯ä¸?ç??"
 
-#: nis/nss_nisplus/nisplus-publickey.c:402
+#: nis/nss_nisplus/nisplus-publickey.c:401
 msgid "netname2user: should not have uid 0"
 msgstr "netname2user: ä¸?è?½æ??ä½¿ç?¨è?? id ç?º 0 ç??æ??æ³?"
 
-#: nis/ypclnt.c:836
+#: nis/ypclnt.c:835
 msgid "Request arguments bad"
 msgstr "å¿?é ?å¼?æ?¸æ??é?¯èª¤"
 
-#: nis/ypclnt.c:839
+#: nis/ypclnt.c:838
 msgid "RPC failure on NIS operation"
 msgstr "NIS é??ä½? RPC å¤±æ??"
 
-#: nis/ypclnt.c:842
+#: nis/ypclnt.c:841
 msgid "Can't bind to server which serves this domain"
 msgstr "ç?¡æ³?è??æ??å??æ?¼æ¤ç¶²å??ç??ä¼ºæ??å?¨è?¯ç¹«"
 
-#: nis/ypclnt.c:845
+#: nis/ypclnt.c:844
 msgid "No such map in server's domain"
 msgstr "å?¨ä¼ºæ??å?¨ç??é ?å??è³?æ??ä¸æ?¾ä¸?å?°æ¤ä¸?å°?æ? è¡¨"
 
-#: nis/ypclnt.c:848
+#: nis/ypclnt.c:847
 msgid "No such key in map"
 msgstr "å?¨å°?æ? è¡¨ä¸æ²?æ??æ¤ä¸?é?µå?¼"
 
-#: nis/ypclnt.c:851
+#: nis/ypclnt.c:850
 msgid "Internal NIS error"
 msgstr "å?§é?¨ NIS é?¯èª¤"
 
-#: nis/ypclnt.c:854
+#: nis/ypclnt.c:853
 msgid "Local resource allocation failure"
 msgstr "å??å??è³?æº?é??ç½®å¤±æ??"
 
-#: nis/ypclnt.c:857
+#: nis/ypclnt.c:856
 msgid "No more records in map database"
 msgstr "å?¨å°?æ? è¡¨è³?æ??åº«ä¸æ²?æ??å?¶ä»?ç´?é??äº?"
 
-#: nis/ypclnt.c:860
+#: nis/ypclnt.c:859
 msgid "Can't communicate with portmapper"
 msgstr "ç?¡æ³?è?? portmapper é??è¨?"
 
-#: nis/ypclnt.c:863
+#: nis/ypclnt.c:862
 msgid "Can't communicate with ypbind"
 msgstr "ç?¡æ³?è?? ypbind é??è¨?"
 
-#: nis/ypclnt.c:866
+#: nis/ypclnt.c:865
 msgid "Can't communicate with ypserv"
 msgstr "ç?¡æ³?è?? ypserv é??è¨?"
 
-#: nis/ypclnt.c:869
+#: nis/ypclnt.c:868
 msgid "Local domain name not set"
 msgstr "å??å??ç¶²å??å??ç¨±æ²?æ??è¨å®?"
 
-#: nis/ypclnt.c:872
+#: nis/ypclnt.c:871
 msgid "NIS map database is bad"
 msgstr "NIS å°?æ? è³?æ??åº«æ?¯å£?ç??"
 
-#: nis/ypclnt.c:875
+#: nis/ypclnt.c:874
 msgid "NIS client/server version mismatch - can't supply service"
 msgstr "NIS è«?æ±?ç«¯/ä¼ºæ??ç«¯ç??æ?¬ä¸?ç¬¦å?? - ç?¡æ³?æ??ä¾?æ??å??"
 
-#: nis/ypclnt.c:881
+#: nis/ypclnt.c:880
 msgid "Database is busy"
 msgstr "è³?æ??åº«æ£å?¨å¿?ç¢?"
 
-#: nis/ypclnt.c:884
+#: nis/ypclnt.c:883
 msgid "Unknown NIS error code"
 msgstr "æ?ªç?¥ç?? NIS é?¯èª¤ç¢¼"
 
-#: nis/ypclnt.c:924
+#: nis/ypclnt.c:923
 msgid "Internal ypbind error"
 msgstr "å?§é?¨ ypbind é?¯èª¤"
 
-#: nis/ypclnt.c:927
+#: nis/ypclnt.c:926
 msgid "Domain not bound"
 msgstr "ç¶²å??æ?¾ä¸?å?°"
 
-#: nis/ypclnt.c:930
+#: nis/ypclnt.c:929
 msgid "System resource allocation failure"
 msgstr "ç³»çµ±è³?æº?é??ç½®å¤±æ??"
 
-#: nis/ypclnt.c:933
+#: nis/ypclnt.c:932
 msgid "Unknown ypbind error"
 msgstr "æ?ªç?¥ç?? ypbind é?¯èª¤"
 
-#: nis/ypclnt.c:974
+#: nis/ypclnt.c:973
 msgid "yp_update: cannot convert host to netname\n"
 msgstr "yp_update: ç?¡æ³?è½?æ??ä¸»æ©?ç??ç¶²è·¯å??ç¨±\n"
 
-#: nis/ypclnt.c:992
+#: nis/ypclnt.c:991
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: ç?¡æ³?å??å¾?ä¼ºæ??å?¨ä½?å??\n"
 
-#: nscd/aicache.c:83 nscd/hstcache.c:492
+#: nscd/aicache.c:82 nscd/hstcache.c:493
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "å°?æ?ªå?¨ hosts å¿«å??ä¸æ?¾å?° \"%s\"!"
 
-#: nscd/aicache.c:85 nscd/hstcache.c:494
+#: nscd/aicache.c:84 nscd/hstcache.c:495
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
 msgstr "é??æ?°è¼?å?¥ã??%sã??æ?¼ä¸»æ©?å¿«å??ï¼?"
 
-#: nscd/cache.c:150
+#: nscd/cache.c:151
 #, c-format
 msgid "add new entry \"%s\" of type %s for %s to cache%s"
 msgstr "å? å?¥æ?°ç??é ?ç?®ã??%sã??ç??å??æ?? %s ç?¨æ?¼ %s å?° cache%s"
 
-#: nscd/cache.c:152
+#: nscd/cache.c:153
 msgid " (first)"
 msgstr " (å??)"
 
-#: nscd/cache.c:276 nscd/connections.c:861
+#: nscd/cache.c:285 nscd/connections.c:1002
 #, c-format
 msgid "cannot stat() file `%s': %s"
 msgstr "ç?¡æ³? stat() æª?æ¡? `%s': %s"
 
-#: nscd/cache.c:318
+#: nscd/cache.c:331
 #, c-format
 msgid "pruning %s cache; time %ld"
 msgstr "pruning %s å¿«å??ï¼?æ??é?? %ld"
 
-#: nscd/cache.c:347
+#: nscd/cache.c:360
 #, c-format
 msgid "considering %s entry \"%s\", timeout %<PRIu64>"
 msgstr "èª?ç?ºä¸ %s é ?ç?®ã??%sã??ï¼?é?¾æ?? %<PRIu64>"
 
-#: nscd/connections.c:565
+#: nscd/connections.c:570
 #, c-format
 msgid "invalid persistent database file \"%s\": %s"
 msgstr "ç?¡æ??ç??æ°¸ä¹?æ?§ç??è³?æ??åº«æª?æ¡?ã??%sã??ï¼?%s"
 
-#: nscd/connections.c:573
+#: nscd/connections.c:578
 msgid "uninitialized header"
 msgstr "æ?ªèµ·å§?ç??æ¨?é "
 
-#: nscd/connections.c:578
+#: nscd/connections.c:583
 msgid "header size does not match"
 msgstr "é ?é¦?å¤§å°?ä¸?å?»å??"
 
-#: nscd/connections.c:588
+#: nscd/connections.c:593
 msgid "file size does not match"
 msgstr "æª?æ¡?å¤§å°?ä¸?å?»å??"
 
-#: nscd/connections.c:605
+#: nscd/connections.c:610
 msgid "verification failed"
 msgstr "æ?¥æ ¸å¤±æ??"
 
-#: nscd/connections.c:619
+#: nscd/connections.c:624
 #, c-format
 msgid "suggested size of table for database %s larger than the persistent database's table"
 msgstr "ç?¨æ?¼è³?æ??åº« %s ç??å»ºè°è¡¨æ ¼å¤§å°?å¤§æ?¼æ°¸ä¹?æ?§ç??è³?æ??åº«è¡¨æ ¼"
 
-#: nscd/connections.c:630 nscd/connections.c:715
+#: nscd/connections.c:635 nscd/connections.c:720
 #, c-format
 msgid "cannot create read-only descriptor for \"%s\"; no mmap"
 msgstr "ç?¡æ³?å»ºç«?ç?¨æ?¼ã??%sã??ç??å?¯è®?æ??è¿°å??ï¼?ç?¡ mmap"
 
-#: nscd/connections.c:646
+#: nscd/connections.c:651
 #, c-format
 msgid "cannot access '%s'"
 msgstr "ç?¡æ³?å?å??ã??%sã??"
 
-#: nscd/connections.c:694
+#: nscd/connections.c:699
 #, c-format
 msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
 msgstr "è³?æ??åº«ç?¨æ?¼ %s å·²æ??å£?æ??å??æ¥å?°ä½¿ç?¨ï¼?ç§»é?¤ %s æ??å??å?°å¦?æ??å¿?è¦?ç??è©±å??é??æ?°å??å??"
 
-#: nscd/connections.c:701
+#: nscd/connections.c:706
 #, c-format
 msgid "cannot create %s; no persistent database used"
 msgstr "ç?¡æ³?å»ºç«? %s; æ?ªä½¿ç?¨æ°¸ä¹?æ?§ç??è³?æ??åº«"
 
-#: nscd/connections.c:704
+#: nscd/connections.c:709
 #, c-format
 msgid "cannot create %s; no sharing possible"
 msgstr "ç?¡æ³?å»ºç«? %s; ä¸?å?¯è?½å?±äº«"
 
-#: nscd/connections.c:775
+#: nscd/connections.c:780
 #, c-format
 msgid "cannot write to database file %s: %s"
 msgstr "ç?¡æ³?å¯«å?¥è³?æ??åº«æª?æ¡? %s: %s"
 
-#: nscd/connections.c:814
+#: nscd/connections.c:819
 #, c-format
 msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
 msgstr "ç?¡æ³?è¨å®?é??è¨?ç«¯å?°é??é??æ?¼ execï¼?%s; å??ç?¨ paranoia æ¨¡å¼?"
 
-#: nscd/connections.c:897
+#: nscd/connections.c:868
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "ç?¡æ³?é??å?? socket: %s"
 
-#: nscd/connections.c:917
+#: nscd/connections.c:888 nscd/connections.c:952
 #, c-format
 msgid "cannot change socket to nonblocking mode: %s"
 msgstr "ç?¡æ³?è®?æ?´é??è¨?ç«¯ç?ºé??å??å¡?æ¨¡å¼?ï¼?%s"
 
-#: nscd/connections.c:925
+#: nscd/connections.c:896 nscd/connections.c:962
 #, c-format
 msgid "cannot set socket to close on exec: %s"
 msgstr "ç?¡æ³?è¨å®?é??è¨?ç«¯æ?¼ execï¼?%s æ??é??é??"
 
-#: nscd/connections.c:938
+#: nscd/connections.c:909
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "ç?¡æ³?é??å?? socket ä¾?æ?¥å??é?£ç·?: %s"
 
-#: nscd/connections.c:1039
+#: nscd/connections.c:986
+#, c-format
+msgid "register trace file %s for database %s"
+msgstr "è¨»å??è¿½è¹¤æª?æ¡? %s ç?¨æ?¼è³?æ??åº« %s"
+
+#: nscd/connections.c:1116
 #, c-format
 msgid "provide access to FD %d, for %s"
 msgstr "æ??ä¾?å?å??å?° FD %d, ç?¨æ?¼ %s"
 
-#: nscd/connections.c:1051
+#: nscd/connections.c:1128
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "ä¸?è?½è??ç??è?? %d ç??ç??è«?æ±?ï¼?ç?®å??ä½¿ç?¨ç??ç??æ?¬æ?¯ %d"
 
-#: nscd/connections.c:1073
+#: nscd/connections.c:1150
 #, c-format
 msgid "request from %ld not handled due to missing permission"
 msgstr "ç?±æ?¼ç¼ºå°?æ¬?é??è??ç?¡æ³?è??ç??ä¾?è?ª %ld ç??è¦?æ±?"
 
-#: nscd/connections.c:1078
+#: nscd/connections.c:1155
 #, c-format
 msgid "request from '%s' [%ld] not handled due to missing permission"
 msgstr "ç?±æ?¼ç¼ºå°?æ¬?é??è??ç?¡æ³?è??ç??ä¾?è?ª '%s' [%ld] ç??è¦?æ±?"
 
-#: nscd/connections.c:1083
+#: nscd/connections.c:1160
 msgid "request not handled due to missing permission"
 msgstr "è¦?æ±?ç?¡æ³?æ?§æ??ç??ç?±æ?¼ç¼ºå°?æ¬?é??"
 
-#: nscd/connections.c:1121 nscd/connections.c:1174
+#: nscd/connections.c:1198 nscd/connections.c:1251
 #, c-format
 msgid "cannot write result: %s"
 msgstr "ç?¡æ³?å¯«å?¥çµ?æ??: %s"
 
-#: nscd/connections.c:1257
+#: nscd/connections.c:1342
 #, c-format
 msgid "error getting caller's id: %s"
 msgstr "å??å¾?å?¼å?«ç¨?å¼?è?å?¥ç¢¼æ??ç?¼ç??é?¯èª¤: %s"
 
-#: nscd/connections.c:1316
+#: nscd/connections.c:1402
 #, c-format
 msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "ç?¡æ³?é??å??/proc/self/cmdlineï¼?%s; å??ç?¨ paranoia æ¨¡å¼?"
 
-#: nscd/connections.c:1330
+#: nscd/connections.c:1416
 #, c-format
 msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
 msgstr "ç?¡æ³?è®?å??/proc/self/cmdlineï¼?%s; å??ç?¨ paranoia æ¨¡å¼?"
 
-#: nscd/connections.c:1370
+#: nscd/connections.c:1456
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr "ç?¡æ³?è®?æ?´ç?ºè??ç?? UIDï¼?%s; å??ç?¨ paranoia æ¨¡å¼?"
 
-#: nscd/connections.c:1380
+#: nscd/connections.c:1466
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr "ç?¡æ³?è®?æ?´ç?ºè??ç?? GIDï¼?%s; å??ç?¨ paranoia æ¨¡å¼?"
 
-#: nscd/connections.c:1393
+#: nscd/connections.c:1479
 #, c-format
 msgid "cannot change to old working directory: %s; disabling paranoia mode"
 msgstr "ç?¡æ³?è®?æ?´ç?ºè??ç??å·¥ä½?ç?®é??ï¼?%s; å??ç?¨ paranoia æ¨¡å¼?"
 
-#: nscd/connections.c:1439
+#: nscd/connections.c:1525
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr "re-exec å¤±æ??ï¼?%s; å??ç?¨ paranoia æ¨¡å¼?"
 
-#: nscd/connections.c:1448
+#: nscd/connections.c:1534
 #, c-format
 msgid "cannot change current working directory to \"/\": %s"
 msgstr "ç?¡æ³?è®?æ?´ç?®å??ç??å·¥ä½?ç?®é??å?°ã??/ã??ï¼?%s"
 
-#: nscd/connections.c:1641
+#: nscd/connections.c:1727
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "è®?å??è«?æ±?æ??ç?¼ç?¾è¼¸å?¥å?¼é??ç?: %s"
 
-#: nscd/connections.c:1674
+#: nscd/connections.c:1760
 #, c-format
 msgid "key length in request too long: %d"
 msgstr "å?¨æ¤è«?æ±?ä¸ä½¿ç?¨ç??é?µå?¼å¤ªé?·äº?: %d"
 
-#: nscd/connections.c:1687
+#: nscd/connections.c:1773
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "è®?å??è«?æ±?ç??é?µå?¼æ??ç?¼ç?¾è¼¸å?¥å?¼é??ç?: %s"
 
-#: nscd/connections.c:1696
+#: nscd/connections.c:1782
 #, c-format
 msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr "handle_request: è«?æ±?å·²è¢«æ?¥å?? (ç??æ?¬ç?º %d) ä¾?è?ªæ?¼ PID %ld"
 
-#: nscd/connections.c:1701
+#: nscd/connections.c:1787
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "handle_request: è«?æ±?å·²è¢«æ?¥å?? (ç??æ?¬ç?º %d)"
 
-#: nscd/connections.c:1901 nscd/connections.c:2099
+#: nscd/connections.c:1999 nscd/connections.c:2227
 #, c-format
 msgid "disabled inotify after read error %d"
 msgstr "è®?å?? %d é?¯èª¤ä¹?å¾?å·²å??ç?¨ inotify"
 
-#: nscd/connections.c:2228
+#: nscd/connections.c:2374
 msgid "could not initialize conditional variable"
 msgstr "ç?¡æ³?å??å§?å??æ¢?ä»¶è®?æ?¸"
 
-#: nscd/connections.c:2236
+#: nscd/connections.c:2382
 msgid "could not start clean-up thread; terminating"
 msgstr "ç?¡æ³?é??å§?æ¸?ç??å?·è¡?ç·?ï¼?çµ?æ¢ä¸"
 
-#: nscd/connections.c:2250
+#: nscd/connections.c:2396
 msgid "could not start any worker thread; terminating"
 msgstr "ç?¡æ³?é??å§?ä»»ä½?è??æ?¯å·¥ä½?å?·è¡?ç·?ï¼?çµ?æ¢ä¸"
 
-#: nscd/connections.c:2301 nscd/connections.c:2302 nscd/connections.c:2319
-#: nscd/connections.c:2328 nscd/connections.c:2346 nscd/connections.c:2357
-#: nscd/connections.c:2368
+#: nscd/connections.c:2447 nscd/connections.c:2448 nscd/connections.c:2465
+#: nscd/connections.c:2474 nscd/connections.c:2492 nscd/connections.c:2503
+#: nscd/connections.c:2514
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr "ä»¥ä½¿ç?¨è?? '%s' ç??èº«å??å?·è¡? nscd å¤±æ??"
 
-#: nscd/connections.c:2320
+#: nscd/connections.c:2466
 #, c-format
 msgid "initial getgrouplist failed"
 msgstr "å??å§? getgrouplist å¤±æ??"
 
-#: nscd/connections.c:2329
+#: nscd/connections.c:2475
 #, c-format
 msgid "getgrouplist failed"
 msgstr "getgrouplist å¤±æ??"
 
-#: nscd/connections.c:2347
+#: nscd/connections.c:2493
 #, c-format
 msgid "setgroups failed"
 msgstr "setgroups å¤±æ??"
 
-#: nscd/grpcache.c:383 nscd/hstcache.c:439 nscd/initgrcache.c:406
-#: nscd/pwdcache.c:378 nscd/servicescache.c:332
+#: nscd/grpcache.c:407 nscd/hstcache.c:440 nscd/initgrcache.c:411
+#: nscd/pwdcache.c:383 nscd/servicescache.c:338
 #, c-format
 msgid "short write in %s: %s"
 msgstr "å¯«å?¥ %s ç??è³?æ??é??ç?: %s"
 
-#: nscd/grpcache.c:428 nscd/initgrcache.c:78
+#: nscd/grpcache.c:452 nscd/initgrcache.c:77
 #, c-format
 msgid "Haven't found \"%s\" in group cache!"
 msgstr "å°?æ?ªå?¨ç¾¤çµ?å¿«å??ä¸æ?¾å?° \"%s\"!"
 
-#: nscd/grpcache.c:430 nscd/initgrcache.c:80
+#: nscd/grpcache.c:454 nscd/initgrcache.c:79
 #, c-format
 msgid "Reloading \"%s\" in group cache!"
 msgstr "é??æ?°è¼?å?¥ã??%sã??æ?¼ç¾¤çµ?å¿«å??ï¼?"
 
-#: nscd/grpcache.c:509
+#: nscd/grpcache.c:533
 #, c-format
 msgid "Invalid numeric gid \"%s\"!"
 msgstr "ç?¡æ??ç?? gid æ?¸å?¼ \"%s\"!"
 
-#: nscd/mem.c:431
+#: nscd/mem.c:425
 #, c-format
 msgid "freed %zu bytes in %s cache"
 msgstr "å?¨ %2$s å¿«å??ä¸ %1$zu ä½?å??çµ?å?¯ç?¨"
 
-#: nscd/mem.c:574
+#: nscd/mem.c:568
 #, c-format
 msgid "no more memory for database '%s'"
 msgstr "ç?¡è¨?æ?¶é«?å?¯ç?¨æ?¼è³?æ??åº«ã??%sã??"
 
-#: nscd/nscd.c:101
+#: nscd/netgroupcache.c:77
+#, c-format
+msgid "Haven't found \"%s\" in netgroup cache!"
+msgstr "å°?æ?ªå?¨ç¶²è·¯ç¾¤çµ?å¿«å??ä¸æ?¾å?°ã??%sã??ï¼?"
+
+#: nscd/netgroupcache.c:79
+#, c-format
+msgid "Reloading \"%s\" in netgroup cache!"
+msgstr "é??æ?°å?¨ç¶²è·¯ç¾¤çµ?å¿«å??ä¸è¼?å?¥ã??%sã??ï¼?"
+
+#: nscd/netgroupcache.c:467
+#, c-format
+msgid "Haven't found \"%s (%s,%s,%s)\" in netgroup cache!"
+msgstr "å°?æ?ªå?¨ç¶²è·¯ç¾¤çµ?å¿«å??ä¸æ?¾å?°ã??%s (%s,%s,%s)ã??ï¼?"
+
+#: nscd/netgroupcache.c:470
+#, c-format
+msgid "Reloading \"%s (%s,%s,%s)\" in netgroup cache!"
+msgstr "é??æ?°å?¨ç¶²è·¯ç¾¤çµ?å¿«å??ä¸è¼?å?¥ã??%s (%s,%s,%s)ã??ï¼?"
+
+#: nscd/nscd.c:116
 msgid "Read configuration data from NAME"
 msgstr "è?ªå??ç¨±ä¸è®?å??è¨å®?è³?æ??"
 
-#: nscd/nscd.c:103
+#: nscd/nscd.c:118
 msgid "Do not fork and display messages on the current tty"
 msgstr "ä¸?å?¨ç?®å??ç?? tty ç?¢ç??å?è¡?ç¨? (fork) ä»¥å??é¡¯ç¤ºè¨?æ?¯"
 
-#: nscd/nscd.c:104
+#: nscd/nscd.c:120
+msgid "Do not fork, but otherwise behave like a daemon"
+msgstr "ä¸?è¡?ç??ï¼?ä½?æ?¯å?¦å?? behave å¦?å??å®?è·ç¨?å¼?"
+
+#: nscd/nscd.c:121
 msgid "NUMBER"
 msgstr "è??ç¢¼"
 
-#: nscd/nscd.c:104
+#: nscd/nscd.c:121
 msgid "Start NUMBER threads"
 msgstr "å??å??å?·è¡?ç·?"
 
-#: nscd/nscd.c:105
+#: nscd/nscd.c:122
 msgid "Shut the server down"
 msgstr "å°?ä¼ºæ??å?¨é??é??"
 
-#: nscd/nscd.c:106
+#: nscd/nscd.c:123
 msgid "Print current configuration statistics"
 msgstr "å?°å?ºç?®å??çµ?æ??çµ±è¨?"
 
-#: nscd/nscd.c:107
+#: nscd/nscd.c:124
 msgid "TABLE"
 msgstr "è¡¨æ ¼"
 
-#: nscd/nscd.c:108
+#: nscd/nscd.c:125
 msgid "Invalidate the specified cache"
 msgstr "ä½¿é?¸å®?ç??å¿«å??ç?¡æ??"
 
-#: nscd/nscd.c:109
+#: nscd/nscd.c:126
 msgid "TABLE,yes"
 msgstr "è¦?è£½ä½?è¡¨æ ¼"
 
-#: nscd/nscd.c:110
+#: nscd/nscd.c:127
 msgid "Use separate cache for each user"
 msgstr "å°?ä¸?å??ä½¿ç?¨è??ä½¿ç?¨ä¸?å??ç??å¿«å??æª?æ¡?"
 
-#: nscd/nscd.c:115
+#: nscd/nscd.c:132
 msgid "Name Service Cache Daemon."
 msgstr "ç¶²å??å??ç¨±å¿«å??ç²¾é??"
 
-#: nscd/nscd.c:147 nss/getent.c:952 nss/makedb.c:123
+#: nscd/nscd.c:164 nss/getent.c:999 nss/makedb.c:208
 #, c-format
 msgid "wrong number of arguments"
 msgstr "å??æ?¸æ?¸ç?®ä¸?å°?"
 
-#: nscd/nscd.c:157
+#: nscd/nscd.c:174
 #, c-format
 msgid "failure while reading configuration file; this is fatal"
 msgstr "è®?å??çµ?æ??æª?æ¡?æ??å¤±æ??ï¼?é??æ?¯ä¸?å??å?´é??é?¯èª¤"
 
-#: nscd/nscd.c:166
+#: nscd/nscd.c:183
 #, c-format
 msgid "already running"
 msgstr "å·²å?¨å?·è¡?"
 
-#: nscd/nscd.c:181 nscd/nscd.c:236
+#: nscd/nscd.c:201 nscd/nscd.c:259
 #, c-format
 msgid "cannot fork"
 msgstr "ç?¡æ³?è¡?ç??"
 
-#: nscd/nscd.c:244
+#: nscd/nscd.c:268
 #, c-format
 msgid "cannot change current working directory to \"/\""
 msgstr "ç?¡æ³?è®?æ?´ç?®å??ç??å·¥ä½?ç?®é??å?°ã??/ã??"
 
-#: nscd/nscd.c:252
+#: nscd/nscd.c:276
 msgid "Could not create log file"
 msgstr "ç?¡æ³?å»ºç«?è¨?é??æª?"
 
-#: nscd/nscd.c:305 nscd/nscd.c:330 nscd/nscd_stat.c:174
+#: nscd/nscd.c:348 nscd/nscd.c:373 nscd/nscd_stat.c:173
 #, c-format
 msgid "Only root is allowed to use this option!"
 msgstr "å?ªæ?? root æ??å?¯ä»¥ä½¿ç?¨æ¤ä¸?é?¸é ?!"
 
-#: nscd/nscd.c:345
+#: nscd/nscd.c:388
 #, c-format
 msgid "'%s' is not a known database"
 msgstr "ã??%sã??ä¸¦é??ä¸?å·²ç?¥è³?æ??åº«"
 
-#: nscd/nscd.c:370 nscd/nscd_stat.c:193
+#: nscd/nscd.c:413 nscd/nscd_stat.c:192
 #, c-format
 msgid "write incomplete"
 msgstr "å¯«å?¥ä¸?å®?å?¨"
 
-#: nscd/nscd.c:381
+#: nscd/nscd.c:424
 #, c-format
 msgid "cannot read invalidate ACK"
 msgstr "ç?¡æ³?è®?å??è¨ç?ºç?¡æ??ç?? ACK"
 
-#: nscd/nscd.c:387
+#: nscd/nscd.c:430
 #, c-format
 msgid "invalidation failed"
 msgstr "ç?¡æ??å??å¤±æ??"
 
-#: nscd/nscd.c:397
+#: nscd/nscd.c:440
 #, c-format
 msgid "secure services not implemented anymore"
 msgstr "å®?å?¨æ??å??ä¸?å??å¯¦ä½?"
@@ -4057,60 +4183,55 @@ msgstr "å¿?é ?ç?ºä¼ºæ??å?¨ä½¿ç?¨è??é?¸é ?æ??å®?ä½¿ç?¨è??å??ç¨±"
 msgid "Must specify user name for stat-user option"
 msgstr "å¿?é ?ç?º stat ä½¿ç?¨è??é?¸é ?æ??å®?ä½¿ç?¨è??å??ç¨±"
 
-#: nscd/nscd_conf.c:245
-#, c-format
-msgid "invalid value for 'reload-count': %u"
-msgstr "ç?¨æ?¼ã??reload-countã??ç??ç?¡æ??å?¼ï¼?%u"
-
-#: nscd/nscd_conf.c:260
+#: nscd/nscd_conf.c:258
 #, c-format
 msgid "Must specify value for restart-interval option"
 msgstr "å¿?é ?æ??å®?ç?¨æ?¼ restart-interval é?¸é ?ç??å?¼"
 
-#: nscd/nscd_conf.c:274
+#: nscd/nscd_conf.c:272
 #, c-format
 msgid "Unknown option: %s %s %s"
 msgstr "æ?ªç?¥ç??é?¸é ?: %s %s %s"
 
-#: nscd/nscd_conf.c:287
+#: nscd/nscd_conf.c:285
 #, c-format
 msgid "cannot get current working directory: %s; disabling paranoia mode"
 msgstr "ç?¡æ³?å??å¾?ç?®å??ç??å·¥ä½?ç?®é??ï¼?%s; å??ç?¨ paranoia æ¨¡å¼?"
 
-#: nscd/nscd_conf.c:307
+#: nscd/nscd_conf.c:305
 #, c-format
 msgid "maximum file size for %s database too small"
 msgstr "æ??å¤§å?¼æª?æ¡?å¤§å°?ç?¨æ?¼ %s è³?æ??åº«å¤ªå°?"
 
-#: nscd/nscd_stat.c:143
+#: nscd/nscd_stat.c:142
 #, c-format
 msgid "cannot write statistics: %s"
 msgstr "ç?¡æ³?å¯«å?¥çµ±è¨?è³?æ??: %s"
 
-#: nscd/nscd_stat.c:158
+#: nscd/nscd_stat.c:157
 msgid "yes"
 msgstr "æ?¯"
 
-#: nscd/nscd_stat.c:159
+#: nscd/nscd_stat.c:158
 msgid "no"
 msgstr "ç?¡"
 
-#: nscd/nscd_stat.c:170
+#: nscd/nscd_stat.c:169
 #, c-format
 msgid "Only root or %s is allowed to use this option!"
 msgstr "å?ªæ?? root æ?? %s æ??å??è¨±ä½¿ç?¨æ¤ä¸?é?¸é ?!"
 
-#: nscd/nscd_stat.c:181
+#: nscd/nscd_stat.c:180
 #, c-format
 msgid "nscd not running!\n"
 msgstr "nscd ä¸¦æ²?æ??å?¨å?·è¡?!\n"
 
-#: nscd/nscd_stat.c:205
+#: nscd/nscd_stat.c:204
 #, c-format
 msgid "cannot read statistics data"
 msgstr "ç?¡æ³?è®?å??çµ±è¨?è³?æ??"
 
-#: nscd/nscd_stat.c:208
+#: nscd/nscd_stat.c:207
 #, c-format
 msgid ""
 "nscd configuration:\n"
@@ -4121,27 +4242,27 @@ msgstr ""
 "\n"
 "%15d  ä¼ºæ??ç¨?å¼?é?¯èª¤è¨?æ?¯å ±å??ç?ç´?\n"
 
-#: nscd/nscd_stat.c:232
+#: nscd/nscd_stat.c:231
 #, c-format
 msgid "%3ud %2uh %2um %2lus  server runtime\n"
 msgstr "%3ud %2uh %2um %2lus  ä¼ºæ??å?¨ å?·è¡?æ??æ??\n"
 
-#: nscd/nscd_stat.c:235
+#: nscd/nscd_stat.c:234
 #, c-format
 msgid "    %2uh %2um %2lus  server runtime\n"
 msgstr "    %2uh %2um %2lus  ä¼ºæ??å?¨ å?·è¡?æ??æ??\n"
 
-#: nscd/nscd_stat.c:237
+#: nscd/nscd_stat.c:236
 #, c-format
 msgid "        %2um %2lus  server runtime\n"
 msgstr "        %2um %2lus  ä¼ºæ??å?¨ å?·è¡?æ??æ??\n"
 
-#: nscd/nscd_stat.c:239
+#: nscd/nscd_stat.c:238
 #, c-format
 msgid "            %2lus  server runtime\n"
 msgstr "            %2lus  ä¼ºæ??å?¨ å?·è¡?æ??æ??\n"
 
-#: nscd/nscd_stat.c:241
+#: nscd/nscd_stat.c:240
 #, c-format
 msgid ""
 "%15d  current number of threads\n"
@@ -4158,7 +4279,7 @@ msgstr ""
 "%15lu  å?§é?¨é??æ?°å??å??\n"
 "%15u  é??æ?°è¼?å?¥è¨?æ?¸\n"
 
-#: nscd/nscd_stat.c:276
+#: nscd/nscd_stat.c:275
 #, c-format
 msgid ""
 "\n"
@@ -4209,97 +4330,97 @@ msgstr ""
 "%15<PRIuMAX> è¨?æ?¶é«?é??ç½®å¤±æ??\n"
 "%15s  æª¢æ?¥ /etc/%s ç??è®?æ?´\n"
 
-#: nscd/pwdcache.c:423
+#: nscd/pwdcache.c:428
 #, c-format
 msgid "Haven't found \"%s\" in password cache!"
 msgstr "å°?æ?ªå?¨å¯?ç¢¼å¿«å??ä¸æ?¾å?° \"%s\"!"
 
-#: nscd/pwdcache.c:425
+#: nscd/pwdcache.c:430
 #, c-format
 msgid "Reloading \"%s\" in password cache!"
 msgstr "é??æ?°è¼?å?¥ã??%sã??æ?¼å¯?ç¢¼å¿«å??ï¼?"
 
-#: nscd/pwdcache.c:506
+#: nscd/pwdcache.c:511
 #, c-format
 msgid "Invalid numeric uid \"%s\"!"
 msgstr "ç?¡æ??ç?? uid æ?¸å?¼ \"%s\"!"
 
-#: nscd/selinux.c:156
+#: nscd/selinux.c:160
 #, c-format
 msgid "Failed opening connection to the audit subsystem: %m"
 msgstr "å¤±æ??ç??é??å??é?£ç·?å?°ç¨½æ ¸å?ç³»çµ±ï¼?%m"
 
-#: nscd/selinux.c:177
+#: nscd/selinux.c:181
 msgid "Failed to set keep-capabilities"
 msgstr "è¨å®?å??è?½ä¿?æ??æ??å¤±æ??"
 
-#: nscd/selinux.c:178 nscd/selinux.c:241
+#: nscd/selinux.c:182 nscd/selinux.c:245
 #, c-format
 msgid "prctl(KEEPCAPS) failed"
 msgstr "prctl(KEEPCAPS) å¤±æ??"
 
-#: nscd/selinux.c:192
+#: nscd/selinux.c:196
 msgid "Failed to initialize drop of capabilities"
 msgstr "å??å§?å??å??è?½æ?¾æ£?æ??å¤±æ??"
 
-#: nscd/selinux.c:193
+#: nscd/selinux.c:197
 #, c-format
 msgid "cap_init failed"
 msgstr "cap_init å¤±æ??"
 
-#: nscd/selinux.c:214 nscd/selinux.c:231
+#: nscd/selinux.c:218 nscd/selinux.c:235
 msgid "Failed to drop capabilities"
 msgstr "æ?¾æ£?å??è?½æ??å¤±æ??"
 
-#: nscd/selinux.c:215 nscd/selinux.c:232
+#: nscd/selinux.c:219 nscd/selinux.c:236
 #, c-format
 msgid "cap_set_proc failed"
 msgstr "cap_set_proc å¤±æ??"
 
-#: nscd/selinux.c:240
+#: nscd/selinux.c:244
 msgid "Failed to unset keep-capabilities"
 msgstr "è§£é?¤è¨å®?å??è?½ä¿?æ??æ??å¤±æ??"
 
-#: nscd/selinux.c:256
+#: nscd/selinux.c:260
 msgid "Failed to determine if kernel supports SELinux"
 msgstr "æ±ºå®?å¦?æ??å?§æ ¸æ?¯æ?´ SELinux æ??å¤±æ??"
 
-#: nscd/selinux.c:271
+#: nscd/selinux.c:275
 #, c-format
 msgid "Failed to start AVC thread"
 msgstr "é??å§? AVC å?·è¡?ç·?æ??å¤±æ??"
 
-#: nscd/selinux.c:293
+#: nscd/selinux.c:297
 #, c-format
 msgid "Failed to create AVC lock"
 msgstr "å»ºç«? AVC é??å®?æ??å¤±æ??"
 
-#: nscd/selinux.c:333
+#: nscd/selinux.c:337
 #, c-format
 msgid "Failed to start AVC"
 msgstr "å??å§? AVC æ??å¤±æ??"
 
-#: nscd/selinux.c:335
+#: nscd/selinux.c:339
 msgid "Access Vector Cache (AVC) started"
 msgstr "å?å??å??é??å¿«å?? (AVC) é??å§?"
 
-#: nscd/selinux.c:356
+#: nscd/selinux.c:360
 msgid "Error getting context of socket peer"
 msgstr "å??å¾?å°?ç?é??è¨?ç«¯ç??ç??æ??çµ?å??æ??ç?¼ç??é?¯èª¤"
 
-#: nscd/selinux.c:361
+#: nscd/selinux.c:365
 msgid "Error getting context of nscd"
 msgstr "å??å¾? nscd ç??ç??æ??çµ?å??æ??ç?¼ç??é?¯èª¤"
 
-#: nscd/selinux.c:367
+#: nscd/selinux.c:371
 msgid "Error getting sid from context"
 msgstr "å¾?ç??æ??çµ?å??å??å¾? sid æ??ç?¼ç??é?¯èª¤"
 
-#: nscd/selinux.c:374
+#: nscd/selinux.c:378
 msgid "compile-time support for database policy missing"
 msgstr "compile-time æ?¯æ?´ç?¨æ?¼è³?æ??åº«ç?ç?¥ç¼ºå°?"
 
-#: nscd/selinux.c:407
+#: nscd/selinux.c:411
 #, c-format
 msgid ""
 "\n"
@@ -4326,68 +4447,76 @@ msgstr ""
 "%15u  CAV æ?¢æ?¥\n"
 "%15u  CAV ç¼ºå°?\n"
 
-#: nscd/servicescache.c:381
+#: nscd/servicescache.c:387
 #, c-format
 msgid "Haven't found \"%s\" in services cache!"
 msgstr "å°?æ?ªå?¨æ??å??å¿«å??ä¸æ?¾å?°ã??%sã??!"
 
-#: nscd/servicescache.c:383
+#: nscd/servicescache.c:389
 #, c-format
 msgid "Reloading \"%s\" in services cache!"
 msgstr "é??æ?°è¼?å?¥ã??%sã??æ?¼æ??å??å¿«å??ï¼?"
 
-#: nss/getent.c:54
+#: nss/getent.c:53
 msgid "database [key ...]"
-msgstr "è³?æ??åº« [é?µå?¼...]"
+msgstr "è³?æ??åº« [é?µå?¼â?¦]"
 
-#: nss/getent.c:59
+#: nss/getent.c:58
 msgid "Service configuration to be used"
 msgstr "å°?è¦?ä½¿ç?¨ç??æ??å??è¨å®?"
 
-#: nss/getent.c:60
+#: nss/getent.c:59
 msgid "disable IDN encoding"
 msgstr "å??ç?¨ IDN ç·¨ç¢¼"
 
-#: nss/getent.c:65
+#: nss/getent.c:64
 msgid "Get entries from administrative database."
 msgstr "å¾?ç®¡ç??è³?æ??åº«å??å¾?æ¢?ç?®ã??"
 
-#: nss/getent.c:149 nss/getent.c:479
+#: nss/getent.c:148 nss/getent.c:477 nss/getent.c:522
 #, c-format
 msgid "Enumeration not supported on %s\n"
 msgstr "æ¤é ?ç?®å?¨ %s ä¸ä¸?è¢«æ?¯æ?´\n"
 
-#: nss/getent.c:866
+#: nss/getent.c:913
 #, c-format
 msgid "Unknown database name"
 msgstr "ä¸?æ??ç??è³?æ??åº«å??ç¨±"
 
-#: nss/getent.c:896
+#: nss/getent.c:943
 msgid "Supported databases:\n"
 msgstr "æ?¯æ?´ç??è³?æ??åº«ï¼?\n"
 
-#: nss/getent.c:962
+#: nss/getent.c:1009
 #, c-format
 msgid "Unknown database: %s\n"
 msgstr "æ?ªç?¥ç??è³?æ??åº«: %s\n"
 
-#: nss/makedb.c:60
+#: nss/makedb.c:118
 msgid "Convert key to lower case"
 msgstr "è½?æ??é?µè½?æ??ç?ºå°?å¯«"
 
-#: nss/makedb.c:63
+#: nss/makedb.c:121
 msgid "Do not print messages while building database"
 msgstr "ä¸?å?°å?ºè¨?æ?¯ç?¶å»ºç«?è³?æ??åº«"
 
-#: nss/makedb.c:65
+#: nss/makedb.c:123
 msgid "Print content of database file, one entry a line"
 msgstr "å?°å?ºå?§å®¹ç??è³?æ??åº«æª?æ¡?ï¼?ä¸?å??é ?ç?®å??"
 
-#: nss/makedb.c:70
-msgid "Create simple DB database from textual input."
-msgstr "å»ºç«?ç°¡å?®ç??åº«æ??åº«è³?æ??åº«å¾?æ??å?è¼¸å?¥ã??"
+#: nss/makedb.c:124
+msgid "CHAR"
+msgstr "å?å??"
+
+#: nss/makedb.c:125
+msgid "Generated line not part of iteration"
+msgstr "ç?¢ç??ç??å??ä¸¦é??è¿ä»£ç??é?¨å??"
+
+#: nss/makedb.c:130
+msgid "Create simple database from textual input."
+msgstr "å¾?æ??å?è¼¸å?¥å»ºç«?ç°¡å?®ç??è³?æ??åº«ã??"
 
-#: nss/makedb.c:73
+#: nss/makedb.c:133
 msgid ""
 "INPUT-FILE OUTPUT-FILE\n"
 "-o OUTPUT-FILE INPUT-FILE\n"
@@ -4397,50 +4526,86 @@ msgstr ""
 "-o è¼¸å?ºæª?æ¡?å??ç¨± è¼¸å?¥æª?æ¡?å??ç¨±\n"
 "-u è¼¸å?¥æª?æ¡?å??ç¨±"
 
-#: nss/makedb.c:142
+#: nss/makedb.c:229
 #, c-format
-msgid "No usable database library found."
-msgstr "æ?¾ä¸?å?°å?¯ç?¨ç??è³?æ??åº«å?½å¼?åº«ã??"
+msgid "cannot open database file `%s'"
+msgstr "ç?¡æ³?é??å??è³?æ??åº«æª?æ¡? %s"
 
-#: nss/makedb.c:149
+#: nss/makedb.c:274
 #, c-format
-msgid "cannot open database file `%s': %s"
-msgstr "ç?¡æ³?é??å??è³?æ??åº«æª?æ¡?ã??%sã??ï¼?%s"
+msgid "no entries to be processed"
+msgstr "æ²?æ??æ¢?ç?®å?¯ä¾?è??ç??"
 
-#: nss/makedb.c:151
-msgid "incorrectly formatted file"
-msgstr "ä¸?æ£ç¢ºæ ¼å¼?å??ç??æª?æ¡?"
+#: nss/makedb.c:284
+#, c-format
+msgid "cannot create temporary file name"
+msgstr "ç?¡æ³?å»ºç«?æ?«å?æª?æ¡?å??ç¨±"
 
-#: nss/makedb.c:331
-msgid "duplicate key"
-msgstr "é??è¤?é?µå?¼"
+#: nss/makedb.c:306
+#, c-format
+msgid "cannot stat newly created file"
+msgstr "ç?¡æ³?å??å¾?æ?°å»ºç«?æª?æ¡?ç??ç??æ??"
 
-#: nss/makedb.c:337
+#: nss/makedb.c:317
 #, c-format
-msgid "while writing database file"
-msgstr "å¯«å?¥è³?æ??åº«æª?æ¡?æ??"
+msgid "cannot rename temporary file"
+msgstr "ç?¡æ³?é??æ?°å?½å??æ?«å?æª?æ¡?"
 
-#: nss/makedb.c:348
+#: nss/makedb.c:533 nss/makedb.c:556
+#, c-format
+msgid "cannot create search tree"
+msgstr "ç?¡æ³?å»ºç«?æ??å°?æ¨¹"
+
+#: nss/makedb.c:562
+msgid "duplicate key"
+msgstr "é??è¤?é?µå?¼"
+
+#: nss/makedb.c:574
 #, c-format
 msgid "problems while reading `%s'"
 msgstr "è®?å??ã??%sã??æ??ç?¼ç??å??é¡?"
 
-#: nss/makedb.c:368 nss/makedb.c:385
+#: nss/makedb.c:801
+#, c-format
+msgid "failed to write new database file"
+msgstr "å¯«å?¥æ?°è³?æ??åº«æª?æ¡?æ??å¤±æ??"
+
+#: nss/makedb.c:814
 #, c-format
-msgid "while reading database"
-msgstr "è®?å??è³?æ??åº«æ??"
+msgid "cannot stat database file"
+msgstr "ç?¡æ³?å??å¾?è³?æ??åº«æª?æ¡?ç??ç??æ??"
 
-#: posix/getconf.c:1036
+#: nss/makedb.c:819
+#, c-format
+msgid "cannot map database file"
+msgstr "ç?¡æ³?æ? å°?è³?æ??åº«æª?æ¡?"
+
+#: nss/makedb.c:822
+#, c-format
+msgid "file not a database file"
+msgstr "æª?æ¡?ä¸?æ?¯è³?æ??åº«æª?æ¡?"
+
+#: nss/makedb.c:873
+#, c-format
+msgid "cannot set file creation context for `%s'"
+msgstr "ç?¡æ³?ç?º %s è¨å®?æª?æ¡?å»ºç«?èª?å¢?"
+
+#: ports/sysdeps/unix/sysv/linux/ia64/makecontext.c:62
+#, c-format
+msgid "makecontext: does not know how to handle more than 8 arguments\n"
+msgstr "makecontext: ä¸?ç?¥è¦?å¦?ä½?è??ç??è¶?é??å?«å??å¼?æ?¸\n"
+
+#: posix/getconf.c:1035
 #, c-format
 msgid "Usage: %s [-v specification] variable_name [pathname]\n"
 msgstr "ç?¨æ³?: %s [-v è¦?æ ¼] è®?æ?¸å??ç¨± [è·¯å¾?å??ç¨±]\n"
 
-#: posix/getconf.c:1039
+#: posix/getconf.c:1038
 #, c-format
 msgid "       %s -a [pathname]\n"
 msgstr "       %s -a [è·¯å¾?å??ç¨±]\n"
 
-#: posix/getconf.c:1115
+#: posix/getconf.c:1114
 #, c-format
 msgid ""
 "Usage: getconf [-v SPEC] VAR\n"
@@ -4459,150 +4624,150 @@ msgstr ""
 "ç?°å¢? SPEC å?¼ã??\n"
 "\n"
 
-#: posix/getconf.c:1173
+#: posix/getconf.c:1172
 #, c-format
 msgid "unknown specification \"%s\""
 msgstr "ä¸?æ??ç??è¦?æ ¼ \"%s\""
 
-#: posix/getconf.c:1225
+#: posix/getconf.c:1224
 #, c-format
 msgid "Couldn't execute %s"
 msgstr "ç?¡æ³?å?·è¡? %s"
 
-#: posix/getconf.c:1269 posix/getconf.c:1285
+#: posix/getconf.c:1268 posix/getconf.c:1284
 msgid "undefined"
 msgstr "æ?ªå®?ç¾©"
 
-#: posix/getconf.c:1307
+#: posix/getconf.c:1306
 #, c-format
 msgid "Unrecognized variable `%s'"
 msgstr "ç?¡æ³?è?å?¥ç??è®?æ?¸ `%s'"
 
-#: posix/getopt.c:594 posix/getopt.c:623
+#: posix/getopt.c:593 posix/getopt.c:622
 #, c-format
 msgid "%s: option '%s' is ambiguous; possibilities:"
 msgstr "%sï¼?é?¸é ?ã??%sã??æ?¯æ¨¡ç¨?å?©å?¯ç??ï¼?å?¯è?½æ?¯ï¼?"
 
-#: posix/getopt.c:664 posix/getopt.c:668
+#: posix/getopt.c:663 posix/getopt.c:667
 #, c-format
 msgid "%s: option '--%s' doesn't allow an argument\n"
 msgstr "%s: é?¸é ? `--%s' ä¸?å??è¨±é??å? å¼?æ?¸\n"
 
-#: posix/getopt.c:677 posix/getopt.c:682
+#: posix/getopt.c:676 posix/getopt.c:681
 #, c-format
 msgid "%s: option '%c%s' doesn't allow an argument\n"
 msgstr "%s: é?¸é ? `%c%s' ä¸?å??è¨±é??å? å¼?æ?¸\n"
 
-#: posix/getopt.c:725 posix/getopt.c:744
+#: posix/getopt.c:724 posix/getopt.c:743
 #, c-format
 msgid "%s: option '--%s' requires an argument\n"
 msgstr "%sï¼?é?¸é ?ã??--%sã??é??è¦?ä¸?å??å¼?æ?¸\n"
 
-#: posix/getopt.c:782 posix/getopt.c:785
+#: posix/getopt.c:781 posix/getopt.c:784
 #, c-format
 msgid "%s: unrecognized option '--%s'\n"
 msgstr "%s: æ?ªç?¥ç??é?¸é ? `--%s'\n"
 
-#: posix/getopt.c:793 posix/getopt.c:796
+#: posix/getopt.c:792 posix/getopt.c:795
 #, c-format
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr "%s: æ?ªç?¥ç??é?¸é ? `%c%s'\n"
 
-#: posix/getopt.c:845 posix/getopt.c:848
+#: posix/getopt.c:844 posix/getopt.c:847
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: ä¸?é?©ç?¨ç??é?¸é ? -- %c\n"
 
-#: posix/getopt.c:898 posix/getopt.c:915 posix/getopt.c:1123
-#: posix/getopt.c:1141
+#: posix/getopt.c:900 posix/getopt.c:917 posix/getopt.c:1127
+#: posix/getopt.c:1145
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: é?¸é ?é??è¦?ä¸?å??å¼?æ?¸ -- %c\n"
 
-#: posix/getopt.c:971 posix/getopt.c:987
+#: posix/getopt.c:973 posix/getopt.c:989
 #, c-format
 msgid "%s: option '-W %s' is ambiguous\n"
 msgstr "%s: é?¸é ? `-W %s' å?«ç¾©ä¸?æ¸?\n"
 
-#: posix/getopt.c:1011 posix/getopt.c:1029
+#: posix/getopt.c:1013 posix/getopt.c:1031
 #, c-format
 msgid "%s: option '-W %s' doesn't allow an argument\n"
 msgstr "%s: é?¸é ? `-W %s' ä¸?å??è¨±é??å? å¼?æ?¸\n"
 
-#: posix/getopt.c:1050 posix/getopt.c:1068
+#: posix/getopt.c:1052 posix/getopt.c:1070
 #, c-format
 msgid "%s: option '-W %s' requires an argument\n"
 msgstr "%sï¼?é?¸é ?ã??-W %sã??é??è¦?ä¸?å??å¼?æ?¸\n"
 
-#: posix/regcomp.c:135
+#: posix/regcomp.c:134
 msgid "No match"
 msgstr "æ²?æ??ç¬¦å??ç??é ?ç?®"
 
-#: posix/regcomp.c:138
+#: posix/regcomp.c:137
 msgid "Invalid regular expression"
 msgstr "ä¸?é?©ç?¨ç??å¸¸è¦?è¡¨ç¤ºå¼?"
 
-#: posix/regcomp.c:141
+#: posix/regcomp.c:140
 msgid "Invalid collation character"
 msgstr "ä¸?é?©ç?¨ç??å°?ç?§å?å??"
 
-#: posix/regcomp.c:144
+#: posix/regcomp.c:143
 msgid "Invalid character class name"
 msgstr "ä¸?é?©ç?¨ç??å?å??é¡?å?¥å??"
 
-#: posix/regcomp.c:147
+#: posix/regcomp.c:146
 msgid "Trailing backslash"
 msgstr "å°¾ç«¯ç??å??æ??ç·?"
 
-#: posix/regcomp.c:150
+#: posix/regcomp.c:149
 msgid "Invalid back reference"
 msgstr "ä¸?é?©ç?¨ç??å¾?é?¨ç´¢å¼?"
 
-#: posix/regcomp.c:153
+#: posix/regcomp.c:152
 msgid "Unmatched [ or [^"
 msgstr "[ æ?? [^ ä¸?è?½å?¹é??"
 
-#: posix/regcomp.c:156
+#: posix/regcomp.c:155
 msgid "Unmatched ( or \\("
 msgstr "( æ?? \\( ä¸?è?½å?¹é??"
 
-#: posix/regcomp.c:159
+#: posix/regcomp.c:158
 msgid "Unmatched \\{"
 msgstr "\\{ ä¸?è?½å?¹é??"
 
-#: posix/regcomp.c:162
+#: posix/regcomp.c:161
 msgid "Invalid content of \\{\\}"
 msgstr "ä¸?é?©ç?¨ç?? \\{\\} å?§å®¹"
 
-#: posix/regcomp.c:165
+#: posix/regcomp.c:164
 msgid "Invalid range end"
 msgstr "ä¸?é?©ç?¨ç??ç¯?å??çµ?æ??"
 
-#: posix/regcomp.c:168
+#: posix/regcomp.c:167
 msgid "Memory exhausted"
 msgstr "è¨?æ?¶é«?ç?¨å®?äº?"
 
-#: posix/regcomp.c:171
+#: posix/regcomp.c:170
 msgid "Invalid preceding regular expression"
 msgstr "ä¸?é?©ç?¨ç??å??ç½®å¸¸è¦?è¡¨ç¤ºå¼?"
 
-#: posix/regcomp.c:174
+#: posix/regcomp.c:173
 msgid "Premature end of regular expression"
 msgstr "å¸¸è¦?è¡¨ç¤ºå¼?å¤ªæ?©çµ?æ??äº?"
 
-#: posix/regcomp.c:177
+#: posix/regcomp.c:176
 msgid "Regular expression too big"
 msgstr "æ£è¦?è¡¨ç¤ºå¼?å¤ªé?·äº?"
 
-#: posix/regcomp.c:180
+#: posix/regcomp.c:179
 msgid "Unmatched ) or \\)"
 msgstr ") æ?? \\) ä¸?è?½å?¹é??"
 
-#: posix/regcomp.c:680
+#: posix/regcomp.c:679
 msgid "No previous regular expression"
 msgstr "å??å??ä¸¦æ?ªä½¿ç?¨é??å¸¸è¦?è¡¨ç¤ºå¼?"
 
-#: posix/wordexp.c:1832
+#: posix/wordexp.c:1830
 msgid "parameter null or not set"
 msgstr "å??æ?¸ç?ºç©ºå?å??æ??æ?¯æ?ªè¨ç½®"
 
@@ -4634,27 +4799,27 @@ msgstr "å?§é?¨è§£è®?é?¯èª¤"
 msgid "Unknown resolver error"
 msgstr "æ?ªç?¥ç??è§£è®?é?¯èª¤"
 
-#: resolv/res_hconf.c:124
+#: resolv/res_hconf.c:122
 #, c-format
 msgid "%s: line %d: cannot specify more than %d trim domains"
 msgstr "%s: ç¬¬ %d å??: ç?¡æ³?æ??å®?è¶?é?? %d å??ä¿®å?ªç¯?å??"
 
-#: resolv/res_hconf.c:145
+#: resolv/res_hconf.c:143
 #, c-format
 msgid "%s: line %d: list delimiter not followed by domain"
 msgstr "%s: ç¬¬ %d å??: ç¯?å??ä¸?å?¯è·?å?¨è¡¨å??å??é??å?å??ä¹?å¾?"
 
-#: resolv/res_hconf.c:204
+#: resolv/res_hconf.c:202
 #, c-format
 msgid "%s: line %d: expected `on' or `off', found `%s'\n"
 msgstr "%s: ç¬¬ %d å??: é ?æ??ç?º `on' æ?? `off'ï¼?å?»ç?¼ç?¾ `%s'\n"
 
-#: resolv/res_hconf.c:247
+#: resolv/res_hconf.c:245
 #, c-format
 msgid "%s: line %d: bad command `%s'\n"
 msgstr "%s: ç¬¬ %d å??: ä¸?ç?¶ç??å?½ä»¤ `%s'\n"
 
-#: resolv/res_hconf.c:282
+#: resolv/res_hconf.c:280
 #, c-format
 msgid "%s: line %d: ignoring trailing garbage `%s'\n"
 msgstr "%s: ç¬¬ %d å??: æ£å?¨å¿½ç?¥å°¾ç«¯ç??ç?¡ç?¨è³?æ?? `%s'\n"
@@ -4745,11 +4910,11 @@ msgstr "ç?©ä»¶ç?¹å®?ç??ç¡¬é«?é?¯èª¤"
 
 #: stdio-common/psiginfo-data.h:31
 msgid "Process breakpoint"
-msgstr "è??ç??ä¸æ?·é»?"
+msgstr "è¡?ç¨?ä¸æ?·é»?"
 
 #: stdio-common/psiginfo-data.h:32
 msgid "Process trace trap"
-msgstr "è??ç??è¿½è¹¤é?·é?±"
+msgstr "è¡?ç¨?è¿½è¹¤é?·é?±"
 
 #: stdio-common/psiginfo-data.h:35
 msgid "Child has exited"
@@ -4799,206 +4964,206 @@ msgstr "é«?å?ªå??æ¬?è¼¸å?¥å?¯ç?¨"
 msgid "Device disconnected"
 msgstr "è£?ç½®å·²ç¶?çµ?æ??é?£ç·?"
 
-#: stdio-common/psiginfo.c:145
+#: stdio-common/psiginfo.c:139
 msgid "Signal sent by kill()"
 msgstr "kill() å·²ç?¼é??ä¿¡è??"
 
-#: stdio-common/psiginfo.c:148
+#: stdio-common/psiginfo.c:142
 msgid "Signal sent by sigqueue()"
 msgstr "sigqueue() å·²ç?¼é??ä¿¡è??"
 
-#: stdio-common/psiginfo.c:151
+#: stdio-common/psiginfo.c:145
 msgid "Signal generated by the expiration of a timer"
 msgstr "è¨?æ??å?¨ç??é?¾æ??å·²ç?¢ç??ä¿¡è??"
 
-#: stdio-common/psiginfo.c:154
+#: stdio-common/psiginfo.c:148
 msgid "Signal generated by the completion of an asynchronous I/O request"
 msgstr "é??å??æ¥ I/O è¦?æ±?ç??å®?æ??å·²ç?¢ç??ä¿¡è??"
 
-#: stdio-common/psiginfo.c:158
+#: stdio-common/psiginfo.c:152
 msgid "Signal generated by the arrival of a message on an empty message queue"
 msgstr "ç©ºè¨?æ?¯ä½?å??ä¸å?°é??ç??è¨?æ?¯å·²ç?¢ç??ä¿¡è??"
 
-#: stdio-common/psiginfo.c:163
+#: stdio-common/psiginfo.c:157
 msgid "Signal sent by tkill()"
 msgstr "tkill() å·²ç?¼é??ä¿¡è??"
 
-#: stdio-common/psiginfo.c:168
+#: stdio-common/psiginfo.c:162
 msgid "Signal generated by the completion of an asynchronous name lookup request"
 msgstr "é??å??æ¥å??ç¨±æ?¥æ?¾è¦?æ±?ç??å®?æ??å·²ç?¢ç??ä¿¡è??"
 
-#: stdio-common/psiginfo.c:174
+#: stdio-common/psiginfo.c:168
 msgid "Signal generated by the completion of an I/O request"
 msgstr "I/O è¦?æ±?ç??å®?æ??å·²ç?¢ç??ä¿¡è??"
 
-#: stdio-common/psiginfo.c:180
+#: stdio-common/psiginfo.c:174
 msgid "Signal sent by the kernel"
 msgstr "å?§æ ¸å·²ç?¼é??ä¿¡è??"
 
-#: stdio-common/psiginfo.c:204
+#: stdio-common/psiginfo.c:198
 #, c-format
 msgid "Unknown signal %d\n"
 msgstr "ä¸?æ??ä¿¡è?? %d\n"
 
-#: stdio-common/psignal.c:51
+#: stdio-common/psignal.c:43
 #, c-format
 msgid "%s%sUnknown signal %d\n"
 msgstr "%s%sæ?ªç?¥ç??ä¿¡è?? %d\n"
 
-#: stdio-common/psignal.c:52
+#: stdio-common/psignal.c:44
 msgid "Unknown signal"
 msgstr "ä¸?æ??ç??ä¿¡è??"
 
-#: string/_strerror.c:47 sysdeps/mach/_strerror.c:87
+#: string/_strerror.c:46 sysdeps/mach/_strerror.c:86
 msgid "Unknown error "
 msgstr "æ?ªç?¥ç??é?¯èª¤ "
 
-#: string/strerror.c:43
+#: string/strerror.c:42
 msgid "Unknown error"
 msgstr "æ?ªç?¥ç??é?¯èª¤"
 
-#: string/strsignal.c:65
+#: string/strsignal.c:60
 #, c-format
 msgid "Real-time signal %d"
 msgstr "å?³æ??ç??ä¿¡è?? %d"
 
-#: string/strsignal.c:69
+#: string/strsignal.c:64
 #, c-format
 msgid "Unknown signal %d"
 msgstr "æ?ªç?¥ç??ä¿¡è?? %d"
 
-#: sunrpc/auth_unix.c:113 sunrpc/clnt_tcp.c:125 sunrpc/clnt_udp.c:136
-#: sunrpc/clnt_unix.c:126 sunrpc/svc_tcp.c:173 sunrpc/svc_tcp.c:218
-#: sunrpc/svc_udp.c:147 sunrpc/svc_unix.c:174 sunrpc/svc_unix.c:215
-#: sunrpc/xdr.c:632 sunrpc/xdr.c:792 sunrpc/xdr_array.c:100
-#: sunrpc/xdr_rec.c:154 sunrpc/xdr_ref.c:79
+#: sunrpc/auth_unix.c:111 sunrpc/clnt_tcp.c:123 sunrpc/clnt_udp.c:134
+#: sunrpc/clnt_unix.c:124 sunrpc/svc_tcp.c:188 sunrpc/svc_tcp.c:233
+#: sunrpc/svc_udp.c:162 sunrpc/svc_unix.c:188 sunrpc/svc_unix.c:229
+#: sunrpc/xdr.c:630 sunrpc/xdr.c:790 sunrpc/xdr_array.c:97
+#: sunrpc/xdr_rec.c:151 sunrpc/xdr_ref.c:76
 msgid "out of memory\n"
 msgstr "è¨?æ?¶é«?ä¸?è¶³\n"
 
-#: sunrpc/auth_unix.c:351
+#: sunrpc/auth_unix.c:349
 msgid "auth_unix.c: Fatal marshalling problem"
 msgstr "auth_unix.c: å?´é??ç??ç·¨çµ?å??é¡?"
 
-#: sunrpc/clnt_perr.c:98 sunrpc/clnt_perr.c:114
+#: sunrpc/clnt_perr.c:95 sunrpc/clnt_perr.c:111
 #, c-format
 msgid "%s: %s; low version = %lu, high version = %lu"
 msgstr "%s: %s; ä½?ç??æ?¬ = %luï¼?é«?ç??æ?¬ = %lu"
 
-#: sunrpc/clnt_perr.c:105
+#: sunrpc/clnt_perr.c:102
 #, c-format
 msgid "%s: %s; why = %s\n"
 msgstr "%s: %s; å??å?  = %s\n"
 
-#: sunrpc/clnt_perr.c:107
+#: sunrpc/clnt_perr.c:104
 #, c-format
 msgid "%s: %s; why = (unknown authentication error - %d)\n"
 msgstr "%s: %s; å??å?  = (ä¸?æ??ç??èª?è?é?¯èª¤ - %d)\n"
 
-#: sunrpc/clnt_perr.c:156
+#: sunrpc/clnt_perr.c:153
 msgid "RPC: Success"
 msgstr "RPC: æ??å??"
 
-#: sunrpc/clnt_perr.c:159
+#: sunrpc/clnt_perr.c:156
 msgid "RPC: Can't encode arguments"
 msgstr "RPC: ç?¡æ³?å°?å¼?æ?¸ç·¨ç¢¼"
 
-#: sunrpc/clnt_perr.c:163
+#: sunrpc/clnt_perr.c:160
 msgid "RPC: Can't decode result"
 msgstr "RPC: ç?¡æ³?è§£ç¢¼å¾?å?ºçµ?æ??"
 
-#: sunrpc/clnt_perr.c:167
+#: sunrpc/clnt_perr.c:164
 msgid "RPC: Unable to send"
 msgstr "RPC: ç?¡æ³?å?³é??"
 
-#: sunrpc/clnt_perr.c:171
+#: sunrpc/clnt_perr.c:168
 msgid "RPC: Unable to receive"
 msgstr "RPC: ç?¡æ³?æ?¥æ?¶"
 
-#: sunrpc/clnt_perr.c:175
+#: sunrpc/clnt_perr.c:172
 msgid "RPC: Timed out"
 msgstr "RPC: è¶?é??æ??é??ä¸?é??"
 
-#: sunrpc/clnt_perr.c:179
+#: sunrpc/clnt_perr.c:176
 msgid "RPC: Incompatible versions of RPC"
 msgstr "RPC: RPC ç??æ?¬ä¸?ç?¸å®¹"
 
-#: sunrpc/clnt_perr.c:183
+#: sunrpc/clnt_perr.c:180
 msgid "RPC: Authentication error"
 msgstr "RPC: èª?è?é?¯èª¤"
 
-#: sunrpc/clnt_perr.c:187
+#: sunrpc/clnt_perr.c:184
 msgid "RPC: Program unavailable"
 msgstr "RPC: ç¨?å¼?ä¸?å?å?¨"
 
-#: sunrpc/clnt_perr.c:191
+#: sunrpc/clnt_perr.c:188
 msgid "RPC: Program/version mismatch"
 msgstr "RPC: ç¨?å¼?/ç??æ?¬ä¸?ç¬¦"
 
-#: sunrpc/clnt_perr.c:195
+#: sunrpc/clnt_perr.c:192
 msgid "RPC: Procedure unavailable"
 msgstr "RPC: ç?¡æ³?å??å¾?ç¨?åº?"
 
-#: sunrpc/clnt_perr.c:199
+#: sunrpc/clnt_perr.c:196
 msgid "RPC: Server can't decode arguments"
 msgstr "RPC: ä¼ºæ??å?¨ç?¡æ³?å°?å¼?æ?¸è§£ç¢¼"
 
-#: sunrpc/clnt_perr.c:203
+#: sunrpc/clnt_perr.c:200
 msgid "RPC: Remote system error"
 msgstr "RPC: é? ç«¯ç¨?å¼?é?¯èª¤"
 
-#: sunrpc/clnt_perr.c:207
+#: sunrpc/clnt_perr.c:204
 msgid "RPC: Unknown host"
 msgstr "RPC: æ?ªç?¥ç??é? ç«¯ä½?å??"
 
-#: sunrpc/clnt_perr.c:211
+#: sunrpc/clnt_perr.c:208
 msgid "RPC: Unknown protocol"
 msgstr "RPC: æ?ªç?¥ç??å??å®?"
 
-#: sunrpc/clnt_perr.c:215
+#: sunrpc/clnt_perr.c:212
 msgid "RPC: Port mapper failure"
 msgstr "RPC: é??è¨?é??å°?æ? é?¯èª¤"
 
-#: sunrpc/clnt_perr.c:219
+#: sunrpc/clnt_perr.c:216
 msgid "RPC: Program not registered"
 msgstr "RPC: ç¨?å¼?æ²?æ??è¨»å??"
 
-#: sunrpc/clnt_perr.c:223
+#: sunrpc/clnt_perr.c:220
 msgid "RPC: Failed (unspecified error)"
 msgstr "RPC: å¤±æ?? (é??ç?¹å®?ç??é?¯èª¤)"
 
-#: sunrpc/clnt_perr.c:264
+#: sunrpc/clnt_perr.c:261
 msgid "RPC: (unknown error code)"
 msgstr "RPC: (æ?ªç?¥ç??é?¯èª¤ç¢¼)"
 
-#: sunrpc/clnt_perr.c:336
+#: sunrpc/clnt_perr.c:333
 msgid "Authentication OK"
 msgstr "é??å®?å®?æ??"
 
-#: sunrpc/clnt_perr.c:339
+#: sunrpc/clnt_perr.c:336
 msgid "Invalid client credential"
 msgstr "ä¸?é?©ç?¨ç??è«?æ±?ç«¯èº«å??èª?è?"
 
-#: sunrpc/clnt_perr.c:343
+#: sunrpc/clnt_perr.c:340
 msgid "Server rejected credential"
 msgstr "ä¼ºæ??å?¨æ??çµ?èº«å??è?æ??"
 
-#: sunrpc/clnt_perr.c:347
+#: sunrpc/clnt_perr.c:344
 msgid "Invalid client verifier"
 msgstr "ä¸?é?©ç?¨ç??è«?æ±?ç«¯èª?è?"
 
-#: sunrpc/clnt_perr.c:351
+#: sunrpc/clnt_perr.c:348
 msgid "Server rejected verifier"
 msgstr "ä¼ºæ??å?¨æ??çµ?èª?è?"
 
-#: sunrpc/clnt_perr.c:355
+#: sunrpc/clnt_perr.c:352
 msgid "Client credential too weak"
 msgstr "ç?¨æ?¶ç«¯è??æ?¯å¤ªå¼±"
 
-#: sunrpc/clnt_perr.c:359
+#: sunrpc/clnt_perr.c:356
 msgid "Invalid server verifier"
 msgstr "ä¸?é?©ç?¨ç??æ??å??èª?è?"
 
-#: sunrpc/clnt_perr.c:363
+#: sunrpc/clnt_perr.c:360
 msgid "Failed (unspecified error)"
 msgstr "å¤±æ?? (ç?¡ç?¹å®?ç??é?¯èª¤)"
 
@@ -5034,242 +5199,249 @@ msgstr "Broadcast èª¿æ?¥æ??å??é¡?"
 msgid "Cannot receive reply to broadcast"
 msgstr "ç?¡æ³?æ?¥å??å»£æ?å¾?ç??å??æ??"
 
-#: sunrpc/rpc_main.c:288
+#: sunrpc/rpc_main.c:277
 #, c-format
 msgid "%s: output would overwrite %s\n"
 msgstr "%s: è¼¸å?ºå°?æ??è¦?è?? %s\n"
 
-#: sunrpc/rpc_main.c:295
+#: sunrpc/rpc_main.c:284
 #, c-format
 msgid "%s: unable to open %s: %m\n"
 msgstr "%s: ç?¡æ³?é??å?? %s: %m\n"
 
-#: sunrpc/rpc_main.c:307
+#: sunrpc/rpc_main.c:296
 #, c-format
 msgid "%s: while writing output %s: %m"
 msgstr "%s: ç?¶å?¨å¯«å?ºè¼¸å?º %s æ??: %m"
 
-#: sunrpc/rpc_main.c:342
+#: sunrpc/rpc_main.c:332 sunrpc/rpc_main.c:371
 #, c-format
-msgid "cannot find C preprocessor: %s \n"
-msgstr "æ?¾ä¸?å?° C å??ç½®è??ç??å?¨: %s \n"
-
-#: sunrpc/rpc_main.c:350
-msgid "cannot find any C preprocessor (cpp)\n"
-msgstr "æ?¾ä¸?å?°ä»»ä½? C å??ç½®è??ç??å?¨ (cpp)\n"
+msgid "cannot find C preprocessor: %s\n"
+msgstr "æ?¾ä¸?å?° C å??ç½®è??ç??å?¨ï¼?%s\n"
 
-#: sunrpc/rpc_main.c:419
+#: sunrpc/rpc_main.c:407
 #, c-format
 msgid "%s: C preprocessor failed with signal %d\n"
 msgstr "%s: C å??ç½®è??ç??å?¨å¤±æ??ï¼?å?¶è¨?è??å?¼ç?º %d\n"
 
-#: sunrpc/rpc_main.c:422
+#: sunrpc/rpc_main.c:410
 #, c-format
 msgid "%s: C preprocessor failed with exit code %d\n"
 msgstr "%s: C å??ç½®è??ç??å?¨å¤±æ??ï¼?å?¶çµ?æ??ç¢¼ç?º %d\n"
 
-#: sunrpc/rpc_main.c:462
+#: sunrpc/rpc_main.c:450
 #, c-format
 msgid "illegal nettype: `%s'\n"
 msgstr "ä¸?å??æ³?ç?? nettypeï¼?ã??%sã??\n"
 
-#: sunrpc/rpc_main.c:1128
+#: sunrpc/rpc_main.c:1085
 #, c-format
 msgid "rpcgen: too many defines\n"
 msgstr "rpcgen: å¤ªå¤? define äº?\n"
 
-#: sunrpc/rpc_main.c:1140
+#: sunrpc/rpc_main.c:1097
 #, c-format
 msgid "rpcgen: arglist coding error\n"
 msgstr "rpcgen: arglist ç·¨ç¢¼é?¯èª¤\n"
 
 #. TRANS: the file will not be removed; this is an
 #. TRANS: informative message.
-#: sunrpc/rpc_main.c:1173
+#: sunrpc/rpc_main.c:1130
 #, c-format
 msgid "file `%s' already exists and may be overwritten\n"
 msgstr "æª?æ¡? `%s' å·²ç¶?å?å?¨ä¸¦æ??å?¯è?½æ??è¢«è¦?è??æ??\n"
 
-#: sunrpc/rpc_main.c:1218
+#: sunrpc/rpc_main.c:1175
 #, c-format
 msgid "Cannot specify more than one input file!\n"
 msgstr "ç?¡æ³?æ??å®?è¶?é??ä¸?å??è¼¸å?¥æª?!\n"
 
-#: sunrpc/rpc_main.c:1392
+#: sunrpc/rpc_main.c:1345
 #, c-format
 msgid "This implementation doesn't support newstyle or MT-safe code!\n"
 msgstr "æ¤å¯¦ä½?æ?¹å¼?ä¸?æ?¯æ?´æ?°ç??å½¢å¼?æ??å¤?å®?å?¨å?·è¡?åº?ç??ç¨?å¼?!\n"
 
-#: sunrpc/rpc_main.c:1401
+#: sunrpc/rpc_main.c:1354
 #, c-format
 msgid "Cannot use netid flag with inetd flag!\n"
 msgstr "ç?¡æ³?å°? netid æ??æ¨?è?? inetd æ??æ¨?ä¸?èµ·ä½¿ç?¨!\n"
 
-#: sunrpc/rpc_main.c:1413
+#: sunrpc/rpc_main.c:1363
 #, c-format
 msgid "Cannot use netid flag without TIRPC!\n"
 msgstr "ç?¡æ³?å?¨æ²?æ?? TIRPC æ??ä½¿ç?¨ netid æ??æ¨?!\n"
 
-#: sunrpc/rpc_main.c:1420
+#: sunrpc/rpc_main.c:1370
 #, c-format
 msgid "Cannot use table flags with newstyle!\n"
 msgstr "ç?¡æ³?å°?è¡¨æ ¼æ??æ¨?è?? newstyle ä¸?èµ·ä½¿ç?¨!\n"
 
-#: sunrpc/rpc_main.c:1439
+#: sunrpc/rpc_main.c:1389
 #, c-format
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr "\"infile\" æ?¯æ¨£ç??ç?¢ç??æ??æ¨?æ??é??ç??\n"
 
-#: sunrpc/rpc_main.c:1444
+#: sunrpc/rpc_main.c:1394
 #, c-format
 msgid "Cannot have more than one file generation flag!\n"
 msgstr "ç?¡æ³?ä½¿ç?¨è¶?é??ä¸?å??ç??æª?æ¡?ç?¢ç??æ??æ¨?!\n"
 
-#: sunrpc/rpc_main.c:1453
+#: sunrpc/rpc_main.c:1403
 #, c-format
 msgid "usage: %s infile\n"
 msgstr "ç?¨æ³?: %s infile\n"
 
-#: sunrpc/rpc_main.c:1454
+#: sunrpc/rpc_main.c:1404
 #, c-format
 msgid "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] infile\n"
 msgstr "\t%s [-abkCLNTM][-Då??ç¨±[=å?¼]] [-i å¤§å°?] [-I [-K ç§?æ?¸]] [-Y è·¯å¾?] è¼¸å?¥æª?æ¡?\n"
 
-#: sunrpc/rpc_main.c:1456
+#: sunrpc/rpc_main.c:1406
 #, 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 è¼¸å?ºæª?æ¡?] [è¼¸å?¥æª?æ¡?]\n"
 
-#: sunrpc/rpc_main.c:1458
+#: sunrpc/rpc_main.c:1408
 #, c-format
 msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
 msgstr "\t%s [-s ç¶²è·¯å??æ??]* [-o è¼¸å?ºæª?æ¡?] [è¼¸å?¥æª?æ¡?]\n"
 
-#: sunrpc/rpc_main.c:1459
+#: sunrpc/rpc_main.c:1409
 #, c-format
 msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
 msgstr "\t%s [-n ç¶²è·¯è?å?¥ç¬¦è??]* [-o è¼¸å?ºæª?æ¡?] [è¼¸å?¥æª?æ¡?]\n"
 
-#: sunrpc/rpc_main.c:1467
+#: sunrpc/rpc_main.c:1417
 #, c-format
 msgid "options:\n"
 msgstr "é?¸é ?ï¼?\n"
 
-#: sunrpc/rpc_main.c:1468
+#: sunrpc/rpc_main.c:1418
 #, c-format
 msgid "-a\t\tgenerate all files, including samples\n"
 msgstr "-a\t\tç?¢ç??æ??æ??æª?æ¡?ï¼?å??å?«æ¨£æ?¬\n"
 
-#: sunrpc/rpc_main.c:1469
+#: sunrpc/rpc_main.c:1419
 #, c-format
 msgid "-b\t\tbackward compatibility mode (generates code for SunOS 4.1)\n"
 msgstr "-b\t\tå??æº¯ç?¸å®¹æ¨¡å¼? (ç?¢ç??ç?¨æ?¼ SunOS 4.1 ç??ç·¨ç¢¼)\n"
 
-#: sunrpc/rpc_main.c:1470
+#: sunrpc/rpc_main.c:1420
 #, c-format
 msgid "-c\t\tgenerate XDR routines\n"
 msgstr "-c\t\tç?¢ç?? XDR å¸¸å¼?\n"
 
-#: sunrpc/rpc_main.c:1471
+#: sunrpc/rpc_main.c:1421
 #, c-format
 msgid "-C\t\tANSI C mode\n"
 msgstr "-C\t\tANSI C æ¨¡å¼?\n"
 
-#: sunrpc/rpc_main.c:1472
+#: sunrpc/rpc_main.c:1422
 #, c-format
 msgid "-Dname[=value]\tdefine a symbol (same as #define)\n"
 msgstr "-Då??ç¨±[=å?¼]\tå®?ç¾©ä¸?å??ç¬¦è?? (å¦?å?? #define)\n"
 
-#: sunrpc/rpc_main.c:1473
+#: sunrpc/rpc_main.c:1423
 #, c-format
 msgid "-h\t\tgenerate header file\n"
 msgstr "-h\t\tç?¢ç??æ¨?é æª?\n"
 
-#: sunrpc/rpc_main.c:1474
+#: sunrpc/rpc_main.c:1424
 #, c-format
 msgid "-i size\t\tsize at which to start generating inline code\n"
 msgstr "-i å¤§å°?\t\tå??å§?ç?¢ç??å?§è?¯ç·¨ç¢¼ç??å¤§å°?\n"
 
-#: sunrpc/rpc_main.c:1475
+#: sunrpc/rpc_main.c:1425
 #, c-format
 msgid "-I\t\tgenerate code for inetd support in server (for SunOS 4.1)\n"
 msgstr "-I\t\tç?¢ç??å?¨ä¼ºæ??å?¨ä¸æ?¯æ?´ç?? inetd ç·¨ç¢¼ (ç?¨æ?¼ SunOS 4.1)\n"
 
-#: sunrpc/rpc_main.c:1476
+#: sunrpc/rpc_main.c:1426
 #, c-format
 msgid "-K seconds\tserver exits after K seconds of inactivity\n"
 msgstr "-K ç§?\tä¸?ä½?ç?¨ K ç§?ä¹?å¾?é?¢é??ä¼ºæ??å?¨\n"
 
-#: sunrpc/rpc_main.c:1477
+#: sunrpc/rpc_main.c:1427
 #, c-format
 msgid "-l\t\tgenerate client side stubs\n"
 msgstr "-l\t\tç?¢ç??å®¢æ?¶ç«¯æ®?é¤?\n"
 
-#: sunrpc/rpc_main.c:1478
+#: sunrpc/rpc_main.c:1428
 #, c-format
 msgid "-L\t\tserver errors will be printed to syslog\n"
 msgstr "-L\t\tä¼ºæ??å?¨é?¯èª¤å°?è¢«å??å?°å?° syslog\n"
 
-#: sunrpc/rpc_main.c:1479
+#: sunrpc/rpc_main.c:1429
 #, c-format
 msgid "-m\t\tgenerate server side stubs\n"
 msgstr "-m\t\tç?¢ç??ä¼ºæ??å?¨ç«¯æ®?é¤?\n"
 
-#: sunrpc/rpc_main.c:1480
+#: sunrpc/rpc_main.c:1430
 #, c-format
 msgid "-M\t\tgenerate MT-safe code\n"
 msgstr "-M\t\tç?¢ç?? MT-safe ç·¨ç¢¼\n"
 
-#: sunrpc/rpc_main.c:1481
+#: sunrpc/rpc_main.c:1431
 #, c-format
 msgid "-n netid\tgenerate server code that supports named netid\n"
 msgstr "-n netid\tç?¢ç??æ?¯æ?´å?·å?? netid ç??ä¼ºæ??å?¨ç·¨ç¢¼\n"
 
-#: sunrpc/rpc_main.c:1482
+#: sunrpc/rpc_main.c:1432
 #, c-format
 msgid "-N\t\tsupports multiple arguments and call-by-value\n"
 msgstr "-N\t\tæ?¯æ?´å¤?é??å¼?æ?¸å??å?³å?¼å?¼å?«\n"
 
-#: sunrpc/rpc_main.c:1483
+#: sunrpc/rpc_main.c:1433
 #, c-format
 msgid "-o outfile\tname of the output file\n"
 msgstr "-o è¼¸å?ºæª?\tè¼¸å?ºæª?æ¡?ç??å??ç¨±\n"
 
-#: sunrpc/rpc_main.c:1484
+#: sunrpc/rpc_main.c:1434
 #, c-format
 msgid "-s nettype\tgenerate server code that supports named nettype\n"
 msgstr "-s nettype\tç?¢ç??æ?¯æ?´å?·å?? nettype ç??ä¼ºæ??å?¨ç·¨ç¢¼\n"
 
-#: sunrpc/rpc_main.c:1485
+#: sunrpc/rpc_main.c:1435
 #, c-format
 msgid "-Sc\t\tgenerate sample client code that uses remote procedures\n"
 msgstr "-Sc\t\tç?¢ç??ä½¿ç?¨é? ç«¯ç¨?åº?ç??ç¯?ä¾?å®¢æ?¶ç«¯ç·¨ç¢¼\n"
 
-#: sunrpc/rpc_main.c:1486
+#: sunrpc/rpc_main.c:1436
 #, c-format
 msgid "-Ss\t\tgenerate sample server code that defines remote procedures\n"
 msgstr "-Ss\t\tç?¢ç??å®?ç¾©é? ç«¯ç¨?åº?ç??ç¯?ä¾?ä¼ºæ??å?¨ç·¨ç¢¼\n"
 
-#: sunrpc/rpc_main.c:1487
+#: sunrpc/rpc_main.c:1437
 #, c-format
 msgid "-Sm \t\tgenerate makefile template \n"
 msgstr "-Sm\t\tç?¢ç?? makefile æ¨¡æ?¿\n"
 
-#: sunrpc/rpc_main.c:1488
+#: sunrpc/rpc_main.c:1438
 #, c-format
 msgid "-t\t\tgenerate RPC dispatch table\n"
 msgstr "-t\t\tç?¢ç?? RPC æ´¾é??è¡¨\n"
 
-#: sunrpc/rpc_main.c:1489
+#: sunrpc/rpc_main.c:1439
 #, c-format
 msgid "-T\t\tgenerate code to support RPC dispatch tables\n"
 msgstr "-T\t\tç?¢ç??æ?¯æ?´ RPC æ´¾é??è¡¨ç??ç·¨ç¢¼\n"
 
-#: sunrpc/rpc_main.c:1490
+#: sunrpc/rpc_main.c:1440
 #, c-format
 msgid "-Y path\t\tdirectory name to find C preprocessor (cpp)\n"
 msgstr "-Y è·¯å¾?\t\tè¦?å°?æ?¾ C å??ç½®è??ç??å?¨ (cpp) ç??ç?®é??å??ç¨±\n"
 
+#: sunrpc/rpc_main.c:1442
+#, c-format
+msgid ""
+"\n"
+"For bug reporting instructions, please see:\n"
+"%s.\n"
+msgstr ""
+"\n"
+"è¦?ç?¥é??é?¯èª¤å ±å??æ??ä»¤ï¼?è«?å??ç??ï¼?\n"
+"%sã??\n"
+
 #: sunrpc/rpc_scan.c:112
 msgid "constant or identifier expected"
 msgstr "æ??è©²è¦?æ??å¸¸æ?¸æ??è?å?¥ç¬¦è??æ??å°?"
@@ -5375,127 +5547,127 @@ msgstr "svc_runï¼?- è¨?æ?¶é«?ä¸?è¶³"
 msgid "svc_run: - poll failed"
 msgstr "svc_run: - poll å¤±æ??"
 
-#: sunrpc/svc_simple.c:81
+#: sunrpc/svc_simple.c:80
 #, c-format
 msgid "can't reassign procedure number %ld\n"
 msgstr "ä¸?è?½é??è¤?æ??å®?ç¨?åº?è??ç¢¼ %ld\n"
 
-#: sunrpc/svc_simple.c:91
+#: sunrpc/svc_simple.c:90
 msgid "couldn't create an rpc server\n"
 msgstr "ä¸?è?½ç?¢ç??é? ç«¯ç¨?åº?å?¼å?«ä¼ºæ??ç¨?å¼?\n"
 
-#: sunrpc/svc_simple.c:99
+#: sunrpc/svc_simple.c:98
 #, c-format
 msgid "couldn't register prog %ld vers %ld\n"
 msgstr "ä¸?è?½å°?ç¨?å¼? %ld è¨»å??å?° %ld\n"
 
-#: sunrpc/svc_simple.c:107
+#: sunrpc/svc_simple.c:106
 msgid "registerrpc: out of memory\n"
 msgstr "registerrpc: è¨?æ?¶é«?ä¸?è¶³\n"
 
-#: sunrpc/svc_simple.c:168
+#: sunrpc/svc_simple.c:169
 #, c-format
 msgid "trouble replying to prog %d\n"
 msgstr "å??æ??ç¨?å¼? %d æ??ç?¼ç??å?°é?£\n"
 
-#: sunrpc/svc_simple.c:177
+#: sunrpc/svc_simple.c:178
 #, c-format
 msgid "never registered prog %d\n"
 msgstr "å??è?¬ä¸?è¦?è¨»å??ç¨?å¼? %d\n"
 
-#: sunrpc/svc_tcp.c:149
+#: sunrpc/svc_tcp.c:164
 msgid "svc_tcp.c - tcp socket creation problem"
 msgstr "svc_tcp.c - tcp socket å»ºç«?ç?¼ç??å??é¡?"
 
-#: sunrpc/svc_tcp.c:164
+#: sunrpc/svc_tcp.c:179
 msgid "svc_tcp.c - cannot getsockname or listen"
 msgstr "svc_tcp.c - ç?¡æ³? getsockname æ?? listen"
 
-#: sunrpc/svc_udp.c:122
+#: sunrpc/svc_udp.c:137
 msgid "svcudp_create: socket creation problem"
 msgstr "svcudp_create: socket å»ºç«?æ??å??é¡?"
 
-#: sunrpc/svc_udp.c:136
+#: sunrpc/svc_udp.c:151
 msgid "svcudp_create - cannot getsockname"
 msgstr "svcudp_create - ç?¡æ³? getsockname"
 
-#: sunrpc/svc_udp.c:168
+#: sunrpc/svc_udp.c:183
 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
 msgstr "svcudp_create: xp_pad å¤ªå°?ä»¥è?´æ?¼ç?¡æ³? IP_PKTINFO\n"
 
-#: sunrpc/svc_udp.c:476
+#: sunrpc/svc_udp.c:495
 msgid "enablecache: cache already enabled"
 msgstr "enablecache: å¿«å??å·²ç¶?é??å??"
 
-#: sunrpc/svc_udp.c:482
+#: sunrpc/svc_udp.c:501
 msgid "enablecache: could not allocate cache"
 msgstr "enablecache: ç?¡æ³?é??ç½®å¿«å??"
 
-#: sunrpc/svc_udp.c:491
+#: sunrpc/svc_udp.c:510
 msgid "enablecache: could not allocate cache data"
 msgstr "enablecache: ç?¡æ³?é??ç½®å¿«å??è³?æ??"
 
-#: sunrpc/svc_udp.c:499
+#: sunrpc/svc_udp.c:518
 msgid "enablecache: could not allocate cache fifo"
 msgstr "enablecache: ç?¡æ³?é??ç½®å¿«å?? fifo ç®¡ç·?"
 
-#: sunrpc/svc_udp.c:535
+#: sunrpc/svc_udp.c:554
 msgid "cache_set: victim not found"
 msgstr "cache_set: æ?¾ä¸?å?° victim"
 
-#: sunrpc/svc_udp.c:546
+#: sunrpc/svc_udp.c:565
 msgid "cache_set: victim alloc failed"
 msgstr "cache_set: victim é??ç½®å¤±æ??"
 
-#: sunrpc/svc_udp.c:553
+#: sunrpc/svc_udp.c:572
 msgid "cache_set: could not allocate new rpc_buffer"
 msgstr "cache_set: ç?¡æ³?é??ç½®æ?°ç??é? ç«¯ç¨?åº?å?¼å?«ç·©è¡?å?? (rpc_buffer)"
 
-#: sunrpc/svc_unix.c:148
+#: sunrpc/svc_unix.c:162
 msgid "svc_unix.c - AF_UNIX socket creation problem"
 msgstr "svc_unix.c - AF_UNIX socket å»ºç«?æ??å??é¡?"
 
-#: sunrpc/svc_unix.c:164
+#: sunrpc/svc_unix.c:178
 msgid "svc_unix.c - cannot getsockname or listen"
 msgstr "svc_unix.c - ç?¡æ³? getsockname æ?? listen"
 
-#: sysdeps/generic/siglist.h:29 sysdeps/unix/siglist.c:27
+#: sysdeps/generic/siglist.h:28
 msgid "Hangup"
 msgstr "æ??æ?·"
 
-#: sysdeps/generic/siglist.h:30 sysdeps/unix/siglist.c:28
+#: sysdeps/generic/siglist.h:29
 msgid "Interrupt"
 msgstr "ä¸æ?·"
 
-#: sysdeps/generic/siglist.h:31 sysdeps/unix/siglist.c:29
+#: sysdeps/generic/siglist.h:30
 msgid "Quit"
 msgstr "é?¢é??"
 
-#: sysdeps/generic/siglist.h:32 sysdeps/unix/siglist.c:30
+#: sysdeps/generic/siglist.h:31
 msgid "Illegal instruction"
 msgstr "ä¸?å??æ³?ç??å?½ä»¤"
 
-#: sysdeps/generic/siglist.h:33 sysdeps/unix/siglist.c:31
+#: sysdeps/generic/siglist.h:32
 msgid "Trace/breakpoint trap"
 msgstr "è¿½è¹¤è??ä¸æ?·é»?é?·é?±"
 
-#: sysdeps/generic/siglist.h:34
+#: sysdeps/generic/siglist.h:33
 msgid "Aborted"
 msgstr "å·²ç¶?çµ?æ¢"
 
-#: sysdeps/generic/siglist.h:35 sysdeps/unix/siglist.c:34
+#: sysdeps/generic/siglist.h:34
 msgid "Floating point exception"
 msgstr "æµ®é»?æ?¸å?ºé?¯"
 
-#: sysdeps/generic/siglist.h:36 sysdeps/unix/siglist.c:35
+#: sysdeps/generic/siglist.h:35
 msgid "Killed"
 msgstr "å·²ç ?æ??"
 
-#: sysdeps/generic/siglist.h:37 sysdeps/unix/siglist.c:36
+#: sysdeps/generic/siglist.h:36
 msgid "Bus error"
 msgstr "å?¯æµ?æ??é?¯èª¤"
 
-#: sysdeps/generic/siglist.h:38 sysdeps/unix/siglist.c:37
+#: sysdeps/generic/siglist.h:37
 msgid "Segmentation fault"
 msgstr "ç¨?å¼?è¨?æ?¶é«?å??æ®µé?¯èª¤"
 
@@ -5504,103 +5676,102 @@ msgstr "ç¨?å¼?è¨?æ?¶é«?å??æ®µé?¯èª¤"
 #. TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
 #. TRANS or blocked.  Thus, your program will never actually see @code{EPIPE}
 #. TRANS unless it has handled or blocked @code{SIGPIPE}.
-#: sysdeps/generic/siglist.h:39 sysdeps/gnu/errlist.c:359
-#: sysdeps/unix/siglist.c:39
+#: sysdeps/generic/siglist.h:38 sysdeps/gnu/errlist.c:359
 msgid "Broken pipe"
 msgstr "ä¸æ?·ç??ç®¡ç·?"
 
-#: sysdeps/generic/siglist.h:40 sysdeps/unix/siglist.c:40
+#: sysdeps/generic/siglist.h:39
 msgid "Alarm clock"
 msgstr "é¬§é??"
 
-#: sysdeps/generic/siglist.h:41 sysdeps/unix/siglist.c:41
+#: sysdeps/generic/siglist.h:40
 msgid "Terminated"
 msgstr "çµ?æ¢"
 
-#: sysdeps/generic/siglist.h:42 sysdeps/unix/siglist.c:42
+#: sysdeps/generic/siglist.h:41
 msgid "Urgent I/O condition"
 msgstr "ç·?æ?¥ç??è¼¸å?ºå?¥ç??æ??"
 
-#: sysdeps/generic/siglist.h:43 sysdeps/unix/siglist.c:43
+#: sysdeps/generic/siglist.h:42
 msgid "Stopped (signal)"
 msgstr "å??æ¢ (ä¿¡è??)"
 
-#: sysdeps/generic/siglist.h:44 sysdeps/unix/siglist.c:44
+#: sysdeps/generic/siglist.h:43
 msgid "Stopped"
 msgstr "å??æ¢"
 
-#: sysdeps/generic/siglist.h:45 sysdeps/unix/siglist.c:45
+#: sysdeps/generic/siglist.h:44
 msgid "Continued"
 msgstr "ç¹¼çº?"
 
-#: sysdeps/generic/siglist.h:46 sysdeps/unix/siglist.c:46
+#: sysdeps/generic/siglist.h:45
 msgid "Child exited"
 msgstr "å?è¡?ç¨?çµ?æ??"
 
-#: sysdeps/generic/siglist.h:47 sysdeps/unix/siglist.c:47
+#: sysdeps/generic/siglist.h:46
 msgid "Stopped (tty input)"
 msgstr "å??æ¢ (tty è¼¸å?¥)"
 
-#: sysdeps/generic/siglist.h:48 sysdeps/unix/siglist.c:48
+#: sysdeps/generic/siglist.h:47
 msgid "Stopped (tty output)"
 msgstr "å??æ¢ (tty è¼¸å?º)"
 
-#: sysdeps/generic/siglist.h:49 sysdeps/unix/siglist.c:49
+#: sysdeps/generic/siglist.h:48
 msgid "I/O possible"
 msgstr "I/O å?¯è¡?"
 
-#: sysdeps/generic/siglist.h:50 sysdeps/unix/siglist.c:50
+#: sysdeps/generic/siglist.h:49
 msgid "CPU time limit exceeded"
 msgstr "CPU æ??é??ä¸?é??è¶?é??äº?"
 
-#: sysdeps/generic/siglist.h:51 sysdeps/unix/siglist.c:51
+#: sysdeps/generic/siglist.h:50
 msgid "File size limit exceeded"
 msgstr "æª?æ¡?å¤§å°?è¶?é??ä¸?é??"
 
-#: sysdeps/generic/siglist.h:52 sysdeps/unix/siglist.c:52
+#: sysdeps/generic/siglist.h:51
 msgid "Virtual timer expired"
 msgstr "è??æ?¬è¨?æ??å?¨å·²é??æ??å??æ¶?äº?"
 
-#: sysdeps/generic/siglist.h:53 sysdeps/unix/siglist.c:53
+#: sysdeps/generic/siglist.h:52
 msgid "Profiling timer expired"
 msgstr "æ¸¬é??è©?ä¼°ç?¨ç??è¨?æ??å?¨å·²é??æ??å??æ¶?äº?"
 
-#: sysdeps/generic/siglist.h:54 sysdeps/unix/siglist.c:54
-msgid "Window changed"
-msgstr "ç¯?å??æ?¹è®?äº?"
-
-#: sysdeps/generic/siglist.h:55 sysdeps/unix/siglist.c:56
+#: sysdeps/generic/siglist.h:53
 msgid "User defined signal 1"
 msgstr "ä½¿ç?¨è??å®?ç¾©ç??è¨?è?? 1"
 
-#: sysdeps/generic/siglist.h:56 sysdeps/unix/siglist.c:57
+#: sysdeps/generic/siglist.h:54
 msgid "User defined signal 2"
 msgstr "ä½¿ç?¨è??å®?ç¾©ç??è¨?è?? 2"
 
-#: sysdeps/generic/siglist.h:60 sysdeps/unix/siglist.c:33
+#: sysdeps/generic/siglist.h:58
 msgid "EMT trap"
 msgstr "EMT é?·é?±"
 
-#: sysdeps/generic/siglist.h:63 sysdeps/unix/siglist.c:38
+#: sysdeps/generic/siglist.h:61
 msgid "Bad system call"
 msgstr "é?¯èª¤ç??ç³»çµ±å?¼å?«"
 
-#: sysdeps/generic/siglist.h:66
+#: sysdeps/generic/siglist.h:64
 msgid "Stack fault"
 msgstr "å ?ç??é?¯èª¤"
 
-#: sysdeps/generic/siglist.h:69
+#: sysdeps/generic/siglist.h:67
 msgid "Information request"
 msgstr "é??è¦?è³?æ??"
 
-#: sysdeps/generic/siglist.h:71
+#: sysdeps/generic/siglist.h:69
 msgid "Power failure"
 msgstr "é?»æº?å?´é??é?¯èª¤"
 
-#: sysdeps/generic/siglist.h:74 sysdeps/unix/siglist.c:55
+#: sysdeps/generic/siglist.h:72
 msgid "Resource lost"
 msgstr "è³?æº?æ¼?å¤±"
 
+#: sysdeps/generic/siglist.h:75
+msgid "Window changed"
+msgstr "ç¯?å??æ?¹è®?äº?"
+
 #. TRANS Operation not permitted; only the owner of the file (or other resource)
 #. TRANS or processes with special privileges can perform the operation.
 #: sysdeps/gnu/errlist.c:25
@@ -5639,8 +5810,8 @@ msgstr "æ²?æ??æ¤ä¸?è£?ç½®æ??ä½?å??"
 
 #. TRANS Argument list too long; used when the arguments passed to a new program
 #. TRANS being executed with one of the @code{exec} functions (@pxref{Executing a
-#. TRANS File}) occupy too much memory space.  This condition never arises in the
-#. TRANS GNU system.
+#. TRANS File}) occupy too much memory space.  This condition never arises on
+#. TRANS @gnuhurdsystems{}.
 #: sysdeps/gnu/errlist.c:94
 msgid "Argument list too long"
 msgstr "å¼?æ?¸å??é ?ç?®é??é?·"
@@ -5680,7 +5851,7 @@ msgid "Cannot allocate memory"
 msgstr "ç?¡æ³?é??ç½®è¨?æ?¶é«?"
 
 #. TRANS Bad address; an invalid pointer was detected.
-#. TRANS In the GNU system, this error never happens; you get a signal instead.
+#. TRANS On @gnuhurdsystems{}, this error never happens; you get a signal instead.
 #: sysdeps/gnu/errlist.c:167
 msgid "Bad address"
 msgstr "é?¯èª¤ç??ä½?å??"
@@ -5748,7 +5919,7 @@ msgstr "é??å??å¤ªå¤?æª?æ¡?"
 
 #. TRANS There are too many distinct file openings in the entire system.  Note
 #. TRANS that any number of linked channels count as just one file opening; see
-#. TRANS @ref{Linked Channels}.  This error never occurs in the GNU system.
+#. TRANS @ref{Linked Channels}.  This error never occurs on @gnuhurdsystems{}.
 #: sysdeps/gnu/errlist.c:275
 msgid "Too many open files in system"
 msgstr "ç³»çµ±ä¸å¤ªå¤?ç??é??å??æª?æ¡?"
@@ -5763,7 +5934,7 @@ msgstr "ä¸?å¸?æ??ç??è£?ç½®è¼¸å?ºå?¥æ?§å?¶ (ioctl)"
 #. TRANS write to a file that is currently being executed.  Often using a
 #. TRANS debugger to run a program is considered having it open for writing and
 #. TRANS will cause this error.  (The name stands for ``text file busy''.)  This
-#. TRANS is not an error in the GNU system; the text is copied as necessary.
+#. TRANS is not an error on @gnuhurdsystems{}; the text is copied as necessary.
 #: sysdeps/gnu/errlist.c:298
 msgid "Text file busy"
 msgstr "æ??å?æª?å¿?é??ä¸"
@@ -5810,7 +5981,7 @@ msgstr "æ?¸å?¼é??ç®?çµ?æ??è¶?å?ºç¯?å??"
 
 #. TRANS Resource temporarily unavailable; the call might work if you try again
 #. TRANS later.  The macro @code{EWOULDBLOCK} is another name for @code{EAGAIN};
-#. TRANS they are always the same in the GNU C library.
+#. TRANS they are always the same in @theglibc{}.
 #. TRANS
 #. TRANS This error can happen in a few different situations:
 #. TRANS
@@ -5841,7 +6012,7 @@ msgstr "æ?¸å?¼é??ç®?çµ?æ??è¶?å?ºç¯?å??"
 msgid "Resource temporarily unavailable"
 msgstr "è³?æº?æ?«æ??ç?¡æ³?å??å¾?"
 
-#. TRANS In the GNU C library, this is another name for @code{EAGAIN} (above).
+#. TRANS In @theglibc{}, this is another name for @code{EAGAIN} (above).
 #. TRANS The values are always the same, on every operating system.
 #. TRANS
 #. TRANS C libraries in many older Unix systems have @code{EWOULDBLOCK} as a
@@ -5904,7 +6075,7 @@ msgstr "é??è¨?ç«¯å??å?¥ä¸?æ?¯æ?´"
 
 #. TRANS The operation you requested is not supported.  Some socket functions
 #. TRANS don't make sense for all types of sockets, and others may not be
-#. TRANS implemented for all communications protocols.  In the GNU system, this
+#. TRANS implemented for all communications protocols.  On @gnuhurdsystems{}, this
 #. TRANS error can happen for many calls when the object does not support the
 #. TRANS particular operation; it is a generic indication that the server knows
 #. TRANS nothing to do for that call.
@@ -6071,7 +6242,7 @@ msgstr "é??è??ç?? NFS æª?æ¡?æ?§å?¶ç¢¼"
 #. TRANS An attempt was made to NFS-mount a remote file system with a file name that
 #. TRANS already specifies an NFS-mounted file.
 #. TRANS (This is an error on some operating systems, but we expect it to work
-#. TRANS properly on the GNU system, making this error code impossible.)
+#. TRANS properly on @gnuhurdsystems{}, making this error code impossible.)
 #: sysdeps/gnu/errlist.c:799
 msgid "Object is remote"
 msgstr "ç?®æ¨?æª?æ¡?ä½?æ?¼é? ç«¯"
@@ -6102,7 +6273,7 @@ msgid "RPC bad procedure for program"
 msgstr "ç¨?å¼?ç?? RPC ç¨?åº?é?¯èª¤"
 
 #. TRANS No locks available.  This is used by the file locking facilities; see
-#. TRANS @ref{File Locks}.  This error is never generated by the GNU system, but
+#. TRANS @ref{File Locks}.  This error is never generated by @gnuhurdsystems{}, but
 #. TRANS it can result from an operation to an NFS server running another
 #. TRANS operating system.
 #: sysdeps/gnu/errlist.c:856
@@ -6159,7 +6330,7 @@ msgstr "ä¸¦æ?ªæ?¯æ?´"
 msgid "Invalid or incomplete multibyte or wide character"
 msgstr "ä¸?é?©ç?¨æ??ä¸?å®?æ?´ç??å¤?ä½?å??çµ?å?å??æ??å¯¬å?å??"
 
-#. TRANS In the GNU system, servers supporting the @code{term} protocol return
+#. TRANS On @gnuhurdsystems{}, servers supporting the @code{term} protocol return
 #. TRANS this error for certain operations when the caller is not in the
 #. TRANS foreground process group of the terminal.  Users do not usually see this
 #. TRANS error because functions such as @code{read} and @code{write} translate
@@ -6169,7 +6340,7 @@ msgstr "ä¸?é?©ç?¨æ??ä¸?å®?æ?´ç??å¤?ä½?å??çµ?å?å??æ??å¯¬å?å??"
 msgid "Inappropriate operation for background process"
 msgstr "ä¸?å¸?æ??ç??è??æ?¯è¡?ç¨?é??ä½?"
 
-#. TRANS In the GNU system, opening a file returns this error when the file is
+#. TRANS On @gnuhurdsystems{}, opening a file returns this error when the file is
 #. TRANS translated by a program and the translator program dies while starting
 #. TRANS up, before it has connected to the file.
 #: sysdeps/gnu/errlist.c:955
@@ -6223,7 +6394,7 @@ msgstr "é??æ¬¡ç??ç??è¢«æ?¨æ??æ??äº?"
 #. TRANS Go home and have a glass of warm, dairy-fresh milk.
 #: sysdeps/gnu/errlist.c:984
 msgid "Computer bought the farm"
-msgstr "é??å?°é?»è?¦è²·äº?ä¸?å¡?å?°å??"
+msgstr "é??è?ºé?»è?¦è²·äº?ä¸?å¡?å?°å??"
 
 #. TRANS This error code has no purpose.
 #: sysdeps/gnu/errlist.c:993
@@ -6396,7 +6567,7 @@ msgstr "å?å??ä¸?å??æ¯?æ??ç??å??äº«å?½å¼?åº«"
 
 #: sysdeps/gnu/errlist.c:1325
 msgid ".lib section in a.out corrupted"
-msgstr "a.out ä¸ .lib ç¯?å??æ¯?æ??äº?"
+msgstr "a.out ä¸ .lib å??æ®µæ¯?æ??äº?"
 
 #: sysdeps/gnu/errlist.c:1333
 msgid "Attempting to link in too many shared libraries"
@@ -6466,7 +6637,11 @@ msgstr "ç??æ??ç?¡æ³?å??å¾©"
 msgid "Operation not possible due to RF-kill"
 msgstr "ç?±æ?¼ RF-kill è??ç?¡æ³?æ??ä½?"
 
-#: sysdeps/mach/_strerror.c:57
+#: sysdeps/gnu/errlist.c:1469
+msgid "Memory page has hardware error"
+msgstr "è¨?æ?¶é«?å??é ?æ??ç¡¬é«?é?¯èª¤"
+
+#: sysdeps/mach/_strerror.c:56
 msgid "Error in unknown error system: "
 msgstr "æ?ªç?¥ç³»çµ±é?¯èª¤: "
 
@@ -6538,25 +6713,12 @@ msgstr "ç?±è¨?è??æ??ä¸æ?·"
 msgid "Parameter string not correctly encoded"
 msgstr "å??æ?¸å?ä¸²ç?¡æ³?æ£ç¢ºç·¨ç¢¼"
 
-#: sysdeps/unix/siglist.c:26
-msgid "Signal 0"
-msgstr "è¨?è?? 0"
-
-#: sysdeps/unix/siglist.c:32
-msgid "IOT trap"
-msgstr "IOT é?·é?±"
-
-#: sysdeps/unix/sysv/linux/i386/readelflib.c:49
+#: sysdeps/unix/sysv/linux/i386/readelflib.c:65
 #, c-format
 msgid "%s is for unknown machine %d.\n"
 msgstr "%s æ?¯çµ¦æ?ªç?¥ç??æ©?å?¨ %dã??\n"
 
-#: sysdeps/unix/sysv/linux/ia64/makecontext.c:63
-#, c-format
-msgid "makecontext: does not know how to handle more than 8 arguments\n"
-msgstr "makecontext: ä¸?ç?¥è¦?å¦?ä½?è??ç??è¶?é??å?«å??å¼?æ?¸\n"
-
-#: sysdeps/unix/sysv/linux/lddlibc4.c:61
+#: sysdeps/unix/sysv/linux/lddlibc4.c:60
 #, c-format
 msgid ""
 "Usage: lddlibc4 FILE\n"
@@ -6565,423 +6727,423 @@ msgstr ""
 "ç?¨æ³?ï¼?lddlibc4 æª?æ¡?\n"
 "\n"
 
-#: sysdeps/unix/sysv/linux/lddlibc4.c:82
+#: sysdeps/unix/sysv/linux/lddlibc4.c:81
 #, c-format
 msgid "cannot open `%s'"
 msgstr "ç?¡æ³?é??å?? `%s'"
 
-#: sysdeps/unix/sysv/linux/lddlibc4.c:86
+#: sysdeps/unix/sysv/linux/lddlibc4.c:85
 #, c-format
 msgid "cannot read header from `%s'"
 msgstr "ç?¡æ³?å¾? `%s' è®?å??æ¨?é è³?æ??"
 
-#: timezone/zdump.c:215
+#: timezone/zdump.c:246
 msgid "lacks alphabetic at start"
 msgstr "lacks å?æ¯?é ?åº?æ?¼é??å§?"
 
-#: timezone/zdump.c:217
+#: timezone/zdump.c:248
 msgid "has fewer than 3 alphabetics"
 msgstr "æ??æ?´å°?ç??æ¯? 3 å?æ¯?é ?åº?"
 
-#: timezone/zdump.c:219
+#: timezone/zdump.c:250
 msgid "has more than 6 alphabetics"
 msgstr "æ??è¶?é?? 6 å?æ¯?é ?åº?"
 
-#: timezone/zdump.c:227
+#: timezone/zdump.c:258
 msgid "differs from POSIX standard"
 msgstr "differs å¾? POSIX æ¨?æº?"
 
-#: timezone/zdump.c:233
+#: timezone/zdump.c:264
 #, c-format
 msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"
 msgstr "%s: è¦å??ï¼?å??å??ã??%sã??ç¸®å¯«ã??%sã??%s\n"
 
-#: timezone/zdump.c:242
+#: timezone/zdump.c:273
 #, c-format
 msgid ""
 "%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"
 "\n"
-"Report bugs to tz@elsie.nci.nih.gov.\n"
+"Report bugs to %s.\n"
 msgstr ""
-"%sï¼?ç?¨æ³?æ?¯ %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"
+"%sï¼?ç?¨æ³?ç?º %s [--version] [--help] [-v] [-c [loyear,]hiyear ] zonename ...\n"
 "\n"
-"è«?å°?é?¯èª¤é??å ±çµ¦ tz@elsie.nci.nih.govã??\n"
+"å°?é?¯èª¤é??å ±çµ¦ %sã??\n"
 
-#: timezone/zdump.c:311
+#: timezone/zdump.c:340
 #, c-format
 msgid "%s: wild -c argument %s\n"
 msgstr "%s: wild -c å¼?æ?¸ %s\n"
 
-#: timezone/zdump.c:398
+#: timezone/zdump.c:426
 msgid "Error writing to standard output"
 msgstr "å¯«å?¥æ¨?æº?è¼¸å?ºæ??é?¯èª¤"
 
-#: timezone/zdump.c:421
+#: timezone/zdump.c:439
 #, c-format
 msgid "%s: use of -v on system with floating time_t other than float or double\n"
 msgstr "%s: ä½¿ç?¨ -v æ?¼å?·å??æµ®é»?æ?¸ time_t ç??ç³»çµ±è??é??æµ®é»?æ?¸æ??é??å??ç²¾åº¦\n"
 
-#: timezone/zic.c:388
+#: timezone/zic.c:361
 #, c-format
 msgid "%s: Memory exhausted: %s\n"
 msgstr "%s: è¨?æ?¶é«?å·²ç?¨å®?: %s\n"
 
-#: timezone/zic.c:434
+#: timezone/zic.c:401
 #, c-format
 msgid "\"%s\", line %d: %s"
 msgstr "\"%s\", ç¬¬ %d å??: %s"
 
-#: timezone/zic.c:437
+#: timezone/zic.c:404
 #, c-format
 msgid " (rule from \"%s\", line %d)"
 msgstr " (è¦?å??ä¾?è?ª \"%s\", ç¬¬ %d å??)"
 
-#: timezone/zic.c:449
+#: timezone/zic.c:415
 msgid "warning: "
 msgstr "è¦å??: "
 
-#: timezone/zic.c:459
+#: timezone/zic.c:425
 #, c-format
 msgid ""
 "%s: usage is %s [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
 "\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
 "\n"
-"Report bugs to tz@elsie.nci.nih.gov.\n"
+"Report bugs to %s.\n"
 msgstr ""
-"%sï¼?ç?¨æ³?æ?¯ %s [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
+"%sï¼?ç?¨æ³?ç?º %s [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
 "\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
 "\n"
-"è«?å°?é?¯èª¤é??å ±çµ¦ tz@elsie.nci.nih.govã??\n"
+"å°?é?¯èª¤é??å ±çµ¦ %sã??\n"
 
-#: timezone/zic.c:496
+#: timezone/zic.c:460
 msgid "wild compilation-time specification of zic_t"
 msgstr "zic_t ç??è?¬ç?¨ç·¨è¯æ??é??è¦?æ ¼"
 
-#: timezone/zic.c:515
+#: timezone/zic.c:479
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s: æ?¨ä½¿ç?¨äº?è¶?é??ä¸?å?? -d é?¸é ?\n"
 
-#: timezone/zic.c:525
+#: timezone/zic.c:489
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s: æ?¨ä½¿ç?¨äº?è¶?é??ä¸?å?? -l é?¸é ?\n"
 
-#: timezone/zic.c:535
+#: timezone/zic.c:499
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s: æ?¨ä½¿ç?¨äº?è¶?é??ä¸?å?? -p é?¸é ?\n"
 
-#: timezone/zic.c:545
+#: timezone/zic.c:509
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr "%s: æ?¨ä½¿ç?¨äº?è¶?é??ä¸?å?? -y é?¸é ?\n"
 
-#: timezone/zic.c:555
+#: timezone/zic.c:519
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s: æ?¨ä½¿ç?¨äº?è¶?é??ä¸?å?? -L é?¸é ?\n"
 
-#: timezone/zic.c:604
+#: timezone/zic.c:566
 msgid "link to link"
 msgstr "é?£çµ?å?°é?£çµ?"
 
-#: timezone/zic.c:669
+#: timezone/zic.c:629
 msgid "hard link failed, symbolic link used"
 msgstr "å¯¦é«?é?£çµ?å¤±æ??ï¼?ä½¿ç?¨ç¬¦è??é?£çµ?ä»£æ?¿"
 
-#: timezone/zic.c:677
+#: timezone/zic.c:637
 #, c-format
 msgid "%s: Can't link from %s to %s: %s\n"
 msgstr "%s: ç?¡æ³?å¾? %s é?£çµ?å?° %s: %s\n"
 
-#: timezone/zic.c:749 timezone/zic.c:751
+#: timezone/zic.c:697 timezone/zic.c:699
 msgid "same rule name in multiple files"
 msgstr "å?¨å¤?å??æª?æ¡?è£¡é?¢æ??ç?¸å??ç??è¦?å??å??ç¨±"
 
-#: timezone/zic.c:792
+#: timezone/zic.c:740
 msgid "unruly zone"
 msgstr "æ²?æ??è¦?å??ç??æ??å??"
 
-#: timezone/zic.c:799
+#: timezone/zic.c:747
 #, c-format
 msgid "%s in ruleless zone"
 msgstr "%s å?¨æ²?æ??è¦?å??ç??å??æ®µ"
 
-#: timezone/zic.c:820
+#: timezone/zic.c:767
 msgid "standard input"
 msgstr "æ¨?æº?è¼¸å?¥"
 
-#: timezone/zic.c:825
+#: timezone/zic.c:772
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr "%s: ç?¡æ³?é??å?? %s: %s\n"
 
-#: timezone/zic.c:836
+#: timezone/zic.c:783
 msgid "line too long"
 msgstr "å??ç??é?·åº¦é??é?·"
 
-#: timezone/zic.c:856
+#: timezone/zic.c:803
 msgid "input line of unknown type"
 msgstr "ä¸?æ??å??å?¥ç??è¼¸å?¥å??"
 
-#: timezone/zic.c:872
+#: timezone/zic.c:819
 #, c-format
 msgid "%s: Leap line in non leap seconds file %s\n"
 msgstr "%s: é??æ??è¨å®?å??å?ºç?¾å?¨ä¸?å?«é??ç§?ç??è¨å®?æª? %s ä¸\n"
 
-#: timezone/zic.c:879 timezone/zic.c:1316 timezone/zic.c:1338
+#: timezone/zic.c:826 timezone/zic.c:1243 timezone/zic.c:1265
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: å?´é??é?¯èª¤: é?¯èª¤ç?? l_value %d\n"
 
-#: timezone/zic.c:887
+#: timezone/zic.c:834
 #, c-format
 msgid "%s: Error reading %s\n"
 msgstr "%s: è®?å??é?¯èª¤ %s\n"
 
-#: timezone/zic.c:894
+#: timezone/zic.c:841
 #, c-format
 msgid "%s: Error closing %s: %s\n"
 msgstr "%s: é??é??é?¯èª¤ %s: %s\n"
 
-#: timezone/zic.c:899
+#: timezone/zic.c:846
 msgid "expected continuation line not found"
 msgstr "æ?¾ä¸?å?°é ?æ??ç??æ?¥çº?å??"
 
-#: timezone/zic.c:943 timezone/zic.c:2480 timezone/zic.c:2499
+#: timezone/zic.c:887 timezone/zic.c:2411 timezone/zic.c:2425
 msgid "time overflow"
 msgstr "æ??é??æº¢ä½?"
 
-#: timezone/zic.c:947
+#: timezone/zic.c:891
 msgid "24:00 not handled by pre-1998 versions of zic"
 msgstr "24:00 ç?¡æ³?ç?±æ?©æ?¼ 1998 ç?? zic ç??æ?¬æ??è??ç??"
 
-#: timezone/zic.c:950
+#: timezone/zic.c:894
 msgid "values over 24 hours not handled by pre-2007 versions of zic"
 msgstr "24 å°?æ??ä»¥ä¸?ç??å?¼ç?¡æ³?ç?±æ?©æ?¼ 2007 ç?? zic ç??æ?¬æ??è??ç??"
 
-#: timezone/zic.c:963
+#: timezone/zic.c:905
 msgid "wrong number of fields on Rule line"
 msgstr "è¦?å??è¨å®?å??ç??æ¬?ä½?æ?¸ç?®é?¯èª¤"
 
-#: timezone/zic.c:967
+#: timezone/zic.c:909
 msgid "nameless rule"
 msgstr "æ²?æ??å??ç¨±ç??è¦?å??"
 
-#: timezone/zic.c:972
+#: timezone/zic.c:914
 msgid "invalid saved time"
 msgstr "ç?¡æ??ç??ç¯?ç´?æ??é??"
 
-#: timezone/zic.c:993
+#: timezone/zic.c:932
 msgid "wrong number of fields on Zone line"
 msgstr "æ??å??è¨å®?å??ç??æ¬?ä½?æ?¸ç?®é?¯èª¤"
 
-#: timezone/zic.c:999
+#: timezone/zic.c:938
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "\"å??æ®µ %s\" å??å?? -l é?¸é ?æ?¯äº?æ?¥ç??"
 
-#: timezone/zic.c:1007
+#: timezone/zic.c:946
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "\"å??æ®µ %s\" å??å?? -p é?¸é ?æ?¯äº?æ?¥ç??"
 
-#: timezone/zic.c:1019
+#: timezone/zic.c:958
 #, c-format
 msgid "duplicate zone name %s (file \"%s\", line %d)"
 msgstr "è¤?è£½æ??å??å??ç¨± %s (æª?æ¡? \"%s\", ç¬¬ %d å??)"
 
-#: timezone/zic.c:1035
+#: timezone/zic.c:972
 msgid "wrong number of fields on Zone continuation line"
 msgstr "æ??å??æ?¥çº?å??ç??æ¬?ä½?æ?¸ç?®ä¸?å°?"
 
-#: timezone/zic.c:1075
+#: timezone/zic.c:1009
 msgid "invalid UTC offset"
 msgstr "ç?¡æ??ç?? UTC ä½?ç§»å?¼"
 
-#: timezone/zic.c:1078
+#: timezone/zic.c:1012
 msgid "invalid abbreviation format"
 msgstr "ç?¡æ??ç??ç¸®å¯«æ ¼å¼?"
 
-#: timezone/zic.c:1107
+#: timezone/zic.c:1041
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr "æ??å??æ?¥çº?å??ç??çµ?æ??æ??é??ä¸?å?¨ä¸?ä¸?å??ç??çµ?æ??æ??é??ä¹?å¾?"
 
-#: timezone/zic.c:1135
+#: timezone/zic.c:1066
 msgid "wrong number of fields on Leap line"
 msgstr "é??æ??è¨å®?å??ç??æ¬?ä½?æ?¸ç?®é?¯èª¤"
 
-#: timezone/zic.c:1144
+#: timezone/zic.c:1075
 msgid "invalid leaping year"
 msgstr "ç?¡æ??ç??é??å¹´"
 
-#: timezone/zic.c:1164 timezone/zic.c:1270
+#: timezone/zic.c:1095 timezone/zic.c:1197
 msgid "invalid month name"
 msgstr "ç?¡æ??ç??æ??å??å??ç¨±"
 
-#: timezone/zic.c:1177 timezone/zic.c:1383 timezone/zic.c:1397
+#: timezone/zic.c:1108 timezone/zic.c:1310 timezone/zic.c:1324
 msgid "invalid day of month"
 msgstr "ç?¡æ??ç??æ?¥æ??æ?¸å?"
 
-#: timezone/zic.c:1182
+#: timezone/zic.c:1113
 msgid "time before zero"
 msgstr "å?¨é?¶ä¹?å??ç??æ??é??"
 
-#: timezone/zic.c:1186
+#: timezone/zic.c:1117
 msgid "time too small"
 msgstr "æ??é??å¤ªå°?"
 
-#: timezone/zic.c:1190
+#: timezone/zic.c:1121
 msgid "time too large"
 msgstr "æ??é??å¤ªå¤§"
 
-#: timezone/zic.c:1194 timezone/zic.c:1299
+#: timezone/zic.c:1125 timezone/zic.c:1226
 msgid "invalid time of day"
 msgstr "ç?¡æ??ç??æ??é??æ?¸å?"
 
-#: timezone/zic.c:1213
+#: timezone/zic.c:1144
 msgid "illegal CORRECTION field on Leap line"
 msgstr "å?¨é??æ??è¨å®?å??ä¸æ??ä¸?å??æ³?ç?? CORRECTION æ¬?ä½?"
 
-#: timezone/zic.c:1218
+#: timezone/zic.c:1149
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "å?¨é??æ??è¨å®?å??ä¸æ??ä¸?å??æ³?ç?? Rolling/Stationary æ¬?ä½?"
 
-#: timezone/zic.c:1234
+#: timezone/zic.c:1163
 msgid "wrong number of fields on Link line"
 msgstr "é?£çµ?è¨å®?å??ç??æ¬?ä½?æ?¸ç?®é?¯èª¤"
 
-#: timezone/zic.c:1238
+#: timezone/zic.c:1167
 msgid "blank FROM field on Link line"
 msgstr "é?£çµ?å??ä¸ç©ºç?½ç?? FROM æ¬?ä½?"
 
-#: timezone/zic.c:1242
+#: timezone/zic.c:1171
 msgid "blank TO field on Link line"
 msgstr "é?£çµ?å??ä¸ç©ºç?½ç?? TO æ¬?ä½?"
 
-#: timezone/zic.c:1320
+#: timezone/zic.c:1247
 msgid "invalid starting year"
 msgstr "ç?¡æ??ç??èµ·å§?å¹´å??"
 
-#: timezone/zic.c:1342
+#: timezone/zic.c:1269
 msgid "invalid ending year"
 msgstr "ç?¡æ??ç??çµ?æ??å¹´å??"
 
-#: timezone/zic.c:1346
+#: timezone/zic.c:1273
 msgid "starting year greater than ending year"
 msgstr "èµ·å§?å¹´å??æ¯?çµ?æ??å¹´å??é??è¦?å¤§"
 
-#: timezone/zic.c:1353
+#: timezone/zic.c:1280
 msgid "typed single year"
 msgstr "è¼¸å?¥ç??å¹´å??æ?¯å??ä¸?å¹´"
 
-#: timezone/zic.c:1388
+#: timezone/zic.c:1315
 msgid "invalid weekday name"
 msgstr "ç?¡æ??ç??å·¥ä½?æ?¥å??ç¨±"
 
-#: timezone/zic.c:1566
+#: timezone/zic.c:1481
 #, c-format
 msgid "%s: Can't remove %s: %s\n"
 msgstr "%s: ç?¡æ³?ç§»é?¤ %s: %s\n"
 
-#: timezone/zic.c:1576
+#: timezone/zic.c:1491
 #, c-format
 msgid "%s: Can't create %s: %s\n"
 msgstr "%s: ç?¡æ³?ç?¢ç?? %s: %s\n"
 
-#: timezone/zic.c:1726
+#: timezone/zic.c:1683
 #, c-format
 msgid "%s: Error writing %s\n"
 msgstr "%s: å¯«å?¥é?¯èª¤ %s\n"
 
-#: timezone/zic.c:2019
+#: timezone/zic.c:1964
 msgid "no POSIX environment variable for zone"
 msgstr "ç?¡ POSIX ç?°å¢?è®?æ?¸ç?¨æ?¼å??"
 
-#: timezone/zic.c:2176
+#: timezone/zic.c:2131
 msgid "can't determine time zone abbreviation to use just after until time"
 msgstr "ç?¡æ³?æ±ºå®?å?¨çµ?æ??æ??é??ä»¥å¾?è©²ä½¿ç?¨ç??æ??å??ç°¡å¯«"
 
-#: timezone/zic.c:2222
+#: timezone/zic.c:2175
 msgid "too many transitions?!"
 msgstr "å¤ªå¤?æ??é??è½?æ??äº??!"
 
-#: timezone/zic.c:2241
+#: timezone/zic.c:2190
 msgid "internal error - addtype called with bad isdst"
 msgstr "å?§é?¨é?¯èª¤ - ç?¨é?¯èª¤ç?? isdst å?¼å?« addtype å?½å¼?"
 
-#: timezone/zic.c:2245
+#: timezone/zic.c:2194
 msgid "internal error - addtype called with bad ttisstd"
 msgstr "å?§é?¨é?¯èª¤ - ç?¨é?¯èª¤ç?? ttisstd å?¼å?« addtype å?½å¼?"
 
-#: timezone/zic.c:2249
+#: timezone/zic.c:2198
 msgid "internal error - addtype called with bad ttisgmt"
 msgstr "å?§é?¨é?¯èª¤ - ç?¨é?¯èª¤ç?? ttisgmt å?¼å?« addtype å?½å¼?"
 
-#: timezone/zic.c:2268
+#: timezone/zic.c:2217
 msgid "too many local time types"
 msgstr "å¤ªå¤?æ?¬å?°æ??é??æ ¼å¼?"
 
-#: timezone/zic.c:2272
+#: timezone/zic.c:2221
 msgid "UTC offset out of range"
 msgstr "UTC å??ç§»è¶?å?ºç¯?å??"
 
-#: timezone/zic.c:2300
+#: timezone/zic.c:2245
 msgid "too many leap seconds"
 msgstr "å¤ªå¤?é??ç§?"
 
-#: timezone/zic.c:2306
+#: timezone/zic.c:2251
 msgid "repeated leap second moment"
 msgstr "é??è¤?ç??é??ç§?è¨å®?"
 
-#: timezone/zic.c:2358
+#: timezone/zic.c:2301
 msgid "Wild result from command execution"
 msgstr "å?½ä»¤å?·è¡?å°?è?´å¥?æ?ªç??çµ?æ??"
 
-#: timezone/zic.c:2359
+#: timezone/zic.c:2302
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s: è¼¸å?¥å?½ä»¤ç?º '%s', çµ?æ??ç?º %d\n"
 
-#: timezone/zic.c:2457
+#: timezone/zic.c:2393
 msgid "Odd number of quotation marks"
 msgstr "å¼?è??æ?¸ç?®ç?ºå¥?æ?¸"
 
-#: timezone/zic.c:2546
+#: timezone/zic.c:2470
 msgid "use of 2/29 in non leap-year"
 msgstr "å?¨é??é??å¹´æ??ç?¨å?° 2/29 æ?¥"
 
-#: timezone/zic.c:2581
+#: timezone/zic.c:2505
 msgid "rule goes past start/end of month--will not work with pre-2004 versions of zic"
 msgstr "è¦?å??è¶?é??é??å§?/çµ?æ??æ??å??--å°?ç?¡æ³?é?©ç?¨æ?©æ?¼ 2004 ç?? zic ç??æ?¬"
 
-#: timezone/zic.c:2613
+#: timezone/zic.c:2536
 msgid "time zone abbreviation lacks alphabetic at start"
 msgstr "æ??å??ç¸®å¯«é??é ç¼ºå°?å?æ¯?"
 
-#: timezone/zic.c:2615
-msgid "time zone abbreviation has more than 3 alphabetics"
-msgstr "æ??å??ç¸®å¯«è¶?é?? 3 å?æ¯?"
+#: timezone/zic.c:2538
+msgid "time zone abbreviation has fewer than 3 alphabetics"
+msgstr "æ??é??å??ç¸®å¯«å°?æ?¼ 3 å??å?æ¯?"
 
-#: timezone/zic.c:2617
+#: timezone/zic.c:2540
 msgid "time zone abbreviation has too many alphabetics"
-msgstr "æ??å??ç¸®å¯«æ??å¤ªå¤?å?æ¯?"
+msgstr "æ??å??ç¸®å¯«å¤ªå¤?å?æ¯?"
 
-#: timezone/zic.c:2627
+#: timezone/zic.c:2550
 msgid "time zone abbreviation differs from POSIX standard"
 msgstr "æ??å??ç¸®å¯«è?? POSIX æ¨?æº?ä¸?å??"
 
-#: timezone/zic.c:2639
+#: timezone/zic.c:2562
 msgid "too many, or too long, time zone abbreviations"
 msgstr "æ??å??ç¸®å¯«å¤ªå¤?æ??è??å¤ªé?·"
 
-#: timezone/zic.c:2680
+#: timezone/zic.c:2602
 #, c-format
 msgid "%s: Can't create directory %s: %s\n"
 msgstr "%s: ç?¡æ³?å»ºç«?ç?®é?? %s: %s\n"
 
-#: timezone/zic.c:2702
+#: timezone/zic.c:2623
 #, c-format
 msgid "%s: %d did not sign extend correctly\n"
 msgstr "%s: %d ç?¡æ³?æ£ç¢ºå?°å»¶å±?è¨?è??\n"

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |    5 +
 po/zh_TW.po | 2780 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 1476 insertions(+), 1309 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]