summaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po3938
1 files changed, 2130 insertions, 1808 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f0be2acd7..fba38cfc1 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: 2018-11-06 11:44+0100\n"
+"POT-Creation-Date: 2019-04-24 18:34+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"
@@ -31,67 +31,67 @@ msgstr " %s <磁盘设备> <分区号> <起点> <长度>\n"
msgid "Tell the kernel about the existence of a specified partition.\n"
msgstr "通知内核,存在某个指定分区。\n"
-#: disk-utils/addpart.c:53 disk-utils/blockdev.c:244 disk-utils/delpart.c:53
-#: disk-utils/mkfs.bfs.c:133 disk-utils/resizepart.c:97 misc-utils/kill.c:269
-#: misc-utils/kill.c:311 misc-utils/rename.c:280 misc-utils/whereis.c:518
-#: sys-utils/flock.c:175 sys-utils/ipcrm.c:160 sys-utils/ldattach.c:368
-#: sys-utils/renice.c:146 sys-utils/switch_root.c:241 sys-utils/tunelp.c:152
+#: disk-utils/addpart.c:52 disk-utils/blockdev.c:244 disk-utils/delpart.c:52
+#: disk-utils/mkfs.bfs.c:127 disk-utils/resizepart.c:96 misc-utils/kill.c:267
+#: misc-utils/kill.c:309 misc-utils/rename.c:280 misc-utils/whereis.c:518
+#: sys-utils/flock.c:177 sys-utils/ipcrm.c:160 sys-utils/ldattach.c:368
+#: sys-utils/renice.c:144 sys-utils/switch_root.c:240 sys-utils/tunelp.c:152
#: term-utils/agetty.c:879 term-utils/agetty.c:880 term-utils/agetty.c:888
#: term-utils/agetty.c:889
msgid "not enough arguments"
msgstr "参数不够"
-#: disk-utils/addpart.c:58 disk-utils/blockdev.c:295 disk-utils/blockdev.c:439
-#: disk-utils/blockdev.c:465 disk-utils/cfdisk.c:2722 disk-utils/delpart.c:59
-#: disk-utils/fdformat.c:229 disk-utils/fdisk.c:766 disk-utils/fdisk.c:1068
-#: disk-utils/fdisk-list.c:324 disk-utils/fdisk-list.c:364
-#: disk-utils/fdisk-list.c:383 disk-utils/fsck.c:1470
+#: disk-utils/addpart.c:57 disk-utils/blockdev.c:293 disk-utils/blockdev.c:437
+#: disk-utils/blockdev.c:463 disk-utils/cfdisk.c:2722 disk-utils/delpart.c:58
+#: disk-utils/fdformat.c:228 disk-utils/fdisk.c:778 disk-utils/fdisk.c:1079
+#: disk-utils/fdisk-list.c:326 disk-utils/fdisk-list.c:366
+#: disk-utils/fdisk-list.c:385 disk-utils/fsck.c:1468
#: disk-utils/fsck.cramfs.c:152 disk-utils/fsck.cramfs.c:512
-#: disk-utils/isosize.c:102 disk-utils/mkfs.bfs.c:192
+#: disk-utils/isosize.c:102 disk-utils/mkfs.bfs.c:186
#: disk-utils/mkfs.cramfs.c:171 disk-utils/mkfs.cramfs.c:660
-#: disk-utils/mkfs.cramfs.c:800 disk-utils/mkfs.minix.c:824
-#: disk-utils/mkswap.c:217 disk-utils/mkswap.c:246 disk-utils/partx.c:1021
-#: disk-utils/resizepart.c:105 disk-utils/sfdisk.c:655 disk-utils/sfdisk.c:711
-#: disk-utils/sfdisk.c:765 disk-utils/sfdisk.c:824 disk-utils/sfdisk.c:903
-#: disk-utils/sfdisk.c:944 disk-utils/sfdisk.c:974 disk-utils/sfdisk.c:1011
-#: disk-utils/sfdisk.c:1570 disk-utils/swaplabel.c:65 libfdisk/src/bsd.c:641
-#: login-utils/islocal.c:87 login-utils/last.c:667 login-utils/sulogin.c:443
+#: 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:1020
+#: disk-utils/resizepart.c:104 disk-utils/sfdisk.c:657 disk-utils/sfdisk.c:713
+#: disk-utils/sfdisk.c:767 disk-utils/sfdisk.c:826 disk-utils/sfdisk.c:905
+#: disk-utils/sfdisk.c:946 disk-utils/sfdisk.c:976 disk-utils/sfdisk.c:1013
+#: disk-utils/sfdisk.c:1572 disk-utils/swaplabel.c:65 libfdisk/src/bsd.c:641
+#: login-utils/islocal.c:87 login-utils/last.c:668 login-utils/sulogin.c:443
#: login-utils/sulogin.c:480 login-utils/utmpdump.c:134
-#: login-utils/utmpdump.c:352 login-utils/utmpdump.c:374 login-utils/vipw.c:261
-#: login-utils/vipw.c:279 misc-utils/findmnt.c:1105 misc-utils/logger.c:1224
-#: misc-utils/mcookie.c:115 misc-utils/uuidd.c:198 sys-utils/blkdiscard.c:182
-#: sys-utils/blkzone.c:96 sys-utils/dmesg.c:524 sys-utils/eject.c:499
-#: sys-utils/eject.c:695 sys-utils/fallocate.c:397 sys-utils/fsfreeze.c:117
-#: sys-utils/fstrim.c:79 sys-utils/hwclock.c:229 sys-utils/hwclock.c:869
-#: sys-utils/hwclock-rtc.c:397 sys-utils/hwclock-rtc.c:432
-#: sys-utils/ldattach.c:392 sys-utils/lscpu.c:393 sys-utils/nsenter.c:129
-#: sys-utils/rfkill.c:192 sys-utils/rfkill.c:553 sys-utils/rtcwake.c:136
-#: sys-utils/rtcwake.c:286 sys-utils/setpriv.c:291 sys-utils/setpriv.c:660
-#: sys-utils/setpriv.c:683 sys-utils/swapon.c:375 sys-utils/swapon.c:518
-#: sys-utils/switch_root.c:167 sys-utils/unshare.c:108 sys-utils/unshare.c:123
+#: login-utils/utmpdump.c:352 login-utils/utmpdump.c:372 login-utils/vipw.c:261
+#: login-utils/vipw.c:279 misc-utils/findmnt.c:1105 misc-utils/logger.c:1239
+#: misc-utils/mcookie.c:115 misc-utils/uuidd.c:198 sys-utils/blkdiscard.c:181
+#: sys-utils/blkzone.c:96 sys-utils/dmesg.c:524 sys-utils/eject.c:497
+#: sys-utils/eject.c:693 sys-utils/fallocate.c:396 sys-utils/fsfreeze.c:116
+#: sys-utils/fstrim.c:85 sys-utils/hwclock.c:229 sys-utils/hwclock.c:869
+#: sys-utils/hwclock-rtc.c:398 sys-utils/hwclock-rtc.c:433
+#: sys-utils/ldattach.c:392 sys-utils/lscpu.c:517 sys-utils/nsenter.c:129
+#: sys-utils/rfkill.c:192 sys-utils/rfkill.c:553 sys-utils/rtcwake.c:137
+#: sys-utils/rtcwake.c:287 sys-utils/setpriv.c:290 sys-utils/setpriv.c:659
+#: sys-utils/setpriv.c:682 sys-utils/swapon.c:375 sys-utils/swapon.c:518
+#: sys-utils/switch_root.c:167 sys-utils/unshare.c:110 sys-utils/unshare.c:125
#: sys-utils/wdctl.c:322 sys-utils/wdctl.c:378 sys-utils/zramctl.c:517
-#: term-utils/agetty.c:2867 term-utils/mesg.c:132 term-utils/script.c:540
+#: term-utils/agetty.c:2869 term-utils/mesg.c:132 term-utils/script.c:540
#: term-utils/script.c:548 term-utils/script.c:633
#: term-utils/scriptreplay.c:198 term-utils/scriptreplay.c:201
-#: term-utils/wall.c:419 text-utils/colcrt.c:282 text-utils/more.c:361
-#: text-utils/rev.c:140 text-utils/ul.c:230
+#: term-utils/wall.c:418 text-utils/colcrt.c:282 text-utils/more.c:361
+#: text-utils/rev.c:139 text-utils/ul.c:230
#, c-format
msgid "cannot open %s"
msgstr "打不开 %s"
-#: disk-utils/addpart.c:61 disk-utils/delpart.c:62 disk-utils/resizepart.c:102
+#: disk-utils/addpart.c:60 disk-utils/delpart.c:61 disk-utils/resizepart.c:101
msgid "invalid partition number argument"
msgstr "无效的分区号参数"
-#: disk-utils/addpart.c:62
+#: disk-utils/addpart.c:61
msgid "invalid start argument"
msgstr "无效的 起点 参数"
-#: disk-utils/addpart.c:63 disk-utils/resizepart.c:112
+#: disk-utils/addpart.c:62 disk-utils/resizepart.c:111
msgid "invalid length argument"
msgstr "无效的长度参数"
-#: disk-utils/addpart.c:64
+#: disk-utils/addpart.c:63
msgid "failed to add partition"
msgstr "添加分区失败"
@@ -211,50 +211,50 @@ msgstr "可用的列:\n"
msgid " %-25s get size in 512-byte sectors\n"
msgstr " %-25s 获得 512-字节扇区的大小\n"
-#: disk-utils/blockdev.c:288 disk-utils/fdformat.c:219
-#: disk-utils/fsck.minix.c:1341 disk-utils/isosize.c:205
-#: disk-utils/mkfs.bfs.c:181 disk-utils/mkfs.c:116 disk-utils/mkfs.minix.c:813
-#: disk-utils/swaplabel.c:181 misc-utils/wipefs.c:757
-#: sys-utils/blkdiscard.c:171 sys-utils/blkzone.c:405 sys-utils/tunelp.c:242
+#: disk-utils/blockdev.c:286 disk-utils/fdformat.c:218
+#: disk-utils/fsck.minix.c:1340 disk-utils/isosize.c:204
+#: disk-utils/mkfs.bfs.c:175 disk-utils/mkfs.c:110 disk-utils/mkfs.minix.c:812
+#: disk-utils/swaplabel.c:180 misc-utils/wipefs.c:756
+#: sys-utils/blkdiscard.c:170 sys-utils/blkzone.c:404 sys-utils/tunelp.c:241
#: sys-utils/zramctl.c:710 sys-utils/zramctl.c:736
msgid "no device specified"
msgstr "未指定设备"
-#: disk-utils/blockdev.c:330
+#: disk-utils/blockdev.c:328
msgid "could not get device size"
msgstr "无法多得设备大小"
-#: disk-utils/blockdev.c:336
+#: disk-utils/blockdev.c:334
#, c-format
msgid "Unknown command: %s"
msgstr "未知命令: %s"
-#: disk-utils/blockdev.c:352
+#: disk-utils/blockdev.c:350
#, c-format
msgid "%s requires an argument"
msgstr "%s 需要一个参数"
-#: disk-utils/blockdev.c:387 disk-utils/blockdev.c:496
+#: disk-utils/blockdev.c:385 disk-utils/blockdev.c:494
#, c-format
msgid "ioctl error on %s"
msgstr "%s ioctl 出错"
-#: disk-utils/blockdev.c:389
+#: disk-utils/blockdev.c:387
#, c-format
msgid "%s failed.\n"
msgstr "%s 失败.\n"
-#: disk-utils/blockdev.c:396
+#: disk-utils/blockdev.c:394
#, c-format
msgid "%s succeeded.\n"
msgstr "%s 成功.\n"
-#: disk-utils/blockdev.c:482
+#: disk-utils/blockdev.c:480
#, c-format
msgid "%s: failed to read partition start from sysfs"
msgstr "%s:读取从 sysfs 起始的分区失败"
-#: disk-utils/blockdev.c:504
+#: disk-utils/blockdev.c:502
#, c-format
msgid "RO RA SSZ BSZ StartSec Size Device\n"
msgstr "RO RA SSZ BSZ 开始段 大小 设备\n"
@@ -302,7 +302,7 @@ msgid "Quit program without writing changes"
msgstr "退出程序而不写入更改"
#: disk-utils/cfdisk.c:195 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1023
-#: libfdisk/src/dos.c:2432 libfdisk/src/gpt.c:3133 libfdisk/src/sgi.c:1160
+#: libfdisk/src/dos.c:2504 libfdisk/src/gpt.c:3137 libfdisk/src/sgi.c:1160
#: libfdisk/src/sun.c:1128
msgid "Type"
msgstr "类型"
@@ -385,315 +385,315 @@ msgstr "文件系统:"
msgid "Mountpoint:"
msgstr "挂载点:"
-#: disk-utils/cfdisk.c:1712
+#: disk-utils/cfdisk.c:1713
#, c-format
msgid "Disk: %s"
msgstr "磁盘:%s"
-#: disk-utils/cfdisk.c:1714
+#: disk-utils/cfdisk.c:1715
#, fuzzy, c-format
msgid "Size: %s, %<PRIu64> bytes, %ju sectors"
msgstr "尺寸:%s,%ju 字节,%ju 个扇区"
-#: disk-utils/cfdisk.c:1717
+#: disk-utils/cfdisk.c:1718
#, c-format
msgid "Label: %s, identifier: %s"
msgstr "标签:%s,标识符:%s"
-#: disk-utils/cfdisk.c:1720
+#: disk-utils/cfdisk.c:1721
#, c-format
msgid "Label: %s"
msgstr "标签:%s"
-#: disk-utils/cfdisk.c:1870
+#: disk-utils/cfdisk.c:1871
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:1876
+#: disk-utils/cfdisk.c:1877
msgid "Please, specify size."
msgstr "请指定文件大小。"
-#: disk-utils/cfdisk.c:1898
+#: disk-utils/cfdisk.c:1899
#, fuzzy, c-format
msgid "Minimum size is %<PRIu64> bytes."
msgstr "最小尺寸为 %ju 字节。"
-#: disk-utils/cfdisk.c:1907
+#: disk-utils/cfdisk.c:1908
#, fuzzy, c-format
msgid "Maximum size is %<PRIu64> bytes."
msgstr "最大尺寸为 %ju 字节。"
-#: disk-utils/cfdisk.c:1914
+#: disk-utils/cfdisk.c:1915
msgid "Failed to parse size."
msgstr "解析大小失败。"
-#: disk-utils/cfdisk.c:1972
+#: disk-utils/cfdisk.c:1973
msgid "Select partition type"
msgstr "选择分区类型"
-#: disk-utils/cfdisk.c:2022 disk-utils/cfdisk.c:2052
+#: disk-utils/cfdisk.c:2023 disk-utils/cfdisk.c:2053
msgid "Enter script file name: "
msgstr "输入脚本文件名:"
-#: disk-utils/cfdisk.c:2023
+#: disk-utils/cfdisk.c:2024
msgid "The script file will be applied to in-memory partition table."
msgstr "该脚本文件将应用于内存中的分区表。"
-#: disk-utils/cfdisk.c:2032 disk-utils/cfdisk.c:2074
+#: disk-utils/cfdisk.c:2033 disk-utils/cfdisk.c:2075
#: disk-utils/fdisk-menu.c:480 disk-utils/fdisk-menu.c:524
#, c-format
msgid "Cannot open %s"
msgstr "打不开 %s"
-#: disk-utils/cfdisk.c:2034 disk-utils/fdisk-menu.c:482
+#: disk-utils/cfdisk.c:2035 disk-utils/fdisk-menu.c:482
#, c-format
msgid "Failed to parse script file %s"
msgstr "解析脚本文件 %s 失败"
-#: disk-utils/cfdisk.c:2036 disk-utils/fdisk-menu.c:484
+#: disk-utils/cfdisk.c:2037 disk-utils/fdisk-menu.c:484
#, c-format
msgid "Failed to apply script %s"
msgstr "应用脚本文件 %s 失败"
-#: disk-utils/cfdisk.c:2053
+#: disk-utils/cfdisk.c:2054
msgid "The current in-memory partition table will be dumped to the file."
msgstr "当前的内存中分区表将转储到该文件中。"
-#: disk-utils/cfdisk.c:2061 disk-utils/fdisk-menu.c:512
+#: disk-utils/cfdisk.c:2062 disk-utils/fdisk-menu.c:512
msgid "Failed to allocate script handler"
msgstr "分配脚本处理程序失败"
-#: disk-utils/cfdisk.c:2067
+#: disk-utils/cfdisk.c:2068
msgid "Failed to read disk layout into script."
msgstr "将磁盘布局读入脚本出错。"
-#: disk-utils/cfdisk.c:2081
+#: disk-utils/cfdisk.c:2082
msgid "Disk layout successfully dumped."
msgstr "成功转储了磁盘布局。"
-#: disk-utils/cfdisk.c:2084 disk-utils/fdisk-menu.c:530
+#: disk-utils/cfdisk.c:2085 disk-utils/fdisk-menu.c:530
#, c-format
msgid "Failed to write script %s"
msgstr "写脚本文件 %s 失败"
-#: disk-utils/cfdisk.c:2120
+#: disk-utils/cfdisk.c:2121
msgid "Select label type"
msgstr "选择标签类型"
-#: disk-utils/cfdisk.c:2123 disk-utils/fdisk.c:1076 disk-utils/fdisk-menu.c:488
+#: disk-utils/cfdisk.c:2124 disk-utils/fdisk.c:1087 disk-utils/fdisk-menu.c:488
msgid "Device does not contain a recognized partition table."
msgstr "设备不包含可识别的分区表。"
-#: disk-utils/cfdisk.c:2131
+#: disk-utils/cfdisk.c:2132
msgid "Select a type to create a new label or press 'L' to load script file."
msgstr "选择一种类型来创建新标签,或按“L”加载脚本文件。"
# 以下三句连贯,一起翻译
-#: disk-utils/cfdisk.c:2180
+#: disk-utils/cfdisk.c:2181
msgid "This is cfdisk, a curses-based disk partitioning program."
msgstr "这是 cfdisk,一款基于 curses 的磁盘分区程序,"
-#: disk-utils/cfdisk.c:2181
+#: disk-utils/cfdisk.c:2182
msgid "It lets you create, delete, and modify partitions on a block device."
msgstr "可以创建、删除和修改块设备上的分区。"
# 以下两条注意对齐
-#: disk-utils/cfdisk.c:2183
+#: disk-utils/cfdisk.c:2184
msgid "Command Meaning"
msgstr "命令 意义"
-#: disk-utils/cfdisk.c:2184
+#: disk-utils/cfdisk.c:2185
msgid "------- -------"
msgstr "------- -------"
-#: disk-utils/cfdisk.c:2185
+#: disk-utils/cfdisk.c:2186
msgid " b Toggle bootable flag of the current partition"
msgstr " b 切换当前分区的 可启动 标志"
-#: disk-utils/cfdisk.c:2186
+#: disk-utils/cfdisk.c:2187
msgid " d Delete the current partition"
msgstr " d 删除当前分区"
-#: disk-utils/cfdisk.c:2187
+#: disk-utils/cfdisk.c:2188
msgid " h Print this screen"
msgstr " h 打印此屏幕"
-#: disk-utils/cfdisk.c:2188
+#: disk-utils/cfdisk.c:2189
msgid " n Create new partition from free space"
msgstr " n 从空闲空间创建新分区"
-#: disk-utils/cfdisk.c:2189
+#: disk-utils/cfdisk.c:2190
msgid " q Quit program without writing partition table"
msgstr " q 退出程序但不写入分区表"
-#: disk-utils/cfdisk.c:2190
+#: disk-utils/cfdisk.c:2191
msgid " s Fix partitions order (only when in disarray)"
msgstr " s 修复分区顺序(仅磁盘阵列)"
-#: disk-utils/cfdisk.c:2191
+#: disk-utils/cfdisk.c:2192
msgid " t Change the partition type"
msgstr " t 更改分区类型"
-#: disk-utils/cfdisk.c:2192
+#: disk-utils/cfdisk.c:2193
msgid " u Dump disk layout to sfdisk compatible script file"
msgstr " u 将磁盘布局转储到兼容 sfdisk 的脚本文件"
-#: disk-utils/cfdisk.c:2193
+#: disk-utils/cfdisk.c:2194
msgid " W Write partition table to disk (you must enter uppercase W);"
msgstr " W 将分区表写入磁盘(必须输入大写 W);"
-#: disk-utils/cfdisk.c:2194
+#: disk-utils/cfdisk.c:2195
msgid " since this might destroy data on the disk, you must either"
msgstr " 由于这可能破坏磁盘上的数据,您必须"
-#: disk-utils/cfdisk.c:2195
+#: disk-utils/cfdisk.c:2196
msgid " confirm or deny the write by entering 'yes' or 'no'"
msgstr " 通过输入“yes”或“no”来确认或拒绝"
-#: disk-utils/cfdisk.c:2196
+#: disk-utils/cfdisk.c:2197
msgid " x Display/hide extra information about a partition"
msgstr " x 显示/隐藏分区的额外信息"
-#: disk-utils/cfdisk.c:2197
+#: disk-utils/cfdisk.c:2198
msgid "Up Arrow Move cursor to the previous partition"
msgstr "上箭头 光标移到上一分区"
-#: disk-utils/cfdisk.c:2198
+#: disk-utils/cfdisk.c:2199
msgid "Down Arrow Move cursor to the next partition"
msgstr "下箭头 光标移到下一分区"
-#: disk-utils/cfdisk.c:2199
+#: disk-utils/cfdisk.c:2200
msgid "Left Arrow Move cursor to the previous menu item"
msgstr "上箭头 光标移到上一菜单项"
-#: disk-utils/cfdisk.c:2200
+#: disk-utils/cfdisk.c:2201
msgid "Right Arrow Move cursor to the next menu item"
msgstr "下箭头 光标移到下一菜单项"
-#: disk-utils/cfdisk.c:2202
+#: disk-utils/cfdisk.c:2203
msgid "Note: All of the commands can be entered with either upper or lower"
msgstr "注:所有命令均可以大写或小写"
-#: disk-utils/cfdisk.c:2203
+#: disk-utils/cfdisk.c:2204
msgid "case letters (except for Write)."
msgstr "字母输入(除了 写入)。"
-#: disk-utils/cfdisk.c:2205
+#: disk-utils/cfdisk.c:2206
msgid "Use lsblk(8) or partx(8) to see more details about the device."
msgstr "使用 lsblk(8) 或 partx(8) 了解有关磁盘的更多细节。"
-#: disk-utils/cfdisk.c:2215 disk-utils/cfdisk.c:2518
+#: disk-utils/cfdisk.c:2216 disk-utils/cfdisk.c:2519
msgid "Press a key to continue."
msgstr "按下一个键继续。"
-#: disk-utils/cfdisk.c:2301
+#: disk-utils/cfdisk.c:2302
msgid "Could not toggle the flag."
msgstr "无法切换标志。"
-#: disk-utils/cfdisk.c:2311
+#: disk-utils/cfdisk.c:2312
#, c-format
msgid "Could not delete partition %zu."
msgstr "无法删除分区 %zu。"
-#: disk-utils/cfdisk.c:2313 disk-utils/fdisk-menu.c:660
+#: disk-utils/cfdisk.c:2314 disk-utils/fdisk-menu.c:660
#, c-format
msgid "Partition %zu has been deleted."
msgstr "分区 %zu 已删除。"
-#: disk-utils/cfdisk.c:2334
+#: disk-utils/cfdisk.c:2335
msgid "Partition size: "
msgstr "分区大小:"
-#: disk-utils/cfdisk.c:2375
+#: disk-utils/cfdisk.c:2376
#, c-format
msgid "Changed type of partition %zu."
msgstr "已更改分区 %zu 的类型。"
-#: disk-utils/cfdisk.c:2377
+#: disk-utils/cfdisk.c:2378
#, c-format
msgid "The type of partition %zu is unchanged."
msgstr "分区 %zu 的类型未更改。"
-#: disk-utils/cfdisk.c:2398
+#: disk-utils/cfdisk.c:2399
#, fuzzy
msgid "New size: "
msgstr "新 shell"
-#: disk-utils/cfdisk.c:2413
+#: disk-utils/cfdisk.c:2414
#, fuzzy, c-format
msgid "Partition %zu resized."
msgstr "%s:已调整分区 #%d 的大小\n"
-#: disk-utils/cfdisk.c:2431 disk-utils/cfdisk.c:2547 disk-utils/fdisk.c:1065
+#: disk-utils/cfdisk.c:2432 disk-utils/cfdisk.c:2548 disk-utils/fdisk.c:1076
#: disk-utils/fdisk-menu.c:591
msgid "Device is open in read-only mode."
msgstr "设备以只读方式打开。"
-#: disk-utils/cfdisk.c:2436
+#: disk-utils/cfdisk.c:2437
msgid "Are you sure you want to write the partition table to disk? "
msgstr "您确定想将分区表写入磁盘吗?"
-#: disk-utils/cfdisk.c:2438
+#: disk-utils/cfdisk.c:2439
msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog."
msgstr "输入“yes”或“no”或按 ESC 取消对话框。"
-#: disk-utils/cfdisk.c:2443 login-utils/lslogins.c:211 sys-utils/lscpu.c:1423
-#: sys-utils/lscpu.c:1433 sys-utils/lsmem.c:266
+#: disk-utils/cfdisk.c:2444 login-utils/lslogins.c:211 sys-utils/lscpu.c:1561
+#: sys-utils/lscpu.c:1571 sys-utils/lsmem.c:266
msgid "yes"
msgstr "是"
-#: disk-utils/cfdisk.c:2444
+#: disk-utils/cfdisk.c:2445
msgid "Did not write partition table to disk."
msgstr "未将分区表写入磁盘。"
-#: disk-utils/cfdisk.c:2449
+#: disk-utils/cfdisk.c:2450
msgid "Failed to write disklabel."
msgstr "写磁盘标签失败。"
-#: disk-utils/cfdisk.c:2455 disk-utils/fdisk-menu.c:599
+#: disk-utils/cfdisk.c:2456 disk-utils/fdisk-menu.c:599
msgid "The partition table has been altered."
msgstr "分区表已调整。"
-#: disk-utils/cfdisk.c:2478 disk-utils/cfdisk.c:2549
+#: disk-utils/cfdisk.c:2479 disk-utils/cfdisk.c:2550
msgid "Note that partition table entries are not in disk order now."
msgstr "注意,现在分区表记录没有按磁盘顺序。"
-#: disk-utils/cfdisk.c:2515
+#: disk-utils/cfdisk.c:2516
#, c-format
msgid "Device already contains a %s signature; it will be removed by a write command."
msgstr "设备已包含一个 %s 签名;写入命令会将其移除。"
-#: disk-utils/cfdisk.c:2526
+#: disk-utils/cfdisk.c:2527
msgid "failed to create a new disklabel"
msgstr "创建新磁盘标签失败"
-#: disk-utils/cfdisk.c:2534
+#: disk-utils/cfdisk.c:2535
msgid "failed to read partitions"
msgstr "读分区失败"
-#: disk-utils/cfdisk.c:2633
+#: disk-utils/cfdisk.c:2634
#, c-format
msgid " %1$s [options] <disk>\n"
msgstr " %1$s [选项] <磁盘>\n"
-#: disk-utils/cfdisk.c:2636 disk-utils/fdisk.c:810 disk-utils/sfdisk.c:1848
+#: disk-utils/cfdisk.c:2637 disk-utils/fdisk.c:822 disk-utils/sfdisk.c:1850
msgid "Display or manipulate a disk partition table.\n"
msgstr "显示或操作磁盘分区表。\n"
-#: disk-utils/cfdisk.c:2639
+#: disk-utils/cfdisk.c:2640
msgid " -L, --color[=<when>] colorize output (auto, always or never)\n"
msgstr " -L, --color[=<何时>] 彩色输出(auto自动,always总是或never从不)\n"
-#: disk-utils/cfdisk.c:2642
+#: disk-utils/cfdisk.c:2643
msgid " -z, --zero start with zeroed partition table\n"
msgstr " -z, --zero 以空分区表开始\n"
-#: disk-utils/cfdisk.c:2680 disk-utils/fdisk.c:952 disk-utils/sfdisk.c:2125
-#: misc-utils/cal.c:429 sys-utils/dmesg.c:1409 text-utils/hexdump.c:114
+#: disk-utils/cfdisk.c:2681 disk-utils/fdisk.c:964 disk-utils/sfdisk.c:2125
+#: misc-utils/cal.c:429 sys-utils/dmesg.c:1406 text-utils/hexdump.c:114
msgid "unsupported color mode"
msgstr "不支持的颜色模式"
-#: disk-utils/cfdisk.c:2700 disk-utils/fdisk.c:890 disk-utils/sfdisk.c:224
+#: disk-utils/cfdisk.c:2700 disk-utils/fdisk.c:902 disk-utils/sfdisk.c:226
msgid "failed to allocate libfdisk context"
msgstr "分配 libfdisk 环境(context)失败"
@@ -706,7 +706,7 @@ msgstr " %s <磁盘设备> <分区号>\n"
msgid "Tell the kernel to forget about a specified partition.\n"
msgstr "通知内核忘记某个特定的分区。\n"
-#: disk-utils/delpart.c:63
+#: disk-utils/delpart.c:62
msgid "failed to remove partition"
msgstr "移除分区失败"
@@ -786,57 +786,57 @@ msgstr "无效参数 - to"
msgid "invalid argument - repair"
msgstr "无效参数 - repair"
-#: disk-utils/fdformat.c:223 disk-utils/fsck.cramfs.c:148
-#: disk-utils/mkfs.bfs.c:188 disk-utils/mkfs.cramfs.c:337
-#: disk-utils/mkfs.cramfs.c:758 disk-utils/mkfs.cramfs.c:797
-#: disk-utils/mkfs.minix.c:821 disk-utils/mkswap.c:243 disk-utils/partx.c:959
-#: login-utils/last.c:681 login-utils/utmpdump.c:137 misc-utils/namei.c:135
-#: misc-utils/rename.c:120 sys-utils/blkdiscard.c:185 sys-utils/blkzone.c:99
-#: sys-utils/dmesg.c:526 sys-utils/fallocate.c:198 sys-utils/fsfreeze.c:120
-#: sys-utils/fstrim.c:84 sys-utils/nsenter.c:164 sys-utils/nsenter.c:168
+#: disk-utils/fdformat.c:222 disk-utils/fsck.cramfs.c:148
+#: disk-utils/mkfs.bfs.c:182 disk-utils/mkfs.cramfs.c:337
+#: disk-utils/mkfs.cramfs.c:758 disk-utils/mkfs.cramfs.c:796
+#: disk-utils/mkfs.minix.c:820 disk-utils/mkswap.c:243 disk-utils/partx.c:958
+#: login-utils/last.c:682 login-utils/utmpdump.c:137 misc-utils/namei.c:135
+#: misc-utils/rename.c:120 sys-utils/blkdiscard.c:184 sys-utils/blkzone.c:99
+#: sys-utils/dmesg.c:526 sys-utils/fallocate.c:198 sys-utils/fsfreeze.c:119
+#: sys-utils/fstrim.c:90 sys-utils/nsenter.c:164 sys-utils/nsenter.c:168
#: sys-utils/swapon.c:523 sys-utils/switch_root.c:94
#: sys-utils/switch_root.c:137 term-utils/mesg.c:134 text-utils/more.c:350
#, c-format
msgid "stat of %s failed"
msgstr "对 %s stat 失败"
-#: disk-utils/fdformat.c:226 disk-utils/partx.c:1018 misc-utils/lsblk.c:1309
-#: sys-utils/blkdiscard.c:187 sys-utils/blkzone.c:101
+#: disk-utils/fdformat.c:225 disk-utils/partx.c:1017 misc-utils/lsblk.c:1386
+#: sys-utils/blkdiscard.c:186 sys-utils/blkzone.c:101
#: sys-utils/mountpoint.c:106
#, c-format
msgid "%s: not a block device"
msgstr "%s:不是一个块设备"
-#: disk-utils/fdformat.c:231
+#: disk-utils/fdformat.c:230
msgid "could not determine current format type"
msgstr "不能确定当前格式类型"
-#: disk-utils/fdformat.c:233
+#: disk-utils/fdformat.c:232
#, c-format
msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
msgstr "%s-面, %d 磁道, %d 秒/磁道. 总容量 %d kB.\n"
-#: disk-utils/fdformat.c:234
+#: disk-utils/fdformat.c:233
msgid "Double"
msgstr "双面"
-#: disk-utils/fdformat.c:234
+#: disk-utils/fdformat.c:233
msgid "Single"
msgstr "单面"
-#: disk-utils/fdformat.c:241
+#: disk-utils/fdformat.c:240
msgid "user defined start track exceeds the medium specific maximum"
msgstr "用户定义的起始磁道超出了媒体的最大指定值"
-#: disk-utils/fdformat.c:243
+#: disk-utils/fdformat.c:242
msgid "user defined end track exceeds the medium specific maximum"
msgstr "用户定义的结束磁道超出了媒体的最大指定值"
-#: disk-utils/fdformat.c:245
+#: disk-utils/fdformat.c:244
msgid "user defined start track exceeds the user defined end track"
msgstr "用户定义的起始磁道超过了定义的终止磁道"
-#: disk-utils/fdformat.c:253 misc-utils/logger.c:1023
+#: disk-utils/fdformat.c:252 misc-utils/logger.c:1043
msgid "close failed"
msgstr "关闭失败"
@@ -851,7 +851,7 @@ msgid "Using default response %c."
msgstr "将使用默认回应 %c。"
#: disk-utils/fdisk.c:222 disk-utils/fdisk.c:296 disk-utils/fdisk.c:373
-#: libfdisk/src/dos.c:1242 libfdisk/src/gpt.c:2470
+#: libfdisk/src/dos.c:1294 libfdisk/src/gpt.c:2474
msgid "Value out of range."
msgstr "值超出范围。"
@@ -885,46 +885,51 @@ msgstr "%s (%c-%c):"
msgid "%s (%<PRIu64>-%<PRIu64>): "
msgstr "%s (%<PRIu64>-%<PRIu64>): "
-#: disk-utils/fdisk.c:440 disk-utils/sfdisk.c:198
+#: disk-utils/fdisk.c:440 disk-utils/sfdisk.c:200
msgid " [Y]es/[N]o: "
msgstr "是[Y]/否[N]:"
-#: disk-utils/fdisk.c:481
+#: disk-utils/fdisk.c:482
msgid "Hex code (type L to list all codes): "
msgstr "Hex 代码(输入 L 列出所有代码):"
-#: disk-utils/fdisk.c:482
+#: disk-utils/fdisk.c:483
msgid "Partition type (type L to list all types): "
msgstr "分区类型(输入 L 列出所有类型):"
-#: disk-utils/fdisk.c:584
+#: disk-utils/fdisk.c:500
+#, fuzzy, c-format
+msgid "Failed to parse '%s' partition type."
+msgstr "解析 %s 的分区类型“%s”失败"
+
+#: disk-utils/fdisk.c:593
msgid "DOS Compatibility flag is set (DEPRECATED!)"
msgstr "已设置 DOS 兼容性标志(已废弃!)"
-#: disk-utils/fdisk.c:585
+#: disk-utils/fdisk.c:594
msgid "DOS Compatibility flag is not set"
msgstr "DOS 兼容性标志未设置"
-#: disk-utils/fdisk.c:606 disk-utils/fdisk.c:642
+#: disk-utils/fdisk.c:616 disk-utils/fdisk.c:654
#, c-format
msgid "Partition %zu does not exist yet!"
msgstr "分区 %zu 还不存在!"
-#: disk-utils/fdisk.c:611 disk-utils/fdisk.c:620 libfdisk/src/ask.c:1028
+#: disk-utils/fdisk.c:621 disk-utils/fdisk.c:632 libfdisk/src/ask.c:1028
msgid "Unknown"
msgstr "未知"
-#: disk-utils/fdisk.c:619
+#: disk-utils/fdisk.c:631
#, c-format
msgid "Changed type of partition '%s' to '%s'."
msgstr "已将分区“%s”的类型更改为“%s”。"
-#: disk-utils/fdisk.c:623
+#: disk-utils/fdisk.c:635
#, c-format
msgid "Type of partition %zu is unchanged: %s."
msgstr "分区 %zu 的类型未更改:%s。"
-#: disk-utils/fdisk.c:719
+#: disk-utils/fdisk.c:731
#, c-format
msgid ""
"\n"
@@ -933,35 +938,35 @@ msgstr ""
"\n"
"%s: 偏移 = %<PRIu64>, 大小 = %zu 字节。"
-#: disk-utils/fdisk.c:725
+#: disk-utils/fdisk.c:737
msgid "cannot seek"
msgstr "无法定位"
-#: disk-utils/fdisk.c:730
+#: disk-utils/fdisk.c:742
msgid "cannot read"
msgstr "不能读"
-#: disk-utils/fdisk.c:743 libfdisk/src/bsd.c:258 libfdisk/src/dos.c:982
-#: libfdisk/src/gpt.c:2398
+#: disk-utils/fdisk.c:755 libfdisk/src/bsd.c:258 libfdisk/src/dos.c:942
+#: libfdisk/src/gpt.c:2402
msgid "First sector"
msgstr "第一个扇区"
-#: disk-utils/fdisk.c:770
+#: disk-utils/fdisk.c:782
#, c-format
msgid "BLKGETSIZE ioctl failed on %s"
msgstr "对 %s 进行 BLKGETSIZE ioctl 失败"
-#: disk-utils/fdisk.c:788 disk-utils/sfdisk.c:1479
+#: disk-utils/fdisk.c:800 disk-utils/sfdisk.c:1481
#, fuzzy, c-format
msgid "The old %s signature will be removed by a write command."
msgstr "写入命令将移除该签名。"
-#: disk-utils/fdisk.c:792
+#: disk-utils/fdisk.c:804
#, 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."
msgstr "强烈建议您使用 wipefs(8)来擦除该设备,以避免潜在的冲突。"
-#: disk-utils/fdisk.c:805
+#: disk-utils/fdisk.c:817
#, c-format
msgid ""
" %1$s [options] <disk> change partition table\n"
@@ -970,135 +975,135 @@ msgstr ""
" %1$s [选项] <磁盘> 更改分区表\n"
" %1$s [选项] -l [<磁盘>] 列出分区表\n"
-#: disk-utils/fdisk.c:813
+#: disk-utils/fdisk.c:825
msgid " -b, --sector-size <size> physical and logical sector size\n"
msgstr " -b, --sectors-size <大小> 显示扇区计数和大小\n"
-#: disk-utils/fdisk.c:814
+#: disk-utils/fdisk.c:826
msgid " -B, --protect-boot don't erase bootbits when creating a new label\n"
msgstr " -B, --protect-boot 创建新标签时不要擦除 bootbits \n"
-#: disk-utils/fdisk.c:815
+#: disk-utils/fdisk.c:827
msgid " -c, --compatibility[=<mode>] mode is 'dos' or 'nondos' (default)\n"
msgstr " -c, --compatibility[=<模式>] 模式,为“dos”或“nondos”(默认)\n"
-#: disk-utils/fdisk.c:816
+#: disk-utils/fdisk.c:828
msgid " -L, --color[=<when>] colorize output (auto, always or never)\n"
msgstr " -L, --color[=<时机>] 彩色输出(auto, always 或 never)\n"
-#: disk-utils/fdisk.c:819
+#: disk-utils/fdisk.c:831
msgid " -l, --list display partitions and exit\n"
msgstr " -l, --list 显示分区并退出\n"
-#: disk-utils/fdisk.c:820
+#: disk-utils/fdisk.c:832
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: disk-utils/fdisk.c:821
+#: disk-utils/fdisk.c:833
msgid " -t, --type <type> recognize specified partition table type only\n"
msgstr " -t, --type <类型> 只识别指定的分区表类型\n"
-#: disk-utils/fdisk.c:822
+#: disk-utils/fdisk.c:834
msgid " -u, --units[=<unit>] display units: 'cylinders' or 'sectors' (default)\n"
msgstr " -u, --units[=<单位>] 显示单位,“cylinders”柱面或“sectors”扇区(默认)\n"
-#: disk-utils/fdisk.c:823
+#: disk-utils/fdisk.c:835
msgid " -s, --getsz display device size in 512-byte sectors [DEPRECATED]\n"
msgstr " -s, --getsz 以 512-字节扇区显示设备大小[已废弃]\n"
-#: disk-utils/fdisk.c:824
+#: disk-utils/fdisk.c:836
msgid " --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
-#: disk-utils/fdisk.c:825
+#: disk-utils/fdisk.c:837
msgid " -w, --wipe <mode> wipe signatures (auto, always or never)\n"
msgstr " -w, --wipe <模式> 擦除签名(auto, always 或 never)\n"
-#: disk-utils/fdisk.c:826 disk-utils/sfdisk.c:1891
+#: disk-utils/fdisk.c:838 disk-utils/sfdisk.c:1893
msgid " -W, --wipe-partitions <mode> wipe signatures from new partitions (auto, always or never)\n"
msgstr " -W, --wipe-partitions <模式> 擦除新分区的签名(auto, always 或 never)\n"
-#: disk-utils/fdisk.c:829
+#: disk-utils/fdisk.c:841
msgid " -C, --cylinders <number> specify the number of cylinders\n"
msgstr " -C, --cylinders <数字> 指定柱面数\n"
-#: disk-utils/fdisk.c:830
+#: disk-utils/fdisk.c:842
msgid " -H, --heads <number> specify the number of heads\n"
msgstr " -H, --heads <数字> 指定磁头数\n"
-#: disk-utils/fdisk.c:831
+#: disk-utils/fdisk.c:843
msgid " -S, --sectors <number> specify the number of sectors per track\n"
msgstr " -S, --sectors <数字> 指定每条磁道的扇区数\n"
-#: disk-utils/fdisk.c:900 disk-utils/fdisk.c:902 disk-utils/partx.c:881
+#: disk-utils/fdisk.c:912 disk-utils/fdisk.c:914 disk-utils/partx.c:881
msgid "invalid sector size argument"
msgstr "无效的 扇区大小 参数"
-#: disk-utils/fdisk.c:912
+#: disk-utils/fdisk.c:924
msgid "invalid cylinders argument"
msgstr "无效的 柱面数 参数"
-#: disk-utils/fdisk.c:924
+#: disk-utils/fdisk.c:936
msgid "not found DOS label driver"
msgstr "未找到 DOS 标签驱动"
-#: disk-utils/fdisk.c:930
+#: disk-utils/fdisk.c:942
#, c-format
msgid "unknown compatibility mode '%s'"
msgstr "未知兼容模式“%s”"
-#: disk-utils/fdisk.c:937
+#: disk-utils/fdisk.c:949
msgid "invalid heads argument"
msgstr "无效的 磁头数 参数"
-#: disk-utils/fdisk.c:943
+#: disk-utils/fdisk.c:955
msgid "invalid sectors argument"
msgstr "无效的 扇区数 参数"
-#: disk-utils/fdisk.c:969
+#: disk-utils/fdisk.c:981
#, c-format
msgid "unsupported disklabel: %s"
msgstr "不支持的磁盘标签:%s"
-#: disk-utils/fdisk.c:977
+#: disk-utils/fdisk.c:989
#, fuzzy
msgid "unsupported unit"
msgstr "不支持的单位“%c”"
-#: disk-utils/fdisk.c:986 disk-utils/fdisk.c:991 disk-utils/sfdisk.c:2089
+#: disk-utils/fdisk.c:997 disk-utils/fdisk.c:1002 disk-utils/sfdisk.c:2089
#: disk-utils/sfdisk.c:2094
msgid "unsupported wipe mode"
msgstr "不支持的擦除模式"
-#: disk-utils/fdisk.c:1004
+#: disk-utils/fdisk.c:1015
msgid "The device properties (sector size and geometry) should be used with one specified device only."
msgstr "设备属性(扇区大小和几何属性)只能用于某个指定的设备。"
-#: disk-utils/fdisk.c:1035 disk-utils/fdisk.c:1050 disk-utils/fsck.cramfs.c:695
-#: disk-utils/mkfs.bfs.c:198 disk-utils/mkfs.cramfs.c:787
-#: disk-utils/partx.c:975 disk-utils/raw.c:137 disk-utils/raw.c:150
-#: disk-utils/raw.c:162 disk-utils/raw.c:203 misc-utils/cal.c:520
-#: misc-utils/findfs.c:58 misc-utils/look.c:150 misc-utils/whereis.c:573
-#: misc-utils/whereis.c:584 misc-utils/whereis.c:595 misc-utils/whereis.c:637
-#: schedutils/chrt.c:504 schedutils/ionice.c:262 schedutils/taskset.c:189
-#: sys-utils/chcpu.c:354 sys-utils/chmem.c:423 sys-utils/dmesg.c:1468
-#: sys-utils/ipcmk.c:135 sys-utils/ldattach.c:321 sys-utils/losetup.c:909
-#: sys-utils/lscpu.c:2027 sys-utils/lsmem.c:632 sys-utils/mount.c:764
-#: sys-utils/mount.c:772 sys-utils/mount.c:812 sys-utils/mount.c:825
-#: sys-utils/mount.c:894 sys-utils/mountpoint.c:180 sys-utils/pivot_root.c:72
-#: sys-utils/swapoff.c:230 sys-utils/swapon.c:994 sys-utils/switch_root.c:250
-#: sys-utils/umount.c:582 term-utils/setterm.c:1176 text-utils/col.c:233
-#: text-utils/more.c:1988
+#: disk-utils/fdisk.c:1046 disk-utils/fdisk.c:1061 disk-utils/fsck.cramfs.c:694
+#: disk-utils/mkfs.bfs.c:192 disk-utils/mkfs.cramfs.c:786
+#: disk-utils/partx.c:974 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:571
+#: misc-utils/whereis.c:582 misc-utils/whereis.c:593 misc-utils/whereis.c:635
+#: 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:1467
+#: sys-utils/ipcmk.c:134 sys-utils/ldattach.c:321 sys-utils/losetup.c:913
+#: sys-utils/lscpu.c:2340 sys-utils/lsmem.c:631 sys-utils/mount.c:809
+#: sys-utils/mount.c:817 sys-utils/mount.c:864 sys-utils/mount.c:877
+#: sys-utils/mount.c:949 sys-utils/mountpoint.c:179 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:583 term-utils/setterm.c:1179 text-utils/col.c:233
+#: text-utils/more.c:1986
#, fuzzy
msgid "bad usage"
msgstr "错误值"
-#: disk-utils/fdisk.c:1056
+#: disk-utils/fdisk.c:1067
#, c-format
msgid "Welcome to fdisk (%s)."
msgstr "欢迎使用 fdisk (%s)。"
-#: disk-utils/fdisk.c:1058 disk-utils/sfdisk.c:1621
+#: disk-utils/fdisk.c:1069 disk-utils/sfdisk.c:1623
msgid ""
"Changes will remain in memory only, until you decide to write them.\n"
"Be careful before using the write command.\n"
@@ -1106,7 +1111,7 @@ msgstr ""
"更改将停留在内存中,直到您决定将更改写入磁盘。\n"
"使用写入命令前请三思。\n"
-#: disk-utils/fdisk.c:1081
+#: disk-utils/fdisk.c:1092
msgid "A hybrid GPT was detected. You have to sync the hybrid MBR manually (expert command 'M')."
msgstr "检测到混合 GPT。您需要手动同步混合 MBR (用专家命令“M”)"
@@ -1120,121 +1125,122 @@ msgstr "磁盘标签类型:%s"
msgid "Disk identifier: %s"
msgstr "磁盘标识符:%s"
-#: disk-utils/fdisk-list.c:60
+#: disk-utils/fdisk-list.c:61
#, c-format
msgid "Disk %s: %s, %ju bytes, %ju sectors"
msgstr "Disk %s:%s,%ju 字节,%ju 个扇区"
-#: disk-utils/fdisk-list.c:67
+#: disk-utils/fdisk-list.c:68
#, fuzzy, c-format
msgid "Disk model: %s"
msgstr "磁盘:%s"
-#: disk-utils/fdisk-list.c:70
+#: disk-utils/fdisk-list.c:71
#, c-format
msgid "Geometry: %d heads, %llu sectors/track, %llu cylinders"
msgstr "几何属性:%d 个磁头, %llu 个扇区/磁道, %llu 个柱面"
-#: disk-utils/fdisk-list.c:75 disk-utils/fdisk-list.c:296
+#: disk-utils/fdisk-list.c:76 disk-utils/fdisk-list.c:298
#, c-format
msgid "Units: %s of %d * %ld = %ld bytes"
msgstr "单元:%s / %d * %ld = %ld 字节"
-#: disk-utils/fdisk-list.c:81 disk-utils/fdisk-list.c:302
+#: disk-utils/fdisk-list.c:82 disk-utils/fdisk-list.c:304
#, c-format
msgid "Sector size (logical/physical): %lu bytes / %lu bytes"
msgstr "扇区大小(逻辑/物理):%lu 字节 / %lu 字节"
-#: disk-utils/fdisk-list.c:84
+#: disk-utils/fdisk-list.c:85
#, c-format
msgid "I/O size (minimum/optimal): %lu bytes / %lu bytes"
msgstr "I/O 大小(最小/最佳):%lu 字节 / %lu 字节"
-#: disk-utils/fdisk-list.c:88
+#: disk-utils/fdisk-list.c:89
#, c-format
msgid "Alignment offset: %lu bytes"
msgstr "对齐偏移量:%lu 字节"
-#: disk-utils/fdisk-list.c:119 disk-utils/fdisk-list.c:239
+#: disk-utils/fdisk-list.c:120 disk-utils/fdisk-list.c:240
#: disk-utils/fsck.c:1255
msgid "failed to allocate iterator"
msgstr "分配迭代器失败"
-#: disk-utils/fdisk-list.c:125 disk-utils/fdisk-list.c:245
-#: disk-utils/partx.c:668 login-utils/lslogins.c:1007 misc-utils/fincore.c:361
-#: misc-utils/findmnt.c:1625 misc-utils/lsblk.c:1735 misc-utils/lslocks.c:456
+#: disk-utils/fdisk-list.c:126 disk-utils/fdisk-list.c:246
+#: disk-utils/partx.c:668 login-utils/lslogins.c:1013 misc-utils/fincore.c:360
+#: misc-utils/findmnt.c:1624 misc-utils/lsblk.c:2013 misc-utils/lslocks.c:456
#: misc-utils/uuidparse.c:252 misc-utils/wipefs.c:156 sys-utils/losetup.c:325
-#: sys-utils/lscpu.c:1596 sys-utils/lscpu.c:1699 sys-utils/lsipc.c:351
-#: sys-utils/prlimit.c:297 sys-utils/rfkill.c:459 sys-utils/swapon.c:284
-#: sys-utils/wdctl.c:260 sys-utils/zramctl.c:496 text-utils/column.c:208
+#: sys-utils/lscpu.c:1632 sys-utils/lscpu.c:1821 sys-utils/lscpu.c:1948
+#: sys-utils/lsipc.c:351 sys-utils/prlimit.c:297 sys-utils/rfkill.c:459
+#: sys-utils/swapon.c:284 sys-utils/wdctl.c:260 sys-utils/zramctl.c:496
+#: text-utils/column.c:208
msgid "failed to allocate output table"
msgstr "分配输出表失败"
-#: disk-utils/fdisk-list.c:166 disk-utils/fdisk-list.c:269
-#: disk-utils/partx.c:582 login-utils/lslogins.c:1065 misc-utils/fincore.c:123
-#: misc-utils/findmnt.c:688 misc-utils/findmnt.c:706 misc-utils/lsblk.c:993
+#: disk-utils/fdisk-list.c:167 disk-utils/fdisk-list.c:270
+#: disk-utils/partx.c:582 login-utils/lslogins.c:1071 misc-utils/fincore.c:123
+#: misc-utils/findmnt.c:688 misc-utils/findmnt.c:706 misc-utils/lsblk.c:1030
#: 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:1622
-#: sys-utils/lscpu.c:1650 sys-utils/lsipc.c:480 sys-utils/lsipc.c:555
-#: sys-utils/lsipc.c:657 sys-utils/lsipc.c:749 sys-utils/lsipc.c:910
-#: sys-utils/prlimit.c:229 sys-utils/rfkill.c:376 sys-utils/swapon.c:179
-#: sys-utils/wdctl.c:214 sys-utils/zramctl.c:414 text-utils/column.c:452
-#: text-utils/column.c:473
+#: sys-utils/losetup.c:348 sys-utils/losetup.c:377 sys-utils/lscpu.c:1651
+#: sys-utils/lscpu.c:1847 sys-utils/lscpu.c:1875 sys-utils/lsipc.c:480
+#: sys-utils/lsipc.c:555 sys-utils/lsipc.c:657 sys-utils/lsipc.c:749
+#: sys-utils/lsipc.c:910 sys-utils/prlimit.c:229 sys-utils/rfkill.c:376
+#: sys-utils/swapon.c:179 sys-utils/wdctl.c:214 sys-utils/zramctl.c:414
+#: text-utils/column.c:452 text-utils/column.c:473
msgid "failed to allocate output line"
msgstr "分配输出行失败"
-#: disk-utils/fdisk-list.c:176 disk-utils/fdisk-list.c:276
-#: disk-utils/partx.c:645 login-utils/lslogins.c:1166 misc-utils/fincore.c:159
-#: misc-utils/findmnt.c:692 misc-utils/findmnt.c:711 misc-utils/lsblk.c:984
+#: disk-utils/fdisk-list.c:177 disk-utils/fdisk-list.c:277
+#: disk-utils/partx.c:645 login-utils/lslogins.c:1172 misc-utils/fincore.c:159
+#: misc-utils/findmnt.c:692 misc-utils/findmnt.c:711 misc-utils/lsblk.c:1065
#: misc-utils/lslocks.c:443 misc-utils/uuidparse.c:239 misc-utils/wipefs.c:263
-#: sys-utils/losetup.c:305 sys-utils/lscpu.c:1630 sys-utils/lscpu.c:1661
-#: sys-utils/lsipc.c:514 sys-utils/lsipc.c:639 sys-utils/prlimit.c:261
-#: sys-utils/rfkill.c:404 sys-utils/swapon.c:227 sys-utils/wdctl.c:242
-#: sys-utils/zramctl.c:481 text-utils/column.c:459
+#: sys-utils/losetup.c:305 sys-utils/lscpu.c:1697 sys-utils/lscpu.c:1855
+#: sys-utils/lscpu.c:1886 sys-utils/lsipc.c:514 sys-utils/lsipc.c:639
+#: sys-utils/prlimit.c:261 sys-utils/rfkill.c:404 sys-utils/swapon.c:227
+#: sys-utils/wdctl.c:242 sys-utils/zramctl.c:481 text-utils/column.c:459
#, fuzzy
msgid "failed to add output data"
msgstr "向输出表添加数据出错"
-#: disk-utils/fdisk-list.c:196
+#: disk-utils/fdisk-list.c:197
#, c-format
msgid "Partition %zu does not start on physical sector boundary."
msgstr "分区 %zu 未起始于物理扇区边界。"
-#: disk-utils/fdisk-list.c:203
+#: disk-utils/fdisk-list.c:204
#, c-format
msgid "Filesystem/RAID signature on partition %zu will be wiped."
msgstr ""
-#: disk-utils/fdisk-list.c:212
+#: disk-utils/fdisk-list.c:213
msgid "Partition table entries are not in disk order."
msgstr "分区表记录没有按磁盘顺序。"
-#: disk-utils/fdisk-list.c:231 libfdisk/src/bsd.c:1018 libfdisk/src/dos.c:2426
-#: libfdisk/src/gpt.c:3129 libfdisk/src/sgi.c:1154 libfdisk/src/sun.c:1122
+#: disk-utils/fdisk-list.c:232 libfdisk/src/bsd.c:1018 libfdisk/src/dos.c:2498
+#: libfdisk/src/gpt.c:3133 libfdisk/src/sgi.c:1154 libfdisk/src/sun.c:1122
msgid "Start"
msgstr "起点"
-#: disk-utils/fdisk-list.c:231 libfdisk/src/bsd.c:1019 libfdisk/src/dos.c:2427
-#: libfdisk/src/gpt.c:3130 libfdisk/src/sgi.c:1155 libfdisk/src/sun.c:1123
+#: disk-utils/fdisk-list.c:232 libfdisk/src/bsd.c:1019 libfdisk/src/dos.c:2499
+#: libfdisk/src/gpt.c:3134 libfdisk/src/sgi.c:1155 libfdisk/src/sun.c:1123
msgid "End"
msgstr "末尾"
-#: disk-utils/fdisk-list.c:231 libfdisk/src/bsd.c:1020 libfdisk/src/dos.c:2428
-#: libfdisk/src/gpt.c:3131 libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:1124
+#: disk-utils/fdisk-list.c:232 libfdisk/src/bsd.c:1020 libfdisk/src/dos.c:2500
+#: libfdisk/src/gpt.c:3135 libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:1124
msgid "Sectors"
msgstr "扇区"
-#: disk-utils/fdisk-list.c:231 libfdisk/src/bsd.c:1022 libfdisk/src/dos.c:2430
-#: libfdisk/src/gpt.c:3132 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1126
+#: disk-utils/fdisk-list.c:232 libfdisk/src/bsd.c:1022 libfdisk/src/dos.c:2502
+#: libfdisk/src/gpt.c:3136 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1126
msgid "Size"
msgstr "大小"
-#: disk-utils/fdisk-list.c:290
+#: disk-utils/fdisk-list.c:292
#, c-format
msgid "Unpartitioned space %s: %s, %ju bytes, %ju sectors"
msgstr "未分区的空间 %s:%s,%ju 个字节,%ju 个扇区"
-#: disk-utils/fdisk-list.c:476
+#: disk-utils/fdisk-list.c:478
#, c-format
msgid "%s unknown column: %s"
msgstr "%s 未知列: %s"
@@ -1528,7 +1534,7 @@ msgstr ""
"\n"
"帮助 (专业命令):\n"
-#: disk-utils/fdisk-menu.c:373 disk-utils/sfdisk.c:1288
+#: disk-utils/fdisk-menu.c:373 disk-utils/sfdisk.c:1290
#, c-format
msgid ""
"\n"
@@ -1583,16 +1589,16 @@ msgstr "将磁盘布局转换成脚本失败"
msgid "Script successfully saved."
msgstr "成本保存了脚本。"
-#: disk-utils/fdisk-menu.c:555 disk-utils/sfdisk.c:1509
+#: disk-utils/fdisk-menu.c:555 disk-utils/sfdisk.c:1511
#, c-format
msgid "Partition #%zu contains a %s signature."
msgstr "分区 #%zu 包含一个 %s 签名。"
-#: disk-utils/fdisk-menu.c:558 disk-utils/sfdisk.c:1512
+#: disk-utils/fdisk-menu.c:558 disk-utils/sfdisk.c:1514
msgid "Do you want to remove the signature?"
msgstr "您想移除该签名吗?"
-#: disk-utils/fdisk-menu.c:563 disk-utils/sfdisk.c:1517
+#: disk-utils/fdisk-menu.c:563 disk-utils/sfdisk.c:1519
msgid "The signature will be removed by a write command."
msgstr "写入命令将移除该签名。"
@@ -1669,11 +1675,12 @@ msgstr "%s 未挂载\n"
#: disk-utils/fsck.c:329 disk-utils/fsck.cramfs.c:171
#: disk-utils/fsck.cramfs.c:178 disk-utils/fsck.cramfs.c:234
-#: disk-utils/fsck.cramfs.c:255 disk-utils/sfdisk.c:298 libfdisk/src/bsd.c:646
+#: disk-utils/fsck.cramfs.c:255 disk-utils/sfdisk.c:300 libfdisk/src/bsd.c:646
#: login-utils/last.c:208 login-utils/last.c:245 login-utils/sulogin.c:656
-#: sys-utils/ctrlaltdel.c:44 sys-utils/rfkill.c:213 sys-utils/setpriv.c:300
-#: term-utils/setterm.c:723 term-utils/setterm.c:780 term-utils/setterm.c:784
-#: term-utils/setterm.c:791
+#: misc-utils/hardlink.c:284 misc-utils/hardlink.c:286
+#: sys-utils/ctrlaltdel.c:44 sys-utils/rfkill.c:213 sys-utils/setpriv.c:299
+#: term-utils/setterm.c:726 term-utils/setterm.c:783 term-utils/setterm.c:787
+#: term-utils/setterm.c:794
#, c-format
msgid "cannot read %s"
msgstr "不能读 %s"
@@ -1728,10 +1735,10 @@ msgstr "%s:第 %d 行解析出错 -- 已忽略"
msgid "%s: failed to parse fstab"
msgstr "%s:解析 fstab 失败"
-#: disk-utils/fsck.c:687 login-utils/login.c:941 login-utils/sulogin.c:1023
-#: login-utils/vipw.c:208 sys-utils/flock.c:346 sys-utils/nsenter.c:180
-#: sys-utils/swapon.c:320 sys-utils/unshare.c:221 sys-utils/unshare.c:438
-#: term-utils/script.c:882
+#: disk-utils/fsck.c:687 login-utils/login.c:944 login-utils/sulogin.c:1023
+#: login-utils/vipw.c:208 sys-utils/flock.c:348 sys-utils/nsenter.c:180
+#: sys-utils/swapon.c:320 sys-utils/unshare.c:223 sys-utils/unshare.c:466
+#: term-utils/script.c:880
msgid "fork failed"
msgstr "fork 失败"
@@ -1744,8 +1751,8 @@ msgstr "%s:执行失败"
msgid "wait: no more child process?!?"
msgstr "等待:没有剩余子进程了?!?"
-#: disk-utils/fsck.c:785 sys-utils/flock.c:364 sys-utils/swapon.c:352
-#: sys-utils/unshare.c:422 sys-utils/unshare.c:443
+#: disk-utils/fsck.c:785 sys-utils/flock.c:366 sys-utils/swapon.c:352
+#: sys-utils/unshare.c:450 sys-utils/unshare.c:471
msgid "waitpid failed"
msgstr "waitpid 失败"
@@ -1879,49 +1886,49 @@ msgstr " -V 解释正在进行的操作\n"
msgid "See the specific fsck.* commands for available fs-options."
msgstr "参见特定的 fsck.* 命令了解可用的文件系统选项。"
-#: disk-utils/fsck.c:1460
+#: disk-utils/fsck.c:1458
msgid "too many devices"
msgstr "设备过多"
-#: disk-utils/fsck.c:1472
+#: disk-utils/fsck.c:1470
msgid "Is /proc mounted?"
msgstr "/proc 挂载了吗?"
-#: disk-utils/fsck.c:1480
+#: disk-utils/fsck.c:1478
#, c-format
msgid "must be root to scan for matching filesystems: %s"
msgstr "必须以 root 用户进行匹配文件系统扫描:%s"
-#: disk-utils/fsck.c:1484
+#: disk-utils/fsck.c:1482
#, c-format
msgid "couldn't find matching filesystem: %s"
msgstr "找不到匹配的文件系统:%s"
-#: disk-utils/fsck.c:1492 disk-utils/fsck.c:1589 misc-utils/kill.c:236
-#: sys-utils/eject.c:278
+#: disk-utils/fsck.c:1490 disk-utils/fsck.c:1587 misc-utils/kill.c:234
+#: sys-utils/eject.c:276
msgid "too many arguments"
msgstr "参数过多"
-#: disk-utils/fsck.c:1547 disk-utils/fsck.c:1550
+#: disk-utils/fsck.c:1545 disk-utils/fsck.c:1548
msgid "invalid argument of -r"
msgstr "-r 的参数无效"
-#: disk-utils/fsck.c:1562
+#: disk-utils/fsck.c:1560
#, fuzzy, c-format
msgid "option '%s' may be specified only once"
msgstr "--pid 选项只能指定一次"
-#: disk-utils/fsck.c:1569 misc-utils/kill.c:282
+#: disk-utils/fsck.c:1567 misc-utils/kill.c:280
#, c-format
msgid "option '%s' requires an argument"
msgstr "“%s”选项需要一个参数"
-#: disk-utils/fsck.c:1600
+#: disk-utils/fsck.c:1598
#, c-format
msgid "invalid argument of -r: %d"
msgstr "-r 的参数无效:%d"
-#: disk-utils/fsck.c:1643
+#: disk-utils/fsck.c:1641
msgid "the -l option can be used with one device only -- ignore"
msgstr "-l 选项只能用于一个设备 -- 忽略"
@@ -2073,8 +2080,8 @@ msgid "non-size (%ld vs %ld) bytes"
msgstr "无大小(%ld : %ld)字节"
#: disk-utils/fsck.cramfs.c:415 disk-utils/fsck.cramfs.c:518
-#: disk-utils/swaplabel.c:109 misc-utils/uuidd.c:366 sys-utils/fallocate.c:409
-#: sys-utils/rfkill.c:560 sys-utils/setpriv.c:666 sys-utils/setpriv.c:689
+#: disk-utils/swaplabel.c:109 misc-utils/uuidd.c:369 sys-utils/fallocate.c:408
+#: sys-utils/rfkill.c:560 sys-utils/setpriv.c:665 sys-utils/setpriv.c:688
#: sys-utils/swapon.c:393 term-utils/ttymsg.c:175
#, c-format
msgid "write failed: %s"
@@ -2091,8 +2098,8 @@ msgid "chown failed: %s"
msgstr "chown 失败:%s"
#: disk-utils/fsck.cramfs.c:435
-#, c-format
-msgid "utime failed: %s"
+#, fuzzy, c-format
+msgid "utimes failed: %s"
msgstr "utime 失败:%s"
#: disk-utils/fsck.cramfs.c:447
@@ -2182,11 +2189,11 @@ msgstr "目录数据终点 (%lu) != 文件数据起点 (%lu)"
msgid "invalid file data offset"
msgstr "无效的文件数据偏移"
-#: disk-utils/fsck.cramfs.c:688 disk-utils/mkfs.cramfs.c:736
+#: disk-utils/fsck.cramfs.c:687 disk-utils/mkfs.cramfs.c:736
msgid "invalid blocksize argument"
msgstr "无效的 块大小 参数"
-#: disk-utils/fsck.cramfs.c:711
+#: disk-utils/fsck.cramfs.c:710
#, c-format
msgid "%s: OK\n"
msgstr "%s:OK\n"
@@ -2569,31 +2576,31 @@ msgstr "inode 大小有误"
msgid "bad v2 inode size"
msgstr "v2 inode 大小有误"
-#: disk-utils/fsck.minix.c:1346
+#: disk-utils/fsck.minix.c:1345
msgid "need terminal for interactive repairs"
msgstr "需要终端来进行交互式修复"
-#: disk-utils/fsck.minix.c:1350
+#: disk-utils/fsck.minix.c:1349
#, c-format
msgid "cannot open %s: %s"
msgstr "无法打开 %s:%s"
-#: disk-utils/fsck.minix.c:1361
+#: disk-utils/fsck.minix.c:1360
#, c-format
msgid "%s is clean, no check.\n"
msgstr "%s 是干净的,不检查。\n"
-#: disk-utils/fsck.minix.c:1364
+#: disk-utils/fsck.minix.c:1363
#, c-format
msgid "Forcing filesystem check on %s.\n"
msgstr "强制在 %s 上进行文件系统检查。\n"
-#: disk-utils/fsck.minix.c:1366
+#: disk-utils/fsck.minix.c:1365
#, c-format
msgid "Filesystem on %s is dirty, needs checking.\n"
msgstr "%s 上的文件系统有问题,需要检查。\n"
-#: disk-utils/fsck.minix.c:1398
+#: disk-utils/fsck.minix.c:1397
#, c-format
msgid ""
"\n"
@@ -2602,12 +2609,12 @@ msgstr ""
"\n"
"已使用 %6ld inodes(%ld%%)\n"
-#: disk-utils/fsck.minix.c:1404
+#: disk-utils/fsck.minix.c:1403
#, c-format
msgid "%6ld zones used (%ld%%)\n"
msgstr "已使用 %6ld 区(%ld%%)\n"
-#: disk-utils/fsck.minix.c:1406
+#: disk-utils/fsck.minix.c:1405
#, c-format
msgid ""
"\n"
@@ -2630,7 +2637,7 @@ msgstr ""
"------\n"
"%6d 个文件\n"
-#: disk-utils/fsck.minix.c:1420
+#: disk-utils/fsck.minix.c:1419
#, c-format
msgid ""
"----------------------------\n"
@@ -2641,12 +2648,12 @@ msgstr ""
"文件系统已经更改\n"
"----------------\n"
-#: disk-utils/fsck.minix.c:1432 disk-utils/mkfs.minix.c:838
-#: disk-utils/mkswap.c:542 disk-utils/partx.c:1068 disk-utils/resizepart.c:116
-#: login-utils/su-common.c:328 login-utils/su-common.c:405
-#: login-utils/utmpdump.c:391 sys-utils/dmesg.c:661 sys-utils/wdctl.c:347
+#: disk-utils/fsck.minix.c:1431 disk-utils/mkfs.minix.c:837
+#: disk-utils/mkswap.c:541 disk-utils/partx.c:1067 disk-utils/resizepart.c:115
+#: login-utils/su-common.c:327 login-utils/su-common.c:404
+#: login-utils/utmpdump.c:389 sys-utils/dmesg.c:661 sys-utils/wdctl.c:347
#: sys-utils/wdctl.c:412 term-utils/script.c:363 term-utils/script.c:442
-#: term-utils/setterm.c:887 text-utils/pg.c:1256
+#: term-utils/setterm.c:890 text-utils/pg.c:1256
msgid "write failed"
msgstr "写失败"
@@ -2720,106 +2727,106 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: disk-utils/mkfs.bfs.c:145
+#: disk-utils/mkfs.bfs.c:139
msgid "invalid number of inodes"
msgstr "无效的 inodes 数目"
-#: disk-utils/mkfs.bfs.c:151
+#: disk-utils/mkfs.bfs.c:145
msgid "volume name too long"
msgstr "卷名过长"
-#: disk-utils/mkfs.bfs.c:158
+#: disk-utils/mkfs.bfs.c:152
msgid "fsname name too long"
msgstr "fsname 名过长"
-#: disk-utils/mkfs.bfs.c:196
+#: disk-utils/mkfs.bfs.c:190
msgid "invalid block-count"
msgstr "无效的块计数"
-#: disk-utils/mkfs.bfs.c:204
+#: disk-utils/mkfs.bfs.c:198
#, c-format
msgid "cannot get size of %s"
msgstr "无法获得 %s 的大小"
-#: disk-utils/mkfs.bfs.c:209
+#: disk-utils/mkfs.bfs.c:203
#, c-format
msgid "blocks argument too large, max is %llu"
msgstr "块参数过大,最大值是 %llu"
-#: disk-utils/mkfs.bfs.c:224
+#: disk-utils/mkfs.bfs.c:218
msgid "too many inodes - max is 512"
msgstr "inodes 过多 - 最多 512"
-#: disk-utils/mkfs.bfs.c:234
+#: disk-utils/mkfs.bfs.c:228
#, c-format
msgid "not enough space, need at least %llu blocks"
msgstr "空间不足,至少需要 %llu 个块"
-#: disk-utils/mkfs.bfs.c:246
+#: disk-utils/mkfs.bfs.c:240
#, c-format
msgid "Device: %s\n"
msgstr "设备:%s\n"
-#: disk-utils/mkfs.bfs.c:247
+#: disk-utils/mkfs.bfs.c:241
#, c-format
msgid "Volume: <%-6s>\n"
msgstr "卷:<%-6s>\n"
-#: disk-utils/mkfs.bfs.c:248
+#: disk-utils/mkfs.bfs.c:242
#, c-format
msgid "FSname: <%-6s>\n"
msgstr "文件系统名:<%-6s>\n"
-#: disk-utils/mkfs.bfs.c:249
+#: disk-utils/mkfs.bfs.c:243
#, c-format
msgid "BlockSize: %d\n"
msgstr "块大小:%d\n"
-#: disk-utils/mkfs.bfs.c:251
+#: disk-utils/mkfs.bfs.c:245
#, c-format
msgid "Inodes: %ld (in 1 block)\n"
msgstr "Inodes:%ld (在 1 个块中)\n"
-#: disk-utils/mkfs.bfs.c:254
+#: disk-utils/mkfs.bfs.c:248
#, c-format
msgid "Inodes: %ld (in %llu blocks)\n"
msgstr "Inodes:%ld (在 %llu 个块中)\n"
-#: disk-utils/mkfs.bfs.c:256
+#: disk-utils/mkfs.bfs.c:250
#, c-format
msgid "Blocks: %llu\n"
msgstr "块:%llu\n"
-#: disk-utils/mkfs.bfs.c:257
+#: disk-utils/mkfs.bfs.c:251
#, c-format
msgid "Inode end: %d, Data end: %d\n"
msgstr "Inode 终点:%d,数据终点:%d\n"
-#: disk-utils/mkfs.bfs.c:262
+#: disk-utils/mkfs.bfs.c:256
msgid "error writing superblock"
msgstr "写超级块出错"
-#: disk-utils/mkfs.bfs.c:283
+#: disk-utils/mkfs.bfs.c:277
msgid "error writing root inode"
msgstr "写 根 inode 出错"
-#: disk-utils/mkfs.bfs.c:288
+#: disk-utils/mkfs.bfs.c:282
msgid "error writing inode"
msgstr "写 inode 出错"
-#: disk-utils/mkfs.bfs.c:291
+#: disk-utils/mkfs.bfs.c:285
msgid "seek error"
msgstr "定位出错"
-#: disk-utils/mkfs.bfs.c:297
+#: disk-utils/mkfs.bfs.c:291
msgid "error writing . entry"
msgstr "写 . 记录出错"
-#: disk-utils/mkfs.bfs.c:301
+#: disk-utils/mkfs.bfs.c:295
msgid "error writing .. entry"
msgstr "写 .. 记录出错"
-#: disk-utils/mkfs.bfs.c:304
+#: disk-utils/mkfs.bfs.c:298
#, c-format
msgid "error closing %s"
msgstr "关闭 %s 出错"
@@ -2862,9 +2869,9 @@ msgstr ""
" -V, --verbose 解释正在进行的操作;\n"
" 多次指定 -V 将导致空运行(dry-run)\n"
-#: disk-utils/mkfs.c:139 include/c.h:233 login-utils/su-common.c:1519
-#: login-utils/sulogin.c:792 login-utils/sulogin.c:796 sys-utils/flock.c:121
-#: sys-utils/rtcwake.c:595 term-utils/script.c:692
+#: disk-utils/mkfs.c:133 include/c.h:239 login-utils/su-common.c:1519
+#: login-utils/sulogin.c:792 login-utils/sulogin.c:796 sys-utils/flock.c:123
+#: sys-utils/rtcwake.c:605 term-utils/script.c:692
#, c-format
msgid "failed to execute %s"
msgstr "执行 %s 失败"
@@ -2938,79 +2945,79 @@ msgstr "无效的修订版本号参数"
msgid "invalid endianness given; must be 'big', 'little', or 'host'"
msgstr "给定的大小端无效。必须为“big”、“little”或“host”"
-#: disk-utils/mkfs.cramfs.c:818
+#: disk-utils/mkfs.cramfs.c:817
#, c-format
msgid "warning: guestimate of required size (upper bound) is %lldMB, but maximum image size is %uMB. We might die prematurely."
msgstr "警告:估计需要的大小(上限)为 %lldMB,但最大镜像大小为 %uMB。程序可能提前终止(die)。"
-#: disk-utils/mkfs.cramfs.c:842
+#: disk-utils/mkfs.cramfs.c:841
msgid "ROM image map"
msgstr "ROM 镜像映射"
-#: disk-utils/mkfs.cramfs.c:854
+#: disk-utils/mkfs.cramfs.c:853
#, c-format
msgid "Including: %s\n"
msgstr "包含:%s\n"
-#: disk-utils/mkfs.cramfs.c:860
+#: disk-utils/mkfs.cramfs.c:859
#, c-format
msgid "Directory data: %zd bytes\n"
msgstr "目录数据:%zd 字节\n"
-#: disk-utils/mkfs.cramfs.c:868
+#: disk-utils/mkfs.cramfs.c:867
#, c-format
msgid "Everything: %zd kilobytes\n"
msgstr "全部:%zd KB\n"
-#: disk-utils/mkfs.cramfs.c:873
+#: disk-utils/mkfs.cramfs.c:872
#, c-format
msgid "Super block: %zd bytes\n"
msgstr "超级块:%zd 字节\n"
-#: disk-utils/mkfs.cramfs.c:880
+#: disk-utils/mkfs.cramfs.c:879
#, c-format
msgid "CRC: %x\n"
msgstr "CRC:%x\n"
-#: disk-utils/mkfs.cramfs.c:885
+#: disk-utils/mkfs.cramfs.c:884
#, c-format
msgid "not enough space allocated for ROM image (%lld allocated, %zu used)"
msgstr "为 ROM 镜像分配的空间不足(已分配 %lld,已使用 %zu)"
-#: disk-utils/mkfs.cramfs.c:891
+#: disk-utils/mkfs.cramfs.c:890
#, c-format
msgid "ROM image write failed (%zd %zd)"
msgstr "写 ROM 镜像失败(%zd %zd)"
-#: disk-utils/mkfs.cramfs.c:894
+#: disk-utils/mkfs.cramfs.c:893
msgid "ROM image"
msgstr "ROM 镜像"
-#: disk-utils/mkfs.cramfs.c:903
+#: disk-utils/mkfs.cramfs.c:902
#, c-format
msgid "warning: filenames truncated to %u bytes."
msgstr "警告:文件名被截短为 %u 个字节。"
-#: disk-utils/mkfs.cramfs.c:905
+#: disk-utils/mkfs.cramfs.c:904
msgid "warning: files were skipped due to errors."
msgstr "警告:由于错误,文件被跳过。"
-#: disk-utils/mkfs.cramfs.c:907
+#: disk-utils/mkfs.cramfs.c:906
#, c-format
msgid "warning: file sizes truncated to %luMB (minus 1 byte)."
msgstr "警告:文件大小被截短为 %luMB(减 1 字节)。"
-#: disk-utils/mkfs.cramfs.c:911
+#: disk-utils/mkfs.cramfs.c:910
#, c-format
msgid "warning: uids truncated to %u bits. (This may be a security concern.)"
msgstr "警告:uid 被截短为 %u 位。(可能有安全隐患。)"
-#: disk-utils/mkfs.cramfs.c:914
+#: disk-utils/mkfs.cramfs.c:913
#, c-format
msgid "warning: gids truncated to %u bits. (This may be a security concern.)"
msgstr "警告:gid 被截短为 %u 位。(可能有安全隐患。)"
-#: disk-utils/mkfs.cramfs.c:917
+#: disk-utils/mkfs.cramfs.c:916
#, c-format
msgid ""
"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
@@ -3224,11 +3231,11 @@ msgstr "解析文件名最大长度失败"
msgid "failed to parse number of inodes"
msgstr "解析 inode 数 失败"
-#: disk-utils/mkfs.minix.c:810
+#: disk-utils/mkfs.minix.c:809
msgid "failed to parse number of blocks"
msgstr "解析块数失败"
-#: disk-utils/mkfs.minix.c:818
+#: disk-utils/mkfs.minix.c:817
#, c-format
msgid "%s is mounted; will not make a filesystem here!"
msgstr "%s 已挂载;将不会在此创建文件系统!"
@@ -3380,79 +3387,79 @@ msgstr "不支持 swapspace 版本 %d"
msgid "warning: ignoring -U (UUIDs are unsupported by %s)"
msgstr "警告:将忽略 -U 选项(%s 不支持 UUID)"
-#: disk-utils/mkswap.c:417
+#: disk-utils/mkswap.c:416
msgid "only one device argument is currently supported"
msgstr "当前只支持一个设备参数"
-#: disk-utils/mkswap.c:424
+#: disk-utils/mkswap.c:423
msgid "error: parsing UUID failed"
msgstr "错误:解析 UUID 失败"
-#: disk-utils/mkswap.c:433
+#: disk-utils/mkswap.c:432
msgid "error: Nowhere to set up swap on?"
msgstr "错误:没有设置交换空间的地方?"
-#: disk-utils/mkswap.c:439
+#: disk-utils/mkswap.c:438
msgid "invalid block count argument"
msgstr "无效的 块计数 参数"
-#: disk-utils/mkswap.c:448
+#: disk-utils/mkswap.c:447
#, c-format
msgid "error: size %llu KiB is larger than device size %<PRIu64> KiB"
msgstr "错误:尺寸 %llu KiB 大于设备尺寸 %<PRIu64> KiB"
-#: disk-utils/mkswap.c:454
+#: disk-utils/mkswap.c:453
#, c-format
msgid "error: swap area needs to be at least %ld KiB"
msgstr "错误:交换区至少需要 %ld KiB"
-#: disk-utils/mkswap.c:459
+#: disk-utils/mkswap.c:458
#, c-format
msgid "warning: truncating swap area to %llu KiB"
msgstr "警告:将把交换区截短为 %llu KiB"
-#: disk-utils/mkswap.c:464
+#: disk-utils/mkswap.c:463
#, c-format
msgid "error: %s is mounted; will not make swapspace"
msgstr "错误:%s 已挂载;将不会创建交换空间"
-#: disk-utils/mkswap.c:471 sys-utils/swapon.c:529
+#: disk-utils/mkswap.c:470 sys-utils/swapon.c:529
#, c-format
msgid "%s: insecure permissions %04o, %04o suggested."
msgstr "%s:不安全的权限 %04o,建议使用 %04o。"
-#: disk-utils/mkswap.c:475 sys-utils/swapon.c:534
+#: disk-utils/mkswap.c:474 sys-utils/swapon.c:534
#, c-format
msgid "%s: insecure file owner %d, 0 (root) suggested."
msgstr "%s:不安全的文件拥有者 %d,建议使用 0(root)。"
-#: disk-utils/mkswap.c:490
+#: disk-utils/mkswap.c:489
msgid "Unable to set up swap-space: unreadable"
msgstr "无法设置交换空间:不可读"
-#: disk-utils/mkswap.c:495
+#: disk-utils/mkswap.c:494
#, c-format
msgid "Setting up swapspace version %d, size = %s (%<PRIu64> bytes)\n"
msgstr "正在设置交换空间版本 %d,大小 = %s (%<PRIu64> 个字节)\n"
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:514
#, c-format
msgid "%s: unable to obtain selinux file label"
msgstr "%s:无法获得 selinux 文件标签"
-#: disk-utils/mkswap.c:518
+#: disk-utils/mkswap.c:517
msgid "unable to matchpathcon()"
msgstr "无法执行 matchpathcon()"
-#: disk-utils/mkswap.c:521
+#: disk-utils/mkswap.c:520
msgid "unable to create new selinux context"
msgstr "无法创建新的 selinux 环境(context)"
-#: disk-utils/mkswap.c:523
+#: disk-utils/mkswap.c:522
msgid "couldn't compute selinux context"
msgstr "无法计算 selinux 环境(context)"
-#: disk-utils/mkswap.c:529
+#: disk-utils/mkswap.c:528
#, c-format
msgid "unable to relabel %s to %s"
msgstr "无法将 %s 标签改为 %s"
@@ -3481,7 +3488,7 @@ msgstr "易读形式的大小"
msgid "partition name"
msgstr "分区名"
-#: disk-utils/partx.c:92 misc-utils/findmnt.c:108 misc-utils/lsblk.c:172
+#: disk-utils/partx.c:92 misc-utils/findmnt.c:108 misc-utils/lsblk.c:171
msgid "partition UUID"
msgstr "分区 UUID"
@@ -3489,7 +3496,7 @@ msgstr "分区 UUID"
msgid "partition table type (dos, gpt, ...)"
msgstr "分区表类型(dos、gpt、...)"
-#: disk-utils/partx.c:94 misc-utils/lsblk.c:173
+#: disk-utils/partx.c:94 misc-utils/lsblk.c:172
msgid "partition flags"
msgstr "分区标志"
@@ -3497,7 +3504,7 @@ msgstr "分区标志"
msgid "partition type (a string, a UUID, or hex)"
msgstr "分区类型(字符串,UUID 或十六进制数)"
-#: disk-utils/partx.c:114 sys-utils/losetup.c:530 sys-utils/losetup.c:641
+#: disk-utils/partx.c:114 sys-utils/losetup.c:534 sys-utils/losetup.c:648
msgid "failed to initialize loopcxt"
msgstr "初始化 loopcxt 失败"
@@ -3516,17 +3523,18 @@ msgstr "尝试将“%s”用作回环设备\n"
msgid "%s: failed to set backing file"
msgstr "%s:设置后备文件失败"
-#: disk-utils/partx.c:131 sys-utils/losetup.c:574
+#: disk-utils/partx.c:131 sys-utils/losetup.c:581
#, c-format
msgid "%s: failed to set up loop device"
msgstr "%s:设置回环设备失败"
#: disk-utils/partx.c:161 login-utils/lslogins.c:311 misc-utils/fincore.c:92
-#: misc-utils/findmnt.c:376 misc-utils/lsblk.c:306 misc-utils/lslocks.c:344
+#: misc-utils/findmnt.c:376 misc-utils/lsblk.c:311 misc-utils/lslocks.c:344
#: misc-utils/uuidparse.c:125 misc-utils/wipefs.c:131 sys-utils/losetup.c:112
-#: sys-utils/lscpu.c:209 sys-utils/lsipc.c:232 sys-utils/lsmem.c:178
-#: sys-utils/lsns.c:223 sys-utils/prlimit.c:277 sys-utils/rfkill.c:159
-#: sys-utils/swapon.c:150 sys-utils/wdctl.c:151 sys-utils/zramctl.c:147
+#: sys-utils/lscpu.c:235 sys-utils/lscpu.c:250 sys-utils/lsipc.c:232
+#: sys-utils/lsmem.c:178 sys-utils/lsns.c:223 sys-utils/prlimit.c:277
+#: sys-utils/rfkill.c:159 sys-utils/swapon.c:150 sys-utils/wdctl.c:151
+#: sys-utils/zramctl.c:147
#, c-format
msgid "unknown column: %s"
msgstr "未知列: %s"
@@ -3622,10 +3630,10 @@ msgid "#%2d: %9ju-%9ju (%9ju sector, %6ju MB)\n"
msgid_plural "#%2d: %9ju-%9ju (%9ju sectors, %6ju MB)\n"
msgstr[0] "#%2d:%9ju-%9ju (%9ju 扇区%6ju MB)\n"
-#: disk-utils/partx.c:679 misc-utils/fincore.c:375 misc-utils/findmnt.c:1653
-#: misc-utils/lsblk.c:1757 misc-utils/lslocks.c:471 sys-utils/losetup.c:339
-#: sys-utils/lscpu.c:1605 sys-utils/prlimit.c:306 sys-utils/rfkill.c:471
-#: sys-utils/swapon.c:293 sys-utils/wdctl.c:271
+#: disk-utils/partx.c:679 misc-utils/fincore.c:374 misc-utils/findmnt.c:1652
+#: misc-utils/lsblk.c:2052 misc-utils/lslocks.c:471 sys-utils/losetup.c:339
+#: sys-utils/lscpu.c:1641 sys-utils/lscpu.c:1830 sys-utils/prlimit.c:306
+#: sys-utils/rfkill.c:471 sys-utils/swapon.c:293 sys-utils/wdctl.c:271
#, fuzzy
msgid "failed to allocate output column"
msgstr "分配输出行失败"
@@ -3679,7 +3687,7 @@ msgstr ""
" -s, --show 列出分区\n"
"\n"
-#: disk-utils/partx.c:765 misc-utils/lsblk.c:1454 sys-utils/lsmem.c:503
+#: disk-utils/partx.c:765 misc-utils/lsblk.c:1713 sys-utils/lsmem.c:503
msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
@@ -3700,11 +3708,11 @@ msgstr " -o, --output <列表> 定义使用哪个输出列\n"
msgid " --output-all output all columns\n"
msgstr " -O, --output-all 输出所有列\n"
-#: disk-utils/partx.c:770 misc-utils/lsblk.c:1470 sys-utils/lsmem.c:501
+#: disk-utils/partx.c:770 misc-utils/lsblk.c:1709 sys-utils/lsmem.c:501
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs 使用 key=“value” 输出格式\n"
-#: disk-utils/partx.c:771 misc-utils/lsblk.c:1471 sys-utils/lsmem.c:507
+#: disk-utils/partx.c:771 misc-utils/lsblk.c:1724 sys-utils/lsmem.c:507
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
@@ -3731,30 +3739,30 @@ msgstr " -v, --verbose 详尽模式\n"
msgid "failed to parse --nr <M-N> range"
msgstr "解析 --nr <M-N> 范围失败"
-#: disk-utils/partx.c:950
+#: disk-utils/partx.c:949
msgid "partition and disk name do not match"
msgstr "分区和磁盘名不符"
-#: disk-utils/partx.c:979
+#: disk-utils/partx.c:978
msgid "--nr and <partition> are mutually exclusive"
msgstr "--nr 和 <分区> 相互排斥"
-#: disk-utils/partx.c:998
+#: disk-utils/partx.c:997
#, c-format
msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
msgstr "分区:%s,磁盘:%s,从分区:%d,到分区:%d\n"
-#: disk-utils/partx.c:1010
+#: disk-utils/partx.c:1009
#, c-format
msgid "%s: cannot delete partitions"
msgstr "%s:不能删除分区"
-#: disk-utils/partx.c:1013
+#: disk-utils/partx.c:1012
#, c-format
msgid "%s: partitioned loop devices unsupported"
msgstr "%s:不支持已分区的回环设备"
-#: disk-utils/partx.c:1030
+#: disk-utils/partx.c:1029
#, c-format
msgid "%s: failed to initialize blkid prober"
msgstr "%s:初始化 blkid 探针失败"
@@ -3784,56 +3792,56 @@ msgstr " -q, --query 设置查询模式\n"
msgid " -a, --all query all raw devices\n"
msgstr " -a, --all 查询所有 raw 设备\n"
-#: disk-utils/raw.c:167
+#: disk-utils/raw.c:166
#, c-format
msgid "Device '%s' is the control raw device (use raw<N> where <N> is greater than zero)"
msgstr "设备“%s”是控制原生设备(请使用 raw<N>,其中 <N> 大于 0)"
-#: disk-utils/raw.c:184
+#: disk-utils/raw.c:183
#, c-format
msgid "Cannot locate block device '%s'"
msgstr "无法定位块设备“%s”"
-#: disk-utils/raw.c:187
+#: disk-utils/raw.c:186
#, c-format
msgid "Device '%s' is not a block device"
msgstr "设备“%s”不是块设备"
-#: disk-utils/raw.c:196 disk-utils/raw.c:199 sys-utils/ipcrm.c:352
+#: disk-utils/raw.c:195 disk-utils/raw.c:198 sys-utils/ipcrm.c:352
#: sys-utils/ipcrm.c:366 sys-utils/ipcrm.c:380
msgid "failed to parse argument"
msgstr "解析参数失败"
-#: disk-utils/raw.c:217
+#: disk-utils/raw.c:216
#, c-format
msgid "Cannot open master raw device '%s'"
msgstr "无法打开主 Raw 设备“%s”"
-#: disk-utils/raw.c:232
+#: disk-utils/raw.c:231
#, c-format
msgid "Cannot locate raw device '%s'"
msgstr "无法定位 raw 设备“%s”"
-#: disk-utils/raw.c:235
+#: disk-utils/raw.c:234
#, c-format
msgid "Raw device '%s' is not a character dev"
msgstr "设备“%s”不是字符设备"
-#: disk-utils/raw.c:239
+#: disk-utils/raw.c:238
#, c-format
msgid "Device '%s' is not a raw dev"
msgstr "设备“%s”不是 raw 设备"
-#: disk-utils/raw.c:249
+#: disk-utils/raw.c:248
msgid "Error querying raw device"
msgstr "查询原生(raw)设备失败"
-#: disk-utils/raw.c:258 disk-utils/raw.c:273
+#: disk-utils/raw.c:257 disk-utils/raw.c:272
#, c-format
msgid "%sraw%d: bound to major %d, minor %d\n"
msgstr "%sraw%d:绑定到主设备号 %d, 次设备号 %d\n"
-#: disk-utils/raw.c:272
+#: disk-utils/raw.c:271
msgid "Error setting raw device"
msgstr "设置原生(raw)设备出错"
@@ -3846,107 +3854,107 @@ msgstr " %s <磁盘设备> <分区号> <长度>\n"
msgid "Tell the kernel about the new size of a partition.\n"
msgstr "告诉内核分区的新尺寸。\n"
-#: disk-utils/resizepart.c:108
+#: disk-utils/resizepart.c:107
#, c-format
msgid "%s: failed to get start of the partition number %s"
msgstr "%s:获取分区号 %s 的起点失败"
-#: disk-utils/resizepart.c:113
+#: disk-utils/resizepart.c:112
msgid "failed to resize partition"
msgstr "调整分区大小失败"
-#: disk-utils/sfdisk.c:232
+#: disk-utils/sfdisk.c:234
msgid "failed to allocate nested libfdisk context"
msgstr "分配嵌套 libfdisk 环境(context)失败"
-#: disk-utils/sfdisk.c:292
+#: disk-utils/sfdisk.c:294
#, c-format
msgid "cannot seek %s"
msgstr "无法定位 %s"
-#: disk-utils/sfdisk.c:303 libfdisk/src/bsd.c:723 libfdisk/src/bsd.c:897
+#: disk-utils/sfdisk.c:305 libfdisk/src/bsd.c:723 libfdisk/src/bsd.c:897
#, c-format
msgid "cannot write %s"
msgstr "无法写 %s"
-#: disk-utils/sfdisk.c:310
+#: disk-utils/sfdisk.c:312
#, c-format
msgid "%12s (offset %5ju, size %5ju): %s"
msgstr "%12s (偏移 %5ju, 大小 %5ju): %s"
-#: disk-utils/sfdisk.c:316
+#: disk-utils/sfdisk.c:318
#, c-format
msgid "%s: failed to create a backup"
msgstr "%s:创建备份失败"
-#: disk-utils/sfdisk.c:329
+#: disk-utils/sfdisk.c:331
msgid "failed to create a backup file, $HOME undefined"
msgstr "创建备份失败,未定义 $HOME"
-#: disk-utils/sfdisk.c:355
+#: disk-utils/sfdisk.c:357
msgid "Backup files:"
msgstr "备份文件:"
-#: disk-utils/sfdisk.c:380
+#: disk-utils/sfdisk.c:382
msgid "failed to read new partition from device; ignoring --move-data"
msgstr "从设备读取新分区失败;将忽略 --move-data"
-#: disk-utils/sfdisk.c:382
+#: disk-utils/sfdisk.c:384
msgid "failed to get size of the new partition; ignoring --move-data"
msgstr "获取新分区大小失败,将忽略 --move-data"
-#: disk-utils/sfdisk.c:384
+#: disk-utils/sfdisk.c:386
msgid "failed to get start of the new partition; ignoring --move-data"
msgstr "获取新分区起点失败,将忽略 --move-data"
-#: disk-utils/sfdisk.c:386
+#: disk-utils/sfdisk.c:388
msgid "failed to get size of the old partition; ignoring --move-data"
msgstr "获取新分区大小失败,将忽略 --move-data"
-#: disk-utils/sfdisk.c:388
+#: disk-utils/sfdisk.c:390
msgid "failed to get start of the old partition; ignoring --move-data"
msgstr "获取旧分区起点失败,将忽略 --move-data"
-#: disk-utils/sfdisk.c:390
+#: disk-utils/sfdisk.c:392
msgid "start of the partition has not been moved; ignoring --move-data"
msgstr "分区起点未移动;将忽略 --move-data"
-#: disk-utils/sfdisk.c:392
+#: disk-utils/sfdisk.c:394
msgid "new partition is smaller than original; ignoring --move-data"
msgstr "新分区小于原分区;将忽略 --move-data"
-#: disk-utils/sfdisk.c:442
+#: disk-utils/sfdisk.c:444
msgid "Data move:"
msgstr "数据移动︰"
-#: disk-utils/sfdisk.c:444
+#: disk-utils/sfdisk.c:446
#, c-format
msgid " typescript file: %s"
msgstr "typescript 文件:%s"
-#: disk-utils/sfdisk.c:445
+#: disk-utils/sfdisk.c:447
#, c-format
msgid " old start: %ju, new start: %ju (move %ju sectors)\n"
msgstr " 原起点:%ju,新起点:%ju (移动 %ju 个扇区)\n"
-#: disk-utils/sfdisk.c:452
+#: disk-utils/sfdisk.c:454
msgid "Do you want to move partition data?"
msgstr "您想移动分区数据吗?"
-#: disk-utils/sfdisk.c:454 disk-utils/sfdisk.c:1819
+#: disk-utils/sfdisk.c:456 disk-utils/sfdisk.c:1821
msgid "Leaving."
msgstr "离开中。"
-#: disk-utils/sfdisk.c:527
+#: disk-utils/sfdisk.c:529
#, c-format
msgid "%s: failed to move data"
msgstr "%s:移动数据失败"
-#: disk-utils/sfdisk.c:542
+#: disk-utils/sfdisk.c:544
msgid "The partition table is unchanged (--no-act)."
msgstr "分区表未更改(--no-act)。"
-#: disk-utils/sfdisk.c:548
+#: disk-utils/sfdisk.c:550
msgid ""
"\n"
"The partition table has been altered."
@@ -3954,12 +3962,12 @@ msgstr ""
"\n"
"分区表已调整。"
-#: disk-utils/sfdisk.c:631
+#: disk-utils/sfdisk.c:633
#, c-format
msgid "unsupported label '%s'"
msgstr "不支持的标签:“%s”"
-#: disk-utils/sfdisk.c:634
+#: disk-utils/sfdisk.c:636
msgid ""
"Id Name\n"
"\n"
@@ -3967,181 +3975,181 @@ msgstr ""
"Id 名称\n"
"\n"
-#: disk-utils/sfdisk.c:664
+#: disk-utils/sfdisk.c:666
msgid "unrecognized partition table type"
msgstr "未识别的分区表类型"
-#: disk-utils/sfdisk.c:717
+#: disk-utils/sfdisk.c:719
#, c-format
msgid "Cannot get size of %s"
msgstr "无法获得 %s 的大小"
-#: disk-utils/sfdisk.c:754
+#: disk-utils/sfdisk.c:756
#, c-format
msgid "total: %ju blocks\n"
msgstr "共计:%ju 个块\n"
-#: disk-utils/sfdisk.c:816 disk-utils/sfdisk.c:899 disk-utils/sfdisk.c:940
-#: disk-utils/sfdisk.c:970 disk-utils/sfdisk.c:1037 disk-utils/sfdisk.c:1101
-#: disk-utils/sfdisk.c:1156 disk-utils/sfdisk.c:1212 disk-utils/sfdisk.c:1566
+#: disk-utils/sfdisk.c:818 disk-utils/sfdisk.c:901 disk-utils/sfdisk.c:942
+#: disk-utils/sfdisk.c:972 disk-utils/sfdisk.c:1039 disk-utils/sfdisk.c:1103
+#: disk-utils/sfdisk.c:1158 disk-utils/sfdisk.c:1214 disk-utils/sfdisk.c:1568
msgid "no disk device specified"
msgstr "未指定磁盘设备"
-#: disk-utils/sfdisk.c:828
+#: disk-utils/sfdisk.c:830
#, fuzzy
msgid "toggle boot flags is unsupported for Hybrid GPT/MBR"
msgstr "开/关启动标志 只支持 MBR"
-#: disk-utils/sfdisk.c:833
+#: disk-utils/sfdisk.c:835
#, fuzzy
msgid "cannot switch to PMBR"
msgstr "无法 stat %s"
-#: disk-utils/sfdisk.c:834
+#: disk-utils/sfdisk.c:836
msgid "Activation is unsupported for GPT -- entering nested PMBR."
msgstr ""
-#: disk-utils/sfdisk.c:837
+#: disk-utils/sfdisk.c:839
#, fuzzy
msgid "toggle boot flags is supported for MBR or PMBR only"
msgstr "开/关启动标志 只支持 MBR"
-#: disk-utils/sfdisk.c:872 disk-utils/sfdisk.c:919 disk-utils/sfdisk.c:1042
-#: disk-utils/sfdisk.c:1106 disk-utils/sfdisk.c:1161 disk-utils/sfdisk.c:1217
-#: disk-utils/sfdisk.c:1564 disk-utils/sfdisk.c:2061
+#: disk-utils/sfdisk.c:874 disk-utils/sfdisk.c:921 disk-utils/sfdisk.c:1044
+#: disk-utils/sfdisk.c:1108 disk-utils/sfdisk.c:1163 disk-utils/sfdisk.c:1219
+#: disk-utils/sfdisk.c:1566 disk-utils/sfdisk.c:2063
msgid "failed to parse partition number"
msgstr "解析分区号失败"
-#: disk-utils/sfdisk.c:877
+#: disk-utils/sfdisk.c:879
#, c-format
msgid "%s: partition %d: failed to toggle bootable flag"
msgstr "%s:分区 %d:开/关启动标志失败"
-#: disk-utils/sfdisk.c:914 disk-utils/sfdisk.c:922
+#: disk-utils/sfdisk.c:916 disk-utils/sfdisk.c:924
#, c-format
msgid "%s: partition %zu: failed to delete"
msgstr "%s:分区 %zu:删除失败"
-#: disk-utils/sfdisk.c:977
+#: disk-utils/sfdisk.c:979
#, fuzzy, c-format
msgid "%s: does not contain a recognized partition table"
msgstr "设备不包含可识别的分区表。"
-#: disk-utils/sfdisk.c:981
+#: disk-utils/sfdisk.c:983
msgid "failed to allocate dump struct"
msgstr "分配转储结构失败"
-#: disk-utils/sfdisk.c:985
+#: disk-utils/sfdisk.c:987
#, fuzzy, c-format
msgid "%s: failed to dump partition table"
msgstr "转储分区表失败"
-#: disk-utils/sfdisk.c:1015
+#: disk-utils/sfdisk.c:1017
#, c-format
msgid "%s: no partition table found"
msgstr "%s:找不到分区表"
-#: disk-utils/sfdisk.c:1019
+#: disk-utils/sfdisk.c:1021
#, c-format
msgid "%s: partition %zu: partition table contains only %zu partitions"
msgstr "%s:分区 %zu:分区表中只包含 %zu 个分区"
-#: disk-utils/sfdisk.c:1022
+#: disk-utils/sfdisk.c:1024
#, c-format
msgid "%s: partition %zu: partition is unused"
msgstr "%s: 分区 %zu: 分区未使用"
-#: disk-utils/sfdisk.c:1041 disk-utils/sfdisk.c:1105 disk-utils/sfdisk.c:1160
-#: disk-utils/sfdisk.c:1216
+#: disk-utils/sfdisk.c:1043 disk-utils/sfdisk.c:1107 disk-utils/sfdisk.c:1162
+#: disk-utils/sfdisk.c:1218
msgid "no partition number specified"
msgstr "未指定分区号"
-#: disk-utils/sfdisk.c:1047 disk-utils/sfdisk.c:1111 disk-utils/sfdisk.c:1166
-#: disk-utils/sfdisk.c:1222 sys-utils/losetup.c:772
+#: disk-utils/sfdisk.c:1049 disk-utils/sfdisk.c:1113 disk-utils/sfdisk.c:1168
+#: disk-utils/sfdisk.c:1224 sys-utils/losetup.c:778
msgid "unexpected arguments"
msgstr "参数异常"
-#: disk-utils/sfdisk.c:1062
+#: disk-utils/sfdisk.c:1064
#, c-format
msgid "%s: partition %zu: failed to get partition type"
msgstr "%s: 分区 %zu:获取分区类型失败"
-#: disk-utils/sfdisk.c:1081
+#: disk-utils/sfdisk.c:1083
#, c-format
msgid "failed to parse %s partition type '%s'"
msgstr "解析 %s 的分区类型“%s”失败"
-#: disk-utils/sfdisk.c:1085
+#: disk-utils/sfdisk.c:1087
#, c-format
msgid "%s: partition %zu: failed to set partition type"
msgstr "%s: 分区 %zu: 设置分区类型失败"
-#: disk-utils/sfdisk.c:1123
+#: disk-utils/sfdisk.c:1125
#, c-format
msgid "%s: partition %zu: failed to get partition UUID"
msgstr "%s: 分区 %zu: 获取分区 UUID 失败"
-#: disk-utils/sfdisk.c:1136 disk-utils/sfdisk.c:1191 disk-utils/sfdisk.c:1245
+#: disk-utils/sfdisk.c:1138 disk-utils/sfdisk.c:1193 disk-utils/sfdisk.c:1247
msgid "failed to allocate partition object"
msgstr "分配分区对象失败"
-#: disk-utils/sfdisk.c:1140
+#: disk-utils/sfdisk.c:1142
#, c-format
msgid "%s: partition %zu: failed to set partition UUID"
msgstr "%s: 分区 %zu: 设置分区 UUID 失败"
-#: disk-utils/sfdisk.c:1178
+#: disk-utils/sfdisk.c:1180
#, c-format
msgid "%s: partition %zu: failed to get partition name"
msgstr "%s: 分区 %zu: 获取分区名失败"
-#: disk-utils/sfdisk.c:1195
+#: disk-utils/sfdisk.c:1197
#, c-format
msgid "%s: partition %zu: failed to set partition name"
msgstr "%s: 分区 %zu: 设置分区名失败"
-#: disk-utils/sfdisk.c:1249
+#: disk-utils/sfdisk.c:1251
#, c-format
msgid "%s: partition %zu: failed to set partition attributes"
msgstr "%s: 分区 %zu: 设置分区属性失败"
-#: disk-utils/sfdisk.c:1292
+#: disk-utils/sfdisk.c:1294
msgid " Commands:\n"
msgstr " 命令:\n"
-#: disk-utils/sfdisk.c:1294
+#: disk-utils/sfdisk.c:1296
msgid " write write table to disk and exit\n"
msgstr " write 将分区表写入磁盘并退出\n"
-#: disk-utils/sfdisk.c:1295
+#: disk-utils/sfdisk.c:1297
msgid " quit show new situation and wait for user's feedback before write\n"
msgstr " quit 显示新状况并等待用户反馈后再写入\n"
-#: disk-utils/sfdisk.c:1296
+#: disk-utils/sfdisk.c:1298
msgid " abort exit sfdisk shell\n"
msgstr " abort 退出 sfdisk shell\n"
-#: disk-utils/sfdisk.c:1297
+#: disk-utils/sfdisk.c:1299
msgid " print display the partition table\n"
msgstr " print 显示分区表\n"
-#: disk-utils/sfdisk.c:1298
+#: disk-utils/sfdisk.c:1300
msgid " help show this help text\n"
msgstr " help 显示帮助并退出\n"
-#: disk-utils/sfdisk.c:1300
+#: disk-utils/sfdisk.c:1302
msgid " Ctrl-D the same as 'quit'\n"
msgstr " Ctrl-D 同“quit”\n"
-#: disk-utils/sfdisk.c:1304
+#: disk-utils/sfdisk.c:1306
msgid " Input format:\n"
msgstr " 输入格式:\n"
-#: disk-utils/sfdisk.c:1306
+#: disk-utils/sfdisk.c:1308
msgid " <start>, <size>, <type>, <bootable>\n"
msgstr " <起点>, <大小>, <类型>, <可启动>\n"
-#: disk-utils/sfdisk.c:1309
+#: disk-utils/sfdisk.c:1311
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"
@@ -4151,7 +4159,7 @@ msgstr ""
" <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n"
" 默认为第一处可用空间。\n"
-#: disk-utils/sfdisk.c:1314
+#: disk-utils/sfdisk.c:1316
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"
@@ -4161,70 +4169,70 @@ msgstr ""
" <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n"
" 默认为所有可用空间。\n"
-#: disk-utils/sfdisk.c:1319
+#: disk-utils/sfdisk.c:1321
msgid " <type> The partition type. Default is a Linux data partition.\n"
msgstr " <类型> 分区类型。默认为 Linux 数据分区。\n"
-#: disk-utils/sfdisk.c:1320
+#: disk-utils/sfdisk.c:1322
#, fuzzy
msgid " MBR: hex or L,S,E,X,U,R,V shortcuts.\n"
msgstr " MBR:hex 或 L,S,E,X 快捷方式。\n"
-#: disk-utils/sfdisk.c:1321
+#: disk-utils/sfdisk.c:1323
#, fuzzy
msgid " GPT: UUID or L,S,H,U,R,V shortcuts.\n"
msgstr " GPT:UUID 或 L,S,H 快捷方式。\n"
-#: disk-utils/sfdisk.c:1324
+#: disk-utils/sfdisk.c:1326
msgid " <bootable> Use '*' to mark an MBR partition as bootable.\n"
msgstr " <可启动> 使用“*”将 MBR 分区标记为 可启动。\n"
-#: disk-utils/sfdisk.c:1328
+#: disk-utils/sfdisk.c:1330
msgid " Example:\n"
msgstr "示例:\n"
-#: disk-utils/sfdisk.c:1330
+#: disk-utils/sfdisk.c:1332
msgid " , 4G Creates a 4GiB partition at default start offset.\n"
msgstr " , 4G 在默认起始偏移位置创建一个 4GiB 分区。\n"
-#: disk-utils/sfdisk.c:1362 sys-utils/dmesg.c:1538
+#: disk-utils/sfdisk.c:1364 sys-utils/dmesg.c:1537
msgid "unsupported command"
msgstr "不支持的命令"
-#: disk-utils/sfdisk.c:1364
+#: disk-utils/sfdisk.c:1366
#, c-format
msgid "line %d: unsupported command"
msgstr "第 %d 行:不支持的命令"
-#: disk-utils/sfdisk.c:1485
+#: disk-utils/sfdisk.c:1487
#, 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."
msgstr "强烈建议您使用 wipefs(8)来擦除该设备,以避免潜在的冲突。"
-#: disk-utils/sfdisk.c:1533
+#: disk-utils/sfdisk.c:1535
msgid "failed to allocate partition name"
msgstr "分配分区名失败"
-#: disk-utils/sfdisk.c:1574
+#: disk-utils/sfdisk.c:1576
msgid "failed to allocate script handler"
msgstr "分配脚本处理程序失败"
-#: disk-utils/sfdisk.c:1590
+#: disk-utils/sfdisk.c:1592
#, c-format
msgid "%s: cannot modify partition %d: no partition table was found"
msgstr "%s:无法修改分区 %d:未找到分区表"
-#: disk-utils/sfdisk.c:1595
+#: disk-utils/sfdisk.c:1597
#, c-format
msgid "%s: cannot modify partition %d: partition table contains only %zu partitions"
msgstr "%s: 无法修改分区 %d: 分区表只包含 %zu 个分区"
-#: disk-utils/sfdisk.c:1601
+#: disk-utils/sfdisk.c:1603
#, c-format
msgid "warning: %s: partition %d is not defined yet"
msgstr "警告:%s: 分区 %d 尚未定义"
-#: disk-utils/sfdisk.c:1619
+#: disk-utils/sfdisk.c:1621
#, c-format
msgid ""
"\n"
@@ -4233,11 +4241,11 @@ msgstr ""
"\n"
"欢迎使用 sfdisk (%s)。"
-#: disk-utils/sfdisk.c:1627
+#: disk-utils/sfdisk.c:1629
msgid "Checking that no-one is using this disk right now ..."
msgstr "请检查现在是不是有人在使用此磁盘..."
-#: disk-utils/sfdisk.c:1630
+#: disk-utils/sfdisk.c:1632
msgid ""
" FAILED\n"
"\n"
@@ -4245,7 +4253,7 @@ msgstr ""
" 失败\n"
"\n"
-#: disk-utils/sfdisk.c:1633
+#: disk-utils/sfdisk.c:1635
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"
@@ -4255,11 +4263,11 @@ msgstr ""
"请卸载此磁盘上所有的文件系统,并关闭(swapoff)上面的交换分区。\n"
"可使用 --no-reread 标志阻止此检查。\n"
-#: disk-utils/sfdisk.c:1638
+#: disk-utils/sfdisk.c:1640
msgid "Use the --force flag to overrule all checks."
msgstr "使用 --force 标志否决所有检查。"
-#: disk-utils/sfdisk.c:1640
+#: disk-utils/sfdisk.c:1642
msgid ""
" OK\n"
"\n"
@@ -4267,7 +4275,7 @@ msgstr ""
" 好的\n"
"\n"
-#: disk-utils/sfdisk.c:1652
+#: disk-utils/sfdisk.c:1654
msgid ""
"\n"
"Old situation:"
@@ -4275,7 +4283,7 @@ msgstr ""
"\n"
"旧状况:"
-#: disk-utils/sfdisk.c:1670
+#: disk-utils/sfdisk.c:1672
#, c-format
msgid ""
"\n"
@@ -4287,7 +4295,7 @@ msgstr ""
"sfdisk 即将创建一个新的磁盘标签“%s”。\n"
"在定义第一个分区之前使用“label: <名字>”可覆盖默认值。"
-#: disk-utils/sfdisk.c:1673
+#: disk-utils/sfdisk.c:1675
msgid ""
"\n"
"Type 'help' to get more information.\n"
@@ -4295,32 +4303,32 @@ msgstr ""
"\n"
"请执行“%s --help”了解更多信息。\n"
-#: disk-utils/sfdisk.c:1691
+#: disk-utils/sfdisk.c:1693
msgid "All partitions used."
msgstr "所有分区均已使用。"
-#: disk-utils/sfdisk.c:1719
+#: disk-utils/sfdisk.c:1721
msgid "Done.\n"
msgstr "完成。\n"
-#: disk-utils/sfdisk.c:1731
+#: disk-utils/sfdisk.c:1733
msgid "Ignoring partition."
msgstr "忽略分区。"
-#: disk-utils/sfdisk.c:1740 disk-utils/sfdisk.c:1800
+#: disk-utils/sfdisk.c:1742 disk-utils/sfdisk.c:1802
msgid "Failed to apply script headers, disk label not created."
msgstr "无法应用脚本标头(header),未创建磁盘标签。"
-#: disk-utils/sfdisk.c:1759
+#: disk-utils/sfdisk.c:1761
#, fuzzy, c-format
msgid "Failed to add #%d partition"
msgstr "添加分区失败"
-#: disk-utils/sfdisk.c:1782
+#: disk-utils/sfdisk.c:1784
msgid "Script header accepted."
msgstr "已接受脚本标头(header)。"
-#: disk-utils/sfdisk.c:1807
+#: disk-utils/sfdisk.c:1809
msgid ""
"\n"
"New situation:"
@@ -4328,15 +4336,15 @@ msgstr ""
"\n"
"新状况:"
-#: disk-utils/sfdisk.c:1817
+#: disk-utils/sfdisk.c:1819
msgid "Do you want to write this to disk?"
msgstr "您想写入该磁盘吗?"
-#: disk-utils/sfdisk.c:1830
+#: disk-utils/sfdisk.c:1832
msgid "Leaving.\n"
msgstr "离开中。\n"
-#: disk-utils/sfdisk.c:1844
+#: disk-utils/sfdisk.c:1846
#, c-format
msgid ""
" %1$s [options] <dev> [[-N] <part>]\n"
@@ -4345,182 +4353,177 @@ msgstr ""
" %1$s [选项] <设备> [[-N] <分区>]\n"
" %1$s [选项] <命令>\n"
-#: disk-utils/sfdisk.c:1851
+#: disk-utils/sfdisk.c:1853
#, fuzzy
msgid " -A, --activate <dev> [<part> ...] list or set bootable (P)MBR partitions\n"
msgstr " -A, --activate <设备> [<分区> ...] 列出或设置可启动的 MBR 分区\n"
-#: disk-utils/sfdisk.c:1852
+#: disk-utils/sfdisk.c:1854
msgid " -d, --dump <dev> dump partition table (usable for later input)\n"
msgstr " -d, --dump <设备> 转储分区表(用于后续输入)\n"
-#: disk-utils/sfdisk.c:1853
+#: disk-utils/sfdisk.c:1855
msgid " -J, --json <dev> dump partition table in JSON format\n"
msgstr " -J, --json <设备> 以 JSON 格式转储分区表\n"
-#: disk-utils/sfdisk.c:1854
+#: disk-utils/sfdisk.c:1856
msgid " -g, --show-geometry [<dev> ...] list geometry of all or specified devices\n"
msgstr " -g, --show-geometry [<设备> ...] 列出所有或指定设备的几何属性\n"
-#: disk-utils/sfdisk.c:1855
+#: disk-utils/sfdisk.c:1857
msgid " -l, --list [<dev> ...] list partitions of each device\n"
msgstr " -l, --list [<设备> ...] 列出每台设备上的分区\n"
-#: disk-utils/sfdisk.c:1856
+#: disk-utils/sfdisk.c:1858
msgid " -F, --list-free [<dev> ...] list unpartitioned free areas of each device\n"
msgstr " -F, --list-free [<设备> ...] 列出每台设备上的未分区空间\n"
-#: disk-utils/sfdisk.c:1857
+#: disk-utils/sfdisk.c:1859
msgid " -r, --reorder <dev> fix partitions order (by start offset)\n"
msgstr " -r, --reorder <设备> (通过起始偏移量)修复分区顺序\n"
-#: disk-utils/sfdisk.c:1858
+#: disk-utils/sfdisk.c:1860
msgid " -s, --show-size [<dev> ...] list sizes of all or specified devices\n"
msgstr " -s, --show-size [<设备> ...] 列出所有或指定设备的大小\n"
-#: disk-utils/sfdisk.c:1859
+#: disk-utils/sfdisk.c:1861
msgid " -T, --list-types print the recognized types (see -X)\n"
msgstr " -T, --list-types 打印识别的类型(见 -X)\n"
-#: disk-utils/sfdisk.c:1860
+#: disk-utils/sfdisk.c:1862
msgid " -V, --verify [<dev> ...] test whether partitions seem correct\n"
msgstr " -V, --verify [<设备> ...] 测试分区是否正确\n"
-#: disk-utils/sfdisk.c:1861
+#: disk-utils/sfdisk.c:1863
msgid " --delete <dev> [<part> ...] delete all or specified partitions\n"
msgstr " --delete <设备> [<分区> ...] 删除所有或指定分区\n"
-#: disk-utils/sfdisk.c:1864
+#: disk-utils/sfdisk.c:1866
msgid " --part-label <dev> <part> [<str>] print or change partition label\n"
msgstr " --part-label <设备> <分区> [<字符串>] 打印或更改分区标签\n"
-#: disk-utils/sfdisk.c:1865
+#: disk-utils/sfdisk.c:1867
msgid " --part-type <dev> <part> [<type>] print or change partition type\n"
msgstr " --part-type <设备> <分区> [<类型>] 打印或更改分区类型\n"
-#: disk-utils/sfdisk.c:1866
+#: disk-utils/sfdisk.c:1868
msgid " --part-uuid <dev> <part> [<uuid>] print or change partition uuid\n"
msgstr " --part-uuid <设备> <分区> [<uuid>] 打印或更改分区 uuid\n"
-#: disk-utils/sfdisk.c:1867
+#: disk-utils/sfdisk.c:1869
msgid " --part-attrs <dev> <part> [<str>] print or change partition attributes\n"
msgstr " --part-attrs <设备> <分区> [<字符串>] 打印或更改分区属性\n"
-#: disk-utils/sfdisk.c:1870
+#: disk-utils/sfdisk.c:1872
msgid " <dev> device (usually disk) path\n"
msgstr " <设备> 设备(通常是磁盘)的路径\n"
-#: disk-utils/sfdisk.c:1871
+#: disk-utils/sfdisk.c:1873
msgid " <part> partition number\n"
msgstr " <分区> 分区号\n"
-#: disk-utils/sfdisk.c:1872
+#: disk-utils/sfdisk.c:1874
msgid " <type> partition type, GUID for GPT, hex for MBR\n"
msgstr " <类型> 分区类型,GUID 对应 GPT,hex 对应 MBR\n"
-#: disk-utils/sfdisk.c:1875
+#: disk-utils/sfdisk.c:1877
msgid " -a, --append append partitions to existing partition table\n"
msgstr " -a, --append 将分区附加到已有分区表\n"
-#: disk-utils/sfdisk.c:1876
+#: disk-utils/sfdisk.c:1878
msgid " -b, --backup backup partition table sectors (see -O)\n"
msgstr " -b, --backup 备份分区表扇区(见 -O)\n"
-#: disk-utils/sfdisk.c:1877
+#: disk-utils/sfdisk.c:1879
msgid " --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
-#: disk-utils/sfdisk.c:1878
+#: disk-utils/sfdisk.c:1880
msgid " --move-data[=<typescript>] move partition data after relocation (requires -N)\n"
msgstr " --move-data[=<typescript>] 重新定位后移动分区数据(需要 -N)\n"
-#: disk-utils/sfdisk.c:1879
+#: disk-utils/sfdisk.c:1881
msgid " -f, --force disable all consistency checking\n"
msgstr " -f, --force 禁用所有的一致性检查\n"
-#: disk-utils/sfdisk.c:1880
+#: disk-utils/sfdisk.c:1882
msgid " --color[=<when>] colorize output (auto, always or never)\n"
msgstr " --color[=<何时>] 彩色输出(auto,always 或 never)\n"
-#: disk-utils/sfdisk.c:1883
+#: disk-utils/sfdisk.c:1885
msgid " -N, --partno <num> specify partition number\n"
msgstr " -N, --partno <数字> 指定分区号\n"
-#: disk-utils/sfdisk.c:1884
+#: disk-utils/sfdisk.c:1886
msgid " -n, --no-act do everything except write to device\n"
msgstr " -n, --no-act 不真正执行写入设备\n"
-#: disk-utils/sfdisk.c:1885
+#: disk-utils/sfdisk.c:1887
msgid " --no-reread do not check whether the device is in use\n"
msgstr " --no-reread 不检查设备是否正在使用\n"
-#: disk-utils/sfdisk.c:1886
+#: disk-utils/sfdisk.c:1888
msgid " --no-tell-kernel do not tell kernel about changes\n"
msgstr " --no-tell-kernel 更改而不告诉内核\n"
-#: disk-utils/sfdisk.c:1887
+#: disk-utils/sfdisk.c:1889
msgid " -O, --backup-file <path> override default backup file name\n"
msgstr " -O, --backup-file <路径> 覆盖默认的备份文件名\n"
-#: disk-utils/sfdisk.c:1888
+#: disk-utils/sfdisk.c:1890
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: disk-utils/sfdisk.c:1889
+#: disk-utils/sfdisk.c:1891
msgid " -q, --quiet suppress extra info messages\n"
msgstr " -q, --quiet 禁止输出额外信息\n"
-#: disk-utils/sfdisk.c:1890
+#: disk-utils/sfdisk.c:1892
msgid " -w, --wipe <mode> wipe signatures (auto, always or never)\n"
msgstr " -w, --wipe <模式> 擦除签名(auto, always 或 never)\n"
-#: disk-utils/sfdisk.c:1892
+#: disk-utils/sfdisk.c:1894
msgid " -X, --label <name> specify label type (dos, gpt, ...)\n"
msgstr " -X, --label <名称> 指定标签类型(dos, gpt, ...)\n"
-#: disk-utils/sfdisk.c:1893
+#: disk-utils/sfdisk.c:1895
msgid " -Y, --label-nested <name> specify nested label type (dos, bsd)\n"
msgstr " -Y, --label-nested <名称> 指定嵌套标签类型(dos, bsd)\n"
-#: disk-utils/sfdisk.c:1895
+#: disk-utils/sfdisk.c:1897
msgid " -G, --show-pt-geometry deprecated, alias to --show-geometry\n"
msgstr " -G, --show-pt-geometry 已废弃,同 --show-geometry\n"
-#: disk-utils/sfdisk.c:1896
+#: disk-utils/sfdisk.c:1898
msgid " -L, --Linux deprecated, only for backward compatibility\n"
msgstr " -L, --Linux 已废弃,仅为向后兼容\n"
-#: disk-utils/sfdisk.c:1897
+#: disk-utils/sfdisk.c:1899
msgid " -u, --unit S deprecated, only sector unit is supported\n"
msgstr " -u, --unit S 已废弃,只支持扇区单位\n"
-#: disk-utils/sfdisk.c:2015
+#: disk-utils/sfdisk.c:2017
#, c-format
msgid "%s is deprecated in favour of --part-type"
msgstr "%s 已废弃,请改用 --part-type"
-#: disk-utils/sfdisk.c:2020
+#: disk-utils/sfdisk.c:2022
msgid "--id is deprecated in favour of --part-type"
msgstr "--id 已废弃,请改用 --part-type"
-#: disk-utils/sfdisk.c:2036
+#: disk-utils/sfdisk.c:2038
msgid "--show-pt-geometry is no more implemented. Using --show-geometry."
msgstr "--show-pt-geometry 不再实现。请使用 --show-geometry。"
-#: disk-utils/sfdisk.c:2048
+#: disk-utils/sfdisk.c:2050
msgid "--Linux option is unnecessary and deprecated"
msgstr "--Linux 选项没必要,并且已废弃"
-#: disk-utils/sfdisk.c:2077
+#: disk-utils/sfdisk.c:2079
#, c-format
msgid "unsupported unit '%c'"
msgstr "不支持的单位“%c”"
-#: disk-utils/sfdisk.c:2080 include/c.h:346
-#, c-format
-msgid "%s from %s\n"
-msgstr "%s,来自 %s\n"
-
#: disk-utils/sfdisk.c:2157
msgid "--movedata requires -N"
msgstr "--movedata 需要 -N"
@@ -4567,16 +4570,16 @@ msgstr ""
" -L, --label <标签> 指定一个新标签\n"
" -U, --uuid <uuid> 指定一个新 uuid\n"
-#: disk-utils/swaplabel.c:172
+#: disk-utils/swaplabel.c:171
msgid "ignore -U (UUIDs are unsupported)"
msgstr "忽略 -U (不支持 UUID)"
-#: include/c.h:224
+#: include/c.h:230
#, fuzzy, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "请尝试执行“%s --help”了解更多信息。\n"
-#: include/c.h:328
+#: include/c.h:334
msgid ""
"\n"
"Usage:\n"
@@ -4584,7 +4587,7 @@ msgstr ""
"\n"
"用法:\n"
-#: include/c.h:329
+#: include/c.h:335
msgid ""
"\n"
"Options:\n"
@@ -4592,7 +4595,7 @@ msgstr ""
"\n"
"选项:\n"
-#: include/c.h:330
+#: include/c.h:336
msgid ""
"\n"
"Functions:\n"
@@ -4600,7 +4603,7 @@ msgstr ""
"\n"
"功能:\n"
-#: include/c.h:331
+#: include/c.h:337
msgid ""
"\n"
"Commands:\n"
@@ -4608,7 +4611,7 @@ msgstr ""
"\n"
"命令:\n"
-#: include/c.h:332
+#: include/c.h:338
#, fuzzy
msgid ""
"\n"
@@ -4617,17 +4620,17 @@ msgstr ""
"\n"
"可用的 --list 列:\n"
-#: include/c.h:335
+#: include/c.h:341
#, fuzzy
msgid "display this help"
msgstr " -? 显示此帮助并退出\n"
-#: include/c.h:336
+#: include/c.h:342
#, fuzzy
msgid "display version"
msgstr " -version\n"
-#: include/c.h:344
+#: include/c.h:350
#, c-format
msgid ""
"\n"
@@ -4636,8 +4639,13 @@ msgstr ""
"\n"
"更多信息请参阅 %s。\n"
+#: include/c.h:352
+#, c-format
+msgid "%s from %s\n"
+msgstr "%s,来自 %s\n"
+
#: include/closestream.h:44 include/closestream.h:46 login-utils/vipw.c:276
-#: login-utils/vipw.c:295 sys-utils/rtcwake.c:298 term-utils/setterm.c:811
+#: login-utils/vipw.c:295 sys-utils/rtcwake.c:299 term-utils/setterm.c:814
#: text-utils/col.c:160
msgid "write error"
msgstr "写出错"
@@ -4650,8 +4658,8 @@ msgstr "默认启用颜色"
msgid "colors are disabled by default"
msgstr "默认禁用颜色"
-#: include/env.h:18 lib/pager.c:153 login-utils/login.c:1027
-#: login-utils/login.c:1031 term-utils/agetty.c:1189
+#: include/env.h:18 lib/pager.c:153 login-utils/login.c:1030
+#: login-utils/login.c:1034 term-utils/agetty.c:1189
#, c-format
msgid "failed to set the %s environment variable"
msgstr "设置环境变量 %s 失败"
@@ -5080,16 +5088,16 @@ msgstr "分区 %zd:无效的起始扇区 0。"
msgid "There is no *BSD partition on %s."
msgstr "%s 上没有 *BSD 分区。"
-#: libfdisk/src/bsd.c:258 libfdisk/src/dos.c:982
+#: libfdisk/src/bsd.c:258 libfdisk/src/dos.c:942
msgid "First cylinder"
msgstr "第一个柱面"
-#: libfdisk/src/bsd.c:291 libfdisk/src/dos.c:1213
+#: libfdisk/src/bsd.c:291 libfdisk/src/dos.c:1265
#, fuzzy
msgid "Last cylinder, +/-cylinders or +/-size{K,M,G,T,P}"
msgstr "最后一个柱面, +cylinders 或 +size{K,M,G,T,P}"
-#: libfdisk/src/bsd.c:296 libfdisk/src/dos.c:1218 libfdisk/src/gpt.c:2447
+#: libfdisk/src/bsd.c:296 libfdisk/src/dos.c:1270 libfdisk/src/gpt.c:2451
#, fuzzy
msgid "Last sector, +/-sectors or +/-size{K,M,G,T,P}"
msgstr "上个扇区,+sectors 或 +size{K,M,G,T,P}"
@@ -5139,7 +5147,7 @@ msgstr "磁道/柱面"
msgid "Sectors/Cylinder"
msgstr "扇区/柱面"
-#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1021 libfdisk/src/dos.c:2429
+#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1021 libfdisk/src/dos.c:2501
#: libfdisk/src/sgi.c:1157 libfdisk/src/sun.c:197 libfdisk/src/sun.c:1125
msgid "Cylinders"
msgstr "柱面"
@@ -5317,7 +5325,7 @@ msgid "sector"
msgid_plural "sectors"
msgstr[0] "扇区"
-#: libfdisk/src/context.c:1440
+#: libfdisk/src/context.c:1445
msgid "Incomplete geometry setting."
msgstr "不完整的几何属性设置。"
@@ -5408,231 +5416,232 @@ msgstr "将忽略额外的扩展分区 %zu"
msgid "Invalid flag 0x%02x%02x of EBR (for partition %zu) will be corrected by w(rite)."
msgstr "分区表 %3$zu 的无效标志 0x%1$02x%2$02x 将通过写入来更正"
-#: libfdisk/src/dos.c:969
+#: libfdisk/src/dos.c:929
#, c-format
msgid "Start sector %ju out of range."
msgstr "起始扇区 %ju 超出范围。"
-#: libfdisk/src/dos.c:1076 libfdisk/src/gpt.c:2321 libfdisk/src/sgi.c:838
+#: libfdisk/src/dos.c:1130 libfdisk/src/gpt.c:2325 libfdisk/src/sgi.c:838
#: libfdisk/src/sun.c:520
#, c-format
msgid "Partition %zu is already defined. Delete it before re-adding it."
msgstr "分区 %zu 已经定义过。请删除后再重新添加它。"
-#: libfdisk/src/dos.c:1146
+#: libfdisk/src/dos.c:1138 libfdisk/src/dos.c:1174 libfdisk/src/dos.c:1236
+#: libfdisk/src/gpt.c:2334
+msgid "No free sectors available."
+msgstr "无空闲扇区可用。"
+
+#: libfdisk/src/dos.c:1198
#, c-format
msgid "Sector %llu is already allocated."
msgstr "扇区 %llu 已经分配."
-#: libfdisk/src/dos.c:1185 libfdisk/src/gpt.c:2330
-msgid "No free sectors available."
-msgstr "无空闲扇区可用。"
-
-#: libfdisk/src/dos.c:1342
+#: libfdisk/src/dos.c:1394
#, c-format
msgid "Adding logical partition %zu"
msgstr "添加逻辑分区 %zu"
-#: libfdisk/src/dos.c:1373
+#: libfdisk/src/dos.c:1425
#, c-format
msgid "Partition %zu: contains sector 0"
msgstr "分区 %zu:包含扇区 0"
-#: libfdisk/src/dos.c:1375
+#: libfdisk/src/dos.c:1427
#, c-format
msgid "Partition %zu: head %d greater than maximum %d"
msgstr "分区 %zu:磁头 %d 大于最大值 %d"
-#: libfdisk/src/dos.c:1378
+#: libfdisk/src/dos.c:1430
#, c-format
msgid "Partition %zu: sector %d greater than maximum %llu"
msgstr "分区 %zu:扇区 %d 大于最大值 %llu"
-#: libfdisk/src/dos.c:1381
+#: libfdisk/src/dos.c:1433
#, c-format
msgid "Partition %zu: cylinder %d greater than maximum %llu"
msgstr "分区 %zu:柱面 %d 大于最大值 %llu"
-#: libfdisk/src/dos.c:1387
+#: libfdisk/src/dos.c:1439
#, c-format
msgid "Partition %zu: previous sectors %u disagrees with total %u"
msgstr "分区 %zu:之前的扇区数 %u 与总数 %u 不符"
-#: libfdisk/src/dos.c:1440
+#: libfdisk/src/dos.c:1492
#, c-format
msgid "Partition %zu: different physical/logical beginnings (non-Linux?): phys=(%d, %d, %d), logical=(%d, %d, %d)"
msgstr "分区 %zu 的物理/逻辑起点不同(非 Linux 分区?):物理=(%d, %d, %d), 逻辑=(%d, %d, %d)"
-#: libfdisk/src/dos.c:1451
+#: libfdisk/src/dos.c:1503
#, c-format
msgid "Partition %zu: different physical/logical endings: phys=(%d, %d, %d), logical=(%d, %d, %d)"
msgstr "分区 %zu 的物理/逻辑终点不同:物理=(%d, %d, %d), 逻辑=(%d, %d, %d)"
-#: libfdisk/src/dos.c:1460
+#: libfdisk/src/dos.c:1512
#, c-format
msgid "Partition %zu: does not end on cylinder boundary."
msgstr "分区 %zu 未结束在柱面边界上。"
-#: libfdisk/src/dos.c:1487
+#: libfdisk/src/dos.c:1559
#, c-format
msgid "Partition %zu: bad start-of-data."
msgstr "分区 %zu:数据起点错误。"
-#: libfdisk/src/dos.c:1500
+#: libfdisk/src/dos.c:1572
#, c-format
msgid "Partition %zu: overlaps partition %zu."
msgstr "分区 %zu:与 分区 %zu 重叠。"
-#: libfdisk/src/dos.c:1528
+#: libfdisk/src/dos.c:1600
#, c-format
msgid "Partition %zu: empty."
msgstr "分区 %zu:空分区。"
-#: libfdisk/src/dos.c:1533
+#: libfdisk/src/dos.c:1605
#, c-format
msgid "Logical partition %zu: not entirely in partition %zu."
msgstr "逻辑分区 %zu:没有完全在分区 %zu 中。"
-#: libfdisk/src/dos.c:1541
+#: libfdisk/src/dos.c:1613
#, c-format
msgid "Total allocated sectors %llu greater than the maximum %llu."
msgstr "分配的总扇区数 %llu 大于最大值 %llu。"
-#: libfdisk/src/dos.c:1544
+#: libfdisk/src/dos.c:1616
#, c-format
msgid "Remaining %lld unallocated %ld-byte sectors."
msgstr "剩余 %lld 未分配的 %ld字节 扇区。"
-#: libfdisk/src/dos.c:1602 libfdisk/src/dos.c:1617 libfdisk/src/dos.c:2064
+#: libfdisk/src/dos.c:1674 libfdisk/src/dos.c:1689 libfdisk/src/dos.c:2136
msgid "Extended partition already exists."
msgstr "扩展分区已存在。"
-#: libfdisk/src/dos.c:1632
+#: libfdisk/src/dos.c:1704
msgid "Extended partition does not exists. Failed to add logical partition."
msgstr ""
-#: libfdisk/src/dos.c:1668
+#: libfdisk/src/dos.c:1740
msgid "The maximum number of partitions has been created."
msgstr "已创建分区达到最大数量。"
-#: libfdisk/src/dos.c:1682
+#: libfdisk/src/dos.c:1754
msgid "All primary partitions are in use."
msgstr "所有主分区都在使用中。"
-#: libfdisk/src/dos.c:1684 libfdisk/src/dos.c:1695
+#: libfdisk/src/dos.c:1756 libfdisk/src/dos.c:1767
msgid "All space for primary partitions is in use."
msgstr "所有主分区的空间都在使用中。"
#. TRANSLATORS: Try to keep this within 80 characters.
-#: libfdisk/src/dos.c:1698
+#: libfdisk/src/dos.c:1770
msgid "To create more partitions, first replace a primary with an extended partition."
msgstr "要创建更多分区,请先将一个主分区替换为扩展分区。"
-#: libfdisk/src/dos.c:1703
+#: libfdisk/src/dos.c:1775
msgid "All logical partitions are in use. Adding a primary partition."
msgstr "所有逻辑分区都在使用中。将添加一个主分区。"
-#: libfdisk/src/dos.c:1725
+#: libfdisk/src/dos.c:1797
msgid "Partition type"
msgstr "分区类型"
-#: libfdisk/src/dos.c:1729
+#: libfdisk/src/dos.c:1801
#, c-format
msgid "%zu primary, %d extended, %zu free"
msgstr "%zu个主分区,%d个扩展分区,%zu空闲"
-#: libfdisk/src/dos.c:1734
+#: libfdisk/src/dos.c:1806
msgid "primary"
msgstr "主分区"
-#: libfdisk/src/dos.c:1736
+#: libfdisk/src/dos.c:1808
msgid "extended"
msgstr "扩展分区"
-#: libfdisk/src/dos.c:1736
+#: libfdisk/src/dos.c:1808
msgid "container for logical partitions"
msgstr "逻辑分区容器"
-#: libfdisk/src/dos.c:1738
+#: libfdisk/src/dos.c:1810
msgid "logical"
msgstr "逻辑分区"
-#: libfdisk/src/dos.c:1738
+#: libfdisk/src/dos.c:1810
msgid "numbered from 5"
msgstr "从 5 开始编号"
-#: libfdisk/src/dos.c:1777
+#: libfdisk/src/dos.c:1849
#, c-format
msgid "Invalid partition type `%c'."
msgstr "无效的分区类型“%c”。"
-#: libfdisk/src/dos.c:1795
+#: libfdisk/src/dos.c:1867
#, c-format
msgid "Cannot write sector %jd: seek failed"
msgstr "写扇区 %jd 失败:定位失败"
-#: libfdisk/src/dos.c:1955 libfdisk/src/gpt.c:1221
+#: libfdisk/src/dos.c:2027 libfdisk/src/gpt.c:1225
msgid "Disk identifier"
msgstr "磁盘标识符"
-#: libfdisk/src/dos.c:2069
+#: libfdisk/src/dos.c:2141
msgid "Type 0 means free space to many systems. Having partitions of type 0 is probably unwise."
msgstr "很多系统将类型 0 视为空闲空间。不建议设置类型为 0 的分区。"
-#: libfdisk/src/dos.c:2074
+#: libfdisk/src/dos.c:2146
msgid "Cannot change type of the extended partition which is already used by logical partitions. Delete logical partitions first."
msgstr "无法更改已被逻辑分区使用的扩展分区的类型。请先删除逻辑分区。"
-#: libfdisk/src/dos.c:2260 libfdisk/src/gpt.c:3038
+#: libfdisk/src/dos.c:2332 libfdisk/src/gpt.c:3042
msgid "Nothing to do. Ordering is correct already."
msgstr "无须操作。顺序已经是正确的了。"
-#: libfdisk/src/dos.c:2315
+#: libfdisk/src/dos.c:2387
#, c-format
msgid "Partition %zu: no data area."
msgstr "分区 %zu:无数据区。"
-#: libfdisk/src/dos.c:2348
+#: libfdisk/src/dos.c:2420
msgid "New beginning of data"
msgstr "新数据起点"
-#: libfdisk/src/dos.c:2404
+#: libfdisk/src/dos.c:2476
#, c-format
msgid "Partition %zu: is an extended partition."
msgstr "分区 %zu:是一个扩展分区。"
-#: libfdisk/src/dos.c:2410
+#: libfdisk/src/dos.c:2482
#, c-format
msgid "The bootable flag on partition %zu is enabled now."
msgstr "分区 %zu 的 可启动 标志已启用。"
-#: libfdisk/src/dos.c:2411
+#: libfdisk/src/dos.c:2483
#, c-format
msgid "The bootable flag on partition %zu is disabled now."
msgstr "分区 %zu 的 可启动 标志已禁用。"
-#: libfdisk/src/dos.c:2424 libfdisk/src/gpt.c:3128 libfdisk/src/sgi.c:1153
+#: libfdisk/src/dos.c:2496 libfdisk/src/gpt.c:3132 libfdisk/src/sgi.c:1153
#: libfdisk/src/sun.c:1121
msgid "Device"
msgstr "设备"
-#: libfdisk/src/dos.c:2425 libfdisk/src/sun.c:40
+#: libfdisk/src/dos.c:2497 libfdisk/src/sun.c:40
msgid "Boot"
msgstr "启动"
-#: libfdisk/src/dos.c:2431 libfdisk/src/sgi.c:1159 libfdisk/src/sun.c:1127
+#: libfdisk/src/dos.c:2503 libfdisk/src/sgi.c:1159 libfdisk/src/sun.c:1127
msgid "Id"
msgstr "Id"
-#: libfdisk/src/dos.c:2435
+#: libfdisk/src/dos.c:2507
msgid "Start-C/H/S"
msgstr "起始-C/H/S"
-#: libfdisk/src/dos.c:2436
+#: libfdisk/src/dos.c:2508
msgid "End-C/H/S"
msgstr "终-C/H/S"
-#: libfdisk/src/dos.c:2437 libfdisk/src/gpt.c:3138 libfdisk/src/sgi.c:1161
+#: libfdisk/src/dos.c:2509 libfdisk/src/gpt.c:3142 libfdisk/src/sgi.c:1161
msgid "Attrs"
msgstr "属性"
@@ -5976,306 +5985,314 @@ msgstr "QNX6 文件系统"
msgid "Plan 9 partition"
msgstr "Plan 9 分区"
-#: libfdisk/src/gpt.c:661
+#: libfdisk/src/gpt.c:290
+msgid "HiFive Unleashed FSBL"
+msgstr ""
+
+#: libfdisk/src/gpt.c:291
+msgid "HiFive Unleashed BBL"
+msgstr ""
+
+#: libfdisk/src/gpt.c:665
msgid "failed to allocate GPT header"
msgstr "分配 GPT 头失败"
-#: libfdisk/src/gpt.c:744
+#: libfdisk/src/gpt.c:748
msgid "First LBA specified by script is out of range."
msgstr "脚本指定的第一个 LBA 超出范围。"
-#: libfdisk/src/gpt.c:756
+#: libfdisk/src/gpt.c:760
msgid "Last LBA specified by script is out of range."
msgstr "脚本指定的最后一个 LBA 超出范围。"
-#: libfdisk/src/gpt.c:895
+#: libfdisk/src/gpt.c:899
#, fuzzy, c-format
msgid "GPT PMBR size mismatch (%<PRIu64> != %<PRIu64>) will be corrected by write."
msgstr "GPT PMBR 大小不符(%<PRIu64> != %<PRIu64>),将用 w(写) 予以更正。"
-#: libfdisk/src/gpt.c:917
+#: libfdisk/src/gpt.c:921
msgid "gpt: stat() failed"
msgstr "gpt:stat() 失败"
-#: libfdisk/src/gpt.c:927
+#: libfdisk/src/gpt.c:931
#, c-format
msgid "gpt: cannot handle files with mode %o"
msgstr "gpt:无法操作模式为 %o 的文件"
-#: libfdisk/src/gpt.c:1191
+#: libfdisk/src/gpt.c:1195
msgid "GPT Header"
msgstr "GPT 头"
-#: libfdisk/src/gpt.c:1196
+#: libfdisk/src/gpt.c:1200
msgid "GPT Entries"
msgstr "GPT 记录项"
-#: libfdisk/src/gpt.c:1228
+#: libfdisk/src/gpt.c:1232
msgid "First LBA"
msgstr "第一个 LBA"
-#: libfdisk/src/gpt.c:1233
+#: libfdisk/src/gpt.c:1237
msgid "Last LBA"
msgstr "最后一个 LBA"
#. TRANSLATORS: The LBA (Logical Block Address) of the backup GPT header.
-#: libfdisk/src/gpt.c:1239
+#: libfdisk/src/gpt.c:1243
msgid "Alternative LBA"
msgstr "替代 LBA"
#. TRANSLATORS: The start of the array of partition entries.
-#: libfdisk/src/gpt.c:1245
+#: libfdisk/src/gpt.c:1249
msgid "Partition entries LBA"
msgstr "分区记录项 LBA"
-#: libfdisk/src/gpt.c:1250
+#: libfdisk/src/gpt.c:1254
msgid "Allocated partition entries"
msgstr "已分配的分区项"
-#: libfdisk/src/gpt.c:1595
+#: libfdisk/src/gpt.c:1599
msgid "The backup GPT table is corrupt, but the primary appears OK, so that will be used."
msgstr "备份 GPT 表损坏,但主表似乎正常,将使用它。"
-#: libfdisk/src/gpt.c:1605
+#: libfdisk/src/gpt.c:1609
msgid "The primary GPT table is corrupt, but the backup appears OK, so that will be used."
msgstr "主 GPT 表损坏,但备份似乎正常,将使用它。"
-#: libfdisk/src/gpt.c:1618
+#: libfdisk/src/gpt.c:1622
msgid "The backup GPT table is not on the end of the device. This problem will be corrected by write."
msgstr ""
-#: libfdisk/src/gpt.c:1800
+#: libfdisk/src/gpt.c:1804
#, c-format
msgid "unsupported GPT attribute bit '%s'"
msgstr "不支持的 GPT 属性位“%s”"
-#: libfdisk/src/gpt.c:1805
+#: libfdisk/src/gpt.c:1809
#, fuzzy, c-format
msgid "failed to parse GPT attribute string '%s'"
msgstr "解析列表“%s”失败"
-#: libfdisk/src/gpt.c:1905
+#: libfdisk/src/gpt.c:1909
#, c-format
msgid "Partition UUID changed from %s to %s."
msgstr "分区 UUID 已从 %s 更改为 %s。"
-#: libfdisk/src/gpt.c:1914
+#: libfdisk/src/gpt.c:1918
#, fuzzy
msgid "Failed to translate partition name, name not changed."
msgstr "分配分区名失败"
-#: libfdisk/src/gpt.c:1916
+#: libfdisk/src/gpt.c:1920
#, c-format
msgid "Partition name changed from '%s' to '%.*s'."
msgstr "分区名已由“%s”改为“%.*s”。"
-#: libfdisk/src/gpt.c:1945
+#: libfdisk/src/gpt.c:1949
msgid "The start of the partition understeps FirstUsableLBA."
msgstr "分区起点未到首个可用 LBA。"
-#: libfdisk/src/gpt.c:1952
+#: libfdisk/src/gpt.c:1956
msgid "The end of the partition oversteps LastUsableLBA."
msgstr "分区终点超过了最后可用 LBA。"
-#: libfdisk/src/gpt.c:2114
+#: libfdisk/src/gpt.c:2118
msgid "The device contains hybrid MBR -- writing GPT only. You have to sync the MBR manually."
msgstr "该设备包含混合 MBR -- 将只写入 GPT。您需要手动同步 MBR。"
-#: libfdisk/src/gpt.c:2151
+#: libfdisk/src/gpt.c:2155
msgid "Disk does not contain a valid backup header."
msgstr "磁盘不含有效的备用磁头。"
-#: libfdisk/src/gpt.c:2156
+#: libfdisk/src/gpt.c:2160
msgid "Invalid primary header CRC checksum."
msgstr "无效的主磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:2160
+#: libfdisk/src/gpt.c:2164
msgid "Invalid backup header CRC checksum."
msgstr "无效的备份磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:2165
+#: libfdisk/src/gpt.c:2169
msgid "Invalid partition entry checksum."
msgstr "无效的分区记录校验和。"
-#: libfdisk/src/gpt.c:2170
+#: libfdisk/src/gpt.c:2174
msgid "Invalid primary header LBA sanity checks."
msgstr "无效的主磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:2174
+#: libfdisk/src/gpt.c:2178
msgid "Invalid backup header LBA sanity checks."
msgstr "无效的备用磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:2179
+#: libfdisk/src/gpt.c:2183
msgid "MyLBA mismatch with real position at primary header."
msgstr "MyLBA 不匹配,真正位置在主磁头。"
-#: libfdisk/src/gpt.c:2183
+#: libfdisk/src/gpt.c:2187
msgid "MyLBA mismatch with real position at backup header."
msgstr "MyLBA 不匹配,真正位置在备份磁头。"
-#: libfdisk/src/gpt.c:2188
+#: libfdisk/src/gpt.c:2192
msgid "Disk is too small to hold all data."
msgstr "磁盘太小,放不下所有数据。"
-#: libfdisk/src/gpt.c:2198
+#: libfdisk/src/gpt.c:2202
msgid "Primary and backup header mismatch."
msgstr "主磁头和备份磁头不匹配。"
-#: libfdisk/src/gpt.c:2204
+#: libfdisk/src/gpt.c:2208
#, c-format
msgid "Partition %u overlaps with partition %u."
msgstr "分区 %u 与 %u 重叠。"
-#: libfdisk/src/gpt.c:2211
+#: libfdisk/src/gpt.c:2215
#, c-format
msgid "Partition %u is too big for the disk."
msgstr "分区 %u 对于该磁盘而言过大。"
-#: libfdisk/src/gpt.c:2218
+#: libfdisk/src/gpt.c:2222
#, c-format
msgid "Partition %u ends before it starts."
msgstr "分区 %u 结束于起点之前。"
-#: libfdisk/src/gpt.c:2227
+#: libfdisk/src/gpt.c:2231
msgid "No errors detected."
msgstr "未检测到错误。"
-#: libfdisk/src/gpt.c:2228
+#: libfdisk/src/gpt.c:2232
#, c-format
msgid "Header version: %s"
msgstr "磁头版本:%s"
-#: libfdisk/src/gpt.c:2229
+#: libfdisk/src/gpt.c:2233
#, fuzzy, c-format
msgid "Using %zu out of %zu partitions."
msgstr "使用着 %2$d 个分区中的 %1$u 个。"
-#: libfdisk/src/gpt.c:2239
+#: libfdisk/src/gpt.c:2243
#, 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:2247
+#: libfdisk/src/gpt.c:2251
#, c-format
msgid "%d error detected."
msgid_plural "%d errors detected."
msgstr[0] "检测到 %d 个错误。"
-#: libfdisk/src/gpt.c:2326
+#: libfdisk/src/gpt.c:2330
msgid "All partitions are already in use."
msgstr "所有分区均已占用。"
-#: libfdisk/src/gpt.c:2383 libfdisk/src/gpt.c:2410
+#: libfdisk/src/gpt.c:2387 libfdisk/src/gpt.c:2414
#, c-format
msgid "Sector %ju already used."
msgstr "扇区 %ju 已使用。"
-#: libfdisk/src/gpt.c:2476
+#: libfdisk/src/gpt.c:2480
#, c-format
msgid "Could not create partition %zu"
msgstr "无法创建分区 %zu"
-#: libfdisk/src/gpt.c:2483
+#: libfdisk/src/gpt.c:2487
#, c-format
msgid "The last usable GPT sector is %ju, but %ju is requested."
msgstr "最后一个可用的 GPT 扇区是 %ju,但请求了 %ju。"
-#: libfdisk/src/gpt.c:2490
+#: libfdisk/src/gpt.c:2494
#, c-format
msgid "The first usable GPT sector is %ju, but %ju is requested."
msgstr "第一个可用的 GPT 扇区是 %ju,但请求了 %ju。"
-#: libfdisk/src/gpt.c:2629
+#: libfdisk/src/gpt.c:2633
#, c-format
msgid "Created a new GPT disklabel (GUID: %s)."
msgstr "已创建新的 GPT 磁盘标签(GUID: %s)。"
-#: libfdisk/src/gpt.c:2647
+#: libfdisk/src/gpt.c:2651
msgid "Enter new disk UUID (in 8-4-4-4-12 format)"
msgstr "输入新磁盘 UUID(以 8-4-4-4-12 格式)"
-#: libfdisk/src/gpt.c:2654
+#: libfdisk/src/gpt.c:2658
msgid "Failed to parse your UUID."
msgstr "解析您的 UUID 失败。"
-#: libfdisk/src/gpt.c:2668
+#: libfdisk/src/gpt.c:2672
#, c-format
msgid "Disk identifier changed from %s to %s."
msgstr "将磁盘标识从 %s 更改为 %s 失败。"
-#: libfdisk/src/gpt.c:2688
+#: libfdisk/src/gpt.c:2692
msgid "Not enough space for new partition table!"
msgstr "创建新分区表的空闲空间不够!"
-#: libfdisk/src/gpt.c:2699
+#: libfdisk/src/gpt.c:2703
#, fuzzy, c-format
msgid "Partition #%zu out of range (minimal start is %<PRIu64> sectors)"
msgstr "分区 #%u 超出范围(最小起点是 %<PRIu64> 扇区)"
-#: libfdisk/src/gpt.c:2704
+#: libfdisk/src/gpt.c:2708
#, fuzzy, c-format
msgid "Partition #%zu out of range (maximal end is %<PRIu64> sectors)"
msgstr "分区 #%u 超出范围(最小终点是 %<PRIu64> 扇区)"
-#: libfdisk/src/gpt.c:2747
+#: libfdisk/src/gpt.c:2751
#, fuzzy, c-format
msgid "The number of the partition has to be smaller than %zu."
msgstr "已创建分区达到最大数量。"
-#: libfdisk/src/gpt.c:2770
+#: libfdisk/src/gpt.c:2774
msgid "Cannot allocate memory!"
msgstr "无法分配内存!"
-#: libfdisk/src/gpt.c:2800
+#: libfdisk/src/gpt.c:2804
#, c-format
msgid "Partition table length changed from %<PRIu32> to %<PRIu64>."
msgstr "分区表长度已从 %<PRIu32> 改为 %<PRIu64>。"
-#: libfdisk/src/gpt.c:2909
+#: libfdisk/src/gpt.c:2913
#, c-format
msgid "The attributes on partition %zu changed to 0x%016<PRIx64>."
msgstr "分区 %zu 的属性已改为 0x%016<PRIx64>。"
-#: libfdisk/src/gpt.c:2959
+#: libfdisk/src/gpt.c:2963
msgid "Enter GUID specific bit"
msgstr "输入 GUID 特定位"
-#: libfdisk/src/gpt.c:2974
+#: libfdisk/src/gpt.c:2978
#, c-format
msgid "failed to toggle unsupported bit %lu"
msgstr "开/关不支持的位 %lu 失败"
-#: libfdisk/src/gpt.c:2987
+#: libfdisk/src/gpt.c:2991
#, c-format
msgid "The GUID specific bit %d on partition %zu is enabled now."
msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已启用。"
-#: libfdisk/src/gpt.c:2988
+#: libfdisk/src/gpt.c:2992
#, c-format
msgid "The GUID specific bit %d on partition %zu is disabled now."
msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已禁用。"
-#: libfdisk/src/gpt.c:2992
+#: libfdisk/src/gpt.c:2996
#, c-format
msgid "The %s flag on partition %zu is enabled now."
msgstr "分区 %2$zu 上的标志 %1$s 现已启用。"
-#: libfdisk/src/gpt.c:2993
+#: libfdisk/src/gpt.c:2997
#, c-format
msgid "The %s flag on partition %zu is disabled now."
msgstr "分区 %2$zu 上的标志 %1$s 现已禁用。"
-#: libfdisk/src/gpt.c:3135
+#: libfdisk/src/gpt.c:3139
msgid "Type-UUID"
msgstr "类型-UUID"
-#: libfdisk/src/gpt.c:3136
+#: libfdisk/src/gpt.c:3140
msgid "UUID"
msgstr "UUID"
-#: libfdisk/src/gpt.c:3137 login-utils/chfn.c:156 login-utils/chfn.c:158
-#: login-utils/chfn.c:324
+#: libfdisk/src/gpt.c:3141 login-utils/chfn.c:156 login-utils/chfn.c:158
+#: login-utils/chfn.c:323
msgid "Name"
msgstr "名称"
@@ -6283,7 +6300,7 @@ msgstr "名称"
msgid "Free space"
msgstr "剩余空间"
-#: libfdisk/src/partition.c:1255
+#: libfdisk/src/partition.c:1263
#, c-format
msgid "Failed to resize partition #%zu."
msgstr "调整分区 #%zu 的大小失败。"
@@ -6699,340 +6716,340 @@ msgstr ""
"和启动锁。\n"
"您确信要把该分区标记为 Linux 交换分区吗?"
-#: libmount/src/context.c:2511
+#: libmount/src/context.c:2554
#, fuzzy, c-format
msgid "operation failed: %m"
msgstr "readlink 失败:%s"
-#: libmount/src/context_mount.c:1445
+#: libmount/src/context_mount.c:1554
#, c-format
msgid "WARNING: failed to apply propagation flags"
msgstr "警告:应用传播标志失败"
-#: libmount/src/context_mount.c:1455
+#: libmount/src/context_mount.c:1564
#, fuzzy, c-format
msgid "WARNING: device write-protected, mounted read-only"
msgstr "%s 写保护,将以只读方式挂载"
-#: libmount/src/context_mount.c:1469
+#: libmount/src/context_mount.c:1578
#, c-format
msgid "operation permitted for root only"
msgstr ""
-#: libmount/src/context_mount.c:1473
+#: libmount/src/context_mount.c:1582
#, c-format
msgid "%s is already mounted"
msgstr "%s 已经挂载"
-#: libmount/src/context_mount.c:1479
+#: libmount/src/context_mount.c:1588
#, fuzzy, c-format
msgid "can't find in %s"
msgstr "在 %2$s 中找不到 %1$s"
-#: libmount/src/context_mount.c:1482
+#: libmount/src/context_mount.c:1591
#, fuzzy, c-format
msgid "can't find mount point in %s"
msgstr "在 %2$s 中找不到挂载点 %1$s"
-#: libmount/src/context_mount.c:1485
+#: libmount/src/context_mount.c:1594
#, c-format
msgid "can't find mount source %s in %s"
msgstr "在 %2$s 中找不到挂载源 %1$s"
-#: libmount/src/context_mount.c:1490
+#: libmount/src/context_mount.c:1599
#, c-format
msgid "more filesystems detected on %s; use -t <type> or wipefs(8)"
msgstr ""
-#: libmount/src/context_mount.c:1495
+#: libmount/src/context_mount.c:1604
#, fuzzy, c-format
msgid "failed to determine filesystem type"
msgstr "%s:确定源失败"
-#: libmount/src/context_mount.c:1496
+#: libmount/src/context_mount.c:1605
#, fuzzy, c-format
msgid "no filesystem type specified"
msgstr "未指定文件名"
-#: libmount/src/context_mount.c:1503
+#: libmount/src/context_mount.c:1612
#, c-format
msgid "can't find %s"
msgstr "找不到 %s"
-#: libmount/src/context_mount.c:1505
+#: libmount/src/context_mount.c:1614
#, fuzzy, c-format
msgid "no mount source specified"
msgstr "未指定挂载点"
-#: libmount/src/context_mount.c:1511
+#: libmount/src/context_mount.c:1620
#, fuzzy, c-format
msgid "failed to parse mount options: %m"
msgstr "解析挂臷选项失败"
-#: libmount/src/context_mount.c:1512
+#: libmount/src/context_mount.c:1621
#, c-format
msgid "failed to parse mount options"
msgstr "解析挂臷选项失败"
-#: libmount/src/context_mount.c:1516
+#: libmount/src/context_mount.c:1625
#, fuzzy, c-format
msgid "failed to setup loop device for %s"
msgstr "%s:设置回环设备失败"
-#: libmount/src/context_mount.c:1520
+#: libmount/src/context_mount.c:1629
#, fuzzy, c-format
msgid "overlapping loop device exists for %s"
msgstr "%s: 重叠的回环设备已存在"
-#: libmount/src/context_mount.c:1524 libmount/src/context_umount.c:1145
+#: libmount/src/context_mount.c:1633 libmount/src/context_umount.c:1206
#, fuzzy, c-format
msgid "locking failed"
msgstr "关闭 %s 失败"
-#: libmount/src/context_mount.c:1528 libmount/src/context_umount.c:1149
+#: libmount/src/context_mount.c:1637 libmount/src/context_umount.c:1210
#: sys-utils/umount.c:238 sys-utils/umount.c:254
#, fuzzy, c-format
msgid "failed to switch namespace"
msgstr "名字空间路径"
-#: libmount/src/context_mount.c:1531
+#: libmount/src/context_mount.c:1640
#, fuzzy, c-format
msgid "mount failed: %m"
msgstr "挂载失败"
-#: libmount/src/context_mount.c:1541
+#: libmount/src/context_mount.c:1650
#, fuzzy, c-format
msgid "filesystem was mounted, but failed to update userspace mount table"
msgstr "%s:文件系统已卸载,但 mount(8) 失败"
-#: libmount/src/context_mount.c:1545
+#: libmount/src/context_mount.c:1654
#, fuzzy, c-format
msgid "filesystem was mounted, but failed to switch namespace back"
msgstr "%s:文件系统已卸载,但 mount(8) 失败"
-#: libmount/src/context_mount.c:1550
+#: libmount/src/context_mount.c:1659
#, fuzzy, c-format
msgid "filesystem was mounted, but any subsequent operation failed: %m"
msgstr "%s:文件系统已卸载,但 mount(8) 失败"
-#: libmount/src/context_mount.c:1568 libmount/src/context_mount.c:1625
+#: libmount/src/context_mount.c:1677 libmount/src/context_mount.c:1734
#, fuzzy, c-format
msgid "mount point is not a directory"
msgstr "挂载点 %s 不是目录"
-#: libmount/src/context_mount.c:1570 login-utils/newgrp.c:227
+#: libmount/src/context_mount.c:1679 login-utils/newgrp.c:226
#, c-format
msgid "permission denied"
msgstr "权限不足"
-#: libmount/src/context_mount.c:1572
+#: libmount/src/context_mount.c:1681
#, c-format
msgid "must be superuser to use mount"
msgstr "必须以超级用户身份使用 mount"
-#: libmount/src/context_mount.c:1582
+#: libmount/src/context_mount.c:1691
#, fuzzy, c-format
msgid "mount point is busy"
msgstr "mount:%s 忙"
-#: libmount/src/context_mount.c:1595
+#: libmount/src/context_mount.c:1704
#, fuzzy, c-format
msgid "%s already mounted on %s"
msgstr "mount:%s 已挂载于 %s\n"
-#: libmount/src/context_mount.c:1601
+#: libmount/src/context_mount.c:1710
#, fuzzy, c-format
msgid "%s already mounted or mount point busy"
msgstr "%s 已经挂载或 %s 忙"
-#: libmount/src/context_mount.c:1607
+#: libmount/src/context_mount.c:1716
#, fuzzy, c-format
msgid "mount point does not exist"
msgstr "挂载点 %s 不存在"
-#: libmount/src/context_mount.c:1610
+#: libmount/src/context_mount.c:1719
#, fuzzy, c-format
msgid "mount point is a symbolic link to nowhere"
msgstr "挂载点 %s 是一个没有目标的符号链接"
-#: libmount/src/context_mount.c:1615
+#: libmount/src/context_mount.c:1724
#, c-format
msgid "special device %s does not exist"
msgstr "特殊设备 %s 不存在"
-#: libmount/src/context_mount.c:1618 libmount/src/context_mount.c:1634
-#: libmount/src/context_mount.c:1718 libmount/src/context_mount.c:1741
+#: libmount/src/context_mount.c:1727 libmount/src/context_mount.c:1743
+#: libmount/src/context_mount.c:1827 libmount/src/context_mount.c:1850
#, fuzzy, c-format
msgid "mount(2) system call failed: %m"
msgstr "mount(2) 失败"
-#: libmount/src/context_mount.c:1630
+#: libmount/src/context_mount.c:1739
#, c-format
msgid "special device %s does not exist (a path prefix is not a directory)"
msgstr "特殊设备 %s 不存在(路径前缀不是目录)"
-#: libmount/src/context_mount.c:1642
+#: libmount/src/context_mount.c:1751
#, fuzzy, c-format
msgid "mount point not mounted or bad option"
msgstr "mount:%s 未挂载或选项错误"
-#: libmount/src/context_mount.c:1644
+#: libmount/src/context_mount.c:1753
#, fuzzy, c-format
msgid "not mount point or bad option"
msgstr "%s 不是一个挂载点或选项有误"
-#: libmount/src/context_mount.c:1647
+#: libmount/src/context_mount.c:1756
#, fuzzy, c-format
msgid "bad option; moving a mount residing under a shared mount is unsupported"
msgstr "选项错误。注意,不支持移动位于共享挂载内的挂载。"
-#: libmount/src/context_mount.c:1651
+#: libmount/src/context_mount.c:1760
#, fuzzy, c-format
msgid "bad option; for several filesystems (e.g. nfs, cifs) you might need a /sbin/mount.<type> helper program"
msgstr ""
" (对某些文件系统(如 nfs、cifs) 您可能需要\n"
" 一款 /sbin/mount.<类型> 助手程序)"
-#: libmount/src/context_mount.c:1655
+#: libmount/src/context_mount.c:1764
#, fuzzy, c-format
msgid "wrong fs type, bad option, bad superblock on %s, missing codepage or helper program, or other error"
msgstr ""
"文件系统类型错误、选项错误、%s 上有坏超级块、\n"
" 缺少代码页或助手程序,或其他错误"
-#: libmount/src/context_mount.c:1662
+#: libmount/src/context_mount.c:1771
#, c-format
msgid "mount table full"
msgstr "挂载表满"
-#: libmount/src/context_mount.c:1667
+#: libmount/src/context_mount.c:1776
#, fuzzy, c-format
msgid "can't read superblock on %s"
msgstr "%s:不能读超级块"
-#: libmount/src/context_mount.c:1674
+#: libmount/src/context_mount.c:1783
#, c-format
msgid "unknown filesystem type '%s'"
msgstr "未知的文件系统类型“%s”"
-#: libmount/src/context_mount.c:1677
+#: libmount/src/context_mount.c:1786
#, c-format
msgid "unknown filesystem type"
msgstr "未知的文件系统类型"
-#: libmount/src/context_mount.c:1686
+#: libmount/src/context_mount.c:1795
#, c-format
msgid "%s is not a block device, and stat(2) fails?"
msgstr "%s 不是块设备,而且 stat(2) 失败?"
-#: libmount/src/context_mount.c:1689
+#: libmount/src/context_mount.c:1798
#, fuzzy, c-format
msgid "the kernel does not recognize %s as a block device; maybe \"modprobe driver\" is necessary"
msgstr ""
"内核无法将 %s 识别为块设备\n"
" (试试“modprobe driver”?)"
-#: libmount/src/context_mount.c:1692
+#: libmount/src/context_mount.c:1801
#, fuzzy, c-format
msgid "%s is not a block device; try \"-o loop\""
msgstr "%s 不是块设备(用 `-o loop' 试试?)"
-#: libmount/src/context_mount.c:1694
+#: libmount/src/context_mount.c:1803
#, fuzzy, c-format
msgid "%s is not a block device"
msgstr "%s 不是一个块设备"
-#: libmount/src/context_mount.c:1701
+#: libmount/src/context_mount.c:1810
#, c-format
msgid "%s is not a valid block device"
msgstr "%s 不是一个有效的块设备"
-#: libmount/src/context_mount.c:1709
+#: libmount/src/context_mount.c:1818
#, c-format
msgid "cannot mount %s read-only"
msgstr "无法以只读方式挂载 %s"
-#: libmount/src/context_mount.c:1711
+#: libmount/src/context_mount.c:1820
#, fuzzy, c-format
msgid "%s is write-protected but explicit read-write mode requested"
msgstr "%s 是写保护的,但指明了“-w”标志"
-#: libmount/src/context_mount.c:1713
+#: libmount/src/context_mount.c:1822
#, c-format
msgid "cannot remount %s read-write, is write-protected"
msgstr "无法以读写方式重新挂载 %s,它是写保护的"
-#: libmount/src/context_mount.c:1715
+#: libmount/src/context_mount.c:1824
#, fuzzy, c-format
msgid "bind %s failed"
msgstr "%s 失败"
-#: libmount/src/context_mount.c:1726
+#: libmount/src/context_mount.c:1835
#, c-format
msgid "no medium found on %s"
msgstr "在 %s 上找不到媒体"
-#: libmount/src/context_mount.c:1733
+#: libmount/src/context_mount.c:1842
#, fuzzy, c-format
msgid "cannot mount; probably corrupted filesystem on %s"
msgstr "将不会尝试在“%s”上创建文件系统"
-#: libmount/src/context_umount.c:1141 libmount/src/context_umount.c:1187
+#: libmount/src/context_umount.c:1202 libmount/src/context_umount.c:1248
#, fuzzy, c-format
msgid "not mounted"
msgstr "%s:未挂载"
-#: libmount/src/context_umount.c:1153
+#: libmount/src/context_umount.c:1214
#, fuzzy, c-format
msgid "umount failed: %m"
msgstr "挂载失败"
-#: libmount/src/context_umount.c:1162
+#: libmount/src/context_umount.c:1223
#, fuzzy, c-format
msgid "filesystem was unmounted, but failed to update userspace mount table"
msgstr "%s:文件系统已卸载,但 mount(8) 失败"
-#: libmount/src/context_umount.c:1166
+#: libmount/src/context_umount.c:1227
#, fuzzy, c-format
msgid "filesystem was unmounted, but failed to switch namespace back"
msgstr "%s:文件系统已卸载,但 mount(8) 失败"
-#: libmount/src/context_umount.c:1171
+#: libmount/src/context_umount.c:1232
#, fuzzy, c-format
msgid "filesystem was unmounted, but any subsequent operation failed: %m"
msgstr "%s:文件系统已卸载,但 mount(8) 失败"
-#: libmount/src/context_umount.c:1184
+#: libmount/src/context_umount.c:1245
#, fuzzy, c-format
msgid "invalid block device"
msgstr "%s:无效的块设备"
-#: libmount/src/context_umount.c:1190
+#: libmount/src/context_umount.c:1251
#, fuzzy, c-format
msgid "can't write superblock"
msgstr "%s:无法写超级块"
-#: libmount/src/context_umount.c:1193
+#: libmount/src/context_umount.c:1254
#, fuzzy, c-format
msgid "target is busy"
msgstr "目标存在"
-#: libmount/src/context_umount.c:1196
+#: libmount/src/context_umount.c:1257
#, fuzzy, c-format
msgid "no mount point specified"
msgstr "未指定挂载点"
-#: libmount/src/context_umount.c:1199
+#: libmount/src/context_umount.c:1260
#, fuzzy, c-format
msgid "must be superuser to unmount"
msgstr "%s:必须以超级用户身份卸载"
-#: libmount/src/context_umount.c:1202
+#: libmount/src/context_umount.c:1263
#, fuzzy, c-format
msgid "block devices are not permitted on filesystem"
msgstr "%s:文件系统不允许块设备"
-#: libmount/src/context_umount.c:1205
+#: libmount/src/context_umount.c:1266
#, fuzzy, c-format
msgid "umount(2) system call failed: %m"
msgstr "mount(2) 失败"
@@ -7100,7 +7117,7 @@ msgstr ""
msgid "time %ld is out of range."
msgstr "值超出范围。"
-#: login-utils/chfn.c:96 login-utils/chsh.c:74 login-utils/lslogins.c:1320
+#: login-utils/chfn.c:96 login-utils/chsh.c:74 login-utils/lslogins.c:1326
#, c-format
msgid " %s [options] [<username>]\n"
msgstr " %s [选项] [<用户名>]\n"
@@ -7130,7 +7147,7 @@ msgstr " -h, --home-phone <电话> 住宅电话\n"
msgid "field %s is too long"
msgstr "字段 %s 过长"
-#: login-utils/chfn.c:127 login-utils/chsh.c:236
+#: login-utils/chfn.c:127 login-utils/chsh.c:235
#, c-format
msgid "%s: has illegal characters"
msgstr "%s:含有非法字符"
@@ -7141,57 +7158,57 @@ msgstr "%s:含有非法字符"
msgid "login.defs forbids setting %s"
msgstr "login.defs 禁止设置 %s"
-#: login-utils/chfn.c:162 login-utils/chfn.c:164 login-utils/chfn.c:326
+#: login-utils/chfn.c:162 login-utils/chfn.c:164 login-utils/chfn.c:325
msgid "Office"
msgstr "办公"
-#: login-utils/chfn.c:168 login-utils/chfn.c:170 login-utils/chfn.c:328
+#: login-utils/chfn.c:168 login-utils/chfn.c:170 login-utils/chfn.c:327
msgid "Office Phone"
msgstr "办公电话"
-#: login-utils/chfn.c:174 login-utils/chfn.c:176 login-utils/chfn.c:330
+#: login-utils/chfn.c:174 login-utils/chfn.c:176 login-utils/chfn.c:329
msgid "Home Phone"
msgstr "住宅电话"
-#: login-utils/chfn.c:194 login-utils/chsh.c:187
+#: login-utils/chfn.c:193 login-utils/chsh.c:186
msgid "cannot handle multiple usernames"
msgstr ""
-#: login-utils/chfn.c:248
+#: login-utils/chfn.c:247
msgid "Aborted."
msgstr "已中止。"
-#: login-utils/chfn.c:311
+#: login-utils/chfn.c:310
#, c-format
msgid "%s: CHFN_RESTRICT has unexpected value: %s"
msgstr "%s: CHFN_RESTRICT 的值异常:%s"
-#: login-utils/chfn.c:313
+#: login-utils/chfn.c:312
#, c-format
msgid "%s: CHFN_RESTRICT does not allow any changes"
msgstr "%s: CHFN_RESTRICT 不允许更改"
-#: login-utils/chfn.c:396
+#: login-utils/chfn.c:395
#, c-format
msgid "Finger information *NOT* changed. Try again later.\n"
msgstr "Finger 信息*没有*更改。请稍后重试。\n"
-#: login-utils/chfn.c:400
+#: login-utils/chfn.c:399
#, c-format
msgid "Finger information changed.\n"
msgstr "Finger 信息已更改。\n"
-#: login-utils/chfn.c:425 login-utils/chsh.c:273
+#: login-utils/chfn.c:425 login-utils/chsh.c:272
#, c-format
msgid "you (user %d) don't exist."
msgstr "您(用户 %d)不存在。"
-#: login-utils/chfn.c:431 login-utils/chsh.c:278 login-utils/libuser.c:59
+#: login-utils/chfn.c:431 login-utils/chsh.c:277 login-utils/libuser.c:59
#, c-format
msgid "user \"%s\" does not exist."
msgstr "用户“%s”不存在。"
-#: login-utils/chfn.c:437 login-utils/chsh.c:284
+#: login-utils/chfn.c:437 login-utils/chsh.c:283
msgid "can only change local entries"
msgstr "只能更改本地记录"
@@ -7200,11 +7217,11 @@ msgstr "只能更改本地记录"
msgid "%s is not authorized to change the finger info of %s"
msgstr "%s 未得到授权更改 %s 的 finger 信息"
-#: login-utils/chfn.c:452 login-utils/chsh.c:300
+#: login-utils/chfn.c:452 login-utils/chsh.c:299
msgid "Unknown user context"
msgstr "未知用户环境(context)"
-#: login-utils/chfn.c:458 login-utils/chsh.c:306
+#: login-utils/chfn.c:458 login-utils/chsh.c:305
#, c-format
msgid "can't set default context for %s"
msgstr "无法设置 %s 默认环境(context)"
@@ -7235,26 +7252,26 @@ msgstr " -s, --shell <shell> 指定登录 shell\n"
msgid " -l, --list-shells print list of shells and exit\n"
msgstr " -l, --list-shells 打印 shell 列表并退出\n"
-#: login-utils/chsh.c:230
+#: login-utils/chsh.c:229
msgid "shell must be a full path name"
msgstr "shell 必须为完整路径名称"
-#: login-utils/chsh.c:232
+#: login-utils/chsh.c:231
#, c-format
msgid "\"%s\" does not exist"
msgstr "“%s”不存在"
-#: login-utils/chsh.c:234
+#: login-utils/chsh.c:233
#, c-format
msgid "\"%s\" is not executable"
msgstr "“%s”不可执行"
-#: login-utils/chsh.c:240
+#: login-utils/chsh.c:239
#, c-format
msgid "Warning: \"%s\" is not listed in %s."
msgstr "警告:“%s”未在 %s 中列出。"
-#: login-utils/chsh.c:244 login-utils/chsh.c:248
+#: login-utils/chsh.c:243 login-utils/chsh.c:247
#, c-format
msgid ""
"\"%s\" is not listed in %s.\n"
@@ -7263,38 +7280,38 @@ msgstr ""
"“%s”未列在 %s 中。\n"
"请使用 %s -l 查看列表。"
-#: login-utils/chsh.c:299
+#: login-utils/chsh.c:298
#, c-format
msgid "%s is not authorized to change the shell of %s"
msgstr "%s 无权更改 %s 的 shell"
-#: login-utils/chsh.c:325
+#: login-utils/chsh.c:324
msgid "running UID doesn't match UID of user we're altering, shell change denied"
msgstr "运行 UID 与要更改的用户的 UID 不匹配,更改 shell 被拒绝"
-#: login-utils/chsh.c:330
+#: login-utils/chsh.c:329
#, c-format
msgid "your shell is not in %s, shell change denied"
msgstr "您的 shell 不在 %s 中,更改 shell 被拒绝"
-#: login-utils/chsh.c:334
+#: login-utils/chsh.c:333
#, c-format
msgid "Changing shell for %s.\n"
msgstr "正在更改 %s 的 shell。\n"
-#: login-utils/chsh.c:342
+#: login-utils/chsh.c:341
msgid "New shell"
msgstr "新 shell"
-#: login-utils/chsh.c:350
+#: login-utils/chsh.c:349
msgid "Shell not changed."
msgstr "shell 未更改。"
-#: login-utils/chsh.c:355
+#: login-utils/chsh.c:354
msgid "Shell *NOT* changed. Try again later."
msgstr "Shell *未* 更改。请稍后重试。"
-#: login-utils/chsh.c:359
+#: login-utils/chsh.c:358
msgid ""
"setpwnam failed\n"
"Shell *NOT* changed. Try again later."
@@ -7302,7 +7319,7 @@ msgstr ""
"setpwnam 失败\n"
"Shell *未* 更改。请稍后重试。"
-#: login-utils/chsh.c:363
+#: login-utils/chsh.c:362
#, c-format
msgid "Shell changed.\n"
msgstr "shell 已更改。\n"
@@ -7312,7 +7329,7 @@ msgstr "shell 已更改。\n"
msgid "Usage: %s <passwordfile> <username>...\n"
msgstr "用法:%s <密码文件> <用户名>...\n"
-#: login-utils/last.c:169 login-utils/lslogins.c:1311 sys-utils/dmesg.c:1268
+#: login-utils/last.c:169 login-utils/lslogins.c:1317 sys-utils/dmesg.c:1268
#: sys-utils/lsipc.c:282
#, c-format
msgid "unknown time format: %s"
@@ -7323,7 +7340,7 @@ msgstr "未知时间格式: %s"
msgid "Interrupted %s"
msgstr "中断的 %s"
-#: login-utils/last.c:435 login-utils/last.c:446 login-utils/last.c:885
+#: login-utils/last.c:435 login-utils/last.c:446 login-utils/last.c:886
msgid "preallocation size exceeded"
msgstr "超过了预分配大小"
@@ -7397,7 +7414,7 @@ msgstr ""
" --time-format <格式> 以指定<格式>显示时间戳:\n"
" notime|short|full|iso\n"
-#: login-utils/last.c:886
+#: login-utils/last.c:887
#, fuzzy, c-format
msgid ""
"\n"
@@ -7412,7 +7429,7 @@ msgid "failed to parse number"
msgstr "解析数字失败"
#: login-utils/last.c:986 login-utils/last.c:991 login-utils/last.c:996
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
#, c-format
msgid "invalid time value \"%s\""
msgstr "无效的时间值\"%s\""
@@ -7464,70 +7481,70 @@ msgstr "致命:坏的 tty"
msgid "FATAL: %s: change permissions failed: %m"
msgstr "致命:%s:更改权限失败:%m"
-#: login-utils/login.c:526
+#: login-utils/login.c:529
#, c-format
msgid "Last login: %.*s "
msgstr "上次登录:%.*s "
-#: login-utils/login.c:528
+#: login-utils/login.c:531
#, c-format
msgid "from %.*s\n"
msgstr "来自 %.*s\n"
-#: login-utils/login.c:531
+#: login-utils/login.c:534
#, c-format
msgid "on %.*s\n"
msgstr "于 %.*s\n"
-#: login-utils/login.c:549
+#: login-utils/login.c:552
msgid "write lastlog failed"
msgstr "写 lastlog 失败"
-#: login-utils/login.c:640
+#: login-utils/login.c:643
#, c-format
msgid "DIALUP AT %s BY %s"
msgstr "DIALUP AT %s BY %s"
-#: login-utils/login.c:645
+#: login-utils/login.c:648
#, c-format
msgid "ROOT LOGIN ON %s FROM %s"
msgstr "ROOT LOGIN ON %s FROM %s"
-#: login-utils/login.c:648
+#: login-utils/login.c:651
#, c-format
msgid "ROOT LOGIN ON %s"
msgstr "ROOT LOGIN ON %s"
-#: login-utils/login.c:651
+#: login-utils/login.c:654
#, c-format
msgid "LOGIN ON %s BY %s FROM %s"
msgstr "LOGIN ON %s BY %s FROM %s"
-#: login-utils/login.c:654
+#: login-utils/login.c:657
#, c-format
msgid "LOGIN ON %s BY %s"
msgstr "LOGIN ON %s BY %s"
-#: login-utils/login.c:688
+#: login-utils/login.c:691
msgid "login: "
msgstr "登录:"
-#: login-utils/login.c:719
+#: login-utils/login.c:722
#, c-format
msgid "PAM failure, aborting: %s"
msgstr "PAM 失败,将中止:%s"
-#: login-utils/login.c:720
+#: login-utils/login.c:723
#, c-format
msgid "Couldn't initialize PAM: %s"
msgstr "无法初始化 PAM:%s"
-#: login-utils/login.c:790
+#: login-utils/login.c:793
#, c-format
msgid "FAILED LOGIN %u FROM %s FOR %s, %s"
msgstr "FAILED LOGIN %u FROM %s FOR %s, %s"
-#: login-utils/login.c:798 login-utils/sulogin.c:1012
+#: login-utils/login.c:801 login-utils/sulogin.c:1012
#, c-format
msgid ""
"Login incorrect\n"
@@ -7536,17 +7553,17 @@ msgstr ""
"登录不正确\n"
"\n"
-#: login-utils/login.c:813
+#: login-utils/login.c:816
#, c-format
msgid "TOO MANY LOGIN TRIES (%u) FROM %s FOR %s, %s"
msgstr "TOO MANY LOGIN TRIES (%u) FROM %s FOR %s, %s"
-#: login-utils/login.c:819
+#: login-utils/login.c:822
#, c-format
msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-#: login-utils/login.c:827
+#: login-utils/login.c:830
#, c-format
msgid ""
"\n"
@@ -7555,7 +7572,7 @@ msgstr ""
"\n"
"登录不正确\n"
-#: login-utils/login.c:855 login-utils/login.c:1246 login-utils/login.c:1269
+#: login-utils/login.c:858 login-utils/login.c:1248 login-utils/login.c:1271
msgid ""
"\n"
"Session setup problem, abort."
@@ -7563,96 +7580,96 @@ msgstr ""
"\n"
"会话设置问题,中止。"
-#: login-utils/login.c:856
+#: login-utils/login.c:859
#, c-format
msgid "NULL user name in %s:%d. Abort."
msgstr "%s:%d 中是空(NULL)用户名。中止。"
-#: login-utils/login.c:995
+#: login-utils/login.c:998
#, c-format
msgid "TIOCSCTTY failed: %m"
msgstr "TIOCSCTTY 失败:%m"
-#: login-utils/login.c:1099
+#: login-utils/login.c:1102
#, fuzzy, c-format
msgid " %s [-p] [-h <host>] [-H] [[-f] <username>]\n"
msgstr "用法:login [-p] [-h <主机>] [-H] [[-f] <用户名>]\n"
-#: login-utils/login.c:1101
+#: login-utils/login.c:1104
msgid "Begin a session on the system.\n"
msgstr "在此系统上开始一次会话。\n"
-#: login-utils/login.c:1104
+#: login-utils/login.c:1107
#, fuzzy
msgid " -p do not destroy the environment"
msgstr " -f 不分割长行\n"
-#: login-utils/login.c:1105
+#: login-utils/login.c:1108
msgid " -f skip a second login authentication"
msgstr ""
-#: login-utils/login.c:1106
+#: login-utils/login.c:1109
msgid " -h <host> hostname to be used for utmp logging"
msgstr ""
-#: login-utils/login.c:1107
+#: login-utils/login.c:1110
#, fuzzy
msgid " -H suppress hostname in the login prompt"
msgstr " -u 屏蔽下划线\n"
-#: login-utils/login.c:1152
+#: login-utils/login.c:1155
#, fuzzy, c-format
msgid "%s: timed out after %u seconds"
msgstr "%u 秒后超时"
-#: login-utils/login.c:1185
+#: login-utils/login.c:1188
#, c-format
msgid "login: -h is for superuser only\n"
msgstr "login:-h 是超级用户专用选项\n"
-#: login-utils/login.c:1247
+#: login-utils/login.c:1249
#, c-format
msgid "Invalid user name \"%s\" in %s:%d. Abort."
msgstr "%2$s:%3$d 中是无效用户名“%1$s”。中止。"
-#: login-utils/login.c:1268
+#: login-utils/login.c:1270
#, c-format
msgid "groups initialization failed: %m"
msgstr "组初始化失败:%m"
-#: login-utils/login.c:1293
+#: login-utils/login.c:1295
msgid "setgid() failed"
msgstr "setgid() 失败"
-#: login-utils/login.c:1323
+#: login-utils/login.c:1325
#, c-format
msgid "You have new mail.\n"
msgstr "有您的新邮件。\n"
-#: login-utils/login.c:1325
+#: login-utils/login.c:1327
#, c-format
msgid "You have mail.\n"
msgstr "有您的邮件。\n"
-#: login-utils/login.c:1339
+#: login-utils/login.c:1341
msgid "setuid() failed"
msgstr "setuid() 失败"
-#: login-utils/login.c:1345 login-utils/sulogin.c:730
+#: login-utils/login.c:1347 login-utils/sulogin.c:730
#, c-format
msgid "%s: change directory failed"
msgstr "%s:更改目录失败"
-#: login-utils/login.c:1352 login-utils/sulogin.c:731
+#: login-utils/login.c:1354 login-utils/sulogin.c:731
#, c-format
msgid "Logging in with home = \"/\".\n"
msgstr "以 home = “/” 登录。\n"
-#: login-utils/login.c:1381
+#: login-utils/login.c:1383
msgid "couldn't exec shell script"
msgstr "无法执行(exec) shell 脚本"
-#: login-utils/login.c:1383
+#: login-utils/login.c:1385
msgid "no shell"
msgstr "无 shell"
@@ -7665,12 +7682,12 @@ msgstr "%s:%s 包含无效的数字值:%s"
msgid "hush login status: restore original IDs failed"
msgstr "静默(hush)登录状态:恢复原 ID 失败"
-#: login-utils/lslogins.c:210 sys-utils/lscpu.c:1423 sys-utils/lscpu.c:1433
+#: login-utils/lslogins.c:210 sys-utils/lscpu.c:1561 sys-utils/lscpu.c:1571
#: sys-utils/lsmem.c:266
msgid "no"
msgstr "否"
-#: login-utils/lslogins.c:219 misc-utils/lsblk.c:185
+#: login-utils/lslogins.c:219 misc-utils/lsblk.c:184
msgid "user name"
msgstr "用户名"
@@ -7894,20 +7911,20 @@ msgstr "不支持的时间类型"
msgid "failed to compose time string"
msgstr "生成时间字符串失败"
-#: login-utils/lslogins.c:719
+#: login-utils/lslogins.c:725
msgid "failed to get supplementary groups"
msgstr "获得附属组失败"
-#: login-utils/lslogins.c:986
+#: login-utils/lslogins.c:992
#, fuzzy, c-format
msgid "cannot found '%s'"
msgstr "打不开 %s"
-#: login-utils/lslogins.c:1162
+#: login-utils/lslogins.c:1168
msgid "internal error: unknown column"
msgstr "内部错误:未知的列"
-#: login-utils/lslogins.c:1260
+#: login-utils/lslogins.c:1266
#, c-format
msgid ""
"\n"
@@ -7916,104 +7933,104 @@ msgstr ""
"\n"
"上次的日志:\n"
-#: login-utils/lslogins.c:1323
+#: login-utils/lslogins.c:1329
msgid "Display information about known users in the system.\n"
msgstr "显示系统中已知用户的信息。\n"
-#: login-utils/lslogins.c:1326
+#: login-utils/lslogins.c:1332
msgid " -a, --acc-expiration display info about passwords expiration\n"
msgstr " -a, --acc-expiration 显示关于密码过期的信息\n"
-#: login-utils/lslogins.c:1327
+#: 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:1328 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:1329
+#: 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:1330
+#: login-utils/lslogins.c:1336
msgid " -G, --supp-groups display information about groups\n"
msgstr " -G, --supp-groups 显示与组相关的信息\n"
-#: login-utils/lslogins.c:1331
+#: 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:1332
+#: 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:1333
+#: login-utils/lslogins.c:1339
msgid " -l, --logins=<logins> display only users from <logins>\n"
msgstr " -l, --logins=<登录方式> 只显示以指定<登录方式>登录的用户\n"
-#: login-utils/lslogins.c:1334 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:1335 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:1336 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:1337 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:1338
+#: login-utils/lslogins.c:1344
#, fuzzy
msgid " --output-all output all columns\n"
msgstr " -O, --output-all 输出所有列\n"
-#: login-utils/lslogins.c:1339
+#: login-utils/lslogins.c:1345
msgid " -p, --pwd display information related to login by password.\n"
msgstr " -p, --pwd 显示与 用密码登录 相关的信息。\n"
-#: login-utils/lslogins.c:1340 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:1341
+#: login-utils/lslogins.c:1347
msgid " -s, --system-accs display system accounts\n"
msgstr " -s, --system-accs 显示系统帐户\n"
-#: login-utils/lslogins.c:1342 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:1343
+#: login-utils/lslogins.c:1349
msgid " -u, --user-accs display user accounts\n"
msgstr " -u, --user-accs 显示用户帐户\n"
-#: login-utils/lslogins.c:1344
+#: login-utils/lslogins.c:1350
msgid " -Z, --context display SELinux contexts\n"
msgstr " -Z, --context 显示 SELinux 环境\n"
-#: login-utils/lslogins.c:1345
+#: 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:1346
+#: 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:1347
+#: 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:1532
+#: login-utils/lslogins.c:1537
msgid "failed to request selinux state"
msgstr "请求 selinux 状态失败"
-#: login-utils/lslogins.c:1546 login-utils/lslogins.c:1551
+#: login-utils/lslogins.c:1551 login-utils/lslogins.c:1556
msgid "Only one user may be specified. Use -l for multiple users."
msgstr "只能指定一个用户。多用户请使用 -l。"
@@ -8042,27 +8059,28 @@ msgstr " %s <组>\n"
msgid "Log in to a new group.\n"
msgstr "以新的组登录。\n"
-#: login-utils/newgrp.c:213
+#: login-utils/newgrp.c:212
msgid "who are you?"
msgstr "您是哪位?"
-#: login-utils/newgrp.c:217 login-utils/newgrp.c:229 sys-utils/nsenter.c:474
+#: login-utils/newgrp.c:216 login-utils/newgrp.c:228 sys-utils/nsenter.c:473
+#: sys-utils/unshare.c:522
msgid "setgid failed"
msgstr "setgid 失败"
-#: login-utils/newgrp.c:222 login-utils/newgrp.c:224
+#: login-utils/newgrp.c:221 login-utils/newgrp.c:223
msgid "no such group"
msgstr "无此组"
-#: login-utils/newgrp.c:233 sys-utils/nsenter.c:476
+#: login-utils/newgrp.c:232 sys-utils/nsenter.c:475 sys-utils/unshare.c:525
msgid "setuid failed"
msgstr "setuid 失败"
#: login-utils/nologin.c:27 misc-utils/lslocks.c:528 misc-utils/mcookie.c:83
#: misc-utils/uuidd.c:62 misc-utils/uuidgen.c:26 sys-utils/dmesg.c:266
-#: sys-utils/ipcmk.c:67 sys-utils/lscpu.c:1891 sys-utils/lsipc.c:291
-#: sys-utils/lsmem.c:494 sys-utils/readprofile.c:104 sys-utils/rtcwake.c:98
-#: term-utils/setterm.c:379 text-utils/line.c:31
+#: sys-utils/ipcmk.c:67 sys-utils/lscpu.c:2175 sys-utils/lsipc.c:291
+#: sys-utils/lsmem.c:494 sys-utils/readprofile.c:104 sys-utils/rtcwake.c:99
+#: term-utils/setterm.c:382 text-utils/line.c:31
#, c-format
msgid " %s [options]\n"
msgstr " %s [选项]\n"
@@ -8071,7 +8089,7 @@ msgstr " %s [选项]\n"
msgid "Politely refuse a login.\n"
msgstr "客气的拒绝登录。\n"
-#: login-utils/nologin.c:87
+#: login-utils/nologin.c:85
#, c-format
msgid "This account is currently not available.\n"
msgstr "此帐户目前不可用。\n"
@@ -8080,75 +8098,76 @@ msgstr "此帐户目前不可用。\n"
msgid " (core dumped)"
msgstr " (核心已转储)"
-#: login-utils/su-common.c:283 misc-utils/rename.c:293 term-utils/script.c:706
+#: login-utils/su-common.c:282 misc-utils/rename.c:293 term-utils/script.c:706
msgid "failed to get terminal attributes"
msgstr "取终端属性失败"
-#: login-utils/su-common.c:307
+#: login-utils/su-common.c:304
#, fuzzy
msgid "failed to create pseudo-terminal"
msgstr "分配输出表失败"
-#: login-utils/su-common.c:493 login-utils/su-common.c:767
+#: login-utils/su-common.c:495 login-utils/su-common.c:769
msgid "cannot block signals"
msgstr "无法阻塞信号"
-#: login-utils/su-common.c:529 misc-utils/uuidd.c:411 term-utils/script.c:573
+#: login-utils/su-common.c:531 misc-utils/uuidd.c:414 term-utils/script.c:573
msgid "poll failed"
msgstr "轮询失败"
-#: login-utils/su-common.c:675
+#: login-utils/su-common.c:677
#, fuzzy
msgid "failed to modify environment"
msgstr "打开目录失败"
-#: login-utils/su-common.c:711
+#: login-utils/su-common.c:713
msgid "may not be used by non-root users"
msgstr "非 root 用户不能使用"
-#: login-utils/su-common.c:735
-msgid "incorrect password"
-msgstr "密码错误"
+#: login-utils/su-common.c:737
+#, fuzzy
+msgid "authentication failed"
+msgstr "tcgetattr 失败"
-#: login-utils/su-common.c:748
+#: login-utils/su-common.c:750
#, c-format
msgid "cannot open session: %s"
msgstr "无法打开会话:%s"
-#: login-utils/su-common.c:784
+#: login-utils/su-common.c:786
msgid "cannot initialize signal mask for session"
msgstr ""
-#: login-utils/su-common.c:792
+#: login-utils/su-common.c:794
#, fuzzy
msgid "cannot initialize signal mask"
msgstr "无法阻塞信号"
-#: login-utils/su-common.c:802
+#: login-utils/su-common.c:804
#, fuzzy
msgid "cannot set signal handler for session"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:810 misc-utils/uuidd.c:398 sys-utils/lscpu.c:734
-#: term-utils/script.c:873
+#: login-utils/su-common.c:812 misc-utils/uuidd.c:401 sys-utils/lscpu.c:866
+#: term-utils/script.c:871
msgid "cannot set signal handler"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:818
+#: login-utils/su-common.c:820
#, fuzzy
msgid "cannot set signal mask"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:846
+#: login-utils/su-common.c:848
msgid "cannot create child process"
msgstr "无法创建子进程"
-#: login-utils/su-common.c:865
+#: login-utils/su-common.c:867
#, c-format
msgid "cannot change directory to %s"
msgstr "无法更改到 %s 目录"
-#: login-utils/su-common.c:884
+#: login-utils/su-common.c:886
#, c-format
msgid ""
"\n"
@@ -8157,63 +8176,63 @@ msgstr ""
"\n"
"会话已终止,正在杀死 shell..."
-#: login-utils/su-common.c:895
+#: login-utils/su-common.c:897
#, c-format
msgid " ...killed.\n"
msgstr " ...已杀死。\n"
-#: login-utils/su-common.c:996
+#: login-utils/su-common.c:998
#, fuzzy
msgid "failed to set the PATH environment variable"
msgstr "设置环境变量 %s 失败"
-#: login-utils/su-common.c:1073
+#: login-utils/su-common.c:1075
msgid "cannot set groups"
msgstr "无法设置 组"
-#: login-utils/su-common.c:1079
+#: login-utils/su-common.c:1081
#, fuzzy, c-format
msgid "failed to user credentials: %s"
msgstr "解析级别“%s”失败"
-#: login-utils/su-common.c:1089 sys-utils/eject.c:660
+#: login-utils/su-common.c:1091 sys-utils/eject.c:658
msgid "cannot set group id"
msgstr "无法设置 组 id"
-#: login-utils/su-common.c:1091 sys-utils/eject.c:663
+#: login-utils/su-common.c:1093 sys-utils/eject.c:661
msgid "cannot set user id"
msgstr "无法设置 用户 id"
-#: login-utils/su-common.c:1159
+#: login-utils/su-common.c:1161
#, fuzzy
msgid " -m, -p, --preserve-environment do not reset environment variables\n"
msgstr " -m, -p, --preserve-environment 不重置环境变量\n"
-#: login-utils/su-common.c:1160
+#: login-utils/su-common.c:1162
#, fuzzy
msgid " -w, --whitelist-environment <list> don't reset specified variables\n"
msgstr " -m, -p, --preserve-environment 不重置环境变量\n"
-#: login-utils/su-common.c:1163
+#: login-utils/su-common.c:1165
msgid " -g, --group <group> specify the primary group\n"
msgstr " -g, --group <组> 指定主组\n"
-#: login-utils/su-common.c:1164
+#: login-utils/su-common.c:1166
#, fuzzy
msgid " -G, --supp-group <group> specify a supplemental group\n"
msgstr ""
" -G, --supp-group <组> 指定一个辅助组\n"
"\n"
-#: login-utils/su-common.c:1167
+#: login-utils/su-common.c:1169
msgid " -, -l, --login make the shell a login shell\n"
msgstr " -, -l, --login 使 shell 成为登录 shell\n"
-#: login-utils/su-common.c:1168
+#: login-utils/su-common.c:1170
msgid " -c, --command <command> pass a single command to the shell with -c\n"
msgstr " -c, --command <命令> 使用 -c 向 shell 传递一条命令\n"
-#: login-utils/su-common.c:1169
+#: login-utils/su-common.c:1171
msgid ""
" --session-command <command> pass a single command to the shell with -c\n"
" and do not create a new session\n"
@@ -8221,20 +8240,20 @@ msgstr ""
" --session-command <命令> 使用 -c 向 shell 传递一条命令\n"
" 而不创建新会话\n"
-#: login-utils/su-common.c:1171
+#: login-utils/su-common.c:1173
msgid " -f, --fast pass -f to the shell (for csh or tcsh)\n"
msgstr " -f, --fast 向shell 传递 -f 选项(csh 或 tcsh)\n"
-#: login-utils/su-common.c:1172
+#: login-utils/su-common.c:1174
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:1173
+#: login-utils/su-common.c:1175
#, fuzzy
msgid " -P, --pty create a new pseudo-terminal\n"
msgstr " -t, --table 创建表格\n"
-#: login-utils/su-common.c:1183
+#: login-utils/su-common.c:1185
#, fuzzy, c-format
msgid ""
" %1$s [options] -u <user> [[--] <command>]\n"
@@ -8243,7 +8262,7 @@ msgstr ""
" %1$s [选项] <设备> [[-N] <分区>]\n"
" %1$s [选项] <命令>\n"
-#: login-utils/su-common.c:1188
+#: login-utils/su-common.c:1190
#, fuzzy
msgid ""
"Run <command> with the effective user ID and group ID of <user>. If -u is\n"
@@ -8255,17 +8274,17 @@ msgstr ""
"将退而使用与 su(1) 兼容的语法并执行标准 shell。\n"
"选项 -c、-f、-l 及 -s 与 -u 相互排斥。\n"
-#: login-utils/su-common.c:1193
+#: login-utils/su-common.c:1195
#, fuzzy
msgid " -u, --user <user> username\n"
msgstr " -u, --user <用户> 用户名\n"
-#: login-utils/su-common.c:1204
+#: login-utils/su-common.c:1206
#, c-format
msgid " %s [options] [-] [<user> [<argument>...]]\n"
msgstr " %s [选项] [-] [<用户> [<参数>...]]\n"
-#: login-utils/su-common.c:1208
+#: login-utils/su-common.c:1210
#, fuzzy
msgid ""
"Change the effective user ID and group ID to that of <user>.\n"
@@ -8275,18 +8294,18 @@ msgstr ""
"将有效用户 id 和组 id 更改为<用户>的 id。\n"
"单个 - 视为 -l。如果未指定<用户>,将假定为 root。\n"
-#: login-utils/su-common.c:1254
+#: login-utils/su-common.c:1256
#, c-format
msgid "specifying more than %d supplemental group is not possible"
msgid_plural "specifying more than %d supplemental groups is not possible"
msgstr[0] "不能指定多于 %d 个补充组"
-#: login-utils/su-common.c:1260
+#: login-utils/su-common.c:1262
#, c-format
msgid "group %s does not exist"
msgstr "组 %s 不存在"
-#: login-utils/su-common.c:1374
+#: login-utils/su-common.c:1376
#, fuzzy
msgid "--pty is not supported for your system"
msgstr "您的系统不支持 --reload"
@@ -8412,7 +8431,7 @@ msgstr ""
" -t, --timeout <秒数> 等待密码的最大时间(默认:无限制)\n"
" -e, --force 如果 getpwnam(3) 失败,直接检查密码文件\n"
-#: login-utils/sulogin.c:864 misc-utils/findmnt.c:1491 sys-utils/wdctl.c:524
+#: login-utils/sulogin.c:866 misc-utils/findmnt.c:1488 sys-utils/wdctl.c:524
#: term-utils/agetty.c:837 term-utils/wall.c:216
msgid "invalid timeout argument"
msgstr "无效的 timeout 超时参数"
@@ -8490,16 +8509,16 @@ msgstr " -r, --reverse 将转储的数据写回 utmp 文件\n"
msgid " -o, --output <file> write to file instead of standard output\n"
msgstr " -o, --output <文件> 写入文件而非标准输出\n"
-#: login-utils/utmpdump.c:377
+#: login-utils/utmpdump.c:375
msgid "following standard input is unsupported"
msgstr "不支持跟随(follow)标准输入"
-#: login-utils/utmpdump.c:383
+#: login-utils/utmpdump.c:381
#, c-format
msgid "Utmp undump of %s\n"
msgstr "%s 的 Utmp undump\n"
-#: login-utils/utmpdump.c:386
+#: login-utils/utmpdump.c:384
#, c-format
msgid "Utmp dump of %s\n"
msgstr "%s 的 Utmp dump\n"
@@ -8544,34 +8563,29 @@ msgstr "无法对文件 chmod"
msgid "Edit the password or group file.\n"
msgstr "编辑密码或组文件。\n"
-#: login-utils/vipw.c:361
+#: login-utils/vipw.c:360
msgid "You are using shadow groups on this system.\n"
msgstr "您正在使用此系统上的遮蔽(shadow)组。\n"
-#: login-utils/vipw.c:362
+#: login-utils/vipw.c:361
msgid "You are using shadow passwords on this system.\n"
msgstr "您正在使用此系统上的遮蔽(shadow)密码。\n"
#. TRANSLATORS: this program uses for y and n rpmatch(3),
#. * which means they can be translated.
-#: login-utils/vipw.c:366
+#: login-utils/vipw.c:365
#, c-format
msgid "Would you like to edit %s now [y/n]? "
msgstr "您想现在编辑 %s 吗[y/n]?"
-#: misc-utils/blkid.c:66
-#, fuzzy, c-format
-msgid "%s from %s (libblkid %s, %s)\n"
-msgstr "%s,来自 %s(libmount %s"
-
-#: misc-utils/blkid.c:76
+#: misc-utils/blkid.c:70
#, c-format
msgid ""
" %s --label <label> | --uuid <uuid>\n"
"\n"
msgstr ""
-#: misc-utils/blkid.c:77
+#: misc-utils/blkid.c:71
#, c-format
msgid ""
" %s [--cache-file <file>] [-ghlLv] [--output <format>] [--match-tag <tag>] \n"
@@ -8579,7 +8593,7 @@ msgid ""
"\n"
msgstr ""
-#: misc-utils/blkid.c:79
+#: misc-utils/blkid.c:73
#, c-format
msgid ""
" %s -p [--match-tag <tag>] [--offset <offset>] [--size <size>] \n"
@@ -8587,12 +8601,12 @@ msgid ""
"\n"
msgstr ""
-#: misc-utils/blkid.c:81
+#: misc-utils/blkid.c:75
#, c-format
msgid " %s -i [--match-tag <tag>] [--output <format>] <dev> ...\n"
msgstr ""
-#: misc-utils/blkid.c:83
+#: misc-utils/blkid.c:77
#, fuzzy
msgid ""
" -c, --cache-file <file> read from <file> instead of reading from the default\n"
@@ -8601,119 +8615,124 @@ msgstr ""
" -A, --adjfile <文件> 指定 adjust 文件的路径\n"
" 默认为 %s\n"
-#: misc-utils/blkid.c:85
+#: misc-utils/blkid.c:79
#, fuzzy
msgid " -d, --no-encoding don't encode non-printing characters\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/blkid.c:86
+#: misc-utils/blkid.c:80
msgid " -g, --garbage-collect garbage collect the blkid cache\n"
msgstr ""
-#: misc-utils/blkid.c:87
+#: misc-utils/blkid.c:81
msgid ""
" -o, --output <format> output format; can be one of:\n"
" value, device, export or full; (default: full)\n"
msgstr ""
-#: misc-utils/blkid.c:89
+#: misc-utils/blkid.c:83
#, fuzzy
msgid " -k, --list-filesystems list all known filesystems/RAIDs and exit\n"
msgstr " -l, --list-shells 打印 shell 列表并退出\n"
-#: misc-utils/blkid.c:90
+#: misc-utils/blkid.c:84
msgid " -s, --match-tag <tag> show specified tag(s) (default show all tags)\n"
msgstr ""
-#: misc-utils/blkid.c:91
+#: misc-utils/blkid.c:85
msgid " -t, --match-token <token> find device with a specific token (NAME=value pair)\n"
msgstr ""
-#: misc-utils/blkid.c:92
+#: misc-utils/blkid.c:86
#, fuzzy
msgid " -l, --list-one look up only first device with token specified by -t\n"
msgstr " -l, --list 列出所有或指定的信息(默认)\n"
-#: misc-utils/blkid.c:93
+#: misc-utils/blkid.c:87
#, fuzzy
msgid " -L, --label <label> convert LABEL to device name\n"
msgstr " -s, --size <尺寸> 设备尺寸\n"
-#: misc-utils/blkid.c:94
+#: misc-utils/blkid.c:88
#, fuzzy
msgid " -U, --uuid <uuid> convert UUID to device name\n"
msgstr " -u, --user <用户> 用户名\n"
-#: misc-utils/blkid.c:95
+#: misc-utils/blkid.c:89
#, fuzzy
msgid " <dev> specify device(s) to probe (default: all devices)\n"
msgstr " <设备> 设备(通常是磁盘)的路径\n"
-#: misc-utils/blkid.c:97
+#: misc-utils/blkid.c:91
#, fuzzy
msgid "Low-level probing options:\n"
msgstr "调度选项:\n"
-#: misc-utils/blkid.c:98
+#: misc-utils/blkid.c:92
#, fuzzy
msgid " -p, --probe low-level superblocks probing (bypass cache)\n"
msgstr " -p, --pid 取消共享 pid 名字空间\n"
-#: misc-utils/blkid.c:99
+#: misc-utils/blkid.c:93
#, fuzzy
msgid " -i, --info gather information about I/O limits\n"
msgstr " -i, --info 只打印有关采样步骤(sampling step)的信息\n"
-#: misc-utils/blkid.c:100
+#: misc-utils/blkid.c:94
#, fuzzy
msgid " -S, --size <size> overwrite device size\n"
msgstr " -s, --size <尺寸> 设备尺寸\n"
-#: misc-utils/blkid.c:101
+#: misc-utils/blkid.c:95
#, fuzzy
msgid " -O, --offset <offset> probe at the given offset\n"
msgstr " -H, --host <主机名> 指定登录主机\n"
-#: misc-utils/blkid.c:102
+#: misc-utils/blkid.c:96
#, fuzzy
msgid " -u, --usages <list> filter by \"usage\" (e.g. -u filesystem,raid)\n"
msgstr " -t, --types <列表> 限制文件系统集合\n"
-#: misc-utils/blkid.c:103
+#: misc-utils/blkid.c:97
#, fuzzy
msgid " -n, --match-types <list> filter by filesystem type (e.g. -n vfat,ext3)\n"
msgstr " -t, --types <列表> 限制文件系统集合\n"
-#: misc-utils/blkid.c:235
+#: misc-utils/blkid.c:98
+#, fuzzy
+msgid " -D, --no-part-details don't print info from partition table\n"
+msgstr " -n, --noheadings 不打印列标题\n"
+
+#: misc-utils/blkid.c:230
msgid "(mounted, mtpt unknown)"
msgstr ""
-#: misc-utils/blkid.c:237
+#: misc-utils/blkid.c:232
#, fuzzy
msgid "(in use)"
msgstr "标记为已使用"
-#: misc-utils/blkid.c:239
+#: misc-utils/blkid.c:234
#, fuzzy
msgid "(not mounted)"
msgstr "%s:未挂载"
-#: misc-utils/blkid.c:503
+#: misc-utils/blkid.c:499
#, fuzzy, c-format
msgid "error: %s"
msgstr "解析错误:%s"
-#: misc-utils/blkid.c:548
+#: misc-utils/blkid.c:544
#, c-format
msgid "%s: ambivalent result (probably more filesystems on the device, use wipefs(8) to see more details)"
msgstr ""
-#: misc-utils/blkid.c:594
+#: misc-utils/blkid.c:590
#, fuzzy, c-format
msgid "unknown keyword in -u <list> argument: '%s'"
msgstr "未知参数:%s"
-#: misc-utils/blkid.c:611
+#: misc-utils/blkid.c:607
msgid "error: -u <list> argument is empty"
msgstr ""
@@ -8722,7 +8741,7 @@ msgstr ""
msgid "unsupported output format %s"
msgstr "不支持的参数格式:%s"
-#: misc-utils/blkid.c:759 misc-utils/wipefs.c:736
+#: misc-utils/blkid.c:759 misc-utils/wipefs.c:733
msgid "invalid offset argument"
msgstr "无效的 偏移 参数"
@@ -8744,15 +8763,20 @@ msgstr ""
msgid "-t needs NAME=value pair"
msgstr ""
-#: misc-utils/blkid.c:833
+#: misc-utils/blkid.c:789
+#, fuzzy, c-format
+msgid "%s from %s (libblkid %s, %s)\n"
+msgstr "%s,来自 %s(libmount %s"
+
+#: misc-utils/blkid.c:835
msgid "The low-level probing mode does not support 'list' output format"
msgstr ""
-#: misc-utils/blkid.c:846
+#: misc-utils/blkid.c:848
msgid "The low-level probing mode requires a device"
msgstr ""
-#: misc-utils/blkid.c:896
+#: misc-utils/blkid.c:898
msgid "The lookup option requires a search type specified using -t"
msgstr ""
@@ -8768,111 +8792,111 @@ msgstr "无效的 周 参数"
msgid "illegal week value: use 1-54"
msgstr "非法的 周 值:请使用 1-54"
-#: misc-utils/cal.c:466
+#: misc-utils/cal.c:465
#, c-format
msgid "failed to parse timestamp or unknown month name: %s"
msgstr " 解析时间戳失败或月份名未知:%s"
-#: misc-utils/cal.c:475
+#: misc-utils/cal.c:474
msgid "illegal day value"
msgstr "日 值不合法"
-#: misc-utils/cal.c:477 misc-utils/cal.c:501
+#: misc-utils/cal.c:476 misc-utils/cal.c:500
#, c-format
msgid "illegal day value: use 1-%d"
msgstr "日 值不合法:请使用 1-%d"
-#: misc-utils/cal.c:481 misc-utils/cal.c:489
+#: misc-utils/cal.c:480 misc-utils/cal.c:488
msgid "illegal month value: use 1-12"
msgstr "月份值不合法:请使用 1-12"
-#: misc-utils/cal.c:485
+#: misc-utils/cal.c:484
#, c-format
msgid "unknown month name: %s"
msgstr "月份名未知:%s"
-#: misc-utils/cal.c:492 misc-utils/cal.c:496
+#: misc-utils/cal.c:491 misc-utils/cal.c:495
msgid "illegal year value"
msgstr "年份值不合法"
-#: misc-utils/cal.c:494
+#: misc-utils/cal.c:493
msgid "illegal year value: use positive integer"
msgstr "年份值不合法:请使用正整数"
-#: misc-utils/cal.c:530 misc-utils/cal.c:543
+#: misc-utils/cal.c:529 misc-utils/cal.c:542
#, c-format
msgid "illegal week value: year %d doesn't have week %d"
msgstr "非法的 周 值:%d 年没有第 %d 周"
-#: misc-utils/cal.c:1099
+#: misc-utils/cal.c:1110
#, c-format
msgid " %s [options] [[[day] month] year]\n"
msgstr " %s [选项] [[[日] 月] 年]\n"
-#: misc-utils/cal.c:1100
+#: misc-utils/cal.c:1111
#, c-format
msgid " %s [options] <timestamp|monthname>\n"
msgstr " %s [选项] <时间戳|月份名>\n"
-#: misc-utils/cal.c:1103
+#: misc-utils/cal.c:1114
msgid "Display a calendar, or some part of it.\n"
msgstr "显示日历或部分日历。\n"
-#: misc-utils/cal.c:1104
+#: misc-utils/cal.c:1115
msgid "Without any arguments, display the current month.\n"
msgstr "不带参数时,显示当月日历。\n"
-#: misc-utils/cal.c:1107
+#: misc-utils/cal.c:1118
msgid " -1, --one show only a single month (default)\n"
msgstr " -1, --one 只显示一个月(默认)\n"
-#: misc-utils/cal.c:1108
+#: misc-utils/cal.c:1119
msgid " -3, --three show three months spanning the date\n"
msgstr " -3, --three 显示该日期前后三个月\n"
-#: misc-utils/cal.c:1109
+#: misc-utils/cal.c:1120
msgid " -n, --months <num> show num months starting with date's month\n"
msgstr " -n, --months < 数字> 显示以日期所在月份开始的若干个月\n"
-#: misc-utils/cal.c:1110
+#: misc-utils/cal.c:1121
msgid " -S, --span span the date when displaying multiple months\n"
msgstr " -S, --span 显示多个月份时的日期范围\n"
-#: misc-utils/cal.c:1111
+#: misc-utils/cal.c:1122
msgid " -s, --sunday Sunday as first day of week\n"
msgstr " -s, --sunday 周日作为一周的第一天\n"
-#: misc-utils/cal.c:1112
+#: misc-utils/cal.c:1123
msgid " -m, --monday Monday as first day of week\n"
msgstr " -m, --monday 周一作为一周的第一天\n"
-#: misc-utils/cal.c:1113
+#: misc-utils/cal.c:1124
#, fuzzy
msgid " -j, --julian use day-of-year for all calendars\n"
msgstr " -j, --julian 输出儒略日期\n"
-#: misc-utils/cal.c:1114
+#: misc-utils/cal.c:1125
msgid " --reform <val> Gregorian reform date (1752|gregorian|iso|julian)\n"
msgstr ""
-#: misc-utils/cal.c:1115
+#: misc-utils/cal.c:1126
#, fuzzy
msgid " --iso alias for --reform=iso\n"
msgstr " t - 原生格式的表"
-#: misc-utils/cal.c:1116
+#: misc-utils/cal.c:1127
msgid " -y, --year show the whole year\n"
msgstr " -y, --year 显示全年\n"
-#: misc-utils/cal.c:1117
+#: misc-utils/cal.c:1128
msgid " -Y, --twelve show the next twelve months\n"
msgstr " -Y, --twelve 显示之后的 12 个月\n"
-#: misc-utils/cal.c:1118
+#: misc-utils/cal.c:1129
msgid " -w, --week[=<num>] show US or ISO-8601 week numbers\n"
msgstr " -w, --week[=<数字>] 显示美国或 ISO-8601 周数\n"
-#: misc-utils/cal.c:1119
+#: misc-utils/cal.c:1130
msgid " --color[=<when>] colorize messages (auto, always or never)\n"
msgstr " --color[=<时机>] 消息彩色显示(auto, always 或 never)\n"
@@ -8946,7 +8970,7 @@ msgstr " -o, --output <列表> 输出列\n"
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: misc-utils/fincore.c:343 sys-utils/losetup.c:814
+#: misc-utils/fincore.c:342 sys-utils/losetup.c:820
msgid "no file specified"
msgstr "未指定文件"
@@ -8959,7 +8983,7 @@ msgstr " %s [选项] {LABEL,UUID,PARTUUID,PARTLABEL}=<值>\n"
msgid "Find a filesystem by label or UUID.\n"
msgstr "按标签或 UUID 查找文件系统。\n"
-#: misc-utils/findfs.c:75
+#: misc-utils/findfs.c:74
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析“%s”"
@@ -8972,7 +8996,7 @@ msgstr "源设备"
msgid "mountpoint"
msgstr "挂载点"
-#: misc-utils/findmnt.c:101 misc-utils/lsblk.c:159
+#: misc-utils/findmnt.c:101 misc-utils/lsblk.c:158
msgid "filesystem type"
msgstr "文件系统类型"
@@ -8992,7 +9016,7 @@ msgstr "FS 的特定挂载选项"
msgid "filesystem label"
msgstr "文件系统标签"
-#: misc-utils/findmnt.c:106 misc-utils/lsblk.c:165
+#: misc-utils/findmnt.c:106 misc-utils/lsblk.c:164
msgid "filesystem UUID"
msgstr "文件系统 UUID"
@@ -9000,7 +9024,7 @@ msgstr "文件系统 UUID"
msgid "partition label"
msgstr "分区标签"
-#: misc-utils/findmnt.c:109 misc-utils/lsblk.c:155
+#: misc-utils/findmnt.c:109 misc-utils/lsblk.c:154
msgid "major:minor device number"
msgstr "主:次 设备号"
@@ -9016,19 +9040,19 @@ msgstr "--poll 保存的旧挂载选项"
msgid "old mountpoint saved by --poll"
msgstr "--poll 保存的旧挂载点"
-#: misc-utils/findmnt.c:113 misc-utils/lsblk.c:158
+#: misc-utils/findmnt.c:113 misc-utils/lsblk.c:157
msgid "filesystem size"
msgstr "文件系统大小"
-#: misc-utils/findmnt.c:114 misc-utils/lsblk.c:157
+#: misc-utils/findmnt.c:114 misc-utils/lsblk.c:156
msgid "filesystem size available"
msgstr "文件系统可用大小"
-#: misc-utils/findmnt.c:115 misc-utils/lsblk.c:160
+#: misc-utils/findmnt.c:115 misc-utils/lsblk.c:159
msgid "filesystem size used"
msgstr "文件系统已用大小"
-#: misc-utils/findmnt.c:116 misc-utils/lsblk.c:161
+#: misc-utils/findmnt.c:116 misc-utils/lsblk.c:160
msgid "filesystem use percentage"
msgstr "文件系统使用百分比"
@@ -9081,8 +9105,8 @@ msgstr "重新挂载"
msgid "move"
msgstr "移动"
-#: misc-utils/findmnt.c:814 misc-utils/findmnt.c:1083 sys-utils/eject.c:714
-#: sys-utils/mount.c:324
+#: misc-utils/findmnt.c:814 misc-utils/findmnt.c:1083 sys-utils/eject.c:712
+#: sys-utils/mount.c:375
msgid "failed to initialize libmount table"
msgstr "初始化 libmount table 失败"
@@ -9093,9 +9117,10 @@ msgstr "不能读 %s"
#: misc-utils/findmnt.c:1023 misc-utils/findmnt.c:1089
#: misc-utils/findmnt-verify.c:94 misc-utils/findmnt-verify.c:481
-#: sys-utils/fstrim.c:229 sys-utils/mount.c:133 sys-utils/mount.c:181
-#: sys-utils/swapoff.c:55 sys-utils/swapoff.c:154 sys-utils/swapon.c:248
-#: sys-utils/swapon.c:278 sys-utils/swapon.c:737 sys-utils/umount.c:187
+#: sys-utils/fstrim.c:238 sys-utils/mount.c:133 sys-utils/mount.c:181
+#: sys-utils/mount.c:248 sys-utils/swapoff.c:55 sys-utils/swapoff.c:154
+#: sys-utils/swapon.c:248 sys-utils/swapon.c:278 sys-utils/swapon.c:737
+#: sys-utils/umount.c:187
msgid "failed to initialize libmount iterator"
msgstr "无法初始化 libmount 迭代器"
@@ -9303,23 +9328,23 @@ msgstr " --verbose 打印更多细节\n"
msgid "unknown direction '%s'"
msgstr "未知方向“%s”"
-#: misc-utils/findmnt.c:1468
+#: misc-utils/findmnt.c:1465
msgid "invalid TID argument"
msgstr "无效的 TID 参数"
-#: misc-utils/findmnt.c:1545
+#: misc-utils/findmnt.c:1544
msgid "--poll accepts only one file, but more specified by --tab-file"
msgstr "--poll 只接受一个文件,但用 --tab-file 指定了多个"
-#: misc-utils/findmnt.c:1549
+#: misc-utils/findmnt.c:1548
msgid "options --target and --source can't be used together with command line element that is not an option"
msgstr "--target 和 --source 选项不能与非选项的命令行元素一起使用"
-#: misc-utils/findmnt.c:1602 sys-utils/fstrim.c:247
+#: misc-utils/findmnt.c:1601 sys-utils/fstrim.c:258
msgid "failed to initialize libmount cache"
msgstr "初始化 libmount 缓存失败"
-#: misc-utils/findmnt.c:1646
+#: misc-utils/findmnt.c:1645
#, c-format
msgid "%s column is requested, but --poll is not enabled"
msgstr "请示了 %s 列,但未启用 --poll"
@@ -9561,6 +9586,161 @@ msgstr "缺少 optstring 参数"
msgid "internal error, contact the author."
msgstr "内部错误,请联系作者。"
+#: misc-utils/hardlink.c:123
+#, c-format
+msgid "Directories: %9lld\n"
+msgstr ""
+
+#: misc-utils/hardlink.c:124
+#, c-format
+msgid "Objects: %9lld\n"
+msgstr ""
+
+#: misc-utils/hardlink.c:125
+#, c-format
+msgid "Regular files: %9lld\n"
+msgstr ""
+
+#: misc-utils/hardlink.c:126
+#, fuzzy, c-format
+msgid "Comparisons: %9lld\n"
+msgstr "分区数:%d"
+
+#: misc-utils/hardlink.c:128
+msgid "Would link: "
+msgstr ""
+
+#: misc-utils/hardlink.c:129
+msgid "Linked: "
+msgstr ""
+
+#: misc-utils/hardlink.c:131
+msgid "Would save: "
+msgstr ""
+
+#: misc-utils/hardlink.c:132
+msgid "Saved: "
+msgstr ""
+
+#: misc-utils/hardlink.c:138
+#, fuzzy, c-format
+msgid " %s [options] directory...\n"
+msgstr " %s [选项] 文件...\n"
+
+#: misc-utils/hardlink.c:141
+msgid "Consolidate duplicate files using hardlinks."
+msgstr ""
+
+#: misc-utils/hardlink.c:144
+msgid " -c, --content compare only contents, ignore permission, etc."
+msgstr ""
+
+#: misc-utils/hardlink.c:145
+#, fuzzy
+msgid " -n, --dry-run don't actually link anything"
+msgstr " -n, --noheadings 不打印标题\n"
+
+#: misc-utils/hardlink.c:146
+#, fuzzy
+msgid " -v, --verbose print summary after hardlinking"
+msgstr " -v, --verbose 打印当前进行的操作\n"
+
+#: misc-utils/hardlink.c:147
+#, fuzzy
+msgid " -vv print every hardlinked file and summary"
+msgstr " -r, --raw 打印原生消息缓冲区\n"
+
+#: misc-utils/hardlink.c:148
+#, fuzzy
+msgid " -f, --force force hardlinking across filesystems"
+msgstr " -f, --fs 输出文件系统信息\n"
+
+#: misc-utils/hardlink.c:149
+msgid " -x, --exclude <regex> exclude files matching pattern"
+msgstr ""
+
+#: misc-utils/hardlink.c:163
+#, fuzzy
+msgid "integer overflow"
+msgstr "内部错误"
+
+#: misc-utils/hardlink.c:192
+#, c-format
+msgid "%s is on different filesystem than the rest (use -f option to override)."
+msgstr ""
+
+#: misc-utils/hardlink.c:300 sys-utils/unshare.c:206
+#, c-format
+msgid "cannot stat %s"
+msgstr "无法 stat %s"
+
+#: misc-utils/hardlink.c:306
+#, fuzzy, c-format
+msgid "file %s changed underneath us"
+msgstr "将目录更改到 %s 失败"
+
+#: misc-utils/hardlink.c:326
+#, c-format
+msgid "failed to hardlink %s to %s (create temporary link as %s failed)"
+msgstr ""
+
+#: misc-utils/hardlink.c:333
+#, c-format
+msgid "failed to hardlink %s to %s (rename temporary link to %s failed)"
+msgstr ""
+
+#: misc-utils/hardlink.c:337
+#, fuzzy, c-format
+msgid "failed to remove temporary link %s"
+msgstr "移除分区失败"
+
+#: misc-utils/hardlink.c:348
+#, fuzzy, c-format
+msgid " %s %s to %s\n"
+msgstr "%s:%s 已移到 %s。\n"
+
+#: misc-utils/hardlink.c:349 misc-utils/hardlink.c:355
+msgid "Would link"
+msgstr ""
+
+#: misc-utils/hardlink.c:349 misc-utils/hardlink.c:355
+msgid "Linked"
+msgstr ""
+
+#: misc-utils/hardlink.c:354
+#, c-format
+msgid " %s %s to %s, %s %jd\n"
+msgstr ""
+
+#: misc-utils/hardlink.c:357
+msgid "would save"
+msgstr ""
+
+#: misc-utils/hardlink.c:357 text-utils/pg.c:1263
+msgid "saved"
+msgstr "已保存"
+
+#: misc-utils/hardlink.c:427
+msgid "option --exclude not supported (built without pcre2)"
+msgstr ""
+
+#: misc-utils/hardlink.c:440
+#, fuzzy
+msgid "no directory specified"
+msgstr "未指定设备"
+
+#: misc-utils/hardlink.c:454
+#, fuzzy, c-format
+msgid "pattern error at offset %d: %s"
+msgstr "%s:第 %d 行解析出错"
+
+#: misc-utils/hardlink.c:499
+#, fuzzy, c-format
+msgid "Skipping %s%s\n"
+msgstr ""
+"\n"
+"...跳过 "
+
#: misc-utils/kill.c:151
#, c-format
msgid "unknown signal %s; valid signals:"
@@ -9607,51 +9787,51 @@ msgstr " -L, --table 列出信号名和数值\n"
msgid " --verbose print pids that will be signaled\n"
msgstr " --verbose 打印将收到信号的 pid\n"
-#: misc-utils/kill.c:240 misc-utils/kill.c:249 sys-utils/setpriv.c:483
-#: sys-utils/unshare.c:389
+#: misc-utils/kill.c:238 misc-utils/kill.c:247 sys-utils/setpriv.c:482
+#: sys-utils/unshare.c:398
#, c-format
msgid "unknown signal: %s"
msgstr "未知信号:%s"
-#: misc-utils/kill.c:260 misc-utils/kill.c:263 misc-utils/kill.c:272
-#: misc-utils/kill.c:284 misc-utils/kill.c:307
+#: misc-utils/kill.c:258 misc-utils/kill.c:261 misc-utils/kill.c:270
+#: misc-utils/kill.c:282 misc-utils/kill.c:305
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s 和 %s 相互排斥"
-#: misc-utils/kill.c:287 sys-utils/eject.c:205 sys-utils/eject.c:230
-#: sys-utils/losetup.c:722 sys-utils/tunelp.c:167 sys-utils/tunelp.c:174
-#: sys-utils/tunelp.c:181 sys-utils/tunelp.c:188 sys-utils/tunelp.c:195
-#: sys-utils/tunelp.c:201 sys-utils/tunelp.c:205 sys-utils/tunelp.c:212
+#: misc-utils/kill.c:285 sys-utils/eject.c:205 sys-utils/eject.c:227
+#: sys-utils/losetup.c:726 sys-utils/tunelp.c:164 sys-utils/tunelp.c:171
+#: sys-utils/tunelp.c:178 sys-utils/tunelp.c:185 sys-utils/tunelp.c:192
+#: sys-utils/tunelp.c:198 sys-utils/tunelp.c:202 sys-utils/tunelp.c:209
#: term-utils/setterm.c:211 term-utils/setterm.c:214 term-utils/setterm.c:233
-#: term-utils/setterm.c:235 term-utils/setterm.c:270 term-utils/setterm.c:272
-#: term-utils/setterm.c:289 term-utils/setterm.c:296 term-utils/setterm.c:298
-#: term-utils/setterm.c:310 term-utils/setterm.c:312 term-utils/setterm.c:321
-#: term-utils/setterm.c:329 term-utils/setterm.c:344 term-utils/setterm.c:346
-#: term-utils/setterm.c:358 term-utils/setterm.c:360 term-utils/setterm.c:371
-#: term-utils/setterm.c:541 term-utils/setterm.c:546 term-utils/setterm.c:551
-#: term-utils/setterm.c:556 term-utils/setterm.c:580 term-utils/setterm.c:585
-#: term-utils/setterm.c:590 term-utils/setterm.c:595 term-utils/setterm.c:600
-#: term-utils/setterm.c:605 term-utils/setterm.c:613 term-utils/setterm.c:646
+#: term-utils/setterm.c:235 term-utils/setterm.c:273 term-utils/setterm.c:275
+#: term-utils/setterm.c:292 term-utils/setterm.c:299 term-utils/setterm.c:301
+#: term-utils/setterm.c:313 term-utils/setterm.c:315 term-utils/setterm.c:324
+#: term-utils/setterm.c:332 term-utils/setterm.c:347 term-utils/setterm.c:349
+#: term-utils/setterm.c:361 term-utils/setterm.c:363 term-utils/setterm.c:374
+#: term-utils/setterm.c:544 term-utils/setterm.c:549 term-utils/setterm.c:554
+#: term-utils/setterm.c:559 term-utils/setterm.c:583 term-utils/setterm.c:588
+#: term-utils/setterm.c:593 term-utils/setterm.c:598 term-utils/setterm.c:603
+#: term-utils/setterm.c:608 term-utils/setterm.c:616 term-utils/setterm.c:649
msgid "argument error"
msgstr "参数出错"
-#: misc-utils/kill.c:304
+#: misc-utils/kill.c:302
#, c-format
msgid "invalid signal name or number: %s"
msgstr "无效的信号名或数字:%s"
-#: misc-utils/kill.c:321
+#: misc-utils/kill.c:319
#, c-format
msgid "sending signal %d to pid %d\n"
msgstr "将信号 %d 发送给 pid %d\n"
-#: misc-utils/kill.c:334
+#: misc-utils/kill.c:332
#, c-format
msgid "sending signal to %s failed"
msgstr "向 %s 发送信号失败"
-#: misc-utils/kill.c:380
+#: misc-utils/kill.c:378
#, c-format
msgid "cannot find process \"%s\""
msgstr "找不到进程“%s”"
@@ -9686,123 +9866,123 @@ msgstr "解析名称 %s 端口 %s 失败:%s"
msgid "failed to connect to %s port %s"
msgstr "连接 %s 端口 %s 失败"
-#: misc-utils/logger.c:354
+#: misc-utils/logger.c:373
#, c-format
msgid "maximum input lines (%d) exceeded"
msgstr "超过了最大输入行数(%d)"
-#: misc-utils/logger.c:506
+#: misc-utils/logger.c:526
msgid "send message failed"
msgstr "发送消息失败"
-#: misc-utils/logger.c:576
+#: misc-utils/logger.c:596
#, c-format
msgid "structured data ID '%s' is not unique"
msgstr "结构化数据的 ID “%s” 不唯一"
-#: misc-utils/logger.c:590
+#: misc-utils/logger.c:610
#, c-format
msgid "--sd-id was not specified for --sd-param %s"
msgstr "没有为 --sd-param %s 指定 --sd-id"
-#: misc-utils/logger.c:769
+#: misc-utils/logger.c:789
msgid "localtime() failed"
msgstr "localtime() 失败"
-#: misc-utils/logger.c:779
+#: misc-utils/logger.c:799
#, c-format
msgid "hostname '%s' is too long"
msgstr "主机名“'%s”太长"
-#: misc-utils/logger.c:785
+#: misc-utils/logger.c:805
#, c-format
msgid "tag '%s' is too long"
msgstr "标签“%s”太长"
-#: misc-utils/logger.c:848
+#: misc-utils/logger.c:868
#, c-format
msgid "ignoring unknown option argument: %s"
msgstr "将忽略未知的选项参数:%s"
-#: misc-utils/logger.c:860
+#: misc-utils/logger.c:880
#, c-format
msgid "invalid argument: %s: using automatic errors"
msgstr "无效参数︰ %s︰ 将使用自动错误"
-#: misc-utils/logger.c:1031
+#: misc-utils/logger.c:1051
#, c-format
msgid " %s [options] [<message>]\n"
msgstr " %s [选项] [<消息>]\n"
-#: misc-utils/logger.c:1034
+#: misc-utils/logger.c:1054
msgid "Enter messages into the system log.\n"
msgstr "将消息输入系统日志。\n"
-#: misc-utils/logger.c:1037
+#: misc-utils/logger.c:1057
msgid " -i log the logger command's PID\n"
msgstr " -i 记录日志程序的 PID\n"
-#: misc-utils/logger.c:1038
+#: misc-utils/logger.c:1058
msgid " --id[=<id>] log the given <id>, or otherwise the PID\n"
msgstr " --id[=<id>] 记录指定的 <id>,否则记录 PID\n"
-#: misc-utils/logger.c:1039
+#: misc-utils/logger.c:1059
msgid " -f, --file <file> log the contents of this file\n"
msgstr " -f, --file <文件> 记录指定文件的内容\n"
-#: misc-utils/logger.c:1040
+#: misc-utils/logger.c:1060
msgid " -e, --skip-empty do not log empty lines when processing files\n"
msgstr " -e, --skip-empty 处理文件时不记录空行\n"
-#: misc-utils/logger.c:1041
+#: misc-utils/logger.c:1061
msgid " --no-act do everything except the write the log\n"
msgstr " --no-act 操作但不实际写入日志\n"
-#: misc-utils/logger.c:1042
+#: misc-utils/logger.c:1062
msgid " -p, --priority <prio> mark given message with this priority\n"
msgstr " -p, --priority <prio> 将指定消息标记为此优先级\n"
-#: misc-utils/logger.c:1043
+#: misc-utils/logger.c:1063
msgid " --octet-count use rfc6587 octet counting\n"
msgstr " --octet-count 使用 rfc6587 八位元组(octet) 计数\n"
-#: misc-utils/logger.c:1044
+#: misc-utils/logger.c:1064
msgid " --prio-prefix look for a prefix on every line read from stdin\n"
msgstr " --prio-prefix 从 stdin 输入的每一行查找前缀\n"
-#: misc-utils/logger.c:1045
+#: misc-utils/logger.c:1065
msgid " -s, --stderr output message to standard error as well\n"
msgstr " -s, --stderr 也向标准错误输出消息\n"
-#: misc-utils/logger.c:1046
+#: misc-utils/logger.c:1066
msgid " -S, --size <size> maximum size for a single message\n"
msgstr " -S, --size <大小> 单条消息的最大尺寸\n"
-#: misc-utils/logger.c:1047
+#: misc-utils/logger.c:1067
msgid " -t, --tag <tag> mark every line with this tag\n"
msgstr " -t, --tag <tag> 向每一行添加指定标记\n"
-#: misc-utils/logger.c:1048
+#: misc-utils/logger.c:1068
msgid " -n, --server <name> write to this remote syslog server\n"
msgstr " -n, --server <名称> 写入指定的远程 syslog 服务器\n"
-#: misc-utils/logger.c:1049
+#: misc-utils/logger.c:1069
msgid " -P, --port <port> use this port for UDP or TCP connection\n"
msgstr " -P, --port <端口> 使用指定端口进行 UDP 或 TCP 连接\n"
-#: misc-utils/logger.c:1050
+#: misc-utils/logger.c:1070
msgid " -T, --tcp use TCP only\n"
msgstr " -T, --tcp 只用 TCP\n"
-#: misc-utils/logger.c:1051
+#: misc-utils/logger.c:1071
msgid " -d, --udp use UDP only\n"
msgstr " -d, --udp 只用 UDP\n"
-#: misc-utils/logger.c:1052
+#: misc-utils/logger.c:1072
msgid " --rfc3164 use the obsolete BSD syslog protocol\n"
msgstr " --rfc3164 使用过时的 BSD syslog 协议\n"
-#: misc-utils/logger.c:1053
+#: misc-utils/logger.c:1073
msgid ""
" --rfc5424[=<snip>] use the syslog protocol (the default for remote);\n"
" <snip> can be notime, or notq, and/or nohost\n"
@@ -9810,23 +9990,23 @@ msgstr ""
" --rfc5424[=<snip>] 使用 syslog 协议(远程时默认);\n"
" <snip> 可以是 notime, 或 notq, 和/或 nohost\n"
-#: misc-utils/logger.c:1055
+#: misc-utils/logger.c:1075
msgid " --sd-id <id> rfc5424 structured data ID\n"
msgstr " --sd-id <id> rfc5424 结构化数据 ID\n"
-#: misc-utils/logger.c:1056
+#: misc-utils/logger.c:1076
msgid " --sd-param <data> rfc5424 structured data name=value\n"
msgstr " --sd-param <数据> rfc5424 结构化数据名称=值\n"
-#: misc-utils/logger.c:1057
+#: misc-utils/logger.c:1077
msgid " --msgid <msgid> set rfc5424 message id field\n"
msgstr " --msgid <msgid> 设置 rfc5424 消息 id 字段\n"
-#: misc-utils/logger.c:1058
+#: misc-utils/logger.c:1078
msgid " -u, --socket <socket> write to this Unix socket\n"
msgstr " -u, --socket <套接字> 写入此 Unix 套接字\n"
-#: misc-utils/logger.c:1059
+#: misc-utils/logger.c:1079
msgid ""
" --socket-errors[=<on|off|auto>]\n"
" print connection errors when using Unix sockets\n"
@@ -9834,378 +10014,398 @@ msgstr ""
" --socket-errors[=<on|off|auto>]\n"
" 使用 Unix 套接字时打印连接错误\n"
-#: misc-utils/logger.c:1062
+#: misc-utils/logger.c:1082
msgid " --journald[=<file>] write journald entry\n"
msgstr " --journald[=<文件>] 写 journald 记录\n"
-#: misc-utils/logger.c:1148
+#: misc-utils/logger.c:1168
#, c-format
msgid "file %s"
msgstr "文件 %s"
-#: misc-utils/logger.c:1163
+#: misc-utils/logger.c:1183
msgid "failed to parse id"
msgstr "解析 id 失败"
-#: misc-utils/logger.c:1181
+#: misc-utils/logger.c:1201
msgid "failed to parse message size"
msgstr "解析消息大小失败"
-#: misc-utils/logger.c:1216
+#: misc-utils/logger.c:1231
msgid "--msgid cannot contain space"
msgstr "--msgid 不能包含空格"
-#: misc-utils/logger.c:1238
+#: misc-utils/logger.c:1253
#, c-format
msgid "invalid structured data ID: '%s'"
msgstr "无效的结构化数据 ID: “%s”"
-#: misc-utils/logger.c:1243
+#: misc-utils/logger.c:1258
#, c-format
msgid "invalid structured data parameter: '%s'"
msgstr "无效的结构化数据参数: “%s”"
-#: misc-utils/logger.c:1253
+#: misc-utils/logger.c:1273
msgid "--file <file> and <message> are mutually exclusive, message is ignored"
msgstr "--file <文件> 和 <消息> 互斥,消息已忽略"
-#: misc-utils/logger.c:1260
+#: misc-utils/logger.c:1280
msgid "journald entry could not be written"
msgstr "无法写入 journald 项"
-#: misc-utils/look.c:360
+#: misc-utils/look.c:359
#, c-format
msgid " %s [options] <string> [<file>...]\n"
msgstr " %s [选项] <字符串> [<文件>...]\n"
-#: misc-utils/look.c:363
+#: misc-utils/look.c:362
msgid "Display lines beginning with a specified string.\n"
msgstr "显示以指定字符串开头的行。\n"
-#: misc-utils/look.c:366
+#: misc-utils/look.c:365
msgid " -a, --alternative use the alternative dictionary\n"
msgstr " -a, --alternative 使用替代字典\n"
-#: misc-utils/look.c:367
+#: misc-utils/look.c:366
msgid " -d, --alphanum compare only blanks and alphanumeric characters\n"
msgstr " -d, --alphanum 只比较空白和字母数字字符\n"
-#: misc-utils/look.c:368
+#: misc-utils/look.c:367
msgid " -f, --ignore-case ignore case differences when comparing\n"
msgstr " -f, --ignore-case 比较时忽略大小写\n"
-#: misc-utils/look.c:369
+#: misc-utils/look.c:368
msgid " -t, --terminate <char> define the string-termination character\n"
msgstr " -t, --terminate <字符> 定义字符串终止字符\n"
-#: misc-utils/lsblk.c:151
+#: misc-utils/lsblk.c:150
msgid "device name"
msgstr "设备名"
-#: misc-utils/lsblk.c:152
+#: misc-utils/lsblk.c:151
msgid "internal kernel device name"
msgstr "内部内核设备名称"
-#: misc-utils/lsblk.c:153
+#: misc-utils/lsblk.c:152
msgid "internal parent kernel device name"
msgstr "内部上级内核设备名称"
-#: misc-utils/lsblk.c:154
+#: misc-utils/lsblk.c:153
#, fuzzy
msgid "path to the device node"
msgstr "设备的状态"
-#: misc-utils/lsblk.c:163 sys-utils/zramctl.c:86
+#: misc-utils/lsblk.c:162 sys-utils/zramctl.c:86
msgid "where the device is mounted"
msgstr "设备挂载位置"
-#: misc-utils/lsblk.c:164 misc-utils/wipefs.c:109
+#: misc-utils/lsblk.c:163 misc-utils/wipefs.c:109
msgid "filesystem LABEL"
msgstr "文件系统标签"
-#: misc-utils/lsblk.c:167
+#: misc-utils/lsblk.c:166
msgid "partition table identifier (usually UUID)"
msgstr ""
-#: misc-utils/lsblk.c:168
+#: misc-utils/lsblk.c:167
#, fuzzy
msgid "partition table type"
msgstr "未知的分区表类型"
-#: misc-utils/lsblk.c:170
+#: misc-utils/lsblk.c:169
msgid "partition type UUID"
msgstr "分区类型 UUID"
-#: misc-utils/lsblk.c:171
+#: misc-utils/lsblk.c:170
msgid "partition LABEL"
msgstr "分区 LABEL"
-#: misc-utils/lsblk.c:175
+#: misc-utils/lsblk.c:174
msgid "read-ahead of the device"
msgstr "该设备的预读(read-ahead)"
-#: misc-utils/lsblk.c:176 sys-utils/losetup.c:79
+#: misc-utils/lsblk.c:175 sys-utils/losetup.c:79
msgid "read-only device"
msgstr "只读设备"
-#: misc-utils/lsblk.c:177
+#: misc-utils/lsblk.c:176
msgid "removable device"
msgstr "可移动设备"
-#: misc-utils/lsblk.c:178
+#: misc-utils/lsblk.c:177
msgid "removable or hotplug device (usb, pcmcia, ...)"
msgstr "可移动或热插拔设备(usb, pcmcia, ...)"
-#: misc-utils/lsblk.c:179
+#: misc-utils/lsblk.c:178
msgid "rotational device"
msgstr "转动设备"
-#: misc-utils/lsblk.c:180
+#: misc-utils/lsblk.c:179
msgid "adds randomness"
msgstr "添加随机性"
-#: misc-utils/lsblk.c:181
+#: misc-utils/lsblk.c:180
msgid "device identifier"
msgstr "设备标识符"
-#: misc-utils/lsblk.c:182
+#: misc-utils/lsblk.c:181
msgid "disk serial number"
msgstr "磁盘序列号"
-#: misc-utils/lsblk.c:183
+#: misc-utils/lsblk.c:182
msgid "size of the device"
msgstr "磁盘容量"
-#: misc-utils/lsblk.c:184
+#: misc-utils/lsblk.c:183
msgid "state of the device"
msgstr "设备的状态"
-#: misc-utils/lsblk.c:186
+#: misc-utils/lsblk.c:185
msgid "group name"
msgstr "组名"
-#: misc-utils/lsblk.c:187
+#: misc-utils/lsblk.c:186
msgid "device node permissions"
msgstr "设备节点权限"
-#: misc-utils/lsblk.c:188
+#: misc-utils/lsblk.c:187
msgid "alignment offset"
msgstr "对齐偏移量"
-#: misc-utils/lsblk.c:189
+#: misc-utils/lsblk.c:188
msgid "minimum I/O size"
msgstr "最小 I/O 大小"
-#: misc-utils/lsblk.c:190
+#: misc-utils/lsblk.c:189
msgid "optimal I/O size"
msgstr "最优 I/O 大小"
-#: misc-utils/lsblk.c:191
+#: misc-utils/lsblk.c:190
msgid "physical sector size"
msgstr "物理扇区大小"
-#: misc-utils/lsblk.c:192
+#: misc-utils/lsblk.c:191
msgid "logical sector size"
msgstr "逻辑扇区大小"
-#: misc-utils/lsblk.c:193
+#: misc-utils/lsblk.c:192
msgid "I/O scheduler name"
msgstr "I/O 调度器名称"
-#: misc-utils/lsblk.c:194
+#: misc-utils/lsblk.c:193
msgid "request queue size"
msgstr "请求队列大小"
-#: misc-utils/lsblk.c:195
+#: misc-utils/lsblk.c:194
msgid "device type"
msgstr "设备类型"
-#: misc-utils/lsblk.c:196
+#: misc-utils/lsblk.c:195
msgid "discard alignment offset"
msgstr "忽略对齐偏移量"
-#: misc-utils/lsblk.c:197
+#: misc-utils/lsblk.c:196
msgid "discard granularity"
msgstr "忽略粒度"
-#: misc-utils/lsblk.c:198
+#: misc-utils/lsblk.c:197
msgid "discard max bytes"
msgstr "忽略最大字节数"
-#: misc-utils/lsblk.c:199
+#: misc-utils/lsblk.c:198
msgid "discard zeroes data"
msgstr "忽略零数据"
-#: misc-utils/lsblk.c:200
+#: misc-utils/lsblk.c:199
msgid "write same max bytes"
msgstr "写相同的最大字节数"
-#: misc-utils/lsblk.c:201
+#: misc-utils/lsblk.c:200
msgid "unique storage identifier"
msgstr "惟一存储标识符"
-#: misc-utils/lsblk.c:202
+#: misc-utils/lsblk.c:201
msgid "Host:Channel:Target:Lun for SCSI"
msgstr "SCSI 的 Host:Channel:Target:Lun"
-#: misc-utils/lsblk.c:203
+#: misc-utils/lsblk.c:202
msgid "device transport type"
msgstr "设备传输类型"
-#: misc-utils/lsblk.c:204
+#: misc-utils/lsblk.c:203
msgid "de-duplicated chain of subsystems"
msgstr "对成链的子系统去重"
-#: misc-utils/lsblk.c:205
+#: misc-utils/lsblk.c:204
msgid "device revision"
msgstr "设备修订版本"
-#: misc-utils/lsblk.c:206
+#: misc-utils/lsblk.c:205
msgid "device vendor"
msgstr "设备制造商"
-#: misc-utils/lsblk.c:207
+#: misc-utils/lsblk.c:206
msgid "zone model"
msgstr ""
-#: misc-utils/lsblk.c:1111
+#: misc-utils/lsblk.c:1182
+#, fuzzy
+msgid "failed to allocate device"
+msgstr "分配迭代器失败"
+
+#: misc-utils/lsblk.c:1222
msgid "failed to open device directory in sysfs"
msgstr "打开 sysfs 中的设备目录失败"
-#: misc-utils/lsblk.c:1263
-#, fuzzy
-msgid "failed to allocate /sys handler"
-msgstr "分配脚本处理程序失败"
-
-#: misc-utils/lsblk.c:1319
+#: misc-utils/lsblk.c:1400
#, c-format
msgid "%s: failed to get sysfs name"
msgstr "%s:获取 sysfs 名称失败"
-#: misc-utils/lsblk.c:1329
+#: misc-utils/lsblk.c:1412
#, c-format
msgid "%s: failed to get whole-disk device number"
msgstr "%s:获取 整盘 设备号失败"
-#: misc-utils/lsblk.c:1381 misc-utils/lsblk.c:1383 misc-utils/lsblk.c:1408
-#: misc-utils/lsblk.c:1410
+#: misc-utils/lsblk.c:1484 misc-utils/lsblk.c:1532
+#, fuzzy
+msgid "failed to allocate /sys handler"
+msgstr "分配脚本处理程序失败"
+
+#: misc-utils/lsblk.c:1591 misc-utils/lsblk.c:1593 misc-utils/lsblk.c:1622
+#: misc-utils/lsblk.c:1624
#, c-format
msgid "failed to parse list '%s'"
msgstr "解析列表“%s”失败"
#. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1388
+#: misc-utils/lsblk.c:1598
#, c-format
msgid "the list of excluded devices is too large (limit is %d devices)"
msgstr "排除设备列表过大(限制为 %d 台设备)"
#. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1415
+#: misc-utils/lsblk.c:1629
#, c-format
msgid "the list of included devices is too large (limit is %d devices)"
msgstr "包含设备列表过大(限制为 %d 台设备)"
-#: misc-utils/lsblk.c:1447 sys-utils/wdctl.c:175
+#: misc-utils/lsblk.c:1698 sys-utils/wdctl.c:175
#, c-format
msgid " %s [options] [<device> ...]\n"
msgstr " %s [选项] [<设备> ...]\n"
-#: misc-utils/lsblk.c:1450
+#: misc-utils/lsblk.c:1701
msgid "List information about block devices.\n"
msgstr "列出块设备的信息。\n"
-#: misc-utils/lsblk.c:1453
+#: misc-utils/lsblk.c:1704
+msgid " -D, --discard print discard capabilities\n"
+msgstr " -D, --discard 打印时丢弃能力\n"
+
+#: misc-utils/lsblk.c:1705
+#, fuzzy
+msgid " -E, --dedup <column> de-duplicate output by <column>\n"
+msgstr " -x, --sort <列> 按<列>对输出排序\n"
+
+#: misc-utils/lsblk.c:1706
+msgid " -I, --include <list> show only devices with specified major numbers\n"
+msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n"
+
+#: misc-utils/lsblk.c:1707 sys-utils/lsmem.c:500
+msgid " -J, --json use JSON output format\n"
+msgstr " -J, --json 使用 JSON 输出格式\n"
+
+#: misc-utils/lsblk.c:1708
+msgid " -O, --output-all output all columns\n"
+msgstr " -O, --output-all 输出所有列\n"
+
+#: misc-utils/lsblk.c:1710
+msgid " -S, --scsi output info about SCSI devices\n"
+msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n"
+
+#: misc-utils/lsblk.c:1711
+#, fuzzy
+msgid " -T, --tree[=<column>] use tree format output\n"
+msgstr " -l, --list 使用列表格式的输出\n"
+
+#: misc-utils/lsblk.c:1712
msgid " -a, --all print all devices\n"
msgstr " -a, --all 打印所有设备\n"
-#: misc-utils/lsblk.c:1455
+#: misc-utils/lsblk.c:1714
msgid " -d, --nodeps don't print slaves or holders\n"
msgstr " -d, --nodeps 不打印从属设备(slave)或占位设备(holder)\n"
-#: misc-utils/lsblk.c:1456
-msgid " -D, --discard print discard capabilities\n"
-msgstr " -D, --discard 打印时丢弃能力\n"
-
-#: misc-utils/lsblk.c:1457
-#, fuzzy
-msgid " -z, --zoned print zone model\n"
-msgstr " -c, --offline 只打印离线 CPU\n"
-
-#: misc-utils/lsblk.c:1458
+#: misc-utils/lsblk.c:1715
msgid " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"
msgstr " -e, --exclude <列表> 根据主设备号排除设备(默认:内存盘)\n"
-#: misc-utils/lsblk.c:1459
+#: misc-utils/lsblk.c:1716
msgid " -f, --fs output info about filesystems\n"
msgstr " -f, --fs 输出文件系统信息\n"
-#: misc-utils/lsblk.c:1460
+#: misc-utils/lsblk.c:1717
msgid " -i, --ascii use ascii characters only\n"
msgstr " -i, --ascii 只使用 ascii 字符\n"
-#: misc-utils/lsblk.c:1461
-msgid " -I, --include <list> show only devices with specified major numbers\n"
-msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n"
-
-#: misc-utils/lsblk.c:1462 sys-utils/lsmem.c:500
-msgid " -J, --json use JSON output format\n"
-msgstr " -J, --json 使用 JSON 输出格式\n"
-
-#: misc-utils/lsblk.c:1463
+#: misc-utils/lsblk.c:1718
msgid " -l, --list use list format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/lsblk.c:1464
+#: misc-utils/lsblk.c:1719
#, fuzzy
-msgid " -T, --tree use tree format output\n"
-msgstr " -l, --list 使用列表格式的输出\n"
+msgid " -M, --merge group parents of sub-trees (usable for RAIDs, Multi-path)\n"
+msgstr " -d, --dump <设备> 转储分区表(用于后续输入)\n"
-#: misc-utils/lsblk.c:1465
+#: misc-utils/lsblk.c:1720
msgid " -m, --perms output info about permissions\n"
msgstr " -m, --perms 输出权限信息\n"
-#: misc-utils/lsblk.c:1466 sys-utils/lsmem.c:504
+#: misc-utils/lsblk.c:1721 sys-utils/lsmem.c:504
msgid " -n, --noheadings don't print headings\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/lsblk.c:1467 sys-utils/lsmem.c:505
+#: misc-utils/lsblk.c:1722 sys-utils/lsmem.c:505
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: misc-utils/lsblk.c:1468
-msgid " -O, --output-all output all columns\n"
-msgstr " -O, --output-all 输出所有列\n"
-
-#: misc-utils/lsblk.c:1469
+#: misc-utils/lsblk.c:1723
msgid " -p, --paths print complete device path\n"
msgstr " -p, --paths 打印完整设备路径\n"
-#: misc-utils/lsblk.c:1472
+#: misc-utils/lsblk.c:1725
msgid " -s, --inverse inverse dependencies\n"
msgstr " -s, --inverse 反向依赖\n"
-#: misc-utils/lsblk.c:1473
-msgid " -S, --scsi output info about SCSI devices\n"
-msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n"
-
-#: misc-utils/lsblk.c:1474
+#: misc-utils/lsblk.c:1726
msgid " -t, --topology output info about topology\n"
msgstr " -t, --topology 输出拓扑信息\n"
-#: misc-utils/lsblk.c:1475
+#: misc-utils/lsblk.c:1727
+#, fuzzy
+msgid " -z, --zoned print zone model\n"
+msgstr " -c, --offline 只打印离线 CPU\n"
+
+#: misc-utils/lsblk.c:1728
msgid " -x, --sort <column> sort output by <column>\n"
msgstr " -x, --sort <列> 按<列>对输出排序\n"
-#: misc-utils/lsblk.c:1476
+#: misc-utils/lsblk.c:1729
#, fuzzy
msgid " --sysroot <dir> use specified directory as system root\n"
msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
-#: misc-utils/lsblk.c:1493
+#: misc-utils/lsblk.c:1746
#, c-format
msgid "failed to access sysfs directory: %s"
msgstr "无法访问 sysfs 目录:%s"
+#: misc-utils/lsblk.c:2084
+#, fuzzy
+msgid "failed to allocate device tree"
+msgstr "分配迭代器失败"
+
#: misc-utils/lslocks.c:73
msgid "command of the process holding the lock"
msgstr "持有锁的进程命令"
@@ -10251,7 +10451,7 @@ msgstr "阻塞锁的进程的 PID"
msgid "failed to parse ID"
msgstr "解析 ID 失败"
-#: misc-utils/lslocks.c:281 sys-utils/nsenter.c:264
+#: misc-utils/lslocks.c:281 sys-utils/nsenter.c:259
msgid "failed to parse pid"
msgstr "解析 pid 失败"
@@ -10306,7 +10506,7 @@ msgid " -r, --raw use the raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
#: 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:995
+#: schedutils/taskset.c:171 sys-utils/choom.c:102 sys-utils/lsns.c:992
#: sys-utils/prlimit.c:585
msgid "invalid PID argument"
msgstr "无效的 PID 参数"
@@ -10338,7 +10538,7 @@ msgstr[0] "从 %2$s 获得 %1$zu 字节\n"
msgid "closing %s failed"
msgstr "关闭 %s 失败"
-#: misc-utils/mcookie.c:164 sys-utils/blkdiscard.c:146 sys-utils/fstrim.c:379
+#: misc-utils/mcookie.c:164 sys-utils/blkdiscard.c:140 sys-utils/fstrim.c:399
#: text-utils/hexdump.c:117
msgid "failed to parse length"
msgstr "解析长度失败"
@@ -10386,19 +10586,19 @@ msgstr ""
" -n, --nosymlinks 不显示符号链接\n"
" -v, --vertical 竖直对齐 模式 和 拥有者\n"
-#: misc-utils/namei.c:409
+#: misc-utils/namei.c:408
msgid "pathname argument is missing"
msgstr "缺少 路径名 参数"
-#: misc-utils/namei.c:415 sys-utils/lsns.c:1069
+#: misc-utils/namei.c:414 sys-utils/lsns.c:1069
msgid "failed to allocate UID cache"
msgstr "分配 UID 缓存失败"
-#: misc-utils/namei.c:418
+#: misc-utils/namei.c:417
msgid "failed to allocate GID cache"
msgstr "分配 GID 缓存失败"
-#: misc-utils/namei.c:440
+#: misc-utils/namei.c:439
#, c-format
msgid "%s: exceeded limit of symlinks"
msgstr "%s:超过了符号链接限制"
@@ -10574,145 +10774,145 @@ msgstr "无法绑定 unix 套接字 %s"
msgid "receiving signal failed"
msgstr "接收信号失败"
-#: misc-utils/uuidd.c:302
+#: misc-utils/uuidd.c:304
msgid "timed out"
msgstr "已超时"
-#: misc-utils/uuidd.c:336 sys-utils/flock.c:272
+#: misc-utils/uuidd.c:339 sys-utils/flock.c:274
msgid "cannot set up timer"
msgstr "无法设置定时器"
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:347
#, c-format
msgid "uuidd daemon is already running at pid %s"
msgstr "uuidd 守护进程已运行,pid 为 %s"
-#: misc-utils/uuidd.c:353
+#: misc-utils/uuidd.c:356
#, c-format
msgid "couldn't listen on unix socket %s"
msgstr "无法侦听 unix 套接字 %s"
-#: misc-utils/uuidd.c:363
+#: misc-utils/uuidd.c:366
#, c-format
msgid "could not truncate file: %s"
msgstr "无法截短文件:%s"
-#: misc-utils/uuidd.c:377
+#: misc-utils/uuidd.c:380
msgid "sd_listen_fds() failed"
msgstr "sd_listen_fds() 失败"
-#: misc-utils/uuidd.c:380
+#: misc-utils/uuidd.c:383
msgid "no file descriptors received, check systemctl status uuidd.socket"
msgstr "没有收到文件描述符,请检查 systemctl 状态 uuidd.socket"
-#: misc-utils/uuidd.c:383
+#: misc-utils/uuidd.c:386
msgid "too many file descriptors received, check uuidd.socket"
msgstr "收到太多文件描述符,请检查 uuidd.socket"
-#: misc-utils/uuidd.c:416
+#: misc-utils/uuidd.c:419
#, c-format
msgid "timeout [%d sec]\n"
msgstr "超时 [%d 秒]\n"
-#: misc-utils/uuidd.c:434 term-utils/setterm.c:899 text-utils/column.c:494
+#: misc-utils/uuidd.c:437 term-utils/setterm.c:902 text-utils/column.c:494
#: text-utils/column.c:517
msgid "read failed"
msgstr "read 失败"
-#: misc-utils/uuidd.c:436
+#: misc-utils/uuidd.c:439
#, c-format
msgid "error reading from client, len = %d"
msgstr "从客户端读取出错,长度 = %d"
-#: misc-utils/uuidd.c:445
+#: misc-utils/uuidd.c:448
#, c-format
msgid "operation %d, incoming num = %d\n"
msgstr "操作 %d,接收数 = %d\n"
-#: misc-utils/uuidd.c:448
+#: misc-utils/uuidd.c:451
#, c-format
msgid "operation %d\n"
msgstr "操作 %d\n"
-#: misc-utils/uuidd.c:464
+#: misc-utils/uuidd.c:467
#, c-format
msgid "Generated time UUID: %s\n"
msgstr "已生成时间 UUID:%s\n"
-#: misc-utils/uuidd.c:474
+#: misc-utils/uuidd.c:477
#, c-format
msgid "Generated random UUID: %s\n"
msgstr "已生成随机 UUID:%s\n"
-#: misc-utils/uuidd.c:483
+#: misc-utils/uuidd.c:486
#, c-format
msgid "Generated time UUID %s and %d following\n"
msgid_plural "Generated time UUID %s and %d following\n"
msgstr[0] "已生成时间 UUID %s 和后续 %d 个\n"
-#: misc-utils/uuidd.c:504
+#: misc-utils/uuidd.c:507
#, c-format
msgid "Generated %d UUID:\n"
msgid_plural "Generated %d UUIDs:\n"
msgstr[0] "已生成 %d 个 UUID:\n"
-#: misc-utils/uuidd.c:518
+#: misc-utils/uuidd.c:521
#, c-format
msgid "Invalid operation %d\n"
msgstr "无效操作 %d\n"
-#: misc-utils/uuidd.c:530
+#: misc-utils/uuidd.c:533
#, c-format
msgid "Unexpected reply length from server %d"
msgstr "服务器 %d 响应长度异常"
-#: misc-utils/uuidd.c:591
+#: misc-utils/uuidd.c:594
msgid "failed to parse --uuids"
msgstr "解析 --uuids 失败"
-#: misc-utils/uuidd.c:608
+#: misc-utils/uuidd.c:611
msgid "uuidd has been built without support for socket activation"
msgstr "uuidd 构建时没有添加套接字激活支持"
-#: misc-utils/uuidd.c:627
+#: misc-utils/uuidd.c:630
msgid "failed to parse --timeout"
msgstr "解析 --timeout 失败"
-#: misc-utils/uuidd.c:640
+#: misc-utils/uuidd.c:643
#, fuzzy, c-format
msgid "socket name too long: %s"
msgstr "卷名过长"
-#: misc-utils/uuidd.c:647
+#: misc-utils/uuidd.c:650
msgid "Both --socket-activation and --socket specified. Ignoring --socket."
msgstr "同时指定了 --socket-activation 和 --socket。将忽略 --socket"
-#: misc-utils/uuidd.c:654 misc-utils/uuidd.c:682
+#: misc-utils/uuidd.c:657 misc-utils/uuidd.c:685
#, c-format
msgid "error calling uuidd daemon (%s)"
msgstr "调用 uuidd 守护进程(%s)出错"
-#: misc-utils/uuidd.c:655 misc-utils/uuidd.c:683
+#: misc-utils/uuidd.c:658 misc-utils/uuidd.c:686
msgid "unexpected error"
msgstr "意外错误"
-#: misc-utils/uuidd.c:663
+#: misc-utils/uuidd.c:666
#, c-format
msgid "%s and %d subsequent UUID\n"
msgid_plural "%s and %d subsequent UUIDs\n"
msgstr[0] "%s 和 %d 个后续 UUID\n"
-#: misc-utils/uuidd.c:667
+#: misc-utils/uuidd.c:670
#, c-format
msgid "List of UUIDs:\n"
msgstr "UUID 列表:\n"
-#: misc-utils/uuidd.c:699
+#: misc-utils/uuidd.c:702
#, c-format
msgid "couldn't kill uuidd running at pid %d"
msgstr "无法运行 pid 为 %d 的 uuidd"
-#: misc-utils/uuidd.c:704
+#: misc-utils/uuidd.c:707
#, c-format
msgid "Killed uuidd running at pid %d.\n"
msgstr "已杀死运行 pid 为 %d 的 uuidd。\n"
@@ -10828,7 +11028,7 @@ msgstr ""
msgid "sha1-based"
msgstr ""
-#: misc-utils/uuidparse.c:267 misc-utils/wipefs.c:177 sys-utils/lscpu.c:1709
+#: misc-utils/uuidparse.c:267 misc-utils/wipefs.c:177 sys-utils/lscpu.c:1958
#: sys-utils/lsns.c:806 sys-utils/zramctl.c:505
msgid "failed to initialize output column"
msgstr "初始化输出列失败"
@@ -10878,7 +11078,7 @@ msgstr " -u 搜索不常见记录\n"
msgid " -l output effective lookup paths\n"
msgstr " -l 输出有效查找路径\n"
-#: misc-utils/whereis.c:648
+#: misc-utils/whereis.c:646
msgid "option -f is missing"
msgstr "缺少 -f 选项"
@@ -11018,7 +11218,7 @@ msgstr " -q, --quiet 禁止输出额外信息\n"
msgid " -t, --types <list> limit the set of filesystem, RAIDs or partition tables"
msgstr " -t, --types <列表> 根据文件系统类型限制文件系统集合\n"
-#: misc-utils/wipefs.c:763
+#: misc-utils/wipefs.c:762
msgid "The --backup option is meaningless in this context"
msgstr "--backup 在此环境中无意义"
@@ -11397,20 +11597,20 @@ msgstr "设置 pid %d 的亲和力失败"
msgid "failed to get pid %d's affinity"
msgstr "获取 pid %d 的亲和力失败"
-#: schedutils/taskset.c:195 sys-utils/chcpu.c:300
+#: schedutils/taskset.c:194 sys-utils/chcpu.c:300
msgid "cannot determine NR_CPUS; aborting"
msgstr "无法确定 NR_CPUS;将中止"
-#: schedutils/taskset.c:204 schedutils/taskset.c:217 sys-utils/chcpu.c:308
+#: schedutils/taskset.c:203 schedutils/taskset.c:216 sys-utils/chcpu.c:307
msgid "cpuset_alloc failed"
msgstr "cpuset_alloc 失败"
-#: schedutils/taskset.c:224 sys-utils/chcpu.c:234
+#: schedutils/taskset.c:223 sys-utils/chcpu.c:234
#, c-format
msgid "failed to parse CPU list: %s"
msgstr "解析 CPU 列表失败:%s"
-#: schedutils/taskset.c:227
+#: schedutils/taskset.c:226
#, c-format
msgid "failed to parse CPU mask: %s"
msgstr "解析 CPU 掩码失败:%s"
@@ -11453,56 +11653,56 @@ msgstr " -z, --zeroout 用 零填充而非丢弃\n"
msgid " -v, --verbose print aligned length and offset\n"
msgstr " -v, --verbose 打印对齐的长度和偏移\n"
-#: sys-utils/blkdiscard.c:150 sys-utils/fstrim.c:383 sys-utils/losetup.c:702
+#: sys-utils/blkdiscard.c:144 sys-utils/fstrim.c:403 sys-utils/losetup.c:706
#: text-utils/hexdump.c:124
msgid "failed to parse offset"
msgstr "解析偏移失败"
-#: sys-utils/blkdiscard.c:154
+#: sys-utils/blkdiscard.c:148
msgid "failed to parse step"
msgstr "解析步长失败"
-#: sys-utils/blkdiscard.c:176 sys-utils/blkzone.c:409 sys-utils/fallocate.c:374
-#: sys-utils/fsfreeze.c:111 sys-utils/fstrim.c:405
+#: sys-utils/blkdiscard.c:175 sys-utils/blkzone.c:408 sys-utils/fallocate.c:373
+#: sys-utils/fsfreeze.c:110 sys-utils/fstrim.c:429
msgid "unexpected number of arguments"
msgstr "参数数量异常"
-#: sys-utils/blkdiscard.c:190
+#: sys-utils/blkdiscard.c:189
#, c-format
msgid "%s: BLKGETSIZE64 ioctl failed"
msgstr "%s:BLKGETSIZE64 ioctl 失败"
-#: sys-utils/blkdiscard.c:192 sys-utils/blkzone.c:107
+#: sys-utils/blkdiscard.c:191 sys-utils/blkzone.c:107
#, c-format
msgid "%s: BLKSSZGET ioctl failed"
msgstr "%s:BLKSSZGET ioctl 失败"
-#: sys-utils/blkdiscard.c:196
+#: sys-utils/blkdiscard.c:195
#, c-format
msgid "%s: offset %<PRIu64> is not aligned to sector size %i"
msgstr "%s: 偏移量 %<PRIu64> 未与扇区大小 %i 对齐"
-#: sys-utils/blkdiscard.c:201 sys-utils/blkzone.c:272
+#: sys-utils/blkdiscard.c:200 sys-utils/blkzone.c:272
#, c-format
msgid "%s: offset is greater than device size"
msgstr "%s:偏移量超过设备大小"
-#: sys-utils/blkdiscard.c:210
+#: sys-utils/blkdiscard.c:209
#, c-format
msgid "%s: length %<PRIu64> is not aligned to sector size %i"
msgstr "%s: 长度 %<PRIu64> 未与扇区大小 %i 对齐"
-#: sys-utils/blkdiscard.c:223
+#: sys-utils/blkdiscard.c:222
#, c-format
msgid "%s: BLKZEROOUT ioctl failed"
msgstr "%s: BLKZEROOUT ioctl 失败"
-#: sys-utils/blkdiscard.c:227
+#: sys-utils/blkdiscard.c:226
#, c-format
msgid "%s: BLKSECDISCARD ioctl failed"
msgstr "%s:BLKSECDISCARD ioctl 失败"
-#: sys-utils/blkdiscard.c:231
+#: sys-utils/blkdiscard.c:230
#, c-format
msgid "%s: BLKDISCARD ioctl failed"
msgstr "%s:BLKDISCARD ioctl 失败"
@@ -11599,22 +11799,22 @@ msgstr " --verbose 打印更多细节\n"
msgid "%s is not valid command name"
msgstr "%s 不是一个有效的块设备"
-#: sys-utils/blkzone.c:380
+#: sys-utils/blkzone.c:377
#, fuzzy
msgid "failed to parse number of zones"
msgstr "解析行数失败"
-#: sys-utils/blkzone.c:384
+#: sys-utils/blkzone.c:381
#, fuzzy
msgid "failed to parse number of sectors"
msgstr "解析行数失败"
-#: sys-utils/blkzone.c:388
+#: sys-utils/blkzone.c:385
#, fuzzy
msgid "failed to parse zone offset"
msgstr "解析偏移失败"
-#: sys-utils/blkzone.c:402 sys-utils/setsid.c:92
+#: sys-utils/blkzone.c:401 sys-utils/setsid.c:92
#, fuzzy
msgid "no command specified"
msgstr "没有指定命令"
@@ -11790,7 +11990,7 @@ msgstr ""
msgid "failed to initialize sysfs handler"
msgstr "%s:初始化 sysfs 处理函数失败"
-#: sys-utils/chcpu.c:339
+#: sys-utils/chcpu.c:338
#, c-format
msgid "unsupported argument: %s"
msgstr "不支持的参数:%s"
@@ -11972,16 +12172,16 @@ msgstr ""
"\n"
"支持的日志设施:\n"
-#: sys-utils/chmem.c:387 sys-utils/lscpu.c:1269 sys-utils/lsmem.c:643
+#: sys-utils/chmem.c:387 sys-utils/lscpu.c:1407 sys-utils/lsmem.c:642
#, fuzzy, c-format
msgid "failed to initialize %s handler"
msgstr "%s:初始化 sysfs 处理函数失败"
-#: sys-utils/chmem.c:434
+#: sys-utils/chmem.c:433
msgid "zone ignored, no valid_zones sysfs attribute present"
msgstr ""
-#: sys-utils/chmem.c:439
+#: sys-utils/chmem.c:438
#, fuzzy, c-format
msgid "unknown memory zone: %s"
msgstr "月份名未知:%s"
@@ -12317,23 +12517,23 @@ msgstr "未知设施“%s”"
msgid "cannot mmap: %s"
msgstr "无法 mmap:%s"
-#: sys-utils/dmesg.c:1435
+#: sys-utils/dmesg.c:1432
msgid "invalid buffer size argument"
msgstr "无效的 缓冲区大小 参数"
-#: sys-utils/dmesg.c:1487
+#: sys-utils/dmesg.c:1486
msgid "--show-delta is ignored when used together with iso8601 time format"
msgstr "--show-delta 与 iso8601 时间格式共用时将忽略"
-#: sys-utils/dmesg.c:1510
+#: sys-utils/dmesg.c:1509
msgid "--raw can be used together with --level or --facility only when reading messages from /dev/kmsg"
msgstr "只有从 /dev/kmsg 读消息时,--raw 才可与 --level 或 --facility 共用"
-#: sys-utils/dmesg.c:1525
+#: sys-utils/dmesg.c:1524
msgid "read kernel buffer failed"
msgstr "读取内核缓冲区失败"
-#: sys-utils/dmesg.c:1544
+#: sys-utils/dmesg.c:1543
msgid "klogctl failed"
msgstr "klogctl 失败"
@@ -12402,272 +12602,272 @@ msgstr "--changerslot/-c 选项的参数无效"
msgid "invalid argument to --cdspeed/-x option"
msgstr "--cdspeed/-x 选项的参数无效"
-#: sys-utils/eject.c:325
+#: sys-utils/eject.c:323
msgid "CD-ROM auto-eject command failed"
msgstr "CD-ROM 自动弹出命令失败"
-#: sys-utils/eject.c:339
+#: sys-utils/eject.c:337
msgid "CD-ROM door lock is not supported"
msgstr "不支持光盘仓门锁"
-#: sys-utils/eject.c:341
+#: sys-utils/eject.c:339
msgid "other users have the drive open and not CAP_SYS_ADMIN"
msgstr "其他用户开启了驱动器仓门,并且非 CAP_SYS_ADMIN"
-#: sys-utils/eject.c:343
+#: sys-utils/eject.c:341
msgid "CD-ROM lock door command failed"
msgstr "CD-ROM 锁仓门命令失败"
-#: sys-utils/eject.c:348
+#: sys-utils/eject.c:346
msgid "CD-Drive may NOT be ejected with device button"
msgstr "CD 驱动器不能通过设备上的按钮弹出"
-#: sys-utils/eject.c:350
+#: sys-utils/eject.c:348
msgid "CD-Drive may be ejected with device button"
msgstr "CD 驱动器可以通过设备上的按钮弹出"
-#: sys-utils/eject.c:361
+#: sys-utils/eject.c:359
msgid "CD-ROM select disc command failed"
msgstr "CD-ROM 选择光盘命令失败"
-#: sys-utils/eject.c:365
+#: sys-utils/eject.c:363
msgid "CD-ROM load from slot command failed"
msgstr "CD-ROM 从槽加载命令失败"
-#: sys-utils/eject.c:367
+#: sys-utils/eject.c:365
msgid "IDE/ATAPI CD-ROM changer not supported by this kernel\n"
msgstr "此内核不支持 IDE/ATAPI CD-ROM\n"
-#: sys-utils/eject.c:385
+#: sys-utils/eject.c:383
msgid "CD-ROM tray close command failed"
msgstr "CD-ROM 关闭仓门命令失败"
-#: sys-utils/eject.c:387
+#: sys-utils/eject.c:385
msgid "CD-ROM tray close command not supported by this kernel\n"
msgstr "此内核不支持 CD-ROM 关闭仓门命令\n"
-#: sys-utils/eject.c:404
+#: sys-utils/eject.c:402
msgid "CD-ROM eject unsupported"
msgstr "不支持 CD-ROM 弹出"
-#: sys-utils/eject.c:432 sys-utils/eject.c:455 sys-utils/eject.c:1009
+#: sys-utils/eject.c:430 sys-utils/eject.c:453 sys-utils/eject.c:1007
msgid "CD-ROM eject command failed"
msgstr "CD-ROM 弹出命令失败"
-#: sys-utils/eject.c:435
+#: sys-utils/eject.c:433
msgid "no CD-ROM information available"
msgstr "没有可用的 CD-ROM 信息"
-#: sys-utils/eject.c:438
+#: sys-utils/eject.c:436
msgid "CD-ROM drive is not ready"
msgstr "CD-ROM 驱动器未就绪"
-#: sys-utils/eject.c:441
+#: sys-utils/eject.c:439
#, fuzzy
msgid "CD-ROM status command failed"
msgstr "CD-ROM 弹出命令失败"
-#: sys-utils/eject.c:481
+#: sys-utils/eject.c:479
msgid "CD-ROM select speed command failed"
msgstr "CD-ROM 选择速度命令失败"
-#: sys-utils/eject.c:483
+#: sys-utils/eject.c:481
msgid "CD-ROM select speed command not supported by this kernel"
msgstr "此内核不支持 CD-ROM 选择速度命令"
-#: sys-utils/eject.c:520
+#: sys-utils/eject.c:518
#, c-format
msgid "%s: failed to finding CD-ROM name"
msgstr "%s:获取 CD-ROM 名称失败"
-#: sys-utils/eject.c:535
+#: sys-utils/eject.c:533
#, c-format
msgid "%s: failed to read speed"
msgstr "%s:读 速度 失败"
-#: sys-utils/eject.c:543
+#: sys-utils/eject.c:541
msgid "failed to read speed"
msgstr "读 速度 失败"
-#: sys-utils/eject.c:583
+#: sys-utils/eject.c:581
msgid "not an sg device, or old sg driver"
msgstr "不是 sg 设备,或为旧 sg 驱动"
-#: sys-utils/eject.c:655
+#: sys-utils/eject.c:653
#, c-format
msgid "%s: unmounting"
msgstr "%s:正在卸载"
-#: sys-utils/eject.c:673
+#: sys-utils/eject.c:671
msgid "unable to fork"
msgstr "无法 fork"
-#: sys-utils/eject.c:680
+#: sys-utils/eject.c:678
#, c-format
msgid "unmount of `%s' did not exit normally"
msgstr "卸载“%s”未正常退出"
-#: sys-utils/eject.c:683
+#: sys-utils/eject.c:681
#, c-format
msgid "unmount of `%s' failed\n"
msgstr "挂臷“%s”失败\n"
-#: sys-utils/eject.c:725
+#: sys-utils/eject.c:723
msgid "failed to parse mount table"
msgstr "解析挂臷表失败"
-#: sys-utils/eject.c:788 sys-utils/eject.c:890
+#: sys-utils/eject.c:786 sys-utils/eject.c:888
#, c-format
msgid "%s: mounted on %s"
msgstr "%s:已挂臷于 %s"
-#: sys-utils/eject.c:831
+#: sys-utils/eject.c:829
msgid "setting CD-ROM speed to auto"
msgstr "正在将 CD-ROM 速度设置为自动"
-#: sys-utils/eject.c:833
+#: sys-utils/eject.c:831
#, c-format
msgid "setting CD-ROM speed to %ldX"
msgstr "正在将 CD-ROM 速度设置为 %ldX"
-#: sys-utils/eject.c:859
+#: sys-utils/eject.c:857
#, c-format
msgid "default device: `%s'"
msgstr "默认设备:“%s”"
-#: sys-utils/eject.c:865
+#: sys-utils/eject.c:863
#, c-format
msgid "using default device `%s'"
msgstr "使用默认设备“%s”"
-#: sys-utils/eject.c:884 sys-utils/rtcwake.c:394
+#: sys-utils/eject.c:882 sys-utils/rtcwake.c:395
#, c-format
msgid "%s: unable to find device"
msgstr "%s:找不到设备"
-#: sys-utils/eject.c:886
+#: sys-utils/eject.c:884
#, c-format
msgid "device name is `%s'"
msgstr "设备名称为“%s”"
-#: sys-utils/eject.c:892 sys-utils/umount.c:332 sys-utils/umount.c:356
+#: sys-utils/eject.c:890 sys-utils/umount.c:332 sys-utils/umount.c:356
#, c-format
msgid "%s: not mounted"
msgstr "%s:未挂载"
-#: sys-utils/eject.c:896
+#: sys-utils/eject.c:894
#, c-format
msgid "%s: disc device: %s (disk device will be used for eject)"
msgstr "%s:盘设备:%s(盘设备将用于弹出)"
-#: sys-utils/eject.c:904
+#: sys-utils/eject.c:902
#, c-format
msgid "%s: not found mountpoint or device with the given name"
msgstr "%s:未找到指定名称的挂载点或设备"
-#: sys-utils/eject.c:907
+#: sys-utils/eject.c:905
#, c-format
msgid "%s: is whole-disk device"
msgstr "%s:是 整盘 设备"
-#: sys-utils/eject.c:911
+#: sys-utils/eject.c:909
#, c-format
msgid "%s: is not hot-pluggable device"
msgstr "%s:不是热插拔设备"
-#: sys-utils/eject.c:915
+#: sys-utils/eject.c:913
#, c-format
msgid "device is `%s'"
msgstr "设备是“%s”"
-#: sys-utils/eject.c:916
+#: sys-utils/eject.c:914
msgid "exiting due to -n/--noop option"
msgstr "将因 -n/--noop 选项退出"
-#: sys-utils/eject.c:930
+#: sys-utils/eject.c:928
#, c-format
msgid "%s: enabling auto-eject mode"
msgstr "%s:正在启用自动弹出模式"
-#: sys-utils/eject.c:932
+#: sys-utils/eject.c:930
#, c-format
msgid "%s: disabling auto-eject mode"
msgstr "%s:正在禁用自动弹出模式"
-#: sys-utils/eject.c:940
+#: sys-utils/eject.c:938
#, c-format
msgid "%s: closing tray"
msgstr "%s:正在关闭仓门"
-#: sys-utils/eject.c:949
+#: sys-utils/eject.c:947
#, c-format
msgid "%s: toggling tray"
msgstr "%s:开关仓门"
-#: sys-utils/eject.c:958
+#: sys-utils/eject.c:956
#, c-format
msgid "%s: listing CD-ROM speed"
msgstr "%s:正在列出 CD-ROM 速度"
-#: sys-utils/eject.c:984
+#: sys-utils/eject.c:982
#, c-format
msgid "error: %s: device in use"
msgstr "错误:%s:设备正在使用"
-#: sys-utils/eject.c:990
+#: sys-utils/eject.c:988
#, c-format
msgid "%s: selecting CD-ROM disc #%ld"
msgstr "%s:正在选择 CD-ROM 盘 #%ld"
-#: sys-utils/eject.c:1006
+#: sys-utils/eject.c:1004
#, c-format
msgid "%s: trying to eject using CD-ROM eject command"
msgstr "%s:正在尝试使用 CD-ROM 弹出命令弹出"
-#: sys-utils/eject.c:1008
+#: sys-utils/eject.c:1006
msgid "CD-ROM eject command succeeded"
msgstr "CD-ROM 弹出命令成功"
-#: sys-utils/eject.c:1013
+#: sys-utils/eject.c:1011
#, c-format
msgid "%s: trying to eject using SCSI commands"
msgstr "%s:正在尝试使用 SCSI 命令弹出"
-#: sys-utils/eject.c:1015
+#: sys-utils/eject.c:1013
msgid "SCSI eject succeeded"
msgstr "SCSI 弹出成功"
-#: sys-utils/eject.c:1016
+#: sys-utils/eject.c:1014
msgid "SCSI eject failed"
msgstr "SCSI 弹出失败"
-#: sys-utils/eject.c:1020
+#: sys-utils/eject.c:1018
#, c-format
msgid "%s: trying to eject using floppy eject command"
msgstr "%s:正在尝试使用软盘弹出命令弹出"
-#: sys-utils/eject.c:1022
+#: sys-utils/eject.c:1020
msgid "floppy eject command succeeded"
msgstr "软盘弹出命令成功"
-#: sys-utils/eject.c:1023
+#: sys-utils/eject.c:1021
msgid "floppy eject command failed"
msgstr "软盘弹出命令失败"
-#: sys-utils/eject.c:1027
+#: sys-utils/eject.c:1025
#, c-format
msgid "%s: trying to eject using tape offline command"
msgstr "%s:正在尝试使用磁带离线命令弹出"
-#: sys-utils/eject.c:1029
+#: sys-utils/eject.c:1027
msgid "tape offline command succeeded"
msgstr "磁带离线命令成功"
-#: sys-utils/eject.c:1030
+#: sys-utils/eject.c:1028
msgid "tape offline command failed"
msgstr "磁带离线命令失败"
-#: sys-utils/eject.c:1034
+#: sys-utils/eject.c:1032
msgid "unable to eject"
msgstr "无法弹出"
@@ -12735,23 +12935,23 @@ msgstr "%s:read 失败"
msgid "%s: %s (%ju bytes) converted to sparse holes.\n"
msgstr "%s:已将 %s(%ju 字节) 转换为稀疏空洞。\n"
-#: sys-utils/fallocate.c:355
+#: sys-utils/fallocate.c:352
msgid "posix_fallocate support is not compiled"
msgstr ""
-#: sys-utils/fallocate.c:369 sys-utils/fsfreeze.c:107
+#: sys-utils/fallocate.c:368 sys-utils/fsfreeze.c:106
msgid "no filename specified"
msgstr "未指定文件名"
-#: sys-utils/fallocate.c:381 sys-utils/fallocate.c:387
+#: sys-utils/fallocate.c:380 sys-utils/fallocate.c:386
msgid "invalid length value specified"
msgstr "指定的长度值无效"
-#: sys-utils/fallocate.c:385
+#: sys-utils/fallocate.c:384
msgid "no length argument specified"
msgstr "没有指定长度参数"
-#: sys-utils/fallocate.c:390
+#: sys-utils/fallocate.c:389
msgid "invalid offset value specified"
msgstr "指定的偏移值无效"
@@ -12810,50 +13010,50 @@ msgstr " -F, --no-fork 执行命令时不 fork\n"
msgid " --verbose increase verbosity\n"
msgstr " --verbose 增加详尽程度\n"
-#: sys-utils/flock.c:106
+#: sys-utils/flock.c:108
#, c-format
msgid "cannot open lock file %s"
msgstr "不能打开锁文件 %s"
-#: sys-utils/flock.c:208
+#: sys-utils/flock.c:210
msgid "invalid timeout value"
msgstr "无效的 超时值"
-#: sys-utils/flock.c:212
+#: sys-utils/flock.c:214
msgid "invalid exit code"
msgstr "无效退出代码"
-#: sys-utils/flock.c:229
+#: sys-utils/flock.c:231
msgid "the --no-fork and --close options are incompatible"
msgstr "--no-fork 和 --close 选项不兼容"
-#: sys-utils/flock.c:237
+#: sys-utils/flock.c:239
#, c-format
msgid "%s requires exactly one command argument"
msgstr "%s 需要惟一的命令行参数"
-#: sys-utils/flock.c:255
+#: sys-utils/flock.c:257
msgid "bad file descriptor"
msgstr "错误的文件描述符"
-#: sys-utils/flock.c:258
+#: sys-utils/flock.c:260
msgid "requires file descriptor, file or directory"
msgstr "需要文件描述符、文件或目录"
-#: sys-utils/flock.c:282
+#: sys-utils/flock.c:284
msgid "failed to get lock"
msgstr "获取锁失败"
-#: sys-utils/flock.c:289
+#: sys-utils/flock.c:291
msgid "timeout while waiting to get lock"
msgstr "等待获得锁超时"
-#: sys-utils/flock.c:330
+#: sys-utils/flock.c:332
#, c-format
msgid "%s: getting lock took %ld.%06ld seconds\n"
msgstr "%s:等待获得锁花了 %ld.%06ld 秒\n"
-#: sys-utils/flock.c:341
+#: sys-utils/flock.c:343
#, c-format
msgid "%s: executing %s\n"
msgstr "%s: 正在执行 %s\n"
@@ -12876,112 +13076,122 @@ msgstr " -f, --freeze 冻结文件系统\n"
msgid " -u, --unfreeze unfreeze the filesystem\n"
msgstr " -u, --unfreeze 解冻文件系统\n"
-#: sys-utils/fsfreeze.c:105
+#: sys-utils/fsfreeze.c:104
msgid "neither --freeze or --unfreeze specified"
msgstr "既未指定 --freeze 也未指定 --unfreeze"
-#: sys-utils/fsfreeze.c:125
+#: sys-utils/fsfreeze.c:124
#, c-format
msgid "%s: is not a directory"
msgstr "%s:不是目录"
-#: sys-utils/fsfreeze.c:132
+#: sys-utils/fsfreeze.c:131
#, c-format
msgid "%s: freeze failed"
msgstr "%s:冻结失败"
-#: sys-utils/fsfreeze.c:138
+#: sys-utils/fsfreeze.c:137
#, c-format
msgid "%s: unfreeze failed"
msgstr "%s:解冻失败"
-#: sys-utils/fstrim.c:89
+#: sys-utils/fstrim.c:76
+#, fuzzy, c-format
+msgid "cannot get realpath: %s"
+msgstr "不能读 %s"
+
+#: sys-utils/fstrim.c:95
#, c-format
msgid "%s: not a directory"
msgstr "%s:不是一个目录"
-#: sys-utils/fstrim.c:96
+#: sys-utils/fstrim.c:102
#, fuzzy, c-format
msgid "%s: 0 B (dry run) trimmed on %s\n"
msgstr "%s:%s 已挂臷到 %s。\n"
-#: sys-utils/fstrim.c:98
+#: sys-utils/fstrim.c:104
#, c-format
msgid "%s: 0 B (dry run) trimmed\n"
msgstr ""
-#: sys-utils/fstrim.c:108
+#: sys-utils/fstrim.c:114
#, c-format
msgid "%s: FITRIM ioctl failed"
msgstr "%s:FITRIM ioctl 失败"
#. TRANSLATORS: The standard value here is a very large number.
-#: sys-utils/fstrim.c:118
+#: sys-utils/fstrim.c:124
#, fuzzy, c-format
msgid "%s: %s (%<PRIu64> bytes) trimmed on %s\n"
msgstr "%s:%s (%<PRIu64> 字节) 已修剪\n"
#. TRANSLATORS: The standard value here is a very large number.
-#: sys-utils/fstrim.c:122
+#: sys-utils/fstrim.c:128
#, c-format
msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
msgstr "%s:%s (%<PRIu64> 字节) 已修剪\n"
-#: sys-utils/fstrim.c:236 sys-utils/lsns.c:1078 sys-utils/swapon.c:733
+#: sys-utils/fstrim.c:245 sys-utils/lsns.c:1078 sys-utils/swapon.c:733
#: sys-utils/umount.c:248
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失败"
-#: sys-utils/fstrim.c:314
+#: sys-utils/fstrim.c:266
+#, fuzzy
+msgid "failed to allocate FS handler"
+msgstr "分配脚本处理程序失败"
+
+#: sys-utils/fstrim.c:340
#, c-format
msgid " %s [options] <mount point>\n"
msgstr " %s [选项] <挂臷点>\n"
-#: sys-utils/fstrim.c:317
+#: sys-utils/fstrim.c:343
msgid "Discard unused blocks on a mounted filesystem.\n"
msgstr "忽略已挂载文件系统上的未用锁。\n"
-#: sys-utils/fstrim.c:320
+#: sys-utils/fstrim.c:346
#, fuzzy
msgid " -a, --all trim all supported mounted filesystems\n"
msgstr " -a, --all 修剪不支持的所有已挂载文件系统\n"
-#: sys-utils/fstrim.c:321
+#: sys-utils/fstrim.c:347
#, fuzzy
msgid " -A, --fstab trim all supported mounted filesystems from /etc/fstab\n"
msgstr " -a, --all 修剪不支持的所有已挂载文件系统\n"
-#: sys-utils/fstrim.c:322
+#: sys-utils/fstrim.c:348
msgid " -o, --offset <num> the offset in bytes to start discarding from\n"
msgstr " -o, --offset <数字> 开始丢弃的偏移量(字节)\n"
-#: sys-utils/fstrim.c:323
+#: sys-utils/fstrim.c:349
msgid " -l, --length <num> the number of bytes to discard\n"
msgstr " -l, --length <数字> 要丢弃的字符数\n"
-#: sys-utils/fstrim.c:324
+#: sys-utils/fstrim.c:350
msgid " -m, --minimum <num> the minimum extent length to discard\n"
msgstr " -m, --minimum <数字> 要丢弃的最小限制长度\n"
-#: sys-utils/fstrim.c:325
+#: sys-utils/fstrim.c:351
msgid " -v, --verbose print number of discarded bytes\n"
msgstr " -v, --verbose 打印丢弃的字节数\n"
-#: sys-utils/fstrim.c:326
+#: sys-utils/fstrim.c:352
#, fuzzy
-msgid " -d, --dry-run does everything, but trim\n"
+msgid " -n, --dry-run does everything, but trim\n"
msgstr " -n, --dry-run 演示操作但不执行(suspend)\n"
-#: sys-utils/fstrim.c:387
+#: sys-utils/fstrim.c:407
msgid "failed to parse minimum extent length"
msgstr "解析 最小范围长度 失败"
-#: sys-utils/fstrim.c:400
+#: sys-utils/fstrim.c:424
msgid "no mountpoint specified"
msgstr "未指定挂载点"
-#: sys-utils/fstrim.c:414
+#: sys-utils/fstrim.c:438
#, c-format
msgid "%s: the discard operation is not supported"
msgstr "%s:不支持丢弃操作"
@@ -13404,86 +13614,86 @@ msgstr "无法访问文件 %s"
msgid "Using direct ISA access to the clock"
msgstr "将对 ISA 时钟使用直接 I/O 指令。"
-#: sys-utils/hwclock-rtc.c:128
+#: sys-utils/hwclock-rtc.c:129
#, fuzzy, c-format
msgid "Trying to open: %s\n"
msgstr "正在尝试卸载 %s\n"
-#: sys-utils/hwclock-rtc.c:150 sys-utils/hwclock-rtc.c:253
+#: sys-utils/hwclock-rtc.c:151 sys-utils/hwclock-rtc.c:254
#, fuzzy
msgid "cannot open rtc device"
msgstr "打不开 "
-#: sys-utils/hwclock-rtc.c:186
+#: sys-utils/hwclock-rtc.c:187
#, c-format
msgid "ioctl(%s) to %s to read the time failed"
msgstr "对 %2$s 的读取时间 ioctl(%1$s) 失败"
-#: sys-utils/hwclock-rtc.c:214
+#: sys-utils/hwclock-rtc.c:215
#, c-format
msgid "Waiting in loop for time from %s to change\n"
msgstr "正在循环等待来自 %s 的时间更改\n"
-#: sys-utils/hwclock-rtc.c:233
+#: sys-utils/hwclock-rtc.c:234
msgid "Timed out waiting for time change."
msgstr "等待时间更改超时。"
-#: sys-utils/hwclock-rtc.c:280
+#: sys-utils/hwclock-rtc.c:281
#, c-format
msgid "select() to %s to wait for clock tick timed out"
msgstr "对 %s select() 以等待时钟嘀嗒超时"
-#: sys-utils/hwclock-rtc.c:283
+#: sys-utils/hwclock-rtc.c:284
#, c-format
msgid "select() to %s to wait for clock tick failed"
msgstr "对 %s select() 以等待时钟嘀嗒失败"
-#: sys-utils/hwclock-rtc.c:288
+#: sys-utils/hwclock-rtc.c:289
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr "对 %s ioctl() 以关闭更新中断失败"
-#: sys-utils/hwclock-rtc.c:294
+#: sys-utils/hwclock-rtc.c:295
#, fuzzy, c-format
msgid "ioctl(%d, RTC_UIE_ON, 0) to %s failed"
msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
-#: sys-utils/hwclock-rtc.c:347
+#: sys-utils/hwclock-rtc.c:348
#, fuzzy, c-format
msgid "ioctl(%s) to %s to set the time failed"
msgstr "对 %2$s ioctl(%1$s) 以设置时间失败。"
-#: sys-utils/hwclock-rtc.c:353
+#: sys-utils/hwclock-rtc.c:354
#, c-format
msgid "ioctl(%s) was successful.\n"
msgstr "ioctl(%s) 成功。\n"
-#: sys-utils/hwclock-rtc.c:369
+#: sys-utils/hwclock-rtc.c:370
#, fuzzy
msgid "Using the rtc interface to the clock."
msgstr "将对时钟使用 /dev 接口。"
-#: sys-utils/hwclock-rtc.c:402
+#: sys-utils/hwclock-rtc.c:403
#, fuzzy, c-format
msgid "ioctl(%d, RTC_EPOCH_READ, epoch_p) to %s failed"
msgstr "对 %s 进行 ioctl(RTC_EPOCH_READ) 失败"
-#: sys-utils/hwclock-rtc.c:408
+#: sys-utils/hwclock-rtc.c:409
#, fuzzy, c-format
msgid "ioctl(%d, RTC_EPOCH_READ, epoch_p) to %s succeeded.\n"
msgstr "对 %s 进行 ioctl(RTC_EPOCH_READ) 失败"
-#: sys-utils/hwclock-rtc.c:426
+#: sys-utils/hwclock-rtc.c:427
#, fuzzy, c-format
msgid "invalid epoch '%s'."
msgstr "无效 ID:%s"
-#: sys-utils/hwclock-rtc.c:437
+#: sys-utils/hwclock-rtc.c:438
#, fuzzy, c-format
msgid "ioctl(%d, RTC_EPOCH_SET, %lu) to %s failed"
msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
-#: sys-utils/hwclock-rtc.c:443
+#: sys-utils/hwclock-rtc.c:444
#, fuzzy, c-format
msgid "ioctl(%d, RTC_EPOCH_SET, %lu) to %s succeeded.\n"
msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
@@ -13508,7 +13718,7 @@ msgstr " -Q, --queue 创建消息队列\n"
msgid " -p, --mode <mode> permission for the resource (default is 0644)\n"
msgstr " -p, --mode <模式> 资源的权限模式掩码(默认为 0644)\n"
-#: sys-utils/ipcmk.c:110 sys-utils/losetup.c:730 sys-utils/zramctl.c:647
+#: sys-utils/ipcmk.c:110 sys-utils/losetup.c:731 sys-utils/zramctl.c:647
msgid "failed to parse size"
msgstr "解析大小失败"
@@ -13516,29 +13726,29 @@ msgstr "解析大小失败"
msgid "failed to parse elements"
msgstr "解析元素失败"
-#: sys-utils/ipcmk.c:141
+#: sys-utils/ipcmk.c:140
msgid "create share memory failed"
msgstr "创建共享内存失败"
-#: sys-utils/ipcmk.c:143
+#: sys-utils/ipcmk.c:142
#, c-format
msgid "Shared memory id: %d\n"
msgstr "共享内存 id:%d\n"
-#: sys-utils/ipcmk.c:149
+#: sys-utils/ipcmk.c:148
msgid "create message queue failed"
msgstr "创建消息队列失败"
-#: sys-utils/ipcmk.c:151
+#: sys-utils/ipcmk.c:150
#, c-format
msgid "Message queue id: %d\n"
msgstr "消息队列 id:%d\n"
-#: sys-utils/ipcmk.c:157
+#: sys-utils/ipcmk.c:156
msgid "create semaphore failed"
msgstr "创建信号量失败"
-#: sys-utils/ipcmk.c:159
+#: sys-utils/ipcmk.c:158
#, c-format
msgid "Semaphore id: %d\n"
msgstr "信号量 id:%d\n"
@@ -14546,196 +14756,224 @@ msgstr " -O, --output-all 输出所有列\n"
msgid " --raw use raw --list output format\n"
msgstr " --raw 使用原生 --list 输出格式\n"
-#: sys-utils/losetup.c:461
+#: sys-utils/losetup.c:464
#, c-format
msgid "%s: Warning: file is smaller than 512 bytes; the loop device may be useless or invisible for system tools."
msgstr "%s:警告,文件小于 512 个字节,回环设备可能无用或在系统工具中看不到。"
-#: sys-utils/losetup.c:465
+#: sys-utils/losetup.c:468
#, c-format
msgid "%s: Warning: file does not fit into a 512-byte sector; the end of the file will be ignored."
msgstr "%s:警告,文件未对齐 512 字节扇区,其末尾将被忽略。"
-#: sys-utils/losetup.c:486 sys-utils/losetup.c:538
+#: sys-utils/losetup.c:490 sys-utils/losetup.c:542
#, c-format
msgid "%s: overlapping loop device exists"
msgstr "%s: 重叠的回环设备已存在"
-#: sys-utils/losetup.c:497
+#: sys-utils/losetup.c:501
#, c-format
msgid "%s: overlapping read-only loop device exists"
msgstr "%s: 存在重叠的只读回环设备"
-#: sys-utils/losetup.c:504
+#: sys-utils/losetup.c:508
#, c-format
msgid "%s: overlapping encrypted loop device exists"
msgstr "%s:存在重叠的加密回环设备"
-#: sys-utils/losetup.c:510
+#: sys-utils/losetup.c:514
#, c-format
msgid "%s: failed to re-use loop device"
msgstr "%s︰ 未能重新使用回环设备"
-#: sys-utils/losetup.c:516
+#: sys-utils/losetup.c:520
msgid "failed to inspect loop devices"
msgstr "审查回环设备失败"
-#: sys-utils/losetup.c:539
+#: sys-utils/losetup.c:543
#, c-format
msgid "%s: failed to check for conflicting loop devices"
msgstr "%s︰ 检查冲突的循环设备失败"
-#: sys-utils/losetup.c:551 sys-utils/losetup.c:868
+#: sys-utils/losetup.c:555 sys-utils/losetup.c:875
msgid "cannot find an unused loop device"
msgstr "找不到未使用的回环设备"
-#: sys-utils/losetup.c:561
+#: sys-utils/losetup.c:568
#, c-format
msgid "%s: failed to use backing file"
msgstr "%s:使用后备文件失败"
-#: sys-utils/losetup.c:654
+#: sys-utils/losetup.c:661
#, fuzzy
msgid "failed to parse logical block size"
msgstr "解析大小失败"
-#: sys-utils/losetup.c:660 sys-utils/losetup.c:670 sys-utils/losetup.c:795
-#: sys-utils/losetup.c:809 sys-utils/losetup.c:848
+#: sys-utils/losetup.c:667 sys-utils/losetup.c:677 sys-utils/losetup.c:801
+#: sys-utils/losetup.c:815 sys-utils/losetup.c:855
#, c-format
msgid "%s: failed to use device"
msgstr "%s:使用设备失败"
-#: sys-utils/losetup.c:806
+#: sys-utils/losetup.c:812
msgid "no loop device specified"
msgstr "未指定回环设备"
-#: sys-utils/losetup.c:821
+#: sys-utils/losetup.c:827
#, c-format
msgid "the options %s are allowed during loop device setup only"
msgstr "选项 %s 只允许在设置回环设备时使用"
-#: sys-utils/losetup.c:826
+#: sys-utils/losetup.c:832
msgid "the option --offset is not allowed in this context"
msgstr "此环境下不允许使用 --offset 选项"
-#: sys-utils/losetup.c:889
+#: sys-utils/losetup.c:896
#, c-format
msgid "%s: set capacity failed"
msgstr "%s:设置容量失败"
-#: sys-utils/losetup.c:898
+#: sys-utils/losetup.c:903
#, c-format
msgid "%s: set direct io failed"
msgstr "%s︰ 设置直接 io 失败"
-#: sys-utils/losetup.c:904
+#: sys-utils/losetup.c:909
#, fuzzy, c-format
msgid "%s: set logical block size failed"
msgstr "%s:获取大小失败"
-#: sys-utils/lscpu.c:84
+#: sys-utils/lscpu.c:86
msgid "none"
msgstr "无"
-#: sys-utils/lscpu.c:85
+#: sys-utils/lscpu.c:87
msgid "para"
msgstr "半"
-#: sys-utils/lscpu.c:86
+#: sys-utils/lscpu.c:88
msgid "full"
msgstr "完全"
-#: sys-utils/lscpu.c:87
+#: sys-utils/lscpu.c:89
msgid "container"
msgstr "容器"
-#: sys-utils/lscpu.c:130
+#: sys-utils/lscpu.c:132
msgid "horizontal"
msgstr "水平"
-#: sys-utils/lscpu.c:131
+#: sys-utils/lscpu.c:133
msgid "vertical"
msgstr "竖直"
-#: sys-utils/lscpu.c:183
+#: sys-utils/lscpu.c:196
msgid "logical CPU number"
msgstr "逻辑 CPU 数量"
-#: sys-utils/lscpu.c:184
+#: sys-utils/lscpu.c:197
msgid "logical core number"
msgstr "逻辑核心数量"
-#: sys-utils/lscpu.c:185
+#: sys-utils/lscpu.c:198
msgid "logical socket number"
msgstr "逻辑(CPU)座数量"
-#: sys-utils/lscpu.c:186
+#: sys-utils/lscpu.c:199
msgid "logical NUMA node number"
msgstr "逻辑 NUMA 节点数量"
-#: sys-utils/lscpu.c:187
+#: sys-utils/lscpu.c:200
msgid "logical book number"
msgstr "逻辑 book 数"
-#: sys-utils/lscpu.c:188
+#: sys-utils/lscpu.c:201
msgid "logical drawer number"
msgstr "逻辑抽屉号"
-#: sys-utils/lscpu.c:189
+#: sys-utils/lscpu.c:202
msgid "shows how caches are shared between CPUs"
msgstr "显示 CPU 间是如何共享缓存的"
-#: sys-utils/lscpu.c:190
+#: sys-utils/lscpu.c:203
msgid "CPU dispatching mode on virtual hardware"
msgstr "虚拟硬件上的 CPU 调度模式"
-#: sys-utils/lscpu.c:191
+#: sys-utils/lscpu.c:204
msgid "physical address of a CPU"
msgstr "CPU 的物理地址"
-#: sys-utils/lscpu.c:192
+#: sys-utils/lscpu.c:205
msgid "shows if the hypervisor has allocated the CPU"
msgstr "显示超级监督(hypervisor)是否分配了 CPU"
-#: sys-utils/lscpu.c:193
+#: sys-utils/lscpu.c:206
msgid "shows if Linux currently makes use of the CPU"
msgstr "显示 Linux 当前是否在使用该 CPU"
-#: sys-utils/lscpu.c:194
+#: sys-utils/lscpu.c:207
msgid "shows the maximum MHz of the CPU"
msgstr "显示 CPU 的最大 MHz"
-#: sys-utils/lscpu.c:195
+#: sys-utils/lscpu.c:208
msgid "shows the minimum MHz of the CPU"
msgstr "显示 CPU 的最小 MHz"
-#: sys-utils/lscpu.c:389
+#: sys-utils/lscpu.c:213
+#, fuzzy
+msgid "size of all system caches"
+msgstr "设置 文件系统 readahead"
+
+#: sys-utils/lscpu.c:214
+msgid "cache level"
+msgstr ""
+
+#: sys-utils/lscpu.c:215
+#, fuzzy
+msgid "cache name"
+msgstr "设备名"
+
+#: sys-utils/lscpu.c:216
+#, fuzzy
+msgid "size of one cache"
+msgstr "磁盘容量"
+
+#: sys-utils/lscpu.c:217
+#, fuzzy
+msgid "cache type"
+msgstr "机器类型︰"
+
+#: sys-utils/lscpu.c:218
+msgid "ways of associativity"
+msgstr ""
+
+#: sys-utils/lscpu.c:513
msgid "error: uname failed"
msgstr "错误:uname 失败"
-#: sys-utils/lscpu.c:481
+#: sys-utils/lscpu.c:605
#, c-format
msgid "failed to determine number of CPUs: %s"
msgstr "确定 CPU 数 失败:%s"
-#: sys-utils/lscpu.c:739
+#: sys-utils/lscpu.c:871
#, fuzzy
msgid "cannot restore signal handler"
msgstr "无法设置信号处理函数"
-#: sys-utils/lscpu.c:1293
+#: sys-utils/lscpu.c:1431
msgid "Failed to extract the node number"
msgstr "提取节点号失败"
-#: sys-utils/lscpu.c:1420 sys-utils/lscpu.c:1430
+#: sys-utils/lscpu.c:1558 sys-utils/lscpu.c:1568
msgid "Y"
msgstr "Y"
-#: sys-utils/lscpu.c:1420 sys-utils/lscpu.c:1430
+#: sys-utils/lscpu.c:1558 sys-utils/lscpu.c:1568
msgid "N"
msgstr "N"
-#: sys-utils/lscpu.c:1514
+#: sys-utils/lscpu.c:1739
#, c-format
msgid ""
"# The following is the parsable format, which can be fed to other\n"
@@ -14745,224 +14983,272 @@ msgstr ""
"# 以下是可解析格式,可以输给其他程序。每列中的各个不同项有一个惟一\n"
"# 的从 0 开始的 ID。\n"
-#: sys-utils/lscpu.c:1711
+#: sys-utils/lscpu.c:1960
msgid "Architecture:"
msgstr "架构:"
-#: sys-utils/lscpu.c:1724
+#: sys-utils/lscpu.c:1973
msgid "CPU op-mode(s):"
msgstr "CPU 运行模式:"
-#: sys-utils/lscpu.c:1727 sys-utils/lscpu.c:1729
+#: sys-utils/lscpu.c:1976 sys-utils/lscpu.c:1978
msgid "Byte Order:"
msgstr "字节序:"
-#: sys-utils/lscpu.c:1733
+#: sys-utils/lscpu.c:1982
msgid "Address sizes:"
msgstr ""
-#: sys-utils/lscpu.c:1735
+#: sys-utils/lscpu.c:1984
msgid "CPU(s):"
msgstr "CPU:"
-#: sys-utils/lscpu.c:1738
+#: sys-utils/lscpu.c:1987
msgid "On-line CPU(s) mask:"
msgstr "在线 CPU 掩码:"
-#: sys-utils/lscpu.c:1739
+#: sys-utils/lscpu.c:1988
msgid "On-line CPU(s) list:"
msgstr "在线 CPU 列表:"
-#: sys-utils/lscpu.c:1751
+#: sys-utils/lscpu.c:2000
msgid "failed to callocate cpu set"
msgstr "分配(callocate) CPU 组 失败"
-#: sys-utils/lscpu.c:1758
+#: sys-utils/lscpu.c:2007
msgid "Off-line CPU(s) mask:"
msgstr "离线 CPU 掩码:"
-#: sys-utils/lscpu.c:1759
+#: sys-utils/lscpu.c:2008
msgid "Off-line CPU(s) list:"
msgstr "离线 CPU 列表:"
-#: sys-utils/lscpu.c:1794
+#: sys-utils/lscpu.c:2043
msgid "Thread(s) per core:"
msgstr "每个核的线程数:"
-#: sys-utils/lscpu.c:1796
+#: sys-utils/lscpu.c:2045
msgid "Core(s) per socket:"
msgstr "每个座的核数:"
-#: sys-utils/lscpu.c:1799
+#: sys-utils/lscpu.c:2048
msgid "Socket(s) per book:"
msgstr "每个 book 的座数:"
-#: sys-utils/lscpu.c:1802
+#: sys-utils/lscpu.c:2051
msgid "Book(s) per drawer:"
msgstr "每个抽屉里的 Book 数︰"
-#: sys-utils/lscpu.c:1804
+#: sys-utils/lscpu.c:2053
msgid "Drawer(s):"
msgstr "抽屉:"
-#: sys-utils/lscpu.c:1806
+#: sys-utils/lscpu.c:2055
msgid "Book(s):"
msgstr "Book:"
-#: sys-utils/lscpu.c:1809
+#: sys-utils/lscpu.c:2058
msgid "Socket(s):"
msgstr "座:"
-#: sys-utils/lscpu.c:1813
+#: sys-utils/lscpu.c:2062
msgid "NUMA node(s):"
msgstr "NUMA 节点:"
-#: sys-utils/lscpu.c:1815
+#: sys-utils/lscpu.c:2064
msgid "Vendor ID:"
msgstr "厂商 ID:"
-#: sys-utils/lscpu.c:1817
+#: sys-utils/lscpu.c:2066
msgid "Machine type:"
msgstr "机器类型︰"
-#: sys-utils/lscpu.c:1819
+#: sys-utils/lscpu.c:2068
msgid "CPU family:"
msgstr "CPU 系列:"
-#: sys-utils/lscpu.c:1821
+#: sys-utils/lscpu.c:2070
msgid "Model:"
msgstr "型号:"
-#: sys-utils/lscpu.c:1823
+#: sys-utils/lscpu.c:2072
msgid "Model name:"
msgstr "型号名称:"
-#: sys-utils/lscpu.c:1825
+#: sys-utils/lscpu.c:2074
msgid "Stepping:"
msgstr "步进:"
-#: sys-utils/lscpu.c:1827
+#: sys-utils/lscpu.c:2076
+#, fuzzy
+msgid "Frequency boost:"
+msgstr "FreeBSD 启动"
+
+#: sys-utils/lscpu.c:2077
+#, fuzzy
+msgid "enabled"
+msgstr "CPU %u 已启用\n"
+
+#: sys-utils/lscpu.c:2077
+#, fuzzy
+msgid "disabled"
+msgstr "CPU %u 已禁用\n"
+
+#: sys-utils/lscpu.c:2079
msgid "CPU MHz:"
msgstr "CPU MHz:"
-#: sys-utils/lscpu.c:1829
+#: sys-utils/lscpu.c:2081
msgid "CPU dynamic MHz:"
msgstr "CPU 动态 MHz:"
-#: sys-utils/lscpu.c:1831
+#: sys-utils/lscpu.c:2083
msgid "CPU static MHz:"
msgstr "CPU 静态 MHz:"
-#: sys-utils/lscpu.c:1833
+#: sys-utils/lscpu.c:2085
msgid "CPU max MHz:"
msgstr "CPU 最大 MHz:"
-#: sys-utils/lscpu.c:1835
+#: sys-utils/lscpu.c:2087
msgid "CPU min MHz:"
msgstr "CPU 最小 MHz:"
-#: sys-utils/lscpu.c:1837
+#: sys-utils/lscpu.c:2089
msgid "BogoMIPS:"
msgstr "BogoMIPS:"
-#: sys-utils/lscpu.c:1840 sys-utils/lscpu.c:1842
+#: sys-utils/lscpu.c:2092 sys-utils/lscpu.c:2094
msgid "Virtualization:"
msgstr "虚拟化:"
-#: sys-utils/lscpu.c:1845
+#: sys-utils/lscpu.c:2097
msgid "Hypervisor:"
msgstr "超管理器:"
-#: sys-utils/lscpu.c:1847
+#: sys-utils/lscpu.c:2099
msgid "Hypervisor vendor:"
msgstr "超管理器厂商:"
-#: sys-utils/lscpu.c:1848
+#: sys-utils/lscpu.c:2100
msgid "Virtualization type:"
msgstr "虚拟化类型:"
-#: sys-utils/lscpu.c:1851
+#: sys-utils/lscpu.c:2103
msgid "Dispatching mode:"
msgstr "分派模式:"
-#: sys-utils/lscpu.c:1855 sys-utils/lscpu.c:1862
-#, c-format
-msgid "%s cache:"
+#: sys-utils/lscpu.c:2120 sys-utils/lscpu.c:2138
+#, fuzzy, c-format
+msgid "%s cache: "
msgstr "%s 缓存:"
-#: sys-utils/lscpu.c:1868
+#: sys-utils/lscpu.c:2145
#, c-format
msgid "NUMA node%d CPU(s):"
msgstr "NUMA 节点%d CPU:"
-#: sys-utils/lscpu.c:1873
+#: sys-utils/lscpu.c:2150
msgid "Physical sockets:"
msgstr "物理套接字︰"
-#: sys-utils/lscpu.c:1874
+#: sys-utils/lscpu.c:2151
msgid "Physical chips:"
msgstr "物理芯片︰"
-#: sys-utils/lscpu.c:1875
+#: sys-utils/lscpu.c:2152
msgid "Physical cores/chip:"
msgstr "物理核心/芯片︰"
-#: sys-utils/lscpu.c:1879
+#: sys-utils/lscpu.c:2163
msgid "Flags:"
msgstr "标记:"
-#: sys-utils/lscpu.c:1894
+#: sys-utils/lscpu.c:2178
msgid "Display information about the CPU architecture.\n"
msgstr "显示 CPU 架构信息。\n"
-#: sys-utils/lscpu.c:1897
+#: sys-utils/lscpu.c:2181
msgid " -a, --all print both online and offline CPUs (default for -e)\n"
msgstr " -a, --all 同时打印在线和离线 CPU (-e 选项默认值)\n"
-#: sys-utils/lscpu.c:1898
+#: sys-utils/lscpu.c:2182
msgid " -b, --online print online CPUs only (default for -p)\n"
msgstr " -b, --online 只打印在线 CPU (-p 选项默认值)\n"
-#: sys-utils/lscpu.c:1899
+#: sys-utils/lscpu.c:2183
+#, fuzzy
+msgid " -B, --bytes print sizes in bytes rather than in human readable format\n"
+msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n"
+
+#: sys-utils/lscpu.c:2184
+#, fuzzy
+msgid " -C, --caches[=<list>] info about caches in extended readable format\n"
+msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n"
+
+#: sys-utils/lscpu.c:2185
msgid " -c, --offline print offline CPUs only\n"
msgstr " -c, --offline 只打印离线 CPU\n"
-#: sys-utils/lscpu.c:1900
+#: sys-utils/lscpu.c:2186
#, fuzzy
msgid " -J, --json use JSON for default or extended format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: sys-utils/lscpu.c:1901
+#: sys-utils/lscpu.c:2187
msgid " -e, --extended[=<list>] print out an extended readable format\n"
msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n"
-#: sys-utils/lscpu.c:1902
+#: sys-utils/lscpu.c:2188
msgid " -p, --parse[=<list>] print out a parsable format\n"
msgstr " -p, --parse[=<列表>] 打印可解析格式\n"
-#: sys-utils/lscpu.c:1903
+#: sys-utils/lscpu.c:2189
msgid " -s, --sysroot <dir> use specified directory as system root\n"
msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
-#: sys-utils/lscpu.c:1904
+#: sys-utils/lscpu.c:2190
msgid " -x, --hex print hexadecimal masks rather than lists of CPUs\n"
msgstr " -x, --hex 打印十六进制掩码而非 CPU 列表\n"
-#: sys-utils/lscpu.c:1905
+#: sys-utils/lscpu.c:2191
msgid " -y, --physical print physical instead of logical IDs\n"
msgstr " -y, --physical 打印物理 ID 而非逻辑 ID\n"
-#: sys-utils/lscpu.c:2020
+#: sys-utils/lscpu.c:2192
+#, fuzzy
+msgid " --output-all print all available columns for -e, -p or -C\n"
+msgstr " -O, --output-all 输出所有列\n"
+
+#: sys-utils/lscpu.c:2196
+#, fuzzy
+msgid ""
+"\n"
+"Available output columns for -e or -p:\n"
+msgstr ""
+"\n"
+"可用的 --list 列:\n"
+
+#: sys-utils/lscpu.c:2200
+#, fuzzy
+msgid ""
+"\n"
+"Available output columns for -C:\n"
+msgstr ""
+"\n"
+"可用的 --list 列:\n"
+
+#: sys-utils/lscpu.c:2333
#, 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"
-#: sys-utils/lscpu.c:2042
+#: sys-utils/lscpu.c:2355
#, fuzzy
msgid "failed to initialize CPUs sysfs handler"
msgstr "%s:初始化 sysfs 处理函数失败"
-#: sys-utils/lscpu.c:2049
+#: sys-utils/lscpu.c:2362
#, fuzzy
msgid "failed to initialize procfs handler"
msgstr "%s:初始化 sysfs 处理函数失败"
@@ -15448,26 +15734,26 @@ msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
msgid " --summary[=when] print summary information (never,always or only)\n"
msgstr ""
-#: sys-utils/lsmem.c:622
+#: sys-utils/lsmem.c:616
#, fuzzy
msgid "unsupported --summary argument"
msgstr "不支持的 --setgroups 参数“%s”"
-#: sys-utils/lsmem.c:637
+#: sys-utils/lsmem.c:636
#, fuzzy
msgid "options --{raw,json,pairs} and --summary=only are mutually exclusive"
msgstr "--setgroups=allow 和 --map-root-user 选项是互斥的"
-#: sys-utils/lsmem.c:645
+#: sys-utils/lsmem.c:644
#, fuzzy
msgid "invalid argument to --sysroot"
msgstr "无效参数:%s"
-#: sys-utils/lsmem.c:676 sys-utils/lsns.c:781
+#: sys-utils/lsmem.c:675 sys-utils/lsns.c:781
msgid "failed to initialize output table"
msgstr "初始化输出表失败"
-#: sys-utils/lsmem.c:691
+#: sys-utils/lsmem.c:690
#, fuzzy
msgid "Failed to initialize output column"
msgstr "初始化输出列失败"
@@ -15542,7 +15828,7 @@ msgstr " -n, --no-mtab 不写 /etc/mtab\n"
msgid " -t, --type <name> namespace type (mnt, net, ipc, user, pid, uts, cgroup)\n"
msgstr " -t, --type <name> 名字空间类型(mnt, net, ipc, user, pid, uts, cgroup)\n"
-#: sys-utils/lsns.c:1012
+#: sys-utils/lsns.c:1007
#, c-format
msgid "unknown namespace type: %s"
msgstr "未知的名字空间类型︰ %s"
@@ -15588,7 +15874,7 @@ msgstr "%s,来自 %s(libmount %s"
msgid "failed to read mtab"
msgstr "读取 mtab 失败"
-#: sys-utils/mount.c:191 sys-utils/umount.c:197
+#: sys-utils/mount.c:191 sys-utils/mount.c:258 sys-utils/umount.c:197
#, c-format
msgid "%-25s: ignored\n"
msgstr "%-25s:已忽略\n"
@@ -15598,27 +15884,27 @@ msgstr "%-25s:已忽略\n"
msgid "%-25s: already mounted\n"
msgstr "%-25s:已经挂载\n"
-#: sys-utils/mount.c:248
+#: sys-utils/mount.c:299
#, c-format
msgid "%s: %s moved to %s.\n"
msgstr "%s:%s 已移到 %s。\n"
-#: sys-utils/mount.c:250
+#: sys-utils/mount.c:301
#, c-format
msgid "%s: %s bound on %s.\n"
msgstr "%s:%s 已绑定到 %s 。\n"
-#: sys-utils/mount.c:253 sys-utils/mount.c:257
+#: sys-utils/mount.c:304 sys-utils/mount.c:308
#, c-format
msgid "%s: %s mounted on %s.\n"
msgstr "%s:%s 已挂臷到 %s。\n"
-#: sys-utils/mount.c:255
+#: sys-utils/mount.c:306
#, c-format
msgid "%s: %s propagation flags changed.\n"
msgstr "%s:%s 传播标志已更改。\n"
-#: sys-utils/mount.c:275
+#: sys-utils/mount.c:326
#, c-format
msgid ""
"mount: %s does not contain SELinux labels.\n"
@@ -15632,22 +15918,22 @@ msgstr ""
" 受限制的应用程序可能会生成 AVC 消息,并被阻止访问该文件系统。\n"
" 更多详细信息请参阅 restorecon(8) 和 mount(8)。\n"
-#: sys-utils/mount.c:333
+#: sys-utils/mount.c:384
#, c-format
msgid "%s: failed to parse"
msgstr "%s:解析失败"
-#: sys-utils/mount.c:372
+#: sys-utils/mount.c:423
#, c-format
msgid "unsupported option format: %s"
msgstr "不支持的参数格式:%s"
-#: sys-utils/mount.c:374
+#: sys-utils/mount.c:425
#, c-format
msgid "failed to append option '%s'"
msgstr "追加选项“%s”失败"
-#: sys-utils/mount.c:392
+#: sys-utils/mount.c:443
#, c-format
msgid ""
" %1$s [-lhV]\n"
@@ -15662,11 +15948,11 @@ msgstr ""
" %1$s [选项] <源> <目录>\n"
" %1$s <操作> <挂载点> [<目标>]\n"
-#: sys-utils/mount.c:400
+#: sys-utils/mount.c:451
msgid "Mount a filesystem.\n"
msgstr "挂载文件系统。\n"
-#: sys-utils/mount.c:404
+#: sys-utils/mount.c:455
#, c-format
msgid ""
" -a, --all mount all filesystems mentioned in fstab\n"
@@ -15681,22 +15967,22 @@ msgstr ""
" -F, --fork 对每个设备禁用 fork(和 -a 选项一起使用)\n"
" -T, --fstab <路径> /etc/fstab 的替代文件\n"
-#: sys-utils/mount.c:410
+#: sys-utils/mount.c:461
#, c-format
msgid " -i, --internal-only don't call the mount.<type> helpers\n"
msgstr " -i, --internal-only 不调用 mount.<type> 辅助程序\n"
-#: sys-utils/mount.c:412
+#: sys-utils/mount.c:463
#, c-format
msgid " -l, --show-labels show also filesystem labels\n"
msgstr " -l, --show-labels 也显示文件系统标签\n"
-#: sys-utils/mount.c:414 sys-utils/umount.c:98
+#: sys-utils/mount.c:465 sys-utils/umount.c:98
#, c-format
msgid " -n, --no-mtab don't write to /etc/mtab\n"
msgstr " -n, --no-mtab 不写 /etc/mtab\n"
-#: sys-utils/mount.c:416
+#: sys-utils/mount.c:467
#, c-format
msgid ""
" --options-mode <mode>\n"
@@ -15707,7 +15993,7 @@ msgid ""
" force use of options from fstab/mtab\n"
msgstr ""
-#: sys-utils/mount.c:423
+#: sys-utils/mount.c:474
#, c-format
msgid ""
" -o, --options <list> comma-separated list of mount options\n"
@@ -15720,7 +16006,7 @@ msgstr ""
" -r, --read-only 以只读方式挂载文件系统(同 -o ro)\n"
" -t, --types <列表> 限制文件系统类型集合\n"
-#: sys-utils/mount.c:428
+#: sys-utils/mount.c:479
#, c-format
msgid ""
" --source <src> explicitly specifies source (path, label, uuid)\n"
@@ -15729,22 +16015,22 @@ msgstr ""
" --source <源> 指明源(路径、标签、uuid)\n"
" --target <目标> 指明挂载点\n"
-#: sys-utils/mount.c:431 sys-utils/umount.c:104
+#: sys-utils/mount.c:482 sys-utils/umount.c:104
#, c-format
msgid " -v, --verbose say what is being done\n"
msgstr " -v, --verbose 打印当前进行的操作\n"
-#: sys-utils/mount.c:433
+#: sys-utils/mount.c:484
#, c-format
msgid " -w, --rw, --read-write mount the filesystem read-write (default)\n"
msgstr " -w, --rw, --read-write 以读写方式挂载文件系统(默认)\n"
-#: sys-utils/mount.c:435
+#: sys-utils/mount.c:486
#, fuzzy, c-format
msgid " -N, --namespace <ns> perform mount in another namespace\n"
msgstr " -S, --setuid <uid> 设置进入空间中的 uid\n"
-#: sys-utils/mount.c:441
+#: sys-utils/mount.c:492
#, c-format
msgid ""
"\n"
@@ -15765,7 +16051,7 @@ msgstr ""
" PARTLABEL=<标签> 按分区标签指定设备\n"
" PARTUUID=<uuid> 按分区 UUID 指定设备\n"
-#: sys-utils/mount.c:450
+#: sys-utils/mount.c:501
#, c-format
msgid ""
" <device> specifies device by path\n"
@@ -15776,7 +16062,7 @@ msgstr ""
" <目录> 绑定式挂载的挂载点(参阅 --bind/rbind)\n"
" <文件> 用于设置回环设备的常规文件\n"
-#: sys-utils/mount.c:455
+#: sys-utils/mount.c:506
#, c-format
msgid ""
"\n"
@@ -15791,7 +16077,7 @@ msgstr ""
" -M, --move 将子树移动到其他位置\n"
" -R, --rbind 挂载其他位置的子树及其包含的所有子挂载(submount)\n"
-#: sys-utils/mount.c:460
+#: sys-utils/mount.c:511
#, c-format
msgid ""
" --make-shared mark a subtree as shared\n"
@@ -15804,7 +16090,7 @@ msgstr ""
" --make-private 将子树标记为 私有\n"
" --make-unbindable 将子树标记为 不可绑定\n"
-#: sys-utils/mount.c:465
+#: sys-utils/mount.c:516
#, c-format
msgid ""
" --make-rshared recursively mark a whole subtree as shared\n"
@@ -15817,20 +16103,20 @@ msgstr ""
" --make-rprivate 递归地将整个子树标记为 私有\n"
" --make-runbindable 递归地将整个子树标记为 不可绑定\n"
-#: sys-utils/mount.c:614 sys-utils/umount.c:487
+#: sys-utils/mount.c:665 sys-utils/umount.c:487
msgid "libmount context allocation failed"
msgstr "libmount 环境(context)分配失败"
-#: sys-utils/mount.c:671 sys-utils/umount.c:543
+#: sys-utils/mount.c:716 sys-utils/umount.c:540
msgid "failed to set options pattern"
msgstr "设置选项模式失败"
-#: sys-utils/mount.c:718 sys-utils/umount.c:563
+#: sys-utils/mount.c:763 sys-utils/umount.c:557
#, fuzzy, c-format
msgid "failed to set target namespace to %s"
msgstr "无法将人格(personality)设置为 %s"
-#: sys-utils/mount.c:871
+#: sys-utils/mount.c:926
msgid "source specified more than once"
msgstr "源指定了多次"
@@ -15857,17 +16143,17 @@ msgstr ""
" -d, --fs-devno 打印文件系统的 主:次 设备号\n"
" -x, --devno 打印块设备的主:次设备号\n"
-#: sys-utils/mountpoint.c:195
+#: sys-utils/mountpoint.c:194
#, c-format
msgid "%s is not a mountpoint\n"
msgstr "%s 不是一个挂载点\n"
-#: sys-utils/mountpoint.c:201
+#: sys-utils/mountpoint.c:200
#, c-format
msgid "%s is a mountpoint\n"
msgstr "%s 是一个挂载点\n"
-#: sys-utils/nsenter.c:73 sys-utils/setarch.c:99 sys-utils/unshare.c:248
+#: sys-utils/nsenter.c:73 sys-utils/setarch.c:99 sys-utils/unshare.c:250
#, c-format
msgid " %s [options] [<program> [<argument>...]]\n"
msgstr " %s [选项] [<程序> [<参数>...]]\n"
@@ -15946,55 +16232,56 @@ msgstr " -Z, --follow-context 根据 --target PID 设置 SELinux 环境\n"
msgid "neither filename nor target pid supplied for %s"
msgstr "没有为 %s 提供文件名或目标 pid"
-#: sys-utils/nsenter.c:309
+#: sys-utils/nsenter.c:304 sys-utils/unshare.c:405
msgid "failed to parse uid"
msgstr "解析 uid 失败"
-#: sys-utils/nsenter.c:313
+#: sys-utils/nsenter.c:308 sys-utils/unshare.c:409
msgid "failed to parse gid"
msgstr "解析 gid 失败"
-#: sys-utils/nsenter.c:349
+#: sys-utils/nsenter.c:348
msgid "no target PID specified for --follow-context"
msgstr "没有为 --follow-context 设置目标 PID"
-#: sys-utils/nsenter.c:351
+#: sys-utils/nsenter.c:350
#, c-format
msgid "failed to get %d SELinux context"
msgstr "未能获取 %d SELinux 环境"
-#: sys-utils/nsenter.c:354
+#: sys-utils/nsenter.c:353
#, c-format
msgid "failed to set exec context to '%s'"
msgstr "向“%s”设置 exec 环境失败"
-#: sys-utils/nsenter.c:361
+#: sys-utils/nsenter.c:360
#, fuzzy
msgid "no target PID specified for --all"
msgstr "没有为 --follow-context 设置目标 PID"
-#: sys-utils/nsenter.c:425
+#: sys-utils/nsenter.c:424
#, c-format
msgid "reassociate to namespace '%s' failed"
msgstr "重新关联到名字空间“%s”失败"
-#: sys-utils/nsenter.c:441
+#: sys-utils/nsenter.c:440
msgid "cannot open current working directory"
msgstr "打不开当前工作目录"
-#: sys-utils/nsenter.c:448
+#: sys-utils/nsenter.c:447
msgid "change directory by root file descriptor failed"
msgstr "根据 root 文件描述符 更改目录失败"
-#: sys-utils/nsenter.c:451
+#: sys-utils/nsenter.c:450
msgid "chroot failed"
msgstr "chroot 失败"
-#: sys-utils/nsenter.c:461
+#: sys-utils/nsenter.c:460
msgid "change directory by working directory file descriptor failed"
msgstr "按工作目录文件描述符更改目录失败"
-#: sys-utils/nsenter.c:472 sys-utils/setpriv.c:1061 sys-utils/setpriv.c:1068
+#: sys-utils/nsenter.c:471 sys-utils/setpriv.c:1060 sys-utils/setpriv.c:1067
+#: sys-utils/unshare.c:520
msgid "setgroups failed"
msgstr "setgroups 失败"
@@ -16007,7 +16294,7 @@ msgstr " %s [选项] 新根目录 旧根目录更名\n"
msgid "Change the root filesystem.\n"
msgstr "更改根文件系统。\n"
-#: sys-utils/pivot_root.c:76
+#: sys-utils/pivot_root.c:75
#, c-format
msgid "failed to change root from `%s' to `%s'"
msgstr "将根目录从“%s”更改为“%s”失败"
@@ -16244,7 +16531,7 @@ msgstr "解析 %s 限制失败"
msgid "option --pid may be specified only once"
msgstr "--pid 选项只能指定一次"
-#: sys-utils/prlimit.c:614
+#: sys-utils/prlimit.c:613
msgid "options --pid and COMMAND are mutually exclusive"
msgstr "--pid 和 命令 互相排斥"
@@ -16304,30 +16591,35 @@ msgstr " -n, --no-auto 禁用字节顺序自动检测\n"
msgid "error writing %s"
msgstr "写 %s 出错"
-#: sys-utils/readprofile.c:270
+#: sys-utils/readprofile.c:250
+#, fuzzy
+msgid "input file is empty"
+msgstr "Linux 文件系统"
+
+#: sys-utils/readprofile.c:272
msgid "Assuming reversed byte order. Use -n to force native byte order."
msgstr "将假设为反向字节顺序。可使用 -n 强制为原生字节顺序。"
-#: sys-utils/readprofile.c:285
+#: sys-utils/readprofile.c:287
#, c-format
msgid "Sampling_step: %u\n"
msgstr "采样步长:%u\n"
-#: sys-utils/readprofile.c:301 sys-utils/readprofile.c:322
+#: sys-utils/readprofile.c:303 sys-utils/readprofile.c:324
#, c-format
msgid "%s(%i): wrong map line"
msgstr "%s(%i):错误的 map 行"
-#: sys-utils/readprofile.c:312
+#: sys-utils/readprofile.c:314
#, c-format
msgid "can't find \"_stext\" in %s"
msgstr "在 %s 中找不到“_stext”"
-#: sys-utils/readprofile.c:345
+#: sys-utils/readprofile.c:347
msgid "profile address out of range. Wrong map file?"
msgstr "配置(profile)地址超出范围。map 文件错误?"
-#: sys-utils/readprofile.c:403
+#: sys-utils/readprofile.c:405
msgid "total"
msgstr "总计"
@@ -16385,19 +16677,19 @@ msgstr "设置 %d 的优先级失败(%s)"
msgid "%d (%s) old priority %d, new priority %d\n"
msgstr "%d (%s) 旧优先级为 %d,新优先级为 %d\n"
-#: sys-utils/renice.c:152
+#: sys-utils/renice.c:150
#, fuzzy, c-format
msgid "invalid priority '%s'"
msgstr "无效 ID:%s"
-#: sys-utils/renice.c:179
+#: sys-utils/renice.c:177
#, c-format
msgid "unknown user %s"
msgstr "未知用户 %s"
#. TRANSLATORS: The first %s is one of the above
#. * three ID names. Read: "bad value for %s: %s"
-#: sys-utils/renice.c:188
+#: sys-utils/renice.c:186
#, c-format
msgid "bad %s value: %s"
msgstr "错误的 %s 值:%s"
@@ -16504,15 +16796,15 @@ msgstr "磁盘标识符"
msgid " unblock identifier\n"
msgstr "磁盘标识符"
-#: sys-utils/rtcwake.c:101
+#: sys-utils/rtcwake.c:102
msgid "Enter a system sleep state until a specified wakeup time.\n"
msgstr "进入系统睡眠状态,直到指定的唤醒时间。\n"
-#: sys-utils/rtcwake.c:104
+#: sys-utils/rtcwake.c:105
msgid " -a, --auto reads the clock mode from adjust file (default)\n"
msgstr " -a, --auto 从 adjust 文件读取时钟模式(默认)\n"
-#: sys-utils/rtcwake.c:106
+#: sys-utils/rtcwake.c:107
#, c-format
msgid ""
" -A, --adjfile <file> specifies the path to the adjust file\n"
@@ -16521,185 +16813,190 @@ msgstr ""
" -A, --adjfile <文件> 指定 adjust 文件的路径\n"
" 默认为 %s\n"
-#: sys-utils/rtcwake.c:108
+#: sys-utils/rtcwake.c:109
msgid " --date <timestamp> date time of timestamp to wake\n"
msgstr " --date <时间戳> 唤醒时间戳的日期时间\n"
-#: sys-utils/rtcwake.c:109
+#: sys-utils/rtcwake.c:110
msgid " -d, --device <device> select rtc device (rtc0|rtc1|...)\n"
msgstr " -d, --device <设备> 选择 rtc 设备(rtc0|rtc1|...)\n"
-#: sys-utils/rtcwake.c:110
+#: sys-utils/rtcwake.c:111
msgid " -n, --dry-run does everything, but suspend\n"
msgstr " -n, --dry-run 演示操作但不执行(suspend)\n"
-#: sys-utils/rtcwake.c:111
+#: sys-utils/rtcwake.c:112
msgid " -l, --local RTC uses local timezone\n"
msgstr " -l, --local RTC 使用本地时区\n"
-#: sys-utils/rtcwake.c:112
+#: sys-utils/rtcwake.c:113
msgid " --list-modes list available modes\n"
msgstr " --list-modes 列出可用模式\n"
-#: sys-utils/rtcwake.c:113
+#: sys-utils/rtcwake.c:114
msgid " -m, --mode <mode> standby|mem|... sleep mode\n"
msgstr " -m, --mode <模式> 指定 standby|mem|... 等睡眠模式\n"
-#: sys-utils/rtcwake.c:114
+#: sys-utils/rtcwake.c:115
msgid " -s, --seconds <seconds> seconds to sleep\n"
msgstr " -s, --seconds <秒数> 指定睡眠的秒数\n"
-#: sys-utils/rtcwake.c:115
+#: sys-utils/rtcwake.c:116
msgid " -t, --time <time_t> time to wake\n"
msgstr " -t, --time <time_t> 指定唤醒时刻\n"
-#: sys-utils/rtcwake.c:116
+#: sys-utils/rtcwake.c:117
msgid " -u, --utc RTC uses UTC\n"
msgstr " -u, --utc RTC 使用 UTC\n"
-#: sys-utils/rtcwake.c:117
+#: sys-utils/rtcwake.c:118
msgid " -v, --verbose verbose messages\n"
msgstr " -v, --verbose 输出详尽消息\n"
-#: sys-utils/rtcwake.c:167
+#: sys-utils/rtcwake.c:168
msgid "read rtc time failed"
msgstr "读取 rtc 时间失败"
-#: sys-utils/rtcwake.c:173
+#: sys-utils/rtcwake.c:174
msgid "read system time failed"
msgstr "读取系统时间失败"
-#: sys-utils/rtcwake.c:189
+#: sys-utils/rtcwake.c:190
msgid "convert rtc time failed"
msgstr "转换 rtc 时间失败"
-#: sys-utils/rtcwake.c:237
+#: sys-utils/rtcwake.c:238
msgid "set rtc wake alarm failed"
msgstr "设置 rtc 唤醒闹钟失败"
-#: sys-utils/rtcwake.c:274
+#: sys-utils/rtcwake.c:275
#, fuzzy
msgid "discarding stdin"
msgstr "忽略对齐偏移量"
-#: sys-utils/rtcwake.c:325
+#: sys-utils/rtcwake.c:326
#, c-format
msgid "unexpected third line in: %s: %s"
msgstr "第 3 行异常:%s:%s"
-#: sys-utils/rtcwake.c:338 sys-utils/rtcwake.c:642
+#: sys-utils/rtcwake.c:339 sys-utils/rtcwake.c:657
msgid "read rtc alarm failed"
msgstr "读取 rtc 闹钟失败"
-#: sys-utils/rtcwake.c:343
+#: sys-utils/rtcwake.c:344
#, c-format
msgid "alarm: off\n"
msgstr "闹钟:关\n"
-#: sys-utils/rtcwake.c:356
+#: sys-utils/rtcwake.c:357
msgid "convert time failed"
msgstr "转换时间失败"
-#: sys-utils/rtcwake.c:361
+#: sys-utils/rtcwake.c:362
#, c-format
msgid "alarm: on %s"
msgstr "闹钟:于 %s"
-#: sys-utils/rtcwake.c:405
+#: sys-utils/rtcwake.c:406
#, c-format
msgid "could not read: %s"
msgstr "无法读取︰%s"
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
#, c-format
msgid "unrecognized suspend state '%s'"
msgstr "不支持的挂起状态“%s”"
-#: sys-utils/rtcwake.c:493
+#: sys-utils/rtcwake.c:494
msgid "invalid seconds argument"
msgstr "无效的 秒数 参数"
-#: sys-utils/rtcwake.c:497
+#: sys-utils/rtcwake.c:498
msgid "invalid time argument"
msgstr "无效的 时间 参数"
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
#, c-format
msgid "%s: assuming RTC uses UTC ...\n"
msgstr "%s:将假设 RTC 使用 UTC...\n"
-#: sys-utils/rtcwake.c:529
+#: sys-utils/rtcwake.c:530
msgid "Using UTC time.\n"
msgstr "使用 UTC 时间。\n"
-#: sys-utils/rtcwake.c:530
+#: sys-utils/rtcwake.c:531
msgid "Using local time.\n"
msgstr "使用当地时间。\n"
-#: sys-utils/rtcwake.c:533
+#: sys-utils/rtcwake.c:534
msgid "must provide wake time (see --seconds, --time and --date options)"
msgstr "必须提供唤醒时间(见 --seconds, --time 和 --date 选项)"
-#: sys-utils/rtcwake.c:539
+#: sys-utils/rtcwake.c:540
#, c-format
msgid "%s not enabled for wakeup events"
msgstr "%s 没有为唤醒事件启用"
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
#, c-format
msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
msgstr "闹钟 %ld,sys 时间 %ld,rtc 时间 %ld,秒数 %u\n"
-#: sys-utils/rtcwake.c:553
+#: sys-utils/rtcwake.c:554
#, c-format
msgid "time doesn't go backward to %s"
msgstr "时间不能返回到 %s"
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
#, c-format
msgid "%s: wakeup using %s at %s"
msgstr "%1$s:用 %3$s 的 %2$s 唤醒"
-#: sys-utils/rtcwake.c:567
+#: sys-utils/rtcwake.c:568
#, c-format
msgid "%s: wakeup from \"%s\" using %s at %s"
msgstr "%s:从“%s”唤醒,使用 %s,时间 %s"
-#: sys-utils/rtcwake.c:577
+#: sys-utils/rtcwake.c:578
#, c-format
msgid "suspend mode: no; leaving\n"
msgstr "挂起模式:无;将离开\n"
-#: sys-utils/rtcwake.c:586
+#: sys-utils/rtcwake.c:601
#, c-format
msgid "suspend mode: off; executing %s\n"
msgstr "挂起模式:关;正在执行 %s\n"
-#: sys-utils/rtcwake.c:605
+#: sys-utils/rtcwake.c:610
+#, fuzzy
+msgid "failed to find shutdown command"
+msgstr "读取失败︰ %s"
+
+#: sys-utils/rtcwake.c:620
#, c-format
msgid "suspend mode: on; reading rtc\n"
msgstr "挂起模式:开;正在读 rtc\n"
-#: sys-utils/rtcwake.c:610
+#: sys-utils/rtcwake.c:625
msgid "rtc read failed"
msgstr "读 rtc 失败"
-#: sys-utils/rtcwake.c:622
+#: sys-utils/rtcwake.c:637
#, c-format
msgid "suspend mode: disable; disabling alarm\n"
msgstr "挂起模式:禁用;正在禁用闹钟\n"
-#: sys-utils/rtcwake.c:626
+#: sys-utils/rtcwake.c:641
#, c-format
msgid "suspend mode: show; printing alarm info\n"
msgstr "挂起模式:显示;正在打印闹钟信息\n"
-#: sys-utils/rtcwake.c:633
+#: sys-utils/rtcwake.c:648
#, c-format
msgid "suspend mode: %s; suspending system\n"
msgstr "挂起模式:%s;正在挂起系统\n"
-#: sys-utils/rtcwake.c:647
+#: sys-utils/rtcwake.c:662
msgid "disable rtc alarm interrupt failed"
msgstr "禁用 rtc 闹钟中断失败"
@@ -16773,40 +17070,35 @@ msgstr " -v, --verbose 告知打开了哪些选项\n"
msgid " --list list settable architectures, and exit\n"
msgstr " --list 列出可设置的架构并退出\n"
-#: sys-utils/setarch.c:258
+#: sys-utils/setarch.c:271
#, c-format
msgid "Kernel cannot set architecture to %s"
msgstr "内核不能设置为 %s 的架构"
-#: sys-utils/setarch.c:307
+#: sys-utils/setarch.c:321
msgid "Not enough arguments"
msgstr "参数不够"
-#: sys-utils/setarch.c:316
-#, c-format
-msgid "Failed to set personality to %s"
-msgstr "无法将人格(personality)设置为 %s"
-
-#: sys-utils/setarch.c:381
+#: sys-utils/setarch.c:389
msgid "unrecognized option '--list'"
msgstr "无法识别的“--list”选项"
-#: sys-utils/setarch.c:389
+#: sys-utils/setarch.c:402
#, fuzzy
msgid "no architecture argument or personality flags specified"
msgstr "未指定架构参数"
-#: sys-utils/setarch.c:400
+#: sys-utils/setarch.c:414
#, c-format
msgid "%s: Unrecognized architecture"
msgstr "%s:未识别的架构"
-#: sys-utils/setarch.c:418
+#: sys-utils/setarch.c:432
#, c-format
msgid "failed to set personality to %s"
msgstr "无法将人格(personality)设置为 %s"
-#: sys-utils/setarch.c:426
+#: sys-utils/setarch.c:444
#, c-format
msgid "Execute command `%s'.\n"
msgstr "执行命令“%s”。\n"
@@ -16902,369 +17194,364 @@ msgstr " --securebits <位> 设置安全位\n"
#: sys-utils/setpriv.c:148
#, fuzzy
-msgid " --reset-env reset environment variables\n"
-msgstr " -m, -p, --preserve-environment 不重置环境变量\n"
-
-#: sys-utils/setpriv.c:149
-#, fuzzy
msgid ""
" --pdeathsig keep|clear|<signame>\n"
" set or clear parent death signal\n"
msgstr " --store 将当前终端设置保存为默认值\n"
-#: sys-utils/setpriv.c:151
+#: sys-utils/setpriv.c:150
#, fuzzy
msgid " --selinux-label <label> set SELinux label\n"
msgstr " --selinux-label <标签> 设置 SELinux 标签\n"
-#: sys-utils/setpriv.c:152
+#: sys-utils/setpriv.c:151
#, fuzzy
msgid " --apparmor-profile <pr> set AppArmor profile\n"
msgstr " --apparmor-profile <pr> 设置 AppArmor 配置文件\n"
-#: sys-utils/setpriv.c:153
+#: sys-utils/setpriv.c:152
msgid ""
" --reset-env clear all environment and initialize\n"
" HOME, SHELL, USER, LOGNAME and PATH\n"
msgstr ""
-#: sys-utils/setpriv.c:159
+#: sys-utils/setpriv.c:158
msgid " This tool can be dangerous. Read the manpage, and be careful.\n"
msgstr "运行此工具有风险。请阅读 man 手册,谨慎操作。\n"
-#: sys-utils/setpriv.c:202
+#: sys-utils/setpriv.c:201
#, fuzzy
msgid "invalid capability type"
msgstr "错误的权能字符串"
-#: sys-utils/setpriv.c:254 sys-utils/setpriv.c:598
+#: sys-utils/setpriv.c:253 sys-utils/setpriv.c:597
msgid "getting process secure bits failed"
msgstr "获取进程安全位失败"
-#: sys-utils/setpriv.c:258
+#: sys-utils/setpriv.c:257
#, c-format
msgid "Securebits: "
msgstr "安全位:"
-#: sys-utils/setpriv.c:278
+#: sys-utils/setpriv.c:277
#, c-format
msgid "[none]\n"
msgstr "[无]\n"
-#: sys-utils/setpriv.c:304
+#: sys-utils/setpriv.c:303
#, c-format
msgid "%s: too long"
msgstr "%s:过长"
-#: sys-utils/setpriv.c:332
+#: sys-utils/setpriv.c:331
#, c-format
msgid "Supplementary groups: "
msgstr "附属组:"
-#: sys-utils/setpriv.c:334 sys-utils/setpriv.c:400 sys-utils/setpriv.c:405
-#: sys-utils/setpriv.c:411 sys-utils/setpriv.c:417 sys-utils/setpriv.c:424
+#: sys-utils/setpriv.c:333 sys-utils/setpriv.c:399 sys-utils/setpriv.c:404
+#: sys-utils/setpriv.c:410 sys-utils/setpriv.c:416 sys-utils/setpriv.c:423
#, c-format
msgid "[none]"
msgstr "[无]"
-#: sys-utils/setpriv.c:352
+#: sys-utils/setpriv.c:351
#, fuzzy
msgid "get pdeathsig failed"
msgstr "getresuid 失败"
-#: sys-utils/setpriv.c:372
+#: sys-utils/setpriv.c:371
#, c-format
msgid "uid: %u\n"
msgstr "uid:%u\n"
-#: sys-utils/setpriv.c:373
+#: sys-utils/setpriv.c:372
#, c-format
msgid "euid: %u\n"
msgstr "euid:%u\n"
-#: sys-utils/setpriv.c:376
+#: sys-utils/setpriv.c:375
#, c-format
msgid "suid: %u\n"
msgstr "suid:%u\n"
-#: sys-utils/setpriv.c:378 sys-utils/setpriv.c:491
+#: sys-utils/setpriv.c:377 sys-utils/setpriv.c:490
msgid "getresuid failed"
msgstr "getresuid 失败"
-#: sys-utils/setpriv.c:387 sys-utils/setpriv.c:506
+#: sys-utils/setpriv.c:386 sys-utils/setpriv.c:505
msgid "getresgid failed"
msgstr "getresgid 失败"
-#: sys-utils/setpriv.c:398
+#: sys-utils/setpriv.c:397
#, c-format
msgid "Effective capabilities: "
msgstr "有效权能:"
-#: sys-utils/setpriv.c:403
+#: sys-utils/setpriv.c:402
#, c-format
msgid "Permitted capabilities: "
msgstr "允许的权能:"
-#: sys-utils/setpriv.c:409
+#: sys-utils/setpriv.c:408
#, c-format
msgid "Inheritable capabilities: "
msgstr "可继承的权能:"
-#: sys-utils/setpriv.c:414
+#: sys-utils/setpriv.c:413
#, fuzzy, c-format
msgid "Ambient capabilities: "
msgstr "允许的权能:"
-#: sys-utils/setpriv.c:419
+#: sys-utils/setpriv.c:418
#, fuzzy, c-format
msgid "[unsupported]"
msgstr "不支持的命令"
-#: sys-utils/setpriv.c:422
+#: sys-utils/setpriv.c:421
#, c-format
msgid "Capability bounding set: "
msgstr "权能绑定集:"
-#: sys-utils/setpriv.c:431
+#: sys-utils/setpriv.c:430
msgid "SELinux label"
msgstr "SELinux 标签"
-#: sys-utils/setpriv.c:434
+#: sys-utils/setpriv.c:433
msgid "AppArmor profile"
msgstr "AppArmor 配置文件"
-#: sys-utils/setpriv.c:447
+#: sys-utils/setpriv.c:446
#, c-format
msgid "cap %d: libcap-ng is broken"
msgstr "权能 %d:libcap-ng 损坏"
-#: sys-utils/setpriv.c:469
+#: sys-utils/setpriv.c:468
msgid "Invalid supplementary group id"
msgstr "无效的附属组 id"
-#: sys-utils/setpriv.c:479
+#: sys-utils/setpriv.c:478
#, fuzzy
msgid "failed to get parent death signal"
msgstr "解析挂臷表失败"
-#: sys-utils/setpriv.c:499
+#: sys-utils/setpriv.c:498
msgid "setresuid failed"
msgstr "setresuid 失败"
-#: sys-utils/setpriv.c:514
+#: sys-utils/setpriv.c:513
msgid "setresgid failed"
msgstr "setresgid 失败"
-#: sys-utils/setpriv.c:546
+#: sys-utils/setpriv.c:545
#, fuzzy
msgid "unsupported capability type"
msgstr "不支持的时间类型"
-#: sys-utils/setpriv.c:563
+#: sys-utils/setpriv.c:562
msgid "bad capability string"
msgstr "错误的权能字符串"
-#: sys-utils/setpriv.c:571
+#: sys-utils/setpriv.c:570
msgid "libcap-ng is too old for \"all\" caps"
msgstr "对于“all”权能,libcap-ng 太旧"
-#: sys-utils/setpriv.c:583
+#: sys-utils/setpriv.c:582
#, c-format
msgid "unknown capability \"%s\""
msgstr "未知权能“%s”"
-#: sys-utils/setpriv.c:607
+#: sys-utils/setpriv.c:606
msgid "unrecognized securebit set -- refusing to adjust"
msgstr "无法识别的安全位集 -- 拒绝调整"
-#: sys-utils/setpriv.c:611
+#: sys-utils/setpriv.c:610
msgid "bad securebits string"
msgstr "安全位字符串有误"
-#: sys-utils/setpriv.c:618
+#: sys-utils/setpriv.c:617
msgid "+all securebits is not allowed"
msgstr "+all 安全位是不允许的"
-#: sys-utils/setpriv.c:631
+#: sys-utils/setpriv.c:630
msgid "adjusting keep_caps does not make sense"
msgstr "调整 keep_caps(保持权能) 没有意义"
-#: sys-utils/setpriv.c:635
+#: sys-utils/setpriv.c:634
msgid "unrecognized securebit"
msgstr "无法识别的安全位"
-#: sys-utils/setpriv.c:655
+#: sys-utils/setpriv.c:654
msgid "SELinux is not running"
msgstr "SELinux 没有运行"
-#: sys-utils/setpriv.c:670
+#: sys-utils/setpriv.c:669
#, c-format
msgid "close failed: %s"
msgstr "关闭失败:%s"
-#: sys-utils/setpriv.c:678
+#: sys-utils/setpriv.c:677
msgid "AppArmor is not running"
msgstr "AppArmor 没有运行"
-#: sys-utils/setpriv.c:855
+#: sys-utils/setpriv.c:854
msgid "duplicate --no-new-privs option"
msgstr "复制 --no-new-privs 选项"
-#: sys-utils/setpriv.c:860
+#: sys-utils/setpriv.c:859
msgid "duplicate ruid"
msgstr "复制 ruid"
-#: sys-utils/setpriv.c:862
+#: sys-utils/setpriv.c:861
msgid "failed to parse ruid"
msgstr "解析 ruid 失败"
-#: sys-utils/setpriv.c:870
+#: sys-utils/setpriv.c:869
msgid "duplicate euid"
msgstr "复制 euid"
-#: sys-utils/setpriv.c:872
+#: sys-utils/setpriv.c:871
msgid "failed to parse euid"
msgstr "解析 euid 失败"
-#: sys-utils/setpriv.c:876
+#: sys-utils/setpriv.c:875
msgid "duplicate ruid or euid"
msgstr "复制 ruid 或 euid"
-#: sys-utils/setpriv.c:878
+#: sys-utils/setpriv.c:877
msgid "failed to parse reuid"
msgstr "解析 reuid 失败"
-#: sys-utils/setpriv.c:887
+#: sys-utils/setpriv.c:886
msgid "duplicate rgid"
msgstr "复制 rgid"
-#: sys-utils/setpriv.c:889
+#: sys-utils/setpriv.c:888
msgid "failed to parse rgid"
msgstr "解析 rgid 失败"
-#: sys-utils/setpriv.c:893
+#: sys-utils/setpriv.c:892
msgid "duplicate egid"
msgstr "复制 egid"
-#: sys-utils/setpriv.c:895
+#: sys-utils/setpriv.c:894
msgid "failed to parse egid"
msgstr "解析 egid 失败"
-#: sys-utils/setpriv.c:899
+#: sys-utils/setpriv.c:898
msgid "duplicate rgid or egid"
msgstr "复制 rgid 或 egid"
-#: sys-utils/setpriv.c:901
+#: sys-utils/setpriv.c:900
msgid "failed to parse regid"
msgstr "解析 regid 失败"
-#: sys-utils/setpriv.c:906
+#: sys-utils/setpriv.c:905
msgid "duplicate --clear-groups option"
msgstr "复制 --clear-groups 选项"
-#: sys-utils/setpriv.c:912
+#: sys-utils/setpriv.c:911
msgid "duplicate --keep-groups option"
msgstr "复制 --keep-groups 选项"
-#: sys-utils/setpriv.c:918
+#: sys-utils/setpriv.c:917
#, fuzzy
msgid "duplicate --init-groups option"
msgstr "复制 --groups 选项"
-#: sys-utils/setpriv.c:924
+#: sys-utils/setpriv.c:923
msgid "duplicate --groups option"
msgstr "复制 --groups 选项"
-#: sys-utils/setpriv.c:930
+#: sys-utils/setpriv.c:929
#, fuzzy
msgid "duplicate --keep-pdeathsig option"
msgstr "复制 --keep-groups 选项"
-#: sys-utils/setpriv.c:939
+#: sys-utils/setpriv.c:938
msgid "duplicate --inh-caps option"
msgstr "复制 --inh-caps 选项"
-#: sys-utils/setpriv.c:945
+#: sys-utils/setpriv.c:944
#, fuzzy
msgid "duplicate --ambient-caps option"
msgstr "复制 --inh-caps 选项"
-#: sys-utils/setpriv.c:951
+#: sys-utils/setpriv.c:950
msgid "duplicate --bounding-set option"
msgstr "复制 --bounding-set 选项"
-#: sys-utils/setpriv.c:957
+#: sys-utils/setpriv.c:956
msgid "duplicate --securebits option"
msgstr "复制 --securebits 选项"
-#: sys-utils/setpriv.c:963
+#: sys-utils/setpriv.c:962
msgid "duplicate --selinux-label option"
msgstr "复制 --selinux-label 选项"
-#: sys-utils/setpriv.c:969
+#: sys-utils/setpriv.c:968
msgid "duplicate --apparmor-profile option"
msgstr "复制 --apparmor-profile 选项"
-#: sys-utils/setpriv.c:988
+#: sys-utils/setpriv.c:987
msgid "--dump is incompatible with all other options"
msgstr "--dump 与其他所有选项不兼容"
-#: sys-utils/setpriv.c:996
+#: sys-utils/setpriv.c:995
msgid "--list-caps must be specified alone"
msgstr "--list-caps 必须作为单独选项指定"
-#: sys-utils/setpriv.c:1002
+#: sys-utils/setpriv.c:1001
msgid "No program specified"
msgstr "未指定程序"
-#: sys-utils/setpriv.c:1008
+#: sys-utils/setpriv.c:1007
#, fuzzy
msgid "--[re]gid requires --keep-groups, --clear-groups, --init-groups, or --groups"
msgstr "--[re]gid 需要 --keep-groups、--clear-groups 或 --groups"
-#: sys-utils/setpriv.c:1012
+#: sys-utils/setpriv.c:1011
msgid "--init-groups requires --ruid or --reuid"
msgstr ""
-#: sys-utils/setpriv.c:1016
+#: sys-utils/setpriv.c:1015
#, c-format
msgid "uid %ld not found, --init-groups requires an user that can be found on the system"
msgstr ""
-#: sys-utils/setpriv.c:1031
+#: sys-utils/setpriv.c:1030
msgid "disallow granting new privileges failed"
msgstr "禁止赋予新权限失败"
-#: sys-utils/setpriv.c:1039
+#: sys-utils/setpriv.c:1038
msgid "keep process capabilities failed"
msgstr "保持进程权能失败"
-#: sys-utils/setpriv.c:1047
+#: sys-utils/setpriv.c:1046
msgid "activate capabilities"
msgstr "激活权能"
-#: sys-utils/setpriv.c:1053
+#: sys-utils/setpriv.c:1052
msgid "reactivate capabilities"
msgstr "重新激活权能"
-#: sys-utils/setpriv.c:1064
+#: sys-utils/setpriv.c:1063
#, fuzzy
msgid "initgroups failed"
msgstr "setgroups 失败"
-#: sys-utils/setpriv.c:1072
+#: sys-utils/setpriv.c:1071
msgid "set process securebits failed"
msgstr "设置进程安全位失败"
-#: sys-utils/setpriv.c:1078
+#: sys-utils/setpriv.c:1077
msgid "apply bounding set"
msgstr "应用绑定集"
-#: sys-utils/setpriv.c:1084
+#: sys-utils/setpriv.c:1083
msgid "apply capabilities"
msgstr "应用权能"
-#: sys-utils/setpriv.c:1093
+#: sys-utils/setpriv.c:1092
#, fuzzy
msgid "set parent death signal failed"
msgstr "设置 rtc 唤醒闹钟失败"
@@ -17571,11 +17858,11 @@ msgstr ""
" pages\t :对释放的页在重新使用前丢弃\n"
" * 如果未选择策略,则两者都将启用。(默认)\n"
-#: sys-utils/swapon.c:911
+#: sys-utils/swapon.c:908
msgid "failed to parse priority"
msgstr "解析优先级失败"
-#: sys-utils/swapon.c:930
+#: sys-utils/swapon.c:927
#, c-format
msgid "unsupported discard policy: %s"
msgstr "不支持的丢弃策略:%s"
@@ -17639,11 +17926,11 @@ msgstr " %s [选项] <新根目录> <init 程序> <init 程序参数>\n"
msgid "Switch to another filesystem as the root of the mount tree.\n"
msgstr "切换到另一个文件系统作为挂载树的根目录。\n"
-#: sys-utils/switch_root.c:255
+#: sys-utils/switch_root.c:254
msgid "failed. Sorry."
msgstr "失败了。抱歉。"
-#: sys-utils/switch_root.c:258
+#: sys-utils/switch_root.c:257
#, c-format
msgid "cannot access %s"
msgstr "无法访问 %s"
@@ -17695,59 +17982,59 @@ msgstr " -r, --reset 重置端口\n"
msgid " -q, --print-irq <on|off> display current irq setting\n"
msgstr " -q, --print-irq <on|off> 显示当前的中断设置\n"
-#: sys-utils/tunelp.c:259
+#: sys-utils/tunelp.c:258
#, c-format
msgid "%s not an lp device"
msgstr "%s 不是循环设备"
-#: sys-utils/tunelp.c:278
+#: sys-utils/tunelp.c:277
msgid "LPGETSTATUS error"
msgstr "LPGETSTATUS 出错"
-#: sys-utils/tunelp.c:283
+#: sys-utils/tunelp.c:282
#, c-format
msgid "%s status is %d"
msgstr "%s 状态为 %d"
-#: sys-utils/tunelp.c:285
+#: sys-utils/tunelp.c:284
#, c-format
msgid ", busy"
msgstr ",忙碌"
-#: sys-utils/tunelp.c:287
+#: sys-utils/tunelp.c:286
#, c-format
msgid ", ready"
msgstr ",就绪"
-#: sys-utils/tunelp.c:289
+#: sys-utils/tunelp.c:288
#, c-format
msgid ", out of paper"
msgstr ",缺页"
-#: sys-utils/tunelp.c:291
+#: sys-utils/tunelp.c:290
#, c-format
msgid ", on-line"
msgstr ",在线"
-#: sys-utils/tunelp.c:293
+#: sys-utils/tunelp.c:292
#, c-format
msgid ", error"
msgstr ",错误"
-#: sys-utils/tunelp.c:298
+#: sys-utils/tunelp.c:297
msgid "ioctl failed"
msgstr "ioctl 失败"
-#: sys-utils/tunelp.c:308
+#: sys-utils/tunelp.c:307
msgid "LPGETIRQ error"
msgstr "LPGETIRQ 出错"
-#: sys-utils/tunelp.c:313
+#: sys-utils/tunelp.c:312
#, c-format
msgid "%s using IRQ %d\n"
msgstr "%s 使用中断请求 %d\n"
-#: sys-utils/tunelp.c:315
+#: sys-utils/tunelp.c:314
#, c-format
msgid "%s using polling\n"
msgstr "%s 使用轮询\n"
@@ -17866,95 +18153,90 @@ msgstr "%s:找不到"
msgid "%s: failed to determine source (--all-targets is unsupported on systems with regular mtab file)."
msgstr "%s:确定源失败(有常规 mtab 文件的系统不支持 --all-targets)"
-#: sys-utils/unshare.c:91
+#: sys-utils/unshare.c:93
#, c-format
msgid "unsupported --setgroups argument '%s'"
msgstr "不支持的 --setgroups 参数“%s”"
-#: sys-utils/unshare.c:112 sys-utils/unshare.c:127
+#: sys-utils/unshare.c:114 sys-utils/unshare.c:129
#, c-format
msgid "write failed %s"
msgstr "写失败:%s"
-#: sys-utils/unshare.c:150
+#: sys-utils/unshare.c:152
#, c-format
msgid "unsupported propagation mode: %s"
msgstr "不受支持的传播模式︰%s"
-#: sys-utils/unshare.c:159
+#: sys-utils/unshare.c:161
msgid "cannot change root filesystem propagation"
msgstr "无法更改根文件系统传播"
-#: sys-utils/unshare.c:190
+#: sys-utils/unshare.c:192
#, c-format
msgid "mount %s on %s failed"
msgstr "将 %s 挂载到 %s 失败"
-#: sys-utils/unshare.c:204
-#, c-format
-msgid "cannot stat %s"
-msgstr "无法 stat %s"
-
-#: sys-utils/unshare.c:215
+#: sys-utils/unshare.c:217
msgid "pipe failed"
msgstr "pipe 失败"
-#: sys-utils/unshare.c:229
+#: sys-utils/unshare.c:231
msgid "failed to read pipe"
msgstr "读取管道失败"
-#: sys-utils/unshare.c:252
+#: sys-utils/unshare.c:254
msgid "Run a program with some namespaces unshared from the parent.\n"
msgstr "以某些未与父(进程)共享的名字空间运行某个程序。\n"
-#: sys-utils/unshare.c:255
+#: sys-utils/unshare.c:257
msgid " -m, --mount[=<file>] unshare mounts namespace\n"
msgstr " -m, --mount[=<文件>] 取消共享 mounts 名字空间\n"
-#: sys-utils/unshare.c:256
+#: sys-utils/unshare.c:258
msgid " -u, --uts[=<file>] unshare UTS namespace (hostname etc)\n"
msgstr " -u, --uts[=<文件>] 取消共享 UTS 名字空间(主机名等)\n"
-#: sys-utils/unshare.c:257
+#: sys-utils/unshare.c:259
msgid " -i, --ipc[=<file>] unshare System V IPC namespace\n"
msgstr " -i, --ipc[=<文件>] 取消共享 System V IPC 名字空间\n"
-#: sys-utils/unshare.c:258
+#: sys-utils/unshare.c:260
msgid " -n, --net[=<file>] unshare network namespace\n"
msgstr " -n, --net[=<file>] 取消共享网络名字空间\n"
-#: sys-utils/unshare.c:259
+#: sys-utils/unshare.c:261
msgid " -p, --pid[=<file>] unshare pid namespace\n"
msgstr " -p, --pid[=<文件>] 取消共享 pid 名字空间\n"
-#: sys-utils/unshare.c:260
+#: sys-utils/unshare.c:262
msgid " -U, --user[=<file>] unshare user namespace\n"
msgstr " -U, --user[=<文件>] 取消共享用户名字空间\n"
-#: sys-utils/unshare.c:261
+#: sys-utils/unshare.c:263
msgid " -C, --cgroup[=<file>] unshare cgroup namespace\n"
msgstr " -C, --cgroup[=<文件>] 取消共享 cgroup 名字空间\n"
-#: sys-utils/unshare.c:263
+#: sys-utils/unshare.c:265
msgid " -f, --fork fork before launching <program>\n"
msgstr " -f, --fork 在启动<程序>前 fork\n"
-#: sys-utils/unshare.c:264
+#: sys-utils/unshare.c:266
msgid " -r, --map-root-user map current user to root (implies --user)\n"
msgstr " -r, --map-root-user 将当前用户映射为 root (连带打开 --user)\n"
-#: sys-utils/unshare.c:266
+#: sys-utils/unshare.c:268
msgid ""
" --kill-child[=<signame>] when dying, kill the forked child (implies --fork)\n"
" defaults to SIGKILL\n"
msgstr ""
-#: sys-utils/unshare.c:268
+#: sys-utils/unshare.c:270
#, fuzzy
msgid " --mount-proc[=<dir>] mount proc filesystem first (implies --mount)\n"
msgstr " --mount-proc[=<目录>] 先挂载 proc 文件系统(连带打开 --mount)\n"
-#: sys-utils/unshare.c:269
+#: sys-utils/unshare.c:271
#, fuzzy
msgid ""
" --propagation slave|shared|private|unchanged\n"
@@ -17963,24 +18245,59 @@ msgstr ""
" --propagation slave|shared|private|unchanged\n"
" 修改 mount 名字空间中的 mount 传播\n"
-#: sys-utils/unshare.c:271
+#: sys-utils/unshare.c:273
#, fuzzy
msgid " --setgroups allow|deny control the setgroups syscall in user namespaces\n"
msgstr " -s, --setgroups allow|deny 控制用户名字空间中的 setgroups 系统调用\n"
-#: sys-utils/unshare.c:404
+#: sys-utils/unshare.c:275
+#, fuzzy
+msgid " -R, --root=<dir>\t run the command with root directory set to <dir>\n"
+msgstr " -r, --root[=<目录>] 设置根目录\n"
+
+#: sys-utils/unshare.c:276
+#, fuzzy
+msgid " -w, --wd=<dir>\t change working directory to <dir>\n"
+msgstr " -w, --wd[=<dir>] 设置工作目录\n"
+
+#: sys-utils/unshare.c:277
+#, fuzzy
+msgid " -S, --setuid <uid>\t set uid in entered namespace\n"
+msgstr " -S, --setuid <uid> 设置进入空间中的 uid\n"
+
+#: sys-utils/unshare.c:278
+#, fuzzy
+msgid " -G, --setgid <gid>\t set gid in entered namespace\n"
+msgstr " -G, --setgid <gid> 设置进入名字空间中的 gid\n"
+
+#: sys-utils/unshare.c:432
msgid "unshare failed"
msgstr "unshare 失败"
-#: sys-utils/unshare.c:448
+#: sys-utils/unshare.c:476
msgid "child exit failed"
msgstr "子进程退出失败"
-#: sys-utils/unshare.c:457
+#: sys-utils/unshare.c:485
msgid "options --setgroups=allow and --map-root-user are mutually exclusive"
msgstr "--setgroups=allow 和 --map-root-user 选项是互斥的"
-#: sys-utils/unshare.c:477
+#: sys-utils/unshare.c:505
+#, fuzzy, c-format
+msgid "cannot change root directory to '%s'"
+msgstr "无法更改到 %s 目录"
+
+#: sys-utils/unshare.c:509
+#, fuzzy, c-format
+msgid "cannot chdir to '%s'"
+msgstr "无法更改到 %s 目录"
+
+#: sys-utils/unshare.c:513
+#, fuzzy, c-format
+msgid "umount %s failed"
+msgstr "挂载 %s 失败"
+
+#: sys-utils/unshare.c:515
#, c-format
msgid "mount %s failed"
msgstr "挂载 %s 失败"
@@ -18323,7 +18640,7 @@ msgstr "%s:无法执行 %s:%m"
#: term-utils/agetty.c:594 term-utils/agetty.c:921 term-utils/agetty.c:1457
#: term-utils/agetty.c:1475 term-utils/agetty.c:1512 term-utils/agetty.c:1522
-#: term-utils/agetty.c:1564 term-utils/agetty.c:2203 term-utils/agetty.c:2770
+#: term-utils/agetty.c:1564 term-utils/agetty.c:2203 term-utils/agetty.c:2772
#, c-format
msgid "failed to allocate memory: %m"
msgstr "分配内存失败:%m"
@@ -18413,27 +18730,27 @@ msgstr "无法打开 os-release 文件"
msgid "failed to create reload file: %s: %m"
msgstr "未能创建 reload 文件︰%s:%m"
-#: term-utils/agetty.c:1934
+#: term-utils/agetty.c:1936
msgid "[press ENTER to login]"
msgstr "[按 ENTER 键登录]"
-#: term-utils/agetty.c:1961
+#: term-utils/agetty.c:1963
msgid "Num Lock off"
msgstr "Num Lock 关"
-#: term-utils/agetty.c:1964
+#: term-utils/agetty.c:1966
msgid "Num Lock on"
msgstr "Num Lock 开"
-#: term-utils/agetty.c:1967
+#: term-utils/agetty.c:1969
msgid "Caps Lock on"
msgstr "Caps Lock 开"
-#: term-utils/agetty.c:1970
+#: term-utils/agetty.c:1972
msgid "Scroll Lock on"
msgstr "Scroll Lock 开"
-#: term-utils/agetty.c:1973
+#: term-utils/agetty.c:1975
#, c-format
msgid ""
"Hint: %s\n"
@@ -18442,7 +18759,7 @@ msgstr ""
"提示:%s\n"
"\n"
-#: term-utils/agetty.c:2115
+#: term-utils/agetty.c:2117
#, c-format
msgid "%s: read: %m"
msgstr "%s:read:%m"
@@ -18619,17 +18936,17 @@ msgid "%d user"
msgid_plural "%d users"
msgstr[0] "%d 位用户"
-#: term-utils/agetty.c:2858
+#: term-utils/agetty.c:2860
#, c-format
msgid "checkname failed: %m"
msgstr "checkname 失败:%m"
-#: term-utils/agetty.c:2870
+#: term-utils/agetty.c:2872
#, c-format
msgid "cannot touch file %s"
msgstr "无法 touch 文件 %s"
-#: term-utils/agetty.c:2874
+#: term-utils/agetty.c:2876
msgid "--reload is unsupported on your system"
msgstr "您的系统不支持 --reload"
@@ -18787,7 +19104,7 @@ msgstr "pty 的输出"
msgid "failed to parse output limit size"
msgstr "解析 %s 限制失败"
-#: term-utils/script.c:854
+#: term-utils/script.c:852
#, c-format
msgid "Script started, file is %s\n"
msgstr "脚本已启动,文件为 %s\n"
@@ -18850,226 +19167,227 @@ msgstr "定时文件 %s:第 %lu 行:格式异常。"
msgid "argument error: bright %s is not supported"
msgstr "参数错误:不支持亮度 %s"
-#: term-utils/setterm.c:326
+#: term-utils/setterm.c:329
msgid "too many tabs"
msgstr "标签过多"
-#: term-utils/setterm.c:382
+#: term-utils/setterm.c:385
msgid "Set the attributes of a terminal.\n"
msgstr "设置终端属性。\n"
-#: term-utils/setterm.c:385
+#: term-utils/setterm.c:388
msgid " --term <terminal_name> override TERM environment variable\n"
msgstr " --term <终端名> 替换 TERM 环境变量\n"
-#: term-utils/setterm.c:386
+#: term-utils/setterm.c:389
msgid " --reset reset terminal to power-on state\n"
msgstr " --reset 重置端口到上电时的状态\n"
-#: term-utils/setterm.c:387
+#: term-utils/setterm.c:390
#, fuzzy
msgid " --resize reset terminal rows and columns\n"
msgstr " --reset 重置端口到上电时的状态\n"
-#: term-utils/setterm.c:388
+#: term-utils/setterm.c:391
msgid " --initialize display init string, and use default settings\n"
msgstr " --initialize 显示初始化字符串,并使用默认设置\n"
-#: term-utils/setterm.c:389
+#: term-utils/setterm.c:392
msgid " --default use default terminal settings\n"
msgstr " --default 使用默认终端设置\n"
-#: term-utils/setterm.c:390
+#: term-utils/setterm.c:393
msgid " --store save current terminal settings as default\n"
msgstr " --store 将当前终端设置保存为默认值\n"
-#: term-utils/setterm.c:391
+#: term-utils/setterm.c:394
msgid " --cursor [on|off] display cursor\n"
msgstr " --cursor [on|off] 显示光标\n"
-#: term-utils/setterm.c:392
+#: term-utils/setterm.c:395
msgid " --repeat [on|off] keyboard repeat\n"
msgstr " --repeat [on|off] 键盘重复\n"
-#: term-utils/setterm.c:393
+#: term-utils/setterm.c:396
msgid " --appcursorkeys [on|off] cursor key application mode\n"
msgstr " --appcursorkeys [on|off] 光标键应用程序模式\n"
-#: term-utils/setterm.c:394
+#: term-utils/setterm.c:397
msgid " --linewrap [on|off] continue on a new line when a line is full\n"
msgstr " --linewrap [on|off] 一行满时在新行中继续\n"
-#: term-utils/setterm.c:395
+#: term-utils/setterm.c:398
msgid " --inversescreen [on|off] swap colors for the whole screen\n"
msgstr " --inversescreen [on|off] 交换整个屏幕的颜色\n"
-#: term-utils/setterm.c:396
+#: term-utils/setterm.c:399
msgid " --foreground default|<color> set foreground color\n"
msgstr " --foreground default|<颜色> 设置前景色\n"
-#: term-utils/setterm.c:397
+#: term-utils/setterm.c:400
msgid " --background default|<color> set background color\n"
msgstr " --background default|<颜色> 设置背景色\n"
-#: term-utils/setterm.c:398
+#: term-utils/setterm.c:401
msgid " --ulcolor [bright] <color> set underlined text color\n"
msgstr " --ulcolor [bright] <颜色> 设置下划线颜色\n"
-#: term-utils/setterm.c:399
-msgid " --hbcolor [bright] <color> set bold text color\n"
+#: term-utils/setterm.c:402
+#, fuzzy
+msgid " --hbcolor [bright] <color> set half-bright text color\n"
msgstr " --hbcolor [bright] <颜色> 设置粗体字颜色\n"
-#: term-utils/setterm.c:400
+#: term-utils/setterm.c:403
msgid " <color>: 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:401
+#: term-utils/setterm.c:404
msgid " --bold [on|off] bold\n"
msgstr " --bold [on|off] 粗体\n"
-#: term-utils/setterm.c:402
+#: term-utils/setterm.c:405
msgid " --half-bright [on|off] dim\n"
msgstr " -half-bright [on|off] 变暗\n"
-#: term-utils/setterm.c:403
+#: term-utils/setterm.c:406
msgid " --blink [on|off] blink\n"
msgstr " --blink [on|off] 闪烁\n"
-#: term-utils/setterm.c:404
+#: term-utils/setterm.c:407
msgid " --underline [on|off] underline\n"
msgstr " --underline [on|off] 下划线\n"
-#: term-utils/setterm.c:405
+#: term-utils/setterm.c:408
msgid " --reverse [on|off] swap foreground and background colors\n"
msgstr " --reverse [on|off] 交换前景色和背景色\n"
-#: term-utils/setterm.c:406
+#: term-utils/setterm.c:409
msgid " --clear [all|rest] clear screen and set cursor position\n"
msgstr " --clear [all|rest] 清屏并设置光标位置\n"
-#: term-utils/setterm.c:407
+#: term-utils/setterm.c:410
msgid " --tabs [<number>...] set these tab stop positions, or show them\n"
msgstr " --tabs [<数字>...] 设置这些制表位置,或显示制表位\n"
-#: term-utils/setterm.c:408
+#: term-utils/setterm.c:411
msgid " --clrtabs [<number>...] clear these tab stop positions, or all\n"
msgstr " --clrtabs [<数字>...] 清除这些或所有制表位\n"
-#: term-utils/setterm.c:409
+#: term-utils/setterm.c:412
msgid " --regtabs [1-160] set a regular tab stop interval\n"
msgstr " --regtabs [1-160] 设置常规的制表位间隔\n"
-#: term-utils/setterm.c:410
+#: term-utils/setterm.c:413
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:411
+#: term-utils/setterm.c:414
msgid " --dump [<number>] write vcsa<number> console dump to file\n"
msgstr " --dump [<数字>] 将 vcsa<数字> 终端转储到文件\n"
-#: term-utils/setterm.c:412
+#: term-utils/setterm.c:415
msgid " --append [<number>] append vcsa<number> console dump to file\n"
msgstr " --append [<数字>] 将 vcsa<数字> 终端转储追加到文件\n"
-#: term-utils/setterm.c:413
+#: term-utils/setterm.c:416
msgid " --file <filename> name of the dump file\n"
msgstr " -f, --file <文件名> 转储文件的名字\n"
-#: term-utils/setterm.c:414
+#: term-utils/setterm.c:417
msgid " --msg [on|off] send kernel messages to console\n"
msgstr " --msg [on|off] 将内核消息发送到终端\n"
-#: term-utils/setterm.c:415
+#: term-utils/setterm.c:418
msgid " --msglevel 0-8 kernel console log level\n"
msgstr " --msglevel 0-8 内核终端日志记录级别\n"
-#: term-utils/setterm.c:416
+#: term-utils/setterm.c:419
msgid " --powersave [on|vsync|hsync|powerdown|off]\n"
msgstr " -powersave [on|vsync|hsync|powerdown|off]\n"
-#: term-utils/setterm.c:417
+#: term-utils/setterm.c:420
msgid " set vesa powersaving features\n"
msgstr " 设置 vesa 节能功能\n"
-#: term-utils/setterm.c:418
+#: term-utils/setterm.c:421
msgid " --powerdown [0-60] set vesa powerdown interval in minutes\n"
msgstr " --powerdown [0-60] 设置 vesa 关闭电源间隔(分钟)\n"
-#: term-utils/setterm.c:419
+#: term-utils/setterm.c:422
msgid " --blength [0-2000] duration of the bell in milliseconds\n"
msgstr " --blength [0-2000] 响铃持续时间(毫秒)\n"
-#: term-utils/setterm.c:420
+#: term-utils/setterm.c:423
msgid " --bfreq <number> bell frequency in Hertz\n"
msgstr " --bfreq <数字> 响铃频率,单位为 Hz\n"
-#: term-utils/setterm.c:431
+#: term-utils/setterm.c:434
msgid "duplicate use of an option"
msgstr "重复使用某选项"
-#: term-utils/setterm.c:740
+#: term-utils/setterm.c:743
msgid "cannot force blank"
msgstr "无法强制清空(blank)"
-#: term-utils/setterm.c:745
+#: term-utils/setterm.c:748
msgid "cannot force unblank"
msgstr "无法强制反清空(unblank)"
-#: term-utils/setterm.c:751
+#: term-utils/setterm.c:754
msgid "cannot get blank status"
msgstr "无法获取空白状态"
-#: term-utils/setterm.c:777
+#: term-utils/setterm.c:780
#, fuzzy, c-format
msgid "cannot open dump file %s for output"
msgstr "无法打开转储文件 %s 进行输出"
-#: term-utils/setterm.c:819
+#: term-utils/setterm.c:822
#, c-format
msgid "terminal %s does not support %s"
msgstr "终端 %s 不支持 %s"
-#: term-utils/setterm.c:857
+#: term-utils/setterm.c:860
#, fuzzy
msgid "select failed"
msgstr "定位失败"
-#: term-utils/setterm.c:883
+#: term-utils/setterm.c:886
msgid "stdin does not refer to a terminal"
msgstr ""
-#: term-utils/setterm.c:911
+#: term-utils/setterm.c:914
#, fuzzy, c-format
msgid "invalid cursor position: %s"
msgstr "无效选项"
-#: term-utils/setterm.c:933
+#: term-utils/setterm.c:936
#, fuzzy
msgid "reset failed"
msgstr "setgid 失败"
-#: term-utils/setterm.c:1097
+#: term-utils/setterm.c:1100
msgid "cannot (un)set powersave mode"
msgstr "无法设置(取消)节能模式"
-#: term-utils/setterm.c:1116 term-utils/setterm.c:1125
+#: term-utils/setterm.c:1119 term-utils/setterm.c:1128
msgid "klogctl error"
msgstr "klogctl 出错"
-#: term-utils/setterm.c:1146
+#: term-utils/setterm.c:1149
msgid "$TERM is not defined."
msgstr "$TERM 未定义。"
-#: term-utils/setterm.c:1153
+#: term-utils/setterm.c:1156
msgid "terminfo database cannot be found"
msgstr "找不到 terminfo 数据库"
-#: term-utils/setterm.c:1155
+#: term-utils/setterm.c:1158
#, c-format
msgid "%s: unknown terminal type"
msgstr "%s:未知终端类型"
-#: term-utils/setterm.c:1157
+#: term-utils/setterm.c:1160
msgid "terminal is hardcopy"
msgstr "终端为硬拷贝(hardcopy)"
@@ -19152,16 +19470,12 @@ msgstr "无效的超时参数:%s"
msgid "cannot get passwd uid"
msgstr "无法获取 passwd uid"
-#: term-utils/wall.c:362
-msgid "cannot get tty name"
-msgstr "无法获得 tty 名称"
-
-#: term-utils/wall.c:382
+#: term-utils/wall.c:381
#, c-format
msgid "Broadcast message from %s@%s (%s) (%s):"
msgstr "来自 %s@%s (%s) (%s) 的广播消息:"
-#: term-utils/wall.c:415
+#: term-utils/wall.c:414
#, c-format
msgid "will not read %s - use stdin."
msgstr "将不读 %s - 使用 stdin。"
@@ -19213,16 +19527,16 @@ msgstr "%s@%s (作为 %s) 于 %s 在 %02d:%02d 发的消息..."
msgid "Message from %s@%s on %s at %02d:%02d ..."
msgstr "%s@%s 于 %s 在 %02d:%02d 发的消息..."
-#: term-utils/write.c:330
+#: term-utils/write.c:329
msgid "you have write permission turned off"
msgstr "您关闭了写权限"
-#: term-utils/write.c:353
+#: term-utils/write.c:352
#, c-format
msgid "%s is not logged in on %s"
msgstr "%s 未在 %s 上登录"
-#: term-utils/write.c:359
+#: term-utils/write.c:358
#, c-format
msgid "%s has messages disabled on %s"
msgstr "%s 在 %s 上禁用了消息"
@@ -19268,6 +19582,11 @@ msgstr ""
msgid "bad -l argument"
msgstr "-l 参数有误"
+#: text-utils/col.c:246
+#, fuzzy, c-format
+msgid "failed on line %d"
+msgstr "unlink %s 失败"
+
#: text-utils/col.c:344
#, c-format
msgid "warning: can't back up %s."
@@ -19313,11 +19632,11 @@ msgstr ""
msgid "Filter out the specified columns.\n"
msgstr "过滤指定列。\n"
-#: text-utils/colrm.c:185
+#: text-utils/colrm.c:184
msgid "first argument"
msgstr "第一个参数"
-#: text-utils/colrm.c:187
+#: text-utils/colrm.c:186
msgid "second argument"
msgstr "第二个参数"
@@ -19477,77 +19796,77 @@ msgstr " -x, --fillrows 先填充行,再填充列\n"
msgid "invalid columns argument"
msgstr "无效的 列数 参数"
-#: text-utils/column.c:748
+#: text-utils/column.c:745
#, fuzzy
msgid "failed to parse column names"
msgstr "解析挂臷表失败"
-#: text-utils/column.c:801
+#: text-utils/column.c:800
msgid "options --tree-id and --tree-parent are required for tree formatting"
msgstr ""
-#: text-utils/column.c:809
+#: text-utils/column.c:808
msgid "option --table required for all --table-*"
msgstr ""
-#: text-utils/column.c:812
+#: text-utils/column.c:811
msgid "option --table-columns required for --json"
msgstr ""
-#: text-utils/hexdump.c:156 text-utils/more.c:205
+#: text-utils/hexdump.c:155 text-utils/more.c:205
#, c-format
msgid " %s [options] <file>...\n"
msgstr " %s [选项] <文件>...\n"
-#: text-utils/hexdump.c:159
+#: text-utils/hexdump.c:158
msgid "Display file contents in hexadecimal, decimal, octal, or ascii.\n"
msgstr "以十六进制、十进制、八进制、二进制或 ascii 显示文件内容。\n"
-#: text-utils/hexdump.c:162
+#: text-utils/hexdump.c:161
msgid " -b, --one-byte-octal one-byte octal display\n"
msgstr " -b, --one-byte-octal 单字节八进制显示\n"
-#: text-utils/hexdump.c:163
+#: text-utils/hexdump.c:162
msgid " -c, --one-byte-char one-byte character display\n"
msgstr " -c, --one-byte-char 单字节字符显示\n"
-#: text-utils/hexdump.c:164
+#: text-utils/hexdump.c:163
msgid " -C, --canonical canonical hex+ASCII display\n"
msgstr " -C, --canonical 规范化 hex+ASCII 显示\n"
-#: text-utils/hexdump.c:165
+#: text-utils/hexdump.c:164
msgid " -d, --two-bytes-decimal two-byte decimal display\n"
msgstr " -d, --two-bytes-decimal 双字节十进制显示\n"
-#: text-utils/hexdump.c:166
+#: text-utils/hexdump.c:165
msgid " -o, --two-bytes-octal two-byte octal display\n"
msgstr " -o, --two-bytes-octal 双字节八进制显示\n"
-#: text-utils/hexdump.c:167
+#: text-utils/hexdump.c:166
msgid " -x, --two-bytes-hex two-byte hexadecimal display\n"
msgstr " -x, --two-bytes-hex 双字节十六进制显示\n"
-#: text-utils/hexdump.c:168
+#: text-utils/hexdump.c:167
msgid " -L, --color[=<mode>] interpret color formatting specifiers\n"
msgstr " -L, --color[=<模式>] 解释颜色格式化限定符\n"
-#: text-utils/hexdump.c:171
+#: text-utils/hexdump.c:170
msgid " -e, --format <format> format string to be used for displaying data\n"
msgstr " -e, --format <格式> 用于显示数据的格式化字符串\n"
-#: text-utils/hexdump.c:172
+#: text-utils/hexdump.c:171
msgid " -f, --format-file <file> file that contains format strings\n"
msgstr " -f, --format-file <文件> 包含格式字符串的文件\n"
-#: text-utils/hexdump.c:173
+#: text-utils/hexdump.c:172
msgid " -n, --length <length> interpret only length bytes of input\n"
msgstr " -n, --length <长度> 只解释规定字节长度的输入\n"
-#: text-utils/hexdump.c:174
+#: text-utils/hexdump.c:173
msgid " -s, --skip <offset> skip offset bytes from the beginning\n"
msgstr " -s, --skip <偏移> 跳过开头的指定字节偏移\n"
-#: text-utils/hexdump.c:175
+#: text-utils/hexdump.c:174
msgid " -v, --no-squeezing output identical lines\n"
msgstr " -v, --no-squeezing 输出相同的行\n"
@@ -19977,10 +20296,6 @@ msgstr "没有记忆的搜索字符串"
msgid "cannot open "
msgstr "打不开 "
-#: text-utils/pg.c:1263
-msgid "saved"
-msgstr "已保存"
-
#: text-utils/pg.c:1353
msgid ": !command not allowed in rflag mode.\n"
msgstr ": !命令 在 rflag 模式下不许使用。\n"
@@ -20046,6 +20361,19 @@ msgstr "输入中有未知转义序列:%o,%o"
msgid "Input line too long."
msgstr "输入行过长。"
+#~ msgid "incorrect password"
+#~ msgstr "密码错误"
+
+#~ msgid "Failed to set personality to %s"
+#~ msgstr "无法将人格(personality)设置为 %s"
+
+#, fuzzy
+#~ msgid " --reset-env reset environment variables\n"
+#~ msgstr " -m, -p, --preserve-environment 不重置环境变量\n"
+
+#~ msgid "cannot get tty name"
+#~ msgstr "无法获得 tty 名称"
+
#~ msgid "%15s: %s"
#~ msgstr "%15s: %s"
@@ -20708,9 +21036,6 @@ msgstr "输入行过长。"
#~ msgid "%d"
#~ msgstr "%d"
-#~ msgid "%s: parse error at line %d"
-#~ msgstr "%s:第 %d 行解析出错"
-
#~ msgid "use of 'kill --pid' option as command name is deprecated"
#~ msgstr "将“kill --pid”选项当作命令的做法已经废弃"
@@ -21547,9 +21872,6 @@ msgstr "输入行过长。"
#~ msgid "track-to-track seek: %ld (milliseconds)"
#~ msgstr "跨磁道定位:%ld (毫秒)"
-#~ msgid "partitions: %d"
-#~ msgstr "分区数:%d"
-
#~ msgid "You cannot change a partition into an extended one or vice versa. Delete it first."
#~ msgstr "您不能将分区更改为扩展分区或从扩展分区改回。请先删除该分区。"