diff --git a/po/zh_CN.po b/po/zh_CN.po
index decbe4aef..dc74ceed0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-2.29-rc2\n"
 "Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2016-11-08 11:08+0100\n"
+"POT-Creation-Date: 2016-10-19 14:46+0200\n"
 "PO-Revision-Date: 2016-11-07 05:25-0500\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -34,8 +34,8 @@ msgstr "通知内核，存在某个指定分区。\n"
 #: disk-utils/addpart.c:56 disk-utils/blockdev.c:276 disk-utils/blockdev.c:420
 #: disk-utils/blockdev.c:446 disk-utils/cfdisk.c:2622 disk-utils/delpart.c:57
 #: disk-utils/fdformat.c:227 disk-utils/fdisk.c:718 disk-utils/fdisk.c:990
-#: disk-utils/fdisk-list.c:301 disk-utils/fdisk-list.c:341
-#: disk-utils/fdisk-list.c:360 disk-utils/fsck.c:1448
+#: disk-utils/fdisk-list.c:299 disk-utils/fdisk-list.c:339
+#: disk-utils/fdisk-list.c:358 disk-utils/fsck.c:1448
 #: disk-utils/fsck.cramfs.c:155 disk-utils/fsck.cramfs.c:510
 #: disk-utils/isosize.c:134 disk-utils/mkfs.bfs.c:189
 #: disk-utils/mkfs.cramfs.c:173 disk-utils/mkfs.cramfs.c:661
@@ -268,7 +268,7 @@ msgid "Quit program without writing changes"
 msgstr "退出程序而不写入更改"
 
 #: disk-utils/cfdisk.c:183 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1020
-#: libfdisk/src/dos.c:2306 libfdisk/src/gpt.c:2902 libfdisk/src/sgi.c:1160
+#: libfdisk/src/dos.c:2306 libfdisk/src/gpt.c:2893 libfdisk/src/sgi.c:1160
 #: libfdisk/src/sun.c:1116
 msgid "Type"
 msgstr "类型"
@@ -593,8 +593,8 @@ msgstr "您确定想将分区表写入磁盘吗？"
 msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog."
 msgstr "输入“yes”或“no”或按 ESC 取消对话框。"
 
-#: disk-utils/cfdisk.c:2358 login-utils/lslogins.c:209 sys-utils/lscpu.c:1526
-#: sys-utils/lscpu.c:1536
+#: disk-utils/cfdisk.c:2358 login-utils/lslogins.c:209 sys-utils/lscpu.c:1517
+#: sys-utils/lscpu.c:1527
 msgid "yes"
 msgstr "是"
 
@@ -700,8 +700,8 @@ msgstr ""
 "将继续 ... "
 
 #: disk-utils/fdformat.c:144 disk-utils/fsck.minix.c:182
-#: disk-utils/swaplabel.c:117 misc-utils/wipefs.c:456 sys-utils/blkdiscard.c:84
-#: sys-utils/tunelp.c:91
+#: disk-utils/swaplabel.c:117 misc-utils/wipefs.c:456
+#: sys-utils/blkdiscard.c:84 sys-utils/tunelp.c:91
 #, c-format
 msgid " %s [options] <device>\n"
 msgstr " %s [选项] <设备>\n"
@@ -815,7 +815,7 @@ msgid "Using default response %c."
 msgstr "将使用默认回应 %c。"
 
 #: disk-utils/fdisk.c:176 disk-utils/fdisk.c:250 disk-utils/fdisk.c:325
-#: libfdisk/src/dos.c:1189 libfdisk/src/gpt.c:2269
+#: libfdisk/src/dos.c:1189 libfdisk/src/gpt.c:2260
 msgid "Value out of range."
 msgstr "值超出范围。"
 
@@ -911,7 +911,7 @@ msgid "cannot read"
 msgstr "不能读"
 
 #: disk-utils/fdisk.c:695 libfdisk/src/bsd.c:259 libfdisk/src/dos.c:933
-#: libfdisk/src/gpt.c:2202
+#: libfdisk/src/gpt.c:2193
 msgid "First sector"
 msgstr "第一个扇区"
 
@@ -1046,8 +1046,8 @@ msgstr ""
 msgid "Device %s already contains a %s signature."
 msgstr "设备 %s 已包含一个 %s 签名。"
 
-#: disk-utils/fdisk.c:1006 disk-utils/fdisk-menu.c:542 disk-utils/sfdisk.c:1477
-#: disk-utils/sfdisk.c:1615
+#: disk-utils/fdisk.c:1006 disk-utils/fdisk-menu.c:542
+#: disk-utils/sfdisk.c:1477 disk-utils/sfdisk.c:1615
 msgid "The signature will be removed by a write command."
 msgstr "写入命令将移除该签名。"
 
@@ -1069,12 +1069,12 @@ msgstr "Disk %s：%s，%ju 字节，%ju 个扇区"
 msgid "Geometry: %d heads, %llu sectors/track, %llu cylinders"
 msgstr "几何属性：%d 个磁头, %llu 个扇区/磁道, %llu 个柱面"
 
-#: disk-utils/fdisk-list.c:59 disk-utils/fdisk-list.c:273
+#: disk-utils/fdisk-list.c:59 disk-utils/fdisk-list.c:271
 #, c-format
 msgid "Units: %s of %d * %ld = %ld bytes"
 msgstr "单元：%s / %d * %ld = %ld 字节"
 
-#: disk-utils/fdisk-list.c:65 disk-utils/fdisk-list.c:279
+#: disk-utils/fdisk-list.c:65 disk-utils/fdisk-list.c:277
 #, c-format
 msgid "Sector size (logical/physical): %lu bytes / %lu bytes"
 msgstr "扇区大小(逻辑/物理)：%lu 字节 / %lu 字节"
@@ -1099,54 +1099,54 @@ msgstr "磁盘标签类型：%s"
 msgid "Disk identifier: %s"
 msgstr "磁盘标识符：%s"
 
-#: disk-utils/fdisk-list.c:109 disk-utils/fdisk-list.c:219
+#: disk-utils/fdisk-list.c:107 disk-utils/fdisk-list.c:217
 #: disk-utils/fsck.c:1244
 msgid "failed to allocate iterator"
 msgstr "分配迭代器失败"
 
-#: disk-utils/fdisk-list.c:115 disk-utils/fdisk-list.c:225
+#: disk-utils/fdisk-list.c:113 disk-utils/fdisk-list.c:223
 msgid "failed to allocate output table"
 msgstr "分配输出表失败"
 
-#: disk-utils/fdisk-list.c:156 disk-utils/fdisk-list.c:249
+#: disk-utils/fdisk-list.c:154 disk-utils/fdisk-list.c:247
 msgid "failed to allocate output line"
 msgstr "分配输出行失败"
 
-#: disk-utils/fdisk-list.c:183
+#: disk-utils/fdisk-list.c:181
 #, c-format
 msgid "Partition %zu does not start on physical sector boundary."
 msgstr "分区 %zu 未起始于物理扇区边界。"
 
-#: disk-utils/fdisk-list.c:192
+#: disk-utils/fdisk-list.c:190
 msgid "Partition table entries are not in disk order."
 msgstr "分区表记录没有按磁盘顺序。"
 
-#: disk-utils/fdisk-list.c:211 libfdisk/src/bsd.c:1015 libfdisk/src/dos.c:2300
-#: libfdisk/src/gpt.c:2898 libfdisk/src/sgi.c:1154 libfdisk/src/sun.c:1110
+#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1015 libfdisk/src/dos.c:2300
+#: libfdisk/src/gpt.c:2889 libfdisk/src/sgi.c:1154 libfdisk/src/sun.c:1110
 msgid "Start"
 msgstr "起点"
 
-#: disk-utils/fdisk-list.c:211 libfdisk/src/bsd.c:1016 libfdisk/src/dos.c:2301
-#: libfdisk/src/gpt.c:2899 libfdisk/src/sgi.c:1155 libfdisk/src/sun.c:1111
+#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1016 libfdisk/src/dos.c:2301
+#: libfdisk/src/gpt.c:2890 libfdisk/src/sgi.c:1155 libfdisk/src/sun.c:1111
 msgid "End"
 msgstr "末尾"
 
-#: disk-utils/fdisk-list.c:211 libfdisk/src/bsd.c:1017 libfdisk/src/dos.c:2302
-#: libfdisk/src/gpt.c:2900 libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:1112
+#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1017 libfdisk/src/dos.c:2302
+#: libfdisk/src/gpt.c:2891 libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:1112
 msgid "Sectors"
 msgstr "扇区"
 
-#: disk-utils/fdisk-list.c:211 libfdisk/src/bsd.c:1019 libfdisk/src/dos.c:2304
-#: libfdisk/src/gpt.c:2901 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1114
+#: disk-utils/fdisk-list.c:209 libfdisk/src/bsd.c:1019 libfdisk/src/dos.c:2304
+#: libfdisk/src/gpt.c:2892 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1114
 msgid "Size"
 msgstr "大小"
 
-#: disk-utils/fdisk-list.c:267
+#: disk-utils/fdisk-list.c:265
 #, c-format
 msgid "Unpartitioned space %s: %s, %ju bytes, %ju sectors"
 msgstr "未分区的空间 %s：%s，%ju 个字节，%ju 个扇区"
 
-#: disk-utils/fdisk-list.c:412
+#: disk-utils/fdisk-list.c:410
 #, c-format
 msgid ""
 "\n"
@@ -1155,7 +1155,7 @@ msgstr ""
 "\n"
 "可用列(用于 -o)：\n"
 
-#: disk-utils/fdisk-list.c:453
+#: disk-utils/fdisk-list.c:451
 #, c-format
 msgid "%s unknown column: %s"
 msgstr "%s 未知列: %s"
@@ -1634,7 +1634,7 @@ msgid "%s: failed to parse fstab"
 msgstr "%s：解析 fstab 失败"
 
 #: disk-utils/fsck.c:679 login-utils/login.c:968 login-utils/sulogin.c:1029
-#: login-utils/vipw.c:204 sys-utils/flock.c:345 sys-utils/nsenter.c:153
+#: login-utils/vipw.c:204 sys-utils/flock.c:337 sys-utils/nsenter.c:153
 #: sys-utils/swapon.c:316 sys-utils/unshare.c:219 sys-utils/unshare.c:420
 #: term-utils/script.c:780
 msgid "fork failed"
@@ -1649,7 +1649,7 @@ msgstr "%s：执行失败"
 msgid "wait: no more child process?!?"
 msgstr "等待：没有剩余子进程了？！？"
 
-#: disk-utils/fsck.c:777 sys-utils/flock.c:363 sys-utils/swapon.c:348
+#: disk-utils/fsck.c:777 sys-utils/flock.c:347 sys-utils/swapon.c:348
 #: sys-utils/unshare.c:404 sys-utils/unshare.c:425
 msgid "waitpid failed"
 msgstr "waitpid 失败"
@@ -2775,8 +2775,8 @@ msgstr " -h, --help         显示此帮助并退出\n"
 
 #: disk-utils/mkfs.c:139 lib/exec_shell.c:49 login-utils/newgrp.c:233
 #: login-utils/su-common.c:651 login-utils/su-common.c:986
-#: login-utils/sulogin.c:795 login-utils/sulogin.c:799 schedutils/chrt.c:558
-#: schedutils/ionice.c:260 schedutils/taskset.c:239 sys-utils/flock.c:122
+#: login-utils/sulogin.c:795 login-utils/sulogin.c:799 schedutils/chrt.c:557
+#: schedutils/ionice.c:260 schedutils/taskset.c:239 sys-utils/flock.c:363
 #: sys-utils/nsenter.c:430 sys-utils/prlimit.c:644 sys-utils/rtcwake.c:577
 #: sys-utils/setarch.c:324 sys-utils/setarch.c:403 sys-utils/setsid.c:115
 #: sys-utils/swapon.c:340 sys-utils/switch_root.c:242 sys-utils/unshare.c:461
@@ -3551,16 +3551,16 @@ msgid "failed to add data to output table"
 msgstr "向输出表添加数据出错"
 
 #: disk-utils/partx.c:667 login-utils/lslogins.c:922 misc-utils/findmnt.c:1582
-#: misc-utils/lsblk.c:1874 misc-utils/lslocks.c:451 sys-utils/losetup.c:310
-#: sys-utils/lscpu.c:1699 sys-utils/lsipc.c:338 sys-utils/lsns.c:489
+#: misc-utils/lsblk.c:1869 misc-utils/lslocks.c:451 sys-utils/losetup.c:310
+#: sys-utils/lscpu.c:1690 sys-utils/lsipc.c:338 sys-utils/lsns.c:489
 #: sys-utils/prlimit.c:297 sys-utils/swapon.c:280 sys-utils/wdctl.c:259
 #: sys-utils/zramctl.c:484
 msgid "failed to initialize output table"
 msgstr "初始化输出表失败"
 
-#: disk-utils/partx.c:678 misc-utils/findmnt.c:1608 misc-utils/lsblk.c:1896
+#: disk-utils/partx.c:678 misc-utils/findmnt.c:1608 misc-utils/lsblk.c:1891
 #: misc-utils/lslocks.c:465 sys-utils/losetup.c:322 sys-utils/losetup.c:358
-#: sys-utils/lscpu.c:1704 sys-utils/lsns.c:510 sys-utils/prlimit.c:306
+#: sys-utils/lscpu.c:1695 sys-utils/lsns.c:510 sys-utils/prlimit.c:306
 #: sys-utils/swapon.c:289 sys-utils/wdctl.c:270 sys-utils/zramctl.c:493
 msgid "failed to initialize output column"
 msgstr "初始化输出列失败"
@@ -4979,7 +4979,7 @@ msgstr "第一个柱面"
 msgid "Last cylinder, +cylinders or +size{K,M,G,T,P}"
 msgstr "最后一个柱面, +cylinders 或 +size{K,M,G,T,P}"
 
-#: libfdisk/src/bsd.c:297 libfdisk/src/dos.c:1166 libfdisk/src/gpt.c:2247
+#: libfdisk/src/bsd.c:297 libfdisk/src/dos.c:1166 libfdisk/src/gpt.c:2238
 msgid "Last sector, +sectors or +size{K,M,G,T,P}"
 msgstr "上个扇区，+sectors 或 +size{K,M,G,T,P}"
 
@@ -5265,7 +5265,7 @@ msgstr "分区表 %3$zu 的无效标志 0x%1$02x%2$02x 将通过写入来更正"
 msgid "Start sector %ju out of range."
 msgstr "起始扇区 %ju 超出范围。"
 
-#: libfdisk/src/dos.c:1026 libfdisk/src/gpt.c:2128 libfdisk/src/sgi.c:839
+#: libfdisk/src/dos.c:1026 libfdisk/src/gpt.c:2119 libfdisk/src/sgi.c:839
 #: libfdisk/src/sun.c:517
 #, c-format
 msgid "Partition %zu is already defined.  Delete it before re-adding it."
@@ -5276,7 +5276,7 @@ msgstr "分区 %zu 已经定义过。请删除后再重新添加它。"
 msgid "Sector %llu is already allocated."
 msgstr "扇区 %llu 已经分配."
 
-#: libfdisk/src/dos.c:1133 libfdisk/src/gpt.c:2138
+#: libfdisk/src/dos.c:1133 libfdisk/src/gpt.c:2129
 msgid "No free sectors available."
 msgstr "无空闲扇区可用。"
 
@@ -5431,7 +5431,7 @@ msgstr "很多系统将类型 0 视为空闲空间。不建议设置类型为 0
 msgid "Cannot change type of the extended partition which is already used by logical partitions. Delete logical partitions first."
 msgstr "无法更改已被逻辑分区使用的扩展分区的类型。请先删除逻辑分区。"
 
-#: libfdisk/src/dos.c:2143 libfdisk/src/gpt.c:2807
+#: libfdisk/src/dos.c:2143 libfdisk/src/gpt.c:2798
 msgid "Nothing to do. Ordering is correct already."
 msgstr "无须操作。顺序已经是正确的了。"
 
@@ -5459,7 +5459,7 @@ msgstr "分区 %zu 的 可启动 标志已启用。"
 msgid "The bootable flag on partition %zu is disabled now."
 msgstr "分区 %zu 的 可启动 标志已禁用。"
 
-#: libfdisk/src/dos.c:2298 libfdisk/src/gpt.c:2897 libfdisk/src/sgi.c:1153
+#: libfdisk/src/dos.c:2298 libfdisk/src/gpt.c:2888 libfdisk/src/sgi.c:1153
 #: libfdisk/src/sun.c:1109
 msgid "Device"
 msgstr "设备"
@@ -5480,7 +5480,7 @@ msgstr "起始-C/H/S"
 msgid "End-C/H/S"
 msgstr "终-C/H/S"
 
-#: libfdisk/src/dos.c:2311 libfdisk/src/gpt.c:2907 libfdisk/src/sgi.c:1161
+#: libfdisk/src/dos.c:2311 libfdisk/src/gpt.c:2898 libfdisk/src/sgi.c:1161
 msgid "Attrs"
 msgstr "属性"
 
@@ -5868,227 +5868,222 @@ msgstr "备份 GPT 表损坏，但主表似乎正常，将使用它。"
 msgid "The primary GPT table is corrupt, but the backup appears OK, so that will be used."
 msgstr "主 GPT 表损坏，但备份似乎正常，将使用它。"
 
-#: libfdisk/src/gpt.c:1623
+#: libfdisk/src/gpt.c:1619
 #, c-format
 msgid "unsupported GPT attribute bit '%s'"
 msgstr "不支持的 GPT 属性位“%s”"
 
-#: libfdisk/src/gpt.c:1628
-#, fuzzy, c-format
-msgid "failed to parse GPT attribute string '%s'"
-msgstr "解析列表“%s”失败"
-
-#: libfdisk/src/gpt.c:1723
+#: libfdisk/src/gpt.c:1714
 #, c-format
 msgid "Partition UUID changed from %s to %s."
 msgstr "分区 UUID 已从 %s 更改为 %s。"
 
-#: libfdisk/src/gpt.c:1731
+#: libfdisk/src/gpt.c:1722
 #, c-format
 msgid "Partition name changed from '%s' to '%.*s'."
 msgstr "分区名已由“%s”改为“%.*s”。"
 
-#: libfdisk/src/gpt.c:1760
+#: libfdisk/src/gpt.c:1751
 msgid "The start of the partition understeps FirstUsableLBA."
 msgstr "分区起点未到首个可用 LBA。"
 
-#: libfdisk/src/gpt.c:1767
+#: libfdisk/src/gpt.c:1758
 msgid "The end of the partition oversteps LastUsableLBA."
 msgstr "分区终点超过了最后可用 LBA。"
 
-#: libfdisk/src/gpt.c:1926
+#: libfdisk/src/gpt.c:1917
 msgid "The device contains hybrid MBR -- writing GPT only. You have to sync the MBR manually."
 msgstr "该设备包含混合 MBR -- 将只写入 GPT。您需要手动同步 MBR。"
 
-#: libfdisk/src/gpt.c:1963
+#: libfdisk/src/gpt.c:1954
 msgid "Disk does not contain a valid backup header."
 msgstr "磁盘不含有效的备用磁头。"
 
-#: libfdisk/src/gpt.c:1968
+#: libfdisk/src/gpt.c:1959
 msgid "Invalid primary header CRC checksum."
 msgstr "无效的主磁头 CRC 校验和。"
 
-#: libfdisk/src/gpt.c:1972
+#: libfdisk/src/gpt.c:1963
 msgid "Invalid backup header CRC checksum."
 msgstr "无效的备份磁头 CRC 校验和。"
 
-#: libfdisk/src/gpt.c:1977
+#: libfdisk/src/gpt.c:1968
 msgid "Invalid partition entry checksum."
 msgstr "无效的分区记录校验和。"
 
-#: libfdisk/src/gpt.c:1982
+#: libfdisk/src/gpt.c:1973
 msgid "Invalid primary header LBA sanity checks."
 msgstr "无效的主磁头 LBA 完整性检查。"
 
-#: libfdisk/src/gpt.c:1986
+#: libfdisk/src/gpt.c:1977
 msgid "Invalid backup header LBA sanity checks."
 msgstr "无效的备用磁头 LBA 完整性检查。"
 
-#: libfdisk/src/gpt.c:1991
+#: libfdisk/src/gpt.c:1982
 msgid "MyLBA mismatch with real position at primary header."
 msgstr "MyLBA 不匹配，真正位置在主磁头。"
 
-#: libfdisk/src/gpt.c:1995
+#: libfdisk/src/gpt.c:1986
 msgid "MyLBA mismatch with real position at backup header."
 msgstr "MyLBA 不匹配，真正位置在备份磁头。"
 
-#: libfdisk/src/gpt.c:2000
+#: libfdisk/src/gpt.c:1991
 msgid "Disk is too small to hold all data."
 msgstr "磁盘太小，放不下所有数据。"
 
-#: libfdisk/src/gpt.c:2010
+#: libfdisk/src/gpt.c:2001
 msgid "Primary and backup header mismatch."
 msgstr "主磁头和备份磁头不匹配。"
 
-#: libfdisk/src/gpt.c:2016
+#: libfdisk/src/gpt.c:2007
 #, c-format
 msgid "Partition %u overlaps with partition %u."
 msgstr "分区 %u 与 %u 重叠。"
 
-#: libfdisk/src/gpt.c:2023
+#: libfdisk/src/gpt.c:2014
 #, c-format
 msgid "Partition %u is too big for the disk."
 msgstr "分区 %u 对于该磁盘而言过大。"
 
-#: libfdisk/src/gpt.c:2030
+#: libfdisk/src/gpt.c:2021
 #, c-format
 msgid "Partition %u ends before it starts."
 msgstr "分区 %u 结束于起点之前。"
 
-#: libfdisk/src/gpt.c:2039
+#: libfdisk/src/gpt.c:2030
 msgid "No errors detected."
 msgstr "未检测到错误。"
 
-#: libfdisk/src/gpt.c:2040
+#: libfdisk/src/gpt.c:2031
 #, c-format
 msgid "Header version: %s"
 msgstr "磁头版本：%s"
 
-#: libfdisk/src/gpt.c:2041
+#: libfdisk/src/gpt.c:2032
 #, c-format
 msgid "Using %u out of %d partitions."
 msgstr "使用着 %2$d 个分区中的 %1$u 个。"
 
-#: libfdisk/src/gpt.c:2052
+#: libfdisk/src/gpt.c:2043
 #, c-format
 msgid "A total of %ju free sectors is available in %u segment."
 msgid_plural "A total of %ju free sectors is available in %u segments (the largest is %s)."
 msgstr[0] "%2$u 个片段中共有 %1$ju 个空闲扇区(最大的是 %3$s)。"
 
-#: libfdisk/src/gpt.c:2060
+#: libfdisk/src/gpt.c:2051
 #, c-format
 msgid "%d error detected."
 msgid_plural "%d errors detected."
 msgstr[0] "检测到 %d 个错误。"
 
-#: libfdisk/src/gpt.c:2134
+#: libfdisk/src/gpt.c:2125
 msgid "All partitions are already in use."
 msgstr "所有分区均已占用。"
 
-#: libfdisk/src/gpt.c:2189 libfdisk/src/gpt.c:2214
+#: libfdisk/src/gpt.c:2180 libfdisk/src/gpt.c:2205
 #, c-format
 msgid "Sector %ju already used."
 msgstr "扇区 %ju 已使用。"
 
-#: libfdisk/src/gpt.c:2275
+#: libfdisk/src/gpt.c:2266
 #, c-format
 msgid "Could not create partition %zu"
 msgstr "无法创建分区 %zu"
 
-#: libfdisk/src/gpt.c:2282
+#: libfdisk/src/gpt.c:2273
 #, c-format
 msgid "The last usable GPT sector is %ju, but %ju is requested."
 msgstr "最后一个可用的 GPT 扇区是 %ju，但请求了 %ju。"
 
-#: libfdisk/src/gpt.c:2289
+#: libfdisk/src/gpt.c:2280
 #, c-format
 msgid "The first usable GPT sector is %ju, but %ju is requested."
 msgstr "第一个可用的 GPT 扇区是 %ju，但请求了 %ju。"
 
-#: libfdisk/src/gpt.c:2421
+#: libfdisk/src/gpt.c:2412
 #, c-format
 msgid "Created a new GPT disklabel (GUID: %s)."
 msgstr "已创建新的 GPT 磁盘标签(GUID: %s)。"
 
-#: libfdisk/src/gpt.c:2439
+#: libfdisk/src/gpt.c:2430
 msgid "Enter new disk UUID (in 8-4-4-4-12 format)"
 msgstr "输入新磁盘 UUID(以 8-4-4-4-12 格式)"
 
-#: libfdisk/src/gpt.c:2446
+#: libfdisk/src/gpt.c:2437
 msgid "Failed to parse your UUID."
 msgstr "解析您的 UUID 失败。"
 
-#: libfdisk/src/gpt.c:2460
+#: libfdisk/src/gpt.c:2451
 #, c-format
 msgid "Disk identifier changed from %s to %s."
 msgstr "将磁盘标识从 %s 更改为 %s 失败。"
 
-#: libfdisk/src/gpt.c:2480
+#: libfdisk/src/gpt.c:2471
 msgid "Not enough space for new partition table!"
 msgstr "创建新分区表的空闲空间不够！"
 
-#: libfdisk/src/gpt.c:2489
+#: libfdisk/src/gpt.c:2480
 #, c-format
 msgid "Partition #%u out of range (minimal start is %<PRIu64> sectors)"
 msgstr "分区 #%u 超出范围(最小起点是 %<PRIu64> 扇区)"
 
-#: libfdisk/src/gpt.c:2494
+#: libfdisk/src/gpt.c:2485
 #, c-format
 msgid "Partition #%u out of range (maximal end is %<PRIu64> sectors)"
 msgstr "分区 #%u 超出范围(最小终点是 %<PRIu64> 扇区)"
 
-#: libfdisk/src/gpt.c:2549
+#: libfdisk/src/gpt.c:2540
 msgid "Cannot allocate memory!"
 msgstr "无法分配内存！"
 
-#: libfdisk/src/gpt.c:2576
+#: libfdisk/src/gpt.c:2567
 #, c-format
 msgid "Partition table length changed from %<PRIu32> to %<PRIu64>."
 msgstr "分区表长度已从 %<PRIu32> 改为 %<PRIu64>。"
 
-#: libfdisk/src/gpt.c:2680
+#: libfdisk/src/gpt.c:2671
 #, c-format
 msgid "The attributes on partition %zu changed to 0x%016<PRIx64>."
 msgstr "分区 %zu 的属性已改为 0x%016<PRIx64>。"
 
-#: libfdisk/src/gpt.c:2728
+#: libfdisk/src/gpt.c:2719
 msgid "Enter GUID specific bit"
 msgstr "输入 GUID 特定位"
 
-#: libfdisk/src/gpt.c:2743
+#: libfdisk/src/gpt.c:2734
 #, c-format
 msgid "failed to toggle unsupported bit %lu"
 msgstr "开/关不支持的位 %lu 失败"
 
-#: libfdisk/src/gpt.c:2756
+#: libfdisk/src/gpt.c:2747
 #, c-format
 msgid "The GUID specific bit %d on partition %zu is enabled now."
 msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已启用。"
 
-#: libfdisk/src/gpt.c:2757
+#: libfdisk/src/gpt.c:2748
 #, c-format
 msgid "The GUID specific bit %d on partition %zu is disabled now."
 msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已禁用。"
 
-#: libfdisk/src/gpt.c:2761
+#: libfdisk/src/gpt.c:2752
 #, c-format
 msgid "The %s flag on partition %zu is enabled now."
 msgstr "分区 %2$zu 上的标志 %1$s 现已启用。"
 
-#: libfdisk/src/gpt.c:2762
+#: libfdisk/src/gpt.c:2753
 #, c-format
 msgid "The %s flag on partition %zu is disabled now."
 msgstr "分区 %2$zu 上的标志 %1$s 现已禁用。"
 
-#: libfdisk/src/gpt.c:2904
+#: libfdisk/src/gpt.c:2895
 msgid "Type-UUID"
 msgstr "类型-UUID"
 
-#: libfdisk/src/gpt.c:2905
+#: libfdisk/src/gpt.c:2896
 msgid "UUID"
 msgstr "UUID"
 
-#: libfdisk/src/gpt.c:2906 login-utils/chfn.c:150 login-utils/chfn.c:152
+#: libfdisk/src/gpt.c:2897 login-utils/chfn.c:150 login-utils/chfn.c:152
 #: login-utils/chfn.c:307
 msgid "Name"
 msgstr "名称"
@@ -6512,7 +6507,7 @@ msgstr ""
 msgid "waitpid failed (%s)"
 msgstr "waitpid 失败(%s)"
 
-#: lib/path.c:209 sys-utils/lscpu.c:1804
+#: lib/path.c:209 sys-utils/lscpu.c:1795
 msgid "failed to callocate cpu set"
 msgstr "分配(callocate) CPU 组 失败"
 
@@ -7119,7 +7114,7 @@ msgstr "%s：%s 包含无效的数字值：%s"
 msgid "hush login status: restore original IDs failed"
 msgstr "静默(hush)登录状态：恢复原 ID 失败"
 
-#: login-utils/lslogins.c:208 sys-utils/lscpu.c:1526 sys-utils/lscpu.c:1536
+#: login-utils/lslogins.c:208 sys-utils/lscpu.c:1517 sys-utils/lscpu.c:1527
 msgid "no"
 msgstr "否"
 
@@ -7362,7 +7357,7 @@ msgstr ""
 #: login-utils/lslogins.c:1228 login-utils/nologin.c:26
 #: misc-utils/lslocks.c:501 misc-utils/mcookie.c:82 misc-utils/uuidd.c:70
 #: misc-utils/uuidgen.c:25 sys-utils/dmesg.c:264 sys-utils/ipcmk.c:66
-#: sys-utils/lscpu.c:1946 sys-utils/lsipc.c:277 sys-utils/readprofile.c:104
+#: sys-utils/lscpu.c:1937 sys-utils/lsipc.c:277 sys-utils/readprofile.c:104
 #: sys-utils/rtcwake.c:95 term-utils/setterm.c:380 text-utils/line.c:30
 #, c-format
 msgid " %s [options]\n"
@@ -7456,7 +7451,8 @@ msgstr "     --wtmp-file <路径>   设置 wtmp 的可选路径\n"
 msgid "     --btmp-file <path>   set an alternate path for btmp\n"
 msgstr "     --btmp-file <路径>   设置 btmp 的可选路径\n"
 
-#: login-utils/lslogins.c:1259 misc-utils/findmnt.c:1244 sys-utils/lscpu.c:1964
+#: login-utils/lslogins.c:1259 misc-utils/findmnt.c:1244
+#: sys-utils/lscpu.c:1955
 #, c-format
 msgid ""
 "\n"
@@ -8534,8 +8530,8 @@ msgid "\"none\" FS type is recommended for bind or move oprations only"
 msgstr "\"none\" 这种文件系统类型只建议用于绑定或移动操作"
 
 #: misc-utils/findmnt-verify.c:414
-#, fuzzy, c-format
-msgid "%s seems unsupported by the current kernel"
+#, c-format
+msgid "%s seems unspported by the current kernel"
 msgstr "当前内核似乎不支持 %s"
 
 #: misc-utils/findmnt-verify.c:420 misc-utils/findmnt-verify.c:421
@@ -8548,8 +8544,8 @@ msgid "%s does not match with on-disk %s"
 msgstr "%s 与磁盘上的 %s 不匹配"
 
 #: misc-utils/findmnt-verify.c:431
-#, fuzzy, c-format
-msgid "on-disk %s seems unsupported by the current kernel"
+#, c-format
+msgid "on-disk %s seems unspported by the current kernel"
 msgstr "当前内核似乎不支持磁盘上的 %s"
 
 #: misc-utils/findmnt-verify.c:433
@@ -8590,15 +8586,15 @@ msgstr "成功，未检测到错误或警告\n"
 msgid "Try `%s --help' for more information.\n"
 msgstr "请尝试执行“%s --help”了解更多信息。\n"
 
-#: misc-utils/getopt.c:304
+#: misc-utils/getopt.c:297
 msgid "empty long option after -l or --long argument"
 msgstr "-l 或 --long 参数后的长选项为空"
 
-#: misc-utils/getopt.c:325
+#: misc-utils/getopt.c:322
 msgid "unknown shell after -s or --shell argument"
 msgstr "-s 或 --shell 参数后是未知的 shell"
 
-#: misc-utils/getopt.c:332
+#: misc-utils/getopt.c:329
 #, c-format
 msgid ""
 " %1$s <optstring> <parameters>\n"
@@ -8609,51 +8605,51 @@ msgstr ""
 " %1$s [options] [--] 选项字符串 参数\n"
 " %1$s [options] -o|--options 选项字符串 [选项] [--] 参数\n"
 
-#: misc-utils/getopt.c:338
+#: misc-utils/getopt.c:335
 msgid "Parse command options.\n"
 msgstr "解析命令选项。 \n"
 
-#: misc-utils/getopt.c:341
+#: misc-utils/getopt.c:338
 msgid " -a, --alternative             allow long options starting with single -\n"
 msgstr " -a, --alternative             允许长选项以单个 - 开头\n"
 
-#: misc-utils/getopt.c:342
+#: misc-utils/getopt.c:339
 msgid " -l, --longoptions <longopts>  the long options to be recognized\n"
 msgstr " -l, --longoptions <longopts>  要识别的长选项\n"
 
-#: misc-utils/getopt.c:343
+#: misc-utils/getopt.c:340
 msgid " -n, --name <progname>         the name under which errors are reported\n"
 msgstr " -n, --name <progname>         要报告其错误的程序名称\n"
 
-#: misc-utils/getopt.c:344
+#: misc-utils/getopt.c:341
 msgid " -o, --options <optstring>     the short options to be recognized\n"
 msgstr " -o, --options <optstring>     要识别的短选项名称\n"
 
-#: misc-utils/getopt.c:345
+#: misc-utils/getopt.c:342
 msgid " -q, --quiet                   disable error reporting by getopt(3)\n"
 msgstr " -q, --quiet                   禁止 getopt(3) 的错误报告\n"
 
-#: misc-utils/getopt.c:346
+#: misc-utils/getopt.c:343
 msgid " -Q, --quiet-output            no normal output\n"
 msgstr " -Q, --quiet-output            无常规输出\n"
 
-#: misc-utils/getopt.c:347
+#: misc-utils/getopt.c:344
 msgid " -s, --shell <shell>           set quoting conventions to those of <shell>\n"
 msgstr " -s, --shell <shell>           设置 <shell> 的引用习惯\n"
 
-#: misc-utils/getopt.c:348
+#: misc-utils/getopt.c:345
 msgid " -T, --test                    test for getopt(1) version\n"
 msgstr " -T, --test                   getopt(1) 版本测试\n"
 
-#: misc-utils/getopt.c:349
+#: misc-utils/getopt.c:346
 msgid " -u, --unquoted                do not quote the output\n"
 msgstr " -u, --unquoted                不引用输出\n"
 
-#: misc-utils/getopt.c:399 misc-utils/getopt.c:459
+#: misc-utils/getopt.c:396 misc-utils/getopt.c:456
 msgid "missing optstring argument"
 msgstr "缺少 optstring 参数"
 
-#: misc-utils/getopt.c:454
+#: misc-utils/getopt.c:451
 msgid "internal error, contact the author."
 msgstr "内部错误，请联系作者。"
 
@@ -9378,7 +9374,7 @@ msgstr " -p, --pid <pid>        只显示由指定进程持有的锁\n"
 msgid " -r, --raw              use the raw output format\n"
 msgstr " -r, --raw              使用原生输出格式\n"
 
-#: misc-utils/lslocks.c:570 schedutils/chrt.c:478 schedutils/ionice.c:177
+#: misc-utils/lslocks.c:570 schedutils/chrt.c:477 schedutils/ionice.c:177
 #: schedutils/taskset.c:163 sys-utils/lsns.c:677 sys-utils/prlimit.c:586
 msgid "invalid PID argument"
 msgstr "无效的 PID 参数"
@@ -9621,7 +9617,7 @@ msgstr "接收信号失败"
 msgid "timed out"
 msgstr "已超时"
 
-#: misc-utils/uuidd.c:345 sys-utils/flock.c:271
+#: misc-utils/uuidd.c:345 sys-utils/flock.c:263
 msgid "cannot set up timer"
 msgstr "无法设置定时器"
 
@@ -9998,99 +9994,99 @@ msgstr " -p, --pid            对指定且存在的 pid 操作\n"
 msgid " -v, --verbose        display status information\n"
 msgstr " -v, --verbose        显示状态信息\n"
 
-#: schedutils/chrt.c:232 schedutils/chrt.c:254
+#: schedutils/chrt.c:232 schedutils/chrt.c:253
 #, c-format
 msgid "failed to get pid %d's policy"
 msgstr "无法获得 pid %d 的策略"
 
-#: schedutils/chrt.c:257
+#: schedutils/chrt.c:256
 #, c-format
 msgid "failed to get pid %d's attributes"
 msgstr "获取 pid %d 的属性失败"
 
-#: schedutils/chrt.c:267
+#: schedutils/chrt.c:266
 #, c-format
 msgid "pid %d's new scheduling policy: %s"
 msgstr "pid “%d” 的新调度策略：%s"
 
-#: schedutils/chrt.c:269
+#: schedutils/chrt.c:268
 #, c-format
 msgid "pid %d's current scheduling policy: %s"
 msgstr "pid %d 当前的调度策略︰ %s"
 
-#: schedutils/chrt.c:276
+#: schedutils/chrt.c:275
 #, c-format
 msgid "pid %d's new scheduling priority: %d\n"
 msgstr "pid %d 的新调度策略：%d\n"
 
-#: schedutils/chrt.c:278
+#: schedutils/chrt.c:277
 #, c-format
 msgid "pid %d's current scheduling priority: %d\n"
 msgstr "pid %d 的当前调度优先级：%d\n"
 
-#: schedutils/chrt.c:283
+#: schedutils/chrt.c:282
 #, c-format
 msgid "pid %d's new runtime/deadline/period parameters: %ju/%ju/%ju\n"
 msgstr "pid %d 新的运行时/截止时间/周期参数︰ %ju/%ju/%ju\n"
 
-#: schedutils/chrt.c:286
+#: schedutils/chrt.c:285
 #, c-format
 msgid "pid %d's current runtime/deadline/period parameters: %ju/%ju/%ju\n"
 msgstr "pid %d 当前的运行时/截止时间/周期参数︰ %ju/%ju/%ju\n"
 
-#: schedutils/chrt.c:300 schedutils/chrt.c:396
+#: schedutils/chrt.c:299 schedutils/chrt.c:395
 msgid "cannot obtain the list of tasks"
 msgstr "无法获取任务列表"
 
-#: schedutils/chrt.c:334
+#: schedutils/chrt.c:333
 #, c-format
 msgid "%s min/max priority\t: %d/%d\n"
 msgstr "%s 最小/最大优先级\t: %d/%d\n"
 
-#: schedutils/chrt.c:337
+#: schedutils/chrt.c:336
 #, c-format
 msgid "%s not supported?\n"
 msgstr "%s 不支持？ \n"
 
-#: schedutils/chrt.c:400
+#: schedutils/chrt.c:399
 #, c-format
 msgid "failed to set tid %d's policy"
 msgstr "设置 tid %d 策略失败"
 
-#: schedutils/chrt.c:405
+#: schedutils/chrt.c:404
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr "设置 pid %d 的策略失败"
 
-#: schedutils/chrt.c:487
+#: schedutils/chrt.c:486
 msgid "invalid runtime argument"
 msgstr "无效的运行时参数"
 
-#: schedutils/chrt.c:490
+#: schedutils/chrt.c:489
 msgid "invalid period argument"
 msgstr "无效的周期参数"
 
-#: schedutils/chrt.c:493
+#: schedutils/chrt.c:492
 msgid "invalid deadline argument"
 msgstr "无效的截止时间参数"
 
-#: schedutils/chrt.c:517
+#: schedutils/chrt.c:516
 msgid "invalid priority argument"
 msgstr "无效的 优先级 参数"
 
-#: schedutils/chrt.c:521
+#: schedutils/chrt.c:520
 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:526
+#: schedutils/chrt.c:525
 msgid "--sched-{runtime,deadline,period} options are supported for SCHED_DEADLINE only"
 msgstr "--sched-{runtime,deadline,period} 选项只支持 SCHED_DEADLINE"
 
-#: schedutils/chrt.c:541
+#: schedutils/chrt.c:540
 msgid "SCHED_DEADLINE is unsupported"
 msgstr "不支持 SCHED_DEADLINE"
 
-#: schedutils/chrt.c:548
+#: schedutils/chrt.c:547
 #, c-format
 msgid "unsupported priority value for the policy: %d: see --max for valid range"
 msgstr "不支持此策略的优先级值：%d：查看 --max 了解有效范围"
@@ -11311,45 +11307,45 @@ msgstr "     --verbose            增加详尽程度\n"
 msgid "cannot open lock file %s"
 msgstr "不能打开锁文件 %s"
 
-#: sys-utils/flock.c:205
+#: sys-utils/flock.c:197
 msgid "invalid timeout value"
 msgstr "无效的 超时值"
 
-#: sys-utils/flock.c:209
+#: sys-utils/flock.c:201
 msgid "invalid exit code"
 msgstr "无效退出代码"
 
-#: sys-utils/flock.c:228
+#: sys-utils/flock.c:220
 msgid "the --no-fork and --close options are incompatible"
 msgstr "--no-fork 和 --close 选项不兼容"
 
-#: sys-utils/flock.c:236
+#: sys-utils/flock.c:228
 #, c-format
 msgid "%s requires exactly one command argument"
 msgstr "%s 需要惟一的命令行参数"
 
-#: sys-utils/flock.c:254
+#: sys-utils/flock.c:246
 msgid "bad file descriptor"
 msgstr "错误的文件描述符"
 
-#: sys-utils/flock.c:257
+#: sys-utils/flock.c:249
 msgid "requires file descriptor, file or directory"
 msgstr "需要文件描述符、文件或目录"
 
-#: sys-utils/flock.c:281
+#: sys-utils/flock.c:273
 msgid "failed to get lock"
 msgstr "获取锁失败"
 
-#: sys-utils/flock.c:288
+#: sys-utils/flock.c:280
 msgid "timeout while waiting to get lock"
 msgstr "等待获得锁超时"
 
-#: sys-utils/flock.c:329
+#: sys-utils/flock.c:321
 #, c-format
 msgid "%s: getting lock took %ld.%06ld seconds\n"
 msgstr "%s：等待获得锁花了 %ld.%06ld 秒\n"
 
-#: sys-utils/flock.c:340
+#: sys-utils/flock.c:332
 #, c-format
 msgid "%s: executing %s\n"
 msgstr "%s: 正在执行 %s\n"
@@ -11551,6 +11547,9 @@ msgstr "错过了- %ld.%06ld 在 %ld.%06ld 之后太长时间了(%.6f > %.6f)\n"
 
 #: sys-utils/hwclock.c:666
 #, 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"
@@ -11704,6 +11703,10 @@ msgstr ""
 
 #: sys-utils/hwclock.c:1056
 #, 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"
@@ -11907,6 +11910,13 @@ msgstr ""
 
 #: sys-utils/hwclock.c:1593
 #, fuzzy, c-format
+#| msgid ""
+#| "     --update-drift   update drift factor in %1$s (requires\n"
+#| "                        --set or --systohc)\n"
+#| "     --noadjfile      do not access %1$s; this requires the use of\n"
+#| "                        either --utc or --localtime\n"
+#| "     --adjfile <file> specifies the path to the adjust file;\n"
+#| "                        the default is %1$s\n"
 msgid ""
 "     --update-drift   update drift factor in %1$s (requires\n"
 "                        --set or --systohc)\n"
@@ -13079,7 +13089,7 @@ msgstr "，加密 %s(类型 %u)"
 msgid "%s: detach failed"
 msgstr "%s：断开失败"
 
-#: sys-utils/losetup.c:329 sys-utils/lscpu.c:1721 sys-utils/prlimit.c:229
+#: sys-utils/losetup.c:329 sys-utils/lscpu.c:1712 sys-utils/prlimit.c:229
 #: sys-utils/swapon.c:176 sys-utils/wdctl.c:215 sys-utils/zramctl.c:405
 msgid "failed to initialize output line"
 msgstr "初始化输出行失败"
@@ -13347,32 +13357,32 @@ msgstr "错误：uname 失败"
 msgid "failed to determine number of CPUs: %s"
 msgstr "确定 CPU 数 失败：%s"
 
-#: sys-utils/lscpu.c:889
+#: sys-utils/lscpu.c:880
 msgid "error: can not set signal handler"
 msgstr "错误：无法设置信号处理函数"
 
-#: sys-utils/lscpu.c:894
+#: sys-utils/lscpu.c:885
 msgid "error: can not restore signal handler"
 msgstr "错误：无法恢复信号处理函数"
 
-#: sys-utils/lscpu.c:939
+#: sys-utils/lscpu.c:930
 #, c-format
 msgid "failed to read from: %s"
 msgstr "读取失败︰ %s"
 
-#: sys-utils/lscpu.c:1396
+#: sys-utils/lscpu.c:1387
 msgid "Failed to extract the node number"
 msgstr "提取节点号失败"
 
-#: sys-utils/lscpu.c:1523 sys-utils/lscpu.c:1533
+#: sys-utils/lscpu.c:1514 sys-utils/lscpu.c:1524
 msgid "Y"
 msgstr "Y"
 
-#: sys-utils/lscpu.c:1523 sys-utils/lscpu.c:1533
+#: sys-utils/lscpu.c:1514 sys-utils/lscpu.c:1524
 msgid "N"
 msgstr "N"
 
-#: sys-utils/lscpu.c:1617
+#: sys-utils/lscpu.c:1608
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -13382,201 +13392,201 @@ msgstr ""
 "# 以下是可解析格式，可以输给其他程序。每列中的各个不同项有一个惟一\n"
 "# 的从 0 开始的 ID。\n"
 
-#: sys-utils/lscpu.c:1767
+#: sys-utils/lscpu.c:1758
 msgid "Architecture:"
 msgstr "架构："
 
-#: sys-utils/lscpu.c:1781
+#: sys-utils/lscpu.c:1772
 msgid "CPU op-mode(s):"
 msgstr "CPU 运行模式："
 
-#: sys-utils/lscpu.c:1784 sys-utils/lscpu.c:1786
+#: sys-utils/lscpu.c:1775 sys-utils/lscpu.c:1777
 msgid "Byte Order:"
 msgstr "字节序："
 
-#: sys-utils/lscpu.c:1788
+#: sys-utils/lscpu.c:1779
 msgid "CPU(s):"
 msgstr "CPU:"
 
-#: sys-utils/lscpu.c:1791
+#: sys-utils/lscpu.c:1782
 msgid "On-line CPU(s) mask:"
 msgstr "在线 CPU 掩码："
 
-#: sys-utils/lscpu.c:1792
+#: sys-utils/lscpu.c:1783
 msgid "On-line CPU(s) list:"
 msgstr "在线 CPU 列表："
 
-#: sys-utils/lscpu.c:1811
+#: sys-utils/lscpu.c:1802
 msgid "Off-line CPU(s) mask:"
 msgstr "离线 CPU 掩码："
 
-#: sys-utils/lscpu.c:1812
+#: sys-utils/lscpu.c:1803
 msgid "Off-line CPU(s) list:"
 msgstr "离线 CPU 列表："
 
-#: sys-utils/lscpu.c:1848
+#: sys-utils/lscpu.c:1839
 msgid "Thread(s) per core:"
 msgstr "每个核的线程数："
 
-#: sys-utils/lscpu.c:1850
+#: sys-utils/lscpu.c:1841
 msgid "Core(s) per socket:"
 msgstr "每个座的核数："
 
-#: sys-utils/lscpu.c:1853
+#: sys-utils/lscpu.c:1844
 msgid "Socket(s) per book:"
 msgstr "每个 book 的座数："
 
-#: sys-utils/lscpu.c:1856
+#: sys-utils/lscpu.c:1847
 msgid "Book(s) per drawer:"
 msgstr "每个抽屉里的 Book 数︰"
 
-#: sys-utils/lscpu.c:1858
+#: sys-utils/lscpu.c:1849
 msgid "Drawer(s):"
 msgstr "抽屉："
 
-#: sys-utils/lscpu.c:1860
+#: sys-utils/lscpu.c:1851
 msgid "Book(s):"
 msgstr "Book："
 
-#: sys-utils/lscpu.c:1863
+#: sys-utils/lscpu.c:1854
 msgid "Socket(s):"
 msgstr "座："
 
-#: sys-utils/lscpu.c:1867
+#: sys-utils/lscpu.c:1858
 msgid "NUMA node(s):"
 msgstr "NUMA 节点："
 
-#: sys-utils/lscpu.c:1869
+#: sys-utils/lscpu.c:1860
 msgid "Vendor ID:"
 msgstr "厂商 ID："
 
-#: sys-utils/lscpu.c:1871
+#: sys-utils/lscpu.c:1862
 msgid "Machine type:"
 msgstr "机器类型︰"
 
-#: sys-utils/lscpu.c:1873
+#: sys-utils/lscpu.c:1864
 msgid "CPU family:"
 msgstr "CPU 系列："
 
-#: sys-utils/lscpu.c:1875
+#: sys-utils/lscpu.c:1866
 msgid "Model:"
 msgstr "型号："
 
-#: sys-utils/lscpu.c:1877
+#: sys-utils/lscpu.c:1868
 msgid "Model name:"
 msgstr "型号名称："
 
-#: sys-utils/lscpu.c:1879
+#: sys-utils/lscpu.c:1870
 msgid "Stepping:"
 msgstr "步进："
 
-#: sys-utils/lscpu.c:1881
+#: sys-utils/lscpu.c:1872
 msgid "CPU MHz:"
 msgstr "CPU MHz："
 
-#: sys-utils/lscpu.c:1883
+#: sys-utils/lscpu.c:1874
 msgid "CPU dynamic MHz:"
 msgstr "CPU 动态 MHz:"
 
-#: sys-utils/lscpu.c:1885
+#: sys-utils/lscpu.c:1876
 msgid "CPU static MHz:"
 msgstr "CPU 静态 MHz:"
 
-#: sys-utils/lscpu.c:1887
+#: sys-utils/lscpu.c:1878
 msgid "CPU max MHz:"
 msgstr "CPU 最大 MHz："
 
-#: sys-utils/lscpu.c:1889
+#: sys-utils/lscpu.c:1880
 msgid "CPU min MHz:"
 msgstr "CPU 最小 MHz："
 
-#: sys-utils/lscpu.c:1891
+#: sys-utils/lscpu.c:1882
 msgid "BogoMIPS:"
 msgstr "BogoMIPS："
 
-#: sys-utils/lscpu.c:1894 sys-utils/lscpu.c:1896
+#: sys-utils/lscpu.c:1885 sys-utils/lscpu.c:1887
 msgid "Virtualization:"
 msgstr "虚拟化："
 
-#: sys-utils/lscpu.c:1899
+#: sys-utils/lscpu.c:1890
 msgid "Hypervisor:"
 msgstr "超管理器："
 
-#: sys-utils/lscpu.c:1901
+#: sys-utils/lscpu.c:1892
 msgid "Hypervisor vendor:"
 msgstr "超管理器厂商："
 
-#: sys-utils/lscpu.c:1902
+#: sys-utils/lscpu.c:1893
 msgid "Virtualization type:"
 msgstr "虚拟化类型："
 
-#: sys-utils/lscpu.c:1905
+#: sys-utils/lscpu.c:1896
 msgid "Dispatching mode:"
 msgstr "分派模式："
 
-#: sys-utils/lscpu.c:1911 sys-utils/lscpu.c:1921
+#: sys-utils/lscpu.c:1902 sys-utils/lscpu.c:1912
 #, c-format
 msgid "%s cache:"
 msgstr "%s 缓存："
 
-#: sys-utils/lscpu.c:1927
+#: sys-utils/lscpu.c:1918
 #, c-format
 msgid "NUMA node%d CPU(s):"
 msgstr "NUMA 节点%d CPU："
 
-#: sys-utils/lscpu.c:1932
+#: sys-utils/lscpu.c:1923
 msgid "Flags:"
 msgstr "标记："
 
-#: sys-utils/lscpu.c:1935
+#: sys-utils/lscpu.c:1926
 msgid "Physical sockets:"
 msgstr "物理套接字︰"
 
-#: sys-utils/lscpu.c:1936
+#: sys-utils/lscpu.c:1927
 msgid "Physical chips:"
 msgstr "物理芯片︰"
 
-#: sys-utils/lscpu.c:1937
+#: sys-utils/lscpu.c:1928
 msgid "Physical cores/chip:"
 msgstr "物理核心/芯片︰"
 
-#: sys-utils/lscpu.c:1949
+#: sys-utils/lscpu.c:1940
 msgid "Display information about the CPU architecture.\n"
 msgstr "显示 CPU 架构信息。\n"
 
-#: sys-utils/lscpu.c:1952
+#: sys-utils/lscpu.c:1943
 msgid " -a, --all               print both online and offline CPUs (default for -e)\n"
 msgstr " -a, --all               同时打印在线和离线 CPU (-e 选项默认值)\n"
 
-#: sys-utils/lscpu.c:1953
+#: sys-utils/lscpu.c:1944
 msgid " -b, --online            print online CPUs only (default for -p)\n"
 msgstr " -b, --online            只打印在线 CPU (-p 选项默认值)\n"
 
-#: sys-utils/lscpu.c:1954
+#: sys-utils/lscpu.c:1945
 msgid " -c, --offline           print offline CPUs only\n"
 msgstr " -c, --offline           只打印离线 CPU\n"
 
-#: sys-utils/lscpu.c:1955
+#: sys-utils/lscpu.c:1946
 msgid " -e, --extended[=<list>] print out an extended readable format\n"
 msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n"
 
-#: sys-utils/lscpu.c:1956
+#: sys-utils/lscpu.c:1947
 msgid " -p, --parse[=<list>]    print out a parsable format\n"
 msgstr " -p, --parse[=<列表>]    打印可解析格式\n"
 
-#: sys-utils/lscpu.c:1957
+#: sys-utils/lscpu.c:1948
 msgid " -s, --sysroot <dir>     use specified directory as system root\n"
 msgstr " -s, --sysroot <目录>    以指定目录作为系统根目录\n"
 
-#: sys-utils/lscpu.c:1958
+#: sys-utils/lscpu.c:1949
 msgid " -x, --hex               print hexadecimal masks rather than lists of CPUs\n"
 msgstr " -x, --hex               打印十六进制掩码而非 CPU 列表\n"
 
-#: sys-utils/lscpu.c:1959
+#: sys-utils/lscpu.c:1950
 msgid " -y, --physical          print physical instead of logical IDs\n"
 msgstr " -y, --physical          打印物理 ID 而非逻辑 ID\n"
 
-#: sys-utils/lscpu.c:2060
+#: sys-utils/lscpu.c:2051
 #, c-format
 msgid "%s: options --all, --online and --offline may only be used with options --extended or --parse.\n"
 msgstr "%s：--all、--online 和 --offline 选项只能与 --extended 或 --parse 选项一起使用。\n"
@@ -13853,6 +13863,9 @@ msgstr ""
 
 #: sys-utils/lsipc.c:313
 #, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Shared-memory columns (--shmems):\n"
 msgid ""
 "\n"
 "Shared-memory columns (--shmems):\n"