# 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.
+# Boyuan Yang <073plan@gmail.com>, 2019, 2020, 2021, 2022.
msgid ""
msgstr ""
-"Project-Id-Version: util-linux-2.36-rc2\n"
+"Project-Id-Version: util-linux-2.38-rc4\n"
"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2021-05-31 18:30+0200\n"
-"PO-Revision-Date: 2020-07-12 22:32-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 2.3.1\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:244 disk-utils/delpart.c:52
-#: disk-utils/mkfs.bfs.c:127 disk-utils/resizepart.c:96 misc-utils/kill.c:314
-#: misc-utils/kill.c:375 misc-utils/rename.c:289 misc-utils/whereis.c:527
-#: sys-utils/flock.c:177 sys-utils/ipcrm.c:160 sys-utils/ldattach.c:367
-#: sys-utils/renice.c:144 sys-utils/switch_root.c:261 sys-utils/tunelp.c:152
-#: term-utils/agetty.c:897 term-utils/agetty.c:898 term-utils/agetty.c:906
-#: term-utils/agetty.c:907
+#: 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: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:293 disk-utils/blockdev.c:437
-#: disk-utils/blockdev.c:464 disk-utils/cfdisk.c:2768 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:1470
-#: disk-utils/fsck.cramfs.c:161 disk-utils/fsck.cramfs.c:520
-#: disk-utils/isosize.c:53 disk-utils/mkfs.bfs.c:186
-#: disk-utils/mkfs.cramfs.c:171 disk-utils/mkfs.cramfs.c:660
-#: disk-utils/mkfs.cramfs.c:799 disk-utils/mkfs.minix.c:838
-#: disk-utils/mkswap.c:316 disk-utils/mkswap.c:345 disk-utils/partx.c:1021
-#: disk-utils/resizepart.c:104 disk-utils/sfdisk.c:380 disk-utils/sfdisk.c:501
-#: disk-utils/sfdisk.c:812 disk-utils/sfdisk.c:1093 disk-utils/swaplabel.c:65
-#: libfdisk/src/bsd.c:642 login-utils/islocal.c:86 login-utils/last.c:694
-#: login-utils/sulogin.c:444 login-utils/sulogin.c:481
-#: login-utils/utmpdump.c:134 login-utils/utmpdump.c:354
-#: login-utils/utmpdump.c:378 login-utils/vipw.c:250 login-utils/vipw.c:268
-#: misc-utils/findmnt.c:1131 misc-utils/hardlink.c:584 misc-utils/logger.c:1241
-#: misc-utils/mcookie.c:119 misc-utils/uuidd.c:231 sys-utils/blkdiscard.c:230
-#: sys-utils/blkzone.c:144 sys-utils/dmesg.c:536 sys-utils/eject.c:499
-#: sys-utils/eject.c:698 sys-utils/fallocate.c:405 sys-utils/fsfreeze.c:116
-#: sys-utils/fstrim.c:103 sys-utils/hwclock.c:239 sys-utils/hwclock.c:906
-#: sys-utils/hwclock-rtc.c:138 sys-utils/hwclock-rtc.c:403
-#: sys-utils/hwclock-rtc.c:438 sys-utils/irq-common.c:253
-#: sys-utils/ldattach.c:391 sys-utils/lscpu-cputype.c:456 sys-utils/lsmem.c:658
-#: sys-utils/nsenter.c:131 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:387 sys-utils/swapon.c:530
-#: sys-utils/switch_root.c:174 sys-utils/unshare.c:112 sys-utils/unshare.c:127
-#: sys-utils/wdctl.c:361 sys-utils/zramctl.c:517 term-utils/agetty.c:2965
-#: term-utils/mesg.c:154 term-utils/script.c:383 term-utils/scriptlive.c:256
+#: 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: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/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: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: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:453
-#: 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 "failed to add partition"
msgstr "添加分区失败"
-#: disk-utils/blockdev.c:63
+#: disk-utils/blockdev.c:64
msgid "set read-only"
msgstr "设置只读"
-#: disk-utils/blockdev.c:70
+#: disk-utils/blockdev.c:71
msgid "set read-write"
msgstr "设置读写"
-#: disk-utils/blockdev.c:76
+#: disk-utils/blockdev.c:77
msgid "get read-only"
msgstr "获得只读"
-#: disk-utils/blockdev.c:82
+#: disk-utils/blockdev.c:83
msgid "get discard zeroes support status"
msgstr "获取 忽略零数据 支持状态"
-#: disk-utils/blockdev.c:88
+#: disk-utils/blockdev.c:89
msgid "get logical block (sector) size"
msgstr "获得逻辑块(扇区)大小"
-#: disk-utils/blockdev.c:94
+#: disk-utils/blockdev.c:95
msgid "get physical block (sector) size"
msgstr "获得物理块(扇区)大小"
-#: disk-utils/blockdev.c:100
+#: disk-utils/blockdev.c:101
msgid "get minimum I/O size"
msgstr "获得最小 I/O 大小"
-#: disk-utils/blockdev.c:106
+#: disk-utils/blockdev.c:107
msgid "get optimal I/O size"
msgstr "获得最优 I/O 大小"
-#: disk-utils/blockdev.c:112
+#: disk-utils/blockdev.c:113
msgid "get alignment offset in bytes"
msgstr "获得对齐偏移字节数"
-#: disk-utils/blockdev.c:118
+#: disk-utils/blockdev.c:119
msgid "get max sectors per request"
msgstr "获得每次请求的最大扇区数"
-#: disk-utils/blockdev.c:124
+#: disk-utils/blockdev.c:125
msgid "get blocksize"
msgstr "获得块大小"
-#: disk-utils/blockdev.c:131
+#: disk-utils/blockdev.c:132
msgid "set blocksize on file descriptor opening the block device"
msgstr "设置打开该块设备的文件描述符的块大小"
-#: disk-utils/blockdev.c:137
+#: disk-utils/blockdev.c:138
msgid "get 32-bit sector count (deprecated, use --getsz)"
msgstr "获得 32-bit 扇区数量(已废弃，请使用 --getsz)"
-#: disk-utils/blockdev.c:143
+#: disk-utils/blockdev.c:144
msgid "get size in bytes"
msgstr "获得字节大小"
-#: disk-utils/blockdev.c:150
+#: disk-utils/blockdev.c:151
msgid "set readahead"
msgstr "设置 readahead"
-#: disk-utils/blockdev.c:156
+#: disk-utils/blockdev.c:157
msgid "get readahead"
msgstr "获取 readahead"
-#: disk-utils/blockdev.c:163
+#: disk-utils/blockdev.c:164
msgid "set filesystem readahead"
msgstr "设置 文件系统 readahead"
-#: disk-utils/blockdev.c:169
+#: disk-utils/blockdev.c:170
msgid "get filesystem readahead"
msgstr "获取 文件系统 readahead"
-#: disk-utils/blockdev.c:173
+#: 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:177
+#: disk-utils/blockdev.c:184
msgid "reread partition table"
msgstr "重新读取分区表"
-#: disk-utils/blockdev.c:187
+#: 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:193
+#: disk-utils/blockdev.c:200
msgid "Call block device ioctls from the command line."
msgstr "从命令行调用块设备 ioctls。"
-#: disk-utils/blockdev.c:196
+#: disk-utils/blockdev.c:203
msgid " -q quiet mode"
msgstr " -q 安静模式"
-#: disk-utils/blockdev.c:197
+#: disk-utils/blockdev.c:204
msgid " -v verbose mode"
msgstr " -v 详尽模式"
-#: disk-utils/blockdev.c:198
+#: disk-utils/blockdev.c:205
msgid " --report print report for specified (or all) devices"
msgstr " --report 输出指定（或全部）设备的报告"
-#: disk-utils/blockdev.c:203
+#: disk-utils/blockdev.c:210
msgid "Available commands:"
msgstr "可用命令："
-#: disk-utils/blockdev.c:204
+#: disk-utils/blockdev.c:211
#, c-format
msgid " %-25s get size in 512-byte sectors\n"
msgstr " %-25s 获得 512-字节扇区的大小\n"
-#: disk-utils/blockdev.c:286 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:779
-#: sys-utils/blkdiscard.c:219 sys-utils/blkzone.c:487 sys-utils/tunelp.c:241
-#: sys-utils/zramctl.c:713 sys-utils/zramctl.c:739
+#: 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:328
+#: disk-utils/blockdev.c:335
msgid "could not get device size"
-msgstr "无法多得设备大小"
+msgstr "无法获取设备大小"
-#: disk-utils/blockdev.c:334
+#: disk-utils/blockdev.c:341
#, c-format
msgid "Unknown command: %s"
msgstr "未知命令: %s"
-#: disk-utils/blockdev.c:350
+#: disk-utils/blockdev.c:357
#, c-format
msgid "%s requires an argument"
msgstr "%s 需要一个参数"
-#: disk-utils/blockdev.c:385 disk-utils/blockdev.c:497
+#: disk-utils/blockdev.c:361
+msgid "failed to parse command argument"
+msgstr "解析命令参数失败"
+
+#: disk-utils/blockdev.c:392 disk-utils/blockdev.c:504
#, c-format
msgid "ioctl error on %s"
msgstr "%s ioctl 出错"
-#: disk-utils/blockdev.c:387
+#: disk-utils/blockdev.c:394
#, c-format
msgid "%s failed.\n"
msgstr "%s 失败。\n"
-#: disk-utils/blockdev.c:394
+#: disk-utils/blockdev.c:401
#, c-format
msgid "%s succeeded.\n"
msgstr "%s 成功。\n"
-#. TRANSLATORS: Start sector not available. Max. 10 letters.
-#: disk-utils/blockdev.c:481
+#. TRANSLATORS: Start sector not available. Max. 15 letters.
+#: disk-utils/blockdev.c:488
msgid "N/A"
msgstr "N/A"
-#: disk-utils/blockdev.c:505
+#: disk-utils/blockdev.c:512
#, c-format
-msgid "RO RA SSZ BSZ StartSec Size Device\n"
-msgstr "RO RA SSZ BSZ 开始段 大小 设备\n"
+msgid "RO RA SSZ BSZ StartSec Size Device\n"
+msgstr "RO RA SSZ BSZ 开始段 大小 设备\n"
-#: disk-utils/cfdisk.c:191
+#: disk-utils/cfdisk.c:198
msgid "Bootable"
msgstr "可启动"
-#: disk-utils/cfdisk.c:191
+#: disk-utils/cfdisk.c:198
msgid "Toggle bootable flag of the current partition"
msgstr "开关当前分区的 可启动 标志"
-#: disk-utils/cfdisk.c:192
+#: disk-utils/cfdisk.c:199
msgid "Delete"
msgstr "删除"
-#: disk-utils/cfdisk.c:192
+#: disk-utils/cfdisk.c:199
msgid "Delete the current partition"
msgstr "删除当前分区"
-#: disk-utils/cfdisk.c:193
+#: disk-utils/cfdisk.c:200
msgid "Resize"
msgstr "更改尺寸"
-#: disk-utils/cfdisk.c:193
+#: disk-utils/cfdisk.c:200
msgid "Reduce or enlarge the current partition"
msgstr "减小或扩大当前分区"
-#: disk-utils/cfdisk.c:194
+#: disk-utils/cfdisk.c:201
msgid "New"
msgstr "新建"
-#: disk-utils/cfdisk.c:194
+#: disk-utils/cfdisk.c:201
msgid "Create new partition from free space"
msgstr "在剩余空间上创建新分区"
-#: disk-utils/cfdisk.c:195
+#: disk-utils/cfdisk.c:202
msgid "Quit"
msgstr "退出"
-#: disk-utils/cfdisk.c:195
+#: disk-utils/cfdisk.c:202
msgid "Quit program without writing changes"
msgstr "退出程序而不写入更改"
-#: disk-utils/cfdisk.c:196 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1031
-#: libfdisk/src/dos.c:2616 libfdisk/src/gpt.c:3194 libfdisk/src/sgi.c:1164
+#: 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:196
+#: disk-utils/cfdisk.c:203
msgid "Change the partition type"
msgstr "更改分区类型"
-#: disk-utils/cfdisk.c:197
+#: disk-utils/cfdisk.c:204
msgid "Help"
msgstr "帮助"
-#: disk-utils/cfdisk.c:197
+#: disk-utils/cfdisk.c:204
msgid "Print help screen"
msgstr "打印帮助界面"
-#: disk-utils/cfdisk.c:198
+#: disk-utils/cfdisk.c:205
msgid "Sort"
msgstr "排序"
-#: disk-utils/cfdisk.c:198
+#: disk-utils/cfdisk.c:205
msgid "Fix partitions order"
msgstr "修复分区顺序"
-#: disk-utils/cfdisk.c:199
+#: disk-utils/cfdisk.c:206
msgid "Write"
msgstr "写入"
-#: disk-utils/cfdisk.c:199
+#: disk-utils/cfdisk.c:206
msgid "Write partition table to disk (this might destroy data)"
msgstr "将分区表写入磁盘(可能损坏数据)"
-#: disk-utils/cfdisk.c:200
+#: disk-utils/cfdisk.c:207
msgid "Dump"
msgstr "转储"
-#: disk-utils/cfdisk.c:200
+#: disk-utils/cfdisk.c:207
msgid "Dump partition table to sfdisk compatible script file"
msgstr "将分区表转储到与 sfdisk 兼容的脚本文件"
-#: disk-utils/cfdisk.c:645 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:1301
+#: disk-utils/cfdisk.c:1318
#, c-format
msgid "%s (mounted)"
msgstr "%s (已挂载)"
-#: disk-utils/cfdisk.c:1321
+#: disk-utils/cfdisk.c:1366
msgid "Partition name:"
msgstr "分区名："
-#: disk-utils/cfdisk.c:1328
+#: disk-utils/cfdisk.c:1373
msgid "Partition UUID:"
msgstr "分区 UUID："
-#: disk-utils/cfdisk.c:1340
+#: disk-utils/cfdisk.c:1392
msgid "Partition type:"
msgstr "分区类型："
-#: disk-utils/cfdisk.c:1347
+#: disk-utils/cfdisk.c:1399
msgid "Attributes:"
msgstr "属性："
-#: disk-utils/cfdisk.c:1371
+#: disk-utils/cfdisk.c:1423
msgid "Filesystem UUID:"
msgstr "文件系统 UUID："
-#: disk-utils/cfdisk.c:1378
+#: disk-utils/cfdisk.c:1430
msgid "Filesystem LABEL:"
msgstr "文件系统标签："
-#: disk-utils/cfdisk.c:1384
+#: disk-utils/cfdisk.c:1436
msgid "Filesystem:"
msgstr "文件系统："
-#: disk-utils/cfdisk.c:1389
+#: disk-utils/cfdisk.c:1441
msgid "Mountpoint:"
msgstr "挂载点："
-#: disk-utils/cfdisk.c:1733
+#: disk-utils/cfdisk.c:1785
#, c-format
msgid "Disk: %s"
msgstr "磁盘：%s"
-#: disk-utils/cfdisk.c:1735
+#: disk-utils/cfdisk.c:1787
#, c-format
msgid "Size: %s, %<PRIu64> bytes, %ju sectors"
msgstr "尺寸：%s，%<PRIu64> 字节，%ju 个扇区"
-#: disk-utils/cfdisk.c:1738
+#: disk-utils/cfdisk.c:1790
#, c-format
msgid "Label: %s, identifier: %s"
msgstr "标签：%s，标识符：%s"
-#: disk-utils/cfdisk.c:1741
+#: disk-utils/cfdisk.c:1793
#, c-format
msgid "Label: %s"
msgstr "标签：%s"
-#: disk-utils/cfdisk.c:1892
+#: 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:1898
+#: disk-utils/cfdisk.c:1950
msgid "Please, specify size."
msgstr "请指定文件大小。"
-#: disk-utils/cfdisk.c:1920
+#: disk-utils/cfdisk.c:1972
#, c-format
msgid "Minimum size is %<PRIu64> bytes."
msgstr "最小尺寸为 %<PRIu64> 字节。"
-#: disk-utils/cfdisk.c:1929
+#: disk-utils/cfdisk.c:1981
#, c-format
msgid "Maximum size is %<PRIu64> bytes."
msgstr "最大尺寸为 %<PRIu64> 字节。"
-#: disk-utils/cfdisk.c:1936
+#: disk-utils/cfdisk.c:1988
msgid "Failed to parse size."
msgstr "解析大小失败。"
-#: disk-utils/cfdisk.c:1994
+#: disk-utils/cfdisk.c:2046
msgid "Select partition type"
msgstr "选择分区类型"
-#: disk-utils/cfdisk.c:2044 disk-utils/cfdisk.c:2074
+#: disk-utils/cfdisk.c:2096 disk-utils/cfdisk.c:2126
msgid "Enter script file name: "
msgstr "输入脚本文件名："
-#: disk-utils/cfdisk.c:2045
+#: disk-utils/cfdisk.c:2097
msgid "The script file will be applied to in-memory partition table."
msgstr "该脚本文件将应用于内存中的分区表。"
-#: disk-utils/cfdisk.c:2054 disk-utils/cfdisk.c:2096
-#: disk-utils/fdisk-menu.c:481 disk-utils/fdisk-menu.c:525
+#: 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 "æ\89\93ä¸\8d开 %s"
+msgstr "æ\97 æ³\95æ\89\93开 %s"
-#: disk-utils/cfdisk.c:2056 disk-utils/fdisk-menu.c:483
+#: 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:2058 disk-utils/fdisk-menu.c:485
+#: 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:2075
+#: disk-utils/cfdisk.c:2127
msgid "The current in-memory partition table will be dumped to the file."
msgstr "当前的内存中分区表将转储到该文件中。"
-#: disk-utils/cfdisk.c:2083 disk-utils/fdisk-menu.c:513
+#: disk-utils/cfdisk.c:2135 disk-utils/fdisk-menu.c:516
msgid "Failed to allocate script handler"
msgstr "分配脚本处理程序失败"
-#: disk-utils/cfdisk.c:2089
+#: disk-utils/cfdisk.c:2141
msgid "Failed to read disk layout into script."
msgstr "将磁盘布局读入脚本出错。"
-#: disk-utils/cfdisk.c:2103
+#: disk-utils/cfdisk.c:2155
msgid "Disk layout successfully dumped."
msgstr "成功转储了磁盘布局。"
-#: disk-utils/cfdisk.c:2106 disk-utils/fdisk-menu.c:531
+#: 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:2142
+#: disk-utils/cfdisk.c:2194
msgid "Select label type"
msgstr "选择标签类型"
-#: disk-utils/cfdisk.c:2145 disk-utils/fdisk.c:1162 disk-utils/fdisk-menu.c:489
+#: 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:2153
-#, fuzzy
+#: 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:2202
+#: disk-utils/cfdisk.c:2254
msgid "This is cfdisk, a curses-based disk partitioning program."
-msgstr "这是 cfdisk，一款基于 curses 的磁盘分区程序，"
+msgstr "这是 cfdisk，一款基于 curses 的磁盘分区程序。"
-#: disk-utils/cfdisk.c:2203
+#: disk-utils/cfdisk.c:2255
msgid "It lets you create, delete, and modify partitions on a block device."
msgstr "可以创建、删除和修改块设备上的分区。"
# 以下两条注意对齐
-#: disk-utils/cfdisk.c:2205
+#: disk-utils/cfdisk.c:2257
msgid "Command Meaning"
msgstr "命令 意义"
-#: disk-utils/cfdisk.c:2206
+#: disk-utils/cfdisk.c:2258
msgid "------- -------"
msgstr "------- -------"
-#: disk-utils/cfdisk.c:2207
+#: disk-utils/cfdisk.c:2259
msgid " b Toggle bootable flag of the current partition"
msgstr " b 切换当前分区的 可启动 标志"
-#: disk-utils/cfdisk.c:2208
+#: disk-utils/cfdisk.c:2260
msgid " d Delete the current partition"
msgstr " d 删除当前分区"
-#: disk-utils/cfdisk.c:2209
+#: disk-utils/cfdisk.c:2261
msgid " h Print this screen"
msgstr " h 打印此屏幕"
-#: disk-utils/cfdisk.c:2210
+#: disk-utils/cfdisk.c:2262
msgid " n Create new partition from free space"
msgstr " n 从空闲空间创建新分区"
-#: disk-utils/cfdisk.c:2211
+#: disk-utils/cfdisk.c:2263
msgid " q Quit program without writing partition table"
msgstr " q 退出程序但不写入分区表"
-#: disk-utils/cfdisk.c:2212
-#, fuzzy
+#: disk-utils/cfdisk.c:2264
msgid " r Reduce or enlarge the current partition"
-msgstr "减小或扩大当前分区"
+msgstr " r 减小或扩大当前分区"
-#: disk-utils/cfdisk.c:2213
+#: disk-utils/cfdisk.c:2265
msgid " s Fix partitions order (only when in disarray)"
msgstr " s 修复分区顺序(仅磁盘阵列)"
-#: disk-utils/cfdisk.c:2214
+#: disk-utils/cfdisk.c:2266
msgid " t Change the partition type"
msgstr " t 更改分区类型"
-#: disk-utils/cfdisk.c:2215
+#: disk-utils/cfdisk.c:2267
msgid " u Dump disk layout to sfdisk compatible script file"
msgstr " u 将磁盘布局转储到兼容 sfdisk 的脚本文件"
-#: disk-utils/cfdisk.c:2216
+#: disk-utils/cfdisk.c:2268
msgid " W Write partition table to disk (you must enter uppercase W);"
msgstr " W 将分区表写入磁盘(必须输入大写 W)；"
-#: disk-utils/cfdisk.c:2217
+#: disk-utils/cfdisk.c:2269
msgid " since this might destroy data on the disk, you must either"
msgstr " 由于这可能破坏磁盘上的数据，您必须"
-#: disk-utils/cfdisk.c:2218
+#: disk-utils/cfdisk.c:2270
msgid " confirm or deny the write by entering 'yes' or 'no'"
msgstr " 通过输入“yes”或“no”来确认或拒绝"
-#: disk-utils/cfdisk.c:2219
+#: disk-utils/cfdisk.c:2271
msgid " x Display/hide extra information about a partition"
msgstr " x 显示/隐藏分区的额外信息"
-#: disk-utils/cfdisk.c:2220
+#: disk-utils/cfdisk.c:2272
msgid "Up Arrow Move cursor to the previous partition"
msgstr "上箭头 光标移到上一分区"
-#: disk-utils/cfdisk.c:2221
+#: disk-utils/cfdisk.c:2273
msgid "Down Arrow Move cursor to the next partition"
msgstr "下箭头 光标移到下一分区"
-#: disk-utils/cfdisk.c:2222
+#: disk-utils/cfdisk.c:2274
msgid "Left Arrow Move cursor to the previous menu item"
msgstr "上箭头 光标移到上一菜单项"
-#: disk-utils/cfdisk.c:2223
+#: disk-utils/cfdisk.c:2275
msgid "Right Arrow Move cursor to the next menu item"
msgstr "下箭头 光标移到下一菜单项"
-#: disk-utils/cfdisk.c:2225
+#: disk-utils/cfdisk.c:2277
msgid "Note: All of the commands can be entered with either upper or lower"
msgstr "注：所有命令均可以大写或小写"
-#: disk-utils/cfdisk.c:2226
+#: disk-utils/cfdisk.c:2278
msgid "case letters (except for Write)."
msgstr "字母输入(除了 写入)。"
-#: disk-utils/cfdisk.c:2228
+#: 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:2238 disk-utils/cfdisk.c:2541
+#: disk-utils/cfdisk.c:2290 disk-utils/cfdisk.c:2593
msgid "Press a key to continue."
msgstr "按下一个键继续。"
-#: disk-utils/cfdisk.c:2324
+#: disk-utils/cfdisk.c:2376
msgid "Could not toggle the flag."
msgstr "无法切换标志。"
-#: disk-utils/cfdisk.c:2334
+#: disk-utils/cfdisk.c:2386
#, c-format
msgid "Could not delete partition %zu."
msgstr "无法删除分区 %zu。"
-#: disk-utils/cfdisk.c:2336 disk-utils/fdisk-menu.c:662
+#: 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:2357
+#: disk-utils/cfdisk.c:2409
msgid "Partition size: "
msgstr "分区大小："
-#: disk-utils/cfdisk.c:2398
+#: disk-utils/cfdisk.c:2450
#, c-format
msgid "Changed type of partition %zu."
msgstr "已更改分区 %zu 的类型。"
-#: disk-utils/cfdisk.c:2400
+#: disk-utils/cfdisk.c:2452
#, c-format
msgid "The type of partition %zu is unchanged."
msgstr "分区 %zu 的类型未更改。"
-#: disk-utils/cfdisk.c:2421
+#: disk-utils/cfdisk.c:2473
msgid "New size: "
msgstr "新大小："
-#: disk-utils/cfdisk.c:2436
+#: disk-utils/cfdisk.c:2488
#, c-format
msgid "Partition %zu resized."
msgstr "已调整分区 %zu 的大小。"
-#: disk-utils/cfdisk.c:2454 disk-utils/fdisk.c:1138 disk-utils/fdisk-menu.c:592
+#: 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:2459
+#: disk-utils/cfdisk.c:2511
msgid "Are you sure you want to write the partition table to disk? "
msgstr "您确定想将分区表写入磁盘吗？"
-#: disk-utils/cfdisk.c:2461
+#: 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:2466 login-utils/lslogins.c:218 sys-utils/lscpu.c:412
-#: sys-utils/lscpu.c:422 sys-utils/lsmem.c:266
+#: 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:2467
+#: disk-utils/cfdisk.c:2519
msgid "Did not write partition table to disk."
msgstr "未将分区表写入磁盘。"
-#: disk-utils/cfdisk.c:2472
+#: disk-utils/cfdisk.c:2524
msgid "Failed to write disklabel."
msgstr "写磁盘标签失败。"
-#: disk-utils/cfdisk.c:2478 disk-utils/fdisk-menu.c:599
+#: disk-utils/cfdisk.c:2530 disk-utils/fdisk-menu.c:602
msgid "The partition table has been altered."
msgstr "分区表已调整。"
-#: disk-utils/cfdisk.c:2501 disk-utils/cfdisk.c:2576
+#: 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:2538
+#: 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:2550
+#: disk-utils/cfdisk.c:2602
msgid "failed to create a new disklabel"
msgstr "创建新磁盘标签失败"
-#: disk-utils/cfdisk.c:2559
+#: disk-utils/cfdisk.c:2611
msgid "failed to read partitions"
msgstr "读分区失败"
-#: disk-utils/cfdisk.c:2572
-#, fuzzy
+#: disk-utils/cfdisk.c:2624
msgid "Device is open in read-only mode. Changes will remain in memory only."
-msgstr "设备以只读方式打开。"
+msgstr "设备以只读方式打开。修改将仅停留在内存中。"
-#: disk-utils/cfdisk.c:2574
+#: disk-utils/cfdisk.c:2626
msgid "Device is currently in use, repartitioning is probably a bad idea."
-msgstr ""
+msgstr "设备正在被使用，不建议您重新分区。"
-#: disk-utils/cfdisk.c:2660
+#: disk-utils/cfdisk.c:2712
#, c-format
msgid " %1$s [options] <disk>\n"
msgstr " %1$s [选项] <磁盘>\n"
-#: disk-utils/cfdisk.c:2663 disk-utils/fdisk.c:855 disk-utils/sfdisk.c:2018
+#: 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:2667
+#: 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:2670
+#: disk-utils/cfdisk.c:2722
msgid " -z, --zero start with zeroed partition table\n"
msgstr " -z, --zero 以空分区表开始\n"
-#: disk-utils/cfdisk.c:2672
+#: 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:2673
-#, fuzzy
+#: disk-utils/cfdisk.c:2725
msgid " -r, --read-only forced open cfdisk in read-only mode\n"
-msgstr " -r, --read-only 创建只读的回环设备\n"
+msgstr " -r, --read-only 强制以只读模式打开 cfdisk\n"
-#: disk-utils/cfdisk.c:2716 disk-utils/fdisk.c:1014 disk-utils/sfdisk.c:2319
-#: misc-utils/cal.c:426 sys-utils/dmesg.c:1453 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:2746 disk-utils/fdisk.c:949 disk-utils/sfdisk.c:231
+#: 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:648 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"
msgid "invalid argument - repair"
msgstr "无效参数 - repair"
-#: disk-utils/fdformat.c:223 disk-utils/fsck.cramfs.c:157
-#: disk-utils/mkfs.bfs.c:182 disk-utils/mkfs.cramfs.c:337
-#: disk-utils/mkfs.cramfs.c:758 disk-utils/mkfs.cramfs.c:796
-#: disk-utils/mkfs.minix.c:835 disk-utils/mkswap.c:342 disk-utils/partx.c:959
-#: login-utils/last.c:708 login-utils/utmpdump.c:137 misc-utils/namei.c:135
-#: misc-utils/rename.c:120 misc-utils/rename.c:182 sys-utils/blkdiscard.c:233
-#: sys-utils/blkzone.c:147 sys-utils/dmesg.c:538 sys-utils/fallocate.c:201
-#: sys-utils/fsfreeze.c:119 sys-utils/fstrim.c:75 sys-utils/nsenter.c:166
-#: sys-utils/nsenter.c:170 sys-utils/swapon.c:535 sys-utils/switch_root.c:93
+#: disk-utils/fdformat.c:223 disk-utils/fsck.cramfs.c:162
+#: 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: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
-#: term-utils/mesg.c:144 term-utils/mesg.c:156
+#: 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:1525
-#: 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:1045
+#: 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:1382 libfdisk/src/gpt.c:2518
+#: libfdisk/src/dos.c:1465 libfdisk/src/gpt.c:2574
msgid "Value out of range."
msgstr "值超出范围。"
msgid "%s (%<PRIu64>-%<PRIu64>): "
msgstr "%s (%<PRIu64>-%<PRIu64>): "
-#: disk-utils/fdisk.c:442 disk-utils/sfdisk.c:205
+#: disk-utils/fdisk.c:442 disk-utils/sfdisk.c:206
msgid " [Y]es/[N]o: "
msgstr "是[Y]/否[N]："
msgid "Partition %zu does not exist yet!"
msgstr "分区 %zu 还不存在！"
-#: disk-utils/fdisk.c:656 disk-utils/fdisk.c:667 libfdisk/src/ask.c:1028
+#: disk-utils/fdisk.c:656 disk-utils/fdisk.c:667 libfdisk/src/ask.c:1032
msgid "Unknown"
msgstr "未知"
msgid "cannot read"
msgstr "不能读"
-#: disk-utils/fdisk.c:788 libfdisk/src/bsd.c:258 libfdisk/src/dos.c:968
-#: libfdisk/src/gpt.c:2446
+#: disk-utils/fdisk.c:788 libfdisk/src/bsd.c:258 libfdisk/src/dos.c:1050
+#: libfdisk/src/gpt.c:2494
msgid "First sector"
msgstr "第一个扇区"
#: disk-utils/fdisk.c:837
#, fuzzy, c-format
+#| msgid "The old %s signature may remain on the device. It is recommended to wipe the device with wipefs(8) or fdisk --wipe, in order to avoid possible collisions."
msgid "The device contains '%s' signature and it may remain on the device. It is recommended to wipe the device with wipefs(8) or fdisk --wipe, in order to avoid possible collisions."
msgstr "旧签名 %s 可能仍然在设备上存留。建议您使用 wipefs(8) 或者 fdisk --wipe 来擦除该设备，以避免潜在的冲突。"
#: disk-utils/fdisk.c:850
-#, fuzzy, c-format
+#, 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 " -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
-#, fuzzy
msgid " -n, --noauto-pt don't create default partition table on empty devices\n"
-msgstr " -P, --partscan 创建带分区的回环设备\n"
+msgstr " -n, --noauto-pt 不要在空设备上创建默认分区表\n"
#: disk-utils/fdisk.c:869
msgid " -o, --output <list> output columns\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:2072
+#: 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:2280
-#: disk-utils/sfdisk.c:2285
+#: 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:702
-#: disk-utils/mkfs.bfs.c:192 disk-utils/mkfs.cramfs.c:786
+#: 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:149 misc-utils/whereis.c:580
-#: misc-utils/whereis.c:591 misc-utils/whereis.c:602 misc-utils/whereis.c:644
-#: schedutils/chrt.c:443 schedutils/ionice.c:262 schedutils/taskset.c:188
-#: sys-utils/chcpu.c:355 sys-utils/chmem.c:422 sys-utils/dmesg.c:1536
-#: sys-utils/ipcmk.c:138 sys-utils/ldattach.c:320 sys-utils/losetup.c:917
-#: sys-utils/lscpu.c:1294 sys-utils/lsmem.c:643 sys-utils/mount.c:833
-#: sys-utils/mount.c:841 sys-utils/mount.c:888 sys-utils/mount.c:901
-#: sys-utils/mount.c:973 sys-utils/mountpoint.c:191 sys-utils/pivot_root.c:71
-#: sys-utils/swapoff.c:258 sys-utils/swapon.c:1005 sys-utils/switch_root.c:270
-#: sys-utils/umount.c:625 term-utils/setterm.c:1197 text-utils/col.c:584
-#: text-utils/more.c:2063
+#: 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:1783
+#: 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"
"使用写入命令前请三思。\n"
#: disk-utils/fdisk.c:1145
-#, fuzzy
-#| 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"
-#| "Use the --no-reread flag to suppress this check.\n"
msgid ""
"This disk is currently in use - repartitioning is probably a bad idea.\n"
"It's recommended to umount all file systems, and swapoff all swap\n"
"partitions on this disk.\n"
msgstr ""
"该磁盘目前正在使用 - 不建议您重新分区。\n"
-"请卸载此磁盘上所有的文件系统，并关闭(swapoff)上面的交换分区。\n"
-"可使用 --no-reread 标志阻止此检查。\n"
+"推荐您卸载此磁盘上所有的文件系统，并关闭（swapoff）上面的交换分区。\n"
#: disk-utils/fdisk.c:1168
msgid "A hybrid GPT was detected. You have to sync the hybrid MBR manually (expert command 'M')."
#: disk-utils/fdisk-list.c:71
#, c-format
-msgid "Geometry: %d heads, %llu sectors/track, %llu cylinders"
-msgstr "几何属性：%d 个磁头, %llu 个扇区/磁道, %llu 个柱面"
+msgid "Geometry: %d heads, %ju sectors/track, %ju cylinders"
+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:1257
+#: 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:1067 misc-utils/fincore.c:356
-#: misc-utils/findmnt.c:1662 misc-utils/lsblk.c:2170 misc-utils/lslocks.c:456
-#: misc-utils/uuidparse.c:252 misc-utils/wipefs.c:157 sys-utils/losetup.c:325
-#: sys-utils/lscpu.c:577 sys-utils/lscpu.c:727 sys-utils/lscpu.c:928
-#: sys-utils/lsipc.c:351 sys-utils/prlimit.c:300 sys-utils/rfkill.c:465
-#: sys-utils/swapon.c:296 sys-utils/wdctl.c:299 sys-utils/zramctl.c:496
-#: text-utils/column.c:210
+#: 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: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: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:1125 misc-utils/fincore.c:123
-#: misc-utils/findmnt.c:705 misc-utils/findmnt.c:723 misc-utils/lsblk.c:1116
-#: misc-utils/lslocks.c:393 misc-utils/uuidparse.c:154 misc-utils/wipefs.c:224
-#: sys-utils/losetup.c:348 sys-utils/losetup.c:377 sys-utils/lscpu.c:491
-#: sys-utils/lscpu.c:756 sys-utils/lscpu.c:788 sys-utils/lsipc.c:481
-#: sys-utils/lsipc.c:562 sys-utils/lsipc.c:664 sys-utils/lsipc.c:756
-#: sys-utils/lsipc.c:920 sys-utils/prlimit.c:229 sys-utils/rfkill.c:380
-#: sys-utils/swapon.c:179 sys-utils/wdctl.c:249 sys-utils/zramctl.c:414
-#: text-utils/column.c:474 text-utils/column.c:499
+#: 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: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: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:1229 misc-utils/fincore.c:159
-#: misc-utils/findmnt.c:709 misc-utils/findmnt.c:728 misc-utils/lsblk.c:1157
-#: misc-utils/lslocks.c:443 misc-utils/uuidparse.c:239 misc-utils/wipefs.c:264
-#: sys-utils/losetup.c:305 sys-utils/lscpu.c:559 sys-utils/lscpu.c:763
-#: sys-utils/lscpu.c:792 sys-utils/lscpu.c:802 sys-utils/lsipc.c:521
-#: sys-utils/lsipc.c:646 sys-utils/prlimit.c:264 sys-utils/rfkill.c:408
-#: sys-utils/swapon.c:227 sys-utils/wdctl.c:277 sys-utils/zramctl.c:481
-#: text-utils/column.c:483
+#: 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: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 "添加输出信息失败"
msgid "Partition table entries are not in disk order."
msgstr "分区表记录没有按磁盘顺序。"
-#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1026 libfdisk/src/dos.c:2610
-#: libfdisk/src/gpt.c:3190 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1130
+#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1026 libfdisk/src/dos.c:2803
+#: 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:2611
-#: libfdisk/src/gpt.c:3191 libfdisk/src/sgi.c:1159 libfdisk/src/sun.c:1131
+#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1027 libfdisk/src/dos.c:2804
+#: 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:2612
-#: libfdisk/src/gpt.c:3192 libfdisk/src/sgi.c:1160 libfdisk/src/sun.c:1132
+#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1028 libfdisk/src/dos.c:2805
+#: 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:2614
-#: libfdisk/src/gpt.c:3193 libfdisk/src/sgi.c:1162 libfdisk/src/sun.c:1134
+#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1030 libfdisk/src/dos.c:2807
+#: 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:226
+#: disk-utils/fdisk-menu.c:127 disk-utils/fdisk-menu.c:227
msgid "return from protective/hybrid MBR to GPT"
msgstr "从 保护/混合 MBR 回到 GPT"
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
+msgid "fix partitions C/H/S values"
+msgstr "修复分区 C/H/S 值"
+
+#: disk-utils/fdisk-menu.c:225
msgid "change the disk identifier"
msgstr "更改磁盘标识符"
-#: disk-utils/fdisk-menu.c:236
+#: disk-utils/fdisk-menu.c:237
msgid "BSD"
msgstr "BSD"
-#: disk-utils/fdisk-menu.c:237
+#: disk-utils/fdisk-menu.c:238
msgid "edit drive data"
msgstr "编辑驱动数据"
-#: disk-utils/fdisk-menu.c:238
+#: disk-utils/fdisk-menu.c:239
msgid "install bootstrap"
msgstr "安装引导程序"
-#: disk-utils/fdisk-menu.c:239
+#: disk-utils/fdisk-menu.c:240
msgid "show complete disklabel"
msgstr "显示完整磁盘标签"
-#: disk-utils/fdisk-menu.c:240
+#: disk-utils/fdisk-menu.c:241
msgid "link BSD partition to non-BSD partition"
msgstr "将 BSD 分区链接到非 BSD 分区"
-#: disk-utils/fdisk-menu.c:372
+#: disk-utils/fdisk-menu.c:373
#, c-format
msgid ""
"\n"
"\n"
"帮助 (专业命令)：\n"
-#: disk-utils/fdisk-menu.c:374 disk-utils/sfdisk.c:1447
+#: disk-utils/fdisk-menu.c:375 disk-utils/sfdisk.c:1472
#, c-format
msgid ""
"\n"
"\n"
"帮助：\n"
-#: disk-utils/fdisk-menu.c:394
+#: disk-utils/fdisk-menu.c:395
#, c-format
msgid "You're editing nested '%s' partition table, primary partition table is '%s'."
msgstr "您正在编辑嵌套的“%s”分区表，主分区表为“%s”。"
-#: disk-utils/fdisk-menu.c:424
+#: disk-utils/fdisk-menu.c:425
msgid "Expert command (m for help): "
msgstr "专家命令(输入 m 显示帮助)："
-#: disk-utils/fdisk-menu.c:426
+#: disk-utils/fdisk-menu.c:427
msgid "Command (m for help): "
msgstr "命令(输入 m 获取帮助)："
-#: disk-utils/fdisk-menu.c:436
+#: 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:449
+#: disk-utils/fdisk-menu.c:452
#, c-format
msgid "%c: unknown command"
msgstr "%c：未知命令"
-#: disk-utils/fdisk-menu.c:474 disk-utils/fdisk-menu.c:507
+#: disk-utils/fdisk-menu.c:477 disk-utils/fdisk-menu.c:510
msgid "Enter script file name"
msgstr "输入脚本文件名"
-#: disk-utils/fdisk-menu.c:486
+#: disk-utils/fdisk-menu.c:489
msgid "Resetting fdisk!"
msgstr "正在重置 fdisk！"
-#: disk-utils/fdisk-menu.c:493
+#: disk-utils/fdisk-menu.c:496
msgid "Script successfully applied."
msgstr "成功应用了脚本。"
-#: disk-utils/fdisk-menu.c:519
+#: disk-utils/fdisk-menu.c:522
msgid "Failed to transform disk layout into script"
msgstr "将磁盘布局转换成脚本失败"
-#: disk-utils/fdisk-menu.c:533
+#: disk-utils/fdisk-menu.c:536
msgid "Script successfully saved."
msgstr "成本保存了脚本。"
-#: disk-utils/fdisk-menu.c:556 disk-utils/sfdisk.c:1673
+#: 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:559 disk-utils/sfdisk.c:1676
+#: 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:564 disk-utils/sfdisk.c:1681
+#: 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:597
+#: disk-utils/fdisk-menu.c:600
msgid "failed to write disklabel"
msgstr "写磁盘标签失败"
-#: disk-utils/fdisk-menu.c:640
-msgid "Failed to fix partitions order."
-msgstr "修复分区顺序失败。"
-
-#: disk-utils/fdisk-menu.c:642
-msgid "Partitions order fixed."
-msgstr "已修复分区顺序。"
-
-#: disk-utils/fdisk-menu.c:660
+#: disk-utils/fdisk-menu.c:659
#, c-format
msgid "Could not delete partition %zu"
msgstr "无法删除分区 %zu"
-#: disk-utils/fdisk-menu.c:689
+#: disk-utils/fdisk-menu.c:688
msgid "Changing display/entry units to cylinders (DEPRECATED!)."
msgstr "将显示/记录单位更改为柱面(已废弃！)。"
-#: disk-utils/fdisk-menu.c:691
+#: disk-utils/fdisk-menu.c:690
msgid "Changing display/entry units to sectors."
msgstr "将显示/记录单位更改为盲区。"
-#: disk-utils/fdisk-menu.c:701 disk-utils/fdisk-menu.c:872
+#: disk-utils/fdisk-menu.c:700 disk-utils/fdisk-menu.c:871
msgid "Leaving nested disklabel."
msgstr "离开嵌套的磁盘标签。"
-#: disk-utils/fdisk-menu.c:738
+#: disk-utils/fdisk-menu.c:737
msgid "New maximum entries"
msgstr "新的最大记录数"
-#: disk-utils/fdisk-menu.c:749
+#: disk-utils/fdisk-menu.c:748
msgid "Entering protective/hybrid MBR disklabel."
msgstr "进入 保护/混合 MBR 磁盘标签。"
-#: disk-utils/fdisk-menu.c:765
+#: 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:780
+#: disk-utils/fdisk-menu.c:779
msgid "New name"
msgstr "新名称"
-#: disk-utils/fdisk-menu.c:843
+#: disk-utils/fdisk-menu.c:842
msgid "Entering nested BSD disklabel."
msgstr "进入嵌套的 BSD 磁盘标签。"
-#: disk-utils/fdisk-menu.c:1041
+#: disk-utils/fdisk-menu.c:878
+msgid "C/H/S values fixed."
+msgstr "C/H/S 值已修复。"
+
+#: disk-utils/fdisk-menu.c:880
+msgid "Nothing to do. C/H/S values are correct already."
+msgstr "无须操作。C/H/S 值已经是正确的了。"
+
+#: disk-utils/fdisk-menu.c:1047
msgid "Number of cylinders"
msgstr "柱面数"
-#: disk-utils/fdisk-menu.c:1048
+#: disk-utils/fdisk-menu.c:1054
msgid "Number of heads"
msgstr "磁头数"
-#: disk-utils/fdisk-menu.c:1054
+#: disk-utils/fdisk-menu.c:1060
msgid "Number of sectors"
msgstr "扇区数"
-#: disk-utils/fdisk-menu.c:1105
-#, fuzzy, c-format
+#: disk-utils/fdisk-menu.c:1111
+#, c-format
msgid "Failed to create '%s' disk label"
-msgstr "创建新磁盘标签失败"
+msgstr "创建“%s”磁盘标签失败"
-#: disk-utils/fsck.c:213
+#: disk-utils/fsck.c:214
#, c-format
msgid "%s is mounted\n"
msgstr "%s 已经挂载\n"
-#: disk-utils/fsck.c:215
+#: disk-utils/fsck.c:216
#, c-format
msgid "%s is not mounted\n"
msgstr "%s 未挂载\n"
-#: disk-utils/fsck.c:329 disk-utils/fsck.cramfs.c:180
-#: disk-utils/fsck.cramfs.c:187 disk-utils/fsck.cramfs.c:243
-#: disk-utils/fsck.cramfs.c:264 disk-utils/sfdisk.c:307 libfdisk/src/bsd.c:647
-#: login-utils/last.c:214 login-utils/last.c:251 login-utils/sulogin.c:657
-#: misc-utils/hardlink.c:586 misc-utils/hardlink.c:743
-#: schedutils/uclampset.c:111 sys-utils/ctrlaltdel.c:44
-#: sys-utils/irq-common.c:259 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
+#: 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: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 "cannot read %s"
msgstr "不能读 %s"
-#: disk-utils/fsck.c:331
+#: disk-utils/fsck.c:332 login-utils/utmpdump.c:288
#, c-format
msgid "parse error: %s"
msgstr "解析错误：%s"
-#: disk-utils/fsck.c:358
+#: disk-utils/fsck.c:359
#, c-format
msgid "cannot create directory %s"
msgstr "无法创建 %s 目录"
-#: disk-utils/fsck.c:371
+#: disk-utils/fsck.c:372
#, c-format
msgid "Locking disk by %s ... "
msgstr "正由 %s 锁定磁盘..."
-#: disk-utils/fsck.c:382
+#: disk-utils/fsck.c:383
#, c-format
msgid "(waiting) "
msgstr "(等待中) "
#. TRANSLATORS: These are followups to "Locking disk...".
-#: disk-utils/fsck.c:392
+#: disk-utils/fsck.c:393
msgid "succeeded"
msgstr "成功"
-#: disk-utils/fsck.c:392
+#: disk-utils/fsck.c:393
msgid "failed"
msgstr "失败"
-#: disk-utils/fsck.c:409
+#: disk-utils/fsck.c:410
#, c-format
msgid "Unlocking %s.\n"
msgstr "正在解锁 %s。\n"
-#: disk-utils/fsck.c:440
+#: disk-utils/fsck.c:441
#, c-format
msgid "failed to setup description for %s"
msgstr "设置 %s 描述 失败"
-#: disk-utils/fsck.c:470 misc-utils/findmnt.c:801 misc-utils/lsblk-mnt.c:15
-#: sys-utils/mount.c:104 sys-utils/swapon-common.c:19 sys-utils/umount.c:52
+#: disk-utils/fsck.c:471 misc-utils/findmnt.c:897 misc-utils/lsblk-mnt.c:15
+#: sys-utils/mount.c:100 sys-utils/swapon-common.c:19 sys-utils/umount.c:52
#, c-format
msgid "%s: parse error at line %d -- ignored"
msgstr "%s：第 %d 行解析出错 -- 已忽略"
-#: disk-utils/fsck.c:502 disk-utils/fsck.c:504
+#: disk-utils/fsck.c:503 disk-utils/fsck.c:505
#, c-format
msgid "%s: failed to parse fstab"
msgstr "%s：解析 fstab 失败"
-#: disk-utils/fsck.c:689 login-utils/login.c:1108 login-utils/sulogin.c:1025
-#: login-utils/vipw.c:197 sys-utils/flock.c:351 sys-utils/nsenter.c:182
-#: sys-utils/swapon.c:332 sys-utils/unshare.c:242 sys-utils/unshare.c:567
+#: 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 失败"
-#: disk-utils/fsck.c:696
+#: disk-utils/fsck.c:697
#, c-format
msgid "%s: execute failed"
msgstr "%s：执行失败"
-#: disk-utils/fsck.c:784
+#: disk-utils/fsck.c:787
msgid "wait: no more child process?!?"
msgstr "wait：没有剩余子进程了？！？"
-#: disk-utils/fsck.c:787 sys-utils/flock.c:369 sys-utils/swapon.c:364
-#: sys-utils/unshare.c:594 sys-utils/unshare.c:607
+#: 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:805
+#: 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:811
+#: disk-utils/fsck.c:814
#, c-format
msgid "%s %s: status is %x, should never happen."
msgstr "%s %s：状态为 %x，这不应该发生。"
-#: disk-utils/fsck.c:857
+#: disk-utils/fsck.c:860
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr "以 %s 结束(退出状态为 %d)\n"
-#: disk-utils/fsck.c:938
-#, fuzzy, c-format
+#: 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:1004
+#: 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:1120
+#: 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:1132
+#: disk-utils/fsck.c:1135
#, c-format
msgid "%s: skipping nonexistent device\n"
msgstr "%s：将跳过不存在的设备\n"
-#: disk-utils/fsck.c:1137
+#: 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:1154
+#: disk-utils/fsck.c:1157
#, c-format
msgid "%s: skipping unknown filesystem type\n"
msgstr "%s：跳过未知的文件系统类型\n"
-#: disk-utils/fsck.c:1168
+#: disk-utils/fsck.c:1171
#, c-format
msgid "cannot check %s: fsck.%s not found"
msgstr "无法检查 %s：找不到 fsck.%s"
-#: disk-utils/fsck.c:1272
+#: disk-utils/fsck.c:1275
msgid "Checking all file systems.\n"
msgstr "正在检查所有文件系统。\n"
# pass number 是fstab中定义的，不为0则每次检测
-#: disk-utils/fsck.c:1363
+#: disk-utils/fsck.c:1366
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--等待中-- (第 %d 遍)\n"
-#: disk-utils/fsck.c:1389
+#: disk-utils/fsck.c:1392
#, c-format
msgid " %s [options] -- [fs-options] [<filesystem> ...]\n"
msgstr " %s [选项] -- [文件系统选项] [<文件系统> ...]\n"
-#: disk-utils/fsck.c:1393
+#: disk-utils/fsck.c:1396
msgid "Check and repair a Linux filesystem.\n"
msgstr "检查并修复 Linux 文件系统。\n"
-#: disk-utils/fsck.c:1396
+#: disk-utils/fsck.c:1399
msgid " -A check all filesystems\n"
msgstr " -A 检查所有文件系统\n"
-#: disk-utils/fsck.c:1397
+#: 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:1398
+#: disk-utils/fsck.c:1401
msgid " -l lock the device to guarantee exclusive access\n"
msgstr " -l 锁定设备以确保独占访问\n"
-#: disk-utils/fsck.c:1399
+#: disk-utils/fsck.c:1402
msgid " -M do not check mounted filesystems\n"
msgstr " -M 不检查已挂臷的文件系统\n"
-#: disk-utils/fsck.c:1400
+#: disk-utils/fsck.c:1403
msgid " -N do not execute, just show what would be done\n"
msgstr " -N 不执行，只显示将执行的操作\n"
-#: disk-utils/fsck.c:1401
+#: disk-utils/fsck.c:1404
msgid " -P check filesystems in parallel, including root\n"
msgstr " -P 并行检查文件系统，包括 root\n"
-#: disk-utils/fsck.c:1402
+#: disk-utils/fsck.c:1405
msgid " -R skip root filesystem; useful only with '-A'\n"
msgstr " -R 跳过根文件系统；只在指定 '-A' 时有用\n"
-#: disk-utils/fsck.c:1403
+#: 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:1405
+#: disk-utils/fsck.c:1408
msgid " -s serialize the checking operations\n"
msgstr " -s 串行化检查操作\n"
-#: disk-utils/fsck.c:1406
+#: disk-utils/fsck.c:1409
msgid " -T do not show the title on startup\n"
msgstr " -T 启动时不显示标题\n"
-#: disk-utils/fsck.c:1407
+#: 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:1409
+#: disk-utils/fsck.c:1412
msgid " -V explain what is being done\n"
msgstr " -V 解释正在进行的操作\n"
-#: disk-utils/fsck.c:1415
+#: disk-utils/fsck.c:1418
msgid "See the specific fsck.* commands for available fs-options."
msgstr "参见特定的 fsck.* 命令了解可用的文件系统选项。"
-#: disk-utils/fsck.c:1460
+#: disk-utils/fsck.c:1463
msgid "too many devices"
msgstr "设备过多"
-#: disk-utils/fsck.c:1472
+#: disk-utils/fsck.c:1475
msgid "Is /proc mounted?"
msgstr "/proc 挂载了吗？"
-#: disk-utils/fsck.c:1480
+#: disk-utils/fsck.c:1483
#, c-format
msgid "must be root to scan for matching filesystems: %s"
msgstr "必须以 root 用户进行匹配文件系统扫描：%s"
-#: disk-utils/fsck.c:1484
+#: disk-utils/fsck.c:1487
#, c-format
msgid "couldn't find matching filesystem: %s"
msgstr "找不到匹配的文件系统：%s"
-#: disk-utils/fsck.c:1492 disk-utils/fsck.c:1589 misc-utils/kill.c:281
-#: sys-utils/eject.c:279
+#: 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:1547 disk-utils/fsck.c:1550
+#: disk-utils/fsck.c:1550 disk-utils/fsck.c:1553
msgid "invalid argument of -r"
msgstr "-r 的参数无效"
-#: disk-utils/fsck.c:1562
+#: disk-utils/fsck.c:1565
#, c-format
msgid "option '%s' may be specified only once"
msgstr "选项“%s”只能指定一次"
-#: disk-utils/fsck.c:1569 misc-utils/kill.c:327 misc-utils/kill.c:343
+#: 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:1600
+#: disk-utils/fsck.c:1603
#, c-format
msgid "invalid argument of -r: %d"
msgstr "-r 的参数无效：%d"
-#: disk-utils/fsck.c:1643
+#: disk-utils/fsck.c:1658
msgid "the -l option can be used with one device only -- ignore"
msgstr "-l 选项只能用于一个设备 -- 忽略"
msgid "ioctl failed: unable to determine device size: %s"
msgstr "ioctl 失败：无法确定设备大小：%s"
-#: disk-utils/fsck.cramfs.c:173
+#: disk-utils/fsck.cramfs.c:172
#, c-format
msgid "not a block device or file: %s"
msgstr "不是一个块设备或文件：%s"
-#: disk-utils/fsck.cramfs.c:176 disk-utils/fsck.cramfs.c:212
+#: disk-utils/fsck.cramfs.c:175 disk-utils/fsck.cramfs.c:211
msgid "file length too short"
msgstr "文件长度过短"
-#: disk-utils/fsck.cramfs.c:185 disk-utils/fsck.cramfs.c:240
-#: disk-utils/fsck.cramfs.c:260 libfdisk/src/bsd.c:719 libfdisk/src/bsd.c:901
-#: login-utils/last.c:209 login-utils/last.c:243 sys-utils/fallocate.c:206
+#: 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:191 disk-utils/fsck.cramfs.c:193
+#: disk-utils/fsck.cramfs.c:190 disk-utils/fsck.cramfs.c:192
msgid "superblock magic not found"
msgstr "超级块魔数(magic)未找到"
-#: disk-utils/fsck.cramfs.c:196
+#: disk-utils/fsck.cramfs.c:195
#, c-format
msgid "cramfs endianness is %s\n"
msgstr "cramfs 大小端为 %s\n"
-#: disk-utils/fsck.cramfs.c:197
+#: disk-utils/fsck.cramfs.c:196
msgid "big"
msgstr "大端"
-#: disk-utils/fsck.cramfs.c:197
+#: disk-utils/fsck.cramfs.c:196
msgid "little"
msgstr "小端"
-#: disk-utils/fsck.cramfs.c:201
+#: disk-utils/fsck.cramfs.c:200
msgid "unsupported filesystem features"
msgstr "不支持的文件系统特性"
-#: disk-utils/fsck.cramfs.c:205
+#: disk-utils/fsck.cramfs.c:204
#, c-format
msgid "superblock size (%d) too small"
msgstr "超级块尺寸(%d)过小"
-#: disk-utils/fsck.cramfs.c:210
+#: disk-utils/fsck.cramfs.c:209
msgid "zero file count"
msgstr "零文件计数"
-#: disk-utils/fsck.cramfs.c:214
+#: disk-utils/fsck.cramfs.c:213
msgid "file extends past end of filesystem"
msgstr "警告：文件超过了文件系统终点"
-#: disk-utils/fsck.cramfs.c:216
+#: disk-utils/fsck.cramfs.c:215
msgid "old cramfs format"
msgstr "旧的 cramfs 格式"
-#: disk-utils/fsck.cramfs.c:225
+#: disk-utils/fsck.cramfs.c:224
msgid "unable to test CRC: old cramfs format"
msgstr "无法检测 CRC：旧的 cramfs 格式"
-#: disk-utils/fsck.cramfs.c:245
+#: 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:283
+#: disk-utils/fsck.cramfs.c:282
msgid "crc error"
msgstr "crc 错误"
-#: disk-utils/fsck.cramfs.c:313 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:317
+#: disk-utils/fsck.cramfs.c:316
msgid "read romfs failed"
msgstr "读取 romfs 失败"
-#: disk-utils/fsck.cramfs.c:349
+#: disk-utils/fsck.cramfs.c:348
msgid "root inode is not directory"
msgstr "根 inode 不是一个目录"
-#: disk-utils/fsck.cramfs.c:353
+#: disk-utils/fsck.cramfs.c:352
#, c-format
msgid "bad root offset (%lu)"
msgstr "错误的根偏移(%lu)"
-#: disk-utils/fsck.cramfs.c:371
+#: disk-utils/fsck.cramfs.c:370
msgid "data block too large"
msgstr "数据块过大"
-#: disk-utils/fsck.cramfs.c:375
+#: disk-utils/fsck.cramfs.c:374
#, c-format
msgid "decompression error: %s"
msgstr "解压出错：%s"
-#: disk-utils/fsck.cramfs.c:401
+#: disk-utils/fsck.cramfs.c:400
#, c-format
msgid " hole at %lu (%zu)\n"
msgstr " 位于 %lu 的空洞(%zu)\n"
-#: disk-utils/fsck.cramfs.c:408 disk-utils/fsck.cramfs.c:560
+#: 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:415
+#: disk-utils/fsck.cramfs.c:414
#, c-format
msgid "non-block (%ld) bytes"
msgstr "非块(%ld)字节 "
-#: disk-utils/fsck.cramfs.c:419
+#: disk-utils/fsck.cramfs.c:418
#, c-format
msgid "non-size (%ld vs %ld) bytes"
msgstr "无大小(%ld ： %ld)字节"
-#: disk-utils/fsck.cramfs.c:424 disk-utils/fsck.cramfs.c:526
-#: disk-utils/swaplabel.c:109 misc-utils/uuidd.c:403 sys-utils/fallocate.c:417
-#: sys-utils/rfkill.c:555 sys-utils/setpriv.c:628 sys-utils/setpriv.c:651
-#: sys-utils/swapon.c:405 term-utils/script.c:319 term-utils/ttymsg.c:175
+#: 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:434
+#: disk-utils/fsck.cramfs.c:433
#, c-format
msgid "lchown failed: %s"
msgstr "lchown 失败：%s"
-#: disk-utils/fsck.cramfs.c:438
-#, 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:443
+#: disk-utils/fsck.cramfs.c:442
#, c-format
msgid "utimes failed: %s"
msgstr "utimes 失败：%s"
-#: disk-utils/fsck.cramfs.c:455
+#: 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:470
+#: disk-utils/fsck.cramfs.c:486
#, c-format
msgid "mkdir failed: %s"
msgstr "mkdir 失败：%s"
-#: disk-utils/fsck.cramfs.c:486
+#: 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:488
+#: disk-utils/fsck.cramfs.c:510
msgid "bad filename length"
msgstr "文件名长度有误"
-#: disk-utils/fsck.cramfs.c:494
+#: disk-utils/fsck.cramfs.c:516
msgid "bad inode offset"
msgstr "inode 偏移有误"
-#: disk-utils/fsck.cramfs.c:509
+#: 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:512
+#: 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:541
+#: disk-utils/fsck.cramfs.c:563
msgid "symbolic link has zero offset"
msgstr "符号链接偏移为 0"
-#: disk-utils/fsck.cramfs.c:543
+#: disk-utils/fsck.cramfs.c:565
msgid "symbolic link has zero size"
msgstr "符号链接大小为 0"
-#: disk-utils/fsck.cramfs.c:552
+#: disk-utils/fsck.cramfs.c:574
#, c-format
msgid "size error in symlink: %s"
msgstr "符号链接大小出错：%s"
-#: disk-utils/fsck.cramfs.c:566
+#: disk-utils/fsck.cramfs.c:588
#, c-format
msgid "symlink failed: %s"
msgstr "symlink 失败：%s"
-#: disk-utils/fsck.cramfs.c:579
+#: disk-utils/fsck.cramfs.c:601
#, c-format
msgid "special file has non-zero offset: %s"
msgstr "特殊文件的偏移不为 0：%s"
-#: disk-utils/fsck.cramfs.c:589
+#: disk-utils/fsck.cramfs.c:611
#, c-format
msgid "fifo has non-zero size: %s"
msgstr "FIFO 的大小不为 0：%s"
-#: disk-utils/fsck.cramfs.c:595
+#: disk-utils/fsck.cramfs.c:617
#, c-format
msgid "socket has non-zero size: %s"
msgstr "套接字的大小不为 0：%s"
-#: disk-utils/fsck.cramfs.c:598
+#: disk-utils/fsck.cramfs.c:620
#, c-format
msgid "bogus mode: %s (%o)"
msgstr "伪(bogus)模式：%s (%o)"
-#: disk-utils/fsck.cramfs.c:607
+#: disk-utils/fsck.cramfs.c:629
#, c-format
msgid "mknod failed: %s"
msgstr "mknod 失败：%s"
-#: disk-utils/fsck.cramfs.c:639
+#: 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:643
+#: 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:647
+#: disk-utils/fsck.cramfs.c:669
msgid "invalid file data offset"
msgstr "无效的文件数据偏移"
-#: disk-utils/fsck.cramfs.c:695 disk-utils/mkfs.cramfs.c:736
+#: disk-utils/fsck.cramfs.c:716 disk-utils/mkfs.cramfs.c:741
msgid "invalid blocksize argument"
msgstr "无效的 块大小 参数"
-#: disk-utils/fsck.cramfs.c:729
+#: 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:667 disk-utils/partx.c:1068 disk-utils/resizepart.c:115
-#: login-utils/utmpdump.c:395 sys-utils/dmesg.c:679 sys-utils/wdctl.c:386
-#: sys-utils/wdctl.c:446 term-utils/setterm.c:908 text-utils/col.c:195
-#: text-utils/pg.c:1259
+#: 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 "write failed"
msgstr "写失败"
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:269 login-utils/su-common.c:1238
-#: login-utils/sulogin.c:794 login-utils/sulogin.c:798 sys-utils/flock.c:123
+#: 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 ""
+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 ""
+msgstr " -N 大小端 设置 cramfs 大小端 (%s|%s|%s), 默认 %s\n"
-#: disk-utils/mkfs.cramfs.c:138
-#, fuzzy
+#: disk-utils/mkfs.cramfs.c:139
msgid " -i file insert a file image into the filesystem"
-msgstr " -i, --inodes <数字> 文件系统的 inode 数\n"
+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
-#, fuzzy, c-format
+#: disk-utils/mkfs.cramfs.c:141
+#, c-format
msgid " -p pad by %d bytes for boot code\n"
-msgstr " -v 详尽模式"
+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 ""
+msgstr " -s 对目录记录进行排序（旧选项，会被忽略）"
-#: disk-utils/mkfs.cramfs.c:142
-#, fuzzy
+#: disk-utils/mkfs.cramfs.c:143
msgid " -z make explicit holes"
-msgstr " -f 不分割长行\n"
+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:162
+#: disk-utils/mkfs.cramfs.c:166
#, c-format
msgid "readlink failed: %s"
msgstr "readlink 失败：%s"
-#: disk-utils/mkfs.cramfs.c:307
+#: disk-utils/mkfs.cramfs.c:311
#, c-format
msgid "could not read directory %s"
msgstr "无法读目录 %s"
-#: disk-utils/mkfs.cramfs.c:442
+#: disk-utils/mkfs.cramfs.c:446
msgid "filesystem too big. Exiting."
msgstr "文件系统过大。将退出。"
-#: disk-utils/mkfs.cramfs.c:601
+#: 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:620
+#: 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:665
+#: disk-utils/mkfs.cramfs.c:669
#, c-format
msgid "cannot close file %s"
msgstr "无法关闭文件 %s"
-#: disk-utils/mkfs.cramfs.c:742
+#: disk-utils/mkfs.cramfs.c:747
msgid "invalid edition number argument"
msgstr "无效的修订版本号参数"
-#: disk-utils/mkfs.cramfs.c:752
+#: 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:817
+#: 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:841
+#: disk-utils/mkfs.cramfs.c:857
msgid "ROM image map"
msgstr "ROM 镜像映射"
-#: disk-utils/mkfs.cramfs.c:853
+#: disk-utils/mkfs.cramfs.c:869
#, c-format
msgid "Including: %s\n"
msgstr "包含：%s\n"
-#: disk-utils/mkfs.cramfs.c:859
+#: disk-utils/mkfs.cramfs.c:875
#, c-format
msgid "Directory data: %zd bytes\n"
msgstr "目录数据：%zd 字节\n"
-#: disk-utils/mkfs.cramfs.c:867
+#: disk-utils/mkfs.cramfs.c:883
#, c-format
msgid "Everything: %zd kilobytes\n"
msgstr "全部：%zd KB\n"
-#: disk-utils/mkfs.cramfs.c:872
+#: disk-utils/mkfs.cramfs.c:888
#, c-format
msgid "Super block: %zd bytes\n"
msgstr "超级块：%zd 字节\n"
-#: disk-utils/mkfs.cramfs.c:879
+#: disk-utils/mkfs.cramfs.c:895
#, c-format
msgid "CRC: %x\n"
msgstr "CRC：%x\n"
-#: disk-utils/mkfs.cramfs.c:884
+#: 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:890
+#: disk-utils/mkfs.cramfs.c:906
#, c-format
msgid "ROM image write failed (%zd %zd)"
msgstr "写 ROM 镜像失败(%zd %zd)"
-#: disk-utils/mkfs.cramfs.c:893
+#: disk-utils/mkfs.cramfs.c:909
msgid "ROM image"
msgstr "ROM 镜像"
-#: disk-utils/mkfs.cramfs.c:902
+#: disk-utils/mkfs.cramfs.c:918
#, c-format
msgid "warning: filenames truncated to %u bytes."
msgstr "警告：文件名被截短为 %u 个字节。"
-#: disk-utils/mkfs.cramfs.c:904
+#: disk-utils/mkfs.cramfs.c:920
msgid "warning: files were skipped due to errors."
msgstr "警告：由于错误，文件被跳过。"
-#: disk-utils/mkfs.cramfs.c:906
+#: 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:910
+#: 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:913
+#: 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:916
+#: disk-utils/mkfs.cramfs.c:932
#, c-format
msgid ""
"WARNING: device numbers truncated to %u bits. This almost certainly means\n"
msgstr " -l, --badblocks <文件> 列出文件中的坏块\n"
#: disk-utils/mkfs.minix.c:149
-#, fuzzy, c-format
+#, c-format
msgid " --lock[=<mode>] use exclusive device lock (%s, %s or %s)\n"
-msgstr " --lock[=<模式>] 使用独占设备锁（%s、%s 或 %s）\n"
+msgstr " --lock[=<模式>] 使用独占设备锁（%s、%s 或 %s）\n"
#: disk-utils/mkfs.minix.c:192
#, c-format
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:90
+#: disk-utils/mkswap.c:111
#, c-format
msgid "Bad user-specified page size %u"
msgstr "用户指定的页大小 %u 有误"
-#: disk-utils/mkswap.c:93
+#: 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:134
+#: disk-utils/mkswap.c:156
msgid "Label was truncated."
msgstr "标签已截短。"
-#: disk-utils/mkswap.c:142
+#: disk-utils/mkswap.c:164
#, c-format
msgid "no label, "
msgstr "无标签，"
-#: disk-utils/mkswap.c:150
+#: disk-utils/mkswap.c:172
#, c-format
msgid "no uuid\n"
msgstr "无 uuid\n"
-#: disk-utils/mkswap.c:159
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:181
+#, c-format
msgid " %s [options] device [size]\n"
-msgstr ""
-"\n"
-"用法\n"
-" %s [选项] 设备 [大小]\n"
+msgstr " %s [选项] 设备 [大小]\n"
-#: disk-utils/mkswap.c:162
+#: disk-utils/mkswap.c:184
msgid "Set up a Linux swap area.\n"
msgstr "设置 Linux 交换区。\n"
-#: disk-utils/mkswap.c:165
-#, fuzzy
+#: 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:166
-#, fuzzy
+#: 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:167
-#, fuzzy
+#: disk-utils/mkswap.c:189
+msgid " -q, --quiet suppress output and warning messages\n"
+msgstr " -q, --quiet 禁止输出和警告信息\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:168
-#, fuzzy
+#: disk-utils/mkswap.c:191
msgid " -L, --label LABEL specify label\n"
-msgstr " -X, --label <名称> 指定标签类型(dos, gpt, ...)\n"
+msgstr " -L, --label 标签 指定标签\n"
-#: disk-utils/mkswap.c:169
-#, fuzzy
+#: 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:170
-#, fuzzy
+#: 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:171
-#, fuzzy
+#: 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:197
msgid " --verbose verbose output\n"
-msgstr " -v, --verbose 详尽模式\n"
+msgstr " --verbose 详尽输出\n"
-#: disk-utils/mkswap.c:174 disk-utils/sfdisk.c:2061
-#, fuzzy, c-format
+#: 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 " --color[=<何时>] 彩色输出（%s, %s 或 %s）\n"
+msgstr " --lock[=<模式>] 使用独占设备锁（%s、%s 或 %s）\n"
-#: disk-utils/mkswap.c:187
+#: disk-utils/mkswap.c:214
#, c-format
msgid "too many bad pages: %lu"
msgstr "坏页过多：%lu"
-#: disk-utils/mkswap.c:208
+#: disk-utils/mkswap.c:235
msgid "seek failed in check_blocks"
msgstr "check_blocks (检查块)时定位失败"
-#: disk-utils/mkswap.c:216
+#: 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:228
+#: 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:236
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:265
+#, c-format
msgid " Use --verbose for more details.\n"
-msgstr " --verbose æ\89\93å\8d°æ\9b´å¤\9aç»\86è\8a\82\n"
+msgstr " 使ç\94¨ --verbose æ\98¾ç¤ºæ\9b´å¤\9aç»\86è\8a\82ã\80\82\n"
-#: disk-utils/mkswap.c:275 disk-utils/mkswap.c:300
+#: 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:283
+#: disk-utils/mkswap.c:314
#, c-format
msgid "data inline extent at offset %ju"
msgstr ""
-#: disk-utils/mkswap.c:286
+#: disk-utils/mkswap.c:317
#, c-format
msgid "shared extent at offset %ju"
msgstr ""
-#: disk-utils/mkswap.c:289
+#: disk-utils/mkswap.c:320
#, c-format
msgid "unallocated extent at offset %ju"
msgstr ""
-#: disk-utils/mkswap.c:329
+#: disk-utils/mkswap.c:361
msgid "unable to alloc new libblkid probe"
msgstr "无法分配新的 libblkid 探针"
-#: disk-utils/mkswap.c:331
+#: disk-utils/mkswap.c:363
msgid "unable to assign device to libblkid probe"
msgstr "无法将设备分配给 libblkid 探针"
-#: disk-utils/mkswap.c:352
+#: 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:367 disk-utils/mkswap.c:392 disk-utils/mkswap.c:439
+#: 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:395
+#: disk-utils/mkswap.c:428
msgid "unable to erase bootbits sectors"
msgstr "不能擦除 bootbits 扇区"
-#: disk-utils/mkswap.c:411
+#: disk-utils/mkswap.c:445
#, c-format
msgid "%s: warning: wiping old %s signature."
msgstr "%s：警告，将擦除旧的 %s 签名。"
-#: disk-utils/mkswap.c:416
+#: disk-utils/mkswap.c:450
#, c-format
msgid "%s: warning: don't erase bootbits sectors"
msgstr "%s：警告，不要擦除 bootbits 扇区"
-#: disk-utils/mkswap.c:419
+#: disk-utils/mkswap.c:453
#, c-format
msgid " (%s partition table detected). "
msgstr " (检测到 %s 分区表)。"
-#: disk-utils/mkswap.c:421
+#: disk-utils/mkswap.c:455
#, c-format
msgid " (compiled without libblkid). "
msgstr " (编译时未链接 libblkid)。"
-#: disk-utils/mkswap.c:422
+#: disk-utils/mkswap.c:456
#, c-format
msgid "Use -f to force.\n"
msgstr "使用 -f 选项强制执行。\n"
-#: disk-utils/mkswap.c:444
+#: disk-utils/mkswap.c:478
#, c-format
msgid "%s: unable to write signature page"
msgstr "%s：无法写签名页"
-#: disk-utils/mkswap.c:491
+#: disk-utils/mkswap.c:536
msgid "parsing page size failed"
msgstr "解析页大小失败"
-#: disk-utils/mkswap.c:497
+#: disk-utils/mkswap.c:545
msgid "parsing version number failed"
msgstr "解析版本号失败"
-#: disk-utils/mkswap.c:500
+#: disk-utils/mkswap.c:548
#, c-format
msgid "swapspace version %d is not supported"
msgstr "不支持 swapspace 版本 %d"
-#: disk-utils/mkswap.c:506
+#: disk-utils/mkswap.c:554
#, c-format
msgid "warning: ignoring -U (UUIDs are unsupported by %s)"
msgstr "警告：将忽略 -U 选项(%s 不支持 UUID)"
-#: disk-utils/mkswap.c:536
+#: 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:543
+#: disk-utils/mkswap.c:609
msgid "error: parsing UUID failed"
msgstr "错误：解析 UUID 失败"
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:618
msgid "error: Nowhere to set up swap on?"
msgstr "错误：没有设置交换空间的地方？"
-#: disk-utils/mkswap.c:558
+#: disk-utils/mkswap.c:624
msgid "invalid block count argument"
msgstr "无效的 块计数 参数"
-#: disk-utils/mkswap.c:567
+#: 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:573
+#: 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:578
+#: disk-utils/mkswap.c:645
#, c-format
msgid "warning: truncating swap area to %llu KiB"
msgstr "警告：将把交换区截短为 %llu KiB"
-#: disk-utils/mkswap.c:583
+#: disk-utils/mkswap.c:650
#, c-format
msgid "error: %s is mounted; will not make swapspace"
msgstr "错误：%s 已挂载；将不会创建交换空间"
-#: disk-utils/mkswap.c:590
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:657
+#, c-format
msgid "%s: insecure permissions %04o, fix with: chmod %04o %s"
-msgstr "%sï¼\9aä¸\8då®\89å\85¨ç\9a\84æ\9d\83é\99\90 %04oï¼\8c建议使ç\94¨ %04oã\80\82"
+msgstr "%sï¼\9aä¸\8då®\89å\85¨ç\9a\84æ\9d\83é\99\90 %04oï¼\8c建议修å¤\8dæ\96¹å¼\8fï¼\9achmod %04o %s"
-#: disk-utils/mkswap.c:594
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:662
+#, c-format
msgid "%s: insecure file owner %d, fix with: chown 0:0 %s"
-msgstr "%sï¼\9aä¸\8då®\89å\85¨ç\9a\84æ\96\87件æ\8b¥æ\9c\89è\80\85 %dï¼\8c建议使ç\94¨ 0(root)ã\80\82"
+msgstr "%sï¼\9aä¸\8då®\89å\85¨ç\9a\84æ\96\87件æ\8b¥æ\9c\89è\80\85 %dï¼\8c建议修å¤\8dæ\96¹å¼\8fï¼\9achown 0:0 %s"
-#: disk-utils/mkswap.c:613
+#: disk-utils/mkswap.c:681
msgid "Unable to set up swap-space: unreadable"
msgstr "无法设置交换空间：不可读"
-#: disk-utils/mkswap.c:618
+#: 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:637
+#: disk-utils/mkswap.c:707
#, c-format
msgid "%s: unable to obtain selinux file label"
msgstr "%s：无法获得 selinux 文件标签"
-#: disk-utils/mkswap.c:642
-#, fuzzy, c-format
+#: disk-utils/mkswap.c:712
+#, c-format
msgid "%s: unable to obtain default selinux file label"
-msgstr "%s：无法获得 selinux 文件标签"
+msgstr "%s：无法获得默认 selinux 文件标签"
-#: disk-utils/mkswap.c:646
+#: disk-utils/mkswap.c:716
msgid "unable to create new selinux context"
msgstr "无法创建新的 selinux 环境(context)"
-#: disk-utils/mkswap.c:648
+#: disk-utils/mkswap.c:718
msgid "couldn't compute selinux context"
msgstr "无法计算 selinux 环境(context)"
-#: disk-utils/mkswap.c:654
+#: 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:115 misc-utils/lsblk.c:183
+#: 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:184
+#: disk-utils/partx.c:94 misc-utils/lsblk.c:200
msgid "partition flags"
msgstr "分区标志"
msgid "%s: failed to set up loop device"
msgstr "%s：设置回环设备失败"
-#: disk-utils/partx.c:161 login-utils/lslogins.c:320 misc-utils/fincore.c:92
-#: misc-utils/findmnt.c:378 misc-utils/lsblk.c:324 misc-utils/lslocks.c:344
-#: 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:193
-#: sys-utils/lscpu.c:208 sys-utils/lsipc.c:232 sys-utils/lsmem.c:178
-#: sys-utils/lsns.c:238 sys-utils/prlimit.c:280 sys-utils/rfkill.c:162
-#: sys-utils/swapon.c:150 sys-utils/wdctl.c:161 sys-utils/zramctl.c:147
+#: disk-utils/partx.c:161 login-utils/lslogins.c:322 misc-utils/fincore.c:92
+#: 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: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"
msgstr "未知列: %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:1690
-#: misc-utils/lsblk.c:2213 misc-utils/lslocks.c:471 sys-utils/losetup.c:339
-#: sys-utils/lscpu.c:586 sys-utils/lscpu.c:736 sys-utils/prlimit.c:309
-#: sys-utils/rfkill.c:477 sys-utils/swapon.c:305 sys-utils/wdctl.c:310
+#: 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:1858 sys-utils/lsmem.c:515
+#: 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:251 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"
-#: disk-utils/partx.c:770 sys-utils/lsmem.c:518
+#: disk-utils/partx.c:770 sys-utils/lsmem.c:531
msgid " --output-all output all columns\n"
msgstr " --output-all 输出所有列\n"
-#: disk-utils/partx.c:771 misc-utils/lsblk.c:1854 sys-utils/lsirq.c:64
-#: sys-utils/lsmem.c:513
+#: 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:1869 sys-utils/lsmem.c:519
+#: 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 "Device '%s' is not a block device"
msgstr "设备“%s”不是块设备"
-#: disk-utils/raw.c:195 disk-utils/raw.c:198 sys-utils/ipcrm.c:352
-#: sys-utils/ipcrm.c:366 sys-utils/ipcrm.c:380
+#: disk-utils/raw.c:195 disk-utils/raw.c:198 sys-utils/ipcrm.c:353
+#: sys-utils/ipcrm.c:367 sys-utils/ipcrm.c:381
msgid "failed to parse argument"
msgstr "解析参数失败"
msgid "failed to resize partition"
msgstr "调整分区大小失败"
-#: disk-utils/sfdisk.c:241
+#: disk-utils/sfdisk.c:242
msgid "failed to allocate nested libfdisk context"
msgstr "分配嵌套 libfdisk 环境(context)失败"
-#: disk-utils/sfdisk.c:301
+#: disk-utils/sfdisk.c:302
#, c-format
msgid "cannot seek %s"
msgstr "无法定位 %s"
-#: disk-utils/sfdisk.c:312 libfdisk/src/bsd.c:724 libfdisk/src/bsd.c:905
-#: schedutils/uclampset.c:119 term-utils/script.c:462
+#: disk-utils/sfdisk.c:313 libfdisk/src/bsd.c:724 libfdisk/src/bsd.c:905
+#: schedutils/uclampset.c:119 term-utils/script.c:470
#, c-format
msgid "cannot write %s"
msgstr "无法写 %s"
-#: disk-utils/sfdisk.c:319
+#: disk-utils/sfdisk.c:320
#, c-format
msgid "%12s (offset %5ju, size %5ju): %s"
msgstr "%12s (偏移 %5ju, 大小 %5ju): %s"
-#: disk-utils/sfdisk.c:325
+#: disk-utils/sfdisk.c:326
#, c-format
msgid "%s: failed to create a backup"
msgstr "%s：创建备份失败"
-#: disk-utils/sfdisk.c:338
+#: disk-utils/sfdisk.c:339
msgid "failed to create a backup file, $HOME undefined"
msgstr "创建备份失败，未定义 $HOME"
-#: disk-utils/sfdisk.c:364
+#: disk-utils/sfdisk.c:365
msgid "Backup files:"
msgstr "备份文件："
-#: disk-utils/sfdisk.c:410
+#: disk-utils/sfdisk.c:411
msgid "failed to read new partition from device; ignoring --move-data"
msgstr "从设备读取新分区失败；将忽略 --move-data"
-#: disk-utils/sfdisk.c:412
+#: disk-utils/sfdisk.c:413
msgid "failed to get size of the new partition; ignoring --move-data"
msgstr "获取新分区大小失败，将忽略 --move-data"
-#: disk-utils/sfdisk.c:414
+#: disk-utils/sfdisk.c:415
msgid "failed to get start of the new partition; ignoring --move-data"
msgstr "获取新分区起点失败，将忽略 --move-data"
-#: disk-utils/sfdisk.c:416
+#: disk-utils/sfdisk.c:417
msgid "failed to get size of the old partition; ignoring --move-data"
msgstr "获取新分区大小失败，将忽略 --move-data"
-#: disk-utils/sfdisk.c:418
+#: disk-utils/sfdisk.c:419
msgid "failed to get start of the old partition; ignoring --move-data"
msgstr "获取旧分区起点失败，将忽略 --move-data"
-#: disk-utils/sfdisk.c:420
+#: disk-utils/sfdisk.c:421
msgid "start of the partition has not been moved; ignoring --move-data"
msgstr "分区起点未移动；将忽略 --move-data"
-#: disk-utils/sfdisk.c:422
+#: disk-utils/sfdisk.c:423
msgid "new partition is smaller than original; ignoring --move-data"
msgstr "新分区小于原分区；将忽略 --move-data"
-#: disk-utils/sfdisk.c:473
+#: disk-utils/sfdisk.c:474
msgid "Data move: (--no-act)"
msgstr "数据移动︰（--no-act）"
-#: disk-utils/sfdisk.c:473
+#: disk-utils/sfdisk.c:474
msgid "Data move:"
msgstr "数据移动︰"
-#: disk-utils/sfdisk.c:476
+#: disk-utils/sfdisk.c:477
#, c-format
msgid " typescript file: %s"
msgstr "typescript 文件：%s"
-#: disk-utils/sfdisk.c:477
+#: disk-utils/sfdisk.c:478
#, c-format
msgid " start sector: (from/to) %ju / %ju\n"
msgstr ""
-#: disk-utils/sfdisk.c:478
+#: disk-utils/sfdisk.c:479
#, fuzzy, c-format
+#| msgid ", %llu sectors\n"
msgid " sectors: %ju\n"
msgstr "，%llu 个扇区\n"
-#: disk-utils/sfdisk.c:479
+#: disk-utils/sfdisk.c:480
#, fuzzy, c-format
+#| msgid "get size in bytes"
msgid " step size: %zu bytes\n"
msgstr "获得字节大小"
-#: disk-utils/sfdisk.c:489
+#: disk-utils/sfdisk.c:490
msgid "Do you want to move partition data?"
msgstr "您想移动分区数据吗？"
-#: disk-utils/sfdisk.c:491 disk-utils/sfdisk.c:1988
+#: disk-utils/sfdisk.c:492 disk-utils/sfdisk.c:2014
msgid "Leaving."
msgstr "离开中。"
-#: disk-utils/sfdisk.c:553
-#, c-format
-msgid "cannot read at offset: %zu; continue"
-msgstr ""
+#: disk-utils/sfdisk.c:554
+#, fuzzy, c-format
+#| msgid "cannot read at offset: %zu; continue"
+msgid "cannot read at offset: %ju; continue"
+msgstr "无法在偏移量 %zu 处读取；继续"
-#: disk-utils/sfdisk.c:564
-#, c-format
-msgid "cannot write at offset: %zu; continue"
-msgstr ""
+#: disk-utils/sfdisk.c:565
+#, fuzzy, c-format
+#| msgid "cannot write at offset: %zu; continue"
+msgid "cannot write at offset: %ju; continue"
+msgstr "无法在偏移量 %zu 处写入；继续"
+
+#: 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:593
+#: disk-utils/sfdisk.c:595
#, c-format
msgid "Moved %ju from %ju sectors (%.3f%%, %.1f MiB/s)."
msgstr ""
-#: disk-utils/sfdisk.c:598
+#: disk-utils/sfdisk.c:600
#, c-format
msgid "Moved %ju from %ju sectors (%.3f%%)."
msgstr ""
-#: disk-utils/sfdisk.c:622
+#: disk-utils/sfdisk.c:624
#, c-format
msgid "Moved %ju from %ju sectors (%.0f%%)."
msgstr ""
-#: disk-utils/sfdisk.c:635
+#: disk-utils/sfdisk.c:637
msgid "Your data has not been moved (--no-act)."
msgstr "您的数据未被移动（--no-act）。"
-#: disk-utils/sfdisk.c:637
-#, fuzzy, c-format
+#: disk-utils/sfdisk.c:639
+#, c-format
msgid "%zu I/O errors detected!"
-msgstr "检测到 %d 个错误。"
+msgstr "检测到 %zu 个 I/O 错误！"
-#: disk-utils/sfdisk.c:640
+#: disk-utils/sfdisk.c:642
#, c-format
msgid "%s: failed to move data"
msgstr "%s：移动数据失败"
-#: disk-utils/sfdisk.c:652
+#: disk-utils/sfdisk.c:654
msgid "The partition table is unchanged (--no-act)."
msgstr "分区表未更改(--no-act)。"
-#: disk-utils/sfdisk.c:660
+#: disk-utils/sfdisk.c:662
msgid ""
"\n"
"The partition table has been altered."
"\n"
"分区表已调整。"
-#: disk-utils/sfdisk.c:735
+#: disk-utils/sfdisk.c:737
#, c-format
msgid "unsupported label '%s'"
msgstr "不支持的标签：“%s”"
-#: disk-utils/sfdisk.c:738
+#: disk-utils/sfdisk.c:740
msgid ""
"Id Name\n"
"\n"
"Id 名称\n"
"\n"
-#: disk-utils/sfdisk.c:765
+#: disk-utils/sfdisk.c:767
msgid "unrecognized partition table type"
msgstr "未识别的分区表类型"
-#: disk-utils/sfdisk.c:818
+#: disk-utils/sfdisk.c:820
#, c-format
msgid "Cannot get size of %s"
msgstr "无法获得 %s 的大小"
-#: disk-utils/sfdisk.c:855
+#: disk-utils/sfdisk.c:857
#, c-format
msgid "total: %ju blocks\n"
msgstr "共计：%ju 个块\n"
-#: disk-utils/sfdisk.c:914 disk-utils/sfdisk.c:992 disk-utils/sfdisk.c:1029
-#: disk-utils/sfdisk.c:1054 disk-utils/sfdisk.c:1124 disk-utils/sfdisk.c:1192
-#: disk-utils/sfdisk.c:1247 disk-utils/sfdisk.c:1303 disk-utils/sfdisk.c:1356
-#: disk-utils/sfdisk.c:1394 disk-utils/sfdisk.c:1730
+#: 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:924
+#: disk-utils/sfdisk.c:926
msgid "toggle boot flags is unsupported for Hybrid GPT/MBR"
msgstr "混合 GPT/MBR 不支持切换启动（boot）标志"
-#: disk-utils/sfdisk.c:929
+#: disk-utils/sfdisk.c:931
msgid "cannot switch to PMBR"
msgstr "无法切换至 PMBR"
-#: disk-utils/sfdisk.c:930
+#: disk-utils/sfdisk.c:932
msgid "Activation is unsupported for GPT -- entering nested PMBR."
msgstr "GPT 不支持激活（Activation）-- 将进入嵌套 PMBR。"
-#: disk-utils/sfdisk.c:933
+#: disk-utils/sfdisk.c:935
msgid "toggle boot flags is supported for MBR or PMBR only"
msgstr "只支持为 MBR 或 PMBR 切换启动（boot）标志"
-#: disk-utils/sfdisk.c:965 disk-utils/sfdisk.c:1008 disk-utils/sfdisk.c:1129
-#: disk-utils/sfdisk.c:1197 disk-utils/sfdisk.c:1252 disk-utils/sfdisk.c:1308
-#: disk-utils/sfdisk.c:1728 disk-utils/sfdisk.c:2254
+#: 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:970
+#: disk-utils/sfdisk.c:972
#, c-format
msgid "%s: partition %d: failed to toggle bootable flag"
msgstr "%s：分区 %d：开/关启动标志失败"
-#: disk-utils/sfdisk.c:1003 disk-utils/sfdisk.c:1011
+#: 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:1059
+#: 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:1063
+#: disk-utils/sfdisk.c:1065
msgid "failed to allocate dump struct"
msgstr "分配转储结构失败"
-#: disk-utils/sfdisk.c:1067
+#: disk-utils/sfdisk.c:1069
#, c-format
msgid "%s: failed to dump partition table"
msgstr "%s：转储分区表失败"
-#: disk-utils/sfdisk.c:1102
+#: disk-utils/sfdisk.c:1127
#, c-format
msgid "%s: no partition table found"
msgstr "%s：找不到分区表"
-#: disk-utils/sfdisk.c:1106
+#: 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:1109
+#: disk-utils/sfdisk.c:1134
#, c-format
msgid "%s: partition %zu: partition is unused"
msgstr "%s: 分区 %zu: 分区未使用"
-#: disk-utils/sfdisk.c:1128 disk-utils/sfdisk.c:1196 disk-utils/sfdisk.c:1251
-#: disk-utils/sfdisk.c:1307
+#: 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:1134 disk-utils/sfdisk.c:1202 disk-utils/sfdisk.c:1257
-#: disk-utils/sfdisk.c:1313 disk-utils/sfdisk.c:1362 disk-utils/sfdisk.c:1396
-#: sys-utils/losetup.c:782
+#: 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:1149
+#: disk-utils/sfdisk.c:1174
#, c-format
msgid "%s: partition %zu: failed to get partition type"
msgstr "%s: 分区 %zu:获取分区类型失败"
-#: disk-utils/sfdisk.c:1172
+#: disk-utils/sfdisk.c:1197
#, c-format
msgid "failed to parse %s partition type '%s'"
msgstr "解析 %s 的分区类型“%s”失败"
-#: disk-utils/sfdisk.c:1176
+#: disk-utils/sfdisk.c:1201
#, c-format
msgid "%s: partition %zu: failed to set partition type"
msgstr "%s: 分区 %zu: 设置分区类型失败"
-#: disk-utils/sfdisk.c:1214
+#: disk-utils/sfdisk.c:1239
#, c-format
msgid "%s: partition %zu: failed to get partition UUID"
msgstr "%s: 分区 %zu: 获取分区 UUID 失败"
-#: disk-utils/sfdisk.c:1227 disk-utils/sfdisk.c:1282 disk-utils/sfdisk.c:1336
+#: 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:1231
+#: disk-utils/sfdisk.c:1256
#, c-format
msgid "%s: partition %zu: failed to set partition UUID"
msgstr "%s: 分区 %zu: 设置分区 UUID 失败"
-#: disk-utils/sfdisk.c:1269
+#: disk-utils/sfdisk.c:1294
#, c-format
msgid "%s: partition %zu: failed to get partition name"
msgstr "%s: 分区 %zu: 获取分区名失败"
-#: disk-utils/sfdisk.c:1286
+#: disk-utils/sfdisk.c:1311
#, c-format
msgid "%s: partition %zu: failed to set partition name"
msgstr "%s: 分区 %zu: 设置分区名失败"
-#: disk-utils/sfdisk.c:1340
+#: disk-utils/sfdisk.c:1365
#, c-format
msgid "%s: partition %zu: failed to set partition attributes"
msgstr "%s: 分区 %zu: 设置分区属性失败"
-#: disk-utils/sfdisk.c:1377
-#, fuzzy, c-format
+#: disk-utils/sfdisk.c:1402
+#, c-format
msgid "%s: failed to set disklabel ID"
-msgstr "%s：无法定位到交换区标签 "
+msgstr "%s：设置磁盘标签 ID 失败"
-#: disk-utils/sfdisk.c:1392
+#: disk-utils/sfdisk.c:1417
#, fuzzy
+#| msgid "No --date option specified."
msgid "no relocate operation specified"
msgstr "未指定 --date 选项。"
-#: disk-utils/sfdisk.c:1406
+#: disk-utils/sfdisk.c:1431
#, fuzzy
+#| msgid "unsupported option format: %s"
msgid "unsupported relocation operation"
msgstr "不支持的参数格式：%s"
-#: disk-utils/sfdisk.c:1451
+#: disk-utils/sfdisk.c:1476
msgid " Commands:\n"
msgstr " 命令：\n"
-#: disk-utils/sfdisk.c:1453
+#: disk-utils/sfdisk.c:1478
msgid " write write table to disk and exit\n"
msgstr " write 将分区表写入磁盘并退出\n"
-#: disk-utils/sfdisk.c:1454
+#: 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:1455
+#: disk-utils/sfdisk.c:1480
msgid " abort exit sfdisk shell\n"
msgstr " abort 退出 sfdisk shell\n"
-#: disk-utils/sfdisk.c:1456
+#: disk-utils/sfdisk.c:1481
msgid " print display the partition table\n"
msgstr " print 显示分区表\n"
-#: disk-utils/sfdisk.c:1457
+#: disk-utils/sfdisk.c:1482
msgid " help show this help text\n"
msgstr " help 显示帮助并退出\n"
-#: disk-utils/sfdisk.c:1459
+#: disk-utils/sfdisk.c:1484
msgid " Ctrl-D the same as 'quit'\n"
msgstr " Ctrl-D 同“quit”\n"
-#: disk-utils/sfdisk.c:1463
+#: disk-utils/sfdisk.c:1488
msgid " Input format:\n"
msgstr " 输入格式：\n"
-#: disk-utils/sfdisk.c:1465
+#: disk-utils/sfdisk.c:1490
msgid " <start>, <size>, <type>, <bootable>\n"
msgstr " <起点>, <大小>, <类型>, <可启动>\n"
-#: disk-utils/sfdisk.c:1468
+#: 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:1473
+#: 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:1478
+#: disk-utils/sfdisk.c:1503
msgid " <type> The partition type. Default is a Linux data partition.\n"
msgstr " <类型> 分区类型。默认为 Linux 数据分区。\n"
-#: disk-utils/sfdisk.c:1479
-#, fuzzy
+#: disk-utils/sfdisk.c:1504
msgid " MBR: hex or L,S,Ex,X,U,R,V shortcuts.\n"
-msgstr " MBR：hex 或 L,S,E,X,U,R,V 快捷方式。\n"
+msgstr " MBR：hex 或 L,S,Ex,X,U,R,V 快捷方式。\n"
-#: disk-utils/sfdisk.c:1480
+#: 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:1483
+#: disk-utils/sfdisk.c:1508
msgid " <bootable> Use '*' to mark an MBR partition as bootable.\n"
msgstr " <可启动> 使用“*”将 MBR 分区标记为 可启动。\n"
-#: disk-utils/sfdisk.c:1487
+#: disk-utils/sfdisk.c:1512
msgid " Example:\n"
-msgstr "示例：\n"
+msgstr " 示例：\n"
-#: disk-utils/sfdisk.c:1489
+#: disk-utils/sfdisk.c:1514
msgid " , 4G Creates a 4GiB partition at default start offset.\n"
msgstr " , 4G 在默认起始偏移位置创建一个 4GiB 分区。\n"
-#: disk-utils/sfdisk.c:1521 sys-utils/dmesg.c:1616
+#: disk-utils/sfdisk.c:1546 sys-utils/dmesg.c:1674
msgid "unsupported command"
msgstr "不支持的命令"
-#: disk-utils/sfdisk.c:1523
+#: disk-utils/sfdisk.c:1548
#, c-format
msgid "line %d: unsupported command"
msgstr "第 %d 行：不支持的命令"
-#: disk-utils/sfdisk.c:1642
+#: 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:1649
+#: 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:1697
+#: disk-utils/sfdisk.c:1722
msgid "failed to allocate partition name"
msgstr "分配分区名失败"
-#: disk-utils/sfdisk.c:1736
+#: disk-utils/sfdisk.c:1761
msgid "failed to allocate script handler"
msgstr "分配脚本处理程序失败"
-#: disk-utils/sfdisk.c:1752
+#: 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:1757
+#: 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:1763
+#: disk-utils/sfdisk.c:1788
#, c-format
msgid "warning: %s: partition %d is not defined yet"
msgstr "警告：%s: 分区 %d 尚未定义"
-#: disk-utils/sfdisk.c:1781
+#: disk-utils/sfdisk.c:1806
#, c-format
msgid ""
"\n"
"\n"
"欢迎使用 sfdisk (%s)。"
-#: disk-utils/sfdisk.c:1789
+#: disk-utils/sfdisk.c:1814
msgid "Checking that no-one is using this disk right now ..."
msgstr "请检查现在是不是有人在使用此磁盘..."
-#: disk-utils/sfdisk.c:1792
+#: disk-utils/sfdisk.c:1817
msgid ""
" FAILED\n"
"\n"
" 失败\n"
"\n"
-#: disk-utils/sfdisk.c:1795
+#: 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:1800
+#: disk-utils/sfdisk.c:1825
msgid "Use the --force flag to overrule all checks."
msgstr "使用 --force 标志否决所有检查。"
-#: disk-utils/sfdisk.c:1802
+#: disk-utils/sfdisk.c:1827
msgid ""
" OK\n"
"\n"
" 好的\n"
"\n"
-#: disk-utils/sfdisk.c:1811
+#: disk-utils/sfdisk.c:1836
msgid ""
"\n"
"Old situation:"
"\n"
"旧状况："
-#: disk-utils/sfdisk.c:1824
-#, fuzzy
+#: disk-utils/sfdisk.c:1849
msgid "failed to set script header"
-msgstr "分配脚本处理程序失败"
+msgstr "设置脚本标头（header）失败"
-#: disk-utils/sfdisk.c:1829
+#: disk-utils/sfdisk.c:1854
#, c-format
msgid ""
"\n"
"sfdisk 即将创建一个新的磁盘标签“%s”。\n"
"在定义第一个分区之前使用“label: <名字>”可覆盖默认值。"
-#: disk-utils/sfdisk.c:1832
+#: disk-utils/sfdisk.c:1857
msgid ""
"\n"
"Type 'help' to get more information.\n"
"\n"
"请执行“%s --help”了解更多信息。\n"
-#: disk-utils/sfdisk.c:1850
+#: disk-utils/sfdisk.c:1875
msgid "All partitions used."
msgstr "所有分区均已使用。"
-#: disk-utils/sfdisk.c:1870
+#: disk-utils/sfdisk.c:1895
#, c-format
msgid "Unknown script header '%s' -- ignore."
-msgstr ""
+msgstr "未知的脚本标头（header）“%s”——忽略。"
-#: disk-utils/sfdisk.c:1886
+#: disk-utils/sfdisk.c:1911
msgid "Done.\n"
msgstr "完成。\n"
-#: disk-utils/sfdisk.c:1898
+#: disk-utils/sfdisk.c:1923
msgid "Ignoring partition."
msgstr "忽略分区。"
-#: disk-utils/sfdisk.c:1908
+#: 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:1929
+#: disk-utils/sfdisk.c:1955
#, c-format
-msgid "Failed to add #%d partition"
-msgstr "添加 #%d 分区失败"
+msgid "Failed to add #%zu partition"
+msgstr "添加 #%zu 分区失败"
-#: disk-utils/sfdisk.c:1952
+#: disk-utils/sfdisk.c:1978
msgid "Script header accepted."
msgstr "已接受脚本标头(header)。"
-#: disk-utils/sfdisk.c:1969
+#: disk-utils/sfdisk.c:1995
msgid "Failed to apply script headers, disk label not created."
msgstr "无法应用脚本标头(header)，未创建磁盘标签。"
-#: disk-utils/sfdisk.c:1976
+#: disk-utils/sfdisk.c:2002
msgid ""
"\n"
"New situation:"
"\n"
"新状况："
-#: disk-utils/sfdisk.c:1986
+#: disk-utils/sfdisk.c:2012
msgid "Do you want to write this to disk?"
msgstr "您想写入该磁盘吗？"
-#: disk-utils/sfdisk.c:1999
+#: disk-utils/sfdisk.c:2025
msgid "Leaving.\n"
msgstr "离开中。\n"
-#: disk-utils/sfdisk.c:2014
+#: 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:2021
+#: 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:2022
+#: 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:2023
+#: 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:2024
+#: disk-utils/sfdisk.c:2050
+msgid " -B, --backup-pt-sectors <dev> binary partition table backup (see -b and -O)\n"
+msgstr " -B, --backup-pt-sectors <dev> 二进制分区表备份（参见 -b 和 -O）\n"
+
+#: 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:2025
+#: disk-utils/sfdisk.c:2052
msgid " -l, --list [<dev> ...] list partitions of each device\n"
msgstr " -l, --list [<设备> ...] 列出每台设备上的分区\n"
-#: disk-utils/sfdisk.c:2026
+#: 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:2027
+#: disk-utils/sfdisk.c:2054
msgid " -r, --reorder <dev> fix partitions order (by start offset)\n"
msgstr " -r, --reorder <设备> (通过起始偏移量)修复分区顺序\n"
-#: disk-utils/sfdisk.c:2028
+#: 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:2029
+#: 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:2030
+#: disk-utils/sfdisk.c:2057
msgid " -V, --verify [<dev> ...] test whether partitions seem correct\n"
msgstr " -V, --verify [<设备> ...] 测试分区是否正确\n"
-#: disk-utils/sfdisk.c:2031
+#: disk-utils/sfdisk.c:2058
msgid " --delete <dev> [<part> ...] delete all or specified partitions\n"
msgstr " --delete <设备> [<分区> ...] 删除所有或指定分区\n"
-#: disk-utils/sfdisk.c:2034
+#: 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:2035
+#: 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:2036
+#: 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:2037
+#: 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:2040
-#, fuzzy
+#: disk-utils/sfdisk.c:2067
msgid " --disk-id <dev> [<str>] print or change disk label ID (UUID)\n"
-msgstr " --part-label <设备> <分区> [<字符串>] 打印或更改分区标签\n"
+msgstr " --disk-id <设备> [<字符串>] 打印或更改磁盘标签 ID（UUID）\n"
-#: disk-utils/sfdisk.c:2041
-#, fuzzy
+#: disk-utils/sfdisk.c:2068
msgid " --relocate <oper> <dev> move partition header\n"
-msgstr " -l, --list [<设备> ...] 列出每台设备上的分区\n"
+msgstr " --relocate <oper> <设备> 移动分区头\n"
-#: disk-utils/sfdisk.c:2044
+#: disk-utils/sfdisk.c:2071
msgid " <dev> device (usually disk) path\n"
msgstr " <设备> 设备(通常是磁盘)的路径\n"
-#: disk-utils/sfdisk.c:2045
+#: disk-utils/sfdisk.c:2072
msgid " <part> partition number\n"
msgstr " <分区> 分区号\n"
-#: disk-utils/sfdisk.c:2046
+#: 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:2049
+#: disk-utils/sfdisk.c:2076
msgid " -a, --append append partitions to existing partition table\n"
msgstr " -a, --append 将分区附加到已有分区表\n"
-#: disk-utils/sfdisk.c:2050
+#: disk-utils/sfdisk.c:2077
msgid " -b, --backup backup partition table sectors (see -O)\n"
msgstr " -b, --backup 备份分区表扇区(见 -O)\n"
-#: disk-utils/sfdisk.c:2051
+#: 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:2052
+#: 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:2053
+#: 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:2054
+#: disk-utils/sfdisk.c:2081
msgid " -f, --force disable all consistency checking\n"
msgstr " -f, --force 禁用所有的一致性检查\n"
-#: disk-utils/sfdisk.c:2057
+#: 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:2062
+#: disk-utils/sfdisk.c:2089
msgid " -N, --partno <num> specify partition number\n"
msgstr " -N, --partno <数字> 指定分区号\n"
-#: disk-utils/sfdisk.c:2063
+#: 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:2064
+#: 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:2065
+#: 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:2066
+#: 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:2067
+#: disk-utils/sfdisk.c:2094
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: disk-utils/sfdisk.c:2068
+#: disk-utils/sfdisk.c:2095
msgid " -q, --quiet suppress extra info messages\n"
msgstr " -q, --quiet 禁止输出额外信息\n"
-#: disk-utils/sfdisk.c:2070
+#: 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:2073
+#: 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:2074
+#: 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:2076
+#: 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:2077
+#: disk-utils/sfdisk.c:2104
msgid " -L, --Linux deprecated, only for backward compatibility\n"
msgstr " -L, --Linux 已废弃，仅为向后兼容\n"
-#: disk-utils/sfdisk.c:2078
+#: 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:2208
+#: disk-utils/sfdisk.c:2239
#, c-format
msgid "%s is deprecated in favour of --part-type"
msgstr "%s 已废弃，请改用 --part-type"
-#: disk-utils/sfdisk.c:2213
+#: disk-utils/sfdisk.c:2244
msgid "--id is deprecated in favour of --part-type"
msgstr "--id 已废弃，请改用 --part-type"
-#: disk-utils/sfdisk.c:2229
+#: 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:2241
+#: disk-utils/sfdisk.c:2272
msgid "--Linux option is unnecessary and deprecated"
msgstr "--Linux 选项没必要，并且已废弃"
-#: disk-utils/sfdisk.c:2270
+#: disk-utils/sfdisk.c:2301
#, c-format
msgid "unsupported unit '%c'"
msgstr "不支持的单位“%c”"
-#: disk-utils/sfdisk.c:2365
+#: disk-utils/sfdisk.c:2396
msgid "--movedata requires -N"
msgstr "--movedata 需要 -N"
msgid "ignore -U (UUIDs are unsupported)"
msgstr "忽略 -U (不支持 UUID)"
-#: include/c.h:260
+#: include/c.h:301
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "请尝试执行“%s --help”了解更多信息。\n"
-#: include/c.h:364
+#: include/c.h:446
msgid ""
"\n"
"Usage:\n"
"\n"
"用法：\n"
-#: include/c.h:365
+#: include/c.h:447
msgid ""
"\n"
"Options:\n"
"\n"
"选项：\n"
-#: include/c.h:366
+#: include/c.h:448
msgid ""
"\n"
"Functions:\n"
"\n"
"功能：\n"
-#: include/c.h:367
+#: include/c.h:449
msgid ""
"\n"
"Commands:\n"
"\n"
"命令：\n"
-#: include/c.h:368
-#, fuzzy
+#: include/c.h:450
msgid ""
"\n"
"Arguments:\n"
-msgstr "参数错误"
+msgstr ""
+"\n"
+"参数：\n"
-#: include/c.h:369
+#: include/c.h:451
msgid ""
"\n"
"Available output columns:\n"
"\n"
"可用的输出列：\n"
-#: include/c.h:372
+#: include/c.h:454
msgid "display this help"
msgstr "显示此帮助"
-#: include/c.h:373
+#: include/c.h:455
msgid "display version"
msgstr "显示版本"
-#: include/c.h:383
+#: include/c.h:465
#, c-format
msgid ""
" %s arguments may be followed by the suffixes for\n"
" GiB, TiB, PiB, EiB, ZiB, and YiB (the \"iB\" is optional)\n"
msgstr ""
+" %s 参数可能跟随一个后缀，包括\n"
+" GiB、TiB、PiB、EiB、ZiB 和 YiB（其中的“iB”是可选的）\n"
-#: include/c.h:386
+#: include/c.h:468
#, c-format
msgid ""
"\n"
"\n"
"更多信息请参阅 %s。\n"
-#: include/c.h:388
+#: 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:265
-#: login-utils/vipw.c:284 sys-utils/rtcwake.c:304 term-utils/setterm.c:833
+#: 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:1192
-#: login-utils/login.c:1196 term-utils/agetty.c:1207
+#: 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:53
+msgid "Linux root (Alpha)"
+msgstr "Linux root (Alpha)"
+
#: include/pt-gpt-partnames.h:54
+msgid "Linux root (ARC)"
+msgstr "Linux root (ARC)"
+
+#: include/pt-gpt-partnames.h:55
msgid "Linux root (ARM)"
msgstr "Linux root (ARM)"
-#: include/pt-gpt-partnames.h:55
+#: include/pt-gpt-partnames.h:56
msgid "Linux root (ARM-64)"
msgstr "Linux root (ARM-64)"
-#: include/pt-gpt-partnames.h:56
-#, fuzzy
-msgid "Linux root (IA-64)"
-msgstr "Linux root\t(IA-64)"
-
#: include/pt-gpt-partnames.h:57
-msgid "Linux reserved"
-msgstr "Linux 保留"
+msgid "Linux root (IA-64)"
+msgstr "Linux root (IA-64)"
#: include/pt-gpt-partnames.h:58
-msgid "Linux home"
-msgstr "Linux home"
+msgid "Linux root (LoongArch-64)"
+msgstr "Linux root (LoongArch-64)"
-#: include/pt-gpt-partnames.h:59 libfdisk/src/sgi.c:63
-msgid "Linux RAID"
-msgstr "Linux RAID"
+#: include/pt-gpt-partnames.h:59
+msgid "Linux root (MIPS-32 LE)"
+msgstr "Linux root (MIPS-32 LE)"
-#: include/pt-gpt-partnames.h:60 include/pt-mbr-partnames.h:61
-#: libfdisk/src/sgi.c:62 libfdisk/src/sun.c:53
-msgid "Linux LVM"
-msgstr "Linux LVM"
+#: 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 variable data"
-msgstr "Linux 保留数据"
+#| msgid "Linux root (ARC)"
+msgid "Linux root (HPPA/PARISC)"
+msgstr "Linux root (ARC)"
#: include/pt-gpt-partnames.h:62
-#, fuzzy
-msgid "Linux temporary data"
-msgstr "Linux 保留数据"
+msgid "Linux root (PPC)"
+msgstr "Linux root (PPC)"
#: include/pt-gpt-partnames.h:63
-#, fuzzy
-msgid "Linux /usr (x86)"
-msgstr "Linux root (x86)"
+msgid "Linux root (PPC64)"
+msgstr "Linux root (PPC64)"
#: include/pt-gpt-partnames.h:64
-#, fuzzy
-msgid "Linux /usr (x86-64)"
-msgstr "Linux root (x86-64)"
+msgid "Linux root (PPC64LE)"
+msgstr "Linux root (PPC64LE)"
#: include/pt-gpt-partnames.h:65
-#, fuzzy
-msgid "Linux /usr (ARM)"
-msgstr "Linux root (ARM)"
+msgid "Linux root (RISC-V-32)"
+msgstr "Linux root (RISC-V-32)"
#: include/pt-gpt-partnames.h:66
-#, fuzzy
-msgid "Linux /usr (ARM-64)"
-msgstr "Linux root (ARM-64)"
+msgid "Linux root (RISC-V-64)"
+msgstr "Linux root (RISC-V-64)"
#: include/pt-gpt-partnames.h:67
-#, fuzzy
-msgid "Linux /usr (IA-64)"
-msgstr "Linux root\t(IA-64)"
+msgid "Linux root (S390)"
+msgstr "Linux root (S390)"
#: include/pt-gpt-partnames.h:68
-#, fuzzy
-msgid "Linux root verity (x86)"
-msgstr "Linux root (x86)"
+msgid "Linux root (S390X)"
+msgstr "Linux root (S390X)"
#: include/pt-gpt-partnames.h:69
-#, fuzzy
-msgid "Linux root verity (x86-64)"
-msgstr "Linux root (x86-64)"
+msgid "Linux root (TILE-Gx)"
+msgstr "Linux root (TILE-Gx)"
#: include/pt-gpt-partnames.h:70
-#, fuzzy
-msgid "Linux root verity (ARM)"
-msgstr "Linux root (ARM)"
+msgid "Linux reserved"
+msgstr "Linux 保留"
#: include/pt-gpt-partnames.h:71
-#, fuzzy
-msgid "Linux root verity (ARM-64)"
-msgstr "Linux root (ARM-64)"
+msgid "Linux home"
+msgstr "Linux home"
-#: include/pt-gpt-partnames.h:72
-#, fuzzy
-msgid "Linux root verity (IA-64)"
-msgstr "Linux root\t(IA-64)"
+#: include/pt-gpt-partnames.h:72 libfdisk/src/sgi.c:63
+msgid "Linux RAID"
+msgstr "Linux RAID"
-#: include/pt-gpt-partnames.h:73
-#, fuzzy
-msgid "Linux /usr verity (x86)"
-msgstr "Linux root (x86)"
+#: 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"
#: include/pt-gpt-partnames.h:74
-#, fuzzy
-msgid "Linux /usr verity (x86-64)"
-msgstr "Linux root (x86-64)"
+msgid "Linux variable data"
+msgstr "Linux 可变数据"
#: include/pt-gpt-partnames.h:75
-#, fuzzy
-msgid "Linux /usr verity (ARM)"
-msgstr "Linux root (ARM)"
+msgid "Linux temporary data"
+msgstr "Linux 临时数据"
#: include/pt-gpt-partnames.h:76
-#, fuzzy
-msgid "Linux /usr verity (ARM-64)"
-msgstr "Linux root (ARM-64)"
+msgid "Linux /usr (x86)"
+msgstr "Linux /usr (x86)"
#: include/pt-gpt-partnames.h:77
-#, fuzzy
-msgid "Linux /usr verity (IA-64)"
-msgstr "Linux root\t(IA-64)"
+msgid "Linux /usr (x86-64)"
+msgstr "Linux /usr (x86-64)"
-#: include/pt-gpt-partnames.h:83 include/pt-mbr-partnames.h:95
-msgid "Linux extended boot"
-msgstr "Linux 扩展启动"
+#: include/pt-gpt-partnames.h:78
+msgid "Linux /usr (Alpha)"
+msgstr "Linux /usr (Alpha)"
+
+#: include/pt-gpt-partnames.h:79
+msgid "Linux /usr (ARC)"
+msgstr "Linux /usr (ARC)"
+
+#: include/pt-gpt-partnames.h:80
+msgid "Linux /usr (ARM)"
+msgstr "Linux /usr (ARM)"
+
+#: include/pt-gpt-partnames.h:81
+msgid "Linux /usr (ARM-64)"
+msgstr "Linux /usr (ARM-64)"
+
+#: include/pt-gpt-partnames.h:82
+msgid "Linux /usr (IA-64)"
+msgstr "Linux /usr (IA-64)"
+
+#: include/pt-gpt-partnames.h:83
+msgid "Linux /usr (LoongArch-64)"
+msgstr "Linux /usr (LoongArch-64)"
+
+#: include/pt-gpt-partnames.h:84
+msgid "Linux /usr (MIPS-32 LE)"
+msgstr "Linux /usr (MIPS-32 LE)"
+
+#: include/pt-gpt-partnames.h:85
+msgid "Linux /usr (MIPS-64 LE)"
+msgstr "Linux /usr (MIPS-64 LE)"
#: include/pt-gpt-partnames.h:86
#, fuzzy
-msgid "Linux user's home"
-msgstr "Linux home"
+#| msgid "Linux /usr (ARC)"
+msgid "Linux /usr (HPPA/PARISC)"
+msgstr "Linux /usr (ARC)"
+
+#: include/pt-gpt-partnames.h:87
+msgid "Linux /usr (PPC)"
+msgstr "Linux /usr (PPC)"
+
+#: include/pt-gpt-partnames.h:88
+msgid "Linux /usr (PPC64)"
+msgstr "Linux /usr (PPC64)"
#: include/pt-gpt-partnames.h:89
-msgid "FreeBSD data"
-msgstr "FreeBSD 数据"
+msgid "Linux /usr (PPC64LE)"
+msgstr "Linux /usr (PPC64LE)"
#: include/pt-gpt-partnames.h:90
-msgid "FreeBSD boot"
-msgstr "FreeBSD 启动"
+msgid "Linux /usr (RISC-V-32)"
+msgstr "Linux /usr (RISC-V-32)"
#: include/pt-gpt-partnames.h:91
-msgid "FreeBSD swap"
-msgstr "FreeBSD 交换"
+msgid "Linux /usr (RISC-V-64)"
+msgstr "Linux /usr (RISC-V-64)"
#: include/pt-gpt-partnames.h:92
-msgid "FreeBSD UFS"
-msgstr "FreeBSD UFS"
+msgid "Linux /usr (S390)"
+msgstr "Linux /usr (S390)"
#: include/pt-gpt-partnames.h:93
-msgid "FreeBSD ZFS"
-msgstr "FreeBSD ZFS"
+msgid "Linux /usr (S390X)"
+msgstr "Linux /usr (S390X)"
#: include/pt-gpt-partnames.h:94
-msgid "FreeBSD Vinum"
-msgstr "FreeBSD Vinum"
+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:96
+#, fuzzy
+#| msgid "Linux root (x86-64)"
+msgid "Linux root verity (x86-64)"
+msgstr "Linux root (x86-64)"
#: include/pt-gpt-partnames.h:97
-msgid "Apple HFS/HFS+"
-msgstr "Apple HFS/HFS+"
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux root verity (Alpha)"
+msgstr "Linux root (ARM)"
#: include/pt-gpt-partnames.h:98
-msgid "Apple APFS"
-msgstr "Apple APFS"
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux root verity (ARC)"
+msgstr "Linux root (ARM)"
#: include/pt-gpt-partnames.h:99
-msgid "Apple UFS"
-msgstr "Apple UFS"
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux root verity (ARM)"
+msgstr "Linux root (ARM)"
#: include/pt-gpt-partnames.h:100
-msgid "Apple RAID"
-msgstr "Apple RAID"
+#, fuzzy
+#| msgid "Linux root (ARM-64)"
+msgid "Linux root verity (ARM-64)"
+msgstr "Linux root (ARM-64)"
#: include/pt-gpt-partnames.h:101
-msgid "Apple RAID offline"
-msgstr "Apple RAID 离线"
+#, fuzzy
+#| msgid "Linux root\t(IA-64)"
+msgid "Linux root verity (IA-64)"
+msgstr "Linux root\t(IA-64)"
#: include/pt-gpt-partnames.h:102
-msgid "Apple boot"
-msgstr "Apple 启动"
+#, fuzzy
+#| msgid "Linux root\t(IA-64)"
+msgid "Linux root verity (LoongArch-64)"
+msgstr "Linux root\t(IA-64)"
#: include/pt-gpt-partnames.h:103
-msgid "Apple label"
-msgstr "Apple 标签"
+#, 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:104
-msgid "Apple TV recovery"
-msgstr "Apple TV 恢复"
+#, 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:105
-msgid "Apple Core storage"
-msgstr "Apple Core 存储"
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux root verity (HPPA/PARISC)"
+msgstr "Linux root (ARM)"
-#: include/pt-gpt-partnames.h:108 include/pt-mbr-partnames.h:77
-msgid "Solaris boot"
-msgstr "Solaris 启动"
+#: 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:107
+#, fuzzy
+#| msgid "Linux root\t(IA-64)"
+msgid "Linux root verity (PPC64)"
+msgstr "Linux root\t(IA-64)"
+
+#: 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:109
-msgid "Solaris root"
-msgstr "Solaris root"
+#, 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: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:111
-msgid "Solaris /usr & Apple ZFS"
-msgstr "Solaris /usr & Apple ZFS"
+#, fuzzy
+#| msgid "Linux root (x86)"
+msgid "Linux root verity (S390)"
+msgstr "Linux root (x86)"
#: include/pt-gpt-partnames.h:112
-msgid "Solaris swap"
-msgstr "Solaris 交换"
+#, fuzzy
+#| msgid "Linux root (x86)"
+msgid "Linux root verity (S390X)"
+msgstr "Linux root (x86)"
#: include/pt-gpt-partnames.h:113
-msgid "Solaris backup"
-msgstr "Solaris 备份"
+#, fuzzy
+#| msgid "Linux root\t(IA-64)"
+msgid "Linux root verity (TILE-Gx)"
+msgstr "Linux root\t(IA-64)"
#: include/pt-gpt-partnames.h:114
-msgid "Solaris /var"
-msgstr "Solaris /var"
+#, fuzzy
+#| msgid "Linux root (x86)"
+msgid "Linux /usr verity (x86)"
+msgstr "Linux root (x86)"
#: include/pt-gpt-partnames.h:115
-msgid "Solaris /home"
-msgstr "Solaris /home"
+#, fuzzy
+#| msgid "Linux root (x86-64)"
+msgid "Linux /usr verity (x86-64)"
+msgstr "Linux root (x86-64)"
#: include/pt-gpt-partnames.h:116
-msgid "Solaris alternate sector"
-msgstr "Solaris 备选扇区"
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux /usr verity (Alpha)"
+msgstr "Linux root (ARM)"
#: include/pt-gpt-partnames.h:117
-msgid "Solaris reserved 1"
-msgstr "Solaris 保留 1"
-
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux /usr verity (ARC)"
+msgstr "Linux root (ARM)"
+
#: include/pt-gpt-partnames.h:118
-msgid "Solaris reserved 2"
-msgstr "Solaris 保留 2"
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux /usr verity (ARM)"
+msgstr "Linux root (ARM)"
#: include/pt-gpt-partnames.h:119
-msgid "Solaris reserved 3"
-msgstr "Solaris 保留 3"
+#, fuzzy
+#| msgid "Linux root (ARM-64)"
+msgid "Linux /usr verity (ARM-64)"
+msgstr "Linux root (ARM-64)"
#: include/pt-gpt-partnames.h:120
-msgid "Solaris reserved 4"
-msgstr "Solaris 保留 4"
+#, fuzzy
+#| msgid "Linux root\t(IA-64)"
+msgid "Linux /usr verity (IA-64)"
+msgstr "Linux root\t(IA-64)"
#: include/pt-gpt-partnames.h:121
-msgid "Solaris reserved 5"
-msgstr "Solaris 保留 5"
+#, fuzzy
+#| msgid "Linux root\t(IA-64)"
+msgid "Linux /usr verity (LoongArch-64)"
+msgstr "Linux root\t(IA-64)"
+
+#: 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: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:124
-msgid "NetBSD swap"
-msgstr "NetBSD 交换"
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux /usr verity (HPPA/PARISC)"
+msgstr "Linux root (ARM)"
#: include/pt-gpt-partnames.h:125
-msgid "NetBSD FFS"
-msgstr "NetBSD FFS"
+#, fuzzy
+#| msgid "Linux root (x86)"
+msgid "Linux /usr verity (PPC)"
+msgstr "Linux root (x86)"
#: include/pt-gpt-partnames.h:126
-msgid "NetBSD LFS"
-msgstr "NetBSD LFS"
+#, fuzzy
+#| msgid "Linux root\t(IA-64)"
+msgid "Linux /usr verity (PPC64)"
+msgstr "Linux root\t(IA-64)"
#: include/pt-gpt-partnames.h:127
-msgid "NetBSD concatenated"
-msgstr "NetBSD concatenated"
+#, fuzzy
+#| msgid "Linux root\t(IA-64)"
+msgid "Linux /usr verity (PPC64LE)"
+msgstr "Linux root\t(IA-64)"
#: include/pt-gpt-partnames.h:128
-msgid "NetBSD encrypted"
-msgstr "NetBSD 加密"
+#, 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:129
-msgid "NetBSD RAID"
-msgstr "NetBSD RAID"
+#, 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:130
+#, fuzzy
+#| msgid "Linux root (x86)"
+msgid "Linux /usr verity (S390)"
+msgstr "Linux root (x86)"
+
+#: 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:132
-msgid "ChromeOS kernel"
-msgstr "ChromeOS 内核"
+#, fuzzy
+#| msgid "Linux root\t(IA-64)"
+msgid "Linux /usr verity (TILE-Gx)"
+msgstr "Linux root\t(IA-64)"
#: include/pt-gpt-partnames.h:133
-msgid "ChromeOS root fs"
-msgstr "ChromeOS 根文件系统"
+#, fuzzy
+#| msgid "Linux root (x86)"
+msgid "Linux root verity sign. (x86)"
+msgstr "Linux root (x86)"
#: include/pt-gpt-partnames.h:134
-msgid "ChromeOS reserved"
-msgstr "ChromeOS 保留"
+#, fuzzy
+#| msgid "Linux root (x86-64)"
+msgid "Linux root verity sign. (x86-64)"
+msgstr "Linux root (x86-64)"
+
+#: 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:136
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux root verity sign. (ARC)"
+msgstr "Linux root (ARM)"
#: include/pt-gpt-partnames.h:137
-msgid "MidnightBSD data"
-msgstr "MidnightBSD 数据"
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux root verity sign. (ARM)"
+msgstr "Linux root (ARM)"
#: include/pt-gpt-partnames.h:138
-msgid "MidnightBSD boot"
-msgstr "MidnightBSD 启动"
+#, fuzzy
+#| msgid "Linux root (ARM-64)"
+msgid "Linux root verity sign. (ARM-64)"
+msgstr "Linux root (ARM-64)"
#: include/pt-gpt-partnames.h:139
-msgid "MidnightBSD swap"
-msgstr "MidnightBSD 交换"
+#, 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:140
-msgid "MidnightBSD UFS"
-msgstr "MidnightBSD UFS"
+#, 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:141
-msgid "MidnightBSD ZFS"
-msgstr "MidnightBSD ZFS"
+#, 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:142
-msgid "MidnightBSD Vinum"
-msgstr "MidnightBSD Vinum"
+#, 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: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:145
-msgid "Ceph Journal"
-msgstr "Ceph 日志"
+#, fuzzy
+#| msgid "Linux root\t(IA-64)"
+msgid "Linux root verity sign. (PPC64)"
+msgstr "Linux root\t(IA-64)"
#: include/pt-gpt-partnames.h:146
-msgid "Ceph Encrypted Journal"
-msgstr "Ceph 加密日志"
+#, fuzzy
+#| msgid "Linux root\t(IA-64)"
+msgid "Linux root verity sign. (PPC64LE)"
+msgstr "Linux root\t(IA-64)"
#: include/pt-gpt-partnames.h:147
-msgid "Ceph OSD"
-msgstr "Ceph OSD"
+#, 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:148
-msgid "Ceph crypt OSD"
-msgstr "Ceph 加密 OSD"
+#, 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:149
-msgid "Ceph disk in creation"
-msgstr "创建中的 Ceph 磁盘"
+#, fuzzy
+#| msgid "Linux root (x86)"
+msgid "Linux root verity sign. (S390)"
+msgstr "Linux root (x86)"
#: include/pt-gpt-partnames.h:150
-msgid "Ceph crypt disk in creation"
-msgstr "创建中的加密 Ceph 磁盘"
+#, fuzzy
+#| msgid "Linux root (x86)"
+msgid "Linux root verity sign. (S390X)"
+msgstr "Linux root (x86)"
-#: include/pt-gpt-partnames.h:153 include/pt-mbr-partnames.h:104
-msgid "VMware VMFS"
-msgstr "VMware VMFS"
+#: 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:152
+#, fuzzy
+#| msgid "Linux root (x86)"
+msgid "Linux /usr verity sign. (x86)"
+msgstr "Linux root (x86)"
+
+#: 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:154
-msgid "VMware Diagnostic"
-msgstr "VMware 诊断"
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux /usr verity sign. (Alpha)"
+msgstr "Linux root (ARM)"
#: include/pt-gpt-partnames.h:155
#, fuzzy
-msgid "VMware Virtual SAN"
-msgstr "VMware VMFS"
+#| msgid "Linux root (ARM)"
+msgid "Linux /usr verity sign. (ARC)"
+msgstr "Linux root (ARM)"
#: include/pt-gpt-partnames.h:156
#, fuzzy
-msgid "VMware Virsto"
-msgstr "VMware VMFS"
+#| msgid "Linux root (ARM)"
+msgid "Linux /usr verity sign. (ARM)"
+msgstr "Linux root (ARM)"
#: include/pt-gpt-partnames.h:157
-msgid "VMware Reserved"
-msgstr "VMware 保留"
+#, fuzzy
+#| msgid "Linux root (ARM-64)"
+msgid "Linux /usr verity sign. (ARM-64)"
+msgstr "Linux root (ARM-64)"
+
+#: 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: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:160
-msgid "OpenBSD data"
-msgstr "OpenBSD 数据"
+#, 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: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:162
+#, fuzzy
+#| msgid "Linux root (ARM)"
+msgid "Linux /usr verity sign. (HPPA/PARISC)"
+msgstr "Linux root (ARM)"
#: include/pt-gpt-partnames.h:163
-msgid "QNX6 file system"
-msgstr "QNX6 文件系统"
+#, fuzzy
+#| msgid "Linux root (x86)"
+msgid "Linux /usr verity sign. (PPC)"
+msgstr "Linux root (x86)"
+
+#: 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: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:166
-msgid "Plan 9 partition"
-msgstr "Plan 9 分区"
+#, 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: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:168
+#, fuzzy
+#| msgid "Linux root (x86)"
+msgid "Linux /usr verity sign. (S390)"
+msgstr "Linux root (x86)"
#: include/pt-gpt-partnames.h:169
-msgid "HiFive Unleashed FSBL"
-msgstr "HiFive Unleashed FSBL"
+#, fuzzy
+#| msgid "Linux root (x86)"
+msgid "Linux /usr verity sign. (S390X)"
+msgstr "Linux root (x86)"
#: include/pt-gpt-partnames.h:170
-msgid "HiFive Unleashed BBL"
-msgstr "HiFive Unleashed BBL"
+#, fuzzy
+#| msgid "Linux root\t(IA-64)"
+msgid "Linux /usr verity sign. (TILE-Gx)"
+msgstr "Linux root\t(IA-64)"
-#: include/pt-mbr-partnames.h:1
-msgid "Empty"
-msgstr "空"
+#: include/pt-gpt-partnames.h:176 include/pt-mbr-partnames.h:99
+msgid "Linux extended boot"
+msgstr "Linux 扩展启动"
-#: include/pt-mbr-partnames.h:2
-msgid "FAT12"
-msgstr "FAT12"
+#: include/pt-gpt-partnames.h:179
+msgid "Linux user's home"
+msgstr "Linux 用户家分区"
-#: include/pt-mbr-partnames.h:3
-msgid "XENIX root"
-msgstr "XENIX root"
+#: include/pt-gpt-partnames.h:182
+msgid "FreeBSD data"
+msgstr "FreeBSD 数据"
-#: include/pt-mbr-partnames.h:4
-msgid "XENIX usr"
-msgstr "XENIX usr"
+#: include/pt-gpt-partnames.h:183
+msgid "FreeBSD boot"
+msgstr "FreeBSD 启动"
-#: include/pt-mbr-partnames.h:5
-msgid "FAT16 <32M"
-msgstr "FAT16 <32M"
+#: include/pt-gpt-partnames.h:184
+msgid "FreeBSD swap"
+msgstr "FreeBSD 交换"
-#: include/pt-mbr-partnames.h:6
-msgid "Extended"
-msgstr "扩展"
+#: include/pt-gpt-partnames.h:185
+msgid "FreeBSD UFS"
+msgstr "FreeBSD UFS"
-#: include/pt-mbr-partnames.h:7
-msgid "FAT16"
-msgstr "FAT16"
+#: include/pt-gpt-partnames.h:186
+msgid "FreeBSD ZFS"
+msgstr "FreeBSD ZFS"
-#: include/pt-mbr-partnames.h:8
-msgid "HPFS/NTFS/exFAT"
-msgstr "HPFS/NTFS/exFAT"
+#: include/pt-gpt-partnames.h:187
+msgid "FreeBSD Vinum"
+msgstr "FreeBSD Vinum"
-#: include/pt-mbr-partnames.h:9
-msgid "AIX"
-msgstr "AIX"
+#: include/pt-gpt-partnames.h:190
+msgid "Apple HFS/HFS+"
+msgstr "Apple HFS/HFS+"
-#: include/pt-mbr-partnames.h:10
-msgid "AIX bootable"
-msgstr "AIX 可启动"
+#: include/pt-gpt-partnames.h:191
+msgid "Apple APFS"
+msgstr "Apple APFS"
-#: include/pt-mbr-partnames.h:11
-msgid "OS/2 Boot Manager"
-msgstr "OS/2 启动管理器"
+#: include/pt-gpt-partnames.h:192
+msgid "Apple UFS"
+msgstr "Apple UFS"
-#: include/pt-mbr-partnames.h:12
-msgid "W95 FAT32"
-msgstr "W95 FAT32"
+#: include/pt-gpt-partnames.h:193
+msgid "Apple RAID"
+msgstr "Apple RAID"
-#: include/pt-mbr-partnames.h:13
-msgid "W95 FAT32 (LBA)"
-msgstr "W95 FAT32 (LBA)"
+#: include/pt-gpt-partnames.h:194
+msgid "Apple RAID offline"
+msgstr "Apple RAID 离线"
-#: include/pt-mbr-partnames.h:14
-msgid "W95 FAT16 (LBA)"
-msgstr "W95 FAT16 (LBA)"
+#: include/pt-gpt-partnames.h:195
+msgid "Apple boot"
+msgstr "Apple 启动"
+
+#: include/pt-gpt-partnames.h:196
+msgid "Apple label"
+msgstr "Apple 标签"
+
+#: include/pt-gpt-partnames.h:197
+msgid "Apple TV recovery"
+msgstr "Apple TV 恢复"
+
+#: include/pt-gpt-partnames.h:198
+msgid "Apple Core storage"
+msgstr "Apple Core 存储"
+
+#: 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:204
+msgid "Solaris root"
+msgstr "Solaris root"
+
+#: include/pt-gpt-partnames.h:206
+msgid "Solaris /usr & Apple ZFS"
+msgstr "Solaris /usr & Apple ZFS"
+
+#: include/pt-gpt-partnames.h:207
+msgid "Solaris swap"
+msgstr "Solaris 交换"
+
+#: include/pt-gpt-partnames.h:208
+msgid "Solaris backup"
+msgstr "Solaris 备份"
+
+#: include/pt-gpt-partnames.h:209
+msgid "Solaris /var"
+msgstr "Solaris /var"
+
+#: include/pt-gpt-partnames.h:210
+msgid "Solaris /home"
+msgstr "Solaris /home"
+
+#: include/pt-gpt-partnames.h:211
+msgid "Solaris alternate sector"
+msgstr "Solaris 备选扇区"
+
+#: include/pt-gpt-partnames.h:212
+msgid "Solaris reserved 1"
+msgstr "Solaris 保留 1"
+
+#: include/pt-gpt-partnames.h:213
+msgid "Solaris reserved 2"
+msgstr "Solaris 保留 2"
+
+#: include/pt-gpt-partnames.h:214
+msgid "Solaris reserved 3"
+msgstr "Solaris 保留 3"
+
+#: include/pt-gpt-partnames.h:215
+msgid "Solaris reserved 4"
+msgstr "Solaris 保留 4"
+
+#: include/pt-gpt-partnames.h:216
+msgid "Solaris reserved 5"
+msgstr "Solaris 保留 5"
+
+#: include/pt-gpt-partnames.h:224
+msgid "NetBSD swap"
+msgstr "NetBSD 交换"
+
+#: include/pt-gpt-partnames.h:225
+msgid "NetBSD FFS"
+msgstr "NetBSD FFS"
+
+#: include/pt-gpt-partnames.h:226
+msgid "NetBSD LFS"
+msgstr "NetBSD LFS"
+
+#: include/pt-gpt-partnames.h:227
+msgid "NetBSD concatenated"
+msgstr "NetBSD concatenated"
+
+#: include/pt-gpt-partnames.h:228
+msgid "NetBSD encrypted"
+msgstr "NetBSD 加密"
+
+#: include/pt-gpt-partnames.h:229
+msgid "NetBSD RAID"
+msgstr "NetBSD RAID"
+
+#: include/pt-gpt-partnames.h:232
+msgid "ChromeOS kernel"
+msgstr "ChromeOS 内核"
+
+#: include/pt-gpt-partnames.h:233
+msgid "ChromeOS root fs"
+msgstr "ChromeOS 根文件系统"
+
+#: include/pt-gpt-partnames.h:234
+msgid "ChromeOS reserved"
+msgstr "ChromeOS 保留"
+
+#: include/pt-gpt-partnames.h:237
+msgid "MidnightBSD data"
+msgstr "MidnightBSD 数据"
+
+#: include/pt-gpt-partnames.h:238
+msgid "MidnightBSD boot"
+msgstr "MidnightBSD 启动"
+
+#: include/pt-gpt-partnames.h:239
+msgid "MidnightBSD swap"
+msgstr "MidnightBSD 交换"
+
+#: include/pt-gpt-partnames.h:240
+msgid "MidnightBSD UFS"
+msgstr "MidnightBSD UFS"
+
+#: include/pt-gpt-partnames.h:241
+msgid "MidnightBSD ZFS"
+msgstr "MidnightBSD ZFS"
+
+#: include/pt-gpt-partnames.h:242
+msgid "MidnightBSD Vinum"
+msgstr "MidnightBSD Vinum"
+
+#: include/pt-gpt-partnames.h:245
+msgid "Ceph Journal"
+msgstr "Ceph 日志"
+
+#: include/pt-gpt-partnames.h:246
+msgid "Ceph Encrypted Journal"
+msgstr "Ceph 加密日志"
+
+#: include/pt-gpt-partnames.h:247
+msgid "Ceph OSD"
+msgstr "Ceph OSD"
+
+#: include/pt-gpt-partnames.h:248
+msgid "Ceph crypt OSD"
+msgstr "Ceph 加密 OSD"
+
+#: include/pt-gpt-partnames.h:249
+msgid "Ceph disk in creation"
+msgstr "创建中的 Ceph 磁盘"
+
+#: include/pt-gpt-partnames.h:250
+msgid "Ceph crypt disk in creation"
+msgstr "创建中的加密 Ceph 磁盘"
+
+#: include/pt-gpt-partnames.h:253 include/pt-mbr-partnames.h:109
+msgid "VMware VMFS"
+msgstr "VMware VMFS"
+
+#: include/pt-gpt-partnames.h:254
+msgid "VMware Diagnostic"
+msgstr "VMware 诊断"
+
+#: include/pt-gpt-partnames.h:255
+msgid "VMware Virtual SAN"
+msgstr "VMware Virtual SAN"
+
+#: include/pt-gpt-partnames.h:256
+msgid "VMware Virsto"
+msgstr "VMware Virsto"
+
+#: include/pt-gpt-partnames.h:257
+msgid "VMware Reserved"
+msgstr "VMware 保留"
+
+#: include/pt-gpt-partnames.h:260
+msgid "OpenBSD data"
+msgstr "OpenBSD 数据"
+
+#: include/pt-gpt-partnames.h:263
+msgid "QNX6 file system"
+msgstr "QNX6 文件系统"
+
+#: include/pt-gpt-partnames.h:266
+msgid "Plan 9 partition"
+msgstr "Plan 9 分区"
+
+#: include/pt-gpt-partnames.h:269
+msgid "HiFive FSBL"
+msgstr "HiFive FSBL"
+
+#: include/pt-gpt-partnames.h:270
+msgid "HiFive BBL"
+msgstr "HiFive BBL"
+
+#: 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:5
+msgid "Empty"
+msgstr "空"
+
+#: include/pt-mbr-partnames.h:6
+msgid "FAT12"
+msgstr "FAT12"
+
+#: include/pt-mbr-partnames.h:7
+msgid "XENIX root"
+msgstr "XENIX root"
+
+#: include/pt-mbr-partnames.h:8
+msgid "XENIX usr"
+msgstr "XENIX usr"
+
+#: include/pt-mbr-partnames.h:9
+msgid "FAT16 <32M"
+msgstr "FAT16 <32M"
+
+#: include/pt-mbr-partnames.h:10
+msgid "Extended"
+msgstr "扩展"
+
+#: include/pt-mbr-partnames.h:11
+msgid "FAT16"
+msgstr "FAT16"
+
+#: include/pt-mbr-partnames.h:12
+msgid "HPFS/NTFS/exFAT"
+msgstr "HPFS/NTFS/exFAT"
+
+#: include/pt-mbr-partnames.h:13
+msgid "AIX"
+msgstr "AIX"
+
+#: include/pt-mbr-partnames.h:14
+msgid "AIX bootable"
+msgstr "AIX 可启动"
#: include/pt-mbr-partnames.h:15
+msgid "OS/2 Boot Manager"
+msgstr "OS/2 启动管理器"
+
+#: include/pt-mbr-partnames.h:16
+msgid "W95 FAT32"
+msgstr "W95 FAT32"
+
+#: include/pt-mbr-partnames.h:17
+msgid "W95 FAT32 (LBA)"
+msgstr "W95 FAT32 (LBA)"
+
+#: include/pt-mbr-partnames.h:18
+msgid "W95 FAT16 (LBA)"
+msgstr "W95 FAT16 (LBA)"
+
+#: 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:105
+#: include/pt-mbr-partnames.h:108
+msgid "EBBR protective"
+msgstr ""
+
+#: include/pt-mbr-partnames.h:110
msgid "VMware VMKCORE"
msgstr "VMware VMKCORE"
-#: include/pt-mbr-partnames.h:106 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:109
+#: include/pt-mbr-partnames.h:114
msgid "LANstep"
msgstr "LANstep"
-#: include/pt-mbr-partnames.h:110
+#: include/pt-mbr-partnames.h:115
msgid "BBT"
msgstr "BBT"
-#: lib/blkdev.c:274
+#: lib/blkdev.c:286
#, c-format
msgid "warning: %s is misaligned"
msgstr "警告：%s 未正确对齐"
-#: lib/blkdev.c:386
-#, fuzzy, c-format
+#: lib/blkdev.c:398
+#, c-format
msgid "unsupported lock mode: %s"
-msgstr "ä¸\8dæ\94¯æ\8c\81ç\9a\84é¢\9cè\89²æ¨¡å¼\8f"
+msgstr "ä¸\8dæ\94¯æ\8c\81ç\9a\84é\94\81模å¼\8fï¼\9a%s"
-#: lib/blkdev.c:396
+#: lib/blkdev.c:408
#, c-format
msgid "%s: %s: device already locked, waiting to get lock ... "
-msgstr ""
+msgstr "%s：%s：设备已锁定，等待获取锁……"
-#: lib/blkdev.c:405
-#, fuzzy, c-format
+#: lib/blkdev.c:417
+#, c-format
msgid "%s: device already locked"
-msgstr "%s 已经挂载"
+msgstr "%s：设备已锁定"
-#: lib/blkdev.c:408
-#, fuzzy, c-format
+#: lib/blkdev.c:420
+#, c-format
msgid "%s: failed to get lock"
-msgstr "获取锁失败"
+msgstr "%s：获取锁失败"
-#: lib/blkdev.c:411
-#, fuzzy, c-format
+#: lib/blkdev.c:423
+#, c-format
msgid "OK\n"
-msgstr "正常"
+msgstr "正常\n"
-#: libfdisk/src/ask.c:505 libfdisk/src/ask.c:517
+#: libfdisk/src/ask.c:509 libfdisk/src/ask.c:521
#, c-format
msgid "Selected partition %ju"
msgstr "已选择分区 %ju"
-#: libfdisk/src/ask.c:508
+#: libfdisk/src/ask.c:512
msgid "No partition is defined yet!"
msgstr "还没有定义分区！"
-#: libfdisk/src/ask.c:520
+#: libfdisk/src/ask.c:524
msgid "No free partition available!"
msgstr "无空闲分区可用！"
-#: libfdisk/src/ask.c:530
+#: libfdisk/src/ask.c:534
msgid "Partition number"
msgstr "分区号"
-#: libfdisk/src/ask.c:1027
+#: libfdisk/src/ask.c:1031
#, c-format
msgid "Created a new partition %d of type '%s' and of size %s."
msgstr "创建了一个新分区 %d，类型为“%s”，大小为 %s。"
msgid "There is no *BSD partition on %s."
msgstr "%s 上没有 *BSD 分区。"
-#: libfdisk/src/bsd.c:258 libfdisk/src/dos.c:968
+#: libfdisk/src/bsd.c:258 libfdisk/src/dos.c:1050
msgid "First cylinder"
msgstr "第一个柱面"
-#: libfdisk/src/bsd.c:291 libfdisk/src/dos.c:1353
+#: libfdisk/src/bsd.c:291 libfdisk/src/dos.c:1436
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:1358 libfdisk/src/gpt.c:2495
+#: 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 "Sectors/Cylinder"
msgstr "扇区/柱面"
-#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1029 libfdisk/src/dos.c:2613
-#: libfdisk/src/sgi.c:1161 libfdisk/src/sun.c:203 libfdisk/src/sun.c:1133
+#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1029 libfdisk/src/dos.c:2806
+#: libfdisk/src/sgi.c:1162 libfdisk/src/sun.c:203 libfdisk/src/sun.c:1133
msgid "Cylinders"
msgstr "柱面"
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
-#, fuzzy
+#: 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) 或 kpartx(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 "不完整的几何属性设置。"
-#: libfdisk/src/dos.c:225
+#: libfdisk/src/dos.c:217
msgid "All primary partitions have been defined already."
msgstr "已经定义了所有主分区。"
-#: libfdisk/src/dos.c:228
+#: libfdisk/src/dos.c:220
msgid "Primary partition not available."
msgstr "主分区不可用。"
-#: libfdisk/src/dos.c:282
+#: libfdisk/src/dos.c:274
#, c-format
msgid "Failed to read extended partition table (offset=%ju)"
msgstr "读取扩展分区表失败(偏移=%ju)"
-#: libfdisk/src/dos.c:352
+#: libfdisk/src/dos.c:344
msgid "You can set geometry from the extra functions menu."
msgstr "您可以从 更多功能 菜单获取几何属性。"
-#: libfdisk/src/dos.c:355
+#: libfdisk/src/dos.c:347
msgid "DOS-compatible mode is deprecated."
msgstr "DOS 兼容模式已废弃。"
-#: libfdisk/src/dos.c:359
+#: libfdisk/src/dos.c:351
msgid "The device presents a logical sector size that is smaller than the physical sector size. Aligning to a physical sector (or optimal I/O) size boundary is recommended, or performance may be impacted."
msgstr "设备上存在一个小于物理扇区尺寸的逻辑扇区尺寸。建议您对齐到物理扇区(或最佳 I/O)尺寸边界，否则性能可能受影响。"
-#: libfdisk/src/dos.c:365
+#: libfdisk/src/dos.c:357
msgid "Cylinders as display units are deprecated."
msgstr "以柱面为显示单位的方式已废弃。"
-#: libfdisk/src/dos.c:372
+#: libfdisk/src/dos.c:364
#, c-format
msgid "The size of this disk is %s (%ju bytes). DOS partition table format cannot be used on drives for volumes larger than %lu bytes for %lu-byte sectors. Use GUID partition table format (GPT)."
msgstr "该磁盘的大小为 %s （%ju 字节）。DOS 分区表不能用于卷容量大于 %lu 字节、%lu 字节扇区的驱动器。请使用 GUID 分区表格式（GPT）。"
-#: libfdisk/src/dos.c:546
+#: libfdisk/src/dos.c:540
msgid "Bad offset in primary extended partition."
msgstr "主扩展分区中的偏移错误。"
-#: libfdisk/src/dos.c:560
+#: libfdisk/src/dos.c:554
#, c-format
msgid "Omitting partitions after #%zu. They will be deleted if you save this partition table."
msgstr "警告：将忽略 #%zu 后的扇区。如果您保存此分区表，它们会被删除。"
-#: libfdisk/src/dos.c:593
+#: libfdisk/src/dos.c:587
#, c-format
msgid "Extra link pointer in partition table %zu."
msgstr "在分区表 %zu 中有额外链接指针。"
-#: libfdisk/src/dos.c:601
+#: libfdisk/src/dos.c:595
#, c-format
msgid "Ignoring extra data in partition table %zu."
msgstr "将忽略分区表 %zu 中的额外数据。"
-#: libfdisk/src/dos.c:657
+#: libfdisk/src/dos.c:651
#, c-format
msgid "omitting empty partition (%zu)"
msgstr "将忽略空分区(%zu)"
-#: libfdisk/src/dos.c:717
-#, c-format
-msgid "Created a new DOS disklabel with disk identifier 0x%08x."
+#: libfdisk/src/dos.c:711
+#, 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:740
+#: libfdisk/src/dos.c:734
msgid "Enter the new disk identifier"
msgstr "输入新磁盘标识符"
-#: libfdisk/src/dos.c:749
+#: libfdisk/src/dos.c:743
msgid "Incorrect value."
msgstr "无效的值。"
-#: libfdisk/src/dos.c:762
+#: libfdisk/src/dos.c:756
#, c-format
msgid "Disk identifier changed from 0x%08x to 0x%08x."
msgstr "磁盘标识从 0x%08x 改为 0x%08x。"
-#: libfdisk/src/dos.c:864
+#: libfdisk/src/dos.c:952
#, c-format
msgid "Ignoring extra extended partition %zu"
msgstr "将忽略额外的扩展分区 %zu"
-#: libfdisk/src/dos.c:878
+#: libfdisk/src/dos.c:966
#, c-format
msgid "Invalid flag 0x%02x%02x of EBR (for partition %zu) will be corrected by w(rite)."
msgstr "分区表 %3$zu 的无效标志 0x%1$02x%2$02x 将通过写入来更正"
-#: libfdisk/src/dos.c:955
+#: libfdisk/src/dos.c:1037
#, c-format
msgid "Start sector %ju out of range."
msgstr "起始扇区 %ju 超出范围。"
-#: libfdisk/src/dos.c:1194 libfdisk/src/gpt.c:2369 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:1209 libfdisk/src/dos.c:1235 libfdisk/src/dos.c:1292
-#: libfdisk/src/dos.c:1324 libfdisk/src/gpt.c:2378
+#: libfdisk/src/dos.c:1291 libfdisk/src/dos.c:1317 libfdisk/src/dos.c:1375
+#: libfdisk/src/dos.c:1407 libfdisk/src/gpt.c:2418
msgid "No free sectors available."
msgstr "无空闲扇区可用。"
-#: libfdisk/src/dos.c:1260
+#: libfdisk/src/dos.c:1342
#, c-format
-msgid "Sector %llu is already allocated."
-msgstr "扇区 %llu 已经分配."
+msgid "Sector %ju is already allocated."
+msgstr "扇区 %ju 已经分配。"
-#: libfdisk/src/dos.c:1479
+#: libfdisk/src/dos.c:1562
#, c-format
msgid "Adding logical partition %zu"
msgstr "添加逻辑分区 %zu"
-#: libfdisk/src/dos.c:1510
+#: libfdisk/src/dos.c:1594
#, c-format
msgid "Partition %zu: contains sector 0"
msgstr "分区 %zu：包含扇区 0"
-#: libfdisk/src/dos.c:1512
+#: libfdisk/src/dos.c:1598
#, c-format
msgid "Partition %zu: head %d greater than maximum %d"
msgstr "分区 %zu：磁头 %d 大于最大值 %d"
-#: libfdisk/src/dos.c:1515
-#, c-format
-msgid "Partition %zu: sector %d greater than maximum %llu"
+#: libfdisk/src/dos.c:1603
+#, fuzzy, c-format
+#| msgid "Partition %zu: sector %d greater than maximum %llu"
+msgid "Partition %zu: sector %d greater than maximum %ju"
msgstr "分区 %zu：扇区 %d 大于最大值 %llu"
-#: libfdisk/src/dos.c:1518
-#, c-format
-msgid "Partition %zu: cylinder %d greater than maximum %llu"
+#: libfdisk/src/dos.c:1609
+#, fuzzy, c-format
+#| msgid "Partition %zu: cylinder %d greater than maximum %llu"
+msgid "Partition %zu: cylinder %d greater than maximum %ju"
msgstr "分区 %zu：柱面 %d 大于最大值 %llu"
-#: libfdisk/src/dos.c:1524
-#, c-format
-msgid "Partition %zu: previous sectors %u disagrees with total %u"
+#: libfdisk/src/dos.c:1616
+#, fuzzy, c-format
+#| msgid "Partition %zu: previous sectors %u disagrees with total %u"
+msgid "Partition %zu: LBA sector %u disagrees with C/H/S calculated sector %u"
msgstr "分区 %zu：之前的扇区数 %u 与总数 %u 不符"
-#: libfdisk/src/dos.c:1577
+#: libfdisk/src/dos.c:1675
#, c-format
msgid "Partition %zu: different physical/logical beginnings (non-Linux?): phys=(%d, %d, %d), logical=(%d, %d, %d)"
msgstr "分区 %zu 的物理/逻辑起点不同(非 Linux 分区？)：物理=(%d, %d, %d), 逻辑=(%d, %d, %d)"
-#: libfdisk/src/dos.c:1588
+#: libfdisk/src/dos.c:1687
#, c-format
msgid "Partition %zu: different physical/logical endings: phys=(%d, %d, %d), logical=(%d, %d, %d)"
msgstr "分区 %zu 的物理/逻辑终点不同：物理=(%d, %d, %d), 逻辑=(%d, %d, %d)"
-#: libfdisk/src/dos.c:1597
+#: libfdisk/src/dos.c:1697
#, c-format
msgid "Partition %zu: does not end on cylinder boundary."
msgstr "分区 %zu 未结束在柱面边界上。"
-#: libfdisk/src/dos.c:1645
+#: libfdisk/src/dos.c:1748
#, c-format
msgid "Partition %zu: bad start-of-data."
msgstr "分区 %zu：数据起点错误。"
-#: libfdisk/src/dos.c:1660
+#: libfdisk/src/dos.c:1764
#, c-format
msgid "Partition %zu: overlaps partition %zu."
msgstr "分区 %zu：与 分区 %zu 重叠。"
-#: libfdisk/src/dos.c:1689
+#: libfdisk/src/dos.c:1793
#, c-format
msgid "Partition %zu: empty."
msgstr "分区 %zu：空分区。"
-#: libfdisk/src/dos.c:1696
+#: libfdisk/src/dos.c:1800
#, c-format
msgid "Logical partition %zu: not entirely in partition %zu."
msgstr "逻辑分区 %zu：没有完全在分区 %zu 中。"
-#: libfdisk/src/dos.c:1705 libfdisk/src/gpt.c:2275
+#: libfdisk/src/dos.c:1809 libfdisk/src/gpt.c:2315
msgid "No errors detected."
msgstr "未检测到错误。"
-#: libfdisk/src/dos.c:1707
-#, c-format
-msgid "Total allocated sectors %llu greater than the maximum %llu."
+#: libfdisk/src/dos.c:1811
+#, fuzzy, c-format
+#| msgid "Total allocated sectors %llu greater than the maximum %llu."
+msgid "Total allocated sectors %ju greater than the maximum %ju."
msgstr "分配的总扇区数 %llu 大于最大值 %llu。"
-#: libfdisk/src/dos.c:1710
-#, c-format
-msgid "Remaining %lld unallocated %ld-byte sectors."
+#: libfdisk/src/dos.c:1814
+#, fuzzy, c-format
+#| msgid "Remaining %lld unallocated %ld-byte sectors."
+msgid "Remaining %ju unallocated %ld-byte sectors."
msgstr "剩余 %lld 未分配的 %ld字节 扇区。"
-#: libfdisk/src/dos.c:1714 libfdisk/src/gpt.c:2295
+#: libfdisk/src/dos.c:1818 libfdisk/src/gpt.c:2335
#, c-format
msgid "%d error detected."
msgid_plural "%d errors detected."
msgstr[0] "检测到 %d 个错误。"
-#: libfdisk/src/dos.c:1747
+#: libfdisk/src/dos.c:1851
msgid "The maximum number of partitions has been created."
msgstr "已创建分区达到最大数量。"
-#: libfdisk/src/dos.c:1780 libfdisk/src/dos.c:1795 libfdisk/src/dos.c:2248
+#: libfdisk/src/dos.c:1884 libfdisk/src/dos.c:1899 libfdisk/src/dos.c:2352
msgid "Extended partition already exists."
msgstr "扩展分区已存在。"
-#: libfdisk/src/dos.c:1810
+#: libfdisk/src/dos.c:1914
msgid "Extended partition does not exists. Failed to add logical partition."
msgstr "扩展分区不存在。添加逻辑分区失败。"
-#: libfdisk/src/dos.c:1871
+#: libfdisk/src/dos.c:1974
msgid "All primary partitions are in use."
msgstr "所有主分区都在使用中。"
-#: libfdisk/src/dos.c:1873 libfdisk/src/dos.c:1885
+#: libfdisk/src/dos.c:1976 libfdisk/src/dos.c:1988
msgid "All space for primary partitions is in use."
msgstr "所有主分区的空间都在使用中。"
#. TRANSLATORS: Try to keep this within 80 characters.
-#: libfdisk/src/dos.c:1888
+#: libfdisk/src/dos.c:1991
msgid "To create more partitions, first replace a primary with an extended partition."
msgstr "要创建更多分区，请先将一个主分区替换为扩展分区。"
-#: libfdisk/src/dos.c:1909
+#: libfdisk/src/dos.c:2012
msgid "Partition type"
msgstr "分区类型"
-#: libfdisk/src/dos.c:1913
-#, fuzzy, c-format
+#: libfdisk/src/dos.c:2016
+#, c-format
msgid "%u primary, %d extended, %u free"
-msgstr "%zu个主分区，%d个扩展分区，%zu空闲"
+msgstr "%u个主分区，%d个扩展分区，%u空闲"
-#: libfdisk/src/dos.c:1918
+#: libfdisk/src/dos.c:2021
msgid "primary"
msgstr "主分区"
-#: libfdisk/src/dos.c:1920
+#: libfdisk/src/dos.c:2023
msgid "extended"
msgstr "扩展分区"
-#: libfdisk/src/dos.c:1920
+#: libfdisk/src/dos.c:2023
msgid "container for logical partitions"
msgstr "逻辑分区容器"
-#: libfdisk/src/dos.c:1922
+#: libfdisk/src/dos.c:2025
msgid "logical"
msgstr "逻辑分区"
-#: libfdisk/src/dos.c:1922
+#: libfdisk/src/dos.c:2025
msgid "numbered from 5"
msgstr "从 5 开始编号"
-#: libfdisk/src/dos.c:1961
+#: libfdisk/src/dos.c:2064
#, c-format
msgid "Invalid partition type `%c'."
msgstr "无效的分区类型“%c”。"
-#: libfdisk/src/dos.c:1979
+#: libfdisk/src/dos.c:2082
#, c-format
msgid "Cannot write sector %jd: seek failed"
msgstr "写扇区 %jd 失败：定位失败"
-#: libfdisk/src/dos.c:2139 libfdisk/src/gpt.c:1294
+#: libfdisk/src/dos.c:2242 libfdisk/src/gpt.c:1291
msgid "Disk identifier"
msgstr "磁盘标识符"
-#: libfdisk/src/dos.c:2253
+#: libfdisk/src/dos.c:2357
msgid "Type 0 means free space to many systems. Having partitions of type 0 is probably unwise."
msgstr "很多系统将类型 0 视为空闲空间。不建议设置类型为 0 的分区。"
-#: libfdisk/src/dos.c:2258
+#: libfdisk/src/dos.c:2362
msgid "Cannot change type of the extended partition which is already used by logical partitions. Delete logical partitions first."
msgstr "无法更改已被逻辑分区使用的扩展分区的类型。请先删除逻辑分区。"
-#: libfdisk/src/dos.c:2444 libfdisk/src/gpt.c:3100
-msgid "Nothing to do. Ordering is correct already."
-msgstr "无须操作。顺序已经是正确的了。"
-
-#: libfdisk/src/dos.c:2499
+#: libfdisk/src/dos.c:2684
#, c-format
msgid "Partition %zu: no data area."
msgstr "分区 %zu：无数据区。"
-#: libfdisk/src/dos.c:2532
+#: libfdisk/src/dos.c:2718
msgid "New beginning of data"
msgstr "新数据起点"
-#: libfdisk/src/dos.c:2588
+#: libfdisk/src/dos.c:2735
+msgid "The new beginning of the partition overlaps the disk label area. Be very careful when using the partition. You can lose all your partitions on the disk."
+msgstr ""
+
+#: libfdisk/src/dos.c:2781
#, c-format
msgid "Partition %zu: is an extended partition."
msgstr "分区 %zu：是一个扩展分区。"
-#: libfdisk/src/dos.c:2594
+#: libfdisk/src/dos.c:2787
#, c-format
msgid "The bootable flag on partition %zu is enabled now."
msgstr "分区 %zu 的 可启动 标志已启用。"
-#: libfdisk/src/dos.c:2595
+#: libfdisk/src/dos.c:2788
#, c-format
msgid "The bootable flag on partition %zu is disabled now."
msgstr "分区 %zu 的 可启动 标志已禁用。"
-#: libfdisk/src/dos.c:2608 libfdisk/src/gpt.c:3189 libfdisk/src/sgi.c:1157
+#: libfdisk/src/dos.c:2801 libfdisk/src/gpt.c:3243 libfdisk/src/sgi.c:1158
#: libfdisk/src/sun.c:1129
msgid "Device"
msgstr "设备"
-#: libfdisk/src/dos.c:2609 libfdisk/src/sun.c:40
+#: libfdisk/src/dos.c:2802 libfdisk/src/sun.c:40
msgid "Boot"
msgstr "启动"
-#: libfdisk/src/dos.c:2615 libfdisk/src/sgi.c:1163 libfdisk/src/sun.c:1135
+#: libfdisk/src/dos.c:2808 libfdisk/src/sgi.c:1164 libfdisk/src/sun.c:1135
msgid "Id"
msgstr "Id"
-#: libfdisk/src/dos.c:2619
+#: libfdisk/src/dos.c:2812
msgid "Start-C/H/S"
msgstr "起始-C/H/S"
-#: libfdisk/src/dos.c:2620
+#: libfdisk/src/dos.c:2813
msgid "End-C/H/S"
msgstr "终-C/H/S"
-#: libfdisk/src/dos.c:2621 libfdisk/src/gpt.c:3199 libfdisk/src/sgi.c:1165
+#: libfdisk/src/dos.c:2814 libfdisk/src/gpt.c:3253 libfdisk/src/sgi.c:1166
msgid "Attrs"
msgstr "属性"
-#: libfdisk/src/gpt.c:690
+#: libfdisk/src/gpt.c:691
msgid "failed to allocate GPT header"
msgstr "分配 GPT 头失败"
-#: libfdisk/src/gpt.c:799
+#: libfdisk/src/gpt.c:800
msgid "First LBA specified by script is out of range."
msgstr "脚本指定的第一个 LBA 超出范围。"
-#: libfdisk/src/gpt.c:811
+#: libfdisk/src/gpt.c:812
msgid "Last LBA specified by script is out of range."
msgstr "脚本指定的最后一个 LBA 超出范围。"
-#: libfdisk/src/gpt.c:952
+#: libfdisk/src/gpt.c:953
#, c-format
msgid "GPT PMBR size mismatch (%<PRIu64> != %<PRIu64>) will be corrected by write."
msgstr "GPT PMBR 大小不符（%<PRIu64> != %<PRIu64>），将用写入予以更正。"
-#: libfdisk/src/gpt.c:977
+#: libfdisk/src/gpt.c:978
msgid "gpt: stat() failed"
msgstr "gpt：stat() 失败"
-#: libfdisk/src/gpt.c:987
+#: libfdisk/src/gpt.c:988
#, c-format
msgid "gpt: cannot handle files with mode %o"
msgstr "gpt：无法操作模式为 %o 的文件"
-#: libfdisk/src/gpt.c:1252
+#: libfdisk/src/gpt.c:1248
msgid "GPT Header"
msgstr "GPT 头"
-#: libfdisk/src/gpt.c:1257
+#: libfdisk/src/gpt.c:1253
msgid "GPT Entries"
msgstr "GPT 记录项"
-#: libfdisk/src/gpt.c:1263
-#, fuzzy
+#: libfdisk/src/gpt.c:1259
msgid "GPT Backup Entries"
-msgstr "GPT 记录项"
+msgstr "GPT 备份记录项"
-#: libfdisk/src/gpt.c:1269
-#, fuzzy
+#: libfdisk/src/gpt.c:1265
msgid "GPT Backup Header"
-msgstr "GPT 头"
+msgstr "GPT å¤\87份头"
-#: libfdisk/src/gpt.c:1301
-msgid "First LBA"
-msgstr "第一个 LBA"
+#: libfdisk/src/gpt.c:1298
+msgid "First usable LBA"
+msgstr "第一个可用 LBA"
-#: libfdisk/src/gpt.c:1306
-msgid "Last LBA"
-msgstr "最后一个 LBA"
+#: libfdisk/src/gpt.c:1303
+msgid "Last usable LBA"
+msgstr "最后一个可用 LBA"
#. TRANSLATORS: The LBA (Logical Block Address) of the backup GPT header.
-#: libfdisk/src/gpt.c:1312
+#: libfdisk/src/gpt.c:1309
msgid "Alternative LBA"
msgstr "替代 LBA"
#. TRANSLATORS: The start of the array of partition entries.
-#: libfdisk/src/gpt.c:1318
-msgid "Partition entries LBA"
+#: 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:1321
+#, fuzzy
+#| msgid "Partition entries LBA"
+msgid "Partition entries ending LBA"
msgstr "分区记录项 LBA"
-#: libfdisk/src/gpt.c:1323
+#: libfdisk/src/gpt.c:1328
msgid "Allocated partition entries"
msgstr "已分配的分区项"
-#: libfdisk/src/gpt.c:1665
+#: 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:1675
+#: 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:1691
-#, fuzzy
+#: libfdisk/src/gpt.c:1696
msgid "The backup GPT table is not on the end of the device."
-msgstr "备份 GPT 表损坏，但主表似乎正常，将使用它。"
+msgstr "备份 GPT 表不在设备的末尾位置。"
-#: libfdisk/src/gpt.c:1694
+#: 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:1698
+#: 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:1853
+#: libfdisk/src/gpt.c:1858
#, c-format
msgid "unsupported GPT attribute bit '%s'"
msgstr "不支持的 GPT 属性位“%s”"
-#: libfdisk/src/gpt.c:1858
+#: 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:1958
+#: libfdisk/src/gpt.c:1963
#, c-format
msgid "Partition UUID changed from %s to %s."
msgstr "分区 UUID 已从 %s 更改为 %s。"
-#: libfdisk/src/gpt.c:1967
+#: libfdisk/src/gpt.c:1972
msgid "Failed to translate partition name, name not changed."
msgstr "翻译分区名称失败，名称未改变。"
-#: libfdisk/src/gpt.c:1969
+#: libfdisk/src/gpt.c:1974
#, c-format
msgid "Partition name changed from '%s' to '%.*s'."
msgstr "分区名已由“%s”改为“%.*s”。"
-#: libfdisk/src/gpt.c:1998
+#: libfdisk/src/gpt.c:2003
msgid "The start of the partition understeps FirstUsableLBA."
msgstr "分区起点未到首个可用 LBA。"
-#: libfdisk/src/gpt.c:2005
+#: libfdisk/src/gpt.c:2010
msgid "The end of the partition oversteps LastUsableLBA."
msgstr "分区终点超过了最后可用 LBA。"
-#: libfdisk/src/gpt.c:2163
+#: libfdisk/src/gpt.c:2203
msgid "The device contains hybrid MBR -- writing GPT only."
msgstr "该设备包含混合 MBR -- 将只写入 GPT。"
-#: libfdisk/src/gpt.c:2199
+#: libfdisk/src/gpt.c:2239
msgid "Disk does not contain a valid backup header."
msgstr "磁盘不含有效的备用磁头。"
-#: libfdisk/src/gpt.c:2204
+#: libfdisk/src/gpt.c:2244
msgid "Invalid primary header CRC checksum."
msgstr "无效的主磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:2208
+#: libfdisk/src/gpt.c:2248
msgid "Invalid backup header CRC checksum."
msgstr "无效的备份磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:2213
+#: libfdisk/src/gpt.c:2253
msgid "Invalid partition entry checksum."
msgstr "无效的分区记录校验和。"
-#: libfdisk/src/gpt.c:2218
+#: libfdisk/src/gpt.c:2258
msgid "Invalid primary header LBA sanity checks."
msgstr "无效的主磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:2222
+#: libfdisk/src/gpt.c:2262
msgid "Invalid backup header LBA sanity checks."
msgstr "无效的备用磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:2227
+#: libfdisk/src/gpt.c:2267
msgid "MyLBA mismatch with real position at primary header."
msgstr "MyLBA 不匹配，真正位置在主磁头。"
-#: libfdisk/src/gpt.c:2231
+#: libfdisk/src/gpt.c:2271
msgid "MyLBA mismatch with real position at backup header."
msgstr "MyLBA 不匹配，真正位置在备份磁头。"
-#: libfdisk/src/gpt.c:2236
+#: libfdisk/src/gpt.c:2276
msgid "Disk is too small to hold all data."
msgstr "磁盘太小，放不下所有数据。"
-#: libfdisk/src/gpt.c:2246
+#: libfdisk/src/gpt.c:2286
msgid "Primary and backup header mismatch."
msgstr "主磁头和备份磁头不匹配。"
-#: libfdisk/src/gpt.c:2252
+#: libfdisk/src/gpt.c:2292
#, c-format
msgid "Partition %u overlaps with partition %u."
msgstr "分区 %u 与 %u 重叠。"
-#: libfdisk/src/gpt.c:2259
+#: libfdisk/src/gpt.c:2299
#, c-format
msgid "Partition %u is too big for the disk."
msgstr "分区 %u 对于该磁盘而言过大。"
-#: libfdisk/src/gpt.c:2266
+#: libfdisk/src/gpt.c:2306
#, c-format
msgid "Partition %u ends before it starts."
msgstr "分区 %u 结束于起点之前。"
-#: libfdisk/src/gpt.c:2276
+#: libfdisk/src/gpt.c:2316
#, c-format
msgid "Header version: %s"
msgstr "磁头版本：%s"
-#: libfdisk/src/gpt.c:2277
+#: 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:2287
+#: 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:2374
+#: libfdisk/src/gpt.c:2414
msgid "All partitions are already in use."
msgstr "所有分区均已占用。"
-#: libfdisk/src/gpt.c:2431 libfdisk/src/gpt.c:2458
+#: libfdisk/src/gpt.c:2465
+#, fuzzy
+#| msgid "No free sectors available."
+msgid "No enough free sectors available."
+msgstr "无空闲扇区可用。"
+
+#: libfdisk/src/gpt.c:2479 libfdisk/src/gpt.c:2506
#, c-format
msgid "Sector %ju already used."
msgstr "扇区 %ju 已使用。"
-#: libfdisk/src/gpt.c:2524
+#: libfdisk/src/gpt.c:2580
#, c-format
msgid "Could not create partition %zu"
msgstr "无法创建分区 %zu"
-#: libfdisk/src/gpt.c:2531
+#: 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:2538
+#: 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:2677
+#: libfdisk/src/gpt.c:2733
#, c-format
msgid "Created a new GPT disklabel (GUID: %s)."
msgstr "已创建新的 GPT 磁盘标签(GUID: %s)。"
-#: libfdisk/src/gpt.c:2680
+#: libfdisk/src/gpt.c:2736
#, fuzzy, c-format
-msgid "The maximal number of partitions is %d (default is %d)."
+#| 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:2702
+#: 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:2710
+#: libfdisk/src/gpt.c:2766
msgid "Failed to parse your UUID."
msgstr "解析您的 UUID 失败。"
-#: libfdisk/src/gpt.c:2724
+#: libfdisk/src/gpt.c:2780
#, c-format
msgid "Disk identifier changed from %s to %s."
msgstr "将磁盘标识从 %s 更改为 %s 失败。"
-#: libfdisk/src/gpt.c:2744
+#: libfdisk/src/gpt.c:2800
msgid "Not enough space for new partition table!"
msgstr "创建新分区表的空闲空间不够！"
-#: libfdisk/src/gpt.c:2755
+#: 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:2760
+#: 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:2806
+#: libfdisk/src/gpt.c:2862
msgid "The partition entry size is zero."
msgstr "分区条目大小为零。"
-#: libfdisk/src/gpt.c:2808
+#: 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:2832
+#: libfdisk/src/gpt.c:2888
msgid "Cannot allocate memory!"
msgstr "无法分配内存！"
-#: libfdisk/src/gpt.c:2861
-#, c-format
-msgid "Partition table length changed from %<PRIu32> to %<PRIu64>."
+#: 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:2971
+#: 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:3021
+#: libfdisk/src/gpt.c:3077
msgid "Enter GUID specific bit"
msgstr "输入 GUID 特定位"
-#: libfdisk/src/gpt.c:3036
+#: libfdisk/src/gpt.c:3092
#, c-format
msgid "failed to toggle unsupported bit %lu"
msgstr "开/关不支持的位 %lu 失败"
-#: libfdisk/src/gpt.c:3049
+#: 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:3050
+#: 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:3054
+#: 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:3055
+#: 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:3196
+#: libfdisk/src/gpt.c:3250
msgid "Type-UUID"
msgstr "类型-UUID"
-#: libfdisk/src/gpt.c:3197
+#: libfdisk/src/gpt.c:3251
msgid "UUID"
msgstr "UUID"
-#: libfdisk/src/gpt.c:3198 login-utils/chfn.c:156 login-utils/chfn.c:158
-#: login-utils/chfn.c:322
+#: libfdisk/src/gpt.c:3252 login-utils/chfn.c:151 login-utils/chfn.c:153
+#: login-utils/chfn.c:316
msgid "Name"
msgstr "名称"
-#: libfdisk/src/partition.c:871
+#: libfdisk/src/label.c:597
+msgid "Partitions order fixed."
+msgstr "已修复分区顺序。"
+
+#: libfdisk/src/label.c:600
+msgid "Nothing to do. Ordering is correct already."
+msgstr "无须操作。顺序已经是正确的了。"
+
+#: libfdisk/src/label.c:603
+msgid "Failed to fix partitions order."
+msgstr "修复分区顺序失败。"
+
+#: libfdisk/src/partition.c:879
msgid "Free space"
msgstr "剩余空间"
-#: libfdisk/src/partition.c:1295
+#: libfdisk/src/partition.c:1373
#, c-format
msgid "Failed to resize partition #%zu."
msgstr "调整分区 #%zu 的大小失败。"
-#: libfdisk/src/parttype.c:288 misc-utils/findmnt.c:670
+#: libfdisk/src/parttype.c:291 misc-utils/findmnt.c:753
#: misc-utils/uuidparse.c:199 misc-utils/uuidparse.c:217 schedutils/chrt.c:127
-#: schedutils/ionice.c:79 sys-utils/hwclock.c:282
+#: schedutils/ionice.c:81 sys-utils/hwclock.c:286
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"
msgstr "最后 %s 或+%s 或 +大小{K,M,G,T,P}"
#: libfdisk/src/sgi.c:989 libfdisk/src/sun.c:248
-#, c-format
-msgid "BLKGETSIZE ioctl failed on %s. Using geometry cylinder value of %llu. This value may be truncated for devices > 33.8 GB."
+#, fuzzy, c-format
+#| msgid "BLKGETSIZE ioctl failed on %s. Using geometry cylinder value of %llu. This value may be truncated for devices > 33.8 GB."
+msgid "BLKGETSIZE ioctl failed on %s. Using geometry cylinder value of %ju. This value may be truncated for devices > 33.8 GB."
msgstr "对 %s 执行 BLKGETSIZE ioctl 失败。将使用几何 柱面 属性值 %llu。对于大于 33.8 GB 的设备，这个值可能被截短。"
-#: libfdisk/src/sgi.c:1055
+#: libfdisk/src/sgi.c:1056
msgid "Created a new SGI disklabel."
msgstr "创建新的SGI 磁盘标签。"
-#: libfdisk/src/sgi.c:1074
+#: libfdisk/src/sgi.c:1075
msgid "Sorry, only for non-empty partitions you can change the tag."
msgstr "抱歉，只有非空分区才能更改标志(tag)。"
-#: libfdisk/src/sgi.c:1080
+#: libfdisk/src/sgi.c:1081
msgid "Consider leaving partition 9 as volume header (0), and partition 11 as entire volume (6), as IRIX expects it."
msgstr "考虑将分区 9 留作卷头(volume header) (0)，分区 11 作为整卷(6)，以符合 IRIX 规定。"
-#: libfdisk/src/sgi.c:1089
+#: libfdisk/src/sgi.c:1090
msgid "It is highly recommended that the partition at offset 0 is of type \"SGI volhdr\", the IRIX system will rely on it to retrieve from its directory standalone tools like sash and fx. Only the \"SGI volume\" entire disk section may violate this. Are you sure about tagging this partition differently?"
msgstr "强烈建议偏移 0 处的分区设为“SGI volhdr”类型，IRIX 会依靠它从它的目录中获取独立的工具，如 sash 和 fx。只有“SGI volume”整磁盘部分(entire disk section)能违反这一规定。您确定要将这一分区标记成其他类型吗？"
#: libfdisk/src/sun.c:86
#, c-format
-msgid "%#zu: start cylinder overflows Sun label limits"
+msgid "#%zu: start cylinder overflows Sun label limits"
msgstr ""
#: libfdisk/src/sun.c:89
#, c-format
-msgid "%#zu: number of sectors overflow Sun label limits"
+msgid "#%zu: number of sectors overflow Sun label limits"
msgstr ""
#: libfdisk/src/sun.c:136
"和启动锁。\n"
"您确信要把该分区标记为 Linux 交换分区吗？"
-#: libmount/src/context.c:2791
+#: 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:1653
+#: libmount/src/context_mount.c:1404
#, c-format
msgid "WARNING: failed to apply propagation flags"
msgstr "警告：应用传播标志失败"
-#: libmount/src/context_mount.c:1663
+#: 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:1677
+#: libmount/src/context_mount.c:1428
#, c-format
msgid "operation permitted for root only"
msgstr "操作只允许由 root 进行"
-#: libmount/src/context_mount.c:1681
+#: libmount/src/context_mount.c:1432
#, c-format
msgid "%s is already mounted"
msgstr "%s 已经挂载"
-#: libmount/src/context_mount.c:1687
+#: libmount/src/context_mount.c:1438
#, c-format
msgid "can't find in %s"
msgstr "无法在 %s 中找到"
-#: libmount/src/context_mount.c:1690
+#: libmount/src/context_mount.c:1441
#, c-format
msgid "can't find mount point in %s"
msgstr "无法在 %s 中找到挂载点"
-#: libmount/src/context_mount.c:1693
+#: 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:1698
+#: 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:1703
+#: libmount/src/context_mount.c:1454
#, c-format
msgid "failed to determine filesystem type"
msgstr "无法确定文件系统类型"
-#: libmount/src/context_mount.c:1704
-#, 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:1711
+#: libmount/src/context_mount.c:1462
#, c-format
msgid "can't find %s"
msgstr "找不到 %s"
-#: libmount/src/context_mount.c:1713
+#: libmount/src/context_mount.c:1464
#, c-format
msgid "no mount source specified"
msgstr "未指定挂载来源"
-#: libmount/src/context_mount.c:1719
+#: 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: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:1479
#, c-format
msgid "failed to parse mount options: %m"
msgstr "解析挂臷选项失败：%m"
-#: libmount/src/context_mount.c:1720
+#: libmount/src/context_mount.c:1480
#, c-format
msgid "failed to parse mount options"
msgstr "解析挂臷选项失败"
-#: libmount/src/context_mount.c:1724
+#: 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:1728
+#: 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:1732 libmount/src/context_umount.c:1270
-#, fuzzy, c-format
+#: libmount/src/context_mount.c:1493 libmount/src/context_umount.c:1263
+#, c-format
msgid "locking failed"
-msgstr "关闭 %s 失败"
+msgstr "锁定失败"
-#: libmount/src/context_mount.c:1736 libmount/src/context_umount.c:1276
-#: sys-utils/umount.c:257 sys-utils/umount.c:273
+#: 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:1739
+#: 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:1749
+#: 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:1755
+#: 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:1762
+#: 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:1780 libmount/src/context_mount.c:1825
+#: 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:1782 login-utils/newgrp.c:226
+#: libmount/src/context_mount.c:1564 login-utils/newgrp.c:228
#, c-format
msgid "permission denied"
msgstr "权限不足"
-#: libmount/src/context_mount.c:1784
+#: libmount/src/context_mount.c:1566
#, c-format
msgid "must be superuser to use mount"
msgstr "必须以超级用户身份使用 mount"
-#: libmount/src/context_mount.c:1791
+#: libmount/src/context_mount.c:1573
#, c-format
msgid "mount point is busy"
msgstr "挂载点忙"
-#: libmount/src/context_mount.c:1798
+#: libmount/src/context_mount.c:1580
#, c-format
msgid "%s already mounted on %s"
msgstr "%s 已挂载于 %s"
-#: libmount/src/context_mount.c:1802
+#: libmount/src/context_mount.c:1584
#, c-format
msgid "%s already mounted or mount point busy"
msgstr "%s 已经挂载或挂载点忙"
-#: libmount/src/context_mount.c:1807
+#: libmount/src/context_mount.c:1589
#, c-format
msgid "mount point does not exist"
msgstr "挂载点不存在"
-#: libmount/src/context_mount.c:1810
+#: libmount/src/context_mount.c:1592
#, c-format
msgid "mount point is a symbolic link to nowhere"
msgstr "挂载点是一个没有目标的符号链接"
-#: libmount/src/context_mount.c:1815
+#: libmount/src/context_mount.c:1597
#, c-format
msgid "special device %s does not exist"
msgstr "特殊设备 %s 不存在"
-#: libmount/src/context_mount.c:1818 libmount/src/context_mount.c:1834
-#: libmount/src/context_mount.c:1918 libmount/src/context_mount.c:1941
+#: 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:1830
+#: 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:1842
+#: libmount/src/context_mount.c:1624
#, c-format
msgid "mount point not mounted or bad option"
msgstr "挂载点未挂载或选项有误"
-#: libmount/src/context_mount.c:1844
+#: libmount/src/context_mount.c:1626
#, c-format
msgid "not mount point or bad option"
msgstr "不是一个挂载点或选项有误"
-#: libmount/src/context_mount.c:1847
+#: 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:1851
+#: 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:1855
+#: 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:1862
+#: libmount/src/context_mount.c:1644
#, c-format
msgid "mount table full"
msgstr "挂载表满"
-#: libmount/src/context_mount.c:1867
+#: libmount/src/context_mount.c:1649
#, c-format
msgid "can't read superblock on %s"
msgstr "无法读取 %s 上的超级块"
-#: libmount/src/context_mount.c:1874
+#: libmount/src/context_mount.c:1656
#, c-format
msgid "unknown filesystem type '%s'"
msgstr "未知的文件系统类型“%s”"
-#: libmount/src/context_mount.c:1877
+#: libmount/src/context_mount.c:1659
#, c-format
msgid "unknown filesystem type"
msgstr "未知的文件系统类型"
-#: libmount/src/context_mount.c:1886
+#: 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:1889
+#: 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:1892
+#: 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:1894
+#: libmount/src/context_mount.c:1676
#, c-format
msgid "%s is not a block device"
msgstr "%s 不是一个块设备"
-#: libmount/src/context_mount.c:1901
+#: libmount/src/context_mount.c:1683
#, c-format
msgid "%s is not a valid block device"
msgstr "%s 不是一个有效的块设备"
-#: libmount/src/context_mount.c:1909
+#: libmount/src/context_mount.c:1691
#, c-format
msgid "cannot mount %s read-only"
msgstr "无法以只读方式挂载 %s"
-#: libmount/src/context_mount.c:1911
+#: 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:1913
+#: libmount/src/context_mount.c:1695
#, c-format
msgid "cannot remount %s read-write, is write-protected"
msgstr "无法以读写方式重新挂载 %s，它是写保护的"
-#: libmount/src/context_mount.c:1915
+#: libmount/src/context_mount.c:1697
#, c-format
msgid "bind %s failed"
msgstr "绑定 %s 失败"
-#: libmount/src/context_mount.c:1926
+#: libmount/src/context_mount.c:1708
#, c-format
msgid "no medium found on %s"
msgstr "在 %s 上找不到媒体"
-#: libmount/src/context_mount.c:1933
+#: libmount/src/context_mount.c:1715
#, c-format
msgid "cannot mount; probably corrupted filesystem on %s"
msgstr "无法挂载；%s 上的文件系统可能已损坏"
-#: libmount/src/context_umount.c:1264 libmount/src/context_umount.c:1318
+#: libmount/src/context_umount.c:1257 libmount/src/context_umount.c:1311
#, c-format
msgid "not mounted"
msgstr "未挂载"
-#: libmount/src/context_umount.c:1280
+#: libmount/src/context_umount.c:1273
#, c-format
msgid "umount failed: %m"
msgstr "挂载失败：%m"
-#: libmount/src/context_umount.c:1289
+#: 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:1295
-#, fuzzy, c-format
+#: 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:1302
+#: 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:1315
+#: libmount/src/context_umount.c:1308
#, c-format
msgid "invalid block device"
msgstr "无效的块设备"
-#: libmount/src/context_umount.c:1321
+#: libmount/src/context_umount.c:1314
#, c-format
msgid "can't write superblock"
msgstr "无法写超级块"
-#: libmount/src/context_umount.c:1324
+#: libmount/src/context_umount.c:1317
#, c-format
msgid "target is busy"
msgstr "目标忙"
-#: libmount/src/context_umount.c:1327
+#: libmount/src/context_umount.c:1320
#, c-format
msgid "no mount point specified"
msgstr "未指定挂载点"
-#: libmount/src/context_umount.c:1330
+#: libmount/src/context_umount.c:1323
#, c-format
msgid "must be superuser to unmount"
msgstr "必须以超级用户身份卸载"
-#: libmount/src/context_umount.c:1333
+#: libmount/src/context_umount.c:1326
#, c-format
msgid "block devices are not permitted on filesystem"
msgstr "文件系统不允许块设备"
-#: libmount/src/context_umount.c:1336
+#: 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
-#, fuzzy, c-format
-#| msgid "time %ld is out of range."
+#: lib/timeutils.c:531 lib/timeutils.c:555
+#, c-format
msgid "time %<PRId64> is out of range."
-msgstr "时间 %ld 超出范围。"
+msgstr "时间 %<PRId64> 超出范围。"
-#: login-utils/chfn.c:96 login-utils/chsh.c:75 login-utils/lslogins.c:1382
+#: 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"
-#: login-utils/chfn.c:99
+#: login-utils/chfn.c:94
msgid "Change your finger information.\n"
msgstr "更改您的 finger 信息。\n"
-#: login-utils/chfn.c:102
+#: login-utils/chfn.c:97
msgid " -f, --full-name <full-name> real name\n"
msgstr " -f, --full-name <全名> 真实姓名\n"
-#: login-utils/chfn.c:103
+#: login-utils/chfn.c:98
msgid " -o, --office <office> office number\n"
msgstr " -o, --office <办公> 办公号码\n"
-#: login-utils/chfn.c:104
+#: login-utils/chfn.c:99
msgid " -p, --office-phone <phone> office phone number\n"
msgstr " -p, --office-phone <电话> 办公电话\n"
-#: login-utils/chfn.c:105
+#: login-utils/chfn.c:100
msgid " -h, --home-phone <phone> home phone number\n"
msgstr " -h, --home-phone <电话> 住宅电话\n"
-#: login-utils/chfn.c:123
+#: login-utils/chfn.c:118
#, c-format
msgid "field %s is too long"
msgstr "字段 %s 过长"
-#: login-utils/chfn.c:127 login-utils/chsh.c:237
+#: login-utils/chfn.c:122 login-utils/chsh.c:182
#, c-format
msgid "%s: has illegal characters"
msgstr "%s：含有非法字符"
-#: login-utils/chfn.c:156 login-utils/chfn.c:162 login-utils/chfn.c:168
-#: login-utils/chfn.c:174
+#: login-utils/chfn.c:151 login-utils/chfn.c:157 login-utils/chfn.c:163
+#: login-utils/chfn.c:169
#, c-format
msgid "login.defs forbids setting %s"
msgstr "login.defs 禁止设置 %s"
-#: login-utils/chfn.c:162 login-utils/chfn.c:164 login-utils/chfn.c:324
+#: login-utils/chfn.c:157 login-utils/chfn.c:159 login-utils/chfn.c:318
msgid "Office"
msgstr "办公"
-#: login-utils/chfn.c:168 login-utils/chfn.c:170 login-utils/chfn.c:326
+#: login-utils/chfn.c:163 login-utils/chfn.c:165 login-utils/chfn.c:320
msgid "Office Phone"
msgstr "办公电话"
-#: login-utils/chfn.c:174 login-utils/chfn.c:176 login-utils/chfn.c:328
+#: login-utils/chfn.c:169 login-utils/chfn.c:171 login-utils/chfn.c:322
msgid "Home Phone"
msgstr "住宅电话"
-#: login-utils/chfn.c:193 login-utils/chsh.c:187
+#: login-utils/chfn.c:189 login-utils/chsh.c:135
msgid "cannot handle multiple usernames"
msgstr "无法处理多个用户名"
-#: login-utils/chfn.c:247
+#: login-utils/chfn.c:240
msgid "Aborted."
msgstr "已中止。"
-#: login-utils/chfn.c:310
+#: login-utils/chfn.c:304
#, c-format
msgid "%s: CHFN_RESTRICT has unexpected value: %s"
msgstr "%s: CHFN_RESTRICT 的值异常：%s"
-#: login-utils/chfn.c:312
+#: login-utils/chfn.c:306
#, c-format
msgid "%s: CHFN_RESTRICT does not allow any changes"
msgstr "%s: CHFN_RESTRICT 不允许更改"
-#: login-utils/chfn.c:394
+#: login-utils/chfn.c:388
#, c-format
msgid "Finger information *NOT* changed. Try again later.\n"
msgstr "Finger 信息*没有*更改。请稍后重试。\n"
-#: login-utils/chfn.c:398
+#: login-utils/chfn.c:392
#, c-format
msgid "Finger information changed.\n"
msgstr "Finger 信息已更改。\n"
-#: login-utils/chfn.c:424 login-utils/chsh.c:274
+#: 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:430 login-utils/chsh.c:279 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:436 login-utils/chsh.c:285
+#: login-utils/chfn.c:430 login-utils/chsh.c:230
msgid "can only change local entries"
msgstr "只能更改本地记录"
-#: login-utils/chfn.c:445
+#: 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:447 login-utils/chsh.c:295
+#: login-utils/chfn.c:441 login-utils/chsh.c:240
msgid "Unknown user context"
msgstr "未知用户环境(context)"
-#: login-utils/chfn.c:452 login-utils/chsh.c:300
+#: 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:463
+#: 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:467
+#: login-utils/chfn.c:461
#, c-format
msgid "Changing finger information for %s.\n"
msgstr "正在更改 %s 的 finger 信息。\n"
-#: login-utils/chfn.c:481
+#: login-utils/chfn.c:475
#, c-format
msgid "Finger information not changed.\n"
msgstr "Finger 信息未更改。\n"
-#: login-utils/chsh.c:78
+#: login-utils/chsh.c:73
msgid "Change your login shell.\n"
msgstr "更改您的登录 shell。\n"
-#: login-utils/chsh.c:81
+#: login-utils/chsh.c:76
msgid " -s, --shell <shell> specify login shell\n"
msgstr " -s, --shell <shell> 指定登录 shell\n"
-#: login-utils/chsh.c:82
+#: 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:231
+#: login-utils/chsh.c:176
msgid "shell must be a full path name"
msgstr "shell 必须为完整路径名称"
-#: login-utils/chsh.c:233
+#: login-utils/chsh.c:178
#, c-format
msgid "\"%s\" does not exist"
msgstr "“%s”不存在"
-#: login-utils/chsh.c:235
+#: login-utils/chsh.c:180
#, c-format
msgid "\"%s\" is not executable"
msgstr "“%s”不可执行"
-#: login-utils/chsh.c:241
+#: login-utils/chsh.c:186
#, c-format
msgid "Warning: \"%s\" is not listed in %s."
msgstr "警告：“%s”未在 %s 中列出。"
-#: login-utils/chsh.c:245 login-utils/chsh.c:249
+#: 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:294
+#: 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:319
+#: 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:324
+#: 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:328
+#: login-utils/chsh.c:273
#, c-format
msgid "Changing shell for %s.\n"
msgstr "正在更改 %s 的 shell。\n"
-#: login-utils/chsh.c:336
+#: login-utils/chsh.c:281
msgid "New shell"
msgstr "新 shell"
-#: login-utils/chsh.c:344
+#: login-utils/chsh.c:289
msgid "Shell not changed."
msgstr "Shell 未更改。"
-#: login-utils/chsh.c:349
+#: login-utils/chsh.c:294
msgid "Shell *NOT* changed. Try again later."
msgstr "Shell *未* 更改。请稍后重试。"
-#: login-utils/chsh.c:353
+#: login-utils/chsh.c:298
msgid ""
"setpwnam failed\n"
"Shell *NOT* changed. Try again later."
"setpwnam 失败\n"
"Shell *未* 更改。请稍后重试。"
-#: login-utils/chsh.c:357
+#: 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:174 login-utils/lslogins.c:1373 sys-utils/dmesg.c:1300
-#: sys-utils/lsipc.c:282
+#: 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:285 login-utils/last.c:293
-#, c-format
-msgid "Interrupted %s"
-msgstr "中断的 %s"
-
-#: login-utils/last.c:451 login-utils/last.c:462 login-utils/last.c:912
+#: login-utils/last.c:439 login-utils/last.c:450 login-utils/last.c:901
msgid "preallocation size exceeded"
msgstr "超过了预分配大小"
-#: login-utils/last.c:581
+#: login-utils/last.c:568
#, c-format
msgid " %s [options] [<username>...] [<tty>...]\n"
msgstr " %s [选项] [<用户名>...] [<tty>...]\n"
-#: login-utils/last.c:584
+#: login-utils/last.c:571
msgid "Show a listing of last logged in users.\n"
msgstr "显示上次登录用户的列表。\n"
-#: login-utils/last.c:587
+#: login-utils/last.c:574
msgid " -<number> how many lines to show\n"
msgstr " -<数字> 显示行数\n"
-#: login-utils/last.c:588
+#: login-utils/last.c:575
msgid " -a, --hostlast display hostnames in the last column\n"
msgstr " -a, --hostlast 最后一列显示主机名\n"
-#: login-utils/last.c:589
+#: 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:591
+#: 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:592
+#: 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:593
+#: 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:594
+#: login-utils/last.c:581
msgid " -n, --limit <number> how many lines to show\n"
msgstr " -n, --limit <数字> 要显示的行数\n"
-#: login-utils/last.c:595
+#: login-utils/last.c:582
msgid " -R, --nohostname don't display the hostname field\n"
msgstr " -R, --nohostname 不显示主机名字段\n"
-#: login-utils/last.c:596
+#: 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:597
+#: 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:598
+#: 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:599
+#: login-utils/last.c:586
msgid " -w, --fullnames display full user and domain names\n"
msgstr " -w, --fullnames 显示完整的用户名和域名\n"
-#: login-utils/last.c:600
+#: 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:601
+#: 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:913
+#: login-utils/last.c:902
#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "%s begins %s"
msgid ""
"\n"
"%s begins %s\n"
"\n"
"%s 开始 %s"
-#: login-utils/last.c:1022 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:281 text-utils/more.c:287
+#: 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:1043 login-utils/last.c:1048 login-utils/last.c:1053
-#: sys-utils/dmesg.c:1514 sys-utils/dmesg.c:1522 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\""
#: login-utils/login.c:467
#, fuzzy, c-format
+#| msgid "chown (%s, %lu, %lu) failed: %m"
msgid "chown (%s, %u, %u) failed: %m"
msgstr "chown (%s, %lu, %lu) 失败：%m"
msgid "chmod (%s, %u) failed: %m"
msgstr "chmod (%s, %u) 失败：%m"
-#: login-utils/login.c:534
+#: login-utils/login.c:535
msgid "FATAL: bad tty"
msgstr "致命：坏的 tty"
-#: login-utils/login.c:552
+#: login-utils/login.c:551
+#, c-format
+msgid "TIOCGWINSZ ioctl failed: %m"
+msgstr "TIOCGWINSZ ioctl 失败: %m"
+
+#: login-utils/login.c:559
#, c-format
msgid "FATAL: %s: change permissions failed: %m"
msgstr "致命：%s：更改权限失败：%m"
-#: login-utils/login.c:682
+#: login-utils/login.c:588
+#, c-format
+msgid "TIOCSWINSZ ioctl failed: %m"
+msgstr "TIOCSWINSZ ioctl 失败: %m"
+
+#: login-utils/login.c:694
#, c-format
msgid "Last login: %.*s "
msgstr "上次登录：%.*s "
-#: login-utils/login.c:686
-#, fuzzy, c-format
+#: login-utils/login.c:698
+#, c-format
msgid "from %s\n"
-msgstr "来自 %.*s\n"
+msgstr "来自 %s\n"
-#: login-utils/login.c:689
-#, fuzzy, c-format
+#: login-utils/login.c:701
+#, c-format
msgid "on %s\n"
-msgstr "于 %.*s\n"
+msgstr "于 %s\n"
-#: login-utils/login.c:705
+#: login-utils/login.c:717
msgid "write lastlog failed"
msgstr "写 lastlog 失败"
-#: login-utils/login.c:796
+#: login-utils/login.c:808
#, c-format
msgid "DIALUP AT %s BY %s"
msgstr "DIALUP AT %s BY %s"
-#: login-utils/login.c:801
+#: login-utils/login.c:813
#, c-format
msgid "ROOT LOGIN ON %s FROM %s"
msgstr "ROOT LOGIN ON %s FROM %s"
-#: login-utils/login.c:804
+#: login-utils/login.c:816
#, c-format
msgid "ROOT LOGIN ON %s"
msgstr "ROOT LOGIN ON %s"
-#: login-utils/login.c:807
+#: login-utils/login.c:819
#, c-format
msgid "LOGIN ON %s BY %s FROM %s"
msgstr "LOGIN ON %s BY %s FROM %s"
-#: login-utils/login.c:810
+#: login-utils/login.c:822
#, c-format
msgid "LOGIN ON %s BY %s"
msgstr "LOGIN ON %s BY %s"
-#: login-utils/login.c:845
+#: login-utils/login.c:857
msgid "login: "
msgstr "登录："
-#: login-utils/login.c:881
+#: login-utils/login.c:893
#, c-format
msgid "PAM failure, aborting: %s"
msgstr "PAM 失败，将中止：%s"
-#: login-utils/login.c:882
+#: login-utils/login.c:894
#, c-format
msgid "Couldn't initialize PAM: %s"
msgstr "无法初始化 PAM：%s"
-#: login-utils/login.c:955
+#: login-utils/login.c:967
#, c-format
msgid "FAILED LOGIN %u FROM %s FOR %s, %s"
msgstr "FAILED LOGIN %u FROM %s FOR %s, %s"
-#: login-utils/login.c:965 login-utils/sulogin.c:1014
+#: login-utils/login.c:977 login-utils/sulogin.c:1101
#, c-format
msgid ""
"Login incorrect\n"
"登录不正确\n"
"\n"
-#: login-utils/login.c:967
-#, fuzzy, c-format
+#: login-utils/login.c:979
+#, c-format
msgid ""
"Password incorrect\n"
"\n"
msgstr ""
-"登录不正确\n"
+"密码不正确\n"
"\n"
-#: login-utils/login.c:981
+#: login-utils/login.c:993
#, c-format
msgid "TOO MANY LOGIN TRIES (%u) FROM %s FOR %s, %s"
msgstr "TOO MANY LOGIN TRIES (%u) FROM %s FOR %s, %s"
-#: login-utils/login.c:987
+#: login-utils/login.c:999
#, c-format
msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-#: login-utils/login.c:995
+#: login-utils/login.c:1007
#, c-format
msgid ""
"\n"
"\n"
"登录不正确\n"
-#: login-utils/login.c:1023 login-utils/login.c:1411 login-utils/login.c:1437
+#: login-utils/login.c:1034 login-utils/login.c:1421 login-utils/login.c:1447
msgid ""
"\n"
"Session setup problem, abort."
"\n"
"会话设置问题，中止。"
-#: login-utils/login.c:1024
+#: login-utils/login.c:1035
msgid "NULL user name. Abort."
msgstr "空（NULL）用户名。中止。"
-#: login-utils/login.c:1162
+#: login-utils/login.c:1173
#, c-format
msgid "TIOCSCTTY failed: %m"
msgstr "TIOCSCTTY 失败：%m"
-#: login-utils/login.c:1264
+#: login-utils/login.c:1275
#, c-format
msgid " %s [-p] [-h <host>] [-H] [[-f] <username>]\n"
msgstr "%s [-p] [-h <主机>] [-H] [[-f] <用户名>]\n"
-#: login-utils/login.c:1266
+#: login-utils/login.c:1277
msgid "Begin a session on the system.\n"
msgstr "在此系统上开始一次会话。\n"
-#: login-utils/login.c:1269
+#: login-utils/login.c:1280
msgid " -p do not destroy the environment"
msgstr " -p 不要清空环境信息"
-#: login-utils/login.c:1270
-#, fuzzy
+#: login-utils/login.c:1281
msgid " -f skip a login authentication"
-msgstr " -f 不分割长行\n"
+msgstr " -f 跳过登录认证"
-#: login-utils/login.c:1271
+#: login-utils/login.c:1282
msgid " -h <host> hostname to be used for utmp logging"
msgstr ""
-#: login-utils/login.c:1272
+#: login-utils/login.c:1283
msgid " -H suppress hostname in the login prompt"
msgstr " -H 在登录提示符中不显示主机名"
#. TRANSLATORS: The standard value for %u is 60.
-#: login-utils/login.c:1296
+#: login-utils/login.c:1307
#, c-format
msgid "%s: timed out after %u seconds"
msgstr "%s：%u 秒后超时"
-#: login-utils/login.c:1323
+#: login-utils/login.c:1334
#, c-format
msgid "login: -h is for superuser only\n"
msgstr "login：-h 是超级用户专用选项\n"
-#: login-utils/login.c:1412
+#: login-utils/login.c:1422
#, c-format
msgid "Invalid user name \"%s\". Abort."
msgstr "无效的用户名“%s”。中止。"
-#: login-utils/login.c:1436
+#: login-utils/login.c:1446
#, c-format
msgid "groups initialization failed: %m"
msgstr "组初始化失败：%m"
-#: login-utils/login.c:1464 sys-utils/mount.c:59 sys-utils/umount.c:123
+#: login-utils/login.c:1474
msgid "setgid() failed"
msgstr "setgid() 失败"
-#: login-utils/login.c:1488 sys-utils/mount.c:62 sys-utils/umount.c:126
+#: login-utils/login.c:1498
msgid "setuid() failed"
msgstr "setuid() 失败"
-#: login-utils/login.c:1494 login-utils/sulogin.c:731
+#: login-utils/login.c:1504 login-utils/sulogin.c:801
#, c-format
msgid "%s: change directory failed"
msgstr "%s：更改目录失败"
-#: login-utils/login.c:1501 login-utils/sulogin.c:732
+#: login-utils/login.c:1511 login-utils/sulogin.c:802
#, c-format
msgid "Logging in with home = \"/\".\n"
msgstr "以 home = “/” 登录。\n"
-#: login-utils/login.c:1529
+#: login-utils/login.c:1542
msgid "couldn't exec shell script"
msgstr "无法执行(exec) shell 脚本"
-#: login-utils/login.c:1531
+#: login-utils/login.c:1544
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
-#, fuzzy, c-format
-msgid "Error reading login.defs: %s"
-msgstr "读 %s 出错"
-
-#: login-utils/logindefs.c:333 login-utils/logindefs.c:353
-#: login-utils/logindefs.c:379
-#, fuzzy, c-format
-msgid "couldn't fetch %s: %s"
-msgstr "无法读取︰%s"
-
-#: login-utils/logindefs.c:537
-msgid "hush login status: restore original IDs failed"
-msgstr "静默(hush)登录状态：恢复原 ID 失败"
-
-#: login-utils/lslogins.c:217 sys-utils/lscpu.c:412 sys-utils/lscpu.c:422
-#: 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:226 misc-utils/lsblk.c:196
+#: login-utils/lslogins.c:227 misc-utils/lsblk.c:199
msgid "user name"
msgstr "用户名"
-#: login-utils/lslogins.c:226
+#: login-utils/lslogins.c:227
msgid "Username"
msgstr "用户名"
-#: login-utils/lslogins.c:227 sys-utils/renice.c:54
+#: login-utils/lslogins.c:228 sys-utils/renice.c:54
msgid "user ID"
msgstr "用户 ID"
-#: login-utils/lslogins.c:228
-msgid "password not required"
+#: login-utils/lslogins.c:229
+#, fuzzy
+#| msgid "password not required"
+msgid "password not defined"
msgstr "无需密码"
-#: login-utils/lslogins.c:228
-msgid "Password not required"
+#: login-utils/lslogins.c:229
+#, fuzzy
+#| msgid "Password not required"
+msgid "Password not required (empty)"
msgstr "无需密码"
-#: login-utils/lslogins.c:229
+#: login-utils/lslogins.c:230
msgid "login by password disabled"
msgstr "已禁止使用密码登录"
-#: login-utils/lslogins.c:229
+#: login-utils/lslogins.c:230
msgid "Login by password disabled"
msgstr "已禁止使用密码登录"
-#: login-utils/lslogins.c:230
+#: login-utils/lslogins.c:231
msgid "password defined, but locked"
msgstr "定义了密码，但已锁定"
-#: login-utils/lslogins.c:230
+#: login-utils/lslogins.c:231
msgid "Password is locked"
msgstr "密码已锁定"
-#: login-utils/lslogins.c:231
+#: login-utils/lslogins.c:232
msgid "password encryption method"
msgstr "密码加密方式"
-#: login-utils/lslogins.c:231
+#: login-utils/lslogins.c:232
msgid "Password encryption method"
msgstr "密码加密方式"
-#: login-utils/lslogins.c:232
+#: login-utils/lslogins.c:233
msgid "log in disabled by nologin(8) or pam_nologin(8)"
msgstr "nologin(8) 或 pam_nologin(8) 禁止了登录"
-#: login-utils/lslogins.c:232
+#: login-utils/lslogins.c:233
msgid "No login"
msgstr "不能登录"
-#: login-utils/lslogins.c:233
+#: login-utils/lslogins.c:234
msgid "primary group name"
msgstr "主组名"
-#: login-utils/lslogins.c:233
+#: login-utils/lslogins.c:234
msgid "Primary group"
msgstr "主组"
-#: login-utils/lslogins.c:234
+#: login-utils/lslogins.c:235
msgid "primary group ID"
msgstr "主组 ID"
-#: login-utils/lslogins.c:235
+#: login-utils/lslogins.c:236
msgid "supplementary group names"
msgstr "附属组名"
-#: login-utils/lslogins.c:235
+#: login-utils/lslogins.c:236
msgid "Supplementary groups"
msgstr "附属组"
-#: login-utils/lslogins.c:236
+#: login-utils/lslogins.c:237
msgid "supplementary group IDs"
msgstr "附属组 ID"
-#: login-utils/lslogins.c:236
+#: login-utils/lslogins.c:237
msgid "Supplementary group IDs"
msgstr "附属组 ID"
-#: login-utils/lslogins.c:237
+#: login-utils/lslogins.c:238
msgid "home directory"
msgstr "主目录"
-#: login-utils/lslogins.c:237
+#: login-utils/lslogins.c:238
msgid "Home directory"
msgstr "主目录"
-#: login-utils/lslogins.c:238
+#: login-utils/lslogins.c:239
msgid "login shell"
msgstr "登录 shell"
-#: login-utils/lslogins.c:238
+#: login-utils/lslogins.c:239
msgid "Shell"
msgstr "Shell"
-#: login-utils/lslogins.c:239
+#: login-utils/lslogins.c:240
msgid "full user name"
msgstr "完整用户名"
-#: login-utils/lslogins.c:239
+#: login-utils/lslogins.c:240
msgid "Gecos field"
msgstr "Gecos 字段"
-#: login-utils/lslogins.c:240
+#: login-utils/lslogins.c:241
msgid "date of last login"
msgstr "上次登录日期"
-#: login-utils/lslogins.c:240
+#: login-utils/lslogins.c:241
msgid "Last login"
msgstr "上次登录"
-#: login-utils/lslogins.c:241
+#: login-utils/lslogins.c:242
msgid "last tty used"
msgstr "上次使用的终端"
-#: login-utils/lslogins.c:241
+#: login-utils/lslogins.c:242
msgid "Last terminal"
msgstr "上次的终端"
-#: login-utils/lslogins.c:242
+#: login-utils/lslogins.c:243
msgid "hostname during the last session"
msgstr "上次会话时的主机名(hostname)"
-#: login-utils/lslogins.c:242
+#: login-utils/lslogins.c:243
msgid "Last hostname"
msgstr "上次的主机名"
-#: login-utils/lslogins.c:243
+#: login-utils/lslogins.c:244
msgid "date of last failed login"
msgstr "上次登录失败的日期"
-#: login-utils/lslogins.c:243
+#: login-utils/lslogins.c:244
msgid "Failed login"
msgstr "失败的登录"
-#: login-utils/lslogins.c:244
+#: login-utils/lslogins.c:245
msgid "where did the login fail?"
msgstr "登录在哪里失败的？"
-#: login-utils/lslogins.c:244
+#: login-utils/lslogins.c:245
msgid "Failed login terminal"
msgstr "登录终端失败"
-#: login-utils/lslogins.c:245
+#: login-utils/lslogins.c:246
msgid "user's hush settings"
msgstr "用户的静默(hush)设置"
-#: login-utils/lslogins.c:245
+#: login-utils/lslogins.c:246
msgid "Hushed"
msgstr "已静默"
-#: login-utils/lslogins.c:246
+#: login-utils/lslogins.c:247
msgid "days user is warned of password expiration"
msgstr "警告用户密码过期的天数"
-#: login-utils/lslogins.c:246
+#: login-utils/lslogins.c:247
msgid "Password expiration warn interval"
msgstr "密码过期警告的间隔"
-#: login-utils/lslogins.c:247
+#: login-utils/lslogins.c:248
msgid "password expiration date"
msgstr "密码过期日"
-#: login-utils/lslogins.c:247
+#: login-utils/lslogins.c:248
msgid "Password expiration"
msgstr "密码过期"
-#: login-utils/lslogins.c:248
+#: login-utils/lslogins.c:249
msgid "date of last password change"
msgstr "上次更改密码的日期"
-#: login-utils/lslogins.c:248
+#: login-utils/lslogins.c:249
msgid "Password changed"
msgstr "密码已更改"
-#: login-utils/lslogins.c:249
+#: login-utils/lslogins.c:250
msgid "number of days required between changes"
msgstr "更改密码的限期(天)"
-#: login-utils/lslogins.c:249
+#: login-utils/lslogins.c:250
msgid "Minimum change time"
msgstr "最小更改时间"
-#: login-utils/lslogins.c:250
+#: login-utils/lslogins.c:251
msgid "max number of days a password may remain unchanged"
msgstr "密码可以多久不更改(天数)"
-#: login-utils/lslogins.c:250
+#: login-utils/lslogins.c:251
msgid "Maximum change time"
msgstr "最大更改时间"
-#: login-utils/lslogins.c:251
+#: login-utils/lslogins.c:252
msgid "the user's security context"
msgstr "用户的安全环境(context)"
-#: login-utils/lslogins.c:251
+#: login-utils/lslogins.c:252
msgid "Selinux context"
msgstr "Selinux 环境"
-#: login-utils/lslogins.c:252
+#: login-utils/lslogins.c:253
msgid "number of processes run by the user"
msgstr "用户运行的进程数"
-#: login-utils/lslogins.c:252
+#: login-utils/lslogins.c:253
msgid "Running processes"
msgstr "运行中的进程"
-#: login-utils/lslogins.c:301 misc-utils/findmnt.c:138 misc-utils/lsblk.c:236
-#: sys-utils/lsipc.c:204 sys-utils/lsmem.c:145
+#: 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"
msgstr "指定了过多的列，限制是 %zu 列"
-#: login-utils/lslogins.c:355 sys-utils/lsipc.c:467
+#: login-utils/lslogins.c:357 sys-utils/lsipc.c:472
msgid "unsupported time type"
msgstr "不支持的时间类型"
-#: login-utils/lslogins.c:359
+#: login-utils/lslogins.c:361
msgid "failed to compose time string"
msgstr "生成时间字符串失败"
-#: login-utils/lslogins.c:761
+#: login-utils/lslogins.c:783
msgid "failed to get supplementary groups"
msgstr "获得附属组失败"
-#: login-utils/lslogins.c:1046
+#: login-utils/lslogins.c:1093
#, c-format
msgid "cannot found '%s'"
msgstr "无法找到“%s”"
-#: login-utils/lslogins.c:1225
+#: login-utils/lslogins.c:1273
msgid "internal error: unknown column"
msgstr "内部错误：未知的列"
-#: login-utils/lslogins.c:1322
+#: login-utils/lslogins.c:1381
#, c-format
msgid ""
"\n"
"\n"
"上次的日志：\n"
-#: login-utils/lslogins.c:1385
+#: login-utils/lslogins.c:1445
msgid "Display information about known users in the system.\n"
msgstr "显示系统中已知用户的信息。\n"
-#: login-utils/lslogins.c:1388
+#: login-utils/lslogins.c:1448
msgid " -a, --acc-expiration display info about passwords expiration\n"
msgstr " -a, --acc-expiration 显示关于密码过期的信息\n"
-#: login-utils/lslogins.c:1389
+#: 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:1390 sys-utils/lsipc.c:310
+#: 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:1391
+#: 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:1392
+#: login-utils/lslogins.c:1452
msgid " -G, --supp-groups display information about groups\n"
msgstr " -G, --supp-groups 显示与组相关的信息\n"
-#: login-utils/lslogins.c:1393
+#: 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:1394
+#: 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:1395
+#: login-utils/lslogins.c:1455
msgid " -l, --logins=<logins> display only users from <logins>\n"
msgstr " -l, --logins=<登录方式> 只显示以指定<登录方式>登录的用户\n"
-#: login-utils/lslogins.c:1396 sys-utils/lsipc.c:312
+#: 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:1397 sys-utils/lsipc.c:305
+#: login-utils/lslogins.c:1457 sys-utils/lsipc.c:306
msgid " --noheadings don't print headings\n"
msgstr " --noheadings 不打印标题\n"
-#: login-utils/lslogins.c:1398 sys-utils/lsipc.c:306
+#: login-utils/lslogins.c:1458 sys-utils/lsipc.c:307
msgid " --notruncate don't truncate output\n"
msgstr " --notruncate 不截断输出\n"
-#: login-utils/lslogins.c:1399 sys-utils/lsipc.c:314
+#: 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:1400
+#: login-utils/lslogins.c:1460
msgid " --output-all output all columns\n"
msgstr " --output-all 输出所有列\n"
-#: login-utils/lslogins.c:1401
+#: login-utils/lslogins.c:1461
msgid " -p, --pwd display information related to login by password.\n"
msgstr " -p, --pwd 显示与 用密码登录 相关的信息。\n"
-#: login-utils/lslogins.c:1402 sys-utils/lsipc.c:316
+#: 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:1403
+#: login-utils/lslogins.c:1463
msgid " -s, --system-accs display system accounts\n"
msgstr " -s, --system-accs 显示系统帐户\n"
-#: login-utils/lslogins.c:1404 sys-utils/lsipc.c:307
+#: 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:1405
+#: login-utils/lslogins.c:1465
msgid " -u, --user-accs display user accounts\n"
msgstr " -u, --user-accs 显示用户帐户\n"
-#: login-utils/lslogins.c:1406
+#: 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:1467
msgid " -Z, --context display SELinux contexts\n"
msgstr " -Z, --context 显示 SELinux 环境\n"
-#: login-utils/lslogins.c:1407
+#: 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:1408
+#: 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:1409
+#: 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:1410
-#, fuzzy
+#: login-utils/lslogins.c:1471
msgid " --lastlog <path> set an alternate path for lastlog\n"
-msgstr " --wtmp-file <路径> 设置 wtmp 的可选路径\n"
+msgstr " --lastlog <路径> 设置 lastlog 的可选路径\n"
-#: login-utils/lslogins.c:1599
+#: login-utils/lslogins.c:1664
msgid "failed to request selinux state"
msgstr "请求 selinux 状态失败"
-#: login-utils/lslogins.c:1613 login-utils/lslogins.c:1618
+#: 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:998
+#: login-utils/newgrp.c:160 login-utils/sulogin.c:1083
msgid "crypt failed"
msgstr "crypt 失败"
-#: login-utils/newgrp.c:173
+#: login-utils/newgrp.c:175
#, c-format
msgid " %s <group>\n"
msgstr " %s <组>\n"
-#: login-utils/newgrp.c:176
+#: login-utils/newgrp.c:178
msgid "Log in to a new group.\n"
msgstr "以新的组登录。\n"
-#: login-utils/newgrp.c:212
+#: login-utils/newgrp.c:214
msgid "who are you?"
msgstr "您是哪位？"
-#: login-utils/newgrp.c:216 login-utils/newgrp.c:228 sys-utils/nsenter.c:484
-#: sys-utils/unshare.c:663 text-utils/more.c:1256
+#: 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 失败"
-#: login-utils/newgrp.c:221 login-utils/newgrp.c:223
+#: login-utils/newgrp.c:223 login-utils/newgrp.c:225
msgid "no such group"
msgstr "无此组"
-#: login-utils/newgrp.c:232 sys-utils/nsenter.c:486 sys-utils/unshare.c:666
-#: text-utils/more.c:1254
+#: 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/lslocks.c:528 misc-utils/mcookie.c:83
-#: misc-utils/uuidd.c:95 misc-utils/uuidgen.c:26 sys-utils/dmesg.c:272
-#: sys-utils/ipcmk.c:67 sys-utils/irqtop.c:244 sys-utils/lscpu.c:1136
-#: sys-utils/lsipc.c:291 sys-utils/lsirq.c:57 sys-utils/lsmem.c:506
-#: sys-utils/readprofile.c:104 sys-utils/rtcwake.c:99
+#: 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
#, c-format
msgid "This account is currently not available.\n"
msgstr "此帐户目前不可用。\n"
-#: login-utils/su-common.c:227
+#: login-utils/su-common.c:233
msgid " (core dumped)"
msgstr " (核心已转储)"
-#: login-utils/su-common.c:275
+#: login-utils/su-common.c:281
msgid "change owner or mode for pseudo-terminal failed"
msgstr ""
-#: login-utils/su-common.c:369
+#: login-utils/su-common.c:377
msgid "failed to modify environment"
msgstr "修改环境失败"
-#: login-utils/su-common.c:405
+#: login-utils/su-common.c:413
msgid "may not be used by non-root users"
msgstr "非 root 用户不能使用"
-#: login-utils/su-common.c:429
+#: login-utils/su-common.c:437
msgid "authentication failed"
msgstr "验证失败"
-#: login-utils/su-common.c:442
+#: login-utils/su-common.c:450
#, c-format
msgid "cannot open session: %s"
msgstr "无法打开会话：%s"
-#: login-utils/su-common.c:461
+#: login-utils/su-common.c:469
msgid "cannot block signals"
msgstr "无法阻塞信号"
-#: login-utils/su-common.c:478
+#: login-utils/su-common.c:486
msgid "cannot initialize signal mask for session"
msgstr ""
-#: login-utils/su-common.c:486
+#: login-utils/su-common.c:494
#, fuzzy
+#| msgid "cannot block signals"
msgid "cannot initialize signal mask"
msgstr "无法阻塞信号"
-#: login-utils/su-common.c:496
+#: 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:504 misc-utils/uuidd.c:435
-#: sys-utils/lscpu-virt.c:486
+#: 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:512
+#: login-utils/su-common.c:520
#, fuzzy
+#| msgid "cannot set signal handler"
msgid "cannot set signal mask"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:538 term-utils/script.c:944
+#: login-utils/su-common.c:547 term-utils/script.c:961
#: term-utils/scriptlive.c:296
-#, fuzzy
msgid "failed to create pseudo-terminal"
-msgstr "创建新磁盘标签失败"
+msgstr "创建伪终端失败"
+
+#: 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:550 term-utils/script.c:954
-#: 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:569 sys-utils/nsenter.c:461
+#: 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:595 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:606
+#: login-utils/su-common.c:630
#, c-format
msgid " ...killed.\n"
msgstr " ...已杀死。\n"
-#: login-utils/su-common.c:703
+#: login-utils/su-common.c:727
msgid "failed to set the PATH environment variable"
msgstr "设置 PATH 环境变量失败"
-#: login-utils/su-common.c:780
+#: login-utils/su-common.c:804
msgid "cannot set groups"
msgstr "无法设置 组"
-#: login-utils/su-common.c:786
+#: 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:796 sys-utils/eject.c:660
+#: login-utils/su-common.c:820
msgid "cannot set group id"
msgstr "无法设置 组 id"
-#: login-utils/su-common.c:798 sys-utils/eject.c:663
+#: login-utils/su-common.c:822
msgid "cannot set user id"
msgstr "无法设置 用户 id"
-#: login-utils/su-common.c:866
+#: 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:867
+#: 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:870
+#: login-utils/su-common.c:890
msgid " -g, --group <group> specify the primary group\n"
msgstr " -g, --group <组> 指定主组\n"
-#: login-utils/su-common.c:871
+#: login-utils/su-common.c:891
#, fuzzy
+#| msgid ""
+#| " -G, --supp-group <group> specify a supplemental group\n"
+#| "\n"
msgid " -G, --supp-group <group> specify a supplemental group\n"
msgstr ""
" -G, --supp-group <组> 指定一个辅助组\n"
"\n"
-#: login-utils/su-common.c:874
+#: 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:875
+#: 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:876
+#: 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:878
+#: 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:879
+#: 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:880
+#: login-utils/su-common.c:900
msgid " -P, --pty create a new pseudo-terminal\n"
msgstr ""
-#: login-utils/su-common.c:890
+#: login-utils/su-common.c:910
#, fuzzy, c-format
+#| msgid ""
+#| " %1$s [options] <dev> [[-N] <part>]\n"
+#| " %1$s [options] <command>\n"
msgid ""
" %1$s [options] -u <user> [[--] <command>]\n"
" %1$s [options] [-] [<user> [<argument>...]]\n"
" %1$s [选项] <设备> [[-N] <分区>]\n"
" %1$s [选项] <命令>\n"
-#: login-utils/su-common.c:895
+#: login-utils/su-common.c:915
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Run <command> with the effective user ID and group ID of <user>. If -u is\n"
+#| "not given, fall back to su(1)-compatible semantics and execute standard shell.\n"
+#| "The options -c, -f, -l, and -s are mutually exclusive with -u.\n"
msgid ""
"Run <command> with the effective user ID and group ID of <user>. If -u is\n"
"not given, fall back to su(1)-compatible semantics and execute standard shell.\n"
"将退而使用与 su(1) 兼容的语法并执行标准 shell。\n"
"选项 -c、-f、-l 及 -s 与 -u 相互排斥。\n"
-#: login-utils/su-common.c:900
-#, fuzzy
+#: login-utils/su-common.c:920
msgid " -u, --user <user> username\n"
-msgstr " -u, --user <用户> 用户名\n"
+msgstr " -u, --user <用户> 用户名\n"
-#: login-utils/su-common.c:911
+#: login-utils/su-common.c:931
#, c-format
msgid " %s [options] [-] [<user> [<argument>...]]\n"
msgstr " %s [选项] [-] [<用户> [<参数>...]]\n"
-#: login-utils/su-common.c:915
+#: login-utils/su-common.c:935
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Change the effective user ID and group ID to that of <user>.\n"
+#| "A mere - implies -l. If <user> is not given, root is assumed.\n"
msgid ""
"Change the effective user ID and group ID to that of <user>.\n"
"A mere - implies -l. If <user> is not given, root is assumed.\n"
"将有效用户 id 和组 id 更改为<用户>的 id。\n"
"单个 - 视为 -l。如果未指定<用户>，将假定为 root。\n"
-#: login-utils/su-common.c:963
+#: 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:969
+#: login-utils/su-common.c:1018
#, c-format
msgid "group %s does not exist"
msgstr "组 %s 不存在"
-#: login-utils/su-common.c:1078
+#: login-utils/su-common.c:1127
msgid "--pty is not supported for your system"
msgstr "--pty 在您的系统上不受支持"
-#: login-utils/su-common.c:1112
+#: 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:1126
+#: 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:1129
+#: login-utils/su-common.c:1178
msgid "no command was specified"
msgstr "没有指定命令"
-#: login-utils/su-common.c:1141
+#: login-utils/su-common.c:1190
msgid "only root can specify alternative groups"
msgstr "只有 root 用户能指定替代组"
-#: login-utils/su-common.c:1152
+#: 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:1187
+#: login-utils/su-common.c:1236
#, c-format
msgid "using restricted shell %s"
msgstr "将使用受限 shell %s"
-#: login-utils/su-common.c:1206
+#: login-utils/su-common.c:1257
msgid "failed to allocate pty handler"
msgstr ""
-#: login-utils/su-common.c:1232
+#: login-utils/su-common.c:1283
#, c-format
msgid "warning: cannot change directory to %s"
msgstr "警告：无法更改到 %s 目录"
-#: login-utils/sulogin.c:130
+#: login-utils/sulogin.c:173 login-utils/sulogin.c:176
+#, c-format
msgid "tcgetattr failed"
msgstr "tcgetattr 失败"
-#: login-utils/sulogin.c:208
+#: login-utils/sulogin.c:259
msgid "tcsetattr failed"
msgstr "tcsetattr 失败"
-#: login-utils/sulogin.c:470
+#: login-utils/sulogin.c:523
#, c-format
msgid "%s: no entry for root\n"
msgstr "%s：无 root 的记录\n"
-#: login-utils/sulogin.c:497
+#: login-utils/sulogin.c:550
#, c-format
msgid "%s: no entry for root"
msgstr "%s：无 root 的记录"
-#: login-utils/sulogin.c:502
+#: login-utils/sulogin.c:555
#, c-format
msgid "%s: root password garbled"
msgstr "%s：root 密码有误"
-#: login-utils/sulogin.c:531
+#: login-utils/sulogin.c:584
#, c-format
msgid ""
"\n"
"\n"
"按 Enter 继续。\n"
-#: login-utils/sulogin.c:537
+#: login-utils/sulogin.c:590
#, c-format
msgid "Give root password for login: "
msgstr "指定 root 的登录密码："
-#: login-utils/sulogin.c:539
+#: login-utils/sulogin.c:592
#, c-format
msgid "Press Enter for login: "
msgstr "按 Enter 键登录："
-#: login-utils/sulogin.c:542
+#: login-utils/sulogin.c:595
#, c-format
msgid "Give root password for maintenance\n"
msgstr "指定 root 的维护密码\n"
-#: login-utils/sulogin.c:544
+#: login-utils/sulogin.c:597
#, c-format
msgid "Press Enter for maintenance\n"
msgstr "按 Enter 键进行维护\n"
-#: login-utils/sulogin.c:545
+#: login-utils/sulogin.c:598
#, c-format
msgid "(or press Control-D to continue): "
msgstr "(或按 Control-D 键继续)："
-#: login-utils/sulogin.c:735
+#: login-utils/sulogin.c:805
msgid "change directory to system root failed"
msgstr "更改到系统根目录失败"
-#: login-utils/sulogin.c:785
+#: login-utils/sulogin.c:855
msgid "setexeccon failed"
msgstr "setexeccon 失败"
-#: login-utils/sulogin.c:806
+#: login-utils/sulogin.c:876
#, c-format
msgid " %s [options] [tty device]\n"
msgstr " %s [选项] [tty 设备]\n"
-#: login-utils/sulogin.c:809
+#: login-utils/sulogin.c:879
msgid "Single-user login.\n"
msgstr "单用户登录。\n"
-#: login-utils/sulogin.c:812
+#: login-utils/sulogin.c:882
msgid ""
" -p, --login-shell start a login shell\n"
" -t, --timeout <seconds> max time to wait for a password (default: no limit)\n"
" -t, --timeout <秒数> 等待密码的最大时间(默认：无限制)\n"
" -e, --force 如果 getpwnam(3) 失败，直接检查密码文件\n"
-#: login-utils/sulogin.c:868 misc-utils/findmnt.c:1520 sys-utils/wdctl.c:640
-#: term-utils/agetty.c:847 term-utils/wall.c:218
+#: 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:887
+#: login-utils/sulogin.c:965
msgid "only superuser can run this program"
msgstr "只有超级用户能运行此程序"
-#: login-utils/sulogin.c:930
+#: login-utils/sulogin.c:1008
msgid "cannot open console"
msgstr "打不开终端"
-#: login-utils/sulogin.c:937
+#: login-utils/sulogin.c:1015
msgid "cannot open password database"
msgstr "无法打开密码数据库"
-#: login-utils/sulogin.c:1011
-#, fuzzy, c-format
+#: login-utils/sulogin.c:1098
+#, c-format
msgid ""
"cannot execute su shell\n"
"\n"
"无法执行 su shell\n"
"\n"
-#: login-utils/sulogin.c:1018
+#: login-utils/sulogin.c:1105
msgid ""
"Timed out\n"
"\n"
"超时\n"
"\n"
-#: login-utils/sulogin.c:1050
-#, fuzzy
+#: login-utils/sulogin.c:1137
msgid ""
"cannot wait on su shell\n"
"\n"
"无法等待 su shell\n"
"\n"
-#: login-utils/utmpdump.c:173
+#: login-utils/utmpdump.c:181
#, c-format
msgid "%s: cannot get file position"
msgstr "%s：无法获取文件位置"
-#: login-utils/utmpdump.c:177
+#: login-utils/utmpdump.c:185
#, c-format
msgid "%s: cannot add inotify watch."
msgstr "%s：无法添加 inotify 观察。"
-#: login-utils/utmpdump.c:186
+#: login-utils/utmpdump.c:194
#, c-format
msgid "%s: cannot read inotify events"
msgstr "%s：无法读 inotify 事件"
-#: login-utils/utmpdump.c:246 login-utils/utmpdump.c:251
+#: login-utils/utmpdump.c:254 login-utils/utmpdump.c:259
msgid "Extraneous newline in file. Exiting."
msgstr "文件中有无关的换行符。将退出。"
-#: login-utils/utmpdump.c:305
+#: login-utils/utmpdump.c:318
#, c-format
msgid " %s [options] [filename]\n"
msgstr " %s [选项] [文件名]\n"
-#: login-utils/utmpdump.c:308
+#: login-utils/utmpdump.c:321
msgid "Dump UTMP and WTMP files in raw format.\n"
msgstr "以原始格式转储 UTMP 和 WTMP 文件。\n"
-#: login-utils/utmpdump.c:311
+#: login-utils/utmpdump.c:324
msgid " -f, --follow output appended data as the file grows\n"
msgstr " -f, --follow 随文件增长输出追加的数据\n"
-#: login-utils/utmpdump.c:312
+#: login-utils/utmpdump.c:325
msgid " -r, --reverse write back dumped data into utmp file\n"
msgstr " -r, --reverse 将转储的数据写回 utmp 文件\n"
-#: login-utils/utmpdump.c:313
+#: login-utils/utmpdump.c:326
msgid " -o, --output <file> write to file instead of standard output\n"
msgstr " -o, --output <文件> 写入文件而非标准输出\n"
-#: login-utils/utmpdump.c:381
+#: login-utils/utmpdump.c:394
msgid "following standard input is unsupported"
msgstr "不支持跟随(follow)标准输入"
-#: login-utils/utmpdump.c:387
+#: login-utils/utmpdump.c:400
#, c-format
msgid "Utmp undump of %s\n"
msgstr "%s 的 Utmp undump\n"
-#: login-utils/utmpdump.c:390
+#: login-utils/utmpdump.c:403
#, c-format
msgid "Utmp dump of %s\n"
msgstr "%s 的 Utmp dump\n"
-#: login-utils/vipw.c:129
+#: login-utils/vipw.c:132
msgid "can't open temporary file"
msgstr "无法打开临时文件"
-#: login-utils/vipw.c:149
+#: login-utils/vipw.c:152
#, c-format
msgid "%s: create a link to %s failed"
msgstr "%s：创建指向 %s 的链接失败"
-#: login-utils/vipw.c:157
+#: login-utils/vipw.c:160
#, c-format
msgid "Can't get context for %s"
msgstr "无法获取 %s 的环境"
-#: login-utils/vipw.c:163
+#: login-utils/vipw.c:166
#, c-format
msgid "Can't set context for %s"
msgstr "无法设置 %s 的环境"
-#: login-utils/vipw.c:228
+#: login-utils/vipw.c:235
#, c-format
msgid "%s unchanged"
msgstr "%s 未改变"
-#: login-utils/vipw.c:246
+#: login-utils/vipw.c:253
msgid "cannot get lock"
msgstr "无法获得锁"
-#: login-utils/vipw.c:273
+#: login-utils/vipw.c:280
msgid "no changes made"
msgstr "无改变"
-#: login-utils/vipw.c:282
+#: login-utils/vipw.c:289
msgid "cannot chmod file"
msgstr "无法对文件 chmod"
-#: login-utils/vipw.c:297
+#: login-utils/vipw.c:304
msgid "Edit the password or group file.\n"
msgstr "编辑密码或组文件。\n"
-#: login-utils/vipw.c:349
+#: login-utils/vipw.c:356
msgid "You are using shadow groups on this system.\n"
msgstr "您正在使用此系统上的遮蔽(shadow)组。\n"
-#: login-utils/vipw.c:350
+#: login-utils/vipw.c:357
msgid "You are using shadow passwords on this system.\n"
msgstr "您正在使用此系统上的遮蔽(shadow)密码。\n"
#. TRANSLATORS: this program uses for y and n rpmatch(3),
#. * which means they can be translated.
-#: login-utils/vipw.c:354
+#: login-utils/vipw.c:361
#, c-format
msgid "Would you like to edit %s now [y/n]? "
msgstr "您想现在编辑 %s 吗[y/n]？"
-#: misc-utils/blkid.c:70
+#: misc-utils/blkid.c:72
#, c-format
msgid ""
" %s --label <label> | --uuid <uuid>\n"
"\n"
msgstr ""
-#: misc-utils/blkid.c:71
+#: misc-utils/blkid.c:73
#, c-format
msgid ""
" %s [--cache-file <file>] [-ghlLv] [--output <format>] [--match-tag <tag>] \n"
"\n"
msgstr ""
-#: misc-utils/blkid.c:73
+#: misc-utils/blkid.c:75
#, c-format
msgid ""
" %s -p [--match-tag <tag>] [--offset <offset>] [--size <size>] \n"
"\n"
msgstr ""
-#: misc-utils/blkid.c:75
+#: misc-utils/blkid.c:77
#, c-format
msgid " %s -i [--match-tag <tag>] [--output <format>] <dev> ...\n"
msgstr ""
-#: misc-utils/blkid.c:77
+#: misc-utils/blkid.c:79
#, fuzzy
+#| msgid ""
+#| " -A, --adjfile <file> specifies the path to the adjust file\n"
+#| " the default is %s\n"
msgid ""
" -c, --cache-file <file> read from <file> instead of reading from the default\n"
" cache file (-c /dev/null means no cache)\n"
" -A, --adjfile <文件> 指定 adjust 文件的路径\n"
" 默认为 %s\n"
-#: misc-utils/blkid.c:79
+#: misc-utils/blkid.c:81
#, fuzzy
+#| msgid " -n, --noheadings don't print headings\n"
msgid " -d, --no-encoding don't encode non-printing characters\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/blkid.c:80
+#: misc-utils/blkid.c:82
msgid " -g, --garbage-collect garbage collect the blkid cache\n"
-msgstr ""
+msgstr " -g, --garbage-collect 对 blkid 缓存进行垃圾回收\n"
-#: misc-utils/blkid.c:81
+#: misc-utils/blkid.c:83
msgid ""
" -o, --output <format> output format; can be one of:\n"
" value, device, export or full; (default: full)\n"
msgstr ""
-#: misc-utils/blkid.c:83
+#: misc-utils/blkid.c:85
#, fuzzy
+#| msgid " -l, --list-shells print list of shells and exit\n"
msgid " -k, --list-filesystems list all known filesystems/RAIDs and exit\n"
msgstr " -l, --list-shells 打印 shell 列表并退出\n"
-#: misc-utils/blkid.c:84
+#: misc-utils/blkid.c:86
msgid " -s, --match-tag <tag> show specified tag(s) (default show all tags)\n"
msgstr ""
-#: misc-utils/blkid.c:85
+#: misc-utils/blkid.c:87
msgid " -t, --match-token <token> find device with a specific token (NAME=value pair)\n"
msgstr ""
-#: misc-utils/blkid.c:86
+#: misc-utils/blkid.c:88
#, fuzzy
+#| msgid " -l, --list list info about all or specified (default)\n"
msgid " -l, --list-one look up only first device with token specified by -t\n"
msgstr " -l, --list 列出所有或指定的信息(默认)\n"
-#: misc-utils/blkid.c:87
+#: misc-utils/blkid.c:89
#, fuzzy
+#| msgid " -s, --size <size> device size\n"
msgid " -L, --label <label> convert LABEL to device name\n"
msgstr " -s, --size <尺寸> 设备尺寸\n"
-#: misc-utils/blkid.c:88
+#: misc-utils/blkid.c:90
msgid " -U, --uuid <uuid> convert UUID to device name\n"
msgstr " -U, --uuid <uuid> 将 UUID 转换为设备名\n"
-#: misc-utils/blkid.c:90
+#: misc-utils/blkid.c:92
#, fuzzy
+#| msgid "Scheduling options:\n"
msgid "Low-level probing options:\n"
msgstr "调度选项：\n"
-#: misc-utils/blkid.c:91
+#: misc-utils/blkid.c:93
#, fuzzy
+#| msgid " -p, --pid unshare pid namespace\n"
msgid " -p, --probe low-level superblocks probing (bypass cache)\n"
msgstr " -p, --pid 取消共享 pid 名字空间\n"
-#: misc-utils/blkid.c:92
+#: misc-utils/blkid.c:94
#, fuzzy
+#| msgid " -i, --info print only info about the sampling step\n"
msgid " -i, --info gather information about I/O limits\n"
msgstr " -i, --info 只打印有关采样步骤(sampling step)的信息\n"
-#: misc-utils/blkid.c:93
+#: misc-utils/blkid.c:95
#, fuzzy
+#| msgid " -P, --port <port> use this port for UDP or TCP connection\n"
msgid " -H, --hint <value> set hint for probing function\n"
msgstr " -P, --port <端口> 使用指定端口进行 UDP 或 TCP 连接\n"
-#: misc-utils/blkid.c:94
+#: misc-utils/blkid.c:96
#, fuzzy
+#| msgid " -s, --size <size> device size\n"
msgid " -S, --size <size> overwrite device size\n"
msgstr " -s, --size <尺寸> 设备尺寸\n"
-#: misc-utils/blkid.c:95
+#: misc-utils/blkid.c:97
#, fuzzy
+#| msgid " -H, --host <hostname> specify login host\n"
msgid " -O, --offset <offset> probe at the given offset\n"
msgstr " -H, --host <主机名> 指定登录主机\n"
-#: misc-utils/blkid.c:96
+#: misc-utils/blkid.c:98
#, fuzzy
+#| msgid " -t, --types <list> limit the set of filesystem types\n"
msgid " -u, --usages <list> filter by \"usage\" (e.g. -u filesystem,raid)\n"
msgstr " -t, --types <列表> 限制文件系统集合\n"
-#: misc-utils/blkid.c:97
+#: misc-utils/blkid.c:99
#, fuzzy
+#| msgid " -t, --types <list> limit the set of filesystem types\n"
msgid " -n, --match-types <list> filter by filesystem type (e.g. -n vfat,ext3)\n"
msgstr " -t, --types <列表> 限制文件系统集合\n"
-#: misc-utils/blkid.c:98
+#: misc-utils/blkid.c:100
msgid " -D, --no-part-details don't print info from partition table\n"
msgstr " -D, --no-part-details 不要打印来自分区表的信息\n"
-#: misc-utils/blkid.c:104
+#: misc-utils/blkid.c:106
msgid "<size> and <offset>"
msgstr ""
-#: misc-utils/blkid.c:106
+#: misc-utils/blkid.c:108
#, fuzzy
+#| msgid " <dev> device (usually disk) path\n"
msgid " <dev> specify device(s) to probe (default: all devices)\n"
msgstr " <设备> 设备(通常是磁盘)的路径\n"
-#: misc-utils/blkid.c:238
+#: misc-utils/blkid.c:240
msgid "(mounted, mtpt unknown)"
msgstr ""
-#: misc-utils/blkid.c:240
+#: misc-utils/blkid.c:242
msgid "(in use)"
msgstr "（使用中）"
-#: misc-utils/blkid.c:242
+#: misc-utils/blkid.c:244
msgid "(not mounted)"
msgstr "（未挂载）"
-#: misc-utils/blkid.c:519 misc-utils/blkid.c:525
+#: misc-utils/blkid.c:518 misc-utils/blkid.c:524
#, c-format
msgid "error: %s"
msgstr "错误：%s"
-#: misc-utils/blkid.c:568
+#: 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:614
+#: 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:631
+#: misc-utils/blkid.c:630
msgid "error: -u <list> argument is empty"
msgstr ""
-#: misc-utils/blkid.c:784
+#: misc-utils/blkid.c:783
#, c-format
msgid "unsupported output format %s"
msgstr "不支持的输出格式：%s"
-#: misc-utils/blkid.c:787 misc-utils/wipefs.c:749
+#: misc-utils/blkid.c:786 misc-utils/fadvise.c:119 misc-utils/wipefs.c:734
msgid "invalid offset argument"
msgstr "无效的 偏移 参数"
-#: misc-utils/blkid.c:794
+#: misc-utils/blkid.c:793
#, fuzzy
+#| msgid "no command was specified"
msgid "Too many tags specified"
msgstr "没有指定命令"
-#: misc-utils/blkid.c:800
+#: misc-utils/blkid.c:799 misc-utils/pipesz.c:273
#, fuzzy
+#| msgid "invalid time argument"
msgid "invalid size argument"
msgstr "无效的 时间 参数"
-#: misc-utils/blkid.c:804
+#: misc-utils/blkid.c:803
msgid "Can only search for one NAME=value pair"
msgstr ""
-#: misc-utils/blkid.c:811
+#: misc-utils/blkid.c:810
msgid "-t needs NAME=value pair"
msgstr ""
-#: misc-utils/blkid.c:817
+#: 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:863
+#: misc-utils/blkid.c:889
msgid "The low-level probing mode does not support 'list' output format"
msgstr ""
-#: misc-utils/blkid.c:876
+#: misc-utils/blkid.c:902
msgid "The low-level probing mode requires a device"
msgstr ""
-#: misc-utils/blkid.c:887
+#: 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:930
+#: 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 "file data resident in memory in pages"
msgstr "共享内存页"
#: misc-utils/fincore.c:174
#, fuzzy, c-format
+#| msgid "failed to read symlink: %s"
msgid "failed to do mincore: %s"
msgstr "读符号链接失败：%s"
-#: misc-utils/fincore.c:210
+#: 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/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/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/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/fincore.c:270
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原始输出格式\n"
-#: misc-utils/fincore.c:338 sys-utils/losetup.c:824
-msgid "no file specified"
-msgstr "未指定文件"
-
#: misc-utils/findfs.c:28
#, c-format
msgid " %s [options] {LABEL,UUID,PARTUUID,PARTLABEL}=<value>\n"
msgid "unable to resolve '%s'"
msgstr "不能解析“%s”"
-#: misc-utils/findmnt.c:100
+#: misc-utils/findmnt.c:103
msgid "action detected by --poll"
msgstr "--poll 检测到的操作"
-#: misc-utils/findmnt.c:101 misc-utils/lsblk.c:163
+#: misc-utils/findmnt.c:104 misc-utils/lsblk.c:179
msgid "filesystem size available"
msgstr "文件系统可用大小"
-#: misc-utils/findmnt.c:102
+#: misc-utils/findmnt.c:105
msgid "dump(8) period in days [fstab only]"
msgstr "dump(8) 周期(天数) [仅 fstab]"
-#: misc-utils/findmnt.c:103
+#: misc-utils/findmnt.c:106
msgid "filesystem root"
msgstr "文件系统 root"
-#: misc-utils/findmnt.c:104 misc-utils/lsblk.c:165
+#: misc-utils/findmnt.c:107 misc-utils/lsblk.c:182
msgid "filesystem type"
msgstr "文件系统类型"
-#: misc-utils/findmnt.c:105
+#: misc-utils/findmnt.c:108
msgid "FS specific mount options"
msgstr "FS 的特定挂载选项"
-#: misc-utils/findmnt.c:106
+#: misc-utils/findmnt.c:109
msgid "mount ID"
msgstr "挂载 ID"
-#: misc-utils/findmnt.c:107
+#: misc-utils/findmnt.c:110
msgid "filesystem label"
msgstr "文件系统标签"
-#: misc-utils/findmnt.c:108 misc-utils/lsblk.c:161
+#: misc-utils/findmnt.c:111 misc-utils/lsblk.c:192 misc-utils/lslocks.c:80
msgid "major:minor device number"
msgstr "主:次 设备号"
-#: misc-utils/findmnt.c:109
+#: misc-utils/findmnt.c:112
msgid "old mount options saved by --poll"
msgstr "--poll 保存的旧挂载选项"
-#: misc-utils/findmnt.c:110
+#: misc-utils/findmnt.c:113
msgid "old mountpoint saved by --poll"
msgstr "--poll 保存的旧挂载点"
-#: misc-utils/findmnt.c:111
+#: misc-utils/findmnt.c:114
msgid "all mount options"
msgstr "全部挂臷选项"
-#: misc-utils/findmnt.c:112
+#: misc-utils/findmnt.c:115
msgid "optional mount fields"
msgstr "可选的挂载字段"
-#: misc-utils/findmnt.c:113
+#: misc-utils/findmnt.c:116
#, fuzzy
+#| msgid "mount ID"
msgid "mount parent ID"
msgstr "挂载 ID"
-#: misc-utils/findmnt.c:114
+#: misc-utils/findmnt.c:117
msgid "partition label"
msgstr "分区标签"
-#: misc-utils/findmnt.c:116
+#: misc-utils/findmnt.c:119
msgid "pass number on parallel fsck(8) [fstab only]"
msgstr "并行 fsck(8) 的遍数(pass number) [仅 fstab]"
-#: misc-utils/findmnt.c:117
+#: misc-utils/findmnt.c:120
msgid "VFS propagation flags"
msgstr "VFS 传播标志"
-#: misc-utils/findmnt.c:118 misc-utils/lsblk.c:164
+#: misc-utils/findmnt.c:121 misc-utils/lsblk.c:181
msgid "filesystem size"
msgstr "文件系统大小"
-#: misc-utils/findmnt.c:119
+#: misc-utils/findmnt.c:122
+#, fuzzy
+#| msgid "source device"
+msgid "all possible source devices"
+msgstr "源设备"
+
+#: misc-utils/findmnt.c:123
msgid "source device"
msgstr "源设备"
-#: misc-utils/findmnt.c:120
+#: misc-utils/findmnt.c:124
msgid "mountpoint"
msgstr "挂载点"
-#: misc-utils/findmnt.c:121
+#: misc-utils/findmnt.c:125
msgid "task ID"
msgstr "任务 ID"
-#: misc-utils/findmnt.c:122 misc-utils/lsblk.c:166
+#: misc-utils/findmnt.c:126 misc-utils/lsblk.c:183
msgid "filesystem size used"
msgstr "文件系统已用大小"
-#: misc-utils/findmnt.c:123 misc-utils/lsblk.c:167
+#: misc-utils/findmnt.c:127 misc-utils/lsblk.c:184
msgid "filesystem use percentage"
msgstr "文件系统使用百分比"
-#: misc-utils/findmnt.c:124 misc-utils/lsblk.c:175
+#: misc-utils/findmnt.c:128 misc-utils/lsblk.c:228
msgid "filesystem UUID"
msgstr "文件系统 UUID"
-#: misc-utils/findmnt.c:125
+#: misc-utils/findmnt.c:129
msgid "VFS specific mount options"
msgstr "VFS 的特定挂载选项"
-#: misc-utils/findmnt.c:335
+#: misc-utils/findmnt.c:340
#, c-format
msgid "unknown action: %s"
msgstr "未知操作: %s"
-#: misc-utils/findmnt.c:658
+#: misc-utils/findmnt.c:741
msgid "mount"
msgstr "挂载"
-#: misc-utils/findmnt.c:661
+#: misc-utils/findmnt.c:744
msgid "umount"
msgstr "卸载"
-#: misc-utils/findmnt.c:664
+#: misc-utils/findmnt.c:747
msgid "remount"
msgstr "重新挂载"
-#: misc-utils/findmnt.c:667
+#: misc-utils/findmnt.c:750
msgid "move"
msgstr "移动"
-#: misc-utils/findmnt.c:831 misc-utils/findmnt.c:1109 sys-utils/eject.c:717
-#: sys-utils/mount.c:378
+#: misc-utils/findmnt.c:927 misc-utils/findmnt.c:1205 sys-utils/eject.c:715
+#: sys-utils/mount.c:408
msgid "failed to initialize libmount table"
msgstr "初始化 libmount table 失败"
-#: misc-utils/findmnt.c:858 text-utils/hexdump-parse.c:84
+#: misc-utils/findmnt.c:954 text-utils/hexdump-parse.c:84
#, c-format
msgid "can't read %s"
msgstr "不能读 %s"
-#: misc-utils/findmnt.c:1049 misc-utils/findmnt.c:1115
-#: misc-utils/findmnt-verify.c:95 misc-utils/findmnt-verify.c:487
-#: sys-utils/fstrim.c:288 sys-utils/mount.c:136 sys-utils/mount.c:184
-#: sys-utils/mount.c:251 sys-utils/swapoff.c:63 sys-utils/swapoff.c:173
-#: sys-utils/swapon.c:247 sys-utils/swapon.c:290 sys-utils/swapon.c:749
-#: sys-utils/umount.c:195
+#: 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: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:199
msgid "failed to initialize libmount iterator"
msgstr "无法初始化 libmount 迭代器"
-#: misc-utils/findmnt.c:1121
+#: misc-utils/findmnt.c:1217
msgid "failed to initialize libmount tabdiff"
msgstr "初始化 libmount tabdiff 失败"
-#: misc-utils/findmnt.c:1149 misc-utils/kill.c:407
+#: misc-utils/findmnt.c:1245 misc-utils/kill.c:416
msgid "poll() failed"
msgstr "poll() 失败"
-#: misc-utils/findmnt.c:1224
+#: misc-utils/findmnt.c:1320
#, c-format
msgid ""
" %1$s [options]\n"
" %1$s [选项] <设备> <挂臷点>\n"
" %1$s [选项] [--source <设备>] [--target <挂臷点>]\n"
-#: misc-utils/findmnt.c:1231
+#: misc-utils/findmnt.c:1327
msgid "Find a (mounted) filesystem.\n"
msgstr "查找(挂载的)文件系统。\n"
-#: misc-utils/findmnt.c:1234
+#: misc-utils/findmnt.c:1330
msgid " -s, --fstab search in static table of filesystems\n"
msgstr " -s, --fstab 在文件系统表态表中搜索\n"
-#: misc-utils/findmnt.c:1235
+#: misc-utils/findmnt.c:1331
#, fuzzy
+#| msgid ""
+#| " -k, --kernel search in kernel table of mounted\n"
+#| " filesystems (default)\n"
msgid ""
" -m, --mtab search in table of mounted filesystems\n"
" (includes user space mount options)\n"
" -k, --kernel 在已挂载文件系统的内核表中搜索\n"
" (默认)\n"
-#: misc-utils/findmnt.c:1237
+#: misc-utils/findmnt.c:1333
msgid ""
" -k, --kernel search in kernel table of mounted\n"
" filesystems (default)\n"
" -k, --kernel 在已挂载文件系统的内核表中搜索\n"
" (默认)\n"
-#: misc-utils/findmnt.c:1240
+#: misc-utils/findmnt.c:1336
msgid " -p, --poll[=<list>] monitor changes in table of mounted filesystems\n"
msgstr " -p, --poll[=<列表>] 监测已挂臷文件系统表的改变\n"
-#: misc-utils/findmnt.c:1241
+#: misc-utils/findmnt.c:1337
msgid " -w, --timeout <num> upper limit in milliseconds that --poll will block\n"
msgstr " -w, --timeout <数字> --poll 阻塞的时间上限(毫秒)\n"
-#: misc-utils/findmnt.c:1244
+#: misc-utils/findmnt.c:1340
msgid " -A, --all disable all built-in filters, print all filesystems\n"
msgstr " -A, --all 禁用所有内置过滤器，打印所有文件系统\n"
-#: misc-utils/findmnt.c:1245
+#: misc-utils/findmnt.c:1341
msgid " -a, --ascii use ASCII chars for tree formatting\n"
msgstr " -a, --ascii 用 ASCII 字符格式化树\n"
-#: misc-utils/findmnt.c:1246
+#: misc-utils/findmnt.c:1342
msgid " -b, --bytes print sizes in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n"
-#: misc-utils/findmnt.c:1247
+#: misc-utils/findmnt.c:1343
msgid " -C, --nocanonicalize don't canonicalize when comparing paths\n"
msgstr " -c, --no-canonicalize 在比较路径时不对路径规范化\n"
-#: misc-utils/findmnt.c:1248
+#: misc-utils/findmnt.c:1344
msgid " -c, --canonicalize canonicalize printed paths\n"
msgstr " -c, --no-canonicalize 对打印的路径规范化\n"
-#: misc-utils/findmnt.c:1249
+#: misc-utils/findmnt.c:1345
msgid " -D, --df imitate the output of df(1)\n"
msgstr " -D, --df 仿照 df(1) 输出\n"
-#: misc-utils/findmnt.c:1250
+#: misc-utils/findmnt.c:1346
msgid " -d, --direction <word> direction of search, 'forward' or 'backward'\n"
msgstr " -d, --direction <单词> 搜索方向，“forward”(往前)或“backward”(往回)\n"
-#: misc-utils/findmnt.c:1251
+#: misc-utils/findmnt.c:1347
msgid ""
" -e, --evaluate convert tags (LABEL,UUID,PARTUUID,PARTLABEL) \n"
" to device names\n"
" -e, --evaluate 将标签(LABEL,UUID,PARTUUID,PARTLABEL) 转换为\n"
" 设备名\n"
-#: misc-utils/findmnt.c:1253
+#: misc-utils/findmnt.c:1349
msgid " -F, --tab-file <path> alternative file for -s, -m or -k options\n"
msgstr " -F, --tab-file <路径> -s, -m 或 -k 选项的替代文件\n"
-#: misc-utils/findmnt.c:1254
+#: misc-utils/findmnt.c:1350
msgid " -f, --first-only print the first found filesystem only\n"
msgstr " -f, --first-only 只打印找到的第一个文件系统\n"
-#: misc-utils/findmnt.c:1255
+#: misc-utils/findmnt.c:1351
msgid " -i, --invert invert the sense of matching\n"
msgstr " -i, --invert 反转搜索的匹配\n"
-#: misc-utils/findmnt.c:1256 misc-utils/lslocks.c:535 sys-utils/lsns.c:970
-#: sys-utils/rfkill.c:629
+#: 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:1257 sys-utils/lsns.c:971
+#: misc-utils/findmnt.c:1353 sys-utils/lsns.c:1292
msgid " -l, --list use list format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/findmnt.c:1258
+#: misc-utils/findmnt.c:1354
msgid " -N, --task <tid> use alternative namespace (/proc/<tid>/mountinfo file)\n"
msgstr " -N, --task <tid> 使用替代的名字空间(/proc/<tid>/mountinfo 文件)\n"
-#: misc-utils/findmnt.c:1259
+#: misc-utils/findmnt.c:1355
msgid " -n, --noheadings don't print column headings\n"
msgstr " -n, --noheadings 不打印列标题\n"
-#: misc-utils/findmnt.c:1260
+#: misc-utils/findmnt.c:1356
msgid " -O, --options <list> limit the set of filesystems by mount options\n"
msgstr " -O, --options <列表> 根据挂臷选项限制文件系统集合\n"
-#: misc-utils/findmnt.c:1261
+#: misc-utils/findmnt.c:1357
msgid " -o, --output <list> the output columns to be shown\n"
msgstr " -o, --output <列表> 要显示的列\n"
-#: misc-utils/findmnt.c:1262
-#, fuzzy
+#: misc-utils/findmnt.c:1358
msgid " --output-all output all available columns\n"
-msgstr " -O, --output-all 输出所有列\n"
+msgstr " --output-all 输出所有可用列\n"
-#: misc-utils/findmnt.c:1263
+#: misc-utils/findmnt.c:1359
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs 使用 键=“值”的输出格式\n"
-#: misc-utils/findmnt.c:1264
-#, fuzzy
+#: misc-utils/findmnt.c:1360
msgid " --pseudo print only pseudo-filesystems\n"
-msgstr " --verbose 打印更多细节\n"
+msgstr " --pseudo 只打印伪文件系统\n"
-#: misc-utils/findmnt.c:1265
+#: misc-utils/findmnt.c:1361
#, fuzzy
+#| msgid " --verbose print more details\n"
msgid " --shadowed print only filesystems over-mounted by another filesystem\n"
msgstr " --verbose 打印更多细节\n"
-#: misc-utils/findmnt.c:1266
+#: misc-utils/findmnt.c:1362
msgid " -R, --submounts print all submounts for the matching filesystems\n"
msgstr " -R, --submounts 打印匹配文件系统的所有子挂载(submount)\n"
-#: misc-utils/findmnt.c:1267
+#: misc-utils/findmnt.c:1363
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: misc-utils/findmnt.c:1268
-#, fuzzy
+#: misc-utils/findmnt.c:1364
msgid " --real print only real filesystems\n"
-msgstr " -a, --all 卸载所有文件系统\n"
+msgstr " --real 只打印真实文件系统\n"
-#: misc-utils/findmnt.c:1269
+#: misc-utils/findmnt.c:1365
msgid ""
" -S, --source <string> the device to mount (by name, maj:min, \n"
" LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n"
" -S, --source <字符串> 要挂载的设备(按 名称, 主:次设备号, \n"
" LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n"
-#: misc-utils/findmnt.c:1271
+#: misc-utils/findmnt.c:1367
msgid " -T, --target <path> the path to the filesystem to use\n"
msgstr " -T, --target <路径> 要使用的文件系统的路径\n"
-#: misc-utils/findmnt.c:1272
-#, fuzzy
+#: misc-utils/findmnt.c:1368
msgid " --tree enable tree format output if possible\n"
-msgstr " -l, --list 使用列表格式的输出\n"
+msgstr " --tree 可能的话，启用树形格式化输出\n"
-#: misc-utils/findmnt.c:1273
+#: misc-utils/findmnt.c:1369
msgid " -M, --mountpoint <dir> the mountpoint directory\n"
msgstr " -M, --mountpoint <目录> 挂载点目录\n"
-#: misc-utils/findmnt.c:1274
+#: misc-utils/findmnt.c:1370
msgid " -t, --types <list> limit the set of filesystems by FS types\n"
msgstr " -t, --types <列表> 根据文件系统类型限制文件系统集合\n"
-#: misc-utils/findmnt.c:1275
+#: misc-utils/findmnt.c:1371
msgid " -U, --uniq ignore filesystems with duplicate target\n"
msgstr " -U, --uniq 忽略目标重复的文件系统\n"
-#: misc-utils/findmnt.c:1276 misc-utils/lslocks.c:542 sys-utils/lsns.c:977
+#: 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"
-#: misc-utils/findmnt.c:1277
+#: misc-utils/findmnt.c:1373
msgid " -v, --nofsroot don't print [/dir] for bind or btrfs mounts\n"
msgstr " -v, --nofsroot 对绑定式或 btrfs 挂载不打印[/dir]\n"
-#: misc-utils/findmnt.c:1280
+#: misc-utils/findmnt.c:1374
+msgid " -y, --shell use column names to be usable as shell variable identifiers\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:1377
msgid " -x, --verify verify mount table content (default is fstab)\n"
msgstr " -x, --verify 验证挂载表内容(默认为 fstab)\n"
-#: misc-utils/findmnt.c:1281
+#: misc-utils/findmnt.c:1378
msgid " --verbose print more details\n"
msgstr " --verbose 打印更多细节\n"
-#: misc-utils/findmnt.c:1282
-#, fuzzy
+#: misc-utils/findmnt.c:1379
msgid " --vfs-all print all VFS options\n"
-msgstr " -a, --all 打印所有设备\n"
+msgstr " --vfs-all 打印所有 VFS 选项\n"
-#: misc-utils/findmnt.c:1421
+#: misc-utils/findmnt.c:1519
#, c-format
msgid "unknown direction '%s'"
msgstr "未知方向“%s”"
-#: misc-utils/findmnt.c:1497
+#: misc-utils/findmnt.c:1596
msgid "invalid TID argument"
msgstr "无效的 TID 参数"
-#: misc-utils/findmnt.c:1582
+#: misc-utils/findmnt.c:1683
msgid "--poll accepts only one file, but more specified by --tab-file"
msgstr "--poll 只接受一个文件，但用 --tab-file 指定了多个"
-#: misc-utils/findmnt.c:1586
+#: misc-utils/findmnt.c:1687
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:1639 sys-utils/fstrim.c:267
+#: misc-utils/findmnt.c:1740 sys-utils/fstrim.c:308
msgid "failed to initialize libmount cache"
msgstr "初始化 libmount 缓存失败"
-#: misc-utils/findmnt.c:1683
+#: misc-utils/findmnt.c:1785
#, c-format
msgid "%s column is requested, but --poll is not enabled"
msgstr "请示了 %s 列，但未启用 --poll"
-#: misc-utils/findmnt-verify.c:119
+#: misc-utils/findmnt-verify.c:125
msgid "target specified more than once"
msgstr "不止一次指定目标"
-#: misc-utils/findmnt-verify.c:121
+#: misc-utils/findmnt-verify.c:127
#, c-format
msgid "wrong order: %s specified before %s"
msgstr "顺序错误：%s 在 %s 之前指定"
-#: misc-utils/findmnt-verify.c:135
+#: misc-utils/findmnt-verify.c:141
msgid "undefined target (fs_file)"
msgstr "未定义目标 (fs_file)"
-#: misc-utils/findmnt-verify.c:142
+#: misc-utils/findmnt-verify.c:148
#, c-format
msgid "non-canonical target path (real: %s)"
msgstr "目标路径不规范(实为：%s)"
-#: misc-utils/findmnt-verify.c:147
+#: misc-utils/findmnt-verify.c:153
#, c-format
msgid "unreachable on boot required target: %m"
msgstr "启动所需目标无法访问：%m"
-#: misc-utils/findmnt-verify.c:149
+#: misc-utils/findmnt-verify.c:155
#, c-format
msgid "unreachable target: %m"
msgstr "不可及的目标: %m"
-#: misc-utils/findmnt-verify.c:153
+#: misc-utils/findmnt-verify.c:159
msgid "target is not a directory"
msgstr "目标不是一个目录"
-#: misc-utils/findmnt-verify.c:155
+#: misc-utils/findmnt-verify.c:161
msgid "target exists"
msgstr "目标存在"
-#: misc-utils/findmnt-verify.c:167
+#: misc-utils/findmnt-verify.c:176
#, c-format
msgid "unreachable on boot required source: %s=%s"
msgstr "启动所需的源无法访问：%s=%s"
-#: misc-utils/findmnt-verify.c:169
+#: misc-utils/findmnt-verify.c:178
#, c-format
msgid "unreachable: %s=%s"
msgstr "不可及: %s=%s"
-#: misc-utils/findmnt-verify.c:171
+#: misc-utils/findmnt-verify.c:180
#, c-format
msgid "%s=%s translated to %s"
msgstr "%s=%s 转换为 %s"
-#: misc-utils/findmnt-verify.c:192
+#: misc-utils/findmnt-verify.c:201
msgid "undefined source (fs_spec)"
msgstr "源未定义(fs_spec)"
-#: misc-utils/findmnt-verify.c:201
+#: misc-utils/findmnt-verify.c:210
#, c-format
msgid "unsupported source tag: %s"
msgstr "不受支持的源标记︰ %s"
-#: misc-utils/findmnt-verify.c:208
+#: misc-utils/findmnt-verify.c:217
#, c-format
msgid "do not check %s source (pseudo/net)"
msgstr "不检查 %s 源(pseudo/net)"
-#: misc-utils/findmnt-verify.c:211
+#: misc-utils/findmnt-verify.c:220
#, c-format
msgid "unreachable source: %s: %m"
msgstr "无法访问源︰ %s: %m"
-#: misc-utils/findmnt-verify.c:214
+#: misc-utils/findmnt-verify.c:223
#, c-format
msgid "non-bind mount source %s is a directory or regular file"
msgstr "非绑定挂载源 %s 是一个目录或常规文件"
-#: misc-utils/findmnt-verify.c:217
+#: misc-utils/findmnt-verify.c:226
#, c-format
msgid "source %s is not a block device"
msgstr "源 %s 不是一个块设备"
-#: misc-utils/findmnt-verify.c:219
+#: misc-utils/findmnt-verify.c:228
#, c-format
msgid "source %s exists"
msgstr "源 %s 已存在"
-#: misc-utils/findmnt-verify.c:232
+#: misc-utils/findmnt-verify.c:241
#, c-format
msgid "VFS options: %s"
msgstr "VFS 选项︰ %s"
-#: misc-utils/findmnt-verify.c:236
+#: misc-utils/findmnt-verify.c:245
#, c-format
msgid "FS options: %s"
msgstr "FS 选项︰ %s"
-#: misc-utils/findmnt-verify.c:240
+#: misc-utils/findmnt-verify.c:249
#, c-format
msgid "userspace options: %s"
msgstr "用户空间选项︰ %s"
-#: misc-utils/findmnt-verify.c:254
+#: misc-utils/findmnt-verify.c:263
#, c-format
msgid "unsupported swaparea discard policy: %s"
msgstr "不支持的 swaparea 放弃策略︰ %s"
-#: misc-utils/findmnt-verify.c:262
+#: misc-utils/findmnt-verify.c:271
msgid "failed to parse swaparea priority option"
msgstr "解析 swaparea 优先级选项失败"
-#: misc-utils/findmnt-verify.c:398
+#: misc-utils/findmnt-verify.c:421
#, c-format
msgid "do not check %s FS type (pseudo/net)"
msgstr "不检查 %s 文件系统类型 (pseudo/net)"
-#: misc-utils/findmnt-verify.c:408
+#: misc-utils/findmnt-verify.c:433
msgid "\"none\" FS type is recommended for bind or move oprations only"
msgstr "\"none\" 这种文件系统类型只建议用于绑定或移动操作"
-#: misc-utils/findmnt-verify.c:418
+#: misc-utils/findmnt-verify.c:445
#, fuzzy, c-format
+#| msgid "%s seems unspported by the current kernel"
msgid "%s seems unsupported by the current kernel"
msgstr "当前内核似乎不支持 %s"
-#: misc-utils/findmnt-verify.c:424 misc-utils/findmnt-verify.c:425
-msgid "cannot detect on-disk filesystem type"
+#: misc-utils/findmnt-verify.c:452
+#, fuzzy
+#| msgid "unknown"
+msgid "reason unknown"
+msgstr "未知"
+
+#: misc-utils/findmnt-verify.c:455 misc-utils/findmnt-verify.c:457
+#, fuzzy, c-format
+#| msgid "cannot detect on-disk filesystem type"
+msgid "cannot detect on-disk filesystem type (%s)"
msgstr "无法检测磁盘上(on-disk)的文件系统类型"
-#: misc-utils/findmnt-verify.c:433
+#: misc-utils/findmnt-verify.c:467
#, c-format
msgid "%s does not match with on-disk %s"
msgstr "%s 与磁盘上的 %s 不匹配"
-#: misc-utils/findmnt-verify.c:436
+#: misc-utils/findmnt-verify.c:471
#, fuzzy, c-format
+#| msgid "on-disk %s seems unspported by the current kernel"
msgid "on-disk %s seems unsupported by the current kernel"
msgstr "当前内核似乎不支持磁盘上的 %s"
-#: misc-utils/findmnt-verify.c:438
+#: misc-utils/findmnt-verify.c:475
#, c-format
msgid "FS type is %s"
msgstr "文件系统类型是 %s"
-#: misc-utils/findmnt-verify.c:450
+#: misc-utils/findmnt-verify.c:492
#, c-format
msgid "recommended root FS passno is 1 (current is %d)"
msgstr " 根文件系统的 passno 推荐值为 1 (当前是 %d)"
-#: misc-utils/findmnt-verify.c:519
+#: misc-utils/findmnt-verify.c:563
+msgid ""
+"your fstab has been modified, but systemd still uses the old version;\n"
+" use 'systemctl daemon-reload' to reload"
+msgstr ""
+
+#: misc-utils/findmnt-verify.c:574
#, c-format
msgid "%d parse error"
msgid_plural "%d parse errors"
msgstr[0] "%d 个解析错误"
-#: misc-utils/findmnt-verify.c:520
+#: misc-utils/findmnt-verify.c:575
#, c-format
msgid ", %d error"
msgid_plural ", %d errors"
msgstr[0] "，%d 个错误"
-#: misc-utils/findmnt-verify.c:521
+#: misc-utils/findmnt-verify.c:576
#, c-format
msgid ", %d warning"
msgid_plural ", %d warnings"
msgstr[0] "，%d 个警告"
-#: misc-utils/findmnt-verify.c:524
+#: misc-utils/findmnt-verify.c:579
#, c-format
msgid "Success, no errors or warnings detected\n"
msgstr "成功，未检测到错误或警告\n"
msgid "internal error, contact the author."
msgstr "内部错误，请联系作者。"
-#: misc-utils/hardlink.c:286
-#, fuzzy
+#: misc-utils/hardlink.c:272
+#, c-format
+msgid "could not compile regular expression %s: %s"
+msgstr "无法编译正则表达式 %s：%s"
+
+#: misc-utils/hardlink.c:391
msgid "Mode:"
-msgstr "型号："
+msgstr "模式："
-#: misc-utils/hardlink.c:287
+#: misc-utils/hardlink.c:392
msgid "dry-run"
msgstr ""
-#: misc-utils/hardlink.c:287
+#: misc-utils/hardlink.c:392
msgid "real"
msgstr ""
-#: misc-utils/hardlink.c:288
-#, fuzzy
+#: misc-utils/hardlink.c:393
+msgid "Method:"
+msgstr ""
+
+#: misc-utils/hardlink.c:394
msgid "Files:"
-msgstr "文件"
+msgstr "文件："
-#: misc-utils/hardlink.c:289 misc-utils/hardlink.c:295
+#: misc-utils/hardlink.c:395 misc-utils/hardlink.c:401
+#: misc-utils/hardlink.c:405
#, c-format
-msgid "%-15s %zu files"
+msgid "%-25s %zu files"
msgstr ""
-#: misc-utils/hardlink.c:289
+#: misc-utils/hardlink.c:395
msgid "Linked:"
msgstr ""
-#: misc-utils/hardlink.c:292
+#: misc-utils/hardlink.c:398
#, c-format
-msgid "%-15s %zu xattrs"
+msgid "%-25s %zu xattrs"
msgstr ""
-#: misc-utils/hardlink.c:292 misc-utils/hardlink.c:295
+#: misc-utils/hardlink.c:398 misc-utils/hardlink.c:401
msgid "Compared:"
msgstr ""
-#: misc-utils/hardlink.c:302
+#: misc-utils/hardlink.c:405
+msgid "Skipped reflinks:"
+msgstr ""
+
+#: misc-utils/hardlink.c:412
#, fuzzy
+#| msgid "saved"
msgid "Saved:"
msgstr "已保存"
-#: misc-utils/hardlink.c:305
+#: misc-utils/hardlink.c:415
#, fuzzy, c-format
-msgid "%-15s %<PRId64>.%06<PRId64> seconds"
-msgstr "%-14s %2i 秒\n"
+#| msgid "%s (%<PRIu64>-%<PRIu64>): "
+msgid "%-25s %<PRId64>.%06<PRId64> seconds"
+msgstr "%s (%<PRIu64>-%<PRIu64>): "
-#: misc-utils/hardlink.c:305
+#: misc-utils/hardlink.c:415
#, fuzzy
+#| msgid "Description"
msgid "Duration:"
msgstr "描述"
-#: misc-utils/hardlink.c:343
+#: 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:359
+#: 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:439
+#: misc-utils/hardlink.c:549
#, c-format
msgid "Comparing xattrs of %s to %s"
msgstr ""
-#: misc-utils/hardlink.c:541
-#, fuzzy, c-format
-msgid "Comparing %s to %s"
-msgstr "分区数：%d"
-
-#: misc-utils/hardlink.c:667
-#, c-format
-msgid "%sLinking %s to %s (-%s)"
+#: misc-utils/hardlink.c:716
+msgid "Reflinking failed, fallback to hardlinking"
msgstr ""
-#: misc-utils/hardlink.c:668
+#: 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:752
msgid "[DryRun] "
msgstr ""
-#: misc-utils/hardlink.c:681
+#: 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:686
-#, fuzzy, c-format
+#: misc-utils/hardlink.c:769
+#, c-format
msgid "cannot rename %s to %s"
-msgstr "无法将 %s 改名为 %s：%s\n"
+msgstr "无法将 %s 改名为 %s"
-#: misc-utils/hardlink.c:758
+#: misc-utils/hardlink.c:855
#, c-format
msgid "Skipped %s (smaller than configured size)"
msgstr ""
-#: misc-utils/hardlink.c:762
+#: misc-utils/hardlink.c:865
#, fuzzy, c-format
-msgid "Visiting %s (file %zu)"
-msgstr "关闭 %s 失败"
+#| msgid "%s: offset is greater than device size"
+msgid "Skipped %s (greater than configured size)"
+msgstr "%s：偏移量超过设备大小"
-#: misc-utils/hardlink.c:820
-#, fuzzy
+#: 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:932
msgid "cannot continue"
-msgstr "无法转为守护进程"
+msgstr "无法继续"
-#: misc-utils/hardlink.c:875
+#: 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:1106
+#, c-format
+msgid "Skipped (already reflink) %s"
+msgstr ""
+
+#: misc-utils/hardlink.c:1127
+#, c-format
+msgid "Skipped (content mismatch) %s"
+msgstr ""
+
+#: misc-utils/hardlink.c:1157
+#, c-format
msgid " %s [options] <directory>|<file> ...\n"
-msgstr " %s [选项] 目录...\n"
+msgstr " %s [options] <目录>|<文件> ...\n"
-#: misc-utils/hardlink.c:879
+#: misc-utils/hardlink.c:1161
msgid "Consolidate duplicate files using hardlinks.\n"
msgstr ""
-#: misc-utils/hardlink.c:882
+#: misc-utils/hardlink.c:1164
#, fuzzy
-msgid " -v, --verbose verbose output (repeat for more verbosity)\n"
-msgstr " -v, --verbose 更详尽\n"
+#| 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:883
+#: misc-utils/hardlink.c:1165
#, fuzzy
-msgid " -q, --quiet quiet mode - don't print anything\n"
-msgstr " -q, --quiet 开启安静模式\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:884
+#: misc-utils/hardlink.c:1167
#, fuzzy
-msgid " -n, --dry-run don't actually link anything\n"
-msgstr " -n, --dry-run 不要实际进行任何链接操作"
+#| msgid " -U, --detect-case detect uppercase terminal\n"
+msgid " -d, --respect-dir directory names have to be identical\n"
+msgstr " -U, --detect-case 检测纯大写终端\n"
-#: misc-utils/hardlink.c:885
+#: misc-utils/hardlink.c:1168
#, fuzzy
+#| 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:886
-#, fuzzy
-msgid " -p, --ignore-mode ignore changes of file mode\n"
-msgstr " -t, --ignore 忽略失败\n"
-
-#: misc-utils/hardlink.c:887
-#, fuzzy
-msgid " -o, --ignore-owner ignore owner changes\n"
-msgstr " -t, --ignore 忽略失败\n"
-
-#: misc-utils/hardlink.c:888
-#, fuzzy
-msgid " -t, --ignore-time ignore timestamps (when testing for equality)\n"
-msgstr " -t, --notime 不显示任何消息的时间戳\n"
-
-#: misc-utils/hardlink.c:890
-msgid " -X, --respect-xattrs respect extended attributes\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:892
+#: misc-utils/hardlink.c:1170
#, fuzzy
+#| msgid ""
+#| " -k, --kernel search in kernel table of mounted\n"
+#| " filesystems (default)\n"
msgid ""
" -m, --maximize maximize the hardlink count, remove the file with\n"
" lowest hardlink count\n"
" -k, --kernel 在已挂载文件系统的内核表中搜索\n"
" (默认)\n"
-#: misc-utils/hardlink.c:894
+#: 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:895
+#: 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:897
+#: misc-utils/hardlink.c:1177
+#, 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:1178
+msgid " -q, --quiet quiet mode - don't print anything\n"
+msgstr " -q, --quiet 安静模式 - 不要打印任何内容\n"
+
+#: misc-utils/hardlink.c:1179
+#, 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"
+
+#: misc-utils/hardlink.c:1180
+#, fuzzy
+#| msgid " -S, --size <size> maximum size for a single message\n"
+msgid " -s, --minimum-size <size> minimum size for files.\n"
+msgstr " -S, --size <大小> 单条消息的最大尺寸\n"
+
+#: misc-utils/hardlink.c:1181
+#, fuzzy
+#| msgid " -S, --size <size> maximum size for a single message\n"
+msgid " -S, --maximum-size <size> maximum size for files.\n"
+msgstr " -S, --size <大小> 单条消息的最大尺寸\n"
+
+#: misc-utils/hardlink.c:1182
+#, 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:1183
+msgid " -v, --verbose verbose output (repeat for more verbosity)\n"
+msgstr " -v, --verbose 详尽输出（重复该参数可获得更详尽内容）\n"
+
+#: misc-utils/hardlink.c:1184
#, fuzzy
+#| 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:898
-msgid " -i, --include <regex> regular expression to include files/dirs\n"
+#: misc-utils/hardlink.c:1186
+msgid " -X, --respect-xattrs respect extended attributes\n"
msgstr ""
-#: misc-utils/hardlink.c:899
+#: misc-utils/hardlink.c:1188
#, fuzzy
-msgid " -s, --minimum-size <size> minimum size for files.\n"
-msgstr " -S, --size <大小> 单条消息的最大尺寸\n"
+#| 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:900
+#: misc-utils/hardlink.c:1191
#, fuzzy
-msgid " -c, --content compare only file contents, same as -pot\n"
-msgstr " -c, --content 只比较内容，忽略权限等其它信息"
+#| 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:927
-#, fuzzy, c-format
-msgid "could not compile regular expression %s: %s"
-msgstr "无上一个正则表达式"
+#: misc-utils/hardlink.c:1192
+msgid " --skip-reflinks skip already cloned files (enabled on --reflink)\n"
+msgstr ""
-#: misc-utils/hardlink.c:1020 sys-utils/ipcmk.c:114 sys-utils/losetup.c:735
-#: sys-utils/zramctl.c:650
-msgid "failed to parse size"
+#: misc-utils/hardlink.c:1303
+#, fuzzy
+#| msgid "failed to parse size"
+msgid "failed to parse minimum size"
msgstr "解析大小失败"
-#: misc-utils/hardlink.c:1070
+#: misc-utils/hardlink.c:1306
#, fuzzy
-msgid "cannot register exit handler"
-msgstr "无法设置信号处理函数"
+#| msgid "failed to parse size"
+msgid "failed to parse maximum size"
+msgstr "解析大小失败"
-#: misc-utils/hardlink.c:1075
+#: misc-utils/hardlink.c:1309
#, fuzzy
-msgid "no directory or file specified"
-msgstr "未指定目录"
+#| msgid "failed to parse size"
+msgid "failed to parse cache size"
+msgstr "解析大小失败"
+
+#: misc-utils/hardlink.c:1312
+#, fuzzy
+#| msgid "failed to parse size"
+msgid "failed to parse I/O size"
+msgstr "解析大小失败"
-#: misc-utils/hardlink.c:1082
+#: misc-utils/hardlink.c:1325
#, fuzzy, c-format
+#| msgid "unsupported lock mode: %s"
+msgid "unsupported reflink mode; %s"
+msgstr "不支持的锁模式：%s"
+
+#: misc-utils/hardlink.c:1406
+msgid "cannot register exit handler"
+msgstr "无法登记退出处理函数"
+
+#: misc-utils/hardlink.c:1411
+msgid "no directory or file specified"
+msgstr "未指定目录或文件"
+
+#: misc-utils/hardlink.c:1417
+#, c-format
+msgid "cannot initialize %s method, use 'memcmp' fallback"
+msgstr ""
+
+#: misc-utils/hardlink.c:1422
+#, fuzzy
+#| msgid "failed to initialize loopcxt"
+msgid "failed to initialize files comparior"
+msgstr "初始化 loopcxt 失败"
+
+#: misc-utils/hardlink.c:1434
+msgid "Scanning [device/inode/links]:"
+msgstr ""
+
+#: misc-utils/hardlink.c:1439 sys-utils/fstrim.c:97
+#, c-format
+msgid "cannot get realpath: %s"
+msgstr "无法获取真实路径：%s"
+
+#: misc-utils/hardlink.c:1445
+#, c-format
msgid "cannot process %s"
-msgstr "无法访问 %s"
+msgstr "无法处理 %s"
-#: misc-utils/kill.c:168
+#: misc-utils/kill.c:171
#, c-format
msgid "unknown signal %s; valid signals:"
msgstr "未知信号 %s；有效信号为："
-#: misc-utils/kill.c:193
+#: misc-utils/kill.c:197
#, c-format
msgid " %s [options] <pid>|<name>...\n"
msgstr " %s [选项] <pid>|<名称> ...\n"
-#: misc-utils/kill.c:196
+#: misc-utils/kill.c:200
msgid "Forcibly terminate a process.\n"
msgstr "强制结束某个进程。\n"
-#: misc-utils/kill.c:199
+#: 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:201
+#: 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:203
+#: 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:206
+#: 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:209
+#: misc-utils/kill.c:213
msgid " -p, --pid print pids without signaling them\n"
msgstr " -p, --pid 打印 pid 而不向它们发送信号\n"
-#: misc-utils/kill.c:210
+#: 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:211
+#: misc-utils/kill.c:215
msgid " -L, --table list signal names and numbers\n"
msgstr " -L, --table 列出信号名和数值\n"
-#: misc-utils/kill.c:212
+#: 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:232 term-utils/agetty.c:691
-#, fuzzy, c-format
-msgid "%s from %s"
-msgstr "%s，来自 %s\n"
-
-#: misc-utils/kill.c:236
+#: misc-utils/kill.c:241
msgid " (with: "
msgstr ""
-#: misc-utils/kill.c:285 misc-utils/kill.c:294 sys-utils/setpriv.c:448
-#: sys-utils/unshare.c:499
+#: 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:305 misc-utils/kill.c:308 misc-utils/kill.c:317
-#: misc-utils/kill.c:329 misc-utils/kill.c:372 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:332 misc-utils/kill.c:347 sys-utils/eject.c:208
-#: sys-utils/eject.c:230 sys-utils/losetup.c:730 sys-utils/tunelp.c:164
+#: 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
#: sys-utils/tunelp.c:209 term-utils/setterm.c:211 term-utils/setterm.c:214
#: 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:325
+#: term-utils/setterm.c:669 text-utils/more.c:329
msgid "argument error"
msgstr "参数出错"
-#: misc-utils/kill.c:369
+#: misc-utils/kill.c:378
#, c-format
msgid "invalid signal name or number: %s"
msgstr "无效的信号名或数字：%s"
-#: misc-utils/kill.c:395
+#: misc-utils/kill.c:404
#, c-format
msgid "pidfd_open() failed: %d"
msgstr "pidfd_open() 失败：%d"
-#: misc-utils/kill.c:400 misc-utils/kill.c:414
-#, fuzzy
+#: misc-utils/kill.c:409 misc-utils/kill.c:423
msgid "pidfd_send_signal() failed"
-msgstr "sd_listen_fds() 失败"
+msgstr "pidfd_send_signal() 失败"
-#: misc-utils/kill.c:411
+#: 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:426
+#: misc-utils/kill.c:435
#, c-format
msgid "sending signal %d to pid %d\n"
msgstr "将信号 %d 发送给 pid %d\n"
-#: misc-utils/kill.c:444
+#: misc-utils/kill.c:453
#, c-format
msgid "sending signal to %s failed"
msgstr "向 %s 发送信号失败"
-#: misc-utils/kill.c:493
+#: 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”"
-#: misc-utils/logger.c:228
+#: misc-utils/logger.c:230
#, c-format
msgid "unknown facility name: %s"
msgstr "未知设施名称：%s"
-#: misc-utils/logger.c:234
+#: misc-utils/logger.c:236
#, c-format
msgid "unknown priority name: %s"
msgstr "未知优先级名称：%s"
-#: misc-utils/logger.c:246
+#: misc-utils/logger.c:248
#, c-format
msgid "openlog %s: pathname too long"
msgstr "openlog %s：路径名过长"
-#: misc-utils/logger.c:273
+#: misc-utils/logger.c:275
#, c-format
msgid "socket %s"
msgstr "套接字 %s"
-#: misc-utils/logger.c:310
+#: misc-utils/logger.c:312
#, c-format
msgid "failed to resolve name %s port %s: %s"
msgstr "解析名称 %s 端口 %s 失败：%s"
-#: misc-utils/logger.c:327
+#: misc-utils/logger.c:329
#, c-format
msgid "failed to connect to %s port %s"
msgstr "连接 %s 端口 %s 失败"
-#: misc-utils/logger.c:375
+#: misc-utils/logger.c:377
#, c-format
msgid "maximum input lines (%d) exceeded"
msgstr "超过了最大输入行数(%d)"
-#: misc-utils/logger.c:528
+#: misc-utils/logger.c:520
msgid "send message failed"
msgstr "发送消息失败"
-#: misc-utils/logger.c:598
+#: misc-utils/logger.c:590
#, c-format
msgid "structured data ID '%s' is not unique"
msgstr "结构化数据的 ID “%s” 不唯一"
-#: misc-utils/logger.c:612
+#: misc-utils/logger.c:604
#, c-format
msgid "--sd-id was not specified for --sd-param %s"
msgstr "没有为 --sd-param %s 指定 --sd-id"
-#: misc-utils/logger.c:791
+#: misc-utils/logger.c:808
msgid "localtime() failed"
msgstr "localtime() 失败"
-#: misc-utils/logger.c:801
+#: misc-utils/logger.c:818
#, c-format
msgid "hostname '%s' is too long"
msgstr "主机名“'%s”太长"
-#: misc-utils/logger.c:807
+#: misc-utils/logger.c:824
#, c-format
msgid "tag '%s' is too long"
msgstr "标签“%s”太长"
-#: misc-utils/logger.c:870
+#: misc-utils/logger.c:887
#, c-format
msgid "ignoring unknown option argument: %s"
msgstr "将忽略未知的选项参数：%s"
-#: misc-utils/logger.c:882
+#: misc-utils/logger.c:899
#, c-format
msgid "invalid argument: %s: using automatic errors"
msgstr "无效参数︰ %s︰ 将使用自动错误"
-#: misc-utils/logger.c:1053
+#: misc-utils/logger.c:1059
#, c-format
msgid " %s [options] [<message>]\n"
msgstr " %s [选项] [<消息>]\n"
-#: misc-utils/logger.c:1056
+#: misc-utils/logger.c:1062
msgid "Enter messages into the system log.\n"
msgstr "将消息输入系统日志。\n"
-#: misc-utils/logger.c:1059
+#: misc-utils/logger.c:1065
msgid " -i log the logger command's PID\n"
msgstr " -i 记录日志程序的 PID\n"
-#: misc-utils/logger.c:1060
+#: 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:1061
+#: misc-utils/logger.c:1067
msgid " -f, --file <file> log the contents of this file\n"
msgstr " -f, --file <文件> 记录指定文件的内容\n"
-#: misc-utils/logger.c:1062
+#: 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:1063
+#: misc-utils/logger.c:1069
msgid " --no-act do everything except the write the log\n"
msgstr " --no-act 操作但不实际写入日志\n"
-#: misc-utils/logger.c:1064
+#: 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:1065
+#: misc-utils/logger.c:1071
msgid " --octet-count use rfc6587 octet counting\n"
msgstr " --octet-count 使用 rfc6587 八位元组(octet) 计数\n"
-#: misc-utils/logger.c:1066
+#: 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:1067
+#: misc-utils/logger.c:1073
msgid " -s, --stderr output message to standard error as well\n"
msgstr " -s, --stderr 也向标准错误输出消息\n"
-#: misc-utils/logger.c:1068
+#: misc-utils/logger.c:1074
msgid " -S, --size <size> maximum size for a single message\n"
msgstr " -S, --size <大小> 单条消息的最大尺寸\n"
-#: misc-utils/logger.c:1069
+#: 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:1070
+#: 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:1071
+#: 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:1072
+#: misc-utils/logger.c:1078
msgid " -T, --tcp use TCP only\n"
msgstr " -T, --tcp 只用 TCP\n"
-#: misc-utils/logger.c:1073
+#: misc-utils/logger.c:1079
msgid " -d, --udp use UDP only\n"
msgstr " -d, --udp 只用 UDP\n"
-#: misc-utils/logger.c:1074
+#: misc-utils/logger.c:1080
msgid " --rfc3164 use the obsolete BSD syslog protocol\n"
msgstr " --rfc3164 使用过时的 BSD syslog 协议\n"
-#: misc-utils/logger.c:1075
+#: 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:1077
+#: 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:1078
+#: misc-utils/logger.c:1084
msgid " --sd-param <data> rfc5424 structured data name=value\n"
msgstr " --sd-param <数据> rfc5424 结构化数据名称=值\n"
-#: misc-utils/logger.c:1079
+#: misc-utils/logger.c:1085
msgid " --msgid <msgid> set rfc5424 message id field\n"
msgstr " --msgid <msgid> 设置 rfc5424 消息 id 字段\n"
-#: misc-utils/logger.c:1080
+#: misc-utils/logger.c:1086
msgid " -u, --socket <socket> write to this Unix socket\n"
msgstr " -u, --socket <套接字> 写入此 Unix 套接字\n"
-#: misc-utils/logger.c:1081
+#: 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:1084
+#: misc-utils/logger.c:1090
msgid " --journald[=<file>] write journald entry\n"
msgstr " --journald[=<文件>] 写 journald 记录\n"
-#: misc-utils/logger.c:1170
+#: misc-utils/logger.c:1176
#, c-format
msgid "file %s"
msgstr "文件 %s"
-#: misc-utils/logger.c:1185
+#: misc-utils/logger.c:1191
msgid "failed to parse id"
msgstr "解析 id 失败"
-#: misc-utils/logger.c:1203
+#: misc-utils/logger.c:1209
msgid "failed to parse message size"
msgstr "解析消息大小失败"
-#: misc-utils/logger.c:1233
+#: misc-utils/logger.c:1239
msgid "--msgid cannot contain space"
msgstr "--msgid 不能包含空格"
-#: misc-utils/logger.c:1255
+#: misc-utils/logger.c:1261
#, c-format
msgid "invalid structured data ID: '%s'"
msgstr "无效的结构化数据 ID: “%s”"
-#: misc-utils/logger.c:1260
+#: misc-utils/logger.c:1266
#, c-format
msgid "invalid structured data parameter: '%s'"
msgstr "无效的结构化数据参数: “%s”"
-#: misc-utils/logger.c:1275
+#: misc-utils/logger.c:1281
msgid "--file <file> and <message> are mutually exclusive, message is ignored"
msgstr "--file <文件> 和 <消息> 互斥，消息已忽略"
-#: misc-utils/logger.c:1282
+#: misc-utils/logger.c:1288
msgid "journald entry could not be written"
msgstr "无法写入 journald 项"
-#: misc-utils/look.c:359
+#: misc-utils/look.c:357
#, c-format
msgid " %s [options] <string> [<file>...]\n"
msgstr " %s [选项] <字符串> [<文件>...]\n"
-#: misc-utils/look.c:362
+#: misc-utils/look.c:360
msgid "Display lines beginning with a specified string.\n"
msgstr "显示以指定字符串开头的行。\n"
-#: misc-utils/look.c:365
+#: misc-utils/look.c:363
msgid " -a, --alternative use the alternative dictionary\n"
msgstr " -a, --alternative 使用替代字典\n"
-#: misc-utils/look.c:366
+#: misc-utils/look.c:364
msgid " -d, --alphanum compare only blanks and alphanumeric characters\n"
msgstr " -d, --alphanum 只比较空白和字母数字字符\n"
-#: misc-utils/look.c:367
+#: misc-utils/look.c:365
msgid " -f, --ignore-case ignore case differences when comparing\n"
msgstr " -f, --ignore-case 比较时忽略大小写\n"
-#: misc-utils/look.c:368
+#: misc-utils/look.c:366
msgid " -t, --terminate <char> define the string-termination character\n"
msgstr " -t, --terminate <字符> 定义字符串终止字符\n"
-#: misc-utils/lsblk.c:157
-msgid "device name"
-msgstr "设备名"
+#: misc-utils/lsblk.c:170
+msgid "alignment offset"
+msgstr "对齐偏移量"
-#: misc-utils/lsblk.c:158
-msgid "internal kernel device name"
-msgstr "内部内核设备名称"
+#: misc-utils/lsblk.c:171
+msgid "udev ID (based on ID-LINK)"
+msgstr ""
-#: misc-utils/lsblk.c:159
-msgid "internal parent kernel device name"
-msgstr "内部上级内核设备名称"
+#: misc-utils/lsblk.c:172
+msgid "the shortest udev /dev/disk/by-id link name"
+msgstr ""
-#: misc-utils/lsblk.c:160
-msgid "path to the device node"
-msgstr "å\88°è®¾å¤\87è\8a\82ç\82¹ç\9a\84è·¯å¾\84"
+#: misc-utils/lsblk.c:173
+msgid "discard alignment offset"
+msgstr "忽ç\95¥å¯¹é½\90å\81\8f移é\87\8f"
-#: misc-utils/lsblk.c:168
+#: misc-utils/lsblk.c:174
#, fuzzy
-msgid "mounted filesystem roots"
-msgstr "文件系统 root"
-
-#: misc-utils/lsblk.c:169
-msgid "filesystem version"
-msgstr "文件系统版本"
+#| msgid "removable device"
+msgid "dax-capable device"
+msgstr "可移动设备"
-#: misc-utils/lsblk.c:171 sys-utils/zramctl.c:86
-msgid "where the device is mounted"
-msgstr "设备挂载位置"
+#: misc-utils/lsblk.c:175
+msgid "discard granularity"
+msgstr "忽略粒度"
-#: misc-utils/lsblk.c:172
+#: misc-utils/lsblk.c:176
#, fuzzy
-msgid "all locations where device is mounted"
-msgstr "设备挂载位置"
-
-#: misc-utils/lsblk.c:174 misc-utils/wipefs.c:110
-msgid "filesystem LABEL"
-msgstr "文件系统标签"
+#| msgid "disk serial number"
+msgid "disk sequence number"
+msgstr "磁盘序列号"
#: misc-utils/lsblk.c:177
-msgid "partition table identifier (usually UUID)"
-msgstr "å\88\86å\8cºè¡¨æ \87è¯\86符ï¼\88é\80\9a常为 UUIDï¼\89"
+msgid "discard max bytes"
+msgstr "忽ç\95¥æ\9c\80大å\97è\8a\82æ\95°"
#: misc-utils/lsblk.c:178
-msgid "partition table type"
-msgstr "å\88\86å\8cºè¡¨ç±»å\9e\8b"
+msgid "discard zeroes data"
+msgstr "忽ç\95¥é\9b¶æ\95°æ\8d®"
#: misc-utils/lsblk.c:180
#, fuzzy
-msgid "partition type code or UUID"
-msgstr "分区类型 UUID"
+#| msgid "filesystem root"
+msgid "mounted filesystem roots"
+msgstr "文件系统 root"
-#: misc-utils/lsblk.c:181
-msgid "partition type name"
-msgstr "分区类型名"
-
-#: misc-utils/lsblk.c:182
-msgid "partition LABEL"
-msgstr "分区 LABEL"
+#: misc-utils/lsblk.c:185
+msgid "filesystem version"
+msgstr "文件系统版本"
#: misc-utils/lsblk.c:186
-msgid "read-ahead of the device"
-msgstr "该设备的预读(read-ahead)"
+msgid "group name"
+msgstr "组名"
-#: misc-utils/lsblk.c:187 sys-utils/losetup.c:79
-msgid "read-only device"
-msgstr "只读设备"
+#: misc-utils/lsblk.c:187
+msgid "Host:Channel:Target:Lun for SCSI"
+msgstr "SCSI 的 Host:Channel:Target:Lun"
#: misc-utils/lsblk.c:188
-msgid "removable device"
-msgstr "可移动设备"
-
-#: misc-utils/lsblk.c:189
msgid "removable or hotplug device (usb, pcmcia, ...)"
msgstr "可移动或热插拔设备(usb, pcmcia, ...)"
-#: misc-utils/lsblk.c:190
-msgid "rotational device"
-msgstr "转动设备"
+#: misc-utils/lsblk.c:189
+msgid "internal kernel device name"
+msgstr "内部内核设备名称"
-#: misc-utils/lsblk.c:191
-msgid "adds randomness"
-msgstr "æ·»å\8a é\9a\8fæ\9cºæ\80§"
+#: misc-utils/lsblk.c:190 misc-utils/wipefs.c:110
+msgid "filesystem LABEL"
+msgstr "æ\96\87件系ç»\9fæ \87ç¾"
-#: misc-utils/lsblk.c:192
-msgid "device identifier"
-msgstr "设备标识符"
+#: misc-utils/lsblk.c:191
+msgid "logical sector size"
+msgstr "逻辑扇区大小"
#: misc-utils/lsblk.c:193
-msgid "disk serial number"
-msgstr "磁盘序列号"
+msgid "minimum I/O size"
+msgstr "最小 I/O 大小"
#: misc-utils/lsblk.c:194
-msgid "size of the device"
-msgstr "磁盘容量"
+msgid "device identifier"
+msgstr "设备标识符"
#: misc-utils/lsblk.c:195
-msgid "state of the device"
-msgstr "设备的状态"
-
-#: misc-utils/lsblk.c:197
-msgid "group name"
-msgstr "组名"
-
-#: misc-utils/lsblk.c:198
msgid "device node permissions"
msgstr "设备节点权限"
-#: misc-utils/lsblk.c:199
-msgid "alignment offset"
-msgstr "对齐偏移量"
+#: misc-utils/lsblk.c:196
+#, fuzzy
+#| msgid "device name"
+msgid "device queues"
+msgstr "设备名"
-#: misc-utils/lsblk.c:200
-msgid "minimum I/O size"
-msgstr "最小 I/O 大小"
+#: misc-utils/lsblk.c:197
+msgid "device name"
+msgstr "设备名"
-#: misc-utils/lsblk.c:201
+#: misc-utils/lsblk.c:198
msgid "optimal I/O size"
msgstr "最优 I/O 大小"
+#: misc-utils/lsblk.c:201
+msgid "partition LABEL"
+msgstr "分区 LABEL"
+
#: misc-utils/lsblk.c:202
-msgid "physical sector size"
-msgstr "物理扇区大小"
+#, 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 "logical sector size"
-msgstr "逻辑扇区大小"
+msgid "partition type name"
+msgstr "分区类型名"
#: misc-utils/lsblk.c:204
-msgid "I/O scheduler name"
-msgstr "I/O 调度器名称"
-
-#: misc-utils/lsblk.c:205
-msgid "request queue size"
-msgstr "请求队列大小"
+#, fuzzy
+#| msgid "partition type UUID"
+msgid "partition type code or UUID"
+msgstr "分区类型 UUID"
#: misc-utils/lsblk.c:206
-msgid "device type"
-msgstr "设备类型"
+msgid "path to the device node"
+msgstr "到设备节点的路径"
#: misc-utils/lsblk.c:207
-msgid "discard alignment offset"
-msgstr "忽ç\95¥å¯¹é½\90å\81\8f移é\87\8f"
+msgid "physical sector size"
+msgstr "ç\89©ç\90\86æ\89\87å\8cºå¤§å°\8f"
#: misc-utils/lsblk.c:208
-msgid "discard granularity"
-msgstr "忽ç\95¥ç²\92度"
+msgid "internal parent kernel device name"
+msgstr "å\86\85é\83¨ä¸\8a级å\86\85æ ¸è®¾å¤\87å\90\8d称"
#: misc-utils/lsblk.c:209
-msgid "discard max bytes"
-msgstr "忽ç\95¥æ\9c\80大å\97è\8a\82æ\95°"
+msgid "partition table type"
+msgstr "å\88\86å\8cºè¡¨ç±»å\9e\8b"
#: misc-utils/lsblk.c:210
-msgid "discard zeroes data"
-msgstr "忽ç\95¥é\9b¶æ\95°æ\8d®"
+msgid "partition table identifier (usually UUID)"
+msgstr "å\88\86å\8cºè¡¨æ \87è¯\86符ï¼\88é\80\9a常为 UUIDï¼\89"
#: misc-utils/lsblk.c:211
+msgid "adds randomness"
+msgstr "添加随机性"
+
+#: misc-utils/lsblk.c:212
+msgid "read-ahead of the device"
+msgstr "该设备的预读(read-ahead)"
+
+#: misc-utils/lsblk.c:213
+msgid "device revision"
+msgstr "设备修订版本"
+
+#: misc-utils/lsblk.c:214
+msgid "removable device"
+msgstr "可移动设备"
+
+#: misc-utils/lsblk.c:215
+msgid "rotational device"
+msgstr "转动设备"
+
+#: misc-utils/lsblk.c:216 sys-utils/losetup.c:79
+msgid "read-only device"
+msgstr "只读设备"
+
+#: misc-utils/lsblk.c:217
+msgid "request queue size"
+msgstr "请求队列大小"
+
+#: misc-utils/lsblk.c:218
+msgid "I/O scheduler name"
+msgstr "I/O 调度器名称"
+
+#: misc-utils/lsblk.c:219
+msgid "disk serial number"
+msgstr "磁盘序列号"
+
+#: misc-utils/lsblk.c:220
+msgid "size of the device"
+msgstr "磁盘容量"
+
+#: misc-utils/lsblk.c:221
+#, fuzzy
+#| msgid "partition name"
+msgid "partition start offset"
+msgstr "分区名"
+
+#: misc-utils/lsblk.c:222
+msgid "state of the device"
+msgstr "设备的状态"
+
+#: misc-utils/lsblk.c:223
+msgid "de-duplicated chain of subsystems"
+msgstr "对成链的子系统去重"
+
+#: misc-utils/lsblk.c:224
+#, fuzzy
+#| msgid "where the device is mounted"
+msgid "all locations where device is mounted"
+msgstr "设备挂载位置"
+
+#: misc-utils/lsblk.c:225 sys-utils/zramctl.c:86
+msgid "where the device is mounted"
+msgstr "设备挂载位置"
+
+#: misc-utils/lsblk.c:226
+msgid "device transport type"
+msgstr "设备传输类型"
+
+#: misc-utils/lsblk.c:227
+msgid "device type"
+msgstr "设备类型"
+
+#: misc-utils/lsblk.c:229
+msgid "device vendor"
+msgstr "设备制造商"
+
+#: misc-utils/lsblk.c:230
msgid "write same max bytes"
msgstr "写相同的最大字节数"
-#: misc-utils/lsblk.c:212
+#: misc-utils/lsblk.c:231
msgid "unique storage identifier"
msgstr "惟一存储标识符"
-#: misc-utils/lsblk.c:213
-msgid "Host:Channel:Target:Lun for SCSI"
-msgstr "SCSI 的 Host:Channel:Target:Lun"
+#: misc-utils/lsblk.c:232
+msgid "zone model"
+msgstr ""
+
+#: misc-utils/lsblk.c:233
+#, fuzzy
+#| msgid "min seg size"
+msgid "zone size"
+msgstr "最小段大小"
+
+#: misc-utils/lsblk.c:234
+#, fuzzy
+#| msgid "discard granularity"
+msgid "zone write granularity"
+msgstr "忽略粒度"
+
+#: misc-utils/lsblk.c:235
+#, fuzzy
+#| msgid "write same max bytes"
+msgid "zone append max bytes"
+msgstr "写相同的最大字节数"
+
+#: misc-utils/lsblk.c:236
+#, fuzzy
+#| msgid "number of sectors"
+msgid "number of zones"
+msgstr "扇区数"
+
+#: misc-utils/lsblk.c:237
+#, fuzzy
+#| msgid "max number of open files"
+msgid "maximum number of open zones"
+msgstr "打开文件的最大数量"
+
+#: misc-utils/lsblk.c:238
+#, fuzzy
+#| msgid "max number of processes"
+msgid "maximum number of active zones"
+msgstr "最大进程数"
+
+#: misc-utils/lsblk.c:1433
+msgid "failed to allocate device"
+msgstr "分配设备失败"
+
+#: misc-utils/lsblk.c:1493
+msgid "failed to open device directory in sysfs"
+msgstr "打开 sysfs 中的设备目录失败"
+
+#: misc-utils/lsblk.c:1681
+#, c-format
+msgid "%s: failed to get sysfs name"
+msgstr "%s：获取 sysfs 名称失败"
+
+#: misc-utils/lsblk.c:1693
+#, c-format
+msgid "%s: failed to get whole-disk device number"
+msgstr "%s：获取 整盘 设备号失败"
+
+#: misc-utils/lsblk.c:1766 misc-utils/lsblk.c:1814
+msgid "failed to allocate /sys handler"
+msgstr "分配 /sys 处理程序失败"
+
+#: 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: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:1912
+#, c-format
+msgid "the list of included devices is too large (limit is %d devices)"
+msgstr "包含设备列表过大(限制为 %d 台设备)"
+
+#: misc-utils/lsblk.c:1981 sys-utils/wdctl.c:225
+#, c-format
+msgid " %s [options] [<device> ...]\n"
+msgstr " %s [选项] [<设备> ...]\n"
+
+#: misc-utils/lsblk.c:1984
+msgid "List information about block devices.\n"
+msgstr "列出块设备的信息。\n"
+
+#: 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:1988
+msgid " -D, --discard print discard capabilities\n"
+msgstr " -D, --discard 打印时丢弃能力\n"
+
+#: 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:1990
+msgid " -I, --include <list> show only devices with specified major numbers\n"
+msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n"
+
+#: 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: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:1993
+msgid " -O, --output-all output all columns\n"
+msgstr " -O, --output-all 输出所有列\n"
+
+#: misc-utils/lsblk.c:1995
+msgid " -S, --scsi output info about SCSI devices\n"
+msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n"
+
+#: 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:1999
+msgid " -a, --all print all devices\n"
+msgstr " -a, --all 打印所有设备\n"
+
+#: 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:2002
+msgid " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"
+msgstr " -e, --exclude <列表> 根据主设备号排除设备(默认：内存盘)\n"
+
+#: misc-utils/lsblk.c:2003
+msgid " -f, --fs output info about filesystems\n"
+msgstr " -f, --fs 输出文件系统信息\n"
+
+#: misc-utils/lsblk.c:2004
+msgid " -i, --ascii use ascii characters only\n"
+msgstr " -i, --ascii 只使用 ascii 字符\n"
+
+#: misc-utils/lsblk.c:2005
+msgid " -l, --list use list format output\n"
+msgstr " -l, --list 使用列表格式的输出\n"
+
+#: misc-utils/lsblk.c:2006
+msgid " -m, --perms output info about permissions\n"
+msgstr " -m, --perms 输出权限信息\n"
+
+#: 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:2008 sys-utils/lsmem.c:530
+msgid " -o, --output <list> output columns\n"
+msgstr " -o, --output <列表> 输出列\n"
+
+#: misc-utils/lsblk.c:2009
+msgid " -p, --paths print complete device path\n"
+msgstr " -p, --paths 打印完整设备路径\n"
+
+#: misc-utils/lsblk.c:2011
+msgid " -s, --inverse inverse dependencies\n"
+msgstr " -s, --inverse 反向依赖\n"
+
+#: misc-utils/lsblk.c:2012
+msgid " -t, --topology output info about topology\n"
+msgstr " -t, --topology 输出拓扑信息\n"
+
+#: 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:2014
+msgid " -x, --sort <column> sort output by <column>\n"
+msgstr " -x, --sort <列> 按<列>对输出排序\n"
+
+#: misc-utils/lsblk.c:2015
+msgid " -y, --shell use column names to be usable as shell variable identifiers\n"
+msgstr ""
+
+#: 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:2017
+msgid " --sysroot <dir> use specified directory as system root\n"
+msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
+
+#: misc-utils/lsblk.c:2034
+#, c-format
+msgid "failed to access sysfs directory: %s"
+msgstr "无法访问 sysfs 目录：%s"
+
+#: misc-utils/lsblk.c:2280
+#, fuzzy
+#| msgid "invalid partition number argument"
+msgid "invalid output width number argument"
+msgstr "无效的分区号参数"
+
+#: misc-utils/lsblk.c:2439
+msgid "failed to allocate device tree"
+msgstr "分配设备树失败"
+
+#: 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:131
+msgid "block device driver name resolved by /proc/devices"
+msgstr ""
+
+#: misc-utils/lsfd.c:134
+msgid "character device driver name resolved by /proc/devices"
+msgstr ""
+
+#: 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:140
+msgid "reachability from the file system"
+msgstr ""
+
+#: misc-utils/lsfd.c:143
+#, fuzzy
+#| msgid "device backing file"
+msgid "ID of device containing file"
+msgstr "设备后备文件"
+
+#: misc-utils/lsfd.c:146
+msgid "device type (blk, char, or nodev)"
+msgstr ""
+
+#: 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:155
+#, fuzzy
+#| msgid "bad file descriptor"
+msgid "file descriptor for the file"
+msgstr "错误的文件描述符"
+
+#: 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:161 misc-utils/lslocks.c:79
+#, fuzzy
+#| msgid "logical NUMA node number"
+msgid "inode number"
+msgstr "逻辑 NUMA 节点数量"
+
+#: 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:182
+msgid "device ID for special, or ID of device containing file"
+msgstr ""
+
+#: misc-utils/lsfd.c:185
+msgid "length of file mapping (in page)"
+msgstr ""
+
+#: misc-utils/lsfd.c:188
+msgid "misc character device name resolved by /proc/misc"
+msgstr ""
+
+#: misc-utils/lsfd.c:191
+#, fuzzy
+#| msgid "mount"
+msgid "mount id"
+msgstr "挂载"
+
+#: misc-utils/lsfd.c:194
+#, fuzzy
+#| msgid "lock access mode"
+msgid "access mode (rwx)"
+msgstr "锁访问模式"
+
+#: misc-utils/lsfd.c:197
+#, fuzzy
+#| msgid "size of the file"
+msgid "name of the file (cooked)"
+msgstr "文件大小"
+
+#: 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: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: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: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: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:248
+#, fuzzy
+#| msgid "Number of attached processes"
+msgid "protocol number of the raw socket"
+msgstr "附加的进程数"
+
+#: misc-utils/lsfd.c:251
+#, fuzzy
+#| msgid "no device specified"
+msgid "device ID (if special file)"
+msgstr "未指定设备"
+
+#: misc-utils/lsfd.c:254
+#, fuzzy
+#| msgid "max file size"
+msgid "file size"
+msgstr "最大文件尺寸"
+
+#: 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: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:293
+#, fuzzy
+#| msgid "filesystem type"
+msgid "file type (cooked)"
+msgstr "文件系统类型"
+
+#: 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: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:370 sys-utils/prlimit.c:87
+msgid "processes"
+msgstr "进程"
+
+#: misc-utils/lsfd.c:374
+#, fuzzy
+#| msgid "Attached processes"
+msgid "root owned processes"
+msgstr "附加的进程"
+
+#: misc-utils/lsfd.c:378
+#, fuzzy
+#| msgid "kernel messages"
+msgid "kernel threads"
+msgstr "内核消息"
+
+#: misc-utils/lsfd.c:382
+#, fuzzy
+#| msgid "open failed"
+msgid "open files"
+msgstr "打开失败"
+
+#: misc-utils/lsfd.c:386
+#, fuzzy
+#| msgid "open failed"
+msgid "RO open files"
+msgstr "打开失败"
+
+#: misc-utils/lsfd.c:390
+#, fuzzy
+#| msgid "open failed"
+msgid "WO open files"
+msgstr "打开失败"
+
+#: misc-utils/lsfd.c:394
+msgid "shared mappings"
+msgstr ""
+
+#: misc-utils/lsfd.c:398
+msgid "RO shared mappings"
+msgstr ""
+
+#: misc-utils/lsfd.c:402
+msgid "WO shared mappings"
+msgstr ""
+
+#: misc-utils/lsfd.c:406
+msgid "regular files"
+msgstr ""
+
+#: misc-utils/lsfd.c:410
+#, fuzzy
+#| msgid "Sectors"
+msgid "directories"
+msgstr "扇区"
+
+#: misc-utils/lsfd.c:414
+#, fuzzy
+#| msgid "socket"
+msgid "sockets"
+msgstr "套接字"
+
+#: misc-utils/lsfd.c:418
+msgid "fifos/pipes"
+msgstr ""
+
+#: misc-utils/lsfd.c:422
+#, fuzzy
+#| msgid "/dev/%s: not a character device"
+msgid "character devices"
+msgstr "/dev/%s：不是字符设备"
+
+#: misc-utils/lsfd.c:426
+#, fuzzy
+#| msgid "block device name"
+msgid "block devices"
+msgstr "块设备名称"
+
+#: misc-utils/lsfd.c:430
+#, fuzzy
+#| msgid "unknown user %s"
+msgid "unknown types"
+msgstr "未知用户 %s"
+
+#: misc-utils/lsfd.c:526
+msgid "too many columns are added via filter expression"
+msgstr ""
+
+#: misc-utils/lsfd.c:1323
+#, fuzzy
+#| msgid "failed to allocate UID cache"
+msgid "failed to allocate an idcache"
+msgstr "分配 UID 缓存失败"
+
+#: misc-utils/lsfd.c:1378 misc-utils/lslocks.c:292
+msgid "(unknown)"
+msgstr "(未知)"
+
+#: 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:1467
+#, c-format
+msgid "garbage at the end of pid specification: %s"
+msgstr ""
+
+#: misc-utils/lsfd.c:1469
+#, c-format
+msgid "out of range value for pid specification: %ld"
+msgstr ""
+
+#: 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:1517
+#, fuzzy
+#| msgid "failed to open: %s"
+msgid "failed to open /proc"
+msgstr "打开失败：%s"
+
+#: 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 " -r, --raw use raw output format\n"
+msgid " -r, --raw use raw output format\n"
+msgstr " -r, --raw 使用原生输出格式\n"
-#: misc-utils/lsblk.c:214
-msgid "device transport type"
-msgstr "设备传输类型"
+#: 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"
+msgstr " -u, --notruncate 不截断列中的文本\n"
-#: misc-utils/lsblk.c:215
-msgid "de-duplicated chain of subsystems"
-msgstr "对成链的子系统去重"
+#: 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"
+msgstr " -p, --pid <pid>... 对这些已运行的进程操作\n"
-#: misc-utils/lsblk.c:216
-msgid "device revision"
-msgstr "设备修订版本"
+#: misc-utils/lsfd.c:1548
+msgid " -i[4|6], --inet[=4|6] list only IPv4 and/or IPv6 sockets\n"
+msgstr ""
-#: misc-utils/lsblk.c:217
-msgid "device vendor"
-msgstr "设备制造商"
+#: misc-utils/lsfd.c:1549
+msgid " -Q, --filter <expr> apply display filter\n"
+msgstr ""
-#: misc-utils/lsblk.c:218
-msgid "zone model"
+#: misc-utils/lsfd.c:1550
+msgid " --debug-filter dump the internal data structure of filter and exit\n"
msgstr ""
-#: misc-utils/lsblk.c:219
+#: misc-utils/lsfd.c:1551
#, fuzzy
-msgid "dax-capable device"
-msgstr "可移动设备"
+#| msgid " --default use default terminal settings\n"
+msgid ""
+" -C, --counter <name>:<expr>\n"
+" define custom counter for --summary output\n"
+msgstr " --default 使用默认终端设置\n"
-#: misc-utils/lsblk.c:1295
-msgid "failed to allocate device"
-msgstr "分配设备失败"
+#: misc-utils/lsfd.c:1553
+msgid " --dump-counters dump counter definitions\n"
+msgstr ""
-#: misc-utils/lsblk.c:1355
-msgid "failed to open device directory in sysfs"
-msgstr "打开 sysfs 中的设备目录失败"
+#: misc-utils/lsfd.c:1554
+msgid " --summary[=<when>] print summary information (only, append, or never)\n"
+msgstr ""
-#: misc-utils/lsblk.c:1543
+#: misc-utils/lsfd.c:1621
#, c-format
-msgid "%s: failed to get sysfs name"
-msgstr "%s：获取 sysfs 名称失败"
+msgid "too short counter specification: -C/--counter %s"
+msgstr ""
-#: misc-utils/lsblk.c:1555
+#: misc-utils/lsfd.c:1625 misc-utils/lsfd.c:1631
#, c-format
-msgid "%s: failed to get whole-disk device number"
-msgstr "%s：获取 整盘 设备号失败"
-
-#: misc-utils/lsblk.c:1628 misc-utils/lsblk.c:1676
-msgid "failed to allocate /sys handler"
-msgstr "分配 /sys 处理程序失败"
+msgid "no name for counter: -C/--counter %s"
+msgstr ""
-#: misc-utils/lsblk.c:1736 misc-utils/lsblk.c:1738 misc-utils/lsblk.c:1767
-#: misc-utils/lsblk.c:1769
+#: misc-utils/lsfd.c:1635
#, c-format
-msgid "failed to parse list '%s'"
-msgstr "解析列表“%s”失败"
+msgid "empty counter expression given: -C/--counter %s"
+msgstr ""
-#. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1743
+#: misc-utils/lsfd.c:1643
#, c-format
-msgid "the list of excluded devices is too large (limit is %d devices)"
-msgstr "排除设备列表过大(限制为 %d 台设备)"
+msgid "don't use `{' in the name of a counter: %s"
+msgstr ""
-#. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1774
-#, c-format
-msgid "the list of included devices is too large (limit is %d devices)"
-msgstr "包含设备列表过大(限制为 %d 台设备)"
+#: misc-utils/lsfd.c:1664
+msgid "failed in making filter for a counter: "
+msgstr ""
-#: misc-utils/lsblk.c:1843 sys-utils/wdctl.c:207
-#, c-format
-msgid " %s [options] [<device> ...]\n"
-msgstr " %s [选项] [<设备> ...]\n"
+#: misc-utils/lsfd.c:1732
+#, fuzzy
+#| msgid "failed to allocate output table"
+msgid "failed to allocate summary table"
+msgstr "分配输出表失败"
-#: misc-utils/lsblk.c:1846
-msgid "List information about block devices.\n"
-msgstr "列出块设备的信息。\n"
+#: misc-utils/lsfd.c:1742
+msgid "VALUE"
+msgstr ""
-#: misc-utils/lsblk.c:1849
-msgid " -D, --discard print discard capabilities\n"
-msgstr " -D, --discard 打印时丢弃能力\n"
+#: 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:1748
+msgid "COUNTER"
+msgstr ""
-#: misc-utils/lsblk.c:1850
+#: misc-utils/lsfd.c:1763 misc-utils/lsfd.c:1765 misc-utils/lsfd.c:1768
#, fuzzy
-msgid " -E, --dedup <column> de-duplicate output by <column>\n"
-msgstr " -x, --sort <列> 按<列>对输出排序\n"
+#| msgid "failed to add output data"
+msgid "failed to add summary data"
+msgstr "添加输出信息失败"
-#: misc-utils/lsblk.c:1851
-msgid " -I, --include <list> show only devices with specified major numbers\n"
-msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n"
+#: misc-utils/lsfd.c:1905
+#, fuzzy, c-format
+#| msgid "unknown argument: %s"
+msgid "unknown -i/--inet argument: %s"
+msgstr "未知参数：%s"
-#: misc-utils/lsblk.c:1852 sys-utils/lsirq.c:63 sys-utils/lsmem.c:512
-msgid " -J, --json use JSON output format\n"
-msgstr " -J, --json 使用 JSON 输出格式\n"
+#: misc-utils/lsfd.c:1931 sys-utils/lsmem.c:641
+msgid "unsupported --summary argument"
+msgstr "不支持的 --summary 参数"
-#: misc-utils/lsblk.c:1853
-msgid " -O, --output-all output all columns\n"
-msgstr " -O, --output-all 输出所有列\n"
+#: 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/lsblk.c:1855
-msgid " -S, --scsi output info about SCSI devices\n"
-msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n"
+#: misc-utils/lsfd-filter.c:417
+#, c-format
+msgid "error: string literal is not terminated: %s"
+msgstr ""
-#: misc-utils/lsblk.c:1856
-#, fuzzy
-msgid " -T, --tree[=<column>] use tree format output\n"
-msgstr " -l, --list 使用列表格式的输出\n"
+#: misc-utils/lsfd-filter.c:511
+#, c-format
+msgid "error: unbalanced parenthesis: %s"
+msgstr ""
-#: misc-utils/lsblk.c:1857
-msgid " -a, --all print all devices\n"
-msgstr " -a, --all 打印所有设备\n"
+#: misc-utils/lsfd-filter.c:560 misc-utils/lsfd-filter.c:570
+#: misc-utils/lsfd-filter.c:580
+#, fuzzy, c-format
+#| msgid "input error: unexpected character %c after %s field"
+msgid "error: unexpected character %c after ="
+msgstr "输入错误：%2$s 字段后出现异常字符 %1$c"
-#: misc-utils/lsblk.c:1859
-msgid " -d, --nodeps don't print slaves or holders\n"
-msgstr " -d, --nodeps 不打印从属设备(slave)或占位设备(holder)\n"
+#: misc-utils/lsfd-filter.c:641
+#, fuzzy, c-format
+#| msgid "%s: failed to get partition number"
+msgid "error: failed to convert input to number"
+msgstr "%s：获取分区号失败"
-#: misc-utils/lsblk.c:1860
-msgid " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"
-msgstr " -e, --exclude <列表> 根据主设备号排除设备(默认：内存盘)\n"
+#: misc-utils/lsfd-filter.c:645
+#, fuzzy, c-format
+#| msgid "input error: unexpected character %c after %s field"
+msgid "error: unexpected character %c"
+msgstr "输入错误：%2$s 字段后出现异常字符 %1$c"
-#: misc-utils/lsblk.c:1861
-msgid " -f, --fs output info about filesystems\n"
-msgstr " -f, --fs 输出文件系统信息\n"
+#: misc-utils/lsfd-filter.c:700
+#, fuzzy, c-format
+#| msgid "input error: unexpected character %c after %s field"
+msgid "error: unexpected token: %s after %s"
+msgstr "输入错误：%2$s 字段后出现异常字符 %1$c"
-#: misc-utils/lsblk.c:1862
-msgid " -i, --ascii use ascii characters only\n"
-msgstr " -i, --ascii 只使用 ascii 字符\n"
+#: misc-utils/lsfd-filter.c:711
+#, c-format
+msgid "error: empty left side expression: %s"
+msgstr ""
-#: misc-utils/lsblk.c:1863
-msgid " -l, --list use list format output\n"
-msgstr " -l, --list 使用列表格式的输出\n"
+#: misc-utils/lsfd-filter.c:726
+#, fuzzy, c-format
+#| msgid "error writing sector %lu on %s"
+msgid "error: no such column: %s"
+msgstr "写 %2$s 上的 %1$lu 扇区出错"
-#: misc-utils/lsblk.c:1864
-#, fuzzy
-msgid " -M, --merge group parents of sub-trees (usable for RAIDs, Multi-path)\n"
-msgstr " -d, --dump <设备> 转储分区表(用于后续输入)\n"
+#: misc-utils/lsfd-filter.c:737
+#, c-format
+msgid "error: cannot add a column to table: %s"
+msgstr ""
-#: misc-utils/lsblk.c:1865
-msgid " -m, --perms output info about permissions\n"
-msgstr " -m, --perms 输出权限信息\n"
+#: misc-utils/lsfd-filter.c:759
+#, fuzzy, c-format
+#| msgid "internal error: unsupported dialog type %d"
+msgid "error: unsupported column data type: %d, column: %s"
+msgstr "内部错误：不支持的对话类型 %d"
-#: misc-utils/lsblk.c:1866 sys-utils/lsirq.c:65 sys-utils/lsmem.c:516
-msgid " -n, --noheadings don't print headings\n"
-msgstr " -n, --noheadings 不打印标题\n"
+#: misc-utils/lsfd-filter.c:804 misc-utils/lsfd-filter.c:834
+#, c-format
+msgid "error: empty right side expression: %s"
+msgstr ""
-#: misc-utils/lsblk.c:1867 sys-utils/lsmem.c:517
-msgid " -o, --output <list> output columns\n"
-msgstr " -o, --output <列表> 输出列\n"
+#: 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/lsblk.c:1868
-msgid " -p, --paths print complete device path\n"
-msgstr " -p, --paths 打印完整设备路径\n"
+#: 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/lsblk.c:1870
-msgid " -s, --inverse inverse dependencies\n"
-msgstr " -s, --inverse 反向依赖\n"
+#: 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/lsblk.c:1871
-msgid " -t, --topology output info about topology\n"
-msgstr " -t, --topology 输出拓扑信息\n"
+#: 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/lsblk.c:1872
-#, fuzzy
-msgid " -w, --width <num> specifies output width as number of characters\n"
-msgstr " -c, --columns <宽度> 输出宽度(字符数)\n"
+#: 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/lsblk.c:1873
-msgid " -x, --sort <column> sort output by <column>\n"
-msgstr " -x, --sort <列> 按<列>对输出排序\n"
+#: misc-utils/lsfd-filter.c:1269
+#, c-format
+msgid "error: string literal is expected as right operand for: %s"
+msgstr ""
-#: misc-utils/lsblk.c:1874
-#, fuzzy
-msgid " -z, --zoned print zone model\n"
-msgstr " -c, --offline 只打印离线 CPU\n"
+#: 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/lsblk.c:1875
-msgid " --sysroot <dir> use specified directory as system root\n"
-msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
+#: misc-utils/lsfd-filter.c:1321
+msgid "error: unbalanced parenthesis: ("
+msgstr ""
-#: misc-utils/lsblk.c:1892
+#: misc-utils/lsfd-filter.c:1327
#, c-format
-msgid "failed to access sysfs directory: %s"
-msgstr "无法访问 sysfs 目录：%s"
+msgid "error: garbage at the end of expression: %s"
+msgstr ""
+
+#: misc-utils/lsfd-filter.c:1333
+#, c-format
+msgid "error: bool expression is expected: %s"
+msgstr ""
-#: misc-utils/lsblk.c:2099
+#: misc-utils/lsfd.h:232
#, fuzzy
-msgid "invalid output width number argument"
-msgstr "无效的分区号参数"
+#| msgid "failed to allocate memory: %m"
+msgid "failed to allocate memory for string"
+msgstr "分配内存失败：%m"
-#: misc-utils/lsblk.c:2257
-msgid "failed to allocate device tree"
-msgstr "分配设备树失败"
+#: 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:73
+#: misc-utils/lslocks.c:75
msgid "command of the process holding the lock"
msgstr "持有锁的进程命令"
-#: misc-utils/lslocks.c:74
+#: misc-utils/lslocks.c:76
msgid "PID of the process holding the lock"
msgstr "持有锁的进程 PID"
-#: misc-utils/lslocks.c:75
+#: misc-utils/lslocks.c:77
msgid "kind of lock"
msgstr "锁的类型"
-#: misc-utils/lslocks.c:76
+#: misc-utils/lslocks.c:78
msgid "size of the lock"
msgstr "锁的大小"
-#: misc-utils/lslocks.c:77
+#: misc-utils/lslocks.c:81
msgid "lock access mode"
msgstr "锁访问模式"
-#: misc-utils/lslocks.c:78
+#: misc-utils/lslocks.c:82
msgid "mandatory state of the lock: 0 (none), 1 (set)"
msgstr "锁的强制(mandatory)状态：0(未设置)，1(设置)"
-#: misc-utils/lslocks.c:79
+#: misc-utils/lslocks.c:83
msgid "relative byte offset of the lock"
msgstr "锁的相对字节偏移量"
-#: misc-utils/lslocks.c:80
+#: misc-utils/lslocks.c:84
msgid "ending offset of the lock"
msgstr "锁的末尾偏移量"
-#: misc-utils/lslocks.c:81
+#: misc-utils/lslocks.c:85
msgid "path of the locked file"
msgstr "锁定文件的路径"
-#: misc-utils/lslocks.c:82
+#: misc-utils/lslocks.c:86
msgid "PID of the process blocking the lock"
msgstr "阻塞锁的进程的 PID"
-#: misc-utils/lslocks.c:259
+#: misc-utils/lslocks.c:234
+#, fuzzy, c-format
+#| msgid "failed to parse %s"
+msgid "failed to parse '%s'"
+msgstr "解析 %s 失败"
+
+#: misc-utils/lslocks.c:266
msgid "failed to parse ID"
msgstr "解析 ID 失败"
-#: misc-utils/lslocks.c:281 misc-utils/uuidd.c:755 sys-utils/nsenter.c:262
+#: 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 失败"
-#: misc-utils/lslocks.c:285
-msgid "(unknown)"
-msgstr "(未知)"
-
-#: misc-utils/lslocks.c:287
+#: misc-utils/lslocks.c:294
msgid "(undefined)"
msgstr ""
-#: misc-utils/lslocks.c:296
+#: misc-utils/lslocks.c:303
msgid "failed to parse start"
msgstr "解析 起点 失败"
-#: misc-utils/lslocks.c:303
+#: misc-utils/lslocks.c:310
msgid "failed to parse end"
msgstr "解析 终点 失败"
-#: misc-utils/lslocks.c:531
+#: misc-utils/lslocks.c:548
msgid "List local system locks.\n"
msgstr "列出本地系统锁。\n"
-#: misc-utils/lslocks.c:534
+#: misc-utils/lslocks.c:551
#, fuzzy
+#| msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n"
msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为打印 SIZE，而非易读格式\n"
-#: misc-utils/lslocks.c:536
+#: misc-utils/lslocks.c:553
msgid " -i, --noinaccessible ignore locks without read permissions\n"
msgstr " -i, --noinaccessible 忽略没有读权限的锁\n"
-#: misc-utils/lslocks.c:537 sys-utils/lsns.c:972 sys-utils/rfkill.c:630
+#: 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:538 sys-utils/lsns.c:973 sys-utils/rfkill.c:631
+#: 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:539 sys-utils/lsns.c:974 sys-utils/rfkill.c:632
+#: 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"
-#: misc-utils/lslocks.c:540
+#: misc-utils/lslocks.c:557
msgid " -p, --pid <pid> display only locks held by this process\n"
msgstr " -p, --pid <pid> 只显示由指定进程持有的锁\n"
-#: misc-utils/lslocks.c:541 sys-utils/lsns.c:976 sys-utils/rfkill.c:633
+#: 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:606 schedutils/chrt.c:414 schedutils/ionice.c:177
-#: schedutils/taskset.c:171 schedutils/uclampset.c:255 sys-utils/choom.c:102
-#: sys-utils/lsns.c:1058 sys-utils/prlimit.c:593
+#: misc-utils/lslocks.c:623 schedutils/chrt.c:413 schedutils/ionice.c:179
+#: 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:671 sys-utils/blkdiscard.c:107
-#: sys-utils/fallocate.c:107 sys-utils/fstrim.c:435
+#: 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:501
-#: 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"
+#| " -V, --version output version information and exit\n"
+#| " -x, --mountpoints show mount point directories with a 'D'\n"
+#| " -m, --modes show the mode bits of each file\n"
+#| " -o, --owners show owner and group name of each file\n"
+#| " -l, --long use a long listing format (-m -o -v) \n"
+#| " -n, --nosymlinks don't follow symlinks\n"
+#| " -v, --vertical vertical align of modes and owners\n"
msgid ""
" -x, --mountpoints show mount point directories with a 'D'\n"
" -m, --modes show the mode bits of each file\n"
" -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:414 sys-utils/lsns.c:1135
-msgid "failed to allocate UID cache"
-msgstr "分配 UID 缓存失败"
-
-#: 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:74
+#: 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:115 misc-utils/rename.c:177
+#: misc-utils/rename.c:159 misc-utils/rename.c:224
#, c-format
msgid "%s: not accessible"
msgstr "%s：不可访问"
-#: misc-utils/rename.c:124
+#: misc-utils/rename.c:168
#, c-format
msgid "%s: not a symbolic link"
msgstr "%s：不是符号链接"
-#: misc-utils/rename.c:129
+#: misc-utils/rename.c:175
#, c-format
msgid "%s: readlink failed"
msgstr "%s：readlink 失败"
-#: misc-utils/rename.c:144
+#: misc-utils/rename.c:191
#, c-format
msgid "Skipping existing link: `%s' -> `%s'\n"
msgstr "跳过已存在的链接：“%s”->“%s”\n"
-#: misc-utils/rename.c:150
+#: misc-utils/rename.c:197
#, c-format
msgid "%s: unlink failed"
msgstr "%s：unlink 失败"
-#: misc-utils/rename.c:154
+#: misc-utils/rename.c:201
#, c-format
msgid "%s: symlinking to %s failed"
msgstr "%s：符号链接到 %s 失败"
-#: misc-utils/rename.c:197
+#: misc-utils/rename.c:240
#, c-format
msgid "Skipping existing file: `%s'\n"
msgstr "跳过已存在的文件：“%s”\n"
-#: misc-utils/rename.c:201
+#: misc-utils/rename.c:244
#, c-format
msgid "%s: rename to %s failed"
msgstr "%s：重命名为 %s 失败"
-#: misc-utils/rename.c:215
+#: misc-utils/rename.c:258
#, c-format
msgid " %s [options] <expression> <replacement> <file>...\n"
msgstr " %s [选项] <表达式> <替换> <文件>...\n"
-#: misc-utils/rename.c:219
+#: misc-utils/rename.c:262
msgid "Rename files.\n"
msgstr "重命名文件。\n"
-#: misc-utils/rename.c:222
+#: misc-utils/rename.c:265
msgid " -v, --verbose explain what is being done\n"
msgstr " -v, --verbose 解释正在进行的操作\n"
-#: misc-utils/rename.c:223
+#: misc-utils/rename.c:266
msgid " -s, --symlink act on the target of symlinks\n"
msgstr " -s, --symlink 在符号链接的目标上执行操作\n"
-#: misc-utils/rename.c:224
+#: misc-utils/rename.c:267
msgid " -n, --no-act do not make any changes\n"
msgstr " -n, --no-act 不要进行任何修改\n"
-#: misc-utils/rename.c:225
+#: 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: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:270
msgid " -o, --no-overwrite don't overwrite existing files\n"
msgstr " -o, --no-overwrite 不要覆写已存在的文件\n"
-#: misc-utils/rename.c:226
+#: misc-utils/rename.c:271
msgid " -i, --interactive prompt before overwrite\n"
msgstr " -i, --interactive 覆写之前进行提示\n"
-#: misc-utils/rename.c:302
+#: 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:1353
+#: 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:210 sys-utils/irqtop.c:213
-#: sys-utils/irqtop.c:230 term-utils/setterm.c:920 text-utils/column.c:531
-#: text-utils/column.c:561
+#: 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:500
+#: 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:515
#, c-format
msgid "Generated time UUID: %s\n"
msgstr "已生成时间 UUID：%s\n"
-#: misc-utils/uuidd.c:510
+#: misc-utils/uuidd.c:525
#, c-format
msgid "Generated random UUID: %s\n"
msgstr "已生成随机 UUID：%s\n"
-#: misc-utils/uuidd.c:519
+#: 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:540
+#: 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:552
+#: misc-utils/uuidd.c:569
#, c-format
msgid "Invalid operation %d\n"
msgstr "无效操作 %d\n"
-#: misc-utils/uuidd.c:564
+#: misc-utils/uuidd.c:581
#, c-format
msgid "Unexpected reply length from server %d"
msgstr "服务器 %d 响应长度异常"
-#: misc-utils/uuidd.c:607
+#: 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:624
+#: misc-utils/uuidd.c:669
msgid "uuidd has been built without support for socket activation"
msgstr "uuidd 构建时没有添加套接字激活支持"
-#: misc-utils/uuidd.c:643
+#: misc-utils/uuidd.c:688
msgid "failed to parse --timeout"
msgstr "解析 --timeout 失败"
-#: misc-utils/uuidd.c:684
+#: misc-utils/uuidd.c:729
#, c-format
msgid "socket name too long: %s"
msgstr "套接字名称过长：%s"
-#: misc-utils/uuidd.c:691
+#: misc-utils/uuidd.c:736
msgid "Both --socket-activation and --socket specified. Ignoring --socket."
msgstr "同时指定了 --socket-activation 和 --socket。将忽略 --socket"
-#: misc-utils/uuidd.c:702 misc-utils/uuidd.c:737
+#: 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:703 misc-utils/uuidd.c:738
+#: misc-utils/uuidd.c:748 misc-utils/uuidd.c:783
msgid "unexpected error"
msgstr "意外错误"
-#: misc-utils/uuidd.c:711
+#: 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:717
+#: misc-utils/uuidd.c:762
#, c-format
msgid "List of UUIDs:\n"
msgstr "UUID 列表：\n"
-#: misc-utils/uuidd.c:759
+#: misc-utils/uuidd.c:804
#, c-format
msgid "couldn't kill uuidd running at pid %d"
msgstr "无法运行 pid 为 %d 的 uuidd"
-#: misc-utils/uuidd.c:764
+#: misc-utils/uuidd.c:809
#, c-format
msgid "Killed uuidd running at pid %d.\n"
msgstr "已杀死运行 pid 为 %d 的 uuidd。\n"
#: misc-utils/uuidgen.c:32
#, fuzzy
+#| msgid " -r, --random test random-based generation\n"
msgid " -r, --random generate random-based uuid\n"
msgstr " -r, --random 测试基于随机数的生成方式\n"
#: misc-utils/uuidgen.c:35
#, fuzzy, c-format
+#| msgid " -a, --all print all devices\n"
msgid " available namespaces: %s\n"
msgstr " -a, --all 打印所有设备\n"
#: misc-utils/uuidgen.c:39
#, fuzzy
+#| msgid " -i, --invert invert the sense of matching\n"
msgid " -x, --hex interpret name as hex string\n"
msgstr " -i, --invert 反转搜索的匹配\n"
#: misc-utils/uuidgen.c:53
-#, fuzzy
msgid "not a valid hex string"
-msgstr "%s：不是有效的交换分区"
+msgstr "不是有效的十六进制字符串"
#: misc-utils/uuidgen.c:144
#, fuzzy
+#| msgid "%s requires an argument"
msgid "--namespace requires --name argument"
msgstr "%s 需要一个参数"
#: misc-utils/uuidgen.c:148
#, fuzzy
+#| msgid "--init-groups requires --ruid or --reuid"
msgid "--namespace requires --md5 or --sha1"
msgstr "--init-groups 需要 --ruid 或者 --reuid"
#: misc-utils/uuidgen.c:153
-#, fuzzy
msgid "--name requires --namespace argument"
-msgstr "无效的名字空间参数"
+msgstr "--name 需要 --namespace 参数"
#: misc-utils/uuidgen.c:157
#, fuzzy
+#| msgid "%s requires an argument"
msgid "--md5 or --sha1 requires --namespace argument"
msgstr "%s 需要一个参数"
#: misc-utils/uuidgen.c:182
-#, fuzzy, c-format
+#, c-format
msgid "unknown namespace alias: '%s'"
-msgstr "未知的名字空间类型︰ %s"
+msgstr "未知的名字空间别名︰“%s”"
#: misc-utils/uuidgen.c:188
#, fuzzy, c-format
+#| msgid "invalid id: %s"
msgid "invalid uuid for namespace: '%s'"
msgstr "无效 ID：%s"
#: misc-utils/uuidparse.c:76
-#, fuzzy
msgid "unique identifier"
-msgstr "惟一存储标识符"
+msgstr "惟一标识符"
#: misc-utils/uuidparse.c:77
#, fuzzy
+#| msgid "partition name"
msgid "variant name"
msgstr "分区名"
msgstr "时间戳"
#: misc-utils/uuidparse.c:97
-#, fuzzy, c-format
+#, c-format
msgid " %s [options] <uuid ...>\n"
-msgstr " %s [选项] <文件>...\n"
+msgstr " %s [选项] <uuid ...>\n"
#: misc-utils/uuidparse.c:100
msgid " -J, --json use JSON output format"
#: misc-utils/uuidparse.c:101
#, fuzzy
+#| msgid " -n, --noheadings don't print headings\n"
msgid " -n, --noheadings don't print headings"
msgstr " -n, --noheadings 不打印标题\n"
#: misc-utils/uuidparse.c:102
#, fuzzy
+#| msgid " -o, --output <list> the output columns to be shown\n"
msgid " -o, --output <list> COLUMNS to display (see below)"
msgstr " -o, --output <列表> 要显示的列\n"
#: misc-utils/uuidparse.c:202
msgid "time-based"
-msgstr ""
+msgstr "基于时间"
#: misc-utils/uuidparse.c:208
msgid "name-based"
-msgstr ""
+msgstr "基于名称"
#: misc-utils/uuidparse.c:211
msgid "random"
#: misc-utils/uuidparse.c:214
msgid "sha1-based"
-msgstr ""
+msgstr "基于sha1"
#: misc-utils/uuidparse.c:267 misc-utils/wipefs.c:178
-#: sys-utils/irq-common.c:155 sys-utils/irq-common.c:459 sys-utils/lscpu.c:948
-#: sys-utils/lsns.c:872 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 选项"
#: misc-utils/wipefs.c:113
#, fuzzy
+#| msgid "bad inode offset"
msgid "magic string offset"
msgstr "inode 偏移有误"
msgid "block device name"
msgstr "块设备名称"
-#: misc-utils/wipefs.c:332
+#: misc-utils/wipefs.c:310
msgid "partition-table"
msgstr "分区表"
-#: misc-utils/wipefs.c:420
+#: misc-utils/wipefs.c:401
#, c-format
msgid "error: %s: probing initialization failed"
msgstr "错误：%s：探测初始化失败"
-#: misc-utils/wipefs.c:471
+#: misc-utils/wipefs.c:452
#, c-format
msgid "%s: failed to erase %s magic string at offset 0x%08jx"
msgstr "%1$s：擦除位于偏移 0x%3$08jx 处的魔数字符串 %2$s 失败"
-#: misc-utils/wipefs.c:477
+#: misc-utils/wipefs.c:458
#, c-format
msgid "%s: %zd byte was erased at offset 0x%08jx (%s): "
msgid_plural "%s: %zd bytes were erased at offset 0x%08jx (%s): "
msgstr[0] "%s：%zd 个字节已擦除，位置偏移为 0x%08jx (%s)："
-#: misc-utils/wipefs.c:506
+#: misc-utils/wipefs.c:487
#, c-format
msgid "%s: failed to create a signature backup"
msgstr "%s：创建签名备份失败"
-#: misc-utils/wipefs.c:532
+#: misc-utils/wipefs.c:513
#, c-format
msgid "%s: calling ioctl to re-read partition table: %m\n"
msgstr "%s：将调用 ioctl 来重新读分区表：%m\n"
-#: misc-utils/wipefs.c:561
+#: misc-utils/wipefs.c:542
msgid "failed to create a signature backup, $HOME undefined"
msgstr "创建签名备份失败，未定义 $HOME"
-#: misc-utils/wipefs.c:579
+#: misc-utils/wipefs.c:560
#, c-format
msgid "%s: ignoring nested \"%s\" partition table on non-whole disk device"
msgstr "%s：忽略 非整盘 设备上的嵌套分区表“%s”"
-#: misc-utils/wipefs.c:608
+#: misc-utils/wipefs.c:589
#, c-format
msgid "%s: offset 0x%jx not found"
msgstr "%s：找不到偏移 0x%jx"
-#: misc-utils/wipefs.c:613
+#: misc-utils/wipefs.c:594
msgid "Use the --force option to force erase."
msgstr "使用 --force 选项强制擦除。"
-#: misc-utils/wipefs.c:651
+#: 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:654
+#: 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:655
+#: 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:656
-#, fuzzy
+#: misc-utils/wipefs.c:641
msgid " -f, --force force erasure"
-msgstr " -f, --force 强制检查\n"
+msgstr " -f, --force 强制擦除"
-#: misc-utils/wipefs.c:657
+#: 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:658
+#: misc-utils/wipefs.c:643
msgid " -J, --json use JSON output format"
msgstr " -J, --json 使用 JSON 输出格式"
-#: misc-utils/wipefs.c:659
+#: 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:660
+#: 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:661
+#: misc-utils/wipefs.c:646
msgid " -O, --output <list> COLUMNS to display (see below)"
msgstr ""
-#: misc-utils/wipefs.c:662
+#: 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:663
+#: misc-utils/wipefs.c:648
msgid " -q, --quiet suppress output messages"
msgstr " -q, --quiet 禁止输出信息"
-#: misc-utils/wipefs.c:664
+#: 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:666
+#: 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:785
+#: misc-utils/wipefs.c:770
msgid "The --backup option is meaningless in this context"
msgstr "--backup 在此环境中无意义"
#: schedutils/chrt.c:80
#, fuzzy
+#| msgid " -R, --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
msgid " -R, --reset-on-fork set reset-on-fork flag\n"
msgstr " -R, --reset-on-fork 为 FIFO 或 RR 设置 SCHED_RESET_ON_FORK\n"
msgid "pid %d's current runtime/deadline/period parameters: %ju/%ju/%ju\n"
msgstr "pid %d 当前的运行时/截止时间/周期参数︰ %ju/%ju/%ju\n"
-#: schedutils/chrt.c:222 schedutils/chrt.c:229 schedutils/chrt.c:332
-#: schedutils/chrt.c:340 schedutils/uclampset.c:141 schedutils/uclampset.c:182
+#: schedutils/chrt.c:227 schedutils/chrt.c:331 schedutils/chrt.c:339
+#: schedutils/uclampset.c:142 schedutils/uclampset.c:184
msgid "cannot obtain the list of tasks"
msgstr "无法获取任务列表"
-#: schedutils/chrt.c:259
+#: schedutils/chrt.c:257
#, c-format
msgid "%s min/max priority\t: %d/%d\n"
msgstr "%s 最小/最大优先级\t: %d/%d\n"
-#: schedutils/chrt.c:262
+#: schedutils/chrt.c:260
#, c-format
msgid "%s not supported?\n"
msgstr "%s 不支持？ \n"
-#: schedutils/chrt.c:336
+#: schedutils/chrt.c:335
#, c-format
msgid "failed to set tid %d's policy"
msgstr "设置 tid %d 策略失败"
-#: schedutils/chrt.c:343
+#: schedutils/chrt.c:342
#, c-format
msgid "failed to set pid %d's policy"
msgstr "设置 pid %d 的策略失败"
-#: schedutils/chrt.c:423
+#: schedutils/chrt.c:422
msgid "invalid runtime argument"
msgstr "无效的运行时参数"
-#: schedutils/chrt.c:426
+#: schedutils/chrt.c:425
msgid "invalid period argument"
msgstr "无效的周期参数"
-#: schedutils/chrt.c:429
+#: schedutils/chrt.c:428
msgid "invalid deadline argument"
msgstr "无效的截止时间参数"
-#: schedutils/chrt.c:454
+#: schedutils/chrt.c:453
msgid "invalid priority argument"
msgstr "无效的 优先级 参数"
-#: schedutils/chrt.c:458
+#: schedutils/chrt.c:457
msgid "--sched-{runtime,deadline,period} options are supported for SCHED_DEADLINE only"
msgstr "--sched-{runtime,deadline,period} 选项只支持 SCHED_DEADLINE"
-#: schedutils/chrt.c:473
+#: schedutils/chrt.c:472
msgid "SCHED_DEADLINE is unsupported"
msgstr "不支持 SCHED_DEADLINE"
-#: schedutils/chrt.c:480
+#: schedutils/chrt.c:479
#, c-format
msgid "unsupported priority value for the policy: %d: see --max for valid range"
msgstr "不支持此策略的优先级值：%d：查看 --max 了解有效范围"
-#: schedutils/ionice.c:76
+#: schedutils/ionice.c:78
msgid "ioprio_get failed"
msgstr "ioprio_get 失败"
-#: schedutils/ionice.c:85
+#: schedutils/ionice.c:87
#, c-format
msgid "%s: prio %lu\n"
msgstr "%s：优先级 %lu\n"
-#: schedutils/ionice.c:98
+#: schedutils/ionice.c:100
msgid "ioprio_set failed"
msgstr "ioprio_set 失败"
-#: schedutils/ionice.c:105
+#: schedutils/ionice.c:107
#, c-format
msgid ""
" %1$s [options] -p <pid>...\n"
" %1$s [选项] -u <uid>...\n"
" %1$s [选项] <命令>\n"
-#: schedutils/ionice.c:111
+#: schedutils/ionice.c:113
msgid "Show or change the I/O-scheduling class and priority of a process.\n"
msgstr "设置或更改进程的 IO 调度类别和优先级。\n"
-#: schedutils/ionice.c:114
+#: schedutils/ionice.c:116
msgid ""
" -c, --class <class> name or number of scheduling class,\n"
" 0: none, 1: realtime, 2: best-effort, 3: idle\n"
" -c, --class <类别> 调度类别的名称或数值\n"
" 0: 无, 1: 实时, 2: 尽力, 3: 空闲\n"
-#: schedutils/ionice.c:116
+#: schedutils/ionice.c:118
msgid ""
" -n, --classdata <num> priority (0..7) in the specified scheduling class,\n"
" only for the realtime and best-effort classes\n"
" -n, --classdata <数字> 指定调度类别的优先级(0..7)，只针对\n"
" “实时”和“尽力”类别\n"
-#: schedutils/ionice.c:118
+#: schedutils/ionice.c:120
msgid " -p, --pid <pid>... act on these already running processes\n"
msgstr " -p, --pid <pid>... 对这些已运行的进程操作\n"
-#: schedutils/ionice.c:119
+#: schedutils/ionice.c:121
msgid " -P, --pgid <pgrp>... act on already running processes in these groups\n"
msgstr " -P, --pgid <pgrp>... 对这些组中已运行的进程操作\n"
-#: schedutils/ionice.c:120
+#: schedutils/ionice.c:122
msgid " -t, --ignore ignore failures\n"
msgstr " -t, --ignore 忽略失败\n"
-#: schedutils/ionice.c:121
+#: schedutils/ionice.c:123
msgid " -u, --uid <uid>... act on already running processes owned by these users\n"
msgstr " -u, --uid <uid>... 对属于这些用户的已运行进程操作\n"
-#: schedutils/ionice.c:157
+#: schedutils/ionice.c:159
msgid "invalid class data argument"
msgstr "无效的类别数据参数"
-#: schedutils/ionice.c:163
+#: schedutils/ionice.c:165
msgid "invalid class argument"
msgstr "无效的类别参数"
-#: schedutils/ionice.c:168
+#: schedutils/ionice.c:170
#, c-format
msgid "unknown scheduling class: '%s'"
msgstr "未知的调度类别：“%s”"
-#: schedutils/ionice.c:176 schedutils/ionice.c:184 schedutils/ionice.c:192
+#: schedutils/ionice.c:178 schedutils/ionice.c:186 schedutils/ionice.c:194
msgid "can handle only one of pid, pgid or uid at once"
msgstr "无法一次只处理一个 pid、pgid 或 uid"
-#: schedutils/ionice.c:185
+#: schedutils/ionice.c:187
msgid "invalid PGID argument"
msgstr "无效的 PGID 参数"
-#: schedutils/ionice.c:193
+#: schedutils/ionice.c:195
msgid "invalid UID argument"
msgstr "无效的 UID 参数"
-#: schedutils/ionice.c:212
+#: schedutils/ionice.c:214
msgid "ignoring given class data for none class"
msgstr "将忽略为“无”类别指定的类别数据"
-#: schedutils/ionice.c:220
+#: schedutils/ionice.c:222
msgid "ignoring given class data for idle class"
msgstr "将忽略为“空闲”类别指定的类别数据"
-#: schedutils/ionice.c:225
+#: schedutils/ionice.c:227
#, c-format
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
+#: 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"
#: schedutils/uclampset.c:56
#, fuzzy, c-format
+#| msgid ""
+#| " %1$s [options] -p <pid>...\n"
+#| " %1$s [options] -P <pgid>...\n"
+#| " %1$s [options] -u <uid>...\n"
+#| " %1$s [options] <command>\n"
msgid ""
" %1$s [options]\n"
" %1$s [options] --pid <pid> | --system | <command> <arg>...\n"
#: schedutils/uclampset.c:61
#, fuzzy
+#| msgid "Show or change the real-time scheduling attributes of a process.\n"
msgid "Show or change the utilization clamping attributes.\n"
msgstr "显示或更改某个进程的实时调度属性。\n"
#: schedutils/uclampset.c:64
#, fuzzy
+#| msgid " -<number> how many lines to show\n"
msgid " -m <value> util_min value to set\n"
msgstr " -<数字> 显示行数\n"
#: schedutils/uclampset.c:65
#, fuzzy
+#| msgid " -<number> how many lines to show\n"
msgid " -M <value> util_max value to set\n"
msgstr " -<数字> 显示行数\n"
#: schedutils/uclampset.c:67
-#, fuzzy
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
+#| msgid " -s, --system-accs display system accounts\n"
msgid " -s, --system operate on system\n"
msgstr " -s, --system-accs 显示系统帐户\n"
msgid "Utilization value range is [0:1024]. Use special -1 value to reset to system's default.\n"
msgstr ""
-#: schedutils/uclampset.c:92 schedutils/uclampset.c:157
+#: schedutils/uclampset.c:92 schedutils/uclampset.c:158
#, fuzzy, c-format
+#| msgid "failed to get pid %d's attributes"
msgid "failed to get pid %d's uclamp values"
msgstr "获取 pid %d 的属性失败"
msgid "System util_clamp: min: %u max: %u\n"
msgstr ""
-#: schedutils/uclampset.c:186
+#: schedutils/uclampset.c:188
#, fuzzy, c-format
+#| msgid "failed to set tid %d's policy"
msgid "failed to set tid %d's uclamp values"
msgstr "设置 tid %d 策略失败"
-#: schedutils/uclampset.c:191
+#: schedutils/uclampset.c:193
#, fuzzy, c-format
+#| msgid "failed to set pid %d's policy"
msgid "failed to set pid %d's uclamp values"
msgstr "设置 pid %d 的策略失败"
-#: schedutils/uclampset.c:205
+#: schedutils/uclampset.c:207
msgid "util_min must be <= util_max"
-msgstr ""
+msgstr "util_min 必须 <= util_max"
-#: schedutils/uclampset.c:216
-#, fuzzy, c-format
+#: schedutils/uclampset.c:218
+#, c-format
msgid "%d out of range"
-msgstr "值超出范围。"
+msgstr "%d 超出范围"
-#: schedutils/uclampset.c:268
-#, fuzzy
+#: schedutils/uclampset.c:269
msgid "invalid util_min argument"
-msgstr "无效的 时间 参数"
+msgstr "无效的 util_min 参数"
#: schedutils/uclampset.c:274
-#, fuzzy
msgid "invalid util_max argument"
-msgstr "无效的 时间 参数"
+msgstr "无效的 util_max 参数"
-#: schedutils/uclampset.c:297
-#, fuzzy
+#: schedutils/uclampset.c:296
msgid "missing -p option"
-msgstr "缺少 optstring 参数"
+msgstr "缺少 -p 参数"
-#: schedutils/uclampset.c:315
-#, fuzzy
+#: schedutils/uclampset.c:314
msgid "no cmd to execute"
-msgstr "æ\89§è¡\8c %s 失败"
+msgstr "æ\97 å\8f¯æ\89§è¡\8cç\9a\84æ\8c\87令"
-#: 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:505 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:533 sys-utils/umount.c:615
+#: 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 "List information about block devices.\n"
msgid "Report zone information about the given device"
msgstr "列出块设备的信息。\n"
#: sys-utils/blkzone.c:97
#, fuzzy
+#| msgid "List information about block devices.\n"
msgid "Report sum of zone capacities for the given device"
msgstr "列出块设备的信息。\n"
#: sys-utils/blkzone.c:152
#, fuzzy, c-format
+#| msgid "%s: set direct io failed"
msgid "%s: blkdev_get_sectors ioctl failed"
msgstr "%s︰ 设置直接 io 失败"
#: sys-utils/blkzone.c:242
#, fuzzy, c-format
+#| msgid "%s: offset is greater than device size"
msgid "%s: offset is greater than or equal to device size"
msgstr "%s：偏移量超过设备大小"
-#: sys-utils/blkzone.c: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"
msgstr "%s：无法写 zone map"
#: sys-utils/blkzone.c:264
#, fuzzy, c-format
+#| msgid "%s: BLKGETSIZE64 ioctl failed"
msgid "%s: BLKREPORTZONE ioctl failed"
msgstr "%s：BLKGETSIZE64 ioctl 失败"
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
-#, fuzzy
+#: sys-utils/blkzone.c:410
msgid " -v, --verbose display more details\n"
-msgstr " --verbose 打印更多细节\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
-#, fuzzy
+#: sys-utils/blkzone.c:492 sys-utils/setsid.c:92
msgid "no command specified"
msgstr "没有指定命令"
#: sys-utils/chcpu.c:249
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Options:\n"
+#| " -h, --help print this help\n"
+#| " -e, --enable <cpu-list> enable cpus\n"
+#| " -d, --disable <cpu-list> disable cpus\n"
+#| " -c, --configure <cpu-list> configure cpus\n"
+#| " -g, --deconfigure <cpu-list> deconfigure cpus\n"
+#| " -p, --dispatch <mode> set dispatching mode\n"
+#| " -r, --rescan trigger rescan of cpus\n"
+#| " -V, --version output version information and exit\n"
msgid ""
" -e, --enable <cpu-list> enable cpus\n"
" -d, --disable <cpu-list> disable cpus\n"
#: sys-utils/chcpu.c:296
#, fuzzy
+#| msgid "%s: failed to initialize sysfs handler"
msgid "failed to initialize sysfs handler"
msgstr "%s：初始化 sysfs 处理函数失败"
#: sys-utils/chmem.c:124 sys-utils/chmem.c:197
#, fuzzy
+#| msgid "failed to parse id"
msgid "Failed to parse index"
msgstr "解析 id 失败"
msgstr ""
#: sys-utils/chmem.c:206
-#, fuzzy, c-format
+#, c-format
msgid "%s already enabled\n"
-msgstr "CPU %u 已经启用\n"
+msgstr ""
+"%s 已启用\n"
+"\n"
#: sys-utils/chmem.c:208
-#, fuzzy, c-format
+#, c-format
msgid "%s already disabled\n"
-msgstr "CPU %u 已经禁用\n"
+msgstr "%s 已禁用\n"
#: sys-utils/chmem.c:218
#, fuzzy, c-format
+#| msgid "%s: failed to disarm watchdog"
msgid "%s enable failed: Zone mismatch"
msgstr "%s：喂看门狗失败"
#: sys-utils/chmem.c:222
#, fuzzy, c-format
+#| msgid "%s: failed to disarm watchdog"
msgid "%s disable failed: Zone mismatch"
msgstr "%s：喂看门狗失败"
msgid "%s disable failed"
msgstr "%s 禁用失败"
-#: sys-utils/chmem.c:265 sys-utils/lsmem.c:490
+#: sys-utils/chmem.c:274 sys-utils/lsmem.c:503
#, c-format
msgid "Failed to read %s"
msgstr "无法读取 %s"
-#: sys-utils/chmem.c:273
+#: sys-utils/chmem.c:280
#, fuzzy
+#| msgid "failed to parse number"
msgid "Failed to parse block number"
msgstr "解析数字失败"
-#: sys-utils/chmem.c:278
+#: sys-utils/chmem.c:285
msgid "Failed to parse size"
msgstr "解析大小失败"
-#: sys-utils/chmem.c:282
+#: sys-utils/chmem.c:289
#, c-format
msgid "Size must be aligned to memory block size (%s)"
msgstr ""
-#: sys-utils/chmem.c:291
+#: sys-utils/chmem.c:298
#, fuzzy
+#| msgid "failed to parse start"
msgid "Failed to parse start"
msgstr "解析 起点 失败"
-#: sys-utils/chmem.c:292
+#: sys-utils/chmem.c:299
#, fuzzy
+#| msgid "failed to parse end"
msgid "Failed to parse end"
msgstr "解析 终点 失败"
-#: sys-utils/chmem.c:296
+#: sys-utils/chmem.c:303
#, fuzzy, c-format
+#| msgid "invalid start argument"
msgid "Invalid start address format: %s"
msgstr "无效的 起点 参数"
-#: sys-utils/chmem.c:298
+#: sys-utils/chmem.c:305
#, fuzzy, c-format
+#| msgid "invalid signal name or number: %s"
msgid "Invalid end address format: %s"
msgstr "无效的信号名或数字：%s"
-#: sys-utils/chmem.c:299
+#: sys-utils/chmem.c:306
#, fuzzy
+#| msgid "failed to parse start"
msgid "Failed to parse start address"
msgstr "解析 起点 失败"
-#: sys-utils/chmem.c:300
+#: sys-utils/chmem.c:307
#, fuzzy
+#| msgid "failed to parse end"
msgid "Failed to parse end address"
msgstr "解析 终点 失败"
-#: sys-utils/chmem.c:303
+#: sys-utils/chmem.c:310
#, c-format
msgid "Start address and (end address + 1) must be aligned to memory block size (%s)"
msgstr ""
-#: sys-utils/chmem.c:317
+#: sys-utils/chmem.c:324
#, c-format
msgid "Invalid parameter: %s"
msgstr "无效参数：%s"
-#: sys-utils/chmem.c:324
+#: sys-utils/chmem.c:331
#, c-format
msgid "Invalid range: %s"
msgstr "无效范围：%s"
-#: sys-utils/chmem.c:333
+#: sys-utils/chmem.c:340
#, fuzzy, c-format
+#| msgid " %s [options] [y | n]\n"
msgid " %s [options] [SIZE|RANGE|BLOCKRANGE]\n"
msgstr " %s [选项] [y | n]\n"
-#: sys-utils/chmem.c:336
+#: sys-utils/chmem.c:343
msgid "Set a particular size or range of memory online or offline.\n"
msgstr ""
-#: sys-utils/chmem.c:339
-#, fuzzy
+#: sys-utils/chmem.c:346
msgid " -e, --enable enable memory\n"
-msgstr " -v, --verbose 详尽模式\n"
+msgstr " -e, --enable 启用内存\n"
-#: sys-utils/chmem.c:340
-#, fuzzy
+#: sys-utils/chmem.c:347
msgid " -d, --disable disable memory\n"
-msgstr " -m, --shmems 共享内存段\n"
+msgstr " -d, --disable 禁用内存\n"
-#: sys-utils/chmem.c:341
-#, fuzzy
+#: sys-utils/chmem.c:348
msgid " -b, --blocks use memory blocks\n"
-msgstr " -u, --unlock 移除锁\n"
+msgstr " -b, --blocks 使用内存块\n"
-#: sys-utils/chmem.c:342
+#: sys-utils/chmem.c:349
msgid " -z, --zone <name> select memory zone (see below)\n"
msgstr ""
-#: sys-utils/chmem.c:343
-#, fuzzy
+#: sys-utils/chmem.c:350
msgid " -v, --verbose verbose output\n"
-msgstr " -v, --verbose 详尽模式\n"
+msgstr " -v, --verbose 详尽输出\n"
-#: sys-utils/chmem.c:346
+#: sys-utils/chmem.c:353
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Supported log facilities:\n"
msgid ""
"\n"
"Supported zones:\n"
"\n"
"支持的日志设施：\n"
-#: sys-utils/chmem.c:387 sys-utils/lscpu-cputype.c:844 sys-utils/lsmem.c:654
+#: 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 "%s：初始化 sysfs 处理函数失败"
-#: sys-utils/chmem.c:433
+#: sys-utils/chmem.c:440
msgid "zone ignored, no valid_zones sysfs attribute present"
msgstr ""
-#: sys-utils/chmem.c:438
+#: sys-utils/chmem.c:445
#, fuzzy, c-format
+#| msgid "unknown month name: %s"
msgid "unknown memory zone: %s"
msgstr "月份名未知：%s"
#: sys-utils/choom.c:38
#, fuzzy, c-format
+#| msgid ""
+#| " %1$s [options] -p <pid>...\n"
+#| " %1$s [options] -P <pgid>...\n"
+#| " %1$s [options] -u <uid>...\n"
+#| " %1$s [options] <command>\n"
msgid ""
" %1$s [options] -p pid\n"
" %1$s [options] -n number -p pid\n"
#: sys-utils/choom.c:47
#, fuzzy
+#| msgid " -n, --priority <num> specify the nice increment value\n"
msgid " -n, --adjust <num> specify the adjust score value\n"
msgstr " -n, --priority <数字> 指定 nice 增量\n"
#: sys-utils/choom.c:48
#, fuzzy
+#| msgid " -p, --task <pid> print process namespaces\n"
msgid " -p, --pid <num> process ID\n"
msgstr " -p, --task <pid> 打印进程名字空间\n"
#: sys-utils/choom.c:60
-#, fuzzy
msgid "failed to read OOM score value"
-msgstr "读 速度 失败"
+msgstr ""
#: sys-utils/choom.c:70
#, fuzzy
+#| msgid "failed to read speed"
msgid "failed to read OOM score adjust value"
msgstr "读 速度 失败"
#: sys-utils/choom.c:105
#, fuzzy
+#| msgid "invalid heads argument"
msgid "invalid adjust argument"
msgstr "无效的 磁头数 参数"
#: sys-utils/choom.c:123
#, fuzzy
+#| msgid "COMMAND not specified."
msgid "no PID or COMMAND specified"
msgstr "没有指定命令"
#: sys-utils/choom.c:127
#, fuzzy
+#| msgid "invalid offset value specified"
msgid "no OOM score adjust value specified"
msgstr "指定的偏移值无效"
#: sys-utils/choom.c:135
#, fuzzy, c-format
+#| msgid "pid %d's current scheduling priority: %d\n"
msgid "pid %d's current OOM score: %d\n"
msgstr "pid %d 的当前调度优先级：%d\n"
#: sys-utils/choom.c:136
#, fuzzy, c-format
+#| msgid "pid %d's current scheduling priority: %d\n"
msgid "pid %d's current OOM score adjust value: %d\n"
msgstr "pid %d 的当前调度优先级：%d\n"
#: sys-utils/choom.c:143 sys-utils/choom.c:150
#, fuzzy
+#| msgid "failed to set data"
msgid "failed to set score adjust value"
msgstr "设置数据失败"
msgid "You must be root to set the Ctrl-Alt-Del behavior"
msgstr "只有 root 用户才能设置 Ctrl-Alt-Del 行为"
-#: sys-utils/ctrlaltdel.c:74 sys-utils/ipcrm.c:395 sys-utils/ipcrm.c:418
+#: sys-utils/ctrlaltdel.c:74 sys-utils/ipcrm.c:396 sys-utils/ipcrm.c:419
#, c-format
msgid "unknown argument: %s"
msgstr "未知参数：%s"
-#: sys-utils/dmesg.c:109
+#: sys-utils/dmesg.c:110
msgid "system is unusable"
msgstr "系统无法使用"
-#: sys-utils/dmesg.c:110
+#: sys-utils/dmesg.c:111
msgid "action must be taken immediately"
msgstr "操作必须立即执行"
-#: sys-utils/dmesg.c:111
+#: sys-utils/dmesg.c:112
msgid "critical conditions"
msgstr "紧急条件"
-#: sys-utils/dmesg.c:112
+#: sys-utils/dmesg.c:113
msgid "error conditions"
msgstr "错误条件"
-#: sys-utils/dmesg.c:113
+#: sys-utils/dmesg.c:114
msgid "warning conditions"
msgstr "警告条件"
-#: sys-utils/dmesg.c:114
+#: sys-utils/dmesg.c:115
msgid "normal but significant condition"
msgstr "正常但重要的条件"
-#: sys-utils/dmesg.c:115
+#: sys-utils/dmesg.c:116
msgid "informational"
msgstr "信息"
-#: sys-utils/dmesg.c:116
+#: sys-utils/dmesg.c:117
msgid "debug-level messages"
msgstr "调试级别的消息"
-#: sys-utils/dmesg.c:130
+#: sys-utils/dmesg.c:131
msgid "kernel messages"
msgstr "内核消息"
-#: sys-utils/dmesg.c:131
+#: sys-utils/dmesg.c:132
msgid "random user-level messages"
msgstr "随机的用户级消息"
-#: sys-utils/dmesg.c:132
+#: sys-utils/dmesg.c:133
msgid "mail system"
msgstr "邮件系统"
-#: sys-utils/dmesg.c:133
+#: sys-utils/dmesg.c:134
msgid "system daemons"
msgstr "系统守护进程"
-#: sys-utils/dmesg.c:134
+#: sys-utils/dmesg.c:135
msgid "security/authorization messages"
msgstr "安全/认证消息"
-#: sys-utils/dmesg.c:135
+#: sys-utils/dmesg.c:136
msgid "messages generated internally by syslogd"
msgstr "syslogd 内部生成的消息"
-#: sys-utils/dmesg.c:136
+#: sys-utils/dmesg.c:137
msgid "line printer subsystem"
msgstr "行打印机子系统"
-#: sys-utils/dmesg.c:137
+#: sys-utils/dmesg.c:138
msgid "network news subsystem"
msgstr "网络新闻子系统"
-#: sys-utils/dmesg.c:138
+#: sys-utils/dmesg.c:139
msgid "UUCP subsystem"
msgstr "UUCP 子系统"
-#: sys-utils/dmesg.c:139
+#: sys-utils/dmesg.c:140
msgid "clock daemon"
msgstr "时钟守护进程"
-#: sys-utils/dmesg.c:140
+#: sys-utils/dmesg.c:141
msgid "security/authorization messages (private)"
msgstr "安全/认证消息(私有)"
-#: sys-utils/dmesg.c:141
+#: sys-utils/dmesg.c:142
msgid "FTP daemon"
msgstr "FTP 守护进程"
-#: sys-utils/dmesg.c:275
+#: sys-utils/dmesg.c:279
msgid "Display or control the kernel ring buffer.\n"
msgstr "显示或控制内核环形缓冲区。\n"
-#: sys-utils/dmesg.c:278
+#: sys-utils/dmesg.c:282
msgid " -C, --clear clear the kernel ring buffer\n"
msgstr " -C, --clear 清除内核环形缓冲区(ring butter)\n"
-#: sys-utils/dmesg.c:279
+#: sys-utils/dmesg.c:283
msgid " -c, --read-clear read and clear all messages\n"
msgstr " -c, --read-clear 读取并清除所有消息\n"
-#: sys-utils/dmesg.c:280
+#: sys-utils/dmesg.c:284
msgid " -D, --console-off disable printing messages to console\n"
msgstr " -D, --console-off 禁止向终端打印消息\n"
-#: sys-utils/dmesg.c:281
+#: sys-utils/dmesg.c:285
msgid " -E, --console-on enable printing messages to console\n"
msgstr " -E, --console-on 启用向终端打印消息\n"
-#: sys-utils/dmesg.c:282
+#: sys-utils/dmesg.c:286
msgid " -F, --file <file> use the file instead of the kernel log buffer\n"
msgstr " -F, --file <文件> 用 文件 代替内核日志缓冲区\n"
-#: sys-utils/dmesg.c:283
+#: sys-utils/dmesg.c:287
msgid " -f, --facility <list> restrict output to defined facilities\n"
msgstr " -f, --facility <列表> 将输出限制为定义的设施\n"
-#: sys-utils/dmesg.c:284
+#: sys-utils/dmesg.c:288
msgid " -H, --human human readable output\n"
msgstr " -H, --human 易读格式输出\n"
-#: sys-utils/dmesg.c:285
+#: sys-utils/dmesg.c:289
+#, fuzzy
+#| msgid " -J, --json use JSON output format\n"
+msgid " -J, --json use JSON output format\n"
+msgstr " -J, --json 使用 JSON 输出格式\n"
+
+#: sys-utils/dmesg.c:290
msgid " -k, --kernel display kernel messages\n"
msgstr " -k, --kernel 显示内核消息\n"
-#: sys-utils/dmesg.c:287
+#: sys-utils/dmesg.c:292
#, fuzzy, c-format
+#| msgid " -L, --color[=<when>] colorize messages (auto, always or never)\n"
msgid " -L, --color[=<when>] colorize messages (%s, %s or %s)\n"
msgstr " -L, --color[=<时机>] 彩色显示消息(auto, always 或 never)\n"
-#: sys-utils/dmesg.c:290
+#: sys-utils/dmesg.c:295
msgid " -l, --level <list> restrict output to defined levels\n"
msgstr " -l, --level <列表> 限制输出级别\n"
-#: sys-utils/dmesg.c:291
+#: sys-utils/dmesg.c:296
msgid " -n, --console-level <level> set level of messages printed to console\n"
msgstr " -n, --console-level <级别> 设置打印到终端的消息级别\n"
-#: sys-utils/dmesg.c:292
+#: sys-utils/dmesg.c:297
msgid " -P, --nopager do not pipe output into a pager\n"
msgstr " -P, --nopager 不将输出通过管道传递给分页程序\n"
-#: sys-utils/dmesg.c:293
+#: sys-utils/dmesg.c:298
msgid " -p, --force-prefix force timestamp output on each line of multi-line messages\n"
msgstr ""
-#: sys-utils/dmesg.c:294
+#: sys-utils/dmesg.c:299
msgid " -r, --raw print the raw message buffer\n"
msgstr " -r, --raw 打印原生消息缓冲区\n"
-#: sys-utils/dmesg.c:295
+#: sys-utils/dmesg.c:300
#, fuzzy
+#| msgid " -n, --noheadings don't print headings\n"
msgid " --noescape don't escape unprintable character\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: sys-utils/dmesg.c:296
+#: sys-utils/dmesg.c:301
msgid " -S, --syslog force to use syslog(2) rather than /dev/kmsg\n"
msgstr " -S, --syslog 强制使用 syslog(2) 而非 /dev/kmsg\n"
-#: sys-utils/dmesg.c:297
+#: sys-utils/dmesg.c:302
msgid " -s, --buffer-size <size> buffer size to query the kernel ring buffer\n"
msgstr " -s, --buffer-size <大小> 查询内核环形缓冲区所用的缓冲区大小\n"
-#: sys-utils/dmesg.c:298
+#: sys-utils/dmesg.c:303
msgid " -u, --userspace display userspace messages\n"
msgstr " -u, --userspace 显示用户空间消息\n"
-#: sys-utils/dmesg.c:299
+#: sys-utils/dmesg.c:304
msgid " -w, --follow wait for new messages\n"
msgstr " -w, --follow 等待新消息\n"
-#: sys-utils/dmesg.c:300
+#: sys-utils/dmesg.c:305
#, fuzzy
+#| msgid " -w, --follow wait for new messages\n"
msgid " -W, --follow-new wait and print only new messages\n"
msgstr " -w, --follow 等待新消息\n"
-#: sys-utils/dmesg.c:301
+#: sys-utils/dmesg.c:306
msgid " -x, --decode decode facility and level to readable string\n"
msgstr " -x, --decode 将设施和级别解码为可读的字符串\n"
-#: sys-utils/dmesg.c:302
+#: sys-utils/dmesg.c:307
msgid " -d, --show-delta show time delta between printed messages\n"
msgstr " -d, --show-delta 显示打印消息之间的时间差\n"
-#: sys-utils/dmesg.c:303
+#: sys-utils/dmesg.c:308
msgid " -e, --reltime show local time and time delta in readable format\n"
msgstr " -e, --reltime 以易读格式显示本地时间和时间差\n"
-#: sys-utils/dmesg.c:304
+#: sys-utils/dmesg.c:309
msgid " -T, --ctime show human-readable timestamp (may be inaccurate!)\n"
msgstr " -T, --ctime 显示易读的时间戳(可能不准确！)\n"
-#: sys-utils/dmesg.c:305
+#: sys-utils/dmesg.c:310
msgid " -t, --notime don't show any timestamp with messages\n"
msgstr " -t, --notime 不显示任何消息的时间戳\n"
-#: sys-utils/dmesg.c:306
+#: sys-utils/dmesg.c:311
msgid ""
" --time-format <format> show timestamp using the given format:\n"
" [delta|reltime|ctime|notime|iso]\n"
" [delta|reltime|ctime|notime|iso]\n"
"挂起/恢复会使 ctime 和 iso 时间戳不精确。\n"
-#: sys-utils/dmesg.c:309
+#: sys-utils/dmesg.c:314
#, fuzzy
+#| msgid " -s, --since <time> display the lines since the specified time\n"
msgid " --since <time> display the lines since the specified time\n"
msgstr " -s, --since <时间> 显示从指定时间起的行\n"
-#: sys-utils/dmesg.c:310
+#: sys-utils/dmesg.c:315
#, fuzzy
+#| msgid " -t, --until <time> display the lines until the specified time\n"
msgid " --until <time> display the lines until the specified time\n"
msgstr " -t, --until <时间> 显示到指定时间为止的行\n"
-#: sys-utils/dmesg.c:314
+#: sys-utils/dmesg.c:319
msgid ""
"\n"
"Supported log facilities:\n"
"\n"
"支持的日志设施：\n"
-#: sys-utils/dmesg.c:320
+#: sys-utils/dmesg.c:325
msgid ""
"\n"
"Supported log levels (priorities):\n"
"\n"
"支持的日志级别(优先级)：\n"
-#: sys-utils/dmesg.c:374
+#: sys-utils/dmesg.c:379
#, c-format
msgid "failed to parse level '%s'"
msgstr "解析级别“%s”失败"
-#: sys-utils/dmesg.c:376
+#: sys-utils/dmesg.c:381
#, c-format
msgid "unknown level '%s'"
msgstr "未知级别“%s”"
-#: sys-utils/dmesg.c:412
+#: sys-utils/dmesg.c:417
#, c-format
msgid "failed to parse facility '%s'"
msgstr "解析设施“%s”失败"
-#: sys-utils/dmesg.c:414
+#: sys-utils/dmesg.c:419
#, c-format
msgid "unknown facility '%s'"
msgstr "未知设施“%s”"
-#: sys-utils/dmesg.c:542
+#: sys-utils/dmesg.c:547
#, c-format
msgid "cannot mmap: %s"
msgstr "无法 mmap：%s"
-#: sys-utils/dmesg.c:1479
+#. TRANSLATORS: dmesg uses strftime() fo generate date-time string
+#. 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: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:873
+msgid "%b%e %H:%M"
+msgstr ""
+
+#: sys-utils/dmesg.c:1526
msgid "invalid buffer size argument"
msgstr "无效的 缓冲区大小 参数"
-#: sys-utils/dmesg.c:1558
+#: 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:1581
+#: 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:1598
+#: sys-utils/dmesg.c:1656
msgid "read kernel buffer failed"
msgstr "读取内核缓冲区失败"
-#: sys-utils/dmesg.c:1606
-#, fuzzy
+#: sys-utils/dmesg.c:1664
msgid "clear kernel buffer failed"
-msgstr "读取内核缓冲区失败"
+msgstr "清除内核缓冲区失败"
-#: sys-utils/dmesg.c:1622
+#: sys-utils/dmesg.c:1680
msgid "klogctl failed"
msgstr "klogctl 失败"
-#: sys-utils/eject.c:138
+#: sys-utils/eject.c:140
#, c-format
msgid " %s [options] [<device>|<mountpoint>]\n"
msgstr " %s [选项] [<设备>|<挂臷点>]\n"
-#: sys-utils/eject.c:141
+#: sys-utils/eject.c:143
msgid "Eject removable media.\n"
msgstr "弹出可移动媒体 \n"
-#: sys-utils/eject.c:144
+#: sys-utils/eject.c:146
msgid ""
" -a, --auto <on|off> turn auto-eject feature on or off\n"
" -c, --changerslot <slot> switch discs on a CD-ROM changer\n"
" -x, --cdspeed <速度> 设置 CD-ROM 最高速度\n"
" -X, --listspeed 列出 CD-ROM 可用速度\n"
-#: sys-utils/eject.c:167
+#: sys-utils/eject.c:169
msgid ""
"\n"
"By default tries -r, -s, -f, and -q in order until success.\n"
"\n"
"默认将依次尝试 -r、-s、-f 和 -q 直到成功。\n"
-#: sys-utils/eject.c:213
+#: sys-utils/eject.c:215
msgid "invalid argument to --changerslot/-c option"
msgstr "--changerslot/-c 选项的参数无效"
-#: sys-utils/eject.c:217
+#: sys-utils/eject.c:219
msgid "invalid argument to --cdspeed/-x option"
msgstr "--cdspeed/-x 选项的参数无效"
-#: sys-utils/eject.c:325
+#: sys-utils/eject.c:327
msgid "CD-ROM auto-eject command failed"
msgstr "CD-ROM 自动弹出命令失败"
-#: sys-utils/eject.c:339
+#: sys-utils/eject.c:341
msgid "CD-ROM door lock is not supported"
msgstr "不支持光盘仓门锁"
-#: sys-utils/eject.c:341
+#: sys-utils/eject.c:343
msgid "other users have the drive open and not CAP_SYS_ADMIN"
msgstr "其他用户开启了驱动器仓门，并且非 CAP_SYS_ADMIN"
-#: sys-utils/eject.c:343
+#: sys-utils/eject.c:345
msgid "CD-ROM lock door command failed"
msgstr "CD-ROM 锁仓门命令失败"
-#: sys-utils/eject.c:348
+#: sys-utils/eject.c:350
msgid "CD-Drive may NOT be ejected with device button"
msgstr "CD 驱动器不能通过设备上的按钮弹出"
-#: sys-utils/eject.c:350
+#: sys-utils/eject.c:352
msgid "CD-Drive may be ejected with device button"
msgstr "CD 驱动器可以通过设备上的按钮弹出"
-#: sys-utils/eject.c:361
+#: sys-utils/eject.c:363
msgid "CD-ROM select disc command failed"
msgstr "CD-ROM 选择光盘命令失败"
-#: sys-utils/eject.c:365
+#: sys-utils/eject.c:367
msgid "CD-ROM load from slot command failed"
msgstr "CD-ROM 从槽加载命令失败"
-#: sys-utils/eject.c:367
+#: sys-utils/eject.c:369
msgid "IDE/ATAPI CD-ROM changer not supported by this kernel\n"
msgstr "此内核不支持 IDE/ATAPI CD-ROM\n"
-#: sys-utils/eject.c:385
+#: sys-utils/eject.c:387
msgid "CD-ROM tray close command failed"
msgstr "CD-ROM 关闭仓门命令失败"
-#: sys-utils/eject.c:387
+#: sys-utils/eject.c:389
msgid "CD-ROM tray close command not supported by this kernel\n"
msgstr "此内核不支持 CD-ROM 关闭仓门命令\n"
-#: sys-utils/eject.c:404
+#: sys-utils/eject.c:406
msgid "CD-ROM eject unsupported"
msgstr "不支持 CD-ROM 弹出"
-#: sys-utils/eject.c:432 sys-utils/eject.c:455 sys-utils/eject.c:1020
+#: sys-utils/eject.c:434 sys-utils/eject.c:457 sys-utils/eject.c:1018
msgid "CD-ROM eject command failed"
msgstr "CD-ROM 弹出命令失败"
-#: sys-utils/eject.c:435
+#: sys-utils/eject.c:437
msgid "no CD-ROM information available"
msgstr "没有可用的 CD-ROM 信息"
-#: sys-utils/eject.c:438
+#: sys-utils/eject.c:440
msgid "CD-ROM drive is not ready"
msgstr "CD-ROM 驱动器未就绪"
-#: sys-utils/eject.c:441
+#: sys-utils/eject.c:443
msgid "CD-ROM status command failed"
msgstr "CD-ROM 状态命令失败"
-#: sys-utils/eject.c:481
+#: sys-utils/eject.c:483
msgid "CD-ROM select speed command failed"
msgstr "CD-ROM 选择速度命令失败"
-#: sys-utils/eject.c:483
+#: sys-utils/eject.c:485
msgid "CD-ROM select speed command not supported by this kernel"
msgstr "此内核不支持 CD-ROM 选择速度命令"
-#: sys-utils/eject.c:520
+#: sys-utils/eject.c:522
#, c-format
msgid "%s: failed to finding CD-ROM name"
msgstr "%s：获取 CD-ROM 名称失败"
-#: sys-utils/eject.c:535
+#: sys-utils/eject.c:539
#, c-format
msgid "%s: failed to read speed"
msgstr "%s：读 速度 失败"
-#: sys-utils/eject.c:543
+#: sys-utils/eject.c:545
msgid "failed to read speed"
msgstr "读 速度 失败"
-#: sys-utils/eject.c:583
+#: sys-utils/eject.c:585
msgid "not an sg device, or old sg driver"
msgstr "不是 sg 设备，或为旧 sg 驱动"
-#: sys-utils/eject.c:655
+#: sys-utils/eject.c:657
#, c-format
msgid "%s: unmounting"
msgstr "%s：正在卸载"
-#: sys-utils/eject.c:673
+#: sys-utils/eject.c:662 sys-utils/mount.c:59 sys-utils/umount.c:122
+#: text-utils/more.c:1271
+#, fuzzy
+#| msgid "permission denied"
+msgid "drop permissions failed"
+msgstr "权限不足"
+
+#: sys-utils/eject.c:671
msgid "unable to fork"
msgstr "无法 fork"
-#: sys-utils/eject.c:680
+#: sys-utils/eject.c:678
#, c-format
msgid "unmount of `%s' did not exit normally"
msgstr "卸载“%s”未正常退出"
-#: sys-utils/eject.c:683
+#: sys-utils/eject.c:681
#, c-format
msgid "unmount of `%s' failed\n"
msgstr "挂臷“%s”失败\n"
-#: sys-utils/eject.c:728
+#: sys-utils/eject.c:726
msgid "failed to parse mount table"
msgstr "解析挂臷表失败"
-#: sys-utils/eject.c:794 sys-utils/eject.c:896
+#: sys-utils/eject.c:792 sys-utils/eject.c:894
#, c-format
msgid "%s: mounted on %s"
msgstr "%s：已挂臷于 %s"
-#: sys-utils/eject.c:837
+#: sys-utils/eject.c:835
msgid "setting CD-ROM speed to auto"
msgstr "正在将 CD-ROM 速度设置为自动"
-#: sys-utils/eject.c:839
+#: sys-utils/eject.c:837
#, c-format
msgid "setting CD-ROM speed to %ldX"
msgstr "正在将 CD-ROM 速度设置为 %ldX"
-#: sys-utils/eject.c:865
+#: sys-utils/eject.c:863
#, c-format
msgid "default device: `%s'"
msgstr "默认设备：“%s”"
-#: sys-utils/eject.c:871
+#: sys-utils/eject.c:869
#, c-format
msgid "using default device `%s'"
msgstr "使用默认设备“%s”"
-#: sys-utils/eject.c:890
+#: sys-utils/eject.c:888
msgid "unable to find device"
msgstr "找不到设备"
-#: sys-utils/eject.c:892
+#: sys-utils/eject.c:890
#, c-format
msgid "device name is `%s'"
msgstr "设备名称为“%s”"
-#: sys-utils/eject.c:898 sys-utils/umount.c:361 sys-utils/umount.c:385
+#: sys-utils/eject.c:896 sys-utils/umount.c:365 sys-utils/umount.c:389
#, c-format
msgid "%s: not mounted"
msgstr "%s：未挂载"
-#: sys-utils/eject.c:902
+#: sys-utils/eject.c:900
#, c-format
msgid "%s: disc device: %s (disk device will be used for eject)"
msgstr "%s：盘设备：%s(盘设备将用于弹出)"
-#: sys-utils/eject.c:910
+#: sys-utils/eject.c:908
#, c-format
msgid "%s: not found mountpoint or device with the given name"
msgstr "%s：未找到指定名称的挂载点或设备"
-#: sys-utils/eject.c:913
+#: sys-utils/eject.c:911
#, c-format
msgid "%s: is whole-disk device"
msgstr "%s：是 整盘 设备"
-#: sys-utils/eject.c:917
-#, c-format
-msgid "%s: is not hot-pluggable device"
+#: sys-utils/eject.c:915
+#, fuzzy, c-format
+#| msgid "%s: is not hot-pluggable device"
+msgid "%s: is not ejectable device"
msgstr "%s：不是热插拔设备"
-#: sys-utils/eject.c:921
+#: sys-utils/eject.c:919
#, c-format
msgid "device is `%s'"
msgstr "设备是“%s”"
-#: sys-utils/eject.c:922
+#: sys-utils/eject.c:920
msgid "exiting due to -n/--noop option"
msgstr "将因 -n/--noop 选项退出"
-#: sys-utils/eject.c:936
+#: sys-utils/eject.c:934
#, c-format
msgid "%s: enabling auto-eject mode"
msgstr "%s：正在启用自动弹出模式"
-#: sys-utils/eject.c:938
+#: sys-utils/eject.c:936
#, c-format
msgid "%s: disabling auto-eject mode"
msgstr "%s：正在禁用自动弹出模式"
-#: sys-utils/eject.c:946
+#: sys-utils/eject.c:944
#, c-format
msgid "%s: closing tray"
msgstr "%s：正在关闭仓门"
-#: sys-utils/eject.c:955
+#: sys-utils/eject.c:953
#, c-format
msgid "%s: toggling tray"
msgstr "%s：开关仓门"
-#: sys-utils/eject.c:964
+#: sys-utils/eject.c:962
#, c-format
msgid "%s: listing CD-ROM speed"
msgstr "%s：正在列出 CD-ROM 速度"
-#: sys-utils/eject.c:990
+#: sys-utils/eject.c:988
#, c-format
msgid "error: %s: device in use"
msgstr "错误：%s：设备正在使用"
-#: sys-utils/eject.c:1001
+#: sys-utils/eject.c:999
#, c-format
msgid "%s: selecting CD-ROM disc #%ld"
msgstr "%s：正在选择 CD-ROM 盘 #%ld"
-#: sys-utils/eject.c:1017
+#: sys-utils/eject.c:1015
#, c-format
msgid "%s: trying to eject using CD-ROM eject command"
msgstr "%s：正在尝试使用 CD-ROM 弹出命令弹出"
-#: sys-utils/eject.c:1019
+#: sys-utils/eject.c:1017
msgid "CD-ROM eject command succeeded"
msgstr "CD-ROM 弹出命令成功"
-#: sys-utils/eject.c:1024
+#: sys-utils/eject.c:1022
#, c-format
msgid "%s: trying to eject using SCSI commands"
msgstr "%s：正在尝试使用 SCSI 命令弹出"
-#: sys-utils/eject.c:1026
+#: sys-utils/eject.c:1024
msgid "SCSI eject succeeded"
msgstr "SCSI 弹出成功"
-#: sys-utils/eject.c:1027
+#: sys-utils/eject.c:1025
msgid "SCSI eject failed"
msgstr "SCSI 弹出失败"
-#: sys-utils/eject.c:1031
+#: sys-utils/eject.c:1029
#, c-format
msgid "%s: trying to eject using floppy eject command"
msgstr "%s：正在尝试使用软盘弹出命令弹出"
-#: sys-utils/eject.c:1033
+#: sys-utils/eject.c:1031
msgid "floppy eject command succeeded"
msgstr "软盘弹出命令成功"
-#: sys-utils/eject.c:1034
+#: sys-utils/eject.c:1032
msgid "floppy eject command failed"
msgstr "软盘弹出命令失败"
-#: sys-utils/eject.c:1038
+#: sys-utils/eject.c:1036
#, c-format
msgid "%s: trying to eject using tape offline command"
msgstr "%s：正在尝试使用磁带离线命令弹出"
-#: sys-utils/eject.c:1040
+#: sys-utils/eject.c:1038
msgid "tape offline command succeeded"
msgstr "磁带离线命令成功"
-#: sys-utils/eject.c:1041
+#: sys-utils/eject.c:1039
msgid "tape offline command failed"
msgstr "磁带离线命令失败"
-#: sys-utils/eject.c:1045
+#: sys-utils/eject.c:1043
msgid "unable to eject"
msgstr "无法弹出"
msgid "invalid offset value specified"
msgstr "指定的偏移值无效"
+#: sys-utils/fallocate.c:421
+#, fuzzy, c-format
+#| msgid "%s: %s (%ju bytes) converted to sparse holes.\n"
+msgid "%s: %s (%ju bytes) hole created.\n"
+msgstr "%s：已将 %s(%ju 字节) 转换为稀疏空洞。\n"
+
+#: sys-utils/fallocate.c:424
+#, fuzzy, c-format
+#| msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
+msgid "%s: %s (%ju bytes) removed.\n"
+msgstr "%s：%s (%<PRIu64> 字节) 已修剪\n"
+
+#: sys-utils/fallocate.c:427
+#, fuzzy, c-format
+#| msgid "%s: %s (%ju bytes) converted to sparse holes.\n"
+msgid "%s: %s (%ju bytes) inserted.\n"
+msgstr "%s：已将 %s(%ju 字节) 转换为稀疏空洞。\n"
+
+#: sys-utils/fallocate.c:430
+#, fuzzy, c-format
+#| msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
+msgid "%s: %s (%ju bytes) zeroed.\n"
+msgstr "%s：%s (%<PRIu64> 字节) 已修剪\n"
+
+#: sys-utils/fallocate.c:433
+#, fuzzy, c-format
+#| msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
+msgid "%s: %s (%ju bytes) allocated.\n"
+msgstr "%s：%s (%<PRIu64> 字节) 已修剪\n"
+
#: sys-utils/flock.c:53
#, c-format
msgid ""
#: sys-utils/fsfreeze.c:44
#, fuzzy
+#| msgid "Mount a filesystem.\n"
msgid "Suspend access to a filesystem.\n"
msgstr "挂载文件系统。\n"
msgid "%s: unfreeze failed"
msgstr "%s：解冻失败"
-#: sys-utils/fstrim.c:80
+#: sys-utils/fstrim.c:83
#, c-format
msgid "%s: not a directory"
msgstr "%s：不是一个目录"
-#: sys-utils/fstrim.c:94
-#, c-format
-msgid "cannot get realpath: %s"
-msgstr "无法获取真实路径：%s"
-
-#: sys-utils/fstrim.c:110
+#: 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:112
+#: sys-utils/fstrim.c:115
#, c-format
msgid "%s: 0 B (dry run) trimmed\n"
msgstr ""
-#: sys-utils/fstrim.c:129
+#: 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:139
+#: 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:143
+#: sys-utils/fstrim.c:147
#, c-format
msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
msgstr "%s：%s (%<PRIu64> 字节) 已修剪\n"
-#: sys-utils/fstrim.c:249 sys-utils/lsns.c:1144 sys-utils/swapon.c:745
-#: sys-utils/umount.c:267
+#: 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:275
+#: sys-utils/fstrim.c:316
#, fuzzy
+#| msgid "failed to allocate script handler"
msgid "failed to allocate FS handler"
msgstr "分配脚本处理程序失败"
-#: sys-utils/fstrim.c:364 sys-utils/fstrim.c:545
+#: 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:415
+#: sys-utils/fstrim.c:454
#, c-format
msgid " %s [options] <mount point>\n"
msgstr " %s [选项] <挂臷点>\n"
-#: sys-utils/fstrim.c:418
+#: sys-utils/fstrim.c:457
msgid "Discard unused blocks on a mounted filesystem.\n"
msgstr "忽略已挂载文件系统上的未用锁。\n"
-#: sys-utils/fstrim.c:421
+#: 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:422
+#: 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:423
+#: 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:424
+#: 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:425
+#: 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:426
+#: 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:427
+#: 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:428
+#: 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:429
+#: 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:509
+#: sys-utils/fstrim.c:550
msgid "failed to parse minimum extent length"
msgstr "解析 最小范围长度 失败"
-#: sys-utils/fstrim.c:528
+#: sys-utils/fstrim.c:572
msgid "no mountpoint specified"
msgstr "未指定挂载点"
-#: sys-utils/hwclock.c:213
+#: sys-utils/hwclock.c:215
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "将假设硬件时钟保持为 %s 时间。\n"
-#: sys-utils/hwclock.c:214 sys-utils/hwclock.c:282
+#: sys-utils/hwclock.c:216 sys-utils/hwclock.c:286
msgid "UTC"
msgstr "UTC"
-#: sys-utils/hwclock.c:214 sys-utils/hwclock.c:281
+#: sys-utils/hwclock.c:216 sys-utils/hwclock.c:285
msgid "local"
msgstr "当地"
-#: sys-utils/hwclock.c:269
+#: sys-utils/hwclock.c:258 sys-utils/hwclock.c:261
+#, fuzzy, c-format
+#| msgid ""
+#| "Warning: unrecognized third line in adjtime file\n"
+#| "(Expected: `UTC' or `LOCAL' or nothing.)"
+msgid "Warning: unrecognized line in adjtime file: %s"
+msgstr ""
+"警告：adjtime 文件第三行无法识别\n"
+"(应为：“UTC”或“LOCAL”或空)"
+
+#: sys-utils/hwclock.c:273
msgid ""
"Warning: unrecognized third line in adjtime file\n"
"(Expected: `UTC' or `LOCAL' or nothing.)"
"警告：adjtime 文件第三行无法识别\n"
"(应为：“UTC”或“LOCAL”或空)"
-#: sys-utils/hwclock.c:275
+#: sys-utils/hwclock.c:279
#, fuzzy, c-format
#| msgid "Last drift adjustment done at %ld seconds after 1969\n"
msgid "Last drift adjustment done at %<PRId64> seconds after 1969\n"
msgstr "上次漂移调整完成于1969(年)后 %ld 秒\n"
-#: sys-utils/hwclock.c:277
+#: sys-utils/hwclock.c:281
#, fuzzy, c-format
#| msgid "Last calibration done at %ld seconds after 1969\n"
msgid "Last calibration done at %<PRId64> seconds after 1969\n"
msgstr "上次校准完成于1969(年)后 %ld 秒\n"
-#: sys-utils/hwclock.c:279
+#: sys-utils/hwclock.c:283
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "硬件时钟为 %s 时间\n"
-#: sys-utils/hwclock.c:306
+#: sys-utils/hwclock.c:310
#, c-format
msgid "Waiting for clock tick...\n"
-msgstr "正在等等时钟滴答...\n"
+msgstr "正在等待时钟滴答...\n"
-#: sys-utils/hwclock.c:312
+#: sys-utils/hwclock.c:316
#, c-format
msgid "...synchronization failed\n"
msgstr "...同步失败\n"
-#: sys-utils/hwclock.c:314
+#: sys-utils/hwclock.c:318
#, c-format
msgid "...got clock tick\n"
msgstr "...已获取时钟滴答\n"
-#: sys-utils/hwclock.c:355
+#: sys-utils/hwclock.c:359
#, c-format
msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
msgstr "硬件时钟值无效：%4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
-#: sys-utils/hwclock.c:362
+#: sys-utils/hwclock.c:366
#, fuzzy, c-format
#| msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %<PRId64> seconds since 1969\n"
msgstr "硬件时钟时间：%4d/%.2d/%.2d %.2d:%.2d:%.2d = 1969(年)后 %ld 秒\n"
-#: sys-utils/hwclock.c:388
+#: sys-utils/hwclock.c:392
#, c-format
msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
msgstr "从硬件时钟读取的时间：%4d/%.2d/%.2d %02d:%02d:%02d\n"
-#: sys-utils/hwclock.c:415
+#: sys-utils/hwclock.c:419
#, fuzzy, c-format
#| msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %<PRId64> seconds since 1969\n"
msgstr "正在将硬件时钟设置为 %.2d:%.2d:%.2d = 1969(年)后 %ld 秒\n"
-#: sys-utils/hwclock.c:451
+#: sys-utils/hwclock.c:455
#, c-format
msgid "RTC type: '%s'\n"
msgstr "RTC 类型：“%s”\n"
-#: sys-utils/hwclock.c:551
+#: sys-utils/hwclock.c:555
#, fuzzy, c-format
+#| msgid "%s %.6f seconds\n"
msgid "Using delay: %.6f seconds\n"
msgstr "%s %.6f 秒\n"
-#: sys-utils/hwclock.c:570
+#: sys-utils/hwclock.c:574
#, fuzzy, c-format
#| msgid "time jumped backward %.6f seconds to %ld.%06ld - retargeting\n"
msgid "time jumped backward %.6f seconds to %<PRId64>.%06<PRId64> - retargeting\n"
msgstr "时间倒退了 %.6f 秒到 %ld.%06ld - 正在重新定位\n"
-#: sys-utils/hwclock.c:592
+#: sys-utils/hwclock.c:596
#, fuzzy, c-format
#| msgid "missed it - %ld.%06ld is too far past %ld.%06ld (%.6f > %.6f)\n"
msgid "missed it - %<PRId64>.%06<PRId64> is too far past %<PRId64>.%06<PRId64> (%.6f > %.6f)\n"
msgstr "错过了- %ld.%06ld 在 %ld.%06ld 之后太长时间了(%.6f > %.6f)\n"
-#: sys-utils/hwclock.c:619
+#: sys-utils/hwclock.c:623
#, fuzzy, c-format
+#| msgid ""
+#| "%ld.%06ld is close enough to %ld.%06ld (%.6f < %.6f)\n"
+#| "Set RTC to %ld (%ld + %d; refsystime = %ld.%06ld)\n"
msgid ""
"%<PRId64>.%06<PRId64> is close enough to %<PRId64>.%06<PRId64> (%.6f < %.6f)\n"
"Set RTC to %<PRId64> (%<PRId64> + %d; refsystime = %<PRId64>.%06<PRId64>)\n"
"%ld.%06d 距 %ld.%06d 太近(%.6f < %.6f)\n"
"请将 RTC 设为 %ld (%ld + %d; refsystime = %ld.%06d)\n"
-#: sys-utils/hwclock.c:713
+#: sys-utils/hwclock.c:717
#, fuzzy
+#| msgid "Calling settimeofday(NULL, %d) "
msgid "Calling settimeofday(NULL, 0) to lock the warp_clock function."
msgstr "正在调用 settimeofday(NULL, %d)"
-#: sys-utils/hwclock.c:716
+#: sys-utils/hwclock.c:720
#, fuzzy, c-format
+#| msgid "Calling settimeofday(NULL, %d) "
msgid "Calling settimeofday(NULL, %d) to set the kernel timezone.\n"
msgstr "正在调用 settimeofday(NULL, %d)"
-#: sys-utils/hwclock.c:720
+#: sys-utils/hwclock.c:724
#, c-format
msgid "Calling settimeofday(NULL, %d) to warp System time, set PCIL and the kernel tz.\n"
msgstr ""
-#: sys-utils/hwclock.c:725
+#: sys-utils/hwclock.c:729
#, fuzzy, c-format
+#| msgid "Calling settimeofday:\n"
msgid "Calling settimeofday(%<PRId64>.%06<PRId64>, NULL) to set the System time.\n"
msgstr "正在调用 settimeofday：\n"
-#: sys-utils/hwclock.c:747
+#: sys-utils/hwclock.c:751
msgid "settimeofday() failed"
msgstr "settimeofday() 失败"
-#: sys-utils/hwclock.c:771
+#: sys-utils/hwclock.c:775
#, c-format
msgid "Not adjusting drift factor because the --update-drift option was not used.\n"
msgstr "将不调整漂移系数，因为没有使用 --update-drift 选项。\n"
-#: sys-utils/hwclock.c:775
+#: sys-utils/hwclock.c:779
#, c-format
msgid ""
"Not adjusting drift factor because last calibration time is zero,\n"
"将不调整漂移系数，因为上次校准时间为零，\n"
"历史有问题；需要启动校准。\n"
-#: sys-utils/hwclock.c:781
+#: sys-utils/hwclock.c:785
#, c-format
msgid "Not adjusting drift factor because it has been less than four hours since the last calibration.\n"
msgstr "将不调整漂移系数，因为距上次校正不到四个小时。\n"
-#: sys-utils/hwclock.c:819
+#: sys-utils/hwclock.c:823
#, c-format
msgid ""
"Clock drift factor was calculated as %f seconds/day.\n"
"时钟漂移系数会按 %f 秒/天计算。\n"
"系数过大，将重置为 0。\n"
-#: sys-utils/hwclock.c:826
+#: sys-utils/hwclock.c:830
#, fuzzy, c-format
+#| msgid ""
+#| "Clock drifted %f seconds in the past %f seconds\n"
+#| "in spite of a drift factor of %f seconds/day.\n"
+#| "Adjusting drift factor by %f seconds/day\n"
msgid ""
"Clock drifted %f seconds in the past %f seconds\n"
"in spite of a drift factor of %f seconds/day.\n"
"Adjusting drift factor by %f seconds/day\n"
msgstr "在过去的 %2$d 秒内，时钟漂移了 %1$.1f 秒，而漂移系数为 %3$f 秒/天。会将漂移系数调整 %4$f 秒/天\n"
-#: sys-utils/hwclock.c:870
+#: sys-utils/hwclock.c:874
#, fuzzy, c-format
+#| msgid "Time since last adjustment is %d second\n"
+#| msgid_plural "Time since last adjustment is %d seconds\n"
msgid "Time since last adjustment is %<PRId64> second\n"
msgid_plural "Time since last adjustment is %<PRId64> seconds\n"
msgstr[0] "距上次调整的时间为 %d 秒\n"
-#: sys-utils/hwclock.c:874
+#: sys-utils/hwclock.c:878
#, fuzzy, c-format
#| msgid "Calculated Hardware Clock drift is %ld.%06ld seconds\n"
msgid "Calculated Hardware Clock drift is %<PRId64>.%06<PRId64> seconds\n"
msgstr "计算出的硬件锁偏差为 %ld.%06ld 秒\n"
-#: sys-utils/hwclock.c:899
+#: sys-utils/hwclock.c:903
#, c-format
msgid ""
"New %s data:\n"
"%s"
msgstr ""
-#: sys-utils/hwclock.c:911
+#: sys-utils/hwclock.c:920
#, c-format
msgid "cannot update %s"
msgstr "无法更新 %s"
-#: sys-utils/hwclock.c:947
+#: sys-utils/hwclock.c:956
#, c-format
msgid "Not setting clock because last adjustment time is zero, so history is bad.\n"
msgstr "将不设置时钟，因为上次调整时间为零，历史有误。\n"
-#: sys-utils/hwclock.c:951
+#: sys-utils/hwclock.c:960
#, c-format
msgid "Not setting clock because drift factor %f is far too high.\n"
msgstr "将不设置时钟，因为上次漂移系数 %f 过高。\n"
-#: sys-utils/hwclock.c:981
+#: sys-utils/hwclock.c:990
#, c-format
msgid "No usable clock interface found.\n"
msgstr "未找到可用的时钟接口。\n"
-#: sys-utils/hwclock.c:983
+#: sys-utils/hwclock.c:992
msgid "Cannot access the Hardware Clock via any known method."
msgstr "无法通过已知的任何方式访问硬件时钟。"
-#: sys-utils/hwclock.c:987
+#: sys-utils/hwclock.c:996
#, fuzzy
+#| msgid "Use the --debug option to see the details of our search for an access method."
msgid "Use the --verbose option to see the details of our search for an access method."
msgstr "请使用 --debug 选项来观察程序搜索访问方法的详情。"
-#: sys-utils/hwclock.c:1037
+#: sys-utils/hwclock.c:1046
#, c-format
msgid "Target date: %<PRId64>\n"
msgstr ""
-#: sys-utils/hwclock.c:1038
+#: sys-utils/hwclock.c:1047
#, c-format
msgid "Predicted RTC: %<PRId64>\n"
msgstr ""
-#: sys-utils/hwclock.c:1068
+#: sys-utils/hwclock.c:1077
msgid "RTC read returned an invalid value."
msgstr ""
-#: sys-utils/hwclock.c:1098
+#: sys-utils/hwclock.c:1107
#, c-format
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr "需要的调整不到一秒，将不设置时钟。\n"
-#: sys-utils/hwclock.c:1135
+#: sys-utils/hwclock.c:1144
#, fuzzy
+#| msgid "unable to read super block"
msgid "unable to read the RTC epoch."
msgstr "不能读超级块"
-#: sys-utils/hwclock.c:1137
+#: sys-utils/hwclock.c:1146
#, c-format
msgid "The RTC epoch is set to %lu.\n"
msgstr ""
-#: sys-utils/hwclock.c:1140
+#: sys-utils/hwclock.c:1149
msgid "--epoch is required for --setepoch."
msgstr ""
-#: sys-utils/hwclock.c:1143
+#: sys-utils/hwclock.c:1152
#, fuzzy
+#| msgid "Unable to set system clock.\n"
msgid "unable to set the RTC epoch."
msgstr "无法设置系统时钟。\n"
-#: sys-utils/hwclock.c:1157
+#: sys-utils/hwclock.c:1165
+#, fuzzy, c-format
+#| msgid "unable to read super block"
+msgid "unable to read the RTC parameter %s"
+msgstr "不能读超级块"
+
+#: sys-utils/hwclock.c:1170
+#, c-format
+msgid "The RTC parameter 0x%jx is set to 0x%jx.\n"
+msgstr ""
+
+#: 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:1160
+#: sys-utils/hwclock.c:1201
msgid "Time clocks utility."
msgstr ""
-#: sys-utils/hwclock.c:1163
-msgid " -r, --show display the RTC time"
+#: 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:1164
+#: sys-utils/hwclock.c:1205
#, fuzzy
-msgid " --get display drift corrected RTC time"
+#| msgid " -Z, --context display SELinux contexts\n"
+msgid " --get display drift corrected RTC time"
msgstr " -Z, --context 显示 SELinux 环境\n"
-#: sys-utils/hwclock.c:1165
+#: sys-utils/hwclock.c:1206
#, fuzzy
-msgid " --set set the RTC according to --date"
+#| msgid " -r, --reset reset the port\n"
+msgid " --set set the RTC according to --date"
msgstr " -r, --reset 重置端口\n"
-#: sys-utils/hwclock.c:1166
-msgid " -s, --hctosys set the system time from the RTC"
-msgstr ""
+#: 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:1167
+#: sys-utils/hwclock.c:1208
#, fuzzy
-msgid " -w, --systohc set the RTC from the system time"
+#| 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:1168
-msgid " --systz send timescale configurations to the kernel"
-msgstr ""
+#: 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:1169
-msgid " -a, --adjust adjust the RTC to account for systematic drift"
-msgstr ""
+#: 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:1171
+#: sys-utils/hwclock.c:1212
#, fuzzy
-msgid " --getepoch display the RTC epoch"
+#| msgid " --help display this help and exit\n"
+msgid " --getepoch display the RTC epoch"
msgstr " --help 显示此帮助并退出\n"
-#: sys-utils/hwclock.c:1172
-msgid " --setepoch set the RTC epoch according to --epoch"
-msgstr ""
+#: 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: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:1174
-msgid " --predict predict the drifted RTC time according to --date"
+#: sys-utils/hwclock.c:1217
+msgid " --param-set <param>=<value> set the RTC parameter"
msgstr ""
-#: sys-utils/hwclock.c:1176
+#: sys-utils/hwclock.c:1219
#, fuzzy
-msgid " -u, --utc the RTC timescale is UTC"
+#| 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: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:1177
+#: sys-utils/hwclock.c:1222
#, fuzzy
-msgid " -l, --localtime the RTC timescale is Local"
+#| 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:1180
+#: sys-utils/hwclock.c:1225
#, fuzzy, c-format
-msgid " -f, --rtc <file> use an alternate file to %1$s\n"
+#| 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:1183
-#, c-format
-msgid " --directisa use the ISA bus instead of %1$s access\n"
-msgstr ""
+#: 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:1184
-msgid " --date <time> date/time input for --set and --predict"
+#: 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:1185
-msgid " --delay <sec> delay used when set new RTC time"
-msgstr ""
+#: 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:1187
-msgid " --epoch <year> epoch input for --setepoch"
+#: sys-utils/hwclock.c:1232
+msgid " --epoch <year> epoch input for --setepoch"
msgstr ""
-#: sys-utils/hwclock.c:1189
-msgid " --update-drift update the RTC drift factor"
-msgstr ""
+#: 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:1191
-#, c-format
-msgid " --noadjfile do not use %1$s\n"
+#: 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:1193
+#: sys-utils/hwclock.c:1238
#, fuzzy, c-format
-msgid " --adjfile <file> use an alternate file to %1$s\n"
+#| 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:1194
-msgid " --test dry run; implies --verbose"
-msgstr " --test 测试运行；隐含启用 --verbose"
+#: 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:1240
+#, fuzzy
+#| msgid " -v, --verbose display more details\n"
+msgid " -v, --verbose display more details"
+msgstr " -v, --verbose 显示更多细节\n"
+
+#: sys-utils/hwclock.c:1247
+msgid " <param> is either a numeric RTC parameter value or one of these aliases:"
+msgstr ""
+
+#: sys-utils/hwclock.c:1250
+#, c-format
+msgid " - %1$s: %2$s (0x%3$x)\n"
+msgstr ""
+
+#: sys-utils/hwclock.c:1254
+msgid " See Kernel's include/uapi/linux/rtc.h for parameters and values."
+msgstr ""
-#: sys-utils/hwclock.c:1195
-msgid " -v, --verbose display more details"
-msgstr " -v, --verbose 显示更多细节"
+#: sys-utils/hwclock.c:1256
+msgid " <param> and <value> accept hexadecimal values if prefixed with 0x, otherwise decimal."
+msgstr ""
-#: sys-utils/hwclock.c:1291
+#: sys-utils/hwclock.c:1357
msgid "Unable to connect to audit system"
msgstr "无法连接到审计系统"
-#: sys-utils/hwclock.c:1315
+#: sys-utils/hwclock.c:1381
msgid "use --verbose, --debug has been deprecated."
msgstr ""
-#: sys-utils/hwclock.c:1417
+#: sys-utils/hwclock.c:1494
#, fuzzy, c-format
+#| msgid "too many arguments"
msgid "%d too many arguments given"
msgstr "参数过多"
-#: sys-utils/hwclock.c:1425
+#: sys-utils/hwclock.c:1502
msgid "--update-drift requires --set or --systohc"
msgstr ""
-#: sys-utils/hwclock.c:1430
+#: sys-utils/hwclock.c:1507
msgid "With --noadjfile, you must specify either --utc or --localtime"
msgstr "指定 --noadjfile 时，您必须指定 --utc 或 --localtime"
-#: sys-utils/hwclock.c:1437
+#: sys-utils/hwclock.c:1514
msgid "--date is required for --set or --predict"
msgstr ""
-#: sys-utils/hwclock.c:1454
-#, fuzzy, c-format
+#: sys-utils/hwclock.c:1531
+#, c-format
msgid "invalid date '%s'"
-msgstr "无效 ID：%s"
+msgstr "无效日期“%s”"
-#: sys-utils/hwclock.c:1468
+#: 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:1485
+#: sys-utils/hwclock.c:1571
msgid "Test mode: nothing was changed."
msgstr "演示模式：无实际修改。"
msgstr "未实现 ISA 端口访问"
#: sys-utils/hwclock-cmos.c:362
-#, fuzzy
msgid "iopl() port access failed"
-msgstr "无法访问文件 %s"
+msgstr "iopl() 端口访问失败"
#: sys-utils/hwclock-cmos.c:373
#, fuzzy
+#| msgid "Using direct I/O instructions to ISA clock."
msgid "Using direct ISA access to the clock"
msgstr "将对 ISA 时钟使用直接 I/O 指令。"
-#: sys-utils/hwclock-rtc.c:131
-#, fuzzy, c-format
+#: sys-utils/hwclock-rtc.c:48
+#, fuzzy
+#| msgid "unsupported filesystem features"
+msgid "supported features"
+msgstr "不支持的文件系统特性"
+
+#: sys-utils/hwclock-rtc.c:49
+msgid "time correction"
+msgstr ""
+
+#: sys-utils/hwclock-rtc.c:50
+msgid "backup switch mode"
+msgstr ""
+
+#: sys-utils/hwclock-rtc.c:101
+#, c-format
msgid "Trying to open: %s\n"
-msgstr "正在尝试卸载 %s\n"
+msgstr "正在尝试打开：%s\n"
-#: sys-utils/hwclock-rtc.c:156 sys-utils/hwclock-rtc.c:259
+#: sys-utils/hwclock-rtc.c:126 sys-utils/hwclock-rtc.c:216
msgid "cannot open rtc device"
msgstr "无法打开 rtc 设备"
-#: sys-utils/hwclock-rtc.c:192
-#, 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:220
+#: 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:239
+#: sys-utils/hwclock-rtc.c:196
msgid "Timed out waiting for time change."
msgstr "等待时间更改超时。"
-#: sys-utils/hwclock-rtc.c:287
+#: 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:290
+#: 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:295
+#: 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:301
+#: 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:353
+#: 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:359
-#, 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:375
+#: 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:408
+#: 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:414
+#: 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:432
+#: sys-utils/hwclock-rtc.c:383
#, fuzzy, c-format
+#| msgid "invalid epoch argument"
msgid "invalid epoch '%s'."
msgstr "无效的纪元(epoch)参数"
-#: sys-utils/hwclock-rtc.c:443
+#: 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:449
+#: 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:442 sys-utils/hwclock-rtc.c:484
+msgid "could not convert parameter name to number"
+msgstr ""
+
+#: 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: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:491
+msgid "expected <param>=<value>"
+msgstr ""
+
+#: sys-utils/hwclock-rtc.c:495
+msgid "could not convert parameter value to number"
+msgstr ""
+
+#: 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:513
+#, fuzzy, c-format
+#| msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgid "ioctl(%d, RTC_PARAM_SET, param) to %s succeeded.\n"
+msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
+
#: sys-utils/ipcmk.c:70
msgid "Create various IPC resources.\n"
msgstr "创建各种 IPC 资源。\n"
#: sys-utils/ipcmk.c:82 sys-utils/zramctl.c:565
#, fuzzy
+#| msgid "size"
msgid "<size>"
msgstr "大小"
+#: sys-utils/ipcmk.c:114 sys-utils/losetup.c:737 sys-utils/zramctl.c:653
+msgid "failed to parse size"
+msgstr "解析大小失败"
+
#: sys-utils/ipcmk.c:121
msgid "failed to parse elements"
msgstr "解析元素失败"
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:130
+#, fuzzy
+#| msgid "failed to parse id"
+msgid "failed to parse mode"
+msgstr "解析 id 失败"
+
+#: sys-utils/ipcmk.c:149
msgid "create share memory failed"
msgstr "创建共享内存失败"
-#: sys-utils/ipcmk.c:146
+#: sys-utils/ipcmk.c:151
#, c-format
msgid "Shared memory id: %d\n"
msgstr "共享内存 id：%d\n"
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:157
msgid "create message queue failed"
msgstr "创建消息队列失败"
-#: sys-utils/ipcmk.c:154
+#: sys-utils/ipcmk.c:159
#, c-format
msgid "Message queue id: %d\n"
msgstr "消息队列 id：%d\n"
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:165
msgid "create semaphore failed"
msgstr "创建信号量失败"
-#: sys-utils/ipcmk.c:162
+#: sys-utils/ipcmk.c:167
#, c-format
msgid "Semaphore id: %d\n"
msgstr "信号量 id：%d\n"
msgid "removing semaphore id `%d'\n"
msgstr "正在移除信号量 id “%d”\n"
-#: sys-utils/ipcrm.c:108 sys-utils/ipcrm.c:222
+#: sys-utils/ipcrm.c:108 sys-utils/ipcrm.c:223
msgid "permission denied for key"
msgstr "对 键 的权限不足"
msgid "permission denied for id"
msgstr "对 id 的权限不足"
-#: sys-utils/ipcrm.c:111 sys-utils/ipcrm.c:228
+#: sys-utils/ipcrm.c:111 sys-utils/ipcrm.c:229
msgid "invalid key"
msgstr "无效键"
msgid "invalid id"
msgstr "无效 id"
-#: sys-utils/ipcrm.c:114 sys-utils/ipcrm.c:225
+#: sys-utils/ipcrm.c:114 sys-utils/ipcrm.c:226
msgid "already removed key"
msgstr "已移除的键"
msgid "already removed id"
msgstr "已移除的 id"
-#: sys-utils/ipcrm.c:117 sys-utils/ipcrm.c:231
+#: sys-utils/ipcrm.c:117 sys-utils/ipcrm.c:232
msgid "key failed"
msgstr "键失败"
msgid "id failed"
msgstr "ID 失败"
-#: sys-utils/ipcrm.c:134
+#: sys-utils/ipcrm.c:135
#, c-format
msgid "invalid id: %s"
msgstr "无效 ID：%s"
-#: sys-utils/ipcrm.c:167
+#: sys-utils/ipcrm.c:168
#, c-format
msgid "resource(s) deleted\n"
msgstr "资源已删除\n"
-#: sys-utils/ipcrm.c:200
+#: sys-utils/ipcrm.c:201
#, c-format
msgid "illegal key (%s)"
msgstr "非法的键(%s)"
-#: sys-utils/ipcrm.c:256
+#: sys-utils/ipcrm.c:257
msgid "kernel not configured for shared memory"
msgstr "内核未做共享内存的相关配置"
-#: sys-utils/ipcrm.c:269
+#: sys-utils/ipcrm.c:270
msgid "kernel not configured for semaphores"
msgstr "内核未做信号量的相关配置"
-#: sys-utils/ipcrm.c:290
+#: sys-utils/ipcrm.c:291
msgid "kernel not configured for message queues"
msgstr "内核未做消息的相关配置"
-#: sys-utils/ipcs.c:60
+#: sys-utils/ipcs.c:61
#, c-format
msgid ""
" %1$s [resource-option...] [output-option]\n"
" %1$s [资源选项...] [输出选项]\n"
" %1$s -m|-q|-s -i <id>\n"
-#: sys-utils/ipcs.c:64 sys-utils/lsipc.c:294
+#: sys-utils/ipcs.c:65 sys-utils/lsipc.c:295
msgid "Show information on IPC facilities.\n"
msgstr "显示 IPC 设施的信息。\n"
-#: sys-utils/ipcs.c:67
+#: sys-utils/ipcs.c:68
msgid " -i, --id <id> print details on resource identified by <id>\n"
msgstr " -i, --id <id> 打印由<id>标识的资源的详细信息\n"
-#: sys-utils/ipcs.c:71 sys-utils/lsipc.c:297
+#: sys-utils/ipcs.c:72 sys-utils/lsipc.c:298
msgid "Resource options:\n"
msgstr "资源选项：\n"
-#: sys-utils/ipcs.c:72 sys-utils/lsipc.c:298
+#: sys-utils/ipcs.c:73 sys-utils/lsipc.c:299
msgid " -m, --shmems shared memory segments\n"
msgstr " -m, --shmems 共享内存段\n"
-#: sys-utils/ipcs.c:73 sys-utils/lsipc.c:299
+#: sys-utils/ipcs.c:74 sys-utils/lsipc.c:300
msgid " -q, --queues message queues\n"
msgstr " -q, --queues 消息队列\n"
-#: sys-utils/ipcs.c:74 sys-utils/lsipc.c:300
+#: sys-utils/ipcs.c:75 sys-utils/lsipc.c:301
msgid " -s, --semaphores semaphores\n"
msgstr " -s, --semaphores 信号量\n"
-#: sys-utils/ipcs.c:75
+#: sys-utils/ipcs.c:76
msgid " -a, --all all (default)\n"
msgstr " -a, --all 全部(默认)\n"
-#: sys-utils/ipcs.c:78
+#: sys-utils/ipcs.c:79
msgid "Output options:\n"
msgstr "输出选项：\n"
-#: sys-utils/ipcs.c:79
+#: sys-utils/ipcs.c:80
msgid " -t, --time show attach, detach and change times\n"
msgstr " -t, --time 显示附加、脱离和更改时间\n"
-#: sys-utils/ipcs.c:80
+#: sys-utils/ipcs.c:81
msgid " -p, --pid show PIDs of creator and last operator\n"
msgstr " -p, --pid 显示创建者和最后操作者的 PID\n"
-#: sys-utils/ipcs.c:81
+#: sys-utils/ipcs.c:82
msgid " -c, --creator show creator and owner\n"
msgstr " -c, --creator 显示创建者和拥有者\n"
-#: sys-utils/ipcs.c:82
+#: sys-utils/ipcs.c:83
msgid " -l, --limits show resource limits\n"
msgstr " -l, --limits 显示资源限制\n"
-#: sys-utils/ipcs.c:83
+#: sys-utils/ipcs.c:84
msgid " -u, --summary show status summary\n"
msgstr " -u, --summary 显示状态摘要\n"
-#: sys-utils/ipcs.c:84
+#: sys-utils/ipcs.c:85
msgid " --human show sizes in human-readable format\n"
msgstr " --human 以易读格式显示大小\n"
-#: sys-utils/ipcs.c:85
+#: sys-utils/ipcs.c:86
msgid " -b, --bytes show sizes in bytes\n"
msgstr " -b, --bytes 以字节数显示大小\n"
-#: sys-utils/ipcs.c:171
+#: sys-utils/ipcs.c:124
+#, fuzzy
+#| msgid "failed to parse argument"
+msgid "failed to parse id argument"
+msgstr "解析参数失败"
+
+#: sys-utils/ipcs.c:172
msgid "when using an ID, a single resource must be specified"
msgstr "使用 ID 时，必须指定一个资源"
-#: sys-utils/ipcs.c:211
+#: sys-utils/ipcs.c:212
#, c-format
msgid "unable to fetch shared memory limits\n"
msgstr "无法获取共享内存限制\n"
-#: sys-utils/ipcs.c:214
+#: sys-utils/ipcs.c:215
#, c-format
msgid "------ Shared Memory Limits --------\n"
msgstr "---------- 同享内存限制 ------------\n"
-#: sys-utils/ipcs.c:215
+#: sys-utils/ipcs.c:216
#, c-format
msgid "max number of segments = %ju\n"
msgstr "最大段数 = %ju\n"
-#: sys-utils/ipcs.c:217
+#: sys-utils/ipcs.c:218
msgid "max seg size"
msgstr "最大段大小"
-#: sys-utils/ipcs.c:224
-#, fuzzy
+#: sys-utils/ipcs.c:225
msgid "max total shared memory (kbytes)"
-msgstr "最大总共享内存"
+msgstr "最大总共享内存（千字节）"
-#: sys-utils/ipcs.c:232
+#: sys-utils/ipcs.c:233
msgid "max total shared memory"
msgstr "最大总共享内存"
-#: sys-utils/ipcs.c:235
+#: sys-utils/ipcs.c:236
msgid "min seg size"
msgstr "最小段大小"
-#: sys-utils/ipcs.c:247
+#: sys-utils/ipcs.c:248
#, c-format
msgid "kernel not configured for shared memory\n"
msgstr "内核未做共享内存的相关配置\n"
-#: sys-utils/ipcs.c:251
+#: sys-utils/ipcs.c:252
#, c-format
msgid "------ Shared Memory Status --------\n"
msgstr "---------- 共享内存状态 ------------\n"
#. "pages swapped = %ld\n"
#. "swap performance = %ld attempts, %ld successes\n"
#.
-#: sys-utils/ipcs.c:263
+#: sys-utils/ipcs.c:264
#, c-format
msgid ""
"segments allocated %d\n"
"页交换 %ld\n"
"交换性能：%ld 次尝试\t %ld 次成功\n"
-#: sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:281
#, c-format
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr "------------- 共享内存段创建者/拥有者 ---------------\n"
-#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:288 sys-utils/ipcs.c:295
-#: sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:283 sys-utils/ipcs.c:289 sys-utils/ipcs.c:296
+#: sys-utils/ipcs.c:302
msgid "shmid"
msgstr "shmid"
-#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:301 sys-utils/ipcs.c:406
-#: sys-utils/ipcs.c:421 sys-utils/ipcs.c:508 sys-utils/ipcs.c:526
+#: sys-utils/ipcs.c:283 sys-utils/ipcs.c:302 sys-utils/ipcs.c:407
+#: sys-utils/ipcs.c:422 sys-utils/ipcs.c:509 sys-utils/ipcs.c:527
msgid "perms"
msgstr "权限"
-#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:406 sys-utils/ipcs.c:508
+#: sys-utils/ipcs.c:283 sys-utils/ipcs.c:407 sys-utils/ipcs.c:509
msgid "cuid"
msgstr "cuid"
-#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:406 sys-utils/ipcs.c:508
+#: sys-utils/ipcs.c:283 sys-utils/ipcs.c:407 sys-utils/ipcs.c:509
msgid "cgid"
msgstr "cgid"
-#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:406 sys-utils/ipcs.c:508
+#: sys-utils/ipcs.c:283 sys-utils/ipcs.c:407 sys-utils/ipcs.c:509
msgid "uid"
msgstr "uid"
-#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:406 sys-utils/ipcs.c:508
+#: sys-utils/ipcs.c:283 sys-utils/ipcs.c:407 sys-utils/ipcs.c:509
msgid "gid"
msgstr "gid"
-#: sys-utils/ipcs.c:286
+#: sys-utils/ipcs.c:287
#, c-format
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr "------------ 共享内存 附加/脱离/更改 时间 --------------\n"
-#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:295 sys-utils/ipcs.c:301
-#: sys-utils/ipcs.c:412 sys-utils/ipcs.c:421 sys-utils/ipcs.c:514
-#: sys-utils/ipcs.c:520 sys-utils/ipcs.c:526
+#: sys-utils/ipcs.c:289 sys-utils/ipcs.c:296 sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:413 sys-utils/ipcs.c:422 sys-utils/ipcs.c:515
+#: sys-utils/ipcs.c:521 sys-utils/ipcs.c:527
msgid "owner"
msgstr "拥有者"
-#: sys-utils/ipcs.c:288
+#: sys-utils/ipcs.c:289
msgid "attached"
msgstr "已附加"
-#: sys-utils/ipcs.c:288
+#: sys-utils/ipcs.c:289
msgid "detached"
msgstr "已断开"
-#: sys-utils/ipcs.c:289
+#: sys-utils/ipcs.c:290
msgid "changed"
msgstr "已更改"
-#: sys-utils/ipcs.c:293
+#: sys-utils/ipcs.c:294
#, c-format
msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
msgstr "-------- 共享内存 创建者/上次修改者 PID ----------\n"
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:296
msgid "cpid"
msgstr "cpid"
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:296
msgid "lpid"
msgstr "lpid"
-#: sys-utils/ipcs.c:299
+#: sys-utils/ipcs.c:300
#, c-format
msgid "------ Shared Memory Segments --------\n"
msgstr "------------ 共享内存段 --------------\n"
-#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:526
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:422 sys-utils/ipcs.c:527
msgid "key"
msgstr "键"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:527
-msgid "size"
-msgstr "大小"
-
-#: sys-utils/ipcs.c:302 sys-utils/prlimit.c:75 sys-utils/prlimit.c:76
-#: sys-utils/prlimit.c:78 sys-utils/prlimit.c:79 sys-utils/prlimit.c:81
-#: sys-utils/prlimit.c:82 sys-utils/prlimit.c:86 sys-utils/prlimit.c:90
+#: 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 "bytes"
msgstr "字节"
-#: sys-utils/ipcs.c:303
+#: sys-utils/ipcs.c:304
msgid "nattch"
msgstr "连接数"
-#: sys-utils/ipcs.c:303
+#: sys-utils/ipcs.c:304
msgid "status"
msgstr "状态"
-#: sys-utils/ipcs.c:327 sys-utils/ipcs.c:329 sys-utils/ipcs.c:331
-#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:551
-#: sys-utils/ipcs.c:553 sys-utils/ipcs.c:555 sys-utils/ipcs.c:608
-#: sys-utils/ipcs.c:610 sys-utils/ipcs.c:639 sys-utils/ipcs.c:641
-#: sys-utils/ipcs.c:643 sys-utils/ipcs.c:667
+#: sys-utils/ipcs.c:328 sys-utils/ipcs.c:330 sys-utils/ipcs.c:332
+#: sys-utils/ipcs.c:445 sys-utils/ipcs.c:447 sys-utils/ipcs.c:552
+#: sys-utils/ipcs.c:554 sys-utils/ipcs.c:556 sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:611 sys-utils/ipcs.c:640 sys-utils/ipcs.c:642
+#: sys-utils/ipcs.c:644 sys-utils/ipcs.c:668
msgid "Not set"
msgstr "未设置"
-#: sys-utils/ipcs.c:357 sys-utils/lsipc.c:1007 sys-utils/lsipc.c:1013
+#: sys-utils/ipcs.c:358 sys-utils/lsipc.c:1012 sys-utils/lsipc.c:1018
msgid "dest"
msgstr "目标"
-#: sys-utils/ipcs.c:358 sys-utils/lsipc.c:1008 sys-utils/lsipc.c:1021
+#: sys-utils/ipcs.c:359 sys-utils/lsipc.c:1013 sys-utils/lsipc.c:1026
msgid "locked"
msgstr "已锁定"
-#: sys-utils/ipcs.c:377
+#: sys-utils/ipcs.c:378
#, c-format
msgid "unable to fetch semaphore limits\n"
msgstr "无法获取信号量限制\n"
-#: sys-utils/ipcs.c:380
+#: sys-utils/ipcs.c:381
#, c-format
msgid "------ Semaphore Limits --------\n"
msgstr "--------- 信号量限制 -----------\n"
-#: sys-utils/ipcs.c:381
+#: sys-utils/ipcs.c:382
#, c-format
msgid "max number of arrays = %d\n"
msgstr "最大数组数量 = %d\n"
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:383
#, c-format
msgid "max semaphores per array = %d\n"
msgstr "每个数组的最大信号量数目 = %d\n"
-#: sys-utils/ipcs.c:383
+#: sys-utils/ipcs.c:384
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr "系统最大信号量数 = %d\n"
-#: sys-utils/ipcs.c:384
+#: sys-utils/ipcs.c:385
#, c-format
msgid "max ops per semop call = %d\n"
msgstr "每次信号量调用最大操作数 = %d\n"
-#: sys-utils/ipcs.c:385
+#: sys-utils/ipcs.c:386
#, c-format
msgid "semaphore max value = %u\n"
msgstr "信号量最大值=%u\n"
-#: sys-utils/ipcs.c:394
+#: sys-utils/ipcs.c:395
#, c-format
msgid "kernel not configured for semaphores\n"
msgstr "内核未做信号量的相关配置\n"
-#: sys-utils/ipcs.c:397
+#: sys-utils/ipcs.c:398
#, c-format
msgid "------ Semaphore Status --------\n"
msgstr "--------- 信号量状态 -----------\n"
-#: sys-utils/ipcs.c:398
+#: sys-utils/ipcs.c:399
#, c-format
msgid "used arrays = %d\n"
msgstr "已使用数组 = %d\n"
-#: sys-utils/ipcs.c:399
+#: sys-utils/ipcs.c:400
#, c-format
msgid "allocated semaphores = %d\n"
msgstr "已分配信号量数 = %d\n"
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:405
#, c-format
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr "----------- 信号量数组创建者/拥有者 ------------\n"
-#: sys-utils/ipcs.c:406 sys-utils/ipcs.c:412 sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:407 sys-utils/ipcs.c:413 sys-utils/ipcs.c:422
msgid "semid"
msgstr "semid"
-#: sys-utils/ipcs.c:410
+#: sys-utils/ipcs.c:411
#, c-format
msgid "------ Semaphore Operation/Change Times --------\n"
msgstr "------------ 信号量 操作/更改 时间 -------------\n"
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:413
msgid "last-op"
msgstr "上一操作"
-#: sys-utils/ipcs.c:412
+#: sys-utils/ipcs.c:413
msgid "last-changed"
msgstr "上次更改"
-#: sys-utils/ipcs.c:419
+#: sys-utils/ipcs.c:420
#, c-format
msgid "------ Semaphore Arrays --------\n"
msgstr "--------- 信号量数组 -----------\n"
-#: sys-utils/ipcs.c:421
+#: sys-utils/ipcs.c:422
msgid "nsems"
msgstr "nsems"
-#: sys-utils/ipcs.c:478
+#: sys-utils/ipcs.c:479
#, c-format
msgid "unable to fetch message limits\n"
msgstr "无法获取消息限制\n"
-#: sys-utils/ipcs.c:481
+#: sys-utils/ipcs.c:482
#, c-format
msgid "------ Messages Limits --------\n"
msgstr "---------- 消息限制 -----------\n"
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:483
#, c-format
msgid "max queues system wide = %d\n"
msgstr "系统最大队列数量 = %d\n"
-#: sys-utils/ipcs.c:484
+#: sys-utils/ipcs.c:485
msgid "max size of message"
msgstr "最大消息尺寸"
-#: sys-utils/ipcs.c:486
+#: sys-utils/ipcs.c:487
msgid "default max size of queue"
msgstr "默认的队列最大尺寸"
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:494
#, c-format
msgid "kernel not configured for message queues\n"
msgstr "内核未做消息的相关配置\n"
-#: sys-utils/ipcs.c:496
+#: sys-utils/ipcs.c:497
#, c-format
msgid "------ Messages Status --------\n"
msgstr "---------- 消息状态 -----------\n"
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:499
#, c-format
msgid "allocated queues = %d\n"
msgstr "已分配队列数 = %d\n"
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:500
#, c-format
msgid "used headers = %d\n"
msgstr "已用消息头(header)数 = %d\n"
-#: sys-utils/ipcs.c:501
+#: sys-utils/ipcs.c:502
msgid "used space"
msgstr "已用空间"
-#: sys-utils/ipcs.c:502
+#: sys-utils/ipcs.c:503
msgid " bytes\n"
msgstr " 字节\n"
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:507
#, c-format
msgid "------ Message Queues Creators/Owners --------\n"
msgstr "---------- 消息队列 创建者/拥有者 ------------\n"
-#: sys-utils/ipcs.c:508 sys-utils/ipcs.c:514 sys-utils/ipcs.c:520
-#: sys-utils/ipcs.c:526
+#: sys-utils/ipcs.c:509 sys-utils/ipcs.c:515 sys-utils/ipcs.c:521
+#: sys-utils/ipcs.c:527
msgid "msqid"
msgstr "msqid"
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:513
#, c-format
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr "----------- 消息队列 发送/接收/更改 时间 ------------\n"
-#: sys-utils/ipcs.c:514
+#: sys-utils/ipcs.c:515
msgid "send"
msgstr "发送"
-#: sys-utils/ipcs.c:514
+#: sys-utils/ipcs.c:515
msgid "recv"
msgstr "接收"
-#: sys-utils/ipcs.c:514
+#: sys-utils/ipcs.c:515
msgid "change"
msgstr "更改"
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:519
#, c-format
msgid "------ Message Queues PIDs --------\n"
msgstr "--------- 消息队列 PID -----------\n"
-#: sys-utils/ipcs.c:520
+#: sys-utils/ipcs.c:521
msgid "lspid"
msgstr "lspid"
-#: sys-utils/ipcs.c:520
+#: sys-utils/ipcs.c:521
msgid "lrpid"
msgstr "lrpid"
-#: sys-utils/ipcs.c:524
+#: sys-utils/ipcs.c:525
#, c-format
msgid "------ Message Queues --------\n"
msgstr "--------- 消息队列 -----------\n"
-#: sys-utils/ipcs.c:527
+#: sys-utils/ipcs.c:528
msgid "used-bytes"
msgstr "已用字节数"
-#: sys-utils/ipcs.c:528
+#: sys-utils/ipcs.c:529
msgid "messages"
msgstr "消息"
-#: sys-utils/ipcs.c:592 sys-utils/ipcs.c:622 sys-utils/ipcs.c:655
-#: sys-utils/lsipc.c:554 sys-utils/lsipc.c:746 sys-utils/lsipc.c:909
+#: sys-utils/ipcs.c:593 sys-utils/ipcs.c:623 sys-utils/ipcs.c:656
+#: sys-utils/lsipc.c:559 sys-utils/lsipc.c:751 sys-utils/lsipc.c:914
#, c-format
msgid "id %d not found"
msgstr "找不到 id %d"
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:597
#, c-format
msgid ""
"\n"
"\n"
"共享内存段 shmid=%d\n"
-#: sys-utils/ipcs.c:597
+#: sys-utils/ipcs.c:598
#, c-format
msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
msgstr "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
-#: sys-utils/ipcs.c:600
+#: sys-utils/ipcs.c:601
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr "模式=%#o\t访问权限=%#o\n"
-#: sys-utils/ipcs.c:602
+#: sys-utils/ipcs.c:603
msgid "size="
msgstr "大小="
-#: sys-utils/ipcs.c:602
+#: sys-utils/ipcs.c:603
msgid "bytes="
msgstr "字节数="
-#: sys-utils/ipcs.c:604
+#: sys-utils/ipcs.c:605
#, c-format
msgid "lpid=%u\tcpid=%u\tnattch=%jd\n"
msgstr "lpid=%u\tcpid=%u\tnattch=%jd\n"
-#: sys-utils/ipcs.c:607
+#: sys-utils/ipcs.c:608
#, c-format
msgid "att_time=%-26.24s\n"
msgstr "附加时间=%-26.24s\n"
-#: sys-utils/ipcs.c:609
+#: sys-utils/ipcs.c:610
#, c-format
msgid "det_time=%-26.24s\n"
msgstr "脱离时间=%-26.24s\n"
-#: sys-utils/ipcs.c:611 sys-utils/ipcs.c:642
+#: sys-utils/ipcs.c:612 sys-utils/ipcs.c:643
#, c-format
msgid "change_time=%-26.24s\n"
msgstr "更改时间=%-26.24s\n"
-#: sys-utils/ipcs.c:626
+#: sys-utils/ipcs.c:627
#, c-format
msgid ""
"\n"
"\n"
"消息队列 msqid=%d\n"
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:628
#, c-format
msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
msgstr "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\t模式=%#o\n"
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:632
msgid "csize="
msgstr "csize="
-#: sys-utils/ipcs.c:631
+#: sys-utils/ipcs.c:632
msgid "cbytes="
msgstr "cbytes="
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:634
msgid "qsize="
msgstr "qsize="
-#: sys-utils/ipcs.c:633
+#: sys-utils/ipcs.c:634
msgid "qbytes="
msgstr "qbytes="
-#: sys-utils/ipcs.c:638
+#: sys-utils/ipcs.c:639
#, c-format
msgid "send_time=%-26.24s\n"
msgstr "发送时间=%-26.24s\n"
-#: sys-utils/ipcs.c:640
+#: sys-utils/ipcs.c:641
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr "接收时间=%-26.24s\n"
-#: sys-utils/ipcs.c:659
+#: sys-utils/ipcs.c:660
#, c-format
msgid ""
"\n"
"\n"
"信号量数组 semid=%d\n"
-#: sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:661
#, c-format
msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
msgstr "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
-#: sys-utils/ipcs.c:663
+#: sys-utils/ipcs.c:664
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr "模式=%#o，访问权限=%#o\n"
-#: sys-utils/ipcs.c:665
+#: sys-utils/ipcs.c:666
#, c-format
msgid "nsems = %ju\n"
msgstr "nsems = %ju\n"
-#: sys-utils/ipcs.c:666
+#: sys-utils/ipcs.c:667
#, c-format
msgid "otime = %-26.24s\n"
msgstr "otime = %-26.24s\n"
-#: sys-utils/ipcs.c:668
+#: sys-utils/ipcs.c:669
#, c-format
msgid "ctime = %-26.24s\n"
msgstr "ctime = %-26.24s\n"
-#: sys-utils/ipcs.c:671
+#: sys-utils/ipcs.c:672
msgid "semnum"
msgstr "semnum"
-#: sys-utils/ipcs.c:671
+#: sys-utils/ipcs.c:672
msgid "value"
msgstr "值"
-#: sys-utils/ipcs.c:671
+#: sys-utils/ipcs.c:672
msgid "ncount"
msgstr "ncount"
-#: sys-utils/ipcs.c:671
+#: sys-utils/ipcs.c:672
msgid "zcount"
msgstr "zcount"
-#: sys-utils/ipcs.c:671
+#: sys-utils/ipcs.c:672
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:443 sys-utils/lsmem.c:689
-#: sys-utils/lsns.c:847
+#: 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:779
+#: sys-utils/irq-common.c:173 sys-utils/lsns.c:1037
msgid "failed to add line to output"
msgstr "向输出添加行出错"
-#: sys-utils/irq-common.c:401
+#: sys-utils/irq-common.c:416
#, fuzzy
+#| msgid "unsupported color mode"
msgid "unsupported column name to sort output"
msgstr "不支持的颜色模式"
-#: sys-utils/irq-common.c:451
+#: sys-utils/irq-common.c:468
#, fuzzy
+#| msgid "interrupts"
msgid "cpu-interrupts"
msgstr "中断"
-#: sys-utils/irq-common.c:483
+#: sys-utils/irq-common.c:504
#, no-c-format
msgid "%delta:"
msgstr ""
-#: sys-utils/irqtop.c:123
+#: sys-utils/irqtop.c:139
#, c-format
msgid ""
"irqtop | total: %ld delta: %ld | %s | %s\n"
"\n"
msgstr ""
-#: sys-utils/irqtop.c:169
+#: sys-utils/irqtop.c:187
msgid "cannot not create timerfd"
msgstr "无法创建 timerfd"
-#: sys-utils/irqtop.c:171
+#: sys-utils/irqtop.c:189
msgid "cannot set timerfd"
msgstr "无法设置 timerfd"
-#: sys-utils/irqtop.c:176 sys-utils/irqtop.c:194 sys-utils/irqtop.c:199
+#: 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:179
+#: sys-utils/irqtop.c:197
msgid "sigfillset failed"
msgstr "sigfillset 失败"
-#: sys-utils/irqtop.c:181
+#: sys-utils/irqtop.c:199
msgid "sigprocmask failed"
msgstr "sigprocmask 失败"
-#: sys-utils/irqtop.c:189
+#: sys-utils/irqtop.c:207
msgid "cannot not create signalfd"
msgstr "无法创建 signalfd"
-#: sys-utils/irqtop.c:247
+#: sys-utils/irqtop.c:265
msgid "Interactive utility to display kernel interrupt information."
msgstr ""
-#: sys-utils/irqtop.c:250
+#: sys-utils/irqtop.c:268
+msgid " -c, --cpu-stat <mode> show per-cpu stat (auto, enable, disable)\n"
+msgstr ""
+
+#: 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:252 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:253 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:257
+#: sys-utils/irqtop.c:277
msgid ""
"\n"
"The following interactive key commands are valid:\n"
msgstr ""
-#: sys-utils/irqtop.c:258
+#: sys-utils/irqtop.c:278
msgid " i sort by IRQ\n"
msgstr ""
-#: sys-utils/irqtop.c:259
+#: sys-utils/irqtop.c:279
msgid " t sort by TOTAL\n"
msgstr ""
-#: sys-utils/irqtop.c:260
+#: sys-utils/irqtop.c:280
msgid " d sort by DELTA\n"
msgstr ""
-#: sys-utils/irqtop.c:261
+#: sys-utils/irqtop.c:281
msgid " n sort by NAME\n"
msgstr ""
-#: sys-utils/irqtop.c:262
+#: sys-utils/irqtop.c:282
msgid " q Q quit program\n"
msgstr ""
-#: sys-utils/irqtop.c:295
+#: sys-utils/irqtop.c:320
+#, fuzzy, c-format
+#| msgid "unsupported mode name: '%s'"
+msgid "unsupported mode '%s'"
+msgstr "不支持的模式名称：“%s”"
+
+#: sys-utils/irqtop.c:342
#, fuzzy
+#| msgid "failed to parse argument"
msgid "failed to parse delay argument"
msgstr "解析参数失败"
-#: sys-utils/irqtop.c:352
+#: sys-utils/irqtop.c:399
msgid "terminal setting retrieval"
msgstr ""
-#: sys-utils/ldattach.c:183
+#: sys-utils/ldattach.c:184
msgid "invalid iflag"
msgstr "无效的 iflag"
-#: sys-utils/ldattach.c:199
+#: sys-utils/ldattach.c:200
#, c-format
msgid " %s [options] <ldisc> <device>\n"
msgstr " %s [选项] <线路规则> <设备>\n"
-#: sys-utils/ldattach.c:202
+#: sys-utils/ldattach.c:203
msgid "Attach a line discipline to a serial line.\n"
msgstr "向串口线附加一条线路规则。\n"
-#: sys-utils/ldattach.c:205
+#: sys-utils/ldattach.c:206
msgid " -d, --debug print verbose messages to stderr\n"
msgstr " -d, --debug 向标准错误打印详尽消息\n"
-#: sys-utils/ldattach.c:206
+#: sys-utils/ldattach.c:207
msgid " -s, --speed <value> set serial line speed\n"
msgstr " -s, --speed <值> 设置串口线速度\n"
-#: sys-utils/ldattach.c:207
+#: sys-utils/ldattach.c:208
msgid " -c, --intro-command <string> intro sent before ldattach\n"
msgstr " -c, --intro-command <字符串> 先发送 intro 后发送 ldattach\n"
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:209
msgid " -p, --pause <seconds> pause between intro and ldattach\n"
msgstr " -p, --pause <秒数> 在 intro 和 ldattach 之间暂停\n"
-#: sys-utils/ldattach.c:209
+#: sys-utils/ldattach.c:210
msgid " -7, --sevenbits set character size to 7 bits\n"
msgstr " -7, --sevenbits 字节大小设为 7 位\n"
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:211
msgid " -8, --eightbits set character size to 8 bits\n"
msgstr " -8, --eightbits 字节大小设为 8 位\n"
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:212
msgid " -n, --noparity set parity to none\n"
msgstr " -n, --noparity 设为无校验位\n"
-#: sys-utils/ldattach.c:212
+#: sys-utils/ldattach.c:213
msgid " -e, --evenparity set parity to even\n"
msgstr " -e, --evenparity 设为奇检验\n"
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:214
msgid " -o, --oddparity set parity to odd\n"
msgstr " -o, --oddparity 设为偶检验\n"
-#: sys-utils/ldattach.c:214
+#: sys-utils/ldattach.c:215
msgid " -1, --onestopbit set stop bits to one\n"
msgstr " -1, --onestopbit 停止位设为 1\n"
-#: sys-utils/ldattach.c:215
+#: sys-utils/ldattach.c:216
msgid " -2, --twostopbits set stop bits to two\n"
msgstr " -2, --twostopbits 停止位设为 2\n"
-#: sys-utils/ldattach.c:216
+#: sys-utils/ldattach.c:217
msgid " -i, --iflag [-]<iflag> set input mode flag\n"
msgstr " -i, --iflag [-]<iflag> 设置输入模式标志\n"
-#: sys-utils/ldattach.c:221
+#: sys-utils/ldattach.c:222
msgid ""
"\n"
"Known <ldisc> names:\n"
"\n"
"已知<线路规则>名称：\n"
-#: sys-utils/ldattach.c:225
+#: sys-utils/ldattach.c:226
msgid ""
"\n"
"Known <iflag> names:\n"
"\n"
"已知<iflag>名称：\n"
-#: sys-utils/ldattach.c:343
+#: sys-utils/ldattach.c:344
msgid "invalid speed argument"
msgstr "无效的 速度 参数"
-#: sys-utils/ldattach.c:346
+#: sys-utils/ldattach.c:347
msgid "invalid pause argument"
msgstr "无效的暂停参数"
-#: sys-utils/ldattach.c:373
+#: sys-utils/ldattach.c:374
msgid "invalid line discipline argument"
msgstr "无效的 线路规则 参数"
-#: sys-utils/ldattach.c:393
+#: sys-utils/ldattach.c:394
#, c-format
msgid "%s is not a serial line"
msgstr "%s 不是串行线"
-#: sys-utils/ldattach.c:400
+#: sys-utils/ldattach.c:401
#, c-format
msgid "cannot get terminal attributes for %s"
msgstr "无法获取 %s 的终端属性"
-#: sys-utils/ldattach.c:403
+#: sys-utils/ldattach.c:404
#, c-format
msgid "speed %d unsupported"
msgstr "不支持速度 %d"
-#: sys-utils/ldattach.c:452
+#: sys-utils/ldattach.c:453
#, c-format
msgid "cannot set terminal attributes for %s"
msgstr "无法设置 %s 的终端属性"
-#: sys-utils/ldattach.c:462
+#: sys-utils/ldattach.c:463
#, c-format
msgid "cannot write intro command to %s"
msgstr "无法向 %s 写入 intro 命令"
-#: sys-utils/ldattach.c:472
+#: sys-utils/ldattach.c:473
msgid "cannot set line discipline"
msgstr "无法设置行规则"
-#: sys-utils/ldattach.c:482
+#: sys-utils/ldattach.c:483
msgid "cannot daemonize"
msgstr "无法转为守护进程"
#: sys-utils/losetup.c:83
#, fuzzy
+#| msgid "logical sector size"
msgid "logical sector size in bytes"
msgstr "逻辑扇区大小"
#: sys-utils/losetup.c:422
#, fuzzy
+#| msgid " -b, --sector-size <size> physical and logical sector size\n"
msgid " -b, --sector-size <num> set the logical sector size to <num>\n"
msgstr " -b, --sectors-size <大小> 显示扇区计数和大小\n"
#: sys-utils/losetup.c:435
#, fuzzy
+#| msgid " -O, --output-all output all columns\n"
msgid " --output-all output all columns\n"
msgstr " -O, --output-all 输出所有列\n"
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:805
-#: sys-utils/losetup.c:819 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:816
+#: sys-utils/losetup.c:820
msgid "no loop device specified"
msgstr "未指定回环设备"
-#: sys-utils/losetup.c:831
+#: sys-utils/losetup.c:835
#, c-format
msgid "the options %s are allowed during loop device setup only"
msgstr "选项 %s 只允许在设置回环设备时使用"
-#: sys-utils/losetup.c:836
+#: 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:907
+#: sys-utils/losetup.c:908
#, c-format
msgid "%s: set direct io failed"
msgstr "%s︰ 设置直接 io 失败"
-#: sys-utils/losetup.c:913
+#: 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:139
+#: sys-utils/lscpu.c:144
msgid "crude measurement of CPU speed"
msgstr ""
-#: sys-utils/lscpu.c:140
+#: sys-utils/lscpu.c:145
msgid "logical CPU number"
msgstr "逻辑 CPU 数量"
-#: sys-utils/lscpu.c:141
+#: sys-utils/lscpu.c:146
msgid "logical core number"
msgstr "逻辑核心数量"
-#: sys-utils/lscpu.c:142
+#: sys-utils/lscpu.c:147
#, fuzzy
+#| msgid "logical core number"
msgid "logical cluster number"
msgstr "逻辑核心数量"
-#: sys-utils/lscpu.c:143
+#: sys-utils/lscpu.c:148
msgid "logical socket number"
msgstr "逻辑(CPU)座数量"
-#: sys-utils/lscpu.c:144
+#: sys-utils/lscpu.c:149
msgid "logical NUMA node number"
msgstr "逻辑 NUMA 节点数量"
-#: sys-utils/lscpu.c:145
+#: sys-utils/lscpu.c:150
msgid "logical book number"
msgstr "逻辑 book 数"
-#: sys-utils/lscpu.c:146
+#: sys-utils/lscpu.c:151
msgid "logical drawer number"
msgstr "逻辑抽屉号"
-#: sys-utils/lscpu.c:147
+#: sys-utils/lscpu.c:152
msgid "shows how caches are shared between CPUs"
msgstr "显示 CPU 间是如何共享缓存的"
-#: sys-utils/lscpu.c:148
+#: sys-utils/lscpu.c:153
msgid "CPU dispatching mode on virtual hardware"
msgstr "虚拟硬件上的 CPU 调度模式"
-#: sys-utils/lscpu.c:149
+#: sys-utils/lscpu.c:154
msgid "physical address of a CPU"
msgstr "CPU 的物理地址"
-#: sys-utils/lscpu.c:150
+#: sys-utils/lscpu.c:155
msgid "shows if the hypervisor has allocated the CPU"
msgstr "显示超级监督(hypervisor)是否分配了 CPU"
-#: sys-utils/lscpu.c:151
+#: sys-utils/lscpu.c:156
msgid "shows if Linux currently makes use of the CPU"
msgstr "显示 Linux 当前是否在使用该 CPU"
-#: sys-utils/lscpu.c:152
+#: 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:153
+#: sys-utils/lscpu.c:158
+msgid "shows scaling percentage of the CPU frequency"
+msgstr ""
+
+#: sys-utils/lscpu.c:159
msgid "shows the maximum MHz of the CPU"
msgstr "显示 CPU 的最大 MHz"
-#: sys-utils/lscpu.c:154
+#: sys-utils/lscpu.c:160
msgid "shows the minimum MHz of the CPU"
msgstr "显示 CPU 的最小 MHz"
-#: sys-utils/lscpu.c:159
+#: 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:160
+#: sys-utils/lscpu.c:167
msgid "cache level"
msgstr "缓存等级"
-#: sys-utils/lscpu.c:161
+#: sys-utils/lscpu.c:168
msgid "cache name"
msgstr "缓存名称"
-#: sys-utils/lscpu.c:162
+#: sys-utils/lscpu.c:169
#, fuzzy
+#| msgid "size of the device"
msgid "size of one cache"
msgstr "磁盘容量"
-#: sys-utils/lscpu.c:163
+#: sys-utils/lscpu.c:170
msgid "cache type"
msgstr "缓存类型"
-#: sys-utils/lscpu.c:164
+#: sys-utils/lscpu.c:171
msgid "ways of associativity"
msgstr ""
-#: sys-utils/lscpu.c:165
+#: sys-utils/lscpu.c:172
msgid "allocation policy"
msgstr ""
-#: sys-utils/lscpu.c:166
+#: sys-utils/lscpu.c:173
msgid "write policy"
msgstr "写策略"
-#: sys-utils/lscpu.c:167
+#: sys-utils/lscpu.c:174
#, fuzzy
-msgid "number of physical cache line per cache t"
+#| msgid "Number of physical cylinders"
+msgid "number of physical cache line per cache tag"
msgstr "物理柱面数"
-#: sys-utils/lscpu.c:168
+#: sys-utils/lscpu.c:175
msgid "number of sets in the cache; set lines has the same cache index"
msgstr ""
-#: sys-utils/lscpu.c:169
+#: sys-utils/lscpu.c:176
msgid "minimum amount of data in bytes transferred from memory to cache"
msgstr ""
-#: sys-utils/lscpu.c:220
+#: 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:227
+#: sys-utils/lscpu.c:243
msgid "failed to initialize procfs handler"
msgstr "%s：初始化 procfs 处理函数失败"
-#: sys-utils/lscpu.c:409 sys-utils/lscpu.c:419
+#: sys-utils/lscpu.c:336
msgid "Y"
msgstr "Y"
-#: sys-utils/lscpu.c:409 sys-utils/lscpu.c:419
+#: sys-utils/lscpu.c:336
msgid "N"
msgstr "N"
-#: sys-utils/lscpu.c:645
+#: sys-utils/lscpu.c:677
#, fuzzy, c-format
+#| msgid ""
+#| "# The following is the parsable format, which can be fed to other\n"
+#| "# programs. Each different item in every column has an unique ID\n"
+#| "# starting from zero.\n"
msgid ""
"# The following is the parsable format, which can be fed to other\n"
"# programs. Each different item in every column has an unique ID\n"
"# 以下是可解析格式，可以输给其他程序。每列中的各个不同项有一个惟一\n"
"# 的从 0 开始的 ID。\n"
-#: sys-utils/lscpu.c:843
+#: sys-utils/lscpu.c:880
msgid "Model name:"
msgstr "型号名称："
-#: sys-utils/lscpu.c:845
-#, fuzzy
+#: sys-utils/lscpu.c:882
msgid "BIOS Model name:"
-msgstr "型号名称："
+msgstr "BIOS 型号名称："
-#: sys-utils/lscpu.c:847
+#: sys-utils/lscpu.c:884
+#, fuzzy
+#| msgid "CPU family:"
+msgid "BIOS CPU family:"
+msgstr "CPU 系列："
+
+#: sys-utils/lscpu.c:886
msgid "Machine type:"
msgstr "机器类型︰"
-#: sys-utils/lscpu.c:849
+#: sys-utils/lscpu.c:888
msgid "CPU family:"
msgstr "CPU 系列："
-#: sys-utils/lscpu.c:851
+#: sys-utils/lscpu.c:890
msgid "Model:"
msgstr "型号："
-#: sys-utils/lscpu.c:853
+#: sys-utils/lscpu.c:892
msgid "Thread(s) per core:"
msgstr "每个核的线程数："
-#: sys-utils/lscpu.c:855
+#: sys-utils/lscpu.c:894
#, fuzzy
+#| msgid "Core(s) per socket:"
msgid "Core(s) per cluster:"
msgstr "每个座的核数："
-#: sys-utils/lscpu.c:857
+#: sys-utils/lscpu.c:896
msgid "Core(s) per socket:"
msgstr "每个座的核数："
-#: sys-utils/lscpu.c:860
+#: sys-utils/lscpu.c:899
msgid "Socket(s) per book:"
msgstr "每个 book 的座数："
-#: sys-utils/lscpu.c:862
+#: sys-utils/lscpu.c:901
msgid "Book(s) per drawer:"
msgstr "每个抽屉里的 Book 数︰"
-#: sys-utils/lscpu.c:863
+#: sys-utils/lscpu.c:902
msgid "Drawer(s):"
msgstr "抽屉："
-#: sys-utils/lscpu.c:865
+#: sys-utils/lscpu.c:904
msgid "Book(s):"
msgstr "Book："
-#: sys-utils/lscpu.c:869 sys-utils/lscpu.c:871 sys-utils/lscpu.c:876
+#: sys-utils/lscpu.c:908 sys-utils/lscpu.c:910 sys-utils/lscpu.c:915
msgid "Socket(s):"
msgstr "座："
-#: sys-utils/lscpu.c:873
+#: sys-utils/lscpu.c:912
msgid "Cluster(s):"
msgstr ""
-#: sys-utils/lscpu.c:881
+#: sys-utils/lscpu.c:920
msgid "Stepping:"
msgstr "步进："
-#: sys-utils/lscpu.c:883
+#: sys-utils/lscpu.c:922
#, fuzzy
+#| msgid "FreeBSD boot"
msgid "Frequency boost:"
msgstr "FreeBSD 启动"
-#: sys-utils/lscpu.c:884
+#: sys-utils/lscpu.c:923
#, fuzzy
+#| msgid "Unusable"
msgid "enabled"
msgstr "不可用"
-#: sys-utils/lscpu.c:884
+#: sys-utils/lscpu.c:923
#, fuzzy
+#| msgid "CPU %u disabled\n"
msgid "disabled"
msgstr "CPU %u 已禁用\n"
-#: sys-utils/lscpu.c:888
+#: sys-utils/lscpu.c:927
msgid "CPU dynamic MHz:"
msgstr "CPU 动态 MHz:"
-#: sys-utils/lscpu.c:890
+#: sys-utils/lscpu.c:929
msgid "CPU static MHz:"
msgstr "CPU 静态 MHz:"
-#: sys-utils/lscpu.c:893
+#: sys-utils/lscpu.c:934
+#, fuzzy
+#| msgid "CPU min MHz:"
+msgid "CPU(s) scaling MHz:"
+msgstr "CPU 最小 MHz："
+
+#: sys-utils/lscpu.c:935
msgid "CPU max MHz:"
msgstr "CPU 最大 MHz："
-#: sys-utils/lscpu.c:894
+#: sys-utils/lscpu.c:936
msgid "CPU min MHz:"
msgstr "CPU 最小 MHz："
-#: sys-utils/lscpu.c:897
+#: sys-utils/lscpu.c:939
msgid "BogoMIPS:"
msgstr "BogoMIPS："
-#: sys-utils/lscpu.c:900
+#: sys-utils/lscpu.c:942
msgid "Dispatching mode:"
msgstr "分派模式："
-#: sys-utils/lscpu.c:903
+#: sys-utils/lscpu.c:945
msgid "Physical sockets:"
msgstr "物理套接字︰"
-#: sys-utils/lscpu.c:904
+#: sys-utils/lscpu.c:946
msgid "Physical chips:"
msgstr "物理芯片︰"
-#: sys-utils/lscpu.c:905
+#: sys-utils/lscpu.c:947
msgid "Physical cores/chip:"
msgstr "物理核心/芯片︰"
-#: sys-utils/lscpu.c:909
+#: sys-utils/lscpu.c:951
msgid "Flags:"
msgstr "标记："
-#: sys-utils/lscpu.c:954
+#: sys-utils/lscpu.c:995
msgid "Architecture:"
msgstr "架构："
-#: sys-utils/lscpu.c:967
+#: sys-utils/lscpu.c:1008
msgid "CPU op-mode(s):"
msgstr "CPU 运行模式："
-#: sys-utils/lscpu.c:970
+#: sys-utils/lscpu.c:1011
msgid "Address sizes:"
msgstr ""
-#: sys-utils/lscpu.c:972 sys-utils/lscpu.c:974
+#: sys-utils/lscpu.c:1014 sys-utils/lscpu.c:1016
msgid "Byte Order:"
msgstr "字节序："
-#: sys-utils/lscpu.c:978
+#: sys-utils/lscpu.c:1019
msgid "CPU(s):"
msgstr "CPU:"
-#: sys-utils/lscpu.c:982
+#: sys-utils/lscpu.c:1023
msgid "On-line CPU(s) mask:"
msgstr "在线 CPU 掩码："
-#: sys-utils/lscpu.c:983
+#: sys-utils/lscpu.c:1024
msgid "On-line CPU(s) list:"
msgstr "在线 CPU 列表："
-#: sys-utils/lscpu.c:995
+#: sys-utils/lscpu.c:1036
msgid "failed to callocate cpu set"
msgstr "分配(callocate) CPU 组 失败"
-#: sys-utils/lscpu.c:1004
+#: sys-utils/lscpu.c:1045
msgid "Off-line CPU(s) mask:"
msgstr "离线 CPU 掩码："
-#: sys-utils/lscpu.c:1005
+#: sys-utils/lscpu.c:1046
msgid "Off-line CPU(s) list:"
msgstr "离线 CPU 列表："
-#: sys-utils/lscpu.c:1012
+#: sys-utils/lscpu.c:1053
msgid "Vendor ID:"
msgstr "厂商 ID："
-#: sys-utils/lscpu.c:1014
-#, fuzzy
+#: sys-utils/lscpu.c:1055
msgid "BIOS Vendor ID:"
-msgstr "厂商 ID："
+msgstr "BIOS 厂商 ID："
-#: sys-utils/lscpu.c:1022
+#: sys-utils/lscpu.c:1063
#, fuzzy
+#| msgid "Virtualization type:"
msgid "Virtualization features:"
msgstr "虚拟化类型："
-#: sys-utils/lscpu.c:1024 sys-utils/lscpu.c:1026
+#: sys-utils/lscpu.c:1065 sys-utils/lscpu.c:1067
msgid "Virtualization:"
msgstr "虚拟化："
-#: sys-utils/lscpu.c:1029
+#: sys-utils/lscpu.c:1070
msgid "Hypervisor:"
msgstr "超管理器："
-#: sys-utils/lscpu.c:1031
+#: sys-utils/lscpu.c:1072
msgid "Hypervisor vendor:"
msgstr "超管理器厂商："
-#: sys-utils/lscpu.c:1032
+#: sys-utils/lscpu.c:1073
msgid "Virtualization type:"
msgstr "虚拟化类型："
-#: sys-utils/lscpu.c:1055
+#: sys-utils/lscpu.c:1096
msgid "Caches (sum of all):"
msgstr ""
-#: sys-utils/lscpu.c:1059 sys-utils/lscpu.c:1089 sys-utils/lscpu.c:1121
+#: 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:1059 sys-utils/lscpu.c:1089
+#: sys-utils/lscpu.c:1100 sys-utils/lscpu.c:1130
#, c-format
msgid "%s cache:"
msgstr "%s 缓存："
-#: sys-utils/lscpu.c:1062
+#: sys-utils/lscpu.c:1103
#, c-format
msgid "%<PRIu64> (%d instance)"
msgid_plural "%<PRIu64> (%d instances)"
msgstr[0] ""
-#: sys-utils/lscpu.c:1071
+#: sys-utils/lscpu.c:1112
#, c-format
msgid "%s (%d instance)"
msgid_plural "%s (%d instances)"
msgstr[0] ""
-#: sys-utils/lscpu.c:1086
-#, fuzzy
+#: sys-utils/lscpu.c:1127
msgid "Caches:"
-msgstr "%s 缓存："
+msgstr "缓存："
-#: sys-utils/lscpu.c:1105
+#: sys-utils/lscpu.c:1146
msgid "NUMA:"
msgstr ""
-#: sys-utils/lscpu.c:1107
+#: sys-utils/lscpu.c:1148
msgid "NUMA node(s):"
msgstr "NUMA 节点："
-#: sys-utils/lscpu.c:1109
+#: sys-utils/lscpu.c:1150
#, c-format
msgid "NUMA node%d CPU(s):"
msgstr "NUMA 节点%d CPU："
-#: sys-utils/lscpu.c:1117
+#: sys-utils/lscpu.c:1158
#, fuzzy
+#| msgid "Inheritable capabilities: "
msgid "Vulnerabilities:"
msgstr "可继承的权能："
-#: sys-utils/lscpu.c:1121
+#: sys-utils/lscpu.c:1162
#, fuzzy, c-format
+#| msgid "unknown capability \"%s\""
msgid "Vulnerability %s:"
msgstr "未知权能“%s”"
-#: sys-utils/lscpu.c:1139
+#: sys-utils/lscpu.c:1180
msgid "Display information about the CPU architecture.\n"
msgstr "显示 CPU 架构信息。\n"
-#: sys-utils/lscpu.c:1142
+#: 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:1143
+#: 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:1144
+#: 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:1145
+#: 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:1146
+#: sys-utils/lscpu.c:1187
msgid " -c, --offline print offline CPUs only\n"
msgstr " -c, --offline 只打印离线 CPU\n"
-#: sys-utils/lscpu.c:1147
+#: 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:1148
+#: sys-utils/lscpu.c:1189
msgid " -e, --extended[=<list>] print out an extended readable format\n"
msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n"
-#: sys-utils/lscpu.c:1149
+#: sys-utils/lscpu.c:1190
msgid " -p, --parse[=<list>] print out a parsable format\n"
msgstr " -p, --parse[=<列表>] 打印可解析格式\n"
-#: sys-utils/lscpu.c:1150
+#: sys-utils/lscpu.c:1191
msgid " -s, --sysroot <dir> use specified directory as system root\n"
msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
-#: sys-utils/lscpu.c:1151
+#: 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:1152
+#: 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:1153
+#: 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:1157
+#: sys-utils/lscpu.c:1199
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Available columns (for -o):\n"
msgid ""
"\n"
"Available output columns for -e or -p:\n"
"\n"
"可用列(用于 -o)：\n"
-#: sys-utils/lscpu.c:1161
+#: sys-utils/lscpu.c:1203
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Available columns (for -o):\n"
msgid ""
"\n"
"Available output columns for -C:\n"
"\n"
"可用列(用于 -o)：\n"
-#: sys-utils/lscpu.c:1287
+#: 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:569
+#: sys-utils/lscpu-cputype.c:604
msgid "error: uname failed"
msgstr "错误：uname 失败"
-#: sys-utils/lscpu-cputype.c:666
+#: sys-utils/lscpu-cputype.c:711
#, c-format
msgid "failed to determine number of CPUs: %s"
msgstr "确定 CPU 数 失败：%s"
-#: sys-utils/lscpu-cputype.c:869
+#: sys-utils/lscpu-cputype.c:914
msgid "Failed to extract the node number"
msgstr "提取节点号失败"
-#: sys-utils/lscpu-virt.c:491
+#: sys-utils/lscpu-virt.c:494
#, fuzzy
+#| msgid "cannot set signal handler"
msgid "cannot restore signal handler"
msgstr "无法设置信号处理函数"
-#: sys-utils/lsipc.c:149
+#: sys-utils/lsipc.c:150
msgid "Resource key"
msgstr "资源键"
-#: sys-utils/lsipc.c:149
+#: sys-utils/lsipc.c:150
msgid "Key"
msgstr "键"
-#: sys-utils/lsipc.c:150
+#: sys-utils/lsipc.c:151
msgid "Resource ID"
msgstr "资源 ID"
-#: sys-utils/lsipc.c:150
+#: sys-utils/lsipc.c:151
msgid "ID"
msgstr "ID"
-#: sys-utils/lsipc.c:151
+#: sys-utils/lsipc.c:152
msgid "Owner's username or UID"
msgstr "拥有者的用户名或 UID"
-#: sys-utils/lsipc.c:151
+#: sys-utils/lsipc.c:152
msgid "Owner"
msgstr "拥有者"
-#: sys-utils/lsipc.c:152
+#: sys-utils/lsipc.c:153
msgid "Permissions"
msgstr "权限"
-#: sys-utils/lsipc.c:153
+#: sys-utils/lsipc.c:154
msgid "Creator UID"
msgstr " 创建者 UID"
-#: sys-utils/lsipc.c:154
+#: sys-utils/lsipc.c:155
msgid "Creator user"
msgstr " 创建者 用户"
-#: sys-utils/lsipc.c:155
+#: sys-utils/lsipc.c:156
msgid "Creator GID"
msgstr "创建者 GID"
-#: sys-utils/lsipc.c:156
+#: sys-utils/lsipc.c:157
msgid "Creator group"
msgstr "创建者组"
-#: sys-utils/lsipc.c:157
+#: sys-utils/lsipc.c:158
msgid "User ID"
msgstr "用户 ID"
-#: sys-utils/lsipc.c:157
+#: sys-utils/lsipc.c:158
msgid "UID"
msgstr "UID"
-#: sys-utils/lsipc.c:158
+#: sys-utils/lsipc.c:159
msgid "User name"
msgstr "用户名"
-#: sys-utils/lsipc.c:159
+#: sys-utils/lsipc.c:160
msgid "Group ID"
msgstr " 组 ID"
-#: sys-utils/lsipc.c:159
+#: sys-utils/lsipc.c:160
msgid "GID"
msgstr "GID"
-#: sys-utils/lsipc.c:160
+#: sys-utils/lsipc.c:161
msgid "Group name"
msgstr "组名"
-#: sys-utils/lsipc.c:161
+#: sys-utils/lsipc.c:162
msgid "Time of the last change"
msgstr "上次更改时间"
-#: sys-utils/lsipc.c:161
+#: sys-utils/lsipc.c:162
msgid "Last change"
msgstr "上次更改"
-#: sys-utils/lsipc.c:164
+#: sys-utils/lsipc.c:165
msgid "Bytes used"
msgstr "已用字节数"
-#: sys-utils/lsipc.c:165
+#: sys-utils/lsipc.c:166
msgid "Number of messages"
msgstr "消息数"
-#: sys-utils/lsipc.c:165
+#: sys-utils/lsipc.c:166
msgid "Messages"
msgstr "消息"
-#: sys-utils/lsipc.c:166
+#: sys-utils/lsipc.c:167
msgid "Time of last msg sent"
msgstr "上次发消息的时间"
-#: sys-utils/lsipc.c:166
+#: sys-utils/lsipc.c:167
msgid "Msg sent"
msgstr " 消息已发送"
-#: sys-utils/lsipc.c:167
+#: sys-utils/lsipc.c:168
msgid "Time of last msg received"
msgstr "收到上条消息的时间"
-#: sys-utils/lsipc.c:167
+#: sys-utils/lsipc.c:168
msgid "Msg received"
msgstr "消息已收到"
-#: sys-utils/lsipc.c:168
+#: sys-utils/lsipc.c:169
msgid "PID of the last msg sender"
msgstr "上条消息发送者的 PID"
-#: sys-utils/lsipc.c:168
+#: sys-utils/lsipc.c:169
msgid "Msg sender"
msgstr " 消息发送者"
-#: sys-utils/lsipc.c:169
+#: sys-utils/lsipc.c:170
msgid "PID of the last msg receiver"
msgstr "上条消息接收者的 PID"
-#: sys-utils/lsipc.c:169
+#: sys-utils/lsipc.c:170
msgid "Msg receiver"
msgstr "消息接收者"
-#: sys-utils/lsipc.c:172
+#: sys-utils/lsipc.c:173
msgid "Segment size"
msgstr "片段大小"
-#: sys-utils/lsipc.c:173
+#: sys-utils/lsipc.c:174
msgid "Number of attached processes"
msgstr "附加的进程数"
-#: sys-utils/lsipc.c:173
+#: sys-utils/lsipc.c:174
msgid "Attached processes"
msgstr "附加的进程"
-#: sys-utils/lsipc.c:174
+#: sys-utils/lsipc.c:175
msgid "Status"
msgstr "状态"
-#: sys-utils/lsipc.c:175
+#: sys-utils/lsipc.c:176
msgid "Attach time"
msgstr "附加时间"
-#: sys-utils/lsipc.c:176
+#: sys-utils/lsipc.c:177
msgid "Detach time"
msgstr "分离时间"
-#: sys-utils/lsipc.c:177
+#: sys-utils/lsipc.c:178
msgid "Creator command line"
msgstr "创建者命令行"
-#: sys-utils/lsipc.c:177
+#: sys-utils/lsipc.c:178
msgid "Creator command"
msgstr "创建者命令"
-#: sys-utils/lsipc.c:178
+#: sys-utils/lsipc.c:179
msgid "PID of the creator"
msgstr "创建者的 PID"
-#: sys-utils/lsipc.c:178
+#: sys-utils/lsipc.c:179
msgid "Creator PID"
msgstr " 创建者 PID"
-#: sys-utils/lsipc.c:179
+#: sys-utils/lsipc.c:180
msgid "PID of last user"
msgstr " 上个用户的 PID"
-#: sys-utils/lsipc.c:179
+#: sys-utils/lsipc.c:180
msgid "Last user PID"
msgstr "上一用户 PID"
-#: sys-utils/lsipc.c:182
+#: sys-utils/lsipc.c:183
msgid "Number of semaphores"
msgstr "信号量个数"
-#: sys-utils/lsipc.c:182
+#: sys-utils/lsipc.c:183
msgid "Semaphores"
msgstr "信号量"
-#: sys-utils/lsipc.c:183
+#: sys-utils/lsipc.c:184
msgid "Time of the last operation"
msgstr " 上次操作的时间"
-#: sys-utils/lsipc.c:183
+#: sys-utils/lsipc.c:184
msgid "Last operation"
msgstr "上次操作"
-#: sys-utils/lsipc.c:186
+#: sys-utils/lsipc.c:187
msgid "Resource name"
msgstr "资源名称"
-#: sys-utils/lsipc.c:186
+#: sys-utils/lsipc.c:187
msgid "Resource"
msgstr "资源"
-#: sys-utils/lsipc.c:187
+#: sys-utils/lsipc.c:188
msgid "Resource description"
msgstr "资源描述"
-#: sys-utils/lsipc.c:187
+#: sys-utils/lsipc.c:188
msgid "Description"
msgstr "描述"
-#: sys-utils/lsipc.c:188
+#: sys-utils/lsipc.c:189
msgid "Currently used"
msgstr "当前已使用"
-#: sys-utils/lsipc.c:188
+#: sys-utils/lsipc.c:189
msgid "Used"
msgstr "已使用"
-#: sys-utils/lsipc.c:189
+#: sys-utils/lsipc.c:190
msgid "Currently use percentage"
msgstr "当前使用比例"
-#: sys-utils/lsipc.c:189
+#: sys-utils/lsipc.c:190
msgid "Use"
msgstr "使用"
-#: sys-utils/lsipc.c:190
+#: sys-utils/lsipc.c:191
msgid "System-wide limit"
msgstr "系统级限制"
-#: sys-utils/lsipc.c:190
+#: sys-utils/lsipc.c:191
msgid "Limit"
msgstr "限制"
-#: sys-utils/lsipc.c:225
+#: sys-utils/lsipc.c:226
#, c-format
msgid "column %s does not apply to the specified IPC"
msgstr "列 %s 不适用于指定的 IPC"
-#: sys-utils/lsipc.c:301
+#: sys-utils/lsipc.c:302
msgid " -g, --global info about system-wide usage (may be used with -m, -q and -s)\n"
msgstr " -g, --global 有关系统范围使用量的信息(可与 -m, -q 和 -s 共用)\n"
-#: sys-utils/lsipc.c:302
+#: sys-utils/lsipc.c:303
msgid " -i, --id <id> print details on resource identified by <id>\n"
msgstr " -i, --id <id> 打印由<id>标识的资源的详细信息\n"
-#: sys-utils/lsipc.c:308
+#: sys-utils/lsipc.c:309
msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为打印 SIZE，而非易读格式\n"
-#: sys-utils/lsipc.c:309
+#: sys-utils/lsipc.c:310
msgid " -c, --creator show creator and owner\n"
msgstr " -c, --creator 显示创建者和拥有者\n"
-#: sys-utils/lsipc.c:311
+#: sys-utils/lsipc.c:312
msgid " -J, --json use the JSON output format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: sys-utils/lsipc.c:313
+#: sys-utils/lsipc.c:314
msgid " -l, --list force list output format (for example with --id)\n"
msgstr " -l, --list 强制以列表格式输出(如与 --id 共用)\n"
-#: sys-utils/lsipc.c:315
+#: sys-utils/lsipc.c:316
msgid " -P, --numeric-perms print numeric permissions (PERMS column)\n"
msgstr " -P, --numeric-perms 打印权限数值(PERMS 列)\n"
-#: sys-utils/lsipc.c:317
+#: sys-utils/lsipc.c:318
msgid " -t, --time show attach, detach and change times\n"
msgstr " -t, --time 显示附加、脱离和更改时间\n"
-#: sys-utils/lsipc.c:322
+#: sys-utils/lsipc.c:325
#, c-format
msgid ""
"\n"
"\n"
"常规选项：\n"
-#: sys-utils/lsipc.c:326
+#: sys-utils/lsipc.c:329
#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Shared-memory columns (--shmems):\n"
msgid ""
"\n"
"Shared-memory columns (--shmems):\n"
"\n"
"共享内存段 shmid=%d\n"
-#: sys-utils/lsipc.c:330
+#: sys-utils/lsipc.c:333
#, c-format
msgid ""
"\n"
"\n"
"消息队列 列(queues)：\n"
-#: sys-utils/lsipc.c:334
+#: sys-utils/lsipc.c:337
#, c-format
msgid ""
"\n"
"\n"
"信号量 列(--semaphores)：\n"
-#: sys-utils/lsipc.c:338
+#: sys-utils/lsipc.c:341
#, c-format
msgid ""
"\n"
"\n"
"摘要 列(--global)：\n"
-#: sys-utils/lsipc.c:424
+#: sys-utils/lsipc.c:429
#, c-format
msgid ""
"Elements:\n"
"元素：\n"
"\n"
-#: sys-utils/lsipc.c:704 sys-utils/lsipc.c:868 sys-utils/lsipc.c:1067
+#: sys-utils/lsipc.c:709 sys-utils/lsipc.c:873 sys-utils/lsipc.c:1072
msgid "failed to set data"
msgstr "设置数据失败"
-#: sys-utils/lsipc.c:729
+#: sys-utils/lsipc.c:734
msgid "Number of semaphore identifiers"
msgstr "信号量标识符的数量"
-#: sys-utils/lsipc.c:730
+#: sys-utils/lsipc.c:735
msgid "Total number of semaphores"
msgstr "信号量的总数"
-#: sys-utils/lsipc.c:731
+#: sys-utils/lsipc.c:736
msgid "Max semaphores per semaphore set."
msgstr "每个信号量集的最大信号量数。"
-#: sys-utils/lsipc.c:732
+#: sys-utils/lsipc.c:737
msgid "Max number of operations per semop(2)"
msgstr "每个 semop(2) 的最大操作数"
-#: sys-utils/lsipc.c:733
+#: sys-utils/lsipc.c:738
msgid "Semaphore max value"
msgstr "信号量的最大值"
-#: sys-utils/lsipc.c:893
+#: sys-utils/lsipc.c:898
msgid "Number of message queues"
msgstr "消息队列的数目"
-#: sys-utils/lsipc.c:894
+#: sys-utils/lsipc.c:899
msgid "Max size of message (bytes)"
msgstr "消息的最大尺寸(字节)"
-#: sys-utils/lsipc.c:895
+#: sys-utils/lsipc.c:900
msgid "Default max size of queue (bytes)"
msgstr "队列的默认最大尺寸(字节)"
-#: sys-utils/lsipc.c:1009 sys-utils/lsipc.c:1028
+#: sys-utils/lsipc.c:1014 sys-utils/lsipc.c:1033
msgid "hugetlb"
msgstr "hugetlb"
-#: sys-utils/lsipc.c:1010 sys-utils/lsipc.c:1035
+#: sys-utils/lsipc.c:1015 sys-utils/lsipc.c:1040
msgid "noreserve"
msgstr "noreserve"
-#: sys-utils/lsipc.c:1092
+#: sys-utils/lsipc.c:1097
msgid "Shared memory segments"
msgstr "共享内存段"
-#: sys-utils/lsipc.c:1093
+#: sys-utils/lsipc.c:1098
msgid "Shared memory pages"
msgstr "共享内存页"
-#: sys-utils/lsipc.c:1094
+#: sys-utils/lsipc.c:1099
msgid "Max size of shared memory segment (bytes)"
msgstr "共享内存段的最大尺寸(字节)"
-#: sys-utils/lsipc.c:1095
+#: sys-utils/lsipc.c:1100
msgid "Min size of shared memory segment (bytes)"
msgstr "共享内存段的最小尺寸(字节)"
-#: sys-utils/lsipc.c:1165
+#: sys-utils/lsipc.c:1171
msgid "failed to parse IPC identifier"
msgstr "解析 IPC 标识符失败"
-#: sys-utils/lsipc.c:1259
+#: sys-utils/lsipc.c:1268
msgid "--global is mutually exclusive with --creator, --id and --time"
msgstr "--global 与 --creator, --id 和 --time 互斥"
#: sys-utils/lsirq.c:60
#, fuzzy
+#| msgid "Display kernel profiling information.\n"
msgid "Utility to display kernel interrupt information."
msgstr "显示内核分析信息。\n"
#: sys-utils/lsmem.c:127
#, fuzzy
+#| msgid "size of the device"
msgid "size of the memory range"
msgstr "磁盘容量"
#: sys-utils/lsmem.c:129
#, fuzzy
+#| msgid " removable"
msgid "memory is removable"
msgstr " 可移动"
#: sys-utils/lsmem.c:131
#, fuzzy
+#| msgid "not enough memory"
msgid "numa node of memory"
msgstr "内存不足"
#: sys-utils/lsmem.c:315 sys-utils/lsmem.c:322
#, fuzzy
+#| msgid "get blocksize"
msgid "Memory block size:"
msgstr "获得块大小"
#: sys-utils/lsmem.c:316 sys-utils/lsmem.c:326
#, fuzzy
+#| msgid "max total shared memory"
msgid "Total online memory:"
msgstr "最大总共享内存"
msgid "Failed to open %s"
msgstr "打开 %s 失败"
-#: sys-utils/lsmem.c:453
+#: sys-utils/lsmem.c:462 sys-utils/lsmem.c:467
#, fuzzy
+#| msgid "failed to parse number of blocks"
msgid "failed to read memory block size"
msgstr "解析块数失败"
-#: sys-utils/lsmem.c:484
+#: sys-utils/lsmem.c:497
#, fuzzy
+#| msgid "This system does not support rescanning of CPUs"
msgid "This system does not support memory blocks"
msgstr "该系统不支持重新扫描 CPU"
-#: sys-utils/lsmem.c:509
+#: sys-utils/lsmem.c:522
msgid "List the ranges of available memory with their online status.\n"
msgstr ""
-#: sys-utils/lsmem.c:514
+#: sys-utils/lsmem.c:527
#, fuzzy
+#| msgid " -a, --all print all devices\n"
msgid " -a, --all list each individual memory block\n"
msgstr " -a, --all 打印所有设备\n"
-#: sys-utils/lsmem.c:520
+#: sys-utils/lsmem.c:533
#, fuzzy
+#| msgid " -o, --output <list> output columns\n"
msgid " -S, --split <list> split ranges by specified columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: sys-utils/lsmem.c:521
+#: sys-utils/lsmem.c:534
#, fuzzy
+#| msgid " -s, --sysroot <dir> use specified directory as system root\n"
msgid " -s, --sysroot <dir> use the specified directory as system root\n"
msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
-#: sys-utils/lsmem.c:522
+#: sys-utils/lsmem.c:535
msgid " --summary[=when] print summary information (never,always or only)\n"
msgstr ""
-#: sys-utils/lsmem.c:628
-msgid "unsupported --summary argument"
-msgstr "不支持的 --summary 参数"
-
-#: sys-utils/lsmem.c:648
+#: sys-utils/lsmem.c:661
#, fuzzy
+#| msgid "options --setgroups=allow and --map-root-user are mutually exclusive"
msgid "options --{raw,json,pairs} and --summary=only are mutually exclusive"
msgstr "--setgroups=allow 和 --map-root-user 选项是互斥的"
-#: sys-utils/lsmem.c:656
+#: sys-utils/lsmem.c:669
#, fuzzy
+#| msgid "invalid argument of -r"
msgid "invalid argument to --sysroot"
msgstr "-r 的参数无效"
-#: sys-utils/lsmem.c:704
+#: sys-utils/lsmem.c:717
msgid "Failed to initialize output column"
msgstr "初始化输出列失败"
-#: sys-utils/lsns.c:105
+#: sys-utils/lsns.c:117
msgid "namespace identifier (inode number)"
msgstr "名字空间标识符 (inode 号)"
-#: sys-utils/lsns.c:106
+#: sys-utils/lsns.c:118
msgid "kind of namespace"
msgstr "名字空间类型"
-#: sys-utils/lsns.c:107
+#: sys-utils/lsns.c:119
msgid "path to the namespace"
msgstr "名字空间路径"
-#: sys-utils/lsns.c:108
+#: sys-utils/lsns.c:120
msgid "number of processes in the namespace"
msgstr "名字空间中的进程数"
-#: sys-utils/lsns.c:109
+#: sys-utils/lsns.c:121
msgid "lowest PID in the namespace"
msgstr "名字空间中的最低 PID"
-#: sys-utils/lsns.c:110
+#: sys-utils/lsns.c:122
msgid "PPID of the PID"
msgstr "PID 的 PPID"
-#: sys-utils/lsns.c:111
+#: sys-utils/lsns.c:123
msgid "command line of the PID"
msgstr "PID 的命令行"
-#: sys-utils/lsns.c:112
+#: sys-utils/lsns.c:124
msgid "UID of the PID"
msgstr "PID 的 UID"
-#: sys-utils/lsns.c:113
+#: sys-utils/lsns.c:125
msgid "username of the PID"
msgstr "PID 的用户名"
-#: sys-utils/lsns.c:114
+#: sys-utils/lsns.c:126
msgid "namespace ID as used by network subsystem"
msgstr ""
-#: sys-utils/lsns.c:115
+#: sys-utils/lsns.c:127
msgid "nsfs mountpoint (usually used network subsystem)"
msgstr ""
-#: sys-utils/lsns.c:116
+#: sys-utils/lsns.c:128
#, fuzzy
#| msgid "namespace identifier (inode number)"
msgid "parent namespace identifier (inode number)"
msgstr "名字空间标识符 (inode 号)"
-#: sys-utils/lsns.c:117
+#: sys-utils/lsns.c:129
#, fuzzy
#| msgid "namespace identifier (inode number)"
msgid "owner namespace identifier (inode number)"
msgstr "名字空间标识符 (inode 号)"
-#: sys-utils/lsns.c:964
+#: sys-utils/lsns.c:1285
#, c-format
msgid " %s [options] [<namespace>]\n"
msgstr " %s [选项] [<名字空间>]\n"
-#: sys-utils/lsns.c:967
+#: sys-utils/lsns.c:1288
msgid "List system namespaces.\n"
msgstr "列出系统名字空间。\n"
-#: sys-utils/lsns.c:975
+#: 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:978
+#: sys-utils/lsns.c:1300
msgid " -W, --nowrap don't use multi-line representation\n"
msgstr " -W, --nowrap 不要使用多行表现\n"
-#: sys-utils/lsns.c:979
+#: 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:1073
+#: 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:1403
#, c-format
msgid "unknown namespace type: %s"
msgstr "未知的名字空间类型︰ %s"
-#: sys-utils/lsns.c:1102
+#: sys-utils/lsns.c:1423
+#, fuzzy, c-format
+#| msgid "unknown namespace type: %s"
+msgid "unknown tree type: %s"
+msgstr "未知的名字空间类型︰ %s"
+
+#: sys-utils/lsns.c:1445
msgid "--task is mutually exclusive with <namespace>"
msgstr "--task 与 <名字空间> 互斥"
-#: sys-utils/lsns.c:1103
+#: sys-utils/lsns.c:1446
msgid "invalid namespace argument"
msgstr "无效的名字空间参数"
-#: sys-utils/lsns.c:1155
+#: 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:1504
#, c-format
msgid "not found namespace: %ju"
msgstr "找不到名字空间︰ %ju"
-#: sys-utils/mount.c:67 sys-utils/umount.c:131
+#: sys-utils/mount.c:63 sys-utils/umount.c:126
#, fuzzy
+#| msgid "permission denied"
msgid "drop permissions failed."
msgstr "权限不足"
-#: sys-utils/mount.c:87 sys-utils/umount.c:65
+#: sys-utils/mount.c:83 sys-utils/umount.c:65
#, c-format
msgid "%s from %s (libmount %s"
msgstr "%s，来自 %s(libmount %s"
-#: sys-utils/mount.c:132
+#: sys-utils/mount.c:130
msgid "failed to read mtab"
msgstr "读取 mtab 失败"
-#: sys-utils/mount.c:194 sys-utils/mount.c:261 sys-utils/umount.c:205
+#: 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:195
+#: sys-utils/mount.c:193
#, c-format
msgid "%-25s: already mounted\n"
msgstr "%-25s：已经挂载\n"
-#: sys-utils/mount.c:302
+#: sys-utils/mount.c:300
#, c-format
msgid "%s: %s moved to %s.\n"
msgstr "%s：%s 已移到 %s。\n"
-#: sys-utils/mount.c:304
+#: sys-utils/mount.c:302
#, c-format
msgid "%s: %s bound on %s.\n"
msgstr "%s：%s 已绑定到 %s 。\n"
-#: sys-utils/mount.c:307 sys-utils/mount.c:311
+#: 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:309
+#: sys-utils/mount.c:307
#, c-format
msgid "%s: %s propagation flags changed.\n"
msgstr "%s：%s 传播标志已更改。\n"
-#: sys-utils/mount.c:329
+#: sys-utils/mount.c:327
#, fuzzy, c-format
+#| msgid ""
+#| "mount: %s does not contain SELinux labels.\n"
+#| " You just mounted an file system that supports labels which does not\n"
+#| " contain labels, onto an SELinux box. It is likely that confined\n"
+#| " applications will generate AVC messages and not be allowed access to\n"
+#| " this file system. For more details see restorecon(8) and mount(8).\n"
msgid ""
"mount: %s does not contain SELinux labels.\n"
" You just mounted a file system that supports labels which does not\n"
" 受限制的应用程序可能会生成 AVC 消息，并被阻止访问该文件系统。\n"
" 更多详细信息请参阅 restorecon(8) 和 mount(8)。\n"
-#: sys-utils/mount.c:387
+#: 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:388
+#, c-format
+msgid " dmesg(1) may have more information after failed mount system call.\n"
+msgstr ""
+
+#: sys-utils/mount.c:417
#, c-format
msgid "%s: failed to parse"
msgstr "%s：解析失败"
-#: sys-utils/mount.c:427
+#: sys-utils/mount.c:459
#, c-format
msgid "unsupported option format: %s"
msgstr "不支持的参数格式：%s"
-#: sys-utils/mount.c:429
+#: sys-utils/mount.c:465
#, c-format
msgid "failed to append option '%s'"
msgstr "追加选项“%s”失败"
-#: sys-utils/mount.c:447
+#: sys-utils/mount.c:486
#, c-format
msgid ""
" %1$s [-lhV]\n"
" %1$s [选项] <源> <目录>\n"
" %1$s <操作> <挂载点> [<目标>]\n"
-#: sys-utils/mount.c:455
+#: sys-utils/mount.c:494
msgid "Mount a filesystem.\n"
msgstr "挂载文件系统。\n"
-#: sys-utils/mount.c:459
-#, 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:465
-#, c-format
+#: 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
+#, 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:467
-#, c-format
+#: sys-utils/mount.c:503
msgid " -l, --show-labels show also filesystem labels\n"
msgstr " -l, --show-labels 也显示文件系统标签\n"
-#: sys-utils/mount.c:469 sys-utils/umount.c:99
-#, c-format
+#: sys-utils/mount.c:504
+msgid " -m, --mkdir[=<mode>] alias to '-o X-mount.mkdir[=<mode>]'\n"
+msgstr ""
+
+#: 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:471
-#, 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:478
-#, 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:483
-#, 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:486
-#, 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:489 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:491
-#, 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:493
-#, 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:499
-#, 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"
-" ID=<id> specifies device by udev hardware ID\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 ""
-"\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"
-#: sys-utils/mount.c:509
-#, 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"
+#: sys-utils/mount.c:534
+msgid " PARTLABEL=<label> specifies device by partition label\n"
msgstr ""
-" <设备> 按路径指定设备\n"
-" <目录> 绑定式挂载的挂载点(参阅 --bind/rbind)\n"
-" <文件> 用于设置回环设备的常规文件\n"
-#: sys-utils/mount.c:514
-#, 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: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
+#| 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"
+#| "Options:\n"
+msgid "Operations:\n"
msgstr ""
"\n"
-"操作：\n"
-" -B, --bind 挂载其他位置的子树(同 -o bind)\n"
-" -M, --move 将子树移动到其他位置\n"
-" -R, --rbind 挂载其他位置的子树及其包含的所有子挂载(submount)\n"
+"选项：\n"
-#: sys-utils/mount.c:519
-#, 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: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
+#, 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:548
+msgid " --make-private mark a subtree as private\n"
msgstr ""
-" --make-shared 将子树标记为 共享\n"
-" --make-slave 将子树标记为 从属\n"
-" --make-private 将子树标记为 私有\n"
-" --make-unbindable 将子树标记为 不可绑定\n"
-#: sys-utils/mount.c:524
-#, 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:549
+msgid " --make-unbindable mark a subtree as unbindable\n"
+msgstr ""
+
+#: 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:675 sys-utils/umount.c:516
+#: sys-utils/mount.c:704 sys-utils/umount.c:520
msgid "libmount context allocation failed"
msgstr "libmount 环境(context)分配失败"
-#: sys-utils/mount.c:737 sys-utils/umount.c:578
+#: sys-utils/mount.c:766 sys-utils/umount.c:582
msgid "failed to set options pattern"
msgstr "设置选项模式失败"
-#: sys-utils/mount.c:784 sys-utils/umount.c:595
+#: 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:950
+#: sys-utils/mount.c:986
msgid "source specified more than once"
msgstr "源指定了多次"
#: sys-utils/mountpoint.c:128
#, fuzzy
+#| msgid ""
+#| " -q, --quiet quiet mode - don't print anything\n"
+#| " -d, --fs-devno print maj:min device number of the filesystem\n"
+#| " -x, --devno print maj:min device number of the block device\n"
msgid ""
" -q, --quiet quiet mode - don't print anything\n"
" --nofollow do not follow symlink\n"
msgid "%s is a mountpoint\n"
msgstr "%s 是一个挂载点\n"
-#: sys-utils/nsenter.c:74 sys-utils/setarch.c:99 sys-utils/unshare.c:305
+#: 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:78
+#: sys-utils/nsenter.c:82
msgid "Run a program with namespaces of other processes.\n"
msgstr "以其他程序的名字空间运行某个程序。\n"
-#: sys-utils/nsenter.c:81
-#, fuzzy
+#: sys-utils/nsenter.c:85
msgid " -a, --all enter all namespaces\n"
-msgstr " -a, --all 打印所有设备\n"
+msgstr " -a, --all 进入所有名字空间\n"
-#: sys-utils/nsenter.c:82
+#: 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:83
+#: sys-utils/nsenter.c:87
msgid " -m, --mount[=<file>] enter mount namespace\n"
msgstr " -m, --mount[=<文件>] 进入 mount 名字空间\n"
-#: sys-utils/nsenter.c:84
+#: sys-utils/nsenter.c:88
msgid " -u, --uts[=<file>] enter UTS namespace (hostname etc)\n"
msgstr " -u, --uts[=<文件>] 进入 UTS 名字空间(主机名等)\n"
-#: sys-utils/nsenter.c:85
+#: 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:86
+#: sys-utils/nsenter.c:90
msgid " -n, --net[=<file>] enter network namespace\n"
msgstr " -n, --net[=<文件>] 进入网络名字空间\n"
-#: sys-utils/nsenter.c:87
+#: sys-utils/nsenter.c:91
msgid " -p, --pid[=<file>] enter pid namespace\n"
msgstr " -p, --pid[=<文件>] 进入 pid 名字空间\n"
-#: sys-utils/nsenter.c:88
+#: sys-utils/nsenter.c:92
msgid " -C, --cgroup[=<file>] enter cgroup namespace\n"
msgstr " -C, --cgroup[=<文件>] 进入 cgroup 名字空间\n"
-#: sys-utils/nsenter.c:89
+#: sys-utils/nsenter.c:93
msgid " -U, --user[=<file>] enter user namespace\n"
msgstr " -U, --user[=<文件>] 进入用户名字空间\n"
-#: sys-utils/nsenter.c:90
+#: 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:91
-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:92
-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:93
+#: 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:94
+#: sys-utils/nsenter.c:98
msgid " -r, --root[=<dir>] set the root directory\n"
msgstr " -r, --root[=<目录>] 设置根目录\n"
-#: sys-utils/nsenter.c:95
+#: sys-utils/nsenter.c:99
msgid " -w, --wd[=<dir>] set the working directory\n"
msgstr " -w, --wd[=<dir>] 设置工作目录\n"
-#: sys-utils/nsenter.c:96
+#: 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"
+msgstr " -w, --wd[=<dir>] 设置工作目录\n"
+
+#: 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:98
+#: 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:123
+#: sys-utils/nsenter.c:131
#, c-format
msgid "neither filename nor target pid supplied for %s"
msgstr "没有为 %s 提供文件名或目标 pid"
-#: sys-utils/nsenter.c:313 sys-utils/unshare.c:473 sys-utils/unshare.c:510
+#: 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:317 sys-utils/unshare.c:477 sys-utils/unshare.c:514
+#: 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:357
+#: sys-utils/nsenter.c:406
msgid "no target PID specified for --follow-context"
msgstr "没有为 --follow-context 设置目标 PID"
-#: sys-utils/nsenter.c:359
+#: sys-utils/nsenter.c:408
#, c-format
msgid "failed to get %d SELinux context"
msgstr "未能获取 %d SELinux 环境"
-#: sys-utils/nsenter.c:362
+#: sys-utils/nsenter.c:411
#, c-format
msgid "failed to set exec context to '%s'"
msgstr "向“%s”设置 exec 环境失败"
-#: sys-utils/nsenter.c:369
+#: 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:433
+#: sys-utils/nsenter.c:482
#, c-format
msgid "reassociate to namespace '%s' failed"
msgstr "重新关联到名字空间“%s”失败"
-#: sys-utils/nsenter.c:449
+#: sys-utils/nsenter.c:498 sys-utils/nsenter.c:521
msgid "cannot open current working directory"
msgstr "打不开当前工作目录"
-#: sys-utils/nsenter.c:456
+#: sys-utils/nsenter.c:505
msgid "change directory by root file descriptor failed"
msgstr "根据 root 文件描述符 更改目录失败"
-#: sys-utils/nsenter.c:459
+#: sys-utils/nsenter.c:508
msgid "chroot failed"
msgstr "chroot 失败"
-#: sys-utils/nsenter.c:471
+#: sys-utils/nsenter.c:528
msgid "change directory by working directory file descriptor failed"
msgstr "按工作目录文件描述符更改目录失败"
-#: sys-utils/nsenter.c:482 sys-utils/setpriv.c:1025 sys-utils/setpriv.c:1032
-#: sys-utils/unshare.c:661
+#: 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 失败"
msgid "failed to change root from `%s' to `%s'"
msgstr "将根目录从“%s”更改为“%s”失败"
-#: sys-utils/prlimit.c:75
+#: sys-utils/prlimit.c:77
msgid "address space limit"
msgstr "地址空间限制"
-#: sys-utils/prlimit.c:76
+#: sys-utils/prlimit.c:78
msgid "max core file size"
msgstr "最大核心文件尺寸"
-#: sys-utils/prlimit.c:77
+#: sys-utils/prlimit.c:79
msgid "CPU time"
msgstr "CPU 时间"
-#: sys-utils/prlimit.c:77
+#: sys-utils/prlimit.c:79
msgid "seconds"
msgstr "秒数"
-#: sys-utils/prlimit.c:78
+#: sys-utils/prlimit.c:80
msgid "max data size"
msgstr "最大数据尺寸"
-#: sys-utils/prlimit.c:79
+#: sys-utils/prlimit.c:81
msgid "max file size"
msgstr "最大文件尺寸"
-#: sys-utils/prlimit.c:80
+#: sys-utils/prlimit.c:82
msgid "max number of file locks held"
msgstr "最大文件锁保持数量"
-#: sys-utils/prlimit.c:80
+#: sys-utils/prlimit.c:82
msgid "locks"
msgstr "锁"
-#: sys-utils/prlimit.c:81
+#: sys-utils/prlimit.c:83
msgid "max locked-in-memory address space"
msgstr "最大内存锁定(locked-in-memory)地址空间"
-#: sys-utils/prlimit.c:82
+#: sys-utils/prlimit.c:84
msgid "max bytes in POSIX mqueues"
msgstr "POSIX 消息队列中的最大字节数"
-#: sys-utils/prlimit.c:83
+#: sys-utils/prlimit.c:85
msgid "max nice prio allowed to raise"
msgstr "允许提升的最大 nice 优先级"
-#: sys-utils/prlimit.c:84
+#: sys-utils/prlimit.c:86
msgid "max number of open files"
msgstr "打开文件的最大数量"
-#: sys-utils/prlimit.c:84
+#: sys-utils/prlimit.c:86
msgid "files"
msgstr "文件"
-#: sys-utils/prlimit.c:85
+#: sys-utils/prlimit.c:87
msgid "max number of processes"
msgstr "最大进程数"
-#: sys-utils/prlimit.c:85
-msgid "processes"
-msgstr "进程"
-
-#: sys-utils/prlimit.c:86
+#: sys-utils/prlimit.c:88
msgid "max resident set size"
msgstr "最大驻留集尺寸"
-#: sys-utils/prlimit.c:87
+#: sys-utils/prlimit.c:89
msgid "max real-time priority"
msgstr "最大实时优先级"
-#: sys-utils/prlimit.c:88
+#: sys-utils/prlimit.c:90
msgid "timeout for real-time tasks"
msgstr "实时任务超时"
-#: sys-utils/prlimit.c:88
+#: sys-utils/prlimit.c:90
msgid "microsecs"
msgstr "毫秒数"
-#: sys-utils/prlimit.c:89
+#: sys-utils/prlimit.c:91
msgid "max number of pending signals"
msgstr "挂起(pending)信号的最大数量"
-#: sys-utils/prlimit.c:89
+#: sys-utils/prlimit.c:91
msgid "signals"
msgstr "信号"
-#: sys-utils/prlimit.c:90
+#: sys-utils/prlimit.c:92
msgid "max stack size"
msgstr "最大栈(stack)尺寸"
-#: sys-utils/prlimit.c:123
+#: sys-utils/prlimit.c:125
msgid "resource name"
msgstr "资源名称"
-#: sys-utils/prlimit.c:124
+#: sys-utils/prlimit.c:126
msgid "resource description"
msgstr "资源描述"
-#: sys-utils/prlimit.c:125
+#: sys-utils/prlimit.c:127
msgid "soft limit"
msgstr "软限制"
-#: sys-utils/prlimit.c:126
+#: sys-utils/prlimit.c:128
msgid "hard limit (ceiling)"
msgstr "硬限制(触顶)"
-#: sys-utils/prlimit.c:127
+#: sys-utils/prlimit.c:129
msgid "units"
msgstr "单位"
-#: sys-utils/prlimit.c:162
-#, c-format
-msgid " %s [options] [-p PID]\n"
+#: sys-utils/prlimit.c:168
+#, fuzzy, c-format
+#| msgid " %s [options] [-p PID]\n"
+msgid " %s [options] [--<resource>=<limit>] [-p PID]\n"
msgstr " %s [选项] [-p PID]\n"
-#: sys-utils/prlimit.c:164
-#, c-format
-msgid " %s [options] COMMAND\n"
-msgstr " %s [选项] 命令\n"
+#: sys-utils/prlimit.c:170
+#, fuzzy, c-format
+#| msgid " %s [options] -u <USER> COMMAND\n"
+msgid " %s [options] [--<resource>=<limit>] COMMAND\n"
+msgstr " %s [选项] -u <USER> COMMAND\n"
-#: sys-utils/prlimit.c:167
+#: sys-utils/prlimit.c:173
msgid "Show or change the resource limits of a process.\n"
msgstr "显示或更改进程的资源限制。 \n"
-#: sys-utils/prlimit.c:169
-msgid ""
-"\n"
-"General Options:\n"
-msgstr ""
-"\n"
-"常规选项：\n"
-
-#: sys-utils/prlimit.c:170
+#: sys-utils/prlimit.c:176
#, fuzzy
+#| msgid ""
+#| " -p, --pid <pid> process id\n"
+#| " -o, --output <list> define which output columns to use\n"
+#| " --noheadings don't print headings\n"
+#| " --raw use the raw output format\n"
+#| " --verbose verbose output\n"
+#| " -h, --help display this help and exit\n"
+#| " -V, --version output version information and exit\n"
msgid ""
" -p, --pid <pid> process id\n"
" -o, --output <list> define which output columns to use\n"
" -h, --help 显示此帮助并退出\n"
" -V, --version 输出版本信息并退出\n"
-#: sys-utils/prlimit.c:178
+#: sys-utils/prlimit.c:184
+#, fuzzy
+#| msgid "Resource"
msgid ""
"\n"
-"Resources Options:\n"
-msgstr ""
-"\n"
-"资源选项：\n"
+"Resources:\n"
+msgstr "资源"
-#: sys-utils/prlimit.c:179
+#: sys-utils/prlimit.c:185
msgid ""
" -c, --core maximum size of core files created\n"
" -d, --data maximum size of a process's data segment\n"
" -y, --rttime 实时调度时进程调度的 CPU\n"
" (间隔)时间(毫秒)\n"
-#: sys-utils/prlimit.c:245 sys-utils/prlimit.c:251 sys-utils/prlimit.c:368
-#: sys-utils/prlimit.c:373
+#: sys-utils/prlimit.c:205
+msgid ""
+" <limit> is defined as a range soft:hard, soft:, :hard or a value to\n"
+" define both limits (e.g. -e=0:10 -r=:10).\n"
+msgstr ""
+
+#: sys-utils/prlimit.c:256 sys-utils/prlimit.c:262 sys-utils/prlimit.c:379
+#: sys-utils/prlimit.c:384
msgid "unlimited"
msgstr "无限制"
-#: sys-utils/prlimit.c:334
+#: sys-utils/prlimit.c:345
#, c-format
msgid "failed to get old %s limit"
msgstr "获取旧的 %s 限制失败"
-#: sys-utils/prlimit.c:358
+#: sys-utils/prlimit.c:369
#, c-format
msgid "the soft limit %s cannot exceed the hard limit"
msgstr "软限制 %s 不能超过硬限制"
-#: sys-utils/prlimit.c:365
+#: sys-utils/prlimit.c:376
#, c-format
msgid "New %s limit for pid %d: "
msgstr "pid %2$d 的新 %1$s 限制："
-#: sys-utils/prlimit.c:380
+#: sys-utils/prlimit.c:391
#, c-format
msgid "failed to set the %s resource limit"
msgstr "设置 %s 资源限制失败"
-#: sys-utils/prlimit.c:381
+#: sys-utils/prlimit.c:392
#, c-format
msgid "failed to get the %s resource limit"
msgstr "获取 %s 资源限制失败"
-#: sys-utils/prlimit.c:463
+#: sys-utils/prlimit.c:474
#, c-format
msgid "failed to parse %s limit"
msgstr "解析 %s 限制失败"
-#: sys-utils/prlimit.c:592
+#: sys-utils/prlimit.c:603
msgid "option --pid may be specified only once"
msgstr "--pid 选项只能指定一次"
-#: sys-utils/prlimit.c:621
+#: sys-utils/prlimit.c:632
msgid "options --pid and COMMAND are mutually exclusive"
msgstr "--pid 和 命令 互相排斥"
-#: sys-utils/readprofile.c:107
+#: sys-utils/readprofile.c:109
msgid "Display kernel profiling information.\n"
msgstr "显示内核分析信息。\n"
-#: sys-utils/readprofile.c:111
+#: sys-utils/readprofile.c:113
#, c-format
msgid " -m, --mapfile <mapfile> (defaults: \"%s\" and\n"
msgstr " -m, --mapfile <映射文件> (默认：“%s”和\n"
-#: sys-utils/readprofile.c:113
+#: sys-utils/readprofile.c:115
#, c-format
msgid " \"%s\")\n"
msgstr " “%s”)\n"
-#: sys-utils/readprofile.c:115
+#: sys-utils/readprofile.c:117
#, c-format
msgid " -p, --profile <pro-file> (default: \"%s\")\n"
msgstr " -p, --profile <pro-file> (默认：“%s”)\n"
-#: sys-utils/readprofile.c:116
+#: sys-utils/readprofile.c:118
msgid " -M, --multiplier <mult> set the profiling multiplier to <mult>\n"
msgstr " -M, --multiplier <乘数> 将性能测试乘数设置为<乘数>\n"
-#: sys-utils/readprofile.c:117
+#: sys-utils/readprofile.c:119
msgid " -i, --info print only info about the sampling step\n"
msgstr " -i, --info 只打印有关采样步骤(sampling step)的信息\n"
-#: sys-utils/readprofile.c:118
+#: sys-utils/readprofile.c:120
msgid " -v, --verbose print verbose data\n"
msgstr " -v, --verbose 打印详细信息\n"
-#: sys-utils/readprofile.c:119
+#: sys-utils/readprofile.c:121
msgid " -a, --all print all symbols, even if count is 0\n"
msgstr " -a, --all 打印所有符号，即使计数为 0\n"
-#: sys-utils/readprofile.c:120
+#: sys-utils/readprofile.c:122
msgid " -b, --histbin print individual histogram-bin counts\n"
msgstr " -b, --histbin 打印各个直方图区间的计数\n"
-#: sys-utils/readprofile.c:121
+#: sys-utils/readprofile.c:123
msgid " -s, --counters print individual counters within functions\n"
msgstr " -s, --counters 打印函数内的独立计数\n"
-#: sys-utils/readprofile.c:122
+#: sys-utils/readprofile.c:124
msgid " -r, --reset reset all the counters (root only)\n"
msgstr " -r, --reset 重置所有计数(限 root 用户)\n"
-#: sys-utils/readprofile.c:123
+#: sys-utils/readprofile.c:125
msgid " -n, --no-auto disable byte order auto-detection\n"
msgstr " -n, --no-auto 禁用字节顺序自动检测\n"
-#: sys-utils/readprofile.c:240
+#: sys-utils/readprofile.c:204
+#, fuzzy
+#| msgid "failed to parse pid"
+msgid "failed to parse multiplier"
+msgstr "解析 pid 失败"
+
+#: sys-utils/readprofile.c:242
#, c-format
msgid "error writing %s"
msgstr "写 %s 出错"
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:253
msgid "input file is empty"
msgstr "输入文件为空"
-#: sys-utils/readprofile.c:273
+#: sys-utils/readprofile.c:275
msgid "Assuming reversed byte order. Use -n to force native byte order."
msgstr "将假设为反向字节顺序。可使用 -n 强制为原生字节顺序。"
-#: sys-utils/readprofile.c:288
+#: sys-utils/readprofile.c:290
#, c-format
msgid "Sampling_step: %u\n"
msgstr "采样步长：%u\n"
-#: sys-utils/readprofile.c:304 sys-utils/readprofile.c:325
+#: sys-utils/readprofile.c:306 sys-utils/readprofile.c:327
#, c-format
msgid "%s(%i): wrong map line"
msgstr "%s(%i)：错误的 map 行"
-#: sys-utils/readprofile.c:315
+#: sys-utils/readprofile.c:317
#, c-format
msgid "can't find \"_stext\" in %s"
msgstr "在 %s 中找不到“_stext”"
-#: sys-utils/readprofile.c:348
+#: sys-utils/readprofile.c:350
msgid "profile address out of range. Wrong map file?"
msgstr "配置(profile)地址超出范围。map 文件错误？"
-#: sys-utils/readprofile.c:409
+#: sys-utils/readprofile.c:411
msgid "total"
msgstr "总计"
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"
#: sys-utils/renice.c:71
#, fuzzy
-msgid " -n, --priority <num> specify the nice value\n"
+#| 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:76
+#, fuzzy
+#| msgid " -n, --priority <num> specify the nice increment value\n"
+msgid " --relative <num> specify the 'relative' nice value\n"
+msgstr " -n, --priority <数字> 指定 nice 增量\n"
+
+#: 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"
#: sys-utils/rfkill.c:135
#, fuzzy
+#| msgid "size of the lock"
msgid "status of software block"
msgstr "锁的大小"
#: sys-utils/rfkill.c:136
#, fuzzy
+#| msgid "Show the status of the hardware watchdog.\n"
msgid "status of hardware block"
msgstr "显示硬件看门狗的状态。\n"
#: sys-utils/rfkill.c:200
#, fuzzy, c-format
+#| msgid "cannot lock %s"
msgid "cannot set non-blocking %s"
msgstr "无法锁定 %s"
msgid "wrong size of rfkill event: %zu < %zu"
msgstr ""
-#: sys-utils/rfkill.c:252
+#: sys-utils/rfkill.c:259
#, fuzzy, c-format
+#| msgid "failed to parse %s"
msgid "failed to poll %s"
msgstr "解析 %s 失败"
-#: sys-utils/rfkill.c:319
+#: sys-utils/rfkill.c:328
msgid "invalid identifier"
msgstr "无效的标识符"
-#: sys-utils/rfkill.c:399 sys-utils/rfkill.c:402
+#: sys-utils/rfkill.c:408 sys-utils/rfkill.c:411
#, fuzzy
+#| msgid "locked"
msgid "blocked"
msgstr "已锁定"
-#: sys-utils/rfkill.c:399 sys-utils/rfkill.c:402
+#: sys-utils/rfkill.c:408 sys-utils/rfkill.c:411
#, fuzzy
+#| msgid "locked"
msgid "unblocked"
msgstr "已锁定"
-#: sys-utils/rfkill.c:421 sys-utils/rfkill.c:495 sys-utils/rfkill.c:536
-#: sys-utils/rfkill.c:572 sys-utils/rfkill.c:593
+#: sys-utils/rfkill.c:430 sys-utils/rfkill.c:505 sys-utils/rfkill.c:546
+#: sys-utils/rfkill.c:582 sys-utils/rfkill.c:603
#, c-format
msgid "invalid identifier: %s"
msgstr "无效的标识符：%s"
-#: sys-utils/rfkill.c:623
+#: sys-utils/rfkill.c:633
#, fuzzy, c-format
+#| msgid " %s [options] [<device> ...]\n"
msgid " %s [options] command [identifier ...]\n"
msgstr " %s [选项] [<设备> ...]\n"
-#: sys-utils/rfkill.c:626
+#: sys-utils/rfkill.c:636
msgid "Tool for enabling and disabling wireless devices.\n"
msgstr ""
#. *
#. list [identifier] (lista [tarkenne])
#.
-#: sys-utils/rfkill.c:650
+#: sys-utils/rfkill.c:660
#, fuzzy
+#| msgid " -help\n"
msgid " help\n"
msgstr " -help\n"
-#: sys-utils/rfkill.c:651
+#: sys-utils/rfkill.c:661
msgid " event\n"
msgstr ""
-#: sys-utils/rfkill.c:652
+#: sys-utils/rfkill.c:662
#, fuzzy
+#| msgid "Disk identifier"
msgid " list [identifier]\n"
msgstr "磁盘标识符"
-#: sys-utils/rfkill.c:653
+#: sys-utils/rfkill.c:663
#, fuzzy
+#| msgid "Disk identifier"
msgid " block identifier\n"
msgstr "磁盘标识符"
-#: sys-utils/rfkill.c:654
+#: sys-utils/rfkill.c:664
#, fuzzy
+#| msgid "Disk identifier"
msgid " unblock identifier\n"
msgstr "磁盘标识符"
-#: sys-utils/rfkill.c:655
+#: sys-utils/rfkill.c:665
#, fuzzy
+#| msgid "Disk identifier"
msgid " toggle identifier\n"
msgstr "磁盘标识符"
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"
#: sys-utils/setpriv.c:126
#, fuzzy
+#| msgid " -d, --dump show current state (and do not exec anything)\n"
msgid " -d, --dump show current state (and do not exec)\n"
msgstr " -d, --dump 显示当前状态(不执行任何操作)\n"
#: sys-utils/setpriv.c:127
#, fuzzy
+#| msgid " --nnp, --no-new-privs disallow granting new privileges\n"
msgid " --nnp, --no-new-privs disallow granting new privileges\n"
msgstr " --nnp, --no-new-privs 禁止赋予新权限\n"
#: sys-utils/setpriv.c:128
#, fuzzy
+#| msgid " --inh-caps <caps,...> set inheritable capabilities\n"
msgid " --ambient-caps <caps,...> set ambient capabilities\n"
msgstr " --inh-caps <caps,...> 设置可继承的权能\n"
#: sys-utils/setpriv.c:129
#, fuzzy
+#| msgid " --inh-caps <caps,...> set inheritable capabilities\n"
msgid " --inh-caps <caps,...> set inheritable capabilities\n"
msgstr " --inh-caps <caps,...> 设置可继承的权能\n"
#: sys-utils/setpriv.c:130
#, fuzzy
+#| msgid " --bounding-set <caps> set capability bounding set\n"
msgid " --bounding-set <caps> set capability bounding set\n"
msgstr " --bounding-set <caps> 设置权能绑定集\n"
#: sys-utils/setpriv.c:131
#, fuzzy
+#| msgid " --ruid <uid> set real uid\n"
msgid " --ruid <uid|user> set real uid\n"
msgstr " --ruid <uid> 设置实际 uid\n"
#: sys-utils/setpriv.c:132
#, fuzzy
+#| msgid " --euid <uid> set effective uid\n"
msgid " --euid <uid|user> set effective uid\n"
msgstr " --euid <uid> 设置有效 uid\n"
#: sys-utils/setpriv.c:133
#, fuzzy
+#| msgid " --rgid <gid> set real gid\n"
msgid " --rgid <gid|user> set real gid\n"
msgstr " --rgid <gid> 设置实际 gid\n"
#: sys-utils/setpriv.c:134
#, fuzzy
+#| msgid " --egid <gid> set effective gid\n"
msgid " --egid <gid|group> set effective gid\n"
msgstr " --egid <gid> 设置有效 gid\n"
#: sys-utils/setpriv.c:135
#, fuzzy
+#| msgid " --reuid <uid> set real and effective uid\n"
msgid " --reuid <uid|user> set real and effective uid\n"
msgstr " --reuid <uid> 设置实际和有效 uid\n"
#: sys-utils/setpriv.c:136
#, fuzzy
+#| msgid " --regid <gid> set real and effective gid\n"
msgid " --regid <gid|group> set real and effective gid\n"
msgstr " --regid <gid> 设置实际和有效 gid\n"
#: sys-utils/setpriv.c:137
#, fuzzy
+#| msgid " --clear-groups clear supplementary groups\n"
msgid " --clear-groups clear supplementary groups\n"
msgstr " --clear-groups 清除附属组\n"
#: sys-utils/setpriv.c:138
#, fuzzy
+#| msgid " --keep-groups keep supplementary groups\n"
msgid " --keep-groups keep supplementary groups\n"
msgstr " --keep-groups 保留附属组\n"
#: sys-utils/setpriv.c:139
#, fuzzy
+#| msgid " --keep-groups keep supplementary groups\n"
msgid " --init-groups initialize supplementary groups\n"
msgstr " --keep-groups 保留附属组\n"
#: sys-utils/setpriv.c:140
#, fuzzy
+#| msgid " --groups <group,...> set supplementary groups\n"
msgid " --groups <group,...> set supplementary groups by UID or name\n"
msgstr " --groups <组,...> 设置附属组\n"
#: sys-utils/setpriv.c:141
#, fuzzy
+#| msgid " --securebits <bits> set securebits\n"
msgid " --securebits <bits> set securebits\n"
msgstr " --securebits <位> 设置安全位\n"
#: sys-utils/setpriv.c:142
#, fuzzy
+#| msgid " --store save current terminal settings as default\n"
msgid ""
" --pdeathsig keep|clear|<signame>\n"
" set or clear parent death signal\n"
#: sys-utils/setpriv.c:144
#, fuzzy
+#| msgid " --selinux-label <label> set SELinux label\n"
msgid " --selinux-label <label> set SELinux label\n"
msgstr " --selinux-label <标签> 设置 SELinux 标签\n"
#: sys-utils/setpriv.c:145
#, fuzzy
+#| msgid " --apparmor-profile <pr> set AppArmor profile\n"
msgid " --apparmor-profile <pr> set AppArmor profile\n"
msgstr " --apparmor-profile <pr> 设置 AppArmor 配置文件\n"
#: sys-utils/setpriv.c:321
#, fuzzy, c-format
+#| msgid "set parent death signal failed"
msgid "Parent death signal: "
msgstr "设置父进程死亡信号失败"
#: sys-utils/setpriv.c:379
#, fuzzy, c-format
+#| msgid "Permitted capabilities: "
msgid "Ambient capabilities: "
msgstr "允许的权能："
#: sys-utils/setpriv.c:972
#, fuzzy
+#| msgid "--[re]gid requires --keep-groups, --clear-groups, or --groups"
msgid "--[re]gid requires --keep-groups, --clear-groups, --init-groups, or --groups"
msgstr "--[re]gid 需要 --keep-groups、--clear-groups 或 --groups"
msgid "%s: swapoff failed"
msgstr "%s：swapoff 失败"
-#: sys-utils/swapoff.c:141 sys-utils/swapon.c:806
+#: sys-utils/swapoff.c:141 sys-utils/swapon.c:807
#, c-format
msgid " %s [options] [<spec>]\n"
msgstr " %s [选项] [<指定>]\n"
msgid "%s: reinitializing the swap."
msgstr "%s：正在重新初始化交换区。"
-#: sys-utils/swapon.c:392
+#: sys-utils/swapon.c:387
#, c-format
msgid "%s: lseek failed"
msgstr "%s：lseek 失败"
-#: sys-utils/swapon.c:398
+#: sys-utils/swapon.c:393
#, c-format
msgid "%s: write signature failed"
msgstr "%s：写签名失败"
-#: sys-utils/swapon.c:541
+#: sys-utils/swapon.c:536
#, c-format
msgid "%s: insecure permissions %04o, %04o suggested."
msgstr "%s：不安全的权限 %04o，建议使用 %04o。"
-#: sys-utils/swapon.c:546
+#: sys-utils/swapon.c:541
#, c-format
msgid "%s: insecure file owner %d, 0 (root) suggested."
msgstr "%s：不安全的文件拥有者 %d，建议使用 0(root)。"
-#: sys-utils/swapon.c:552
+#: sys-utils/swapon.c:547
#, c-format
msgid "%s: skipping - it appears to have holes."
msgstr "%s：将跳过 - 它似乎有空洞。"
-#: sys-utils/swapon.c:560
+#: sys-utils/swapon.c:555
#, c-format
msgid "%s: get size failed"
msgstr "%s：获取大小失败"
-#: sys-utils/swapon.c:566
+#: sys-utils/swapon.c:561
#, c-format
msgid "%s: read swap header failed"
msgstr "%s：读交换区头失败"
-#: sys-utils/swapon.c:571
+#: sys-utils/swapon.c:566
#, c-format
msgid "%s: found signature [pagesize=%d, signature=%s]"
msgstr "%s：找到签名[页尺寸=%d, 签名=%s]"
-#: sys-utils/swapon.c:582
+#: sys-utils/swapon.c:577
#, c-format
msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
msgstr "%s：页大小=%d，交换区大小=%llu，设备大小=%llu"
-#: sys-utils/swapon.c:587
+#: sys-utils/swapon.c:582
#, c-format
msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
msgstr "%s：末页 0x%08llx 大于交换空间的实际大小"
-#: sys-utils/swapon.c:597
+#: sys-utils/swapon.c:592
#, c-format
msgid "%s: swap format pagesize does not match."
msgstr "%s：交换格式 页大小 不匹配。"
-#: sys-utils/swapon.c:603
+#: sys-utils/swapon.c:598
#, c-format
msgid "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
msgstr "%s：交换格式 页大小 不匹配。(使用 --fixpgsz 来重新对它初始化。)"
-#: sys-utils/swapon.c:612
+#: sys-utils/swapon.c:607
#, c-format
msgid "%s: software suspend data detected. Rewriting the swap signature."
msgstr "%s：检测到软件挂起数据。将重新写交换签名。"
-#: sys-utils/swapon.c:682
+#: sys-utils/swapon.c:677
#, c-format
msgid "swapon %s\n"
msgstr "swapon %s\n"
-#: sys-utils/swapon.c:686
+#: sys-utils/swapon.c:681
#, c-format
msgid "%s: swapon failed"
msgstr "%s：swapon 失败"
-#: sys-utils/swapon.c:759
+#: sys-utils/swapon.c:760
#, c-format
msgid "%s: noauto option -- ignored"
msgstr "%s：无自动选项 -- 已忽略"
-#: sys-utils/swapon.c:781
+#: sys-utils/swapon.c:782
#, c-format
msgid "%s: already active -- ignored"
msgstr "%s：已激活 -- 已忽略"
-#: sys-utils/swapon.c:787
+#: sys-utils/swapon.c:788
#, c-format
msgid "%s: inaccessible -- ignored"
msgstr "%s：无法访问 -- 已忽略"
-#: sys-utils/swapon.c:809
+#: sys-utils/swapon.c:810
msgid "Enable devices and files for paging and swapping.\n"
msgstr "允许将设备和文件用于分页和交换。\n"
-#: sys-utils/swapon.c:812
+#: sys-utils/swapon.c:813
msgid " -a, --all enable all swaps from /etc/fstab\n"
msgstr " -a, --all 启用 /etc/fstab 中的所有交换区\n"
-#: sys-utils/swapon.c:813
+#: sys-utils/swapon.c:814
msgid " -d, --discard[=<policy>] enable swap discards, if supported by device\n"
msgstr " -d, --discard[=<policy>] 如果设备支持，启用 swap 丢弃\n"
-#: sys-utils/swapon.c:814
+#: sys-utils/swapon.c:815
msgid " -e, --ifexists silently skip devices that do not exist\n"
msgstr " -e, --ifexists 自动跳过不存在的设备而不提示\n"
-#: sys-utils/swapon.c:815
+#: sys-utils/swapon.c:816
msgid " -f, --fixpgsz reinitialize the swap space if necessary\n"
msgstr " -f, --fixpgsz 必要时重新初始化交换区\n"
-#: sys-utils/swapon.c:816
+#: sys-utils/swapon.c:817
msgid " -o, --options <list> comma-separated list of swap options\n"
msgstr " -o, --options <列表> 以英文逗号分隔的 swap 选项\n"
-#: sys-utils/swapon.c:817
+#: sys-utils/swapon.c:818
msgid " -p, --priority <prio> specify the priority of the swap device\n"
msgstr " -p, --priority <优先级> 指定交换设备的优先级\n"
-#: sys-utils/swapon.c:818
+#: sys-utils/swapon.c:819
msgid " -s, --summary display summary about used swap devices (DEPRECATED)\n"
msgstr " -s, --summary 显示已使用交换设备的摘要(已废弃)\n"
-#: sys-utils/swapon.c:819
+#: 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:820
+#: sys-utils/swapon.c:822
msgid " --noheadings don't print table heading (with --show)\n"
msgstr " --noheadings 不打印表头(与 --show 合用)\n"
-#: sys-utils/swapon.c:821
+#: sys-utils/swapon.c:823
msgid " --raw use the raw output format (with --show)\n"
msgstr " --raw 使用原生输出格式(与 --show 合用)\n"
-#: sys-utils/swapon.c:822
+#: sys-utils/swapon.c:824
msgid " --bytes display swap size in bytes in --show output\n"
msgstr " --bytes 在 --show 输出中以字节数显示交换区大小\n"
-#: sys-utils/swapon.c:823
+#: sys-utils/swapon.c:825
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详尽模式\n"
-#: sys-utils/swapon.c:828
+#: sys-utils/swapon.c:830
msgid ""
"\n"
"The <spec> parameter:\n"
" <设备> 要使用设备的名称\n"
" <文件> 要使用文件的名称\n"
-#: sys-utils/swapon.c:838
+#: sys-utils/swapon.c:840
msgid ""
"\n"
"Available discard policy types (for --discard):\n"
" pages\t ：对释放的页在重新使用前丢弃\n"
" * 如果未选择策略，则两者都将启用。(默认)\n"
-#: sys-utils/swapon.c:920
+#: sys-utils/swapon.c:923
msgid "failed to parse priority"
msgstr "解析优先级失败"
-#: sys-utils/swapon.c:939
+#: 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 " -N, --namespace <ns> perform umount in another namespace\n"
msgstr " -N, --namespace <ns> 在另一个命名空间进行卸载\n"
-#: sys-utils/umount.c:157
+#: sys-utils/umount.c:152
#, c-format
msgid "%s (%s) unmounted"
msgstr "%s (%s) 已卸载"
-#: sys-utils/umount.c:159
+#: sys-utils/umount.c:154
#, c-format
msgid "%s unmounted"
msgstr "%s 未挂载"
-#: sys-utils/umount.c:228
+#: sys-utils/umount.c:232
msgid "failed to set umount target"
msgstr "设置卸载目标失败"
-#: sys-utils/umount.c:261
+#: sys-utils/umount.c:265
msgid "libmount table allocation failed"
msgstr "libmount 表分配失败"
-#: sys-utils/umount.c:307 sys-utils/umount.c:399
+#: sys-utils/umount.c:311 sys-utils/umount.c:403
msgid "libmount iterator allocation failed"
msgstr "分配 libmount 迭代器失败！"
-#: sys-utils/umount.c:320
+#: sys-utils/umount.c:324
#, c-format
msgid "failed to get child fs of %s"
msgstr "获取 %s 的子文件系统失败"
-#: sys-utils/umount.c:362 sys-utils/umount.c:386
+#: sys-utils/umount.c:366 sys-utils/umount.c:390
#, c-format
msgid "%s: not found"
msgstr "%s：找不到"
-#: sys-utils/umount.c:393
+#: 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:95
+#: sys-utils/unshare.c:98
#, c-format
msgid "unsupported --setgroups argument '%s'"
msgstr "不支持的 --setgroups 参数“%s”"
-#: sys-utils/unshare.c:116 sys-utils/unshare.c:131
+#: sys-utils/unshare.c:119 sys-utils/unshare.c:134
#, c-format
msgid "write failed %s"
msgstr "写失败：%s"
-#: sys-utils/unshare.c:154
+#: sys-utils/unshare.c:157
#, c-format
msgid "unsupported propagation mode: %s"
msgstr "不受支持的传播模式︰%s"
-#: sys-utils/unshare.c:163
+#: sys-utils/unshare.c:166
msgid "cannot change root filesystem propagation"
msgstr "无法更改根文件系统传播"
-#: sys-utils/unshare.c:194
+#: sys-utils/unshare.c:197
#, c-format
msgid "mount %s on %s failed"
msgstr "将 %s 挂载到 %s 失败"
-#: sys-utils/unshare.c:208 text-utils/more.c:457
-#, c-format
-msgid "cannot stat %s"
-msgstr "无法 stat %s"
-
-#: sys-utils/unshare.c:221
+#: sys-utils/unshare.c:224
msgid "failed to open /proc/self/timens_offsets"
msgstr "打开 /proc/self/timens_offsets 失败"
-#: sys-utils/unshare.c:224
+#: sys-utils/unshare.c:227
msgid "failed to write to /proc/self/timens_offsets"
msgstr "写入 /proc/self/timens_offsets 失败"
-#: sys-utils/unshare.c:236
-msgid "pipe failed"
-msgstr "pipe 失败"
+#: sys-utils/unshare.c:294
+#, fuzzy
+#| msgid "reset failed"
+msgid "eventfd failed"
+msgstr "reset 失败"
-#: sys-utils/unshare.c:250
-msgid "failed to read pipe"
-msgstr "读取管道失败"
+#: sys-utils/unshare.c:304
+#, fuzzy
+#| msgid "failed to read speed"
+msgid "failed to read eventfd"
+msgstr "读 速度 失败"
+
+#: sys-utils/unshare.c:402
+#, fuzzy, c-format
+#| msgid "invalid date '%s'"
+msgid "invalid mapping '%s'"
+msgstr "无效日期“%s”"
-#: sys-utils/unshare.c:309
+#: sys-utils/unshare.c:430
+#, fuzzy, c-format
+#| msgid "could not read: %s"
+msgid "could not open '%s'"
+msgstr "无法读取︰%s"
+
+#: 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:470
+#, c-format
+msgid "no line matching user \"%s\" in %s"
+msgstr ""
+
+#: sys-utils/unshare.c:647
msgid "Run a program with some namespaces unshared from the parent.\n"
msgstr "以某些未与父(进程)共享的名字空间运行某个程序。\n"
-#: sys-utils/unshare.c:312
+#: sys-utils/unshare.c:650
msgid " -m, --mount[=<file>] unshare mounts namespace\n"
msgstr " -m, --mount[=<文件>] 取消共享 mounts 名字空间\n"
-#: sys-utils/unshare.c:313
+#: sys-utils/unshare.c:651
msgid " -u, --uts[=<file>] unshare UTS namespace (hostname etc)\n"
msgstr " -u, --uts[=<文件>] 取消共享 UTS 名字空间(主机名等)\n"
-#: sys-utils/unshare.c:314
+#: 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:315
+#: sys-utils/unshare.c:653
msgid " -n, --net[=<file>] unshare network namespace\n"
msgstr " -n, --net[=<file>] 取消共享网络名字空间\n"
-#: sys-utils/unshare.c:316
+#: sys-utils/unshare.c:654
msgid " -p, --pid[=<file>] unshare pid namespace\n"
msgstr " -p, --pid[=<文件>] 取消共享 pid 名字空间\n"
-#: sys-utils/unshare.c:317
+#: sys-utils/unshare.c:655
msgid " -U, --user[=<file>] unshare user namespace\n"
msgstr " -U, --user[=<文件>] 取消共享用户名字空间\n"
-#: sys-utils/unshare.c:318
+#: sys-utils/unshare.c:656
msgid " -C, --cgroup[=<file>] unshare cgroup namespace\n"
msgstr " -C, --cgroup[=<文件>] 取消共享 cgroup 名字空间\n"
-#: sys-utils/unshare.c:319
+#: sys-utils/unshare.c:657
msgid " -T, --time[=<file>] unshare time namespace\n"
msgstr " -T, --time[=<文件>] 取消共享时间名字空间\n"
-#: sys-utils/unshare.c:321
+#: sys-utils/unshare.c:659
msgid " -f, --fork fork before launching <program>\n"
msgstr " -f, --fork 在启动<程序>前 fork\n"
-#: sys-utils/unshare.c:322
+#: 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:323
+#: 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:324
+#: 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:325
+#: 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:327
+#: 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:665
+#, fuzzy
+#| msgid " -r, --map-root-user map current user to root (implies --user)\n"
+msgid ""
+" --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:667
+#, fuzzy
+#| msgid " -r, --map-root-user map current user to root (implies --user)\n"
+msgid ""
+" --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:670
msgid ""
" --kill-child[=<signame>] when dying, kill the forked child (implies --fork)\n"
" defaults to SIGKILL\n"
msgstr ""
-#: sys-utils/unshare.c:329
+#: 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:330
+#: sys-utils/unshare.c:673
#, fuzzy
+#| msgid ""
+#| " --propagation slave|shared|private|unchanged\n"
+#| " modify mount propagation in mount namespace\n"
msgid ""
" --propagation slave|shared|private|unchanged\n"
" modify mount propagation in mount namespace\n"
" --propagation slave|shared|private|unchanged\n"
" 修改 mount 名字空间中的 mount 传播\n"
-#: sys-utils/unshare.c:332
+#: 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:333
+#: 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:335
+#: 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:336
+#: 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:337
+#: 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:338
+#: 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:339
+#: sys-utils/unshare.c:682
msgid " --monotonic <offset> set clock monotonic offset (seconds) in time namespaces\n"
msgstr ""
-#: sys-utils/unshare.c:340
+#: sys-utils/unshare.c:683
msgid " --boottime <offset> set clock boottime offset (seconds) in time namespaces\n"
msgstr ""
-#: sys-utils/unshare.c:524
+#: sys-utils/unshare.c:898
#, fuzzy
+#| msgid "failed to parse offset"
msgid "failed to parse monotonic offset"
msgstr "解析偏移失败"
-#: sys-utils/unshare.c:528
+#: sys-utils/unshare.c:902
#, fuzzy
+#| msgid "failed to parse offset"
msgid "failed to parse boottime offset"
msgstr "解析偏移失败"
-#: sys-utils/unshare.c:542
+#: sys-utils/unshare.c:916
msgid "options --monotonic and --boottime require unsharing of a time namespace (-t)"
msgstr ""
-#: sys-utils/unshare.c:549
+#: sys-utils/unshare.c:930
msgid "unshare failed"
msgstr "unshare 失败"
-#: sys-utils/unshare.c:616
+#: sys-utils/unshare.c:947
+#, fuzzy
+#| msgid "sigprocmask failed"
+msgid "sigprocmask block failed"
+msgstr "sigprocmask 失败"
+
+#: 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:1002
+#, fuzzy
+#| msgid "sigprocmask failed"
+msgid "sigprocmask unblock failed"
+msgstr "sigprocmask 失败"
+
+#: sys-utils/unshare.c:1006
msgid "child exit failed"
msgstr "子进程退出失败"
-#: sys-utils/unshare.c:631
+#: 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:646
+#: sys-utils/unshare.c:1060
#, c-format
msgid "cannot change root directory to '%s'"
msgstr "无法更改根目录至“%s”"
-#: sys-utils/unshare.c:650
+#: sys-utils/unshare.c:1064
#, c-format
msgid "cannot chdir to '%s'"
msgstr "无法更改目录（chdir）到“%s”"
-#: sys-utils/unshare.c:654
+#: 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:656
+#: sys-utils/unshare.c:1080
#, c-format
msgid "mount %s failed"
msgstr "挂载 %s 失败"
-#: sys-utils/unshare.c:681
+#: sys-utils/unshare.c:1105
msgid "capget failed"
msgstr "capget 失败"
-#: sys-utils/unshare.c:689
+#: sys-utils/unshare.c:1113
msgid "capset failed"
msgstr "capset 失败"
-#: sys-utils/unshare.c:701
+#: sys-utils/unshare.c:1125
msgid "prctl(PR_CAP_AMBIENT) failed"
msgstr "prctl(PR_CAP_AMBIENT) 失败"
-#: sys-utils/wdctl.c:72
+#: sys-utils/wdctl.c:73
msgid "Card previously reset the CPU"
msgstr "卡曾经重置 CPU"
-#: sys-utils/wdctl.c:73
+#: sys-utils/wdctl.c:74
msgid "External relay 1"
msgstr "外部中继 1"
-#: sys-utils/wdctl.c:74
+#: sys-utils/wdctl.c:75
msgid "External relay 2"
msgstr "外部中继 2"
-#: sys-utils/wdctl.c:75
+#: sys-utils/wdctl.c:76
msgid "Fan failed"
msgstr "风扇失败"
-#: sys-utils/wdctl.c:76
+#: sys-utils/wdctl.c:77
msgid "Keep alive ping reply"
msgstr "保持活动 ping 回应"
-#: sys-utils/wdctl.c:77
+#: sys-utils/wdctl.c:78
msgid "Supports magic close char"
msgstr "支持 magic close 字符"
-#: sys-utils/wdctl.c:78
+#: sys-utils/wdctl.c:79
msgid "Reset due to CPU overheat"
msgstr "因 CPU 过热重置"
-#: sys-utils/wdctl.c:79
+#: sys-utils/wdctl.c:80
msgid "Power over voltage"
msgstr "供电电压过高"
-#: sys-utils/wdctl.c:80
+#: sys-utils/wdctl.c:81
msgid "Power bad/power fault"
msgstr "供电问题/供电故障"
-#: sys-utils/wdctl.c:81
+#: sys-utils/wdctl.c:82
msgid "Pretimeout (in seconds)"
msgstr "预超时(秒)"
-#: sys-utils/wdctl.c:82
+#: sys-utils/wdctl.c:83
msgid "Set timeout (in seconds)"
msgstr "设置超时(秒)"
-#: sys-utils/wdctl.c:83
+#: sys-utils/wdctl.c:84
msgid "Not trigger reboot"
msgstr "不触发重启"
-#: sys-utils/wdctl.c:99
+#: sys-utils/wdctl.c:100
msgid "flag name"
msgstr "标志名称"
-#: sys-utils/wdctl.c:100
+#: sys-utils/wdctl.c:101
msgid "flag description"
msgstr "标志描述"
-#: sys-utils/wdctl.c:101
+#: sys-utils/wdctl.c:102
msgid "flag status"
msgstr "标志状态"
-#: sys-utils/wdctl.c:102
+#: sys-utils/wdctl.c:103
msgid "flag boot status"
msgstr "标志启动状态"
-#: sys-utils/wdctl.c:103
+#: sys-utils/wdctl.c:104
msgid "watchdog device name"
msgstr "看门狗设备名称"
-#: sys-utils/wdctl.c:148
+#: sys-utils/wdctl.c:166
#, c-format
msgid "unknown flag: %s"
msgstr "未知标志：%s"
-#: sys-utils/wdctl.c:210
+#: sys-utils/wdctl.c:228
msgid "Show the status of the hardware watchdog.\n"
msgstr "显示硬件看门狗的状态。\n"
-#: sys-utils/wdctl.c:213
+#: sys-utils/wdctl.c:231
+#, fuzzy
+#| msgid ""
+#| " -f, --flags <list> print selected flags only\n"
+#| " -F, --noflags don't print information about flags\n"
+#| " -I, --noident don't print watchdog identity information\n"
+#| " -n, --noheadings don't print headings for flags table\n"
+#| " -O, --oneline print all information on one line\n"
+#| " -o, --output <list> output columns of the flags\n"
+#| " -r, --raw use raw output format for flags table\n"
+#| " -T, --notimeouts don't print watchdog timeouts\n"
+#| " -s, --settimeout <sec> set watchdog timeout\n"
+#| " -x, --flags-only print only flags table (same as -I -T)\n"
msgid ""
" -f, --flags <list> print selected flags only\n"
" -F, --noflags don't print information about flags\n"
" -n, --noheadings don't print headings for flags table\n"
" -O, --oneline print all information on one line\n"
" -o, --output <list> output columns of the flags\n"
+" -p, --setpretimeout <sec> set watchdog pre-timeout\n"
+" -g, --setpregovernor <name> set pre-timeout governor\n"
" -r, --raw use raw output format for flags table\n"
" -T, --notimeouts don't print watchdog timeouts\n"
" -s, --settimeout <sec> set watchdog timeout\n"
" -s, --settimeout <秒> 设置看门狗超时\n"
" -x, --flags-only 只打印标志表格(同 -I -T)\n"
-#: sys-utils/wdctl.c:229
+#: sys-utils/wdctl.c:249
#, c-format
msgid "The default device is %s.\n"
msgstr "默认设备为 %s。\n"
-#: sys-utils/wdctl.c:231
+#: sys-utils/wdctl.c:251
#, c-format
msgid "No default device is available.\n"
msgstr "没有可用的默认设备。\n"
-#: sys-utils/wdctl.c:329
+#: sys-utils/wdctl.c:379
#, c-format
msgid "%s: unknown flags 0x%x\n"
msgstr "%s：未知标志 0x%x\n"
-#: sys-utils/wdctl.c:359
+#: sys-utils/wdctl.c:415
#, c-format
msgid "%s: watchdog already in use, terminating."
msgstr "%s：看门狗正在使用，将终止。"
-#: sys-utils/wdctl.c:373 sys-utils/wdctl.c:438
+#: sys-utils/wdctl.c:429 sys-utils/wdctl.c:528
#, c-format
msgid "%s: failed to disarm watchdog"
msgstr "%s：喂看门狗失败"
-#: sys-utils/wdctl.c:382
+#: sys-utils/wdctl.c:439
#, c-format
msgid "cannot set timeout for %s"
msgstr "无法设置 %s 的超时"
-#: sys-utils/wdctl.c:388
+#: sys-utils/wdctl.c:441
#, c-format
msgid "Timeout has been set to %d second.\n"
msgid_plural "Timeout has been set to %d seconds.\n"
msgstr[0] "超时已调整为 %d 秒\n"
-#: sys-utils/wdctl.c:417
+#: sys-utils/wdctl.c:449
+#, fuzzy, c-format
+#| msgid "cannot set timeout for %s"
+msgid "cannot set pretimeout for %s"
+msgstr "无法设置 %s 的超时"
+
+#: sys-utils/wdctl.c:451
+#, fuzzy, c-format
+#| msgid "Timeout has been set to %d second.\n"
+#| msgid_plural "Timeout has been set to %d seconds.\n"
+msgid "Pre-timeout has been set to %d second.\n"
+msgid_plural "Pre-timeout has been set to %d seconds.\n"
+msgstr[0] "超时已调整为 %d 秒\n"
+
+#: sys-utils/wdctl.c:470
+#, fuzzy
+#| msgid "cannot set timeout for %s"
+msgid "cannot set pre-timeout governor"
+msgstr "无法设置 %s 的超时"
+
+#: sys-utils/wdctl.c:500
#, c-format
msgid "%s: failed to get information about watchdog"
msgstr "%s：获取看门狗信息失败"
-#: sys-utils/wdctl.c:503
+#: sys-utils/wdctl.c:609
#, c-format
msgid "cannot read information about %s"
msgstr "无法读取有关 %s 的信息"
-#: sys-utils/wdctl.c:513 sys-utils/wdctl.c:516 sys-utils/wdctl.c:519
+#: 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:514
+#: sys-utils/wdctl.c:621
msgid "Timeout:"
msgstr "超时："
-#: sys-utils/wdctl.c:517
+#: sys-utils/wdctl.c:624
+msgid "Timeleft:"
+msgstr "剩余时间："
+
+#: sys-utils/wdctl.c:627
msgid "Pre-timeout:"
msgstr "预超时："
-#: sys-utils/wdctl.c:520
-msgid "Timeleft:"
-msgstr "剩余时间："
+#: 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:633
+#, fuzzy
+#| msgid "Pre-timeout:"
+msgid "Pre-timeout governor:"
+msgstr "预超时："
+
+#: sys-utils/wdctl.c:639
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Available output columns:\n"
+msgid "Available pre-timeout governors:"
+msgstr ""
+"\n"
+"可用的输出列：\n"
-#: sys-utils/wdctl.c:576
+#: sys-utils/wdctl.c:697
msgid "Device:"
msgstr "设备："
-#: sys-utils/wdctl.c:578
+#: sys-utils/wdctl.c:699
msgid "Identity:"
msgstr "标识："
-#: sys-utils/wdctl.c:580
+#: sys-utils/wdctl.c:701
msgid "version"
msgstr "版本："
-#: sys-utils/wdctl.c:690
+#: sys-utils/wdctl.c:768
+#, fuzzy
+#| msgid "invalid timeout argument"
+msgid "invalid pretimeout argument"
+msgstr "无效的 timeout 超时参数"
+
+#: sys-utils/wdctl.c:822
msgid "No default device is available."
msgstr "无可用默认设备。"
msgstr "设置和控制 zram 设备。\n"
#: sys-utils/zramctl.c:550
-msgid " -a, --algorithm lzo|lz4|lz4hc|deflate|842 compression algorithm to use\n"
+#, fuzzy
+#| msgid " -a, --algorithm lzo|lz4|lz4hc|deflate|842 compression algorithm to use\n"
+msgid " -a, --algorithm <alg> compression algorithm to use\n"
msgstr " -a, --algorithm lzo|lz4|lz4hc|deflate|842 要使用的压缩算法\n"
#: sys-utils/zramctl.c:551
msgid " -t, --streams <number> number of compression streams\n"
msgstr " -t, --streams <数字> 压缩流数量\n"
-#: sys-utils/zramctl.c:654
+#: sys-utils/zramctl.c:567
+msgid " <alg> specify algorithm, supported are:\n"
+msgstr ""
+
+#: sys-utils/zramctl.c:568
+msgid " lzo, lz4, lz4hc, deflate, 842 and zstd\n"
+msgstr ""
+
+#: sys-utils/zramctl.c:657
msgid "failed to parse streams"
msgstr "解析流失败"
-#: sys-utils/zramctl.c:676
+#: sys-utils/zramctl.c:679
msgid "option --find is mutually exclusive with <device>"
msgstr "--find 选项与<设备>互斥"
-#: sys-utils/zramctl.c:682
+#: sys-utils/zramctl.c:685
msgid "only one <device> at a time is allowed"
msgstr "一次只允许一个 <设备>"
-#: sys-utils/zramctl.c:685
+#: sys-utils/zramctl.c:688
msgid "options --algorithm and --streams must be combined with --size"
msgstr "--algorithm 和 --streams 必须与 --size 合用"
-#: sys-utils/zramctl.c:718 sys-utils/zramctl.c:747
+#: sys-utils/zramctl.c:721 sys-utils/zramctl.c:750
#, c-format
msgid "%s: failed to reset"
msgstr "%s︰重置失败"
-#: sys-utils/zramctl.c:729 sys-utils/zramctl.c:737
+#: sys-utils/zramctl.c:732 sys-utils/zramctl.c:740
msgid "no free zram device found"
msgstr "未找到空闲的 zram 设备"
-#: sys-utils/zramctl.c:751
+#: sys-utils/zramctl.c:754
#, c-format
msgid "%s: failed to set number of streams"
msgstr "%s︰设置流数量失败"
-#: sys-utils/zramctl.c:755
+#: sys-utils/zramctl.c:758
#, c-format
msgid "%s: failed to set algorithm"
msgstr "%s︰设置算法失败"
-#: sys-utils/zramctl.c:758
+#: sys-utils/zramctl.c:761
#, c-format
msgid "%s: failed to set disksize (%ju bytes)"
msgstr "%s：设置磁盘大小失败(%ju 个字节)"
-#: term-utils/agetty.c:496
+#: term-utils/agetty.c:512
#, c-format
msgid "%s%s (automatic login)\n"
msgstr "%s%s (自动登录)\n"
-#: term-utils/agetty.c:553
+#: term-utils/agetty.c:569
#, c-format
msgid "%s: can't change root directory %s: %m"
msgstr "%s：无法更改根目录 %s：%m"
-#: term-utils/agetty.c:556
+#: term-utils/agetty.c:572
#, c-format
msgid "%s: can't change working directory %s: %m"
msgstr "%s：无法更改工作目录 %s：%m"
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:575
#, c-format
msgid "%s: can't change process priority: %m"
msgstr "%s：无法更改进程优先级：%m"
-#: term-utils/agetty.c:570
+#: term-utils/agetty.c:586
#, c-format
msgid "%s: can't exec %s: %m"
msgstr "%s：无法执行 %s：%m"
-#: term-utils/agetty.c:601 term-utils/agetty.c:939 term-utils/agetty.c:1483
-#: term-utils/agetty.c:1501 term-utils/agetty.c:1538 term-utils/agetty.c:1548
-#: term-utils/agetty.c:1590 term-utils/agetty.c:1951 term-utils/agetty.c:2307
-#: term-utils/agetty.c:2868
+#: 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:778
+#: term-utils/agetty.c:791
msgid "invalid delay argument"
msgstr "无效的延迟参数"
-#: term-utils/agetty.c:816
+#: term-utils/agetty.c:829
msgid "invalid argument of --local-line"
msgstr "--local-line 选项参数无效"
-#: term-utils/agetty.c:835
+#: term-utils/agetty.c:848
msgid "invalid nice argument"
msgstr "无效的 nice 参数"
-#: term-utils/agetty.c:944
+#: 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:966
#, c-format
msgid "bad speed: %s"
msgstr "速度有误：%s"
-#: term-utils/agetty.c:946
+#: term-utils/agetty.c:968
msgid "too many alternate speeds"
msgstr "备选速度过多"
-#: term-utils/agetty.c:1053 term-utils/agetty.c:1057 term-utils/agetty.c:1110
+#: 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:1076
+#: term-utils/agetty.c:1098
#, c-format
msgid "/dev/%s: not a character device"
msgstr "/dev/%s：不是字符设备"
-#: term-utils/agetty.c:1078
+#: term-utils/agetty.c:1100
#, c-format
msgid "/dev/%s: not a tty"
msgstr "/dev/%s：不是终端"
-#: term-utils/agetty.c:1082 term-utils/agetty.c:1114
+#: 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:1104
+#: term-utils/agetty.c:1126
#, c-format
msgid "/dev/%s: vhangup() failed: %m"
msgstr "/dev/%s：vhangup() 失败：%m"
-#: term-utils/agetty.c:1125
+#: term-utils/agetty.c:1147
#, c-format
msgid "%s: not open for read/write"
msgstr "%s：未打开(就)读/写"
-#: term-utils/agetty.c:1130
+#: term-utils/agetty.c:1152
#, c-format
msgid "/dev/%s: cannot set process group: %m"
msgstr "/dev/%s：无法设置进程组：%m"
-#: term-utils/agetty.c:1144
+#: term-utils/agetty.c:1166
#, c-format
msgid "%s: dup problem: %m"
msgstr "%s：dup 问题：%m"
-#: term-utils/agetty.c:1161
+#: term-utils/agetty.c:1183
#, c-format
msgid "%s: failed to get terminal attributes: %m"
msgstr "%s：获取终端属性失败：%m"
-#: term-utils/agetty.c:1380 term-utils/agetty.c:1409
+#: term-utils/agetty.c:1414 term-utils/agetty.c:1443
#, c-format
msgid "setting terminal attributes failed: %m"
msgstr "设置终端属性失败：%m"
-#: term-utils/agetty.c:1528
+#: term-utils/agetty.c:1562
msgid "cannot open os-release file"
msgstr "无法打开 os-release 文件"
-#: term-utils/agetty.c:1695
+#: term-utils/agetty.c:1729
#, c-format
msgid "failed to create reload file: %s: %m"
msgstr "未能创建 reload 文件︰%s：%m"
-#: term-utils/agetty.c:2015
+#: term-utils/agetty.c:2049
#, c-format
msgid "failed to get terminal attributes: %m"
msgstr "获取终端属性失败：%m"
-#: term-utils/agetty.c:2037
+#: term-utils/agetty.c:2071
msgid "[press ENTER to login]"
msgstr "[按 ENTER 键登录]"
-#: term-utils/agetty.c:2064
+#: term-utils/agetty.c:2099
msgid "Num Lock off"
msgstr "Num Lock 关"
-#: term-utils/agetty.c:2067
+#: term-utils/agetty.c:2102
msgid "Num Lock on"
msgstr "Num Lock 开"
-#: term-utils/agetty.c:2070
+#: term-utils/agetty.c:2105
msgid "Caps Lock on"
msgstr "Caps Lock 开"
-#: term-utils/agetty.c:2073
+#: term-utils/agetty.c:2108
msgid "Scroll Lock on"
msgstr "Scroll Lock 开"
-#: term-utils/agetty.c:2076
+#: term-utils/agetty.c:2111
#, c-format
msgid ""
"Hint: %s\n"
"提示：%s\n"
"\n"
-#: term-utils/agetty.c:2218
+#: term-utils/agetty.c:2255
#, c-format
msgid "%s: read: %m"
msgstr "%s：read：%m"
-#: term-utils/agetty.c:2283
+#: term-utils/agetty.c:2322
#, c-format
msgid "%s: input overrun"
msgstr "%s：输入过载"
-#: term-utils/agetty.c:2303 term-utils/agetty.c:2311
+#: 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:2317
+#: term-utils/agetty.c:2356
#, c-format
msgid "%s: invalid character 0x%x in login name"
msgstr "%s：登录名中的字符 0x%x 无效"
-#: term-utils/agetty.c:2402
+#: term-utils/agetty.c:2441
#, c-format
msgid "%s: failed to set terminal attributes: %m"
msgstr "%s：设置终端属性失败：%m"
-#: term-utils/agetty.c:2440
+#: 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:2444
+#: term-utils/agetty.c:2490
msgid "Open a terminal and set its mode.\n"
msgstr "打开一个终端并设置其模式。\n"
-#: term-utils/agetty.c:2447
+#: term-utils/agetty.c:2493
msgid " -8, --8bits assume 8-bit tty\n"
msgstr " -8, --8bits 采用 8 位 tty\n"
-#: term-utils/agetty.c:2448
+#: term-utils/agetty.c:2494
msgid " -a, --autologin <user> login the specified user automatically\n"
msgstr " -a, --autologin <用户> 以指定用户自动登录\n"
-#: term-utils/agetty.c:2449
+#: term-utils/agetty.c:2495
msgid " -c, --noreset do not reset control mode\n"
msgstr " -c, --noreset 不重置控制模式\n"
-#: term-utils/agetty.c:2450
+#: 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:2451
+#: 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:2452
+#: term-utils/agetty.c:2498
msgid " --show-issue display issue file and exit\n"
msgstr " --show-issue 显示预登录（issue）文件并退出\n"
-#: term-utils/agetty.c:2453
+#: term-utils/agetty.c:2499
msgid " -h, --flow-control enable hardware flow control\n"
msgstr " -h, --flow-control 启用硬件流控制\n"
-#: term-utils/agetty.c:2454
+#: term-utils/agetty.c:2500
msgid " -H, --host <hostname> specify login host\n"
msgstr " -H, --host <主机名> 指定登录主机\n"
-#: term-utils/agetty.c:2455
+#: term-utils/agetty.c:2501
msgid " -i, --noissue do not display issue file\n"
msgstr " -i, --noissue 不显示预登录消息(issue)文件\n"
-#: term-utils/agetty.c:2456
+#: term-utils/agetty.c:2502
msgid " -I, --init-string <string> set init string\n"
msgstr " -I, --init-string <字符串> 设置初始字符串\n"
-#: term-utils/agetty.c:2457
+#: term-utils/agetty.c:2503
msgid " -J --noclear do not clear the screen before prompt\n"
msgstr " -J --noclear 提示之前不清屏\n"
-#: term-utils/agetty.c:2458
+#: term-utils/agetty.c:2504
msgid " -l, --login-program <file> specify login program\n"
msgstr " -l, --login-program <文件> 指定登录程序\n"
-#: term-utils/agetty.c:2459
+#: 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:2460
+#: term-utils/agetty.c:2506
msgid " -m, --extract-baud extract baud rate during connect\n"
msgstr " -m, --extract-baud 连接过程中提取波特率\n"
-#: term-utils/agetty.c:2461
+#: term-utils/agetty.c:2507
msgid " -n, --skip-login do not prompt for login\n"
msgstr " -n, --skip-login 不提示登录\n"
-#: term-utils/agetty.c:2462
+#: 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:2463
+#: 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:2464
+#: 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:2465
+#: term-utils/agetty.c:2511
msgid " -r, --chroot <dir> change root to the directory\n"
msgstr " -r, --chroot <目录> 将根目录更改为指定目录\n"
-#: term-utils/agetty.c:2466
+#: 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:2467
+#: 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:2468
+#: term-utils/agetty.c:2514
msgid " -t, --timeout <number> login process timeout\n"
msgstr " -t, --timeout <数字> 登录进程超时(秒)\n"
-#: term-utils/agetty.c:2469
+#: term-utils/agetty.c:2515
msgid " -U, --detect-case detect uppercase terminal\n"
msgstr " -U, --detect-case 检测纯大写终端\n"
-#: term-utils/agetty.c:2470
+#: term-utils/agetty.c:2516
msgid " -w, --wait-cr wait carriage-return\n"
msgstr " -w, --wait-cr 等待回车\n"
-#: term-utils/agetty.c:2471
+#: term-utils/agetty.c:2517
msgid " --nohints do not print hints\n"
msgstr " --nohints 不打印提示信息\n"
-#: term-utils/agetty.c:2472
+#: term-utils/agetty.c:2518
msgid " --nohostname no hostname at all will be shown\n"
msgstr " --nohostname 将完全不显示主机名\n"
-#: term-utils/agetty.c:2473
+#: term-utils/agetty.c:2519
msgid " --long-hostname show full qualified hostname\n"
msgstr " --long-hostname 显示完全限定主机名\n"
-#: term-utils/agetty.c:2474
+#: term-utils/agetty.c:2520
msgid " --erase-chars <string> additional backspace chars\n"
msgstr " --erase-chars <字符串> 附加的退格字符\n"
-#: term-utils/agetty.c:2475
+#: term-utils/agetty.c:2521
msgid " --kill-chars <string> additional kill chars\n"
msgstr " --kill-chars <字符串> 附加的杀死(kill)字符\n"
-#: term-utils/agetty.c:2476
+#: term-utils/agetty.c:2522
msgid " --chdir <directory> chdir before the login\n"
msgstr " --chdir <目录> 登录前切换目录(chdir)\n"
-#: term-utils/agetty.c:2477
+#: term-utils/agetty.c:2523
msgid " --delay <number> sleep seconds before prompt\n"
msgstr " --delay <数字> 提示前睡眠的秒数\n"
-#: term-utils/agetty.c:2478
+#: term-utils/agetty.c:2524
msgid " --nice <number> run login with this priority\n"
msgstr " --nice <数字> 以指定优先级运行 login\n"
-#: term-utils/agetty.c:2479
+#: term-utils/agetty.c:2525
msgid " --reload reload prompts on running agetty instances\n"
msgstr " --reload 在运行 agetty 实例时重新载入提示\n"
-#: term-utils/agetty.c:2480
+#: term-utils/agetty.c:2526
msgid " --list-speeds display supported baud rates\n"
msgstr " --list-speeds 显示支持的波特率\n"
-#: term-utils/agetty.c:2825
+#: term-utils/agetty.c:2874
#, c-format
msgid "%d user"
msgid_plural "%d users"
msgstr[0] "%d 位用户"
-#: term-utils/agetty.c:2956
+#: term-utils/agetty.c:3004
#, c-format
msgid "checkname failed: %m"
msgstr "checkname 失败：%m"
-#: term-utils/agetty.c:2968
+#: term-utils/agetty.c:3016
#, c-format
msgid "cannot touch file %s"
msgstr "无法 touch 文件 %s"
-#: term-utils/agetty.c:2972
+#: term-utils/agetty.c:3020
msgid "--reload is unsupported on your system"
msgstr "您的系统不支持 --reload"
msgid "write access to your terminal is denied"
msgstr "对您的终端的写访问已被拒绝"
-#: term-utils/script.c:190
+#: term-utils/script.c:193
#, c-format
msgid " %s [options] [file]\n"
msgstr " %s [选项] [文件]\n"
-#: term-utils/script.c:193
+#: term-utils/script.c:196
msgid "Make a typescript of a terminal session.\n"
msgstr "创建终端会话的打字稿（typescript）。\n"
-#: term-utils/script.c:196
+#: term-utils/script.c:199
msgid " -I, --log-in <file> log stdin to file\n"
msgstr " -I, --log-in <文件> 将标准输入记录到文件\n"
-#: term-utils/script.c:197
+#: term-utils/script.c:200
msgid " -O, --log-out <file> log stdout to file (default)\n"
msgstr " -O, --log-out <文件> 将标准输出记录到文件（默认）\n"
-#: term-utils/script.c:198
+#: term-utils/script.c:201
msgid " -B, --log-io <file> log stdin and stdout to file\n"
msgstr " -B, --log-io <文件> 将标准输入和标准输出记录到文件\n"
-#: term-utils/script.c:201
+#: term-utils/script.c:204
msgid " -T, --log-timing <file> log timing information to file\n"
msgstr " -T, --log-timing <文件> 将时序信息记录到文件\n"
-#: term-utils/script.c:202
+#: term-utils/script.c:205
msgid " -t[<file>], --timing[=<file>] deprecated alias to -T (default file is stderr)\n"
msgstr " -t[<文件>], --timing[=<文件>] 到 -T 的已不建议使用的别名（默认文件为标准错误）\n"
-#: term-utils/script.c:203
+#: term-utils/script.c:206
msgid " -m, --logging-format <name> force to 'classic' or 'advanced' format\n"
msgstr " -m, --logging-format <名称> 强制使用“classic”或“advanced”格式\n"
-#: term-utils/script.c:206
+#: term-utils/script.c:209
msgid " -a, --append append to the log file\n"
msgstr " -a, --append 附加到日志文件\n"
-#: term-utils/script.c:207
+#: term-utils/script.c:210
msgid " -c, --command <command> run command rather than interactive shell\n"
msgstr " -c, --command <命令> 运行指定命令而非启动交互式 shell\n"
-#: term-utils/script.c:208
+#: term-utils/script.c:211
msgid " -e, --return return exit code of the child process\n"
msgstr " -e, --return 返回子进程的退出值\n"
-#: term-utils/script.c:209
+#: term-utils/script.c:212
msgid " -f, --flush run flush after each write\n"
msgstr " -f, --flush 每次写入后清空缓冲区\n"
-#: term-utils/script.c:210
+#: term-utils/script.c:213
msgid " --force use output file even when it is a link\n"
msgstr " --force 强制使用指定输出文件，无论目标文件是链接与否\n"
-#: term-utils/script.c:211
+#: term-utils/script.c:214
#, fuzzy
+#| msgid " -E, --echo <when> echo input (auto, always or never)\n"
msgid " -E, --echo <when> echo input in session (auto, always or never)\n"
msgstr " -E, --echo <时机> 回显输入（, always 或 never）\n"
-#: term-utils/script.c:212
+#: term-utils/script.c:215
msgid " -o, --output-limit <size> terminate if output files exceed size\n"
msgstr " -o, --output-limit <大小> 在输出文件超出指定大小时终止\n"
-#: term-utils/script.c:213
+#: term-utils/script.c:216
msgid " -q, --quiet be quiet\n"
msgstr " -q, --quiet 开启安静模式\n"
-#: term-utils/script.c:296
+#: term-utils/script.c:299
#, c-format
msgid ""
"\n"
"\n"
"脚本完成于 %s [<%s>]\n"
-#: term-utils/script.c:298
+#: term-utils/script.c:301
#, c-format
msgid ""
"\n"
"\n"
"脚本完成于 %s [COMMAND_EXIT_CODE=\"%d\"]\n"
-#: term-utils/script.c:395
+#: term-utils/script.c:399
#, c-format
msgid "Script started on %s ["
msgstr "脚本启动于 %s ["
-#: term-utils/script.c:407
-#, c-format
-msgid "<not executed on terminal>"
+#: term-utils/script.c:415
+#, fuzzy, c-format
+#| msgid "<not executed on terminal>"
+msgid "%*s<not executed on terminal>"
msgstr "<未在终端上执行>"
-#: term-utils/script.c:680
+#: term-utils/script.c:689
#, c-format
msgid "Script terminated, max output files size %<PRIu64> exceeded.\n"
msgstr "脚本已终止，已超过最大输出文件大小 %<PRIu64>。\n"
-#: term-utils/script.c:682
+#: term-utils/script.c:691
msgid "max output size exceeded"
msgstr "超过了最大输出大小"
-#: term-utils/script.c:743
+#: term-utils/script.c:752
#, c-format
msgid ""
"output file `%s' is a link\n"
"如果真想用它，使用 --force 选项。\n"
"程序没有启动。"
-#: term-utils/script.c:822
+#: term-utils/script.c:833
#, c-format
msgid "unssuported echo mode: '%s'"
msgstr "不支持的回显模式：“%s”"
-#: term-utils/script.c:847
+#: term-utils/script.c:858
msgid "failed to parse output limit size"
msgstr "解析输出大小限制失败"
-#: term-utils/script.c:858
-#, fuzzy, c-format
+#: term-utils/script.c:869
+#, c-format
msgid "unsupported logging format: '%s'"
msgstr "不支持的日志格式：“%s”"
-#: term-utils/script.c:902
+#: term-utils/script.c:922
msgid "log multiple streams is mutually exclusive with 'classic' format"
msgstr "无法在使用“classic”（经典）格式时同时记录多个流"
-#: term-utils/script.c:929
+#: term-utils/script.c:949
#, c-format
msgid "Script started"
msgstr "脚本已启动"
-#: term-utils/script.c:931
+#: term-utils/script.c:951
#, c-format
msgid ", output log file is '%s'"
msgstr "，输出日志文件为“%s”"
-#: term-utils/script.c:933
+#: term-utils/script.c:953
#, c-format
msgid ", input log file is '%s'"
msgstr "，输入日志文件为“%s”"
-#: term-utils/script.c:935
+#: term-utils/script.c:955
#, c-format
msgid ", timing file is '%s'"
msgstr "，时序文件为“%s”"
-#: term-utils/script.c:936
+#: term-utils/script.c:956
#, c-format
msgid ".\n"
msgstr "。\n"
-#: term-utils/script.c:1042
+#: term-utils/script.c:1065
#, c-format
msgid "Script done.\n"
msgstr "脚本已完成。\n"
#: term-utils/scriptlive.c:73
#, fuzzy
+#| msgid " -c, --command <command> run a single command string through the shell\n"
msgid " -c, --command <command> run command rather than interactive shell\n"
msgstr " -c, --command <命令> 通过 shell 运行单个命令字符串\n"
#: term-utils/scriptlive.c:75 term-utils/scriptreplay.c:68
#, fuzzy
+#| msgid " --delay <number> sleep seconds before prompt\n"
msgid " -m, --maxdelay <num> wait at most this many seconds between updates\n"
msgstr " --delay <数字> 提示前睡眠的秒数\n"
#: term-utils/scriptlive.c:226 term-utils/scriptreplay.c:233
#, fuzzy
+#| msgid "failed to parse argument"
msgid "failed to parse maximal delay argument"
msgstr "解析参数失败"
#: term-utils/scriptlive.c:251
#, fuzzy
+#| msgid "no input file specified"
msgid "stdin typescript file not specified"
msgstr "未指定输入文件"
#: term-utils/scriptlive.c:284
#, fuzzy
+#| msgid "failed to allocate script handler"
msgid "failed to allocate PTY handler"
msgstr "分配脚本处理程序失败"
-#: term-utils/scriptlive.c:363
+#: term-utils/scriptlive.c:365
#, c-format
msgid ""
"\n"
#: term-utils/scriptreplay.c:66
#, fuzzy
+#| msgid " -V display version information and exit\n"
msgid " --summary display overview about recorded session and exit\n"
msgstr " -V 显示版本信息并退出\n"
msgstr " -c, --cr-mode <类型> CR 字符模式（auto, never, always）\n"
#: term-utils/scriptreplay.c:131
-#, fuzzy
msgid "unexpected tcgetattr failure"
-msgstr "tcgetattr 失败"
+msgstr "未预期的 tcgetattr 失败"
#: term-utils/scriptreplay.c:212
#, c-format
#: term-utils/setterm.c:388
#, fuzzy
+#| msgid " --reset reset terminal to power-on state\n"
msgid " --reset reset terminal to power-on state\n"
msgstr " --reset 重置端口到上电时的状态\n"
#: term-utils/setterm.c:389
#, fuzzy
+#| msgid " --resize reset terminal rows and columns\n"
msgid " --resize reset terminal rows and columns\n"
msgstr " --resize 重置终端行和列大小\n"
#: term-utils/setterm.c:390
#, fuzzy
+#| msgid " --initialize display init string, and use default settings\n"
msgid " --initialize display init string, and use default settings\n"
msgstr " --initialize 显示初始化字符串，并使用默认设置\n"
#: term-utils/setterm.c:392
#, fuzzy
+#| msgid " --store save current terminal settings as default\n"
msgid " --store save current terminal settings as default\n"
msgstr " --store 将当前终端设置保存为默认值\n"
#: term-utils/setterm.c:395
#, fuzzy
+#| msgid " --cursor [on|off] display cursor\n"
msgid " --cursor on|off display cursor\n"
msgstr " --cursor [on|off] 显示光标\n"
#: term-utils/setterm.c:396
#, fuzzy
+#| msgid " --repeat [on|off] keyboard repeat\n"
msgid " --repeat on|off keyboard repeat\n"
msgstr " --repeat [on|off] 键盘重复\n"
#: term-utils/setterm.c:397
#, fuzzy
+#| msgid " --appcursorkeys [on|off] cursor key application mode\n"
msgid " --appcursorkeys on|off cursor key application mode\n"
msgstr " --appcursorkeys [on|off] 光标键应用程序模式\n"
#: term-utils/setterm.c:398
#, fuzzy
+#| msgid " --linewrap [on|off] continue on a new line when a line is full\n"
msgid " --linewrap on|off continue on a new line when a line is full\n"
msgstr " --linewrap [on|off] 一行满时在新行中继续\n"
#: term-utils/setterm.c:399
#, fuzzy
+#| msgid " --inversescreen [on|off] swap colors for the whole screen\n"
msgid " --inversescreen on|off swap colors for the whole screen\n"
msgstr " --inversescreen [on|off] 交换整个屏幕的颜色\n"
#: term-utils/setterm.c:421
#, fuzzy
+#| msgid " --tabs [<number>...] set these tab stop positions, or show them\n"
msgid " --tabs[=<number>...] set these tab stop positions, or show them\n"
msgstr " --tabs [<数字>...] 设置这些制表位置，或显示制表位\n"
#: term-utils/setterm.c:422
#, fuzzy
+#| msgid " --clrtabs [<number>...] clear these tab stop positions, or all\n"
msgid " --clrtabs[=<number>...] clear these tab stop positions, or all\n"
msgstr " --clrtabs [<数字>...] 清除这些或所有制表位\n"
#: term-utils/setterm.c:423
#, fuzzy
+#| msgid " --regtabs [1-160] set a regular tab stop interval\n"
msgid " --regtabs[=1-160] set a regular tab stop interval\n"
msgstr " --regtabs [1-160] 设置常规的制表位间隔\n"
#: term-utils/setterm.c:424
#, fuzzy
+#| msgid " --blank [0-60|force|poke] set time of inactivity before screen blanks\n"
msgid " --blank[=0-60|force|poke] set time of inactivity before screen blanks\n"
msgstr " --blank [0-60|force|poke] 设置多久不活动后屏幕变空白\n"
#: term-utils/setterm.c:427
#, fuzzy
+#| msgid " --dump [<number>] write vcsa<number> console dump to file\n"
msgid " --dump[=<number>] write vcsa<number> console dump to file\n"
msgstr " --dump [<数字>] 将 vcsa<数字> 终端转储到文件\n"
#: term-utils/setterm.c:428
#, fuzzy
+#| msgid " --append [<number>] append vcsa<number> console dump to file\n"
msgid " --append <number> append vcsa<number> console dump to file\n"
msgstr " --append [<数字>] 将 vcsa<数字> 终端转储追加到文件\n"
msgid "%s: BAD ERROR, message is far too long"
msgstr "%s：严重错误，消息太长太长了"
-#: term-utils/wall.c:88
+#: term-utils/wall.c:89
#, c-format
msgid " %s [options] [<file> | <message>]\n"
msgstr " %s [选项] [<文件> | <消息>]\n"
-#: term-utils/wall.c:91
+#: term-utils/wall.c:92
msgid "Write a message to all users.\n"
msgstr "向所有用户发消息。\n"
-#: term-utils/wall.c:94
+#: term-utils/wall.c:95
#, fuzzy
+#| msgid " -g, --group <group> specify the primary group\n"
msgid " -g, --group <group> only send message to group\n"
msgstr " -g, --group <组> 指定主组\n"
-#: term-utils/wall.c:95
+#: term-utils/wall.c:96
msgid " -n, --nobanner do not print banner, works only for root\n"
msgstr " -n, --nobanner 不打印欢迎消息，只对 root 用户生效\n"
-#: term-utils/wall.c:96
+#: term-utils/wall.c:97
msgid " -t, --timeout <timeout> write timeout in seconds\n"
msgstr " -t, --timeout <超时> 写超时(秒)\n"
-#: term-utils/wall.c:124
+#: term-utils/wall.c:125
msgid "invalid group argument"
msgstr "无效的组参数"
-#: term-utils/wall.c:126
+#: term-utils/wall.c:127
#, c-format
msgid "%s: unknown gid"
msgstr "%s：未知的 gid"
-#: term-utils/wall.c:169
+#: term-utils/wall.c:170
msgid "getgrouplist found more groups than sysconf allows"
msgstr ""
-#: term-utils/wall.c:215
+#: term-utils/wall.c:216
msgid "--nobanner is available only for root"
msgstr "--nobanner 只有 root 能用"
-#: term-utils/wall.c:220
+#: term-utils/wall.c:221
#, c-format
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 上禁用了消息"
#: text-utils/col.c:174
#, fuzzy
+#| msgid "Filter out reverse line feeds.\n"
msgid "Filter out reverse line feeds from standard input.\n"
msgstr "过滤反换行。\n"
msgid "bad -l argument"
msgstr "-l 参数有误"
-#: text-utils/colcrt.c:82 text-utils/column.c:663
+#: 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:336
+#: text-utils/column.c:403
msgid "failed to parse --table-order list"
msgstr "解析 --table-order 列表失败"
-#: text-utils/column.c:412
+#: 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:416
+#: text-utils/column.c:489
msgid "failed to parse --table-trunc list"
msgstr "解析 --table-trunc 列表失败"
-#: text-utils/column.c:420
+#: text-utils/column.c:493
msgid "failed to parse --table-noextreme list"
msgstr "解析 --table-noextreme 列表失败"
-#: text-utils/column.c:424
+#: text-utils/column.c:497
msgid "failed to parse --table-wrap list"
msgstr "解析 --table-wrap 列表失败"
-#: text-utils/column.c:428
-msgid "failed to parse --table-hide list"
-msgstr "解析 --table-hide 列表失败"
-
-#: text-utils/column.c:465
+#: 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:481
+#: text-utils/column.c:566
msgid "failed to allocate output data"
msgstr "分配输出数据失败"
-#: text-utils/column.c:666
+#: text-utils/column.c:751
msgid "Columnate lists.\n"
msgstr "成列输出内容。\n"
-#: text-utils/column.c:669
+#: text-utils/column.c:754
msgid " -t, --table create a table\n"
msgstr " -t, --table 创建表格\n"
-#: text-utils/column.c:670
+#: 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:671
+#: 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:672
+#: 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:673
+#: 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:674
+#: 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:675
+#: 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:676
+#: 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:677
+#: 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:678
+#: text-utils/column.c:765
msgid " -R, --table-right <columns> right align text in these columns\n"
msgstr ""
-#: text-utils/column.c:679
+#: 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:680
+#: text-utils/column.c:767
msgid " -W, --table-wrap <columns> wrap text in the columns when necessary\n"
msgstr ""
-#: text-utils/column.c:681
+#: 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:682
+#: 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:685
+#: 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:686
+#: 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:687
+#: 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:690
+#: 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:691
+#: text-utils/column.c:778
#, fuzzy
+#| msgid ""
+#| " -o, --output-separator <string>\n"
+#| " columns separator for table output; default is two spaces\n"
msgid " -o, --output-separator <string> columns separator for table output (default is two spaces)\n"
msgstr ""
" -o, --output-separator <字符串>\n"
" 表格输出列分隔符，默认为两个空格\n"
-#: text-utils/column.c:692
+#: 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:693
+#: 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:764
+#: text-utils/column.c:861
msgid "invalid columns argument"
msgstr "无效的 列数 参数"
-#: text-utils/column.c:789
+#: text-utils/column.c:887
#, fuzzy
+#| msgid "invalid columns argument"
msgid "invalid columns limit argument"
msgstr "无效的 列数 参数"
-#: text-utils/column.c:791
+#: text-utils/column.c:889
msgid "columns limit must be greater than zero"
msgstr ""
-#: text-utils/column.c:794
+#: text-utils/column.c:892
msgid "failed to parse column names"
msgstr "解析列名称失败"
-#: text-utils/column.c:849
+#: text-utils/column.c:919
+#, fuzzy
+#| msgid "failed to allocate iterator"
+msgid "failed to use input separator"
+msgstr "分配迭代器失败"
+
+#: 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:235
+#: text-utils/hexdump.c:162 text-utils/more.c:237
#, c-format
msgid " %s [options] <file>...\n"
msgstr " %s [选项] <文件>...\n"
msgid "<length> and <offset>"
msgstr ""
-#: text-utils/hexdump-display.c:364
+#: text-utils/hexdump-display.c:366
msgid "all input file arguments failed"
msgstr "所有输入文件参数失败"
msgid "bad conversion character %%%s"
msgstr "转换字符 %%%s 有误"
-#: text-utils/hexdump-parse.c:436
+#: 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:238
+#: text-utils/more.c:240
#, fuzzy
-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:241
+#: 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:242
+#: 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:243
+#: 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:244
+#: 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:245
+#: 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:246
+#: text-utils/more.c:248
+msgid " -e, --exit-on-eof exit on end-of-file"
+msgstr ""
+
+#: 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:247
+#: 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:248
+#: 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:249
+#: 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:250
+#: 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:251
+#: 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:352
-#, fuzzy
+#: text-utils/more.c:357
msgid "MORE environment variable"
-msgstr "设置环境变量 %s 失败"
+msgstr "MORE 环境变量"
-#: text-utils/more.c:405
-#, fuzzy
+#: text-utils/more.c:410
msgid "magic failed"
-msgstr "mkdir 失败：%s"
+msgstr "魔数校验失败"
-#: text-utils/more.c:409 text-utils/more.c:428
+#: text-utils/more.c:414 text-utils/more.c:433
#, c-format
msgid ""
"\n"
"\n"
msgstr ""
"\n"
-"******** %s：不是文件文件 ********\n"
+"******** %s：不是文本文件 ********\n"
"\n"
-#: text-utils/more.c:461
+#: text-utils/more.c:467
#, c-format
msgid ""
"\n"
"*** %s：目录 ***\n"
"\n"
-#: text-utils/more.c:727
+#: text-utils/more.c:729
#, c-format
msgid "--More--"
msgstr "--更多--"
-#: text-utils/more.c:729
+#: text-utils/more.c:731
#, c-format
msgid "(Next file: %s)"
msgstr "(下个文件：%s)"
-#: text-utils/more.c:737
+#: text-utils/more.c:736 text-utils/more.c:742
+#, c-format
+msgid "(END)"
+msgstr ""
+
+#: text-utils/more.c:747
#, c-format
msgid "[Press space to continue, 'q' to quit.]"
msgstr "[按空格键继续，“q”键退出。]"
-#: text-utils/more.c:938
+#: text-utils/more.c:949
msgid ""
"\n"
"...Skipping "
"\n"
"...跳过 "
-#: text-utils/more.c:942
+#: text-utils/more.c:953
msgid "...Skipping to file "
msgstr "...跳到文件 "
-#: text-utils/more.c:944
+#: text-utils/more.c:955
msgid "...Skipping back to file "
msgstr "...将跳回文件 "
-#: text-utils/more.c:1106
+#: text-utils/more.c:1117
msgid "Line too long"
msgstr "行过长"
-#: text-utils/more.c:1144
+#: text-utils/more.c:1160
msgid "No previous command to substitute for"
msgstr "没有要替换的前一命令"
-#: text-utils/more.c:1173
+#: text-utils/more.c:1189
#, c-format
msgid "[Use q or Q to quit]"
msgstr "[使用 q 或 Q 退出]"
-#: text-utils/more.c:1261
+#: text-utils/more.c:1275
msgid "exec failed\n"
msgstr "exec 失败\n"
-#: text-utils/more.c:1271
+#: text-utils/more.c:1285
msgid "can't fork\n"
msgstr "无法 fork\n"
-#: text-utils/more.c:1427
+#: text-utils/more.c:1441
msgid "...skipping\n"
msgstr "...跳过\n"
-#: text-utils/more.c:1464
+#: text-utils/more.c:1478
msgid ""
"\n"
"Pattern not found\n"
"\n"
"未找到模式\n"
-#: text-utils/more.c:1468 text-utils/pg.c:1036 text-utils/pg.c:1184
+#: text-utils/more.c:1482 text-utils/pg.c:1032 text-utils/pg.c:1180
msgid "Pattern not found"
msgstr "找不到模式"
-#: text-utils/more.c:1486
+#: text-utils/more.c:1500
#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Most commands optionally preceded by integer argument k. Defaults in brackets.\n"
+#| "Star (*) indicates argument becomes new default.\n"
msgid ""
"Most commands optionally preceded by integer argument k. Defaults in brackets.\n"
"Star (*) indicates argument becomes new default.\n"
"多数命令可在前面加整数参数 k。方括号中为参数的默认值\n"
"星号(*)表示参数将成为新的默认值。\n"
-#: text-utils/more.c:1492
+#: text-utils/more.c:1506
#, fuzzy, c-format
+#| msgid ""
+#| "<space> Display next k lines of text [current screen size]\n"
+#| "z Display next k lines of text [current screen size]*\n"
+#| "<return> Display next k lines of text [1]*\n"
+#| "d or ctrl-D Scroll k lines [current scroll size, initially 11]*\n"
+#| "q or Q or <interrupt> Exit from more\n"
+#| "s Skip forward k lines of text [1]\n"
+#| "f Skip forward k screenfuls of text [1]\n"
+#| "b or ctrl-B Skip backwards k screenfuls of text [1]\n"
+#| "' Go to place where previous search started\n"
+#| "= Display current line number\n"
+#| "/<regular expression> Search for kth occurrence of regular expression [1]\n"
+#| "n Search for kth occurrence of last r.e [1]\n"
+#| "!<cmd> or :!<cmd> Execute <cmd> in a subshell\n"
+#| "v Start up /usr/bin/vi at current line\n"
+#| "ctrl-L Redraw screen\n"
+#| ":n Go to kth next file [1]\n"
+#| ":p Go to kth previous file [1]\n"
+#| ":f Display current file name and line number\n"
+#| ". Repeat previous command\n"
msgid ""
"<space> Display next k lines of text [current screen size]\n"
"z Display next k lines of text [current screen size]*\n"
":f 显示当前文件名和行号\n"
". 重复前一命令\n"
-#: text-utils/more.c:1558
+#: text-utils/more.c:1572
#, c-format
msgid "...back %d page"
msgid_plural "...back %d pages"
msgstr[0] "...后退 %d 页"
-#: text-utils/more.c:1582
+#: text-utils/more.c:1596
#, c-format
msgid "...skipping %d line"
msgid_plural "...skipping %d lines"
msgstr[0] "...跳过 %d 行"
-#: text-utils/more.c:1682
+#: text-utils/more.c:1696
msgid ""
"\n"
"***Back***\n"
"***后退***\n"
"\n"
-#: text-utils/more.c:1701
+#: text-utils/more.c:1715
#, c-format
msgid "\"%s\" line %d"
msgstr "“%s”第 %d 行"
-#: text-utils/more.c:1704
+#: text-utils/more.c:1718
#, c-format
msgid "[Not a file] line %d"
msgstr "[不是文件] 第 %d 行"
-#: text-utils/more.c:1710
+#: text-utils/more.c:1724
msgid "No previous regular expression"
msgstr "无上一个正则表达式"
-#: text-utils/more.c:1779
+#: text-utils/more.c:1793
#, c-format
msgid "[Press 'h' for instructions.]"
msgstr "[按“h”键获取说明。]"
msgid "illegal option -- %s"
msgstr "非法的参数 -- %s"
-#: text-utils/pg.c:367
+#: text-utils/pg.c:366
msgid "...skipping forward\n"
msgstr "...前进\n"
-#: text-utils/pg.c:369
+#: text-utils/pg.c:368
msgid "...skipping backward\n"
msgstr "...后退\n"
-#: text-utils/pg.c:385
+#: text-utils/pg.c:384
msgid "No next file"
msgstr "无下一个文件"
-#: text-utils/pg.c:389
+#: text-utils/pg.c:388
msgid "No previous file"
msgstr "无上一个文件"
-#: text-utils/pg.c:891
+#: text-utils/pg.c:887
#, c-format
msgid "Read error from %s file"
msgstr "从 %s 文件读出错"
-#: text-utils/pg.c:894
+#: text-utils/pg.c:890
#, c-format
msgid "Unexpected EOF in %s file"
msgstr "在 %s 文件中遇到异常 EOF"
-#: text-utils/pg.c:896
+#: text-utils/pg.c:892
#, c-format
msgid "Unknown error in %s file"
msgstr "在 %s 文件中遇到未知错误"
-#: text-utils/pg.c:949
+#: text-utils/pg.c:945
msgid "Cannot create temporary file"
msgstr "无法创建临时文件"
-#: text-utils/pg.c:958 text-utils/pg.c:1125 text-utils/pg.c:1151
+#: text-utils/pg.c:954 text-utils/pg.c:1121 text-utils/pg.c:1147
msgid "RE error: "
msgstr "表达式错误："
-#: text-utils/pg.c:1108
+#: text-utils/pg.c:1104
msgid "(EOF)"
msgstr "(文件末尾)"
-#: text-utils/pg.c:1133 text-utils/pg.c:1159
+#: text-utils/pg.c:1129 text-utils/pg.c:1155
msgid "No remembered search string"
msgstr "没有记忆的搜索字符串"
-#: text-utils/pg.c:1214
+#: text-utils/pg.c:1210
msgid "cannot open "
msgstr "打不开 "
-#: text-utils/pg.c:1266
+#: text-utils/pg.c:1262
msgid "saved"
msgstr "已保存"
-#: text-utils/pg.c:1356
+#: text-utils/pg.c:1352
msgid ": !command not allowed in rflag mode.\n"
msgstr ": !命令 在 rflag 模式下不许使用。\n"
-#: text-utils/pg.c:1390
+#: text-utils/pg.c:1386
msgid "fork() failed, try again later\n"
msgstr "fork() 失败，请稍后重试\n"
-#: text-utils/pg.c:1478
+#: text-utils/pg.c:1474
msgid "(Next file: "
msgstr "(下个文件："
-#: text-utils/pg.c:1544
+#: text-utils/pg.c:1540
#, c-format
msgid "%s %s Copyright (c) 2000-2001 Gunnar Ritter. All rights reserved.\n"
msgstr "%s %s Copyright (c) 2000-2001 Gunnar Ritter. All rights reserved.\n"
-#: text-utils/pg.c:1597 text-utils/pg.c:1670
+#: text-utils/pg.c:1593 text-utils/pg.c:1666
msgid "failed to parse number of lines per page"
msgstr "解析每页的行数失败"
msgid "terminal `%s' is not known, defaulting to `dumb'"
msgstr "终端“%s”未知，将使用默认值“dumb”"
-#~ msgid "Filename"
-#~ msgstr "文件名"
+#, c-format
+#~ msgid "chown failed: %s"
+#~ msgstr "chown 失败：%s"
#, c-format
-#~ msgid "umount %s failed"
-#~ msgstr "卸载 %s 失败"
+#~ msgid "waitpid failed (%s)"
+#~ msgstr "waitpid 失败(%s)"
+
+#, c-format
+#~ msgid "Interrupted %s"
+#~ msgstr "中断的 %s"
+
+#, fuzzy
+#~| 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
+#~| msgid "closing %s failed"
+#~ msgid "Visiting %s (file %zu)"
+#~ msgstr "关闭 %s 失败"
+
+#~ msgid " -v, --verbose display more details"
+#~ msgstr " -v, --verbose 显示更多细节"
+
+#~ msgid " %s [options] COMMAND\n"
+#~ msgstr " %s [选项] 命令\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "General Options:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "常规选项：\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Resources Options:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "资源选项：\n"
+
+#~ msgid "cannot stat %s"
+#~ msgstr "无法 stat %s"
+
+#~ msgid "pipe failed"
+#~ msgstr "pipe 失败"
+
#~ msgid ""
#~ "\n"
#~ "Options:\n"
#~ msgid "integer overflow"
#~ msgstr "整数溢出"
-#, fuzzy, c-format
+#, fuzzy
+#~| msgid "failed to change directory to %s"
#~ msgid "file %s changed underneath us"
#~ msgstr "将目录更改到 %s 失败"
-#, c-format
#~ msgid "failed to remove temporary link %s"
#~ msgstr "移除临时链接 %s 失败"
-#, c-format
#~ msgid " %s %s to %s\n"
#~ msgstr " %s %s 到 %s\n"
#~ msgid "option --exclude not supported (built without pcre2)"
#~ msgstr "不支持 --exclude 选项（构建时未配置使用 pcre2）"
-#, fuzzy, c-format
+#, fuzzy
+#~| msgid "%s: parse error at line %d"
#~ msgid "pattern error at offset %d: %s"
#~ msgstr "%s：第 %d 行解析出错"
-#, c-format
#~ msgid "Skipping %s%s\n"
#~ msgstr "跳过 %s%s\n"
#~ msgid "libcap-ng is too old for \"all\" caps"
#~ msgstr "对于“all”权能，libcap-ng 太旧"
-#, c-format
+#~ msgid "Filename"
+#~ msgstr "文件名"
+
+#~ msgid "umount %s failed"
+#~ msgstr "卸载 %s 失败"
+
#~ msgid "failed on line %d"
#~ msgstr "在 %d 行失败"
#~ msgid "write to stdout failed"
#~ msgstr "写 stdout 失败"
-#~ msgid "unexpected end of file on %s"
-#~ msgstr "%s 上的文件结尾异常"
-
#~ msgid "failed to read typescript file %s"
#~ msgstr "读 typescript 文件 %s 失败"
#~ 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 名称"
#~ msgid "cannot open device %s for writing"
#~ msgstr "不能打开 %s 以写入"
-#~ msgid "error writing sector %lu on %s"
-#~ msgstr "写 %2$s 上的 %1$lu 扇区出错"
-
#~ msgid "Disk %s: cannot get geometry"
#~ msgstr "磁盘 %s：无法获取几何属性"
#~ msgid "input error: `=' expected after %s field"
#~ msgstr "输入错误：%s 字段后应为“=”"
-#~ msgid "input error: unexpected character %c after %s field"
-#~ msgstr "输入错误：%2$s 字段后出现异常字符 %1$c"
-
#~ msgid "unrecognized input: %s"
#~ msgstr "无法识别的输入：%s"
#~ " --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"
#~ msgid "Created partition %zd\n"
#~ msgstr "已创建分区 %zd\n"
-#~ msgid " %s [options] -u <USER> COMMAND\n"
-#~ msgstr " %s [选项] -u <USER> COMMAND\n"
-
#~ msgid " %s [options] [-] [USER [arg]...]\n"
#~ msgstr " %s [选项] [-] [USER [参数]...]\n"
projects / thirdparty / util-linux.git / blobdiff