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.po7150
1 files changed, 3910 insertions, 3240 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a9643f064..439980ab3 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: 2017-06-02 11:14+0200\n"
+"POT-Creation-Date: 2017-09-19 14:06+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"
@@ -22,64 +22,76 @@ msgstr ""
"X-Crowdin-Language: zh-CN\n"
"X-Crowdin-File: util-linux-2.29-rc2.zh_CN.po\n"
-#: disk-utils/addpart.c:14
+#: disk-utils/addpart.c:15
#, c-format
msgid " %s <disk device> <partition number> <start> <length>\n"
msgstr " %s <磁盘设备> <分区号> <起点> <长度>\n"
-#: disk-utils/addpart.c:18
+#: disk-utils/addpart.c:19
msgid "Tell the kernel about the existence of a specified partition.\n"
msgstr "通知内核,存在某个指定分区。\n"
-#: disk-utils/addpart.c:56 disk-utils/blockdev.c:276 disk-utils/blockdev.c:420
-#: disk-utils/blockdev.c:446 disk-utils/cfdisk.c:2639 disk-utils/delpart.c:57
-#: disk-utils/fdformat.c:227 disk-utils/fdisk.c:720 disk-utils/fdisk.c:1019
+#: 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:95 misc-utils/kill.c:396
+#: misc-utils/kill.c:438 misc-utils/rename.c:200 misc-utils/whereis.c:515
+#: 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
+#: term-utils/agetty.c:850 term-utils/agetty.c:851 term-utils/agetty.c:859
+#: term-utils/agetty.c:860
+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:2687 disk-utils/delpart.c:59
+#: disk-utils/fdformat.c:229 disk-utils/fdisk.c:764 disk-utils/fdisk.c:1066
#: disk-utils/fdisk-list.c:321 disk-utils/fdisk-list.c:361
-#: disk-utils/fdisk-list.c:380 disk-utils/fsck.c:1448
-#: disk-utils/fsck.cramfs.c:155 disk-utils/fsck.cramfs.c:510
-#: disk-utils/isosize.c:134 disk-utils/mkfs.bfs.c:189
-#: disk-utils/mkfs.cramfs.c:173 disk-utils/mkfs.cramfs.c:661
-#: disk-utils/mkfs.cramfs.c:788 disk-utils/mkfs.minix.c:819
-#: disk-utils/mkswap.c:215 disk-utils/mkswap.c:244 disk-utils/partx.c:1013
-#: disk-utils/resizepart.c:101 disk-utils/sfdisk.c:649 disk-utils/sfdisk.c:705
-#: disk-utils/sfdisk.c:759 disk-utils/sfdisk.c:818 disk-utils/sfdisk.c:882
-#: disk-utils/sfdisk.c:923 disk-utils/sfdisk.c:953 disk-utils/sfdisk.c:990
-#: disk-utils/sfdisk.c:1574 disk-utils/swaplabel.c:60 libfdisk/src/bsd.c:640
-#: lib/path.c:70 lib/path.c:82 login-utils/islocal.c:87 login-utils/last.c:670
+#: disk-utils/fdisk-list.c:380 disk-utils/fsck.c:1457
+#: disk-utils/fsck.cramfs.c:152 disk-utils/fsck.cramfs.c:507
+#: disk-utils/isosize.c:102 disk-utils/mkfs.bfs.c:192
+#: disk-utils/mkfs.cramfs.c:171 disk-utils/mkfs.cramfs.c:659
+#: disk-utils/mkfs.cramfs.c:799 disk-utils/mkfs.minix.c:824
+#: disk-utils/mkswap.c:217 disk-utils/mkswap.c:246 disk-utils/partx.c:1013
+#: disk-utils/resizepart.c:103 disk-utils/sfdisk.c:648 disk-utils/sfdisk.c:704
+#: disk-utils/sfdisk.c:758 disk-utils/sfdisk.c:817 disk-utils/sfdisk.c:881
+#: disk-utils/sfdisk.c:922 disk-utils/sfdisk.c:952 disk-utils/sfdisk.c:989
+#: disk-utils/sfdisk.c:1548 disk-utils/swaplabel.c:65 libfdisk/src/bsd.c:640
+#: lib/path.c:81 lib/path.c:99 login-utils/islocal.c:87 login-utils/last.c:674
#: login-utils/sulogin.c:443 login-utils/sulogin.c:480
#: login-utils/utmpdump.c:136 login-utils/utmpdump.c:354
-#: login-utils/utmpdump.c:376 login-utils/vipw.c:259 login-utils/vipw.c:277
-#: misc-utils/findmnt.c:1099 misc-utils/logger.c:1188 misc-utils/mcookie.c:115
-#: misc-utils/uuidd.c:207 sys-utils/blkdiscard.c:182 sys-utils/blkzone.c:96
-#: sys-utils/dmesg.c:521 sys-utils/eject.c:499 sys-utils/eject.c:699
+#: login-utils/utmpdump.c:376 login-utils/vipw.c:262 login-utils/vipw.c:280
+#: misc-utils/findmnt.c:1099 misc-utils/logger.c:1190 misc-utils/mcookie.c:115
+#: misc-utils/uuidd.c:198 sys-utils/blkdiscard.c:182 sys-utils/blkzone.c:96
+#: sys-utils/dmesg.c:532 sys-utils/eject.c:499 sys-utils/eject.c:699
#: sys-utils/fallocate.c:405 sys-utils/fsfreeze.c:117 sys-utils/fstrim.c:72
-#: sys-utils/hwclock.c:215 sys-utils/ldattach.c:387 sys-utils/nsenter.c:130
-#: sys-utils/rtcwake.c:136 sys-utils/rtcwake.c:270 sys-utils/setpriv.c:230
-#: sys-utils/setpriv.c:529 sys-utils/setpriv.c:552 sys-utils/swapon.c:372
-#: sys-utils/swapon.c:515 sys-utils/switch_root.c:167 sys-utils/unshare.c:106
-#: sys-utils/unshare.c:121 sys-utils/wdctl.c:323 sys-utils/wdctl.c:379
-#: term-utils/agetty.c:2624 term-utils/mesg.c:127 term-utils/script.c:426
-#: term-utils/script.c:432 term-utils/script.c:434 term-utils/script.c:530
-#: term-utils/scriptreplay.c:197 term-utils/scriptreplay.c:200
-#: term-utils/wall.c:413 text-utils/colcrt.c:282 text-utils/more.c:519
-#: text-utils/rev.c:141 text-utils/ul.c:231
+#: sys-utils/hwclock.c:207 sys-utils/hwclock-rtc.c:400
+#: sys-utils/hwclock-rtc.c:435 sys-utils/ldattach.c:392 sys-utils/nsenter.c:129
+#: sys-utils/rfkill.c:158 sys-utils/rfkill.c:220 sys-utils/rfkill.c:352
+#: sys-utils/rfkill.c:441 sys-utils/rtcwake.c:134 sys-utils/rtcwake.c:268
+#: sys-utils/setpriv.c:276 sys-utils/setpriv.c:614 sys-utils/setpriv.c:637
+#: sys-utils/swapon.c:376 sys-utils/swapon.c:519 sys-utils/switch_root.c:167
+#: sys-utils/unshare.c:106 sys-utils/unshare.c:121 sys-utils/wdctl.c:322
+#: sys-utils/wdctl.c:378 term-utils/agetty.c:2608 term-utils/mesg.c:127
+#: term-utils/script.c:460 term-utils/script.c:468 term-utils/script.c:563
+#: term-utils/scriptreplay.c:198 term-utils/scriptreplay.c:201
+#: term-utils/wall.c:419 text-utils/colcrt.c:282 text-utils/more.c:534
+#: text-utils/rev.c:141 text-utils/ul.c:230
#, c-format
msgid "cannot open %s"
msgstr "打不开 %s"
-#: disk-utils/addpart.c:59 disk-utils/delpart.c:60 disk-utils/resizepart.c:98
+#: disk-utils/addpart.c:61 disk-utils/delpart.c:62 disk-utils/resizepart.c:100
msgid "invalid partition number argument"
msgstr "无效的分区号参数"
-#: disk-utils/addpart.c:60
+#: disk-utils/addpart.c:62
msgid "invalid start argument"
msgstr "无效的 起点 参数"
-#: disk-utils/addpart.c:61 disk-utils/resizepart.c:108
+#: disk-utils/addpart.c:63 disk-utils/resizepart.c:110
msgid "invalid length argument"
msgstr "无效的长度参数"
-#: disk-utils/addpart.c:62
+#: disk-utils/addpart.c:64
msgid "failed to add partition"
msgstr "添加分区失败"
@@ -163,70 +175,91 @@ msgstr "刷新缓存"
msgid "reread partition table"
msgstr "重新读取分区表"
-#: disk-utils/blockdev.c:184
+#: disk-utils/blockdev.c:187
#, c-format
msgid ""
-"\n"
-"Usage:\n"
-" %1$s -V\n"
-" %1$s --report [devices]\n"
" %1$s [-v|-q] commands devices\n"
-"\n"
-"Available commands:\n"
+" %1$s --report [devices]\n"
+" %1$s -h|-V\n"
msgstr ""
-"\n"
-"用法:\n"
-" %1$s -V\n"
-" %1$s --report [设备]\n"
-" %1$s [-v|-q] 命令 设备\n"
-"\n"
-"可用命令有:\n"
-#: disk-utils/blockdev.c:190
+#: disk-utils/blockdev.c:193
+msgid "Call block device ioctls from the command line."
+msgstr ""
+
+#: disk-utils/blockdev.c:196
+#, fuzzy
+msgid " -q quiet mode"
+msgstr " -q, --quiet 开启安静模式\n"
+
+#: disk-utils/blockdev.c:197
+#, fuzzy
+msgid " -v verbose mode"
+msgstr " -v, --verbose 详尽模式\n"
+
+#: disk-utils/blockdev.c:198
+msgid " --report print report for specified (or all) devices"
+msgstr ""
+
+#: disk-utils/blockdev.c:203
+#, fuzzy
+msgid "Available commands:"
+msgstr "可用的列:\n"
+
+#: disk-utils/blockdev.c:204
#, c-format
msgid " %-25s get size in 512-byte sectors\n"
msgstr " %-25s 获得 512-字节扇区的大小\n"
-#: disk-utils/blockdev.c:311
+#: 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:718
+#: sys-utils/blkdiscard.c:171 sys-utils/blkzone.c:394 sys-utils/tunelp.c:242
+#: sys-utils/zramctl.c:686 sys-utils/zramctl.c:712
+msgid "no device specified"
+msgstr "未指定设备"
+
+#: disk-utils/blockdev.c:330
msgid "could not get device size"
msgstr "无法多得设备大小"
-#: disk-utils/blockdev.c:317
+#: disk-utils/blockdev.c:336
#, c-format
msgid "Unknown command: %s"
msgstr "未知命令: %s"
-#: disk-utils/blockdev.c:333
+#: disk-utils/blockdev.c:352
#, c-format
msgid "%s requires an argument"
msgstr "%s 需要一个参数"
-#: disk-utils/blockdev.c:368 disk-utils/blockdev.c:474
+#: disk-utils/blockdev.c:387 disk-utils/blockdev.c:493
#, c-format
msgid "ioctl error on %s"
msgstr "%s ioctl 出错"
-#: disk-utils/blockdev.c:370
+#: disk-utils/blockdev.c:389
#, c-format
msgid "%s failed.\n"
msgstr "%s 失败.\n"
-#: disk-utils/blockdev.c:377
+#: disk-utils/blockdev.c:396
#, c-format
msgid "%s succeeded.\n"
msgstr "%s 成功.\n"
-#: disk-utils/blockdev.c:457
+#: disk-utils/blockdev.c:476
#, c-format
msgid "%s: failed to initialize sysfs handler"
msgstr "%s:初始化 sysfs 处理函数失败"
-#: disk-utils/blockdev.c:461
+#: disk-utils/blockdev.c:480
#, c-format
msgid "%s: failed to read partition start from sysfs"
msgstr "%s:读取从 sysfs 起始的分区失败"
-#: disk-utils/blockdev.c:482
+#: disk-utils/blockdev.c:501
#, c-format
msgid "RO RA SSZ BSZ StartSec Size Device\n"
msgstr "RO RA SSZ BSZ 开始段 大小 设备\n"
@@ -248,417 +281,437 @@ msgid "Delete the current partition"
msgstr "删除当前分区"
#: disk-utils/cfdisk.c:186
+#, fuzzy
+msgid "Resize"
+msgstr "大小"
+
+#: disk-utils/cfdisk.c:186
+#, fuzzy
+msgid "Reduce or enlarge the current partition"
+msgstr "删除当前分区"
+
+#: disk-utils/cfdisk.c:187
msgid "New"
msgstr "新建"
-#: disk-utils/cfdisk.c:186
+#: disk-utils/cfdisk.c:187
msgid "Create new partition from free space"
msgstr "在剩余空间上创建新分区"
-#: disk-utils/cfdisk.c:187
+#: disk-utils/cfdisk.c:188
msgid "Quit"
msgstr "退出"
-#: disk-utils/cfdisk.c:187
+#: disk-utils/cfdisk.c:188
msgid "Quit program without writing changes"
msgstr "退出程序而不写入更改"
-#: disk-utils/cfdisk.c:188 libfdisk/src/bsd.c:438 libfdisk/src/bsd.c:1022
-#: libfdisk/src/dos.c:2396 libfdisk/src/gpt.c:3017 libfdisk/src/sgi.c:1159
-#: libfdisk/src/sun.c:1119
+#: disk-utils/cfdisk.c:189 libfdisk/src/bsd.c:438 libfdisk/src/bsd.c:1022
+#: libfdisk/src/dos.c:2431 libfdisk/src/gpt.c:3043 libfdisk/src/sgi.c:1159
+#: libfdisk/src/sun.c:1100
msgid "Type"
msgstr "类型"
-#: disk-utils/cfdisk.c:188
+#: disk-utils/cfdisk.c:189
msgid "Change the partition type"
msgstr "更改分区类型"
-#: disk-utils/cfdisk.c:189
+#: disk-utils/cfdisk.c:190
msgid "Help"
msgstr "帮助"
-#: disk-utils/cfdisk.c:189
+#: disk-utils/cfdisk.c:190
msgid "Print help screen"
msgstr "打印帮助界面"
-#: disk-utils/cfdisk.c:190
+#: disk-utils/cfdisk.c:191
msgid "Sort"
msgstr "排序"
-#: disk-utils/cfdisk.c:190
+#: disk-utils/cfdisk.c:191
msgid "Fix partitions order"
msgstr "修复分区顺序"
-#: disk-utils/cfdisk.c:191
+#: disk-utils/cfdisk.c:192
msgid "Write"
msgstr "写入"
-#: disk-utils/cfdisk.c:191
+#: disk-utils/cfdisk.c:192
msgid "Write partition table to disk (this might destroy data)"
msgstr "将分区表写入磁盘(可能损坏数据)"
-#: disk-utils/cfdisk.c:192
+#: disk-utils/cfdisk.c:193
msgid "Dump"
msgstr "转储"
-#: disk-utils/cfdisk.c:192
+#: disk-utils/cfdisk.c:193
msgid "Dump partition table to sfdisk compatible script file"
msgstr "将分区表转储到与 sfdisk 兼容的脚本文件"
-#: disk-utils/cfdisk.c:625 disk-utils/fdisk.c:417
+#: disk-utils/cfdisk.c:628 disk-utils/fdisk.c:461
#, c-format
msgid "internal error: unsupported dialog type %d"
msgstr "内部错误:不支持的对话类型 %d"
-#: disk-utils/cfdisk.c:1262
+#: disk-utils/cfdisk.c:1265
#, c-format
msgid "%s (mounted)"
msgstr "%s (已挂载)"
-#: disk-utils/cfdisk.c:1282
+#: disk-utils/cfdisk.c:1285
msgid "Partition name:"
msgstr "分区名:"
-#: disk-utils/cfdisk.c:1289
+#: disk-utils/cfdisk.c:1292
msgid "Partition UUID:"
msgstr "分区 UUID:"
-#: disk-utils/cfdisk.c:1301
+#: disk-utils/cfdisk.c:1304
msgid "Partition type:"
msgstr "分区类型:"
-#: disk-utils/cfdisk.c:1308
+#: disk-utils/cfdisk.c:1311
msgid "Attributes:"
msgstr "属性:"
-#: disk-utils/cfdisk.c:1332
+#: disk-utils/cfdisk.c:1335
msgid "Filesystem UUID:"
msgstr "文件系统 UUID:"
-#: disk-utils/cfdisk.c:1339
+#: disk-utils/cfdisk.c:1342
msgid "Filesystem LABEL:"
msgstr "文件系统标签:"
-#: disk-utils/cfdisk.c:1345
+#: disk-utils/cfdisk.c:1348
msgid "Filesystem:"
msgstr "文件系统:"
-#: disk-utils/cfdisk.c:1350
+#: disk-utils/cfdisk.c:1353
msgid "Mountpoint:"
msgstr "挂载点:"
-#: disk-utils/cfdisk.c:1693
+#: disk-utils/cfdisk.c:1696
#, c-format
msgid "Disk: %s"
msgstr "磁盘:%s"
-#: disk-utils/cfdisk.c:1695
+#: disk-utils/cfdisk.c:1698
#, c-format
msgid "Size: %s, %ju bytes, %ju sectors"
msgstr "尺寸:%s,%ju 字节,%ju 个扇区"
-#: disk-utils/cfdisk.c:1698
+#: disk-utils/cfdisk.c:1701
#, c-format
msgid "Label: %s, identifier: %s"
msgstr "标签:%s,标识符:%s"
-#: disk-utils/cfdisk.c:1701
+#: disk-utils/cfdisk.c:1704
#, c-format
msgid "Label: %s"
msgstr "标签:%s"
-#: disk-utils/cfdisk.c:1842
+#: disk-utils/cfdisk.c:1849
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:1848
+#: disk-utils/cfdisk.c:1855
msgid "Please, specify size."
msgstr "请指定文件大小。"
-#: disk-utils/cfdisk.c:1870
+#: disk-utils/cfdisk.c:1877
#, c-format
msgid "Minimum size is %ju bytes."
msgstr "最小尺寸为 %ju 字节。"
-#: disk-utils/cfdisk.c:1879
+#: disk-utils/cfdisk.c:1886
#, c-format
msgid "Maximum size is %ju bytes."
msgstr "最大尺寸为 %ju 字节。"
-#: disk-utils/cfdisk.c:1886
+#: disk-utils/cfdisk.c:1893
msgid "Failed to parse size."
msgstr "解析大小失败。"
-#: disk-utils/cfdisk.c:1944
+#: disk-utils/cfdisk.c:1951
msgid "Select partition type"
msgstr "选择分区类型"
-#: disk-utils/cfdisk.c:1990 disk-utils/cfdisk.c:2020
+#: disk-utils/cfdisk.c:1997 disk-utils/cfdisk.c:2027
msgid "Enter script file name: "
msgstr "输入脚本文件名:"
-#: disk-utils/cfdisk.c:1991
+#: disk-utils/cfdisk.c:1998
msgid "The script file will be applied to in-memory partition table."
msgstr "该脚本文件将应用于内存中的分区表。"
-#: disk-utils/cfdisk.c:2000 disk-utils/cfdisk.c:2042
-#: disk-utils/fdisk-menu.c:465 disk-utils/fdisk-menu.c:503
+#: disk-utils/cfdisk.c:2007 disk-utils/cfdisk.c:2049
+#: disk-utils/fdisk-menu.c:479 disk-utils/fdisk-menu.c:523
#, c-format
msgid "Cannot open %s"
msgstr "打不开 %s"
-#: disk-utils/cfdisk.c:2002 disk-utils/fdisk-menu.c:467
+#: disk-utils/cfdisk.c:2009 disk-utils/fdisk-menu.c:481
#, c-format
msgid "Failed to parse script file %s"
msgstr "解析脚本文件 %s 失败"
-#: disk-utils/cfdisk.c:2004 disk-utils/fdisk-menu.c:469
+#: disk-utils/cfdisk.c:2011 disk-utils/fdisk-menu.c:483
#, c-format
msgid "Failed to apply script %s"
msgstr "应用脚本文件 %s 失败"
-#: disk-utils/cfdisk.c:2021
+#: disk-utils/cfdisk.c:2028
msgid "The current in-memory partition table will be dumped to the file."
msgstr "当前的内存中分区表将转储到该文件中。"
-#: disk-utils/cfdisk.c:2029 disk-utils/fdisk-menu.c:491
+#: disk-utils/cfdisk.c:2036 disk-utils/fdisk-menu.c:511
msgid "Failed to allocate script handler"
msgstr "分配脚本处理程序失败"
-#: disk-utils/cfdisk.c:2035
+#: disk-utils/cfdisk.c:2042
msgid "Failed to read disk layout into script."
msgstr "将磁盘布局读入脚本出错。"
-#: disk-utils/cfdisk.c:2049
+#: disk-utils/cfdisk.c:2056
msgid "Disk layout successfully dumped."
msgstr "成功转储了磁盘布局。"
-#: disk-utils/cfdisk.c:2052 disk-utils/fdisk-menu.c:509
+#: disk-utils/cfdisk.c:2059 disk-utils/fdisk-menu.c:529
#, c-format
msgid "Failed to write script %s"
msgstr "写脚本文件 %s 失败"
-#: disk-utils/cfdisk.c:2088
+#: disk-utils/cfdisk.c:2095
msgid "Select label type"
msgstr "选择标签类型"
-#: disk-utils/cfdisk.c:2091 disk-utils/fdisk.c:1027
+#: disk-utils/cfdisk.c:2098 disk-utils/fdisk.c:1074 disk-utils/fdisk-menu.c:487
msgid "Device does not contain a recognized partition table."
msgstr "设备不包含可识别的分区表。"
-#: disk-utils/cfdisk.c:2099
+#: disk-utils/cfdisk.c:2106
msgid "Select a type to create a new label or press 'L' to load script file."
msgstr "选择一种类型来创建新标签,或按“L”加载脚本文件。"
# 以下三句连贯,一起翻译
-#: disk-utils/cfdisk.c:2144
+#: disk-utils/cfdisk.c:2151
msgid "This is cfdisk, a curses-based disk partitioning program."
msgstr "这是 cfdisk,一款基于 curses 的磁盘分区程序,"
-#: disk-utils/cfdisk.c:2145
+#: disk-utils/cfdisk.c:2152
msgid "It lets you create, delete, and modify partitions on a block device."
msgstr "可以创建、删除和修改块设备上的分区。"
# 以下两条注意对齐
-#: disk-utils/cfdisk.c:2147
+#: disk-utils/cfdisk.c:2154
msgid "Command Meaning"
msgstr "命令 意义"
-#: disk-utils/cfdisk.c:2148
+#: disk-utils/cfdisk.c:2155
msgid "------- -------"
msgstr "------- -------"
-#: disk-utils/cfdisk.c:2149
+#: disk-utils/cfdisk.c:2156
msgid " b Toggle bootable flag of the current partition"
msgstr " b 切换当前分区的 可启动 标志"
-#: disk-utils/cfdisk.c:2150
+#: disk-utils/cfdisk.c:2157
msgid " d Delete the current partition"
msgstr " d 删除当前分区"
-#: disk-utils/cfdisk.c:2151
+#: disk-utils/cfdisk.c:2158
msgid " h Print this screen"
msgstr " h 打印此屏幕"
-#: disk-utils/cfdisk.c:2152
+#: disk-utils/cfdisk.c:2159
msgid " n Create new partition from free space"
msgstr " n 从空闲空间创建新分区"
-#: disk-utils/cfdisk.c:2153
+#: disk-utils/cfdisk.c:2160
msgid " q Quit program without writing partition table"
msgstr " q 退出程序但不写入分区表"
-#: disk-utils/cfdisk.c:2154
+#: disk-utils/cfdisk.c:2161
msgid " s Fix partitions order (only when in disarray)"
msgstr " s 修复分区顺序(仅磁盘阵列)"
-#: disk-utils/cfdisk.c:2155
+#: disk-utils/cfdisk.c:2162
msgid " t Change the partition type"
msgstr " t 更改分区类型"
-#: disk-utils/cfdisk.c:2156
+#: disk-utils/cfdisk.c:2163
msgid " u Dump disk layout to sfdisk compatible script file"
msgstr " u 将磁盘布局转储到兼容 sfdisk 的脚本文件"
-#: disk-utils/cfdisk.c:2157
+#: disk-utils/cfdisk.c:2164
msgid " W Write partition table to disk (you must enter uppercase W);"
msgstr " W 将分区表写入磁盘(必须输入大写 W);"
-#: disk-utils/cfdisk.c:2158
+#: disk-utils/cfdisk.c:2165
msgid " since this might destroy data on the disk, you must either"
msgstr " 由于这可能破坏磁盘上的数据,您必须"
-#: disk-utils/cfdisk.c:2159
+#: disk-utils/cfdisk.c:2166
msgid " confirm or deny the write by entering 'yes' or 'no'"
msgstr " 通过输入“yes”或“no”来确认或拒绝"
-#: disk-utils/cfdisk.c:2160
+#: disk-utils/cfdisk.c:2167
msgid " x Display/hide extra information about a partition"
msgstr " x 显示/隐藏分区的额外信息"
-#: disk-utils/cfdisk.c:2161
+#: disk-utils/cfdisk.c:2168
msgid "Up Arrow Move cursor to the previous partition"
msgstr "上箭头 光标移到上一分区"
-#: disk-utils/cfdisk.c:2162
+#: disk-utils/cfdisk.c:2169
msgid "Down Arrow Move cursor to the next partition"
msgstr "下箭头 光标移到下一分区"
-#: disk-utils/cfdisk.c:2163
+#: disk-utils/cfdisk.c:2170
msgid "Left Arrow Move cursor to the previous menu item"
msgstr "上箭头 光标移到上一菜单项"
-#: disk-utils/cfdisk.c:2164
+#: disk-utils/cfdisk.c:2171
msgid "Right Arrow Move cursor to the next menu item"
msgstr "下箭头 光标移到下一菜单项"
-#: disk-utils/cfdisk.c:2166
+#: disk-utils/cfdisk.c:2173
msgid "Note: All of the commands can be entered with either upper or lower"
msgstr "注:所有命令均可以大写或小写"
-#: disk-utils/cfdisk.c:2167
+#: disk-utils/cfdisk.c:2174
msgid "case letters (except for Write)."
msgstr "字母输入(除了 写入)。"
-#: disk-utils/cfdisk.c:2169
+#: disk-utils/cfdisk.c:2176
msgid "Use lsblk(8) or partx(8) to see more details about the device."
msgstr "使用 lsblk(8) 或 partx(8) 了解有关磁盘的更多细节。"
-#: disk-utils/cfdisk.c:2179 disk-utils/cfdisk.c:2438
+#: disk-utils/cfdisk.c:2186 disk-utils/cfdisk.c:2486
msgid "Press a key to continue."
msgstr "按下一个键继续。"
-#: disk-utils/cfdisk.c:2261
+#: disk-utils/cfdisk.c:2269
msgid "Could not toggle the flag."
msgstr "无法切换标志。"
-#: disk-utils/cfdisk.c:2271
+#: disk-utils/cfdisk.c:2279
#, c-format
msgid "Could not delete partition %zu."
msgstr "无法删除分区 %zu。"
-#: disk-utils/cfdisk.c:2273 disk-utils/fdisk-menu.c:633
+#: disk-utils/cfdisk.c:2281 disk-utils/fdisk-menu.c:657
#, c-format
msgid "Partition %zu has been deleted."
msgstr "分区 %zu 已删除。"
-#: disk-utils/cfdisk.c:2294
+#: disk-utils/cfdisk.c:2302
msgid "Partition size: "
msgstr "分区大小:"
-#: disk-utils/cfdisk.c:2335
+#: disk-utils/cfdisk.c:2343
#, c-format
msgid "Changed type of partition %zu."
msgstr "已更改分区 %zu 的类型。"
-#: disk-utils/cfdisk.c:2337
+#: disk-utils/cfdisk.c:2345
#, c-format
msgid "The type of partition %zu is unchanged."
msgstr "分区 %zu 的类型未更改。"
-#: disk-utils/cfdisk.c:2354 disk-utils/cfdisk.c:2467 disk-utils/fdisk.c:1016
-#: disk-utils/fdisk-menu.c:570
+#: disk-utils/cfdisk.c:2366
+#, fuzzy
+msgid "New size: "
+msgstr "新 shell"
+
+#: disk-utils/cfdisk.c:2381
+#, fuzzy, c-format
+msgid "Partition %zu resized."
+msgstr "%s:已调整分区 #%d 的大小\n"
+
+#: disk-utils/cfdisk.c:2399 disk-utils/cfdisk.c:2515 disk-utils/fdisk.c:1063
+#: disk-utils/fdisk-menu.c:590
msgid "Device is open in read-only mode."
msgstr "设备以只读方式打开。"
-#: disk-utils/cfdisk.c:2359
+#: disk-utils/cfdisk.c:2404
msgid "Are you sure you want to write the partition table to disk? "
msgstr "您确定想将分区表写入磁盘吗?"
-#: disk-utils/cfdisk.c:2361
+#: disk-utils/cfdisk.c:2406
msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog."
msgstr "输入“yes”或“no”或按 ESC 取消对话框。"
-#: disk-utils/cfdisk.c:2366 login-utils/lslogins.c:209 sys-utils/lscpu.c:1589
-#: sys-utils/lscpu.c:1599 sys-utils/lsmem.c:200
+#: disk-utils/cfdisk.c:2411 login-utils/lslogins.c:209 sys-utils/lscpu.c:1588
+#: sys-utils/lscpu.c:1598 sys-utils/lsmem.c:200
msgid "yes"
msgstr "是"
-#: disk-utils/cfdisk.c:2367
+#: disk-utils/cfdisk.c:2412
msgid "Did not write partition table to disk."
msgstr "未将分区表写入磁盘。"
-#: disk-utils/cfdisk.c:2372
+#: disk-utils/cfdisk.c:2417
msgid "Failed to write disklabel."
msgstr "写磁盘标签失败。"
-#: disk-utils/cfdisk.c:2375 disk-utils/fdisk-menu.c:578
+#: disk-utils/cfdisk.c:2423 disk-utils/fdisk-menu.c:598
msgid "The partition table has been altered."
msgstr "分区表已调整。"
-#: disk-utils/cfdisk.c:2398 disk-utils/cfdisk.c:2469
+#: disk-utils/cfdisk.c:2446 disk-utils/cfdisk.c:2517
msgid "Note that partition table entries are not in disk order now."
msgstr "注意,现在分区表记录没有按磁盘顺序。"
-#: disk-utils/cfdisk.c:2435
+#: disk-utils/cfdisk.c:2483
#, c-format
msgid "Device already contains a %s signature; it will be removed by a write command."
msgstr "设备已包含一个 %s 签名;写入命令会将其移除。"
-#: disk-utils/cfdisk.c:2446
+#: disk-utils/cfdisk.c:2494
msgid "failed to create a new disklabel"
msgstr "创建新磁盘标签失败"
-#: disk-utils/cfdisk.c:2454
+#: disk-utils/cfdisk.c:2502
msgid "failed to read partitions"
msgstr "读分区失败"
-#: disk-utils/cfdisk.c:2549
+#: disk-utils/cfdisk.c:2598
#, c-format
msgid " %1$s [options] <disk>\n"
msgstr " %1$s [选项] <磁盘>\n"
-#: disk-utils/cfdisk.c:2552 disk-utils/fdisk.c:762 disk-utils/sfdisk.c:1851
+#: disk-utils/cfdisk.c:2601 disk-utils/fdisk.c:808 disk-utils/sfdisk.c:1826
msgid "Display or manipulate a disk partition table.\n"
msgstr "显示或操作磁盘分区表。\n"
-#: disk-utils/cfdisk.c:2555
+#: disk-utils/cfdisk.c:2604
msgid " -L, --color[=<when>] colorize output (auto, always or never)\n"
msgstr " -L, --color[=<何时>] 彩色输出(auto自动,always总是或never从不)\n"
-#: disk-utils/cfdisk.c:2558
+#: disk-utils/cfdisk.c:2607
msgid " -z, --zero start with zeroed partition table\n"
msgstr " -z, --zero 以空分区表开始\n"
-#: disk-utils/cfdisk.c:2597 disk-utils/fdisk.c:907 disk-utils/sfdisk.c:2128
-#: misc-utils/cal.c:391 sys-utils/dmesg.c:1332 text-utils/hexdump.c:114
+#: disk-utils/cfdisk.c:2645 disk-utils/fdisk.c:950 disk-utils/sfdisk.c:2103
+#: misc-utils/cal.c:391 sys-utils/dmesg.c:1435 text-utils/hexdump.c:114
msgid "unsupported color mode"
msgstr "不支持的颜色模式"
-#: disk-utils/cfdisk.c:2617 disk-utils/fdisk.c:843 disk-utils/sfdisk.c:225
+#: disk-utils/cfdisk.c:2665 disk-utils/fdisk.c:888 disk-utils/sfdisk.c:224
msgid "failed to allocate libfdisk context"
msgstr "分配 libfdisk 环境(context)失败"
-#: disk-utils/delpart.c:14
+#: disk-utils/delpart.c:15
#, c-format
msgid " %s <disk device> <partition number>\n"
msgstr " %s <磁盘设备> <分区号>\n"
-#: disk-utils/delpart.c:18
+#: disk-utils/delpart.c:19
msgid "Tell the kernel to forget about a specified partition.\n"
msgstr "通知内核忘记某个特定的分区。\n"
-#: disk-utils/delpart.c:61
+#: disk-utils/delpart.c:63
msgid "failed to remove partition"
msgstr "移除分区失败"
@@ -695,26 +748,26 @@ msgstr ""
"磁道/磁头 %u/%u 有坏数据\n"
"将继续 ... "
-#: disk-utils/fdformat.c:144 disk-utils/fsck.minix.c:182
-#: disk-utils/swaplabel.c:117 misc-utils/wipefs.c:458 sys-utils/blkdiscard.c:84
-#: sys-utils/tunelp.c:91
+#: disk-utils/fdformat.c:145 disk-utils/fsck.minix.c:183
+#: disk-utils/swaplabel.c:123 misc-utils/wipefs.c:602 sys-utils/blkdiscard.c:85
+#: sys-utils/tunelp.c:95
#, c-format
msgid " %s [options] <device>\n"
msgstr " %s [选项] <设备>\n"
-#: disk-utils/fdformat.c:148
+#: disk-utils/fdformat.c:149
msgid "Do a low-level formatting of a floppy disk.\n"
msgstr "对软盘进行低级格式化。\n"
-#: disk-utils/fdformat.c:151
+#: disk-utils/fdformat.c:152
msgid " -f, --from <N> start at the track N (default 0)\n"
msgstr " -f, --from <N> 从磁道 N 开始(默认 0)\n"
-#: disk-utils/fdformat.c:152
+#: disk-utils/fdformat.c:153
msgid " -t, --to <N> stop at the track N\n"
msgstr " -t, --to <N> 在磁道 N 停止\n"
-#: disk-utils/fdformat.c:153
+#: disk-utils/fdformat.c:154
msgid ""
" -r, --repair <N> try to repair tracks failed during\n"
" the verification (max N retries)\n"
@@ -722,7 +775,7 @@ msgstr ""
" -r, --repair <N> 尝试修复在验证时失败的磁道\n"
" (最多尝试 N 次)\n"
-#: disk-utils/fdformat.c:155
+#: disk-utils/fdformat.c:156
msgid " -n, --no-verify disable the verification after the format\n"
msgstr " -n, --no-verify 禁止格式化后的验证\n"
@@ -738,159 +791,150 @@ msgstr "无效参数 - to"
msgid "invalid argument - repair"
msgstr "无效参数 - repair"
-#: disk-utils/fdformat.c:221 disk-utils/fsck.cramfs.c:151
-#: disk-utils/mkfs.bfs.c:185 disk-utils/mkfs.cramfs.c:338
-#: disk-utils/mkfs.cramfs.c:748 disk-utils/mkfs.cramfs.c:785
-#: disk-utils/mkfs.minix.c:816 disk-utils/mkswap.c:241 disk-utils/partx.c:952
-#: login-utils/last.c:684 login-utils/utmpdump.c:139 misc-utils/namei.c:135
+#: disk-utils/fdformat.c:223 disk-utils/fsck.cramfs.c:148
+#: disk-utils/mkfs.bfs.c:188 disk-utils/mkfs.cramfs.c:336
+#: disk-utils/mkfs.cramfs.c:757 disk-utils/mkfs.cramfs.c:796
+#: disk-utils/mkfs.minix.c:821 disk-utils/mkswap.c:243 disk-utils/partx.c:951
+#: login-utils/last.c:688 login-utils/utmpdump.c:139 misc-utils/namei.c:135
#: misc-utils/rename.c:63 sys-utils/blkdiscard.c:185 sys-utils/blkzone.c:99
-#: sys-utils/dmesg.c:523 sys-utils/fallocate.c:216 sys-utils/fsfreeze.c:120
-#: sys-utils/fstrim.c:77 sys-utils/nsenter.c:165 sys-utils/nsenter.c:169
-#: sys-utils/swapon.c:520 sys-utils/switch_root.c:94
-#: sys-utils/switch_root.c:137 term-utils/mesg.c:129 text-utils/more.c:510
+#: sys-utils/dmesg.c:534 sys-utils/fallocate.c:216 sys-utils/fsfreeze.c:120
+#: sys-utils/fstrim.c:77 sys-utils/nsenter.c:164 sys-utils/nsenter.c:168
+#: sys-utils/swapon.c:524 sys-utils/switch_root.c:94
+#: sys-utils/switch_root.c:137 term-utils/mesg.c:129 text-utils/more.c:525
#, c-format
msgid "stat of %s failed"
msgstr "对 %s stat 失败"
-#: disk-utils/fdformat.c:224 disk-utils/partx.c:1010 misc-utils/lsblk.c:1499
+#: disk-utils/fdformat.c:226 disk-utils/partx.c:1010 misc-utils/lsblk.c:1499
#: sys-utils/blkdiscard.c:187 sys-utils/blkzone.c:101
#: sys-utils/mountpoint.c:107
#, c-format
msgid "%s: not a block device"
msgstr "%s:不是一个块设备"
-#: disk-utils/fdformat.c:229
+#: disk-utils/fdformat.c:231
msgid "could not determine current format type"
msgstr "不能确定当前格式类型"
-#: disk-utils/fdformat.c:231
+#: disk-utils/fdformat.c:233
#, 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:232
+#: disk-utils/fdformat.c:234
msgid "Double"
msgstr "双面"
-#: disk-utils/fdformat.c:232
+#: disk-utils/fdformat.c:234
msgid "Single"
msgstr "单面"
-#: disk-utils/fdformat.c:239
+#: disk-utils/fdformat.c:241
msgid "user defined start track exceeds the medium specific maximum"
msgstr "用户定义的起始磁道超出了媒体的最大指定值"
-#: disk-utils/fdformat.c:241
+#: disk-utils/fdformat.c:243
msgid "user defined end track exceeds the medium specific maximum"
msgstr "用户定义的结束磁道超出了媒体的最大指定值"
-#: disk-utils/fdformat.c:243
+#: disk-utils/fdformat.c:245
msgid "user defined start track exceeds the user defined end track"
msgstr "用户定义的起始磁道超过了定义的终止磁道"
-#: disk-utils/fdformat.c:251 misc-utils/logger.c:987
+#: disk-utils/fdformat.c:253 misc-utils/logger.c:989
msgid "close failed"
msgstr "关闭失败"
-#: disk-utils/fdisk.c:97 disk-utils/fdisk.c:113
-#, c-format
-msgid ""
-"\n"
-"Do you really want to quit? "
-msgstr ""
-"\n"
-"您确实要退出吗?"
-
-#: disk-utils/fdisk.c:160
+#: disk-utils/fdisk.c:204
#, c-format
msgid "Select (default %c): "
msgstr "选择 (默认 %c):"
-#: disk-utils/fdisk.c:165
+#: disk-utils/fdisk.c:209
#, c-format
msgid "Using default response %c."
msgstr "将使用默认回应 %c。"
-#: disk-utils/fdisk.c:178 disk-utils/fdisk.c:252 disk-utils/fdisk.c:327
-#: libfdisk/src/dos.c:1223 libfdisk/src/gpt.c:2359
+#: disk-utils/fdisk.c:222 disk-utils/fdisk.c:296 disk-utils/fdisk.c:371
+#: libfdisk/src/dos.c:1241 libfdisk/src/gpt.c:2380
msgid "Value out of range."
msgstr "值超出范围。"
-#: disk-utils/fdisk.c:207
+#: disk-utils/fdisk.c:251
#, c-format
msgid "%s (%s, default %c): "
msgstr "%s (%s,默认 %c):"
-#: disk-utils/fdisk.c:210 disk-utils/fdisk.c:277
+#: disk-utils/fdisk.c:254 disk-utils/fdisk.c:321
#, c-format
msgid "%s (%s, default %<PRIu64>): "
msgstr "%s (%s, 默认 %<PRIu64>): "
-#: disk-utils/fdisk.c:215
+#: disk-utils/fdisk.c:259
#, c-format
msgid "%s (%c-%c, default %c): "
msgstr "%s (%c-%c,默认为 %c):"
-#: disk-utils/fdisk.c:219 disk-utils/fdisk.c:281
+#: disk-utils/fdisk.c:263 disk-utils/fdisk.c:325
#, c-format
msgid "%s (%<PRIu64>-%<PRIu64>, default %<PRIu64>): "
msgstr "%s (%<PRIu64>-%<PRIu64>, 默认 %<PRIu64>): "
-#: disk-utils/fdisk.c:222
+#: disk-utils/fdisk.c:266
#, c-format
msgid "%s (%c-%c): "
msgstr "%s (%c-%c):"
-#: disk-utils/fdisk.c:225 disk-utils/fdisk.c:284
+#: disk-utils/fdisk.c:269 disk-utils/fdisk.c:328
#, c-format
msgid "%s (%<PRIu64>-%<PRIu64>): "
msgstr "%s (%<PRIu64>-%<PRIu64>): "
-#: disk-utils/fdisk.c:394 disk-utils/sfdisk.c:199
+#: disk-utils/fdisk.c:438 disk-utils/sfdisk.c:198
msgid " [Y]es/[N]o: "
msgstr "是[Y]/否[N]:"
-#: disk-utils/fdisk.c:435
+#: disk-utils/fdisk.c:479
msgid "Hex code (type L to list all codes): "
msgstr "Hex 代码(输入 L 列出所有代码):"
-#: disk-utils/fdisk.c:436
+#: disk-utils/fdisk.c:480
msgid "Partition type (type L to list all types): "
msgstr "分区类型(输入 L 列出所有类型):"
-#: disk-utils/fdisk.c:538
+#: disk-utils/fdisk.c:582
msgid "DOS Compatibility flag is set (DEPRECATED!)"
msgstr "已设置 DOS 兼容性标志(已废弃!)"
-#: disk-utils/fdisk.c:539
+#: disk-utils/fdisk.c:583
msgid "DOS Compatibility flag is not set"
msgstr "DOS 兼容性标志未设置"
-#: disk-utils/fdisk.c:560 disk-utils/fdisk.c:596
+#: disk-utils/fdisk.c:604 disk-utils/fdisk.c:640
#, c-format
msgid "Partition %zu does not exist yet!"
msgstr "分区 %zu 还不存在!"
-#: disk-utils/fdisk.c:565 disk-utils/fdisk.c:574 libfdisk/src/ask.c:995
+#: disk-utils/fdisk.c:609 disk-utils/fdisk.c:618 libfdisk/src/ask.c:1003
msgid "Unknown"
msgstr "未知"
-#: disk-utils/fdisk.c:573
+#: disk-utils/fdisk.c:617
#, c-format
msgid "Changed type of partition '%s' to '%s'."
msgstr "已将分区“%s”的类型更改为“%s”。"
-#: disk-utils/fdisk.c:577
+#: disk-utils/fdisk.c:621
#, c-format
msgid "Type of partition %zu is unchanged: %s."
msgstr "分区 %zu 的类型未更改:%s。"
-#: disk-utils/fdisk.c:616
+#: disk-utils/fdisk.c:660
#, c-format
msgid "%15s: %s"
msgstr "%15s: %s"
-#: disk-utils/fdisk.c:673
+#: disk-utils/fdisk.c:717
#, c-format
msgid ""
"\n"
@@ -899,35 +943,35 @@ msgstr ""
"\n"
"%s: 偏移 = %<PRIu64>, 大小 = %zu 字节。"
-#: disk-utils/fdisk.c:679
+#: disk-utils/fdisk.c:723
msgid "cannot seek"
msgstr "无法定位"
-#: disk-utils/fdisk.c:684
+#: disk-utils/fdisk.c:728
msgid "cannot read"
msgstr "不能读"
-#: disk-utils/fdisk.c:697 libfdisk/src/bsd.c:258 libfdisk/src/dos.c:964
-#: libfdisk/src/gpt.c:2292
+#: disk-utils/fdisk.c:741 libfdisk/src/bsd.c:258 libfdisk/src/dos.c:982
+#: libfdisk/src/gpt.c:2309
msgid "First sector"
msgstr "第一个扇区"
-#: disk-utils/fdisk.c:724
+#: disk-utils/fdisk.c:768
#, c-format
msgid "BLKGETSIZE ioctl failed on %s"
msgstr "对 %s 进行 BLKGETSIZE ioctl 失败"
-#: disk-utils/fdisk.c:742 disk-utils/sfdisk.c:1483
+#: disk-utils/fdisk.c:786 disk-utils/sfdisk.c:1457
#, fuzzy, c-format
msgid "The old %s signature will be removed by a write command."
msgstr "写入命令将移除该签名。"
-#: disk-utils/fdisk.c:746
+#: disk-utils/fdisk.c:790
#, 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:757
+#: disk-utils/fdisk.c:803
#, c-format
msgid ""
" %1$s [options] <disk> change partition table\n"
@@ -936,111 +980,134 @@ msgstr ""
" %1$s [选项] <磁盘> 更改分区表\n"
" %1$s [选项] -l [<磁盘>] 列出分区表\n"
-#: disk-utils/fdisk.c:765
+#: disk-utils/fdisk.c:811
msgid " -b, --sector-size <size> physical and logical sector size\n"
msgstr " -b, --sectors-size <大小> 显示扇区计数和大小\n"
-#: disk-utils/fdisk.c:766
+#: disk-utils/fdisk.c:812
msgid " -B, --protect-boot don't erase bootbits when creating a new label\n"
msgstr " -B, --protect-boot 创建新标签时不要擦除 bootbits \n"
-#: disk-utils/fdisk.c:767
+#: disk-utils/fdisk.c:813
msgid " -c, --compatibility[=<mode>] mode is 'dos' or 'nondos' (default)\n"
msgstr " -c, --compatibility[=<模式>] 模式,为“dos”或“nondos”(默认)\n"
-#: disk-utils/fdisk.c:768
+#: disk-utils/fdisk.c:814
msgid " -L, --color[=<when>] colorize output (auto, always or never)\n"
msgstr " -L, --color[=<时机>] 彩色输出(auto, always 或 never)\n"
-#: disk-utils/fdisk.c:771
+#: disk-utils/fdisk.c:817
msgid " -l, --list display partitions and exit\n"
msgstr " -l, --list 显示分区并退出\n"
-#: disk-utils/fdisk.c:772
+#: disk-utils/fdisk.c:818
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: disk-utils/fdisk.c:773
+#: disk-utils/fdisk.c:819
msgid " -t, --type <type> recognize specified partition table type only\n"
msgstr " -t, --type <类型> 只识别指定的分区表类型\n"
-#: disk-utils/fdisk.c:774
+#: disk-utils/fdisk.c:820
msgid " -u, --units[=<unit>] display units: 'cylinders' or 'sectors' (default)\n"
msgstr " -u, --units[=<单位>] 显示单位,“cylinders”柱面或“sectors”扇区(默认)\n"
-#: disk-utils/fdisk.c:775
+#: disk-utils/fdisk.c:821
msgid " -s, --getsz display device size in 512-byte sectors [DEPRECATED]\n"
msgstr " -s, --getsz 以 512-字节扇区显示设备大小[已废弃]\n"
-#: disk-utils/fdisk.c:776
+#: disk-utils/fdisk.c:822
msgid " --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
-#: disk-utils/fdisk.c:777
+#: disk-utils/fdisk.c:823
msgid " -w, --wipe <mode> wipe signatures (auto, always or never)\n"
msgstr " -w, --wipe <模式> 擦除签名(auto, always 或 never)\n"
-#: disk-utils/fdisk.c:778 disk-utils/sfdisk.c:1894
+#: disk-utils/fdisk.c:824 disk-utils/sfdisk.c:1869
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:781
+#: disk-utils/fdisk.c:827
msgid " -C, --cylinders <number> specify the number of cylinders\n"
msgstr " -C, --cylinders <数字> 指定柱面数\n"
-#: disk-utils/fdisk.c:782
+#: disk-utils/fdisk.c:828
msgid " -H, --heads <number> specify the number of heads\n"
msgstr " -H, --heads <数字> 指定磁头数\n"
-#: disk-utils/fdisk.c:783
+#: disk-utils/fdisk.c:829
msgid " -S, --sectors <number> specify the number of sectors per track\n"
msgstr " -S, --sectors <数字> 指定每条磁道的扇区数\n"
-#: disk-utils/fdisk.c:853 disk-utils/partx.c:874
+#: disk-utils/fdisk.c:898 disk-utils/fdisk.c:900 disk-utils/partx.c:873
msgid "invalid sector size argument"
msgstr "无效的 扇区大小 参数"
-#: disk-utils/fdisk.c:865
+#: disk-utils/fdisk.c:910
msgid "invalid cylinders argument"
msgstr "无效的 柱面数 参数"
-#: disk-utils/fdisk.c:877
+#: disk-utils/fdisk.c:922
msgid "not found DOS label driver"
msgstr "未找到 DOS 标签驱动"
-#: disk-utils/fdisk.c:883
+#: disk-utils/fdisk.c:928
#, c-format
msgid "unknown compatibility mode '%s'"
msgstr "未知兼容模式“%s”"
-#: disk-utils/fdisk.c:892
+#: disk-utils/fdisk.c:935
msgid "invalid heads argument"
msgstr "无效的 磁头数 参数"
-#: disk-utils/fdisk.c:898
+#: disk-utils/fdisk.c:941
msgid "invalid sectors argument"
msgstr "无效的 扇区数 参数"
-#: disk-utils/fdisk.c:924
+#: disk-utils/fdisk.c:967
#, c-format
msgid "unsupported disklabel: %s"
msgstr "不支持的磁盘标签:%s"
-#: disk-utils/fdisk.c:941 disk-utils/fdisk.c:946 disk-utils/sfdisk.c:2092
-#: disk-utils/sfdisk.c:2097
+#: disk-utils/fdisk.c:975
+#, fuzzy
+msgid "unsupported unit"
+msgstr "不支持的单位“%c”"
+
+#: disk-utils/fdisk.c:984 disk-utils/fdisk.c:989 disk-utils/sfdisk.c:2067
+#: disk-utils/sfdisk.c:2072
msgid "unsupported wipe mode"
msgstr "不支持的擦除模式"
-#: disk-utils/fdisk.c:959
+#: disk-utils/fdisk.c:1002
msgid "The device properties (sector size and geometry) should be used with one specified device only."
msgstr "设备属性(扇区大小和几何属性)只能用于某个指定的设备。"
-#: disk-utils/fdisk.c:1007
+#: disk-utils/fdisk.c:1033 disk-utils/fdisk.c:1048 disk-utils/fsck.cramfs.c:690
+#: disk-utils/mkfs.bfs.c:198 disk-utils/mkfs.cramfs.c:786
+#: disk-utils/partx.c:967 disk-utils/raw.c:137 disk-utils/raw.c:150
+#: disk-utils/raw.c:162 disk-utils/raw.c:203 misc-utils/cal.c:473
+#: misc-utils/findfs.c:59 misc-utils/look.c:150 misc-utils/whereis.c:570
+#: misc-utils/whereis.c:581 misc-utils/whereis.c:592 misc-utils/whereis.c:634
+#: schedutils/chrt.c:504 schedutils/ionice.c:262 schedutils/taskset.c:189
+#: sys-utils/chcpu.c:344 sys-utils/chmem.c:317 sys-utils/dmesg.c:1491
+#: sys-utils/ipcmk.c:135 sys-utils/ldattach.c:321 sys-utils/losetup.c:863
+#: sys-utils/lscpu.c:2177 sys-utils/lsmem.c:499 sys-utils/mount.c:698
+#: sys-utils/mount.c:711 sys-utils/mount.c:780 sys-utils/mountpoint.c:181
+#: sys-utils/pivot_root.c:72 sys-utils/swapoff.c:231 sys-utils/swapon.c:989
+#: sys-utils/switch_root.c:250 sys-utils/umount.c:528 term-utils/setterm.c:1176
+#: text-utils/col.c:233 text-utils/more.c:337
+#, fuzzy
+msgid "bad usage"
+msgstr "错误值"
+
+#: disk-utils/fdisk.c:1054
#, c-format
msgid "Welcome to fdisk (%s)."
msgstr "欢迎使用 fdisk (%s)。"
-#: disk-utils/fdisk.c:1009 disk-utils/sfdisk.c:1625
+#: disk-utils/fdisk.c:1056 disk-utils/sfdisk.c:1599
msgid ""
"Changes will remain in memory only, until you decide to write them.\n"
"Be careful before using the write command.\n"
@@ -1048,7 +1115,7 @@ msgstr ""
"更改将停留在内存中,直到您决定将更改写入磁盘。\n"
"使用写入命令前请三思。\n"
-#: disk-utils/fdisk.c:1032
+#: disk-utils/fdisk.c:1079
msgid "A hybrid GPT was detected. You have to sync the hybrid MBR manually (expert command 'M')."
msgstr "检测到混合 GPT。您需要手动同步混合 MBR (用专家命令“M”)"
@@ -1093,37 +1160,40 @@ msgid "Alignment offset: %lu bytes"
msgstr "对齐偏移量:%lu 字节"
#: disk-utils/fdisk-list.c:116 disk-utils/fdisk-list.c:236
-#: disk-utils/fsck.c:1244
+#: disk-utils/fsck.c:1242
msgid "failed to allocate iterator"
msgstr "分配迭代器失败"
#: disk-utils/fdisk-list.c:122 disk-utils/fdisk-list.c:242
-#: disk-utils/partx.c:667 login-utils/lslogins.c:918 misc-utils/fincore.c:362
-#: misc-utils/findmnt.c:1598 misc-utils/lsblk.c:1897 misc-utils/lslocks.c:449
-#: sys-utils/losetup.c:314 sys-utils/lscpu.c:1762 sys-utils/lscpu.c:1865
-#: sys-utils/lsipc.c:338 sys-utils/prlimit.c:297 sys-utils/swapon.c:281
-#: sys-utils/wdctl.c:261 sys-utils/zramctl.c:488 text-utils/column.c:196
+#: disk-utils/partx.c:667 login-utils/lslogins.c:917 misc-utils/fincore.c:362
+#: misc-utils/findmnt.c:1596 misc-utils/lsblk.c:1906 misc-utils/lslocks.c:449
+#: misc-utils/uuidparse.c:258 misc-utils/wipefs.c:151 sys-utils/losetup.c:314
+#: sys-utils/lscpu.c:1761 sys-utils/lscpu.c:1864 sys-utils/lsipc.c:338
+#: sys-utils/prlimit.c:297 sys-utils/rfkill.c:320 sys-utils/swapon.c:285
+#: sys-utils/wdctl.c:260 sys-utils/zramctl.c:488 text-utils/column.c:205
msgid "failed to allocate output table"
msgstr "分配输出表失败"
#: disk-utils/fdisk-list.c:163 disk-utils/fdisk-list.c:266
-#: disk-utils/partx.c:581 login-utils/lslogins.c:976 misc-utils/fincore.c:123
+#: disk-utils/partx.c:581 login-utils/lslogins.c:975 misc-utils/fincore.c:123
#: misc-utils/findmnt.c:688 misc-utils/findmnt.c:706 misc-utils/lsblk.c:1174
-#: misc-utils/lslocks.c:391 sys-utils/losetup.c:333 sys-utils/losetup.c:362
-#: sys-utils/lscpu.c:1788 sys-utils/lscpu.c:1816 sys-utils/lsipc.c:470
-#: sys-utils/lsipc.c:545 sys-utils/lsipc.c:647 sys-utils/lsipc.c:739
-#: sys-utils/lsipc.c:900 sys-utils/prlimit.c:229 sys-utils/swapon.c:176
-#: sys-utils/wdctl.c:215 sys-utils/zramctl.c:409 text-utils/column.c:407
+#: misc-utils/lslocks.c:391 misc-utils/uuidparse.c:154 misc-utils/wipefs.c:210
+#: sys-utils/losetup.c:333 sys-utils/losetup.c:362 sys-utils/lscpu.c:1787
+#: sys-utils/lscpu.c:1815 sys-utils/lsipc.c:470 sys-utils/lsipc.c:545
+#: sys-utils/lsipc.c:647 sys-utils/lsipc.c:739 sys-utils/lsipc.c:900
+#: sys-utils/prlimit.c:229 sys-utils/rfkill.c:283 sys-utils/swapon.c:180
+#: sys-utils/wdctl.c:214 sys-utils/zramctl.c:409 text-utils/column.c:420
msgid "failed to allocate output line"
msgstr "分配输出行失败"
#: disk-utils/fdisk-list.c:173 disk-utils/fdisk-list.c:273
-#: disk-utils/partx.c:644 login-utils/lslogins.c:1074 misc-utils/fincore.c:159
+#: disk-utils/partx.c:644 login-utils/lslogins.c:1073 misc-utils/fincore.c:159
#: misc-utils/findmnt.c:692 misc-utils/findmnt.c:711 misc-utils/lsblk.c:1165
-#: misc-utils/lslocks.c:436 sys-utils/losetup.c:294 sys-utils/lscpu.c:1796
-#: sys-utils/lscpu.c:1827 sys-utils/lsipc.c:504 sys-utils/lsipc.c:629
-#: sys-utils/prlimit.c:261 sys-utils/swapon.c:224 sys-utils/wdctl.c:243
-#: sys-utils/zramctl.c:475 text-utils/column.c:413
+#: misc-utils/lslocks.c:436 misc-utils/uuidparse.c:245 misc-utils/wipefs.c:250
+#: sys-utils/losetup.c:294 sys-utils/lscpu.c:1795 sys-utils/lscpu.c:1826
+#: sys-utils/lsipc.c:504 sys-utils/lsipc.c:629 sys-utils/prlimit.c:261
+#: sys-utils/rfkill.c:308 sys-utils/swapon.c:228 sys-utils/wdctl.c:242
+#: sys-utils/zramctl.c:475 text-utils/column.c:426
#, fuzzy
msgid "failed to add output data"
msgstr "向输出表添加数据出错"
@@ -1142,23 +1212,23 @@ msgstr ""
msgid "Partition table entries are not in disk order."
msgstr "分区表记录没有按磁盘顺序。"
-#: disk-utils/fdisk-list.c:228 libfdisk/src/bsd.c:1017 libfdisk/src/dos.c:2390
-#: libfdisk/src/gpt.c:3013 libfdisk/src/sgi.c:1153 libfdisk/src/sun.c:1113
+#: disk-utils/fdisk-list.c:228 libfdisk/src/bsd.c:1017 libfdisk/src/dos.c:2425
+#: libfdisk/src/gpt.c:3039 libfdisk/src/sgi.c:1153 libfdisk/src/sun.c:1094
msgid "Start"
msgstr "起点"
-#: disk-utils/fdisk-list.c:228 libfdisk/src/bsd.c:1018 libfdisk/src/dos.c:2391
-#: libfdisk/src/gpt.c:3014 libfdisk/src/sgi.c:1154 libfdisk/src/sun.c:1114
+#: disk-utils/fdisk-list.c:228 libfdisk/src/bsd.c:1018 libfdisk/src/dos.c:2426
+#: libfdisk/src/gpt.c:3040 libfdisk/src/sgi.c:1154 libfdisk/src/sun.c:1095
msgid "End"
msgstr "末尾"
-#: disk-utils/fdisk-list.c:228 libfdisk/src/bsd.c:1019 libfdisk/src/dos.c:2392
-#: libfdisk/src/gpt.c:3015 libfdisk/src/sgi.c:1155 libfdisk/src/sun.c:1115
+#: disk-utils/fdisk-list.c:228 libfdisk/src/bsd.c:1019 libfdisk/src/dos.c:2427
+#: libfdisk/src/gpt.c:3041 libfdisk/src/sgi.c:1155 libfdisk/src/sun.c:1096
msgid "Sectors"
msgstr "扇区"
-#: disk-utils/fdisk-list.c:228 libfdisk/src/bsd.c:1021 libfdisk/src/dos.c:2394
-#: libfdisk/src/gpt.c:3016 libfdisk/src/sgi.c:1157 libfdisk/src/sun.c:1117
+#: disk-utils/fdisk-list.c:228 libfdisk/src/bsd.c:1021 libfdisk/src/dos.c:2429
+#: libfdisk/src/gpt.c:3042 libfdisk/src/sgi.c:1157 libfdisk/src/sun.c:1098
msgid "Size"
msgstr "大小"
@@ -1167,301 +1237,292 @@ msgstr "大小"
msgid "Unpartitioned space %s: %s, %ju bytes, %ju sectors"
msgstr "未分区的空间 %s:%s,%ju 个字节,%ju 个扇区"
-#: disk-utils/fdisk-list.c:432
-#, c-format
-msgid ""
-"\n"
-"Available columns (for -o):\n"
-msgstr ""
-"\n"
-"可用列(用于 -o):\n"
-
#: disk-utils/fdisk-list.c:473
#, c-format
msgid "%s unknown column: %s"
msgstr "%s 未知列: %s"
-#: disk-utils/fdisk-menu.c:95
+#: disk-utils/fdisk-menu.c:96
msgid "Generic"
msgstr "常规"
-#: disk-utils/fdisk-menu.c:96
+#: disk-utils/fdisk-menu.c:97
msgid "delete a partition"
msgstr "删除分区"
-#: disk-utils/fdisk-menu.c:97
+#: disk-utils/fdisk-menu.c:98
msgid "list free unpartitioned space"
msgstr "列出未分区的空闲区"
-#: disk-utils/fdisk-menu.c:98
+#: disk-utils/fdisk-menu.c:99
msgid "list known partition types"
msgstr "列出已知分区类型"
-#: disk-utils/fdisk-menu.c:99
+#: disk-utils/fdisk-menu.c:100
msgid "add a new partition"
msgstr "添加新分区"
-#: disk-utils/fdisk-menu.c:100
+#: disk-utils/fdisk-menu.c:101
msgid "print the partition table"
msgstr "打印分区表"
-#: disk-utils/fdisk-menu.c:101
+#: disk-utils/fdisk-menu.c:102
msgid "change a partition type"
msgstr "更改分区类型"
-#: disk-utils/fdisk-menu.c:102
+#: disk-utils/fdisk-menu.c:103
msgid "verify the partition table"
msgstr "检查分区表"
-#: disk-utils/fdisk-menu.c:103
+#: disk-utils/fdisk-menu.c:104
msgid "print information about a partition"
msgstr "打印某个分区的相关信息"
-#: disk-utils/fdisk-menu.c:105
+#: disk-utils/fdisk-menu.c:106
msgid "print the raw data of the first sector from the device"
msgstr "打印设备第1个扇区的原始数据"
-#: disk-utils/fdisk-menu.c:106
+#: disk-utils/fdisk-menu.c:107
msgid "print the raw data of the disklabel from the device"
msgstr "打印设备磁盘标签的原始数据"
-#: disk-utils/fdisk-menu.c:107
+#: disk-utils/fdisk-menu.c:108
msgid "fix partitions order"
msgstr "修复分区顺序"
-#: disk-utils/fdisk-menu.c:109
+#: disk-utils/fdisk-menu.c:110
msgid "Misc"
msgstr "杂项"
-#: disk-utils/fdisk-menu.c:110
+#: disk-utils/fdisk-menu.c:111
msgid "print this menu"
msgstr "打印此菜单"
-#: disk-utils/fdisk-menu.c:111
+#: disk-utils/fdisk-menu.c:112
msgid "change display/entry units"
msgstr "更改 显示/记录 单位"
-#: disk-utils/fdisk-menu.c:112
+#: disk-utils/fdisk-menu.c:113
msgid "extra functionality (experts only)"
msgstr "更多功能(仅限专业人员)"
-#: disk-utils/fdisk-menu.c:114
+#: disk-utils/fdisk-menu.c:115
msgid "Script"
msgstr "脚本"
-#: disk-utils/fdisk-menu.c:115
+#: disk-utils/fdisk-menu.c:116
msgid "load disk layout from sfdisk script file"
msgstr "从 sfdisk 脚本文件加载磁盘布局"
-#: disk-utils/fdisk-menu.c:116
+#: disk-utils/fdisk-menu.c:117
msgid "dump disk layout to sfdisk script file"
msgstr "将磁盘布局转储为 sfdisk 脚本文件"
-#: disk-utils/fdisk-menu.c:118
+#: disk-utils/fdisk-menu.c:119
msgid "Save & Exit"
msgstr "保存并退出"
-#: disk-utils/fdisk-menu.c:119
+#: disk-utils/fdisk-menu.c:120
msgid "write table to disk and exit"
msgstr "将分区表写入磁盘并退出"
-#: disk-utils/fdisk-menu.c:120
+#: disk-utils/fdisk-menu.c:121
msgid "write table to disk"
msgstr "将分区表写入磁盘"
-#: disk-utils/fdisk-menu.c:121
+#: disk-utils/fdisk-menu.c:122
msgid "quit without saving changes"
msgstr "退出而不保存更改"
-#: disk-utils/fdisk-menu.c:122
+#: disk-utils/fdisk-menu.c:123
msgid "return to main menu"
msgstr "返回主菜单"
-#: disk-utils/fdisk-menu.c:124
+#: disk-utils/fdisk-menu.c:125
msgid "return from BSD to DOS"
msgstr "从 BSD 回到 DOS"
-#: disk-utils/fdisk-menu.c:135
+#: disk-utils/fdisk-menu.c:136
msgid "Create a new label"
msgstr "新建空磁盘标签"
-#: disk-utils/fdisk-menu.c:136
+#: disk-utils/fdisk-menu.c:137
msgid "create a new empty GPT partition table"
msgstr "新建一份 GPT 分区表"
-#: disk-utils/fdisk-menu.c:137
+#: disk-utils/fdisk-menu.c:138
msgid "create a new empty SGI (IRIX) partition table"
msgstr "新建一份空 GPT (IRIX) 分区表"
-#: disk-utils/fdisk-menu.c:138
+#: disk-utils/fdisk-menu.c:139
msgid "create a new empty DOS partition table"
msgstr "新建一份的空 DOS 分区表"
-#: disk-utils/fdisk-menu.c:139
+#: disk-utils/fdisk-menu.c:140
msgid "create a new empty Sun partition table"
msgstr "新建一份空 Sun 分区表"
-#: disk-utils/fdisk-menu.c:143
+#: disk-utils/fdisk-menu.c:144
msgid "create an IRIX (SGI) partition table"
msgstr "创建一份 IRIX(SGI) 分区表"
-#: disk-utils/fdisk-menu.c:152
+#: disk-utils/fdisk-menu.c:153
msgid "Geometry"
msgstr "几何属性"
-#: disk-utils/fdisk-menu.c:153
+#: disk-utils/fdisk-menu.c:154
msgid "change number of cylinders"
msgstr "更改柱面数"
-#: disk-utils/fdisk-menu.c:154
+#: disk-utils/fdisk-menu.c:155
msgid "change number of heads"
msgstr "更改磁头数"
-#: disk-utils/fdisk-menu.c:155
+#: disk-utils/fdisk-menu.c:156
msgid "change number of sectors/track"
msgstr "更改扇区/磁道数"
-#: disk-utils/fdisk-menu.c:164 include/pt-mbr-partnames.h:95
+#: disk-utils/fdisk-menu.c:165 include/pt-mbr-partnames.h:95
msgid "GPT"
msgstr "GPT"
-#: disk-utils/fdisk-menu.c:165
+#: disk-utils/fdisk-menu.c:166
msgid "change disk GUID"
msgstr "更改磁盘 GUID"
-#: disk-utils/fdisk-menu.c:166
+#: disk-utils/fdisk-menu.c:167
msgid "change partition name"
msgstr "更改分区名"
-#: disk-utils/fdisk-menu.c:167
+#: disk-utils/fdisk-menu.c:168
msgid "change partition UUID"
msgstr "更改分区 UUID"
-#: disk-utils/fdisk-menu.c:168
+#: disk-utils/fdisk-menu.c:169
msgid "change table length"
msgstr "更改表长度"
-#: disk-utils/fdisk-menu.c:169
+#: disk-utils/fdisk-menu.c:170
msgid "enter protective/hybrid MBR"
msgstr "进入 保护/混合 MBR"
-#: disk-utils/fdisk-menu.c:172
+#: disk-utils/fdisk-menu.c:173
msgid "toggle the legacy BIOS bootable flag"
msgstr "开关旧 BIOS 的 可启动 标志"
-#: disk-utils/fdisk-menu.c:173
+#: disk-utils/fdisk-menu.c:174
msgid "toggle the no block IO protocol flag"
msgstr "开关 不阻塞 IO 协议 标志"
-#: disk-utils/fdisk-menu.c:174
+#: disk-utils/fdisk-menu.c:175
msgid "toggle the required partition flag"
msgstr "开关 必需分区 标志"
-#: disk-utils/fdisk-menu.c:175
+#: disk-utils/fdisk-menu.c:176
msgid "toggle the GUID specific bits"
msgstr "开/关 GUID 特定位"
-#: disk-utils/fdisk-menu.c:185
+#: disk-utils/fdisk-menu.c:186
msgid "Sun"
msgstr "Sun"
-#: disk-utils/fdisk-menu.c:186
+#: disk-utils/fdisk-menu.c:187
msgid "toggle the read-only flag"
msgstr "开关 只读 标志"
-#: disk-utils/fdisk-menu.c:187
+#: disk-utils/fdisk-menu.c:188
msgid "toggle the mountable flag"
msgstr "开关 可挂臷 标志"
-#: disk-utils/fdisk-menu.c:189
+#: disk-utils/fdisk-menu.c:190
msgid "change number of alternate cylinders"
msgstr "更改备选柱面数"
-#: disk-utils/fdisk-menu.c:190
+#: disk-utils/fdisk-menu.c:191
msgid "change number of extra sectors per cylinder"
msgstr "更改每柱面的额外扇区数"
-#: disk-utils/fdisk-menu.c:191
+#: disk-utils/fdisk-menu.c:192
msgid "change interleave factor"
msgstr "更改交错系数"
-#: disk-utils/fdisk-menu.c:192
+#: disk-utils/fdisk-menu.c:193
msgid "change rotation speed (rpm)"
msgstr "更改转速(转/分)"
-#: disk-utils/fdisk-menu.c:193
+#: disk-utils/fdisk-menu.c:194
msgid "change number of physical cylinders"
msgstr "更改物理柱面数"
-#: disk-utils/fdisk-menu.c:202
+#: disk-utils/fdisk-menu.c:203
msgid "SGI"
msgstr "SGI"
-#: disk-utils/fdisk-menu.c:203
+#: disk-utils/fdisk-menu.c:204
msgid "select bootable partition"
msgstr "选择可启动分区"
-#: disk-utils/fdisk-menu.c:204
+#: disk-utils/fdisk-menu.c:205
msgid "edit bootfile entry"
msgstr "编辑启动文件记录"
-#: disk-utils/fdisk-menu.c:205
+#: disk-utils/fdisk-menu.c:206
msgid "select sgi swap partition"
msgstr "选择 sgi 交换分区"
-#: disk-utils/fdisk-menu.c:206
+#: disk-utils/fdisk-menu.c:207
msgid "create SGI info"
msgstr "创建 SGI 信息"
-#: disk-utils/fdisk-menu.c:215
+#: disk-utils/fdisk-menu.c:216
msgid "DOS (MBR)"
msgstr "DOS (MBR)"
-#: disk-utils/fdisk-menu.c:216
+#: disk-utils/fdisk-menu.c:217
msgid "toggle a bootable flag"
msgstr "开关 可启动 标志"
-#: disk-utils/fdisk-menu.c:217
+#: disk-utils/fdisk-menu.c:218
msgid "edit nested BSD disklabel"
msgstr "编辑嵌套的 BSD 磁盘标签"
-#: disk-utils/fdisk-menu.c:218
+#: disk-utils/fdisk-menu.c:219
msgid "toggle the dos compatibility flag"
msgstr "开关 dos 兼容性标志"
-#: disk-utils/fdisk-menu.c:220
+#: disk-utils/fdisk-menu.c:221
msgid "move beginning of data in a partition"
msgstr "移动分区数据的起始点"
-#: disk-utils/fdisk-menu.c:221
+#: disk-utils/fdisk-menu.c:222
msgid "change the disk identifier"
msgstr "更改磁盘标识符"
-#: disk-utils/fdisk-menu.c:223
+#: disk-utils/fdisk-menu.c:224
msgid "return from protective/hybrid MBR to GPT"
msgstr "从 保护/混合 MBR 回到 GPT"
-#: disk-utils/fdisk-menu.c:233
+#: disk-utils/fdisk-menu.c:234
msgid "BSD"
msgstr "BSD"
-#: disk-utils/fdisk-menu.c:234
+#: disk-utils/fdisk-menu.c:235
msgid "edit drive data"
msgstr "编辑驱动数据"
-#: disk-utils/fdisk-menu.c:235
+#: disk-utils/fdisk-menu.c:236
msgid "install bootstrap"
msgstr "安装引导程序"
-#: disk-utils/fdisk-menu.c:236
+#: disk-utils/fdisk-menu.c:237
msgid "show complete disklabel"
msgstr "显示完整磁盘标签"
-#: disk-utils/fdisk-menu.c:237
+#: disk-utils/fdisk-menu.c:238
msgid "link BSD partition to non-BSD partition"
msgstr "将 BSD 分区链接到非 BSD 分区"
-#: disk-utils/fdisk-menu.c:369
+#: disk-utils/fdisk-menu.c:370
#, c-format
msgid ""
"\n"
@@ -1470,7 +1531,7 @@ msgstr ""
"\n"
"帮助 (专业命令):\n"
-#: disk-utils/fdisk-menu.c:371 disk-utils/sfdisk.c:1267
+#: disk-utils/fdisk-menu.c:372 disk-utils/sfdisk.c:1266
#, c-format
msgid ""
"\n"
@@ -1479,305 +1540,318 @@ msgstr ""
"\n"
"帮助:\n"
-#: disk-utils/fdisk-menu.c:391
+#: disk-utils/fdisk-menu.c:392
#, c-format
msgid "You're editing nested '%s' partition table, primary partition table is '%s'."
msgstr "您正在编辑嵌套的“%s”分区表,主分区表为“%s”。"
-#: disk-utils/fdisk-menu.c:421
+#: disk-utils/fdisk-menu.c:422
msgid "Expert command (m for help): "
msgstr "专家命令(输入 m 显示帮助):"
-#: disk-utils/fdisk-menu.c:423
+#: disk-utils/fdisk-menu.c:424
msgid "Command (m for help): "
msgstr "命令(输入 m 获取帮助):"
-#: disk-utils/fdisk-menu.c:433
+#: disk-utils/fdisk-menu.c:434
+msgid ""
+"\n"
+"Do you really want to quit? "
+msgstr ""
+"\n"
+"您确实要退出吗?"
+
+#: disk-utils/fdisk-menu.c:447
#, c-format
msgid "%c: unknown command"
msgstr "%c:未知命令"
-#: disk-utils/fdisk-menu.c:458 disk-utils/fdisk-menu.c:485
+#: disk-utils/fdisk-menu.c:472 disk-utils/fdisk-menu.c:505
msgid "Enter script file name"
msgstr "输入脚本文件名"
-#: disk-utils/fdisk-menu.c:471
+#: disk-utils/fdisk-menu.c:484
+msgid "Resetting fdisk!"
+msgstr ""
+
+#: disk-utils/fdisk-menu.c:491
msgid "Script successfully applied."
msgstr "成功应用了脚本。"
-#: disk-utils/fdisk-menu.c:497
+#: disk-utils/fdisk-menu.c:517
msgid "Failed to transform disk layout into script"
msgstr "将磁盘布局转换成脚本失败"
-#: disk-utils/fdisk-menu.c:511
+#: disk-utils/fdisk-menu.c:531
msgid "Script successfully saved."
msgstr "成本保存了脚本。"
-#: disk-utils/fdisk-menu.c:534 disk-utils/sfdisk.c:1513
+#: disk-utils/fdisk-menu.c:554 disk-utils/sfdisk.c:1487
#, c-format
msgid "Partition #%zu contains a %s signature."
msgstr "分区 #%zu 包含一个 %s 签名。"
-#: disk-utils/fdisk-menu.c:537 disk-utils/sfdisk.c:1516
+#: disk-utils/fdisk-menu.c:557 disk-utils/sfdisk.c:1490
msgid "Do you want to remove the signature?"
msgstr "您想移除该签名吗?"
-#: disk-utils/fdisk-menu.c:542 disk-utils/sfdisk.c:1521
+#: disk-utils/fdisk-menu.c:562 disk-utils/sfdisk.c:1495
msgid "The signature will be removed by a write command."
msgstr "写入命令将移除该签名。"
-#: disk-utils/fdisk-menu.c:575
+#: disk-utils/fdisk-menu.c:595
msgid "failed to write disklabel"
msgstr "写磁盘标签失败"
-#: disk-utils/fdisk-menu.c:613
+#: disk-utils/fdisk-menu.c:637
msgid "Failed to fix partitions order."
msgstr "修复分区顺序失败。"
-#: disk-utils/fdisk-menu.c:615
+#: disk-utils/fdisk-menu.c:639
msgid "Partitions order fixed."
msgstr "已修复分区顺序。"
-#: disk-utils/fdisk-menu.c:631
+#: disk-utils/fdisk-menu.c:655
#, c-format
msgid "Could not delete partition %zu"
msgstr "无法删除分区 %zu"
-#: disk-utils/fdisk-menu.c:660
+#: disk-utils/fdisk-menu.c:684
msgid "Changing display/entry units to cylinders (DEPRECATED!)."
msgstr "将显示/记录单位更改为柱面(已废弃!)。"
-#: disk-utils/fdisk-menu.c:662
+#: disk-utils/fdisk-menu.c:686
msgid "Changing display/entry units to sectors."
msgstr "将显示/记录单位更改为盲区。"
-#: disk-utils/fdisk-menu.c:672 disk-utils/fdisk-menu.c:842
+#: disk-utils/fdisk-menu.c:696 disk-utils/fdisk-menu.c:866
msgid "Leaving nested disklabel."
msgstr "离开嵌套的磁盘标签。"
-#: disk-utils/fdisk-menu.c:709
+#: disk-utils/fdisk-menu.c:733
msgid "New maximum entries"
msgstr "新的最大记录数"
-#: disk-utils/fdisk-menu.c:719
+#: disk-utils/fdisk-menu.c:743
msgid "Entering protective/hybrid MBR disklabel."
msgstr "进入 保护/混合 MBR 磁盘标签。"
-#: disk-utils/fdisk-menu.c:735
+#: disk-utils/fdisk-menu.c:759
msgid "New UUID (in 8-4-4-4-12 format)"
msgstr "新 UUID (以 8-4-4-4-12 格式)"
-#: disk-utils/fdisk-menu.c:750
+#: disk-utils/fdisk-menu.c:774
msgid "New name"
msgstr "新名称"
-#: disk-utils/fdisk-menu.c:813
+#: disk-utils/fdisk-menu.c:837
msgid "Entering nested BSD disklabel."
msgstr "进入嵌套的 BSD 磁盘标签。"
-#: disk-utils/fdisk-menu.c:998
+#: disk-utils/fdisk-menu.c:1022
msgid "Number of cylinders"
msgstr "柱面数"
-#: disk-utils/fdisk-menu.c:1002
+#: disk-utils/fdisk-menu.c:1026
msgid "Number of heads"
msgstr "磁头数"
-#: disk-utils/fdisk-menu.c:1006
+#: disk-utils/fdisk-menu.c:1030
msgid "Number of sectors"
msgstr "扇区数"
-#: disk-utils/fsck.c:215
+#: disk-utils/fsck.c:213
#, c-format
msgid "%s is mounted\n"
msgstr "%s 已经挂载\n"
-#: disk-utils/fsck.c:217
+#: disk-utils/fsck.c:215
#, c-format
msgid "%s is not mounted\n"
msgstr "%s 未挂载\n"
-#: disk-utils/fsck.c:331 disk-utils/fsck.cramfs.c:174
-#: disk-utils/fsck.cramfs.c:181 disk-utils/fsck.cramfs.c:235
-#: disk-utils/fsck.cramfs.c:253 disk-utils/sfdisk.c:299 libfdisk/src/bsd.c:645
-#: lib/path.c:110 lib/path.c:131 lib/path.c:152 lib/path.c:200
+#: disk-utils/fsck.c:329 disk-utils/fsck.cramfs.c:171
+#: disk-utils/fsck.cramfs.c:178 disk-utils/fsck.cramfs.c:232
+#: disk-utils/fsck.cramfs.c:250 disk-utils/sfdisk.c:298 libfdisk/src/bsd.c:645
+#: lib/path.c:126 lib/path.c:147 lib/path.c:168 lib/path.c:216
#: login-utils/last.c:208 login-utils/last.c:245 login-utils/sulogin.c:655
-#: sys-utils/setpriv.c:239 term-utils/setterm.c:721 term-utils/setterm.c:778
-#: term-utils/setterm.c:782 term-utils/setterm.c:789
+#: sys-utils/rfkill.c:179 sys-utils/rfkill.c:225 sys-utils/rfkill.c:366
+#: sys-utils/setpriv.c:285 term-utils/setterm.c:723 term-utils/setterm.c:780
+#: term-utils/setterm.c:784 term-utils/setterm.c:791
#, c-format
msgid "cannot read %s"
msgstr "不能读 %s"
-#: disk-utils/fsck.c:333 lib/path.c:133 lib/path.c:154
+#: disk-utils/fsck.c:331 lib/path.c:149 lib/path.c:170
#, c-format
msgid "parse error: %s"
msgstr "解析错误:%s"
-#: disk-utils/fsck.c:360
+#: disk-utils/fsck.c:358
#, c-format
msgid "cannot create directory %s"
msgstr "无法创建 %s 目录"
-#: disk-utils/fsck.c:373
+#: disk-utils/fsck.c:371
#, c-format
msgid "Locking disk by %s ... "
msgstr "正由 %s 锁定磁盘..."
-#: disk-utils/fsck.c:384
+#: disk-utils/fsck.c:382
#, c-format
msgid "(waiting) "
msgstr "(等待中) "
#. TRANSLATORS: These are followups to "Locking disk...".
-#: disk-utils/fsck.c:394
+#: disk-utils/fsck.c:392
msgid "succeeded"
msgstr "成功"
-#: disk-utils/fsck.c:394
+#: disk-utils/fsck.c:392
msgid "failed"
msgstr "失败"
-#: disk-utils/fsck.c:412
+#: disk-utils/fsck.c:410
#, c-format
msgid "Unlocking %s.\n"
msgstr "正在解锁 %s。\n"
-#: disk-utils/fsck.c:444
+#: disk-utils/fsck.c:442
#, c-format
msgid "failed to setup description for %s"
msgstr "设置 %s 描述 失败"
-#: disk-utils/fsck.c:474 misc-utils/findmnt.c:784 misc-utils/lsblk.c:444
-#: sys-utils/mount.c:99 sys-utils/swapon-common.c:19 sys-utils/umount.c:45
+#: disk-utils/fsck.c:472 misc-utils/findmnt.c:784 misc-utils/lsblk.c:444
+#: sys-utils/mount.c:101 sys-utils/swapon-common.c:19 sys-utils/umount.c:49
#, c-format
msgid "%s: parse error at line %d -- ignored"
msgstr "%s:第 %d 行解析出错 -- 已忽略"
-#: disk-utils/fsck.c:506 disk-utils/fsck.c:508
+#: disk-utils/fsck.c:504 disk-utils/fsck.c:506
#, c-format
msgid "%s: failed to parse fstab"
msgstr "%s:解析 fstab 失败"
-#: disk-utils/fsck.c:679 login-utils/login.c:952 login-utils/sulogin.c:1026
-#: login-utils/vipw.c:205 sys-utils/flock.c:343 sys-utils/nsenter.c:181
-#: sys-utils/swapon.c:317 sys-utils/unshare.c:219 sys-utils/unshare.c:420
-#: term-utils/script.c:788
+#: disk-utils/fsck.c:677 login-utils/login.c:934 login-utils/sulogin.c:1024
+#: login-utils/vipw.c:208 sys-utils/flock.c:346 sys-utils/nsenter.c:180
+#: sys-utils/swapon.c:321 sys-utils/unshare.c:219 sys-utils/unshare.c:419
+#: term-utils/script.c:809
msgid "fork failed"
msgstr "fork 失败"
-#: disk-utils/fsck.c:686
+#: disk-utils/fsck.c:684
#, c-format
msgid "%s: execute failed"
msgstr "%s:执行失败"
-#: disk-utils/fsck.c:774
+#: disk-utils/fsck.c:772
msgid "wait: no more child process?!?"
msgstr "等待:没有剩余子进程了?!?"
-#: disk-utils/fsck.c:777 sys-utils/flock.c:361 sys-utils/swapon.c:349
-#: sys-utils/unshare.c:404 sys-utils/unshare.c:425
+#: disk-utils/fsck.c:775 sys-utils/flock.c:364 sys-utils/swapon.c:353
+#: sys-utils/unshare.c:403 sys-utils/unshare.c:424
msgid "waitpid failed"
msgstr "waitpid 失败"
-#: disk-utils/fsck.c:795
+#: disk-utils/fsck.c:793
#, c-format
msgid "Warning... %s for device %s exited with signal %d."
msgstr "警告... 对设备 %2$s 的 %1$s 以信号 %3$d 退出。"
-#: disk-utils/fsck.c:801
+#: disk-utils/fsck.c:799
#, c-format
msgid "%s %s: status is %x, should never happen."
msgstr "%s %s:状态为 %x,这不应该发生。"
-#: disk-utils/fsck.c:847
+#: disk-utils/fsck.c:845
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr "以 %s 结束(退出状态为 %d)\n"
-#: disk-utils/fsck.c:925
+#: disk-utils/fsck.c:923
#, c-format
msgid "error %d (%m) while executing fsck.%s for %s"
msgstr "对 %3$s 执行 fsck.%2$s 时出现错误 %1$d (%m)"
-#: disk-utils/fsck.c:991
+#: disk-utils/fsck.c:989
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'."
msgstr "传递给 -t 选项的文件系统类型必须全部/全不以“no”或“!”为前缀。"
-#: disk-utils/fsck.c:1107
+#: disk-utils/fsck.c:1105
#, c-format
msgid "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
msgstr "%s:将跳过 /etc/fstab 中的错误行:fsck 通过次数非零的绑定式挂载"
-#: disk-utils/fsck.c:1119
+#: disk-utils/fsck.c:1117
#, c-format
msgid "%s: skipping nonexistent device\n"
msgstr "%s:将跳过不存在的设备\n"
-#: disk-utils/fsck.c:1124
+#: disk-utils/fsck.c:1122
#, c-format
msgid "%s: nonexistent device (\"nofail\" fstab option may be used to skip this device)\n"
msgstr "%s:设备不存在(可以使用fstab 选项“nofail”来跳过此设备)\n"
-#: disk-utils/fsck.c:1141
+#: disk-utils/fsck.c:1139
#, c-format
msgid "%s: skipping unknown filesystem type\n"
msgstr "%s:跳过未知的文件系统类型\n"
-#: disk-utils/fsck.c:1155
+#: disk-utils/fsck.c:1153
#, c-format
msgid "cannot check %s: fsck.%s not found"
msgstr "无法检查 %s:找不到 fsck.%s"
-#: disk-utils/fsck.c:1259
+#: disk-utils/fsck.c:1257
msgid "Checking all file systems.\n"
msgstr "正在检查所有文件系统。\n"
# pass number 是fstab中定义的,不为0则每次检测
-#: disk-utils/fsck.c:1350
+#: disk-utils/fsck.c:1348
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--等待中-- (第 %d 遍)\n"
-#: disk-utils/fsck.c:1375
+#: disk-utils/fsck.c:1374
#, c-format
msgid " %s [options] -- [fs-options] [<filesystem> ...]\n"
msgstr " %s [选项] -- [文件系统选项] [<文件系统> ...]\n"
-#: disk-utils/fsck.c:1379
+#: disk-utils/fsck.c:1378
msgid "Check and repair a Linux filesystem.\n"
msgstr "检查并修复 Linux 文件系统。\n"
-#: disk-utils/fsck.c:1382
+#: disk-utils/fsck.c:1381
msgid " -A check all filesystems\n"
msgstr " -A 检查所有文件系统\n"
-#: disk-utils/fsck.c:1383
+#: disk-utils/fsck.c:1382
msgid " -C [<fd>] display progress bar; file descriptor is for GUIs\n"
msgstr " -C [<fd>] 显示进度条;文件描述符 fd 用于图形用户界面\n"
-#: disk-utils/fsck.c:1384
+#: disk-utils/fsck.c:1383
msgid " -l lock the device to guarantee exclusive access\n"
msgstr " -l 锁定设备以确保独占访问\n"
-#: disk-utils/fsck.c:1385
+#: disk-utils/fsck.c:1384
msgid " -M do not check mounted filesystems\n"
msgstr " -M 不检查已挂臷的文件系统\n"
-#: disk-utils/fsck.c:1386
+#: disk-utils/fsck.c:1385
msgid " -N do not execute, just show what would be done\n"
msgstr " -N 不执行,只显示将执行的操作\n"
-#: disk-utils/fsck.c:1387
+#: disk-utils/fsck.c:1386
msgid " -P check filesystems in parallel, including root\n"
msgstr " -P 并行检查文件系统,包括 root\n"
-#: disk-utils/fsck.c:1388
+#: disk-utils/fsck.c:1387
msgid " -R skip root filesystem; useful only with '-A'\n"
msgstr " -R 跳过根文件系统;只在指定 '-A' 时有用\n"
-#: disk-utils/fsck.c:1389
+#: disk-utils/fsck.c:1388
msgid ""
" -r [<fd>] report statistics for each device checked;\n"
" file descriptor is for GUIs\n"
@@ -1785,15 +1859,15 @@ msgstr ""
" -r [<fd>] 报告对每个已检查设备的统计;\n"
" 文件描述符用于 GUI\n"
-#: disk-utils/fsck.c:1391
+#: disk-utils/fsck.c:1390
msgid " -s serialize the checking operations\n"
msgstr " -s 串行化检查操作\n"
-#: disk-utils/fsck.c:1392
+#: disk-utils/fsck.c:1391
msgid " -T do not show the title on startup\n"
msgstr " -T 启动时不显示标题\n"
-#: disk-utils/fsck.c:1393
+#: disk-utils/fsck.c:1392
msgid ""
" -t <type> specify filesystem types to be checked;\n"
" <type> is allowed to be a comma-separated list\n"
@@ -1801,344 +1875,350 @@ msgstr ""
" -t <类型> 指定要检查的文件系统类型;\n"
" <类型> 可以是以英文逗号分隔的列表\n"
-#: disk-utils/fsck.c:1395
+#: disk-utils/fsck.c:1394
msgid " -V explain what is being done\n"
msgstr " -V 解释正在进行的操作\n"
-#: disk-utils/fsck.c:1396
-msgid " -? display this help and exit\n"
-msgstr " -? 显示此帮助并退出\n"
-
-#: disk-utils/fsck.c:1399
+#: disk-utils/fsck.c:1400
msgid "See the specific fsck.* commands for available fs-options."
msgstr "参见特定的 fsck.* 命令了解可用的文件系统选项。"
-#: disk-utils/fsck.c:1438
+#: disk-utils/fsck.c:1447
msgid "too many devices"
msgstr "设备过多"
-#: disk-utils/fsck.c:1450
+#: disk-utils/fsck.c:1459
msgid "Is /proc mounted?"
msgstr "/proc 挂载了吗?"
-#: disk-utils/fsck.c:1458
+#: disk-utils/fsck.c:1467
#, c-format
msgid "must be root to scan for matching filesystems: %s"
msgstr "必须以 root 用户进行匹配文件系统扫描:%s"
-#: disk-utils/fsck.c:1462
+#: disk-utils/fsck.c:1471
#, c-format
msgid "couldn't find matching filesystem: %s"
msgstr "找不到匹配的文件系统:%s"
-#: disk-utils/fsck.c:1470 disk-utils/fsck.c:1565 misc-utils/kill.c:363
+#: disk-utils/fsck.c:1479 disk-utils/fsck.c:1576 misc-utils/kill.c:363
#: sys-utils/eject.c:278
msgid "too many arguments"
msgstr "参数过多"
-#: disk-utils/fsck.c:1525 disk-utils/fsck.c:1528
+#: disk-utils/fsck.c:1534 disk-utils/fsck.c:1537
msgid "invalid argument of -r"
msgstr "-r 的参数无效"
-#: disk-utils/fsck.c:1576
+#: disk-utils/fsck.c:1549
+#, fuzzy, c-format
+msgid "option '%s' may be specified only once"
+msgstr "--pid 选项只能指定一次"
+
+#: disk-utils/fsck.c:1556 misc-utils/kill.c:409
+#, c-format
+msgid "option '%s' requires an argument"
+msgstr "“%s”选项需要一个参数"
+
+#: disk-utils/fsck.c:1587
#, c-format
msgid "invalid argument of -r: %d"
msgstr "-r 的参数无效:%d"
-#: disk-utils/fsck.c:1618
+#: disk-utils/fsck.c:1630
msgid "the -l option can be used with one device only -- ignore"
msgstr "-l 选项只能用于一个设备 -- 忽略"
-#: disk-utils/fsck.cramfs.c:113
+#: disk-utils/fsck.cramfs.c:111
#, c-format
msgid " %s [options] <file>\n"
msgstr " %s [选项] <文件>\n"
-#: disk-utils/fsck.cramfs.c:116
+#: disk-utils/fsck.cramfs.c:114
msgid "Check and repair a compressed ROM filesystem.\n"
msgstr "检查并修复压缩的 ROM 文件系统。\n"
-#: disk-utils/fsck.cramfs.c:119
+#: disk-utils/fsck.cramfs.c:117
msgid " -a for compatibility only, ignored\n"
msgstr " -a 纯兼容性选项,忽略\n"
-#: disk-utils/fsck.cramfs.c:120
+#: disk-utils/fsck.cramfs.c:118
msgid " -v, --verbose be more verbose\n"
msgstr " -v, --verbose 更详尽\n"
-#: disk-utils/fsck.cramfs.c:121
+#: disk-utils/fsck.cramfs.c:119
msgid " -y for compatibility only, ignored\n"
msgstr " -y 纯兼容性选项,忽略\n"
-#: disk-utils/fsck.cramfs.c:122
+#: disk-utils/fsck.cramfs.c:120
msgid " -b, --blocksize <size> use this blocksize, defaults to page size\n"
msgstr " -b, --blocksize <大小> 使用指定的块大小,默认为页的大小\n"
-#: disk-utils/fsck.cramfs.c:123
+#: disk-utils/fsck.cramfs.c:121
msgid " --extract[=<dir>] test uncompression, optionally extract into <dir>\n"
msgstr " --extract[=<目录>] 测试解压,可指定解压到<目录>\n"
-#: disk-utils/fsck.cramfs.c:161
+#: disk-utils/fsck.cramfs.c:158
#, c-format
msgid "ioctl failed: unable to determine device size: %s"
msgstr "ioctl 失败:无法确定设备大小:%s"
-#: disk-utils/fsck.cramfs.c:167
+#: disk-utils/fsck.cramfs.c:164
#, c-format
msgid "not a block device or file: %s"
msgstr "不是一个块设备或文件:%s"
-#: disk-utils/fsck.cramfs.c:170 disk-utils/fsck.cramfs.c:206
+#: disk-utils/fsck.cramfs.c:167 disk-utils/fsck.cramfs.c:203
msgid "file length too short"
msgstr "文件长度过短"
-#: disk-utils/fsck.cramfs.c:179 disk-utils/fsck.cramfs.c:233
-#: disk-utils/fsck.cramfs.c:249 libfdisk/src/bsd.c:717 libfdisk/src/bsd.c:892
+#: disk-utils/fsck.cramfs.c:176 disk-utils/fsck.cramfs.c:230
+#: disk-utils/fsck.cramfs.c:246 libfdisk/src/bsd.c:717 libfdisk/src/bsd.c:892
#: login-utils/last.c:203 login-utils/last.c:237 sys-utils/fallocate.c:221
#, c-format
msgid "seek on %s failed"
msgstr "在 %s 上定位失败"
-#: disk-utils/fsck.cramfs.c:185 disk-utils/fsck.cramfs.c:187
+#: disk-utils/fsck.cramfs.c:182 disk-utils/fsck.cramfs.c:184
msgid "superblock magic not found"
msgstr "超级块魔数(magic)未找到"
-#: disk-utils/fsck.cramfs.c:190
+#: disk-utils/fsck.cramfs.c:187
#, c-format
msgid "cramfs endianness is %s\n"
msgstr "cramfs 大小端为 %s\n"
-#: disk-utils/fsck.cramfs.c:191
+#: disk-utils/fsck.cramfs.c:188
msgid "big"
msgstr "大端"
-#: disk-utils/fsck.cramfs.c:191
+#: disk-utils/fsck.cramfs.c:188
msgid "little"
msgstr "小端"
-#: disk-utils/fsck.cramfs.c:195
+#: disk-utils/fsck.cramfs.c:192
msgid "unsupported filesystem features"
msgstr "不支持的文件系统特性"
-#: disk-utils/fsck.cramfs.c:199
+#: disk-utils/fsck.cramfs.c:196
#, c-format
msgid "superblock size (%d) too small"
msgstr "超级块尺寸(%d)过小"
-#: disk-utils/fsck.cramfs.c:204
+#: disk-utils/fsck.cramfs.c:201
msgid "zero file count"
msgstr "零文件计数"
-#: disk-utils/fsck.cramfs.c:208
+#: disk-utils/fsck.cramfs.c:205
msgid "file extends past end of filesystem"
msgstr "警告:文件超过了文件系统终点"
-#: disk-utils/fsck.cramfs.c:210
+#: disk-utils/fsck.cramfs.c:207
msgid "old cramfs format"
msgstr "旧的 cramfs 格式"
-#: disk-utils/fsck.cramfs.c:219
+#: disk-utils/fsck.cramfs.c:216
msgid "unable to test CRC: old cramfs format"
msgstr "无法检测 CRC:旧的 cramfs 格式"
-#: disk-utils/fsck.cramfs.c:272
+#: disk-utils/fsck.cramfs.c:269
msgid "crc error"
msgstr "crc 错误"
-#: disk-utils/fsck.cramfs.c:302 disk-utils/fsck.minix.c:560
+#: disk-utils/fsck.cramfs.c:299 disk-utils/fsck.minix.c:560
msgid "seek failed"
msgstr "定位失败"
-#: disk-utils/fsck.cramfs.c:306
+#: disk-utils/fsck.cramfs.c:303
msgid "read romfs failed"
msgstr "读取 romfs 失败"
-#: disk-utils/fsck.cramfs.c:338
+#: disk-utils/fsck.cramfs.c:335
msgid "root inode is not directory"
msgstr "根 inode 不是一个目录"
-#: disk-utils/fsck.cramfs.c:342
+#: disk-utils/fsck.cramfs.c:339
#, c-format
msgid "bad root offset (%lu)"
msgstr "错误的根偏移(%lu)"
-#: disk-utils/fsck.cramfs.c:360
+#: disk-utils/fsck.cramfs.c:357
msgid "data block too large"
msgstr "数据块过大"
-#: disk-utils/fsck.cramfs.c:364
+#: disk-utils/fsck.cramfs.c:361
#, c-format
msgid "decompression error: %s"
msgstr "解压出错:%s"
-#: disk-utils/fsck.cramfs.c:390
+#: disk-utils/fsck.cramfs.c:387
#, c-format
msgid " hole at %lu (%zu)\n"
msgstr " 位于 %lu 的空洞(%zu)\n"
-#: disk-utils/fsck.cramfs.c:397 disk-utils/fsck.cramfs.c:550
+#: disk-utils/fsck.cramfs.c:394 disk-utils/fsck.cramfs.c:547
#, c-format
msgid " uncompressing block at %lu to %lu (%lu)\n"
msgstr " 正在将 %lu 处的块解压到 %lu (%lu)\n"
-#: disk-utils/fsck.cramfs.c:404
+#: disk-utils/fsck.cramfs.c:401
#, c-format
msgid "non-block (%ld) bytes"
msgstr "非块(%ld)字节 "
-#: disk-utils/fsck.cramfs.c:408
+#: disk-utils/fsck.cramfs.c:405
#, c-format
msgid "non-size (%ld vs %ld) bytes"
msgstr "无大小(%ld : %ld)字节"
-#: disk-utils/fsck.cramfs.c:413 disk-utils/fsck.cramfs.c:516
-#: disk-utils/swaplabel.c:104 misc-utils/uuidd.c:375 sys-utils/fallocate.c:417
-#: sys-utils/setpriv.c:535 sys-utils/setpriv.c:558 sys-utils/swapon.c:390
-#: term-utils/ttymsg.c:175
+#: disk-utils/fsck.cramfs.c:410 disk-utils/fsck.cramfs.c:513
+#: disk-utils/swaplabel.c:109 misc-utils/uuidd.c:366 sys-utils/fallocate.c:417
+#: sys-utils/rfkill.c:448 sys-utils/setpriv.c:620 sys-utils/setpriv.c:643
+#: sys-utils/swapon.c:394 term-utils/ttymsg.c:175
#, c-format
msgid "write failed: %s"
msgstr "写失败:%s"
-#: disk-utils/fsck.cramfs.c:424
+#: disk-utils/fsck.cramfs.c:421
#, c-format
msgid "lchown failed: %s"
msgstr "lchown 失败:%s"
-#: disk-utils/fsck.cramfs.c:428
+#: disk-utils/fsck.cramfs.c:425
#, c-format
msgid "chown failed: %s"
msgstr "chown 失败:%s"
-#: disk-utils/fsck.cramfs.c:433
+#: disk-utils/fsck.cramfs.c:430
#, c-format
msgid "utime failed: %s"
msgstr "utime 失败:%s"
-#: disk-utils/fsck.cramfs.c:445
+#: disk-utils/fsck.cramfs.c:442
#, c-format
msgid "directory inode has zero offset and non-zero size: %s"
msgstr "目录 inode 偏移为 0,大小不为 0:%s"
-#: disk-utils/fsck.cramfs.c:460
+#: disk-utils/fsck.cramfs.c:457
#, c-format
msgid "mkdir failed: %s"
msgstr "mkdir 失败:%s"
-#: disk-utils/fsck.cramfs.c:476
+#: disk-utils/fsck.cramfs.c:473
msgid "filename length is zero"
msgstr "文件名长度为 0"
-#: disk-utils/fsck.cramfs.c:478
+#: disk-utils/fsck.cramfs.c:475
msgid "bad filename length"
msgstr "文件名长度有误"
-#: disk-utils/fsck.cramfs.c:484
+#: disk-utils/fsck.cramfs.c:481
msgid "bad inode offset"
msgstr "inode 偏移有误"
-#: disk-utils/fsck.cramfs.c:499
+#: disk-utils/fsck.cramfs.c:496
msgid "file inode has zero offset and non-zero size"
msgstr "文件 inode 偏移为 0,大小不为 0"
-#: disk-utils/fsck.cramfs.c:502
+#: disk-utils/fsck.cramfs.c:499
msgid "file inode has zero size and non-zero offset"
msgstr "文件 inode 大小为 0,偏移不为 0"
-#: disk-utils/fsck.cramfs.c:531
+#: disk-utils/fsck.cramfs.c:528
msgid "symbolic link has zero offset"
msgstr "符号链接偏移为 0"
-#: disk-utils/fsck.cramfs.c:533
+#: disk-utils/fsck.cramfs.c:530
msgid "symbolic link has zero size"
msgstr "符号链接大小为 0"
-#: disk-utils/fsck.cramfs.c:542
+#: disk-utils/fsck.cramfs.c:539
#, c-format
msgid "size error in symlink: %s"
msgstr "符号链接大小出错:%s"
-#: disk-utils/fsck.cramfs.c:556
+#: disk-utils/fsck.cramfs.c:553
#, c-format
msgid "symlink failed: %s"
msgstr "symlink 失败:%s"
-#: disk-utils/fsck.cramfs.c:569
+#: disk-utils/fsck.cramfs.c:566
#, c-format
msgid "special file has non-zero offset: %s"
msgstr "特殊文件的偏移不为 0:%s"
-#: disk-utils/fsck.cramfs.c:579
+#: disk-utils/fsck.cramfs.c:576
#, c-format
msgid "fifo has non-zero size: %s"
msgstr "FIFO 的大小不为 0:%s"
-#: disk-utils/fsck.cramfs.c:585
+#: disk-utils/fsck.cramfs.c:582
#, c-format
msgid "socket has non-zero size: %s"
msgstr "套接字的大小不为 0:%s"
-#: disk-utils/fsck.cramfs.c:588
+#: disk-utils/fsck.cramfs.c:585
#, c-format
msgid "bogus mode: %s (%o)"
msgstr "伪(bogus)模式:%s (%o)"
-#: disk-utils/fsck.cramfs.c:597
+#: disk-utils/fsck.cramfs.c:594
#, c-format
msgid "mknod failed: %s"
msgstr "mknod 失败:%s"
-#: disk-utils/fsck.cramfs.c:629
+#: disk-utils/fsck.cramfs.c:626
#, c-format
msgid "directory data start (%lu) < sizeof(struct cramfs_super) + start (%zu)"
msgstr "目录数据起点(%lu) < sizeof(struct cramfs_super) + 起点 (%zu)"
-#: disk-utils/fsck.cramfs.c:633
+#: disk-utils/fsck.cramfs.c:630
#, c-format
msgid "directory data end (%lu) != file data start (%lu)"
msgstr "目录数据终点 (%lu) != 文件数据起点 (%lu)"
-#: disk-utils/fsck.cramfs.c:637
+#: disk-utils/fsck.cramfs.c:634
msgid "invalid file data offset"
msgstr "无效的文件数据偏移"
-#: disk-utils/fsck.cramfs.c:684 disk-utils/mkfs.cramfs.c:726
+#: disk-utils/fsck.cramfs.c:683 disk-utils/mkfs.cramfs.c:735
msgid "invalid blocksize argument"
msgstr "无效的 块大小 参数"
-#: disk-utils/fsck.cramfs.c:705
+#: disk-utils/fsck.cramfs.c:706
#, c-format
msgid "%s: OK\n"
msgstr "%s:OK\n"
-#: disk-utils/fsck.minix.c:184
+#: disk-utils/fsck.minix.c:185
msgid "Check the consistency of a Minix filesystem.\n"
msgstr "检查 Minix 文件系统的一致性。\n"
-#: disk-utils/fsck.minix.c:186
+#: disk-utils/fsck.minix.c:187
msgid " -l, --list list all filenames\n"
msgstr " -l, --list 列出所有文件名\n"
-#: disk-utils/fsck.minix.c:187
+#: disk-utils/fsck.minix.c:188
msgid " -a, --auto automatic repair\n"
msgstr " -a, --auto 自动修复\n"
-#: disk-utils/fsck.minix.c:188
+#: disk-utils/fsck.minix.c:189
msgid " -r, --repair interactive repair\n"
msgstr " -r, --repair 交互修复\n"
-#: disk-utils/fsck.minix.c:189
+#: disk-utils/fsck.minix.c:190
msgid " -v, --verbose be verbose\n"
msgstr " -v, --verbose 详尽方式\n"
-#: disk-utils/fsck.minix.c:190
+#: disk-utils/fsck.minix.c:191
msgid " -s, --super output super-block information\n"
msgstr " -s, --super 输出超级块信息\n"
-#: disk-utils/fsck.minix.c:191
+#: disk-utils/fsck.minix.c:192
msgid " -m, --uncleared activate mode not cleared warnings\n"
msgstr " -m, --uncleared 激活 模式未清除 警告\n"
-#: disk-utils/fsck.minix.c:192
+#: disk-utils/fsck.minix.c:193
msgid " -f, --force force check\n"
msgstr " -f, --force 强制检查\n"
@@ -2324,7 +2404,7 @@ msgstr "%ld 个inode\n"
msgid "%ld blocks\n"
msgstr "%ld 块\n"
-#: disk-utils/fsck.minix.c:649 disk-utils/mkfs.minix.c:566
+#: disk-utils/fsck.minix.c:649 disk-utils/mkfs.minix.c:568
#, c-format
msgid "Firstdatazone=%jd (%jd)\n"
msgstr "首个数据区=%jd (%jd)\n"
@@ -2480,39 +2560,39 @@ msgstr "区 %lu:使用中,已计数=%d\n"
msgid "Zone %lu: not in use, counted=%d\n"
msgstr "区 %lu:未使用,已计数=%d\n"
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1299
msgid "bad inode size"
msgstr "inode 大小有误"
-#: disk-utils/fsck.minix.c:1299
+#: disk-utils/fsck.minix.c:1301
msgid "bad v2 inode size"
msgstr "v2 inode 大小有误"
-#: disk-utils/fsck.minix.c:1343
+#: disk-utils/fsck.minix.c:1346
msgid "need terminal for interactive repairs"
msgstr "需要终端来进行交互式修复"
-#: disk-utils/fsck.minix.c:1347
+#: disk-utils/fsck.minix.c:1350
#, c-format
msgid "cannot open %s: %s"
msgstr "无法打开 %s:%s"
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1361
#, c-format
msgid "%s is clean, no check.\n"
msgstr "%s 是干净的,不检查。\n"
-#: disk-utils/fsck.minix.c:1361
+#: disk-utils/fsck.minix.c:1364
#, c-format
msgid "Forcing filesystem check on %s.\n"
msgstr "强制在 %s 上进行文件系统检查。\n"
-#: disk-utils/fsck.minix.c:1363
+#: disk-utils/fsck.minix.c:1366
#, c-format
msgid "Filesystem on %s is dirty, needs checking.\n"
msgstr "%s 上的文件系统有问题,需要检查。\n"
-#: disk-utils/fsck.minix.c:1395
+#: disk-utils/fsck.minix.c:1398
#, c-format
msgid ""
"\n"
@@ -2521,12 +2601,12 @@ msgstr ""
"\n"
"已使用 %6ld inodes(%ld%%)\n"
-#: disk-utils/fsck.minix.c:1401
+#: disk-utils/fsck.minix.c:1404
#, c-format
msgid "%6ld zones used (%ld%%)\n"
msgstr "已使用 %6ld 区(%ld%%)\n"
-#: disk-utils/fsck.minix.c:1403
+#: disk-utils/fsck.minix.c:1406
#, c-format
msgid ""
"\n"
@@ -2549,7 +2629,7 @@ msgstr ""
"------\n"
"%6d 个文件\n"
-#: disk-utils/fsck.minix.c:1417
+#: disk-utils/fsck.minix.c:1420
#, c-format
msgid ""
"----------------------------\n"
@@ -2560,66 +2640,62 @@ msgstr ""
"文件系统已经更改\n"
"----------------\n"
-#: disk-utils/fsck.minix.c:1429 disk-utils/mkfs.minix.c:833
-#: disk-utils/mkswap.c:539 disk-utils/partx.c:1058 disk-utils/resizepart.c:112
-#: login-utils/utmpdump.c:393 sys-utils/dmesg.c:658 sys-utils/wdctl.c:348
-#: sys-utils/wdctl.c:413 term-utils/script.c:273 term-utils/script.c:350
-#: term-utils/setterm.c:885 text-utils/pg.c:1256
+#: disk-utils/fsck.minix.c:1432 disk-utils/mkfs.minix.c:838
+#: disk-utils/mkswap.c:541 disk-utils/partx.c:1058 disk-utils/resizepart.c:114
+#: login-utils/su-common.c:328 login-utils/su-common.c:405
+#: login-utils/utmpdump.c:393 sys-utils/dmesg.c:669 sys-utils/wdctl.c:347
+#: sys-utils/wdctl.c:412 term-utils/script.c:298 term-utils/script.c:375
+#: term-utils/setterm.c:887 text-utils/pg.c:1256
msgid "write failed"
msgstr "写失败"
-#: disk-utils/isosize.c:136
+#: disk-utils/isosize.c:106
#, c-format
msgid "%s: might not be an ISO filesystem"
msgstr "%s:可能不是 ISO 文件系统"
-#: disk-utils/isosize.c:139
-#, c-format
-msgid "seek error on %s"
-msgstr "%s 定位出错"
-
-#: disk-utils/isosize.c:142
+#: disk-utils/isosize.c:111 disk-utils/isosize.c:113
#, c-format
msgid "read error on %s"
msgstr "%s 读出错"
-#: disk-utils/isosize.c:151
+#: disk-utils/isosize.c:124
#, c-format
msgid "sector count: %d, sector size: %d\n"
msgstr "扇区计数:%d,扇区大小:%d\n"
-#: disk-utils/isosize.c:170
-#, c-format
-msgid " %s [options] <iso9660_image_file>\n"
+#: disk-utils/isosize.c:148
+#, fuzzy, c-format
+msgid " %s [options] <iso9660_image_file> ...\n"
msgstr " %s [选项] <iso9660镜像文件>\n"
-#: disk-utils/isosize.c:174
+#: disk-utils/isosize.c:152
msgid "Show the length of an ISO-9660 filesystem.\n"
msgstr "显示 ISO-9660 文件系统的长度。\n"
-#: disk-utils/isosize.c:177
+#: disk-utils/isosize.c:155
msgid " -d, --divisor=<number> divide the amount of bytes by <number>\n"
msgstr " -d, --divisor=<数字> 将字节数除以 <数字>\n"
-#: disk-utils/isosize.c:178
+#: disk-utils/isosize.c:156
msgid " -x, --sectors show sector count and size\n"
msgstr " -x, --sectors 显示扇区计数和大小\n"
-#: disk-utils/isosize.c:210
+#: disk-utils/isosize.c:187
msgid "invalid divisor argument"
msgstr "无效的 divisor(除数) 参数"
-#: disk-utils/mkfs.bfs.c:73
+#: disk-utils/mkfs.bfs.c:74
#, c-format
msgid "Usage: %s [options] device [block-count]\n"
msgstr "Usage: %s [选项] 设备 [块数]\n"
-#: disk-utils/mkfs.bfs.c:77
+#: disk-utils/mkfs.bfs.c:78
msgid "Make an SCO bfs filesystem.\n"
msgstr "制作 SCO bfs 文件系统。\n"
-#: disk-utils/mkfs.bfs.c:79
-#, c-format
+#: disk-utils/mkfs.bfs.c:80
+#, fuzzy, c-format
msgid ""
"\n"
"Options:\n"
@@ -2629,10 +2705,6 @@ msgid ""
" -v, --verbose explain what is being done\n"
" -c this option is silently ignored\n"
" -l this option is silently ignored\n"
-" -V, --version output version information and exit\n"
-" -V as version must be only option\n"
-" -h, --help display this help and exit\n"
-"\n"
msgstr ""
"\n"
"选项有:\n"
@@ -2647,140 +2719,140 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: disk-utils/mkfs.bfs.c:144
+#: disk-utils/mkfs.bfs.c:145
msgid "invalid number of inodes"
msgstr "无效的 inodes 数目"
-#: disk-utils/mkfs.bfs.c:150
+#: disk-utils/mkfs.bfs.c:151
msgid "volume name too long"
msgstr "卷名过长"
-#: disk-utils/mkfs.bfs.c:157
+#: disk-utils/mkfs.bfs.c:158
msgid "fsname name too long"
msgstr "fsname 名过长"
-#: disk-utils/mkfs.bfs.c:193
+#: disk-utils/mkfs.bfs.c:196
msgid "invalid block-count"
msgstr "无效的块计数"
-#: disk-utils/mkfs.bfs.c:199
+#: disk-utils/mkfs.bfs.c:204
#, c-format
msgid "cannot get size of %s"
msgstr "无法获得 %s 的大小"
-#: disk-utils/mkfs.bfs.c:204
+#: disk-utils/mkfs.bfs.c:209
#, c-format
msgid "blocks argument too large, max is %llu"
msgstr "块参数过大,最大值是 %llu"
-#: disk-utils/mkfs.bfs.c:219
+#: disk-utils/mkfs.bfs.c:224
msgid "too many inodes - max is 512"
msgstr "inodes 过多 - 最多 512"
-#: disk-utils/mkfs.bfs.c:229
+#: disk-utils/mkfs.bfs.c:234
#, c-format
msgid "not enough space, need at least %llu blocks"
msgstr "空间不足,至少需要 %llu 个块"
-#: disk-utils/mkfs.bfs.c:241
+#: disk-utils/mkfs.bfs.c:246
#, c-format
msgid "Device: %s\n"
msgstr "设备:%s\n"
-#: disk-utils/mkfs.bfs.c:242
+#: disk-utils/mkfs.bfs.c:247
#, c-format
msgid "Volume: <%-6s>\n"
msgstr "卷:<%-6s>\n"
-#: disk-utils/mkfs.bfs.c:243
+#: disk-utils/mkfs.bfs.c:248
#, c-format
msgid "FSname: <%-6s>\n"
msgstr "文件系统名:<%-6s>\n"
-#: disk-utils/mkfs.bfs.c:244
+#: disk-utils/mkfs.bfs.c:249
#, c-format
msgid "BlockSize: %d\n"
msgstr "块大小:%d\n"
-#: disk-utils/mkfs.bfs.c:246
+#: disk-utils/mkfs.bfs.c:251
#, c-format
msgid "Inodes: %ld (in 1 block)\n"
msgstr "Inodes:%ld (在 1 个块中)\n"
-#: disk-utils/mkfs.bfs.c:249
+#: disk-utils/mkfs.bfs.c:254
#, c-format
msgid "Inodes: %ld (in %llu blocks)\n"
msgstr "Inodes:%ld (在 %llu 个块中)\n"
-#: disk-utils/mkfs.bfs.c:251
+#: disk-utils/mkfs.bfs.c:256
#, c-format
msgid "Blocks: %llu\n"
msgstr "块:%llu\n"
-#: disk-utils/mkfs.bfs.c:252
+#: disk-utils/mkfs.bfs.c:257
#, c-format
msgid "Inode end: %d, Data end: %d\n"
msgstr "Inode 终点:%d,数据终点:%d\n"
-#: disk-utils/mkfs.bfs.c:257
+#: disk-utils/mkfs.bfs.c:262
msgid "error writing superblock"
msgstr "写超级块出错"
-#: disk-utils/mkfs.bfs.c:278
+#: disk-utils/mkfs.bfs.c:283
msgid "error writing root inode"
msgstr "写 根 inode 出错"
-#: disk-utils/mkfs.bfs.c:283
+#: disk-utils/mkfs.bfs.c:288
msgid "error writing inode"
msgstr "写 inode 出错"
-#: disk-utils/mkfs.bfs.c:286
+#: disk-utils/mkfs.bfs.c:291
msgid "seek error"
msgstr "定位出错"
-#: disk-utils/mkfs.bfs.c:292
+#: disk-utils/mkfs.bfs.c:297
msgid "error writing . entry"
msgstr "写 . 记录出错"
-#: disk-utils/mkfs.bfs.c:296
+#: disk-utils/mkfs.bfs.c:301
msgid "error writing .. entry"
msgstr "写 .. 记录出错"
-#: disk-utils/mkfs.bfs.c:299
+#: disk-utils/mkfs.bfs.c:304
#, c-format
msgid "error closing %s"
msgstr "关闭 %s 出错"
-#: disk-utils/mkfs.c:44
+#: disk-utils/mkfs.c:45
#, c-format
msgid " %s [options] [-t <type>] [fs-options] <device> [<size>]\n"
msgstr " %s [选项] [-t <类型>] [文件系统选项] <设备> [<大小>]\n"
-#: disk-utils/mkfs.c:48
+#: disk-utils/mkfs.c:49
msgid "Make a Linux filesystem.\n"
msgstr "创建一个Linux 文件系统。\n"
-#: disk-utils/mkfs.c:51
+#: disk-utils/mkfs.c:52
#, c-format
msgid " -t, --type=<type> filesystem type; when unspecified, ext2 is used\n"
msgstr " -t, --type=<类型> 文件系统类型;若不指定,将使用 ext2\n"
-#: disk-utils/mkfs.c:52
+#: disk-utils/mkfs.c:53
#, c-format
msgid " fs-options parameters for the real filesystem builder\n"
msgstr " fs-options 实际文件系统构建程序的参数\n"
-#: disk-utils/mkfs.c:53
+#: disk-utils/mkfs.c:54
#, c-format
msgid " <device> path to the device to be used\n"
msgstr " <设备> 要使用设备的路径\n"
-#: disk-utils/mkfs.c:54
+#: disk-utils/mkfs.c:55
#, c-format
msgid " <size> number of blocks to be used on the device\n"
msgstr " <大小> 要使用设备上的块数\n"
-#: disk-utils/mkfs.c:55
+#: disk-utils/mkfs.c:56
#, c-format
msgid ""
" -V, --verbose explain what is being done;\n"
@@ -2789,47 +2861,32 @@ msgstr ""
" -V, --verbose 解释正在进行的操作;\n"
" 多次指定 -V 将导致空运行(dry-run)\n"
-#: disk-utils/mkfs.c:57
-#, c-format
-msgid ""
-" -V, --version display version information and exit;\n"
-" -V as --version must be the only option\n"
-msgstr ""
-" -V, --version 显示版本信息并退出\n"
-" 将 -V 作为 --version 选项时必须是惟一选项\n"
-
-#: disk-utils/mkfs.c:59
-#, c-format
-msgid " -h, --help display this help text and exit\n"
-msgstr " -h, --help 显示此帮助并退出\n"
-
#: disk-utils/mkfs.c:139 lib/exec_shell.c:49 login-utils/newgrp.c:239
-#: login-utils/su-common.c:648 login-utils/su-common.c:989
-#: login-utils/sulogin.c:791 login-utils/sulogin.c:795 schedutils/chrt.c:555
-#: schedutils/ionice.c:260 schedutils/taskset.c:245 sys-utils/flock.c:122
-#: sys-utils/nsenter.c:482 sys-utils/prlimit.c:642 sys-utils/rtcwake.c:577
-#: sys-utils/setarch.c:324 sys-utils/setarch.c:403 sys-utils/setsid.c:115
-#: sys-utils/swapon.c:341 sys-utils/switch_root.c:257 sys-utils/unshare.c:461
-#: term-utils/script.c:589 text-utils/pg.c:1383
+#: login-utils/su-common.c:1073 login-utils/su-common.c:1441
+#: login-utils/sulogin.c:791 login-utils/sulogin.c:795 schedutils/chrt.c:556
+#: schedutils/ionice.c:260 schedutils/taskset.c:248 sys-utils/flock.c:121
+#: sys-utils/nsenter.c:481 sys-utils/prlimit.c:642 sys-utils/rtcwake.c:575
+#: sys-utils/setarch.c:313 sys-utils/setarch.c:392 sys-utils/setsid.c:117
+#: sys-utils/swapon.c:345 sys-utils/switch_root.c:261 sys-utils/unshare.c:460
+#: term-utils/script.c:622 text-utils/pg.c:1383
#, c-format
msgid "failed to execute %s"
msgstr "执行 %s 失败"
-#: disk-utils/mkfs.cramfs.c:131
-#, c-format
+#: disk-utils/mkfs.cramfs.c:128
+#, fuzzy, c-format
msgid ""
"usage: %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n name] dirname outfile\n"
-" -h print this help\n"
" -v be verbose\n"
" -E make all warnings errors (non-zero exit status)\n"
" -b blksize use this blocksize, must equal page size\n"
" -e edition set edition number (part of fsid)\n"
" -N endian set cramfs endianness (big|little|host), default host\n"
-" -i file insert a file image into the filesystem (requires >= 2.4.0)\n"
+" -i file insert a file image into the filesystem\n"
" -n name set name of cramfs filesystem\n"
" -p pad by %d bytes for boot code\n"
" -s sort directory entries (old option, ignored)\n"
-" -z make explicit holes (requires >= 2.3.39)\n"
+" -z make explicit holes\n"
" dirname root of the filesystem to be compressed\n"
" outfile output file\n"
msgstr ""
@@ -2848,212 +2905,212 @@ msgstr ""
" 目录名 要压缩的文件系统的根目录\n"
" 输出文件 输出文件\n"
-#: disk-utils/mkfs.cramfs.c:164
+#: disk-utils/mkfs.cramfs.c:162
#, c-format
msgid "readlink failed: %s"
msgstr "readlink 失败:%s"
-#: disk-utils/mkfs.cramfs.c:308
+#: disk-utils/mkfs.cramfs.c:306
#, c-format
msgid "could not read directory %s"
msgstr "无法读目录 %s"
-#: disk-utils/mkfs.cramfs.c:443
+#: disk-utils/mkfs.cramfs.c:441
msgid "filesystem too big. Exiting."
msgstr "文件系统过大。将退出。"
-#: disk-utils/mkfs.cramfs.c:602
+#: disk-utils/mkfs.cramfs.c:600
#, c-format
msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
msgstr "AIEEE:块已“压缩”到 > 2*块长度(%ld)\n"
-#: disk-utils/mkfs.cramfs.c:621
+#: disk-utils/mkfs.cramfs.c:619
#, c-format
msgid "%6.2f%% (%+ld bytes)\t%s\n"
msgstr "%6.2f%% (%+ld 字节)\t%s\n"
-#: disk-utils/mkfs.cramfs.c:666
+#: disk-utils/mkfs.cramfs.c:664
#, c-format
msgid "cannot close file %s"
msgstr "无法关闭文件 %s"
-#: disk-utils/mkfs.cramfs.c:732
+#: disk-utils/mkfs.cramfs.c:741
msgid "invalid edition number argument"
msgstr "无效的修订版本号参数"
-#: disk-utils/mkfs.cramfs.c:742
+#: disk-utils/mkfs.cramfs.c:751
msgid "invalid endianness given; must be 'big', 'little', or 'host'"
msgstr "给定的大小端无效。必须为“big”、“little”或“host”"
-#: disk-utils/mkfs.cramfs.c:806
+#: 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:830
+#: disk-utils/mkfs.cramfs.c:841
msgid "ROM image map"
msgstr "ROM 镜像映射"
-#: disk-utils/mkfs.cramfs.c:842
+#: disk-utils/mkfs.cramfs.c:853
#, c-format
msgid "Including: %s\n"
msgstr "包含:%s\n"
-#: disk-utils/mkfs.cramfs.c:848
+#: disk-utils/mkfs.cramfs.c:859
#, c-format
msgid "Directory data: %zd bytes\n"
msgstr "目录数据:%zd 字节\n"
-#: disk-utils/mkfs.cramfs.c:856
+#: disk-utils/mkfs.cramfs.c:867
#, c-format
msgid "Everything: %zd kilobytes\n"
msgstr "全部:%zd KB\n"
-#: disk-utils/mkfs.cramfs.c:861
+#: disk-utils/mkfs.cramfs.c:872
#, c-format
msgid "Super block: %zd bytes\n"
msgstr "超级块:%zd 字节\n"
-#: disk-utils/mkfs.cramfs.c:868
+#: disk-utils/mkfs.cramfs.c:879
#, c-format
msgid "CRC: %x\n"
msgstr "CRC:%x\n"
-#: disk-utils/mkfs.cramfs.c:873
+#: 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:879
+#: disk-utils/mkfs.cramfs.c:890
#, c-format
msgid "ROM image write failed (%zd %zd)"
msgstr "写 ROM 镜像失败(%zd %zd)"
-#: disk-utils/mkfs.cramfs.c:882
+#: disk-utils/mkfs.cramfs.c:893
msgid "ROM image"
msgstr "ROM 镜像"
-#: disk-utils/mkfs.cramfs.c:891
+#: disk-utils/mkfs.cramfs.c:902
#, c-format
msgid "warning: filenames truncated to %u bytes."
msgstr "警告:文件名被截短为 %u 个字节。"
-#: disk-utils/mkfs.cramfs.c:893
+#: disk-utils/mkfs.cramfs.c:904
msgid "warning: files were skipped due to errors."
msgstr "警告:由于错误,文件被跳过。"
-#: disk-utils/mkfs.cramfs.c:895
+#: 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:899
+#: 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:902
+#: 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:905
+#: disk-utils/mkfs.cramfs.c:916
#, c-format
msgid ""
"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
"that some device files will be wrong."
msgstr "警告:设备号被截短为 %u 位。几乎可以肯定某些设备文件将出错。"
-#: disk-utils/mkfs.minix.c:135
+#: disk-utils/mkfs.minix.c:138
#, c-format
msgid " %s [options] /dev/name [blocks]\n"
msgstr " %s [选项] /dev/name [块数]\n"
-#: disk-utils/mkfs.minix.c:137
+#: disk-utils/mkfs.minix.c:140
msgid " -1 use Minix version 1\n"
msgstr " -1 使用 Minix 第 1 版\n"
-#: disk-utils/mkfs.minix.c:138
+#: disk-utils/mkfs.minix.c:141
msgid " -2, -v use Minix version 2\n"
msgstr " -2, -v 使用 Minix 第 2 版\n"
-#: disk-utils/mkfs.minix.c:139
+#: disk-utils/mkfs.minix.c:142
msgid " -3 use Minix version 3\n"
msgstr " -3 使用 Minix 第 3 版\n"
-#: disk-utils/mkfs.minix.c:140
+#: disk-utils/mkfs.minix.c:143
msgid " -n, --namelength <num> maximum length of filenames\n"
msgstr " -n, --namelength <数字> 文件名的最大长度\n"
-#: disk-utils/mkfs.minix.c:141
+#: disk-utils/mkfs.minix.c:144
msgid " -i, --inodes <num> number of inodes for the filesystem\n"
msgstr " -i, --inodes <数字> 文件系统的 inode 数\n"
-#: disk-utils/mkfs.minix.c:142
+#: disk-utils/mkfs.minix.c:145
msgid " -c, --check check the device for bad blocks\n"
msgstr " -c, --check 检查设备坏块\n"
-#: disk-utils/mkfs.minix.c:143
+#: disk-utils/mkfs.minix.c:146
msgid " -l, --badblocks <file> list of bad blocks from file\n"
msgstr " -l, --badblocks <文件> 列出文件中的坏块\n"
-#: disk-utils/mkfs.minix.c:187
+#: disk-utils/mkfs.minix.c:189
#, c-format
msgid "%s: seek to boot block failed in write_tables"
msgstr "%s:在 write_tables 中定位到启动块失败"
-#: disk-utils/mkfs.minix.c:190
+#: disk-utils/mkfs.minix.c:192
#, c-format
msgid "%s: unable to clear boot sector"
msgstr "%s:无法清除启动扇区"
-#: disk-utils/mkfs.minix.c:192
+#: disk-utils/mkfs.minix.c:194
#, c-format
msgid "%s: seek failed in write_tables"
msgstr "%s:在 write_tables 中定位失败"
-#: disk-utils/mkfs.minix.c:195
+#: disk-utils/mkfs.minix.c:197
#, c-format
msgid "%s: unable to write super-block"
msgstr "%s:无法写超级块"
-#: disk-utils/mkfs.minix.c:198
+#: disk-utils/mkfs.minix.c:200
#, c-format
msgid "%s: unable to write inode map"
msgstr "%s:无法写 inode map"
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
#, c-format
msgid "%s: unable to write zone map"
msgstr "%s:无法写 zone map"
-#: disk-utils/mkfs.minix.c:204
+#: disk-utils/mkfs.minix.c:206
#, c-format
msgid "%s: unable to write inodes"
msgstr "%s:无法写 inodes"
-#: disk-utils/mkfs.minix.c:209
+#: disk-utils/mkfs.minix.c:211
#, c-format
msgid "%s: seek failed in write_block"
msgstr "%s:在 write_block 中定位失败"
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:214
#, c-format
msgid "%s: write failed in write_block"
msgstr "%s:在 write_block 中写入失败"
-#: disk-utils/mkfs.minix.c:221 disk-utils/mkfs.minix.c:296
-#: disk-utils/mkfs.minix.c:345
+#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
+#: disk-utils/mkfs.minix.c:347
#, c-format
msgid "%s: too many bad blocks"
msgstr "%s:坏块太多"
-#: disk-utils/mkfs.minix.c:229
+#: disk-utils/mkfs.minix.c:231
#, c-format
msgid "%s: not enough good blocks"
msgstr "%s:好块不够"
-#: disk-utils/mkfs.minix.c:544
+#: disk-utils/mkfs.minix.c:546
#, c-format
msgid ""
"First data block at %jd, which is too far (max %d).\n"
@@ -3062,24 +3119,24 @@ msgstr ""
"第一个数据块位于 %jd,过远(最大为 %d)。\n"
"请尝试通过传递 --inodes <数值> 来指定更少的 inode"
-#: disk-utils/mkfs.minix.c:564
+#: disk-utils/mkfs.minix.c:566
#, c-format
msgid "%lu inode\n"
msgid_plural "%lu inodes\n"
msgstr[0] "%lu 个 inode\n"
-#: disk-utils/mkfs.minix.c:565
+#: disk-utils/mkfs.minix.c:567
#, c-format
msgid "%lu block\n"
msgid_plural "%lu blocks\n"
msgstr[0] "%lu 个块\n"
-#: disk-utils/mkfs.minix.c:568
+#: disk-utils/mkfs.minix.c:570
#, c-format
msgid "Zonesize=%zu\n"
msgstr "区大小=%zu\n"
-#: disk-utils/mkfs.minix.c:569
+#: disk-utils/mkfs.minix.c:571
#, c-format
msgid ""
"Maxsize=%zu\n"
@@ -3088,94 +3145,94 @@ msgstr ""
"最大尺寸=%zu\n"
"\n"
-#: disk-utils/mkfs.minix.c:582
+#: disk-utils/mkfs.minix.c:584
#, c-format
msgid "%s: seek failed during testing of blocks"
msgstr "%s:在测试块时定位失败"
-#: disk-utils/mkfs.minix.c:589
+#: disk-utils/mkfs.minix.c:591
#, c-format
msgid "Weird values in do_check: probably bugs\n"
msgstr "do_check 中的值异常:可能有 bug\n"
-#: disk-utils/mkfs.minix.c:622
+#: disk-utils/mkfs.minix.c:624
#, c-format
msgid "%s: seek failed in check_blocks"
msgstr "%s:在 check_blocks 中定位失败"
-#: disk-utils/mkfs.minix.c:632
+#: disk-utils/mkfs.minix.c:634
#, c-format
msgid "%s: bad blocks before data-area: cannot make fs"
msgstr "%s:数据区前有坏块:无法创建文件系统"
-#: disk-utils/mkfs.minix.c:639 disk-utils/mkfs.minix.c:663
+#: disk-utils/mkfs.minix.c:641 disk-utils/mkfs.minix.c:665
#, c-format
msgid "%d bad block\n"
msgid_plural "%d bad blocks\n"
msgstr[0] "%d 个坏块\n"
-#: disk-utils/mkfs.minix.c:648
+#: disk-utils/mkfs.minix.c:650
#, c-format
msgid "%s: can't open file of bad blocks"
msgstr "%s: 打不开坏块文件"
-#: disk-utils/mkfs.minix.c:653
+#: disk-utils/mkfs.minix.c:655
#, c-format
msgid "badblock number input error on line %d\n"
msgstr "第 %d 行坏块数输入错误\n"
-#: disk-utils/mkfs.minix.c:654
+#: disk-utils/mkfs.minix.c:656
#, c-format
msgid "%s: cannot read badblocks file"
msgstr "%s: 打不开 badblocks 文件"
-#: disk-utils/mkfs.minix.c:694
+#: disk-utils/mkfs.minix.c:696
#, c-format
msgid "block size smaller than physical sector size of %s"
msgstr "块尺寸比 %s 的物理扇区尺寸小"
-#: disk-utils/mkfs.minix.c:697
+#: disk-utils/mkfs.minix.c:699
#, c-format
msgid "cannot determine size of %s"
msgstr "无法确定 %s 的大小"
-#: disk-utils/mkfs.minix.c:705
+#: disk-utils/mkfs.minix.c:707
#, c-format
msgid "%s: requested blocks (%llu) exceeds available (%llu) blocks\n"
msgstr "%s:重复的块 (%llu) 超出可用的 (%llu) 块\n"
-#: disk-utils/mkfs.minix.c:708
+#: disk-utils/mkfs.minix.c:710
#, c-format
msgid "%s: number of blocks too small"
msgstr "%s:块数太小"
-#: disk-utils/mkfs.minix.c:723 disk-utils/mkfs.minix.c:729
+#: disk-utils/mkfs.minix.c:725 disk-utils/mkfs.minix.c:731
#, c-format
msgid "unsupported name length: %d"
msgstr "不支持的名字长度:%d"
-#: disk-utils/mkfs.minix.c:732
+#: disk-utils/mkfs.minix.c:734
#, c-format
msgid "unsupported minix file system version: %d"
msgstr " 不支持的 minix 文件系统版本:%d"
-#: disk-utils/mkfs.minix.c:767
+#: disk-utils/mkfs.minix.c:771
msgid "-v is ambiguous, use '-2' instead"
msgstr "-v 含义不清,请转用“-2”"
-#: disk-utils/mkfs.minix.c:778
+#: disk-utils/mkfs.minix.c:782
msgid "failed to parse maximum length of filenames"
msgstr "解析文件名最大长度失败"
-#: disk-utils/mkfs.minix.c:782
+#: disk-utils/mkfs.minix.c:786
msgid "failed to parse number of inodes"
msgstr "解析 inode 数 失败"
-#: disk-utils/mkfs.minix.c:806
+#: disk-utils/mkfs.minix.c:810
msgid "failed to parse number of blocks"
msgstr "解析块数失败"
-#: disk-utils/mkfs.minix.c:813
+#: disk-utils/mkfs.minix.c:818
#, c-format
msgid "%s is mounted; will not make a filesystem here!"
msgstr "%s 已挂载;将不会在此创建文件系统!"
@@ -3204,7 +3261,7 @@ msgstr "无标签,"
msgid "no uuid\n"
msgstr "无 uuid\n"
-#: disk-utils/mkswap.c:147
+#: disk-utils/mkswap.c:148
#, c-format
msgid ""
"\n"
@@ -3215,12 +3272,12 @@ msgstr ""
"用法\n"
" %s [选项] 设备 [大小]\n"
-#: disk-utils/mkswap.c:152
+#: disk-utils/mkswap.c:153
msgid "Set up a Linux swap area.\n"
msgstr "设置 Linux 交换区。\n"
-#: disk-utils/mkswap.c:155
-#, c-format
+#: disk-utils/mkswap.c:156
+#, fuzzy, c-format
msgid ""
"\n"
"Options:\n"
@@ -3230,9 +3287,6 @@ msgid ""
" -L, --label LABEL specify label\n"
" -v, --swapversion NUM specify swap-space version number\n"
" -U, --uuid UUID specify the uuid to use\n"
-" -V, --version output version information and exit\n"
-" -h, --help display this help and exit\n"
-"\n"
msgstr ""
"\n"
"选项:\n"
@@ -3246,163 +3300,163 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: disk-utils/mkswap.c:174
+#: disk-utils/mkswap.c:176
#, c-format
msgid "too many bad pages: %lu"
msgstr "坏页过多:%lu"
-#: disk-utils/mkswap.c:195
+#: disk-utils/mkswap.c:197
msgid "seek failed in check_blocks"
msgstr "check_blocks (检查块)时定位失败"
-#: disk-utils/mkswap.c:203
+#: disk-utils/mkswap.c:205
#, c-format
msgid "%lu bad page\n"
msgid_plural "%lu bad pages\n"
msgstr[0] "%lu 个坏页\n"
-#: disk-utils/mkswap.c:228
+#: disk-utils/mkswap.c:230
msgid "unable to alloc new libblkid probe"
msgstr "无法分配新的 libblkid 探针"
-#: disk-utils/mkswap.c:230
+#: disk-utils/mkswap.c:232
msgid "unable to assign device to libblkid probe"
msgstr "无法将设备分配给 libblkid 探针"
-#: disk-utils/mkswap.c:247
+#: disk-utils/mkswap.c:249
#, c-format
msgid "warning: checking bad blocks from swap file is not supported: %s"
msgstr "警告:不支持检查交换区的坏块:%s"
-#: disk-utils/mkswap.c:261 disk-utils/mkswap.c:287 disk-utils/mkswap.c:334
+#: disk-utils/mkswap.c:263 disk-utils/mkswap.c:289 disk-utils/mkswap.c:336
msgid "unable to rewind swap-device"
msgstr "无法倒回(rewind)交换设备"
-#: disk-utils/mkswap.c:290
+#: disk-utils/mkswap.c:292
msgid "unable to erase bootbits sectors"
msgstr "不能擦除 bootbits 扇区"
-#: disk-utils/mkswap.c:306
+#: disk-utils/mkswap.c:308
#, c-format
msgid "%s: warning: wiping old %s signature."
msgstr "%s:警告,将擦除旧的 %s 签名。"
-#: disk-utils/mkswap.c:311
+#: disk-utils/mkswap.c:313
#, c-format
msgid "%s: warning: don't erase bootbits sectors"
msgstr "%s:警告,不要擦除 bootbits 扇区"
-#: disk-utils/mkswap.c:314
+#: disk-utils/mkswap.c:316
#, c-format
msgid " (%s partition table detected). "
msgstr " (检测到 %s 分区表)。"
-#: disk-utils/mkswap.c:316
+#: disk-utils/mkswap.c:318
#, c-format
msgid " (compiled without libblkid). "
msgstr " (编译时未链接 libblkid)。"
-#: disk-utils/mkswap.c:317
+#: disk-utils/mkswap.c:319
#, c-format
msgid "Use -f to force.\n"
msgstr "使用 -f 选项强制执行。\n"
-#: disk-utils/mkswap.c:339
+#: disk-utils/mkswap.c:341
#, c-format
msgid "%s: unable to write signature page"
msgstr "%s:无法写签名页"
-#: disk-utils/mkswap.c:380
+#: disk-utils/mkswap.c:382
msgid "parsing page size failed"
msgstr "解析页大小失败"
-#: disk-utils/mkswap.c:386
+#: disk-utils/mkswap.c:388
msgid "parsing version number failed"
msgstr "解析版本号失败"
-#: disk-utils/mkswap.c:389
+#: disk-utils/mkswap.c:391
#, c-format
msgid "swapspace version %d is not supported"
msgstr "不支持 swapspace 版本 %d"
-#: disk-utils/mkswap.c:395
+#: disk-utils/mkswap.c:397
#, c-format
msgid "warning: ignoring -U (UUIDs are unsupported by %s)"
msgstr "警告:将忽略 -U 选项(%s 不支持 UUID)"
-#: disk-utils/mkswap.c:414
+#: disk-utils/mkswap.c:416
msgid "only one device argument is currently supported"
msgstr "当前只支持一个设备参数"
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:423
msgid "error: parsing UUID failed"
msgstr "错误:解析 UUID 失败"
-#: disk-utils/mkswap.c:430
+#: disk-utils/mkswap.c:432
msgid "error: Nowhere to set up swap on?"
msgstr "错误:没有设置交换空间的地方?"
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:438
msgid "invalid block count argument"
msgstr "无效的 块计数 参数"
-#: disk-utils/mkswap.c:445
+#: 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:451
+#: 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:456
+#: disk-utils/mkswap.c:458
#, c-format
msgid "warning: truncating swap area to %llu KiB"
msgstr "警告:将把交换区截短为 %llu KiB"
-#: disk-utils/mkswap.c:461
+#: disk-utils/mkswap.c:463
#, c-format
msgid "error: %s is mounted; will not make swapspace"
msgstr "错误:%s 已挂载;将不会创建交换空间"
-#: disk-utils/mkswap.c:468 sys-utils/swapon.c:526
+#: disk-utils/mkswap.c:470 sys-utils/swapon.c:530
#, c-format
msgid "%s: insecure permissions %04o, %04o suggested."
msgstr "%s:不安全的权限 %04o,建议使用 %04o。"
-#: disk-utils/mkswap.c:472 sys-utils/swapon.c:531
+#: disk-utils/mkswap.c:474 sys-utils/swapon.c:535
#, c-format
msgid "%s: insecure file owner %d, 0 (root) suggested."
msgstr "%s:不安全的文件拥有者 %d,建议使用 0(root)。"
-#: disk-utils/mkswap.c:487
+#: disk-utils/mkswap.c:489
msgid "Unable to set up swap-space: unreadable"
msgstr "无法设置交换空间:不可读"
-#: disk-utils/mkswap.c:492
+#: 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:512
+#: disk-utils/mkswap.c:514
#, c-format
msgid "%s: unable to obtain selinux file label"
msgstr "%s:无法获得 selinux 文件标签"
-#: disk-utils/mkswap.c:515
+#: disk-utils/mkswap.c:517
msgid "unable to matchpathcon()"
msgstr "无法执行 matchpathcon()"
-#: disk-utils/mkswap.c:518
+#: disk-utils/mkswap.c:520
msgid "unable to create new selinux context"
msgstr "无法创建新的 selinux 环境(context)"
-#: disk-utils/mkswap.c:520
+#: disk-utils/mkswap.c:522
msgid "couldn't compute selinux context"
msgstr "无法计算 selinux 环境(context)"
-#: disk-utils/mkswap.c:526
+#: disk-utils/mkswap.c:528
#, c-format
msgid "unable to relabel %s to %s"
msgstr "无法将 %s 标签改为 %s"
@@ -3473,9 +3527,10 @@ msgstr "%s:设置回环设备失败"
#: disk-utils/partx.c:161 login-utils/lslogins.c:307 misc-utils/fincore.c:92
#: misc-utils/findmnt.c:376 misc-utils/lsblk.c:365 misc-utils/lslocks.c:342
-#: sys-utils/losetup.c:107 sys-utils/lscpu.c:373 sys-utils/lsipc.c:232
-#: sys-utils/lsmem.c:136 sys-utils/lsns.c:189 sys-utils/prlimit.c:277
-#: sys-utils/swapon.c:147 sys-utils/wdctl.c:151 sys-utils/zramctl.c:148
+#: misc-utils/uuidparse.c:125 misc-utils/wipefs.c:126 sys-utils/losetup.c:107
+#: sys-utils/lscpu.c:373 sys-utils/lsipc.c:232 sys-utils/lsmem.c:136
+#: sys-utils/lsns.c:189 sys-utils/prlimit.c:277 sys-utils/rfkill.c:131
+#: sys-utils/swapon.c:151 sys-utils/wdctl.c:151 sys-utils/zramctl.c:148
#, c-format
msgid "unknown column: %s"
msgstr "未知列: %s"
@@ -3571,10 +3626,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:678 misc-utils/fincore.c:374 misc-utils/findmnt.c:1624
-#: misc-utils/lsblk.c:1919 misc-utils/lslocks.c:462 sys-utils/losetup.c:326
-#: sys-utils/lscpu.c:1771 sys-utils/prlimit.c:306 sys-utils/swapon.c:290
-#: sys-utils/wdctl.c:272
+#: disk-utils/partx.c:678 misc-utils/fincore.c:374 misc-utils/findmnt.c:1622
+#: misc-utils/lsblk.c:1928 misc-utils/lslocks.c:462 sys-utils/losetup.c:326
+#: sys-utils/lscpu.c:1770 sys-utils/prlimit.c:306 sys-utils/rfkill.c:330
+#: sys-utils/swapon.c:294 sys-utils/wdctl.c:271
#, fuzzy
msgid "failed to allocate output column"
msgstr "分配输出行失败"
@@ -3599,28 +3654,28 @@ msgstr "%s:检测到分区表类型“%s”\n"
msgid "%s: partition table with no partitions"
msgstr "%s:分区表中无分区"
-#: disk-utils/partx.c:752
+#: disk-utils/partx.c:753
#, c-format
msgid " %s [-a|-d|-s|-u] [--nr <n:m> | <partition>] <disk>\n"
msgstr " %s [-a|-d|-s|-u] [--nr <n:m> | <分区>] <磁盘>\n"
-#: disk-utils/partx.c:756
+#: disk-utils/partx.c:757
msgid "Tell the kernel about the presence and numbering of partitions.\n"
msgstr "告知内核分区的存在和排列情况。\n"
-#: disk-utils/partx.c:759
+#: disk-utils/partx.c:760
msgid " -a, --add add specified partitions or all of them\n"
msgstr " -a, --add 添加指定的分区或所有分区\n"
-#: disk-utils/partx.c:760
+#: disk-utils/partx.c:761
msgid " -d, --delete delete specified partitions or all of them\n"
msgstr " -d, --delete 删除指定的分区或所有分区\n"
-#: disk-utils/partx.c:761
+#: disk-utils/partx.c:762
msgid " -u, --update update specified partitions or all of them\n"
msgstr " -u, --update 更新指定的分区或所有分区\n"
-#: disk-utils/partx.c:762
+#: disk-utils/partx.c:763
msgid ""
" -s, --show list partitions\n"
"\n"
@@ -3628,62 +3683,54 @@ msgstr ""
" -s, --show 列出分区\n"
"\n"
-#: disk-utils/partx.c:763 misc-utils/lsblk.c:1637 sys-utils/lsmem.c:380
+#: disk-utils/partx.c:764 misc-utils/lsblk.c:1638 sys-utils/lsmem.c:382
msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
-#: disk-utils/partx.c:764
+#: disk-utils/partx.c:765
msgid " -g, --noheadings don't print headings for --show\n"
msgstr " -g, --noheadings --show 时不打印标题\n"
-#: disk-utils/partx.c:765
+#: disk-utils/partx.c:766
msgid " -n, --nr <n:m> specify the range of partitions (e.g. --nr 2:4)\n"
msgstr " -n, --nr <n:m> 指定分区范围(例如:--nr 2:4)\n"
-#: disk-utils/partx.c:766
+#: disk-utils/partx.c:767
msgid " -o, --output <list> define which output columns to use\n"
msgstr " -o, --output <列表> 定义使用哪个输出列\n"
-#: disk-utils/partx.c:767 misc-utils/lsblk.c:1652 sys-utils/lsmem.c:378
+#: disk-utils/partx.c:768 misc-utils/lsblk.c:1654 sys-utils/lsmem.c:380
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs 使用 key=“value” 输出格式\n"
-#: disk-utils/partx.c:768 misc-utils/lsblk.c:1653 sys-utils/lsmem.c:383
+#: disk-utils/partx.c:769 misc-utils/lsblk.c:1655 sys-utils/lsmem.c:385
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: disk-utils/partx.c:769
+#: disk-utils/partx.c:770
#, fuzzy
msgid " -S, --sector-size <num> overwrite sector size\n"
msgstr " -b, --sectors-size <大小> 显示扇区计数和大小\n"
-#: disk-utils/partx.c:770
+#: disk-utils/partx.c:771
#, fuzzy
msgid " -t, --type <type> specify the partition type\n"
msgstr " -t, --type <类型> 指定分区类型(dos、bsd、solaris 等)\n"
-#: disk-utils/partx.c:771
+#: disk-utils/partx.c:772
#, fuzzy
msgid " --list-types list supported partition types and exit\n"
msgstr " --list 列出可设置的架构并退出\n"
-#: disk-utils/partx.c:772 sys-utils/fallocate.c:100
+#: disk-utils/partx.c:773 sys-utils/fallocate.c:101
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详尽模式\n"
-#: disk-utils/partx.c:778
-msgid ""
-"\n"
-"Available columns (for --show, --raw or --pairs):\n"
-msgstr ""
-"\n"
-"可用的列(针对 --show、--raw 或 --pairs):\n"
-
-#: disk-utils/partx.c:857
+#: disk-utils/partx.c:856
msgid "failed to parse --nr <M-N> range"
msgstr "解析 --nr <M-N> 范围失败"
-#: disk-utils/partx.c:943
+#: disk-utils/partx.c:942
msgid "partition and disk name do not match"
msgstr "分区和磁盘名不符"
@@ -3711,7 +3758,7 @@ msgstr "%s:不支持已分区的回环设备"
msgid "%s: failed to initialize blkid prober"
msgstr "%s:初始化 blkid 探针失败"
-#: disk-utils/raw.c:51
+#: disk-utils/raw.c:50
#, c-format
msgid ""
" %1$s %2$srawN <major> <minor>\n"
@@ -3724,181 +3771,181 @@ msgstr ""
" %1$s -q %2$srawN\n"
" %1$s -qa\n"
-#: disk-utils/raw.c:58
+#: disk-utils/raw.c:57
msgid "Bind a raw character device to a block device.\n"
msgstr "将原生字符设备绑定到块设备。\n"
-#: disk-utils/raw.c:61
+#: disk-utils/raw.c:60
msgid " -q, --query set query mode\n"
msgstr " -q, --query 设置查询模式\n"
-#: disk-utils/raw.c:62
+#: disk-utils/raw.c:61
msgid " -a, --all query all raw devices\n"
msgstr " -a, --all 查询所有 raw 设备\n"
-#: disk-utils/raw.c:164
+#: disk-utils/raw.c:167
#, 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:181
+#: disk-utils/raw.c:184
#, c-format
msgid "Cannot locate block device '%s'"
msgstr "无法定位块设备“%s”"
-#: disk-utils/raw.c:184
+#: disk-utils/raw.c:187
#, c-format
msgid "Device '%s' is not a block device"
msgstr "设备“%s”不是块设备"
-#: disk-utils/raw.c:193 disk-utils/raw.c:196 sys-utils/ipcrm.c:351
-#: sys-utils/ipcrm.c:364 sys-utils/ipcrm.c:377
+#: disk-utils/raw.c:196 disk-utils/raw.c:199 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:213
+#: disk-utils/raw.c:217
#, c-format
msgid "Cannot open master raw device '%s'"
msgstr "无法打开主 Raw 设备“%s”"
-#: disk-utils/raw.c:228
+#: disk-utils/raw.c:232
#, c-format
msgid "Cannot locate raw device '%s'"
msgstr "无法定位 raw 设备“%s”"
-#: disk-utils/raw.c:231
+#: disk-utils/raw.c:235
#, c-format
msgid "Raw device '%s' is not a character dev"
msgstr "设备“%s”不是字符设备"
-#: disk-utils/raw.c:235
+#: disk-utils/raw.c:239
#, c-format
msgid "Device '%s' is not a raw dev"
msgstr "设备“%s”不是 raw 设备"
-#: disk-utils/raw.c:245
+#: disk-utils/raw.c:249
msgid "Error querying raw device"
msgstr "查询原生(raw)设备失败"
-#: disk-utils/raw.c:254 disk-utils/raw.c:269
+#: disk-utils/raw.c:258 disk-utils/raw.c:273
#, c-format
msgid "%sraw%d: bound to major %d, minor %d\n"
msgstr "%sraw%d:绑定到主设备号 %d, 次设备号 %d\n"
-#: disk-utils/raw.c:268
+#: disk-utils/raw.c:272
msgid "Error setting raw device"
msgstr "设置原生(raw)设备出错"
-#: disk-utils/resizepart.c:19
+#: disk-utils/resizepart.c:20
#, c-format
msgid " %s <disk device> <partition number> <length>\n"
msgstr " %s <磁盘设备> <分区号> <长度>\n"
-#: disk-utils/resizepart.c:23
+#: disk-utils/resizepart.c:24
msgid "Tell the kernel about the new size of a partition.\n"
msgstr "告诉内核分区的新尺寸。\n"
-#: disk-utils/resizepart.c:104
+#: disk-utils/resizepart.c:106
#, c-format
msgid "%s: failed to get start of the partition number %s"
msgstr "%s:获取分区号 %s 的起点失败"
-#: disk-utils/resizepart.c:109
+#: disk-utils/resizepart.c:111
msgid "failed to resize partition"
msgstr "调整分区大小失败"
-#: disk-utils/sfdisk.c:233
+#: disk-utils/sfdisk.c:232
msgid "failed to allocate nested libfdisk context"
msgstr "分配嵌套 libfdisk 环境(context)失败"
-#: disk-utils/sfdisk.c:293
+#: disk-utils/sfdisk.c:292
#, c-format
msgid "cannot seek %s"
msgstr "无法定位 %s"
-#: disk-utils/sfdisk.c:304 libfdisk/src/bsd.c:722 libfdisk/src/bsd.c:896
+#: disk-utils/sfdisk.c:303 libfdisk/src/bsd.c:722 libfdisk/src/bsd.c:896
#, c-format
msgid "cannot write %s"
msgstr "无法写 %s"
-#: disk-utils/sfdisk.c:311
+#: disk-utils/sfdisk.c:310
#, c-format
msgid "%12s (offset %5ju, size %5ju): %s"
msgstr "%12s (偏移 %5ju, 大小 %5ju): %s"
-#: disk-utils/sfdisk.c:317
+#: disk-utils/sfdisk.c:316
#, c-format
msgid "%s: failed to create a backup"
msgstr "%s:创建备份失败"
-#: disk-utils/sfdisk.c:330
+#: disk-utils/sfdisk.c:329
msgid "failed to create a backup file, $HOME undefined"
msgstr "创建备份失败,未定义 $HOME"
-#: disk-utils/sfdisk.c:356
+#: disk-utils/sfdisk.c:355
msgid "Backup files:"
msgstr "备份文件:"
-#: disk-utils/sfdisk.c:381
+#: disk-utils/sfdisk.c:380
msgid "failed to read new partition from device; ignoring --move-data"
msgstr "从设备读取新分区失败;将忽略 --move-data"
-#: disk-utils/sfdisk.c:383
+#: disk-utils/sfdisk.c:382
msgid "failed to get size of the new partition; ignoring --move-data"
msgstr "获取新分区大小失败,将忽略 --move-data"
-#: disk-utils/sfdisk.c:385
+#: disk-utils/sfdisk.c:384
msgid "failed to get start of the new partition; ignoring --move-data"
msgstr "获取新分区起点失败,将忽略 --move-data"
-#: disk-utils/sfdisk.c:387
+#: disk-utils/sfdisk.c:386
msgid "failed to get size of the old partition; ignoring --move-data"
msgstr "获取新分区大小失败,将忽略 --move-data"
-#: disk-utils/sfdisk.c:389
+#: disk-utils/sfdisk.c:388
msgid "failed to get start of the old partition; ignoring --move-data"
msgstr "获取旧分区起点失败,将忽略 --move-data"
-#: disk-utils/sfdisk.c:391
+#: disk-utils/sfdisk.c:390
msgid "start of the partition has not been moved; ignoring --move-data"
msgstr "分区起点未移动;将忽略 --move-data"
-#: disk-utils/sfdisk.c:393
+#: disk-utils/sfdisk.c:392
msgid "new partition is smaller than original; ignoring --move-data"
msgstr "新分区小于原分区;将忽略 --move-data"
-#: disk-utils/sfdisk.c:443
+#: disk-utils/sfdisk.c:442
msgid "Data move:"
msgstr "数据移动︰"
-#: disk-utils/sfdisk.c:445
+#: disk-utils/sfdisk.c:444
#, c-format
msgid " typescript file: %s"
msgstr "typescript 文件:%s"
-#: disk-utils/sfdisk.c:446
+#: disk-utils/sfdisk.c:445
#, c-format
msgid " old start: %ju, new start: %ju (move %ju sectors)\n"
msgstr " 原起点:%ju,新起点:%ju (移动 %ju 个扇区)\n"
-#: disk-utils/sfdisk.c:453
+#: disk-utils/sfdisk.c:452
msgid "Do you want to move partition data?"
msgstr "您想移动分区数据吗?"
-#: disk-utils/sfdisk.c:455 disk-utils/sfdisk.c:1823
+#: disk-utils/sfdisk.c:454 disk-utils/sfdisk.c:1797
msgid "Leaving."
msgstr "离开中。"
-#: disk-utils/sfdisk.c:528
+#: disk-utils/sfdisk.c:527
#, c-format
msgid "%s: failed to move data"
msgstr "%s:移动数据失败"
-#: disk-utils/sfdisk.c:543
+#: disk-utils/sfdisk.c:542
msgid "The partition table is unchanged (--no-act)."
msgstr "分区表未更改(--no-act)。"
-#: disk-utils/sfdisk.c:549
+#: disk-utils/sfdisk.c:548
msgid ""
"\n"
"The partition table has been altered."
@@ -3906,12 +3953,12 @@ msgstr ""
"\n"
"分区表已调整。"
-#: disk-utils/sfdisk.c:625
+#: disk-utils/sfdisk.c:624
#, c-format
msgid "unsupported label '%s'"
msgstr "不支持的标签:“%s”"
-#: disk-utils/sfdisk.c:628
+#: disk-utils/sfdisk.c:627
msgid ""
"Id Name\n"
"\n"
@@ -3919,166 +3966,166 @@ msgstr ""
"Id 名称\n"
"\n"
-#: disk-utils/sfdisk.c:658
+#: disk-utils/sfdisk.c:657
msgid "unrecognized partition table type"
msgstr "未识别的分区表类型"
-#: disk-utils/sfdisk.c:711
+#: disk-utils/sfdisk.c:710
#, c-format
msgid "Cannot get size of %s"
msgstr "无法获得 %s 的大小"
-#: disk-utils/sfdisk.c:748
+#: disk-utils/sfdisk.c:747
#, c-format
msgid "total: %ju blocks\n"
msgstr "共计:%ju 个块\n"
-#: disk-utils/sfdisk.c:810 disk-utils/sfdisk.c:878 disk-utils/sfdisk.c:919
-#: disk-utils/sfdisk.c:949 disk-utils/sfdisk.c:1016 disk-utils/sfdisk.c:1080
-#: disk-utils/sfdisk.c:1135 disk-utils/sfdisk.c:1191 disk-utils/sfdisk.c:1570
+#: disk-utils/sfdisk.c:809 disk-utils/sfdisk.c:877 disk-utils/sfdisk.c:918
+#: disk-utils/sfdisk.c:948 disk-utils/sfdisk.c:1015 disk-utils/sfdisk.c:1079
+#: disk-utils/sfdisk.c:1134 disk-utils/sfdisk.c:1190 disk-utils/sfdisk.c:1544
msgid "no disk device specified"
msgstr "未指定磁盘设备"
-#: disk-utils/sfdisk.c:821
+#: disk-utils/sfdisk.c:820
msgid "toggle boot flags is supported for MBR only"
msgstr "开/关启动标志 只支持 MBR"
-#: disk-utils/sfdisk.c:852 disk-utils/sfdisk.c:898 disk-utils/sfdisk.c:1021
-#: disk-utils/sfdisk.c:1085 disk-utils/sfdisk.c:1140 disk-utils/sfdisk.c:1196
-#: disk-utils/sfdisk.c:1568 disk-utils/sfdisk.c:2064
+#: disk-utils/sfdisk.c:851 disk-utils/sfdisk.c:897 disk-utils/sfdisk.c:1020
+#: disk-utils/sfdisk.c:1084 disk-utils/sfdisk.c:1139 disk-utils/sfdisk.c:1195
+#: disk-utils/sfdisk.c:1542 disk-utils/sfdisk.c:2039
msgid "failed to parse partition number"
msgstr "解析分区号失败"
-#: disk-utils/sfdisk.c:857
+#: disk-utils/sfdisk.c:856
#, c-format
msgid "%s: partition %d: failed to toggle bootable flag"
msgstr "%s:分区 %d:开/关启动标志失败"
-#: disk-utils/sfdisk.c:893 disk-utils/sfdisk.c:901
+#: disk-utils/sfdisk.c:892 disk-utils/sfdisk.c:900
#, c-format
msgid "%s: partition %zu: failed to delete"
msgstr "%s:分区 %zu:删除失败"
-#: disk-utils/sfdisk.c:956
+#: disk-utils/sfdisk.c:955
#, fuzzy, c-format
msgid "%s: does not contain a recognized partition table"
msgstr "设备不包含可识别的分区表。"
-#: disk-utils/sfdisk.c:960
+#: disk-utils/sfdisk.c:959
msgid "failed to allocate dump struct"
msgstr "分配转储结构失败"
-#: disk-utils/sfdisk.c:964
+#: disk-utils/sfdisk.c:963
#, fuzzy, c-format
msgid "%s: failed to dump partition table"
msgstr "转储分区表失败"
-#: disk-utils/sfdisk.c:994
+#: disk-utils/sfdisk.c:993
#, c-format
msgid "%s: no partition table found"
msgstr "%s:找不到分区表"
-#: disk-utils/sfdisk.c:998
+#: disk-utils/sfdisk.c:997
#, c-format
msgid "%s: partition %zu: partition table contains only %zu partitions"
msgstr "%s:分区 %zu:分区表中只包含 %zu 个分区"
-#: disk-utils/sfdisk.c:1001
+#: disk-utils/sfdisk.c:1000
#, c-format
msgid "%s: partition %zu: partition is unused"
msgstr "%s: 分区 %zu: 分区未使用"
-#: disk-utils/sfdisk.c:1020 disk-utils/sfdisk.c:1084 disk-utils/sfdisk.c:1139
-#: disk-utils/sfdisk.c:1195
+#: disk-utils/sfdisk.c:1019 disk-utils/sfdisk.c:1083 disk-utils/sfdisk.c:1138
+#: disk-utils/sfdisk.c:1194
msgid "no partition number specified"
msgstr "未指定分区号"
-#: disk-utils/sfdisk.c:1026 disk-utils/sfdisk.c:1090 disk-utils/sfdisk.c:1145
-#: disk-utils/sfdisk.c:1201
+#: disk-utils/sfdisk.c:1025 disk-utils/sfdisk.c:1089 disk-utils/sfdisk.c:1144
+#: disk-utils/sfdisk.c:1200
msgid "unexpected arguments"
msgstr "参数异常"
-#: disk-utils/sfdisk.c:1041
+#: disk-utils/sfdisk.c:1040
#, c-format
msgid "%s: partition %zu: failed to get partition type"
msgstr "%s: 分区 %zu:获取分区类型失败"
-#: disk-utils/sfdisk.c:1060
+#: disk-utils/sfdisk.c:1059
#, c-format
msgid "failed to parse %s partition type '%s'"
msgstr "解析 %s 的分区类型“%s”失败"
-#: disk-utils/sfdisk.c:1064
+#: disk-utils/sfdisk.c:1063
#, c-format
msgid "%s: partition %zu: failed to set partition type"
msgstr "%s: 分区 %zu: 设置分区类型失败"
-#: disk-utils/sfdisk.c:1102
+#: disk-utils/sfdisk.c:1101
#, c-format
msgid "%s: partition %zu: failed to get partition UUID"
msgstr "%s: 分区 %zu: 获取分区 UUID 失败"
-#: disk-utils/sfdisk.c:1115 disk-utils/sfdisk.c:1170 disk-utils/sfdisk.c:1224
+#: disk-utils/sfdisk.c:1114 disk-utils/sfdisk.c:1169 disk-utils/sfdisk.c:1223
msgid "failed to allocate partition object"
msgstr "分配分区对象失败"
-#: disk-utils/sfdisk.c:1119
+#: disk-utils/sfdisk.c:1118
#, c-format
msgid "%s: partition %zu: failed to set partition UUID"
msgstr "%s: 分区 %zu: 设置分区 UUID 失败"
-#: disk-utils/sfdisk.c:1157
+#: disk-utils/sfdisk.c:1156
#, c-format
msgid "%s: partition %zu: failed to get partition name"
msgstr "%s: 分区 %zu: 获取分区名失败"
-#: disk-utils/sfdisk.c:1174
+#: disk-utils/sfdisk.c:1173
#, c-format
msgid "%s: partition %zu: failed to set partition name"
msgstr "%s: 分区 %zu: 设置分区名失败"
-#: disk-utils/sfdisk.c:1228
+#: disk-utils/sfdisk.c:1227
#, c-format
msgid "%s: partition %zu: failed to set partition attributes"
msgstr "%s: 分区 %zu: 设置分区属性失败"
-#: disk-utils/sfdisk.c:1271
+#: disk-utils/sfdisk.c:1270
msgid " Commands:\n"
msgstr " 命令:\n"
-#: disk-utils/sfdisk.c:1273
+#: disk-utils/sfdisk.c:1272
msgid " write write table to disk and exit\n"
msgstr " write 将分区表写入磁盘并退出\n"
-#: disk-utils/sfdisk.c:1274
+#: disk-utils/sfdisk.c:1273
msgid " quit show new situation and wait for user's feedback before write\n"
msgstr " quit 显示新状况并等待用户反馈后再写入\n"
-#: disk-utils/sfdisk.c:1275
+#: disk-utils/sfdisk.c:1274
msgid " abort exit sfdisk shell\n"
msgstr " abort 退出 sfdisk shell\n"
-#: disk-utils/sfdisk.c:1276
+#: disk-utils/sfdisk.c:1275
msgid " print display the partition table\n"
msgstr " print 显示分区表\n"
-#: disk-utils/sfdisk.c:1277
+#: disk-utils/sfdisk.c:1276
msgid " help show this help text\n"
msgstr " help 显示帮助并退出\n"
-#: disk-utils/sfdisk.c:1279
+#: disk-utils/sfdisk.c:1278
msgid " Ctrl-D the same as 'quit'\n"
msgstr " Ctrl-D 同“quit”\n"
-#: disk-utils/sfdisk.c:1283
+#: disk-utils/sfdisk.c:1282
msgid " Input format:\n"
msgstr " 输入格式:\n"
-#: disk-utils/sfdisk.c:1285
+#: disk-utils/sfdisk.c:1284
msgid " <start>, <size>, <type>, <bootable>\n"
msgstr " <起点>, <大小>, <类型>, <可启动>\n"
-#: disk-utils/sfdisk.c:1288
+#: disk-utils/sfdisk.c:1287
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"
@@ -4088,7 +4135,7 @@ msgstr ""
" <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n"
" 默认为第一处可用空间。\n"
-#: disk-utils/sfdisk.c:1293
+#: disk-utils/sfdisk.c:1292
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"
@@ -4098,68 +4145,68 @@ msgstr ""
" <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n"
" 默认为所有可用空间。\n"
-#: disk-utils/sfdisk.c:1298
+#: disk-utils/sfdisk.c:1297
msgid " <type> The partition type. Default is a Linux data partition.\n"
msgstr " <类型> 分区类型。默认为 Linux 数据分区。\n"
-#: disk-utils/sfdisk.c:1299
+#: disk-utils/sfdisk.c:1298
msgid " MBR: hex or L,S,E,X shortcuts.\n"
msgstr " MBR:hex 或 L,S,E,X 快捷方式。\n"
-#: disk-utils/sfdisk.c:1300
+#: disk-utils/sfdisk.c:1299
msgid " GPT: UUID or L,S,H shortcuts.\n"
msgstr " GPT:UUID 或 L,S,H 快捷方式。\n"
-#: disk-utils/sfdisk.c:1303
+#: disk-utils/sfdisk.c:1302
msgid " <bootable> Use '*' to mark an MBR partition as bootable.\n"
msgstr " <可启动> 使用“*”将 MBR 分区标记为 可启动。\n"
-#: disk-utils/sfdisk.c:1307
+#: disk-utils/sfdisk.c:1306
msgid " Example:\n"
msgstr "示例:\n"
-#: disk-utils/sfdisk.c:1309
+#: disk-utils/sfdisk.c:1308
msgid " , 4G Creates a 4GiB partition at default start offset.\n"
msgstr " , 4G 在默认起始偏移位置创建一个 4GiB 分区。\n"
-#: disk-utils/sfdisk.c:1341 sys-utils/dmesg.c:1453
+#: disk-utils/sfdisk.c:1340 sys-utils/dmesg.c:1556
msgid "unsupported command"
msgstr "不支持的命令"
-#: disk-utils/sfdisk.c:1343
+#: disk-utils/sfdisk.c:1342
#, c-format
msgid "line %d: unsupported command"
msgstr "第 %d 行:不支持的命令"
-#: disk-utils/sfdisk.c:1489
+#: disk-utils/sfdisk.c:1463
#, 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:1537
+#: disk-utils/sfdisk.c:1511
msgid "failed to allocate partition name"
msgstr "分配分区名失败"
-#: disk-utils/sfdisk.c:1578
+#: disk-utils/sfdisk.c:1552
msgid "failed to allocate script handler"
msgstr "分配脚本处理程序失败"
-#: disk-utils/sfdisk.c:1594
+#: disk-utils/sfdisk.c:1568
#, c-format
msgid "%s: cannot modify partition %d: no partition table was found"
msgstr "%s:无法修改分区 %d:未找到分区表"
-#: disk-utils/sfdisk.c:1599
+#: disk-utils/sfdisk.c:1573
#, c-format
msgid "%s: cannot modify partition %d: partition table contains only %zu partitions"
msgstr "%s: 无法修改分区 %d: 分区表只包含 %zu 个分区"
-#: disk-utils/sfdisk.c:1605
+#: disk-utils/sfdisk.c:1579
#, c-format
msgid "warning: %s: partition %d is not defined yet"
msgstr "警告:%s: 分区 %d 尚未定义"
-#: disk-utils/sfdisk.c:1623
+#: disk-utils/sfdisk.c:1597
#, c-format
msgid ""
"\n"
@@ -4168,11 +4215,11 @@ msgstr ""
"\n"
"欢迎使用 sfdisk (%s)。"
-#: disk-utils/sfdisk.c:1631
+#: disk-utils/sfdisk.c:1605
msgid "Checking that no-one is using this disk right now ..."
msgstr "请检查现在是不是有人在使用此磁盘..."
-#: disk-utils/sfdisk.c:1634
+#: disk-utils/sfdisk.c:1608
msgid ""
" FAILED\n"
"\n"
@@ -4180,7 +4227,7 @@ msgstr ""
" 失败\n"
"\n"
-#: disk-utils/sfdisk.c:1637
+#: disk-utils/sfdisk.c:1611
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"
@@ -4190,11 +4237,11 @@ msgstr ""
"请卸载此磁盘上所有的文件系统,并关闭(swapoff)上面的交换分区。\n"
"可使用 --no-reread 标志阻止此检查。\n"
-#: disk-utils/sfdisk.c:1642
+#: disk-utils/sfdisk.c:1616
msgid "Use the --force flag to overrule all checks."
msgstr "使用 --force 标志否决所有检查。"
-#: disk-utils/sfdisk.c:1644
+#: disk-utils/sfdisk.c:1618
msgid ""
" OK\n"
"\n"
@@ -4202,7 +4249,7 @@ msgstr ""
" 好的\n"
"\n"
-#: disk-utils/sfdisk.c:1656
+#: disk-utils/sfdisk.c:1630
msgid ""
"\n"
"Old situation:"
@@ -4210,7 +4257,7 @@ msgstr ""
"\n"
"旧状况:"
-#: disk-utils/sfdisk.c:1674
+#: disk-utils/sfdisk.c:1648
#, c-format
msgid ""
"\n"
@@ -4222,7 +4269,7 @@ msgstr ""
"sfdisk 即将创建一个新的磁盘标签“%s”。\n"
"在定义第一个分区之前使用“label: <名字>”可覆盖默认值。"
-#: disk-utils/sfdisk.c:1677
+#: disk-utils/sfdisk.c:1651
msgid ""
"\n"
"Type 'help' to get more information.\n"
@@ -4230,32 +4277,32 @@ msgstr ""
"\n"
"请执行“%s --help”了解更多信息。\n"
-#: disk-utils/sfdisk.c:1695
+#: disk-utils/sfdisk.c:1669
msgid "All partitions used."
msgstr "所有分区均已使用。"
-#: disk-utils/sfdisk.c:1723
+#: disk-utils/sfdisk.c:1697
msgid "Done.\n"
msgstr "完成。\n"
-#: disk-utils/sfdisk.c:1735
+#: disk-utils/sfdisk.c:1709
msgid "Ignoring partition."
msgstr "忽略分区。"
-#: disk-utils/sfdisk.c:1744 disk-utils/sfdisk.c:1804
+#: disk-utils/sfdisk.c:1718 disk-utils/sfdisk.c:1778
msgid "Failed to apply script headers, disk label not created."
msgstr "无法应用脚本标头(header),未创建磁盘标签。"
-#: disk-utils/sfdisk.c:1763
+#: disk-utils/sfdisk.c:1737
#, fuzzy, c-format
msgid "Failed to add #%d partition"
msgstr "添加分区失败"
-#: disk-utils/sfdisk.c:1786
+#: disk-utils/sfdisk.c:1760
msgid "Script header accepted."
msgstr "已接受脚本标头(header)。"
-#: disk-utils/sfdisk.c:1811
+#: disk-utils/sfdisk.c:1785
msgid ""
"\n"
"New situation:"
@@ -4263,15 +4310,15 @@ msgstr ""
"\n"
"新状况:"
-#: disk-utils/sfdisk.c:1821
+#: disk-utils/sfdisk.c:1795
msgid "Do you want to write this to disk?"
msgstr "您想写入该磁盘吗?"
-#: disk-utils/sfdisk.c:1834
+#: disk-utils/sfdisk.c:1808
msgid "Leaving.\n"
msgstr "离开中。\n"
-#: disk-utils/sfdisk.c:1847
+#: disk-utils/sfdisk.c:1822
#, c-format
msgid ""
" %1$s [options] <dev> [[-N] <part>]\n"
@@ -4280,232 +4327,220 @@ msgstr ""
" %1$s [选项] <设备> [[-N] <分区>]\n"
" %1$s [选项] <命令>\n"
-#: disk-utils/sfdisk.c:1853 sys-utils/blkzone.c:303
-msgid ""
-"\n"
-"Commands:\n"
-msgstr ""
-"\n"
-"命令:\n"
-
-#: disk-utils/sfdisk.c:1854
+#: disk-utils/sfdisk.c:1829
msgid " -A, --activate <dev> [<part> ...] list or set bootable MBR partitions\n"
msgstr " -A, --activate <设备> [<分区> ...] 列出或设置可启动的 MBR 分区\n"
-#: disk-utils/sfdisk.c:1855
+#: disk-utils/sfdisk.c:1830
msgid " -d, --dump <dev> dump partition table (usable for later input)\n"
msgstr " -d, --dump <设备> 转储分区表(用于后续输入)\n"
-#: disk-utils/sfdisk.c:1856
+#: disk-utils/sfdisk.c:1831
msgid " -J, --json <dev> dump partition table in JSON format\n"
msgstr " -J, --json <设备> 以 JSON 格式转储分区表\n"
-#: disk-utils/sfdisk.c:1857
+#: disk-utils/sfdisk.c:1832
msgid " -g, --show-geometry [<dev> ...] list geometry of all or specified devices\n"
msgstr " -g, --show-geometry [<设备> ...] 列出所有或指定设备的几何属性\n"
-#: disk-utils/sfdisk.c:1858
+#: disk-utils/sfdisk.c:1833
msgid " -l, --list [<dev> ...] list partitions of each device\n"
msgstr " -l, --list [<设备> ...] 列出每台设备上的分区\n"
-#: disk-utils/sfdisk.c:1859
+#: disk-utils/sfdisk.c:1834
msgid " -F, --list-free [<dev> ...] list unpartitioned free areas of each device\n"
msgstr " -F, --list-free [<设备> ...] 列出每台设备上的未分区空间\n"
-#: disk-utils/sfdisk.c:1860
+#: disk-utils/sfdisk.c:1835
msgid " -r, --reorder <dev> fix partitions order (by start offset)\n"
msgstr " -r, --reorder <设备> (通过起始偏移量)修复分区顺序\n"
-#: disk-utils/sfdisk.c:1861
+#: disk-utils/sfdisk.c:1836
msgid " -s, --show-size [<dev> ...] list sizes of all or specified devices\n"
msgstr " -s, --show-size [<设备> ...] 列出所有或指定设备的大小\n"
-#: disk-utils/sfdisk.c:1862
+#: disk-utils/sfdisk.c:1837
msgid " -T, --list-types print the recognized types (see -X)\n"
msgstr " -T, --list-types 打印识别的类型(见 -X)\n"
-#: disk-utils/sfdisk.c:1863
+#: disk-utils/sfdisk.c:1838
msgid " -V, --verify [<dev> ...] test whether partitions seem correct\n"
msgstr " -V, --verify [<设备> ...] 测试分区是否正确\n"
-#: disk-utils/sfdisk.c:1864
+#: disk-utils/sfdisk.c:1839
msgid " --delete <dev> [<part> ...] delete all or specified partitions\n"
msgstr " --delete <设备> [<分区> ...] 删除所有或指定分区\n"
-#: disk-utils/sfdisk.c:1867
+#: disk-utils/sfdisk.c:1842
msgid " --part-label <dev> <part> [<str>] print or change partition label\n"
msgstr " --part-label <设备> <分区> [<字符串>] 打印或更改分区标签\n"
-#: disk-utils/sfdisk.c:1868
+#: disk-utils/sfdisk.c:1843
msgid " --part-type <dev> <part> [<type>] print or change partition type\n"
msgstr " --part-type <设备> <分区> [<类型>] 打印或更改分区类型\n"
-#: disk-utils/sfdisk.c:1869
+#: disk-utils/sfdisk.c:1844
msgid " --part-uuid <dev> <part> [<uuid>] print or change partition uuid\n"
msgstr " --part-uuid <设备> <分区> [<uuid>] 打印或更改分区 uuid\n"
-#: disk-utils/sfdisk.c:1870
+#: disk-utils/sfdisk.c:1845
msgid " --part-attrs <dev> <part> [<str>] print or change partition attributes\n"
msgstr " --part-attrs <设备> <分区> [<字符串>] 打印或更改分区属性\n"
-#: disk-utils/sfdisk.c:1873
+#: disk-utils/sfdisk.c:1848
msgid " <dev> device (usually disk) path\n"
msgstr " <设备> 设备(通常是磁盘)的路径\n"
-#: disk-utils/sfdisk.c:1874
+#: disk-utils/sfdisk.c:1849
msgid " <part> partition number\n"
msgstr " <分区> 分区号\n"
-#: disk-utils/sfdisk.c:1875
+#: disk-utils/sfdisk.c:1850
msgid " <type> partition type, GUID for GPT, hex for MBR\n"
msgstr " <类型> 分区类型,GUID 对应 GPT,hex 对应 MBR\n"
-#: disk-utils/sfdisk.c:1878
+#: disk-utils/sfdisk.c:1853
msgid " -a, --append append partitions to existing partition table\n"
msgstr " -a, --append 将分区附加到已有分区表\n"
-#: disk-utils/sfdisk.c:1879
+#: disk-utils/sfdisk.c:1854
msgid " -b, --backup backup partition table sectors (see -O)\n"
msgstr " -b, --backup 备份分区表扇区(见 -O)\n"
-#: disk-utils/sfdisk.c:1880
+#: disk-utils/sfdisk.c:1855
msgid " --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
-#: disk-utils/sfdisk.c:1881
+#: disk-utils/sfdisk.c:1856
msgid " --move-data[=<typescript>] move partition data after relocation (requires -N)\n"
msgstr " --move-data[=<typescript>] 重新定位后移动分区数据(需要 -N)\n"
-#: disk-utils/sfdisk.c:1882
+#: disk-utils/sfdisk.c:1857
msgid " -f, --force disable all consistency checking\n"
msgstr " -f, --force 禁用所有的一致性检查\n"
-#: disk-utils/sfdisk.c:1883
+#: disk-utils/sfdisk.c:1858
msgid " --color[=<when>] colorize output (auto, always or never)\n"
msgstr " --color[=<何时>] 彩色输出(auto,always 或 never)\n"
-#: disk-utils/sfdisk.c:1886
+#: disk-utils/sfdisk.c:1861
msgid " -N, --partno <num> specify partition number\n"
msgstr " -N, --partno <数字> 指定分区号\n"
-#: disk-utils/sfdisk.c:1887
+#: disk-utils/sfdisk.c:1862
msgid " -n, --no-act do everything except write to device\n"
msgstr " -n, --no-act 不真正执行写入设备\n"
-#: disk-utils/sfdisk.c:1888
+#: disk-utils/sfdisk.c:1863
msgid " --no-reread do not check whether the device is in use\n"
msgstr " --no-reread 不检查设备是否正在使用\n"
-#: disk-utils/sfdisk.c:1889
+#: disk-utils/sfdisk.c:1864
msgid " --no-tell-kernel do not tell kernel about changes\n"
msgstr " --no-tell-kernel 更改而不告诉内核\n"
-#: disk-utils/sfdisk.c:1890
+#: disk-utils/sfdisk.c:1865
msgid " -O, --backup-file <path> override default backup file name\n"
msgstr " -O, --backup-file <路径> 覆盖默认的备份文件名\n"
-#: disk-utils/sfdisk.c:1891
+#: disk-utils/sfdisk.c:1866
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: disk-utils/sfdisk.c:1892
+#: disk-utils/sfdisk.c:1867
msgid " -q, --quiet suppress extra info messages\n"
msgstr " -q, --quiet 禁止输出额外信息\n"
-#: disk-utils/sfdisk.c:1893
+#: disk-utils/sfdisk.c:1868
msgid " -w, --wipe <mode> wipe signatures (auto, always or never)\n"
msgstr " -w, --wipe <模式> 擦除签名(auto, always 或 never)\n"
-#: disk-utils/sfdisk.c:1895
+#: disk-utils/sfdisk.c:1870
msgid " -X, --label <name> specify label type (dos, gpt, ...)\n"
msgstr " -X, --label <名称> 指定标签类型(dos, gpt, ...)\n"
-#: disk-utils/sfdisk.c:1896
+#: disk-utils/sfdisk.c:1871
msgid " -Y, --label-nested <name> specify nested label type (dos, bsd)\n"
msgstr " -Y, --label-nested <名称> 指定嵌套标签类型(dos, bsd)\n"
-#: disk-utils/sfdisk.c:1898
+#: disk-utils/sfdisk.c:1873
msgid " -G, --show-pt-geometry deprecated, alias to --show-geometry\n"
msgstr " -G, --show-pt-geometry 已废弃,同 --show-geometry\n"
-#: disk-utils/sfdisk.c:1899
+#: disk-utils/sfdisk.c:1874
msgid " -L, --Linux deprecated, only for backward compatibility\n"
msgstr " -L, --Linux 已废弃,仅为向后兼容\n"
-#: disk-utils/sfdisk.c:1900
+#: disk-utils/sfdisk.c:1875
msgid " -u, --unit S deprecated, only sector unit is supported\n"
msgstr " -u, --unit S 已废弃,只支持扇区单位\n"
-#: disk-utils/sfdisk.c:1904 login-utils/chfn.c:107 login-utils/chsh.c:84
-msgid " -v, --version output version information and exit\n"
-msgstr " -v, --version 输出版本信息并退出\n"
-
-#: disk-utils/sfdisk.c:2018
+#: disk-utils/sfdisk.c:1993
#, c-format
msgid "%s is deprecated in favour of --part-type"
msgstr "%s 已废弃,请改用 --part-type"
-#: disk-utils/sfdisk.c:2023
+#: disk-utils/sfdisk.c:1998
msgid "--id is deprecated in favour of --part-type"
msgstr "--id 已废弃,请改用 --part-type"
-#: disk-utils/sfdisk.c:2039
+#: disk-utils/sfdisk.c:2014
msgid "--show-pt-geometry is no more implemented. Using --show-geometry."
msgstr "--show-pt-geometry 不再实现。请使用 --show-geometry。"
-#: disk-utils/sfdisk.c:2051
+#: disk-utils/sfdisk.c:2026
msgid "--Linux option is unnecessary and deprecated"
msgstr "--Linux 选项没必要,并且已废弃"
-#: disk-utils/sfdisk.c:2080
+#: disk-utils/sfdisk.c:2055
#, c-format
msgid "unsupported unit '%c'"
msgstr "不支持的单位“%c”"
-#: disk-utils/sfdisk.c:2083 include/c.h:325
+#: disk-utils/sfdisk.c:2058 include/c.h:330
#, c-format
msgid "%s from %s\n"
msgstr "%s,来自 %s\n"
-#: disk-utils/sfdisk.c:2160
+#: disk-utils/sfdisk.c:2135
msgid "--movedata requires -N"
msgstr "--movedata 需要 -N"
-#: disk-utils/swaplabel.c:69
+#: disk-utils/swaplabel.c:74
#, c-format
msgid "failed to parse UUID: %s"
msgstr "解析 UUID 失败:%s"
-#: disk-utils/swaplabel.c:73
+#: disk-utils/swaplabel.c:78
#, c-format
msgid "%s: failed to seek to swap UUID"
msgstr "%s:定位到交换区 UUID 失败"
-#: disk-utils/swaplabel.c:77
+#: disk-utils/swaplabel.c:82
#, c-format
msgid "%s: failed to write UUID"
msgstr "%s:写 UUID 失败"
-#: disk-utils/swaplabel.c:88
+#: disk-utils/swaplabel.c:93
#, c-format
msgid "%s: failed to seek to swap label "
msgstr "%s:无法定位到交换区标签 "
-#: disk-utils/swaplabel.c:95
+#: disk-utils/swaplabel.c:100
#, c-format
msgid "label is too long. Truncating it to '%s'"
msgstr "标签过长。将截短到“%s”"
-#: disk-utils/swaplabel.c:98
+#: disk-utils/swaplabel.c:103
#, c-format
msgid "%s: failed to write label"
msgstr "%s:写标签失败"
-#: disk-utils/swaplabel.c:121
+#: disk-utils/swaplabel.c:127
msgid "Display or change the label or UUID of a swap area.\n"
msgstr "显示或更改交换区的标签或 UUID。\n"
-#: disk-utils/swaplabel.c:124
+#: disk-utils/swaplabel.c:130
msgid ""
" -L, --label <label> specify a new label\n"
" -U, --uuid <uuid> specify a new uuid\n"
@@ -4513,7 +4548,7 @@ msgstr ""
" -L, --label <标签> 指定一个新标签\n"
" -U, --uuid <uuid> 指定一个新 uuid\n"
-#: disk-utils/swaplabel.c:167
+#: disk-utils/swaplabel.c:172
msgid "ignore -U (UUIDs are unsupported)"
msgstr "忽略 -U (不支持 UUID)"
@@ -4522,12 +4557,7 @@ msgstr "忽略 -U (不支持 UUID)"
msgid "Try '%s --help' for more information.\n"
msgstr "请尝试执行“%s --help”了解更多信息。\n"
-#: include/c.h:220
-#, fuzzy, c-format
-msgid "Try '%s -h' for more information.\n"
-msgstr "请尝试执行“%s --help”了解更多信息。\n"
-
-#: include/c.h:318
+#: include/c.h:312
msgid ""
"\n"
"Usage:\n"
@@ -4535,7 +4565,7 @@ msgstr ""
"\n"
"用法:\n"
-#: include/c.h:319
+#: include/c.h:313
msgid ""
"\n"
"Options:\n"
@@ -4543,15 +4573,42 @@ msgstr ""
"\n"
"选项:\n"
-#: include/c.h:321
-msgid " -h, --help display this help and exit\n"
-msgstr " -h, --help 显示此帮助并退出\n"
+#: include/c.h:314
+msgid ""
+"\n"
+"Functions:\n"
+msgstr ""
+"\n"
+"功能:\n"
+
+#: include/c.h:315
+msgid ""
+"\n"
+"Commands:\n"
+msgstr ""
+"\n"
+"命令:\n"
+
+#: include/c.h:316
+#, fuzzy
+msgid ""
+"\n"
+"Available output columns:\n"
+msgstr ""
+"\n"
+"可用的 --list 列:\n"
+
+#: include/c.h:319
+#, fuzzy
+msgid "display this help"
+msgstr " -? 显示此帮助并退出\n"
-#: include/c.h:322
-msgid " -V, --version output version information and exit\n"
-msgstr " -V, --version 输出版本信息并退出\n"
+#: include/c.h:320
+#, fuzzy
+msgid "display version"
+msgstr " -version\n"
-#: include/c.h:323
+#: include/c.h:328
#, c-format
msgid ""
"\n"
@@ -4560,9 +4617,9 @@ msgstr ""
"\n"
"更多信息请参阅 %s。\n"
-#: include/closestream.h:46 include/closestream.h:48 login-utils/vipw.c:274
-#: login-utils/vipw.c:293 sys-utils/rtcwake.c:280 term-utils/setterm.c:809
-#: text-utils/col.c:157
+#: include/closestream.h:46 include/closestream.h:48 login-utils/vipw.c:277
+#: login-utils/vipw.c:296 sys-utils/rtcwake.c:278 term-utils/setterm.c:811
+#: text-utils/col.c:160
msgid "write error"
msgstr "写出错"
@@ -4574,9 +4631,8 @@ msgstr "默认启用颜色"
msgid "colors are disabled by default"
msgstr "默认禁用颜色"
-#: include/env.h:18 lib/pager.c:151 login-utils/login.c:1036
-#: login-utils/login.c:1040 login-utils/su-common.c:520
-#: term-utils/agetty.c:1146
+#: include/env.h:18 lib/pager.c:151 login-utils/login.c:1018
+#: login-utils/login.c:1022 term-utils/agetty.c:1160
#, c-format
msgid "failed to set the %s environment variable"
msgstr "设置环境变量 %s 失败"
@@ -4968,41 +5024,29 @@ msgstr "LANstep"
msgid "BBT"
msgstr "BBT"
-#: lib/blkdev.c:282
+#: lib/blkdev.c:273
#, c-format
msgid "warning: %s is misaligned"
msgstr "警告:%s 未正确对齐"
-#: libfdisk/src/alignment.c:698
-msgid "Calling ioctl() to re-read partition table."
-msgstr "将调用 ioctl() 来重新读分区表。"
-
-#: libfdisk/src/alignment.c:707
-msgid "Re-reading the partition table failed."
-msgstr "重新读取分区表失败。"
-
-#: libfdisk/src/alignment.c:709
-msgid "The kernel still uses the old table. The new table will be used at the next reboot or after you run partprobe(8) or kpartx(8)."
-msgstr "内核仍在使用旧分区表。新分区表将在下次重启或运行 partprobe(8) 或 kpartx(8) 后生效。"
-
-#: libfdisk/src/ask.c:472 libfdisk/src/ask.c:484
+#: libfdisk/src/ask.c:480 libfdisk/src/ask.c:492
#, c-format
msgid "Selected partition %ju"
msgstr "已选择分区 %ju"
-#: libfdisk/src/ask.c:475
+#: libfdisk/src/ask.c:483
msgid "No partition is defined yet!"
msgstr "还没有定义分区!"
-#: libfdisk/src/ask.c:487
+#: libfdisk/src/ask.c:495
msgid "No free partition available!"
msgstr "无空闲分区可用!"
-#: libfdisk/src/ask.c:497
+#: libfdisk/src/ask.c:505
msgid "Partition number"
msgstr "分区号"
-#: libfdisk/src/ask.c:994
+#: libfdisk/src/ask.c:1002
#, c-format
msgid "Created a new partition %d of type '%s' and of size %s."
msgstr "创建了一个新分区 %d,类型为“%s”,大小为 %s。"
@@ -5017,15 +5061,15 @@ msgstr "分区 %zd:无效的起始扇区 0。"
msgid "There is no *BSD partition on %s."
msgstr "%s 上没有 *BSD 分区。"
-#: libfdisk/src/bsd.c:258 libfdisk/src/dos.c:964
+#: libfdisk/src/bsd.c:258 libfdisk/src/dos.c:982
msgid "First cylinder"
msgstr "第一个柱面"
-#: libfdisk/src/bsd.c:291 libfdisk/src/dos.c:1195
+#: libfdisk/src/bsd.c:291 libfdisk/src/dos.c:1213
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:1200 libfdisk/src/gpt.c:2337
+#: libfdisk/src/bsd.c:296 libfdisk/src/dos.c:1218 libfdisk/src/gpt.c:2358
msgid "Last sector, +sectors or +size{K,M,G,T,P}"
msgstr "上个扇区,+sectors 或 +size{K,M,G,T,P}"
@@ -5046,7 +5090,7 @@ msgstr "磁盘"
msgid "Packname"
msgstr "包名"
-#: libfdisk/src/bsd.c:462 libfdisk/src/sun.c:1120
+#: libfdisk/src/bsd.c:462 libfdisk/src/sun.c:1101
msgid "Flags"
msgstr "标志"
@@ -5074,16 +5118,16 @@ msgstr "磁道/柱面"
msgid "Sectors/Cylinder"
msgstr "扇区/柱面"
-#: libfdisk/src/bsd.c:490 libfdisk/src/bsd.c:1020 libfdisk/src/dos.c:2393
-#: libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:199 libfdisk/src/sun.c:1116
+#: libfdisk/src/bsd.c:490 libfdisk/src/bsd.c:1020 libfdisk/src/dos.c:2428
+#: libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:189 libfdisk/src/sun.c:1097
msgid "Cylinders"
msgstr "柱面"
-#: libfdisk/src/bsd.c:495 libfdisk/src/sun.c:763
+#: libfdisk/src/bsd.c:495 libfdisk/src/sun.c:748
msgid "Rpm"
msgstr "转每分"
-#: libfdisk/src/bsd.c:500 libfdisk/src/sgi.c:291 libfdisk/src/sun.c:783
+#: libfdisk/src/bsd.c:500 libfdisk/src/sgi.c:291 libfdisk/src/sun.c:768
msgid "Interleave"
msgstr "交错"
@@ -5176,7 +5220,7 @@ msgstr "磁盘标签已写入 %s。(不要忘了也写入 %s 磁盘标签。)"
msgid "Disklabel written to %s."
msgstr "磁盘标签已写入 %s。"
-#: libfdisk/src/bsd.c:911 libfdisk/src/context.c:645
+#: libfdisk/src/bsd.c:911 libfdisk/src/context.c:686
msgid "Syncing disks."
msgstr "正在同步磁盘。"
@@ -5205,22 +5249,54 @@ msgstr "Bsize"
msgid "Cpg"
msgstr "Cpg"
-#: libfdisk/src/context.c:639
+#: libfdisk/src/context.c:680
#, c-format
msgid "%s: close device failed"
msgstr "%s:关闭设备失败"
-#: libfdisk/src/context.c:820
+#: libfdisk/src/context.c:754
+msgid "Calling ioctl() to re-read partition table."
+msgstr "将调用 ioctl() 来重新读分区表。"
+
+#: libfdisk/src/context.c:763
+msgid "Re-reading the partition table failed."
+msgstr "重新读取分区表失败。"
+
+#: libfdisk/src/context.c:765
+msgid "The kernel still uses the old table. The new table will be used at the next reboot or after you run partprobe(8) or kpartx(8)."
+msgstr "内核仍在使用旧分区表。新分区表将在下次重启或运行 partprobe(8) 或 kpartx(8) 后生效。"
+
+#: libfdisk/src/context.c:850
+#, fuzzy, c-format
+msgid "Failed to remove partition %zu from system"
+msgstr "移除分区失败"
+
+#: libfdisk/src/context.c:858
+#, fuzzy, c-format
+msgid "Failed to update system information about partition %zu"
+msgstr "打印某个分区的相关信息"
+
+#: libfdisk/src/context.c:866
+#, fuzzy, c-format
+msgid "Failed to add partition %zu to system"
+msgstr "添加分区失败"
+
+#: libfdisk/src/context.c:872
+#, fuzzy
+msgid "The kernel still uses the old partitions. The new table will be used at the next reboot. "
+msgstr "内核仍在使用旧分区表。新分区表将在下次重启或运行 partprobe(8) 或 kpartx(8) 后生效。"
+
+#: libfdisk/src/context.c:1082
msgid "cylinder"
msgid_plural "cylinders"
msgstr[0] "柱面"
-#: libfdisk/src/context.c:821
+#: libfdisk/src/context.c:1083
msgid "sector"
msgid_plural "sectors"
msgstr[0] "扇区"
-#: libfdisk/src/context.c:1124
+#: libfdisk/src/context.c:1386
msgid "Incomplete geometry setting."
msgstr "不完整的几何属性设置。"
@@ -5228,305 +5304,314 @@ msgstr "不完整的几何属性设置。"
msgid "All primary partitions have been defined already."
msgstr "已经定义了所有主分区。"
-#: libfdisk/src/dos.c:267
+#: libfdisk/src/dos.c:216
+#, fuzzy
+msgid "Primary partition not available."
+msgstr "无空闲分区可用!"
+
+#: libfdisk/src/dos.c:270
#, c-format
msgid "Failed to read extended partition table (offset=%ju)"
msgstr "读取扩展分区表失败(偏移=%ju)"
-#: libfdisk/src/dos.c:337
+#: libfdisk/src/dos.c:340
msgid "You can set geometry from the extra functions menu."
msgstr "您可以从 更多功能 菜单获取几何属性。"
-#: libfdisk/src/dos.c:340
+#: libfdisk/src/dos.c:343
msgid "DOS-compatible mode is deprecated."
msgstr "DOS 兼容模式已废弃。"
-#: libfdisk/src/dos.c:344
+#: libfdisk/src/dos.c:347
msgid "The device presents a logical sector size that is smaller than the physical sector size. Aligning to a physical sector (or optimal I/O) size boundary is recommended, or performance may be impacted."
msgstr "设备上存在一个小于物理扇区尺寸的逻辑扇区尺寸。建议您对齐到物理扇区(或最佳 I/O)尺寸边界,否则性能可能受影响。"
-#: libfdisk/src/dos.c:350
+#: libfdisk/src/dos.c:353
msgid "Cylinders as display units are deprecated."
msgstr "以柱面为显示单位的方式已废弃。"
-#: libfdisk/src/dos.c:357
+#: libfdisk/src/dos.c:360
#, fuzzy, c-format
msgid "The size of this disk is %s (%ju bytes). DOS partition table format cannot be used on drives for volumes larger than %lu bytes for %lu-byte sectors. Use GUID partition table format (GPT)."
msgstr "该磁盘的大小为 %s (%ju 个字节)。DOS 分区表不能用于卷容量大于 %lu 字节,%lu 字节扇区的驱动器。请使用 GUID 分区表格式(GPT)。"
-#: libfdisk/src/dos.c:516
+#: libfdisk/src/dos.c:534
msgid "Bad offset in primary extended partition."
msgstr "主扩展分区中的偏移错误。"
-#: libfdisk/src/dos.c:530
+#: libfdisk/src/dos.c:548
#, c-format
msgid "Omitting partitions after #%zu. They will be deleted if you save this partition table."
msgstr "警告:将忽略 #%zu 后的扇区。如果您保存此分区表,它们会被删除。"
-#: libfdisk/src/dos.c:563
+#: libfdisk/src/dos.c:581
#, c-format
msgid "Extra link pointer in partition table %zu."
msgstr "在分区表 %zu 中有额外链接指针。"
-#: libfdisk/src/dos.c:571
+#: libfdisk/src/dos.c:589
#, c-format
msgid "Ignoring extra data in partition table %zu."
msgstr "将忽略分区表 %zu 中的额外数据。"
-#: libfdisk/src/dos.c:627
+#: libfdisk/src/dos.c:645
#, c-format
msgid "omitting empty partition (%zu)"
msgstr "将忽略空分区(%zu)"
-#: libfdisk/src/dos.c:687
+#: libfdisk/src/dos.c:705
#, c-format
msgid "Created a new DOS disklabel with disk identifier 0x%08x."
msgstr "创建了一个磁盘标识符为 0x%08x 的新 DOS 磁盘标签。"
-#: libfdisk/src/dos.c:708
+#: libfdisk/src/dos.c:726
msgid "Enter the new disk identifier"
msgstr "输入新磁盘标识符"
-#: libfdisk/src/dos.c:715
+#: libfdisk/src/dos.c:733
msgid "Incorrect value."
msgstr "无效的值。"
-#: libfdisk/src/dos.c:724
+#: libfdisk/src/dos.c:742
#, c-format
msgid "Disk identifier changed from 0x%08x to 0x%08x."
msgstr "磁盘标识从 0x%08x 改为 0x%08x。"
-#: libfdisk/src/dos.c:820
+#: libfdisk/src/dos.c:838
#, c-format
msgid "Ignoring extra extended partition %zu"
msgstr "将忽略额外的扩展分区 %zu"
-#: libfdisk/src/dos.c:834
+#: libfdisk/src/dos.c:852
#, c-format
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:951
+#: libfdisk/src/dos.c:969
#, c-format
msgid "Start sector %ju out of range."
msgstr "起始扇区 %ju 超出范围。"
-#: libfdisk/src/dos.c:1058 libfdisk/src/gpt.c:2217 libfdisk/src/sgi.c:838
-#: libfdisk/src/sun.c:520
+#: libfdisk/src/dos.c:1076 libfdisk/src/gpt.c:2232 libfdisk/src/sgi.c:838
+#: libfdisk/src/sun.c:505
#, c-format
msgid "Partition %zu is already defined. Delete it before re-adding it."
msgstr "分区 %zu 已经定义过。请删除后再重新添加它。"
-#: libfdisk/src/dos.c:1128
+#: libfdisk/src/dos.c:1146
#, c-format
msgid "Sector %llu is already allocated."
msgstr "扇区 %llu 已经分配."
-#: libfdisk/src/dos.c:1167 libfdisk/src/gpt.c:2226
+#: libfdisk/src/dos.c:1185 libfdisk/src/gpt.c:2241
msgid "No free sectors available."
msgstr "无空闲扇区可用。"
-#: libfdisk/src/dos.c:1323
+#: libfdisk/src/dos.c:1341
#, c-format
msgid "Adding logical partition %zu"
msgstr "添加逻辑分区 %zu"
-#: libfdisk/src/dos.c:1354
+#: libfdisk/src/dos.c:1372
#, c-format
msgid "Partition %zu: contains sector 0"
msgstr "分区 %zu:包含扇区 0"
-#: libfdisk/src/dos.c:1356
+#: libfdisk/src/dos.c:1374
#, c-format
msgid "Partition %zu: head %d greater than maximum %d"
msgstr "分区 %zu:磁头 %d 大于最大值 %d"
-#: libfdisk/src/dos.c:1359
+#: libfdisk/src/dos.c:1377
#, c-format
msgid "Partition %zu: sector %d greater than maximum %llu"
msgstr "分区 %zu:扇区 %d 大于最大值 %llu"
-#: libfdisk/src/dos.c:1362
+#: libfdisk/src/dos.c:1380
#, c-format
msgid "Partition %zu: cylinder %d greater than maximum %llu"
msgstr "分区 %zu:柱面 %d 大于最大值 %llu"
-#: libfdisk/src/dos.c:1368
+#: libfdisk/src/dos.c:1386
#, c-format
msgid "Partition %zu: previous sectors %u disagrees with total %u"
msgstr "分区 %zu:之前的扇区数 %u 与总数 %u 不符"
-#: libfdisk/src/dos.c:1421
+#: libfdisk/src/dos.c:1439
#, 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:1432
+#: libfdisk/src/dos.c:1450
#, 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:1441
+#: libfdisk/src/dos.c:1459
#, c-format
msgid "Partition %zu: does not end on cylinder boundary."
msgstr "分区 %zu 未结束在柱面边界上。"
-#: libfdisk/src/dos.c:1468
+#: libfdisk/src/dos.c:1486
#, c-format
msgid "Partition %zu: bad start-of-data."
msgstr "分区 %zu:数据起点错误。"
-#: libfdisk/src/dos.c:1481
+#: libfdisk/src/dos.c:1499
#, c-format
msgid "Partition %zu: overlaps partition %zu."
msgstr "分区 %zu:与 分区 %zu 重叠。"
-#: libfdisk/src/dos.c:1509
+#: libfdisk/src/dos.c:1527
#, c-format
msgid "Partition %zu: empty."
msgstr "分区 %zu:空分区。"
-#: libfdisk/src/dos.c:1514
+#: libfdisk/src/dos.c:1532
#, c-format
msgid "Logical partition %zu: not entirely in partition %zu."
msgstr "逻辑分区 %zu:没有完全在分区 %zu 中。"
-#: libfdisk/src/dos.c:1522
+#: libfdisk/src/dos.c:1540
#, c-format
msgid "Total allocated sectors %llu greater than the maximum %llu."
msgstr "分配的总扇区数 %llu 大于最大值 %llu。"
-#: libfdisk/src/dos.c:1525
+#: libfdisk/src/dos.c:1543
#, c-format
msgid "Remaining %lld unallocated %ld-byte sectors."
msgstr "剩余 %lld 未分配的 %ld字节 扇区。"
-#: libfdisk/src/dos.c:1573 libfdisk/src/dos.c:2028
+#: libfdisk/src/dos.c:1601 libfdisk/src/dos.c:1616 libfdisk/src/dos.c:2063
msgid "Extended partition already exists."
msgstr "扩展分区已存在。"
-#: libfdisk/src/dos.c:1635
+#: libfdisk/src/dos.c:1631
+msgid "Extended partition does not exists. Failed to add logical partition."
+msgstr ""
+
+#: libfdisk/src/dos.c:1667
msgid "The maximum number of partitions has been created."
msgstr "已创建分区达到最大数量。"
-#: libfdisk/src/dos.c:1647
+#: libfdisk/src/dos.c:1681
msgid "All primary partitions are in use."
msgstr "所有主分区都在使用中。"
-#: libfdisk/src/dos.c:1649 libfdisk/src/dos.c:1660
+#: libfdisk/src/dos.c:1683 libfdisk/src/dos.c:1694
msgid "All space for primary partitions is in use."
msgstr "所有主分区的空间都在使用中。"
#. TRANSLATORS: Try to keep this within 80 characters.
-#: libfdisk/src/dos.c:1663
+#: libfdisk/src/dos.c:1697
msgid "To create more partitions, first replace a primary with an extended partition."
msgstr "要创建更多分区,请先将一个主分区替换为扩展分区。"
-#: libfdisk/src/dos.c:1668
+#: libfdisk/src/dos.c:1702
msgid "All logical partitions are in use. Adding a primary partition."
msgstr "所有逻辑分区都在使用中。将添加一个主分区。"
-#: libfdisk/src/dos.c:1690
+#: libfdisk/src/dos.c:1724
msgid "Partition type"
msgstr "分区类型"
-#: libfdisk/src/dos.c:1694
+#: libfdisk/src/dos.c:1728
#, c-format
msgid "%zu primary, %d extended, %zu free"
msgstr "%zu个主分区,%d个扩展分区,%zu空闲"
-#: libfdisk/src/dos.c:1699
+#: libfdisk/src/dos.c:1733
msgid "primary"
msgstr "主分区"
-#: libfdisk/src/dos.c:1701
+#: libfdisk/src/dos.c:1735
msgid "extended"
msgstr "扩展分区"
-#: libfdisk/src/dos.c:1701
+#: libfdisk/src/dos.c:1735
msgid "container for logical partitions"
msgstr "逻辑分区容器"
-#: libfdisk/src/dos.c:1703
+#: libfdisk/src/dos.c:1737
msgid "logical"
msgstr "逻辑分区"
-#: libfdisk/src/dos.c:1703
+#: libfdisk/src/dos.c:1737
msgid "numbered from 5"
msgstr "从 5 开始编号"
-#: libfdisk/src/dos.c:1741
+#: libfdisk/src/dos.c:1776
#, c-format
msgid "Invalid partition type `%c'."
msgstr "无效的分区类型“%c”。"
-#: libfdisk/src/dos.c:1759
+#: libfdisk/src/dos.c:1794
#, c-format
msgid "Cannot write sector %jd: seek failed"
msgstr "写扇区 %jd 失败:定位失败"
-#: libfdisk/src/dos.c:1919 libfdisk/src/gpt.c:1138
+#: libfdisk/src/dos.c:1954 libfdisk/src/gpt.c:1148
msgid "Disk identifier"
msgstr "磁盘标识符"
-#: libfdisk/src/dos.c:2033
+#: libfdisk/src/dos.c:2068
msgid "Type 0 means free space to many systems. Having partitions of type 0 is probably unwise."
msgstr "很多系统将类型 0 视为空闲空间。不建议设置类型为 0 的分区。"
-#: libfdisk/src/dos.c:2038
+#: libfdisk/src/dos.c:2073
msgid "Cannot change type of the extended partition which is already used by logical partitions. Delete logical partitions first."
msgstr "无法更改已被逻辑分区使用的扩展分区的类型。请先删除逻辑分区。"
-#: libfdisk/src/dos.c:2224 libfdisk/src/gpt.c:2922
+#: libfdisk/src/dos.c:2259 libfdisk/src/gpt.c:2948
msgid "Nothing to do. Ordering is correct already."
msgstr "无须操作。顺序已经是正确的了。"
-#: libfdisk/src/dos.c:2279
+#: libfdisk/src/dos.c:2314
#, c-format
msgid "Partition %zu: no data area."
msgstr "分区 %zu:无数据区。"
-#: libfdisk/src/dos.c:2312
+#: libfdisk/src/dos.c:2347
msgid "New beginning of data"
msgstr "新数据起点"
-#: libfdisk/src/dos.c:2368
+#: libfdisk/src/dos.c:2403
#, c-format
msgid "Partition %zu: is an extended partition."
msgstr "分区 %zu:是一个扩展分区。"
-#: libfdisk/src/dos.c:2374
+#: libfdisk/src/dos.c:2409
#, c-format
msgid "The bootable flag on partition %zu is enabled now."
msgstr "分区 %zu 的 可启动 标志已启用。"
-#: libfdisk/src/dos.c:2375
+#: libfdisk/src/dos.c:2410
#, c-format
msgid "The bootable flag on partition %zu is disabled now."
msgstr "分区 %zu 的 可启动 标志已禁用。"
-#: libfdisk/src/dos.c:2388 libfdisk/src/gpt.c:3012 libfdisk/src/sgi.c:1152
-#: libfdisk/src/sun.c:1112
+#: libfdisk/src/dos.c:2423 libfdisk/src/gpt.c:3038 libfdisk/src/sgi.c:1152
+#: libfdisk/src/sun.c:1093
msgid "Device"
msgstr "设备"
-#: libfdisk/src/dos.c:2389 libfdisk/src/sun.c:40
+#: libfdisk/src/dos.c:2424 libfdisk/src/sun.c:40
msgid "Boot"
msgstr "启动"
-#: libfdisk/src/dos.c:2395 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1118
+#: libfdisk/src/dos.c:2430 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1099
msgid "Id"
msgstr "Id"
-#: libfdisk/src/dos.c:2399
+#: libfdisk/src/dos.c:2434
msgid "Start-C/H/S"
msgstr "起始-C/H/S"
-#: libfdisk/src/dos.c:2400
+#: libfdisk/src/dos.c:2435
msgid "End-C/H/S"
msgstr "终-C/H/S"
-#: libfdisk/src/dos.c:2401 libfdisk/src/gpt.c:3022 libfdisk/src/sgi.c:1160
+#: libfdisk/src/dos.c:2436 libfdisk/src/gpt.c:3048 libfdisk/src/sgi.c:1160
msgid "Attrs"
msgstr "属性"
@@ -5850,311 +5935,312 @@ msgstr "QNX6 文件系统"
msgid "Plan 9 partition"
msgstr "Plan 9 分区"
-#: libfdisk/src/gpt.c:589
+#: libfdisk/src/gpt.c:594
msgid "failed to allocate GPT header"
msgstr "分配 GPT 头失败"
-#: libfdisk/src/gpt.c:672
+#: libfdisk/src/gpt.c:677
msgid "First LBA specified by script is out of range."
msgstr "脚本指定的第一个 LBA 超出范围。"
-#: libfdisk/src/gpt.c:684
+#: libfdisk/src/gpt.c:689
msgid "Last LBA specified by script is out of range."
msgstr "脚本指定的最后一个 LBA 超出范围。"
-#: libfdisk/src/gpt.c:817
+#: libfdisk/src/gpt.c:827
#, c-format
msgid "GPT PMBR size mismatch (%<PRIu64> != %<PRIu64>) will be corrected by w(rite)."
msgstr "GPT PMBR 大小不符(%<PRIu64> != %<PRIu64>),将用 w(写) 予以更正。"
-#: libfdisk/src/gpt.c:834
+#: libfdisk/src/gpt.c:844
msgid "gpt: stat() failed"
msgstr "gpt:stat() 失败"
-#: libfdisk/src/gpt.c:844
+#: libfdisk/src/gpt.c:854
#, c-format
msgid "gpt: cannot handle files with mode %o"
msgstr "gpt:无法操作模式为 %o 的文件"
-#: libfdisk/src/gpt.c:1108
+#: libfdisk/src/gpt.c:1118
msgid "GPT Header"
msgstr "GPT 头"
-#: libfdisk/src/gpt.c:1113
+#: libfdisk/src/gpt.c:1123
msgid "GPT Entries"
msgstr "GPT 记录项"
-#: libfdisk/src/gpt.c:1145
+#: libfdisk/src/gpt.c:1155
msgid "First LBA"
msgstr "第一个 LBA"
-#: libfdisk/src/gpt.c:1150
+#: libfdisk/src/gpt.c:1160
msgid "Last LBA"
msgstr "最后一个 LBA"
#. TRANSLATORS: The LBA (Logical Block Address) of the backup GPT header.
-#: libfdisk/src/gpt.c:1156
+#: libfdisk/src/gpt.c:1166
msgid "Alternative LBA"
msgstr "替代 LBA"
#. TRANSLATORS: The start of the array of partition entries.
-#: libfdisk/src/gpt.c:1162
+#: libfdisk/src/gpt.c:1172
msgid "Partition entries LBA"
msgstr "分区记录项 LBA"
-#: libfdisk/src/gpt.c:1167
+#: libfdisk/src/gpt.c:1177
msgid "Allocated partition entries"
msgstr "已分配的分区项"
-#: libfdisk/src/gpt.c:1512
+#: libfdisk/src/gpt.c:1522
msgid "The backup GPT table is corrupt, but the primary appears OK, so that will be used."
msgstr "备份 GPT 表损坏,但主表似乎正常,将使用它。"
-#: libfdisk/src/gpt.c:1521
+#: libfdisk/src/gpt.c:1531
msgid "The primary GPT table is corrupt, but the backup appears OK, so that will be used."
msgstr "主 GPT 表损坏,但备份似乎正常,将使用它。"
-#: libfdisk/src/gpt.c:1703
+#: libfdisk/src/gpt.c:1713
#, c-format
msgid "unsupported GPT attribute bit '%s'"
msgstr "不支持的 GPT 属性位“%s”"
-#: libfdisk/src/gpt.c:1708
+#: libfdisk/src/gpt.c:1718
#, fuzzy, c-format
msgid "failed to parse GPT attribute string '%s'"
msgstr "解析列表“%s”失败"
-#: libfdisk/src/gpt.c:1803
+#: libfdisk/src/gpt.c:1818
#, c-format
msgid "Partition UUID changed from %s to %s."
msgstr "分区 UUID 已从 %s 更改为 %s。"
-#: libfdisk/src/gpt.c:1811
+#: libfdisk/src/gpt.c:1826
#, c-format
msgid "Partition name changed from '%s' to '%.*s'."
msgstr "分区名已由“%s”改为“%.*s”。"
-#: libfdisk/src/gpt.c:1840
+#: libfdisk/src/gpt.c:1855
msgid "The start of the partition understeps FirstUsableLBA."
msgstr "分区起点未到首个可用 LBA。"
-#: libfdisk/src/gpt.c:1847
+#: libfdisk/src/gpt.c:1862
msgid "The end of the partition oversteps LastUsableLBA."
msgstr "分区终点超过了最后可用 LBA。"
-#: libfdisk/src/gpt.c:2010
+#: libfdisk/src/gpt.c:2025
msgid "The device contains hybrid MBR -- writing GPT only. You have to sync the MBR manually."
msgstr "该设备包含混合 MBR -- 将只写入 GPT。您需要手动同步 MBR。"
-#: libfdisk/src/gpt.c:2047
+#: libfdisk/src/gpt.c:2062
msgid "Disk does not contain a valid backup header."
msgstr "磁盘不含有效的备用磁头。"
-#: libfdisk/src/gpt.c:2052
+#: libfdisk/src/gpt.c:2067
msgid "Invalid primary header CRC checksum."
msgstr "无效的主磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:2056
+#: libfdisk/src/gpt.c:2071
msgid "Invalid backup header CRC checksum."
msgstr "无效的备份磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:2061
+#: libfdisk/src/gpt.c:2076
msgid "Invalid partition entry checksum."
msgstr "无效的分区记录校验和。"
-#: libfdisk/src/gpt.c:2066
+#: libfdisk/src/gpt.c:2081
msgid "Invalid primary header LBA sanity checks."
msgstr "无效的主磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:2070
+#: libfdisk/src/gpt.c:2085
msgid "Invalid backup header LBA sanity checks."
msgstr "无效的备用磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:2075
+#: libfdisk/src/gpt.c:2090
msgid "MyLBA mismatch with real position at primary header."
msgstr "MyLBA 不匹配,真正位置在主磁头。"
-#: libfdisk/src/gpt.c:2079
+#: libfdisk/src/gpt.c:2094
msgid "MyLBA mismatch with real position at backup header."
msgstr "MyLBA 不匹配,真正位置在备份磁头。"
-#: libfdisk/src/gpt.c:2084
+#: libfdisk/src/gpt.c:2099
msgid "Disk is too small to hold all data."
msgstr "磁盘太小,放不下所有数据。"
-#: libfdisk/src/gpt.c:2094
+#: libfdisk/src/gpt.c:2109
msgid "Primary and backup header mismatch."
msgstr "主磁头和备份磁头不匹配。"
-#: libfdisk/src/gpt.c:2100
+#: libfdisk/src/gpt.c:2115
#, c-format
msgid "Partition %u overlaps with partition %u."
msgstr "分区 %u 与 %u 重叠。"
-#: libfdisk/src/gpt.c:2107
+#: libfdisk/src/gpt.c:2122
#, c-format
msgid "Partition %u is too big for the disk."
msgstr "分区 %u 对于该磁盘而言过大。"
-#: libfdisk/src/gpt.c:2114
+#: libfdisk/src/gpt.c:2129
#, c-format
msgid "Partition %u ends before it starts."
msgstr "分区 %u 结束于起点之前。"
-#: libfdisk/src/gpt.c:2123
+#: libfdisk/src/gpt.c:2138
msgid "No errors detected."
msgstr "未检测到错误。"
-#: libfdisk/src/gpt.c:2124
+#: libfdisk/src/gpt.c:2139
#, c-format
msgid "Header version: %s"
msgstr "磁头版本:%s"
-#: libfdisk/src/gpt.c:2125
+#: libfdisk/src/gpt.c:2140
#, fuzzy, c-format
msgid "Using %zu out of %zu partitions."
msgstr "使用着 %2$d 个分区中的 %1$u 个。"
-#: libfdisk/src/gpt.c:2135
+#: libfdisk/src/gpt.c:2150
#, 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:2143
+#: libfdisk/src/gpt.c:2158
#, c-format
msgid "%d error detected."
msgid_plural "%d errors detected."
msgstr[0] "检测到 %d 个错误。"
-#: libfdisk/src/gpt.c:2222
+#: libfdisk/src/gpt.c:2237
msgid "All partitions are already in use."
msgstr "所有分区均已占用。"
-#: libfdisk/src/gpt.c:2279 libfdisk/src/gpt.c:2304
+#: libfdisk/src/gpt.c:2294 libfdisk/src/gpt.c:2321
#, c-format
msgid "Sector %ju already used."
msgstr "扇区 %ju 已使用。"
-#: libfdisk/src/gpt.c:2365
+#: libfdisk/src/gpt.c:2386
#, c-format
msgid "Could not create partition %zu"
msgstr "无法创建分区 %zu"
-#: libfdisk/src/gpt.c:2372
+#: libfdisk/src/gpt.c:2393
#, c-format
msgid "The last usable GPT sector is %ju, but %ju is requested."
msgstr "最后一个可用的 GPT 扇区是 %ju,但请求了 %ju。"
-#: libfdisk/src/gpt.c:2379
+#: libfdisk/src/gpt.c:2400
#, c-format
msgid "The first usable GPT sector is %ju, but %ju is requested."
msgstr "第一个可用的 GPT 扇区是 %ju,但请求了 %ju。"
-#: libfdisk/src/gpt.c:2513
+#: libfdisk/src/gpt.c:2539
#, c-format
msgid "Created a new GPT disklabel (GUID: %s)."
msgstr "已创建新的 GPT 磁盘标签(GUID: %s)。"
-#: libfdisk/src/gpt.c:2531
+#: libfdisk/src/gpt.c:2557
msgid "Enter new disk UUID (in 8-4-4-4-12 format)"
msgstr "输入新磁盘 UUID(以 8-4-4-4-12 格式)"
-#: libfdisk/src/gpt.c:2538
+#: libfdisk/src/gpt.c:2564
msgid "Failed to parse your UUID."
msgstr "解析您的 UUID 失败。"
-#: libfdisk/src/gpt.c:2552
+#: libfdisk/src/gpt.c:2578
#, c-format
msgid "Disk identifier changed from %s to %s."
msgstr "将磁盘标识从 %s 更改为 %s 失败。"
-#: libfdisk/src/gpt.c:2572
+#: libfdisk/src/gpt.c:2598
msgid "Not enough space for new partition table!"
msgstr "创建新分区表的空闲空间不够!"
-#: libfdisk/src/gpt.c:2583
+#: libfdisk/src/gpt.c:2609
#, fuzzy, c-format
msgid "Partition #%zu out of range (minimal start is %<PRIu64> sectors)"
msgstr "分区 #%u 超出范围(最小起点是 %<PRIu64> 扇区)"
-#: libfdisk/src/gpt.c:2588
+#: libfdisk/src/gpt.c:2614
#, fuzzy, c-format
msgid "Partition #%zu out of range (maximal end is %<PRIu64> sectors)"
msgstr "分区 #%u 超出范围(最小终点是 %<PRIu64> 扇区)"
-#: libfdisk/src/gpt.c:2631
+#: libfdisk/src/gpt.c:2657
#, fuzzy, c-format
msgid "The number of the partition has to be smaller than %zu."
msgstr "已创建分区达到最大数量。"
-#: libfdisk/src/gpt.c:2654
+#: libfdisk/src/gpt.c:2680
msgid "Cannot allocate memory!"
msgstr "无法分配内存!"
-#: libfdisk/src/gpt.c:2684
+#: libfdisk/src/gpt.c:2710
#, c-format
msgid "Partition table length changed from %<PRIu32> to %<PRIu64>."
msgstr "分区表长度已从 %<PRIu32> 改为 %<PRIu64>。"
-#: libfdisk/src/gpt.c:2793
+#: libfdisk/src/gpt.c:2819
#, c-format
msgid "The attributes on partition %zu changed to 0x%016<PRIx64>."
msgstr "分区 %zu 的属性已改为 0x%016<PRIx64>。"
-#: libfdisk/src/gpt.c:2843
+#: libfdisk/src/gpt.c:2869
msgid "Enter GUID specific bit"
msgstr "输入 GUID 特定位"
-#: libfdisk/src/gpt.c:2858
+#: libfdisk/src/gpt.c:2884
#, c-format
msgid "failed to toggle unsupported bit %lu"
msgstr "开/关不支持的位 %lu 失败"
-#: libfdisk/src/gpt.c:2871
+#: libfdisk/src/gpt.c:2897
#, c-format
msgid "The GUID specific bit %d on partition %zu is enabled now."
msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已启用。"
-#: libfdisk/src/gpt.c:2872
+#: libfdisk/src/gpt.c:2898
#, c-format
msgid "The GUID specific bit %d on partition %zu is disabled now."
msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已禁用。"
-#: libfdisk/src/gpt.c:2876
+#: libfdisk/src/gpt.c:2902
#, c-format
msgid "The %s flag on partition %zu is enabled now."
msgstr "分区 %2$zu 上的标志 %1$s 现已启用。"
-#: libfdisk/src/gpt.c:2877
+#: libfdisk/src/gpt.c:2903
#, c-format
msgid "The %s flag on partition %zu is disabled now."
msgstr "分区 %2$zu 上的标志 %1$s 现已禁用。"
-#: libfdisk/src/gpt.c:3019
+#: libfdisk/src/gpt.c:3045
msgid "Type-UUID"
msgstr "类型-UUID"
-#: libfdisk/src/gpt.c:3020
+#: libfdisk/src/gpt.c:3046
msgid "UUID"
msgstr "UUID"
-#: libfdisk/src/gpt.c:3021 login-utils/chfn.c:155 login-utils/chfn.c:157
-#: login-utils/chfn.c:321
+#: libfdisk/src/gpt.c:3047 login-utils/chfn.c:156 login-utils/chfn.c:158
+#: login-utils/chfn.c:324
msgid "Name"
msgstr "名称"
-#: libfdisk/src/partition.c:841
+#: libfdisk/src/partition.c:848
msgid "Free space"
msgstr "剩余空间"
-#: libfdisk/src/partition.c:1210
+#: libfdisk/src/partition.c:1255
#, c-format
msgid "Failed to resize partition #%zu."
msgstr "调整分区 #%zu 的大小失败。"
-#: libfdisk/src/parttype.c:258 misc-utils/findmnt.c:655 schedutils/chrt.c:206
-#: schedutils/ionice.c:79 sys-utils/hwclock.c:256
+#: libfdisk/src/parttype.c:258 misc-utils/findmnt.c:655
+#: misc-utils/uuidparse.c:199 misc-utils/uuidparse.c:217 schedutils/chrt.c:205
+#: schedutils/ionice.c:79 sys-utils/hwclock.c:248
msgid "unknown"
msgstr "未知"
@@ -6226,11 +6312,11 @@ msgstr "在第二扇区创建了 SGI 信息。"
msgid "Detected an SGI disklabel with wrong checksum."
msgstr "检测到校验和错误的 sgi 磁盘标签。"
-#: libfdisk/src/sgi.c:281 libfdisk/src/sun.c:773
+#: libfdisk/src/sgi.c:281 libfdisk/src/sun.c:758
msgid "Physical cylinders"
msgstr "物理柱面数"
-#: libfdisk/src/sgi.c:286 libfdisk/src/sun.c:778
+#: libfdisk/src/sgi.c:286 libfdisk/src/sun.c:763
msgid "Extra sects/cyl"
msgstr "额外扇区/柱面"
@@ -6278,7 +6364,7 @@ msgstr "启动文件已更改为“%s”。"
msgid "More than one entire disk entry present."
msgstr "存在超过一个整磁盘记录。"
-#: libfdisk/src/sgi.c:602 libfdisk/src/sun.c:461
+#: libfdisk/src/sgi.c:602 libfdisk/src/sun.c:446
msgid "No partitions defined."
msgstr "未定义分区。"
@@ -6339,7 +6425,7 @@ msgstr "整个磁盘已经被分区覆盖。"
msgid "You got a partition overlap on the disk. Fix it first!"
msgstr "磁盘上有重叠分区。请先修复它!"
-#: libfdisk/src/sgi.c:874 libfdisk/src/sun.c:547
+#: libfdisk/src/sgi.c:874 libfdisk/src/sun.c:532
#, c-format
msgid "First %s"
msgstr "起始 %s"
@@ -6348,12 +6434,12 @@ msgstr "起始 %s"
msgid "It is highly recommended that the eleventh partition covers the entire disk and is of type 'SGI volume'."
msgstr "强烈建议第十一分区覆盖整个磁盘,并使用“SGI volume”类型。"
-#: libfdisk/src/sgi.c:913 libfdisk/src/sun.c:642
+#: libfdisk/src/sgi.c:913 libfdisk/src/sun.c:627
#, c-format
msgid "Last %s or +%s or +size{K,M,G,T,P}"
msgstr "最后 %s 或+%s 或 +大小{K,M,G,T,P}"
-#: libfdisk/src/sgi.c:984 libfdisk/src/sun.c:244
+#: libfdisk/src/sgi.c:984 libfdisk/src/sun.c:234
#, c-format
msgid "BLKGETSIZE ioctl failed on %s. Using geometry cylinder value of %llu. This value may be truncated for devices > 33.8 GB."
msgstr "对 %s 执行 BLKGETSIZE ioctl 失败。将使用几何 柱面 属性值 %llu。对于大于 33.8 GB 的设备,这个值可能被截短。"
@@ -6418,80 +6504,80 @@ msgstr "SunOS cachefs"
msgid "SunOS reserved"
msgstr "SunOS 保留"
-#: libfdisk/src/sun.c:136
+#: libfdisk/src/sun.c:130
msgid "Detected sun disklabel with wrong checksum. Probably you'll have to set all the values, e.g. heads, sectors, cylinders and partitions or force a fresh label (s command in main menu)"
msgstr "检测到校验和错误的 sun 磁盘标签。您可能要设置所有的值(如磁头、扇区、柱面和分区)或强制一个新标签(主菜单中的 s 命令)"
-#: libfdisk/src/sun.c:153
+#: libfdisk/src/sun.c:147
#, c-format
msgid "Detected sun disklabel with wrong version [%d]."
msgstr "检测到带错误版本 [%d] 的 sun 磁盘标签 。"
-#: libfdisk/src/sun.c:158
+#: libfdisk/src/sun.c:152
#, c-format
msgid "Detected sun disklabel with wrong vtoc.sanity [0x%08x]."
msgstr "检测到带错误的 vtoc.sanity [0x%08x] 的 sun 磁盘标签。"
-#: libfdisk/src/sun.c:163
+#: libfdisk/src/sun.c:157
#, c-format
msgid "Detected sun disklabel with wrong vtoc.nparts [%u]."
msgstr "检测到带错误 vtoc.nparts [%u] 的 sun 磁盘标签。"
-#: libfdisk/src/sun.c:168
+#: libfdisk/src/sun.c:162
msgid "Warning: Wrong values need to be fixed up and will be corrected by w(rite)"
msgstr "警告:错误值需要修复,并且将通过 w(写) 操作修正。"
-#: libfdisk/src/sun.c:195
+#: libfdisk/src/sun.c:185
msgid "Heads"
msgstr "磁头"
-#: libfdisk/src/sun.c:197
+#: libfdisk/src/sun.c:187
msgid "Sectors/track"
msgstr "扇区/磁道"
-#: libfdisk/src/sun.c:300
+#: libfdisk/src/sun.c:285
msgid "Created a new Sun disklabel."
msgstr "创建新的 Sun 磁盘标签。"
-#: libfdisk/src/sun.c:419
+#: libfdisk/src/sun.c:404
#, c-format
msgid "Partition %u doesn't end on cylinder boundary."
msgstr "分区 %u 未结束在柱面边界上。"
-#: libfdisk/src/sun.c:438
+#: libfdisk/src/sun.c:423
#, c-format
msgid "Partition %u overlaps with others in sectors %u-%u."
msgstr "分区 %u 在扇区 %u-%u 与其他分区重叠。"
-#: libfdisk/src/sun.c:466
+#: libfdisk/src/sun.c:451
#, c-format
msgid "Unused gap - sectors 0-%u."
msgstr "未使用的间隙 - 扇区 0-%u。"
-#: libfdisk/src/sun.c:468 libfdisk/src/sun.c:474
+#: libfdisk/src/sun.c:453 libfdisk/src/sun.c:459
#, c-format
msgid "Unused gap - sectors %u-%u."
msgstr "未使用的间隙 - 扇区 %u-%u。"
-#: libfdisk/src/sun.c:531
+#: libfdisk/src/sun.c:516
msgid "Other partitions already cover the whole disk. Delete some/shrink them before retry."
msgstr "其他分区已覆盖了整个磁盘。删除几个分区或压缩它们,然后重试。"
-#: libfdisk/src/sun.c:596
+#: libfdisk/src/sun.c:581
#, c-format
msgid "Sector %d is already allocated"
msgstr "扇区 %d 已分配"
-#: libfdisk/src/sun.c:603
+#: libfdisk/src/sun.c:588
msgid "It is highly recommended that the third partition covers the whole disk and is of type `Whole disk'"
msgstr "强烈建议让第三个分区覆盖整个磁盘,并设为“整盘”类型"
-#: libfdisk/src/sun.c:613
+#: libfdisk/src/sun.c:598
#, c-format
msgid "Aligning the first sector from %u to %u to be on cylinder boundary."
msgstr "将把从 %u 到 %u 的首个扇区对齐到柱面边界。"
-#: libfdisk/src/sun.c:688
+#: libfdisk/src/sun.c:673
#, c-format
msgid ""
"You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -6501,44 +6587,44 @@ msgstr ""
"您没有使第三个分区覆盖整个磁盘,但是值 %lu %s 覆盖了其他分区。\n"
"您的记录已经更改为 %lu %s"
-#: libfdisk/src/sun.c:729
+#: libfdisk/src/sun.c:714
#, c-format
msgid "If you want to maintain SunOS/Solaris compatibility, consider leaving this partition as Whole disk (5), starting at 0, with %u sectors"
msgstr "如果您想与 SunOS/Solaris 兼容,请保持此分区为 整盘 (5),以 0 开始,大小为 %u 个扇区"
-#: libfdisk/src/sun.c:753
+#: libfdisk/src/sun.c:738
msgid "Label ID"
msgstr "标签 ID"
-#: libfdisk/src/sun.c:758
+#: libfdisk/src/sun.c:743
msgid "Volume ID"
msgstr "卷 ID"
-#: libfdisk/src/sun.c:768
+#: libfdisk/src/sun.c:753
msgid "Alternate cylinders"
msgstr "备用柱面数"
-#: libfdisk/src/sun.c:874
+#: libfdisk/src/sun.c:859
msgid "Number of alternate cylinders"
msgstr "备用柱面的数量"
-#: libfdisk/src/sun.c:899
+#: libfdisk/src/sun.c:884
msgid "Extra sectors per cylinder"
msgstr "每个柱面的额外扇区数"
-#: libfdisk/src/sun.c:923
+#: libfdisk/src/sun.c:908
msgid "Interleave factor"
msgstr "交错系数"
-#: libfdisk/src/sun.c:947
+#: libfdisk/src/sun.c:932
msgid "Rotation speed (rpm)"
msgstr "转速(转/分)"
-#: libfdisk/src/sun.c:971
+#: libfdisk/src/sun.c:956
msgid "Number of physical cylinders"
msgstr "物理柱面数"
-#: libfdisk/src/sun.c:1040
+#: libfdisk/src/sun.c:1021
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -6546,7 +6632,7 @@ msgstr ""
"考虑保持分区 3 为 整盘 (5),\n"
"这是 SunOS/Solaris 的规定,Linux 也建议这么做。\n"
-#: libfdisk/src/sun.c:1051
+#: libfdisk/src/sun.c:1032
msgid ""
"It is highly recommended that the partition at offset 0\n"
"is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -6558,7 +6644,7 @@ msgstr ""
"和启动锁。\n"
"您确信要把该分区标记为 Linux 交换分区吗?"
-#: libmount/src/context.c:2367
+#: libmount/src/context.c:2377
#, fuzzy, c-format
msgid "operation failed: %m"
msgstr "readlink 失败:%s"
@@ -6643,219 +6729,234 @@ msgstr "%s:设置回环设备失败"
msgid "overlapping loop device exists for %s"
msgstr "%s: 重叠的回环设备已存在"
-#: libmount/src/context_mount.c:1383
+#: libmount/src/context_mount.c:1384 libmount/src/context_umount.c:1068
+#, fuzzy, c-format
+msgid "locking failed"
+msgstr "关闭 %s 失败"
+
+#: libmount/src/context_mount.c:1387
#, fuzzy, c-format
msgid "mount failed: %m"
msgstr "挂载失败"
-#: libmount/src/context_mount.c:1393
+#: libmount/src/context_mount.c:1397
+#, fuzzy, c-format
+msgid "filesystem was mounted, but failed to update userspace mount table"
+msgstr "%s:文件系统已卸载,但 mount(8) 失败"
+
+#: libmount/src/context_mount.c:1402
#, fuzzy, c-format
msgid "filesystem was mounted, but any subsequent operation failed: %m"
msgstr "%s:文件系统已卸载,但 mount(8) 失败"
-#: libmount/src/context_mount.c:1411 libmount/src/context_mount.c:1468
+#: libmount/src/context_mount.c:1420 libmount/src/context_mount.c:1477
#, fuzzy, c-format
msgid "mount point is not a directory"
msgstr "挂载点 %s 不是目录"
-#: libmount/src/context_mount.c:1413 login-utils/newgrp.c:227
+#: libmount/src/context_mount.c:1422 login-utils/newgrp.c:227
#, c-format
msgid "permission denied"
msgstr "权限不足"
-#: libmount/src/context_mount.c:1415
+#: libmount/src/context_mount.c:1424
#, c-format
msgid "must be superuser to use mount"
msgstr "必须以超级用户身份使用 mount"
-#: libmount/src/context_mount.c:1425
+#: libmount/src/context_mount.c:1434
#, fuzzy, c-format
msgid "mount point is busy"
msgstr "mount:%s 忙"
-#: libmount/src/context_mount.c:1438
+#: libmount/src/context_mount.c:1447
#, fuzzy, c-format
msgid "%s already mounted on %s"
msgstr "mount:%s 已挂载于 %s\n"
-#: libmount/src/context_mount.c:1444
+#: libmount/src/context_mount.c:1453
#, fuzzy, c-format
msgid "%s already mounted or mount point busy"
msgstr "%s 已经挂载或 %s 忙"
-#: libmount/src/context_mount.c:1450
+#: libmount/src/context_mount.c:1459
#, fuzzy, c-format
msgid "mount point does not exist"
msgstr "挂载点 %s 不存在"
-#: libmount/src/context_mount.c:1453
+#: libmount/src/context_mount.c:1462
#, fuzzy, c-format
msgid "mount point is a symbolic link to nowhere"
msgstr "挂载点 %s 是一个没有目标的符号链接"
-#: libmount/src/context_mount.c:1458
+#: libmount/src/context_mount.c:1467
#, c-format
msgid "special device %s does not exist"
msgstr "特殊设备 %s 不存在"
-#: libmount/src/context_mount.c:1461 libmount/src/context_mount.c:1477
-#: libmount/src/context_mount.c:1561 libmount/src/context_mount.c:1575
+#: libmount/src/context_mount.c:1470 libmount/src/context_mount.c:1486
+#: libmount/src/context_mount.c:1570 libmount/src/context_mount.c:1584
#, fuzzy, c-format
msgid "mount(2) system call failed: %m"
msgstr "mount(2) 失败"
-#: libmount/src/context_mount.c:1473
+#: libmount/src/context_mount.c:1482
#, c-format
msgid "special device %s does not exist (a path prefix is not a directory)"
msgstr "特殊设备 %s 不存在(路径前缀不是目录)"
-#: libmount/src/context_mount.c:1485
+#: libmount/src/context_mount.c:1494
#, fuzzy, c-format
msgid "mount point not mounted or bad option"
msgstr "mount:%s 未挂载或选项错误"
-#: libmount/src/context_mount.c:1487
+#: libmount/src/context_mount.c:1496
#, fuzzy, c-format
msgid "not mount point or bad option"
msgstr "%s 不是一个挂载点或选项有误"
-#: libmount/src/context_mount.c:1490
+#: libmount/src/context_mount.c:1499
#, fuzzy, c-format
msgid "bad option; moving a mount residing under a shared mount is unsupported"
msgstr "选项错误。注意,不支持移动位于共享挂载内的挂载。"
-#: libmount/src/context_mount.c:1494
+#: libmount/src/context_mount.c:1503
#, 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:1498
+#: libmount/src/context_mount.c:1507
#, 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:1505
+#: libmount/src/context_mount.c:1514
#, c-format
msgid "mount table full"
msgstr "挂载表满"
-#: libmount/src/context_mount.c:1510
+#: libmount/src/context_mount.c:1519
#, fuzzy, c-format
msgid "can't read superblock on %s"
msgstr "%s:不能读超级块"
-#: libmount/src/context_mount.c:1517
+#: libmount/src/context_mount.c:1526
#, c-format
msgid "unknown filesystem type '%s'"
msgstr "未知的文件系统类型“%s”"
-#: libmount/src/context_mount.c:1520
+#: libmount/src/context_mount.c:1529
#, c-format
msgid "unknown filesystem type"
msgstr "未知的文件系统类型"
-#: libmount/src/context_mount.c:1529
+#: libmount/src/context_mount.c:1538
#, c-format
msgid "%s is not a block device, and stat(2) fails?"
msgstr "%s 不是块设备,而且 stat(2) 失败?"
-#: libmount/src/context_mount.c:1532
+#: libmount/src/context_mount.c:1541
#, 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:1535
+#: libmount/src/context_mount.c:1544
#, fuzzy, c-format
msgid "%s is not a block device; try \"-o loop\""
msgstr "%s 不是块设备(用 `-o loop' 试试?)"
-#: libmount/src/context_mount.c:1537
+#: libmount/src/context_mount.c:1546
#, fuzzy, c-format
msgid "%s is not a block device"
msgstr "%s 不是一个块设备"
-#: libmount/src/context_mount.c:1544
+#: libmount/src/context_mount.c:1553
#, c-format
msgid "%s is not a valid block device"
msgstr "%s 不是一个有效的块设备"
-#: libmount/src/context_mount.c:1552
+#: libmount/src/context_mount.c:1561
#, c-format
msgid "cannot mount %s read-only"
msgstr "无法以只读方式挂载 %s"
-#: libmount/src/context_mount.c:1554
+#: libmount/src/context_mount.c:1563
#, fuzzy, c-format
msgid "%s is write-protected but explicit read-write mode requested"
msgstr "%s 是写保护的,但指明了“-w”标志"
-#: libmount/src/context_mount.c:1556
+#: libmount/src/context_mount.c:1565
#, c-format
msgid "cannot remount %s read-write, is write-protected"
msgstr "无法以读写方式重新挂载 %s,它是写保护的"
-#: libmount/src/context_mount.c:1558
+#: libmount/src/context_mount.c:1567
#, fuzzy, c-format
msgid "bind %s failed"
msgstr "%s 失败"
-#: libmount/src/context_mount.c:1569
+#: libmount/src/context_mount.c:1578
#, c-format
msgid "no medium found on %s"
msgstr "在 %s 上找不到媒体"
-#: libmount/src/context_umount.c:1051 libmount/src/context_umount.c:1080
+#: libmount/src/context_umount.c:1064 libmount/src/context_umount.c:1102
#, fuzzy, c-format
msgid "not mounted"
msgstr "%s:未挂载"
-#: libmount/src/context_umount.c:1055
+#: libmount/src/context_umount.c:1072
#, fuzzy, c-format
msgid "umount failed: %m"
msgstr "挂载失败"
-#: libmount/src/context_umount.c:1064
+#: libmount/src/context_umount.c:1081
+#, fuzzy, c-format
+msgid "filesystem was unmounted, but failed to update userspace mount table"
+msgstr "%s:文件系统已卸载,但 mount(8) 失败"
+
+#: libmount/src/context_umount.c:1086
#, fuzzy, c-format
msgid "filesystem was unmounted, but any subsequent operation failed: %m"
msgstr "%s:文件系统已卸载,但 mount(8) 失败"
-#: libmount/src/context_umount.c:1077
+#: libmount/src/context_umount.c:1099
#, fuzzy, c-format
msgid "invalid block device"
msgstr "%s:无效的块设备"
-#: libmount/src/context_umount.c:1083
+#: libmount/src/context_umount.c:1105
#, fuzzy, c-format
msgid "can't write superblock"
msgstr "%s:无法写超级块"
-#: libmount/src/context_umount.c:1086
+#: libmount/src/context_umount.c:1108
#, fuzzy, c-format
msgid "target is busy"
msgstr "目标存在"
-#: libmount/src/context_umount.c:1089
+#: libmount/src/context_umount.c:1111
#, fuzzy, c-format
msgid "no mount point specified"
msgstr "未指定挂载点"
-#: libmount/src/context_umount.c:1092
+#: libmount/src/context_umount.c:1114
#, fuzzy, c-format
msgid "must be superuser to unmount"
msgstr "%s:必须以超级用户身份卸载"
-#: libmount/src/context_umount.c:1095
+#: libmount/src/context_umount.c:1117
#, fuzzy, c-format
msgid "block devices are not permitted on filesystem"
msgstr "%s:文件系统不允许块设备"
-#: libmount/src/context_umount.c:1098
+#: libmount/src/context_umount.c:1120
#, fuzzy, c-format
msgid "umount(2) system call failed: %m"
msgstr "mount(2) 失败"
@@ -6865,46 +6966,46 @@ msgstr "mount(2) 失败"
msgid "waitpid failed (%s)"
msgstr "waitpid 失败(%s)"
-#: lib/path.c:209 sys-utils/lscpu.c:1913
+#: lib/path.c:225 sys-utils/lscpu.c:1912
msgid "failed to callocate cpu set"
msgstr "分配(callocate) CPU 组 失败"
-#: lib/path.c:213
+#: lib/path.c:229
#, c-format
msgid "failed to parse CPU list %s"
msgstr "解析 CPU 列表 %s 失败"
-#: lib/path.c:216
+#: lib/path.c:232
#, c-format
msgid "failed to parse CPU mask %s"
msgstr "解析 CPU 掩码 %s 失败"
-#: lib/plymouth-ctrl.c:72
+#: lib/plymouth-ctrl.c:73
#, fuzzy
msgid "cannot open UNIX socket"
msgstr "打不开 UNIX 套接字"
-#: lib/plymouth-ctrl.c:78
+#: lib/plymouth-ctrl.c:79
#, fuzzy
msgid "cannot set option for UNIX socket"
msgstr "无法设置 UNIX 套接字选项"
-#: lib/plymouth-ctrl.c:92
+#: lib/plymouth-ctrl.c:90
#, fuzzy
msgid "cannot connect on UNIX socket"
msgstr "无法连接 UNIX 套接字"
-#: lib/plymouth-ctrl.c:132
+#: lib/plymouth-ctrl.c:128
#, c-format
msgid "the plymouth request %c is not implemented"
msgstr "plymouth 请求 %c 没有实现"
-#: lib/randutils.c:159
+#: lib/randutils.c:178
#, fuzzy
msgid "getrandom() function"
msgstr "libc 伪随机函数"
-#: lib/randutils.c:172
+#: lib/randutils.c:191
msgid "libc pseudo-random functions"
msgstr "libc 伪随机函数"
@@ -6928,125 +7029,125 @@ msgstr "%s:不是有效的交换分区"
msgid "%s: unsupported swap version '%s'"
msgstr "%s:不支持的 swap 版本“%s”"
-#: login-utils/chfn.c:95 login-utils/chsh.c:74
+#: login-utils/chfn.c:96 login-utils/chsh.c:74
#, c-format
msgid " %s [options] [<username>]\n"
msgstr " %s [选项] [<用户名>]\n"
-#: login-utils/chfn.c:98
+#: login-utils/chfn.c:99
msgid "Change your finger information.\n"
msgstr "更改您的手指信息。\n"
-#: login-utils/chfn.c:101
+#: login-utils/chfn.c:102
msgid " -f, --full-name <full-name> real name\n"
msgstr " -f, --full-name <全名> 真实姓名\n"
-#: login-utils/chfn.c:102
+#: login-utils/chfn.c:103
msgid " -o, --office <office> office number\n"
msgstr " -o, --office <办公> 办公号码\n"
-#: login-utils/chfn.c:103
+#: login-utils/chfn.c:104
msgid " -p, --office-phone <phone> office phone number\n"
msgstr " -p, --office-phone <电话> 办公电话\n"
-#: login-utils/chfn.c:104
+#: login-utils/chfn.c:105
msgid " -h, --home-phone <phone> home phone number\n"
msgstr " -h, --home-phone <电话> 住宅电话\n"
-#: login-utils/chfn.c:106 login-utils/chsh.c:83
-msgid " -u, --help display this help and exit\n"
-msgstr " -u, --help 显示此帮助并退出\n"
-
-#: login-utils/chfn.c:122
+#: login-utils/chfn.c:123
#, c-format
msgid "field %s is too long"
msgstr "字段 %s 过长"
-#: login-utils/chfn.c:126 login-utils/chsh.c:215
+#: login-utils/chfn.c:127 login-utils/chsh.c:236
#, c-format
msgid "%s: has illegal characters"
msgstr "%s:含有非法字符"
-#: login-utils/chfn.c:155 login-utils/chfn.c:161 login-utils/chfn.c:167
-#: login-utils/chfn.c:173
+#: login-utils/chfn.c:156 login-utils/chfn.c:162 login-utils/chfn.c:168
+#: login-utils/chfn.c:174
#, c-format
msgid "login.defs forbids setting %s"
msgstr "login.defs 禁止设置 %s"
-#: login-utils/chfn.c:161 login-utils/chfn.c:163 login-utils/chfn.c:323
+#: login-utils/chfn.c:162 login-utils/chfn.c:164 login-utils/chfn.c:326
msgid "Office"
msgstr "办公"
-#: login-utils/chfn.c:167 login-utils/chfn.c:169 login-utils/chfn.c:325
+#: login-utils/chfn.c:168 login-utils/chfn.c:170 login-utils/chfn.c:328
msgid "Office Phone"
msgstr "办公电话"
-#: login-utils/chfn.c:173 login-utils/chfn.c:175 login-utils/chfn.c:327
+#: login-utils/chfn.c:174 login-utils/chfn.c:176 login-utils/chfn.c:330
msgid "Home Phone"
msgstr "住宅电话"
-#: login-utils/chfn.c:245
+#: login-utils/chfn.c:194 login-utils/chsh.c:187
+msgid "cannot handle multiple usernames"
+msgstr ""
+
+#: login-utils/chfn.c:248
msgid "Aborted."
msgstr "已中止。"
-#: login-utils/chfn.c:308
+#: login-utils/chfn.c:311
#, c-format
msgid "%s: CHFN_RESTRICT has unexpected value: %s"
msgstr "%s: CHFN_RESTRICT 的值异常:%s"
-#: login-utils/chfn.c:310
+#: login-utils/chfn.c:313
#, c-format
msgid "%s: CHFN_RESTRICT does not allow any changes"
msgstr "%s: CHFN_RESTRICT 不允许更改"
-#: login-utils/chfn.c:393
+#: login-utils/chfn.c:396
#, c-format
msgid "Finger information *NOT* changed. Try again later.\n"
msgstr "Finger 信息*没有*更改。请稍后重试。\n"
-#: login-utils/chfn.c:397
+#: login-utils/chfn.c:400
#, c-format
msgid "Finger information changed.\n"
msgstr "Finger 信息已更改。\n"
-#: login-utils/chfn.c:422 login-utils/chsh.c:252
+#: login-utils/chfn.c:425 login-utils/chsh.c:273
#, c-format
msgid "you (user %d) don't exist."
msgstr "您(用户 %d)不存在。"
-#: login-utils/chfn.c:428 login-utils/chsh.c:257 login-utils/libuser.c:59
+#: login-utils/chfn.c:431 login-utils/chsh.c:278 login-utils/libuser.c:59
#, c-format
msgid "user \"%s\" does not exist."
msgstr "用户“%s”不存在。"
-#: login-utils/chfn.c:434 login-utils/chsh.c:263
+#: login-utils/chfn.c:437 login-utils/chsh.c:284
msgid "can only change local entries"
msgstr "只能更改本地记录"
-#: login-utils/chfn.c:447
+#: login-utils/chfn.c:450
#, c-format
msgid "%s is not authorized to change the finger info of %s"
msgstr "%s 未得到授权更改 %s 的 finger 信息"
-#: login-utils/chfn.c:449 login-utils/chsh.c:279
+#: login-utils/chfn.c:452 login-utils/chsh.c:300
msgid "Unknown user context"
msgstr "未知用户环境(context)"
-#: login-utils/chfn.c:455 login-utils/chsh.c:285
+#: login-utils/chfn.c:458 login-utils/chsh.c:306
#, c-format
msgid "can't set default context for %s"
msgstr "无法设置 %s 默认环境(context)"
-#: login-utils/chfn.c:466
+#: login-utils/chfn.c:469
msgid "running UID doesn't match UID of user we're altering, change denied"
msgstr "运行中的 UID 与要改变的用户的 UID 不匹配,更改被拒绝"
-#: login-utils/chfn.c:470
+#: login-utils/chfn.c:473
#, c-format
msgid "Changing finger information for %s.\n"
msgstr "正在更改 %s 的 finger 信息。\n"
-#: login-utils/chfn.c:484
+#: login-utils/chfn.c:487
#, c-format
msgid "Finger information not changed.\n"
msgstr "Finger 信息未更改。\n"
@@ -7063,30 +7164,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:105
-msgid "No known shells."
-msgstr "无已知 shell。"
-
-#: login-utils/chsh.c:209
+#: login-utils/chsh.c:230
msgid "shell must be a full path name"
msgstr "shell 必须为完整路径名称"
-#: login-utils/chsh.c:211
+#: login-utils/chsh.c:232
#, c-format
msgid "\"%s\" does not exist"
msgstr "“%s”不存在"
-#: login-utils/chsh.c:213
+#: login-utils/chsh.c:234
#, c-format
msgid "\"%s\" is not executable"
msgstr "“%s”不可执行"
-#: login-utils/chsh.c:219
+#: login-utils/chsh.c:240
#, c-format
msgid "Warning: \"%s\" is not listed in %s."
msgstr "警告:“%s”未在 %s 中列出。"
-#: login-utils/chsh.c:223 login-utils/chsh.c:227
+#: login-utils/chsh.c:244 login-utils/chsh.c:248
#, c-format
msgid ""
"\"%s\" is not listed in %s.\n"
@@ -7095,38 +7192,38 @@ msgstr ""
"“%s”未列在 %s 中。\n"
"请使用 %s -l 查看列表。"
-#: login-utils/chsh.c:278
+#: login-utils/chsh.c:299
#, c-format
msgid "%s is not authorized to change the shell of %s"
msgstr "%s 无权更改 %s 的 shell"
-#: login-utils/chsh.c:304
+#: login-utils/chsh.c:325
msgid "running UID doesn't match UID of user we're altering, shell change denied"
msgstr "运行 UID 与要更改的用户的 UID 不匹配,更改 shell 被拒绝"
-#: login-utils/chsh.c:309
+#: login-utils/chsh.c:330
#, c-format
msgid "your shell is not in %s, shell change denied"
msgstr "您的 shell 不在 %s 中,更改 shell 被拒绝"
-#: login-utils/chsh.c:313
+#: login-utils/chsh.c:334
#, c-format
msgid "Changing shell for %s.\n"
msgstr "正在更改 %s 的 shell。\n"
-#: login-utils/chsh.c:321
+#: login-utils/chsh.c:342
msgid "New shell"
msgstr "新 shell"
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:350
msgid "Shell not changed."
msgstr "shell 未更改。"
-#: login-utils/chsh.c:334
+#: login-utils/chsh.c:355
msgid "Shell *NOT* changed. Try again later."
msgstr "Shell *未* 更改。请稍后重试。"
-#: login-utils/chsh.c:338
+#: login-utils/chsh.c:359
msgid ""
"setpwnam failed\n"
"Shell *NOT* changed. Try again later."
@@ -7134,7 +7231,7 @@ msgstr ""
"setpwnam 失败\n"
"Shell *未* 更改。请稍后重试。"
-#: login-utils/chsh.c:342
+#: login-utils/chsh.c:363
#, c-format
msgid "Shell changed.\n"
msgstr "shell 已更改。\n"
@@ -7144,7 +7241,7 @@ msgstr "shell 已更改。\n"
msgid "Usage: %s <passwordfile> <username>...\n"
msgstr "用法:%s <密码文件> <用户名>...\n"
-#: login-utils/last.c:169 login-utils/lslogins.c:1219 sys-utils/dmesg.c:1192
+#: login-utils/last.c:169 login-utils/lslogins.c:1218 sys-utils/dmesg.c:1295
#: sys-utils/lsipc.c:269
#, c-format
msgid "unknown time format: %s"
@@ -7155,73 +7252,73 @@ msgstr "未知时间格式: %s"
msgid "Interrupted %s"
msgstr "中断的 %s"
-#: login-utils/last.c:435 login-utils/last.c:446 login-utils/last.c:888
+#: login-utils/last.c:435 login-utils/last.c:446 login-utils/last.c:892
msgid "preallocation size exceeded"
msgstr "超过了预分配大小"
-#: login-utils/last.c:567
+#: login-utils/last.c:572
#, c-format
msgid " %s [options] [<username>...] [<tty>...]\n"
msgstr " %s [选项] [<用户名>...] [<tty>...]\n"
-#: login-utils/last.c:570
+#: login-utils/last.c:575
msgid "Show a listing of last logged in users.\n"
msgstr "显示上次登录用户的列表。\n"
-#: login-utils/last.c:573
+#: login-utils/last.c:578
msgid " -<number> how many lines to show\n"
msgstr " -<数字> 显示行数\n"
-#: login-utils/last.c:574
+#: login-utils/last.c:579
msgid " -a, --hostlast display hostnames in the last column\n"
msgstr " -a, --hostlast 最后一列显示主机名\n"
-#: login-utils/last.c:575
+#: login-utils/last.c:580
msgid " -d, --dns translate the IP number back into a hostname\n"
msgstr " -d, --dns 将 IP 号转换回主机名\n"
-#: login-utils/last.c:577
+#: login-utils/last.c:582
#, c-format
msgid " -f, --file <file> use a specific file instead of %s\n"
msgstr " -F, --file <文件> 用指定文件代替 %s\n"
-#: login-utils/last.c:578
+#: login-utils/last.c:583
msgid " -F, --fulltimes print full login and logout times and dates\n"
msgstr " -F, --fulltimes 打印完整的登录和注销时间和日期\n"
-#: login-utils/last.c:579
+#: login-utils/last.c:584
msgid " -i, --ip display IP numbers in numbers-and-dots notation\n"
msgstr " -i, --ip 以数字和点的形式显示 IP 号\n"
-#: login-utils/last.c:580
+#: login-utils/last.c:585
msgid " -n, --limit <number> how many lines to show\n"
msgstr " -n, --limit <数字> 要显示的行数\n"
-#: login-utils/last.c:581
+#: login-utils/last.c:586
msgid " -R, --nohostname don't display the hostname field\n"
msgstr " -R, --nohostname 不显示主机名字段\n"
-#: login-utils/last.c:582
+#: login-utils/last.c:587
msgid " -s, --since <time> display the lines since the specified time\n"
msgstr " -s, --since <时间> 显示从指定时间起的行\n"
-#: login-utils/last.c:583
+#: login-utils/last.c:588
msgid " -t, --until <time> display the lines until the specified time\n"
msgstr " -t, --until <时间> 显示到指定时间为止的行\n"
-#: login-utils/last.c:584
+#: login-utils/last.c:589
msgid " -p, --present <time> display who were present at the specified time\n"
msgstr " -p, --present <时间> 显示在指定时间谁在场(present)\n"
-#: login-utils/last.c:585
+#: login-utils/last.c:590
msgid " -w, --fullnames display full user and domain names\n"
msgstr " -w, --fullnames 显示完整的用户名和域名\n"
-#: login-utils/last.c:586
+#: login-utils/last.c:591
msgid " -x, --system display system shutdown entries and run level changes\n"
msgstr " -x, --system 显示系统关机项和运行级别更改\n"
-#: login-utils/last.c:587
+#: login-utils/last.c:592
msgid ""
" --time-format <format> show timestamps in the specified <format>:\n"
" notime|short|full|iso\n"
@@ -7229,7 +7326,7 @@ msgstr ""
" --time-format <格式> 以指定<格式>显示时间戳:\n"
" notime|short|full|iso\n"
-#: login-utils/last.c:889
+#: login-utils/last.c:893
#, fuzzy, c-format
msgid ""
"\n"
@@ -7238,13 +7335,13 @@ msgstr ""
"\n"
"%s 开始 %s"
-#: login-utils/last.c:968 term-utils/scriptreplay.c:64
-#: term-utils/scriptreplay.c:68
+#: login-utils/last.c:972 term-utils/scriptreplay.c:65
+#: term-utils/scriptreplay.c:69
msgid "failed to parse number"
msgstr "解析数字失败"
-#: login-utils/last.c:989 login-utils/last.c:994 login-utils/last.c:999
-#: sys-utils/rtcwake.c:485
+#: login-utils/last.c:993 login-utils/last.c:998 login-utils/last.c:1003
+#: sys-utils/rtcwake.c:483
#, c-format
msgid "invalid time value \"%s\""
msgstr "无效的时间值\"%s\""
@@ -7268,104 +7365,104 @@ msgid "user attribute not changed: %s"
msgstr "用户属性未更改:%s"
#. TRANSLATORS: The standard value for %u is 60.
-#: login-utils/login.c:183
+#: login-utils/login.c:185
#, c-format
msgid "timed out after %u seconds"
msgstr "%u 秒后超时"
-#: login-utils/login.c:289
+#: login-utils/login.c:291
#, c-format
msgid "FATAL: can't reopen tty: %m"
msgstr "致命:无法重新打开 tty:%m"
-#: login-utils/login.c:295
+#: login-utils/login.c:297
#, c-format
msgid "FATAL: %s is not a terminal"
msgstr "致命:%s 不是终端"
-#: login-utils/login.c:313
+#: login-utils/login.c:315
#, c-format
msgid "chown (%s, %lu, %lu) failed: %m"
msgstr "chown (%s, %lu, %lu) 失败:%m"
-#: login-utils/login.c:317
+#: login-utils/login.c:319
#, c-format
msgid "chmod (%s, %u) failed: %m"
msgstr "chmod (%s, %u) 失败:%m"
-#: login-utils/login.c:378
+#: login-utils/login.c:380
msgid "FATAL: bad tty"
msgstr "致命:坏的 tty"
-#: login-utils/login.c:396
+#: login-utils/login.c:398
#, c-format
msgid "FATAL: %s: change permissions failed: %m"
msgstr "致命:%s:更改权限失败:%m"
-#: login-utils/login.c:522
+#: login-utils/login.c:524
#, c-format
msgid "Last login: %.*s "
msgstr "上次登录:%.*s "
-#: login-utils/login.c:524
+#: login-utils/login.c:526
#, c-format
msgid "from %.*s\n"
msgstr "来自 %.*s\n"
-#: login-utils/login.c:527
+#: login-utils/login.c:529
#, c-format
msgid "on %.*s\n"
msgstr "于 %.*s\n"
-#: login-utils/login.c:545
+#: login-utils/login.c:547
msgid "write lastlog failed"
msgstr "写 lastlog 失败"
-#: login-utils/login.c:636
+#: login-utils/login.c:638
#, c-format
msgid "DIALUP AT %s BY %s"
msgstr "DIALUP AT %s BY %s"
-#: login-utils/login.c:641
+#: login-utils/login.c:643
#, c-format
msgid "ROOT LOGIN ON %s FROM %s"
msgstr "ROOT LOGIN ON %s FROM %s"
-#: login-utils/login.c:644
+#: login-utils/login.c:646
#, c-format
msgid "ROOT LOGIN ON %s"
msgstr "ROOT LOGIN ON %s"
-#: login-utils/login.c:647
+#: login-utils/login.c:649
#, c-format
msgid "LOGIN ON %s BY %s FROM %s"
msgstr "LOGIN ON %s BY %s FROM %s"
-#: login-utils/login.c:650
+#: login-utils/login.c:652
#, c-format
msgid "LOGIN ON %s BY %s"
msgstr "LOGIN ON %s BY %s"
-#: login-utils/login.c:703
+#: login-utils/login.c:685
msgid "login: "
msgstr "登录:"
-#: login-utils/login.c:729
+#: login-utils/login.c:711
#, c-format
msgid "PAM failure, aborting: %s"
msgstr "PAM 失败,将中止:%s"
-#: login-utils/login.c:730
+#: login-utils/login.c:712
#, c-format
msgid "Couldn't initialize PAM: %s"
msgstr "无法初始化 PAM:%s"
-#: login-utils/login.c:801
+#: login-utils/login.c:783
#, c-format
msgid "FAILED LOGIN %u FROM %s FOR %s, %s"
msgstr "FAILED LOGIN %u FROM %s FOR %s, %s"
-#: login-utils/login.c:809 login-utils/sulogin.c:1015
+#: login-utils/login.c:791 login-utils/sulogin.c:1013
#, c-format
msgid ""
"Login incorrect\n"
@@ -7374,17 +7471,17 @@ msgstr ""
"登录不正确\n"
"\n"
-#: login-utils/login.c:824
+#: login-utils/login.c:806
#, 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:830
+#: login-utils/login.c:812
#, c-format
msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-#: login-utils/login.c:838
+#: login-utils/login.c:820
#, c-format
msgid ""
"\n"
@@ -7393,7 +7490,7 @@ msgstr ""
"\n"
"登录不正确\n"
-#: login-utils/login.c:866 login-utils/login.c:1216 login-utils/login.c:1239
+#: login-utils/login.c:848 login-utils/login.c:1228 login-utils/login.c:1251
msgid ""
"\n"
"Session setup problem, abort."
@@ -7401,86 +7498,104 @@ msgstr ""
"\n"
"会话设置问题,中止。"
-#: login-utils/login.c:867
+#: login-utils/login.c:849
#, c-format
msgid "NULL user name in %s:%d. Abort."
msgstr "%s:%d 中是空(NULL)用户名。中止。"
-#: login-utils/login.c:1004
+#: login-utils/login.c:986
#, c-format
msgid "TIOCSCTTY failed: %m"
msgstr "TIOCSCTTY 失败:%m"
-#: login-utils/login.c:1158
-#, c-format
-msgid "login: -h is for superuser only\n"
-msgstr "login:-h 是超级用户专用选项\n"
-
-#: login-utils/login.c:1173
-#, c-format
-msgid "Usage: login [-p] [-h <host>] [-H] [[-f] <username>]\n"
+#: login-utils/login.c:1090
+#, fuzzy, c-format
+msgid " %s [-p] [-h <host>] [-H] [[-f] <username>]\n"
msgstr "用法:login [-p] [-h <主机>] [-H] [[-f] <用户名>]\n"
-#: login-utils/login.c:1175
+#: login-utils/login.c:1092
msgid "Begin a session on the system.\n"
msgstr "在此系统上开始一次会话。\n"
-#: login-utils/login.c:1217
+#: login-utils/login.c:1095
+#, fuzzy
+msgid " -p do not destroy the environment"
+msgstr " -f 不分割长行\n"
+
+#: login-utils/login.c:1096
+msgid " -f skip a second login authentication"
+msgstr ""
+
+#: login-utils/login.c:1097
+msgid " -h <host> hostname to be used for utmp logging"
+msgstr ""
+
+#: login-utils/login.c:1098
+#, fuzzy
+msgid " -H suppress hostname in the login prompt"
+msgstr " -u 屏蔽下划线\n"
+
+#: login-utils/login.c:1171
+#, c-format
+msgid "login: -h is for superuser only\n"
+msgstr "login:-h 是超级用户专用选项\n"
+
+#: login-utils/login.c:1229
#, c-format
msgid "Invalid user name \"%s\" in %s:%d. Abort."
msgstr "%2$s:%3$d 中是无效用户名“%1$s”。中止。"
-#: login-utils/login.c:1238
+#: login-utils/login.c:1250
#, c-format
msgid "groups initialization failed: %m"
msgstr "组初始化失败:%m"
-#: login-utils/login.c:1263
+#: login-utils/login.c:1275
msgid "setgid() failed"
msgstr "setgid() 失败"
-#: login-utils/login.c:1293
+#: login-utils/login.c:1305
#, c-format
msgid "You have new mail.\n"
msgstr "有您的新邮件。\n"
-#: login-utils/login.c:1295
+#: login-utils/login.c:1307
#, c-format
msgid "You have mail.\n"
msgstr "有您的邮件。\n"
-#: login-utils/login.c:1309
+#: login-utils/login.c:1321
msgid "setuid() failed"
msgstr "setuid() 失败"
-#: login-utils/login.c:1315 login-utils/sulogin.c:729
+#: login-utils/login.c:1327 login-utils/sulogin.c:729
#, c-format
msgid "%s: change directory failed"
msgstr "%s:更改目录失败"
-#: login-utils/login.c:1322 login-utils/sulogin.c:730
+#: login-utils/login.c:1334 login-utils/sulogin.c:730
#, c-format
msgid "Logging in with home = \"/\".\n"
msgstr "以 home = “/” 登录。\n"
-#: login-utils/login.c:1351
+#: login-utils/login.c:1363
msgid "couldn't exec shell script"
msgstr "无法执行(exec) shell 脚本"
-#: login-utils/login.c:1353
+#: login-utils/login.c:1365
msgid "no shell"
msgstr "无 shell"
-#: login-utils/logindefs.c:206
+#: login-utils/logindefs.c:213
#, c-format
msgid "%s: %s contains invalid numerical value: %s"
msgstr "%s:%s 包含无效的数字值:%s"
-#: login-utils/logindefs.c:376
+#: login-utils/logindefs.c:383
msgid "hush login status: restore original IDs failed"
msgstr "静默(hush)登录状态:恢复原 ID 失败"
-#: login-utils/lslogins.c:208 sys-utils/lscpu.c:1589 sys-utils/lscpu.c:1599
+#: login-utils/lslogins.c:208 sys-utils/lscpu.c:1588 sys-utils/lscpu.c:1598
#: sys-utils/lsmem.c:200
msgid "no"
msgstr "否"
@@ -7703,11 +7818,11 @@ msgstr "生成时间字符串失败"
msgid "failed to get supplementary groups"
msgstr "获得附属组失败"
-#: login-utils/lslogins.c:1070
+#: login-utils/lslogins.c:1069
msgid "internal error: unknown column"
msgstr "内部错误:未知的列"
-#: login-utils/lslogins.c:1168
+#: login-utils/lslogins.c:1167
#, c-format
msgid ""
"\n"
@@ -7716,12 +7831,12 @@ msgstr ""
"\n"
"上次的日志:\n"
-#: login-utils/lslogins.c:1227 login-utils/nologin.c:26
-#: misc-utils/lslocks.c:494 misc-utils/mcookie.c:82 misc-utils/uuidd.c:70
-#: misc-utils/uuidgen.c:25 sys-utils/dmesg.c:263 sys-utils/ipcmk.c:66
-#: sys-utils/lscpu.c:2052 sys-utils/lsipc.c:277 sys-utils/lsmem.c:371
-#: sys-utils/readprofile.c:104 sys-utils/rtcwake.c:95 term-utils/setterm.c:378
-#: text-utils/line.c:30
+#: login-utils/lslogins.c:1227 login-utils/nologin.c:27
+#: misc-utils/lslocks.c:495 misc-utils/mcookie.c:83 misc-utils/uuidd.c:62
+#: misc-utils/uuidgen.c:26 sys-utils/dmesg.c:275 sys-utils/ipcmk.c:67
+#: sys-utils/lscpu.c:2052 sys-utils/lsipc.c:278 sys-utils/lsmem.c:373
+#: sys-utils/readprofile.c:104 sys-utils/rtcwake.c:96 term-utils/setterm.c:379
+#: text-utils/line.c:31
#, c-format
msgid " %s [options]\n"
msgstr " %s [选项]\n"
@@ -7738,7 +7853,7 @@ msgstr " -a, --acc-expiration 显示关于密码过期的信息\n"
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:1235 sys-utils/lsipc.c:296
+#: login-utils/lslogins.c:1235 sys-utils/lsipc.c:297
msgid " -e, --export display in an export-able output format\n"
msgstr " -e, --export 以可导出的格式显示\n"
@@ -7762,19 +7877,19 @@ msgstr " -L, --last 显示关于该用户上次登录会话的信
msgid " -l, --logins=<logins> display only users from <logins>\n"
msgstr " -l, --logins=<登录方式> 只显示以指定<登录方式>登录的用户\n"
-#: login-utils/lslogins.c:1241 sys-utils/lsipc.c:298
+#: login-utils/lslogins.c:1241 sys-utils/lsipc.c:299
msgid " -n, --newline display each piece of information on a new line\n"
msgstr " -n, --newline 逐行显示每一部分信息\n"
-#: login-utils/lslogins.c:1242 sys-utils/lsipc.c:291
+#: login-utils/lslogins.c:1242 sys-utils/lsipc.c:292
msgid " --noheadings don't print headings\n"
msgstr " --noheadings 不打印标题\n"
-#: login-utils/lslogins.c:1243 sys-utils/lsipc.c:292
+#: login-utils/lslogins.c:1243 sys-utils/lsipc.c:293
msgid " --notruncate don't truncate output\n"
msgstr " --notruncate 不截断输出\n"
-#: login-utils/lslogins.c:1244 sys-utils/lsipc.c:300
+#: login-utils/lslogins.c:1244 sys-utils/lsipc.c:301
msgid " -o, --output[=<list>] define the columns to output\n"
msgstr " -o, --output[=<列表>] 定义要输出的列\n"
@@ -7782,7 +7897,7 @@ msgstr " -o, --output[=<列表>] 定义要输出的列\n"
msgid " -p, --pwd display information related to login by password.\n"
msgstr " -p, --pwd 显示与 用密码登录 相关的信息。\n"
-#: login-utils/lslogins.c:1246 sys-utils/lsipc.c:302
+#: login-utils/lslogins.c:1246 sys-utils/lsipc.c:303
msgid " -r, --raw display in raw mode\n"
msgstr " -r, --raw 以原始方式显示\n"
@@ -7790,7 +7905,7 @@ msgstr " -r, --raw 以原始方式显示\n"
msgid " -s, --system-accs display system accounts\n"
msgstr " -s, --system-accs 显示系统帐户\n"
-#: login-utils/lslogins.c:1248 sys-utils/lsipc.c:293
+#: login-utils/lslogins.c:1248 sys-utils/lsipc.c:294
msgid " --time-format=<type> display dates in short, full or iso format\n"
msgstr " --time-format=<格式> 以短、长或 iso 格式显示日期\n"
@@ -7814,21 +7929,11 @@ msgstr " --wtmp-file <路径> 设置 wtmp 的可选路径\n"
msgid " --btmp-file <path> set an alternate path for btmp\n"
msgstr " --btmp-file <路径> 设置 btmp 的可选路径\n"
-#: login-utils/lslogins.c:1258 misc-utils/findmnt.c:1251 sys-utils/lscpu.c:2071
-#: sys-utils/lsmem.c:391
-#, c-format
-msgid ""
-"\n"
-"Available columns:\n"
-msgstr ""
-"\n"
-"可用的列:\n"
-
-#: login-utils/lslogins.c:1441
+#: login-utils/lslogins.c:1435
msgid "failed to request selinux state"
msgstr "请求 selinux 状态失败"
-#: login-utils/lslogins.c:1455 login-utils/lslogins.c:1459
+#: login-utils/lslogins.c:1449 login-utils/lslogins.c:1453
msgid "Only one user may be specified. Use -l for multiple users."
msgstr "只能指定一个用户。多用户请使用 -l。"
@@ -7844,16 +7949,16 @@ msgstr "getline() 失败"
msgid "Password: "
msgstr "密码:"
-#: login-utils/newgrp.c:160 login-utils/sulogin.c:997
+#: login-utils/newgrp.c:160 login-utils/sulogin.c:995
msgid "crypt failed"
msgstr "crypt 失败"
-#: login-utils/newgrp.c:172
+#: login-utils/newgrp.c:173
#, c-format
msgid " %s <group>\n"
msgstr " %s <组>\n"
-#: login-utils/newgrp.c:175
+#: login-utils/newgrp.c:176
msgid "Log in to a new group.\n"
msgstr "以新的组登录。\n"
@@ -7861,7 +7966,7 @@ msgstr "以新的组登录。\n"
msgid "who are you?"
msgstr "您是哪位?"
-#: login-utils/newgrp.c:217 login-utils/newgrp.c:229 sys-utils/nsenter.c:475
+#: login-utils/newgrp.c:217 login-utils/newgrp.c:229 sys-utils/nsenter.c:474
msgid "setgid failed"
msgstr "setgid 失败"
@@ -7869,11 +7974,11 @@ msgstr "setgid 失败"
msgid "no such group"
msgstr "无此组"
-#: login-utils/newgrp.c:233 sys-utils/nsenter.c:477
+#: login-utils/newgrp.c:233 sys-utils/nsenter.c:476
msgid "setuid failed"
msgstr "setuid 失败"
-#: login-utils/nologin.c:29
+#: login-utils/nologin.c:30
msgid "Politely refuse a login.\n"
msgstr "客气的拒绝登录。\n"
@@ -7882,35 +7987,79 @@ msgstr "客气的拒绝登录。\n"
msgid "This account is currently not available.\n"
msgstr "此帐户目前不可用。\n"
-#: login-utils/su-common.c:283
-#, c-format
-msgid "cannot open session: %s"
-msgstr "无法打开会话:%s"
+#: login-utils/su-common.c:229
+msgid " (core dumped)"
+msgstr " (核心已转储)"
-#: login-utils/su-common.c:295
-msgid "cannot create child process"
-msgstr "无法创建子进程"
+#: login-utils/su-common.c:283 term-utils/script.c:636
+msgid "failed to get terminal attributes"
+msgstr "取终端属性失败"
#: login-utils/su-common.c:307
-#, c-format
-msgid "cannot change directory to %s"
-msgstr "无法更改到 %s 目录"
+#, fuzzy
+msgid "failed to create pseudo-terminal"
+msgstr "分配输出表失败"
-#: login-utils/su-common.c:312
+#: login-utils/su-common.c:493 login-utils/su-common.c:767
msgid "cannot block signals"
msgstr "无法阻塞信号"
-#: login-utils/su-common.c:326 login-utils/su-common.c:334
-#: login-utils/su-common.c:340 misc-utils/uuidd.c:407 sys-utils/lscpu.c:892
-#: term-utils/script.c:779
+#: login-utils/su-common.c:529 misc-utils/uuidd.c:411 term-utils/script.c:496
+msgid "poll failed"
+msgstr "轮询失败"
+
+#: login-utils/su-common.c:675
+#, fuzzy
+msgid "failed to modify environment"
+msgstr "打开目录失败"
+
+#: login-utils/su-common.c:711
+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:748
+#, c-format
+msgid "cannot open session: %s"
+msgstr "无法打开会话:%s"
+
+#: login-utils/su-common.c:784
+msgid "cannot initialize signal mask for session"
+msgstr ""
+
+#: login-utils/su-common.c:792
+#, fuzzy
+msgid "cannot initialize signal mask"
+msgstr "无法阻塞信号"
+
+#: login-utils/su-common.c:802
+#, fuzzy
+msgid "cannot set signal handler for session"
+msgstr "无法设置信号处理函数"
+
+#: login-utils/su-common.c:810 misc-utils/uuidd.c:398 sys-utils/lscpu.c:892
+#: term-utils/script.c:800
msgid "cannot set signal handler"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:365
-msgid " (core dumped)"
-msgstr " (核心已转储)"
+#: login-utils/su-common.c:818
+#, fuzzy
+msgid "cannot set signal mask"
+msgstr "无法设置信号处理函数"
+
+#: login-utils/su-common.c:846
+msgid "cannot create child process"
+msgstr "无法创建子进程"
+
+#: login-utils/su-common.c:863
+#, c-format
+msgid "cannot change directory to %s"
+msgstr "无法更改到 %s 目录"
-#: login-utils/su-common.c:384
+#: login-utils/su-common.c:882
#, c-format
msgid ""
"\n"
@@ -7919,92 +8068,57 @@ msgstr ""
"\n"
"会话已终止,正在杀死 shell..."
-#: login-utils/su-common.c:396
+#: login-utils/su-common.c:893
#, c-format
msgid " ...killed.\n"
msgstr " ...已杀死。\n"
-#: login-utils/su-common.c:477
-msgid "may not be used by non-root users"
-msgstr "非 root 用户不能使用"
-
-#: login-utils/su-common.c:505
-msgid "incorrect password"
-msgstr "密码错误"
+#: login-utils/su-common.c:944
+#, fuzzy
+msgid "failed to set the PATH environment variable"
+msgstr "设置环境变量 %s 失败"
-#: login-utils/su-common.c:589
+#: login-utils/su-common.c:1009
msgid "cannot set groups"
msgstr "无法设置 组"
-#: login-utils/su-common.c:604 sys-utils/eject.c:664
+#: login-utils/su-common.c:1015
+#, fuzzy, c-format
+msgid "failed to user credentials: %s"
+msgstr "解析级别“%s”失败"
+
+#: login-utils/su-common.c:1025 sys-utils/eject.c:664
msgid "cannot set group id"
msgstr "无法设置 组 id"
-#: login-utils/su-common.c:606 sys-utils/eject.c:667
+#: login-utils/su-common.c:1027 sys-utils/eject.c:667
msgid "cannot set user id"
msgstr "无法设置 用户 id"
-#: login-utils/su-common.c:679
-#, fuzzy, c-format
-msgid " %s [options] -u <user> [[--] <command>]\n"
-msgstr " %s [选项] -u <用户> <命令>\n"
-
-#: login-utils/su-common.c:680 login-utils/su-common.c:692
-#, c-format
-msgid " %s [options] [-] [<user> [<argument>...]]\n"
-msgstr " %s [选项] [-] [<用户> [<参数>...]]\n"
-
-#: login-utils/su-common.c:681
-msgid ""
-"\n"
-"Run <command> with the effective user ID and group ID of <user>. If -u is\n"
-"not given, fall back to su(1)-compatible semantics and execute standard shell.\n"
-"The options -c, -f, -l, and -s are mutually exclusive with -u.\n"
-msgstr ""
-"\n"
-"以<用户>的有效用户 id 和组 id 运行<命令>。如果未给出 -u,\n"
-"将退而使用与 su(1) 兼容的语法并执行标准 shell。\n"
-"选项 -c、-f、-l 及 -s 与 -u 相互排斥。\n"
-
-#: login-utils/su-common.c:688
-msgid " -u, --user <user> username\n"
-msgstr " -u, --user <用户> 用户名\n"
-
-#: login-utils/su-common.c:693
-msgid ""
-"\n"
-"Change the effective user ID and group ID to that of <user>.\n"
-"A mere - implies -l. If <user> is not given, root is assumed.\n"
-msgstr ""
-"\n"
-"将有效用户 id 和组 id 更改为<用户>的 id。\n"
-"单个 - 视为 -l。如果未指定<用户>,将假定为 root。\n"
-
-#: login-utils/su-common.c:700
+#: login-utils/su-common.c:1098
msgid " -m, -p, --preserve-environment do not reset environment variables\n"
msgstr " -m, -p, --preserve-environment 不重置环境变量\n"
-#: login-utils/su-common.c:701
+#: login-utils/su-common.c:1099
msgid " -g, --group <group> specify the primary group\n"
msgstr " -g, --group <组> 指定主组\n"
-#: login-utils/su-common.c:702
-msgid ""
-" -G, --supp-group <group> specify a supplemental group\n"
-"\n"
+#: login-utils/su-common.c:1100
+#, fuzzy
+msgid " -G, --supp-group <group> specify a supplemental group\n"
msgstr ""
" -G, --supp-group <组> 指定一个辅助组\n"
"\n"
-#: login-utils/su-common.c:704
+#: login-utils/su-common.c:1103
msgid " -, -l, --login make the shell a login shell\n"
msgstr " -, -l, --login 使 shell 成为登录 shell\n"
-#: login-utils/su-common.c:705
+#: login-utils/su-common.c:1104
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:706
+#: login-utils/su-common.c:1105
msgid ""
" --session-command <command> pass a single command to the shell with -c\n"
" and do not create a new session\n"
@@ -8012,52 +8126,103 @@ msgstr ""
" --session-command <命令> 使用 -c 向 shell 传递一条命令\n"
" 而不创建新会话\n"
-#: login-utils/su-common.c:708
+#: login-utils/su-common.c:1107
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:709
+#: login-utils/su-common.c:1108
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:756
+#: login-utils/su-common.c:1109
+#, fuzzy
+msgid " -P, --pty create a new pseudo-terminal\n"
+msgstr " -t, --table 创建表格\n"
+
+#: login-utils/su-common.c:1119
+#, fuzzy, c-format
+msgid ""
+" %1$s [options] -u <user> [[--] <command>]\n"
+" %1$s [options] [-] [<user> [<argument>...]]\n"
+msgstr ""
+" %1$s [选项] <设备> [[-N] <分区>]\n"
+" %1$s [选项] <命令>\n"
+
+#: login-utils/su-common.c:1124
+#, fuzzy
+msgid ""
+"Run <command> with the effective user ID and group ID of <user>. If -u is\n"
+"not given, fall back to su(1)-compatible semantics and execute standard shell.\n"
+"The options -c, -f, -l, and -s are mutually exclusive with -u.\n"
+msgstr ""
+"\n"
+"以<用户>的有效用户 id 和组 id 运行<命令>。如果未给出 -u,\n"
+"将退而使用与 su(1) 兼容的语法并执行标准 shell。\n"
+"选项 -c、-f、-l 及 -s 与 -u 相互排斥。\n"
+
+#: login-utils/su-common.c:1129
+#, fuzzy
+msgid " -u, --user <user> username\n"
+msgstr " -u, --user <用户> 用户名\n"
+
+#: login-utils/su-common.c:1140
+#, c-format
+msgid " %s [options] [-] [<user> [<argument>...]]\n"
+msgstr " %s [选项] [-] [<用户> [<参数>...]]\n"
+
+#: login-utils/su-common.c:1144
+#, fuzzy
+msgid ""
+"Change the effective user ID and group ID to that of <user>.\n"
+"A mere - implies -l. If <user> is not given, root is assumed.\n"
+msgstr ""
+"\n"
+"将有效用户 id 和组 id 更改为<用户>的 id。\n"
+"单个 - 视为 -l。如果未指定<用户>,将假定为 root。\n"
+
+#: login-utils/su-common.c:1190
#, 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:762
+#: login-utils/su-common.c:1196
#, c-format
msgid "group %s does not exist"
msgstr "组 %s 不存在"
-#: login-utils/su-common.c:880
+#: login-utils/su-common.c:1296
+#, fuzzy
+msgid "--pty is not supported for your system"
+msgstr "您的系统不支持 --reload"
+
+#: login-utils/su-common.c:1332
msgid "ignoring --preserve-environment, it's mutually exclusive with --login"
msgstr "将忽略 --preserve-environment,它与 --login 互斥。"
-#: login-utils/su-common.c:891
+#: login-utils/su-common.c:1346
msgid "options --{shell,fast,command,session-command,login} and --user are mutually exclusive"
msgstr "选项 --{shell,fast,command,session-command,login} 和 --user 互斥"
-#: login-utils/su-common.c:895
+#: login-utils/su-common.c:1349
msgid "no command was specified"
msgstr "没有指定命令"
-#: login-utils/su-common.c:912
+#: login-utils/su-common.c:1361
msgid "only root can specify alternative groups"
msgstr "只有 root 用户能指定替代组"
-#: login-utils/su-common.c:919
+#: login-utils/su-common.c:1371
#, c-format
msgid "user %s does not exist"
msgstr "用户 %s 不存在"
-#: login-utils/su-common.c:959
+#: login-utils/su-common.c:1404
#, c-format
msgid "using restricted shell %s"
msgstr "将使用受限 shell %s"
-#: login-utils/su-common.c:983
+#: login-utils/su-common.c:1435
#, c-format
msgid "warning: cannot change directory to %s"
msgstr "警告:无法更改到 %s 目录"
@@ -8133,16 +8298,16 @@ msgstr "更改到系统根目录失败"
msgid "setexeccon failed"
msgstr "setexeccon 失败"
-#: login-utils/sulogin.c:802
+#: login-utils/sulogin.c:803
#, c-format
msgid " %s [options] [tty device]\n"
msgstr " %s [选项] [tty 设备]\n"
-#: login-utils/sulogin.c:805
+#: login-utils/sulogin.c:806
msgid "Single-user login.\n"
msgstr "单用户登录。\n"
-#: login-utils/sulogin.c:808
+#: login-utils/sulogin.c:809
msgid ""
" -p, --login-shell start a login shell\n"
" -t, --timeout <seconds> max time to wait for a password (default: no limit)\n"
@@ -8152,24 +8317,24 @@ msgstr ""
" -t, --timeout <秒数> 等待密码的最大时间(默认:无限制)\n"
" -e, --force 如果 getpwnam(3) 失败,直接检查密码文件\n"
-#: login-utils/sulogin.c:863 misc-utils/findmnt.c:1470 sys-utils/wdctl.c:525
-#: term-utils/agetty.c:758 term-utils/wall.c:210
+#: login-utils/sulogin.c:863 misc-utils/findmnt.c:1468 sys-utils/wdctl.c:524
+#: term-utils/agetty.c:808 term-utils/wall.c:216
msgid "invalid timeout argument"
msgstr "无效的 timeout 超时参数"
-#: login-utils/sulogin.c:885
+#: login-utils/sulogin.c:884
msgid "only superuser can run this program"
msgstr "只有超级用户能运行此程序"
-#: login-utils/sulogin.c:928
+#: login-utils/sulogin.c:927
msgid "cannot open console"
msgstr "打不开终端"
-#: login-utils/sulogin.c:935
+#: login-utils/sulogin.c:934
msgid "cannot open password database"
msgstr "无法打开密码数据库"
-#: login-utils/sulogin.c:1012
+#: login-utils/sulogin.c:1010
#, fuzzy, c-format
msgid ""
"cannot execute su shell\n"
@@ -8178,7 +8343,7 @@ msgstr ""
"无法执行 su shell\n"
"\n"
-#: login-utils/sulogin.c:1019
+#: login-utils/sulogin.c:1017
msgid ""
"Timed out\n"
"\n"
@@ -8186,7 +8351,7 @@ msgstr ""
"超时\n"
"\n"
-#: login-utils/sulogin.c:1051
+#: login-utils/sulogin.c:1049
#, fuzzy
msgid ""
"cannot wait on su shell\n"
@@ -8209,24 +8374,24 @@ msgstr "%s:无法读 inotify 事件"
msgid "Extraneous newline in file. Exiting."
msgstr "文件中有无关的换行符。将退出。"
-#: login-utils/utmpdump.c:304
+#: login-utils/utmpdump.c:305
#, c-format
msgid " %s [options] [filename]\n"
msgstr " %s [选项] [文件名]\n"
-#: login-utils/utmpdump.c:307
+#: login-utils/utmpdump.c:308
msgid "Dump UTMP and WTMP files in raw format.\n"
msgstr "以原始格式转储 UTMP 和 WTMP 文件。\n"
-#: login-utils/utmpdump.c:310
+#: login-utils/utmpdump.c:311
msgid " -f, --follow output appended data as the file grows\n"
msgstr " -f, --follow 随文件增长输出追加的数据\n"
-#: login-utils/utmpdump.c:311
+#: login-utils/utmpdump.c:312
msgid " -r, --reverse write back dumped data into utmp file\n"
msgstr " -r, --reverse 将转储的数据写回 utmp 文件\n"
-#: login-utils/utmpdump.c:312
+#: login-utils/utmpdump.c:313
msgid " -o, --output <file> write to file instead of standard output\n"
msgstr " -o, --output <文件> 写入文件而非标准输出\n"
@@ -8244,74 +8409,74 @@ msgstr "%s 的 Utmp undump\n"
msgid "Utmp dump of %s\n"
msgstr "%s 的 Utmp dump\n"
-#: login-utils/vipw.c:142
+#: login-utils/vipw.c:145
msgid "can't open temporary file"
msgstr "无法打开临时文件"
-#: login-utils/vipw.c:158
+#: login-utils/vipw.c:161
#, c-format
msgid "%s: create a link to %s failed"
msgstr "%s:创建指向 %s 的链接失败"
-#: login-utils/vipw.c:165
+#: login-utils/vipw.c:168
#, c-format
msgid "Can't get context for %s"
msgstr "无法获取 %s 的环境"
-#: login-utils/vipw.c:171
+#: login-utils/vipw.c:174
#, c-format
msgid "Can't set context for %s"
msgstr "无法设置 %s 的环境"
-#: login-utils/vipw.c:237
+#: login-utils/vipw.c:240
#, c-format
msgid "%s unchanged"
msgstr "%s 未改变"
-#: login-utils/vipw.c:255
+#: login-utils/vipw.c:258
msgid "cannot get lock"
msgstr "无法获得锁"
-#: login-utils/vipw.c:282
+#: login-utils/vipw.c:285
msgid "no changes made"
msgstr "无改变"
-#: login-utils/vipw.c:291
+#: login-utils/vipw.c:294
msgid "cannot chmod file"
msgstr "无法对文件 chmod"
-#: login-utils/vipw.c:305
+#: login-utils/vipw.c:309
msgid "Edit the password or group file.\n"
msgstr "编辑密码或组文件。\n"
-#: login-utils/vipw.c:359
+#: login-utils/vipw.c:362
msgid "You are using shadow groups on this system.\n"
msgstr "您正在使用此系统上的遮蔽(shadow)组。\n"
-#: login-utils/vipw.c:360
+#: login-utils/vipw.c:363
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:364
+#: login-utils/vipw.c:367
#, c-format
msgid "Would you like to edit %s now [y/n]? "
msgstr "您想现在编辑 %s 吗[y/n]?"
-#: misc-utils/blkid.c:65
+#: 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:75
+#: misc-utils/blkid.c:76
#, c-format
msgid ""
" %s --label <label> | --uuid <uuid>\n"
"\n"
msgstr ""
-#: misc-utils/blkid.c:76
+#: misc-utils/blkid.c:77
#, c-format
msgid ""
" %s [--cache-file <file>] [-ghlLv] [--output <format>] [--match-tag <tag>] \n"
@@ -8319,7 +8484,7 @@ msgid ""
"\n"
msgstr ""
-#: misc-utils/blkid.c:78
+#: misc-utils/blkid.c:79
#, c-format
msgid ""
" %s -p [--match-tag <tag>] [--offset <offset>] [--size <size>] \n"
@@ -8327,12 +8492,12 @@ msgid ""
"\n"
msgstr ""
-#: misc-utils/blkid.c:80
+#: misc-utils/blkid.c:81
#, c-format
msgid " %s -i [--match-tag <tag>] [--output <format>] <dev> ...\n"
msgstr ""
-#: misc-utils/blkid.c:82
+#: misc-utils/blkid.c:83
#, fuzzy
msgid ""
" -c, --cache-file <file> read from <file> instead of reading from the default\n"
@@ -8341,85 +8506,85 @@ msgstr ""
" -A, --adjfile <文件> 指定 adjust 文件的路径\n"
" 默认为 %s\n"
-#: misc-utils/blkid.c:84
+#: misc-utils/blkid.c:85
#, fuzzy
msgid " -d, --no-encoding don't encode non-printing characters\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/blkid.c:85
+#: misc-utils/blkid.c:86
msgid " -g, --garbage-collect garbage collect the blkid cache\n"
msgstr ""
-#: misc-utils/blkid.c:86
+#: misc-utils/blkid.c:87
msgid ""
" -o, --output <format> output format; can be one of:\n"
" value, device, export or full; (default: full)\n"
msgstr ""
-#: misc-utils/blkid.c:88
+#: misc-utils/blkid.c:89
#, fuzzy
msgid " -k, --list-filesystems list all known filesystems/RAIDs and exit\n"
msgstr " -l, --list-shells 打印 shell 列表并退出\n"
-#: misc-utils/blkid.c:89
+#: misc-utils/blkid.c:90
msgid " -s, --match-tag <tag> show specified tag(s) (default show all tags)\n"
msgstr ""
-#: misc-utils/blkid.c:90
+#: misc-utils/blkid.c:91
msgid " -t, --match-token <token> find device with a specific token (NAME=value pair)\n"
msgstr ""
-#: misc-utils/blkid.c:91
+#: misc-utils/blkid.c:92
#, fuzzy
msgid " -l, --list-one look up only first device with token specified by -t\n"
msgstr " -l, --list 列出所有或指定的信息(默认)\n"
-#: misc-utils/blkid.c:92
+#: misc-utils/blkid.c:93
#, fuzzy
msgid " -L, --label <label> convert LABEL to device name\n"
msgstr " -s, --size <尺寸> 设备尺寸\n"
-#: misc-utils/blkid.c:93
+#: misc-utils/blkid.c:94
#, fuzzy
msgid " -U, --uuid <uuid> convert UUID to device name\n"
msgstr " -u, --user <用户> 用户名\n"
-#: misc-utils/blkid.c:94
+#: misc-utils/blkid.c:95
#, fuzzy
msgid " <dev> specify device(s) to probe (default: all devices)\n"
msgstr " <设备> 设备(通常是磁盘)的路径\n"
-#: misc-utils/blkid.c:96
+#: misc-utils/blkid.c:97
#, fuzzy
msgid "Low-level probing options:\n"
msgstr "调度选项:\n"
-#: misc-utils/blkid.c:97
+#: misc-utils/blkid.c:98
#, fuzzy
msgid " -p, --probe low-level superblocks probing (bypass cache)\n"
msgstr " -p, --pid 取消共享 pid 名字空间\n"
-#: misc-utils/blkid.c:98
+#: misc-utils/blkid.c:99
#, fuzzy
msgid " -i, --info gather information about I/O limits\n"
msgstr " -i, --info 只打印有关采样步骤(sampling step)的信息\n"
-#: misc-utils/blkid.c:99
+#: misc-utils/blkid.c:100
#, fuzzy
msgid " -S, --size <size> overwrite device size\n"
msgstr " -s, --size <尺寸> 设备尺寸\n"
-#: misc-utils/blkid.c:100
+#: misc-utils/blkid.c:101
#, fuzzy
msgid " -O, --offset <offset> probe at the given offset\n"
msgstr " -H, --host <主机名> 指定登录主机\n"
-#: misc-utils/blkid.c:101
+#: misc-utils/blkid.c:102
#, fuzzy
msgid " -u, --usages <list> filter by \"usage\" (e.g. -u filesystem,raid)\n"
msgstr " -t, --types <列表> 限制文件系统集合\n"
-#: misc-utils/blkid.c:102
+#: misc-utils/blkid.c:103
#, fuzzy
msgid " -n, --match-types <list> filter by filesystem type (e.g. -n vfat,ext3)\n"
msgstr " -t, --types <列表> 限制文件系统集合\n"
@@ -8457,42 +8622,42 @@ msgstr "未知参数:%s"
msgid "error: -u <list> argument is empty"
msgstr ""
-#: misc-utils/blkid.c:754
+#: misc-utils/blkid.c:756
#, fuzzy, c-format
msgid "unsupported output format %s"
msgstr "不支持的参数格式:%s"
-#: misc-utils/blkid.c:757 misc-utils/wipefs.c:535
+#: misc-utils/blkid.c:759 misc-utils/wipefs.c:697
msgid "invalid offset argument"
msgstr "无效的 偏移 参数"
-#: misc-utils/blkid.c:764
+#: misc-utils/blkid.c:766
#, fuzzy
msgid "Too many tags specified"
msgstr "没有指定命令"
-#: misc-utils/blkid.c:770
+#: misc-utils/blkid.c:772
#, fuzzy
msgid "invalid size argument"
msgstr "无效的 时间 参数"
-#: misc-utils/blkid.c:774
+#: misc-utils/blkid.c:776
msgid "Can only search for one NAME=value pair"
msgstr ""
-#: misc-utils/blkid.c:781
+#: misc-utils/blkid.c:783
msgid "-t needs NAME=value pair"
msgstr ""
-#: misc-utils/blkid.c:831
+#: misc-utils/blkid.c:833
msgid "The low-level probing mode does not support 'list' output format"
msgstr ""
-#: misc-utils/blkid.c:844
+#: misc-utils/blkid.c:846
msgid "The low-level probing mode requires a device"
msgstr ""
-#: misc-utils/blkid.c:894
+#: misc-utils/blkid.c:896
msgid "The lookup option requires a search type specified using -t"
msgstr ""
@@ -8539,85 +8704,85 @@ msgstr "年份值不合法"
msgid "illegal year value: use positive integer"
msgstr "年份值不合法:请使用正整数"
-#: misc-utils/cal.c:482 misc-utils/cal.c:495
+#: misc-utils/cal.c:483 misc-utils/cal.c:496
#, c-format
msgid "illegal week value: year %d doesn't have week %d"
msgstr "非法的 周 值:%d 年没有第 %d 周"
-#: misc-utils/cal.c:679
+#: misc-utils/cal.c:680
#, c-format
msgid "%s"
msgstr "%s"
-#: misc-utils/cal.c:685
+#: misc-utils/cal.c:686
#, c-format
msgid "%04d"
msgstr "%04d"
-#: misc-utils/cal.c:691
+#: misc-utils/cal.c:692
#, c-format
msgid "%s %04d"
msgstr "%s %04d"
-#: misc-utils/cal.c:993
+#: misc-utils/cal.c:995
#, c-format
msgid " %s [options] [[[day] month] year]\n"
msgstr " %s [选项] [[[日] 月] 年]\n"
-#: misc-utils/cal.c:994
+#: misc-utils/cal.c:996
#, c-format
msgid " %s [options] <timestamp|monthname>\n"
msgstr " %s [选项] <时间戳|月份名>\n"
-#: misc-utils/cal.c:997
+#: misc-utils/cal.c:999
msgid "Display a calendar, or some part of it.\n"
msgstr "显示日历或部分日历。\n"
-#: misc-utils/cal.c:998
+#: misc-utils/cal.c:1000
msgid "Without any arguments, display the current month.\n"
msgstr "不带参数时,显示当月日历。\n"
-#: misc-utils/cal.c:1001
+#: misc-utils/cal.c:1003
msgid " -1, --one show only a single month (default)\n"
msgstr " -1, --one 只显示一个月(默认)\n"
-#: misc-utils/cal.c:1002
+#: misc-utils/cal.c:1004
msgid " -3, --three show three months spanning the date\n"
msgstr " -3, --three 显示该日期前后三个月\n"
-#: misc-utils/cal.c:1003
+#: misc-utils/cal.c:1005
msgid " -n, --months <num> show num months starting with date's month\n"
msgstr " -n, --months < 数字> 显示以日期所在月份开始的若干个月\n"
-#: misc-utils/cal.c:1004
+#: misc-utils/cal.c:1006
msgid " -S, --span span the date when displaying multiple months\n"
msgstr " -S, --span 显示多个月份时的日期范围\n"
-#: misc-utils/cal.c:1005
+#: misc-utils/cal.c:1007
msgid " -s, --sunday Sunday as first day of week\n"
msgstr " -s, --sunday 周日作为一周的第一天\n"
-#: misc-utils/cal.c:1006
+#: misc-utils/cal.c:1008
msgid " -m, --monday Monday as first day of week\n"
msgstr " -m, --monday 周一作为一周的第一天\n"
-#: misc-utils/cal.c:1007
+#: misc-utils/cal.c:1009
msgid " -j, --julian output Julian dates\n"
msgstr " -j, --julian 输出儒略日期\n"
-#: misc-utils/cal.c:1008
+#: misc-utils/cal.c:1010
msgid " -y, --year show the whole year\n"
msgstr " -y, --year 显示全年\n"
-#: misc-utils/cal.c:1009
+#: misc-utils/cal.c:1011
msgid " -Y, --twelve show the next twelve months\n"
msgstr " -Y, --twelve 显示之后的 12 个月\n"
-#: misc-utils/cal.c:1010
+#: misc-utils/cal.c:1012
msgid " -w, --week[=<num>] show US or ISO-8601 week numbers\n"
msgstr " -w, --week[=<数字>] 显示美国或 ISO-8601 周数\n"
-#: misc-utils/cal.c:1011
+#: misc-utils/cal.c:1013
msgid " --color[=<when>] colorize messages (auto, always or never)\n"
msgstr " --color[=<时机>] 消息彩色显示(auto, always 或 never)\n"
@@ -8661,46 +8826,36 @@ msgstr "解析 %s 失败"
msgid "failed to do fstat: %s"
msgstr "读取失败︰ %s"
-#: misc-utils/fincore.c:266
+#: misc-utils/fincore.c:267
#, c-format
msgid " %s [options] file...\n"
msgstr " %s [选项] 文件...\n"
-#: misc-utils/fincore.c:269
+#: misc-utils/fincore.c:270
#, fuzzy
msgid " -J, --json use JSON output format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: misc-utils/fincore.c:270
+#: misc-utils/fincore.c:271
#, fuzzy
msgid " -b, --bytes print sizes in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n"
-#: misc-utils/fincore.c:271
+#: misc-utils/fincore.c:272
#, fuzzy
msgid " -n, --noheadings don't print headings\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/fincore.c:272
+#: misc-utils/fincore.c:273
#, fuzzy
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: misc-utils/fincore.c:273
+#: misc-utils/fincore.c:274
#, fuzzy
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: misc-utils/fincore.c:279 misc-utils/lsblk.c:1662 misc-utils/lslocks.c:512
-#: sys-utils/lsns.c:632 sys-utils/prlimit.c:196 sys-utils/zramctl.c:548
-#, c-format
-msgid ""
-"\n"
-"Available columns (for --output):\n"
-msgstr ""
-"\n"
-"可用列(用于 --output):\n"
-
#: misc-utils/fincore.c:344 sys-utils/losetup.c:777
msgid "no file specified"
msgstr "未指定文件"
@@ -8714,7 +8869,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:76
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析“%s”"
@@ -8837,7 +8992,7 @@ msgid "move"
msgstr "移动"
#: misc-utils/findmnt.c:814 misc-utils/findmnt.c:1077 sys-utils/eject.c:718
-#: sys-utils/mount.c:322
+#: sys-utils/mount.c:324
msgid "failed to initialize libmount table"
msgstr "初始化 libmount table 失败"
@@ -8847,10 +9002,10 @@ msgid "can't read %s"
msgstr "不能读 %s"
#: misc-utils/findmnt.c:1017 misc-utils/findmnt.c:1083
-#: misc-utils/findmnt-verify.c:94 misc-utils/findmnt-verify.c:482
-#: sys-utils/fstrim.c:187 sys-utils/mount.c:131 sys-utils/mount.c:179
-#: sys-utils/swapoff.c:56 sys-utils/swapoff.c:155 sys-utils/swapon.c:245
-#: sys-utils/swapon.c:275 sys-utils/swapon.c:734 sys-utils/umount.c:170
+#: misc-utils/findmnt-verify.c:94 misc-utils/findmnt-verify.c:481
+#: sys-utils/fstrim.c:187 sys-utils/mount.c:133 sys-utils/mount.c:181
+#: sys-utils/swapoff.c:56 sys-utils/swapoff.c:155 sys-utils/swapon.c:249
+#: sys-utils/swapon.c:279 sys-utils/swapon.c:738 sys-utils/umount.c:174
msgid "failed to initialize libmount iterator"
msgstr "无法初始化 libmount 迭代器"
@@ -8862,7 +9017,7 @@ msgstr "初始化 libmount tabdiff 失败"
msgid "poll() failed"
msgstr "poll() 失败"
-#: misc-utils/findmnt.c:1191
+#: misc-utils/findmnt.c:1192
#, c-format
msgid ""
" %1$s [options]\n"
@@ -8875,15 +9030,15 @@ msgstr ""
" %1$s [选项] <设备> <挂臷点>\n"
" %1$s [选项] [--source <设备>] [--target <挂臷点>]\n"
-#: misc-utils/findmnt.c:1198
+#: misc-utils/findmnt.c:1199
msgid "Find a (mounted) filesystem.\n"
msgstr "查找(挂载的)文件系统。\n"
-#: misc-utils/findmnt.c:1201
+#: misc-utils/findmnt.c:1202
msgid " -s, --fstab search in static table of filesystems\n"
msgstr " -s, --fstab 在文件系统表态表中搜索\n"
-#: misc-utils/findmnt.c:1202
+#: misc-utils/findmnt.c:1203
#, fuzzy
msgid ""
" -m, --mtab search in table of mounted filesystems\n"
@@ -8892,7 +9047,7 @@ msgstr ""
" -k, --kernel 在已挂载文件系统的内核表中搜索\n"
" (默认)\n"
-#: misc-utils/findmnt.c:1204
+#: misc-utils/findmnt.c:1205
msgid ""
" -k, --kernel search in kernel table of mounted\n"
" filesystems (default)\n"
@@ -8900,43 +9055,43 @@ msgstr ""
" -k, --kernel 在已挂载文件系统的内核表中搜索\n"
" (默认)\n"
-#: misc-utils/findmnt.c:1207
+#: misc-utils/findmnt.c:1208
msgid " -p, --poll[=<list>] monitor changes in table of mounted filesystems\n"
msgstr " -p, --poll[=<列表>] 监测已挂臷文件系统表的改变\n"
-#: misc-utils/findmnt.c:1208
+#: misc-utils/findmnt.c:1209
msgid " -w, --timeout <num> upper limit in milliseconds that --poll will block\n"
msgstr " -w, --timeout <数字> --poll 阻塞的时间上限(毫秒)\n"
-#: misc-utils/findmnt.c:1211
+#: misc-utils/findmnt.c:1212
msgid " -A, --all disable all built-in filters, print all filesystems\n"
msgstr " -A, --all 禁用所有内置过滤器,打印所有文件系统\n"
-#: misc-utils/findmnt.c:1212
+#: misc-utils/findmnt.c:1213
msgid " -a, --ascii use ASCII chars for tree formatting\n"
msgstr " -a, --ascii 用 ASCII 字符格式化树\n"
-#: misc-utils/findmnt.c:1213
+#: misc-utils/findmnt.c:1214
msgid " -b, --bytes print sizes in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n"
-#: misc-utils/findmnt.c:1214
+#: misc-utils/findmnt.c:1215
msgid " -C, --nocanonicalize don't canonicalize when comparing paths\n"
msgstr " -c, --no-canonicalize 在比较路径时不对路径规范化\n"
-#: misc-utils/findmnt.c:1215
+#: misc-utils/findmnt.c:1216
msgid " -c, --canonicalize canonicalize printed paths\n"
msgstr " -c, --no-canonicalize 对打印的路径规范化\n"
-#: misc-utils/findmnt.c:1216
+#: misc-utils/findmnt.c:1217
msgid " -D, --df imitate the output of df(1)\n"
msgstr " -D, --df 仿照 df(1) 输出\n"
-#: misc-utils/findmnt.c:1217
+#: misc-utils/findmnt.c:1218
msgid " -d, --direction <word> direction of search, 'forward' or 'backward'\n"
msgstr " -d, --direction <单词> 搜索方向,“forward”(往前)或“backward”(往回)\n"
-#: misc-utils/findmnt.c:1218
+#: misc-utils/findmnt.c:1219
msgid ""
" -e, --evaluate convert tags (LABEL,UUID,PARTUUID,PARTLABEL) \n"
" to device names\n"
@@ -8944,55 +9099,56 @@ msgstr ""
" -e, --evaluate 将标签(LABEL,UUID,PARTUUID,PARTLABEL) 转换为\n"
" 设备名\n"
-#: misc-utils/findmnt.c:1220
+#: misc-utils/findmnt.c:1221
msgid " -F, --tab-file <path> alternative file for -s, -m or -k options\n"
msgstr " -F, --tab-file <路径> -s, -m 或 -k 选项的替代文件\n"
-#: misc-utils/findmnt.c:1221
+#: misc-utils/findmnt.c:1222
msgid " -f, --first-only print the first found filesystem only\n"
msgstr " -f, --first-only 只打印找到的第一个文件系统\n"
-#: misc-utils/findmnt.c:1222
+#: misc-utils/findmnt.c:1223
msgid " -i, --invert invert the sense of matching\n"
msgstr " -i, --invert 反转搜索的匹配\n"
-#: misc-utils/findmnt.c:1223 misc-utils/lslocks.c:500 sys-utils/lsns.c:619
+#: misc-utils/findmnt.c:1224 misc-utils/lslocks.c:501 sys-utils/lsns.c:620
+#: sys-utils/rfkill.c:469
msgid " -J, --json use JSON output format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: misc-utils/findmnt.c:1224 sys-utils/lsns.c:620
+#: misc-utils/findmnt.c:1225 sys-utils/lsns.c:621
msgid " -l, --list use list format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/findmnt.c:1225
+#: misc-utils/findmnt.c:1226
msgid " -N, --task <tid> use alternative namespace (/proc/<tid>/mountinfo file)\n"
msgstr " -N, --task <tid> 使用替代的名字空间(/proc/<tid>/mountinfo 文件)\n"
-#: misc-utils/findmnt.c:1226
+#: misc-utils/findmnt.c:1227
msgid " -n, --noheadings don't print column headings\n"
msgstr " -n, --noheadings 不打印列标题\n"
-#: misc-utils/findmnt.c:1227
+#: misc-utils/findmnt.c:1228
msgid " -O, --options <list> limit the set of filesystems by mount options\n"
msgstr " -O, --options <列表> 根据挂臷选项限制文件系统集合\n"
-#: misc-utils/findmnt.c:1228
+#: misc-utils/findmnt.c:1229
msgid " -o, --output <list> the output columns to be shown\n"
msgstr " -o, --output <列表> 要显示的列\n"
-#: misc-utils/findmnt.c:1229
+#: misc-utils/findmnt.c:1230
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs 使用 键=“值”的输出格式\n"
-#: misc-utils/findmnt.c:1230
+#: misc-utils/findmnt.c:1231
msgid " -R, --submounts print all submounts for the matching filesystems\n"
msgstr " -R, --submounts 打印匹配文件系统的所有子挂载(submount)\n"
-#: misc-utils/findmnt.c:1231
+#: misc-utils/findmnt.c:1232
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: misc-utils/findmnt.c:1232
+#: misc-utils/findmnt.c:1233
msgid ""
" -S, --source <string> the device to mount (by name, maj:min, \n"
" LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n"
@@ -9000,65 +9156,65 @@ msgstr ""
" -S, --source <字符串> 要挂载的设备(按 名称, 主:次设备号, \n"
" LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n"
-#: misc-utils/findmnt.c:1234
+#: misc-utils/findmnt.c:1235
msgid " -T, --target <path> the path to the filesystem to use\n"
msgstr " -T, --target <路径> 要使用的文件系统的路径\n"
-#: misc-utils/findmnt.c:1235
+#: misc-utils/findmnt.c:1236
#, fuzzy
msgid " --tree enable tree format output is possible\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/findmnt.c:1236
+#: misc-utils/findmnt.c:1237
msgid " -M, --mountpoint <dir> the mountpoint directory\n"
msgstr " -M, --mountpoint <目录> 挂载点目录\n"
-#: misc-utils/findmnt.c:1237
+#: misc-utils/findmnt.c:1238
msgid " -t, --types <list> limit the set of filesystems by FS types\n"
msgstr " -t, --types <列表> 根据文件系统类型限制文件系统集合\n"
-#: misc-utils/findmnt.c:1238
+#: misc-utils/findmnt.c:1239
msgid " -U, --uniq ignore filesystems with duplicate target\n"
msgstr " -U, --uniq 忽略目标重复的文件系统\n"
-#: misc-utils/findmnt.c:1239 misc-utils/lslocks.c:506 sys-utils/lsns.c:625
+#: misc-utils/findmnt.c:1240 misc-utils/lslocks.c:507 sys-utils/lsns.c:626
msgid " -u, --notruncate don't truncate text in columns\n"
msgstr " -u, --notruncate 不截断列中的文本\n"
-#: misc-utils/findmnt.c:1240
+#: misc-utils/findmnt.c:1241
msgid " -v, --nofsroot don't print [/dir] for bind or btrfs mounts\n"
msgstr " -v, --nofsroot 对绑定式或 btrfs 挂载不打印[/dir]\n"
-#: misc-utils/findmnt.c:1243
+#: misc-utils/findmnt.c:1244
msgid " -x, --verify verify mount table content (default is fstab)\n"
msgstr " -x, --verify 验证挂载表内容(默认为 fstab)\n"
-#: misc-utils/findmnt.c:1244
+#: misc-utils/findmnt.c:1245
msgid " --verbose print more details\n"
msgstr " --verbose 打印更多细节\n"
-#: misc-utils/findmnt.c:1375
+#: misc-utils/findmnt.c:1373
#, c-format
msgid "unknown direction '%s'"
msgstr "未知方向“%s”"
-#: misc-utils/findmnt.c:1447
+#: misc-utils/findmnt.c:1445
msgid "invalid TID argument"
msgstr "无效的 TID 参数"
-#: misc-utils/findmnt.c:1518
+#: misc-utils/findmnt.c:1516
msgid "--poll accepts only one file, but more specified by --tab-file"
msgstr "--poll 只接受一个文件,但用 --tab-file 指定了多个"
-#: misc-utils/findmnt.c:1522
+#: misc-utils/findmnt.c:1520
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:1575
+#: misc-utils/findmnt.c:1573
msgid "failed to initialize libmount cache"
msgstr "初始化 libmount 缓存失败"
-#: misc-utils/findmnt.c:1618
+#: misc-utils/findmnt.c:1616
#, c-format
msgid "%s column is requested, but --poll is not enabled"
msgstr "请示了 %s 列,但未启用 --poll"
@@ -9072,181 +9228,176 @@ msgstr "不止一次指定目标"
msgid "wrong order: %s specified before %s"
msgstr "顺序错误:%s 在 %s 之前指定"
-#: misc-utils/findmnt-verify.c:133
+#: misc-utils/findmnt-verify.c:132
msgid "undefined target (fs_file)"
msgstr "未定义目标 (fs_file)"
-#: misc-utils/findmnt-verify.c:140
+#: misc-utils/findmnt-verify.c:139
#, c-format
msgid "non-canonical target path (real: %s)"
msgstr "目标路径不规范(实为:%s)"
-#: misc-utils/findmnt-verify.c:145
+#: misc-utils/findmnt-verify.c:144
#, c-format
msgid "unreachable on boot required target: %m"
msgstr "启动所需目标无法访问:%m"
-#: misc-utils/findmnt-verify.c:147
+#: misc-utils/findmnt-verify.c:146
#, c-format
msgid "unreachable target: %m"
msgstr "不可及的目标: %m"
-#: misc-utils/findmnt-verify.c:151
+#: misc-utils/findmnt-verify.c:150
msgid "target is not a directory"
msgstr "目标不是一个目录"
-#: misc-utils/findmnt-verify.c:153
+#: misc-utils/findmnt-verify.c:152
msgid "target exists"
msgstr "目标存在"
-#: misc-utils/findmnt-verify.c:165
+#: misc-utils/findmnt-verify.c:164
#, c-format
msgid "unreachable on boot required source: %s=%s"
msgstr "启动所需的源无法访问:%s=%s"
-#: misc-utils/findmnt-verify.c:167
+#: misc-utils/findmnt-verify.c:166
#, c-format
msgid "unreachable: %s=%s"
msgstr "不可及: %s=%s"
-#: misc-utils/findmnt-verify.c:169
+#: misc-utils/findmnt-verify.c:168
#, c-format
msgid "%s=%s translated to %s"
msgstr "%s=%s 转换为 %s"
-#: misc-utils/findmnt-verify.c:190
+#: misc-utils/findmnt-verify.c:189
msgid "undefined source (fs_spec)"
msgstr "源未定义(fs_spec)"
-#: misc-utils/findmnt-verify.c:199
+#: misc-utils/findmnt-verify.c:198
#, c-format
msgid "unsupported source tag: %s"
msgstr "不受支持的源标记︰ %s"
-#: misc-utils/findmnt-verify.c:206
+#: misc-utils/findmnt-verify.c:205
#, c-format
msgid "do not check %s source (pseudo/net)"
msgstr "不检查 %s 源(pseudo/net)"
-#: misc-utils/findmnt-verify.c:209
+#: misc-utils/findmnt-verify.c:208
#, c-format
msgid "unreachable source: %s: %m"
msgstr "无法访问源︰ %s: %m"
-#: misc-utils/findmnt-verify.c:212
+#: misc-utils/findmnt-verify.c:211
#, c-format
msgid "non-bind mount source %s is a directory or regular file"
msgstr "非绑定挂载源 %s 是一个目录或常规文件"
-#: misc-utils/findmnt-verify.c:215
+#: misc-utils/findmnt-verify.c:214
#, c-format
msgid "source %s is not a block device"
msgstr "源 %s 不是一个块设备"
-#: misc-utils/findmnt-verify.c:217
+#: misc-utils/findmnt-verify.c:216
#, c-format
msgid "source %s exists"
msgstr "源 %s 已存在"
-#: misc-utils/findmnt-verify.c:230
+#: misc-utils/findmnt-verify.c:229
#, c-format
msgid "VFS options: %s"
msgstr "VFS 选项︰ %s"
-#: misc-utils/findmnt-verify.c:234
+#: misc-utils/findmnt-verify.c:233
#, c-format
msgid "FS options: %s"
msgstr "FS 选项︰ %s"
-#: misc-utils/findmnt-verify.c:238
+#: misc-utils/findmnt-verify.c:237
#, c-format
msgid "userspace options: %s"
msgstr "用户空间选项︰ %s"
-#: misc-utils/findmnt-verify.c:252
+#: misc-utils/findmnt-verify.c:251
#, c-format
msgid "unsupported swaparea discard policy: %s"
msgstr "不支持的 swaparea 放弃策略︰ %s"
-#: misc-utils/findmnt-verify.c:260
+#: misc-utils/findmnt-verify.c:259
msgid "failed to parse swaparea priority option"
msgstr "解析 swaparea 优先级选项失败"
-#: misc-utils/findmnt-verify.c:396
+#: misc-utils/findmnt-verify.c:395
#, c-format
msgid "do not check %s FS type (pseudo/net)"
msgstr "不检查 %s 文件系统类型 (pseudo/net)"
-#: misc-utils/findmnt-verify.c:406
+#: misc-utils/findmnt-verify.c:405
msgid "\"none\" FS type is recommended for bind or move oprations only"
msgstr "\"none\" 这种文件系统类型只建议用于绑定或移动操作"
-#: misc-utils/findmnt-verify.c:414
+#: misc-utils/findmnt-verify.c:413
#, fuzzy, c-format
msgid "%s seems unsupported by the current kernel"
msgstr "当前内核似乎不支持 %s"
-#: misc-utils/findmnt-verify.c:420 misc-utils/findmnt-verify.c:421
+#: misc-utils/findmnt-verify.c:419 misc-utils/findmnt-verify.c:420
msgid "cannot detect on-disk filesystem type"
msgstr "无法检测磁盘上(on-disk)的文件系统类型"
-#: misc-utils/findmnt-verify.c:428
+#: misc-utils/findmnt-verify.c:427
#, c-format
msgid "%s does not match with on-disk %s"
msgstr "%s 与磁盘上的 %s 不匹配"
-#: misc-utils/findmnt-verify.c:431
+#: misc-utils/findmnt-verify.c:430
#, fuzzy, c-format
msgid "on-disk %s seems unsupported by the current kernel"
msgstr "当前内核似乎不支持磁盘上的 %s"
-#: misc-utils/findmnt-verify.c:433
+#: misc-utils/findmnt-verify.c:432
#, c-format
msgid "FS type is %s"
msgstr "文件系统类型是 %s"
-#: misc-utils/findmnt-verify.c:445
+#: misc-utils/findmnt-verify.c:444
#, c-format
msgid "recommended root FS passno is 1 (current is %d)"
msgstr " 根文件系统的 passno 推荐值为 1 (当前是 %d)"
-#: misc-utils/findmnt-verify.c:512
+#: misc-utils/findmnt-verify.c:511
#, c-format
msgid "%d parse error"
msgid_plural "%d parse errors"
msgstr[0] "%d 个解析错误"
-#: misc-utils/findmnt-verify.c:513
+#: misc-utils/findmnt-verify.c:512
#, c-format
msgid ", %d error"
msgid_plural ", %d errors"
msgstr[0] ",%d 个错误"
-#: misc-utils/findmnt-verify.c:514
+#: misc-utils/findmnt-verify.c:513
#, c-format
msgid ", %d warning"
msgid_plural ", %d warnings"
msgstr[0] ",%d 个警告"
-#: misc-utils/findmnt-verify.c:517
+#: misc-utils/findmnt-verify.c:516
#, c-format
msgid "Success, no errors or warnings detected\n"
msgstr "成功,未检测到错误或警告\n"
-#: misc-utils/getopt.c:246
-#, c-format
-msgid "Try `%s --help' for more information.\n"
-msgstr "请尝试执行“%s --help”了解更多信息。\n"
-
-#: misc-utils/getopt.c:304
+#: misc-utils/getopt.c:302
msgid "empty long option after -l or --long argument"
msgstr "-l 或 --long 参数后的长选项为空"
-#: misc-utils/getopt.c:325
+#: misc-utils/getopt.c:323
msgid "unknown shell after -s or --shell argument"
msgstr "-s 或 --shell 参数后是未知的 shell"
-#: misc-utils/getopt.c:332
+#: misc-utils/getopt.c:330
#, c-format
msgid ""
" %1$s <optstring> <parameters>\n"
@@ -9257,51 +9408,51 @@ msgstr ""
" %1$s [options] [--] 选项字符串 参数\n"
" %1$s [options] -o|--options 选项字符串 [选项] [--] 参数\n"
-#: misc-utils/getopt.c:338
+#: misc-utils/getopt.c:336
msgid "Parse command options.\n"
msgstr "解析命令选项。 \n"
-#: misc-utils/getopt.c:341
+#: misc-utils/getopt.c:339
msgid " -a, --alternative allow long options starting with single -\n"
msgstr " -a, --alternative 允许长选项以单个 - 开头\n"
-#: misc-utils/getopt.c:342
+#: misc-utils/getopt.c:340
msgid " -l, --longoptions <longopts> the long options to be recognized\n"
msgstr " -l, --longoptions <longopts> 要识别的长选项\n"
-#: misc-utils/getopt.c:343
+#: misc-utils/getopt.c:341
msgid " -n, --name <progname> the name under which errors are reported\n"
msgstr " -n, --name <progname> 要报告其错误的程序名称\n"
-#: misc-utils/getopt.c:344
+#: misc-utils/getopt.c:342
msgid " -o, --options <optstring> the short options to be recognized\n"
msgstr " -o, --options <optstring> 要识别的短选项名称\n"
-#: misc-utils/getopt.c:345
+#: misc-utils/getopt.c:343
msgid " -q, --quiet disable error reporting by getopt(3)\n"
msgstr " -q, --quiet 禁止 getopt(3) 的错误报告\n"
-#: misc-utils/getopt.c:346
+#: misc-utils/getopt.c:344
msgid " -Q, --quiet-output no normal output\n"
msgstr " -Q, --quiet-output 无常规输出\n"
-#: misc-utils/getopt.c:347
+#: misc-utils/getopt.c:345
msgid " -s, --shell <shell> set quoting conventions to those of <shell>\n"
msgstr " -s, --shell <shell> 设置 <shell> 的引用习惯\n"
-#: misc-utils/getopt.c:348
+#: misc-utils/getopt.c:346
msgid " -T, --test test for getopt(1) version\n"
msgstr " -T, --test getopt(1) 版本测试\n"
-#: misc-utils/getopt.c:349
+#: misc-utils/getopt.c:347
msgid " -u, --unquoted do not quote the output\n"
msgstr " -u, --unquoted 不引用输出\n"
-#: misc-utils/getopt.c:399 misc-utils/getopt.c:459
+#: misc-utils/getopt.c:396 misc-utils/getopt.c:456
msgid "missing optstring argument"
msgstr "缺少 optstring 参数"
-#: misc-utils/getopt.c:454
+#: misc-utils/getopt.c:451
msgid "internal error, contact the author."
msgstr "内部错误,请联系作者。"
@@ -9310,16 +9461,16 @@ msgstr "内部错误,请联系作者。"
msgid "unknown signal %s; valid signals:"
msgstr "未知信号 %s;有效信号为:"
-#: misc-utils/kill.c:302
+#: misc-utils/kill.c:303
#, c-format
msgid " %s [options] <pid>|<name>...\n"
msgstr " %s [选项] <pid>|<名称> ...\n"
-#: misc-utils/kill.c:305
+#: misc-utils/kill.c:306
msgid "Forcibly terminate a process.\n"
msgstr "强制结束某个进程。\n"
-#: misc-utils/kill.c:308
+#: misc-utils/kill.c:309
msgid ""
" -a, --all do not restrict the name-to-pid conversion to processes\n"
" with the same uid as the present process\n"
@@ -9327,27 +9478,27 @@ msgstr ""
" -a, --all 不限于只对和当前进程的 uid 相同的进程进行\n"
" 名称-pid 转换\n"
-#: misc-utils/kill.c:310
+#: misc-utils/kill.c:311
msgid " -s, --signal <signal> send this <signal> instead of SIGTERM\n"
msgstr " -s, --signal <信号> 发送指定的<信号>而非 SIGTERM\n"
-#: misc-utils/kill.c:312
+#: misc-utils/kill.c:313
msgid " -q, --queue <value> use sigqueue(2), not kill(2), and pass <value> as data\n"
msgstr " -q, --queue <值> 使用 sigqueue(2) 代替 kill(2),并传递<值>数据\n"
-#: misc-utils/kill.c:314
+#: misc-utils/kill.c:315
msgid " -p, --pid print pids without signaling them\n"
msgstr " -p, --pid 打印 pid 而不向它们发送信号\n"
-#: misc-utils/kill.c:315
+#: misc-utils/kill.c:316
msgid " -l, --list[=<signal>] list signal names, or convert a signal number to a name\n"
msgstr " -l, --list [=<信号>] 列出信号名,或将一个信号数值转换为名称\n"
-#: misc-utils/kill.c:316
+#: misc-utils/kill.c:317
msgid " -L, --table list signal names and numbers\n"
msgstr " -L, --table 列出信号名和数值\n"
-#: misc-utils/kill.c:317
+#: misc-utils/kill.c:318
msgid " --verbose print pids that will be signaled\n"
msgstr " --verbose 打印将收到信号的 pid\n"
@@ -9362,31 +9513,20 @@ msgstr "未知信号:%s"
msgid "%s and %s are mutually exclusive"
msgstr "%s 和 %s 相互排斥"
-#: misc-utils/kill.c:396 misc-utils/kill.c:438 misc-utils/rename.c:180
-#: sys-utils/ipcrm.c:160 term-utils/agetty.c:797 term-utils/agetty.c:806
-msgid "not enough arguments"
-msgstr "参数不够"
-
-#: misc-utils/kill.c:409
-#, c-format
-msgid "option '%s' requires an argument"
-msgstr "“%s”选项需要一个参数"
-
#: misc-utils/kill.c:414 sys-utils/eject.c:205 sys-utils/eject.c:230
-#: sys-utils/losetup.c:694 sys-utils/tunelp.c:161 sys-utils/tunelp.c:168
-#: sys-utils/tunelp.c:175 sys-utils/tunelp.c:182 sys-utils/tunelp.c:189
-#: sys-utils/tunelp.c:195 sys-utils/tunelp.c:199 sys-utils/tunelp.c:206
-#: sys-utils/tunelp.c:231 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:539 term-utils/setterm.c:544
-#: term-utils/setterm.c:549 term-utils/setterm.c:554 term-utils/setterm.c:578
-#: 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:611
-#: term-utils/setterm.c:644
+#: sys-utils/losetup.c:694 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
+#: 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
msgid "argument error"
msgstr "参数出错"
@@ -9483,80 +9623,80 @@ msgstr "将忽略未知的选项参数:%s"
msgid "invalid argument: %s: using automatic errors"
msgstr "无效参数︰ %s︰ 将使用自动错误"
-#: misc-utils/logger.c:994
+#: misc-utils/logger.c:997
#, c-format
msgid " %s [options] [<message>]\n"
msgstr " %s [选项] [<消息>]\n"
-#: misc-utils/logger.c:997
+#: misc-utils/logger.c:1000
msgid "Enter messages into the system log.\n"
msgstr "将消息输入系统日志。\n"
-#: misc-utils/logger.c:1000
+#: misc-utils/logger.c:1003
msgid " -i log the logger command's PID\n"
msgstr " -i 记录日志程序的 PID\n"
-#: misc-utils/logger.c:1001
+#: misc-utils/logger.c:1004
msgid " --id[=<id>] log the given <id>, or otherwise the PID\n"
msgstr " --id[=<id>] 记录指定的 <id>,否则记录 PID\n"
-#: misc-utils/logger.c:1002
+#: misc-utils/logger.c:1005
msgid " -f, --file <file> log the contents of this file\n"
msgstr " -f, --file <文件> 记录指定文件的内容\n"
-#: misc-utils/logger.c:1003
+#: misc-utils/logger.c:1006
msgid " -e, --skip-empty do not log empty lines when processing files\n"
msgstr " -e, --skip-empty 处理文件时不记录空行\n"
-#: misc-utils/logger.c:1004
+#: misc-utils/logger.c:1007
msgid " --no-act do everything except the write the log\n"
msgstr " --no-act 操作但不实际写入日志\n"
-#: misc-utils/logger.c:1005
+#: misc-utils/logger.c:1008
msgid " -p, --priority <prio> mark given message with this priority\n"
msgstr " -p, --priority <prio> 将指定消息标记为此优先级\n"
-#: misc-utils/logger.c:1006
+#: misc-utils/logger.c:1009
msgid " --octet-count use rfc6587 octet counting\n"
msgstr " --octet-count 使用 rfc6587 八位元组(octet) 计数\n"
-#: misc-utils/logger.c:1007
+#: misc-utils/logger.c:1010
msgid " --prio-prefix look for a prefix on every line read from stdin\n"
msgstr " --prio-prefix 从 stdin 输入的每一行查找前缀\n"
-#: misc-utils/logger.c:1008
+#: misc-utils/logger.c:1011
msgid " -s, --stderr output message to standard error as well\n"
msgstr " -s, --stderr 也向标准错误输出消息\n"
-#: misc-utils/logger.c:1009
+#: misc-utils/logger.c:1012
msgid " -S, --size <size> maximum size for a single message\n"
msgstr " -S, --size <大小> 单条消息的最大尺寸\n"
-#: misc-utils/logger.c:1010
+#: misc-utils/logger.c:1013
msgid " -t, --tag <tag> mark every line with this tag\n"
msgstr " -t, --tag <tag> 向每一行添加指定标记\n"
-#: misc-utils/logger.c:1011
+#: misc-utils/logger.c:1014
msgid " -n, --server <name> write to this remote syslog server\n"
msgstr " -n, --server <名称> 写入指定的远程 syslog 服务器\n"
-#: misc-utils/logger.c:1012
+#: misc-utils/logger.c:1015
msgid " -P, --port <port> use this port for UDP or TCP connection\n"
msgstr " -P, --port <端口> 使用指定端口进行 UDP 或 TCP 连接\n"
-#: misc-utils/logger.c:1013
+#: misc-utils/logger.c:1016
msgid " -T, --tcp use TCP only\n"
msgstr " -T, --tcp 只用 TCP\n"
-#: misc-utils/logger.c:1014
+#: misc-utils/logger.c:1017
msgid " -d, --udp use UDP only\n"
msgstr " -d, --udp 只用 UDP\n"
-#: misc-utils/logger.c:1015
+#: misc-utils/logger.c:1018
msgid " --rfc3164 use the obsolete BSD syslog protocol\n"
msgstr " --rfc3164 使用过时的 BSD syslog 协议\n"
-#: misc-utils/logger.c:1016
+#: misc-utils/logger.c:1019
msgid ""
" --rfc5424[=<snip>] use the syslog protocol (the default for remote);\n"
" <snip> can be notime, or notq, and/or nohost\n"
@@ -9564,23 +9704,23 @@ msgstr ""
" --rfc5424[=<snip>] 使用 syslog 协议(远程时默认);\n"
" <snip> 可以是 notime, 或 notq, 和/或 nohost\n"
-#: misc-utils/logger.c:1018
+#: misc-utils/logger.c:1021
msgid " --sd-id <id> rfc5424 structured data ID\n"
msgstr " --sd-id <id> rfc5424 结构化数据 ID\n"
-#: misc-utils/logger.c:1019
+#: misc-utils/logger.c:1022
msgid " --sd-param <data> rfc5424 structured data name=value\n"
msgstr " --sd-param <数据> rfc5424 结构化数据名称=值\n"
-#: misc-utils/logger.c:1020
+#: misc-utils/logger.c:1023
msgid " --msgid <msgid> set rfc5424 message id field\n"
msgstr " --msgid <msgid> 设置 rfc5424 消息 id 字段\n"
-#: misc-utils/logger.c:1021
+#: misc-utils/logger.c:1024
msgid " -u, --socket <socket> write to this Unix socket\n"
msgstr " -u, --socket <套接字> 写入此 Unix 套接字\n"
-#: misc-utils/logger.c:1022
+#: misc-utils/logger.c:1025
msgid ""
" --socket-errors[=<on|off|auto>]\n"
" print connection errors when using Unix sockets\n"
@@ -9588,67 +9728,67 @@ msgstr ""
" --socket-errors[=<on|off|auto>]\n"
" 使用 Unix 套接字时打印连接错误\n"
-#: misc-utils/logger.c:1025
+#: misc-utils/logger.c:1028
msgid " --journald[=<file>] write journald entry\n"
msgstr " --journald[=<文件>] 写 journald 记录\n"
-#: misc-utils/logger.c:1112
+#: misc-utils/logger.c:1114
#, c-format
msgid "file %s"
msgstr "文件 %s"
-#: misc-utils/logger.c:1127
+#: misc-utils/logger.c:1129
msgid "failed to parse id"
msgstr "解析 id 失败"
-#: misc-utils/logger.c:1145
+#: misc-utils/logger.c:1147
msgid "failed to parse message size"
msgstr "解析消息大小失败"
-#: misc-utils/logger.c:1180
+#: misc-utils/logger.c:1182
msgid "--msgid cannot contain space"
msgstr "--msgid 不能包含空格"
-#: misc-utils/logger.c:1202
+#: misc-utils/logger.c:1204
#, c-format
msgid "invalid structured data ID: '%s'"
msgstr "无效的结构化数据 ID: “%s”"
-#: misc-utils/logger.c:1207
+#: misc-utils/logger.c:1209
#, c-format
msgid "invalid structured data parameter: '%s'"
msgstr "无效的结构化数据参数: “%s”"
-#: misc-utils/logger.c:1217
+#: misc-utils/logger.c:1219
msgid "--file <file> and <message> are mutually exclusive, message is ignored"
msgstr "--file <文件> 和 <消息> 互斥,消息已忽略"
-#: misc-utils/logger.c:1224
+#: misc-utils/logger.c:1226
msgid "journald entry could not be written"
msgstr "无法写入 journald 项"
-#: misc-utils/look.c:354
+#: misc-utils/look.c:360
#, c-format
msgid " %s [options] <string> [<file>...]\n"
msgstr " %s [选项] <字符串> [<文件>...]\n"
-#: misc-utils/look.c:357
+#: misc-utils/look.c:363
msgid "Display lines beginning with a specified string.\n"
msgstr "显示以指定字符串开头的行。\n"
-#: misc-utils/look.c:360
+#: misc-utils/look.c:366
msgid " -a, --alternative use the alternative dictionary\n"
msgstr " -a, --alternative 使用替代字典\n"
-#: misc-utils/look.c:361
+#: misc-utils/look.c:367
msgid " -d, --alphanum compare only blanks and alphanumeric characters\n"
msgstr " -d, --alphanum 只比较空白和字母数字字符\n"
-#: misc-utils/look.c:362
+#: misc-utils/look.c:368
msgid " -f, --ignore-case ignore case differences when comparing\n"
msgstr " -f, --ignore-case 比较时忽略大小写\n"
-#: misc-utils/look.c:363
+#: misc-utils/look.c:369
msgid " -t, --terminate <char> define the string-termination character\n"
msgstr " -t, --terminate <字符> 定义字符串终止字符\n"
@@ -9668,7 +9808,7 @@ msgstr "内部上级内核设备名称"
msgid "where the device is mounted"
msgstr "设备挂载位置"
-#: misc-utils/lsblk.c:166
+#: misc-utils/lsblk.c:166 misc-utils/wipefs.c:104
msgid "filesystem LABEL"
msgstr "文件系统标签"
@@ -9850,93 +9990,98 @@ msgstr "排除设备列表过大(限制为 %d 台设备)"
msgid "the list of included devices is too large (limit is %d devices)"
msgstr "包含设备列表过大(限制为 %d 台设备)"
-#: misc-utils/lsblk.c:1630 sys-utils/wdctl.c:174
+#: misc-utils/lsblk.c:1631 sys-utils/wdctl.c:175
#, c-format
msgid " %s [options] [<device> ...]\n"
msgstr " %s [选项] [<设备> ...]\n"
-#: misc-utils/lsblk.c:1633
+#: misc-utils/lsblk.c:1634
msgid "List information about block devices.\n"
msgstr "列出块设备的信息。\n"
-#: misc-utils/lsblk.c:1636
+#: misc-utils/lsblk.c:1637
msgid " -a, --all print all devices\n"
msgstr " -a, --all 打印所有设备\n"
-#: misc-utils/lsblk.c:1638
+#: misc-utils/lsblk.c:1639
msgid " -d, --nodeps don't print slaves or holders\n"
msgstr " -d, --nodeps 不打印从属设备(slave)或占位设备(holder)\n"
-#: misc-utils/lsblk.c:1639
+#: misc-utils/lsblk.c:1640
msgid " -D, --discard print discard capabilities\n"
msgstr " -D, --discard 打印时丢弃能力\n"
-#: misc-utils/lsblk.c:1640
+#: misc-utils/lsblk.c:1641
#, fuzzy
msgid " -z, --zoned print zone model\n"
msgstr " -c, --offline 只打印离线 CPU\n"
-#: misc-utils/lsblk.c:1641
+#: misc-utils/lsblk.c:1642
msgid " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"
msgstr " -e, --exclude <列表> 根据主设备号排除设备(默认:内存盘)\n"
-#: misc-utils/lsblk.c:1642
+#: misc-utils/lsblk.c:1643
msgid " -f, --fs output info about filesystems\n"
msgstr " -f, --fs 输出文件系统信息\n"
-#: misc-utils/lsblk.c:1643
+#: misc-utils/lsblk.c:1644
msgid " -i, --ascii use ascii characters only\n"
msgstr " -i, --ascii 只使用 ascii 字符\n"
-#: misc-utils/lsblk.c:1644
+#: misc-utils/lsblk.c:1645
msgid " -I, --include <list> show only devices with specified major numbers\n"
msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n"
-#: misc-utils/lsblk.c:1645 sys-utils/lsmem.c:377
+#: misc-utils/lsblk.c:1646 sys-utils/lsmem.c:379
msgid " -J, --json use JSON output format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: misc-utils/lsblk.c:1646
+#: misc-utils/lsblk.c:1647
msgid " -l, --list use list format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/lsblk.c:1647
+#: misc-utils/lsblk.c:1648
+#, fuzzy
+msgid " -T, --tree use tree format output\n"
+msgstr " -l, --list 使用列表格式的输出\n"
+
+#: misc-utils/lsblk.c:1649
msgid " -m, --perms output info about permissions\n"
msgstr " -m, --perms 输出权限信息\n"
-#: misc-utils/lsblk.c:1648 sys-utils/lsmem.c:381
+#: misc-utils/lsblk.c:1650 sys-utils/lsmem.c:383
msgid " -n, --noheadings don't print headings\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/lsblk.c:1649 sys-utils/lsmem.c:382
+#: misc-utils/lsblk.c:1651 sys-utils/lsmem.c:384
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: misc-utils/lsblk.c:1650
+#: misc-utils/lsblk.c:1652
msgid " -O, --output-all output all columns\n"
msgstr " -O, --output-all 输出所有列\n"
-#: misc-utils/lsblk.c:1651
+#: misc-utils/lsblk.c:1653
msgid " -p, --paths print complete device path\n"
msgstr " -p, --paths 打印完整设备路径\n"
-#: misc-utils/lsblk.c:1654
+#: misc-utils/lsblk.c:1656
msgid " -s, --inverse inverse dependencies\n"
msgstr " -s, --inverse 反向依赖\n"
-#: misc-utils/lsblk.c:1655
+#: misc-utils/lsblk.c:1657
msgid " -S, --scsi output info about SCSI devices\n"
msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n"
-#: misc-utils/lsblk.c:1656
+#: misc-utils/lsblk.c:1658
msgid " -t, --topology output info about topology\n"
msgstr " -t, --topology 输出拓扑信息\n"
-#: misc-utils/lsblk.c:1657
+#: misc-utils/lsblk.c:1659
msgid " -x, --sort <column> sort output by <column>\n"
msgstr " -x, --sort <列> 按<列>对输出排序\n"
-#: misc-utils/lsblk.c:1675
+#: misc-utils/lsblk.c:1676
#, c-format
msgid "failed to access sysfs directory: %s"
msgstr "无法访问 sysfs 目录:%s"
@@ -9985,7 +10130,7 @@ msgstr "阻塞锁的进程的 PID"
msgid "failed to parse ID"
msgstr "解析 ID 失败"
-#: misc-utils/lslocks.c:281 sys-utils/nsenter.c:265
+#: misc-utils/lslocks.c:281 sys-utils/nsenter.c:264
msgid "failed to parse pid"
msgstr "解析 pid 失败"
@@ -10001,48 +10146,48 @@ msgstr "解析 起点 失败"
msgid "failed to parse end"
msgstr "解析 终点 失败"
-#: misc-utils/lslocks.c:497
+#: misc-utils/lslocks.c:498
msgid "List local system locks.\n"
msgstr "列出本地系统锁。\n"
-#: misc-utils/lslocks.c:501
+#: misc-utils/lslocks.c:502
msgid " -i, --noinaccessible ignore locks without read permissions\n"
msgstr " -i, --noinaccessible 忽略没有读权限的锁\n"
-#: misc-utils/lslocks.c:502 sys-utils/lsns.c:621
+#: misc-utils/lslocks.c:503 sys-utils/lsns.c:622 sys-utils/rfkill.c:470
msgid " -n, --noheadings don't print headings\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/lslocks.c:503 sys-utils/lsns.c:622
+#: misc-utils/lslocks.c:504 sys-utils/lsns.c:623 sys-utils/rfkill.c:471
msgid " -o, --output <list> define which output columns to use\n"
msgstr " -o, --output <list> 定义使用哪个输出列\n"
-#: misc-utils/lslocks.c:504
+#: misc-utils/lslocks.c:505
msgid " -p, --pid <pid> display only locks held by this process\n"
msgstr " -p, --pid <pid> 只显示由指定进程持有的锁\n"
-#: misc-utils/lslocks.c:505 sys-utils/lsns.c:624
+#: misc-utils/lslocks.c:506 sys-utils/lsns.c:625 sys-utils/rfkill.c:472
msgid " -r, --raw use the raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: misc-utils/lslocks.c:563 schedutils/chrt.c:476 schedutils/ionice.c:177
-#: schedutils/taskset.c:170 sys-utils/lsns.c:699 sys-utils/prlimit.c:585
+#: misc-utils/lslocks.c:563 schedutils/chrt.c:475 schedutils/ionice.c:177
+#: schedutils/taskset.c:171 sys-utils/lsns.c:698 sys-utils/prlimit.c:585
msgid "invalid PID argument"
msgstr "无效的 PID 参数"
-#: misc-utils/mcookie.c:85
+#: misc-utils/mcookie.c:86
msgid "Generate magic cookies for xauth.\n"
msgstr "为 xauth 生成 magic cookies。\n"
-#: misc-utils/mcookie.c:88
+#: misc-utils/mcookie.c:89
msgid " -f, --file <file> use file as a cookie seed\n"
msgstr " -f, --file <文件> 用指定文件作为 cookie 种子\n"
-#: misc-utils/mcookie.c:89
+#: misc-utils/mcookie.c:90
msgid " -m, --max-size <num> limit how much is read from seed files\n"
msgstr " -m, --max-size <数字> 限制从种子文件读取的大小\n"
-#: misc-utils/mcookie.c:90
+#: misc-utils/mcookie.c:91
msgid " -v, --verbose explain what is being done\n"
msgstr " -v, --verbose 解释正在进行的操作\n"
@@ -10091,10 +10236,9 @@ msgstr " %s [选项] <路径名> ...\n"
msgid "Follow a pathname until a terminal point is found.\n"
msgstr "沿路径寻找,直到某个终止点为止。\n"
-#: misc-utils/namei.c:339
+#: misc-utils/namei.c:340
+#, fuzzy
msgid ""
-" -h, --help displays this help text\n"
-" -V, --version output version information and exit\n"
" -x, --mountpoints show mount point directories with a 'D'\n"
" -m, --modes show the mode bits of each file\n"
" -o, --owners show owner and group name of each file\n"
@@ -10115,7 +10259,7 @@ msgstr ""
msgid "pathname argument is missing"
msgstr "缺少 路径名 参数"
-#: misc-utils/namei.c:414 sys-utils/lsns.c:763
+#: misc-utils/namei.c:414 sys-utils/lsns.c:762
msgid "failed to allocate UID cache"
msgstr "分配 UID 缓存失败"
@@ -10138,422 +10282,593 @@ msgstr "%s:不是符号链接"
msgid "%s: readlink failed"
msgstr "%s:readlink 失败"
-#: misc-utils/rename.c:80
+#: misc-utils/rename.c:82
+#, c-format
+msgid "Skipping existing link: `%s'\n"
+msgstr ""
+
+#: misc-utils/rename.c:89
#, c-format
msgid "%s: unlink failed"
msgstr "%s:unlink 失败"
-#: misc-utils/rename.c:83
+#: misc-utils/rename.c:92
#, c-format
msgid "%s: symlinking to %s failed"
msgstr "%s:符号链接到 %s 失败"
-#: misc-utils/rename.c:105
+#: misc-utils/rename.c:117
+#, fuzzy, c-format
+msgid "Skipping existing file: `%s'\n"
+msgstr "...跳到文件 "
+
+#: misc-utils/rename.c:121
#, c-format
msgid "%s: rename to %s failed"
msgstr "%s:重命名为 %s 失败"
-#: misc-utils/rename.c:118
+#: misc-utils/rename.c:135
#, c-format
msgid " %s [options] <expression> <replacement> <file>...\n"
msgstr " %s [选项] <表达式> <替换> <文件>...\n"
-#: misc-utils/rename.c:122
+#: misc-utils/rename.c:139
msgid "Rename files.\n"
msgstr "重命名文件。\n"
-#: misc-utils/rename.c:125
-msgid " -v, --verbose explain what is being done\n"
-msgstr " -v, --verbose 解释正在进行的操作\n"
+#: misc-utils/rename.c:142
+#, fuzzy
+msgid " -v, --verbose explain what is being done\n"
+msgstr " -v, --verbose 解释正在进行的操作\n"
-#: misc-utils/rename.c:126
-msgid " -s, --symlink act on the target of symlinks\n"
+#: misc-utils/rename.c:143
+#, fuzzy
+msgid " -s, --symlink act on the target of symlinks\n"
msgstr " -s, --symlink 在符号链接的目标上执行\n"
-#: misc-utils/rename.c:127
+#: misc-utils/rename.c:144
#, fuzzy
-msgid " -n, --no-act do not make any changes\n"
+msgid " -n, --no-act do not make any changes\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/uuidd.c:72
+#: misc-utils/rename.c:145
+msgid " -o, --no-overwrite don't overwrite existing files\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:64
msgid "A daemon for generating UUIDs.\n"
msgstr "一个用于生成 UUID 的守护进程。\n"
-#: misc-utils/uuidd.c:74
+#: misc-utils/uuidd.c:66
msgid " -p, --pid <path> path to pid file\n"
msgstr " -p, --pid <路径> pid 文件路径\n"
-#: misc-utils/uuidd.c:75
+#: misc-utils/uuidd.c:67
msgid " -s, --socket <path> path to socket\n"
msgstr " -s, --socket <路径> 套接字路径\n"
-#: misc-utils/uuidd.c:76
+#: misc-utils/uuidd.c:68
msgid " -T, --timeout <sec> specify inactivity timeout\n"
msgstr " -T, --timeout <秒> 指定无活动超时\n"
-#: misc-utils/uuidd.c:77
+#: misc-utils/uuidd.c:69
msgid " -k, --kill kill running daemon\n"
msgstr " -k, --kill 杀死运行中的守护进程\n"
-#: misc-utils/uuidd.c:78
+#: misc-utils/uuidd.c:70
msgid " -r, --random test random-based generation\n"
msgstr " -r, --random 测试基于随机数的生成方式\n"
-#: misc-utils/uuidd.c:79
+#: misc-utils/uuidd.c:71
msgid " -t, --time test time-based generation\n"
msgstr " -t, --time 测试基于时间的生成方式\n"
-#: misc-utils/uuidd.c:80
+#: misc-utils/uuidd.c:72
msgid " -n, --uuids <num> request number of uuids\n"
msgstr " -n, --uuids <数值> 请求指定数量的 uuid\n"
-#: misc-utils/uuidd.c:81
+#: misc-utils/uuidd.c:73
msgid " -P, --no-pid do not create pid file\n"
msgstr " -P, --no-pid 不创建 pid 文件\n"
-#: misc-utils/uuidd.c:82
+#: misc-utils/uuidd.c:74
msgid " -F, --no-fork do not daemonize using double-fork\n"
msgstr " -F, --no-fork 不使用双 fork 变成守护进程\n"
-#: misc-utils/uuidd.c:83
+#: misc-utils/uuidd.c:75
msgid " -S, --socket-activation do not create listening socket\n"
msgstr " -S, --socket-activation 不创建侦听套接字\n"
-#: misc-utils/uuidd.c:84
+#: misc-utils/uuidd.c:76
msgid " -d, --debug run in debugging mode\n"
msgstr " -d, --debug 以调试模式运行\n"
-#: misc-utils/uuidd.c:85
+#: misc-utils/uuidd.c:77
msgid " -q, --quiet turn on quiet mode\n"
msgstr " -q, --quiet 开启安静模式\n"
-#: misc-utils/uuidd.c:118
+#: misc-utils/uuidd.c:109
msgid "bad arguments"
msgstr "参数错误"
-#: misc-utils/uuidd.c:125
+#: misc-utils/uuidd.c:116
msgid "socket"
msgstr "套接字"
-#: misc-utils/uuidd.c:136
+#: misc-utils/uuidd.c:127
msgid "connect"
msgstr "连接"
-#: misc-utils/uuidd.c:156
+#: misc-utils/uuidd.c:147
msgid "write"
msgstr "写"
-#: misc-utils/uuidd.c:164
+#: misc-utils/uuidd.c:155
msgid "read count"
msgstr "读计数"
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:161
msgid "bad response length"
msgstr "响应长度错误"
-#: misc-utils/uuidd.c:221
+#: misc-utils/uuidd.c:212
#, c-format
msgid "cannot lock %s"
msgstr "无法锁定 %s"
-#: misc-utils/uuidd.c:246
+#: misc-utils/uuidd.c:237
msgid "couldn't create unix stream socket"
msgstr "无法创建 unix 流套接字"
-#: misc-utils/uuidd.c:271
+#: misc-utils/uuidd.c:262
#, c-format
msgid "couldn't bind unix socket %s"
msgstr "无法绑定 unix 套接字 %s"
-#: misc-utils/uuidd.c:298
+#: misc-utils/uuidd.c:289
msgid "receiving signal failed"
msgstr "接收信号失败"
-#: misc-utils/uuidd.c:311
+#: misc-utils/uuidd.c:302
msgid "timed out"
msgstr "已超时"
-#: misc-utils/uuidd.c:345 sys-utils/flock.c:269
+#: misc-utils/uuidd.c:336 sys-utils/flock.c:272
msgid "cannot set up timer"
msgstr "无法设置定时器"
-#: misc-utils/uuidd.c:353
+#: misc-utils/uuidd.c:344
#, c-format
msgid "uuidd daemon is already running at pid %s"
msgstr "uuidd 守护进程已运行,pid 为 %s"
-#: misc-utils/uuidd.c:362
+#: misc-utils/uuidd.c:353
#, c-format
msgid "couldn't listen on unix socket %s"
msgstr "无法侦听 unix 套接字 %s"
-#: misc-utils/uuidd.c:372
+#: misc-utils/uuidd.c:363
#, c-format
msgid "could not truncate file: %s"
msgstr "无法截短文件:%s"
-#: misc-utils/uuidd.c:386
+#: misc-utils/uuidd.c:377
msgid "sd_listen_fds() failed"
msgstr "sd_listen_fds() 失败"
-#: misc-utils/uuidd.c:389
+#: misc-utils/uuidd.c:380
msgid "no file descriptors received, check systemctl status uuidd.socket"
msgstr "没有收到文件描述符,请检查 systemctl 状态 uuidd.socket"
-#: misc-utils/uuidd.c:392
+#: misc-utils/uuidd.c:383
msgid "too many file descriptors received, check uuidd.socket"
msgstr "收到太多文件描述符,请检查 uuidd.socket"
-#: misc-utils/uuidd.c:420 term-utils/script.c:460
-msgid "poll failed"
-msgstr "轮询失败"
-
-#: misc-utils/uuidd.c:425
+#: misc-utils/uuidd.c:416
#, c-format
msgid "timeout [%d sec]\n"
msgstr "超时 [%d 秒]\n"
-#: misc-utils/uuidd.c:443 term-utils/setterm.c:897 text-utils/column.c:436
-#: text-utils/column.c:449
+#: misc-utils/uuidd.c:434 term-utils/setterm.c:899 text-utils/column.c:449
+#: text-utils/column.c:462
msgid "read failed"
msgstr "read 失败"
-#: misc-utils/uuidd.c:445
+#: misc-utils/uuidd.c:436
#, c-format
msgid "error reading from client, len = %d"
msgstr "从客户端读取出错,长度 = %d"
-#: misc-utils/uuidd.c:454
+#: misc-utils/uuidd.c:445
#, c-format
msgid "operation %d, incoming num = %d\n"
msgstr "操作 %d,接收数 = %d\n"
-#: misc-utils/uuidd.c:457
+#: misc-utils/uuidd.c:448
#, c-format
msgid "operation %d\n"
msgstr "操作 %d\n"
-#: misc-utils/uuidd.c:473
+#: misc-utils/uuidd.c:464
#, c-format
msgid "Generated time UUID: %s\n"
msgstr "已生成时间 UUID:%s\n"
-#: misc-utils/uuidd.c:483
+#: misc-utils/uuidd.c:474
#, c-format
msgid "Generated random UUID: %s\n"
msgstr "已生成随机 UUID:%s\n"
-#: misc-utils/uuidd.c:492
+#: misc-utils/uuidd.c:483
#, 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:513
+#: misc-utils/uuidd.c:504
#, c-format
msgid "Generated %d UUID:\n"
msgid_plural "Generated %d UUIDs:\n"
msgstr[0] "已生成 %d 个 UUID:\n"
-#: misc-utils/uuidd.c:527
+#: misc-utils/uuidd.c:518
#, c-format
msgid "Invalid operation %d\n"
msgstr "无效操作 %d\n"
-#: misc-utils/uuidd.c:539
+#: misc-utils/uuidd.c:530
#, c-format
msgid "Unexpected reply length from server %d"
msgstr "服务器 %d 响应长度异常"
-#: misc-utils/uuidd.c:600
+#: misc-utils/uuidd.c:591
msgid "failed to parse --uuids"
msgstr "解析 --uuids 失败"
-#: misc-utils/uuidd.c:617
+#: misc-utils/uuidd.c:608
msgid "uuidd has been built without support for socket activation"
msgstr "uuidd 构建时没有添加套接字激活支持"
-#: misc-utils/uuidd.c:636
+#: misc-utils/uuidd.c:627
msgid "failed to parse --timeout"
msgstr "解析 --timeout 失败"
-#: misc-utils/uuidd.c:653
+#: misc-utils/uuidd.c:644
msgid "Both --socket-activation and --socket specified. Ignoring --socket."
msgstr "同时指定了 --socket-activation 和 --socket。将忽略 --socket"
-#: misc-utils/uuidd.c:660 misc-utils/uuidd.c:688
+#: misc-utils/uuidd.c:651 misc-utils/uuidd.c:679
#, c-format
msgid "error calling uuidd daemon (%s)"
msgstr "调用 uuidd 守护进程(%s)出错"
-#: misc-utils/uuidd.c:661 misc-utils/uuidd.c:689
+#: misc-utils/uuidd.c:652 misc-utils/uuidd.c:680
msgid "unexpected error"
msgstr "意外错误"
-#: misc-utils/uuidd.c:669
+#: misc-utils/uuidd.c:660
#, 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:673
+#: misc-utils/uuidd.c:664
#, c-format
msgid "List of UUIDs:\n"
msgstr "UUID 列表:\n"
-#: misc-utils/uuidd.c:705
+#: misc-utils/uuidd.c:696
#, c-format
msgid "couldn't kill uuidd running at pid %d"
msgstr "无法运行 pid 为 %d 的 uuidd"
-#: misc-utils/uuidd.c:710
+#: misc-utils/uuidd.c:701
#, c-format
msgid "Killed uuidd running at pid %d.\n"
msgstr "已杀死运行 pid 为 %d 的 uuidd。\n"
-#: misc-utils/uuidgen.c:28
+#: misc-utils/uuidgen.c:29
msgid "Create a new UUID value.\n"
msgstr "创建新的 UUID 值。\n"
-#: misc-utils/uuidgen.c:31
-msgid ""
-" -r, --random generate random-based uuid\n"
-" -t, --time generate time-based uuid\n"
-" -V, --version output version information and exit\n"
-" -h, --help display this help and exit\n"
-"\n"
+#: misc-utils/uuidgen.c:32
+#, fuzzy
+msgid " -r, --random generate random-based uuid\n"
+msgstr " -r, --random 测试基于随机数的生成方式\n"
+
+#: misc-utils/uuidgen.c:33
+#, fuzzy
+msgid " -t, --time generate time-based uuid\n"
+msgstr " -t, --time 测试基于时间的生成方式\n"
+
+#: misc-utils/uuidgen.c:34
+msgid " -n, --namespace ns generate hash-based uuid in this namespace\n"
msgstr ""
-" -r, --random 生成基于随机数的 uuid\n"
-" -t, --time 生成基于时间的 uuid\n"
-" -V, --version 输出版本信息并退出\n"
-" -h, --help 显示此帮助并退出\n"
-"\n"
-#: misc-utils/whereis.c:189
+#: misc-utils/uuidgen.c:35
+msgid " -N, --name name generate hash-based uuid from this name\n"
+msgstr ""
+
+#: misc-utils/uuidgen.c:36
+#, fuzzy
+msgid " -m, --md5 generate md5 hash\n"
+msgstr " -a, --all 打印所有设备\n"
+
+#: misc-utils/uuidgen.c:37
+#, fuzzy
+msgid " -s, --sha1 generate sha1 hash\n"
+msgstr " -s, --shared 获取共享锁\n"
+
+#: misc-utils/uuidgen.c:38
+#, fuzzy
+msgid " -x, --hex interpret name as hex string\n"
+msgstr " -i, --invert 反转搜索的匹配\n"
+
+#: misc-utils/uuidparse.c:76
+#, fuzzy
+msgid "unique identifier"
+msgstr "惟一存储标识符"
+
+#: misc-utils/uuidparse.c:77
+#, fuzzy
+msgid "variant name"
+msgstr "分区名"
+
+#: misc-utils/uuidparse.c:78
+#, fuzzy
+msgid "type name"
+msgstr "新名称"
+
+#: misc-utils/uuidparse.c:79
+msgid "timestamp"
+msgstr ""
+
+#: misc-utils/uuidparse.c:97
+#, fuzzy, c-format
+msgid " %s [options] <uuid ...>\n"
+msgstr " %s [选项] <文件>...\n"
+
+#: misc-utils/uuidparse.c:100
+#, fuzzy
+msgid " -J, --json use JSON output format"
+msgstr " -J, --json 使用 JSON 输出格式\n"
+
+#: misc-utils/uuidparse.c:101
+#, fuzzy
+msgid " -n, --noheadings don't print headings"
+msgstr " -n, --noheadings 不打印标题\n"
+
+#: misc-utils/uuidparse.c:102
+#, fuzzy
+msgid " -o, --output <list> COLUMNS to display (see below)"
+msgstr " -o, --output <列表> 要显示的列\n"
+
+#: misc-utils/uuidparse.c:103
+#, fuzzy
+msgid " -r, --raw use the raw output format"
+msgstr " -r, --raw 使用原生输出格式\n"
+
+#: misc-utils/uuidparse.c:172 misc-utils/uuidparse.c:191
+#: misc-utils/uuidparse.c:222
+#, fuzzy
+msgid "invalid"
+msgstr "无效 id"
+
+#: misc-utils/uuidparse.c:186
+msgid "other"
+msgstr ""
+
+#: misc-utils/uuidparse.c:197
+msgid "nil"
+msgstr ""
+
+#: misc-utils/uuidparse.c:202
+msgid "time-based"
+msgstr ""
+
+#: misc-utils/uuidparse.c:208
+msgid "name-based"
+msgstr ""
+
+#: misc-utils/uuidparse.c:211
+msgid "random"
+msgstr ""
+
+#: misc-utils/uuidparse.c:214
+msgid "sha1-based"
+msgstr ""
+
+#: misc-utils/uuidparse.c:273 misc-utils/wipefs.c:170 sys-utils/lscpu.c:1874
+#: sys-utils/lsns.c:532 sys-utils/zramctl.c:497
+msgid "failed to initialize output column"
+msgstr "初始化输出列失败"
+
+#: misc-utils/whereis.c:196
#, c-format
msgid " %s [options] [-BMS <dir>... -f] <name>\n"
msgstr " %s [选项] [-BMS <dir>... -f] <名称>\n"
-#: misc-utils/whereis.c:192
+#: misc-utils/whereis.c:199
msgid "Locate the binary, source, and manual-page files for a command.\n"
msgstr "定位某个命令的二进制文件、源码和帮助页文件。\n"
-#: misc-utils/whereis.c:195
+#: misc-utils/whereis.c:202
msgid " -b search only for binaries\n"
msgstr " -b 只搜索二进制文件\n"
-#: misc-utils/whereis.c:196
+#: misc-utils/whereis.c:203
msgid " -B <dirs> define binaries lookup path\n"
msgstr " -B <目录> 定义二进制文件查找路径\n"
-#: misc-utils/whereis.c:197
+#: misc-utils/whereis.c:204
msgid " -m search only for manuals and infos\n"
msgstr " -m 只搜索手册和信息\n"
-#: misc-utils/whereis.c:198
+#: misc-utils/whereis.c:205
msgid " -M <dirs> define man and info lookup path\n"
msgstr " -M <目录> 定义 man 和 info 查找路径\n"
-#: misc-utils/whereis.c:199
+#: misc-utils/whereis.c:206
msgid " -s search only for sources\n"
msgstr " -s 只搜索源代码\n"
-#: misc-utils/whereis.c:200
+#: misc-utils/whereis.c:207
msgid " -S <dirs> define sources lookup path\n"
msgstr " -S <目录> 定义源代码查找路径\n"
-#: misc-utils/whereis.c:201
+#: misc-utils/whereis.c:208
msgid " -f terminate <dirs> argument list\n"
msgstr " -f 终止 <目录> 参数列表\n"
-#: misc-utils/whereis.c:202
+#: misc-utils/whereis.c:209
msgid " -u search for unusual entries\n"
msgstr " -u 搜索不常见记录\n"
-#: misc-utils/whereis.c:203
+#: misc-utils/whereis.c:210
msgid " -l output effective lookup paths\n"
msgstr " -l 输出有效查找路径\n"
-#: misc-utils/whereis.c:619
+#: misc-utils/whereis.c:645
msgid "option -f is missing"
msgstr "缺少 -f 选项"
-#: misc-utils/wipefs.c:196
-msgid "partition table"
+#: misc-utils/wipefs.c:103
+#, fuzzy
+msgid "partition/filesystem UUID"
+msgstr "文件系统 UUID"
+
+#: misc-utils/wipefs.c:105
+msgid "magic string length"
+msgstr ""
+
+#: misc-utils/wipefs.c:106
+msgid "superblok type"
+msgstr ""
+
+#: misc-utils/wipefs.c:107
+#, fuzzy
+msgid "magic string offset"
+msgstr "inode 偏移有误"
+
+#: misc-utils/wipefs.c:108
+#, fuzzy
+msgid "type description"
+msgstr "标志描述"
+
+#: misc-utils/wipefs.c:109
+#, fuzzy
+msgid "block device name"
+msgstr "块设备 "
+
+#: misc-utils/wipefs.c:318
+#, fuzzy
+msgid "partition-table"
msgstr "分区表"
-#: misc-utils/wipefs.c:269
+#: misc-utils/wipefs.c:406
#, c-format
msgid "error: %s: probing initialization failed"
msgstr "错误:%s:探测初始化失败"
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:457
#, c-format
msgid "%s: failed to erase %s magic string at offset 0x%08jx"
msgstr "%1$s:擦除位于偏移 0x%3$08jx 处的魔数字符串 %2$s 失败"
-#: misc-utils/wipefs.c:319
+#: misc-utils/wipefs.c:463
#, c-format
msgid "%s: %zd byte was erased at offset 0x%08jx (%s): "
msgid_plural "%s: %zd bytes were erased at offset 0x%08jx (%s): "
msgstr[0] "%s:%zd 个字节已擦除,位置偏移为 0x%08jx (%s):"
-#: misc-utils/wipefs.c:348
+#: misc-utils/wipefs.c:492
#, c-format
msgid "%s: failed to create a signature backup"
msgstr "%s:创建签名备份失败"
-#: misc-utils/wipefs.c:361
+#: misc-utils/wipefs.c:505
#, c-format
msgid "%s: calling ioctl to re-read partition table: %m\n"
msgstr "%s:将调用 ioctl 来重新读分区表:%m\n"
-#: misc-utils/wipefs.c:385
+#: misc-utils/wipefs.c:528
msgid "failed to create a signature backup, $HOME undefined"
msgstr "创建签名备份失败,未定义 $HOME"
-#: misc-utils/wipefs.c:414
+#: misc-utils/wipefs.c:546
#, c-format
msgid "%s: ignoring nested \"%s\" partition table on non-whole disk device"
msgstr "%s:忽略 非整盘 设备上的嵌套分区表“%s”"
-#: misc-utils/wipefs.c:431
+#: misc-utils/wipefs.c:575
#, c-format
msgid "%s: offset 0x%jx not found"
msgstr "%s:找不到偏移 0x%jx"
-#: misc-utils/wipefs.c:435
+#: misc-utils/wipefs.c:580
msgid "Use the --force option to force erase."
msgstr "使用 --force 选项强制擦除。"
-#: misc-utils/wipefs.c:461
-msgid "Wipe signatures from a device.\n"
+#: misc-utils/wipefs.c:605
+#, fuzzy
+msgid "Wipe signatures from a device."
msgstr "从设备擦除签名。\n"
-#: misc-utils/wipefs.c:464
-msgid ""
-" -a, --all wipe all magic strings (BE CAREFUL!)\n"
-" -b, --backup create a signature backup in $HOME\n"
-" -f, --force force erasure\n"
-" -h, --help show this help text\n"
-" -n, --no-act do everything except the actual write() call\n"
-" -o, --offset <num> offset to erase, in bytes\n"
-" -p, --parsable print out in parsable instead of printable format\n"
-" -q, --quiet suppress output messages\n"
-" -t, --types <list> limit the set of filesystem, RAIDs or partition tables\n"
-" -V, --version output version information and exit\n"
-msgstr ""
-" -a, --all 擦除所有魔数字符串(慎重!)\n"
-" -b, --backup 在 $HOME 中创建签名备份\n"
-" -f, --force 强制擦除\n"
-" -h, --help 显示此帮助文字\n"
-" -n, --no-act 照常操作但不执行实际的 write() 调用\n"
-" -o, --offset <数字> 要擦除的偏移字节数\n"
-" -p, --parsable 以可解析的格式打印输出,而非以可打印的格式\n"
-" -t, --types <列表> 限制文件系统、RAID 或分区表的集合\n"
-" -V, --version 输出版本信息并退出\n"
+#: misc-utils/wipefs.c:608
+#, fuzzy
+msgid " -a, --all wipe all magic strings (BE CAREFUL!)"
+msgstr " -a, --all 打印所有设备\n"
+
+#: misc-utils/wipefs.c:609
+#, fuzzy
+msgid " -b, --backup create a signature backup in $HOME"
+msgstr "创建签名备份失败,未定义 $HOME"
+
+#: misc-utils/wipefs.c:610
+#, fuzzy
+msgid " -f, --force force erasure"
+msgstr " -f, --force 强制检查\n"
+
+#: misc-utils/wipefs.c:611
+#, fuzzy
+msgid " -i, --noheadings don't print headings"
+msgstr " -n, --noheadings 不打印标题\n"
+
+#: misc-utils/wipefs.c:612
+#, fuzzy
+msgid " -J, --json use JSON output format"
+msgstr " -J, --json 使用 JSON 输出格式\n"
+
+#: misc-utils/wipefs.c:613
+#, fuzzy
+msgid " -n, --no-act do everything except the actual write() call"
+msgstr " --no-act 操作但不实际写入日志\n"
+
+#: misc-utils/wipefs.c:614
+#, fuzzy
+msgid " -o, --offset <num> offset to erase, in bytes"
+msgstr " -o, --offset <数字> 范围操作的偏移量(字节数)\n"
+
+#: misc-utils/wipefs.c:615
+msgid " -O, --output <list> COLUMNS to display (see below)"
+msgstr ""
+
+#: misc-utils/wipefs.c:616
+#, fuzzy
+msgid " -p, --parsable print out in parsable instead of printable format"
+msgstr " -p, --parse[=<列表>] 打印可解析格式\n"
+
+#: misc-utils/wipefs.c:617
+#, fuzzy
+msgid " -q, --quiet suppress output messages"
+msgstr " -q, --quiet 禁止输出额外信息\n"
-#: misc-utils/wipefs.c:559
+#: misc-utils/wipefs.c:618
+#, fuzzy
+msgid " -t, --types <list> limit the set of filesystem, RAIDs or partition tables"
+msgstr " -t, --types <列表> 根据文件系统类型限制文件系统集合\n"
+
+#: misc-utils/wipefs.c:724
msgid "The --backup option is meaningless in this context"
msgstr "--backup 在此环境中无意义"
@@ -10647,99 +10962,99 @@ msgstr " -p, --pid 对指定且存在的 pid 操作\n"
msgid " -v, --verbose display status information\n"
msgstr " -v, --verbose 显示状态信息\n"
-#: schedutils/chrt.c:232 schedutils/chrt.c:254
+#: schedutils/chrt.c:231 schedutils/chrt.c:253
#, c-format
msgid "failed to get pid %d's policy"
msgstr "无法获得 pid %d 的策略"
-#: schedutils/chrt.c:257
+#: schedutils/chrt.c:256
#, c-format
msgid "failed to get pid %d's attributes"
msgstr "获取 pid %d 的属性失败"
-#: schedutils/chrt.c:267
+#: schedutils/chrt.c:266
#, c-format
msgid "pid %d's new scheduling policy: %s"
msgstr "pid “%d” 的新调度策略:%s"
-#: schedutils/chrt.c:269
+#: schedutils/chrt.c:268
#, c-format
msgid "pid %d's current scheduling policy: %s"
msgstr "pid %d 当前的调度策略︰ %s"
-#: schedutils/chrt.c:276
+#: schedutils/chrt.c:275
#, c-format
msgid "pid %d's new scheduling priority: %d\n"
msgstr "pid %d 的新调度策略:%d\n"
-#: schedutils/chrt.c:278
+#: schedutils/chrt.c:277
#, c-format
msgid "pid %d's current scheduling priority: %d\n"
msgstr "pid %d 的当前调度优先级:%d\n"
-#: schedutils/chrt.c:283
+#: schedutils/chrt.c:282
#, c-format
msgid "pid %d's new runtime/deadline/period parameters: %ju/%ju/%ju\n"
msgstr "pid %d 新的运行时/截止时间/周期参数︰ %ju/%ju/%ju\n"
-#: schedutils/chrt.c:286
+#: schedutils/chrt.c:285
#, c-format
msgid "pid %d's current runtime/deadline/period parameters: %ju/%ju/%ju\n"
msgstr "pid %d 当前的运行时/截止时间/周期参数︰ %ju/%ju/%ju\n"
-#: schedutils/chrt.c:300 schedutils/chrt.c:396
+#: schedutils/chrt.c:299 schedutils/chrt.c:395
msgid "cannot obtain the list of tasks"
msgstr "无法获取任务列表"
-#: schedutils/chrt.c:334
+#: schedutils/chrt.c:333
#, c-format
msgid "%s min/max priority\t: %d/%d\n"
msgstr "%s 最小/最大优先级\t: %d/%d\n"
-#: schedutils/chrt.c:337
+#: schedutils/chrt.c:336
#, c-format
msgid "%s not supported?\n"
msgstr "%s 不支持? \n"
-#: schedutils/chrt.c:400
+#: schedutils/chrt.c:399
#, c-format
msgid "failed to set tid %d's policy"
msgstr "设置 tid %d 策略失败"
-#: schedutils/chrt.c:405
+#: schedutils/chrt.c:404
#, c-format
msgid "failed to set pid %d's policy"
msgstr "设置 pid %d 的策略失败"
-#: schedutils/chrt.c:485
+#: schedutils/chrt.c:484
msgid "invalid runtime argument"
msgstr "无效的运行时参数"
-#: schedutils/chrt.c:488
+#: schedutils/chrt.c:487
msgid "invalid period argument"
msgstr "无效的周期参数"
-#: schedutils/chrt.c:491
+#: schedutils/chrt.c:490
msgid "invalid deadline argument"
msgstr "无效的截止时间参数"
-#: schedutils/chrt.c:514
+#: schedutils/chrt.c:515
msgid "invalid priority argument"
msgstr "无效的 优先级 参数"
-#: schedutils/chrt.c:518
+#: schedutils/chrt.c:519
msgid "--reset-on-fork option is supported for SCHED_FIFO and SCHED_RR policies only"
msgstr "--reset-on-fork 选项只支持 SCHED_FIFO and SCHED_RR 策略"
-#: schedutils/chrt.c:523
+#: schedutils/chrt.c:524
msgid "--sched-{runtime,deadline,period} options are supported for SCHED_DEADLINE only"
msgstr "--sched-{runtime,deadline,period} 选项只支持 SCHED_DEADLINE"
-#: schedutils/chrt.c:538
+#: schedutils/chrt.c:539
msgid "SCHED_DEADLINE is unsupported"
msgstr "不支持 SCHED_DEADLINE"
-#: schedutils/chrt.c:545
+#: schedutils/chrt.c:546
#, c-format
msgid "unsupported priority value for the policy: %d: see --max for valid range"
msgstr "不支持此策略的优先级值:%d:查看 --max 了解有效范围"
@@ -10757,7 +11072,7 @@ msgstr "%s:优先级 %lu\n"
msgid "ioprio_set failed"
msgstr "ioprio_set 失败"
-#: schedutils/ionice.c:104
+#: schedutils/ionice.c:105
#, c-format
msgid ""
" %1$s [options] -p <pid>...\n"
@@ -10770,11 +11085,11 @@ msgstr ""
" %1$s [选项] -u <uid>...\n"
" %1$s [选项] <命令>\n"
-#: schedutils/ionice.c:110
+#: schedutils/ionice.c:111
msgid "Show or change the I/O-scheduling class and priority of a process.\n"
msgstr "设置或更改进程的 IO 调度类别和优先级。\n"
-#: schedutils/ionice.c:113
+#: schedutils/ionice.c:114
msgid ""
" -c, --class <class> name or number of scheduling class,\n"
" 0: none, 1: realtime, 2: best-effort, 3: idle\n"
@@ -10782,7 +11097,7 @@ msgstr ""
" -c, --class <类别> 调度类别的名称或数值\n"
" 0: 无, 1: 实时, 2: 尽力, 3: 空闲\n"
-#: schedutils/ionice.c:115
+#: schedutils/ionice.c:116
msgid ""
" -n, --classdata <num> priority (0..7) in the specified scheduling class,\n"
" only for the realtime and best-effort classes\n"
@@ -10790,19 +11105,19 @@ msgstr ""
" -n, --classdata <数字> 指定调度类别的优先级(0..7),只针对\n"
" “实时”和“尽力”类别\n"
-#: schedutils/ionice.c:117
+#: schedutils/ionice.c:118
msgid " -p, --pid <pid>... act on these already running processes\n"
msgstr " -p, --pid <pid>... 对这些已运行的进程操作\n"
-#: schedutils/ionice.c:118
+#: schedutils/ionice.c:119
msgid " -P, --pgid <pgrp>... act on already running processes in these groups\n"
msgstr " -P, --pgid <pgrp>... 对这些组中已运行的进程操作\n"
-#: schedutils/ionice.c:119
+#: schedutils/ionice.c:120
msgid " -t, --ignore ignore failures\n"
msgstr " -t, --ignore 忽略失败\n"
-#: schedutils/ionice.c:120
+#: schedutils/ionice.c:121
msgid " -u, --uid <uid>... act on already running processes owned by these users\n"
msgstr " -u, --uid <uid>... 对属于这些用户的已运行进程操作\n"
@@ -10844,7 +11159,7 @@ msgstr "将忽略为“空闲”类别指定的类别数据"
msgid "unknown prio class %d"
msgstr "未知的优先级类别 %d"
-#: schedutils/taskset.c:51
+#: schedutils/taskset.c:52
#, c-format
msgid ""
"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
@@ -10853,20 +11168,17 @@ msgstr ""
"用法:%s [选项] [掩码 | cpu列表] [pid|命令 [参数...]]\n"
"\n"
-#: schedutils/taskset.c:55
+#: schedutils/taskset.c:56
msgid "Show or change the CPU affinity of a process.\n"
msgstr "显示或更改某个进程的 CPU 亲和力。\n"
-#: schedutils/taskset.c:59
-#, c-format
+#: schedutils/taskset.c:60
+#, fuzzy, c-format
msgid ""
"Options:\n"
" -a, --all-tasks operate on all the tasks (threads) for a given pid\n"
" -p, --pid operate on existing given pid\n"
" -c, --cpu-list display and specify cpus in list format\n"
-" -h, --help display this help\n"
-" -V, --version output version information\n"
-"\n"
msgstr ""
"选项:\n"
" -a, --all-tasks 在给定 pid 的所有任务(线程)上操作\n"
@@ -10876,7 +11188,7 @@ msgstr ""
" -V, --version 输出版本信息\n"
"\n"
-#: schedutils/taskset.c:67
+#: schedutils/taskset.c:69
#, c-format
msgid ""
"The default behavior is to run a new command:\n"
@@ -10901,54 +11213,54 @@ msgstr ""
"列表格式中的范围可以带一个跨度参数:\n"
" 例如 0-31:2 与掩码 0x55555555 等效\n"
-#: schedutils/taskset.c:90
+#: schedutils/taskset.c:91
#, c-format
msgid "pid %d's new affinity list: %s\n"
msgstr "pid %d 的新亲和力列表:%s\n"
-#: schedutils/taskset.c:91
+#: schedutils/taskset.c:92
#, c-format
msgid "pid %d's current affinity list: %s\n"
msgstr "pid %d 的当前亲和力列表:%s\n"
-#: schedutils/taskset.c:94
+#: schedutils/taskset.c:95
#, c-format
msgid "pid %d's new affinity mask: %s\n"
msgstr "pid %d 的新亲和力掩码:%s\n"
-#: schedutils/taskset.c:95
+#: schedutils/taskset.c:96
#, c-format
msgid "pid %d's current affinity mask: %s\n"
msgstr "pid %d 的当前亲和力掩码:%s\n"
-#: schedutils/taskset.c:99
+#: schedutils/taskset.c:100
msgid "internal error: conversion from cpuset to string failed"
msgstr "内部错误:从 cpuset 转换到字符串失败"
-#: schedutils/taskset.c:108
+#: schedutils/taskset.c:109
#, c-format
msgid "failed to set pid %d's affinity"
msgstr "设置 pid %d 的亲和力失败"
-#: schedutils/taskset.c:109
+#: schedutils/taskset.c:110
#, c-format
msgid "failed to get pid %d's affinity"
msgstr "获取 pid %d 的亲和力失败"
-#: schedutils/taskset.c:192 sys-utils/chcpu.c:289
+#: schedutils/taskset.c:195 sys-utils/chcpu.c:292
msgid "cannot determine NR_CPUS; aborting"
msgstr "无法确定 NR_CPUS;将中止"
-#: schedutils/taskset.c:201 schedutils/taskset.c:214 sys-utils/chcpu.c:295
+#: schedutils/taskset.c:204 schedutils/taskset.c:217 sys-utils/chcpu.c:298
msgid "cpuset_alloc failed"
msgstr "cpuset_alloc 失败"
-#: schedutils/taskset.c:221 sys-utils/chcpu.c:232
+#: schedutils/taskset.c:224 sys-utils/chcpu.c:232
#, c-format
msgid "failed to parse CPU list: %s"
msgstr "解析 CPU 列表失败:%s"
-#: schedutils/taskset.c:224
+#: schedutils/taskset.c:227
#, c-format
msgid "failed to parse CPU mask: %s"
msgstr "解析 CPU 掩码失败:%s"
@@ -10963,31 +11275,31 @@ msgstr "%s: 用零填充的 %<PRIu64> 个字节,始于偏移量 %<PRIu64>\n"
msgid "%s: Discarded %<PRIu64> bytes from the offset %<PRIu64>\n"
msgstr "%1$s:已忽略从偏移 %3$<PRIu64> 位置开始的 %2$<PRIu64> 个字节\n"
-#: sys-utils/blkdiscard.c:87
+#: sys-utils/blkdiscard.c:88
msgid "Discard the content of sectors on a device.\n"
msgstr "丢弃一个设备上的扇区内容。\n"
-#: sys-utils/blkdiscard.c:90
+#: sys-utils/blkdiscard.c:91
msgid " -o, --offset <num> offset in bytes to discard from\n"
msgstr " -o, --offset <数值> 要丢弃的起始位置(字节)\n"
-#: sys-utils/blkdiscard.c:91
+#: sys-utils/blkdiscard.c:92
msgid " -l, --length <num> length of bytes to discard from the offset\n"
msgstr " -l, --length <数值> 从起始处起要丢弃的长度(字节数)\n"
-#: sys-utils/blkdiscard.c:92
+#: sys-utils/blkdiscard.c:93
msgid " -p, --step <num> size of the discard iterations within the offset\n"
msgstr " -p, --step <数值> 在偏移范围内丢弃迭代的尺寸\n"
-#: sys-utils/blkdiscard.c:93
+#: sys-utils/blkdiscard.c:94
msgid " -s, --secure perform secure discard\n"
msgstr " -s, --secure 执行安全丢弃\n"
-#: sys-utils/blkdiscard.c:94
+#: sys-utils/blkdiscard.c:95
msgid " -z, --zeroout zero-fill rather than discard\n"
msgstr " -z, --zeroout 用 零填充而非丢弃\n"
-#: sys-utils/blkdiscard.c:95
+#: sys-utils/blkdiscard.c:96
msgid " -v, --verbose print aligned length and offset\n"
msgstr " -v, --verbose 打印对齐的长度和偏移\n"
@@ -11000,11 +11312,6 @@ msgstr "解析偏移失败"
msgid "failed to parse step"
msgstr "解析步长失败"
-#: sys-utils/blkdiscard.c:171 sys-utils/blkzone.c:394 sys-utils/zramctl.c:686
-#: sys-utils/zramctl.c:712
-msgid "no device specified"
-msgstr "未指定设备"
-
#: sys-utils/blkdiscard.c:176 sys-utils/blkzone.c:398 sys-utils/fallocate.c:382
#: sys-utils/fsfreeze.c:111 sys-utils/fstrim.c:334
msgid "unexpected number of arguments"
@@ -11104,30 +11411,30 @@ msgstr "%s:BLKSSZGET ioctl 失败"
msgid "%s: successfully reset in range from %<PRIu64>, to %<PRIu64>"
msgstr "分区表长度已从 %<PRIu32> 改为 %<PRIu64>。"
-#: sys-utils/blkzone.c:298
+#: sys-utils/blkzone.c:299
#, fuzzy, c-format
msgid " %s <command> [options] <device>\n"
msgstr " %s [选项] <设备>\n"
-#: sys-utils/blkzone.c:301
+#: sys-utils/blkzone.c:302
msgid "Run zone command on the given block device.\n"
msgstr ""
-#: sys-utils/blkzone.c:308
+#: sys-utils/blkzone.c:309
#, fuzzy
msgid " -o, --offset <sector> start sector of zone to act (in 512-byte sectors)\n"
msgstr " -o, --offset <数字> 范围操作的偏移量(字节数)\n"
-#: sys-utils/blkzone.c:309
+#: sys-utils/blkzone.c:310
msgid " -l, --length <sectors> maximum sectors to act (in 512-byte sectors)\n"
msgstr ""
-#: sys-utils/blkzone.c:310
+#: sys-utils/blkzone.c:311
#, fuzzy
msgid " -c, --count <number> maximum number of zones\n"
msgstr " -t, --streams <数字> 压缩流数量\n"
-#: sys-utils/blkzone.c:311
+#: sys-utils/blkzone.c:312
#, fuzzy
msgid " -v, --verbose display more details\n"
msgstr " --verbose 打印更多细节\n"
@@ -11152,7 +11459,7 @@ msgstr "解析行数失败"
msgid "failed to parse zone offset"
msgstr "解析偏移失败"
-#: sys-utils/blkzone.c:391
+#: sys-utils/blkzone.c:391 sys-utils/setsid.c:87
#, fuzzy
msgid "no command specified"
msgstr "没有指定命令"
@@ -11287,7 +11594,7 @@ msgstr "CPU %u 已取消配置\n"
msgid "invalid CPU number in CPU list: %s"
msgstr "CPU 列表中的 CPU 数量无效:%s"
-#: sys-utils/chcpu.c:238 text-utils/col.c:130
+#: sys-utils/chcpu.c:239 text-utils/col.c:131
#, c-format
msgid ""
"\n"
@@ -11298,22 +11605,19 @@ msgstr ""
"用法:\n"
" %s [选项]\n"
-#: sys-utils/chcpu.c:242
+#: sys-utils/chcpu.c:243
msgid "Configure CPUs in a multi-processor system.\n"
msgstr "配置多处理器系统中的 CPU。\n"
-#: sys-utils/chcpu.c:244
+#: sys-utils/chcpu.c:247
+#, fuzzy
msgid ""
-"\n"
-"Options:\n"
-" -h, --help print this help\n"
-" -e, --enable <cpu-list> enable cpus\n"
-" -d, --disable <cpu-list> disable cpus\n"
-" -c, --configure <cpu-list> configure cpus\n"
-" -g, --deconfigure <cpu-list> deconfigure cpus\n"
-" -p, --dispatch <mode> set dispatching mode\n"
-" -r, --rescan trigger rescan of cpus\n"
-" -V, --version output version information and exit\n"
+" -e, --enable <cpu-list> enable cpus\n"
+" -d, --disable <cpu-list> disable cpus\n"
+" -c, --configure <cpu-list> configure cpus\n"
+" -g, --deconfigure <cpu-list> deconfigure cpus\n"
+" -p, --dispatch <mode> set dispatching mode\n"
+" -r, --rescan trigger rescan of cpus\n"
msgstr ""
"\n"
"选项:\n"
@@ -11326,7 +11630,7 @@ msgstr ""
" -r, --rescan 触发重新扫描 cpu\n"
" -V, --version 输出版本信息并退出\n"
-#: sys-utils/chcpu.c:326
+#: sys-utils/chcpu.c:329
#, c-format
msgid "unsupported argument: %s"
msgstr "不支持的参数:%s"
@@ -11391,7 +11695,7 @@ msgstr "CPU %u 启用失败"
msgid "%s disable failed"
msgstr "CPU %u 禁用失败"
-#: sys-utils/chmem.c:175 sys-utils/lsmem.c:360
+#: sys-utils/chmem.c:175 sys-utils/lsmem.c:357 sys-utils/lsmem.c:361
#, fuzzy, c-format
msgid "Failed to read %s"
msgstr "读 速度 失败"
@@ -11456,40 +11760,40 @@ msgstr "无效参数:%s"
msgid "Invalid range: %s"
msgstr "无效参数:%s"
-#: sys-utils/chmem.c:240
+#: sys-utils/chmem.c:241
#, fuzzy, c-format
msgid " %s [options] [SIZE|RANGE|BLOCKRANGE]\n"
msgstr " %s [选项] [y | n]\n"
-#: sys-utils/chmem.c:243
+#: sys-utils/chmem.c:244
msgid "Set a particular size or range of memory online or offline.\n"
msgstr ""
-#: sys-utils/chmem.c:246
+#: sys-utils/chmem.c:247
#, fuzzy
msgid " -e, --enable enable memory\n"
msgstr " -v, --verbose 详尽方式\n"
-#: sys-utils/chmem.c:247
+#: sys-utils/chmem.c:248
msgid " -d, --disable disable memory\n"
msgstr ""
-#: sys-utils/chmem.c:248
+#: sys-utils/chmem.c:249
#, fuzzy
msgid " -b, --blocks use memory blocks\n"
msgstr " -v, --verbose 详尽方式\n"
-#: sys-utils/chmem.c:249
+#: sys-utils/chmem.c:250
#, fuzzy
msgid " -v, --verbose verbose output\n"
msgstr " -v, --verbose 详尽方式\n"
-#: sys-utils/ctrlaltdel.c:27
+#: sys-utils/ctrlaltdel.c:28
#, c-format
msgid " %s hard|soft\n"
msgstr " %s hard|soft\n"
-#: sys-utils/ctrlaltdel.c:30
+#: sys-utils/ctrlaltdel.c:31
#, c-format
msgid "Set the function of the Ctrl-Alt-Del combination.\n"
msgstr "设置 Ctrl-Alt-Del 组合键的功能。\n"
@@ -11507,184 +11811,184 @@ msgstr "%s 有异常值:%ju"
msgid "You must be root to set the Ctrl-Alt-Del behavior"
msgstr "只有 root 用户才能设置 Ctrl-Alt-Del 行为"
-#: sys-utils/ctrlaltdel.c:71 sys-utils/ipcrm.c:392 sys-utils/ipcrm.c:415
+#: sys-utils/ctrlaltdel.c:71 sys-utils/ipcrm.c:395 sys-utils/ipcrm.c:418
#, c-format
msgid "unknown argument: %s"
msgstr "未知参数:%s"
-#: sys-utils/dmesg.c:109
+#: sys-utils/dmesg.c:110
msgid "system is unusable"
msgstr "系统无法使用"
-#: sys-utils/dmesg.c:110
+#: sys-utils/dmesg.c:111
msgid "action must be taken immediately"
msgstr "操作必须立即执行"
-#: sys-utils/dmesg.c:111
+#: sys-utils/dmesg.c:112
msgid "critical conditions"
msgstr "紧急条件"
-#: sys-utils/dmesg.c:112
+#: sys-utils/dmesg.c:113
msgid "error conditions"
msgstr "错误条件"
-#: sys-utils/dmesg.c:113
+#: sys-utils/dmesg.c:114
msgid "warning conditions"
msgstr "警告条件"
-#: sys-utils/dmesg.c:114
+#: sys-utils/dmesg.c:115
msgid "normal but significant condition"
msgstr "正常但重要的条件"
-#: sys-utils/dmesg.c:115
+#: sys-utils/dmesg.c:116
msgid "informational"
msgstr "信息"
-#: sys-utils/dmesg.c:116
+#: sys-utils/dmesg.c:117
msgid "debug-level messages"
msgstr "调试级别的消息"
-#: sys-utils/dmesg.c:130
+#: sys-utils/dmesg.c:131
msgid "kernel messages"
msgstr "内核消息"
-#: sys-utils/dmesg.c:131
+#: sys-utils/dmesg.c:132
msgid "random user-level messages"
msgstr "随机的用户级消息"
-#: sys-utils/dmesg.c:132
+#: sys-utils/dmesg.c:133
msgid "mail system"
msgstr "邮件系统"
-#: sys-utils/dmesg.c:133
+#: sys-utils/dmesg.c:134
msgid "system daemons"
msgstr "系统守护进程"
-#: sys-utils/dmesg.c:134
+#: sys-utils/dmesg.c:135
msgid "security/authorization messages"
msgstr "安全/认证消息"
-#: sys-utils/dmesg.c:135
+#: sys-utils/dmesg.c:136
msgid "messages generated internally by syslogd"
msgstr "syslogd 内部生成的消息"
-#: sys-utils/dmesg.c:136
+#: sys-utils/dmesg.c:137
msgid "line printer subsystem"
msgstr "行打印机子系统"
-#: sys-utils/dmesg.c:137
+#: sys-utils/dmesg.c:138
msgid "network news subsystem"
msgstr "网络新闻子系统"
-#: sys-utils/dmesg.c:138
+#: sys-utils/dmesg.c:139
msgid "UUCP subsystem"
msgstr "UUCP 子系统"
-#: sys-utils/dmesg.c:139
+#: sys-utils/dmesg.c:140
msgid "clock daemon"
msgstr "时钟守护进程"
-#: sys-utils/dmesg.c:140
+#: sys-utils/dmesg.c:141
msgid "security/authorization messages (private)"
msgstr "安全/认证消息(私有)"
-#: sys-utils/dmesg.c:141
+#: sys-utils/dmesg.c:142
msgid "FTP daemon"
msgstr "ftp 守护进程"
-#: sys-utils/dmesg.c:266
+#: sys-utils/dmesg.c:278
msgid "Display or control the kernel ring buffer.\n"
msgstr "显示或控制内核环形缓冲区。\n"
-#: sys-utils/dmesg.c:269
+#: sys-utils/dmesg.c:281
msgid " -C, --clear clear the kernel ring buffer\n"
msgstr " -C, --clear 清除内核环形缓冲区(ring butter)\n"
-#: sys-utils/dmesg.c:270
+#: sys-utils/dmesg.c:282
msgid " -c, --read-clear read and clear all messages\n"
msgstr " -c, --read-clear 读取并清除所有消息\n"
-#: sys-utils/dmesg.c:271
+#: sys-utils/dmesg.c:283
msgid " -D, --console-off disable printing messages to console\n"
msgstr " -D, --console-off 禁止向终端打印消息\n"
-#: sys-utils/dmesg.c:272
+#: sys-utils/dmesg.c:284
msgid " -E, --console-on enable printing messages to console\n"
msgstr " -E, --console-on 启用向终端打印消息\n"
-#: sys-utils/dmesg.c:273
+#: sys-utils/dmesg.c:285
msgid " -F, --file <file> use the file instead of the kernel log buffer\n"
msgstr " -F, --file <文件> 用 文件 代替内核日志缓冲区\n"
-#: sys-utils/dmesg.c:274
+#: sys-utils/dmesg.c:286
msgid " -f, --facility <list> restrict output to defined facilities\n"
msgstr " -f, --facility <列表> 将输出限制为定义的设施\n"
-#: sys-utils/dmesg.c:275
+#: sys-utils/dmesg.c:287
msgid " -H, --human human readable output\n"
msgstr " -H, --human 易读格式输出\n"
-#: sys-utils/dmesg.c:276
+#: sys-utils/dmesg.c:288
msgid " -k, --kernel display kernel messages\n"
msgstr " -k, --kernel 显示内核消息\n"
-#: sys-utils/dmesg.c:277
+#: sys-utils/dmesg.c:289
msgid " -L, --color[=<when>] colorize messages (auto, always or never)\n"
msgstr " -L, --color[=<时机>] 彩色显示消息(auto, always 或 never)\n"
-#: sys-utils/dmesg.c:280
+#: sys-utils/dmesg.c:292
msgid " -l, --level <list> restrict output to defined levels\n"
msgstr " -l, --level <列表> 限制输出级别\n"
-#: sys-utils/dmesg.c:281
+#: sys-utils/dmesg.c:293
msgid " -n, --console-level <level> set level of messages printed to console\n"
msgstr " -n, --console-level <级别> 设置打印到终端的消息级别\n"
-#: sys-utils/dmesg.c:282
+#: sys-utils/dmesg.c:294
msgid " -P, --nopager do not pipe output into a pager\n"
msgstr " -P, --nopager 不将输出通过管道传递给分页程序\n"
-#: sys-utils/dmesg.c:283
+#: sys-utils/dmesg.c:295
msgid " -r, --raw print the raw message buffer\n"
msgstr " -r, --raw 打印原生消息缓冲区\n"
-#: sys-utils/dmesg.c:284
+#: sys-utils/dmesg.c:296
msgid " -S, --syslog force to use syslog(2) rather than /dev/kmsg\n"
msgstr " -S, --syslog 强制使用 syslog(2) 而非 /dev/kmsg\n"
-#: sys-utils/dmesg.c:285
+#: sys-utils/dmesg.c:297
msgid " -s, --buffer-size <size> buffer size to query the kernel ring buffer\n"
msgstr " -s, --buffer-size <大小> 查询内核环形缓冲区所用的缓冲区大小\n"
-#: sys-utils/dmesg.c:286
+#: sys-utils/dmesg.c:298
msgid " -u, --userspace display userspace messages\n"
msgstr " -u, --userspace 显示用户空间消息\n"
-#: sys-utils/dmesg.c:287
+#: sys-utils/dmesg.c:299
msgid " -w, --follow wait for new messages\n"
msgstr " -w, --follow 等待新消息\n"
-#: sys-utils/dmesg.c:288
+#: sys-utils/dmesg.c:300
msgid " -x, --decode decode facility and level to readable string\n"
msgstr " -x, --decode 将设施和级别解码为可读的字符串\n"
-#: sys-utils/dmesg.c:289
+#: sys-utils/dmesg.c:301
msgid " -d, --show-delta show time delta between printed messages\n"
msgstr " -d, --show-delta 显示打印消息之间的时间差\n"
-#: sys-utils/dmesg.c:290
+#: sys-utils/dmesg.c:302
msgid " -e, --reltime show local time and time delta in readable format\n"
msgstr " -e, --reltime 以易读格式显示本地时间和时间差\n"
-#: sys-utils/dmesg.c:291
+#: sys-utils/dmesg.c:303
msgid " -T, --ctime show human-readable timestamp (may be inaccurate!)\n"
msgstr " -T, --ctime 显示易读的时间戳(可能不准确!)\n"
-#: sys-utils/dmesg.c:292
+#: sys-utils/dmesg.c:304
msgid " -t, --notime don't show any timestamp with messages\n"
msgstr " -t, --notime 不显示任何消息的时间戳\n"
-#: sys-utils/dmesg.c:293
+#: sys-utils/dmesg.c:305
msgid ""
" --time-format <format> show timestamp using the given format:\n"
" [delta|reltime|ctime|notime|iso]\n"
@@ -11694,7 +11998,7 @@ msgstr ""
" [delta|reltime|ctime|notime|iso]\n"
"挂起/恢复会使 ctime 和 iso 时间戳不精确。\n"
-#: sys-utils/dmesg.c:299
+#: sys-utils/dmesg.c:310
msgid ""
"\n"
"Supported log facilities:\n"
@@ -11702,7 +12006,7 @@ msgstr ""
"\n"
"支持的日志设施:\n"
-#: sys-utils/dmesg.c:305
+#: sys-utils/dmesg.c:316
msgid ""
"\n"
"Supported log levels (priorities):\n"
@@ -11710,61 +12014,61 @@ msgstr ""
"\n"
"支持的日志级别(优先级):\n"
-#: sys-utils/dmesg.c:359
+#: sys-utils/dmesg.c:370
#, c-format
msgid "failed to parse level '%s'"
msgstr "解析级别“%s”失败"
-#: sys-utils/dmesg.c:361
+#: sys-utils/dmesg.c:372
#, c-format
msgid "unknown level '%s'"
msgstr "未知级别“%s”"
-#: sys-utils/dmesg.c:397
+#: sys-utils/dmesg.c:408
#, c-format
msgid "failed to parse facility '%s'"
msgstr "解析设施“%s”失败"
-#: sys-utils/dmesg.c:399
+#: sys-utils/dmesg.c:410
#, c-format
msgid "unknown facility '%s'"
msgstr "未知设施“%s”"
-#: sys-utils/dmesg.c:527
+#: sys-utils/dmesg.c:538
#, c-format
msgid "cannot mmap: %s"
msgstr "无法 mmap:%s"
-#: sys-utils/dmesg.c:1355
+#: sys-utils/dmesg.c:1458
msgid "invalid buffer size argument"
msgstr "无效的 缓冲区大小 参数"
-#: sys-utils/dmesg.c:1407
+#: sys-utils/dmesg.c:1510
msgid "--show-delta is ignored when used together with iso8601 time format"
msgstr "--show-delta 与 iso8601 时间格式共用时将忽略"
-#: sys-utils/dmesg.c:1430
+#: sys-utils/dmesg.c:1533
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:1440
+#: sys-utils/dmesg.c:1543
msgid "read kernel buffer failed"
msgstr "读取内核缓冲区失败"
-#: sys-utils/dmesg.c:1459
+#: sys-utils/dmesg.c:1562
msgid "klogctl failed"
msgstr "klogctl 失败"
-#: sys-utils/eject.c:134
+#: sys-utils/eject.c:135
#, c-format
msgid " %s [options] [<device>|<mountpoint>]\n"
msgstr " %s [选项] [<设备>|<挂臷点>]\n"
-#: sys-utils/eject.c:137
+#: sys-utils/eject.c:138
msgid "Eject removable media.\n"
msgstr "弹出可移动媒体 \n"
-#: sys-utils/eject.c:140
+#: sys-utils/eject.c:141
msgid ""
" -a, --auto <on|off> turn auto-eject feature on or off\n"
" -c, --changerslot <slot> switch discs on a CD-ROM changer\n"
@@ -11958,7 +12262,7 @@ msgstr "默认设备:“%s”"
msgid "using default device `%s'"
msgstr "使用默认设备“%s”"
-#: sys-utils/eject.c:885 sys-utils/rtcwake.c:376
+#: sys-utils/eject.c:885 sys-utils/rtcwake.c:374
#, c-format
msgid "%s: unable to find device"
msgstr "%s:找不到设备"
@@ -11968,7 +12272,7 @@ msgstr "%s:找不到设备"
msgid "device name is `%s'"
msgstr "设备名称为“%s”"
-#: sys-utils/eject.c:893 sys-utils/umount.c:305 sys-utils/umount.c:328
+#: sys-utils/eject.c:893 sys-utils/umount.c:309 sys-utils/umount.c:332
#, c-format
msgid "%s: not mounted"
msgstr "%s:未挂载"
@@ -12089,48 +12393,48 @@ msgstr "磁带离线命令失败"
msgid "unable to eject"
msgstr "无法弹出"
-#: sys-utils/fallocate.c:83
+#: sys-utils/fallocate.c:84
#, c-format
msgid " %s [options] <filename>\n"
msgstr " %s [选项] <文件名>\n"
-#: sys-utils/fallocate.c:86
+#: sys-utils/fallocate.c:87
msgid "Preallocate space to, or deallocate space from a file.\n"
msgstr "为文件预分配空间或从文件回收空间。\n"
-#: sys-utils/fallocate.c:89
+#: sys-utils/fallocate.c:90
msgid " -c, --collapse-range remove a range from the file\n"
msgstr " -c, --collapse-range 移除文件中的某个范围\n"
-#: sys-utils/fallocate.c:90
+#: sys-utils/fallocate.c:91
msgid " -d, --dig-holes detect zeroes and replace with holes\n"
msgstr " -d, --dig-holes 检测零并替换为空洞\n"
-#: sys-utils/fallocate.c:91
+#: sys-utils/fallocate.c:92
msgid " -i, --insert-range insert a hole at range, shifting existing data\n"
msgstr ""
-#: sys-utils/fallocate.c:92
+#: sys-utils/fallocate.c:93
msgid " -l, --length <num> length for range operations, in bytes\n"
msgstr " -l, --length <数字> 范围操作的长度(字节数)\n"
-#: sys-utils/fallocate.c:93
+#: sys-utils/fallocate.c:94
msgid " -n, --keep-size maintain the apparent size of the file\n"
msgstr " -n, --keep-size 保持文件的显示大小\n"
-#: sys-utils/fallocate.c:94
+#: sys-utils/fallocate.c:95
msgid " -o, --offset <num> offset for range operations, in bytes\n"
msgstr " -o, --offset <数字> 范围操作的偏移量(字节数)\n"
-#: sys-utils/fallocate.c:95
+#: sys-utils/fallocate.c:96
msgid " -p, --punch-hole replace a range with a hole (implies -n)\n"
msgstr " -p, --punch-hole 将某个范围替换为空洞(连带打开 -n)\n"
-#: sys-utils/fallocate.c:96
+#: sys-utils/fallocate.c:97
msgid " -z, --zero-range zero and ensure allocation of a range\n"
msgstr " -z, --zero-range 清零并保证分配某个范围\n"
-#: sys-utils/fallocate.c:98
+#: sys-utils/fallocate.c:99
#, fuzzy
msgid " -x, --posix use posix_fallocate(3) instead of fallocate(2)\n"
msgstr " -y, --physical 打印物理 ID 而非逻辑 ID\n"
@@ -12228,69 +12532,69 @@ msgstr " -F, --no-fork 执行命令时不 fork\n"
msgid " --verbose increase verbosity\n"
msgstr " --verbose 增加详尽程度\n"
-#: sys-utils/flock.c:107
+#: sys-utils/flock.c:106
#, c-format
msgid "cannot open lock file %s"
msgstr "不能打开锁文件 %s"
-#: sys-utils/flock.c:205
+#: sys-utils/flock.c:208
msgid "invalid timeout value"
msgstr "无效的 超时值"
-#: sys-utils/flock.c:209
+#: sys-utils/flock.c:212
msgid "invalid exit code"
msgstr "无效退出代码"
-#: sys-utils/flock.c:226
+#: sys-utils/flock.c:229
msgid "the --no-fork and --close options are incompatible"
msgstr "--no-fork 和 --close 选项不兼容"
-#: sys-utils/flock.c:234
+#: sys-utils/flock.c:237
#, c-format
msgid "%s requires exactly one command argument"
msgstr "%s 需要惟一的命令行参数"
-#: sys-utils/flock.c:252
+#: sys-utils/flock.c:255
msgid "bad file descriptor"
msgstr "错误的文件描述符"
-#: sys-utils/flock.c:255
+#: sys-utils/flock.c:258
msgid "requires file descriptor, file or directory"
msgstr "需要文件描述符、文件或目录"
-#: sys-utils/flock.c:279
+#: sys-utils/flock.c:282
msgid "failed to get lock"
msgstr "获取锁失败"
-#: sys-utils/flock.c:286
+#: sys-utils/flock.c:289
msgid "timeout while waiting to get lock"
msgstr "等待获得锁超时"
-#: sys-utils/flock.c:327
+#: sys-utils/flock.c:330
#, c-format
msgid "%s: getting lock took %ld.%06ld seconds\n"
msgstr "%s:等待获得锁花了 %ld.%06ld 秒\n"
-#: sys-utils/flock.c:338
+#: sys-utils/flock.c:341
#, c-format
msgid "%s: executing %s\n"
msgstr "%s: 正在执行 %s\n"
-#: sys-utils/fsfreeze.c:40
+#: sys-utils/fsfreeze.c:41
#, c-format
msgid " %s [options] <mountpoint>\n"
msgstr " %s [选项] <挂臷点>\n"
-#: sys-utils/fsfreeze.c:43
+#: sys-utils/fsfreeze.c:44
#, fuzzy
msgid "Suspend access to a filesystem.\n"
msgstr "挂载文件系统。\n"
-#: sys-utils/fsfreeze.c:46
+#: sys-utils/fsfreeze.c:47
msgid " -f, --freeze freeze the filesystem\n"
msgstr " -f, --freeze 冻结文件系统\n"
-#: sys-utils/fsfreeze.c:47
+#: sys-utils/fsfreeze.c:48
msgid " -u, --unfreeze unfreeze the filesystem\n"
msgstr " -u, --unfreeze 解冻文件系统\n"
@@ -12329,37 +12633,37 @@ msgstr "%s:FITRIM ioctl 失败"
msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
msgstr "%s:%s (%<PRIu64> 字节) 已修剪\n"
-#: sys-utils/fstrim.c:191 sys-utils/swapon.c:730 sys-utils/umount.c:225
+#: sys-utils/fstrim.c:191 sys-utils/swapon.c:734 sys-utils/umount.c:229
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失败"
-#: sys-utils/fstrim.c:251
+#: sys-utils/fstrim.c:252
#, c-format
msgid " %s [options] <mount point>\n"
msgstr " %s [选项] <挂臷点>\n"
-#: sys-utils/fstrim.c:254
+#: sys-utils/fstrim.c:255
msgid "Discard unused blocks on a mounted filesystem.\n"
msgstr "忽略已挂载文件系统上的未用锁。\n"
-#: sys-utils/fstrim.c:257
+#: sys-utils/fstrim.c:258
msgid " -a, --all trim all mounted filesystems that are supported\n"
msgstr " -a, --all 修剪不支持的所有已挂载文件系统\n"
-#: sys-utils/fstrim.c:258
+#: sys-utils/fstrim.c:259
msgid " -o, --offset <num> the offset in bytes to start discarding from\n"
msgstr " -o, --offset <数字> 开始丢弃的偏移量(字节)\n"
-#: sys-utils/fstrim.c:259
+#: sys-utils/fstrim.c:260
msgid " -l, --length <num> the number of bytes to discard\n"
msgstr " -l, --length <数字> 要丢弃的字符数\n"
-#: sys-utils/fstrim.c:260
+#: sys-utils/fstrim.c:261
msgid " -m, --minimum <num> the minimum extent length to discard\n"
msgstr " -m, --minimum <数字> 要丢弃的最小限制长度\n"
-#: sys-utils/fstrim.c:261
+#: sys-utils/fstrim.c:262
msgid " -v, --verbose print number of discarded bytes\n"
msgstr " -v, --verbose 打印丢弃的字节数\n"
@@ -12376,20 +12680,20 @@ msgstr "未指定挂载点"
msgid "%s: the discard operation is not supported"
msgstr "%s:不支持丢弃操作"
-#: sys-utils/hwclock.c:188
+#: sys-utils/hwclock.c:183
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "将假设硬件时钟保持为 %s 时间。\n"
-#: sys-utils/hwclock.c:189 sys-utils/hwclock.c:256
+#: sys-utils/hwclock.c:184 sys-utils/hwclock.c:248
msgid "UTC"
msgstr "UTC"
-#: sys-utils/hwclock.c:189 sys-utils/hwclock.c:255
+#: sys-utils/hwclock.c:184 sys-utils/hwclock.c:247
msgid "local"
msgstr "当地"
-#: sys-utils/hwclock.c:242
+#: sys-utils/hwclock.c:234
msgid ""
"Warning: unrecognized third line in adjtime file\n"
"(Expected: `UTC' or `LOCAL' or nothing.)"
@@ -12397,82 +12701,82 @@ msgstr ""
"警告:adjtime 文件第三行无法识别\n"
"(应为:“UTC”或“LOCAL”或空)"
-#: sys-utils/hwclock.c:249
+#: sys-utils/hwclock.c:241
#, c-format
msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgstr "上次漂移调整完成于1969(年)后 %ld 秒\n"
-#: sys-utils/hwclock.c:251
+#: sys-utils/hwclock.c:243
#, c-format
msgid "Last calibration done at %ld seconds after 1969\n"
msgstr "上次校准完成于1969(年)后 %ld 秒\n"
-#: sys-utils/hwclock.c:253
+#: sys-utils/hwclock.c:245
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "硬件时钟为 %s 时间\n"
-#: sys-utils/hwclock.c:280
+#: sys-utils/hwclock.c:272
#, c-format
msgid "Waiting for clock tick...\n"
msgstr "正在等等时钟滴答...\n"
-#: sys-utils/hwclock.c:286
+#: sys-utils/hwclock.c:278
#, c-format
msgid "...synchronization failed\n"
msgstr "...同步失败\n"
-#: sys-utils/hwclock.c:288
+#: sys-utils/hwclock.c:280
#, c-format
msgid "...got clock tick\n"
msgstr "...已获取时钟滴答\n"
-#: sys-utils/hwclock.c:327
+#: sys-utils/hwclock.c:321
#, c-format
msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
msgstr "硬件时钟值无效:%4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-#: sys-utils/hwclock.c:335
+#: sys-utils/hwclock.c:329
#, c-format
msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr "硬件时钟时间:%4d/%.2d/%.2d %.2d:%.2d:%.2d = 1969(年)后 %ld 秒\n"
-#: sys-utils/hwclock.c:361
+#: sys-utils/hwclock.c:356
#, c-format
msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
msgstr "从硬件时钟读取的时间:%4d/%.2d/%.2d %02d:%02d:%02d\n"
-#: sys-utils/hwclock.c:388
+#: sys-utils/hwclock.c:383
#, c-format
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgstr "正在将硬件时钟设置为 %.2d:%.2d:%.2d = 1969(年)后 %ld 秒\n"
-#: sys-utils/hwclock.c:394 sys-utils/hwclock.c:638 sys-utils/hwclock.c:726
+#: sys-utils/hwclock.c:389 sys-utils/hwclock.c:638
#, fuzzy, c-format
msgid "Test mode: clock was not changed\n"
msgstr "上次更改时间"
-#: sys-utils/hwclock.c:486
+#: sys-utils/hwclock.c:481
#, c-format
msgid "sleeping ~%d usec\n"
msgstr "将睡眠 ~%d 微秒\n"
-#: sys-utils/hwclock.c:497
+#: sys-utils/hwclock.c:492
#, c-format
msgid "time jumped backward %.6f seconds to %ld.%06ld - retargeting\n"
msgstr "时间倒退了 %.6f 秒到 %ld.%06ld - 正在重新定位\n"
-#: sys-utils/hwclock.c:505
+#: sys-utils/hwclock.c:500
#, c-format
msgid "%ld.%06ld < %ld.%06ld (%.6f)\n"
msgstr "%ld.%06ld < %ld.%06ld (%.6f)\n"
-#: sys-utils/hwclock.c:521
+#: sys-utils/hwclock.c:516
#, c-format
msgid "missed it - %ld.%06ld is too far past %ld.%06ld (%.6f > %.6f)\n"
msgstr "错过了- %ld.%06ld 在 %ld.%06ld 之后太长时间了(%.6f > %.6f)\n"
-#: sys-utils/hwclock.c:549
+#: sys-utils/hwclock.c:544
#, fuzzy, c-format
msgid ""
"%ld.%06ld is close enough to %ld.%06ld (%.6f < %.6f)\n"
@@ -12481,58 +12785,43 @@ msgstr ""
"%ld.%06d 距 %ld.%06d 太近(%.6f < %.6f)\n"
"请将 RTC 设为 %ld (%ld + %d; refsystime = %ld.%06d)\n"
-#: sys-utils/hwclock.c:571
-msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095)."
-msgstr "硬件时钟寄存器包含的值无效(如一个月的第 50 天)或超出了程序能处理的范围(如2095年)。"
+#: sys-utils/hwclock.c:619
+#, c-format
+msgid "Calling settimeofday(NULL, %d) to set persistent_clock_is_local.\n"
+msgstr ""
-#: sys-utils/hwclock.c:612
-msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it."
-msgstr "硬件时钟不包含有效时间,因此无法从它来设置系统时间。"
+#: sys-utils/hwclock.c:622
+msgid "Calling settimeofday(NULL, 0) to lock the warp function."
+msgstr ""
-#: sys-utils/hwclock.c:631 sys-utils/hwclock.c:718
-#, c-format
-msgid "Calling settimeofday:\n"
+#: sys-utils/hwclock.c:625
+#, fuzzy, c-format
+msgid "Calling settimeofday(%ld.%06ld, %d)\n"
msgstr "正在调用 settimeofday:\n"
-#: sys-utils/hwclock.c:632 sys-utils/hwclock.c:720
-#, c-format
-msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
-msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+#: sys-utils/hwclock.c:628
+#, fuzzy, c-format
+msgid "Calling settimeofday(NULL, %d) "
+msgstr "正在调用 settimeofday:\n"
-#: sys-utils/hwclock.c:634 sys-utils/hwclock.c:722
-#, c-format
-msgid "\ttz.tz_minuteswest = %d\n"
-msgstr "\ttz.tz_minuteswest = %d\n"
+#: sys-utils/hwclock.c:630
+msgid "to set the kernel timezone."
+msgstr ""
-#: sys-utils/hwclock.c:654 sys-utils/hwclock.c:750
-msgid "Must be superuser to set system clock."
-msgstr "只能以超级用户身份来设置系统时钟。"
+#: sys-utils/hwclock.c:632
+msgid "to warp System time."
+msgstr ""
-#: sys-utils/hwclock.c:657 sys-utils/hwclock.c:753
+#: sys-utils/hwclock.c:652
msgid "settimeofday() failed"
msgstr "settimeofday() 失败"
-#: sys-utils/hwclock.c:693
-#, c-format
-msgid "Current system time: %ld = %s\n"
-msgstr "当前系统时间:%ld = %s\n"
-
-#: sys-utils/hwclock.c:719
-#, c-format
-msgid "\tUTC: %s\n"
-msgstr "\tUTC:%s\n"
-
-#: sys-utils/hwclock.c:784
+#: sys-utils/hwclock.c:676
#, c-format
msgid "Not adjusting drift factor because the --update-drift option was not used.\n"
msgstr "将不调整漂移系数,因为没有使用 --update-drift 选项。\n"
-#: sys-utils/hwclock.c:788
-#, c-format
-msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
-msgstr "将不调整漂移系数,因为之前硬件时钟包含垃圾内容。\n"
-
-#: sys-utils/hwclock.c:793
+#: sys-utils/hwclock.c:680
#, c-format
msgid ""
"Not adjusting drift factor because last calibration time is zero,\n"
@@ -12541,12 +12830,12 @@ msgstr ""
"将不调整漂移系数,因为上次校准时间为零,\n"
"历史有问题;需要启动校准。\n"
-#: sys-utils/hwclock.c:799
+#: sys-utils/hwclock.c:686
#, c-format
msgid "Not adjusting drift factor because it has been less than four hours since the last calibration.\n"
msgstr "将不调整漂移系数,因为距上次校正不到四个小时。\n"
-#: sys-utils/hwclock.c:837
+#: sys-utils/hwclock.c:724
#, c-format
msgid ""
"Clock drift factor was calculated as %f seconds/day.\n"
@@ -12555,7 +12844,7 @@ msgstr ""
"时钟漂移系数会按 %f 秒/天计算。\n"
"系数过大,将重置为 0。\n"
-#: sys-utils/hwclock.c:844
+#: sys-utils/hwclock.c:731
#, fuzzy, c-format
msgid ""
"Clock drifted %f seconds in the past %f seconds\n"
@@ -12563,371 +12852,357 @@ msgid ""
"Adjusting drift factor by %f seconds/day\n"
msgstr "在过去的 %2$d 秒内,时钟漂移了 %1$.1f 秒,而漂移系数为 %3$f 秒/天。会将漂移系数调整 %4$f 秒/天\n"
-#: sys-utils/hwclock.c:888
+#: sys-utils/hwclock.c:775
#, fuzzy, c-format
msgid "Time since last adjustment is %ld second\n"
msgid_plural "Time since last adjustment is %ld seconds\n"
msgstr[0] "距上次调整的时间为 %d 秒\n"
-#: sys-utils/hwclock.c:892
+#: sys-utils/hwclock.c:779
#, c-format
msgid "Calculated Hardware Clock drift is %ld.%06ld seconds\n"
msgstr "计算出的硬件锁偏差为 %ld.%06ld 秒\n"
-#: sys-utils/hwclock.c:922
+#: sys-utils/hwclock.c:809
#, fuzzy, c-format
msgid ""
"Test mode: %s was not updated with:\n"
"%s"
msgstr "设备 %s 未与 %s 关联\n"
-#: sys-utils/hwclock.c:931
+#: sys-utils/hwclock.c:818
#, c-format
msgid "Could not open file with the clock adjustment parameters in it (%s) for writing"
msgstr "无法打开包含时钟调整参数(%s)的文件来写入"
-#: sys-utils/hwclock.c:935
+#: sys-utils/hwclock.c:822
#, c-format
msgid "Could not update file with the clock adjustment parameters (%s) in it"
msgstr "无法更新包含时钟调整参数(%s)的文件"
-#: sys-utils/hwclock.c:941
+#: sys-utils/hwclock.c:828
msgid "Drift adjustment parameters not updated."
msgstr "漂移调整参数未更新。"
-#: sys-utils/hwclock.c:974
-msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it."
-msgstr "硬件时间不包含有效时间,程序无法调整它。"
-
-#: sys-utils/hwclock.c:982
+#: sys-utils/hwclock.c:860
#, c-format
msgid "Not setting clock because last adjustment time is zero, so history is bad.\n"
msgstr "将不设置时钟,因为上次调整时间为零,历史有误。\n"
-#: sys-utils/hwclock.c:986
+#: sys-utils/hwclock.c:864
#, c-format
msgid "Not setting clock because drift factor %f is far too high.\n"
msgstr "将不设置时钟,因为上次漂移系数 %f 过高。\n"
-#: sys-utils/hwclock.c:1014
+#: sys-utils/hwclock.c:892
#, c-format
msgid "No usable clock interface found.\n"
msgstr "未找到可用的时钟接口。\n"
-#: sys-utils/hwclock.c:1015
+#: sys-utils/hwclock.c:893
msgid "Cannot access the Hardware Clock via any known method."
msgstr "无法通过已知的任何方式访问硬件时钟。"
-#: sys-utils/hwclock.c:1018
+#: sys-utils/hwclock.c:896
msgid "Use the --debug option to see the details of our search for an access method."
msgstr "请使用 --debug 选项来观察程序搜索访问方法的详情。"
-#: sys-utils/hwclock.c:1120
+#: sys-utils/hwclock.c:946
#, c-format
-msgid "Needed adjustment is less than one second, so not setting clock.\n"
-msgstr "需要的调整不到一秒,将不设置时钟。\n"
+msgid "Target date: %ld\n"
+msgstr ""
-#: sys-utils/hwclock.c:1140 sys-utils/hwclock.c:1146
+#: sys-utils/hwclock.c:947
#, c-format
-msgid "Unable to set system clock.\n"
-msgstr "无法设置系统时钟。\n"
+msgid "Predicted RTC: %ld\n"
+msgstr ""
+
+#: sys-utils/hwclock.c:978
+msgid "RTC read returned an invalid value."
+msgstr ""
-#: sys-utils/hwclock.c:1154
+#: sys-utils/hwclock.c:1006
#, c-format
-msgid "At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
-msgstr "位于1969(年)后 %ld 秒,RTC 应读取到的是1969(年)后 %ld 秒。\n"
+msgid "Needed adjustment is less than one second, so not setting clock.\n"
+msgstr "需要的调整不到一秒,将不设置时钟。\n"
-#: sys-utils/hwclock.c:1177
-msgid "Unable to get the epoch value from the kernel."
-msgstr "无法从内核获取纪元(epoch)值。"
+#: sys-utils/hwclock.c:1043
+#, fuzzy
+msgid "unable to read the RTC epoch."
+msgstr "不能读超级块"
-#: sys-utils/hwclock.c:1179
+#: sys-utils/hwclock.c:1045
#, c-format
-msgid "Kernel is assuming an epoch value of %lu\n"
-msgstr "内核假设纪元(epoch)值为 %lu\n"
+msgid "The RTC epoch is set to %lu.\n"
+msgstr ""
-#: sys-utils/hwclock.c:1184
-msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it."
-msgstr "要设置纪元(epoch)值,您必须使用“epoch”选项来指定设置的值。"
+#: sys-utils/hwclock.c:1048
+msgid "--epoch is required for --setepoch."
+msgstr ""
-#: sys-utils/hwclock.c:1188
-#, c-format
-msgid "Not setting the epoch to %lu - testing only.\n"
-msgstr "不会将纪元(epoch)设置为 %lu - 仅用于测试。\n"
+#: sys-utils/hwclock.c:1050
+#, fuzzy, c-format
+msgid "Test mode: epoch was not set to %s.\n"
+msgstr "上次更改时间"
-#: sys-utils/hwclock.c:1192
-#, c-format
-msgid "Unable to set the epoch value in the kernel.\n"
-msgstr "无法设置内核中的纪元(epoch)值。\n"
+#: sys-utils/hwclock.c:1053
+#, fuzzy
+msgid "unable to set the RTC epoch."
+msgstr "无法设置系统时钟。\n"
-#: sys-utils/hwclock.c:1220
-msgid " hwclock [function] [option...]\n"
+#: sys-utils/hwclock.c:1067
+#, fuzzy, c-format
+msgid " %s [function] [option...]\n"
msgstr " hwclock [功能] [选项...]\n"
-#: sys-utils/hwclock.c:1223
-msgid "Query or set the hardware clock.\n"
-msgstr "查询或设置硬件锁。\n"
+#: sys-utils/hwclock.c:1070
+msgid "Time clocks utility."
+msgstr ""
-#: sys-utils/hwclock.c:1225
-msgid ""
-"\n"
-"Functions:\n"
+#: sys-utils/hwclock.c:1073
+#, fuzzy
+msgid " -r, --show display the RTC time"
+msgstr " -r, --raw 以原始方式显示\n"
+
+#: sys-utils/hwclock.c:1074
+#, fuzzy
+msgid " --get display drift corrected RTC time"
+msgstr " -Z, --context 显示 SELinux 环境\n"
+
+#: sys-utils/hwclock.c:1075
+#, fuzzy
+msgid " --set set the RTC according to --date"
+msgstr " -r, --reset 重置端口\n"
+
+#: sys-utils/hwclock.c:1076
+msgid " -s, --hctosys set the system time from the RTC"
msgstr ""
-"\n"
-"功能:\n"
-#: sys-utils/hwclock.c:1226
-msgid ""
-" -h, --help show this help text and exit\n"
-" -r, --show read hardware clock and print result\n"
-" --get read hardware clock and print drift corrected result\n"
-" --set set the RTC to the time given with --date\n"
+#: sys-utils/hwclock.c:1077
+#, fuzzy
+msgid " -w, --systohc set the RTC from the system time"
+msgstr " -t, --types <列表> 限制文件系统集合\n"
+
+#: sys-utils/hwclock.c:1078
+msgid " --systz send timescale configurations to the kernel"
msgstr ""
-" -h, --help 显示此帮助并退出\n"
-" -r, --show 读取硬件时钟并打印结果\n"
-" --set 将 RTC 设置为 --date 指定的时间\n"
-#: sys-utils/hwclock.c:1230
-msgid ""
-" -s, --hctosys set the system time from the hardware clock\n"
-" -w, --systohc set the hardware clock from the current system time\n"
-" --systz set the system time based on the current timezone\n"
-" --adjust adjust the RTC to account for systematic drift since\n"
-" the clock was last set or adjusted\n"
-msgstr ""
-" -s, --hctosys 从硬件时钟设置系统时间\n"
-" -w, --systohc 从当前系统时间设置硬件时钟\n"
-" --systz 基于当前时区设置系统时间\n"
-" --adjust 根据自上次时钟设置或调整后的系统漂移\n"
-" 来调整 RTC\n"
-
-#: sys-utils/hwclock.c:1236
-msgid ""
-" --getepoch print out the kernel's hardware clock epoch value\n"
-" --setepoch set the kernel's hardware clock epoch value to the \n"
-" value given with --epoch\n"
+#: sys-utils/hwclock.c:1079
+msgid " -a, --adjust adjust the RTC to account for systematic drift"
msgstr ""
-" --getepoch 打印内核的硬件时钟纪元(epoch)值\n"
-" --setepoch 将内核的硬件时钟纪元(epoch)值设置为\n"
-" --epoch 选项指定的值\n"
-#: sys-utils/hwclock.c:1240
-msgid ""
-" --predict predict RTC reading at time given with --date\n"
-" -V, --version display version information and exit\n"
+#: sys-utils/hwclock.c:1081
+#, fuzzy
+msgid " --getepoch display the RTC epoch"
+msgstr " --help 显示此帮助并退出\n"
+
+#: sys-utils/hwclock.c:1082
+msgid " --setepoch set the RTC epoch according to --epoch"
msgstr ""
-" --predict 预测 --date 选项所指定时刻读取到的 RTC 值\n"
-" -V, --version 显示版本信息并退出\n"
-#: sys-utils/hwclock.c:1244
-msgid ""
-" -u, --utc the hardware clock is kept in UTC\n"
-" --localtime the hardware clock is kept in local time\n"
+#: sys-utils/hwclock.c:1084
+msgid " --predict predict the drifted RTC time according to --date"
msgstr ""
-" -u, --utc 硬件时钟保持为 UTC 时间\n"
-" --localtime 硬件时钟保持为本地时间\n"
-#: sys-utils/hwclock.c:1247
-msgid " -f, --rtc <file> special /dev/... file to use instead of default\n"
-msgstr " -f, --rtc <文件> 代替默认文件的特殊 /dev/... 文件\n"
+#: sys-utils/hwclock.c:1086
+#, fuzzy
+msgid " -u, --utc the RTC timescale is UTC"
+msgstr " -u, --utc RTC 使用 UTC\n"
+
+#: sys-utils/hwclock.c:1087
+#, fuzzy
+msgid " -l, --localtime the RTC timescale is Local"
+msgstr " -l, --local RTC 使用本地时区\n"
+
+#: sys-utils/hwclock.c:1090
+#, fuzzy, c-format
+msgid " -f, --rtc <file> use an alternate file to %1$s\n"
+msgstr " -F, --file <文件> 用指定文件代替 %s\n"
-#: sys-utils/hwclock.c:1250
+#: sys-utils/hwclock.c:1093
#, c-format
-msgid ""
-" --directisa access the ISA bus directly instead of %s\n"
-" --date <time> specifies the time to which to set the hardware clock\n"
+msgid " --directisa use the ISA bus instead of %1$s access\n"
+msgstr ""
+
+#: sys-utils/hwclock.c:1094
+#, fuzzy
+msgid " --date <time> date/time input for --set and --predict"
+msgstr " --date <时间戳> 唤醒时间戳的日期时间\n"
+
+#: sys-utils/hwclock.c:1096
+msgid " --epoch <year> epoch input for --setepoch"
msgstr ""
-#: sys-utils/hwclock.c:1253
-msgid " --epoch <year> specifies the hardware clock's epoch value\n"
+#: sys-utils/hwclock.c:1098
+msgid " --update-drift update the RTC drift factor"
msgstr ""
-#: sys-utils/hwclock.c:1256
+#: sys-utils/hwclock.c:1100
#, fuzzy, c-format
-msgid ""
-" --update-drift update drift factor in %1$s (requires\n"
-" --set or --systohc)\n"
-" --noadjfile do not access %1$s; this requires the use of\n"
-" either --utc or --localtime\n"
-" --adjfile <file> specifies the path to the adjust file;\n"
-" the default is %1$s\n"
-msgstr ""
-" --noadjfile 不访问 %s;需要使用 --utc 或 --localtime 选项\n"
-" --adjfile <文件> 指定调整文件的路径;\n"
-" 默认为 %s\n"
-
-#: sys-utils/hwclock.c:1262
-msgid ""
-" --test do not update anything, just show what would happen\n"
-" -D, --debug debugging mode\n"
-"\n"
+msgid " --noadjfile do not use %1$s\n"
+msgstr " --noheadings 不打印标题\n"
+
+#: sys-utils/hwclock.c:1102
+#, fuzzy, c-format
+msgid " --adjfile <file> use an alternate file to %1$s\n"
+msgstr " -F, --file <文件> 用指定文件代替 %s\n"
+
+#: sys-utils/hwclock.c:1103
+msgid " --test dry run; use -D to view what would have happened"
msgstr ""
-" --test 不更新,只显示将进行什么操作\n"
-" -D, --debug 调试模式\n"
-"\n"
-#: sys-utils/hwclock.c:1368
+#: sys-utils/hwclock.c:1104
+#, fuzzy
+msgid " -D, --debug display more details"
+msgstr " --verbose 打印更多细节\n"
+
+#: sys-utils/hwclock.c:1194
msgid "Unable to connect to audit system"
msgstr "无法连接到审计系统"
-#: sys-utils/hwclock.c:1432
-msgid "invalid epoch argument"
-msgstr "无效的纪元(epoch)参数"
-
-#: sys-utils/hwclock.c:1488
+#: sys-utils/hwclock.c:1311
#, fuzzy, c-format
msgid "%d too many arguments given"
msgstr "参数过多"
-#: sys-utils/hwclock.c:1496
+#: sys-utils/hwclock.c:1319
+msgid "--update-drift requires --set or --systohc"
+msgstr ""
+
+#: sys-utils/hwclock.c:1324
msgid "With --noadjfile, you must specify either --utc or --localtime"
msgstr "指定 --noadjfile 时,您必须指定 --utc 或 --localtime"
-#: sys-utils/hwclock.c:1503
+#: sys-utils/hwclock.c:1331
msgid "--date is required for --set or --predict"
msgstr ""
-#: sys-utils/hwclock.c:1509
+#: sys-utils/hwclock.c:1337
#, fuzzy, c-format
msgid "invalid date '%s'"
msgstr "无效 ID:%s"
-#: sys-utils/hwclock-cmos.c:391
+#: sys-utils/hwclock.c:1351
+#, fuzzy, c-format
+msgid "System Time: %ld.%06ld\n"
+msgstr "当前系统时间:%ld = %s\n"
+
+#: sys-utils/hwclock-cmos.c:389
#, fuzzy
msgid "ISA port access is not implemented"
msgstr "plymouth 请求 %c 没有实现"
-#: sys-utils/hwclock-cmos.c:394
+#: sys-utils/hwclock-cmos.c:391
#, fuzzy
msgid "iopl() port access failed"
msgstr "无法访问文件 %s"
-#: sys-utils/hwclock-cmos.c:396
-msgid "root privileges may be required"
-msgstr ""
-
-#: sys-utils/hwclock-cmos.c:402
+#: sys-utils/hwclock-cmos.c:397
#, fuzzy
msgid "Using direct ISA access to the clock"
msgstr "将对 ISA 时钟使用直接 I/O 指令。"
-#: sys-utils/hwclock-rtc.c:129
+#: sys-utils/hwclock-rtc.c:128
#, fuzzy, c-format
msgid "Trying to open: %s\n"
msgstr "正在尝试卸载 %s\n"
-#: sys-utils/hwclock-rtc.c:151 sys-utils/hwclock-rtc.c:249
-#: sys-utils/hwclock-rtc.c:411 sys-utils/hwclock-rtc.c:454
+#: sys-utils/hwclock-rtc.c:150 sys-utils/hwclock-rtc.c:253
#, fuzzy
msgid "cannot open rtc device"
msgstr "打不开 "
-#: sys-utils/hwclock-rtc.c:187
+#: sys-utils/hwclock-rtc.c:186
#, c-format
msgid "ioctl(%s) to %s to read the time failed"
msgstr "对 %2$s 的读取时间 ioctl(%1$s) 失败"
-#: sys-utils/hwclock-rtc.c:210
+#: sys-utils/hwclock-rtc.c:214
#, c-format
msgid "Waiting in loop for time from %s to change\n"
msgstr "正在循环等待来自 %s 的时间更改\n"
-#: sys-utils/hwclock-rtc.c:229
+#: sys-utils/hwclock-rtc.c:233
msgid "Timed out waiting for time change."
msgstr "等待时间更改超时。"
-#: sys-utils/hwclock-rtc.c:286
+#: sys-utils/hwclock-rtc.c:289
#, c-format
msgid "select() to %s to wait for clock tick timed out"
msgstr "对 %s select() 以等待时钟嘀嗒超时"
-#: sys-utils/hwclock-rtc.c:289
+#: sys-utils/hwclock-rtc.c:292
#, c-format
msgid "select() to %s to wait for clock tick failed"
msgstr "对 %s select() 以等待时钟嘀嗒失败"
-#: sys-utils/hwclock-rtc.c:294
+#: sys-utils/hwclock-rtc.c:297
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr "对 %s ioctl() 以关闭更新中断失败"
-#: sys-utils/hwclock-rtc.c:304
-#, c-format
-msgid "%s does not have interrupt functions. "
-msgstr "%s 没有中断函数。"
-
-#: sys-utils/hwclock-rtc.c:308
-#, c-format
-msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
-msgstr "对 %s ioctl() 以打开更新中断意外失败"
+#: sys-utils/hwclock-rtc.c:303
+#, fuzzy, c-format
+msgid "ioctl(%d, RTC_UIE_ON, 0) to %s failed"
+msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
-#: sys-utils/hwclock-rtc.c:361
+#: sys-utils/hwclock-rtc.c:356
#, fuzzy, c-format
msgid "ioctl(%s) to %s to set the time failed"
msgstr "对 %2$s ioctl(%1$s) 以设置时间失败。"
-#: sys-utils/hwclock-rtc.c:367
+#: sys-utils/hwclock-rtc.c:362
#, c-format
msgid "ioctl(%s) was successful.\n"
msgstr "ioctl(%s) 成功。\n"
-#: sys-utils/hwclock-rtc.c:378
+#: sys-utils/hwclock-rtc.c:373
#, fuzzy
msgid "Using the rtc interface to the clock."
msgstr "将对时钟使用 /dev 接口。"
-#: sys-utils/hwclock-rtc.c:407 sys-utils/hwclock-rtc.c:450
-#, fuzzy
-msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file. This file does not exist on this system."
-msgstr "要操作内核中的纪元(epoch)值,必须通过设备特殊文件 %s 访问 Linux “rtc”设备驱动。此系统上不存在该文件。"
-
-#: sys-utils/hwclock-rtc.c:416
-#, c-format
-msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+#: sys-utils/hwclock-rtc.c:405
+#, 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:421
-#, c-format
-msgid "we have read epoch %lu from %s with RTC_EPOCH_READ ioctl.\n"
-msgstr "我们使用RTC_EPOCH_READ ioctl 从 %2$s 读取了纪元(epoch) %1$lu。\n"
-
-#: sys-utils/hwclock-rtc.c:441
-#, c-format
-msgid "The epoch value may not be less than 1900. You requested %ld"
-msgstr "纪元(epoch)值不能小于 1900。您要求了 %ld"
+#: sys-utils/hwclock-rtc.c:411
+#, 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:459
-#, c-format
-msgid "setting epoch to %lu with RTC_EPOCH_SET ioctl to %s.\n"
-msgstr "正通过 RTC_EPOCH_SET ioctl 向 %2$s 设置纪元(epoch) %1$lu。\n"
+#: sys-utils/hwclock-rtc.c:429
+#, fuzzy, c-format
+msgid "invalid epoch '%s'."
+msgstr "无效 ID:%s"
-#: sys-utils/hwclock-rtc.c:465
-#, c-format
-msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl."
-msgstr "%s 的内核设备驱动没有 RTC_EPOCH_SET ioctl (方法)。"
+#: sys-utils/hwclock-rtc.c:440
+#, fuzzy, c-format
+msgid "ioctl(%d, RTC_EPOCH_SET, %lu) to %s failed"
+msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
-#: sys-utils/hwclock-rtc.c:469
-#, c-format
-msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+#: sys-utils/hwclock-rtc.c:446
+#, fuzzy, c-format
+msgid "ioctl(%d, RTC_EPOCH_SET, %lu) to %s succeeded.\n"
msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
-#: sys-utils/ipcmk.c:69
+#: sys-utils/ipcmk.c:70
msgid "Create various IPC resources.\n"
msgstr "创建各种 IPC 资源。\n"
-#: sys-utils/ipcmk.c:72
+#: sys-utils/ipcmk.c:73
msgid " -M, --shmem <size> create shared memory segment of size <size>\n"
msgstr " -M, --shmem <尺寸> 创建大小为指定<尺寸>的共享内存段。\n"
-#: sys-utils/ipcmk.c:73
+#: sys-utils/ipcmk.c:74
msgid " -S, --semaphore <number> create semaphore array with <number> elements\n"
msgstr " -S, --semaphore <数字> 创建包含 <数字> 个元素的信号量\n"
-#: sys-utils/ipcmk.c:74
+#: sys-utils/ipcmk.c:75
msgid " -Q, --queue create message queue\n"
msgstr " -Q, --queue 创建消息队列\n"
-#: sys-utils/ipcmk.c:75
+#: sys-utils/ipcmk.c:76
msgid " -p, --mode <mode> permission for the resource (default is 0644)\n"
msgstr " -p, --mode <模式> 资源的权限模式掩码(默认为 0644)\n"
@@ -12939,34 +13214,34 @@ msgstr "解析大小失败"
msgid "failed to parse elements"
msgstr "解析元素失败"
-#: sys-utils/ipcmk.c:140
+#: sys-utils/ipcmk.c:141
msgid "create share memory failed"
msgstr "创建共享内存失败"
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:143
#, c-format
msgid "Shared memory id: %d\n"
msgstr "共享内存 id:%d\n"
-#: sys-utils/ipcmk.c:148
+#: sys-utils/ipcmk.c:149
msgid "create message queue failed"
msgstr "创建消息队列失败"
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:151
#, c-format
msgid "Message queue id: %d\n"
msgstr "消息队列 id:%d\n"
-#: sys-utils/ipcmk.c:156
+#: sys-utils/ipcmk.c:157
msgid "create semaphore failed"
msgstr "创建信号量失败"
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:159
#, c-format
msgid "Semaphore id: %d\n"
msgstr "信号量 id:%d\n"
-#: sys-utils/ipcrm.c:50
+#: sys-utils/ipcrm.c:51
#, c-format
msgid ""
" %1$s [options]\n"
@@ -12975,39 +13250,39 @@ msgstr ""
" %1$s [选项]\n"
" %1$s shm|msg|sem <id>...\n"
-#: sys-utils/ipcrm.c:54
+#: sys-utils/ipcrm.c:55
msgid "Remove certain IPC resources.\n"
msgstr "移除某个 IPC 资源。\n"
-#: sys-utils/ipcrm.c:57
+#: sys-utils/ipcrm.c:58
msgid " -m, --shmem-id <id> remove shared memory segment by id\n"
msgstr " -m, --shmem-id <id> 按 id 号移除共享内存段\n"
-#: sys-utils/ipcrm.c:58
+#: sys-utils/ipcrm.c:59
msgid " -M, --shmem-key <key> remove shared memory segment by key\n"
msgstr " -M, --shmem-key <键> 按键值移除共享内存段\n"
-#: sys-utils/ipcrm.c:59
+#: sys-utils/ipcrm.c:60
msgid " -q, --queue-id <id> remove message queue by id\n"
msgstr " -q, --queue-id <id> 按 id 号移除消息队列\n"
-#: sys-utils/ipcrm.c:60
+#: sys-utils/ipcrm.c:61
msgid " -Q, --queue-key <key> remove message queue by key\n"
msgstr " -Q, --queue-key <键> 按键值移除消息队列\n"
-#: sys-utils/ipcrm.c:61
+#: sys-utils/ipcrm.c:62
msgid " -s, --semaphore-id <id> remove semaphore by id\n"
msgstr " -s, --semaphore-id <id> 按 id 号移除信号量\n"
-#: sys-utils/ipcrm.c:62
+#: sys-utils/ipcrm.c:63
msgid " -S, --semaphore-key <key> remove semaphore by key\n"
msgstr " -S, --semaphore-key <键> 按键值移除信号量\n"
-#: sys-utils/ipcrm.c:63
+#: sys-utils/ipcrm.c:64
msgid " -a, --all[=shm|msg|sem] remove all (in the specified category)\n"
msgstr " -a, --all[=<shm|msg|sem>] (将指定类别中的)全部移除\n"
-#: sys-utils/ipcrm.c:64
+#: sys-utils/ipcrm.c:65
msgid " -v, --verbose explain what is being done\n"
msgstr " -v, --verbose 解释正在进行的操作\n"
@@ -13085,7 +13360,7 @@ msgstr "内核未做信号量的相关配置"
msgid "kernel not configured for message queues"
msgstr "内核未做消息的相关配置"
-#: sys-utils/ipcs.c:52
+#: sys-utils/ipcs.c:53
#, c-format
msgid ""
" %1$s [resource-option...] [output-option]\n"
@@ -13094,27 +13369,27 @@ msgstr ""
" %1$s [资源选项...] [输出选项]\n"
" %1$s -m|-q|-s -i <id>\n"
-#: sys-utils/ipcs.c:56 sys-utils/lsipc.c:280
+#: sys-utils/ipcs.c:57 sys-utils/lsipc.c:281
msgid "Show information on IPC facilities.\n"
msgstr "显示 IPC 设施的信息。\n"
-#: sys-utils/ipcs.c:59
+#: sys-utils/ipcs.c:60
msgid " -i, --id <id> print details on resource identified by <id>\n"
msgstr " -i, --id <id> 打印由<id>标识的资源的详细信息\n"
-#: sys-utils/ipcs.c:64 sys-utils/lsipc.c:283
+#: sys-utils/ipcs.c:64 sys-utils/lsipc.c:284
msgid "Resource options:\n"
msgstr "资源选项:\n"
-#: sys-utils/ipcs.c:65 sys-utils/lsipc.c:284
+#: sys-utils/ipcs.c:65 sys-utils/lsipc.c:285
msgid " -m, --shmems shared memory segments\n"
msgstr " -m, --shmems 共享内存段\n"
-#: sys-utils/ipcs.c:66 sys-utils/lsipc.c:285
+#: sys-utils/ipcs.c:66 sys-utils/lsipc.c:286
msgid " -q, --queues message queues\n"
msgstr " -q, --queues 消息队列\n"
-#: sys-utils/ipcs.c:67 sys-utils/lsipc.c:286
+#: sys-utils/ipcs.c:67 sys-utils/lsipc.c:287
msgid " -s, --semaphores semaphores\n"
msgstr " -s, --semaphores 信号量\n"
@@ -13683,68 +13958,68 @@ msgstr "%s (字节) = "
msgid "%s (kbytes) = "
msgstr "%s (千字节) = "
-#: sys-utils/ldattach.c:180
+#: sys-utils/ldattach.c:184
msgid "invalid iflag"
msgstr "无效的 iflag"
-#: sys-utils/ldattach.c:196
+#: sys-utils/ldattach.c:200
#, c-format
msgid " %s [options] <ldisc> <device>\n"
msgstr " %s [选项] <线路规则> <设备>\n"
-#: sys-utils/ldattach.c:199
+#: sys-utils/ldattach.c:203
msgid "Attach a line discipline to a serial line.\n"
msgstr "向串口线附加一条线路规则。\n"
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:206
msgid " -d, --debug print verbose messages to stderr\n"
msgstr " -d, --debug 向标准错误打印详尽消息\n"
-#: sys-utils/ldattach.c:203
+#: sys-utils/ldattach.c:207
msgid " -s, --speed <value> set serial line speed\n"
msgstr " -s, --speed <值> 设置串口线速度\n"
-#: sys-utils/ldattach.c:204
+#: sys-utils/ldattach.c:208
msgid " -c, --intro-command <string> intro sent before ldattach\n"
msgstr " -c, --intro-command <字符串> 先发送 intro 后发送 ldattach\n"
-#: sys-utils/ldattach.c:205
+#: sys-utils/ldattach.c:209
msgid " -p, --pause <seconds> pause between intro and ldattach\n"
msgstr " -p, --pause <秒数> 在 intro 和 ldattach 之间暂停\n"
-#: sys-utils/ldattach.c:206
+#: sys-utils/ldattach.c:210
msgid " -7, --sevenbits set character size to 7 bits\n"
msgstr " -7, --sevenbits 字节大小设为 7 位\n"
-#: sys-utils/ldattach.c:207
+#: sys-utils/ldattach.c:211
msgid " -8, --eightbits set character size to 8 bits\n"
msgstr " -8, --eightbits 字节大小设为 8 位\n"
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:212
msgid " -n, --noparity set parity to none\n"
msgstr " -n, --noparity 设为无校验位\n"
-#: sys-utils/ldattach.c:209
+#: sys-utils/ldattach.c:213
msgid " -e, --evenparity set parity to even\n"
msgstr " -e, --evenparity 设为奇检验\n"
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:214
msgid " -o, --oddparity set parity to odd\n"
msgstr " -o, --oddparity 设为偶检验\n"
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:215
msgid " -1, --onestopbit set stop bits to one\n"
msgstr " -1, --onestopbit 停止位设为 1\n"
-#: sys-utils/ldattach.c:212
+#: sys-utils/ldattach.c:216
msgid " -2, --twostopbits set stop bits to two\n"
msgstr " -2, --twostopbits 停止位设为 2\n"
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:217
msgid " -i, --iflag [-]<iflag> set input mode flag\n"
msgstr " -i, --iflag [-]<iflag> 设置输入模式标志\n"
-#: sys-utils/ldattach.c:219
+#: sys-utils/ldattach.c:222
msgid ""
"\n"
"Known <ldisc> names:\n"
@@ -13752,7 +14027,7 @@ msgstr ""
"\n"
"已知<线路规则>名称:\n"
-#: sys-utils/ldattach.c:223
+#: sys-utils/ldattach.c:226
msgid ""
"\n"
"Known <iflag> names:\n"
@@ -13760,48 +14035,48 @@ msgstr ""
"\n"
"已知<iflag>名称:\n"
-#: sys-utils/ldattach.c:340
+#: sys-utils/ldattach.c:344
msgid "invalid speed argument"
msgstr "无效的 速度 参数"
-#: sys-utils/ldattach.c:343
+#: sys-utils/ldattach.c:347
msgid "invalid pause argument"
msgstr "无效的暂停参数"
-#: sys-utils/ldattach.c:369
+#: sys-utils/ldattach.c:374
msgid "invalid line discipline argument"
msgstr "无效的 线路规则 参数"
-#: sys-utils/ldattach.c:389
+#: sys-utils/ldattach.c:394
#, c-format
msgid "%s is not a serial line"
msgstr "%s 不是串行线"
-#: sys-utils/ldattach.c:396
+#: sys-utils/ldattach.c:401
#, c-format
msgid "cannot get terminal attributes for %s"
msgstr "无法获取 %s 的终端属性"
-#: sys-utils/ldattach.c:399
+#: sys-utils/ldattach.c:404
#, c-format
msgid "speed %d unsupported"
msgstr "不支持速度 %d"
-#: sys-utils/ldattach.c:448
+#: sys-utils/ldattach.c:453
#, c-format
msgid "cannot set terminal attributes for %s"
msgstr "无法设置 %s 的终端属性"
-#: sys-utils/ldattach.c:458
+#: sys-utils/ldattach.c:463
#, c-format
msgid "cannot write intro command to %s"
msgstr "无法向 %s 写入 intro 命令"
-#: sys-utils/ldattach.c:468
+#: sys-utils/ldattach.c:473
msgid "cannot set line discipline"
msgstr "无法设置行规则"
-#: sys-utils/ldattach.c:478
+#: sys-utils/ldattach.c:483
msgid "cannot daemonize"
msgstr "无法转为守护进程"
@@ -13865,7 +14140,7 @@ msgstr ",加密 %s(类型 %u)"
msgid "%s: detach failed"
msgstr "%s:断开失败"
-#: sys-utils/losetup.c:385
+#: sys-utils/losetup.c:386
#, c-format
msgid ""
" %1$s [options] [<loopdev>]\n"
@@ -13874,95 +14149,86 @@ msgstr ""
" %1$s [选项] [<回环设备>]\n"
" %1$s [选项] -f | <回环设备> <文件>\n"
-#: sys-utils/losetup.c:390
+#: sys-utils/losetup.c:391
msgid "Set up and control loop devices.\n"
msgstr "设置和控制回环设备。\n"
-#: sys-utils/losetup.c:394
+#: sys-utils/losetup.c:395
msgid " -a, --all list all used devices\n"
msgstr " -a, --all 列出所有使用的设备\n"
-#: sys-utils/losetup.c:395
+#: sys-utils/losetup.c:396
msgid " -d, --detach <loopdev>... detach one or more devices\n"
msgstr " -d, --detach <回环设备>... 断开一台或多台设备\n"
-#: sys-utils/losetup.c:396
+#: sys-utils/losetup.c:397
msgid " -D, --detach-all detach all used devices\n"
msgstr " -D, --detach-all 断开所有使用的设备\n"
-#: sys-utils/losetup.c:397
+#: sys-utils/losetup.c:398
msgid " -f, --find find first unused device\n"
msgstr " -f, --find 查找第一个未使用的设备\n"
-#: sys-utils/losetup.c:398
+#: sys-utils/losetup.c:399
msgid " -c, --set-capacity <loopdev> resize the device\n"
msgstr " -c, --set-capacity <回环设备> 改变设备容量\n"
-#: sys-utils/losetup.c:399
+#: sys-utils/losetup.c:400
msgid " -j, --associated <file> list all devices associated with <file>\n"
msgstr " -j, --associated <文件> 列出所有与 <文件> 相关的设备\n"
-#: sys-utils/losetup.c:400
+#: sys-utils/losetup.c:401
msgid " -L, --nooverlap avoid possible conflict between devices\n"
msgstr " -L, --nooverlap 避免设备间的潜在冲突\n"
-#: sys-utils/losetup.c:404
+#: sys-utils/losetup.c:405
msgid " -o, --offset <num> start at offset <num> into file\n"
msgstr " -o, --offset <数字> 在文件偏移量 <数字> 处开始\n"
-#: sys-utils/losetup.c:405
+#: sys-utils/losetup.c:406
msgid " --sizelimit <num> device is limited to <num> bytes of the file\n"
msgstr " --sizelimit <数字> 设备限制为了文件的<数字>个字节\n"
-#: sys-utils/losetup.c:406
+#: sys-utils/losetup.c:407
msgid " -P, --partscan create a partitioned loop device\n"
msgstr " -P, --partscan 创建带分区的回环设备\n"
-#: sys-utils/losetup.c:407
+#: sys-utils/losetup.c:408
msgid " -r, --read-only set up a read-only loop device\n"
msgstr " -r, --read-only 创建只读的回环设备\n"
-#: sys-utils/losetup.c:408
+#: sys-utils/losetup.c:409
msgid " --direct-io[=<on|off>] open backing file with O_DIRECT\n"
msgstr " --direct-io[=<on|off>] 通过 O_DIRECT 打开后备文件\n"
-#: sys-utils/losetup.c:409
+#: sys-utils/losetup.c:410
msgid " --show print device name after setup (with -f)\n"
msgstr " --show 设置后打印设备名(加 -f 选项)\n"
-#: sys-utils/losetup.c:410
+#: sys-utils/losetup.c:411
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详尽模式\n"
-#: sys-utils/losetup.c:414
+#: sys-utils/losetup.c:415
msgid " -J, --json use JSON --list output format\n"
msgstr " -J, --json 使用 JSON --list 输出格式\n"
-#: sys-utils/losetup.c:415
+#: sys-utils/losetup.c:416
msgid " -l, --list list info about all or specified (default)\n"
msgstr " -l, --list 列出所有或指定的信息(默认)\n"
-#: sys-utils/losetup.c:416
+#: sys-utils/losetup.c:417
msgid " -n, --noheadings don't print headings for --list output\n"
msgstr " -n, --noheadings --list 输出时不打印标题\n"
-#: sys-utils/losetup.c:417
+#: sys-utils/losetup.c:418
msgid " -O, --output <cols> specify columns to output for --list\n"
msgstr " -O, --output <列> 指定 --list 选项要输出的列\n"
-#: sys-utils/losetup.c:418
+#: sys-utils/losetup.c:419
msgid " --raw use raw --list output format\n"
msgstr " --raw 使用原生 --list 输出格式\n"
-#: sys-utils/losetup.c:424
-#, fuzzy
-msgid ""
-"\n"
-"Available --output columns:\n"
-msgstr ""
-"\n"
-"可用的 --list 列:\n"
-
#: sys-utils/losetup.c:444
#, c-format
msgid "%s: Warning: file is smaller than 512 bytes; the loop device may be useless or invisible for system tools."
@@ -14139,15 +14405,15 @@ msgstr "读取失败︰ %s"
msgid "Failed to extract the node number"
msgstr "提取节点号失败"
-#: sys-utils/lscpu.c:1586 sys-utils/lscpu.c:1596
+#: sys-utils/lscpu.c:1585 sys-utils/lscpu.c:1595
msgid "Y"
msgstr "Y"
-#: sys-utils/lscpu.c:1586 sys-utils/lscpu.c:1596
+#: sys-utils/lscpu.c:1585 sys-utils/lscpu.c:1595
msgid "N"
msgstr "N"
-#: sys-utils/lscpu.c:1680
+#: sys-utils/lscpu.c:1679
#, c-format
msgid ""
"# The following is the parsable format, which can be fed to other\n"
@@ -14157,165 +14423,161 @@ msgstr ""
"# 以下是可解析格式,可以输给其他程序。每列中的各个不同项有一个惟一\n"
"# 的从 0 开始的 ID。\n"
-#: sys-utils/lscpu.c:1875 sys-utils/lsns.c:532 sys-utils/zramctl.c:497
-msgid "failed to initialize output column"
-msgstr "初始化输出列失败"
-
-#: sys-utils/lscpu.c:1877
+#: sys-utils/lscpu.c:1876
msgid "Architecture:"
msgstr "架构:"
-#: sys-utils/lscpu.c:1890
+#: sys-utils/lscpu.c:1889
msgid "CPU op-mode(s):"
msgstr "CPU 运行模式:"
-#: sys-utils/lscpu.c:1893 sys-utils/lscpu.c:1895
+#: sys-utils/lscpu.c:1892 sys-utils/lscpu.c:1894
msgid "Byte Order:"
msgstr "字节序:"
-#: sys-utils/lscpu.c:1897
+#: sys-utils/lscpu.c:1896
msgid "CPU(s):"
msgstr "CPU:"
-#: sys-utils/lscpu.c:1900
+#: sys-utils/lscpu.c:1899
msgid "On-line CPU(s) mask:"
msgstr "在线 CPU 掩码:"
-#: sys-utils/lscpu.c:1901
+#: sys-utils/lscpu.c:1900
msgid "On-line CPU(s) list:"
msgstr "在线 CPU 列表:"
-#: sys-utils/lscpu.c:1920
+#: sys-utils/lscpu.c:1919
msgid "Off-line CPU(s) mask:"
msgstr "离线 CPU 掩码:"
-#: sys-utils/lscpu.c:1921
+#: sys-utils/lscpu.c:1920
msgid "Off-line CPU(s) list:"
msgstr "离线 CPU 列表:"
-#: sys-utils/lscpu.c:1956
+#: sys-utils/lscpu.c:1955
msgid "Thread(s) per core:"
msgstr "每个核的线程数:"
-#: sys-utils/lscpu.c:1958
+#: sys-utils/lscpu.c:1957
msgid "Core(s) per socket:"
msgstr "每个座的核数:"
-#: sys-utils/lscpu.c:1961
+#: sys-utils/lscpu.c:1960
msgid "Socket(s) per book:"
msgstr "每个 book 的座数:"
-#: sys-utils/lscpu.c:1964
+#: sys-utils/lscpu.c:1963
msgid "Book(s) per drawer:"
msgstr "每个抽屉里的 Book 数︰"
-#: sys-utils/lscpu.c:1966
+#: sys-utils/lscpu.c:1965
msgid "Drawer(s):"
msgstr "抽屉:"
-#: sys-utils/lscpu.c:1968
+#: sys-utils/lscpu.c:1967
msgid "Book(s):"
msgstr "Book:"
-#: sys-utils/lscpu.c:1971
+#: sys-utils/lscpu.c:1970
msgid "Socket(s):"
msgstr "座:"
-#: sys-utils/lscpu.c:1975
+#: sys-utils/lscpu.c:1974
msgid "NUMA node(s):"
msgstr "NUMA 节点:"
-#: sys-utils/lscpu.c:1977
+#: sys-utils/lscpu.c:1976
msgid "Vendor ID:"
msgstr "厂商 ID:"
-#: sys-utils/lscpu.c:1979
+#: sys-utils/lscpu.c:1978
msgid "Machine type:"
msgstr "机器类型︰"
-#: sys-utils/lscpu.c:1981
+#: sys-utils/lscpu.c:1980
msgid "CPU family:"
msgstr "CPU 系列:"
-#: sys-utils/lscpu.c:1983
+#: sys-utils/lscpu.c:1982
msgid "Model:"
msgstr "型号:"
-#: sys-utils/lscpu.c:1985
+#: sys-utils/lscpu.c:1984
msgid "Model name:"
msgstr "型号名称:"
-#: sys-utils/lscpu.c:1987
+#: sys-utils/lscpu.c:1986
msgid "Stepping:"
msgstr "步进:"
-#: sys-utils/lscpu.c:1989
+#: sys-utils/lscpu.c:1988
msgid "CPU MHz:"
msgstr "CPU MHz:"
-#: sys-utils/lscpu.c:1991
+#: sys-utils/lscpu.c:1990
msgid "CPU dynamic MHz:"
msgstr "CPU 动态 MHz:"
-#: sys-utils/lscpu.c:1993
+#: sys-utils/lscpu.c:1992
msgid "CPU static MHz:"
msgstr "CPU 静态 MHz:"
-#: sys-utils/lscpu.c:1995
+#: sys-utils/lscpu.c:1994
msgid "CPU max MHz:"
msgstr "CPU 最大 MHz:"
-#: sys-utils/lscpu.c:1997
+#: sys-utils/lscpu.c:1996
msgid "CPU min MHz:"
msgstr "CPU 最小 MHz:"
-#: sys-utils/lscpu.c:1999
+#: sys-utils/lscpu.c:1998
msgid "BogoMIPS:"
msgstr "BogoMIPS:"
-#: sys-utils/lscpu.c:2002 sys-utils/lscpu.c:2004
+#: sys-utils/lscpu.c:2001 sys-utils/lscpu.c:2003
msgid "Virtualization:"
msgstr "虚拟化:"
-#: sys-utils/lscpu.c:2007
+#: sys-utils/lscpu.c:2006
msgid "Hypervisor:"
msgstr "超管理器:"
-#: sys-utils/lscpu.c:2009
+#: sys-utils/lscpu.c:2008
msgid "Hypervisor vendor:"
msgstr "超管理器厂商:"
-#: sys-utils/lscpu.c:2010
+#: sys-utils/lscpu.c:2009
msgid "Virtualization type:"
msgstr "虚拟化类型:"
-#: sys-utils/lscpu.c:2013
+#: sys-utils/lscpu.c:2012
msgid "Dispatching mode:"
msgstr "分派模式:"
-#: sys-utils/lscpu.c:2017 sys-utils/lscpu.c:2024
+#: sys-utils/lscpu.c:2016 sys-utils/lscpu.c:2023
#, c-format
msgid "%s cache:"
msgstr "%s 缓存:"
-#: sys-utils/lscpu.c:2030
+#: sys-utils/lscpu.c:2029
#, c-format
msgid "NUMA node%d CPU(s):"
msgstr "NUMA 节点%d CPU:"
-#: sys-utils/lscpu.c:2035
+#: sys-utils/lscpu.c:2034
msgid "Physical sockets:"
msgstr "物理套接字︰"
-#: sys-utils/lscpu.c:2036
+#: sys-utils/lscpu.c:2035
msgid "Physical chips:"
msgstr "物理芯片︰"
-#: sys-utils/lscpu.c:2037
+#: sys-utils/lscpu.c:2036
msgid "Physical cores/chip:"
msgstr "物理核心/芯片︰"
-#: sys-utils/lscpu.c:2041
+#: sys-utils/lscpu.c:2040
msgid "Flags:"
msgstr "标记:"
@@ -14360,7 +14622,12 @@ msgstr " -x, --hex 打印十六进制掩码而非 CPU 列表\n"
msgid " -y, --physical print physical instead of logical IDs\n"
msgstr " -y, --physical 打印物理 ID 而非逻辑 ID\n"
-#: sys-utils/lscpu.c:2171
+#: sys-utils/lscpu.c:2151 sys-utils/lsmem.c:475
+#, fuzzy, c-format
+msgid "invalid argument to %s"
+msgstr "无效参数:%s"
+
+#: sys-utils/lscpu.c:2170
#, 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"
@@ -14594,35 +14861,35 @@ msgstr "限制"
msgid "column %s does not apply to the specified IPC"
msgstr "列 %s 不适用于指定的 IPC"
-#: sys-utils/lsipc.c:287
+#: sys-utils/lsipc.c:288
msgid " -g, --global info about system-wide usage (may be used with -m, -q and -s)\n"
msgstr " -g, --global 有关系统范围使用量的信息(可与 -m, -q 和 -s 共用)\n"
-#: sys-utils/lsipc.c:288
+#: sys-utils/lsipc.c:289
msgid " -i, --id <id> print details on resource identified by <id>\n"
msgstr " -i, --id <id> 打印由<id>标识的资源的详细信息\n"
-#: sys-utils/lsipc.c:294
+#: sys-utils/lsipc.c:295
msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为打印 SIZE,而非易读格式\n"
-#: sys-utils/lsipc.c:295
+#: sys-utils/lsipc.c:296
msgid " -c, --creator show creator and owner\n"
msgstr " -c, --creator 显示创建者和拥有者\n"
-#: sys-utils/lsipc.c:297
+#: sys-utils/lsipc.c:298
msgid " -J, --json use the JSON output format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: sys-utils/lsipc.c:299
+#: sys-utils/lsipc.c:300
msgid " -l, --list force list output format (for example with --id)\n"
msgstr " -l, --list 强制以列表格式输出(如与 --id 共用)\n"
-#: sys-utils/lsipc.c:301
+#: sys-utils/lsipc.c:302
msgid " -P, --numeric-perms print numeric permissions (PERMS column)\n"
msgstr " -P, --numeric-perms 打印权限数值(PERMS 列)\n"
-#: sys-utils/lsipc.c:303
+#: sys-utils/lsipc.c:304
msgid " -t, --time show attach, detach and change times\n"
msgstr " -t, --time 显示附加、脱离和更改时间\n"
@@ -14803,49 +15070,49 @@ msgstr "最大总共享内存"
msgid "Total offline memory:"
msgstr ""
-#: sys-utils/lsmem.c:259
+#: sys-utils/lsmem.c:257
#, fuzzy, c-format
msgid "Failed to open %s"
msgstr "解析 %s 失败"
-#: sys-utils/lsmem.c:354
+#: sys-utils/lsmem.c:353
#, fuzzy
msgid "This system does not support memory blocks"
msgstr "该系统不支持重新扫描 CPU"
-#: sys-utils/lsmem.c:374
+#: sys-utils/lsmem.c:376
msgid "List the ranges of available memory with their online status.\n"
msgstr ""
-#: sys-utils/lsmem.c:379
+#: sys-utils/lsmem.c:381
#, fuzzy
msgid " -a, --all list each individual memory block\n"
msgstr " -a, --all 打印所有设备\n"
-#: sys-utils/lsmem.c:384
+#: sys-utils/lsmem.c:386
#, fuzzy
msgid " -s, --sysroot <dir> use the specified directory as system root\n"
msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
-#: sys-utils/lsmem.c:385
+#: sys-utils/lsmem.c:387
msgid " --summary[=when] print summary information (never,always or only)\n"
msgstr ""
-#: sys-utils/lsmem.c:488
+#: sys-utils/lsmem.c:489
#, fuzzy
msgid "unsupported --summary argument"
msgstr "不支持的 --setgroups 参数“%s”"
-#: sys-utils/lsmem.c:501
+#: sys-utils/lsmem.c:504
#, fuzzy
msgid "options --{raw,json,pairs} and --summary=only are mutually exclusive"
msgstr "--setgroups=allow 和 --map-root-user 选项是互斥的"
-#: sys-utils/lsmem.c:532 sys-utils/lsns.c:511
+#: sys-utils/lsmem.c:535 sys-utils/lsns.c:511
msgid "failed to initialize output table"
msgstr "初始化输出表失败"
-#: sys-utils/lsmem.c:544
+#: sys-utils/lsmem.c:547
#, fuzzy
msgid "Failed to initialize output column"
msgstr "初始化输出列失败"
@@ -14890,100 +15157,100 @@ msgstr "PID 的用户名"
msgid "failed to add line to output"
msgstr "向输出添加行出错"
-#: sys-utils/lsns.c:613
+#: sys-utils/lsns.c:614
#, c-format
msgid " %s [options] [<namespace>]\n"
msgstr " %s [选项] [<名字空间>]\n"
-#: sys-utils/lsns.c:616
+#: sys-utils/lsns.c:617
msgid "List system namespaces.\n"
msgstr "列出系统名字空间。\n"
-#: sys-utils/lsns.c:623
+#: sys-utils/lsns.c:624
msgid " -p, --task <pid> print process namespaces\n"
msgstr " -p, --task <pid> 打印进程名字空间\n"
-#: sys-utils/lsns.c:626
+#: sys-utils/lsns.c:627
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:716
+#: sys-utils/lsns.c:715
#, c-format
msgid "unknown namespace type: %s"
msgstr "未知的名字空间类型︰ %s"
-#: sys-utils/lsns.c:734
+#: sys-utils/lsns.c:733
msgid "--task is mutually exclusive with <namespace>"
msgstr "--task 与 <名字空间> 互斥"
-#: sys-utils/lsns.c:735
+#: sys-utils/lsns.c:734
msgid "invalid namespace argument"
msgstr "无效的名字空间参数"
-#: sys-utils/lsns.c:773
+#: sys-utils/lsns.c:772
#, c-format
msgid "not found namespace: %ju"
msgstr "找不到名字空间︰ %ju"
-#: sys-utils/mount.c:63 sys-utils/umount.c:116
+#: sys-utils/mount.c:65 sys-utils/umount.c:120
#, c-format
msgid "only root can use \"--%s\" option (effective UID is %u)"
msgstr "只有 root 用户能使用“--%s”选项(有效 UID 是 %u)"
-#: sys-utils/mount.c:66 sys-utils/umount.c:119
+#: sys-utils/mount.c:68 sys-utils/umount.c:123
#, c-format
msgid "only root can do that (effective UID is %u)"
msgstr "只有 root 用户能执行该操作(有效 UID 为 %u)"
-#: sys-utils/mount.c:70 sys-utils/umount.c:123
+#: sys-utils/mount.c:72 sys-utils/umount.c:127
#, c-format
msgid "only root can use \"--%s\" option"
msgstr "只有 root 用户能使用“--%s”选项"
-#: sys-utils/mount.c:71 sys-utils/umount.c:124
+#: sys-utils/mount.c:73 sys-utils/umount.c:128
msgid "only root can do that"
msgstr "只有 root 能执行该操作"
-#: sys-utils/mount.c:82 sys-utils/umount.c:58
+#: sys-utils/mount.c:84 sys-utils/umount.c:62
#, c-format
msgid "%s from %s (libmount %s"
msgstr "%s,来自 %s(libmount %s"
-#: sys-utils/mount.c:127
+#: sys-utils/mount.c:129
msgid "failed to read mtab"
msgstr "读取 mtab 失败"
-#: sys-utils/mount.c:189 sys-utils/umount.c:180
+#: sys-utils/mount.c:191 sys-utils/umount.c:184
#, c-format
msgid "%-25s: ignored\n"
msgstr "%-25s:已忽略\n"
-#: sys-utils/mount.c:190
+#: sys-utils/mount.c:192
#, c-format
msgid "%-25s: already mounted\n"
msgstr "%-25s:已经挂载\n"
-#: sys-utils/mount.c:246
+#: sys-utils/mount.c:248
#, c-format
msgid "%s: %s moved to %s.\n"
msgstr "%s:%s 已移到 %s。\n"
-#: sys-utils/mount.c:248
+#: sys-utils/mount.c:250
#, c-format
msgid "%s: %s bound on %s.\n"
msgstr "%s:%s 已绑定到 %s 。\n"
-#: sys-utils/mount.c:251 sys-utils/mount.c:255
+#: sys-utils/mount.c:253 sys-utils/mount.c:257
#, c-format
msgid "%s: %s mounted on %s.\n"
msgstr "%s:%s 已挂臷到 %s。\n"
-#: sys-utils/mount.c:253
+#: sys-utils/mount.c:255
#, c-format
msgid "%s: %s propagation flags changed.\n"
msgstr "%s:%s 传播标志已更改。\n"
-#: sys-utils/mount.c:273
+#: sys-utils/mount.c:275
#, c-format
msgid ""
"mount: %s does not contain SELinux labels.\n"
@@ -14997,27 +15264,27 @@ msgstr ""
" 受限制的应用程序可能会生成 AVC 消息,并被阻止访问该文件系统。\n"
" 更多详细信息请参阅 restorecon(8) 和 mount(8)。\n"
-#: sys-utils/mount.c:305 sys-utils/umount.c:157
+#: sys-utils/mount.c:307 sys-utils/umount.c:161
#, fuzzy, c-format
msgid "%s: %s."
msgstr "%15s: %s"
-#: sys-utils/mount.c:331
+#: sys-utils/mount.c:333
#, c-format
msgid "%s: failed to parse"
msgstr "%s:解析失败"
-#: sys-utils/mount.c:370
+#: sys-utils/mount.c:372
#, c-format
msgid "unsupported option format: %s"
msgstr "不支持的参数格式:%s"
-#: sys-utils/mount.c:372
+#: sys-utils/mount.c:374
#, c-format
msgid "failed to append option '%s'"
msgstr "追加选项“%s”失败"
-#: sys-utils/mount.c:389
+#: sys-utils/mount.c:392
#, c-format
msgid ""
" %1$s [-lhV]\n"
@@ -15032,11 +15299,11 @@ msgstr ""
" %1$s [选项] <源> <目录>\n"
" %1$s <操作> <挂载点> [<目标>]\n"
-#: sys-utils/mount.c:397
+#: sys-utils/mount.c:400
msgid "Mount a filesystem.\n"
msgstr "挂载文件系统。\n"
-#: sys-utils/mount.c:401
+#: sys-utils/mount.c:404
#, c-format
msgid ""
" -a, --all mount all filesystems mentioned in fstab\n"
@@ -15051,22 +15318,22 @@ msgstr ""
" -F, --fork 对每个设备禁用 fork(和 -a 选项一起使用)\n"
" -T, --fstab <路径> /etc/fstab 的替代文件\n"
-#: sys-utils/mount.c:407
+#: sys-utils/mount.c:410
#, 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:409
+#: sys-utils/mount.c:412
#, c-format
msgid " -l, --show-labels show also filesystem labels\n"
msgstr " -l, --show-labels 也显示文件系统标签\n"
-#: sys-utils/mount.c:411 sys-utils/umount.c:91
+#: sys-utils/mount.c:414 sys-utils/umount.c:96
#, c-format
msgid " -n, --no-mtab don't write to /etc/mtab\n"
msgstr " -n, --no-mtab 不写 /etc/mtab\n"
-#: sys-utils/mount.c:413
+#: sys-utils/mount.c:416
#, c-format
msgid ""
" -o, --options <list> comma-separated list of mount options\n"
@@ -15079,7 +15346,7 @@ msgstr ""
" -r, --read-only 以只读方式挂载文件系统(同 -o ro)\n"
" -t, --types <列表> 限制文件系统类型集合\n"
-#: sys-utils/mount.c:418
+#: sys-utils/mount.c:421
#, c-format
msgid ""
" --source <src> explicitly specifies source (path, label, uuid)\n"
@@ -15088,17 +15355,17 @@ msgstr ""
" --source <源> 指明源(路径、标签、uuid)\n"
" --target <目标> 指明挂载点\n"
-#: sys-utils/mount.c:421 sys-utils/umount.c:97
+#: sys-utils/mount.c:424 sys-utils/umount.c:102
#, c-format
msgid " -v, --verbose say what is being done\n"
msgstr " -v, --verbose 打印当前进行的操作\n"
-#: sys-utils/mount.c:423
+#: sys-utils/mount.c:426
#, c-format
msgid " -w, --rw, --read-write mount the filesystem read-write (default)\n"
msgstr " -w, --rw, --read-write 以读写方式挂载文件系统(默认)\n"
-#: sys-utils/mount.c:430
+#: sys-utils/mount.c:432
#, c-format
msgid ""
"\n"
@@ -15119,7 +15386,7 @@ msgstr ""
" PARTLABEL=<标签> 按分区标签指定设备\n"
" PARTUUID=<uuid> 按分区 UUID 指定设备\n"
-#: sys-utils/mount.c:439
+#: sys-utils/mount.c:441
#, c-format
msgid ""
" <device> specifies device by path\n"
@@ -15130,7 +15397,7 @@ msgstr ""
" <目录> 绑定式挂载的挂载点(参阅 --bind/rbind)\n"
" <文件> 用于设置回环设备的常规文件\n"
-#: sys-utils/mount.c:444
+#: sys-utils/mount.c:446
#, c-format
msgid ""
"\n"
@@ -15145,7 +15412,7 @@ msgstr ""
" -M, --move 将子树移动到其他位置\n"
" -R, --rbind 挂载其他位置的子树及其包含的所有子挂载(submount)\n"
-#: sys-utils/mount.c:449
+#: sys-utils/mount.c:451
#, c-format
msgid ""
" --make-shared mark a subtree as shared\n"
@@ -15158,7 +15425,7 @@ msgstr ""
" --make-private 将子树标记为 私有\n"
" --make-unbindable 将子树标记为 不可绑定\n"
-#: sys-utils/mount.c:454
+#: sys-utils/mount.c:456
#, c-format
msgid ""
" --make-rshared recursively mark a whole subtree as shared\n"
@@ -15171,19 +15438,19 @@ msgstr ""
" --make-rprivate 递归地将整个子树标记为 私有\n"
" --make-runbindable 递归地将整个子树标记为 不可绑定\n"
-#: sys-utils/mount.c:540 sys-utils/umount.c:444
+#: sys-utils/mount.c:544 sys-utils/umount.c:448
msgid "libmount context allocation failed"
msgstr "libmount 环境(context)分配失败"
-#: sys-utils/mount.c:597 sys-utils/umount.c:497
+#: sys-utils/mount.c:601 sys-utils/umount.c:501
msgid "failed to set options pattern"
msgstr "设置选项模式失败"
-#: sys-utils/mount.c:749
+#: sys-utils/mount.c:757
msgid "source specified more than once"
msgstr "源指定了多次"
-#: sys-utils/mountpoint.c:118
+#: sys-utils/mountpoint.c:119
#, c-format
msgid ""
" %1$s [-qd] /path/to/directory\n"
@@ -15192,11 +15459,11 @@ msgstr ""
" %1$s [-qd] /目录/的/路径\n"
" %1$s -x /dev/设备\n"
-#: sys-utils/mountpoint.c:122
+#: sys-utils/mountpoint.c:123
msgid "Check whether a directory or file is a mountpoint.\n"
msgstr "检查目录或文件是否为挂载点。\n"
-#: sys-utils/mountpoint.c:125
+#: sys-utils/mountpoint.c:126
msgid ""
" -q, --quiet quiet mode - don't print anything\n"
" -d, --fs-devno print maj:min device number of the filesystem\n"
@@ -15206,12 +15473,12 @@ msgstr ""
" -d, --fs-devno 打印文件系统的 主:次 设备号\n"
" -x, --devno 打印块设备的主:次设备号\n"
-#: sys-utils/mountpoint.c:194
+#: sys-utils/mountpoint.c:196
#, c-format
msgid "%s is not a mountpoint\n"
msgstr "%s 不是一个挂载点\n"
-#: sys-utils/mountpoint.c:200
+#: sys-utils/mountpoint.c:202
#, c-format
msgid "%s is a mountpoint\n"
msgstr "%s 是一个挂载点\n"
@@ -15290,73 +15557,73 @@ msgstr " -F, --no-fork 执行 <程序> 前不 fork\n"
msgid " -Z, --follow-context set SELinux context according to --target PID\n"
msgstr " -Z, --follow-context 根据 --target PID 设置 SELinux 环境\n"
-#: sys-utils/nsenter.c:122
+#: sys-utils/nsenter.c:121
#, c-format
msgid "neither filename nor target pid supplied for %s"
msgstr "没有为 %s 提供文件名或目标 pid"
-#: sys-utils/nsenter.c:310
+#: sys-utils/nsenter.c:309
msgid "failed to parse uid"
msgstr "解析 uid 失败"
-#: sys-utils/nsenter.c:314
+#: sys-utils/nsenter.c:313
msgid "failed to parse gid"
msgstr "解析 gid 失败"
-#: sys-utils/nsenter.c:350
+#: sys-utils/nsenter.c:349
msgid "no target PID specified for --follow-context"
msgstr "没有为 --follow-context 设置目标 PID"
-#: sys-utils/nsenter.c:352
+#: sys-utils/nsenter.c:351
#, c-format
msgid "failed to get %d SELinux context"
msgstr "未能获取 %d SELinux 环境"
-#: sys-utils/nsenter.c:355
+#: sys-utils/nsenter.c:354
#, c-format
msgid "failed to set exec context to '%s'"
msgstr "向“%s”设置 exec 环境失败"
-#: sys-utils/nsenter.c:362
+#: sys-utils/nsenter.c:361
#, fuzzy
msgid "no target PID specified for --all"
msgstr "没有为 --follow-context 设置目标 PID"
-#: sys-utils/nsenter.c:426
+#: sys-utils/nsenter.c:425
#, c-format
msgid "reassociate to namespace '%s' failed"
msgstr "重新关联到名字空间“%s”失败"
-#: sys-utils/nsenter.c:442
+#: sys-utils/nsenter.c:441
msgid "cannot open current working directory"
msgstr "打不开当前工作目录"
-#: sys-utils/nsenter.c:449
+#: sys-utils/nsenter.c:448
msgid "change directory by root file descriptor failed"
msgstr "根据 root 文件描述符 更改目录失败"
-#: sys-utils/nsenter.c:452
+#: sys-utils/nsenter.c:451
msgid "chroot failed"
msgstr "chroot 失败"
-#: sys-utils/nsenter.c:462
+#: sys-utils/nsenter.c:461
msgid "change directory by working directory file descriptor failed"
msgstr "按工作目录文件描述符更改目录失败"
-#: sys-utils/nsenter.c:473 sys-utils/setpriv.c:813 sys-utils/setpriv.c:817
+#: sys-utils/nsenter.c:472 sys-utils/setpriv.c:962 sys-utils/setpriv.c:969
msgid "setgroups failed"
msgstr "setgroups 失败"
-#: sys-utils/pivot_root.c:33
+#: sys-utils/pivot_root.c:34
#, c-format
msgid " %s [options] new_root put_old\n"
msgstr " %s [选项] 新根目录 旧根目录更名\n"
-#: sys-utils/pivot_root.c:37
+#: sys-utils/pivot_root.c:38
msgid "Change the root filesystem.\n"
msgstr "更改根文件系统。\n"
-#: sys-utils/pivot_root.c:75
+#: sys-utils/pivot_root.c:76
#, c-format
msgid "failed to change root from `%s' to `%s'"
msgstr "将根目录从“%s”更改为“%s”失败"
@@ -15469,21 +15736,21 @@ msgstr "硬限制(触顶)"
msgid "units"
msgstr "单位"
-#: sys-utils/prlimit.c:161
+#: sys-utils/prlimit.c:162
#, c-format
msgid " %s [options] [-p PID]\n"
msgstr " %s [选项] [-p PID]\n"
-#: sys-utils/prlimit.c:163
+#: sys-utils/prlimit.c:164
#, c-format
msgid " %s [options] COMMAND\n"
msgstr " %s [选项] 命令\n"
-#: sys-utils/prlimit.c:166
+#: sys-utils/prlimit.c:167
msgid "Show or change the resource limits of a process.\n"
msgstr "显示或更改进程的资源限制。 \n"
-#: sys-utils/prlimit.c:168
+#: sys-utils/prlimit.c:169
msgid ""
"\n"
"General Options:\n"
@@ -15491,15 +15758,14 @@ msgstr ""
"\n"
"常规选项:\n"
-#: sys-utils/prlimit.c:169
+#: sys-utils/prlimit.c:170
+#, fuzzy
msgid ""
" -p, --pid <pid> process id\n"
" -o, --output <list> define which output columns to use\n"
" --noheadings don't print headings\n"
" --raw use the raw output format\n"
" --verbose verbose output\n"
-" -h, --help display this help and exit\n"
-" -V, --version output version information and exit\n"
msgstr ""
" -p, --pid <pid> 进程 id\n"
" -o, --output <列表> 定义要使用的输出列\n"
@@ -15509,7 +15775,7 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
" -V, --version 输出版本信息并退出\n"
-#: sys-utils/prlimit.c:177
+#: sys-utils/prlimit.c:178
msgid ""
"\n"
"Resources Options:\n"
@@ -15517,7 +15783,7 @@ msgstr ""
"\n"
"资源选项:\n"
-#: sys-utils/prlimit.c:178
+#: sys-utils/prlimit.c:179
msgid ""
" -c, --core maximum size of core files created\n"
" -d, --data maximum size of a process's data segment\n"
@@ -15649,35 +15915,35 @@ msgstr " -r, --reset 重置所有计数(限 root 用户)\n"
msgid " -n, --no-auto disable byte order auto-detection\n"
msgstr " -n, --no-auto 禁用字节顺序自动检测\n"
-#: sys-utils/readprofile.c:240
+#: sys-utils/readprofile.c:239
#, c-format
msgid "error writing %s"
msgstr "写 %s 出错"
-#: sys-utils/readprofile.c:271
+#: sys-utils/readprofile.c:270
msgid "Assuming reversed byte order. Use -n to force native byte order."
msgstr "将假设为反向字节顺序。可使用 -n 强制为原生字节顺序。"
-#: sys-utils/readprofile.c:286
+#: sys-utils/readprofile.c:285
#, c-format
msgid "Sampling_step: %u\n"
msgstr "采样步长:%u\n"
-#: sys-utils/readprofile.c:302 sys-utils/readprofile.c:323
+#: sys-utils/readprofile.c:301 sys-utils/readprofile.c:322
#, c-format
msgid "%s(%i): wrong map line"
msgstr "%s(%i):错误的 map 行"
-#: sys-utils/readprofile.c:313
+#: sys-utils/readprofile.c:312
#, c-format
msgid "can't find \"_stext\" in %s"
msgstr "在 %s 中找不到“_stext”"
-#: sys-utils/readprofile.c:346
+#: sys-utils/readprofile.c:345
msgid "profile address out of range. Wrong map file?"
msgstr "配置(profile)地址超出范围。map 文件错误?"
-#: sys-utils/readprofile.c:404
+#: sys-utils/readprofile.c:403
msgid "total"
msgstr "总计"
@@ -15689,7 +15955,7 @@ msgstr "进程 ID"
msgid "process group ID"
msgstr "进程组 ID"
-#: sys-utils/renice.c:61
+#: sys-utils/renice.c:62
#, c-format
msgid ""
" %1$s [-n] <priority> [-p|--pid] <pid>...\n"
@@ -15700,23 +15966,23 @@ msgstr ""
" %1$s [-n] <优先级> -g|--pgrp <pgid>...\n"
" %1$s [-n] <优先级> -u|--user <用户>...\n"
-#: sys-utils/renice.c:67
+#: sys-utils/renice.c:68
msgid "Alter the priority of running processes.\n"
msgstr "改变运行进程的优先级。 \n"
-#: sys-utils/renice.c:70
+#: sys-utils/renice.c:71
msgid " -n, --priority <num> specify the nice increment value\n"
msgstr " -n, --priority <数字> 指定 nice 增量\n"
-#: sys-utils/renice.c:71
+#: sys-utils/renice.c:72
msgid " -p, --pid <id> interpret argument as process ID (default)\n"
msgstr " -p, --pid <id> 将参数解释为进程 ID (默认)\n"
-#: sys-utils/renice.c:72
+#: sys-utils/renice.c:73
msgid " -g, --pgrp <id> interpret argument as process group ID\n"
msgstr " -g, --pgrp <id> 将参数解释为进程组 ID\n"
-#: sys-utils/renice.c:73
+#: sys-utils/renice.c:74
msgid " -u, --user <name>|<id> interpret argument as username or user ID\n"
msgstr " -u, --user <name>|<id> 将参数解释为 用户名 或 用户 ID\n"
@@ -15735,27 +16001,129 @@ msgstr "设置 %d 的优先级失败(%s)"
msgid "%d (%s) old priority %d, new priority %d\n"
msgstr "%d (%s) 旧优先级为 %d,新优先级为 %d\n"
-#: sys-utils/renice.c:176
+#: sys-utils/renice.c:152
+#, fuzzy, c-format
+msgid "invalid priorty '%s'"
+msgstr "无效 ID:%s"
+
+#: sys-utils/renice.c:179
#, 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:185
+#: sys-utils/renice.c:188
#, c-format
msgid "bad %s value: %s"
msgstr "错误的 %s 值:%s"
-#: sys-utils/rtcwake.c:98
+#: sys-utils/rfkill.c:101
+#, fuzzy
+msgid "kernel device name"
+msgstr "内部内核设备名称"
+
+#: sys-utils/rfkill.c:102
+#, fuzzy
+msgid "device identifier value"
+msgstr "设备标识符"
+
+#: sys-utils/rfkill.c:103
+msgid "device type name that can be used as identifier"
+msgstr ""
+
+#: sys-utils/rfkill.c:104
+#, fuzzy
+msgid "status of software block"
+msgstr "锁的大小"
+
+#: sys-utils/rfkill.c:105
+#, fuzzy
+msgid "status of hardware block"
+msgstr "显示硬件看门狗的状态。\n"
+
+#: sys-utils/rfkill.c:170
+#, fuzzy, c-format
+msgid "failed to poll %s"
+msgstr "解析 %s 失败"
+
+#: sys-utils/rfkill.c:184 sys-utils/rfkill.c:371
+#, c-format
+msgid "wrong size of rfkill event: %zu < %d"
+msgstr ""
+
+#: sys-utils/rfkill.c:259
+#, fuzzy
+msgid "invalid identifier"
+msgstr "设备标识符"
+
+#: sys-utils/rfkill.c:299 sys-utils/rfkill.c:302
+#, fuzzy
+msgid "blocked"
+msgstr "已锁定"
+
+#: sys-utils/rfkill.c:299 sys-utils/rfkill.c:302
+#, fuzzy
+msgid "unblocked"
+msgstr "已锁定"
+
+#: sys-utils/rfkill.c:345 sys-utils/rfkill.c:421
+#, fuzzy, c-format
+msgid "invalid identifier: %s"
+msgstr "磁盘标识符:%s"
+
+#: sys-utils/rfkill.c:357
+#, fuzzy, c-format
+msgid "cannot set non-blocking %s"
+msgstr "无法锁定 %s"
+
+#: sys-utils/rfkill.c:463
+#, fuzzy, c-format
+msgid " %s [options] command [identifier ...]\n"
+msgstr " %s [选项] [<设备> ...]\n"
+
+#: sys-utils/rfkill.c:466
+msgid "Tool for enabling and disabling wireless devices.\n"
+msgstr ""
+
+#. TRANSLATORS: command names should not be translated, explaining
+#. them as additional field after identifer is fine, for example
+#. *
+#. list [identifier] (lista [tarkenne])
+#.
+#: sys-utils/rfkill.c:489
+#, fuzzy
+msgid " help\n"
+msgstr " -help\n"
+
+#: sys-utils/rfkill.c:490
+msgid " event\n"
+msgstr ""
+
+#: sys-utils/rfkill.c:491
+#, fuzzy
+msgid " list [identifier]\n"
+msgstr "磁盘标识符"
+
+#: sys-utils/rfkill.c:492
+#, fuzzy
+msgid " block identifier\n"
+msgstr "磁盘标识符"
+
+#: sys-utils/rfkill.c:493
+#, fuzzy
+msgid " unblock identifier\n"
+msgstr "磁盘标识符"
+
+#: sys-utils/rtcwake.c:99
msgid "Enter a system sleep state until a specified wakeup time.\n"
msgstr "进入系统睡眠状态,直到指定的唤醒时间。\n"
-#: sys-utils/rtcwake.c:101
+#: sys-utils/rtcwake.c:102
msgid " -a, --auto reads the clock mode from adjust file (default)\n"
msgstr " -a, --auto 从 adjust 文件读取时钟模式(默认)\n"
-#: sys-utils/rtcwake.c:103
+#: sys-utils/rtcwake.c:104
#, c-format
msgid ""
" -A, --adjfile <file> specifies the path to the adjust file\n"
@@ -15764,180 +16132,180 @@ msgstr ""
" -A, --adjfile <文件> 指定 adjust 文件的路径\n"
" 默认为 %s\n"
-#: sys-utils/rtcwake.c:105
+#: sys-utils/rtcwake.c:106
msgid " --date <timestamp> date time of timestamp to wake\n"
msgstr " --date <时间戳> 唤醒时间戳的日期时间\n"
-#: sys-utils/rtcwake.c:106
+#: sys-utils/rtcwake.c:107
msgid " -d, --device <device> select rtc device (rtc0|rtc1|...)\n"
msgstr " -d, --device <设备> 选择 rtc 设备(rtc0|rtc1|...)\n"
-#: sys-utils/rtcwake.c:107
+#: sys-utils/rtcwake.c:108
msgid " -n, --dry-run does everything, but suspend\n"
msgstr " -n, --dry-run 演示操作但不执行(suspend)\n"
-#: sys-utils/rtcwake.c:108
+#: sys-utils/rtcwake.c:109
msgid " -l, --local RTC uses local timezone\n"
msgstr " -l, --local RTC 使用本地时区\n"
-#: sys-utils/rtcwake.c:109
+#: sys-utils/rtcwake.c:110
msgid " --list-modes list available modes\n"
msgstr " --list-modes 列出可用模式\n"
-#: sys-utils/rtcwake.c:110
+#: sys-utils/rtcwake.c:111
msgid " -m, --mode <mode> standby|mem|... sleep mode\n"
msgstr " -m, --mode <模式> 指定 standby|mem|... 等睡眠模式\n"
-#: sys-utils/rtcwake.c:111
+#: sys-utils/rtcwake.c:112
msgid " -s, --seconds <seconds> seconds to sleep\n"
msgstr " -s, --seconds <秒数> 指定睡眠的秒数\n"
-#: sys-utils/rtcwake.c:112
+#: sys-utils/rtcwake.c:113
msgid " -t, --time <time_t> time to wake\n"
msgstr " -t, --time <time_t> 指定唤醒时刻\n"
-#: sys-utils/rtcwake.c:113
+#: sys-utils/rtcwake.c:114
msgid " -u, --utc RTC uses UTC\n"
msgstr " -u, --utc RTC 使用 UTC\n"
-#: sys-utils/rtcwake.c:114
+#: sys-utils/rtcwake.c:115
msgid " -v, --verbose verbose messages\n"
msgstr " -v, --verbose 输出详尽消息\n"
-#: sys-utils/rtcwake.c:167
+#: sys-utils/rtcwake.c:165
msgid "read rtc time failed"
msgstr "读取 rtc 时间失败"
-#: sys-utils/rtcwake.c:173
+#: sys-utils/rtcwake.c:171
msgid "read system time failed"
msgstr "读取系统时间失败"
-#: sys-utils/rtcwake.c:189
+#: sys-utils/rtcwake.c:187
msgid "convert rtc time failed"
msgstr "转换 rtc 时间失败"
-#: sys-utils/rtcwake.c:237
+#: sys-utils/rtcwake.c:235
msgid "set rtc wake alarm failed"
msgstr "设置 rtc 唤醒闹钟失败"
-#: sys-utils/rtcwake.c:307
+#: sys-utils/rtcwake.c:305
#, c-format
msgid "unexpected third line in: %s: %s"
msgstr "第 3 行异常:%s:%s"
-#: sys-utils/rtcwake.c:320 sys-utils/rtcwake.c:624
+#: sys-utils/rtcwake.c:318 sys-utils/rtcwake.c:622
msgid "read rtc alarm failed"
msgstr "读取 rtc 闹钟失败"
-#: sys-utils/rtcwake.c:325
+#: sys-utils/rtcwake.c:323
#, c-format
msgid "alarm: off\n"
msgstr "闹钟:关\n"
-#: sys-utils/rtcwake.c:338
+#: sys-utils/rtcwake.c:336
msgid "convert time failed"
msgstr "转换时间失败"
-#: sys-utils/rtcwake.c:343
+#: sys-utils/rtcwake.c:341
#, c-format
msgid "alarm: on %s"
msgstr "闹钟:于 %s"
-#: sys-utils/rtcwake.c:387
+#: sys-utils/rtcwake.c:385
#, c-format
msgid "could not read: %s"
msgstr "无法读取︰%s"
-#: sys-utils/rtcwake.c:467
+#: sys-utils/rtcwake.c:465
#, c-format
msgid "unrecognized suspend state '%s'"
msgstr "不支持的挂起状态“%s”"
-#: sys-utils/rtcwake.c:475
+#: sys-utils/rtcwake.c:473
msgid "invalid seconds argument"
msgstr "无效的 秒数 参数"
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:477
msgid "invalid time argument"
msgstr "无效的 时间 参数"
-#: sys-utils/rtcwake.c:506
+#: sys-utils/rtcwake.c:504
#, c-format
msgid "%s: assuming RTC uses UTC ...\n"
msgstr "%s:将假设 RTC 使用 UTC...\n"
-#: sys-utils/rtcwake.c:511
+#: sys-utils/rtcwake.c:509
msgid "Using UTC time.\n"
msgstr "使用 UTC 时间。\n"
-#: sys-utils/rtcwake.c:512
+#: sys-utils/rtcwake.c:510
msgid "Using local time.\n"
msgstr "使用当地时间。\n"
-#: sys-utils/rtcwake.c:515
+#: sys-utils/rtcwake.c:513
msgid "must provide wake time (see --seconds, --time and --date options)"
msgstr "必须提供唤醒时间(见 --seconds, --time 和 --date 选项)"
-#: sys-utils/rtcwake.c:521
+#: sys-utils/rtcwake.c:519
#, c-format
msgid "%s not enabled for wakeup events"
msgstr "%s 没有为唤醒事件启用"
-#: sys-utils/rtcwake.c:528
+#: sys-utils/rtcwake.c:526
#, 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:535
+#: sys-utils/rtcwake.c:533
#, c-format
msgid "time doesn't go backward to %s"
msgstr "时间不能返回到 %s"
-#: sys-utils/rtcwake.c:545
+#: sys-utils/rtcwake.c:543
#, c-format
msgid "%s: wakeup using %s at %s"
msgstr "%1$s:用 %3$s 的 %2$s 唤醒"
-#: sys-utils/rtcwake.c:549
+#: sys-utils/rtcwake.c:547
#, c-format
msgid "%s: wakeup from \"%s\" using %s at %s"
msgstr "%s:从“%s”唤醒,使用 %s,时间 %s"
-#: sys-utils/rtcwake.c:559
+#: sys-utils/rtcwake.c:557
#, c-format
msgid "suspend mode: no; leaving\n"
msgstr "挂起模式:无;将离开\n"
-#: sys-utils/rtcwake.c:568
+#: sys-utils/rtcwake.c:566
#, c-format
msgid "suspend mode: off; executing %s\n"
msgstr "挂起模式:关;正在执行 %s\n"
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:585
#, c-format
msgid "suspend mode: on; reading rtc\n"
msgstr "挂起模式:开;正在读 rtc\n"
-#: sys-utils/rtcwake.c:592
+#: sys-utils/rtcwake.c:590
msgid "rtc read failed"
msgstr "读 rtc 失败"
-#: sys-utils/rtcwake.c:604
+#: sys-utils/rtcwake.c:602
#, c-format
msgid "suspend mode: disable; disabling alarm\n"
msgstr "挂起模式:禁用;正在禁用闹钟\n"
-#: sys-utils/rtcwake.c:608
+#: sys-utils/rtcwake.c:606
#, c-format
msgid "suspend mode: show; printing alarm info\n"
msgstr "挂起模式:显示;正在打印闹钟信息\n"
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:613
#, c-format
msgid "suspend mode: %s; suspending system\n"
msgstr "挂起模式:%s;正在挂起系统\n"
-#: sys-utils/rtcwake.c:629
+#: sys-utils/rtcwake.c:627
msgid "disable rtc alarm interrupt failed"
msgstr "禁用 rtc 闹钟中断失败"
@@ -16011,442 +16379,499 @@ msgstr " -v, --verbose 告知打开了哪些选项\n"
msgid " --list list settable architectures, and exit\n"
msgstr " --list 列出可设置的架构并退出\n"
-#: sys-utils/setarch.c:128
-#, c-format
-msgid ""
-"%s\n"
-"Try `%s --help' for more information."
-msgstr ""
-"%s\n"
-"请使用“%s --help”了解更多信息。"
-
-#: sys-utils/setarch.c:131
-#, c-format
-msgid "Try `%s --help' for more information."
-msgstr "请使用“%s --help”了解更多信息。"
-
-#: sys-utils/setarch.c:237
+#: sys-utils/setarch.c:225
#, c-format
msgid "%s: Unrecognized architecture"
msgstr "%s:未识别的架构"
-#: sys-utils/setarch.c:258
+#: sys-utils/setarch.c:246
#, c-format
msgid "Kernel cannot set architecture to %s"
msgstr "内核不能设置为 %s 的架构"
-#: sys-utils/setarch.c:305
+#: sys-utils/setarch.c:293
msgid "Not enough arguments"
msgstr "参数不够"
-#: sys-utils/setarch.c:322
+#: sys-utils/setarch.c:311
#, c-format
msgid "Failed to set personality to %s"
msgstr "无法将人格(personality)设置为 %s"
-#: sys-utils/setarch.c:379
+#: sys-utils/setarch.c:368
msgid "unrecognized option '--list'"
msgstr "无法识别的“--list”选项"
-#: sys-utils/setarch.c:387
+#: sys-utils/setarch.c:376
msgid "no architecture argument specified"
msgstr "未指定架构参数"
-#: sys-utils/setarch.c:393
+#: sys-utils/setarch.c:382
#, c-format
msgid "failed to set personality to %s"
msgstr "无法将人格(personality)设置为 %s"
-#: sys-utils/setarch.c:396
+#: sys-utils/setarch.c:385
#, c-format
msgid "Execute command `%s'.\n"
msgstr "执行命令“%s”。\n"
-#: sys-utils/setpriv.c:93
+#: sys-utils/setpriv.c:115
#, c-format
msgid " %s [options] <program> [<argument>...]\n"
msgstr " %s [选项] <程序> [<参数>...]\n"
-#: sys-utils/setpriv.c:97
+#: sys-utils/setpriv.c:119
msgid "Run a program with different privilege settings.\n"
msgstr "以不同的权限设置运行程序。\n"
-#: sys-utils/setpriv.c:100
-msgid " -d, --dump show current state (and do not exec anything)\n"
+#: sys-utils/setpriv.c:122
+#, fuzzy
+msgid " -d, --dump show current state (and do not exec)\n"
msgstr " -d, --dump 显示当前状态(不执行任何操作)\n"
-#: sys-utils/setpriv.c:101
-msgid " --nnp, --no-new-privs disallow granting new privileges\n"
+#: sys-utils/setpriv.c:123
+#, fuzzy
+msgid " --nnp, --no-new-privs disallow granting new privileges\n"
msgstr " --nnp, --no-new-privs 禁止赋予新权限\n"
-#: sys-utils/setpriv.c:102
-msgid " --inh-caps <caps,...> set inheritable capabilities\n"
+#: sys-utils/setpriv.c:124
+#, fuzzy
+msgid " --ambient-caps <caps,...> set ambient capabilities\n"
+msgstr " --inh-caps <caps,...> 设置可继承的权能\n"
+
+#: sys-utils/setpriv.c:125
+#, fuzzy
+msgid " --inh-caps <caps,...> set inheritable capabilities\n"
msgstr " --inh-caps <caps,...> 设置可继承的权能\n"
-#: sys-utils/setpriv.c:103
-msgid " --bounding-set <caps> set capability bounding set\n"
+#: sys-utils/setpriv.c:126
+#, fuzzy
+msgid " --bounding-set <caps> set capability bounding set\n"
msgstr " --bounding-set <caps> 设置权能绑定集\n"
-#: sys-utils/setpriv.c:104
-msgid " --ruid <uid> set real uid\n"
+#: sys-utils/setpriv.c:127
+#, fuzzy
+msgid " --ruid <uid> set real uid\n"
msgstr " --ruid <uid> 设置实际 uid\n"
-#: sys-utils/setpriv.c:105
-msgid " --euid <uid> set effective uid\n"
+#: sys-utils/setpriv.c:128
+#, fuzzy
+msgid " --euid <uid> set effective uid\n"
msgstr " --euid <uid> 设置有效 uid\n"
-#: sys-utils/setpriv.c:106
-msgid " --rgid <gid> set real gid\n"
+#: sys-utils/setpriv.c:129
+#, fuzzy
+msgid " --rgid <gid> set real gid\n"
msgstr " --rgid <gid> 设置实际 gid\n"
-#: sys-utils/setpriv.c:107
-msgid " --egid <gid> set effective gid\n"
+#: sys-utils/setpriv.c:130
+#, fuzzy
+msgid " --egid <gid> set effective gid\n"
msgstr " --egid <gid> 设置有效 gid\n"
-#: sys-utils/setpriv.c:108
-msgid " --reuid <uid> set real and effective uid\n"
+#: sys-utils/setpriv.c:131
+#, fuzzy
+msgid " --reuid <uid> set real and effective uid\n"
msgstr " --reuid <uid> 设置实际和有效 uid\n"
-#: sys-utils/setpriv.c:109
-msgid " --regid <gid> set real and effective gid\n"
+#: sys-utils/setpriv.c:132
+#, fuzzy
+msgid " --regid <gid> set real and effective gid\n"
msgstr " --regid <gid> 设置实际和有效 gid\n"
-#: sys-utils/setpriv.c:110
-msgid " --clear-groups clear supplementary groups\n"
+#: sys-utils/setpriv.c:133
+#, fuzzy
+msgid " --clear-groups clear supplementary groups\n"
msgstr " --clear-groups 清除附属组\n"
-#: sys-utils/setpriv.c:111
-msgid " --keep-groups keep supplementary groups\n"
+#: sys-utils/setpriv.c:134
+#, fuzzy
+msgid " --keep-groups keep supplementary groups\n"
+msgstr " --keep-groups 保留附属组\n"
+
+#: sys-utils/setpriv.c:135
+#, fuzzy
+msgid " --init-groups initialize supplementary groups\n"
msgstr " --keep-groups 保留附属组\n"
-#: sys-utils/setpriv.c:112
-msgid " --groups <group,...> set supplementary groups\n"
+#: sys-utils/setpriv.c:136
+#, fuzzy
+msgid " --groups <group,...> set supplementary groups\n"
msgstr " --groups <组,...> 设置附属组\n"
-#: sys-utils/setpriv.c:113
-msgid " --securebits <bits> set securebits\n"
+#: sys-utils/setpriv.c:137
+#, fuzzy
+msgid " --securebits <bits> set securebits\n"
msgstr " --securebits <位> 设置安全位\n"
-#: sys-utils/setpriv.c:114
-msgid " --selinux-label <label> set SELinux label\n"
+#: sys-utils/setpriv.c:138
+#, fuzzy
+msgid " --selinux-label <label> set SELinux label\n"
msgstr " --selinux-label <标签> 设置 SELinux 标签\n"
-#: sys-utils/setpriv.c:115
-msgid " --apparmor-profile <pr> set AppArmor profile\n"
+#: sys-utils/setpriv.c:139
+#, fuzzy
+msgid " --apparmor-profile <pr> set AppArmor profile\n"
msgstr " --apparmor-profile <pr> 设置 AppArmor 配置文件\n"
-#: sys-utils/setpriv.c:121
+#: sys-utils/setpriv.c:144
msgid " This tool can be dangerous. Read the manpage, and be careful.\n"
msgstr "运行此工具有风险。请阅读 man 手册,谨慎操作。\n"
-#: sys-utils/setpriv.c:193 sys-utils/setpriv.c:467
+#: sys-utils/setpriv.c:187
+#, fuzzy
+msgid "invalid capability type"
+msgstr "错误的权能字符串"
+
+#: sys-utils/setpriv.c:239 sys-utils/setpriv.c:552
msgid "getting process secure bits failed"
msgstr "获取进程安全位失败"
-#: sys-utils/setpriv.c:197
+#: sys-utils/setpriv.c:243
#, c-format
msgid "Securebits: "
msgstr "安全位:"
-#: sys-utils/setpriv.c:217
+#: sys-utils/setpriv.c:263
#, c-format
msgid "[none]\n"
msgstr "[无]\n"
-#: sys-utils/setpriv.c:243
+#: sys-utils/setpriv.c:289
#, c-format
msgid "%s: too long"
msgstr "%s:过长"
-#: sys-utils/setpriv.c:271
+#: sys-utils/setpriv.c:317
#, c-format
msgid "Supplementary groups: "
msgstr "附属组:"
-#: sys-utils/setpriv.c:273 sys-utils/setpriv.c:321 sys-utils/setpriv.c:326
-#: sys-utils/setpriv.c:332 sys-utils/setpriv.c:337
+#: sys-utils/setpriv.c:319 sys-utils/setpriv.c:367 sys-utils/setpriv.c:372
+#: sys-utils/setpriv.c:378 sys-utils/setpriv.c:384 sys-utils/setpriv.c:391
#, c-format
msgid "[none]"
msgstr "[无]"
-#: sys-utils/setpriv.c:293
+#: sys-utils/setpriv.c:339
#, c-format
msgid "uid: %u\n"
msgstr "uid:%u\n"
-#: sys-utils/setpriv.c:294
+#: sys-utils/setpriv.c:340
#, c-format
msgid "euid: %u\n"
msgstr "euid:%u\n"
-#: sys-utils/setpriv.c:297
+#: sys-utils/setpriv.c:343
#, c-format
msgid "suid: %u\n"
msgstr "suid:%u\n"
-#: sys-utils/setpriv.c:299 sys-utils/setpriv.c:391
+#: sys-utils/setpriv.c:345 sys-utils/setpriv.c:445
msgid "getresuid failed"
msgstr "getresuid 失败"
-#: sys-utils/setpriv.c:308 sys-utils/setpriv.c:406
+#: sys-utils/setpriv.c:354 sys-utils/setpriv.c:460
msgid "getresgid failed"
msgstr "getresgid 失败"
-#: sys-utils/setpriv.c:319
+#: sys-utils/setpriv.c:365
#, c-format
msgid "Effective capabilities: "
msgstr "有效权能:"
-#: sys-utils/setpriv.c:324
+#: sys-utils/setpriv.c:370
#, c-format
msgid "Permitted capabilities: "
msgstr "允许的权能:"
-#: sys-utils/setpriv.c:330
+#: sys-utils/setpriv.c:376
#, c-format
msgid "Inheritable capabilities: "
msgstr "可继承的权能:"
-#: sys-utils/setpriv.c:335
+#: sys-utils/setpriv.c:381
+#, fuzzy, c-format
+msgid "Ambient capabilities: "
+msgstr "允许的权能:"
+
+#: sys-utils/setpriv.c:386
+#, fuzzy, c-format
+msgid "[unsupported]"
+msgstr "不支持的命令"
+
+#: sys-utils/setpriv.c:389
#, c-format
msgid "Capability bounding set: "
msgstr "权能绑定集:"
-#: sys-utils/setpriv.c:343
+#: sys-utils/setpriv.c:397
msgid "SELinux label"
msgstr "SELinux 标签"
-#: sys-utils/setpriv.c:346
+#: sys-utils/setpriv.c:400
msgid "AppArmor profile"
msgstr "AppArmor 配置文件"
-#: sys-utils/setpriv.c:359
+#: sys-utils/setpriv.c:413
#, c-format
msgid "cap %d: libcap-ng is broken"
msgstr "权能 %d:libcap-ng 损坏"
-#: sys-utils/setpriv.c:382
+#: sys-utils/setpriv.c:436
msgid "Invalid supplementary group id"
msgstr "无效的附属组 id"
-#: sys-utils/setpriv.c:399
+#: sys-utils/setpriv.c:453
msgid "setresuid failed"
msgstr "setresuid 失败"
-#: sys-utils/setpriv.c:414
+#: sys-utils/setpriv.c:468
msgid "setresgid failed"
msgstr "setresgid 失败"
-#: sys-utils/setpriv.c:435
+#: sys-utils/setpriv.c:500
+#, fuzzy
+msgid "unsupported capability type"
+msgstr "不支持的时间类型"
+
+#: sys-utils/setpriv.c:517
msgid "bad capability string"
msgstr "错误的权能字符串"
-#: sys-utils/setpriv.c:443
+#: sys-utils/setpriv.c:525
msgid "libcap-ng is too old for \"all\" caps"
msgstr "对于“all”权能,libcap-ng 太旧"
-#: sys-utils/setpriv.c:452
+#: sys-utils/setpriv.c:537
#, c-format
msgid "unknown capability \"%s\""
msgstr "未知权能“%s”"
-#: sys-utils/setpriv.c:476
+#: sys-utils/setpriv.c:561
msgid "unrecognized securebit set -- refusing to adjust"
msgstr "无法识别的安全位集 -- 拒绝调整"
-#: sys-utils/setpriv.c:480
+#: sys-utils/setpriv.c:565
msgid "bad securebits string"
msgstr "安全位字符串有误"
-#: sys-utils/setpriv.c:487
+#: sys-utils/setpriv.c:572
msgid "+all securebits is not allowed"
msgstr "+all 安全位是不允许的"
-#: sys-utils/setpriv.c:500
+#: sys-utils/setpriv.c:585
msgid "adjusting keep_caps does not make sense"
msgstr "调整 keep_caps(保持权能) 没有意义"
-#: sys-utils/setpriv.c:504
+#: sys-utils/setpriv.c:589
msgid "unrecognized securebit"
msgstr "无法识别的安全位"
-#: sys-utils/setpriv.c:524
+#: sys-utils/setpriv.c:609
msgid "SELinux is not running"
msgstr "SELinux 没有运行"
-#: sys-utils/setpriv.c:539
+#: sys-utils/setpriv.c:624
#, c-format
msgid "close failed: %s"
msgstr "关闭失败:%s"
-#: sys-utils/setpriv.c:547
+#: sys-utils/setpriv.c:632
msgid "AppArmor is not running"
msgstr "AppArmor 没有运行"
-#: sys-utils/setpriv.c:658
+#: sys-utils/setpriv.c:775
msgid "duplicate --no-new-privs option"
msgstr "复制 --no-new-privs 选项"
-#: sys-utils/setpriv.c:663
+#: sys-utils/setpriv.c:780
msgid "duplicate ruid"
msgstr "复制 ruid"
-#: sys-utils/setpriv.c:665
+#: sys-utils/setpriv.c:782
msgid "failed to parse ruid"
msgstr "解析 ruid 失败"
-#: sys-utils/setpriv.c:669
+#: sys-utils/setpriv.c:790
msgid "duplicate euid"
msgstr "复制 euid"
-#: sys-utils/setpriv.c:671
+#: sys-utils/setpriv.c:792
msgid "failed to parse euid"
msgstr "解析 euid 失败"
-#: sys-utils/setpriv.c:675
+#: sys-utils/setpriv.c:796
msgid "duplicate ruid or euid"
msgstr "复制 ruid 或 euid"
-#: sys-utils/setpriv.c:677
+#: sys-utils/setpriv.c:798
msgid "failed to parse reuid"
msgstr "解析 reuid 失败"
-#: sys-utils/setpriv.c:681
+#: sys-utils/setpriv.c:807
msgid "duplicate rgid"
msgstr "复制 rgid"
-#: sys-utils/setpriv.c:683
+#: sys-utils/setpriv.c:809
msgid "failed to parse rgid"
msgstr "解析 rgid 失败"
-#: sys-utils/setpriv.c:687
+#: sys-utils/setpriv.c:813
msgid "duplicate egid"
msgstr "复制 egid"
-#: sys-utils/setpriv.c:689
+#: sys-utils/setpriv.c:815
msgid "failed to parse egid"
msgstr "解析 egid 失败"
-#: sys-utils/setpriv.c:693
+#: sys-utils/setpriv.c:819
msgid "duplicate rgid or egid"
msgstr "复制 rgid 或 egid"
-#: sys-utils/setpriv.c:695
+#: sys-utils/setpriv.c:821
msgid "failed to parse regid"
msgstr "解析 regid 失败"
-#: sys-utils/setpriv.c:700
+#: sys-utils/setpriv.c:826
msgid "duplicate --clear-groups option"
msgstr "复制 --clear-groups 选项"
-#: sys-utils/setpriv.c:706
+#: sys-utils/setpriv.c:832
msgid "duplicate --keep-groups option"
msgstr "复制 --keep-groups 选项"
-#: sys-utils/setpriv.c:712
+#: sys-utils/setpriv.c:838
+#, fuzzy
+msgid "duplicate --init-groups option"
+msgstr "复制 --groups 选项"
+
+#: sys-utils/setpriv.c:844
msgid "duplicate --groups option"
msgstr "复制 --groups 选项"
-#: sys-utils/setpriv.c:721
+#: sys-utils/setpriv.c:853
msgid "duplicate --inh-caps option"
msgstr "复制 --inh-caps 选项"
-#: sys-utils/setpriv.c:727
+#: sys-utils/setpriv.c:859
+#, fuzzy
+msgid "duplicate --ambient-caps option"
+msgstr "复制 --inh-caps 选项"
+
+#: sys-utils/setpriv.c:865
msgid "duplicate --bounding-set option"
msgstr "复制 --bounding-set 选项"
-#: sys-utils/setpriv.c:733
+#: sys-utils/setpriv.c:871
msgid "duplicate --securebits option"
msgstr "复制 --securebits 选项"
-#: sys-utils/setpriv.c:739
+#: sys-utils/setpriv.c:877
msgid "duplicate --selinux-label option"
msgstr "复制 --selinux-label 选项"
-#: sys-utils/setpriv.c:745
+#: sys-utils/setpriv.c:883
msgid "duplicate --apparmor-profile option"
msgstr "复制 --apparmor-profile 选项"
-#: sys-utils/setpriv.c:761
+#: sys-utils/setpriv.c:899
msgid "--dump is incompatible with all other options"
msgstr "--dump 与其他所有选项不兼容"
-#: sys-utils/setpriv.c:769
+#: sys-utils/setpriv.c:907
msgid "--list-caps must be specified alone"
msgstr "--list-caps 必须作为单独选项指定"
-#: sys-utils/setpriv.c:775
+#: sys-utils/setpriv.c:913
msgid "No program specified"
msgstr "未指定程序"
-#: sys-utils/setpriv.c:780
-msgid "--[re]gid requires --keep-groups, --clear-groups, or --groups"
+#: sys-utils/setpriv.c:919
+#, 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:783
+#: sys-utils/setpriv.c:923
+msgid "--init-groups requires --ruid or --reuid"
+msgstr ""
+
+#: sys-utils/setpriv.c:927
+#, c-format
+msgid "uid %ld not found, --init-groups requires an user that can be found on the system"
+msgstr ""
+
+#: sys-utils/setpriv.c:932
msgid "disallow granting new privileges failed"
msgstr "禁止赋予新权限失败"
-#: sys-utils/setpriv.c:791
+#: sys-utils/setpriv.c:940
msgid "keep process capabilities failed"
msgstr "保持进程权能失败"
-#: sys-utils/setpriv.c:799
+#: sys-utils/setpriv.c:948
msgid "activate capabilities"
msgstr "激活权能"
-#: sys-utils/setpriv.c:805
+#: sys-utils/setpriv.c:954
msgid "reactivate capabilities"
msgstr "重新激活权能"
-#: sys-utils/setpriv.c:821
+#: sys-utils/setpriv.c:965
+#, fuzzy
+msgid "initgroups failed"
+msgstr "setgroups 失败"
+
+#: sys-utils/setpriv.c:973
msgid "set process securebits failed"
msgstr "设置进程安全位失败"
-#: sys-utils/setpriv.c:827
+#: sys-utils/setpriv.c:979
msgid "apply bounding set"
msgstr "应用绑定集"
-#: sys-utils/setpriv.c:833
+#: sys-utils/setpriv.c:985
msgid "apply capabilities"
msgstr "应用权能"
-#: sys-utils/setpriv.c:838
+#: sys-utils/setpriv.c:994
#, c-format
msgid "cannot execute: %s"
msgstr "无法执行:%s"
-#: sys-utils/setsid.c:32
+#: sys-utils/setsid.c:33
#, c-format
msgid " %s [options] <program> [arguments ...]\n"
msgstr " %s [选项] <程序> [参数 ...]\n"
-#: sys-utils/setsid.c:36
+#: sys-utils/setsid.c:37
msgid "Run a program in a new session.\n"
msgstr "在新会话中运行程序。\n"
-#: sys-utils/setsid.c:39
+#: sys-utils/setsid.c:40
msgid " -c, --ctty set the controlling terminal to the current one\n"
msgstr " -c, --ctty 将控制终端设置为当前终端\n"
-#: sys-utils/setsid.c:40
+#: sys-utils/setsid.c:41
msgid " -w, --wait wait program to exit, and use the same return\n"
msgstr " -w, --wait 等待程序退出,并使用它的返回值\n"
-#: sys-utils/setsid.c:93
+#: sys-utils/setsid.c:95
msgid "fork"
msgstr "fork"
-#: sys-utils/setsid.c:105
+#: sys-utils/setsid.c:107
#, c-format
msgid "child %d did not exit normally"
msgstr "子 %d 未正常退出"
-#: sys-utils/setsid.c:110
+#: sys-utils/setsid.c:112
msgid "setsid failed"
msgstr "setsid 失败"
-#: sys-utils/setsid.c:113
+#: sys-utils/setsid.c:115
msgid "failed to set the controlling terminal"
msgstr "设置控制终端失败"
@@ -16464,16 +16889,16 @@ msgstr "非超级用户。"
msgid "%s: swapoff failed"
msgstr "%s:swapoff 失败"
-#: sys-utils/swapoff.c:122 sys-utils/swapon.c:789
+#: sys-utils/swapoff.c:123 sys-utils/swapon.c:795
#, c-format
msgid " %s [options] [<spec>]\n"
msgstr " %s [选项] [<指定>]\n"
-#: sys-utils/swapoff.c:125
+#: sys-utils/swapoff.c:126
msgid "Disable devices and files for paging and swapping.\n"
msgstr "禁止将设备和文件用于分页和交换。\n"
-#: sys-utils/swapoff.c:128
+#: sys-utils/swapoff.c:129
msgid ""
" -a, --all disable all swaps from /proc/swaps\n"
" -v, --verbose verbose mode\n"
@@ -16501,181 +16926,181 @@ msgstr ""
" <设备> 要使用设备的名称\n"
" <文件> 要使用文件的名称\n"
-#: sys-utils/swapon.c:93
+#: sys-utils/swapon.c:97
msgid "device file or partition path"
msgstr "设备文件或分区路径"
-#: sys-utils/swapon.c:94
+#: sys-utils/swapon.c:98
msgid "type of the device"
msgstr "设备的类型"
-#: sys-utils/swapon.c:95
+#: sys-utils/swapon.c:99
msgid "size of the swap area"
msgstr "交换区大小"
-#: sys-utils/swapon.c:96
+#: sys-utils/swapon.c:100
msgid "bytes in use"
msgstr "已使用字节数"
-#: sys-utils/swapon.c:97
+#: sys-utils/swapon.c:101
msgid "swap priority"
msgstr "交换优先级"
-#: sys-utils/swapon.c:98
+#: sys-utils/swapon.c:102
msgid "swap uuid"
msgstr "swap uuid"
-#: sys-utils/swapon.c:99
+#: sys-utils/swapon.c:103
msgid "swap label"
msgstr "swap 标签"
-#: sys-utils/swapon.c:247
+#: sys-utils/swapon.c:251
#, c-format
msgid "%s\t\t\t\tType\t\tSize\tUsed\tPriority\n"
msgstr "%s\t\t\t\t类型\t\t大小\t已用\t权限\n"
-#: sys-utils/swapon.c:247
+#: sys-utils/swapon.c:251
msgid "Filename"
msgstr "文件名"
-#: sys-utils/swapon.c:313
+#: sys-utils/swapon.c:317
#, c-format
msgid "%s: reinitializing the swap."
msgstr "%s:正在重新初始化交换区。"
-#: sys-utils/swapon.c:377
+#: sys-utils/swapon.c:381
#, c-format
msgid "%s: lseek failed"
msgstr "%s:lseek 失败"
-#: sys-utils/swapon.c:383
+#: sys-utils/swapon.c:387
#, c-format
msgid "%s: write signature failed"
msgstr "%s:写签名失败"
-#: sys-utils/swapon.c:537
+#: sys-utils/swapon.c:541
#, c-format
msgid "%s: skipping - it appears to have holes."
msgstr "%s:将跳过 - 它似乎有空洞。"
-#: sys-utils/swapon.c:545
+#: sys-utils/swapon.c:549
#, c-format
msgid "%s: get size failed"
msgstr "%s:获取大小失败"
-#: sys-utils/swapon.c:551
+#: sys-utils/swapon.c:555
#, c-format
msgid "%s: read swap header failed"
msgstr "%s:读交换区头失败"
-#: sys-utils/swapon.c:556
+#: sys-utils/swapon.c:560
#, c-format
msgid "%s: found signature [pagesize=%d, signature=%s]"
msgstr "%s:找到签名[页尺寸=%d, 签名=%s]"
-#: sys-utils/swapon.c:567
+#: sys-utils/swapon.c:571
#, c-format
msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
msgstr "%s:页大小=%d,交换区大小=%llu,设备大小=%llu"
-#: sys-utils/swapon.c:572
+#: sys-utils/swapon.c:576
#, c-format
msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
msgstr "%s:末页 0x%08llx 大于交换空间的实际大小"
-#: sys-utils/swapon.c:582
+#: sys-utils/swapon.c:586
#, c-format
msgid "%s: swap format pagesize does not match."
msgstr "%s:交换格式 页大小 不匹配。"
-#: sys-utils/swapon.c:588
+#: sys-utils/swapon.c:592
#, c-format
msgid "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
msgstr "%s:交换格式 页大小 不匹配。(使用 --fixpgsz 来重新对它初始化。)"
-#: sys-utils/swapon.c:597
+#: sys-utils/swapon.c:601
#, c-format
msgid "%s: software suspend data detected. Rewriting the swap signature."
msgstr "%s:检测到软件挂起数据。将重新写交换签名。"
-#: sys-utils/swapon.c:667
+#: sys-utils/swapon.c:671
#, c-format
msgid "swapon %s\n"
msgstr "swapon %s\n"
-#: sys-utils/swapon.c:671
+#: sys-utils/swapon.c:675
#, c-format
msgid "%s: swapon failed"
msgstr "%s:swapon 失败"
-#: sys-utils/swapon.c:744
+#: sys-utils/swapon.c:748
#, c-format
msgid "%s: noauto option -- ignored"
msgstr "%s:无自动选项 -- 已忽略"
-#: sys-utils/swapon.c:766
+#: sys-utils/swapon.c:770
#, c-format
msgid "%s: already active -- ignored"
msgstr "%s:已激活 -- 已忽略"
-#: sys-utils/swapon.c:772
+#: sys-utils/swapon.c:776
#, c-format
msgid "%s: inaccessible -- ignored"
msgstr "%s:无法访问 -- 已忽略"
-#: sys-utils/swapon.c:792
+#: sys-utils/swapon.c:798
msgid "Enable devices and files for paging and swapping.\n"
msgstr "允许将设备和文件用于分页和交换。\n"
-#: sys-utils/swapon.c:795
+#: sys-utils/swapon.c:801
msgid " -a, --all enable all swaps from /etc/fstab\n"
msgstr " -a, --all 启用 /etc/fstab 中的所有交换区\n"
-#: sys-utils/swapon.c:796
+#: sys-utils/swapon.c:802
msgid " -d, --discard[=<policy>] enable swap discards, if supported by device\n"
msgstr " -d, --discard[=<policy>] 如果设备支持,启用 swap 丢弃\n"
-#: sys-utils/swapon.c:797
+#: sys-utils/swapon.c:803
msgid " -e, --ifexists silently skip devices that do not exist\n"
msgstr " -e, --ifexists 自动跳过不存在的设备而不提示\n"
-#: sys-utils/swapon.c:798
+#: sys-utils/swapon.c:804
msgid " -f, --fixpgsz reinitialize the swap space if necessary\n"
msgstr " -f, --fixpgsz 必要时重新初始化交换区\n"
-#: sys-utils/swapon.c:799
+#: sys-utils/swapon.c:805
msgid " -o, --options <list> comma-separated list of swap options\n"
msgstr " -o, --options <列表> 以英文逗号分隔的 swap 选项\n"
-#: sys-utils/swapon.c:800
+#: sys-utils/swapon.c:806
msgid " -p, --priority <prio> specify the priority of the swap device\n"
msgstr " -p, --priority <优先级> 指定交换设备的优先级\n"
-#: sys-utils/swapon.c:801
+#: sys-utils/swapon.c:807
msgid " -s, --summary display summary about used swap devices (DEPRECATED)\n"
msgstr " -s, --summary 显示已使用交换设备的摘要(已废弃)\n"
-#: sys-utils/swapon.c:802
+#: sys-utils/swapon.c:808
msgid " --show[=<columns>] display summary in definable table\n"
msgstr " --show[=<列>] 以可自定义的表格形式打印摘要\n"
-#: sys-utils/swapon.c:803
+#: sys-utils/swapon.c:809
msgid " --noheadings don't print table heading (with --show)\n"
msgstr " --noheadings 不打印表头(与 --show 合用)\n"
-#: sys-utils/swapon.c:804
+#: sys-utils/swapon.c:810
msgid " --raw use the raw output format (with --show)\n"
msgstr " --raw 使用原生输出格式(与 --show 合用)\n"
-#: sys-utils/swapon.c:805
+#: sys-utils/swapon.c:811
msgid " --bytes display swap size in bytes in --show output\n"
msgstr " --bytes 在 --show 输出中以字节数显示交换区大小\n"
-#: sys-utils/swapon.c:806
+#: sys-utils/swapon.c:812
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详尽模式\n"
-#: sys-utils/swapon.c:812
+#: sys-utils/swapon.c:817
msgid ""
"\n"
"The <spec> parameter:\n"
@@ -16699,7 +17124,7 @@ msgstr ""
" <设备> 要使用设备的名称\n"
" <文件> 要使用文件的名称\n"
-#: sys-utils/swapon.c:822
+#: sys-utils/swapon.c:827
msgid ""
"\n"
"Available discard policy types (for --discard):\n"
@@ -16713,19 +17138,11 @@ msgstr ""
" pages\t :对释放的页在重新使用前丢弃\n"
" * 如果未选择策略,则两者都将启用。(默认)\n"
-#: sys-utils/swapon.c:827
-msgid ""
-"\n"
-"Available columns (for --show):\n"
-msgstr ""
-"\n"
-"可用列(用于 --show):\n"
-
-#: sys-utils/swapon.c:905
+#: sys-utils/swapon.c:910
msgid "failed to parse priority"
msgstr "解析优先级失败"
-#: sys-utils/swapon.c:924
+#: sys-utils/swapon.c:929
#, c-format
msgid "unsupported discard policy: %s"
msgstr "不支持的丢弃策略:%s"
@@ -16780,133 +17197,129 @@ msgstr "更改 root 失败"
msgid "old root filesystem is not an initramfs"
msgstr "旧根文件系统不是 initramfs 格式"
-#: sys-utils/switch_root.c:204
+#: sys-utils/switch_root.c:205
#, c-format
msgid " %s [options] <newrootdir> <init> <args to init>\n"
msgstr " %s [选项] <新根目录> <init 程序> <init 程序参数>\n"
-#: sys-utils/switch_root.c:208
+#: sys-utils/switch_root.c:209
msgid "Switch to another filesystem as the root of the mount tree.\n"
msgstr "切换到另一个文件系统作为挂载树的根目录。\n"
-#: sys-utils/switch_root.c:251
+#: sys-utils/switch_root.c:255
msgid "failed. Sorry."
msgstr "失败了。抱歉。"
-#: sys-utils/switch_root.c:254
+#: sys-utils/switch_root.c:258
#, c-format
msgid "cannot access %s"
msgstr "无法访问 %s"
-#: sys-utils/tunelp.c:94
+#: sys-utils/tunelp.c:98
msgid "Set various parameters for the line printer.\n"
msgstr "设置行式打印机的各种参数。\n"
-#: sys-utils/tunelp.c:97
+#: sys-utils/tunelp.c:101
msgid " -i, --irq <num> specify parallel port irq\n"
msgstr " -i, --irq <数字> 指定并口中断号\n"
-#: sys-utils/tunelp.c:98
+#: sys-utils/tunelp.c:102
msgid " -t, --time <ms> driver wait time in milliseconds\n"
msgstr " -t, --time <毫秒数> 驱动等待时间(毫秒)\n"
-#: sys-utils/tunelp.c:99
+#: sys-utils/tunelp.c:103
msgid " -c, --chars <num> number of output characters before sleep\n"
msgstr " -c, --chars <数字> 睡眠前输出的字符数\n"
-#: sys-utils/tunelp.c:100
+#: sys-utils/tunelp.c:104
msgid " -w, --wait <us> strobe wait in micro seconds\n"
msgstr " -w, --wait <微秒数> 选通(strobe)信号等待时间(微秒)\n"
#. TRANSLATORS: do not translate <on|off> arguments. The
#. argument reader does not recognize locale, unless `on' is
#. exactly that very same string.
-#: sys-utils/tunelp.c:104
+#: sys-utils/tunelp.c:108
msgid " -a, --abort <on|off> abort on error\n"
msgstr " -a, --abort <on|off> 出错时中止\n"
-#: sys-utils/tunelp.c:105
+#: sys-utils/tunelp.c:109
msgid " -o, --check-status <on|off> check printer status before printing\n"
msgstr " -o, --check-status <on|off> 打印前检查打印机状态\n"
-#: sys-utils/tunelp.c:106
+#: sys-utils/tunelp.c:110
msgid " -C, --careful <on|off> extra checking to status check\n"
msgstr " -C, --careful <on|off> 进行状态检查外的其他检查\n"
-#: sys-utils/tunelp.c:107
+#: sys-utils/tunelp.c:111
msgid " -s, --status query printer status\n"
msgstr " -s, --status 查询打印机状态\n"
-#: sys-utils/tunelp.c:108
-msgid " -T, --trust-irq <on|off> make driver to trust irq\n"
-msgstr " -T, --trust-irq <on|off> 将驱动设置为信任的中断\n"
-
-#: sys-utils/tunelp.c:109
+#: sys-utils/tunelp.c:112
msgid " -r, --reset reset the port\n"
msgstr " -r, --reset 重置端口\n"
-#: sys-utils/tunelp.c:110
+#: sys-utils/tunelp.c:113
msgid " -q, --print-irq <on|off> display current irq setting\n"
msgstr " -q, --print-irq <on|off> 显示当前的中断设置\n"
-#: sys-utils/tunelp.c:261
+#: sys-utils/tunelp.c:259
#, c-format
msgid "%s not an lp device"
msgstr "%s 不是循环设备"
-#: sys-utils/tunelp.c:280
+#: sys-utils/tunelp.c:278
msgid "LPGETSTATUS error"
msgstr "LPGETSTATUS 出错"
-#: sys-utils/tunelp.c:285
+#: sys-utils/tunelp.c:283
#, c-format
msgid "%s status is %d"
msgstr "%s 状态为 %d"
-#: sys-utils/tunelp.c:287
+#: sys-utils/tunelp.c:285
#, c-format
msgid ", busy"
msgstr ",忙碌"
-#: sys-utils/tunelp.c:289
+#: sys-utils/tunelp.c:287
#, c-format
msgid ", ready"
msgstr ",就绪"
-#: sys-utils/tunelp.c:291
+#: sys-utils/tunelp.c:289
#, c-format
msgid ", out of paper"
msgstr ",缺页"
-#: sys-utils/tunelp.c:293
+#: sys-utils/tunelp.c:291
#, c-format
msgid ", on-line"
msgstr ",在线"
-#: sys-utils/tunelp.c:295
+#: sys-utils/tunelp.c:293
#, c-format
msgid ", error"
msgstr ",错误"
-#: sys-utils/tunelp.c:300
+#: sys-utils/tunelp.c:298
msgid "ioctl failed"
msgstr "ioctl 失败"
-#: sys-utils/tunelp.c:310
+#: sys-utils/tunelp.c:308
msgid "LPGETIRQ error"
msgstr "LPGETIRQ 出错"
-#: sys-utils/tunelp.c:315
+#: sys-utils/tunelp.c:313
#, c-format
msgid "%s using IRQ %d\n"
msgstr "%s 使用中断请求 %d\n"
-#: sys-utils/tunelp.c:317
+#: sys-utils/tunelp.c:315
#, c-format
msgid "%s using polling\n"
msgstr "%s 使用轮询\n"
-#: sys-utils/umount.c:74
+#: sys-utils/umount.c:79
#, c-format
msgid ""
" %1$s [-hV]\n"
@@ -16917,15 +17330,15 @@ msgstr ""
" %1$s -a [选项]\n"
" %1$s [选项] <源> | <目录>\n"
-#: sys-utils/umount.c:80
+#: sys-utils/umount.c:85
msgid "Unmount filesystems.\n"
msgstr "卸载文件系统。\n"
-#: sys-utils/umount.c:83
+#: sys-utils/umount.c:88
msgid " -a, --all unmount all filesystems\n"
msgstr " -a, --all 卸载所有文件系统\n"
-#: sys-utils/umount.c:84
+#: sys-utils/umount.c:89
msgid ""
" -A, --all-targets unmount all mountpoints for the given device in the\n"
" current namespace\n"
@@ -16933,79 +17346,79 @@ msgstr ""
" -A, --all-targets 卸载当前名字空间内指定设备\n"
" 对应的所有挂臷点\n"
-#: sys-utils/umount.c:86
+#: sys-utils/umount.c:91
msgid " -c, --no-canonicalize don't canonicalize paths\n"
msgstr " -c, --no-canonicalize 不对路径规范化\n"
-#: sys-utils/umount.c:87
+#: sys-utils/umount.c:92
msgid " -d, --detach-loop if mounted loop device, also free this loop device\n"
msgstr " -d, --detach-loop 若挂臷了回环设备,也释放该回环设备\n"
-#: sys-utils/umount.c:88
+#: sys-utils/umount.c:93
msgid " --fake dry run; skip the umount(2) syscall\n"
msgstr " --fake 空运行;跳过 umount(2) 系统调用\n"
-#: sys-utils/umount.c:89
+#: sys-utils/umount.c:94
msgid " -f, --force force unmount (in case of an unreachable NFS system)\n"
msgstr " -f, --force 强制卸载(遇到不响应的 NFS 系统时)\n"
-#: sys-utils/umount.c:90
+#: sys-utils/umount.c:95
msgid " -i, --internal-only don't call the umount.<type> helpers\n"
msgstr " -i, --internal-only 不调用 umount.<类型> 辅助程序\n"
-#: sys-utils/umount.c:92
+#: sys-utils/umount.c:97
msgid " -l, --lazy detach the filesystem now, clean up things later\n"
msgstr " -l, --lazy 立即断开文件系统,清理以后执行\n"
-#: sys-utils/umount.c:93
+#: sys-utils/umount.c:98
msgid " -O, --test-opts <list> limit the set of filesystems (use with -a)\n"
msgstr " -O, --test-opts <列表> 限制文件系统集合(和 -a 选项一起使用)\n"
-#: sys-utils/umount.c:94
+#: sys-utils/umount.c:99
msgid " -R, --recursive recursively unmount a target with all its children\n"
msgstr " -R, --recursive 递归卸载目录及其子对象\n"
-#: sys-utils/umount.c:95
+#: sys-utils/umount.c:100
msgid " -r, --read-only in case unmounting fails, try to remount read-only\n"
msgstr " -r, --read-only 若卸载失败,尝试以只读方式重新挂臷\n"
-#: sys-utils/umount.c:96
+#: sys-utils/umount.c:101
msgid " -t, --types <list> limit the set of filesystem types\n"
msgstr " -t, --types <列表> 限制文件系统集合\n"
-#: sys-utils/umount.c:141
+#: sys-utils/umount.c:145
#, c-format
msgid "%s (%s) unmounted"
msgstr "%s (%s) 已卸载"
-#: sys-utils/umount.c:143
+#: sys-utils/umount.c:147
#, c-format
msgid "%s unmounted"
msgstr "%s 未挂载"
-#: sys-utils/umount.c:203
+#: sys-utils/umount.c:207
msgid "failed to set umount target"
msgstr "设置卸载目标失败"
-#: sys-utils/umount.c:219
+#: sys-utils/umount.c:223
msgid "libmount table allocation failed"
msgstr "libmount 表分配失败"
-#: sys-utils/umount.c:262 sys-utils/umount.c:342
+#: sys-utils/umount.c:266 sys-utils/umount.c:346
msgid "libmount iterator allocation failed"
msgstr "分配 libmount 迭代器失败!"
-#: sys-utils/umount.c:268
+#: sys-utils/umount.c:272
#, c-format
msgid "failed to get child fs of %s"
msgstr "获取 %s 的子文件系统失败"
-#: sys-utils/umount.c:306 sys-utils/umount.c:329
+#: sys-utils/umount.c:310 sys-utils/umount.c:333
#, c-format
msgid "%s: not found"
msgstr "%s:找不到"
-#: sys-utils/umount.c:336
+#: sys-utils/umount.c:340
#, c-format
msgid "%s: failed to determine source (--all-targets is unsupported on systems with regular mtab file)."
msgstr "%s:确定源失败(有常规 mtab 文件的系统不支持 --all-targets)"
@@ -17103,19 +17516,19 @@ msgstr ""
msgid " -s, --setgroups allow|deny control the setgroups syscall in user namespaces\n"
msgstr " -s, --setgroups allow|deny 控制用户名字空间中的 setgroups 系统调用\n"
-#: sys-utils/unshare.c:386
+#: sys-utils/unshare.c:385
msgid "unshare failed"
msgstr "unshare 失败"
-#: sys-utils/unshare.c:430
+#: sys-utils/unshare.c:429
msgid "child exit failed"
msgstr "子进程退出失败"
-#: sys-utils/unshare.c:437
+#: sys-utils/unshare.c:436
msgid "options --setgroups=allow and --map-root-user are mutually exclusive"
msgstr "--setgroups=allow 和 --map-root-user 选项是互斥的"
-#: sys-utils/unshare.c:457
+#: sys-utils/unshare.c:456
#, c-format
msgid "mount %s failed"
msgstr "挂载 %s 失败"
@@ -17193,11 +17606,11 @@ msgstr "看门狗设备名称"
msgid "unknown flag: %s"
msgstr "未知标志:%s"
-#: sys-utils/wdctl.c:177
+#: sys-utils/wdctl.c:178
msgid "Show the status of the hardware watchdog.\n"
msgstr "显示硬件看门狗的状态。\n"
-#: sys-utils/wdctl.c:180
+#: sys-utils/wdctl.c:181
msgid ""
" -f, --flags <list> print selected flags only\n"
" -F, --noflags don't print information about flags\n"
@@ -17226,68 +17639,64 @@ msgstr ""
msgid "The default device is %s.\n"
msgstr "默认设备为 %s。\n"
-#: sys-utils/wdctl.c:199
-msgid "Available columns:\n"
-msgstr "可用的列:\n"
-
-#: sys-utils/wdctl.c:291
+#: sys-utils/wdctl.c:290
#, c-format
msgid "%s: unknown flags 0x%x\n"
msgstr "%s:未知标志 0x%x\n"
-#: sys-utils/wdctl.c:321 sys-utils/wdctl.c:377
+#: sys-utils/wdctl.c:320 sys-utils/wdctl.c:376
#, c-format
msgid "%s: watchdog already in use, terminating."
msgstr "%s:看门狗正在使用,将终止。"
-#: sys-utils/wdctl.c:335 sys-utils/wdctl.c:405
+#: sys-utils/wdctl.c:334 sys-utils/wdctl.c:404
#, c-format
msgid "%s: failed to disarm watchdog"
msgstr "%s:喂看门狗失败"
-#: sys-utils/wdctl.c:344
+#: sys-utils/wdctl.c:343
#, c-format
msgid "cannot set timeout for %s"
msgstr "无法设置 %s 的超时"
-#: sys-utils/wdctl.c:350
+#: sys-utils/wdctl.c:349
#, c-format
msgid "Timeout has been set to %d second.\n"
msgid_plural "Timeout has been set to %d seconds.\n"
msgstr[0] "超时已调整为 %d 秒\n"
-#: sys-utils/wdctl.c:384
+#: sys-utils/wdctl.c:383
#, c-format
msgid "%s: failed to get information about watchdog"
msgstr "%s:获取看门狗信息失败"
-#: sys-utils/wdctl.c:466 sys-utils/wdctl.c:469 sys-utils/wdctl.c:472
+#: sys-utils/wdctl.c:465 sys-utils/wdctl.c:468 sys-utils/wdctl.c:471
#, c-format
msgid "%-14s %2i second\n"
msgid_plural "%-14s %2i seconds\n"
msgstr[0] "%-14s %2i 秒\n"
-#: sys-utils/wdctl.c:467
+#: sys-utils/wdctl.c:466
msgid "Timeout:"
msgstr "超时:"
-#: sys-utils/wdctl.c:470
+#: sys-utils/wdctl.c:469
msgid "Pre-timeout:"
msgstr "预超时:"
-#: sys-utils/wdctl.c:473
+#: sys-utils/wdctl.c:472
msgid "Timeleft:"
msgstr "剩余时间:"
-#: sys-utils/wdctl.c:605
+#: sys-utils/wdctl.c:604
msgid "Device:"
msgstr "设备:"
-#: sys-utils/wdctl.c:607
+#: sys-utils/wdctl.c:606
msgid "Identity:"
msgstr "标识:"
-#: sys-utils/wdctl.c:609
+#: sys-utils/wdctl.c:608
msgid "version"
msgstr "版本:"
@@ -17339,7 +17748,7 @@ msgstr "通过压实迁移的对象数"
msgid "Failed to parse mm_stat"
msgstr "解析 mm_stat 失败"
-#: sys-utils/zramctl.c:525
+#: sys-utils/zramctl.c:526
#, c-format
msgid ""
" %1$s [options] <device>\n"
@@ -17349,43 +17758,43 @@ msgstr ""
" %1$s [选项] [<回环设备>]\n"
" %1$s [选项] -f | <回环设备> <文件>\n"
-#: sys-utils/zramctl.c:531
+#: sys-utils/zramctl.c:532
msgid "Set up and control zram devices.\n"
msgstr "设置和控制 zram 设备。\n"
-#: sys-utils/zramctl.c:534
+#: sys-utils/zramctl.c:535
msgid " -a, --algorithm lzo|lz4 compression algorithm to use\n"
msgstr " -a, --algorithm lzo|lz4 要使用的压缩算法\n"
-#: sys-utils/zramctl.c:535
+#: sys-utils/zramctl.c:536
msgid " -b, --bytes print sizes in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为打印尺寸,而非易读格式\n"
-#: sys-utils/zramctl.c:536
+#: sys-utils/zramctl.c:537
msgid " -f, --find find a free device\n"
msgstr " -f, --find 查找空闲设备\n"
-#: sys-utils/zramctl.c:537
+#: sys-utils/zramctl.c:538
msgid " -n, --noheadings don't print headings\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: sys-utils/zramctl.c:538
+#: sys-utils/zramctl.c:539
msgid " -o, --output <list> columns to use for status output\n"
msgstr " -o, --output <list> 用于状态输出的列\n"
-#: sys-utils/zramctl.c:539
+#: sys-utils/zramctl.c:540
msgid " --raw use raw status output format\n"
msgstr " --raw 使用原生状态输出格式\n"
-#: sys-utils/zramctl.c:540
+#: sys-utils/zramctl.c:541
msgid " -r, --reset reset all specified devices\n"
msgstr " -r, --reset 重置所有指定的设备\n"
-#: sys-utils/zramctl.c:541
+#: sys-utils/zramctl.c:542
msgid " -s, --size <size> device size\n"
msgstr " -s, --size <尺寸> 设备尺寸\n"
-#: sys-utils/zramctl.c:542
+#: sys-utils/zramctl.c:543
msgid " -t, --streams <number> number of compression streams\n"
msgstr " -t, --streams <数字> 压缩流数量\n"
@@ -17434,140 +17843,144 @@ msgstr "%s︰设置算法失败"
msgid "%s: failed to set disksize (%ju bytes)"
msgstr "%s:设置磁盘大小失败(%ju 个字节)"
-#: term-utils/agetty.c:459
+#: term-utils/agetty.c:463
#, c-format
msgid "%s%s (automatic login)\n"
msgstr "%s%s (自动登录)\n"
-#: term-utils/agetty.c:515
+#: term-utils/agetty.c:519
#, c-format
msgid "%s: can't change root directory %s: %m"
msgstr "%s:无法更改根目录 %s:%m"
-#: term-utils/agetty.c:518
+#: term-utils/agetty.c:522
#, c-format
msgid "%s: can't change working directory %s: %m"
msgstr "%s:无法更改工作目录 %s:%m"
-#: term-utils/agetty.c:521
+#: term-utils/agetty.c:525
#, c-format
msgid "%s: can't change process priority: %m"
msgstr "%s:无法更改进程优先级:%m"
-#: term-utils/agetty.c:532
+#: term-utils/agetty.c:536
#, c-format
msgid "%s: can't exec %s: %m"
msgstr "%s:无法执行 %s:%m"
-#: term-utils/agetty.c:563 term-utils/agetty.c:849 term-utils/agetty.c:861
-#: term-utils/agetty.c:878 term-utils/agetty.c:1396 term-utils/agetty.c:1414
-#: term-utils/agetty.c:1450 term-utils/agetty.c:1460 term-utils/agetty.c:1497
-#: term-utils/agetty.c:1981 term-utils/agetty.c:2527
+#: term-utils/agetty.c:567 term-utils/agetty.c:892 term-utils/agetty.c:1410
+#: term-utils/agetty.c:1428 term-utils/agetty.c:1464 term-utils/agetty.c:1474
+#: term-utils/agetty.c:1511 term-utils/agetty.c:1954 term-utils/agetty.c:2511
#, c-format
msgid "failed to allocate memory: %m"
msgstr "分配内存失败:%m"
-#: term-utils/agetty.c:688
+#: term-utils/agetty.c:654
+#, fuzzy, c-format
+msgid "%s from %s"
+msgstr "%s,来自 %s\n"
+
+#: term-utils/agetty.c:738
msgid "invalid delay argument"
msgstr "无效的延迟参数"
-#: term-utils/agetty.c:727
+#: term-utils/agetty.c:777
msgid "invalid argument of --local-line"
msgstr "--local-line 选项参数无效"
-#: term-utils/agetty.c:746
+#: term-utils/agetty.c:796
msgid "invalid nice argument"
msgstr "无效的 nice 参数"
-#: term-utils/agetty.c:883
+#: term-utils/agetty.c:897
#, c-format
msgid "bad speed: %s"
msgstr "速度有误:%s"
-#: term-utils/agetty.c:885
+#: term-utils/agetty.c:899
msgid "too many alternate speeds"
msgstr "备选速度过多"
-#: term-utils/agetty.c:992 term-utils/agetty.c:996 term-utils/agetty.c:1049
+#: term-utils/agetty.c:1006 term-utils/agetty.c:1010 term-utils/agetty.c:1063
#, c-format
msgid "/dev/%s: cannot open as standard input: %m"
msgstr "/dev/%s:无法以标准输入打开:%m"
-#: term-utils/agetty.c:1015
+#: term-utils/agetty.c:1029
#, c-format
msgid "/dev/%s: not a character device"
msgstr "/dev/%s:不是字符设备"
-#: term-utils/agetty.c:1017
+#: term-utils/agetty.c:1031
#, c-format
msgid "/dev/%s: not a tty"
msgstr "/dev/%s:不是终端"
-#: term-utils/agetty.c:1021 term-utils/agetty.c:1053
+#: term-utils/agetty.c:1035 term-utils/agetty.c:1067
#, c-format
msgid "/dev/%s: cannot get controlling tty: %m"
msgstr "/dev/%s:无法获取控制 tty:%m"
-#: term-utils/agetty.c:1043
+#: term-utils/agetty.c:1057
#, c-format
msgid "/dev/%s: vhangup() failed: %m"
msgstr "/dev/%s:vhangup() 失败:%m"
-#: term-utils/agetty.c:1064
+#: term-utils/agetty.c:1078
#, c-format
msgid "%s: not open for read/write"
msgstr "%s:未打开(就)读/写"
-#: term-utils/agetty.c:1069
+#: term-utils/agetty.c:1083
#, c-format
msgid "/dev/%s: cannot set process group: %m"
msgstr "/dev/%s:无法设置进程组:%m"
-#: term-utils/agetty.c:1083
+#: term-utils/agetty.c:1097
#, c-format
msgid "%s: dup problem: %m"
msgstr "%s:dup 问题:%m"
-#: term-utils/agetty.c:1100
+#: term-utils/agetty.c:1114
#, c-format
msgid "%s: failed to get terminal attributes: %m"
msgstr "%s:获取终端属性失败:%m"
-#: term-utils/agetty.c:1302 term-utils/agetty.c:1322
+#: term-utils/agetty.c:1316 term-utils/agetty.c:1336
#, c-format
msgid "setting terminal attributes failed: %m"
msgstr "设置终端属性失败:%m"
-#: term-utils/agetty.c:1440
+#: term-utils/agetty.c:1454
msgid "cannot open os-release file"
msgstr "无法打开 os-release 文件"
-#: term-utils/agetty.c:1618
+#: term-utils/agetty.c:1616
#, c-format
msgid "failed to create reload file: %s: %m"
msgstr "未能创建 reload 文件︰%s:%m"
-#: term-utils/agetty.c:1717
+#: term-utils/agetty.c:1703
msgid "[press ENTER to login]"
msgstr "[按 ENTER 键登录]"
-#: term-utils/agetty.c:1742
+#: term-utils/agetty.c:1727
msgid "Num Lock off"
msgstr "Num Lock 关"
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1730
msgid "Num Lock on"
msgstr "Num Lock 开"
-#: term-utils/agetty.c:1748
+#: term-utils/agetty.c:1733
msgid "Caps Lock on"
msgstr "Caps Lock 开"
-#: term-utils/agetty.c:1751
+#: term-utils/agetty.c:1736
msgid "Scroll Lock on"
msgstr "Scroll Lock 开"
-#: term-utils/agetty.c:1754
+#: term-utils/agetty.c:1739
#, c-format
msgid ""
"Hint: %s\n"
@@ -17576,32 +17989,32 @@ msgstr ""
"提示:%s\n"
"\n"
-#: term-utils/agetty.c:1901
+#: term-utils/agetty.c:1874
#, c-format
msgid "%s: read: %m"
msgstr "%s:read:%m"
-#: term-utils/agetty.c:1960
+#: term-utils/agetty.c:1933
#, c-format
msgid "%s: input overrun"
msgstr "%s:输入过载"
-#: term-utils/agetty.c:1977 term-utils/agetty.c:1985
+#: term-utils/agetty.c:1950 term-utils/agetty.c:1958
#, c-format
msgid "%s: invalid character conversion for login name"
msgstr "%s:登录名字符转换无效"
-#: term-utils/agetty.c:1991
+#: term-utils/agetty.c:1964
#, c-format
msgid "%s: invalid character 0x%x in login name"
msgstr "%s:登录名中的字符 0x%x 无效"
-#: term-utils/agetty.c:2076
+#: term-utils/agetty.c:2049
#, c-format
msgid "%s: failed to set terminal attributes: %m"
msgstr "%s:设置终端属性失败:%m"
-#: term-utils/agetty.c:2112
+#: term-utils/agetty.c:2087
#, c-format
msgid ""
" %1$s [options] <line> [<baud_rate>,...] [<termtype>]\n"
@@ -17610,176 +18023,173 @@ msgstr ""
" %1$s [选项] <线路> [<波特率>,...] [<终端类型>]\n"
" %1$s [选项] <波特率>,... <线路> [<终端类型>]\n"
-#: term-utils/agetty.c:2116
+#: term-utils/agetty.c:2091
msgid "Open a terminal and set its mode.\n"
msgstr "打开一个终端并设置其模式。\n"
-#: term-utils/agetty.c:2119
+#: term-utils/agetty.c:2094
msgid " -8, --8bits assume 8-bit tty\n"
msgstr " -8, --8bits 采用 8 位 tty\n"
-#: term-utils/agetty.c:2120
+#: term-utils/agetty.c:2095
msgid " -a, --autologin <user> login the specified user automatically\n"
msgstr " -a, --autologin <用户> 以指定用户自动登录\n"
-#: term-utils/agetty.c:2121
+#: term-utils/agetty.c:2096
msgid " -c, --noreset do not reset control mode\n"
msgstr " -c, --noreset 不重置控制模式\n"
-#: term-utils/agetty.c:2122
+#: term-utils/agetty.c:2097
msgid " -E, --remote use -r <hostname> for login(1)\n"
msgstr " -E, --remote 使用 -r <主机名> 选项调用 login(1)\n"
-#: term-utils/agetty.c:2123
+#: term-utils/agetty.c:2098
msgid " -f, --issue-file <file> display issue file\n"
msgstr " -f, --issue-file <文件> 指定要显示的预登录消息(issue)文件\n"
-#: term-utils/agetty.c:2124
+#: term-utils/agetty.c:2099
msgid " -h, --flow-control enable hardware flow control\n"
msgstr " -h, --flow-control 启用硬件流控制\n"
-#: term-utils/agetty.c:2125
+#: term-utils/agetty.c:2100
msgid " -H, --host <hostname> specify login host\n"
msgstr " -H, --host <主机名> 指定登录主机\n"
-#: term-utils/agetty.c:2126
+#: term-utils/agetty.c:2101
msgid " -i, --noissue do not display issue file\n"
msgstr " -i, --noissue 不显示预登录消息(issue)文件\n"
-#: term-utils/agetty.c:2127
+#: term-utils/agetty.c:2102
msgid " -I, --init-string <string> set init string\n"
msgstr " -I, --init-string <字符串> 设置初始字符串\n"
-#: term-utils/agetty.c:2128
+#: term-utils/agetty.c:2103
msgid " -J --noclear do not clear the screen before prompt\n"
msgstr " -J --noclear 提示之前不清屏\n"
-#: term-utils/agetty.c:2129
+#: term-utils/agetty.c:2104
msgid " -l, --login-program <file> specify login program\n"
msgstr " -l, --login-program <文件> 指定登录程序\n"
-#: term-utils/agetty.c:2130
+#: term-utils/agetty.c:2105
msgid " -L, --local-line[=<mode>] control the local line flag\n"
msgstr " -L, --local-line[=<模式>] 控制本地线路标志\n"
-#: term-utils/agetty.c:2131
+#: term-utils/agetty.c:2106
msgid " -m, --extract-baud extract baud rate during connect\n"
msgstr " -m, --extract-baud 连接过程中提取波特率\n"
-#: term-utils/agetty.c:2132
+#: term-utils/agetty.c:2107
msgid " -n, --skip-login do not prompt for login\n"
msgstr " -n, --skip-login 不提示登录\n"
-#: term-utils/agetty.c:2133
+#: term-utils/agetty.c:2108
msgid " -N --nonewline do not print a newline before issue\n"
msgstr " -N --nonewline 预登录消息(issue)前不打印换行(newline)\n"
-#: term-utils/agetty.c:2134
+#: term-utils/agetty.c:2109
msgid " -o, --login-options <opts> options that are passed to login\n"
msgstr " -o, --login-options <选项> 传递给登录程序的选项\n"
-#: term-utils/agetty.c:2135
+#: term-utils/agetty.c:2110
msgid " -p, --login-pause wait for any key before the login\n"
msgstr " -p, --login-pause 登录前等待按下任意键来继续\n"
-#: term-utils/agetty.c:2136
+#: term-utils/agetty.c:2111
msgid " -r, --chroot <dir> change root to the directory\n"
msgstr " -r, --chroot <目录> 将根目录更改为指定目录\n"
-#: term-utils/agetty.c:2137
+#: term-utils/agetty.c:2112
msgid " -R, --hangup do virtually hangup on the tty\n"
msgstr " -R, --hangup 对 tty 执行虚拟挂起(virtual hangup)\n"
-#: term-utils/agetty.c:2138
+#: term-utils/agetty.c:2113
msgid " -s, --keep-baud try to keep baud rate after break\n"
msgstr " -s, --keep-baud 中断(break)后尝试保持波特率\n"
-#: term-utils/agetty.c:2139
+#: term-utils/agetty.c:2114
msgid " -t, --timeout <number> login process timeout\n"
msgstr " -t, --timeout <数字> 登录进程超时(秒)\n"
-#: term-utils/agetty.c:2140
+#: term-utils/agetty.c:2115
msgid " -U, --detect-case detect uppercase terminal\n"
msgstr " -U, --detect-case 检测纯大写终端\n"
-#: term-utils/agetty.c:2141
+#: term-utils/agetty.c:2116
msgid " -w, --wait-cr wait carriage-return\n"
msgstr " -w, --wait-cr 等待回车\n"
-#: term-utils/agetty.c:2142
+#: term-utils/agetty.c:2117
msgid " --nohints do not print hints\n"
msgstr " --nohints 不打印提示信息\n"
-#: term-utils/agetty.c:2143
+#: term-utils/agetty.c:2118
msgid " --nohostname no hostname at all will be shown\n"
msgstr " --nohostname 将完全不显示主机名\n"
-#: term-utils/agetty.c:2144
+#: term-utils/agetty.c:2119
msgid " --long-hostname show full qualified hostname\n"
msgstr " --long-hostname 显示完全限定主机名\n"
-#: term-utils/agetty.c:2145
+#: term-utils/agetty.c:2120
msgid " --erase-chars <string> additional backspace chars\n"
msgstr " --erase-chars <字符串> 附加的退格字符\n"
-#: term-utils/agetty.c:2146
+#: term-utils/agetty.c:2121
msgid " --kill-chars <string> additional kill chars\n"
msgstr " --kill-chars <字符串> 附加的杀死(kill)字符\n"
-#: term-utils/agetty.c:2147
+#: term-utils/agetty.c:2122
msgid " --chdir <directory> chdir before the login\n"
msgstr " --chdir <目录> 登录前切换目录(chdir)\n"
-#: term-utils/agetty.c:2148
+#: term-utils/agetty.c:2123
msgid " --delay <number> sleep seconds before prompt\n"
msgstr " --delay <数字> 提示前睡眠的秒数\n"
-#: term-utils/agetty.c:2149
+#: term-utils/agetty.c:2124
msgid " --nice <number> run login with this priority\n"
msgstr " --nice <数字> 以指定优先级运行 login\n"
-#: term-utils/agetty.c:2150
+#: term-utils/agetty.c:2125
msgid " --reload reload prompts on running agetty instances\n"
msgstr " --reload 在运行 agetty 实例时重新载入提示\n"
-#: term-utils/agetty.c:2151
-msgid " --help display this help and exit\n"
-msgstr " --help 显示此帮助并退出\n"
-
-#: term-utils/agetty.c:2152
-msgid " --version output version information and exit\n"
-msgstr " --version 输出版本信息并退出\n"
+#: term-utils/agetty.c:2126
+#, fuzzy
+msgid " --list-speeds display supported baud rates\n"
+msgstr " --list 列出可设置的架构并退出\n"
-#: term-utils/agetty.c:2487
+#: term-utils/agetty.c:2471
#, c-format
msgid "%d user"
msgid_plural "%d users"
msgstr[0] "%d 位用户"
-#: term-utils/agetty.c:2615
+#: term-utils/agetty.c:2599
#, c-format
msgid "checkname failed: %m"
msgstr "checkname 失败:%m"
-#: term-utils/agetty.c:2627
+#: term-utils/agetty.c:2611
#, c-format
msgid "cannot touch file %s"
msgstr "无法 touch 文件 %s"
-#: term-utils/agetty.c:2631
+#: term-utils/agetty.c:2615
msgid "--reload is unsupported on your system"
msgstr "您的系统不支持 --reload"
-#: term-utils/mesg.c:75
+#: term-utils/mesg.c:76
#, c-format
msgid " %s [options] [y | n]\n"
msgstr " %s [选项] [y | n]\n"
-#: term-utils/mesg.c:78
+#: term-utils/mesg.c:79
msgid "Control write access of other users to your terminal.\n"
msgstr "控制其他用户对您终端的写权限。\n"
-#: term-utils/mesg.c:81
+#: term-utils/mesg.c:82
msgid " -v, --verbose explain what is being done\n"
msgstr " -v, --verbose 解释正在进行的操作\n"
@@ -17813,27 +18223,25 @@ msgstr "拒绝了写您的终端"
msgid "invalid argument: %s"
msgstr "无效参数:%s"
-#: term-utils/script.c:160
+#: term-utils/script.c:161
#, c-format
msgid " %s [options] [file]\n"
msgstr " %s [选项] [文件]\n"
-#: term-utils/script.c:163
+#: term-utils/script.c:164
msgid "Make a typescript of a terminal session.\n"
msgstr "创建终端会话的 typescript。\n"
-#: term-utils/script.c:166
+#: term-utils/script.c:167
+#, fuzzy
msgid ""
-" -a, --append append the output\n"
-" -c, --command <command> run command rather than interactive shell\n"
-" -e, --return return exit code of the child process\n"
-" -f, --flush run flush after each write\n"
-" --force use output file even when it is a link\n"
-" -q, --quiet be quiet\n"
-" -t, --timing[=<file>] output timing data to stderr (or to FILE)\n"
-" -V, --version output version information and exit\n"
-" -h, --help display this help and exit\n"
-"\n"
+" -a, --append append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
+" -e, --return return exit code of the child process\n"
+" -f, --flush run flush after each write\n"
+" --force use output file even when it is a link\n"
+" -q, --quiet be quiet\n"
+" -t[<file>], --timing[=<file>] output timing data to stderr or to FILE\n"
msgstr ""
" -a, --append 追加输出\n"
" -c, --command <命令> 运行命令而不是交互式 shell\n"
@@ -17846,7 +18254,7 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: term-utils/script.c:188
+#: term-utils/script.c:189
#, c-format
msgid ""
"output file `%s' is a link\n"
@@ -17857,16 +18265,16 @@ msgstr ""
"如果真想用它,使用 --force 选项。\n"
"程序没有启动。"
-#: term-utils/script.c:200
+#: term-utils/script.c:225
#, c-format
msgid "Script done, file is %s\n"
msgstr "脚本完成,文件为 %s\n"
-#: term-utils/script.c:263
+#: term-utils/script.c:288
msgid "cannot write script file"
msgstr "无法写脚本文件"
-#: term-utils/script.c:397
+#: term-utils/script.c:429
#, c-format
msgid ""
"\n"
@@ -17875,12 +18283,12 @@ msgstr ""
"\n"
"会话已终止。\n"
-#: term-utils/script.c:442
+#: term-utils/script.c:478
#, fuzzy, c-format
msgid "Script started on %s\n"
msgstr "脚本已于 %s 启动"
-#: term-utils/script.c:519
+#: term-utils/script.c:552
#, fuzzy, c-format
msgid ""
"\n"
@@ -17889,41 +18297,35 @@ msgstr ""
"\n"
"脚本完成,于 %s"
-#: term-utils/script.c:615
-msgid "failed to get terminal attributes"
-msgstr "取终端属性失败"
-
-#: term-utils/script.c:622
+#: term-utils/script.c:643
msgid "openpty failed"
msgstr "openpty 失败"
-#: term-utils/script.c:660
+#: term-utils/script.c:681
msgid "out of pty's"
msgstr "pty 的输出"
-#: term-utils/script.c:760
+#: term-utils/script.c:781
#, c-format
msgid "Script started, file is %s\n"
msgstr "脚本已启动,文件为 %s\n"
-#: term-utils/scriptreplay.c:43
+#: term-utils/scriptreplay.c:44
#, c-format
msgid " %s [-t] timingfile [typescript] [divisor]\n"
msgstr " %s [-t] timingfile [typescript] [divisor]\n"
-#: term-utils/scriptreplay.c:47
+#: term-utils/scriptreplay.c:48
msgid "Play back terminal typescripts, using timing information.\n"
msgstr "使用定时信息回话终端 typescript。\n"
-#: term-utils/scriptreplay.c:50
+#: term-utils/scriptreplay.c:51
+#, fuzzy
msgid ""
" -t, --timing <file> script timing output file\n"
" -s, --typescript <file> script terminal session output file\n"
" -d, --divisor <num> speed up or slow down execution with time divisor\n"
" -m, --maxdelay <num> wait at most this many seconds between updates\n"
-" -V, --version output version information and exit\n"
-" -h, --help display this help and exit\n"
-"\n"
msgstr ""
" -t, --timing <文件> 脚本时序输出文件\n"
" -s, --typescript <文件> 脚本终端会话输出文件\n"
@@ -17933,30 +18335,30 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
"\n"
-#: term-utils/scriptreplay.c:112
+#: term-utils/scriptreplay.c:113
msgid "write to stdout failed"
msgstr "写 stdout 失败"
-#: term-utils/scriptreplay.c:118
+#: term-utils/scriptreplay.c:119
#, c-format
msgid "unexpected end of file on %s"
msgstr "%s 上的文件结尾异常"
-#: term-utils/scriptreplay.c:120
+#: term-utils/scriptreplay.c:121
#, c-format
msgid "failed to read typescript file %s"
msgstr "读 typescript 文件 %s 失败"
-#: term-utils/scriptreplay.c:184
+#: term-utils/scriptreplay.c:185
msgid "wrong number of arguments"
msgstr "参数个数不正确"
-#: term-utils/scriptreplay.c:215
+#: term-utils/scriptreplay.c:216
#, c-format
msgid "failed to read timing file %s"
msgstr "读时序文件 %s 失败"
-#: term-utils/scriptreplay.c:217
+#: term-utils/scriptreplay.c:218
#, c-format
msgid "timing file %s: line %lu: unexpected format"
msgstr "定时文件 %s:第 %lu 行:格式异常。"
@@ -17970,230 +18372,222 @@ msgstr "参数错误:不支持亮度 %s"
msgid "too many tabs"
msgstr "标签过多"
-#: term-utils/setterm.c:381
+#: term-utils/setterm.c:382
msgid "Set the attributes of a terminal.\n"
msgstr "设置终端属性。\n"
-#: term-utils/setterm.c:384
+#: term-utils/setterm.c:385
msgid " --term <terminal_name> override TERM environment variable\n"
msgstr " --term <终端名> 替换 TERM 环境变量\n"
-#: term-utils/setterm.c:385
+#: term-utils/setterm.c:386
msgid " --reset reset terminal to power-on state\n"
msgstr " --reset 重置端口到上电时的状态\n"
-#: term-utils/setterm.c:386
+#: term-utils/setterm.c:387
#, fuzzy
msgid " --resize reset terminal rows and columns\n"
msgstr " --reset 重置端口到上电时的状态\n"
-#: term-utils/setterm.c:387
+#: term-utils/setterm.c:388
msgid " --initialize display init string, and use default settings\n"
msgstr " --initialize 显示初始化字符串,并使用默认设置\n"
-#: term-utils/setterm.c:388
+#: term-utils/setterm.c:389
msgid " --default use default terminal settings\n"
msgstr " --default 使用默认终端设置\n"
-#: term-utils/setterm.c:389
+#: term-utils/setterm.c:390
msgid " --store save current terminal settings as default\n"
msgstr " --store 将当前终端设置保存为默认值\n"
-#: term-utils/setterm.c:390
+#: term-utils/setterm.c:391
msgid " --cursor [on|off] display cursor\n"
msgstr " --cursor [on|off] 显示光标\n"
-#: term-utils/setterm.c:391
+#: term-utils/setterm.c:392
msgid " --repeat [on|off] keyboard repeat\n"
msgstr " --repeat [on|off] 键盘重复\n"
-#: term-utils/setterm.c:392
+#: term-utils/setterm.c:393
msgid " --appcursorkeys [on|off] cursor key application mode\n"
msgstr " --appcursorkeys [on|off] 光标键应用程序模式\n"
-#: term-utils/setterm.c:393
+#: term-utils/setterm.c:394
msgid " --linewrap [on|off] continue on a new line when a line is full\n"
msgstr " --linewrap [on|off] 一行满时在新行中继续\n"
-#: term-utils/setterm.c:394
+#: term-utils/setterm.c:395
msgid " --inversescreen [on|off] swap colors for the whole screen\n"
msgstr " --inversescreen [on|off] 交换整个屏幕的颜色\n"
-#: term-utils/setterm.c:395
+#: term-utils/setterm.c:396
msgid " --foreground default|<color> set foreground color\n"
msgstr " --foreground default|<颜色> 设置前景色\n"
-#: term-utils/setterm.c:396
+#: term-utils/setterm.c:397
msgid " --background default|<color> set background color\n"
msgstr " --background default|<颜色> 设置背景色\n"
-#: term-utils/setterm.c:397
+#: term-utils/setterm.c:398
msgid " --ulcolor [bright] <color> set underlined text color\n"
msgstr " --ulcolor [bright] <颜色> 设置下划线颜色\n"
-#: term-utils/setterm.c:398
+#: term-utils/setterm.c:399
msgid " --hbcolor [bright] <color> set bold text color\n"
msgstr " --hbcolor [bright] <颜色> 设置粗体字颜色\n"
-#: term-utils/setterm.c:399
+#: term-utils/setterm.c:400
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:400
+#: term-utils/setterm.c:401
msgid " --bold [on|off] bold\n"
msgstr " --bold [on|off] 粗体\n"
-#: term-utils/setterm.c:401
+#: term-utils/setterm.c:402
msgid " --half-bright [on|off] dim\n"
msgstr " -half-bright [on|off] 变暗\n"
-#: term-utils/setterm.c:402
+#: term-utils/setterm.c:403
msgid " --blink [on|off] blink\n"
msgstr " --blink [on|off] 闪烁\n"
-#: term-utils/setterm.c:403
+#: term-utils/setterm.c:404
msgid " --underline [on|off] underline\n"
msgstr " --underline [on|off] 下划线\n"
-#: term-utils/setterm.c:404
+#: term-utils/setterm.c:405
msgid " --reverse [on|off] swap foreground and background colors\n"
msgstr " --reverse [on|off] 交换前景色和背景色\n"
-#: term-utils/setterm.c:405
+#: term-utils/setterm.c:406
msgid " --clear [all|rest] clear screen and set cursor position\n"
msgstr " --clear [all|rest] 清屏并设置光标位置\n"
-#: term-utils/setterm.c:406
+#: term-utils/setterm.c:407
msgid " --tabs [<number>...] set these tab stop positions, or show them\n"
msgstr " --tabs [<数字>...] 设置这些制表位置,或显示制表位\n"
-#: term-utils/setterm.c:407
+#: term-utils/setterm.c:408
msgid " --clrtabs [<number>...] clear these tab stop positions, or all\n"
msgstr " --clrtabs [<数字>...] 清除这些或所有制表位\n"
-#: term-utils/setterm.c:408
+#: term-utils/setterm.c:409
msgid " --regtabs [1-160] set a regular tab stop interval\n"
msgstr " --regtabs [1-160] 设置常规的制表位间隔\n"
-#: term-utils/setterm.c:409
+#: term-utils/setterm.c:410
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:410
+#: term-utils/setterm.c:411
msgid " --dump [<number>] write vcsa<number> console dump to file\n"
msgstr " --dump [<数字>] 将 vcsa<数字> 终端转储到文件\n"
-#: term-utils/setterm.c:411
+#: term-utils/setterm.c:412
msgid " --append [<number>] append vcsa<number> console dump to file\n"
msgstr " --append [<数字>] 将 vcsa<数字> 终端转储追加到文件\n"
-#: term-utils/setterm.c:412
+#: term-utils/setterm.c:413
msgid " --file <filename> name of the dump file\n"
msgstr " -f, --file <文件名> 转储文件的名字\n"
-#: term-utils/setterm.c:413
+#: term-utils/setterm.c:414
msgid " --msg [on|off] send kernel messages to console\n"
msgstr " --msg [on|off] 将内核消息发送到终端\n"
-#: term-utils/setterm.c:414
+#: term-utils/setterm.c:415
msgid " --msglevel 0-8 kernel console log level\n"
msgstr " --msglevel 0-8 内核终端日志记录级别\n"
-#: term-utils/setterm.c:415
+#: term-utils/setterm.c:416
msgid " --powersave [on|vsync|hsync|powerdown|off]\n"
msgstr " -powersave [on|vsync|hsync|powerdown|off]\n"
-#: term-utils/setterm.c:416
+#: term-utils/setterm.c:417
msgid " set vesa powersaving features\n"
msgstr " 设置 vesa 节能功能\n"
-#: term-utils/setterm.c:417
+#: term-utils/setterm.c:418
msgid " --powerdown [0-60] set vesa powerdown interval in minutes\n"
msgstr " --powerdown [0-60] 设置 vesa 关闭电源间隔(分钟)\n"
-#: term-utils/setterm.c:418
+#: term-utils/setterm.c:419
msgid " --blength [0-2000] duration of the bell in milliseconds\n"
msgstr " --blength [0-2000] 响铃持续时间(毫秒)\n"
-#: term-utils/setterm.c:419
+#: term-utils/setterm.c:420
msgid " --bfreq <number> bell frequency in Hertz\n"
msgstr " --bfreq <数字> 响铃频率,单位为 Hz\n"
-#: term-utils/setterm.c:420
-msgid " --version show version information and exit\n"
-msgstr " --version 输出版本信息并退出\n"
-
-#: term-utils/setterm.c:421
-msgid " --help display this help and exit\n"
-msgstr " --help 显示此帮助并退出\n"
-
-#: term-utils/setterm.c:429
+#: term-utils/setterm.c:431
msgid "duplicate use of an option"
msgstr "重复使用某选项"
-#: term-utils/setterm.c:738
+#: term-utils/setterm.c:740
msgid "cannot force blank"
msgstr "无法强制清空(blank)"
-#: term-utils/setterm.c:743
+#: term-utils/setterm.c:745
msgid "cannot force unblank"
msgstr "无法强制反清空(unblank)"
-#: term-utils/setterm.c:749
+#: term-utils/setterm.c:751
msgid "cannot get blank status"
msgstr "无法获取空白状态"
-#: term-utils/setterm.c:775
+#: term-utils/setterm.c:777
#, fuzzy, c-format
msgid "cannot open dump file %s for output"
msgstr "无法打开转储文件 %s 进行输出"
-#: term-utils/setterm.c:817
+#: term-utils/setterm.c:819
#, c-format
msgid "terminal %s does not support %s"
msgstr "终端 %s 不支持 %s"
-#: term-utils/setterm.c:855
+#: term-utils/setterm.c:857
#, fuzzy
msgid "select failed"
msgstr "定位失败"
-#: term-utils/setterm.c:881
+#: term-utils/setterm.c:883
msgid "stdin does not refer to a terminal"
msgstr ""
-#: term-utils/setterm.c:909
+#: term-utils/setterm.c:911
#, fuzzy, c-format
msgid "invalid cursor position: %s"
msgstr "无效选项"
-#: term-utils/setterm.c:931
+#: term-utils/setterm.c:933
#, fuzzy
msgid "reset failed"
msgstr "setgid 失败"
-#: term-utils/setterm.c:1095
+#: term-utils/setterm.c:1097
msgid "cannot (un)set powersave mode"
msgstr "无法设置(取消)节能模式"
-#: term-utils/setterm.c:1114 term-utils/setterm.c:1123
+#: term-utils/setterm.c:1116 term-utils/setterm.c:1125
msgid "klogctl error"
msgstr "klogctl 出错"
-#: term-utils/setterm.c:1144
+#: term-utils/setterm.c:1146
msgid "$TERM is not defined."
msgstr "$TERM 未定义。"
-#: term-utils/setterm.c:1151
+#: term-utils/setterm.c:1153
msgid "terminfo database cannot be found"
msgstr "找不到 terminfo 数据库"
-#: term-utils/setterm.c:1153
+#: term-utils/setterm.c:1155
#, c-format
msgid "%s: unknown terminal type"
msgstr "%s:未知终端类型"
-#: term-utils/setterm.c:1155
+#: term-utils/setterm.c:1157
msgid "terminal is hardcopy"
msgstr "终端为硬拷贝(hardcopy)"
@@ -18227,136 +18621,136 @@ msgstr "无法 fork"
msgid "%s: BAD ERROR, message is far too long"
msgstr "%s:严重错误,消息太长太长了"
-#: term-utils/wall.c:85
+#: term-utils/wall.c:86
#, c-format
msgid " %s [options] [<file> | <message>]\n"
msgstr " %s [选项] [<文件> | <消息>]\n"
-#: term-utils/wall.c:88
+#: term-utils/wall.c:89
msgid "Write a message to all users.\n"
msgstr "向所有用户发消息。\n"
-#: term-utils/wall.c:91
+#: term-utils/wall.c:92
#, fuzzy
msgid " -g, --group <group> only send message to group\n"
msgstr " -g, --group <组> 指定主组\n"
-#: term-utils/wall.c:92
+#: term-utils/wall.c:93
msgid " -n, --nobanner do not print banner, works only for root\n"
msgstr " -n, --nobanner 不打印欢迎消息,只对 root 用户生效\n"
-#: term-utils/wall.c:93
+#: term-utils/wall.c:94
msgid " -t, --timeout <timeout> write timeout in seconds\n"
msgstr " -t, --timeout <超时> 写超时(秒)\n"
-#: term-utils/wall.c:116
+#: term-utils/wall.c:122
#, fuzzy
msgid "invalid group argument"
msgstr "无效的周期参数"
-#: term-utils/wall.c:118
+#: term-utils/wall.c:124
#, fuzzy, c-format
msgid "%s: unknown gid"
msgstr "%c:未知命令"
-#: term-utils/wall.c:161
+#: term-utils/wall.c:167
msgid "getgrouplist found more groups than sysconf allows"
msgstr ""
-#: term-utils/wall.c:207
+#: term-utils/wall.c:213
msgid "--nobanner is available only for root"
msgstr "--nobanner 只有 root 能用"
-#: term-utils/wall.c:212
+#: term-utils/wall.c:218
#, c-format
msgid "invalid timeout argument: %s"
msgstr "无效的超时参数:%s"
-#: term-utils/wall.c:351
+#: term-utils/wall.c:357
msgid "cannot get passwd uid"
msgstr "无法获取 passwd uid"
-#: term-utils/wall.c:356
+#: term-utils/wall.c:362
msgid "cannot get tty name"
msgstr "无法获得 tty 名称"
-#: term-utils/wall.c:376
+#: term-utils/wall.c:382
#, c-format
msgid "Broadcast message from %s@%s (%s) (%s):"
msgstr "来自 %s@%s (%s) (%s) 的广播消息:"
-#: term-utils/wall.c:409
+#: term-utils/wall.c:415
#, c-format
msgid "will not read %s - use stdin."
msgstr "将不读 %s - 使用 stdin。"
-#: term-utils/write.c:86
+#: term-utils/write.c:87
#, c-format
msgid " %s [options] <user> [<ttyname>]\n"
msgstr " %s [选项] <用户> [<tty名称>]\n"
-#: term-utils/write.c:90
+#: term-utils/write.c:91
msgid "Send a message to another user.\n"
msgstr "向另一个用户发送消息。\n"
-#: term-utils/write.c:117
+#: term-utils/write.c:116
#, c-format
msgid "effective gid does not match group of %s"
msgstr "有效 gid 与组 %s 不匹配"
-#: term-utils/write.c:202
+#: term-utils/write.c:201
#, c-format
msgid "%s is not logged in"
msgstr "%s 未登录"
-#: term-utils/write.c:207
+#: term-utils/write.c:206
msgid "can't find your tty's name"
msgstr "找不到您的 tty 名称"
-#: term-utils/write.c:212
+#: term-utils/write.c:211
#, c-format
msgid "%s has messages disabled"
msgstr "%s 禁用了消息"
-#: term-utils/write.c:215
+#: term-utils/write.c:214
#, c-format
msgid "%s is logged in more than once; writing to %s"
msgstr "%s 登录了多次;将记入 %s"
-#: term-utils/write.c:238
+#: term-utils/write.c:237
msgid "carefulputc failed"
msgstr "carefulputc 失败"
-#: term-utils/write.c:280
+#: term-utils/write.c:279
#, c-format
msgid "Message from %s@%s (as %s) on %s at %02d:%02d ..."
msgstr "%s@%s (作为 %s) 于 %s 在 %02d:%02d 发的消息..."
-#: term-utils/write.c:284
+#: term-utils/write.c:283
#, c-format
msgid "Message from %s@%s on %s at %02d:%02d ..."
msgstr "%s@%s 于 %s 在 %02d:%02d 发的消息..."
-#: term-utils/write.c:331
+#: term-utils/write.c:330
msgid "you have write permission turned off"
msgstr "您关闭了写权限"
-#: term-utils/write.c:354
+#: term-utils/write.c:353
#, c-format
msgid "%s is not logged in on %s"
msgstr "%s 未在 %s 上登录"
-#: term-utils/write.c:360
+#: term-utils/write.c:359
#, c-format
msgid "%s has messages disabled on %s"
msgstr "%s 在 %s 上禁用了消息"
-#: text-utils/col.c:134
+#: text-utils/col.c:135
msgid "Filter out reverse line feeds.\n"
msgstr "过滤反换行。\n"
-#: text-utils/col.c:137
-#, c-format
+#: text-utils/col.c:138
+#, fuzzy, c-format
msgid ""
"\n"
"Options:\n"
@@ -18366,9 +18760,6 @@ msgid ""
" -h, --tabs convert spaces to tabs\n"
" -x, --spaces convert tabs to spaces\n"
" -l, --lines NUM buffer at least NUM lines\n"
-" -V, --version output version information and exit\n"
-" -H, --help display this help and exit\n"
-"\n"
msgstr ""
"\n"
"选项:\n"
@@ -18382,7 +18773,7 @@ msgstr ""
" -H, --help 显示此帮助并退出\n"
"\n"
-#: text-utils/col.c:148 text-utils/colrm.c:69
+#: text-utils/col.c:151 text-utils/colrm.c:69
#, c-format
msgid ""
"%s reads from standard input and writes to standard output\n"
@@ -18391,41 +18782,41 @@ msgstr ""
"%s 读取标准输入并写入标准输出\n"
"\n"
-#: text-utils/col.c:212
+#: text-utils/col.c:215
msgid "bad -l argument"
msgstr "-l 参数有误"
-#: text-utils/col.c:339
+#: text-utils/col.c:344
#, c-format
msgid "warning: can't back up %s."
msgstr "警告:无法备份 %s。"
-#: text-utils/col.c:340
+#: text-utils/col.c:345
msgid "past first line"
msgstr "越过第一行"
-#: text-utils/col.c:340
+#: text-utils/col.c:345
msgid "-- line already flushed"
msgstr "-- 行已经被冲洗(flushed)"
-#: text-utils/colcrt.c:81 text-utils/column.c:551
+#: text-utils/colcrt.c:82 text-utils/column.c:564
#, c-format
msgid " %s [options] [<file>...]\n"
msgstr " %s [选项] [<文件>...]\n"
-#: text-utils/colcrt.c:84
+#: text-utils/colcrt.c:85
msgid "Filter nroff output for CRT previewing.\n"
msgstr "过滤 nroff 输出以便 CRT 预览。\n"
-#: text-utils/colcrt.c:87
+#: text-utils/colcrt.c:88
msgid " -, --no-underlining suppress all underlining\n"
msgstr " -, --no-underlining 禁止所有下划线\n"
-#: text-utils/colcrt.c:88
+#: text-utils/colcrt.c:89
msgid " -2, --half-lines print all half-lines\n"
msgstr " -2, --half-lines 打印所有半行\n"
-#: text-utils/colrm.c:59
+#: text-utils/colrm.c:60
#, c-format
msgid ""
"\n"
@@ -18436,7 +18827,7 @@ msgstr ""
"用法:\n"
" %s [起始列 [终止列]]\n"
-#: text-utils/colrm.c:64
+#: text-utils/colrm.c:65
msgid "Filter out the specified columns.\n"
msgstr "过滤指定列。\n"
@@ -18448,219 +18839,223 @@ msgstr "第一个参数"
msgid "second argument"
msgstr "第二个参数"
-#: text-utils/column.c:217
+#: text-utils/column.c:230
#, fuzzy
msgid "failed to parse column"
msgstr "解析 终点 失败"
-#: text-utils/column.c:227
+#: text-utils/column.c:240
#, fuzzy, c-format
msgid "undefined column name '%s'"
msgstr "未定义的挂载点"
-#: text-utils/column.c:278
+#: text-utils/column.c:291
#, fuzzy
msgid "failed to parse --table-order list"
msgstr "解析 --timeout 失败"
-#: text-utils/column.c:351
+#: text-utils/column.c:364
#, fuzzy
msgid "failed to parse --table-right list"
msgstr "解析 起点 失败"
-#: text-utils/column.c:355
+#: text-utils/column.c:368
#, fuzzy
msgid "failed to parse --table-trunc list"
msgstr "解析 --timeout 失败"
-#: text-utils/column.c:359
+#: text-utils/column.c:372
#, fuzzy
msgid "failed to parse --table-noextreme list"
msgstr "解析 --timeout 失败"
-#: text-utils/column.c:363
+#: text-utils/column.c:376
#, fuzzy
msgid "failed to parse --table-wrap list"
msgstr "解析 起点 失败"
-#: text-utils/column.c:367
+#: text-utils/column.c:380
#, fuzzy
msgid "failed to parse --table-hide list"
msgstr "解析 --timeout 失败"
-#: text-utils/column.c:398
+#: text-utils/column.c:411
#, c-format
msgid "line %zu: for JSON the name of the column %zu is required"
msgstr ""
-#: text-utils/column.c:411
+#: text-utils/column.c:424
#, fuzzy
msgid "failed to allocate output data"
msgstr "分配输出表失败"
-#: text-utils/column.c:554
+#: text-utils/column.c:567
msgid "Columnate lists.\n"
msgstr "成列输出内容。\n"
-#: text-utils/column.c:557
+#: text-utils/column.c:570
#, fuzzy
msgid " -t, --table create a table\n"
msgstr " -t, --table 创建表格\n"
-#: text-utils/column.c:558
+#: text-utils/column.c:571
#, fuzzy
msgid " -n, --table-name <name> table name for JSON output\n"
msgstr " -n, --name <progname> 要报告其错误的程序名称\n"
-#: text-utils/column.c:559
+#: text-utils/column.c:572
#, fuzzy
msgid " -O, --table-order <columns> specify order of output columns\n"
msgstr " -x, --sort <列> 按<列>对输出排序\n"
-#: text-utils/column.c:560
+#: text-utils/column.c:573
#, fuzzy
msgid " -N, --table-columns <names> comma separated columns names\n"
msgstr " -o, --options <列表> 以英文逗号分隔的 swap 选项\n"
-#: text-utils/column.c:561
+#: text-utils/column.c:574
msgid " -E, --table-noextreme <columns> don't count long text from the columns to column width\n"
msgstr ""
-#: text-utils/column.c:562
+#: text-utils/column.c:575
+msgid " -e, --table-header-repeat repeat header for each page\n"
+msgstr ""
+
+#: text-utils/column.c:576
#, fuzzy
msgid " -H, --table-hide <columns> don't print the columns\n"
msgstr " -n, --noheadings 不打印列标题\n"
-#: text-utils/column.c:563
+#: text-utils/column.c:577
msgid " -R, --table-right <columns> right align text in these columns\n"
msgstr ""
-#: text-utils/column.c:564
+#: text-utils/column.c:578
#, fuzzy
msgid " -T, --table-truncate <columns> truncate text in the columns when necessary\n"
msgstr " -u, --notruncate 不截断列中的文本\n"
-#: text-utils/column.c:565
+#: text-utils/column.c:579
msgid " -W, --table-wrap <columns> wrap text in the columns when necessary\n"
msgstr ""
-#: text-utils/column.c:566
+#: text-utils/column.c:580
#, fuzzy
msgid " -J, --json use JSON output format for table\n"
msgstr " -J, --json 使用 JSON --list 输出格式\n"
-#: text-utils/column.c:569
+#: text-utils/column.c:583
#, fuzzy
msgid " -r, --tree <column> column to use tree-like output for the table\n"
msgstr " -O, --output <列> 指定 --list 选项要输出的列\n"
-#: text-utils/column.c:570
+#: text-utils/column.c:584
#, fuzzy
msgid " -i, --tree-id <column> line ID to specify child-parent relation\n"
msgstr " -i, --irq <数字> 指定并口中断号\n"
-#: text-utils/column.c:571
+#: text-utils/column.c:585
#, fuzzy
msgid " -p, --tree-parent <column> parent to specify child-parent relation\n"
msgstr " -N, --partno <数字> 指定分区号\n"
-#: text-utils/column.c:574
+#: text-utils/column.c:588
#, fuzzy
msgid " -c, --output-width <width> width of output in number of characters\n"
msgstr " -c, --columns <宽度> 输出宽度(字符数)\n"
-#: text-utils/column.c:575
+#: text-utils/column.c:589
#, fuzzy
msgid " -o, --output-separator <string> columns separator for table output (default is two spaces)\n"
msgstr ""
" -o, --output-separator <字符串>\n"
" 表格输出列分隔符,默认为两个空格\n"
-#: text-utils/column.c:576
+#: text-utils/column.c:590
#, fuzzy
msgid " -s, --separator <string> possible table delimiters\n"
msgstr " -s, --separator <字符串> 可用的表格分隔符\n"
-#: text-utils/column.c:577
+#: text-utils/column.c:591
#, fuzzy
msgid " -x, --fillrows fill rows before columns\n"
msgstr " -x, --fillrows 先填充行,再填充列\n"
-#: text-utils/column.c:643
+#: text-utils/column.c:657
msgid "invalid columns argument"
msgstr "无效的 列数 参数"
-#: text-utils/column.c:662
+#: text-utils/column.c:679
#, fuzzy
msgid "failed to parse column names"
msgstr "解析挂臷表失败"
-#: text-utils/column.c:715
+#: text-utils/column.c:732
msgid "options --tree-id and --tree-parent are required for tree formatting"
msgstr ""
-#: text-utils/column.c:723
+#: text-utils/column.c:740
msgid "option --table required for all --table-*"
msgstr ""
-#: text-utils/column.c:726
+#: text-utils/column.c:743
msgid "option --table-columns required for --json"
msgstr ""
-#: text-utils/hexdump.c:155 text-utils/more.c:231
+#: text-utils/hexdump.c:156 text-utils/more.c:232
#, c-format
msgid " %s [options] <file>...\n"
msgstr " %s [选项] <文件>...\n"
-#: text-utils/hexdump.c:158
+#: text-utils/hexdump.c:159
msgid "Display file contents in hexadecimal, decimal, octal, or ascii.\n"
msgstr "以十六进制、十进制、八进制、二进制或 ascii 显示文件内容。\n"
-#: text-utils/hexdump.c:161
+#: text-utils/hexdump.c:162
msgid " -b, --one-byte-octal one-byte octal display\n"
msgstr " -b, --one-byte-octal 单字节八进制显示\n"
-#: text-utils/hexdump.c:162
+#: text-utils/hexdump.c:163
msgid " -c, --one-byte-char one-byte character display\n"
msgstr " -c, --one-byte-char 单字节字符显示\n"
-#: text-utils/hexdump.c:163
+#: text-utils/hexdump.c:164
msgid " -C, --canonical canonical hex+ASCII display\n"
msgstr " -C, --canonical 规范化 hex+ASCII 显示\n"
-#: text-utils/hexdump.c:164
+#: text-utils/hexdump.c:165
msgid " -d, --two-bytes-decimal two-byte decimal display\n"
msgstr " -d, --two-bytes-decimal 双字节十进制显示\n"
-#: text-utils/hexdump.c:165
+#: text-utils/hexdump.c:166
msgid " -o, --two-bytes-octal two-byte octal display\n"
msgstr " -o, --two-bytes-octal 双字节八进制显示\n"
-#: text-utils/hexdump.c:166
+#: text-utils/hexdump.c:167
msgid " -x, --two-bytes-hex two-byte hexadecimal display\n"
msgstr " -x, --two-bytes-hex 双字节十六进制显示\n"
-#: text-utils/hexdump.c:167
+#: text-utils/hexdump.c:168
msgid " -L, --color[=<mode>] interpret color formatting specifiers\n"
msgstr " -L, --color[=<模式>] 解释颜色格式化限定符\n"
-#: text-utils/hexdump.c:170
+#: text-utils/hexdump.c:171
msgid " -e, --format <format> format string to be used for displaying data\n"
msgstr " -e, --format <格式> 用于显示数据的格式化字符串\n"
-#: text-utils/hexdump.c:171
+#: text-utils/hexdump.c:172
msgid " -f, --format-file <file> file that contains format strings\n"
msgstr " -f, --format-file <文件> 包含格式字符串的文件\n"
-#: text-utils/hexdump.c:172
+#: text-utils/hexdump.c:173
msgid " -n, --length <length> interpret only length bytes of input\n"
msgstr " -n, --length <长度> 只解释规定字节长度的输入\n"
-#: text-utils/hexdump.c:173
+#: text-utils/hexdump.c:174
msgid " -s, --skip <offset> skip offset bytes from the beginning\n"
msgstr " -s, --skip <偏移> 跳过开头的指定字节偏移\n"
-#: text-utils/hexdump.c:174
+#: text-utils/hexdump.c:175
msgid " -v, --no-squeezing output identical lines\n"
msgstr " -v, --no-squeezing 输出相同的行\n"
@@ -18692,64 +19087,60 @@ msgstr "转换字符 %%%s 有误"
msgid "byte count with multiple conversion characters"
msgstr "对字符计数使用了多个转换字符"
-#: text-utils/line.c:33
+#: text-utils/line.c:34
msgid "Read one line.\n"
msgstr "读一行内容。\n"
-#: text-utils/more.c:234
+#: text-utils/more.c:235
msgid "A file perusal filter for CRT viewing.\n"
msgstr "适合屏幕查看的文件阅读输出工具。\n"
-#: text-utils/more.c:237
+#: text-utils/more.c:238
msgid " -d display help instead of ringing bell\n"
msgstr " -d 显示帮助而非响铃\n"
-#: text-utils/more.c:238
+#: text-utils/more.c:239
msgid " -f count logical rather than screen lines\n"
msgstr " -f 计算逻辑行数,而非屏幕行数\n"
-#: text-utils/more.c:239
+#: text-utils/more.c:240
msgid " -l suppress pause after form feed\n"
msgstr " -l 屏蔽换页(form feed)后的暂停\n"
-#: text-utils/more.c:240
+#: text-utils/more.c:241
msgid " -c do not scroll, display text and clean line ends\n"
msgstr " -c 不滚动,显示文本并清理行末\n"
-#: text-utils/more.c:241
+#: text-utils/more.c:242
msgid " -p do not scroll, clean screen and display text\n"
msgstr " -p 不滚动,清除屏幕并显示文本\n"
-#: text-utils/more.c:242
+#: text-utils/more.c:243
msgid " -s squeeze multiple blank lines into one\n"
msgstr " -s 将多行空行压缩为一行\n"
-#: text-utils/more.c:243
+#: text-utils/more.c:244
msgid " -u suppress underlining\n"
msgstr " -u 屏蔽下划线\n"
-#: text-utils/more.c:244
+#: text-utils/more.c:245
msgid " -<number> the number of lines per screenful\n"
msgstr " -<数字> 每屏的行数\n"
-#: text-utils/more.c:245
+#: text-utils/more.c:246
msgid " +<number> display file beginning from line number\n"
msgstr " +<数字> 从指定行开始显示文件\n"
-#: text-utils/more.c:246
+#: text-utils/more.c:247
msgid " +/<string> display file beginning from search string match\n"
msgstr " +/<字符串> 从匹配搜索字符串的位置开始显示文件\n"
-#: text-utils/more.c:247
-msgid " -V display version information and exit\n"
-msgstr " -V 显示版本信息并退出\n"
-
-#: text-utils/more.c:490
+#: text-utils/more.c:505
#, c-format
msgid "unknown option -%s"
msgstr "未知选项 -%s"
-#: text-utils/more.c:514
+#: text-utils/more.c:529
#, c-format
msgid ""
"\n"
@@ -18760,7 +19151,7 @@ msgstr ""
"*** %s:目录 ***\n"
"\n"
-#: text-utils/more.c:556
+#: text-utils/more.c:571
#, c-format
msgid ""
"\n"
@@ -18771,39 +19162,39 @@ msgstr ""
"******** %s:不是文件文件 ********\n"
"\n"
-#: text-utils/more.c:651
+#: text-utils/more.c:666
#, c-format
msgid "[Use q or Q to quit]"
msgstr "[使用 q 或 Q 退出]"
-#: text-utils/more.c:730
+#: text-utils/more.c:745
#, c-format
msgid "--More--"
msgstr "--更多--"
-#: text-utils/more.c:732
+#: text-utils/more.c:747
#, c-format
msgid "(Next file: %s)"
msgstr "(下个文件:%s)"
-#: text-utils/more.c:740
+#: text-utils/more.c:755
#, c-format
msgid "[Press space to continue, 'q' to quit.]"
msgstr "[按空格键继续,“q”键退出。]"
-#: text-utils/more.c:1168
+#: text-utils/more.c:1183
#, c-format
msgid "...back %d page"
msgid_plural "...back %d pages"
msgstr[0] "...后退 %d 页"
-#: text-utils/more.c:1216
+#: text-utils/more.c:1231
#, c-format
msgid "...skipping %d line"
msgid_plural "...skipping %d lines"
msgstr[0] "...跳过 %d 行"
-#: text-utils/more.c:1254
+#: text-utils/more.c:1269
msgid ""
"\n"
"***Back***\n"
@@ -18813,11 +19204,11 @@ msgstr ""
"***后退***\n"
"\n"
-#: text-utils/more.c:1269
+#: text-utils/more.c:1284
msgid "No previous regular expression"
msgstr "无上一个正则表达式"
-#: text-utils/more.c:1299
+#: text-utils/more.c:1314
msgid ""
"\n"
"Most commands optionally preceded by integer argument k. Defaults in brackets.\n"
@@ -18827,7 +19218,7 @@ msgstr ""
"多数命令可在前面加整数参数 k。方括号中为参数的默认值\n"
"星号(*)表示参数将成为新的默认值。\n"
-#: text-utils/more.c:1306
+#: text-utils/more.c:1321
msgid ""
"<space> Display next k lines of text [current screen size]\n"
"z Display next k lines of text [current screen size]*\n"
@@ -18869,30 +19260,30 @@ msgstr ""
":f 显示当前文件名和行号\n"
". 重复前一命令\n"
-#: text-utils/more.c:1379 text-utils/more.c:1385
+#: text-utils/more.c:1394 text-utils/more.c:1400
#, c-format
msgid "[Press 'h' for instructions.]"
msgstr "[按“h”键获取说明。]"
-#: text-utils/more.c:1416
+#: text-utils/more.c:1431
#, c-format
msgid "\"%s\" line %d"
msgstr "“%s”第 %d 行"
-#: text-utils/more.c:1418
+#: text-utils/more.c:1433
#, c-format
msgid "[Not a file] line %d"
msgstr "[不是文件] 第 %d 行"
-#: text-utils/more.c:1500
+#: text-utils/more.c:1515
msgid " Overflow\n"
msgstr " 上溢\n"
-#: text-utils/more.c:1549
+#: text-utils/more.c:1564
msgid "...skipping\n"
msgstr "...跳过\n"
-#: text-utils/more.c:1583
+#: text-utils/more.c:1598
msgid ""
"\n"
"Pattern not found\n"
@@ -18900,19 +19291,19 @@ msgstr ""
"\n"
"未找到模式\n"
-#: text-utils/more.c:1589 text-utils/pg.c:1035 text-utils/pg.c:1181
+#: text-utils/more.c:1604 text-utils/pg.c:1035 text-utils/pg.c:1181
msgid "Pattern not found"
msgstr "找不到模式"
-#: text-utils/more.c:1635
+#: text-utils/more.c:1650
msgid "exec failed\n"
msgstr "exec 失败\n"
-#: text-utils/more.c:1649
+#: text-utils/more.c:1664
msgid "can't fork\n"
msgstr "无法 fork\n"
-#: text-utils/more.c:1683
+#: text-utils/more.c:1698
msgid ""
"\n"
"...Skipping "
@@ -18920,19 +19311,19 @@ msgstr ""
"\n"
"...跳过 "
-#: text-utils/more.c:1687
+#: text-utils/more.c:1702
msgid "...Skipping to file "
msgstr "...跳到文件 "
-#: text-utils/more.c:1689
+#: text-utils/more.c:1704
msgid "...Skipping back to file "
msgstr "...将跳回文件 "
-#: text-utils/more.c:1979
+#: text-utils/more.c:1993
msgid "Line too long"
msgstr "行过长"
-#: text-utils/more.c:2016
+#: text-utils/more.c:2030
msgid "No previous command to substitute for"
msgstr "没有要替换的前一命令"
@@ -18984,52 +19375,52 @@ msgstr ""
"更多信息请参阅 pg(1)。\n"
"-------------------------------------------------------\n"
-#: text-utils/pg.c:230
+#: text-utils/pg.c:231
#, c-format
msgid " %s [options] [+line] [+/pattern/] [files]\n"
msgstr " %s [选项] [+行] [+/模式/] [文件]\n"
-#: text-utils/pg.c:234
+#: text-utils/pg.c:235
msgid "Browse pagewise through text files.\n"
msgstr "逐页查看文本文件。\n"
-#: text-utils/pg.c:237
+#: text-utils/pg.c:238
msgid " -number lines per page\n"
msgstr " -number 每页的行数\n"
-#: text-utils/pg.c:238
+#: text-utils/pg.c:239
msgid " -c clear screen before displaying\n"
msgstr " -c 显示前清屏\n"
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
msgid " -e do not pause at end of a file\n"
msgstr " -e 不在文件末尾暂停\n"
-#: text-utils/pg.c:240
+#: text-utils/pg.c:241
msgid " -f do not split long lines\n"
msgstr " -f 不分割长行\n"
-#: text-utils/pg.c:241
+#: text-utils/pg.c:242
msgid " -n terminate command with new line\n"
msgstr " -n 用换行符(new line)终止命令\n"
-#: text-utils/pg.c:242
+#: text-utils/pg.c:243
msgid " -p <prompt> specify prompt\n"
msgstr " -p <提示> 指定提示语\n"
-#: text-utils/pg.c:243
+#: text-utils/pg.c:244
msgid " -r disallow shell escape\n"
msgstr " -r 禁止 shell 转义\n"
-#: text-utils/pg.c:244
+#: text-utils/pg.c:245
msgid " -s print messages to stdout\n"
msgstr " -s 向标准输出打印消息\n"
-#: text-utils/pg.c:245
+#: text-utils/pg.c:246
msgid " +number start at the given line\n"
msgstr " +数字 从指定行开始\n"
-#: text-utils/pg.c:246
+#: text-utils/pg.c:247
msgid " +/pattern/ start at the line containing pattern\n"
msgstr " +/模式/ 从包含 模式 的行开始\n"
@@ -19119,12 +19510,12 @@ msgstr "%s %s Copyright (c) 2000-2001 Gunnar Ritter. All rights reserved.\n"
msgid "failed to parse number of lines per page"
msgstr "解析每页的行数失败"
-#: text-utils/rev.c:76
+#: text-utils/rev.c:77
#, c-format
msgid "Usage: %s [options] [file ...]\n"
msgstr "用法:%s [选项] [文件 ...]\n"
-#: text-utils/rev.c:80
+#: text-utils/rev.c:81
msgid "Reverse lines characterwise.\n"
msgstr "对成行的内容逐字翻转。\n"
@@ -19145,34 +19536,325 @@ msgstr " -t, -T, --terminal TERMINAL 用 TERMINAL 覆盖 TERM 环境变量的
msgid " -i, --indicated underlining is indicated via a separate line\n"
msgstr " -i, --indicated 通过单独一行表示下划线\n"
-#: text-utils/ul.c:210
+#: text-utils/ul.c:209
msgid "trouble reading terminfo"
msgstr "读取终端信息出错"
-#: text-utils/ul.c:215
+#: text-utils/ul.c:214
#, c-format
msgid "terminal `%s' is not known, defaulting to `dumb'"
msgstr "终端“%s”未知,将使用默认值“dumb”"
-#: text-utils/ul.c:305
+#: text-utils/ul.c:304
#, c-format
msgid "unknown escape sequence in input: %o, %o"
msgstr "输入中有未知转义序列:%o,%o"
-#: text-utils/ul.c:630
+#: text-utils/ul.c:629
msgid "Input line too long."
msgstr "输入行过长。"
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -V\n"
+#~ " %1$s --report [devices]\n"
+#~ " %1$s [-v|-q] commands devices\n"
+#~ "\n"
+#~ "Available commands:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "用法:\n"
+#~ " %1$s -V\n"
+#~ " %1$s --report [设备]\n"
+#~ " %1$s [-v|-q] 命令 设备\n"
+#~ "\n"
+#~ "可用命令有:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Available columns (for -o):\n"
+#~ msgstr ""
+#~ "\n"
+#~ "可用列(用于 -o):\n"
+
+#~ msgid "seek error on %s"
+#~ msgstr "%s 定位出错"
+
+#~ msgid ""
+#~ " -V, --version display version information and exit;\n"
+#~ " -V as --version must be the only option\n"
+#~ msgstr ""
+#~ " -V, --version 显示版本信息并退出\n"
+#~ " 将 -V 作为 --version 选项时必须是惟一选项\n"
+
+#~ msgid " -h, --help display this help text and exit\n"
+#~ msgstr " -h, --help 显示此帮助并退出\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Available columns (for --show, --raw or --pairs):\n"
+#~ msgstr ""
+#~ "\n"
+#~ "可用的列(针对 --show、--raw 或 --pairs):\n"
+
+#~ msgid " -v, --version output version information and exit\n"
+#~ msgstr " -v, --version 输出版本信息并退出\n"
+
+#, fuzzy
+#~ msgid "Try '%s -h' for more information.\n"
+#~ msgstr "请尝试执行“%s --help”了解更多信息。\n"
+
+#~ msgid " -h, --help display this help and exit\n"
+#~ msgstr " -h, --help 显示此帮助并退出\n"
+
+#~ msgid " -V, --version output version information and exit\n"
+#~ msgstr " -V, --version 输出版本信息并退出\n"
+
+#~ msgid " -u, --help display this help and exit\n"
+#~ msgstr " -u, --help 显示此帮助并退出\n"
+
+#~ msgid "No known shells."
+#~ msgstr "无已知 shell。"
+
+#~ msgid ""
+#~ "\n"
+#~ "Available columns:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "可用的列:\n"
+
+#, fuzzy
+#~ msgid " %s [options] -u <user> [[--] <command>]\n"
+#~ msgstr " %s [选项] -u <用户> <命令>\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Available columns (for --output):\n"
+#~ msgstr ""
+#~ "\n"
+#~ "可用列(用于 --output):\n"
+
+#~ msgid "Try `%s --help' for more information.\n"
+#~ msgstr "请尝试执行“%s --help”了解更多信息。\n"
+
+#~ msgid " -v, --verbose explain what is being done\n"
+#~ msgstr " -v, --verbose 解释正在进行的操作\n"
+
+#~ msgid ""
+#~ " -r, --random generate random-based uuid\n"
+#~ " -t, --time generate time-based uuid\n"
+#~ " -V, --version output version information and exit\n"
+#~ " -h, --help display this help and exit\n"
+#~ "\n"
+#~ msgstr ""
+#~ " -r, --random 生成基于随机数的 uuid\n"
+#~ " -t, --time 生成基于时间的 uuid\n"
+#~ " -V, --version 输出版本信息并退出\n"
+#~ " -h, --help 显示此帮助并退出\n"
+#~ "\n"
+
+#~ msgid ""
+#~ " -a, --all wipe all magic strings (BE CAREFUL!)\n"
+#~ " -b, --backup create a signature backup in $HOME\n"
+#~ " -f, --force force erasure\n"
+#~ " -h, --help show this help text\n"
+#~ " -n, --no-act do everything except the actual write() call\n"
+#~ " -o, --offset <num> offset to erase, in bytes\n"
+#~ " -p, --parsable print out in parsable instead of printable format\n"
+#~ " -q, --quiet suppress output messages\n"
+#~ " -t, --types <list> limit the set of filesystem, RAIDs or partition tables\n"
+#~ " -V, --version output version information and exit\n"
+#~ msgstr ""
+#~ " -a, --all 擦除所有魔数字符串(慎重!)\n"
+#~ " -b, --backup 在 $HOME 中创建签名备份\n"
+#~ " -f, --force 强制擦除\n"
+#~ " -h, --help 显示此帮助文字\n"
+#~ " -n, --no-act 照常操作但不执行实际的 write() 调用\n"
+#~ " -o, --offset <数字> 要擦除的偏移字节数\n"
+#~ " -p, --parsable 以可解析的格式打印输出,而非以可打印的格式\n"
+#~ " -t, --types <列表> 限制文件系统、RAID 或分区表的集合\n"
+#~ " -V, --version 输出版本信息并退出\n"
+
+#~ msgid "The Hardware Clock registers contain values that are either invalid (e.g. 50th day of month) or beyond the range we can handle (e.g. Year 2095)."
+#~ msgstr "硬件时钟寄存器包含的值无效(如一个月的第 50 天)或超出了程序能处理的范围(如2095年)。"
+
+#~ msgid "The Hardware Clock does not contain a valid time, so we cannot set the System Time from it."
+#~ msgstr "硬件时钟不包含有效时间,因此无法从它来设置系统时间。"
+
+#~ msgid "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+#~ msgstr "\ttv.tv_sec = %ld, tv.tv_usec = %ld\n"
+
+#~ msgid "\ttz.tz_minuteswest = %d\n"
+#~ msgstr "\ttz.tz_minuteswest = %d\n"
+
+#~ msgid "Must be superuser to set system clock."
+#~ msgstr "只能以超级用户身份来设置系统时钟。"
+
+#~ msgid "\tUTC: %s\n"
+#~ msgstr "\tUTC:%s\n"
+
+#~ msgid "Not adjusting drift factor because the Hardware Clock previously contained garbage.\n"
+#~ msgstr "将不调整漂移系数,因为之前硬件时钟包含垃圾内容。\n"
+
+#~ msgid "The Hardware Clock does not contain a valid time, so we cannot adjust it."
+#~ msgstr "硬件时间不包含有效时间,程序无法调整它。"
+
+#~ msgid "At %ld seconds after 1969, RTC is predicted to read %ld seconds after 1969.\n"
+#~ msgstr "位于1969(年)后 %ld 秒,RTC 应读取到的是1969(年)后 %ld 秒。\n"
+
+#~ msgid "Unable to get the epoch value from the kernel."
+#~ msgstr "无法从内核获取纪元(epoch)值。"
+
+#~ msgid "Kernel is assuming an epoch value of %lu\n"
+#~ msgstr "内核假设纪元(epoch)值为 %lu\n"
+
+#~ msgid "To set the epoch value, you must use the 'epoch' option to tell to what value to set it."
+#~ msgstr "要设置纪元(epoch)值,您必须使用“epoch”选项来指定设置的值。"
+
+#~ msgid "Not setting the epoch to %lu - testing only.\n"
+#~ msgstr "不会将纪元(epoch)设置为 %lu - 仅用于测试。\n"
+
+#~ msgid "Unable to set the epoch value in the kernel.\n"
+#~ msgstr "无法设置内核中的纪元(epoch)值。\n"
+
+#~ msgid "Query or set the hardware clock.\n"
+#~ msgstr "查询或设置硬件锁。\n"
+
+#~ msgid ""
+#~ " -h, --help show this help text and exit\n"
+#~ " -r, --show read hardware clock and print result\n"
+#~ " --get read hardware clock and print drift corrected result\n"
+#~ " --set set the RTC to the time given with --date\n"
+#~ msgstr ""
+#~ " -h, --help 显示此帮助并退出\n"
+#~ " -r, --show 读取硬件时钟并打印结果\n"
+#~ " --set 将 RTC 设置为 --date 指定的时间\n"
+
+#~ msgid ""
+#~ " -s, --hctosys set the system time from the hardware clock\n"
+#~ " -w, --systohc set the hardware clock from the current system time\n"
+#~ " --systz set the system time based on the current timezone\n"
+#~ " --adjust adjust the RTC to account for systematic drift since\n"
+#~ " the clock was last set or adjusted\n"
+#~ msgstr ""
+#~ " -s, --hctosys 从硬件时钟设置系统时间\n"
+#~ " -w, --systohc 从当前系统时间设置硬件时钟\n"
+#~ " --systz 基于当前时区设置系统时间\n"
+#~ " --adjust 根据自上次时钟设置或调整后的系统漂移\n"
+#~ " 来调整 RTC\n"
+
+#~ msgid ""
+#~ " --getepoch print out the kernel's hardware clock epoch value\n"
+#~ " --setepoch set the kernel's hardware clock epoch value to the \n"
+#~ " value given with --epoch\n"
+#~ msgstr ""
+#~ " --getepoch 打印内核的硬件时钟纪元(epoch)值\n"
+#~ " --setepoch 将内核的硬件时钟纪元(epoch)值设置为\n"
+#~ " --epoch 选项指定的值\n"
+
+#~ msgid ""
+#~ " --predict predict RTC reading at time given with --date\n"
+#~ " -V, --version display version information and exit\n"
+#~ msgstr ""
+#~ " --predict 预测 --date 选项所指定时刻读取到的 RTC 值\n"
+#~ " -V, --version 显示版本信息并退出\n"
+
+#~ msgid ""
+#~ " -u, --utc the hardware clock is kept in UTC\n"
+#~ " --localtime the hardware clock is kept in local time\n"
+#~ msgstr ""
+#~ " -u, --utc 硬件时钟保持为 UTC 时间\n"
+#~ " --localtime 硬件时钟保持为本地时间\n"
+
+#~ msgid " -f, --rtc <file> special /dev/... file to use instead of default\n"
+#~ msgstr " -f, --rtc <文件> 代替默认文件的特殊 /dev/... 文件\n"
+
+#, fuzzy
+#~ msgid ""
+#~ " --update-drift update drift factor in %1$s (requires\n"
+#~ " --set or --systohc)\n"
+#~ " --noadjfile do not access %1$s; this requires the use of\n"
+#~ " either --utc or --localtime\n"
+#~ " --adjfile <file> specifies the path to the adjust file;\n"
+#~ " the default is %1$s\n"
+#~ msgstr ""
+#~ " --noadjfile 不访问 %s;需要使用 --utc 或 --localtime 选项\n"
+#~ " --adjfile <文件> 指定调整文件的路径;\n"
+#~ " 默认为 %s\n"
+
+#~ msgid ""
+#~ " --test do not update anything, just show what would happen\n"
+#~ " -D, --debug debugging mode\n"
+#~ "\n"
+#~ msgstr ""
+#~ " --test 不更新,只显示将进行什么操作\n"
+#~ " -D, --debug 调试模式\n"
+#~ "\n"
+
+#~ msgid "invalid epoch argument"
+#~ msgstr "无效的纪元(epoch)参数"
+
+#~ msgid "%s does not have interrupt functions. "
+#~ msgstr "%s 没有中断函数。"
+
+#~ msgid "ioctl() to %s to turn on update interrupts failed unexpectedly"
+#~ msgstr "对 %s ioctl() 以打开更新中断意外失败"
+
+#, fuzzy
+#~ msgid "To manipulate the epoch value in the kernel, we must access the Linux 'rtc' device driver via the device special file. This file does not exist on this system."
+#~ msgstr "要操作内核中的纪元(epoch)值,必须通过设备特殊文件 %s 访问 Linux “rtc”设备驱动。此系统上不存在该文件。"
+
+#~ msgid "we have read epoch %lu from %s with RTC_EPOCH_READ ioctl.\n"
+#~ msgstr "我们使用RTC_EPOCH_READ ioctl 从 %2$s 读取了纪元(epoch) %1$lu。\n"
+
+#~ msgid "The epoch value may not be less than 1900. You requested %ld"
+#~ msgstr "纪元(epoch)值不能小于 1900。您要求了 %ld"
+
+#~ msgid "setting epoch to %lu with RTC_EPOCH_SET ioctl to %s.\n"
+#~ msgstr "正通过 RTC_EPOCH_SET ioctl 向 %2$s 设置纪元(epoch) %1$lu。\n"
+
+#~ msgid "The kernel device driver for %s does not have the RTC_EPOCH_SET ioctl."
+#~ msgstr "%s 的内核设备驱动没有 RTC_EPOCH_SET ioctl (方法)。"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "Try `%s --help' for more information."
+#~ msgstr ""
+#~ "%s\n"
+#~ "请使用“%s --help”了解更多信息。"
+
+#~ msgid "Try `%s --help' for more information."
+#~ msgstr "请使用“%s --help”了解更多信息。"
+
+#~ msgid ""
+#~ "\n"
+#~ "Available columns (for --show):\n"
+#~ msgstr ""
+#~ "\n"
+#~ "可用列(用于 --show):\n"
+
+#~ msgid " -T, --trust-irq <on|off> make driver to trust irq\n"
+#~ msgstr " -T, --trust-irq <on|off> 将驱动设置为信任的中断\n"
+
+#~ msgid " --version output version information and exit\n"
+#~ msgstr " --version 输出版本信息并退出\n"
+
+#~ msgid " --version show version information and exit\n"
+#~ msgstr " --version 输出版本信息并退出\n"
+
+#~ msgid " --help display this help and exit\n"
+#~ msgstr " --help 显示此帮助并退出\n"
+
+#~ msgid " -V display version information and exit\n"
+#~ msgstr " -V 显示版本信息并退出\n"
+
#~ msgid "failed to add data to output table"
#~ msgstr "向输出表添加数据出错"
#~ msgid "failed to initialize output line"
#~ msgstr "初始化输出行失败"
-#, fuzzy
-#~ msgid "failed to create output table"
-#~ msgstr "分配输出表失败"
-
#~ msgid "Device %s already contains a %s signature."
#~ msgstr "设备 %s 已包含一个 %s 签名。"
@@ -20634,9 +21316,6 @@ msgstr "输入行过长。"
#~ " --bytes 在 --show 选项输出中以字节显示交换区大小\n"
#~ " -v, --verbose 详尽模式\n"
-#~ msgid "bad value"
-#~ msgstr "错误值"
-
#~ msgid " -m, --mount unshare mounts namespace\n"
#~ msgstr " -m, --mount 取消共享挂载名字空间\n"
@@ -21671,9 +22350,6 @@ msgstr "输入行过长。"
#~ msgid "mount: %s is not a valid block device"
#~ msgstr "mount:%s 不是有效的块设备"
-#~ msgid "block device "
-#~ msgstr "块设备 "
-
#~ msgid "mount: cannot mount %s%s read-only"
#~ msgstr "mount:无法以只读方式挂载 %s%s"
@@ -22163,12 +22839,6 @@ msgstr "输入行过长。"
#~ msgid " -bfreq freqnumber\n"
#~ msgstr " -bfreq freqnumber\n"
-#~ msgid " -version\n"
-#~ msgstr " -version\n"
-
-#~ msgid " -help\n"
-#~ msgstr " -help\n"
-
#~ msgid "Error writing screendump"
#~ msgstr "写屏幕转储失败"