Synchronize translation project PO files.

1 files changed, 1938 insertions, 1614 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index c7e4409101..ff0d76ca52 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,15 +9,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libc 2.17.90.20130724\n"
-"POT-Creation-Date: 2013-07-24 23:29-0700\n"
+"POT-Creation-Date: 2018-07-26 22:19-0400\n"
 "PO-Revision-Date: 2013-09-03 13:39+0800\n"
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "Language: zh_TW\n"
-"X-Bugs: Report translation errors to the Language-Team address.\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"
 
 #: argp/argp-help.c:227
@@ -70,7 +70,7 @@ msgid "Give a short usage message"
 msgstr "給出簡短的使用訊息"
 
 #: argp/argp-parse.c:103 catgets/gencat.c:109 catgets/gencat.c:113
-#: iconv/iconv_prog.c:60 iconv/iconv_prog.c:61 nscd/nscd.c:115
+#: iconv/iconv_prog.c:60 iconv/iconv_prog.c:61 nscd/nscd.c:105
 #: nss/makedb.c:120
 msgid "NAME"
 msgstr "名稱"
@@ -105,8 +105,11 @@ msgid "(PROGRAM ERROR) Option should have been recognized!?"
 msgstr "(程式錯誤) 選項應該已經可辨識!?"
 
 #: assert/assert-perr.c:35
-#, c-format
-msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
+#, fuzzy, c-format
+#| msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n"
+msgid ""
+"%s%s%s:%u: %s%sUnexpected error: %s.\n"
+"%n"
 msgstr "%s%s%s:%u: %s%s無法預料的錯誤: %s。\n"
 
 #: assert/assert.c:101
@@ -146,13 +149,12 @@ msgstr ""
 "-o 輸出檔案名稱 [輸入檔案名稱]...\n"
 "[輸出檔案名稱 [輸入檔案名稱]...]"
 
-#: catgets/gencat.c:229 debug/pcprofiledump.c:209 elf/ldconfig.c:307
-#: elf/pldd.c:219 elf/sln.c:85 elf/sprof.c:372 iconv/iconv_prog.c:408
-#: iconv/iconvconfig.c:379 locale/programs/locale.c:277
-#: locale/programs/localedef.c:364 login/programs/pt_chown.c:88
-#: malloc/memusagestat.c:563 nscd/nscd.c:450 nss/getent.c:965 nss/makedb.c:369
-#: posix/getconf.c:1121 sunrpc/rpcinfo.c:691
-#: sysdeps/unix/sysv/linux/lddlibc4.c:61
+#: catgets/gencat.c:229 debug/pcprofiledump.c:209 elf/ldconfig.c:308
+#: elf/pldd.c:252 elf/sln.c:77 elf/sprof.c:372 iconv/iconv_prog.c:405
+#: iconv/iconvconfig.c:379 locale/programs/locale.c:275
+#: locale/programs/localedef.c:427 login/programs/pt_chown.c:89
+#: malloc/memusagestat.c:563 nss/getent.c:933 nss/makedb.c:369
+#: posix/getconf.c:503 sysdeps/unix/sysv/linux/lddlibc4.c:61
 #, c-format
 msgid ""
 "For bug reporting instructions, please see:\n"
@@ -162,12 +164,12 @@ msgstr ""
 "%s。\n"
 
 #: catgets/gencat.c:245 debug/pcprofiledump.c:225 debug/xtrace.sh:64
-#: elf/ldconfig.c:323 elf/ldd.bash.in:38 elf/pldd.c:235 elf/sotruss.ksh:75
-#: elf/sprof.c:389 iconv/iconv_prog.c:425 iconv/iconvconfig.c:396
-#: locale/programs/locale.c:294 locale/programs/localedef.c:390
-#: login/programs/pt_chown.c:62 malloc/memusage.sh:71
-#: malloc/memusagestat.c:579 nscd/nscd.c:466 nss/getent.c:86 nss/makedb.c:385
-#: posix/getconf.c:1103 sysdeps/unix/sysv/linux/lddlibc4.c:68
+#: elf/ldconfig.c:324 elf/ldd.bash.in:38 elf/pldd.c:268 elf/sotruss.sh:75
+#: elf/sprof.c:389 iconv/iconv_prog.c:422 iconv/iconvconfig.c:396
+#: locale/programs/locale.c:292 locale/programs/localedef.c:453
+#: login/programs/pt_chown.c:63 malloc/memusage.sh:71
+#: malloc/memusagestat.c:581 nscd/nscd.c:509 nss/getent.c:87 nss/makedb.c:385
+#: posix/getconf.c:485 sysdeps/unix/sysv/linux/lddlibc4.c:68
 #, c-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -179,11 +181,11 @@ msgstr ""
 "售或者適合某些特殊目的。\n"
 
 #: catgets/gencat.c:250 debug/pcprofiledump.c:230 debug/xtrace.sh:68
-#: elf/ldconfig.c:328 elf/pldd.c:240 elf/sprof.c:395 iconv/iconv_prog.c:430
-#: iconv/iconvconfig.c:401 locale/programs/locale.c:299
-#: locale/programs/localedef.c:395 malloc/memusage.sh:75
-#: malloc/memusagestat.c:584 nscd/nscd.c:471 nss/getent.c:91 nss/makedb.c:390
-#: posix/getconf.c:1108
+#: elf/ldconfig.c:329 elf/pldd.c:273 elf/sprof.c:395 iconv/iconv_prog.c:427
+#: iconv/iconvconfig.c:401 locale/programs/locale.c:297
+#: locale/programs/localedef.c:458 malloc/memusage.sh:75
+#: malloc/memusagestat.c:586 nscd/nscd.c:514 nss/getent.c:92 nss/makedb.c:390
+#: posix/getconf.c:490
 #, c-format
 msgid "Written by %s.\n"
 msgstr "作者 %s。\n"
@@ -192,7 +194,7 @@ msgstr "作者 %s。\n"
 msgid "*standard input*"
 msgstr "*標準輸入*"
 
-#: catgets/gencat.c:287 iconv/iconv_charmap.c:167 iconv/iconv_prog.c:293
+#: catgets/gencat.c:287 iconv/iconv_charmap.c:167 iconv/iconv_prog.c:290
 #: nss/makedb.c:246
 #, c-format
 msgid "cannot open input file `%s'"
@@ -303,8 +305,8 @@ msgstr "無效的指標大小"
 msgid "Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n"
 msgstr "用法：xtrace [選項]… 程式 [PROGRAMOPTION]…\\n"
 
-#: debug/xtrace.sh:32 elf/sotruss.ksh:56 elf/sotruss.ksh:67
-#: elf/sotruss.ksh:135 malloc/memusage.sh:26
+#: debug/xtrace.sh:32 elf/sotruss.sh:56 elf/sotruss.sh:67 elf/sotruss.sh:135
+#: malloc/memusage.sh:26
 msgid "Try \\`%s --help' or \\`%s --usage' for more information.\\n"
 msgstr "請嘗試 \\『%s --help』或\\『%s --usage』以獲得更多資訊。\\n"
 
@@ -338,7 +340,7 @@ msgstr ""
 "短選項。\n"
 "\n"
 
-#: debug/xtrace.sh:57 elf/ldd.bash.in:55 elf/sotruss.ksh:49
+#: debug/xtrace.sh:57 elf/ldd.bash.in:55 elf/sotruss.sh:49
 #: malloc/memusage.sh:64
 msgid "For bug reporting instructions, please see:\\\\n%s.\\\\n"
 msgstr "要知道錯誤報告指令，請參看:\\\\n%s.\\\\n"
@@ -385,60 +387,61 @@ msgstr "無效的模式參數"
 msgid "unknown"
 msgstr "未知"
 
-#: elf/cache.c:126
+#: elf/cache.c:141
 msgid "Unknown OS"
 msgstr "未知的作業系統"
 
-#: elf/cache.c:131
+#: elf/cache.c:146
 #, c-format
 msgid ", OS ABI: %s %d.%d.%d"
 msgstr ", OS ABI: %s %d.%d.%d"
 
-#: elf/cache.c:148 elf/ldconfig.c:1318
+#: elf/cache.c:163 elf/ldconfig.c:1332
 #, c-format
 msgid "Can't open cache file %s\n"
 msgstr "無法開啟快取檔 %s\n"
 
-#: elf/cache.c:162
+#: elf/cache.c:177
 #, c-format
 msgid "mmap of cache file failed.\n"
 msgstr "快取檔案 mmap 失敗。\n"
 
-#: elf/cache.c:166 elf/cache.c:180
+#: elf/cache.c:181 elf/cache.c:195
 #, c-format
 msgid "File is not a cache file.\n"
 msgstr "檔案並非快取檔。\n"
 
-#: elf/cache.c:213 elf/cache.c:223
+#: elf/cache.c:228 elf/cache.c:238
 #, c-format
 msgid "%d libs found in cache `%s'\n"
 msgstr "%d 函式庫在快取 `%s' 中找到\n"
 
-#: elf/cache.c:417
+#: elf/cache.c:432
 #, c-format
 msgid "Can't create temporary cache file %s"
 msgstr "無法產生暫時的快取檔 %s"
 
-#: elf/cache.c:425 elf/cache.c:435 elf/cache.c:439 elf/cache.c:444
+#: elf/cache.c:440 elf/cache.c:450 elf/cache.c:454 elf/cache.c:458
+#: elf/cache.c:468
 #, c-format
 msgid "Writing of cache data failed"
 msgstr "寫入快取資料時發生錯誤"
 
-#: elf/cache.c:449
+#: elf/cache.c:463
 #, c-format
 msgid "Changing access rights of %s to %#o failed"
 msgstr "更改 %s 的存取權限為 %#o 失敗"
 
-#: elf/cache.c:454
+#: elf/cache.c:472
 #, c-format
 msgid "Renaming of %s to %s failed"
 msgstr "將 %s 改名為 %s 失敗"
 
-#: elf/dl-close.c:384 elf/dl-open.c:470
+#: elf/dl-close.c:399 elf/dl-open.c:420
 msgid "cannot create scope list"
 msgstr "無法建立作用域列表"
 
-#: elf/dl-close.c:777
+#: elf/dl-close.c:839
 msgid "shared object not open"
 msgstr "共用目的檔案沒有開啟"
 
@@ -455,223 +458,219 @@ msgstr "空的動態字串字組替換"
 msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
 msgstr "由於空的動態字串字組替換而無法載入外部的 `%s'\n"
 
-#: elf/dl-deps.c:479
+#: elf/dl-deps.c:220
+#, fuzzy
+#| msgid "cannot allocate dependency list"
+msgid "cannot allocate dependency buffer"
+msgstr "無法配置相關性列表"
+
+#: elf/dl-deps.c:443
 msgid "cannot allocate dependency list"
 msgstr "無法配置相關性列表"
 
-#: elf/dl-deps.c:516 elf/dl-deps.c:576
+#: elf/dl-deps.c:483 elf/dl-deps.c:543
 msgid "cannot allocate symbol search list"
 msgstr "無法配置符號搜尋列表"
 
-#: elf/dl-deps.c:556
+#: elf/dl-deps.c:523
 msgid "Filters not supported with LD_TRACE_PRELINKING"
 msgstr "過濾程式不支援與 LD_TRACE_PRELINKING 共用"
 
-#: elf/dl-error.c:76
-msgid "DYNAMIC LINKER BUG!!!"
-msgstr "動態連接程式有問題!!!"
-
-#: elf/dl-error.c:123
+#: elf/dl-error-skeleton.c:80
 msgid "error while loading shared libraries"
 msgstr "載入共用函式庫時發生錯誤"
 
-#: elf/dl-fptr.c:87 ports/sysdeps/hppa/dl-fptr.c:93
+#: elf/dl-error-skeleton.c:113
+msgid "DYNAMIC LINKER BUG!!!"
+msgstr "動態連接程式有問題!!!"
+
+#: elf/dl-fptr.c:88 sysdeps/hppa/dl-fptr.c:95
 msgid "cannot map pages for fdesc table"
 msgstr "無法將頁面對映於 fdesc 表格"
 
-#: elf/dl-fptr.c:191 ports/sysdeps/hppa/dl-fptr.c:206
+#: elf/dl-fptr.c:192 sysdeps/hppa/dl-fptr.c:213
 msgid "cannot map pages for fptr table"
 msgstr "無法將頁面對映於 fptr 表格"
 
-#: elf/dl-fptr.c:220 ports/sysdeps/hppa/dl-fptr.c:235
+#: elf/dl-fptr.c:221 sysdeps/hppa/dl-fptr.c:242
 msgid "internal error: symidx out of range of fptr table"
 msgstr "內部錯誤：symidx 超出 fptr 表格的範圍"
 
-#: elf/dl-hwcaps.c:184 elf/dl-hwcaps.c:196
+#: elf/dl-hwcaps.c:202 elf/dl-hwcaps.c:214
 msgid "cannot create capability list"
 msgstr "無法建立 capability 列表"
 
-#: elf/dl-load.c:465
+#: elf/dl-load.c:427
 msgid "cannot allocate name record"
 msgstr "無法配置名稱紀錄"
 
-#: elf/dl-load.c:542 elf/dl-load.c:658 elf/dl-load.c:743 elf/dl-load.c:862
+#: elf/dl-load.c:513 elf/dl-load.c:626 elf/dl-load.c:715 elf/dl-load.c:811
 msgid "cannot create cache for search path"
 msgstr "無法為搜尋路徑建立快取"
 
-#: elf/dl-load.c:633
+#: elf/dl-load.c:609
 msgid "cannot create RUNPATH/RPATH copy"
 msgstr "無法建立 RUNPATH/RPATH 的副本"
 
-#: elf/dl-load.c:729
+#: elf/dl-load.c:702
 msgid "cannot create search path array"
 msgstr "無法建立搜尋路徑陣列"
 
-#: elf/dl-load.c:934
+#: elf/dl-load.c:883
 msgid "cannot stat shared object"
 msgstr "無法 stat 共用目的檔"
 
-#: elf/dl-load.c:1012
+#: elf/dl-load.c:960
 msgid "cannot open zero fill device"
 msgstr "無法開啟以零填滿的裝置"
 
-#: elf/dl-load.c:1059 elf/dl-load.c:2342
+#: elf/dl-load.c:1007 elf/dl-load.c:2203
 msgid "cannot create shared object descriptor"
 msgstr "無法建立共用目的檔敘述項"
 
-#: elf/dl-load.c:1078 elf/dl-load.c:1755 elf/dl-load.c:1858
+#: elf/dl-load.c:1026 elf/dl-load.c:1560 elf/dl-load.c:1673
 msgid "cannot read file data"
 msgstr "無法讀取檔案資料"
 
-#: elf/dl-load.c:1124
+#: elf/dl-load.c:1072
 msgid "ELF load command alignment not page-aligned"
 msgstr "ELF 載入命令對齊並沒有按照記憶體分頁 (page) 對齊"
 
-#: elf/dl-load.c:1131
+#: elf/dl-load.c:1079
 msgid "ELF load command address/offset not properly aligned"
 msgstr "ELF 載入命令位址/位移並沒有適當地對齊"
 
-#: elf/dl-load.c:1216
-msgid "cannot allocate TLS data structures for initial thread"
-msgstr "無法配置 TLS 資料結構用以起始執行緒"
-
-#: elf/dl-load.c:1239
-msgid "cannot handle TLS data"
-msgstr "無法處理 TLS 資料"
+#: elf/dl-load.c:1161
+#, fuzzy
+#| msgid "cannot restore segment prot after reloc"
+msgid "cannot process note segment"
+msgstr "在 reloc 之後無法復原 segment prot"
 
-#: elf/dl-load.c:1258
+#: elf/dl-load.c:1172
 msgid "object file has no loadable segments"
 msgstr "目的檔中沒有可載入的區段"
 
-#: elf/dl-load.c:1294
-msgid "failed to map segment from shared object"
-msgstr "從共用目的檔中對映區段失敗"
-
-#: elf/dl-load.c:1320
+#: elf/dl-load.c:1181 elf/dl-load.c:1652
 msgid "cannot dynamically load executable"
 msgstr "無法動態載入執行檔"
 
-#: elf/dl-load.c:1383 elf/dl-load.c:1492
-msgid "cannot change memory protections"
-msgstr "無法改變記憶體保護狀態"
-
-#: elf/dl-load.c:1402
-msgid "cannot map zero-fill pages"
-msgstr "無法對應以零填滿的分頁區"
-
-#: elf/dl-load.c:1416
+#: elf/dl-load.c:1202
 msgid "object file has no dynamic section"
 msgstr "共用目的檔中沒有動態區段"
 
-#: elf/dl-load.c:1439
+#: elf/dl-load.c:1225
 msgid "shared object cannot be dlopen()ed"
 msgstr "共用目的檔無法被 dlopen()"
 
-#: elf/dl-load.c:1452
+#: elf/dl-load.c:1238
 msgid "cannot allocate memory for program header"
 msgstr "無法配置記憶體給程式標頭區使用"
 
-#: elf/dl-load.c:1469 elf/dl-open.c:195
-msgid "invalid caller"
-msgstr "無效的呼叫者"
+#: elf/dl-load.c:1271 elf/dl-load.h:130
+msgid "cannot change memory protections"
+msgstr "無法改變記憶體保護狀態"
 
-#: elf/dl-load.c:1512
+#: elf/dl-load.c:1291
 msgid "cannot enable executable stack as shared object requires"
 msgstr "無法開啟可執行堆疊做為共用目的檔"
 
-#: elf/dl-load.c:1525
+#: elf/dl-load.c:1304
 msgid "cannot close file descriptor"
 msgstr "無法關閉檔案描述符號"
 
-#: elf/dl-load.c:1755
+#: elf/dl-load.c:1560
 msgid "file too short"
 msgstr "檔案太小"
 
-#: elf/dl-load.c:1791
+#: elf/dl-load.c:1595
 msgid "invalid ELF header"
 msgstr "無效的 ELF 標頭"
 
-#: elf/dl-load.c:1803
+#: elf/dl-load.c:1607
 msgid "ELF file data encoding not big-endian"
 msgstr "ELF 檔資料編碼並非大尾序"
 
-#: elf/dl-load.c:1805
+#: elf/dl-load.c:1609
 msgid "ELF file data encoding not little-endian"
 msgstr "ELF 檔資料編碼並非小尾序"
 
-#: elf/dl-load.c:1809
+#: elf/dl-load.c:1613
 msgid "ELF file version ident does not match current one"
 msgstr "ELF 檔版本 ident 不符合目前所使用的"
 
-#: elf/dl-load.c:1813
+#: elf/dl-load.c:1617
 msgid "ELF file OS ABI invalid"
 msgstr "ELF 檔 OS ABI 版本不適用"
 
-#: elf/dl-load.c:1816
+#: elf/dl-load.c:1620
 msgid "ELF file ABI version invalid"
 msgstr "ELF 檔 ABI 版本不適用"
 
-#: elf/dl-load.c:1819
+#: elf/dl-load.c:1623
 msgid "nonzero padding in e_ident"
 msgstr "在 e_ident 中填補非零值"
 
-#: elf/dl-load.c:1822
+#: elf/dl-load.c:1626
 msgid "internal error"
 msgstr "內部錯誤"
 
-#: elf/dl-load.c:1829
+#: elf/dl-load.c:1633
 msgid "ELF file version does not match current one"
 msgstr "ELF 檔版本不符合目前的版本"
 
-#: elf/dl-load.c:1837
+#: elf/dl-load.c:1641
 msgid "only ET_DYN and ET_EXEC can be loaded"
 msgstr "只有 ET_DYN 以及 ET_EXEC 可以載入"
 
-#: elf/dl-load.c:1843
+#: elf/dl-load.c:1657
 msgid "ELF file's phentsize not the expected size"
 msgstr "ELF 檔的 phentsize 並不是預期中的大小"
 
-#: elf/dl-load.c:2361
+#: elf/dl-load.c:2222
 msgid "wrong ELF class: ELFCLASS64"
 msgstr "錯誤 ELF 類別：ELFCLASS64"
 
-#: elf/dl-load.c:2362
+#: elf/dl-load.c:2223
 msgid "wrong ELF class: ELFCLASS32"
 msgstr "錯誤 ELF 類別：ELFCLASS32"
 
-#: elf/dl-load.c:2365
+#: elf/dl-load.c:2226
 msgid "cannot open shared object file"
 msgstr "無法開啟共用目的檔"
 
-#: elf/dl-lookup.c:753 ports/sysdeps/mips/dl-lookup.c:771
+#: elf/dl-load.h:128
+msgid "failed to map segment from shared object"
+msgstr "從共用目的檔中對映區段失敗"
+
+#: elf/dl-load.h:132
+msgid "cannot map zero-fill pages"
+msgstr "無法對應以零填滿的分頁區"
+
+#: elf/dl-lookup.c:835
 msgid "relocation error"
 msgstr "重定址錯誤"
 
-#: elf/dl-lookup.c:780 ports/sysdeps/mips/dl-lookup.c:798
+#: elf/dl-lookup.c:858
 msgid "symbol lookup error"
 msgstr "符號查找錯誤"
 
-#: elf/dl-open.c:102
+#: elf/dl-open.c:99
 msgid "cannot extend global scope"
 msgstr "無法延展全域變數的作用域"
 
-#: elf/dl-open.c:520
+#: elf/dl-open.c:470
 msgid "TLS generation counter wrapped!  Please report this."
 msgstr "TLS 產生計數器被轉換執行！ 請報告這個情況。"
 
-#: elf/dl-open.c:542
-msgid "cannot load any more object with static TLS"
-msgstr "無法以靜態 TLS 再載入任何物件"
-
-#: elf/dl-open.c:599
+#: elf/dl-open.c:534
 msgid "invalid mode for dlopen()"
 msgstr "無效的 dlopen() 模式"
 
-#: elf/dl-open.c:616
+#: elf/dl-open.c:551
 msgid "no more namespaces available for dlmopen()"
 msgstr "無更多命名空間可見於 dlmopen ()"
 
-#: elf/dl-open.c:634
+#: elf/dl-open.c:575
 msgid "invalid target namespace in dlmopen()"
 msgstr "dlmopen() 中的無效目標命名空間"
 
@@ -679,258 +678,255 @@ msgstr "dlmopen() 中的無效目標命名空間"
 msgid "cannot allocate memory in static TLS block"
 msgstr "無法在靜態 TLS 區塊中配置記憶體"
 
-#: elf/dl-reloc.c:212
+#: elf/dl-reloc.c:205
 msgid "cannot make segment writable for relocation"
 msgstr "在重新定址以後無法將區段設為可寫入狀態"
 
-#: elf/dl-reloc.c:275
-#, c-format
-msgid "%s: no PLTREL found in object %s\n"
-msgstr "%s: 在目的檔 %s 中沒有找到 PLTREL\n"
-
-#: elf/dl-reloc.c:286
+#: elf/dl-reloc.c:276
 #, c-format
 msgid "%s: out of memory to store relocation results for %s\n"
 msgstr "%s: 記憶體不足以儲存重定址結果用於 %s\n"
 
-#: elf/dl-reloc.c:302
+#: elf/dl-reloc.c:292
 msgid "cannot restore segment prot after reloc"
 msgstr "在 reloc 之後無法復原 segment prot"
 
-#: elf/dl-reloc.c:331
+#: elf/dl-reloc.c:323
 msgid "cannot apply additional memory protection after relocation"
 msgstr "重定址之後無法套用額外記憶體保護"
 
-#: elf/dl-sym.c:153
+#: elf/dl-sym.c:136
 msgid "RTLD_NEXT used in code not dynamically loaded"
 msgstr "程式碼所使用的 RTLD_NEXT 沒有動態載入"
 
-#: elf/dl-tls.c:875
+#: elf/dl-tls.c:931
 msgid "cannot create TLS data structures"
 msgstr "無法建立 TLS 資料結構"
 
-#: elf/dl-version.c:166
+#: elf/dl-version.c:148
 msgid "version lookup error"
 msgstr "版本查找錯誤"
 
-#: elf/dl-version.c:296
+#: elf/dl-version.c:279
 msgid "cannot allocate version reference table"
 msgstr "無法配置版本參照表"
 
-#: elf/ldconfig.c:141
+#: elf/ldconfig.c:142
 msgid "Print cache"
 msgstr "印出快取"
 
-#: elf/ldconfig.c:142
+#: elf/ldconfig.c:143
 msgid "Generate verbose messages"
 msgstr "產生更多的訊息"
 
-#: elf/ldconfig.c:143
+#: elf/ldconfig.c:144
 msgid "Don't build cache"
 msgstr "不建立快取"
 
-#: elf/ldconfig.c:144
-msgid "Don't generate links"
-msgstr "不產生連結"
-
 #: elf/ldconfig.c:145
+#, fuzzy
+#| msgid "%s is not a symbolic link\n"
+msgid "Don't update symbolic links"
+msgstr "%s 不是一個符號連接檔\n"
+
+#: elf/ldconfig.c:146
 msgid "Change to and use ROOT as root directory"
 msgstr "變換到 ROOT 目錄並以它做為根目錄"
 
-#: elf/ldconfig.c:145
+#: elf/ldconfig.c:146
 msgid "ROOT"
 msgstr "ROOT"
 
-#: elf/ldconfig.c:146
+#: elf/ldconfig.c:147
 msgid "CACHE"
 msgstr "CACHE"
 
-#: elf/ldconfig.c:146
+#: elf/ldconfig.c:147
 msgid "Use CACHE as cache file"
 msgstr "使用 CACHE 當作快取檔案"
 
-#: elf/ldconfig.c:147
+#: elf/ldconfig.c:148
 msgid "CONF"
 msgstr "CONF"
 
-#: elf/ldconfig.c:147
+#: elf/ldconfig.c:148
 msgid "Use CONF as configuration file"
 msgstr "使用 CONF 當作設定檔"
 
-#: elf/ldconfig.c:148
+#: elf/ldconfig.c:149
 msgid "Only process directories specified on the command line.  Don't build cache."
 msgstr "只處理在命令列引數中有指定的目錄，不建立快取檔案。"
 
-#: elf/ldconfig.c:149
+#: elf/ldconfig.c:150
 msgid "Manually link individual libraries."
 msgstr "手動個別連結函式庫"
 
-#: elf/ldconfig.c:150
+#: elf/ldconfig.c:151
 msgid "FORMAT"
 msgstr "FORMAT"
 
-#: elf/ldconfig.c:150
+#: elf/ldconfig.c:151
 msgid "Format to use: new, old or compat (default)"
 msgstr "將使用格式: 新、舊或相容 (預設)"
 
-#: elf/ldconfig.c:151
+#: elf/ldconfig.c:152
 msgid "Ignore auxiliary cache file"
 msgstr "忽略輔助設備快取檔案"
 
-#: elf/ldconfig.c:159
+#: elf/ldconfig.c:160
 msgid "Configure Dynamic Linker Run Time Bindings."
 msgstr "設定執行時期動態連接"
 
-#: elf/ldconfig.c:346
+#: elf/ldconfig.c:347
 #, c-format
 msgid "Path `%s' given more than once"
 msgstr "路徑 `%s' 使用超過一次"
 
-#: elf/ldconfig.c:386
+#: elf/ldconfig.c:387
 #, c-format
 msgid "%s is not a known library type"
 msgstr "%s 不是一個已知的函式庫型態"
 
-#: elf/ldconfig.c:414
+#: elf/ldconfig.c:415
 #, c-format
 msgid "Can't stat %s"
 msgstr "無法 stat %s"
 
-#: elf/ldconfig.c:488
+#: elf/ldconfig.c:489
 #, c-format
 msgid "Can't stat %s\n"
 msgstr "無法 stat %s\n"
 
-#: elf/ldconfig.c:498
+#: elf/ldconfig.c:499
 #, c-format
 msgid "%s is not a symbolic link\n"
 msgstr "%s 不是一個符號連接檔\n"
 
-#: elf/ldconfig.c:517
+#: elf/ldconfig.c:518
 #, c-format
 msgid "Can't unlink %s"
 msgstr "無法取消連結 %s"
 
-#: elf/ldconfig.c:523
+#: elf/ldconfig.c:524
 #, c-format
 msgid "Can't link %s to %s"
 msgstr "無法從 %s 連結到 %s"
 
-#: elf/ldconfig.c:529
+#: elf/ldconfig.c:530
 msgid " (changed)\n"
 msgstr " (已改變)\n"
 
-#: elf/ldconfig.c:531
+#: elf/ldconfig.c:532
 msgid " (SKIPPED)\n"
 msgstr " (已忽略)\n"
 
-#: elf/ldconfig.c:586
+#: elf/ldconfig.c:587
 #, c-format
 msgid "Can't find %s"
 msgstr "找不到 %s"
 
-#: elf/ldconfig.c:602 elf/ldconfig.c:775 elf/ldconfig.c:834 elf/ldconfig.c:868
+#: elf/ldconfig.c:603 elf/ldconfig.c:769 elf/ldconfig.c:825 elf/ldconfig.c:857
 #, c-format
 msgid "Cannot lstat %s"
 msgstr "無法 lstat %s"
 
-#: elf/ldconfig.c:609
+#: elf/ldconfig.c:610
 #, c-format
 msgid "Ignored file %s since it is not a regular file."
 msgstr "忽略檔案 %s 因為它不是一個正常的檔案。"
 
-#: elf/ldconfig.c:618
+#: elf/ldconfig.c:619
 #, c-format
 msgid "No link created since soname could not be found for %s"
 msgstr "由於找不到 %s 的共用目的檔名稱，連結並未被建立"
 
-#: elf/ldconfig.c:701
+#: elf/ldconfig.c:702
 #, c-format
 msgid "Can't open directory %s"
 msgstr "無法開啟目錄 %s"
 
-#: elf/ldconfig.c:793 elf/ldconfig.c:855 elf/readlib.c:90
+#: elf/ldconfig.c:787 elf/ldconfig.c:845 elf/readlib.c:97
 #, c-format
 msgid "Input file %s not found.\n"
 msgstr "輸入檔 %s 找不到。\n"
 
-#: elf/ldconfig.c:800
+#: elf/ldconfig.c:794
 #, c-format
 msgid "Cannot stat %s"
 msgstr "無法顯示狀態 %s"
 
-#: elf/ldconfig.c:929
+#: elf/ldconfig.c:939
 #, c-format
 msgid "libc5 library %s in wrong directory"
 msgstr "libc5 函式庫 %s 擺錯目錄了"
 
-#: elf/ldconfig.c:932
+#: elf/ldconfig.c:942
 #, c-format
 msgid "libc6 library %s in wrong directory"
 msgstr "libc6 函式庫 %s 擺錯目錄了"
 
-#: elf/ldconfig.c:935
+#: elf/ldconfig.c:945
 #, c-format
 msgid "libc4 library %s in wrong directory"
 msgstr "libc4 函式庫 %s 擺錯目錄了"
 
-#: elf/ldconfig.c:963
+#: elf/ldconfig.c:973
 #, c-format
 msgid "libraries %s and %s in directory %s have same soname but different type."
 msgstr "函式庫 %s 跟 %s (在目錄 %s 底下) 有共同的共用函式庫名稱，不過其格式卻不同"
 
-#: elf/ldconfig.c:1072
+#: elf/ldconfig.c:1082
 #, c-format
 msgid "Warning: ignoring configuration file that cannot be opened: %s"
 msgstr "警告：正在忽略無法開啟的組態檔案：%s"
 
-#: elf/ldconfig.c:1138
+#: elf/ldconfig.c:1148
 #, c-format
 msgid "%s:%u: bad syntax in hwcap line"
 msgstr "%s:%u: 在 hwcap 列中有不當的語法"
 
-#: elf/ldconfig.c:1144
+#: elf/ldconfig.c:1154
 #, c-format
 msgid "%s:%u: hwcap index %lu above maximum %u"
 msgstr "%s:%u: hwcap 索引 %lu 以上的最大值 %u"
 
-#: elf/ldconfig.c:1151 elf/ldconfig.c:1159
+#: elf/ldconfig.c:1161 elf/ldconfig.c:1169
 #, c-format
 msgid "%s:%u: hwcap index %lu already defined as %s"
 msgstr "%s:%u: hwcap 索引 %lu 已經被定義為 %s"
 
-#: elf/ldconfig.c:1162
+#: elf/ldconfig.c:1172
 #, c-format
 msgid "%s:%u: duplicate hwcap %lu %s"
 msgstr "%s:%u: 重製 hwcap %lu %s"
 
-#: elf/ldconfig.c:1184
+#: elf/ldconfig.c:1194
 #, c-format
 msgid "need absolute file name for configuration file when using -r"
 msgstr "需要絕對檔案名稱用於組態檔案時正在使用 -r"
 
-#: elf/ldconfig.c:1191 locale/programs/xmalloc.c:64 malloc/obstack.c:432
-#: malloc/obstack.c:434 posix/getconf.c:1076 posix/getconf.c:1296
+#: elf/ldconfig.c:1201 locale/programs/xmalloc.c:63 malloc/obstack.c:416
+#: malloc/obstack.c:418 posix/getconf.c:458 posix/getconf.c:697
 #, c-format
 msgid "memory exhausted"
 msgstr "記憶體耗盡"
 
-#: elf/ldconfig.c:1223
+#: elf/ldconfig.c:1233
 #, c-format
 msgid "%s:%u: cannot read directory %s"
 msgstr "%s:%u: 無法讀取目錄 %s"
 
-#: elf/ldconfig.c:1267
+#: elf/ldconfig.c:1281
 #, c-format
 msgid "relative path `%s' used to build cache"
 msgstr "用來建置快取的相對路徑 `%s'"
 
-#: elf/ldconfig.c:1297
+#: elf/ldconfig.c:1311
 #, c-format
 msgid "Can't chdir to /"
 msgstr "無法變更目錄到 /"
 
-#: elf/ldconfig.c:1338
+#: elf/ldconfig.c:1352
 #, c-format
 msgid "Can't open cache file directory %s\n"
 msgstr "無法開啟快取檔案目錄 %s\n"
@@ -965,38 +961,38 @@ msgstr "ldd：選項「$1」為模稜兩可的"
 msgid "unrecognized option"
 msgstr "無法辨識的選項"
 
-#: elf/ldd.bash.in:88 elf/ldd.bash.in:126
+#: elf/ldd.bash.in:88 elf/ldd.bash.in:125
 msgid "Try \\`ldd --help' for more information."
 msgstr "嘗試「ldd --help」以獲得更多資訊。"
 
-#: elf/ldd.bash.in:125
+#: elf/ldd.bash.in:124
 msgid "missing file arguments"
 msgstr "缺少檔案引數"
 
-#. TRANS No such file or directory.  This is a ``file doesn't exist'' error
+#. TRANS This is a ``file doesn't exist'' error
 #. TRANS for ordinary files that are referenced in contexts where they are
 #. TRANS expected to already exist.
-#: elf/ldd.bash.in:148 sysdeps/gnu/errlist.c:36
+#: elf/ldd.bash.in:147 sysdeps/gnu/errlist.c:37
 msgid "No such file or directory"
 msgstr "沒有此一檔案或目錄"
 
-#: elf/ldd.bash.in:151 inet/rcmd.c:488
+#: elf/ldd.bash.in:150 inet/rcmd.c:480
 msgid "not regular file"
 msgstr "並非正常的檔案"
 
-#: elf/ldd.bash.in:154
+#: elf/ldd.bash.in:153
 msgid "warning: you do not have execution permission for"
 msgstr "警告：您沒有執行權限用於"
 
-#: elf/ldd.bash.in:183
+#: elf/ldd.bash.in:170
 msgid "\tnot a dynamic executable"
 msgstr "\t不是動態可執行檔案"
 
-#: elf/ldd.bash.in:191
+#: elf/ldd.bash.in:178
 msgid "exited with unknown exit code"
 msgstr "離開的與不明的離開代碼"
 
-#: elf/ldd.bash.in:196
+#: elf/ldd.bash.in:183
 msgid "error: you do not have read permission for"
 msgstr "錯誤：您沒有讀取許可權用於"
 
@@ -1025,65 +1021,71 @@ msgstr "無法讀取 r_debug"
 msgid "cannot read program interpreter"
 msgstr "無法讀取程式解譯器"
 
-#: elf/pldd-xx.c:196
+#: elf/pldd-xx.c:197
 #, c-format
 msgid "cannot read link map"
 msgstr "無法讀取鏈結映射"
 
-#: elf/pldd-xx.c:207
+#: elf/pldd-xx.c:209
 #, c-format
 msgid "cannot read object name"
 msgstr "無法讀取物件名稱"
 
-#: elf/pldd.c:62
+#: elf/pldd-xx.c:219
+#, fuzzy, c-format
+#| msgid "cannot allocate memory for program header"
+msgid "cannot allocate buffer for object name"
+msgstr "無法配置記憶體給程式標頭區使用"
+
+#: elf/pldd.c:64
 msgid "List dynamic shared objects loaded into process."
 msgstr "列出已載入行程中的動態共用物件。"
 
-#: elf/pldd.c:66
+#: elf/pldd.c:68
 msgid "PID"
 msgstr "行程識別號"
 
-#: elf/pldd.c:97
+#: elf/pldd.c:100
 #, c-format
 msgid "Exactly one parameter with process ID required.\n"
 msgstr "需要剛好一個附有行程識別號的參數。\n"
 
-#: elf/pldd.c:109
+#: elf/pldd.c:112
 #, c-format
 msgid "invalid process ID '%s'"
 msgstr "無效的行程識別號 %s"
 
-#: elf/pldd.c:117
+#: elf/pldd.c:120
 #, c-format
 msgid "cannot open %s"
 msgstr "無法開啟 %s"
 
-#: elf/pldd.c:142
+#: elf/pldd.c:152
 #, c-format
 msgid "cannot open %s/task"
 msgstr "無法開啟 %s/任務"
 
-#: elf/pldd.c:145
+#: elf/pldd.c:155
 #, c-format
 msgid "cannot prepare reading %s/task"
 msgstr "無法準備讀取 %s/任務"
 
-#: elf/pldd.c:158
+#: elf/pldd.c:168
 #, c-format
 msgid "invalid thread ID '%s'"
 msgstr "無效的執行緒識別號 %s"
 
-#: elf/pldd.c:169
+#: elf/pldd.c:179
 #, c-format
 msgid "cannot attach to process %lu"
 msgstr "無法附加到行程 %lu"
 
-#: elf/pldd.c:261
+#: elf/pldd.c:294
 #, c-format
 msgid "cannot get information about process %lu"
 msgstr "無法獲得行程 %lu 的相關資訊"
 
-#: elf/pldd.c:274
+#: elf/pldd.c:307
 #, c-format
 msgid "process %lu is no ELF program"
 msgstr "行程 %lu 並非 ELF 程式"
@@ -1118,32 +1120,32 @@ msgstr "%s 不是一個共用目的檔 (型態: %d)。\n"
 msgid "more than one dynamic segment\n"
 msgstr "超過一個的動態區段\n"
 
-#: elf/readlib.c:96
+#: elf/readlib.c:103
 #, c-format
 msgid "Cannot fstat file %s.\n"
 msgstr "無法 fstat 檔案 %s。\n"
 
-#: elf/readlib.c:107
+#: elf/readlib.c:114
 #, c-format
 msgid "File %s is empty, not checked."
 msgstr "檔案 %s 為空，不做檢查。"
 
-#: elf/readlib.c:113
+#: elf/readlib.c:120
 #, c-format
 msgid "File %s is too small, not checked."
 msgstr "檔案 %s 太小，不做檢查。"
 
-#: elf/readlib.c:123
+#: elf/readlib.c:130
 #, c-format
 msgid "Cannot mmap file %s.\n"
 msgstr "無法 mmap 檔案 %s。\n"
 
-#: elf/readlib.c:161
+#: elf/readlib.c:169
 #, c-format
 msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n"
 msgstr "%s 不是一個 ELF 檔 - 其開頭的魔術位元組是錯的。\n"
 
-#: elf/sln.c:84
+#: elf/sln.c:76
 #, c-format
 msgid ""
 "Usage: sln src dest|file\n"
@@ -1152,37 +1154,37 @@ msgstr ""
 "用法：sln 原始碼 目的|檔案\n"
 "\n"
 
-#: elf/sln.c:109
+#: elf/sln.c:97
 #, c-format
 msgid "%s: file open error: %m\n"
 msgstr "%s：檔案開啟錯誤：%m\n"
 
-#: elf/sln.c:146
+#: elf/sln.c:134
 #, c-format
 msgid "No target in line %d\n"
 msgstr "沒有目標於第 %d 列\n"
 
-#: elf/sln.c:178
+#: elf/sln.c:164
 #, c-format
 msgid "%s: destination must not be a directory\n"
 msgstr "%s：目的必須不是目錄\n"
 
-#: elf/sln.c:184
+#: elf/sln.c:170
 #, c-format
 msgid "%s: failed to remove the old destination\n"
 msgstr "%s：無法移除舊的目的\n"
 
-#: elf/sln.c:192
+#: elf/sln.c:178
 #, c-format
 msgid "%s: invalid destination: %s\n"
 msgstr "%s：無效的目的：%s\n"
 
-#: elf/sln.c:207 elf/sln.c:216
+#: elf/sln.c:189 elf/sln.c:198
 #, c-format
 msgid "Invalid link from \"%s\" to \"%s\": %s\n"
 msgstr "從「%s」到「%s」的鏈結無效：%s\n"
 
-#: elf/sotruss.ksh:32
+#: elf/sotruss.sh:32
 #, sh-format
 msgid ""
 "Usage: sotruss [OPTION...] [--] EXECUTABLE [EXECUTABLE-OPTION...]\n"
@@ -1211,23 +1213,23 @@ msgstr ""
 "      --usage             給出簡短用法訊息\n"
 "      --version           印出程式版本"
 
-#: elf/sotruss.ksh:46
+#: elf/sotruss.sh:46
 msgid "Mandatory arguments to long options are also mandatory for any corresponding\\nshort options.\\n"
 msgstr "長選項的必要引數同樣也是相對應短選項的必要引數。"
 
-#: elf/sotruss.ksh:55
+#: elf/sotruss.sh:55
 msgid "%s: option requires an argument -- '%s'\\n"
 msgstr "%s：選項需要一個引數 --『%s』\\n"
 
-#: elf/sotruss.ksh:61
+#: elf/sotruss.sh:61
 msgid "%s: option is ambiguous; possibilities:"
 msgstr "%s：選項是模稜兩可的；可能是："
 
-#: elf/sotruss.ksh:79
+#: elf/sotruss.sh:79
 msgid "Written by %s.\\n"
 msgstr "作者 %s。\\n"
 
-#: elf/sotruss.ksh:86
+#: elf/sotruss.sh:86
 msgid ""
 "Usage: %s [-ef] [-F FROMLIST] [-o FILENAME] [-T TOLIST] [--exit]\n"
 "\t    [--follow] [--from FROMLIST] [--output FILENAME] [--to TOLIST]\n"
@@ -1239,7 +1241,7 @@ msgstr ""
 "\t    [--help] [--usage] [--version] [--]\n"
 "\t    可執行檔案 [EXECUTABLE-OPTION...]\\n"
 
-#: elf/sotruss.ksh:134
+#: elf/sotruss.sh:134
 msgid "%s: unrecognized option '%c%s'\\n"
 msgstr "%s：無法辨識的選項『%c%s』\\n"
 
@@ -1272,9 +1274,9 @@ msgstr "SHOBJ [PROFDATA]"
 msgid "failed to load shared object `%s'"
 msgstr "開啟共用目的檔 `%s' 失敗"
 
-#: elf/sprof.c:442
+#: elf/sprof.c:442 elf/sprof.c:825 elf/sprof.c:923
 #, c-format
-msgid "cannot create internal descriptors"
+msgid "cannot create internal descriptor"
 msgstr "無法建立內部敘述項"
 
 #: elf/sprof.c:554
@@ -1342,11 +1344,6 @@ msgstr "測試資料檔案 mmap 失敗"
 msgid "error while closing the profiling data file"
 msgstr "正在關閉測試資料檔案時發生錯誤"
 
-#: elf/sprof.c:825 elf/sprof.c:923
-#, c-format
-msgid "cannot create internal descriptor"
-msgstr "無法建立內部敘述項"
-
 #: elf/sprof.c:899
 #, c-format
 msgid "`%s' is no correct profile data file for `%s'"
@@ -1357,33 +1354,33 @@ msgstr "`%s' 不是 `%s' 中正確的測速評估資料檔"
 msgid "cannot allocate symbol data"
 msgstr "無法配置函式符號資料"
 
-#: iconv/iconv_charmap.c:141 iconv/iconv_prog.c:448
+#: iconv/iconv_charmap.c:141 iconv/iconv_prog.c:445
 #, c-format
 msgid "cannot open output file"
 msgstr "無法開啟輸出檔"
 
-#: iconv/iconv_charmap.c:187 iconv/iconv_prog.c:311
+#: iconv/iconv_charmap.c:187 iconv/iconv_prog.c:308
 #, c-format
 msgid "error while closing input `%s'"
 msgstr "正在關閉輸入 `%s' 的時候發生錯誤"
 
-#: iconv/iconv_charmap.c:461
+#: iconv/iconv_charmap.c:435
 #, c-format
 msgid "illegal input sequence at position %Zd"
 msgstr "位置 %Zd 有不合法的輸入序列"
 
-#: iconv/iconv_charmap.c:480 iconv/iconv_prog.c:539
+#: iconv/iconv_charmap.c:454 iconv/iconv_prog.c:536
 #, c-format
 msgid "incomplete character or shift sequence at end of buffer"
 msgstr "緩衝區結尾有不完全的字元或 shift sequence"
 
-#: iconv/iconv_charmap.c:525 iconv/iconv_charmap.c:561 iconv/iconv_prog.c:582
-#: iconv/iconv_prog.c:618
+#: iconv/iconv_charmap.c:499 iconv/iconv_charmap.c:535 iconv/iconv_prog.c:579
+#: iconv/iconv_prog.c:615
 #, c-format
 msgid "error while reading the input"
 msgstr "正在讀入資料的時候發生錯誤"
 
-#: iconv/iconv_charmap.c:543 iconv/iconv_prog.c:600
+#: iconv/iconv_charmap.c:517 iconv/iconv_prog.c:597
 #, c-format
 msgid "unable to allocate buffer for input"
 msgstr "無法配置輸入用的緩衝區"
@@ -1408,7 +1405,7 @@ msgstr "資料:"
 msgid "list all known coded character sets"
 msgstr "列出所有已知的編碼字元集"
 
-#: iconv/iconv_prog.c:64 locale/programs/localedef.c:127
+#: iconv/iconv_prog.c:64 locale/programs/localedef.c:120
 msgid "Output control:"
 msgstr "輸出控制:"
 
@@ -1417,8 +1414,8 @@ msgid "omit invalid characters from output"
 msgstr "省略無效字元的輸出"
 
 #: iconv/iconv_prog.c:66 iconv/iconvconfig.c:128
-#: locale/programs/localedef.c:120 locale/programs/localedef.c:122
-#: locale/programs/localedef.c:124 locale/programs/localedef.c:145
+#: locale/programs/localedef.c:113 locale/programs/localedef.c:115
+#: locale/programs/localedef.c:117 locale/programs/localedef.c:144
 #: malloc/memusagestat.c:56
 msgid "FILE"
 msgstr "檔案"
@@ -1443,59 +1440,67 @@ msgstr "從給定的檔案的字元編碼轉換到另一個"
 msgid "[FILE...]"
 msgstr "[FILE…]"
 
-#: iconv/iconv_prog.c:233
+#: iconv/iconv_prog.c:230
 #, c-format
 msgid "conversions from `%s' and to `%s' are not supported"
 msgstr "不支援從 `%s' 以及到 `%s' 的轉換"
 
-#: iconv/iconv_prog.c:238
+#: iconv/iconv_prog.c:235
 #, c-format
 msgid "conversion from `%s' is not supported"
 msgstr "不支援從 `%s' 的轉換"
 
-#: iconv/iconv_prog.c:245
+#: iconv/iconv_prog.c:242
 #, c-format
 msgid "conversion to `%s' is not supported"
 msgstr "不支援到 `%s' 的轉換"
 
-#: iconv/iconv_prog.c:249
+#: iconv/iconv_prog.c:246
 #, c-format
 msgid "conversion from `%s' to `%s' is not supported"
 msgstr "不支援從 `%s' 到 `%s' 的轉換"
 
-#: iconv/iconv_prog.c:259
+#: iconv/iconv_prog.c:256
 #, c-format
 msgid "failed to start conversion processing"
 msgstr "開始轉換程序失敗"
 
-#: iconv/iconv_prog.c:357
+#: iconv/iconv_prog.c:354
 #, c-format
 msgid "error while closing output file"
 msgstr "正在關閉輸出檔案的時候發生錯誤"
 
-#: iconv/iconv_prog.c:458
+#: iconv/iconv_prog.c:455
 #, c-format
 msgid "conversion stopped due to problem in writing the output"
 msgstr "因寫入輸出時發生錯誤而導致轉換停止"
 
-#: iconv/iconv_prog.c:535
+#: iconv/iconv_prog.c:532
 #, c-format
 msgid "illegal input sequence at position %ld"
 msgstr "位置 %ld 有不合法的輸入序列"
 
-#: iconv/iconv_prog.c:543
+#: iconv/iconv_prog.c:540
 #, c-format
 msgid "internal error (illegal descriptor)"
 msgstr "內部錯誤 (不合法的敘述項)"
 
-#: iconv/iconv_prog.c:546
+#: iconv/iconv_prog.c:543
 #, c-format
 msgid "unknown iconv() error %d"
 msgstr "不明的 iconv() 錯誤 %d"
 
-#: iconv/iconv_prog.c:791
+#: iconv/iconv_prog.c:786
+#, fuzzy
+#| msgid ""
+#| "The following list contain all the coded character sets known.  This does\n"
+#| "not necessarily mean that all combinations of these names can be used for\n"
+#| "the FROM and TO command line parameters.  One coded character set can be\n"
+#| "listed with several different names (aliases).\n"
+#| "\n"
+#| "  "
 msgid ""
-"The following list contain all the coded character sets known.  This does\n"
+"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"
 "the FROM and TO command line parameters.  One coded character set can be\n"
 "listed with several different names (aliases).\n"
@@ -1516,7 +1521,7 @@ msgstr "建立快速載入 iconv 模組的設定檔案。"
 msgid "[DIR...]"
 msgstr "[目錄…]"
 
-#: iconv/iconvconfig.c:126 locale/programs/localedef.c:131
+#: iconv/iconvconfig.c:126 locale/programs/localedef.c:123
 msgid "PATH"
 msgstr "路徑"
 
@@ -1537,7 +1542,7 @@ msgstr "不搜尋標準目錄，只有那些在之上命令列"
 msgid "Directory arguments required when using --nostdlib"
 msgstr "目錄引數必要項時正在使用 --nostdlib"
 
-#: iconv/iconvconfig.c:341 locale/programs/localedef.c:288
+#: iconv/iconvconfig.c:341
 #, c-format
 msgid "no output file produced because warnings were issued"
 msgstr "因為發出過警告訊息，所以沒有製造任何輸出檔"
@@ -1547,98 +1552,96 @@ msgstr "因為發出過警告訊息，所以沒有製造任何輸出檔"
 msgid "while inserting in search tree"
 msgstr "當插入於搜尋樹之中"
 
-#: iconv/iconvconfig.c:1239
+#: iconv/iconvconfig.c:1238
 #, c-format
 msgid "cannot generate output file"
 msgstr "無法產生輸出檔"
 
-#: inet/rcmd.c:163
+#: inet/rcmd.c:157
 msgid "rcmd: Cannot allocate memory\n"
 msgstr "rcmd: 無法配置記憶體\n"
 
-#: inet/rcmd.c:178
+#: inet/rcmd.c:174
 msgid "rcmd: socket: All ports in use\n"
 msgstr "rcmd: socket: 所有的埠都在使用中\n"
 
-#: inet/rcmd.c:206
+#: inet/rcmd.c:202
 #, c-format
 msgid "connect to address %s: "
 msgstr "連接到位址 %s: "
 
-#: inet/rcmd.c:219
+#: inet/rcmd.c:215
 #, c-format
 msgid "Trying %s...\n"
 msgstr "嘗試 %s…\n"
 
-#: inet/rcmd.c:255
+#: inet/rcmd.c:251
 #, c-format
 msgid "rcmd: write (setting up stderr): %m\n"
 msgstr "rcmd: write (正在設定標準錯誤輸出): %m\n"
 
-#: inet/rcmd.c:271
+#: inet/rcmd.c:267
 #, c-format
 msgid "rcmd: poll (setting up stderr): %m\n"
 msgstr "rcmd: poll (正在設定標準錯誤輸出): %m\n"
 
-#: inet/rcmd.c:274
+#: inet/rcmd.c:270
 msgid "poll: protocol failure in circuit setup\n"
 msgstr "poll: 通訊協定在設定線路時失效\n"
 
-#: inet/rcmd.c:306
+#: inet/rcmd.c:302
 msgid "socket: protocol failure in circuit setup\n"
 msgstr "socket: 通訊協定在設定線路時失效\n"
 
-#: inet/rcmd.c:330
+#: inet/rcmd.c:326
 #, c-format
 msgid "rcmd: %s: short read"
 msgstr "rcmd: %s: 讀入資料過短"
 
-#: inet/rcmd.c:486
+#: inet/rcmd.c:478
 msgid "lstat failed"
 msgstr "lstat 失敗"
 
-#: inet/rcmd.c:493
+#: inet/rcmd.c:485
 msgid "cannot open"
 msgstr "無法開啟"
 
-#: inet/rcmd.c:495
+#: inet/rcmd.c:487
 msgid "fstat failed"
 msgstr "fstat 失敗"
 
-#: inet/rcmd.c:497
+#: inet/rcmd.c:489
 msgid "bad owner"
 msgstr "錯誤的擁有者"
 
-#: inet/rcmd.c:499
+#: inet/rcmd.c:491
 msgid "writeable by other than owner"
 msgstr "使用者以外的人亦可寫入"
 
-#: inet/rcmd.c:501
+#: inet/rcmd.c:493
 msgid "hard linked somewhere"
 msgstr "被實體連結到某處"
 
-#: inet/ruserpass.c:170 inet/ruserpass.c:193
+#: inet/ruserpass.c:165 inet/ruserpass.c:188
 msgid "out of memory"
 msgstr "記憶體不足"
 
-#: inet/ruserpass.c:184
+#: inet/ruserpass.c:179
 msgid "Error: .netrc file is readable by others."
 msgstr "錯誤: .netrc 檔可以被別人讀取"
 
-#: inet/ruserpass.c:185
-msgid "Remove password or make file unreadable by others."
+#: inet/ruserpass.c:180
+#, fuzzy
+#| msgid "Remove password or make file unreadable by others."
+msgid "Remove 'password' line or make file unreadable by others."
 msgstr "移除密碼或讓他人無法讀取檔案"
 
-#: inet/ruserpass.c:277
+#: inet/ruserpass.c:199
 #, c-format
 msgid "Unknown .netrc keyword %s"
 msgstr "未知的 .netrc 關鍵字 %s"
 
-#: libidn/nfkc.c:463
-msgid "Character out of range for UTF-8"
-msgstr "字元超出 UTF-8 範圍"
-
-#: locale/programs/charmap-dir.c:57
+#: locale/programs/charmap-dir.c:56
 #, c-format
 msgid "cannot read character map directory `%s'"
 msgstr "無法讀取字集對照檔目錄 `%s'"
@@ -1648,835 +1651,834 @@ msgstr "無法讀取字集對照檔目錄 `%s'"
 msgid "character map file `%s' not found"
 msgstr "找不到字集對照檔 `%s'"
 
-#: locale/programs/charmap.c:195
+#: locale/programs/charmap.c:196
 #, c-format
 msgid "default character map file `%s' not found"
 msgstr "找不到預設的字集對照檔 `%s'"
 
-#: locale/programs/charmap.c:258
-#, c-format
-msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
+#: locale/programs/charmap.c:265
+#, fuzzy, c-format
+#| msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant\n"
+msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant [--no-warnings=ascii]"
 msgstr "字元對應 `%s' 不是 ASCII 相容碼，區域化資料庫不符合 ISO C\n"
 
-#: locale/programs/charmap.c:337
+#: locale/programs/charmap.c:343
 #, c-format
 msgid "%s: <mb_cur_max> must be greater than <mb_cur_min>\n"
 msgstr "%s: <mb_cur_max> 必須大於 <mb_cur_min>\n"
 
-#: locale/programs/charmap.c:357 locale/programs/charmap.c:374
-#: locale/programs/repertoire.c:174
+#: locale/programs/charmap.c:363 locale/programs/charmap.c:380
+#: locale/programs/repertoire.c:173
 #, c-format
 msgid "syntax error in prolog: %s"
 msgstr "prolog 中有語法錯誤: %s"
 
-#: locale/programs/charmap.c:358
+#: locale/programs/charmap.c:364
 msgid "invalid definition"
 msgstr "無效的定義"
 
-#: locale/programs/charmap.c:375 locale/programs/locfile.c:125
-#: locale/programs/locfile.c:152 locale/programs/repertoire.c:175
+#: locale/programs/charmap.c:381 locale/programs/locfile.c:131
+#: locale/programs/locfile.c:158 locale/programs/repertoire.c:174
 msgid "bad argument"
 msgstr "錯誤的引數"
 
-#: locale/programs/charmap.c:403
+#: locale/programs/charmap.c:408
 #, c-format
 msgid "duplicate definition of <%s>"
 msgstr "<%s> 的定義重複了"
 
-#: locale/programs/charmap.c:410
+#: locale/programs/charmap.c:415
 #, c-format
 msgid "value for <%s> must be 1 or greater"
 msgstr "<%s> 的值必須為 1 或者更大"
 
-#: locale/programs/charmap.c:422
+#: locale/programs/charmap.c:427
 #, c-format
 msgid "value of <%s> must be greater or equal than the value of <%s>"
 msgstr "<%s> 的值必須等於或大於 <%s> 的值"
 
-#: locale/programs/charmap.c:445 locale/programs/repertoire.c:183
+#: locale/programs/charmap.c:450 locale/programs/repertoire.c:182
 #, c-format
 msgid "argument to <%s> must be a single character"
 msgstr "給 <%s> 的引數必須是一個單字元"
 
-#: locale/programs/charmap.c:471
+#: locale/programs/charmap.c:476
 msgid "character sets with locking states are not supported"
 msgstr "不支援使用 locking 狀態的字元集"
 
-#: locale/programs/charmap.c:498 locale/programs/charmap.c:552
-#: locale/programs/charmap.c:584 locale/programs/charmap.c:678
-#: locale/programs/charmap.c:733 locale/programs/charmap.c:774
-#: locale/programs/charmap.c:815
+#: locale/programs/charmap.c:503 locale/programs/charmap.c:557
+#: locale/programs/charmap.c:589 locale/programs/charmap.c:683
+#: locale/programs/charmap.c:738 locale/programs/charmap.c:779
+#: locale/programs/charmap.c:820
 #, c-format
 msgid "syntax error in %s definition: %s"
 msgstr "定義 %s 的語法錯誤: %s"
 
-#: locale/programs/charmap.c:499 locale/programs/charmap.c:679
-#: locale/programs/charmap.c:775 locale/programs/repertoire.c:230
+#: locale/programs/charmap.c:504 locale/programs/charmap.c:684
+#: locale/programs/charmap.c:780 locale/programs/repertoire.c:229
 msgid "no symbolic name given"
 msgstr "沒有給予符號名稱"
 
-#: locale/programs/charmap.c:553
+#: locale/programs/charmap.c:558
 msgid "invalid encoding given"
 msgstr "給予的編碼是無效的"
 
-#: locale/programs/charmap.c:562
+#: locale/programs/charmap.c:567
 msgid "too few bytes in character encoding"
 msgstr "字元定義中的位元組太少了"
 
-#: locale/programs/charmap.c:564
+#: locale/programs/charmap.c:569
 msgid "too many bytes in character encoding"
 msgstr "字元定義中的位元組太多了"
 
-#: locale/programs/charmap.c:586 locale/programs/charmap.c:734
-#: locale/programs/charmap.c:817 locale/programs/repertoire.c:296
+#: locale/programs/charmap.c:591 locale/programs/charmap.c:739
+#: locale/programs/charmap.c:822 locale/programs/repertoire.c:295
 msgid "no symbolic name given for end of range"
 msgstr "沒有給此區的最後一個字元符號名稱"
 
-#: locale/programs/charmap.c:610 locale/programs/ld-address.c:602
-#: locale/programs/ld-collate.c:2767 locale/programs/ld-collate.c:3925
-#: locale/programs/ld-ctype.c:2256 locale/programs/ld-ctype.c:3007
-#: locale/programs/ld-identification.c:452
-#: locale/programs/ld-measurement.c:238 locale/programs/ld-messages.c:332
-#: locale/programs/ld-monetary.c:942 locale/programs/ld-name.c:307
-#: locale/programs/ld-numeric.c:368 locale/programs/ld-paper.c:241
-#: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1221
-#: locale/programs/repertoire.c:313
+#: locale/programs/charmap.c:615 locale/programs/ld-address.c:524
+#: locale/programs/ld-collate.c:2616 locale/programs/ld-collate.c:3774
+#: locale/programs/ld-ctype.c:2117 locale/programs/ld-ctype.c:2829
+#: locale/programs/ld-identification.c:397
+#: locale/programs/ld-measurement.c:213 locale/programs/ld-messages.c:295
+#: locale/programs/ld-monetary.c:748 locale/programs/ld-name.c:262
+#: locale/programs/ld-numeric.c:325 locale/programs/ld-paper.c:212
+#: locale/programs/ld-telephone.c:276 locale/programs/ld-time.c:959
+#: locale/programs/repertoire.c:312
 #, c-format
 msgid "%1$s: definition does not end with `END %1$s'"
 msgstr "%1$s: 定義並沒有以 `END %1$s' 做為結束"
 
-#: locale/programs/charmap.c:643
+#: locale/programs/charmap.c:648
 msgid "only WIDTH definitions are allowed to follow the CHARMAP definition"
 msgstr "只有 WIDTH 定義才能直接寫在 CHARMAP 定義之後"
 
-#: locale/programs/charmap.c:651 locale/programs/charmap.c:714
+#: locale/programs/charmap.c:656 locale/programs/charmap.c:719
 #, c-format
 msgid "value for %s must be an integer"
 msgstr "%s 的值必須是整數才行"
 
-#: locale/programs/charmap.c:842
+#: locale/programs/charmap.c:847
 #, c-format
 msgid "%s: error in state machine"
 msgstr "%s: 狀態機錯誤"
 
-#: locale/programs/charmap.c:850 locale/programs/ld-address.c:618
-#: locale/programs/ld-collate.c:2764 locale/programs/ld-collate.c:4118
-#: locale/programs/ld-ctype.c:2253 locale/programs/ld-ctype.c:3024
-#: locale/programs/ld-identification.c:468
-#: locale/programs/ld-measurement.c:254 locale/programs/ld-messages.c:348
-#: locale/programs/ld-monetary.c:958 locale/programs/ld-name.c:323
-#: locale/programs/ld-numeric.c:384 locale/programs/ld-paper.c:257
-#: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1237
-#: locale/programs/locfile.c:825 locale/programs/repertoire.c:324
+#: locale/programs/charmap.c:855 locale/programs/ld-address.c:540
+#: locale/programs/ld-collate.c:2613 locale/programs/ld-collate.c:3967
+#: locale/programs/ld-ctype.c:2114 locale/programs/ld-ctype.c:2846
+#: locale/programs/ld-identification.c:413
+#: locale/programs/ld-measurement.c:229 locale/programs/ld-messages.c:311
+#: locale/programs/ld-monetary.c:764 locale/programs/ld-name.c:278
+#: locale/programs/ld-numeric.c:341 locale/programs/ld-paper.c:228
+#: locale/programs/ld-telephone.c:292 locale/programs/ld-time.c:990
+#: locale/programs/locfile.c:997 locale/programs/repertoire.c:323
 #, c-format
 msgid "%s: premature end of file"
 msgstr "%s: 未完成已達檔案的末尾"
 
-#: locale/programs/charmap.c:869 locale/programs/charmap.c:880
+#: locale/programs/charmap.c:874 locale/programs/charmap.c:885
 #, c-format
 msgid "unknown character `%s'"
 msgstr "不明的字元 `%s'"
 
-#: locale/programs/charmap.c:888
+#: locale/programs/charmap.c:893
 #, c-format
 msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d"
 msgstr "在範圍起始與結束的位元組序列中，位元組的數目並不一致: %d vs %d"
 
-#: locale/programs/charmap.c:993 locale/programs/ld-collate.c:3044
-#: locale/programs/repertoire.c:419
+#: locale/programs/charmap.c:998 locale/programs/ld-collate.c:2893
+#: locale/programs/repertoire.c:418
 msgid "invalid names for character range"
 msgstr "無效的字元範圍名稱"
 
-#: locale/programs/charmap.c:1005 locale/programs/repertoire.c:431
+#: locale/programs/charmap.c:1010 locale/programs/repertoire.c:430
 msgid "hexadecimal range format should use only capital characters"
 msgstr "在表示十六進位的範圍時只能用大寫的英文字母表示"
 
-#: locale/programs/charmap.c:1023 locale/programs/repertoire.c:449
+#: locale/programs/charmap.c:1028 locale/programs/repertoire.c:448
 #, c-format
 msgid "<%s> and <%s> are invalid names for range"
 msgstr "<%s> 以及 <%s> 是不適用的範圍名稱"
 
-#: locale/programs/charmap.c:1029 locale/programs/repertoire.c:456
+#: locale/programs/charmap.c:1034 locale/programs/repertoire.c:455
 msgid "upper limit in range is smaller than lower limit"
 msgstr "範圍中上限小於下限"
 
-#: locale/programs/charmap.c:1087
+#: locale/programs/charmap.c:1092
 msgid "resulting bytes for range not representable."
 msgstr "用來定義範圍的位元組無法被表述出來"
 
-#: locale/programs/ld-address.c:135 locale/programs/ld-collate.c:1558
-#: locale/programs/ld-ctype.c:421 locale/programs/ld-identification.c:133
-#: locale/programs/ld-measurement.c:94 locale/programs/ld-messages.c:97
-#: locale/programs/ld-monetary.c:193 locale/programs/ld-name.c:94
-#: locale/programs/ld-numeric.c:98 locale/programs/ld-paper.c:91
-#: locale/programs/ld-telephone.c:94 locale/programs/ld-time.c:159
+#: locale/programs/ld-address.c:133 locale/programs/ld-collate.c:1563
+#: locale/programs/ld-ctype.c:430 locale/programs/ld-identification.c:131
+#: locale/programs/ld-measurement.c:92 locale/programs/ld-messages.c:96
+#: locale/programs/ld-monetary.c:192 locale/programs/ld-name.c:93
+#: locale/programs/ld-numeric.c:97 locale/programs/ld-paper.c:89
+#: locale/programs/ld-telephone.c:92 locale/programs/ld-time.c:164
 #, c-format
 msgid "No definition for %s category found"
 msgstr "找不到 %s 類別的定義"
 
-#: locale/programs/ld-address.c:146 locale/programs/ld-address.c:184
-#: locale/programs/ld-address.c:202 locale/programs/ld-address.c:231
-#: locale/programs/ld-address.c:303 locale/programs/ld-address.c:322
-#: locale/programs/ld-address.c:335 locale/programs/ld-identification.c:146
-#: locale/programs/ld-measurement.c:105 locale/programs/ld-monetary.c:205
-#: locale/programs/ld-monetary.c:249 locale/programs/ld-monetary.c:265
-#: locale/programs/ld-monetary.c:277 locale/programs/ld-name.c:105
-#: locale/programs/ld-name.c:142 locale/programs/ld-numeric.c:112
-#: locale/programs/ld-numeric.c:126 locale/programs/ld-paper.c:102
-#: locale/programs/ld-paper.c:111 locale/programs/ld-telephone.c:105
-#: locale/programs/ld-telephone.c:162 locale/programs/ld-time.c:175
-#: locale/programs/ld-time.c:196
+#: locale/programs/ld-address.c:144 locale/programs/ld-address.c:182
+#: locale/programs/ld-address.c:199 locale/programs/ld-address.c:228
+#: locale/programs/ld-address.c:300 locale/programs/ld-address.c:319
+#: locale/programs/ld-address.c:331 locale/programs/ld-identification.c:144
+#: locale/programs/ld-measurement.c:103 locale/programs/ld-monetary.c:204
+#: locale/programs/ld-monetary.c:258 locale/programs/ld-monetary.c:274
+#: locale/programs/ld-monetary.c:286 locale/programs/ld-name.c:104
+#: locale/programs/ld-name.c:141 locale/programs/ld-numeric.c:111
+#: locale/programs/ld-numeric.c:125 locale/programs/ld-paper.c:100
+#: locale/programs/ld-paper.c:109 locale/programs/ld-telephone.c:103
+#: locale/programs/ld-telephone.c:160 locale/programs/ld-time.c:180
+#: locale/programs/ld-time.c:201
 #, c-format
 msgid "%s: field `%s' not defined"
 msgstr "%s: 欄位 `%s' 沒有定義"
 
-#: locale/programs/ld-address.c:158 locale/programs/ld-address.c:210
-#: locale/programs/ld-address.c:240 locale/programs/ld-address.c:278
-#: locale/programs/ld-name.c:117 locale/programs/ld-telephone.c:117
+#: locale/programs/ld-address.c:156 locale/programs/ld-address.c:207
+#: locale/programs/ld-address.c:237 locale/programs/ld-address.c:275
+#: locale/programs/ld-name.c:116 locale/programs/ld-telephone.c:115
 #, c-format
 msgid "%s: field `%s' must not be empty"
 msgstr "%s: 欄位 `%s' 不可以空白"
 
-#: locale/programs/ld-address.c:170
+#: locale/programs/ld-address.c:168
 #, c-format
 msgid "%s: invalid escape `%%%c' sequence in field `%s'"
 msgstr "%s: 不適用的跳脫序列 `%%%c', 在欄位 `%s' 中"
 
-#: locale/programs/ld-address.c:221
+#: locale/programs/ld-address.c:218
 #, c-format
 msgid "%s: terminology language code `%s' not defined"
 msgstr "%s: 術語語言編碼 `%s' 未定義"
 
-#: locale/programs/ld-address.c:246
+#: locale/programs/ld-address.c:243
 #, c-format
 msgid "%s: field `%s' must not be defined"
 msgstr "%s: 欄位「%s」必須未被定義"
 
-#: locale/programs/ld-address.c:260 locale/programs/ld-address.c:289
+#: locale/programs/ld-address.c:257 locale/programs/ld-address.c:286
 #, c-format
 msgid "%s: language abbreviation `%s' not defined"
 msgstr "%s: 語言縮寫 `%s' 沒有定義"
 
-#: locale/programs/ld-address.c:267 locale/programs/ld-address.c:295
-#: locale/programs/ld-address.c:329 locale/programs/ld-address.c:341
+#: locale/programs/ld-address.c:264 locale/programs/ld-address.c:292
+#: locale/programs/ld-address.c:325 locale/programs/ld-address.c:337
 #, c-format
 msgid "%s: `%s' value does not match `%s' value"
 msgstr "%s: `%s' 值與 `%s' 值不符合"
 
-#: locale/programs/ld-address.c:314
+#: locale/programs/ld-address.c:311
 #, c-format
 msgid "%s: numeric country code `%d' not valid"
 msgstr "%s: 國家數字代碼 `%d' 錯誤"
 
-#: locale/programs/ld-address.c:510 locale/programs/ld-address.c:547
-#: locale/programs/ld-address.c:585 locale/programs/ld-ctype.c:2631
-#: locale/programs/ld-identification.c:364
-#: locale/programs/ld-measurement.c:221 locale/programs/ld-messages.c:301
-#: locale/programs/ld-monetary.c:700 locale/programs/ld-monetary.c:735
-#: locale/programs/ld-monetary.c:776 locale/programs/ld-name.c:280
-#: locale/programs/ld-numeric.c:263 locale/programs/ld-paper.c:224
-#: locale/programs/ld-telephone.c:288 locale/programs/ld-time.c:1126
-#: locale/programs/ld-time.c:1168
+#: locale/programs/ld-address.c:432 locale/programs/ld-address.c:469
+#: locale/programs/ld-address.c:507 locale/programs/ld-ctype.c:2478
+#: locale/programs/ld-identification.c:309
+#: locale/programs/ld-measurement.c:196 locale/programs/ld-messages.c:264
+#: locale/programs/ld-monetary.c:503 locale/programs/ld-monetary.c:538
+#: locale/programs/ld-monetary.c:579 locale/programs/ld-name.c:235
+#: locale/programs/ld-numeric.c:217 locale/programs/ld-paper.c:195
+#: locale/programs/ld-telephone.c:251 locale/programs/ld-time.c:864
+#: locale/programs/ld-time.c:906
 #, c-format
 msgid "%s: field `%s' declared more than once"
 msgstr "%s: `%s' 欄位不只一次地宣告"
 
-#: locale/programs/ld-address.c:514 locale/programs/ld-address.c:552
-#: locale/programs/ld-identification.c:368 locale/programs/ld-messages.c:311
-#: locale/programs/ld-monetary.c:704 locale/programs/ld-monetary.c:739
-#: locale/programs/ld-name.c:284 locale/programs/ld-numeric.c:267
-#: locale/programs/ld-telephone.c:292 locale/programs/ld-time.c:1020
-#: locale/programs/ld-time.c:1089 locale/programs/ld-time.c:1131
+#: locale/programs/ld-address.c: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
 #, c-format
 msgid "%s: unknown character in field `%s'"
 msgstr "%s: 未知的字元在欄位 `%s' 中"
 
-#: locale/programs/ld-address.c:599 locale/programs/ld-collate.c:3923
-#: locale/programs/ld-ctype.c:3004 locale/programs/ld-identification.c:449
-#: locale/programs/ld-measurement.c:235 locale/programs/ld-messages.c:330
-#: locale/programs/ld-monetary.c:940 locale/programs/ld-name.c:305
-#: locale/programs/ld-numeric.c:366 locale/programs/ld-paper.c:239
-#: locale/programs/ld-telephone.c:311 locale/programs/ld-time.c:1219
+#: locale/programs/ld-address.c:521 locale/programs/ld-collate.c:3772
+#: locale/programs/ld-ctype.c:2826 locale/programs/ld-identification.c:394
+#: locale/programs/ld-measurement.c:210 locale/programs/ld-messages.c:293
+#: locale/programs/ld-monetary.c:746 locale/programs/ld-name.c:260
+#: locale/programs/ld-numeric.c:323 locale/programs/ld-paper.c:210
+#: locale/programs/ld-telephone.c:274 locale/programs/ld-time.c:957
 #, c-format
 msgid "%s: incomplete `END' line"
 msgstr "%s: 不完整的 `END' 列"
 
-#: locale/programs/ld-address.c:609 locale/programs/ld-collate.c:544
-#: locale/programs/ld-collate.c:596 locale/programs/ld-collate.c:892
-#: locale/programs/ld-collate.c:905 locale/programs/ld-collate.c:2733
-#: locale/programs/ld-collate.c:2754 locale/programs/ld-collate.c:4108
-#: locale/programs/ld-ctype.c:1985 locale/programs/ld-ctype.c:2243
-#: locale/programs/ld-ctype.c:2829 locale/programs/ld-ctype.c:3015
-#: locale/programs/ld-identification.c:459
-#: locale/programs/ld-measurement.c:245 locale/programs/ld-messages.c:339
-#: locale/programs/ld-monetary.c:949 locale/programs/ld-name.c:314
-#: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:248
-#: locale/programs/ld-telephone.c:320 locale/programs/ld-time.c:1228
+#: locale/programs/ld-address.c:531 locale/programs/ld-collate.c:550
+#: locale/programs/ld-collate.c:602 locale/programs/ld-collate.c:898
+#: locale/programs/ld-collate.c:911 locale/programs/ld-collate.c:2582
+#: locale/programs/ld-collate.c:2603 locale/programs/ld-collate.c:3957
+#: locale/programs/ld-ctype.c:1846 locale/programs/ld-ctype.c:2104
+#: locale/programs/ld-ctype.c:2676 locale/programs/ld-ctype.c:2837
+#: locale/programs/ld-identification.c:404
+#: locale/programs/ld-measurement.c:220 locale/programs/ld-messages.c:302
+#: locale/programs/ld-monetary.c:755 locale/programs/ld-name.c:269
+#: locale/programs/ld-numeric.c:332 locale/programs/ld-paper.c:219
+#: locale/programs/ld-telephone.c:283 locale/programs/ld-time.c:981
 #, c-format
 msgid "%s: syntax error"
 msgstr "%s: 語法錯誤"
 
-#: locale/programs/ld-collate.c:419
+#: locale/programs/ld-collate.c:425
 #, c-format
 msgid "`%.*s' already defined in charmap"
 msgstr "`%.*s' 在字集對照表中已經定義過了"
 
-#: locale/programs/ld-collate.c:428
+#: locale/programs/ld-collate.c:434
 #, c-format
 msgid "`%.*s' already defined in repertoire"
 msgstr "`%.*s' 在編碼對映檔中已經被定義過了"
 
-#: locale/programs/ld-collate.c:435
+#: locale/programs/ld-collate.c:441
 #, c-format
 msgid "`%.*s' already defined as collating symbol"
 msgstr "`%.*s' 已被定義為對照符號"
 
-#: locale/programs/ld-collate.c:442
+#: locale/programs/ld-collate.c:448
 #, c-format
 msgid "`%.*s' already defined as collating element"
 msgstr "`%.*s' 已被定義為對照元素"
 
-#: locale/programs/ld-collate.c:473 locale/programs/ld-collate.c:499
+#: locale/programs/ld-collate.c:479 locale/programs/ld-collate.c:505
 #, c-format
 msgid "%s: `forward' and `backward' are mutually excluding each other"
 msgstr "%s: `forward' 以及 `backward' 彼此互相排斥"
 
-#: locale/programs/ld-collate.c:483 locale/programs/ld-collate.c:509
-#: locale/programs/ld-collate.c:525
+#: locale/programs/ld-collate.c:489 locale/programs/ld-collate.c:515
+#: locale/programs/ld-collate.c:531
 #, c-format
 msgid "%s: `%s' mentioned more than once in definition of weight %d"
 msgstr "%s: `%s' 不只一次地在權重 %d 中被提到"
 
-#: locale/programs/ld-collate.c:581
+#: locale/programs/ld-collate.c:587
 #, c-format
 msgid "%s: too many rules; first entry only had %d"
 msgstr "%s: 太多規則；第一個項目只包含 %d"
 
-#: locale/programs/ld-collate.c:617
+#: locale/programs/ld-collate.c:623
 #, c-format
 msgid "%s: not enough sorting rules"
 msgstr "%s: 排序規則不足"
 
-#: locale/programs/ld-collate.c:782
+#: locale/programs/ld-collate.c:788
 #, c-format
 msgid "%s: empty weight string not allowed"
 msgstr "%s: 空白的權重字串是不允許的"
 
-#: locale/programs/ld-collate.c:877
+#: locale/programs/ld-collate.c:883
 #, c-format
 msgid "%s: weights must use the same ellipsis symbol as the name"
 msgstr "%s: 權重必須使用與名稱相同的省略符號"
 
-#: locale/programs/ld-collate.c:933
+#: locale/programs/ld-collate.c:939
 #, c-format
 msgid "%s: too many values"
 msgstr "%s: 太多變數值"
 
-#: locale/programs/ld-collate.c:1053 locale/programs/ld-collate.c:1228
+#: locale/programs/ld-collate.c:1059 locale/programs/ld-collate.c:1234
 #, c-format
 msgid "order for `%.*s' already defined at %s:%Zu"
 msgstr "`%.*s' 的順序已經在 %s:%Zu 裡面定義了"
 
-#: locale/programs/ld-collate.c:1103
+#: locale/programs/ld-collate.c:1109
 #, c-format
 msgid "%s: the start and the end symbol of a range must stand for characters"
 msgstr "%s: 啟始與結束符號範圍必須代表字元"
 
-#: locale/programs/ld-collate.c:1130
+#: locale/programs/ld-collate.c:1136
 #, c-format
 msgid "%s: byte sequences of first and last character must have the same length"
 msgstr "%s: 第一個與最後一個字元的位元組序列必須有相同的長度"
 
-#: locale/programs/ld-collate.c:1172
+#: locale/programs/ld-collate.c:1178
 #, c-format
 msgid "%s: byte sequence of first character of range is not lower than that of the last character"
 msgstr "%s: 範圍首字元的位元組序列沒有低於末字元的位元組序列"
 
-#: locale/programs/ld-collate.c:1297
+#: locale/programs/ld-collate.c:1303
 #, c-format
 msgid "%s: symbolic range ellipsis must not directly follow `order_start'"
 msgstr "%s: 符號範圍的省略不可以直接在 `order_start' 之後"
 
-#: locale/programs/ld-collate.c:1301
+#: locale/programs/ld-collate.c:1307
 #, c-format
 msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'"
 msgstr "%s: 符號範圍的省略不可以直接在 `order_end' 之前"
 
-#: locale/programs/ld-collate.c:1321 locale/programs/ld-ctype.c:1502
+#: locale/programs/ld-collate.c:1327 locale/programs/ld-ctype.c:1363
 #, c-format
 msgid "`%s' and `%.*s' are not valid names for symbolic range"
 msgstr "`%s' 和 `%.*s' 皆非符號範圍中適用的名稱"
 
-#: locale/programs/ld-collate.c:1371 locale/programs/ld-collate.c:3859
+#: locale/programs/ld-collate.c:1377 locale/programs/ld-collate.c:3708
 #, c-format
 msgid "%s: order for `%.*s' already defined at %s:%Zu"
 msgstr "%s: `%.*s' 的順序已在 %s:%Zu 中定義"
 
-#: locale/programs/ld-collate.c:1380
+#: locale/programs/ld-collate.c:1386
 #, c-format
 msgid "%s: `%s' must be a character"
 msgstr "%s: `%s' 必須是一個字元"
 
-#: locale/programs/ld-collate.c:1575
+#: locale/programs/ld-collate.c:1580
 #, c-format
 msgid "%s: `position' must be used for a specific level in all sections or none"
 msgstr "%s: `position' 必須在所有區塊裡特定的等級中使用，否則不能使用"
 
-#: locale/programs/ld-collate.c:1600
+#: locale/programs/ld-collate.c:1604
 #, c-format
 msgid "symbol `%s' not defined"
 msgstr "並未定義 `%s' 符號"
 
-#: locale/programs/ld-collate.c:1676 locale/programs/ld-collate.c:1782
+#: locale/programs/ld-collate.c:1680 locale/programs/ld-collate.c:1785
 #, c-format
 msgid "symbol `%s' has the same encoding as"
 msgstr "跟符號 `%s' 有相同的編碼: "
 
-#: locale/programs/ld-collate.c:1680 locale/programs/ld-collate.c:1786
+#: locale/programs/ld-collate.c:1684 locale/programs/ld-collate.c:1789
 #, c-format
 msgid "symbol `%s'"
 msgstr "符號 `%s'"
 
-#: locale/programs/ld-collate.c:1828
-#, c-format
-msgid "no definition of `UNDEFINED'"
-msgstr "沒有找到 `UNDEFINED' 的定義"
-
-#: locale/programs/ld-collate.c:1857
-#, c-format
+#: locale/programs/ld-collate.c:1852
 msgid "too many errors; giving up"
 msgstr "發生太多錯誤；放棄中"
 
-#: locale/programs/ld-collate.c:2659 locale/programs/ld-collate.c:4047
+#: locale/programs/ld-collate.c:2508 locale/programs/ld-collate.c:3896
 #, c-format
 msgid "%s: nested conditionals not supported"
 msgstr "%s: 不支援巢狀條件"
 
-#: locale/programs/ld-collate.c:2677
-#, c-format
-msgid "%s: more then one 'else'"
+#: locale/programs/ld-collate.c:2526
+#, fuzzy, c-format
+#| msgid "%s: more then one 'else'"
+msgid "%s: more than one 'else'"
 msgstr "%s: 使用多於一個「else」"
 
-#: locale/programs/ld-collate.c:2852
+#: locale/programs/ld-collate.c:2701
 #, c-format
 msgid "%s: duplicate definition of `%s'"
 msgstr "%s: 重複的定義 `%s'"
 
-#: locale/programs/ld-collate.c:2888
+#: locale/programs/ld-collate.c:2737
 #, c-format
 msgid "%s: duplicate declaration of section `%s'"
 msgstr "%s: 重複的 `%s' 區塊宣告"
 
-#: locale/programs/ld-collate.c:3024
+#: locale/programs/ld-collate.c:2873
 #, c-format
 msgid "%s: unknown character in collating symbol name"
 msgstr "%s: 未知的字元在對照符號名稱中"
 
-#: locale/programs/ld-collate.c:3153
+#: locale/programs/ld-collate.c:3002
 #, c-format
 msgid "%s: unknown character in equivalent definition name"
 msgstr "%s: 未知的字元在同義定義名稱中"
 
-#: locale/programs/ld-collate.c:3164
+#: locale/programs/ld-collate.c:3013
 #, c-format
 msgid "%s: unknown character in equivalent definition value"
 msgstr "%s: 未知的字元在同義定義值中"
 
-#: locale/programs/ld-collate.c:3174
+#: locale/programs/ld-collate.c:3023
 #, c-format
 msgid "%s: unknown symbol `%s' in equivalent definition"
 msgstr "%s: 未知的符號 `%s' 在同義定義中"
 
-#: locale/programs/ld-collate.c:3183
+#: locale/programs/ld-collate.c:3032
 msgid "error while adding equivalent collating symbol"
 msgstr "正在加入同義對照符號時發生錯誤"
 
-#: locale/programs/ld-collate.c:3221
+#: locale/programs/ld-collate.c:3070
 #, c-format
 msgid "duplicate definition of script `%s'"
 msgstr "敘述 `%s' 的定義重複了"
 
-#: locale/programs/ld-collate.c:3269
+#: locale/programs/ld-collate.c:3118
 #, c-format
 msgid "%s: unknown section name `%.*s'"
 msgstr "%s: 不明的節段名稱「%.*s」"
 
-#: locale/programs/ld-collate.c:3298
+#: locale/programs/ld-collate.c:3147
 #, c-format
 msgid "%s: multiple order definitions for section `%s'"
 msgstr "%s: `%s' 區塊中有多個順序定義"
 
-#: locale/programs/ld-collate.c:3326
+#: locale/programs/ld-collate.c:3175
 #, c-format
 msgid "%s: invalid number of sorting rules"
 msgstr "%s: 不適用的排序規則數目"
 
-#: locale/programs/ld-collate.c:3353
+#: locale/programs/ld-collate.c:3202
 #, c-format
 msgid "%s: multiple order definitions for unnamed section"
 msgstr "%s: 未命名的區塊中有多個順序定義"
 
-#: locale/programs/ld-collate.c:3408 locale/programs/ld-collate.c:3538
-#: locale/programs/ld-collate.c:3901
+#: locale/programs/ld-collate.c:3257 locale/programs/ld-collate.c:3387
+#: locale/programs/ld-collate.c:3750
 #, c-format
 msgid "%s: missing `order_end' keyword"
 msgstr "%s: 缺少 `order_end' 關鍵字"
 
-#: locale/programs/ld-collate.c:3471
+#: locale/programs/ld-collate.c:3320
 #, c-format
 msgid "%s: order for collating symbol %.*s not yet defined"
 msgstr "%s: 對照符號 %.*s 的順序尚未定義"
 
-#: locale/programs/ld-collate.c:3489
+#: locale/programs/ld-collate.c:3338
 #, c-format
 msgid "%s: order for collating element %.*s not yet defined"
 msgstr "%s: 對照元素 %.*s 的順序尚未定義"
 
-#: locale/programs/ld-collate.c:3500
+#: locale/programs/ld-collate.c:3349
 #, c-format
 msgid "%s: cannot reorder after %.*s: symbol not known"
 msgstr "%s: 無法重新排列在 %.*s 之後: 未知的符號"
 
-#: locale/programs/ld-collate.c:3552 locale/programs/ld-collate.c:3913
+#: locale/programs/ld-collate.c:3401 locale/programs/ld-collate.c:3762
 #, c-format
 msgid "%s: missing `reorder-end' keyword"
 msgstr "%s: 缺少 `reorder-end' 關鍵字"
 
-#: locale/programs/ld-collate.c:3586 locale/programs/ld-collate.c:3784
+#: locale/programs/ld-collate.c:3435 locale/programs/ld-collate.c:3633
 #, c-format
 msgid "%s: section `%.*s' not known"
 msgstr "%s: 未知的區塊 `%.*s'"
 
-#: locale/programs/ld-collate.c:3651
+#: locale/programs/ld-collate.c:3500
 #, c-format
 msgid "%s: bad symbol <%.*s>"
 msgstr "%s: 不當的符號 <%.*s>"
 
-#: locale/programs/ld-collate.c:3847
+#: locale/programs/ld-collate.c:3696
 #, c-format
 msgid "%s: cannot have `%s' as end of ellipsis range"
 msgstr "%s: 無法用 `%s' 做為省略區段的結尾"
 
-#: locale/programs/ld-collate.c:3897
+#: locale/programs/ld-collate.c:3746
 #, c-format
 msgid "%s: empty category description not allowed"
 msgstr "%s: 空白的類別描述是不允許的"
 
-#: locale/programs/ld-collate.c:3916
+#: locale/programs/ld-collate.c:3765
 #, c-format
 msgid "%s: missing `reorder-sections-end' keyword"
 msgstr "%s: 缺少 `reorder-sections-end' 關鍵字"
 
-#: locale/programs/ld-collate.c:4080
+#: locale/programs/ld-collate.c:3929
 #, c-format
 msgid "%s: '%s' without matching 'ifdef' or 'ifndef'"
 msgstr "%s:「%s」而不需吻合中「ifdef」或「ifndef」"
 
-#: locale/programs/ld-collate.c:4098
+#: locale/programs/ld-collate.c:3947
 #, c-format
 msgid "%s: 'endif' without matching 'ifdef' or 'ifndef'"
 msgstr "%s:「endif」而不需吻合中「ifdef」或「ifndef」"
 
-#: locale/programs/ld-ctype.c:440
-#, c-format
+#: locale/programs/ld-ctype.c:448
 msgid "No character set name specified in charmap"
 msgstr "在字元對應 (charmap) 中沒有設定字集名稱"
 
-#: locale/programs/ld-ctype.c:469
+#: locale/programs/ld-ctype.c:476
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must be in class `%s'"
 msgstr "character L'\\u%0*x' (放在類別 `%s' 之中) 必須在類別 `%s' 裡面"
 
-#: locale/programs/ld-ctype.c:484
+#: locale/programs/ld-ctype.c:490
 #, c-format
 msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'"
 msgstr "character L'\\u%0*x' (放在類別 `%s' 之中) 不能在類別 `%s' 裡面"
 
-#: locale/programs/ld-ctype.c:498 locale/programs/ld-ctype.c:556
+#: locale/programs/ld-ctype.c:504 locale/programs/ld-ctype.c:560
 #, c-format
 msgid "internal error in %s, line %u"
 msgstr "%s 的第 %u 列發生內部錯誤"
 
-#: locale/programs/ld-ctype.c:527
+#: locale/programs/ld-ctype.c:532
 #, c-format
 msgid "character '%s' in class `%s' must be in class `%s'"
 msgstr "字元 '%s' (放在類別 `%s' 之中) 必須在類別 `%s' 裡面"
 
-#: locale/programs/ld-ctype.c:543
+#: locale/programs/ld-ctype.c:547
 #, c-format
 msgid "character '%s' in class `%s' must not be in class `%s'"
 msgstr "字元 '%s' (放在類別 `%s' 之中) 不能在類別 `%s' 裡面"
 
-#: locale/programs/ld-ctype.c:573 locale/programs/ld-ctype.c:611
+#: locale/programs/ld-ctype.c:576 locale/programs/ld-ctype.c:611
 #, c-format
 msgid "<SP> character not in class `%s'"
 msgstr "<SP> 字元不在類別 `%s' 中"
 
-#: locale/programs/ld-ctype.c:585 locale/programs/ld-ctype.c:622
+#: locale/programs/ld-ctype.c:587 locale/programs/ld-ctype.c:621
 #, c-format
 msgid "<SP> character must not be in class `%s'"
 msgstr "<SP> 字元不可以在類別 `%s' 中"
 
-#: locale/programs/ld-ctype.c:600
-#, c-format
+#: locale/programs/ld-ctype.c:601
 msgid "character <SP> not defined in character map"
 msgstr "字元 <SP> 在字集對照檔中沒有定義"
 
-#: locale/programs/ld-ctype.c:736
-#, c-format
+#: locale/programs/ld-ctype.c:735
 msgid "`digit' category has not entries in groups of ten"
 msgstr "`digit' 類別在群組 \"十\" 中沒有項目"
 
-#: locale/programs/ld-ctype.c:785
-#, c-format
+#: locale/programs/ld-ctype.c:784
 msgid "no input digits defined and none of the standard names in the charmap"
 msgstr "沒有定義輸入數字，在字集對照檔中也找不到相符的標準名稱"
 
-#: locale/programs/ld-ctype.c:850
-#, c-format
+#: locale/programs/ld-ctype.c:849
 msgid "not all characters used in `outdigit' are available in the charmap"
 msgstr "在字集對照表中無法找到某些在 `outdigit' 中用到的字元"
 
-#: locale/programs/ld-ctype.c:867
-#, c-format
+#: locale/programs/ld-ctype.c:866
 msgid "not all characters used in `outdigit' are available in the repertoire"
 msgstr "在編碼對映檔中無法找到某些在 `outdigit' 中用到的字元"
 
-#: locale/programs/ld-ctype.c:1270
+#: locale/programs/ld-ctype.c:1131
 #, c-format
 msgid "character class `%s' already defined"
 msgstr "字元類別 `%s' 已經定義過了"
 
-#: locale/programs/ld-ctype.c:1276
+#: locale/programs/ld-ctype.c:1137
 #, c-format
 msgid "implementation limit: no more than %Zd character classes allowed"
 msgstr "程式實作的限制: 不能使用超過 %Zd 個字集類別"
 
-#: locale/programs/ld-ctype.c:1302
+#: locale/programs/ld-ctype.c:1163
 #, c-format
 msgid "character map `%s' already defined"
 msgstr "字集對照檔 `%s' 已經定義過了"
 
-#: locale/programs/ld-ctype.c:1308
+#: locale/programs/ld-ctype.c:1169
 #, c-format
 msgid "implementation limit: no more than %d character maps allowed"
 msgstr "程式實作的限制: 不能使用超過 %d 個字集對照檔"
 
-#: locale/programs/ld-ctype.c:1573 locale/programs/ld-ctype.c:1698
-#: locale/programs/ld-ctype.c:1804 locale/programs/ld-ctype.c:2494
-#: locale/programs/ld-ctype.c:3490
+#: locale/programs/ld-ctype.c:1434 locale/programs/ld-ctype.c:1559
+#: locale/programs/ld-ctype.c:1665 locale/programs/ld-ctype.c:2341
+#: locale/programs/ld-ctype.c:3299
 #, c-format
 msgid "%s: field `%s' does not contain exactly ten entries"
 msgstr "%s: `%s' 欄位沒有精確包含十個項目"
 
-#: locale/programs/ld-ctype.c:1601 locale/programs/ld-ctype.c:2175
+#: 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:1728
+#: 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:1735
+#: locale/programs/ld-ctype.c:1596
 msgid "to-value character sequence is smaller than from-value sequence"
 msgstr "字元序列定義的結尾值比起始值還要小"
 
-#: locale/programs/ld-ctype.c:2095 locale/programs/ld-ctype.c:2146
+#: locale/programs/ld-ctype.c:1956 locale/programs/ld-ctype.c:2007
 msgid "premature end of `translit_ignore' definition"
 msgstr "`translit_ignore' 定義沒有按時結束"
 
-#: locale/programs/ld-ctype.c:2101 locale/programs/ld-ctype.c:2152
-#: locale/programs/ld-ctype.c:2194
+#: locale/programs/ld-ctype.c:1962 locale/programs/ld-ctype.c:2013
+#: locale/programs/ld-ctype.c:2055
 msgid "syntax error"
 msgstr "語法錯誤"
 
-#: locale/programs/ld-ctype.c:2327
+#: 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:2342
+#: 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:2516
+#: locale/programs/ld-ctype.c:2363
 msgid "ellipsis range must be marked by two operands of same type"
 msgstr "省略區域必須用兩個型別相同的運算元標示出來"
 
-#: locale/programs/ld-ctype.c:2525
+#: 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:2540
+#: 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:2554
+#: locale/programs/ld-ctype.c:2401
 msgid "with character code range values one must use the absolute ellipsis `...'"
 msgstr "用來指定字元編碼值的範圍時得用絕對位置的省略符號 `…'"
 
-#: locale/programs/ld-ctype.c:2705
+#: locale/programs/ld-ctype.c:2552
 #, c-format
 msgid "duplicated definition for mapping `%s'"
 msgstr "對映 `%s' 的定義重複了"
 
-#: locale/programs/ld-ctype.c:2791 locale/programs/ld-ctype.c:2935
+#: 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:2886
+#: locale/programs/ld-ctype.c:2733
 #, c-format
 msgid "%s: duplicate `default_missing' definition"
 msgstr "%s: 重複的 `default_missing' 定義"
 
-#: locale/programs/ld-ctype.c:2891
+#: locale/programs/ld-ctype.c:2738
 msgid "previous definition was here"
 msgstr "先前的設定在此"
 
-#: locale/programs/ld-ctype.c:2913
+#: 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:3066 locale/programs/ld-ctype.c:3150
-#: locale/programs/ld-ctype.c:3170 locale/programs/ld-ctype.c:3191
-#: locale/programs/ld-ctype.c:3212 locale/programs/ld-ctype.c:3233
-#: locale/programs/ld-ctype.c:3254 locale/programs/ld-ctype.c:3294
-#: locale/programs/ld-ctype.c:3315 locale/programs/ld-ctype.c:3382
-#: locale/programs/ld-ctype.c:3424 locale/programs/ld-ctype.c:3449
+#: locale/programs/ld-ctype.c:2877 locale/programs/ld-ctype.c:2973
+#: locale/programs/ld-ctype.c:2992 locale/programs/ld-ctype.c:3012
+#: locale/programs/ld-ctype.c:3032 locale/programs/ld-ctype.c:3052
+#: locale/programs/ld-ctype.c:3072 locale/programs/ld-ctype.c:3111
+#: locale/programs/ld-ctype.c:3131 locale/programs/ld-ctype.c:3195
+#: locale/programs/ld-ctype.c:3236 locale/programs/ld-ctype.c:3259
 #, c-format
 msgid "%s: character `%s' not defined while needed as default value"
 msgstr "%s: 字元 `%s' 沒有定義，但它是必需的預設值"
 
-#: locale/programs/ld-ctype.c:3071 locale/programs/ld-ctype.c:3155
-#: locale/programs/ld-ctype.c:3175 locale/programs/ld-ctype.c:3196
-#: locale/programs/ld-ctype.c:3217 locale/programs/ld-ctype.c:3238
-#: locale/programs/ld-ctype.c:3259 locale/programs/ld-ctype.c:3299
-#: locale/programs/ld-ctype.c:3320 locale/programs/ld-ctype.c:3387
+#: locale/programs/ld-ctype.c:2882 locale/programs/ld-ctype.c:2978
+#: locale/programs/ld-ctype.c:2997 locale/programs/ld-ctype.c:3017
+#: locale/programs/ld-ctype.c:3037 locale/programs/ld-ctype.c:3057
+#: locale/programs/ld-ctype.c:3077 locale/programs/ld-ctype.c:3116
+#: locale/programs/ld-ctype.c:3136 locale/programs/ld-ctype.c:3200
 #, c-format
 msgid "%s: character `%s' in charmap not representable with one byte"
 msgstr "%s: 字集對照表中的字元 `%s' 無法表示為單一位元組"
 
-#: locale/programs/ld-ctype.c:3431 locale/programs/ld-ctype.c:3456
+#: locale/programs/ld-ctype.c:3242 locale/programs/ld-ctype.c:3265
 #, c-format
 msgid "%s: character `%s' needed as default value not representable with one byte"
 msgstr "%s: 做為預設值所需的字元 `%s' 無法表示為單一位元組"
 
-#: locale/programs/ld-ctype.c:3512
-#, c-format
+#: locale/programs/ld-ctype.c:3321
 msgid "no output digits defined and none of the standard names in the charmap"
 msgstr "沒有定義輸出數字，在字集對照檔中也找不到相符的標準名稱"
 
-#: locale/programs/ld-ctype.c:3803
+#: locale/programs/ld-ctype.c:3570
 #, c-format
 msgid "%s: transliteration data from locale `%s' not available"
 msgstr "%s: 語區資料`%s' 的音譯資料不存在"
 
-#: locale/programs/ld-ctype.c:3904
-#, c-format
-msgid "%s: table for class \"%s\": %lu bytes\n"
+#: locale/programs/ld-ctype.c:3669
+#, fuzzy, c-format
+#| msgid "%s: table for class \"%s\": %lu bytes\n"
+msgid "%s: table for class \"%s\": %lu bytes"
 msgstr "%s: 類別 \"%s\" 表格: %lu 位元組\n"
 
-#: locale/programs/ld-ctype.c:3973
-#, c-format
-msgid "%s: table for map \"%s\": %lu bytes\n"
+#: locale/programs/ld-ctype.c:3733
+#, fuzzy, c-format
+#| msgid "%s: table for map \"%s\": %lu bytes\n"
+msgid "%s: table for map \"%s\": %lu bytes"
 msgstr "%s: 對映表 \"%s\" 表格: %lu 位元組\n"
 
-#: locale/programs/ld-ctype.c:4106
-#, c-format
-msgid "%s: table for width: %lu bytes\n"
+#: locale/programs/ld-ctype.c:3857
+#, fuzzy, c-format
+#| msgid "%s: table for width: %lu bytes\n"
+msgid "%s: table for width: %lu bytes"
 msgstr "%s: 寬度表格: %lu 位元組\n"
 
-#: locale/programs/ld-identification.c:170
+#: locale/programs/ld-identification.c:173
 #, c-format
 msgid "%s: no identification for category `%s'"
 msgstr "%s: 類別 `%s' 沒有認證"
 
-#: locale/programs/ld-identification.c:435
+#: locale/programs/ld-identification.c:197
+#, fuzzy, c-format
+#| msgid "%s: no identification for category `%s'"
+msgid "%s: unknown standard `%s' for category `%s'"
+msgstr "%s: 類別 `%s' 沒有認證"
+
+#: locale/programs/ld-identification.c:380
 #, c-format
 msgid "%s: duplicate category version definition"
 msgstr "%s: 重複的類別版本定義"
 
-#: locale/programs/ld-measurement.c:113
+#: locale/programs/ld-measurement.c:111
 #, c-format
 msgid "%s: invalid value for field `%s'"
 msgstr "%s: 在欄位 `%s' 中的值不適用"
 
-#: locale/programs/ld-messages.c:114 locale/programs/ld-messages.c:148
+#: locale/programs/ld-messages.c:113 locale/programs/ld-messages.c:146
 #, c-format
 msgid "%s: field `%s' undefined"
 msgstr "%s: 欄位 `%s' 沒有定義"
 
-#: locale/programs/ld-messages.c:121 locale/programs/ld-messages.c:155
-#: locale/programs/ld-monetary.c:255 locale/programs/ld-numeric.c:118
+#: locale/programs/ld-messages.c:119 locale/programs/ld-messages.c:152
+#: locale/programs/ld-monetary.c:264 locale/programs/ld-numeric.c:117
 #, c-format
 msgid "%s: value for field `%s' must not be an empty string"
 msgstr "%s: 欄位 `%s' 值不可以是空字串"
 
-#: locale/programs/ld-messages.c:137 locale/programs/ld-messages.c:171
+#: locale/programs/ld-messages.c:135 locale/programs/ld-messages.c:168
 #, c-format
 msgid "%s: no correct regular expression for field `%s': %s"
 msgstr "%s: 沒有給欄位 `%s' 正確的常規表示式： %s"
 
-#: locale/programs/ld-monetary.c:223
+#: locale/programs/ld-monetary.c:228
 #, c-format
 msgid "%s: value of field `int_curr_symbol' has wrong length"
 msgstr "%s: 欄位 `int_curr_symbol' 值的長度錯誤"
 
-#: locale/programs/ld-monetary.c:236
-#, c-format
-msgid "%s: value of field `int_curr_symbol' does not correspond to a valid name in ISO 4217"
+#: locale/programs/ld-monetary.c:245
+#, fuzzy, c-format
+#| msgid "%s: value of field `int_curr_symbol' does not correspond to a valid name in ISO 4217"
+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 中合法的名稱"
 
-#: locale/programs/ld-monetary.c:284 locale/programs/ld-monetary.c:314
+#: locale/programs/ld-monetary.c:293 locale/programs/ld-monetary.c:322
 #, c-format
 msgid "%s: value for field `%s' must be in range %d...%d"
 msgstr "%s: 欄位 `%s' 的值必須在範圍 %d…%d"
 
-#: locale/programs/ld-monetary.c:746 locale/programs/ld-numeric.c:274
+#: locale/programs/ld-monetary.c:549 locale/programs/ld-numeric.c:228
 #, c-format
 msgid "%s: value for field `%s' must be a single character"
 msgstr "%s: 欄位 `%s' 的值必須是個單一字元"
 
-#: locale/programs/ld-monetary.c:843 locale/programs/ld-numeric.c:318
+#: locale/programs/ld-monetary.c:646 locale/programs/ld-numeric.c:272
 #, c-format
 msgid "%s: `-1' must be last entry in `%s' field"
 msgstr "%s: `-1' 在 `%s' 欄位中必須是最後一個項目"
 
-#: locale/programs/ld-monetary.c:865 locale/programs/ld-numeric.c:335
+#: locale/programs/ld-monetary.c:668 locale/programs/ld-numeric.c:289
 #, c-format
 msgid "%s: values for field `%s' must be smaller than 127"
 msgstr "%s: 欄位 `%s' 的值必須小於 127"
 
-#: locale/programs/ld-monetary.c:908
+#: locale/programs/ld-monetary.c:714
 msgid "conversion rate value cannot be zero"
 msgstr "轉換率的值不可以是零"
 
-#: locale/programs/ld-name.c:129 locale/programs/ld-telephone.c:126
-#: locale/programs/ld-telephone.c:149
+#: locale/programs/ld-name.c:128 locale/programs/ld-telephone.c:124
+#: locale/programs/ld-telephone.c:147
 #, c-format
 msgid "%s: invalid escape sequence in field `%s'"
 msgstr "%s: 在欄位 `%s' 中的跳脫序列不適用"
 
-#: locale/programs/ld-time.c:247
+#: locale/programs/ld-time.c:251
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not '+' nor '-'"
 msgstr "%s: 在 `era' 欄位的字串 %Zd 中，方向旗標既不是 '+' 也不是 '-'"
 
-#: locale/programs/ld-time.c:258
+#: locale/programs/ld-time.c:261
 #, c-format
 msgid "%s: direction flag in string %Zd in `era' field is not a single character"
 msgstr "%s: 在 `era' 欄位的字串 %Zd 中，方向旗標不是一個單一字元"
 
-#: locale/programs/ld-time.c:271
+#: locale/programs/ld-time.c:273
 #, c-format
 msgid "%s: invalid number for offset in string %Zd in `era' field"
 msgstr "%s: 在 `era' 欄位、字串 %Zd 中的位移數字不適用"
 
-#: locale/programs/ld-time.c:279
+#: locale/programs/ld-time.c:280
 #, c-format
 msgid "%s: garbage at end of offset value in string %Zd in `era' field"
 msgstr "%s: 無用的資料，在 `era' 欄位、字串 %Zd 中末尾的位移值"
@@ -2486,57 +2488,57 @@ msgstr "%s: 無用的資料，在 `era' 欄位、字串 %Zd 中末尾的位移�
 msgid "%s: invalid starting date in string %Zd in `era' field"
 msgstr "%s: 在 `era' 欄位、字串 %Zd 中的起始日期不適用"
 
-#: locale/programs/ld-time.c:339
+#: locale/programs/ld-time.c:338
 #, c-format
 msgid "%s: garbage at end of starting date in string %Zd in `era' field "
 msgstr "%s: 無用的資料，在 `era' 欄位、字串 %Zd 中末尾的起始日期"
 
-#: locale/programs/ld-time.c:358
+#: locale/programs/ld-time.c:356
 #, c-format
 msgid "%s: starting date is invalid in string %Zd in `era' field"
 msgstr "%s: 在 `era' 區域的字串 %Zd 中的啟始日期是不適用的"
 
-#: locale/programs/ld-time.c:407 locale/programs/ld-time.c:435
+#: locale/programs/ld-time.c:404 locale/programs/ld-time.c:430
 #, c-format
 msgid "%s: invalid stopping date in string %Zd in `era' field"
 msgstr "%s: 在 `era' 欄位、字串 %Zd 中的結束日期不適用"
 
-#: locale/programs/ld-time.c:416
+#: locale/programs/ld-time.c:412
 #, c-format
 msgid "%s: garbage at end of stopping date in string %Zd in `era' field"
 msgstr "%s: 無用的資料，在 `era' 區域、字串 %Zd 中末尾的結束日期"
 
-#: locale/programs/ld-time.c:444
+#: locale/programs/ld-time.c:438
 #, c-format
 msgid "%s: missing era name in string %Zd in `era' field"
 msgstr "%s: 缺少 era 名稱，在 `era' 欄位、字串 %Zd 中"
 
-#: locale/programs/ld-time.c:456
+#: locale/programs/ld-time.c:449
 #, c-format
 msgid "%s: missing era format in string %Zd in `era' field"
 msgstr "%s: 缺少 era 格式，在 `era' 欄位、字串 %Zd 中"
 
-#: locale/programs/ld-time.c:497
+#: locale/programs/ld-time.c:494
 #, c-format
 msgid "%s: third operand for value of field `%s' must not be larger than %d"
 msgstr "%s: 欄位 `%s' 值的第三個運算元不可以比 %d 大"
 
-#: locale/programs/ld-time.c:505 locale/programs/ld-time.c:513
-#: locale/programs/ld-time.c:521
+#: locale/programs/ld-time.c:502 locale/programs/ld-time.c:510
+#: locale/programs/ld-time.c:518
 #, c-format
 msgid "%s: values for field `%s' must not be larger than %d"
 msgstr "%s: 欄位 `%s' 的值不可以大於 %d"
 
-#: locale/programs/ld-time.c:1004
+#: locale/programs/ld-time.c:740
 #, c-format
 msgid "%s: too few values for field `%s'"
 msgstr "%s: 欄位 `%s' 中的值太少"
 
-#: locale/programs/ld-time.c:1049
+#: locale/programs/ld-time.c:785
 msgid "extra trailing semicolon"
 msgstr "多出的尾端分號"
 
-#: locale/programs/ld-time.c:1052
+#: locale/programs/ld-time.c:788
 #, c-format
 msgid "%s: too many values for field `%s'"
 msgstr "%s: 欄位 `%s' 中的值太多"
@@ -2561,20 +2563,16 @@ msgstr "沒有結尾的符號名稱"
 msgid "illegal escape sequence at end of string"
 msgstr "字串結尾有不合法的跳脫序列"
 
-#: locale/programs/linereader.c:627 locale/programs/linereader.c:855
+#: locale/programs/linereader.c:627 locale/programs/linereader.c:847
 msgid "unterminated string"
 msgstr "沒有結尾的字串"
 
-#: locale/programs/linereader.c:669
-msgid "non-symbolic character value should not be used"
-msgstr "非符號性的字元值不應該被使用才對"
-
-#: locale/programs/linereader.c:816
+#: locale/programs/linereader.c:808
 #, c-format
 msgid "symbol `%.*s' not in charmap"
 msgstr "符號 `%.*s' 並不在字集對照表中"
 
-#: locale/programs/linereader.c:837
+#: locale/programs/linereader.c:829
 #, c-format
 msgid "symbol `%.*s' not in repertoire map"
 msgstr "符號 `%.*s' 並不在編碼對映檔中"
@@ -2584,39 +2582,39 @@ msgstr "符號 `%.*s' 並不在編碼對映檔中"
 msgid "unknown name \"%s\""
 msgstr "不明名稱「%s」"
 
-#: locale/programs/locale.c:72
+#: locale/programs/locale.c:70
 msgid "System information:"
 msgstr "系統相關資訊:"
 
-#: locale/programs/locale.c:74
+#: locale/programs/locale.c:72
 msgid "Write names of available locales"
 msgstr "寫出存在的語區資料名稱"
 
-#: locale/programs/locale.c:76
+#: locale/programs/locale.c:74
 msgid "Write names of available charmaps"
 msgstr "寫出存在的字集對照表名稱"
 
-#: locale/programs/locale.c:77
+#: locale/programs/locale.c:75
 msgid "Modify output format:"
 msgstr "修改輸出格式:"
 
-#: locale/programs/locale.c:78
+#: locale/programs/locale.c:76
 msgid "Write names of selected categories"
 msgstr "寫出選取的類別名稱"
 
-#: locale/programs/locale.c:79
+#: locale/programs/locale.c:77
 msgid "Write names of selected keywords"
 msgstr "寫出選取的關鍵字名稱"
 
-#: locale/programs/locale.c:80
+#: locale/programs/locale.c:78
 msgid "Print more information"
 msgstr "印出更多的資訊"
 
-#: locale/programs/locale.c:85
+#: locale/programs/locale.c:83
 msgid "Get locale-specific information."
 msgstr "取得語區資料特定的資訊"
 
-#: locale/programs/locale.c:88
+#: locale/programs/locale.c:86
 msgid ""
 "NAME\n"
 "[-a|-m]"
@@ -2624,104 +2622,122 @@ msgstr ""
 "名稱\n"
 "[-a|-m]"
 
-#: locale/programs/locale.c:192
+#: locale/programs/locale.c:190
 #, c-format
 msgid "Cannot set LC_CTYPE to default locale"
 msgstr "無法將 LC_CTYPE 設置為預設的語區"
 
-#: locale/programs/locale.c:194
+#: locale/programs/locale.c:192
 #, c-format
 msgid "Cannot set LC_MESSAGES to default locale"
 msgstr "無法將 LC_MESSAGES 設置為預設的語區"
 
-#: locale/programs/locale.c:207
+#: locale/programs/locale.c:205
 #, c-format
 msgid "Cannot set LC_COLLATE to default locale"
 msgstr "無法將 LC_COLLATE 設置為預設的語區"
 
-#: locale/programs/locale.c:223
+#: locale/programs/locale.c:221
 #, c-format
 msgid "Cannot set LC_ALL to default locale"
 msgstr "無法將 LC_ALL 設置為預設的語區"
 
-#: locale/programs/locale.c:519
+#: locale/programs/locale.c:521
 #, c-format
 msgid "while preparing output"
 msgstr "在準備輸出時"
 
-#: locale/programs/localedef.c:119
+#: locale/programs/localedef.c:112
 msgid "Input Files:"
 msgstr "輸入檔:"
 
-#: locale/programs/localedef.c:121
+#: locale/programs/localedef.c:114
 msgid "Symbolic character names defined in FILE"
 msgstr "符號字元的名稱定義在檔案 FILE 中"
 
-#: locale/programs/localedef.c:123
+#: locale/programs/localedef.c:116
 msgid "Source definitions are found in FILE"
 msgstr "原始資料定義在檔案 FILE 中"
 
-#: locale/programs/localedef.c:125
+#: locale/programs/localedef.c:118
 msgid "FILE contains mapping from symbolic names to UCS4 values"
 msgstr "檔案 FILE 內含符號名與 UCS4 編碼之間的對映"
 
-#: locale/programs/localedef.c:129
+#: locale/programs/localedef.c:122
 msgid "Create output even if warning messages were issued"
 msgstr "產生輸出即使是有警告訊息"
 
-#: locale/programs/localedef.c:130
-msgid "Create old-style tables"
-msgstr "產生舊格式的表格"
-
-#: locale/programs/localedef.c:131
+#: locale/programs/localedef.c:123
 msgid "Optional output file prefix"
 msgstr "可有可無的輸出檔路徑"
 
-#: locale/programs/localedef.c:132
+#: locale/programs/localedef.c:124
 msgid "Strictly conform to POSIX"
 msgstr "嚴格遵從 POSIX"
 
-#: locale/programs/localedef.c:134
+#: locale/programs/localedef.c:126
 msgid "Suppress warnings and information messages"
 msgstr "忽略警告與提示訊息"
 
-#: locale/programs/localedef.c:135
+#: locale/programs/localedef.c:127
 msgid "Print more messages"
 msgstr "印出更多的訊息"
 
-#: locale/programs/localedef.c:136
+#: locale/programs/localedef.c:128 locale/programs/localedef.c:131
+#, fuzzy
+#| msgid "warning: "
+msgid "<warnings>"
+msgstr "警告: "
+
+#: locale/programs/localedef.c:129
+msgid "Comma-separated list of warnings to disable; supported warnings are: ascii, intcurrsym"
+msgstr ""
+
+#: locale/programs/localedef.c:132
+msgid "Comma-separated list of warnings to enable; supported warnings are: ascii, intcurrsym"
+msgstr ""
+
+#: locale/programs/localedef.c:135
 msgid "Archive control:"
 msgstr "保存檔控制:"
 
-#: locale/programs/localedef.c:138
+#: locale/programs/localedef.c:137
 msgid "Don't add new data to archive"
 msgstr "不要加入新資料到保存檔"
 
-#: locale/programs/localedef.c:140
+#: locale/programs/localedef.c:139
 msgid "Add locales named by parameters to archive"
 msgstr "藉由參數加入語區名稱到保存檔"
 
-#: locale/programs/localedef.c:141
+#: locale/programs/localedef.c:140
 msgid "Replace existing archive content"
 msgstr "替換已有的保存檔內容"
 
-#: locale/programs/localedef.c:143
+#: locale/programs/localedef.c:142
 msgid "Remove locales named by parameters from archive"
 msgstr "藉由參數從保存檔中刪除語區名稱"
 
-#: locale/programs/localedef.c:144
+#: locale/programs/localedef.c:143
 msgid "List content of archive"
 msgstr "列出保存檔的內容"
 
-#: locale/programs/localedef.c:146
+#: locale/programs/localedef.c:145
 msgid "locale.alias file to consult when making archive"
 msgstr "製作保存檔時查閱 locale.alias 檔案"
 
-#: locale/programs/localedef.c:151
+#: locale/programs/localedef.c:147
+msgid "Generate little-endian output"
+msgstr ""
+
+#: locale/programs/localedef.c:149
+msgid "Generate big-endian output"
+msgstr ""
+
+#: locale/programs/localedef.c:154
 msgid "Compile locale specification"
 msgstr "編譯語區資料規格"
 
-#: locale/programs/localedef.c:154
+#: locale/programs/localedef.c:157
 msgid ""
 "NAME\n"
 "[--add-to-archive|--delete-from-archive] FILE...\n"
@@ -2731,28 +2747,33 @@ msgstr ""
 "[--add-to-archive|--delete-from-archive] 檔案...\n"
 "--list-archive [檔案]"
 
-#: locale/programs/localedef.c:229
+#: locale/programs/localedef.c:232
 #, c-format
 msgid "cannot create directory for output files"
 msgstr "無法為輸出檔建立目錄"
 
-#: locale/programs/localedef.c:240
-#, c-format
+#: locale/programs/localedef.c:243
 msgid "FATAL: system does not define `_POSIX2_LOCALEDEF'"
 msgstr "嚴重錯誤: 系統沒有定義 `_POSIX2_LOCALEDEF'"
 
-#: locale/programs/localedef.c:254 locale/programs/localedef.c:270
-#: locale/programs/localedef.c:602 locale/programs/localedef.c:622
+#: locale/programs/localedef.c:257 locale/programs/localedef.c:273
+#: locale/programs/localedef.c:663 locale/programs/localedef.c:683
 #, c-format
 msgid "cannot open locale definition file `%s'"
 msgstr "無法開啟語區資料定義檔 `%s'"
 
-#: locale/programs/localedef.c:282
+#: locale/programs/localedef.c:297
 #, c-format
 msgid "cannot write output files to `%s'"
 msgstr "無法將輸出檔案寫入 `%s'"
 
-#: locale/programs/localedef.c:368
+#: locale/programs/localedef.c:303
+#, fuzzy
+#| msgid "no output file produced because warnings were issued"
+msgid "no output file produced because errors were issued"
+msgstr "因為發出過警告訊息，所以沒有製造任何輸出檔"
+
+#: locale/programs/localedef.c:431
 #, c-format
 msgid ""
 "System's directory for character maps : %s\n"
@@ -2765,216 +2786,213 @@ msgstr ""
 "\t\t      語區路徑   ：%s\n"
 "%s"
 
-#: locale/programs/localedef.c:570
-#, c-format
+#: locale/programs/localedef.c:631
 msgid "circular dependencies between locale definitions"
 msgstr "有語區資料在定義時發生循環相關的情況"
 
-#: locale/programs/localedef.c:576
+#: locale/programs/localedef.c:637
 #, c-format
 msgid "cannot add already read locale `%s' a second time"
 msgstr " `%s' 語區資料已經用過，不能重複加入"
 
-#: locale/programs/locarchive.c:125 locale/programs/locarchive.c:367
+#: locale/programs/locarchive.c:133 locale/programs/locarchive.c:380
 #, c-format
 msgid "cannot create temporary file: %s"
 msgstr "無法產生暫時檔：%s"
 
-#: locale/programs/locarchive.c:155 locale/programs/locarchive.c:413
+#: locale/programs/locarchive.c:167 locale/programs/locarchive.c:430
 #, c-format
 msgid "cannot initialize archive file"
 msgstr "無法起始保存檔"
 
-#: locale/programs/locarchive.c:162 locale/programs/locarchive.c:420
+#: locale/programs/locarchive.c:174 locale/programs/locarchive.c:437
 #, c-format
 msgid "cannot resize archive file"
 msgstr "無法改變保存檔大小"
 
-#: locale/programs/locarchive.c:177 locale/programs/locarchive.c:435
-#: locale/programs/locarchive.c:645
+#: locale/programs/locarchive.c:189 locale/programs/locarchive.c:452
+#: locale/programs/locarchive.c:674
 #, c-format
 msgid "cannot map archive header"
 msgstr "無法註記保存檔表頭"
 
-#: locale/programs/locarchive.c:199
+#: locale/programs/locarchive.c:211
 #, c-format
 msgid "failed to create new locale archive"
 msgstr "無法建立新的語區保存檔"
 
-#: locale/programs/locarchive.c:211
+#: locale/programs/locarchive.c:223
 #, c-format
 msgid "cannot change mode of new locale archive"
 msgstr "無法改變新的語區資料保存檔狀態"
 
-#: locale/programs/locarchive.c:311
-#, c-format
+#: locale/programs/locarchive.c:324
 msgid "cannot read data from locale archive"
 msgstr "無法從語區歸檔讀取資料"
 
-#: locale/programs/locarchive.c:342
+#: locale/programs/locarchive.c:355
 #, c-format
 msgid "cannot map locale archive file"
 msgstr "無法映射語區資料保存檔"
 
-#: locale/programs/locarchive.c:443
+#: locale/programs/locarchive.c:460
 #, c-format
 msgid "cannot lock new archive"
 msgstr "無法鎖定新的保存檔"
 
-#: locale/programs/locarchive.c:509
+#: locale/programs/locarchive.c:529
 #, c-format
 msgid "cannot extend locale archive file"
 msgstr "無法延展語區資料保存檔"
 
-#: locale/programs/locarchive.c:518
+#: locale/programs/locarchive.c:538
 #, c-format
 msgid "cannot change mode of resized locale archive"
 msgstr "無法改變已變更大小的語區資料保存檔狀態"
 
-#: locale/programs/locarchive.c:526
+#: locale/programs/locarchive.c:546
 #, c-format
 msgid "cannot rename new archive"
 msgstr "無法更改新保存檔名稱"
 
-#: locale/programs/locarchive.c:579
+#: locale/programs/locarchive.c:608
 #, c-format
 msgid "cannot open locale archive \"%s\""
 msgstr "無法開啟語區資料保存檔 \"%s\""
 
-#: locale/programs/locarchive.c:584
+#: locale/programs/locarchive.c:613
 #, c-format
 msgid "cannot stat locale archive \"%s\""
 msgstr "無法統計語區資料保存檔 \"%s\""
 
-#: locale/programs/locarchive.c:603
+#: locale/programs/locarchive.c:632
 #, c-format
 msgid "cannot lock locale archive \"%s\""
 msgstr "無法鎖定語區資料保存檔 \"%s\""
 
-#: locale/programs/locarchive.c:626
+#: locale/programs/locarchive.c:655
 #, c-format
 msgid "cannot read archive header"
 msgstr "無法讀取保存檔表頭資料"
 
-#: locale/programs/locarchive.c:697
+#: locale/programs/locarchive.c:728
 #, c-format
 msgid "locale '%s' already exists"
 msgstr "語區資料 `%s' 已經存在"
 
-#: locale/programs/locarchive.c:959 locale/programs/locarchive.c:974
-#: locale/programs/locarchive.c:986 locale/programs/locarchive.c:998
-#: locale/programs/locfile.c:343
+#: 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
 #, c-format
 msgid "cannot add to locale archive"
 msgstr "無法加入語區資料保存檔"
 
-#: locale/programs/locarchive.c:1156
+#: locale/programs/locarchive.c:1203
 #, c-format
 msgid "locale alias file `%s' not found"
 msgstr "找不到語區資料別名檔 `%s'"
 
-#: locale/programs/locarchive.c:1306
+#: locale/programs/locarchive.c:1351
 #, c-format
 msgid "Adding %s\n"
 msgstr "加入 %s 中\n"
 
-#: locale/programs/locarchive.c:1312
+#: locale/programs/locarchive.c:1357
 #, c-format
 msgid "stat of \"%s\" failed: %s: ignored"
 msgstr "取得 \"%s\" 的資訊時失敗: %s: 已忽略"
 
-#: locale/programs/locarchive.c:1318
+#: locale/programs/locarchive.c:1363
 #, c-format
 msgid "\"%s\" is no directory; ignored"
 msgstr "\"%s\" 並非目錄; 已忽略"
 
-#: locale/programs/locarchive.c:1325
+#: locale/programs/locarchive.c:1370
 #, c-format
 msgid "cannot open directory \"%s\": %s: ignored"
 msgstr "無法開啟目錄 \"%s\": %s: 已忽略"
 
-#: locale/programs/locarchive.c:1397
+#: locale/programs/locarchive.c:1438
 #, c-format
 msgid "incomplete set of locale files in \"%s\""
 msgstr "不完整的一組語區資料檔案存在於 \"%s\" 之中"
 
-#: locale/programs/locarchive.c:1461
+#: locale/programs/locarchive.c:1502
 #, c-format
 msgid "cannot read all files in \"%s\": ignored"
 msgstr "無法讀取 \"%s\" 中的所有檔案: 已忽略"
 
-#: locale/programs/locarchive.c:1531
+#: locale/programs/locarchive.c:1572
 #, c-format
 msgid "locale \"%s\" not in archive"
 msgstr "語區資料 \"%s\" 不在保存檔中"
 
-#: locale/programs/locfile.c:131
+#: locale/programs/locfile.c:137
 #, c-format
 msgid "argument to `%s' must be a single character"
 msgstr "給 `%s' 的引數必須是一個單字元"
 
-#: locale/programs/locfile.c:251
+#: locale/programs/locfile.c:257
 msgid "syntax error: not inside a locale definition section"
 msgstr "語法錯誤: 不能在語區資料定義區塊裡面使用"
 
-#: locale/programs/locfile.c:625
+#: locale/programs/locfile.c:799
 #, c-format
 msgid "cannot open output file `%s' for category `%s'"
 msgstr "無法開啟輸出檔 `%s' 供類別 `%s' 使用"
 
-#: locale/programs/locfile.c:649
+#: locale/programs/locfile.c:822
 #, c-format
 msgid "failure while writing data for category `%s'"
 msgstr "正在為類別 `%s' 寫入資料時發生錯誤"
 
-#: locale/programs/locfile.c:745
+#: locale/programs/locfile.c:917
 #, c-format
 msgid "cannot create output file `%s' for category `%s'"
 msgstr "無法建立輸出檔 `%s' 供類別 `%s' 使用"
 
-#: locale/programs/locfile.c:781
+#: locale/programs/locfile.c:953
 msgid "expecting string argument for `copy'"
 msgstr "`copy' 的引數應該是字串才對"
 
-#: locale/programs/locfile.c:785
+#: locale/programs/locfile.c:957
 msgid "locale name should consist only of portable characters"
 msgstr "語區資料的名稱應該以常用字元組成"
 
-#: locale/programs/locfile.c:804
+#: locale/programs/locfile.c:976
 msgid "no other keyword shall be specified when `copy' is used"
 msgstr "使用 `copy' 的時候不應該再用到任何其他的關鍵字了"
 
-#: locale/programs/locfile.c:818
+#: locale/programs/locfile.c:990
 #, c-format
 msgid "`%1$s' definition does not end with `END %1$s'"
 msgstr "`%1$s' 定義沒有以 `END %1$s' 結束"
 
-#: locale/programs/repertoire.c:229 locale/programs/repertoire.c:270
-#: locale/programs/repertoire.c:295
+#: locale/programs/repertoire.c:228 locale/programs/repertoire.c:269
+#: locale/programs/repertoire.c:294
 #, c-format
 msgid "syntax error in repertoire map definition: %s"
 msgstr "編碼對映檔中的定義有語法錯誤: %s"
 
-#: locale/programs/repertoire.c:271
+#: locale/programs/repertoire.c:270
 msgid "no <Uxxxx> or <Uxxxxxxxx> value given"
 msgstr "沒有給定 <Uxxxx> 或 <Uxxxxxxxx> 的值"
 
-#: locale/programs/repertoire.c:331
-#, c-format
+#: locale/programs/repertoire.c:330
 msgid "cannot save new repertoire map"
 msgstr "無法儲存新的編碼對映檔"
 
-#: locale/programs/repertoire.c:342
+#: locale/programs/repertoire.c:341
 #, c-format
 msgid "repertoire map file `%s' not found"
 msgstr "找不到編碼對映檔 `%s'"
 
-#: login/programs/pt_chown.c:78
+#: login/programs/pt_chown.c:79
 #, 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:92
+#: login/programs/pt_chown.c:93
 #, 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"
@@ -2985,33 +3003,33 @@ msgstr ""
 "\n"
 "%s"
 
-#: login/programs/pt_chown.c:198
+#: login/programs/pt_chown.c:204
 #, c-format
 msgid "too many arguments"
 msgstr "太多引數"
 
-#: login/programs/pt_chown.c:206
+#: login/programs/pt_chown.c:212
 #, c-format
 msgid "needs to be installed setuid `root'"
 msgstr "需要是已安裝的 setuid「根」"
 
-#: malloc/mcheck.c:347
+#: malloc/mcheck.c:344
 msgid "memory is consistent, library is buggy\n"
 msgstr "記憶體內容一致，函式庫有問題\n"
 
-#: malloc/mcheck.c:350
+#: malloc/mcheck.c:347
 msgid "memory clobbered before allocated block\n"
 msgstr "記憶體在配置區塊之前就 clobbered 了\n"
 
-#: malloc/mcheck.c:353
+#: malloc/mcheck.c:350
 msgid "memory clobbered past end of allocated block\n"
 msgstr "記憶體在經過配置的區塊尾部時 clobbered 了\n"
 
-#: malloc/mcheck.c:356
+#: malloc/mcheck.c:353
 msgid "block freed twice\n"
 msgstr "此區塊被用 free 指令釋放了兩次\n"
 
-#: malloc/mcheck.c:359
+#: malloc/mcheck.c:356
 msgid "bogus mcheck_status, library is buggy\n"
 msgstr "記憶體檢查狀態 (mcheck_ststus) 有誤，您所用的函式庫有問題\n"
 
@@ -3136,7 +3154,7 @@ msgstr "從記憶體性能測試資料產生圖像"
 msgid "DATAFILE [OUTFILE]"
 msgstr "資料檔 [輸出檔]"
 
-#: misc/error.c:117
+#: misc/error.c:192
 msgid "Unknown system error"
 msgstr "未知的系統錯誤"
 
@@ -3144,8 +3162,8 @@ msgstr "未知的系統錯誤"
 msgid "unable to free arguments"
 msgstr "無法釋放參數"
 
-#: nis/nis_error.h:1 nis/ypclnt.c:831 nis/ypclnt.c:919 posix/regcomp.c:133
-#: sysdeps/gnu/errlist.c:20
+#: nis/nis_error.h:1 nis/ypclnt.c:825 nis/ypclnt.c:914 posix/regcomp.c:135
+#: sysdeps/gnu/errlist.c:21
 msgid "Success"
 msgstr "成功"
 
@@ -3185,8 +3203,8 @@ msgstr "一般系統錯誤"
 msgid "First/next chain broken"
 msgstr "第一個/下一個序列壞掉了"
 
-#. TRANS Permission denied; the file permissions do not allow the attempted operation.
-#: nis/nis_error.h:11 nis/ypclnt.c:876 sysdeps/gnu/errlist.c:157
+#. TRANS The file permissions do not allow the attempted operation.
+#: nis/nis_error.h:11 nis/ypclnt.c:870 sysdeps/gnu/errlist.c:158
 msgid "Permission denied"
 msgstr "拒絕不符權限的操作"
 
@@ -3338,128 +3356,128 @@ msgstr "無法在伺服器上建立執行程序"
 msgid "Master server busy, full dump rescheduled."
 msgstr "主要伺服器忙碌中，重新進行完整資料傾卸排程。"
 
-#: nis/nis_local_names.c:121
+#: 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:51
+#: nis/nis_print.c:52
 msgid "UNKNOWN"
 msgstr "不明"
 
-#: nis/nis_print.c:109
+#: nis/nis_print.c:110
 msgid "BOGUS OBJECT\n"
 msgstr "假的物件\n"
 
-#: nis/nis_print.c:112
+#: nis/nis_print.c:113
 msgid "NO OBJECT\n"
 msgstr "沒有物件\n"
 
-#: nis/nis_print.c:115
+#: nis/nis_print.c:116
 msgid "DIRECTORY\n"
 msgstr "目錄\n"
 
-#: nis/nis_print.c:118
+#: nis/nis_print.c:119
 msgid "GROUP\n"
 msgstr "群組\n"
 
-#: nis/nis_print.c:121
+#: nis/nis_print.c:122
 msgid "TABLE\n"
 msgstr "表格\n"
 
-#: nis/nis_print.c:124
+#: nis/nis_print.c:125
 msgid "ENTRY\n"
 msgstr "項目\n"
 
-#: nis/nis_print.c:127
+#: nis/nis_print.c:128
 msgid "LINK\n"
 msgstr "連結\n"
 
-#: nis/nis_print.c:130
+#: nis/nis_print.c:131
 msgid "PRIVATE\n"
 msgstr "私有的\n"
 
-#: nis/nis_print.c:133
+#: nis/nis_print.c:134
 msgid "(Unknown object)\n"
 msgstr "(未知的物件)\n"
 
-#: nis/nis_print.c:167
+#: nis/nis_print.c:168
 #, c-format
 msgid "Name : `%s'\n"
 msgstr "名稱 : `%s'\n"
 
-#: nis/nis_print.c:168
+#: nis/nis_print.c:169
 #, c-format
 msgid "Type : %s\n"
 msgstr "格式 : %s\n"
 
-#: nis/nis_print.c:173
+#: nis/nis_print.c:174
 msgid "Master Server :\n"
 msgstr "主要伺服器 :\n"
 
-#: nis/nis_print.c:175
+#: nis/nis_print.c:176
 msgid "Replicate :\n"
 msgstr "複製 :\n"
 
-#: nis/nis_print.c:176
+#: nis/nis_print.c:177
 #, c-format
 msgid "\tName       : %s\n"
 msgstr "\t名稱       : %s\n"
 
-#: nis/nis_print.c:177
+#: nis/nis_print.c:178
 msgid "\tPublic Key : "
 msgstr "\t公共鑰匙 : "
 
-#: nis/nis_print.c:181
+#: nis/nis_print.c:182
 msgid "None.\n"
 msgstr "無\n"
 
-#: nis/nis_print.c:184
+#: nis/nis_print.c:185
 #, c-format
 msgid "Diffie-Hellmann (%d bits)\n"
 msgstr "Diffie-Hellmann (%d 位元)\n"
 
-#: nis/nis_print.c:189
+#: nis/nis_print.c:190
 #, c-format
 msgid "RSA (%d bits)\n"
 msgstr "RSA (%d 位元)\n"
 
-#: nis/nis_print.c:192
+#: nis/nis_print.c:193
 msgid "Kerberos.\n"
 msgstr "Kerberos.\n"
 
-#: nis/nis_print.c:195
+#: nis/nis_print.c:196
 #, c-format
 msgid "Unknown (type = %d, bits = %d)\n"
 msgstr "未知的 (型態 = %d，位元 = %d)\n"
 
-#: nis/nis_print.c:206
+#: nis/nis_print.c:207
 #, c-format
 msgid "\tUniversal addresses (%u)\n"
 msgstr "\t絕對位址 (%u)\n"
 
-#: nis/nis_print.c:228
+#: nis/nis_print.c:229
 msgid "Time to live : "
 msgstr "存在時間 : "
 
-#: nis/nis_print.c:230
+#: nis/nis_print.c:231
 msgid "Default Access rights :\n"
 msgstr "預設的存取權限 :\n"
 
-#: nis/nis_print.c:239
+#: nis/nis_print.c:240
 #, c-format
 msgid "\tType         : %s\n"
 msgstr "\t型別         : %s\n"
 
-#: nis/nis_print.c:240
+#: nis/nis_print.c:241
 msgid "\tAccess rights: "
 msgstr "\t存取權限: "
 
-#: nis/nis_print.c:254
+#: nis/nis_print.c:255
 msgid "Group Flags :"
 msgstr "群組旗標 :"
 
-#: nis/nis_print.c:257
+#: nis/nis_print.c:258
 msgid ""
 "\n"
 "Group Members :\n"
@@ -3467,95 +3485,95 @@ msgstr ""
 "\n"
 "群組的成員 :\n"
 
-#: nis/nis_print.c:269
+#: nis/nis_print.c:270
 #, c-format
 msgid "Table Type          : %s\n"
 msgstr "表格形式           : %s\n"
 
-#: nis/nis_print.c:270
+#: nis/nis_print.c:271
 #, c-format
 msgid "Number of Columns   : %d\n"
 msgstr "欄位的數目 : %d\n"
 
-#: nis/nis_print.c:271
+#: nis/nis_print.c:272
 #, c-format
 msgid "Character Separator : %c\n"
 msgstr "字元分隔號 : %c\n"
 
-#: nis/nis_print.c:272
+#: nis/nis_print.c:273
 #, c-format
 msgid "Search Path         : %s\n"
 msgstr "搜尋路徑         : %s\n"
 
-#: nis/nis_print.c:273
+#: nis/nis_print.c:274
 msgid "Columns             :\n"
 msgstr "行             :\n"
 
-#: nis/nis_print.c:276
+#: nis/nis_print.c:277
 #, c-format
 msgid "\t[%d]\tName          : %s\n"
 msgstr "\t[%d]\t名稱          : %s\n"
 
-#: nis/nis_print.c:278
+#: nis/nis_print.c:279
 msgid "\t\tAttributes    : "
 msgstr "\t\t屬性     : "
 
-#: nis/nis_print.c:280
+#: nis/nis_print.c:281
 msgid "\t\tAccess Rights : "
 msgstr "\t\t存取權限 : "
 
-#: nis/nis_print.c:290
+#: nis/nis_print.c:291
 msgid "Linked Object Type : "
 msgstr "連結的物件型態 : "
 
-#: nis/nis_print.c:292
+#: nis/nis_print.c:293
 #, c-format
 msgid "Linked to : %s\n"
 msgstr "連結到 : %s\n"
 
-#: nis/nis_print.c:302
+#: nis/nis_print.c:303
 #, c-format
 msgid "\tEntry data of type %s\n"
 msgstr "\t型別為 %s 的項目資料\n"
 
-#: nis/nis_print.c:305
+#: nis/nis_print.c:306
 #, c-format
 msgid "\t[%u] - [%u bytes] "
 msgstr "\t[%u] - [%u 位元組] "
 
-#: nis/nis_print.c:308
+#: nis/nis_print.c:309
 msgid "Encrypted data\n"
 msgstr "編碼資料\n"
 
-#: nis/nis_print.c:310
+#: nis/nis_print.c:311
 msgid "Binary data\n"
 msgstr "二進位資料\n"
 
-#: nis/nis_print.c:326
+#: nis/nis_print.c:327
 #, c-format
 msgid "Object Name   : %s\n"
 msgstr "物件名稱   : %s\n"
 
-#: nis/nis_print.c:327
+#: nis/nis_print.c:328
 #, c-format
 msgid "Directory     : %s\n"
 msgstr "目錄     : %s\n"
 
-#: nis/nis_print.c:328
+#: nis/nis_print.c:329
 #, c-format
 msgid "Owner         : %s\n"
 msgstr "擁有者       : %s\n"
 
-#: nis/nis_print.c:329
+#: nis/nis_print.c:330
 #, c-format
 msgid "Group         : %s\n"
 msgstr "群組         : %s\n"
 
-#: nis/nis_print.c:330
+#: nis/nis_print.c:331
 msgid "Access Rights : "
 msgstr "存取權限 : "
 
-#: nis/nis_print.c:332
+#: nis/nis_print.c:333
 #, c-format
 msgid ""
 "\n"
@@ -3564,90 +3582,90 @@ msgstr ""
 "\n"
 "存在的時間 : "
 
-#: nis/nis_print.c:335
+#: nis/nis_print.c:336
 #, c-format
 msgid "Creation Time : %s"
 msgstr "產生時間 : %s"
 
-#: nis/nis_print.c:337
+#: nis/nis_print.c:338
 #, c-format
 msgid "Mod. Time     : %s"
 msgstr "修改時間     : %s"
 
-#: nis/nis_print.c:338
+#: nis/nis_print.c:339
 msgid "Object Type   : "
 msgstr "物件型別   : "
 
-#: nis/nis_print.c:358
+#: nis/nis_print.c:359
 #, c-format
 msgid "    Data Length = %u\n"
 msgstr "    資料長度 = %u\n"
 
-#: nis/nis_print.c:372
+#: nis/nis_print.c:373
 #, c-format
 msgid "Status            : %s\n"
 msgstr "狀態              : %s\n"
 
-#: nis/nis_print.c:373
+#: nis/nis_print.c:374
 #, c-format
 msgid "Number of objects : %u\n"
 msgstr "物件的數目 : %u\n"
 
-#: nis/nis_print.c:377
+#: nis/nis_print.c:378
 #, c-format
 msgid "Object #%d:\n"
 msgstr "目的檔 #%d:\n"
 
-#: nis/nis_print_group_entry.c:116
+#: nis/nis_print_group_entry.c:117
 #, c-format
 msgid "Group entry for \"%s.%s\" group:\n"
 msgstr "群組 \"%s.%s\" 群組項目:\n"
 
-#: nis/nis_print_group_entry.c:124
+#: nis/nis_print_group_entry.c:125
 msgid "    Explicit members:\n"
 msgstr "    明確的成員:\n"
 
-#: nis/nis_print_group_entry.c:129
+#: nis/nis_print_group_entry.c:130
 msgid "    No explicit members\n"
 msgstr "    沒有明確的成員\n"
 
-#: nis/nis_print_group_entry.c:132
+#: nis/nis_print_group_entry.c:133
 msgid "    Implicit members:\n"
 msgstr "    不明確的成員:\n"
 
-#: nis/nis_print_group_entry.c:137
+#: nis/nis_print_group_entry.c:138
 msgid "    No implicit members\n"
 msgstr "    沒有不明確的成員\n"
 
-#: nis/nis_print_group_entry.c:140
+#: nis/nis_print_group_entry.c:141
 msgid "    Recursive members:\n"
 msgstr "    遞迴的成員:\n"
 
-#: nis/nis_print_group_entry.c:145
+#: nis/nis_print_group_entry.c:146
 msgid "    No recursive members\n"
 msgstr "    沒有遞迴的成員\n"
 
-#: nis/nis_print_group_entry.c:148
+#: nis/nis_print_group_entry.c:149
 msgid "    Explicit nonmembers:\n"
 msgstr "    明確的非成員:\n"
 
-#: nis/nis_print_group_entry.c:153
+#: nis/nis_print_group_entry.c:154
 msgid "    No explicit nonmembers\n"
 msgstr "    沒有明確的非成員\n"
 
-#: nis/nis_print_group_entry.c:156
+#: nis/nis_print_group_entry.c:157
 msgid "    Implicit nonmembers:\n"
 msgstr "    不明確的非成員:\n"
 
-#: nis/nis_print_group_entry.c:161
+#: nis/nis_print_group_entry.c:162
 msgid "    No implicit nonmembers\n"
 msgstr "    沒有不明確的非成員\n"
 
-#: nis/nis_print_group_entry.c:164
+#: nis/nis_print_group_entry.c:165
 msgid "    Recursive nonmembers:\n"
 msgstr "    遞迴的非成員：\n"
 
-#: nis/nis_print_group_entry.c:169
+#: nis/nis_print_group_entry.c:170
 msgid "    No recursive nonmembers\n"
 msgstr "    沒有遞迴的非成員\n"
 
@@ -3689,100 +3707,100 @@ msgstr "netname2user: %s 的本地端項目在 %s 目錄下並不是唯一的"
 msgid "netname2user: should not have uid 0"
 msgstr "netname2user: 不能有使用者 id 為 0 的情況"
 
-#: nis/ypclnt.c:834
+#: nis/ypclnt.c:828
 msgid "Request arguments bad"
 msgstr "必須引數有錯誤"
 
-#: nis/ypclnt.c:837
+#: nis/ypclnt.c:831
 msgid "RPC failure on NIS operation"
 msgstr "NIS 運作 RPC 失敗"
 
-#: nis/ypclnt.c:840
+#: nis/ypclnt.c:834
 msgid "Can't bind to server which serves this domain"
 msgstr "無法與服務於此網域的伺服器聯繫"
 
-#: nis/ypclnt.c:843
+#: nis/ypclnt.c:837
 msgid "No such map in server's domain"
 msgstr "在伺服器的領域資料中找不到此一對映表"
 
-#: nis/ypclnt.c:846
+#: nis/ypclnt.c:840
 msgid "No such key in map"
 msgstr "在對映表中沒有此一鍵值"
 
-#: nis/ypclnt.c:849
+#: nis/ypclnt.c:843
 msgid "Internal NIS error"
 msgstr "內部 NIS 錯誤"
 
-#: nis/ypclnt.c:852
+#: nis/ypclnt.c:846
 msgid "Local resource allocation failure"
 msgstr "區域資源配置失敗"
 
-#: nis/ypclnt.c:855
+#: nis/ypclnt.c:849
 msgid "No more records in map database"
 msgstr "在對映表資料庫中沒有其他紀錄了"
 
-#: nis/ypclnt.c:858
+#: nis/ypclnt.c:852
 msgid "Can't communicate with portmapper"
 msgstr "無法與 portmapper 通訊"
 
-#: nis/ypclnt.c:861
+#: nis/ypclnt.c:855
 msgid "Can't communicate with ypbind"
 msgstr "無法與 ypbind 通訊"
 
-#: nis/ypclnt.c:864
+#: nis/ypclnt.c:858
 msgid "Can't communicate with ypserv"
 msgstr "無法與 ypserv 通訊"
 
-#: nis/ypclnt.c:867
+#: nis/ypclnt.c:861
 msgid "Local domain name not set"
 msgstr "區域網域名稱沒有設定"
 
-#: nis/ypclnt.c:870
+#: nis/ypclnt.c:864
 msgid "NIS map database is bad"
 msgstr "NIS 對映資料庫是壞的"
 
-#: nis/ypclnt.c:873
+#: nis/ypclnt.c:867
 msgid "NIS client/server version mismatch - can't supply service"
 msgstr "NIS 請求端/伺服端版本不符合 - 無法提供服務"
 
-#: nis/ypclnt.c:879
+#: nis/ypclnt.c:873
 msgid "Database is busy"
 msgstr "資料庫正在忙碌"
 
-#: nis/ypclnt.c:882
+#: nis/ypclnt.c:876
 msgid "Unknown NIS error code"
 msgstr "未知的 NIS 錯誤碼"
 
-#: nis/ypclnt.c:922
+#: nis/ypclnt.c:917
 msgid "Internal ypbind error"
 msgstr "內部 ypbind 錯誤"
 
-#: nis/ypclnt.c:925
+#: nis/ypclnt.c:920
 msgid "Domain not bound"
 msgstr "網域找不到"
 
-#: nis/ypclnt.c:928
+#: nis/ypclnt.c:923
 msgid "System resource allocation failure"
 msgstr "系統資源配置失敗"
 
-#: nis/ypclnt.c:931
+#: nis/ypclnt.c:926
 msgid "Unknown ypbind error"
 msgstr "未知的 ypbind 錯誤"
 
-#: nis/ypclnt.c:972
+#: nis/ypclnt.c:967
 msgid "yp_update: cannot convert host to netname\n"
 msgstr "yp_update: 無法轉換主機的網路名稱\n"
 
-#: nis/ypclnt.c:990
+#: nis/ypclnt.c:985
 msgid "yp_update: cannot get server address\n"
 msgstr "yp_update: 無法取得伺服器位址\n"
 
-#: nscd/aicache.c:82 nscd/hstcache.c:494
+#: nscd/aicache.c:83 nscd/hstcache.c:452
 #, c-format
 msgid "Haven't found \"%s\" in hosts cache!"
 msgstr "尚未在 hosts 快取中找到 \"%s\"!"
 
-#: nscd/aicache.c:84 nscd/hstcache.c:496
+#: nscd/aicache.c:85 nscd/hstcache.c:454
 #, c-format
 msgid "Reloading \"%s\" in hosts cache!"
 msgstr "重新載入「%s」於主機快取！"
@@ -3796,257 +3814,305 @@ msgstr "加入新的項目「%s」的型態 %s 用於 %s 到 cache%s"
 msgid " (first)"
 msgstr " (先)"
 
-#: nscd/cache.c:285 nscd/connections.c:1019
-#, c-format
-msgid "cannot stat() file `%s': %s"
+#: nscd/cache.c:288
+#, fuzzy, c-format
+#| msgid "cannot stat() file `%s': %s"
+msgid "checking for monitored file `%s': %s"
 msgstr "無法 stat() 檔案 `%s': %s"
 
-#: nscd/cache.c:331
+#: nscd/cache.c:298
+#, c-format
+msgid "monitored file `%s` changed (mtime)"
+msgstr ""
+
+#: nscd/cache.c:341
 #, c-format
 msgid "pruning %s cache; time %ld"
 msgstr "pruning %s 快取；時間 %ld"
 
-#: nscd/cache.c:360
+#: nscd/cache.c:370
 #, c-format
 msgid "considering %s entry \"%s\", timeout %<PRIu64>"
 msgstr "認為中 %s 項目「%s」，逾時 %<PRIu64>"
 
-#: nscd/connections.c:571
+#: nscd/connections.c:520
 #, c-format
 msgid "invalid persistent database file \"%s\": %s"
 msgstr "無效的永久性的資料庫檔案「%s」：%s"
 
-#: nscd/connections.c:579
+#: nscd/connections.c:528
 msgid "uninitialized header"
 msgstr "未起始的標頭"
 
-#: nscd/connections.c:584
+#: nscd/connections.c:533
 msgid "header size does not match"
 msgstr "頁首大小不吻合"
 
-#: nscd/connections.c:594
+#: nscd/connections.c:543
 msgid "file size does not match"
 msgstr "檔案大小不吻合"
 
-#: nscd/connections.c:611
+#: nscd/connections.c:560
 msgid "verification failed"
 msgstr "查核失敗"
 
-#: nscd/connections.c:625
+#: nscd/connections.c:574
 #, c-format
 msgid "suggested size of table for database %s larger than the persistent database's table"
 msgstr "用於資料庫 %s 的建議表格大小大於永久性的資料庫表格"
 
-#: nscd/connections.c:636 nscd/connections.c:721
+#: nscd/connections.c:585 nscd/connections.c:669
 #, c-format
 msgid "cannot create read-only descriptor for \"%s\"; no mmap"
 msgstr "無法建立用於「%s」的唯讀描述元；無 mmap"
 
-#: nscd/connections.c:652
+#: nscd/connections.c:601
 #, c-format
 msgid "cannot access '%s'"
 msgstr "無法存取『%s』"
 
-#: nscd/connections.c:700
+#: nscd/connections.c:649
 #, c-format
 msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
 msgstr "資料庫用於 %s 已損壞或同步地使用；移除 %s 手動地如果必要的話和重新啟動"
 
-#: nscd/connections.c:707
+#: nscd/connections.c:655
 #, c-format
 msgid "cannot create %s; no persistent database used"
 msgstr "無法建立 %s; 未使用永久性的資料庫"
 
-#: nscd/connections.c:710
+#: nscd/connections.c:658
 #, c-format
 msgid "cannot create %s; no sharing possible"
 msgstr "無法建立 %s; 不可能共享"
 
-#: nscd/connections.c:781
+#: nscd/connections.c:729
 #, c-format
 msgid "cannot write to database file %s: %s"
 msgstr "無法寫入資料庫檔案 %s: %s"
 
-#: nscd/connections.c:820
-#, c-format
-msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
-msgstr "無法設定通訊端到關閉於 exec：%s; 停用 paranoia 模式"
-
-#: nscd/connections.c:869
+#: nscd/connections.c:785
 #, c-format
 msgid "cannot open socket: %s"
 msgstr "無法開啟 socket: %s"
 
-#: nscd/connections.c:889 nscd/connections.c:953
+#: nscd/connections.c:804
 #, c-format
-msgid "cannot change socket to nonblocking mode: %s"
-msgstr "無法變更通訊端為非區塊模式：%s"
+msgid "cannot enable socket to accept connections: %s"
+msgstr "無法開啟 socket 來接受連線: %s"
 
-#: nscd/connections.c:897 nscd/connections.c:963
+#: nscd/connections.c:861
 #, c-format
-msgid "cannot set socket to close on exec: %s"
-msgstr "無法設定通訊端於 exec：%s 時關閉"
+msgid "disabled inotify-based monitoring for file `%s': %s"
+msgstr ""
 
-#: nscd/connections.c:910
+#: nscd/connections.c:865
 #, c-format
-msgid "cannot enable socket to accept connections: %s"
-msgstr "無法開啟 socket 來接受連線: %s"
+msgid "monitoring file `%s` (%d)"
+msgstr ""
 
-#: nscd/connections.c:1003
+#: nscd/connections.c:878
 #, c-format
-msgid "register trace file %s for database %s"
+msgid "disabled inotify-based monitoring for directory `%s': %s"
+msgstr ""
+
+#: nscd/connections.c:882
+#, fuzzy, c-format
+#| msgid "Can't open directory %s"
+msgid "monitoring directory `%s` (%d)"
+msgstr "無法開啟目錄 %s"
+
+#: nscd/connections.c:910
+#, fuzzy, c-format
+#| msgid "register trace file %s for database %s"
+msgid "monitoring file %s for database %s"
 msgstr "註冊追蹤檔案 %s 用於資料庫 %s"
 
-#: nscd/connections.c:1133
+#: nscd/connections.c:920
+#, c-format
+msgid "stat failed for file `%s'; will try again later: %s"
+msgstr ""
+
+#: nscd/connections.c:1039
 #, c-format
 msgid "provide access to FD %d, for %s"
 msgstr "提供存取到 FD %d, 用於 %s"
 
-#: nscd/connections.c:1145
+#: nscd/connections.c:1051
 #, c-format
 msgid "cannot handle old request version %d; current version is %d"
 msgstr "不能處理舊 %d 版的請求；目前使用的版本是 %d"
 
-#: nscd/connections.c:1167
+#: nscd/connections.c:1074
 #, c-format
 msgid "request from %ld not handled due to missing permission"
 msgstr "由於缺少權限而無法處理來自 %ld 的要求"
 
-#: nscd/connections.c:1172
+#: nscd/connections.c:1079
 #, c-format
 msgid "request from '%s' [%ld] not handled due to missing permission"
 msgstr "由於缺少權限而無法處理來自 '%s' [%ld] 的要求"
 
-#: nscd/connections.c:1177
+#: nscd/connections.c:1084
 msgid "request not handled due to missing permission"
 msgstr "要求無法控柄的由於缺少權限"
 
-#: nscd/connections.c:1215 nscd/connections.c:1268
+#: nscd/connections.c:1122 nscd/connections.c:1148
 #, c-format
 msgid "cannot write result: %s"
 msgstr "無法寫入結果: %s"
 
-#: nscd/connections.c:1359
+#: nscd/connections.c:1239
 #, c-format
 msgid "error getting caller's id: %s"
 msgstr "取得呼叫程式識別碼時發生錯誤: %s"
 
-#: nscd/connections.c:1419
-#, c-format
-msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
+#: nscd/connections.c:1349
+#, fuzzy, c-format
+#| msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
+msgid "cannot open /proc/self/cmdline: %m; disabling paranoia mode"
 msgstr "無法開啟/proc/self/cmdline：%s; 停用 paranoia 模式"
 
-#: nscd/connections.c:1433
-#, c-format
-msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
-msgstr "無法讀取/proc/self/cmdline：%s; 停用 paranoia 模式"
-
-#: nscd/connections.c:1473
+#: nscd/connections.c:1372
 #, c-format
 msgid "cannot change to old UID: %s; disabling paranoia mode"
 msgstr "無法變更為舊的 UID：%s; 停用 paranoia 模式"
 
-#: nscd/connections.c:1483
+#: nscd/connections.c:1383
 #, c-format
 msgid "cannot change to old GID: %s; disabling paranoia mode"
 msgstr "無法變更為舊的 GID：%s; 停用 paranoia 模式"
 
-#: nscd/connections.c:1496
+#: nscd/connections.c:1397
 #, c-format
 msgid "cannot change to old working directory: %s; disabling paranoia mode"
 msgstr "無法變更為舊的工作目錄：%s; 停用 paranoia 模式"
 
-#: nscd/connections.c:1542
+#: nscd/connections.c:1444
 #, c-format
 msgid "re-exec failed: %s; disabling paranoia mode"
 msgstr "re-exec 失敗：%s; 停用 paranoia 模式"
 
-#: nscd/connections.c:1551
+#: nscd/connections.c:1453
 #, c-format
 msgid "cannot change current working directory to \"/\": %s"
 msgstr "無法變更目前的工作目錄到「/」：%s"
 
-#: nscd/connections.c:1744
+#: nscd/connections.c:1637
 #, c-format
 msgid "short read while reading request: %s"
 msgstr "讀取請求時發現輸入值過短: %s"
 
-#: nscd/connections.c:1777
+#: nscd/connections.c:1670
 #, c-format
 msgid "key length in request too long: %d"
 msgstr "在此請求中使用的鍵值太長了: %d"
 
-#: nscd/connections.c:1790
+#: nscd/connections.c:1683
 #, c-format
 msgid "short read while reading request key: %s"
 msgstr "讀取請求的鍵值時發現輸入值過短: %s"
 
-#: nscd/connections.c:1800
+#: nscd/connections.c:1693
 #, c-format
 msgid "handle_request: request received (Version = %d) from PID %ld"
 msgstr "handle_request: 請求已被接受 (版本為 %d) 來自於 PID %ld"
 
-#: nscd/connections.c:1805
+#: nscd/connections.c:1698
 #, c-format
 msgid "handle_request: request received (Version = %d)"
 msgstr "handle_request: 請求已被接受 (版本為 %d)"
 
-#: nscd/connections.c:2069 nscd/connections.c:2271
+#: nscd/connections.c:1838
+#, c-format
+msgid "ignored inotify event for `%s` (file exists)"
+msgstr ""
+
+#: nscd/connections.c:1843
 #, c-format
-msgid "disabled inotify after read error %d"
+msgid "monitored file `%s` was %s, removing watch"
+msgstr ""
+
+#: nscd/connections.c:1851 nscd/connections.c:1893
+#, c-format
+msgid "failed to remove file watch `%s`: %s"
+msgstr ""
+
+#: nscd/connections.c:1866
+#, c-format
+msgid "monitored file `%s` was written to"
+msgstr ""
+
+#: nscd/connections.c:1890
+#, c-format
+msgid "monitored parent directory `%s` was %s, removing watch on `%s`"
+msgstr ""
+
+#: nscd/connections.c:1916
+#, c-format
+msgid "monitored file `%s` was %s, adding watch"
+msgstr ""
+
+#: nscd/connections.c:1928
+#, fuzzy, c-format
+#| msgid "failed to load shared object `%s'"
+msgid "failed to add file watch `%s`: %s"
+msgstr "開啟共用目的檔 `%s' 失敗"
+
+#: nscd/connections.c:2106 nscd/connections.c:2271
+#, fuzzy, c-format
+#| msgid "disabled inotify after read error %d"
+msgid "disabled inotify-based monitoring after read error %d"
 msgstr "讀取 %d 錯誤之後已停用 inotify"
 
-#: nscd/connections.c:2394
+#: nscd/connections.c:2386
 msgid "could not initialize conditional variable"
 msgstr "無法初始化條件變數"
 
-#: nscd/connections.c:2402
+#: nscd/connections.c:2394
 msgid "could not start clean-up thread; terminating"
 msgstr "無法開始清理執行緒；終止中"
 
-#: nscd/connections.c:2416
+#: nscd/connections.c:2408
 msgid "could not start any worker thread; terminating"
 msgstr "無法開始任何背景工作執行緒；終止中"
 
-#: nscd/connections.c:2467 nscd/connections.c:2468 nscd/connections.c:2485
-#: nscd/connections.c:2494 nscd/connections.c:2512 nscd/connections.c:2523
-#: nscd/connections.c:2534
+#: 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
 #, c-format
 msgid "Failed to run nscd as user '%s'"
 msgstr "以使用者 '%s' 的身分執行 nscd 失敗"
 
-#: nscd/connections.c:2486
-#, c-format
+#: nscd/connections.c:2483
 msgid "initial getgrouplist failed"
 msgstr "初始 getgrouplist 失敗"
 
-#: nscd/connections.c:2495
-#, c-format
+#: nscd/connections.c:2492
 msgid "getgrouplist failed"
 msgstr "getgrouplist 失敗"
 
-#: nscd/connections.c:2513
-#, c-format
+#: nscd/connections.c:2510
 msgid "setgroups failed"
 msgstr "setgroups 失敗"
 
-#: nscd/grpcache.c:413 nscd/hstcache.c:441 nscd/initgrcache.c:419
-#: nscd/pwdcache.c:391 nscd/servicescache.c:346
+#: nscd/grpcache.c:385 nscd/hstcache.c:402 nscd/initgrcache.c:385
+#: nscd/pwdcache.c:363 nscd/servicescache.c:310
 #, c-format
 msgid "short write in %s: %s"
 msgstr "寫入 %s 的資料過短: %s"
 
-#: nscd/grpcache.c:458 nscd/initgrcache.c:77
+#: nscd/grpcache.c:430 nscd/initgrcache.c:81
 #, c-format
 msgid "Haven't found \"%s\" in group cache!"
 msgstr "尚未在群組快取中找到 \"%s\"!"
 
-#: nscd/grpcache.c:460 nscd/initgrcache.c:79
+#: nscd/grpcache.c:432 nscd/initgrcache.c:83
 #, c-format
 msgid "Reloading \"%s\" in group cache!"
 msgstr "重新載入「%s」於群組快取！"
 
-#: nscd/grpcache.c:539
+#: nscd/grpcache.c:492
 #, c-format
 msgid "Invalid numeric gid \"%s\"!"
 msgstr "無效的 gid 數值 \"%s\"!"
@@ -4061,202 +4127,241 @@ msgstr "在 %2$s 快取中 %1$zu 位元組可用"
 msgid "no more memory for database '%s'"
 msgstr "無記憶體可用於資料庫「%s」"
 
-#: nscd/netgroupcache.c:77
+#: nscd/netgroupcache.c:121
 #, c-format
 msgid "Haven't found \"%s\" in netgroup cache!"
 msgstr "尚未在網路群組快取中找到「%s」！"
 
-#: nscd/netgroupcache.c:79
+#: nscd/netgroupcache.c:123
 #, c-format
 msgid "Reloading \"%s\" in netgroup cache!"
 msgstr "重新在網路群組快取中載入「%s」！"
 
-#: nscd/netgroupcache.c:475
+#: 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:478
+#: nscd/netgroupcache.c:472
 #, c-format
 msgid "Reloading \"%s (%s,%s,%s)\" in netgroup cache!"
 msgstr "重新在網路群組快取中載入「%s (%s,%s,%s)」！"
 
-#: nscd/nscd.c:116
+#: nscd/nscd.c:106
 msgid "Read configuration data from NAME"
 msgstr "自名稱中讀取設定資料"
 
-#: nscd/nscd.c:118
+#: nscd/nscd.c:108
 msgid "Do not fork and display messages on the current tty"
 msgstr "不在目前的 tty 產生子行程 (fork) 以及顯示訊息"
 
-#: nscd/nscd.c:120
+#: nscd/nscd.c:110
 msgid "Do not fork, but otherwise behave like a daemon"
 msgstr "不衍生，但是否則 behave 如同守護程式"
 
-#: nscd/nscd.c:121
+#: nscd/nscd.c:111
 msgid "NUMBER"
 msgstr "號碼"
 
-#: nscd/nscd.c:121
+#: nscd/nscd.c:111
 msgid "Start NUMBER threads"
 msgstr "啟動執行緒"
 
-#: nscd/nscd.c:122
+#: nscd/nscd.c:112
 msgid "Shut the server down"
 msgstr "將伺服器關閉"
 
-#: nscd/nscd.c:123
+#: nscd/nscd.c:113
 msgid "Print current configuration statistics"
 msgstr "印出目前組態統計"
 
-#: nscd/nscd.c:124
+#: nscd/nscd.c:114
 msgid "TABLE"
 msgstr "表格"
 
-#: nscd/nscd.c:125
+#: nscd/nscd.c:115
 msgid "Invalidate the specified cache"
 msgstr "使選定的快取無效"
 
-#: nscd/nscd.c:126
+#: nscd/nscd.c:116
 msgid "TABLE,yes"
 msgstr "要製作表格"
 
-#: nscd/nscd.c:127
+#: nscd/nscd.c:117
 msgid "Use separate cache for each user"
 msgstr "對不同使用者使用不同的快取檔案"
 
-#: nscd/nscd.c:132
+#: nscd/nscd.c:122
 msgid "Name Service Cache Daemon."
 msgstr "網域名稱快取精靈"
 
-#: nscd/nscd.c:164 nss/getent.c:999 nss/makedb.c:206
+#: nscd/nscd.c:155 nss/getent.c:967 nss/makedb.c:206
 #, c-format
 msgid "wrong number of arguments"
 msgstr "參數數目不對"
 
-#: nscd/nscd.c:174
+#: nscd/nscd.c:165
 #, c-format
 msgid "failure while reading configuration file; this is fatal"
 msgstr "讀取組態檔案時失敗；這是一個嚴重錯誤"
 
-#: nscd/nscd.c:183
+#: nscd/nscd.c:174
 #, c-format
 msgid "already running"
 msgstr "已在執行"
 
-#: nscd/nscd.c:201
+#: nscd/nscd.c:194
+#, fuzzy, c-format
+#| msgid "cannot create directory for output files"
+msgid "cannot create a pipe to talk to the child"
+msgstr "無法為輸出檔建立目錄"
+
+#: nscd/nscd.c:198
 #, c-format
 msgid "cannot fork"
 msgstr "無法衍生"
 
-#: nscd/nscd.c:259
-#, c-format
+#: nscd/nscd.c:268
 msgid "cannot change current working directory to \"/\""
 msgstr "無法變更目前的工作目錄到「/」"
 
-#: nscd/nscd.c:267
+#: nscd/nscd.c:276
 msgid "Could not create log file"
 msgstr "無法建立記錄檔"
 
-#: nscd/nscd.c:339 nscd/nscd.c:364 nscd/nscd_stat.c:173
-#, c-format
-msgid "Only root is allowed to use this option!"
-msgstr "只有 root 才可以使用此一選項!"
-
-#: nscd/nscd.c:379
-#, c-format
-msgid "'%s' is not a known database"
-msgstr "『%s』並非一已知資料庫"
-
-#: nscd/nscd.c:404 nscd/nscd_stat.c:192
+#: nscd/nscd.c:355 nscd/nscd_stat.c:209
 #, c-format
 msgid "write incomplete"
 msgstr "寫入不完全"
 
-#: nscd/nscd.c:415
+#: nscd/nscd.c:366
 #, c-format
 msgid "cannot read invalidate ACK"
 msgstr "無法讀取設為無效的 ACK"
 
-#: nscd/nscd.c:421
+#: nscd/nscd.c:372
 #, c-format
 msgid "invalidation failed"
 msgstr "無效化失敗"
 
-#: nscd/nscd.c:431
+#: nscd/nscd.c:417 nscd/nscd.c:442 nscd/nscd_stat.c:190
+#, c-format
+msgid "Only root is allowed to use this option!"
+msgstr "只有 root 才可以使用此一選項!"
+
+#: nscd/nscd.c:437
+#, c-format
+msgid "'%s' is not a known database"
+msgstr "『%s』並非一已知資料庫"
+
+#: nscd/nscd.c:452
 #, c-format
 msgid "secure services not implemented anymore"
 msgstr "安全服務不再實作"
 
-#: nscd/nscd_conf.c:57
+#: nscd/nscd.c:485
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "For bug reporting instructions, please see:\n"
+#| "%s.\n"
+msgid ""
+"Supported tables:\n"
+"%s\n"
+"\n"
+"For bug reporting instructions, please see:\n"
+"%s.\n"
+msgstr ""
+"\n"
+"要知道錯誤報告指令，請參看：\n"
+"%s。\n"
+
+#: nscd/nscd.c:635
+#, fuzzy, c-format
+#| msgid "lstat failed"
+msgid "'wait' failed\n"
+msgstr "lstat 失敗"
+
+#: nscd/nscd.c:642
+#, c-format
+msgid "child exited with status %d\n"
+msgstr ""
+
+#: nscd/nscd.c:647
+#, fuzzy, c-format
+#| msgid "Interrupted by a signal"
+msgid "child terminated by signal %d\n"
+msgstr "由訊號所中斷"
+
+#: nscd/nscd_conf.c:54
 #, c-format
 msgid "database %s is not supported"
 msgstr "資料庫 %s 並未支援"
 
-#: nscd/nscd_conf.c:108
+#: nscd/nscd_conf.c:105
 #, c-format
 msgid "Parse error: %s"
 msgstr "解析錯誤: %s"
 
-#: nscd/nscd_conf.c:194
+#: nscd/nscd_conf.c:191
 #, c-format
 msgid "Must specify user name for server-user option"
 msgstr "必須為伺服器使用者選項指定使用者名稱"
 
-#: nscd/nscd_conf.c:201
+#: nscd/nscd_conf.c:198
 #, c-format
 msgid "Must specify user name for stat-user option"
 msgstr "必須為 stat 使用者選項指定使用者名稱"
 
-#: nscd/nscd_conf.c:258
+#: nscd/nscd_conf.c:255
 #, c-format
 msgid "Must specify value for restart-interval option"
 msgstr "必須指定用於 restart-interval 選項的值"
 
-#: nscd/nscd_conf.c:272
+#: nscd/nscd_conf.c:269
 #, c-format
 msgid "Unknown option: %s %s %s"
 msgstr "未知的選項: %s %s %s"
 
-#: nscd/nscd_conf.c:285
+#: nscd/nscd_conf.c:282
 #, c-format
 msgid "cannot get current working directory: %s; disabling paranoia mode"
 msgstr "無法取得目前的工作目錄：%s; 停用 paranoia 模式"
 
-#: nscd/nscd_conf.c:305
+#: nscd/nscd_conf.c:302
 #, c-format
 msgid "maximum file size for %s database too small"
 msgstr "最大值檔案大小用於 %s 資料庫太小"
 
-#: nscd/nscd_stat.c:142
+#: nscd/nscd_stat.c:159
 #, c-format
 msgid "cannot write statistics: %s"
 msgstr "無法寫入統計資料: %s"
 
-#: nscd/nscd_stat.c:157
+#: nscd/nscd_stat.c:174
 msgid "yes"
 msgstr "是"
 
-#: nscd/nscd_stat.c:158
+#: nscd/nscd_stat.c:175
 msgid "no"
 msgstr "無"
 
-#: nscd/nscd_stat.c:169
+#: nscd/nscd_stat.c:186
 #, c-format
 msgid "Only root or %s is allowed to use this option!"
 msgstr "只有 root 或 %s 才允許使用此一選項!"
 
-#: nscd/nscd_stat.c:180
+#: nscd/nscd_stat.c:197
 #, c-format
 msgid "nscd not running!\n"
 msgstr "nscd 並沒有在執行!\n"
 
-#: nscd/nscd_stat.c:204
+#: nscd/nscd_stat.c:221
 #, c-format
 msgid "cannot read statistics data"
 msgstr "無法讀取統計資料"
 
-#: nscd/nscd_stat.c:207
+#: nscd/nscd_stat.c:224
 #, c-format
 msgid ""
 "nscd configuration:\n"
@@ -4267,27 +4372,27 @@ msgstr ""
 "\n"
 "%15d  伺服程式錯誤訊息報告等級\n"
 
-#: nscd/nscd_stat.c:231
+#: nscd/nscd_stat.c:248
 #, c-format
 msgid "%3ud %2uh %2um %2lus  server runtime\n"
 msgstr "%3ud %2uh %2um %2lus  伺服器 執行時期\n"
 
-#: nscd/nscd_stat.c:234
+#: nscd/nscd_stat.c:251
 #, c-format
 msgid "    %2uh %2um %2lus  server runtime\n"
 msgstr "    %2uh %2um %2lus  伺服器 執行時期\n"
 
-#: nscd/nscd_stat.c:236
+#: nscd/nscd_stat.c:253
 #, c-format
 msgid "        %2um %2lus  server runtime\n"
 msgstr "        %2um %2lus  伺服器 執行時期\n"
 
-#: nscd/nscd_stat.c:238
+#: nscd/nscd_stat.c:255
 #, c-format
 msgid "            %2lus  server runtime\n"
 msgstr "            %2lus  伺服器 執行時期\n"
 
-#: nscd/nscd_stat.c:240
+#: nscd/nscd_stat.c:257
 #, c-format
 msgid ""
 "%15d  current number of threads\n"
@@ -4304,7 +4409,7 @@ msgstr ""
 "%15lu  內部重新啟動\n"
 "%15u  重新載入計數\n"
 
-#: nscd/nscd_stat.c:275
+#: nscd/nscd_stat.c:292
 #, c-format
 msgid ""
 "\n"
@@ -4355,97 +4460,104 @@ msgstr ""
 "%15<PRIuMAX> 記憶體配置失敗\n"
 "%15s  檢查 /etc/%s 的變更\n"
 
-#: nscd/pwdcache.c:436
-#, c-format
-msgid "Haven't found \"%s\" in password cache!"
-msgstr "尚未在密碼快取中找到 \"%s\"!"
+#: nscd/pwdcache.c:407
+#, fuzzy, c-format
+#| msgid "Haven't found \"%s\" in hosts cache!"
+msgid "Haven't found \"%s\" in user database cache!"
+msgstr "尚未在 hosts 快取中找到 \"%s\"!"
 
-#: nscd/pwdcache.c:438
-#, c-format
-msgid "Reloading \"%s\" in password cache!"
-msgstr "重新載入「%s」於密碼快取！"
+#: nscd/pwdcache.c:409
+#, fuzzy, c-format
+#| msgid "Reloading \"%s\" in hosts cache!"
+msgid "Reloading \"%s\" in user database cache!"
+msgstr "重新載入「%s」於主機快取！"
 
-#: nscd/pwdcache.c:519
+#: nscd/pwdcache.c:471
 #, c-format
 msgid "Invalid numeric uid \"%s\"!"
 msgstr "無效的 uid 數值 \"%s\"!"
 
-#: nscd/selinux.c:160
+#: nscd/selinux.c:154
 #, c-format
 msgid "Failed opening connection to the audit subsystem: %m"
 msgstr "失敗的開啟連線到稽核子系統：%m"
 
-#: nscd/selinux.c:181
+#: nscd/selinux.c:175
 msgid "Failed to set keep-capabilities"
 msgstr "設定功能保持時失敗"
 
-#: nscd/selinux.c:182 nscd/selinux.c:245
-#, c-format
+#: nscd/selinux.c:176 nscd/selinux.c:239
 msgid "prctl(KEEPCAPS) failed"
 msgstr "prctl(KEEPCAPS) 失敗"
 
-#: nscd/selinux.c:196
+#: nscd/selinux.c:190
 msgid "Failed to initialize drop of capabilities"
 msgstr "初始化功能放棄時失敗"
 
-#: nscd/selinux.c:197
-#, c-format
+#: nscd/selinux.c:191
 msgid "cap_init failed"
 msgstr "cap_init 失敗"
 
-#: nscd/selinux.c:218 nscd/selinux.c:235
+#: nscd/selinux.c:212 nscd/selinux.c:229
 msgid "Failed to drop capabilities"
 msgstr "放棄功能時失敗"
 
-#: nscd/selinux.c:219 nscd/selinux.c:236
-#, c-format
+#: nscd/selinux.c:213 nscd/selinux.c:230
 msgid "cap_set_proc failed"
 msgstr "cap_set_proc 失敗"
 
-#: nscd/selinux.c:244
+#: nscd/selinux.c:238
 msgid "Failed to unset keep-capabilities"
 msgstr "解除設定功能保持時失敗"
 
-#: nscd/selinux.c:260
+#: nscd/selinux.c:254
 msgid "Failed to determine if kernel supports SELinux"
 msgstr "決定如果內核支援 SELinux 時失敗"
 
-#: nscd/selinux.c:275
-#, c-format
+#: nscd/selinux.c:269
 msgid "Failed to start AVC thread"
 msgstr "開始 AVC 執行緒時失敗"
 
-#: nscd/selinux.c:297
-#, c-format
+#: nscd/selinux.c:291
 msgid "Failed to create AVC lock"
 msgstr "建立 AVC 鎖定時失敗"
 
-#: nscd/selinux.c:337
-#, c-format
+#: nscd/selinux.c:331
 msgid "Failed to start AVC"
 msgstr "啟始 AVC 時失敗"
 
-#: nscd/selinux.c:339
+#: nscd/selinux.c:333
 msgid "Access Vector Cache (AVC) started"
 msgstr "存取向量快取 (AVC) 開始"
 
-#: nscd/selinux.c:360
+#: nscd/selinux.c:368
+msgid "Error querying policy for undefined object classes or permissions."
+msgstr ""
+
+#: nscd/selinux.c:375
+#, fuzzy
+#| msgid "Error getting context of nscd"
+msgid "Error getting security class for nscd."
+msgstr "取得 nscd 的狀態組合時發生錯誤"
+
+#: nscd/selinux.c:380
+#, c-format
+msgid "Error translating permission name \"%s\" to access vector bit."
+msgstr ""
+
+#: nscd/selinux.c:390
 msgid "Error getting context of socket peer"
 msgstr "取得對等通訊端的狀態組合時發生錯誤"
 
-#: nscd/selinux.c:365
+#: nscd/selinux.c:395
 msgid "Error getting context of nscd"
 msgstr "取得 nscd 的狀態組合時發生錯誤"
 
-#: nscd/selinux.c:371
+#: nscd/selinux.c:401
 msgid "Error getting sid from context"
 msgstr "從狀態組合取得 sid 時發生錯誤"
 
-#: nscd/selinux.c:378
-msgid "compile-time support for database policy missing"
-msgstr "compile-time 支援用於資料庫策略缺少"
-
-#: nscd/selinux.c:411
+#: nscd/selinux.c:439
 #, c-format
 msgid ""
 "\n"
@@ -4472,51 +4584,57 @@ msgstr ""
 "%15u  CAV 探查\n"
 "%15u  CAV 缺少\n"
 
-#: nscd/servicescache.c:395
+#: nscd/servicescache.c:358
 #, c-format
 msgid "Haven't found \"%s\" in services cache!"
 msgstr "尚未在服務快取中找到「%s」!"
 
-#: nscd/servicescache.c:397
+#: nscd/servicescache.c:360
 #, c-format
 msgid "Reloading \"%s\" in services cache!"
 msgstr "重新載入「%s」於服務快取！"
 
-#: nss/getent.c:53
+#: nss/getent.c:54
 msgid "database [key ...]"
 msgstr "資料庫 [鍵值…]"
 
-#: nss/getent.c:58
+#: nss/getent.c:59
 msgid "CONFIG"
 msgstr "組態"
 
-#: nss/getent.c:58
+#: nss/getent.c:59
 msgid "Service configuration to be used"
 msgstr "將要使用的服務組態"
 
-#: nss/getent.c:59
+#: nss/getent.c:60
 msgid "disable IDN encoding"
 msgstr "停用 IDN 編碼"
 
-#: nss/getent.c:64
+#: nss/getent.c:65
 msgid "Get entries from administrative database."
 msgstr "從管理資料庫取得條目。"
 
-#: nss/getent.c:148 nss/getent.c:477 nss/getent.c:522
+#: nss/getent.c:149 nss/getent.c:442 nss/getent.c:489
 #, c-format
 msgid "Enumeration not supported on %s\n"
 msgstr "此項目在 %s 中不被支援\n"
 
-#: nss/getent.c:913
+#: nss/getent.c:497 nss/getent.c:510
+#, fuzzy, c-format
+#| msgid "Could not create log file"
+msgid "Could not allocate group list: %m\n"
+msgstr "無法建立記錄檔"
+
+#: nss/getent.c:881
 #, c-format
 msgid "Unknown database name"
 msgstr "不明的資料庫名稱"
 
-#: nss/getent.c:943
+#: nss/getent.c:911
 msgid "Supported databases:\n"
 msgstr "支援的資料庫：\n"
 
-#: nss/getent.c:1009
+#: nss/getent.c:977
 #, c-format
 msgid "Unknown database: %s\n"
 msgstr "未知的資料庫: %s\n"
@@ -4585,61 +4703,56 @@ msgstr "無法取得新建立檔案的狀態"
 msgid "cannot rename temporary file"
 msgstr "無法重新命名暫存檔案"
 
-#: nss/makedb.c:531 nss/makedb.c:554
+#: nss/makedb.c:527 nss/makedb.c:550
 #, c-format
 msgid "cannot create search tree"
 msgstr "無法建立搜尋樹"
 
-#: nss/makedb.c:560
+#: nss/makedb.c:556
 msgid "duplicate key"
 msgstr "重複鍵值"
 
-#: nss/makedb.c:572
+#: nss/makedb.c:568
 #, c-format
 msgid "problems while reading `%s'"
 msgstr "讀取「%s」時發生問題"
 
-#: nss/makedb.c:799
+#: nss/makedb.c:795
 #, c-format
 msgid "failed to write new database file"
 msgstr "寫入新資料庫檔案時失敗"
 
-#: nss/makedb.c:812
+#: nss/makedb.c:808
 #, c-format
 msgid "cannot stat database file"
 msgstr "無法取得資料庫檔案的狀態"
 
-#: nss/makedb.c:817
+#: nss/makedb.c:813
 #, c-format
 msgid "cannot map database file"
 msgstr "無法映射資料庫檔案"
 
-#: nss/makedb.c:820
+#: nss/makedb.c:816
 #, c-format
 msgid "file not a database file"
 msgstr "檔案不是資料庫檔案"
 
-#: nss/makedb.c:871
+#: nss/makedb.c:867
 #, c-format
 msgid "cannot set file creation context for `%s'"
 msgstr "無法為 %s 設定檔案建立語境"
 
-#: ports/sysdeps/unix/sysv/linux/ia64/makecontext.c:58
-#, c-format
-msgid "makecontext: does not know how to handle more than 8 arguments\n"
-msgstr "makecontext: 不知要如何處理超過八個引數\n"
-
-#: posix/getconf.c:1035
+#: posix/getconf.c:417
 #, c-format
 msgid "Usage: %s [-v specification] variable_name [pathname]\n"
 msgstr "用法: %s [-v 規格] 變數名稱 [路徑名稱]\n"
 
-#: posix/getconf.c:1038
+#: posix/getconf.c:420
 #, c-format
 msgid "       %s -a [pathname]\n"
 msgstr "       %s -a [路徑名稱]\n"
 
-#: posix/getconf.c:1114
+#: posix/getconf.c:496
 #, c-format
 msgid ""
 "Usage: getconf [-v SPEC] VAR\n"
@@ -4658,202 +4771,188 @@ msgstr ""
 "環境 SPEC 值。\n"
 "\n"
 
-#: posix/getconf.c:1172
+#: posix/getconf.c:572
 #, c-format
 msgid "unknown specification \"%s\""
 msgstr "不明的規格 \"%s\""
 
-#: posix/getconf.c:1224
+#: posix/getconf.c:624
 #, c-format
 msgid "Couldn't execute %s"
 msgstr "無法執行 %s"
 
-#: posix/getconf.c:1268 posix/getconf.c:1284
+#: posix/getconf.c:669 posix/getconf.c:685
 msgid "undefined"
 msgstr "未定義"
 
-#: posix/getconf.c:1306
+#: posix/getconf.c:707
 #, c-format
 msgid "Unrecognized variable `%s'"
 msgstr "無法識別的變數 `%s'"
 
-#: posix/getopt.c:592 posix/getopt.c:621
-#, c-format
-msgid "%s: option '%s' is ambiguous; possibilities:"
+#: posix/getopt.c:277
+#, fuzzy, c-format
+#| msgid "%s: option '-W %s' is ambiguous\n"
+msgid "%s: option '%s%s' is ambiguous\n"
+msgstr "%s: 選項 `-W %s' 含義不清\n"
+
+#: posix/getopt.c:283
+#, fuzzy, c-format
+#| msgid "%s: option '%s' is ambiguous; possibilities:"
+msgid "%s: option '%s%s' is ambiguous; possibilities:"
 msgstr "%s：選項『%s』是模稜兩可的；可能是："
 
-#: posix/getopt.c:662 posix/getopt.c:666
-#, c-format
-msgid "%s: option '--%s' doesn't allow an argument\n"
-msgstr "%s: 選項 `--%s' 不允許附加引數\n"
+#: posix/getopt.c:318
+#, fuzzy, c-format
+#| msgid "%s: unrecognized option '%c%s'\n"
+msgid "%s: unrecognized option '%s%s'\n"
+msgstr "%s: 未知的選項 `%c%s'\n"
 
-#: posix/getopt.c:675 posix/getopt.c:680
-#, c-format
-msgid "%s: option '%c%s' doesn't allow an argument\n"
+#: posix/getopt.c:344
+#, fuzzy, c-format
+#| msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgid "%s: option '%s%s' doesn't allow an argument\n"
 msgstr "%s: 選項 `%c%s' 不允許附加引數\n"
 
-#: posix/getopt.c:723 posix/getopt.c:742
-#, c-format
-msgid "%s: option '--%s' requires an argument\n"
+#: posix/getopt.c:359
+#, fuzzy, c-format
+#| msgid "%s: option '--%s' requires an argument\n"
+msgid "%s: option '%s%s' requires an argument\n"
 msgstr "%s：選項『--%s』需要一個引數\n"
 
-#: posix/getopt.c:780 posix/getopt.c:783
-#, c-format
-msgid "%s: unrecognized option '--%s'\n"
-msgstr "%s: 未知的選項 `--%s'\n"
-
-#: posix/getopt.c:791 posix/getopt.c:794
-#, c-format
-msgid "%s: unrecognized option '%c%s'\n"
-msgstr "%s: 未知的選項 `%c%s'\n"
-
-#: posix/getopt.c:843 posix/getopt.c:846
+#: posix/getopt.c:620
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s: 不適用的選項 -- %c\n"
 
-#: posix/getopt.c:899 posix/getopt.c:916 posix/getopt.c:1126
-#: posix/getopt.c:1144
+#: posix/getopt.c:635 posix/getopt.c:681
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s: 選項需要一個引數 -- %c\n"
 
-#: posix/getopt.c:972 posix/getopt.c:988
-#, c-format
-msgid "%s: option '-W %s' is ambiguous\n"
-msgstr "%s: 選項 `-W %s' 含義不清\n"
-
-#: posix/getopt.c:1012 posix/getopt.c:1030
-#, c-format
-msgid "%s: option '-W %s' doesn't allow an argument\n"
-msgstr "%s: 選項 `-W %s' 不允許附加引數\n"
-
-#: posix/getopt.c:1051 posix/getopt.c:1069
-#, c-format
-msgid "%s: option '-W %s' requires an argument\n"
-msgstr "%s：選項『-W %s』需要一個引數\n"
-
-#: posix/regcomp.c:136
+#: posix/regcomp.c:138
 msgid "No match"
 msgstr "沒有符合的項目"
 
-#: posix/regcomp.c:139
+#: posix/regcomp.c:141
 msgid "Invalid regular expression"
 msgstr "不適用的常規表示式"
 
-#: posix/regcomp.c:142
+#: posix/regcomp.c:144
 msgid "Invalid collation character"
 msgstr "不適用的對照字元"
 
-#: posix/regcomp.c:145
+#: posix/regcomp.c:147
 msgid "Invalid character class name"
 msgstr "不適用的字元類別名"
 
-#: posix/regcomp.c:148
+#: posix/regcomp.c:150
 msgid "Trailing backslash"
 msgstr "尾端的反斜線"
 
-#: posix/regcomp.c:151
+#: posix/regcomp.c:153
 msgid "Invalid back reference"
 msgstr "不適用的後部索引"
 
-#: posix/regcomp.c:154
-msgid "Unmatched [ or [^"
+#: posix/regcomp.c:156
+#, fuzzy
+#| msgid "Unmatched [ or [^"
+msgid "Unmatched [, [^, [:, [., or [="
 msgstr "[ 或 [^ 不能匹配"
 
-#: posix/regcomp.c:157
+#: posix/regcomp.c:159
 msgid "Unmatched ( or \\("
 msgstr "( 或 \\( 不能匹配"
 
-#: posix/regcomp.c:160
+#: posix/regcomp.c:162
 msgid "Unmatched \\{"
 msgstr "\\{ 不能匹配"
 
-#: posix/regcomp.c:163
+#: posix/regcomp.c:165
 msgid "Invalid content of \\{\\}"
 msgstr "不適用的 \\{\\} 內容"
 
-#: posix/regcomp.c:166
+#: posix/regcomp.c:168
 msgid "Invalid range end"
 msgstr "不適用的範圍結束"
 
-#: posix/regcomp.c:169
+#: posix/regcomp.c:171
 msgid "Memory exhausted"
 msgstr "記憶體用完了"
 
-#: posix/regcomp.c:172
+#: posix/regcomp.c:174
 msgid "Invalid preceding regular expression"
 msgstr "不適用的前置常規表示式"
 
-#: posix/regcomp.c:175
+#: posix/regcomp.c:177
 msgid "Premature end of regular expression"
 msgstr "常規表示式太早結束了"
 
-#: posix/regcomp.c:178
+#: posix/regcomp.c:180
 msgid "Regular expression too big"
 msgstr "正規表示式太長了"
 
-#: posix/regcomp.c:181
+#: posix/regcomp.c:183
 msgid "Unmatched ) or \\)"
 msgstr ") 或 \\) 不能匹配"
 
-#: posix/regcomp.c:681
+#: posix/regcomp.c:689
 msgid "No previous regular expression"
 msgstr "先前並未使用過常規表示式"
 
-#: posix/wordexp.c:1840
+#: posix/wordexp.c:1815
 msgid "parameter null or not set"
 msgstr "參數為空字元或是未設置"
 
-#: resolv/herror.c:68
+#: resolv/herror.c:63
 msgid "Resolver Error 0 (no error)"
 msgstr "解讀錯誤碼 0 (沒有錯誤)"
 
-#: resolv/herror.c:69
+#: resolv/herror.c:64
 msgid "Unknown host"
 msgstr "未知的遠端位址"
 
-#: resolv/herror.c:70
+#: resolv/herror.c:65
 msgid "Host name lookup failure"
 msgstr "遠端系統名稱搜尋失敗"
 
-#: resolv/herror.c:71
+#: resolv/herror.c:66
 msgid "Unknown server error"
 msgstr "未知的伺服器錯誤"
 
-#: resolv/herror.c:72
+#: resolv/herror.c:67
 msgid "No address associated with name"
 msgstr "沒有此名稱所對應的位址"
 
-#: resolv/herror.c:107
+#: resolv/herror.c:102
 msgid "Resolver internal error"
 msgstr "內部解讀錯誤"
 
-#: resolv/herror.c:110
+#: resolv/herror.c:105
 msgid "Unknown resolver error"
 msgstr "未知的解讀錯誤"
 
-#: resolv/res_hconf.c:121
+#: resolv/res_hconf.c:118
 #, c-format
 msgid "%s: line %d: cannot specify more than %d trim domains"
 msgstr "%s: 第 %d 列: 無法指定超過 %d 個修剪範圍"
 
-#: resolv/res_hconf.c:142
+#: resolv/res_hconf.c:139
 #, c-format
 msgid "%s: line %d: list delimiter not followed by domain"
 msgstr "%s: 第 %d 列: 範圍不可跟在表列分隔字元之後"
 
-#: resolv/res_hconf.c:201
+#: resolv/res_hconf.c:176
 #, c-format
 msgid "%s: line %d: expected `on' or `off', found `%s'\n"
 msgstr "%s: 第 %d 列: 預期為 `on' 或 `off'，卻發現 `%s'\n"
 
-#: resolv/res_hconf.c:244
+#: resolv/res_hconf.c:219
 #, c-format
 msgid "%s: line %d: bad command `%s'\n"
 msgstr "%s: 第 %d 列: 不當的命令 `%s'\n"
 
-#: resolv/res_hconf.c:279
+#: resolv/res_hconf.c:252
 #, c-format
 msgid "%s: line %d: ignoring trailing garbage `%s'\n"
 msgstr "%s: 第 %d 列: 正在忽略尾端的無用資料 `%s'\n"
@@ -4959,7 +5058,9 @@ msgid "Child has terminated abnormally and did not create a core file"
 msgstr "子行程已異常終止且未建立記憶體檔案"
 
 #: stdio-common/psiginfo-data.h:37
-msgid "Child hat terminated abnormally and created a core file"
+#, fuzzy
+#| msgid "Child hat terminated abnormally and created a core file"
+msgid "Child has terminated abnormally and created a core file"
 msgstr "子行程已異常終止並已建立了記憶體檔案"
 
 #: stdio-common/psiginfo-data.h:38
@@ -4986,7 +5087,7 @@ msgstr "輸出緩衝區可用"
 msgid "Input message available"
 msgstr "輸入訊息可用"
 
-#: stdio-common/psiginfo-data.h:46
+#: stdio-common/psiginfo-data.h:46 timezone/zdump.c:381 timezone/zic.c:520
 msgid "I/O error"
 msgstr "I/O 錯誤"
 
@@ -4998,43 +5099,43 @@ msgstr "高優先權輸入可用"
 msgid "Device disconnected"
 msgstr "裝置已經結束連線"
 
-#: stdio-common/psiginfo.c:139
+#: stdio-common/psiginfo.c:140
 msgid "Signal sent by kill()"
 msgstr "kill() 已發送信號"
 
-#: stdio-common/psiginfo.c:142
+#: stdio-common/psiginfo.c:143
 msgid "Signal sent by sigqueue()"
 msgstr "sigqueue() 已發送信號"
 
-#: stdio-common/psiginfo.c:145
+#: stdio-common/psiginfo.c:146
 msgid "Signal generated by the expiration of a timer"
 msgstr "計時器的逾期已產生信號"
 
-#: stdio-common/psiginfo.c:148
+#: stdio-common/psiginfo.c:149
 msgid "Signal generated by the completion of an asynchronous I/O request"
 msgstr "非同步 I/O 要求的完成已產生信號"
 
-#: stdio-common/psiginfo.c:152
+#: stdio-common/psiginfo.c:153
 msgid "Signal generated by the arrival of a message on an empty message queue"
 msgstr "空訊息佇列中到達的訊息已產生信號"
 
-#: stdio-common/psiginfo.c:157
+#: stdio-common/psiginfo.c:158
 msgid "Signal sent by tkill()"
 msgstr "tkill() 已發送信號"
 
-#: stdio-common/psiginfo.c:162
+#: stdio-common/psiginfo.c:163
 msgid "Signal generated by the completion of an asynchronous name lookup request"
 msgstr "非同步名稱查找要求的完成已產生信號"
 
-#: stdio-common/psiginfo.c:168
+#: stdio-common/psiginfo.c:169
 msgid "Signal generated by the completion of an I/O request"
 msgstr "I/O 要求的完成已產生信號"
 
-#: stdio-common/psiginfo.c:174
+#: stdio-common/psiginfo.c:175
 msgid "Signal sent by the kernel"
 msgstr "內核已發送信號"
 
-#: stdio-common/psiginfo.c:198
+#: stdio-common/psiginfo.c:199
 #, c-format
 msgid "Unknown signal %d\n"
 msgstr "不明信號 %d\n"
@@ -5052,7 +5153,7 @@ msgstr "不明的信號"
 msgid "Unknown error "
 msgstr "未知的錯誤 "
 
-#: string/strerror.c:42
+#: string/strerror.c:41
 msgid "Unknown error"
 msgstr "未知的錯誤"
 
@@ -5066,11 +5167,11 @@ msgstr "即時的信號 %d"
 msgid "Unknown signal %d"
 msgstr "未知的信號 %d"
 
-#: sunrpc/auth_unix.c:111 sunrpc/clnt_tcp.c:123 sunrpc/clnt_udp.c:135
-#: sunrpc/clnt_unix.c:124 sunrpc/svc_tcp.c:188 sunrpc/svc_tcp.c:233
-#: sunrpc/svc_udp.c:162 sunrpc/svc_unix.c:188 sunrpc/svc_unix.c:229
-#: sunrpc/xdr.c:631 sunrpc/xdr.c:791 sunrpc/xdr_array.c:97
-#: sunrpc/xdr_rec.c:152 sunrpc/xdr_ref.c:76
+#: sunrpc/auth_unix.c:112 sunrpc/clnt_tcp.c:124 sunrpc/clnt_udp.c:139
+#: sunrpc/clnt_unix.c:125 sunrpc/svc_tcp.c:189 sunrpc/svc_tcp.c:233
+#: sunrpc/svc_udp.c:161 sunrpc/svc_unix.c:189 sunrpc/svc_unix.c:229
+#: sunrpc/xdr.c:628 sunrpc/xdr.c:788 sunrpc/xdr_array.c:102
+#: sunrpc/xdr_rec.c:153 sunrpc/xdr_ref.c:79
 msgid "out of memory\n"
 msgstr "記憶體不足\n"
 
@@ -5078,158 +5179,158 @@ msgstr "記憶體不足\n"
 msgid "auth_unix.c: Fatal marshalling problem"
 msgstr "auth_unix.c: 嚴重的編組問題"
 
-#: sunrpc/clnt_perr.c:95 sunrpc/clnt_perr.c:111
+#: sunrpc/clnt_perr.c:92 sunrpc/clnt_perr.c:108
 #, c-format
 msgid "%s: %s; low version = %lu, high version = %lu"
 msgstr "%s: %s; 低版本 = %lu，高版本 = %lu"
 
-#: sunrpc/clnt_perr.c:102
+#: sunrpc/clnt_perr.c:99
 #, c-format
 msgid "%s: %s; why = %s\n"
 msgstr "%s: %s; 原因 = %s\n"
 
-#: sunrpc/clnt_perr.c:104
+#: sunrpc/clnt_perr.c:101
 #, c-format
 msgid "%s: %s; why = (unknown authentication error - %d)\n"
 msgstr "%s: %s; 原因 = (不明的認證錯誤 - %d)\n"
 
-#: sunrpc/clnt_perr.c:153
+#: sunrpc/clnt_perr.c:150
 msgid "RPC: Success"
 msgstr "RPC: 成功"
 
-#: sunrpc/clnt_perr.c:156
+#: sunrpc/clnt_perr.c:153
 msgid "RPC: Can't encode arguments"
 msgstr "RPC: 無法將引數編碼"
 
-#: sunrpc/clnt_perr.c:160
+#: sunrpc/clnt_perr.c:157
 msgid "RPC: Can't decode result"
 msgstr "RPC: 無法解碼得出結果"
 
-#: sunrpc/clnt_perr.c:164
+#: sunrpc/clnt_perr.c:161
 msgid "RPC: Unable to send"
 msgstr "RPC: 無法傳送"
 
-#: sunrpc/clnt_perr.c:168
+#: sunrpc/clnt_perr.c:165
 msgid "RPC: Unable to receive"
 msgstr "RPC: 無法接收"
 
-#: sunrpc/clnt_perr.c:172
+#: sunrpc/clnt_perr.c:169
 msgid "RPC: Timed out"
 msgstr "RPC: 超過時間上限"
 
-#: sunrpc/clnt_perr.c:176
+#: sunrpc/clnt_perr.c:173
 msgid "RPC: Incompatible versions of RPC"
 msgstr "RPC: RPC 版本不相容"
 
-#: sunrpc/clnt_perr.c:180
+#: sunrpc/clnt_perr.c:177
 msgid "RPC: Authentication error"
 msgstr "RPC: 認證錯誤"
 
-#: sunrpc/clnt_perr.c:184
+#: sunrpc/clnt_perr.c:181
 msgid "RPC: Program unavailable"
 msgstr "RPC: 程式不存在"
 
-#: sunrpc/clnt_perr.c:188
+#: sunrpc/clnt_perr.c:185
 msgid "RPC: Program/version mismatch"
 msgstr "RPC: 程式/版本不符"
 
-#: sunrpc/clnt_perr.c:192
+#: sunrpc/clnt_perr.c:189
 msgid "RPC: Procedure unavailable"
 msgstr "RPC: 無法取得程序"
 
-#: sunrpc/clnt_perr.c:196
+#: sunrpc/clnt_perr.c:193
 msgid "RPC: Server can't decode arguments"
 msgstr "RPC: 伺服器無法將引數解碼"
 
-#: sunrpc/clnt_perr.c:200
+#: sunrpc/clnt_perr.c:197
 msgid "RPC: Remote system error"
 msgstr "RPC: 遠端程式錯誤"
 
-#: sunrpc/clnt_perr.c:204
+#: sunrpc/clnt_perr.c:201
 msgid "RPC: Unknown host"
 msgstr "RPC: 未知的遠端位址"
 
-#: sunrpc/clnt_perr.c:208
+#: sunrpc/clnt_perr.c:205
 msgid "RPC: Unknown protocol"
 msgstr "RPC: 未知的協定"
 
-#: sunrpc/clnt_perr.c:212
+#: sunrpc/clnt_perr.c:209
 msgid "RPC: Port mapper failure"
 msgstr "RPC: 通訊阜對映錯誤"
 
-#: sunrpc/clnt_perr.c:216
+#: sunrpc/clnt_perr.c:213
 msgid "RPC: Program not registered"
 msgstr "RPC: 程式沒有註冊"
 
-#: sunrpc/clnt_perr.c:220
+#: sunrpc/clnt_perr.c:217
 msgid "RPC: Failed (unspecified error)"
 msgstr "RPC: 失敗 (非特定的錯誤)"
 
-#: sunrpc/clnt_perr.c:261
+#: sunrpc/clnt_perr.c:258
 msgid "RPC: (unknown error code)"
 msgstr "RPC: (未知的錯誤碼)"
 
-#: sunrpc/clnt_perr.c:333
+#: sunrpc/clnt_perr.c:330
 msgid "Authentication OK"
 msgstr "鑑定完成"
 
-#: sunrpc/clnt_perr.c:336
+#: sunrpc/clnt_perr.c:333
 msgid "Invalid client credential"
 msgstr "不適用的請求端身分認證"
 
-#: sunrpc/clnt_perr.c:340
+#: sunrpc/clnt_perr.c:337
 msgid "Server rejected credential"
 msgstr "伺服器拒絕身分證明"
 
-#: sunrpc/clnt_perr.c:344
+#: sunrpc/clnt_perr.c:341
 msgid "Invalid client verifier"
 msgstr "不適用的請求端認證"
 
-#: sunrpc/clnt_perr.c:348
+#: sunrpc/clnt_perr.c:345
 msgid "Server rejected verifier"
 msgstr "伺服器拒絕認證"
 
-#: sunrpc/clnt_perr.c:352
+#: sunrpc/clnt_perr.c:349
 msgid "Client credential too weak"
 msgstr "用戶端背景太弱"
 
-#: sunrpc/clnt_perr.c:356
+#: sunrpc/clnt_perr.c:353
 msgid "Invalid server verifier"
 msgstr "不適用的服務認證"
 
-#: sunrpc/clnt_perr.c:360
+#: sunrpc/clnt_perr.c:357
 msgid "Failed (unspecified error)"
 msgstr "失敗 (無特定的錯誤)"
 
-#: sunrpc/clnt_raw.c:115
+#: sunrpc/clnt_raw.c:112
 msgid "clnt_raw.c: fatal header serialization error"
 msgstr "clnt_raw.c: 嚴重的標頭序列化錯誤"
 
-#: sunrpc/pm_getmaps.c:77
+#: sunrpc/pm_getmaps.c:78
 msgid "pmap_getmaps.c: rpc problem"
 msgstr "pmap_getmaps.c: 遠端程序呼叫問題"
 
-#: sunrpc/pmap_clnt.c:127
+#: sunrpc/pmap_clnt.c:128
 msgid "Cannot register service"
 msgstr "無法註冊服務"
 
-#: sunrpc/pmap_rmt.c:243
+#: sunrpc/pmap_rmt.c:244
 msgid "Cannot create socket for broadcast rpc"
 msgstr "無法為廣播式遠端程序呼叫 (broadcast rpc) 產生 socket"
 
-#: sunrpc/pmap_rmt.c:250
+#: sunrpc/pmap_rmt.c:251
 msgid "Cannot set socket option SO_BROADCAST"
 msgstr "無法設定 socket 選項 SO_BROADCAST"
 
-#: sunrpc/pmap_rmt.c:302
+#: sunrpc/pmap_rmt.c:303
 msgid "Cannot send broadcast packet"
 msgstr "無法傳送廣播封包"
 
-#: sunrpc/pmap_rmt.c:327
+#: sunrpc/pmap_rmt.c:328
 msgid "Broadcast poll problem"
 msgstr "Broadcast 調查有問題"
 
-#: sunrpc/pmap_rmt.c:340
+#: sunrpc/pmap_rmt.c:341
 msgid "Cannot receive reply to broadcast"
 msgstr "無法接受廣播後的回應"
 
@@ -5292,180 +5393,192 @@ msgstr "無法指定超過一個輸入檔!\n"
 
 #: sunrpc/rpc_main.c:1349
 #, c-format
-msgid "This implementation doesn't support newstyle or MT-safe code!\n"
-msgstr "此實作方式不支援新的形式或多安全執行序的程式!\n"
-
-#: sunrpc/rpc_main.c:1358
-#, c-format
 msgid "Cannot use netid flag with inetd flag!\n"
 msgstr "無法將 netid 旗標與 inetd 旗標一起使用!\n"
 
-#: sunrpc/rpc_main.c:1367
+#: sunrpc/rpc_main.c:1358
 #, c-format
 msgid "Cannot use netid flag without TIRPC!\n"
 msgstr "無法在沒有 TIRPC 時使用 netid 旗標!\n"
 
-#: sunrpc/rpc_main.c:1374
+#: sunrpc/rpc_main.c:1365
 #, c-format
 msgid "Cannot use table flags with newstyle!\n"
 msgstr "無法將表格旗標與 newstyle 一起使用!\n"
 
-#: sunrpc/rpc_main.c:1393
+#: sunrpc/rpc_main.c:1384
 #, c-format
 msgid "\"infile\" is required for template generation flags.\n"
 msgstr "\"infile\" 是樣版產生旗標所需的\n"
 
-#: sunrpc/rpc_main.c:1398
+#: sunrpc/rpc_main.c:1389
 #, c-format
 msgid "Cannot have more than one file generation flag!\n"
 msgstr "無法使用超過一個的檔案產生旗標!\n"
 
-#: sunrpc/rpc_main.c:1407
+#: sunrpc/rpc_main.c:1398
 #, c-format
 msgid "usage: %s infile\n"
 msgstr "用法: %s infile\n"
 
-#: sunrpc/rpc_main.c:1408
+#: sunrpc/rpc_main.c:1399
 #, c-format
 msgid "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] infile\n"
 msgstr "\t%s [-abkCLNTM][-D名稱[=值]] [-i 大小] [-I [-K 秒數]] [-Y 路徑] 輸入檔案\n"
 
-#: sunrpc/rpc_main.c:1410
+#: sunrpc/rpc_main.c:1401
 #, c-format
 msgid "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n"
 msgstr "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o 輸出檔案] [輸入檔案]\n"
 
-#: sunrpc/rpc_main.c:1412
+#: sunrpc/rpc_main.c:1403
 #, c-format
 msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
 msgstr "\t%s [-s 網路型態]* [-o 輸出檔案] [輸入檔案]\n"
 
-#: sunrpc/rpc_main.c:1413
+#: sunrpc/rpc_main.c:1404
 #, c-format
 msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
 msgstr "\t%s [-n 網路識別符號]* [-o 輸出檔案] [輸入檔案]\n"
 
-#: sunrpc/rpc_main.c:1421
+#: sunrpc/rpc_main.c:1412
 #, c-format
 msgid "options:\n"
 msgstr "選項：\n"
 
-#: sunrpc/rpc_main.c:1422
+#: sunrpc/rpc_main.c:1413
 #, c-format
 msgid "-a\t\tgenerate all files, including samples\n"
 msgstr "-a\t\t產生所有檔案，包含樣本\n"
 
-#: sunrpc/rpc_main.c:1423
+#: sunrpc/rpc_main.c:1414
 #, c-format
 msgid "-b\t\tbackward compatibility mode (generates code for SunOS 4.1)\n"
 msgstr "-b\t\t回溯相容模式 (產生用於 SunOS 4.1 的編碼)\n"
 
-#: sunrpc/rpc_main.c:1424
+#: sunrpc/rpc_main.c:1415
 #, c-format
 msgid "-c\t\tgenerate XDR routines\n"
 msgstr "-c\t\t產生 XDR 常式\n"
 
-#: sunrpc/rpc_main.c:1425
+#: sunrpc/rpc_main.c:1416
 #, c-format
 msgid "-C\t\tANSI C mode\n"
 msgstr "-C\t\tANSI C 模式\n"
 
-#: sunrpc/rpc_main.c:1426
+#: sunrpc/rpc_main.c:1417
 #, c-format
 msgid "-Dname[=value]\tdefine a symbol (same as #define)\n"
 msgstr "-D名稱[=值]\t定義一個符號 (如同 #define)\n"
 
-#: sunrpc/rpc_main.c:1427
+#: sunrpc/rpc_main.c:1418
 #, c-format
 msgid "-h\t\tgenerate header file\n"
 msgstr "-h\t\t產生標頭檔\n"
 
-#: sunrpc/rpc_main.c:1428
+#: sunrpc/rpc_main.c:1419
 #, c-format
 msgid "-i size\t\tsize at which to start generating inline code\n"
 msgstr "-i 大小\t\t啟始產生內聯編碼的大小\n"
 
-#: sunrpc/rpc_main.c:1429
+#: sunrpc/rpc_main.c:1420
 #, c-format
 msgid "-I\t\tgenerate code for inetd support in server (for SunOS 4.1)\n"
 msgstr "-I\t\t產生在伺服器中支援的 inetd 編碼 (用於 SunOS 4.1)\n"
 
-#: sunrpc/rpc_main.c:1430
+#: sunrpc/rpc_main.c:1421
 #, c-format
 msgid "-K seconds\tserver exits after K seconds of inactivity\n"
 msgstr "-K 秒\t不作用 K 秒之後離開伺服器\n"
 
-#: sunrpc/rpc_main.c:1431
+#: sunrpc/rpc_main.c:1422
 #, c-format
 msgid "-l\t\tgenerate client side stubs\n"
 msgstr "-l\t\t產生客戶端殘餘\n"
 
-#: sunrpc/rpc_main.c:1432
+#: sunrpc/rpc_main.c:1423
 #, c-format
 msgid "-L\t\tserver errors will be printed to syslog\n"
 msgstr "-L\t\t伺服器錯誤將被列印到 syslog\n"
 
-#: sunrpc/rpc_main.c:1433
+#: sunrpc/rpc_main.c:1424
 #, c-format
 msgid "-m\t\tgenerate server side stubs\n"
 msgstr "-m\t\t產生伺服器端殘餘\n"
 
-#: sunrpc/rpc_main.c:1434
+#: sunrpc/rpc_main.c:1425
 #, c-format
 msgid "-M\t\tgenerate MT-safe code\n"
 msgstr "-M\t\t產生 MT-safe 編碼\n"
 
-#: sunrpc/rpc_main.c:1435
+#: sunrpc/rpc_main.c:1426
 #, c-format
 msgid "-n netid\tgenerate server code that supports named netid\n"
 msgstr "-n netid\t產生支援具名 netid 的伺服器編碼\n"
 
-#: sunrpc/rpc_main.c:1436
+#: sunrpc/rpc_main.c:1427
 #, c-format
 msgid "-N\t\tsupports multiple arguments and call-by-value\n"
 msgstr "-N\t\t支援多重引數和傳值呼叫\n"
 
-#: sunrpc/rpc_main.c:1437
+#: sunrpc/rpc_main.c:1428
 #, c-format
 msgid "-o outfile\tname of the output file\n"
 msgstr "-o 輸出檔\t輸出檔案的名稱\n"
 
-#: sunrpc/rpc_main.c:1438
+#: sunrpc/rpc_main.c:1429
 #, c-format
 msgid "-s nettype\tgenerate server code that supports named nettype\n"
 msgstr "-s nettype\t產生支援具名 nettype 的伺服器編碼\n"
 
-#: sunrpc/rpc_main.c:1439
+#: sunrpc/rpc_main.c:1430
 #, c-format
 msgid "-Sc\t\tgenerate sample client code that uses remote procedures\n"
 msgstr "-Sc\t\t產生使用遠端程序的範例客戶端編碼\n"
 
-#: sunrpc/rpc_main.c:1440
+#: sunrpc/rpc_main.c:1431
 #, c-format
 msgid "-Ss\t\tgenerate sample server code that defines remote procedures\n"
 msgstr "-Ss\t\t產生定義遠端程序的範例伺服器編碼\n"
 
-#: sunrpc/rpc_main.c:1441
+#: sunrpc/rpc_main.c:1432
 #, c-format
 msgid "-Sm \t\tgenerate makefile template \n"
 msgstr "-Sm\t\t產生 makefile 模板\n"
 
-#: sunrpc/rpc_main.c:1442
+#: sunrpc/rpc_main.c:1433
 #, c-format
 msgid "-t\t\tgenerate RPC dispatch table\n"
 msgstr "-t\t\t產生 RPC 派送表\n"
 
-#: sunrpc/rpc_main.c:1443
+#: sunrpc/rpc_main.c:1434
 #, c-format
 msgid "-T\t\tgenerate code to support RPC dispatch tables\n"
 msgstr "-T\t\t產生支援 RPC 派送表的編碼\n"
 
-#: sunrpc/rpc_main.c:1444
+#: sunrpc/rpc_main.c:1435
 #, c-format
 msgid "-Y path\t\tdirectory name to find C preprocessor (cpp)\n"
 msgstr "-Y 路徑\t\t要尋找 C 前置處理器 (cpp) 的目錄名稱\n"
 
-#: sunrpc/rpc_main.c:1446
+#: sunrpc/rpc_main.c:1436
+#, c-format
+msgid "-5\t\tSysVr4 compatibility mode\n"
+msgstr ""
+
+#: sunrpc/rpc_main.c:1437
+#, fuzzy, c-format
+#| msgid "Give this help list"
+msgid "--help\t\tgive this help list\n"
+msgstr "給出這個使用方式列表"
+
+#: sunrpc/rpc_main.c:1438
+#, fuzzy, c-format
+#| msgid "Print program version"
+msgid "--version\tprint program version\n"
+msgstr "印出程式版本"
+
+#: sunrpc/rpc_main.c:1440
 #, c-format
 msgid ""
 "\n"
@@ -5496,447 +5609,370 @@ msgstr "空的字元字串"
 msgid "preprocessor error"
 msgstr "前置處理器錯誤"
 
-#: sunrpc/rpcinfo.c:246 sunrpc/rpcinfo.c:392
-#, c-format
-msgid "program %lu is not available\n"
-msgstr "程式 %lu 不存在\n"
-
-#: sunrpc/rpcinfo.c:273 sunrpc/rpcinfo.c:319 sunrpc/rpcinfo.c:342
-#: sunrpc/rpcinfo.c:416 sunrpc/rpcinfo.c:462 sunrpc/rpcinfo.c:485
-#: sunrpc/rpcinfo.c:519
-#, c-format
-msgid "program %lu version %lu is not available\n"
-msgstr "程式 %lu 的第 %lu 版並不存在\n"
-
-#: sunrpc/rpcinfo.c:524
-#, c-format
-msgid "program %lu version %lu ready and waiting\n"
-msgstr "程式 %lu 的第 %lu 版已經就緒並等待服務中\n"
-
-#: sunrpc/rpcinfo.c:565 sunrpc/rpcinfo.c:572
-msgid "rpcinfo: can't contact portmapper"
-msgstr "rpcinfo: 無法建立跟 portmapper 之間的連線"
-
-#: sunrpc/rpcinfo.c:579
-msgid "No remote programs registered.\n"
-msgstr "沒有註冊過的遠端應用程式\n"
-
-#: sunrpc/rpcinfo.c:583
-msgid "   program vers proto   port\n"
-msgstr "   程式採用的協定連接阜\n"
-
-#: sunrpc/rpcinfo.c:622
-msgid "(unknown)"
-msgstr "(未知)"
-
-#: sunrpc/rpcinfo.c:646
-#, c-format
-msgid "rpcinfo: broadcast failed: %s\n"
-msgstr "rpcinfo: 廣播失敗: %s\n"
-
-#: sunrpc/rpcinfo.c:667
-msgid "Sorry. You are not root\n"
-msgstr "不好意思，你並不是 root 使用者\n"
-
-#: sunrpc/rpcinfo.c:674
-#, c-format
-msgid "rpcinfo: Could not delete registration for prog %s version %s\n"
-msgstr "rpcinfo: 無法刪除程式 %s (第 %s 版) 的註冊資料\n"
-
-#: sunrpc/rpcinfo.c:683
-msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
-msgstr "使用方式: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
-
-#: sunrpc/rpcinfo.c:685
-msgid "       rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n"
-msgstr "       rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n"
-
-#: sunrpc/rpcinfo.c:687
-msgid "       rpcinfo -p [ host ]\n"
-msgstr "       rpcinfo -p [ host ]\n"
-
-#: sunrpc/rpcinfo.c:688
-msgid "       rpcinfo -b prognum versnum\n"
-msgstr "       rpcinfo -b prognum versnum\n"
-
-#: sunrpc/rpcinfo.c:689
-msgid "       rpcinfo -d prognum versnum\n"
-msgstr "       rpcinfo -d prognum versnum\n"
-
-#: sunrpc/rpcinfo.c:714
-#, c-format
-msgid "rpcinfo: %s is unknown service\n"
-msgstr "rpcinfo: %s 是不明的服務\n"
-
-#: sunrpc/rpcinfo.c:751
-#, c-format
-msgid "rpcinfo: %s is unknown host\n"
-msgstr "rpcinfo: %s 是不明的主機\n"
-
-#: sunrpc/svc_run.c:71
+#: sunrpc/svc_run.c:72
 msgid "svc_run: - out of memory"
 msgstr "svc_run：- 記憶體不足"
 
-#: sunrpc/svc_run.c:91
+#: sunrpc/svc_run.c:92
 msgid "svc_run: - poll failed"
 msgstr "svc_run: - poll 失敗"
 
-#: sunrpc/svc_simple.c:80
+#: sunrpc/svc_simple.c:72
 #, c-format
 msgid "can't reassign procedure number %ld\n"
 msgstr "不能重複指定程序號碼 %ld\n"
 
-#: sunrpc/svc_simple.c:90
+#: sunrpc/svc_simple.c:82
 msgid "couldn't create an rpc server\n"
 msgstr "不能產生遠端程序呼叫伺服程式\n"
 
-#: sunrpc/svc_simple.c:98
+#: sunrpc/svc_simple.c:90
 #, c-format
 msgid "couldn't register prog %ld vers %ld\n"
 msgstr "不能將程式 %ld 註冊到 %ld\n"
 
-#: sunrpc/svc_simple.c:106
+#: sunrpc/svc_simple.c:98
 msgid "registerrpc: out of memory\n"
 msgstr "registerrpc: 記憶體不足\n"
 
-#: sunrpc/svc_simple.c:169
+#: sunrpc/svc_simple.c:161
 #, c-format
 msgid "trouble replying to prog %d\n"
 msgstr "回應程式 %d 時發生困難\n"
 
-#: sunrpc/svc_simple.c:178
+#: sunrpc/svc_simple.c:170
 #, c-format
 msgid "never registered prog %d\n"
 msgstr "千萬不要註冊程式 %d\n"
 
-#: sunrpc/svc_tcp.c:164
+#: sunrpc/svc_tcp.c:165
 msgid "svc_tcp.c - tcp socket creation problem"
 msgstr "svc_tcp.c - tcp socket 建立發生問題"
 
-#: sunrpc/svc_tcp.c:179
+#: sunrpc/svc_tcp.c:180
 msgid "svc_tcp.c - cannot getsockname or listen"
 msgstr "svc_tcp.c - 無法 getsockname 或 listen"
 
-#: sunrpc/svc_udp.c:137
+#: sunrpc/svc_udp.c:136
 msgid "svcudp_create: socket creation problem"
 msgstr "svcudp_create: socket 建立有問題"
 
-#: sunrpc/svc_udp.c:151
+#: sunrpc/svc_udp.c:150
 msgid "svcudp_create - cannot getsockname"
 msgstr "svcudp_create - 無法 getsockname"
 
-#: sunrpc/svc_udp.c:183
+#: sunrpc/svc_udp.c:182
 msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
 msgstr "svcudp_create: xp_pad 太小以致於無法 IP_PKTINFO\n"
 
-#: sunrpc/svc_udp.c:495
+#: sunrpc/svc_udp.c:481
 msgid "enablecache: cache already enabled"
 msgstr "enablecache: 快取已經開啟"
 
-#: sunrpc/svc_udp.c:501
+#: sunrpc/svc_udp.c:487
 msgid "enablecache: could not allocate cache"
 msgstr "enablecache: 無法配置快取"
 
-#: sunrpc/svc_udp.c:510
+#: sunrpc/svc_udp.c:496
 msgid "enablecache: could not allocate cache data"
 msgstr "enablecache: 無法配置快取資料"
 
-#: sunrpc/svc_udp.c:518
+#: sunrpc/svc_udp.c:504
 msgid "enablecache: could not allocate cache fifo"
 msgstr "enablecache: 無法配置快取 fifo 管線"
 
-#: sunrpc/svc_udp.c:554
+#: sunrpc/svc_udp.c:540
 msgid "cache_set: victim not found"
 msgstr "cache_set: 找不到 victim"
 
-#: sunrpc/svc_udp.c:565
+#: sunrpc/svc_udp.c:551
 msgid "cache_set: victim alloc failed"
 msgstr "cache_set: victim 配置失敗"
 
-#: sunrpc/svc_udp.c:572
+#: sunrpc/svc_udp.c:558
 msgid "cache_set: could not allocate new rpc_buffer"
 msgstr "cache_set: 無法配置新的遠端程序呼叫緩衝區 (rpc_buffer)"
 
-#: sunrpc/svc_unix.c:162
+#: sunrpc/svc_unix.c:163
 msgid "svc_unix.c - AF_UNIX socket creation problem"
 msgstr "svc_unix.c - AF_UNIX socket 建立有問題"
 
-#: sunrpc/svc_unix.c:178
+#: sunrpc/svc_unix.c:179
 msgid "svc_unix.c - cannot getsockname or listen"
 msgstr "svc_unix.c - 無法 getsockname 或 listen"
 
-#: sysdeps/generic/siglist.h:28
+#: sysdeps/generic/siglist.h:29
 msgid "Hangup"
 msgstr "掛斷"
 
-#: sysdeps/generic/siglist.h:29
+#: sysdeps/generic/siglist.h:30
 msgid "Interrupt"
 msgstr "中斷"
 
-#: sysdeps/generic/siglist.h:30
+#: sysdeps/generic/siglist.h:31
 msgid "Quit"
 msgstr "離開"
 
-#: sysdeps/generic/siglist.h:31
+#: sysdeps/generic/siglist.h:32
 msgid "Illegal instruction"
 msgstr "不合法的命令"
 
-#: sysdeps/generic/siglist.h:32
+#: sysdeps/generic/siglist.h:33
 msgid "Trace/breakpoint trap"
 msgstr "追蹤與中斷點陷阱"
 
-#: sysdeps/generic/siglist.h:33
+#: sysdeps/generic/siglist.h:34
 msgid "Aborted"
 msgstr "已經終止"
 
-#: sysdeps/generic/siglist.h:34
+#: sysdeps/generic/siglist.h:35
 msgid "Floating point exception"
 msgstr "浮點數出錯"
 
-#: sysdeps/generic/siglist.h:35
+#: sysdeps/generic/siglist.h:36
 msgid "Killed"
 msgstr "已砍掉"
 
-#: sysdeps/generic/siglist.h:36
+#: sysdeps/generic/siglist.h:37
 msgid "Bus error"
 msgstr "匯流排錯誤"
 
-#: sysdeps/generic/siglist.h:37
+#: sysdeps/generic/siglist.h:38
+msgid "Bad system call"
+msgstr "錯誤的系統呼叫"
+
+#: sysdeps/generic/siglist.h:39
 msgid "Segmentation fault"
 msgstr "程式記憶體區段錯誤"
 
-#. TRANS Broken pipe; there is no process reading from the other end of a pipe.
+#. TRANS There is no process reading from the other end of a pipe.
 #. TRANS Every library function that returns this error code also generates a
 #. TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
 #. TRANS or blocked.  Thus, your program will never actually see @code{EPIPE}
 #. TRANS unless it has handled or blocked @code{SIGPIPE}.
-#: sysdeps/generic/siglist.h:38 sysdeps/gnu/errlist.c:359
+#: sysdeps/generic/siglist.h:40 sysdeps/gnu/errlist.c:360
 msgid "Broken pipe"
 msgstr "中斷的管線"
 
-#: sysdeps/generic/siglist.h:39
+#: sysdeps/generic/siglist.h:41
 msgid "Alarm clock"
 msgstr "鬧鐘"
 
-#: sysdeps/generic/siglist.h:40
+#: sysdeps/generic/siglist.h:42
 msgid "Terminated"
 msgstr "終止"
 
-#: sysdeps/generic/siglist.h:41
+#: sysdeps/generic/siglist.h:43
 msgid "Urgent I/O condition"
 msgstr "緊急的輸出入狀態"
 
-#: sysdeps/generic/siglist.h:42
+#: sysdeps/generic/siglist.h:44
 msgid "Stopped (signal)"
 msgstr "停止 (信號)"
 
-#: sysdeps/generic/siglist.h:43
+#: sysdeps/generic/siglist.h:45
 msgid "Stopped"
 msgstr "停止"
 
-#: sysdeps/generic/siglist.h:44
+#: sysdeps/generic/siglist.h:46
 msgid "Continued"
 msgstr "繼續"
 
-#: sysdeps/generic/siglist.h:45
+#: sysdeps/generic/siglist.h:47
 msgid "Child exited"
 msgstr "子行程結束"
 
-#: sysdeps/generic/siglist.h:46
+#: sysdeps/generic/siglist.h:48
 msgid "Stopped (tty input)"
 msgstr "停止 (tty 輸入)"
 
-#: sysdeps/generic/siglist.h:47
+#: sysdeps/generic/siglist.h:49
 msgid "Stopped (tty output)"
 msgstr "停止 (tty 輸出)"
 
-#: sysdeps/generic/siglist.h:48
+#: sysdeps/generic/siglist.h:50
 msgid "I/O possible"
 msgstr "I/O 可行"
 
-#: sysdeps/generic/siglist.h:49
+#: sysdeps/generic/siglist.h:51
 msgid "CPU time limit exceeded"
 msgstr "CPU 時間上限超過了"
 
-#: sysdeps/generic/siglist.h:50
+#: sysdeps/generic/siglist.h:52
 msgid "File size limit exceeded"
 msgstr "檔案大小超過上限"
 
-#: sysdeps/generic/siglist.h:51
+#: sysdeps/generic/siglist.h:53
 msgid "Virtual timer expired"
 msgstr "虛擬計時器已過時取消了"
 
-#: sysdeps/generic/siglist.h:52
+#: sysdeps/generic/siglist.h:54
 msgid "Profiling timer expired"
 msgstr "測速評估用的計時器已過時取消了"
 
-#: sysdeps/generic/siglist.h:53
+#: sysdeps/generic/siglist.h:55
 msgid "User defined signal 1"
 msgstr "使用者定義的訊號 1"
 
-#: sysdeps/generic/siglist.h:54
+#: sysdeps/generic/siglist.h:56
 msgid "User defined signal 2"
 msgstr "使用者定義的訊號 2"
 
-#: sysdeps/generic/siglist.h:58
-msgid "EMT trap"
-msgstr "EMT 陷阱"
+#: sysdeps/generic/siglist.h:57
+msgid "Window changed"
+msgstr "範圍改變了"
 
 #: sysdeps/generic/siglist.h:61
-msgid "Bad system call"
-msgstr "錯誤的系統呼叫"
+msgid "EMT trap"
+msgstr "EMT 陷阱"
 
 #: sysdeps/generic/siglist.h:64
 msgid "Stack fault"
 msgstr "堆疊錯誤"
 
 #: sysdeps/generic/siglist.h:67
-msgid "Information request"
-msgstr "需要資料"
-
-#: sysdeps/generic/siglist.h:69
 msgid "Power failure"
 msgstr "電源嚴重錯誤"
 
-#: sysdeps/generic/siglist.h:72
+#: sysdeps/generic/siglist.h:70
+msgid "Information request"
+msgstr "需要資料"
+
+#: sysdeps/generic/siglist.h:73
 msgid "Resource lost"
 msgstr "資源漏失"
 
-#: sysdeps/generic/siglist.h:75
-msgid "Window changed"
-msgstr "範圍改變了"
-
-#. TRANS Operation not permitted; only the owner of the file (or other resource)
+#. TRANS Only the owner of the file (or other resource)
 #. TRANS or processes with special privileges can perform the operation.
-#: sysdeps/gnu/errlist.c:25
+#: sysdeps/gnu/errlist.c:26
 msgid "Operation not permitted"
 msgstr "此項操作並不被允許"
 
 #. TRANS No process matches the specified process ID.
-#: sysdeps/gnu/errlist.c:45
+#: sysdeps/gnu/errlist.c:46
 msgid "No such process"
 msgstr "沒有此一程序"
 
-#. TRANS Interrupted function call; an asynchronous signal occurred and prevented
+#. TRANS An asynchronous signal occurred and prevented
 #. TRANS completion of the call.  When this happens, you should try the call
 #. TRANS again.
 #. TRANS
 #. TRANS You can choose to have functions resume after a signal that is handled,
 #. TRANS rather than failing with @code{EINTR}; see @ref{Interrupted
 #. TRANS Primitives}.
-#: sysdeps/gnu/errlist.c:60
+#: sysdeps/gnu/errlist.c:61
 msgid "Interrupted system call"
 msgstr "中斷的系統呼叫"
 
-#. TRANS Input/output error; usually used for physical read or write errors.
-#: sysdeps/gnu/errlist.c:69
+#. TRANS Usually used for physical read or write errors.
+#: sysdeps/gnu/errlist.c:70
 msgid "Input/output error"
 msgstr "輸入/輸出錯誤"
 
-#. TRANS No such device or address.  The system tried to use the device
+#. TRANS The system tried to use the device
 #. TRANS represented by a file you specified, and it couldn't find the device.
 #. TRANS This can mean that the device file was installed incorrectly, or that
 #. TRANS the physical device is missing or not correctly attached to the
 #. TRANS computer.
-#: sysdeps/gnu/errlist.c:82
+#: sysdeps/gnu/errlist.c:83
 msgid "No such device or address"
 msgstr "沒有此一裝置或位址"
 
-#. TRANS Argument list too long; used when the arguments passed to a new program
+#. TRANS Used when the arguments passed to a new program
 #. TRANS being executed with one of the @code{exec} functions (@pxref{Executing a
 #. TRANS File}) occupy too much memory space.  This condition never arises on
 #. TRANS @gnuhurdsystems{}.
-#: sysdeps/gnu/errlist.c:94
+#: sysdeps/gnu/errlist.c:95
 msgid "Argument list too long"
 msgstr "引數列項目過長"
 
 #. TRANS Invalid executable file format.  This condition is detected by the
 #. TRANS @code{exec} functions; see @ref{Executing a File}.
-#: sysdeps/gnu/errlist.c:104
+#: sysdeps/gnu/errlist.c:105
 msgid "Exec format error"
 msgstr "可執行檔格式錯誤"
 
-#. TRANS Bad file descriptor; for example, I/O on a descriptor that has been
+#. TRANS For example, I/O on a descriptor that has been
 #. TRANS closed or reading from a descriptor open only for writing (or vice
 #. TRANS versa).
-#: sysdeps/gnu/errlist.c:115
+#: sysdeps/gnu/errlist.c:116
 msgid "Bad file descriptor"
 msgstr "錯誤的檔案敘述項"
 
-#. TRANS There are no child processes.  This error happens on operations that are
+#. TRANS This error happens on operations that are
 #. TRANS supposed to manipulate child processes, when there aren't any processes
 #. TRANS to manipulate.
-#: sysdeps/gnu/errlist.c:126
+#: sysdeps/gnu/errlist.c:127
 msgid "No child processes"
 msgstr "沒有子程序存在"
 
-#. TRANS Deadlock avoided; allocating a system resource would have resulted in a
+#. TRANS Allocating a system resource would have resulted in a
 #. TRANS deadlock situation.  The system does not guarantee that it will notice
 #. TRANS all such situations.  This error means you got lucky and the system
 #. TRANS noticed; it might just hang.  @xref{File Locks}, for an example.
-#: sysdeps/gnu/errlist.c:138
+#: sysdeps/gnu/errlist.c:139
 msgid "Resource deadlock avoided"
 msgstr "避開資源鎖定"
 
-#. TRANS No memory available.  The system cannot allocate more virtual memory
+#. TRANS The system cannot allocate more virtual memory
 #. TRANS because its capacity is full.
-#: sysdeps/gnu/errlist.c:148
+#: sysdeps/gnu/errlist.c:149
 msgid "Cannot allocate memory"
 msgstr "無法配置記憶體"
 
-#. TRANS Bad address; an invalid pointer was detected.
+#. TRANS An invalid pointer was detected.
 #. TRANS On @gnuhurdsystems{}, this error never happens; you get a signal instead.
-#: sysdeps/gnu/errlist.c:167
+#: sysdeps/gnu/errlist.c:168
 msgid "Bad address"
 msgstr "錯誤的位址"
 
 #. TRANS A file that isn't a block special file was given in a situation that
 #. TRANS requires one.  For example, trying to mount an ordinary file as a file
 #. TRANS system in Unix gives this error.
-#: sysdeps/gnu/errlist.c:178
+#: sysdeps/gnu/errlist.c:179
 msgid "Block device required"
 msgstr "必須是區塊裝置 (Block device)"
 
-#. TRANS Resource busy; a system resource that can't be shared is already in use.
+#. TRANS A system resource that can't be shared is already in use.
 #. TRANS For example, if you try to delete a file that is the root of a currently
 #. TRANS mounted filesystem, you get this error.
-#: sysdeps/gnu/errlist.c:189
+#: sysdeps/gnu/errlist.c:190
 msgid "Device or resource busy"
 msgstr "裝置或系統資源忙碌中"
 
-#. TRANS File exists; an existing file was specified in a context where it only
+#. TRANS An existing file was specified in a context where it only
 #. TRANS makes sense to specify a new file.
-#: sysdeps/gnu/errlist.c:199
+#: sysdeps/gnu/errlist.c:200
 msgid "File exists"
 msgstr "檔案已存在"
 
 #. TRANS An attempt to make an improper link across file systems was detected.
 #. TRANS This happens not only when you use @code{link} (@pxref{Hard Links}) but
 #. TRANS also when you rename a file with @code{rename} (@pxref{Renaming Files}).
-#: sysdeps/gnu/errlist.c:210
+#: sysdeps/gnu/errlist.c:211
 msgid "Invalid cross-device link"
 msgstr "不適用的裝置間連結"
 
 #. TRANS The wrong type of device was given to a function that expects a
 #. TRANS particular sort of device.
-#: sysdeps/gnu/errlist.c:220
+#: sysdeps/gnu/errlist.c:221
 msgid "No such device"
 msgstr "沒有此一裝置"
 
 #. TRANS A file that isn't a directory was specified when a directory is required.
-#: sysdeps/gnu/errlist.c:229
+#: sysdeps/gnu/errlist.c:230
 msgid "Not a directory"
 msgstr "並不是一個目錄"
 
-#. TRANS File is a directory; you cannot open a directory for writing,
+#. TRANS You cannot open a directory for writing,
 #. TRANS or create or remove hard links to it.
-#: sysdeps/gnu/errlist.c:239
+#: sysdeps/gnu/errlist.c:240
 msgid "Is a directory"
 msgstr "是個目錄"
 
-#. TRANS Invalid argument.  This is used to indicate various kinds of problems
+#. TRANS This is used to indicate various kinds of problems
 #. TRANS with passing the wrong argument to a library function.
-#: sysdeps/gnu/errlist.c:249
+#: sysdeps/gnu/errlist.c:250
 msgid "Invalid argument"
 msgstr "不適用的引數"
 
@@ -5947,20 +5983,20 @@ msgstr "不適用的引數"
 #. TRANS limit that can usually be increased.  If you get this error, you might
 #. TRANS want to increase the @code{RLIMIT_NOFILE} limit or make it unlimited;
 #. TRANS @pxref{Limits on Resources}.
-#: sysdeps/gnu/errlist.c:264
+#: sysdeps/gnu/errlist.c:265
 msgid "Too many open files"
 msgstr "開啟太多檔案"
 
 #. TRANS There are too many distinct file openings in the entire system.  Note
 #. TRANS that any number of linked channels count as just one file opening; see
 #. TRANS @ref{Linked Channels}.  This error never occurs on @gnuhurdsystems{}.
-#: sysdeps/gnu/errlist.c:275
+#: sysdeps/gnu/errlist.c:276
 msgid "Too many open files in system"
 msgstr "系統中太多的開啟檔案"
 
 #. TRANS Inappropriate I/O control operation, such as trying to set terminal
 #. TRANS modes on an ordinary file.
-#: sysdeps/gnu/errlist.c:285
+#: sysdeps/gnu/errlist.c:286
 msgid "Inappropriate ioctl for device"
 msgstr "不希望的裝置輸出入控制 (ioctl)"
 
@@ -5969,51 +6005,51 @@ msgstr "不希望的裝置輸出入控制 (ioctl)"
 #. TRANS debugger to run a program is considered having it open for writing and
 #. TRANS will cause this error.  (The name stands for ``text file busy''.)  This
 #. TRANS is not an error on @gnuhurdsystems{}; the text is copied as necessary.
-#: sysdeps/gnu/errlist.c:298
+#: sysdeps/gnu/errlist.c:299
 msgid "Text file busy"
 msgstr "文字檔忙錄中"
 
-#. TRANS File too big; the size of a file would be larger than allowed by the system.
-#: sysdeps/gnu/errlist.c:307
+#. TRANS The size of a file would be larger than allowed by the system.
+#: sysdeps/gnu/errlist.c:308
 msgid "File too large"
 msgstr "檔案太大"
 
-#. TRANS No space left on device; write operation on a file failed because the
+#. TRANS Write operation on a file failed because the
 #. TRANS disk is full.
-#: sysdeps/gnu/errlist.c:317
+#: sysdeps/gnu/errlist.c:318
 msgid "No space left on device"
 msgstr "裝置上已無多餘空間"
 
 #. TRANS Invalid seek operation (such as on a pipe).
-#: sysdeps/gnu/errlist.c:326
+#: sysdeps/gnu/errlist.c:327
 msgid "Illegal seek"
 msgstr "不合法的搜尋"
 
 #. TRANS An attempt was made to modify something on a read-only file system.
-#: sysdeps/gnu/errlist.c:335
+#: sysdeps/gnu/errlist.c:336
 msgid "Read-only file system"
 msgstr "唯讀的檔案系統"
 
-#. TRANS Too many links; the link count of a single file would become too large.
+#. TRANS The link count of a single file would become too large.
 #. TRANS @code{rename} can cause this error if the file being renamed already has
 #. TRANS as many links as it can take (@pxref{Renaming Files}).
-#: sysdeps/gnu/errlist.c:346
+#: sysdeps/gnu/errlist.c:347
 msgid "Too many links"
 msgstr "太多連結"
 
-#. TRANS Domain error; used by mathematical functions when an argument value does
+#. TRANS Used by mathematical functions when an argument value does
 #. TRANS not fall into the domain over which the function is defined.
-#: sysdeps/gnu/errlist.c:369
+#: sysdeps/gnu/errlist.c:370
 msgid "Numerical argument out of domain"
 msgstr "數值參數的值超出範圍"
 
-#. TRANS Range error; used by mathematical functions when the result value is
+#. TRANS Used by mathematical functions when the result value is
 #. TRANS not representable because of overflow or underflow.
-#: sysdeps/gnu/errlist.c:379
+#: sysdeps/gnu/errlist.c:380
 msgid "Numerical result out of range"
 msgstr "數值運算結果超出範圍"
 
-#. TRANS Resource temporarily unavailable; the call might work if you try again
+#. TRANS The call might work if you try again
 #. TRANS later.  The macro @code{EWOULDBLOCK} is another name for @code{EAGAIN};
 #. TRANS they are always the same in @theglibc{}.
 #. TRANS
@@ -6042,7 +6078,7 @@ msgstr "數值運算結果超出範圍"
 #. TRANS so usually an interactive program should report the error to the user
 #. TRANS and return to its command loop.
 #. TRANS @end itemize
-#: sysdeps/gnu/errlist.c:416
+#: sysdeps/gnu/errlist.c:417
 msgid "Resource temporarily unavailable"
 msgstr "資源暫時無法取得"
 
@@ -6051,7 +6087,7 @@ msgstr "資源暫時無法取得"
 #. TRANS
 #. TRANS C libraries in many older Unix systems have @code{EWOULDBLOCK} as a
 #. TRANS separate error code.
-#: sysdeps/gnu/errlist.c:429
+#: sysdeps/gnu/errlist.c:430
 msgid "Operation would block"
 msgstr "操作將會暫停"
 
@@ -6063,47 +6099,47 @@ msgstr "操作將會暫停"
 #. TRANS the object before the call completes return @code{EALREADY}.  You can
 #. TRANS use the @code{select} function to find out when the pending operation
 #. TRANS has completed; @pxref{Waiting for I/O}.
-#: sysdeps/gnu/errlist.c:445
+#: sysdeps/gnu/errlist.c:446
 msgid "Operation now in progress"
 msgstr "操作正在處理"
 
 #. TRANS An operation is already in progress on an object that has non-blocking
 #. TRANS mode selected.
-#: sysdeps/gnu/errlist.c:455
+#: sysdeps/gnu/errlist.c:456
 msgid "Operation already in progress"
 msgstr "此項操作已在處理中"
 
 #. TRANS A file that isn't a socket was specified when a socket is required.
-#: sysdeps/gnu/errlist.c:464
+#: sysdeps/gnu/errlist.c:465
 msgid "Socket operation on non-socket"
 msgstr "Socket 在非 socket 上運作"
 
 #. TRANS The size of a message sent on a socket was larger than the supported
 #. TRANS maximum size.
-#: sysdeps/gnu/errlist.c:474
+#: sysdeps/gnu/errlist.c:475
 msgid "Message too long"
 msgstr "訊息太長"
 
 #. TRANS The socket type does not support the requested communications protocol.
-#: sysdeps/gnu/errlist.c:483
+#: sysdeps/gnu/errlist.c:484
 msgid "Protocol wrong type for socket"
 msgstr "通訊端的協定錯誤型態"
 
 #. TRANS You specified a socket option that doesn't make sense for the
 #. TRANS particular protocol being used by the socket.  @xref{Socket Options}.
-#: sysdeps/gnu/errlist.c:493
+#: sysdeps/gnu/errlist.c:494
 msgid "Protocol not available"
 msgstr "協定不存在"
 
 #. TRANS The socket domain does not support the requested communications protocol
 #. TRANS (perhaps because the requested protocol is completely invalid).
 #. TRANS @xref{Creating a Socket}.
-#: sysdeps/gnu/errlist.c:504
+#: sysdeps/gnu/errlist.c:505
 msgid "Protocol not supported"
 msgstr "協定不支援"
 
 #. TRANS The socket type is not supported.
-#: sysdeps/gnu/errlist.c:513
+#: sysdeps/gnu/errlist.c:514
 msgid "Socket type not supported"
 msgstr "通訊端型別不支援"
 
@@ -6113,71 +6149,71 @@ msgstr "通訊端型別不支援"
 #. TRANS error can happen for many calls when the object does not support the
 #. TRANS particular operation; it is a generic indication that the server knows
 #. TRANS nothing to do for that call.
-#: sysdeps/gnu/errlist.c:527
+#: sysdeps/gnu/errlist.c:528
 msgid "Operation not supported"
 msgstr "此項操作並不被支援"
 
 #. TRANS The socket communications protocol family you requested is not supported.
-#: sysdeps/gnu/errlist.c:536
+#: sysdeps/gnu/errlist.c:537
 msgid "Protocol family not supported"
 msgstr "協定群組不支援"
 
 #. TRANS The address family specified for a socket is not supported; it is
 #. TRANS inconsistent with the protocol being used on the socket.  @xref{Sockets}.
-#: sysdeps/gnu/errlist.c:546
+#: sysdeps/gnu/errlist.c:547
 msgid "Address family not supported by protocol"
 msgstr "位址族群不被協定所支援"
 
 #. TRANS The requested socket address is already in use.  @xref{Socket Addresses}.
-#: sysdeps/gnu/errlist.c:555
+#: sysdeps/gnu/errlist.c:556
 msgid "Address already in use"
 msgstr "位址已經有在使用"
 
 #. TRANS The requested socket address is not available; for example, you tried
 #. TRANS to give a socket a name that doesn't match the local host name.
 #. TRANS @xref{Socket Addresses}.
-#: sysdeps/gnu/errlist.c:566
+#: sysdeps/gnu/errlist.c:567
 msgid "Cannot assign requested address"
 msgstr "無法指定所需的位址"
 
 #. TRANS A socket operation failed because the network was down.
-#: sysdeps/gnu/errlist.c:575
+#: sysdeps/gnu/errlist.c:576
 msgid "Network is down"
 msgstr "網路停擺"
 
 #. TRANS A socket operation failed because the subnet containing the remote host
 #. TRANS was unreachable.
-#: sysdeps/gnu/errlist.c:585
+#: sysdeps/gnu/errlist.c:586
 msgid "Network is unreachable"
 msgstr "無法接觸網路"
 
 #. TRANS A network connection was reset because the remote host crashed.
-#: sysdeps/gnu/errlist.c:594
+#: sysdeps/gnu/errlist.c:595
 msgid "Network dropped connection on reset"
 msgstr "在重設時網路連線漏失"
 
 #. TRANS A network connection was aborted locally.
-#: sysdeps/gnu/errlist.c:603
+#: sysdeps/gnu/errlist.c:604
 msgid "Software caused connection abort"
 msgstr "軟體造成連線中斷"
 
 #. TRANS A network connection was closed for reasons outside the control of the
 #. TRANS local host, such as by the remote machine rebooting or an unrecoverable
 #. TRANS protocol violation.
-#: sysdeps/gnu/errlist.c:614
+#: sysdeps/gnu/errlist.c:615
 msgid "Connection reset by peer"
 msgstr "連線被對方重設"
 
 #. TRANS The kernel's buffers for I/O operations are all in use.  In GNU, this
 #. TRANS error is always synonymous with @code{ENOMEM}; you may get one or the
 #. TRANS other from network operations.
-#: sysdeps/gnu/errlist.c:625
+#: sysdeps/gnu/errlist.c:626
 msgid "No buffer space available"
 msgstr "沒有可用的緩衝空間了"
 
 #. TRANS You tried to connect a socket that is already connected.
 #. TRANS @xref{Connecting}.
-#: sysdeps/gnu/errlist.c:635
+#: sysdeps/gnu/errlist.c:636
 msgid "Transport endpoint is already connected"
 msgstr "傳輸的兩端已經完成連線了"
 
@@ -6185,23 +6221,22 @@ msgstr "傳輸的兩端已經完成連線了"
 #. TRANS try to transmit data over a socket, without first specifying a
 #. TRANS destination for the data.  For a connectionless socket (for datagram
 #. TRANS protocols, such as UDP), you get @code{EDESTADDRREQ} instead.
-#: sysdeps/gnu/errlist.c:647
+#: sysdeps/gnu/errlist.c:648
 msgid "Transport endpoint is not connected"
 msgstr "傳輸的兩端尚未連線"
 
 #. TRANS No default destination address was set for the socket.  You get this
 #. TRANS error when you try to transmit data over a connectionless socket,
 #. TRANS without first specifying a destination for the data with @code{connect}.
-#: sysdeps/gnu/errlist.c:658
+#: sysdeps/gnu/errlist.c:659
 msgid "Destination address required"
 msgstr "需要目標位址"
 
 #. TRANS The socket has already been shut down.
-#: sysdeps/gnu/errlist.c:667
+#: sysdeps/gnu/errlist.c:668
 msgid "Cannot send after transport endpoint shutdown"
 msgstr "無法在輸送端點關閉後傳送"
 
-#. TRANS ???
 #: sysdeps/gnu/errlist.c:676
 msgid "Too many references: cannot splice"
 msgstr "太多的參考指標: 無法連接"
@@ -6265,7 +6300,7 @@ msgstr "太多使用者"
 msgid "Disk quota exceeded"
 msgstr "磁碟配額已滿"
 
-#. TRANS Stale file handle.  This indicates an internal confusion in the
+#. TRANS This indicates an internal confusion in the
 #. TRANS file system which is due to file system rearrangements on the server host
 #. TRANS for NFS file systems or corruption in other file systems.
 #. TRANS Repairing this condition usually requires unmounting, possibly repairing
@@ -6282,68 +6317,61 @@ msgstr "過舊的檔案控柄"
 msgid "Object is remote"
 msgstr "目標檔案位於遠端"
 
-#. TRANS ???
-#: sysdeps/gnu/errlist.c:809
+#: sysdeps/gnu/errlist.c:808
 msgid "RPC struct is bad"
 msgstr "RPC 結構是壞的"
 
-#. TRANS ???
-#: sysdeps/gnu/errlist.c:818
+#: sysdeps/gnu/errlist.c:816
 msgid "RPC version wrong"
 msgstr "RPC 版本錯誤"
 
-#. TRANS ???
-#: sysdeps/gnu/errlist.c:827
+#: sysdeps/gnu/errlist.c:824
 msgid "RPC program not available"
 msgstr "RPC 程式不存在"
 
-#. TRANS ???
-#: sysdeps/gnu/errlist.c:836
+#: sysdeps/gnu/errlist.c:832
 msgid "RPC program version wrong"
 msgstr "RPC 程式版本錯誤"
 
-#. TRANS ???
-#: sysdeps/gnu/errlist.c:845
+#: sysdeps/gnu/errlist.c:840
 msgid "RPC bad procedure for program"
 msgstr "程式的 RPC 程序錯誤"
 
-#. TRANS No locks available.  This is used by the file locking facilities; see
+#. TRANS This is used by the file locking facilities; see
 #. TRANS @ref{File Locks}.  This error is never generated by @gnuhurdsystems{}, but
 #. TRANS it can result from an operation to an NFS server running another
 #. TRANS operating system.
-#: sysdeps/gnu/errlist.c:857
+#: sysdeps/gnu/errlist.c:852
 msgid "No locks available"
 msgstr "無法鎖定資料"
 
-#. TRANS Inappropriate file type or format.  The file was the wrong type for the
+#. TRANS The file was the wrong type for the
 #. TRANS operation, or a data file had the wrong format.
 #. TRANS
 #. TRANS On some systems @code{chmod} returns this error if you try to set the
 #. TRANS sticky bit on a non-directory file; @pxref{Setting Permissions}.
-#: sysdeps/gnu/errlist.c:870
+#: sysdeps/gnu/errlist.c:865
 msgid "Inappropriate file type or format"
 msgstr "不希望的檔案型態或格式"
 
-#. TRANS ???
-#: sysdeps/gnu/errlist.c:879
+#: sysdeps/gnu/errlist.c:873
 msgid "Authentication error"
 msgstr "鑑定錯誤"
 
-#. TRANS ???
-#: sysdeps/gnu/errlist.c:888
+#: sysdeps/gnu/errlist.c:881
 msgid "Need authenticator"
 msgstr "需要認證"
 
-#. TRANS Function not implemented.  This indicates that the function called is
+#. TRANS This indicates that the function called is
 #. TRANS not implemented at all, either in the C library itself or in the
 #. TRANS operating system.  When you get this error, you can be sure that this
 #. TRANS particular function will always fail with @code{ENOSYS} unless you
 #. TRANS install a new version of the C library or the operating system.
-#: sysdeps/gnu/errlist.c:901
+#: sysdeps/gnu/errlist.c:894
 msgid "Function not implemented"
 msgstr "功能沒有實作"
 
-#. TRANS Not supported.  A function returns this error when certain parameter
+#. TRANS A function returns this error when certain parameter
 #. TRANS values are valid, but the functionality they request is not available.
 #. TRANS This can mean that the function does not implement a particular command
 #. TRANS or option value or flag bit at all.  For functions that operate on some
@@ -6355,13 +6383,13 @@ msgstr "功能沒有實作"
 #. TRANS
 #. TRANS If the entire function is not available at all in the implementation,
 #. TRANS it returns @code{ENOSYS} instead.
-#: sysdeps/gnu/errlist.c:921
+#: sysdeps/gnu/errlist.c:914
 msgid "Not supported"
 msgstr "並未支援"
 
 #. TRANS While decoding a multibyte character the function came along an invalid
 #. TRANS or an incomplete sequence of bytes or the given wide character is invalid.
-#: sysdeps/gnu/errlist.c:931
+#: sysdeps/gnu/errlist.c:924
 msgid "Invalid or incomplete multibyte or wide character"
 msgstr "不適用或不完整的多位元組字元或寬字元"
 
@@ -6371,26 +6399,26 @@ msgstr "不適用或不完整的多位元組字元或寬字元"
 #. TRANS error because functions such as @code{read} and @code{write} translate
 #. TRANS it into a @code{SIGTTIN} or @code{SIGTTOU} signal.  @xref{Job Control},
 #. TRANS for information on process groups and these signals.
-#: sysdeps/gnu/errlist.c:945
+#: sysdeps/gnu/errlist.c:938
 msgid "Inappropriate operation for background process"
 msgstr "不希望的背景行程運作"
 
 #. TRANS On @gnuhurdsystems{}, opening a file returns this error when the file is
 #. TRANS translated by a program and the translator program dies while starting
 #. TRANS up, before it has connected to the file.
-#: sysdeps/gnu/errlist.c:956
+#: sysdeps/gnu/errlist.c:949
 msgid "Translator died"
 msgstr "中介程式已經結束"
 
 #. TRANS The experienced user will know what is wrong.
 #. TRANS @c This error code is a joke.  Its perror text is part of the joke.
 #. TRANS @c Don't change it.
-#: sysdeps/gnu/errlist.c:967
+#: sysdeps/gnu/errlist.c:960
 msgid "?"
 msgstr "?"
 
 #. TRANS You did @strong{what}?
-#: sysdeps/gnu/errlist.c:976
+#: sysdeps/gnu/errlist.c:969
 msgid "You really blew it this time"
 msgstr "這次真的被您打敗了"
 
@@ -6427,252 +6455,252 @@ msgstr "這次真的被您打敗了"
 # 簡單的說，兒歌 "唐老先生有塊地..."，然後呢?? ;-p
 #
 #. TRANS Go home and have a glass of warm, dairy-fresh milk.
-#: sysdeps/gnu/errlist.c:985
+#: sysdeps/gnu/errlist.c:978
 msgid "Computer bought the farm"
 msgstr "這臺電腦買了一塊地囉"
 
 #. TRANS This error code has no purpose.
-#: sysdeps/gnu/errlist.c:994
+#: sysdeps/gnu/errlist.c:987
 msgid "Gratuitous error"
 msgstr "無故的錯誤"
 
-#: sysdeps/gnu/errlist.c:1002
+#: sysdeps/gnu/errlist.c:995
 msgid "Bad message"
 msgstr "錯誤的訊息"
 
-#: sysdeps/gnu/errlist.c:1010
+#: sysdeps/gnu/errlist.c:1003
 msgid "Identifier removed"
 msgstr "識別符號移除"
 
-#: sysdeps/gnu/errlist.c:1018
+#: sysdeps/gnu/errlist.c:1011
 msgid "Multihop attempted"
 msgstr "嘗試 Multihop"
 
-#: sysdeps/gnu/errlist.c:1026
+#: sysdeps/gnu/errlist.c:1019
 msgid "No data available"
 msgstr "沒有可用的資料"
 
-#: sysdeps/gnu/errlist.c:1034
+#: sysdeps/gnu/errlist.c:1027
 msgid "Link has been severed"
 msgstr "連結已有服務"
 
-#: sysdeps/gnu/errlist.c:1042
+#: sysdeps/gnu/errlist.c:1035
 msgid "No message of desired type"
 msgstr "沒有符合需求格式的訊息"
 
-#: sysdeps/gnu/errlist.c:1050
+#: sysdeps/gnu/errlist.c:1043
 msgid "Out of streams resources"
 msgstr "所有資料流的資源都已用盡"
 
-#: sysdeps/gnu/errlist.c:1058
+#: sysdeps/gnu/errlist.c:1051
 msgid "Device not a stream"
 msgstr "裝置不是資料流"
 
-#: sysdeps/gnu/errlist.c:1066
+#: sysdeps/gnu/errlist.c:1059
 msgid "Value too large for defined data type"
 msgstr "有定義的資料型別值太大"
 
-#: sysdeps/gnu/errlist.c:1074
+#: sysdeps/gnu/errlist.c:1067
 msgid "Protocol error"
 msgstr "協定錯誤"
 
-#: sysdeps/gnu/errlist.c:1082
+#: sysdeps/gnu/errlist.c:1075
 msgid "Timer expired"
 msgstr "計時器已逾時"
 
-#. TRANS Operation canceled; an asynchronous operation was canceled before it
+#. TRANS An asynchronous operation was canceled before it
 #. TRANS completed.  @xref{Asynchronous I/O}.  When you call @code{aio_cancel},
 #. TRANS the normal result is for the operations affected to complete with this
 #. TRANS error; @pxref{Cancel AIO Operations}.
-#: sysdeps/gnu/errlist.c:1094
+#: sysdeps/gnu/errlist.c:1087
 msgid "Operation canceled"
 msgstr "操作已被取消"
 
-#: sysdeps/gnu/errlist.c:1102
+#: sysdeps/gnu/errlist.c:1095
+msgid "Owner died"
+msgstr "擁有者已消逝"
+
+#: sysdeps/gnu/errlist.c:1103
+msgid "State not recoverable"
+msgstr "狀態無法回復"
+
+#: sysdeps/gnu/errlist.c:1111
 msgid "Interrupted system call should be restarted"
 msgstr "中斷的系統呼叫必須重新啟動"
 
-#: sysdeps/gnu/errlist.c:1110
+#: sysdeps/gnu/errlist.c:1119
 msgid "Channel number out of range"
 msgstr "通道號碼超出範圍"
 
-#: sysdeps/gnu/errlist.c:1118
+#: sysdeps/gnu/errlist.c:1127
 msgid "Level 2 not synchronized"
 msgstr "層級 2 沒有同步"
 
-#: sysdeps/gnu/errlist.c:1126
+#: sysdeps/gnu/errlist.c:1135
 msgid "Level 3 halted"
 msgstr "層級 3 停止"
 
-#: sysdeps/gnu/errlist.c:1134
+#: sysdeps/gnu/errlist.c:1143
 msgid "Level 3 reset"
 msgstr "層級 3 重設"
 
-#: sysdeps/gnu/errlist.c:1142
+#: sysdeps/gnu/errlist.c:1151
 msgid "Link number out of range"
 msgstr "連結數目超過範圍"
 
-#: sysdeps/gnu/errlist.c:1150
+#: sysdeps/gnu/errlist.c:1159
 msgid "Protocol driver not attached"
 msgstr "協定的驅動程式未連接"
 
-#: sysdeps/gnu/errlist.c:1158
+#: sysdeps/gnu/errlist.c:1167
 msgid "No CSI structure available"
 msgstr "沒有可用的 CSI 結構了"
 
-#: sysdeps/gnu/errlist.c:1166
+#: sysdeps/gnu/errlist.c:1175
 msgid "Level 2 halted"
 msgstr "層級 2 停止"
 
-#: sysdeps/gnu/errlist.c:1174
+#: sysdeps/gnu/errlist.c:1183
 msgid "Invalid exchange"
 msgstr "不適用的交換"
 
-#: sysdeps/gnu/errlist.c:1182
+#: sysdeps/gnu/errlist.c:1191
 msgid "Invalid request descriptor"
 msgstr "不適用的請求敘述項"
 
-#: sysdeps/gnu/errlist.c:1190
+#: sysdeps/gnu/errlist.c:1199
 msgid "Exchange full"
 msgstr "交換已滿"
 
-#: sysdeps/gnu/errlist.c:1198
+#: sysdeps/gnu/errlist.c:1207
 msgid "No anode"
 msgstr "沒有 anode"
 
-#: sysdeps/gnu/errlist.c:1206
+#: sysdeps/gnu/errlist.c:1215
 msgid "Invalid request code"
 msgstr "不適用的請求碼"
 
-#: sysdeps/gnu/errlist.c:1214
+#: sysdeps/gnu/errlist.c:1223
 msgid "Invalid slot"
 msgstr "不適用的 slot"
 
-#: sysdeps/gnu/errlist.c:1222
+#: sysdeps/gnu/errlist.c:1231
 msgid "File locking deadlock error"
 msgstr "檔案鎖定停頓錯誤"
 
-#: sysdeps/gnu/errlist.c:1230
+#: sysdeps/gnu/errlist.c:1239
 msgid "Bad font file format"
 msgstr "錯誤的字型檔格式"
 
-#: sysdeps/gnu/errlist.c:1238
+#: sysdeps/gnu/errlist.c:1247
 msgid "Machine is not on the network"
 msgstr "機器不在網路中"
 
-#: sysdeps/gnu/errlist.c:1246
+#: sysdeps/gnu/errlist.c:1255
 msgid "Package not installed"
 msgstr "套件並未安裝"
 
-#: sysdeps/gnu/errlist.c:1254
+#: sysdeps/gnu/errlist.c:1263
 msgid "Advertise error"
 msgstr "通知錯誤"
 
-#: sysdeps/gnu/errlist.c:1262
+#: sysdeps/gnu/errlist.c:1271
 msgid "Srmount error"
 msgstr "Srmount 錯誤"
 
-#: sysdeps/gnu/errlist.c:1270
+#: sysdeps/gnu/errlist.c:1279
 msgid "Communication error on send"
 msgstr "在傳送時通訊錯誤"
 
-#: sysdeps/gnu/errlist.c:1278
+#: sysdeps/gnu/errlist.c:1287
 msgid "RFS specific error"
 msgstr "RFS 特定錯誤"
 
-#: sysdeps/gnu/errlist.c:1286
+#: sysdeps/gnu/errlist.c:1295
 msgid "Name not unique on network"
 msgstr "網路上的名稱不是唯一的"
 
-#: sysdeps/gnu/errlist.c:1294
+#: sysdeps/gnu/errlist.c:1303
 msgid "File descriptor in bad state"
 msgstr "檔案敘述項處於錯誤狀態"
 
-#: sysdeps/gnu/errlist.c:1302
+#: sysdeps/gnu/errlist.c:1311
 msgid "Remote address changed"
 msgstr "遠端位址改變了"
 
-#: sysdeps/gnu/errlist.c:1310
+#: sysdeps/gnu/errlist.c:1319
 msgid "Can not access a needed shared library"
 msgstr "無法存取所需的分享函式庫"
 
-#: sysdeps/gnu/errlist.c:1318
+#: sysdeps/gnu/errlist.c:1327
 msgid "Accessing a corrupted shared library"
 msgstr "存取一個毀掉的分享函式庫"
 
-#: sysdeps/gnu/errlist.c:1326
+#: sysdeps/gnu/errlist.c:1335
 msgid ".lib section in a.out corrupted"
 msgstr "a.out 中 .lib 區段毀掉了"
 
-#: sysdeps/gnu/errlist.c:1334
+#: sysdeps/gnu/errlist.c:1343
 msgid "Attempting to link in too many shared libraries"
 msgstr "嘗試去連結太多的分享資料庫"
 
-#: sysdeps/gnu/errlist.c:1342
+#: sysdeps/gnu/errlist.c:1351
 msgid "Cannot exec a shared library directly"
 msgstr "不能直接執行一個分享函式庫"
 
-#: sysdeps/gnu/errlist.c:1350
+#: sysdeps/gnu/errlist.c:1359
 msgid "Streams pipe error"
 msgstr "資料流管線錯誤"
 
-#: sysdeps/gnu/errlist.c:1358
+#: sysdeps/gnu/errlist.c:1367
 msgid "Structure needs cleaning"
 msgstr "結構需要清理"
 
-#: sysdeps/gnu/errlist.c:1366
+#: sysdeps/gnu/errlist.c:1375
 msgid "Not a XENIX named type file"
 msgstr "並非 XENIX 命名格式的檔案"
 
-#: sysdeps/gnu/errlist.c:1374
+#: sysdeps/gnu/errlist.c:1383
 msgid "No XENIX semaphores available"
 msgstr "沒有可用的 XENIX 信號標誌了"
 
-#: sysdeps/gnu/errlist.c:1382
+#: sysdeps/gnu/errlist.c:1391
 msgid "Is a named type file"
 msgstr "是個具名的型態檔案"
 
-#: sysdeps/gnu/errlist.c:1390
+#: sysdeps/gnu/errlist.c:1399
 msgid "Remote I/O error"
 msgstr "遠端輸出入錯誤"
 
-#: sysdeps/gnu/errlist.c:1398
+#: sysdeps/gnu/errlist.c:1407
 msgid "No medium found"
 msgstr "找不到媒體"
 
-#: sysdeps/gnu/errlist.c:1406
+#: sysdeps/gnu/errlist.c:1415
 msgid "Wrong medium type"
 msgstr "錯誤的媒體型態"
 
-#: sysdeps/gnu/errlist.c:1414
+#: sysdeps/gnu/errlist.c:1423
 msgid "Required key not available"
 msgstr "必要鍵值無法使用"
 
-#: sysdeps/gnu/errlist.c:1422
+#: sysdeps/gnu/errlist.c:1431
 msgid "Key has expired"
 msgstr "鍵值已過期"
 
-#: sysdeps/gnu/errlist.c:1430
+#: sysdeps/gnu/errlist.c:1439
 msgid "Key has been revoked"
 msgstr "鍵值已取消"
 
-#: sysdeps/gnu/errlist.c:1438
+#: sysdeps/gnu/errlist.c:1447
 msgid "Key was rejected by service"
 msgstr "鍵值被服務所拒絕"
 
-#: sysdeps/gnu/errlist.c:1446
-msgid "Owner died"
-msgstr "擁有者已消逝"
-
-#: sysdeps/gnu/errlist.c:1454
-msgid "State not recoverable"
-msgstr "狀態無法回復"
-
-#: sysdeps/gnu/errlist.c:1462
+#: sysdeps/gnu/errlist.c:1455
 msgid "Operation not possible due to RF-kill"
 msgstr "由於 RF-kill 而無法操作"
 
-#: sysdeps/gnu/errlist.c:1470
+#: sysdeps/gnu/errlist.c:1463
 msgid "Memory page has hardware error"
 msgstr "記憶體分頁有硬體錯誤"
 
@@ -6753,6 +6781,11 @@ msgstr "參數字串無法正確編碼"
 msgid "%s is for unknown machine %d.\n"
 msgstr "%s 是給未知的機器 %d。\n"
 
+#: sysdeps/unix/sysv/linux/ia64/makecontext.c:58
+#, 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
 #, c-format
 msgid ""
@@ -6772,76 +6805,123 @@ msgstr "無法開啟 `%s'"
 msgid "cannot read header from `%s'"
 msgstr "無法從 `%s' 讀取標頭資料"
 
-#: timezone/zdump.c:246
-msgid "lacks alphabetic at start"
-msgstr "lacks 字母順序於開始"
+#: sysdeps/x86/dl-cet.c:202
+msgid "mprotect legacy bitmap failed"
+msgstr ""
 
-#: timezone/zdump.c:248
-msgid "has fewer than 3 alphabetics"
+#: sysdeps/x86/dl-cet.c:217
+#, fuzzy
+#| msgid "Data input available"
+msgid "legacy bitmap isn't available"
+msgstr "資料輸入可用"
+
+#: sysdeps/x86/dl-cet.c:247
+#, fuzzy
+#| msgid "failed to start conversion processing"
+msgid "failed to mark legacy code region"
+msgstr "開始轉換程序失敗"
+
+#: sysdeps/x86/dl-cet.c:269
+msgid "shadow stack isn't enabled"
+msgstr ""
+
+#: sysdeps/x86/dl-cet.c:290
+msgid "can't disable CET"
+msgstr ""
+
+#: timezone/zdump.c:338
+#, fuzzy
+#| msgid "has fewer than 3 alphabetics"
+msgid "has fewer than 3 characters"
 msgstr "有更少的比 3 字母順序"
 
-#: timezone/zdump.c:250
-msgid "has more than 6 alphabetics"
+#: timezone/zdump.c:340
+#, fuzzy
+#| msgid "has more than 6 alphabetics"
+msgid "has more than 6 characters"
 msgstr "有超過 6 字母順序"
 
-#: timezone/zdump.c:258
-msgid "differs from POSIX standard"
-msgstr "differs 從 POSIX 標準"
+#: timezone/zdump.c:342
+msgid "has characters other than ASCII alphanumerics, '-' or '+'"
+msgstr ""
 
-#: timezone/zdump.c:264
+#: timezone/zdump.c:347
 #, c-format
 msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"
 msgstr "%s: 警告：區域「%s」縮寫「%s」%s\n"
 
-#: timezone/zdump.c:273
+#: timezone/zdump.c:393
 #, c-format
 msgid ""
-"%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"
+"%s: usage: %s OPTIONS ZONENAME ...\n"
+"Options include:\n"
+"  -c [L,]U   Start at year L (default -500), end before year U (default 2500)\n"
+"  -t [L,]U   Start at time L, end before time U (in seconds since 1970)\n"
+"  -i         List transitions briefly (format is experimental)\n"
+"  -v         List transitions verbosely\n"
+"  -V         List transitions a bit less verbosely\n"
+"  --help     Output this help\n"
+"  --version  Output version info\n"
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"%s：用法為 %s [--version] [--help] [-v] [-c [低年分,]高年分 ] 區域名稱 ...\n"
-"\n"
-"將錯誤通報給 %s。\n"
 
-#: timezone/zdump.c:340
+#: timezone/zdump.c:479
 #, c-format
 msgid "%s: wild -c argument %s\n"
 msgstr "%s: wild -c 引數 %s\n"
 
-#: timezone/zdump.c:426
-msgid "Error writing to standard output"
-msgstr "寫入標準輸出時錯誤"
-
-#: timezone/zdump.c:439
-#, c-format
-msgid "%s: use of -v on system with floating time_t other than float or double\n"
-msgstr "%s: 使用 -v 於具備浮點數 time_t 的系統而非浮點數或雙倍精度\n"
+#: timezone/zdump.c:512
+#, fuzzy, c-format
+#| msgid "%s: wild -c argument %s\n"
+msgid "%s: wild -t argument %s\n"
+msgstr "%s: wild -c 引數 %s\n"
 
-#: timezone/zic.c:361
+#: timezone/zic.c:398
 #, c-format
 msgid "%s: Memory exhausted: %s\n"
 msgstr "%s: 記憶體已用完: %s\n"
 
-#: timezone/zic.c:401
-#, c-format
-msgid "\"%s\", line %d: %s"
+#: timezone/zic.c:406
+#, fuzzy
+#| msgid "time overflow"
+msgid "size overflow"
+msgstr "時間溢位"
+
+#: timezone/zic.c:454
+#, fuzzy
+#| msgid "Integer overflow"
+msgid "integer overflow"
+msgstr "整數溢位"
+
+#: timezone/zic.c:488
+#, fuzzy, c-format
+#| msgid "\"%s\", line %d: %s"
+msgid "\"%s\", line %<PRIdMAX>: "
 msgstr "\"%s\", 第 %d 列: %s"
 
-#: timezone/zic.c:404
-#, c-format
-msgid " (rule from \"%s\", line %d)"
+#: timezone/zic.c:491
+#, fuzzy, c-format
+#| msgid " (rule from \"%s\", line %d)"
+msgid " (rule from \"%s\", line %<PRIdMAX>)"
 msgstr " (規則來自 \"%s\", 第 %d 列)"
 
-#: timezone/zic.c:415
+#: timezone/zic.c:510
+#, c-format
 msgid "warning: "
 msgstr "警告: "
 
-#: timezone/zic.c:425
-#, c-format
+#: timezone/zic.c:535
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: usage is %s [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
+#| "\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
+#| "\n"
+#| "Report bugs to %s.\n"
 msgid ""
-"%s: usage is %s [ --version ] [ --help ] [ -v ] [ -l localtime ] [ -p posixrules ] \\\n"
-"\t[ -d directory ] [ -L leapseconds ] [ -y yearistype ] [ filename ... ]\n"
+"%s: usage is %s [ --version ] [ --help ] [ -v ] \\\n"
+"\t[ -l localtime ] [ -p posixrules ] [ -d directory ] \\\n"
+"\t[ -L leapseconds ] [ filename ... ]\n"
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
@@ -6850,335 +6930,579 @@ msgstr ""
 "\n"
 "將錯誤通報給 %s。\n"
 
-#: timezone/zic.c:460
+#: timezone/zic.c:558
+#, fuzzy, c-format
+#| msgid "%s: Can't create %s: %s\n"
+msgid "%s: Can't chdir to %s: %s\n"
+msgstr "%s: 無法產生 %s: %s\n"
+
+#: timezone/zic.c:590
 msgid "wild compilation-time specification of zic_t"
 msgstr "zic_t 的萬用編譯時間規格"
 
-#: timezone/zic.c:479
+#: timezone/zic.c:610
 #, c-format
 msgid "%s: More than one -d option specified\n"
 msgstr "%s: 您使用了超過一個 -d 選項\n"
 
-#: timezone/zic.c:489
+#: timezone/zic.c:620
 #, c-format
 msgid "%s: More than one -l option specified\n"
 msgstr "%s: 您使用了超過一個 -l 選項\n"
 
-#: timezone/zic.c:499
+#: timezone/zic.c:630
 #, c-format
 msgid "%s: More than one -p option specified\n"
 msgstr "%s: 您使用了超過一個 -p 選項\n"
 
-#: timezone/zic.c:509
+#: timezone/zic.c:640
 #, c-format
 msgid "%s: More than one -y option specified\n"
 msgstr "%s: 您使用了超過一個 -y 選項\n"
 
-#: timezone/zic.c:519
+#: timezone/zic.c:650
 #, c-format
 msgid "%s: More than one -L option specified\n"
 msgstr "%s: 您使用了超過一個 -L 選項\n"
 
-#: timezone/zic.c:566
+#: timezone/zic.c:659
+msgid "-s ignored"
+msgstr ""
+
+#: timezone/zic.c:698
 msgid "link to link"
 msgstr "連結到連結"
 
-#: timezone/zic.c:629
-msgid "hard link failed, symbolic link used"
-msgstr "實體連結失敗，使用符號連結代替"
+#: timezone/zic.c:701 timezone/zic.c:705
+#, fuzzy
+#| msgid "Too many links"
+msgid "command line"
+msgstr "太多連結"
+
+#: timezone/zic.c:721
+msgid "empty file name"
+msgstr ""
+
+#: timezone/zic.c:724
+#, c-format
+msgid "file name '%s' begins with '/'"
+msgstr ""
 
-#: timezone/zic.c:637
+#: timezone/zic.c:734
 #, c-format
-msgid "%s: Can't link from %s to %s: %s\n"
+msgid "file name '%s' contains '%.*s' component"
+msgstr ""
+
+#: timezone/zic.c:740
+#, c-format
+msgid "file name '%s' component contains leading '-'"
+msgstr ""
+
+#: timezone/zic.c:743
+#, c-format
+msgid "file name '%s' contains overlength component '%.*s...'"
+msgstr ""
+
+#: timezone/zic.c:771
+#, c-format
+msgid "file name '%s' contains byte '%c'"
+msgstr ""
+
+#: timezone/zic.c:772
+#, c-format
+msgid "file name '%s' contains byte '\\%o'"
+msgstr ""
+
+#: timezone/zic.c:842
+#, fuzzy, c-format
+#| msgid "%s: Can't link from %s to %s: %s\n"
+msgid "%s: link from %s/%s failed: %s\n"
 msgstr "%s: 無法從 %s 連結到 %s: %s\n"
 
-#: timezone/zic.c:697 timezone/zic.c:699
+#: timezone/zic.c:852 timezone/zic.c:1815
+#, fuzzy, c-format
+#| msgid "%s: Can't remove %s: %s\n"
+msgid "%s: Can't remove %s/%s: %s\n"
+msgstr "%s: 無法移除 %s: %s\n"
+
+#: timezone/zic.c:874
+#, c-format
+msgid "symbolic link used because hard link failed: %s"
+msgstr ""
+
+#: timezone/zic.c:882
+#, fuzzy, c-format
+#| msgid "%s: Can't create %s: %s\n"
+msgid "%s: Can't read %s/%s: %s\n"
+msgstr "%s: 無法產生 %s: %s\n"
+
+#: timezone/zic.c:889 timezone/zic.c:1828
+#, fuzzy, c-format
+#| msgid "%s: Can't create %s: %s\n"
+msgid "%s: Can't create %s/%s: %s\n"
+msgstr "%s: 無法產生 %s: %s\n"
+
+#: timezone/zic.c:898
+#, c-format
+msgid "copy used because hard link failed: %s"
+msgstr ""
+
+#: timezone/zic.c:901
+#, c-format
+msgid "copy used because symbolic link failed: %s"
+msgstr ""
+
+#: timezone/zic.c:1013 timezone/zic.c:1015
 msgid "same rule name in multiple files"
 msgstr "在多個檔案裡面有相同的規則名稱"
 
-#: timezone/zic.c:740
+#: timezone/zic.c:1056
 msgid "unruly zone"
 msgstr "沒有規則的時區"
 
-#: timezone/zic.c:747
+#: timezone/zic.c:1063
 #, c-format
 msgid "%s in ruleless zone"
 msgstr "%s 在沒有規則的區段"
 
-#: timezone/zic.c:767
+#: timezone/zic.c:1083
 msgid "standard input"
 msgstr "標準輸入"
 
-#: timezone/zic.c:772
+#: timezone/zic.c:1088
 #, c-format
 msgid "%s: Can't open %s: %s\n"
 msgstr "%s: 無法開啟 %s: %s\n"
 
-#: timezone/zic.c:783
+#: timezone/zic.c:1099
 msgid "line too long"
 msgstr "列的長度過長"
 
-#: timezone/zic.c:803
+#: timezone/zic.c:1119
 msgid "input line of unknown type"
 msgstr "不明型別的輸入列"
 
-#: timezone/zic.c:819
-#, c-format
-msgid "%s: Leap line in non leap seconds file %s\n"
+#: timezone/zic.c:1134
+#, fuzzy, c-format
+#| msgid "%s: Leap line in non leap seconds file %s\n"
+msgid "%s: Leap line in non leap seconds file %s"
 msgstr "%s: 閏時設定列出現在不含閏秒的設定檔 %s 中\n"
 
-#: timezone/zic.c:826 timezone/zic.c:1243 timezone/zic.c:1265
+#: timezone/zic.c:1142 timezone/zic.c:1547 timezone/zic.c:1569
 #, c-format
 msgid "%s: panic: Invalid l_value %d\n"
 msgstr "%s: 嚴重錯誤: 錯誤的 l_value %d\n"
 
-#: timezone/zic.c:834
-#, c-format
-msgid "%s: Error reading %s\n"
-msgstr "%s: 讀取錯誤 %s\n"
-
-#: timezone/zic.c:841
-#, c-format
-msgid "%s: Error closing %s: %s\n"
-msgstr "%s: 關閉錯誤 %s: %s\n"
-
-#: timezone/zic.c:846
+#: timezone/zic.c:1151
 msgid "expected continuation line not found"
 msgstr "找不到預期的接續列"
 
-#: timezone/zic.c:887 timezone/zic.c:2413 timezone/zic.c:2427
+#: timezone/zic.c:1193 timezone/zic.c:2976
 msgid "time overflow"
 msgstr "時間溢位"
 
-#: timezone/zic.c:891
-msgid "24:00 not handled by pre-1998 versions of zic"
-msgstr "24:00 無法由早於 1998 的 zic 版本所處理"
-
-#: timezone/zic.c:894
+#: timezone/zic.c:1198
 msgid "values over 24 hours not handled by pre-2007 versions of zic"
 msgstr "24 小時以上的值無法由早於 2007 的 zic 版本所處理"
 
-#: timezone/zic.c:905
+#: timezone/zic.c:1209
 msgid "wrong number of fields on Rule line"
 msgstr "規則設定列的欄位數目錯誤"
 
-#: timezone/zic.c:909
+#: timezone/zic.c:1213
 msgid "nameless rule"
 msgstr "沒有名稱的規則"
 
-#: timezone/zic.c:914
+#: timezone/zic.c:1218
 msgid "invalid saved time"
 msgstr "無效的節約時間"
 
-#: timezone/zic.c:932
+#: timezone/zic.c:1235
 msgid "wrong number of fields on Zone line"
 msgstr "時區設定列的欄位數目錯誤"
 
-#: timezone/zic.c:938
+#: timezone/zic.c:1240
 #, c-format
 msgid "\"Zone %s\" line and -l option are mutually exclusive"
 msgstr "\"區段 %s\" 列和 -l 選項是互斥的"
 
-#: timezone/zic.c:946
+#: timezone/zic.c:1246
 #, c-format
 msgid "\"Zone %s\" line and -p option are mutually exclusive"
 msgstr "\"區段 %s\" 列和 -p 選項是互斥的"
 
-#: timezone/zic.c:958
-#, c-format
-msgid "duplicate zone name %s (file \"%s\", line %d)"
+#: timezone/zic.c:1253
+#, fuzzy, c-format
+#| msgid "duplicate zone name %s (file \"%s\", line %d)"
+msgid "duplicate zone name %s (file \"%s\", line %<PRIdMAX>)"
 msgstr "複製時區名稱 %s (檔案 \"%s\", 第 %d 列)"
 
-#: timezone/zic.c:972
+#: timezone/zic.c:1267
 msgid "wrong number of fields on Zone continuation line"
 msgstr "時區接續列的欄位數目不對"
 
-#: timezone/zic.c:1009
-msgid "invalid UTC offset"
+#: timezone/zic.c:1307
+#, fuzzy
+#| msgid "invalid UTC offset"
+msgid "invalid UT offset"
 msgstr "無效的 UTC 位移值"
 
-#: timezone/zic.c:1012
+#: timezone/zic.c:1311
 msgid "invalid abbreviation format"
 msgstr "無效的縮寫格式"
 
-#: timezone/zic.c:1041
+#: timezone/zic.c:1320
+#, fuzzy, c-format
+#| msgid "24:00 not handled by pre-1998 versions of zic"
+msgid "format '%s' not handled by pre-2015 versions of zic"
+msgstr "24:00 無法由早於 1998 的 zic 版本所處理"
+
+#: timezone/zic.c:1347
 msgid "Zone continuation line end time is not after end time of previous line"
 msgstr "時區接續列的結束時間不在上一列的結束時間之後"
 
-#: timezone/zic.c:1066
+#: timezone/zic.c:1374
 msgid "wrong number of fields on Leap line"
 msgstr "閏時設定列的欄位數目錯誤"
 
-#: timezone/zic.c:1075
+#: timezone/zic.c:1383
 msgid "invalid leaping year"
 msgstr "無效的閏年"
 
-#: timezone/zic.c:1095 timezone/zic.c:1197
+#: timezone/zic.c:1403 timezone/zic.c:1501
 msgid "invalid month name"
 msgstr "無效的月分名稱"
 
-#: timezone/zic.c:1108 timezone/zic.c:1310 timezone/zic.c:1324
+#: timezone/zic.c:1416 timezone/zic.c:1614 timezone/zic.c:1628
 msgid "invalid day of month"
 msgstr "無效的日期數字"
 
-#: timezone/zic.c:1113
-msgid "time before zero"
-msgstr "在零之前的時間"
-
-#: timezone/zic.c:1117
+#: timezone/zic.c:1421
 msgid "time too small"
 msgstr "時間太小"
 
-#: timezone/zic.c:1121
+#: timezone/zic.c:1425
 msgid "time too large"
 msgstr "時間太大"
 
-#: timezone/zic.c:1125 timezone/zic.c:1226
+#: timezone/zic.c:1429 timezone/zic.c:1530
 msgid "invalid time of day"
 msgstr "無效的時間數字"
 
-#: timezone/zic.c:1144
+#: timezone/zic.c:1448
 msgid "illegal CORRECTION field on Leap line"
 msgstr "在閏時設定列中有不合法的 CORRECTION 欄位"
 
-#: timezone/zic.c:1149
+#: timezone/zic.c:1453
 msgid "illegal Rolling/Stationary field on Leap line"
 msgstr "在閏時設定列中有不合法的 Rolling/Stationary 欄位"
 
-#: timezone/zic.c:1163
+#: timezone/zic.c:1459
+msgid "leap second precedes Big Bang"
+msgstr ""
+
+#: timezone/zic.c:1472
 msgid "wrong number of fields on Link line"
 msgstr "連結設定列的欄位數目錯誤"
 
-#: timezone/zic.c:1167
+#: timezone/zic.c:1476
 msgid "blank FROM field on Link line"
 msgstr "連結列中空白的 FROM 欄位"
 
-#: timezone/zic.c:1171
-msgid "blank TO field on Link line"
-msgstr "連結列中空白的 TO 欄位"
-
-#: timezone/zic.c:1247
+#: timezone/zic.c:1551
 msgid "invalid starting year"
 msgstr "無效的起始年分"
 
-#: timezone/zic.c:1269
+#: timezone/zic.c:1573
 msgid "invalid ending year"
 msgstr "無效的結束年分"
 
-#: timezone/zic.c:1273
+#: timezone/zic.c:1577
 msgid "starting year greater than ending year"
 msgstr "起始年分比結束年分還要大"
 
-#: timezone/zic.c:1280
+#: timezone/zic.c:1584
 msgid "typed single year"
 msgstr "輸入的年分是同一年"
 
-#: timezone/zic.c:1315
+#: timezone/zic.c:1619
 msgid "invalid weekday name"
 msgstr "無效的工作日名稱"
 
-#: timezone/zic.c:1481
+#: timezone/zic.c:1743
 #, c-format
-msgid "%s: Can't remove %s: %s\n"
-msgstr "%s: 無法移除 %s: %s\n"
+msgid "reference clients mishandle more than %d transition times"
+msgstr ""
 
-#: timezone/zic.c:1491
-#, c-format
-msgid "%s: Can't create %s: %s\n"
-msgstr "%s: 無法產生 %s: %s\n"
+#: timezone/zic.c:1747
+msgid "pre-2014 clients may mishandle more than 1200 transition times"
+msgstr ""
 
-#: timezone/zic.c:1683
+#: timezone/zic.c:1858
+#, fuzzy
+#| msgid "too many transitions?!"
+msgid "too many transition times"
+msgstr "太多時間轉換了?!"
+
+#: timezone/zic.c:2047
 #, c-format
-msgid "%s: Error writing %s\n"
-msgstr "%s: 寫入錯誤 %s\n"
+msgid "%%z UTC offset magnitude exceeds 99:59:59"
+msgstr ""
 
-#: timezone/zic.c:1966
+#: timezone/zic.c:2424
 msgid "no POSIX environment variable for zone"
 msgstr "無 POSIX 環境變數用於區"
 
-#: timezone/zic.c:2133
-msgid "can't determine time zone abbreviation to use just after until time"
-msgstr "無法決定在結束時間以後該使用的時區簡寫"
-
-#: timezone/zic.c:2177
-msgid "too many transitions?!"
-msgstr "太多時間轉換了?!"
-
-#: timezone/zic.c:2192
-msgid "internal error - addtype called with bad isdst"
-msgstr "內部錯誤 - 用錯誤的 isdst 呼叫 addtype 函式"
+#: timezone/zic.c:2430
+#, c-format
+msgid "%s: pre-%d clients may mishandle distant timestamps"
+msgstr ""
 
-#: timezone/zic.c:2196
-msgid "internal error - addtype called with bad ttisstd"
-msgstr "內部錯誤 - 用錯誤的 ttisstd 呼叫 addtype 函式"
+#: timezone/zic.c:2566
+msgid "two rules for same instant"
+msgstr ""
 
-#: timezone/zic.c:2200
-msgid "internal error - addtype called with bad ttisgmt"
-msgstr "內部錯誤 - 用錯誤的 ttisgmt 呼叫 addtype 函式"
+#: timezone/zic.c:2627
+msgid "can't determine time zone abbreviation to use just after until time"
+msgstr "無法決定在結束時間以後該使用的時區簡寫"
 
-#: timezone/zic.c:2219
+#: timezone/zic.c:2725
 msgid "too many local time types"
 msgstr "太多本地時間格式"
 
-#: timezone/zic.c:2223
-msgid "UTC offset out of range"
+#: timezone/zic.c:2729
+#, fuzzy
+#| msgid "UTC offset out of range"
+msgid "UT offset out of range"
 msgstr "UTC 偏移超出範圍"
 
-#: timezone/zic.c:2247
+#: timezone/zic.c:2753
 msgid "too many leap seconds"
 msgstr "太多閏秒"
 
-#: timezone/zic.c:2253
+#: timezone/zic.c:2759
 msgid "repeated leap second moment"
 msgstr "重複的閏秒設定"
 
-#: timezone/zic.c:2303
+#: timezone/zic.c:2830
 msgid "Wild result from command execution"
 msgstr "命令執行導致奇怪的結果"
 
-#: timezone/zic.c:2304
+#: timezone/zic.c:2831
 #, c-format
 msgid "%s: command was '%s', result was %d\n"
 msgstr "%s: 輸入命令為 '%s', 結果為 %d\n"
 
-#: timezone/zic.c:2395
+#: timezone/zic.c:2961
 msgid "Odd number of quotation marks"
 msgstr "引號數目為奇數"
 
-#: timezone/zic.c:2472
+#: timezone/zic.c:3046
 msgid "use of 2/29 in non leap-year"
 msgstr "在非閏年時用到 2/29 日"
 
-#: timezone/zic.c:2507
-msgid "rule goes past start/end of month--will not work with pre-2004 versions of zic"
+#: timezone/zic.c:3081
+#, fuzzy
+#| msgid "rule goes past start/end of month--will not work with pre-2004 versions of zic"
+msgid "rule goes past start/end of month; will not work with pre-2004 versions of zic"
 msgstr "規則超過開始/結束月分--將無法適用早於 2004 的 zic 版本"
 
-#: timezone/zic.c:2538
-msgid "time zone abbreviation lacks alphabetic at start"
-msgstr "時區縮寫開頭缺少字母"
-
-#: timezone/zic.c:2540
-msgid "time zone abbreviation has fewer than 3 alphabetics"
+#: timezone/zic.c:3108
+#, fuzzy
+#| msgid "time zone abbreviation has fewer than 3 alphabetics"
+msgid "time zone abbreviation has fewer than 3 characters"
 msgstr "時間區縮寫少於 3 個字母"
 
-#: timezone/zic.c:2542
-msgid "time zone abbreviation has too many alphabetics"
+#: timezone/zic.c:3110
+#, fuzzy
+#| msgid "time zone abbreviation has too many alphabetics"
+msgid "time zone abbreviation has too many characters"
 msgstr "時區縮寫太多字母"
 
-#: timezone/zic.c:2552
+#: timezone/zic.c:3112
 msgid "time zone abbreviation differs from POSIX standard"
 msgstr "時區縮寫與 POSIX 標準不同"
 
-#: timezone/zic.c:2564
+#: timezone/zic.c:3118
 msgid "too many, or too long, time zone abbreviations"
 msgstr "時區縮寫太多或者太長"
 
-#: timezone/zic.c:2604
-#, c-format
-msgid "%s: Can't create directory %s: %s\n"
+#: timezone/zic.c:3161
+#, fuzzy, c-format
+#| msgid "%s: Can't create directory %s: %s\n"
+msgid "%s: Can't create directory %s: %s"
 msgstr "%s: 無法建立目錄 %s: %s\n"
 
-#: timezone/zic.c:2625
-#, c-format
-msgid "%s: %d did not sign extend correctly\n"
-msgstr "%s: %d 無法正確地延展訊號\n"
+#~ msgid "cannot allocate TLS data structures for initial thread"
+#~ msgstr "無法配置 TLS 資料結構用以起始執行緒"
+
+#~ msgid "cannot handle TLS data"
+#~ msgstr "無法處理 TLS 資料"
+
+#~ msgid "invalid caller"
+#~ msgstr "無效的呼叫者"
+
+#~ msgid "cannot load any more object with static TLS"
+#~ msgstr "無法以靜態 TLS 再載入任何物件"
+
+#~ msgid "%s: no PLTREL found in object %s\n"
+#~ msgstr "%s: 在目的檔 %s 中沒有找到 PLTREL\n"
+
+#~ msgid "Don't generate links"
+#~ msgstr "不產生連結"
+
+#~ msgid "cannot create internal descriptors"
+#~ msgstr "無法建立內部敘述項"
+
+#~ msgid "Character out of range for UTF-8"
+#~ msgstr "字元超出 UTF-8 範圍"
+
+#~ msgid "no definition of `UNDEFINED'"
+#~ msgstr "沒有找到 `UNDEFINED' 的定義"
+
+#~ msgid "non-symbolic character value should not be used"
+#~ msgstr "非符號性的字元值不應該被使用才對"
+
+#~ msgid "Create old-style tables"
+#~ msgstr "產生舊格式的表格"
+
+#~ msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
+#~ msgstr "無法設定通訊端到關閉於 exec：%s; 停用 paranoia 模式"
+
+#~ msgid "cannot change socket to nonblocking mode: %s"
+#~ msgstr "無法變更通訊端為非區塊模式：%s"
+
+#~ msgid "cannot set socket to close on exec: %s"
+#~ msgstr "無法設定通訊端於 exec：%s 時關閉"
+
+#~ msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
+#~ msgstr "無法讀取/proc/self/cmdline：%s; 停用 paranoia 模式"
+
+#~ msgid "Haven't found \"%s\" in password cache!"
+#~ msgstr "尚未在密碼快取中找到 \"%s\"!"
+
+#~ msgid "Reloading \"%s\" in password cache!"
+#~ msgstr "重新載入「%s」於密碼快取！"
+
+#~ msgid "compile-time support for database policy missing"
+#~ msgstr "compile-time 支援用於資料庫策略缺少"
+
+#~ msgid "%s: option '--%s' doesn't allow an argument\n"
+#~ msgstr "%s: 選項 `--%s' 不允許附加引數\n"
+
+#~ msgid "%s: unrecognized option '--%s'\n"
+#~ msgstr "%s: 未知的選項 `--%s'\n"
+
+#~ msgid "%s: option '-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: 選項 `-W %s' 不允許附加引數\n"
+
+#~ msgid "%s: option '-W %s' requires an argument\n"
+#~ msgstr "%s：選項『-W %s』需要一個引數\n"
+
+#~ msgid "This implementation doesn't support newstyle or MT-safe code!\n"
+#~ msgstr "此實作方式不支援新的形式或多安全執行序的程式!\n"
+
+#~ msgid "program %lu is not available\n"
+#~ msgstr "程式 %lu 不存在\n"
+
+#~ msgid "program %lu version %lu is not available\n"
+#~ msgstr "程式 %lu 的第 %lu 版並不存在\n"
+
+#~ msgid "program %lu version %lu ready and waiting\n"
+#~ msgstr "程式 %lu 的第 %lu 版已經就緒並等待服務中\n"
+
+#~ msgid "rpcinfo: can't contact portmapper"
+#~ msgstr "rpcinfo: 無法建立跟 portmapper 之間的連線"
+
+#~ msgid "No remote programs registered.\n"
+#~ msgstr "沒有註冊過的遠端應用程式\n"
+
+#~ msgid "   program vers proto   port\n"
+#~ msgstr "   程式採用的協定連接阜\n"
+
+#~ msgid "(unknown)"
+#~ msgstr "(未知)"
+
+#~ msgid "rpcinfo: broadcast failed: %s\n"
+#~ msgstr "rpcinfo: 廣播失敗: %s\n"
+
+#~ msgid "Sorry. You are not root\n"
+#~ msgstr "不好意思，你並不是 root 使用者\n"
+
+#~ msgid "rpcinfo: Could not delete registration for prog %s version %s\n"
+#~ msgstr "rpcinfo: 無法刪除程式 %s (第 %s 版) 的註冊資料\n"
+
+#~ msgid "Usage: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
+#~ msgstr "使用方式: rpcinfo [ -n portnum ] -u host prognum [ versnum ]\n"
+
+#~ msgid "       rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n"
+#~ msgstr "       rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n"
+
+#~ msgid "       rpcinfo -p [ host ]\n"
+#~ msgstr "       rpcinfo -p [ host ]\n"
+
+#~ msgid "       rpcinfo -b prognum versnum\n"
+#~ msgstr "       rpcinfo -b prognum versnum\n"
+
+#~ msgid "       rpcinfo -d prognum versnum\n"
+#~ msgstr "       rpcinfo -d prognum versnum\n"
+
+#~ msgid "rpcinfo: %s is unknown service\n"
+#~ msgstr "rpcinfo: %s 是不明的服務\n"
+
+#~ msgid "rpcinfo: %s is unknown host\n"
+#~ msgstr "rpcinfo: %s 是不明的主機\n"
+
+#~ msgid "lacks alphabetic at start"
+#~ msgstr "lacks 字母順序於開始"
+
+#~ msgid "differs from POSIX standard"
+#~ msgstr "differs 從 POSIX 標準"
+
+#~ msgid ""
+#~ "%s: usage is %s [ --version ] [ --help ] [ -v ] [ -c [loyear,]hiyear ] zonename ...\n"
+#~ "\n"
+#~ "Report bugs to %s.\n"
+#~ msgstr ""
+#~ "%s：用法為 %s [--version] [--help] [-v] [-c [低年分,]高年分 ] 區域名稱 ...\n"
+#~ "\n"
+#~ "將錯誤通報給 %s。\n"
+
+#~ msgid "Error writing to standard output"
+#~ msgstr "寫入標準輸出時錯誤"
+
+#~ msgid "%s: use of -v on system with floating time_t other than float or double\n"
+#~ msgstr "%s: 使用 -v 於具備浮點數 time_t 的系統而非浮點數或雙倍精度\n"
+
+#~ msgid "hard link failed, symbolic link used"
+#~ msgstr "實體連結失敗，使用符號連結代替"
+
+#~ msgid "%s: Error reading %s\n"
+#~ msgstr "%s: 讀取錯誤 %s\n"
+
+#~ msgid "%s: Error closing %s: %s\n"
+#~ msgstr "%s: 關閉錯誤 %s: %s\n"
+
+#~ msgid "time before zero"
+#~ msgstr "在零之前的時間"
+
+#~ msgid "blank TO field on Link line"
+#~ msgstr "連結列中空白的 TO 欄位"
+
+#~ msgid "%s: Error writing %s\n"
+#~ msgstr "%s: 寫入錯誤 %s\n"
+
+#~ msgid "internal error - addtype called with bad isdst"
+#~ msgstr "內部錯誤 - 用錯誤的 isdst 呼叫 addtype 函式"
+
+#~ msgid "internal error - addtype called with bad ttisstd"
+#~ msgstr "內部錯誤 - 用錯誤的 ttisstd 呼叫 addtype 函式"
+
+#~ msgid "internal error - addtype called with bad ttisgmt"
+#~ msgstr "內部錯誤 - 用錯誤的 ttisgmt 呼叫 addtype 函式"
+
+#~ msgid "time zone abbreviation lacks alphabetic at start"
+#~ msgstr "時區縮寫開頭缺少字母"
+
+#~ msgid "%s: %d did not sign extend correctly\n"
+#~ msgstr "%s: %d 無法正確地延展訊號\n"