# This file is distributed under the same license as the util-linux package.
# Ray Wang <wanglei1123@gmail.com>, 2008.
# Wylmer Wang <wantinghard@gmail.com>, 2012, 2013, 2014, 2015, 2016.
-# Boyuan Yang <073plan@gmail.com>, 2019, 2020, 2021.
+# Boyuan Yang <073plan@gmail.com>, 2019, 2020, 2021, 2022.
msgid ""
msgstr ""
-"Project-Id-Version: util-linux-2.37-rc2\n"
+"Project-Id-Version: util-linux-2.38-rc4\n"
"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2022-03-04 12:14+0100\n"
-"PO-Revision-Date: 2021-10-06 14:54-0400\n"
+"POT-Creation-Date: 2023-05-17 11:52+0200\n"
+"PO-Revision-Date: 2022-03-17 10:51-0400\n"
"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
+"X-Generator: Poedit 3.0.1\n"
#: disk-utils/addpart.c:15
#, c-format
msgid "Tell the kernel about the existence of a specified partition.\n"
msgstr "通知内核,存在某个指定分区。\n"
-#: disk-utils/addpart.c:52 disk-utils/blockdev.c:245 disk-utils/delpart.c:52
-#: disk-utils/mkfs.bfs.c:127 disk-utils/resizepart.c:96 misc-utils/kill.c:317
-#: misc-utils/kill.c:378 misc-utils/rename.c:326 misc-utils/whereis.c:527
+#: disk-utils/addpart.c:52 disk-utils/blockdev.c:251 disk-utils/delpart.c:52
+#: disk-utils/mkfs.bfs.c:134 disk-utils/resizepart.c:96 misc-utils/kill.c:323
+#: misc-utils/kill.c:384 misc-utils/rename.c:348 misc-utils/whereis.c:539
#: sys-utils/flock.c:177 sys-utils/ipcrm.c:161 sys-utils/ldattach.c:368
-#: sys-utils/renice.c:144 sys-utils/switch_root.c:261 sys-utils/tunelp.c:152
-#: term-utils/agetty.c:902 term-utils/agetty.c:903 term-utils/agetty.c:911
-#: term-utils/agetty.c:912
+#: sys-utils/renice.c:175 sys-utils/switch_root.c:261 sys-utils/tunelp.c:152
+#: term-utils/agetty.c:910 term-utils/agetty.c:911 term-utils/agetty.c:919
+#: term-utils/agetty.c:920
msgid "not enough arguments"
msgstr "参数不够"
-#: disk-utils/addpart.c:57 disk-utils/blockdev.c:294 disk-utils/blockdev.c:438
-#: disk-utils/blockdev.c:465 disk-utils/cfdisk.c:2818 disk-utils/delpart.c:58
+#. TRANSLATORS: '%s' refers to a file
+#: disk-utils/addpart.c:57 disk-utils/blockdev.c:300 disk-utils/blockdev.c:444
+#: disk-utils/blockdev.c:471 disk-utils/cfdisk.c:2820 disk-utils/delpart.c:58
#: disk-utils/fdformat.c:229 disk-utils/fdisk.c:810 disk-utils/fdisk.c:1141
#: disk-utils/fdisk-list.c:327 disk-utils/fdisk-list.c:368
-#: disk-utils/fdisk-list.c:391 disk-utils/fsck.c:1471
-#: disk-utils/fsck.cramfs.c:158 disk-utils/fsck.cramfs.c:521
-#: disk-utils/isosize.c:53 disk-utils/mkfs.bfs.c:186
-#: disk-utils/mkfs.cramfs.c:173 disk-utils/mkfs.cramfs.c:662
-#: disk-utils/mkfs.cramfs.c:801 disk-utils/mkfs.minix.c:838
-#: disk-utils/mkswap.c:325 disk-utils/mkswap.c:354 disk-utils/partx.c:1021
+#: disk-utils/fdisk-list.c:391 disk-utils/fsck.c:1473
+#: disk-utils/fsck.cramfs.c:158 disk-utils/fsck.cramfs.c:542
+#: disk-utils/isosize.c:53 disk-utils/mkfs.bfs.c:202
+#: disk-utils/mkfs.cramfs.c:175 disk-utils/mkfs.cramfs.c:664
+#: disk-utils/mkfs.cramfs.c:812 disk-utils/mkfs.minix.c:838
+#: disk-utils/mkswap.c:347 disk-utils/mkswap.c:377 disk-utils/partx.c:1022
#: disk-utils/resizepart.c:104 disk-utils/sfdisk.c:381 disk-utils/sfdisk.c:502
-#: disk-utils/sfdisk.c:813 disk-utils/sfdisk.c:1117 disk-utils/swaplabel.c:65
-#: libfdisk/src/bsd.c:642 login-utils/islocal.c:86 login-utils/last.c:695
+#: disk-utils/sfdisk.c:814 disk-utils/sfdisk.c:1118 disk-utils/swaplabel.c:65
+#: libfdisk/src/bsd.c:642 login-utils/islocal.c:86 login-utils/last.c:683
#: login-utils/sulogin.c:497 login-utils/sulogin.c:534
#: login-utils/utmpdump.c:142 login-utils/utmpdump.c:367
#: login-utils/utmpdump.c:391 login-utils/vipw.c:257 login-utils/vipw.c:275
-#: misc-utils/findmnt.c:1227 misc-utils/logger.c:1229 misc-utils/mcookie.c:119
-#: misc-utils/uuidd.c:231 sys-utils/blkdiscard.c:230 sys-utils/blkzone.c:144
+#: misc-utils/fadvise.c:148 misc-utils/findmnt.c:1227 misc-utils/logger.c:1247
+#: misc-utils/mcookie.c:119 misc-utils/pipesz.c:162 misc-utils/uuidd.c:235
+#: sys-utils/blkdiscard.c:248 sys-utils/blkpr.c:164 sys-utils/blkzone.c:144
#: sys-utils/dmesg.c:541 sys-utils/eject.c:501 sys-utils/eject.c:696
-#: sys-utils/fallocate.c:405 sys-utils/fsfreeze.c:116 sys-utils/fstrim.c:105
-#: sys-utils/hwclock.c:241 sys-utils/hwclock.c:912 sys-utils/hwclock-rtc.c:173
-#: sys-utils/hwclock-rtc.c:438 sys-utils/hwclock-rtc.c:474
-#: sys-utils/hwclock-rtc.c:528 sys-utils/hwclock-rtc.c:581
-#: sys-utils/irq-common.c:253 sys-utils/ldattach.c:392
-#: sys-utils/lscpu-cputype.c:470 sys-utils/lsmem.c:671 sys-utils/nsenter.c:133
+#: sys-utils/fallocate.c:405 sys-utils/fsfreeze.c:116 sys-utils/fstrim.c:106
+#: sys-utils/hwclock.c:241 sys-utils/hwclock.c:912 sys-utils/hwclock-rtc.c:108
+#: sys-utils/hwclock-rtc.c:353 sys-utils/hwclock-rtc.c:389
+#: sys-utils/hwclock-rtc.c:449 sys-utils/hwclock-rtc.c:502
+#: sys-utils/irq-common.c:263 sys-utils/ldattach.c:392
+#: sys-utils/lscpu-cputype.c:477 sys-utils/lsmem.c:671 sys-utils/nsenter.c:139
#: sys-utils/rfkill.c:195 sys-utils/rtcwake.c:137 sys-utils/rtcwake.c:292
#: sys-utils/setpriv.c:256 sys-utils/setpriv.c:622 sys-utils/setpriv.c:645
#: sys-utils/swapon.c:382 sys-utils/swapon.c:525 sys-utils/switch_root.c:174
-#: sys-utils/unshare.c:113 sys-utils/unshare.c:128 sys-utils/wdctl.c:417
-#: sys-utils/zramctl.c:517 term-utils/agetty.c:3000 term-utils/mesg.c:154
+#: sys-utils/unshare.c:115 sys-utils/unshare.c:130 sys-utils/wdctl.c:417
+#: sys-utils/zramctl.c:517 term-utils/agetty.c:3013 term-utils/mesg.c:154
#: term-utils/script.c:386 term-utils/scriptlive.c:256
#: term-utils/scriptlive.c:259 term-utils/scriptlive.c:262
#: term-utils/scriptreplay.c:281 term-utils/scriptreplay.c:284
#: term-utils/scriptreplay.c:287 term-utils/scriptreplay.c:290
-#: term-utils/wall.c:421 text-utils/colcrt.c:284 text-utils/more.c:460
-#: text-utils/rev.c:140 text-utils/ul.c:637
+#: term-utils/wall.c:353 text-utils/colcrt.c:284 text-utils/more.c:459
+#: text-utils/rev.c:165 text-utils/ul.c:637
#, c-format
msgid "cannot open %s"
msgstr "打不开 %s"
msgid "invalid start argument"
msgstr "无效的 起点 参数"
-#: disk-utils/addpart.c:62 disk-utils/resizepart.c:111
+#: disk-utils/addpart.c:62 disk-utils/resizepart.c:111 misc-utils/fadvise.c:115
msgid "invalid length argument"
msgstr "无效的长度参数"
msgid "get filesystem readahead"
msgstr "获取 文件系统 readahead"
-#: disk-utils/blockdev.c:174
+#: disk-utils/blockdev.c:176
+#, fuzzy
+#| msgid "disk serial number"
+msgid "get disk sequence number"
+msgstr "磁盘序列号"
+
+#: disk-utils/blockdev.c:180
msgid "flush buffers"
msgstr "刷新缓存"
-#: disk-utils/blockdev.c:178
+#: disk-utils/blockdev.c:184
msgid "reread partition table"
msgstr "重新读取分区表"
-#: disk-utils/blockdev.c:188
+#: disk-utils/blockdev.c:194
#, c-format
msgid ""
" %1$s [-v|-q] commands devices\n"
" %1$s --report [设备]\n"
" %1$s -h|-V\n"
-#: disk-utils/blockdev.c:194
+#: disk-utils/blockdev.c:200
msgid "Call block device ioctls from the command line."
msgstr "从命令行调用块设备 ioctls。"
-#: disk-utils/blockdev.c:197
+#: disk-utils/blockdev.c:203
msgid " -q quiet mode"
msgstr " -q 安静模式"
-#: disk-utils/blockdev.c:198
+#: disk-utils/blockdev.c:204
msgid " -v verbose mode"
msgstr " -v 详尽模式"
-#: disk-utils/blockdev.c:199
+#: disk-utils/blockdev.c:205
msgid " --report print report for specified (or all) devices"
msgstr " --report 输出指定(或全部)设备的报告"
-#: disk-utils/blockdev.c:204
+#: disk-utils/blockdev.c:210
msgid "Available commands:"
msgstr "可用命令:"
-#: disk-utils/blockdev.c:205
+#: disk-utils/blockdev.c:211
#, c-format
msgid " %-25s get size in 512-byte sectors\n"
msgstr " %-25s 获得 512-字节扇区的大小\n"
-#: disk-utils/blockdev.c:287 disk-utils/fdformat.c:219
+#: disk-utils/blockdev.c:293 disk-utils/fdformat.c:219
#: disk-utils/fsck.minix.c:1336 disk-utils/isosize.c:155
-#: disk-utils/mkfs.bfs.c:175 disk-utils/mkfs.c:110 disk-utils/mkfs.minix.c:827
-#: disk-utils/swaplabel.c:180 misc-utils/wipefs.c:760
-#: sys-utils/blkdiscard.c:219 sys-utils/blkzone.c:487 sys-utils/tunelp.c:241
-#: sys-utils/zramctl.c:716 sys-utils/zramctl.c:742
+#: disk-utils/mkfs.bfs.c:191 disk-utils/mkfs.c:110 disk-utils/mkfs.minix.c:827
+#: disk-utils/swaplabel.c:180 misc-utils/wipefs.c:764
+#: sys-utils/blkdiscard.c:237 sys-utils/blkpr.c:303 sys-utils/blkzone.c:495
+#: sys-utils/tunelp.c:241 sys-utils/zramctl.c:716 sys-utils/zramctl.c:742
msgid "no device specified"
msgstr "未指定设备"
-#: disk-utils/blockdev.c:329
+#: disk-utils/blockdev.c:335
msgid "could not get device size"
msgstr "无法获取设备大小"
-#: disk-utils/blockdev.c:335
+#: disk-utils/blockdev.c:341
#, c-format
msgid "Unknown command: %s"
msgstr "未知命令: %s"
-#: disk-utils/blockdev.c:351
+#: disk-utils/blockdev.c:357
#, c-format
msgid "%s requires an argument"
msgstr "%s 需要一个参数"
-#: disk-utils/blockdev.c:355
-#, fuzzy
-#| msgid "failed to parse argument"
+#: disk-utils/blockdev.c:361
msgid "failed to parse command argument"
-msgstr "解析参数失败"
+msgstr "解æ\9e\90å\91½ä»¤å\8f\82æ\95°å¤±è´¥"
-#: disk-utils/blockdev.c:386 disk-utils/blockdev.c:498
+#: disk-utils/blockdev.c:392 disk-utils/blockdev.c:504
#, c-format
msgid "ioctl error on %s"
msgstr "%s ioctl 出错"
-#: disk-utils/blockdev.c:388
+#: disk-utils/blockdev.c:394
#, c-format
msgid "%s failed.\n"
msgstr "%s 失败。\n"
-#: disk-utils/blockdev.c:395
+#: disk-utils/blockdev.c:401
#, c-format
msgid "%s succeeded.\n"
msgstr "%s 成功。\n"
#. TRANSLATORS: Start sector not available. Max. 15 letters.
-#: disk-utils/blockdev.c:482
+#: disk-utils/blockdev.c:488
msgid "N/A"
msgstr "N/A"
-#: disk-utils/blockdev.c:506
-#, fuzzy, c-format
-#| msgid "RO RA SSZ BSZ StartSec Size Device\n"
+#: disk-utils/blockdev.c:512
+#, c-format
msgid "RO RA SSZ BSZ StartSec Size Device\n"
-msgstr "RO RA SSZ BSZ 开始段 大小 设备\n"
+msgstr "RO RA SSZ BSZ 开始段 大小 设备\n"
-#: disk-utils/cfdisk.c:196
+#: disk-utils/cfdisk.c:198
msgid "Bootable"
msgstr "可启动"
-#: disk-utils/cfdisk.c:196
+#: disk-utils/cfdisk.c:198
msgid "Toggle bootable flag of the current partition"
msgstr "开关当前分区的 可启动 标志"
-#: disk-utils/cfdisk.c:197
+#: disk-utils/cfdisk.c:199
msgid "Delete"
msgstr "删除"
-#: disk-utils/cfdisk.c:197
+#: disk-utils/cfdisk.c:199
msgid "Delete the current partition"
msgstr "删除当前分区"
-#: disk-utils/cfdisk.c:198
+#: disk-utils/cfdisk.c:200
msgid "Resize"
msgstr "更改尺寸"
-#: disk-utils/cfdisk.c:198
+#: disk-utils/cfdisk.c:200
msgid "Reduce or enlarge the current partition"
msgstr "减小或扩大当前分区"
-#: disk-utils/cfdisk.c:199
+#: disk-utils/cfdisk.c:201
msgid "New"
msgstr "新建"
-#: disk-utils/cfdisk.c:199
+#: disk-utils/cfdisk.c:201
msgid "Create new partition from free space"
msgstr "在剩余空间上创建新分区"
-#: disk-utils/cfdisk.c:200
+#: disk-utils/cfdisk.c:202
msgid "Quit"
msgstr "退出"
-#: disk-utils/cfdisk.c:200
+#: disk-utils/cfdisk.c:202
msgid "Quit program without writing changes"
msgstr "退出程序而不写入更改"
-#: disk-utils/cfdisk.c:201 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1031
-#: libfdisk/src/dos.c:2809 libfdisk/src/gpt.c:3218 libfdisk/src/sgi.c:1165
+#: disk-utils/cfdisk.c:203 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1031
+#: libfdisk/src/dos.c:2809 libfdisk/src/gpt.c:3248 libfdisk/src/sgi.c:1165
#: libfdisk/src/sun.c:1136
msgid "Type"
msgstr "类型"
-#: disk-utils/cfdisk.c:201
+#: disk-utils/cfdisk.c:203
msgid "Change the partition type"
msgstr "更改分区类型"
-#: disk-utils/cfdisk.c:202
+#: disk-utils/cfdisk.c:204
msgid "Help"
msgstr "帮助"
-#: disk-utils/cfdisk.c:202
+#: disk-utils/cfdisk.c:204
msgid "Print help screen"
msgstr "打印帮助界面"
-#: disk-utils/cfdisk.c:203
+#: disk-utils/cfdisk.c:205
msgid "Sort"
msgstr "排序"
-#: disk-utils/cfdisk.c:203
+#: disk-utils/cfdisk.c:205
msgid "Fix partitions order"
msgstr "修复分区顺序"
-#: disk-utils/cfdisk.c:204
+#: disk-utils/cfdisk.c:206
msgid "Write"
msgstr "写入"
-#: disk-utils/cfdisk.c:204
+#: disk-utils/cfdisk.c:206
msgid "Write partition table to disk (this might destroy data)"
msgstr "将分区表写入磁盘(可能损坏数据)"
-#: disk-utils/cfdisk.c:205
+#: disk-utils/cfdisk.c:207
msgid "Dump"
msgstr "转储"
-#: disk-utils/cfdisk.c:205
+#: disk-utils/cfdisk.c:207
msgid "Dump partition table to sfdisk compatible script file"
msgstr "将分区表转储到与 sfdisk 兼容的脚本文件"
-#: disk-utils/cfdisk.c:650 disk-utils/fdisk.c:465
+#: disk-utils/cfdisk.c:652 disk-utils/fdisk.c:465
#, c-format
msgid "internal error: unsupported dialog type %d"
msgstr "内部错误:不支持的对话类型 %d"
-#: disk-utils/cfdisk.c:1316
+#: disk-utils/cfdisk.c:1318
#, c-format
msgid "%s (mounted)"
msgstr "%s (已挂载)"
-#: disk-utils/cfdisk.c:1364
+#: disk-utils/cfdisk.c:1366
msgid "Partition name:"
msgstr "分区名:"
-#: disk-utils/cfdisk.c:1371
+#: disk-utils/cfdisk.c:1373
msgid "Partition UUID:"
msgstr "分区 UUID:"
-#: disk-utils/cfdisk.c:1390
+#: disk-utils/cfdisk.c:1392
msgid "Partition type:"
msgstr "分区类型:"
-#: disk-utils/cfdisk.c:1397
+#: disk-utils/cfdisk.c:1399
msgid "Attributes:"
msgstr "属性:"
-#: disk-utils/cfdisk.c:1421
+#: disk-utils/cfdisk.c:1423
msgid "Filesystem UUID:"
msgstr "文件系统 UUID:"
-#: disk-utils/cfdisk.c:1428
+#: disk-utils/cfdisk.c:1430
msgid "Filesystem LABEL:"
msgstr "文件系统标签:"
-#: disk-utils/cfdisk.c:1434
+#: disk-utils/cfdisk.c:1436
msgid "Filesystem:"
msgstr "文件系统:"
-#: disk-utils/cfdisk.c:1439
+#: disk-utils/cfdisk.c:1441
msgid "Mountpoint:"
msgstr "挂载点:"
-#: disk-utils/cfdisk.c:1783
+#: disk-utils/cfdisk.c:1785
#, c-format
msgid "Disk: %s"
msgstr "磁盘:%s"
-#: disk-utils/cfdisk.c:1785
+#: disk-utils/cfdisk.c:1787
#, c-format
msgid "Size: %s, %<PRIu64> bytes, %ju sectors"
msgstr "尺寸:%s,%<PRIu64> 字节,%ju 个扇区"
-#: disk-utils/cfdisk.c:1788
+#: disk-utils/cfdisk.c:1790
#, c-format
msgid "Label: %s, identifier: %s"
msgstr "标签:%s,标识符:%s"
-#: disk-utils/cfdisk.c:1791
+#: disk-utils/cfdisk.c:1793
#, c-format
msgid "Label: %s"
msgstr "标签:%s"
-#: disk-utils/cfdisk.c:1942
+#: disk-utils/cfdisk.c:1944
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:1948
+#: disk-utils/cfdisk.c:1950
msgid "Please, specify size."
msgstr "请指定文件大小。"
-#: disk-utils/cfdisk.c:1970
+#: disk-utils/cfdisk.c:1972
#, c-format
msgid "Minimum size is %<PRIu64> bytes."
msgstr "最小尺寸为 %<PRIu64> 字节。"
-#: disk-utils/cfdisk.c:1979
+#: disk-utils/cfdisk.c:1981
#, c-format
msgid "Maximum size is %<PRIu64> bytes."
msgstr "最大尺寸为 %<PRIu64> 字节。"
-#: disk-utils/cfdisk.c:1986
+#: disk-utils/cfdisk.c:1988
msgid "Failed to parse size."
msgstr "解析大小失败。"
-#: disk-utils/cfdisk.c:2044
+#: disk-utils/cfdisk.c:2046
msgid "Select partition type"
msgstr "选择分区类型"
-#: disk-utils/cfdisk.c:2094 disk-utils/cfdisk.c:2124
+#: disk-utils/cfdisk.c:2096 disk-utils/cfdisk.c:2126
msgid "Enter script file name: "
msgstr "输入脚本文件名:"
-#: disk-utils/cfdisk.c:2095
+#: disk-utils/cfdisk.c:2097
msgid "The script file will be applied to in-memory partition table."
msgstr "该脚本文件将应用于内存中的分区表。"
-#: disk-utils/cfdisk.c:2104 disk-utils/cfdisk.c:2146
-#: disk-utils/fdisk-menu.c:482 disk-utils/fdisk-menu.c:526
+#: disk-utils/cfdisk.c:2106 disk-utils/cfdisk.c:2148
+#: disk-utils/fdisk-menu.c:484 disk-utils/fdisk-menu.c:528
#, c-format
msgid "Cannot open %s"
msgstr "无法打开 %s"
-#: disk-utils/cfdisk.c:2106 disk-utils/fdisk-menu.c:484
+#: disk-utils/cfdisk.c:2108 disk-utils/fdisk-menu.c:486
#, c-format
msgid "Failed to parse script file %s"
msgstr "解析脚本文件 %s 失败"
-#: disk-utils/cfdisk.c:2108 disk-utils/fdisk-menu.c:486
+#: disk-utils/cfdisk.c:2110 disk-utils/fdisk-menu.c:488
#, c-format
msgid "Failed to apply script %s"
msgstr "应用脚本文件 %s 失败"
-#: disk-utils/cfdisk.c:2125
+#: disk-utils/cfdisk.c:2127
msgid "The current in-memory partition table will be dumped to the file."
msgstr "当前的内存中分区表将转储到该文件中。"
-#: disk-utils/cfdisk.c:2133 disk-utils/fdisk-menu.c:514
+#: disk-utils/cfdisk.c:2135 disk-utils/fdisk-menu.c:516
msgid "Failed to allocate script handler"
msgstr "分配脚本处理程序失败"
-#: disk-utils/cfdisk.c:2139
+#: disk-utils/cfdisk.c:2141
msgid "Failed to read disk layout into script."
msgstr "将磁盘布局读入脚本出错。"
-#: disk-utils/cfdisk.c:2153
+#: disk-utils/cfdisk.c:2155
msgid "Disk layout successfully dumped."
msgstr "成功转储了磁盘布局。"
-#: disk-utils/cfdisk.c:2156 disk-utils/fdisk-menu.c:532
+#: disk-utils/cfdisk.c:2158 disk-utils/fdisk-menu.c:534
#, c-format
msgid "Failed to write script %s"
msgstr "写脚本文件 %s 失败"
-#: disk-utils/cfdisk.c:2192
+#: disk-utils/cfdisk.c:2194
msgid "Select label type"
msgstr "选择标签类型"
-#: disk-utils/cfdisk.c:2195 disk-utils/fdisk.c:1162 disk-utils/fdisk-menu.c:490
+#: disk-utils/cfdisk.c:2197 disk-utils/fdisk.c:1162 disk-utils/fdisk-menu.c:492
msgid "Device does not contain a recognized partition table."
msgstr "设备不包含可识别的分区表。"
-#: disk-utils/cfdisk.c:2203
-#, fuzzy
-#| msgid "Select a type to create a new label or press 'L' to load script file."
+#: disk-utils/cfdisk.c:2205
msgid "Select a type to create a new label, press 'L' to load script file, 'Q' quits."
-msgstr "é\80\89æ\8b©ä¸\80ç§\8dç±»å\9e\8bæ\9d¥å\88\9b建æ\96°æ \87ç¾ï¼\8cæ\88\96æ\8c\89â\80\9cLâ\80\9då\8a è½½è\84\9aæ\9c¬æ\96\87件。"
+msgstr "é\80\89æ\8b©ä¸\80ç§\8dç±»å\9e\8bæ\9d¥å\88\9b建æ\96°æ \87ç¾ï¼\8cæ\8c\89â\80\9cLâ\80\9då\8a è½½è\84\9aæ\9c¬æ\96\87件ï¼\8cæ\8c\89â\80\9cQâ\80\9dé\80\80å\87º。"
# 以下三句连贯,一起翻译
-#: disk-utils/cfdisk.c:2252
+#: disk-utils/cfdisk.c:2254
msgid "This is cfdisk, a curses-based disk partitioning program."
msgstr "这是 cfdisk,一款基于 curses 的磁盘分区程序。"
-#: disk-utils/cfdisk.c:2253
+#: disk-utils/cfdisk.c:2255
msgid "It lets you create, delete, and modify partitions on a block device."
msgstr "可以创建、删除和修改块设备上的分区。"
# 以下两条注意对齐
-#: disk-utils/cfdisk.c:2255
+#: disk-utils/cfdisk.c:2257
msgid "Command Meaning"
msgstr "命令 意义"
-#: disk-utils/cfdisk.c:2256
+#: disk-utils/cfdisk.c:2258
msgid "------- -------"
msgstr "------- -------"
-#: disk-utils/cfdisk.c:2257
+#: disk-utils/cfdisk.c:2259
msgid " b Toggle bootable flag of the current partition"
msgstr " b 切换当前分区的 可启动 标志"
-#: disk-utils/cfdisk.c:2258
+#: disk-utils/cfdisk.c:2260
msgid " d Delete the current partition"
msgstr " d 删除当前分区"
-#: disk-utils/cfdisk.c:2259
+#: disk-utils/cfdisk.c:2261
msgid " h Print this screen"
msgstr " h 打印此屏幕"
-#: disk-utils/cfdisk.c:2260
+#: disk-utils/cfdisk.c:2262
msgid " n Create new partition from free space"
msgstr " n 从空闲空间创建新分区"
-#: disk-utils/cfdisk.c:2261
+#: disk-utils/cfdisk.c:2263
msgid " q Quit program without writing partition table"
msgstr " q 退出程序但不写入分区表"
-#: disk-utils/cfdisk.c:2262
+#: disk-utils/cfdisk.c:2264
msgid " r Reduce or enlarge the current partition"
msgstr " r 减小或扩大当前分区"
-#: disk-utils/cfdisk.c:2263
+#: disk-utils/cfdisk.c:2265
msgid " s Fix partitions order (only when in disarray)"
msgstr " s 修复分区顺序(仅磁盘阵列)"
-#: disk-utils/cfdisk.c:2264
+#: disk-utils/cfdisk.c:2266
msgid " t Change the partition type"
msgstr " t 更改分区类型"
-#: disk-utils/cfdisk.c:2265
+#: disk-utils/cfdisk.c:2267
msgid " u Dump disk layout to sfdisk compatible script file"
msgstr " u 将磁盘布局转储到兼容 sfdisk 的脚本文件"
-#: disk-utils/cfdisk.c:2266
+#: disk-utils/cfdisk.c:2268
msgid " W Write partition table to disk (you must enter uppercase W);"
msgstr " W 将分区表写入磁盘(必须输入大写 W);"
-#: disk-utils/cfdisk.c:2267
+#: disk-utils/cfdisk.c:2269
msgid " since this might destroy data on the disk, you must either"
msgstr " 由于这可能破坏磁盘上的数据,您必须"
-#: disk-utils/cfdisk.c:2268
+#: disk-utils/cfdisk.c:2270
msgid " confirm or deny the write by entering 'yes' or 'no'"
msgstr " 通过输入“yes”或“no”来确认或拒绝"
-#: disk-utils/cfdisk.c:2269
+#: disk-utils/cfdisk.c:2271
msgid " x Display/hide extra information about a partition"
msgstr " x 显示/隐藏分区的额外信息"
-#: disk-utils/cfdisk.c:2270
+#: disk-utils/cfdisk.c:2272
msgid "Up Arrow Move cursor to the previous partition"
msgstr "上箭头 光标移到上一分区"
-#: disk-utils/cfdisk.c:2271
+#: disk-utils/cfdisk.c:2273
msgid "Down Arrow Move cursor to the next partition"
msgstr "下箭头 光标移到下一分区"
-#: disk-utils/cfdisk.c:2272
+#: disk-utils/cfdisk.c:2274
msgid "Left Arrow Move cursor to the previous menu item"
msgstr "上箭头 光标移到上一菜单项"
-#: disk-utils/cfdisk.c:2273
+#: disk-utils/cfdisk.c:2275
msgid "Right Arrow Move cursor to the next menu item"
msgstr "下箭头 光标移到下一菜单项"
-#: disk-utils/cfdisk.c:2275
+#: disk-utils/cfdisk.c:2277
msgid "Note: All of the commands can be entered with either upper or lower"
msgstr "注:所有命令均可以大写或小写"
-#: disk-utils/cfdisk.c:2276
+#: disk-utils/cfdisk.c:2278
msgid "case letters (except for Write)."
msgstr "字母输入(除了 写入)。"
-#: disk-utils/cfdisk.c:2278
+#: disk-utils/cfdisk.c:2280
msgid "Use lsblk(8) or partx(8) to see more details about the device."
msgstr "使用 lsblk(8) 或 partx(8) 了解有关磁盘的更多细节。"
-#: disk-utils/cfdisk.c:2288 disk-utils/cfdisk.c:2591
+#: disk-utils/cfdisk.c:2290 disk-utils/cfdisk.c:2593
msgid "Press a key to continue."
msgstr "按下一个键继续。"
-#: disk-utils/cfdisk.c:2374
+#: disk-utils/cfdisk.c:2376
msgid "Could not toggle the flag."
msgstr "无法切换标志。"
-#: disk-utils/cfdisk.c:2384
+#: disk-utils/cfdisk.c:2386
#, c-format
msgid "Could not delete partition %zu."
msgstr "无法删除分区 %zu。"
-#: disk-utils/cfdisk.c:2386 disk-utils/fdisk-menu.c:659
+#: disk-utils/cfdisk.c:2388 disk-utils/fdisk-menu.c:661
#, c-format
msgid "Partition %zu has been deleted."
msgstr "分区 %zu 已删除。"
-#: disk-utils/cfdisk.c:2407
+#: disk-utils/cfdisk.c:2409
msgid "Partition size: "
msgstr "分区大小:"
-#: disk-utils/cfdisk.c:2448
+#: disk-utils/cfdisk.c:2450
#, c-format
msgid "Changed type of partition %zu."
msgstr "已更改分区 %zu 的类型。"
-#: disk-utils/cfdisk.c:2450
+#: disk-utils/cfdisk.c:2452
#, c-format
msgid "The type of partition %zu is unchanged."
msgstr "分区 %zu 的类型未更改。"
-#: disk-utils/cfdisk.c:2471
+#: disk-utils/cfdisk.c:2473
msgid "New size: "
msgstr "新大小:"
-#: disk-utils/cfdisk.c:2486
+#: disk-utils/cfdisk.c:2488
#, c-format
msgid "Partition %zu resized."
msgstr "已调整分区 %zu 的大小。"
-#: disk-utils/cfdisk.c:2504 disk-utils/fdisk.c:1138 disk-utils/fdisk-menu.c:593
+#: disk-utils/cfdisk.c:2506 disk-utils/fdisk.c:1138 disk-utils/fdisk-menu.c:595
msgid "Device is open in read-only mode."
msgstr "设备以只读方式打开。"
-#: disk-utils/cfdisk.c:2509
+#: disk-utils/cfdisk.c:2511
msgid "Are you sure you want to write the partition table to disk? "
msgstr "您确定想将分区表写入磁盘吗?"
-#: disk-utils/cfdisk.c:2511
+#: disk-utils/cfdisk.c:2513
msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog."
msgstr "输入“yes”或“no”或按 ESC 取消对话框。"
-#: disk-utils/cfdisk.c:2516 login-utils/lslogins.c:219 sys-utils/lscpu.c:325
+#: disk-utils/cfdisk.c:2518 login-utils/lslogins.c:219 sys-utils/lscpu.c:339
#: sys-utils/lsmem.c:266
msgid "yes"
msgstr "是"
-#: disk-utils/cfdisk.c:2517
+#: disk-utils/cfdisk.c:2519
msgid "Did not write partition table to disk."
msgstr "未将分区表写入磁盘。"
-#: disk-utils/cfdisk.c:2522
+#: disk-utils/cfdisk.c:2524
msgid "Failed to write disklabel."
msgstr "写磁盘标签失败。"
-#: disk-utils/cfdisk.c:2528 disk-utils/fdisk-menu.c:600
+#: disk-utils/cfdisk.c:2530 disk-utils/fdisk-menu.c:602
msgid "The partition table has been altered."
msgstr "分区表已调整。"
-#: disk-utils/cfdisk.c:2551 disk-utils/cfdisk.c:2626
+#: disk-utils/cfdisk.c:2553 disk-utils/cfdisk.c:2628
msgid "Note that partition table entries are not in disk order now."
msgstr "注意,现在分区表记录没有按磁盘顺序。"
-#: disk-utils/cfdisk.c:2588
+#: disk-utils/cfdisk.c:2590
#, c-format
msgid "Device already contains a %s signature; it will be removed by a write command."
msgstr "设备已包含一个 %s 签名;写入命令会将其移除。"
-#: disk-utils/cfdisk.c:2600
+#: disk-utils/cfdisk.c:2602
msgid "failed to create a new disklabel"
msgstr "创建新磁盘标签失败"
-#: disk-utils/cfdisk.c:2609
+#: disk-utils/cfdisk.c:2611
msgid "failed to read partitions"
msgstr "读分区失败"
-#: disk-utils/cfdisk.c:2622
+#: disk-utils/cfdisk.c:2624
msgid "Device is open in read-only mode. Changes will remain in memory only."
msgstr "设备以只读方式打开。修改将仅停留在内存中。"
-#: disk-utils/cfdisk.c:2624
+#: disk-utils/cfdisk.c:2626
msgid "Device is currently in use, repartitioning is probably a bad idea."
msgstr "设备正在被使用,不建议您重新分区。"
-#: disk-utils/cfdisk.c:2710
+#: disk-utils/cfdisk.c:2712
#, c-format
msgid " %1$s [options] <disk>\n"
msgstr " %1$s [选项] <磁盘>\n"
-#: disk-utils/cfdisk.c:2713 disk-utils/fdisk.c:855 disk-utils/sfdisk.c:2043
+#: disk-utils/cfdisk.c:2715 disk-utils/fdisk.c:855 disk-utils/sfdisk.c:2044
msgid "Display or manipulate a disk partition table.\n"
msgstr "显示或操作磁盘分区表。\n"
-#: disk-utils/cfdisk.c:2717
+#: disk-utils/cfdisk.c:2719
#, c-format
msgid " -L, --color[=<when>] colorize output (%s, %s or %s)\n"
msgstr " -L, --color[=<时机>] 彩色输出(%s, %s 或 %s)\n"
-#: disk-utils/cfdisk.c:2720
+#: disk-utils/cfdisk.c:2722
msgid " -z, --zero start with zeroed partition table\n"
msgstr " -z, --zero 以空分区表开始\n"
-#: disk-utils/cfdisk.c:2722
+#: disk-utils/cfdisk.c:2724
#, c-format
msgid " --lock[=<mode>] use exclusive device lock (%s, %s or %s)\n"
msgstr " --lock[=<模式>] 使用独占设备锁(%s、%s 或 %s)\n"
-#: disk-utils/cfdisk.c:2723
+#: disk-utils/cfdisk.c:2725
msgid " -r, --read-only forced open cfdisk in read-only mode\n"
msgstr " -r, --read-only 强制以只读模式打开 cfdisk\n"
-#: disk-utils/cfdisk.c:2766 disk-utils/fdisk.c:1014 disk-utils/sfdisk.c:2349
-#: misc-utils/cal.c:426 sys-utils/dmesg.c:1497 text-utils/hexdump.c:121
+#: disk-utils/cfdisk.c:2768 disk-utils/fdisk.c:1014 disk-utils/sfdisk.c:2350
+#: misc-utils/cal.c:421 sys-utils/dmesg.c:1499 text-utils/hexdump.c:114
msgid "unsupported color mode"
msgstr "不支持的颜色模式"
-#: disk-utils/cfdisk.c:2796 disk-utils/fdisk.c:949 disk-utils/sfdisk.c:232
+#: disk-utils/cfdisk.c:2798 disk-utils/fdisk.c:949 disk-utils/sfdisk.c:232
msgid "failed to allocate libfdisk context"
msgstr "分配 libfdisk 环境(context)失败"
"将继续 ... "
#: disk-utils/fdformat.c:146 disk-utils/fsck.minix.c:183
-#: disk-utils/swaplabel.c:123 misc-utils/wipefs.c:629 sys-utils/blkdiscard.c:89
-#: sys-utils/tunelp.c:95
+#: disk-utils/swaplabel.c:123 misc-utils/wipefs.c:633 sys-utils/blkdiscard.c:92
+#: sys-utils/blkpr.c:213 sys-utils/tunelp.c:95
#, c-format
msgid " %s [options] <device>\n"
msgstr " %s [选项] <设备>\n"
msgstr "无效参数 - repair"
#: disk-utils/fdformat.c:223 disk-utils/fsck.cramfs.c:162
-#: disk-utils/mkfs.bfs.c:182 disk-utils/mkfs.cramfs.c:339
-#: disk-utils/mkfs.cramfs.c:760 disk-utils/mkfs.cramfs.c:798
-#: disk-utils/mkfs.minix.c:835 disk-utils/mkswap.c:351 disk-utils/partx.c:959
-#: login-utils/last.c:709 login-utils/utmpdump.c:145 misc-utils/namei.c:135
-#: misc-utils/rename.c:138 misc-utils/rename.c:203 sys-utils/blkdiscard.c:233
+#: disk-utils/mkfs.bfs.c:198 disk-utils/mkfs.cramfs.c:341
+#: disk-utils/mkfs.cramfs.c:763 disk-utils/mkfs.cramfs.c:809
+#: disk-utils/mkfs.minix.c:835 disk-utils/mkswap.c:374 disk-utils/partx.c:959
+#: login-utils/last.c:697 login-utils/utmpdump.c:145 misc-utils/namei.c:146
+#: misc-utils/rename.c:164 misc-utils/rename.c:229 sys-utils/blkdiscard.c:251
#: sys-utils/blkzone.c:147 sys-utils/dmesg.c:543 sys-utils/fallocate.c:201
-#: sys-utils/fsfreeze.c:119 sys-utils/fstrim.c:77 sys-utils/nsenter.c:181
+#: sys-utils/fsfreeze.c:119 sys-utils/fstrim.c:78 sys-utils/nsenter.c:187
#: sys-utils/swapon.c:530 sys-utils/switch_root.c:93
#: sys-utils/switch_root.c:134 sys-utils/switch_root.c:139
-#: sys-utils/unshare.c:209 term-utils/mesg.c:144 term-utils/mesg.c:156
-#: text-utils/more.c:464
+#: sys-utils/unshare.c:211 term-utils/mesg.c:144 term-utils/mesg.c:156
+#: text-utils/more.c:463
#, c-format
msgid "stat of %s failed"
msgstr "对 %s stat 失败"
-#: disk-utils/fdformat.c:226 disk-utils/partx.c:1018 misc-utils/lsblk.c:1578
-#: sys-utils/blkdiscard.c:235 sys-utils/blkzone.c:149
+#: disk-utils/fdformat.c:226 disk-utils/partx.c:1019 misc-utils/lsblk.c:1663
+#: sys-utils/blkdiscard.c:253 sys-utils/blkzone.c:149
#: sys-utils/mountpoint.c:109
#, c-format
msgid "%s: not a block device"
msgid "user defined start track exceeds the user defined end track"
msgstr "用户定义的起始磁道超过了定义的终止磁道"
-#: disk-utils/fdformat.c:253 misc-utils/logger.c:1032
+#: disk-utils/fdformat.c:253 misc-utils/logger.c:1050
msgid "close failed"
msgstr "关闭失败"
msgstr "将使用默认回应 %c。"
#: disk-utils/fdisk.c:224 disk-utils/fdisk.c:298 disk-utils/fdisk.c:375
-#: libfdisk/src/dos.c:1465 libfdisk/src/gpt.c:2544
+#: libfdisk/src/dos.c:1465 libfdisk/src/gpt.c:2574
msgid "Value out of range."
msgstr "值超出范围。"
msgstr "不能读"
#: disk-utils/fdisk.c:788 libfdisk/src/bsd.c:258 libfdisk/src/dos.c:1050
-#: libfdisk/src/gpt.c:2464
+#: libfdisk/src/gpt.c:2494
msgid "First sector"
msgstr "第一个扇区"
msgstr "旧签名 %s 可能仍然在设备上存留。建议您使用 wipefs(8) 或者 fdisk --wipe 来擦除该设备,以避免潜在的冲突。"
#: disk-utils/fdisk.c:850
-#, fuzzy, c-format
-#| msgid ""
-#| " %1$s [options] <disk> change partition table\n"
-#| " %1$s [options] -l [<disk>] list partition table(s)\n"
+#, c-format
msgid ""
" %1$s [options] <disk> change partition table\n"
" %1$s [options] -l [<disk>...] list partition table(s)\n"
msgstr ""
" %1$s [选项] <磁盘> 更改分区表\n"
-" %1$s [选项] -l [<磁盘>] 列出分区表\n"
+" %1$s [选项] -l [<磁盘>...] 列出分区表\n"
#: disk-utils/fdisk.c:858
msgid " -b, --sector-size <size> physical and logical sector size\n"
msgstr " -l, --list 显示分区并退出\n"
#: disk-utils/fdisk.c:866
-#, fuzzy
-#| msgid " -l, --list [<dev> ...] list partitions of each device\n"
msgid " -x, --list-details like --list but with more details\n"
-msgstr " -l, --list [<设备> ...] 列出每台设备上的分区\n"
+msgstr " -x, --list-details 类似 --list 但提供更多细节\n"
#: disk-utils/fdisk.c:868
msgid " -n, --noauto-pt don't create default partition table on empty devices\n"
msgid " -w, --wipe <mode> wipe signatures (%s, %s or %s)\n"
msgstr " -w, --wipe <模式> 擦除签名(%s, %s 或 %s)\n"
-#: disk-utils/fdisk.c:879 disk-utils/sfdisk.c:2098
+#: disk-utils/fdisk.c:879 disk-utils/sfdisk.c:2099
#, c-format
msgid " -W, --wipe-partitions <mode> wipe signatures from new partitions (%s, %s or %s)\n"
msgstr " -W, --wipe-partitions <模式> 擦除新分区的签名(%s, %s 或 %s)\n"
msgid "unsupported unit"
msgstr "不支持的单位"
-#: disk-utils/fdisk.c:1050 disk-utils/fdisk.c:1055 disk-utils/sfdisk.c:2310
-#: disk-utils/sfdisk.c:2315
+#: disk-utils/fdisk.c:1050 disk-utils/fdisk.c:1055 disk-utils/sfdisk.c:2311
+#: disk-utils/sfdisk.c:2316
msgid "unsupported wipe mode"
msgstr "不支持的擦除模式"
msgid "The device properties (sector size and geometry) should be used with one specified device only."
msgstr "设备属性(扇区大小和几何属性)只能用于某个指定的设备。"
-#: disk-utils/fdisk.c:1107 disk-utils/fdisk.c:1122 disk-utils/fsck.cramfs.c:703
-#: disk-utils/mkfs.bfs.c:192 disk-utils/mkfs.cramfs.c:788
+#: disk-utils/fdisk.c:1107 disk-utils/fdisk.c:1122 disk-utils/fsck.cramfs.c:723
+#: disk-utils/mkfs.bfs.c:211 disk-utils/mkfs.cramfs.c:799
#: disk-utils/partx.c:975 disk-utils/raw.c:136 disk-utils/raw.c:149
-#: disk-utils/raw.c:161 disk-utils/raw.c:202 misc-utils/cal.c:524
-#: misc-utils/findfs.c:58 misc-utils/look.c:147 misc-utils/whereis.c:580
-#: misc-utils/whereis.c:591 misc-utils/whereis.c:602 misc-utils/whereis.c:644
-#: schedutils/chrt.c:442 schedutils/ionice.c:264 schedutils/taskset.c:188
-#: sys-utils/chcpu.c:355 sys-utils/chmem.c:429 sys-utils/dmesg.c:1580
-#: sys-utils/ipcmk.c:143 sys-utils/ldattach.c:321 sys-utils/losetup.c:916
-#: sys-utils/lscpu.c:1318 sys-utils/lsmem.c:656 sys-utils/mount.c:877
-#: sys-utils/mount.c:885 sys-utils/mount.c:932 sys-utils/mount.c:945
-#: sys-utils/mount.c:1017 sys-utils/mountpoint.c:191 sys-utils/pivot_root.c:71
-#: sys-utils/swapoff.c:258 sys-utils/swapon.c:1006 sys-utils/switch_root.c:270
-#: sys-utils/umount.c:620 term-utils/setterm.c:1197 text-utils/col.c:584
-#: text-utils/more.c:2094
+#: disk-utils/raw.c:161 disk-utils/raw.c:202 misc-utils/cal.c:525
+#: misc-utils/findfs.c:58 misc-utils/look.c:147 misc-utils/whereis.c:592
+#: misc-utils/whereis.c:603 misc-utils/whereis.c:614 misc-utils/whereis.c:659
+#: schedutils/chrt.c:442 schedutils/ionice.c:264 schedutils/taskset.c:207
+#: sys-utils/chcpu.c:355 sys-utils/chmem.c:429 sys-utils/dmesg.c:1579
+#: sys-utils/ipcmk.c:143 sys-utils/ldattach.c:321 sys-utils/losetup.c:918
+#: sys-utils/lscpu.c:1350 sys-utils/lsmem.c:656 sys-utils/mount.c:867
+#: sys-utils/mount.c:875 sys-utils/mount.c:924 sys-utils/mount.c:937
+#: sys-utils/mount.c:1009 sys-utils/mountpoint.c:191 sys-utils/pivot_root.c:71
+#: sys-utils/swapoff.c:258 sys-utils/swapon.c:1011 sys-utils/switch_root.c:270
+#: sys-utils/umount.c:629 term-utils/setterm.c:1197 text-utils/col.c:584
+#: text-utils/more.c:2096
msgid "bad usage"
msgstr "错误用法"
msgid "Welcome to fdisk (%s)."
msgstr "欢迎使用 fdisk (%s)。"
-#: disk-utils/fdisk.c:1130 disk-utils/sfdisk.c:1807
+#: disk-utils/fdisk.c:1130 disk-utils/sfdisk.c:1808
msgid ""
"Changes will remain in memory only, until you decide to write them.\n"
"Be careful before using the write command.\n"
msgstr "磁盘型号:%s"
#: disk-utils/fdisk-list.c:71
-#, fuzzy, c-format
-#| msgid "Geometry: %d heads, %llu sectors/track, %llu cylinders"
+#, c-format
msgid "Geometry: %d heads, %ju sectors/track, %ju cylinders"
-msgstr "几何属性:%d 个磁头, %llu 个扇区/磁道, %llu 个柱面"
+msgstr "几何属性:%d 个磁头, %ju 个扇区/磁道, %ju 个柱面"
#: disk-utils/fdisk-list.c:76 disk-utils/fdisk-list.c:299
#, c-format
msgstr "对齐偏移量:%lu 字节"
#: disk-utils/fdisk-list.c:120 disk-utils/fdisk-list.c:241
-#: disk-utils/fsck.c:1258
+#: disk-utils/fsck.c:1260
msgid "failed to allocate iterator"
msgstr "分配迭代器失败"
#: disk-utils/fdisk-list.c:126 disk-utils/fdisk-list.c:247
-#: disk-utils/partx.c:669 login-utils/lslogins.c:1073 misc-utils/fincore.c:356
-#: misc-utils/findmnt.c:1763 misc-utils/lsblk.c:2240 misc-utils/lsfd.c:1634
+#: disk-utils/partx.c:669 login-utils/lslogins.c:1113 misc-utils/fincore.c:357
+#: misc-utils/findmnt.c:1763 misc-utils/lsblk.c:2351 misc-utils/lsfd.c:1970
#: misc-utils/lslocks.c:472 misc-utils/uuidparse.c:252 misc-utils/wipefs.c:157
-#: sys-utils/losetup.c:325 sys-utils/lscpu.c:586 sys-utils/lscpu.c:741
-#: sys-utils/lscpu.c:952 sys-utils/lsipc.c:354 sys-utils/prlimit.c:311
+#: sys-utils/losetup.c:325 sys-utils/lscpu.c:604 sys-utils/lscpu.c:759
+#: sys-utils/lscpu.c:970 sys-utils/lsipc.c:354 sys-utils/prlimit.c:311
#: sys-utils/rfkill.c:474 sys-utils/swapon.c:296 sys-utils/wdctl.c:349
-#: sys-utils/zramctl.c:496 text-utils/column.c:210
+#: sys-utils/zramctl.c:496 text-utils/column.c:217
msgid "failed to allocate output table"
msgstr "分配输出表失败"
#: disk-utils/fdisk-list.c:167 disk-utils/fdisk-list.c:271
-#: disk-utils/partx.c:583 login-utils/lslogins.c:1133 misc-utils/fincore.c:123
-#: misc-utils/findmnt.c:788 misc-utils/findmnt.c:806 misc-utils/lsblk.c:1166
-#: misc-utils/lsfd.c:856 misc-utils/lslocks.c:400 misc-utils/uuidparse.c:154
+#: disk-utils/partx.c:583 login-utils/lslogins.c:1173 misc-utils/fincore.c:123
+#: misc-utils/findmnt.c:788 misc-utils/findmnt.c:806 misc-utils/lsblk.c:1231
+#: misc-utils/lsfd.c:1134 misc-utils/lslocks.c:400 misc-utils/uuidparse.c:154
#: misc-utils/wipefs.c:202 sys-utils/losetup.c:348 sys-utils/losetup.c:377
-#: sys-utils/lscpu.c:500 sys-utils/lscpu.c:776 sys-utils/lscpu.c:808
+#: sys-utils/lscpu.c:518 sys-utils/lscpu.c:794 sys-utils/lscpu.c:826
#: sys-utils/lsipc.c:486 sys-utils/lsipc.c:567 sys-utils/lsipc.c:669
#: sys-utils/lsipc.c:761 sys-utils/lsipc.c:925 sys-utils/prlimit.c:240
#: sys-utils/rfkill.c:389 sys-utils/swapon.c:179 sys-utils/wdctl.c:299
-#: sys-utils/zramctl.c:414 text-utils/column.c:472 text-utils/column.c:497
+#: sys-utils/zramctl.c:414 text-utils/column.c:559 text-utils/column.c:584
msgid "failed to allocate output line"
msgstr "分配输出行失败"
#: disk-utils/fdisk-list.c:177 disk-utils/fdisk-list.c:278
-#: disk-utils/partx.c:646 login-utils/lslogins.c:1237 misc-utils/fincore.c:159
-#: misc-utils/findmnt.c:792 misc-utils/findmnt.c:811 misc-utils/lsblk.c:1207
+#: disk-utils/partx.c:646 login-utils/lslogins.c:1277 misc-utils/fincore.c:159
+#: misc-utils/findmnt.c:792 misc-utils/findmnt.c:811 misc-utils/lsblk.c:1272
#: misc-utils/lsfd-bdev.c:48 misc-utils/lsfd-bdev.c:61
#: misc-utils/lsfd-bdev.c:87 misc-utils/lsfd-bdev.c:89
#: misc-utils/lsfd-cdev.c:49 misc-utils/lsfd-cdev.c:66
#: misc-utils/lsfd-cdev.c:101 misc-utils/lsfd-cdev.c:103
-#: misc-utils/lsfd-fifo.c:39 misc-utils/lsfd-fifo.c:53
-#: misc-utils/lsfd-fifo.c:55 misc-utils/lsfd-file.c:204
-#: misc-utils/lsfd-file.c:209 misc-utils/lsfd-file.c:214
-#: misc-utils/lsfd-file.c:221 misc-utils/lsfd-file.c:228
-#: misc-utils/lsfd-file.c:233 misc-utils/lsfd-file.c:347
-#: misc-utils/lsfd-file.c:349 misc-utils/lsfd-sock.c:47
-#: misc-utils/lsfd-sock.c:52 misc-utils/lsfd-sock.c:73
-#: misc-utils/lsfd-sock.c:75 misc-utils/lsfd-unkn.c:39
-#: misc-utils/lsfd-unkn.c:53 misc-utils/lsfd-unkn.c:55 misc-utils/lslocks.c:459
-#: misc-utils/uuidparse.c:239 misc-utils/wipefs.c:242 sys-utils/losetup.c:305
-#: sys-utils/lscpu.c:568 sys-utils/lscpu.c:783 sys-utils/lscpu.c:812
-#: sys-utils/lscpu.c:822 sys-utils/lsipc.c:526 sys-utils/lsipc.c:651
-#: sys-utils/prlimit.c:275 sys-utils/rfkill.c:417 sys-utils/swapon.c:227
-#: sys-utils/wdctl.c:327 sys-utils/zramctl.c:481 text-utils/column.c:481
+#: misc-utils/lsfd-fifo.c:59 misc-utils/lsfd-fifo.c:91
+#: misc-utils/lsfd-fifo.c:93 misc-utils/lsfd-file.c:131
+#: misc-utils/lsfd-file.c:137 misc-utils/lsfd-file.c:143
+#: misc-utils/lsfd-file.c:150 misc-utils/lsfd-file.c:157
+#: misc-utils/lsfd-file.c:162 misc-utils/lsfd-file.c:274
+#: misc-utils/lsfd-file.c:276 misc-utils/lsfd-file.c:444
+#: misc-utils/lsfd-file.c:451 misc-utils/lsfd-sock.c:54
+#: misc-utils/lsfd-sock.c:114 misc-utils/lsfd-sock.c:116
+#: misc-utils/lsfd-unkn.c:114 misc-utils/lsfd-unkn.c:116
+#: misc-utils/lslocks.c:459 misc-utils/uuidparse.c:239 misc-utils/wipefs.c:242
+#: sys-utils/losetup.c:305 sys-utils/lscpu.c:586 sys-utils/lscpu.c:801
+#: sys-utils/lscpu.c:830 sys-utils/lscpu.c:840 sys-utils/lsipc.c:526
+#: sys-utils/lsipc.c:651 sys-utils/prlimit.c:275 sys-utils/rfkill.c:417
+#: sys-utils/swapon.c:227 sys-utils/wdctl.c:327 sys-utils/zramctl.c:481
+#: text-utils/column.c:568
msgid "failed to add output data"
msgstr "添加输出信息失败"
msgstr "分区表记录没有按磁盘顺序。"
#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1026 libfdisk/src/dos.c:2803
-#: libfdisk/src/gpt.c:3214 libfdisk/src/sgi.c:1159 libfdisk/src/sun.c:1130
+#: libfdisk/src/gpt.c:3244 libfdisk/src/sgi.c:1159 libfdisk/src/sun.c:1130
msgid "Start"
msgstr "起点"
#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1027 libfdisk/src/dos.c:2804
-#: libfdisk/src/gpt.c:3215 libfdisk/src/sgi.c:1160 libfdisk/src/sun.c:1131
+#: libfdisk/src/gpt.c:3245 libfdisk/src/sgi.c:1160 libfdisk/src/sun.c:1131
msgid "End"
msgstr "末尾"
#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1028 libfdisk/src/dos.c:2805
-#: libfdisk/src/gpt.c:3216 libfdisk/src/sgi.c:1161 libfdisk/src/sun.c:1132
+#: libfdisk/src/gpt.c:3246 libfdisk/src/sgi.c:1161 libfdisk/src/sun.c:1132
msgid "Sectors"
msgstr "扇区"
#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1030 libfdisk/src/dos.c:2807
-#: libfdisk/src/gpt.c:3217 libfdisk/src/sgi.c:1163 libfdisk/src/sun.c:1134
+#: libfdisk/src/gpt.c:3247 libfdisk/src/sgi.c:1163 libfdisk/src/sun.c:1134
msgid "Size"
msgstr "大小"
msgstr "返回主菜单"
#: disk-utils/fdisk-menu.c:125
-msgid "return from BSD to DOS"
+#, fuzzy
+#| msgid "return from BSD to DOS"
+msgid "return from BSD to DOS (MBR)"
msgstr "从 BSD 回到 DOS"
#: disk-utils/fdisk-menu.c:127 disk-utils/fdisk-menu.c:227
msgstr "新建一份空 GPT (IRIX) 分区表"
#: disk-utils/fdisk-menu.c:141
-msgid "create a new empty DOS partition table"
+#, fuzzy
+#| msgid "create a new empty DOS partition table"
+msgid "create a new empty MBR (DOS) partition table"
msgstr "新建一份的空 DOS 分区表"
#: disk-utils/fdisk-menu.c:142
msgid "change number of sectors/track"
msgstr "更改扇区/磁道数"
-#: disk-utils/fdisk-menu.c:167 include/pt-mbr-partnames.h:98
+#: disk-utils/fdisk-menu.c:167 include/pt-mbr-partnames.h:102
msgid "GPT"
msgstr "GPT"
msgstr "移动分区数据的起始点"
#: disk-utils/fdisk-menu.c:224
-#, fuzzy
-#| msgid "fix partitions order"
msgid "fix partitions C/H/S values"
-msgstr "修复分区顺序"
+msgstr "修复分区 C/H/S 值"
#: disk-utils/fdisk-menu.c:225
msgid "change the disk identifier"
"\n"
"帮助 (专业命令):\n"
-#: disk-utils/fdisk-menu.c:375 disk-utils/sfdisk.c:1471
+#: disk-utils/fdisk-menu.c:375 disk-utils/sfdisk.c:1472
#, c-format
msgid ""
"\n"
msgid "Command (m for help): "
msgstr "命令(输入 m 获取帮助):"
-#: disk-utils/fdisk-menu.c:437
+#: disk-utils/fdisk-menu.c:439
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "All unwritten changes will be lost, do you really want to quit? "
msgid ""
"\n"
-"All unwritten changes will be lost, do you really want to quit? "
+"All unwritten changes will be lost, do you really want to quit? (y/n)"
msgstr ""
"\n"
"所有未写入的修改均会丢失,您确认要退出吗?"
-#: disk-utils/fdisk-menu.c:450
+#: disk-utils/fdisk-menu.c:452
#, c-format
msgid "%c: unknown command"
msgstr "%c:未知命令"
-#: disk-utils/fdisk-menu.c:475 disk-utils/fdisk-menu.c:508
+#: disk-utils/fdisk-menu.c:477 disk-utils/fdisk-menu.c:510
msgid "Enter script file name"
msgstr "输入脚本文件名"
-#: disk-utils/fdisk-menu.c:487
+#: disk-utils/fdisk-menu.c:489
msgid "Resetting fdisk!"
msgstr "正在重置 fdisk!"
-#: disk-utils/fdisk-menu.c:494
+#: disk-utils/fdisk-menu.c:496
msgid "Script successfully applied."
msgstr "成功应用了脚本。"
-#: disk-utils/fdisk-menu.c:520
+#: disk-utils/fdisk-menu.c:522
msgid "Failed to transform disk layout into script"
msgstr "将磁盘布局转换成脚本失败"
-#: disk-utils/fdisk-menu.c:534
+#: disk-utils/fdisk-menu.c:536
msgid "Script successfully saved."
msgstr "成本保存了脚本。"
-#: disk-utils/fdisk-menu.c:557 disk-utils/sfdisk.c:1697
+#: disk-utils/fdisk-menu.c:559 disk-utils/sfdisk.c:1698
#, c-format
msgid "Partition #%zu contains a %s signature."
msgstr "分区 #%zu 包含一个 %s 签名。"
-#: disk-utils/fdisk-menu.c:560 disk-utils/sfdisk.c:1700
+#: disk-utils/fdisk-menu.c:562 disk-utils/sfdisk.c:1701
msgid "Do you want to remove the signature?"
msgstr "您想移除该签名吗?"
-#: disk-utils/fdisk-menu.c:565 disk-utils/sfdisk.c:1705
+#: disk-utils/fdisk-menu.c:567 disk-utils/sfdisk.c:1706
msgid "The signature will be removed by a write command."
msgstr "写入命令将移除该签名。"
-#: disk-utils/fdisk-menu.c:598
+#: disk-utils/fdisk-menu.c:600
msgid "failed to write disklabel"
msgstr "写磁盘标签失败"
-#: disk-utils/fdisk-menu.c:657
+#: disk-utils/fdisk-menu.c:659
#, c-format
msgid "Could not delete partition %zu"
msgstr "无法删除分区 %zu"
-#: disk-utils/fdisk-menu.c:686
+#: disk-utils/fdisk-menu.c:688
msgid "Changing display/entry units to cylinders (DEPRECATED!)."
msgstr "将显示/记录单位更改为柱面(已废弃!)。"
-#: disk-utils/fdisk-menu.c:688
+#: disk-utils/fdisk-menu.c:690
msgid "Changing display/entry units to sectors."
msgstr "将显示/记录单位更改为盲区。"
-#: disk-utils/fdisk-menu.c:698 disk-utils/fdisk-menu.c:869
+#: disk-utils/fdisk-menu.c:700 disk-utils/fdisk-menu.c:871
msgid "Leaving nested disklabel."
msgstr "离开嵌套的磁盘标签。"
-#: disk-utils/fdisk-menu.c:735
+#: disk-utils/fdisk-menu.c:737
msgid "New maximum entries"
msgstr "新的最大记录数"
-#: disk-utils/fdisk-menu.c:746
+#: disk-utils/fdisk-menu.c:748
msgid "Entering protective/hybrid MBR disklabel."
msgstr "进入 保护/混合 MBR 磁盘标签。"
-#: disk-utils/fdisk-menu.c:762
+#: disk-utils/fdisk-menu.c:764
msgid "New UUID (in 8-4-4-4-12 format)"
msgstr "新 UUID (以 8-4-4-4-12 格式)"
-#: disk-utils/fdisk-menu.c:777
+#: disk-utils/fdisk-menu.c:779
msgid "New name"
msgstr "新名称"
-#: disk-utils/fdisk-menu.c:840
+#: disk-utils/fdisk-menu.c:842
msgid "Entering nested BSD disklabel."
msgstr "进入嵌套的 BSD 磁盘标签。"
-#: disk-utils/fdisk-menu.c:876
+#: disk-utils/fdisk-menu.c:878
msgid "C/H/S values fixed."
-msgstr ""
+msgstr "C/H/S 值已修复。"
-#: disk-utils/fdisk-menu.c:878
-#, fuzzy
-#| msgid "Nothing to do. Ordering is correct already."
+#: disk-utils/fdisk-menu.c:880
msgid "Nothing to do. C/H/S values are correct already."
-msgstr "无须操作。顺序已经是正确的了。"
+msgstr "无须操作。C/H/S 值已经是正确的了。"
-#: disk-utils/fdisk-menu.c:1045
+#: disk-utils/fdisk-menu.c:1047
msgid "Number of cylinders"
msgstr "柱面数"
-#: disk-utils/fdisk-menu.c:1052
+#: disk-utils/fdisk-menu.c:1054
msgid "Number of heads"
msgstr "磁头数"
-#: disk-utils/fdisk-menu.c:1058
+#: disk-utils/fdisk-menu.c:1060
msgid "Number of sectors"
msgstr "扇区数"
-#: disk-utils/fdisk-menu.c:1109
+#: disk-utils/fdisk-menu.c:1111
#, c-format
msgid "Failed to create '%s' disk label"
msgstr "创建“%s”磁盘标签失败"
msgid "%s is not mounted\n"
msgstr "%s 未挂载\n"
-#: disk-utils/fsck.c:330 disk-utils/fsck.cramfs.c:181
-#: disk-utils/fsck.cramfs.c:188 disk-utils/fsck.cramfs.c:244
-#: disk-utils/fsck.cramfs.c:265 disk-utils/sfdisk.c:308 libfdisk/src/bsd.c:647
+#: disk-utils/fsck.c:330 disk-utils/fsck.cramfs.c:179
+#: disk-utils/fsck.cramfs.c:186 disk-utils/fsck.cramfs.c:242
+#: disk-utils/fsck.cramfs.c:263 disk-utils/sfdisk.c:308 libfdisk/src/bsd.c:647
#: login-utils/last.c:215 login-utils/last.c:252 login-utils/sulogin.c:721
-#: misc-utils/hardlink.c:795 schedutils/uclampset.c:111
-#: sys-utils/ctrlaltdel.c:44 sys-utils/irq-common.c:259 sys-utils/rfkill.c:216
+#: misc-utils/hardlink.c:840 schedutils/uclampset.c:111
+#: sys-utils/ctrlaltdel.c:44 sys-utils/irq-common.c:269 sys-utils/rfkill.c:216
#: sys-utils/setpriv.c:265 term-utils/setterm.c:746 term-utils/setterm.c:802
#: term-utils/setterm.c:806 term-utils/setterm.c:813
#, c-format
msgid "%s: failed to parse fstab"
msgstr "%s:解析 fstab 失败"
-#: disk-utils/fsck.c:690 login-utils/login.c:1119 login-utils/sulogin.c:1104
-#: login-utils/vipw.c:200 sys-utils/flock.c:351 sys-utils/nsenter.c:201
-#: sys-utils/swapon.c:332 sys-utils/unshare.c:296 sys-utils/unshare.c:637
-#: sys-utils/unshare.c:963
+#: disk-utils/fsck.c:690 login-utils/login.c:1119 login-utils/sulogin.c:1112
+#: login-utils/vipw.c:200 sys-utils/flock.c:351 sys-utils/nsenter.c:207
+#: sys-utils/swapon.c:332 sys-utils/unshare.c:298 sys-utils/unshare.c:626
+#: sys-utils/unshare.c:962
msgid "fork failed"
msgstr "fork 失败"
msgid "%s: execute failed"
msgstr "%s:执行失败"
-#: disk-utils/fsck.c:785
+#: disk-utils/fsck.c:787
msgid "wait: no more child process?!?"
msgstr "wait:没有剩余子进程了?!?"
-#: disk-utils/fsck.c:788 sys-utils/flock.c:369 sys-utils/swapon.c:359
-#: sys-utils/unshare.c:246 sys-utils/unshare.c:987
+#: disk-utils/fsck.c:790 sys-utils/flock.c:369 sys-utils/swapon.c:359
+#: sys-utils/unshare.c:248 sys-utils/unshare.c:986
msgid "waitpid failed"
msgstr "waitpid 失败"
-#: disk-utils/fsck.c:806
+#: disk-utils/fsck.c:808
#, c-format
msgid "Warning... %s for device %s exited with signal %d."
msgstr "警告... 对设备 %2$s 的 %1$s 以信号 %3$d 退出。"
-#: disk-utils/fsck.c:812
+#: disk-utils/fsck.c:814
#, c-format
msgid "%s %s: status is %x, should never happen."
msgstr "%s %s:状态为 %x,这不应该发生。"
-#: disk-utils/fsck.c:858
+#: disk-utils/fsck.c:860
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr "以 %s 结束(退出状态为 %d)\n"
-#: disk-utils/fsck.c:939
-#, fuzzy, c-format
-#| msgid "error %d (%m) while executing fsck.%s for %s"
+#: disk-utils/fsck.c:941
+#, c-format
msgid "error %d (%s) while executing fsck.%s for %s"
-msgstr "对 %3$s 执行 fsck.%2$s 时出现错误 %1$d (%m)"
+msgstr "错误 %d(%s)出现在执行 fsck.%s 时,用于 %s"
-#: disk-utils/fsck.c:1005
+#: disk-utils/fsck.c:1007
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:1121
+#: disk-utils/fsck.c:1123
#, 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:1133
+#: disk-utils/fsck.c:1135
#, c-format
msgid "%s: skipping nonexistent device\n"
msgstr "%s:将跳过不存在的设备\n"
-#: disk-utils/fsck.c:1138
+#: disk-utils/fsck.c:1140
#, 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:1155
+#: disk-utils/fsck.c:1157
#, c-format
msgid "%s: skipping unknown filesystem type\n"
msgstr "%s:跳过未知的文件系统类型\n"
-#: disk-utils/fsck.c:1169
+#: disk-utils/fsck.c:1171
#, c-format
msgid "cannot check %s: fsck.%s not found"
msgstr "无法检查 %s:找不到 fsck.%s"
-#: disk-utils/fsck.c:1273
+#: disk-utils/fsck.c:1275
msgid "Checking all file systems.\n"
msgstr "正在检查所有文件系统。\n"
# pass number 是fstab中定义的,不为0则每次检测
-#: disk-utils/fsck.c:1364
+#: disk-utils/fsck.c:1366
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--等待中-- (第 %d 遍)\n"
-#: disk-utils/fsck.c:1390
+#: disk-utils/fsck.c:1392
#, c-format
msgid " %s [options] -- [fs-options] [<filesystem> ...]\n"
msgstr " %s [选项] -- [文件系统选项] [<文件系统> ...]\n"
-#: disk-utils/fsck.c:1394
+#: disk-utils/fsck.c:1396
msgid "Check and repair a Linux filesystem.\n"
msgstr "检查并修复 Linux 文件系统。\n"
-#: disk-utils/fsck.c:1397
+#: disk-utils/fsck.c:1399
msgid " -A check all filesystems\n"
msgstr " -A 检查所有文件系统\n"
-#: disk-utils/fsck.c:1398
+#: disk-utils/fsck.c:1400
msgid " -C [<fd>] display progress bar; file descriptor is for GUIs\n"
msgstr " -C [<fd>] 显示进度条;文件描述符 fd 用于图形用户界面\n"
-#: disk-utils/fsck.c:1399
+#: disk-utils/fsck.c:1401
msgid " -l lock the device to guarantee exclusive access\n"
msgstr " -l 锁定设备以确保独占访问\n"
-#: disk-utils/fsck.c:1400
+#: disk-utils/fsck.c:1402
msgid " -M do not check mounted filesystems\n"
msgstr " -M 不检查已挂臷的文件系统\n"
-#: disk-utils/fsck.c:1401
+#: disk-utils/fsck.c:1403
msgid " -N do not execute, just show what would be done\n"
msgstr " -N 不执行,只显示将执行的操作\n"
-#: disk-utils/fsck.c:1402
+#: disk-utils/fsck.c:1404
msgid " -P check filesystems in parallel, including root\n"
msgstr " -P 并行检查文件系统,包括 root\n"
-#: disk-utils/fsck.c:1403
+#: disk-utils/fsck.c:1405
msgid " -R skip root filesystem; useful only with '-A'\n"
msgstr " -R 跳过根文件系统;只在指定 '-A' 时有用\n"
-#: disk-utils/fsck.c:1404
+#: disk-utils/fsck.c:1406
msgid ""
" -r [<fd>] report statistics for each device checked;\n"
" file descriptor is for GUIs\n"
" -r [<fd>] 报告对每个已检查设备的统计;\n"
" 文件描述符用于 GUI\n"
-#: disk-utils/fsck.c:1406
+#: disk-utils/fsck.c:1408
msgid " -s serialize the checking operations\n"
msgstr " -s 串行化检查操作\n"
-#: disk-utils/fsck.c:1407
+#: disk-utils/fsck.c:1409
msgid " -T do not show the title on startup\n"
msgstr " -T 启动时不显示标题\n"
-#: disk-utils/fsck.c:1408
+#: disk-utils/fsck.c:1410
msgid ""
" -t <type> specify filesystem types to be checked;\n"
" <type> is allowed to be a comma-separated list\n"
" -t <类型> 指定要检查的文件系统类型;\n"
" <类型> 可以是以英文逗号分隔的列表\n"
-#: disk-utils/fsck.c:1410
+#: disk-utils/fsck.c:1412
msgid " -V explain what is being done\n"
msgstr " -V 解释正在进行的操作\n"
-#: disk-utils/fsck.c:1416
+#: disk-utils/fsck.c:1418
msgid "See the specific fsck.* commands for available fs-options."
msgstr "参见特定的 fsck.* 命令了解可用的文件系统选项。"
-#: disk-utils/fsck.c:1461
+#: disk-utils/fsck.c:1463
msgid "too many devices"
msgstr "设备过多"
-#: disk-utils/fsck.c:1473
+#: disk-utils/fsck.c:1475
msgid "Is /proc mounted?"
msgstr "/proc 挂载了吗?"
-#: disk-utils/fsck.c:1481
+#: disk-utils/fsck.c:1483
#, c-format
msgid "must be root to scan for matching filesystems: %s"
msgstr "必须以 root 用户进行匹配文件系统扫描:%s"
-#: disk-utils/fsck.c:1485
+#: disk-utils/fsck.c:1487
#, c-format
msgid "couldn't find matching filesystem: %s"
msgstr "找不到匹配的文件系统:%s"
-#: disk-utils/fsck.c:1493 disk-utils/fsck.c:1590 misc-utils/kill.c:284
+#: disk-utils/fsck.c:1495 disk-utils/fsck.c:1592 misc-utils/kill.c:286
#: sys-utils/eject.c:281
msgid "too many arguments"
msgstr "参数过多"
-#: disk-utils/fsck.c:1548 disk-utils/fsck.c:1551
+#: disk-utils/fsck.c:1550 disk-utils/fsck.c:1553
msgid "invalid argument of -r"
msgstr "-r 的参数无效"
-#: disk-utils/fsck.c:1563
+#: disk-utils/fsck.c:1565
#, c-format
msgid "option '%s' may be specified only once"
msgstr "选项“%s”只能指定一次"
-#: disk-utils/fsck.c:1570 misc-utils/kill.c:330 misc-utils/kill.c:346
+#: disk-utils/fsck.c:1572 misc-utils/kill.c:336 misc-utils/kill.c:352
#, c-format
msgid "option '%s' requires an argument"
msgstr "“%s”选项需要一个参数"
-#: disk-utils/fsck.c:1601
+#: disk-utils/fsck.c:1603
#, c-format
msgid "invalid argument of -r: %d"
msgstr "-r 的参数无效:%d"
-#: disk-utils/fsck.c:1646
+#: disk-utils/fsck.c:1658
msgid "the -l option can be used with one device only -- ignore"
msgstr "-l 选项只能用于一个设备 -- 忽略"
msgid " --extract[=<dir>] test uncompression, optionally extract into <dir>\n"
msgstr " --extract[=<目录>] 测试解压,可指定解压到<目录>\n"
-#: disk-utils/fsck.cramfs.c:168
+#: disk-utils/fsck.cramfs.c:167
#, c-format
msgid "ioctl failed: unable to determine device size: %s"
msgstr "ioctl 失败:无法确定设备大小:%s"
-#: disk-utils/fsck.cramfs.c:174
+#: disk-utils/fsck.cramfs.c:172
#, c-format
msgid "not a block device or file: %s"
msgstr "不是一个块设备或文件:%s"
-#: disk-utils/fsck.cramfs.c:177 disk-utils/fsck.cramfs.c:213
+#: disk-utils/fsck.cramfs.c:175 disk-utils/fsck.cramfs.c:211
msgid "file length too short"
msgstr "文件长度过短"
-#: disk-utils/fsck.cramfs.c:186 disk-utils/fsck.cramfs.c:241
-#: disk-utils/fsck.cramfs.c:261 libfdisk/src/bsd.c:719 libfdisk/src/bsd.c:901
+#: disk-utils/fsck.cramfs.c:184 disk-utils/fsck.cramfs.c:239
+#: disk-utils/fsck.cramfs.c:259 libfdisk/src/bsd.c:719 libfdisk/src/bsd.c:901
#: login-utils/last.c:210 login-utils/last.c:244 sys-utils/fallocate.c:206
#, c-format
msgid "seek on %s failed"
msgstr "在 %s 上定位失败"
-#: disk-utils/fsck.cramfs.c:192 disk-utils/fsck.cramfs.c:194
+#: disk-utils/fsck.cramfs.c:190 disk-utils/fsck.cramfs.c:192
msgid "superblock magic not found"
msgstr "超级块魔数(magic)未找到"
-#: disk-utils/fsck.cramfs.c:197
+#: disk-utils/fsck.cramfs.c:195
#, c-format
msgid "cramfs endianness is %s\n"
msgstr "cramfs 大小端为 %s\n"
-#: disk-utils/fsck.cramfs.c:198
+#: disk-utils/fsck.cramfs.c:196
msgid "big"
msgstr "大端"
-#: disk-utils/fsck.cramfs.c:198
+#: disk-utils/fsck.cramfs.c:196
msgid "little"
msgstr "小端"
-#: disk-utils/fsck.cramfs.c:202
+#: disk-utils/fsck.cramfs.c:200
msgid "unsupported filesystem features"
msgstr "不支持的文件系统特性"
-#: disk-utils/fsck.cramfs.c:206
+#: disk-utils/fsck.cramfs.c:204
#, c-format
msgid "superblock size (%d) too small"
msgstr "超级块尺寸(%d)过小"
-#: disk-utils/fsck.cramfs.c:211
+#: disk-utils/fsck.cramfs.c:209
msgid "zero file count"
msgstr "零文件计数"
-#: disk-utils/fsck.cramfs.c:215
+#: disk-utils/fsck.cramfs.c:213
msgid "file extends past end of filesystem"
msgstr "警告:文件超过了文件系统终点"
-#: disk-utils/fsck.cramfs.c:217
+#: disk-utils/fsck.cramfs.c:215
msgid "old cramfs format"
msgstr "旧的 cramfs 格式"
-#: disk-utils/fsck.cramfs.c:226
+#: disk-utils/fsck.cramfs.c:224
msgid "unable to test CRC: old cramfs format"
msgstr "无法检测 CRC:旧的 cramfs 格式"
-#: disk-utils/fsck.cramfs.c:246
+#: disk-utils/fsck.cramfs.c:244
#, c-format
msgid "failed to read %<PRIu32> bytes from file %s"
msgstr "读取 %<PRIu32> 字节(读自文件 %s)时失败"
-#: disk-utils/fsck.cramfs.c:284
+#: disk-utils/fsck.cramfs.c:282
msgid "crc error"
msgstr "crc 错误"
-#: disk-utils/fsck.cramfs.c:314 disk-utils/fsck.minix.c:558
+#: disk-utils/fsck.cramfs.c:312 disk-utils/fsck.minix.c:558
msgid "seek failed"
msgstr "定位失败"
-#: disk-utils/fsck.cramfs.c:318
+#: disk-utils/fsck.cramfs.c:316
msgid "read romfs failed"
msgstr "读取 romfs 失败"
-#: disk-utils/fsck.cramfs.c:350
+#: disk-utils/fsck.cramfs.c:348
msgid "root inode is not directory"
msgstr "根 inode 不是一个目录"
-#: disk-utils/fsck.cramfs.c:354
+#: disk-utils/fsck.cramfs.c:352
#, c-format
msgid "bad root offset (%lu)"
msgstr "错误的根偏移(%lu)"
-#: disk-utils/fsck.cramfs.c:372
+#: disk-utils/fsck.cramfs.c:370
msgid "data block too large"
msgstr "数据块过大"
-#: disk-utils/fsck.cramfs.c:376
+#: disk-utils/fsck.cramfs.c:374
#, c-format
msgid "decompression error: %s"
msgstr "解压出错:%s"
-#: disk-utils/fsck.cramfs.c:402
+#: disk-utils/fsck.cramfs.c:400
#, c-format
msgid " hole at %lu (%zu)\n"
msgstr " 位于 %lu 的空洞(%zu)\n"
-#: disk-utils/fsck.cramfs.c:409 disk-utils/fsck.cramfs.c:561
+#: disk-utils/fsck.cramfs.c:407 disk-utils/fsck.cramfs.c:582
#, c-format
msgid " uncompressing block at %lu to %lu (%lu)\n"
msgstr " 正在将 %lu 处的块解压到 %lu (%lu)\n"
-#: disk-utils/fsck.cramfs.c:416
+#: disk-utils/fsck.cramfs.c:414
#, c-format
msgid "non-block (%ld) bytes"
msgstr "非块(%ld)字节 "
-#: disk-utils/fsck.cramfs.c:420
+#: disk-utils/fsck.cramfs.c:418
#, c-format
msgid "non-size (%ld vs %ld) bytes"
msgstr "无大小(%ld : %ld)字节"
-#: disk-utils/fsck.cramfs.c:425 disk-utils/fsck.cramfs.c:527
-#: disk-utils/swaplabel.c:109 misc-utils/uuidd.c:403 sys-utils/fallocate.c:440
+#: disk-utils/fsck.cramfs.c:423 disk-utils/fsck.cramfs.c:548
+#: disk-utils/swaplabel.c:109 misc-utils/uuidd.c:407 sys-utils/fallocate.c:440
#: sys-utils/rfkill.c:565 sys-utils/setpriv.c:628 sys-utils/setpriv.c:651
#: sys-utils/swapon.c:400 term-utils/script.c:322 term-utils/ttymsg.c:175
#, c-format
msgid "write failed: %s"
msgstr "写失败:%s"
-#: disk-utils/fsck.cramfs.c:435
+#: disk-utils/fsck.cramfs.c:433
#, c-format
msgid "lchown failed: %s"
msgstr "lchown 失败:%s"
-#: disk-utils/fsck.cramfs.c:439
-#, c-format
-msgid "chown failed: %s"
-msgstr "chown 失败:%s"
+#: disk-utils/fsck.cramfs.c:437
+#, fuzzy, c-format
+#| msgid "mknod failed: %s"
+msgid "chmod failed: %s"
+msgstr "mknod 失败:%s"
-#: disk-utils/fsck.cramfs.c:444
+#: disk-utils/fsck.cramfs.c:442
#, c-format
msgid "utimes failed: %s"
msgstr "utimes 失败:%s"
-#: disk-utils/fsck.cramfs.c:456
+#: disk-utils/fsck.cramfs.c:471
#, c-format
msgid "directory inode has zero offset and non-zero size: %s"
msgstr "目录 inode 偏移为 0,大小不为 0:%s"
-#: disk-utils/fsck.cramfs.c:471
+#: disk-utils/fsck.cramfs.c:486
#, c-format
msgid "mkdir failed: %s"
msgstr "mkdir 失败:%s"
-#: disk-utils/fsck.cramfs.c:487
+#: disk-utils/fsck.cramfs.c:502
+#, fuzzy
+#| msgid " -file dumpfilename\n"
+msgid "illegal filename"
+msgstr " -file dumpfilename\n"
+
+#: disk-utils/fsck.cramfs.c:504
+#, fuzzy
+#| msgid "Enter script file name"
+msgid "dangerous filename"
+msgstr "输入脚本文件名"
+
+#: disk-utils/fsck.cramfs.c:508
msgid "filename length is zero"
msgstr "文件名长度为 0"
-#: disk-utils/fsck.cramfs.c:489
+#: disk-utils/fsck.cramfs.c:510
msgid "bad filename length"
msgstr "文件名长度有误"
-#: disk-utils/fsck.cramfs.c:495
+#: disk-utils/fsck.cramfs.c:516
msgid "bad inode offset"
msgstr "inode 偏移有误"
-#: disk-utils/fsck.cramfs.c:510
+#: disk-utils/fsck.cramfs.c:531
msgid "file inode has zero offset and non-zero size"
msgstr "文件 inode 偏移为 0,大小不为 0"
-#: disk-utils/fsck.cramfs.c:513
+#: disk-utils/fsck.cramfs.c:534
msgid "file inode has zero size and non-zero offset"
msgstr "文件 inode 大小为 0,偏移不为 0"
-#: disk-utils/fsck.cramfs.c:542
+#: disk-utils/fsck.cramfs.c:563
msgid "symbolic link has zero offset"
msgstr "符号链接偏移为 0"
-#: disk-utils/fsck.cramfs.c:544
+#: disk-utils/fsck.cramfs.c:565
msgid "symbolic link has zero size"
msgstr "符号链接大小为 0"
-#: disk-utils/fsck.cramfs.c:553
+#: disk-utils/fsck.cramfs.c:574
#, c-format
msgid "size error in symlink: %s"
msgstr "符号链接大小出错:%s"
-#: disk-utils/fsck.cramfs.c:567
+#: disk-utils/fsck.cramfs.c:588
#, c-format
msgid "symlink failed: %s"
msgstr "symlink 失败:%s"
-#: disk-utils/fsck.cramfs.c:580
+#: disk-utils/fsck.cramfs.c:601
#, c-format
msgid "special file has non-zero offset: %s"
msgstr "特殊文件的偏移不为 0:%s"
-#: disk-utils/fsck.cramfs.c:590
+#: disk-utils/fsck.cramfs.c:611
#, c-format
msgid "fifo has non-zero size: %s"
msgstr "FIFO 的大小不为 0:%s"
-#: disk-utils/fsck.cramfs.c:596
+#: disk-utils/fsck.cramfs.c:617
#, c-format
msgid "socket has non-zero size: %s"
msgstr "套接字的大小不为 0:%s"
-#: disk-utils/fsck.cramfs.c:599
+#: disk-utils/fsck.cramfs.c:620
#, c-format
msgid "bogus mode: %s (%o)"
msgstr "伪(bogus)模式:%s (%o)"
-#: disk-utils/fsck.cramfs.c:608
+#: disk-utils/fsck.cramfs.c:629
#, c-format
msgid "mknod failed: %s"
msgstr "mknod 失败:%s"
-#: disk-utils/fsck.cramfs.c:640
+#: disk-utils/fsck.cramfs.c:661
#, 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:644
+#: disk-utils/fsck.cramfs.c:665
#, c-format
msgid "directory data end (%lu) != file data start (%lu)"
msgstr "目录数据终点 (%lu) != 文件数据起点 (%lu)"
-#: disk-utils/fsck.cramfs.c:648
+#: disk-utils/fsck.cramfs.c:669
msgid "invalid file data offset"
msgstr "无效的文件数据偏移"
-#: disk-utils/fsck.cramfs.c:696 disk-utils/mkfs.cramfs.c:738
+#: disk-utils/fsck.cramfs.c:716 disk-utils/mkfs.cramfs.c:741
msgid "invalid blocksize argument"
msgstr "无效的 块大小 参数"
-#: disk-utils/fsck.cramfs.c:730
+#: disk-utils/fsck.cramfs.c:750
#, c-format
msgid "%s: OK\n"
msgstr "%s:OK\n"
"----------------\n"
#: disk-utils/fsck.minix.c:1429 disk-utils/mkfs.minix.c:854
-#: disk-utils/mkswap.c:700 disk-utils/partx.c:1068 disk-utils/resizepart.c:115
+#: disk-utils/mkswap.c:737 disk-utils/partx.c:1071 disk-utils/resizepart.c:115
#: login-utils/utmpdump.c:408 sys-utils/dmesg.c:684 sys-utils/wdctl.c:457
#: sys-utils/wdctl.c:536 term-utils/setterm.c:908 text-utils/col.c:195
#: text-utils/pg.c:1255
msgid "invalid divisor argument"
msgstr "无效的 divisor(除数) 参数"
-#: disk-utils/mkfs.bfs.c:74
+#: disk-utils/mkfs.bfs.c:75
#, c-format
msgid "Usage: %s [options] device [block-count]\n"
msgstr "Usage: %s [选项] 设备 [块数]\n"
-#: disk-utils/mkfs.bfs.c:78
+#: disk-utils/mkfs.bfs.c:79
msgid "Make an SCO bfs filesystem.\n"
msgstr "制作 SCO bfs 文件系统。\n"
-#: disk-utils/mkfs.bfs.c:80
-#, c-format
+#: disk-utils/mkfs.bfs.c:81
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Options:\n"
+#| " -N, --inodes=NUM specify desired number of inodes\n"
+#| " -V, --vname=NAME specify volume name\n"
+#| " -F, --fname=NAME specify file system name\n"
+#| " -v, --verbose explain what is being done\n"
+#| " -c this option is silently ignored\n"
+#| " -l this option is silently ignored\n"
msgid ""
"\n"
"Options:\n"
" -v, --verbose explain what is being done\n"
" -c this option is silently ignored\n"
" -l this option is silently ignored\n"
+" --lock[=<mode>] use exclusive device lock (yes, no or nonblock)\n"
msgstr ""
"\n"
"选项:\n"
" -c 此选项将被忽略,不做提示\n"
" -l 此选项将被忽略,不做提示\n"
-#: disk-utils/mkfs.bfs.c:139
+#: disk-utils/mkfs.bfs.c:146
msgid "invalid number of inodes"
msgstr "无效的 inodes 数目"
-#: disk-utils/mkfs.bfs.c:145
+#: disk-utils/mkfs.bfs.c:152
msgid "volume name too long"
msgstr "卷名过长"
-#: disk-utils/mkfs.bfs.c:152
+#: disk-utils/mkfs.bfs.c:159
msgid "fsname name too long"
msgstr "fsname 名过长"
-#: disk-utils/mkfs.bfs.c:190
+#: disk-utils/mkfs.bfs.c:209
msgid "invalid block-count"
msgstr "无效的块计数"
-#: disk-utils/mkfs.bfs.c:198
+#: disk-utils/mkfs.bfs.c:217
#, c-format
msgid "cannot get size of %s"
msgstr "无法获得 %s 的大小"
-#: disk-utils/mkfs.bfs.c:203
+#: disk-utils/mkfs.bfs.c:222
#, c-format
msgid "blocks argument too large, max is %llu"
msgstr "块参数过大,最大值是 %llu"
-#: disk-utils/mkfs.bfs.c:218
+#: disk-utils/mkfs.bfs.c:237
msgid "too many inodes - max is 512"
msgstr "inodes 过多 - 最多 512"
-#: disk-utils/mkfs.bfs.c:228
+#: disk-utils/mkfs.bfs.c:247
#, c-format
msgid "not enough space, need at least %llu blocks"
msgstr "空间不足,至少需要 %llu 个块"
-#: disk-utils/mkfs.bfs.c:240
+#: disk-utils/mkfs.bfs.c:259
#, c-format
msgid "Device: %s\n"
msgstr "设备:%s\n"
-#: disk-utils/mkfs.bfs.c:241
+#: disk-utils/mkfs.bfs.c:260
#, c-format
msgid "Volume: <%-6s>\n"
msgstr "卷:<%-6s>\n"
-#: disk-utils/mkfs.bfs.c:242
+#: disk-utils/mkfs.bfs.c:261
#, c-format
msgid "FSname: <%-6s>\n"
msgstr "文件系统名:<%-6s>\n"
-#: disk-utils/mkfs.bfs.c:243
+#: disk-utils/mkfs.bfs.c:262
#, c-format
msgid "BlockSize: %d\n"
msgstr "块大小:%d\n"
-#: disk-utils/mkfs.bfs.c:245
+#: disk-utils/mkfs.bfs.c:264
#, c-format
msgid "Inodes: %ld (in 1 block)\n"
msgstr "Inodes:%ld (在 1 个块中)\n"
-#: disk-utils/mkfs.bfs.c:248
+#: disk-utils/mkfs.bfs.c:267
#, c-format
msgid "Inodes: %ld (in %llu blocks)\n"
msgstr "Inodes:%ld (在 %llu 个块中)\n"
-#: disk-utils/mkfs.bfs.c:250
+#: disk-utils/mkfs.bfs.c:269
#, c-format
msgid "Blocks: %llu\n"
msgstr "块:%llu\n"
-#: disk-utils/mkfs.bfs.c:251
+#: disk-utils/mkfs.bfs.c:270
#, c-format
msgid "Inode end: %d, Data end: %d\n"
msgstr "Inode 终点:%d,数据终点:%d\n"
-#: disk-utils/mkfs.bfs.c:256
+#: disk-utils/mkfs.bfs.c:275
msgid "error writing superblock"
msgstr "写超级块出错"
-#: disk-utils/mkfs.bfs.c:277
+#: disk-utils/mkfs.bfs.c:296
msgid "error writing root inode"
msgstr "写根 inode 出错"
-#: disk-utils/mkfs.bfs.c:282
+#: disk-utils/mkfs.bfs.c:301
msgid "error writing inode"
msgstr "写 inode 出错"
-#: disk-utils/mkfs.bfs.c:285
+#: disk-utils/mkfs.bfs.c:304
msgid "seek error"
msgstr "定位出错"
-#: disk-utils/mkfs.bfs.c:291
+#: disk-utils/mkfs.bfs.c:310
msgid "error writing . entry"
msgstr "写 . 记录出错"
-#: disk-utils/mkfs.bfs.c:295
+#: disk-utils/mkfs.bfs.c:314
msgid "error writing .. entry"
msgstr "写 .. 记录出错"
-#: disk-utils/mkfs.bfs.c:298
+#: disk-utils/mkfs.bfs.c:317
#, c-format
msgid "error closing %s"
msgstr "关闭 %s 出错"
" -V, --verbose 解释正在进行的操作;\n"
" 多次指定 -V 将导致空运行(dry-run)\n"
-#: disk-utils/mkfs.c:133 include/c.h:297 login-utils/su-common.c:1291
+#: disk-utils/mkfs.c:133 include/c.h:310 login-utils/su-common.c:1292
#: login-utils/sulogin.c:864 login-utils/sulogin.c:868 sys-utils/flock.c:123
#: sys-utils/rtcwake.c:623
#, c-format
msgid "failed to execute %s"
msgstr "执行 %s 失败"
-#: disk-utils/mkfs.cramfs.c:128
+#: disk-utils/mkfs.cramfs.c:129
#, c-format
msgid " %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n name] dirname outfile\n"
msgstr " %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n 名称] dirname outfile\n"
-#: disk-utils/mkfs.cramfs.c:131
+#: disk-utils/mkfs.cramfs.c:132
msgid "Make compressed ROM file system."
msgstr "制作压缩的 ROM 文件系统"
-#: disk-utils/mkfs.cramfs.c:133
+#: disk-utils/mkfs.cramfs.c:134
msgid " -v be verbose"
msgstr " -v 详尽模式"
-#: disk-utils/mkfs.cramfs.c:134
+#: disk-utils/mkfs.cramfs.c:135
msgid " -E make all warnings errors (non-zero exit status)"
msgstr " -E 将所有警告当作错误(以非零退出值返回)"
-#: disk-utils/mkfs.cramfs.c:135
+#: disk-utils/mkfs.cramfs.c:136
msgid " -b blksize use this blocksize, must equal page size"
msgstr " -b blksize 使用指定的块大小,必须等于页的大小"
-#: disk-utils/mkfs.cramfs.c:136
+#: disk-utils/mkfs.cramfs.c:137
msgid " -e edition set edition number (part of fsid)"
msgstr " -e 版本 设置修订版本号(fsid 的一部分)"
-#: disk-utils/mkfs.cramfs.c:137
+#: disk-utils/mkfs.cramfs.c:138
#, c-format
msgid " -N endian set cramfs endianness (%s|%s|%s), default %s\n"
msgstr " -N 大小端 设置 cramfs 大小端 (%s|%s|%s), 默认 %s\n"
-#: disk-utils/mkfs.cramfs.c:138
+#: disk-utils/mkfs.cramfs.c:139
msgid " -i file insert a file image into the filesystem"
msgstr " -i 文件 将文件镜像插入文件系统"
-#: disk-utils/mkfs.cramfs.c:139
+#: disk-utils/mkfs.cramfs.c:140
msgid " -n name set name of cramfs filesystem"
msgstr " -n 名称 设置 cramfs 文件系统的名称"
-#: disk-utils/mkfs.cramfs.c:140
+#: disk-utils/mkfs.cramfs.c:141
#, c-format
msgid " -p pad by %d bytes for boot code\n"
msgstr " -p 为引导代码填充 %d 字节\n"
-#: disk-utils/mkfs.cramfs.c:141
+#: disk-utils/mkfs.cramfs.c:142
msgid " -s sort directory entries (old option, ignored)"
msgstr " -s 对目录记录进行排序(旧选项,会被忽略)"
-#: disk-utils/mkfs.cramfs.c:142
+#: disk-utils/mkfs.cramfs.c:143
msgid " -z make explicit holes"
msgstr " -z 产生显式空洞"
-#: disk-utils/mkfs.cramfs.c:143
+#: disk-utils/mkfs.cramfs.c:144
+#, fuzzy
+#| msgid " --lock[=<mode>] use exclusive device lock (%s, %s or %s)\n"
+msgid " -l[=<mode>] use exclusive device lock (yes, no or nonblock)"
+msgstr " --lock[=<模式>] 使用独占设备锁(%s、%s 或 %s)\n"
+
+#: disk-utils/mkfs.cramfs.c:145
msgid " dirname root of the filesystem to be compressed"
msgstr " dirname 要压缩的文件系统的根"
-#: disk-utils/mkfs.cramfs.c:144
+#: disk-utils/mkfs.cramfs.c:146
msgid " outfile output file"
msgstr " outfile 输出文件"
-#: disk-utils/mkfs.cramfs.c:164
+#: disk-utils/mkfs.cramfs.c:166
#, c-format
msgid "readlink failed: %s"
msgstr "readlink 失败:%s"
-#: disk-utils/mkfs.cramfs.c:309
+#: disk-utils/mkfs.cramfs.c:311
#, c-format
msgid "could not read directory %s"
msgstr "无法读目录 %s"
-#: disk-utils/mkfs.cramfs.c:444
+#: disk-utils/mkfs.cramfs.c:446
msgid "filesystem too big. Exiting."
msgstr "文件系统过大。将退出。"
-#: disk-utils/mkfs.cramfs.c:603
+#: disk-utils/mkfs.cramfs.c:605
#, c-format
msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n"
msgstr "AIEEE:块已“压缩”到 > 2*块长度(%ld)\n"
-#: disk-utils/mkfs.cramfs.c:622
+#: disk-utils/mkfs.cramfs.c:624
#, c-format
msgid "%6.2f%% (%+ld bytes)\t%s\n"
msgstr "%6.2f%% (%+ld 字节)\t%s\n"
-#: disk-utils/mkfs.cramfs.c:667
+#: disk-utils/mkfs.cramfs.c:669
#, c-format
msgid "cannot close file %s"
msgstr "无法关闭文件 %s"
-#: disk-utils/mkfs.cramfs.c:744
+#: disk-utils/mkfs.cramfs.c:747
msgid "invalid edition number argument"
msgstr "无效的修订版本号参数"
-#: disk-utils/mkfs.cramfs.c:754
+#: disk-utils/mkfs.cramfs.c:757
msgid "invalid endianness given; must be 'big', 'little', or 'host'"
msgstr "给定的大小端无效。必须为“big”、“little”或“host”"
-#: disk-utils/mkfs.cramfs.c:819
+#: disk-utils/mkfs.cramfs.c:833
#, 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:843
+#: disk-utils/mkfs.cramfs.c:857
msgid "ROM image map"
msgstr "ROM 镜像映射"
-#: disk-utils/mkfs.cramfs.c:855
+#: disk-utils/mkfs.cramfs.c:869
#, c-format
msgid "Including: %s\n"
msgstr "包含:%s\n"
-#: disk-utils/mkfs.cramfs.c:861
+#: disk-utils/mkfs.cramfs.c:875
#, c-format
msgid "Directory data: %zd bytes\n"
msgstr "目录数据:%zd 字节\n"
-#: disk-utils/mkfs.cramfs.c:869
+#: disk-utils/mkfs.cramfs.c:883
#, c-format
msgid "Everything: %zd kilobytes\n"
msgstr "全部:%zd KB\n"
-#: disk-utils/mkfs.cramfs.c:874
+#: disk-utils/mkfs.cramfs.c:888
#, c-format
msgid "Super block: %zd bytes\n"
msgstr "超级块:%zd 字节\n"
-#: disk-utils/mkfs.cramfs.c:881
+#: disk-utils/mkfs.cramfs.c:895
#, c-format
msgid "CRC: %x\n"
msgstr "CRC:%x\n"
-#: disk-utils/mkfs.cramfs.c:886
+#: disk-utils/mkfs.cramfs.c:900
#, c-format
msgid "not enough space allocated for ROM image (%lld allocated, %zu used)"
msgstr "为 ROM 镜像分配的空间不足(已分配 %lld,已使用 %zu)"
-#: disk-utils/mkfs.cramfs.c:892
+#: disk-utils/mkfs.cramfs.c:906
#, c-format
msgid "ROM image write failed (%zd %zd)"
msgstr "写 ROM 镜像失败(%zd %zd)"
-#: disk-utils/mkfs.cramfs.c:895
+#: disk-utils/mkfs.cramfs.c:909
msgid "ROM image"
msgstr "ROM 镜像"
-#: disk-utils/mkfs.cramfs.c:904
+#: disk-utils/mkfs.cramfs.c:918
#, c-format
msgid "warning: filenames truncated to %u bytes."
msgstr "警告:文件名被截短为 %u 个字节。"
-#: disk-utils/mkfs.cramfs.c:906
+#: disk-utils/mkfs.cramfs.c:920
msgid "warning: files were skipped due to errors."
msgstr "警告:由于错误,文件被跳过。"
-#: disk-utils/mkfs.cramfs.c:908
+#: disk-utils/mkfs.cramfs.c:922
#, c-format
msgid "warning: file sizes truncated to %luMB (minus 1 byte)."
msgstr "警告:文件大小被截短为 %luMB(减 1 字节)。"
-#: disk-utils/mkfs.cramfs.c:912
+#: disk-utils/mkfs.cramfs.c:926
#, c-format
msgid "warning: uids truncated to %u bits. (This may be a security concern.)"
msgstr "警告:uid 被截短为 %u 位。(可能有安全隐患。)"
-#: disk-utils/mkfs.cramfs.c:915
+#: disk-utils/mkfs.cramfs.c:929
#, c-format
msgid "warning: gids truncated to %u bits. (This may be a security concern.)"
msgstr "警告:gid 被截短为 %u 位。(可能有安全隐患。)"
-#: disk-utils/mkfs.cramfs.c:918
+#: disk-utils/mkfs.cramfs.c:932
#, c-format
msgid ""
"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
msgid "block size smaller than physical sector size of %s"
msgstr "块尺寸比 %s 的物理扇区尺寸小"
-#: disk-utils/mkfs.minix.c:702
+#: disk-utils/mkfs.minix.c:702 disk-utils/mkswap.c:349
#, c-format
msgid "cannot determine size of %s"
msgstr "无法确定 %s 的大小"
msgid "%s is mounted; will not make a filesystem here!"
msgstr "%s 已挂载;将不会在此创建文件系统!"
-#: disk-utils/mkswap.c:92
+#: disk-utils/mkswap.c:111
#, c-format
msgid "Bad user-specified page size %u"
msgstr "用户指定的页大小 %u 有误"
-#: disk-utils/mkswap.c:95
+#: disk-utils/mkswap.c:114
#, c-format
msgid "Using user-specified page size %d, instead of the system value %d"
msgstr "将使用用户指定的页大小 %d 来取代系统值 %d"
-#: disk-utils/mkswap.c:137
+#: disk-utils/mkswap.c:156
msgid "Label was truncated."
msgstr "标签已截短。"
-#: disk-utils/mkswap.c:145
+#: disk-utils/mkswap.c:164
#, c-format
msgid "no label, "
msgstr "无标签,"
-#: disk-utils/mkswap.c:153
+#: disk-utils/mkswap.c:172
#, c-format
msgid "no uuid\n"
msgstr "无 uuid\n"
-#: disk-utils/mkswap.c:162
+#: disk-utils/mkswap.c:181
#, c-format
msgid " %s [options] device [size]\n"
msgstr " %s [选项] 设备 [大小]\n"
-#: disk-utils/mkswap.c:165
+#: disk-utils/mkswap.c:184
msgid "Set up a Linux swap area.\n"
msgstr "设置 Linux 交换区。\n"
-#: disk-utils/mkswap.c:168
-#, fuzzy
-#| msgid " -c, --check check the device for bad blocks\n"
+#: disk-utils/mkswap.c:187
msgid " -c, --check check bad blocks before creating the swap area\n"
-msgstr " -c, --check 检查设备坏块\n"
+msgstr " -c, --check 创建交换区之前先检查设备坏块\n"
-#: disk-utils/mkswap.c:169
-#, fuzzy
-#| msgid " -f, --find find a free device\n"
+#: disk-utils/mkswap.c:188
msgid " -f, --force allow swap size area be larger than device\n"
-msgstr " -f, --find 查找空闲设备\n"
+msgstr " -f, --force 允许交换区大小大于设备大小\n"
-#: disk-utils/mkswap.c:170
-#, fuzzy
-#| msgid " -q, --quiet suppress extra info messages\n"
+#: disk-utils/mkswap.c:189
msgid " -q, --quiet suppress output and warning messages\n"
-msgstr " -q, --quiet 禁止输出额外信息\n"
+msgstr " -q, --quiet 禁止输出和警告信息\n"
-#: disk-utils/mkswap.c:171
-#, fuzzy
-#| msgid " -b, --bytes show sizes in bytes\n"
+#: disk-utils/mkswap.c:190
msgid " -p, --pagesize SIZE specify page size in bytes\n"
-msgstr " -b, --bytes 以字节数显示大小\n"
+msgstr " -p, --pagesize 大小 指定页面大小,以字节为单位\n"
-#: disk-utils/mkswap.c:172
+#: disk-utils/mkswap.c:191
msgid " -L, --label LABEL specify label\n"
msgstr " -L, --label 标签 指定标签\n"
-#: disk-utils/mkswap.c:173
-#, fuzzy
-#| msgid " -N, --partno <num> specify partition number\n"
+#: disk-utils/mkswap.c:192
msgid " -v, --swapversion NUM specify swap-space version number\n"
-msgstr " -N, --partno <数字> 指定分区号\n"
+msgstr " -v, --swapversion 数字 指定交换空间版本号\n"
-#: disk-utils/mkswap.c:174
-#, fuzzy
-#| msgid " -g, --group <group> specify the primary group\n"
+#: disk-utils/mkswap.c:193
msgid " -U, --uuid UUID specify the uuid to use\n"
-msgstr " -g, --group <组> 指定主组\n"
+msgstr " -U, --uuid UUID 指定要使用的 uuid\n"
+
+#: disk-utils/mkswap.c:195
+#, c-format
+msgid " -e, --endianness=<value> specify the endianness to use (%s, %s or %s)\n"
+msgstr ""
-#: disk-utils/mkswap.c:175
+#: disk-utils/mkswap.c:197
msgid " --verbose verbose output\n"
msgstr " --verbose 详尽输出\n"
-#: disk-utils/mkswap.c:178 disk-utils/sfdisk.c:2087
+#: disk-utils/mkswap.c:200 disk-utils/sfdisk.c:2088
#, c-format
msgid " --lock[=<mode>] use exclusive device lock (%s, %s or %s)\n"
msgstr " --lock[=<模式>] 使用独占设备锁(%s、%s 或 %s)\n"
-#: disk-utils/mkswap.c:192
+#: disk-utils/mkswap.c:214
#, c-format
msgid "too many bad pages: %lu"
msgstr "坏页过多:%lu"
-#: disk-utils/mkswap.c:213
+#: disk-utils/mkswap.c:235
msgid "seek failed in check_blocks"
msgstr "check_blocks (检查块)时定位失败"
-#: disk-utils/mkswap.c:223
+#: disk-utils/mkswap.c:245
#, c-format
msgid "%lu bad page\n"
msgid_plural "%lu bad pages\n"
msgstr[0] "%lu 个坏页\n"
-#: disk-utils/mkswap.c:235
+#: disk-utils/mkswap.c:257
#, c-format
msgid ""
"mkswap: %s contains holes or other unsupported extents.\n"
" This swap file can be rejected by kernel on swap activation!\n"
msgstr ""
+"mkswap: %s 包含空洞或者其它不支持的扩展。\n"
+" 此交换文件可能会在启用时被内核拒绝!\n"
-#: disk-utils/mkswap.c:243
+#: disk-utils/mkswap.c:265
#, c-format
msgid " Use --verbose for more details.\n"
msgstr " 使用 --verbose 显示更多细节。\n"
-#: disk-utils/mkswap.c:284 disk-utils/mkswap.c:309
+#: disk-utils/mkswap.c:306 disk-utils/mkswap.c:331
#, c-format
msgid "hole detected at offset %ju"
-msgstr ""
+msgstr "在偏移量 %ju 处探测到空洞"
-#: disk-utils/mkswap.c:292
+#: disk-utils/mkswap.c:314
#, c-format
msgid "data inline extent at offset %ju"
msgstr ""
-#: disk-utils/mkswap.c:295
+#: disk-utils/mkswap.c:317
#, c-format
msgid "shared extent at offset %ju"
msgstr ""
-#: disk-utils/mkswap.c:298
+#: disk-utils/mkswap.c:320
#, c-format
msgid "unallocated extent at offset %ju"
msgstr ""
-#: disk-utils/mkswap.c:338
+#: disk-utils/mkswap.c:361
msgid "unable to alloc new libblkid probe"
msgstr "无法分配新的 libblkid 探针"
-#: disk-utils/mkswap.c:340
+#: disk-utils/mkswap.c:363
msgid "unable to assign device to libblkid probe"
msgstr "无法将设备分配给 libblkid 探针"
-#: disk-utils/mkswap.c:362
+#: disk-utils/mkswap.c:385
#, c-format
msgid "warning: checking bad blocks from swap file is not supported: %s"
msgstr "警告:不支持检查交换区的坏块:%s"
-#: disk-utils/mkswap.c:377 disk-utils/mkswap.c:402 disk-utils/mkswap.c:450
+#: disk-utils/mkswap.c:400 disk-utils/mkswap.c:425 disk-utils/mkswap.c:473
msgid "unable to rewind swap-device"
msgstr "无法倒回(rewind)交换设备"
-#: disk-utils/mkswap.c:405
+#: disk-utils/mkswap.c:428
msgid "unable to erase bootbits sectors"
msgstr "不能擦除 bootbits 扇区"
-#: disk-utils/mkswap.c:422
+#: disk-utils/mkswap.c:445
#, c-format
msgid "%s: warning: wiping old %s signature."
msgstr "%s:警告,将擦除旧的 %s 签名。"
-#: disk-utils/mkswap.c:427
+#: disk-utils/mkswap.c:450
#, c-format
msgid "%s: warning: don't erase bootbits sectors"
msgstr "%s:警告,不要擦除 bootbits 扇区"
-#: disk-utils/mkswap.c:430
+#: disk-utils/mkswap.c:453
#, c-format
msgid " (%s partition table detected). "
msgstr " (检测到 %s 分区表)。"
-#: disk-utils/mkswap.c:432
+#: disk-utils/mkswap.c:455
#, c-format
msgid " (compiled without libblkid). "
msgstr " (编译时未链接 libblkid)。"
-#: disk-utils/mkswap.c:433
+#: disk-utils/mkswap.c:456
#, c-format
msgid "Use -f to force.\n"
msgstr "使用 -f 选项强制执行。\n"
-#: disk-utils/mkswap.c:455
+#: disk-utils/mkswap.c:478
#, c-format
msgid "%s: unable to write signature page"
msgstr "%s:无法写签名页"
-#: disk-utils/mkswap.c:512
+#: disk-utils/mkswap.c:536
msgid "parsing page size failed"
msgstr "解析页大小失败"
-#: disk-utils/mkswap.c:521
+#: disk-utils/mkswap.c:545
msgid "parsing version number failed"
msgstr "解析版本号失败"
-#: disk-utils/mkswap.c:524
+#: disk-utils/mkswap.c:548
#, c-format
msgid "swapspace version %d is not supported"
msgstr "不支持 swapspace 版本 %d"
-#: disk-utils/mkswap.c:530
+#: disk-utils/mkswap.c:554
#, c-format
msgid "warning: ignoring -U (UUIDs are unsupported by %s)"
msgstr "警告:将忽略 -U 选项(%s 不支持 UUID)"
-#: disk-utils/mkswap.c:560
+#: disk-utils/mkswap.c:567
+#, fuzzy, c-format
+#| msgid "swapspace version %d is not supported"
+msgid "invalid endianness %s is not supported"
+msgstr "不支持 swapspace 版本 %d"
+
+#: disk-utils/mkswap.c:596
msgid "only one device argument is currently supported"
msgstr "当前只支持一个设备参数"
-#: disk-utils/mkswap.c:573
+#: disk-utils/mkswap.c:609
msgid "error: parsing UUID failed"
msgstr "错误:解析 UUID 失败"
-#: disk-utils/mkswap.c:582
+#: disk-utils/mkswap.c:618
msgid "error: Nowhere to set up swap on?"
msgstr "错误:没有设置交换空间的地方?"
-#: disk-utils/mkswap.c:588
+#: disk-utils/mkswap.c:624
msgid "invalid block count argument"
msgstr "无效的 块计数 参数"
-#: disk-utils/mkswap.c:597
+#: disk-utils/mkswap.c:633
#, c-format
msgid "error: size %llu KiB is larger than device size %<PRIu64> KiB"
msgstr "错误:尺寸 %llu KiB 大于设备尺寸 %<PRIu64> KiB"
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:639
#, c-format
msgid "error: swap area needs to be at least %ld KiB"
msgstr "错误:交换区至少需要 %ld KiB"
-#: disk-utils/mkswap.c:609
+#: disk-utils/mkswap.c:645
#, c-format
msgid "warning: truncating swap area to %llu KiB"
msgstr "警告:将把交换区截短为 %llu KiB"
-#: disk-utils/mkswap.c:614
+#: disk-utils/mkswap.c:650
#, c-format
msgid "error: %s is mounted; will not make swapspace"
msgstr "错误:%s 已挂载;将不会创建交换空间"
-#: disk-utils/mkswap.c:621
+#: disk-utils/mkswap.c:657
#, c-format
msgid "%s: insecure permissions %04o, fix with: chmod %04o %s"
msgstr "%s:不安全的权限 %04o,建议修复方式:chmod %04o %s"
-#: disk-utils/mkswap.c:626
+#: disk-utils/mkswap.c:662
#, c-format
msgid "%s: insecure file owner %d, fix with: chown 0:0 %s"
msgstr "%s:不安全的文件拥有者 %d,建议修复方式:chown 0:0 %s"
-#: disk-utils/mkswap.c:645
+#: disk-utils/mkswap.c:681
msgid "Unable to set up swap-space: unreadable"
msgstr "无法设置交换空间:不可读"
-#: disk-utils/mkswap.c:651
+#: disk-utils/mkswap.c:687
#, c-format
msgid "Setting up swapspace version %d, size = %s (%<PRIu64> bytes)\n"
msgstr "正在设置交换空间版本 %d,大小 = %s (%<PRIu64> 个字节)\n"
-#: disk-utils/mkswap.c:670
+#: disk-utils/mkswap.c:707
#, c-format
msgid "%s: unable to obtain selinux file label"
msgstr "%s:无法获得 selinux 文件标签"
-#: disk-utils/mkswap.c:675
+#: disk-utils/mkswap.c:712
#, c-format
msgid "%s: unable to obtain default selinux file label"
msgstr "%s:无法获得默认 selinux 文件标签"
-#: disk-utils/mkswap.c:679
+#: disk-utils/mkswap.c:716
msgid "unable to create new selinux context"
msgstr "无法创建新的 selinux 环境(context)"
-#: disk-utils/mkswap.c:681
+#: disk-utils/mkswap.c:718
msgid "couldn't compute selinux context"
msgstr "无法计算 selinux 环境(context)"
-#: disk-utils/mkswap.c:687
+#: disk-utils/mkswap.c:724
#, c-format
msgid "unable to relabel %s to %s"
msgstr "无法将 %s 标签改为 %s"
msgid "partition name"
msgstr "分区名"
-#: disk-utils/partx.c:92 misc-utils/findmnt.c:118 misc-utils/lsblk.c:195
+#: disk-utils/partx.c:92 misc-utils/findmnt.c:118 misc-utils/lsblk.c:205
msgid "partition UUID"
msgstr "分区 UUID"
msgid "partition table type (dos, gpt, ...)"
msgstr "分区表类型(dos、gpt、...)"
-#: disk-utils/partx.c:94 misc-utils/lsblk.c:191
+#: disk-utils/partx.c:94 misc-utils/lsblk.c:200
msgid "partition flags"
msgstr "分区标志"
msgstr "%s:设置回环设备失败"
#: disk-utils/partx.c:161 login-utils/lslogins.c:322 misc-utils/fincore.c:92
-#: misc-utils/findmnt.c:383 misc-utils/lsblk.c:333 misc-utils/lsfd.c:309
+#: misc-utils/findmnt.c:383 misc-utils/lsblk.c:343 misc-utils/lsfd.c:477
#: misc-utils/lslocks.c:351 misc-utils/uuidparse.c:125 misc-utils/wipefs.c:132
-#: sys-utils/irq-common.c:102 sys-utils/losetup.c:112 sys-utils/lscpu.c:196
-#: sys-utils/lscpu.c:211 sys-utils/lsipc.c:233 sys-utils/lsmem.c:178
-#: sys-utils/lsns.c:257 sys-utils/prlimit.c:291 sys-utils/rfkill.c:162
+#: sys-utils/irq-common.c:103 sys-utils/losetup.c:112 sys-utils/lscpu.c:200
+#: sys-utils/lscpu.c:215 sys-utils/lsipc.c:233 sys-utils/lsmem.c:178
+#: sys-utils/lsns.c:268 sys-utils/prlimit.c:291 sys-utils/rfkill.c:162
#: sys-utils/swapon.c:150 sys-utils/wdctl.c:179 sys-utils/zramctl.c:147
#, c-format
msgid "unknown column: %s"
msgid_plural "#%2d: %9ju-%9ju (%9ju sectors, %6ju MB)\n"
msgstr[0] "#%2d:%9ju-%9ju (%9ju 扇区%6ju MB)\n"
-#: disk-utils/partx.c:680 misc-utils/fincore.c:370 misc-utils/findmnt.c:1792
-#: misc-utils/lsblk.c:2284 misc-utils/lsfd.c:356 misc-utils/lsfd.c:1648
-#: misc-utils/lslocks.c:487 sys-utils/losetup.c:339 sys-utils/lscpu.c:598
-#: sys-utils/lscpu.c:754 sys-utils/prlimit.c:320 sys-utils/rfkill.c:487
+#: disk-utils/partx.c:680 misc-utils/fincore.c:371 misc-utils/findmnt.c:1792
+#: misc-utils/lsblk.c:2395 misc-utils/lsfd.c:532 misc-utils/lsfd.c:1984
+#: misc-utils/lslocks.c:487 sys-utils/losetup.c:339 sys-utils/lscpu.c:616
+#: sys-utils/lscpu.c:772 sys-utils/prlimit.c:320 sys-utils/rfkill.c:487
#: sys-utils/swapon.c:305 sys-utils/wdctl.c:360
msgid "failed to allocate output column"
msgstr "分配输出列失败"
" -s, --show 列出分区\n"
"\n"
-#: disk-utils/partx.c:766 misc-utils/lsblk.c:1913 sys-utils/lsmem.c:528
+#: disk-utils/partx.c:766 misc-utils/lsblk.c:2000 sys-utils/lsmem.c:528
msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
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:769 sys-utils/irqtop.c:265 sys-utils/lsirq.c:66
+#: disk-utils/partx.c:769 sys-utils/irqtop.c:271 sys-utils/lsirq.c:66
msgid " -o, --output <list> define which output columns to use\n"
msgstr " -o, --output <列表> 定义使用哪个输出列\n"
msgid " --output-all output all columns\n"
msgstr " --output-all 输出所有列\n"
-#: disk-utils/partx.c:771 misc-utils/lsblk.c:1909 sys-utils/lsirq.c:64
+#: disk-utils/partx.c:771 misc-utils/lsblk.c:1994 sys-utils/lsirq.c:64
#: sys-utils/lsmem.c:526
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs 使用 key=“value” 输出格式\n"
-#: disk-utils/partx.c:772 misc-utils/lsblk.c:1923 sys-utils/lsmem.c:532
+#: disk-utils/partx.c:772 misc-utils/lsblk.c:2010 sys-utils/lsmem.c:532
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
msgid "%s: partitioned loop devices unsupported"
msgstr "%s:不支持已分区的回环设备"
-#: disk-utils/partx.c:1030
+#: disk-utils/partx.c:1031
#, c-format
msgid "%s: failed to initialize blkid prober"
msgstr "%s:初始化 blkid 探针失败"
msgid "Do you want to move partition data?"
msgstr "您想移动分区数据吗?"
-#: disk-utils/sfdisk.c:492 disk-utils/sfdisk.c:2013
+#: disk-utils/sfdisk.c:492 disk-utils/sfdisk.c:2014
msgid "Leaving."
msgstr "离开中。"
#: disk-utils/sfdisk.c:554
-#, c-format
-msgid "cannot read at offset: %zu; continue"
+#, fuzzy, c-format
+#| msgid "cannot read at offset: %zu; continue"
+msgid "cannot read at offset: %ju; continue"
msgstr "无法在偏移量 %zu 处读取;继续"
#: disk-utils/sfdisk.c:565
-#, c-format
-msgid "cannot write at offset: %zu; continue"
+#, fuzzy, c-format
+#| msgid "cannot write at offset: %zu; continue"
+msgid "cannot write at offset: %ju; continue"
msgstr "无法在偏移量 %zu 处写入;继续"
-#: disk-utils/sfdisk.c:594
+#: disk-utils/sfdisk.c:571
+#, fuzzy, c-format
+#| msgid "cannot read at offset: %zu; continue"
+msgid "cannot fsync at offset: %ju; continue"
+msgstr "无法在偏移量 %zu 处读取;继续"
+
+#: disk-utils/sfdisk.c:595
#, c-format
msgid "Moved %ju from %ju sectors (%.3f%%, %.1f MiB/s)."
msgstr ""
-#: disk-utils/sfdisk.c:599
+#: disk-utils/sfdisk.c:600
#, c-format
msgid "Moved %ju from %ju sectors (%.3f%%)."
msgstr ""
-#: disk-utils/sfdisk.c:623
+#: disk-utils/sfdisk.c:624
#, c-format
msgid "Moved %ju from %ju sectors (%.0f%%)."
msgstr ""
-#: disk-utils/sfdisk.c:636
+#: disk-utils/sfdisk.c:637
msgid "Your data has not been moved (--no-act)."
msgstr "您的数据未被移动(--no-act)。"
-#: disk-utils/sfdisk.c:638
+#: disk-utils/sfdisk.c:639
#, c-format
msgid "%zu I/O errors detected!"
msgstr "检测到 %zu 个 I/O 错误!"
-#: disk-utils/sfdisk.c:641
+#: disk-utils/sfdisk.c:642
#, c-format
msgid "%s: failed to move data"
msgstr "%s:移动数据失败"
-#: disk-utils/sfdisk.c:653
+#: disk-utils/sfdisk.c:654
msgid "The partition table is unchanged (--no-act)."
msgstr "分区表未更改(--no-act)。"
-#: disk-utils/sfdisk.c:661
+#: disk-utils/sfdisk.c:662
msgid ""
"\n"
"The partition table has been altered."
"\n"
"分区表已调整。"
-#: disk-utils/sfdisk.c:736
+#: disk-utils/sfdisk.c:737
#, c-format
msgid "unsupported label '%s'"
msgstr "不支持的标签:“%s”"
-#: disk-utils/sfdisk.c:739
+#: disk-utils/sfdisk.c:740
msgid ""
"Id Name\n"
"\n"
"Id 名称\n"
"\n"
-#: disk-utils/sfdisk.c:766
+#: disk-utils/sfdisk.c:767
msgid "unrecognized partition table type"
msgstr "未识别的分区表类型"
-#: disk-utils/sfdisk.c:819
+#: disk-utils/sfdisk.c:820
#, c-format
msgid "Cannot get size of %s"
msgstr "无法获得 %s 的大小"
-#: disk-utils/sfdisk.c:856
+#: disk-utils/sfdisk.c:857
#, c-format
msgid "total: %ju blocks\n"
msgstr "共计:%ju 个块\n"
-#: disk-utils/sfdisk.c:915 disk-utils/sfdisk.c:993 disk-utils/sfdisk.c:1030
-#: disk-utils/sfdisk.c:1055 disk-utils/sfdisk.c:1089 disk-utils/sfdisk.c:1148
-#: disk-utils/sfdisk.c:1216 disk-utils/sfdisk.c:1271 disk-utils/sfdisk.c:1327
-#: disk-utils/sfdisk.c:1380 disk-utils/sfdisk.c:1418 disk-utils/sfdisk.c:1754
+#: disk-utils/sfdisk.c:916 disk-utils/sfdisk.c:994 disk-utils/sfdisk.c:1031
+#: disk-utils/sfdisk.c:1056 disk-utils/sfdisk.c:1090 disk-utils/sfdisk.c:1149
+#: disk-utils/sfdisk.c:1217 disk-utils/sfdisk.c:1272 disk-utils/sfdisk.c:1328
+#: disk-utils/sfdisk.c:1381 disk-utils/sfdisk.c:1419 disk-utils/sfdisk.c:1755
msgid "no disk device specified"
msgstr "未指定磁盘设备"
-#: disk-utils/sfdisk.c:925
+#: disk-utils/sfdisk.c:926
msgid "toggle boot flags is unsupported for Hybrid GPT/MBR"
msgstr "混合 GPT/MBR 不支持切换启动(boot)标志"
-#: disk-utils/sfdisk.c:930
+#: disk-utils/sfdisk.c:931
msgid "cannot switch to PMBR"
msgstr "无法切换至 PMBR"
-#: disk-utils/sfdisk.c:931
+#: disk-utils/sfdisk.c:932
msgid "Activation is unsupported for GPT -- entering nested PMBR."
msgstr "GPT 不支持激活(Activation)-- 将进入嵌套 PMBR。"
-#: disk-utils/sfdisk.c:934
+#: disk-utils/sfdisk.c:935
msgid "toggle boot flags is supported for MBR or PMBR only"
msgstr "只支持为 MBR 或 PMBR 切换启动(boot)标志"
-#: disk-utils/sfdisk.c:966 disk-utils/sfdisk.c:1009 disk-utils/sfdisk.c:1153
-#: disk-utils/sfdisk.c:1221 disk-utils/sfdisk.c:1276 disk-utils/sfdisk.c:1332
-#: disk-utils/sfdisk.c:1752 disk-utils/sfdisk.c:2284
+#: disk-utils/sfdisk.c:967 disk-utils/sfdisk.c:1010 disk-utils/sfdisk.c:1154
+#: disk-utils/sfdisk.c:1222 disk-utils/sfdisk.c:1277 disk-utils/sfdisk.c:1333
+#: disk-utils/sfdisk.c:1753 disk-utils/sfdisk.c:2285
msgid "failed to parse partition number"
msgstr "解析分区号失败"
-#: disk-utils/sfdisk.c:971
+#: disk-utils/sfdisk.c:972
#, c-format
msgid "%s: partition %d: failed to toggle bootable flag"
msgstr "%s:分区 %d:开/关启动标志失败"
-#: disk-utils/sfdisk.c:1004 disk-utils/sfdisk.c:1012
+#: disk-utils/sfdisk.c:1005 disk-utils/sfdisk.c:1013
#, c-format
msgid "%s: partition %zu: failed to delete"
msgstr "%s:分区 %zu:删除失败"
-#: disk-utils/sfdisk.c:1060 disk-utils/sfdisk.c:1094
+#: disk-utils/sfdisk.c:1061 disk-utils/sfdisk.c:1095
#, c-format
msgid "%s: does not contain a recognized partition table"
msgstr "%s:不包含可识别的分区表"
-#: disk-utils/sfdisk.c:1064
+#: disk-utils/sfdisk.c:1065
msgid "failed to allocate dump struct"
msgstr "分配转储结构失败"
-#: disk-utils/sfdisk.c:1068
+#: disk-utils/sfdisk.c:1069
#, c-format
msgid "%s: failed to dump partition table"
msgstr "%s:转储分区表失败"
-#: disk-utils/sfdisk.c:1126
+#: disk-utils/sfdisk.c:1127
#, c-format
msgid "%s: no partition table found"
msgstr "%s:找不到分区表"
-#: disk-utils/sfdisk.c:1130
+#: disk-utils/sfdisk.c:1131
#, c-format
msgid "%s: partition %zu: partition table contains only %zu partitions"
msgstr "%s:分区 %zu:分区表中只包含 %zu 个分区"
-#: disk-utils/sfdisk.c:1133
+#: disk-utils/sfdisk.c:1134
#, c-format
msgid "%s: partition %zu: partition is unused"
msgstr "%s: 分区 %zu: 分区未使用"
-#: disk-utils/sfdisk.c:1152 disk-utils/sfdisk.c:1220 disk-utils/sfdisk.c:1275
-#: disk-utils/sfdisk.c:1331
+#: disk-utils/sfdisk.c:1153 disk-utils/sfdisk.c:1221 disk-utils/sfdisk.c:1276
+#: disk-utils/sfdisk.c:1332
msgid "no partition number specified"
msgstr "未指定分区号"
-#: disk-utils/sfdisk.c:1158 disk-utils/sfdisk.c:1226 disk-utils/sfdisk.c:1281
-#: disk-utils/sfdisk.c:1337 disk-utils/sfdisk.c:1386 disk-utils/sfdisk.c:1420
+#: disk-utils/sfdisk.c:1159 disk-utils/sfdisk.c:1227 disk-utils/sfdisk.c:1282
+#: disk-utils/sfdisk.c:1338 disk-utils/sfdisk.c:1387 disk-utils/sfdisk.c:1421
#: sys-utils/losetup.c:784
msgid "unexpected arguments"
msgstr "参数异常"
-#: disk-utils/sfdisk.c:1173
+#: disk-utils/sfdisk.c:1174
#, c-format
msgid "%s: partition %zu: failed to get partition type"
msgstr "%s: 分区 %zu:获取分区类型失败"
-#: disk-utils/sfdisk.c:1196
+#: disk-utils/sfdisk.c:1197
#, c-format
msgid "failed to parse %s partition type '%s'"
msgstr "解析 %s 的分区类型“%s”失败"
-#: disk-utils/sfdisk.c:1200
+#: disk-utils/sfdisk.c:1201
#, c-format
msgid "%s: partition %zu: failed to set partition type"
msgstr "%s: 分区 %zu: 设置分区类型失败"
-#: disk-utils/sfdisk.c:1238
+#: disk-utils/sfdisk.c:1239
#, c-format
msgid "%s: partition %zu: failed to get partition UUID"
msgstr "%s: 分区 %zu: 获取分区 UUID 失败"
-#: disk-utils/sfdisk.c:1251 disk-utils/sfdisk.c:1306 disk-utils/sfdisk.c:1360
+#: disk-utils/sfdisk.c:1252 disk-utils/sfdisk.c:1307 disk-utils/sfdisk.c:1361
msgid "failed to allocate partition object"
msgstr "分配分区对象失败"
-#: disk-utils/sfdisk.c:1255
+#: disk-utils/sfdisk.c:1256
#, c-format
msgid "%s: partition %zu: failed to set partition UUID"
msgstr "%s: 分区 %zu: 设置分区 UUID 失败"
-#: disk-utils/sfdisk.c:1293
+#: disk-utils/sfdisk.c:1294
#, c-format
msgid "%s: partition %zu: failed to get partition name"
msgstr "%s: 分区 %zu: 获取分区名失败"
-#: disk-utils/sfdisk.c:1310
+#: disk-utils/sfdisk.c:1311
#, c-format
msgid "%s: partition %zu: failed to set partition name"
msgstr "%s: 分区 %zu: 设置分区名失败"
-#: disk-utils/sfdisk.c:1364
+#: disk-utils/sfdisk.c:1365
#, c-format
msgid "%s: partition %zu: failed to set partition attributes"
msgstr "%s: 分区 %zu: 设置分区属性失败"
-#: disk-utils/sfdisk.c:1401
+#: disk-utils/sfdisk.c:1402
#, c-format
msgid "%s: failed to set disklabel ID"
msgstr "%s:设置磁盘标签 ID 失败"
-#: disk-utils/sfdisk.c:1416
+#: disk-utils/sfdisk.c:1417
#, fuzzy
#| msgid "No --date option specified."
msgid "no relocate operation specified"
msgstr "未指定 --date 选项。"
-#: disk-utils/sfdisk.c:1430
+#: disk-utils/sfdisk.c:1431
#, fuzzy
#| msgid "unsupported option format: %s"
msgid "unsupported relocation operation"
msgstr "不支持的参数格式:%s"
-#: disk-utils/sfdisk.c:1475
+#: disk-utils/sfdisk.c:1476
msgid " Commands:\n"
msgstr " 命令:\n"
-#: disk-utils/sfdisk.c:1477
+#: disk-utils/sfdisk.c:1478
msgid " write write table to disk and exit\n"
msgstr " write 将分区表写入磁盘并退出\n"
-#: disk-utils/sfdisk.c:1478
+#: disk-utils/sfdisk.c:1479
msgid " quit show new situation and wait for user's feedback before write\n"
msgstr " quit 显示新状况并等待用户反馈后再写入\n"
-#: disk-utils/sfdisk.c:1479
+#: disk-utils/sfdisk.c:1480
msgid " abort exit sfdisk shell\n"
msgstr " abort 退出 sfdisk shell\n"
-#: disk-utils/sfdisk.c:1480
+#: disk-utils/sfdisk.c:1481
msgid " print display the partition table\n"
msgstr " print 显示分区表\n"
-#: disk-utils/sfdisk.c:1481
+#: disk-utils/sfdisk.c:1482
msgid " help show this help text\n"
msgstr " help 显示帮助并退出\n"
-#: disk-utils/sfdisk.c:1483
+#: disk-utils/sfdisk.c:1484
msgid " Ctrl-D the same as 'quit'\n"
msgstr " Ctrl-D 同“quit”\n"
-#: disk-utils/sfdisk.c:1487
+#: disk-utils/sfdisk.c:1488
msgid " Input format:\n"
msgstr " 输入格式:\n"
-#: disk-utils/sfdisk.c:1489
+#: disk-utils/sfdisk.c:1490
msgid " <start>, <size>, <type>, <bootable>\n"
msgstr " <起点>, <大小>, <类型>, <可启动>\n"
-#: disk-utils/sfdisk.c:1492
+#: disk-utils/sfdisk.c:1493
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"
" <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n"
" 默认为第一处可用空间。\n"
-#: disk-utils/sfdisk.c:1497
+#: disk-utils/sfdisk.c:1498
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"
" <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n"
" 默认为所有可用空间。\n"
-#: disk-utils/sfdisk.c:1502
+#: disk-utils/sfdisk.c:1503
msgid " <type> The partition type. Default is a Linux data partition.\n"
msgstr " <类型> 分区类型。默认为 Linux 数据分区。\n"
-#: disk-utils/sfdisk.c:1503
+#: disk-utils/sfdisk.c:1504
msgid " MBR: hex or L,S,Ex,X,U,R,V shortcuts.\n"
msgstr " MBR:hex 或 L,S,Ex,X,U,R,V 快捷方式。\n"
-#: disk-utils/sfdisk.c:1504
+#: disk-utils/sfdisk.c:1505
msgid " GPT: UUID or L,S,H,U,R,V shortcuts.\n"
msgstr " GPT:UUID 或 L,S,H,U,R,V 快捷方式。\n"
-#: disk-utils/sfdisk.c:1507
+#: disk-utils/sfdisk.c:1508
msgid " <bootable> Use '*' to mark an MBR partition as bootable.\n"
msgstr " <可启动> 使用“*”将 MBR 分区标记为 可启动。\n"
-#: disk-utils/sfdisk.c:1511
+#: disk-utils/sfdisk.c:1512
msgid " Example:\n"
msgstr " 示例:\n"
-#: disk-utils/sfdisk.c:1513
+#: disk-utils/sfdisk.c:1514
msgid " , 4G Creates a 4GiB partition at default start offset.\n"
msgstr " , 4G 在默认起始偏移位置创建一个 4GiB 分区。\n"
-#: disk-utils/sfdisk.c:1545 sys-utils/dmesg.c:1672
+#: disk-utils/sfdisk.c:1546 sys-utils/dmesg.c:1674
msgid "unsupported command"
msgstr "不支持的命令"
-#: disk-utils/sfdisk.c:1547
+#: disk-utils/sfdisk.c:1548
#, c-format
msgid "line %d: unsupported command"
msgstr "第 %d 行:不支持的命令"
-#: disk-utils/sfdisk.c:1666
+#: disk-utils/sfdisk.c:1667
#, fuzzy, c-format
#| msgid "Device already contains a %s signature; it will be removed by a write command."
msgid "The device contains '%s' signature and it may be removed by a write command. See sfdisk(8) man page and --wipe option for more details."
msgstr "设备已包含一个 %s 签名;写入命令会将其移除。"
-#: disk-utils/sfdisk.c:1673
+#: disk-utils/sfdisk.c:1674
#, fuzzy, c-format
#| msgid "The old %s signature may remain on the device. It is recommended to wipe the device with wipefs(8) or sfdisk --wipe, in order to avoid possible collisions."
msgid "The device contains '%s' signature and it may remain on the device. It is recommended to wipe the device with wipefs(8) or sfdisk --wipe, in order to avoid possible collisions."
msgstr "旧签名 %s 可能仍然在设备上存留。建议您使用 wipefs(8) 或者 fdisk --wipe 来擦除该设备,以避免潜在的冲突。"
-#: disk-utils/sfdisk.c:1721
+#: disk-utils/sfdisk.c:1722
msgid "failed to allocate partition name"
msgstr "分配分区名失败"
-#: disk-utils/sfdisk.c:1760
+#: disk-utils/sfdisk.c:1761
msgid "failed to allocate script handler"
msgstr "分配脚本处理程序失败"
-#: disk-utils/sfdisk.c:1776
+#: disk-utils/sfdisk.c:1777
#, c-format
msgid "%s: cannot modify partition %d: no partition table was found"
msgstr "%s:无法修改分区 %d:未找到分区表"
-#: disk-utils/sfdisk.c:1781
+#: disk-utils/sfdisk.c:1782
#, c-format
msgid "%s: cannot modify partition %d: partition table contains only %zu partitions"
msgstr "%s: 无法修改分区 %d: 分区表只包含 %zu 个分区"
-#: disk-utils/sfdisk.c:1787
+#: disk-utils/sfdisk.c:1788
#, c-format
msgid "warning: %s: partition %d is not defined yet"
msgstr "警告:%s: 分区 %d 尚未定义"
-#: disk-utils/sfdisk.c:1805
+#: disk-utils/sfdisk.c:1806
#, c-format
msgid ""
"\n"
"\n"
"欢迎使用 sfdisk (%s)。"
-#: disk-utils/sfdisk.c:1813
+#: disk-utils/sfdisk.c:1814
msgid "Checking that no-one is using this disk right now ..."
msgstr "请检查现在是不是有人在使用此磁盘..."
-#: disk-utils/sfdisk.c:1816
+#: disk-utils/sfdisk.c:1817
msgid ""
" FAILED\n"
"\n"
" 失败\n"
"\n"
-#: disk-utils/sfdisk.c:1819
+#: disk-utils/sfdisk.c:1820
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"
"请卸载此磁盘上所有的文件系统,并关闭(swapoff)上面的交换分区。\n"
"可使用 --no-reread 标志阻止此检查。\n"
-#: disk-utils/sfdisk.c:1824
+#: disk-utils/sfdisk.c:1825
msgid "Use the --force flag to overrule all checks."
msgstr "使用 --force 标志否决所有检查。"
-#: disk-utils/sfdisk.c:1826
+#: disk-utils/sfdisk.c:1827
msgid ""
" OK\n"
"\n"
" 好的\n"
"\n"
-#: disk-utils/sfdisk.c:1835
+#: disk-utils/sfdisk.c:1836
msgid ""
"\n"
"Old situation:"
"\n"
"旧状况:"
-#: disk-utils/sfdisk.c:1848
+#: disk-utils/sfdisk.c:1849
msgid "failed to set script header"
-msgstr ""
+msgstr "设置脚本标头(header)失败"
-#: disk-utils/sfdisk.c:1853
+#: disk-utils/sfdisk.c:1854
#, c-format
msgid ""
"\n"
"sfdisk 即将创建一个新的磁盘标签“%s”。\n"
"在定义第一个分区之前使用“label: <名字>”可覆盖默认值。"
-#: disk-utils/sfdisk.c:1856
+#: disk-utils/sfdisk.c:1857
msgid ""
"\n"
"Type 'help' to get more information.\n"
"\n"
"请执行“%s --help”了解更多信息。\n"
-#: disk-utils/sfdisk.c:1874
+#: disk-utils/sfdisk.c:1875
msgid "All partitions used."
msgstr "所有分区均已使用。"
-#: disk-utils/sfdisk.c:1894
+#: disk-utils/sfdisk.c:1895
#, c-format
msgid "Unknown script header '%s' -- ignore."
-msgstr ""
+msgstr "未知的脚本标头(header)“%s”——忽略。"
-#: disk-utils/sfdisk.c:1910
+#: disk-utils/sfdisk.c:1911
msgid "Done.\n"
msgstr "完成。\n"
-#: disk-utils/sfdisk.c:1922
+#: disk-utils/sfdisk.c:1923
msgid "Ignoring partition."
msgstr "忽略分区。"
-#: disk-utils/sfdisk.c:1933
+#: disk-utils/sfdisk.c:1934
#, fuzzy
#| msgid "Failed to apply script headers, disk label not created."
msgid "Failed to apply script headers, disk label not created"
msgstr "无法应用脚本标头(header),未创建磁盘标签。"
-#: disk-utils/sfdisk.c:1954
-#, fuzzy, c-format
-#| msgid "Failed to add #%d partition"
+#: disk-utils/sfdisk.c:1955
+#, c-format
msgid "Failed to add #%zu partition"
-msgstr "添加 #%d 分区失败"
+msgstr "添加 #%zu 分区失败"
-#: disk-utils/sfdisk.c:1977
+#: disk-utils/sfdisk.c:1978
msgid "Script header accepted."
msgstr "已接受脚本标头(header)。"
-#: disk-utils/sfdisk.c:1994
+#: disk-utils/sfdisk.c:1995
msgid "Failed to apply script headers, disk label not created."
msgstr "无法应用脚本标头(header),未创建磁盘标签。"
-#: disk-utils/sfdisk.c:2001
+#: disk-utils/sfdisk.c:2002
msgid ""
"\n"
"New situation:"
"\n"
"新状况:"
-#: disk-utils/sfdisk.c:2011
+#: disk-utils/sfdisk.c:2012
msgid "Do you want to write this to disk?"
msgstr "您想写入该磁盘吗?"
-#: disk-utils/sfdisk.c:2024
+#: disk-utils/sfdisk.c:2025
msgid "Leaving.\n"
msgstr "离开中。\n"
-#: disk-utils/sfdisk.c:2039
+#: disk-utils/sfdisk.c:2040
#, c-format
msgid ""
" %1$s [options] <dev> [[-N] <part>]\n"
" %1$s [选项] <设备> [[-N] <分区>]\n"
" %1$s [选项] <命令>\n"
-#: disk-utils/sfdisk.c:2046
+#: disk-utils/sfdisk.c:2047
msgid " -A, --activate <dev> [<part> ...] list or set bootable (P)MBR partitions\n"
msgstr " -A, --activate <设备> [<分区> ...] 列出或设置可启动的 (P)MBR 分区\n"
-#: disk-utils/sfdisk.c:2047
+#: disk-utils/sfdisk.c:2048
msgid " -d, --dump <dev> dump partition table (usable for later input)\n"
msgstr " -d, --dump <设备> 转储分区表(用于后续输入)\n"
-#: disk-utils/sfdisk.c:2048
+#: disk-utils/sfdisk.c:2049
msgid " -J, --json <dev> dump partition table in JSON format\n"
msgstr " -J, --json <设备> 以 JSON 格式转储分区表\n"
-#: disk-utils/sfdisk.c:2049
-#, fuzzy
-#| msgid " -b, --backup backup partition table sectors (see -O)\n"
+#: disk-utils/sfdisk.c:2050
msgid " -B, --backup-pt-sectors <dev> binary partition table backup (see -b and -O)\n"
-msgstr " -b, --backup 备份分区表扇区(见 -O)\n"
+msgstr " -B, --backup-pt-sectors <dev> 二进制分区表备份(参见 -b 和 -O)\n"
-#: disk-utils/sfdisk.c:2050
+#: disk-utils/sfdisk.c:2051
msgid " -g, --show-geometry [<dev> ...] list geometry of all or specified devices\n"
msgstr " -g, --show-geometry [<设备> ...] 列出所有或指定设备的几何属性\n"
-#: disk-utils/sfdisk.c:2051
+#: disk-utils/sfdisk.c:2052
msgid " -l, --list [<dev> ...] list partitions of each device\n"
msgstr " -l, --list [<设备> ...] 列出每台设备上的分区\n"
-#: disk-utils/sfdisk.c:2052
+#: disk-utils/sfdisk.c:2053
msgid " -F, --list-free [<dev> ...] list unpartitioned free areas of each device\n"
msgstr " -F, --list-free [<设备> ...] 列出每台设备上的未分区空间\n"
-#: disk-utils/sfdisk.c:2053
+#: disk-utils/sfdisk.c:2054
msgid " -r, --reorder <dev> fix partitions order (by start offset)\n"
msgstr " -r, --reorder <设备> (通过起始偏移量)修复分区顺序\n"
-#: disk-utils/sfdisk.c:2054
+#: disk-utils/sfdisk.c:2055
msgid " -s, --show-size [<dev> ...] list sizes of all or specified devices\n"
msgstr " -s, --show-size [<设备> ...] 列出所有或指定设备的大小\n"
-#: disk-utils/sfdisk.c:2055
+#: disk-utils/sfdisk.c:2056
msgid " -T, --list-types print the recognized types (see -X)\n"
msgstr " -T, --list-types 打印识别的类型(见 -X)\n"
-#: disk-utils/sfdisk.c:2056
+#: disk-utils/sfdisk.c:2057
msgid " -V, --verify [<dev> ...] test whether partitions seem correct\n"
msgstr " -V, --verify [<设备> ...] 测试分区是否正确\n"
-#: disk-utils/sfdisk.c:2057
+#: disk-utils/sfdisk.c:2058
msgid " --delete <dev> [<part> ...] delete all or specified partitions\n"
msgstr " --delete <设备> [<分区> ...] 删除所有或指定分区\n"
-#: disk-utils/sfdisk.c:2060
+#: disk-utils/sfdisk.c:2061
msgid " --part-label <dev> <part> [<str>] print or change partition label\n"
msgstr " --part-label <设备> <分区> [<字符串>] 打印或更改分区标签\n"
-#: disk-utils/sfdisk.c:2061
+#: disk-utils/sfdisk.c:2062
msgid " --part-type <dev> <part> [<type>] print or change partition type\n"
msgstr " --part-type <设备> <分区> [<类型>] 打印或更改分区类型\n"
-#: disk-utils/sfdisk.c:2062
+#: disk-utils/sfdisk.c:2063
msgid " --part-uuid <dev> <part> [<uuid>] print or change partition uuid\n"
msgstr " --part-uuid <设备> <分区> [<uuid>] 打印或更改分区 uuid\n"
-#: disk-utils/sfdisk.c:2063
+#: disk-utils/sfdisk.c:2064
msgid " --part-attrs <dev> <part> [<str>] print or change partition attributes\n"
msgstr " --part-attrs <设备> <分区> [<字符串>] 打印或更改分区属性\n"
-#: disk-utils/sfdisk.c:2066
+#: disk-utils/sfdisk.c:2067
msgid " --disk-id <dev> [<str>] print or change disk label ID (UUID)\n"
msgstr " --disk-id <设备> [<字符串>] 打印或更改磁盘标签 ID(UUID)\n"
-#: disk-utils/sfdisk.c:2067
+#: disk-utils/sfdisk.c:2068
msgid " --relocate <oper> <dev> move partition header\n"
msgstr " --relocate <oper> <设备> 移动分区头\n"
-#: disk-utils/sfdisk.c:2070
+#: disk-utils/sfdisk.c:2071
msgid " <dev> device (usually disk) path\n"
msgstr " <设备> 设备(通常是磁盘)的路径\n"
-#: disk-utils/sfdisk.c:2071
+#: disk-utils/sfdisk.c:2072
msgid " <part> partition number\n"
msgstr " <分区> 分区号\n"
-#: disk-utils/sfdisk.c:2072
+#: disk-utils/sfdisk.c:2073
msgid " <type> partition type, GUID for GPT, hex for MBR\n"
msgstr " <类型> 分区类型,GUID 对应 GPT,hex 对应 MBR\n"
-#: disk-utils/sfdisk.c:2075
+#: disk-utils/sfdisk.c:2076
msgid " -a, --append append partitions to existing partition table\n"
msgstr " -a, --append 将分区附加到已有分区表\n"
-#: disk-utils/sfdisk.c:2076
+#: disk-utils/sfdisk.c:2077
msgid " -b, --backup backup partition table sectors (see -O)\n"
msgstr " -b, --backup 备份分区表扇区(见 -O)\n"
-#: disk-utils/sfdisk.c:2077
+#: disk-utils/sfdisk.c:2078
msgid " --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
-#: disk-utils/sfdisk.c:2078
+#: disk-utils/sfdisk.c:2079
msgid " --move-data[=<typescript>] move partition data after relocation (requires -N)\n"
msgstr " --move-data[=<typescript>] 重新定位后移动分区数据(需要 -N)\n"
-#: disk-utils/sfdisk.c:2079
+#: disk-utils/sfdisk.c:2080
msgid " --move-use-fsync use fsync after each write when move data\n"
msgstr " --move-use-fsync 移动数据每次写入后调用 fsync\n"
-#: disk-utils/sfdisk.c:2080
+#: disk-utils/sfdisk.c:2081
msgid " -f, --force disable all consistency checking\n"
msgstr " -f, --force 禁用所有的一致性检查\n"
-#: disk-utils/sfdisk.c:2083
+#: disk-utils/sfdisk.c:2084
#, c-format
msgid " --color[=<when>] colorize output (%s, %s or %s)\n"
msgstr " --color[=<何时>] 彩色输出(%s, %s 或 %s)\n"
-#: disk-utils/sfdisk.c:2088
+#: disk-utils/sfdisk.c:2089
msgid " -N, --partno <num> specify partition number\n"
msgstr " -N, --partno <数字> 指定分区号\n"
-#: disk-utils/sfdisk.c:2089
+#: disk-utils/sfdisk.c:2090
msgid " -n, --no-act do everything except write to device\n"
msgstr " -n, --no-act 不真正执行写入设备\n"
-#: disk-utils/sfdisk.c:2090
+#: disk-utils/sfdisk.c:2091
msgid " --no-reread do not check whether the device is in use\n"
msgstr " --no-reread 不检查设备是否正在使用\n"
-#: disk-utils/sfdisk.c:2091
+#: disk-utils/sfdisk.c:2092
msgid " --no-tell-kernel do not tell kernel about changes\n"
msgstr " --no-tell-kernel 更改而不告诉内核\n"
-#: disk-utils/sfdisk.c:2092
+#: disk-utils/sfdisk.c:2093
msgid " -O, --backup-file <path> override default backup file name\n"
msgstr " -O, --backup-file <路径> 覆盖默认的备份文件名\n"
-#: disk-utils/sfdisk.c:2093
+#: disk-utils/sfdisk.c:2094
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: disk-utils/sfdisk.c:2094
+#: disk-utils/sfdisk.c:2095
msgid " -q, --quiet suppress extra info messages\n"
msgstr " -q, --quiet 禁止输出额外信息\n"
-#: disk-utils/sfdisk.c:2096
+#: disk-utils/sfdisk.c:2097
#, c-format
msgid " -w, --wipe <mode> wipe signatures (%s, %s or %s)\n"
msgstr " -w, --wipe <模式> 擦除签名(%s, %s 或 %s)\n"
-#: disk-utils/sfdisk.c:2099
+#: disk-utils/sfdisk.c:2100
msgid " -X, --label <name> specify label type (dos, gpt, ...)\n"
msgstr " -X, --label <名称> 指定标签类型(dos, gpt, ...)\n"
-#: disk-utils/sfdisk.c:2100
+#: disk-utils/sfdisk.c:2101
msgid " -Y, --label-nested <name> specify nested label type (dos, bsd)\n"
msgstr " -Y, --label-nested <名称> 指定嵌套标签类型(dos, bsd)\n"
-#: disk-utils/sfdisk.c:2102
+#: disk-utils/sfdisk.c:2103
msgid " -G, --show-pt-geometry deprecated, alias to --show-geometry\n"
msgstr " -G, --show-pt-geometry 已废弃,同 --show-geometry\n"
-#: disk-utils/sfdisk.c:2103
+#: disk-utils/sfdisk.c:2104
msgid " -L, --Linux deprecated, only for backward compatibility\n"
msgstr " -L, --Linux 已废弃,仅为向后兼容\n"
-#: disk-utils/sfdisk.c:2104
+#: disk-utils/sfdisk.c:2105
msgid " -u, --unit S deprecated, only sector unit is supported\n"
msgstr " -u, --unit S 已废弃,只支持扇区单位\n"
-#: disk-utils/sfdisk.c:2238
+#: disk-utils/sfdisk.c:2239
#, c-format
msgid "%s is deprecated in favour of --part-type"
msgstr "%s 已废弃,请改用 --part-type"
-#: disk-utils/sfdisk.c:2243
+#: disk-utils/sfdisk.c:2244
msgid "--id is deprecated in favour of --part-type"
msgstr "--id 已废弃,请改用 --part-type"
-#: disk-utils/sfdisk.c:2259
+#: disk-utils/sfdisk.c:2260
msgid "--show-pt-geometry is no more implemented. Using --show-geometry."
msgstr "--show-pt-geometry 不再实现。请使用 --show-geometry。"
-#: disk-utils/sfdisk.c:2271
+#: disk-utils/sfdisk.c:2272
msgid "--Linux option is unnecessary and deprecated"
msgstr "--Linux 选项没必要,并且已废弃"
-#: disk-utils/sfdisk.c:2300
+#: disk-utils/sfdisk.c:2301
#, c-format
msgid "unsupported unit '%c'"
msgstr "不支持的单位“%c”"
-#: disk-utils/sfdisk.c:2395
+#: disk-utils/sfdisk.c:2396
msgid "--movedata requires -N"
msgstr "--movedata 需要 -N"
msgid "ignore -U (UUIDs are unsupported)"
msgstr "忽略 -U (不支持 UUID)"
-#: include/c.h:288
+#: include/c.h:301
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "请尝试执行“%s --help”了解更多信息。\n"
-#: include/c.h:410
+#: include/c.h:446
msgid ""
"\n"
"Usage:\n"
"\n"
"用法:\n"
-#: include/c.h:411
+#: include/c.h:447
msgid ""
"\n"
"Options:\n"
"\n"
"选项:\n"
-#: include/c.h:412
+#: include/c.h:448
msgid ""
"\n"
"Functions:\n"
"\n"
"功能:\n"
-#: include/c.h:413
+#: include/c.h:449
msgid ""
"\n"
"Commands:\n"
"\n"
"命令:\n"
-#: include/c.h:414
+#: include/c.h:450
msgid ""
"\n"
"Arguments:\n"
"\n"
"参数:\n"
-#: include/c.h:415
+#: include/c.h:451
msgid ""
"\n"
"Available output columns:\n"
"\n"
"可用的输出列:\n"
-#: include/c.h:418
+#: include/c.h:454
msgid "display this help"
msgstr "显示此帮助"
-#: include/c.h:419
+#: include/c.h:455
msgid "display version"
msgstr "显示版本"
-#: include/c.h:429
+#: include/c.h:465
#, c-format
msgid ""
" %s arguments may be followed by the suffixes for\n"
" %s 参数可能跟随一个后缀,包括\n"
" GiB、TiB、PiB、EiB、ZiB 和 YiB(其中的“iB”是可选的)\n"
-#: include/c.h:432
+#: include/c.h:468
#, c-format
msgid ""
"\n"
"\n"
"更多信息请参阅 %s。\n"
-#: include/c.h:434
+#: include/c.h:470
#, c-format
msgid "%s from %s\n"
msgstr "%s,来自 %s\n"
-#: include/closestream.h:70 include/closestream.h:72 login-utils/vipw.c:272
+#: include/c.h:492 misc-utils/kill.c:237 term-utils/agetty.c:704
+#, fuzzy, c-format
+#| msgid "%s from %s\n"
+msgid "%s from %s"
+msgstr "%s,来自 %s\n"
+
+#: include/c.h:496
+msgid "features:"
+msgstr ""
+
+#: include/closestream.h:74 include/closestream.h:76 login-utils/vipw.c:272
#: login-utils/vipw.c:291 sys-utils/rtcwake.c:304 term-utils/setterm.c:833
msgid "write error"
msgstr "写出错"
msgid "colors are disabled by default"
msgstr "默认禁用颜色"
-#: include/env.h:25 lib/pager.c:153 login-utils/login.c:1203
-#: login-utils/login.c:1207 term-utils/agetty.c:1233
+#: include/env.h:26 lib/pager.c:158 login-utils/login.c:1203
+#: login-utils/login.c:1207 term-utils/agetty.c:1241
#, c-format
msgid "failed to set the %s environment variable"
msgstr "设置环境变量 %s 失败"
-#: include/optutils.h:85
+#: include/optutils.h:89
#, c-format
msgid "%s: mutually exclusive arguments:"
msgstr "%s:互斥参数:"
-#: include/pt-gpt-partnames.h:16
+#: include/pt-gpt-partnames.h:15
msgid "EFI System"
msgstr "EFI 系统"
-#: include/pt-gpt-partnames.h:18
+#: include/pt-gpt-partnames.h:17
msgid "MBR partition scheme"
msgstr "MBR 分区方案"
-#: include/pt-gpt-partnames.h:19
+#: include/pt-gpt-partnames.h:18
msgid "Intel Fast Flash"
msgstr "Intel Fast Flash"
-#: include/pt-gpt-partnames.h:22
+#: include/pt-gpt-partnames.h:21
msgid "BIOS boot"
msgstr "BIOS 启动"
-#: include/pt-gpt-partnames.h:25
+#: include/pt-gpt-partnames.h:24
msgid "Sony boot partition"
msgstr "Sony 启动分区"
-#: include/pt-gpt-partnames.h:26
+#: include/pt-gpt-partnames.h:25
msgid "Lenovo boot partition"
msgstr "Lenovo 启动分区"
-#: include/pt-gpt-partnames.h:29
+#: include/pt-gpt-partnames.h:28
msgid "PowerPC PReP boot"
msgstr "PowerPC PReP boot"
-#: include/pt-gpt-partnames.h:32
+#: include/pt-gpt-partnames.h:31
msgid "ONIE boot"
msgstr "ONIE boot"
-#: include/pt-gpt-partnames.h:33
+#: include/pt-gpt-partnames.h:32
msgid "ONIE config"
msgstr "ONIE 配置"
-#: include/pt-gpt-partnames.h:36
+#: include/pt-gpt-partnames.h:35
msgid "Microsoft reserved"
msgstr "Microsoft 保留"
-#: include/pt-gpt-partnames.h:37
+#: include/pt-gpt-partnames.h:36
msgid "Microsoft basic data"
msgstr "Microsoft 基本数据"
-#: include/pt-gpt-partnames.h:38
+#: include/pt-gpt-partnames.h:37
msgid "Microsoft LDM metadata"
msgstr "Microsoft LDM 元数据"
-#: include/pt-gpt-partnames.h:39
+#: include/pt-gpt-partnames.h:38
msgid "Microsoft LDM data"
msgstr "Microsoft LDM 数据"
-#: include/pt-gpt-partnames.h:40
+#: include/pt-gpt-partnames.h:39
msgid "Windows recovery environment"
msgstr "Windows 恢复环境"
-#: include/pt-gpt-partnames.h:41
+#: include/pt-gpt-partnames.h:40
msgid "IBM General Parallel Fs"
msgstr "IBM 通用并行文件系统"
-#: include/pt-gpt-partnames.h:42
+#: include/pt-gpt-partnames.h:41
msgid "Microsoft Storage Spaces"
msgstr "Microsoft 存储空间"
-#: include/pt-gpt-partnames.h:45
+#: include/pt-gpt-partnames.h:44
msgid "HP-UX data"
msgstr "HP-UX 数据"
-#: include/pt-gpt-partnames.h:46
+#: include/pt-gpt-partnames.h:45
msgid "HP-UX service"
msgstr "HP-UX 服务"
-#: include/pt-gpt-partnames.h:49 libfdisk/src/sgi.c:60 libfdisk/src/sun.c:51
+#: include/pt-gpt-partnames.h:48 libfdisk/src/sgi.c:60 libfdisk/src/sun.c:51
msgid "Linux swap"
msgstr "Linux swap"
-#: include/pt-gpt-partnames.h:50
+#: include/pt-gpt-partnames.h:49
msgid "Linux filesystem"
msgstr "Linux 文件系统"
-#: include/pt-gpt-partnames.h:51
+#: include/pt-gpt-partnames.h:50
msgid "Linux server data"
msgstr "Linux 保留数据"
-#: include/pt-gpt-partnames.h:52
+#: include/pt-gpt-partnames.h:51
msgid "Linux root (x86)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:53
+#: include/pt-gpt-partnames.h:52
msgid "Linux root (x86-64)"
msgstr "Linux root (x86-64)"
-#: include/pt-gpt-partnames.h:54
-#, fuzzy
-#| msgid "Linux root (ARM)"
+#: include/pt-gpt-partnames.h:53
msgid "Linux root (Alpha)"
-msgstr "Linux root (ARM)"
+msgstr "Linux root (Alpha)"
-#: include/pt-gpt-partnames.h:55
-#, fuzzy
-#| msgid "Linux root (ARM)"
+#: include/pt-gpt-partnames.h:54
msgid "Linux root (ARC)"
-msgstr "Linux root (ARM)"
+msgstr "Linux root (ARC)"
-#: include/pt-gpt-partnames.h:56
+#: include/pt-gpt-partnames.h:55
msgid "Linux root (ARM)"
msgstr "Linux root (ARM)"
-#: include/pt-gpt-partnames.h:57
+#: include/pt-gpt-partnames.h:56
msgid "Linux root (ARM-64)"
msgstr "Linux root (ARM-64)"
-#: include/pt-gpt-partnames.h:58
+#: include/pt-gpt-partnames.h:57
msgid "Linux root (IA-64)"
msgstr "Linux root (IA-64)"
-#: include/pt-gpt-partnames.h:59
-#, fuzzy
-#| msgid "Linux root (IA-64)"
+#: include/pt-gpt-partnames.h:58
msgid "Linux root (LoongArch-64)"
-msgstr "Linux root (IA-64)"
+msgstr "Linux root (LoongArch-64)"
-#: include/pt-gpt-partnames.h:60
-#, fuzzy
-#| msgid "Linux root (IA-64)"
+#: include/pt-gpt-partnames.h:59
msgid "Linux root (MIPS-32 LE)"
-msgstr "Linux root (IA-64)"
+msgstr "Linux root (MIPS-32 LE)"
+
+#: include/pt-gpt-partnames.h:60
+msgid "Linux root (MIPS-64 LE)"
+msgstr "Linux root (MIPS-64 LE)"
#: include/pt-gpt-partnames.h:61
#, fuzzy
-#| msgid "Linux root (IA-64)"
-msgid "Linux root (MIPS-64 LE)"
-msgstr "Linux root (IA-64)"
+#| msgid "Linux root (ARC)"
+msgid "Linux root (HPPA/PARISC)"
+msgstr "Linux root (ARC)"
#: include/pt-gpt-partnames.h:62
-#, fuzzy
-#| msgid "Linux root (x86)"
msgid "Linux root (PPC)"
-msgstr "Linux root (x86)"
+msgstr "Linux root (PPC)"
#: include/pt-gpt-partnames.h:63
-#, fuzzy
-#| msgid "Linux root (IA-64)"
msgid "Linux root (PPC64)"
-msgstr "Linux root (IA-64)"
+msgstr "Linux root (PPC64)"
#: include/pt-gpt-partnames.h:64
-#, fuzzy
-#| msgid "Linux root (IA-64)"
msgid "Linux root (PPC64LE)"
-msgstr "Linux root (IA-64)"
+msgstr "Linux root (PPC64LE)"
#: include/pt-gpt-partnames.h:65
-#, fuzzy
-#| msgid "Linux root (IA-64)"
msgid "Linux root (RISC-V-32)"
-msgstr "Linux root (IA-64)"
+msgstr "Linux root (RISC-V-32)"
#: include/pt-gpt-partnames.h:66
-#, fuzzy
-#| msgid "Linux root (IA-64)"
msgid "Linux root (RISC-V-64)"
-msgstr "Linux root (IA-64)"
+msgstr "Linux root (RISC-V-64)"
#: include/pt-gpt-partnames.h:67
-#, fuzzy
-#| msgid "Linux root (x86)"
msgid "Linux root (S390)"
-msgstr "Linux root (x86)"
+msgstr "Linux root (S390)"
#: include/pt-gpt-partnames.h:68
-#, fuzzy
-#| msgid "Linux root (x86)"
msgid "Linux root (S390X)"
-msgstr "Linux root (x86)"
+msgstr "Linux root (S390X)"
#: include/pt-gpt-partnames.h:69
-#, fuzzy
-#| msgid "Linux root (IA-64)"
msgid "Linux root (TILE-Gx)"
-msgstr "Linux root (IA-64)"
+msgstr "Linux root (TILE-Gx)"
#: include/pt-gpt-partnames.h:70
msgid "Linux reserved"
msgid "Linux RAID"
msgstr "Linux RAID"
-#: include/pt-gpt-partnames.h:73 include/pt-mbr-partnames.h:61
+#: include/pt-gpt-partnames.h:73 include/pt-mbr-partnames.h:65
#: libfdisk/src/sgi.c:62 libfdisk/src/sun.c:53
msgid "Linux LVM"
msgstr "Linux LVM"
msgstr "Linux /usr (x86-64)"
#: include/pt-gpt-partnames.h:78
-#, fuzzy
-#| msgid "Linux /usr (ARM)"
msgid "Linux /usr (Alpha)"
-msgstr "Linux /usr (ARM)"
+msgstr "Linux /usr (Alpha)"
#: include/pt-gpt-partnames.h:79
-#, fuzzy
-#| msgid "Linux /usr (ARM)"
msgid "Linux /usr (ARC)"
-msgstr "Linux /usr (ARM)"
+msgstr "Linux /usr (ARC)"
#: include/pt-gpt-partnames.h:80
msgid "Linux /usr (ARM)"
msgstr "Linux /usr (IA-64)"
#: include/pt-gpt-partnames.h:83
-#, fuzzy
-#| msgid "Linux /usr (IA-64)"
msgid "Linux /usr (LoongArch-64)"
-msgstr "Linux /usr (IA-64)"
+msgstr "Linux /usr (LoongArch-64)"
#: include/pt-gpt-partnames.h:84
-#, fuzzy
-#| msgid "Linux /usr (IA-64)"
msgid "Linux /usr (MIPS-32 LE)"
-msgstr "Linux /usr (IA-64)"
+msgstr "Linux /usr (MIPS-32 LE)"
#: include/pt-gpt-partnames.h:85
-#, fuzzy
-#| msgid "Linux /usr (IA-64)"
msgid "Linux /usr (MIPS-64 LE)"
-msgstr "Linux /usr (IA-64)"
+msgstr "Linux /usr (MIPS-64 LE)"
#: include/pt-gpt-partnames.h:86
#, fuzzy
-#| msgid "Linux /usr (x86)"
-msgid "Linux /usr (PPC)"
-msgstr "Linux /usr (x86)"
+#| msgid "Linux /usr (ARC)"
+msgid "Linux /usr (HPPA/PARISC)"
+msgstr "Linux /usr (ARC)"
#: include/pt-gpt-partnames.h:87
-#, fuzzy
-#| msgid "Linux /usr (IA-64)"
-msgid "Linux /usr (PPC64)"
-msgstr "Linux /usr (IA-64)"
+msgid "Linux /usr (PPC)"
+msgstr "Linux /usr (PPC)"
#: include/pt-gpt-partnames.h:88
-#, fuzzy
-#| msgid "Linux /usr (IA-64)"
-msgid "Linux /usr (PPC64LE)"
-msgstr "Linux /usr (IA-64)"
+msgid "Linux /usr (PPC64)"
+msgstr "Linux /usr (PPC64)"
#: include/pt-gpt-partnames.h:89
-#, fuzzy
-#| msgid "Linux /usr (IA-64)"
-msgid "Linux /usr (RISC-V-32)"
-msgstr "Linux /usr (IA-64)"
+msgid "Linux /usr (PPC64LE)"
+msgstr "Linux /usr (PPC64LE)"
#: include/pt-gpt-partnames.h:90
-#, fuzzy
-#| msgid "Linux /usr (IA-64)"
-msgid "Linux /usr (RISC-V-64)"
-msgstr "Linux /usr (IA-64)"
+msgid "Linux /usr (RISC-V-32)"
+msgstr "Linux /usr (RISC-V-32)"
#: include/pt-gpt-partnames.h:91
-#, fuzzy
-#| msgid "Linux /usr (x86)"
-msgid "Linux /usr (S390)"
-msgstr "Linux /usr (x86)"
+msgid "Linux /usr (RISC-V-64)"
+msgstr "Linux /usr (RISC-V-64)"
#: include/pt-gpt-partnames.h:92
-#, fuzzy
-#| msgid "Linux /usr (x86)"
-msgid "Linux /usr (S390X)"
-msgstr "Linux /usr (x86)"
+msgid "Linux /usr (S390)"
+msgstr "Linux /usr (S390)"
#: include/pt-gpt-partnames.h:93
-#, fuzzy
-#| msgid "Linux /usr (IA-64)"
-msgid "Linux /usr (TILE-Gx)"
-msgstr "Linux /usr (IA-64)"
+msgid "Linux /usr (S390X)"
+msgstr "Linux /usr (S390X)"
#: include/pt-gpt-partnames.h:94
+msgid "Linux /usr (TILE-Gx)"
+msgstr "Linux /usr (TILE-Gx)"
+
+#: include/pt-gpt-partnames.h:95
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux root verity (x86)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:95
+#: include/pt-gpt-partnames.h:96
#, fuzzy
#| msgid "Linux root (x86-64)"
msgid "Linux root verity (x86-64)"
msgstr "Linux root (x86-64)"
-#: include/pt-gpt-partnames.h:96
+#: include/pt-gpt-partnames.h:97
#, fuzzy
#| msgid "Linux root (ARM)"
msgid "Linux root verity (Alpha)"
msgstr "Linux root (ARM)"
-#: include/pt-gpt-partnames.h:97
+#: include/pt-gpt-partnames.h:98
#, fuzzy
#| msgid "Linux root (ARM)"
msgid "Linux root verity (ARC)"
msgstr "Linux root (ARM)"
-#: include/pt-gpt-partnames.h:98
+#: include/pt-gpt-partnames.h:99
#, fuzzy
#| msgid "Linux root (ARM)"
msgid "Linux root verity (ARM)"
msgstr "Linux root (ARM)"
-#: include/pt-gpt-partnames.h:99
+#: include/pt-gpt-partnames.h:100
#, fuzzy
#| msgid "Linux root (ARM-64)"
msgid "Linux root verity (ARM-64)"
msgstr "Linux root (ARM-64)"
-#: include/pt-gpt-partnames.h:100
+#: include/pt-gpt-partnames.h:101
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity (IA-64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:101
+#: include/pt-gpt-partnames.h:102
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity (LoongArch-64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:102
+#: include/pt-gpt-partnames.h:103
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity (MIPS-32 LE)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:103
+#: include/pt-gpt-partnames.h:104
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity (MIPS-64 LE)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:104
+#: include/pt-gpt-partnames.h:105
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux root verity (HPPA/PARISC)"
+msgstr "Linux root (ARM)"
+
+#: include/pt-gpt-partnames.h:106
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux root verity (PPC)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:105
+#: include/pt-gpt-partnames.h:107
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity (PPC64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:106
+#: include/pt-gpt-partnames.h:108
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity (PPC64LE)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:107
+#: include/pt-gpt-partnames.h:109
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity (RISC-V-32)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:108
+#: include/pt-gpt-partnames.h:110
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity (RISC-V-64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:109
+#: include/pt-gpt-partnames.h:111
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux root verity (S390)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:110
+#: include/pt-gpt-partnames.h:112
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux root verity (S390X)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:111
+#: include/pt-gpt-partnames.h:113
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity (TILE-Gx)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:112
+#: include/pt-gpt-partnames.h:114
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux /usr verity (x86)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:113
+#: include/pt-gpt-partnames.h:115
#, fuzzy
#| msgid "Linux root (x86-64)"
msgid "Linux /usr verity (x86-64)"
msgstr "Linux root (x86-64)"
-#: include/pt-gpt-partnames.h:114
+#: include/pt-gpt-partnames.h:116
#, fuzzy
#| msgid "Linux root (ARM)"
msgid "Linux /usr verity (Alpha)"
msgstr "Linux root (ARM)"
-#: include/pt-gpt-partnames.h:115
+#: include/pt-gpt-partnames.h:117
#, fuzzy
#| msgid "Linux root (ARM)"
msgid "Linux /usr verity (ARC)"
msgstr "Linux root (ARM)"
-#: include/pt-gpt-partnames.h:116
+#: include/pt-gpt-partnames.h:118
#, fuzzy
#| msgid "Linux root (ARM)"
msgid "Linux /usr verity (ARM)"
msgstr "Linux root (ARM)"
-#: include/pt-gpt-partnames.h:117
+#: include/pt-gpt-partnames.h:119
#, fuzzy
#| msgid "Linux root (ARM-64)"
msgid "Linux /usr verity (ARM-64)"
msgstr "Linux root (ARM-64)"
-#: include/pt-gpt-partnames.h:118
+#: include/pt-gpt-partnames.h:120
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity (IA-64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:119
+#: include/pt-gpt-partnames.h:121
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity (LoongArch-64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:120
+#: include/pt-gpt-partnames.h:122
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity (MIPS-32 LE)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:121
+#: include/pt-gpt-partnames.h:123
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity (MIPS-64 LE)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:122
+#: include/pt-gpt-partnames.h:124
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux /usr verity (HPPA/PARISC)"
+msgstr "Linux root (ARM)"
+
+#: include/pt-gpt-partnames.h:125
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux /usr verity (PPC)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:123
+#: include/pt-gpt-partnames.h:126
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity (PPC64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:124
+#: include/pt-gpt-partnames.h:127
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity (PPC64LE)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:125
+#: include/pt-gpt-partnames.h:128
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity (RISC-V-32)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:126
+#: include/pt-gpt-partnames.h:129
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity (RISC-V-64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:127
+#: include/pt-gpt-partnames.h:130
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux /usr verity (S390)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:128
+#: include/pt-gpt-partnames.h:131
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux /usr verity (S390X)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:129
+#: include/pt-gpt-partnames.h:132
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity (TILE-Gx)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:130
+#: include/pt-gpt-partnames.h:133
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux root verity sign. (x86)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:131
+#: include/pt-gpt-partnames.h:134
#, fuzzy
#| msgid "Linux root (x86-64)"
msgid "Linux root verity sign. (x86-64)"
msgstr "Linux root (x86-64)"
-#: include/pt-gpt-partnames.h:132
+#: include/pt-gpt-partnames.h:135
#, fuzzy
#| msgid "Linux root (ARM)"
msgid "Linux root verity sign. (Alpha)"
msgstr "Linux root (ARM)"
-#: include/pt-gpt-partnames.h:133
+#: include/pt-gpt-partnames.h:136
#, fuzzy
#| msgid "Linux root (ARM)"
msgid "Linux root verity sign. (ARC)"
msgstr "Linux root (ARM)"
-#: include/pt-gpt-partnames.h:134
+#: include/pt-gpt-partnames.h:137
#, fuzzy
#| msgid "Linux root (ARM)"
msgid "Linux root verity sign. (ARM)"
msgstr "Linux root (ARM)"
-#: include/pt-gpt-partnames.h:135
+#: include/pt-gpt-partnames.h:138
#, fuzzy
#| msgid "Linux root (ARM-64)"
msgid "Linux root verity sign. (ARM-64)"
msgstr "Linux root (ARM-64)"
-#: include/pt-gpt-partnames.h:136
+#: include/pt-gpt-partnames.h:139
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity sign. (IA-64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:137
+#: include/pt-gpt-partnames.h:140
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity sign. (LoongArch-64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:138
+#: include/pt-gpt-partnames.h:141
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity sign. (MIPS-32 LE)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:139
+#: include/pt-gpt-partnames.h:142
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity sign. (MIPS-64 LE)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:140
+#: include/pt-gpt-partnames.h:143
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux root verity sign. (HPPA/PARISC)"
+msgstr "Linux root (ARM)"
+
+#: include/pt-gpt-partnames.h:144
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux root verity sign. (PPC)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:141
+#: include/pt-gpt-partnames.h:145
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity sign. (PPC64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:142
+#: include/pt-gpt-partnames.h:146
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity sign. (PPC64LE)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:143
+#: include/pt-gpt-partnames.h:147
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity sign. (RISC-V-32)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:144
+#: include/pt-gpt-partnames.h:148
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity sign. (RISC-V-64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:145
+#: include/pt-gpt-partnames.h:149
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux root verity sign. (S390)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:146
+#: include/pt-gpt-partnames.h:150
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux root verity sign. (S390X)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:147
+#: include/pt-gpt-partnames.h:151
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux root verity sign. (TILE-Gx)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:148
+#: include/pt-gpt-partnames.h:152
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux /usr verity sign. (x86)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:149
+#: include/pt-gpt-partnames.h:153
#, fuzzy
#| msgid "Linux root (x86-64)"
msgid "Linux /usr verity sign. (x86-64)"
msgstr "Linux root (x86-64)"
-#: include/pt-gpt-partnames.h:150
+#: include/pt-gpt-partnames.h:154
#, fuzzy
#| msgid "Linux root (ARM)"
msgid "Linux /usr verity sign. (Alpha)"
msgstr "Linux root (ARM)"
-#: include/pt-gpt-partnames.h:151
+#: include/pt-gpt-partnames.h:155
#, fuzzy
#| msgid "Linux root (ARM)"
msgid "Linux /usr verity sign. (ARC)"
msgstr "Linux root (ARM)"
-#: include/pt-gpt-partnames.h:152
+#: include/pt-gpt-partnames.h:156
#, fuzzy
#| msgid "Linux root (ARM)"
msgid "Linux /usr verity sign. (ARM)"
msgstr "Linux root (ARM)"
-#: include/pt-gpt-partnames.h:153
+#: include/pt-gpt-partnames.h:157
#, fuzzy
#| msgid "Linux root (ARM-64)"
msgid "Linux /usr verity sign. (ARM-64)"
msgstr "Linux root (ARM-64)"
-#: include/pt-gpt-partnames.h:154
+#: include/pt-gpt-partnames.h:158
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity sign. (IA-64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:155
+#: include/pt-gpt-partnames.h:159
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity sign. (LoongArch-64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:156
+#: include/pt-gpt-partnames.h:160
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity sign. (MIPS-32 LE)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:157
+#: include/pt-gpt-partnames.h:161
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity sign. (MIPS-64 LE)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:158
+#: include/pt-gpt-partnames.h:162
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux /usr verity sign. (HPPA/PARISC)"
+msgstr "Linux root (ARM)"
+
+#: include/pt-gpt-partnames.h:163
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux /usr verity sign. (PPC)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:159
+#: include/pt-gpt-partnames.h:164
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity sign. (PPC64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:160
+#: include/pt-gpt-partnames.h:165
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity sign. (PPC64LE)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:161
+#: include/pt-gpt-partnames.h:166
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity sign. (RISC-V-32)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:162
+#: include/pt-gpt-partnames.h:167
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity sign. (RISC-V-64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:163
+#: include/pt-gpt-partnames.h:168
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux /usr verity sign. (S390)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:164
+#: include/pt-gpt-partnames.h:169
#, fuzzy
#| msgid "Linux root (x86)"
msgid "Linux /usr verity sign. (S390X)"
msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:165
+#: include/pt-gpt-partnames.h:170
#, fuzzy
#| msgid "Linux root\t(IA-64)"
msgid "Linux /usr verity sign. (TILE-Gx)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:171 include/pt-mbr-partnames.h:95
+#: include/pt-gpt-partnames.h:176 include/pt-mbr-partnames.h:99
msgid "Linux extended boot"
msgstr "Linux 扩展启动"
-#: include/pt-gpt-partnames.h:174
+#: include/pt-gpt-partnames.h:179
msgid "Linux user's home"
msgstr "Linux 用户家分区"
-#: include/pt-gpt-partnames.h:177
+#: include/pt-gpt-partnames.h:182
msgid "FreeBSD data"
msgstr "FreeBSD 数据"
-#: include/pt-gpt-partnames.h:178
+#: include/pt-gpt-partnames.h:183
msgid "FreeBSD boot"
msgstr "FreeBSD 启动"
-#: include/pt-gpt-partnames.h:179
+#: include/pt-gpt-partnames.h:184
msgid "FreeBSD swap"
msgstr "FreeBSD 交换"
-#: include/pt-gpt-partnames.h:180
+#: include/pt-gpt-partnames.h:185
msgid "FreeBSD UFS"
msgstr "FreeBSD UFS"
-#: include/pt-gpt-partnames.h:181
+#: include/pt-gpt-partnames.h:186
msgid "FreeBSD ZFS"
msgstr "FreeBSD ZFS"
-#: include/pt-gpt-partnames.h:182
+#: include/pt-gpt-partnames.h:187
msgid "FreeBSD Vinum"
msgstr "FreeBSD Vinum"
-#: include/pt-gpt-partnames.h:185
+#: include/pt-gpt-partnames.h:190
msgid "Apple HFS/HFS+"
msgstr "Apple HFS/HFS+"
-#: include/pt-gpt-partnames.h:186
+#: include/pt-gpt-partnames.h:191
msgid "Apple APFS"
msgstr "Apple APFS"
-#: include/pt-gpt-partnames.h:187
+#: include/pt-gpt-partnames.h:192
msgid "Apple UFS"
msgstr "Apple UFS"
-#: include/pt-gpt-partnames.h:188
+#: include/pt-gpt-partnames.h:193
msgid "Apple RAID"
msgstr "Apple RAID"
-#: include/pt-gpt-partnames.h:189
+#: include/pt-gpt-partnames.h:194
msgid "Apple RAID offline"
msgstr "Apple RAID 离线"
-#: include/pt-gpt-partnames.h:190
+#: include/pt-gpt-partnames.h:195
msgid "Apple boot"
msgstr "Apple 启动"
-#: include/pt-gpt-partnames.h:191
+#: include/pt-gpt-partnames.h:196
msgid "Apple label"
msgstr "Apple 标签"
-#: include/pt-gpt-partnames.h:192
+#: include/pt-gpt-partnames.h:197
msgid "Apple TV recovery"
msgstr "Apple TV 恢复"
-#: include/pt-gpt-partnames.h:193
+#: include/pt-gpt-partnames.h:198
msgid "Apple Core storage"
msgstr "Apple Core 存储"
-#: include/pt-gpt-partnames.h:196 include/pt-mbr-partnames.h:77
+#: include/pt-gpt-partnames.h:199
+#, fuzzy
+#| msgid "Apple boot"
+msgid "Apple Silicon boot"
+msgstr "Apple 启动"
+
+#: include/pt-gpt-partnames.h:200
+#, fuzzy
+#| msgid "Apple TV recovery"
+msgid "Apple Silicon recovery"
+msgstr "Apple TV 恢复"
+
+#: include/pt-gpt-partnames.h:203 include/pt-mbr-partnames.h:81
msgid "Solaris boot"
msgstr "Solaris 启动"
-#: include/pt-gpt-partnames.h:197
+#: include/pt-gpt-partnames.h:204
msgid "Solaris root"
msgstr "Solaris root"
-#: include/pt-gpt-partnames.h:199
+#: include/pt-gpt-partnames.h:206
msgid "Solaris /usr & Apple ZFS"
msgstr "Solaris /usr & Apple ZFS"
-#: include/pt-gpt-partnames.h:200
+#: include/pt-gpt-partnames.h:207
msgid "Solaris swap"
msgstr "Solaris 交换"
-#: include/pt-gpt-partnames.h:201
+#: include/pt-gpt-partnames.h:208
msgid "Solaris backup"
msgstr "Solaris 备份"
-#: include/pt-gpt-partnames.h:202
+#: include/pt-gpt-partnames.h:209
msgid "Solaris /var"
msgstr "Solaris /var"
-#: include/pt-gpt-partnames.h:203
+#: include/pt-gpt-partnames.h:210
msgid "Solaris /home"
msgstr "Solaris /home"
-#: include/pt-gpt-partnames.h:204
+#: include/pt-gpt-partnames.h:211
msgid "Solaris alternate sector"
msgstr "Solaris 备选扇区"
-#: include/pt-gpt-partnames.h:205
+#: include/pt-gpt-partnames.h:212
msgid "Solaris reserved 1"
msgstr "Solaris 保留 1"
-#: include/pt-gpt-partnames.h:206
+#: include/pt-gpt-partnames.h:213
msgid "Solaris reserved 2"
msgstr "Solaris 保留 2"
-#: include/pt-gpt-partnames.h:207
+#: include/pt-gpt-partnames.h:214
msgid "Solaris reserved 3"
msgstr "Solaris 保留 3"
-#: include/pt-gpt-partnames.h:208
+#: include/pt-gpt-partnames.h:215
msgid "Solaris reserved 4"
msgstr "Solaris 保留 4"
-#: include/pt-gpt-partnames.h:209
+#: include/pt-gpt-partnames.h:216
msgid "Solaris reserved 5"
msgstr "Solaris 保留 5"
-#: include/pt-gpt-partnames.h:217
+#: include/pt-gpt-partnames.h:224
msgid "NetBSD swap"
msgstr "NetBSD 交换"
-#: include/pt-gpt-partnames.h:218
+#: include/pt-gpt-partnames.h:225
msgid "NetBSD FFS"
msgstr "NetBSD FFS"
-#: include/pt-gpt-partnames.h:219
+#: include/pt-gpt-partnames.h:226
msgid "NetBSD LFS"
msgstr "NetBSD LFS"
-#: include/pt-gpt-partnames.h:220
+#: include/pt-gpt-partnames.h:227
msgid "NetBSD concatenated"
msgstr "NetBSD concatenated"
-#: include/pt-gpt-partnames.h:221
+#: include/pt-gpt-partnames.h:228
msgid "NetBSD encrypted"
msgstr "NetBSD 加密"
-#: include/pt-gpt-partnames.h:222
+#: include/pt-gpt-partnames.h:229
msgid "NetBSD RAID"
msgstr "NetBSD RAID"
-#: include/pt-gpt-partnames.h:225
+#: include/pt-gpt-partnames.h:232
msgid "ChromeOS kernel"
msgstr "ChromeOS 内核"
-#: include/pt-gpt-partnames.h:226
+#: include/pt-gpt-partnames.h:233
msgid "ChromeOS root fs"
msgstr "ChromeOS 根文件系统"
-#: include/pt-gpt-partnames.h:227
+#: include/pt-gpt-partnames.h:234
msgid "ChromeOS reserved"
msgstr "ChromeOS 保留"
-#: include/pt-gpt-partnames.h:230
+#: include/pt-gpt-partnames.h:237
msgid "MidnightBSD data"
msgstr "MidnightBSD 数据"
-#: include/pt-gpt-partnames.h:231
+#: include/pt-gpt-partnames.h:238
msgid "MidnightBSD boot"
msgstr "MidnightBSD 启动"
-#: include/pt-gpt-partnames.h:232
+#: include/pt-gpt-partnames.h:239
msgid "MidnightBSD swap"
msgstr "MidnightBSD 交换"
-#: include/pt-gpt-partnames.h:233
+#: include/pt-gpt-partnames.h:240
msgid "MidnightBSD UFS"
msgstr "MidnightBSD UFS"
-#: include/pt-gpt-partnames.h:234
+#: include/pt-gpt-partnames.h:241
msgid "MidnightBSD ZFS"
msgstr "MidnightBSD ZFS"
-#: include/pt-gpt-partnames.h:235
+#: include/pt-gpt-partnames.h:242
msgid "MidnightBSD Vinum"
msgstr "MidnightBSD Vinum"
-#: include/pt-gpt-partnames.h:238
+#: include/pt-gpt-partnames.h:245
msgid "Ceph Journal"
msgstr "Ceph 日志"
-#: include/pt-gpt-partnames.h:239
+#: include/pt-gpt-partnames.h:246
msgid "Ceph Encrypted Journal"
msgstr "Ceph 加密日志"
-#: include/pt-gpt-partnames.h:240
+#: include/pt-gpt-partnames.h:247
msgid "Ceph OSD"
msgstr "Ceph OSD"
-#: include/pt-gpt-partnames.h:241
+#: include/pt-gpt-partnames.h:248
msgid "Ceph crypt OSD"
msgstr "Ceph 加密 OSD"
-#: include/pt-gpt-partnames.h:242
+#: include/pt-gpt-partnames.h:249
msgid "Ceph disk in creation"
msgstr "创建中的 Ceph 磁盘"
-#: include/pt-gpt-partnames.h:243
+#: include/pt-gpt-partnames.h:250
msgid "Ceph crypt disk in creation"
msgstr "创建中的加密 Ceph 磁盘"
-#: include/pt-gpt-partnames.h:246 include/pt-mbr-partnames.h:105
+#: include/pt-gpt-partnames.h:253 include/pt-mbr-partnames.h:109
msgid "VMware VMFS"
msgstr "VMware VMFS"
-#: include/pt-gpt-partnames.h:247
+#: include/pt-gpt-partnames.h:254
msgid "VMware Diagnostic"
msgstr "VMware 诊断"
-#: include/pt-gpt-partnames.h:248
+#: include/pt-gpt-partnames.h:255
msgid "VMware Virtual SAN"
msgstr "VMware Virtual SAN"
-#: include/pt-gpt-partnames.h:249
+#: include/pt-gpt-partnames.h:256
msgid "VMware Virsto"
msgstr "VMware Virsto"
-#: include/pt-gpt-partnames.h:250
+#: include/pt-gpt-partnames.h:257
msgid "VMware Reserved"
msgstr "VMware 保留"
-#: include/pt-gpt-partnames.h:253
+#: include/pt-gpt-partnames.h:260
msgid "OpenBSD data"
msgstr "OpenBSD 数据"
-#: include/pt-gpt-partnames.h:256
+#: include/pt-gpt-partnames.h:263
msgid "QNX6 file system"
msgstr "QNX6 文件系统"
-#: include/pt-gpt-partnames.h:259
+#: include/pt-gpt-partnames.h:266
msgid "Plan 9 partition"
msgstr "Plan 9 分区"
-#: include/pt-gpt-partnames.h:262
-#, fuzzy
-#| msgid "HiFive Unleashed FSBL"
+#: include/pt-gpt-partnames.h:269
msgid "HiFive FSBL"
-msgstr "HiFive Unleashed FSBL"
+msgstr "HiFive FSBL"
-#: include/pt-gpt-partnames.h:263
-#, fuzzy
-#| msgid "HiFive Unleashed BBL"
+#: include/pt-gpt-partnames.h:270
msgid "HiFive BBL"
-msgstr "HiFive Unleashed BBL"
+msgstr "HiFive BBL"
-#: include/pt-gpt-partnames.h:266
+#: include/pt-gpt-partnames.h:273
msgid "Haiku BFS"
+msgstr "Haiku BFS"
+
+#: include/pt-gpt-partnames.h:276
+msgid "Marvell Armada 3700 Boot partition"
msgstr ""
-#: include/pt-mbr-partnames.h:1
+#: include/pt-mbr-partnames.h:5
msgid "Empty"
msgstr "空"
-#: include/pt-mbr-partnames.h:2
+#: include/pt-mbr-partnames.h:6
msgid "FAT12"
msgstr "FAT12"
-#: include/pt-mbr-partnames.h:3
+#: include/pt-mbr-partnames.h:7
msgid "XENIX root"
msgstr "XENIX root"
-#: include/pt-mbr-partnames.h:4
+#: include/pt-mbr-partnames.h:8
msgid "XENIX usr"
msgstr "XENIX usr"
-#: include/pt-mbr-partnames.h:5
+#: include/pt-mbr-partnames.h:9
msgid "FAT16 <32M"
msgstr "FAT16 <32M"
-#: include/pt-mbr-partnames.h:6
+#: include/pt-mbr-partnames.h:10
msgid "Extended"
msgstr "扩展"
-#: include/pt-mbr-partnames.h:7
+#: include/pt-mbr-partnames.h:11
msgid "FAT16"
msgstr "FAT16"
-#: include/pt-mbr-partnames.h:8
+#: include/pt-mbr-partnames.h:12
msgid "HPFS/NTFS/exFAT"
msgstr "HPFS/NTFS/exFAT"
-#: include/pt-mbr-partnames.h:9
+#: include/pt-mbr-partnames.h:13
msgid "AIX"
msgstr "AIX"
-#: include/pt-mbr-partnames.h:10
+#: include/pt-mbr-partnames.h:14
msgid "AIX bootable"
msgstr "AIX 可启动"
-#: include/pt-mbr-partnames.h:11
+#: include/pt-mbr-partnames.h:15
msgid "OS/2 Boot Manager"
msgstr "OS/2 启动管理器"
-#: include/pt-mbr-partnames.h:12
+#: include/pt-mbr-partnames.h:16
msgid "W95 FAT32"
msgstr "W95 FAT32"
-#: include/pt-mbr-partnames.h:13
+#: include/pt-mbr-partnames.h:17
msgid "W95 FAT32 (LBA)"
msgstr "W95 FAT32 (LBA)"
-#: include/pt-mbr-partnames.h:14
+#: include/pt-mbr-partnames.h:18
msgid "W95 FAT16 (LBA)"
msgstr "W95 FAT16 (LBA)"
-#: include/pt-mbr-partnames.h:15
+#: include/pt-mbr-partnames.h:19
msgid "W95 Ext'd (LBA)"
msgstr "W95 扩展 (LBA)"
-#: include/pt-mbr-partnames.h:16
+#: include/pt-mbr-partnames.h:20
msgid "OPUS"
msgstr "OPUS"
-#: include/pt-mbr-partnames.h:17
+#: include/pt-mbr-partnames.h:21
msgid "Hidden FAT12"
msgstr "隐藏的 FAT12"
-#: include/pt-mbr-partnames.h:18
+#: include/pt-mbr-partnames.h:22
msgid "Compaq diagnostics"
msgstr "Compaq 诊断"
-#: include/pt-mbr-partnames.h:19
+#: include/pt-mbr-partnames.h:23
msgid "Hidden FAT16 <32M"
msgstr "隐藏的 FAT16 <32M"
-#: include/pt-mbr-partnames.h:20
+#: include/pt-mbr-partnames.h:24
msgid "Hidden FAT16"
msgstr "隐藏的 FAT16"
-#: include/pt-mbr-partnames.h:21
+#: include/pt-mbr-partnames.h:25
msgid "Hidden HPFS/NTFS"
msgstr "隐藏的 HPFS/NTFS"
-#: include/pt-mbr-partnames.h:22
+#: include/pt-mbr-partnames.h:26
msgid "AST SmartSleep"
msgstr "AST 智能睡眠"
-#: include/pt-mbr-partnames.h:23
+#: include/pt-mbr-partnames.h:27
msgid "Hidden W95 FAT32"
msgstr "隐藏的 W95 FAT32"
-#: include/pt-mbr-partnames.h:24
+#: include/pt-mbr-partnames.h:28
msgid "Hidden W95 FAT32 (LBA)"
msgstr "隐藏的 W95 FAT32 (LBA)"
-#: include/pt-mbr-partnames.h:25
+#: include/pt-mbr-partnames.h:29
msgid "Hidden W95 FAT16 (LBA)"
msgstr "隐藏的 W95 FAT16 (LBA)"
-#: include/pt-mbr-partnames.h:26
+#: include/pt-mbr-partnames.h:30
msgid "NEC DOS"
msgstr "NEC DOS"
-#: include/pt-mbr-partnames.h:27
+#: include/pt-mbr-partnames.h:31
msgid "Hidden NTFS WinRE"
msgstr "隐藏的 NTFS WinRE"
-#: include/pt-mbr-partnames.h:28
+#: include/pt-mbr-partnames.h:32
msgid "Plan 9"
msgstr "Plan 9"
-#: include/pt-mbr-partnames.h:29
+#: include/pt-mbr-partnames.h:33
msgid "PartitionMagic recovery"
msgstr "PartitionMagic 恢复"
-#: include/pt-mbr-partnames.h:30
+#: include/pt-mbr-partnames.h:34
msgid "Venix 80286"
msgstr "Venix 80286"
-#: include/pt-mbr-partnames.h:31
+#: include/pt-mbr-partnames.h:35
msgid "PPC PReP Boot"
msgstr "PPC PReP Boot"
-#: include/pt-mbr-partnames.h:32
+#: include/pt-mbr-partnames.h:36
msgid "SFS"
msgstr "SFS"
-#: include/pt-mbr-partnames.h:33
+#: include/pt-mbr-partnames.h:37
msgid "QNX4.x"
msgstr "QNX4.x"
-#: include/pt-mbr-partnames.h:34
+#: include/pt-mbr-partnames.h:38
msgid "QNX4.x 2nd part"
msgstr "QNX4.x 第2部分"
-#: include/pt-mbr-partnames.h:35
+#: include/pt-mbr-partnames.h:39
msgid "QNX4.x 3rd part"
msgstr "QNX4.x 第3部分"
-#: include/pt-mbr-partnames.h:36
+#: include/pt-mbr-partnames.h:40
msgid "OnTrack DM"
msgstr "OnTrack DM"
-#: include/pt-mbr-partnames.h:37
+#: include/pt-mbr-partnames.h:41
msgid "OnTrack DM6 Aux1"
msgstr "OnTrack DM6 Aux1"
-#: include/pt-mbr-partnames.h:38
+#: include/pt-mbr-partnames.h:42
msgid "CP/M"
msgstr "CP/M"
-#: include/pt-mbr-partnames.h:39
+#: include/pt-mbr-partnames.h:43
msgid "OnTrack DM6 Aux3"
msgstr "OnTrack DM6 Aux3"
-#: include/pt-mbr-partnames.h:40
+#: include/pt-mbr-partnames.h:44
msgid "OnTrackDM6"
msgstr "OnTrackDM6"
-#: include/pt-mbr-partnames.h:41
+#: include/pt-mbr-partnames.h:45
msgid "EZ-Drive"
msgstr "EZ-Drive"
-#: include/pt-mbr-partnames.h:42
+#: include/pt-mbr-partnames.h:46
msgid "Golden Bow"
msgstr "Golden Bow"
-#: include/pt-mbr-partnames.h:43
+#: include/pt-mbr-partnames.h:47
msgid "Priam Edisk"
msgstr "Priam Edisk"
-#: include/pt-mbr-partnames.h:44 include/pt-mbr-partnames.h:91
-#: include/pt-mbr-partnames.h:101 include/pt-mbr-partnames.h:102
+#: include/pt-mbr-partnames.h:48 include/pt-mbr-partnames.h:95
+#: include/pt-mbr-partnames.h:105 include/pt-mbr-partnames.h:106
msgid "SpeedStor"
msgstr "SpeedStor"
-#: include/pt-mbr-partnames.h:45
+#: include/pt-mbr-partnames.h:49
msgid "GNU HURD or SysV"
msgstr "GNU HURD 或 SysV"
-#: include/pt-mbr-partnames.h:46
+#: include/pt-mbr-partnames.h:50
msgid "Novell Netware 286"
msgstr "Novell Netware 286"
-#: include/pt-mbr-partnames.h:47
+#: include/pt-mbr-partnames.h:51
msgid "Novell Netware 386"
msgstr "Novell Netware 386"
-#: include/pt-mbr-partnames.h:48
+#: include/pt-mbr-partnames.h:52
msgid "DiskSecure Multi-Boot"
msgstr "DiskSecure 多启动"
-#: include/pt-mbr-partnames.h:49
+#: include/pt-mbr-partnames.h:53
msgid "PC/IX"
msgstr "PC/IX"
-#: include/pt-mbr-partnames.h:50
+#: include/pt-mbr-partnames.h:54
msgid "Old Minix"
msgstr "旧 Minix"
-#: include/pt-mbr-partnames.h:51
+#: include/pt-mbr-partnames.h:55
msgid "Minix / old Linux"
msgstr "Minix / 旧 Linux"
-#: include/pt-mbr-partnames.h:52
+#: include/pt-mbr-partnames.h:56
msgid "Linux swap / Solaris"
msgstr "Linux swap / Solaris"
-#: include/pt-mbr-partnames.h:53
+#: include/pt-mbr-partnames.h:57
msgid "Linux"
msgstr "Linux"
-#: include/pt-mbr-partnames.h:54
+#: include/pt-mbr-partnames.h:58
msgid "OS/2 hidden or Intel hibernation"
msgstr "OS/2 隐藏 或 Intel 休眠"
-#: include/pt-mbr-partnames.h:57
+#: include/pt-mbr-partnames.h:61
msgid "Linux extended"
msgstr "Linux 扩展"
-#: include/pt-mbr-partnames.h:58 include/pt-mbr-partnames.h:59
+#: include/pt-mbr-partnames.h:62 include/pt-mbr-partnames.h:63
msgid "NTFS volume set"
msgstr "NTFS 卷集"
-#: include/pt-mbr-partnames.h:60
+#: include/pt-mbr-partnames.h:64
msgid "Linux plaintext"
msgstr "Linux 纯文本"
-#: include/pt-mbr-partnames.h:62
+#: include/pt-mbr-partnames.h:66
msgid "Amoeba"
msgstr "Amoeba"
-#: include/pt-mbr-partnames.h:63
+#: include/pt-mbr-partnames.h:67
msgid "Amoeba BBT"
msgstr "Amoeba BBT"
-#: include/pt-mbr-partnames.h:64
+#: include/pt-mbr-partnames.h:68
msgid "BSD/OS"
msgstr "BSD/OS"
-#: include/pt-mbr-partnames.h:65
+#: include/pt-mbr-partnames.h:69
msgid "IBM Thinkpad hibernation"
msgstr "IBM Thinkpad 休眠"
-#: include/pt-mbr-partnames.h:66
+#: include/pt-mbr-partnames.h:70
msgid "FreeBSD"
msgstr "FreeBSD"
-#: include/pt-mbr-partnames.h:67
+#: include/pt-mbr-partnames.h:71
msgid "OpenBSD"
msgstr "OpenBSD"
-#: include/pt-mbr-partnames.h:68
+#: include/pt-mbr-partnames.h:72
msgid "NeXTSTEP"
msgstr "NeXTSTEP"
-#: include/pt-mbr-partnames.h:69
+#: include/pt-mbr-partnames.h:73
msgid "Darwin UFS"
msgstr "Darwin UFS"
-#: include/pt-mbr-partnames.h:70
+#: include/pt-mbr-partnames.h:74
msgid "NetBSD"
msgstr "NetBSD"
-#: include/pt-mbr-partnames.h:71
+#: include/pt-mbr-partnames.h:75
msgid "Darwin boot"
msgstr "Darwin 启动"
-#: include/pt-mbr-partnames.h:72
+#: include/pt-mbr-partnames.h:76
msgid "HFS / HFS+"
msgstr "HFS / HFS+"
-#: include/pt-mbr-partnames.h:73
+#: include/pt-mbr-partnames.h:77
msgid "BSDI fs"
msgstr "BSDI fs"
-#: include/pt-mbr-partnames.h:74
+#: include/pt-mbr-partnames.h:78
msgid "BSDI swap"
msgstr "BSDI swap"
-#: include/pt-mbr-partnames.h:75
+#: include/pt-mbr-partnames.h:79
msgid "Boot Wizard hidden"
msgstr "Boot Wizard 隐藏"
-#: include/pt-mbr-partnames.h:76
+#: include/pt-mbr-partnames.h:80
msgid "Acronis FAT32 LBA"
msgstr "Acronis FAT32 LBA"
-#: include/pt-mbr-partnames.h:78
+#: include/pt-mbr-partnames.h:82
msgid "Solaris"
msgstr "Solaris"
-#: include/pt-mbr-partnames.h:79
+#: include/pt-mbr-partnames.h:83
msgid "DRDOS/sec (FAT-12)"
msgstr "DRDOS/sec (FAT-12)"
-#: include/pt-mbr-partnames.h:80
+#: include/pt-mbr-partnames.h:84
msgid "DRDOS/sec (FAT-16 < 32M)"
msgstr "DRDOS/sec (FAT-16 < 32M)"
-#: include/pt-mbr-partnames.h:81
+#: include/pt-mbr-partnames.h:85
msgid "DRDOS/sec (FAT-16)"
msgstr "DRDOS/sec (FAT-16)"
-#: include/pt-mbr-partnames.h:82
+#: include/pt-mbr-partnames.h:86
msgid "Syrinx"
msgstr "Syrinx"
-#: include/pt-mbr-partnames.h:83
+#: include/pt-mbr-partnames.h:87
msgid "Non-FS data"
msgstr "非文件系统数据"
-#: include/pt-mbr-partnames.h:84
+#: include/pt-mbr-partnames.h:88
msgid "CP/M / CTOS / ..."
msgstr "CP/M / CTOS / ..."
-#: include/pt-mbr-partnames.h:86
+#: include/pt-mbr-partnames.h:90
msgid "Dell Utility"
msgstr "Dell 工具"
-#: include/pt-mbr-partnames.h:87
+#: include/pt-mbr-partnames.h:91
msgid "BootIt"
msgstr "BootIt"
-#: include/pt-mbr-partnames.h:88
+#: include/pt-mbr-partnames.h:92
msgid "DOS access"
msgstr "DOS 访问"
-#: include/pt-mbr-partnames.h:90
+#: include/pt-mbr-partnames.h:94
msgid "DOS R/O"
msgstr "DOS R/O"
-#: include/pt-mbr-partnames.h:97
+#: include/pt-mbr-partnames.h:101
msgid "BeOS fs"
msgstr "BeOS fs"
-#: include/pt-mbr-partnames.h:99
+#: include/pt-mbr-partnames.h:103
msgid "EFI (FAT-12/16/32)"
msgstr "EFI (FAT-12/16/32)"
-#: include/pt-mbr-partnames.h:100
+#: include/pt-mbr-partnames.h:104
msgid "Linux/PA-RISC boot"
msgstr "Linux/PA-RISC 启动"
-#: include/pt-mbr-partnames.h:103
+#: include/pt-mbr-partnames.h:107
msgid "DOS secondary"
msgstr "DOS 次要"
-#: include/pt-mbr-partnames.h:104
+#: include/pt-mbr-partnames.h:108
msgid "EBBR protective"
msgstr ""
-#: include/pt-mbr-partnames.h:106
+#: include/pt-mbr-partnames.h:110
msgid "VMware VMKCORE"
msgstr "VMware VMKCORE"
-#: include/pt-mbr-partnames.h:107 libfdisk/src/sun.c:54
+#: include/pt-mbr-partnames.h:111 libfdisk/src/sun.c:54
msgid "Linux raid autodetect"
msgstr "Linux raid 自动检测"
-#: include/pt-mbr-partnames.h:110
+#: include/pt-mbr-partnames.h:114
msgid "LANstep"
msgstr "LANstep"
-#: include/pt-mbr-partnames.h:111
+#: include/pt-mbr-partnames.h:115
msgid "BBT"
msgstr "BBT"
-#: lib/blkdev.c:280
+#: lib/blkdev.c:286
#, c-format
msgid "warning: %s is misaligned"
msgstr "警告:%s 未正确对齐"
-#: lib/blkdev.c:392
+#: lib/blkdev.c:398
#, c-format
msgid "unsupported lock mode: %s"
msgstr "不支持的锁模式:%s"
-#: lib/blkdev.c:402
+#: lib/blkdev.c:408
#, c-format
msgid "%s: %s: device already locked, waiting to get lock ... "
msgstr "%s:%s:设备已锁定,等待获取锁……"
-#: lib/blkdev.c:411
+#: lib/blkdev.c:417
#, c-format
msgid "%s: device already locked"
msgstr "%s:设备已锁定"
-#: lib/blkdev.c:414
+#: lib/blkdev.c:420
#, c-format
msgid "%s: failed to get lock"
msgstr "%s:获取锁失败"
-#: lib/blkdev.c:417
-#, fuzzy, c-format
+#: lib/blkdev.c:423
+#, c-format
msgid "OK\n"
msgstr "正常\n"
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:1441 libfdisk/src/gpt.c:2521
+#: libfdisk/src/bsd.c:296 libfdisk/src/dos.c:1441 libfdisk/src/gpt.c:2551
msgid "Last sector, +/-sectors or +/-size{K,M,G,T,P}"
msgstr "最后一个扇区,+/-sectors 或 +size{K,M,G,T,P}"
msgid "Disklabel written to %s."
msgstr "磁盘标签已写入 %s。"
-#: libfdisk/src/bsd.c:920 libfdisk/src/context.c:776
+#: libfdisk/src/bsd.c:920 libfdisk/src/context.c:777
msgid "Syncing disks."
msgstr "正在同步磁盘。"
msgid "Cpg"
msgstr "Cpg"
-#: libfdisk/src/context.c:766
+#: libfdisk/src/context.c:767
#, c-format
msgid "%s: fsync device failed"
msgstr "%s:设备 fsync 失败"
-#: libfdisk/src/context.c:771
+#: libfdisk/src/context.c:772 misc-utils/wipefs.c:619
#, c-format
msgid "%s: close device failed"
msgstr "%s:关闭设备失败"
-#: libfdisk/src/context.c:854
+#: libfdisk/src/context.c:855
msgid "Calling ioctl() to re-read partition table."
msgstr "将调用 ioctl() 来重新读分区表。"
-#: libfdisk/src/context.c:862
+#: libfdisk/src/context.c:863
msgid "Re-reading the partition table failed."
msgstr "重新读取分区表失败。"
-#: libfdisk/src/context.c:864
+#: libfdisk/src/context.c:865
msgid "The kernel still uses the old table. The new table will be used at the next reboot or after you run partprobe(8) or partx(8)."
msgstr "内核仍在使用旧分区表。新分区表将在下次重启或运行 partprobe(8) 或 partx(8) 后生效。"
-#: libfdisk/src/context.c:954
+#: libfdisk/src/context.c:955
#, c-format
msgid "Failed to remove partition %zu from system"
msgstr "从系统上移除分区 %zu 时失败"
-#: libfdisk/src/context.c:963
+#: libfdisk/src/context.c:964
#, c-format
msgid "Failed to update system information about partition %zu"
msgstr "更新系统中有关分区 %zu 的信息时失败"
-#: libfdisk/src/context.c:983
+#: libfdisk/src/context.c:984
#, c-format
msgid "Failed to add partition %zu to system"
msgstr "添加分区 %zu 至系统时失败"
-#: libfdisk/src/context.c:989
+#: libfdisk/src/context.c:990
msgid "The kernel still uses the old partitions. The new table will be used at the next reboot. "
msgstr "内核仍在使用旧分区。新分区表将在下次重启后生效。"
-#: libfdisk/src/context.c:1193
+#: libfdisk/src/context.c:1194
msgid "cylinder"
msgid_plural "cylinders"
msgstr[0] "柱面"
-#: libfdisk/src/context.c:1194
+#: libfdisk/src/context.c:1195
msgid "sector"
msgid_plural "sectors"
msgstr[0] "扇区"
-#: libfdisk/src/context.c:1550
+#: libfdisk/src/context.c:1551
msgid "Incomplete geometry setting."
msgstr "不完整的几何属性设置。"
msgstr "将忽略空分区(%zu)"
#: libfdisk/src/dos.c:711
-#, c-format
-msgid "Created a new DOS disklabel with disk identifier 0x%08x."
+#, fuzzy, c-format
+#| msgid "Created a new DOS disklabel with disk identifier 0x%08x."
+msgid "Created a new DOS (MBR) disklabel with disk identifier 0x%08x."
msgstr "创建了一个磁盘标识符为 0x%08x 的新 DOS 磁盘标签。"
#: libfdisk/src/dos.c:734
msgid "Start sector %ju out of range."
msgstr "起始扇区 %ju 超出范围。"
-#: libfdisk/src/dos.c:1276 libfdisk/src/gpt.c:2379 libfdisk/src/sgi.c:842
+#: libfdisk/src/dos.c:1276 libfdisk/src/gpt.c:2409 libfdisk/src/sgi.c:842
#: libfdisk/src/sun.c:528
#, c-format
msgid "Partition %zu is already defined. Delete it before re-adding it."
msgstr "分区 %zu 已经定义过。请删除后再重新添加它。"
#: libfdisk/src/dos.c:1291 libfdisk/src/dos.c:1317 libfdisk/src/dos.c:1375
-#: libfdisk/src/dos.c:1407 libfdisk/src/gpt.c:2388
+#: libfdisk/src/dos.c:1407 libfdisk/src/gpt.c:2418
msgid "No free sectors available."
msgstr "无空闲扇区可用。"
#: libfdisk/src/dos.c:1342
-#, fuzzy, c-format
-#| msgid "Sector %llu is already allocated."
+#, c-format
msgid "Sector %ju is already allocated."
-msgstr "扇区 %llu 已经分配."
+msgstr "扇区 %ju 已经分配。"
#: libfdisk/src/dos.c:1562
#, c-format
msgid "Logical partition %zu: not entirely in partition %zu."
msgstr "逻辑分区 %zu:没有完全在分区 %zu 中。"
-#: libfdisk/src/dos.c:1809 libfdisk/src/gpt.c:2285
+#: libfdisk/src/dos.c:1809 libfdisk/src/gpt.c:2315
msgid "No errors detected."
msgstr "未检测到错误。"
msgid "Remaining %ju unallocated %ld-byte sectors."
msgstr "剩余 %lld 未分配的 %ld字节 扇区。"
-#: libfdisk/src/dos.c:1818 libfdisk/src/gpt.c:2305
+#: libfdisk/src/dos.c:1818 libfdisk/src/gpt.c:2335
#, c-format
msgid "%d error detected."
msgid_plural "%d errors detected."
msgid "Cannot write sector %jd: seek failed"
msgstr "写扇区 %jd 失败:定位失败"
-#: libfdisk/src/dos.c:2242 libfdisk/src/gpt.c:1296
+#: libfdisk/src/dos.c:2242 libfdisk/src/gpt.c:1291
msgid "Disk identifier"
msgstr "磁盘标识符"
msgid "The bootable flag on partition %zu is disabled now."
msgstr "分区 %zu 的 可启动 标志已禁用。"
-#: libfdisk/src/dos.c:2801 libfdisk/src/gpt.c:3213 libfdisk/src/sgi.c:1158
+#: libfdisk/src/dos.c:2801 libfdisk/src/gpt.c:3243 libfdisk/src/sgi.c:1158
#: libfdisk/src/sun.c:1129
msgid "Device"
msgstr "设备"
msgid "End-C/H/S"
msgstr "终-C/H/S"
-#: libfdisk/src/dos.c:2814 libfdisk/src/gpt.c:3223 libfdisk/src/sgi.c:1166
+#: libfdisk/src/dos.c:2814 libfdisk/src/gpt.c:3253 libfdisk/src/sgi.c:1166
msgid "Attrs"
msgstr "属性"
msgid "gpt: cannot handle files with mode %o"
msgstr "gpt:无法操作模式为 %o 的文件"
-#: libfdisk/src/gpt.c:1253
+#: libfdisk/src/gpt.c:1248
msgid "GPT Header"
msgstr "GPT 头"
-#: libfdisk/src/gpt.c:1258
+#: libfdisk/src/gpt.c:1253
msgid "GPT Entries"
msgstr "GPT 记录项"
-#: libfdisk/src/gpt.c:1264
+#: libfdisk/src/gpt.c:1259
msgid "GPT Backup Entries"
msgstr "GPT 备份记录项"
-#: libfdisk/src/gpt.c:1270
+#: libfdisk/src/gpt.c:1265
msgid "GPT Backup Header"
msgstr "GPT 备份头"
-#: libfdisk/src/gpt.c:1303
-#, fuzzy
-#| msgid "First LBA"
+#: libfdisk/src/gpt.c:1298
msgid "First usable LBA"
-msgstr "第一个 LBA"
+msgstr "第一个可用 LBA"
-#: libfdisk/src/gpt.c:1308
-#, fuzzy
-#| msgid "Last LBA"
+#: libfdisk/src/gpt.c:1303
msgid "Last usable LBA"
-msgstr "最后一个 LBA"
+msgstr "最后一个可用 LBA"
#. TRANSLATORS: The LBA (Logical Block Address) of the backup GPT header.
-#: libfdisk/src/gpt.c:1314
+#: libfdisk/src/gpt.c:1309
msgid "Alternative LBA"
msgstr "替代 LBA"
#. TRANSLATORS: The start of the array of partition entries.
-#: libfdisk/src/gpt.c:1320
+#: libfdisk/src/gpt.c:1315
#, fuzzy
#| msgid "Partition entries LBA"
msgid "Partition entries starting LBA"
msgstr "分区记录项 LBA"
#. TRANSLATORS: The end of the array of partition entries.
-#: libfdisk/src/gpt.c:1326
+#: libfdisk/src/gpt.c:1321
#, fuzzy
#| msgid "Partition entries LBA"
msgid "Partition entries ending LBA"
msgstr "分区记录项 LBA"
-#: libfdisk/src/gpt.c:1333
+#: libfdisk/src/gpt.c:1328
msgid "Allocated partition entries"
msgstr "已分配的分区项"
-#: libfdisk/src/gpt.c:1675
+#: libfdisk/src/gpt.c:1670
msgid "The backup GPT table is corrupt, but the primary appears OK, so that will be used."
msgstr "备份 GPT 表损坏,但主表似乎正常,将使用它。"
-#: libfdisk/src/gpt.c:1685
+#: libfdisk/src/gpt.c:1680
msgid "The primary GPT table is corrupt, but the backup appears OK, so that will be used."
msgstr "主 GPT 表损坏,但备份似乎正常,将使用它。"
-#: libfdisk/src/gpt.c:1701
+#: libfdisk/src/gpt.c:1696
msgid "The backup GPT table is not on the end of the device."
msgstr "备份 GPT 表不在设备的末尾位置。"
-#: libfdisk/src/gpt.c:1704
+#: libfdisk/src/gpt.c:1699
msgid "The backup GPT table is not on the end of the device. This problem will be corrected by write."
msgstr ""
-#: libfdisk/src/gpt.c:1708
+#: libfdisk/src/gpt.c:1703
#, fuzzy
#| msgid "failed to allocate output table"
msgid "Failed to recalculate backup GPT table location"
msgstr "分配输出表失败"
-#: libfdisk/src/gpt.c:1863
+#: libfdisk/src/gpt.c:1858
#, c-format
msgid "unsupported GPT attribute bit '%s'"
msgstr "不支持的 GPT 属性位“%s”"
-#: libfdisk/src/gpt.c:1868
+#: libfdisk/src/gpt.c:1863
#, fuzzy, c-format
#| msgid "failed to parse list '%s'"
msgid "failed to parse GPT attribute string '%s'"
msgstr "解析列表“%s”失败"
-#: libfdisk/src/gpt.c:1968
+#: libfdisk/src/gpt.c:1963
#, c-format
msgid "Partition UUID changed from %s to %s."
msgstr "分区 UUID 已从 %s 更改为 %s。"
-#: libfdisk/src/gpt.c:1977
+#: libfdisk/src/gpt.c:1972
msgid "Failed to translate partition name, name not changed."
msgstr "翻译分区名称失败,名称未改变。"
-#: libfdisk/src/gpt.c:1979
+#: libfdisk/src/gpt.c:1974
#, c-format
msgid "Partition name changed from '%s' to '%.*s'."
msgstr "分区名已由“%s”改为“%.*s”。"
-#: libfdisk/src/gpt.c:2008
+#: libfdisk/src/gpt.c:2003
msgid "The start of the partition understeps FirstUsableLBA."
msgstr "分区起点未到首个可用 LBA。"
-#: libfdisk/src/gpt.c:2015
+#: libfdisk/src/gpt.c:2010
msgid "The end of the partition oversteps LastUsableLBA."
msgstr "分区终点超过了最后可用 LBA。"
-#: libfdisk/src/gpt.c:2173
+#: libfdisk/src/gpt.c:2203
msgid "The device contains hybrid MBR -- writing GPT only."
msgstr "该设备包含混合 MBR -- 将只写入 GPT。"
-#: libfdisk/src/gpt.c:2209
+#: libfdisk/src/gpt.c:2239
msgid "Disk does not contain a valid backup header."
msgstr "磁盘不含有效的备用磁头。"
-#: libfdisk/src/gpt.c:2214
+#: libfdisk/src/gpt.c:2244
msgid "Invalid primary header CRC checksum."
msgstr "无效的主磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:2218
+#: libfdisk/src/gpt.c:2248
msgid "Invalid backup header CRC checksum."
msgstr "无效的备份磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:2223
+#: libfdisk/src/gpt.c:2253
msgid "Invalid partition entry checksum."
msgstr "无效的分区记录校验和。"
-#: libfdisk/src/gpt.c:2228
+#: libfdisk/src/gpt.c:2258
msgid "Invalid primary header LBA sanity checks."
msgstr "无效的主磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:2232
+#: libfdisk/src/gpt.c:2262
msgid "Invalid backup header LBA sanity checks."
msgstr "无效的备用磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:2237
+#: libfdisk/src/gpt.c:2267
msgid "MyLBA mismatch with real position at primary header."
msgstr "MyLBA 不匹配,真正位置在主磁头。"
-#: libfdisk/src/gpt.c:2241
+#: libfdisk/src/gpt.c:2271
msgid "MyLBA mismatch with real position at backup header."
msgstr "MyLBA 不匹配,真正位置在备份磁头。"
-#: libfdisk/src/gpt.c:2246
+#: libfdisk/src/gpt.c:2276
msgid "Disk is too small to hold all data."
msgstr "磁盘太小,放不下所有数据。"
-#: libfdisk/src/gpt.c:2256
+#: libfdisk/src/gpt.c:2286
msgid "Primary and backup header mismatch."
msgstr "主磁头和备份磁头不匹配。"
-#: libfdisk/src/gpt.c:2262
+#: libfdisk/src/gpt.c:2292
#, c-format
msgid "Partition %u overlaps with partition %u."
msgstr "分区 %u 与 %u 重叠。"
-#: libfdisk/src/gpt.c:2269
+#: libfdisk/src/gpt.c:2299
#, c-format
msgid "Partition %u is too big for the disk."
msgstr "分区 %u 对于该磁盘而言过大。"
-#: libfdisk/src/gpt.c:2276
+#: libfdisk/src/gpt.c:2306
#, c-format
msgid "Partition %u ends before it starts."
msgstr "分区 %u 结束于起点之前。"
-#: libfdisk/src/gpt.c:2286
+#: libfdisk/src/gpt.c:2316
#, c-format
msgid "Header version: %s"
msgstr "磁头版本:%s"
-#: libfdisk/src/gpt.c:2287
+#: libfdisk/src/gpt.c:2317
#, fuzzy, c-format
#| msgid "Using %u out of %d partitions."
msgid "Using %zu out of %zu partitions."
msgstr "使用着 %2$d 个分区中的 %1$u 个。"
-#: libfdisk/src/gpt.c:2297
+#: libfdisk/src/gpt.c:2327
#, 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:2384
+#: libfdisk/src/gpt.c:2414
msgid "All partitions are already in use."
msgstr "所有分区均已占用。"
-#: libfdisk/src/gpt.c:2435
+#: libfdisk/src/gpt.c:2465
#, fuzzy
#| msgid "No free sectors available."
msgid "No enough free sectors available."
msgstr "无空闲扇区可用。"
-#: libfdisk/src/gpt.c:2449 libfdisk/src/gpt.c:2476
+#: libfdisk/src/gpt.c:2479 libfdisk/src/gpt.c:2506
#, c-format
msgid "Sector %ju already used."
msgstr "扇区 %ju 已使用。"
-#: libfdisk/src/gpt.c:2550
+#: libfdisk/src/gpt.c:2580
#, c-format
msgid "Could not create partition %zu"
msgstr "无法创建分区 %zu"
-#: libfdisk/src/gpt.c:2557
+#: libfdisk/src/gpt.c:2587
#, c-format
msgid "The last usable GPT sector is %ju, but %ju is requested."
msgstr "最后一个可用的 GPT 扇区是 %ju,但请求了 %ju。"
-#: libfdisk/src/gpt.c:2564
+#: libfdisk/src/gpt.c:2594
#, c-format
msgid "The first usable GPT sector is %ju, but %ju is requested."
msgstr "第一个可用的 GPT 扇区是 %ju,但请求了 %ju。"
-#: libfdisk/src/gpt.c:2703
+#: libfdisk/src/gpt.c:2733
#, c-format
msgid "Created a new GPT disklabel (GUID: %s)."
msgstr "已创建新的 GPT 磁盘标签(GUID: %s)。"
-#: libfdisk/src/gpt.c:2706
+#: libfdisk/src/gpt.c:2736
#, fuzzy, c-format
#| msgid "The maximum number of partitions has been created."
msgid "The maximal number of partitions is %zu (default is %zu)."
msgstr "已创建分区达到最大数量。"
-#: libfdisk/src/gpt.c:2728
+#: libfdisk/src/gpt.c:2758
msgid "Enter new disk UUID (in 8-4-4-4-12 format)"
msgstr "输入新磁盘 UUID(以 8-4-4-4-12 格式)"
-#: libfdisk/src/gpt.c:2736
+#: libfdisk/src/gpt.c:2766
msgid "Failed to parse your UUID."
msgstr "解析您的 UUID 失败。"
-#: libfdisk/src/gpt.c:2750
+#: libfdisk/src/gpt.c:2780
#, c-format
msgid "Disk identifier changed from %s to %s."
msgstr "将磁盘标识从 %s 更改为 %s 失败。"
-#: libfdisk/src/gpt.c:2770
+#: libfdisk/src/gpt.c:2800
msgid "Not enough space for new partition table!"
msgstr "创建新分区表的空闲空间不够!"
-#: libfdisk/src/gpt.c:2781
+#: libfdisk/src/gpt.c:2811
#, fuzzy, c-format
#| msgid "Partition #%u out of range (minimal start is %<PRIu64> sectors)"
msgid "Partition #%zu out of range (minimal start is %<PRIu64> sectors)"
msgstr "分区 #%u 超出范围(最小起点是 %<PRIu64> 扇区)"
-#: libfdisk/src/gpt.c:2786
+#: libfdisk/src/gpt.c:2816
#, fuzzy, c-format
#| msgid "Partition #%u out of range (maximal end is %<PRIu64> sectors)"
msgid "Partition #%zu out of range (maximal end is %<PRIu64> sectors)"
msgstr "分区 #%u 超出范围(最小终点是 %<PRIu64> 扇区)"
-#: libfdisk/src/gpt.c:2832
+#: libfdisk/src/gpt.c:2862
msgid "The partition entry size is zero."
msgstr "分区条目大小为零。"
-#: libfdisk/src/gpt.c:2834
+#: libfdisk/src/gpt.c:2864
#, c-format
msgid "The number of the partition has to be smaller than %zu."
msgstr "分区数量必须小于 %zu。"
-#: libfdisk/src/gpt.c:2858
+#: libfdisk/src/gpt.c:2888
msgid "Cannot allocate memory!"
msgstr "无法分配内存!"
-#: libfdisk/src/gpt.c:2887
+#: libfdisk/src/gpt.c:2917
#, fuzzy, c-format
#| msgid "Partition table length changed from %<PRIu32> to %<PRIu64>."
msgid "Partition table length changed from %<PRIu32> to %<PRIu32>."
msgstr "分区表长度已从 %<PRIu32> 改为 %<PRIu64>。"
-#: libfdisk/src/gpt.c:2997
+#: libfdisk/src/gpt.c:3027
#, c-format
msgid "The attributes on partition %zu changed to 0x%016<PRIx64>."
msgstr "分区 %zu 的属性已改为 0x%016<PRIx64>。"
-#: libfdisk/src/gpt.c:3047
+#: libfdisk/src/gpt.c:3077
msgid "Enter GUID specific bit"
msgstr "输入 GUID 特定位"
-#: libfdisk/src/gpt.c:3062
+#: libfdisk/src/gpt.c:3092
#, c-format
msgid "failed to toggle unsupported bit %lu"
msgstr "开/关不支持的位 %lu 失败"
-#: libfdisk/src/gpt.c:3075
+#: libfdisk/src/gpt.c:3105
#, c-format
msgid "The GUID specific bit %d on partition %zu is enabled now."
msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已启用。"
-#: libfdisk/src/gpt.c:3076
+#: libfdisk/src/gpt.c:3106
#, c-format
msgid "The GUID specific bit %d on partition %zu is disabled now."
msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已禁用。"
-#: libfdisk/src/gpt.c:3080
+#: libfdisk/src/gpt.c:3110
#, c-format
msgid "The %s flag on partition %zu is enabled now."
msgstr "分区 %2$zu 上的标志 %1$s 现已启用。"
-#: libfdisk/src/gpt.c:3081
+#: libfdisk/src/gpt.c:3111
#, c-format
msgid "The %s flag on partition %zu is disabled now."
msgstr "分区 %2$zu 上的标志 %1$s 现已禁用。"
-#: libfdisk/src/gpt.c:3220
+#: libfdisk/src/gpt.c:3250
msgid "Type-UUID"
msgstr "类型-UUID"
-#: libfdisk/src/gpt.c:3221
+#: libfdisk/src/gpt.c:3251
msgid "UUID"
msgstr "UUID"
-#: libfdisk/src/gpt.c:3222 login-utils/chfn.c:151 login-utils/chfn.c:153
-#: login-utils/chfn.c:315
+#: libfdisk/src/gpt.c:3252 login-utils/chfn.c:151 login-utils/chfn.c:153
+#: login-utils/chfn.c:316
msgid "Name"
msgstr "名称"
msgid "Failed to fix partitions order."
msgstr "修复分区顺序失败。"
-#: libfdisk/src/partition.c:871
+#: libfdisk/src/partition.c:879
msgid "Free space"
msgstr "剩余空间"
-#: libfdisk/src/partition.c:1365
+#: libfdisk/src/partition.c:1373
#, c-format
msgid "Failed to resize partition #%zu."
msgstr "调整分区 #%zu 的大小失败。"
msgid "unknown"
msgstr "未知"
+#: libfdisk/src/script.c:820
+msgid "The script and device sector size differ; the sizes will be recalculated to match the device."
+msgstr ""
+
+#: libfdisk/src/script.c:1037
+msgid "Can't recalculate partition start to the device sectors"
+msgstr ""
+
+#: libfdisk/src/script.c:1095
+msgid "Can't recalculate partition size to the device sectors"
+msgstr ""
+
+#: libfdisk/src/script.c:1554
+msgid "Ignore \"first-lba\" header due to sector size mismatch."
+msgstr ""
+
+#: libfdisk/src/script.c:1558
+msgid "Ignore \"last-lba\" header due to sector size mismatch."
+msgstr ""
+
#: libfdisk/src/sgi.c:46
msgid "SGI volhdr"
msgstr "SGI volhdr"
"和启动锁。\n"
"您确信要把该分区标记为 Linux 交换分区吗?"
-#: libmount/src/context.c:2851
+#: lib/logindefs.c:216
+#, c-format
+msgid "%s: %s contains invalid numerical value: %s"
+msgstr "%s:%s 包含无效的数字值:%s"
+
+#: lib/logindefs.c:266
+#, c-format
+msgid "Error reading login.defs: %s"
+msgstr "读取 login.defs 出错:%s"
+
+#: lib/logindefs.c:333 lib/logindefs.c:353 lib/logindefs.c:379
+#, c-format
+msgid "couldn't fetch %s: %s"
+msgstr "无法读取%s:%s"
+
+#: lib/logindefs.c:538
+msgid "hush login status: restore original IDs failed"
+msgstr "静默(hush)登录状态:恢复原 ID 失败"
+
+#: libmount/src/context.c:2700
#, c-format
msgid "operation failed: %m"
msgstr "操作失败:%m"
-#: libmount/src/context_mount.c:1713
+#: libmount/src/context_mount.c:1404
#, c-format
msgid "WARNING: failed to apply propagation flags"
msgstr "警告:应用传播标志失败"
-#: libmount/src/context_mount.c:1723
+#: libmount/src/context_mount.c:1414
#, fuzzy, c-format
#| msgid "WARNING: device write-protected, mounted read-only"
msgid "WARNING: source write-protected, mounted read-only"
msgstr "警告:设备写保护,使用只读方式挂载"
-#: libmount/src/context_mount.c:1737
+#: libmount/src/context_mount.c:1428
#, c-format
msgid "operation permitted for root only"
msgstr "操作只允许由 root 进行"
-#: libmount/src/context_mount.c:1741
+#: libmount/src/context_mount.c:1432
#, c-format
msgid "%s is already mounted"
msgstr "%s 已经挂载"
-#: libmount/src/context_mount.c:1747
+#: libmount/src/context_mount.c:1438
#, c-format
msgid "can't find in %s"
msgstr "无法在 %s 中找到"
-#: libmount/src/context_mount.c:1750
+#: libmount/src/context_mount.c:1441
#, c-format
msgid "can't find mount point in %s"
msgstr "无法在 %s 中找到挂载点"
-#: libmount/src/context_mount.c:1753
+#: libmount/src/context_mount.c:1444
#, c-format
msgid "can't find mount source %s in %s"
msgstr "在 %2$s 中找不到挂载源 %1$s"
-#: libmount/src/context_mount.c:1758
+#: libmount/src/context_mount.c:1449
#, c-format
msgid "more filesystems detected on %s; use -t <type> or wipefs(8)"
msgstr "%s 上探测到了更多文件系统;请使用 -t <类型> 或 wipefs(8)"
-#: libmount/src/context_mount.c:1763
+#: libmount/src/context_mount.c:1454
#, c-format
msgid "failed to determine filesystem type"
msgstr "无法确定文件系统类型"
-#: libmount/src/context_mount.c:1764
-#, c-format
-msgid "no filesystem type specified"
+#: libmount/src/context_mount.c:1455
+#, fuzzy, c-format
+#| msgid "no filesystem type specified"
+msgid "no valid filesystem type specified"
msgstr "未指定文件系统类型"
-#: libmount/src/context_mount.c:1771
+#: libmount/src/context_mount.c:1462
#, c-format
msgid "can't find %s"
msgstr "找不到 %s"
-#: libmount/src/context_mount.c:1773
+#: libmount/src/context_mount.c:1464
#, c-format
msgid "no mount source specified"
msgstr "未指定挂载来源"
-#: libmount/src/context_mount.c:1784
+#: libmount/src/context_mount.c:1475
#, fuzzy, c-format
#| msgid "failed to parse mount options: %m"
msgid "failed to parse mount options '%s': %m"
msgstr "解析挂臷选项失败:%m"
-#: libmount/src/context_mount.c:1785
+#: libmount/src/context_mount.c:1476
#, fuzzy, c-format
#| msgid "failed to parse mount options: %m"
msgid "failed to parse mount options '%s'"
msgstr "解析挂臷选项失败:%m"
-#: libmount/src/context_mount.c:1788
+#: libmount/src/context_mount.c:1479
#, c-format
msgid "failed to parse mount options: %m"
msgstr "解析挂臷选项失败:%m"
-#: libmount/src/context_mount.c:1789
+#: libmount/src/context_mount.c:1480
#, c-format
msgid "failed to parse mount options"
msgstr "解析挂臷选项失败"
-#: libmount/src/context_mount.c:1794
+#: libmount/src/context_mount.c:1485
#, fuzzy, c-format
#| msgid "%s: failed to setup loop device"
msgid "failed to setup loop device for %s"
msgstr "%s:设置回环设备失败"
-#: libmount/src/context_mount.c:1798
+#: libmount/src/context_mount.c:1489
#, fuzzy, c-format
#| msgid "%s: overlapping loop device exists"
msgid "overlapping loop device exists for %s"
msgstr "%s: 重叠的回环设备已存在"
-#: libmount/src/context_mount.c:1802 libmount/src/context_umount.c:1258
+#: libmount/src/context_mount.c:1493 libmount/src/context_umount.c:1263
#, c-format
msgid "locking failed"
msgstr "锁定失败"
-#: libmount/src/context_mount.c:1806 libmount/src/context_umount.c:1264
-#: sys-utils/umount.c:252 sys-utils/umount.c:268
+#: libmount/src/context_mount.c:1497 libmount/src/context_umount.c:1269
+#: sys-utils/umount.c:261 sys-utils/umount.c:277
#, c-format
msgid "failed to switch namespace"
msgstr "切换名字空间失败"
-#: libmount/src/context_mount.c:1809
+#: libmount/src/context_mount.c:1501
+#, fuzzy, c-format
+#| msgid "%s is already mounted"
+msgid "filesystem already mounted"
+msgstr "%s 已经挂载"
+
+#: libmount/src/context_mount.c:1504
#, c-format
msgid "mount failed: %m"
msgstr "挂载失败:%m"
-#: libmount/src/context_mount.c:1819
+#: libmount/src/context_mount.c:1514
#, fuzzy, c-format
#| msgid "%s: filesystem was unmounted, but mount(8) failed"
msgid "filesystem was mounted, but failed to update userspace mount table"
msgstr "%s:文件系统已卸载,但 mount(8) 失败"
-#: libmount/src/context_mount.c:1825
+#: libmount/src/context_mount.c:1520
#, fuzzy, c-format
#| msgid "%s: filesystem was unmounted, but mount(8) failed"
msgid "filesystem was mounted, but failed to switch namespace back"
msgstr "%s:文件系统已卸载,但 mount(8) 失败"
-#: libmount/src/context_mount.c:1832
+#: libmount/src/context_mount.c:1526
+#, fuzzy, c-format
+#| msgid "%s: filesystem was unmounted, but mount(8) failed"
+msgid "filesystem was mounted, but failed to change ownership: %m"
+msgstr "%s:文件系统已卸载,但 mount(8) 失败"
+
+#: libmount/src/context_mount.c:1532
+#, fuzzy, c-format
+#| msgid "%s: filesystem was unmounted, but mount(8) failed"
+msgid "filesystem was mounted, but failed to change mode: %m"
+msgstr "%s:文件系统已卸载,但 mount(8) 失败"
+
+#: libmount/src/context_mount.c:1538
+#, fuzzy, c-format
+#| msgid "%s: filesystem was unmounted, but mount(8) failed"
+msgid "filesystem was mounted, but failed to attach idmapping"
+msgstr "%s:文件系统已卸载,但 mount(8) 失败"
+
+#: libmount/src/context_mount.c:1544
#, fuzzy, c-format
#| msgid "%s: filesystem was unmounted, but mount(8) failed"
msgid "filesystem was mounted, but any subsequent operation failed: %m"
msgstr "%s:文件系统已卸载,但 mount(8) 失败"
-#: libmount/src/context_mount.c:1850 libmount/src/context_mount.c:1895
+#: libmount/src/context_mount.c:1562 libmount/src/context_mount.c:1607
#, c-format
msgid "mount point is not a directory"
msgstr "挂载点不是目录"
-#: libmount/src/context_mount.c:1852 login-utils/newgrp.c:228
+#: libmount/src/context_mount.c:1564 login-utils/newgrp.c:228
#, c-format
msgid "permission denied"
msgstr "权限不足"
-#: libmount/src/context_mount.c:1854
+#: libmount/src/context_mount.c:1566
#, c-format
msgid "must be superuser to use mount"
msgstr "必须以超级用户身份使用 mount"
-#: libmount/src/context_mount.c:1861
+#: libmount/src/context_mount.c:1573
#, c-format
msgid "mount point is busy"
msgstr "挂载点忙"
-#: libmount/src/context_mount.c:1868
+#: libmount/src/context_mount.c:1580
#, c-format
msgid "%s already mounted on %s"
msgstr "%s 已挂载于 %s"
-#: libmount/src/context_mount.c:1872
+#: libmount/src/context_mount.c:1584
#, c-format
msgid "%s already mounted or mount point busy"
msgstr "%s 已经挂载或挂载点忙"
-#: libmount/src/context_mount.c:1877
+#: libmount/src/context_mount.c:1589
#, c-format
msgid "mount point does not exist"
msgstr "挂载点不存在"
-#: libmount/src/context_mount.c:1880
+#: libmount/src/context_mount.c:1592
#, c-format
msgid "mount point is a symbolic link to nowhere"
msgstr "挂载点是一个没有目标的符号链接"
-#: libmount/src/context_mount.c:1885
+#: libmount/src/context_mount.c:1597
#, c-format
msgid "special device %s does not exist"
msgstr "特殊设备 %s 不存在"
-#: libmount/src/context_mount.c:1888 libmount/src/context_mount.c:1904
-#: libmount/src/context_mount.c:1988 libmount/src/context_mount.c:2011
+#: libmount/src/context_mount.c:1600 libmount/src/context_mount.c:1616
+#: libmount/src/context_mount.c:1700 libmount/src/context_mount.c:1723
#, c-format
msgid "mount(2) system call failed: %m"
msgstr "mount(2) 系统调用失败:%m"
-#: libmount/src/context_mount.c:1900
+#: libmount/src/context_mount.c:1612
#, c-format
msgid "special device %s does not exist (a path prefix is not a directory)"
msgstr "特殊设备 %s 不存在(路径前缀不是目录)"
-#: libmount/src/context_mount.c:1912
+#: libmount/src/context_mount.c:1624
#, c-format
msgid "mount point not mounted or bad option"
msgstr "挂载点未挂载或选项有误"
-#: libmount/src/context_mount.c:1914
+#: libmount/src/context_mount.c:1626
#, c-format
msgid "not mount point or bad option"
msgstr "不是一个挂载点或选项有误"
-#: libmount/src/context_mount.c:1917
+#: libmount/src/context_mount.c:1629
#, c-format
msgid "bad option; moving a mount residing under a shared mount is unsupported"
msgstr "选项错误;不支持移动位于共享挂载内的挂载"
-#: libmount/src/context_mount.c:1921
+#: libmount/src/context_mount.c:1633
#, c-format
msgid "bad option; for several filesystems (e.g. nfs, cifs) you might need a /sbin/mount.<type> helper program"
msgstr "选项错误;对某些文件系统(如 nfs、cifs)您可能需要一款 /sbin/mount.<类型> 的帮助程序"
-#: libmount/src/context_mount.c:1925
+#: libmount/src/context_mount.c:1637
#, c-format
msgid "wrong fs type, bad option, bad superblock on %s, missing codepage or helper program, or other error"
msgstr "文件系统类型错误、选项错误、%s 上有坏超级块、缺少代码页或帮助程序或其他错误"
-#: libmount/src/context_mount.c:1932
+#: libmount/src/context_mount.c:1644
#, c-format
msgid "mount table full"
msgstr "挂载表满"
-#: libmount/src/context_mount.c:1937
+#: libmount/src/context_mount.c:1649
#, c-format
msgid "can't read superblock on %s"
msgstr "无法读取 %s 上的超级块"
-#: libmount/src/context_mount.c:1944
+#: libmount/src/context_mount.c:1656
#, c-format
msgid "unknown filesystem type '%s'"
msgstr "未知的文件系统类型“%s”"
-#: libmount/src/context_mount.c:1947
+#: libmount/src/context_mount.c:1659
#, c-format
msgid "unknown filesystem type"
msgstr "未知的文件系统类型"
-#: libmount/src/context_mount.c:1956
+#: libmount/src/context_mount.c:1668
#, c-format
msgid "%s is not a block device, and stat(2) fails?"
msgstr "%s 不是块设备,而且 stat(2) 失败?"
-#: libmount/src/context_mount.c:1959
+#: libmount/src/context_mount.c:1671
#, c-format
msgid "the kernel does not recognize %s as a block device; maybe \"modprobe driver\" is necessary"
msgstr "内核无法将 %s 识别为块设备;也许需要“modprobe driver”"
-#: libmount/src/context_mount.c:1962
+#: libmount/src/context_mount.c:1674
#, c-format
msgid "%s is not a block device; try \"-o loop\""
msgstr "%s 不是块设备;请尝试“-o loop”"
-#: libmount/src/context_mount.c:1964
+#: libmount/src/context_mount.c:1676
#, c-format
msgid "%s is not a block device"
msgstr "%s 不是一个块设备"
-#: libmount/src/context_mount.c:1971
+#: libmount/src/context_mount.c:1683
#, c-format
msgid "%s is not a valid block device"
msgstr "%s 不是一个有效的块设备"
-#: libmount/src/context_mount.c:1979
+#: libmount/src/context_mount.c:1691
#, c-format
msgid "cannot mount %s read-only"
msgstr "无法以只读方式挂载 %s"
-#: libmount/src/context_mount.c:1981
+#: libmount/src/context_mount.c:1693
#, c-format
msgid "%s is write-protected but explicit read-write mode requested"
msgstr "%s 是写保护的,但明确请求了读写模式"
-#: libmount/src/context_mount.c:1983
+#: libmount/src/context_mount.c:1695
#, c-format
msgid "cannot remount %s read-write, is write-protected"
msgstr "无法以读写方式重新挂载 %s,它是写保护的"
-#: libmount/src/context_mount.c:1985
+#: libmount/src/context_mount.c:1697
#, c-format
msgid "bind %s failed"
msgstr "绑定 %s 失败"
-#: libmount/src/context_mount.c:1996
+#: libmount/src/context_mount.c:1708
#, c-format
msgid "no medium found on %s"
msgstr "在 %s 上找不到媒体"
-#: libmount/src/context_mount.c:2003
+#: libmount/src/context_mount.c:1715
#, c-format
msgid "cannot mount; probably corrupted filesystem on %s"
msgstr "无法挂载;%s 上的文件系统可能已损坏"
-#: libmount/src/context_umount.c:1252 libmount/src/context_umount.c:1306
+#: libmount/src/context_umount.c:1257 libmount/src/context_umount.c:1311
#, c-format
msgid "not mounted"
msgstr "未挂载"
-#: libmount/src/context_umount.c:1268
+#: libmount/src/context_umount.c:1273
#, c-format
msgid "umount failed: %m"
msgstr "挂载失败:%m"
-#: libmount/src/context_umount.c:1277
+#: libmount/src/context_umount.c:1282
#, c-format
msgid "filesystem was unmounted, but failed to update userspace mount table"
msgstr "文件系统已卸载,但更新用户空间挂载表失败"
-#: libmount/src/context_umount.c:1283
-#, fuzzy, c-format
-#| msgid "%s: filesystem was unmounted, but mount(8) failed"
+#: libmount/src/context_umount.c:1288
+#, c-format
msgid "filesystem was unmounted, but failed to switch namespace back"
-msgstr "%s:文件系统已卸载,但 mount(8) 失败"
+msgstr ""
-#: libmount/src/context_umount.c:1290
+#: libmount/src/context_umount.c:1295
#, fuzzy, c-format
#| msgid "%s: filesystem was unmounted, but mount(8) failed"
msgid "filesystem was unmounted, but any subsequent operation failed: %m"
msgstr "%s:文件系统已卸载,但 mount(8) 失败"
-#: libmount/src/context_umount.c:1303
+#: libmount/src/context_umount.c:1308
#, c-format
msgid "invalid block device"
msgstr "无效的块设备"
-#: libmount/src/context_umount.c:1309
+#: libmount/src/context_umount.c:1314
#, c-format
msgid "can't write superblock"
msgstr "无法写超级块"
-#: libmount/src/context_umount.c:1312
+#: libmount/src/context_umount.c:1317
#, c-format
msgid "target is busy"
msgstr "目标忙"
-#: libmount/src/context_umount.c:1315
+#: libmount/src/context_umount.c:1320
#, c-format
msgid "no mount point specified"
msgstr "未指定挂载点"
-#: libmount/src/context_umount.c:1318
+#: libmount/src/context_umount.c:1323
#, c-format
msgid "must be superuser to unmount"
msgstr "必须以超级用户身份卸载"
-#: libmount/src/context_umount.c:1321
+#: libmount/src/context_umount.c:1326
#, c-format
msgid "block devices are not permitted on filesystem"
msgstr "文件系统不允许块设备"
-#: libmount/src/context_umount.c:1324
+#: libmount/src/context_umount.c:1329
#, c-format
msgid "umount(2) system call failed: %m"
msgstr "umount(2) 系统调用失败:%m"
-#: lib/pager.c:112
-#, c-format
-msgid "waitpid failed (%s)"
-msgstr "waitpid 失败(%s)"
-
#: lib/plymouth-ctrl.c:73
msgid "cannot open UNIX socket"
msgstr "无法打开 UNIX 套接字"
msgid "the plymouth request %c is not implemented"
msgstr "plymouth 请求 %c 没有实现"
-#: lib/randutils.c:196
+#: lib/randutils.c:191
msgid "getrandom() function"
msgstr "getrandom() 函数"
-#: lib/randutils.c:209
+#: lib/randutils.c:204
msgid "libc pseudo-random functions"
msgstr "libc 伪随机函数"
+#: lib/shells.c:36
+#, fuzzy, c-format
+#| msgid "cannot open lock file %s"
+msgid "Cannot parse shells files: %s"
+msgstr "不能打开锁文件 %s"
+
+#: lib/shells.c:44
+#, c-format
+msgid "Cannot evaluate entries in shells files: %s"
+msgstr ""
+
#: lib/swapprober.c:22 lib/swapprober.c:35
#, c-format
msgid "%s: unable to probe device"
msgid "%s: unsupported swap version '%s'"
msgstr "%s:不支持的 swap 版本“%s”"
-#: lib/timeutils.c:466
+#: lib/timeutils.c:513
msgid "format_iso_time: buffer overflow."
msgstr "format_iso_time:缓冲溢出。"
-#: lib/timeutils.c:484 lib/timeutils.c:508
+#: lib/timeutils.c:531 lib/timeutils.c:555
#, c-format
msgid "time %<PRId64> is out of range."
msgstr "时间 %<PRId64> 超出范围。"
-#: login-utils/chfn.c:91 login-utils/chsh.c:69 login-utils/lslogins.c:1402
+#: login-utils/chfn.c:91 login-utils/chsh.c:70 login-utils/lslogins.c:1442
#, c-format
msgid " %s [options] [<username>]\n"
msgstr " %s [选项] [<用户名>]\n"
msgid "field %s is too long"
msgstr "字段 %s 过长"
-#: login-utils/chfn.c:122 login-utils/chsh.c:201
+#: login-utils/chfn.c:122 login-utils/chsh.c:182
#, c-format
msgid "%s: has illegal characters"
msgstr "%s:含有非法字符"
msgid "login.defs forbids setting %s"
msgstr "login.defs 禁止设置 %s"
-#: login-utils/chfn.c:157 login-utils/chfn.c:159 login-utils/chfn.c:317
+#: login-utils/chfn.c:157 login-utils/chfn.c:159 login-utils/chfn.c:318
msgid "Office"
msgstr "办公"
-#: login-utils/chfn.c:163 login-utils/chfn.c:165 login-utils/chfn.c:319
+#: login-utils/chfn.c:163 login-utils/chfn.c:165 login-utils/chfn.c:320
msgid "Office Phone"
msgstr "办公电话"
-#: login-utils/chfn.c:169 login-utils/chfn.c:171 login-utils/chfn.c:321
+#: login-utils/chfn.c:169 login-utils/chfn.c:171 login-utils/chfn.c:322
msgid "Home Phone"
msgstr "住宅电话"
-#: login-utils/chfn.c:188 login-utils/chsh.c:154
+#: login-utils/chfn.c:189 login-utils/chsh.c:135
msgid "cannot handle multiple usernames"
msgstr "无法处理多个用户名"
-#: login-utils/chfn.c:239
+#: login-utils/chfn.c:240
msgid "Aborted."
msgstr "已中止。"
-#: login-utils/chfn.c:303
+#: login-utils/chfn.c:304
#, c-format
msgid "%s: CHFN_RESTRICT has unexpected value: %s"
msgstr "%s: CHFN_RESTRICT 的值异常:%s"
-#: login-utils/chfn.c:305
+#: login-utils/chfn.c:306
#, c-format
msgid "%s: CHFN_RESTRICT does not allow any changes"
msgstr "%s: CHFN_RESTRICT 不允许更改"
-#: login-utils/chfn.c:387
+#: login-utils/chfn.c:388
#, c-format
msgid "Finger information *NOT* changed. Try again later.\n"
msgstr "Finger 信息*没有*更改。请稍后重试。\n"
-#: login-utils/chfn.c:391
+#: login-utils/chfn.c:392
#, c-format
msgid "Finger information changed.\n"
msgstr "Finger 信息已更改。\n"
-#: login-utils/chfn.c:417 login-utils/chsh.c:238 sys-utils/unshare.c:442
+#: login-utils/chfn.c:418 login-utils/chsh.c:219 sys-utils/unshare.c:426
#, c-format
msgid "you (user %d) don't exist."
msgstr "您(用户 %d)不存在。"
-#: login-utils/chfn.c:423 login-utils/chsh.c:243 login-utils/libuser.c:59
+#: login-utils/chfn.c:424 login-utils/chsh.c:224 login-utils/libuser.c:59
#, c-format
msgid "user \"%s\" does not exist."
msgstr "用户“%s”不存在。"
-#: login-utils/chfn.c:429 login-utils/chsh.c:249
+#: login-utils/chfn.c:430 login-utils/chsh.c:230
msgid "can only change local entries"
msgstr "只能更改本地记录"
-#: login-utils/chfn.c:438
+#: login-utils/chfn.c:439
#, c-format
msgid "%s is not authorized to change the finger info of %s"
msgstr "%s 未得到授权更改 %s 的 finger 信息"
-#: login-utils/chfn.c:440 login-utils/chsh.c:259
+#: login-utils/chfn.c:441 login-utils/chsh.c:240
msgid "Unknown user context"
msgstr "未知用户环境(context)"
-#: login-utils/chfn.c:445 login-utils/chsh.c:264
+#: login-utils/chfn.c:446 login-utils/chsh.c:245
#, c-format
msgid "can't set default context for %s"
msgstr "无法设置 %s 默认环境(context)"
-#: login-utils/chfn.c:456
+#: login-utils/chfn.c:457
msgid "running UID doesn't match UID of user we're altering, change denied"
msgstr "运行中的 UID 与要改变的用户的 UID 不匹配,更改被拒绝"
-#: login-utils/chfn.c:460
+#: login-utils/chfn.c:461
#, c-format
msgid "Changing finger information for %s.\n"
msgstr "正在更改 %s 的 finger 信息。\n"
-#: login-utils/chfn.c:474
+#: login-utils/chfn.c:475
#, c-format
msgid "Finger information not changed.\n"
msgstr "Finger 信息未更改。\n"
-#: login-utils/chsh.c:72
+#: login-utils/chsh.c:73
msgid "Change your login shell.\n"
msgstr "更改您的登录 shell。\n"
-#: login-utils/chsh.c:75
+#: login-utils/chsh.c:76
msgid " -s, --shell <shell> specify login shell\n"
msgstr " -s, --shell <shell> 指定登录 shell\n"
-#: login-utils/chsh.c:76
+#: login-utils/chsh.c:77
msgid " -l, --list-shells print list of shells and exit\n"
msgstr " -l, --list-shells 打印 shell 列表并退出\n"
-#: login-utils/chsh.c:195
+#: login-utils/chsh.c:176
msgid "shell must be a full path name"
msgstr "shell 必须为完整路径名称"
-#: login-utils/chsh.c:197
+#: login-utils/chsh.c:178
#, c-format
msgid "\"%s\" does not exist"
msgstr "“%s”不存在"
-#: login-utils/chsh.c:199
+#: login-utils/chsh.c:180
#, c-format
msgid "\"%s\" is not executable"
msgstr "“%s”不可执行"
-#: login-utils/chsh.c:205
+#: login-utils/chsh.c:186
#, c-format
msgid "Warning: \"%s\" is not listed in %s."
msgstr "警告:“%s”未在 %s 中列出。"
-#: login-utils/chsh.c:209 login-utils/chsh.c:213
+#: login-utils/chsh.c:190 login-utils/chsh.c:194
#, c-format
msgid ""
"\"%s\" is not listed in %s.\n"
"“%s”未列在 %s 中。\n"
"请使用 %s -l 查看列表。"
-#: login-utils/chsh.c:258
+#: login-utils/chsh.c:239
#, c-format
msgid "%s is not authorized to change the shell of %s"
msgstr "%s 无权更改 %s 的 shell"
-#: login-utils/chsh.c:283
+#: login-utils/chsh.c:264
msgid "running UID doesn't match UID of user we're altering, shell change denied"
msgstr "运行 UID 与要更改的用户的 UID 不匹配,更改 shell 被拒绝"
-#: login-utils/chsh.c:288
+#: login-utils/chsh.c:269
#, c-format
msgid "your shell is not in %s, shell change denied"
msgstr "您的 shell 不在 %s 中,更改 shell 被拒绝"
-#: login-utils/chsh.c:292
+#: login-utils/chsh.c:273
#, c-format
msgid "Changing shell for %s.\n"
msgstr "正在更改 %s 的 shell。\n"
-#: login-utils/chsh.c:300
+#: login-utils/chsh.c:281
msgid "New shell"
msgstr "新 shell"
-#: login-utils/chsh.c:308
+#: login-utils/chsh.c:289
msgid "Shell not changed."
msgstr "Shell 未更改。"
-#: login-utils/chsh.c:313
+#: login-utils/chsh.c:294
msgid "Shell *NOT* changed. Try again later."
msgstr "Shell *未* 更改。请稍后重试。"
-#: login-utils/chsh.c:317
+#: login-utils/chsh.c:298
msgid ""
"setpwnam failed\n"
"Shell *NOT* changed. Try again later."
"setpwnam 失败\n"
"Shell *未* 更改。请稍后重试。"
-#: login-utils/chsh.c:321
+#: login-utils/chsh.c:302
#, c-format
msgid "Shell changed.\n"
msgstr "Shell 已更改。\n"
msgid "Usage: %s <passwordfile> <username>...\n"
msgstr "用法:%s <密码文件> <用户名>...\n"
-#: login-utils/last.c:175 login-utils/lslogins.c:1393 sys-utils/dmesg.c:1340
+#: login-utils/last.c:175 login-utils/lslogins.c:1433 sys-utils/dmesg.c:1342
#: sys-utils/lsipc.c:283
#, c-format
msgid "unknown time format: %s"
msgstr "未知时间格式: %s"
-#: login-utils/last.c:286 login-utils/last.c:294
-#, c-format
-msgid "Interrupted %s"
-msgstr "中断的 %s"
-
-#: login-utils/last.c:452 login-utils/last.c:463 login-utils/last.c:913
+#: login-utils/last.c:439 login-utils/last.c:450 login-utils/last.c:901
msgid "preallocation size exceeded"
msgstr "超过了预分配大小"
-#: login-utils/last.c:582
+#: login-utils/last.c:568
#, c-format
msgid " %s [options] [<username>...] [<tty>...]\n"
msgstr " %s [选项] [<用户名>...] [<tty>...]\n"
-#: login-utils/last.c:585
+#: login-utils/last.c:571
msgid "Show a listing of last logged in users.\n"
msgstr "显示上次登录用户的列表。\n"
-#: login-utils/last.c:588
+#: login-utils/last.c:574
msgid " -<number> how many lines to show\n"
msgstr " -<数字> 显示行数\n"
-#: login-utils/last.c:589
+#: login-utils/last.c:575
msgid " -a, --hostlast display hostnames in the last column\n"
msgstr " -a, --hostlast 最后一列显示主机名\n"
-#: login-utils/last.c:590
+#: login-utils/last.c:576
msgid " -d, --dns translate the IP number back into a hostname\n"
msgstr " -d, --dns 将 IP 号转换回主机名\n"
-#: login-utils/last.c:592
+#: login-utils/last.c:578
#, c-format
msgid " -f, --file <file> use a specific file instead of %s\n"
msgstr " -F, --file <文件> 用指定文件代替 %s\n"
-#: login-utils/last.c:593
+#: login-utils/last.c:579
msgid " -F, --fulltimes print full login and logout times and dates\n"
msgstr " -F, --fulltimes 打印完整的登录和注销时间和日期\n"
-#: login-utils/last.c:594
+#: login-utils/last.c:580
msgid " -i, --ip display IP numbers in numbers-and-dots notation\n"
msgstr " -i, --ip 以数字和点的形式显示 IP 号\n"
-#: login-utils/last.c:595
+#: login-utils/last.c:581
msgid " -n, --limit <number> how many lines to show\n"
msgstr " -n, --limit <数字> 要显示的行数\n"
-#: login-utils/last.c:596
+#: login-utils/last.c:582
msgid " -R, --nohostname don't display the hostname field\n"
msgstr " -R, --nohostname 不显示主机名字段\n"
-#: login-utils/last.c:597
+#: login-utils/last.c:583
msgid " -s, --since <time> display the lines since the specified time\n"
msgstr " -s, --since <时间> 显示从指定时间起的行\n"
-#: login-utils/last.c:598
+#: login-utils/last.c:584
msgid " -t, --until <time> display the lines until the specified time\n"
msgstr " -t, --until <时间> 显示到指定时间为止的行\n"
-#: login-utils/last.c:599
+#: login-utils/last.c:585
msgid " -p, --present <time> display who were present at the specified time\n"
msgstr " -p, --present <时间> 显示在指定时间谁在场(present)\n"
-#: login-utils/last.c:600
+#: login-utils/last.c:586
msgid " -w, --fullnames display full user and domain names\n"
msgstr " -w, --fullnames 显示完整的用户名和域名\n"
-#: login-utils/last.c:601
+#: login-utils/last.c:587
msgid " -x, --system display system shutdown entries and run level changes\n"
msgstr " -x, --system 显示系统关机项和运行级别更改\n"
-#: login-utils/last.c:602
+#: login-utils/last.c:588
msgid ""
" --time-format <format> show timestamps in the specified <format>:\n"
" notime|short|full|iso\n"
" --time-format <格式> 以指定<格式>显示时间戳:\n"
" notime|short|full|iso\n"
-#: login-utils/last.c:914
+#: login-utils/last.c:902
#, fuzzy, c-format
#| msgid ""
#| "\n"
"\n"
"%s 开始 %s"
-#: login-utils/last.c:1023 term-utils/scriptlive.c:85
+#: login-utils/last.c:1011 term-utils/scriptlive.c:85
#: term-utils/scriptlive.c:89 term-utils/scriptreplay.c:80
-#: term-utils/scriptreplay.c:84 text-utils/more.c:286 text-utils/more.c:292
+#: term-utils/scriptreplay.c:84 text-utils/more.c:285 text-utils/more.c:291
msgid "failed to parse number"
msgstr "解析数字失败"
-#: login-utils/last.c:1044 login-utils/last.c:1049 login-utils/last.c:1054
-#: sys-utils/dmesg.c:1558 sys-utils/dmesg.c:1566 sys-utils/rtcwake.c:511
+#: login-utils/last.c:1032 login-utils/last.c:1037 login-utils/last.c:1042
+#: sys-utils/dmesg.c:1560 sys-utils/dmesg.c:1566 sys-utils/rtcwake.c:511
#, c-format
msgid "invalid time value \"%s\""
msgstr "无效的时间值\"%s\""
msgstr "致命:坏的 tty"
#: login-utils/login.c:551
-#, fuzzy, c-format
-#| msgid "TIOCSCTTY failed: %m"
+#, c-format
msgid "TIOCGWINSZ ioctl failed: %m"
-msgstr "TIOCSCTTY 失败:%m"
+msgstr "TIOCGWINSZ ioctl 失败: %m"
#: login-utils/login.c:559
#, c-format
msgstr "致命:%s:更改权限失败:%m"
#: login-utils/login.c:588
-#, fuzzy, c-format
-#| msgid "TIOCSCTTY failed: %m"
+#, c-format
msgid "TIOCSWINSZ ioctl failed: %m"
-msgstr "TIOCSCTTY 失败:%m"
+msgstr "TIOCSWINSZ ioctl 失败: %m"
#: login-utils/login.c:694
#, c-format
msgstr "上次登录:%.*s "
#: login-utils/login.c:698
-#, fuzzy, c-format
-#| msgid "from %.*s\n"
+#, c-format
msgid "from %s\n"
-msgstr "来自 %.*s\n"
+msgstr "来自 %s\n"
#: login-utils/login.c:701
-#, fuzzy, c-format
-#| msgid "on %.*s\n"
+#, c-format
msgid "on %s\n"
-msgstr "于 %.*s\n"
+msgstr "于 %s\n"
#: login-utils/login.c:717
msgid "write lastlog failed"
msgid "FAILED LOGIN %u FROM %s FOR %s, %s"
msgstr "FAILED LOGIN %u FROM %s FOR %s, %s"
-#: login-utils/login.c:977 login-utils/sulogin.c:1093
+#: login-utils/login.c:977 login-utils/sulogin.c:1101
#, c-format
msgid ""
"Login incorrect\n"
msgid "no shell"
msgstr "无 shell"
-#: login-utils/logindefs.c:216
-#, c-format
-msgid "%s: %s contains invalid numerical value: %s"
-msgstr "%s:%s 包含无效的数字值:%s"
-
-#: login-utils/logindefs.c:266
-#, c-format
-msgid "Error reading login.defs: %s"
-msgstr "读取 login.defs 出错:%s"
-
-#: login-utils/logindefs.c:333 login-utils/logindefs.c:353
-#: login-utils/logindefs.c:379
-#, c-format
-msgid "couldn't fetch %s: %s"
-msgstr "无法读取%s:%s"
-
-#: login-utils/logindefs.c:537
-msgid "hush login status: restore original IDs failed"
-msgstr "静默(hush)登录状态:恢复原 ID 失败"
-
-#: login-utils/lslogins.c:218 sys-utils/lscpu.c:325 sys-utils/lsmem.c:266
+#: login-utils/lslogins.c:218 sys-utils/lscpu.c:339 sys-utils/lsmem.c:266
msgid "no"
msgstr "否"
-#: login-utils/lslogins.c:227 misc-utils/lsblk.c:190
+#: login-utils/lslogins.c:227 misc-utils/lsblk.c:199
msgid "user name"
msgstr "用户名"
msgstr "用户 ID"
#: login-utils/lslogins.c:229
-msgid "password not required"
+#, fuzzy
+#| msgid "password not required"
+msgid "password not defined"
msgstr "无需密码"
#: login-utils/lslogins.c:229
-msgid "Password not required"
+#, fuzzy
+#| msgid "Password not required"
+msgid "Password not required (empty)"
msgstr "无需密码"
#: login-utils/lslogins.c:230
msgid "Running processes"
msgstr "运行中的进程"
-#: login-utils/lslogins.c:303 misc-utils/findmnt.c:142 misc-utils/lsblk.c:245
+#: login-utils/lslogins.c:303 misc-utils/findmnt.c:142 misc-utils/lsblk.c:255
#: sys-utils/lsipc.c:205 sys-utils/lsmem.c:145
#, c-format
msgid "too many columns specified, the limit is %zu columns"
msgid "failed to compose time string"
msgstr "生成时间字符串失败"
-#: login-utils/lslogins.c:765
+#: login-utils/lslogins.c:783
msgid "failed to get supplementary groups"
msgstr "获得附属组失败"
-#: login-utils/lslogins.c:1053
+#: login-utils/lslogins.c:1093
#, c-format
msgid "cannot found '%s'"
msgstr "无法找到“%s”"
-#: login-utils/lslogins.c:1233
+#: login-utils/lslogins.c:1273
msgid "internal error: unknown column"
msgstr "内部错误:未知的列"
-#: login-utils/lslogins.c:1341
+#: login-utils/lslogins.c:1381
#, c-format
msgid ""
"\n"
"\n"
"上次的日志:\n"
-#: login-utils/lslogins.c:1405
+#: login-utils/lslogins.c:1445
msgid "Display information about known users in the system.\n"
msgstr "显示系统中已知用户的信息。\n"
-#: login-utils/lslogins.c:1408
+#: login-utils/lslogins.c:1448
msgid " -a, --acc-expiration display info about passwords expiration\n"
msgstr " -a, --acc-expiration 显示关于密码过期的信息\n"
-#: login-utils/lslogins.c:1409
+#: login-utils/lslogins.c:1449
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:1410 sys-utils/lsipc.c:311
+#: login-utils/lslogins.c:1450 sys-utils/lsipc.c:311
msgid " -e, --export display in an export-able output format\n"
msgstr " -e, --export 以可导出的格式显示\n"
-#: login-utils/lslogins.c:1411
+#: login-utils/lslogins.c:1451
msgid " -f, --failed display data about the users' last failed logins\n"
msgstr " -f, --failed 显示有关该用户上次登录失败的数据\n"
-#: login-utils/lslogins.c:1412
+#: login-utils/lslogins.c:1452
msgid " -G, --supp-groups display information about groups\n"
msgstr " -G, --supp-groups 显示与组相关的信息\n"
-#: login-utils/lslogins.c:1413
+#: login-utils/lslogins.c:1453
msgid " -g, --groups=<groups> display users belonging to a group in <groups>\n"
msgstr " -g, --groups=<groups> 显示属于<groups>中的组的用户\n"
-#: login-utils/lslogins.c:1414
+#: login-utils/lslogins.c:1454
msgid " -L, --last show info about the users' last login sessions\n"
msgstr " -L, --last 显示关于该用户上次登录会话的信息\n"
-#: login-utils/lslogins.c:1415
+#: login-utils/lslogins.c:1455
msgid " -l, --logins=<logins> display only users from <logins>\n"
msgstr " -l, --logins=<登录方式> 只显示以指定<登录方式>登录的用户\n"
-#: login-utils/lslogins.c:1416 sys-utils/lsipc.c:313
+#: login-utils/lslogins.c:1456 sys-utils/lsipc.c:313
msgid " -n, --newline display each piece of information on a new line\n"
msgstr " -n, --newline 逐行显示每一部分信息\n"
-#: login-utils/lslogins.c:1417 sys-utils/lsipc.c:306
+#: login-utils/lslogins.c:1457 sys-utils/lsipc.c:306
msgid " --noheadings don't print headings\n"
msgstr " --noheadings 不打印标题\n"
-#: login-utils/lslogins.c:1418 sys-utils/lsipc.c:307
+#: login-utils/lslogins.c:1458 sys-utils/lsipc.c:307
msgid " --notruncate don't truncate output\n"
msgstr " --notruncate 不截断输出\n"
-#: login-utils/lslogins.c:1419 sys-utils/lsipc.c:315
+#: login-utils/lslogins.c:1459 sys-utils/lsipc.c:315
msgid " -o, --output[=<list>] define the columns to output\n"
msgstr " -o, --output[=<列表>] 定义要输出的列\n"
-#: login-utils/lslogins.c:1420
+#: login-utils/lslogins.c:1460
msgid " --output-all output all columns\n"
msgstr " --output-all 输出所有列\n"
-#: login-utils/lslogins.c:1421
+#: login-utils/lslogins.c:1461
msgid " -p, --pwd display information related to login by password.\n"
msgstr " -p, --pwd 显示与 用密码登录 相关的信息。\n"
-#: login-utils/lslogins.c:1422 sys-utils/lsipc.c:317
+#: login-utils/lslogins.c:1462 sys-utils/lsipc.c:317
msgid " -r, --raw display in raw mode\n"
msgstr " -r, --raw 以原始方式显示\n"
-#: login-utils/lslogins.c:1423
+#: login-utils/lslogins.c:1463
msgid " -s, --system-accs display system accounts\n"
msgstr " -s, --system-accs 显示系统帐户\n"
-#: login-utils/lslogins.c:1424 sys-utils/lsipc.c:308
+#: login-utils/lslogins.c:1464 sys-utils/lsipc.c:308
msgid " --time-format=<type> display dates in short, full or iso format\n"
msgstr " --time-format=<格式> 以短、长或 iso 格式显示日期\n"
-#: login-utils/lslogins.c:1425
+#: login-utils/lslogins.c:1465
msgid " -u, --user-accs display user accounts\n"
msgstr " -u, --user-accs 显示用户帐户\n"
-#: login-utils/lslogins.c:1426 sys-utils/lsipc.c:319
+#: login-utils/lslogins.c:1466 sys-utils/lsipc.c:319
msgid " -y, --shell use column names to be usable as shell variable identifiers\n"
msgstr ""
-#: login-utils/lslogins.c:1427
+#: login-utils/lslogins.c:1467
msgid " -Z, --context display SELinux contexts\n"
msgstr " -Z, --context 显示 SELinux 环境\n"
-#: login-utils/lslogins.c:1428
+#: login-utils/lslogins.c:1468
msgid " -z, --print0 delimit user entries with a nul character\n"
msgstr " -z, --print0 用空字符(nul)分隔用户记录项\n"
-#: login-utils/lslogins.c:1429
+#: login-utils/lslogins.c:1469
msgid " --wtmp-file <path> set an alternate path for wtmp\n"
msgstr " --wtmp-file <路径> 设置 wtmp 的可选路径\n"
-#: login-utils/lslogins.c:1430
+#: login-utils/lslogins.c:1470
msgid " --btmp-file <path> set an alternate path for btmp\n"
msgstr " --btmp-file <路径> 设置 btmp 的可选路径\n"
-#: login-utils/lslogins.c:1431
+#: login-utils/lslogins.c:1471
msgid " --lastlog <path> set an alternate path for lastlog\n"
msgstr " --lastlog <路径> 设置 lastlog 的可选路径\n"
-#: login-utils/lslogins.c:1624
+#: login-utils/lslogins.c:1664
msgid "failed to request selinux state"
msgstr "请求 selinux 状态失败"
-#: login-utils/lslogins.c:1638 login-utils/lslogins.c:1643
+#: login-utils/lslogins.c:1678 login-utils/lslogins.c:1683
msgid "Only one user may be specified. Use -l for multiple users."
msgstr "只能指定一个用户。多用户请使用 -l。"
msgid "Password: "
msgstr "密码:"
-#: login-utils/newgrp.c:160 login-utils/sulogin.c:1075
+#: login-utils/newgrp.c:160 login-utils/sulogin.c:1083
msgid "crypt failed"
msgstr "crypt 失败"
msgid "who are you?"
msgstr "您是哪位?"
-#: login-utils/newgrp.c:218 login-utils/newgrp.c:230 sys-utils/nsenter.c:520
-#: sys-utils/unshare.c:1064
+#: login-utils/newgrp.c:218 login-utils/newgrp.c:230 sys-utils/nsenter.c:567
+#: sys-utils/unshare.c:1087
msgid "setgid failed"
msgstr "setgid 失败"
msgid "no such group"
msgstr "无此组"
-#: login-utils/newgrp.c:234 sys-utils/nsenter.c:522 sys-utils/unshare.c:1067
+#: login-utils/newgrp.c:234 sys-utils/nsenter.c:569 sys-utils/unshare.c:1090
msgid "setuid failed"
msgstr "setuid 失败"
-#: login-utils/nologin.c:28 misc-utils/lsfd.c:1251 misc-utils/lslocks.c:545
-#: misc-utils/mcookie.c:83 misc-utils/uuidd.c:95 misc-utils/uuidgen.c:26
-#: sys-utils/dmesg.c:276 sys-utils/ipcmk.c:67 sys-utils/irqtop.c:257
-#: sys-utils/lscpu.c:1160 sys-utils/lsipc.c:292 sys-utils/lsirq.c:57
+#: login-utils/nologin.c:28 misc-utils/lsfd.c:1538 misc-utils/lslocks.c:545
+#: misc-utils/mcookie.c:83 misc-utils/uuidd.c:97 misc-utils/uuidgen.c:26
+#: sys-utils/dmesg.c:276 sys-utils/ipcmk.c:67 sys-utils/irqtop.c:262
+#: sys-utils/lscpu.c:1177 sys-utils/lsipc.c:292 sys-utils/lsirq.c:57
#: sys-utils/lsmem.c:519 sys-utils/readprofile.c:106 sys-utils/rtcwake.c:99
#: term-utils/scriptlive.c:57 term-utils/scriptreplay.c:47
#: term-utils/setterm.c:381 text-utils/line.c:31
msgid "This account is currently not available.\n"
msgstr "此帐户目前不可用。\n"
-#: login-utils/su-common.c:232
+#: login-utils/su-common.c:233
msgid " (core dumped)"
msgstr " (核心已转储)"
-#: login-utils/su-common.c:280
+#: login-utils/su-common.c:281
msgid "change owner or mode for pseudo-terminal failed"
msgstr ""
-#: login-utils/su-common.c:374
+#: login-utils/su-common.c:377
msgid "failed to modify environment"
msgstr "修改环境失败"
-#: login-utils/su-common.c:410
+#: login-utils/su-common.c:413
msgid "may not be used by non-root users"
msgstr "非 root 用户不能使用"
-#: login-utils/su-common.c:434
+#: login-utils/su-common.c:437
msgid "authentication failed"
msgstr "验证失败"
-#: login-utils/su-common.c:447
+#: login-utils/su-common.c:450
#, c-format
msgid "cannot open session: %s"
msgstr "无法打开会话:%s"
-#: login-utils/su-common.c:466
+#: login-utils/su-common.c:469
msgid "cannot block signals"
msgstr "无法阻塞信号"
-#: login-utils/su-common.c:483
+#: login-utils/su-common.c:486
msgid "cannot initialize signal mask for session"
msgstr ""
-#: login-utils/su-common.c:491
+#: login-utils/su-common.c:494
#, fuzzy
#| msgid "cannot block signals"
msgid "cannot initialize signal mask"
msgstr "无法阻塞信号"
-#: login-utils/su-common.c:501
+#: login-utils/su-common.c:504
#, fuzzy
#| msgid "cannot set signal handler"
msgid "cannot set signal handler for session"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:509 misc-utils/uuidd.c:435
+#: login-utils/su-common.c:512 misc-utils/uuidd.c:439
#: sys-utils/lscpu-virt.c:489
msgid "cannot set signal handler"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:517
+#: login-utils/su-common.c:520
#, fuzzy
#| msgid "cannot set signal handler"
msgid "cannot set signal mask"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:544 term-utils/script.c:955
+#: login-utils/su-common.c:547 term-utils/script.c:961
#: term-utils/scriptlive.c:296
msgid "failed to create pseudo-terminal"
msgstr "创建伪终端失败"
-#: login-utils/su-common.c:559
+#: login-utils/su-common.c:549 term-utils/script.c:968
+#: term-utils/scriptlive.c:298
+#, fuzzy
+#| msgid "%s: failed to initialize sysfs handler"
+msgid "failed to initialize signals handler"
+msgstr "%s:初始化 sysfs 处理函数失败"
+
+#: login-utils/su-common.c:564
#, fuzzy
#| msgid "cannot set signal handler"
msgid "cannot set child signal handler"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:569 term-utils/script.c:965
-#: term-utils/scriptlive.c:303
+#: login-utils/su-common.c:574 term-utils/script.c:977
+#: term-utils/scriptlive.c:305
msgid "cannot create child process"
msgstr "无法创建子进程"
-#: login-utils/su-common.c:588 sys-utils/nsenter.c:489
+#: login-utils/su-common.c:593 sys-utils/nsenter.c:510
#: sys-utils/switch_root.c:189
#, c-format
msgid "cannot change directory to %s"
msgstr "无法更改到 %s 目录"
-#: login-utils/su-common.c:614 term-utils/scriptlive.c:352
+#: login-utils/su-common.c:619 term-utils/scriptlive.c:354
#, c-format
msgid ""
"\n"
"\n"
"会话已终止,正在杀死 shell..."
-#: login-utils/su-common.c:625
+#: login-utils/su-common.c:630
#, c-format
msgid " ...killed.\n"
msgstr " ...已杀死。\n"
-#: login-utils/su-common.c:722
+#: login-utils/su-common.c:727
msgid "failed to set the PATH environment variable"
msgstr "设置 PATH 环境变量失败"
-#: login-utils/su-common.c:799
+#: login-utils/su-common.c:804
msgid "cannot set groups"
msgstr "无法设置 组"
-#: login-utils/su-common.c:805
+#: login-utils/su-common.c:810
#, fuzzy, c-format
#| msgid "failed to parse level '%s'"
msgid "failed to establish user credentials: %s"
msgstr "解析级别“%s”失败"
-#: login-utils/su-common.c:815
+#: login-utils/su-common.c:820
msgid "cannot set group id"
msgstr "无法设置 组 id"
-#: login-utils/su-common.c:817
+#: login-utils/su-common.c:822
msgid "cannot set user id"
msgstr "无法设置 用户 id"
-#: login-utils/su-common.c:885
+#: login-utils/su-common.c:886
msgid " -m, -p, --preserve-environment do not reset environment variables\n"
msgstr " -m, -p, --preserve-environment 不重置环境变量\n"
-#: login-utils/su-common.c:886
+#: login-utils/su-common.c:887
#, fuzzy
#| msgid " -m, -p, --preserve-environment do not reset environment variables\n"
msgid " -w, --whitelist-environment <list> don't reset specified variables\n"
msgstr " -m, -p, --preserve-environment 不重置环境变量\n"
-#: login-utils/su-common.c:889
+#: login-utils/su-common.c:890
msgid " -g, --group <group> specify the primary group\n"
msgstr " -g, --group <组> 指定主组\n"
-#: login-utils/su-common.c:890
+#: login-utils/su-common.c:891
#, fuzzy
#| msgid ""
#| " -G, --supp-group <group> specify a supplemental group\n"
" -G, --supp-group <组> 指定一个辅助组\n"
"\n"
-#: login-utils/su-common.c:893
+#: login-utils/su-common.c:894
msgid " -, -l, --login make the shell a login shell\n"
msgstr " -, -l, --login 使 shell 成为登录 shell\n"
-#: login-utils/su-common.c:894
+#: login-utils/su-common.c:895
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:895
+#: login-utils/su-common.c:896
msgid ""
" --session-command <command> pass a single command to the shell with -c\n"
" and do not create a new session\n"
" --session-command <命令> 使用 -c 向 shell 传递一条命令\n"
" 而不创建新会话\n"
-#: login-utils/su-common.c:897
+#: login-utils/su-common.c:898
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:898
+#: login-utils/su-common.c:899
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:899
+#: login-utils/su-common.c:900
msgid " -P, --pty create a new pseudo-terminal\n"
msgstr ""
-#: login-utils/su-common.c:909
+#: login-utils/su-common.c:910
#, fuzzy, c-format
#| msgid ""
#| " %1$s [options] <dev> [[-N] <part>]\n"
" %1$s [选项] <设备> [[-N] <分区>]\n"
" %1$s [选项] <命令>\n"
-#: login-utils/su-common.c:914
+#: login-utils/su-common.c:915
#, fuzzy
#| msgid ""
#| "\n"
"将退而使用与 su(1) 兼容的语法并执行标准 shell。\n"
"选项 -c、-f、-l 及 -s 与 -u 相互排斥。\n"
-#: login-utils/su-common.c:919
+#: login-utils/su-common.c:920
msgid " -u, --user <user> username\n"
msgstr " -u, --user <用户> 用户名\n"
-#: login-utils/su-common.c:930
+#: login-utils/su-common.c:931
#, c-format
msgid " %s [options] [-] [<user> [<argument>...]]\n"
msgstr " %s [选项] [-] [<用户> [<参数>...]]\n"
-#: login-utils/su-common.c:934
+#: login-utils/su-common.c:935
#, fuzzy
#| msgid ""
#| "\n"
"将有效用户 id 和组 id 更改为<用户>的 id。\n"
"单个 - 视为 -l。如果未指定<用户>,将假定为 root。\n"
-#: login-utils/su-common.c:1011
+#: login-utils/su-common.c:1012
#, 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:1017
+#: login-utils/su-common.c:1018
#, c-format
msgid "group %s does not exist"
msgstr "组 %s 不存在"
-#: login-utils/su-common.c:1126
+#: login-utils/su-common.c:1127
msgid "--pty is not supported for your system"
msgstr "--pty 在您的系统上不受支持"
-#: login-utils/su-common.c:1160
+#: login-utils/su-common.c:1161
msgid "ignoring --preserve-environment, it's mutually exclusive with --login"
msgstr "将忽略 --preserve-environment,它与 --login 互斥。"
-#: login-utils/su-common.c:1174
+#: login-utils/su-common.c:1175
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:1177
+#: login-utils/su-common.c:1178
msgid "no command was specified"
msgstr "没有指定命令"
-#: login-utils/su-common.c:1189
+#: login-utils/su-common.c:1190
msgid "only root can specify alternative groups"
msgstr "只有 root 用户能指定替代组"
-#: login-utils/su-common.c:1200
+#: login-utils/su-common.c:1201
#, c-format
msgid "user %s does not exist or the user entry does not contain all the required fields"
msgstr ""
-#: login-utils/su-common.c:1235
+#: login-utils/su-common.c:1236
#, c-format
msgid "using restricted shell %s"
msgstr "将使用受限 shell %s"
-#: login-utils/su-common.c:1256
+#: login-utils/su-common.c:1257
msgid "failed to allocate pty handler"
msgstr ""
-#: login-utils/su-common.c:1282
+#: login-utils/su-common.c:1283
#, c-format
msgid "warning: cannot change directory to %s"
msgstr "警告:无法更改到 %s 目录"
" -t, --timeout <秒数> 等待密码的最大时间(默认:无限制)\n"
" -e, --force 如果 getpwnam(3) 失败,直接检查密码文件\n"
-#: login-utils/sulogin.c:938 misc-utils/findmnt.c:1619 sys-utils/wdctl.c:762
-#: term-utils/agetty.c:852 term-utils/wall.c:219
+#: login-utils/sulogin.c:938 misc-utils/findmnt.c:1619 sys-utils/wdctl.c:764
+#: term-utils/agetty.c:860 term-utils/wall.c:219
msgid "invalid timeout argument"
msgstr "无效的 timeout 超时参数"
-#: login-utils/sulogin.c:957
+#: login-utils/sulogin.c:965
msgid "only superuser can run this program"
msgstr "只有超级用户能运行此程序"
-#: login-utils/sulogin.c:1000
+#: login-utils/sulogin.c:1008
msgid "cannot open console"
msgstr "打不开终端"
-#: login-utils/sulogin.c:1007
+#: login-utils/sulogin.c:1015
msgid "cannot open password database"
msgstr "无法打开密码数据库"
-#: login-utils/sulogin.c:1090
+#: login-utils/sulogin.c:1098
#, c-format
msgid ""
"cannot execute su shell\n"
"无法执行 su shell\n"
"\n"
-#: login-utils/sulogin.c:1097
+#: login-utils/sulogin.c:1105
msgid ""
"Timed out\n"
"\n"
"超时\n"
"\n"
-#: login-utils/sulogin.c:1129
+#: login-utils/sulogin.c:1137
msgid ""
"cannot wait on su shell\n"
"\n"
msgid "(not mounted)"
msgstr "(未挂载)"
-#: misc-utils/blkid.c:521 misc-utils/blkid.c:527
+#: misc-utils/blkid.c:518 misc-utils/blkid.c:524
#, c-format
msgid "error: %s"
msgstr "错误:%s"
-#: misc-utils/blkid.c:570
+#: misc-utils/blkid.c:567
#, c-format
msgid "%s: ambivalent result (probably more filesystems on the device, use wipefs(8) to see more details)"
msgstr ""
-#: misc-utils/blkid.c:616
+#: misc-utils/blkid.c:613
#, fuzzy, c-format
#| msgid "unknown argument: %s"
msgid "unknown keyword in -u <list> argument: '%s'"
msgstr "未知参数:%s"
-#: misc-utils/blkid.c:633
+#: misc-utils/blkid.c:630
msgid "error: -u <list> argument is empty"
msgstr ""
-#: misc-utils/blkid.c:786
+#: misc-utils/blkid.c:783
#, c-format
msgid "unsupported output format %s"
msgstr "不支持的输出格式:%s"
-#: misc-utils/blkid.c:789 misc-utils/wipefs.c:730
+#: misc-utils/blkid.c:786 misc-utils/fadvise.c:119 misc-utils/wipefs.c:734
msgid "invalid offset argument"
msgstr "无效的 偏移 参数"
-#: misc-utils/blkid.c:796
+#: misc-utils/blkid.c:793
#, fuzzy
#| msgid "no command was specified"
msgid "Too many tags specified"
msgstr "没有指定命令"
-#: misc-utils/blkid.c:802
+#: misc-utils/blkid.c:799 misc-utils/pipesz.c:273
#, fuzzy
#| msgid "invalid time argument"
msgid "invalid size argument"
msgstr "无效的 时间 参数"
-#: misc-utils/blkid.c:806
+#: misc-utils/blkid.c:803
msgid "Can only search for one NAME=value pair"
msgstr ""
-#: misc-utils/blkid.c:813
+#: misc-utils/blkid.c:810
msgid "-t needs NAME=value pair"
msgstr ""
-#: misc-utils/blkid.c:819
+#: misc-utils/blkid.c:816
#, c-format
msgid "%s from %s (libblkid %s, %s)\n"
msgstr "%s,来自 %s(libblkid %s,%s)\n"
-#: misc-utils/blkid.c:892
+#: misc-utils/blkid.c:889
msgid "The low-level probing mode does not support 'list' output format"
msgstr ""
-#: misc-utils/blkid.c:905
+#: misc-utils/blkid.c:902
msgid "The low-level probing mode requires a device"
msgstr ""
-#: misc-utils/blkid.c:916
+#: misc-utils/blkid.c:913
#, fuzzy, c-format
#| msgid "Failed to set personality to %s"
msgid "Failed to use probing hint: %s"
msgstr "无法将人格(personality)设置为 %s"
-#: misc-utils/blkid.c:959
+#: misc-utils/blkid.c:956
msgid "The lookup option requires a search type specified using -t"
msgstr ""
-#: misc-utils/cal.c:408
+#: misc-utils/cal.c:403
msgid "invalid month argument"
msgstr "无效的月份参数"
-#: misc-utils/cal.c:416
+#: misc-utils/cal.c:411
msgid "invalid week argument"
msgstr "无效的 周 参数"
-#: misc-utils/cal.c:418
+#: misc-utils/cal.c:413
msgid "illegal week value: use 1-54"
msgstr "非法的 周 值:请使用 1-54"
-#: misc-utils/cal.c:470
+#: misc-utils/cal.c:471
#, c-format
msgid "failed to parse timestamp or unknown month name: %s"
msgstr " 解析时间戳失败或月份名未知:%s"
-#: misc-utils/cal.c:479
+#: misc-utils/cal.c:480
msgid "illegal day value"
msgstr "日 值不合法"
-#: misc-utils/cal.c:481 misc-utils/cal.c:505
+#: misc-utils/cal.c:482 misc-utils/cal.c:506
#, c-format
msgid "illegal day value: use 1-%d"
msgstr "日 值不合法:请使用 1-%d"
-#: misc-utils/cal.c:485 misc-utils/cal.c:493
+#: misc-utils/cal.c:486 misc-utils/cal.c:494
msgid "illegal month value: use 1-12"
msgstr "月份值不合法:请使用 1-12"
-#: misc-utils/cal.c:489
+#: misc-utils/cal.c:490
#, c-format
msgid "unknown month name: %s"
msgstr "月份名未知:%s"
-#: misc-utils/cal.c:496 misc-utils/cal.c:500
+#: misc-utils/cal.c:497 misc-utils/cal.c:501
msgid "illegal year value"
msgstr "年份值不合法"
-#: misc-utils/cal.c:498
+#: misc-utils/cal.c:499
msgid "illegal year value: use positive integer"
msgstr "年份值不合法:请使用正整数"
-#: misc-utils/cal.c:534 misc-utils/cal.c:547
+#: misc-utils/cal.c:535 misc-utils/cal.c:548
#, c-format
msgid "illegal week value: year %d doesn't have week %d"
msgstr "非法的 周 值:%d 年没有第 %d 周"
-#: misc-utils/cal.c:1248
+#: misc-utils/cal.c:1270
#, c-format
msgid " %s [options] [[[day] month] year]\n"
msgstr " %s [选项] [[[日] 月] 年]\n"
-#: misc-utils/cal.c:1249
+#: misc-utils/cal.c:1271
#, c-format
msgid " %s [options] <timestamp|monthname>\n"
msgstr " %s [选项] <时间戳|月份名>\n"
-#: misc-utils/cal.c:1252
+#: misc-utils/cal.c:1274
msgid "Display a calendar, or some part of it.\n"
msgstr "显示日历或部分日历。\n"
-#: misc-utils/cal.c:1253
+#: misc-utils/cal.c:1275
msgid "Without any arguments, display the current month.\n"
msgstr "不带参数时,显示当月日历。\n"
-#: misc-utils/cal.c:1256
+#: misc-utils/cal.c:1278
msgid " -1, --one show only a single month (default)\n"
msgstr " -1, --one 只显示一个月(默认)\n"
-#: misc-utils/cal.c:1257
+#: misc-utils/cal.c:1279
msgid " -3, --three show three months spanning the date\n"
msgstr " -3, --three 显示该日期前后三个月\n"
-#: misc-utils/cal.c:1258
+#: misc-utils/cal.c:1280
msgid " -n, --months <num> show num months starting with date's month\n"
msgstr " -n, --months < 数字> 显示以日期所在月份开始的若干个月\n"
-#: misc-utils/cal.c:1259
+#: misc-utils/cal.c:1281
msgid " -S, --span span the date when displaying multiple months\n"
msgstr " -S, --span 显示多个月份时的日期范围\n"
-#: misc-utils/cal.c:1260
+#: misc-utils/cal.c:1282
msgid " -s, --sunday Sunday as first day of week\n"
msgstr " -s, --sunday 周日作为一周的第一天\n"
-#: misc-utils/cal.c:1261
+#: misc-utils/cal.c:1283
msgid " -m, --monday Monday as first day of week\n"
msgstr " -m, --monday 周一作为一周的第一天\n"
-#: misc-utils/cal.c:1262
+#: misc-utils/cal.c:1284
#, fuzzy
#| msgid " -j, --julian output Julian dates\n"
msgid " -j, --julian use day-of-year for all calendars\n"
msgstr " -j, --julian 输出儒略日期\n"
-#: misc-utils/cal.c:1263
+#: misc-utils/cal.c:1285
msgid " --reform <val> Gregorian reform date (1752|gregorian|iso|julian)\n"
msgstr ""
-#: misc-utils/cal.c:1264
+#: misc-utils/cal.c:1286
msgid " --iso alias for --reform=iso\n"
msgstr " --iso --reform=iso 的别名\n"
-#: misc-utils/cal.c:1265
+#: misc-utils/cal.c:1287
msgid " -y, --year show the whole year\n"
msgstr " -y, --year 显示全年\n"
-#: misc-utils/cal.c:1266
+#: misc-utils/cal.c:1288
msgid " -Y, --twelve show the next twelve months\n"
msgstr " -Y, --twelve 显示之后的 12 个月\n"
-#: misc-utils/cal.c:1267
+#: misc-utils/cal.c:1289
msgid " -w, --week[=<num>] show US or ISO-8601 week numbers\n"
msgstr " -w, --week[=<数字>] 显示美国或 ISO-8601 周数\n"
-#: misc-utils/cal.c:1268
+#: misc-utils/cal.c:1290
#, fuzzy
#| msgid " -y, --physical print physical instead of logical IDs\n"
msgid " -v, --vertical show day vertically instead of line\n"
msgstr " -y, --physical 打印物理 ID 而非逻辑 ID\n"
-#: misc-utils/cal.c:1270
+#: misc-utils/cal.c:1291
+#, fuzzy
+#| msgid " -o, --output <list> define which output columns to use\n"
+msgid " -c, --columns <width> amount of columns to use\n"
+msgstr " -o, --output <列表> 定义使用哪个输出列\n"
+
+#: misc-utils/cal.c:1293
#, fuzzy, c-format
#| msgid " --color[=<when>] colorize messages (auto, always or never)\n"
msgid " --color[=<when>] colorize messages (%s, %s or %s)\n"
msgstr " --color[=<时机>] 消息彩色显示(auto, always 或 never)\n"
+#: misc-utils/fadvise.c:49
+#, c-format
+msgid " %s [options] file\n"
+msgstr " %s [选项] 文件\n"
+
+#: misc-utils/fadvise.c:50
+#, fuzzy, c-format
+#| msgid " %s [options] file\n"
+msgid " %s [options] --fd|-d file-descriptor\n"
+msgstr " %s [选项] 文件\n"
+
+#: misc-utils/fadvise.c:53
+msgid " -a, --advice <advice> applying advice to the file (default: \"dontneed\")\n"
+msgstr ""
+
+#: misc-utils/fadvise.c:54
+#, fuzzy
+#| msgid " -l, --length <num> length for range operations, in bytes\n"
+msgid " -l, --length <num> length for range operations, in bytes\n"
+msgstr " -l, --length <数字> 范围操作的长度(字节数)\n"
+
+#: misc-utils/fadvise.c:55
+#, fuzzy
+#| msgid " -o, --offset <num> offset for range operations, in bytes\n"
+msgid " -o, --offset <num> offset for range operations, in bytes\n"
+msgstr " -o, --offset <数字> 范围操作的偏移量(字节数)\n"
+
+#: misc-utils/fadvise.c:60
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Available columns (for --show):\n"
+msgid ""
+"\n"
+"Available values for advice:\n"
+msgstr ""
+"\n"
+"可用列(用于 --show):\n"
+
+#: misc-utils/fadvise.c:111 misc-utils/pipesz.c:263 misc-utils/pipesz.c:335
+#, fuzzy
+#| msgid "invalid speed argument"
+msgid "invalid fd argument"
+msgstr "无效的 速度 参数"
+
+#: misc-utils/fadvise.c:131 misc-utils/fincore.c:339 sys-utils/losetup.c:828
+msgid "no file specified"
+msgstr "未指定文件"
+
+#: misc-utils/fadvise.c:136
+#, fuzzy
+#| msgid "bad file descriptor"
+msgid "specify either file descriptor or file name"
+msgstr "错误的文件描述符"
+
+#: misc-utils/fadvise.c:141
+#, fuzzy
+#| msgid "bad file descriptor"
+msgid "specify one file descriptor or file name"
+msgstr "错误的文件描述符"
+
+#: misc-utils/fadvise.c:156
+#, fuzzy, c-format
+#| msgid "failed to read pipe"
+msgid "failed to advise: %s"
+msgstr "读取管道失败"
+
#: misc-utils/fincore.c:61
#, fuzzy
#| msgid "Shared memory pages"
msgid "failed to do mincore: %s"
msgstr "读符号链接失败:%s"
-#: misc-utils/fincore.c:210
+#: misc-utils/fincore.c:211
#, c-format
msgid "failed to do mmap: %s"
msgstr "进行 mmap 失败:%s"
-#: misc-utils/fincore.c:236
+#: misc-utils/fincore.c:237
#, c-format
msgid "failed to open: %s"
msgstr "打开失败:%s"
-#: misc-utils/fincore.c:241
+#: misc-utils/fincore.c:242
#, c-format
msgid "failed to do fstat: %s"
msgstr "进行 fstat 失败:%s"
-#: misc-utils/fincore.c:262
+#: misc-utils/fincore.c:263
#, c-format
msgid " %s [options] file...\n"
msgstr " %s [选项] 文件...\n"
-#: misc-utils/fincore.c:265 misc-utils/lsfd.c:1255
+#: misc-utils/fincore.c:266
msgid " -J, --json use JSON output format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: misc-utils/fincore.c:266
+#: misc-utils/fincore.c:267
#, fuzzy
#| msgid " -b, --bytes print sizes in bytes rather than in human readable format\n"
msgid " -b, --bytes print sizes in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n"
-#: misc-utils/fincore.c:267 misc-utils/lsfd.c:1256
+#: misc-utils/fincore.c:268
#, fuzzy
#| msgid " -n, --noheadings don't print headings\n"
msgid " -n, --noheadings don't print headings\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/fincore.c:268 misc-utils/lsfd.c:1257
+#: misc-utils/fincore.c:269
#, fuzzy
#| msgid " -o, --output <list> output columns\n"
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: misc-utils/fincore.c:269 misc-utils/lsfd.c:1258
+#: misc-utils/fincore.c:270
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原始输出格式\n"
-#: misc-utils/fincore.c:338 sys-utils/losetup.c:826
-msgid "no file specified"
-msgstr "未指定文件"
-
#: misc-utils/findfs.c:28
#, c-format
msgid " %s [options] {LABEL,UUID,PARTUUID,PARTLABEL}=<value>\n"
msgid "action detected by --poll"
msgstr "--poll 检测到的操作"
-#: misc-utils/findmnt.c:104 misc-utils/lsblk.c:171
+#: misc-utils/findmnt.c:104 misc-utils/lsblk.c:179
msgid "filesystem size available"
msgstr "文件系统可用大小"
msgid "filesystem root"
msgstr "文件系统 root"
-#: misc-utils/findmnt.c:107 misc-utils/lsblk.c:174
+#: misc-utils/findmnt.c:107 misc-utils/lsblk.c:182
msgid "filesystem type"
msgstr "文件系统类型"
msgid "filesystem label"
msgstr "文件系统标签"
-#: misc-utils/findmnt.c:111 misc-utils/lsblk.c:184 misc-utils/lslocks.c:80
+#: misc-utils/findmnt.c:111 misc-utils/lsblk.c:192 misc-utils/lslocks.c:80
msgid "major:minor device number"
msgstr "主:次 设备号"
msgid "VFS propagation flags"
msgstr "VFS 传播标志"
-#: misc-utils/findmnt.c:121 misc-utils/lsblk.c:173
+#: misc-utils/findmnt.c:121 misc-utils/lsblk.c:181
msgid "filesystem size"
msgstr "文件系统大小"
msgid "task ID"
msgstr "任务 ID"
-#: misc-utils/findmnt.c:126 misc-utils/lsblk.c:175
+#: misc-utils/findmnt.c:126 misc-utils/lsblk.c:183
msgid "filesystem size used"
msgstr "文件系统已用大小"
-#: misc-utils/findmnt.c:127 misc-utils/lsblk.c:176
+#: misc-utils/findmnt.c:127 misc-utils/lsblk.c:184
msgid "filesystem use percentage"
msgstr "文件系统使用百分比"
-#: misc-utils/findmnt.c:128 misc-utils/lsblk.c:218
+#: misc-utils/findmnt.c:128 misc-utils/lsblk.c:228
msgid "filesystem UUID"
msgstr "文件系统 UUID"
msgstr "移动"
#: misc-utils/findmnt.c:927 misc-utils/findmnt.c:1205 sys-utils/eject.c:715
-#: sys-utils/mount.c:406
+#: sys-utils/mount.c:408
msgid "failed to initialize libmount table"
msgstr "初始化 libmount table 失败"
#: misc-utils/findmnt.c:1145 misc-utils/findmnt.c:1211
#: misc-utils/findmnt-verify.c:101 misc-utils/findmnt-verify.c:529
-#: sys-utils/fstrim.c:316 sys-utils/mount.c:132 sys-utils/mount.c:180
-#: sys-utils/mount.c:247 sys-utils/swapoff.c:63 sys-utils/swapoff.c:173
+#: sys-utils/fstrim.c:329 sys-utils/mount.c:134 sys-utils/mount.c:182
+#: sys-utils/mount.c:249 sys-utils/swapoff.c:63 sys-utils/swapoff.c:173
#: sys-utils/swapon.c:247 sys-utils/swapon.c:290 sys-utils/swapon.c:750
-#: sys-utils/umount.c:190
+#: sys-utils/umount.c:199
msgid "failed to initialize libmount iterator"
msgstr "无法初始化 libmount 迭代器"
msgid "failed to initialize libmount tabdiff"
msgstr "初始化 libmount tabdiff 失败"
-#: misc-utils/findmnt.c:1245 misc-utils/kill.c:410
+#: misc-utils/findmnt.c:1245 misc-utils/kill.c:416
msgid "poll() failed"
msgstr "poll() 失败"
msgid " -i, --invert invert the sense of matching\n"
msgstr " -i, --invert 反转搜索的匹配\n"
-#: misc-utils/findmnt.c:1352 misc-utils/lslocks.c:552 sys-utils/lsns.c:1214
+#: misc-utils/findmnt.c:1352 misc-utils/lslocks.c:552 sys-utils/lsns.c:1291
#: sys-utils/rfkill.c:639
msgid " -J, --json use JSON output format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: misc-utils/findmnt.c:1353 sys-utils/lsns.c:1215
+#: misc-utils/findmnt.c:1353 sys-utils/lsns.c:1292
msgid " -l, --list use list format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
msgid " -U, --uniq ignore filesystems with duplicate target\n"
msgstr " -U, --uniq 忽略目标重复的文件系统\n"
-#: misc-utils/findmnt.c:1372 misc-utils/lslocks.c:559 sys-utils/lsns.c:1221
+#: misc-utils/findmnt.c:1372 misc-utils/lslocks.c:559 sys-utils/lsns.c:1299
msgid " -u, --notruncate don't truncate text in columns\n"
msgstr " -u, --notruncate 不截断列中的文本\n"
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:1740 sys-utils/fstrim.c:295
+#: misc-utils/findmnt.c:1740 sys-utils/fstrim.c:308
msgid "failed to initialize libmount cache"
msgstr "初始化 libmount 缓存失败"
#: misc-utils/findmnt-verify.c:452
#, fuzzy
-#| msgid "Unknown"
-msgid "reason uknown"
+#| msgid "unknown"
+msgid "reason unknown"
msgstr "未知"
#: misc-utils/findmnt-verify.c:455 misc-utils/findmnt-verify.c:457
msgid "internal error, contact the author."
msgstr "内部错误,请联系作者。"
-#: misc-utils/hardlink.c:262
+#: misc-utils/hardlink.c:272
#, c-format
msgid "could not compile regular expression %s: %s"
msgstr "无法编译正则表达式 %s:%s"
-#: misc-utils/hardlink.c:345
+#: misc-utils/hardlink.c:391
msgid "Mode:"
msgstr "模式:"
-#: misc-utils/hardlink.c:346
+#: misc-utils/hardlink.c:392
msgid "dry-run"
msgstr ""
-#: misc-utils/hardlink.c:346
+#: misc-utils/hardlink.c:392
msgid "real"
msgstr ""
-#: misc-utils/hardlink.c:347
+#: misc-utils/hardlink.c:393
msgid "Method:"
msgstr ""
-#: misc-utils/hardlink.c:348
+#: misc-utils/hardlink.c:394
msgid "Files:"
msgstr "文件:"
-#: misc-utils/hardlink.c:349 misc-utils/hardlink.c:355
-#: misc-utils/hardlink.c:359
+#: misc-utils/hardlink.c:395 misc-utils/hardlink.c:401
+#: misc-utils/hardlink.c:405
#, c-format
msgid "%-25s %zu files"
msgstr ""
-#: misc-utils/hardlink.c:349
+#: misc-utils/hardlink.c:395
msgid "Linked:"
msgstr ""
-#: misc-utils/hardlink.c:352
+#: misc-utils/hardlink.c:398
#, c-format
msgid "%-25s %zu xattrs"
msgstr ""
-#: misc-utils/hardlink.c:352 misc-utils/hardlink.c:355
+#: misc-utils/hardlink.c:398 misc-utils/hardlink.c:401
msgid "Compared:"
msgstr ""
-#: misc-utils/hardlink.c:359
+#: misc-utils/hardlink.c:405
msgid "Skipped reflinks:"
msgstr ""
-#: misc-utils/hardlink.c:366
+#: misc-utils/hardlink.c:412
#, fuzzy
#| msgid "saved"
msgid "Saved:"
msgstr "已保存"
-#: misc-utils/hardlink.c:369
+#: misc-utils/hardlink.c:415
#, fuzzy, c-format
#| msgid "%s (%<PRIu64>-%<PRIu64>): "
msgid "%-25s %<PRId64>.%06<PRId64> seconds"
msgstr "%s (%<PRIu64>-%<PRIu64>): "
-#: misc-utils/hardlink.c:369
+#: misc-utils/hardlink.c:415
#, fuzzy
#| msgid "Description"
msgid "Duration:"
msgstr "描述"
-#: misc-utils/hardlink.c:407
+#: misc-utils/hardlink.c:453
#, fuzzy, c-format
#| msgid "cannot get threshold for %s"
msgid "cannot get xattr names for %s"
msgstr "无法获取 %s 的阈值"
-#: misc-utils/hardlink.c:423
+#: misc-utils/hardlink.c:469
#, fuzzy, c-format
#| msgid "cannot get threshold for %s"
msgid "cannot get xattr value of %s for %s"
msgstr "无法获取 %s 的阈值"
-#: misc-utils/hardlink.c:503
+#: misc-utils/hardlink.c:549
#, c-format
msgid "Comparing xattrs of %s to %s"
msgstr ""
-#: misc-utils/hardlink.c:671
+#: misc-utils/hardlink.c:716
msgid "Reflinking failed, fallback to hardlinking"
msgstr ""
-#: misc-utils/hardlink.c:706
+#: misc-utils/hardlink.c:751
#, fuzzy, c-format
#| msgid "%s: symlinking to %s failed"
msgid "%s%sLinking %s to %s (-%s)"
msgstr "%s:符号链接到 %s 失败"
-#: misc-utils/hardlink.c:707
+#: misc-utils/hardlink.c:752
msgid "[DryRun] "
msgstr ""
-#: misc-utils/hardlink.c:721
+#: misc-utils/hardlink.c:766
#, fuzzy, c-format
#| msgid "cannot open %s: %s"
msgid "cannot link %s to %s"
msgstr "无法打开 %s:%s"
-#: misc-utils/hardlink.c:724
+#: misc-utils/hardlink.c:769
#, c-format
msgid "cannot rename %s to %s"
msgstr "无法将 %s 改名为 %s"
-#: misc-utils/hardlink.c:810
+#: misc-utils/hardlink.c:855
#, c-format
msgid "Skipped %s (smaller than configured size)"
msgstr ""
-#: misc-utils/hardlink.c:820
+#: misc-utils/hardlink.c:865
#, fuzzy, c-format
#| msgid "%s: offset is greater than device size"
msgid "Skipped %s (greater than configured size)"
msgstr "%s:偏移量超过设备大小"
-#: misc-utils/hardlink.c:847
+#: misc-utils/hardlink.c:893
#, fuzzy, c-format
#| msgid "target specified more than once"
msgid "Skipped %s (specified more than once)"
msgstr "不止一次指定目标"
-#: misc-utils/hardlink.c:886
+#: misc-utils/hardlink.c:932
msgid "cannot continue"
msgstr "无法继续"
-#: misc-utils/hardlink.c:1054
+#: misc-utils/hardlink.c:1100
#, fuzzy, c-format
#| msgid "unsupported GPT attribute bit '%s'"
msgid "Skipped (attributes mismatch) %s"
msgstr "不支持的 GPT 属性位“%s”"
-#: misc-utils/hardlink.c:1060
+#: misc-utils/hardlink.c:1106
#, c-format
msgid "Skipped (already reflink) %s"
msgstr ""
-#: misc-utils/hardlink.c:1081
+#: misc-utils/hardlink.c:1127
#, c-format
msgid "Skipped (content mismatch) %s"
msgstr ""
-#: misc-utils/hardlink.c:1111
+#: misc-utils/hardlink.c:1157
#, c-format
msgid " %s [options] <directory>|<file> ...\n"
msgstr " %s [options] <目录>|<文件> ...\n"
-#: misc-utils/hardlink.c:1115
+#: misc-utils/hardlink.c:1161
msgid "Consolidate duplicate files using hardlinks.\n"
msgstr ""
-#: misc-utils/hardlink.c:1118
-msgid " -v, --verbose verbose output (repeat for more verbosity)\n"
-msgstr " -v, --verbose 详尽输出(重复该参数可获得更详尽内容)\n"
-
-#: misc-utils/hardlink.c:1119
-msgid " -q, --quiet quiet mode - don't print anything\n"
-msgstr " -q, --quiet 安静模式 - 不要打印任何内容\n"
-
-#: misc-utils/hardlink.c:1120
+#: misc-utils/hardlink.c:1164
#, fuzzy
-#| msgid " -n, --dry-run don't actually link anything"
-msgid " -n, --dry-run don't actually link anything\n"
-msgstr " -n, --dry-run 不要实际进行任何链接操作"
+#| msgid " -c, --content compare only contents, ignore permission, etc."
+msgid " -c, --content compare only file contents, same as -pot\n"
+msgstr " -c, --content 只比较内容,忽略权限等其它信息"
-#: misc-utils/hardlink.c:1121
+#: misc-utils/hardlink.c:1165
#, fuzzy
-#| msgid " -f, --file <file> log the contents of this file\n"
-msgid " -y, --method <name> file content comparison method\n"
-msgstr " -f, --file <文件> 记录指定文件的内容\n"
+#| msgid " -S, --size <size> maximum size for a single message\n"
+msgid ""
+" -b, --io-size <size> I/O buffer size for file reading\n"
+" (speedup, using more RAM)\n"
+msgstr " -S, --size <大小> 单条消息的最大尺寸\n"
-#: misc-utils/hardlink.c:1123
+#: misc-utils/hardlink.c:1167
#, fuzzy
#| msgid " -U, --detect-case detect uppercase terminal\n"
-msgid " -f, --respect-name filenames have to be identical\n"
+msgid " -d, --respect-dir directory names have to be identical\n"
msgstr " -U, --detect-case 检测纯大写终端\n"
-#: misc-utils/hardlink.c:1124
-#, fuzzy
-#| msgid " -t, --ignore ignore failures\n"
-msgid " -p, --ignore-mode ignore changes of file mode\n"
-msgstr " -t, --ignore 忽略失败\n"
-
-#: misc-utils/hardlink.c:1125
-#, fuzzy
-#| msgid " -t, --ignore ignore failures\n"
-msgid " -o, --ignore-owner ignore owner changes\n"
-msgstr " -t, --ignore 忽略失败\n"
-
-#: misc-utils/hardlink.c:1126
-#, fuzzy
-#| msgid " -t, --notime don't show any timestamp with messages\n"
-msgid " -t, --ignore-time ignore timestamps (when testing for equality)\n"
-msgstr " -t, --notime 不显示任何消息的时间戳\n"
-
-#: misc-utils/hardlink.c:1128
-msgid " -X, --respect-xattrs respect extended attributes\n"
-msgstr ""
-
-#: misc-utils/hardlink.c:1131
+#: misc-utils/hardlink.c:1168
#, fuzzy
-#| msgid " -E, --echo <when> echo input (auto, always or never)\n"
-msgid " --reflink[=<when>] create clone/CoW copies (auto, always, never)\n"
-msgstr " -E, --echo <时机> 回显输入(, always 或 never)\n"
+#| msgid " -U, --detect-case detect uppercase terminal\n"
+msgid " -f, --respect-name filenames have to be identical\n"
+msgstr " -U, --detect-case 检测纯大写终端\n"
-#: misc-utils/hardlink.c:1132
-msgid " --skip-reflinks skip already cloned files (enabled on --reflink)\n"
-msgstr ""
+#: misc-utils/hardlink.c:1169
+msgid " -i, --include <regex> regular expression to include files/dirs\n"
+msgstr " -i, --include <正则> 用于包含文件/目录的正则表达式\n"
-#: misc-utils/hardlink.c:1134
+#: misc-utils/hardlink.c:1170
#, fuzzy
#| msgid ""
#| " -k, --kernel search in kernel table of mounted\n"
" -k, --kernel 在已挂载文件系统的内核表中搜索\n"
" (默认)\n"
-#: misc-utils/hardlink.c:1136
+#: misc-utils/hardlink.c:1172
#, fuzzy
#| msgid " -i, --invert invert the sense of matching\n"
msgid " -M, --minimize reverse the meaning of -m\n"
msgstr " -i, --invert 反转搜索的匹配\n"
-#: misc-utils/hardlink.c:1137
+#: misc-utils/hardlink.c:1173
+#, fuzzy
+#| msgid " -n, --dry-run don't actually link anything"
+msgid " -n, --dry-run don't actually link anything\n"
+msgstr " -n, --dry-run 不要实际进行任何链接操作"
+
+#: misc-utils/hardlink.c:1174
+#, fuzzy
+#| msgid " -t, --ignore ignore failures\n"
+msgid " -o, --ignore-owner ignore owner changes\n"
+msgstr " -t, --ignore 忽略失败\n"
+
+#: misc-utils/hardlink.c:1175
msgid ""
" -O, --keep-oldest keep the oldest file of multiple equal files\n"
" (lower precedence than minimize/maximize)\n"
msgstr ""
-#: misc-utils/hardlink.c:1139
+#: misc-utils/hardlink.c:1177
#, fuzzy
-#| msgid " -x, --exclude <regex> exclude files matching pattern"
-msgid " -x, --exclude <regex> regular expression to exclude files\n"
-msgstr " -x, --exclude <正则> 排除匹配指定模式的文件"
+#| msgid " -t, --ignore ignore failures\n"
+msgid " -p, --ignore-mode ignore changes of file mode\n"
+msgstr " -t, --ignore 忽略失败\n"
-#: misc-utils/hardlink.c:1140
-msgid " -i, --include <regex> regular expression to include files/dirs\n"
-msgstr " -i, --include <正则> 用于包含文件/目录的正则表达式\n"
+#: misc-utils/hardlink.c:1178
+msgid " -q, --quiet quiet mode - don't print anything\n"
+msgstr " -q, --quiet 安静模式 - 不要打印任何内容\n"
-#: misc-utils/hardlink.c:1141
+#: misc-utils/hardlink.c:1179
#, fuzzy
#| msgid " -S, --size <size> maximum size for a single message\n"
-msgid " -s, --minimum-size <size> minimum size for files.\n"
+msgid " -r, --cache-size <size> memory limit for cached file content data\n"
msgstr " -S, --size <大小> 单条消息的最大尺寸\n"
-#: misc-utils/hardlink.c:1142
+#: misc-utils/hardlink.c:1180
#, fuzzy
#| msgid " -S, --size <size> maximum size for a single message\n"
-msgid " -S, --maximum-size <size> maximum size for files.\n"
+msgid " -s, --minimum-size <size> minimum size for files.\n"
msgstr " -S, --size <大小> 单条消息的最大尺寸\n"
-#: misc-utils/hardlink.c:1143
+#: misc-utils/hardlink.c:1181
#, fuzzy
#| msgid " -S, --size <size> maximum size for a single message\n"
-msgid " -b, --io-size <size> I/O buffer size for file reading (speedup, using more RAM)\n"
+msgid " -S, --maximum-size <size> maximum size for files.\n"
msgstr " -S, --size <大小> 单条消息的最大尺寸\n"
-#: misc-utils/hardlink.c:1144
+#: misc-utils/hardlink.c:1182
#, fuzzy
-#| msgid " -S, --size <size> maximum size for a single message\n"
-msgid " -r, --cache-size <size> memory limit for cached file content data\n"
-msgstr " -S, --size <大小> 单条消息的最大尺寸\n"
+#| msgid " -t, --notime don't show any timestamp with messages\n"
+msgid " -t, --ignore-time ignore timestamps (when testing for equality)\n"
+msgstr " -t, --notime 不显示任何消息的时间戳\n"
+
+#: misc-utils/hardlink.c:1183
+msgid " -v, --verbose verbose output (repeat for more verbosity)\n"
+msgstr " -v, --verbose 详尽输出(重复该参数可获得更详尽内容)\n"
-#: misc-utils/hardlink.c:1145
+#: misc-utils/hardlink.c:1184
#, fuzzy
-#| msgid " -c, --content compare only contents, ignore permission, etc."
-msgid " -c, --content compare only file contents, same as -pot\n"
-msgstr " -c, --content 只比较内容,忽略权限等其它信息"
+#| msgid " -x, --exclude <regex> exclude files matching pattern"
+msgid " -x, --exclude <regex> regular expression to exclude files\n"
+msgstr " -x, --exclude <正则> 排除匹配指定模式的文件"
+
+#: misc-utils/hardlink.c:1186
+msgid " -X, --respect-xattrs respect extended attributes\n"
+msgstr ""
+
+#: misc-utils/hardlink.c:1188
+#, fuzzy
+#| msgid " -f, --file <file> log the contents of this file\n"
+msgid " -y, --method <name> file content comparison method\n"
+msgstr " -f, --file <文件> 记录指定文件的内容\n"
+
+#: misc-utils/hardlink.c:1191
+#, fuzzy
+#| msgid " -E, --echo <when> echo input (auto, always or never)\n"
+msgid " --reflink[=<when>] create clone/CoW copies (auto, always, never)\n"
+msgstr " -E, --echo <时机> 回显输入(, always 或 never)\n"
-#: misc-utils/hardlink.c:1256
+#: misc-utils/hardlink.c:1192
+msgid " --skip-reflinks skip already cloned files (enabled on --reflink)\n"
+msgstr ""
+
+#: misc-utils/hardlink.c:1303
#, fuzzy
#| msgid "failed to parse size"
msgid "failed to parse minimum size"
msgstr "解析大小失败"
-#: misc-utils/hardlink.c:1259
+#: misc-utils/hardlink.c:1306
#, fuzzy
#| msgid "failed to parse size"
msgid "failed to parse maximum size"
msgstr "解析大小失败"
-#: misc-utils/hardlink.c:1262
+#: misc-utils/hardlink.c:1309
#, fuzzy
#| msgid "failed to parse size"
-msgid "failed to cache size"
+msgid "failed to parse cache size"
msgstr "解析大小失败"
-#: misc-utils/hardlink.c:1265
+#: misc-utils/hardlink.c:1312
#, fuzzy
#| msgid "failed to parse size"
msgid "failed to parse I/O size"
msgstr "解析大小失败"
-#: misc-utils/hardlink.c:1278
+#: misc-utils/hardlink.c:1325
#, fuzzy, c-format
#| msgid "unsupported lock mode: %s"
msgid "unsupported reflink mode; %s"
msgstr "不支持的锁模式:%s"
-#: misc-utils/hardlink.c:1336
+#: misc-utils/hardlink.c:1406
msgid "cannot register exit handler"
msgstr "无法登记退出处理函数"
-#: misc-utils/hardlink.c:1341
+#: misc-utils/hardlink.c:1411
msgid "no directory or file specified"
msgstr "未指定目录或文件"
-#: misc-utils/hardlink.c:1347
+#: misc-utils/hardlink.c:1417
#, c-format
msgid "cannot initialize %s method, use 'memcmp' fallback"
msgstr ""
-#: misc-utils/hardlink.c:1352
+#: misc-utils/hardlink.c:1422
#, fuzzy
#| msgid "failed to initialize loopcxt"
msgid "failed to initialize files comparior"
msgstr "初始化 loopcxt 失败"
-#: misc-utils/hardlink.c:1364
+#: misc-utils/hardlink.c:1434
msgid "Scanning [device/inode/links]:"
msgstr ""
-#: misc-utils/hardlink.c:1369 sys-utils/fstrim.c:96
+#: misc-utils/hardlink.c:1439 sys-utils/fstrim.c:97
#, c-format
msgid "cannot get realpath: %s"
msgstr "无法获取真实路径:%s"
-#: misc-utils/hardlink.c:1373
+#: misc-utils/hardlink.c:1445
#, c-format
msgid "cannot process %s"
msgstr "无法处理 %s"
-#: misc-utils/kill.c:170
+#: misc-utils/kill.c:171
#, c-format
msgid "unknown signal %s; valid signals:"
msgstr "未知信号 %s;有效信号为:"
-#: misc-utils/kill.c:196
+#: misc-utils/kill.c:197
#, c-format
msgid " %s [options] <pid>|<name>...\n"
msgstr " %s [选项] <pid>|<名称> ...\n"
-#: misc-utils/kill.c:199
+#: misc-utils/kill.c:200
msgid "Forcibly terminate a process.\n"
msgstr "强制结束某个进程。\n"
-#: misc-utils/kill.c:202
+#: misc-utils/kill.c:203
msgid ""
" -a, --all do not restrict the name-to-pid conversion to processes\n"
" with the same uid as the present process\n"
" -a, --all 不限于只对和当前进程的 uid 相同的进程进行\n"
" 名称-pid 转换\n"
-#: misc-utils/kill.c:204
+#: misc-utils/kill.c:205
msgid " -s, --signal <signal> send this <signal> instead of SIGTERM\n"
msgstr " -s, --signal <信号> 发送指定的<信号>而非 SIGTERM\n"
-#: misc-utils/kill.c:206
+#: misc-utils/kill.c:207
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:209
+#: misc-utils/kill.c:210
msgid ""
" --timeout <milliseconds> <follow-up signal>\n"
" wait up to timeout and send follow-up signal\n"
msgstr ""
-#: misc-utils/kill.c:212
+#: misc-utils/kill.c:213
msgid " -p, --pid print pids without signaling them\n"
msgstr " -p, --pid 打印 pid 而不向它们发送信号\n"
-#: misc-utils/kill.c:213
+#: misc-utils/kill.c:214
msgid " -l, --list[=<signal>] list signal names, or convert a signal number to a name\n"
msgstr " -l, --list [=<信号>] 列出信号名,或将一个信号数值转换为名称\n"
-#: misc-utils/kill.c:214
+#: misc-utils/kill.c:215
msgid " -L, --table list signal names and numbers\n"
msgstr " -L, --table 列出信号名和数值\n"
-#: misc-utils/kill.c:215
-msgid " --verbose print pids that will be signaled\n"
-msgstr " --verbose 打印将收到信号的 pid\n"
-
-#: misc-utils/kill.c:235 term-utils/agetty.c:696
-#, fuzzy, c-format
-#| msgid "%s from %s\n"
-msgid "%s from %s"
-msgstr "%s,来自 %s\n"
+#: misc-utils/kill.c:216
+msgid " -r, --require-handler do not send signal if signal handler is not present\n"
+msgstr ""
+
+#: misc-utils/kill.c:217
+msgid " --verbose print pids that will be signaled\n"
+msgstr " --verbose 打印将收到信号的 pid\n"
-#: misc-utils/kill.c:239
+#: misc-utils/kill.c:241
msgid " (with: "
msgstr ""
-#: misc-utils/kill.c:288 misc-utils/kill.c:297 sys-utils/setpriv.c:448
-#: sys-utils/unshare.c:881
+#: misc-utils/kill.c:290 misc-utils/kill.c:299 sys-utils/setpriv.c:448
+#: sys-utils/unshare.c:873
#, c-format
msgid "unknown signal: %s"
msgstr "未知信号:%s"
-#: misc-utils/kill.c:308 misc-utils/kill.c:311 misc-utils/kill.c:320
-#: misc-utils/kill.c:332 misc-utils/kill.c:375 sys-utils/mountpoint.c:195
+#: misc-utils/kill.c:314 misc-utils/kill.c:317 misc-utils/kill.c:326
+#: misc-utils/kill.c:338 misc-utils/kill.c:381 sys-utils/mountpoint.c:195
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s 和 %s 相互排斥"
-#: misc-utils/kill.c:335 misc-utils/kill.c:350 sys-utils/eject.c:210
+#: misc-utils/kill.c:341 misc-utils/kill.c:356 sys-utils/eject.c:210
#: sys-utils/eject.c:232 sys-utils/losetup.c:730 sys-utils/tunelp.c:164
#: sys-utils/tunelp.c:171 sys-utils/tunelp.c:178 sys-utils/tunelp.c:185
#: sys-utils/tunelp.c:192 sys-utils/tunelp.c:198 sys-utils/tunelp.c:202
#: term-utils/setterm.c:571 term-utils/setterm.c:576 term-utils/setterm.c:600
#: term-utils/setterm.c:605 term-utils/setterm.c:610 term-utils/setterm.c:615
#: term-utils/setterm.c:620 term-utils/setterm.c:625 term-utils/setterm.c:634
-#: term-utils/setterm.c:669 text-utils/more.c:330
+#: term-utils/setterm.c:669 text-utils/more.c:329
msgid "argument error"
msgstr "参数出错"
-#: misc-utils/kill.c:372
+#: misc-utils/kill.c:378
#, c-format
msgid "invalid signal name or number: %s"
msgstr "无效的信号名或数字:%s"
-#: misc-utils/kill.c:398
+#: misc-utils/kill.c:404
#, c-format
msgid "pidfd_open() failed: %d"
msgstr "pidfd_open() 失败:%d"
-#: misc-utils/kill.c:403 misc-utils/kill.c:417
+#: misc-utils/kill.c:409 misc-utils/kill.c:423
msgid "pidfd_send_signal() failed"
msgstr "pidfd_send_signal() 失败"
-#: misc-utils/kill.c:414
+#: misc-utils/kill.c:420
#, fuzzy, c-format
#| msgid "sending signal %d to pid %d\n"
msgid "timeout, sending signal %d to pid %d\n"
msgstr "将信号 %d 发送给 pid %d\n"
-#: misc-utils/kill.c:429
+#: misc-utils/kill.c:435
#, c-format
msgid "sending signal %d to pid %d\n"
msgstr "将信号 %d 发送给 pid %d\n"
-#: misc-utils/kill.c:447
+#: misc-utils/kill.c:453
#, c-format
msgid "sending signal to %s failed"
msgstr "向 %s 发送信号失败"
-#: misc-utils/kill.c:504
+#: misc-utils/kill.c:478
+#, c-format
+msgid "not signalling pid %d, it has no userspace handler for signal %d\n"
+msgstr ""
+
+#: misc-utils/kill.c:540
#, c-format
msgid "cannot find process \"%s\""
msgstr "找不到进程“%s”"
msgid "--sd-id was not specified for --sd-param %s"
msgstr "没有为 --sd-param %s 指定 --sd-id"
-#: misc-utils/logger.c:784
+#: misc-utils/logger.c:808
msgid "localtime() failed"
msgstr "localtime() 失败"
-#: misc-utils/logger.c:794
+#: misc-utils/logger.c:818
#, c-format
msgid "hostname '%s' is too long"
msgstr "主机名“'%s”太长"
-#: misc-utils/logger.c:800
+#: misc-utils/logger.c:824
#, c-format
msgid "tag '%s' is too long"
msgstr "标签“%s”太长"
-#: misc-utils/logger.c:863
+#: misc-utils/logger.c:887
#, c-format
msgid "ignoring unknown option argument: %s"
msgstr "将忽略未知的选项参数:%s"
-#: misc-utils/logger.c:875
+#: misc-utils/logger.c:899
#, c-format
msgid "invalid argument: %s: using automatic errors"
msgstr "无效参数︰ %s︰ 将使用自动错误"
-#: misc-utils/logger.c:1041
+#: misc-utils/logger.c:1059
#, c-format
msgid " %s [options] [<message>]\n"
msgstr " %s [选项] [<消息>]\n"
-#: misc-utils/logger.c:1044
+#: misc-utils/logger.c:1062
msgid "Enter messages into the system log.\n"
msgstr "将消息输入系统日志。\n"
-#: misc-utils/logger.c:1047
+#: misc-utils/logger.c:1065
msgid " -i log the logger command's PID\n"
msgstr " -i 记录日志程序的 PID\n"
-#: misc-utils/logger.c:1048
+#: misc-utils/logger.c:1066
msgid " --id[=<id>] log the given <id>, or otherwise the PID\n"
msgstr " --id[=<id>] 记录指定的 <id>,否则记录 PID\n"
-#: misc-utils/logger.c:1049
+#: misc-utils/logger.c:1067
msgid " -f, --file <file> log the contents of this file\n"
msgstr " -f, --file <文件> 记录指定文件的内容\n"
-#: misc-utils/logger.c:1050
+#: misc-utils/logger.c:1068
msgid " -e, --skip-empty do not log empty lines when processing files\n"
msgstr " -e, --skip-empty 处理文件时不记录空行\n"
-#: misc-utils/logger.c:1051
+#: misc-utils/logger.c:1069
msgid " --no-act do everything except the write the log\n"
msgstr " --no-act 操作但不实际写入日志\n"
-#: misc-utils/logger.c:1052
+#: misc-utils/logger.c:1070
msgid " -p, --priority <prio> mark given message with this priority\n"
msgstr " -p, --priority <prio> 将指定消息标记为此优先级\n"
-#: misc-utils/logger.c:1053
+#: misc-utils/logger.c:1071
msgid " --octet-count use rfc6587 octet counting\n"
msgstr " --octet-count 使用 rfc6587 八位元组(octet) 计数\n"
-#: misc-utils/logger.c:1054
+#: misc-utils/logger.c:1072
msgid " --prio-prefix look for a prefix on every line read from stdin\n"
msgstr " --prio-prefix 从 stdin 输入的每一行查找前缀\n"
-#: misc-utils/logger.c:1055
+#: misc-utils/logger.c:1073
msgid " -s, --stderr output message to standard error as well\n"
msgstr " -s, --stderr 也向标准错误输出消息\n"
-#: misc-utils/logger.c:1056
+#: misc-utils/logger.c:1074
msgid " -S, --size <size> maximum size for a single message\n"
msgstr " -S, --size <大小> 单条消息的最大尺寸\n"
-#: misc-utils/logger.c:1057
+#: misc-utils/logger.c:1075
msgid " -t, --tag <tag> mark every line with this tag\n"
msgstr " -t, --tag <tag> 向每一行添加指定标记\n"
-#: misc-utils/logger.c:1058
+#: misc-utils/logger.c:1076
msgid " -n, --server <name> write to this remote syslog server\n"
msgstr " -n, --server <名称> 写入指定的远程 syslog 服务器\n"
-#: misc-utils/logger.c:1059
+#: misc-utils/logger.c:1077
msgid " -P, --port <port> use this port for UDP or TCP connection\n"
msgstr " -P, --port <端口> 使用指定端口进行 UDP 或 TCP 连接\n"
-#: misc-utils/logger.c:1060
+#: misc-utils/logger.c:1078
msgid " -T, --tcp use TCP only\n"
msgstr " -T, --tcp 只用 TCP\n"
-#: misc-utils/logger.c:1061
+#: misc-utils/logger.c:1079
msgid " -d, --udp use UDP only\n"
msgstr " -d, --udp 只用 UDP\n"
-#: misc-utils/logger.c:1062
+#: misc-utils/logger.c:1080
msgid " --rfc3164 use the obsolete BSD syslog protocol\n"
msgstr " --rfc3164 使用过时的 BSD syslog 协议\n"
-#: misc-utils/logger.c:1063
+#: misc-utils/logger.c:1081
msgid ""
" --rfc5424[=<snip>] use the syslog protocol (the default for remote);\n"
" <snip> can be notime, or notq, and/or nohost\n"
" --rfc5424[=<snip>] 使用 syslog 协议(远程时默认);\n"
" <snip> 可以是 notime, 或 notq, 和/或 nohost\n"
-#: misc-utils/logger.c:1065
+#: misc-utils/logger.c:1083
msgid " --sd-id <id> rfc5424 structured data ID\n"
msgstr " --sd-id <id> rfc5424 结构化数据 ID\n"
-#: misc-utils/logger.c:1066
+#: misc-utils/logger.c:1084
msgid " --sd-param <data> rfc5424 structured data name=value\n"
msgstr " --sd-param <数据> rfc5424 结构化数据名称=值\n"
-#: misc-utils/logger.c:1067
+#: misc-utils/logger.c:1085
msgid " --msgid <msgid> set rfc5424 message id field\n"
msgstr " --msgid <msgid> 设置 rfc5424 消息 id 字段\n"
-#: misc-utils/logger.c:1068
+#: misc-utils/logger.c:1086
msgid " -u, --socket <socket> write to this Unix socket\n"
msgstr " -u, --socket <套接字> 写入此 Unix 套接字\n"
-#: misc-utils/logger.c:1069
+#: misc-utils/logger.c:1087
msgid ""
" --socket-errors[=<on|off|auto>]\n"
" print connection errors when using Unix sockets\n"
" --socket-errors[=<on|off|auto>]\n"
" 使用 Unix 套接字时打印连接错误\n"
-#: misc-utils/logger.c:1072
+#: misc-utils/logger.c:1090
msgid " --journald[=<file>] write journald entry\n"
msgstr " --journald[=<文件>] 写 journald 记录\n"
-#: misc-utils/logger.c:1158
+#: misc-utils/logger.c:1176
#, c-format
msgid "file %s"
msgstr "文件 %s"
-#: misc-utils/logger.c:1173
+#: misc-utils/logger.c:1191
msgid "failed to parse id"
msgstr "解析 id 失败"
-#: misc-utils/logger.c:1191
+#: misc-utils/logger.c:1209
msgid "failed to parse message size"
msgstr "解析消息大小失败"
-#: misc-utils/logger.c:1221
+#: misc-utils/logger.c:1239
msgid "--msgid cannot contain space"
msgstr "--msgid 不能包含空格"
-#: misc-utils/logger.c:1243
+#: misc-utils/logger.c:1261
#, c-format
msgid "invalid structured data ID: '%s'"
msgstr "无效的结构化数据 ID: “%s”"
-#: misc-utils/logger.c:1248
+#: misc-utils/logger.c:1266
#, c-format
msgid "invalid structured data parameter: '%s'"
msgstr "无效的结构化数据参数: “%s”"
-#: misc-utils/logger.c:1263
+#: misc-utils/logger.c:1281
msgid "--file <file> and <message> are mutually exclusive, message is ignored"
msgstr "--file <文件> 和 <消息> 互斥,消息已忽略"
-#: misc-utils/logger.c:1270
+#: misc-utils/logger.c:1288
msgid "journald entry could not be written"
msgstr "无法写入 journald 项"
msgid " -t, --terminate <char> define the string-termination character\n"
msgstr " -t, --terminate <字符> 定义字符串终止字符\n"
-#: misc-utils/lsblk.c:165
+#: misc-utils/lsblk.c:170
msgid "alignment offset"
msgstr "对齐偏移量"
-#: misc-utils/lsblk.c:166
+#: misc-utils/lsblk.c:171
+msgid "udev ID (based on ID-LINK)"
+msgstr ""
+
+#: misc-utils/lsblk.c:172
+msgid "the shortest udev /dev/disk/by-id link name"
+msgstr ""
+
+#: misc-utils/lsblk.c:173
msgid "discard alignment offset"
msgstr "忽略对齐偏移量"
-#: misc-utils/lsblk.c:167
+#: misc-utils/lsblk.c:174
#, fuzzy
#| msgid "removable device"
msgid "dax-capable device"
msgstr "可移动设备"
-#: misc-utils/lsblk.c:168
+#: misc-utils/lsblk.c:175
msgid "discard granularity"
msgstr "忽略粒度"
-#: misc-utils/lsblk.c:169
+#: misc-utils/lsblk.c:176
+#, fuzzy
+#| msgid "disk serial number"
+msgid "disk sequence number"
+msgstr "磁盘序列号"
+
+#: misc-utils/lsblk.c:177
msgid "discard max bytes"
msgstr "忽略最大字节数"
-#: misc-utils/lsblk.c:170
+#: misc-utils/lsblk.c:178
msgid "discard zeroes data"
msgstr "忽略零数据"
-#: misc-utils/lsblk.c:172
+#: misc-utils/lsblk.c:180
#, fuzzy
#| msgid "filesystem root"
msgid "mounted filesystem roots"
msgstr "文件系统 root"
-#: misc-utils/lsblk.c:177
+#: misc-utils/lsblk.c:185
msgid "filesystem version"
msgstr "文件系统版本"
-#: misc-utils/lsblk.c:178
+#: misc-utils/lsblk.c:186
msgid "group name"
msgstr "组名"
-#: misc-utils/lsblk.c:179
+#: misc-utils/lsblk.c:187
msgid "Host:Channel:Target:Lun for SCSI"
msgstr "SCSI 的 Host:Channel:Target:Lun"
-#: misc-utils/lsblk.c:180
+#: misc-utils/lsblk.c:188
msgid "removable or hotplug device (usb, pcmcia, ...)"
msgstr "可移动或热插拔设备(usb, pcmcia, ...)"
-#: misc-utils/lsblk.c:181
+#: misc-utils/lsblk.c:189
msgid "internal kernel device name"
msgstr "内部内核设备名称"
-#: misc-utils/lsblk.c:182 misc-utils/wipefs.c:110
+#: misc-utils/lsblk.c:190 misc-utils/wipefs.c:110
msgid "filesystem LABEL"
msgstr "文件系统标签"
-#: misc-utils/lsblk.c:183
+#: misc-utils/lsblk.c:191
msgid "logical sector size"
msgstr "逻辑扇区大小"
-#: misc-utils/lsblk.c:185
+#: misc-utils/lsblk.c:193
msgid "minimum I/O size"
msgstr "最小 I/O 大小"
-#: misc-utils/lsblk.c:186
+#: misc-utils/lsblk.c:194
msgid "device identifier"
msgstr "设备标识符"
-#: misc-utils/lsblk.c:187
+#: misc-utils/lsblk.c:195
msgid "device node permissions"
msgstr "设备节点权限"
-#: misc-utils/lsblk.c:188
+#: misc-utils/lsblk.c:196
+#, fuzzy
+#| msgid "device name"
+msgid "device queues"
+msgstr "设备名"
+
+#: misc-utils/lsblk.c:197
msgid "device name"
msgstr "设备名"
-#: misc-utils/lsblk.c:189
+#: misc-utils/lsblk.c:198
msgid "optimal I/O size"
msgstr "最优 I/O 大小"
-#: misc-utils/lsblk.c:192
+#: misc-utils/lsblk.c:201
msgid "partition LABEL"
msgstr "分区 LABEL"
-#: misc-utils/lsblk.c:193
+#: misc-utils/lsblk.c:202
+#, fuzzy
+#| msgid "%s: partition %zu: failed to get partition type"
+msgid "partition number as read from the partition table"
+msgstr "%s: 分区 %zu:获取分区类型失败"
+
+#: misc-utils/lsblk.c:203
msgid "partition type name"
msgstr "分区类型名"
-#: misc-utils/lsblk.c:194
+#: misc-utils/lsblk.c:204
#, fuzzy
#| msgid "partition type UUID"
msgid "partition type code or UUID"
msgstr "分区类型 UUID"
-#: misc-utils/lsblk.c:196
+#: misc-utils/lsblk.c:206
msgid "path to the device node"
msgstr "到设备节点的路径"
-#: misc-utils/lsblk.c:197
+#: misc-utils/lsblk.c:207
msgid "physical sector size"
msgstr "物理扇区大小"
-#: misc-utils/lsblk.c:198
+#: misc-utils/lsblk.c:208
msgid "internal parent kernel device name"
msgstr "内部上级内核设备名称"
-#: misc-utils/lsblk.c:199
+#: misc-utils/lsblk.c:209
msgid "partition table type"
msgstr "分区表类型"
-#: misc-utils/lsblk.c:200
+#: misc-utils/lsblk.c:210
msgid "partition table identifier (usually UUID)"
msgstr "分区表标识符(通常为 UUID)"
-#: misc-utils/lsblk.c:201
+#: misc-utils/lsblk.c:211
msgid "adds randomness"
msgstr "添加随机性"
-#: misc-utils/lsblk.c:202
+#: misc-utils/lsblk.c:212
msgid "read-ahead of the device"
msgstr "该设备的预读(read-ahead)"
-#: misc-utils/lsblk.c:203
+#: misc-utils/lsblk.c:213
msgid "device revision"
msgstr "设备修订版本"
-#: misc-utils/lsblk.c:204
+#: misc-utils/lsblk.c:214
msgid "removable device"
msgstr "可移动设备"
-#: misc-utils/lsblk.c:205
+#: misc-utils/lsblk.c:215
msgid "rotational device"
msgstr "转动设备"
-#: misc-utils/lsblk.c:206 sys-utils/losetup.c:79
+#: misc-utils/lsblk.c:216 sys-utils/losetup.c:79
msgid "read-only device"
msgstr "只读设备"
-#: misc-utils/lsblk.c:207
+#: misc-utils/lsblk.c:217
msgid "request queue size"
msgstr "请求队列大小"
-#: misc-utils/lsblk.c:208
+#: misc-utils/lsblk.c:218
msgid "I/O scheduler name"
msgstr "I/O 调度器名称"
-#: misc-utils/lsblk.c:209
+#: misc-utils/lsblk.c:219
msgid "disk serial number"
msgstr "磁盘序列号"
-#: misc-utils/lsblk.c:210
+#: misc-utils/lsblk.c:220
msgid "size of the device"
msgstr "磁盘容量"
-#: misc-utils/lsblk.c:211
+#: misc-utils/lsblk.c:221
#, fuzzy
#| msgid "partition name"
msgid "partition start offset"
msgstr "分区名"
-#: misc-utils/lsblk.c:212
+#: misc-utils/lsblk.c:222
msgid "state of the device"
msgstr "设备的状态"
-#: misc-utils/lsblk.c:213
+#: misc-utils/lsblk.c:223
msgid "de-duplicated chain of subsystems"
msgstr "对成链的子系统去重"
-#: misc-utils/lsblk.c:214
+#: misc-utils/lsblk.c:224
#, fuzzy
#| msgid "where the device is mounted"
msgid "all locations where device is mounted"
msgstr "设备挂载位置"
-#: misc-utils/lsblk.c:215 sys-utils/zramctl.c:86
+#: misc-utils/lsblk.c:225 sys-utils/zramctl.c:86
msgid "where the device is mounted"
msgstr "设备挂载位置"
-#: misc-utils/lsblk.c:216
+#: misc-utils/lsblk.c:226
msgid "device transport type"
msgstr "设备传输类型"
-#: misc-utils/lsblk.c:217
+#: misc-utils/lsblk.c:227
msgid "device type"
msgstr "设备类型"
-#: misc-utils/lsblk.c:219
+#: misc-utils/lsblk.c:229
msgid "device vendor"
msgstr "设备制造商"
-#: misc-utils/lsblk.c:220
+#: misc-utils/lsblk.c:230
msgid "write same max bytes"
msgstr "写相同的最大字节数"
-#: misc-utils/lsblk.c:221
+#: misc-utils/lsblk.c:231
msgid "unique storage identifier"
msgstr "惟一存储标识符"
-#: misc-utils/lsblk.c:222
+#: misc-utils/lsblk.c:232
msgid "zone model"
msgstr ""
-#: misc-utils/lsblk.c:223
+#: misc-utils/lsblk.c:233
#, fuzzy
#| msgid "min seg size"
msgid "zone size"
msgstr "最小段大小"
-#: misc-utils/lsblk.c:224
+#: misc-utils/lsblk.c:234
#, fuzzy
#| msgid "discard granularity"
msgid "zone write granularity"
msgstr "忽略粒度"
-#: misc-utils/lsblk.c:225
+#: misc-utils/lsblk.c:235
#, fuzzy
#| msgid "write same max bytes"
msgid "zone append max bytes"
msgstr "写相同的最大字节数"
-#: misc-utils/lsblk.c:226
+#: misc-utils/lsblk.c:236
#, fuzzy
#| msgid "number of sectors"
msgid "number of zones"
msgstr "扇区数"
-#: misc-utils/lsblk.c:227
+#: misc-utils/lsblk.c:237
#, fuzzy
#| msgid "max number of open files"
msgid "maximum number of open zones"
msgstr "打开文件的最大数量"
-#: misc-utils/lsblk.c:228
+#: misc-utils/lsblk.c:238
#, fuzzy
#| msgid "max number of processes"
msgid "maximum number of active zones"
msgstr "最大进程数"
-#: misc-utils/lsblk.c:1348
+#: misc-utils/lsblk.c:1433
msgid "failed to allocate device"
msgstr "分配设备失败"
-#: misc-utils/lsblk.c:1408
+#: misc-utils/lsblk.c:1493
msgid "failed to open device directory in sysfs"
msgstr "打开 sysfs 中的设备目录失败"
-#: misc-utils/lsblk.c:1596
+#: misc-utils/lsblk.c:1681
#, c-format
msgid "%s: failed to get sysfs name"
msgstr "%s:获取 sysfs 名称失败"
-#: misc-utils/lsblk.c:1608
+#: misc-utils/lsblk.c:1693
#, c-format
msgid "%s: failed to get whole-disk device number"
msgstr "%s:获取 整盘 设备号失败"
-#: misc-utils/lsblk.c:1681 misc-utils/lsblk.c:1729
+#: misc-utils/lsblk.c:1766 misc-utils/lsblk.c:1814
msgid "failed to allocate /sys handler"
msgstr "分配 /sys 处理程序失败"
-#: misc-utils/lsblk.c:1789 misc-utils/lsblk.c:1791 misc-utils/lsblk.c:1820
-#: misc-utils/lsblk.c:1822
+#: misc-utils/lsblk.c:1874 misc-utils/lsblk.c:1876 misc-utils/lsblk.c:1905
+#: misc-utils/lsblk.c:1907
#, c-format
msgid "failed to parse list '%s'"
msgstr "解析列表“%s”失败"
#. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1796
+#: misc-utils/lsblk.c:1881
#, c-format
msgid "the list of excluded devices is too large (limit is %d devices)"
msgstr "排除设备列表过大(限制为 %d 台设备)"
#. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1827
+#: misc-utils/lsblk.c:1912
#, c-format
msgid "the list of included devices is too large (limit is %d devices)"
msgstr "包含设备列表过大(限制为 %d 台设备)"
-#: misc-utils/lsblk.c:1896 sys-utils/wdctl.c:225
+#: misc-utils/lsblk.c:1981 sys-utils/wdctl.c:225
#, c-format
msgid " %s [options] [<device> ...]\n"
msgstr " %s [选项] [<设备> ...]\n"
-#: misc-utils/lsblk.c:1899
+#: misc-utils/lsblk.c:1984
msgid "List information about block devices.\n"
msgstr "列出块设备的信息。\n"
-#: misc-utils/lsblk.c:1902
+#: misc-utils/lsblk.c:1987
#, fuzzy
#| msgid " -d, --nodeps don't print slaves or holders\n"
msgid " -A, --noempty don't print empty devices\n"
msgstr " -d, --nodeps 不打印从属设备(slave)或占位设备(holder)\n"
-#: misc-utils/lsblk.c:1903
+#: misc-utils/lsblk.c:1988
msgid " -D, --discard print discard capabilities\n"
msgstr " -D, --discard 打印时丢弃能力\n"
-#: misc-utils/lsblk.c:1904
+#: misc-utils/lsblk.c:1989
#, fuzzy
#| msgid " -x, --sort <column> sort output by <column>\n"
msgid " -E, --dedup <column> de-duplicate output by <column>\n"
msgstr " -x, --sort <列> 按<列>对输出排序\n"
-#: misc-utils/lsblk.c:1905
+#: misc-utils/lsblk.c:1990
msgid " -I, --include <list> show only devices with specified major numbers\n"
msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n"
-#: misc-utils/lsblk.c:1906 sys-utils/lsirq.c:63 sys-utils/lsmem.c:525
+#: misc-utils/lsblk.c:1991 sys-utils/lsirq.c:63 sys-utils/lsmem.c:525
msgid " -J, --json use JSON output format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: misc-utils/lsblk.c:1907
+#: misc-utils/lsblk.c:1992
#, fuzzy
#| msgid " -d, --dump <dev> dump partition table (usable for later input)\n"
msgid " -M, --merge group parents of sub-trees (usable for RAIDs, Multi-path)\n"
msgstr " -d, --dump <设备> 转储分区表(用于后续输入)\n"
-#: misc-utils/lsblk.c:1908
+#: misc-utils/lsblk.c:1993
msgid " -O, --output-all output all columns\n"
msgstr " -O, --output-all 输出所有列\n"
-#: misc-utils/lsblk.c:1910
+#: misc-utils/lsblk.c:1995
msgid " -S, --scsi output info about SCSI devices\n"
msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n"
-#: misc-utils/lsblk.c:1911
+#: misc-utils/lsblk.c:1996
+#, fuzzy
+#| msgid " -S, --scsi output info about SCSI devices\n"
+msgid " -N, --nvme output info about NVMe devices\n"
+msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n"
+
+#: misc-utils/lsblk.c:1997
+#, fuzzy
+#| msgid " -S, --scsi output info about SCSI devices\n"
+msgid " -v, --virtio output info about virtio devices\n"
+msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n"
+
+#: misc-utils/lsblk.c:1998
#, fuzzy
#| msgid " -l, --list use list format output\n"
msgid " -T, --tree[=<column>] use tree format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/lsblk.c:1912
+#: misc-utils/lsblk.c:1999
msgid " -a, --all print all devices\n"
msgstr " -a, --all 打印所有设备\n"
-#: misc-utils/lsblk.c:1914
+#: misc-utils/lsblk.c:2001
msgid " -d, --nodeps don't print slaves or holders\n"
msgstr " -d, --nodeps 不打印从属设备(slave)或占位设备(holder)\n"
-#: misc-utils/lsblk.c:1915
+#: misc-utils/lsblk.c:2002
msgid " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"
msgstr " -e, --exclude <列表> 根据主设备号排除设备(默认:内存盘)\n"
-#: misc-utils/lsblk.c:1916
+#: misc-utils/lsblk.c:2003
msgid " -f, --fs output info about filesystems\n"
msgstr " -f, --fs 输出文件系统信息\n"
-#: misc-utils/lsblk.c:1917
+#: misc-utils/lsblk.c:2004
msgid " -i, --ascii use ascii characters only\n"
msgstr " -i, --ascii 只使用 ascii 字符\n"
-#: misc-utils/lsblk.c:1918
+#: misc-utils/lsblk.c:2005
msgid " -l, --list use list format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/lsblk.c:1919
+#: misc-utils/lsblk.c:2006
msgid " -m, --perms output info about permissions\n"
msgstr " -m, --perms 输出权限信息\n"
-#: misc-utils/lsblk.c:1920 sys-utils/lsirq.c:65 sys-utils/lsmem.c:529
+#: misc-utils/lsblk.c:2007 sys-utils/lsirq.c:65 sys-utils/lsmem.c:529
msgid " -n, --noheadings don't print headings\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/lsblk.c:1921 sys-utils/lsmem.c:530
+#: misc-utils/lsblk.c:2008 sys-utils/lsmem.c:530
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: misc-utils/lsblk.c:1922
+#: misc-utils/lsblk.c:2009
msgid " -p, --paths print complete device path\n"
msgstr " -p, --paths 打印完整设备路径\n"
-#: misc-utils/lsblk.c:1924
+#: misc-utils/lsblk.c:2011
msgid " -s, --inverse inverse dependencies\n"
msgstr " -s, --inverse 反向依赖\n"
-#: misc-utils/lsblk.c:1925
+#: misc-utils/lsblk.c:2012
msgid " -t, --topology output info about topology\n"
msgstr " -t, --topology 输出拓扑信息\n"
-#: misc-utils/lsblk.c:1926
+#: misc-utils/lsblk.c:2013
#, fuzzy
#| msgid " -c, --columns <width> width of output in number of characters\n"
msgid " -w, --width <num> specifies output width as number of characters\n"
msgstr " -c, --columns <宽度> 输出宽度(字符数)\n"
-#: misc-utils/lsblk.c:1927
+#: misc-utils/lsblk.c:2014
msgid " -x, --sort <column> sort output by <column>\n"
msgstr " -x, --sort <列> 按<列>对输出排序\n"
-#: misc-utils/lsblk.c:1928
+#: misc-utils/lsblk.c:2015
msgid " -y, --shell use column names to be usable as shell variable identifiers\n"
msgstr ""
-#: misc-utils/lsblk.c:1929
+#: misc-utils/lsblk.c:2016
#, fuzzy
#| msgid " -c, --offline print offline CPUs only\n"
msgid " -z, --zoned print zone related information\n"
msgstr " -c, --offline 只打印离线 CPU\n"
-#: misc-utils/lsblk.c:1930
+#: misc-utils/lsblk.c:2017
msgid " --sysroot <dir> use specified directory as system root\n"
msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
-#: misc-utils/lsblk.c:1947
+#: misc-utils/lsblk.c:2034
#, c-format
msgid "failed to access sysfs directory: %s"
msgstr "无法访问 sysfs 目录:%s"
-#: misc-utils/lsblk.c:2169
+#: misc-utils/lsblk.c:2280
#, fuzzy
#| msgid "invalid partition number argument"
msgid "invalid output width number argument"
msgstr "无效的分区号参数"
-#: misc-utils/lsblk.c:2328
+#: misc-utils/lsblk.c:2439
msgid "failed to allocate device tree"
msgstr "分配设备树失败"
-#: misc-utils/lsfd.c:111
+#: misc-utils/lsfd.c:125
+msgid "class of anonymous inode"
+msgstr ""
+
+#: misc-utils/lsfd.c:128
#, fuzzy
#| msgid "cannot create child process"
msgid "association between file and process"
msgstr "无法创建子进程"
-#: misc-utils/lsfd.c:113
+#: misc-utils/lsfd.c:131
msgid "block device driver name resolved by /proc/devices"
msgstr ""
-#: misc-utils/lsfd.c:115
+#: misc-utils/lsfd.c:134
msgid "character device driver name resolved by /proc/devices"
msgstr ""
-#: misc-utils/lsfd.c:117
+#: misc-utils/lsfd.c:137
#, fuzzy
#| msgid "command of the process holding the lock"
msgid "command of the process opening the file"
msgstr "持有锁的进程命令"
-#: misc-utils/lsfd.c:119
+#: misc-utils/lsfd.c:140
msgid "reachability from the file system"
msgstr ""
-#: misc-utils/lsfd.c:121
+#: misc-utils/lsfd.c:143
#, fuzzy
#| msgid "device backing file"
msgid "ID of device containing file"
msgstr "设备后备文件"
-#: misc-utils/lsfd.c:123
+#: misc-utils/lsfd.c:146
msgid "device type (blk, char, or nodev)"
msgstr ""
-#: misc-utils/lsfd.c:125
+#: misc-utils/lsfd.c:149
+msgid "IPC endpoints information communicated with the fd"
+msgstr ""
+
+#: misc-utils/lsfd.c:152
msgid "flags specified when opening the file"
msgstr ""
-#: misc-utils/lsfd.c:127
+#: misc-utils/lsfd.c:155
#, fuzzy
#| msgid "bad file descriptor"
msgid "file descriptor for the file"
msgstr "错误的文件描述符"
-#: misc-utils/lsfd.c:129
+#: misc-utils/lsfd.c:158
#, fuzzy
#| msgid "max number of open files"
msgid "user ID number of the file's owner"
msgstr "打开文件的最大数量"
-#: misc-utils/lsfd.c:131 misc-utils/lslocks.c:79
+#: misc-utils/lsfd.c:161 misc-utils/lslocks.c:79
#, fuzzy
#| msgid "logical NUMA node number"
msgid "inode number"
msgstr "逻辑 NUMA 节点数量"
-#: misc-utils/lsfd.c:133
+#: misc-utils/lsfd.c:164
+msgid "local IP address"
+msgstr ""
+
+#: misc-utils/lsfd.c:167
+msgid "remote IP address"
+msgstr ""
+
+#: misc-utils/lsfd.c:170
+msgid "local IPv6 address"
+msgstr ""
+
+#: misc-utils/lsfd.c:173
+msgid "remote IPv6 address"
+msgstr ""
+
+#: misc-utils/lsfd.c:176
+#, fuzzy
+#| msgid "size of the file"
+msgid "name of the file (raw)"
+msgstr "文件大小"
+
+#: misc-utils/lsfd.c:179
msgid "opened by a kernel thread"
msgstr ""
-#: misc-utils/lsfd.c:135
+#: misc-utils/lsfd.c:182
msgid "device ID for special, or ID of device containing file"
msgstr ""
-#: misc-utils/lsfd.c:137
+#: misc-utils/lsfd.c:185
msgid "length of file mapping (in page)"
msgstr ""
-#: misc-utils/lsfd.c:139
+#: misc-utils/lsfd.c:188
msgid "misc character device name resolved by /proc/misc"
msgstr ""
-#: misc-utils/lsfd.c:141
+#: misc-utils/lsfd.c:191
#, fuzzy
#| msgid "mount"
msgid "mount id"
msgstr "挂载"
-#: misc-utils/lsfd.c:143
+#: misc-utils/lsfd.c:194
#, fuzzy
#| msgid "lock access mode"
msgid "access mode (rwx)"
msgstr "锁访问模式"
-#: misc-utils/lsfd.c:145
+#: misc-utils/lsfd.c:197
#, fuzzy
#| msgid "size of the file"
-msgid "name of the file"
+msgid "name of the file (cooked)"
msgstr "文件大小"
-#: misc-utils/lsfd.c:147
+#: misc-utils/lsfd.c:200
+msgid "netlink multicast groups"
+msgstr ""
+
+#: misc-utils/lsfd.c:203
+msgid "netlink local port id"
+msgstr ""
+
+#: misc-utils/lsfd.c:206
+msgid "netlink protocol"
+msgstr ""
+
+#: misc-utils/lsfd.c:209
#, fuzzy
#| msgid "ncount"
msgid "link count"
msgstr "ncount"
-#: misc-utils/lsfd.c:149
+#: misc-utils/lsfd.c:212
+msgid "name of the namespace (NS.TYPE:[INODE])"
+msgstr ""
+
+#: misc-utils/lsfd.c:215
+#, fuzzy
+#| msgid "path to the namespace"
+msgid "type of the namespace"
+msgstr "名字空间路径"
+
+#: misc-utils/lsfd.c:218
#, fuzzy
#| msgid "size of the file"
msgid "owner of the file"
msgstr "文件大小"
-#: misc-utils/lsfd.c:151
+#: misc-utils/lsfd.c:221
+msgid "net interface associated with the packet socket"
+msgstr ""
+
+#: misc-utils/lsfd.c:224
+msgid "L3 protocol associated with the packet socket"
+msgstr ""
+
+#: misc-utils/lsfd.c:227
+msgid "block device name resolved by /proc/partition"
+msgstr ""
+
+#: misc-utils/lsfd.c:230
#, fuzzy
#| msgid "PID of the process holding the lock"
msgid "PID of the process opening the file"
msgstr "持有锁的进程 PID"
-#: misc-utils/lsfd.c:153
-msgid "block device name resolved by /proc/partition"
+#: misc-utils/lsfd.c:233
+#, fuzzy
+#| msgid "command of the process holding the lock"
+msgid "command of the process targeted by the pidfd"
+msgstr "持有锁的进程命令"
+
+#: misc-utils/lsfd.c:236
+msgid "NSpid field in fdinfo of the pidfd"
msgstr ""
-#: misc-utils/lsfd.c:155
+#: misc-utils/lsfd.c:239
+#, fuzzy
+#| msgid "PID of the process holding the lock"
+msgid "PID of the process targeted by the pidfd"
+msgstr "持有锁的进程 PID"
+
+#: misc-utils/lsfd.c:242
+msgid "ICMP echo request ID"
+msgstr ""
+
+#: misc-utils/lsfd.c:245
#, fuzzy
#| msgid "%s: cannot get file position"
msgid "file position"
msgstr "%s:无法获取文件位置"
-#: misc-utils/lsfd.c:157
+#: misc-utils/lsfd.c:248
#, fuzzy
-#| msgid "partition name"
-msgid "protocol name"
-msgstr "分区名"
+#| msgid "Number of attached processes"
+msgid "protocol number of the raw socket"
+msgstr "附加的进程数"
-#: misc-utils/lsfd.c:159
+#: misc-utils/lsfd.c:251
#, fuzzy
#| msgid "no device specified"
msgid "device ID (if special file)"
msgstr "未指定设备"
-#: misc-utils/lsfd.c:161
+#: misc-utils/lsfd.c:254
#, fuzzy
#| msgid "max file size"
msgid "file size"
msgstr "最大文件尺寸"
-#: misc-utils/lsfd.c:163
+#: misc-utils/lsfd.c:257
+msgid "listening socket"
+msgstr ""
+
+#: misc-utils/lsfd.c:260
+msgid "inode identifying network namespace where the socket belongs to"
+msgstr ""
+
+#: misc-utils/lsfd.c:263
+#, fuzzy
+#| msgid "partition name"
+msgid "protocol name"
+msgstr "分区名"
+
+#: misc-utils/lsfd.c:266
+msgid "State of socket"
+msgstr ""
+
+#: misc-utils/lsfd.c:269
+#, fuzzy
+#| msgid "socket"
+msgid "Type of socket"
+msgstr "套接字"
+
+#: misc-utils/lsfd.c:272
#, fuzzy
#| msgid "failed to read new partition from device; ignoring --move-data"
msgid "file system, partition, or device containing file"
msgstr "从设备读取新分区失败;将忽略 --move-data"
-#: misc-utils/lsfd.c:165
+#: misc-utils/lsfd.c:275
+#, fuzzy
+#| msgid "filesystem type"
+msgid "file type (raw)"
+msgstr "文件系统类型"
+
+#: misc-utils/lsfd.c:278
+msgid "local TCP address (INET address:TCP port)"
+msgstr ""
+
+#: misc-utils/lsfd.c:281
+msgid "remote TCP address (INET address:TCP port)"
+msgstr ""
+
+#: misc-utils/lsfd.c:284
+#, fuzzy
+#| msgid "logical CPU number"
+msgid "local TCP port"
+msgstr "逻辑 CPU 数量"
+
+#: misc-utils/lsfd.c:287
+msgid "remote TCP port"
+msgstr ""
+
+#: misc-utils/lsfd.c:290
#, fuzzy
#| msgid "PID of the process holding the lock"
msgid "thread ID of the process opening the file"
msgstr "持有锁的进程 PID"
-#: misc-utils/lsfd.c:167
+#: misc-utils/lsfd.c:293
#, fuzzy
#| msgid "filesystem type"
-msgid "file type"
+msgid "file type (cooked)"
msgstr "文件系统类型"
-#: misc-utils/lsfd.c:169
+#: misc-utils/lsfd.c:296
+msgid "local UDP address (INET address:UDP port)"
+msgstr ""
+
+#: misc-utils/lsfd.c:299
+msgid "remote UDP address (INET address:UDP port)"
+msgstr ""
+
+#: misc-utils/lsfd.c:302
+msgid "local UDP port"
+msgstr ""
+
+#: misc-utils/lsfd.c:305
+msgid "remote UDP port"
+msgstr ""
+
+#: misc-utils/lsfd.c:308
+msgid "local UDPLite address (INET address:UDPLite port)"
+msgstr ""
+
+#: misc-utils/lsfd.c:311
+msgid "remote UDPLite address (INET address:UDPLite port)"
+msgstr ""
+
+#: misc-utils/lsfd.c:314
+msgid "local UDPLite port"
+msgstr ""
+
+#: misc-utils/lsfd.c:317
+msgid "remote UDPLite port"
+msgstr ""
+
+#: misc-utils/lsfd.c:320
#, fuzzy
#| msgid "Number of attached processes"
msgid "user ID number of the process"
msgstr "附加的进程数"
-#: misc-utils/lsfd.c:171
+#: misc-utils/lsfd.c:323
+msgid "filesystem pathname for UNIX domain socket"
+msgstr ""
+
+#: misc-utils/lsfd.c:326
#, fuzzy
#| msgid "Number of attached processes"
msgid "user of the process"
msgstr "附加的进程数"
-#: misc-utils/lsfd.c:215 sys-utils/prlimit.c:87
+#: misc-utils/lsfd.c:370 sys-utils/prlimit.c:87
msgid "processes"
msgstr "进程"
-#: misc-utils/lsfd.c:219
+#: misc-utils/lsfd.c:374
#, fuzzy
#| msgid "Attached processes"
msgid "root owned processes"
msgstr "附加的进程"
-#: misc-utils/lsfd.c:223
+#: misc-utils/lsfd.c:378
#, fuzzy
#| msgid "kernel messages"
msgid "kernel threads"
msgstr "内核消息"
-#: misc-utils/lsfd.c:227
+#: misc-utils/lsfd.c:382
#, fuzzy
#| msgid "open failed"
msgid "open files"
msgstr "打开失败"
-#: misc-utils/lsfd.c:231
+#: misc-utils/lsfd.c:386
#, fuzzy
#| msgid "open failed"
msgid "RO open files"
msgstr "打开失败"
-#: misc-utils/lsfd.c:235
+#: misc-utils/lsfd.c:390
#, fuzzy
#| msgid "open failed"
msgid "WO open files"
msgstr "打开失败"
-#: misc-utils/lsfd.c:239
+#: misc-utils/lsfd.c:394
msgid "shared mappings"
msgstr ""
-#: misc-utils/lsfd.c:243
+#: misc-utils/lsfd.c:398
msgid "RO shared mappings"
msgstr ""
-#: misc-utils/lsfd.c:247
+#: misc-utils/lsfd.c:402
msgid "WO shared mappings"
msgstr ""
-#: misc-utils/lsfd.c:251
+#: misc-utils/lsfd.c:406
msgid "regular files"
msgstr ""
-#: misc-utils/lsfd.c:255
+#: misc-utils/lsfd.c:410
#, fuzzy
#| msgid "Sectors"
msgid "directories"
msgstr "扇区"
-#: misc-utils/lsfd.c:259
+#: misc-utils/lsfd.c:414
#, fuzzy
#| msgid "socket"
msgid "sockets"
msgstr "套接字"
-#: misc-utils/lsfd.c:263
+#: misc-utils/lsfd.c:418
msgid "fifos/pipes"
msgstr ""
-#: misc-utils/lsfd.c:267
+#: misc-utils/lsfd.c:422
#, fuzzy
#| msgid "/dev/%s: not a character device"
msgid "character devices"
msgstr "/dev/%s:不是字符设备"
-#: misc-utils/lsfd.c:271
+#: misc-utils/lsfd.c:426
#, fuzzy
#| msgid "block device name"
msgid "block devices"
msgstr "块设备名称"
-#: misc-utils/lsfd.c:275
+#: misc-utils/lsfd.c:430
#, fuzzy
#| msgid "unknown user %s"
msgid "unknown types"
msgstr "未知用户 %s"
-#: misc-utils/lsfd.c:350
+#: misc-utils/lsfd.c:526
msgid "too many columns are added via filter expression"
msgstr ""
-#: misc-utils/lsfd.c:1039
+#: misc-utils/lsfd.c:1323
#, fuzzy
#| msgid "failed to allocate UID cache"
msgid "failed to allocate an idcache"
msgstr "分配 UID 缓存失败"
-#: misc-utils/lsfd.c:1094 misc-utils/lslocks.c:292
+#: misc-utils/lsfd.c:1378 misc-utils/lslocks.c:292
msgid "(unknown)"
msgstr "(未知)"
-#: misc-utils/lsfd.c:1178
+#: misc-utils/lsfd.c:1434 misc-utils/lsfd-filter.c:374
+#: misc-utils/lsfd-sock-xinfo.c:152 misc-utils/lsfd-sock-xinfo.c:279
+#, fuzzy
+#| msgid "failed to allocate memory: %m"
+msgid "failed to allocate memory"
+msgstr "分配内存失败:%m"
+
+#: misc-utils/lsfd.c:1465
#, fuzzy, c-format
#| msgid "unexpected value in %s: %ju"
msgid "unexpected value for pid specification: %s"
msgstr "%s 有异常值:%ju"
-#: misc-utils/lsfd.c:1180
+#: misc-utils/lsfd.c:1467
#, c-format
msgid "garbage at the end of pid specification: %s"
msgstr ""
-#: misc-utils/lsfd.c:1182
+#: misc-utils/lsfd.c:1469
#, c-format
msgid "out of range value for pid specification: %ld"
msgstr ""
-#: misc-utils/lsfd.c:1226
+#: misc-utils/lsfd.c:1513
#, fuzzy
#| msgid "failed to initialize procfs handler"
msgid "failed to alloc procfs handler"
msgstr "%s:初始化 procfs 处理函数失败"
-#: misc-utils/lsfd.c:1230
+#: misc-utils/lsfd.c:1517
#, fuzzy
#| msgid "failed to open: %s"
msgid "failed to open /proc"
msgstr "打开失败:%s"
-#: misc-utils/lsfd.c:1254
+#: misc-utils/lsfd.c:1541
+#, fuzzy
+#| msgid " -n, --noheadings don't print headings\n"
+msgid " -l, --threads list in threads level\n"
+msgstr " -n, --noheadings 不打印标题\n"
+
+#: misc-utils/lsfd.c:1542
+#, fuzzy
+#| msgid " -J, --json use JSON output format\n"
+msgid " -J, --json use JSON output format\n"
+msgstr " -J, --json 使用 JSON 输出格式\n"
+
+#: misc-utils/lsfd.c:1543
+#, fuzzy
+#| msgid " --noheadings don't print headings\n"
+msgid " -n, --noheadings don't print headings\n"
+msgstr " --noheadings 不打印标题\n"
+
+#: misc-utils/lsfd.c:1544
+#, fuzzy
+#| msgid " -o, --output <list> output columns\n"
+msgid " -o, --output <list> output columns\n"
+msgstr " -o, --output <列表> 输出列\n"
+
+#: misc-utils/lsfd.c:1545
#, fuzzy
-#| msgid " -n, --noheadings don't print headings\n"
-msgid " -l, --threads list in threads level\n"
-msgstr " -n, --noheadings 不打印标题\n"
+#| msgid " -r, --raw use raw output format\n"
+msgid " -r, --raw use raw output format\n"
+msgstr " -r, --raw 使用原生输出格式\n"
-#: misc-utils/lsfd.c:1259
+#: misc-utils/lsfd.c:1546
#, fuzzy
#| msgid " -u, --notruncate don't truncate text in columns\n"
-msgid " -u, --notruncate don't truncate text in columns\n"
+msgid " -u, --notruncate don't truncate text in columns\n"
msgstr " -u, --notruncate 不截断列中的文本\n"
-#: misc-utils/lsfd.c:1260
+#: misc-utils/lsfd.c:1547
#, fuzzy
#| msgid " -p, --pid <pid>... act on these already running processes\n"
-msgid " -p, --pid <pid(s)> collect information only specified processes\n"
+msgid " -p, --pid <pid(s)> collect information only specified processes\n"
msgstr " -p, --pid <pid>... 对这些已运行的进程操作\n"
-#: misc-utils/lsfd.c:1261
-msgid " -Q, --filter <expr> apply display filter\n"
+#: misc-utils/lsfd.c:1548
+msgid " -i[4|6], --inet[=4|6] list only IPv4 and/or IPv6 sockets\n"
+msgstr ""
+
+#: misc-utils/lsfd.c:1549
+msgid " -Q, --filter <expr> apply display filter\n"
msgstr ""
-#: misc-utils/lsfd.c:1262
-msgid " --debug-filter dump the innternal data structure of filter and exit\n"
+#: misc-utils/lsfd.c:1550
+msgid " --debug-filter dump the internal data structure of filter and exit\n"
msgstr ""
-#: misc-utils/lsfd.c:1263
+#: misc-utils/lsfd.c:1551
#, fuzzy
#| msgid " --default use default terminal settings\n"
msgid ""
-" -C, --counter <name>:<expr>\n"
-" define custom counter for --summary output\n"
+" -C, --counter <name>:<expr>\n"
+" define custom counter for --summary output\n"
msgstr " --default 使用默认终端设置\n"
-#: misc-utils/lsfd.c:1265
-msgid " --dump-counters dump counter definitions\n"
+#: misc-utils/lsfd.c:1553
+msgid " --dump-counters dump counter definitions\n"
msgstr ""
-#: misc-utils/lsfd.c:1266
-msgid " --summary[=when] print summary information (only, append, or never)\n"
+#: misc-utils/lsfd.c:1554
+msgid " --summary[=<when>] print summary information (only, append, or never)\n"
msgstr ""
-#: misc-utils/lsfd.c:1288
-#, fuzzy
-#| msgid "failed to allocate memory: %m"
-msgid "failed to allocate memory for string"
-msgstr "分配内存失败:%m"
-
-#: misc-utils/lsfd.c:1345
+#: misc-utils/lsfd.c:1621
#, c-format
msgid "too short counter specification: -C/--counter %s"
msgstr ""
-#: misc-utils/lsfd.c:1349 misc-utils/lsfd.c:1355
+#: misc-utils/lsfd.c:1625 misc-utils/lsfd.c:1631
#, c-format
msgid "no name for counter: -C/--counter %s"
msgstr ""
-#: misc-utils/lsfd.c:1359
+#: misc-utils/lsfd.c:1635
#, c-format
-msgid "empty ecounter expression given: -C/--counter %s"
+msgid "empty counter expression given: -C/--counter %s"
msgstr ""
-#: misc-utils/lsfd.c:1367
+#: misc-utils/lsfd.c:1643
#, c-format
msgid "don't use `{' in the name of a counter: %s"
msgstr ""
-#: misc-utils/lsfd.c:1388
+#: misc-utils/lsfd.c:1664
msgid "failed in making filter for a counter: "
msgstr ""
-#: misc-utils/lsfd.c:1456
+#: misc-utils/lsfd.c:1732
#, fuzzy
#| msgid "failed to allocate output table"
msgid "failed to allocate summary table"
msgstr "分配输出表失败"
-#: misc-utils/lsfd.c:1466
+#: misc-utils/lsfd.c:1742
msgid "VALUE"
msgstr ""
-#: misc-utils/lsfd.c:1468 misc-utils/lsfd.c:1474
+#: misc-utils/lsfd.c:1744 misc-utils/lsfd.c:1750
#, fuzzy
#| msgid "failed to allocate output column"
msgid "failed to allocate summary column"
msgstr "分配输出列失败"
-#: misc-utils/lsfd.c:1472
+#: misc-utils/lsfd.c:1748
msgid "COUNTER"
msgstr ""
-#: misc-utils/lsfd.c:1487 misc-utils/lsfd.c:1489 misc-utils/lsfd.c:1492
+#: misc-utils/lsfd.c:1763 misc-utils/lsfd.c:1765 misc-utils/lsfd.c:1768
#, fuzzy
#| msgid "failed to add output data"
msgid "failed to add summary data"
msgstr "添加输出信息失败"
-#: misc-utils/lsfd.c:1597 sys-utils/lsmem.c:641
+#: misc-utils/lsfd.c:1905
+#, fuzzy, c-format
+#| msgid "unknown argument: %s"
+msgid "unknown -i/--inet argument: %s"
+msgstr "未知参数:%s"
+
+#: misc-utils/lsfd.c:1931 sys-utils/lsmem.c:641
msgid "unsupported --summary argument"
msgstr "不支持的 --summary 参数"
-#: misc-utils/lsfd-file.c:384 misc-utils/namei.c:414 sys-utils/lsns.c:1403
+#: misc-utils/lsfd-file.c:311 misc-utils/namei.c:455 sys-utils/lsns.c:1486
msgid "failed to allocate UID cache"
msgstr "分配 UID 缓存失败"
-#: misc-utils/lsfd-filter.c:375
-#, fuzzy
-#| msgid "failed to allocate memory: %m"
-msgid "failed to allocate memory"
-msgstr "分配内存失败:%m"
-
-#: misc-utils/lsfd-filter.c:418
+#: misc-utils/lsfd-filter.c:417
#, c-format
msgid "error: string literal is not terminated: %s"
msgstr ""
msgid "error: empty right side expression: %s"
msgstr ""
-#: misc-utils/lsfd-filter.c:970
+#: misc-utils/lsfd-filter.c:874
+#, fuzzy
+#| msgid "could not compile regular expression %s: %s"
+msgid "error: empty filter expression"
+msgstr "无法编译正则表达式 %s:%s"
+
+#: misc-utils/lsfd-filter.c:975
#, fuzzy, c-format
#| msgid "unexpected end of file on %s"
msgid "unexpected type in filter application: %s"
msgstr "%s 上的文件结尾异常"
-#: misc-utils/lsfd-filter.c:1071
+#: misc-utils/lsfd-filter.c:1076
#, fuzzy, c-format
#| msgid "input error: unexpected character %c after %s field"
msgid "error: unexpected operand type %s for: %s"
msgstr "输入错误:%2$s 字段后出现异常字符 %1$c"
-#: misc-utils/lsfd-filter.c:1194 misc-utils/lsfd-filter.c:1227
-#: misc-utils/lsfd-filter.c:1249
+#: misc-utils/lsfd-filter.c:1199 misc-utils/lsfd-filter.c:1232
+#: misc-utils/lsfd-filter.c:1254
#, fuzzy, c-format
#| msgid "input error: unexpected character %c after %s field"
msgid "error: unexpected left operand type %s for: %s"
msgstr "输入错误:%2$s 字段后出现异常字符 %1$c"
-#: misc-utils/lsfd-filter.c:1202 misc-utils/lsfd-filter.c:1235
-#: misc-utils/lsfd-filter.c:1257
+#: misc-utils/lsfd-filter.c:1207 misc-utils/lsfd-filter.c:1240
+#: misc-utils/lsfd-filter.c:1262
#, fuzzy, c-format
#| msgid "input error: unexpected character %c after %s field"
msgid "error: unexpected right operand type %s for: %s"
msgstr "输入错误:%2$s 字段后出现异常字符 %1$c"
-#: misc-utils/lsfd-filter.c:1264
+#: misc-utils/lsfd-filter.c:1269
#, c-format
msgid "error: string literal is expected as right operand for: %s"
msgstr ""
-#: misc-utils/lsfd-filter.c:1280
+#: misc-utils/lsfd-filter.c:1285
#, fuzzy, c-format
#| msgid "could not compile regular expression %s: %s"
msgid "error: could not compile regular expression %s: %s"
msgstr "无法编译正则表达式 %s:%s"
-#: misc-utils/lsfd-filter.c:1316
+#: misc-utils/lsfd-filter.c:1321
msgid "error: unbalanced parenthesis: ("
msgstr ""
-#: misc-utils/lsfd-filter.c:1322
+#: misc-utils/lsfd-filter.c:1327
#, c-format
msgid "error: garbage at the end of expression: %s"
msgstr ""
-#: misc-utils/lsfd-filter.c:1328
+#: misc-utils/lsfd-filter.c:1333
#, c-format
msgid "error: bool expression is expected: %s"
msgstr ""
+#: misc-utils/lsfd.h:232
+#, fuzzy
+#| msgid "failed to allocate memory: %m"
+msgid "failed to allocate memory for string"
+msgstr "分配内存失败:%m"
+
+#: misc-utils/lsfd-sock-xinfo.c:228
+#, fuzzy
+#| msgid "failed to allocate output column"
+msgid "failed to alloc path context for /var/run/netns"
+msgstr "分配输出列失败"
+
#: misc-utils/lslocks.c:75
msgid "command of the process holding the lock"
msgstr "持有锁的进程命令"
msgid "failed to parse ID"
msgstr "解析 ID 失败"
-#: misc-utils/lslocks.c:288 misc-utils/uuidd.c:758 sys-utils/nsenter.c:291
+#: misc-utils/lslocks.c:288 misc-utils/uuidd.c:800 misc-utils/waitpid.c:57
+#: sys-utils/nsenter.c:299
msgid "failed to parse pid"
msgstr "解析 pid 失败"
msgid " -i, --noinaccessible ignore locks without read permissions\n"
msgstr " -i, --noinaccessible 忽略没有读权限的锁\n"
-#: misc-utils/lslocks.c:554 sys-utils/lsns.c:1216 sys-utils/rfkill.c:640
+#: misc-utils/lslocks.c:554 sys-utils/lsns.c:1293 sys-utils/rfkill.c:640
msgid " -n, --noheadings don't print headings\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/lslocks.c:555 sys-utils/lsns.c:1217 sys-utils/rfkill.c:641
+#: misc-utils/lslocks.c:555 sys-utils/lsns.c:1294 sys-utils/rfkill.c:641
msgid " -o, --output <list> define which output columns to use\n"
msgstr " -o, --output <list> 定义使用哪个输出列\n"
-#: misc-utils/lslocks.c:556 sys-utils/lsns.c:1218 sys-utils/rfkill.c:642
+#: misc-utils/lslocks.c:556 sys-utils/lsns.c:1295 sys-utils/rfkill.c:642
msgid " --output-all output all columns\n"
msgstr " --output-all 输出所有列\n"
msgid " -p, --pid <pid> display only locks held by this process\n"
msgstr " -p, --pid <pid> 只显示由指定进程持有的锁\n"
-#: misc-utils/lslocks.c:558 sys-utils/lsns.c:1220 sys-utils/rfkill.c:643
+#: misc-utils/lslocks.c:558 sys-utils/lsns.c:1298 sys-utils/rfkill.c:643
msgid " -r, --raw use the raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
#: misc-utils/lslocks.c:623 schedutils/chrt.c:413 schedutils/ionice.c:179
-#: schedutils/taskset.c:171 schedutils/uclampset.c:257 sys-utils/choom.c:102
-#: sys-utils/lsns.c:1305 sys-utils/prlimit.c:604
+#: schedutils/taskset.c:190 schedutils/uclampset.c:257 sys-utils/choom.c:102
+#: sys-utils/lsns.c:1388 sys-utils/prlimit.c:604
msgid "invalid PID argument"
msgstr "无效的 PID 参数"
msgid " -v, --verbose explain what is being done\n"
msgstr " -v, --verbose 解释正在进行的操作\n"
-#: misc-utils/mcookie.c:97 misc-utils/wipefs.c:652 sys-utils/blkdiscard.c:107
-#: sys-utils/fallocate.c:107 sys-utils/fstrim.c:463
+#: misc-utils/mcookie.c:97 misc-utils/wipefs.c:656 sys-utils/blkdiscard.c:111
+#: sys-utils/fallocate.c:107 sys-utils/fstrim.c:475
msgid "<num>"
msgstr ""
msgid "closing %s failed"
msgstr "关闭 %s 失败"
-#: misc-utils/mcookie.c:168 sys-utils/blkdiscard.c:189 sys-utils/fstrim.c:529
-#: text-utils/hexdump.c:124
+#: misc-utils/mcookie.c:168 sys-utils/blkdiscard.c:204 sys-utils/fstrim.c:542
+#: text-utils/hexdump.c:117
msgid "failed to parse length"
msgstr "解析长度失败"
msgid_plural "Got %d bytes from %s\n"
msgstr[0] "从 %2$s 获取到 %1$d 字节\n"
-#: misc-utils/namei.c:90
+#: misc-utils/namei.c:101
#, c-format
msgid "failed to read symlink: %s"
msgstr "读符号链接失败:%s"
-#: misc-utils/namei.c:334
+#: misc-utils/namei.c:359
#, c-format
msgid " %s [options] <pathname>...\n"
msgstr " %s [选项] <路径名> ...\n"
-#: misc-utils/namei.c:337
+#: misc-utils/namei.c:362
msgid "Follow a pathname until a terminal point is found.\n"
msgstr "沿路径寻找,直到某个终止点为止。\n"
-#: misc-utils/namei.c:341
+#: misc-utils/namei.c:366
#, fuzzy
#| msgid ""
#| " -h, --help displays this help text\n"
" -n, --nosymlinks 不显示符号链接\n"
" -v, --vertical 竖直对齐 模式 和 拥有者\n"
-#: misc-utils/namei.c:408
+#: misc-utils/namei.c:373
+#, fuzzy
+#| msgid " -R, --submounts print all submounts for the matching filesystems\n"
+msgid " -Z, --context print any security context of each file \n"
+msgstr " -R, --submounts 打印匹配文件系统的所有子挂载(submount)\n"
+
+#: misc-utils/namei.c:449
msgid "pathname argument is missing"
msgstr "缺少 路径名 参数"
-#: misc-utils/namei.c:417
+#: misc-utils/namei.c:458
msgid "failed to allocate GID cache"
msgstr "分配 GID 缓存失败"
-#: misc-utils/namei.c:439
+#: misc-utils/namei.c:480
#, c-format
msgid "%s: exceeded limit of symlinks"
msgstr "%s:超过了符号链接限制"
-#: misc-utils/rename.c:91
+#: misc-utils/pipesz.c:65
+#, fuzzy, c-format
+#| msgid " %s [options] -u <user> <command>\n"
+msgid " %s [options] [--set <size>] [--] [command]\n"
+msgstr " %s [选项] -u <用户> <命令>\n"
+
+#: misc-utils/pipesz.c:66
+#, fuzzy, c-format
+#| msgid " %s [options]\n"
+msgid " %s [options] --get\n"
+msgstr " %s [选项]\n"
+
+#. TRANSLATORS: 'command' refers to a program argument
+#: misc-utils/pipesz.c:70
+msgid "Set or examine pipe buffer sizes and optionally execute command."
+msgstr ""
+
+#: misc-utils/pipesz.c:73
+#, fuzzy
+#| msgid " -t, --ignore ignore failures\n"
+msgid " -g, --get examine pipe buffers"
+msgstr " -t, --ignore 忽略失败\n"
+
+#: misc-utils/pipesz.c:76
+#, fuzzy, c-format
+#| msgid ""
+#| " -A, --adjfile <file> specifies the path to the adjust file\n"
+#| " the default is %s\n"
+msgid ""
+" -s, --set <size> set pipe buffer sizes\n"
+" size defaults to %s\n"
+msgstr ""
+" -A, --adjfile <文件> 指定 adjust 文件的路径\n"
+" 默认为 %s\n"
+
+#: misc-utils/pipesz.c:81
+#, fuzzy
+#| msgid " -p, --pid <path> path to pid file\n"
+msgid " -f, --file <path> act on a file"
+msgstr " -p, --pid <路径> pid 文件路径\n"
+
+#: misc-utils/pipesz.c:82
+#, fuzzy
+#| msgid " -f, --file <file> log the contents of this file\n"
+msgid " -n, --fd <num> act on a file descriptor"
+msgstr " -f, --file <文件> 记录指定文件的内容\n"
+
+#: misc-utils/pipesz.c:83
+#, fuzzy
+#| msgid " -s, --symlink act on the target of symlinks\n"
+msgid " -i, --stdin act on standard input"
+msgstr " -s, --symlink 在符号链接的目标上执行操作\n"
+
+#: misc-utils/pipesz.c:84
+#, fuzzy
+#| msgid " -o, --output <file> write to file instead of standard output\n"
+msgid " -o, --stdout act on standard output"
+msgstr " -o, --output <文件> 写入文件而非标准输出\n"
+
+#: misc-utils/pipesz.c:85
+#, fuzzy
+#| msgid " -s, --stderr output message to standard error as well\n"
+msgid " -e, --stderr act on standard error"
+msgstr " -s, --stderr 也向标准错误输出消息\n"
+
+#: misc-utils/pipesz.c:88
+#, fuzzy
+#| msgid " -c, --creator show creator and owner\n"
+msgid " -c, --check do not continue after an error"
+msgstr " -c, --creator 显示创建者和拥有者\n"
+
+#: misc-utils/pipesz.c:89
+#, fuzzy
+#| msgid " -q, --quiet suppress 'not mounted' error messages\n"
+msgid " -q, --quiet do not warn of non-fatal errors"
+msgstr " -q, --quiet 不要输出“未挂载”错误信息\n"
+
+#: misc-utils/pipesz.c:90
+#, fuzzy
+#| msgid " -v, --verbose verbose output\n"
+msgid " -v, --verbose provide detailed output"
+msgstr " -v, --verbose 详尽输出\n"
+
+#. TRANSLATORS: '%s' refers to a file
+#: misc-utils/pipesz.c:111
+#, fuzzy, c-format
+#| msgid "cannot get size of %s"
+msgid "cannot get pipe buffer size of %s"
+msgstr "无法获得 %s 的大小"
+
+#. TRANSLATORS: '%s' refers to a file
+#: misc-utils/pipesz.c:131
+#, fuzzy, c-format
+#| msgid "cannot get size of %s"
+msgid "cannot set pipe buffer size of %s"
+msgstr "无法获得 %s 的大小"
+
+#. TRANSLATORS: '%s' refers to a file, '%d' to a buffer size in bytes
+#: misc-utils/pipesz.c:134
+#, c-format
+msgid "%s pipe buffer size set to %d"
+msgstr ""
+
+#. TRANSLATORS: '%s' refers to a system file
+#: misc-utils/pipesz.c:185 misc-utils/pipesz.c:191
+#, fuzzy, c-format
+#| msgid "cannot update %s"
+msgid "cannot parse %s"
+msgstr "无法更新 %s"
+
+#: misc-utils/pipesz.c:288
+msgid "cannot specify a command with --get"
+msgstr ""
+
+#. TRANSLATORS: a column that contains the names of files that are unix pipes
+#: misc-utils/pipesz.c:294
+msgid "pipe"
+msgstr ""
+
+#. TRANSLATORS: a column that contains buffer sizes in bytes
+#: misc-utils/pipesz.c:296 sys-utils/ipcs.c:303 sys-utils/ipcs.c:528
+msgid "size"
+msgstr "大小"
+
+#. TRANSLATORS: a column that contains an amount of data which has not been used by a program
+#: misc-utils/pipesz.c:298
+#, fuzzy
+#| msgid ", ready"
+msgid "unread"
+msgstr ",就绪"
+
+#: misc-utils/pipesz.c:311
+#, fuzzy
+#| msgid "mount: type specified twice"
+msgid "using last specified size"
+msgstr "mount:类型指定了两次"
+
+#: misc-utils/rename.c:117
#, c-format
msgid "%s: overwrite `%s'? "
msgstr ""
-#: misc-utils/rename.c:133 misc-utils/rename.c:198
+#: misc-utils/rename.c:159 misc-utils/rename.c:224
#, c-format
msgid "%s: not accessible"
msgstr "%s:不可访问"
-#: misc-utils/rename.c:142
+#: misc-utils/rename.c:168
#, c-format
msgid "%s: not a symbolic link"
msgstr "%s:不是符号链接"
-#: misc-utils/rename.c:149
+#: misc-utils/rename.c:175
#, c-format
msgid "%s: readlink failed"
msgstr "%s:readlink 失败"
-#: misc-utils/rename.c:165
+#: misc-utils/rename.c:191
#, c-format
msgid "Skipping existing link: `%s' -> `%s'\n"
msgstr "跳过已存在的链接:“%s”->“%s”\n"
-#: misc-utils/rename.c:171
+#: misc-utils/rename.c:197
#, c-format
msgid "%s: unlink failed"
msgstr "%s:unlink 失败"
-#: misc-utils/rename.c:175
+#: misc-utils/rename.c:201
#, c-format
msgid "%s: symlinking to %s failed"
msgstr "%s:符号链接到 %s 失败"
-#: misc-utils/rename.c:218
+#: misc-utils/rename.c:240
#, c-format
msgid "Skipping existing file: `%s'\n"
msgstr "跳过已存在的文件:“%s”\n"
-#: misc-utils/rename.c:222
+#: misc-utils/rename.c:244
#, c-format
msgid "%s: rename to %s failed"
msgstr "%s:重命名为 %s 失败"
-#: misc-utils/rename.c:236
+#: misc-utils/rename.c:258
#, c-format
msgid " %s [options] <expression> <replacement> <file>...\n"
msgstr " %s [选项] <表达式> <替换> <文件>...\n"
-#: misc-utils/rename.c:240
+#: misc-utils/rename.c:262
msgid "Rename files.\n"
msgstr "重命名文件。\n"
-#: misc-utils/rename.c:243
+#: misc-utils/rename.c:265
msgid " -v, --verbose explain what is being done\n"
msgstr " -v, --verbose 解释正在进行的操作\n"
-#: misc-utils/rename.c:244
+#: misc-utils/rename.c:266
msgid " -s, --symlink act on the target of symlinks\n"
msgstr " -s, --symlink 在符号链接的目标上执行操作\n"
-#: misc-utils/rename.c:245
+#: misc-utils/rename.c:267
msgid " -n, --no-act do not make any changes\n"
msgstr " -n, --no-act 不要进行任何修改\n"
-#: misc-utils/rename.c:246
+#: misc-utils/rename.c:268
#, fuzzy
#| msgid " -a, --all print all devices\n"
msgid " -a, --all replace all occurrences\n"
msgstr " -a, --all 打印所有设备\n"
-#: misc-utils/rename.c:247
+#: misc-utils/rename.c:269
#, fuzzy
#| msgid " -a, --hostlast display hostnames in the last column\n"
msgid " -l, --last replace only the last occurrence\n"
msgstr " -a, --hostlast 最后一列显示主机名\n"
-#: misc-utils/rename.c:248
+#: misc-utils/rename.c:270
msgid " -o, --no-overwrite don't overwrite existing files\n"
msgstr " -o, --no-overwrite 不要覆写已存在的文件\n"
-#: misc-utils/rename.c:249
+#: misc-utils/rename.c:271
msgid " -i, --interactive prompt before overwrite\n"
msgstr " -i, --interactive 覆写之前进行提示\n"
-#: misc-utils/rename.c:339
+#: misc-utils/rename.c:361
msgid "failed to get terminal attributes"
msgstr "取终端属性失败"
-#: misc-utils/uuidd.c:97
+#: misc-utils/uuidd.c:99
msgid "A daemon for generating UUIDs.\n"
msgstr "一个用于生成 UUID 的守护进程。\n"
-#: misc-utils/uuidd.c:99
+#: misc-utils/uuidd.c:101
msgid " -p, --pid <path> path to pid file\n"
msgstr " -p, --pid <路径> pid 文件路径\n"
-#: misc-utils/uuidd.c:100
+#: misc-utils/uuidd.c:102
msgid " -s, --socket <path> path to socket\n"
msgstr " -s, --socket <路径> 套接字路径\n"
-#: misc-utils/uuidd.c:101
+#: misc-utils/uuidd.c:103
msgid " -T, --timeout <sec> specify inactivity timeout\n"
msgstr " -T, --timeout <秒> 指定无活动超时\n"
-#: misc-utils/uuidd.c:102
+#: misc-utils/uuidd.c:104
msgid " -k, --kill kill running daemon\n"
msgstr " -k, --kill 杀死运行中的守护进程\n"
-#: misc-utils/uuidd.c:103
+#: misc-utils/uuidd.c:105
msgid " -r, --random test random-based generation\n"
msgstr " -r, --random 测试基于随机数的生成方式\n"
-#: misc-utils/uuidd.c:104
+#: misc-utils/uuidd.c:106
msgid " -t, --time test time-based generation\n"
msgstr " -t, --time 测试基于时间的生成方式\n"
-#: misc-utils/uuidd.c:105
+#: misc-utils/uuidd.c:107
msgid " -n, --uuids <num> request number of uuids\n"
msgstr " -n, --uuids <数值> 请求指定数量的 uuid\n"
-#: misc-utils/uuidd.c:106
+#: misc-utils/uuidd.c:108
msgid " -P, --no-pid do not create pid file\n"
msgstr " -P, --no-pid 不创建 pid 文件\n"
-#: misc-utils/uuidd.c:107
+#: misc-utils/uuidd.c:109
msgid " -F, --no-fork do not daemonize using double-fork\n"
msgstr " -F, --no-fork 不使用双 fork 变成守护进程\n"
-#: misc-utils/uuidd.c:108
+#: misc-utils/uuidd.c:110
msgid " -S, --socket-activation do not create listening socket\n"
msgstr " -S, --socket-activation 不创建侦听套接字\n"
-#: misc-utils/uuidd.c:109
+#: misc-utils/uuidd.c:111
+msgid " -C, --cont-clock[=<NUM>[hd]]\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:112
+#, fuzzy
+#| msgid " --help display this help and exit\n"
+msgid " activate continuous clock handling\n"
+msgstr " --help 显示此帮助并退出\n"
+
+#: misc-utils/uuidd.c:113
msgid " -d, --debug run in debugging mode\n"
msgstr " -d, --debug 以调试模式运行\n"
-#: misc-utils/uuidd.c:110
+#: misc-utils/uuidd.c:114
msgid " -q, --quiet turn on quiet mode\n"
msgstr " -q, --quiet 开启安静模式\n"
-#: misc-utils/uuidd.c:142
+#: misc-utils/uuidd.c:146
msgid "bad arguments"
msgstr "参数错误"
-#: misc-utils/uuidd.c:149
+#: misc-utils/uuidd.c:153
msgid "socket"
msgstr "套接字"
-#: misc-utils/uuidd.c:160
+#: misc-utils/uuidd.c:164
msgid "connect"
msgstr "连接"
-#: misc-utils/uuidd.c:180
+#: misc-utils/uuidd.c:184
msgid "write"
msgstr "写"
-#: misc-utils/uuidd.c:188
+#: misc-utils/uuidd.c:192
msgid "read count"
msgstr "读计数"
-#: misc-utils/uuidd.c:194
+#: misc-utils/uuidd.c:198
msgid "bad response length"
msgstr "响应长度错误"
-#: misc-utils/uuidd.c:245
+#: misc-utils/uuidd.c:249
#, c-format
msgid "cannot lock %s"
msgstr "无法锁定 %s"
-#: misc-utils/uuidd.c:270
+#: misc-utils/uuidd.c:274
msgid "couldn't create unix stream socket"
msgstr "无法创建 unix 流套接字"
-#: misc-utils/uuidd.c:295
+#: misc-utils/uuidd.c:299
#, c-format
msgid "couldn't bind unix socket %s"
msgstr "无法绑定 unix 套接字 %s"
-#: misc-utils/uuidd.c:322
+#: misc-utils/uuidd.c:326
msgid "receiving signal failed"
msgstr "接收信号失败"
-#: misc-utils/uuidd.c:337
+#: misc-utils/uuidd.c:341
msgid "timed out"
msgstr "已超时"
-#: misc-utils/uuidd.c:373 sys-utils/flock.c:276
+#: misc-utils/uuidd.c:377 sys-utils/flock.c:276
msgid "cannot set up timer"
msgstr "无法设置定时器"
-#: misc-utils/uuidd.c:381
+#: misc-utils/uuidd.c:385
#, c-format
msgid "uuidd daemon is already running at pid %s"
msgstr "uuidd 守护进程已运行,pid 为 %s"
-#: misc-utils/uuidd.c:390
+#: misc-utils/uuidd.c:394
#, c-format
msgid "couldn't listen on unix socket %s"
msgstr "无法侦听 unix 套接字 %s"
-#: misc-utils/uuidd.c:400
+#: misc-utils/uuidd.c:404
#, c-format
msgid "could not truncate file: %s"
msgstr "无法截短文件:%s"
-#: misc-utils/uuidd.c:414
+#: misc-utils/uuidd.c:418
msgid "sd_listen_fds() failed"
msgstr "sd_listen_fds() 失败"
-#: misc-utils/uuidd.c:417
+#: misc-utils/uuidd.c:421
msgid "no file descriptors received, check systemctl status uuidd.socket"
msgstr "没有收到文件描述符,请检查 systemctl 状态 uuidd.socket"
-#: misc-utils/uuidd.c:420
+#: misc-utils/uuidd.c:424
msgid "too many file descriptors received, check uuidd.socket"
msgstr "收到太多文件描述符,请检查 uuidd.socket"
-#: misc-utils/uuidd.c:448 text-utils/more.c:1368
+#: misc-utils/uuidd.c:450
+#, c-format
+msgid "max_clock_offset = %u sec\n"
+msgstr ""
+
+#: misc-utils/uuidd.c:461 text-utils/more.c:1367
msgid "poll failed"
msgstr "轮询失败"
-#: misc-utils/uuidd.c:453
+#: misc-utils/uuidd.c:466
#, c-format
msgid "timeout [%d sec]\n"
msgstr "超时 [%d 秒]\n"
-#: misc-utils/uuidd.c:470 sys-utils/irqtop.c:223 sys-utils/irqtop.c:226
-#: sys-utils/irqtop.c:243 term-utils/setterm.c:920 text-utils/column.c:529
-#: text-utils/column.c:559
+#: misc-utils/uuidd.c:483 sys-utils/irqtop.c:228 sys-utils/irqtop.c:231
+#: sys-utils/irqtop.c:248 term-utils/setterm.c:920 text-utils/column.c:616
+#: text-utils/column.c:646
msgid "read failed"
msgstr "read 失败"
-#: misc-utils/uuidd.c:472
+#: misc-utils/uuidd.c:485
#, c-format
msgid "error reading from client, len = %d"
msgstr "从客户端读取出错,长度 = %d"
-#: misc-utils/uuidd.c:481
+#: misc-utils/uuidd.c:494
#, c-format
msgid "operation %d, incoming num = %d\n"
msgstr "操作 %d,接收数 = %d\n"
-#: misc-utils/uuidd.c:484
+#: misc-utils/uuidd.c:497
#, c-format
msgid "operation %d\n"
msgstr "操作 %d\n"
-#: misc-utils/uuidd.c:498 misc-utils/uuidd.c:509 misc-utils/uuidd.c:519
+#: misc-utils/uuidd.c:512 misc-utils/uuidd.c:533
#, fuzzy
#| msgid "failed to parse logical block size"
msgid "failed to open/lock clock counter"
msgstr "解析逻辑块大小失败"
-#: misc-utils/uuidd.c:501
+#: misc-utils/uuidd.c:515
#, c-format
msgid "Generated time UUID: %s\n"
msgstr "已生成时间 UUID:%s\n"
-#: misc-utils/uuidd.c:512
+#: misc-utils/uuidd.c:525
#, c-format
msgid "Generated random UUID: %s\n"
msgstr "已生成随机 UUID:%s\n"
-#: misc-utils/uuidd.c:522
+#: misc-utils/uuidd.c:536
#, 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:543
+#: misc-utils/uuidd.c:557
#, c-format
msgid "Generated %d UUID:\n"
msgid_plural "Generated %d UUIDs:\n"
msgstr[0] "已生成 %d 个 UUID:\n"
-#: misc-utils/uuidd.c:555
+#: misc-utils/uuidd.c:569
#, c-format
msgid "Invalid operation %d\n"
msgstr "无效操作 %d\n"
-#: misc-utils/uuidd.c:567
+#: misc-utils/uuidd.c:581
#, c-format
msgid "Unexpected reply length from server %d"
msgstr "服务器 %d 响应长度异常"
-#: misc-utils/uuidd.c:610
+#: misc-utils/uuidd.c:601
+#, fuzzy
+#| msgid "failed to parse column"
+msgid "failed to parse --cont-clock/-C"
+msgstr "解析列失败"
+
+#: misc-utils/uuidd.c:652
msgid "failed to parse --uuids"
msgstr "解析 --uuids 失败"
-#: misc-utils/uuidd.c:627
+#: misc-utils/uuidd.c:669
msgid "uuidd has been built without support for socket activation"
msgstr "uuidd 构建时没有添加套接字激活支持"
-#: misc-utils/uuidd.c:646
+#: misc-utils/uuidd.c:688
msgid "failed to parse --timeout"
msgstr "解析 --timeout 失败"
-#: misc-utils/uuidd.c:687
+#: misc-utils/uuidd.c:729
#, c-format
msgid "socket name too long: %s"
msgstr "套接字名称过长:%s"
-#: misc-utils/uuidd.c:694
+#: misc-utils/uuidd.c:736
msgid "Both --socket-activation and --socket specified. Ignoring --socket."
msgstr "同时指定了 --socket-activation 和 --socket。将忽略 --socket"
-#: misc-utils/uuidd.c:705 misc-utils/uuidd.c:740
+#: misc-utils/uuidd.c:747 misc-utils/uuidd.c:782
#, c-format
msgid "error calling uuidd daemon (%s)"
msgstr "调用 uuidd 守护进程(%s)出错"
-#: misc-utils/uuidd.c:706 misc-utils/uuidd.c:741
+#: misc-utils/uuidd.c:748 misc-utils/uuidd.c:783
msgid "unexpected error"
msgstr "意外错误"
-#: misc-utils/uuidd.c:714
+#: misc-utils/uuidd.c:756
#, 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:720
+#: misc-utils/uuidd.c:762
#, c-format
msgid "List of UUIDs:\n"
msgstr "UUID 列表:\n"
-#: misc-utils/uuidd.c:762
+#: misc-utils/uuidd.c:804
#, c-format
msgid "couldn't kill uuidd running at pid %d"
msgstr "无法运行 pid 为 %d 的 uuidd"
-#: misc-utils/uuidd.c:767
+#: misc-utils/uuidd.c:809
#, c-format
msgid "Killed uuidd running at pid %d.\n"
msgstr "已杀死运行 pid 为 %d 的 uuidd。\n"
msgstr "基于sha1"
#: misc-utils/uuidparse.c:267 misc-utils/wipefs.c:178
-#: sys-utils/irq-common.c:155 sys-utils/irq-common.c:460 sys-utils/lscpu.c:972
-#: sys-utils/lsns.c:1093 sys-utils/zramctl.c:505
+#: sys-utils/irq-common.c:156 sys-utils/irq-common.c:478 sys-utils/lscpu.c:990
+#: sys-utils/lsns.c:1146 sys-utils/zramctl.c:505
msgid "failed to initialize output column"
msgstr "初始化输出列失败"
-#: misc-utils/whereis.c:201
+#: misc-utils/waitpid.c:70
+#, c-format
+msgid "PID %d has exited, skipping"
+msgstr ""
+
+#: misc-utils/waitpid.c:73
+#, fuzzy, c-format
+#| msgid "could not read: %s"
+msgid "could not open pid %u"
+msgstr "无法读取︰%s"
+
+#: misc-utils/waitpid.c:92
+#, fuzzy
+#| msgid "cannot not create timerfd"
+msgid "could not create timerfd"
+msgstr "无法创建 timerfd"
+
+#: misc-utils/waitpid.c:95
+#, fuzzy
+#| msgid "cannot set timerfd"
+msgid "could not set timer"
+msgstr "无法设置 timerfd"
+
+#: misc-utils/waitpid.c:111
+#, fuzzy
+#| msgid "cannot not create timerfd"
+msgid "could not add timerfd"
+msgstr "无法创建 timerfd"
+
+#: misc-utils/waitpid.c:121
+#, fuzzy
+#| msgid "could not read: %s"
+msgid "could not add listener"
+msgstr "无法读取︰%s"
+
+#: misc-utils/waitpid.c:139
+msgid "failure during wait"
+msgstr ""
+
+#: misc-utils/waitpid.c:143
+#, c-format
+msgid "Timeout expired\n"
+msgstr ""
+
+#: misc-utils/waitpid.c:147
+#, c-format
+msgid "PID %d finished\n"
+msgstr ""
+
+#: misc-utils/waitpid.c:160
+#, fuzzy, c-format
+#| msgid " %s [options] file...\n"
+msgid " %s [options] pid...\n"
+msgstr " %s [选项] 文件...\n"
+
+#: misc-utils/waitpid.c:163
+#, fuzzy
+#| msgid " -v, --verbose be more verbose\n"
+msgid " -v, --verbose be more verbose\n"
+msgstr " -v, --verbose 更详尽\n"
+
+#: misc-utils/waitpid.c:164
+#, fuzzy
+#| msgid " -t, --timeout <timeout> write timeout in seconds\n"
+msgid " -t, --timeout=<timeout> wait at most timeout seconds\n"
+msgstr " -t, --timeout <超时> 写超时(秒)\n"
+
+#: misc-utils/waitpid.c:165
+#, fuzzy
+#| msgid " -a, --all print all devices\n"
+msgid " -e, --exited allow exited PIDs\n"
+msgstr " -a, --all 打印所有设备\n"
+
+#: misc-utils/waitpid.c:166
+#, fuzzy
+#| msgid " -t, --streams <number> number of compression streams\n"
+msgid " -c, --count=<count> number of process exits to wait for\n"
+msgstr " -t, --streams <数字> 压缩流数量\n"
+
+#: misc-utils/waitpid.c:204
+#, fuzzy
+#| msgid "failed to parse --timeout"
+msgid "Could not parse timeout"
+msgstr "解析 --timeout 失败"
+
+#: misc-utils/waitpid.c:210
+#, fuzzy
+#| msgid "invalid block-count"
+msgid "Invalid count"
+msgstr "无效的块计数"
+
+#: misc-utils/waitpid.c:237
+#, fuzzy
+#| msgid "no file specified"
+msgid "no PIDs specified"
+msgstr "未指定文件"
+
+#: misc-utils/waitpid.c:241
+#, c-format
+msgid "can't want for %zu of %zu PIDs"
+msgstr ""
+
+#: misc-utils/waitpid.c:249
+#, fuzzy
+#| msgid "could not read: %s"
+msgid "could not create epoll"
+msgstr "无法读取︰%s"
+
+#: misc-utils/whereis.c:205
#, c-format
msgid " %s [options] [-BMS <dir>... -f] <name>\n"
msgstr " %s [选项] [-BMS <dir>... -f] <名称>\n"
-#: misc-utils/whereis.c:204
+#: misc-utils/whereis.c:208
msgid "Locate the binary, source, and manual-page files for a command.\n"
msgstr "定位某个命令的二进制文件、源码和帮助页文件。\n"
-#: misc-utils/whereis.c:207
+#: misc-utils/whereis.c:211
msgid " -b search only for binaries\n"
msgstr " -b 只搜索二进制文件\n"
-#: misc-utils/whereis.c:208
+#: misc-utils/whereis.c:212
msgid " -B <dirs> define binaries lookup path\n"
msgstr " -B <目录> 定义二进制文件查找路径\n"
-#: misc-utils/whereis.c:209
+#: misc-utils/whereis.c:213
msgid " -m search only for manuals and infos\n"
msgstr " -m 只搜索手册和信息\n"
-#: misc-utils/whereis.c:210
+#: misc-utils/whereis.c:214
msgid " -M <dirs> define man and info lookup path\n"
msgstr " -M <目录> 定义 man 和 info 查找路径\n"
-#: misc-utils/whereis.c:211
+#: misc-utils/whereis.c:215
msgid " -s search only for sources\n"
msgstr " -s 只搜索源代码\n"
-#: misc-utils/whereis.c:212
+#: misc-utils/whereis.c:216
msgid " -S <dirs> define sources lookup path\n"
msgstr " -S <目录> 定义源代码查找路径\n"
-#: misc-utils/whereis.c:213
+#: misc-utils/whereis.c:217
msgid " -f terminate <dirs> argument list\n"
msgstr " -f 终止 <目录> 参数列表\n"
-#: misc-utils/whereis.c:214
+#: misc-utils/whereis.c:218
msgid " -u search for unusual entries\n"
msgstr " -u 搜索不常见记录\n"
-#: misc-utils/whereis.c:215
+#: misc-utils/whereis.c:219
+#, fuzzy
+#| msgid " -i, --invert invert the sense of matching\n"
+msgid " -g interpret name as glob (pathnames pattern)\n"
+msgstr " -i, --invert 反转搜索的匹配\n"
+
+#: misc-utils/whereis.c:220
msgid " -l output effective lookup paths\n"
msgstr " -l 输出有效查找路径\n"
-#: misc-utils/whereis.c:655
+#: misc-utils/whereis.c:670
msgid "option -f is missing"
msgstr "缺少 -f 选项"
msgid "Use the --force option to force erase."
msgstr "使用 --force 选项强制擦除。"
-#: misc-utils/wipefs.c:632
+#: misc-utils/wipefs.c:597
+#, fuzzy, c-format
+#| msgid "%s: cannot fflush changes: %s"
+msgid "%s: cannot flush modified buffers"
+msgstr "%s:无法 fflush 更改:%s"
+
+#: misc-utils/wipefs.c:636
msgid "Wipe signatures from a device."
msgstr "从设备擦除签名。"
-#: misc-utils/wipefs.c:635
+#: misc-utils/wipefs.c:639
#, fuzzy
#| msgid " -a, --all print all devices\n"
msgid " -a, --all wipe all magic strings (BE CAREFUL!)"
msgstr " -a, --all 打印所有设备\n"
-#: misc-utils/wipefs.c:636
+#: misc-utils/wipefs.c:640
#, fuzzy
#| msgid "failed to create a signature backup, $HOME undefined"
msgid " -b, --backup create a signature backup in $HOME"
msgstr "创建签名备份失败,未定义 $HOME"
-#: misc-utils/wipefs.c:637
-#, fuzzy
-#| msgid " -f, --force force check\n"
+#: misc-utils/wipefs.c:641
msgid " -f, --force force erasure"
-msgstr " -f, --force 强制检查\n"
+msgstr " -f, --force 强制擦除"
-#: misc-utils/wipefs.c:638
+#: misc-utils/wipefs.c:642
#, fuzzy
#| msgid " -n, --noheadings don't print headings\n"
msgid " -i, --noheadings don't print headings"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/wipefs.c:639
+#: misc-utils/wipefs.c:643
msgid " -J, --json use JSON output format"
msgstr " -J, --json 使用 JSON 输出格式"
-#: misc-utils/wipefs.c:640
+#: misc-utils/wipefs.c:644
#, fuzzy
#| msgid " --no-act do everything except the write the log\n"
msgid " -n, --no-act do everything except the actual write() call"
msgstr " --no-act 操作但不实际写入日志\n"
-#: misc-utils/wipefs.c:641
+#: misc-utils/wipefs.c:645
#, fuzzy
#| msgid " -o, --offset <num> offset for range operations, in bytes\n"
msgid " -o, --offset <num> offset to erase, in bytes"
msgstr " -o, --offset <数字> 范围操作的偏移量(字节数)\n"
-#: misc-utils/wipefs.c:642
+#: misc-utils/wipefs.c:646
msgid " -O, --output <list> COLUMNS to display (see below)"
msgstr ""
-#: misc-utils/wipefs.c:643
+#: misc-utils/wipefs.c:647
#, fuzzy
#| msgid " -p, --parse[=<list>] print out a parsable format\n"
msgid " -p, --parsable print out in parsable instead of printable format"
msgstr " -p, --parse[=<列表>] 打印可解析格式\n"
-#: misc-utils/wipefs.c:644
+#: misc-utils/wipefs.c:648
msgid " -q, --quiet suppress output messages"
msgstr " -q, --quiet 禁止输出信息"
-#: misc-utils/wipefs.c:645
+#: misc-utils/wipefs.c:649
#, fuzzy
#| msgid " -t, --types <list> limit the set of filesystems by FS types\n"
msgid " -t, --types <list> limit the set of filesystem, RAIDs or partition tables"
msgstr " -t, --types <列表> 根据文件系统类型限制文件系统集合\n"
-#: misc-utils/wipefs.c:647
+#: misc-utils/wipefs.c:651
#, fuzzy, c-format
#| msgid " --color[=<when>] colorize messages (auto, always or never)\n"
msgid " --lock[=<mode>] use exclusive device lock (%s, %s or %s)\n"
msgstr " --color[=<时机>] 消息彩色显示(auto, always 或 never)\n"
-#: misc-utils/wipefs.c:766
+#: misc-utils/wipefs.c:770
msgid "The --backup option is meaningless in this context"
msgstr "--backup 在此环境中无意义"
msgid "unknown prio class %d"
msgstr "未知的优先级类别 %d"
-#: schedutils/taskset.c:52
+#: schedutils/taskset.c:56
#, c-format
msgid ""
"Usage: %s [options] [mask | cpu-list] [pid|cmd [args...]]\n"
"用法:%s [选项] [掩码 | cpu列表] [pid|命令 [参数...]]\n"
"\n"
-#: schedutils/taskset.c:56
+#: schedutils/taskset.c:60
msgid "Show or change the CPU affinity of a process.\n"
msgstr "显示或更改某个进程的 CPU 亲和力。\n"
-#: schedutils/taskset.c:60
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| " -a, --all-tasks operate on all the tasks (threads) for a given pid\n"
-#| " -p, --pid operate on existing given pid\n"
-#| " -c, --cpu-list display and specify cpus in list format\n"
-#| " -h, --help display this help\n"
-#| " -V, --version output version information\n"
-#| "\n"
+#: schedutils/taskset.c:64
+#, c-format
msgid ""
"Options:\n"
" -a, --all-tasks operate on all the tasks (threads) for a given pid\n"
" -a, --all-tasks 在给定 pid 的所有任务(线程)上操作\n"
" -p, --pid 在存在的给定 pid 上操作\n"
" -c, --cpu-list 以列表格式显示和指定 CPU\n"
-" -h, --help 显示此帮助\n"
-" -V, --version 输出版本信息\n"
-"\n"
-#: schedutils/taskset.c:69
+#: schedutils/taskset.c:73
#, c-format
msgid ""
"The default behavior is to run a new command:\n"
"列表格式中的范围可以带一个跨度参数:\n"
" 例如 0-31:2 与掩码 0x55555555 等效\n"
-#: schedutils/taskset.c:91
+#: schedutils/taskset.c:95
#, c-format
msgid "pid %d's new affinity list: %s\n"
msgstr "pid %d 的新亲和力列表:%s\n"
-#: schedutils/taskset.c:92
+#: schedutils/taskset.c:96
#, c-format
msgid "pid %d's current affinity list: %s\n"
msgstr "pid %d 的当前亲和力列表:%s\n"
-#: schedutils/taskset.c:95
+#: schedutils/taskset.c:99
#, c-format
msgid "pid %d's new affinity mask: %s\n"
msgstr "pid %d 的新亲和力掩码:%s\n"
-#: schedutils/taskset.c:96
+#: schedutils/taskset.c:100
#, c-format
msgid "pid %d's current affinity mask: %s\n"
msgstr "pid %d 的当前亲和力掩码:%s\n"
-#: schedutils/taskset.c:100
+#: schedutils/taskset.c:104
msgid "internal error: conversion from cpuset to string failed"
msgstr "内部错误:从 cpuset 转换到字符串失败"
-#: schedutils/taskset.c:109
+#: schedutils/taskset.c:113
#, c-format
msgid "failed to set pid %d's affinity"
msgstr "设置 pid %d 的亲和力失败"
-#: schedutils/taskset.c:110
+#: schedutils/taskset.c:114
#, c-format
msgid "failed to get pid %d's affinity"
msgstr "获取 pid %d 的亲和力失败"
-#: schedutils/taskset.c:194 sys-utils/chcpu.c:300
+#: schedutils/taskset.c:142
+msgid "affinity cannot be set due to PF_NO_SETAFFINITY flag set"
+msgstr ""
+
+#: schedutils/taskset.c:213 sys-utils/chcpu.c:300 sys-utils/irqtop.c:326
msgid "cannot determine NR_CPUS; aborting"
msgstr "无法确定 NR_CPUS;将中止"
-#: schedutils/taskset.c:203 schedutils/taskset.c:216 sys-utils/chcpu.c:307
+#: schedutils/taskset.c:222 schedutils/taskset.c:235 sys-utils/chcpu.c:307
+#: sys-utils/irqtop.c:330
msgid "cpuset_alloc failed"
msgstr "cpuset_alloc 失败"
-#: schedutils/taskset.c:223 sys-utils/chcpu.c:234
+#: schedutils/taskset.c:242 sys-utils/chcpu.c:234 sys-utils/irqtop.c:333
#, c-format
msgid "failed to parse CPU list: %s"
msgstr "解析 CPU 列表失败:%s"
-#: schedutils/taskset.c:226
+#: schedutils/taskset.c:245
#, c-format
msgid "failed to parse CPU mask: %s"
msgstr "解析 CPU 掩码失败:%s"
msgstr " -<数字> 显示行数\n"
#: schedutils/uclampset.c:67
-#, fuzzy
-#| msgid " -p, --pid operate on existing given pid\n"
msgid " -p, --pid <pid> operate on existing given pid\n"
-msgstr " -p, --pid 对指定且存在的 pid 操作\n"
+msgstr " -p, --pid <pid> 对指定且存在的 pid 操作\n"
#: schedutils/uclampset.c:68
#, fuzzy
#: schedutils/uclampset.c:207
msgid "util_min must be <= util_max"
-msgstr ""
+msgstr "util_min 必须 <= util_max"
#: schedutils/uclampset.c:218
#, c-format
msgstr "%d 超出范围"
#: schedutils/uclampset.c:269
-#, fuzzy
-#| msgid "invalid time argument"
msgid "invalid util_min argument"
-msgstr "无效的 时间 参数"
+msgstr "无效的 util_min 参数"
#: schedutils/uclampset.c:274
-#, fuzzy
-#| msgid "invalid time argument"
msgid "invalid util_max argument"
-msgstr "无效的 时间 参数"
+msgstr "无效的 util_max 参数"
#: schedutils/uclampset.c:296
msgid "missing -p option"
msgid "no cmd to execute"
msgstr "无可执行的指令"
-#: sys-utils/blkdiscard.c:73
+#: sys-utils/blkdiscard.c:76
#, c-format
msgid "%s: Zero-filled %<PRIu64> bytes from the offset %<PRIu64>\n"
msgstr "%s: 用零填充的 %<PRIu64> 个字节,始于偏移量 %<PRIu64>\n"
-#: sys-utils/blkdiscard.c:78
+#: sys-utils/blkdiscard.c:81
#, c-format
msgid "%s: Discarded %<PRIu64> bytes from the offset %<PRIu64>\n"
msgstr "%1$s:已忽略从偏移 %3$<PRIu64> 位置开始的 %2$<PRIu64> 个字节\n"
-#: sys-utils/blkdiscard.c:92
+#: sys-utils/blkdiscard.c:95
msgid "Discard the content of sectors on a device.\n"
msgstr "丢弃一个设备上的扇区内容。\n"
-#: sys-utils/blkdiscard.c:95
+#: sys-utils/blkdiscard.c:98
msgid " -f, --force disable all checking\n"
msgstr " -f, --force 禁用所有检查\n"
-#: sys-utils/blkdiscard.c:96
-msgid " -o, --offset <num> offset in bytes to discard from\n"
-msgstr " -o, --offset <数值> 要丢弃的起始位置(字节)\n"
-
-#: sys-utils/blkdiscard.c:97
+#: sys-utils/blkdiscard.c:99
msgid " -l, --length <num> length of bytes to discard from the offset\n"
msgstr " -l, --length <数值> 从起始处起要丢弃的长度(字节数)\n"
-#: sys-utils/blkdiscard.c:98
+#: sys-utils/blkdiscard.c:100
+msgid " -o, --offset <num> offset in bytes to discard from\n"
+msgstr " -o, --offset <数值> 要丢弃的起始位置(字节)\n"
+
+#: sys-utils/blkdiscard.c:101
msgid " -p, --step <num> size of the discard iterations within the offset\n"
msgstr " -p, --step <数值> 在偏移范围内丢弃迭代的尺寸\n"
-#: sys-utils/blkdiscard.c:99
+#: sys-utils/blkdiscard.c:102
+#, fuzzy
+#| msgid " -q, --quiet suppress output messages"
+msgid " -q, --quiet suppress warning messages\n"
+msgstr " -q, --quiet 禁止输出信息"
+
+#: sys-utils/blkdiscard.c:103
msgid " -s, --secure perform secure discard\n"
msgstr " -s, --secure 执行安全丢弃\n"
-#: sys-utils/blkdiscard.c:100
+#: sys-utils/blkdiscard.c:104
+msgid " -v, --verbose print aligned length and offset\n"
+msgstr " -v, --verbose 打印对齐的长度和偏移\n"
+
+#: sys-utils/blkdiscard.c:105
msgid " -z, --zeroout zero-fill rather than discard\n"
msgstr " -z, --zeroout 用 零填充而非丢弃\n"
-#: sys-utils/blkdiscard.c:101
-msgid " -v, --verbose print aligned length and offset\n"
-msgstr " -v, --verbose 打印对齐的长度和偏移\n"
+#: sys-utils/blkdiscard.c:162 sys-utils/blkzone.c:378
+#, c-format
+msgid "%s: %s ioctl failed"
+msgstr "%s:%s ioctl 失败"
-#: sys-utils/blkdiscard.c:193 sys-utils/fstrim.c:533 sys-utils/losetup.c:710
-#: text-utils/hexdump.c:131
+#: sys-utils/blkdiscard.c:208 sys-utils/fstrim.c:546 sys-utils/losetup.c:710
+#: text-utils/hexdump.c:124
msgid "failed to parse offset"
msgstr "解析偏移失败"
-#: sys-utils/blkdiscard.c:197
+#: sys-utils/blkdiscard.c:212
msgid "failed to parse step"
msgstr "解析步长失败"
-#: sys-utils/blkdiscard.c:224 sys-utils/blkzone.c:491 sys-utils/fallocate.c:382
-#: sys-utils/fsfreeze.c:110 sys-utils/fstrim.c:561 sys-utils/umount.c:610
+#: sys-utils/blkdiscard.c:242 sys-utils/blkpr.c:307 sys-utils/blkzone.c:499
+#: sys-utils/fallocate.c:382 sys-utils/fsfreeze.c:110 sys-utils/fstrim.c:577
+#: sys-utils/umount.c:619 term-utils/script.c:908
msgid "unexpected number of arguments"
msgstr "参数数量异常"
-#: sys-utils/blkdiscard.c:238
+#: sys-utils/blkdiscard.c:256
#, c-format
msgid "%s: BLKGETSIZE64 ioctl failed"
msgstr "%s:BLKGETSIZE64 ioctl 失败"
-#: sys-utils/blkdiscard.c:240 sys-utils/blkzone.c:155
+#: sys-utils/blkdiscard.c:258 sys-utils/blkzone.c:155
#, c-format
msgid "%s: BLKSSZGET ioctl failed"
msgstr "%s:BLKSSZGET ioctl 失败"
-#: sys-utils/blkdiscard.c:244
+#: sys-utils/blkdiscard.c:262
#, c-format
msgid "%s: offset %<PRIu64> is not aligned to sector size %i"
msgstr "%s: 偏移量 %<PRIu64> 未与扇区大小 %i 对齐"
-#: sys-utils/blkdiscard.c:249 sys-utils/blkzone.c:348
+#: sys-utils/blkdiscard.c:267 sys-utils/blkzone.c:356
#, c-format
msgid "%s: offset is greater than device size"
msgstr "%s:偏移量超过设备大小"
-#: sys-utils/blkdiscard.c:258
+#: sys-utils/blkdiscard.c:276
#, c-format
msgid "%s: length %<PRIu64> is not aligned to sector size %i"
msgstr "%s: 长度 %<PRIu64> 未与扇区大小 %i 对齐"
-#: sys-utils/blkdiscard.c:262
+#: sys-utils/blkdiscard.c:281
msgid "Operation forced, data will be lost!"
-msgstr ""
+msgstr "强制进行操作,数据将丢失!"
-#: sys-utils/blkdiscard.c:273
+#: sys-utils/blkdiscard.c:292
msgid "This is destructive operation, data will be lost! Use the -f option to override."
-msgstr ""
+msgstr "这是一个破坏性的操作,数据将会丢失!使用 -f 选项以强制进行。"
-#: sys-utils/blkdiscard.c:280
+#: sys-utils/blkdiscard.c:299
#, fuzzy
#| msgid "failed to allocate device"
msgid "failed to probe the device"
msgstr "分配设备失败"
-#: sys-utils/blkdiscard.c:296
-#, c-format
-msgid "%s: BLKZEROOUT ioctl failed"
-msgstr "%s: BLKZEROOUT ioctl 失败"
+#: sys-utils/blkpr.c:195 sys-utils/blkpr.c:280
+#, fuzzy
+#| msgid "%c: unknown command"
+msgid "unknown command"
+msgstr "%c:未知命令"
-#: sys-utils/blkdiscard.c:300
-#, c-format
-msgid "%s: BLKSECDISCARD ioctl failed"
-msgstr "%s:BLKSECDISCARD ioctl 失败"
+#: sys-utils/blkpr.c:200
+#, fuzzy
+#| msgid "ioctl failed"
+msgid "pr ioctl failed"
+msgstr "ioctl 失败"
-#: sys-utils/blkdiscard.c:304
+#: sys-utils/blkpr.c:202
#, c-format
-msgid "%s: BLKDISCARD ioctl failed"
-msgstr "%s:BLKDISCARD ioctl 失败"
+msgid "error code 0x%x, for more detailed information see specification of device model."
+msgstr ""
+
+#: sys-utils/blkpr.c:216
+#, fuzzy
+#| msgid "Discard the content of sectors on a device.\n"
+msgid "Persistent reservations on a device.\n"
+msgstr "丢弃一个设备上的扇区内容。\n"
+
+#: sys-utils/blkpr.c:219
+#, fuzzy
+#| msgid " -c, --command <command> run command rather than interactive shell\n"
+msgid " -c, --command <cmd> command of persistent reservations\n"
+msgstr " -c, --command <命令> 运行指定命令而非启动交互式 shell\n"
+
+#: sys-utils/blkpr.c:220
+#, fuzzy
+#| msgid " -u, --user <user> username\n"
+msgid " -k, --key <num> key to operate\n"
+msgstr " -u, --user <用户> 用户名\n"
+
+#: sys-utils/blkpr.c:221
+#, fuzzy
+#| msgid " -p, --task <pid> print process namespaces\n"
+msgid " -K, --oldkey <num> old key to operate\n"
+msgstr " -p, --task <pid> 打印进程名字空间\n"
+
+#: sys-utils/blkpr.c:222
+#, fuzzy
+#| msgid " -i, --iflag [-]<iflag> set input mode flag\n"
+msgid " -f, --flag <flag> command flag\n"
+msgstr " -i, --iflag [-]<iflag> 设置输入模式标志\n"
+
+#: sys-utils/blkpr.c:223
+#, fuzzy
+#| msgid " -t, --type <type> specify the partition type\n"
+msgid " -t, --type <type> command type\n"
+msgstr " -t, --type <类型> 指定分区类型\n"
+
+#: sys-utils/blkpr.c:230
+msgid " <cmd> is an command, available command:\n"
+msgstr ""
+
+#: sys-utils/blkpr.c:233
+msgid " <flag> is a command flag, available flags:\n"
+msgstr ""
+
+#: sys-utils/blkpr.c:236
+msgid " <type> is a command type, available types:\n"
+msgstr ""
+
+#: sys-utils/blkpr.c:271
+#, fuzzy
+#| msgid "failed to parse end"
+msgid "failed to parse key"
+msgstr "解析 终点 失败"
+
+#: sys-utils/blkpr.c:275
+#, fuzzy
+#| msgid "failed to parse id"
+msgid "failed to parse old key"
+msgstr "解析 id 失败"
+
+#: sys-utils/blkpr.c:285
+#, fuzzy
+#| msgid "unknown user %s"
+msgid "unknown type"
+msgstr "未知用户 %s"
+
+#: sys-utils/blkpr.c:290
+#, fuzzy
+#| msgid "unknown flag: %s"
+msgid "unknown flag"
+msgstr "未知标志:%s"
#: sys-utils/blkzone.c:93
#, fuzzy
msgid "%s: offset is greater than or equal to device size"
msgstr "%s:偏移量超过设备大小"
-#: sys-utils/blkzone.c:246 sys-utils/blkzone.c:338
+#: sys-utils/blkzone.c:246 sys-utils/blkzone.c:346
#, fuzzy, c-format
#| msgid "%s: unable to write zone map"
msgid "%s: unable to determine zone size"
msgid " start: 0x%09<PRIx64>, len 0x%06<PRIx64>, cap 0x%06<PRIx64>, wptr 0x%06<PRIx64> reset:%u non-seq:%u, zcond:%2u(%s) [type: %u(%s)]\n"
msgstr ""
-#: sys-utils/blkzone.c:318
+#: sys-utils/blkzone.c:310
+#, c-format
+msgid " start: 0x%09<PRIx64>, len 0x%06<PRIx64>, wptr 0x%06<PRIx64> reset:%u non-seq:%u, zcond:%2u(%s) [type: %u(%s)]\n"
+msgstr ""
+
+#: sys-utils/blkzone.c:326
#, c-format
msgid "0x%09<PRIx64>\n"
msgstr ""
-#: sys-utils/blkzone.c:343
+#: sys-utils/blkzone.c:351
#, fuzzy, c-format
#| msgid "%s: offset %<PRIu64> is not aligned to sector size %i"
msgid "%s: offset %<PRIu64> is not aligned to zone size %lu"
msgstr "%s: 偏移量 %<PRIu64> 未与扇区大小 %i 对齐"
-#: sys-utils/blkzone.c:362
+#: sys-utils/blkzone.c:370
#, fuzzy, c-format
#| msgid "%s: offset %<PRIu64> is not aligned to sector size %i"
msgid "%s: number of sectors %<PRIu64> is not aligned to zone size %lu"
msgstr "%s: 偏移量 %<PRIu64> 未与扇区大小 %i 对齐"
-#: sys-utils/blkzone.c:370
-#, c-format
-msgid "%s: %s ioctl failed"
-msgstr "%s:%s ioctl 失败"
-
-#: sys-utils/blkzone.c:373
+#: sys-utils/blkzone.c:381
#, fuzzy, c-format
#| msgid "Partition table length changed from %<PRIu32> to %<PRIu64>."
msgid "%s: successful %s of zones in range from %<PRIu64>, to %<PRIu64>"
msgstr "分区表长度已从 %<PRIu32> 改为 %<PRIu64>。"
-#: sys-utils/blkzone.c:388
+#: sys-utils/blkzone.c:396
#, c-format
msgid " %s <command> [options] <device>\n"
msgstr " %s <命令> [选项] <设备>\n"
-#: sys-utils/blkzone.c:391
+#: sys-utils/blkzone.c:399
msgid "Run zone command on the given block device.\n"
msgstr ""
-#: sys-utils/blkzone.c:398
+#: sys-utils/blkzone.c:406
#, fuzzy
#| msgid " -o, --offset <num> offset for range operations, in bytes\n"
msgid " -o, --offset <sector> start sector of zone to act (in 512-byte sectors)\n"
msgstr " -o, --offset <数字> 范围操作的偏移量(字节数)\n"
-#: sys-utils/blkzone.c:399
+#: sys-utils/blkzone.c:407
msgid " -l, --length <sectors> maximum sectors to act (in 512-byte sectors)\n"
msgstr ""
-#: sys-utils/blkzone.c:400
+#: sys-utils/blkzone.c:408
#, fuzzy
#| msgid " -t, --streams <number> number of compression streams\n"
msgid " -c, --count <number> maximum number of zones\n"
msgstr " -t, --streams <数字> 压缩流数量\n"
-#: sys-utils/blkzone.c:401
+#: sys-utils/blkzone.c:409
#, fuzzy
#| msgid " -f, --force force hardlinking across filesystems"
msgid " -f, --force enforce on block devices used by the system\n"
msgstr " -f, --force 强制跨文件系统进行硬链接"
-#: sys-utils/blkzone.c:402
+#: sys-utils/blkzone.c:410
msgid " -v, --verbose display more details\n"
msgstr " -v, --verbose 显示更多细节\n"
-#: sys-utils/blkzone.c:407
+#: sys-utils/blkzone.c:415
#, fuzzy
#| msgid "sector count: %d, sector size: %d\n"
msgid "<sector> and <sectors>"
msgstr "扇区计数:%d,扇区大小:%d\n"
-#: sys-utils/blkzone.c:445
+#: sys-utils/blkzone.c:453
#, fuzzy, c-format
#| msgid "%s is not a valid block device"
msgid "%s is not valid command name"
msgstr "%s 不是一个有效的块设备"
-#: sys-utils/blkzone.c:457
+#: sys-utils/blkzone.c:465
#, fuzzy
#| msgid "failed to parse number of lines"
msgid "failed to parse number of zones"
msgstr "解析行数失败"
-#: sys-utils/blkzone.c:461
+#: sys-utils/blkzone.c:469
#, fuzzy
#| msgid "failed to parse number of lines"
msgid "failed to parse number of sectors"
msgstr "解析行数失败"
-#: sys-utils/blkzone.c:465
+#: sys-utils/blkzone.c:473
#, fuzzy
#| msgid "failed to parse offset"
msgid "failed to parse zone offset"
msgstr "解析偏移失败"
-#: sys-utils/blkzone.c:484 sys-utils/setsid.c:92
+#: sys-utils/blkzone.c:492 sys-utils/setsid.c:92
msgid "no command specified"
msgstr "没有指定命令"
msgstr ""
#: sys-utils/chmem.c:206
-#, fuzzy, c-format
-#| msgid "CPU %u is already enabled\n"
+#, c-format
msgid "%s already enabled\n"
-msgstr "CPU %u 已经启用\n"
+msgstr ""
+"%s 已启用\n"
+"\n"
#: sys-utils/chmem.c:208
-#, fuzzy, c-format
-#| msgid "CPU %u is already disabled\n"
+#, c-format
msgid "%s already disabled\n"
-msgstr "CPU %u 已经禁用\n"
+msgstr "%s 已禁用\n"
#: sys-utils/chmem.c:218
#, fuzzy, c-format
msgstr ""
#: sys-utils/chmem.c:346
-#, fuzzy
-#| msgid " -v, --verbose verbose mode\n"
msgid " -e, --enable enable memory\n"
-msgstr " -v, --verbose 详尽模式\n"
+msgstr " -e, --enable 启用内存\n"
#: sys-utils/chmem.c:347
-#, fuzzy
-#| msgid " -m, --shmems shared memory segments\n"
msgid " -d, --disable disable memory\n"
-msgstr " -m, --shmems 共享内存段\n"
+msgstr " -d, --disable 禁用内存\n"
#: sys-utils/chmem.c:348
-#, fuzzy
-#| msgid " -u, --unlock remove a lock\n"
msgid " -b, --blocks use memory blocks\n"
-msgstr " -u, --unlock 移除锁\n"
+msgstr " -b, --blocks 使用内存块\n"
#: sys-utils/chmem.c:349
msgid " -z, --zone <name> select memory zone (see below)\n"
msgstr ""
#: sys-utils/chmem.c:350
-#, fuzzy
-#| msgid " -v, --verbose verbose mode\n"
msgid " -v, --verbose verbose output\n"
-msgstr " -v, --verbose 详尽模式\n"
+msgstr " -v, --verbose 详尽输出\n"
#: sys-utils/chmem.c:353
#, fuzzy
"\n"
"支持的日志设施:\n"
-#: sys-utils/chmem.c:394 sys-utils/lscpu-cputype.c:872 sys-utils/lsmem.c:667
+#: sys-utils/chmem.c:394 sys-utils/lscpu-cputype.c:889 sys-utils/lsmem.c:667
#, fuzzy, c-format
#| msgid "%s: failed to initialize sysfs handler"
msgid "failed to initialize %s handler"
msgstr " -p, --task <pid> 打印进程名字空间\n"
#: sys-utils/choom.c:60
-#, fuzzy
-#| msgid "failed to read speed"
msgid "failed to read OOM score value"
-msgstr "读 速度 失败"
+msgstr ""
#: sys-utils/choom.c:70
#, fuzzy
#. where %a is abbreviated name of the day, %b is abbreviated month
#. name and %e is day of the month as a decimal number. Please, set
#. proper month/day order here
-#: sys-utils/dmesg.c:861
+#: sys-utils/dmesg.c:863
msgid "%a %b %e %H:%M:%S %Y"
msgstr ""
#. TRANSLATORS: dmesg uses strftime() fo generate date-time string
#. where: %b is abbreviated month and %e is day of the month as a
#. decimal number. Please, set proper month/day order here.
-#: sys-utils/dmesg.c:871
+#: sys-utils/dmesg.c:873
msgid "%b%e %H:%M"
msgstr ""
-#: sys-utils/dmesg.c:1523
+#: sys-utils/dmesg.c:1526
msgid "invalid buffer size argument"
msgstr "无效的 缓冲区大小 参数"
-#: sys-utils/dmesg.c:1611
+#: sys-utils/dmesg.c:1612
msgid "--show-delta is ignored when used together with iso8601 time format"
msgstr "--show-delta 与 iso8601 时间格式共用时将忽略"
-#: sys-utils/dmesg.c:1635
+#: sys-utils/dmesg.c:1636
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:1655
+#: sys-utils/dmesg.c:1656
msgid "read kernel buffer failed"
msgstr "读取内核缓冲区失败"
-#: sys-utils/dmesg.c:1662
-#, fuzzy
-#| msgid "read kernel buffer failed"
+#: sys-utils/dmesg.c:1664
msgid "clear kernel buffer failed"
-msgstr "读取内核缓冲区失败"
+msgstr "清除内核缓冲区失败"
-#: sys-utils/dmesg.c:1678
+#: sys-utils/dmesg.c:1680
msgid "klogctl failed"
msgstr "klogctl 失败"
msgstr "%s:正在卸载"
#: sys-utils/eject.c:662 sys-utils/mount.c:59 sys-utils/umount.c:122
-#: text-utils/more.c:1272
+#: text-utils/more.c:1271
#, fuzzy
#| msgid "permission denied"
msgid "drop permissions failed"
msgid "device name is `%s'"
msgstr "设备名称为“%s”"
-#: sys-utils/eject.c:896 sys-utils/umount.c:356 sys-utils/umount.c:380
+#: sys-utils/eject.c:896 sys-utils/umount.c:365 sys-utils/umount.c:389
#, c-format
msgid "%s: not mounted"
msgstr "%s:未挂载"
msgstr "%s:是 整盘 设备"
#: sys-utils/eject.c:915
-#, c-format
-msgid "%s: is not hot-pluggable device"
+#, fuzzy, c-format
+#| msgid "%s: is not hot-pluggable device"
+msgid "%s: is not ejectable device"
msgstr "%s:不是热插拔设备"
#: sys-utils/eject.c:919
msgid "%s: unfreeze failed"
msgstr "%s:解冻失败"
-#: sys-utils/fstrim.c:82
+#: sys-utils/fstrim.c:83
#, c-format
msgid "%s: not a directory"
msgstr "%s:不是一个目录"
-#: sys-utils/fstrim.c:112
+#: sys-utils/fstrim.c:113
#, fuzzy, c-format
#| msgid "%s: %s mounted on %s.\n"
msgid "%s: 0 B (dry run) trimmed on %s\n"
msgstr "%s:%s 已挂臷到 %s。\n"
-#: sys-utils/fstrim.c:114
+#: sys-utils/fstrim.c:115
#, c-format
msgid "%s: 0 B (dry run) trimmed\n"
msgstr ""
-#: sys-utils/fstrim.c:131
+#: sys-utils/fstrim.c:133
#, c-format
msgid "%s: FITRIM ioctl failed"
msgstr "%s:FITRIM ioctl 失败"
#. TRANSLATORS: The standard value here is a very large number.
-#: sys-utils/fstrim.c:141
+#: sys-utils/fstrim.c:143
#, fuzzy, c-format
#| msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
msgid "%s: %s (%<PRIu64> bytes) trimmed on %s\n"
msgstr "%s:%s (%<PRIu64> 字节) 已修剪\n"
#. TRANSLATORS: The standard value here is a very large number.
-#: sys-utils/fstrim.c:145
+#: sys-utils/fstrim.c:147
#, c-format
msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
msgstr "%s:%s (%<PRIu64> 字节) 已修剪\n"
-#: sys-utils/fstrim.c:277 sys-utils/lsns.c:1412 sys-utils/swapon.c:746
-#: sys-utils/umount.c:262
+#: sys-utils/fstrim.c:290 sys-utils/lsns.c:1494 sys-utils/swapon.c:746
+#: sys-utils/umount.c:271
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失败"
-#: sys-utils/fstrim.c:303
+#: sys-utils/fstrim.c:316
#, fuzzy
#| msgid "failed to allocate script handler"
msgid "failed to allocate FS handler"
msgstr "分配脚本处理程序失败"
-#: sys-utils/fstrim.c:392 sys-utils/fstrim.c:575
+#: sys-utils/fstrim.c:403 sys-utils/fstrim.c:591
#, c-format
msgid "%s: the discard operation is not supported"
msgstr "%s:不支持丢弃操作"
-#: sys-utils/fstrim.c:443
+#: sys-utils/fstrim.c:454
#, c-format
msgid " %s [options] <mount point>\n"
msgstr " %s [选项] <挂臷点>\n"
-#: sys-utils/fstrim.c:446
+#: sys-utils/fstrim.c:457
msgid "Discard unused blocks on a mounted filesystem.\n"
msgstr "忽略已挂载文件系统上的未用锁。\n"
-#: sys-utils/fstrim.c:449
+#: sys-utils/fstrim.c:460
#, fuzzy
#| msgid " -a, --all unmount all filesystems\n"
msgid " -a, --all trim mounted filesystems\n"
msgstr " -a, --all 卸载所有文件系统\n"
-#: sys-utils/fstrim.c:450
+#: sys-utils/fstrim.c:461
#, fuzzy
#| msgid " -a, --all trim all mounted filesystems that are supported\n"
msgid " -A, --fstab trim filesystems from /etc/fstab\n"
msgstr " -a, --all 修剪不支持的所有已挂载文件系统\n"
-#: sys-utils/fstrim.c:451
+#: sys-utils/fstrim.c:462
#, fuzzy
#| msgid " -m, -p, --preserve-environment do not reset environment variables\n"
msgid " -I, --listed-in <list> trim filesystems listed in specified files\n"
msgstr " -m, -p, --preserve-environment 不重置环境变量\n"
-#: sys-utils/fstrim.c:452
+#: sys-utils/fstrim.c:463
#, fuzzy
#| msgid " -o, --offset <num> the offset in bytes to start discarding from\n"
msgid " -o, --offset <num> the offset in bytes to start discarding from\n"
msgstr " -o, --offset <数字> 开始丢弃的偏移量(字节)\n"
-#: sys-utils/fstrim.c:453
+#: sys-utils/fstrim.c:464
#, fuzzy
#| msgid " -l, --length <num> the number of bytes to discard\n"
msgid " -l, --length <num> the number of bytes to discard\n"
msgstr " -l, --length <数字> 要丢弃的字符数\n"
-#: sys-utils/fstrim.c:454
+#: sys-utils/fstrim.c:465
#, fuzzy
#| msgid " -m, --minimum <num> the minimum extent length to discard\n"
msgid " -m, --minimum <num> the minimum extent length to discard\n"
msgstr " -m, --minimum <数字> 要丢弃的最小限制长度\n"
-#: sys-utils/fstrim.c:455
+#: sys-utils/fstrim.c:466
+#, fuzzy
+#| msgid " -t, --types <list> limit the set of filesystem types\n"
+msgid " -t, --types <list> limit the set of filesystem types\n"
+msgstr " -t, --types <列表> 限制文件系统集合\n"
+
+#: sys-utils/fstrim.c:467
#, fuzzy
#| msgid " -v, --verbose print number of discarded bytes\n"
msgid " -v, --verbose print number of discarded bytes\n"
msgstr " -v, --verbose 打印丢弃的字节数\n"
-#: sys-utils/fstrim.c:456
+#: sys-utils/fstrim.c:468
#, fuzzy
#| msgid " -q, --quiet suppress extra info messages\n"
msgid " --quiet-unsupported suppress error messages if trim unsupported\n"
msgstr " -q, --quiet 禁止输出额外信息\n"
-#: sys-utils/fstrim.c:457
+#: sys-utils/fstrim.c:469
#, fuzzy
#| msgid " -n, --dry-run does everything, but suspend\n"
msgid " -n, --dry-run does everything, but trim\n"
msgstr " -n, --dry-run 演示操作但不执行(suspend)\n"
-#: sys-utils/fstrim.c:537
+#: sys-utils/fstrim.c:550
msgid "failed to parse minimum extent length"
msgstr "解析 最小范围长度 失败"
-#: sys-utils/fstrim.c:556
+#: sys-utils/fstrim.c:572
msgid "no mountpoint specified"
msgstr "未指定挂载点"
msgid "The RTC parameter 0x%jx is set to 0x%jx.\n"
msgstr ""
-#: sys-utils/hwclock.c:1197
+#: sys-utils/hwclock.c:1198
#, fuzzy, c-format
#| msgid " hwclock [function] [option...]\n"
msgid " %s [function] [option...]\n"
msgstr " hwclock [功能] [选项...]\n"
-#: sys-utils/hwclock.c:1200
+#: sys-utils/hwclock.c:1201
msgid "Time clocks utility."
msgstr ""
-#: sys-utils/hwclock.c:1203
+#: sys-utils/hwclock.c:1204
#, fuzzy
#| msgid " -r, --show display the RTC time"
msgid " -r, --show display the RTC time"
msgstr " -r, --show 显示 RTC 时间"
-#: sys-utils/hwclock.c:1204
+#: sys-utils/hwclock.c:1205
#, fuzzy
#| msgid " -Z, --context display SELinux contexts\n"
msgid " --get display drift corrected RTC time"
msgstr " -Z, --context 显示 SELinux 环境\n"
-#: sys-utils/hwclock.c:1205
+#: sys-utils/hwclock.c:1206
#, fuzzy
#| msgid " -r, --reset reset the port\n"
msgid " --set set the RTC according to --date"
msgstr " -r, --reset 重置端口\n"
-#: sys-utils/hwclock.c:1206
+#: sys-utils/hwclock.c:1207
#, fuzzy
#| msgid " -r, --reset reset the port\n"
msgid " -s, --hctosys set the system time from the RTC"
msgstr " -r, --reset 重置端口\n"
-#: sys-utils/hwclock.c:1207
+#: sys-utils/hwclock.c:1208
#, fuzzy
#| msgid " -t, --types <list> limit the set of filesystem types\n"
msgid " -w, --systohc set the RTC from the system time"
msgstr " -t, --types <列表> 限制文件系统集合\n"
-#: sys-utils/hwclock.c:1208
+#: sys-utils/hwclock.c:1209
#, fuzzy
#| msgid " set vesa powersaving features\n"
msgid " --systz send timescale configurations to the kernel"
msgstr " 设置 vesa 节能功能\n"
-#: sys-utils/hwclock.c:1209
+#: sys-utils/hwclock.c:1210
#, fuzzy
#| msgid " -J, --json use JSON --list output format\n"
msgid " -a, --adjust adjust the RTC to account for systematic drift"
msgstr " -J, --json 使用 JSON --list 输出格式\n"
-#: sys-utils/hwclock.c:1211
+#: sys-utils/hwclock.c:1212
#, fuzzy
#| msgid " --help display this help and exit\n"
msgid " --getepoch display the RTC epoch"
msgstr " --help 显示此帮助并退出\n"
-#: sys-utils/hwclock.c:1212
+#: sys-utils/hwclock.c:1213
#, fuzzy
#| msgid " -r, --reset reset the port\n"
msgid " --setepoch set the RTC epoch according to --epoch"
msgstr " -r, --reset 重置端口\n"
-#: sys-utils/hwclock.c:1215
+#: sys-utils/hwclock.c:1216
#, fuzzy
#| msgid " --help display this help and exit\n"
msgid " --param-get <param> display the RTC parameter"
msgstr " --help 显示此帮助并退出\n"
-#: sys-utils/hwclock.c:1216
+#: sys-utils/hwclock.c:1217
msgid " --param-set <param>=<value> set the RTC parameter"
msgstr ""
-#: sys-utils/hwclock.c:1218
+#: sys-utils/hwclock.c:1219
#, fuzzy
#| msgid " -r, --reset reset the port\n"
msgid " --predict predict the drifted RTC time according to --date"
msgstr " -r, --reset 重置端口\n"
-#: sys-utils/hwclock.c:1220
+#: sys-utils/hwclock.c:1221
#, fuzzy
#| msgid " -u, --utc RTC uses UTC\n"
msgid " -u, --utc the RTC timescale is UTC"
msgstr " -u, --utc RTC 使用 UTC\n"
-#: sys-utils/hwclock.c:1221
+#: sys-utils/hwclock.c:1222
#, fuzzy
#| msgid " -l, --local RTC uses local timezone\n"
msgid " -l, --localtime the RTC timescale is Local"
msgstr " -l, --local RTC 使用本地时区\n"
-#: sys-utils/hwclock.c:1224
+#: sys-utils/hwclock.c:1225
#, fuzzy, c-format
#| msgid " -f, --file <file> use a specific file instead of %s\n"
msgid " -f, --rtc <file> use an alternate file to %1$s\n"
msgstr " -F, --file <文件> 用指定文件代替 %s\n"
-#: sys-utils/hwclock.c:1227
+#: sys-utils/hwclock.c:1228
#, fuzzy, c-format
#| msgid " --raw use raw status output format\n"
msgid " --directisa use the ISA bus instead of %1$s access\n"
msgstr " --raw 使用原生状态输出格式\n"
-#: sys-utils/hwclock.c:1228
+#: sys-utils/hwclock.c:1229
#, fuzzy
#| msgid " --date <time> date/time input for --set and --predict"
msgid " --date <time> date/time input for --set and --predict"
msgstr " --date <时间戳> 指定用于 --set 和 --predict 的日期/时间输入"
-#: sys-utils/hwclock.c:1229
+#: sys-utils/hwclock.c:1230
#, fuzzy
#| msgid " -Z, --context display SELinux contexts\n"
msgid " --delay <sec> delay used when set new RTC time"
msgstr " -Z, --context 显示 SELinux 环境\n"
-#: sys-utils/hwclock.c:1231
+#: sys-utils/hwclock.c:1232
msgid " --epoch <year> epoch input for --setepoch"
msgstr ""
-#: sys-utils/hwclock.c:1233
+#: sys-utils/hwclock.c:1234
#, fuzzy
#| msgid " -r, --reset reset the port\n"
msgid " --update-drift update the RTC drift factor"
msgstr " -r, --reset 重置端口\n"
-#: sys-utils/hwclock.c:1235
+#: sys-utils/hwclock.c:1236
#, fuzzy, c-format
#| msgid " --noadjfile do not use %1$s\n"
msgid " --noadjfile do not use %1$s\n"
msgstr " --noadjfile 不使用 %1$s\n"
-#: sys-utils/hwclock.c:1237
+#: sys-utils/hwclock.c:1238
#, fuzzy, c-format
#| msgid " -f, --file <file> use a specific file instead of %s\n"
msgid " --adjfile <file> use an alternate file to %1$s\n"
msgstr " -F, --file <文件> 用指定文件代替 %s\n"
-#: sys-utils/hwclock.c:1238
+#: sys-utils/hwclock.c:1239
#, fuzzy
#| msgid " --test dry run; implies --verbose"
msgid " --test dry run; implies --verbose"
msgstr " --test 测试运行;隐含启用 --verbose"
-#: sys-utils/hwclock.c:1239
+#: sys-utils/hwclock.c:1240
#, fuzzy
#| msgid " -v, --verbose display more details\n"
msgid " -v, --verbose display more details"
msgstr " -v, --verbose 显示更多细节\n"
-#: sys-utils/hwclock.c:1246
+#: sys-utils/hwclock.c:1247
msgid " <param> is either a numeric RTC parameter value or one of these aliases:"
msgstr ""
-#: sys-utils/hwclock.c:1249
+#: sys-utils/hwclock.c:1250
#, c-format
msgid " - %1$s: %2$s (0x%3$x)\n"
msgstr ""
-#: sys-utils/hwclock.c:1253
+#: sys-utils/hwclock.c:1254
msgid " See Kernel's include/uapi/linux/rtc.h for parameters and values."
msgstr ""
-#: sys-utils/hwclock.c:1255
+#: sys-utils/hwclock.c:1256
msgid " <param> and <value> accept hexadecimal values if prefixed with 0x, otherwise decimal."
msgstr ""
-#: sys-utils/hwclock.c:1356
+#: sys-utils/hwclock.c:1357
msgid "Unable to connect to audit system"
msgstr "无法连接到审计系统"
-#: sys-utils/hwclock.c:1380
+#: sys-utils/hwclock.c:1381
msgid "use --verbose, --debug has been deprecated."
msgstr ""
-#: sys-utils/hwclock.c:1493
+#: sys-utils/hwclock.c:1494
#, fuzzy, c-format
#| msgid "too many arguments"
msgid "%d too many arguments given"
msgstr "参数过多"
-#: sys-utils/hwclock.c:1501
+#: sys-utils/hwclock.c:1502
msgid "--update-drift requires --set or --systohc"
msgstr ""
-#: sys-utils/hwclock.c:1506
+#: sys-utils/hwclock.c:1507
msgid "With --noadjfile, you must specify either --utc or --localtime"
msgstr "指定 --noadjfile 时,您必须指定 --utc 或 --localtime"
-#: sys-utils/hwclock.c:1513
+#: sys-utils/hwclock.c:1514
msgid "--date is required for --set or --predict"
msgstr ""
-#: sys-utils/hwclock.c:1530
+#: sys-utils/hwclock.c:1531
#, c-format
msgid "invalid date '%s'"
msgstr "无效日期“%s”"
-#: sys-utils/hwclock.c:1553
+#: sys-utils/hwclock.c:1554
#, fuzzy, c-format
#| msgid "Current system time: %ld = %s\n"
msgid "System Time: %<PRId64>.%06<PRId64>\n"
msgstr "当前系统时间:%ld = %s\n"
-#: sys-utils/hwclock.c:1570
+#: sys-utils/hwclock.c:1571
msgid "Test mode: nothing was changed."
msgstr "演示模式:无实际修改。"
msgid "Using direct ISA access to the clock"
msgstr "将对 ISA 时钟使用直接 I/O 指令。"
-#: sys-utils/hwclock-rtc.c:113
+#: sys-utils/hwclock-rtc.c:48
#, fuzzy
#| msgid "unsupported filesystem features"
msgid "supported features"
msgstr "不支持的文件系统特性"
-#: sys-utils/hwclock-rtc.c:114
+#: sys-utils/hwclock-rtc.c:49
msgid "time correction"
msgstr ""
-#: sys-utils/hwclock-rtc.c:115
+#: sys-utils/hwclock-rtc.c:50
msgid "backup switch mode"
msgstr ""
-#: sys-utils/hwclock-rtc.c:166
+#: sys-utils/hwclock-rtc.c:101
#, c-format
msgid "Trying to open: %s\n"
msgstr "正在尝试打开:%s\n"
-#: sys-utils/hwclock-rtc.c:191 sys-utils/hwclock-rtc.c:294
+#: sys-utils/hwclock-rtc.c:126 sys-utils/hwclock-rtc.c:216
msgid "cannot open rtc device"
msgstr "无法打开 rtc 设备"
-#: sys-utils/hwclock-rtc.c:227
-#, c-format
-msgid "ioctl(%s) to %s to read the time failed"
+#: sys-utils/hwclock-rtc.c:140
+#, fuzzy, c-format
+#| msgid "ioctl(%s) to %s to read the time failed"
+msgid "ioctl(RTC_RD_NAME) to %s to read the time failed"
msgstr "对 %2$s 的读取时间 ioctl(%1$s) 失败"
-#: sys-utils/hwclock-rtc.c:255
+#: sys-utils/hwclock-rtc.c:177
#, c-format
msgid "Waiting in loop for time from %s to change\n"
msgstr "正在循环等待来自 %s 的时间更改\n"
-#: sys-utils/hwclock-rtc.c:274
+#: sys-utils/hwclock-rtc.c:196
msgid "Timed out waiting for time change."
msgstr "等待时间更改超时。"
-#: sys-utils/hwclock-rtc.c:322
+#: sys-utils/hwclock-rtc.c:244
#, c-format
msgid "select() to %s to wait for clock tick timed out"
msgstr "对 %s select() 以等待时钟嘀嗒超时"
-#: sys-utils/hwclock-rtc.c:325
+#: sys-utils/hwclock-rtc.c:247
#, c-format
msgid "select() to %s to wait for clock tick failed"
msgstr "对 %s select() 以等待时钟嘀嗒失败"
-#: sys-utils/hwclock-rtc.c:330
+#: sys-utils/hwclock-rtc.c:252
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr "对 %s ioctl() 以关闭更新中断失败"
-#: sys-utils/hwclock-rtc.c:336
+#: sys-utils/hwclock-rtc.c:258
#, fuzzy, c-format
#| msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgid "ioctl(%d, RTC_UIE_ON, 0) to %s failed"
msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
-#: sys-utils/hwclock-rtc.c:388
+#: sys-utils/hwclock-rtc.c:303
#, fuzzy, c-format
#| msgid "ioctl(%s) to %s to set the time failed."
-msgid "ioctl(%s) to %s to set the time failed"
+msgid "ioctl(RTC_SET_TIME) to %s to set the time failed"
msgstr "对 %2$s ioctl(%1$s) 以设置时间失败。"
-#: sys-utils/hwclock-rtc.c:394
-#, c-format
-msgid "ioctl(%s) was successful.\n"
+#: sys-utils/hwclock-rtc.c:309
+#, fuzzy, c-format
+#| msgid "ioctl(%s) was successful.\n"
+msgid "ioctl(RTC_SET_TIME) was successful.\n"
msgstr "ioctl(%s) 成功。\n"
-#: sys-utils/hwclock-rtc.c:410
+#: sys-utils/hwclock-rtc.c:325
#, fuzzy
#| msgid "Using the /dev interface to the clock."
msgid "Using the rtc interface to the clock."
msgstr "将对时钟使用 /dev 接口。"
-#: sys-utils/hwclock-rtc.c:443
+#: sys-utils/hwclock-rtc.c:358
#, fuzzy, c-format
#| msgid "ioctl(RTC_EPOCH_READ) to %s failed"
msgid "ioctl(%d, RTC_EPOCH_READ, epoch_p) to %s failed"
msgstr "对 %s 进行 ioctl(RTC_EPOCH_READ) 失败"
-#: sys-utils/hwclock-rtc.c:449
+#: sys-utils/hwclock-rtc.c:364
#, fuzzy, c-format
#| msgid "ioctl(RTC_EPOCH_READ) to %s failed"
msgid "ioctl(%d, RTC_EPOCH_READ, epoch_p) to %s succeeded.\n"
msgstr "对 %s 进行 ioctl(RTC_EPOCH_READ) 失败"
-#: sys-utils/hwclock-rtc.c:468
+#: sys-utils/hwclock-rtc.c:383
#, fuzzy, c-format
#| msgid "invalid epoch argument"
msgid "invalid epoch '%s'."
msgstr "无效的纪元(epoch)参数"
-#: sys-utils/hwclock-rtc.c:479
+#: sys-utils/hwclock-rtc.c:394
#, fuzzy, c-format
#| msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgid "ioctl(%d, RTC_EPOCH_SET, %lu) to %s failed"
msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
-#: sys-utils/hwclock-rtc.c:485
+#: sys-utils/hwclock-rtc.c:400
#, fuzzy, c-format
#| msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgid "ioctl(%d, RTC_EPOCH_SET, %lu) to %s succeeded.\n"
msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
-#: sys-utils/hwclock-rtc.c:521 sys-utils/hwclock-rtc.c:563
+#: sys-utils/hwclock-rtc.c:442 sys-utils/hwclock-rtc.c:484
msgid "could not convert parameter name to number"
msgstr ""
-#: sys-utils/hwclock-rtc.c:533
+#: sys-utils/hwclock-rtc.c:454
#, fuzzy, c-format
#| msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgid "ioctl(%d, RTC_PARAM_GET, param) to %s failed"
msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
-#: sys-utils/hwclock-rtc.c:544
+#: sys-utils/hwclock-rtc.c:465
#, fuzzy, c-format
#| msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgid "ioctl(%d, RTC_PARAM_GET, param) to %s succeeded.\n"
msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
-#: sys-utils/hwclock-rtc.c:570
+#: sys-utils/hwclock-rtc.c:491
msgid "expected <param>=<value>"
msgstr ""
-#: sys-utils/hwclock-rtc.c:574
+#: sys-utils/hwclock-rtc.c:495
msgid "could not convert parameter value to number"
msgstr ""
-#: sys-utils/hwclock-rtc.c:586
+#: sys-utils/hwclock-rtc.c:507
#, fuzzy, c-format
#| msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgid "ioctl(%d, RTC_PARAM_SET, param) to %s failed"
msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
-#: sys-utils/hwclock-rtc.c:592
+#: sys-utils/hwclock-rtc.c:513
#, fuzzy, c-format
#| msgid "ioctl(RTC_EPOCH_SET) to %s failed"
msgid "ioctl(%d, RTC_PARAM_SET, param) to %s succeeded.\n"
msgid "key"
msgstr "键"
-#: sys-utils/ipcs.c:303 sys-utils/ipcs.c:528
-msgid "size"
-msgstr "大小"
-
#: sys-utils/ipcs.c:303 sys-utils/prlimit.c:77 sys-utils/prlimit.c:78
#: sys-utils/prlimit.c:80 sys-utils/prlimit.c:81 sys-utils/prlimit.c:83
#: sys-utils/prlimit.c:84 sys-utils/prlimit.c:88 sys-utils/prlimit.c:92
msgid "pid"
msgstr "pid"
-#: sys-utils/ipcutils.c:232 sys-utils/ipcutils.c:236 sys-utils/ipcutils.c:240
-#: sys-utils/ipcutils.c:244
+#: sys-utils/ipcutils.c:234 sys-utils/ipcutils.c:238 sys-utils/ipcutils.c:242
+#: sys-utils/ipcutils.c:246
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: sys-utils/ipcutils.c:505
+#: sys-utils/ipcutils.c:507
#, c-format
msgid "%s (bytes) = "
msgstr "%s (字节) = "
-#: sys-utils/ipcutils.c:507
+#: sys-utils/ipcutils.c:509
#, c-format
msgid "%s (kbytes) = "
msgstr "%s (千字节) = "
-#: sys-utils/irq-common.c:53
+#: sys-utils/irq-common.c:54
msgid "interrupts"
msgstr "中断"
-#: sys-utils/irq-common.c:54
+#: sys-utils/irq-common.c:55
#, fuzzy
#| msgid "read count"
msgid "total count"
msgstr "读计数"
-#: sys-utils/irq-common.c:55
+#: sys-utils/irq-common.c:56
#, fuzzy
#| msgid "read count"
msgid "delta count"
msgstr "读计数"
-#: sys-utils/irq-common.c:56
+#: sys-utils/irq-common.c:57
msgid "name"
msgstr "名称"
-#: sys-utils/irq-common.c:138 sys-utils/irq-common.c:444 sys-utils/lsmem.c:702
-#: sys-utils/lsns.c:1063
+#: sys-utils/irq-common.c:139 sys-utils/irq-common.c:460 sys-utils/lsmem.c:702
+#: sys-utils/lsns.c:1116
msgid "failed to initialize output table"
msgstr "初始化输出表失败"
-#: sys-utils/irq-common.c:172 sys-utils/lsns.c:984
+#: sys-utils/irq-common.c:173 sys-utils/lsns.c:1037
msgid "failed to add line to output"
msgstr "向输出添加行出错"
-#: sys-utils/irq-common.c:402
+#: sys-utils/irq-common.c:416
#, fuzzy
#| msgid "unsupported color mode"
msgid "unsupported column name to sort output"
msgstr "不支持的颜色模式"
-#: sys-utils/irq-common.c:452
+#: sys-utils/irq-common.c:468
#, fuzzy
#| msgid "interrupts"
msgid "cpu-interrupts"
msgstr "中断"
-#: sys-utils/irq-common.c:484
+#: sys-utils/irq-common.c:504
#, no-c-format
msgid "%delta:"
msgstr ""
-#: sys-utils/irqtop.c:134
+#: sys-utils/irqtop.c:139
#, c-format
msgid ""
"irqtop | total: %ld delta: %ld | %s | %s\n"
"\n"
msgstr ""
-#: sys-utils/irqtop.c:182
+#: sys-utils/irqtop.c:187
msgid "cannot not create timerfd"
msgstr "无法创建 timerfd"
-#: sys-utils/irqtop.c:184
+#: sys-utils/irqtop.c:189
msgid "cannot set timerfd"
msgstr "无法设置 timerfd"
-#: sys-utils/irqtop.c:189 sys-utils/irqtop.c:207 sys-utils/irqtop.c:212
+#: sys-utils/irqtop.c:194 sys-utils/irqtop.c:212 sys-utils/irqtop.c:217
msgid "epoll_ctl failed"
msgstr "epoll_ctl 失败"
-#: sys-utils/irqtop.c:192
+#: sys-utils/irqtop.c:197
msgid "sigfillset failed"
msgstr "sigfillset 失败"
-#: sys-utils/irqtop.c:194
+#: sys-utils/irqtop.c:199
msgid "sigprocmask failed"
msgstr "sigprocmask 失败"
-#: sys-utils/irqtop.c:202
+#: sys-utils/irqtop.c:207
msgid "cannot not create signalfd"
msgstr "无法创建 signalfd"
-#: sys-utils/irqtop.c:260
+#: sys-utils/irqtop.c:265
msgid "Interactive utility to display kernel interrupt information."
msgstr ""
-#: sys-utils/irqtop.c:263
+#: sys-utils/irqtop.c:268
msgid " -c, --cpu-stat <mode> show per-cpu stat (auto, enable, disable)\n"
msgstr ""
-#: sys-utils/irqtop.c:264
+#: sys-utils/irqtop.c:269
+msgid " -C, --cpu-list <list> specify cpus in list format\n"
+msgstr ""
+
+#: sys-utils/irqtop.c:270
msgid " -d, --delay <secs> delay updates\n"
msgstr ""
-#: sys-utils/irqtop.c:266 sys-utils/lsirq.c:67
+#: sys-utils/irqtop.c:272 sys-utils/lsirq.c:67
#, fuzzy
#| msgid " -x, --sort <column> sort output by <column>\n"
msgid " -s, --sort <column> specify sort column\n"
msgstr " -x, --sort <列> 按<列>对输出排序\n"
-#: sys-utils/irqtop.c:267 sys-utils/lsirq.c:68
+#: sys-utils/irqtop.c:273 sys-utils/lsirq.c:68
#, fuzzy
#| msgid " -y, --physical print physical instead of logical IDs\n"
msgid " -S, --softirq show softirqs instead of interrupts\n"
msgstr " -y, --physical 打印物理 ID 而非逻辑 ID\n"
-#: sys-utils/irqtop.c:271
+#: sys-utils/irqtop.c:277
msgid ""
"\n"
"The following interactive key commands are valid:\n"
msgstr ""
-#: sys-utils/irqtop.c:272
+#: sys-utils/irqtop.c:278
msgid " i sort by IRQ\n"
msgstr ""
-#: sys-utils/irqtop.c:273
+#: sys-utils/irqtop.c:279
msgid " t sort by TOTAL\n"
msgstr ""
-#: sys-utils/irqtop.c:274
+#: sys-utils/irqtop.c:280
msgid " d sort by DELTA\n"
msgstr ""
-#: sys-utils/irqtop.c:275
+#: sys-utils/irqtop.c:281
msgid " n sort by NAME\n"
msgstr ""
-#: sys-utils/irqtop.c:276
+#: sys-utils/irqtop.c:282
msgid " q Q quit program\n"
msgstr ""
-#: sys-utils/irqtop.c:313
+#: sys-utils/irqtop.c:320
#, fuzzy, c-format
#| msgid "unsupported mode name: '%s'"
msgid "unsupported mode '%s'"
msgstr "不支持的模式名称:“%s”"
-#: sys-utils/irqtop.c:320
+#: sys-utils/irqtop.c:342
#, fuzzy
#| msgid "failed to parse argument"
msgid "failed to parse delay argument"
msgstr "解析参数失败"
-#: sys-utils/irqtop.c:377
+#: sys-utils/irqtop.c:399
msgid "terminal setting retrieval"
msgstr ""
msgid "%s: failed to check for conflicting loop devices"
msgstr "%s︰ 检查冲突的循环设备失败"
-#: sys-utils/losetup.c:555 sys-utils/losetup.c:879
+#: sys-utils/losetup.c:555 sys-utils/losetup.c:881
msgid "cannot find an unused loop device"
msgstr "找不到未使用的回环设备"
msgid "failed to parse logical block size"
msgstr "解析逻辑块大小失败"
-#: sys-utils/losetup.c:671 sys-utils/losetup.c:681 sys-utils/losetup.c:807
-#: sys-utils/losetup.c:821 sys-utils/losetup.c:859
+#: sys-utils/losetup.c:671 sys-utils/losetup.c:681 sys-utils/losetup.c:809
+#: sys-utils/losetup.c:823 sys-utils/losetup.c:861
#, c-format
msgid "%s: failed to use device"
msgstr "%s:使用设备失败"
-#: sys-utils/losetup.c:818
+#: sys-utils/losetup.c:820
msgid "no loop device specified"
msgstr "未指定回环设备"
-#: sys-utils/losetup.c:833
+#: sys-utils/losetup.c:835
#, c-format
msgid "the options %s are allowed during loop device setup only"
msgstr "选项 %s 只允许在设置回环设备时使用"
-#: sys-utils/losetup.c:838
+#: sys-utils/losetup.c:840
msgid "the option --offset is not allowed in this context"
msgstr "此环境下不允许使用 --offset 选项"
-#: sys-utils/losetup.c:900
+#: sys-utils/losetup.c:902
#, c-format
msgid "%s: set capacity failed"
msgstr "%s:设置容量失败"
-#: sys-utils/losetup.c:906
+#: sys-utils/losetup.c:908
#, c-format
msgid "%s: set direct io failed"
msgstr "%s︰ 设置直接 io 失败"
-#: sys-utils/losetup.c:912
+#: sys-utils/losetup.c:914
#, c-format
msgid "%s: set logical block size failed"
msgstr "%s:设置逻辑块大小失败"
-#: sys-utils/lscpu.c:46
+#: sys-utils/lscpu.c:48
msgid "none"
msgstr "无"
-#: sys-utils/lscpu.c:47
+#: sys-utils/lscpu.c:49
msgid "para"
msgstr "半"
-#: sys-utils/lscpu.c:48
+#: sys-utils/lscpu.c:50
msgid "full"
msgstr "完全"
-#: sys-utils/lscpu.c:49
+#: sys-utils/lscpu.c:51
msgid "container"
msgstr "容器"
-#: sys-utils/lscpu.c:73
+#: sys-utils/lscpu.c:75
msgid "horizontal"
msgstr "水平"
-#: sys-utils/lscpu.c:74
+#: sys-utils/lscpu.c:76
msgid "vertical"
msgstr "竖直"
-#: sys-utils/lscpu.c:141
+#: sys-utils/lscpu.c:144
msgid "crude measurement of CPU speed"
msgstr ""
-#: sys-utils/lscpu.c:142
+#: sys-utils/lscpu.c:145
msgid "logical CPU number"
msgstr "逻辑 CPU 数量"
-#: sys-utils/lscpu.c:143
+#: sys-utils/lscpu.c:146
msgid "logical core number"
msgstr "逻辑核心数量"
-#: sys-utils/lscpu.c:144
+#: sys-utils/lscpu.c:147
#, fuzzy
#| msgid "logical core number"
msgid "logical cluster number"
msgstr "逻辑核心数量"
-#: sys-utils/lscpu.c:145
+#: sys-utils/lscpu.c:148
msgid "logical socket number"
msgstr "逻辑(CPU)座数量"
-#: sys-utils/lscpu.c:146
+#: sys-utils/lscpu.c:149
msgid "logical NUMA node number"
msgstr "逻辑 NUMA 节点数量"
-#: sys-utils/lscpu.c:147
+#: sys-utils/lscpu.c:150
msgid "logical book number"
msgstr "逻辑 book 数"
-#: sys-utils/lscpu.c:148
+#: sys-utils/lscpu.c:151
msgid "logical drawer number"
msgstr "逻辑抽屉号"
-#: sys-utils/lscpu.c:149
+#: sys-utils/lscpu.c:152
msgid "shows how caches are shared between CPUs"
msgstr "显示 CPU 间是如何共享缓存的"
-#: sys-utils/lscpu.c:150
+#: sys-utils/lscpu.c:153
msgid "CPU dispatching mode on virtual hardware"
msgstr "虚拟硬件上的 CPU 调度模式"
-#: sys-utils/lscpu.c:151
+#: sys-utils/lscpu.c:154
msgid "physical address of a CPU"
msgstr "CPU 的物理地址"
-#: sys-utils/lscpu.c:152
+#: sys-utils/lscpu.c:155
msgid "shows if the hypervisor has allocated the CPU"
msgstr "显示超级监督(hypervisor)是否分配了 CPU"
-#: sys-utils/lscpu.c:153
+#: sys-utils/lscpu.c:156
msgid "shows if Linux currently makes use of the CPU"
msgstr "显示 Linux 当前是否在使用该 CPU"
-#: sys-utils/lscpu.c:154
+#: sys-utils/lscpu.c:157
#, fuzzy
#| msgid "shows the maximum MHz of the CPU"
msgid "shows the currently MHz of the CPU"
msgstr "显示 CPU 的最大 MHz"
-#: sys-utils/lscpu.c:155
+#: sys-utils/lscpu.c:158
msgid "shows scaling percentage of the CPU frequency"
msgstr ""
-#: sys-utils/lscpu.c:156
+#: sys-utils/lscpu.c:159
msgid "shows the maximum MHz of the CPU"
msgstr "显示 CPU 的最大 MHz"
-#: sys-utils/lscpu.c:157
+#: sys-utils/lscpu.c:160
msgid "shows the minimum MHz of the CPU"
msgstr "显示 CPU 的最小 MHz"
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:161
+msgid "shows CPU model name"
+msgstr ""
+
+#: sys-utils/lscpu.c:166
#, fuzzy
#| msgid "set filesystem readahead"
msgid "size of all system caches"
msgstr "设置 文件系统 readahead"
-#: sys-utils/lscpu.c:163
+#: sys-utils/lscpu.c:167
msgid "cache level"
msgstr "缓存等级"
-#: sys-utils/lscpu.c:164
+#: sys-utils/lscpu.c:168
msgid "cache name"
msgstr "缓存名称"
-#: sys-utils/lscpu.c:165
+#: sys-utils/lscpu.c:169
#, fuzzy
#| msgid "size of the device"
msgid "size of one cache"
msgstr "磁盘容量"
-#: sys-utils/lscpu.c:166
+#: sys-utils/lscpu.c:170
msgid "cache type"
msgstr "缓存类型"
-#: sys-utils/lscpu.c:167
+#: sys-utils/lscpu.c:171
msgid "ways of associativity"
msgstr ""
-#: sys-utils/lscpu.c:168
+#: sys-utils/lscpu.c:172
msgid "allocation policy"
msgstr ""
-#: sys-utils/lscpu.c:169
+#: sys-utils/lscpu.c:173
msgid "write policy"
msgstr "写策略"
-#: sys-utils/lscpu.c:170
+#: sys-utils/lscpu.c:174
#, fuzzy
#| msgid "Number of physical cylinders"
-msgid "number of physical cache line per cache t"
+msgid "number of physical cache line per cache tag"
msgstr "物理柱面数"
-#: sys-utils/lscpu.c:171
+#: sys-utils/lscpu.c:175
msgid "number of sets in the cache; set lines has the same cache index"
msgstr ""
-#: sys-utils/lscpu.c:172
+#: sys-utils/lscpu.c:176
msgid "minimum amount of data in bytes transferred from memory to cache"
msgstr ""
-#: sys-utils/lscpu.c:223
+#: sys-utils/lscpu.c:229
+#, fuzzy
+#| msgid "failed to initialize procfs handler"
+msgid "failed to initialize rootfs handler"
+msgstr "%s:初始化 procfs 处理函数失败"
+
+#: sys-utils/lscpu.c:236
msgid "failed to initialize CPUs sysfs handler"
msgstr "%s:初始化 CPU sysfs 处理函数失败"
-#: sys-utils/lscpu.c:230
+#: sys-utils/lscpu.c:243
msgid "failed to initialize procfs handler"
msgstr "%s:初始化 procfs 处理函数失败"
-#: sys-utils/lscpu.c:322
+#: sys-utils/lscpu.c:336
msgid "Y"
msgstr "Y"
-#: sys-utils/lscpu.c:322
+#: sys-utils/lscpu.c:336
msgid "N"
msgstr "N"
-#: sys-utils/lscpu.c:659
+#: sys-utils/lscpu.c:677
#, fuzzy, c-format
#| msgid ""
#| "# The following is the parsable format, which can be fed to other\n"
"# 以下是可解析格式,可以输给其他程序。每列中的各个不同项有一个惟一\n"
"# 的从 0 开始的 ID。\n"
-#: sys-utils/lscpu.c:862
+#: sys-utils/lscpu.c:880
msgid "Model name:"
msgstr "型号名称:"
-#: sys-utils/lscpu.c:864
+#: sys-utils/lscpu.c:882
msgid "BIOS Model name:"
msgstr "BIOS 型号名称:"
-#: sys-utils/lscpu.c:866
+#: sys-utils/lscpu.c:884
#, fuzzy
#| msgid "CPU family:"
msgid "BIOS CPU family:"
msgstr "CPU 系列:"
-#: sys-utils/lscpu.c:868
+#: sys-utils/lscpu.c:886
msgid "Machine type:"
msgstr "机器类型︰"
-#: sys-utils/lscpu.c:870
+#: sys-utils/lscpu.c:888
msgid "CPU family:"
msgstr "CPU 系列:"
-#: sys-utils/lscpu.c:872
+#: sys-utils/lscpu.c:890
msgid "Model:"
msgstr "型号:"
-#: sys-utils/lscpu.c:874
+#: sys-utils/lscpu.c:892
msgid "Thread(s) per core:"
msgstr "每个核的线程数:"
-#: sys-utils/lscpu.c:876
+#: sys-utils/lscpu.c:894
#, fuzzy
#| msgid "Core(s) per socket:"
msgid "Core(s) per cluster:"
msgstr "每个座的核数:"
-#: sys-utils/lscpu.c:878
+#: sys-utils/lscpu.c:896
msgid "Core(s) per socket:"
msgstr "每个座的核数:"
-#: sys-utils/lscpu.c:881
+#: sys-utils/lscpu.c:899
msgid "Socket(s) per book:"
msgstr "每个 book 的座数:"
-#: sys-utils/lscpu.c:883
+#: sys-utils/lscpu.c:901
msgid "Book(s) per drawer:"
msgstr "每个抽屉里的 Book 数︰"
-#: sys-utils/lscpu.c:884
+#: sys-utils/lscpu.c:902
msgid "Drawer(s):"
msgstr "抽屉:"
-#: sys-utils/lscpu.c:886
+#: sys-utils/lscpu.c:904
msgid "Book(s):"
msgstr "Book:"
-#: sys-utils/lscpu.c:890 sys-utils/lscpu.c:892 sys-utils/lscpu.c:897
+#: sys-utils/lscpu.c:908 sys-utils/lscpu.c:910 sys-utils/lscpu.c:915
msgid "Socket(s):"
msgstr "座:"
-#: sys-utils/lscpu.c:894
+#: sys-utils/lscpu.c:912
msgid "Cluster(s):"
msgstr ""
-#: sys-utils/lscpu.c:902
+#: sys-utils/lscpu.c:920
msgid "Stepping:"
msgstr "步进:"
-#: sys-utils/lscpu.c:904
+#: sys-utils/lscpu.c:922
#, fuzzy
#| msgid "FreeBSD boot"
msgid "Frequency boost:"
msgstr "FreeBSD 启动"
-#: sys-utils/lscpu.c:905
+#: sys-utils/lscpu.c:923
#, fuzzy
#| msgid "Unusable"
msgid "enabled"
msgstr "不可用"
-#: sys-utils/lscpu.c:905
+#: sys-utils/lscpu.c:923
#, fuzzy
#| msgid "CPU %u disabled\n"
msgid "disabled"
msgstr "CPU %u 已禁用\n"
-#: sys-utils/lscpu.c:909
+#: sys-utils/lscpu.c:927
msgid "CPU dynamic MHz:"
msgstr "CPU 动态 MHz:"
-#: sys-utils/lscpu.c:911
+#: sys-utils/lscpu.c:929
msgid "CPU static MHz:"
msgstr "CPU 静态 MHz:"
-#: sys-utils/lscpu.c:916
+#: sys-utils/lscpu.c:934
#, fuzzy
#| msgid "CPU min MHz:"
msgid "CPU(s) scaling MHz:"
msgstr "CPU 最小 MHz:"
-#: sys-utils/lscpu.c:917
+#: sys-utils/lscpu.c:935
msgid "CPU max MHz:"
msgstr "CPU 最大 MHz:"
-#: sys-utils/lscpu.c:918
+#: sys-utils/lscpu.c:936
msgid "CPU min MHz:"
msgstr "CPU 最小 MHz:"
-#: sys-utils/lscpu.c:921
+#: sys-utils/lscpu.c:939
msgid "BogoMIPS:"
msgstr "BogoMIPS:"
-#: sys-utils/lscpu.c:924
+#: sys-utils/lscpu.c:942
msgid "Dispatching mode:"
msgstr "分派模式:"
-#: sys-utils/lscpu.c:927
+#: sys-utils/lscpu.c:945
msgid "Physical sockets:"
msgstr "物理套接字︰"
-#: sys-utils/lscpu.c:928
+#: sys-utils/lscpu.c:946
msgid "Physical chips:"
msgstr "物理芯片︰"
-#: sys-utils/lscpu.c:929
+#: sys-utils/lscpu.c:947
msgid "Physical cores/chip:"
msgstr "物理核心/芯片︰"
-#: sys-utils/lscpu.c:933
+#: sys-utils/lscpu.c:951
msgid "Flags:"
msgstr "标记:"
-#: sys-utils/lscpu.c:978
+#: sys-utils/lscpu.c:995
msgid "Architecture:"
msgstr "架构:"
-#: sys-utils/lscpu.c:991
+#: sys-utils/lscpu.c:1008
msgid "CPU op-mode(s):"
msgstr "CPU 运行模式:"
-#: sys-utils/lscpu.c:994
+#: sys-utils/lscpu.c:1011
msgid "Address sizes:"
msgstr ""
-#: sys-utils/lscpu.c:996 sys-utils/lscpu.c:998
+#: sys-utils/lscpu.c:1014 sys-utils/lscpu.c:1016
msgid "Byte Order:"
msgstr "字节序:"
-#: sys-utils/lscpu.c:1002
+#: sys-utils/lscpu.c:1019
msgid "CPU(s):"
msgstr "CPU:"
-#: sys-utils/lscpu.c:1006
+#: sys-utils/lscpu.c:1023
msgid "On-line CPU(s) mask:"
msgstr "在线 CPU 掩码:"
-#: sys-utils/lscpu.c:1007
+#: sys-utils/lscpu.c:1024
msgid "On-line CPU(s) list:"
msgstr "在线 CPU 列表:"
-#: sys-utils/lscpu.c:1019
+#: sys-utils/lscpu.c:1036
msgid "failed to callocate cpu set"
msgstr "分配(callocate) CPU 组 失败"
-#: sys-utils/lscpu.c:1028
+#: sys-utils/lscpu.c:1045
msgid "Off-line CPU(s) mask:"
msgstr "离线 CPU 掩码:"
-#: sys-utils/lscpu.c:1029
+#: sys-utils/lscpu.c:1046
msgid "Off-line CPU(s) list:"
msgstr "离线 CPU 列表:"
-#: sys-utils/lscpu.c:1036
+#: sys-utils/lscpu.c:1053
msgid "Vendor ID:"
msgstr "厂商 ID:"
-#: sys-utils/lscpu.c:1038
+#: sys-utils/lscpu.c:1055
msgid "BIOS Vendor ID:"
msgstr "BIOS 厂商 ID:"
-#: sys-utils/lscpu.c:1046
+#: sys-utils/lscpu.c:1063
#, fuzzy
#| msgid "Virtualization type:"
msgid "Virtualization features:"
msgstr "虚拟化类型:"
-#: sys-utils/lscpu.c:1048 sys-utils/lscpu.c:1050
+#: sys-utils/lscpu.c:1065 sys-utils/lscpu.c:1067
msgid "Virtualization:"
msgstr "虚拟化:"
-#: sys-utils/lscpu.c:1053
+#: sys-utils/lscpu.c:1070
msgid "Hypervisor:"
msgstr "超管理器:"
-#: sys-utils/lscpu.c:1055
+#: sys-utils/lscpu.c:1072
msgid "Hypervisor vendor:"
msgstr "超管理器厂商:"
-#: sys-utils/lscpu.c:1056
+#: sys-utils/lscpu.c:1073
msgid "Virtualization type:"
msgstr "虚拟化类型:"
-#: sys-utils/lscpu.c:1079
+#: sys-utils/lscpu.c:1096
msgid "Caches (sum of all):"
msgstr ""
-#: sys-utils/lscpu.c:1083 sys-utils/lscpu.c:1113 sys-utils/lscpu.c:1145
+#: sys-utils/lscpu.c:1100 sys-utils/lscpu.c:1130 sys-utils/lscpu.c:1162
#, fuzzy, c-format
#| msgid "%s"
msgid "%s:"
msgstr "%s"
-#: sys-utils/lscpu.c:1083 sys-utils/lscpu.c:1113
+#: sys-utils/lscpu.c:1100 sys-utils/lscpu.c:1130
#, c-format
msgid "%s cache:"
msgstr "%s 缓存:"
-#: sys-utils/lscpu.c:1086
+#: sys-utils/lscpu.c:1103
#, c-format
msgid "%<PRIu64> (%d instance)"
msgid_plural "%<PRIu64> (%d instances)"
msgstr[0] ""
-#: sys-utils/lscpu.c:1095
+#: sys-utils/lscpu.c:1112
#, c-format
msgid "%s (%d instance)"
msgid_plural "%s (%d instances)"
msgstr[0] ""
-#: sys-utils/lscpu.c:1110
+#: sys-utils/lscpu.c:1127
msgid "Caches:"
msgstr "缓存:"
-#: sys-utils/lscpu.c:1129
+#: sys-utils/lscpu.c:1146
msgid "NUMA:"
msgstr ""
-#: sys-utils/lscpu.c:1131
+#: sys-utils/lscpu.c:1148
msgid "NUMA node(s):"
msgstr "NUMA 节点:"
-#: sys-utils/lscpu.c:1133
+#: sys-utils/lscpu.c:1150
#, c-format
msgid "NUMA node%d CPU(s):"
msgstr "NUMA 节点%d CPU:"
-#: sys-utils/lscpu.c:1141
+#: sys-utils/lscpu.c:1158
#, fuzzy
#| msgid "Inheritable capabilities: "
msgid "Vulnerabilities:"
msgstr "可继承的权能:"
-#: sys-utils/lscpu.c:1145
+#: sys-utils/lscpu.c:1162
#, fuzzy, c-format
#| msgid "unknown capability \"%s\""
msgid "Vulnerability %s:"
msgstr "未知权能“%s”"
-#: sys-utils/lscpu.c:1163
+#: sys-utils/lscpu.c:1180
msgid "Display information about the CPU architecture.\n"
msgstr "显示 CPU 架构信息。\n"
-#: sys-utils/lscpu.c:1166
+#: sys-utils/lscpu.c:1183
msgid " -a, --all print both online and offline CPUs (default for -e)\n"
msgstr " -a, --all 同时打印在线和离线 CPU (-e 选项默认值)\n"
-#: sys-utils/lscpu.c:1167
+#: sys-utils/lscpu.c:1184
msgid " -b, --online print online CPUs only (default for -p)\n"
msgstr " -b, --online 只打印在线 CPU (-p 选项默认值)\n"
-#: sys-utils/lscpu.c:1168
+#: sys-utils/lscpu.c:1185
#, fuzzy
#| msgid " -b, --bytes print sizes in bytes rather than in human readable format\n"
msgid " -B, --bytes print sizes in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n"
-#: sys-utils/lscpu.c:1169
+#: sys-utils/lscpu.c:1186
#, fuzzy
#| msgid " -e, --extended[=<list>] print out an extended readable format\n"
msgid " -C, --caches[=<list>] info about caches in extended readable format\n"
msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n"
-#: sys-utils/lscpu.c:1170
+#: sys-utils/lscpu.c:1187
msgid " -c, --offline print offline CPUs only\n"
msgstr " -c, --offline 只打印离线 CPU\n"
-#: sys-utils/lscpu.c:1171
+#: sys-utils/lscpu.c:1188
#, fuzzy
#| msgid " -J, --json use JSON output format\n"
msgid " -J, --json use JSON for default or extended format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: sys-utils/lscpu.c:1172
+#: sys-utils/lscpu.c:1189
msgid " -e, --extended[=<list>] print out an extended readable format\n"
msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n"
-#: sys-utils/lscpu.c:1173
+#: sys-utils/lscpu.c:1190
msgid " -p, --parse[=<list>] print out a parsable format\n"
msgstr " -p, --parse[=<列表>] 打印可解析格式\n"
-#: sys-utils/lscpu.c:1174
+#: sys-utils/lscpu.c:1191
msgid " -s, --sysroot <dir> use specified directory as system root\n"
msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
-#: sys-utils/lscpu.c:1175
+#: sys-utils/lscpu.c:1192
msgid " -x, --hex print hexadecimal masks rather than lists of CPUs\n"
msgstr " -x, --hex 打印十六进制掩码而非 CPU 列表\n"
-#: sys-utils/lscpu.c:1176
+#: sys-utils/lscpu.c:1193
msgid " -y, --physical print physical instead of logical IDs\n"
msgstr " -y, --physical 打印物理 ID 而非逻辑 ID\n"
-#: sys-utils/lscpu.c:1177
+#: sys-utils/lscpu.c:1194
+msgid " --hierarchic[=when] use subsections in summary (auto, never, always)\n"
+msgstr ""
+
+#: sys-utils/lscpu.c:1195
#, fuzzy
#| msgid " -O, --output-all output all columns\n"
msgid " --output-all print all available columns for -e, -p or -C\n"
msgstr " -O, --output-all 输出所有列\n"
-#: sys-utils/lscpu.c:1181
+#: sys-utils/lscpu.c:1199
#, fuzzy
#| msgid ""
#| "\n"
"\n"
"可用列(用于 -o):\n"
-#: sys-utils/lscpu.c:1185
+#: sys-utils/lscpu.c:1203
#, fuzzy
#| msgid ""
#| "\n"
"\n"
"可用列(用于 -o):\n"
-#: sys-utils/lscpu.c:1311
+#: sys-utils/lscpu.c:1319
+#, fuzzy
+#| msgid "unsupported --summary argument"
+msgid "unsupported --flat argument"
+msgstr "不支持的 --summary 参数"
+
+#: sys-utils/lscpu.c:1343
#, c-format
msgid "%s: options --all, --online and --offline may only be used with options --extended or --parse.\n"
msgstr "%s:--all、--online 和 --offline 选项只能与 --extended 或 --parse 选项一起使用。\n"
-#: sys-utils/lscpu-cputype.c:597
+#: sys-utils/lscpu-cputype.c:604
msgid "error: uname failed"
msgstr "错误:uname 失败"
-#: sys-utils/lscpu-cputype.c:694
+#: sys-utils/lscpu-cputype.c:711
#, c-format
msgid "failed to determine number of CPUs: %s"
msgstr "确定 CPU 数 失败:%s"
-#: sys-utils/lscpu-cputype.c:897
+#: sys-utils/lscpu-cputype.c:914
msgid "Failed to extract the node number"
msgstr "提取节点号失败"
msgid "Failed to initialize output column"
msgstr "初始化输出列失败"
-#: sys-utils/lsns.c:107
+#: sys-utils/lsns.c:117
msgid "namespace identifier (inode number)"
msgstr "名字空间标识符 (inode 号)"
-#: sys-utils/lsns.c:108
+#: sys-utils/lsns.c:118
msgid "kind of namespace"
msgstr "名字空间类型"
-#: sys-utils/lsns.c:109
+#: sys-utils/lsns.c:119
msgid "path to the namespace"
msgstr "名字空间路径"
-#: sys-utils/lsns.c:110
+#: sys-utils/lsns.c:120
msgid "number of processes in the namespace"
msgstr "名字空间中的进程数"
-#: sys-utils/lsns.c:111
+#: sys-utils/lsns.c:121
msgid "lowest PID in the namespace"
msgstr "名字空间中的最低 PID"
-#: sys-utils/lsns.c:112
+#: sys-utils/lsns.c:122
msgid "PPID of the PID"
msgstr "PID 的 PPID"
-#: sys-utils/lsns.c:113
+#: sys-utils/lsns.c:123
msgid "command line of the PID"
msgstr "PID 的命令行"
-#: sys-utils/lsns.c:114
+#: sys-utils/lsns.c:124
msgid "UID of the PID"
msgstr "PID 的 UID"
-#: sys-utils/lsns.c:115
+#: sys-utils/lsns.c:125
msgid "username of the PID"
msgstr "PID 的用户名"
-#: sys-utils/lsns.c:116
+#: sys-utils/lsns.c:126
msgid "namespace ID as used by network subsystem"
msgstr ""
-#: sys-utils/lsns.c:117
+#: sys-utils/lsns.c:127
msgid "nsfs mountpoint (usually used network subsystem)"
msgstr ""
-#: sys-utils/lsns.c:118
+#: sys-utils/lsns.c:128
#, fuzzy
#| msgid "namespace identifier (inode number)"
msgid "parent namespace identifier (inode number)"
msgstr "名字空间标识符 (inode 号)"
-#: sys-utils/lsns.c:119
+#: sys-utils/lsns.c:129
#, fuzzy
#| msgid "namespace identifier (inode number)"
msgid "owner namespace identifier (inode number)"
msgstr "名字空间标识符 (inode 号)"
-#: sys-utils/lsns.c:1208
+#: sys-utils/lsns.c:1285
#, c-format
msgid " %s [options] [<namespace>]\n"
msgstr " %s [选项] [<名字空间>]\n"
-#: sys-utils/lsns.c:1211
+#: sys-utils/lsns.c:1288
msgid "List system namespaces.\n"
msgstr "列出系统名字空间。\n"
-#: sys-utils/lsns.c:1219
+#: sys-utils/lsns.c:1296
+#, fuzzy
+#| msgid " -q, --quiet suppress output messages"
+msgid " -P, --persistent namespaces without processes\n"
+msgstr " -q, --quiet 禁止输出信息"
+
+#: sys-utils/lsns.c:1297
msgid " -p, --task <pid> print process namespaces\n"
msgstr " -p, --task <pid> 打印进程名字空间\n"
-#: sys-utils/lsns.c:1222
+#: sys-utils/lsns.c:1300
msgid " -W, --nowrap don't use multi-line representation\n"
msgstr " -W, --nowrap 不要使用多行表现\n"
-#: sys-utils/lsns.c:1223
+#: sys-utils/lsns.c:1301
#, fuzzy
#| msgid " -t, --type <name> namespace type (mnt, net, ipc, user, pid, uts, cgroup)\n"
msgid " -t, --type <name> namespace type (mnt, net, ipc, user, pid, uts, cgroup, time)\n"
msgstr " -t, --type <name> 名字空间类型(mnt, net, ipc, user, pid, uts, cgroup)\n"
-#: sys-utils/lsns.c:1224
+#: sys-utils/lsns.c:1302
#, fuzzy
#| msgid " --tree enable tree format output if possible\n"
msgid " -T, --tree <rel> use tree format (parent, owner, or process)\n"
msgstr " --tree 可能的话,启用树形格式化输出\n"
-#: sys-utils/lsns.c:1320
+#: sys-utils/lsns.c:1403
#, c-format
msgid "unknown namespace type: %s"
msgstr "未知的名字空间类型︰ %s"
-#: sys-utils/lsns.c:1340
+#: sys-utils/lsns.c:1423
#, fuzzy, c-format
#| msgid "unknown namespace type: %s"
msgid "unknown tree type: %s"
msgstr "未知的名字空间类型︰ %s"
-#: sys-utils/lsns.c:1362
+#: sys-utils/lsns.c:1445
msgid "--task is mutually exclusive with <namespace>"
msgstr "--task 与 <名字空间> 互斥"
-#: sys-utils/lsns.c:1363
+#: sys-utils/lsns.c:1446
msgid "invalid namespace argument"
msgstr "无效的名字空间参数"
-#: sys-utils/lsns.c:1393
+#: sys-utils/lsns.c:1476
#, fuzzy
#| msgid "--pty is not supported for your system"
msgid "--tree={parent|owner} is unsupported for your system"
msgstr "--pty 在您的系统上不受支持"
-#: sys-utils/lsns.c:1423
+#: sys-utils/lsns.c:1504
#, c-format
msgid "not found namespace: %ju"
msgstr "找不到名字空间︰ %ju"
msgid "%s from %s (libmount %s"
msgstr "%s,来自 %s(libmount %s"
-#: sys-utils/mount.c:128
+#: sys-utils/mount.c:130
msgid "failed to read mtab"
msgstr "读取 mtab 失败"
-#: sys-utils/mount.c:190 sys-utils/mount.c:257 sys-utils/umount.c:200
+#: sys-utils/mount.c:192 sys-utils/mount.c:259 sys-utils/umount.c:209
#, c-format
msgid "%-25s: ignored\n"
msgstr "%-25s:已忽略\n"
-#: sys-utils/mount.c:191
+#: sys-utils/mount.c:193
#, c-format
msgid "%-25s: already mounted\n"
msgstr "%-25s:已经挂载\n"
-#: sys-utils/mount.c:298
+#: sys-utils/mount.c:300
#, c-format
msgid "%s: %s moved to %s.\n"
msgstr "%s:%s 已移到 %s。\n"
-#: sys-utils/mount.c:300
+#: sys-utils/mount.c:302
#, c-format
msgid "%s: %s bound on %s.\n"
msgstr "%s:%s 已绑定到 %s 。\n"
-#: sys-utils/mount.c:303 sys-utils/mount.c:307
+#: sys-utils/mount.c:305 sys-utils/mount.c:309
#, c-format
msgid "%s: %s mounted on %s.\n"
msgstr "%s:%s 已挂臷到 %s。\n"
-#: sys-utils/mount.c:305
+#: sys-utils/mount.c:307
#, c-format
msgid "%s: %s propagation flags changed.\n"
msgstr "%s:%s 传播标志已更改。\n"
-#: sys-utils/mount.c:325
+#: sys-utils/mount.c:327
#, fuzzy, c-format
#| msgid ""
#| "mount: %s does not contain SELinux labels.\n"
" 受限制的应用程序可能会生成 AVC 消息,并被阻止访问该文件系统。\n"
" 更多详细信息请参阅 restorecon(8) 和 mount(8)。\n"
-#: sys-utils/mount.c:354
+#: sys-utils/mount.c:356
#, c-format
msgid ""
"mount: (hint) your fstab has been modified, but systemd still uses\n"
" the old version; use 'systemctl daemon-reload' to reload.\n"
msgstr ""
-#: sys-utils/mount.c:386
+#: sys-utils/mount.c:388
#, c-format
msgid " dmesg(1) may have more information after failed mount system call.\n"
msgstr ""
-#: sys-utils/mount.c:415
+#: sys-utils/mount.c:417
#, c-format
msgid "%s: failed to parse"
msgstr "%s:解析失败"
-#: sys-utils/mount.c:457
+#: sys-utils/mount.c:459
#, c-format
msgid "unsupported option format: %s"
msgstr "不支持的参数格式:%s"
-#: sys-utils/mount.c:463
+#: sys-utils/mount.c:465
#, c-format
msgid "failed to append option '%s'"
msgstr "追加选项“%s”失败"
-#: sys-utils/mount.c:483
+#: sys-utils/mount.c:486
#, c-format
msgid ""
" %1$s [-lhV]\n"
" %1$s [选项] <源> <目录>\n"
" %1$s <操作> <挂载点> [<目标>]\n"
-#: sys-utils/mount.c:491
+#: sys-utils/mount.c:494
msgid "Mount a filesystem.\n"
msgstr "挂载文件系统。\n"
-#: sys-utils/mount.c:495
-#, c-format
-msgid ""
-" -a, --all mount all filesystems mentioned in fstab\n"
-" -c, --no-canonicalize don't canonicalize paths\n"
-" -f, --fake dry run; skip the mount(2) syscall\n"
-" -F, --fork fork off for each device (use with -a)\n"
-" -T, --fstab <path> alternative file to /etc/fstab\n"
-msgstr ""
-" -a, --all 挂载 fstab 中的所有文件系统\n"
-" -c, --no-canonicalize 不对路径规范化\n"
-" -f, --fake 空运行;跳过 mount(2) 系统调用\n"
-" -F, --fork 对每个设备禁用 fork(和 -a 选项一起使用)\n"
-" -T, --fstab <路径> /etc/fstab 的替代文件\n"
+#: sys-utils/mount.c:497
+#, fuzzy
+#| msgid " -a, --all unmount all filesystems\n"
+msgid " -a, --all mount all filesystems mentioned in fstab\n"
+msgstr " -a, --all 卸载所有文件系统\n"
+
+#: sys-utils/mount.c:498 sys-utils/umount.c:94
+msgid " -c, --no-canonicalize don't canonicalize paths\n"
+msgstr " -c, --no-canonicalize 不对路径规范化\n"
+
+#: sys-utils/mount.c:499
+#, fuzzy
+#| msgid " --fake dry run; skip the umount(2) syscall\n"
+msgid " -f, --fake dry run; skip the mount(2) syscall\n"
+msgstr " --fake 空运行;跳过 umount(2) 系统调用\n"
+
+#: sys-utils/mount.c:500
+#, fuzzy
+#| msgid " -f, --force force hardlinking across filesystems"
+msgid " -F, --fork fork off for each device (use with -a)\n"
+msgstr " -f, --force 强制跨文件系统进行硬链接"
#: sys-utils/mount.c:501
-#, c-format
+#, fuzzy
+#| msgid " -a, --all trim all mounted filesystems that are supported\n"
+msgid " -T, --fstab <path> alternative file to /etc/fstab\n"
+msgstr " -a, --all 修剪不支持的所有已挂载文件系统\n"
+
+#: sys-utils/mount.c:502
msgid " -i, --internal-only don't call the mount.<type> helpers\n"
msgstr " -i, --internal-only 不调用 mount.<type> 辅助程序\n"
#: sys-utils/mount.c:503
-#, c-format
msgid " -l, --show-labels show also filesystem labels\n"
msgstr " -l, --show-labels 也显示文件系统标签\n"
-#: sys-utils/mount.c:505
-#, c-format
+#: sys-utils/mount.c:504
msgid " -m, --mkdir[=<mode>] alias to '-o X-mount.mkdir[=<mode>]'\n"
msgstr ""
-#: sys-utils/mount.c:507 sys-utils/umount.c:99
-#, c-format
+#: sys-utils/mount.c:505 sys-utils/umount.c:99
msgid " -n, --no-mtab don't write to /etc/mtab\n"
msgstr " -n, --no-mtab 不写 /etc/mtab\n"
-#: sys-utils/mount.c:509
-#, c-format
+#: sys-utils/mount.c:506
msgid ""
" --options-mode <mode>\n"
" what to do with options loaded from fstab\n"
+msgstr ""
+
+#: sys-utils/mount.c:508
+#, fuzzy
+#| msgid ""
+#| " --propagation slave|shared|private|unchanged\n"
+#| " modify mount propagation in mount namespace\n"
+msgid ""
" --options-source <source>\n"
" mount options source\n"
+msgstr ""
+" --propagation slave|shared|private|unchanged\n"
+" 修改 mount 名字空间中的 mount 传播\n"
+
+#: sys-utils/mount.c:510
+msgid ""
" --options-source-force\n"
" force use of options from fstab/mtab\n"
msgstr ""
-#: sys-utils/mount.c:516
-#, c-format
-msgid ""
-" -o, --options <list> comma-separated list of mount options\n"
-" -O, --test-opts <list> limit the set of filesystems (use with -a)\n"
-" -r, --read-only mount the filesystem read-only (same as -o ro)\n"
-" -t, --types <list> limit the set of filesystem types\n"
+#: sys-utils/mount.c:512
+#, fuzzy
+#| msgid " -P check filesystems in parallel, including root\n"
+msgid " --onlyonce check if filesystem is already mounted\n"
+msgstr " -P 并行检查文件系统,包括 root\n"
+
+#: sys-utils/mount.c:513
+#, fuzzy
+#| msgid " -o, --options <list> comma-separated list of swap options\n"
+msgid " -o, --options <list> comma-separated list of mount options\n"
+msgstr " -o, --options <列表> 以英文逗号分隔的 swap 选项\n"
+
+#: sys-utils/mount.c:514 sys-utils/umount.c:101
+msgid " -O, --test-opts <list> limit the set of filesystems (use with -a)\n"
+msgstr " -O, --test-opts <列表> 限制文件系统集合(和 -a 选项一起使用)\n"
+
+#: sys-utils/mount.c:515
+#, fuzzy
+#| msgid " -r, --read-only forced open cfdisk in read-only mode\n"
+msgid " -r, --read-only mount the filesystem read-only (same as -o ro)\n"
+msgstr " -r, --read-only 强制以只读模式打开 cfdisk\n"
+
+#: sys-utils/mount.c:516 sys-utils/umount.c:104
+msgid " -t, --types <list> limit the set of filesystem types\n"
+msgstr " -t, --types <列表> 限制文件系统集合\n"
+
+#: sys-utils/mount.c:517
+#, fuzzy
+#| msgid ""
+#| " --source <src> explicitly specifies source (path, label, uuid)\n"
+#| " --target <target> explicitly specifies mountpoint\n"
+msgid " --source <src> explicitly specifies source (path, label, uuid)\n"
msgstr ""
-" -o, --options <列表> 挂载选项列表,以英文逗号分隔\n"
-" -O, --test-opts <列表> 限制文件系统集合(和 -a 选项一起使用)\n"
-" -r, --read-only 以只读方式挂载文件系统(同 -o ro)\n"
-" -t, --types <列表> 限制文件系统类型集合\n"
+" --source <源> 指明源(路径、标签、uuid)\n"
+" --target <目标> 指明挂载点\n"
-#: sys-utils/mount.c:521
-#, c-format
-msgid ""
-" --source <src> explicitly specifies source (path, label, uuid)\n"
-" --target <target> explicitly specifies mountpoint\n"
+#: sys-utils/mount.c:518
+#, fuzzy
+#| msgid ""
+#| " --source <src> explicitly specifies source (path, label, uuid)\n"
+#| " --target <target> explicitly specifies mountpoint\n"
+msgid " --target <target> explicitly specifies mountpoint\n"
msgstr ""
" --source <源> 指明源(路径、标签、uuid)\n"
" --target <目标> 指明挂载点\n"
-#: sys-utils/mount.c:524
-#, fuzzy, c-format
+#: sys-utils/mount.c:519
+#, fuzzy
#| msgid " --default use default terminal settings\n"
msgid ""
" --target-prefix <path>\n"
" specifies path used for all mountpoints\n"
msgstr " --default 使用默认终端设置\n"
-#: sys-utils/mount.c:527 sys-utils/umount.c:105
-#, c-format
+#: sys-utils/mount.c:521 sys-utils/umount.c:105
msgid " -v, --verbose say what is being done\n"
msgstr " -v, --verbose 打印当前进行的操作\n"
-#: sys-utils/mount.c:529
-#, c-format
+#: sys-utils/mount.c:522
msgid " -w, --rw, --read-write mount the filesystem read-write (default)\n"
msgstr " -w, --rw, --read-write 以读写方式挂载文件系统(默认)\n"
-#: sys-utils/mount.c:531
-#, fuzzy, c-format
+#: sys-utils/mount.c:523
+#, fuzzy
#| msgid " -S, --setuid <uid> set uid in entered namespace\n"
msgid " -N, --namespace <ns> perform mount in another namespace\n"
msgstr " -S, --setuid <uid> 设置进入空间中的 uid\n"
+#: sys-utils/mount.c:529
+#, fuzzy
+#| msgid "Resource"
+msgid "Source:\n"
+msgstr "资源"
+
+#: sys-utils/mount.c:530
+#, fuzzy
+#| msgid " -s, --size <size> device size\n"
+msgid " -L, --label <label> synonym for LABEL=<label>\n"
+msgstr " -s, --size <尺寸> 设备尺寸\n"
+
+#: sys-utils/mount.c:531
+#, fuzzy
+#| msgid " -U, --uuid <uuid> convert UUID to device name\n"
+msgid " -U, --uuid <uuid> synonym for UUID=<uuid>\n"
+msgstr " -U, --uuid <uuid> 将 UUID 转换为设备名\n"
+
+#: sys-utils/mount.c:532
+#, fuzzy
+#| msgid " -L, --label LABEL specify label\n"
+msgid " LABEL=<label> specifies device by filesystem label\n"
+msgstr " -L, --label 标签 指定标签\n"
+
+#: sys-utils/mount.c:533
+msgid " UUID=<uuid> specifies device by filesystem UUID\n"
+msgstr ""
+
+#: sys-utils/mount.c:534
+msgid " PARTLABEL=<label> specifies device by partition label\n"
+msgstr ""
+
+#: sys-utils/mount.c:535
+msgid " PARTUUID=<uuid> specifies device by partition UUID\n"
+msgstr ""
+
+#: sys-utils/mount.c:536
+#, fuzzy
+#| msgid " <dev> device (usually disk) path\n"
+msgid " ID=<id> specifies device by udev hardware ID\n"
+msgstr " <设备> 设备(通常是磁盘)的路径\n"
+
#: sys-utils/mount.c:537
-#, fuzzy, c-format
+#, fuzzy
+#| msgid " <dev> device (usually disk) path\n"
+msgid " <device> specifies device by path\n"
+msgstr " <设备> 设备(通常是磁盘)的路径\n"
+
+#: sys-utils/mount.c:538
+msgid " <directory> mountpoint for bind mounts (see --bind/rbind)\n"
+msgstr ""
+
+#: sys-utils/mount.c:539
+#, fuzzy
+#| msgid " -f, --file <file> use a specific file instead of %s\n"
+msgid " <file> regular file for loopdev setup\n"
+msgstr " -F, --file <文件> 用指定文件代替 %s\n"
+
+#: sys-utils/mount.c:542
+#, fuzzy
#| msgid ""
#| "\n"
-#| "Source:\n"
-#| " -L, --label <label> synonym for LABEL=<label>\n"
-#| " -U, --uuid <uuid> synonym for UUID=<uuid>\n"
-#| " LABEL=<label> specifies device by filesystem label\n"
-#| " UUID=<uuid> specifies device by filesystem UUID\n"
-#| " PARTLABEL=<label> specifies device by partition label\n"
-#| " PARTUUID=<uuid> specifies device by partition UUID\n"
-msgid ""
-"\n"
-"Source:\n"
-" -L, --label <label> synonym for LABEL=<label>\n"
-" -U, --uuid <uuid> synonym for UUID=<uuid>\n"
-" LABEL=<label> specifies device by filesystem label\n"
-" UUID=<uuid> specifies device by filesystem UUID\n"
-" PARTLABEL=<label> specifies device by partition label\n"
-" PARTUUID=<uuid> specifies device by partition UUID\n"
-" ID=<id> specifies device by udev hardware ID\n"
+#| "Options:\n"
+msgid "Operations:\n"
msgstr ""
"\n"
-"源:\n"
-" -L, --label <标签> 同 LABEL=<label>\n"
-" -U, --uuid <uuid> 同 UUID=<uuid>\n"
-" LABEL=<标签> 按文件系统标签指定设备\n"
-" UUID=<uuid> 按文件系统 UUID 指定设备\n"
-" PARTLABEL=<标签> 按分区标签指定设备\n"
-" PARTUUID=<uuid> 按分区 UUID 指定设备\n"
+"选项:\n"
+
+#: sys-utils/mount.c:543
+#, fuzzy
+#| msgid " -c, --content compare only contents, ignore permission, etc."
+msgid " -B, --bind mount a subtree somewhere else (same as -o bind)\n"
+msgstr " -c, --content 只比较内容,忽略权限等其它信息"
+
+#: sys-utils/mount.c:544
+#, fuzzy
+#| msgid " -n, --net unshare network namespace\n"
+msgid " -M, --move move a subtree to some other place\n"
+msgstr " -n, --net 取消共享网络名字空间\n"
+
+#: sys-utils/mount.c:545
+#, fuzzy
+#| msgid " -m, --mount unshare mounts namespace\n"
+msgid " -R, --rbind mount a subtree and all submounts somewhere else\n"
+msgstr " -m, --mount 取消共享挂载名字空间\n"
+
+#: sys-utils/mount.c:546
+#, fuzzy
+#| msgid " -s, --shared get a shared lock\n"
+msgid " --make-shared mark a subtree as shared\n"
+msgstr " -s, --shared 获取共享锁\n"
#: sys-utils/mount.c:547
-#, c-format
-msgid ""
-" <device> specifies device by path\n"
-" <directory> mountpoint for bind mounts (see --bind/rbind)\n"
-" <file> regular file for loopdev setup\n"
-msgstr ""
-" <设备> 按路径指定设备\n"
-" <目录> 绑定式挂载的挂载点(参阅 --bind/rbind)\n"
-" <文件> 用于设置回环设备的常规文件\n"
+#, fuzzy
+#| msgid " -s, --shared get a shared lock\n"
+msgid " --make-slave mark a subtree as slave\n"
+msgstr " -s, --shared 获取共享锁\n"
-#: sys-utils/mount.c:552
-#, c-format
-msgid ""
-"\n"
-"Operations:\n"
-" -B, --bind mount a subtree somewhere else (same as -o bind)\n"
-" -M, --move move a subtree to some other place\n"
-" -R, --rbind mount a subtree and all submounts somewhere else\n"
+#: sys-utils/mount.c:548
+msgid " --make-private mark a subtree as private\n"
msgstr ""
-"\n"
-"操作:\n"
-" -B, --bind 挂载其他位置的子树(同 -o bind)\n"
-" -M, --move 将子树移动到其他位置\n"
-" -R, --rbind 挂载其他位置的子树及其包含的所有子挂载(submount)\n"
-#: sys-utils/mount.c:557
-#, c-format
-msgid ""
-" --make-shared mark a subtree as shared\n"
-" --make-slave mark a subtree as slave\n"
-" --make-private mark a subtree as private\n"
-" --make-unbindable mark a subtree as unbindable\n"
+#: sys-utils/mount.c:549
+msgid " --make-unbindable mark a subtree as unbindable\n"
msgstr ""
-" --make-shared 将子树标记为 共享\n"
-" --make-slave 将子树标记为 从属\n"
-" --make-private 将子树标记为 私有\n"
-" --make-unbindable 将子树标记为 不可绑定\n"
-#: sys-utils/mount.c:562
-#, c-format
-msgid ""
-" --make-rshared recursively mark a whole subtree as shared\n"
-" --make-rslave recursively mark a whole subtree as slave\n"
-" --make-rprivate recursively mark a whole subtree as private\n"
-" --make-runbindable recursively mark a whole subtree as unbindable\n"
+#: sys-utils/mount.c:550
+#, fuzzy
+#| msgid " -s, --shared get a shared lock\n"
+msgid " --make-rshared recursively mark a whole subtree as shared\n"
+msgstr " -s, --shared 获取共享锁\n"
+
+#: sys-utils/mount.c:551
+#, fuzzy
+#| msgid " -R, --recursive recursively unmount a target with all its children\n"
+msgid " --make-rslave recursively mark a whole subtree as slave\n"
+msgstr " -R, --recursive 递归卸载目录及其子对象\n"
+
+#: sys-utils/mount.c:552
+#, fuzzy
+#| msgid " -R, --recursive recursively unmount a target with all its children\n"
+msgid " --make-rprivate recursively mark a whole subtree as private\n"
+msgstr " -R, --recursive 递归卸载目录及其子对象\n"
+
+#: sys-utils/mount.c:553
+msgid " --make-runbindable recursively mark a whole subtree as unbindable\n"
msgstr ""
-" --make-rshared 递归地将整个子树标记为 共享\n"
-" --make-rslave 递归地将整个子树标记为 从属\n"
-" --make-rprivate 递归地将整个子树标记为 私有\n"
-" --make-runbindable 递归地将整个子树标记为 不可绑定\n"
-#: sys-utils/mount.c:714 sys-utils/umount.c:511
+#: sys-utils/mount.c:704 sys-utils/umount.c:520
msgid "libmount context allocation failed"
msgstr "libmount 环境(context)分配失败"
-#: sys-utils/mount.c:776 sys-utils/umount.c:573
+#: sys-utils/mount.c:766 sys-utils/umount.c:582
msgid "failed to set options pattern"
msgstr "设置选项模式失败"
-#: sys-utils/mount.c:828 sys-utils/umount.c:590
+#: sys-utils/mount.c:818 sys-utils/umount.c:599
#, fuzzy, c-format
#| msgid "failed to set personality to %s"
msgid "failed to set target namespace to %s"
msgstr "无法将人格(personality)设置为 %s"
-#: sys-utils/mount.c:994
+#: sys-utils/mount.c:986
msgid "source specified more than once"
msgstr "源指定了多次"
msgid "%s is a mountpoint\n"
msgstr "%s 是一个挂载点\n"
-#: sys-utils/nsenter.c:75 sys-utils/setarch.c:99 sys-utils/unshare.c:654
+#: sys-utils/nsenter.c:78 sys-utils/setarch.c:139 sys-utils/unshare.c:643
#, c-format
msgid " %s [options] [<program> [<argument>...]]\n"
msgstr " %s [选项] [<程序> [<参数>...]]\n"
-#: sys-utils/nsenter.c:79
+#: sys-utils/nsenter.c:82
msgid "Run a program with namespaces of other processes.\n"
msgstr "以其他程序的名字空间运行某个程序。\n"
-#: sys-utils/nsenter.c:82
-#, fuzzy
-#| msgid " -a, --all print all devices\n"
+#: sys-utils/nsenter.c:85
msgid " -a, --all enter all namespaces\n"
-msgstr " -a, --all 打印所有设备\n"
+msgstr " -a, --all 进入所有名字空间\n"
-#: sys-utils/nsenter.c:83
+#: sys-utils/nsenter.c:86
msgid " -t, --target <pid> target process to get namespaces from\n"
msgstr " -t, --target <pid> 要获取名字空间的目标进程\n"
-#: sys-utils/nsenter.c:84
+#: sys-utils/nsenter.c:87
msgid " -m, --mount[=<file>] enter mount namespace\n"
msgstr " -m, --mount[=<文件>] 进入 mount 名字空间\n"
-#: sys-utils/nsenter.c:85
+#: sys-utils/nsenter.c:88
msgid " -u, --uts[=<file>] enter UTS namespace (hostname etc)\n"
msgstr " -u, --uts[=<文件>] 进入 UTS 名字空间(主机名等)\n"
-#: sys-utils/nsenter.c:86
+#: sys-utils/nsenter.c:89
msgid " -i, --ipc[=<file>] enter System V IPC namespace\n"
msgstr " -i, --ipc[=<文件>] 进入 System V IPC 名字空间\n"
-#: sys-utils/nsenter.c:87
+#: sys-utils/nsenter.c:90
msgid " -n, --net[=<file>] enter network namespace\n"
msgstr " -n, --net[=<文件>] 进入网络名字空间\n"
-#: sys-utils/nsenter.c:88
+#: sys-utils/nsenter.c:91
msgid " -p, --pid[=<file>] enter pid namespace\n"
msgstr " -p, --pid[=<文件>] 进入 pid 名字空间\n"
-#: sys-utils/nsenter.c:89
+#: sys-utils/nsenter.c:92
msgid " -C, --cgroup[=<file>] enter cgroup namespace\n"
msgstr " -C, --cgroup[=<文件>] 进入 cgroup 名字空间\n"
-#: sys-utils/nsenter.c:90
+#: sys-utils/nsenter.c:93
msgid " -U, --user[=<file>] enter user namespace\n"
msgstr " -U, --user[=<文件>] 进入用户名字空间\n"
-#: sys-utils/nsenter.c:91
+#: sys-utils/nsenter.c:94
#, fuzzy
#| msgid " -p, --pid[=<file>] enter pid namespace\n"
msgid " -T, --time[=<file>] enter time namespace\n"
msgstr " -p, --pid[=<文件>] 进入 pid 名字空间\n"
-#: sys-utils/nsenter.c:92
-msgid " -S, --setuid <uid> set uid in entered namespace\n"
+#: sys-utils/nsenter.c:95
+#, fuzzy
+#| msgid " -S, --setuid <uid> set uid in entered namespace\n"
+msgid " -S, --setuid[=<uid>] set uid in entered namespace\n"
msgstr " -S, --setuid <uid> 设置进入空间中的 uid\n"
-#: sys-utils/nsenter.c:93
-msgid " -G, --setgid <gid> set gid in entered namespace\n"
+#: sys-utils/nsenter.c:96
+#, fuzzy
+#| msgid " -G, --setgid <gid> set gid in entered namespace\n"
+msgid " -G, --setgid[=<gid>] set gid in entered namespace\n"
msgstr " -G, --setgid <gid> 设置进入名字空间中的 gid\n"
-#: sys-utils/nsenter.c:94
+#: sys-utils/nsenter.c:97
msgid " --preserve-credentials do not touch uids or gids\n"
msgstr " --preserve-credentials 不干涉 uid 或 gid\n"
-#: sys-utils/nsenter.c:95
+#: sys-utils/nsenter.c:98
msgid " -r, --root[=<dir>] set the root directory\n"
msgstr " -r, --root[=<目录>] 设置根目录\n"
-#: sys-utils/nsenter.c:96
+#: sys-utils/nsenter.c:99
msgid " -w, --wd[=<dir>] set the working directory\n"
msgstr " -w, --wd[=<dir>] 设置工作目录\n"
-#: sys-utils/nsenter.c:97
+#: sys-utils/nsenter.c:100
#, fuzzy
#| msgid " -w, --wd[=<dir>] set the working directory\n"
-msgid " -W. --wdns <dir> set the working directory in namespace\n"
+msgid " -W, --wdns <dir> set the working directory in namespace\n"
msgstr " -w, --wd[=<dir>] 设置工作目录\n"
-#: sys-utils/nsenter.c:98
+#: sys-utils/nsenter.c:101
+#, fuzzy
+#| msgid " -e, --return return exit code of the child process\n"
+msgid " -e, --env inherit environment variables from target process\n"
+msgstr " -e, --return 返回子进程的退出值\n"
+
+#: sys-utils/nsenter.c:102
msgid " -F, --no-fork do not fork before exec'ing <program>\n"
msgstr " -F, --no-fork 执行 <程序> 前不 fork\n"
-#: sys-utils/nsenter.c:100
+#: sys-utils/nsenter.c:104
msgid " -Z, --follow-context set SELinux context according to --target PID\n"
msgstr " -Z, --follow-context 根据 --target PID 设置 SELinux 环境\n"
-#: sys-utils/nsenter.c:125
+#: sys-utils/nsenter.c:131
#, c-format
msgid "neither filename nor target pid supplied for %s"
msgstr "没有为 %s 提供文件名或目标 pid"
-#: sys-utils/nsenter.c:342 sys-utils/unshare.c:836 sys-utils/unshare.c:892
+#: sys-utils/nsenter.c:353 sys-utils/unshare.c:828 sys-utils/unshare.c:884
msgid "failed to parse uid"
msgstr "解析 uid 失败"
-#: sys-utils/nsenter.c:346 sys-utils/unshare.c:840 sys-utils/unshare.c:896
+#: sys-utils/nsenter.c:360 sys-utils/unshare.c:832 sys-utils/unshare.c:888
msgid "failed to parse gid"
msgstr "解析 gid 失败"
-#: sys-utils/nsenter.c:389
+#: sys-utils/nsenter.c:406
msgid "no target PID specified for --follow-context"
msgstr "没有为 --follow-context 设置目标 PID"
-#: sys-utils/nsenter.c:391
+#: sys-utils/nsenter.c:408
#, c-format
msgid "failed to get %d SELinux context"
msgstr "未能获取 %d SELinux 环境"
-#: sys-utils/nsenter.c:394
+#: sys-utils/nsenter.c:411
#, c-format
msgid "failed to set exec context to '%s'"
msgstr "向“%s”设置 exec 环境失败"
-#: sys-utils/nsenter.c:401
+#: sys-utils/nsenter.c:418
#, fuzzy
#| msgid "no target PID specified for --follow-context"
msgid "no target PID specified for --all"
msgstr "没有为 --follow-context 设置目标 PID"
-#: sys-utils/nsenter.c:461
+#: sys-utils/nsenter.c:482
#, c-format
msgid "reassociate to namespace '%s' failed"
msgstr "重新关联到名字空间“%s”失败"
-#: sys-utils/nsenter.c:477 sys-utils/nsenter.c:500
+#: sys-utils/nsenter.c:498 sys-utils/nsenter.c:521
msgid "cannot open current working directory"
msgstr "打不开当前工作目录"
-#: sys-utils/nsenter.c:484
+#: sys-utils/nsenter.c:505
msgid "change directory by root file descriptor failed"
msgstr "根据 root 文件描述符 更改目录失败"
-#: sys-utils/nsenter.c:487
+#: sys-utils/nsenter.c:508
msgid "chroot failed"
msgstr "chroot 失败"
-#: sys-utils/nsenter.c:507
+#: sys-utils/nsenter.c:528
msgid "change directory by working directory file descriptor failed"
msgstr "按工作目录文件描述符更改目录失败"
-#: sys-utils/nsenter.c:518 sys-utils/setpriv.c:1025 sys-utils/setpriv.c:1032
-#: sys-utils/unshare.c:1062
+#: sys-utils/nsenter.c:537
+#, fuzzy
+#| msgid "failed to set the %s environment variable"
+msgid "failed to get environment variables"
+msgstr "设置环境变量 %s 失败"
+
+#: sys-utils/nsenter.c:540
+#, fuzzy
+#| msgid "failed to set the %s environment variable"
+msgid "failed to set environment variables"
+msgstr "设置环境变量 %s 失败"
+
+#: sys-utils/nsenter.c:549
+#, fuzzy
+#| msgid "cannot process %s"
+msgid "can not get process stat"
+msgstr "无法处理 %s"
+
+#: sys-utils/nsenter.c:565 sys-utils/setpriv.c:1025 sys-utils/setpriv.c:1032
+#: sys-utils/unshare.c:1085
msgid "setgroups failed"
msgstr "setgroups 失败"
msgstr "进程组 ID"
#: sys-utils/renice.c:62
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| " %1$s [-n] <priority> [-p|--pid] <pid>...\n"
+#| " %1$s [-n] <priority> -g|--pgrp <pgid>...\n"
+#| " %1$s [-n] <priority> -u|--user <user>...\n"
msgid ""
-" %1$s [-n] <priority> [-p|--pid] <pid>...\n"
-" %1$s [-n] <priority> -g|--pgrp <pgid>...\n"
-" %1$s [-n] <priority> -u|--user <user>...\n"
+" %1$s [-n|--priority|--relative] <priority> [-p|--pid] <pid>...\n"
+" %1$s [-n|--priority|--relative] <priority> -g|--pgrp <pgid>...\n"
+" %1$s [-n|--priority|--relative] <priority> -u|--user <user>...\n"
msgstr ""
" %1$s [-n] <优先级> [-p|--pid] <pid>...\n"
" %1$s [-n] <优先级> -g|--pgrp <pgid>...\n"
" %1$s [-n] <优先级> -u|--user <用户>...\n"
-#: sys-utils/renice.c:68
-msgid "Alter the priority of running processes.\n"
-msgstr "改变运行进程的优先级。 \n"
+#: sys-utils/renice.c:68
+msgid "Alter the priority of running processes.\n"
+msgstr "改变运行进程的优先级。 \n"
+
+#: sys-utils/renice.c:71
+#, fuzzy
+#| msgid " -n, --priority <num> specify the nice increment value\n"
+msgid " -n <num> specify the nice value\n"
+msgstr " -n, --priority <数字> 指定 nice 增量\n"
+
+#: sys-utils/renice.c:72
+#, fuzzy
+#| msgid " set vesa powersaving features\n"
+msgid " If POSIXLY_CORRECT flag is set in environment\n"
+msgstr " 设置 vesa 节能功能\n"
+
+#: sys-utils/renice.c:73
+#, fuzzy
+#| msgid " set vesa powersaving features\n"
+msgid " then the priority is 'relative' to current\n"
+msgstr " 设置 vesa 节能功能\n"
+
+#: sys-utils/renice.c:74
+#, fuzzy
+#| msgid " --store save current terminal settings as default\n"
+msgid " process priority. Otherwise it is 'absolute'.\n"
+msgstr " --store 将当前终端设置保存为默认值\n"
+
+#: sys-utils/renice.c:75
+#, fuzzy
+#| msgid " -n, --priority <num> specify the nice increment value\n"
+msgid " --priority <num> specify the 'absolute' nice value\n"
+msgstr " -n, --priority <数字> 指定 nice 增量\n"
-#: sys-utils/renice.c:71
+#: sys-utils/renice.c:76
#, fuzzy
#| msgid " -n, --priority <num> specify the nice increment value\n"
-msgid " -n, --priority <num> specify the nice value\n"
+msgid " --relative <num> specify the 'relative' nice value\n"
msgstr " -n, --priority <数字> 指定 nice 增量\n"
-#: sys-utils/renice.c:72
+#: sys-utils/renice.c:77
#, fuzzy
#| msgid " -p, --pid <id> interpret argument as process ID (default)\n"
msgid " -p, --pid interpret arguments as process ID (default)\n"
msgstr " -p, --pid <id> 将参数解释为进程 ID (默认)\n"
-#: sys-utils/renice.c:73
+#: sys-utils/renice.c:78
#, fuzzy
#| msgid " -g, --pgrp <id> interpret argument as process group ID\n"
msgid " -g, --pgrp interpret arguments as process group ID\n"
msgstr " -g, --pgrp <id> 将参数解释为进程组 ID\n"
-#: sys-utils/renice.c:74
+#: sys-utils/renice.c:79
#, fuzzy
#| msgid " -u, --user <name>|<id> interpret argument as username or user ID\n"
msgid " -u, --user interpret arguments as username or user ID\n"
msgstr " -u, --user <name>|<id> 将参数解释为 用户名 或 用户 ID\n"
-#: sys-utils/renice.c:86
+#: sys-utils/renice.c:91
#, c-format
msgid "failed to get priority for %d (%s)"
msgstr "获取 %d (%s) 的优先级失败"
-#: sys-utils/renice.c:99
+#: sys-utils/renice.c:110
#, c-format
msgid "failed to set priority for %d (%s)"
msgstr "设置 %d 的优先级失败(%s)"
-#: sys-utils/renice.c:104
+#: sys-utils/renice.c:115
#, c-format
msgid "%d (%s) old priority %d, new priority %d\n"
msgstr "%d (%s) 旧优先级为 %d,新优先级为 %d\n"
-#: sys-utils/renice.c:150
+#: sys-utils/renice.c:181
#, c-format
msgid "invalid priority '%s'"
msgstr "无效的优先级“%s”"
-#: sys-utils/renice.c:177
+#: sys-utils/renice.c:208
#, 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:186
+#: sys-utils/renice.c:217
#, c-format
msgid "bad %s value: %s"
msgstr "错误的 %s 值:%s"
msgid "disable rtc alarm interrupt failed"
msgstr "禁用 rtc 闹钟中断失败"
-#: sys-utils/setarch.c:48
+#: sys-utils/setarch.c:50
#, c-format
msgid "Switching on %s.\n"
msgstr "正在打开 %s。\n"
-#: sys-utils/setarch.c:97
+#: sys-utils/setarch.c:137
#, c-format
msgid " %s [<arch>] [options] [<program> [<argument>...]]\n"
msgstr " %s [<架构>] [选项] [<程序> [<参数>...]]\n"
-#: sys-utils/setarch.c:102
+#: sys-utils/setarch.c:142
msgid "Change the reported architecture and set personality flags.\n"
msgstr "更改报告的架构并设置人格标志(personality flag) 。\n"
-#: sys-utils/setarch.c:105
+#: sys-utils/setarch.c:145
msgid " -B, --32bit turns on ADDR_LIMIT_32BIT\n"
msgstr " -B, --32bit 开启 ADDR_LIMIT_32BIT\n"
-#: sys-utils/setarch.c:106
+#: sys-utils/setarch.c:146
msgid " -F, --fdpic-funcptrs makes function pointers point to descriptors\n"
msgstr " -F, --fdpic-funcptrs 将程序指针指向描述符\n"
-#: sys-utils/setarch.c:107
+#: sys-utils/setarch.c:147
msgid " -I, --short-inode turns on SHORT_INODE\n"
msgstr " -I, --short-inode 开启 SHORT_INODE\n"
-#: sys-utils/setarch.c:108
+#: sys-utils/setarch.c:148
msgid " -L, --addr-compat-layout changes the way virtual memory is allocated\n"
msgstr " -L, --addr-compat-layout 更改虚拟内存分配的方式\n"
-#: sys-utils/setarch.c:109
+#: sys-utils/setarch.c:149
msgid " -R, --addr-no-randomize disables randomization of the virtual address space\n"
msgstr " -R, --addr-no-randomize 禁止随机化虚拟地址空间\n"
-#: sys-utils/setarch.c:110
+#: sys-utils/setarch.c:150
msgid " -S, --whole-seconds turns on WHOLE_SECONDS\n"
msgstr " -S, --whole-seconds 开启 WHOLE_SECONDS\n"
-#: sys-utils/setarch.c:111
+#: sys-utils/setarch.c:151
msgid " -T, --sticky-timeouts turns on STICKY_TIMEOUTS\n"
msgstr " -T, --sticky-timeouts 开启 STICKY_TIMEOUTS\n"
-#: sys-utils/setarch.c:112
+#: sys-utils/setarch.c:152
msgid " -X, --read-implies-exec turns on READ_IMPLIES_EXEC\n"
msgstr " -X, --read-implies-exec 开启 READ_IMPLIES_EXEC\n"
-#: sys-utils/setarch.c:113
+#: sys-utils/setarch.c:153
msgid " -Z, --mmap-page-zero turns on MMAP_PAGE_ZERO\n"
msgstr " -Z, --mmap-page-zero 开启 MMAP_PAGE_ZERO\n"
-#: sys-utils/setarch.c:114
+#: sys-utils/setarch.c:154
msgid " -3, --3gb limits the used address space to a maximum of 3 GB\n"
msgstr " -3, --3gb 将用户地址空间限制为最多 3 GB\n"
-#: sys-utils/setarch.c:115
+#: sys-utils/setarch.c:155
msgid " --4gb ignored (for backward compatibility only)\n"
msgstr " --4gb 忽略(纯为兼容)\n"
-#: sys-utils/setarch.c:116
+#: sys-utils/setarch.c:156
msgid " --uname-2.6 turns on UNAME26\n"
msgstr " --uname-2.6 开启 UNAME26\n"
-#: sys-utils/setarch.c:117
+#: sys-utils/setarch.c:157
msgid " -v, --verbose say what options are being switched on\n"
msgstr " -v, --verbose 告知打开了哪些选项\n"
-#: sys-utils/setarch.c:120
+#: sys-utils/setarch.c:160
msgid " --list list settable architectures, and exit\n"
msgstr " --list 列出可设置的架构并退出\n"
-#: sys-utils/setarch.c:293
+#: sys-utils/setarch.c:161
+msgid " --show[=personality] show current or specific personality and exit\n"
+msgstr ""
+
+#: sys-utils/setarch.c:341
#, c-format
msgid "Kernel cannot set architecture to %s"
msgstr "内核不能设置为 %s 的架构"
-#: sys-utils/setarch.c:342
+#: sys-utils/setarch.c:406
+msgid "Can not get current kernel personality"
+msgstr ""
+
+#: sys-utils/setarch.c:459
msgid "Not enough arguments"
msgstr "参数不够"
-#: sys-utils/setarch.c:410
+#: sys-utils/setarch.c:527
msgid "unrecognized option '--list'"
msgstr "无法识别的“--list”选项"
-#: sys-utils/setarch.c:423
+#: sys-utils/setarch.c:536
+#, fuzzy
+#| msgid "mount ID"
+msgid "could not parse personality"
+msgstr "挂载 ID"
+
+#: sys-utils/setarch.c:540
+#, fuzzy
+#| msgid "unrecognized option '--list'"
+msgid "unrecognized option '--show'"
+msgstr "无法识别的“--list”选项"
+
+#: sys-utils/setarch.c:554
#, fuzzy
msgid "no architecture argument or personality flags specified"
msgstr "未指定架构参数"
-#: sys-utils/setarch.c:435
+#: sys-utils/setarch.c:566
#, c-format
msgid "%s: Unrecognized architecture"
msgstr "%s:未识别的架构"
-#: sys-utils/setarch.c:453
+#: sys-utils/setarch.c:584
#, c-format
msgid "failed to set personality to %s"
msgstr "无法将人格(personality)设置为 %s"
-#: sys-utils/setarch.c:465
+#: sys-utils/setarch.c:596
#, c-format
msgid "Execute command `%s'.\n"
msgstr "执行命令“%s”。\n"
msgstr " -s, --summary 显示已使用交换设备的摘要(已废弃)\n"
#: sys-utils/swapon.c:820
+#, fuzzy
+#| msgid " -a, --all trim all mounted filesystems that are supported\n"
+msgid " -T, --fstab <path> alternative file to /etc/fstab\n"
+msgstr " -a, --all 修剪不支持的所有已挂载文件系统\n"
+
+#: sys-utils/swapon.c:821
msgid " --show[=<columns>] display summary in definable table\n"
msgstr " --show[=<列>] 以可自定义的表格形式打印摘要\n"
-#: sys-utils/swapon.c:821
+#: sys-utils/swapon.c:822
msgid " --noheadings don't print table heading (with --show)\n"
msgstr " --noheadings 不打印表头(与 --show 合用)\n"
-#: sys-utils/swapon.c:822
+#: sys-utils/swapon.c:823
msgid " --raw use the raw output format (with --show)\n"
msgstr " --raw 使用原生输出格式(与 --show 合用)\n"
-#: sys-utils/swapon.c:823
+#: sys-utils/swapon.c:824
msgid " --bytes display swap size in bytes in --show output\n"
msgstr " --bytes 在 --show 输出中以字节数显示交换区大小\n"
-#: sys-utils/swapon.c:824
+#: sys-utils/swapon.c:825
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详尽模式\n"
-#: sys-utils/swapon.c:829
+#: sys-utils/swapon.c:830
msgid ""
"\n"
"The <spec> parameter:\n"
" <设备> 要使用设备的名称\n"
" <文件> 要使用文件的名称\n"
-#: sys-utils/swapon.c:839
+#: sys-utils/swapon.c:840
msgid ""
"\n"
"Available discard policy types (for --discard):\n"
" pages\t :对释放的页在重新使用前丢弃\n"
" * 如果未选择策略,则两者都将启用。(默认)\n"
-#: sys-utils/swapon.c:921
+#: sys-utils/swapon.c:923
msgid "failed to parse priority"
msgstr "解析优先级失败"
-#: sys-utils/swapon.c:940
+#: sys-utils/swapon.c:945
#, c-format
msgid "unsupported discard policy: %s"
msgstr "不支持的丢弃策略:%s"
" -A, --all-targets 卸载当前名字空间内指定设备\n"
" 对应的所有挂臷点\n"
-#: sys-utils/umount.c:94
-msgid " -c, --no-canonicalize don't canonicalize paths\n"
-msgstr " -c, --no-canonicalize 不对路径规范化\n"
-
#: sys-utils/umount.c:95
msgid " -d, --detach-loop if mounted loop device, also free this loop device\n"
msgstr " -d, --detach-loop 若挂臷了回环设备,也释放该回环设备\n"
msgid " -l, --lazy detach the filesystem now, clean up things later\n"
msgstr " -l, --lazy 立即断开文件系统,清理以后执行\n"
-#: sys-utils/umount.c:101
-msgid " -O, --test-opts <list> limit the set of filesystems (use with -a)\n"
-msgstr " -O, --test-opts <列表> 限制文件系统集合(和 -a 选项一起使用)\n"
-
#: sys-utils/umount.c:102
msgid " -R, --recursive recursively unmount a target with all its children\n"
msgstr " -R, --recursive 递归卸载目录及其子对象\n"
msgid " -r, --read-only in case unmounting fails, try to remount read-only\n"
msgstr " -r, --read-only 若卸载失败,尝试以只读方式重新挂臷\n"
-#: sys-utils/umount.c:104
-msgid " -t, --types <list> limit the set of filesystem types\n"
-msgstr " -t, --types <列表> 限制文件系统集合\n"
-
#: sys-utils/umount.c:106
msgid " -q, --quiet suppress 'not mounted' error messages\n"
msgstr " -q, --quiet 不要输出“未挂载”错误信息\n"
msgid "%s unmounted"
msgstr "%s 未挂载"
-#: sys-utils/umount.c:223
+#: sys-utils/umount.c:232
msgid "failed to set umount target"
msgstr "设置卸载目标失败"
-#: sys-utils/umount.c:256
+#: sys-utils/umount.c:265
msgid "libmount table allocation failed"
msgstr "libmount 表分配失败"
-#: sys-utils/umount.c:302 sys-utils/umount.c:394
+#: sys-utils/umount.c:311 sys-utils/umount.c:403
msgid "libmount iterator allocation failed"
msgstr "分配 libmount 迭代器失败!"
-#: sys-utils/umount.c:315
+#: sys-utils/umount.c:324
#, c-format
msgid "failed to get child fs of %s"
msgstr "获取 %s 的子文件系统失败"
-#: sys-utils/umount.c:357 sys-utils/umount.c:381
+#: sys-utils/umount.c:366 sys-utils/umount.c:390
#, c-format
msgid "%s: not found"
msgstr "%s:找不到"
-#: sys-utils/umount.c:388
+#: sys-utils/umount.c:397
#, c-format
msgid "%s: failed to determine source (--all-targets is unsupported on systems with regular mtab file)."
msgstr "%s:确定源失败(有常规 mtab 文件的系统不支持 --all-targets)"
-#: sys-utils/unshare.c:96
+#: sys-utils/unshare.c:98
#, c-format
msgid "unsupported --setgroups argument '%s'"
msgstr "不支持的 --setgroups 参数“%s”"
-#: sys-utils/unshare.c:117 sys-utils/unshare.c:132
+#: sys-utils/unshare.c:119 sys-utils/unshare.c:134
#, c-format
msgid "write failed %s"
msgstr "写失败:%s"
-#: sys-utils/unshare.c:155
+#: sys-utils/unshare.c:157
#, c-format
msgid "unsupported propagation mode: %s"
msgstr "不受支持的传播模式︰%s"
-#: sys-utils/unshare.c:164
+#: sys-utils/unshare.c:166
msgid "cannot change root filesystem propagation"
msgstr "无法更改根文件系统传播"
-#: sys-utils/unshare.c:195
+#: sys-utils/unshare.c:197
#, c-format
msgid "mount %s on %s failed"
msgstr "将 %s 挂载到 %s 失败"
-#: sys-utils/unshare.c:222
+#: sys-utils/unshare.c:224
msgid "failed to open /proc/self/timens_offsets"
msgstr "打开 /proc/self/timens_offsets 失败"
-#: sys-utils/unshare.c:225
+#: sys-utils/unshare.c:227
msgid "failed to write to /proc/self/timens_offsets"
msgstr "写入 /proc/self/timens_offsets 失败"
-#: sys-utils/unshare.c:292
+#: sys-utils/unshare.c:294
#, fuzzy
#| msgid "reset failed"
msgid "eventfd failed"
msgstr "reset 失败"
-#: sys-utils/unshare.c:302
+#: sys-utils/unshare.c:304
#, fuzzy
#| msgid "failed to read speed"
msgid "failed to read eventfd"
msgstr "读 速度 失败"
-#: sys-utils/unshare.c:391
-#, fuzzy
-#| msgid "mount ID"
-msgid "could not parse ID"
-msgstr "挂载 ID"
-
-#: sys-utils/unshare.c:409
-#, c-format
-msgid "too many elements for mapping '%s'"
-msgstr ""
-
-#: sys-utils/unshare.c:411
-#, c-format
-msgid "mapping '%s' contains only %d elements"
-msgstr ""
+#: sys-utils/unshare.c:402
+#, fuzzy, c-format
+#| msgid "invalid date '%s'"
+msgid "invalid mapping '%s'"
+msgstr "无效日期“%s”"
-#: sys-utils/unshare.c:446
+#: sys-utils/unshare.c:430
#, fuzzy, c-format
#| msgid "could not read: %s"
msgid "could not open '%s'"
msgstr "无法读取︰%s"
-#: sys-utils/unshare.c:471 sys-utils/unshare.c:477
+#: sys-utils/unshare.c:455 sys-utils/unshare.c:461
#, fuzzy
#| msgid "failed to parse uid"
msgid "failed to parse subid map"
msgstr "解析 uid 失败"
-#: sys-utils/unshare.c:486
+#: sys-utils/unshare.c:470
#, c-format
msgid "no line matching user \"%s\" in %s"
msgstr ""
-#: sys-utils/unshare.c:658
+#: sys-utils/unshare.c:647
msgid "Run a program with some namespaces unshared from the parent.\n"
msgstr "以某些未与父(进程)共享的名字空间运行某个程序。\n"
-#: sys-utils/unshare.c:661
+#: sys-utils/unshare.c:650
msgid " -m, --mount[=<file>] unshare mounts namespace\n"
msgstr " -m, --mount[=<文件>] 取消共享 mounts 名字空间\n"
-#: sys-utils/unshare.c:662
+#: sys-utils/unshare.c:651
msgid " -u, --uts[=<file>] unshare UTS namespace (hostname etc)\n"
msgstr " -u, --uts[=<文件>] 取消共享 UTS 名字空间(主机名等)\n"
-#: sys-utils/unshare.c:663
+#: sys-utils/unshare.c:652
msgid " -i, --ipc[=<file>] unshare System V IPC namespace\n"
msgstr " -i, --ipc[=<文件>] 取消共享 System V IPC 名字空间\n"
-#: sys-utils/unshare.c:664
+#: sys-utils/unshare.c:653
msgid " -n, --net[=<file>] unshare network namespace\n"
msgstr " -n, --net[=<file>] 取消共享网络名字空间\n"
-#: sys-utils/unshare.c:665
+#: sys-utils/unshare.c:654
msgid " -p, --pid[=<file>] unshare pid namespace\n"
msgstr " -p, --pid[=<文件>] 取消共享 pid 名字空间\n"
-#: sys-utils/unshare.c:666
+#: sys-utils/unshare.c:655
msgid " -U, --user[=<file>] unshare user namespace\n"
msgstr " -U, --user[=<文件>] 取消共享用户名字空间\n"
-#: sys-utils/unshare.c:667
+#: sys-utils/unshare.c:656
msgid " -C, --cgroup[=<file>] unshare cgroup namespace\n"
msgstr " -C, --cgroup[=<文件>] 取消共享 cgroup 名字空间\n"
-#: sys-utils/unshare.c:668
+#: sys-utils/unshare.c:657
msgid " -T, --time[=<file>] unshare time namespace\n"
msgstr " -T, --time[=<文件>] 取消共享时间名字空间\n"
-#: sys-utils/unshare.c:670
+#: sys-utils/unshare.c:659
msgid " -f, --fork fork before launching <program>\n"
msgstr " -f, --fork 在启动<程序>前 fork\n"
-#: sys-utils/unshare.c:671
+#: sys-utils/unshare.c:660
#, fuzzy
#| msgid " -r, --map-root-user map current user to root (implies --user)\n"
msgid " --map-user=<uid>|<name> map current user to uid (implies --user)\n"
msgstr " -r, --map-root-user 将当前用户映射为 root (连带打开 --user)\n"
-#: sys-utils/unshare.c:672
+#: sys-utils/unshare.c:661
#, fuzzy
#| msgid " -r, --map-root-user map current user to root (implies --user)\n"
msgid " --map-group=<gid>|<name> map current group to gid (implies --user)\n"
msgstr " -r, --map-root-user 将当前用户映射为 root (连带打开 --user)\n"
-#: sys-utils/unshare.c:673
+#: sys-utils/unshare.c:662
msgid " -r, --map-root-user map current user to root (implies --user)\n"
msgstr " -r, --map-root-user 将当前用户映射为 root (连带打开 --user)\n"
-#: sys-utils/unshare.c:674
+#: sys-utils/unshare.c:663
#, fuzzy
#| msgid " -r, --map-root-user map current user to root (implies --user)\n"
msgid " -c, --map-current-user map current user to itself (implies --user)\n"
msgstr " -r, --map-root-user 将当前用户映射为 root (连带打开 --user)\n"
-#: sys-utils/unshare.c:675
+#: sys-utils/unshare.c:664
#, fuzzy
#| msgid " -r, --map-root-user map current user to root (implies --user)\n"
msgid " --map-auto map users and groups automatically (implies --user)\n"
msgstr " -r, --map-root-user 将当前用户映射为 root (连带打开 --user)\n"
-#: sys-utils/unshare.c:676
+#: sys-utils/unshare.c:665
#, fuzzy
#| msgid " -r, --map-root-user map current user to root (implies --user)\n"
msgid ""
-" --map-users=<outeruid>,<inneruid>,<count>\n"
+" --map-users=<inneruid>:<outeruid>:<count>\n"
" map count users from outeruid to inneruid (implies --user)\n"
msgstr " -r, --map-root-user 将当前用户映射为 root (连带打开 --user)\n"
-#: sys-utils/unshare.c:678
+#: sys-utils/unshare.c:667
#, fuzzy
#| msgid " -r, --map-root-user map current user to root (implies --user)\n"
msgid ""
-" --map-groups=<outergid>,<innergid>,<count>\n"
+" --map-groups=<innergid>:<outergid>:<count>\n"
" map count groups from outergid to innergid (implies --user)\n"
msgstr " -r, --map-root-user 将当前用户映射为 root (连带打开 --user)\n"
-#: sys-utils/unshare.c:681
+#: sys-utils/unshare.c:670
msgid ""
" --kill-child[=<signame>] when dying, kill the forked child (implies --fork)\n"
" defaults to SIGKILL\n"
msgstr ""
-#: sys-utils/unshare.c:683
+#: sys-utils/unshare.c:672
#, fuzzy
#| msgid " --mount-proc[=<dir>] mount proc filesystem first (implies --mount)\n"
msgid " --mount-proc[=<dir>] mount proc filesystem first (implies --mount)\n"
msgstr " --mount-proc[=<目录>] 先挂载 proc 文件系统(连带打开 --mount)\n"
-#: sys-utils/unshare.c:684
+#: sys-utils/unshare.c:673
#, fuzzy
#| msgid ""
#| " --propagation slave|shared|private|unchanged\n"
" --propagation slave|shared|private|unchanged\n"
" 修改 mount 名字空间中的 mount 传播\n"
-#: sys-utils/unshare.c:686
+#: sys-utils/unshare.c:675
#, fuzzy
#| msgid " -s, --setgroups allow|deny control the setgroups syscall in user namespaces\n"
msgid " --setgroups allow|deny control the setgroups syscall in user namespaces\n"
msgstr " -s, --setgroups allow|deny 控制用户名字空间中的 setgroups 系统调用\n"
-#: sys-utils/unshare.c:687
+#: sys-utils/unshare.c:676
#, fuzzy
#| msgid " -a, --all print all devices\n"
msgid " --keep-caps retain capabilities granted in user namespaces\n"
msgstr " -a, --all 打印所有设备\n"
-#: sys-utils/unshare.c:689
+#: sys-utils/unshare.c:678
#, fuzzy
#| msgid " -r, --root[=<dir>] set the root directory\n"
msgid " -R, --root=<dir> run the command with root directory set to <dir>\n"
msgstr " -r, --root[=<目录>] 设置根目录\n"
-#: sys-utils/unshare.c:690
+#: sys-utils/unshare.c:679
#, fuzzy
#| msgid " -w, --wd=<dir>\t change working directory to <dir>\n"
msgid " -w, --wd=<dir> change working directory to <dir>\n"
msgstr " -w, --wd=<dir>\t 变更工作目录为 <dir>\n"
-#: sys-utils/unshare.c:691
+#: sys-utils/unshare.c:680
#, fuzzy
#| msgid " -S, --setuid <uid> set uid in entered namespace\n"
msgid " -S, --setuid <uid> set uid in entered namespace\n"
msgstr " -S, --setuid <uid> 设置进入空间中的 uid\n"
-#: sys-utils/unshare.c:692
+#: sys-utils/unshare.c:681
#, fuzzy
#| msgid " -G, --setgid <gid> set gid in entered namespace\n"
msgid " -G, --setgid <gid> set gid in entered namespace\n"
msgstr " -G, --setgid <gid> 设置进入名字空间中的 gid\n"
-#: sys-utils/unshare.c:693
+#: sys-utils/unshare.c:682
msgid " --monotonic <offset> set clock monotonic offset (seconds) in time namespaces\n"
msgstr ""
-#: sys-utils/unshare.c:694
+#: sys-utils/unshare.c:683
msgid " --boottime <offset> set clock boottime offset (seconds) in time namespaces\n"
msgstr ""
-#: sys-utils/unshare.c:906
+#: sys-utils/unshare.c:898
#, fuzzy
#| msgid "failed to parse offset"
msgid "failed to parse monotonic offset"
msgstr "解析偏移失败"
-#: sys-utils/unshare.c:910
+#: sys-utils/unshare.c:902
#, fuzzy
#| msgid "failed to parse offset"
msgid "failed to parse boottime offset"
msgstr "解析偏移失败"
-#: sys-utils/unshare.c:924
+#: sys-utils/unshare.c:916
msgid "options --monotonic and --boottime require unsharing of a time namespace (-t)"
msgstr ""
-#: sys-utils/unshare.c:938
+#: sys-utils/unshare.c:930
msgid "unshare failed"
msgstr "unshare 失败"
-#: sys-utils/unshare.c:955
+#: sys-utils/unshare.c:947
#, fuzzy
#| msgid "sigprocmask failed"
msgid "sigprocmask block failed"
msgstr "sigprocmask 失败"
-#: sys-utils/unshare.c:967
+#: sys-utils/unshare.c:953
+#, fuzzy
+#| msgid "pidfd_open() failed: %d"
+msgid "pidfd_open failed"
+msgstr "pidfd_open() 失败:%d"
+
+#: sys-utils/unshare.c:966
#, fuzzy
#| msgid "sigprocmask failed"
msgid "sigprocmask restore failed"
msgstr "sigprocmask 失败"
-#: sys-utils/unshare.c:1003
+#: sys-utils/unshare.c:1002
#, fuzzy
#| msgid "sigprocmask failed"
msgid "sigprocmask unblock failed"
msgstr "sigprocmask 失败"
-#: sys-utils/unshare.c:1007
+#: sys-utils/unshare.c:1006
msgid "child exit failed"
msgstr "子进程退出失败"
-#: sys-utils/unshare.c:1022
+#: sys-utils/unshare.c:1045
#, fuzzy
#| msgid "options --setgroups=allow and --map-root-user are mutually exclusive"
msgid "options --setgroups=allow and --map-group are mutually exclusive"
msgstr "--setgroups=allow 和 --map-root-user 选项是互斥的"
-#: sys-utils/unshare.c:1037
+#: sys-utils/unshare.c:1060
#, c-format
msgid "cannot change root directory to '%s'"
msgstr "无法更改根目录至“%s”"
-#: sys-utils/unshare.c:1041
+#: sys-utils/unshare.c:1064
#, c-format
msgid "cannot chdir to '%s'"
msgstr "无法更改目录(chdir)到“%s”"
-#: sys-utils/unshare.c:1053
+#: sys-utils/unshare.c:1076
#, fuzzy, c-format
#| msgid "cannot change root filesystem propagation"
msgid "cannot change %s filesystem propagation"
msgstr "无法更改根文件系统传播"
-#: sys-utils/unshare.c:1057
+#: sys-utils/unshare.c:1080
#, c-format
msgid "mount %s failed"
msgstr "挂载 %s 失败"
-#: sys-utils/unshare.c:1082
+#: sys-utils/unshare.c:1105
msgid "capget failed"
msgstr "capget 失败"
-#: sys-utils/unshare.c:1090
+#: sys-utils/unshare.c:1113
msgid "capset failed"
msgstr "capset 失败"
-#: sys-utils/unshare.c:1102
+#: sys-utils/unshare.c:1125
msgid "prctl(PR_CAP_AMBIENT) failed"
msgstr "prctl(PR_CAP_AMBIENT) 失败"
msgid "%s: failed to get information about watchdog"
msgstr "%s:获取看门狗信息失败"
-#: sys-utils/wdctl.c:607
+#: sys-utils/wdctl.c:609
#, c-format
msgid "cannot read information about %s"
msgstr "无法读取有关 %s 的信息"
-#: sys-utils/wdctl.c:618 sys-utils/wdctl.c:621 sys-utils/wdctl.c:624
+#: sys-utils/wdctl.c:620 sys-utils/wdctl.c:623 sys-utils/wdctl.c:626
#, c-format
msgid "%-14s %2i second\n"
msgid_plural "%-14s %2i seconds\n"
msgstr[0] "%-14s %2i 秒\n"
-#: sys-utils/wdctl.c:619
+#: sys-utils/wdctl.c:621
msgid "Timeout:"
msgstr "超时:"
-#: sys-utils/wdctl.c:622
+#: sys-utils/wdctl.c:624
msgid "Timeleft:"
msgstr "剩余时间:"
-#: sys-utils/wdctl.c:625
+#: sys-utils/wdctl.c:627
msgid "Pre-timeout:"
msgstr "预超时:"
-#: sys-utils/wdctl.c:631 sys-utils/wdctl.c:636
+#: sys-utils/wdctl.c:633 sys-utils/wdctl.c:638
#, fuzzy, c-format
#| msgid "%-14s %2i second\n"
#| msgid_plural "%-14s %2i seconds\n"
msgid "%-14s %s\n"
msgstr "%-14s %2i 秒\n"
-#: sys-utils/wdctl.c:631
+#: sys-utils/wdctl.c:633
#, fuzzy
#| msgid "Pre-timeout:"
msgid "Pre-timeout governor:"
msgstr "预超时:"
-#: sys-utils/wdctl.c:637
+#: sys-utils/wdctl.c:639
#, fuzzy
#| msgid ""
#| "\n"
"\n"
"可用的输出列:\n"
-#: sys-utils/wdctl.c:695
+#: sys-utils/wdctl.c:697
msgid "Device:"
msgstr "设备:"
-#: sys-utils/wdctl.c:697
+#: sys-utils/wdctl.c:699
msgid "Identity:"
msgstr "标识:"
-#: sys-utils/wdctl.c:699
+#: sys-utils/wdctl.c:701
msgid "version"
msgstr "版本:"
-#: sys-utils/wdctl.c:766
+#: sys-utils/wdctl.c:768
#, fuzzy
#| msgid "invalid timeout argument"
msgid "invalid pretimeout argument"
msgstr "无效的 timeout 超时参数"
-#: sys-utils/wdctl.c:820
+#: sys-utils/wdctl.c:822
msgid "No default device is available."
msgstr "无可用默认设备。"
msgid "%s: failed to set disksize (%ju bytes)"
msgstr "%s:设置磁盘大小失败(%ju 个字节)"
-#: term-utils/agetty.c:501
+#: term-utils/agetty.c:512
#, c-format
msgid "%s%s (automatic login)\n"
msgstr "%s%s (自动登录)\n"
-#: term-utils/agetty.c:558
+#: term-utils/agetty.c:569
#, c-format
msgid "%s: can't change root directory %s: %m"
msgstr "%s:无法更改根目录 %s:%m"
-#: term-utils/agetty.c:561
+#: term-utils/agetty.c:572
#, c-format
msgid "%s: can't change working directory %s: %m"
msgstr "%s:无法更改工作目录 %s:%m"
-#: term-utils/agetty.c:564
+#: term-utils/agetty.c:575
#, c-format
msgid "%s: can't change process priority: %m"
msgstr "%s:无法更改进程优先级:%m"
-#: term-utils/agetty.c:575
+#: term-utils/agetty.c:586
#, c-format
msgid "%s: can't exec %s: %m"
msgstr "%s:无法执行 %s:%m"
-#: term-utils/agetty.c:606 term-utils/agetty.c:953 term-utils/agetty.c:1184
-#: term-utils/agetty.c:1509 term-utils/agetty.c:1527 term-utils/agetty.c:1564
-#: term-utils/agetty.c:1574 term-utils/agetty.c:1616 term-utils/agetty.c:1977
-#: term-utils/agetty.c:2335 term-utils/agetty.c:2903
+#: term-utils/agetty.c:617 term-utils/agetty.c:961 term-utils/agetty.c:1192
+#: term-utils/agetty.c:1517 term-utils/agetty.c:1535 term-utils/agetty.c:1572
+#: term-utils/agetty.c:1582 term-utils/agetty.c:1624 term-utils/agetty.c:1985
+#: term-utils/agetty.c:2346 term-utils/agetty.c:2917
#, c-format
msgid "failed to allocate memory: %m"
msgstr "分配内存失败:%m"
-#: term-utils/agetty.c:783
+#: term-utils/agetty.c:791
msgid "invalid delay argument"
msgstr "无效的延迟参数"
-#: term-utils/agetty.c:821
+#: term-utils/agetty.c:829
msgid "invalid argument of --local-line"
msgstr "--local-line 选项参数无效"
-#: term-utils/agetty.c:840
+#: term-utils/agetty.c:848
msgid "invalid nice argument"
msgstr "无效的 nice 参数"
-#: term-utils/agetty.c:931
+#: term-utils/agetty.c:939
#, fuzzy, c-format
#| msgid "could not set terminal attributes"
msgid "could not get terminal name: %d"
msgstr "无法设置终端属性"
-#: term-utils/agetty.c:958
+#: term-utils/agetty.c:966
#, c-format
msgid "bad speed: %s"
msgstr "速度有误:%s"
-#: term-utils/agetty.c:960
+#: term-utils/agetty.c:968
msgid "too many alternate speeds"
msgstr "备选速度过多"
-#: term-utils/agetty.c:1067 term-utils/agetty.c:1071 term-utils/agetty.c:1124
+#: term-utils/agetty.c:1075 term-utils/agetty.c:1079 term-utils/agetty.c:1132
#, c-format
msgid "/dev/%s: cannot open as standard input: %m"
msgstr "/dev/%s:无法以标准输入打开:%m"
-#: term-utils/agetty.c:1090
+#: term-utils/agetty.c:1098
#, c-format
msgid "/dev/%s: not a character device"
msgstr "/dev/%s:不是字符设备"
-#: term-utils/agetty.c:1092
+#: term-utils/agetty.c:1100
#, c-format
msgid "/dev/%s: not a tty"
msgstr "/dev/%s:不是终端"
-#: term-utils/agetty.c:1096 term-utils/agetty.c:1128
+#: term-utils/agetty.c:1104 term-utils/agetty.c:1136
#, c-format
msgid "/dev/%s: cannot get controlling tty: %m"
msgstr "/dev/%s:无法获取控制 tty:%m"
-#: term-utils/agetty.c:1118
+#: term-utils/agetty.c:1126
#, c-format
msgid "/dev/%s: vhangup() failed: %m"
msgstr "/dev/%s:vhangup() 失败:%m"
-#: term-utils/agetty.c:1139
+#: term-utils/agetty.c:1147
#, c-format
msgid "%s: not open for read/write"
msgstr "%s:未打开(就)读/写"
-#: term-utils/agetty.c:1144
+#: term-utils/agetty.c:1152
#, c-format
msgid "/dev/%s: cannot set process group: %m"
msgstr "/dev/%s:无法设置进程组:%m"
-#: term-utils/agetty.c:1158
+#: term-utils/agetty.c:1166
#, c-format
msgid "%s: dup problem: %m"
msgstr "%s:dup 问题:%m"
-#: term-utils/agetty.c:1175
+#: term-utils/agetty.c:1183
#, c-format
msgid "%s: failed to get terminal attributes: %m"
msgstr "%s:获取终端属性失败:%m"
-#: term-utils/agetty.c:1406 term-utils/agetty.c:1435
+#: term-utils/agetty.c:1414 term-utils/agetty.c:1443
#, c-format
msgid "setting terminal attributes failed: %m"
msgstr "设置终端属性失败:%m"
-#: term-utils/agetty.c:1554
+#: term-utils/agetty.c:1562
msgid "cannot open os-release file"
msgstr "无法打开 os-release 文件"
-#: term-utils/agetty.c:1721
+#: term-utils/agetty.c:1729
#, c-format
msgid "failed to create reload file: %s: %m"
msgstr "未能创建 reload 文件︰%s:%m"
-#: term-utils/agetty.c:2041
+#: term-utils/agetty.c:2049
#, c-format
msgid "failed to get terminal attributes: %m"
msgstr "获取终端属性失败:%m"
-#: term-utils/agetty.c:2063
+#: term-utils/agetty.c:2071
msgid "[press ENTER to login]"
msgstr "[按 ENTER 键登录]"
-#: term-utils/agetty.c:2090
+#: term-utils/agetty.c:2099
msgid "Num Lock off"
msgstr "Num Lock 关"
-#: term-utils/agetty.c:2093
+#: term-utils/agetty.c:2102
msgid "Num Lock on"
msgstr "Num Lock 开"
-#: term-utils/agetty.c:2096
+#: term-utils/agetty.c:2105
msgid "Caps Lock on"
msgstr "Caps Lock 开"
-#: term-utils/agetty.c:2099
+#: term-utils/agetty.c:2108
msgid "Scroll Lock on"
msgstr "Scroll Lock 开"
-#: term-utils/agetty.c:2102
+#: term-utils/agetty.c:2111
#, c-format
msgid ""
"Hint: %s\n"
"提示:%s\n"
"\n"
-#: term-utils/agetty.c:2244
+#: term-utils/agetty.c:2255
#, c-format
msgid "%s: read: %m"
msgstr "%s:read:%m"
-#: term-utils/agetty.c:2311
+#: term-utils/agetty.c:2322
#, c-format
msgid "%s: input overrun"
msgstr "%s:输入过载"
-#: term-utils/agetty.c:2331 term-utils/agetty.c:2339
+#: term-utils/agetty.c:2342 term-utils/agetty.c:2350
#, c-format
msgid "%s: invalid character conversion for login name"
msgstr "%s:登录名字符转换无效"
-#: term-utils/agetty.c:2345
+#: term-utils/agetty.c:2356
#, c-format
msgid "%s: invalid character 0x%x in login name"
msgstr "%s:登录名中的字符 0x%x 无效"
-#: term-utils/agetty.c:2430
+#: term-utils/agetty.c:2441
#, c-format
msgid "%s: failed to set terminal attributes: %m"
msgstr "%s:设置终端属性失败:%m"
-#: term-utils/agetty.c:2475
+#: term-utils/agetty.c:2486
#, c-format
msgid ""
" %1$s [options] <line> [<baud_rate>,...] [<termtype>]\n"
" %1$s [选项] <线路> [<波特率>,...] [<终端类型>]\n"
" %1$s [选项] <波特率>,... <线路> [<终端类型>]\n"
-#: term-utils/agetty.c:2479
+#: term-utils/agetty.c:2490
msgid "Open a terminal and set its mode.\n"
msgstr "打开一个终端并设置其模式。\n"
-#: term-utils/agetty.c:2482
+#: term-utils/agetty.c:2493
msgid " -8, --8bits assume 8-bit tty\n"
msgstr " -8, --8bits 采用 8 位 tty\n"
-#: term-utils/agetty.c:2483
+#: term-utils/agetty.c:2494
msgid " -a, --autologin <user> login the specified user automatically\n"
msgstr " -a, --autologin <用户> 以指定用户自动登录\n"
-#: term-utils/agetty.c:2484
+#: term-utils/agetty.c:2495
msgid " -c, --noreset do not reset control mode\n"
msgstr " -c, --noreset 不重置控制模式\n"
-#: term-utils/agetty.c:2485
+#: term-utils/agetty.c:2496
msgid " -E, --remote use -r <hostname> for login(1)\n"
msgstr " -E, --remote 使用 -r <主机名> 选项调用 login(1)\n"
-#: term-utils/agetty.c:2486
+#: term-utils/agetty.c:2497
#, fuzzy
#| msgid " -f, --issue-file <file> display issue file\n"
msgid " -f, --issue-file <list> display issue files or directories\n"
msgstr " -f, --issue-file <文件> 指定要显示的预登录消息(issue)文件\n"
-#: term-utils/agetty.c:2487
+#: term-utils/agetty.c:2498
msgid " --show-issue display issue file and exit\n"
msgstr " --show-issue 显示预登录(issue)文件并退出\n"
-#: term-utils/agetty.c:2488
+#: term-utils/agetty.c:2499
msgid " -h, --flow-control enable hardware flow control\n"
msgstr " -h, --flow-control 启用硬件流控制\n"
-#: term-utils/agetty.c:2489
+#: term-utils/agetty.c:2500
msgid " -H, --host <hostname> specify login host\n"
msgstr " -H, --host <主机名> 指定登录主机\n"
-#: term-utils/agetty.c:2490
+#: term-utils/agetty.c:2501
msgid " -i, --noissue do not display issue file\n"
msgstr " -i, --noissue 不显示预登录消息(issue)文件\n"
-#: term-utils/agetty.c:2491
+#: term-utils/agetty.c:2502
msgid " -I, --init-string <string> set init string\n"
msgstr " -I, --init-string <字符串> 设置初始字符串\n"
-#: term-utils/agetty.c:2492
+#: term-utils/agetty.c:2503
msgid " -J --noclear do not clear the screen before prompt\n"
msgstr " -J --noclear 提示之前不清屏\n"
-#: term-utils/agetty.c:2493
+#: term-utils/agetty.c:2504
msgid " -l, --login-program <file> specify login program\n"
msgstr " -l, --login-program <文件> 指定登录程序\n"
-#: term-utils/agetty.c:2494
+#: term-utils/agetty.c:2505
msgid " -L, --local-line[=<mode>] control the local line flag\n"
msgstr " -L, --local-line[=<模式>] 控制本地线路标志\n"
-#: term-utils/agetty.c:2495
+#: term-utils/agetty.c:2506
msgid " -m, --extract-baud extract baud rate during connect\n"
msgstr " -m, --extract-baud 连接过程中提取波特率\n"
-#: term-utils/agetty.c:2496
+#: term-utils/agetty.c:2507
msgid " -n, --skip-login do not prompt for login\n"
msgstr " -n, --skip-login 不提示登录\n"
-#: term-utils/agetty.c:2497
+#: term-utils/agetty.c:2508
msgid " -N --nonewline do not print a newline before issue\n"
msgstr " -N --nonewline 预登录消息(issue)前不打印换行(newline)\n"
-#: term-utils/agetty.c:2498
+#: term-utils/agetty.c:2509
msgid " -o, --login-options <opts> options that are passed to login\n"
msgstr " -o, --login-options <选项> 传递给登录程序的选项\n"
-#: term-utils/agetty.c:2499
+#: term-utils/agetty.c:2510
msgid " -p, --login-pause wait for any key before the login\n"
msgstr " -p, --login-pause 登录前等待按下任意键来继续\n"
-#: term-utils/agetty.c:2500
+#: term-utils/agetty.c:2511
msgid " -r, --chroot <dir> change root to the directory\n"
msgstr " -r, --chroot <目录> 将根目录更改为指定目录\n"
-#: term-utils/agetty.c:2501
+#: term-utils/agetty.c:2512
msgid " -R, --hangup do virtually hangup on the tty\n"
msgstr " -R, --hangup 对 tty 执行虚拟挂起(virtual hangup)\n"
-#: term-utils/agetty.c:2502
+#: term-utils/agetty.c:2513
msgid " -s, --keep-baud try to keep baud rate after break\n"
msgstr " -s, --keep-baud 中断(break)后尝试保持波特率\n"
-#: term-utils/agetty.c:2503
+#: term-utils/agetty.c:2514
msgid " -t, --timeout <number> login process timeout\n"
msgstr " -t, --timeout <数字> 登录进程超时(秒)\n"
-#: term-utils/agetty.c:2504
+#: term-utils/agetty.c:2515
msgid " -U, --detect-case detect uppercase terminal\n"
msgstr " -U, --detect-case 检测纯大写终端\n"
-#: term-utils/agetty.c:2505
+#: term-utils/agetty.c:2516
msgid " -w, --wait-cr wait carriage-return\n"
msgstr " -w, --wait-cr 等待回车\n"
-#: term-utils/agetty.c:2506
+#: term-utils/agetty.c:2517
msgid " --nohints do not print hints\n"
msgstr " --nohints 不打印提示信息\n"
-#: term-utils/agetty.c:2507
+#: term-utils/agetty.c:2518
msgid " --nohostname no hostname at all will be shown\n"
msgstr " --nohostname 将完全不显示主机名\n"
-#: term-utils/agetty.c:2508
+#: term-utils/agetty.c:2519
msgid " --long-hostname show full qualified hostname\n"
msgstr " --long-hostname 显示完全限定主机名\n"
-#: term-utils/agetty.c:2509
+#: term-utils/agetty.c:2520
msgid " --erase-chars <string> additional backspace chars\n"
msgstr " --erase-chars <字符串> 附加的退格字符\n"
-#: term-utils/agetty.c:2510
+#: term-utils/agetty.c:2521
msgid " --kill-chars <string> additional kill chars\n"
msgstr " --kill-chars <字符串> 附加的杀死(kill)字符\n"
-#: term-utils/agetty.c:2511
+#: term-utils/agetty.c:2522
msgid " --chdir <directory> chdir before the login\n"
msgstr " --chdir <目录> 登录前切换目录(chdir)\n"
-#: term-utils/agetty.c:2512
+#: term-utils/agetty.c:2523
msgid " --delay <number> sleep seconds before prompt\n"
msgstr " --delay <数字> 提示前睡眠的秒数\n"
-#: term-utils/agetty.c:2513
+#: term-utils/agetty.c:2524
msgid " --nice <number> run login with this priority\n"
msgstr " --nice <数字> 以指定优先级运行 login\n"
-#: term-utils/agetty.c:2514
+#: term-utils/agetty.c:2525
msgid " --reload reload prompts on running agetty instances\n"
msgstr " --reload 在运行 agetty 实例时重新载入提示\n"
-#: term-utils/agetty.c:2515
+#: term-utils/agetty.c:2526
msgid " --list-speeds display supported baud rates\n"
msgstr " --list-speeds 显示支持的波特率\n"
-#: term-utils/agetty.c:2860
+#: term-utils/agetty.c:2874
#, c-format
msgid "%d user"
msgid_plural "%d users"
msgstr[0] "%d 位用户"
-#: term-utils/agetty.c:2991
+#: term-utils/agetty.c:3004
#, c-format
msgid "checkname failed: %m"
msgstr "checkname 失败:%m"
-#: term-utils/agetty.c:3003
+#: term-utils/agetty.c:3016
#, c-format
msgid "cannot touch file %s"
msgstr "无法 touch 文件 %s"
-#: term-utils/agetty.c:3007
+#: term-utils/agetty.c:3020
msgid "--reload is unsupported on your system"
msgstr "您的系统不支持 --reload"
msgid "unsupported logging format: '%s'"
msgstr "不支持的日志格式:“%s”"
-#: term-utils/script.c:913
+#: term-utils/script.c:922
msgid "log multiple streams is mutually exclusive with 'classic' format"
msgstr "无法在使用“classic”(经典)格式时同时记录多个流"
-#: term-utils/script.c:940
+#: term-utils/script.c:949
#, c-format
msgid "Script started"
msgstr "脚本已启动"
-#: term-utils/script.c:942
+#: term-utils/script.c:951
#, c-format
msgid ", output log file is '%s'"
msgstr ",输出日志文件为“%s”"
-#: term-utils/script.c:944
+#: term-utils/script.c:953
#, c-format
msgid ", input log file is '%s'"
msgstr ",输入日志文件为“%s”"
-#: term-utils/script.c:946
+#: term-utils/script.c:955
#, c-format
msgid ", timing file is '%s'"
msgstr ",时序文件为“%s”"
-#: term-utils/script.c:947
+#: term-utils/script.c:956
#, c-format
msgid ".\n"
msgstr "。\n"
-#: term-utils/script.c:1053
+#: term-utils/script.c:1065
#, c-format
msgid "Script done.\n"
msgstr "脚本已完成。\n"
msgid "failed to allocate PTY handler"
msgstr "分配脚本处理程序失败"
-#: term-utils/scriptlive.c:363
+#: term-utils/scriptlive.c:365
#, c-format
msgid ""
"\n"
msgid "invalid timeout argument: %s"
msgstr "无效的超时参数:%s"
-#: term-utils/wall.c:361
+#: term-utils/wall.c:293
msgid "cannot get passwd uid"
msgstr "无法获取 passwd uid"
-#: term-utils/wall.c:385
+#: term-utils/wall.c:317
#, c-format
msgid "Broadcast message from %s@%s (%s) (%s):"
msgstr "来自 %s@%s (%s) (%s) 的广播消息:"
-#: term-utils/wall.c:417
+#: term-utils/wall.c:349
#, c-format
msgid "will not read %s - use stdin."
msgstr "将不读 %s - 使用 stdin。"
msgid "%s is logged in more than once; writing to %s"
msgstr "%s 登录了多次;将记入 %s"
-#: term-utils/write.c:237
-msgid "carefulputc failed"
-msgstr "carefulputc 失败"
-
-#: term-utils/write.c:279
+#: term-utils/write.c:265
#, 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:283
+#: term-utils/write.c:269
#, c-format
msgid "Message from %s@%s on %s at %02d:%02d ..."
msgstr "%s@%s 于 %s 在 %02d:%02d 发的消息..."
-#: term-utils/write.c:329
+#: term-utils/write.c:280
+msgid "carefulputc failed"
+msgstr "carefulputc 失败"
+
+#: term-utils/write.c:318
msgid "you have write permission turned off"
msgstr "您关闭了写权限"
-#: term-utils/write.c:352
+#: term-utils/write.c:341
#, c-format
msgid "%s is not logged in on %s"
msgstr "%s 未在 %s 上登录"
-#: term-utils/write.c:358
+#: term-utils/write.c:347
#, c-format
msgid "%s has messages disabled on %s"
msgstr "%s 在 %s 上禁用了消息"
msgid "bad -l argument"
msgstr "-l 参数有误"
-#: text-utils/colcrt.c:82 text-utils/column.c:661
+#: text-utils/colcrt.c:82 text-utils/column.c:748
#, c-format
msgid " %s [options] [<file>...]\n"
msgstr " %s [选项] [<文件>...]\n"
msgid "second argument"
msgstr "第二个参数"
-#: text-utils/column.c:236
+#: text-utils/column.c:282
msgid "failed to parse column"
msgstr "解析列失败"
-#: text-utils/column.c:246
+#: text-utils/column.c:291
#, c-format
msgid "undefined column name '%s'"
msgstr "未定义的列名称“%s”"
-#: text-utils/column.c:334
+#: text-utils/column.c:403
msgid "failed to parse --table-order list"
msgstr "解析 --table-order 列表失败"
-#: text-utils/column.c:410
+#: text-utils/column.c:481
+msgid "failed to parse --table-hide list"
+msgstr "解析 --table-hide 列表失败"
+
+#: text-utils/column.c:485
msgid "failed to parse --table-right list"
msgstr "解析 --table-right 列表失败"
-#: text-utils/column.c:414
+#: text-utils/column.c:489
msgid "failed to parse --table-trunc list"
msgstr "解析 --table-trunc 列表失败"
-#: text-utils/column.c:418
+#: text-utils/column.c:493
msgid "failed to parse --table-noextreme list"
msgstr "解析 --table-noextreme 列表失败"
-#: text-utils/column.c:422
+#: text-utils/column.c:497
msgid "failed to parse --table-wrap list"
msgstr "解析 --table-wrap 列表失败"
-#: text-utils/column.c:426
-msgid "failed to parse --table-hide list"
-msgstr "解析 --table-hide 列表失败"
-
-#: text-utils/column.c:463
+#: text-utils/column.c:549
#, c-format
msgid "line %zu: for JSON the name of the column %zu is required"
msgstr ""
-#: text-utils/column.c:479
+#: text-utils/column.c:566
msgid "failed to allocate output data"
msgstr "分配输出数据失败"
-#: text-utils/column.c:664
+#: text-utils/column.c:751
msgid "Columnate lists.\n"
msgstr "成列输出内容。\n"
-#: text-utils/column.c:667
+#: text-utils/column.c:754
msgid " -t, --table create a table\n"
msgstr " -t, --table 创建表格\n"
-#: text-utils/column.c:668
+#: text-utils/column.c:755
#, fuzzy
#| msgid " -n, --name <progname> the name under which errors are reported\n"
msgid " -n, --table-name <name> table name for JSON output\n"
msgstr " -n, --name <progname> 要报告其错误的程序名称\n"
-#: text-utils/column.c:669
+#: text-utils/column.c:756
#, fuzzy
#| msgid " -x, --sort <column> sort output by <column>\n"
msgid " -O, --table-order <columns> specify order of output columns\n"
msgstr " -x, --sort <列> 按<列>对输出排序\n"
-#: text-utils/column.c:670
+#: text-utils/column.c:757
+#, fuzzy
+#| msgid " -n, --noheadings don't print column headings\n"
+msgid " -C, --table-column <properties> define column\n"
+msgstr " -n, --noheadings 不打印列标题\n"
+
+#: text-utils/column.c:758
#, fuzzy
#| msgid " -o, --options <list> comma-separated list of swap options\n"
msgid " -N, --table-columns <names> comma separated columns names\n"
msgstr " -o, --options <列表> 以英文逗号分隔的 swap 选项\n"
-#: text-utils/column.c:671
+#: text-utils/column.c:759
#, fuzzy
#| msgid " -t, --streams <number> number of compression streams\n"
msgid " -l, --table-columns-limit <num> maximal number of input columns\n"
msgstr " -t, --streams <数字> 压缩流数量\n"
-#: text-utils/column.c:672
+#: text-utils/column.c:760
msgid " -E, --table-noextreme <columns> don't count long text from the columns to column width\n"
msgstr ""
-#: text-utils/column.c:673
+#: text-utils/column.c:761
#, fuzzy
#| msgid " -n, --noheadings don't print headings\n"
msgid " -d, --table-noheadings don't print header\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: text-utils/column.c:674
+#: text-utils/column.c:762
+#, fuzzy
+#| msgid " -a, --all enter all namespaces\n"
+msgid " -m, --table-maxout fill all available space\n"
+msgstr " -a, --all 进入所有名字空间\n"
+
+#: text-utils/column.c:763
msgid " -e, --table-header-repeat repeat header for each page\n"
msgstr ""
-#: text-utils/column.c:675
+#: text-utils/column.c:764
#, fuzzy
#| msgid " -n, --noheadings don't print column headings\n"
msgid " -H, --table-hide <columns> don't print the columns\n"
msgstr " -n, --noheadings 不打印列标题\n"
-#: text-utils/column.c:676
+#: text-utils/column.c:765
msgid " -R, --table-right <columns> right align text in these columns\n"
msgstr ""
-#: text-utils/column.c:677
+#: text-utils/column.c:766
#, fuzzy
#| msgid " -u, --notruncate don't truncate text in columns\n"
msgid " -T, --table-truncate <columns> truncate text in the columns when necessary\n"
msgstr " -u, --notruncate 不截断列中的文本\n"
-#: text-utils/column.c:678
+#: text-utils/column.c:767
msgid " -W, --table-wrap <columns> wrap text in the columns when necessary\n"
msgstr ""
-#: text-utils/column.c:679
+#: text-utils/column.c:768
#, fuzzy
#| msgid " -L, --table-empty-lines don't ignore empty lines\n"
msgid " -L, --keep-empty-lines don't ignore empty lines\n"
msgstr " -L, --table-empty-lines 不要忽略空行\n"
-#: text-utils/column.c:680
+#: text-utils/column.c:769
#, fuzzy
#| msgid " -J, --json use JSON --list output format\n"
msgid " -J, --json use JSON output format for table\n"
msgstr " -J, --json 使用 JSON --list 输出格式\n"
-#: text-utils/column.c:683
+#: text-utils/column.c:772
#, fuzzy
#| msgid " -O, --output <cols> specify columns to output for --list\n"
msgid " -r, --tree <column> column to use tree-like output for the table\n"
msgstr " -O, --output <列> 指定 --list 选项要输出的列\n"
-#: text-utils/column.c:684
+#: text-utils/column.c:773
#, fuzzy
#| msgid " -i, --irq <num> specify parallel port irq\n"
msgid " -i, --tree-id <column> line ID to specify child-parent relation\n"
msgstr " -i, --irq <数字> 指定并口中断号\n"
-#: text-utils/column.c:685
+#: text-utils/column.c:774
#, fuzzy
#| msgid " -N, --partno <num> specify partition number\n"
msgid " -p, --tree-parent <column> parent to specify child-parent relation\n"
msgstr " -N, --partno <数字> 指定分区号\n"
-#: text-utils/column.c:688
+#: text-utils/column.c:777
#, fuzzy
#| msgid " -c, --columns <width> width of output in number of characters\n"
msgid " -c, --output-width <width> width of output in number of characters\n"
msgstr " -c, --columns <宽度> 输出宽度(字符数)\n"
-#: text-utils/column.c:689
+#: text-utils/column.c:778
#, fuzzy
#| msgid ""
#| " -o, --output-separator <string>\n"
" -o, --output-separator <字符串>\n"
" 表格输出列分隔符,默认为两个空格\n"
-#: text-utils/column.c:690
+#: text-utils/column.c:779
#, fuzzy
#| msgid " -s, --separator <string> possible table delimiters\n"
msgid " -s, --separator <string> possible table delimiters\n"
msgstr " -s, --separator <字符串> 可用的表格分隔符\n"
-#: text-utils/column.c:691
+#: text-utils/column.c:780
#, fuzzy
#| msgid " -x, --fillrows fill rows before columns\n"
msgid " -x, --fillrows fill rows before columns\n"
msgstr " -x, --fillrows 先填充行,再填充列\n"
-#: text-utils/column.c:762
+#: text-utils/column.c:861
msgid "invalid columns argument"
msgstr "无效的 列数 参数"
-#: text-utils/column.c:787
+#: text-utils/column.c:887
#, fuzzy
#| msgid "invalid columns argument"
msgid "invalid columns limit argument"
msgstr "无效的 列数 参数"
-#: text-utils/column.c:789
+#: text-utils/column.c:889
msgid "columns limit must be greater than zero"
msgstr ""
-#: text-utils/column.c:792
+#: text-utils/column.c:892
msgid "failed to parse column names"
msgstr "解析列名称失败"
-#: text-utils/column.c:816
+#: text-utils/column.c:919
#, fuzzy
#| msgid "failed to allocate iterator"
msgid "failed to use input separator"
msgstr "分配迭代器失败"
-#: text-utils/column.c:849
+#: text-utils/column.c:952
msgid "options --tree-id and --tree-parent are required for tree formatting"
msgstr ""
-#: text-utils/column.c:857
+#: text-utils/column.c:960
msgid "option --table required for all --table-*"
msgstr "所有 --table-* 均需要 --table 选项"
-#: text-utils/column.c:860
-msgid "option --table-columns required for --json"
+#: text-utils/column.c:963
+#, fuzzy
+#| msgid "option --table-columns required for --json"
+msgid "option --table-columns or --table-column required for --json"
msgstr "使用 --json 需要 --table-columns 选项"
-#: text-utils/hexdump.c:162 text-utils/more.c:238
+#: text-utils/hexdump.c:162 text-utils/more.c:237
#, c-format
msgid " %s [options] <file>...\n"
msgstr " %s [选项] <文件>...\n"
msgid "bad conversion character %%%s"
msgstr "转换字符 %%%s 有误"
-#: text-utils/hexdump-parse.c:438
+#: text-utils/hexdump-parse.c:440
msgid "byte count with multiple conversion characters"
msgstr "对字符计数使用了多个转换字符"
msgid "Read one line.\n"
msgstr "读一行内容。\n"
-#: text-utils/more.c:241
+#: text-utils/more.c:240
#, fuzzy
-#| msgid "A file perusal filter for CRT viewing.\n"
-msgid "A file perusal filter for CRT viewing."
-msgstr "适合屏幕查看的文件阅读输出工具。\n"
+#| msgid "Discard the content of sectors on a device.\n"
+msgid "Display the contents of a file in a terminal."
+msgstr "丢弃一个设备上的扇区内容。\n"
-#: text-utils/more.c:244
+#: text-utils/more.c:243
#, fuzzy
#| msgid " -d display help instead of ringing bell\n"
msgid " -d, --silent display help instead of ringing bell"
msgstr " -d 显示帮助而非响铃\n"
-#: text-utils/more.c:245
+#: text-utils/more.c:244
#, fuzzy
#| msgid " -f count logical rather than screen lines\n"
msgid " -f, --logical count logical rather than screen lines"
msgstr " -f 计算逻辑行数,而非屏幕行数\n"
-#: text-utils/more.c:246
+#: text-utils/more.c:245
#, fuzzy
#| msgid " -l suppress pause after form feed\n"
msgid " -l, --no-pause suppress pause after form feed"
msgstr " -l 屏蔽换页(form feed)后的暂停\n"
-#: text-utils/more.c:247
+#: text-utils/more.c:246
#, fuzzy
#| msgid " -c do not scroll, display text and clean line ends\n"
msgid " -c, --print-over do not scroll, display text and clean line ends"
msgstr " -c 不滚动,显示文本并清理行末\n"
-#: text-utils/more.c:248
+#: text-utils/more.c:247
#, fuzzy
#| msgid " -p do not scroll, clean screen and display text\n"
msgid " -p, --clean-print do not scroll, clean screen and display text"
msgstr " -p 不滚动,清除屏幕并显示文本\n"
-#: text-utils/more.c:249
+#: text-utils/more.c:248
msgid " -e, --exit-on-eof exit on end-of-file"
msgstr ""
-#: text-utils/more.c:250
+#: text-utils/more.c:249
#, fuzzy
#| msgid " -s squeeze multiple blank lines into one\n"
msgid " -s, --squeeze squeeze multiple blank lines into one"
msgstr " -s 将多行空行压缩为一行\n"
-#: text-utils/more.c:251
+#: text-utils/more.c:250
#, fuzzy
#| msgid " -u suppress underlining\n"
msgid " -u, --plain suppress underlining and bold"
msgstr " -u 屏蔽下划线\n"
-#: text-utils/more.c:252
+#: text-utils/more.c:251
#, fuzzy
#| msgid " -<number> the number of lines per screenful\n"
msgid " -n, --lines <number> the number of lines per screenful"
msgstr " -<数字> 每屏的行数\n"
-#: text-utils/more.c:253
+#: text-utils/more.c:252
#, fuzzy
#| msgid " -<number> same as '-n <number>'\n"
msgid " -<number> same as --lines"
msgstr " -<数字> 同“-n <数字>”\n"
-#: text-utils/more.c:254
+#: text-utils/more.c:253
#, fuzzy
#| msgid " +<number> display file beginning from line number\n"
msgid " +<number> display file beginning from line number"
msgstr " +<数字> 从指定行开始显示文件\n"
-#: text-utils/more.c:255
+#: text-utils/more.c:254
#, fuzzy
#| msgid " +/<string> display file beginning from search string match\n"
msgid " +/<pattern> display file beginning from pattern match"
msgstr " +/<字符串> 从匹配搜索字符串的位置开始显示文件\n"
-#: text-utils/more.c:358
+#: text-utils/more.c:357
msgid "MORE environment variable"
msgstr "MORE 环境变量"
-#: text-utils/more.c:411
+#: text-utils/more.c:410
msgid "magic failed"
msgstr "魔数校验失败"
-#: text-utils/more.c:415 text-utils/more.c:434
+#: text-utils/more.c:414 text-utils/more.c:433
#, c-format
msgid ""
"\n"
"******** %s:不是文本文件 ********\n"
"\n"
-#: text-utils/more.c:468
+#: text-utils/more.c:467
#, c-format
msgid ""
"\n"
"*** %s:目录 ***\n"
"\n"
-#: text-utils/more.c:730
+#: text-utils/more.c:729
#, c-format
msgid "--More--"
msgstr "--更多--"
-#: text-utils/more.c:732
+#: text-utils/more.c:731
#, c-format
msgid "(Next file: %s)"
msgstr "(下个文件:%s)"
-#: text-utils/more.c:737 text-utils/more.c:743
+#: text-utils/more.c:736 text-utils/more.c:742
#, c-format
msgid "(END)"
msgstr ""
-#: text-utils/more.c:748
+#: text-utils/more.c:747
#, c-format
msgid "[Press space to continue, 'q' to quit.]"
msgstr "[按空格键继续,“q”键退出。]"
-#: text-utils/more.c:950
+#: text-utils/more.c:949
msgid ""
"\n"
"...Skipping "
"\n"
"...跳过 "
-#: text-utils/more.c:954
+#: text-utils/more.c:953
msgid "...Skipping to file "
msgstr "...跳到文件 "
-#: text-utils/more.c:956
+#: text-utils/more.c:955
msgid "...Skipping back to file "
msgstr "...将跳回文件 "
-#: text-utils/more.c:1118
+#: text-utils/more.c:1117
msgid "Line too long"
msgstr "行过长"
-#: text-utils/more.c:1161
+#: text-utils/more.c:1160
msgid "No previous command to substitute for"
msgstr "没有要替换的前一命令"
-#: text-utils/more.c:1190
+#: text-utils/more.c:1189
#, c-format
msgid "[Use q or Q to quit]"
msgstr "[使用 q 或 Q 退出]"
-#: text-utils/more.c:1276
+#: text-utils/more.c:1275
msgid "exec failed\n"
msgstr "exec 失败\n"
-#: text-utils/more.c:1286
+#: text-utils/more.c:1285
msgid "can't fork\n"
msgstr "无法 fork\n"
-#: text-utils/more.c:1442
+#: text-utils/more.c:1441
msgid "...skipping\n"
msgstr "...跳过\n"
-#: text-utils/more.c:1479
+#: text-utils/more.c:1478
msgid ""
"\n"
"Pattern not found\n"
"\n"
"未找到模式\n"
-#: text-utils/more.c:1483 text-utils/pg.c:1032 text-utils/pg.c:1180
+#: text-utils/more.c:1482 text-utils/pg.c:1032 text-utils/pg.c:1180
msgid "Pattern not found"
msgstr "找不到模式"
-#: text-utils/more.c:1501
+#: text-utils/more.c:1500
#, fuzzy
#| msgid ""
#| "\n"
"多数命令可在前面加整数参数 k。方括号中为参数的默认值\n"
"星号(*)表示参数将成为新的默认值。\n"
-#: text-utils/more.c:1507
+#: text-utils/more.c:1506
#, fuzzy, c-format
#| msgid ""
#| "<space> Display next k lines of text [current screen size]\n"
":f 显示当前文件名和行号\n"
". 重复前一命令\n"
-#: text-utils/more.c:1573
+#: text-utils/more.c:1572
#, c-format
msgid "...back %d page"
msgid_plural "...back %d pages"
msgstr[0] "...后退 %d 页"
-#: text-utils/more.c:1597
+#: text-utils/more.c:1596
#, c-format
msgid "...skipping %d line"
msgid_plural "...skipping %d lines"
msgstr[0] "...跳过 %d 行"
-#: text-utils/more.c:1697
+#: text-utils/more.c:1696
msgid ""
"\n"
"***Back***\n"
"***后退***\n"
"\n"
-#: text-utils/more.c:1716
+#: text-utils/more.c:1715
#, c-format
msgid "\"%s\" line %d"
msgstr "“%s”第 %d 行"
-#: text-utils/more.c:1719
+#: text-utils/more.c:1718
#, c-format
msgid "[Not a file] line %d"
msgstr "[不是文件] 第 %d 行"
-#: text-utils/more.c:1725
+#: text-utils/more.c:1724
msgid "No previous regular expression"
msgstr "无上一个正则表达式"
-#: text-utils/more.c:1794
+#: text-utils/more.c:1793
#, c-format
msgid "[Press 'h' for instructions.]"
msgstr "[按“h”键获取说明。]"
msgid "terminal `%s' is not known, defaulting to `dumb'"
msgstr "终端“%s”未知,将使用默认值“dumb”"
+#, c-format
+#~ msgid "chown failed: %s"
+#~ msgstr "chown 失败:%s"
+
+#, c-format
+#~ msgid "waitpid failed (%s)"
+#~ msgstr "waitpid 失败(%s)"
+
+#, c-format
+#~ msgid "Interrupted %s"
+#~ msgstr "中断的 %s"
+
#, fuzzy
-#~| msgid "child exit failed"
-#~ msgid "child kill failed"
-#~ msgstr "子进程退出失败"
+#~| msgid " -u, --notruncate don't truncate text in columns\n"
+#~ msgid " -u, --notruncate don't truncate text in columns\n"
+#~ msgstr " -u, --notruncate 不截断列中的文本\n"
+
+#, c-format
+#~ msgid "%s: BLKZEROOUT ioctl failed"
+#~ msgstr "%s: BLKZEROOUT ioctl 失败"
+
+#, c-format
+#~ msgid "%s: BLKSECDISCARD ioctl failed"
+#~ msgstr "%s:BLKSECDISCARD ioctl 失败"
+
+#, c-format
+#~ msgid "%s: BLKDISCARD ioctl failed"
+#~ msgstr "%s:BLKDISCARD ioctl 失败"
+
+#, c-format
+#~ msgid ""
+#~ " -a, --all mount all filesystems mentioned in fstab\n"
+#~ " -c, --no-canonicalize don't canonicalize paths\n"
+#~ " -f, --fake dry run; skip the mount(2) syscall\n"
+#~ " -F, --fork fork off for each device (use with -a)\n"
+#~ " -T, --fstab <path> alternative file to /etc/fstab\n"
+#~ msgstr ""
+#~ " -a, --all 挂载 fstab 中的所有文件系统\n"
+#~ " -c, --no-canonicalize 不对路径规范化\n"
+#~ " -f, --fake 空运行;跳过 mount(2) 系统调用\n"
+#~ " -F, --fork 对每个设备禁用 fork(和 -a 选项一起使用)\n"
+#~ " -T, --fstab <路径> /etc/fstab 的替代文件\n"
+
+#, c-format
+#~ msgid ""
+#~ " -o, --options <list> comma-separated list of mount options\n"
+#~ " -O, --test-opts <list> limit the set of filesystems (use with -a)\n"
+#~ " -r, --read-only mount the filesystem read-only (same as -o ro)\n"
+#~ " -t, --types <list> limit the set of filesystem types\n"
+#~ msgstr ""
+#~ " -o, --options <列表> 挂载选项列表,以英文逗号分隔\n"
+#~ " -O, --test-opts <列表> 限制文件系统集合(和 -a 选项一起使用)\n"
+#~ " -r, --read-only 以只读方式挂载文件系统(同 -o ro)\n"
+#~ " -t, --types <列表> 限制文件系统类型集合\n"
#, fuzzy, c-format
+#~| msgid ""
+#~| "\n"
+#~| "Source:\n"
+#~| " -L, --label <label> synonym for LABEL=<label>\n"
+#~| " -U, --uuid <uuid> synonym for UUID=<uuid>\n"
+#~| " LABEL=<label> specifies device by filesystem label\n"
+#~| " UUID=<uuid> specifies device by filesystem UUID\n"
+#~| " PARTLABEL=<label> specifies device by partition label\n"
+#~| " PARTUUID=<uuid> specifies device by partition UUID\n"
+#~ msgid ""
+#~ "\n"
+#~ "Source:\n"
+#~ " -L, --label <label> synonym for LABEL=<label>\n"
+#~ " -U, --uuid <uuid> synonym for UUID=<uuid>\n"
+#~ " LABEL=<label> specifies device by filesystem label\n"
+#~ " UUID=<uuid> specifies device by filesystem UUID\n"
+#~ " PARTLABEL=<label> specifies device by partition label\n"
+#~ " PARTUUID=<uuid> specifies device by partition UUID\n"
+#~ " ID=<id> specifies device by udev hardware ID\n"
+#~ msgstr ""
+#~ "\n"
+#~ "源:\n"
+#~ " -L, --label <标签> 同 LABEL=<label>\n"
+#~ " -U, --uuid <uuid> 同 UUID=<uuid>\n"
+#~ " LABEL=<标签> 按文件系统标签指定设备\n"
+#~ " UUID=<uuid> 按文件系统 UUID 指定设备\n"
+#~ " PARTLABEL=<标签> 按分区标签指定设备\n"
+#~ " PARTUUID=<uuid> 按分区 UUID 指定设备\n"
+
+#, c-format
+#~ msgid ""
+#~ " <device> specifies device by path\n"
+#~ " <directory> mountpoint for bind mounts (see --bind/rbind)\n"
+#~ " <file> regular file for loopdev setup\n"
+#~ msgstr ""
+#~ " <设备> 按路径指定设备\n"
+#~ " <目录> 绑定式挂载的挂载点(参阅 --bind/rbind)\n"
+#~ " <文件> 用于设置回环设备的常规文件\n"
+
+#, c-format
+#~ msgid ""
+#~ "\n"
+#~ "Operations:\n"
+#~ " -B, --bind mount a subtree somewhere else (same as -o bind)\n"
+#~ " -M, --move move a subtree to some other place\n"
+#~ " -R, --rbind mount a subtree and all submounts somewhere else\n"
+#~ msgstr ""
+#~ "\n"
+#~ "操作:\n"
+#~ " -B, --bind 挂载其他位置的子树(同 -o bind)\n"
+#~ " -M, --move 将子树移动到其他位置\n"
+#~ " -R, --rbind 挂载其他位置的子树及其包含的所有子挂载(submount)\n"
+
+#, c-format
+#~ msgid ""
+#~ " --make-shared mark a subtree as shared\n"
+#~ " --make-slave mark a subtree as slave\n"
+#~ " --make-private mark a subtree as private\n"
+#~ " --make-unbindable mark a subtree as unbindable\n"
+#~ msgstr ""
+#~ " --make-shared 将子树标记为 共享\n"
+#~ " --make-slave 将子树标记为 从属\n"
+#~ " --make-private 将子树标记为 私有\n"
+#~ " --make-unbindable 将子树标记为 不可绑定\n"
+
+#, c-format
+#~ msgid ""
+#~ " --make-rshared recursively mark a whole subtree as shared\n"
+#~ " --make-rslave recursively mark a whole subtree as slave\n"
+#~ " --make-rprivate recursively mark a whole subtree as private\n"
+#~ " --make-runbindable recursively mark a whole subtree as unbindable\n"
+#~ msgstr ""
+#~ " --make-rshared 递归地将整个子树标记为 共享\n"
+#~ " --make-rslave 递归地将整个子树标记为 从属\n"
+#~ " --make-rprivate 递归地将整个子树标记为 私有\n"
+#~ " --make-runbindable 递归地将整个子树标记为 不可绑定\n"
+
+#, fuzzy
+#~| msgid "A file perusal filter for CRT viewing.\n"
+#~ msgid "A file perusal filter for CRT viewing."
+#~ msgstr "适合屏幕查看的文件阅读输出工具。\n"
+
+#, fuzzy
#~| msgid "partitions: %d"
#~ msgid "Comparing %s to %s"
#~ msgstr "分区数:%d"
-#, fuzzy, c-format
+#, fuzzy
#~| msgid "closing %s failed"
#~ msgid "Visiting %s (file %zu)"
#~ msgstr "关闭 %s 失败"
#~ msgid " -v, --verbose display more details"
#~ msgstr " -v, --verbose 显示更多细节"
-#, c-format
#~ msgid " %s [options] COMMAND\n"
#~ msgstr " %s [选项] 命令\n"
#~ "\n"
#~ "资源选项:\n"
-#, c-format
#~ msgid "cannot stat %s"
#~ msgstr "无法 stat %s"
#~ msgid "pipe failed"
#~ msgstr "pipe 失败"
-#~ msgid "failed to read pipe"
-#~ msgstr "读取管道失败"
-
#~ msgid ""
#~ "\n"
#~ "Options:\n"
#~ msgid "incorrect password"
#~ msgstr "密码错误"
-#~ msgid " %s [options] -u <user> <command>\n"
-#~ msgstr " %s [选项] -u <用户> <命令>\n"
-
#~ msgid "%04d"
#~ msgstr "%04d"
#~ msgid "cannot execute: %s"
#~ msgstr "无法执行:%s"
-#~ 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 show version information and exit\n"
#~ msgstr " --version 输出版本信息并退出\n"
-#~ msgid " --help display this help and exit\n"
-#~ msgstr " --help 显示此帮助并退出\n"
-
#~ msgid "cannot get tty name"
#~ msgstr "无法获得 tty 名称"
#~ " --bytes 在 --show 选项输出中以字节显示交换区大小\n"
#~ " -v, --verbose 详尽模式\n"
-#~ msgid " -m, --mount unshare mounts namespace\n"
-#~ msgstr " -m, --mount 取消共享挂载名字空间\n"
-
#~ msgid " -u, --uts unshare UTS namespace (hostname etc)\n"
#~ msgstr " -u, --uts 取消共享 UTS 名字空间(主机名等)\n"
#~ msgid " -i, --ipc unshare System V IPC namespace\n"
#~ msgstr " -i, --ipc 取消共享 System V IPC 名字空间\n"
-#~ msgid " -n, --net unshare network namespace\n"
-#~ msgstr " -n, --net 取消共享网络名字空间\n"
-
#~ msgid "cannot open: %s: %m"
#~ msgstr "无法打开 %s:%m"
#~ " -h, --help 显示此帮助并退出\n"
#~ "\n"
-#~ msgid " %s [options] file\n"
-#~ msgstr " %s [选项] 文件\n"
-
#~ msgid "can only change local entries."
#~ msgstr "只能更改本地记录。"
#~ msgid "error writing %s: %s"
#~ msgstr "写 %s 出错:%s"
-#~ msgid "%s: cannot fflush changes: %s"
-#~ msgstr "%s:无法 fflush 更改:%s"
-
#~ msgid "error changing mode of %s: %s\n"
#~ msgstr "更改 %s 的模式出错:%s\n"
#~ msgid "mount: loop device specified twice"
#~ msgstr "mount:回环设备指定了两次"
-#~ msgid "mount: type specified twice"
-#~ msgstr "mount:类型指定了两次"
-
#~ msgid "mount: skipping the setup of a loop device\n"
#~ msgstr "mount:将跳过回环设备的设置\n"
#~ msgid " -append <1-NR_CONSOLES>\n"
#~ msgstr " -append <1-NR_CONSOLES>\n"
-#~ msgid " -file dumpfilename\n"
-#~ msgstr " -file dumpfilename\n"
-
#~ msgid " -msg <on|off>\n"
#~ msgstr " -msg <on|off>\n"