po: merge changes

Signed-off-by: Karel Zak <kzak@redhat.com>

1 files changed, 190 insertions, 185 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index c7ce6924e..98b754807 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.23.1\n"
 "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2015-08-24 12:23+0200\n"
+"POT-Creation-Date: 2015-09-07 09:45+0200\n"
 "PO-Revision-Date: 2013-06-07 23:29+0800\n"
 "Last-Translator: Wei-Lun Chao <bluebat@member.fsf.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -221,7 +221,7 @@ msgstr "%s 失敗。\n"
 msgid "%s succeeded.\n"
 msgstr "%s 成功。\n"
 
-#: disk-utils/blockdev.c:457 misc-utils/lsblk.c:1175 misc-utils/lsblk.c:1182
+#: disk-utils/blockdev.c:457 misc-utils/lsblk.c:1177 misc-utils/lsblk.c:1184
 #, fuzzy, c-format
 msgid "%s: failed to initialize sysfs handler"
 msgstr "%s：無法初始化 sysfs 處理常式"
@@ -268,8 +268,8 @@ msgstr "離開"
 msgid "Quit program without writing partition table"
 msgstr "離開本程式且不寫入分割表"
 
-#: disk-utils/cfdisk.c:184 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1016
-#: libfdisk/src/dos.c:2306 libfdisk/src/gpt.c:2765 libfdisk/src/sgi.c:1162
+#: disk-utils/cfdisk.c:184 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1020
+#: libfdisk/src/dos.c:2305 libfdisk/src/gpt.c:2774 libfdisk/src/sgi.c:1162
 #: libfdisk/src/sun.c:1113
 msgid "Type"
 msgstr "類型"
@@ -624,8 +624,8 @@ msgstr "您確定要將分割表寫入硬碟中嗎? (yes 或 no):"
 msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog."
 msgstr ""
 
-#: disk-utils/cfdisk.c:2381 login-utils/lslogins.c:208 sys-utils/lscpu.c:1267
-#: sys-utils/lscpu.c:1277
+#: disk-utils/cfdisk.c:2381 login-utils/lslogins.c:208 sys-utils/lscpu.c:1262
+#: sys-utils/lscpu.c:1272
 msgid "yes"
 msgstr "是"
 
@@ -684,7 +684,7 @@ msgid " -z, --zero               start with zeroed partition table\n"
 msgstr " -Q, --queue              建立訊息佇列\n"
 
 #: disk-utils/cfdisk.c:2597 disk-utils/fdisk.c:863 disk-utils/sfdisk.c:1663
-#: misc-utils/cal.c:402 sys-utils/dmesg.c:1333 text-utils/hexdump.c:114
+#: misc-utils/cal.c:411 sys-utils/dmesg.c:1333 text-utils/hexdump.c:114
 #, fuzzy
 msgid "unsupported color mode"
 msgstr "不受支援的命令"
@@ -801,7 +801,7 @@ msgstr "無效的引數：%s"
 msgid "stat of %s failed"
 msgstr "stat 失敗"
 
-#: disk-utils/fdformat.c:223 disk-utils/partx.c:950 misc-utils/lsblk.c:1468
+#: disk-utils/fdformat.c:223 disk-utils/partx.c:950 misc-utils/lsblk.c:1470
 #: sys-utils/blkdiscard.c:159 sys-utils/mountpoint.c:107
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -989,7 +989,7 @@ msgid " -b, --sector-size <size>      physical and logical sector size\n"
 msgstr " -c, --creator     顯示建立者和擁有者\n"
 
 #: disk-utils/fdisk.c:726
-msgid " -B, --protect-boot            don't erase bootbits when creat a new label\n"
+msgid " -B, --protect-boot            don't erase bootbits when create a new label\n"
 msgstr ""
 
 #: disk-utils/fdisk.c:727
@@ -1175,24 +1175,24 @@ msgstr ""
 "\n"
 "分割表項目未按磁碟排序\n"
 
-#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1011 libfdisk/src/dos.c:2300
-#: libfdisk/src/gpt.c:2761 libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:1107
+#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1015 libfdisk/src/dos.c:2299
+#: libfdisk/src/gpt.c:2770 libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:1107
 #, fuzzy
 msgid "Start"
 msgstr "啟始"
 
-#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1012 libfdisk/src/dos.c:2301
-#: libfdisk/src/gpt.c:2762 libfdisk/src/sgi.c:1157 libfdisk/src/sun.c:1108
+#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1016 libfdisk/src/dos.c:2300
+#: libfdisk/src/gpt.c:2771 libfdisk/src/sgi.c:1157 libfdisk/src/sun.c:1108
 msgid "End"
 msgstr "結束"
 
-#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1013 libfdisk/src/dos.c:2302
-#: libfdisk/src/gpt.c:2763 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1109
+#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1017 libfdisk/src/dos.c:2301
+#: libfdisk/src/gpt.c:2772 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1109
 msgid "Sectors"
 msgstr "磁區"
 
-#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1015 libfdisk/src/dos.c:2304
-#: libfdisk/src/gpt.c:2764 libfdisk/src/sgi.c:1160 libfdisk/src/sun.c:1111
+#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1019 libfdisk/src/dos.c:2303
+#: libfdisk/src/gpt.c:2773 libfdisk/src/sgi.c:1160 libfdisk/src/sun.c:1111
 msgid "Size"
 msgstr ""
 
@@ -3697,15 +3697,15 @@ msgid "failed to add data to output table"
 msgstr "加入輸出列時失敗"
 
 #: disk-utils/partx.c:633 login-utils/lslogins.c:928 misc-utils/findmnt.c:1582
-#: misc-utils/lsblk.c:1849 misc-utils/lslocks.c:465 sys-utils/losetup.c:304
-#: sys-utils/lscpu.c:1438 sys-utils/lsipc.c:338 sys-utils/prlimit.c:297
+#: misc-utils/lsblk.c:1851 misc-utils/lslocks.c:465 sys-utils/losetup.c:304
+#: sys-utils/lscpu.c:1433 sys-utils/lsipc.c:338 sys-utils/prlimit.c:297
 #: sys-utils/swapon.c:266 sys-utils/wdctl.c:259 sys-utils/zramctl.c:418
 msgid "failed to initialize output table"
 msgstr "初始化輸出表格時失敗"
 
-#: disk-utils/partx.c:644 misc-utils/findmnt.c:1608 misc-utils/lsblk.c:1869
+#: disk-utils/partx.c:644 misc-utils/findmnt.c:1608 misc-utils/lsblk.c:1871
 #: misc-utils/lslocks.c:479 sys-utils/losetup.c:316 sys-utils/losetup.c:352
-#: sys-utils/lscpu.c:1443 sys-utils/prlimit.c:306 sys-utils/swapon.c:275
+#: sys-utils/lscpu.c:1438 sys-utils/prlimit.c:306 sys-utils/swapon.c:275
 #: sys-utils/wdctl.c:270 sys-utils/zramctl.c:427
 msgid "failed to initialize output column"
 msgstr "初始化輸出欄時失敗"
@@ -3760,7 +3760,7 @@ msgid ""
 "\n"
 msgstr " -n, --noparity          設定同位到無\n"
 
-#: disk-utils/partx.c:725 misc-utils/lsblk.c:1606
+#: disk-utils/partx.c:725 misc-utils/lsblk.c:1608
 msgid " -b, --bytes          print SIZE in bytes rather than in human readable format\n"
 msgstr ""
 
@@ -3777,12 +3777,12 @@ msgstr ""
 msgid " -o, --output <list>  define which output columns to use\n"
 msgstr " -o, --options <optstring>    短選項為辨識的\n"
 
-#: disk-utils/partx.c:729 misc-utils/lsblk.c:1620
+#: disk-utils/partx.c:729 misc-utils/lsblk.c:1622
 #, fuzzy
 msgid " -P, --pairs          use key=\"value\" output format\n"
 msgstr " -V, --version                輸出版本資訊\n"
 
-#: disk-utils/partx.c:730 misc-utils/lsblk.c:1621
+#: disk-utils/partx.c:730 misc-utils/lsblk.c:1623
 #, fuzzy
 msgid " -r, --raw            use raw output format\n"
 msgstr " -V, --version                輸出版本資訊\n"
@@ -5138,7 +5138,7 @@ msgstr "磁軌/磁柱"
 msgid "Sectors/Cylinder"
 msgstr "磁區/磁柱"
 
-#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1014 libfdisk/src/dos.c:2303
+#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1018 libfdisk/src/dos.c:2302
 #: libfdisk/src/sgi.c:1159 libfdisk/src/sun.c:196 libfdisk/src/sun.c:1110
 msgid "Cylinders"
 msgstr "磁柱"
@@ -5237,38 +5237,43 @@ msgstr "啟動程式與磁碟標籤重疊！\n"
 msgid "Bootstrap installed on %s."
 msgstr "啟動程式已安裝於 %s。\n"
 
-#: libfdisk/src/bsd.c:899
+#: libfdisk/src/bsd.c:900
+#, c-format
+msgid "Disklabel written to %s (don't forget to write %s disklable too)."
+msgstr ""
+
+#: libfdisk/src/bsd.c:903
 #, fuzzy, c-format
 msgid "Disklabel written to %s."
 msgstr "硬碟: %s\n"
 
-#: libfdisk/src/bsd.c:905 libfdisk/src/context.c:611
+#: libfdisk/src/bsd.c:909 libfdisk/src/context.c:611
 #, fuzzy
 msgid "Syncing disks."
 msgstr "同步磁碟。\n"
 
-#: libfdisk/src/bsd.c:946
+#: libfdisk/src/bsd.c:950
 msgid "BSD label is not nested within a DOS partition."
 msgstr ""
 
-#: libfdisk/src/bsd.c:974
+#: libfdisk/src/bsd.c:978
 #, fuzzy, c-format
 msgid "BSD partition '%c' linked to DOS partition %zu."
 msgstr "鏈結 BSD 分割到 non-BSD 分割"
 
-#: libfdisk/src/bsd.c:1010
+#: libfdisk/src/bsd.c:1014
 msgid "Slice"
 msgstr ""
 
-#: libfdisk/src/bsd.c:1017
+#: libfdisk/src/bsd.c:1021
 msgid "Fsize"
 msgstr ""
 
-#: libfdisk/src/bsd.c:1018
+#: libfdisk/src/bsd.c:1022
 msgid "Bsize"
 msgstr ""
 
-#: libfdisk/src/bsd.c:1019
+#: libfdisk/src/bsd.c:1023
 msgid "Cpg"
 msgstr ""
 
@@ -5589,67 +5594,62 @@ msgstr ""
 "使用「d」命令來刪除分割區。\n"
 
 #: libfdisk/src/dos.c:1963
-msgid "Cannot change type of the extended partition which is already used by logical partitons. Delete logical partitions first."
+msgid "Cannot change type of the extended partition which is already used by logical partitions. Delete logical partitions first."
 msgstr ""
 
-#: libfdisk/src/dos.c:2142
+#: libfdisk/src/dos.c:2142 libfdisk/src/gpt.c:2679
 #, fuzzy
 msgid "Nothing to do. Ordering is correct already."
 msgstr ""
 "無事可做。順序已經是正確的。\n"
 "\n"
 
-#: libfdisk/src/dos.c:2171 libfdisk/src/gpt.c:2680
-#, fuzzy
-msgid "Done."
-msgstr "完成。\n"
-
-#: libfdisk/src/dos.c:2192
+#: libfdisk/src/dos.c:2191
 #, fuzzy, c-format
 msgid "Partition %zu: no data area."
 msgstr "分割區 %d 沒有資料區域\n"
 
-#: libfdisk/src/dos.c:2222
+#: libfdisk/src/dos.c:2221
 msgid "New beginning of data"
 msgstr "新的資料開始部分"
 
-#: libfdisk/src/dos.c:2278
+#: libfdisk/src/dos.c:2277
 #, fuzzy, c-format
 msgid "Partition %zu: is an extended partition."
 msgstr "警告：分割區 %d 是擴充分割區\n"
 
-#: libfdisk/src/dos.c:2284
+#: libfdisk/src/dos.c:2283
 #, fuzzy, c-format
 msgid "The bootable flag on partition %zu is enabled now."
 msgstr "分割區 %d 的系統類型未被變更：%x (%s)\n"
 
-#: libfdisk/src/dos.c:2285
+#: libfdisk/src/dos.c:2284
 #, fuzzy, c-format
 msgid "The bootable flag on partition %zu is disabled now."
 msgstr "切換目前分割區的屬性旗標"
 
-#: libfdisk/src/dos.c:2298 libfdisk/src/gpt.c:2760 libfdisk/src/sgi.c:1155
+#: libfdisk/src/dos.c:2297 libfdisk/src/gpt.c:2769 libfdisk/src/sgi.c:1155
 #: libfdisk/src/sun.c:1106
 msgid "Device"
 msgstr "所用裝置"
 
-#: libfdisk/src/dos.c:2299 libfdisk/src/sun.c:41
+#: libfdisk/src/dos.c:2298 libfdisk/src/sun.c:41
 msgid "Boot"
 msgstr "可開機"
 
-#: libfdisk/src/dos.c:2305 libfdisk/src/sgi.c:1161 libfdisk/src/sun.c:1112
+#: libfdisk/src/dos.c:2304 libfdisk/src/sgi.c:1161 libfdisk/src/sun.c:1112
 msgid "Id"
 msgstr ""
 
-#: libfdisk/src/dos.c:2309
+#: libfdisk/src/dos.c:2308
 msgid "Start-C/H/S"
 msgstr ""
 
-#: libfdisk/src/dos.c:2310
+#: libfdisk/src/dos.c:2309
 msgid "End-C/H/S"
 msgstr ""
 
-#: libfdisk/src/dos.c:2311 libfdisk/src/gpt.c:2770 libfdisk/src/sgi.c:1163
+#: libfdisk/src/dos.c:2310 libfdisk/src/gpt.c:2779 libfdisk/src/sgi.c:1163
 msgid "Attrs"
 msgstr ""
 
@@ -6258,16 +6258,16 @@ msgstr "分割區 %d 的系統類型未被變更：%x (%s)\n"
 msgid "The %s flag on partition %zu is disabled now."
 msgstr "這個分割區無法使用"
 
-#: libfdisk/src/gpt.c:2767
+#: libfdisk/src/gpt.c:2776
 #, fuzzy
 msgid "Type-UUID"
 msgstr "類型"
 
-#: libfdisk/src/gpt.c:2768
+#: libfdisk/src/gpt.c:2777
 msgid "UUID"
 msgstr ""
 
-#: libfdisk/src/gpt.c:2769 login-utils/chfn.c:151 login-utils/chfn.c:153
+#: libfdisk/src/gpt.c:2778 login-utils/chfn.c:151 login-utils/chfn.c:153
 #: login-utils/chfn.c:308
 msgid "Name"
 msgstr "名稱"
@@ -6776,7 +6776,7 @@ msgstr ""
 msgid "waitpid failed (%s)"
 msgstr "waitpid 失敗 (%s)"
 
-#: lib/path.c:209 sys-utils/lscpu.c:1543
+#: lib/path.c:209 sys-utils/lscpu.c:1538
 msgid "failed to callocate cpu set"
 msgstr "callocate cpu 集合時失敗"
 
@@ -7306,7 +7306,7 @@ msgstr ""
 "\n"
 "登入錯誤\n"
 
-#: login-utils/login.c:893 login-utils/login.c:1237 login-utils/login.c:1260
+#: login-utils/login.c:893 login-utils/login.c:1240 login-utils/login.c:1263
 #, fuzzy
 msgid ""
 "\n"
@@ -7325,66 +7325,66 @@ msgstr "在 %s:%d 中包含空使用者名稱，放棄。"
 msgid "TIOCSCTTY failed: %m"
 msgstr "TIOCSCTTY 失敗：%m"
 
-#: login-utils/login.c:1179
+#: login-utils/login.c:1182
 #, fuzzy, c-format
 msgid "login: -h is for superuser only\n"
 msgstr "login：-h 只提供系統管理者使用。\n"
 
-#: login-utils/login.c:1194
+#: login-utils/login.c:1197
 #, fuzzy, c-format
 msgid "Usage: login [-p] [-h <host>] [-H] [[-f] <username>]\n"
 msgstr "用法：登入 [-p] [-h 主機] [-H] [-f 使用者名稱|使用者名稱]\n"
 
-#: login-utils/login.c:1196
+#: login-utils/login.c:1199
 #, fuzzy
 msgid "Begin a session on the system.\n"
 msgstr "您正在這個系統中使用陰影密碼。\n"
 
-#: login-utils/login.c:1238
+#: login-utils/login.c:1241
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "無效的使用者名稱「%s」於 %s:%d，放棄。"
 
-#: login-utils/login.c:1259
+#: login-utils/login.c:1262
 #, fuzzy, c-format
 msgid "groups initialization failed: %m"
 msgstr "群組初始化失敗：%m"
 
-#: login-utils/login.c:1284
+#: login-utils/login.c:1287
 #, fuzzy
 msgid "setgid() failed"
 msgstr "setgid() 失敗"
 
-#: login-utils/login.c:1314
+#: login-utils/login.c:1317
 #, c-format
 msgid "You have new mail.\n"
 msgstr "您有新郵件。\n"
 
-#: login-utils/login.c:1316
+#: login-utils/login.c:1319
 #, c-format
 msgid "You have mail.\n"
 msgstr "您有郵件。\n"
 
-#: login-utils/login.c:1330
+#: login-utils/login.c:1333
 msgid "setuid() failed"
 msgstr "setuid() 失敗"
 
-#: login-utils/login.c:1336 login-utils/sulogin.c:763
+#: login-utils/login.c:1339 login-utils/sulogin.c:763
 #, fuzzy, c-format
 msgid "%s: change directory failed"
 msgstr "%s：變更目錄失敗"
 
-#: login-utils/login.c:1343 login-utils/sulogin.c:764
+#: login-utils/login.c:1346 login-utils/sulogin.c:764
 #, c-format
 msgid "Logging in with home = \"/\".\n"
 msgstr "登入時個人資料夾=「/」。\n"
 
-#: login-utils/login.c:1372
+#: login-utils/login.c:1375
 #, fuzzy
 msgid "couldn't exec shell script"
 msgstr "無法 exec 命令稿"
 
-#: login-utils/login.c:1374
+#: login-utils/login.c:1377
 #, fuzzy
 msgid "no shell"
 msgstr "沒有命令殼"
@@ -7398,7 +7398,7 @@ msgstr "%s：%s 含有無效的數值：%s"
 msgid "hush login status: restore original IDs failed"
 msgstr ""
 
-#: login-utils/lslogins.c:207 sys-utils/lscpu.c:1267 sys-utils/lscpu.c:1277
+#: login-utils/lslogins.c:207 sys-utils/lscpu.c:1262 sys-utils/lscpu.c:1272
 msgid "no"
 msgstr "否"
 
@@ -7667,7 +7667,7 @@ msgstr "上次登入：%.*s "
 #: login-utils/lslogins.c:1234 login-utils/nologin.c:25
 #: misc-utils/lslocks.c:515 misc-utils/mcookie.c:82 misc-utils/uuidd.c:73
 #: misc-utils/uuidgen.c:33 sys-utils/dmesg.c:264 sys-utils/ipcmk.c:66
-#: sys-utils/lscpu.c:1651 sys-utils/lsipc.c:277 sys-utils/readprofile.c:104
+#: sys-utils/lscpu.c:1646 sys-utils/lsipc.c:277 sys-utils/readprofile.c:104
 #: sys-utils/rtcwake.c:95 term-utils/setterm.c:388 text-utils/line.c:30
 #, fuzzy, c-format
 msgid " %s [options]\n"
@@ -7776,7 +7776,7 @@ msgid "     --btmp-file <path>   set an alternate path for btmp\n"
 msgstr ""
 
 #: login-utils/lslogins.c:1265 misc-utils/findmnt.c:1262
-#: sys-utils/lscpu.c:1668
+#: sys-utils/lscpu.c:1663
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8290,123 +8290,123 @@ msgstr "您正在這個系統中使用陰影密碼。\n"
 msgid "Would you like to edit %s now [y/n]? "
 msgstr "您現在想要編輯 %s 嗎[y/n]？"
 
-#: misc-utils/cal.c:387
+#: misc-utils/cal.c:396
 #, fuzzy
 msgid "invalid month argument"
 msgstr "無效的長度引數"
 
-#: misc-utils/cal.c:392
+#: misc-utils/cal.c:401
 #, fuzzy
 msgid "invalid week argument"
 msgstr "無效的速度引數"
 
-#: misc-utils/cal.c:394
+#: misc-utils/cal.c:403
 #, fuzzy
-msgid "illegal week value: use 1-53"
+msgid "illegal week value: use 1-54"
 msgstr "不合法的日號：使用 1-%d"
 
-#: misc-utils/cal.c:430
+#: misc-utils/cal.c:439
 #, fuzzy
 msgid "illegal day value"
 msgstr "不合法的天值"
 
-#: misc-utils/cal.c:432 misc-utils/cal.c:448
+#: misc-utils/cal.c:441 misc-utils/cal.c:457
 #, c-format
 msgid "illegal day value: use 1-%d"
 msgstr "不合法的日號：使用 1-%d"
 
-#: misc-utils/cal.c:435 misc-utils/cal.c:437
+#: misc-utils/cal.c:444 misc-utils/cal.c:446
 msgid "illegal month value: use 1-12"
 msgstr "不合法的月分：使用 1-12"
 
-#: misc-utils/cal.c:440 misc-utils/cal.c:444
+#: misc-utils/cal.c:449 misc-utils/cal.c:453
 #, fuzzy
 msgid "illegal year value"
 msgstr "不合法的天值"
 
-#: misc-utils/cal.c:442
+#: misc-utils/cal.c:451
 #, fuzzy
 msgid "illegal year value: use positive integer"
 msgstr "不合法的年分：使用 1-9999"
 
-#: misc-utils/cal.c:473 misc-utils/cal.c:486
+#: misc-utils/cal.c:482 misc-utils/cal.c:495
 #, c-format
 msgid "illegal week value: year %d doesn't have week %d"
 msgstr ""
 
-#: misc-utils/cal.c:627
+#: misc-utils/cal.c:634
 #, fuzzy, c-format
 msgid "%s"
 msgstr "%s"
 
-#: misc-utils/cal.c:633
+#: misc-utils/cal.c:640
 #, c-format
 msgid "%d"
 msgstr ""
 
-#: misc-utils/cal.c:639
+#: misc-utils/cal.c:646
 #, c-format
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:942
+#: misc-utils/cal.c:948
 #, fuzzy, c-format
 msgid " %s [options] [[[day] month] year]\n"
 msgstr " %s [選項] [[[天] 月] 年]\n"
 
-#: misc-utils/cal.c:945
+#: misc-utils/cal.c:951
 msgid "Display a calendar, or some part of it.\n"
 msgstr ""
 
-#: misc-utils/cal.c:946
+#: misc-utils/cal.c:952
 msgid "Without any arguments, display the current month.\n"
 msgstr ""
 
-#: misc-utils/cal.c:949
+#: misc-utils/cal.c:955
 #, fuzzy
 msgid " -1, --one             show only a single month (default)\n"
 msgstr " -i, --info                列印只有資訊關於取樣步驟\n"
 
-#: misc-utils/cal.c:950
+#: misc-utils/cal.c:956
 #, fuzzy
 msgid " -3, --three           show three months spanning the date\n"
 msgstr " -c, --creator     顯示建立者和擁有者\n"
 
-#: misc-utils/cal.c:951
+#: misc-utils/cal.c:957
 #, fuzzy
 msgid " -n, --months <num>    show num months starting with date's month\n"
 msgstr " -c, --creator     顯示建立者和擁有者\n"
 
-#: misc-utils/cal.c:952
+#: misc-utils/cal.c:958
 #, fuzzy
 msgid " -s, --sunday          Sunday as first day of week\n"
 msgstr " -n, --noparity          設定同位到無\n"
 
-#: misc-utils/cal.c:953
+#: misc-utils/cal.c:959
 #, fuzzy
 msgid " -m, --monday          Monday as first day of week\n"
 msgstr " -n, --noparity          設定同位到無\n"
 
-#: misc-utils/cal.c:954
+#: misc-utils/cal.c:960
 #, fuzzy
 msgid " -j, --julian          output Julian dates\n"
 msgstr " -V           輸出版本資訊然後離開\n"
 
-#: misc-utils/cal.c:955
+#: misc-utils/cal.c:961
 #, fuzzy
 msgid " -y, --year            show the whole year\n"
 msgstr " -v, --verbose            是更多詳細的\n"
 
-#: misc-utils/cal.c:956
+#: misc-utils/cal.c:962
 #, fuzzy
 msgid " -Y, --twelve          show the next twelve months\n"
 msgstr " -v, --verbose            是更多詳細的\n"
 
-#: misc-utils/cal.c:957
+#: misc-utils/cal.c:963
 msgid " -w, --week[=<num>]    show US or ISO-8601 week numbers\n"
 msgstr ""
 
-#: misc-utils/cal.c:958
+#: misc-utils/cal.c:964
 msgid "     --color[=<when>]  colorize messages (auto, always or never)\n"
 msgstr ""
 
@@ -9421,158 +9421,158 @@ msgstr "裝置節點權限"
 msgid "device vendor"
 msgstr "裝置名稱"
 
-#: misc-utils/lsblk.c:1161
+#: misc-utils/lsblk.c:1163
 #, fuzzy, c-format
 msgid "%s: failed to get device path"
 msgstr "%s：無法提取裝置路徑"
 
-#: misc-utils/lsblk.c:1169
+#: misc-utils/lsblk.c:1171
 #, fuzzy, c-format
 msgid "%s: unknown device name"
 msgstr "%s：不明裝置名稱"
 
-#: misc-utils/lsblk.c:1206
+#: misc-utils/lsblk.c:1208
 #, fuzzy, c-format
 msgid "%s: failed to get dm name"
 msgstr "%s：無法提取 dm 名稱"
 
-#: misc-utils/lsblk.c:1255
+#: misc-utils/lsblk.c:1257
 #, fuzzy
 msgid "failed to open device directory in sysfs"
 msgstr "開啟裝置目錄在中 sysfs 時失敗"
 
-#: misc-utils/lsblk.c:1445
+#: misc-utils/lsblk.c:1447
 #, fuzzy, c-format
 msgid "%s: failed to compose sysfs path"
 msgstr "撰寫 sysfs 路徑用於 %s 時失敗"
 
-#: misc-utils/lsblk.c:1451
+#: misc-utils/lsblk.c:1453
 #, fuzzy, c-format
 msgid "%s: failed to read link"
 msgstr "%s：無法讀取鏈結"
 
-#: misc-utils/lsblk.c:1473
+#: misc-utils/lsblk.c:1475
 #, fuzzy, c-format
 msgid "%s: failed to get sysfs name"
 msgstr "%s：無法提取 dm 名稱"
 
-#: misc-utils/lsblk.c:1482
+#: misc-utils/lsblk.c:1484
 #, fuzzy, c-format
 msgid "%s: failed to get whole-disk device number"
 msgstr "%s：無法提取 whole-disk 裝置編號"
 
-#: misc-utils/lsblk.c:1534 misc-utils/lsblk.c:1536 misc-utils/lsblk.c:1561
-#: misc-utils/lsblk.c:1563
+#: misc-utils/lsblk.c:1536 misc-utils/lsblk.c:1538 misc-utils/lsblk.c:1563
+#: misc-utils/lsblk.c:1565
 #, fuzzy, c-format
 msgid "failed to parse list '%s'"
 msgstr "剖析清單『%s 時失敗』"
 
 #. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1541
+#: misc-utils/lsblk.c:1543
 #, fuzzy, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr "排除的裝置清單的太大 (限制是 %d 裝置)"
 
 #. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1568
+#: misc-utils/lsblk.c:1570
 #, fuzzy, c-format
 msgid "the list of included devices is too large (limit is %d devices)"
 msgstr "包含的裝置清單的太大 (限制是 %d 裝置)"
 
-#: misc-utils/lsblk.c:1599 sys-utils/wdctl.c:174
+#: misc-utils/lsblk.c:1601 sys-utils/wdctl.c:174
 #, fuzzy, c-format
 msgid " %s [options] [<device> ...]\n"
 msgstr " %s [選項] [<device>...]\n"
 
-#: misc-utils/lsblk.c:1602
+#: misc-utils/lsblk.c:1604
 #, fuzzy
 msgid "List information about block devices.\n"
 msgstr "%s：不是區塊裝置"
 
-#: misc-utils/lsblk.c:1605
+#: misc-utils/lsblk.c:1607
 #, fuzzy
 msgid " -a, --all            print all devices\n"
 msgstr " -a, --all      查詢所有原始裝置\n"
 
-#: misc-utils/lsblk.c:1607
+#: misc-utils/lsblk.c:1609
 #, fuzzy
 msgid " -d, --nodeps         don't print slaves or holders\n"
 msgstr " -d, --debug             列印詳細的訊息到標準勘誤\n"
 
-#: misc-utils/lsblk.c:1608
+#: misc-utils/lsblk.c:1610
 msgid " -D, --discard        print discard capabilities\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:1609
+#: misc-utils/lsblk.c:1611
 msgid " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:1610
+#: misc-utils/lsblk.c:1612
 #, fuzzy
 msgid " -f, --fs             output info about filesystems\n"
 msgstr " -i, --info                列印只有資訊關於取樣步驟\n"
 
-#: misc-utils/lsblk.c:1611
+#: misc-utils/lsblk.c:1613
 #, fuzzy
 msgid " -i, --ascii          use ascii characters only\n"
 msgstr " -7, --sevenbits         設定字元大小到 7 位元\n"
 
-#: misc-utils/lsblk.c:1612
+#: misc-utils/lsblk.c:1614
 msgid " -I, --include <list> show only devices with specified major numbers\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:1613
+#: misc-utils/lsblk.c:1615
 #, fuzzy
 msgid " -J, --json           use JSON output format\n"
 msgstr " -V, --version                輸出版本資訊\n"
 
-#: misc-utils/lsblk.c:1614
+#: misc-utils/lsblk.c:1616
 #, fuzzy
 msgid " -l, --list           use list format output\n"
 msgstr " -Q, --quiet-output           沒有一般輸出\n"
 
-#: misc-utils/lsblk.c:1615
+#: misc-utils/lsblk.c:1617
 #, fuzzy
 msgid " -m, --perms          output info about permissions\n"
 msgstr " -V, --version                輸出版本資訊\n"
 
-#: misc-utils/lsblk.c:1616
+#: misc-utils/lsblk.c:1618
 msgid " -n, --noheadings     don't print headings\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:1617
+#: misc-utils/lsblk.c:1619
 msgid " -o, --output <list>  output columns\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:1618
+#: misc-utils/lsblk.c:1620
 #, fuzzy
 msgid " -O, --output-all     output all columns\n"
 msgstr " -o, --options <optstring>    短選項為辨識的\n"
 
-#: misc-utils/lsblk.c:1619
+#: misc-utils/lsblk.c:1621
 #, fuzzy
 msgid " -p, --paths          print complete device path\n"
 msgstr " -v, --verbose             列印詳細的資料\n"
 
-#: misc-utils/lsblk.c:1622
+#: misc-utils/lsblk.c:1624
 #, fuzzy
 msgid " -s, --inverse        inverse dependencies\n"
 msgstr " -v, --verbose             列印詳細的資料\n"
 
-#: misc-utils/lsblk.c:1623
+#: misc-utils/lsblk.c:1625
 #, fuzzy
 msgid " -S, --scsi           output info about SCSI devices\n"
 msgstr " -V           輸出版本資訊然後離開\n"
 
-#: misc-utils/lsblk.c:1624
+#: misc-utils/lsblk.c:1626
 msgid " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:1625
+#: misc-utils/lsblk.c:1627
 msgid " -x, --sort <column>  sort output by <column>\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:1630 misc-utils/lslocks.c:532 sys-utils/prlimit.c:196
+#: misc-utils/lsblk.c:1632 misc-utils/lslocks.c:532 sys-utils/prlimit.c:196
 #: sys-utils/zramctl.c:478
 #, fuzzy, c-format
 msgid ""
@@ -9582,12 +9582,12 @@ msgstr ""
 "\n"
 "可用欄位 (用於 --output)：\n"
 
-#: misc-utils/lsblk.c:1643
+#: misc-utils/lsblk.c:1645
 #, fuzzy, c-format
 msgid "failed to access sysfs directory: %s"
 msgstr "存取 sysfs 目錄時失敗：%s"
 
-#: misc-utils/lsblk.c:1840
+#: misc-utils/lsblk.c:1842
 msgid "the sort column has to be among the output columns"
 msgstr ""
 
@@ -11031,7 +11031,7 @@ msgstr ""
 
 #: sys-utils/dmesg.c:292
 #, fuzzy
-msgid " -T, --ctime                 show human readable timestamp\n"
+msgid " -T, --ctime                 show human readable timestamp (may be inaccurate!)\n"
 msgstr " -u, --unquote                不引言輸出\n"
 
 #: sys-utils/dmesg.c:293
@@ -11523,7 +11523,8 @@ msgid " -z, --zero-range     zero and ensure allocation of a range\n"
 msgstr ""
 
 #: sys-utils/fallocate.c:126
-msgid "keep size mode (-n option) unsupported"
+#, fuzzy
+msgid "fallocate failed: keep size mode is unsupported"
 msgstr "保持大小模式 (-n 選項) 未受支援"
 
 #: sys-utils/fallocate.c:127
@@ -12145,8 +12146,8 @@ msgid "To set the epoch value, you must use the 'epoch' option to tell to what v
 msgstr "要設定時期值，您必須使用『時期』選項到告訴到什麼值到設定它。"
 
 #: sys-utils/hwclock.c:1461
-#, c-format
-msgid "Not setting the epoch to %d - testing only.\n"
+#, fuzzy, c-format
+msgid "Not setting the epoch to %lu - testing only.\n"
 msgstr "不將時期設定為 %d - 只限於測試。\n"
 
 #: sys-utils/hwclock.c:1465
@@ -13490,7 +13491,7 @@ msgstr "，加密 %s (型態 %u)"
 msgid "%s: detach failed"
 msgstr "%s：卸離失敗"
 
-#: sys-utils/losetup.c:323 sys-utils/lscpu.c:1460 sys-utils/prlimit.c:229
+#: sys-utils/losetup.c:323 sys-utils/lscpu.c:1455 sys-utils/prlimit.c:229
 #: sys-utils/swapon.c:162 sys-utils/wdctl.c:215 sys-utils/zramctl.c:339
 #, fuzzy
 msgid "failed to initialize output line"
@@ -13742,32 +13743,32 @@ msgstr "錯誤：uname 失敗"
 msgid "failed to determine number of CPUs: %s"
 msgstr "剖析列號的時失敗"
 
-#: sys-utils/lscpu.c:732
+#: sys-utils/lscpu.c:727
 #, fuzzy
 msgid "error: can not set signal handler"
 msgstr "無法設定信號處理程式"
 
-#: sys-utils/lscpu.c:737
+#: sys-utils/lscpu.c:732
 #, fuzzy
 msgid "error: can not restore signal handler"
 msgstr "無法設定信號處理程式"
 
-#: sys-utils/lscpu.c:1172
+#: sys-utils/lscpu.c:1167
 #, fuzzy
 msgid "Failed to extract the node number"
 msgstr "%s：無法提取分割區編號"
 
-#: sys-utils/lscpu.c:1264 sys-utils/lscpu.c:1274
+#: sys-utils/lscpu.c:1259 sys-utils/lscpu.c:1269
 #, fuzzy
 msgid "Y"
 msgstr "Y"
 
-#: sys-utils/lscpu.c:1264 sys-utils/lscpu.c:1274
+#: sys-utils/lscpu.c:1259 sys-utils/lscpu.c:1269
 #, fuzzy
 msgid "N"
 msgstr "N"
 
-#: sys-utils/lscpu.c:1356
+#: sys-utils/lscpu.c:1351
 #, fuzzy, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -13778,185 +13779,185 @@ msgstr ""
 "# 程式。每個不同的項目在中每欄有唯一識別號\n"
 "# 開始從零。\n"
 
-#: sys-utils/lscpu.c:1506
+#: sys-utils/lscpu.c:1501
 msgid "Architecture:"
 msgstr "架構："
 
-#: sys-utils/lscpu.c:1520
+#: sys-utils/lscpu.c:1515
 msgid "CPU op-mode(s):"
 msgstr "CPU 作業模式："
 
-#: sys-utils/lscpu.c:1523 sys-utils/lscpu.c:1525
+#: sys-utils/lscpu.c:1518 sys-utils/lscpu.c:1520
 #, fuzzy
 msgid "Byte Order:"
 msgstr "位元組次序："
 
-#: sys-utils/lscpu.c:1527
+#: sys-utils/lscpu.c:1522
 #, fuzzy
 msgid "CPU(s):"
 msgstr "CPU (s)："
 
-#: sys-utils/lscpu.c:1530
+#: sys-utils/lscpu.c:1525
 #, fuzzy
 msgid "On-line CPU(s) mask:"
 msgstr "線上 CPU (s) 遮罩："
 
-#: sys-utils/lscpu.c:1531
+#: sys-utils/lscpu.c:1526
 #, fuzzy
 msgid "On-line CPU(s) list:"
 msgstr "線上 CPU (s) 清單："
 
-#: sys-utils/lscpu.c:1550
+#: sys-utils/lscpu.c:1545
 #, fuzzy
 msgid "Off-line CPU(s) mask:"
 msgstr "離線 CPU (s) 遮罩："
 
-#: sys-utils/lscpu.c:1551
+#: sys-utils/lscpu.c:1546
 #, fuzzy
 msgid "Off-line CPU(s) list:"
 msgstr "離線 CPU (s) 清單："
 
-#: sys-utils/lscpu.c:1582
+#: sys-utils/lscpu.c:1577
 msgid "Thread(s) per core:"
 msgstr "每核心執行緒數："
 
-#: sys-utils/lscpu.c:1583
+#: sys-utils/lscpu.c:1578
 msgid "Core(s) per socket:"
 msgstr "每通訊端核心數："
 
-#: sys-utils/lscpu.c:1586
+#: sys-utils/lscpu.c:1581
 #, fuzzy
 msgid "Socket(s) per book:"
 msgstr "通訊端各書籍："
 
-#: sys-utils/lscpu.c:1588
+#: sys-utils/lscpu.c:1583
 #, fuzzy
 msgid "Book(s):"
 msgstr "書籍："
 
-#: sys-utils/lscpu.c:1590
+#: sys-utils/lscpu.c:1585
 #, fuzzy
 msgid "Socket(s):"
 msgstr "通訊端："
 
-#: sys-utils/lscpu.c:1594
+#: sys-utils/lscpu.c:1589
 msgid "NUMA node(s):"
 msgstr "NUMA 節點："
 
-#: sys-utils/lscpu.c:1596
+#: sys-utils/lscpu.c:1591
 msgid "Vendor ID:"
 msgstr "供應商識別號："
 
-#: sys-utils/lscpu.c:1598
+#: sys-utils/lscpu.c:1593
 msgid "CPU family:"
 msgstr "CPU 家族："
 
-#: sys-utils/lscpu.c:1600
+#: sys-utils/lscpu.c:1595
 msgid "Model:"
 msgstr "型號："
 
-#: sys-utils/lscpu.c:1602
+#: sys-utils/lscpu.c:1597
 #, fuzzy
 msgid "Model name:"
 msgstr "型號："
 
-#: sys-utils/lscpu.c:1604
+#: sys-utils/lscpu.c:1599
 msgid "Stepping:"
 msgstr "製程："
 
-#: sys-utils/lscpu.c:1606
+#: sys-utils/lscpu.c:1601
 msgid "CPU MHz:"
 msgstr "CPU MHz："
 
-#: sys-utils/lscpu.c:1608
+#: sys-utils/lscpu.c:1603
 #, fuzzy
 msgid "CPU max MHz:"
 msgstr "CPU MHz："
 
-#: sys-utils/lscpu.c:1610
+#: sys-utils/lscpu.c:1605
 #, fuzzy
 msgid "CPU min MHz:"
 msgstr "CPU MHz："
 
-#: sys-utils/lscpu.c:1612
+#: sys-utils/lscpu.c:1607
 #, fuzzy
 msgid "BogoMIPS:"
 msgstr "BogoMIPS："
 
-#: sys-utils/lscpu.c:1615 sys-utils/lscpu.c:1617
+#: sys-utils/lscpu.c:1610 sys-utils/lscpu.c:1612
 msgid "Virtualization:"
 msgstr "虛擬："
 
-#: sys-utils/lscpu.c:1620
+#: sys-utils/lscpu.c:1615
 #, fuzzy
 msgid "Hypervisor:"
 msgstr "Hypervisor："
 
-#: sys-utils/lscpu.c:1622
+#: sys-utils/lscpu.c:1617
 msgid "Hypervisor vendor:"
 msgstr "Hypervisor 供應商："
 
-#: sys-utils/lscpu.c:1623
+#: sys-utils/lscpu.c:1618
 msgid "Virtualization type:"
 msgstr "虛擬型態："
 
-#: sys-utils/lscpu.c:1626
+#: sys-utils/lscpu.c:1621
 #, fuzzy
 msgid "Dispatching mode:"
 msgstr "派送模式："
 
-#: sys-utils/lscpu.c:1632
+#: sys-utils/lscpu.c:1627
 #, c-format
 msgid "%s cache:"
 msgstr "%s 快取："
 
-#: sys-utils/lscpu.c:1638
+#: sys-utils/lscpu.c:1633
 #, c-format
 msgid "NUMA node%d CPU(s):"
 msgstr "NUMA node%d CPU(s)："
 
-#: sys-utils/lscpu.c:1643
+#: sys-utils/lscpu.c:1638
 #, fuzzy
 msgid "Flags:"
 msgstr "屬性旗標"
 
-#: sys-utils/lscpu.c:1654
+#: sys-utils/lscpu.c:1649
 msgid "Display information about the CPU architecture.\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:1657
+#: sys-utils/lscpu.c:1652
 #, fuzzy
 msgid " -a, --all               print both online and offline CPUs (default for -e)\n"
 msgstr " -a, --all                 列印所有符號，即使計數是 0\n"
 
-#: sys-utils/lscpu.c:1658
+#: sys-utils/lscpu.c:1653
 #, fuzzy
 msgid " -b, --online            print online CPUs only (default for -p)\n"
 msgstr " -i, --info                列印只有資訊關於取樣步驟\n"
 
-#: sys-utils/lscpu.c:1659
+#: sys-utils/lscpu.c:1654
 #, fuzzy
 msgid " -c, --offline           print offline CPUs only\n"
 msgstr " -n, --noparity          設定同位到無\n"
 
-#: sys-utils/lscpu.c:1660
+#: sys-utils/lscpu.c:1655
 msgid " -e, --extended[=<list>] print out an extended readable format\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:1661
+#: sys-utils/lscpu.c:1656
 msgid " -p, --parse[=<list>]    print out a parsable format\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:1662
+#: sys-utils/lscpu.c:1657
 msgid " -s, --sysroot <dir>     use specified directory as system root\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:1663
+#: sys-utils/lscpu.c:1658
 #, fuzzy
 msgid " -x, --hex               print hexadecimal masks rather than lists of CPUs\n"
 msgstr " -d, --debug             列印詳細的訊息到標準勘誤\n"
 
-#: sys-utils/lscpu.c:1760
+#: sys-utils/lscpu.c:1755
 #, fuzzy, c-format
 msgid "%s: options --all, --online and --offline may only be used with options --extended or --parse.\n"
 msgstr "%s：選項 --all，--online 和 --offline 也許會只有被使用與選項 --extended 或 --parsable。\n"
@@ -17250,7 +17251,7 @@ msgid "memory zram have consumed to store compressed data"
 msgstr ""
 
 #: sys-utils/zramctl.c:81
-msgid "number of objects migrated migrated by compaction"
+msgid "number of objects migrated by compaction"
 msgstr ""
 
 #: sys-utils/zramctl.c:297 sys-utils/zramctl.c:308
@@ -19104,6 +19105,10 @@ msgid "Input line too long."
 msgstr "輸入列太長。"
 
 #, fuzzy
+#~ msgid "Done."
+#~ msgstr "完成。\n"
+
+#, fuzzy
 #~ msgid ""
 #~ "Very long (%zu bytes) filename `%s' found.\n"
 #~ " Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting."