about summary refs log tree commit diff
path: root/po/zh_TW.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_TW.po')
-rw-r--r--po/zh_TW.po1959
1 files changed, 1015 insertions, 944 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4135ac5c9f..3e808fe126 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -15,18 +15,18 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libc 2.31.9000\n"
-"POT-Creation-Date: 2021-07-28 22:02-0400\n"
-"PO-Revision-Date: 2020-07-24 01:31+0800\n"
+"Project-Id-Version: libc 2.34.9000\n"
+"POT-Creation-Date: 2022-01-29 17:34-0500\n"
+"PO-Revision-Date: 2022-02-01 12:16+0800\n"
 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.4\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: argp/argp-help.c:229
 #, c-format
@@ -77,9 +77,9 @@ msgstr "給出這個使用方式列表"
 msgid "Give a short usage message"
 msgstr "給出簡短的使用訊息"
 
-#: argp/argp-parse.c:103 catgets/gencat.c:109 catgets/gencat.c:113
-#: iconv/iconv_prog.c:61 iconv/iconv_prog.c:62 nscd/nscd.c:107 nscd/nscd.c:111
-#: nss/makedb.c:121
+#: argp/argp-parse.c:103 catgets/gencat.c:108 catgets/gencat.c:112
+#: iconv/iconv_prog.c:60 iconv/iconv_prog.c:61 nscd/nscd.c:106 nscd/nscd.c:110
+#: nss/makedb.c:120
 msgid "NAME"
 msgstr "名稱"
 
@@ -130,19 +130,19 @@ msgstr ""
 "%s%s%s:%u:%s%s假設『%s』失敗。\n"
 "%n"
 
-#: catgets/gencat.c:110
+#: catgets/gencat.c:109
 msgid "Create C header file NAME containing symbol definitions"
 msgstr "產生的 C 標頭檔名內含符號定義"
 
-#: catgets/gencat.c:112
+#: catgets/gencat.c:111
 msgid "Do not use existing catalog, force new output file"
 msgstr "不使用現存的 catalog, 強制使用新的輸出檔"
 
-#: catgets/gencat.c:113 nss/makedb.c:121
+#: catgets/gencat.c:112 nss/makedb.c:120
 msgid "Write output to file NAME"
 msgstr "將輸出寫到檔案 NAME 中"
 
-#: catgets/gencat.c:118
+#: catgets/gencat.c:117
 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"
@@ -150,7 +150,7 @@ msgstr ""
 "產生訊息 catelog。\\v如果輸入檔名是 -, 將從標準輸入讀取輸入。\n"
 "如果輸出檔名是 -, 則輸出將寫到標準輸出去。\n"
 
-#: catgets/gencat.c:123
+#: catgets/gencat.c:122
 msgid ""
 "-o OUTPUT-FILE [INPUT-FILE]...\n"
 "[OUTPUT-FILE [INPUT-FILE]...]"
@@ -158,12 +158,12 @@ msgstr ""
 "-o 輸出檔案名稱 [輸入檔案名稱]...\n"
 "[輸出檔案名稱 [輸入檔案名稱]...]"
 
-#: catgets/gencat.c:229 debug/pcprofiledump.c:209 elf/ldconfig.c:312
-#: elf/pldd.c:247 elf/sln.c:77 elf/sprof.c:372 iconv/iconv_prog.c:388
-#: iconv/iconvconfig.c:381 locale/programs/locale.c:276
-#: locale/programs/localedef.c:438 login/programs/pt_chown.c:89
-#: malloc/memusagestat.c:563 nss/getent.c:953 nss/makedb.c:370
-#: posix/getconf.c:503 sysdeps/unix/sysv/linux/lddlibc4.c:61
+#: catgets/gencat.c:228 debug/pcprofiledump.c:208 elf/ldconfig.c:311
+#: elf/pldd.c:246 elf/sln.c:77 elf/sprof.c:371 iconv/iconv_prog.c:387
+#: iconv/iconvconfig.c:380 locale/programs/locale.c:275
+#: locale/programs/localedef.c:437 login/programs/pt_chown.c:88
+#: malloc/memusagestat.c:562 nss/getent.c:952 nss/makedb.c:369
+#: posix/getconf.c:503 sysdeps/unix/sysv/linux/lddlibc4.c:60
 #, c-format
 msgid ""
 "For bug reporting instructions, please see:\n"
@@ -172,13 +172,13 @@ msgstr ""
 "要知道錯誤報告指令,請參看:\n"
 "%s。\n"
 
-#: catgets/gencat.c:245 debug/pcprofiledump.c:225 debug/xtrace.sh:64
-#: elf/ldconfig.c:328 elf/ldd.bash.in:38 elf/pldd.c:263 elf/sotruss.sh:75
-#: elf/sprof.c:389 iconv/iconv_prog.c:405 iconv/iconvconfig.c:398
-#: locale/programs/locale.c:293 locale/programs/localedef.c:460
-#: login/programs/pt_chown.c:63 malloc/memusage.sh:71 malloc/memusagestat.c:581
-#: nscd/nscd.c:522 nss/getent.c:88 nss/makedb.c:386 posix/getconf.c:485
-#: sysdeps/unix/sysv/linux/lddlibc4.c:68
+#: catgets/gencat.c:244 debug/pcprofiledump.c:224 debug/xtrace.sh:63
+#: elf/ldconfig.c:327 elf/ldd.bash.in:38 elf/pldd.c:262 elf/sotruss.sh:75
+#: elf/sprof.c:388 iconv/iconv_prog.c:404 iconv/iconvconfig.c:397
+#: locale/programs/locale.c:292 locale/programs/localedef.c:459
+#: login/programs/pt_chown.c:62 malloc/memusage.sh:70 malloc/memusagestat.c:580
+#: nscd/nscd.c:521 nss/getent.c:87 nss/makedb.c:385 posix/getconf.c:485
+#: sysdeps/unix/sysv/linux/lddlibc4.c:67
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -189,141 +189,141 @@ msgstr ""
 "這是一個自由軟體;請見原始碼的授權條款。這沒有擔保;甚至也沒有專為銷\n"
 "售或者適合某些特殊目的。\n"
 
-#: catgets/gencat.c:250 debug/pcprofiledump.c:230 debug/xtrace.sh:68
-#: elf/ldconfig.c:333 elf/pldd.c:268 elf/sprof.c:395 iconv/iconv_prog.c:410
-#: iconv/iconvconfig.c:403 locale/programs/locale.c:298
-#: locale/programs/localedef.c:465 malloc/memusage.sh:75
-#: malloc/memusagestat.c:586 nscd/nscd.c:527 nss/getent.c:93 nss/makedb.c:391
+#: catgets/gencat.c:249 debug/pcprofiledump.c:229 debug/xtrace.sh:67
+#: elf/ldconfig.c:332 elf/pldd.c:267 elf/sprof.c:394 iconv/iconv_prog.c:409
+#: iconv/iconvconfig.c:402 locale/programs/locale.c:297
+#: locale/programs/localedef.c:464 malloc/memusage.sh:74
+#: malloc/memusagestat.c:585 nscd/nscd.c:526 nss/getent.c:92 nss/makedb.c:390
 #: posix/getconf.c:490
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 編寫。\n"
 
-#: catgets/gencat.c:281
+#: catgets/gencat.c:280
 msgid "*standard input*"
 msgstr "*標準輸入*"
 
-#: catgets/gencat.c:287 iconv/iconv_charmap.c:173 iconv/iconv_prog.c:273
-#: nss/makedb.c:247
+#: catgets/gencat.c:286 iconv/iconv_charmap.c:172 iconv/iconv_prog.c:272
+#: nss/makedb.c:246
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "無法開啟輸入檔 `%s'"
 
-#: catgets/gencat.c:416 catgets/gencat.c:491
+#: catgets/gencat.c:415 catgets/gencat.c:490
 msgid "illegal set number"
 msgstr "不合法的集合編號"
 
-#: catgets/gencat.c:443
+#: catgets/gencat.c:442
 msgid "duplicate set definition"
 msgstr "複製集合定義"
 
-#: catgets/gencat.c:445 catgets/gencat.c:617 catgets/gencat.c:669
+#: catgets/gencat.c:444 catgets/gencat.c:616 catgets/gencat.c:668
 msgid "this is the first definition"
 msgstr "此為第一個定義"
 
-#: catgets/gencat.c:516
+#: catgets/gencat.c:515
 #, c-format
 msgid "unknown set `%s'"
 msgstr "不明的集合 `%s'"
 
-#: catgets/gencat.c:557
+#: catgets/gencat.c:556
 msgid "invalid quote character"
 msgstr "不適用的引用字元"
 
-#: catgets/gencat.c:570
+#: catgets/gencat.c:569
 #, c-format
 msgid "unknown directive `%s': line ignored"
 msgstr "不明的 `%s' 指示詞: 此列忽略"
 
-#: catgets/gencat.c:615
+#: catgets/gencat.c:614
 msgid "duplicated message number"
 msgstr "重複的訊息編號"
 
-#: catgets/gencat.c:666
+#: catgets/gencat.c:665
 msgid "duplicated message identifier"
 msgstr "重複的訊息識別符號"
 
-#: catgets/gencat.c:723
+#: catgets/gencat.c:722
 msgid "invalid character: message ignored"
 msgstr "不適用的字元: 忽略此訊息"
 
-#: catgets/gencat.c:766
+#: catgets/gencat.c:765
 msgid "invalid line"
 msgstr "無效的輸入列"
 
-#: catgets/gencat.c:820
+#: catgets/gencat.c:819
 msgid "malformed line ignored"
 msgstr "忽略奇怪的列"
 
-#: catgets/gencat.c:984 catgets/gencat.c:1025
+#: catgets/gencat.c:983 catgets/gencat.c:1024
 #, c-format
 msgid "cannot open output file `%s'"
 msgstr "無法開啟輸出檔 `%s'"
 
-#: catgets/gencat.c:1187 locale/programs/linereader.c:560
+#: catgets/gencat.c:1186 locale/programs/linereader.c:559
 msgid "invalid escape sequence"
 msgstr "無效的跳脫序列"
 
-#: catgets/gencat.c:1211
+#: catgets/gencat.c:1210
 msgid "unterminated message"
 msgstr "沒有結尾的訊息"
 
-#: catgets/gencat.c:1235
+#: catgets/gencat.c:1234
 #, c-format
 msgid "while opening old catalog file"
 msgstr "在開啟舊的類別檔案時"
 
-#: catgets/gencat.c:1326
+#: catgets/gencat.c:1325
 #, c-format
 msgid "conversion modules not available"
 msgstr "轉換模組不存在"
 
-#: catgets/gencat.c:1352
+#: catgets/gencat.c:1351
 #, 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:26 debug/xtrace.sh:44
+#: debug/xtrace.sh:25 debug/xtrace.sh:43
 msgid "Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n"
 msgstr "用法:xtrace [選項]… 程式 [PROGRAMOPTION]…\\n"
 
-#: debug/xtrace.sh:32 elf/sotruss.sh:56 elf/sotruss.sh:67 elf/sotruss.sh:135
-#: malloc/memusage.sh:26
+#: debug/xtrace.sh:31 elf/sotruss.sh:56 elf/sotruss.sh:67 elf/sotruss.sh:135
+#: malloc/memusage.sh:25
 msgid "Try \\`%s --help' or \\`%s --usage' for more information.\\n"
 msgstr "請嘗試 \\『%s --help』或\\『%s --usage』以獲得更多資訊。\\n"
 
-#: debug/xtrace.sh:38
+#: debug/xtrace.sh:37
 msgid "%s: option '%s' requires an argument.\\n"
 msgstr "%s:選項『%s』需要一個引數.\\n"
 
-#: debug/xtrace.sh:45
+#: debug/xtrace.sh:44
 msgid ""
 "Trace execution of program by printing currently executed function.\n"
 "\n"
@@ -349,25 +349,25 @@ msgstr ""
 "短選項。\n"
 "\n"
 
-#: debug/xtrace.sh:57 elf/ldd.bash.in:55 elf/sotruss.sh:49
-#: malloc/memusage.sh:64
+#: debug/xtrace.sh:56 elf/ldd.bash.in:55 elf/sotruss.sh:49
+#: malloc/memusage.sh:63
 msgid "For bug reporting instructions, please see:\\\\n%s.\\\\n"
 msgstr "要知道錯誤報告指令,請參看:\\\\n%s.\\\\n"
 
-#: debug/xtrace.sh:125
+#: debug/xtrace.sh:124
 msgid "xtrace: unrecognized option \\`$1'\\n"
 msgstr "xtrace:無法辨識的選項「$1」\\n"
 
-#: debug/xtrace.sh:138
+#: debug/xtrace.sh:137
 msgid "No program name given\\n"
 msgstr "未給定程式名稱\\n"
 
-#: debug/xtrace.sh:146
+#: debug/xtrace.sh:145
 #, sh-format
 msgid "executable \\`$program' not found\\n"
 msgstr "可執行檔案「$program」找不到\\n"
 
-#: debug/xtrace.sh:150
+#: debug/xtrace.sh:149
 #, sh-format
 msgid "\\`$program' is no executable\\n"
 msgstr "「$program」不是可執行檔案\\n"
@@ -388,65 +388,94 @@ msgstr "無效的模式"
 msgid "invalid mode parameter"
 msgstr "無效的模式參數"
 
-#: elf/cache.c:180
+#: elf/cache.c:179
 msgid "unknown"
 msgstr "未知"
 
-#: elf/cache.c:254
+#: elf/cache.c:253
 msgid "Unknown OS"
 msgstr "未知的作業系統"
 
-#: elf/cache.c:259
+#: elf/cache.c:258
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", OS ABI: %s %d.%d.%d"
 
-#: elf/cache.c:320 elf/ldconfig.c:1434
+#: elf/cache.c:296
+#, c-format
+msgid "Cache file has wrong endianness.\n"
+msgstr "快取檔案的字節順序有誤。\n"
+
+#: elf/cache.c:305
+msgid "Cache generated by: "
+msgstr "快取產生者:"
+
+#: elf/cache.c:319 elf/ldconfig.c:1437
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "無法開啟快取檔 %s\n"
 
-#: elf/cache.c:334
+#: elf/cache.c:333
 #, c-format
 msgid "mmap of cache file failed.\n"
 msgstr "快取檔案 mmap 失敗。\n"
 
-#: elf/cache.c:338 elf/cache.c:352 elf/cache.c:363
+#: elf/cache.c:337 elf/cache.c:351 elf/cache.c:362
 #, c-format
 msgid "File is not a cache file.\n"
 msgstr "檔案並非快取檔。\n"
 
-#: elf/cache.c:392 elf/cache.c:407
+#: elf/cache.c:391 elf/cache.c:406
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "%d 函式庫在快取 `%s' 中找到\n"
 
-#: elf/cache.c:726
+#: elf/cache.c:404
+#, c-format
+msgid "Malformed extension data in cache file %s\n"
+msgstr "快取檔案 %s 中的擴充資料格式錯誤\n"
+
+#: elf/cache.c:547
+#, c-format
+msgid "Writing of cache extension data failed"
+msgstr "快取擴充資料寫入失敗"
+
+#: elf/cache.c:558
+#, c-format
+msgid "%s: ISA level is too high (%d > %d)"
+msgstr "%s:ISA 級別過高 (%d > %d)"
+
+#: elf/cache.c:725
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "無法產生暫時的快取檔 %s"
 
-#: elf/cache.c:734 elf/cache.c:744 elf/cache.c:748 elf/cache.c:753
-#: elf/cache.c:771
+#: elf/cache.c:733 elf/cache.c:743 elf/cache.c:747 elf/cache.c:752
+#: elf/cache.c:770
 #, c-format
 msgid "Writing of cache data failed"
 msgstr "寫入快取資料時發生錯誤"
 
-#: elf/cache.c:766
+#: elf/cache.c:765
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr "更改 %s 的存取權限為 %#o 失敗"
 
-#: elf/cache.c:775
+#: elf/cache.c:774
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "將 %s 改名為 %s 失敗"
 
-#: elf/dl-close.c:409 elf/dl-open.c:294
+#: elf/cache.c:805
+#, c-format
+msgid "Could not create library path"
+msgstr "無法建立函式庫路徑"
+
+#: elf/dl-close.c:386 elf/dl-open.c:298
 msgid "cannot create scope list"
 msgstr "無法建立作用域列表"
 
-#: elf/dl-close.c:870
+#: elf/dl-close.c:815
 msgid "shared object not open"
 msgstr "共用物件案沒有開啟"
 
@@ -499,171 +528,175 @@ msgstr "無法將頁面對映於 fptr 表格"
 msgid "internal error: symidx out of range of fptr table"
 msgstr "內部錯誤:symidx 超出 fptr 表格的範圍"
 
+#: elf/dl-hwcaps.c:104
+msgid "cannot create HWCAP priorities"
+msgstr "無法建立 HWCAP 優先級"
+
 #: elf/dl-hwcaps.c:247 elf/dl-hwcaps.c:262
 msgid "cannot create capability list"
 msgstr "無法建立 capability 列表"
 
-#: elf/dl-load.c:432
+#: elf/dl-load.c:434
 msgid "cannot allocate name record"
 msgstr "無法配置名稱紀錄"
 
-#: elf/dl-load.c:534 elf/dl-load.c:647 elf/dl-load.c:741 elf/dl-load.c:838
+#: elf/dl-load.c:536 elf/dl-load.c:649 elf/dl-load.c:743 elf/dl-load.c:840
 msgid "cannot create cache for search path"
 msgstr "無法為搜尋路徑建立快取"
 
-#: elf/dl-load.c:630
+#: elf/dl-load.c:632
 msgid "cannot create RUNPATH/RPATH copy"
 msgstr "無法建立 RUNPATH/RPATH 的副本"
 
-#: elf/dl-load.c:727
+#: elf/dl-load.c:729
 msgid "cannot create search path array"
 msgstr "無法建立搜尋路徑陣列"
 
-#: elf/dl-load.c:968
+#: elf/dl-load.c:970
 msgid "cannot stat shared object"
 msgstr "無法 stat 共用物件"
 
-#: elf/dl-load.c:1099 elf/dl-load.c:2314
+#: elf/dl-load.c:1069 elf/dl-load.c:2282
 msgid "cannot create shared object descriptor"
 msgstr "無法建立共用物件敘述項"
 
-#: elf/dl-load.c:1118 elf/dl-load.c:1689 elf/dl-load.c:1791
+#: elf/dl-load.c:1088 elf/dl-load.c:1661 elf/dl-load.c:1763
 msgid "cannot read file data"
 msgstr "無法讀取檔案資料"
 
-#: elf/dl-load.c:1164
-msgid "ELF load command alignment not page-aligned"
-msgstr "ELF 載入命令對齊並沒有按照記憶體分頁 (page) 對齊"
+#: elf/dl-load.c:1141
+msgid "ELF load command address/offset not page-aligned"
+msgstr "ELF 載入命令的位址或位移沒有對齊頁面"
 
-#: elf/dl-load.c:1171
-msgid "ELF load command address/offset not properly aligned"
-msgstr "ELF 載入命令位址/位移並沒有適當地對齊"
-
-#: elf/dl-load.c:1250
+#: elf/dl-load.c:1223
 msgid "object file has no loadable segments"
 msgstr "目的檔中沒有可載入的區段"
 
-#: elf/dl-load.c:1263
+#: elf/dl-load.c:1240
 msgid "cannot dynamically load executable"
 msgstr "無法動態載入執行檔"
 
-#: elf/dl-load.c:1288
+#: elf/dl-load.c:1247
 msgid "object file has no dynamic section"
 msgstr "共用物件中沒有動態區段"
 
-#: elf/dl-load.c:1306
+#: elf/dl-load.c:1282
 msgid "cannot dynamically load position-independent executable"
 msgstr "無法動態載入地址無關可執行檔"
 
-#: elf/dl-load.c:1308
+#: elf/dl-load.c:1284
 msgid "shared object cannot be dlopen()ed"
 msgstr "共用物件無法被 dlopen()"
 
-#: elf/dl-load.c:1321
+#: elf/dl-load.c:1297
 msgid "cannot allocate memory for program header"
 msgstr "無法配置記憶體給程式標頭區使用"
 
-#: elf/dl-load.c:1354 elf/dl-load.h:130
+#: elf/dl-load.c:1330 elf/dl-load.h:131
 msgid "cannot change memory protections"
 msgstr "無法改變記憶體保護狀態"
 
-#: elf/dl-load.c:1378
+#: elf/dl-load.c:1354
 msgid "cannot enable executable stack as shared object requires"
 msgstr "無法開啟可執行堆疊做為共用物件"
 
-#: elf/dl-load.c:1406
+#: elf/dl-load.c:1382
 msgid "cannot close file descriptor"
 msgstr "無法關閉檔案描述符號"
 
-#: elf/dl-load.c:1689
+#: elf/dl-load.c:1661
 msgid "file too short"
 msgstr "檔案太小"
 
-#: elf/dl-load.c:1725
+#: elf/dl-load.c:1697
 msgid "invalid ELF header"
 msgstr "無效的 ELF 標頭"
 
-#: elf/dl-load.c:1737
+#: elf/dl-load.c:1709
 msgid "ELF file data encoding not big-endian"
 msgstr "ELF 檔資料編碼並非大尾序"
 
-#: elf/dl-load.c:1739
+#: elf/dl-load.c:1711
 msgid "ELF file data encoding not little-endian"
 msgstr "ELF 檔資料編碼並非小尾序"
 
-#: elf/dl-load.c:1743
+#: elf/dl-load.c:1715
 msgid "ELF file version ident does not match current one"
 msgstr "ELF 檔版本 ident 不符合目前所使用的"
 
-#: elf/dl-load.c:1747
+#: elf/dl-load.c:1719
 msgid "ELF file OS ABI invalid"
 msgstr "ELF 檔 OS ABI 版本不適用"
 
-#: elf/dl-load.c:1750
+#: elf/dl-load.c:1722
 msgid "ELF file ABI version invalid"
 msgstr "ELF 檔 ABI 版本不適用"
 
-#: elf/dl-load.c:1753
+#: elf/dl-load.c:1725
 msgid "nonzero padding in e_ident"
 msgstr "在 e_ident 中填補非零值"
 
-#: elf/dl-load.c:1756
+#: elf/dl-load.c:1728
 msgid "internal error"
 msgstr "內部錯誤"
 
-#: elf/dl-load.c:1763
+#: elf/dl-load.c:1735
 msgid "ELF file version does not match current one"
 msgstr "ELF 檔版本不符合目前的版本"
 
-#: elf/dl-load.c:1771
+#: elf/dl-load.c:1743
 msgid "only ET_DYN and ET_EXEC can be loaded"
 msgstr "只有 ET_DYN 以及 ET_EXEC 可以載入"
 
-#: elf/dl-load.c:1776
+#: elf/dl-load.c:1748
 msgid "ELF file's phentsize not the expected size"
 msgstr "ELF 檔的 phentsize 並不是預期中的大小"
 
-#: elf/dl-load.c:2333
+#: elf/dl-load.c:2301
 msgid "wrong ELF class: ELFCLASS64"
 msgstr "錯誤 ELF 類別:ELFCLASS64"
 
-#: elf/dl-load.c:2334
+#: elf/dl-load.c:2302
 msgid "wrong ELF class: ELFCLASS32"
 msgstr "錯誤 ELF 類別:ELFCLASS32"
 
-#: elf/dl-load.c:2337
+#: elf/dl-load.c:2305
 msgid "cannot open shared object file"
 msgstr "無法開啟共用物件"
 
-#: elf/dl-load.h:128
+#: elf/dl-load.h:129
 msgid "failed to map segment from shared object"
 msgstr "從共用物件中對映區段失敗"
 
-#: elf/dl-load.h:132
+#: elf/dl-load.h:133
 msgid "cannot map zero-fill pages"
 msgstr "無法對應以零填滿的分頁區"
 
-#: elf/dl-lookup.c:876
+#: elf/dl-lookup.c:881
 msgid "symbol lookup error"
 msgstr "符號查找錯誤"
 
-#: elf/dl-open.c:80
+#: elf/dl-open.c:84
 msgid "cannot extend global scope"
 msgstr "無法延展全域變數的作用域"
 
-#: elf/dl-open.c:401
+#: elf/dl-open.c:405
 msgid "TLS generation counter wrapped!  Please report this."
 msgstr "TLS 產生計數器被轉換執行! 請報告這個情況。"
 
-#: elf/dl-open.c:814
+#: elf/dl-open.c:737
+msgid "cannot allocate address lookup data"
+msgstr "無法配置地址查詢資料"
+
+#: elf/dl-open.c:827
 msgid "invalid mode for dlopen()"
 msgstr "無效的 dlopen() 模式"
 
-#: elf/dl-open.c:831
+#: elf/dl-open.c:844
 msgid "no more namespaces available for dlmopen()"
 msgstr "無更多命名空間可見於 dlmopen ()"
 
-#: elf/dl-open.c:855
+#: elf/dl-open.c:868
 msgid "invalid target namespace in dlmopen()"
 msgstr "dlmopen() 中的無效目標命名空間"
 
@@ -671,20 +704,20 @@ msgstr "dlmopen() 中的無效目標命名空間"
 msgid "cannot allocate memory in static TLS block"
 msgstr "無法在靜態 TLS 區塊中配置記憶體"
 
-#: elf/dl-reloc.c:233
+#: elf/dl-reloc.c:275
 msgid "cannot make segment writable for relocation"
 msgstr "在重新定址以後無法將區段設為可寫入狀態"
 
-#: elf/dl-reloc.c:293
+#: elf/dl-reloc.c:306
 #, c-format
 msgid "%s: out of memory to store relocation results for %s\n"
 msgstr "%s: 記憶體不足以儲存重定址結果用於 %s\n"
 
-#: elf/dl-reloc.c:309
+#: elf/dl-reloc.c:322
 msgid "cannot restore segment prot after reloc"
 msgstr "在 reloc 之後無法復原 segment prot"
 
-#: elf/dl-reloc.c:340
+#: elf/dl-reloc.c:353
 msgid "cannot apply additional memory protection after relocation"
 msgstr "重定址之後無法套用額外記憶體保護"
 
@@ -696,224 +729,234 @@ msgstr "程式碼所使用的 RTLD_NEXT 沒有動態載入"
 msgid "cannot create TLS data structures"
 msgstr "無法建立 TLS 資料結構"
 
-#: elf/dl-version.c:148
+#: elf/dl-version.c:147
 msgid "version lookup error"
 msgstr "版本查找錯誤"
 
-#: elf/dl-version.c:279
+#: elf/dl-version.c:278
 msgid "cannot allocate version reference table"
 msgstr "無法配置版本參照表"
 
-#: elf/ldconfig.c:151
+#: elf/ldconfig.c:150
 msgid "Print cache"
 msgstr "印出快取"
 
-#: elf/ldconfig.c:152
+#: elf/ldconfig.c:151
 msgid "Generate verbose messages"
 msgstr "產生更多的訊息"
 
-#: elf/ldconfig.c:153
+#: elf/ldconfig.c:152
 msgid "Don't build cache"
 msgstr "不建立快取"
 
-#: elf/ldconfig.c:154
+#: elf/ldconfig.c:153
 msgid "Don't update symbolic links"
 msgstr "不要更新符號連結"
 
-#: elf/ldconfig.c:155
+#: elf/ldconfig.c:154
 msgid "Change to and use ROOT as root directory"
 msgstr "變換到 ROOT 目錄並以它做為根目錄"
 
-#: elf/ldconfig.c:155
+#: elf/ldconfig.c:154
 msgid "ROOT"
 msgstr "ROOT"
 
-#: elf/ldconfig.c:156
+#: elf/ldconfig.c:155
 msgid "CACHE"
 msgstr "CACHE"
 
-#: elf/ldconfig.c:156
+#: elf/ldconfig.c:155
 msgid "Use CACHE as cache file"
 msgstr "使用 CACHE 當作快取檔案"
 
-#: elf/ldconfig.c:157
+#: elf/ldconfig.c:156
 msgid "CONF"
 msgstr "CONF"
 
-#: elf/ldconfig.c:157
+#: elf/ldconfig.c:156
 msgid "Use CONF as configuration file"
 msgstr "使用 CONF 當作設定檔"
 
-#: elf/ldconfig.c:158
+#: elf/ldconfig.c:157
 msgid "Only process directories specified on the command line.  Don't build cache."
 msgstr "只處理在指令列引數中有指定的目錄,不建立快取檔案。"
 
-#: elf/ldconfig.c:159
+#: elf/ldconfig.c:158
 msgid "Manually link individual libraries."
 msgstr "手動個別連結函式庫"
 
-#: elf/ldconfig.c:160
+#: elf/ldconfig.c:159
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: elf/ldconfig.c:160
+#: elf/ldconfig.c:159
 msgid "Format to use: new (default), old, or compat"
 msgstr "要使用的格式:new (預設值)、old 或 compat"
 
-#: elf/ldconfig.c:161
+#: elf/ldconfig.c:160
 msgid "Ignore auxiliary cache file"
 msgstr "忽略輔助設備快取檔案"
 
-#: elf/ldconfig.c:169
+#: elf/ldconfig.c:168
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr "設定執行時期動態連接"
 
-#: elf/ldconfig.c:372
+#: elf/ldconfig.c:371
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "路徑 `%s' 使用超過一次"
 
-#: elf/ldconfig.c:373
+#: elf/ldconfig.c:372
 #, c-format
 msgid "(from %s:%d and %s:%d)\n"
 msgstr "(自 %s:%d 和 %s:%d)\n"
 
-#: elf/ldconfig.c:488
+#: elf/ldconfig.c:404 elf/ldconfig.c:445
+#, c-format
+msgid "Could not form glibc-hwcaps path"
+msgstr "無法建構 glibc-hwcaps 路徑"
+
+#: elf/ldconfig.c:418
+#, c-format
+msgid "Listing directory %s"
+msgstr "列出目錄 %s"
+
+#: elf/ldconfig.c:487
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s 不是一個已知的函式庫型態"
 
-#: elf/ldconfig.c:516
+#: elf/ldconfig.c:519
 #, c-format
 msgid "Can't stat %s"
 msgstr "無法 stat %s"
 
-#: elf/ldconfig.c:597
+#: elf/ldconfig.c:600
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "無法 stat %s\n"
 
-#: elf/ldconfig.c:607
+#: elf/ldconfig.c:610
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s 不是一個符號連接檔\n"
 
-#: elf/ldconfig.c:626
+#: elf/ldconfig.c:629
 #, c-format
 msgid "Can't unlink %s"
 msgstr "無法取消連結 %s"
 
-#: elf/ldconfig.c:632
+#: elf/ldconfig.c:635
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "無法從 %s 連結到 %s"
 
-#: elf/ldconfig.c:638
+#: elf/ldconfig.c:641
 msgid " (changed)\n"
 msgstr " (已改變)\n"
 
-#: elf/ldconfig.c:640
+#: elf/ldconfig.c:643
 msgid " (SKIPPED)\n"
 msgstr " (已忽略)\n"
 
-#: elf/ldconfig.c:696
+#: elf/ldconfig.c:699
 #, c-format
 msgid "Can't find %s"
 msgstr "找不到 %s"
 
-#: elf/ldconfig.c:712 elf/ldconfig.c:892 elf/ldconfig.c:952 elf/ldconfig.c:984
+#: elf/ldconfig.c:715 elf/ldconfig.c:895 elf/ldconfig.c:955 elf/ldconfig.c:987
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "無法 lstat %s"
 
-#: elf/ldconfig.c:718
+#: elf/ldconfig.c:721
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "忽略檔案 %s 因為它不是一個正常的檔案。"
 
-#: elf/ldconfig.c:726
+#: elf/ldconfig.c:729
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "由於找不到 %s 的共用物件名稱,連結並未被建立"
 
-#: elf/ldconfig.c:801
+#: elf/ldconfig.c:804
 #, c-format
 msgid " (from %s:%d)\n"
 msgstr " (自 %s:%d)\n"
 
-#: elf/ldconfig.c:825
+#: elf/ldconfig.c:828
 #, c-format
 msgid "Can't open directory %s"
 msgstr "無法開啟目錄 %s"
 
-#: elf/ldconfig.c:910 elf/ldconfig.c:972 elf/readlib.c:98
+#: elf/ldconfig.c:913 elf/ldconfig.c:975 elf/readlib.c:96
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "輸入檔 %s 找不到。\n"
 
-#: elf/ldconfig.c:917
+#: elf/ldconfig.c:920
 #, c-format
 msgid "Cannot stat %s"
 msgstr "無法顯示狀態 %s"
 
-#: elf/ldconfig.c:1070
+#: elf/ldconfig.c:1073
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "libc5 函式庫 %s 擺錯目錄了"
 
-#: elf/ldconfig.c:1073
+#: elf/ldconfig.c:1076
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "libc6 函式庫 %s 擺錯目錄了"
 
-#: elf/ldconfig.c:1076
+#: elf/ldconfig.c:1079
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "libc4 函式庫 %s 擺錯目錄了"
 
-#: elf/ldconfig.c:1104
+#: elf/ldconfig.c:1107
 #, c-format
 msgid "libraries %s and %s in directory %s have same soname but different type."
 msgstr "函式庫 %s 跟 %s (在目錄 %s 底下) 有共同的共用函式庫名稱,不過其格式卻不同"
 
-#: elf/ldconfig.c:1234
+#: elf/ldconfig.c:1237
 #, c-format
 msgid "Warning: ignoring configuration file that cannot be opened: %s"
 msgstr "警告:正在忽略無法開啟的組態檔案:%s"
 
-#: elf/ldconfig.c:1282
+#: elf/ldconfig.c:1285
 #, c-format
 msgid "%s:%u: hwcap directive ignored"
 msgstr "%s:%u: 忽略 hwcap 指示詞"
 
-#: elf/ldconfig.c:1301
+#: elf/ldconfig.c:1304
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr "需要絕對檔案名稱用於組態檔案時正在使用 -r"
 
-#: elf/ldconfig.c:1308 locale/programs/xasprintf.c:31
+#: elf/ldconfig.c:1311 locale/programs/xasprintf.c:31
 #: locale/programs/xmalloc.c:63 malloc/obstack.c:416 malloc/obstack.c:418
 #: posix/getconf.c:458 posix/getconf.c:697
 #, c-format
 msgid "memory exhausted"
 msgstr "記憶體用盡"
 
-#: elf/ldconfig.c:1341
+#: elf/ldconfig.c:1344
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr "%s:%u: 無法讀取目錄 %s"
 
-#: elf/ldconfig.c:1389
+#: elf/ldconfig.c:1392
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr "用來建置快取的相對路徑 `%s'"
 
-#: elf/ldconfig.c:1413
+#: elf/ldconfig.c:1416
 #, c-format
 msgid "Can't chdir to /"
 msgstr "無法變更目錄到 /"
 
-#: elf/ldconfig.c:1454
+#: elf/ldconfig.c:1457
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "無法開啟快取檔案目錄 %s\n"
@@ -983,155 +1026,155 @@ msgstr "離開的與不明的離開代碼"
 msgid "error: you do not have read permission for"
 msgstr "錯誤:您沒有讀取許可權用於"
 
-#: elf/pldd-xx.c:102
+#: elf/pldd-xx.c:101
 #, c-format
 msgid "cannot find program header of process"
 msgstr "找不到行程的程式標頭"
 
-#: elf/pldd-xx.c:106
+#: elf/pldd-xx.c:105
 #, c-format
 msgid "cannot read program header"
 msgstr "無法讀取程式標頭"
 
-#: elf/pldd-xx.c:128
+#: elf/pldd-xx.c:127
 #, c-format
 msgid "cannot read dynamic section"
 msgstr "無法讀取動態區段"
 
-#: elf/pldd-xx.c:137
+#: elf/pldd-xx.c:136
 #, c-format
 msgid "cannot read r_debug"
 msgstr "無法讀取 r_debug"
 
-#: elf/pldd-xx.c:154
+#: elf/pldd-xx.c:153
 #, c-format
 msgid "cannot read program interpreter"
 msgstr "無法讀取程式解譯器"
 
-#: elf/pldd-xx.c:183
+#: elf/pldd-xx.c:182
 #, c-format
 msgid "cannot read link map"
 msgstr "無法讀取鏈結映射"
 
-#: elf/pldd-xx.c:190
+#: elf/pldd-xx.c:189
 #, c-format
 msgid "cannot read object name"
 msgstr "無法讀取物件名稱"
 
-#: elf/pldd-xx.c:197
+#: elf/pldd-xx.c:196
 #, c-format
 msgid "cannot allocate buffer for object name"
 msgstr "無法為物件名稱分配緩衝區"
 
-#: elf/pldd.c:58
+#: elf/pldd.c:57
 msgid "List dynamic shared objects loaded into process."
 msgstr "列出已載入行程中的動態共用物件。"
 
-#: elf/pldd.c:62
+#: elf/pldd.c:61
 msgid "PID"
 msgstr "行程識別號"
 
-#: elf/pldd.c:89
+#: elf/pldd.c:88
 #, c-format
 msgid "Exactly one parameter with process ID required.\n"
 msgstr "需要剛好一個附有行程識別號的參數。\n"
 
-#: elf/pldd.c:103
+#: elf/pldd.c:102
 #, c-format
 msgid "invalid process ID '%s'"
 msgstr "無效的行程識別號 %s"
 
-#: elf/pldd.c:111
+#: elf/pldd.c:110
 #, c-format
 msgid "cannot open %s"
 msgstr "無法開啟 %s"
 
-#: elf/pldd.c:142
+#: elf/pldd.c:141
 #, c-format
 msgid "cannot open %s/task"
 msgstr "無法開啟 %s/任務"
 
-#: elf/pldd.c:145
+#: elf/pldd.c:144
 #, c-format
 msgid "cannot prepare reading %s/task"
 msgstr "無法準備讀取 %s/任務"
 
-#: elf/pldd.c:158
+#: elf/pldd.c:157
 #, c-format
 msgid "invalid thread ID '%s'"
 msgstr "無效的執行緒識別號 %s"
 
-#: elf/pldd.c:169
+#: elf/pldd.c:168
 #, c-format
 msgid "cannot attach to process %lu"
 msgstr "無法附加到行程 %lu"
 
-#: elf/pldd.c:184
+#: elf/pldd.c:183
 #, c-format
 msgid "no valid %s/task entries"
 msgstr "沒有有效的 %s/作業項目"
 
-#: elf/pldd.c:290
+#: elf/pldd.c:289
 #, c-format
 msgid "cannot get information about process %lu"
 msgstr "無法獲得行程 %lu 的相關資訊"
 
-#: elf/pldd.c:303
+#: elf/pldd.c:302
 #, c-format
 msgid "process %lu is no ELF program"
 msgstr "行程 %lu 並非 ELF 程式"
 
-#: elf/readelflib.c:36
+#: elf/readelflib.c:34
 #, c-format
 msgid "file %s is truncated\n"
 msgstr "檔案 %s 已截短\n"
 
-#: elf/readelflib.c:67
+#: elf/readelflib.c:65
 #, c-format
 msgid "%s is a 32 bit ELF file.\n"
 msgstr "%s 是一個 32 位元的 ELF 檔案。\n"
 
-#: elf/readelflib.c:69
+#: elf/readelflib.c:67
 #, c-format
 msgid "%s is a 64 bit ELF file.\n"
 msgstr "%s 是一個 64 位元的 ELF 檔案。\n"
 
-#: elf/readelflib.c:71
+#: elf/readelflib.c:69
 #, c-format
 msgid "Unknown ELFCLASS in file %s.\n"
 msgstr "檔案 %s 中未知的 ELFCLASS。\n"
 
-#: elf/readelflib.c:78
+#: elf/readelflib.c:76
 #, c-format
 msgid "%s is not a shared object file (Type: %d).\n"
 msgstr "%s 不是一個共用物件 (型態: %d)。\n"
 
-#: elf/readelflib.c:106
+#: elf/readelflib.c:104
 #, c-format
 msgid "more than one dynamic segment\n"
 msgstr "超過一個的動態區段\n"
 
-#: elf/readlib.c:104
+#: elf/readlib.c:102
 #, c-format
 msgid "Cannot fstat file %s.\n"
 msgstr "無法 fstat 檔案 %s。\n"
 
-#: elf/readlib.c:115
+#: elf/readlib.c:113
 #, c-format
 msgid "File %s is empty, not checked."
 msgstr "檔案 %s 為空,不做檢查。"
 
-#: elf/readlib.c:121
+#: elf/readlib.c:119
 #, c-format
 msgid "File %s is too small, not checked."
 msgstr "檔案 %s 太小,不做檢查。"
 
-#: elf/readlib.c:131
+#: elf/readlib.c:129
 #, c-format
 msgid "Cannot mmap file %s.\n"
 msgstr "無法 mmap 檔案 %s。\n"
 
-#: elf/readlib.c:170
+#: elf/readlib.c:168
 #, c-format
 msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
 msgstr "%s 不是一個 ELF 檔 - 其開頭的魔術位元組是錯的。\n"
@@ -1236,252 +1279,267 @@ msgstr ""
 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:433
+#: elf/sprof.c:432
 #, c-format
 msgid "failed to load shared object `%s'"
 msgstr "開啟共用物件 `%s' 失敗"
 
-#: elf/sprof.c:442 elf/sprof.c:825 elf/sprof.c:923
+#: elf/sprof.c:441 elf/sprof.c:824 elf/sprof.c:922
 #, c-format
 msgid "cannot create internal descriptor"
 msgstr "無法建立內部敘述項"
 
-#: elf/sprof.c:554
+#: elf/sprof.c:553
 #, c-format
 msgid "Reopening shared object `%s' failed"
 msgstr "重新開啟共用物件 %s 失敗"
 
-#: elf/sprof.c:561 elf/sprof.c:656
+#: elf/sprof.c:560 elf/sprof.c:655
 #, c-format
 msgid "reading of section headers failed"
 msgstr "讀取小節標頭時失敗"
 
-#: elf/sprof.c:569 elf/sprof.c:664
+#: elf/sprof.c:568 elf/sprof.c:663
 #, c-format
 msgid "reading of section header string table failed"
 msgstr "讀取小節標頭字串表格時失敗"
 
-#: elf/sprof.c:595
+#: elf/sprof.c:594
 #, c-format
 msgid "*** Cannot read debuginfo file name: %m\n"
 msgstr "*** 無法讀取除錯資訊檔案名稱:%m\n"
 
-#: elf/sprof.c:616
+#: elf/sprof.c:615
 #, c-format
 msgid "cannot determine file name"
 msgstr "無法決定檔案名稱"
 
-#: elf/sprof.c:649
+#: elf/sprof.c:648
 #, c-format
 msgid "reading of ELF header failed"
 msgstr "讀取 ELF 標頭時失敗"
 
-#: elf/sprof.c:685
+#: elf/sprof.c:684
 #, c-format
 msgid "*** The file `%s' is stripped: no detailed analysis possible\n"
 msgstr "*** 檔案 `%s' 被裁剪了: 無法做詳細的分析\n"
 
-#: elf/sprof.c:715
+#: elf/sprof.c:714
 #, c-format
 msgid "failed to load symbol data"
 msgstr "載入函式符號資料失敗"
 
-#: elf/sprof.c:780
+#: elf/sprof.c:779
 #, c-format
 msgid "cannot load profiling data"
 msgstr "無法載入測試資料"
 
-#: elf/sprof.c:789
+#: elf/sprof.c:788
 #, c-format
 msgid "while stat'ing profiling data file"
 msgstr "在對測試資料檔案進行統計的時候"
 
-#: elf/sprof.c:797
+#: elf/sprof.c:796
 #, c-format
 msgid "profiling data file `%s' does not match shared object `%s'"
 msgstr "測試資料檔 `%s' 與共用物件 `%s' 不符合"
 
-#: elf/sprof.c:808
+#: elf/sprof.c:807
 #, c-format
 msgid "failed to mmap the profiling data file"
 msgstr "測試資料檔案 mmap 失敗"
 
-#: elf/sprof.c:816
+#: elf/sprof.c:815
 #, c-format
 msgid "error while closing the profiling data file"
 msgstr "正在關閉測試資料檔案時發生錯誤"
 
-#: elf/sprof.c:899
+#: elf/sprof.c:898
 #, c-format
 msgid "`%s' is no correct profile data file for `%s'"
 msgstr "`%s' 不是 `%s' 中正確的測速評估資料檔"
 
-#: elf/sprof.c:1080 elf/sprof.c:1138
+#: elf/sprof.c:1079 elf/sprof.c:1137
 #, c-format
 msgid "cannot allocate symbol data"
 msgstr "無法配置函式符號資料"
 
-#: iconv/iconv_charmap.c:147 iconv/iconv_prog.c:428
+#: elf/stringtable.c:90
+#, c-format
+msgid "String table string is too long"
+msgstr "字串表的字串過長"
+
+#: elf/stringtable.c:103
+#, c-format
+msgid "String table has too many entries"
+msgstr "字串表項目過多"
+
+#: elf/stringtable.c:188 elf/stringtable.c:196
+#, c-format
+msgid "String table is too large"
+msgstr "字串表過大"
+
+#: iconv/iconv_charmap.c:146 iconv/iconv_prog.c:427
 #, c-format
 msgid "cannot open output file"
 msgstr "無法開啟輸出檔"
 
-#: iconv/iconv_charmap.c:193 iconv/iconv_prog.c:291
+#: iconv/iconv_charmap.c:192 iconv/iconv_prog.c:290
 #, c-format
 msgid "error while closing input `%s'"
 msgstr "正在關閉輸入 `%s' 的時候發生錯誤"
 
-#: iconv/iconv_charmap.c:442
+#: iconv/iconv_charmap.c:443
 #, c-format
 msgid "illegal input sequence at position %Zd"
 msgstr "位置 %Zd 有不合法的輸入序列"
 
-#: iconv/iconv_charmap.c:461 iconv/iconv_prog.c:519
+#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:518
 #, c-format
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr "緩衝區結尾有不完全的字元或 shift sequence"
 
-#: iconv/iconv_charmap.c:506 iconv/iconv_charmap.c:542 iconv/iconv_prog.c:562
-#: iconv/iconv_prog.c:598
+#: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:543 iconv/iconv_prog.c:561
+#: iconv/iconv_prog.c:597
 #, c-format
 msgid "error while reading the input"
 msgstr "正在讀入資料的時候發生錯誤"
 
-#: iconv/iconv_charmap.c:524 iconv/iconv_prog.c:580
+#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:579
 #, 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:124
+#: iconv/iconv_prog.c:64 locale/programs/localedef.c:123
 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/iconvconfig.c:129
-#: locale/programs/localedef.c:117 locale/programs/localedef.c:119
-#: locale/programs/localedef.c:121 locale/programs/localedef.c:150
-#: malloc/memusagestat.c:56
+#: iconv/iconv_prog.c:66 iconv/iconvconfig.c:128
+#: locale/programs/localedef.c:116 locale/programs/localedef.c:118
+#: locale/programs/localedef.c:120 locale/programs/localedef.c:149
+#: malloc/memusagestat.c:55
 msgid "FILE"
 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…]"
 
-#: iconv/iconv_prog.c:177 iconv/iconv_prog.c:239
+#: iconv/iconv_prog.c:176 iconv/iconv_prog.c:238
 #, c-format
 msgid "failed to start conversion processing"
 msgstr "開始轉換程序失敗"
 
-#: iconv/iconv_prog.c:213
+#: iconv/iconv_prog.c:212
 #, c-format
 msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "不支援從 `%s' 以及到 `%s' 的轉換"
 
-#: iconv/iconv_prog.c:218
+#: iconv/iconv_prog.c:217
 #, c-format
 msgid "conversion from `%s' is not supported"
 msgstr "不支援從 `%s' 的轉換"
 
-#: iconv/iconv_prog.c:225
+#: iconv/iconv_prog.c:224
 #, c-format
 msgid "conversion to `%s' is not supported"
 msgstr "不支援到 `%s' 的轉換"
 
-#: iconv/iconv_prog.c:229
+#: iconv/iconv_prog.c:228
 #, c-format
 msgid "conversion from `%s' to `%s' is not supported"
 msgstr "不支援從 `%s' 到 `%s' 的轉換"
 
-#: iconv/iconv_prog.c:337
+#: iconv/iconv_prog.c:336
 #, c-format
 msgid "error while closing output file"
 msgstr "正在關閉輸出檔案的時候發生錯誤"
 
-#: iconv/iconv_prog.c:438
+#: iconv/iconv_prog.c:437
 #, c-format
 msgid "conversion stopped due to problem in writing the output"
 msgstr "因寫入輸出時發生錯誤而導致轉換停止"
 
-#: iconv/iconv_prog.c:515
+#: iconv/iconv_prog.c:514
 #, c-format
 msgid "illegal input sequence at position %ld"
 msgstr "位置 %ld 有不合法的輸入序列"
 
-#: iconv/iconv_prog.c:523
+#: iconv/iconv_prog.c:522
 #, c-format
 msgid "internal error (illegal descriptor)"
 msgstr "內部錯誤 (不合法的敘述項)"
 
-#: iconv/iconv_prog.c:526
+#: iconv/iconv_prog.c:525
 #, c-format
 msgid "unknown iconv() error %d"
 msgstr "不明的 iconv() 錯誤 %d"
 
-#: iconv/iconv_prog.c:769
+#: iconv/iconv_prog.c:768
 msgid ""
 "The following list contains all the coded character sets known.  This does\n"
 "not necessarily mean that all combinations of these names can be used for\n"
@@ -1496,46 +1554,46 @@ 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 "[目錄…]"
 
-#: iconv/iconvconfig.c:127 locale/programs/localedef.c:129
+#: iconv/iconvconfig.c:126 locale/programs/localedef.c:128
 msgid "PATH"
 msgstr "路徑"
 
-#: iconv/iconvconfig.c:128
+#: iconv/iconvconfig.c:127
 msgid "Prefix used for all file accesses"
 msgstr "使用於所有檔案存取時的前置文字"
 
-#: iconv/iconvconfig.c:129
+#: iconv/iconvconfig.c:128
 msgid "Put output in FILE instead of installed location (--prefix does not apply to FILE)"
 msgstr "在 FILE 中置放輸出以代替已安裝的位置 (--prefix 不套用到 FILE)"
 
-#: iconv/iconvconfig.c:133
+#: iconv/iconvconfig.c:132
 msgid "Do not search standard directories, only those on the command line"
 msgstr "不搜尋標準目錄,只有那些在之上指令列"
 
-#: iconv/iconvconfig.c:301
+#: iconv/iconvconfig.c:300
 #, c-format
 msgid "Directory arguments required when using --nostdlib"
 msgstr "目錄引數必要項時正在使用 --nostdlib"
 
-#: iconv/iconvconfig.c:343
+#: iconv/iconvconfig.c:342
 #, c-format
 msgid "no output file produced because warnings were issued"
 msgstr "因為發出過警告訊息,所以沒有製造任何輸出檔"
 
-#: iconv/iconvconfig.c:432
+#: iconv/iconvconfig.c:431
 #, c-format
 msgid "while inserting in search tree"
 msgstr "當插入於搜尋樹之中"
 
-#: iconv/iconvconfig.c:1188
+#: iconv/iconvconfig.c:1195
 #, c-format
 msgid "cannot generate output file"
 msgstr "無法產生輸出檔"
@@ -1627,966 +1685,966 @@ msgstr "未知的 .netrc 關鍵字 %s"
 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:196
+#: locale/programs/charmap.c:195
 #, c-format
 msgid "default character map file `%s' not found"
 msgstr "找不到預設的字集對照檔 `%s'"
 
-#: locale/programs/charmap.c:265
+#: locale/programs/charmap.c:264
 #, c-format
 msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant [--no-warnings=ascii]"
 msgstr "「%s」字元映射不相容 ASCII,語系不符合 ISO C 的規範 [--no-warnings=ascii]"
 
-#: locale/programs/charmap.c:343
+#: locale/programs/charmap.c:342
 #, 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:363 locale/programs/charmap.c:380
-#: locale/programs/repertoire.c:173
+#: locale/programs/charmap.c:362 locale/programs/charmap.c:379
+#: locale/programs/repertoire.c:172
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "prolog 中有語法錯誤: %s"
 
-#: locale/programs/charmap.c:364
+#: locale/programs/charmap.c:363
 msgid "invalid definition"
 msgstr "無效的定義"
 
-#: locale/programs/charmap.c:381 locale/programs/locfile.c:131
-#: locale/programs/locfile.c:158 locale/programs/repertoire.c:174
+#: locale/programs/charmap.c:380 locale/programs/locfile.c:130
+#: locale/programs/locfile.c:157 locale/programs/repertoire.c:173
 msgid "bad argument"
 msgstr "錯誤的引數"
 
-#: locale/programs/charmap.c:408
+#: locale/programs/charmap.c:407
 #, c-format
 msgid "duplicate definition of <%s>"
 msgstr "<%s> 的定義重複了"
 
-#: locale/programs/charmap.c:415
+#: locale/programs/charmap.c:414
 #, c-format
 msgid "value for <%s> must be 1 or greater"
 msgstr "<%s> 的值必須為 1 或者更大"
 
-#: locale/programs/charmap.c:427
+#: locale/programs/charmap.c:426
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "<%s> 的值必須等於或大於 <%s> 的值"
 
-#: locale/programs/charmap.c:450 locale/programs/repertoire.c:182
+#: locale/programs/charmap.c:449 locale/programs/repertoire.c:181
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "給 <%s> 的引數必須是一個單字元"
 
-#: locale/programs/charmap.c:476
+#: locale/programs/charmap.c:475
 msgid "character sets with locking states are not supported"
 msgstr "不支援使用 locking 狀態的字元集"
 
-#: locale/programs/charmap.c:503 locale/programs/charmap.c:557
-#: locale/programs/charmap.c:589 locale/programs/charmap.c:683
-#: locale/programs/charmap.c:739 locale/programs/charmap.c:780
-#: locale/programs/charmap.c:821
+#: locale/programs/charmap.c:502 locale/programs/charmap.c:556
+#: locale/programs/charmap.c:588 locale/programs/charmap.c:682
+#: locale/programs/charmap.c:738 locale/programs/charmap.c:779
+#: locale/programs/charmap.c:820
 #, c-format
 msgid "syntax error in %s definition: %s"
 msgstr "定義 %s 的語法錯誤: %s"
 
-#: locale/programs/charmap.c:504 locale/programs/charmap.c:684
-#: locale/programs/charmap.c:781 locale/programs/repertoire.c:229
+#: locale/programs/charmap.c:503 locale/programs/charmap.c:683
+#: locale/programs/charmap.c:780 locale/programs/repertoire.c:228
 msgid "no symbolic name given"
 msgstr "沒有給予符號名稱"
 
-#: locale/programs/charmap.c:558
+#: locale/programs/charmap.c:557
 msgid "invalid encoding given"
 msgstr "給予的編碼是無效的"
 
-#: locale/programs/charmap.c:567
+#: locale/programs/charmap.c:566
 msgid "too few bytes in character encoding"
 msgstr "字元定義中的位元組太少了"
 
-#: locale/programs/charmap.c:569
+#: locale/programs/charmap.c:568
 msgid "too many bytes in character encoding"
 msgstr "字元定義中的位元組太多了"
 
-#: locale/programs/charmap.c:591 locale/programs/charmap.c:740
-#: locale/programs/charmap.c:823 locale/programs/repertoire.c:295
+#: locale/programs/charmap.c:590 locale/programs/charmap.c:739
+#: locale/programs/charmap.c:822 locale/programs/repertoire.c:294
 msgid "no symbolic name given for end of range"
 msgstr "沒有給此區的最後一個字元符號名稱"
 
-#: locale/programs/charmap.c:615 locale/programs/ld-address.c:524
-#: locale/programs/ld-collate.c:2619 locale/programs/ld-collate.c:3777
-#: locale/programs/ld-ctype.c:2118 locale/programs/ld-ctype.c:2830
-#: locale/programs/ld-identification.c:397 locale/programs/ld-measurement.c:213
-#: locale/programs/ld-messages.c:295 locale/programs/ld-monetary.c:748
-#: locale/programs/ld-name.c:262 locale/programs/ld-numeric.c:325
-#: locale/programs/ld-paper.c:212 locale/programs/ld-telephone.c:276
-#: locale/programs/ld-time.c:959 locale/programs/repertoire.c:312
+#: locale/programs/charmap.c:614 locale/programs/ld-address.c:523
+#: locale/programs/ld-collate.c:2642 locale/programs/ld-collate.c:3806
+#: locale/programs/ld-ctype.c:2117 locale/programs/ld-ctype.c:2829
+#: locale/programs/ld-identification.c:396 locale/programs/ld-measurement.c:212
+#: locale/programs/ld-messages.c:294 locale/programs/ld-monetary.c:747
+#: locale/programs/ld-name.c:261 locale/programs/ld-numeric.c:324
+#: locale/programs/ld-paper.c:211 locale/programs/ld-telephone.c:275
+#: locale/programs/ld-time.c:958 locale/programs/repertoire.c:311
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
 msgstr "%1$s: 定義並沒有以 `END %1$s' 做為結束"
 
-#: locale/programs/charmap.c:648
+#: locale/programs/charmap.c:647
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr "只有 WIDTH 定義才能直接寫在 CHARMAP 定義之後"
 
-#: locale/programs/charmap.c:656 locale/programs/charmap.c:720
+#: locale/programs/charmap.c:655 locale/programs/charmap.c:719
 #, c-format
 msgid "value for %s must be an integer"
 msgstr "%s 的值必須是整數才行"
 
-#: locale/programs/charmap.c:848
+#: locale/programs/charmap.c:847
 #, c-format
 msgid "%s: error in state machine"
 msgstr "%s: 狀態機錯誤"
 
-#: locale/programs/charmap.c:856 locale/programs/ld-address.c:540
-#: locale/programs/ld-collate.c:2616 locale/programs/ld-collate.c:3970
-#: locale/programs/ld-ctype.c:2115 locale/programs/ld-ctype.c:2847
-#: locale/programs/ld-identification.c:413 locale/programs/ld-measurement.c:229
-#: locale/programs/ld-messages.c:311 locale/programs/ld-monetary.c:764
-#: locale/programs/ld-name.c:278 locale/programs/ld-numeric.c:341
-#: locale/programs/ld-paper.c:228 locale/programs/ld-telephone.c:292
-#: locale/programs/ld-time.c:990 locale/programs/locfile.c:1010
-#: locale/programs/repertoire.c:323
+#: locale/programs/charmap.c:855 locale/programs/ld-address.c:539
+#: locale/programs/ld-collate.c:2639 locale/programs/ld-collate.c:3999
+#: locale/programs/ld-ctype.c:2114 locale/programs/ld-ctype.c:2846
+#: locale/programs/ld-identification.c:412 locale/programs/ld-measurement.c:228
+#: locale/programs/ld-messages.c:310 locale/programs/ld-monetary.c:763
+#: locale/programs/ld-name.c:277 locale/programs/ld-numeric.c:340
+#: locale/programs/ld-paper.c:227 locale/programs/ld-telephone.c:291
+#: locale/programs/ld-time.c:989 locale/programs/locfile.c:1009
+#: locale/programs/repertoire.c:322
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s: 未完成已達檔案的末尾"
 
-#: locale/programs/charmap.c:875 locale/programs/charmap.c:886
+#: locale/programs/charmap.c:874 locale/programs/charmap.c:885
 #, c-format
 msgid "unknown character `%s'"
 msgstr "不明的字元 `%s'"
 
-#: locale/programs/charmap.c:894
+#: locale/programs/charmap.c:893
 #, c-format
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
 msgstr "在範圍起始與結束的位元組序列中,位元組的數目並不一致: %d vs %d"
 
-#: locale/programs/charmap.c:999 locale/programs/ld-collate.c:2896
-#: locale/programs/repertoire.c:418
+#: locale/programs/charmap.c:998 locale/programs/ld-collate.c:2923
+#: locale/programs/repertoire.c:417
 msgid "invalid names for character range"
 msgstr "無效的字元範圍名稱"
 
-#: locale/programs/charmap.c:1011 locale/programs/repertoire.c:430
+#: locale/programs/charmap.c:1010 locale/programs/repertoire.c:429
 msgid "hexadecimal range format should use only capital characters"
 msgstr "在表示十六進位的範圍時只能用大寫的英文字母表示"
 
-#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:448
+#: locale/programs/charmap.c:1028 locale/programs/repertoire.c:447
 #, c-format
 msgid "<%s> and <%s> are invalid names for range"
 msgstr "<%s> 以及 <%s> 是不適用的範圍名稱"
 
-#: locale/programs/charmap.c:1035 locale/programs/repertoire.c:455
+#: locale/programs/charmap.c:1034 locale/programs/repertoire.c:454
 msgid "upper limit in range is smaller than lower limit"
 msgstr "範圍中上限小於下限"
 
-#: locale/programs/charmap.c:1093
+#: locale/programs/charmap.c:1092
 msgid "resulting bytes for range not representable."
 msgstr "用來定義範圍的位元組無法被表述出來"
 
-#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1566
-#: locale/programs/ld-ctype.c:430 locale/programs/ld-identification.c:131
-#: locale/programs/ld-measurement.c:92 locale/programs/ld-messages.c:96
-#: locale/programs/ld-monetary.c:192 locale/programs/ld-name.c:93
-#: locale/programs/ld-numeric.c:97 locale/programs/ld-paper.c:89
-#: locale/programs/ld-telephone.c:92 locale/programs/ld-time.c:164
+#: locale/programs/ld-address.c:132 locale/programs/ld-collate.c:1570
+#: locale/programs/ld-ctype.c:429 locale/programs/ld-identification.c:130
+#: locale/programs/ld-measurement.c:91 locale/programs/ld-messages.c:95
+#: locale/programs/ld-monetary.c:191 locale/programs/ld-name.c:92
+#: locale/programs/ld-numeric.c:96 locale/programs/ld-paper.c:88
+#: locale/programs/ld-telephone.c:91 locale/programs/ld-time.c:163
 #, c-format
 msgid "No definition for %s category found"
 msgstr "找不到 %s 類別的定義"
 
-#: locale/programs/ld-address.c:144 locale/programs/ld-address.c:182
-#: locale/programs/ld-address.c:199 locale/programs/ld-address.c:228
-#: locale/programs/ld-address.c:300 locale/programs/ld-address.c:319
-#: locale/programs/ld-address.c:331 locale/programs/ld-identification.c:144
-#: locale/programs/ld-measurement.c:103 locale/programs/ld-monetary.c:204
-#: locale/programs/ld-monetary.c:258 locale/programs/ld-monetary.c:274
-#: locale/programs/ld-monetary.c:286 locale/programs/ld-name.c:104
-#: locale/programs/ld-name.c:141 locale/programs/ld-numeric.c:111
-#: locale/programs/ld-numeric.c:125 locale/programs/ld-paper.c:100
-#: locale/programs/ld-paper.c:109 locale/programs/ld-telephone.c:103
-#: locale/programs/ld-telephone.c:160 locale/programs/ld-time.c:180
-#: locale/programs/ld-time.c:201
+#: locale/programs/ld-address.c:143 locale/programs/ld-address.c:181
+#: locale/programs/ld-address.c:198 locale/programs/ld-address.c:227
+#: locale/programs/ld-address.c:299 locale/programs/ld-address.c:318
+#: locale/programs/ld-address.c:330 locale/programs/ld-identification.c:143
+#: locale/programs/ld-measurement.c:102 locale/programs/ld-monetary.c:203
+#: locale/programs/ld-monetary.c:257 locale/programs/ld-monetary.c:273
+#: locale/programs/ld-monetary.c:285 locale/programs/ld-name.c:103
+#: locale/programs/ld-name.c:140 locale/programs/ld-numeric.c:110
+#: locale/programs/ld-numeric.c:124 locale/programs/ld-paper.c:99
+#: locale/programs/ld-paper.c:108 locale/programs/ld-telephone.c:102
+#: locale/programs/ld-telephone.c:159 locale/programs/ld-time.c:179
+#: locale/programs/ld-time.c:200
 #, c-format
 msgid "%s: field `%s' not defined"
 msgstr "%s: 欄位 `%s' 沒有定義"
 
-#: locale/programs/ld-address.c:156 locale/programs/ld-address.c:207
-#: locale/programs/ld-address.c:237 locale/programs/ld-address.c:275
-#: locale/programs/ld-name.c:116 locale/programs/ld-telephone.c:115
+#: locale/programs/ld-address.c:155 locale/programs/ld-address.c:206
+#: locale/programs/ld-address.c:236 locale/programs/ld-address.c:274
+#: locale/programs/ld-name.c:115 locale/programs/ld-telephone.c:114
 #, c-format
 msgid "%s: field `%s' must not be empty"
 msgstr "%s: 欄位 `%s' 不可以空白"
 
-#: locale/programs/ld-address.c:168
+#: locale/programs/ld-address.c:167
 #, c-format
 msgid "%s: invalid escape `%%%c' sequence in field `%s'"
 msgstr "%s: 不適用的跳脫序列 `%%%c', 在欄位 `%s' 中"
 
-#: locale/programs/ld-address.c:218
+#: locale/programs/ld-address.c:217
 #, c-format
 msgid "%s: terminology language code `%s' not defined"
 msgstr "%s: 術語語言編碼 `%s' 未定義"
 
-#: locale/programs/ld-address.c:243
+#: locale/programs/ld-address.c:242
 #, c-format
 msgid "%s: field `%s' must not be defined"
 msgstr "%s: 欄位「%s」必須未被定義"
 
-#: locale/programs/ld-address.c:257 locale/programs/ld-address.c:286
+#: locale/programs/ld-address.c:256 locale/programs/ld-address.c:285
 #, c-format
 msgid "%s: language abbreviation `%s' not defined"
 msgstr "%s: 語言縮寫 `%s' 沒有定義"
 
-#: locale/programs/ld-address.c:264 locale/programs/ld-address.c:292
-#: locale/programs/ld-address.c:325 locale/programs/ld-address.c:337
+#: locale/programs/ld-address.c:263 locale/programs/ld-address.c:291
+#: locale/programs/ld-address.c:324 locale/programs/ld-address.c:336
 #, c-format
 msgid "%s: `%s' value does not match `%s' value"
 msgstr "%s: `%s' 值與 `%s' 值不符合"
 
-#: locale/programs/ld-address.c:311
+#: locale/programs/ld-address.c:310
 #, c-format
 msgid "%s: numeric country code `%d' not valid"
 msgstr "%s: 國家數字代碼 `%d' 錯誤"
 
-#: locale/programs/ld-address.c:432 locale/programs/ld-address.c:469
-#: locale/programs/ld-address.c:507 locale/programs/ld-ctype.c:2479
-#: locale/programs/ld-identification.c:309 locale/programs/ld-measurement.c:196
-#: locale/programs/ld-messages.c:264 locale/programs/ld-monetary.c:503
-#: locale/programs/ld-monetary.c:538 locale/programs/ld-monetary.c:579
-#: locale/programs/ld-name.c:235 locale/programs/ld-numeric.c:217
-#: locale/programs/ld-paper.c:195 locale/programs/ld-telephone.c:251
-#: locale/programs/ld-time.c:864 locale/programs/ld-time.c:906
+#: locale/programs/ld-address.c:431 locale/programs/ld-address.c:468
+#: locale/programs/ld-address.c:506 locale/programs/ld-ctype.c:2478
+#: locale/programs/ld-identification.c:308 locale/programs/ld-measurement.c:195
+#: locale/programs/ld-messages.c:263 locale/programs/ld-monetary.c:502
+#: locale/programs/ld-monetary.c:537 locale/programs/ld-monetary.c:578
+#: locale/programs/ld-name.c:234 locale/programs/ld-numeric.c:216
+#: locale/programs/ld-paper.c:194 locale/programs/ld-telephone.c:250
+#: locale/programs/ld-time.c:863 locale/programs/ld-time.c:905
 #, c-format
 msgid "%s: field `%s' declared more than once"
 msgstr "%s: `%s' 欄位不只一次地宣告"
 
-#: locale/programs/ld-address.c:436 locale/programs/ld-address.c:474
-#: locale/programs/ld-identification.c:313 locale/programs/ld-messages.c:274
-#: locale/programs/ld-monetary.c:507 locale/programs/ld-monetary.c:542
-#: locale/programs/ld-name.c:239 locale/programs/ld-numeric.c:221
-#: locale/programs/ld-telephone.c:255 locale/programs/ld-time.c:756
-#: locale/programs/ld-time.c:827 locale/programs/ld-time.c:869
+#: locale/programs/ld-address.c:435 locale/programs/ld-address.c:473
+#: locale/programs/ld-identification.c:312 locale/programs/ld-messages.c:273
+#: locale/programs/ld-monetary.c:506 locale/programs/ld-monetary.c:541
+#: locale/programs/ld-name.c:238 locale/programs/ld-numeric.c:220
+#: locale/programs/ld-telephone.c:254 locale/programs/ld-time.c:755
+#: locale/programs/ld-time.c:826 locale/programs/ld-time.c:868
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: 未知的字元在欄位 `%s' 中"
 
-#: locale/programs/ld-address.c:521 locale/programs/ld-collate.c:3775
-#: locale/programs/ld-ctype.c:2827 locale/programs/ld-identification.c:394
-#: locale/programs/ld-measurement.c:210 locale/programs/ld-messages.c:293
-#: locale/programs/ld-monetary.c:746 locale/programs/ld-name.c:260
-#: locale/programs/ld-numeric.c:323 locale/programs/ld-paper.c:210
-#: locale/programs/ld-telephone.c:274 locale/programs/ld-time.c:957
+#: locale/programs/ld-address.c:520 locale/programs/ld-collate.c:3804
+#: locale/programs/ld-ctype.c:2826 locale/programs/ld-identification.c:393
+#: locale/programs/ld-measurement.c:209 locale/programs/ld-messages.c:292
+#: locale/programs/ld-monetary.c:745 locale/programs/ld-name.c:259
+#: locale/programs/ld-numeric.c:322 locale/programs/ld-paper.c:209
+#: locale/programs/ld-telephone.c:273 locale/programs/ld-time.c:956
 #, c-format
 msgid "%s: incomplete `END' line"
 msgstr "%s: 不完整的 `END' 列"
 
-#: locale/programs/ld-address.c:531 locale/programs/ld-collate.c:550
-#: locale/programs/ld-collate.c:602 locale/programs/ld-collate.c:898
-#: locale/programs/ld-collate.c:911 locale/programs/ld-collate.c:2585
-#: locale/programs/ld-collate.c:2606 locale/programs/ld-collate.c:3960
-#: locale/programs/ld-ctype.c:1847 locale/programs/ld-ctype.c:2105
-#: locale/programs/ld-ctype.c:2677 locale/programs/ld-ctype.c:2838
-#: locale/programs/ld-identification.c:404 locale/programs/ld-measurement.c:220
-#: locale/programs/ld-messages.c:302 locale/programs/ld-monetary.c:755
-#: locale/programs/ld-name.c:269 locale/programs/ld-numeric.c:332
-#: locale/programs/ld-paper.c:219 locale/programs/ld-telephone.c:283
-#: locale/programs/ld-time.c:981
+#: locale/programs/ld-address.c:530 locale/programs/ld-collate.c:553
+#: locale/programs/ld-collate.c:605 locale/programs/ld-collate.c:901
+#: locale/programs/ld-collate.c:914 locale/programs/ld-collate.c:2608
+#: locale/programs/ld-collate.c:2629 locale/programs/ld-collate.c:3989
+#: locale/programs/ld-ctype.c:1846 locale/programs/ld-ctype.c:2104
+#: locale/programs/ld-ctype.c:2676 locale/programs/ld-ctype.c:2837
+#: locale/programs/ld-identification.c:403 locale/programs/ld-measurement.c:219
+#: locale/programs/ld-messages.c:301 locale/programs/ld-monetary.c:754
+#: locale/programs/ld-name.c:268 locale/programs/ld-numeric.c:331
+#: locale/programs/ld-paper.c:218 locale/programs/ld-telephone.c:282
+#: locale/programs/ld-time.c:980
 #, c-format
 msgid "%s: syntax error"
 msgstr "%s: 語法錯誤"
 
-#: locale/programs/ld-collate.c:425
+#: locale/programs/ld-collate.c:428
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "`%.*s' 在字集對照表中已經定義過了"
 
-#: locale/programs/ld-collate.c:434
+#: locale/programs/ld-collate.c:437
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "`%.*s' 在編碼對映檔中已經被定義過了"
 
-#: locale/programs/ld-collate.c:441
+#: locale/programs/ld-collate.c:444
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "`%.*s' 已被定義為對照符號"
 
-#: locale/programs/ld-collate.c:448
+#: locale/programs/ld-collate.c:451
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "`%.*s' 已被定義為對照元素"
 
-#: locale/programs/ld-collate.c:479 locale/programs/ld-collate.c:505
+#: locale/programs/ld-collate.c:482 locale/programs/ld-collate.c:508
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: `forward' 以及 `backward' 彼此互相排斥"
 
-#: locale/programs/ld-collate.c:489 locale/programs/ld-collate.c:515
-#: locale/programs/ld-collate.c:531
+#: locale/programs/ld-collate.c:492 locale/programs/ld-collate.c:518
+#: locale/programs/ld-collate.c:534
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s: `%s' 不只一次地在權重 %d 中被提到"
 
-#: locale/programs/ld-collate.c:587
+#: locale/programs/ld-collate.c:590
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: 太多規則;第一個項目只包含 %d"
 
-#: locale/programs/ld-collate.c:623
+#: locale/programs/ld-collate.c:626
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: 排序規則不足"
 
-#: locale/programs/ld-collate.c:788
+#: locale/programs/ld-collate.c:791
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: 空白的權重字串是不允許的"
 
-#: locale/programs/ld-collate.c:883
+#: locale/programs/ld-collate.c:886
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: 權重必須使用與名稱相同的省略符號"
 
-#: locale/programs/ld-collate.c:939
+#: locale/programs/ld-collate.c:942
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: 太多變數值"
 
-#: locale/programs/ld-collate.c:1059 locale/programs/ld-collate.c:1234
+#: locale/programs/ld-collate.c:1062 locale/programs/ld-collate.c:1237
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "`%.*s' 的順序已經在 %s:%Zu 裡面定義了"
 
-#: locale/programs/ld-collate.c:1109
+#: locale/programs/ld-collate.c:1112
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: 啟始與結束符號範圍必須代表字元"
 
-#: locale/programs/ld-collate.c:1136
+#: locale/programs/ld-collate.c:1139
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 msgstr "%s: 第一個與最後一個字元的位元組序列必須有相同的長度"
 
-#: locale/programs/ld-collate.c:1178
+#: locale/programs/ld-collate.c:1181
 #, 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:1303
+#: locale/programs/ld-collate.c:1306
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: 符號範圍的省略不可以直接在 `order_start' 之後"
 
-#: locale/programs/ld-collate.c:1307
+#: locale/programs/ld-collate.c:1310
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr "%s: 符號範圍的省略不可以直接在 `order_end' 之前"
 
-#: locale/programs/ld-collate.c:1327 locale/programs/ld-ctype.c:1363
+#: locale/programs/ld-collate.c:1330 locale/programs/ld-ctype.c:1362
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' 和 `%.*s' 皆非符號範圍中適用的名稱"
 
-#: locale/programs/ld-collate.c:1377 locale/programs/ld-collate.c:3711
+#: locale/programs/ld-collate.c:1380 locale/programs/ld-collate.c:3738
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: `%.*s' 的順序已在 %s:%Zu 中定義"
 
-#: locale/programs/ld-collate.c:1386
+#: locale/programs/ld-collate.c:1389
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: `%s' 必須是一個字元"
 
-#: locale/programs/ld-collate.c:1583
+#: locale/programs/ld-collate.c:1591
 #, 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:1607
+#: locale/programs/ld-collate.c:1615
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "並未定義 `%s' 符號"
 
-#: locale/programs/ld-collate.c:1683 locale/programs/ld-collate.c:1788
+#: locale/programs/ld-collate.c:1691 locale/programs/ld-collate.c:1796
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "跟符號 `%s' 有相同的編碼: "
 
-#: locale/programs/ld-collate.c:1687 locale/programs/ld-collate.c:1792
+#: locale/programs/ld-collate.c:1695 locale/programs/ld-collate.c:1800
 #, c-format
 msgid "symbol `%s'"
 msgstr "符號 `%s'"
 
-#: locale/programs/ld-collate.c:1855
+#: locale/programs/ld-collate.c:1863
 msgid "too many errors; giving up"
 msgstr "發生太多錯誤;放棄中"
 
-#: locale/programs/ld-collate.c:2511 locale/programs/ld-collate.c:3899
+#: locale/programs/ld-collate.c:2534 locale/programs/ld-collate.c:3928
 #, c-format
 msgid "%s: nested conditionals not supported"
 msgstr "%s: 不支援巢狀條件"
 
-#: locale/programs/ld-collate.c:2529
+#: locale/programs/ld-collate.c:2552
 #, c-format
 msgid "%s: more than one 'else'"
 msgstr "%s: 使用多於一個「else」"
 
-#: locale/programs/ld-collate.c:2704
+#: locale/programs/ld-collate.c:2731
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: 重複的定義 `%s'"
 
-#: locale/programs/ld-collate.c:2740
+#: locale/programs/ld-collate.c:2767
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: 重複的 `%s' 區塊宣告"
 
-#: locale/programs/ld-collate.c:2876
+#: locale/programs/ld-collate.c:2903
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: 未知的字元在對照符號名稱中"
 
-#: locale/programs/ld-collate.c:3005
+#: locale/programs/ld-collate.c:3032
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: 未知的字元在同義定義名稱中"
 
-#: locale/programs/ld-collate.c:3016
+#: locale/programs/ld-collate.c:3043
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: 未知的字元在同義定義值中"
 
-#: locale/programs/ld-collate.c:3026
+#: locale/programs/ld-collate.c:3053
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: 未知的符號 `%s' 在同義定義中"
 
-#: locale/programs/ld-collate.c:3035
+#: locale/programs/ld-collate.c:3062
 msgid "error while adding equivalent collating symbol"
 msgstr "正在加入同義對照符號時發生錯誤"
 
-#: locale/programs/ld-collate.c:3073
+#: locale/programs/ld-collate.c:3100
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "敘述 `%s' 的定義重複了"
 
-#: locale/programs/ld-collate.c:3121
+#: locale/programs/ld-collate.c:3148
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr "%s: 不明的節段名稱「%.*s」"
 
-#: locale/programs/ld-collate.c:3150
+#: locale/programs/ld-collate.c:3177
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: `%s' 區塊中有多個順序定義"
 
-#: locale/programs/ld-collate.c:3178
+#: locale/programs/ld-collate.c:3205
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: 不適用的排序規則數目"
 
-#: locale/programs/ld-collate.c:3205
+#: locale/programs/ld-collate.c:3232
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: 未命名的區塊中有多個順序定義"
 
-#: locale/programs/ld-collate.c:3260 locale/programs/ld-collate.c:3390
-#: locale/programs/ld-collate.c:3753
+#: locale/programs/ld-collate.c:3287 locale/programs/ld-collate.c:3417
+#: locale/programs/ld-collate.c:3782
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: 缺少 `order_end' 關鍵字"
 
-#: locale/programs/ld-collate.c:3323
+#: locale/programs/ld-collate.c:3350
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: 對照符號 %.*s 的順序尚未定義"
 
-#: locale/programs/ld-collate.c:3341
+#: locale/programs/ld-collate.c:3368
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: 對照元素 %.*s 的順序尚未定義"
 
-#: locale/programs/ld-collate.c:3352
+#: locale/programs/ld-collate.c:3379
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: 無法重新排列在 %.*s 之後: 未知的符號"
 
-#: locale/programs/ld-collate.c:3404 locale/programs/ld-collate.c:3765
+#: locale/programs/ld-collate.c:3431 locale/programs/ld-collate.c:3794
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: 缺少 `reorder-end' 關鍵字"
 
-#: locale/programs/ld-collate.c:3438 locale/programs/ld-collate.c:3636
+#: locale/programs/ld-collate.c:3465 locale/programs/ld-collate.c:3663
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: 未知的區塊 `%.*s'"
 
-#: locale/programs/ld-collate.c:3503
+#: locale/programs/ld-collate.c:3530
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: 不當的符號 <%.*s>"
 
-#: locale/programs/ld-collate.c:3699
+#: locale/programs/ld-collate.c:3726
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: 無法用 `%s' 做為省略區段的結尾"
 
-#: locale/programs/ld-collate.c:3749
+#: locale/programs/ld-collate.c:3778
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: 空白的類別描述是不允許的"
 
-#: locale/programs/ld-collate.c:3768
+#: locale/programs/ld-collate.c:3797
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: 缺少 `reorder-sections-end' 關鍵字"
 
-#: locale/programs/ld-collate.c:3932
+#: locale/programs/ld-collate.c:3961
 #, c-format
 msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
 msgstr "%s:「%s」而不需吻合中「ifdef」或「ifndef」"
 
-#: locale/programs/ld-collate.c:3950
+#: locale/programs/ld-collate.c:3979
 #, c-format
 msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
 msgstr "%s:「endif」而不需吻合中「ifdef」或「ifndef」"
 
-#: locale/programs/ld-ctype.c:448
+#: locale/programs/ld-ctype.c:447
 msgid "No character set name specified in charmap"
 msgstr "在字元對應 (charmap) 中沒有設定字集名稱"
 
-#: locale/programs/ld-ctype.c:476
+#: locale/programs/ld-ctype.c:475
 #, 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:490
+#: locale/programs/ld-ctype.c:489
 #, 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:504 locale/programs/ld-ctype.c:560
+#: locale/programs/ld-ctype.c:503 locale/programs/ld-ctype.c:559
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr "%s 的第 %u 列發生內部錯誤"
 
-#: locale/programs/ld-ctype.c:532
+#: locale/programs/ld-ctype.c:531
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr "字元 '%s' (放在類別 `%s' 之中) 必須在類別 `%s' 裡面"
 
-#: locale/programs/ld-ctype.c:547
+#: locale/programs/ld-ctype.c:546
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr "字元 '%s' (放在類別 `%s' 之中) 不能在類別 `%s' 裡面"
 
-#: locale/programs/ld-ctype.c:576 locale/programs/ld-ctype.c:611
+#: locale/programs/ld-ctype.c:575 locale/programs/ld-ctype.c:610
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr "<SP> 字元不在類別 `%s' 中"
 
-#: locale/programs/ld-ctype.c:587 locale/programs/ld-ctype.c:621
+#: locale/programs/ld-ctype.c:586 locale/programs/ld-ctype.c:620
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr "<SP> 字元不可以在類別 `%s' 中"
 
-#: locale/programs/ld-ctype.c:601
+#: locale/programs/ld-ctype.c:600
 msgid "character <SP> not defined in character map"
 msgstr "字元 <SP> 在字集對照檔中沒有定義"
 
-#: locale/programs/ld-ctype.c:735
+#: locale/programs/ld-ctype.c:734
 msgid "`digit' category has not entries in groups of ten"
 msgstr "`digit' 類別在群組 \"十\" 中沒有項目"
 
-#: locale/programs/ld-ctype.c:784
+#: locale/programs/ld-ctype.c:783
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr "沒有定義輸入數字,在字集對照檔中也找不到相符的標準名稱"
 
-#: locale/programs/ld-ctype.c:847
+#: locale/programs/ld-ctype.c:846
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr "在字集對照表中無法找到某些在 `outdigit' 中用到的字元"
 
-#: locale/programs/ld-ctype.c:866
+#: locale/programs/ld-ctype.c:865
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr "在編碼對映檔中無法找到某些在 `outdigit' 中用到的字元"
 
-#: locale/programs/ld-ctype.c:1131
+#: locale/programs/ld-ctype.c:1130
 #, c-format
 msgid "character class `%s' already defined"
 msgstr "字元類別 `%s' 已經定義過了"
 
-#: locale/programs/ld-ctype.c:1137
+#: locale/programs/ld-ctype.c:1136
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr "程式實作的限制: 不能使用超過 %Zd 個字集類別"
 
-#: locale/programs/ld-ctype.c:1163
+#: locale/programs/ld-ctype.c:1162
 #, c-format
 msgid "character map `%s' already defined"
 msgstr "字集對照檔 `%s' 已經定義過了"
 
-#: locale/programs/ld-ctype.c:1169
+#: locale/programs/ld-ctype.c:1168
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr "程式實作的限制: 不能使用超過 %d 個字集對照檔"
 
-#: locale/programs/ld-ctype.c:1435 locale/programs/ld-ctype.c:1560
-#: locale/programs/ld-ctype.c:1666 locale/programs/ld-ctype.c:2342
-#: locale/programs/ld-ctype.c:3302
+#: locale/programs/ld-ctype.c:1434 locale/programs/ld-ctype.c:1559
+#: locale/programs/ld-ctype.c:1665 locale/programs/ld-ctype.c:2341
+#: locale/programs/ld-ctype.c:3301
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr "%s: `%s' 欄位沒有精確包含十個項目"
 
-#: locale/programs/ld-ctype.c:1463 locale/programs/ld-ctype.c:2037
+#: locale/programs/ld-ctype.c:1462 locale/programs/ld-ctype.c:2036
 #, c-format
 msgid "to-value <U%0*X> of range is smaller than from-value <U%0*X>"
 msgstr "區域定義的結尾值 <U%0*X> 比起始值 <U%0*X> 還要小"
 
-#: locale/programs/ld-ctype.c:1590
+#: locale/programs/ld-ctype.c:1589
 msgid "start and end character sequence of range must have the same length"
 msgstr "從起始到結束之間的字元序列長度跟編碼範圍必須相同"
 
-#: locale/programs/ld-ctype.c:1597
+#: locale/programs/ld-ctype.c:1596
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr "字元序列定義的結尾值比起始值還要小"
 
-#: locale/programs/ld-ctype.c:1957 locale/programs/ld-ctype.c:2008
+#: locale/programs/ld-ctype.c:1956 locale/programs/ld-ctype.c:2007
 msgid "premature end of `translit_ignore' definition"
 msgstr "`translit_ignore' 定義沒有按時結束"
 
-#: locale/programs/ld-ctype.c:1963 locale/programs/ld-ctype.c:2014
-#: locale/programs/ld-ctype.c:2056
+#: locale/programs/ld-ctype.c:1962 locale/programs/ld-ctype.c:2013
+#: locale/programs/ld-ctype.c:2055
 msgid "syntax error"
 msgstr "語法錯誤"
 
-#: locale/programs/ld-ctype.c:2189
+#: locale/programs/ld-ctype.c:2188
 #, c-format
 msgid "%s: syntax error in definition of new character class"
 msgstr "%s: 在定義新字元類別時語法錯誤"
 
-#: locale/programs/ld-ctype.c:2204
+#: locale/programs/ld-ctype.c:2203
 #, c-format
 msgid "%s: syntax error in definition of new character map"
 msgstr "%s: 在定義新字元對應時語法錯誤"
 
-#: locale/programs/ld-ctype.c:2364
+#: locale/programs/ld-ctype.c:2363
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr "省略區域必須用兩個型別相同的運算元標示出來"
 
-#: locale/programs/ld-ctype.c:2373
+#: locale/programs/ld-ctype.c:2372
 msgid "with symbolic name range values the absolute ellipsis `...' must not be used"
 msgstr "用符號名稱來指定字元編碼範圍時不可以用絕對位置的省略符號 `…'"
 
-#: locale/programs/ld-ctype.c:2388
+#: locale/programs/ld-ctype.c:2387
 msgid "with UCS range values one must use the hexadecimal symbolic ellipsis `..'"
 msgstr "用來指定 UCS 值的範圍時得用十六進位表示的省略符號 `..'"
 
-#: locale/programs/ld-ctype.c:2402
+#: locale/programs/ld-ctype.c:2401
 msgid "with character code range values one must use the absolute ellipsis `...'"
 msgstr "用來指定字元編碼值的範圍時得用絕對位置的省略符號 `…'"
 
-#: locale/programs/ld-ctype.c:2553
+#: locale/programs/ld-ctype.c:2552
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr "對映 `%s' 的定義重複了"
 
-#: locale/programs/ld-ctype.c:2639 locale/programs/ld-ctype.c:2783
+#: locale/programs/ld-ctype.c:2638 locale/programs/ld-ctype.c:2782
 #, c-format
 msgid "%s: `translit_start' section does not end with `translit_end'"
 msgstr "%s: `translit_start' 小節並沒有以 `translit_end' 做為結束"
 
-#: locale/programs/ld-ctype.c:2734
+#: locale/programs/ld-ctype.c:2733
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr "%s: 重複的 `default_missing' 定義"
 
-#: locale/programs/ld-ctype.c:2739
+#: locale/programs/ld-ctype.c:2738
 msgid "previous definition was here"
 msgstr "先前的設定在此"
 
-#: locale/programs/ld-ctype.c:2761
+#: locale/programs/ld-ctype.c:2760
 #, c-format
 msgid "%s: no representable `default_missing' definition found"
 msgstr "%s: 找不到可表示為 `default_missing' 的定義"
 
-#: locale/programs/ld-ctype.c:2878 locale/programs/ld-ctype.c:2974
-#: locale/programs/ld-ctype.c:2993 locale/programs/ld-ctype.c:3013
-#: locale/programs/ld-ctype.c:3033 locale/programs/ld-ctype.c:3053
-#: locale/programs/ld-ctype.c:3073 locale/programs/ld-ctype.c:3112
-#: locale/programs/ld-ctype.c:3132 locale/programs/ld-ctype.c:3198
-#: locale/programs/ld-ctype.c:3239 locale/programs/ld-ctype.c:3262
+#: locale/programs/ld-ctype.c:2877 locale/programs/ld-ctype.c:2973
+#: locale/programs/ld-ctype.c:2992 locale/programs/ld-ctype.c:3012
+#: locale/programs/ld-ctype.c:3032 locale/programs/ld-ctype.c:3052
+#: locale/programs/ld-ctype.c:3072 locale/programs/ld-ctype.c:3111
+#: locale/programs/ld-ctype.c:3131 locale/programs/ld-ctype.c:3197
+#: locale/programs/ld-ctype.c:3238 locale/programs/ld-ctype.c:3261
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr "%s: 字元 `%s' 沒有定義,但它是必需的預設值"
 
-#: locale/programs/ld-ctype.c:2883 locale/programs/ld-ctype.c:2979
-#: locale/programs/ld-ctype.c:2998 locale/programs/ld-ctype.c:3018
-#: locale/programs/ld-ctype.c:3038 locale/programs/ld-ctype.c:3058
-#: locale/programs/ld-ctype.c:3078 locale/programs/ld-ctype.c:3117
-#: locale/programs/ld-ctype.c:3137 locale/programs/ld-ctype.c:3203
+#: locale/programs/ld-ctype.c:2882 locale/programs/ld-ctype.c:2978
+#: locale/programs/ld-ctype.c:2997 locale/programs/ld-ctype.c:3017
+#: locale/programs/ld-ctype.c:3037 locale/programs/ld-ctype.c:3057
+#: locale/programs/ld-ctype.c:3077 locale/programs/ld-ctype.c:3116
+#: locale/programs/ld-ctype.c:3136 locale/programs/ld-ctype.c:3202
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr "%s: 字集對照表中的字元 `%s' 無法表示為單一位元組"
 
-#: locale/programs/ld-ctype.c:3245 locale/programs/ld-ctype.c:3268
+#: locale/programs/ld-ctype.c:3244 locale/programs/ld-ctype.c:3267
 #, c-format
 msgid "%s: character `%s' needed as default value not representable with one byte"
 msgstr "%s: 做為預設值所需的字元 `%s' 無法表示為單一位元組"
 
-#: locale/programs/ld-ctype.c:3324
+#: locale/programs/ld-ctype.c:3323
 msgid "no output digits defined and none of the standard names in the charmap"
 msgstr "沒有定義輸出數字,在字集對照檔中也找不到相符的標準名稱"
 
-#: locale/programs/ld-ctype.c:3573
+#: locale/programs/ld-ctype.c:3572
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
 msgstr "%s: 語區資料`%s' 的音譯資料不存在"
 
-#: locale/programs/ld-ctype.c:3672
+#: locale/programs/ld-ctype.c:3671
 #, c-format
 msgid "%s: table for class \"%s\": %lu bytes"
 msgstr "%s: 類別「%s」表格: %lu 位元組"
 
-#: locale/programs/ld-ctype.c:3736
+#: locale/programs/ld-ctype.c:3735
 #, c-format
 msgid "%s: table for map \"%s\": %lu bytes"
 msgstr "%s: 對「%s」映射的表格: %lu 位元組"
 
-#: locale/programs/ld-ctype.c:3860
+#: locale/programs/ld-ctype.c:3859
 #, c-format
 msgid "%s: table for width: %lu bytes"
 msgstr "%s: 用於下述寬度的表格: %lu 位元組"
 
-#: locale/programs/ld-identification.c:173
+#: locale/programs/ld-identification.c:172
 #, c-format
 msgid "%s: no identification for category `%s'"
 msgstr "%s: 類別 `%s' 沒有認證"
 
-#: locale/programs/ld-identification.c:197
+#: locale/programs/ld-identification.c:196
 #, c-format
 msgid "%s: unknown standard `%s' for category `%s'"
 msgstr "%1$s: 「%3$s」分類的「%2$s」標準未知"
 
-#: locale/programs/ld-identification.c:380
+#: locale/programs/ld-identification.c:379
 #, c-format
 msgid "%s: duplicate category version definition"
 msgstr "%s: 重複的類別版本定義"
 
-#: locale/programs/ld-measurement.c:111
+#: locale/programs/ld-measurement.c:110
 #, c-format
 msgid "%s: invalid value for field `%s'"
 msgstr "%s: 在欄位 `%s' 中的值不適用"
 
-#: locale/programs/ld-messages.c:113 locale/programs/ld-messages.c:146
+#: locale/programs/ld-messages.c:112 locale/programs/ld-messages.c:145
 #, c-format
 msgid "%s: field `%s' undefined"
 msgstr "%s: 欄位 `%s' 沒有定義"
 
-#: locale/programs/ld-messages.c:119 locale/programs/ld-messages.c:152
-#: locale/programs/ld-monetary.c:264 locale/programs/ld-numeric.c:117
+#: locale/programs/ld-messages.c:118 locale/programs/ld-messages.c:151
+#: locale/programs/ld-monetary.c:263 locale/programs/ld-numeric.c:116
 #, c-format
 msgid "%s: value for field `%s' must not be an empty string"
 msgstr "%s: 欄位 `%s' 值不可以是空字串"
 
-#: locale/programs/ld-messages.c:135 locale/programs/ld-messages.c:168
+#: locale/programs/ld-messages.c:134 locale/programs/ld-messages.c:167
 #, c-format
 msgid "%s: no correct regular expression for field `%s': %s"
 msgstr "%s: 沒有給欄位 `%s' 正確的常規表示式: %s"
 
-#: locale/programs/ld-monetary.c:228
+#: locale/programs/ld-monetary.c:227
 #, c-format
 msgid "%s: value of field `int_curr_symbol' has wrong length"
 msgstr "%s: 欄位 `int_curr_symbol' 值的長度錯誤"
 
-#: locale/programs/ld-monetary.c:245
+#: locale/programs/ld-monetary.c:244
 #, c-format
 msgid "%s: value of field `int_curr_symbol' does not correspond to a valid name in ISO 4217 [--no-warnings=intcurrsym]"
 msgstr "%s: 欄位「int_curr_symbol」的值並不是 ISO 4217 中合法的名稱 [--no-warnings=intcurrsym]"
 
-#: locale/programs/ld-monetary.c:293 locale/programs/ld-monetary.c:322
+#: locale/programs/ld-monetary.c:292 locale/programs/ld-monetary.c:321
 #, c-format
 msgid "%s: value for field `%s' must be in range %d...%d"
 msgstr "%s: 欄位 `%s' 的值必須在範圍 %d…%d"
 
-#: locale/programs/ld-monetary.c:549 locale/programs/ld-numeric.c:228
+#: locale/programs/ld-monetary.c:548 locale/programs/ld-numeric.c:227
 #, c-format
 msgid "%s: value for field `%s' must be a single character"
 msgstr "%s: 欄位 `%s' 的值必須是個單一字元"
 
-#: locale/programs/ld-monetary.c:646 locale/programs/ld-numeric.c:272
+#: locale/programs/ld-monetary.c:645 locale/programs/ld-numeric.c:271
 #, c-format
 msgid "%s: `-1' must be last entry in `%s' field"
 msgstr "%s: `-1' 在 `%s' 欄位中必須是最後一個項目"
 
-#: locale/programs/ld-monetary.c:668 locale/programs/ld-numeric.c:289
+#: locale/programs/ld-monetary.c:667 locale/programs/ld-numeric.c:288
 #, c-format
 msgid "%s: values for field `%s' must be smaller than 127"
 msgstr "%s: 欄位 `%s' 的值必須小於 127"
 
-#: locale/programs/ld-monetary.c:714
+#: locale/programs/ld-monetary.c:713
 msgid "conversion rate value cannot be zero"
 msgstr "轉換率的值不可以是零"
 
-#: locale/programs/ld-name.c:128 locale/programs/ld-telephone.c:124
-#: locale/programs/ld-telephone.c:147
+#: locale/programs/ld-name.c:127 locale/programs/ld-telephone.c:123
+#: locale/programs/ld-telephone.c:146
 #, c-format
 msgid "%s: invalid escape sequence in field `%s'"
 msgstr "%s: 在欄位 `%s' 中的跳脫序列不適用"
 
-#: locale/programs/ld-time.c:251
+#: locale/programs/ld-time.c:250
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not '+' nor '-'"
 msgstr "%s: 在 `era' 欄位的字串 %Zd 中,方向旗標既不是 '+' 也不是 '-'"
 
-#: locale/programs/ld-time.c:261
+#: locale/programs/ld-time.c:260
 #, 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:273
+#: locale/programs/ld-time.c:272
 #, c-format
 msgid "%s: invalid number for offset in string %Zd in `era' field"
 msgstr "%s: 在 `era' 欄位、字串 %Zd 中的位移數字不適用"
 
-#: locale/programs/ld-time.c:280
+#: locale/programs/ld-time.c:279
 #, 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:338
+#: locale/programs/ld-time.c:337
 #, 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:356
+#: locale/programs/ld-time.c:355
 #, c-format
 msgid "%s: starting date is invalid in string %Zd in `era' field"
 msgstr "%s: 在 `era' 區域的字串 %Zd 中的啟始日期是不適用的"
 
-#: locale/programs/ld-time.c:404 locale/programs/ld-time.c:430
+#: locale/programs/ld-time.c:403 locale/programs/ld-time.c:429
 #, c-format
 msgid "%s: invalid stopping date in string %Zd in `era' field"
 msgstr "%s: 在 `era' 欄位、字串 %Zd 中的結束日期不適用"
 
-#: locale/programs/ld-time.c:412
+#: locale/programs/ld-time.c:411
 #, 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:438
+#: locale/programs/ld-time.c:437
 #, c-format
 msgid "%s: missing era name in string %Zd in `era' field"
 msgstr "%s: 缺少 era 名稱,在 `era' 欄位、字串 %Zd 中"
 
-#: locale/programs/ld-time.c:449
+#: locale/programs/ld-time.c:448
 #, c-format
 msgid "%s: missing era format in string %Zd in `era' field"
 msgstr "%s: 缺少 era 格式,在 `era' 欄位、字串 %Zd 中"
 
-#: locale/programs/ld-time.c:494
+#: locale/programs/ld-time.c:493
 #, 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:502 locale/programs/ld-time.c:510
-#: locale/programs/ld-time.c:518
+#: locale/programs/ld-time.c:501 locale/programs/ld-time.c:509
+#: locale/programs/ld-time.c:517
 #, c-format
 msgid "%s: values for field `%s' must not be larger than %d"
 msgstr "%s: 欄位 `%s' 的值不可以大於 %d"
 
-#: locale/programs/ld-time.c:740
+#: locale/programs/ld-time.c:739
 #, c-format
 msgid "%s: too few values for field `%s'"
 msgstr "%s: 欄位 `%s' 中的值太少"
 
-#: locale/programs/ld-time.c:785
+#: locale/programs/ld-time.c:784
 msgid "extra trailing semicolon"
 msgstr "多出的尾端分號"
 
-#: locale/programs/ld-time.c:788
+#: locale/programs/ld-time.c:787
 #, 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:847
+#: locale/programs/linereader.c:626 locale/programs/linereader.c:846
 msgid "unterminated string"
 msgstr "沒有結尾的字串"
 
-#: locale/programs/linereader.c:808
+#: locale/programs/linereader.c:807
 #, c-format
 msgid "symbol `%.*s' not in charmap"
 msgstr "符號 `%.*s' 並不在字集對照表中"
 
-#: locale/programs/linereader.c:829
+#: locale/programs/linereader.c:828
 #, c-format
 msgid "symbol `%.*s' not in repertoire map"
 msgstr "符號 `%.*s' 並不在編碼對映檔中"
 
-#: locale/programs/locale-spec.c:130
+#: locale/programs/locale-spec.c:129
 #, c-format
 msgid "unknown name \"%s\""
 msgstr "不明名稱「%s」"
 
-#: locale/programs/locale.c:70
+#: locale/programs/locale.c:69
 msgid "System information:"
 msgstr "系統相關資訊:"
 
-#: locale/programs/locale.c:72
+#: locale/programs/locale.c:71
 msgid "Write names of available locales"
 msgstr "寫出存在的語區資料名稱"
 
-#: locale/programs/locale.c:74
+#: locale/programs/locale.c:73
 msgid "Write names of available charmaps"
 msgstr "寫出存在的字集對照表名稱"
 
-#: locale/programs/locale.c:75
+#: locale/programs/locale.c:74
 msgid "Modify output format:"
 msgstr "修改輸出格式:"
 
-#: locale/programs/locale.c:76
+#: locale/programs/locale.c:75
 msgid "Write names of selected categories"
 msgstr "寫出選取的類別名稱"
 
-#: locale/programs/locale.c:77
+#: locale/programs/locale.c:76
 msgid "Write names of selected keywords"
 msgstr "寫出選取的關鍵字名稱"
 
-#: locale/programs/locale.c:78
+#: locale/programs/locale.c:77
 msgid "Print more information"
 msgstr "印出更多的資訊"
 
-#: locale/programs/locale.c:83
+#: locale/programs/locale.c:82
 msgid "Get locale-specific information."
 msgstr "取得語區資料特定的資訊"
 
-#: locale/programs/locale.c:86
+#: locale/programs/locale.c:85
 msgid ""
 "NAME\n"
 "[-a|-m]"
@@ -2594,114 +2652,114 @@ msgstr ""
 "名稱\n"
 "[-a|-m]"
 
-#: locale/programs/locale.c:522
+#: locale/programs/locale.c:521
 #, c-format
 msgid "while preparing output"
 msgstr "在準備輸出時"
 
-#: locale/programs/locale.c:1000
+#: locale/programs/locale.c:999
 #, c-format
 msgid "Cannot set %s to default locale"
 msgstr "無法將 %s 設成預設語區"
 
-#: locale/programs/locale.c:1098
+#: locale/programs/locale.c:1097
 #, c-format
 msgid "warning: The LOCPATH variable is set to \"%s\"\n"
 msgstr "警告:LOCPATH 變數已設成「%s」\n"
 
-#: locale/programs/localedef.c:116
+#: locale/programs/localedef.c:115
 msgid "Input Files:"
 msgstr "輸入檔:"
 
-#: locale/programs/localedef.c:118
+#: locale/programs/localedef.c:117
 msgid "Symbolic character names defined in FILE"
 msgstr "符號字元的名稱定義在檔案 FILE 中"
 
-#: locale/programs/localedef.c:120
+#: locale/programs/localedef.c:119
 msgid "Source definitions are found in FILE"
 msgstr "原始資料定義在檔案 FILE 中"
 
-#: locale/programs/localedef.c:122
+#: locale/programs/localedef.c:121
 msgid "FILE contains mapping from symbolic names to UCS4 values"
 msgstr "檔案 FILE 內含符號名與 UCS4 編碼之間的對映"
 
-#: locale/programs/localedef.c:126
+#: locale/programs/localedef.c:125
 msgid "Create output even if warning messages were issued"
 msgstr "產生輸出即使是有警告訊息"
 
-#: locale/programs/localedef.c:128
+#: locale/programs/localedef.c:127
 msgid "Do not create hard links between installed locales"
 msgstr "不要在安裝的語系之間建立實際連結"
 
-#: locale/programs/localedef.c:129
+#: locale/programs/localedef.c:128
 msgid "Optional output file prefix"
 msgstr "可有可無的輸出檔路徑"
 
-#: locale/programs/localedef.c:130
+#: locale/programs/localedef.c:129
 msgid "Strictly conform to POSIX"
 msgstr "嚴格遵從 POSIX"
 
-#: locale/programs/localedef.c:132
+#: locale/programs/localedef.c:131
 msgid "Suppress warnings and information messages"
 msgstr "忽略警告與提示訊息"
 
-#: locale/programs/localedef.c:133
+#: locale/programs/localedef.c:132
 msgid "Print more messages"
 msgstr "印出更多的訊息"
 
-#: locale/programs/localedef.c:134 locale/programs/localedef.c:137
+#: locale/programs/localedef.c:133 locale/programs/localedef.c:136
 msgid "<warnings>"
 msgstr "<警告>"
 
-#: locale/programs/localedef.c:135
+#: locale/programs/localedef.c:134
 msgid "Comma-separated list of warnings to disable; supported warnings are: ascii, intcurrsym"
 msgstr "要停用的警告(使用逗號分隔);支援的警告有:ascii, intcurrsym"
 
-#: locale/programs/localedef.c:138
+#: locale/programs/localedef.c:137
 msgid "Comma-separated list of warnings to enable; supported warnings are: ascii, intcurrsym"
 msgstr "要啟用的警告(使用逗號分隔);支援的警告有:ascii, intcurrsym"
 
-#: locale/programs/localedef.c:141
+#: locale/programs/localedef.c:140
 msgid "Archive control:"
 msgstr "保存檔控制:"
 
-#: locale/programs/localedef.c:143
+#: locale/programs/localedef.c:142
 msgid "Don't add new data to archive"
 msgstr "不要加入新資料到保存檔"
 
-#: locale/programs/localedef.c:145
+#: locale/programs/localedef.c:144
 msgid "Add locales named by parameters to archive"
 msgstr "藉由參數加入語區名稱到保存檔"
 
-#: locale/programs/localedef.c:146
+#: locale/programs/localedef.c:145
 msgid "Replace existing archive content"
 msgstr "替換已有的保存檔內容"
 
-#: locale/programs/localedef.c:148
+#: locale/programs/localedef.c:147
 msgid "Remove locales named by parameters from archive"
 msgstr "藉由參數從保存檔中刪除語區名稱"
 
-#: locale/programs/localedef.c:149
+#: locale/programs/localedef.c:148
 msgid "List content of archive"
 msgstr "列出保存檔的內容"
 
-#: locale/programs/localedef.c:151
+#: locale/programs/localedef.c:150
 msgid "locale.alias file to consult when making archive"
 msgstr "製作保存檔時查閱 locale.alias 檔案"
 
-#: locale/programs/localedef.c:153
+#: locale/programs/localedef.c:152
 msgid "Generate little-endian output"
 msgstr "產生小端序輸出"
 
-#: locale/programs/localedef.c:155
+#: locale/programs/localedef.c:154
 msgid "Generate big-endian output"
 msgstr "產生大端序輸出"
 
-#: locale/programs/localedef.c:160
+#: locale/programs/localedef.c:159
 msgid "Compile locale specification"
 msgstr "編譯語區資料規格"
 
-#: locale/programs/localedef.c:163
+#: locale/programs/localedef.c:162
 msgid ""
 "NAME\n"
 "[--add-to-archive|--delete-from-archive] FILE...\n"
@@ -2711,31 +2769,31 @@ msgstr ""
 "[--add-to-archive|--delete-from-archive] 檔案...\n"
 "--list-archive [檔案]"
 
-#: locale/programs/localedef.c:239
+#: locale/programs/localedef.c:238
 #, c-format
 msgid "cannot create directory for output files"
 msgstr "無法為輸出檔建立目錄"
 
-#: locale/programs/localedef.c:250
+#: locale/programs/localedef.c:249
 msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
 msgstr "嚴重錯誤: 系統沒有定義 `_POSIX2_LOCALEDEF'"
 
-#: locale/programs/localedef.c:264 locale/programs/localedef.c:280
-#: locale/programs/localedef.c:678 locale/programs/localedef.c:698
+#: locale/programs/localedef.c:263 locale/programs/localedef.c:279
+#: locale/programs/localedef.c:677 locale/programs/localedef.c:697
 #, c-format
 msgid "cannot open locale definition file `%s'"
 msgstr "無法開啟語區資料定義檔 `%s'"
 
-#: locale/programs/localedef.c:304
+#: locale/programs/localedef.c:303
 #, c-format
 msgid "cannot write output files to `%s'"
 msgstr "無法將輸出檔案寫入 `%s'"
 
-#: locale/programs/localedef.c:310
+#: locale/programs/localedef.c:309
 msgid "no output file produced because errors were issued"
 msgstr "因為發出過錯誤訊息,所以沒有產生出任何輸出檔"
 
-#: locale/programs/localedef.c:441
+#: locale/programs/localedef.c:440
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
@@ -2748,223 +2806,228 @@ msgstr ""
 "\t\t      語區路徑   :%s\n"
 "%s"
 
-#: locale/programs/localedef.c:546
+#: locale/programs/localedef.c:545
 #, c-format
 msgid "cannot create output path '%s': %s"
 msgstr "無法建立「%s」輸出路徑:%s"
 
-#: locale/programs/localedef.c:554
+#: locale/programs/localedef.c:553
 #, c-format
 msgid "no write permission to output path '%s': %s"
 msgstr "沒有「%s」輸出路徑的寫入權限:%s"
 
-#: locale/programs/localedef.c:646
+#: locale/programs/localedef.c:645
 msgid "circular dependencies between locale definitions"
 msgstr "有語區資料在定義時發生循環相關的情況"
 
-#: locale/programs/localedef.c:652
+#: locale/programs/localedef.c:651
 #, c-format
 msgid "cannot add already read locale `%s' a second time"
 msgstr " `%s' 語區資料已經用過,不能重複加入"
 
-#: locale/programs/locarchive.c:133 locale/programs/locarchive.c:380
+#: locale/programs/locarchive.c:132 locale/programs/locarchive.c:379
 #, c-format
 msgid "cannot create temporary file: %s"
 msgstr "無法產生暫時檔:%s"
 
-#: locale/programs/locarchive.c:167 locale/programs/locarchive.c:430
+#: locale/programs/locarchive.c:166 locale/programs/locarchive.c:429
 #, c-format
 msgid "cannot initialize archive file"
 msgstr "無法起始保存檔"
 
-#: locale/programs/locarchive.c:174 locale/programs/locarchive.c:437
+#: locale/programs/locarchive.c:173 locale/programs/locarchive.c:436
 #, c-format
 msgid "cannot resize archive file"
 msgstr "無法改變保存檔大小"
 
-#: locale/programs/locarchive.c:189 locale/programs/locarchive.c:452
-#: locale/programs/locarchive.c:674
+#: locale/programs/locarchive.c:188 locale/programs/locarchive.c:451
+#: locale/programs/locarchive.c:680
 #, c-format
 msgid "cannot map archive header"
 msgstr "無法註記保存檔表頭"
 
-#: locale/programs/locarchive.c:211
+#: locale/programs/locarchive.c:210
 #, c-format
 msgid "failed to create new locale archive"
 msgstr "無法建立新的語區保存檔"
 
-#: locale/programs/locarchive.c:223
+#: locale/programs/locarchive.c:222
 #, c-format
 msgid "cannot change mode of new locale archive"
 msgstr "無法改變新的語區資料保存檔狀態"
 
-#: locale/programs/locarchive.c:324
+#: locale/programs/locarchive.c:323
 msgid "cannot read data from locale archive"
 msgstr "無法從語區歸檔讀取資料"
 
-#: locale/programs/locarchive.c:355
+#: locale/programs/locarchive.c:354
 #, c-format
 msgid "cannot map locale archive file"
 msgstr "無法映射語區資料保存檔"
 
-#: locale/programs/locarchive.c:460
+#: locale/programs/locarchive.c:459
 #, c-format
 msgid "cannot lock new archive"
 msgstr "無法鎖定新的保存檔"
 
-#: locale/programs/locarchive.c:529
+#: locale/programs/locarchive.c:528
 #, c-format
 msgid "cannot extend locale archive file"
 msgstr "無法延展語區資料保存檔"
 
-#: locale/programs/locarchive.c:538
+#: locale/programs/locarchive.c:537
 #, c-format
 msgid "cannot change mode of resized locale archive"
 msgstr "無法改變已變更大小的語區資料保存檔狀態"
 
-#: locale/programs/locarchive.c:546
+#: locale/programs/locarchive.c:545
 #, c-format
 msgid "cannot rename new archive"
 msgstr "無法更改新保存檔名稱"
 
-#: locale/programs/locarchive.c:608
+#: locale/programs/locarchive.c:607
 #, c-format
 msgid "cannot open locale archive \"%s\""
 msgstr "無法開啟語區資料保存檔 \"%s\""
 
-#: locale/programs/locarchive.c:613
+#: locale/programs/locarchive.c:612
 #, c-format
 msgid "cannot stat locale archive \"%s\""
 msgstr "無法統計語區資料保存檔 \"%s\""
 
-#: locale/programs/locarchive.c:632
+#: locale/programs/locarchive.c:631
 #, c-format
 msgid "cannot lock locale archive \"%s\""
 msgstr "無法鎖定語區資料保存檔 \"%s\""
 
-#: locale/programs/locarchive.c:655
+#: locale/programs/locarchive.c:654
 #, c-format
 msgid "cannot read archive header"
 msgstr "無法讀取保存檔表頭資料"
 
-#: locale/programs/locarchive.c:728
+#: locale/programs/locarchive.c:661
+#, c-format
+msgid "bad magic value in archive header"
+msgstr "封存檔標頭的 magic 值無效"
+
+#: locale/programs/locarchive.c:734
 #, c-format
 msgid "locale '%s' already exists"
 msgstr "語區資料 `%s' 已經存在"
 
-#: locale/programs/locarchive.c:1003 locale/programs/locarchive.c:1018
-#: locale/programs/locarchive.c:1030 locale/programs/locarchive.c:1042
-#: locale/programs/locfile.c:350
+#: locale/programs/locarchive.c:1009 locale/programs/locarchive.c:1024
+#: locale/programs/locarchive.c:1036 locale/programs/locarchive.c:1048
+#: locale/programs/locfile.c:349
 #, c-format
 msgid "cannot add to locale archive"
 msgstr "無法加入語區資料保存檔"
 
-#: locale/programs/locarchive.c:1203
+#: locale/programs/locarchive.c:1209
 #, c-format
 msgid "locale alias file `%s' not found"
 msgstr "找不到語區資料別名檔 `%s'"
 
-#: locale/programs/locarchive.c:1351
+#: locale/programs/locarchive.c:1357
 #, c-format
 msgid "Adding %s\n"
 msgstr "加入 %s 中\n"
 
-#: locale/programs/locarchive.c:1357
+#: locale/programs/locarchive.c:1363
 #, c-format
 msgid "stat of \"%s\" failed: %s: ignored"
 msgstr "取得 \"%s\" 的資訊時失敗: %s: 已忽略"
 
-#: locale/programs/locarchive.c:1363
+#: locale/programs/locarchive.c:1369
 #, c-format
 msgid "\"%s\" is no directory; ignored"
 msgstr "\"%s\" 並非目錄; 已忽略"
 
-#: locale/programs/locarchive.c:1370
+#: locale/programs/locarchive.c:1376
 #, c-format
 msgid "cannot open directory \"%s\": %s: ignored"
 msgstr "無法開啟目錄 \"%s\": %s: 已忽略"
 
-#: locale/programs/locarchive.c:1438
+#: locale/programs/locarchive.c:1444
 #, c-format
 msgid "incomplete set of locale files in \"%s\""
 msgstr "不完整的一組語區資料檔案存在於 \"%s\" 之中"
 
-#: locale/programs/locarchive.c:1502
+#: locale/programs/locarchive.c:1508
 #, c-format
 msgid "cannot read all files in \"%s\": ignored"
 msgstr "無法讀取 \"%s\" 中的所有檔案: 已忽略"
 
-#: locale/programs/locarchive.c:1572
+#: locale/programs/locarchive.c:1578
 #, c-format
 msgid "locale \"%s\" not in archive"
 msgstr "語區資料 \"%s\" 不在保存檔中"
 
-#: locale/programs/locfile.c:137
+#: locale/programs/locfile.c:136
 #, c-format
 msgid "argument to `%s' must be a single character"
 msgstr "給 `%s' 的引數必須是一個單字元"
 
-#: locale/programs/locfile.c:257
+#: locale/programs/locfile.c:256
 msgid "syntax error: not inside a locale definition section"
 msgstr "語法錯誤: 不能在語區資料定義區塊裡面使用"
 
-#: locale/programs/locfile.c:799
+#: locale/programs/locfile.c:798
 #, c-format
 msgid "cannot open output file `%s' for category `%s'"
 msgstr "無法開啟輸出檔 `%s' 供類別 `%s' 使用"
 
-#: locale/programs/locfile.c:822
+#: locale/programs/locfile.c:821
 #, c-format
 msgid "failure while writing data for category `%s'"
 msgstr "正在為類別 `%s' 寫入資料時發生錯誤"
 
-#: locale/programs/locfile.c:930
+#: locale/programs/locfile.c:929
 #, c-format
 msgid "cannot create output file `%s' for category `%s'"
 msgstr "無法建立輸出檔 `%s' 供類別 `%s' 使用"
 
-#: locale/programs/locfile.c:966
+#: locale/programs/locfile.c:965
 msgid "expecting string argument for `copy'"
 msgstr "`copy' 的引數應該是字串才對"
 
-#: locale/programs/locfile.c:970
+#: locale/programs/locfile.c:969
 msgid "locale name should consist only of portable characters"
 msgstr "語區資料的名稱應該以常用字元組成"
 
-#: locale/programs/locfile.c:989
+#: locale/programs/locfile.c:988
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr "使用 `copy' 的時候不應該再用到任何其他的關鍵字了"
 
-#: locale/programs/locfile.c:1003
+#: locale/programs/locfile.c:1002
 #, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "`%1$s' 定義沒有以 `END %1$s' 結束"
 
-#: locale/programs/repertoire.c:228 locale/programs/repertoire.c:269
-#: locale/programs/repertoire.c:294
+#: locale/programs/repertoire.c:227 locale/programs/repertoire.c:268
+#: locale/programs/repertoire.c:293
 #, c-format
 msgid "syntax error in repertoire map definition: %s"
 msgstr "編碼對映檔中的定義有語法錯誤: %s"
 
-#: locale/programs/repertoire.c:270
+#: locale/programs/repertoire.c:269
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "沒有給定 <Uxxxx> 或 <Uxxxxxxxx> 的值"
 
-#: locale/programs/repertoire.c:330
+#: locale/programs/repertoire.c:329
 msgid "cannot save new repertoire map"
 msgstr "無法儲存新的編碼對映檔"
 
-#: locale/programs/repertoire.c:341
+#: locale/programs/repertoire.c:340
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr "找不到編碼對映檔 `%s'"
 
-#: login/programs/pt_chown.c:79
+#: login/programs/pt_chown.c:78
 #, c-format
 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:93
+#: 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"
@@ -2975,41 +3038,41 @@ msgstr ""
 "\n"
 "%s"
 
-#: login/programs/pt_chown.c:204
+#: login/programs/pt_chown.c:203
 #, c-format
 msgid "too many arguments"
 msgstr "太多引數"
 
-#: login/programs/pt_chown.c:212
+#: login/programs/pt_chown.c:211
 #, c-format
 msgid "needs to be installed setuid `root'"
 msgstr "需要是已安裝的 setuid「根」"
 
-#: malloc/mcheck-impl.c:355
+#: malloc/mcheck-impl.c:354
 msgid "memory is consistent, library is buggy\n"
 msgstr "記憶體內容一致,函式庫有問題\n"
 
-#: malloc/mcheck-impl.c:358
+#: malloc/mcheck-impl.c:357
 msgid "memory clobbered before allocated block\n"
 msgstr "記憶體在配置區塊之前就 clobbered 了\n"
 
-#: malloc/mcheck-impl.c:361
+#: malloc/mcheck-impl.c:360
 msgid "memory clobbered past end of allocated block\n"
 msgstr "記憶體在經過配置的區塊尾部時 clobbered 了\n"
 
-#: malloc/mcheck-impl.c:364
+#: malloc/mcheck-impl.c:363
 msgid "block freed twice\n"
 msgstr "此區塊被用 free 指令釋放了兩次\n"
 
-#: malloc/mcheck-impl.c:367
+#: malloc/mcheck-impl.c:366
 msgid "bogus mcheck_status, library is buggy\n"
 msgstr "記憶體檢查狀態 (mcheck_ststus) 有誤,您所用的函式庫有問題\n"
 
-#: malloc/memusage.sh:32
+#: malloc/memusage.sh:31
 msgid "%s: option '%s' requires an argument\\n"
 msgstr "%s:選項『%s』需要一個引數\\n"
 
-#: malloc/memusage.sh:38
+#: malloc/memusage.sh:37
 msgid ""
 "Usage: memusage [OPTION]... PROGRAM [PROGRAMOPTION]...\n"
 "Profile memory usage of PROGRAM.\n"
@@ -3062,7 +3125,7 @@ msgstr ""
 "長選項的必要引數同樣也是相對應短選項的必要引數。\n"
 "\n"
 
-#: malloc/memusage.sh:99
+#: malloc/memusage.sh:98
 msgid ""
 "Syntax: memusage [--data=FILE] [--progname=NAME] [--png=FILE] [--unbuffered]\n"
 "\t    [--buffer=SIZE] [--no-timer] [--time-based] [--total]\n"
@@ -3074,55 +3137,55 @@ msgstr ""
 "\t   [--title=字串] [--x-size=大小] [--y-size=大小]\n"
 "\t   程式 [PROGRAMOPTION]…"
 
-#: malloc/memusage.sh:191
+#: malloc/memusage.sh:190
 msgid "memusage: option \\`${1##*=}' is ambiguous"
 msgstr "memusage:選項 \\「${1##*=}」為模稜兩可的"
 
-#: malloc/memusage.sh:200
+#: malloc/memusage.sh:199
 msgid "memusage: unrecognized option \\`$1'"
 msgstr "memusage:無法辨識的選項「$1」"
 
-#: malloc/memusage.sh:213
+#: malloc/memusage.sh:212
 msgid "No program name given"
 msgstr "未給定程式名稱"
 
-#: malloc/memusagestat.c:56
+#: malloc/memusagestat.c:55
 msgid "Name output file"
 msgstr "名稱輸出檔"
 
-#: malloc/memusagestat.c:57
+#: malloc/memusagestat.c:56
 msgid "STRING"
 msgstr "字串"
 
-#: malloc/memusagestat.c:57
+#: malloc/memusagestat.c:56
 msgid "Title string used in output graphic"
 msgstr "在輸出的圖像中使用有標頭的字串"
 
-#: malloc/memusagestat.c:58
+#: malloc/memusagestat.c:57
 msgid "Generate output linear to time (default is linear to number of function calls)"
 msgstr "產生輸出與時間呈線性關係 (預設是與函式呼叫數目呈線性關係)"
 
-#: malloc/memusagestat.c:62
+#: malloc/memusagestat.c:61
 msgid "Also draw graph for total memory consumption"
 msgstr "同時對總記憶體用量作圖"
 
-#: malloc/memusagestat.c:63
+#: malloc/memusagestat.c:62
 msgid "VALUE"
 msgstr "像素值"
 
-#: malloc/memusagestat.c:64
+#: malloc/memusagestat.c:63
 msgid "Make output graphic VALUE pixels wide"
 msgstr "定製輸出圖形的寬度像素值"
 
-#: malloc/memusagestat.c:65
+#: malloc/memusagestat.c:64
 msgid "Make output graphic VALUE pixels high"
 msgstr "定製輸出圖形的高度像素值"
 
-#: malloc/memusagestat.c:70
+#: malloc/memusagestat.c:69
 msgid "Generate graphic from memory profiling data"
 msgstr "從記憶體性能測試資料產生圖像"
 
-#: malloc/memusagestat.c:73
+#: malloc/memusagestat.c:72
 msgid "DATAFILE [OUTFILE]"
 msgstr "資料檔 [輸出檔]"
 
@@ -3130,11 +3193,11 @@ msgstr "資料檔 [輸出檔]"
 msgid "Unknown system error"
 msgstr "未知系統錯誤"
 
-#: nis/nis_callback.c:188
+#: nis/nis_callback.c:187
 msgid "unable to free arguments"
 msgstr "無法釋放參數"
 
-#: nis/nis_error.h:1 nis/ypclnt.c:833 nis/ypclnt.c:922 posix/regcomp.c:135
+#: nis/nis_error.h:1 nis/ypclnt.c:832 nis/ypclnt.c:921 posix/regcomp.c:135
 #: sysdeps/gnu/errlist.h:1
 msgid "Success"
 msgstr "成功"
@@ -3176,7 +3239,7 @@ msgid "First/next chain broken"
 msgstr "第一個/下一個序列壞掉了"
 
 #. TRANS The file permissions do not allow the attempted operation.
-#: nis/nis_error.h:11 nis/ypclnt.c:878 sysdeps/gnu/errlist.h:90
+#: nis/nis_error.h:11 nis/ypclnt.c:877 sysdeps/gnu/errlist.h:90
 msgid "Permission denied"
 msgstr "拒絕不符權限的操作"
 
@@ -3328,128 +3391,128 @@ msgstr "無法在伺服器上建立執行程序"
 msgid "Master server busy, full dump rescheduled."
 msgstr "主要伺服器忙碌中,重新進行完整資料傾卸排程。"
 
-#: nis/nis_local_names.c:123
+#: nis/nis_local_names.c:122
 #, c-format
 msgid "LOCAL entry for UID %d in directory %s not unique\n"
 msgstr "UID 為 %d 的項目在本地端中並不是唯一的 (在 %s 目錄裡面)\n"
 
-#: nis/nis_print.c:52
+#: nis/nis_print.c:51
 msgid "UNKNOWN"
 msgstr "不明"
 
-#: nis/nis_print.c:110
+#: nis/nis_print.c:109
 msgid "BOGUS OBJECT\n"
 msgstr "假的物件\n"
 
-#: nis/nis_print.c:113
+#: nis/nis_print.c:112
 msgid "NO OBJECT\n"
 msgstr "沒有物件\n"
 
-#: nis/nis_print.c:116
+#: nis/nis_print.c:115
 msgid "DIRECTORY\n"
 msgstr "目錄\n"
 
-#: nis/nis_print.c:119
+#: nis/nis_print.c:118
 msgid "GROUP\n"
 msgstr "群組\n"
 
-#: nis/nis_print.c:122
+#: nis/nis_print.c:121
 msgid "TABLE\n"
 msgstr "表格\n"
 
-#: nis/nis_print.c:125
+#: nis/nis_print.c:124
 msgid "ENTRY\n"
 msgstr "項目\n"
 
-#: nis/nis_print.c:128
+#: nis/nis_print.c:127
 msgid "LINK\n"
 msgstr "連結\n"
 
-#: nis/nis_print.c:131
+#: nis/nis_print.c:130
 msgid "PRIVATE\n"
 msgstr "私有的\n"
 
-#: nis/nis_print.c:134
+#: nis/nis_print.c:133
 msgid "(Unknown object)\n"
 msgstr "(未知的物件)\n"
 
-#: nis/nis_print.c:168
+#: nis/nis_print.c:167
 #, c-format
 msgid "Name : `%s'\n"
 msgstr "名稱 : `%s'\n"
 
-#: nis/nis_print.c:169
+#: nis/nis_print.c:168
 #, c-format
 msgid "Type : %s\n"
 msgstr "格式 : %s\n"
 
-#: nis/nis_print.c:174
+#: nis/nis_print.c:173
 msgid "Master Server :\n"
 msgstr "主要伺服器 :\n"
 
-#: nis/nis_print.c:176
+#: nis/nis_print.c:175
 msgid "Replicate :\n"
 msgstr "複製 :\n"
 
-#: nis/nis_print.c:177
+#: nis/nis_print.c:176
 #, c-format
 msgid "\tName       : %s\n"
 msgstr "\t名稱       : %s\n"
 
-#: nis/nis_print.c:178
+#: nis/nis_print.c:177
 msgid "\tPublic Key : "
 msgstr "\t公共鑰匙 : "
 
-#: nis/nis_print.c:182
+#: nis/nis_print.c:181
 msgid "None.\n"
 msgstr "無\n"
 
-#: nis/nis_print.c:185
+#: nis/nis_print.c:184
 #, c-format
 msgid "Diffie-Hellmann (%d bits)\n"
 msgstr "Diffie-Hellmann (%d 位元)\n"
 
-#: nis/nis_print.c:190
+#: nis/nis_print.c:189
 #, c-format
 msgid "RSA (%d bits)\n"
 msgstr "RSA (%d 位元)\n"
 
-#: nis/nis_print.c:193
+#: nis/nis_print.c:192
 msgid "Kerberos.\n"
 msgstr "Kerberos.\n"
 
-#: nis/nis_print.c:196
+#: nis/nis_print.c:195
 #, c-format
 msgid "Unknown (type = %d, bits = %d)\n"
 msgstr "未知的 (型態 = %d,位元 = %d)\n"
 
-#: nis/nis_print.c:207
+#: nis/nis_print.c:206
 #, c-format
 msgid "\tUniversal addresses (%u)\n"
 msgstr "\t絕對位址 (%u)\n"
 
-#: nis/nis_print.c:229
+#: nis/nis_print.c:228
 msgid "Time to live : "
 msgstr "存在時間 : "
 
-#: nis/nis_print.c:231
+#: nis/nis_print.c:230
 msgid "Default Access rights :\n"
 msgstr "預設的存取權限 :\n"
 
-#: nis/nis_print.c:240
+#: nis/nis_print.c:239
 #, c-format
 msgid "\tType         : %s\n"
 msgstr "\t型別         : %s\n"
 
-#: nis/nis_print.c:241
+#: nis/nis_print.c:240
 msgid "\tAccess rights: "
 msgstr "\t存取權限: "
 
-#: nis/nis_print.c:255
+#: nis/nis_print.c:254
 msgid "Group Flags :"
 msgstr "群組旗標 :"
 
-#: nis/nis_print.c:258
+#: nis/nis_print.c:257
 msgid ""
 "\n"
 "Group Members :\n"
@@ -3457,95 +3520,95 @@ msgstr ""
 "\n"
 "群組的成員 :\n"
 
-#: nis/nis_print.c:270
+#: nis/nis_print.c:269
 #, c-format
 msgid "Table Type          : %s\n"
 msgstr "表格形式           : %s\n"
 
-#: nis/nis_print.c:271
+#: nis/nis_print.c:270
 #, c-format
 msgid "Number of Columns   : %d\n"
 msgstr "欄位的數目 : %d\n"
 
-#: nis/nis_print.c:272
+#: nis/nis_print.c:271
 #, c-format
 msgid "Character Separator : %c\n"
 msgstr "字元分隔號 : %c\n"
 
-#: nis/nis_print.c:273
+#: nis/nis_print.c:272
 #, c-format
 msgid "Search Path         : %s\n"
 msgstr "搜尋路徑         : %s\n"
 
-#: nis/nis_print.c:274
+#: nis/nis_print.c:273
 msgid "Columns             :\n"
 msgstr "行             :\n"
 
-#: nis/nis_print.c:277
+#: nis/nis_print.c:276
 #, c-format
 msgid "\t[%d]\tName          : %s\n"
 msgstr "\t[%d]\t名稱          : %s\n"
 
-#: nis/nis_print.c:279
+#: nis/nis_print.c:278
 msgid "\t\tAttributes    : "
 msgstr "\t\t屬性     : "
 
-#: nis/nis_print.c:281
+#: nis/nis_print.c:280
 msgid "\t\tAccess Rights : "
 msgstr "\t\t存取權限 : "
 
-#: nis/nis_print.c:291
+#: nis/nis_print.c:290
 msgid "Linked Object Type : "
 msgstr "連結的物件型態 : "
 
-#: nis/nis_print.c:293
+#: nis/nis_print.c:292
 #, c-format
 msgid "Linked to : %s\n"
 msgstr "連結到 : %s\n"
 
-#: nis/nis_print.c:303
+#: nis/nis_print.c:302
 #, c-format
 msgid "\tEntry data of type %s\n"
 msgstr "\t型別為 %s 的項目資料\n"
 
-#: nis/nis_print.c:306
+#: nis/nis_print.c:305
 #, c-format
 msgid "\t[%u] - [%u bytes] "
 msgstr "\t[%u] - [%u 位元組] "
 
-#: nis/nis_print.c:309
+#: nis/nis_print.c:308
 msgid "Encrypted data\n"
 msgstr "編碼資料\n"
 
-#: nis/nis_print.c:311
+#: nis/nis_print.c:310
 msgid "Binary data\n"
 msgstr "二進位資料\n"
 
-#: nis/nis_print.c:327
+#: nis/nis_print.c:326
 #, c-format
 msgid "Object Name   : %s\n"
 msgstr "物件名稱   : %s\n"
 
-#: nis/nis_print.c:328
+#: nis/nis_print.c:327
 #, c-format
 msgid "Directory     : %s\n"
 msgstr "目錄     : %s\n"
 
-#: nis/nis_print.c:329
+#: nis/nis_print.c:328
 #, c-format
 msgid "Owner         : %s\n"
 msgstr "擁有者       : %s\n"
 
-#: nis/nis_print.c:330
+#: nis/nis_print.c:329
 #, c-format
 msgid "Group         : %s\n"
 msgstr "群組         : %s\n"
 
-#: nis/nis_print.c:331
+#: nis/nis_print.c:330
 msgid "Access Rights : "
 msgstr "存取權限 : "
 
-#: nis/nis_print.c:333
+#: nis/nis_print.c:332
 #, c-format
 msgid ""
 "\n"
@@ -3554,216 +3617,216 @@ msgstr ""
 "\n"
 "存在的時間 : "
 
-#: nis/nis_print.c:336
+#: nis/nis_print.c:335
 #, c-format
 msgid "Creation Time : %s"
 msgstr "產生時間 : %s"
 
-#: nis/nis_print.c:338
+#: nis/nis_print.c:337
 #, c-format
 msgid "Mod. Time     : %s"
 msgstr "修改時間     : %s"
 
-#: nis/nis_print.c:339
+#: nis/nis_print.c:338
 msgid "Object Type   : "
 msgstr "物件型別   : "
 
-#: nis/nis_print.c:359
+#: nis/nis_print.c:358
 #, c-format
 msgid "    Data Length = %u\n"
 msgstr "    資料長度 = %u\n"
 
-#: nis/nis_print.c:373
+#: nis/nis_print.c:372
 #, c-format
 msgid "Status            : %s\n"
 msgstr "狀態              : %s\n"
 
-#: nis/nis_print.c:374
+#: nis/nis_print.c:373
 #, c-format
 msgid "Number of objects : %u\n"
 msgstr "物件的數目 : %u\n"
 
-#: nis/nis_print.c:378
+#: nis/nis_print.c:377
 #, c-format
 msgid "Object #%d:\n"
 msgstr "目的檔 #%d:\n"
 
-#: nis/nis_print_group_entry.c:117
+#: nis/nis_print_group_entry.c:116
 #, c-format
 msgid "Group entry for \"%s.%s\" group:\n"
 msgstr "群組 \"%s.%s\" 群組項目:\n"
 
-#: nis/nis_print_group_entry.c:125
+#: nis/nis_print_group_entry.c:124
 msgid "    Explicit members:\n"
 msgstr "    明確的成員:\n"
 
-#: nis/nis_print_group_entry.c:130
+#: nis/nis_print_group_entry.c:129
 msgid "    No explicit members\n"
 msgstr "    沒有明確的成員\n"
 
-#: nis/nis_print_group_entry.c:133
+#: nis/nis_print_group_entry.c:132
 msgid "    Implicit members:\n"
 msgstr "    不明確的成員:\n"
 
-#: nis/nis_print_group_entry.c:138
+#: nis/nis_print_group_entry.c:137
 msgid "    No implicit members\n"
 msgstr "    沒有不明確的成員\n"
 
-#: nis/nis_print_group_entry.c:141
+#: nis/nis_print_group_entry.c:140
 msgid "    Recursive members:\n"
 msgstr "    遞迴的成員:\n"
 
-#: nis/nis_print_group_entry.c:146
+#: nis/nis_print_group_entry.c:145
 msgid "    No recursive members\n"
 msgstr "    沒有遞迴的成員\n"
 
-#: nis/nis_print_group_entry.c:149
+#: nis/nis_print_group_entry.c:148
 msgid "    Explicit nonmembers:\n"
 msgstr "    明確的非成員:\n"
 
-#: nis/nis_print_group_entry.c:154
+#: nis/nis_print_group_entry.c:153
 msgid "    No explicit nonmembers\n"
 msgstr "    沒有明確的非成員\n"
 
-#: nis/nis_print_group_entry.c:157
+#: nis/nis_print_group_entry.c:156
 msgid "    Implicit nonmembers:\n"
 msgstr "    不明確的非成員:\n"
 
-#: nis/nis_print_group_entry.c:162
+#: nis/nis_print_group_entry.c:161
 msgid "    No implicit nonmembers\n"
 msgstr "    沒有不明確的非成員\n"
 
-#: nis/nis_print_group_entry.c:165
+#: nis/nis_print_group_entry.c:164
 msgid "    Recursive nonmembers:\n"
 msgstr "    遞迴的非成員:\n"
 
-#: nis/nis_print_group_entry.c:170
+#: nis/nis_print_group_entry.c:169
 msgid "    No recursive nonmembers\n"
 msgstr "    沒有遞迴的非成員\n"
 
-#: 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:925
+#: nis/ypclnt.c:924
 msgid "Internal ypbind error"
 msgstr "內部 ypbind 錯誤"
 
-#: nis/ypclnt.c:928
+#: nis/ypclnt.c:927
 msgid "Domain not bound"
 msgstr "網域找不到"
 
-#: nis/ypclnt.c:931
+#: nis/ypclnt.c:930
 msgid "System resource allocation failure"
 msgstr "系統資源配置失敗"
 
-#: nis/ypclnt.c:934
+#: nis/ypclnt.c:933
 msgid "Unknown ypbind error"
 msgstr "未知的 ypbind 錯誤"
 
-#: nis/ypclnt.c:975
+#: nis/ypclnt.c:974
 msgid "yp_update: cannot convert host to netname\n"
 msgstr "yp_update: 無法轉換主機的網路名稱\n"
 
-#: nis/ypclnt.c:993
+#: nis/ypclnt.c:992
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: 無法取得伺服器位址\n"
 
-#: nscd/aicache.c:69 nscd/hstcache.c:452
+#: nscd/aicache.c:68 nscd/hstcache.c:451
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "尚未在 hosts 快取中找到 \"%s\"!"
 
-#: nscd/aicache.c:71 nscd/hstcache.c:454
+#: nscd/aicache.c:70 nscd/hstcache.c:453
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
 msgstr "重新載入「%s」於主機快取!"
 
-#: nscd/cache.c:151
+#: nscd/cache.c:150
 #, c-format
 msgid "add new entry \"%s\" of type %s for %s to cache%s"
 msgstr "加入新的項目「%s」的型態 %s 用於 %s 到 cache%s"
 
-#: nscd/cache.c:153
+#: nscd/cache.c:152
 msgid " (first)"
 msgstr " (先)"
 
-#: nscd/cache.c:288
+#: nscd/cache.c:287
 #, c-format
 msgid "checking for monitored file `%s': %s"
 msgstr "檢查監控中檔案「%s」中:%s"
 
-#: nscd/cache.c:298
+#: nscd/cache.c:297
 #, c-format
 msgid "monitored file `%s` changed (mtime)"
 msgstr "監控中檔案「%s」遭變更 (mtime)"
 
-#: nscd/cache.c:341
+#: nscd/cache.c:340
 #, c-format
 msgid "pruning %s cache; time %ld"
 msgstr "pruning %s 快取;時間 %ld"
 
-#: nscd/cache.c:370
+#: nscd/cache.c:369
 #, c-format
 msgid "considering %s entry \"%s\", timeout %<PRIu64>"
 msgstr "認為中 %s 項目「%s」,逾時 %<PRIu64>"
@@ -3777,429 +3840,429 @@ msgstr " - 所有資料:"
 msgid " - remaining data %p: "
 msgstr " - 剩餘資料 %p:"
 
-#: nscd/connections.c:520
+#: nscd/connections.c:519
 #, c-format
 msgid "invalid persistent database file \"%s\": %s"
 msgstr "無效的永久性的資料庫檔案「%s」:%s"
 
-#: nscd/connections.c:528
+#: nscd/connections.c:527
 msgid "uninitialized header"
 msgstr "未起始的標頭"
 
-#: nscd/connections.c:533
+#: nscd/connections.c:532
 msgid "header size does not match"
 msgstr "頁首大小不吻合"
 
-#: nscd/connections.c:543
+#: nscd/connections.c:542
 msgid "file size does not match"
 msgstr "檔案大小不吻合"
 
-#: nscd/connections.c:560
+#: nscd/connections.c:559
 msgid "verification failed"
 msgstr "查核失敗"
 
-#: nscd/connections.c:574
+#: nscd/connections.c:573
 #, c-format
 msgid "suggested size of table for database %s larger than the persistent database's table"
 msgstr "用於資料庫 %s 的建議表格大小大於永久性的資料庫表格"
 
-#: nscd/connections.c:585 nscd/connections.c:669
+#: nscd/connections.c:584 nscd/connections.c:668
 #, c-format
 msgid "cannot create read-only descriptor for \"%s\"; no mmap"
 msgstr "無法建立用於「%s」的唯讀描述元;無 mmap"
 
-#: nscd/connections.c:601
+#: nscd/connections.c:600
 #, c-format
 msgid "cannot access '%s'"
 msgstr "無法存取『%s』"
 
-#: nscd/connections.c:649
+#: nscd/connections.c:648
 #, c-format
 msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
 msgstr "資料庫用於 %s 已損壞或同步地使用;移除 %s 手動地如果必要的話和重新啟動"
 
-#: nscd/connections.c:655
+#: nscd/connections.c:654
 #, c-format
 msgid "cannot create %s; no persistent database used"
 msgstr "無法建立 %s; 未使用永久性的資料庫"
 
-#: nscd/connections.c:658
+#: nscd/connections.c:657
 #, c-format
 msgid "cannot create %s; no sharing possible"
 msgstr "無法建立 %s; 不可能共享"
 
-#: nscd/connections.c:729
+#: nscd/connections.c:728
 #, c-format
 msgid "cannot write to database file %s: %s"
 msgstr "無法寫入資料庫檔案 %s: %s"
 
-#: nscd/connections.c:785
+#: nscd/connections.c:784
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "無法開啟 socket: %s"
 
-#: nscd/connections.c:804
+#: nscd/connections.c:803
 #, c-format
 msgid "cannot enable socket to accept connections: %s"
 msgstr "無法開啟 socket 來接受連線: %s"
 
-#: nscd/connections.c:861
+#: nscd/connections.c:860
 #, c-format
 msgid "disabled inotify-based monitoring for file `%s': %s"
 msgstr "已停用「%s」檔案基於 inotify 的監控:%s"
 
-#: nscd/connections.c:865
+#: nscd/connections.c:864
 #, c-format
 msgid "monitoring file `%s` (%d)"
 msgstr "正在監控「%s」檔案 (%d)"
 
-#: nscd/connections.c:878
+#: nscd/connections.c:877
 #, c-format
 msgid "disabled inotify-based monitoring for directory `%s': %s"
 msgstr "已停用「%s」目錄基於 inotify 的監控:%s"
 
-#: nscd/connections.c:882
+#: nscd/connections.c:881
 #, c-format
 msgid "monitoring directory `%s` (%d)"
 msgstr "正在監控「%s」目錄 (%d)"
 
-#: nscd/connections.c:910
+#: nscd/connections.c:909
 #, c-format
 msgid "monitoring file %s for database %s"
 msgstr "正在監控 %2$s 資料庫的 %1$s 檔案"
 
-#: nscd/connections.c:920
+#: nscd/connections.c:919
 #, c-format
 msgid "stat failed for file `%s'; will try again later: %s"
 msgstr "取得「%s」檔案的資訊 (stat) 失敗;將會在稍候重新嘗試:%s"
 
-#: nscd/connections.c:1039
+#: nscd/connections.c:1038
 #, c-format
 msgid "provide access to FD %d, for %s"
 msgstr "提供存取到 FD %d, 用於 %s"
 
-#: nscd/connections.c:1051
+#: nscd/connections.c:1050
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "不能處理舊 %d 版的請求;目前使用的版本是 %d"
 
-#: nscd/connections.c:1074
+#: nscd/connections.c:1073
 #, c-format
 msgid "request from %ld not handled due to missing permission"
 msgstr "由於缺少權限而無法處理來自 %ld 的要求"
 
-#: nscd/connections.c:1079
+#: nscd/connections.c:1078
 #, c-format
 msgid "request from '%s' [%ld] not handled due to missing permission"
 msgstr "由於缺少權限而無法處理來自 '%s' [%ld] 的要求"
 
-#: nscd/connections.c:1084
+#: nscd/connections.c:1083
 msgid "request not handled due to missing permission"
 msgstr "要求無法控柄的由於缺少權限"
 
-#: nscd/connections.c:1122 nscd/connections.c:1148
+#: nscd/connections.c:1121 nscd/connections.c:1147
 #, c-format
 msgid "cannot write result: %s"
 msgstr "無法寫入結果: %s"
 
-#: nscd/connections.c:1239
+#: nscd/connections.c:1238
 #, c-format
 msgid "error getting caller's id: %s"
 msgstr "取得呼叫程式識別碼時發生錯誤: %s"
 
-#: nscd/connections.c:1349
+#: nscd/connections.c:1348
 #, c-format
 msgid "cannot open /proc/self/cmdline: %m; disabling paranoia mode"
 msgstr "無法開啟 /proc/self/cmdline: %m;停用 paranoia 模式"
 
-#: nscd/connections.c:1372
+#: nscd/connections.c:1371
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr "無法變更為舊的 UID:%s; 停用 paranoia 模式"
 
-#: nscd/connections.c:1383
+#: nscd/connections.c:1382
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr "無法變更為舊的 GID:%s; 停用 paranoia 模式"
 
-#: nscd/connections.c:1397
+#: nscd/connections.c:1396
 #, c-format
 msgid "cannot change to old working directory: %s; disabling paranoia mode"
 msgstr "無法變更為舊的工作目錄:%s; 停用 paranoia 模式"
 
-#: nscd/connections.c:1444
+#: nscd/connections.c:1443
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr "re-exec 失敗:%s; 停用 paranoia 模式"
 
-#: nscd/connections.c:1453
+#: nscd/connections.c:1452
 #, c-format
 msgid "cannot change current working directory to \"/\": %s"
 msgstr "無法變更目前的工作目錄到「/」:%s"
 
-#: nscd/connections.c:1637
+#: nscd/connections.c:1636
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "讀取請求時發現輸入值過短: %s"
 
-#: nscd/connections.c:1670
+#: nscd/connections.c:1669
 #, c-format
 msgid "key length in request too long: %d"
 msgstr "在此請求中使用的鍵值太長了: %d"
 
-#: nscd/connections.c:1683
+#: nscd/connections.c:1682
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "讀取請求的鍵值時發現輸入值過短: %s"
 
-#: nscd/connections.c:1693
+#: nscd/connections.c:1692
 #, c-format
 msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr "handle_request: 請求已被接受 (版本為 %d) 來自於 PID %ld"
 
-#: nscd/connections.c:1698
+#: nscd/connections.c:1697
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "handle_request: 請求已被接受 (版本為 %d)"
 
-#: nscd/connections.c:1838
+#: nscd/connections.c:1837
 #, c-format
 msgid "ignored inotify event for `%s` (file exists)"
 msgstr "已忽略「%s」的 inotify 事件(檔案已經存在)"
 
-#: nscd/connections.c:1843
+#: nscd/connections.c:1842
 #, c-format
 msgid "monitored file `%s` was %s, removing watch"
 msgstr "監控中檔案「%s」原來是 %s,移除觀察"
 
-#: nscd/connections.c:1851 nscd/connections.c:1893
+#: nscd/connections.c:1850 nscd/connections.c:1892
 #, c-format
 msgid "failed to remove file watch `%s`: %s"
 msgstr "無法移除「%s」檔案觀察:%s"
 
-#: nscd/connections.c:1866
+#: nscd/connections.c:1865
 #, c-format
 msgid "monitored file `%s` was written to"
 msgstr "監控中檔案「%s」已寫入"
 
-#: nscd/connections.c:1890
+#: nscd/connections.c:1889
 #, c-format
 msgid "monitored parent directory `%s` was %s, removing watch on `%s`"
 msgstr "監控中上層目錄「%s」原來是 %s,移除「%s」上的觀察"
 
-#: nscd/connections.c:1916
+#: nscd/connections.c:1915
 #, c-format
 msgid "monitored file `%s` was %s, adding watch"
 msgstr "監控中檔案「%s」原來是 %s,新增觀察"
 
-#: nscd/connections.c:1928
+#: nscd/connections.c:1927
 #, c-format
 msgid "failed to add file watch `%s`: %s"
 msgstr "無法新增「%s」檔案觀察:%s"
 
-#: nscd/connections.c:2106 nscd/connections.c:2271
+#: nscd/connections.c:2105 nscd/connections.c:2270
 #, c-format
 msgid "disabled inotify-based monitoring after read error %d"
 msgstr "在發生讀取錯誤 %d 後,已停用基於 inotify 的監控"
 
-#: nscd/connections.c:2386
+#: nscd/connections.c:2385
 msgid "could not initialize conditional variable"
 msgstr "無法初始化條件變數"
 
-#: nscd/connections.c:2394
+#: nscd/connections.c:2393
 msgid "could not start clean-up thread; terminating"
 msgstr "無法開始清理執行緒;終止中"
 
-#: nscd/connections.c:2408
+#: nscd/connections.c:2407
 msgid "could not start any worker thread; terminating"
 msgstr "無法開始任何背景工作執行緒;終止中"
 
-#: nscd/connections.c:2463 nscd/connections.c:2465 nscd/connections.c:2481
-#: nscd/connections.c:2491 nscd/connections.c:2509 nscd/connections.c:2520
-#: nscd/connections.c:2530
+#: nscd/connections.c:2462 nscd/connections.c:2464 nscd/connections.c:2480
+#: nscd/connections.c:2490 nscd/connections.c:2508 nscd/connections.c:2519
+#: nscd/connections.c:2529
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr "以使用者 '%s' 的身分執行 nscd 失敗"
 
-#: nscd/connections.c:2483
+#: nscd/connections.c:2482
 msgid "initial getgrouplist failed"
 msgstr "初始 getgrouplist 失敗"
 
-#: nscd/connections.c:2492
+#: nscd/connections.c:2491
 msgid "getgrouplist failed"
 msgstr "getgrouplist 失敗"
 
-#: nscd/connections.c:2510
+#: nscd/connections.c:2509
 msgid "setgroups failed"
 msgstr "setgroups 失敗"
 
-#: nscd/grpcache.c:385 nscd/hstcache.c:402 nscd/initgrcache.c:378
-#: nscd/pwdcache.c:363 nscd/servicescache.c:310
+#: nscd/grpcache.c:384 nscd/hstcache.c:401 nscd/initgrcache.c:377
+#: nscd/pwdcache.c:362 nscd/servicescache.c:309
 #, c-format
 msgid "short write in %s: %s"
 msgstr "寫入 %s 的資料過短: %s"
 
-#: nscd/grpcache.c:430 nscd/initgrcache.c:75
+#: nscd/grpcache.c:429 nscd/initgrcache.c:74
 #, c-format
 msgid "Haven't found \"%s\" in group cache!"
 msgstr "尚未在群組快取中找到 \"%s\"!"
 
-#: nscd/grpcache.c:432 nscd/initgrcache.c:77
+#: nscd/grpcache.c:431 nscd/initgrcache.c:76
 #, c-format
 msgid "Reloading \"%s\" in group cache!"
 msgstr "重新載入「%s」於群組快取!"
 
-#: nscd/grpcache.c:492
+#: nscd/grpcache.c:491
 #, c-format
 msgid "Invalid numeric gid \"%s\"!"
 msgstr "無效的 gid 數值 \"%s\"!"
 
-#: nscd/mem.c:425
+#: nscd/mem.c:424
 #, c-format
 msgid "freed %zu bytes in %s cache"
 msgstr "在 %2$s 快取中 %1$zu 位元組可用"
 
-#: nscd/mem.c:568
+#: nscd/mem.c:567
 #, c-format
 msgid "no more memory for database '%s'"
 msgstr "無記憶體可用於資料庫「%s」"
 
-#: nscd/netgroupcache.c:122
+#: nscd/netgroupcache.c:121
 #, c-format
 msgid "Haven't found \"%s\" in netgroup cache!"
 msgstr "尚未在網路群組快取中找到「%s」!"
 
-#: nscd/netgroupcache.c:124
+#: nscd/netgroupcache.c:123
 #, c-format
 msgid "Reloading \"%s\" in netgroup cache!"
 msgstr "重新在網路群組快取中載入「%s」!"
 
-#: nscd/netgroupcache.c:470
+#: nscd/netgroupcache.c:469
 #, c-format
 msgid "Haven't found \"%s (%s,%s,%s)\" in netgroup cache!"
 msgstr "尚未在網路群組快取中找到「%s (%s,%s,%s)」!"
 
-#: nscd/netgroupcache.c:473
+#: nscd/netgroupcache.c:472
 #, c-format
 msgid "Reloading \"%s (%s,%s,%s)\" in netgroup cache!"
 msgstr "重新在網路群組快取中載入「%s (%s,%s,%s)」!"
 
-#: nscd/nscd.c:108
+#: nscd/nscd.c:107
 msgid "Read configuration data from NAME"
 msgstr "自名稱中讀取設定資料"
 
-#: nscd/nscd.c:110
+#: nscd/nscd.c:109
 msgid "Do not fork and display messages on the current tty"
 msgstr "不在目前的 tty 產生子行程 (fork) 以及顯示訊息"
 
-#: nscd/nscd.c:112
+#: nscd/nscd.c:111
 msgid "Print contents of the offline cache file NAME"
 msgstr "輸出離線快取檔案 NAME 的內容"
 
-#: nscd/nscd.c:114
+#: nscd/nscd.c:113
 msgid "Do not fork, but otherwise behave like a daemon"
 msgstr "不衍生,但是否則 behave 如同守護程式"
 
-#: nscd/nscd.c:115
+#: nscd/nscd.c:114
 msgid "NUMBER"
 msgstr "號碼"
 
-#: nscd/nscd.c:115
+#: nscd/nscd.c:114
 msgid "Start NUMBER threads"
 msgstr "啟動執行緒"
 
-#: nscd/nscd.c:116
+#: nscd/nscd.c:115
 msgid "Shut the server down"
 msgstr "將伺服器關閉"
 
-#: nscd/nscd.c:117
+#: nscd/nscd.c:116
 msgid "Print current configuration statistics"
 msgstr "印出目前組態統計"
 
-#: nscd/nscd.c:118
+#: nscd/nscd.c:117
 msgid "TABLE"
 msgstr "表格"
 
-#: nscd/nscd.c:119
+#: nscd/nscd.c:118
 msgid "Invalidate the specified cache"
 msgstr "使選定的快取無效"
 
-#: nscd/nscd.c:120
+#: nscd/nscd.c:119
 msgid "TABLE,yes"
 msgstr "要製作表格"
 
-#: nscd/nscd.c:121
+#: nscd/nscd.c:120
 msgid "Use separate cache for each user"
 msgstr "對不同使用者使用不同的快取檔案"
 
-#: nscd/nscd.c:126
+#: nscd/nscd.c:125
 msgid "Name Service Cache Daemon."
 msgstr "網域名稱快取精靈"
 
-#: nscd/nscd.c:159 nss/getent.c:987 nss/makedb.c:207
+#: nscd/nscd.c:158 nss/getent.c:986 nss/makedb.c:206
 #, c-format
 msgid "wrong number of arguments"
 msgstr "參數數目不對"
 
-#: nscd/nscd.c:174
+#: nscd/nscd.c:173
 #, c-format
 msgid "failure while reading configuration file; this is fatal"
 msgstr "讀取組態檔案時失敗;這是一個嚴重錯誤"
 
-#: nscd/nscd.c:183
+#: nscd/nscd.c:182
 #, c-format
 msgid "already running"
 msgstr "已在執行"
 
-#: nscd/nscd.c:203
+#: nscd/nscd.c:202
 #, c-format
 msgid "cannot create a pipe to talk to the child"
 msgstr "無法建立與子程序通訊的管道"
 
-#: nscd/nscd.c:207
+#: nscd/nscd.c:206
 #, c-format
 msgid "cannot fork"
 msgstr "無法衍生"
 
-#: nscd/nscd.c:277
+#: nscd/nscd.c:276
 msgid "cannot change current working directory to \"/\""
 msgstr "無法變更目前的工作目錄到「/」"
 
-#: nscd/nscd.c:285
+#: nscd/nscd.c:284
 msgid "Could not create log file"
 msgstr "無法建立記錄檔"
 
-#: nscd/nscd.c:364 nscd/nscd_stat.c:209
+#: nscd/nscd.c:363 nscd/nscd_stat.c:208
 #, c-format
 msgid "write incomplete"
 msgstr "寫入不完全"
 
-#: nscd/nscd.c:375
+#: nscd/nscd.c:374
 #, c-format
 msgid "cannot read invalidate ACK"
 msgstr "無法讀取設為無效的 ACK"
 
-#: nscd/nscd.c:381
+#: nscd/nscd.c:380
 #, c-format
 msgid "invalidation failed"
 msgstr "無效化失敗"
 
-#: nscd/nscd.c:430 nscd/nscd.c:455 nscd/nscd_stat.c:190
+#: nscd/nscd.c:429 nscd/nscd.c:454 nscd/nscd_stat.c:189
 #, c-format
 msgid "Only root is allowed to use this option!"
 msgstr "只有 root 才可以使用此一選項!"
 
-#: nscd/nscd.c:450
+#: nscd/nscd.c:449
 #, c-format
 msgid "'%s' is not a known database"
 msgstr "『%s』並非一已知資料庫"
 
-#: nscd/nscd.c:465
+#: nscd/nscd.c:464
 #, c-format
 msgid "secure services not implemented anymore"
 msgstr "安全服務不再實作"
 
-#: nscd/nscd.c:498
+#: nscd/nscd.c:497
 #, c-format
 msgid ""
 "Supported tables:\n"
@@ -4215,90 +4278,90 @@ msgstr ""
 "%s。\n"
 "\n"
 
-#: nscd/nscd.c:648
+#: nscd/nscd.c:647
 #, c-format
 msgid "'wait' failed\n"
 msgstr "'wait' 失敗\n"
 
-#: nscd/nscd.c:655
+#: nscd/nscd.c:654
 #, c-format
 msgid "child exited with status %d\n"
 msgstr "子程序已結束,回傳碼:%d\n"
 
-#: nscd/nscd.c:660
+#: nscd/nscd.c:659
 #, c-format
 msgid "child terminated by signal %d\n"
 msgstr "子程序被 %d 信號終止\n"
 
-#: nscd/nscd_conf.c:54
+#: nscd/nscd_conf.c:53
 #, c-format
 msgid "database %s is not supported"
 msgstr "資料庫 %s 並未支援"
 
-#: nscd/nscd_conf.c:105
+#: nscd/nscd_conf.c:104
 #, c-format
 msgid "Parse error: %s"
 msgstr "解析錯誤: %s"
 
-#: nscd/nscd_conf.c:191
+#: nscd/nscd_conf.c:190
 #, c-format
 msgid "Must specify user name for server-user option"
 msgstr "必須為伺服器使用者選項指定使用者名稱"
 
-#: nscd/nscd_conf.c:201
+#: nscd/nscd_conf.c:200
 #, c-format
 msgid "Must specify user name for stat-user option"
 msgstr "必須為 stat 使用者選項指定使用者名稱"
 
-#: nscd/nscd_conf.c:259
+#: nscd/nscd_conf.c:258
 #, c-format
 msgid "Must specify value for restart-interval option"
 msgstr "必須指定用於 restart-interval 選項的值"
 
-#: nscd/nscd_conf.c:273
+#: nscd/nscd_conf.c:272
 #, c-format
 msgid "Unknown option: %s %s %s"
 msgstr "未知的選項: %s %s %s"
 
-#: nscd/nscd_conf.c:286
+#: nscd/nscd_conf.c:285
 #, c-format
 msgid "cannot get current working directory: %s; disabling paranoia mode"
 msgstr "無法取得目前的工作目錄:%s; 停用 paranoia 模式"
 
-#: nscd/nscd_conf.c:306
+#: nscd/nscd_conf.c:305
 #, c-format
 msgid "maximum file size for %s database too small"
 msgstr "最大值檔案大小用於 %s 資料庫太小"
 
-#: nscd/nscd_stat.c:159
+#: nscd/nscd_stat.c:158
 #, c-format
 msgid "cannot write statistics: %s"
 msgstr "無法寫入統計資料: %s"
 
-#: nscd/nscd_stat.c:174
+#: nscd/nscd_stat.c:173
 msgid "yes"
 msgstr "是"
 
-#: nscd/nscd_stat.c:175
+#: nscd/nscd_stat.c:174
 msgid "no"
 msgstr "無"
 
-#: nscd/nscd_stat.c:186
+#: nscd/nscd_stat.c:185
 #, c-format
 msgid "Only root or %s is allowed to use this option!"
 msgstr "只有 root 或 %s 才允許使用此一選項!"
 
-#: nscd/nscd_stat.c:197
+#: nscd/nscd_stat.c:196
 #, c-format
 msgid "nscd not running!\n"
 msgstr "nscd 並沒有在執行!\n"
 
-#: nscd/nscd_stat.c:221
+#: nscd/nscd_stat.c:220
 #, c-format
 msgid "cannot read statistics data"
 msgstr "無法讀取統計資料"
 
-#: nscd/nscd_stat.c:224
+#: nscd/nscd_stat.c:223
 #, c-format
 msgid ""
 "nscd configuration:\n"
@@ -4309,27 +4372,27 @@ msgstr ""
 "\n"
 "%15d  伺服程式錯誤訊息報告等級\n"
 
-#: nscd/nscd_stat.c:248
+#: nscd/nscd_stat.c:247
 #, c-format
 msgid "%3ud %2uh %2um %2lus  server runtime\n"
 msgstr "%3ud %2uh %2um %2lus  伺服器 執行時期\n"
 
-#: nscd/nscd_stat.c:251
+#: nscd/nscd_stat.c:250
 #, c-format
 msgid "    %2uh %2um %2lus  server runtime\n"
 msgstr "    %2uh %2um %2lus  伺服器 執行時期\n"
 
-#: nscd/nscd_stat.c:253
+#: nscd/nscd_stat.c:252
 #, c-format
 msgid "        %2um %2lus  server runtime\n"
 msgstr "        %2um %2lus  伺服器 執行時期\n"
 
-#: nscd/nscd_stat.c:255
+#: nscd/nscd_stat.c:254
 #, c-format
 msgid "            %2lus  server runtime\n"
 msgstr "            %2lus  伺服器 執行時期\n"
 
-#: nscd/nscd_stat.c:257
+#: nscd/nscd_stat.c:256
 #, c-format
 msgid ""
 "%15d  current number of threads\n"
@@ -4346,7 +4409,7 @@ msgstr ""
 "%15lu  內部重新啟動\n"
 "%15u  重新載入計數\n"
 
-#: nscd/nscd_stat.c:292
+#: nscd/nscd_stat.c:291
 #, c-format
 msgid ""
 "\n"
@@ -4397,100 +4460,100 @@ msgstr ""
 "%15<PRIuMAX> 記憶體配置失敗\n"
 "%15s  檢查 /etc/%s 的變更\n"
 
-#: nscd/pwdcache.c:407
+#: nscd/pwdcache.c:406
 #, c-format
 msgid "Haven't found \"%s\" in user database cache!"
 msgstr "未在使用者資料庫快取發現「%s」!"
 
-#: nscd/pwdcache.c:409
+#: nscd/pwdcache.c:408
 #, c-format
 msgid "Reloading \"%s\" in user database cache!"
 msgstr "正在重新載入使用者資料庫快取中的「%s」!"
 
-#: nscd/pwdcache.c:471
+#: nscd/pwdcache.c:470
 #, c-format
 msgid "Invalid numeric uid \"%s\"!"
 msgstr "無效的 uid 數值 \"%s\"!"
 
-#: nscd/selinux.c:155
+#: nscd/selinux.c:154
 #, c-format
 msgid "Failed opening connection to the audit subsystem: %m"
 msgstr "失敗的開啟連線到稽核子系統:%m"
 
-#: nscd/selinux.c:176
+#: nscd/selinux.c:175
 msgid "Failed to set keep-capabilities"
 msgstr "設定功能保持時失敗"
 
-#: nscd/selinux.c:177 nscd/selinux.c:240
+#: nscd/selinux.c:176 nscd/selinux.c:239
 msgid "prctl(KEEPCAPS) failed"
 msgstr "prctl(KEEPCAPS) 失敗"
 
-#: nscd/selinux.c:191
+#: nscd/selinux.c:190
 msgid "Failed to initialize drop of capabilities"
 msgstr "初始化功能放棄時失敗"
 
-#: nscd/selinux.c:192
+#: nscd/selinux.c:191
 msgid "cap_init failed"
 msgstr "cap_init 失敗"
 
-#: nscd/selinux.c:213 nscd/selinux.c:230
+#: nscd/selinux.c:212 nscd/selinux.c:229
 msgid "Failed to drop capabilities"
 msgstr "放棄功能時失敗"
 
-#: nscd/selinux.c:214 nscd/selinux.c:231
+#: nscd/selinux.c:213 nscd/selinux.c:230
 msgid "cap_set_proc failed"
 msgstr "cap_set_proc 失敗"
 
-#: nscd/selinux.c:239
+#: nscd/selinux.c:238
 msgid "Failed to unset keep-capabilities"
 msgstr "解除設定功能保持時失敗"
 
-#: nscd/selinux.c:255
+#: nscd/selinux.c:254
 msgid "Failed to determine if kernel supports SELinux"
 msgstr "決定如果內核支援 SELinux 時失敗"
 
-#: nscd/selinux.c:270
+#: nscd/selinux.c:269
 msgid "Failed to start AVC thread"
 msgstr "開始 AVC 執行緒時失敗"
 
-#: nscd/selinux.c:292
+#: nscd/selinux.c:291
 msgid "Failed to create AVC lock"
 msgstr "建立 AVC 鎖定時失敗"
 
-#: nscd/selinux.c:338
+#: nscd/selinux.c:337
 msgid "Failed to start AVC"
 msgstr "啟始 AVC 時失敗"
 
-#: nscd/selinux.c:340
+#: nscd/selinux.c:339
 msgid "Access Vector Cache (AVC) started"
 msgstr "存取向量快取 (AVC) 開始"
 
-#: nscd/selinux.c:382
+#: nscd/selinux.c:381
 msgid "Error querying policy for undefined object classes or permissions."
 msgstr "查詢未定義物件類別或權限的政策時發生錯誤。"
 
-#: nscd/selinux.c:389
+#: nscd/selinux.c:388
 msgid "Error getting security class for nscd."
 msgstr "取得 nscd 的安全性類別時發生錯誤。"
 
-#: nscd/selinux.c:394
+#: nscd/selinux.c:393
 #, c-format
 msgid "Error translating permission name \"%s\" to access vector bit."
 msgstr "將「%s」權限名稱解譯成存取向量位元 (access vector bit) 時發生錯誤。"
 
-#: nscd/selinux.c:404
+#: nscd/selinux.c:403
 msgid "Error getting context of socket peer"
 msgstr "取得對等通訊端的狀態組合時發生錯誤"
 
-#: nscd/selinux.c:409
+#: nscd/selinux.c:408
 msgid "Error getting context of nscd"
 msgstr "取得 nscd 的狀態組合時發生錯誤"
 
-#: nscd/selinux.c:415
+#: nscd/selinux.c:414
 msgid "Error getting sid from context"
 msgstr "從狀態組合取得 sid 時發生錯誤"
 
-#: nscd/selinux.c:454
+#: nscd/selinux.c:453
 #, c-format
 msgid ""
 "\n"
@@ -4517,85 +4580,85 @@ msgstr ""
 "%15u  CAV 探查\n"
 "%15u  CAV 缺少\n"
 
-#: nscd/servicescache.c:358
+#: nscd/servicescache.c:357
 #, c-format
 msgid "Haven't found \"%s\" in services cache!"
 msgstr "尚未在服務快取中找到「%s」!"
 
-#: nscd/servicescache.c:360
+#: nscd/servicescache.c:359
 #, c-format
 msgid "Reloading \"%s\" in services cache!"
 msgstr "重新載入「%s」於服務快取!"
 
-#: nss/getent.c:55
+#: nss/getent.c:54
 msgid "database [key ...]"
 msgstr "資料庫 [鍵值…]"
 
-#: nss/getent.c:60
+#: nss/getent.c:59
 msgid "CONFIG"
 msgstr "組態"
 
-#: nss/getent.c:60
+#: nss/getent.c:59
 msgid "Service configuration to be used"
 msgstr "將要使用的服務組態"
 
-#: nss/getent.c:61
+#: nss/getent.c:60
 msgid "disable IDN encoding"
 msgstr "停用 IDN 編碼"
 
-#: nss/getent.c:66
+#: nss/getent.c:65
 msgid "Get entries from administrative database."
 msgstr "從管理資料庫取得條目。"
 
-#: nss/getent.c:150 nss/getent.c:462 nss/getent.c:509
+#: nss/getent.c:149 nss/getent.c:461 nss/getent.c:508
 #, c-format
 msgid "Enumeration not supported on %s\n"
 msgstr "此項目在 %s 中不被支援\n"
 
-#: nss/getent.c:517 nss/getent.c:530
+#: nss/getent.c:516 nss/getent.c:529
 #, c-format
 msgid "Could not allocate group list: %m\n"
 msgstr "無法分配群組列表:%m\n"
 
-#: nss/getent.c:901
+#: nss/getent.c:900
 #, c-format
 msgid "Unknown database name"
 msgstr "不明的資料庫名稱"
 
-#: nss/getent.c:931
+#: nss/getent.c:930
 msgid "Supported databases:\n"
 msgstr "支援的資料庫:\n"
 
-#: nss/getent.c:997
+#: nss/getent.c:996
 #, c-format
 msgid "Unknown database: %s\n"
 msgstr "未知的資料庫: %s\n"
 
-#: nss/makedb.c:120
+#: nss/makedb.c:119
 msgid "Convert key to lower case"
 msgstr "轉換鍵轉換為小寫"
 
-#: nss/makedb.c:123
+#: nss/makedb.c:122
 msgid "Do not print messages while building database"
 msgstr "不印出訊息當建立資料庫"
 
-#: nss/makedb.c:125
+#: nss/makedb.c:124
 msgid "Print content of database file, one entry a line"
 msgstr "印出內容的資料庫檔案,一個項目列"
 
-#: nss/makedb.c:126
+#: nss/makedb.c:125
 msgid "CHAR"
 msgstr "字元"
 
-#: nss/makedb.c:127
+#: nss/makedb.c:126
 msgid "Generated line not part of iteration"
 msgstr "產生的列並非迭代的部分"
 
-#: nss/makedb.c:132
+#: nss/makedb.c:131
 msgid "Create simple database from textual input."
 msgstr "從文字輸入建立簡單的資料庫。"
 
-#: nss/makedb.c:135
+#: nss/makedb.c:134
 msgid ""
 "INPUT-FILE OUTPUT-FILE\n"
 "-o OUTPUT-FILE INPUT-FILE\n"
@@ -4605,71 +4668,71 @@ msgstr ""
 "-o 輸出檔案名稱 輸入檔案名稱\n"
 "-u 輸入檔案名稱"
 
-#: nss/makedb.c:228
+#: nss/makedb.c:227
 #, c-format
 msgid "cannot open database file `%s'"
 msgstr "無法開啟資料庫檔案 %s"
 
-#: nss/makedb.c:273
+#: nss/makedb.c:272
 #, c-format
 msgid "no entries to be processed"
 msgstr "沒有條目可供處理"
 
-#: nss/makedb.c:283
+#: nss/makedb.c:282
 #, c-format
 msgid "cannot create temporary file name"
 msgstr "無法建立暫存檔案名稱"
 
-#: nss/makedb.c:289
+#: nss/makedb.c:288
 #, c-format
 msgid "cannot create temporary file"
 msgstr "無法產生暫時檔"
 
-#: nss/makedb.c:305
+#: nss/makedb.c:304
 #, c-format
 msgid "cannot stat newly created file"
 msgstr "無法取得新建立檔案的狀態"
 
-#: nss/makedb.c:316
+#: nss/makedb.c:315
 #, c-format
 msgid "cannot rename temporary file"
 msgstr "無法重新命名暫存檔案"
 
-#: nss/makedb.c:528 nss/makedb.c:551
+#: nss/makedb.c:527 nss/makedb.c:550
 #, c-format
 msgid "cannot create search tree"
 msgstr "無法建立搜尋樹"
 
-#: nss/makedb.c:557
+#: nss/makedb.c:556
 msgid "duplicate key"
 msgstr "重複鍵值"
 
-#: nss/makedb.c:569
+#: nss/makedb.c:568
 #, c-format
 msgid "problems while reading `%s'"
 msgstr "讀取「%s」時發生問題"
 
-#: nss/makedb.c:805
+#: nss/makedb.c:804
 #, c-format
 msgid "failed to write new database file"
 msgstr "寫入新資料庫檔案時失敗"
 
-#: nss/makedb.c:822
+#: nss/makedb.c:821
 #, c-format
 msgid "cannot stat database file"
 msgstr "無法取得資料庫檔案的狀態"
 
-#: nss/makedb.c:827
+#: nss/makedb.c:826
 #, c-format
 msgid "cannot map database file"
 msgstr "無法映射資料庫檔案"
 
-#: nss/makedb.c:830
+#: nss/makedb.c:829
 #, c-format
 msgid "file not a database file"
 msgstr "檔案不是資料庫檔案"
 
-#: nss/makedb.c:888
+#: nss/makedb.c:887
 #, c-format
 msgid "cannot set file creation context for `%s'"
 msgstr "無法為 %s 設定檔案建立語境"
@@ -4825,7 +4888,7 @@ msgstr "不對稱的 ) 或 \\)"
 msgid "No previous regular expression"
 msgstr "沒有上一個正規表示式"
 
-#: posix/wordexp.c:1795
+#: posix/wordexp.c:1794
 msgid "parameter null or not set"
 msgstr "參數為空字元或是未設置"
 
@@ -4857,27 +4920,27 @@ msgstr "內部解讀錯誤"
 msgid "Unknown resolver error"
 msgstr "未知的解讀錯誤"
 
-#: resolv/res_hconf.c:118
+#: resolv/res_hconf.c:117
 #, c-format
 msgid "%s: line %d: cannot specify more than %d trim domains"
 msgstr "%s: 第 %d 列: 無法指定超過 %d 個修剪範圍"
 
-#: resolv/res_hconf.c:139
+#: resolv/res_hconf.c:138
 #, c-format
 msgid "%s: line %d: list delimiter not followed by domain"
 msgstr "%s: 第 %d 列: 範圍不可跟在表列分隔字元之後"
 
-#: resolv/res_hconf.c:176
+#: resolv/res_hconf.c:175
 #, c-format
 msgid "%s: line %d: expected `on' or `off', found `%s'\n"
 msgstr "%s: 第 %d 列: 預期為 `on' 或 `off',卻發現 `%s'\n"
 
-#: resolv/res_hconf.c:219
+#: resolv/res_hconf.c:218
 #, c-format
 msgid "%s: line %d: bad command `%s'\n"
 msgstr "%s: 第 %d 列: 不當的命令 `%s'\n"
 
-#: resolv/res_hconf.c:252
+#: resolv/res_hconf.c:251
 #, c-format
 msgid "%s: line %d: ignoring trailing garbage `%s'\n"
 msgstr "%s: 第 %d 列: 正在忽略尾端的無用資料 `%s'\n"
@@ -5088,7 +5151,7 @@ msgstr "未知信號 %d"
 
 #: sunrpc/auth_unix.c:113 sunrpc/clnt_tcp.c:124 sunrpc/clnt_udp.c:140
 #: sunrpc/clnt_unix.c:125 sunrpc/svc_tcp.c:189 sunrpc/svc_tcp.c:233
-#: sunrpc/svc_udp.c:161 sunrpc/svc_unix.c:189 sunrpc/svc_unix.c:229
+#: sunrpc/svc_udp.c:161 sunrpc/svc_unix.c:186 sunrpc/svc_unix.c:226
 #: sunrpc/xdr.c:631 sunrpc/xdr.c:791 sunrpc/xdr_array.c:102
 #: sunrpc/xdr_rec.c:153 sunrpc/xdr_ref.c:79
 msgid "out of memory\n"
@@ -5337,14 +5400,18 @@ msgstr "cache_set: victim 配置失敗"
 msgid "cache_set: could not allocate new rpc_buffer"
 msgstr "cache_set: 無法配置新的遠端程序呼叫緩衝區 (rpc_buffer)"
 
-#: sunrpc/svc_unix.c:163
+#: sunrpc/svc_unix.c:166
 msgid "svc_unix.c - AF_UNIX socket creation problem"
 msgstr "svc_unix.c - AF_UNIX socket 建立有問題"
 
-#: sunrpc/svc_unix.c:179
+#: sunrpc/svc_unix.c:176
 msgid "svc_unix.c - cannot getsockname or listen"
 msgstr "svc_unix.c - 無法 getsockname 或 listen"
 
+#: sysdeps/aarch64/dl-bti.c:72
+msgid "failed to turn on BTI protection"
+msgstr "無法啟動 BTI 保護"
+
 #: sysdeps/generic/siglist.h:29
 msgid "Hangup"
 msgstr "掛斷"
@@ -6428,12 +6495,12 @@ msgstr "遭信號中斷"
 msgid "Parameter string not correctly encoded"
 msgstr "未正確編碼參數字串"
 
-#: sysdeps/unix/sysv/linux/ia64/makecontext.c:58
+#: sysdeps/unix/sysv/linux/ia64/makecontext.c:57
 #, c-format
 msgid "makecontext: does not know how to handle more than 8 arguments\n"
 msgstr "makecontext: 不知要如何處理超過八個引數\n"
 
-#: sysdeps/unix/sysv/linux/lddlibc4.c:60
+#: sysdeps/unix/sysv/linux/lddlibc4.c:59
 #, c-format
 msgid ""
 "Usage: lddlibc4 FILE\n"
@@ -6442,17 +6509,17 @@ msgstr ""
 "用法:lddlibc4 檔案\n"
 "\n"
 
-#: sysdeps/unix/sysv/linux/lddlibc4.c:81
+#: sysdeps/unix/sysv/linux/lddlibc4.c:80
 #, c-format
 msgid "cannot open `%s'"
 msgstr "無法開啟 `%s'"
 
-#: sysdeps/unix/sysv/linux/lddlibc4.c:85
+#: sysdeps/unix/sysv/linux/lddlibc4.c:84
 #, c-format
 msgid "cannot read header from `%s'"
 msgstr "無法從 `%s' 讀取標頭資料"
 
-#: sysdeps/unix/sysv/linux/x86/readelflib.c:66
+#: sysdeps/unix/sysv/linux/x86/readelflib.c:64
 #, c-format
 msgid "%s is for unknown machine %d.\n"
 msgstr "%s 是給未知的機器 %d。\n"
@@ -6469,6 +6536,10 @@ msgstr "重新組建啟用 SHSTK 支援的共用物件"
 msgid "can't disable CET"
 msgstr "無法停用 CET"
 
+#: sysdeps/x86/dl-prop.h:61
+msgid "CPU ISA level is lower than required"
+msgstr "CPU ISA 級別小於所需級別"
+
 #: timezone/zdump.c:332
 msgid "has characters other than ASCII alphanumerics, '-' or '+'"
 msgstr "包含除 ASCII 數字、英文字母、「-」及「+」以外的字元"