From aafc98c2eb2e7ee14b0a3b2c8b25d32152b82005 Mon Sep 17 00:00:00 2001
From: Boyuan Yang <073plan@gmail.com>
Date: Wed, 20 May 2020 15:31:00 +0200
Subject: [PATCH] po: update zh_CN.po (from translationproject.org)

---
 po/zh_CN.po | 1682 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 1005 insertions(+), 677 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 81323edfbb..748ab00f6f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the util-linux package.
 # Ray Wang <wanglei1123@gmail.com>, 2008.
 # Wylmer Wang <wantinghard@gmail.com>, 2012, 2013, 2014, 2015, 2016.
-# Boyuan Yang <073plan@gmail.com>, 2019.
+# Boyuan Yang <073plan@gmail.com>, 2019, 2020.
 msgid ""
 msgstr ""
-"Project-Id-Version: util-linux-2.34-rc2\n"
+"Project-Id-Version: util-linux-2.35-rc2\n"
 "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2020-01-31 10:14+0100\n"
-"PO-Revision-Date: 2019-12-07 12:48-0500\n"
+"POT-Creation-Date: 2020-01-08 10:30+0100\n"
+"PO-Revision-Date: 2020-03-10 12:26-0400\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.3\n"
 
 #: disk-utils/addpart.c:15
 #, c-format
@@ -40,7 +40,7 @@ msgid "not enough arguments"
 msgstr "参数不够"
 
 #: disk-utils/addpart.c:57 disk-utils/blockdev.c:293 disk-utils/blockdev.c:437
-#: disk-utils/blockdev.c:463 disk-utils/cfdisk.c:2724 disk-utils/delpart.c:58
+#: disk-utils/blockdev.c:463 disk-utils/cfdisk.c:2721 disk-utils/delpart.c:58
 #: disk-utils/fdformat.c:229 disk-utils/fdisk.c:780 disk-utils/fdisk.c:1085
 #: disk-utils/fdisk-list.c:326 disk-utils/fdisk-list.c:366
 #: disk-utils/fdisk-list.c:385 disk-utils/fsck.c:1468
@@ -49,10 +49,10 @@ msgstr "参数不够"
 #: disk-utils/mkfs.cramfs.c:171 disk-utils/mkfs.cramfs.c:660
 #: disk-utils/mkfs.cramfs.c:799 disk-utils/mkfs.minix.c:823
 #: disk-utils/mkswap.c:217 disk-utils/mkswap.c:246 disk-utils/partx.c:1019
-#: disk-utils/resizepart.c:104 disk-utils/sfdisk.c:474 disk-utils/sfdisk.c:729
-#: disk-utils/sfdisk.c:785 disk-utils/sfdisk.c:839 disk-utils/sfdisk.c:898
-#: disk-utils/sfdisk.c:977 disk-utils/sfdisk.c:1018 disk-utils/sfdisk.c:1048
-#: disk-utils/sfdisk.c:1085 disk-utils/sfdisk.c:1646 disk-utils/swaplabel.c:65
+#: disk-utils/resizepart.c:104 disk-utils/sfdisk.c:476 disk-utils/sfdisk.c:724
+#: disk-utils/sfdisk.c:780 disk-utils/sfdisk.c:834 disk-utils/sfdisk.c:893
+#: disk-utils/sfdisk.c:972 disk-utils/sfdisk.c:1013 disk-utils/sfdisk.c:1043
+#: disk-utils/sfdisk.c:1080 disk-utils/sfdisk.c:1641 disk-utils/swaplabel.c:65
 #: libfdisk/src/bsd.c:642 login-utils/islocal.c:87 login-utils/last.c:667
 #: login-utils/sulogin.c:444 login-utils/sulogin.c:481
 #: login-utils/utmpdump.c:134 login-utils/utmpdump.c:355
@@ -61,7 +61,7 @@ msgstr "参数不够"
 #: misc-utils/uuidd.c:198 sys-utils/blkdiscard.c:181 sys-utils/blkzone.c:96
 #: sys-utils/dmesg.c:527 sys-utils/eject.c:500 sys-utils/eject.c:699
 #: sys-utils/fallocate.c:399 sys-utils/fsfreeze.c:116 sys-utils/fstrim.c:102
-#: sys-utils/hwclock.c:234 sys-utils/hwclock.c:874 sys-utils/hwclock-rtc.c:138
+#: sys-utils/hwclock.c:233 sys-utils/hwclock.c:873 sys-utils/hwclock-rtc.c:138
 #: sys-utils/hwclock-rtc.c:403 sys-utils/hwclock-rtc.c:438
 #: sys-utils/ldattach.c:392 sys-utils/lscpu.c:527 sys-utils/nsenter.c:129
 #: sys-utils/rfkill.c:192 sys-utils/rfkill.c:553 sys-utils/rtcwake.c:137
@@ -346,352 +346,353 @@ msgstr "将分区表转储到与 sfdisk 兼容的脚本文件"
 msgid "internal error: unsupported dialog type %d"
 msgstr "内部错误：不支持的对话类型 %d"
 
-#: disk-utils/cfdisk.c:1282
+#: disk-utils/cfdisk.c:1279
 #, c-format
 msgid "%s (mounted)"
 msgstr "%s (已挂载)"
 
-#: disk-utils/cfdisk.c:1302
+#: disk-utils/cfdisk.c:1299
 msgid "Partition name:"
 msgstr "分区名："
 
-#: disk-utils/cfdisk.c:1309
+#: disk-utils/cfdisk.c:1306
 msgid "Partition UUID:"
 msgstr "分区 UUID："
 
-#: disk-utils/cfdisk.c:1321
+#: disk-utils/cfdisk.c:1318
 msgid "Partition type:"
 msgstr "分区类型："
 
-#: disk-utils/cfdisk.c:1328
+#: disk-utils/cfdisk.c:1325
 msgid "Attributes:"
 msgstr "属性："
 
-#: disk-utils/cfdisk.c:1352
+#: disk-utils/cfdisk.c:1349
 msgid "Filesystem UUID:"
 msgstr "文件系统 UUID："
 
-#: disk-utils/cfdisk.c:1359
+#: disk-utils/cfdisk.c:1356
 msgid "Filesystem LABEL:"
 msgstr "文件系统标签："
 
-#: disk-utils/cfdisk.c:1365
+#: disk-utils/cfdisk.c:1362
 msgid "Filesystem:"
 msgstr "文件系统："
 
-#: disk-utils/cfdisk.c:1370
+#: disk-utils/cfdisk.c:1367
 msgid "Mountpoint:"
 msgstr "挂载点："
 
-#: disk-utils/cfdisk.c:1714
+#: disk-utils/cfdisk.c:1711
 #, c-format
 msgid "Disk: %s"
 msgstr "磁盘：%s"
 
-#: disk-utils/cfdisk.c:1716
+#: disk-utils/cfdisk.c:1713
 #, c-format
 msgid "Size: %s, %<PRIu64> bytes, %ju sectors"
 msgstr "尺寸：%s，%<PRIu64> 字节，%ju 个扇区"
 
-#: disk-utils/cfdisk.c:1719
+#: disk-utils/cfdisk.c:1716
 #, c-format
 msgid "Label: %s, identifier: %s"
 msgstr "标签：%s，标识符：%s"
 
-#: disk-utils/cfdisk.c:1722
+#: disk-utils/cfdisk.c:1719
 #, c-format
 msgid "Label: %s"
 msgstr "标签：%s"
 
-#: disk-utils/cfdisk.c:1872
+#: disk-utils/cfdisk.c:1869
 msgid "May be followed by M for MiB, G for GiB, T for TiB, or S for sectors."
 msgstr "后面可以加 M(MiB), G(GiB), T(TiB) 或 S(扇区)。"
 
-#: disk-utils/cfdisk.c:1878
+#: disk-utils/cfdisk.c:1875
 msgid "Please, specify size."
 msgstr "请指定文件大小。"
 
-#: disk-utils/cfdisk.c:1900
+#: disk-utils/cfdisk.c:1897
 #, c-format
 msgid "Minimum size is %<PRIu64> bytes."
 msgstr "最小尺寸为 %<PRIu64> 字节。"
 
-#: disk-utils/cfdisk.c:1909
+#: disk-utils/cfdisk.c:1906
 #, c-format
 msgid "Maximum size is %<PRIu64> bytes."
 msgstr "最大尺寸为 %<PRIu64> 字节。"
 
-#: disk-utils/cfdisk.c:1916
+#: disk-utils/cfdisk.c:1913
 msgid "Failed to parse size."
 msgstr "解析大小失败。"
 
-#: disk-utils/cfdisk.c:1974
+#: disk-utils/cfdisk.c:1971
 msgid "Select partition type"
 msgstr "选择分区类型"
 
-#: disk-utils/cfdisk.c:2024 disk-utils/cfdisk.c:2054
+#: disk-utils/cfdisk.c:2021 disk-utils/cfdisk.c:2051
 msgid "Enter script file name: "
 msgstr "输入脚本文件名："
 
-#: disk-utils/cfdisk.c:2025
+#: disk-utils/cfdisk.c:2022
 msgid "The script file will be applied to in-memory partition table."
 msgstr "该脚本文件将应用于内存中的分区表。"
 
-#: disk-utils/cfdisk.c:2034 disk-utils/cfdisk.c:2076
+#: disk-utils/cfdisk.c:2031 disk-utils/cfdisk.c:2073
 #: disk-utils/fdisk-menu.c:481 disk-utils/fdisk-menu.c:525
 #, c-format
 msgid "Cannot open %s"
 msgstr "打不开 %s"
 
-#: disk-utils/cfdisk.c:2036 disk-utils/fdisk-menu.c:483
+#: disk-utils/cfdisk.c:2033 disk-utils/fdisk-menu.c:483
 #, c-format
 msgid "Failed to parse script file %s"
 msgstr "解析脚本文件 %s 失败"
 
-#: disk-utils/cfdisk.c:2038 disk-utils/fdisk-menu.c:485
+#: disk-utils/cfdisk.c:2035 disk-utils/fdisk-menu.c:485
 #, c-format
 msgid "Failed to apply script %s"
 msgstr "应用脚本文件 %s 失败"
 
-#: disk-utils/cfdisk.c:2055
+#: disk-utils/cfdisk.c:2052
 msgid "The current in-memory partition table will be dumped to the file."
 msgstr "当前的内存中分区表将转储到该文件中。"
 
-#: disk-utils/cfdisk.c:2063 disk-utils/fdisk-menu.c:513
+#: disk-utils/cfdisk.c:2060 disk-utils/fdisk-menu.c:513
 msgid "Failed to allocate script handler"
 msgstr "分配脚本处理程序失败"
 
-#: disk-utils/cfdisk.c:2069
+#: disk-utils/cfdisk.c:2066
 msgid "Failed to read disk layout into script."
 msgstr "将磁盘布局读入脚本出错。"
 
-#: disk-utils/cfdisk.c:2083
+#: disk-utils/cfdisk.c:2080
 msgid "Disk layout successfully dumped."
 msgstr "成功转储了磁盘布局。"
 
-#: disk-utils/cfdisk.c:2086 disk-utils/fdisk-menu.c:531
+#: disk-utils/cfdisk.c:2083 disk-utils/fdisk-menu.c:531
 #, c-format
 msgid "Failed to write script %s"
 msgstr "写脚本文件 %s 失败"
 
-#: disk-utils/cfdisk.c:2122
+#: disk-utils/cfdisk.c:2119
 msgid "Select label type"
 msgstr "选择标签类型"
 
-#: disk-utils/cfdisk.c:2125 disk-utils/fdisk.c:1093 disk-utils/fdisk-menu.c:489
+#: disk-utils/cfdisk.c:2122 disk-utils/fdisk.c:1093
+#: disk-utils/fdisk-menu.c:489
 msgid "Device does not contain a recognized partition table."
 msgstr "设备不包含可识别的分区表。"
 
-#: disk-utils/cfdisk.c:2133
+#: disk-utils/cfdisk.c:2130
 msgid "Select a type to create a new label or press 'L' to load script file."
 msgstr "选择一种类型来创建新标签，或按“L”加载脚本文件。"
 
 # 以下三句连贯，一起翻译
-#: disk-utils/cfdisk.c:2182
+#: disk-utils/cfdisk.c:2179
 msgid "This is cfdisk, a curses-based disk partitioning program."
 msgstr "这是 cfdisk，一款基于 curses 的磁盘分区程序，"
 
-#: disk-utils/cfdisk.c:2183
+#: disk-utils/cfdisk.c:2180
 msgid "It lets you create, delete, and modify partitions on a block device."
 msgstr "可以创建、删除和修改块设备上的分区。"
 
 # 以下两条注意对齐
-#: disk-utils/cfdisk.c:2185
+#: disk-utils/cfdisk.c:2182
 msgid "Command      Meaning"
 msgstr "命令         意义"
 
-#: disk-utils/cfdisk.c:2186
+#: disk-utils/cfdisk.c:2183
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: disk-utils/cfdisk.c:2187
+#: disk-utils/cfdisk.c:2184
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          切换当前分区的 可启动 标志"
 
-#: disk-utils/cfdisk.c:2188
+#: disk-utils/cfdisk.c:2185
 msgid "  d          Delete the current partition"
 msgstr "  d          删除当前分区"
 
-#: disk-utils/cfdisk.c:2189
+#: disk-utils/cfdisk.c:2186
 msgid "  h          Print this screen"
 msgstr "  h          打印此屏幕"
 
-#: disk-utils/cfdisk.c:2190
+#: disk-utils/cfdisk.c:2187
 msgid "  n          Create new partition from free space"
 msgstr "  n          从空闲空间创建新分区"
 
-#: disk-utils/cfdisk.c:2191
+#: disk-utils/cfdisk.c:2188
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          退出程序但不写入分区表"
 
-#: disk-utils/cfdisk.c:2192
+#: disk-utils/cfdisk.c:2189
 msgid "  s          Fix partitions order (only when in disarray)"
 msgstr "  s          修复分区顺序(仅磁盘阵列)"
 
-#: disk-utils/cfdisk.c:2193
+#: disk-utils/cfdisk.c:2190
 msgid "  t          Change the partition type"
 msgstr "  t          更改分区类型"
 
-#: disk-utils/cfdisk.c:2194
+#: disk-utils/cfdisk.c:2191
 msgid "  u          Dump disk layout to sfdisk compatible script file"
 msgstr "  u          将磁盘布局转储到兼容 sfdisk 的脚本文件"
 
-#: disk-utils/cfdisk.c:2195
+#: disk-utils/cfdisk.c:2192
 msgid "  W          Write partition table to disk (you must enter uppercase W);"
 msgstr "  W          将分区表写入磁盘(必须输入大写 W)；"
 
-#: disk-utils/cfdisk.c:2196
+#: disk-utils/cfdisk.c:2193
 msgid "               since this might destroy data on the disk, you must either"
 msgstr "             由于这可能破坏磁盘上的数据，您必须"
 
-#: disk-utils/cfdisk.c:2197
+#: disk-utils/cfdisk.c:2194
 msgid "               confirm or deny the write by entering 'yes' or 'no'"
 msgstr "             通过输入“yes”或“no”来确认或拒绝"
 
-#: disk-utils/cfdisk.c:2198
+#: disk-utils/cfdisk.c:2195
 msgid "  x          Display/hide extra information about a partition"
 msgstr "  x          显示/隐藏分区的额外信息"
 
-#: disk-utils/cfdisk.c:2199
+#: disk-utils/cfdisk.c:2196
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "上箭头       光标移到上一分区"
 
-#: disk-utils/cfdisk.c:2200
+#: disk-utils/cfdisk.c:2197
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "下箭头       光标移到下一分区"
 
-#: disk-utils/cfdisk.c:2201
+#: disk-utils/cfdisk.c:2198
 msgid "Left Arrow   Move cursor to the previous menu item"
 msgstr "上箭头       光标移到上一菜单项"
 
-#: disk-utils/cfdisk.c:2202
+#: disk-utils/cfdisk.c:2199
 msgid "Right Arrow  Move cursor to the next menu item"
 msgstr "下箭头       光标移到下一菜单项"
 
-#: disk-utils/cfdisk.c:2204
+#: disk-utils/cfdisk.c:2201
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "注：所有命令均可以大写或小写"
 
-#: disk-utils/cfdisk.c:2205
+#: disk-utils/cfdisk.c:2202
 msgid "case letters (except for Write)."
 msgstr "字母输入(除了 写入)。"
 
-#: disk-utils/cfdisk.c:2207
+#: disk-utils/cfdisk.c:2204
 msgid "Use lsblk(8) or partx(8) to see more details about the device."
 msgstr "使用 lsblk(8) 或 partx(8) 了解有关磁盘的更多细节。"
 
-#: disk-utils/cfdisk.c:2217 disk-utils/cfdisk.c:2520
+#: disk-utils/cfdisk.c:2214 disk-utils/cfdisk.c:2517
 msgid "Press a key to continue."
 msgstr "按下一个键继续。"
 
-#: disk-utils/cfdisk.c:2303
+#: disk-utils/cfdisk.c:2300
 msgid "Could not toggle the flag."
 msgstr "无法切换标志。"
 
-#: disk-utils/cfdisk.c:2313
+#: disk-utils/cfdisk.c:2310
 #, c-format
 msgid "Could not delete partition %zu."
 msgstr "无法删除分区 %zu。"
 
-#: disk-utils/cfdisk.c:2315 disk-utils/fdisk-menu.c:662
+#: disk-utils/cfdisk.c:2312 disk-utils/fdisk-menu.c:662
 #, c-format
 msgid "Partition %zu has been deleted."
 msgstr "分区 %zu 已删除。"
 
-#: disk-utils/cfdisk.c:2336
+#: disk-utils/cfdisk.c:2333
 msgid "Partition size: "
 msgstr "分区大小："
 
-#: disk-utils/cfdisk.c:2377
+#: disk-utils/cfdisk.c:2374
 #, c-format
 msgid "Changed type of partition %zu."
 msgstr "已更改分区 %zu 的类型。"
 
-#: disk-utils/cfdisk.c:2379
+#: disk-utils/cfdisk.c:2376
 #, c-format
 msgid "The type of partition %zu is unchanged."
 msgstr "分区 %zu 的类型未更改。"
 
-#: disk-utils/cfdisk.c:2400
+#: disk-utils/cfdisk.c:2397
 msgid "New size: "
 msgstr "新大小："
 
-#: disk-utils/cfdisk.c:2415
+#: disk-utils/cfdisk.c:2412
 #, c-format
 msgid "Partition %zu resized."
 msgstr "已调整分区 %zu 的大小。"
 
-#: disk-utils/cfdisk.c:2433 disk-utils/cfdisk.c:2549 disk-utils/fdisk.c:1082
+#: disk-utils/cfdisk.c:2430 disk-utils/cfdisk.c:2546 disk-utils/fdisk.c:1082
 #: disk-utils/fdisk-menu.c:592
 msgid "Device is open in read-only mode."
 msgstr "设备以只读方式打开。"
 
-#: disk-utils/cfdisk.c:2438
+#: disk-utils/cfdisk.c:2435
 msgid "Are you sure you want to write the partition table to disk? "
 msgstr "您确定想将分区表写入磁盘吗？"
 
-#: disk-utils/cfdisk.c:2440
+#: disk-utils/cfdisk.c:2437
 msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog."
 msgstr "输入“yes”或“no”或按 ESC 取消对话框。"
 
-#: disk-utils/cfdisk.c:2445 login-utils/lslogins.c:211 sys-utils/lscpu.c:1584
+#: disk-utils/cfdisk.c:2442 login-utils/lslogins.c:211 sys-utils/lscpu.c:1584
 #: sys-utils/lscpu.c:1594 sys-utils/lsmem.c:266
 msgid "yes"
 msgstr "是"
 
-#: disk-utils/cfdisk.c:2446
+#: disk-utils/cfdisk.c:2443
 msgid "Did not write partition table to disk."
 msgstr "未将分区表写入磁盘。"
 
-#: disk-utils/cfdisk.c:2451
+#: disk-utils/cfdisk.c:2448
 msgid "Failed to write disklabel."
 msgstr "写磁盘标签失败。"
 
-#: disk-utils/cfdisk.c:2457 disk-utils/fdisk-menu.c:599
+#: disk-utils/cfdisk.c:2454 disk-utils/fdisk-menu.c:599
 msgid "The partition table has been altered."
 msgstr "分区表已调整。"
 
-#: disk-utils/cfdisk.c:2480 disk-utils/cfdisk.c:2551
+#: disk-utils/cfdisk.c:2477 disk-utils/cfdisk.c:2548
 msgid "Note that partition table entries are not in disk order now."
 msgstr "注意，现在分区表记录没有按磁盘顺序。"
 
-#: disk-utils/cfdisk.c:2517
+#: disk-utils/cfdisk.c:2514
 #, c-format
 msgid "Device already contains a %s signature; it will be removed by a write command."
 msgstr "设备已包含一个 %s 签名；写入命令会将其移除。"
 
-#: disk-utils/cfdisk.c:2528
+#: disk-utils/cfdisk.c:2525
 msgid "failed to create a new disklabel"
 msgstr "创建新磁盘标签失败"
 
-#: disk-utils/cfdisk.c:2536
+#: disk-utils/cfdisk.c:2533
 msgid "failed to read partitions"
 msgstr "读分区失败"
 
-#: disk-utils/cfdisk.c:2635
+#: disk-utils/cfdisk.c:2632
 #, c-format
 msgid " %1$s [options] <disk>\n"
 msgstr " %1$s [选项] <磁盘>\n"
 
-#: disk-utils/cfdisk.c:2638 disk-utils/fdisk.c:825 disk-utils/sfdisk.c:1923
+#: disk-utils/cfdisk.c:2635 disk-utils/fdisk.c:825 disk-utils/sfdisk.c:1919
 msgid "Display or manipulate a disk partition table.\n"
 msgstr "显示或操作磁盘分区表。\n"
 
-#: disk-utils/cfdisk.c:2642
-#, fuzzy, c-format
+#: disk-utils/cfdisk.c:2639
+#, c-format
 msgid " -L, --color[=<when>]     colorize output (%s, %s or %s)\n"
-msgstr " -L, --color[=<何时>]     彩色输出(auto自动，always总是或never从不)\n"
+msgstr " -L, --color[=<时机>]     彩色输出（%s, %s 或 %s）\n"
 
-#: disk-utils/cfdisk.c:2645
+#: disk-utils/cfdisk.c:2642
 msgid " -z, --zero               start with zeroed partition table\n"
 msgstr " -z, --zero              以空分区表开始\n"
 
-#: disk-utils/cfdisk.c:2683 disk-utils/fdisk.c:970 disk-utils/sfdisk.c:2205
+#: disk-utils/cfdisk.c:2680 disk-utils/fdisk.c:970 disk-utils/sfdisk.c:2201
 #: misc-utils/cal.c:429 sys-utils/dmesg.c:1425 text-utils/hexdump.c:114
 msgid "unsupported color mode"
 msgstr "不支持的颜色模式"
 
-#: disk-utils/cfdisk.c:2702 disk-utils/fdisk.c:908 disk-utils/sfdisk.c:227
+#: disk-utils/cfdisk.c:2699 disk-utils/fdisk.c:908 disk-utils/sfdisk.c:227
 msgid "failed to allocate libfdisk context"
 msgstr "分配 libfdisk 环境(context)失败"
 
@@ -742,8 +743,8 @@ msgstr ""
 "将继续 ... "
 
 #: disk-utils/fdformat.c:146 disk-utils/fsck.minix.c:183
-#: disk-utils/swaplabel.c:123 misc-utils/wipefs.c:641 sys-utils/blkdiscard.c:85
-#: sys-utils/tunelp.c:95
+#: disk-utils/swaplabel.c:123 misc-utils/wipefs.c:641
+#: sys-utils/blkdiscard.c:85 sys-utils/tunelp.c:95
 #, c-format
 msgid " %s [options] <device>\n"
 msgstr " %s [选项] <设备>\n"
@@ -955,12 +956,13 @@ msgid "BLKGETSIZE ioctl failed on %s"
 msgstr "对 %s 进行 BLKGETSIZE ioctl 失败"
 
 #: disk-utils/fdisk.c:802
-#, fuzzy, c-format
+#, c-format
 msgid "The device contains '%s' signature and it will be removed by a write command. See fdisk(8) man page and --wipe option for more details."
-msgstr "设备已包含一个 %s 签名；写入命令会将其移除。"
+msgstr "设备已包含一个 '%s' 签名，写入命令会将其移除。请参见 fdisk(8) 的手册页和 --wipe 选项以了解更多细节。"
 
 #: disk-utils/fdisk.c:807
 #, fuzzy, c-format
+#| msgid "The old %s signature may remain on the device. It is recommended to wipe the device with wipefs(8) or fdisk --wipe, in order to avoid possible collisions."
 msgid "The device contains '%s' signature and it may remain on the device. It is recommended to wipe the device with wipefs(8) or fdisk --wipe, in order to avoid possible collisions."
 msgstr "旧签名 %s 可能仍然在设备上存留。建议您使用 wipefs(8) 或者 fdisk --wipe 来擦除该设备，以避免潜在的冲突。"
 
@@ -986,9 +988,9 @@ msgid " -c, --compatibility[=<mode>]  mode is 'dos' or 'nondos' (default)\n"
 msgstr " -c, --compatibility[=<模式>]  模式，为“dos”或“nondos”(默认)\n"
 
 #: disk-utils/fdisk.c:832
-#, fuzzy, c-format
+#, c-format
 msgid " -L, --color[=<when>]          colorize output (%s, %s or %s)\n"
-msgstr " -L, --color[=<时机>]          彩色输出(auto, always 或 never)\n"
+msgstr " -L, --color[=<时机>]          彩色输出（%s, %s 或 %s）\n"
 
 #: disk-utils/fdisk.c:835
 msgid " -l, --list                    display partitions and exit\n"
@@ -1015,14 +1017,14 @@ msgid "     --bytes                   print SIZE in bytes rather than in human r
 msgstr "     -b, --bytes                   以字节为单位而非易读的格式来打印 SIZE\n"
 
 #: disk-utils/fdisk.c:842
-#, fuzzy, c-format
+#, c-format
 msgid " -w, --wipe <mode>             wipe signatures (%s, %s or %s)\n"
-msgstr " -w, --wipe <模式>             擦除签名(auto, always 或 never)\n"
+msgstr " -w, --wipe <模式>             擦除签名（%s, %s 或 %s）\n"
 
-#: disk-utils/fdisk.c:844 disk-utils/sfdisk.c:1970
-#, fuzzy, c-format
+#: disk-utils/fdisk.c:844 disk-utils/sfdisk.c:1966
+#, c-format
 msgid " -W, --wipe-partitions <mode>  wipe signatures from new partitions (%s, %s or %s)\n"
-msgstr " -W, --wipe-partitions <模式>  擦除新分区的签名(auto, always 或 never)\n"
+msgstr " -W, --wipe-partitions <模式>  擦除新分区的签名(%s, %s 或 %s)\n"
 
 #: disk-utils/fdisk.c:847
 msgid " -C, --cylinders <number>      specify the number of cylinders\n"
@@ -1070,8 +1072,8 @@ msgstr "不支持的磁盘标签：%s"
 msgid "unsupported unit"
 msgstr "不支持的单位"
 
-#: disk-utils/fdisk.c:1003 disk-utils/fdisk.c:1008 disk-utils/sfdisk.c:2169
-#: disk-utils/sfdisk.c:2174
+#: disk-utils/fdisk.c:1003 disk-utils/fdisk.c:1008 disk-utils/sfdisk.c:2165
+#: disk-utils/sfdisk.c:2170
 msgid "unsupported wipe mode"
 msgstr "不支持的擦除模式"
 
@@ -1079,21 +1081,21 @@ msgstr "不支持的擦除模式"
 msgid "The device properties (sector size and geometry) should be used with one specified device only."
 msgstr "设备属性(扇区大小和几何属性)只能用于某个指定的设备。"
 
-#: disk-utils/fdisk.c:1052 disk-utils/fdisk.c:1067 disk-utils/fsck.cramfs.c:693
-#: disk-utils/mkfs.bfs.c:192 disk-utils/mkfs.cramfs.c:786
-#: disk-utils/partx.c:973 disk-utils/raw.c:136 disk-utils/raw.c:149
-#: disk-utils/raw.c:161 disk-utils/raw.c:202 misc-utils/cal.c:519
-#: misc-utils/findfs.c:58 misc-utils/look.c:149 misc-utils/whereis.c:586
-#: misc-utils/whereis.c:597 misc-utils/whereis.c:608 misc-utils/whereis.c:650
-#: schedutils/chrt.c:513 schedutils/ionice.c:262 schedutils/taskset.c:188
-#: sys-utils/chcpu.c:355 sys-utils/chmem.c:422 sys-utils/dmesg.c:1489
-#: sys-utils/ipcmk.c:134 sys-utils/ldattach.c:321 sys-utils/losetup.c:913
-#: sys-utils/lscpu.c:2391 sys-utils/lsmem.c:631 sys-utils/mount.c:812
-#: sys-utils/mount.c:820 sys-utils/mount.c:867 sys-utils/mount.c:880
-#: sys-utils/mount.c:952 sys-utils/mountpoint.c:189 sys-utils/pivot_root.c:71
-#: sys-utils/swapoff.c:229 sys-utils/swapon.c:993 sys-utils/switch_root.c:249
-#: sys-utils/umount.c:596 term-utils/setterm.c:1200 text-utils/col.c:233
-#: text-utils/more.c:1986
+#: disk-utils/fdisk.c:1052 disk-utils/fdisk.c:1067
+#: disk-utils/fsck.cramfs.c:693 disk-utils/mkfs.bfs.c:192
+#: disk-utils/mkfs.cramfs.c:786 disk-utils/partx.c:973 disk-utils/raw.c:136
+#: disk-utils/raw.c:149 disk-utils/raw.c:161 disk-utils/raw.c:202
+#: misc-utils/cal.c:519 misc-utils/findfs.c:58 misc-utils/look.c:149
+#: misc-utils/whereis.c:586 misc-utils/whereis.c:597 misc-utils/whereis.c:608
+#: misc-utils/whereis.c:650 schedutils/chrt.c:504 schedutils/ionice.c:262
+#: schedutils/taskset.c:188 sys-utils/chcpu.c:355 sys-utils/chmem.c:422
+#: sys-utils/dmesg.c:1489 sys-utils/ipcmk.c:134 sys-utils/ldattach.c:321
+#: sys-utils/losetup.c:913 sys-utils/lscpu.c:2391 sys-utils/lsmem.c:631
+#: sys-utils/mount.c:812 sys-utils/mount.c:820 sys-utils/mount.c:867
+#: sys-utils/mount.c:880 sys-utils/mount.c:952 sys-utils/mountpoint.c:189
+#: sys-utils/pivot_root.c:71 sys-utils/swapoff.c:229 sys-utils/swapon.c:993
+#: sys-utils/switch_root.c:249 sys-utils/umount.c:596
+#: term-utils/setterm.c:1200 text-utils/col.c:233 text-utils/more.c:1986
 msgid "bad usage"
 msgstr "错误用法"
 
@@ -1102,7 +1104,7 @@ msgstr "错误用法"
 msgid "Welcome to fdisk (%s)."
 msgstr "欢迎使用 fdisk (%s)。"
 
-#: disk-utils/fdisk.c:1075 disk-utils/sfdisk.c:1697
+#: disk-utils/fdisk.c:1075 disk-utils/sfdisk.c:1692
 msgid ""
 "Changes will remain in memory only, until you decide to write them.\n"
 "Be careful before using the write command.\n"
@@ -1165,7 +1167,7 @@ msgid "failed to allocate iterator"
 msgstr "分配迭代器失败"
 
 #: disk-utils/fdisk-list.c:126 disk-utils/fdisk-list.c:246
-#: disk-utils/partx.c:667 login-utils/lslogins.c:1025 misc-utils/fincore.c:356
+#: disk-utils/partx.c:667 login-utils/lslogins.c:1013 misc-utils/fincore.c:356
 #: misc-utils/findmnt.c:1625 misc-utils/lsblk.c:2071 misc-utils/lslocks.c:456
 #: misc-utils/uuidparse.c:252 misc-utils/wipefs.c:156 sys-utils/losetup.c:325
 #: sys-utils/lscpu.c:1655 sys-utils/lscpu.c:1867 sys-utils/lscpu.c:1999
@@ -1176,7 +1178,7 @@ msgid "failed to allocate output table"
 msgstr "分配输出表失败"
 
 #: disk-utils/fdisk-list.c:167 disk-utils/fdisk-list.c:270
-#: disk-utils/partx.c:581 login-utils/lslogins.c:1083 misc-utils/fincore.c:123
+#: disk-utils/partx.c:581 login-utils/lslogins.c:1071 misc-utils/fincore.c:123
 #: misc-utils/findmnt.c:688 misc-utils/findmnt.c:706 misc-utils/lsblk.c:1073
 #: misc-utils/lslocks.c:393 misc-utils/uuidparse.c:154 misc-utils/wipefs.c:223
 #: sys-utils/losetup.c:348 sys-utils/losetup.c:377 sys-utils/lscpu.c:1674
@@ -1189,7 +1191,7 @@ msgid "failed to allocate output line"
 msgstr "分配输出行失败"
 
 #: disk-utils/fdisk-list.c:177 disk-utils/fdisk-list.c:277
-#: disk-utils/partx.c:644 login-utils/lslogins.c:1184 misc-utils/fincore.c:159
+#: disk-utils/partx.c:644 login-utils/lslogins.c:1172 misc-utils/fincore.c:159
 #: misc-utils/findmnt.c:692 misc-utils/findmnt.c:711 misc-utils/lsblk.c:1114
 #: misc-utils/lslocks.c:443 misc-utils/uuidparse.c:239 misc-utils/wipefs.c:263
 #: sys-utils/losetup.c:305 sys-utils/lscpu.c:1741 sys-utils/lscpu.c:1903
@@ -1533,7 +1535,7 @@ msgstr ""
 "\n"
 "帮助 (专业命令)：\n"
 
-#: disk-utils/fdisk-menu.c:374 disk-utils/sfdisk.c:1362
+#: disk-utils/fdisk-menu.c:374 disk-utils/sfdisk.c:1357
 #, c-format
 msgid ""
 "\n"
@@ -1560,6 +1562,8 @@ msgid ""
 "\n"
 "All unwritten changes will be lost, do you really want to quit? "
 msgstr ""
+"\n"
+"所有未写入的修改均会丢失，您确认要退出吗？"
 
 #: disk-utils/fdisk-menu.c:449
 #, c-format
@@ -1586,16 +1590,16 @@ msgstr "将磁盘布局转换成脚本失败"
 msgid "Script successfully saved."
 msgstr "成本保存了脚本。"
 
-#: disk-utils/fdisk-menu.c:556 disk-utils/sfdisk.c:1585
+#: disk-utils/fdisk-menu.c:556 disk-utils/sfdisk.c:1580
 #, c-format
 msgid "Partition #%zu contains a %s signature."
 msgstr "分区 #%zu 包含一个 %s 签名。"
 
-#: disk-utils/fdisk-menu.c:559 disk-utils/sfdisk.c:1588
+#: disk-utils/fdisk-menu.c:559 disk-utils/sfdisk.c:1583
 msgid "Do you want to remove the signature?"
 msgstr "您想移除该签名吗？"
 
-#: disk-utils/fdisk-menu.c:564 disk-utils/sfdisk.c:1593
+#: disk-utils/fdisk-menu.c:564 disk-utils/sfdisk.c:1588
 msgid "The signature will be removed by a write command."
 msgstr "写入命令将移除该签名。"
 
@@ -2859,7 +2863,7 @@ msgstr ""
 " -V, --verbose      解释正在进行的操作；\n"
 "                      多次指定 -V 将导致空运行(dry-run)\n"
 
-#: disk-utils/mkfs.c:133 include/c.h:254 login-utils/su-common.c:1207
+#: disk-utils/mkfs.c:133 include/c.h:252 login-utils/su-common.c:1207
 #: login-utils/sulogin.c:793 login-utils/sulogin.c:797 sys-utils/flock.c:123
 #: sys-utils/rtcwake.c:609
 #, c-format
@@ -2869,24 +2873,23 @@ msgstr "执行 %s 失败"
 #: disk-utils/mkfs.cramfs.c:128
 #, c-format
 msgid " %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n name] dirname outfile\n"
-msgstr ""
+msgstr " %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n 名称] dirname outfile\n"
 
 #: disk-utils/mkfs.cramfs.c:131
-#, fuzzy
 msgid "Make compressed ROM file system."
-msgstr "检查并修复压缩的 ROM 文件系统。\n"
+msgstr "制作压缩的 ROM 文件系统"
 
 #: disk-utils/mkfs.cramfs.c:133
-#, fuzzy
 msgid " -v             be verbose"
 msgstr " -v             详尽模式"
 
 #: disk-utils/mkfs.cramfs.c:134
 msgid " -E             make all warnings errors (non-zero exit status)"
-msgstr ""
+msgstr " -E             将所有警告当作错误（以非零退出值返回）"
 
 #: disk-utils/mkfs.cramfs.c:135
 #, fuzzy
+#| msgid " -b, --blocksize <size>   use this blocksize, defaults to page size\n"
 msgid " -b blksize     use this blocksize, must equal page size"
 msgstr " -b, --blocksize <大小>   使用指定的块大小，默认为页的大小\n"
 
@@ -2901,16 +2904,17 @@ msgstr ""
 
 #: disk-utils/mkfs.cramfs.c:138
 #, fuzzy
+#| msgid " -i, --inodes <num>      number of inodes for the filesystem\n"
 msgid " -i file        insert a file image into the filesystem"
 msgstr " -i, --inodes <数字>     文件系统的 inode 数\n"
 
 #: disk-utils/mkfs.cramfs.c:139
-#, fuzzy
 msgid " -n name        set name of cramfs filesystem"
-msgstr " -A         检查所有文件系统\n"
+msgstr " -n 名称        设置 cramfs 文件系统的名称"
 
 #: disk-utils/mkfs.cramfs.c:140
 #, fuzzy, c-format
+#| msgid " -v             verbose mode"
 msgid " -p             pad by %d bytes for boot code\n"
 msgstr " -v             详尽模式"
 
@@ -2920,16 +2924,17 @@ msgstr ""
 
 #: disk-utils/mkfs.cramfs.c:142
 #, fuzzy
+#| msgid " -f           do not split long lines\n"
 msgid " -z             make explicit holes"
 msgstr " -f           不分割长行\n"
 
 #: disk-utils/mkfs.cramfs.c:143
 msgid " dirname        root of the filesystem to be compressed"
-msgstr ""
+msgstr " dirname        要压缩的文件系统的根"
 
 #: disk-utils/mkfs.cramfs.c:144
 msgid " outfile        output file"
-msgstr ""
+msgstr " outfile        输出文件"
 
 #: disk-utils/mkfs.cramfs.c:162
 #, c-format
@@ -3939,72 +3944,68 @@ msgstr "分区起点未移动；将忽略 --move-data"
 msgid "new partition is smaller than original; ignoring --move-data"
 msgstr "新分区小于原分区；将忽略 --move-data"
 
-#: disk-utils/sfdisk.c:448
-#, fuzzy
+#: disk-utils/sfdisk.c:450
 msgid "Data move: (--no-act)"
-msgstr "数据移动︰"
+msgstr "数据移动︰（--no-act）"
 
-#: disk-utils/sfdisk.c:448
+#: disk-utils/sfdisk.c:450
 msgid "Data move:"
 msgstr "数据移动︰"
 
-#: disk-utils/sfdisk.c:451
+#: disk-utils/sfdisk.c:453
 #, c-format
 msgid " typescript file: %s"
 msgstr "typescript 文件：%s"
 
-#: disk-utils/sfdisk.c:452
+#: disk-utils/sfdisk.c:454
 #, c-format
 msgid "  start sector: (from/to) %ju / %ju\n"
 msgstr ""
 
-#: disk-utils/sfdisk.c:453
+#: disk-utils/sfdisk.c:455
 #, fuzzy, c-format
+#| msgid ", %llu sectors\n"
 msgid "  sectors: %ju\n"
 msgstr "，%llu 个扇区\n"
 
-#: disk-utils/sfdisk.c:454
+#: disk-utils/sfdisk.c:456
 #, fuzzy, c-format
+#| msgid "get size in bytes"
 msgid "  step size: %zu bytes\n"
 msgstr "获得字节大小"
 
-#: disk-utils/sfdisk.c:464
+#: disk-utils/sfdisk.c:466
 msgid "Do you want to move partition data?"
 msgstr "您想移动分区数据吗？"
 
-#: disk-utils/sfdisk.c:466 disk-utils/sfdisk.c:1894
+#: disk-utils/sfdisk.c:468 disk-utils/sfdisk.c:1890
 msgid "Leaving."
 msgstr "离开中。"
 
-#: disk-utils/sfdisk.c:559
+#: disk-utils/sfdisk.c:554
 #, c-format
 msgid "Moved %ju from %ju sectors (%.3f%%, %.1f MiB/s)."
 msgstr ""
 
-#: disk-utils/sfdisk.c:564
+#: disk-utils/sfdisk.c:559 disk-utils/sfdisk.c:577
 #, c-format
 msgid "Moved %ju from %ju sectors (%.3f%%)."
 msgstr ""
 
-#: disk-utils/sfdisk.c:582
-#, c-format
-msgid "Moved %ju from %ju sectors (%.0f%%)."
-msgstr ""
-
-#: disk-utils/sfdisk.c:594
+#: disk-utils/sfdisk.c:589
 msgid "Your data has not been moved (--no-act)."
-msgstr ""
+msgstr "您的数据未被移动（--no-act）。"
 
-#: disk-utils/sfdisk.c:599
+#: disk-utils/sfdisk.c:594
 #, c-format
 msgid "%s: failed to move data"
 msgstr "%s：移动数据失败"
 
-#: disk-utils/sfdisk.c:614
+#: disk-utils/sfdisk.c:609
 msgid "The partition table is unchanged (--no-act)."
 msgstr "分区表未更改(--no-act)。"
 
-#: disk-utils/sfdisk.c:622
+#: disk-utils/sfdisk.c:617
 msgid ""
 "\n"
 "The partition table has been altered."
@@ -4012,12 +4013,12 @@ msgstr ""
 "\n"
 "分区表已调整。"
 
-#: disk-utils/sfdisk.c:705
+#: disk-utils/sfdisk.c:700
 #, c-format
 msgid "unsupported label '%s'"
 msgstr "不支持的标签：“%s”"
 
-#: disk-utils/sfdisk.c:708
+#: disk-utils/sfdisk.c:703
 msgid ""
 "Id  Name\n"
 "\n"
@@ -4025,178 +4026,178 @@ msgstr ""
 "Id 名称\n"
 "\n"
 
-#: disk-utils/sfdisk.c:738
+#: disk-utils/sfdisk.c:733
 msgid "unrecognized partition table type"
 msgstr "未识别的分区表类型"
 
-#: disk-utils/sfdisk.c:791
+#: disk-utils/sfdisk.c:786
 #, c-format
 msgid "Cannot get size of %s"
 msgstr "无法获得 %s 的大小"
 
-#: disk-utils/sfdisk.c:828
+#: disk-utils/sfdisk.c:823
 #, c-format
 msgid "total: %ju blocks\n"
 msgstr "共计：%ju 个块\n"
 
-#: disk-utils/sfdisk.c:890 disk-utils/sfdisk.c:973 disk-utils/sfdisk.c:1014
-#: disk-utils/sfdisk.c:1044 disk-utils/sfdisk.c:1111 disk-utils/sfdisk.c:1175
-#: disk-utils/sfdisk.c:1230 disk-utils/sfdisk.c:1286 disk-utils/sfdisk.c:1642
+#: disk-utils/sfdisk.c:885 disk-utils/sfdisk.c:968 disk-utils/sfdisk.c:1009
+#: disk-utils/sfdisk.c:1039 disk-utils/sfdisk.c:1106 disk-utils/sfdisk.c:1170
+#: disk-utils/sfdisk.c:1225 disk-utils/sfdisk.c:1281 disk-utils/sfdisk.c:1637
 msgid "no disk device specified"
 msgstr "未指定磁盘设备"
 
-#: disk-utils/sfdisk.c:902
+#: disk-utils/sfdisk.c:897
 msgid "toggle boot flags is unsupported for Hybrid GPT/MBR"
 msgstr "混合 GPT/MBR 不支持切换启动（boot）标志"
 
-#: disk-utils/sfdisk.c:907
+#: disk-utils/sfdisk.c:902
 msgid "cannot switch to PMBR"
 msgstr "无法切换至 PMBR"
 
-#: disk-utils/sfdisk.c:908
+#: disk-utils/sfdisk.c:903
 msgid "Activation is unsupported for GPT -- entering nested PMBR."
 msgstr "GPT 不支持激活（Activation）-- 将进入嵌套 PMBR。"
 
-#: disk-utils/sfdisk.c:911
+#: disk-utils/sfdisk.c:906
 msgid "toggle boot flags is supported for MBR or PMBR only"
 msgstr "只支持为 MBR 或 PMBR 切换启动（boot）标志"
 
-#: disk-utils/sfdisk.c:946 disk-utils/sfdisk.c:993 disk-utils/sfdisk.c:1116
-#: disk-utils/sfdisk.c:1180 disk-utils/sfdisk.c:1235 disk-utils/sfdisk.c:1291
-#: disk-utils/sfdisk.c:1640 disk-utils/sfdisk.c:2143
+#: disk-utils/sfdisk.c:941 disk-utils/sfdisk.c:988 disk-utils/sfdisk.c:1111
+#: disk-utils/sfdisk.c:1175 disk-utils/sfdisk.c:1230 disk-utils/sfdisk.c:1286
+#: disk-utils/sfdisk.c:1635 disk-utils/sfdisk.c:2139
 msgid "failed to parse partition number"
 msgstr "解析分区号失败"
 
-#: disk-utils/sfdisk.c:951
+#: disk-utils/sfdisk.c:946
 #, c-format
 msgid "%s: partition %d: failed to toggle bootable flag"
 msgstr "%s：分区 %d：开/关启动标志失败"
 
-#: disk-utils/sfdisk.c:988 disk-utils/sfdisk.c:996
+#: disk-utils/sfdisk.c:983 disk-utils/sfdisk.c:991
 #, c-format
 msgid "%s: partition %zu: failed to delete"
 msgstr "%s：分区 %zu：删除失败"
 
-#: disk-utils/sfdisk.c:1051
+#: disk-utils/sfdisk.c:1046
 #, c-format
 msgid "%s: does not contain a recognized partition table"
 msgstr "%s：不包含可识别的分区表"
 
-#: disk-utils/sfdisk.c:1055
+#: disk-utils/sfdisk.c:1050
 msgid "failed to allocate dump struct"
 msgstr "分配转储结构失败"
 
-#: disk-utils/sfdisk.c:1059
+#: disk-utils/sfdisk.c:1054
 #, c-format
 msgid "%s: failed to dump partition table"
 msgstr "%s：转储分区表失败"
 
-#: disk-utils/sfdisk.c:1089
+#: disk-utils/sfdisk.c:1084
 #, c-format
 msgid "%s: no partition table found"
 msgstr "%s：找不到分区表"
 
-#: disk-utils/sfdisk.c:1093
+#: disk-utils/sfdisk.c:1088
 #, c-format
 msgid "%s: partition %zu: partition table contains only %zu partitions"
 msgstr "%s：分区 %zu：分区表中只包含 %zu 个分区"
 
-#: disk-utils/sfdisk.c:1096
+#: disk-utils/sfdisk.c:1091
 #, c-format
 msgid "%s: partition %zu: partition is unused"
 msgstr "%s: 分区 %zu: 分区未使用"
 
-#: disk-utils/sfdisk.c:1115 disk-utils/sfdisk.c:1179 disk-utils/sfdisk.c:1234
-#: disk-utils/sfdisk.c:1290
+#: disk-utils/sfdisk.c:1110 disk-utils/sfdisk.c:1174 disk-utils/sfdisk.c:1229
+#: disk-utils/sfdisk.c:1285
 msgid "no partition number specified"
 msgstr "未指定分区号"
 
-#: disk-utils/sfdisk.c:1121 disk-utils/sfdisk.c:1185 disk-utils/sfdisk.c:1240
-#: disk-utils/sfdisk.c:1296 sys-utils/losetup.c:778
+#: disk-utils/sfdisk.c:1116 disk-utils/sfdisk.c:1180 disk-utils/sfdisk.c:1235
+#: disk-utils/sfdisk.c:1291 sys-utils/losetup.c:778
 msgid "unexpected arguments"
 msgstr "参数异常"
 
-#: disk-utils/sfdisk.c:1136
+#: disk-utils/sfdisk.c:1131
 #, c-format
 msgid "%s: partition %zu: failed to get partition type"
 msgstr "%s: 分区 %zu:获取分区类型失败"
 
-#: disk-utils/sfdisk.c:1155
+#: disk-utils/sfdisk.c:1150
 #, c-format
 msgid "failed to parse %s partition type '%s'"
 msgstr "解析 %s 的分区类型“%s”失败"
 
-#: disk-utils/sfdisk.c:1159
+#: disk-utils/sfdisk.c:1154
 #, c-format
 msgid "%s: partition %zu: failed to set partition type"
 msgstr "%s: 分区 %zu: 设置分区类型失败"
 
-#: disk-utils/sfdisk.c:1197
+#: disk-utils/sfdisk.c:1192
 #, c-format
 msgid "%s: partition %zu: failed to get partition UUID"
 msgstr "%s: 分区 %zu: 获取分区 UUID 失败"
 
-#: disk-utils/sfdisk.c:1210 disk-utils/sfdisk.c:1265 disk-utils/sfdisk.c:1319
+#: disk-utils/sfdisk.c:1205 disk-utils/sfdisk.c:1260 disk-utils/sfdisk.c:1314
 msgid "failed to allocate partition object"
 msgstr "分配分区对象失败"
 
-#: disk-utils/sfdisk.c:1214
+#: disk-utils/sfdisk.c:1209
 #, c-format
 msgid "%s: partition %zu: failed to set partition UUID"
 msgstr "%s: 分区 %zu: 设置分区 UUID 失败"
 
-#: disk-utils/sfdisk.c:1252
+#: disk-utils/sfdisk.c:1247
 #, c-format
 msgid "%s: partition %zu: failed to get partition name"
 msgstr "%s: 分区 %zu: 获取分区名失败"
 
-#: disk-utils/sfdisk.c:1269
+#: disk-utils/sfdisk.c:1264
 #, c-format
 msgid "%s: partition %zu: failed to set partition name"
 msgstr "%s: 分区 %zu: 设置分区名失败"
 
-#: disk-utils/sfdisk.c:1323
+#: disk-utils/sfdisk.c:1318
 #, c-format
 msgid "%s: partition %zu: failed to set partition attributes"
 msgstr "%s: 分区 %zu: 设置分区属性失败"
 
-#: disk-utils/sfdisk.c:1366
+#: disk-utils/sfdisk.c:1361
 msgid " Commands:\n"
 msgstr " 命令：\n"
 
-#: disk-utils/sfdisk.c:1368
+#: disk-utils/sfdisk.c:1363
 msgid "   write    write table to disk and exit\n"
 msgstr "   write    将分区表写入磁盘并退出\n"
 
-#: disk-utils/sfdisk.c:1369
+#: disk-utils/sfdisk.c:1364
 msgid "   quit     show new situation and wait for user's feedback before write\n"
 msgstr "   quit     显示新状况并等待用户反馈后再写入\n"
 
-#: disk-utils/sfdisk.c:1370
+#: disk-utils/sfdisk.c:1365
 msgid "   abort    exit sfdisk shell\n"
 msgstr "   abort    退出 sfdisk shell\n"
 
-#: disk-utils/sfdisk.c:1371
+#: disk-utils/sfdisk.c:1366
 msgid "   print    display the partition table\n"
 msgstr "   print    显示分区表\n"
 
-#: disk-utils/sfdisk.c:1372
+#: disk-utils/sfdisk.c:1367
 msgid "   help     show this help text\n"
 msgstr "   help     显示帮助并退出\n"
 
-#: disk-utils/sfdisk.c:1374
+#: disk-utils/sfdisk.c:1369
 msgid "   Ctrl-D   the same as 'quit'\n"
 msgstr "   Ctrl-D   同“quit”\n"
 
-#: disk-utils/sfdisk.c:1378
+#: disk-utils/sfdisk.c:1373
 msgid " Input format:\n"
 msgstr " 输入格式：\n"
 
-#: disk-utils/sfdisk.c:1380
+#: disk-utils/sfdisk.c:1375
 msgid "   <start>, <size>, <type>, <bootable>\n"
 msgstr "   <起点>, <大小>, <类型>, <可启动>\n"
 
-#: disk-utils/sfdisk.c:1383
+#: disk-utils/sfdisk.c:1378
 msgid ""
 "   <start>  Beginning of the partition in sectors, or bytes if\n"
 "            specified in the format <number>{K,M,G,T,P,E,Z,Y}.\n"
@@ -4206,7 +4207,7 @@ msgstr ""
 "            <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n"
 "            默认为第一处可用空间。\n"
 
-#: disk-utils/sfdisk.c:1388
+#: disk-utils/sfdisk.c:1383
 msgid ""
 "   <size>   Size of the partition in sectors, or bytes if\n"
 "            specified in the format <number>{K,M,G,T,P,E,Z,Y}.\n"
@@ -4216,73 +4217,75 @@ msgstr ""
 "            <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n"
 "            默认为所有可用空间。\n"
 
-#: disk-utils/sfdisk.c:1393
+#: disk-utils/sfdisk.c:1388
 msgid "   <type>   The partition type.  Default is a Linux data partition.\n"
 msgstr "   <类型>   分区类型。默认为 Linux 数据分区。\n"
 
-#: disk-utils/sfdisk.c:1394
+#: disk-utils/sfdisk.c:1389
 msgid "            MBR: hex or L,S,E,X,U,R,V shortcuts.\n"
 msgstr "            MBR：hex 或 L,S,E,X,U,R,V 快捷方式。\n"
 
-#: disk-utils/sfdisk.c:1395
+#: disk-utils/sfdisk.c:1390
 msgid "            GPT: UUID or L,S,H,U,R,V shortcuts.\n"
 msgstr "            GPT：UUID 或 L,S,H,U,R,V 快捷方式。\n"
 
-#: disk-utils/sfdisk.c:1398
+#: disk-utils/sfdisk.c:1393
 msgid "   <bootable>  Use '*' to mark an MBR partition as bootable.\n"
 msgstr "   <可启动>    使用“*”将 MBR 分区标记为 可启动。\n"
 
-#: disk-utils/sfdisk.c:1402
+#: disk-utils/sfdisk.c:1397
 msgid " Example:\n"
 msgstr "示例：\n"
 
-#: disk-utils/sfdisk.c:1404
+#: disk-utils/sfdisk.c:1399
 msgid "   , 4G     Creates a 4GiB partition at default start offset.\n"
 msgstr "   , 4G     在默认起始偏移位置创建一个 4GiB 分区。\n"
 
-#: disk-utils/sfdisk.c:1436 sys-utils/dmesg.c:1559
+#: disk-utils/sfdisk.c:1431 sys-utils/dmesg.c:1559
 msgid "unsupported command"
 msgstr "不支持的命令"
 
-#: disk-utils/sfdisk.c:1438
+#: disk-utils/sfdisk.c:1433
 #, c-format
 msgid "line %d: unsupported command"
 msgstr "第 %d 行：不支持的命令"
 
-#: disk-utils/sfdisk.c:1554
+#: disk-utils/sfdisk.c:1549
 #, fuzzy, c-format
+#| msgid "Device already contains a %s signature; it will be removed by a write command."
 msgid "The device contains '%s' signature and it will be removed by a write command. See sfdisk(8) man page and --wipe option for more details."
 msgstr "设备已包含一个 %s 签名；写入命令会将其移除。"
 
-#: disk-utils/sfdisk.c:1561
+#: disk-utils/sfdisk.c:1556
 #, fuzzy, c-format
+#| msgid "The old %s signature may remain on the device. It is recommended to wipe the device with wipefs(8) or sfdisk --wipe, in order to avoid possible collisions."
 msgid "The device contains '%s' signature and it may remain on the device. It is recommended to wipe the device with wipefs(8) or sfdisk --wipe, in order to avoid possible collisions."
 msgstr "旧签名 %s 可能仍然在设备上存留。建议您使用 wipefs(8) 或者 fdisk --wipe 来擦除该设备，以避免潜在的冲突。"
 
-#: disk-utils/sfdisk.c:1609
+#: disk-utils/sfdisk.c:1604
 msgid "failed to allocate partition name"
 msgstr "分配分区名失败"
 
-#: disk-utils/sfdisk.c:1650
+#: disk-utils/sfdisk.c:1645
 msgid "failed to allocate script handler"
 msgstr "分配脚本处理程序失败"
 
-#: disk-utils/sfdisk.c:1666
+#: disk-utils/sfdisk.c:1661
 #, c-format
 msgid "%s: cannot modify partition %d: no partition table was found"
 msgstr "%s：无法修改分区 %d：未找到分区表"
 
-#: disk-utils/sfdisk.c:1671
+#: disk-utils/sfdisk.c:1666
 #, c-format
 msgid "%s: cannot modify partition %d: partition table contains only %zu partitions"
 msgstr "%s: 无法修改分区 %d: 分区表只包含 %zu 个分区"
 
-#: disk-utils/sfdisk.c:1677
+#: disk-utils/sfdisk.c:1672
 #, c-format
 msgid "warning: %s: partition %d is not defined yet"
 msgstr "警告：%s: 分区 %d 尚未定义"
 
-#: disk-utils/sfdisk.c:1695
+#: disk-utils/sfdisk.c:1690
 #, c-format
 msgid ""
 "\n"
@@ -4291,11 +4294,11 @@ msgstr ""
 "\n"
 "欢迎使用 sfdisk (%s)。"
 
-#: disk-utils/sfdisk.c:1703
+#: disk-utils/sfdisk.c:1698
 msgid "Checking that no-one is using this disk right now ..."
 msgstr "请检查现在是不是有人在使用此磁盘..."
 
-#: disk-utils/sfdisk.c:1706
+#: disk-utils/sfdisk.c:1701
 msgid ""
 " FAILED\n"
 "\n"
@@ -4303,7 +4306,7 @@ msgstr ""
 " 失败\n"
 "\n"
 
-#: disk-utils/sfdisk.c:1709
+#: disk-utils/sfdisk.c:1704
 msgid ""
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
 "Umount all file systems, and swapoff all swap partitions on this disk.\n"
@@ -4313,11 +4316,11 @@ msgstr ""
 "请卸载此磁盘上所有的文件系统，并关闭(swapoff)上面的交换分区。\n"
 "可使用 --no-reread 标志阻止此检查。\n"
 
-#: disk-utils/sfdisk.c:1714
+#: disk-utils/sfdisk.c:1709
 msgid "Use the --force flag to overrule all checks."
 msgstr "使用 --force 标志否决所有检查。"
 
-#: disk-utils/sfdisk.c:1716
+#: disk-utils/sfdisk.c:1711
 msgid ""
 " OK\n"
 "\n"
@@ -4325,7 +4328,7 @@ msgstr ""
 " 好的\n"
 "\n"
 
-#: disk-utils/sfdisk.c:1728
+#: disk-utils/sfdisk.c:1723
 msgid ""
 "\n"
 "Old situation:"
@@ -4334,11 +4337,6 @@ msgstr ""
 "旧状况："
 
 #: disk-utils/sfdisk.c:1741
-#, fuzzy
-msgid "failed to set script header"
-msgstr "分配脚本处理程序失败"
-
-#: disk-utils/sfdisk.c:1746
 #, c-format
 msgid ""
 "\n"
@@ -4350,7 +4348,7 @@ msgstr ""
 "sfdisk 即将创建一个新的磁盘标签“%s”。\n"
 "在定义第一个分区之前使用“label: <名字>”可覆盖默认值。"
 
-#: disk-utils/sfdisk.c:1749
+#: disk-utils/sfdisk.c:1744
 msgid ""
 "\n"
 "Type 'help' to get more information.\n"
@@ -4358,32 +4356,32 @@ msgstr ""
 "\n"
 "请执行“%s --help”了解更多信息。\n"
 
-#: disk-utils/sfdisk.c:1767
+#: disk-utils/sfdisk.c:1762
 msgid "All partitions used."
 msgstr "所有分区均已使用。"
 
-#: disk-utils/sfdisk.c:1795
+#: disk-utils/sfdisk.c:1790
 msgid "Done.\n"
 msgstr "完成。\n"
 
-#: disk-utils/sfdisk.c:1807
+#: disk-utils/sfdisk.c:1802
 msgid "Ignoring partition."
 msgstr "忽略分区。"
 
-#: disk-utils/sfdisk.c:1816 disk-utils/sfdisk.c:1875
+#: disk-utils/sfdisk.c:1811 disk-utils/sfdisk.c:1871
 msgid "Failed to apply script headers, disk label not created."
 msgstr "无法应用脚本标头(header)，未创建磁盘标签。"
 
-#: disk-utils/sfdisk.c:1835
+#: disk-utils/sfdisk.c:1830
 #, c-format
 msgid "Failed to add #%d partition"
 msgstr "添加 #%d 分区失败"
 
-#: disk-utils/sfdisk.c:1858
+#: disk-utils/sfdisk.c:1853
 msgid "Script header accepted."
 msgstr "已接受脚本标头(header)。"
 
-#: disk-utils/sfdisk.c:1882
+#: disk-utils/sfdisk.c:1878
 msgid ""
 "\n"
 "New situation:"
@@ -4391,15 +4389,15 @@ msgstr ""
 "\n"
 "新状况："
 
-#: disk-utils/sfdisk.c:1892
+#: disk-utils/sfdisk.c:1888
 msgid "Do you want to write this to disk?"
 msgstr "您想写入该磁盘吗？"
 
-#: disk-utils/sfdisk.c:1905
+#: disk-utils/sfdisk.c:1901
 msgid "Leaving.\n"
 msgstr "离开中。\n"
 
-#: disk-utils/sfdisk.c:1919
+#: disk-utils/sfdisk.c:1915
 #, c-format
 msgid ""
 " %1$s [options] <dev> [[-N] <part>]\n"
@@ -4408,183 +4406,183 @@ msgstr ""
 " %1$s [选项] <设备> [[-N] <分区>]\n"
 " %1$s [选项] <命令>\n"
 
-#: disk-utils/sfdisk.c:1926
+#: disk-utils/sfdisk.c:1922
 msgid " -A, --activate <dev> [<part> ...] list or set bootable (P)MBR partitions\n"
 msgstr " -A, --activate <设备> [<分区> ...] 列出或设置可启动的 (P)MBR 分区\n"
 
-#: disk-utils/sfdisk.c:1927
+#: disk-utils/sfdisk.c:1923
 msgid " -d, --dump <dev>                  dump partition table (usable for later input)\n"
 msgstr " -d, --dump <设备>                 转储分区表(用于后续输入)\n"
 
-#: disk-utils/sfdisk.c:1928
+#: disk-utils/sfdisk.c:1924
 msgid " -J, --json <dev>                  dump partition table in JSON format\n"
 msgstr " -J, --json <设备>                 以 JSON 格式转储分区表\n"
 
-#: disk-utils/sfdisk.c:1929
+#: disk-utils/sfdisk.c:1925
 msgid " -g, --show-geometry [<dev> ...]   list geometry of all or specified devices\n"
 msgstr " -g, --show-geometry [<设备> ...]  列出所有或指定设备的几何属性\n"
 
-#: disk-utils/sfdisk.c:1930
+#: disk-utils/sfdisk.c:1926
 msgid " -l, --list [<dev> ...]            list partitions of each device\n"
 msgstr " -l, --list [<设备> ...]           列出每台设备上的分区\n"
 
-#: disk-utils/sfdisk.c:1931
+#: disk-utils/sfdisk.c:1927
 msgid " -F, --list-free [<dev> ...]       list unpartitioned free areas of each device\n"
 msgstr " -F, --list-free [<设备> ...]      列出每台设备上的未分区空间\n"
 
-#: disk-utils/sfdisk.c:1932
+#: disk-utils/sfdisk.c:1928
 msgid " -r, --reorder <dev>               fix partitions order (by start offset)\n"
 msgstr " -r, --reorder <设备>              (通过起始偏移量)修复分区顺序\n"
 
-#: disk-utils/sfdisk.c:1933
+#: disk-utils/sfdisk.c:1929
 msgid " -s, --show-size [<dev> ...]       list sizes of all or specified devices\n"
 msgstr " -s, --show-size [<设备> ...]       列出所有或指定设备的大小\n"
 
-#: disk-utils/sfdisk.c:1934
+#: disk-utils/sfdisk.c:1930
 msgid " -T, --list-types                  print the recognized types (see -X)\n"
 msgstr " -T, --list-types                  打印识别的类型(见 -X)\n"
 
-#: disk-utils/sfdisk.c:1935
+#: disk-utils/sfdisk.c:1931
 msgid " -V, --verify [<dev> ...]          test whether partitions seem correct\n"
 msgstr " -V, --verify [<设备> ...]         测试分区是否正确\n"
 
-#: disk-utils/sfdisk.c:1936
+#: disk-utils/sfdisk.c:1932
 msgid "     --delete <dev> [<part> ...]   delete all or specified partitions\n"
 msgstr "     --delete <设备> [<分区> ...]  删除所有或指定分区\n"
 
-#: disk-utils/sfdisk.c:1939
+#: disk-utils/sfdisk.c:1935
 msgid " --part-label <dev> <part> [<str>] print or change partition label\n"
 msgstr " --part-label <设备> <分区> [<字符串>] 打印或更改分区标签\n"
 
-#: disk-utils/sfdisk.c:1940
+#: disk-utils/sfdisk.c:1936
 msgid " --part-type <dev> <part> [<type>] print or change partition type\n"
 msgstr " --part-type <设备> <分区> [<类型>]    打印或更改分区类型\n"
 
-#: disk-utils/sfdisk.c:1941
+#: disk-utils/sfdisk.c:1937
 msgid " --part-uuid <dev> <part> [<uuid>] print or change partition uuid\n"
 msgstr " --part-uuid <设备> <分区> [<uuid>]    打印或更改分区 uuid\n"
 
-#: disk-utils/sfdisk.c:1942
+#: disk-utils/sfdisk.c:1938
 msgid " --part-attrs <dev> <part> [<str>] print or change partition attributes\n"
 msgstr " --part-attrs <设备> <分区> [<字符串>] 打印或更改分区属性\n"
 
-#: disk-utils/sfdisk.c:1945
+#: disk-utils/sfdisk.c:1941
 msgid " <dev>                     device (usually disk) path\n"
 msgstr " <设备>                    设备(通常是磁盘)的路径\n"
 
-#: disk-utils/sfdisk.c:1946
+#: disk-utils/sfdisk.c:1942
 msgid " <part>                    partition number\n"
 msgstr " <分区>                   分区号\n"
 
-#: disk-utils/sfdisk.c:1947
+#: disk-utils/sfdisk.c:1943
 msgid " <type>                    partition type, GUID for GPT, hex for MBR\n"
 msgstr " <类型>                    分区类型，GUID 对应 GPT，hex 对应 MBR\n"
 
-#: disk-utils/sfdisk.c:1950
+#: disk-utils/sfdisk.c:1946
 msgid " -a, --append              append partitions to existing partition table\n"
 msgstr " -a, --append              将分区附加到已有分区表\n"
 
-#: disk-utils/sfdisk.c:1951
+#: disk-utils/sfdisk.c:1947
 msgid " -b, --backup              backup partition table sectors (see -O)\n"
 msgstr " -b, --backup              备份分区表扇区(见 -O)\n"
 
-#: disk-utils/sfdisk.c:1952
+#: disk-utils/sfdisk.c:1948
 msgid "     --bytes               print SIZE in bytes rather than in human readable format\n"
 msgstr "     -b, --bytes               以字节为单位而非易读的格式来打印 SIZE\n"
 
-#: disk-utils/sfdisk.c:1953
+#: disk-utils/sfdisk.c:1949
 msgid "     --move-data[=<typescript>] move partition data after relocation (requires -N)\n"
 msgstr "     --move-data[=<typescript>] 重新定位后移动分区数据(需要 -N)\n"
 
-#: disk-utils/sfdisk.c:1954
+#: disk-utils/sfdisk.c:1950
 msgid "     --move-use-fsync      use fsync after each write when move data\n"
-msgstr ""
+msgstr "     --move-use-fsync      移动数据每次写入后调用 fsync\n"
 
-#: disk-utils/sfdisk.c:1955
+#: disk-utils/sfdisk.c:1951
 msgid " -f, --force               disable all consistency checking\n"
 msgstr " -f, --force               禁用所有的一致性检查\n"
 
-#: disk-utils/sfdisk.c:1957
-#, fuzzy, c-format
+#: disk-utils/sfdisk.c:1953
+#, c-format
 msgid "     --color[=<when>]      colorize output (%s, %s or %s)\n"
-msgstr "     --color[=<何时>]     彩色输出(auto，always 或 never)\n"
+msgstr "     --color[=<何时>]     彩色输出（%s, %s 或 %s）\n"
 
-#: disk-utils/sfdisk.c:1960
+#: disk-utils/sfdisk.c:1956
 msgid " -N, --partno <num>        specify partition number\n"
 msgstr " -N, --partno <数字>       指定分区号\n"
 
-#: disk-utils/sfdisk.c:1961
+#: disk-utils/sfdisk.c:1957
 msgid " -n, --no-act              do everything except write to device\n"
 msgstr " -n, --no-act              不真正执行写入设备\n"
 
-#: disk-utils/sfdisk.c:1962
+#: disk-utils/sfdisk.c:1958
 msgid "     --no-reread           do not check whether the device is in use\n"
 msgstr "     --no-reread           不检查设备是否正在使用\n"
 
-#: disk-utils/sfdisk.c:1963
+#: disk-utils/sfdisk.c:1959
 msgid "     --no-tell-kernel      do not tell kernel about changes\n"
 msgstr "     --no-tell-kernel      更改而不告诉内核\n"
 
-#: disk-utils/sfdisk.c:1964
+#: disk-utils/sfdisk.c:1960
 msgid " -O, --backup-file <path>  override default backup file name\n"
 msgstr " -O, --backup-file <路径>  覆盖默认的备份文件名\n"
 
-#: disk-utils/sfdisk.c:1965
+#: disk-utils/sfdisk.c:1961
 msgid " -o, --output <list>       output columns\n"
 msgstr " -o, --output <列表>       输出列\n"
 
-#: disk-utils/sfdisk.c:1966
+#: disk-utils/sfdisk.c:1962
 msgid " -q, --quiet               suppress extra info messages\n"
 msgstr " -q, --quiet               禁止输出额外信息\n"
 
-#: disk-utils/sfdisk.c:1968
-#, fuzzy, c-format
+#: disk-utils/sfdisk.c:1964
+#, c-format
 msgid " -w, --wipe <mode>         wipe signatures (%s, %s or %s)\n"
-msgstr " -w, --wipe <模式>         擦除签名(auto, always 或 never)\n"
+msgstr " -w, --wipe <模式>         擦除签名（%s, %s 或 %s）\n"
 
-#: disk-utils/sfdisk.c:1971
+#: disk-utils/sfdisk.c:1967
 msgid " -X, --label <name>        specify label type (dos, gpt, ...)\n"
 msgstr " -X, --label <名称>        指定标签类型(dos, gpt, ...)\n"
 
-#: disk-utils/sfdisk.c:1972
+#: disk-utils/sfdisk.c:1968
 msgid " -Y, --label-nested <name> specify nested label type (dos, bsd)\n"
 msgstr " -Y, --label-nested <名称> 指定嵌套标签类型(dos, bsd)\n"
 
-#: disk-utils/sfdisk.c:1974
+#: disk-utils/sfdisk.c:1970
 msgid " -G, --show-pt-geometry    deprecated, alias to --show-geometry\n"
 msgstr " -G, --show-pt-geometry    已废弃，同 --show-geometry\n"
 
-#: disk-utils/sfdisk.c:1975
+#: disk-utils/sfdisk.c:1971
 msgid " -L, --Linux               deprecated, only for backward compatibility\n"
 msgstr " -L, --Linux               已废弃，仅为向后兼容\n"
 
-#: disk-utils/sfdisk.c:1976
+#: disk-utils/sfdisk.c:1972
 msgid " -u, --unit S              deprecated, only sector unit is supported\n"
 msgstr " -u, --unit S              已废弃，只支持扇区单位\n"
 
-#: disk-utils/sfdisk.c:2097
+#: disk-utils/sfdisk.c:2093
 #, c-format
 msgid "%s is deprecated in favour of --part-type"
 msgstr "%s 已废弃，请改用 --part-type"
 
-#: disk-utils/sfdisk.c:2102
+#: disk-utils/sfdisk.c:2098
 msgid "--id is deprecated in favour of --part-type"
 msgstr "--id 已废弃，请改用 --part-type"
 
-#: disk-utils/sfdisk.c:2118
+#: disk-utils/sfdisk.c:2114
 msgid "--show-pt-geometry is no more implemented. Using --show-geometry."
 msgstr "--show-pt-geometry 不再实现。请使用 --show-geometry。"
 
-#: disk-utils/sfdisk.c:2130
+#: disk-utils/sfdisk.c:2126
 msgid "--Linux option is unnecessary and deprecated"
 msgstr "--Linux 选项没必要，并且已废弃"
 
-#: disk-utils/sfdisk.c:2159
+#: disk-utils/sfdisk.c:2155
 #, c-format
 msgid "unsupported unit '%c'"
 msgstr "不支持的单位“%c”"
 
-#: disk-utils/sfdisk.c:2240
+#: disk-utils/sfdisk.c:2236
 msgid "--movedata requires -N"
 msgstr "--movedata  需要 -N"
 
@@ -4634,12 +4632,12 @@ msgstr ""
 msgid "ignore -U (UUIDs are unsupported)"
 msgstr "忽略 -U (不支持 UUID)"
 
-#: include/c.h:245
+#: include/c.h:243
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "请尝试执行“%s --help”了解更多信息。\n"
 
-#: include/c.h:349
+#: include/c.h:347
 msgid ""
 "\n"
 "Usage:\n"
@@ -4647,7 +4645,7 @@ msgstr ""
 "\n"
 "用法：\n"
 
-#: include/c.h:350
+#: include/c.h:348
 msgid ""
 "\n"
 "Options:\n"
@@ -4655,7 +4653,7 @@ msgstr ""
 "\n"
 "选项：\n"
 
-#: include/c.h:351
+#: include/c.h:349
 msgid ""
 "\n"
 "Functions:\n"
@@ -4663,7 +4661,7 @@ msgstr ""
 "\n"
 "功能：\n"
 
-#: include/c.h:352
+#: include/c.h:350
 msgid ""
 "\n"
 "Commands:\n"
@@ -4671,7 +4669,7 @@ msgstr ""
 "\n"
 "命令：\n"
 
-#: include/c.h:353
+#: include/c.h:351
 msgid ""
 "\n"
 "Available output columns:\n"
@@ -4679,15 +4677,15 @@ msgstr ""
 "\n"
 "可用的输出列：\n"
 
-#: include/c.h:356
+#: include/c.h:354
 msgid "display this help"
 msgstr "显示此帮助"
 
-#: include/c.h:357
+#: include/c.h:355
 msgid "display version"
 msgstr "显示版本"
 
-#: include/c.h:365
+#: include/c.h:363
 #, c-format
 msgid ""
 "\n"
@@ -4696,7 +4694,7 @@ msgstr ""
 "\n"
 "更多信息请参阅 %s。\n"
 
-#: include/c.h:367
+#: include/c.h:365
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s，来自 %s\n"
@@ -4880,9 +4878,8 @@ msgid "Apple HFS/HFS+"
 msgstr "Apple HFS/HFS+"
 
 #: include/pt-gpt-partnames.h:78
-#, fuzzy
 msgid "Apple APFS"
-msgstr "Apple UFS"
+msgstr "Apple APFS"
 
 #: include/pt-gpt-partnames.h:79
 msgid "Apple UFS"
@@ -5058,11 +5055,13 @@ msgstr "VMware 诊断"
 
 #: include/pt-gpt-partnames.h:135
 #, fuzzy
+#| msgid "VMware VMFS"
 msgid "VMware Virtual SAN"
 msgstr "VMware VMFS"
 
 #: include/pt-gpt-partnames.h:136
 #, fuzzy
+#| msgid "VMware VMFS"
 msgid "VMware Virsto"
 msgstr "VMware VMFS"
 
@@ -5084,11 +5083,11 @@ msgstr "Plan 9 分区"
 
 #: include/pt-gpt-partnames.h:149
 msgid "HiFive Unleashed FSBL"
-msgstr ""
+msgstr "HiFive Unleashed FSBL"
 
 #: include/pt-gpt-partnames.h:150
 msgid "HiFive Unleashed BBL"
-msgstr ""
+msgstr "HiFive Unleashed BBL"
 
 #: include/pt-mbr-partnames.h:1
 msgid "Empty"
@@ -5681,9 +5680,9 @@ msgid "Cpg"
 msgstr "Cpg"
 
 #: libfdisk/src/context.c:740
-#, fuzzy, c-format
+#, c-format
 msgid "%s: fsync device failed"
-msgstr "%s：关闭设备失败"
+msgstr "%s：设备 fsync 失败"
 
 #: libfdisk/src/context.c:745
 #, c-format
@@ -5700,6 +5699,7 @@ msgstr "重新读取分区表失败。"
 
 #: libfdisk/src/context.c:836
 #, fuzzy
+#| msgid "The kernel still uses the old table. The new table will be used at the next reboot or after you run partprobe(8) or kpartx(8)."
 msgid "The kernel still uses the old table. The new table will be used at the next reboot or after you run partprobe(8) or partx(8)."
 msgstr "内核仍在使用旧分区表。新分区表将在下次重启或运行 partprobe(8) 或 kpartx(8) 后生效。"
 
@@ -5722,17 +5722,17 @@ msgstr "添加分区 %zu 至系统时失败"
 msgid "The kernel still uses the old partitions. The new table will be used at the next reboot. "
 msgstr "内核仍在使用旧分区。新分区表将在下次重启后生效。"
 
-#: libfdisk/src/context.c:1155
+#: libfdisk/src/context.c:1154
 msgid "cylinder"
 msgid_plural "cylinders"
 msgstr[0] "柱面"
 
-#: libfdisk/src/context.c:1156
+#: libfdisk/src/context.c:1155
 msgid "sector"
 msgid_plural "sectors"
 msgstr[0] "扇区"
 
-#: libfdisk/src/context.c:1512
+#: libfdisk/src/context.c:1511
 msgid "Incomplete geometry setting."
 msgstr "不完整的几何属性设置。"
 
@@ -5953,6 +5953,7 @@ msgstr "分区类型"
 
 #: libfdisk/src/dos.c:1798
 #, fuzzy, c-format
+#| msgid "%zu primary, %d extended, %zu free"
 msgid "%u primary, %d extended, %u free"
 msgstr "%zu个主分区，%d个扩展分区，%zu空闲"
 
@@ -6126,6 +6127,7 @@ msgstr "不支持的 GPT 属性位“%s”"
 
 #: libfdisk/src/gpt.c:1676
 #, fuzzy, c-format
+#| msgid "failed to parse list '%s'"
 msgid "failed to parse GPT attribute string '%s'"
 msgstr "解析列表“%s”失败"
 
@@ -6152,9 +6154,8 @@ msgid "The end of the partition oversteps LastUsableLBA."
 msgstr "分区终点超过了最后可用 LBA。"
 
 #: libfdisk/src/gpt.c:1986
-#, fuzzy
 msgid "The device contains hybrid MBR -- writing GPT only."
-msgstr "该设备包含混合 MBR -- 将只写入 GPT。您需要手动同步 MBR。"
+msgstr "该设备包含混合 MBR -- 将只写入 GPT。"
 
 #: libfdisk/src/gpt.c:2022
 msgid "Disk does not contain a valid backup header."
@@ -6222,6 +6223,7 @@ msgstr "磁头版本：%s"
 
 #: libfdisk/src/gpt.c:2100
 #, fuzzy, c-format
+#| msgid "Using %u out of %d partitions."
 msgid "Using %zu out of %zu partitions."
 msgstr "使用着 %2$d 个分区中的 %1$u 个。"
 
@@ -6285,11 +6287,13 @@ msgstr "创建新分区表的空闲空间不够！"
 
 #: libfdisk/src/gpt.c:2570
 #, fuzzy, c-format
+#| msgid "Partition #%u out of range (minimal start is %<PRIu64> sectors)"
 msgid "Partition #%zu out of range (minimal start is %<PRIu64> sectors)"
 msgstr "分区 #%u 超出范围(最小起点是 %<PRIu64> 扇区)"
 
 #: libfdisk/src/gpt.c:2575
 #, fuzzy, c-format
+#| msgid "Partition #%u out of range (maximal end is %<PRIu64> sectors)"
 msgid "Partition #%zu out of range (maximal end is %<PRIu64> sectors)"
 msgstr "分区 #%u 超出范围(最小终点是 %<PRIu64> 扇区)"
 
@@ -6298,9 +6302,9 @@ msgid "The partition entry size is zero."
 msgstr "分区条目大小为零。"
 
 #: libfdisk/src/gpt.c:2623
-#, fuzzy, c-format
+#, c-format
 msgid "The number of the partition has to be smaller than %zu."
-msgstr "已创建分区达到最大数量。"
+msgstr "分区数量必须小于 %zu。"
 
 #: libfdisk/src/gpt.c:2646
 msgid "Cannot allocate memory!"
@@ -6358,18 +6362,18 @@ msgstr "UUID"
 msgid "Name"
 msgstr "名称"
 
-#: libfdisk/src/partition.c:847
+#: libfdisk/src/partition.c:836
 msgid "Free space"
 msgstr "剩余空间"
 
-#: libfdisk/src/partition.c:1271
+#: libfdisk/src/partition.c:1260
 #, c-format
 msgid "Failed to resize partition #%zu."
 msgstr "调整分区 #%zu 的大小失败。"
 
 #: libfdisk/src/parttype.c:239 misc-utils/findmnt.c:655
 #: misc-utils/uuidparse.c:199 misc-utils/uuidparse.c:217 schedutils/chrt.c:205
-#: schedutils/ionice.c:79 sys-utils/hwclock.c:275
+#: schedutils/ionice.c:79 sys-utils/hwclock.c:274
 msgid "unknown"
 msgstr "未知"
 
@@ -6788,7 +6792,7 @@ msgstr ""
 "和启动锁。\n"
 "您确信要把该分区标记为 Linux 交换分区吗？"
 
-#: libmount/src/context.c:2761
+#: libmount/src/context.c:2758
 #, c-format
 msgid "operation failed: %m"
 msgstr "操作失败：%m"
@@ -6814,14 +6818,14 @@ msgid "%s is already mounted"
 msgstr "%s 已经挂载"
 
 #: libmount/src/context_mount.c:1627
-#, fuzzy, c-format
+#, c-format
 msgid "can't find in %s"
-msgstr "在 %2$s 中找不到 %1$s"
+msgstr "无法在 %s 中找到"
 
 #: libmount/src/context_mount.c:1630
-#, fuzzy, c-format
+#, c-format
 msgid "can't find mount point in %s"
-msgstr "在 %2$s 中找不到挂载点 %1$s"
+msgstr "无法在 %s 中找到挂载点"
 
 #: libmount/src/context_mount.c:1633
 #, c-format
@@ -6834,9 +6838,9 @@ msgid "more filesystems detected on %s; use -t <type> or wipefs(8)"
 msgstr "%s 上探测到了更多文件系统；请使用 -t <类型> 或 wipefs(8)"
 
 #: libmount/src/context_mount.c:1643
-#, fuzzy, c-format
+#, c-format
 msgid "failed to determine filesystem type"
-msgstr "%s：确定源失败"
+msgstr "无法确定文件系统类型"
 
 #: libmount/src/context_mount.c:1644
 #, c-format
@@ -6865,16 +6869,19 @@ msgstr "解析挂臷选项失败"
 
 #: libmount/src/context_mount.c:1664
 #, fuzzy, c-format
+#| msgid "%s: failed to setup loop device"
 msgid "failed to setup loop device for %s"
 msgstr "%s：设置回环设备失败"
 
 #: libmount/src/context_mount.c:1668
 #, fuzzy, c-format
+#| msgid "%s: overlapping loop device exists"
 msgid "overlapping loop device exists for %s"
 msgstr "%s: 重叠的回环设备已存在"
 
 #: libmount/src/context_mount.c:1672 libmount/src/context_umount.c:1207
 #, fuzzy, c-format
+#| msgid "closing %s failed"
 msgid "locking failed"
 msgstr "关闭 %s 失败"
 
@@ -6891,16 +6898,19 @@ msgstr "挂载失败：%m"
 
 #: libmount/src/context_mount.c:1689
 #, fuzzy, c-format
+#| msgid "%s: filesystem was unmounted, but mount(8) failed"
 msgid "filesystem was mounted, but failed to update userspace mount table"
 msgstr "%s：文件系统已卸载，但 mount(8) 失败"
 
 #: libmount/src/context_mount.c:1693
 #, fuzzy, c-format
+#| msgid "%s: filesystem was unmounted, but mount(8) failed"
 msgid "filesystem was mounted, but failed to switch namespace back"
 msgstr "%s：文件系统已卸载，但 mount(8) 失败"
 
 #: libmount/src/context_mount.c:1698
 #, fuzzy, c-format
+#| msgid "%s: filesystem was unmounted, but mount(8) failed"
 msgid "filesystem was mounted, but any subsequent operation failed: %m"
 msgstr "%s：文件系统已卸载，但 mount(8) 失败"
 
@@ -7071,17 +7081,19 @@ msgid "umount failed: %m"
 msgstr "挂载失败：%m"
 
 #: libmount/src/context_umount.c:1224
-#, fuzzy, c-format
+#, c-format
 msgid "filesystem was unmounted, but failed to update userspace mount table"
-msgstr "%s：文件系统已卸载，但 mount(8) 失败"
+msgstr "文件系统已卸载，但更新用户空间挂载表失败"
 
 #: libmount/src/context_umount.c:1228
 #, fuzzy, c-format
+#| msgid "%s: filesystem was unmounted, but mount(8) failed"
 msgid "filesystem was unmounted, but failed to switch namespace back"
 msgstr "%s：文件系统已卸载，但 mount(8) 失败"
 
 #: libmount/src/context_umount.c:1233
 #, fuzzy, c-format
+#| msgid "%s: filesystem was unmounted, but mount(8) failed"
 msgid "filesystem was unmounted, but any subsequent operation failed: %m"
 msgstr "%s：文件系统已卸载，但 mount(8) 失败"
 
@@ -7142,11 +7154,11 @@ msgstr "无法连接 UNIX 套接字"
 msgid "the plymouth request %c is not implemented"
 msgstr "plymouth 请求 %c 没有实现"
 
-#: lib/randutils.c:190
+#: lib/randutils.c:187
 msgid "getrandom() function"
 msgstr "getrandom() 函数"
 
-#: lib/randutils.c:203
+#: lib/randutils.c:200
 msgid "libc pseudo-random functions"
 msgstr "libc 伪随机函数"
 
@@ -7179,7 +7191,7 @@ msgstr "format_iso_time：缓冲溢出。"
 msgid "time %ld is out of range."
 msgstr "时间 %ld 超出范围。"
 
-#: login-utils/chfn.c:96 login-utils/chsh.c:75 login-utils/lslogins.c:1338
+#: login-utils/chfn.c:96 login-utils/chsh.c:75 login-utils/lslogins.c:1326
 #, c-format
 msgid " %s [options] [<username>]\n"
 msgstr " %s [选项] [<用户名>]\n"
@@ -7391,7 +7403,7 @@ msgstr "Shell 已更改。\n"
 msgid "Usage: %s <passwordfile> <username>...\n"
 msgstr "用法：%s <密码文件> <用户名>...\n"
 
-#: login-utils/last.c:169 login-utils/lslogins.c:1329 sys-utils/dmesg.c:1285
+#: login-utils/last.c:169 login-utils/lslogins.c:1317 sys-utils/dmesg.c:1285
 #: sys-utils/lsipc.c:282
 #, c-format
 msgid "unknown time format: %s"
@@ -7478,6 +7490,9 @@ msgstr ""
 
 #: login-utils/last.c:886
 #, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s begins %s"
 msgid ""
 "\n"
 "%s begins %s\n"
@@ -7485,8 +7500,9 @@ msgstr ""
 "\n"
 "%s 开始 %s"
 
-#: login-utils/last.c:964 term-utils/scriptlive.c:85 term-utils/scriptlive.c:89
-#: term-utils/scriptreplay.c:79 term-utils/scriptreplay.c:83
+#: login-utils/last.c:964 term-utils/scriptlive.c:85
+#: term-utils/scriptlive.c:89 term-utils/scriptreplay.c:79
+#: term-utils/scriptreplay.c:83
 msgid "failed to parse number"
 msgstr "解析数字失败"
 
@@ -7677,9 +7693,9 @@ msgid " -H             suppress hostname in the login prompt"
 msgstr " -H             在登录提示符中不显示主机名"
 
 #: login-utils/login.c:1155
-#, fuzzy, c-format
+#, c-format
 msgid "%s: timed out after %u seconds"
-msgstr "%u 秒后超时"
+msgstr "%s：%u 秒后超时"
 
 #: login-utils/login.c:1188
 #, c-format
@@ -7972,16 +7988,16 @@ msgstr "生成时间字符串失败"
 msgid "failed to get supplementary groups"
 msgstr "获得附属组失败"
 
-#: login-utils/lslogins.c:1004
+#: login-utils/lslogins.c:992
 #, c-format
 msgid "cannot found '%s'"
 msgstr "无法找到“%s”"
 
-#: login-utils/lslogins.c:1180
+#: login-utils/lslogins.c:1168
 msgid "internal error: unknown column"
 msgstr "内部错误：未知的列"
 
-#: login-utils/lslogins.c:1278
+#: login-utils/lslogins.c:1266
 #, c-format
 msgid ""
 "\n"
@@ -7990,104 +8006,103 @@ msgstr ""
 "\n"
 "上次的日志：\n"
 
-#: login-utils/lslogins.c:1341
+#: login-utils/lslogins.c:1329
 msgid "Display information about known users in the system.\n"
 msgstr "显示系统中已知用户的信息。\n"
 
-#: login-utils/lslogins.c:1344
+#: login-utils/lslogins.c:1332
 msgid " -a, --acc-expiration     display info about passwords expiration\n"
 msgstr " -a, --acc-expiration     显示关于密码过期的信息\n"
 
-#: login-utils/lslogins.c:1345
+#: login-utils/lslogins.c:1333
 msgid " -c, --colon-separate     display data in a format similar to /etc/passwd\n"
 msgstr " -c, --colon-separate     以与 /etc/passwd 相似的格式显示日期\n"
 
-#: login-utils/lslogins.c:1346 sys-utils/lsipc.c:310
+#: login-utils/lslogins.c:1334 sys-utils/lsipc.c:310
 msgid " -e, --export             display in an export-able output format\n"
 msgstr " -e, --export             以可导出的格式显示\n"
 
-#: login-utils/lslogins.c:1347
+#: login-utils/lslogins.c:1335
 msgid " -f, --failed             display data about the users' last failed logins\n"
 msgstr " -f, --failed             显示有关该用户上次登录失败的数据\n"
 
-#: login-utils/lslogins.c:1348
+#: login-utils/lslogins.c:1336
 msgid " -G, --supp-groups        display information about groups\n"
 msgstr " -G, --supp-groups        显示与组相关的信息\n"
 
-#: login-utils/lslogins.c:1349
+#: login-utils/lslogins.c:1337
 msgid " -g, --groups=<groups>    display users belonging to a group in <groups>\n"
 msgstr " -g, --groups=<groups>    显示属于<groups>中的组的用户\n"
 
-#: login-utils/lslogins.c:1350
+#: login-utils/lslogins.c:1338
 msgid " -L, --last               show info about the users' last login sessions\n"
 msgstr " -L, --last               显示关于该用户上次登录会话的信息\n"
 
-#: login-utils/lslogins.c:1351
+#: login-utils/lslogins.c:1339
 msgid " -l, --logins=<logins>    display only users from <logins>\n"
 msgstr " -l, --logins=<登录方式>  只显示以指定<登录方式>登录的用户\n"
 
-#: login-utils/lslogins.c:1352 sys-utils/lsipc.c:312
+#: login-utils/lslogins.c:1340 sys-utils/lsipc.c:312
 msgid " -n, --newline            display each piece of information on a new line\n"
 msgstr " -n, --newline            逐行显示每一部分信息\n"
 
-#: login-utils/lslogins.c:1353 sys-utils/lsipc.c:305
+#: login-utils/lslogins.c:1341 sys-utils/lsipc.c:305
 msgid "     --noheadings         don't print headings\n"
 msgstr "      --noheadings     不打印标题\n"
 
-#: login-utils/lslogins.c:1354 sys-utils/lsipc.c:306
+#: login-utils/lslogins.c:1342 sys-utils/lsipc.c:306
 msgid "     --notruncate         don't truncate output\n"
 msgstr "     --notruncate         不截断输出\n"
 
-#: login-utils/lslogins.c:1355 sys-utils/lsipc.c:314
+#: login-utils/lslogins.c:1343 sys-utils/lsipc.c:314
 msgid " -o, --output[=<list>]    define the columns to output\n"
 msgstr " -o, --output[=<列表>]    定义要输出的列\n"
 
-#: login-utils/lslogins.c:1356
-#, fuzzy
+#: login-utils/lslogins.c:1344
 msgid "     --output-all         output all columns\n"
-msgstr " -O, --output-all     输出所有列\n"
+msgstr "     --output-all         输出所有列\n"
 
-#: login-utils/lslogins.c:1357
+#: login-utils/lslogins.c:1345
 msgid " -p, --pwd                display information related to login by password.\n"
 msgstr " -p, --pwd                显示与 用密码登录 相关的信息。\n"
 
-#: login-utils/lslogins.c:1358 sys-utils/lsipc.c:316
+#: login-utils/lslogins.c:1346 sys-utils/lsipc.c:316
 msgid " -r, --raw                display in raw mode\n"
 msgstr " -r, --raw                以原始方式显示\n"
 
-#: login-utils/lslogins.c:1359
+#: login-utils/lslogins.c:1347
 msgid " -s, --system-accs        display system accounts\n"
 msgstr " -s, --system-accs        显示系统帐户\n"
 
-#: login-utils/lslogins.c:1360 sys-utils/lsipc.c:307
+#: login-utils/lslogins.c:1348 sys-utils/lsipc.c:307
 msgid "     --time-format=<type> display dates in short, full or iso format\n"
 msgstr "     --time-format=<格式>  以短、长或 iso 格式显示日期\n"
 
-#: login-utils/lslogins.c:1361
+#: login-utils/lslogins.c:1349
 msgid " -u, --user-accs          display user accounts\n"
 msgstr " -u, --user-accs          显示用户帐户\n"
 
-#: login-utils/lslogins.c:1362
+#: login-utils/lslogins.c:1350
 msgid " -Z, --context            display SELinux contexts\n"
 msgstr " -Z, --context            显示 SELinux 环境\n"
 
-#: login-utils/lslogins.c:1363
+#: login-utils/lslogins.c:1351
 msgid " -z, --print0             delimit user entries with a nul character\n"
 msgstr " -z, --print0             用空字符(nul)分隔用户记录项\n"
 
-#: login-utils/lslogins.c:1364
+#: login-utils/lslogins.c:1352
 msgid "     --wtmp-file <path>   set an alternate path for wtmp\n"
 msgstr "     --wtmp-file <路径>   设置 wtmp 的可选路径\n"
 
-#: login-utils/lslogins.c:1365
+#: login-utils/lslogins.c:1353
 msgid "     --btmp-file <path>   set an alternate path for btmp\n"
 msgstr "     --btmp-file <路径>   设置 btmp 的可选路径\n"
 
-#: login-utils/lslogins.c:1549
+#: login-utils/lslogins.c:1537
 msgid "failed to request selinux state"
 msgstr "请求 selinux 状态失败"
 
-#: login-utils/lslogins.c:1563 login-utils/lslogins.c:1568
+#: login-utils/lslogins.c:1551 login-utils/lslogins.c:1556
 msgid "Only one user may be specified. Use -l for multiple users."
 msgstr "只能指定一个用户。多用户请使用 -l。"
 
@@ -8148,9 +8163,8 @@ msgid "Politely refuse a login.\n"
 msgstr "客气的拒绝登录。\n"
 
 #: login-utils/nologin.c:33
-#, fuzzy
 msgid " -c, --command <command>  does nothing (for compatibility with su -c)\n"
-msgstr " -c, --command <命令>            使用 -c 向 shell 传递一条命令\n"
+msgstr " -c, --command <命令>     无操作（用于保持与 su -c 的兼容性）\n"
 
 #: login-utils/nologin.c:113
 #, c-format
@@ -8162,18 +8176,16 @@ msgid " (core dumped)"
 msgstr " (核心已转储)"
 
 #: login-utils/su-common.c:344
-#, fuzzy
 msgid "failed to modify environment"
-msgstr "打开目录失败"
+msgstr "修改环境失败"
 
 #: login-utils/su-common.c:380
 msgid "may not be used by non-root users"
 msgstr "非 root 用户不能使用"
 
 #: login-utils/su-common.c:404
-#, fuzzy
 msgid "authentication failed"
-msgstr "tcgetattr 失败"
+msgstr "验证失败"
 
 #: login-utils/su-common.c:417
 #, c-format
@@ -8190,11 +8202,13 @@ msgstr ""
 
 #: login-utils/su-common.c:461
 #, fuzzy
+#| msgid "cannot block signals"
 msgid "cannot initialize signal mask"
 msgstr "无法阻塞信号"
 
 #: login-utils/su-common.c:471
 #, fuzzy
+#| msgid "cannot set signal handler"
 msgid "cannot set signal handler for session"
 msgstr "无法设置信号处理函数"
 
@@ -8204,16 +8218,18 @@ msgstr "无法设置信号处理函数"
 
 #: login-utils/su-common.c:487
 #, fuzzy
+#| msgid "cannot set signal handler"
 msgid "cannot set signal mask"
 msgstr "无法设置信号处理函数"
 
-#: login-utils/su-common.c:512 term-utils/script.c:949
+#: login-utils/su-common.c:512 term-utils/script.c:953
 #: term-utils/scriptlive.c:296
 #, fuzzy
+#| msgid "failed to create a new disklabel"
 msgid "failed to create pseudo-terminal"
 msgstr "创建新磁盘标签失败"
 
-#: login-utils/su-common.c:524 term-utils/script.c:959
+#: login-utils/su-common.c:524 term-utils/script.c:963
 #: term-utils/scriptlive.c:303
 msgid "cannot create child process"
 msgstr "无法创建子进程"
@@ -8238,9 +8254,8 @@ msgid " ...killed.\n"
 msgstr " ...已杀死。\n"
 
 #: login-utils/su-common.c:678
-#, fuzzy
 msgid "failed to set the PATH environment variable"
-msgstr "设置环境变量 %s 失败"
+msgstr "设置 PATH 环境变量失败"
 
 #: login-utils/su-common.c:755
 msgid "cannot set groups"
@@ -8248,6 +8263,7 @@ msgstr "无法设置 组"
 
 #: login-utils/su-common.c:761
 #, fuzzy, c-format
+#| msgid "failed to parse level '%s'"
 msgid "failed to establish user credentials: %s"
 msgstr "解析级别“%s”失败"
 
@@ -8260,12 +8276,12 @@ msgid "cannot set user id"
 msgstr "无法设置 用户 id"
 
 #: login-utils/su-common.c:841
-#, fuzzy
 msgid " -m, -p, --preserve-environment      do not reset environment variables\n"
-msgstr " -m, -p, --preserve-environment  不重置环境变量\n"
+msgstr " -m, -p, --preserve-environment      不重置环境变量\n"
 
 #: login-utils/su-common.c:842
 #, fuzzy
+#| msgid " -m, -p, --preserve-environment  do not reset environment variables\n"
 msgid " -w, --whitelist-environment <list>  don't reset specified variables\n"
 msgstr " -m, -p, --preserve-environment  不重置环境变量\n"
 
@@ -8275,6 +8291,9 @@ msgstr " -g, --group <组>                指定主组\n"
 
 #: login-utils/su-common.c:846
 #, fuzzy
+#| msgid ""
+#| " -G, --supp-group <group>        specify a supplemental group\n"
+#| "\n"
 msgid " -G, --supp-group <group>        specify a supplemental group\n"
 msgstr ""
 " -G, --supp-group <组>        指定一个辅助组\n"
@@ -8305,12 +8324,14 @@ msgid " -s, --shell <shell>             run <shell> if /etc/shells allows it\n"
 msgstr " -s, --shell <shell>             若 /etc/shells 允许，运行<shell>\n"
 
 #: login-utils/su-common.c:855
-#, fuzzy
 msgid " -P, --pty                       create a new pseudo-terminal\n"
-msgstr "                                 而不创建新会话\n"
+msgstr ""
 
 #: login-utils/su-common.c:865
 #, fuzzy, c-format
+#| msgid ""
+#| " %1$s [options] <dev> [[-N] <part>]\n"
+#| " %1$s [options] <command>\n"
 msgid ""
 " %1$s [options] -u <user> [[--] <command>]\n"
 " %1$s [options] [-] [<user> [<argument>...]]\n"
@@ -8320,6 +8341,11 @@ msgstr ""
 
 #: login-utils/su-common.c:870
 #, fuzzy
+#| msgid ""
+#| "\n"
+#| "Run <command> with the effective user ID and group ID of <user>.  If -u is\n"
+#| "not given, fall back to su(1)-compatible semantics and execute standard shell.\n"
+#| "The options -c, -f, -l, and -s are mutually exclusive with -u.\n"
 msgid ""
 "Run <command> with the effective user ID and group ID of <user>.  If -u is\n"
 "not given, fall back to su(1)-compatible semantics and execute standard shell.\n"
@@ -8332,6 +8358,7 @@ msgstr ""
 
 #: login-utils/su-common.c:875
 #, fuzzy
+#| msgid " -u, --user <user>             username\n"
 msgid " -u, --user <user>               username\n"
 msgstr " -u, --user <用户>             用户名\n"
 
@@ -8342,6 +8369,10 @@ msgstr " %s [选项] [-] [<用户> [<参数>...]]\n"
 
 #: login-utils/su-common.c:890
 #, fuzzy
+#| msgid ""
+#| "\n"
+#| "Change the effective user ID and group ID to that of <user>.\n"
+#| "A mere - implies -l.  If <user> is not given, root is assumed.\n"
 msgid ""
 "Change the effective user ID and group ID to that of <user>.\n"
 "A mere - implies -l.  If <user> is not given, root is assumed.\n"
@@ -8362,9 +8393,8 @@ msgid "group %s does not exist"
 msgstr "组 %s 不存在"
 
 #: login-utils/su-common.c:1051
-#, fuzzy
 msgid "--pty is not supported for your system"
-msgstr "您的系统不支持 --reload"
+msgstr "--pty 在您的系统上不受支持"
 
 #: login-utils/su-common.c:1085
 msgid "ignoring --preserve-environment, it's mutually exclusive with --login"
@@ -8393,9 +8423,8 @@ msgid "using restricted shell %s"
 msgstr "将使用受限 shell %s"
 
 #: login-utils/su-common.c:1179
-#, fuzzy
 msgid "failed to allocate pty handler"
-msgstr "分配脚本处理程序失败"
+msgstr ""
 
 #: login-utils/su-common.c:1201
 #, c-format
@@ -8511,6 +8540,9 @@ msgstr "无法打开密码数据库"
 
 #: login-utils/sulogin.c:1010
 #, fuzzy, c-format
+#| msgid ""
+#| "Can not execute su shell\n"
+#| "\n"
 msgid ""
 "cannot execute su shell\n"
 "\n"
@@ -8528,6 +8560,9 @@ msgstr ""
 
 #: login-utils/sulogin.c:1049
 #, fuzzy
+#| msgid ""
+#| "Can not wait on su shell\n"
+#| "\n"
 msgid ""
 "cannot wait on su shell\n"
 "\n"
@@ -8536,9 +8571,9 @@ msgstr ""
 "\n"
 
 #: login-utils/utmpdump.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot get file position"
-msgstr "%s：不能删除分区"
+msgstr "%s：无法获取文件位置"
 
 #: login-utils/utmpdump.c:177
 #, c-format
@@ -8674,6 +8709,9 @@ msgstr ""
 
 #: misc-utils/blkid.c:77
 #, fuzzy
+#| msgid ""
+#| " -A, --adjfile <file>     specifies the path to the adjust file\n"
+#| "                            the default is %s\n"
 msgid ""
 " -c, --cache-file <file>    read from <file> instead of reading from the default\n"
 "                              cache file (-c /dev/null means no cache)\n"
@@ -8683,6 +8721,7 @@ msgstr ""
 
 #: misc-utils/blkid.c:79
 #, fuzzy
+#| msgid " -n, --noheadings          don't print headings\n"
 msgid " -d, --no-encoding          don't encode non-printing characters\n"
 msgstr " -n, --noheadings          不打印标题\n"
 
@@ -8698,6 +8737,7 @@ msgstr ""
 
 #: misc-utils/blkid.c:83
 #, fuzzy
+#| msgid " -l, --list-shells    print list of shells and exit\n"
 msgid " -k, --list-filesystems     list all known filesystems/RAIDs and exit\n"
 msgstr " -l, --list-shells    打印 shell 列表并退出\n"
 
@@ -8711,63 +8751,71 @@ msgstr ""
 
 #: misc-utils/blkid.c:86
 #, fuzzy
+#| msgid " -l, --list                    list info about all or specified (default)\n"
 msgid " -l, --list-one             look up only first device with token specified by -t\n"
 msgstr " -l, --list                    列出所有或指定的信息(默认)\n"
 
 #: misc-utils/blkid.c:87
 #, fuzzy
+#| msgid " -s, --size <size>         device size\n"
 msgid " -L, --label <label>        convert LABEL to device name\n"
 msgstr " -s, --size <尺寸>         设备尺寸\n"
 
 #: misc-utils/blkid.c:88
-#, fuzzy
 msgid " -U, --uuid <uuid>          convert UUID to device name\n"
-msgstr " -u, --user <用户>             用户名\n"
+msgstr " -U, --uuid <uuid>          将 UUID 转换为设备名\n"
 
 #: misc-utils/blkid.c:89
 #, fuzzy
+#| msgid " <dev>                     device (usually disk) path\n"
 msgid " <dev>                      specify device(s) to probe (default: all devices)\n"
 msgstr " <设备>                    设备(通常是磁盘)的路径\n"
 
 #: misc-utils/blkid.c:91
 #, fuzzy
+#| msgid "Scheduling options:\n"
 msgid "Low-level probing options:\n"
 msgstr "调度选项：\n"
 
 #: misc-utils/blkid.c:92
 #, fuzzy
+#| msgid " -p, --pid                 unshare pid namespace\n"
 msgid " -p, --probe                low-level superblocks probing (bypass cache)\n"
 msgstr " -p, --pid                 取消共享 pid 名字空间\n"
 
 #: misc-utils/blkid.c:93
 #, fuzzy
+#| msgid " -i, --info                print only info about the sampling step\n"
 msgid " -i, --info                 gather information about I/O limits\n"
 msgstr " -i, --info                只打印有关采样步骤(sampling step)的信息\n"
 
 #: misc-utils/blkid.c:94
 #, fuzzy
+#| msgid " -s, --size <size>         device size\n"
 msgid " -S, --size <size>          overwrite device size\n"
 msgstr " -s, --size <尺寸>         设备尺寸\n"
 
 #: misc-utils/blkid.c:95
 #, fuzzy
+#| msgid " -H, --host <hostname>      specify login host\n"
 msgid " -O, --offset <offset>      probe at the given offset\n"
 msgstr " -H, --host <主机名>        指定登录主机\n"
 
 #: misc-utils/blkid.c:96
 #, fuzzy
+#| msgid " -t, --types <list>      limit the set of filesystem types\n"
 msgid " -u, --usages <list>        filter by \"usage\" (e.g. -u filesystem,raid)\n"
 msgstr " -t, --types <列表>      限制文件系统集合\n"
 
 #: misc-utils/blkid.c:97
 #, fuzzy
+#| msgid " -t, --types <list>      limit the set of filesystem types\n"
 msgid " -n, --match-types <list>   filter by filesystem type (e.g. -n vfat,ext3)\n"
 msgstr " -t, --types <列表>      限制文件系统集合\n"
 
 #: misc-utils/blkid.c:98
-#, fuzzy
 msgid " -D, --no-part-details      don't print info from partition table\n"
-msgstr " -n, --noheadings       不打印列标题\n"
+msgstr " -D, --no-part-details      不要打印来自分区表的信息\n"
 
 #: misc-utils/blkid.c:232
 msgid "(mounted, mtpt unknown)"
@@ -8782,9 +8830,9 @@ msgid "(not mounted)"
 msgstr "（未挂载）"
 
 #: misc-utils/blkid.c:504 misc-utils/blkid.c:510
-#, fuzzy, c-format
+#, c-format
 msgid "error: %s"
-msgstr "解析错误：%s"
+msgstr "错误：%s"
 
 #: misc-utils/blkid.c:553
 #, c-format
@@ -8793,6 +8841,7 @@ msgstr ""
 
 #: misc-utils/blkid.c:599
 #, fuzzy, c-format
+#| msgid "unknown argument: %s"
 msgid "unknown keyword in -u <list> argument: '%s'"
 msgstr "未知参数：%s"
 
@@ -8801,9 +8850,9 @@ msgid "error: -u <list> argument is empty"
 msgstr ""
 
 #: misc-utils/blkid.c:765
-#, fuzzy, c-format
+#, c-format
 msgid "unsupported output format %s"
-msgstr "不支持的参数格式：%s"
+msgstr "不支持的输出格式：%s"
 
 #: misc-utils/blkid.c:768 misc-utils/wipefs.c:733
 msgid "invalid offset argument"
@@ -8811,11 +8860,13 @@ msgstr "无效的 偏移 参数"
 
 #: misc-utils/blkid.c:775
 #, fuzzy
+#| msgid "no command was specified"
 msgid "Too many tags specified"
 msgstr "没有指定命令"
 
 #: misc-utils/blkid.c:781
 #, fuzzy
+#| msgid "invalid time argument"
 msgid "invalid size argument"
 msgstr "无效的 时间 参数"
 
@@ -8936,6 +8987,7 @@ msgstr " -m, --monday          周一作为一周的第一天\n"
 
 #: misc-utils/cal.c:1130
 #, fuzzy
+#| msgid " -j, --julian          output Julian dates\n"
 msgid " -j, --julian          use day-of-year for all calendars\n"
 msgstr " -j, --julian          输出儒略日期\n"
 
@@ -8961,11 +9013,13 @@ msgstr " -w, --week[=<数字>]   显示美国或 ISO-8601 周数\n"
 
 #: misc-utils/cal.c:1137
 #, fuzzy, c-format
+#| msgid "     --color[=<when>]  colorize messages (auto, always or never)\n"
 msgid "     --color[=<when>]  colorize messages (%s, %s or %s)\n"
 msgstr "     --color[=<时机>]  消息彩色显示(auto, always 或 never)\n"
 
 #: misc-utils/fincore.c:61
 #, fuzzy
+#| msgid "Shared memory pages"
 msgid "file data resident in memory in pages"
 msgstr "共享内存页"
 
@@ -8974,34 +9028,33 @@ msgid "file data resident in memory in bytes"
 msgstr ""
 
 #: misc-utils/fincore.c:63
-#, fuzzy
 msgid "size of the file"
-msgstr "磁盘容量"
+msgstr "文件大小"
 
 #: misc-utils/fincore.c:64
-#, fuzzy
 msgid "file name"
-msgstr "文件名"
+msgstr "文件名称"
 
 #: misc-utils/fincore.c:174
 #, fuzzy, c-format
+#| msgid "failed to read symlink: %s"
 msgid "failed to do mincore: %s"
 msgstr "读符号链接失败：%s"
 
 #: misc-utils/fincore.c:210
-#, fuzzy, c-format
+#, c-format
 msgid "failed to do mmap: %s"
-msgstr "读取失败︰ %s"
+msgstr "进行 mmap 失败：%s"
 
 #: misc-utils/fincore.c:236
-#, fuzzy, c-format
+#, c-format
 msgid "failed to open: %s"
-msgstr "解析 %s 失败"
+msgstr "打开失败：%s"
 
 #: misc-utils/fincore.c:241
-#, fuzzy, c-format
+#, c-format
 msgid "failed to do fstat: %s"
-msgstr "读取失败︰ %s"
+msgstr "进行 fstat 失败：%s"
 
 #: misc-utils/fincore.c:262
 #, c-format
@@ -9009,29 +9062,30 @@ msgid " %s [options] file...\n"
 msgstr " %s [选项] 文件...\n"
 
 #: misc-utils/fincore.c:265
-#, fuzzy
 msgid " -J, --json            use JSON output format\n"
-msgstr " -J, --json              使用 JSON 输出格式\n"
+msgstr " -J, --json            使用 JSON 输出格式\n"
 
 #: misc-utils/fincore.c:266
 #, fuzzy
+#| msgid " -b, --bytes            print sizes in bytes rather than in human readable format\n"
 msgid " -b, --bytes           print sizes in bytes rather than in human readable format\n"
 msgstr " -b, --bytes           以字节为单位而非易读的格式来打印大小\n"
 
 #: misc-utils/fincore.c:267
 #, fuzzy
+#| msgid " -n, --noheadings       don't print headings\n"
 msgid " -n, --noheadings      don't print headings\n"
 msgstr " -n, --noheadings       不打印标题\n"
 
 #: misc-utils/fincore.c:268
 #, fuzzy
+#| msgid " -o, --output <list>  output columns\n"
 msgid " -o, --output <list>   output columns\n"
 msgstr " -o, --output <列表>  输出列\n"
 
 #: misc-utils/fincore.c:269
-#, fuzzy
 msgid " -r, --raw             use raw output format\n"
-msgstr " -r, --raw              使用原生输出格式\n"
+msgstr " -r, --raw             使用原始输出格式\n"
 
 #: misc-utils/fincore.c:338 sys-utils/losetup.c:820
 msgid "no file specified"
@@ -9218,6 +9272,9 @@ msgstr " -s, --fstab            在文件系统表态表中搜索\n"
 
 #: misc-utils/findmnt.c:1210
 #, fuzzy
+#| msgid ""
+#| " -k, --kernel           search in kernel table of mounted\n"
+#| "                          filesystems (default)\n"
 msgid ""
 " -m, --mtab             search in table of mounted filesystems\n"
 "                          (includes user space mount options)\n"
@@ -9316,6 +9373,7 @@ msgstr " -o, --output <列表>    要显示的列\n"
 
 #: misc-utils/findmnt.c:1237
 #, fuzzy
+#| msgid " -O, --output-all     output all columns\n"
 msgid "     --output-all       output all available columns\n"
 msgstr " -O, --output-all     输出所有列\n"
 
@@ -9325,6 +9383,7 @@ msgstr " -P, --pairs            使用 键=“值”的输出格式\n"
 
 #: misc-utils/findmnt.c:1239
 #, fuzzy
+#| msgid "     --verbose          print more details\n"
 msgid "     --pseudo           print only pseudo-filesystems\n"
 msgstr "     --verbose          打印更多细节\n"
 
@@ -9338,6 +9397,7 @@ msgstr " -r, --raw              使用原生输出格式\n"
 
 #: misc-utils/findmnt.c:1242
 #, fuzzy
+#| msgid " -a, --all               unmount all filesystems\n"
 msgid "     --real             print only real filesystems\n"
 msgstr " -a, --all               卸载所有文件系统\n"
 
@@ -9355,6 +9415,7 @@ msgstr " -T, --target <路径>    要使用的文件系统的路径\n"
 
 #: misc-utils/findmnt.c:1246
 #, fuzzy
+#| msgid " -l, --list             use list format output\n"
 msgid "     --tree             enable tree format output is possible\n"
 msgstr " -l, --list             使用列表格式的输出\n"
 
@@ -9532,6 +9593,7 @@ msgstr "\"none\" 这种文件系统类型只建议用于绑定或移动操作"
 
 #: misc-utils/findmnt-verify.c:418
 #, fuzzy, c-format
+#| msgid "%s seems unspported by the current kernel"
 msgid "%s seems unsupported by the current kernel"
 msgstr "当前内核似乎不支持 %s"
 
@@ -9546,6 +9608,7 @@ msgstr "%s 与磁盘上的 %s 不匹配"
 
 #: misc-utils/findmnt-verify.c:436
 #, fuzzy, c-format
+#| msgid "on-disk %s seems unspported by the current kernel"
 msgid "on-disk %s seems unsupported by the current kernel"
 msgstr "当前内核似乎不支持磁盘上的 %s"
 
@@ -9666,6 +9729,7 @@ msgstr ""
 
 #: misc-utils/hardlink.c:130
 #, fuzzy, c-format
+#| msgid "partitions: %d"
 msgid "Comparisons:   %9lld\n"
 msgstr "分区数：%d"
 
@@ -9734,6 +9798,7 @@ msgstr "无法 stat %s"
 
 #: misc-utils/hardlink.c:312
 #, fuzzy, c-format
+#| msgid "failed to change directory to %s"
 msgid "file %s changed underneath us"
 msgstr "将目录更改到 %s 失败"
 
@@ -9788,6 +9853,7 @@ msgstr "未指定目录"
 
 #: misc-utils/hardlink.c:464
 #, fuzzy, c-format
+#| msgid "%s: parse error at line %d"
 msgid "pattern error at offset %d: %s"
 msgstr "%s：第 %d 行解析出错"
 
@@ -9850,6 +9916,7 @@ msgstr "     --verbose          打印将收到信号的 pid\n"
 
 #: misc-utils/kill.c:232 term-utils/agetty.c:687
 #, fuzzy, c-format
+#| msgid "%s from %s\n"
 msgid "%s from %s"
 msgstr "%s，来自 %s\n"
 
@@ -9894,16 +9961,19 @@ msgstr "无效的信号名或数字：%s"
 
 #: misc-utils/kill.c:396
 #, fuzzy, c-format
+#| msgid "write failed: %d"
 msgid "pidfd_open() failed: %d"
 msgstr "写失败：%d"
 
 #: misc-utils/kill.c:401 misc-utils/kill.c:415
 #, fuzzy
+#| msgid "sd_listen_fds() failed"
 msgid "pidfd_send_signal() failed"
 msgstr "sd_listen_fds() 失败"
 
 #: misc-utils/kill.c:412
 #, fuzzy, c-format
+#| msgid "sending signal %d to pid %d\n"
 msgid "timeout, sending signal %d to pid %d\n"
 msgstr "将信号 %d 发送给 pid %d\n"
 
@@ -10182,6 +10252,7 @@ msgstr "到设备节点的路径"
 
 #: misc-utils/lsblk.c:163
 #, fuzzy
+#| msgid "filesystem size"
 msgid "filesystem version"
 msgstr "文件系统大小"
 
@@ -10203,11 +10274,13 @@ msgstr "分区表类型"
 
 #: misc-utils/lsblk.c:172
 #, fuzzy
+#| msgid "partition type UUID"
 msgid "partition type code or UUID"
 msgstr "分区类型 UUID"
 
 #: misc-utils/lsblk.c:173
 #, fuzzy
+#| msgid "partition name"
 msgid "partition type name"
 msgstr "分区名"
 
@@ -10398,6 +10471,7 @@ msgstr " -D, --discard        打印时丢弃能力\n"
 
 #: misc-utils/lsblk.c:1762
 #, fuzzy
+#| msgid " -x, --sort <column>  sort output by <column>\n"
 msgid " -E, --dedup <column> de-duplicate output by <column>\n"
 msgstr " -x, --sort <列>      按<列>对输出排序\n"
 
@@ -10419,6 +10493,7 @@ msgstr " -S, --scsi           输出有关 SCSI 设备的信息\n"
 
 #: misc-utils/lsblk.c:1768
 #, fuzzy
+#| msgid " -l, --list           use list format output\n"
 msgid " -T, --tree[=<column>] use tree format output\n"
 msgstr " -l, --list           使用列表格式的输出\n"
 
@@ -10448,6 +10523,7 @@ msgstr " -l, --list           使用列表格式的输出\n"
 
 #: misc-utils/lsblk.c:1776
 #, fuzzy
+#| msgid " -d, --dump <dev>                  dump partition table (usable for later input)\n"
 msgid " -M, --merge          group parents of sub-trees (usable for RAIDs, Multi-path)\n"
 msgstr " -d, --dump <设备>                 转储分区表(用于后续输入)\n"
 
@@ -10477,6 +10553,7 @@ msgstr " -t, --topology       输出拓扑信息\n"
 
 #: misc-utils/lsblk.c:1784
 #, fuzzy
+#| msgid " -c, --offline           print offline CPUs only\n"
 msgid " -z, --zoned          print zone model\n"
 msgstr " -c, --offline           只打印离线 CPU\n"
 
@@ -10567,6 +10644,7 @@ msgstr "列出本地系统锁。\n"
 
 #: misc-utils/lslocks.c:534
 #, fuzzy
+#| msgid " -b, --bytes              print SIZE in bytes rather than in human readable format\n"
 msgid " -b, --bytes            print SIZE in bytes rather than in human readable format\n"
 msgstr " -b, --bytes              以字节为打印 SIZE，而非易读格式\n"
 
@@ -10584,6 +10662,7 @@ msgstr " -o, --output <list>    定义使用哪个输出列\n"
 
 #: misc-utils/lslocks.c:539 sys-utils/lsns.c:908 sys-utils/rfkill.c:584
 #, fuzzy
+#| msgid " -O, --output-all     output all columns\n"
 msgid "     --output-all       output all columns\n"
 msgstr " -O, --output-all     输出所有列\n"
 
@@ -10595,7 +10674,7 @@ msgstr " -p, --pid <pid>        只显示由指定进程持有的锁\n"
 msgid " -r, --raw              use the raw output format\n"
 msgstr " -r, --raw              使用原生输出格式\n"
 
-#: misc-utils/lslocks.c:606 schedutils/chrt.c:484 schedutils/ionice.c:177
+#: misc-utils/lslocks.c:606 schedutils/chrt.c:475 schedutils/ionice.c:177
 #: schedutils/taskset.c:171 sys-utils/choom.c:102 sys-utils/lsns.c:992
 #: sys-utils/prlimit.c:585
 msgid "invalid PID argument"
@@ -10659,6 +10738,15 @@ msgstr "沿路径寻找，直到某个终止点为止。\n"
 
 #: misc-utils/namei.c:341
 #, fuzzy
+#| msgid ""
+#| " -h, --help          displays this help text\n"
+#| " -V, --version       output version information and exit\n"
+#| " -x, --mountpoints   show mount point directories with a 'D'\n"
+#| " -m, --modes         show the mode bits of each file\n"
+#| " -o, --owners        show owner and group name of each file\n"
+#| " -l, --long          use a long listing format (-m -o -v) \n"
+#| " -n, --nosymlinks    don't follow symlinks\n"
+#| " -v, --vertical      vertical align of modes and owners\n"
 msgid ""
 " -x, --mountpoints   show mount point directories with a 'D'\n"
 " -m, --modes         show the mode bits of each file\n"
@@ -11018,11 +11106,13 @@ msgstr "创建新的 UUID 值。\n"
 
 #: misc-utils/uuidgen.c:32
 #, fuzzy
+#| msgid " -r, --random            test random-based generation\n"
 msgid " -r, --random        generate random-based uuid\n"
 msgstr " -r, --random            测试基于随机数的生成方式\n"
 
 #: misc-utils/uuidgen.c:33
 #, fuzzy
+#| msgid " -t, --time              test time-based generation\n"
 msgid " -t, --time          generate time-based uuid\n"
 msgstr " -t, --time              测试基于时间的生成方式\n"
 
@@ -11044,16 +11134,19 @@ msgstr " -s, --sha1          生成 sha1 散列\n"
 
 #: misc-utils/uuidgen.c:38
 #, fuzzy
+#| msgid " -i, --invert           invert the sense of matching\n"
 msgid " -x, --hex           interpret name as hex string\n"
 msgstr " -i, --invert           反转搜索的匹配\n"
 
 #: misc-utils/uuidparse.c:76
 #, fuzzy
+#| msgid "unique storage identifier"
 msgid "unique identifier"
 msgstr "惟一存储标识符"
 
 #: misc-utils/uuidparse.c:77
 #, fuzzy
+#| msgid "partition name"
 msgid "variant name"
 msgstr "分区名"
 
@@ -11067,6 +11160,7 @@ msgstr "时间戳"
 
 #: misc-utils/uuidparse.c:97
 #, fuzzy, c-format
+#| msgid " %s [options] <file>...\n"
 msgid " %s [options] <uuid ...>\n"
 msgstr " %s [选项] <文件>...\n"
 
@@ -11076,11 +11170,13 @@ msgstr " -J, --json              使用 JSON 输出格式"
 
 #: misc-utils/uuidparse.c:101
 #, fuzzy
+#| msgid " -n, --noheadings       don't print headings\n"
 msgid " -n, --noheadings       don't print headings"
 msgstr " -n, --noheadings       不打印标题\n"
 
 #: misc-utils/uuidparse.c:102
 #, fuzzy
+#| msgid " -o, --output <list>    the output columns to be shown\n"
 msgid " -o, --output <list>    COLUMNS to display (see below)"
 msgstr " -o, --output <列表>    要显示的列\n"
 
@@ -11091,6 +11187,7 @@ msgstr " -r, --raw              使用原始输出格式"
 #: misc-utils/uuidparse.c:172 misc-utils/uuidparse.c:191
 #: misc-utils/uuidparse.c:222
 #, fuzzy
+#| msgid "invalid id"
 msgid "invalid"
 msgstr "无效 id"
 
@@ -11186,6 +11283,7 @@ msgstr "超级块类型"
 
 #: misc-utils/wipefs.c:112
 #, fuzzy
+#| msgid "bad inode offset"
 msgid "magic string offset"
 msgstr "inode 偏移有误"
 
@@ -11251,21 +11349,25 @@ msgstr "从设备擦除签名。"
 
 #: misc-utils/wipefs.c:647
 #, fuzzy
+#| msgid " -a, --all            print all devices\n"
 msgid " -a, --all           wipe all magic strings (BE CAREFUL!)"
 msgstr " -a, --all            打印所有设备\n"
 
 #: misc-utils/wipefs.c:648
 #, fuzzy
+#| msgid "failed to create a signature backup, $HOME undefined"
 msgid " -b, --backup        create a signature backup in $HOME"
 msgstr "创建签名备份失败，未定义 $HOME"
 
 #: misc-utils/wipefs.c:649
 #, fuzzy
+#| msgid " -f, --force      force check\n"
 msgid " -f, --force         force erasure"
 msgstr " -f, --force      强制检查\n"
 
 #: misc-utils/wipefs.c:650
 #, fuzzy
+#| msgid " -n, --noheadings     don't print headings\n"
 msgid " -i, --noheadings    don't print headings"
 msgstr " -n, --noheadings     不打印标题\n"
 
@@ -11275,11 +11377,13 @@ msgstr " -J, --json          使用 JSON 输出格式"
 
 #: misc-utils/wipefs.c:652
 #, fuzzy
+#| msgid "     --no-act             do everything except the write the log\n"
 msgid " -n, --no-act        do everything except the actual write() call"
 msgstr "     --no-act             操作但不实际写入日志\n"
 
 #: misc-utils/wipefs.c:653
 #, fuzzy
+#| msgid " -o, --offset <num>   offset for range operations, in bytes\n"
 msgid " -o, --offset <num>  offset to erase, in bytes"
 msgstr " -o, --offset <数字>  范围操作的偏移量(字节数)\n"
 
@@ -11289,6 +11393,7 @@ msgstr ""
 
 #: misc-utils/wipefs.c:655
 #, fuzzy
+#| msgid " -p, --parse[=<list>]    print out a parsable format\n"
 msgid " -p, --parsable      print out in parsable instead of printable format"
 msgstr " -p, --parse[=<列表>]    打印可解析格式\n"
 
@@ -11298,6 +11403,7 @@ msgstr " -q, --quiet         禁止输出信息"
 
 #: misc-utils/wipefs.c:657
 #, fuzzy
+#| msgid " -t, --types <list>     limit the set of filesystems by FS types\n"
 msgid " -t, --types <list>  limit the set of filesystem, RAIDs or partition tables"
 msgstr " -t, --types <列表>     根据文件系统类型限制文件系统集合\n"
 
@@ -11435,7 +11541,7 @@ msgstr "pid %d 新的运行时/截止时间/周期参数︰ %ju/%ju/%ju\n"
 msgid "pid %d's current runtime/deadline/period parameters: %ju/%ju/%ju\n"
 msgstr "pid %d 当前的运行时/截止时间/周期参数︰ %ju/%ju/%ju\n"
 
-#: schedutils/chrt.c:299 schedutils/chrt.c:404
+#: schedutils/chrt.c:299 schedutils/chrt.c:395
 msgid "cannot obtain the list of tasks"
 msgstr "无法获取任务列表"
 
@@ -11449,45 +11555,45 @@ msgstr "%s 最小/最大优先级\t: %d/%d\n"
 msgid "%s not supported?\n"
 msgstr "%s 不支持？ \n"
 
-#: schedutils/chrt.c:408
+#: schedutils/chrt.c:399
 #, c-format
 msgid "failed to set tid %d's policy"
 msgstr "设置 tid %d 策略失败"
 
-#: schedutils/chrt.c:413
+#: schedutils/chrt.c:404
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr "设置 pid %d 的策略失败"
 
-#: schedutils/chrt.c:493
+#: schedutils/chrt.c:484
 msgid "invalid runtime argument"
 msgstr "无效的运行时参数"
 
-#: schedutils/chrt.c:496
+#: schedutils/chrt.c:487
 msgid "invalid period argument"
 msgstr "无效的周期参数"
 
-#: schedutils/chrt.c:499
+#: schedutils/chrt.c:490
 msgid "invalid deadline argument"
 msgstr "无效的截止时间参数"
 
-#: schedutils/chrt.c:524
+#: schedutils/chrt.c:515
 msgid "invalid priority argument"
 msgstr "无效的 优先级 参数"
 
-#: schedutils/chrt.c:528
+#: schedutils/chrt.c:519
 msgid "--reset-on-fork option is supported for SCHED_FIFO and SCHED_RR policies only"
 msgstr "--reset-on-fork 选项只支持 SCHED_FIFO and SCHED_RR 策略"
 
-#: schedutils/chrt.c:533
+#: schedutils/chrt.c:524
 msgid "--sched-{runtime,deadline,period} options are supported for SCHED_DEADLINE only"
 msgstr "--sched-{runtime,deadline,period} 选项只支持 SCHED_DEADLINE"
 
-#: schedutils/chrt.c:548
+#: schedutils/chrt.c:539
 msgid "SCHED_DEADLINE is unsupported"
 msgstr "不支持 SCHED_DEADLINE"
 
-#: schedutils/chrt.c:555
+#: schedutils/chrt.c:546
 #, c-format
 msgid "unsupported priority value for the policy: %d: see --max for valid range"
 msgstr "不支持此策略的优先级值：%d：查看 --max 了解有效范围"
@@ -11607,6 +11713,14 @@ msgstr "显示或更改某个进程的 CPU 亲和力。\n"
 
 #: schedutils/taskset.c:60
 #, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| " -a, --all-tasks         operate on all the tasks (threads) for a given pid\n"
+#| " -p, --pid               operate on existing given pid\n"
+#| " -c, --cpu-list          display and specify cpus in list format\n"
+#| " -h, --help              display this help\n"
+#| " -V, --version           output version information\n"
+#| "\n"
 msgid ""
 "Options:\n"
 " -a, --all-tasks         operate on all the tasks (threads) for a given pid\n"
@@ -11745,8 +11859,9 @@ msgstr "解析偏移失败"
 msgid "failed to parse step"
 msgstr "解析步长失败"
 
-#: sys-utils/blkdiscard.c:175 sys-utils/blkzone.c:406 sys-utils/fallocate.c:376
-#: sys-utils/fsfreeze.c:110 sys-utils/fstrim.c:478 sys-utils/umount.c:586
+#: sys-utils/blkdiscard.c:175 sys-utils/blkzone.c:406
+#: sys-utils/fallocate.c:376 sys-utils/fsfreeze.c:110 sys-utils/fstrim.c:478
+#: sys-utils/umount.c:586
 msgid "unexpected number of arguments"
 msgstr "参数数量异常"
 
@@ -11792,6 +11907,7 @@ msgstr "%s：BLKDISCARD ioctl 失败"
 
 #: sys-utils/blkzone.c:73
 #, fuzzy
+#| msgid "List information about block devices.\n"
 msgid "Report zone information about the given device"
 msgstr "列出块设备的信息。\n"
 
@@ -11801,21 +11917,25 @@ msgstr ""
 
 #: sys-utils/blkzone.c:104
 #, fuzzy, c-format
+#| msgid "%s: set direct io failed"
 msgid "%s: blkdev_get_sectors ioctl failed"
 msgstr "%s︰ 设置直接 io 失败"
 
 #: sys-utils/blkzone.c:184
 #, fuzzy, c-format
+#| msgid "%s: offset is greater than device size"
 msgid "%s: offset is greater than or equal to device size"
 msgstr "%s：偏移量超过设备大小"
 
 #: sys-utils/blkzone.c:188 sys-utils/blkzone.c:260
 #, fuzzy, c-format
+#| msgid "%s: unable to write zone map"
 msgid "%s: unable to determine zone size"
 msgstr "%s：无法写 zone map"
 
 #: sys-utils/blkzone.c:206
 #, fuzzy, c-format
+#| msgid "%s: BLKGETSIZE64 ioctl failed"
 msgid "%s: BLKREPORTZONE ioctl failed"
 msgstr "%s：BLKGETSIZE64 ioctl 失败"
 
@@ -11831,26 +11951,31 @@ msgstr ""
 
 #: sys-utils/blkzone.c:265
 #, fuzzy, c-format
+#| msgid "%s: offset %<PRIu64> is not aligned to sector size %i"
 msgid "%s: offset %<PRIu64> is not aligned to zone size %lu"
 msgstr "%s: 偏移量 %<PRIu64> 未与扇区大小 %i 对齐"
 
 #: sys-utils/blkzone.c:284
 #, fuzzy, c-format
+#| msgid "%s: offset %<PRIu64> is not aligned to sector size %i"
 msgid "%s: number of sectors %<PRIu64> is not aligned to zone size %lu"
 msgstr "%s: 偏移量 %<PRIu64> 未与扇区大小 %i 对齐"
 
 #: sys-utils/blkzone.c:292
 #, fuzzy, c-format
+#| msgid "%s: BLKSSZGET ioctl failed"
 msgid "%s: BLKRESETZONE ioctl failed"
 msgstr "%s：BLKSSZGET ioctl 失败"
 
 #: sys-utils/blkzone.c:294
 #, fuzzy, c-format
+#| msgid "Partition table length changed from %<PRIu32> to %<PRIu64>."
 msgid "%s: successfully reset in range from %<PRIu64>, to %<PRIu64>"
 msgstr "分区表长度已从 %<PRIu32> 改为 %<PRIu64>。"
 
 #: sys-utils/blkzone.c:308
 #, fuzzy, c-format
+#| msgid " %s [options] <device>\n"
 msgid " %s <command> [options] <device>\n"
 msgstr " %s [选项] <设备>\n"
 
@@ -11860,6 +11985,7 @@ msgstr ""
 
 #: sys-utils/blkzone.c:318
 #, fuzzy
+#| msgid " -o, --offset <num>   offset for range operations, in bytes\n"
 msgid " -o, --offset <sector>  start sector of zone to act (in 512-byte sectors)\n"
 msgstr " -o, --offset <数字>  范围操作的偏移量(字节数)\n"
 
@@ -11869,36 +11995,43 @@ msgstr ""
 
 #: sys-utils/blkzone.c:320
 #, fuzzy
+#| msgid " -t, --streams <number>    number of compression streams\n"
 msgid " -c, --count <number>   maximum number of zones\n"
 msgstr " -t, --streams <数字>      压缩流数量\n"
 
 #: sys-utils/blkzone.c:321
 #, fuzzy
+#| msgid "     --verbose          print more details\n"
 msgid " -v, --verbose          display more details\n"
 msgstr "     --verbose          打印更多细节\n"
 
 #: sys-utils/blkzone.c:363
 #, fuzzy, c-format
+#| msgid "%s is not a valid block device"
 msgid "%s is not valid command name"
 msgstr "%s 不是一个有效的块设备"
 
 #: sys-utils/blkzone.c:375
 #, fuzzy
+#| msgid "failed to parse number of lines"
 msgid "failed to parse number of zones"
 msgstr "解析行数失败"
 
 #: sys-utils/blkzone.c:379
 #, fuzzy
+#| msgid "failed to parse number of lines"
 msgid "failed to parse number of sectors"
 msgstr "解析行数失败"
 
 #: sys-utils/blkzone.c:383
 #, fuzzy
+#| msgid "failed to parse offset"
 msgid "failed to parse zone offset"
 msgstr "解析偏移失败"
 
 #: sys-utils/blkzone.c:399 sys-utils/setsid.c:92
 #, fuzzy
+#| msgid "no command was specified"
 msgid "no command specified"
 msgstr "没有指定命令"
 
@@ -12049,6 +12182,17 @@ msgstr "配置多处理器系统中的 CPU。\n"
 
 #: sys-utils/chcpu.c:249
 #, fuzzy
+#| msgid ""
+#| "\n"
+#| "Options:\n"
+#| "  -h, --help                    print this help\n"
+#| "  -e, --enable <cpu-list>       enable cpus\n"
+#| "  -d, --disable <cpu-list>      disable cpus\n"
+#| "  -c, --configure <cpu-list>    configure cpus\n"
+#| "  -g, --deconfigure <cpu-list>  deconfigure cpus\n"
+#| "  -p, --dispatch <mode>         set dispatching mode\n"
+#| "  -r, --rescan                  trigger rescan of cpus\n"
+#| "  -V, --version                 output version information and exit\n"
 msgid ""
 " -e, --enable <cpu-list>       enable cpus\n"
 " -d, --disable <cpu-list>      disable cpus\n"
@@ -12070,6 +12214,7 @@ msgstr ""
 
 #: sys-utils/chcpu.c:296
 #, fuzzy
+#| msgid "%s: failed to initialize sysfs handler"
 msgid "failed to initialize sysfs handler"
 msgstr "%s：初始化 sysfs 处理函数失败"
 
@@ -12085,6 +12230,7 @@ msgstr ""
 
 #: sys-utils/chmem.c:124 sys-utils/chmem.c:197
 #, fuzzy
+#| msgid "failed to parse id"
 msgid "Failed to parse index"
 msgstr "解析 id 失败"
 
@@ -12100,11 +12246,13 @@ msgstr "%s 禁用失败\n"
 
 #: sys-utils/chmem.c:156 sys-utils/chmem.c:242
 #, fuzzy, c-format
+#| msgid "CPU %u enabled\n"
 msgid "%s enabled\n"
 msgstr "CPU %u 已启用\n"
 
 #: sys-utils/chmem.c:158 sys-utils/chmem.c:244
 #, fuzzy, c-format
+#| msgid "CPU %u disabled\n"
 msgid "%s disabled\n"
 msgstr "CPU %u 已禁用\n"
 
@@ -12120,41 +12268,49 @@ msgstr ""
 
 #: sys-utils/chmem.c:206
 #, fuzzy, c-format
+#| msgid "CPU %u is already enabled\n"
 msgid "%s already enabled\n"
 msgstr "CPU %u 已经启用\n"
 
 #: sys-utils/chmem.c:208
 #, fuzzy, c-format
+#| msgid "CPU %u is already disabled\n"
 msgid "%s already disabled\n"
 msgstr "CPU %u 已经禁用\n"
 
 #: sys-utils/chmem.c:218
 #, fuzzy, c-format
+#| msgid "%s: failed to disarm watchdog"
 msgid "%s enable failed: Zone mismatch"
 msgstr "%s：喂看门狗失败"
 
 #: sys-utils/chmem.c:222
 #, fuzzy, c-format
+#| msgid "%s: failed to disarm watchdog"
 msgid "%s disable failed: Zone mismatch"
 msgstr "%s：喂看门狗失败"
 
 #: sys-utils/chmem.c:237
 #, fuzzy, c-format
+#| msgid "CPU %u enable failed"
 msgid "%s enable failed"
 msgstr "CPU %u 启用失败"
 
 #: sys-utils/chmem.c:239
 #, fuzzy, c-format
+#| msgid "CPU %u disable failed"
 msgid "%s disable failed"
 msgstr "CPU %u 禁用失败"
 
 #: sys-utils/chmem.c:265 sys-utils/lsmem.c:478
 #, fuzzy, c-format
+#| msgid "failed to read speed"
 msgid "Failed to read %s"
 msgstr "读 速度 失败"
 
 #: sys-utils/chmem.c:273
 #, fuzzy
+#| msgid "failed to parse number"
 msgid "Failed to parse block number"
 msgstr "解析数字失败"
 
@@ -12169,31 +12325,37 @@ msgstr ""
 
 #: sys-utils/chmem.c:291
 #, fuzzy
+#| msgid "failed to parse start"
 msgid "Failed to parse start"
 msgstr "解析 起点 失败"
 
 #: sys-utils/chmem.c:292
 #, fuzzy
+#| msgid "failed to parse end"
 msgid "Failed to parse end"
 msgstr "解析 终点 失败"
 
 #: sys-utils/chmem.c:296
 #, fuzzy, c-format
+#| msgid "invalid start argument"
 msgid "Invalid start address format: %s"
 msgstr "无效的 起点 参数"
 
 #: sys-utils/chmem.c:298
 #, fuzzy, c-format
+#| msgid "invalid signal name or number: %s"
 msgid "Invalid end address format: %s"
 msgstr "无效的信号名或数字：%s"
 
 #: sys-utils/chmem.c:299
 #, fuzzy
+#| msgid "failed to parse start"
 msgid "Failed to parse start address"
 msgstr "解析 起点 失败"
 
 #: sys-utils/chmem.c:300
 #, fuzzy
+#| msgid "failed to parse end"
 msgid "Failed to parse end address"
 msgstr "解析 终点 失败"
 
@@ -12204,16 +12366,19 @@ msgstr ""
 
 #: sys-utils/chmem.c:317
 #, fuzzy, c-format
+#| msgid "invalid argument: %s"
 msgid "Invalid parameter: %s"
 msgstr "无效参数：%s"
 
 #: sys-utils/chmem.c:324
 #, fuzzy, c-format
+#| msgid "invalid argument: %s"
 msgid "Invalid range: %s"
 msgstr "无效参数：%s"
 
 #: sys-utils/chmem.c:333
 #, fuzzy, c-format
+#| msgid " %s [options] [y | n]\n"
 msgid " %s [options] [SIZE|RANGE|BLOCKRANGE]\n"
 msgstr " %s [选项] [y | n]\n"
 
@@ -12223,16 +12388,19 @@ msgstr ""
 
 #: sys-utils/chmem.c:339
 #, fuzzy
+#| msgid " -v, --verbose        verbose mode\n"
 msgid " -e, --enable       enable memory\n"
 msgstr " -v, --verbose        详尽模式\n"
 
 #: sys-utils/chmem.c:340
 #, fuzzy
+#| msgid " -m, --shmems      shared memory segments\n"
 msgid " -d, --disable      disable memory\n"
 msgstr " -m, --shmems      共享内存段\n"
 
 #: sys-utils/chmem.c:341
 #, fuzzy
+#| msgid " -u, --unlock             remove a lock\n"
 msgid " -b, --blocks       use memory blocks\n"
 msgstr " -u, --unlock             移除锁\n"
 
@@ -12242,11 +12410,15 @@ msgstr ""
 
 #: sys-utils/chmem.c:343
 #, fuzzy
+#| msgid " -v, --verbose        verbose mode\n"
 msgid " -v, --verbose      verbose output\n"
 msgstr " -v, --verbose        详尽模式\n"
 
 #: sys-utils/chmem.c:346
 #, fuzzy
+#| msgid ""
+#| "\n"
+#| "Supported log facilities:\n"
 msgid ""
 "\n"
 "Supported zones:\n"
@@ -12256,6 +12428,7 @@ msgstr ""
 
 #: sys-utils/chmem.c:387 sys-utils/lscpu.c:1430 sys-utils/lsmem.c:642
 #, fuzzy, c-format
+#| msgid "%s: failed to initialize sysfs handler"
 msgid "failed to initialize %s handler"
 msgstr "%s：初始化 sysfs 处理函数失败"
 
@@ -12265,11 +12438,17 @@ msgstr ""
 
 #: sys-utils/chmem.c:438
 #, fuzzy, c-format
+#| msgid "unknown month name: %s"
 msgid "unknown memory zone: %s"
 msgstr "月份名未知：%s"
 
 #: sys-utils/choom.c:38
 #, fuzzy, c-format
+#| msgid ""
+#| " %1$s [options] -p <pid>...\n"
+#| " %1$s [options] -P <pgid>...\n"
+#| " %1$s [options] -u <uid>...\n"
+#| " %1$s [options] <command>\n"
 msgid ""
 " %1$s [options] -p pid\n"
 " %1$s [options] -n number -p pid\n"
@@ -12286,26 +12465,31 @@ msgstr ""
 
 #: sys-utils/choom.c:47
 #, fuzzy
+#| msgid " -n, --priority <num>   specify the nice increment value\n"
 msgid " -n, --adjust <num>     specify the adjust score value\n"
 msgstr " -n, --priority <数字>  指定 nice 增量\n"
 
 #: sys-utils/choom.c:48
 #, fuzzy
+#| msgid " -p, --task <pid>       print process namespaces\n"
 msgid " -p, --pid <num>        process ID\n"
 msgstr " -p, --task <pid>       打印进程名字空间\n"
 
 #: sys-utils/choom.c:60
 #, fuzzy
+#| msgid "failed to read speed"
 msgid "failed to read OOM score value"
 msgstr "读 速度 失败"
 
 #: sys-utils/choom.c:70
 #, fuzzy
+#| msgid "failed to read speed"
 msgid "failed to read OOM score adjust value"
 msgstr "读 速度 失败"
 
 #: sys-utils/choom.c:105
 #, fuzzy
+#| msgid "invalid heads argument"
 msgid "invalid adjust argument"
 msgstr "无效的 磁头数 参数"
 
@@ -12316,26 +12500,31 @@ msgstr "无效参数：%s"
 
 #: sys-utils/choom.c:123
 #, fuzzy
+#| msgid "COMMAND not specified."
 msgid "no PID or COMMAND specified"
 msgstr "没有指定命令"
 
 #: sys-utils/choom.c:127
 #, fuzzy
+#| msgid "invalid offset value specified"
 msgid "no OOM score adjust value specified"
 msgstr "指定的偏移值无效"
 
 #: sys-utils/choom.c:135
 #, fuzzy, c-format
+#| msgid "pid %d's current scheduling priority: %d\n"
 msgid "pid %d's current OOM score: %d\n"
 msgstr "pid %d 的当前调度优先级：%d\n"
 
 #: sys-utils/choom.c:136
 #, fuzzy, c-format
+#| msgid "pid %d's current scheduling priority: %d\n"
 msgid "pid %d's current OOM score adjust value: %d\n"
 msgstr "pid %d 的当前调度优先级：%d\n"
 
 #: sys-utils/choom.c:143 sys-utils/choom.c:150
 #, fuzzy
+#| msgid "failed to set data"
 msgid "failed to set score adjust value"
 msgstr "设置数据失败"
 
@@ -12490,6 +12679,7 @@ msgstr " -k, --kernel                显示内核消息\n"
 
 #: sys-utils/dmesg.c:282
 #, fuzzy, c-format
+#| msgid " -L, --color[=<when>]        colorize messages (auto, always or never)\n"
 msgid " -L, --color[=<when>]        colorize messages (%s, %s or %s)\n"
 msgstr " -L, --color[=<时机>]        彩色显示消息(auto, always 或 never)\n"
 
@@ -12515,6 +12705,7 @@ msgstr " -r, --raw                   打印原生消息缓冲区\n"
 
 #: sys-utils/dmesg.c:290
 #, fuzzy
+#| msgid " -n, --noheadings          don't print headings\n"
 msgid "     --noescape              don't escape unprintable character\n"
 msgstr " -n, --noheadings          不打印标题\n"
 
@@ -12752,6 +12943,7 @@ msgstr "CD-ROM 驱动器未就绪"
 
 #: sys-utils/eject.c:442
 #, fuzzy
+#| msgid "CD-ROM eject command failed"
 msgid "CD-ROM status command failed"
 msgstr "CD-ROM 弹出命令失败"
 
@@ -13002,6 +13194,7 @@ msgstr " -z, --zero-range     清零并保证分配某个范围\n"
 
 #: sys-utils/fallocate.c:99
 #, fuzzy
+#| msgid " -y, --physical          print physical instead of logical IDs\n"
 msgid " -x, --posix          use posix_fallocate(3) instead of fallocate(2)\n"
 msgstr " -y, --physical          打印物理 ID 而非逻辑 ID\n"
 
@@ -13153,6 +13346,7 @@ msgstr " %s [选项] <挂臷点>\n"
 
 #: sys-utils/fsfreeze.c:44
 #, fuzzy
+#| msgid "Mount a filesystem.\n"
 msgid "Suspend access to a filesystem.\n"
 msgstr "挂载文件系统。\n"
 
@@ -13190,11 +13384,13 @@ msgstr "%s：不是一个目录"
 
 #: sys-utils/fstrim.c:93
 #, fuzzy, c-format
+#| msgid "cannot read %s"
 msgid "cannot get realpath: %s"
 msgstr "不能读 %s"
 
 #: sys-utils/fstrim.c:109
 #, fuzzy, c-format
+#| msgid "%s: %s mounted on %s.\n"
 msgid "%s: 0 B (dry run) trimmed on %s\n"
 msgstr "%s：%s 已挂臷到 %s。\n"
 
@@ -13211,6 +13407,7 @@ msgstr "%s：FITRIM ioctl 失败"
 #. TRANSLATORS: The standard value here is a very large number.
 #: sys-utils/fstrim.c:138
 #, fuzzy, c-format
+#| msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
 msgid "%s: %s (%<PRIu64> bytes) trimmed on %s\n"
 msgstr "%s：%s (%<PRIu64> 字节) 已修剪\n"
 
@@ -13228,6 +13425,7 @@ msgstr "解析 %s 失败"
 
 #: sys-utils/fstrim.c:273
 #, fuzzy
+#| msgid "failed to allocate script handler"
 msgid "failed to allocate FS handler"
 msgstr "分配脚本处理程序失败"
 
@@ -13247,11 +13445,13 @@ msgstr "忽略已挂载文件系统上的未用锁。\n"
 
 #: sys-utils/fstrim.c:388
 #, fuzzy
+#| msgid " -a, --all           trim all mounted filesystems that are supported\n"
 msgid " -a, --all           trim all supported mounted filesystems\n"
 msgstr " -a, --all           修剪不支持的所有已挂载文件系统\n"
 
 #: sys-utils/fstrim.c:389
 #, fuzzy
+#| msgid " -a, --all           trim all mounted filesystems that are supported\n"
 msgid " -A, --fstab         trim all supported mounted filesystems from /etc/fstab\n"
 msgstr " -a, --all           修剪不支持的所有已挂载文件系统\n"
 
@@ -13273,11 +13473,13 @@ msgstr " -v, --verbose       打印丢弃的字节数\n"
 
 #: sys-utils/fstrim.c:394
 #, fuzzy
+#| msgid " -q, --quiet               suppress extra info messages\n"
 msgid "     --quiet         suppress trim error messages\n"
 msgstr " -q, --quiet               禁止输出额外信息\n"
 
 #: sys-utils/fstrim.c:395
 #, fuzzy
+#| msgid " -n, --dry-run            does everything, but suspend\n"
 msgid " -n, --dry-run       does everything, but trim\n"
 msgstr " -n, --dry-run            演示操作但不执行(suspend)\n"
 
@@ -13289,20 +13491,20 @@ msgstr "解析 最小范围长度 失败"
 msgid "no mountpoint specified"
 msgstr "未指定挂载点"
 
-#: sys-utils/hwclock.c:210
+#: sys-utils/hwclock.c:209
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "将假设硬件时钟保持为 %s 时间。\n"
 
-#: sys-utils/hwclock.c:211 sys-utils/hwclock.c:275
+#: sys-utils/hwclock.c:210 sys-utils/hwclock.c:274
 msgid "UTC"
 msgstr "UTC"
 
-#: sys-utils/hwclock.c:211 sys-utils/hwclock.c:274
+#: sys-utils/hwclock.c:210 sys-utils/hwclock.c:273
 msgid "local"
 msgstr "当地"
 
-#: sys-utils/hwclock.c:261
+#: sys-utils/hwclock.c:260
 msgid ""
 "Warning: unrecognized third line in adjtime file\n"
 "(Expected: `UTC' or `LOCAL' or nothing.)"
@@ -13310,78 +13512,82 @@ msgstr ""
 "警告：adjtime 文件第三行无法识别\n"
 "(应为：“UTC”或“LOCAL”或空)"
 
-#: sys-utils/hwclock.c:268
+#: sys-utils/hwclock.c:267
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "上次漂移调整完成于1969(年)后 %ld 秒\n"
 
-#: sys-utils/hwclock.c:270
+#: sys-utils/hwclock.c:269
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "上次校准完成于1969(年)后 %ld 秒\n"
 
-#: sys-utils/hwclock.c:272
+#: sys-utils/hwclock.c:271
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "硬件时钟为 %s 时间\n"
 
-#: sys-utils/hwclock.c:299
+#: sys-utils/hwclock.c:298
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "正在等等时钟滴答...\n"
 
-#: sys-utils/hwclock.c:305
+#: sys-utils/hwclock.c:304
 #, c-format
 msgid "...synchronization failed\n"
 msgstr "...同步失败\n"
 
-#: sys-utils/hwclock.c:307
+#: sys-utils/hwclock.c:306
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...已获取时钟滴答\n"
 
-#: sys-utils/hwclock.c:348
+#: sys-utils/hwclock.c:347
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "硬件时钟值无效：%4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: sys-utils/hwclock.c:356
+#: sys-utils/hwclock.c:355
 #, c-format
 msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "硬件时钟时间：%4d/%.2d/%.2d %.2d:%.2d:%.2d = 1969(年)后 %ld 秒\n"
 
-#: sys-utils/hwclock.c:383
+#: sys-utils/hwclock.c:382
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "从硬件时钟读取的时间：%4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: sys-utils/hwclock.c:410
+#: sys-utils/hwclock.c:409
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "正在将硬件时钟设置为 %.2d:%.2d:%.2d = 1969(年)后 %ld 秒\n"
 
-#: sys-utils/hwclock.c:446
+#: sys-utils/hwclock.c:445
 #, c-format
 msgid "RTC type: '%s'\n"
 msgstr "RTC 类型：“%s”\n"
 
-#: sys-utils/hwclock.c:546
+#: sys-utils/hwclock.c:545
 #, fuzzy, c-format
+#| msgid "%s  %.6f seconds\n"
 msgid "Using delay: %.6f seconds\n"
 msgstr "%s  %.6f 秒\n"
 
-#: sys-utils/hwclock.c:565
+#: sys-utils/hwclock.c:564
 #, c-format
 msgid "time jumped backward %.6f seconds to %ld.%06ld - retargeting\n"
 msgstr "时间倒退了 %.6f 秒到 %ld.%06ld - 正在重新定位\n"
 
-#: sys-utils/hwclock.c:587
+#: sys-utils/hwclock.c:586
 #, c-format
 msgid "missed it - %ld.%06ld is too far past %ld.%06ld (%.6f > %.6f)\n"
 msgstr "错过了- %ld.%06ld 在 %ld.%06ld 之后太长时间了(%.6f > %.6f)\n"
 
-#: sys-utils/hwclock.c:615
+#: sys-utils/hwclock.c:614
 #, fuzzy, c-format
+#| msgid ""
+#| "%ld.%06ld is close enough to %ld.%06ld (%.6f < %.6f)\n"
+#| "Set RTC to %ld (%ld + %d; refsystime = %ld.%06ld)\n"
 msgid ""
 "%ld.%06ld is close enough to %ld.%06ld (%.6f < %.6f)\n"
 "Set RTC to %ld (%ld + %d; refsystime = %ld.%06ld)\n"
@@ -13389,43 +13595,44 @@ msgstr ""
 "%ld.%06d 距 %ld.%06d 太近(%.6f < %.6f)\n"
 "请将 RTC 设为 %ld (%ld + %d; refsystime = %ld.%06d)\n"
 
-#: sys-utils/hwclock.c:685
+#: sys-utils/hwclock.c:684
 #, c-format
 msgid "Calling settimeofday(NULL, %d) to set persistent_clock_is_local.\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:688
+#: sys-utils/hwclock.c:687
 msgid "Calling settimeofday(NULL, 0) to lock the warp function."
 msgstr ""
 
-#: sys-utils/hwclock.c:691
+#: sys-utils/hwclock.c:690
 #, fuzzy, c-format
+#| msgid "Calling settimeofday:\n"
 msgid "Calling settimeofday(%ld.%06ld, %d)\n"
 msgstr "正在调用 settimeofday：\n"
 
-#: sys-utils/hwclock.c:694
+#: sys-utils/hwclock.c:693
 #, c-format
 msgid "Calling settimeofday(NULL, %d) "
 msgstr "正在调用 settimeofday(NULL, %d)"
 
-#: sys-utils/hwclock.c:696
+#: sys-utils/hwclock.c:695
 msgid "to set the kernel timezone."
 msgstr ""
 
-#: sys-utils/hwclock.c:698
+#: sys-utils/hwclock.c:697
 msgid "to warp System time."
 msgstr ""
 
-#: sys-utils/hwclock.c:715
+#: sys-utils/hwclock.c:714
 msgid "settimeofday() failed"
 msgstr "settimeofday() 失败"
 
-#: sys-utils/hwclock.c:739
+#: sys-utils/hwclock.c:738
 #, c-format
 msgid "Not adjusting drift factor because the --update-drift option was not used.\n"
 msgstr "将不调整漂移系数，因为没有使用 --update-drift 选项。\n"
 
-#: sys-utils/hwclock.c:743
+#: sys-utils/hwclock.c:742
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -13434,12 +13641,12 @@ msgstr ""
 "将不调整漂移系数，因为上次校准时间为零，\n"
 "历史有问题；需要启动校准。\n"
 
-#: sys-utils/hwclock.c:749
+#: sys-utils/hwclock.c:748
 #, c-format
 msgid "Not adjusting drift factor because it has been less than four hours since the last calibration.\n"
 msgstr "将不调整漂移系数，因为距上次校正不到四个小时。\n"
 
-#: sys-utils/hwclock.c:787
+#: sys-utils/hwclock.c:786
 #, c-format
 msgid ""
 "Clock drift factor was calculated as %f seconds/day.\n"
@@ -13448,203 +13655,223 @@ msgstr ""
 "时钟漂移系数会按 %f 秒/天计算。\n"
 "系数过大，将重置为 0。\n"
 
-#: sys-utils/hwclock.c:794
+#: sys-utils/hwclock.c:793
 #, fuzzy, c-format
+#| msgid ""
+#| "Clock drifted %f seconds in the past %f seconds\n"
+#| "in spite of a drift factor of %f seconds/day.\n"
+#| "Adjusting drift factor by %f seconds/day\n"
 msgid ""
 "Clock drifted %f seconds in the past %f seconds\n"
 "in spite of a drift factor of %f seconds/day.\n"
 "Adjusting drift factor by %f seconds/day\n"
 msgstr "在过去的 %2$d 秒内，时钟漂移了 %1$.1f 秒，而漂移系数为 %3$f 秒/天。会将漂移系数调整 %4$f 秒/天\n"
 
-#: sys-utils/hwclock.c:838
+#: sys-utils/hwclock.c:837
 #, fuzzy, c-format
+#| msgid "Time since last adjustment is %d second\n"
+#| msgid_plural "Time since last adjustment is %d seconds\n"
 msgid "Time since last adjustment is %ld second\n"
 msgid_plural "Time since last adjustment is %ld seconds\n"
 msgstr[0] "距上次调整的时间为 %d 秒\n"
 
-#: sys-utils/hwclock.c:842
+#: sys-utils/hwclock.c:841
 #, c-format
 msgid "Calculated Hardware Clock drift is %ld.%06ld seconds\n"
 msgstr "计算出的硬件锁偏差为 %ld.%06ld 秒\n"
 
-#: sys-utils/hwclock.c:867
+#: sys-utils/hwclock.c:866
 #, c-format
 msgid ""
 "New %s data:\n"
 "%s"
 msgstr ""
 
-#: sys-utils/hwclock.c:877
+#: sys-utils/hwclock.c:876
 #, fuzzy, c-format
+#| msgid "cannot open %s"
 msgid "cannot update %s"
 msgstr "打不开 %s"
 
-#: sys-utils/hwclock.c:913
+#: sys-utils/hwclock.c:912
 #, c-format
 msgid "Not setting clock because last adjustment time is zero, so history is bad.\n"
 msgstr "将不设置时钟，因为上次调整时间为零，历史有误。\n"
 
-#: sys-utils/hwclock.c:917
+#: sys-utils/hwclock.c:916
 #, c-format
 msgid "Not setting clock because drift factor %f is far too high.\n"
 msgstr "将不设置时钟，因为上次漂移系数 %f 过高。\n"
 
-#: sys-utils/hwclock.c:947
+#: sys-utils/hwclock.c:946
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "未找到可用的时钟接口。\n"
 
-#: sys-utils/hwclock.c:949
+#: sys-utils/hwclock.c:948
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr "无法通过已知的任何方式访问硬件时钟。"
 
-#: sys-utils/hwclock.c:953
+#: sys-utils/hwclock.c:952
 #, fuzzy
+#| msgid "Use the --debug option to see the details of our search for an access method."
 msgid "Use the --verbose option to see the details of our search for an access method."
 msgstr "请使用 --debug 选项来观察程序搜索访问方法的详情。"
 
-#: sys-utils/hwclock.c:1003
+#: sys-utils/hwclock.c:1002
 #, c-format
 msgid "Target date:   %ld\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:1004
+#: sys-utils/hwclock.c:1003
 #, c-format
 msgid "Predicted RTC: %ld\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:1034
+#: sys-utils/hwclock.c:1033
 msgid "RTC read returned an invalid value."
 msgstr ""
 
-#: sys-utils/hwclock.c:1062
+#: sys-utils/hwclock.c:1061
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr "需要的调整不到一秒，将不设置时钟。\n"
 
-#: sys-utils/hwclock.c:1099
+#: sys-utils/hwclock.c:1098
 #, fuzzy
+#| msgid "unable to read super block"
 msgid "unable to read the RTC epoch."
 msgstr "不能读超级块"
 
-#: sys-utils/hwclock.c:1101
+#: sys-utils/hwclock.c:1100
 #, c-format
 msgid "The RTC epoch is set to %lu.\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:1104
+#: sys-utils/hwclock.c:1103
 msgid "--epoch is required for --setepoch."
 msgstr ""
 
-#: sys-utils/hwclock.c:1107
+#: sys-utils/hwclock.c:1106
 #, fuzzy
+#| msgid "Unable to set system clock.\n"
 msgid "unable to set the RTC epoch."
 msgstr "无法设置系统时钟。\n"
 
-#: sys-utils/hwclock.c:1121
+#: sys-utils/hwclock.c:1120
 #, fuzzy, c-format
+#| msgid " hwclock [function] [option...]\n"
 msgid " %s [function] [option...]\n"
 msgstr " hwclock [功能] [选项...]\n"
 
-#: sys-utils/hwclock.c:1124
+#: sys-utils/hwclock.c:1123
 msgid "Time clocks utility."
 msgstr ""
 
-#: sys-utils/hwclock.c:1127
+#: sys-utils/hwclock.c:1126
 msgid " -r, --show           display the RTC time"
 msgstr " -r, --show           显示 RTC 时间"
 
-#: sys-utils/hwclock.c:1128
+#: sys-utils/hwclock.c:1127
 #, fuzzy
+#| msgid " -Z, --context            display SELinux contexts\n"
 msgid "     --get            display drift corrected RTC time"
 msgstr " -Z, --context            显示 SELinux 环境\n"
 
-#: sys-utils/hwclock.c:1129
+#: sys-utils/hwclock.c:1128
 #, fuzzy
+#| msgid " -r, --reset                  reset the port\n"
 msgid "     --set            set the RTC according to --date"
 msgstr " -r, --reset                  重置端口\n"
 
-#: sys-utils/hwclock.c:1130
+#: sys-utils/hwclock.c:1129
 msgid " -s, --hctosys        set the system time from the RTC"
 msgstr ""
 
-#: sys-utils/hwclock.c:1131
+#: sys-utils/hwclock.c:1130
 #, fuzzy
+#| msgid " -t, --types <list>      limit the set of filesystem types\n"
 msgid " -w, --systohc        set the RTC from the system time"
 msgstr " -t, --types <列表>      限制文件系统集合\n"
 
-#: sys-utils/hwclock.c:1132
+#: sys-utils/hwclock.c:1131
 msgid "     --systz          send timescale configurations to the kernel"
 msgstr ""
 
-#: sys-utils/hwclock.c:1133
+#: sys-utils/hwclock.c:1132
 msgid " -a, --adjust         adjust the RTC to account for systematic drift"
 msgstr ""
 
-#: sys-utils/hwclock.c:1135
+#: sys-utils/hwclock.c:1134
 #, fuzzy
+#| msgid "     --help                 display this help and exit\n"
 msgid "     --getepoch       display the RTC epoch"
 msgstr "     --help                 显示此帮助并退出\n"
 
-#: sys-utils/hwclock.c:1136
+#: sys-utils/hwclock.c:1135
 msgid "     --setepoch       set the RTC epoch according to --epoch"
 msgstr ""
 
-#: sys-utils/hwclock.c:1138
+#: sys-utils/hwclock.c:1137
 msgid "     --predict        predict the drifted RTC time according to --date"
 msgstr ""
 
-#: sys-utils/hwclock.c:1140
+#: sys-utils/hwclock.c:1139
 #, fuzzy
+#| msgid " -u, --utc                RTC uses UTC\n"
 msgid " -u, --utc            the RTC timescale is UTC"
 msgstr " -u, --utc                RTC 使用 UTC\n"
 
-#: sys-utils/hwclock.c:1141
+#: sys-utils/hwclock.c:1140
 #, fuzzy
+#| msgid " -l, --local              RTC uses local timezone\n"
 msgid " -l, --localtime      the RTC timescale is Local"
 msgstr " -l, --local              RTC 使用本地时区\n"
 
-#: sys-utils/hwclock.c:1144
+#: sys-utils/hwclock.c:1143
 #, fuzzy, c-format
+#| msgid " -f, --file <file>    use a specific file instead of %s\n"
 msgid " -f, --rtc <file>     use an alternate file to %1$s\n"
 msgstr " -F, --file <文件>    用指定文件代替 %s\n"
 
-#: sys-utils/hwclock.c:1147
+#: sys-utils/hwclock.c:1146
 #, c-format
 msgid "     --directisa      use the ISA bus instead of %1$s access\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:1148
+#: sys-utils/hwclock.c:1147
 msgid "     --date <time>    date/time input for --set and --predict"
 msgstr "     --date <时间戳>  指定用于 --set 和 --predict 的日期/时间输入"
 
-#: sys-utils/hwclock.c:1149
+#: sys-utils/hwclock.c:1148
 msgid "     --delay <sec>    delay used when set new RTC time"
 msgstr ""
 
-#: sys-utils/hwclock.c:1151
+#: sys-utils/hwclock.c:1150
 msgid "     --epoch <year>   epoch input for --setepoch"
 msgstr ""
 
-#: sys-utils/hwclock.c:1153
+#: sys-utils/hwclock.c:1152
 msgid "     --update-drift   update the RTC drift factor"
 msgstr ""
 
-#: sys-utils/hwclock.c:1155
+#: sys-utils/hwclock.c:1154
 #, fuzzy, c-format
+#| msgid "     --noheadings         don't print headings\n"
 msgid "     --noadjfile      do not use %1$s\n"
 msgstr "      --noheadings     不打印标题\n"
 
-#: sys-utils/hwclock.c:1157
+#: sys-utils/hwclock.c:1156
 #, fuzzy, c-format
+#| msgid " -f, --file <file>    use a specific file instead of %s\n"
 msgid "     --adjfile <file> use an alternate file to %1$s\n"
 msgstr " -F, --file <文件>    用指定文件代替 %s\n"
 
-#: sys-utils/hwclock.c:1158
+#: sys-utils/hwclock.c:1157
 msgid "     --test           dry run; implies --verbose"
 msgstr "     --test           测试运行；隐含启用 --verbose"
 
-#: sys-utils/hwclock.c:1159
+#: sys-utils/hwclock.c:1158
 msgid " -v, --verbose        display more details"
 msgstr " -v, --verbose        显示更多细节"
 
@@ -13658,6 +13885,7 @@ msgstr ""
 
 #: sys-utils/hwclock.c:1381
 #, fuzzy, c-format
+#| msgid "too many arguments"
 msgid "%d too many arguments given"
 msgstr "参数过多"
 
@@ -13673,17 +13901,19 @@ msgstr "指定 --noadjfile 时，您必须指定 --utc 或 --localtime"
 msgid "--date is required for --set or --predict"
 msgstr ""
 
-#: sys-utils/hwclock.c:1418
+#: sys-utils/hwclock.c:1407
 #, fuzzy, c-format
+#| msgid "invalid id: %s"
 msgid "invalid date '%s'"
 msgstr "无效 ID：%s"
 
-#: sys-utils/hwclock.c:1432
+#: sys-utils/hwclock.c:1421
 #, fuzzy, c-format
+#| msgid "Current system time: %ld = %s\n"
 msgid "System Time: %ld.%06ld\n"
 msgstr "当前系统时间：%ld = %s\n"
 
-#: sys-utils/hwclock.c:1448
+#: sys-utils/hwclock.c:1437
 msgid "Test mode: nothing was changed."
 msgstr "演示模式：无实际修改。"
 
@@ -13693,16 +13923,19 @@ msgstr "未实现 ISA 端口访问"
 
 #: sys-utils/hwclock-cmos.c:362
 #, fuzzy
+#| msgid "cannot access file %s"
 msgid "iopl() port access failed"
 msgstr "无法访问文件 %s"
 
 #: sys-utils/hwclock-cmos.c:373
 #, fuzzy
+#| msgid "Using direct I/O instructions to ISA clock."
 msgid "Using direct ISA access to the clock"
 msgstr "将对 ISA 时钟使用直接 I/O 指令。"
 
 #: sys-utils/hwclock-rtc.c:131
 #, fuzzy, c-format
+#| msgid "Trying to unmount %s\n"
 msgid "Trying to open: %s\n"
 msgstr "正在尝试卸载 %s\n"
 
@@ -13741,11 +13974,13 @@ msgstr "对 %s ioctl() 以关闭更新中断失败"
 
 #: sys-utils/hwclock-rtc.c:300
 #, fuzzy, c-format
+#| msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgid "ioctl(%d, RTC_UIE_ON, 0) to %s failed"
 msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
 
 #: sys-utils/hwclock-rtc.c:353
 #, fuzzy, c-format
+#| msgid "ioctl(%s) to %s to set the time failed."
 msgid "ioctl(%s) to %s to set the time failed"
 msgstr "对 %2$s ioctl(%1$s) 以设置时间失败。"
 
@@ -13756,31 +13991,37 @@ msgstr "ioctl(%s) 成功。\n"
 
 #: sys-utils/hwclock-rtc.c:375
 #, fuzzy
+#| msgid "Using the /dev interface to the clock."
 msgid "Using the rtc interface to the clock."
 msgstr "将对时钟使用 /dev 接口。"
 
 #: sys-utils/hwclock-rtc.c:408
 #, fuzzy, c-format
+#| msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgid "ioctl(%d, RTC_EPOCH_READ, epoch_p) to %s failed"
 msgstr "对 %s 进行 ioctl(RTC_EPOCH_READ) 失败"
 
 #: sys-utils/hwclock-rtc.c:414
 #, fuzzy, c-format
+#| msgid "ioctl(RTC_EPOCH_READ) to %s failed"
 msgid "ioctl(%d, RTC_EPOCH_READ, epoch_p) to %s succeeded.\n"
 msgstr "对 %s 进行 ioctl(RTC_EPOCH_READ) 失败"
 
 #: sys-utils/hwclock-rtc.c:432
 #, fuzzy, c-format
+#| msgid "invalid epoch argument"
 msgid "invalid epoch '%s'."
 msgstr "无效的纪元(epoch)参数"
 
 #: sys-utils/hwclock-rtc.c:443
 #, fuzzy, c-format
+#| msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgid "ioctl(%d, RTC_EPOCH_SET, %lu) to %s failed"
 msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
 
 #: sys-utils/hwclock-rtc.c:449
 #, fuzzy, c-format
+#| msgid "ioctl(RTC_EPOCH_SET) to %s failed"
 msgid "ioctl(%d, RTC_EPOCH_SET, %lu) to %s succeeded.\n"
 msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
 
@@ -14720,6 +14961,7 @@ msgstr "通过直接 IO 访问后备文件"
 
 #: sys-utils/losetup.c:83
 #, fuzzy
+#| msgid "logical sector size"
 msgid "logical sector size in bytes"
 msgstr "逻辑扇区大小"
 
@@ -14794,6 +15036,7 @@ msgstr "     --sizelimit <数字>        设备限制为了文件的<数字>个
 
 #: sys-utils/losetup.c:422
 #, fuzzy
+#| msgid " -b, --sector-size <size>      physical and logical sector size\n"
 msgid " -b, --sector-size <num>       set the logical sector size to <num>\n"
 msgstr " -b, --sectors-size <大小>     显示扇区计数和大小\n"
 
@@ -14835,6 +15078,7 @@ msgstr " -O, --output <列>           指定 --list 选项要输出的列\n"
 
 #: sys-utils/losetup.c:435
 #, fuzzy
+#| msgid " -O, --output-all     output all columns\n"
 msgid "     --output-all              output all columns\n"
 msgstr " -O, --output-all     输出所有列\n"
 
@@ -14892,6 +15136,7 @@ msgstr "%s：使用后备文件失败"
 
 #: sys-utils/losetup.c:661
 #, fuzzy
+#| msgid "failed to parse size"
 msgid "failed to parse logical block size"
 msgstr "解析大小失败"
 
@@ -14926,6 +15171,7 @@ msgstr "%s︰ 设置直接 io 失败"
 
 #: sys-utils/losetup.c:909
 #, fuzzy, c-format
+#| msgid "%s: get size failed"
 msgid "%s: set logical block size failed"
 msgstr "%s：获取大小失败"
 
@@ -15007,6 +15253,7 @@ msgstr "显示 CPU 的最小 MHz"
 
 #: sys-utils/lscpu.c:218
 #, fuzzy
+#| msgid "set filesystem readahead"
 msgid "size of all system caches"
 msgstr "设置 文件系统 readahead"
 
@@ -15016,11 +15263,13 @@ msgstr ""
 
 #: sys-utils/lscpu.c:220
 #, fuzzy
+#| msgid "device name"
 msgid "cache name"
 msgstr "设备名"
 
 #: sys-utils/lscpu.c:221
 #, fuzzy
+#| msgid "size of the device"
 msgid "size of one cache"
 msgstr "磁盘容量"
 
@@ -15038,11 +15287,13 @@ msgstr ""
 
 #: sys-utils/lscpu.c:225
 #, fuzzy
+#| msgid "write error"
 msgid "write policy"
 msgstr "写出错"
 
 #: sys-utils/lscpu.c:226
 #, fuzzy
+#| msgid "Number of physical cylinders"
 msgid "number of physical cache line per cache t"
 msgstr "物理柱面数"
 
@@ -15065,6 +15316,7 @@ msgstr "确定 CPU 数 失败：%s"
 
 #: sys-utils/lscpu.c:883
 #, fuzzy
+#| msgid "cannot set signal handler"
 msgid "cannot restore signal handler"
 msgstr "无法设置信号处理函数"
 
@@ -15188,16 +15440,19 @@ msgstr "步进："
 
 #: sys-utils/lscpu.c:2127
 #, fuzzy
+#| msgid "FreeBSD boot"
 msgid "Frequency boost:"
 msgstr "FreeBSD 启动"
 
 #: sys-utils/lscpu.c:2128
 #, fuzzy
+#| msgid "Unusable"
 msgid "enabled"
 msgstr "不可用"
 
 #: sys-utils/lscpu.c:2128
 #, fuzzy
+#| msgid "CPU %u disabled\n"
 msgid "disabled"
 msgstr "CPU %u 已禁用\n"
 
@@ -15285,11 +15540,13 @@ msgstr " -b, --online            只打印在线 CPU (-p 选项默认值)\n"
 
 #: sys-utils/lscpu.c:2234
 #, fuzzy
+#| msgid " -b, --bytes            print sizes in bytes rather than in human readable format\n"
 msgid " -B, --bytes             print sizes in bytes rather than in human readable format\n"
 msgstr " -b, --bytes           以字节为单位而非易读的格式来打印大小\n"
 
 #: sys-utils/lscpu.c:2235
 #, fuzzy
+#| msgid " -e, --extended[=<list>] print out an extended readable format\n"
 msgid " -C, --caches[=<list>]   info about caches in extended readable format\n"
 msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n"
 
@@ -15299,6 +15556,7 @@ msgstr " -c, --offline           只打印离线 CPU\n"
 
 #: sys-utils/lscpu.c:2237
 #, fuzzy
+#| msgid " -J, --json             use JSON output format\n"
 msgid " -J, --json              use JSON for default or extended format\n"
 msgstr " -J, --json              使用 JSON 输出格式\n"
 
@@ -15324,11 +15582,15 @@ msgstr " -y, --physical          打印物理 ID 而非逻辑 ID\n"
 
 #: sys-utils/lscpu.c:2243
 #, fuzzy
+#| msgid " -O, --output-all     output all columns\n"
 msgid "     --output-all        print all available columns for -e, -p or -C\n"
 msgstr " -O, --output-all     输出所有列\n"
 
 #: sys-utils/lscpu.c:2247
 #, fuzzy
+#| msgid ""
+#| "\n"
+#| "Available columns (for -o):\n"
 msgid ""
 "\n"
 "Available output columns for -e or -p:\n"
@@ -15338,6 +15600,9 @@ msgstr ""
 
 #: sys-utils/lscpu.c:2251
 #, fuzzy
+#| msgid ""
+#| "\n"
+#| "Available columns (for -o):\n"
 msgid ""
 "\n"
 "Available output columns for -C:\n"
@@ -15352,11 +15617,13 @@ msgstr "%s：--all、--online 和 --offline 选项只能与 --extended 或 --par
 
 #: sys-utils/lscpu.c:2406
 #, fuzzy
+#| msgid "%s: failed to initialize sysfs handler"
 msgid "failed to initialize CPUs sysfs handler"
 msgstr "%s：初始化 sysfs 处理函数失败"
 
 #: sys-utils/lscpu.c:2413
 #, fuzzy
+#| msgid "%s: failed to initialize sysfs handler"
 msgid "failed to initialize procfs handler"
 msgstr "%s：初始化 sysfs 处理函数失败"
 
@@ -15632,6 +15899,9 @@ msgstr ""
 
 #: sys-utils/lsipc.c:326
 #, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Shared-memory columns (--shmems):\n"
 msgid ""
 "\n"
 "Shared-memory columns (--shmems):\n"
@@ -15749,6 +16019,7 @@ msgstr ""
 
 #: sys-utils/lsmem.c:127
 #, fuzzy
+#| msgid "size of the device"
 msgid "size of the memory range"
 msgstr "磁盘容量"
 
@@ -15758,6 +16029,7 @@ msgstr ""
 
 #: sys-utils/lsmem.c:129
 #, fuzzy
+#| msgid " removable"
 msgid "memory is removable"
 msgstr " 可移动"
 
@@ -15767,6 +16039,7 @@ msgstr ""
 
 #: sys-utils/lsmem.c:131
 #, fuzzy
+#| msgid "not enough memory"
 msgid "numa node of memory"
 msgstr "内存不足"
 
@@ -15788,11 +16061,13 @@ msgstr ""
 
 #: sys-utils/lsmem.c:315 sys-utils/lsmem.c:322
 #, fuzzy
+#| msgid "get blocksize"
 msgid "Memory block size:"
 msgstr "获得块大小"
 
 #: sys-utils/lsmem.c:316 sys-utils/lsmem.c:326
 #, fuzzy
+#| msgid "max total shared memory"
 msgid "Total online memory:"
 msgstr "最大总共享内存"
 
@@ -15801,17 +16076,19 @@ msgid "Total offline memory:"
 msgstr ""
 
 #: sys-utils/lsmem.c:343
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to open %s"
-msgstr "解析 %s 失败"
+msgstr "打开 %s 失败"
 
 #: sys-utils/lsmem.c:441
 #, fuzzy
+#| msgid "failed to parse number of blocks"
 msgid "failed to read memory block size"
 msgstr "解析块数失败"
 
 #: sys-utils/lsmem.c:472
 #, fuzzy
+#| msgid "This system does not support rescanning of CPUs"
 msgid "This system does not support memory blocks"
 msgstr "该系统不支持重新扫描 CPU"
 
@@ -15821,16 +16098,19 @@ msgstr ""
 
 #: sys-utils/lsmem.c:502
 #, fuzzy
+#| msgid " -a, --all            print all devices\n"
 msgid " -a, --all            list each individual memory block\n"
 msgstr " -a, --all            打印所有设备\n"
 
 #: sys-utils/lsmem.c:508
 #, fuzzy
+#| msgid " -o, --output <list>       output columns\n"
 msgid " -S, --split <list>   split ranges by specified columns\n"
 msgstr " -o, --output <列表>       输出列\n"
 
 #: sys-utils/lsmem.c:509
 #, fuzzy
+#| msgid " -s, --sysroot <dir>     use specified directory as system root\n"
 msgid " -s, --sysroot <dir>  use the specified directory as system root\n"
 msgstr " -s, --sysroot <目录>    以指定目录作为系统根目录\n"
 
@@ -15839,17 +16119,18 @@ msgid "     --summary[=when] print summary information (never,always or only)\n"
 msgstr ""
 
 #: sys-utils/lsmem.c:616
-#, fuzzy
 msgid "unsupported --summary argument"
-msgstr "不支持的 --setgroups 参数“%s”"
+msgstr "不支持的 --summary 参数"
 
 #: sys-utils/lsmem.c:636
 #, fuzzy
+#| msgid "options --setgroups=allow and --map-root-user are mutually exclusive"
 msgid "options --{raw,json,pairs} and --summary=only are mutually exclusive"
 msgstr "--setgroups=allow 和 --map-root-user 选项是互斥的"
 
 #: sys-utils/lsmem.c:644
 #, fuzzy
+#| msgid "invalid argument of -r"
 msgid "invalid argument to --sysroot"
 msgstr "-r 的参数无效"
 
@@ -15858,7 +16139,6 @@ msgid "failed to initialize output table"
 msgstr "初始化输出表失败"
 
 #: sys-utils/lsmem.c:690
-#, fuzzy
 msgid "Failed to initialize output column"
 msgstr "初始化输出列失败"
 
@@ -15924,9 +16204,8 @@ msgid " -p, --task <pid>       print process namespaces\n"
 msgstr " -p, --task <pid>       打印进程名字空间\n"
 
 #: sys-utils/lsns.c:912
-#, fuzzy
 msgid " -W, --nowrap           don't use multi-line representation\n"
-msgstr " -n, --no-mtab           不写 /etc/mtab\n"
+msgstr " -W, --nowrap           不要使用多行表现\n"
 
 #: sys-utils/lsns.c:913
 msgid " -t, --type <name>      namespace type (mnt, net, ipc, user, pid, uts, cgroup)\n"
@@ -15952,6 +16231,7 @@ msgstr "找不到名字空间︰ %ju"
 
 #: sys-utils/mount.c:65 sys-utils/umount.c:130
 #, fuzzy
+#| msgid "permission denied"
 msgid "drop permissions failed."
 msgstr "权限不足"
 
@@ -16107,6 +16387,7 @@ msgstr ""
 
 #: sys-utils/mount.c:477
 #, fuzzy, c-format
+#| msgid " --default                         use default terminal settings\n"
 msgid ""
 "     --target-prefix <path>\n"
 "                         specifies path use for all mountpoints\n"
@@ -16124,6 +16405,7 @@ msgstr " -w, --rw, --read-write  以读写方式挂载文件系统(默认)\n"
 
 #: sys-utils/mount.c:484
 #, fuzzy, c-format
+#| msgid " -S, --setuid <uid>     set uid in entered namespace\n"
 msgid " -N, --namespace <ns>    perform mount in another namespace\n"
 msgstr " -S, --setuid <uid>     设置进入空间中的 uid\n"
 
@@ -16210,6 +16492,7 @@ msgstr "设置选项模式失败"
 
 #: sys-utils/mount.c:763 sys-utils/umount.c:566
 #, fuzzy, c-format
+#| msgid "failed to set personality to %s"
 msgid "failed to set target namespace to %s"
 msgstr "无法将人格(personality)设置为 %s"
 
@@ -16232,6 +16515,10 @@ msgstr "检查目录或文件是否为挂载点。\n"
 
 #: sys-utils/mountpoint.c:126
 #, fuzzy
+#| msgid ""
+#| " -q, --quiet        quiet mode - don't print anything\n"
+#| " -d, --fs-devno     print maj:min device number of the filesystem\n"
+#| " -x, --devno        print maj:min device number of the block device\n"
 msgid ""
 " -q, --quiet        quiet mode - don't print anything\n"
 "     --nofollow     do not follow symlink\n"
@@ -16263,6 +16550,7 @@ msgstr "以其他程序的名字空间运行某个程序。\n"
 
 #: sys-utils/nsenter.c:80
 #, fuzzy
+#| msgid " -a, --all            print all devices\n"
 msgid " -a, --all              enter all namespaces\n"
 msgstr " -a, --all            打印所有设备\n"
 
@@ -16355,6 +16643,7 @@ msgstr "向“%s”设置 exec 环境失败"
 
 #: sys-utils/nsenter.c:360
 #, fuzzy
+#| msgid "no target PID specified for --follow-context"
 msgid "no target PID specified for --all"
 msgstr "没有为 --follow-context 设置目标 PID"
 
@@ -16530,6 +16819,14 @@ msgstr ""
 
 #: sys-utils/prlimit.c:170
 #, fuzzy
+#| msgid ""
+#| " -p, --pid <pid>        process id\n"
+#| " -o, --output <list>    define which output columns to use\n"
+#| "     --noheadings       don't print headings\n"
+#| "     --raw              use the raw output format\n"
+#| "     --verbose          verbose output\n"
+#| " -h, --help             display this help and exit\n"
+#| " -V, --version          output version information and exit\n"
 msgid ""
 " -p, --pid <pid>        process id\n"
 " -o, --output <list>    define which output columns to use\n"
@@ -16746,21 +17043,25 @@ msgstr "改变运行进程的优先级。 \n"
 
 #: sys-utils/renice.c:71
 #, fuzzy
+#| msgid " -n, --priority <num>   specify the nice increment value\n"
 msgid " -n, --priority <num>   specify the nice value\n"
 msgstr " -n, --priority <数字>  指定 nice 增量\n"
 
 #: sys-utils/renice.c:72
 #, fuzzy
+#| msgid " -p, --pid <id>         interpret argument as process ID (default)\n"
 msgid " -p, --pid              interpret arguments as process ID (default)\n"
 msgstr " -p, --pid <id>         将参数解释为进程 ID (默认)\n"
 
 #: sys-utils/renice.c:73
 #, fuzzy
+#| msgid " -g, --pgrp <id>        interpret argument as process group ID\n"
 msgid " -g, --pgrp             interpret arguments as process group ID\n"
 msgstr " -g, --pgrp <id>        将参数解释为进程组 ID\n"
 
 #: sys-utils/renice.c:74
 #, fuzzy
+#| msgid " -u, --user <name>|<id> interpret argument as username or user ID\n"
 msgid " -u, --user             interpret arguments as username or user ID\n"
 msgstr " -u, --user <name>|<id> 将参数解释为 用户名 或 用户 ID\n"
 
@@ -16814,16 +17115,19 @@ msgstr "设备类型描述"
 
 #: sys-utils/rfkill.c:132
 #, fuzzy
+#| msgid "size of the lock"
 msgid "status of software block"
 msgstr "锁的大小"
 
 #: sys-utils/rfkill.c:133
 #, fuzzy
+#| msgid "Show the status of the hardware watchdog.\n"
 msgid "status of hardware block"
 msgstr "显示硬件看门狗的状态。\n"
 
 #: sys-utils/rfkill.c:197
 #, fuzzy, c-format
+#| msgid "cannot lock %s"
 msgid "cannot set non-blocking %s"
 msgstr "无法锁定 %s"
 
@@ -16834,6 +17138,7 @@ msgstr ""
 
 #: sys-utils/rfkill.c:248
 #, fuzzy, c-format
+#| msgid "failed to parse %s"
 msgid "failed to poll %s"
 msgstr "解析 %s 失败"
 
@@ -16843,21 +17148,24 @@ msgstr "无效的标识符"
 
 #: sys-utils/rfkill.c:395 sys-utils/rfkill.c:398
 #, fuzzy
+#| msgid "locked"
 msgid "blocked"
 msgstr "已锁定"
 
 #: sys-utils/rfkill.c:395 sys-utils/rfkill.c:398
 #, fuzzy
+#| msgid "locked"
 msgid "unblocked"
 msgstr "已锁定"
 
 #: sys-utils/rfkill.c:417 sys-utils/rfkill.c:489 sys-utils/rfkill.c:533
-#, fuzzy, c-format
+#, c-format
 msgid "invalid identifier: %s"
-msgstr "磁盘标识符：%s"
+msgstr "无效的标识符：%s"
 
 #: sys-utils/rfkill.c:575
 #, fuzzy, c-format
+#| msgid " %s [options] [<device> ...]\n"
 msgid " %s [options] command [identifier ...]\n"
 msgstr " %s [选项] [<设备> ...]\n"
 
@@ -16872,6 +17180,7 @@ msgstr ""
 #.
 #: sys-utils/rfkill.c:602
 #, fuzzy
+#| msgid " -help\n"
 msgid " help\n"
 msgstr " -help\n"
 
@@ -16881,16 +17190,19 @@ msgstr ""
 
 #: sys-utils/rfkill.c:604
 #, fuzzy
+#| msgid "Disk identifier"
 msgid " list   [identifier]\n"
 msgstr "磁盘标识符"
 
 #: sys-utils/rfkill.c:605
 #, fuzzy
+#| msgid "Disk identifier"
 msgid " block   identifier\n"
 msgstr "磁盘标识符"
 
 #: sys-utils/rfkill.c:606
 #, fuzzy
+#| msgid "Disk identifier"
 msgid " unblock identifier\n"
 msgstr "磁盘标识符"
 
@@ -17210,86 +17522,103 @@ msgstr "以不同的权限设置运行程序。\n"
 
 #: sys-utils/setpriv.c:126
 #, fuzzy
+#| msgid " -d, --dump               show current state (and do not exec anything)\n"
 msgid " -d, --dump                  show current state (and do not exec)\n"
 msgstr " -d, --dump               显示当前状态(不执行任何操作)\n"
 
 #: sys-utils/setpriv.c:127
 #, fuzzy
+#| msgid " --nnp, --no-new-privs    disallow granting new privileges\n"
 msgid " --nnp, --no-new-privs       disallow granting new privileges\n"
 msgstr " --nnp, --no-new-privs    禁止赋予新权限\n"
 
 #: sys-utils/setpriv.c:128
 #, fuzzy
+#| msgid " --inh-caps <caps,...>    set inheritable capabilities\n"
 msgid " --ambient-caps <caps,...>   set ambient capabilities\n"
 msgstr " --inh-caps <caps,...>    设置可继承的权能\n"
 
 #: sys-utils/setpriv.c:129
 #, fuzzy
+#| msgid " --inh-caps <caps,...>    set inheritable capabilities\n"
 msgid " --inh-caps <caps,...>       set inheritable capabilities\n"
 msgstr " --inh-caps <caps,...>    设置可继承的权能\n"
 
 #: sys-utils/setpriv.c:130
 #, fuzzy
+#| msgid " --bounding-set <caps>    set capability bounding set\n"
 msgid " --bounding-set <caps>       set capability bounding set\n"
 msgstr " --bounding-set <caps>    设置权能绑定集\n"
 
 #: sys-utils/setpriv.c:131
 #, fuzzy
+#| msgid " --ruid <uid>             set real uid\n"
 msgid " --ruid <uid|user>           set real uid\n"
 msgstr " --ruid <uid>             设置实际 uid\n"
 
 #: sys-utils/setpriv.c:132
 #, fuzzy
+#| msgid " --euid <uid>             set effective uid\n"
 msgid " --euid <uid|user>           set effective uid\n"
 msgstr " --euid <uid>             设置有效 uid\n"
 
 #: sys-utils/setpriv.c:133
 #, fuzzy
+#| msgid " --rgid <gid>             set real gid\n"
 msgid " --rgid <gid|user>           set real gid\n"
 msgstr " --rgid <gid>             设置实际 gid\n"
 
 #: sys-utils/setpriv.c:134
 #, fuzzy
+#| msgid " --egid <gid>             set effective gid\n"
 msgid " --egid <gid|group>          set effective gid\n"
 msgstr " --egid <gid>             设置有效 gid\n"
 
 #: sys-utils/setpriv.c:135
 #, fuzzy
+#| msgid " --reuid <uid>            set real and effective uid\n"
 msgid " --reuid <uid|user>          set real and effective uid\n"
 msgstr " --reuid <uid>            设置实际和有效 uid\n"
 
 #: sys-utils/setpriv.c:136
 #, fuzzy
+#| msgid " --regid <gid>            set real and effective gid\n"
 msgid " --regid <gid|group>         set real and effective gid\n"
 msgstr " --regid <gid>            设置实际和有效 gid\n"
 
 #: sys-utils/setpriv.c:137
 #, fuzzy
+#| msgid " --clear-groups           clear supplementary groups\n"
 msgid " --clear-groups              clear supplementary groups\n"
 msgstr " --clear-groups           清除附属组\n"
 
 #: sys-utils/setpriv.c:138
 #, fuzzy
+#| msgid " --keep-groups            keep supplementary groups\n"
 msgid " --keep-groups               keep supplementary groups\n"
 msgstr " --keep-groups            保留附属组\n"
 
 #: sys-utils/setpriv.c:139
 #, fuzzy
+#| msgid " --keep-groups            keep supplementary groups\n"
 msgid " --init-groups               initialize supplementary groups\n"
 msgstr " --keep-groups            保留附属组\n"
 
 #: sys-utils/setpriv.c:140
 #, fuzzy
+#| msgid " --groups <group,...>     set supplementary groups\n"
 msgid " --groups <group,...>        set supplementary groups by UID or name\n"
 msgstr " --groups <组,...>        设置附属组\n"
 
 #: sys-utils/setpriv.c:141
 #, fuzzy
+#| msgid " --securebits <bits>      set securebits\n"
 msgid " --securebits <bits>         set securebits\n"
 msgstr " --securebits <位>        设置安全位\n"
 
 #: sys-utils/setpriv.c:142
 #, fuzzy
+#| msgid " --store                           save current terminal settings as default\n"
 msgid ""
 " --pdeathsig keep|clear|<signame>\n"
 "                             set or clear parent death signal\n"
@@ -17297,11 +17626,13 @@ msgstr " --store                           将当前终端设置保存为默认
 
 #: sys-utils/setpriv.c:144
 #, fuzzy
+#| msgid " --selinux-label <label>  set SELinux label\n"
 msgid " --selinux-label <label>     set SELinux label\n"
 msgstr " --selinux-label <标签>  设置 SELinux 标签\n"
 
 #: sys-utils/setpriv.c:145
 #, fuzzy
+#| msgid " --apparmor-profile <pr>  set AppArmor profile\n"
 msgid " --apparmor-profile <pr>     set AppArmor profile\n"
 msgstr " --apparmor-profile <pr>  设置 AppArmor 配置文件\n"
 
@@ -17317,6 +17648,7 @@ msgstr "运行此工具有风险。请阅读 man 手册，谨慎操作。\n"
 
 #: sys-utils/setpriv.c:170
 #, fuzzy
+#| msgid "bad capability string"
 msgid "invalid capability type"
 msgstr "错误的权能字符串"
 
@@ -17351,9 +17683,8 @@ msgid "[none]"
 msgstr "[无]"
 
 #: sys-utils/setpriv.c:320
-#, fuzzy
 msgid "get pdeathsig failed"
-msgstr "getresuid 失败"
+msgstr "获取 pdeathsig 失败"
 
 #: sys-utils/setpriv.c:340
 #, c-format
@@ -17395,6 +17726,7 @@ msgstr "可继承的权能："
 
 #: sys-utils/setpriv.c:382
 #, fuzzy, c-format
+#| msgid "Permitted capabilities: "
 msgid "Ambient capabilities: "
 msgstr "允许的权能："
 
@@ -17439,6 +17771,7 @@ msgstr "setresgid 失败"
 
 #: sys-utils/setpriv.c:514
 #, fuzzy
+#| msgid "unsupported time type"
 msgid "unsupported capability type"
 msgstr "不支持的时间类型"
 
@@ -17598,6 +17931,7 @@ msgstr "未指定程序"
 
 #: sys-utils/setpriv.c:978
 #, fuzzy
+#| msgid "--[re]gid requires --keep-groups, --clear-groups, or --groups"
 msgid "--[re]gid requires --keep-groups, --clear-groups, --init-groups, or --groups"
 msgstr "--[re]gid 需要 --keep-groups、--clear-groups 或 --groups"
 
@@ -18200,9 +18534,8 @@ msgid " -q, --quiet             suppress 'not mounted' error messages\n"
 msgstr " -q, --quiet             不要输出“未挂载”错误信息\n"
 
 #: sys-utils/umount.c:106
-#, fuzzy
 msgid " -N, --namespace <ns>    perform umount in another namespace\n"
-msgstr " -S, --setuid <uid>     设置进入空间中的 uid\n"
+msgstr " -N, --namespace <ns>    在另一个命名空间进行卸载\n"
 
 #: sys-utils/umount.c:149
 #, c-format
@@ -18315,6 +18648,7 @@ msgstr " -r, --map-root-user       将当前用户映射为 root (连带打开 -
 
 #: sys-utils/unshare.c:273
 #, fuzzy
+#| msgid " -r, --map-root-user       map current user to root (implies --user)\n"
 msgid " -c, --map-current-user    map current user to itself (implies --user)\n"
 msgstr " -r, --map-root-user       将当前用户映射为 root (连带打开 --user)\n"
 
@@ -18326,11 +18660,15 @@ msgstr ""
 
 #: sys-utils/unshare.c:277
 #, fuzzy
+#| msgid "     --mount-proc[=<dir>]  mount proc filesystem first (implies --mount)\n"
 msgid " --mount-proc[=<dir>]      mount proc filesystem first (implies --mount)\n"
 msgstr "     --mount-proc[=<目录>] 先挂载 proc 文件系统(连带打开 --mount)\n"
 
 #: sys-utils/unshare.c:278
 #, fuzzy
+#| msgid ""
+#| "     --propagation slave|shared|private|unchanged\n"
+#| "                           modify mount propagation in mount namespace\n"
 msgid ""
 " --propagation slave|shared|private|unchanged\n"
 "                           modify mount propagation in mount namespace\n"
@@ -18340,16 +18678,19 @@ msgstr ""
 
 #: sys-utils/unshare.c:280
 #, fuzzy
+#| msgid " -s, --setgroups allow|deny  control the setgroups syscall in user namespaces\n"
 msgid " --setgroups allow|deny    control the setgroups syscall in user namespaces\n"
 msgstr " -s, --setgroups allow|deny  控制用户名字空间中的 setgroups 系统调用\n"
 
 #: sys-utils/unshare.c:281
 #, fuzzy
+#| msgid " -a, --all            print all devices\n"
 msgid " --keep-caps               retain capabilities granted in user namespaces\n"
 msgstr " -a, --all            打印所有设备\n"
 
 #: sys-utils/unshare.c:283
 #, fuzzy
+#| msgid " -r, --root[=<dir>]     set the root directory\n"
 msgid " -R, --root=<dir>\t    run the command with root directory set to <dir>\n"
 msgstr " -r, --root[=<目录>]     设置根目录\n"
 
@@ -18359,18 +18700,19 @@ msgstr " -w, --wd=<dir>\t    变更工作目录为 <dir>\n"
 
 #: sys-utils/unshare.c:285
 #, fuzzy
+#| msgid " -S, --setuid <uid>     set uid in entered namespace\n"
 msgid " -S, --setuid <uid>\t    set uid in entered namespace\n"
 msgstr " -S, --setuid <uid>     设置进入空间中的 uid\n"
 
 #: sys-utils/unshare.c:286
 #, fuzzy
+#| msgid " -G, --setgid <gid>     set gid in entered namespace\n"
 msgid " -G, --setgid <gid>\t    set gid in entered namespace\n"
 msgstr " -G, --setgid <gid>     设置进入名字空间中的 gid\n"
 
 #: sys-utils/unshare.c:398 sys-utils/unshare.c:406
-#, fuzzy
 msgid "options --map-root-user and --map-current-user are mutually exclusive"
-msgstr "--setgroups=allow 和 --map-root-user 选项是互斥的"
+msgstr "--map-root-user 选项和 --map-current-user 选项是互斥的"
 
 #: sys-utils/unshare.c:460
 msgid "unshare failed"
@@ -18386,6 +18728,7 @@ msgstr "--setgroups=allow 和 --map-root-user 选项是互斥的"
 
 #: sys-utils/unshare.c:527
 #, fuzzy
+#| msgid "options --setgroups=allow and --map-root-user are mutually exclusive"
 msgid "options --setgroups=allow and --map-current-user are mutually exclusive"
 msgstr "--setgroups=allow 和 --map-root-user 选项是互斥的"
 
@@ -18410,18 +18753,16 @@ msgid "mount %s failed"
 msgstr "挂载 %s 失败"
 
 #: sys-utils/unshare.c:581
-#, fuzzy
 msgid "capget failed"
-msgstr "crypt 失败"
+msgstr "capget 失败"
 
 #: sys-utils/unshare.c:589
-#, fuzzy
 msgid "capset failed"
-msgstr "reset 失败"
+msgstr "capset 失败"
 
 #: sys-utils/unshare.c:601
 msgid "prctl(PR_CAP_AMBIENT) failed"
-msgstr ""
+msgstr "prctl(PR_CAP_AMBIENT) 失败"
 
 #: sys-utils/wdctl.c:72
 msgid "Card previously reset the CPU"
@@ -18530,9 +18871,9 @@ msgid "The default device is %s.\n"
 msgstr "默认设备为 %s。\n"
 
 #: sys-utils/wdctl.c:231
-#, fuzzy, c-format
+#, c-format
 msgid "No default device is available.\n"
-msgstr "默认设备为 %s。\n"
+msgstr "没有可用的默认设备。\n"
 
 #: sys-utils/wdctl.c:329
 #, c-format
@@ -18566,9 +18907,9 @@ msgid "%s: failed to get information about watchdog"
 msgstr "%s：获取看门狗信息失败"
 
 #: sys-utils/wdctl.c:503
-#, fuzzy, c-format
+#, c-format
 msgid "cannot read information about %s"
-msgstr "无法向 %s 写入 intro 命令"
+msgstr "无法读取有关 %s 的信息"
 
 #: sys-utils/wdctl.c:513 sys-utils/wdctl.c:516 sys-utils/wdctl.c:519
 #, c-format
@@ -18601,9 +18942,8 @@ msgid "version"
 msgstr "版本："
 
 #: sys-utils/wdctl.c:690
-#, fuzzy
 msgid "No default device is available."
-msgstr "默认设备为 %s。\n"
+msgstr "无可用默认设备。"
 
 #: sys-utils/zramctl.c:75
 msgid "zram device name"
@@ -18860,9 +19200,9 @@ msgid "failed to create reload file: %s: %m"
 msgstr "未能创建 reload 文件︰%s：%m"
 
 #: term-utils/agetty.c:1988
-#, fuzzy, c-format
+#, c-format
 msgid "failed to get terminal attributes: %m"
-msgstr "%s：获取终端属性失败：%m"
+msgstr "获取终端属性失败：%m"
 
 #: term-utils/agetty.c:2010
 msgid "[press ENTER to login]"
@@ -18952,9 +19292,8 @@ msgid " -f, --issue-file <file>    display issue file\n"
 msgstr " -f, --issue-file <文件>    指定要显示的预登录消息(issue)文件\n"
 
 #: term-utils/agetty.c:2422
-#, fuzzy
 msgid "     --show-issue           display issue file and exit\n"
-msgstr " -i, --noissue              不显示预登录消息(issue)文件\n"
+msgstr "     --show-issue           显示预登录（issue）文件并退出\n"
 
 #: term-utils/agetty.c:2423
 msgid " -h, --flow-control         enable hardware flow control\n"
@@ -19125,11 +19464,11 @@ msgstr "更改 %s 模式失败"
 
 #: term-utils/mesg.c:166
 msgid "write access to your terminal is allowed"
-msgstr "允许了写您的终端"
+msgstr "对您的终端的写访问已被允许"
 
 #: term-utils/mesg.c:173
 msgid "write access to your terminal is denied"
-msgstr "拒绝了写您的终端"
+msgstr "对您的终端的写访问已被拒绝"
 
 #: term-utils/script.c:190
 #, c-format
@@ -19138,75 +19477,63 @@ msgstr " %s [选项] [文件]\n"
 
 #: term-utils/script.c:193
 msgid "Make a typescript of a terminal session.\n"
-msgstr "创建终端会话的 typescript。\n"
+msgstr "创建终端会话的打字稿（typescript）。\n"
 
 #: term-utils/script.c:196
-#, fuzzy
 msgid " -I, --log-in <file>           log stdin to file\n"
-msgstr " -f, --file <文件>       记录指定文件的内容\n"
+msgstr " -I, --log-in <文件>           将标准输入记录到文件\n"
 
 #: term-utils/script.c:197
-#, fuzzy
 msgid " -O, --log-out <file>          log stdout to file (default)\n"
-msgstr " -a, --all         全部(默认)\n"
+msgstr " -O, --log-out <文件>          将标准输出记录到文件（默认）\n"
 
 #: term-utils/script.c:198
-#, fuzzy
 msgid " -B, --log-io <file>           log stdin and stdout to file\n"
-msgstr " -f, --file <文件>       记录指定文件的内容\n"
+msgstr " -B, --log-io <文件>           将标准输入和标准输出记录到文件\n"
 
 #: term-utils/script.c:201
-#, fuzzy
 msgid " -T, --log-timing <file>       log timing information to file\n"
-msgstr " -f, --file <文件>       记录指定文件的内容\n"
+msgstr " -T, --log-timing <文件>       将时序信息记录到文件\n"
 
 #: term-utils/script.c:202
 msgid " -t[<file>], --timing[=<file>] deprecated alias to -T (default file is stderr)\n"
-msgstr ""
+msgstr " -t[<文件>], --timing[=<文件>] 到 -T 的已不建议使用的别名（默认文件为标准错误）\n"
 
 #: term-utils/script.c:203
 msgid " -m, --logging-format <name>   force to 'classic' or 'advanced' format\n"
-msgstr ""
+msgstr " -m, --logging-format <名称>   强制使用“classic”或“advanced”格式\n"
 
 #: term-utils/script.c:206
-#, fuzzy
 msgid " -a, --append                  append to the log file\n"
-msgstr " -a, --append              将分区附加到已有分区表\n"
+msgstr " -a, --append                  附加到日志文件\n"
 
 #: term-utils/script.c:207
-#, fuzzy
 msgid " -c, --command <command>       run command rather than interactive shell\n"
-msgstr " -c, --command <命令>      通过 shell 运行单个命令字符串\n"
+msgstr " -c, --command <命令>          运行指定命令而非启动交互式 shell\n"
 
 #: term-utils/script.c:208
-#, fuzzy
 msgid " -e, --return                  return exit code of the child process\n"
-msgstr " -r, --reset                  重置端口\n"
+msgstr " -e, --return                  返回子进程的退出值\n"
 
 #: term-utils/script.c:209
-#, fuzzy
 msgid " -f, --flush                   run flush after each write\n"
-msgstr " -t, --table                      创建表格\n"
+msgstr " -f, --flush                   每次写入后清空缓冲区\n"
 
 #: term-utils/script.c:210
-#, fuzzy
 msgid "     --force                   use output file even when it is a link\n"
-msgstr "     --raw                 使用原生状态输出格式\n"
+msgstr "     --force                   强制使用指定输出文件，无论目标文件是链接与否\n"
 
 #: term-utils/script.c:211
-#, fuzzy
 msgid " -E, --echo <when>             echo input (auto, always or never)\n"
-msgstr " -L, --color[=<时机>]          彩色输出(auto, always 或 never)\n"
+msgstr " -E, --echo <时机>             回显输入（, always 或 never）\n"
 
 #: term-utils/script.c:212
-#, fuzzy
 msgid " -o, --output-limit <size>     terminate if output files exceed size\n"
-msgstr " -o, --output <list>    定义使用哪个输出列\n"
+msgstr " -o, --output-limit <大小>     在输出文件超出指定大小时终止\n"
 
 #: term-utils/script.c:213
-#, fuzzy
 msgid " -q, --quiet                   be quiet\n"
-msgstr " -q, --quiet             开启安静模式\n"
+msgstr " -q, --quiet                   开启安静模式\n"
 
 #: term-utils/script.c:296
 #, c-format
@@ -19237,7 +19564,7 @@ msgid "<not executed on terminal>"
 msgstr "<未在终端上执行>"
 
 #: term-utils/script.c:680
-#, fuzzy, c-format
+#, c-format
 msgid "Script terminated, max output files size %<PRIu64> exceeded.\n"
 msgstr "脚本已终止，已超过最大输出文件大小 %<PRIu64>。\n"
 
@@ -19257,67 +19584,66 @@ msgstr ""
 "程序没有启动。"
 
 #: term-utils/script.c:827
-#, fuzzy, c-format
+#, c-format
 msgid "unssuported echo mode: '%s'"
-msgstr "不支持的颜色模式"
+msgstr "不支持的回显模式：“%s”"
 
 #: term-utils/script.c:852
 msgid "failed to parse output limit size"
 msgstr "解析输出大小限制失败"
 
 #: term-utils/script.c:863
-#, fuzzy, c-format
+#, c-format
 msgid "unssuported logging format: '%s'"
-msgstr "不支持的参数格式：%s"
+msgstr "不支持的日志格式：“%s”"
 
-#: term-utils/script.c:907
-#, fuzzy
+#: term-utils/script.c:911
 msgid "log multiple streams is mutually exclusive with 'classic' format"
-msgstr "--task 与 <名字空间> 互斥"
+msgstr "无法在使用“classic”（经典）格式时同时记录多个流"
 
-#: term-utils/script.c:934
-#, fuzzy, c-format
+#: term-utils/script.c:938
+#, c-format
 msgid "Script started"
-msgstr "脚本启动于 %s ["
+msgstr "脚本已启动"
 
-#: term-utils/script.c:936
-#, fuzzy, c-format
+#: term-utils/script.c:940
+#, c-format
 msgid ", output log file is '%s'"
-msgstr "脚本完成，文件为  %s\n"
+msgstr "，输出日志文件为“%s”"
 
-#: term-utils/script.c:938
-#, fuzzy, c-format
+#: term-utils/script.c:942
+#, c-format
 msgid ", input log file is '%s'"
-msgstr "脚本完成，文件为  %s\n"
+msgstr "，输入日志文件为“%s”"
 
-#: term-utils/script.c:940
-#, fuzzy, c-format
+#: term-utils/script.c:944
+#, c-format
 msgid ", timing file is '%s'"
-msgstr "读时序文件 %s 失败"
+msgstr "，时序文件为“%s”"
 
-#: term-utils/script.c:941
-#, fuzzy, c-format
+#: term-utils/script.c:945
+#, c-format
 msgid ".\n"
-msgstr "\n"
+msgstr "。\n"
 
-#: term-utils/script.c:1047
-#, fuzzy, c-format
+#: term-utils/script.c:1051
+#, c-format
 msgid "Script done.\n"
-msgstr "脚本完成，文件为  %s\n"
+msgstr "脚本已完成。\n"
 
 #: term-utils/scriptlive.c:60
 #, fuzzy, c-format
+#| msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgid " %s [-t] timingfile [-I|-B] typescript\n"
 msgstr " %s [-t] timingfile [typescript] [divisor]\n"
 
 #: term-utils/scriptlive.c:64
 msgid "Execute terminal typescript.\n"
-msgstr ""
+msgstr "执行终端打字稿（typescript）。\n"
 
 #: term-utils/scriptlive.c:67 term-utils/scriptreplay.c:56
-#, fuzzy
 msgid " -t, --timing <file>     script timing log file\n"
-msgstr " -t, --time <time_t>      指定唤醒时刻\n"
+msgstr " -t, --timing <文件>     script timing log file\n"
 
 #: term-utils/scriptlive.c:68
 msgid " -T, --log-timing <file> alias to -t\n"
@@ -19326,7 +19652,7 @@ msgstr ""
 #: term-utils/scriptlive.c:69 term-utils/scriptreplay.c:58
 #, fuzzy
 msgid " -I, --log-in <file>     script stdin log file\n"
-msgstr " -f, --issue-file <文件>    指定要显示的预登录消息(issue)文件\n"
+msgstr " -I, --log-in <文件>     脚本标准输入日志文件\n"
 
 #: term-utils/scriptlive.c:70 term-utils/scriptreplay.c:60
 msgid " -B, --log-io <file>     script stdin and stdout log file\n"
@@ -19334,6 +19660,7 @@ msgstr ""
 
 #: term-utils/scriptlive.c:73
 #, fuzzy
+#| msgid " -c, --command <command>  run a single command string through the shell\n"
 msgid " -c, --command <command> run command rather than interactive shell\n"
 msgstr " -c, --command <命令>      通过 shell 运行单个命令字符串\n"
 
@@ -19343,21 +19670,23 @@ msgstr ""
 
 #: term-utils/scriptlive.c:75 term-utils/scriptreplay.c:67
 #, fuzzy
+#| msgid "     --delay <number>       sleep seconds before prompt\n"
 msgid " -m, --maxdelay <num>    wait at most this many seconds between updates\n"
 msgstr "     --delay <数字>         提示前睡眠的秒数\n"
 
 #: term-utils/scriptlive.c:226 term-utils/scriptreplay.c:212
 #, fuzzy
+#| msgid "failed to parse argument"
 msgid "failed to parse maximal delay argument"
 msgstr "解析参数失败"
 
 #: term-utils/scriptlive.c:249 term-utils/scriptreplay.c:253
-#, fuzzy
 msgid "timing file not specified"
-msgstr "未指定文件"
+msgstr "未指定时序文件"
 
 #: term-utils/scriptlive.c:251
 #, fuzzy
+#| msgid "no input file specified"
 msgid "stdin typescript file not specified"
 msgstr "未指定输入文件"
 
@@ -19368,6 +19697,7 @@ msgstr ""
 
 #: term-utils/scriptlive.c:284
 #, fuzzy
+#| msgid "failed to allocate script handler"
 msgid "failed to allocate PTY handler"
 msgstr "分配脚本处理程序失败"
 
@@ -19389,55 +19719,53 @@ msgstr "使用定时信息回话终端 typescript。\n"
 
 #: term-utils/scriptreplay.c:57
 msgid " -T, --log-timing <file> aliast to -t\n"
-msgstr ""
+msgstr " -T, --log-timing <文件> 到 -t 的别名\n"
 
 #: term-utils/scriptreplay.c:59
-#, fuzzy
 msgid " -O, --log-out <file>    script stdout log file (default)\n"
-msgstr " -f, --from <N>    从磁道 N 开始(默认 0)\n"
+msgstr ""
 
 #: term-utils/scriptreplay.c:62
 msgid " -s, --typescript <file> deprecated alias to -O\n"
-msgstr ""
+msgstr " -s, --typescript <文件> 已不建议使用的 -O 的别名\n"
 
 #: term-utils/scriptreplay.c:65
 #, fuzzy
+#| msgid " -V          display version information and exit\n"
 msgid "     --summary           display overview about recorded session and exit\n"
 msgstr " -V          显示版本信息并退出\n"
 
 #: term-utils/scriptreplay.c:68
-#, fuzzy
 msgid " -x, --stream <name>     stream type (out, in, signal or info)\n"
-msgstr " -t, --type <name>      名字空间类型(mnt, net, ipc, user, pid, uts, cgroup)\n"
+msgstr " -x, --stream <name>     流类型（out, in, signal 或 info）\n"
 
 #: term-utils/scriptreplay.c:69
 msgid " -c, --cr-mode <type>    CR char mode (auto, never, always)\n"
-msgstr ""
+msgstr " -c, --cr-mode <类型>    CR 字符模式（auto, never, always）\n"
 
 #: term-utils/scriptreplay.c:191
-#, fuzzy, c-format
+#, c-format
 msgid "unsupported mode name: '%s'"
-msgstr "不支持的标签：“%s”"
+msgstr "不支持的模式名称：“%s”"
 
 #: term-utils/scriptreplay.c:224
-#, fuzzy, c-format
+#, c-format
 msgid "unsupported stream name: '%s'"
-msgstr "不受支持的源标记︰ %s"
+msgstr "不支持的流名称：“%s”"
 
 #: term-utils/scriptreplay.c:255
-#, fuzzy
 msgid "data log file not specified"
-msgstr "未指定文件"
+msgstr "未指定数据日志文件"
 
 #: term-utils/scriptreplay.c:304
-#, fuzzy, c-format
+#, c-format
 msgid "%s: log file error"
-msgstr "klogctl 出错"
+msgstr "%s：日志文件错误"
 
 #: term-utils/scriptreplay.c:306
 #, c-format
 msgid "%s: line %d: timing file error"
-msgstr ""
+msgstr "%s：行 %d：时序文件错误"
 
 #: term-utils/setterm.c:237
 #, c-format
@@ -19453,184 +19781,178 @@ msgid "Set the attributes of a terminal.\n"
 msgstr "设置终端属性。\n"
 
 #: term-utils/setterm.c:388
-#, fuzzy
 msgid " --term <terminal_name>        override TERM environment variable\n"
-msgstr " --term          <终端名>          替换 TERM 环境变量\n"
+msgstr " --term <终端_名称>            替换 TERM 环境变量\n"
 
 #: term-utils/setterm.c:389
 #, fuzzy
+#| msgid " --reset                           reset terminal to power-on state\n"
 msgid " --reset                       reset terminal to power-on state\n"
 msgstr " --reset                           重置端口到上电时的状态\n"
 
 #: term-utils/setterm.c:390
 #, fuzzy
+#| msgid " --resize                          reset terminal rows and columns\n"
 msgid " --resize                      reset terminal rows and columns\n"
 msgstr " --resize                          重置终端行和列大小\n"
 
 #: term-utils/setterm.c:391
 #, fuzzy
+#| msgid " --initialize                      display init string, and use default settings\n"
 msgid " --initialize                  display init string, and use default settings\n"
 msgstr " --initialize                      显示初始化字符串，并使用默认设置\n"
 
 #: term-utils/setterm.c:392
-#, fuzzy
 msgid " --default                     use default terminal settings\n"
-msgstr " --default                         使用默认终端设置\n"
+msgstr " --default                     使用默认终端设置\n"
 
 #: term-utils/setterm.c:393
 #, fuzzy
+#| msgid " --store                           save current terminal settings as default\n"
 msgid " --store                       save current terminal settings as default\n"
 msgstr " --store                           将当前终端设置保存为默认值\n"
 
 #: term-utils/setterm.c:396
 #, fuzzy
+#| msgid " --cursor        [on|off]          display cursor\n"
 msgid " --cursor on|off               display cursor\n"
 msgstr " --cursor        [on|off]          显示光标\n"
 
 #: term-utils/setterm.c:397
 #, fuzzy
+#| msgid " --repeat        [on|off]          keyboard repeat\n"
 msgid " --repeat on|off               keyboard repeat\n"
 msgstr " --repeat        [on|off]          键盘重复\n"
 
 #: term-utils/setterm.c:398
 #, fuzzy
+#| msgid " --appcursorkeys [on|off]          cursor key application mode\n"
 msgid " --appcursorkeys on|off        cursor key application mode\n"
 msgstr " --appcursorkeys [on|off]          光标键应用程序模式\n"
 
 #: term-utils/setterm.c:399
 #, fuzzy
+#| msgid " --linewrap      [on|off]          continue on a new line when a line is full\n"
 msgid " --linewrap on|off             continue on a new line when a line is full\n"
 msgstr " --linewrap      [on|off]          一行满时在新行中继续\n"
 
 #: term-utils/setterm.c:400
 #, fuzzy
+#| msgid " --inversescreen [on|off]          swap colors for the whole screen\n"
 msgid " --inversescreen on|off        swap colors for the whole screen\n"
 msgstr " --inversescreen [on|off]          交换整个屏幕的颜色\n"
 
 #: term-utils/setterm.c:403
-#, fuzzy
 msgid " --msg on|off                  send kernel messages to console\n"
-msgstr " --msg           [on|off]          将内核消息发送到终端\n"
+msgstr " --msg on|off                  将内核消息发送到控制台\n"
 
 #: term-utils/setterm.c:404
-#, fuzzy
 msgid " --msglevel <0-8>              kernel console log level\n"
-msgstr " --msglevel      0-8               内核终端日志记录级别\n"
+msgstr " --msglevel <0-8>              内核控制台日志记录级别\n"
 
 #: term-utils/setterm.c:407
-#, fuzzy
 msgid " --foreground default|<color>  set foreground color\n"
-msgstr " --foreground    default|<颜色>    设置前景色\n"
+msgstr " --foreground default|<颜色>   设置前景色\n"
 
 #: term-utils/setterm.c:408
-#, fuzzy
 msgid " --background default|<color>  set background color\n"
-msgstr " --background    default|<颜色>    设置背景色\n"
+msgstr " --background default|<颜色>   设置背景色\n"
 
 #: term-utils/setterm.c:409
-#, fuzzy
 msgid " --ulcolor [bright] <color>    set underlined text color\n"
-msgstr " --ulcolor       [bright] <颜色>   设置下划线颜色\n"
+msgstr " --ulcolor [bright] <颜色>     设置下划线文本颜色\n"
 
 #: term-utils/setterm.c:410
-#, fuzzy
 msgid " --hbcolor [bright] <color>    set half-bright text color\n"
-msgstr " --hbcolor       [bright] <颜色>   设置粗体字颜色\n"
+msgstr " --hbcolor [bright] <颜色>     设置半亮度文本颜色\n"
 
 #: term-utils/setterm.c:411
-#, fuzzy
 msgid "        <color>: black blue cyan green grey magenta red white yellow\n"
-msgstr "                 <颜色>：black blue cyan green grey magenta red white yellow\n"
+msgstr "         <颜色>：black blue cyan green grey magenta red white yellow\n"
 
 #: term-utils/setterm.c:414
-#, fuzzy
 msgid " --bold on|off                 bold\n"
-msgstr " --bold          [on|off]          粗体\n"
+msgstr " --bold on|off                 粗体\n"
 
 #: term-utils/setterm.c:415
-#, fuzzy
 msgid " --half-bright on|off          dim\n"
-msgstr " -half-bright    [on|off]          变暗\n"
+msgstr " --half-bright on|off          变暗\n"
 
 #: term-utils/setterm.c:416
-#, fuzzy
 msgid " --blink on|off                blink\n"
-msgstr " --blink         [on|off]          闪烁\n"
+msgstr " --blink on|off                闪烁\n"
 
 #: term-utils/setterm.c:417
-#, fuzzy
 msgid " --underline on|off            underline\n"
-msgstr " --underline     [on|off]          下划线\n"
+msgstr " --underline on|off            下划线\n"
 
 #: term-utils/setterm.c:418
-#, fuzzy
 msgid " --reverse  on|off             swap foreground and background colors\n"
-msgstr " --reverse       [on|off]          交换前景色和背景色\n"
+msgstr " --reverse  on|off             交换前景色和背景色\n"
 
 #: term-utils/setterm.c:421
-#, fuzzy
 msgid " --clear[=<all|rest>]          clear screen and set cursor position\n"
-msgstr " --clear         [all|rest]        清屏并设置光标位置\n"
+msgstr " --clear[=<all|rest>]          清屏并设置光标位置\n"
 
 #: term-utils/setterm.c:422
 #, fuzzy
+#| msgid " --tabs          [<number>...]     set these tab stop positions, or show them\n"
 msgid " --tabs[=<number>...]          set these tab stop positions, or show them\n"
 msgstr " --tabs          [<数字>...]       设置这些制表位置，或显示制表位\n"
 
 #: term-utils/setterm.c:423
 #, fuzzy
+#| msgid " --clrtabs       [<number>...]     clear these tab stop positions, or all\n"
 msgid " --clrtabs[=<number>...]       clear these tab stop positions, or all\n"
 msgstr " --clrtabs       [<数字>...]       清除这些或所有制表位\n"
 
 #: term-utils/setterm.c:424
 #, fuzzy
+#| msgid " --regtabs       [1-160]           set a regular tab stop interval\n"
 msgid " --regtabs[=1-160]             set a regular tab stop interval\n"
 msgstr " --regtabs       [1-160]           设置常规的制表位间隔\n"
 
 #: term-utils/setterm.c:425
 #, fuzzy
+#| msgid " --blank         [0-60|force|poke] set time of inactivity before screen blanks\n"
 msgid " --blank[=0-60|force|poke]     set time of inactivity before screen blanks\n"
 msgstr " --blank         [0-60|force|poke] 设置多久不活动后屏幕变空白\n"
 
 #: term-utils/setterm.c:428
 #, fuzzy
+#| msgid " --dump          [<number>]        write vcsa<number> console dump to file\n"
 msgid " --dump[=<number>]             write vcsa<number> console dump to file\n"
 msgstr " --dump          [<数字>]          将 vcsa<数字> 终端转储到文件\n"
 
 #: term-utils/setterm.c:429
 #, fuzzy
+#| msgid " --append        [<number>]        append vcsa<number> console dump to file\n"
 msgid " --append <number>             append vcsa<number> console dump to file\n"
 msgstr " --append        [<数字>]          将 vcsa<数字> 终端转储追加到文件\n"
 
 #: term-utils/setterm.c:430
-#, fuzzy
 msgid " --file <filename>             name of the dump file\n"
-msgstr " -f, --file      <文件名>          转储文件的名字\n"
+msgstr " --file <文件名>               转储文件的名字\n"
 
 #: term-utils/setterm.c:433
-#, fuzzy
 msgid " --powersave on|vsync|hsync|powerdown|off\n"
-msgstr " -powersave      [on|vsync|hsync|powerdown|off]\n"
+msgstr " --powersave on|vsync|hsync|powerdown|off\n"
 
 #: term-utils/setterm.c:434
-#, fuzzy
 msgid "                               set vesa powersaving features\n"
-msgstr "                                   设置 vesa 节能功能\n"
+msgstr "                               设置 vesa 节能功能\n"
 
 #: term-utils/setterm.c:435
-#, fuzzy
 msgid " --powerdown[=<0-60>]          set vesa powerdown interval in minutes\n"
-msgstr " --powerdown     [0-60]            设置 vesa 关闭电源间隔(分钟)\n"
+msgstr " --powerdown[=<0-60>]          设置 vesa 关闭电源间隔（分钟）\n"
 
 #: term-utils/setterm.c:438
-#, fuzzy
 msgid " --blength[=<0-2000>]          duration of the bell in milliseconds\n"
-msgstr " --blength       [0-2000]          响铃持续时间(毫秒)\n"
+msgstr " --blength[=<0-2000>]          响铃持续时间（毫秒）\n"
 
 #: term-utils/setterm.c:439
-#, fuzzy
 msgid " --bfreq[=<number>]            bell frequency in Hertz\n"
-msgstr " --bfreq         <数字>            响铃频率，单位为 Hz\n"
+msgstr " --bfreq[=<数字>]            响铃频率，单位为 Hz\n"
 
 #: term-utils/setterm.c:452
 msgid "duplicate use of an option"
@@ -19741,6 +20063,7 @@ msgstr "向所有用户发消息。\n"
 
 #: term-utils/wall.c:93
 #, fuzzy
+#| msgid " -g, --group <group>             specify the primary group\n"
 msgid " -g, --group <group>     only send message to group\n"
 msgstr " -g, --group <组>                指定主组\n"
 
@@ -19854,7 +20177,7 @@ msgid "Filter out reverse line feeds.\n"
 msgstr "过滤反换行。\n"
 
 #: text-utils/col.c:138
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -19873,9 +20196,6 @@ msgstr ""
 " -h, --tabs             将空格转换为制表符\n"
 " -x, --spaces           将制表符转换为空格\n"
 " -l, --lines NUM        缓冲至少 NUM 行\n"
-" -V, --version          输出版本信息并退出\n"
-" -H, --help             显示此帮助并退出\n"
-"\n"
 
 #: text-utils/col.c:151 text-utils/colrm.c:69
 #, c-format
@@ -19891,9 +20211,9 @@ msgid "bad -l argument"
 msgstr "-l 参数有误"
 
 #: text-utils/col.c:246
-#, fuzzy, c-format
+#, c-format
 msgid "failed on line %d"
-msgstr "unlink %s 失败"
+msgstr "在 %d 行失败"
 
 #: text-utils/col.c:344
 #, c-format
@@ -19949,44 +20269,37 @@ msgid "second argument"
 msgstr "第二个参数"
 
 #: text-utils/column.c:235
-#, fuzzy
 msgid "failed to parse column"
-msgstr "解析 终点 失败"
+msgstr "解析列失败"
 
 #: text-utils/column.c:245
-#, fuzzy, c-format
+#, c-format
 msgid "undefined column name '%s'"
-msgstr "未定义的挂载点"
+msgstr "未定义的列名称“%s”"
 
 #: text-utils/column.c:321
-#, fuzzy
 msgid "failed to parse --table-order list"
-msgstr "解析 --timeout 失败"
+msgstr "解析 --table-order 列表失败"
 
 #: text-utils/column.c:397
-#, fuzzy
 msgid "failed to parse --table-right list"
-msgstr "解析 起点 失败"
+msgstr "解析 --table-right 列表失败"
 
 #: text-utils/column.c:401
-#, fuzzy
 msgid "failed to parse --table-trunc list"
-msgstr "解析 --timeout 失败"
+msgstr "解析 --table-trunc 列表失败"
 
 #: text-utils/column.c:405
-#, fuzzy
 msgid "failed to parse --table-noextreme list"
-msgstr "解析 --timeout 失败"
+msgstr "解析 --table-noextreme 列表失败"
 
 #: text-utils/column.c:409
-#, fuzzy
 msgid "failed to parse --table-wrap list"
-msgstr "解析 起点 失败"
+msgstr "解析 --table-wrap 列表失败"
 
 #: text-utils/column.c:413
-#, fuzzy
 msgid "failed to parse --table-hide list"
-msgstr "解析 --timeout 失败"
+msgstr "解析 --table-hide 列表失败"
 
 #: text-utils/column.c:444
 #, c-format
@@ -20007,16 +20320,19 @@ msgstr " -t, --table                      创建表格\n"
 
 #: text-utils/column.c:633
 #, fuzzy
+#| msgid " -n, --name <progname>         the name under which errors are reported\n"
 msgid " -n, --table-name <name>          table name for JSON output\n"
 msgstr " -n, --name <progname>         要报告其错误的程序名称\n"
 
 #: text-utils/column.c:634
 #, fuzzy
+#| msgid " -x, --sort <column>  sort output by <column>\n"
 msgid " -O, --table-order <columns>      specify order of output columns\n"
 msgstr " -x, --sort <列>      按<列>对输出排序\n"
 
 #: text-utils/column.c:635
 #, fuzzy
+#| msgid " -o, --options <list>     comma-separated list of swap options\n"
 msgid " -N, --table-columns <names>      comma separated columns names\n"
 msgstr " -o, --options <列表>     以英文逗号分隔的 swap 选项\n"
 
@@ -20026,6 +20342,7 @@ msgstr ""
 
 #: text-utils/column.c:637
 #, fuzzy
+#| msgid " -n, --noheadings          don't print headings\n"
 msgid " -d, --table-noheadings           don't print header\n"
 msgstr " -n, --noheadings          不打印标题\n"
 
@@ -20035,6 +20352,7 @@ msgstr ""
 
 #: text-utils/column.c:639
 #, fuzzy
+#| msgid " -n, --noheadings       don't print column headings\n"
 msgid " -H, --table-hide <columns>       don't print the columns\n"
 msgstr " -n, --noheadings       不打印列标题\n"
 
@@ -20044,6 +20362,7 @@ msgstr ""
 
 #: text-utils/column.c:641
 #, fuzzy
+#| msgid " -u, --notruncate       don't truncate text in columns\n"
 msgid " -T, --table-truncate <columns>   truncate text in the columns when necessary\n"
 msgstr " -u, --notruncate       不截断列中的文本\n"
 
@@ -20052,37 +20371,44 @@ msgid " -W, --table-wrap <columns>       wrap text in the columns when necessary
 msgstr ""
 
 #: text-utils/column.c:643
-#, fuzzy
 msgid " -L, --table-empty-lines          don't ignore empty lines\n"
-msgstr " -n, --noheadings          不打印标题\n"
+msgstr " -L, --table-empty-lines          不要忽略空行\n"
 
 #: text-utils/column.c:644
 #, fuzzy
+#| msgid " -J, --json                    use JSON --list output format\n"
 msgid " -J, --json                       use JSON output format for table\n"
 msgstr " -J, --json                    使用 JSON --list 输出格式\n"
 
 #: text-utils/column.c:647
 #, fuzzy
+#| msgid " -O, --output <cols>           specify columns to output for --list\n"
 msgid " -r, --tree <column>              column to use tree-like output for the table\n"
 msgstr " -O, --output <列>           指定 --list 选项要输出的列\n"
 
 #: text-utils/column.c:648
 #, fuzzy
+#| msgid " -i, --irq <num>              specify parallel port irq\n"
 msgid " -i, --tree-id <column>           line ID to specify child-parent relation\n"
 msgstr " -i, --irq <数字>             指定并口中断号\n"
 
 #: text-utils/column.c:649
 #, fuzzy
+#| msgid " -N, --partno <num>        specify partition number\n"
 msgid " -p, --tree-parent <column>       parent to specify child-parent relation\n"
 msgstr " -N, --partno <数字>       指定分区号\n"
 
 #: text-utils/column.c:652
 #, fuzzy
+#| msgid " -c, --columns <width>    width of output in number of characters\n"
 msgid " -c, --output-width <width>       width of output in number of characters\n"
 msgstr " -c, --columns <宽度>     输出宽度(字符数)\n"
 
 #: text-utils/column.c:653
 #, fuzzy
+#| msgid ""
+#| " -o, --output-separator <string>\n"
+#| "                          columns separator for table output; default is two spaces\n"
 msgid " -o, --output-separator <string>  columns separator for table output (default is two spaces)\n"
 msgstr ""
 " -o, --output-separator <字符串>\n"
@@ -20090,11 +20416,13 @@ msgstr ""
 
 #: text-utils/column.c:654
 #, fuzzy
+#| msgid " -s, --separator <string> possible table delimiters\n"
 msgid " -s, --separator <string>         possible table delimiters\n"
 msgstr " -s, --separator <字符串> 可用的表格分隔符\n"
 
 #: text-utils/column.c:655
 #, fuzzy
+#| msgid " -x, --fillrows           fill rows before columns\n"
 msgid " -x, --fillrows                   fill rows before columns\n"
 msgstr " -x, --fillrows           先填充行，再填充列\n"
 
@@ -20112,7 +20440,7 @@ msgstr ""
 
 #: text-utils/column.c:812
 msgid "option --table required for all --table-*"
-msgstr ""
+msgstr "所有 --table-* 均需要 --table 选项"
 
 #: text-utils/column.c:815
 msgid "option --table-columns required for --json"
@@ -20666,9 +20994,6 @@ msgstr "输入中有未知转义序列：%o，%o"
 msgid "Input line too long."
 msgstr "输入行过长。"
 
-#~ msgid "Rufus alignment"
-#~ msgstr "Rufus 对齐"
-
 #~ msgid "The old %s signature will be removed by a write command."
 #~ msgstr "写入命令将移除旧签名 %s。"
 
@@ -20711,6 +21036,9 @@ msgstr "输入行过长。"
 #~ msgid " old start: %ju, new start: %ju (move %ju sectors)\n"
 #~ msgstr " 原起点：%ju，新起点：%ju (移动 %ju 个扇区)\n"
 
+#~ msgid "Rufus alignment"
+#~ msgstr "Rufus 对齐"
+
 #~ msgid "user %s does not exist"
 #~ msgstr "用户 %s 不存在"
 
-- 
2.47.2