summaryrefslogtreecommitdiffstats
path: root/po/zh_CN.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po7641
1 files changed, 4472 insertions, 3169 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3458551..39bf800 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: util-linux-2.38-rc4\n"
"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2023-12-04 20:35+0100\n"
+"POT-Creation-Date: 2024-03-27 12:52+0100\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"
@@ -29,53 +29,54 @@ msgstr " %s <磁盘设备> <分区号> <起点> <长度>\n"
msgid "Tell the kernel about the existence of a specified partition.\n"
msgstr "通知内核,存在某个指定分区。\n"
-#: disk-utils/addpart.c:62 disk-utils/blockdev.c:259 disk-utils/delpart.c:62
+#: disk-utils/addpart.c:62 disk-utils/blockdev.c:270 disk-utils/delpart.c:62
#: disk-utils/mkfs.bfs.c:142 disk-utils/resizepart.c:106 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
+#: misc-utils/kill.c:384 misc-utils/rename.c:344 misc-utils/whereis.c:539
+#: sys-utils/flock.c:177 sys-utils/ipcrm.c:166 sys-utils/ldattach.c:365
+#: sys-utils/renice.c:177 sys-utils/switch_root.c:261 sys-utils/tunelp.c:152
+#: term-utils/agetty.c:902 term-utils/agetty.c:903 term-utils/agetty.c:911
+#: term-utils/agetty.c:912
msgid "not enough arguments"
msgstr "参数不够"
#. TRANSLATORS: '%s' refers to a file
-#: disk-utils/addpart.c:67 disk-utils/blockdev.c:308 disk-utils/blockdev.c:452
-#: disk-utils/blockdev.c:479 disk-utils/cfdisk.c:2822 disk-utils/delpart.c:68
-#: disk-utils/fdformat.c:238 disk-utils/fdisk.c:812 disk-utils/fdisk.c:1143
+#: disk-utils/addpart.c:67 disk-utils/blockdev.c:319 disk-utils/blockdev.c:466
+#: disk-utils/blockdev.c:493 disk-utils/cfdisk.c:2833 disk-utils/delpart.c:68
+#: disk-utils/fdformat.c:238 disk-utils/fdisk.c:907 disk-utils/fdisk.c:1238
#: disk-utils/fdisk-list.c:337 disk-utils/fdisk-list.c:378
#: disk-utils/fdisk-list.c:401 disk-utils/fsck.c:1477
#: disk-utils/fsck.cramfs.c:160 disk-utils/fsck.cramfs.c:544
#: disk-utils/isosize.c:60 disk-utils/mkfs.bfs.c:210
#: disk-utils/mkfs.cramfs.c:177 disk-utils/mkfs.cramfs.c:666
#: disk-utils/mkfs.cramfs.c:814 disk-utils/mkfs.minix.c:842
-#: disk-utils/mkswap.c:354 disk-utils/mkswap.c:384 disk-utils/partx.c:1029
+#: disk-utils/mkswap.c:363 disk-utils/mkswap.c:406 disk-utils/partx.c:1029
#: disk-utils/resizepart.c:114 disk-utils/sfdisk.c:381 disk-utils/sfdisk.c:502
#: disk-utils/sfdisk.c:814 disk-utils/sfdisk.c:1118 disk-utils/swaplabel.c:67
-#: 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
+#: libfdisk/src/bsd.c:642 login-utils/islocal.c:86 login-utils/last.c:690
+#: login-utils/sulogin.c:574 login-utils/sulogin.c:611
#: 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
+#: misc-utils/fadvise.c:148 misc-utils/findmnt.c:1291 misc-utils/logger.c:1247
+#: misc-utils/mcookie.c:123 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:547 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:479 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
+#: sys-utils/dmesg.c:671 sys-utils/eject.c:501 sys-utils/eject.c:696
+#: sys-utils/fallocate.c:407 sys-utils/fsfreeze.c:116 sys-utils/fstrim.c:106
+#: sys-utils/hwclock.c:248 sys-utils/hwclock.c:919 sys-utils/hwclock-rtc.c:113
+#: sys-utils/hwclock-rtc.c:358 sys-utils/hwclock-rtc.c:394
+#: sys-utils/hwclock-rtc.c:454 sys-utils/hwclock-rtc.c:507
+#: sys-utils/hwclock-rtc.c:561 sys-utils/hwclock-rtc.c:596
+#: sys-utils/irq-common.c:255 sys-utils/ldattach.c:389
+#: sys-utils/lscpu-cputype.c:492 sys-utils/lsmem.c:664 sys-utils/nsenter.c:174
+#: sys-utils/rfkill.c:196 sys-utils/rtcwake.c:146 sys-utils/rtcwake.c:301
+#: sys-utils/setpriv.c:262 sys-utils/setpriv.c:628 sys-utils/setpriv.c:651
+#: sys-utils/swapon.c:395 sys-utils/swapon.c:538 sys-utils/switch_root.c:174
+#: sys-utils/unshare.c:115 sys-utils/unshare.c:130 sys-utils/wdctl.c:422
+#: sys-utils/zramctl.c:517 term-utils/agetty.c:2987 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:353 text-utils/colcrt.c:284 text-utils/more.c:459
+#: term-utils/scriptreplay.c:282 term-utils/scriptreplay.c:285
+#: term-utils/scriptreplay.c:288 term-utils/scriptreplay.c:291
+#: term-utils/wall.c:393 text-utils/colcrt.c:284 text-utils/more.c:460
#: text-utils/rev.c:165 text-utils/ul.c:637
#, c-format
msgid "cannot open %s"
@@ -97,93 +98,99 @@ msgstr "无效的长度参数"
msgid "failed to add partition"
msgstr "添加分区失败"
-#: disk-utils/blockdev.c:72
+#: disk-utils/blockdev.c:75
msgid "set read-only"
msgstr "设置只读"
-#: disk-utils/blockdev.c:79
+#: disk-utils/blockdev.c:82
msgid "set read-write"
msgstr "设置读写"
-#: disk-utils/blockdev.c:85
+#: disk-utils/blockdev.c:88
msgid "get read-only"
msgstr "获得只读"
-#: disk-utils/blockdev.c:91
+#: disk-utils/blockdev.c:94
msgid "get discard zeroes support status"
msgstr "获取 忽略零数据 支持状态"
-#: disk-utils/blockdev.c:97
+#: disk-utils/blockdev.c:100
msgid "get logical block (sector) size"
msgstr "获得逻辑块(扇区)大小"
-#: disk-utils/blockdev.c:103
+#: disk-utils/blockdev.c:106
msgid "get physical block (sector) size"
msgstr "获得物理块(扇区)大小"
-#: disk-utils/blockdev.c:109
+#: disk-utils/blockdev.c:112
msgid "get minimum I/O size"
msgstr "获得最小 I/O 大小"
-#: disk-utils/blockdev.c:115
+#: disk-utils/blockdev.c:118
msgid "get optimal I/O size"
msgstr "获得最优 I/O 大小"
-#: disk-utils/blockdev.c:121
+#: disk-utils/blockdev.c:124
msgid "get alignment offset in bytes"
msgstr "获得对齐偏移字节数"
-#: disk-utils/blockdev.c:127
+#: disk-utils/blockdev.c:130
msgid "get max sectors per request"
msgstr "获得每次请求的最大扇区数"
-#: disk-utils/blockdev.c:133
+#: disk-utils/blockdev.c:136
msgid "get blocksize"
msgstr "获得块大小"
-#: disk-utils/blockdev.c:140
+#: disk-utils/blockdev.c:143
msgid "set blocksize on file descriptor opening the block device"
msgstr "设置打开该块设备的文件描述符的块大小"
-#: disk-utils/blockdev.c:146
+#: disk-utils/blockdev.c:149
msgid "get 32-bit sector count (deprecated, use --getsz)"
msgstr "获得 32-bit 扇区数量(已废弃,请使用 --getsz)"
-#: disk-utils/blockdev.c:152
+#: disk-utils/blockdev.c:155
msgid "get size in bytes"
msgstr "获得字节大小"
-#: disk-utils/blockdev.c:159
+#: disk-utils/blockdev.c:162
msgid "set readahead"
msgstr "设置 readahead"
-#: disk-utils/blockdev.c:165
+#: disk-utils/blockdev.c:168
msgid "get readahead"
msgstr "获取 readahead"
-#: disk-utils/blockdev.c:172
+#: disk-utils/blockdev.c:175
msgid "set filesystem readahead"
msgstr "设置 文件系统 readahead"
-#: disk-utils/blockdev.c:178
+#: disk-utils/blockdev.c:181
msgid "get filesystem readahead"
msgstr "获取 文件系统 readahead"
-#: disk-utils/blockdev.c:184
+#: disk-utils/blockdev.c:187
#, fuzzy
#| msgid "disk serial number"
msgid "get disk sequence number"
msgstr "磁盘序列号"
-#: disk-utils/blockdev.c:188
+#: disk-utils/blockdev.c:194
+#, fuzzy
+#| msgid "min seg size"
+msgid "get zone size"
+msgstr "最小段大小"
+
+#: disk-utils/blockdev.c:199
msgid "flush buffers"
msgstr "刷新缓存"
-#: disk-utils/blockdev.c:192
+#: disk-utils/blockdev.c:203
msgid "reread partition table"
msgstr "重新读取分区表"
-#: disk-utils/blockdev.c:202
+#: disk-utils/blockdev.c:213
#, c-format
msgid ""
" %1$s [-v|-q] commands devices\n"
@@ -194,536 +201,555 @@ msgstr ""
" %1$s --report [设备]\n"
" %1$s -h|-V\n"
-#: disk-utils/blockdev.c:208
+#: disk-utils/blockdev.c:219
msgid "Call block device ioctls from the command line."
msgstr "从命令行调用块设备 ioctls。"
-#: disk-utils/blockdev.c:211
+#: disk-utils/blockdev.c:222
msgid " -q quiet mode"
msgstr " -q 安静模式"
-#: disk-utils/blockdev.c:212
+#: disk-utils/blockdev.c:223
msgid " -v verbose mode"
msgstr " -v 详尽模式"
-#: disk-utils/blockdev.c:213
+#: disk-utils/blockdev.c:224
msgid " --report print report for specified (or all) devices"
msgstr " --report 输出指定(或全部)设备的报告"
-#: disk-utils/blockdev.c:218
+#: disk-utils/blockdev.c:229
msgid "Available commands:"
msgstr "可用命令:"
-#: disk-utils/blockdev.c:219
+#: disk-utils/blockdev.c:230
#, c-format
msgid " %-25s get size in 512-byte sectors\n"
msgstr " %-25s 获得 512-字节扇区的大小\n"
-#: disk-utils/blockdev.c:301 disk-utils/fdformat.c:228
+#: disk-utils/blockdev.c:312 disk-utils/fdformat.c:228
#: disk-utils/fsck.minix.c:1342 disk-utils/isosize.c:162
#: disk-utils/mkfs.bfs.c:199 disk-utils/mkfs.c:117 disk-utils/mkfs.minix.c:831
-#: disk-utils/swaplabel.c:182 misc-utils/wipefs.c:764
+#: disk-utils/swaplabel.c:182 misc-utils/wipefs.c:768
#: sys-utils/blkdiscard.c:237 sys-utils/blkpr.c:303 sys-utils/blkzone.c:488
#: sys-utils/tunelp.c:241 sys-utils/zramctl.c:717 sys-utils/zramctl.c:743
msgid "no device specified"
msgstr "未指定设备"
-#: disk-utils/blockdev.c:343
+#: disk-utils/blockdev.c:352
+#, fuzzy, c-format
+#| msgid " %-25s get size in 512-byte sectors\n"
+msgid "get size in 512-byte sectors: "
+msgstr " %-25s 获得 512-字节扇区的大小\n"
+
+#: disk-utils/blockdev.c:357
msgid "could not get device size"
msgstr "无法获取设备大小"
-#: disk-utils/blockdev.c:349
+#: disk-utils/blockdev.c:363
#, c-format
msgid "Unknown command: %s"
msgstr "未知命令: %s"
-#: disk-utils/blockdev.c:365
+#: disk-utils/blockdev.c:379
#, c-format
msgid "%s requires an argument"
msgstr "%s 需要一个参数"
-#: disk-utils/blockdev.c:369
+#: disk-utils/blockdev.c:383
msgid "failed to parse command argument"
msgstr "解析命令参数失败"
-#: disk-utils/blockdev.c:400 disk-utils/blockdev.c:512
+#: disk-utils/blockdev.c:414 disk-utils/blockdev.c:526
#, c-format
msgid "ioctl error on %s"
msgstr "%s ioctl 出错"
-#: disk-utils/blockdev.c:402
+#: disk-utils/blockdev.c:416
#, c-format
msgid "%s failed.\n"
msgstr "%s 失败。\n"
-#: disk-utils/blockdev.c:409
+#: disk-utils/blockdev.c:423
#, c-format
msgid "%s succeeded.\n"
msgstr "%s 成功。\n"
#. TRANSLATORS: Start sector not available. Max. 15 letters.
-#: disk-utils/blockdev.c:496
+#: disk-utils/blockdev.c:510
msgid "N/A"
msgstr "N/A"
-#: disk-utils/blockdev.c:520
+#: disk-utils/blockdev.c:534
#, c-format
msgid "RO RA SSZ BSZ StartSec Size Device\n"
msgstr "RO RA SSZ BSZ 开始段 大小 设备\n"
-#: disk-utils/cfdisk.c:200
+#: disk-utils/cfdisk.c:201
msgid "Bootable"
msgstr "可启动"
-#: disk-utils/cfdisk.c:200
+#: disk-utils/cfdisk.c:201
msgid "Toggle bootable flag of the current partition"
msgstr "开关当前分区的 可启动 标志"
-#: disk-utils/cfdisk.c:201
+#: disk-utils/cfdisk.c:202
msgid "Delete"
msgstr "删除"
-#: disk-utils/cfdisk.c:201
+#: disk-utils/cfdisk.c:202
msgid "Delete the current partition"
msgstr "删除当前分区"
-#: disk-utils/cfdisk.c:202
+#: disk-utils/cfdisk.c:203
msgid "Resize"
msgstr "更改尺寸"
-#: disk-utils/cfdisk.c:202
+#: disk-utils/cfdisk.c:203
msgid "Reduce or enlarge the current partition"
msgstr "减小或扩大当前分区"
-#: disk-utils/cfdisk.c:203
+#: disk-utils/cfdisk.c:204
msgid "New"
msgstr "新建"
-#: disk-utils/cfdisk.c:203
+#: disk-utils/cfdisk.c:204
msgid "Create new partition from free space"
msgstr "在剩余空间上创建新分区"
-#: disk-utils/cfdisk.c:204
+#: disk-utils/cfdisk.c:205
msgid "Quit"
msgstr "退出"
-#: disk-utils/cfdisk.c:204
+#: disk-utils/cfdisk.c:205
msgid "Quit program without writing changes"
msgstr "退出程序而不写入更改"
-#: disk-utils/cfdisk.c:205 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
+#: disk-utils/cfdisk.c:206 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1031
+#: libfdisk/src/dos.c:2819 libfdisk/src/gpt.c:3249 libfdisk/src/sgi.c:1168
+#: libfdisk/src/sun.c:1140
msgid "Type"
msgstr "类型"
-#: disk-utils/cfdisk.c:205
+#: disk-utils/cfdisk.c:206
msgid "Change the partition type"
msgstr "更改分区类型"
-#: disk-utils/cfdisk.c:206
+#: disk-utils/cfdisk.c:207
msgid "Help"
msgstr "帮助"
-#: disk-utils/cfdisk.c:206
+#: disk-utils/cfdisk.c:207
msgid "Print help screen"
msgstr "打印帮助界面"
-#: disk-utils/cfdisk.c:207
+#: disk-utils/cfdisk.c:208
msgid "Sort"
msgstr "排序"
-#: disk-utils/cfdisk.c:207
+#: disk-utils/cfdisk.c:208
msgid "Fix partitions order"
msgstr "修复分区顺序"
-#: disk-utils/cfdisk.c:208
+#: disk-utils/cfdisk.c:209
msgid "Write"
msgstr "写入"
-#: disk-utils/cfdisk.c:208
+#: disk-utils/cfdisk.c:209
msgid "Write partition table to disk (this might destroy data)"
msgstr "将分区表写入磁盘(可能损坏数据)"
-#: disk-utils/cfdisk.c:209
+#: disk-utils/cfdisk.c:210
msgid "Dump"
msgstr "转储"
-#: disk-utils/cfdisk.c:209
+#: disk-utils/cfdisk.c:210
msgid "Dump partition table to sfdisk compatible script file"
msgstr "将分区表转储到与 sfdisk 兼容的脚本文件"
-#: disk-utils/cfdisk.c:654 disk-utils/fdisk.c:467
+#: disk-utils/cfdisk.c:655 disk-utils/fdisk.c:467
#, c-format
msgid "internal error: unsupported dialog type %d"
msgstr "内部错误:不支持的对话类型 %d"
-#: disk-utils/cfdisk.c:1320
+#: disk-utils/cfdisk.c:1321
#, c-format
msgid "%s (mounted)"
msgstr "%s (已挂载)"
-#: disk-utils/cfdisk.c:1368
+#: disk-utils/cfdisk.c:1369
msgid "Partition name:"
msgstr "分区名:"
-#: disk-utils/cfdisk.c:1375
+#: disk-utils/cfdisk.c:1376
msgid "Partition UUID:"
msgstr "分区 UUID:"
-#: disk-utils/cfdisk.c:1394
+#: disk-utils/cfdisk.c:1395
msgid "Partition type:"
msgstr "分区类型:"
-#: disk-utils/cfdisk.c:1401
+#: disk-utils/cfdisk.c:1402
msgid "Attributes:"
msgstr "属性:"
-#: disk-utils/cfdisk.c:1425
+#: disk-utils/cfdisk.c:1426
msgid "Filesystem UUID:"
msgstr "文件系统 UUID:"
-#: disk-utils/cfdisk.c:1432
+#: disk-utils/cfdisk.c:1433
msgid "Filesystem LABEL:"
msgstr "文件系统标签:"
-#: disk-utils/cfdisk.c:1438
+#: disk-utils/cfdisk.c:1439
msgid "Filesystem:"
msgstr "文件系统:"
-#: disk-utils/cfdisk.c:1443
+#: disk-utils/cfdisk.c:1444
msgid "Mountpoint:"
msgstr "挂载点:"
-#: disk-utils/cfdisk.c:1787
+#: disk-utils/cfdisk.c:1788
#, c-format
msgid "Disk: %s"
msgstr "磁盘:%s"
-#: disk-utils/cfdisk.c:1789
+#: disk-utils/cfdisk.c:1790
#, c-format
msgid "Size: %s, %<PRIu64> bytes, %ju sectors"
msgstr "尺寸:%s,%<PRIu64> 字节,%ju 个扇区"
-#: disk-utils/cfdisk.c:1792
+#: disk-utils/cfdisk.c:1793
#, c-format
msgid "Label: %s, identifier: %s"
msgstr "标签:%s,标识符:%s"
-#: disk-utils/cfdisk.c:1795
+#: disk-utils/cfdisk.c:1796
#, c-format
msgid "Label: %s"
msgstr "标签:%s"
-#: disk-utils/cfdisk.c:1946
+#: disk-utils/cfdisk.c:1947
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:1952
+#: disk-utils/cfdisk.c:1953
msgid "Please, specify size."
msgstr "请指定文件大小。"
-#: disk-utils/cfdisk.c:1974
+#: disk-utils/cfdisk.c:1975
#, c-format
msgid "Minimum size is %<PRIu64> bytes."
msgstr "最小尺寸为 %<PRIu64> 字节。"
-#: disk-utils/cfdisk.c:1983
+#: disk-utils/cfdisk.c:1984
#, c-format
msgid "Maximum size is %<PRIu64> bytes."
msgstr "最大尺寸为 %<PRIu64> 字节。"
-#: disk-utils/cfdisk.c:1990
+#: disk-utils/cfdisk.c:1991
msgid "Failed to parse size."
msgstr "解析大小失败。"
-#: disk-utils/cfdisk.c:2048
+#: disk-utils/cfdisk.c:2049
msgid "Select partition type"
msgstr "选择分区类型"
-#: disk-utils/cfdisk.c:2098 disk-utils/cfdisk.c:2128
+#: disk-utils/cfdisk.c:2099 disk-utils/cfdisk.c:2129
msgid "Enter script file name: "
msgstr "输入脚本文件名:"
-#: disk-utils/cfdisk.c:2099
+#: disk-utils/cfdisk.c:2100
msgid "The script file will be applied to in-memory partition table."
msgstr "该脚本文件将应用于内存中的分区表。"
-#: disk-utils/cfdisk.c:2108 disk-utils/cfdisk.c:2150
-#: disk-utils/fdisk-menu.c:493 disk-utils/fdisk-menu.c:537
+#: disk-utils/cfdisk.c:2109 disk-utils/cfdisk.c:2151
+#: disk-utils/fdisk-menu.c:494 disk-utils/fdisk-menu.c:538
#, c-format
msgid "Cannot open %s"
msgstr "无法打开 %s"
-#: disk-utils/cfdisk.c:2110 disk-utils/fdisk-menu.c:495
+#: disk-utils/cfdisk.c:2111 disk-utils/fdisk-menu.c:496
#, c-format
msgid "Failed to parse script file %s"
msgstr "解析脚本文件 %s 失败"
-#: disk-utils/cfdisk.c:2112 disk-utils/fdisk-menu.c:497
+#: disk-utils/cfdisk.c:2113 disk-utils/fdisk-menu.c:498
#, c-format
msgid "Failed to apply script %s"
msgstr "应用脚本文件 %s 失败"
-#: disk-utils/cfdisk.c:2129
+#: disk-utils/cfdisk.c:2130
msgid "The current in-memory partition table will be dumped to the file."
msgstr "当前的内存中分区表将转储到该文件中。"
-#: disk-utils/cfdisk.c:2137 disk-utils/fdisk-menu.c:525
+#: disk-utils/cfdisk.c:2138 disk-utils/fdisk-menu.c:526
msgid "Failed to allocate script handler"
msgstr "分配脚本处理程序失败"
-#: disk-utils/cfdisk.c:2143
+#: disk-utils/cfdisk.c:2144
msgid "Failed to read disk layout into script."
msgstr "将磁盘布局读入脚本出错。"
-#: disk-utils/cfdisk.c:2157
+#: disk-utils/cfdisk.c:2158
msgid "Disk layout successfully dumped."
msgstr "成功转储了磁盘布局。"
-#: disk-utils/cfdisk.c:2160 disk-utils/fdisk-menu.c:543
+#: disk-utils/cfdisk.c:2161 disk-utils/fdisk-menu.c:544
#, c-format
msgid "Failed to write script %s"
msgstr "写脚本文件 %s 失败"
-#: disk-utils/cfdisk.c:2196
+#: disk-utils/cfdisk.c:2197
msgid "Select label type"
msgstr "选择标签类型"
-#: disk-utils/cfdisk.c:2199 disk-utils/fdisk.c:1164 disk-utils/fdisk-menu.c:501
+#: disk-utils/cfdisk.c:2200 disk-utils/fdisk.c:1259 disk-utils/fdisk-menu.c:502
msgid "Device does not contain a recognized partition table."
msgstr "设备不包含可识别的分区表。"
-#: disk-utils/cfdisk.c:2207
+#: disk-utils/cfdisk.c:2208
msgid "Select a type to create a new label, press 'L' to load script file, 'Q' quits."
msgstr "选择一种类型来创建新标签,按“L”加载脚本文件,按“Q”退出。"
# 以下三句连贯,一起翻译
-#: disk-utils/cfdisk.c:2256
+#: disk-utils/cfdisk.c:2257
msgid "This is cfdisk, a curses-based disk partitioning program."
msgstr "这是 cfdisk,一款基于 curses 的磁盘分区程序。"
-#: disk-utils/cfdisk.c:2257
+#: disk-utils/cfdisk.c:2258
msgid "It lets you create, delete, and modify partitions on a block device."
msgstr "可以创建、删除和修改块设备上的分区。"
# 以下两条注意对齐
-#: disk-utils/cfdisk.c:2259
+#: disk-utils/cfdisk.c:2260
msgid "Command Meaning"
msgstr "命令 意义"
-#: disk-utils/cfdisk.c:2260
+#: disk-utils/cfdisk.c:2261
msgid "------- -------"
msgstr "------- -------"
-#: disk-utils/cfdisk.c:2261
-msgid " b Toggle bootable flag of the current partition"
+#: disk-utils/cfdisk.c:2262
+#, fuzzy
+#| msgid " b Toggle bootable flag of the current partition"
+msgid " b Toggle bootable flag of the current partition;"
msgstr " b 切换当前分区的 可启动 标志"
-#: disk-utils/cfdisk.c:2262
+#: disk-utils/cfdisk.c:2263
+msgid " implemented for DOS (MBR) and SGI labels only"
+msgstr ""
+
+#: disk-utils/cfdisk.c:2264
msgid " d Delete the current partition"
msgstr " d 删除当前分区"
-#: disk-utils/cfdisk.c:2263
+#: disk-utils/cfdisk.c:2265
msgid " h Print this screen"
msgstr " h 打印此屏幕"
-#: disk-utils/cfdisk.c:2264
+#: disk-utils/cfdisk.c:2266
msgid " n Create new partition from free space"
msgstr " n 从空闲空间创建新分区"
-#: disk-utils/cfdisk.c:2265
+#: disk-utils/cfdisk.c:2267
msgid " q Quit program without writing partition table"
msgstr " q 退出程序但不写入分区表"
-#: disk-utils/cfdisk.c:2266
+#: disk-utils/cfdisk.c:2268
msgid " r Reduce or enlarge the current partition"
msgstr " r 减小或扩大当前分区"
-#: disk-utils/cfdisk.c:2267
+#: disk-utils/cfdisk.c:2269
msgid " s Fix partitions order (only when in disarray)"
msgstr " s 修复分区顺序(仅磁盘阵列)"
-#: disk-utils/cfdisk.c:2268
+#: disk-utils/cfdisk.c:2270
msgid " t Change the partition type"
msgstr " t 更改分区类型"
-#: disk-utils/cfdisk.c:2269
+#: disk-utils/cfdisk.c:2271
msgid " u Dump disk layout to sfdisk compatible script file"
msgstr " u 将磁盘布局转储到兼容 sfdisk 的脚本文件"
-#: disk-utils/cfdisk.c:2270
+#: disk-utils/cfdisk.c:2272
msgid " W Write partition table to disk (you must enter uppercase W);"
msgstr " W 将分区表写入磁盘(必须输入大写 W);"
-#: disk-utils/cfdisk.c:2271
+#: disk-utils/cfdisk.c:2273
msgid " since this might destroy data on the disk, you must either"
msgstr " 由于这可能破坏磁盘上的数据,您必须"
-#: disk-utils/cfdisk.c:2272
+#: disk-utils/cfdisk.c:2274
msgid " confirm or deny the write by entering 'yes' or 'no'"
msgstr " 通过输入“yes”或“no”来确认或拒绝"
-#: disk-utils/cfdisk.c:2273
+#: disk-utils/cfdisk.c:2275
msgid " x Display/hide extra information about a partition"
msgstr " x 显示/隐藏分区的额外信息"
-#: disk-utils/cfdisk.c:2274
+#: disk-utils/cfdisk.c:2276
msgid "Up Arrow Move cursor to the previous partition"
msgstr "上箭头 光标移到上一分区"
-#: disk-utils/cfdisk.c:2275
+#: disk-utils/cfdisk.c:2277
msgid "Down Arrow Move cursor to the next partition"
msgstr "下箭头 光标移到下一分区"
-#: disk-utils/cfdisk.c:2276
+#: disk-utils/cfdisk.c:2278
msgid "Left Arrow Move cursor to the previous menu item"
msgstr "上箭头 光标移到上一菜单项"
-#: disk-utils/cfdisk.c:2277
+#: disk-utils/cfdisk.c:2279
msgid "Right Arrow Move cursor to the next menu item"
msgstr "下箭头 光标移到下一菜单项"
-#: disk-utils/cfdisk.c:2279
+#: disk-utils/cfdisk.c:2281
msgid "Note: All of the commands can be entered with either upper or lower"
msgstr "注:所有命令均可以大写或小写"
-#: disk-utils/cfdisk.c:2280
+#: disk-utils/cfdisk.c:2282
msgid "case letters (except for Write)."
msgstr "字母输入(除了 写入)。"
-#: disk-utils/cfdisk.c:2282
+#: disk-utils/cfdisk.c:2284
msgid "Use lsblk(8) or partx(8) to see more details about the device."
msgstr "使用 lsblk(8) 或 partx(8) 了解有关磁盘的更多细节。"
-#: disk-utils/cfdisk.c:2292 disk-utils/cfdisk.c:2595
+#: disk-utils/cfdisk.c:2294 disk-utils/cfdisk.c:2599
msgid "Press a key to continue."
msgstr "按下一个键继续。"
-#: disk-utils/cfdisk.c:2378
+#: disk-utils/cfdisk.c:2380
msgid "Could not toggle the flag."
msgstr "无法切换标志。"
-#: disk-utils/cfdisk.c:2388
+#: disk-utils/cfdisk.c:2390
#, c-format
msgid "Could not delete partition %zu."
msgstr "无法删除分区 %zu。"
-#: disk-utils/cfdisk.c:2390 disk-utils/fdisk-menu.c:670
+#: disk-utils/cfdisk.c:2392 disk-utils/fdisk-menu.c:671
#, c-format
msgid "Partition %zu has been deleted."
msgstr "分区 %zu 已删除。"
-#: disk-utils/cfdisk.c:2411
+#: disk-utils/cfdisk.c:2413
msgid "Partition size: "
msgstr "分区大小:"
-#: disk-utils/cfdisk.c:2452
+#: disk-utils/cfdisk.c:2454
#, c-format
msgid "Changed type of partition %zu."
msgstr "已更改分区 %zu 的类型。"
-#: disk-utils/cfdisk.c:2454
+#: disk-utils/cfdisk.c:2456
#, c-format
msgid "The type of partition %zu is unchanged."
msgstr "分区 %zu 的类型未更改。"
-#: disk-utils/cfdisk.c:2475
+#: disk-utils/cfdisk.c:2476
msgid "New size: "
msgstr "新大小:"
-#: disk-utils/cfdisk.c:2490
+#: disk-utils/cfdisk.c:2491
#, c-format
msgid "Partition %zu resized."
msgstr "已调整分区 %zu 的大小。"
-#: disk-utils/cfdisk.c:2508 disk-utils/fdisk.c:1140 disk-utils/fdisk-menu.c:604
+#: disk-utils/cfdisk.c:2509 disk-utils/fdisk.c:1235 disk-utils/fdisk-menu.c:605
msgid "Device is open in read-only mode."
msgstr "设备以只读方式打开。"
-#: disk-utils/cfdisk.c:2513
+#: disk-utils/cfdisk.c:2514
msgid "Are you sure you want to write the partition table to disk? "
msgstr "您确定想将分区表写入磁盘吗?"
-#: disk-utils/cfdisk.c:2515
+#: disk-utils/cfdisk.c:2516
msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog."
msgstr "输入“yes”或“no”或按 ESC 取消对话框。"
-#: disk-utils/cfdisk.c:2520 login-utils/lslogins.c:219 sys-utils/lscpu.c:339
-#: sys-utils/lsmem.c:266
+#: disk-utils/cfdisk.c:2521 login-utils/lslogins.c:219 sys-utils/lscpu.c:331
+#: sys-utils/lsmem.c:259
msgid "yes"
msgstr "是"
-#: disk-utils/cfdisk.c:2521
+#: disk-utils/cfdisk.c:2522
msgid "Did not write partition table to disk."
msgstr "未将分区表写入磁盘。"
-#: disk-utils/cfdisk.c:2526
+#: disk-utils/cfdisk.c:2527
msgid "Failed to write disklabel."
msgstr "写磁盘标签失败。"
-#: disk-utils/cfdisk.c:2532 disk-utils/fdisk-menu.c:611
+#: disk-utils/cfdisk.c:2535 disk-utils/fdisk-menu.c:612
msgid "The partition table has been altered."
msgstr "分区表已调整。"
-#: disk-utils/cfdisk.c:2555 disk-utils/cfdisk.c:2630
+#: disk-utils/cfdisk.c:2560 disk-utils/cfdisk.c:2641
msgid "Note that partition table entries are not in disk order now."
msgstr "注意,现在分区表记录没有按磁盘顺序。"
-#: disk-utils/cfdisk.c:2592
-#, c-format
-msgid "Device already contains a %s signature; it will be removed by a write command."
-msgstr "设备已包含一个 %s 签名;写入命令会将其移除。"
+#: disk-utils/cfdisk.c:2597
+#, fuzzy, c-format
+#| msgid "Device %s already contains a %s signature."
+msgid "Device already contains a %s signature."
+msgstr "设备 %s 已包含一个 %s 签名。"
-#: disk-utils/cfdisk.c:2604
+#: disk-utils/cfdisk.c:2603
+#, fuzzy
+#| msgid "Do you want to remove the signature?"
+msgid "Do you want to remove it? [Y]es/[N]o: "
+msgstr "您想移除该签名吗?"
+
+#: disk-utils/cfdisk.c:2615
msgid "failed to create a new disklabel"
msgstr "创建新磁盘标签失败"
-#: disk-utils/cfdisk.c:2613
+#: disk-utils/cfdisk.c:2624
msgid "failed to read partitions"
msgstr "读分区失败"
-#: disk-utils/cfdisk.c:2626
+#: disk-utils/cfdisk.c:2637
msgid "Device is open in read-only mode. Changes will remain in memory only."
msgstr "设备以只读方式打开。修改将仅停留在内存中。"
-#: disk-utils/cfdisk.c:2628
+#: disk-utils/cfdisk.c:2639
msgid "Device is currently in use, repartitioning is probably a bad idea."
msgstr "设备正在被使用,不建议您重新分区。"
-#: disk-utils/cfdisk.c:2714
+#: disk-utils/cfdisk.c:2725
#, c-format
msgid " %1$s [options] <disk>\n"
msgstr " %1$s [选项] <磁盘>\n"
-#: disk-utils/cfdisk.c:2717 disk-utils/fdisk.c:857 disk-utils/sfdisk.c:2044
+#: disk-utils/cfdisk.c:2728 disk-utils/fdisk.c:952 disk-utils/sfdisk.c:2044
msgid "Display or manipulate a disk partition table.\n"
msgstr "显示或操作磁盘分区表。\n"
-#: disk-utils/cfdisk.c:2721
+#: disk-utils/cfdisk.c:2732
#, c-format
msgid " -L, --color[=<when>] colorize output (%s, %s or %s)\n"
msgstr " -L, --color[=<时机>] 彩色输出(%s, %s 或 %s)\n"
-#: disk-utils/cfdisk.c:2724
+#: disk-utils/cfdisk.c:2735
msgid " -z, --zero start with zeroed partition table\n"
msgstr " -z, --zero 以空分区表开始\n"
-#: disk-utils/cfdisk.c:2726
+#: disk-utils/cfdisk.c:2737
#, c-format
msgid " --lock[=<mode>] use exclusive device lock (%s, %s or %s)\n"
msgstr " --lock[=<模式>] 使用独占设备锁(%s、%s 或 %s)\n"
-#: disk-utils/cfdisk.c:2727
+#: disk-utils/cfdisk.c:2738
msgid " -r, --read-only forced open cfdisk in read-only mode\n"
msgstr " -r, --read-only 强制以只读模式打开 cfdisk\n"
-#: disk-utils/cfdisk.c:2770 disk-utils/fdisk.c:1016 disk-utils/sfdisk.c:2350
-#: misc-utils/cal.c:421 sys-utils/dmesg.c:1505 text-utils/hexdump.c:114
+#: disk-utils/cfdisk.c:2781 disk-utils/fdisk.c:1111 disk-utils/sfdisk.c:2350
+#: misc-utils/cal.c:421 sys-utils/dmesg.c:1768 text-utils/hexdump.c:119
msgid "unsupported color mode"
msgstr "不支持的颜色模式"
-#: disk-utils/cfdisk.c:2800 disk-utils/fdisk.c:951 disk-utils/sfdisk.c:232
+#: disk-utils/cfdisk.c:2811 disk-utils/fdisk.c:1046 disk-utils/sfdisk.c:232
msgid "failed to allocate libfdisk context"
msgstr "分配 libfdisk 环境(context)失败"
@@ -774,7 +800,7 @@ msgstr ""
"将继续 ... "
#: disk-utils/fdformat.c:155 disk-utils/fsck.minix.c:189
-#: disk-utils/swaplabel.c:125 misc-utils/wipefs.c:633 sys-utils/blkdiscard.c:92
+#: disk-utils/swaplabel.c:125 misc-utils/wipefs.c:630 sys-utils/blkdiscard.c:92
#: sys-utils/blkpr.c:213 sys-utils/tunelp.c:95
#, c-format
msgid " %s [options] <device>\n"
@@ -819,22 +845,22 @@ msgstr "无效参数 - repair"
#: disk-utils/fdformat.c:232 disk-utils/fsck.cramfs.c:164
#: disk-utils/mkfs.bfs.c:206 disk-utils/mkfs.cramfs.c:343
#: disk-utils/mkfs.cramfs.c:765 disk-utils/mkfs.cramfs.c:811
-#: disk-utils/mkfs.minix.c:839 disk-utils/mkswap.c:381 disk-utils/partx.c:966
-#: 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:549 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
+#: disk-utils/mkfs.minix.c:839 disk-utils/mkswap.c:402 disk-utils/partx.c:966
+#: login-utils/last.c:704 login-utils/utmpdump.c:145 misc-utils/namei.c:146
+#: misc-utils/rename.c:160 misc-utils/rename.c:225 sys-utils/blkdiscard.c:251
+#: sys-utils/blkzone.c:147 sys-utils/dmesg.c:673 sys-utils/fallocate.c:201
+#: sys-utils/fsfreeze.c:119 sys-utils/fstrim.c:78 sys-utils/nsenter.c:271
+#: sys-utils/swapon.c:543 sys-utils/switch_root.c:93
#: sys-utils/switch_root.c:134 sys-utils/switch_root.c:139
#: sys-utils/unshare.c:211 term-utils/mesg.c:144 term-utils/mesg.c:156
-#: text-utils/more.c:463
+#: text-utils/more.c:464
#, c-format
msgid "stat of %s failed"
msgstr "对 %s stat 失败"
-#: disk-utils/fdformat.c:235 disk-utils/partx.c:1026 misc-utils/lsblk.c:1663
+#: disk-utils/fdformat.c:235 disk-utils/partx.c:1026 misc-utils/lsblk.c:1794
#: sys-utils/blkdiscard.c:253 sys-utils/blkzone.c:149
-#: sys-utils/mountpoint.c:109
+#: sys-utils/mountpoint.c:100
#, c-format
msgid "%s: not a block device"
msgstr "%s:不是一个块设备"
@@ -883,7 +909,7 @@ msgid "Using default response %c."
msgstr "将使用默认回应 %c。"
#: disk-utils/fdisk.c:226 disk-utils/fdisk.c:300 disk-utils/fdisk.c:377
-#: libfdisk/src/dos.c:1465 libfdisk/src/gpt.c:2574
+#: libfdisk/src/dos.c:1465 libfdisk/src/gpt.c:2575
msgid "Value out of range."
msgstr "值超出范围。"
@@ -958,26 +984,49 @@ msgstr "已设置 DOS 兼容性标志(已废弃!)"
msgid "DOS Compatibility flag is not set"
msgstr "DOS 兼容性标志未设置"
-#: disk-utils/fdisk.c:653 disk-utils/fdisk.c:691
+#: disk-utils/fdisk.c:690
+#, c-format
+msgid "New <size>{K,M,G,T,P} in bytes or <size>S in sectors (default %s)"
+msgstr ""
+
+#: disk-utils/fdisk.c:701 disk-utils/mkswap.c:623
+#, fuzzy
+#| msgid "invalid id"
+msgid "Invalid size"
+msgstr "无效 id"
+
+#: disk-utils/fdisk.c:717
+#, fuzzy, c-format
+#| msgid "Partition %zu has been deleted."
+msgid "Partition %zu has been resized."
+msgstr "分区 %zu 已删除。"
+
+#: disk-utils/fdisk.c:729
+#, fuzzy, c-format
+#| msgid "Could not create partition %zu"
+msgid "Could not resize partition %zu: %s"
+msgstr "无法创建分区 %zu"
+
+#: disk-utils/fdisk.c:748 disk-utils/fdisk.c:786
#, c-format
msgid "Partition %zu does not exist yet!"
msgstr "分区 %zu 还不存在!"
-#: disk-utils/fdisk.c:658 disk-utils/fdisk.c:669 libfdisk/src/ask.c:1032
+#: disk-utils/fdisk.c:753 disk-utils/fdisk.c:764 libfdisk/src/ask.c:1032
msgid "Unknown"
msgstr "未知"
-#: disk-utils/fdisk.c:668
+#: disk-utils/fdisk.c:763
#, c-format
msgid "Changed type of partition '%s' to '%s'."
msgstr "已将分区“%s”的类型更改为“%s”。"
-#: disk-utils/fdisk.c:672
+#: disk-utils/fdisk.c:767
#, c-format
msgid "Type of partition %zu is unchanged: %s."
msgstr "分区 %zu 的类型未更改:%s。"
-#: disk-utils/fdisk.c:768
+#: disk-utils/fdisk.c:863
#, c-format
msgid ""
"\n"
@@ -986,36 +1035,36 @@ msgstr ""
"\n"
"%s: 偏移 = %<PRIu64>, 大小 = %zu 字节。"
-#: disk-utils/fdisk.c:774
+#: disk-utils/fdisk.c:869
msgid "cannot seek"
msgstr "无法定位"
-#: disk-utils/fdisk.c:779
+#: disk-utils/fdisk.c:874
msgid "cannot read"
msgstr "不能读"
-#: disk-utils/fdisk.c:790 libfdisk/src/bsd.c:258 libfdisk/src/dos.c:1050
-#: libfdisk/src/gpt.c:2494
+#: disk-utils/fdisk.c:885 libfdisk/src/bsd.c:258 libfdisk/src/dos.c:1050
+#: libfdisk/src/gpt.c:2495
msgid "First sector"
msgstr "第一个扇区"
-#: disk-utils/fdisk.c:816
+#: disk-utils/fdisk.c:911
#, c-format
msgid "BLKGETSIZE ioctl failed on %s"
msgstr "对 %s 进行 BLKGETSIZE ioctl 失败"
-#: disk-utils/fdisk.c:834
+#: disk-utils/fdisk.c:929
#, c-format
msgid "The device contains '%s' signature and it will be removed by a write command. See fdisk(8) man page and --wipe option for more details."
msgstr "设备已包含一个 '%s' 签名,写入命令会将其移除。请参见 fdisk(8) 的手册页和 --wipe 选项以了解更多细节。"
-#: disk-utils/fdisk.c:839
+#: disk-utils/fdisk.c:934
#, 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:852
+#: disk-utils/fdisk.c:947
#, c-format
msgid ""
" %1$s [options] <disk> change partition table\n"
@@ -1024,149 +1073,149 @@ msgstr ""
" %1$s [选项] <磁盘> 更改分区表\n"
" %1$s [选项] -l [<磁盘>...] 列出分区表\n"
-#: disk-utils/fdisk.c:860
+#: disk-utils/fdisk.c:955
msgid " -b, --sector-size <size> physical and logical sector size\n"
msgstr " -b, --sectors-size <大小> 显示扇区计数和大小\n"
-#: disk-utils/fdisk.c:861
+#: disk-utils/fdisk.c:956
msgid " -B, --protect-boot don't erase bootbits when creating a new label\n"
msgstr " -B, --protect-boot 创建新标签时不要擦除 bootbits \n"
-#: disk-utils/fdisk.c:862
+#: disk-utils/fdisk.c:957
msgid " -c, --compatibility[=<mode>] mode is 'dos' or 'nondos' (default)\n"
msgstr " -c, --compatibility[=<模式>] 模式,为“dos”或“nondos”(默认)\n"
-#: disk-utils/fdisk.c:864
+#: disk-utils/fdisk.c:959
#, c-format
msgid " -L, --color[=<when>] colorize output (%s, %s or %s)\n"
msgstr " -L, --color[=<时机>] 彩色输出(%s, %s 或 %s)\n"
-#: disk-utils/fdisk.c:867
+#: disk-utils/fdisk.c:962
msgid " -l, --list display partitions and exit\n"
msgstr " -l, --list 显示分区并退出\n"
-#: disk-utils/fdisk.c:868
+#: disk-utils/fdisk.c:963
msgid " -x, --list-details like --list but with more details\n"
msgstr " -x, --list-details 类似 --list 但提供更多细节\n"
-#: disk-utils/fdisk.c:870
+#: disk-utils/fdisk.c:965
msgid " -n, --noauto-pt don't create default partition table on empty devices\n"
msgstr " -n, --noauto-pt 不要在空设备上创建默认分区表\n"
-#: disk-utils/fdisk.c:871
+#: disk-utils/fdisk.c:966
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: disk-utils/fdisk.c:872
+#: disk-utils/fdisk.c:967
msgid " -t, --type <type> recognize specified partition table type only\n"
msgstr " -t, --type <类型> 只识别指定的分区表类型\n"
-#: disk-utils/fdisk.c:873
+#: disk-utils/fdisk.c:968
msgid " -u, --units[=<unit>] display units: 'cylinders' or 'sectors' (default)\n"
msgstr " -u, --units[=<单位>] 显示单位,“cylinders”柱面或“sectors”扇区(默认)\n"
-#: disk-utils/fdisk.c:874
+#: disk-utils/fdisk.c:969
msgid " -s, --getsz display device size in 512-byte sectors [DEPRECATED]\n"
msgstr " -s, --getsz 以 512-字节扇区显示设备大小[已废弃]\n"
-#: disk-utils/fdisk.c:875
+#: disk-utils/fdisk.c:970
msgid " --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
-#: disk-utils/fdisk.c:877
+#: disk-utils/fdisk.c:972
#, c-format
msgid " --lock[=<mode>] use exclusive device lock (%s, %s or %s)\n"
msgstr " --lock[=<模式>] 使用独占设备锁(%s、%s 或 %s)\n"
-#: disk-utils/fdisk.c:879
+#: disk-utils/fdisk.c:974
#, c-format
msgid " -w, --wipe <mode> wipe signatures (%s, %s or %s)\n"
msgstr " -w, --wipe <模式> 擦除签名(%s, %s 或 %s)\n"
-#: disk-utils/fdisk.c:881 disk-utils/sfdisk.c:2099
+#: disk-utils/fdisk.c:976 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"
-#: disk-utils/fdisk.c:884
+#: disk-utils/fdisk.c:979
msgid " -C, --cylinders <number> specify the number of cylinders\n"
msgstr " -C, --cylinders <数字> 指定柱面数\n"
-#: disk-utils/fdisk.c:885
+#: disk-utils/fdisk.c:980
msgid " -H, --heads <number> specify the number of heads\n"
msgstr " -H, --heads <数字> 指定磁头数\n"
-#: disk-utils/fdisk.c:886
+#: disk-utils/fdisk.c:981
msgid " -S, --sectors <number> specify the number of sectors per track\n"
msgstr " -S, --sectors <数字> 指定每条磁道的扇区数\n"
-#: disk-utils/fdisk.c:961 disk-utils/fdisk.c:963 disk-utils/partx.c:889
+#: disk-utils/fdisk.c:1056 disk-utils/fdisk.c:1058 disk-utils/partx.c:889
msgid "invalid sector size argument"
msgstr "无效的 扇区大小 参数"
-#: disk-utils/fdisk.c:973
+#: disk-utils/fdisk.c:1068
msgid "invalid cylinders argument"
msgstr "无效的 柱面数 参数"
-#: disk-utils/fdisk.c:985
+#: disk-utils/fdisk.c:1080
msgid "not found DOS label driver"
msgstr "未找到 DOS 标签驱动"
-#: disk-utils/fdisk.c:991
+#: disk-utils/fdisk.c:1086
#, c-format
msgid "unknown compatibility mode '%s'"
msgstr "未知兼容模式“%s”"
-#: disk-utils/fdisk.c:998
+#: disk-utils/fdisk.c:1093
msgid "invalid heads argument"
msgstr "无效的 磁头数 参数"
-#: disk-utils/fdisk.c:1004
+#: disk-utils/fdisk.c:1099
msgid "invalid sectors argument"
msgstr "无效的 扇区数 参数"
-#: disk-utils/fdisk.c:1036
+#: disk-utils/fdisk.c:1131
#, c-format
msgid "unsupported disklabel: %s"
msgstr "不支持的磁盘标签:%s"
-#: disk-utils/fdisk.c:1044
+#: disk-utils/fdisk.c:1139
msgid "unsupported unit"
msgstr "不支持的单位"
-#: disk-utils/fdisk.c:1052 disk-utils/fdisk.c:1057 disk-utils/sfdisk.c:2311
+#: disk-utils/fdisk.c:1147 disk-utils/fdisk.c:1152 disk-utils/sfdisk.c:2311
#: disk-utils/sfdisk.c:2316
msgid "unsupported wipe mode"
msgstr "不支持的擦除模式"
-#: disk-utils/fdisk.c:1078
+#: disk-utils/fdisk.c:1173
msgid "The device properties (sector size and geometry) should be used with one specified device only."
msgstr "设备属性(扇区大小和几何属性)只能用于某个指定的设备。"
-#: disk-utils/fdisk.c:1109 disk-utils/fdisk.c:1124 disk-utils/fsck.cramfs.c:725
+#: disk-utils/fdisk.c:1204 disk-utils/fdisk.c:1219 disk-utils/fsck.cramfs.c:725
#: disk-utils/mkfs.bfs.c:219 disk-utils/mkfs.cramfs.c:801
#: disk-utils/partx.c:982 disk-utils/raw.c:136 disk-utils/raw.c:149
#: disk-utils/raw.c:161 disk-utils/raw.c:202 misc-utils/cal.c:526
#: 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:1585
-#: sys-utils/ipcmk.c:143 sys-utils/ldattach.c:321 sys-utils/losetup.c:926
-#: 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:1200 text-utils/col.c:584
-#: text-utils/more.c:2096
+#: sys-utils/chcpu.c:355 sys-utils/chmem.c:429 sys-utils/dmesg.c:1849
+#: sys-utils/ipcmk.c:143 sys-utils/ldattach.c:318 sys-utils/losetup.c:997
+#: sys-utils/lscpu.c:1344 sys-utils/lsmem.c:649 sys-utils/mount.c:861
+#: sys-utils/mount.c:887 sys-utils/mount.c:895 sys-utils/mount.c:947
+#: sys-utils/mount.c:960 sys-utils/mount.c:1032 sys-utils/mountpoint.c:182
+#: sys-utils/pivot_root.c:66 sys-utils/swapoff.c:271 sys-utils/swapon.c:1024
+#: sys-utils/switch_root.c:270 sys-utils/umount.c:629 term-utils/setterm.c:1200
+#: text-utils/col.c:584 text-utils/more.c:2135
msgid "bad usage"
msgstr "错误用法"
-#: disk-utils/fdisk.c:1130
+#: disk-utils/fdisk.c:1225
#, c-format
msgid "Welcome to fdisk (%s)."
msgstr "欢迎使用 fdisk (%s)。"
-#: disk-utils/fdisk.c:1132 disk-utils/sfdisk.c:1808
+#: disk-utils/fdisk.c:1227 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"
@@ -1174,7 +1223,7 @@ msgstr ""
"更改将停留在内存中,直到您决定将更改写入磁盘。\n"
"使用写入命令前请三思。\n"
-#: disk-utils/fdisk.c:1147
+#: disk-utils/fdisk.c:1242
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"
@@ -1183,7 +1232,7 @@ msgstr ""
"该磁盘目前正在使用 - 不建议您重新分区。\n"
"推荐您卸载此磁盘上所有的文件系统,并关闭(swapoff)上面的交换分区。\n"
-#: disk-utils/fdisk.c:1170
+#: disk-utils/fdisk.c:1265
msgid "A hybrid GPT was detected. You have to sync the hybrid MBR manually (expert command 'M')."
msgstr "检测到混合 GPT。您需要手动同步混合 MBR (用专家命令“M”)"
@@ -1233,55 +1282,62 @@ msgid "Alignment offset: %lu bytes"
msgstr "对齐偏移量:%lu 字节"
#: disk-utils/fdisk-list.c:130 disk-utils/fdisk-list.c:251
-#: disk-utils/fsck.c:1264
+#: disk-utils/fsck.c:1264 misc-utils/lsblk.c:2200 misc-utils/lsblk.c:2254
+#: misc-utils/lsfd.c:1962
msgid "failed to allocate iterator"
msgstr "分配迭代器失败"
#: disk-utils/fdisk-list.c:136 disk-utils/fdisk-list.c:257
-#: disk-utils/partx.c:676 login-utils/lslogins.c:1113 misc-utils/fincore.c:357
-#: misc-utils/findmnt.c:1763 misc-utils/lsblk.c:2351 misc-utils/lsfd.c:1974
-#: misc-utils/lslocks.c:472 misc-utils/uuidparse.c:252 misc-utils/wipefs.c:157
-#: sys-utils/losetup.c:326 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
+#: disk-utils/partx.c:676 include/column-list-table.h:45
+#: login-utils/lslogins.c:1113 misc-utils/fincore.c:500
+#: misc-utils/findmnt.c:1896 misc-utils/lsblk.c:2729 misc-utils/lsclocks.c:649
+#: misc-utils/lsfd.c:2386 misc-utils/lslocks.c:754 misc-utils/uuidparse.c:252
+#: misc-utils/wipefs.c:157 sys-utils/losetup.c:389 sys-utils/lscpu.c:596
+#: sys-utils/lscpu.c:751 sys-utils/lscpu.c:966 sys-utils/lsipc.c:354
+#: sys-utils/prlimit.c:303 sys-utils/rfkill.c:475 sys-utils/swapon.c:309
+#: sys-utils/wdctl.c:354 sys-utils/zramctl.c:496 text-utils/column.c:217
msgid "failed to allocate output table"
msgstr "分配输出表失败"
#: disk-utils/fdisk-list.c:177 disk-utils/fdisk-list.c:281
-#: disk-utils/partx.c:590 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:1135 misc-utils/lslocks.c:400 misc-utils/uuidparse.c:154
-#: misc-utils/wipefs.c:202 sys-utils/losetup.c:349 sys-utils/losetup.c:378
-#: 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:555 text-utils/column.c:579
+#: disk-utils/partx.c:590 include/column-list-table.h:72
+#: login-utils/lslogins.c:1173 misc-utils/fincore.c:218
+#: misc-utils/findmnt.c:847 misc-utils/findmnt.c:868 misc-utils/lsblk.c:1331
+#: misc-utils/lsclocks.c:294 misc-utils/lsfd.c:1261 misc-utils/lslocks.c:619
+#: misc-utils/uuidparse.c:154 misc-utils/wipefs.c:202 sys-utils/losetup.c:412
+#: sys-utils/losetup.c:441 sys-utils/lscpu.c:510 sys-utils/lscpu.c:786
+#: sys-utils/lscpu.c:818 sys-utils/lsipc.c:486 sys-utils/lsipc.c:567
+#: sys-utils/lsipc.c:669 sys-utils/lsipc.c:763 sys-utils/lsipc.c:927
+#: sys-utils/prlimit.c:232 sys-utils/rfkill.c:390 sys-utils/swapon.c:192
+#: sys-utils/wdctl.c:304 sys-utils/zramctl.c:414 text-utils/column.c:555
+#: text-utils/column.c:579
msgid "failed to allocate output line"
msgstr "分配输出行失败"
#: disk-utils/fdisk-list.c:187 disk-utils/fdisk-list.c:288
-#: disk-utils/partx.c:653 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:306 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
+#: disk-utils/partx.c:653 include/column-list-table.h:75
+#: include/column-list-table.h:83 include/column-list-table.h:85
+#: login-utils/lslogins.c:1277 misc-utils/fincore.c:266
+#: misc-utils/findmnt.c:836 misc-utils/lsblk.c:1282 misc-utils/lsfd-bdev.c:44
+#: misc-utils/lsfd-bdev.c:57 misc-utils/lsfd-bdev.c:83
+#: misc-utils/lsfd-bdev.c:85 misc-utils/lsfd-cdev.c:86
+#: misc-utils/lsfd-cdev.c:91 misc-utils/lsfd-cdev.c:113
+#: misc-utils/lsfd-cdev.c:115 misc-utils/lsfd-fifo.c:55
+#: misc-utils/lsfd-fifo.c:87 misc-utils/lsfd-fifo.c:89
+#: misc-utils/lsfd-file.c:178 misc-utils/lsfd-file.c:190
+#: misc-utils/lsfd-file.c:198 misc-utils/lsfd-file.c:204
+#: misc-utils/lsfd-file.c:211 misc-utils/lsfd-file.c:218
+#: misc-utils/lsfd-file.c:223 misc-utils/lsfd-file.c:347
+#: misc-utils/lsfd-file.c:349 misc-utils/lsfd-file.c:645
+#: misc-utils/lsfd-file.c:652 misc-utils/lsfd-file.c:710
+#: misc-utils/lsfd-file.c:731 misc-utils/lsfd-sock.c:75
+#: misc-utils/lsfd-sock.c:132 misc-utils/lsfd-sock.c:134
+#: misc-utils/lsfd-unkn.c:123 misc-utils/lsfd-unkn.c:125
+#: misc-utils/lslocks.c:700 misc-utils/uuidparse.c:239 misc-utils/wipefs.c:242
+#: sys-utils/losetup.c:369 sys-utils/lscpu.c:578 sys-utils/lscpu.c:793
+#: sys-utils/lscpu.c:822 sys-utils/lscpu.c:832 sys-utils/lsipc.c:526
+#: sys-utils/lsipc.c:651 sys-utils/prlimit.c:267 sys-utils/rfkill.c:418
+#: sys-utils/swapon.c:240 sys-utils/wdctl.c:332 sys-utils/zramctl.c:481
#: text-utils/column.c:562
msgid "failed to add output data"
msgstr "添加输出信息失败"
@@ -1300,23 +1356,23 @@ msgstr "%zu 分区上的文件系统/RAID 签名将被擦除。"
msgid "Partition table entries are not in disk order."
msgstr "分区表记录没有按磁盘顺序。"
-#: disk-utils/fdisk-list.c:243 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
+#: disk-utils/fdisk-list.c:243 libfdisk/src/bsd.c:1026 libfdisk/src/dos.c:2813
+#: libfdisk/src/gpt.c:3245 libfdisk/src/sgi.c:1162 libfdisk/src/sun.c:1134
msgid "Start"
msgstr "起点"
-#: disk-utils/fdisk-list.c:243 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
+#: disk-utils/fdisk-list.c:243 libfdisk/src/bsd.c:1027 libfdisk/src/dos.c:2814
+#: libfdisk/src/gpt.c:3246 libfdisk/src/sgi.c:1163 libfdisk/src/sun.c:1135
msgid "End"
msgstr "末尾"
-#: disk-utils/fdisk-list.c:243 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
+#: disk-utils/fdisk-list.c:243 libfdisk/src/bsd.c:1028 libfdisk/src/dos.c:2815
+#: libfdisk/src/gpt.c:3247 libfdisk/src/sgi.c:1164 libfdisk/src/sun.c:1136
msgid "Sectors"
msgstr "扇区"
-#: disk-utils/fdisk-list.c:243 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
+#: disk-utils/fdisk-list.c:243 libfdisk/src/bsd.c:1030 libfdisk/src/dos.c:2817
+#: libfdisk/src/gpt.c:3248 libfdisk/src/sgi.c:1166 libfdisk/src/sun.c:1138
msgid "Size"
msgstr "大小"
@@ -1325,7 +1381,7 @@ msgstr "大小"
msgid "Unpartitioned space %s: %s, %ju bytes, %ju sectors"
msgstr "未分区的空间 %s:%s,%ju 个字节,%ju 个扇区"
-#: disk-utils/fdisk-list.c:493
+#: disk-utils/fdisk-list.c:494
#, c-format
msgid "%s unknown column: %s"
msgstr "%s 未知列: %s"
@@ -1366,259 +1422,265 @@ msgstr "检查分区表"
msgid "print information about a partition"
msgstr "打印某个分区的相关信息"
-#: disk-utils/fdisk-menu.c:115
+#: disk-utils/fdisk-menu.c:114
+#, fuzzy
+#| msgid "delete a partition"
+msgid "resize a partition"
+msgstr "删除分区"
+
+#: disk-utils/fdisk-menu.c:116
msgid "print the raw data of the first sector from the device"
msgstr "打印设备第1个扇区的原始数据"
-#: disk-utils/fdisk-menu.c:116
+#: disk-utils/fdisk-menu.c:117
msgid "print the raw data of the disklabel from the device"
msgstr "打印设备磁盘标签的原始数据"
-#: disk-utils/fdisk-menu.c:117
+#: disk-utils/fdisk-menu.c:118
msgid "fix partitions order"
msgstr "修复分区顺序"
-#: disk-utils/fdisk-menu.c:119
+#: disk-utils/fdisk-menu.c:120
msgid "Misc"
msgstr "杂项"
-#: disk-utils/fdisk-menu.c:120
+#: disk-utils/fdisk-menu.c:121
msgid "print this menu"
msgstr "打印此菜单"
-#: disk-utils/fdisk-menu.c:121
+#: disk-utils/fdisk-menu.c:122
msgid "change display/entry units"
msgstr "更改 显示/记录 单位"
-#: disk-utils/fdisk-menu.c:122
+#: disk-utils/fdisk-menu.c:123
msgid "extra functionality (experts only)"
msgstr "更多功能(仅限专业人员)"
-#: disk-utils/fdisk-menu.c:124
+#: disk-utils/fdisk-menu.c:125
msgid "Script"
msgstr "脚本"
-#: disk-utils/fdisk-menu.c:125
+#: disk-utils/fdisk-menu.c:126
msgid "load disk layout from sfdisk script file"
msgstr "从 sfdisk 脚本文件加载磁盘布局"
-#: disk-utils/fdisk-menu.c:126
+#: disk-utils/fdisk-menu.c:127
msgid "dump disk layout to sfdisk script file"
msgstr "将磁盘布局转储为 sfdisk 脚本文件"
-#: disk-utils/fdisk-menu.c:128
+#: disk-utils/fdisk-menu.c:129
msgid "Save & Exit"
msgstr "保存并退出"
-#: disk-utils/fdisk-menu.c:129
+#: disk-utils/fdisk-menu.c:130
msgid "write table to disk and exit"
msgstr "将分区表写入磁盘并退出"
-#: disk-utils/fdisk-menu.c:130
+#: disk-utils/fdisk-menu.c:131
msgid "write table to disk"
msgstr "将分区表写入磁盘"
-#: disk-utils/fdisk-menu.c:131
+#: disk-utils/fdisk-menu.c:132
msgid "quit without saving changes"
msgstr "退出而不保存更改"
-#: disk-utils/fdisk-menu.c:132
+#: disk-utils/fdisk-menu.c:133
msgid "return to main menu"
msgstr "返回主菜单"
-#: disk-utils/fdisk-menu.c:134
+#: disk-utils/fdisk-menu.c:135
#, fuzzy
#| msgid "return from BSD to DOS"
msgid "return from BSD to DOS (MBR)"
msgstr "从 BSD 回到 DOS"
-#: disk-utils/fdisk-menu.c:136 disk-utils/fdisk-menu.c:236
+#: disk-utils/fdisk-menu.c:137 disk-utils/fdisk-menu.c:237
msgid "return from protective/hybrid MBR to GPT"
msgstr "从 保护/混合 MBR 回到 GPT"
-#: disk-utils/fdisk-menu.c:147
+#: disk-utils/fdisk-menu.c:148
msgid "Create a new label"
msgstr "新建空磁盘标签"
-#: disk-utils/fdisk-menu.c:148
+#: disk-utils/fdisk-menu.c:149
msgid "create a new empty GPT partition table"
msgstr "新建一份 GPT 分区表"
-#: disk-utils/fdisk-menu.c:149
+#: disk-utils/fdisk-menu.c:150
msgid "create a new empty SGI (IRIX) partition table"
msgstr "新建一份空 GPT (IRIX) 分区表"
-#: disk-utils/fdisk-menu.c:150
+#: disk-utils/fdisk-menu.c:151
#, 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:151
+#: disk-utils/fdisk-menu.c:152
msgid "create a new empty Sun partition table"
msgstr "新建一份空 Sun 分区表"
-#: disk-utils/fdisk-menu.c:155
+#: disk-utils/fdisk-menu.c:156
msgid "create an IRIX (SGI) partition table"
msgstr "创建一份 IRIX(SGI) 分区表"
-#: disk-utils/fdisk-menu.c:164
+#: disk-utils/fdisk-menu.c:165
msgid "Geometry (for the current label)"
msgstr "几何属性(对当前标签)"
-#: disk-utils/fdisk-menu.c:165
+#: disk-utils/fdisk-menu.c:166
msgid "change number of cylinders"
msgstr "更改柱面数"
-#: disk-utils/fdisk-menu.c:166
+#: disk-utils/fdisk-menu.c:167
msgid "change number of heads"
msgstr "更改磁头数"
-#: disk-utils/fdisk-menu.c:167
+#: disk-utils/fdisk-menu.c:168
msgid "change number of sectors/track"
msgstr "更改扇区/磁道数"
-#: disk-utils/fdisk-menu.c:176 include/pt-mbr-partnames.h:102
+#: disk-utils/fdisk-menu.c:177 include/pt-mbr-partnames.h:102
msgid "GPT"
msgstr "GPT"
-#: disk-utils/fdisk-menu.c:177
+#: disk-utils/fdisk-menu.c:178
msgid "change disk GUID"
msgstr "更改磁盘 GUID"
-#: disk-utils/fdisk-menu.c:178
+#: disk-utils/fdisk-menu.c:179
msgid "change partition name"
msgstr "更改分区名"
-#: disk-utils/fdisk-menu.c:179
+#: disk-utils/fdisk-menu.c:180
msgid "change partition UUID"
msgstr "更改分区 UUID"
-#: disk-utils/fdisk-menu.c:180
+#: disk-utils/fdisk-menu.c:181
msgid "change table length"
msgstr "更改表长度"
-#: disk-utils/fdisk-menu.c:181
+#: disk-utils/fdisk-menu.c:182
msgid "enter protective/hybrid MBR"
msgstr "进入 保护/混合 MBR"
-#: disk-utils/fdisk-menu.c:184
+#: disk-utils/fdisk-menu.c:185
msgid "toggle the legacy BIOS bootable flag"
msgstr "开关旧 BIOS 的 可启动 标志"
-#: disk-utils/fdisk-menu.c:185
+#: disk-utils/fdisk-menu.c:186
msgid "toggle the no block IO protocol flag"
msgstr "开关 不阻塞 IO 协议 标志"
-#: disk-utils/fdisk-menu.c:186
+#: disk-utils/fdisk-menu.c:187
msgid "toggle the required partition flag"
msgstr "开关 必需分区 标志"
-#: disk-utils/fdisk-menu.c:187
+#: disk-utils/fdisk-menu.c:188
msgid "toggle the GUID specific bits"
msgstr "开/关 GUID 特定位"
-#: disk-utils/fdisk-menu.c:197
+#: disk-utils/fdisk-menu.c:198
msgid "Sun"
msgstr "Sun"
-#: disk-utils/fdisk-menu.c:198
+#: disk-utils/fdisk-menu.c:199
msgid "toggle the read-only flag"
msgstr "开关 只读 标志"
-#: disk-utils/fdisk-menu.c:199
+#: disk-utils/fdisk-menu.c:200
msgid "toggle the mountable flag"
msgstr "开关 可挂臷 标志"
-#: disk-utils/fdisk-menu.c:201
+#: disk-utils/fdisk-menu.c:202
msgid "change number of alternate cylinders"
msgstr "更改备选柱面数"
-#: disk-utils/fdisk-menu.c:202
+#: disk-utils/fdisk-menu.c:203
msgid "change number of extra sectors per cylinder"
msgstr "更改每柱面的额外扇区数"
-#: disk-utils/fdisk-menu.c:203
+#: disk-utils/fdisk-menu.c:204
msgid "change interleave factor"
msgstr "更改交错系数"
-#: disk-utils/fdisk-menu.c:204
+#: disk-utils/fdisk-menu.c:205
msgid "change rotation speed (rpm)"
msgstr "更改转速(转/分)"
-#: disk-utils/fdisk-menu.c:205
+#: disk-utils/fdisk-menu.c:206
msgid "change number of physical cylinders"
msgstr "更改物理柱面数"
-#: disk-utils/fdisk-menu.c:214
+#: disk-utils/fdisk-menu.c:215
msgid "SGI"
msgstr "SGI"
-#: disk-utils/fdisk-menu.c:215
+#: disk-utils/fdisk-menu.c:216
msgid "select bootable partition"
msgstr "选择可启动分区"
-#: disk-utils/fdisk-menu.c:216
+#: disk-utils/fdisk-menu.c:217
msgid "edit bootfile entry"
msgstr "编辑启动文件记录"
-#: disk-utils/fdisk-menu.c:217
+#: disk-utils/fdisk-menu.c:218
msgid "select sgi swap partition"
msgstr "选择 sgi 交换分区"
-#: disk-utils/fdisk-menu.c:218
+#: disk-utils/fdisk-menu.c:219
msgid "create SGI info"
msgstr "创建 SGI 信息"
-#: disk-utils/fdisk-menu.c:227
+#: disk-utils/fdisk-menu.c:228
msgid "DOS (MBR)"
msgstr "DOS (MBR)"
-#: disk-utils/fdisk-menu.c:228
+#: disk-utils/fdisk-menu.c:229
msgid "toggle a bootable flag"
msgstr "开关 可启动 标志"
-#: disk-utils/fdisk-menu.c:229
+#: disk-utils/fdisk-menu.c:230
msgid "edit nested BSD disklabel"
msgstr "编辑嵌套的 BSD 磁盘标签"
-#: disk-utils/fdisk-menu.c:230
+#: disk-utils/fdisk-menu.c:231
msgid "toggle the dos compatibility flag"
msgstr "开关 dos 兼容性标志"
-#: disk-utils/fdisk-menu.c:232
+#: disk-utils/fdisk-menu.c:233
msgid "move beginning of data in a partition"
msgstr "移动分区数据的起始点"
-#: disk-utils/fdisk-menu.c:233
+#: disk-utils/fdisk-menu.c:234
msgid "fix partitions C/H/S values"
msgstr "修复分区 C/H/S 值"
-#: disk-utils/fdisk-menu.c:234
+#: disk-utils/fdisk-menu.c:235
msgid "change the disk identifier"
msgstr "更改磁盘标识符"
-#: disk-utils/fdisk-menu.c:246
+#: disk-utils/fdisk-menu.c:247
msgid "BSD"
msgstr "BSD"
-#: disk-utils/fdisk-menu.c:247
+#: disk-utils/fdisk-menu.c:248
msgid "edit drive data"
msgstr "编辑驱动数据"
-#: disk-utils/fdisk-menu.c:248
+#: disk-utils/fdisk-menu.c:249
msgid "install bootstrap"
msgstr "安装引导程序"
-#: disk-utils/fdisk-menu.c:249
+#: disk-utils/fdisk-menu.c:250
msgid "show complete disklabel"
msgstr "显示完整磁盘标签"
-#: disk-utils/fdisk-menu.c:250
+#: disk-utils/fdisk-menu.c:251
msgid "link BSD partition to non-BSD partition"
msgstr "将 BSD 分区链接到非 BSD 分区"
-#: disk-utils/fdisk-menu.c:382
+#: disk-utils/fdisk-menu.c:383
#, c-format
msgid ""
"\n"
@@ -1627,7 +1689,7 @@ msgstr ""
"\n"
"帮助 (专业命令):\n"
-#: disk-utils/fdisk-menu.c:384 disk-utils/sfdisk.c:1472
+#: disk-utils/fdisk-menu.c:385 disk-utils/sfdisk.c:1472
#, c-format
msgid ""
"\n"
@@ -1636,20 +1698,20 @@ msgstr ""
"\n"
"帮助:\n"
-#: disk-utils/fdisk-menu.c:404
+#: disk-utils/fdisk-menu.c:405
#, c-format
msgid "You're editing nested '%s' partition table, primary partition table is '%s'."
msgstr "您正在编辑嵌套的“%s”分区表,主分区表为“%s”。"
-#: disk-utils/fdisk-menu.c:434
+#: disk-utils/fdisk-menu.c:435
msgid "Expert command (m for help): "
msgstr "专家命令(输入 m 显示帮助):"
-#: disk-utils/fdisk-menu.c:436
+#: disk-utils/fdisk-menu.c:437
msgid "Command (m for help): "
msgstr "命令(输入 m 获取帮助):"
-#: disk-utils/fdisk-menu.c:448
+#: disk-utils/fdisk-menu.c:449
#, fuzzy
#| msgid ""
#| "\n"
@@ -1661,106 +1723,106 @@ msgstr ""
"\n"
"所有未写入的修改均会丢失,您确认要退出吗?"
-#: disk-utils/fdisk-menu.c:461
+#: disk-utils/fdisk-menu.c:462
#, c-format
msgid "%c: unknown command"
msgstr "%c:未知命令"
-#: disk-utils/fdisk-menu.c:486 disk-utils/fdisk-menu.c:519
+#: disk-utils/fdisk-menu.c:487 disk-utils/fdisk-menu.c:520
msgid "Enter script file name"
msgstr "输入脚本文件名"
-#: disk-utils/fdisk-menu.c:498
+#: disk-utils/fdisk-menu.c:499
msgid "Resetting fdisk!"
msgstr "正在重置 fdisk!"
-#: disk-utils/fdisk-menu.c:505
+#: disk-utils/fdisk-menu.c:506
msgid "Script successfully applied."
msgstr "成功应用了脚本。"
-#: disk-utils/fdisk-menu.c:531
+#: disk-utils/fdisk-menu.c:532
msgid "Failed to transform disk layout into script"
msgstr "将磁盘布局转换成脚本失败"
-#: disk-utils/fdisk-menu.c:545
+#: disk-utils/fdisk-menu.c:546
msgid "Script successfully saved."
msgstr "成本保存了脚本。"
-#: disk-utils/fdisk-menu.c:568 disk-utils/sfdisk.c:1698
+#: disk-utils/fdisk-menu.c:569 disk-utils/sfdisk.c:1698
#, c-format
msgid "Partition #%zu contains a %s signature."
msgstr "分区 #%zu 包含一个 %s 签名。"
-#: disk-utils/fdisk-menu.c:571 disk-utils/sfdisk.c:1701
+#: disk-utils/fdisk-menu.c:572 disk-utils/sfdisk.c:1701
msgid "Do you want to remove the signature?"
msgstr "您想移除该签名吗?"
-#: disk-utils/fdisk-menu.c:576 disk-utils/sfdisk.c:1706
+#: disk-utils/fdisk-menu.c:577 disk-utils/sfdisk.c:1706
msgid "The signature will be removed by a write command."
msgstr "写入命令将移除该签名。"
-#: disk-utils/fdisk-menu.c:609
+#: disk-utils/fdisk-menu.c:610
msgid "failed to write disklabel"
msgstr "写磁盘标签失败"
-#: disk-utils/fdisk-menu.c:668
+#: disk-utils/fdisk-menu.c:669
#, c-format
msgid "Could not delete partition %zu"
msgstr "无法删除分区 %zu"
-#: disk-utils/fdisk-menu.c:697
+#: disk-utils/fdisk-menu.c:701
msgid "Changing display/entry units to cylinders (DEPRECATED!)."
msgstr "将显示/记录单位更改为柱面(已废弃!)。"
-#: disk-utils/fdisk-menu.c:699
+#: disk-utils/fdisk-menu.c:703
msgid "Changing display/entry units to sectors."
msgstr "将显示/记录单位更改为盲区。"
-#: disk-utils/fdisk-menu.c:709 disk-utils/fdisk-menu.c:880
+#: disk-utils/fdisk-menu.c:713 disk-utils/fdisk-menu.c:884
msgid "Leaving nested disklabel."
msgstr "离开嵌套的磁盘标签。"
-#: disk-utils/fdisk-menu.c:746
+#: disk-utils/fdisk-menu.c:750
msgid "New maximum entries"
msgstr "新的最大记录数"
-#: disk-utils/fdisk-menu.c:757
+#: disk-utils/fdisk-menu.c:761
msgid "Entering protective/hybrid MBR disklabel."
msgstr "进入 保护/混合 MBR 磁盘标签。"
-#: disk-utils/fdisk-menu.c:773
+#: disk-utils/fdisk-menu.c:777
msgid "New UUID (in 8-4-4-4-12 format)"
msgstr "新 UUID (以 8-4-4-4-12 格式)"
-#: disk-utils/fdisk-menu.c:788
+#: disk-utils/fdisk-menu.c:792
msgid "New name"
msgstr "新名称"
-#: disk-utils/fdisk-menu.c:851
+#: disk-utils/fdisk-menu.c:855
msgid "Entering nested BSD disklabel."
msgstr "进入嵌套的 BSD 磁盘标签。"
-#: disk-utils/fdisk-menu.c:887
+#: disk-utils/fdisk-menu.c:891
msgid "C/H/S values fixed."
msgstr "C/H/S 值已修复。"
-#: disk-utils/fdisk-menu.c:889
+#: disk-utils/fdisk-menu.c:893
msgid "Nothing to do. C/H/S values are correct already."
msgstr "无须操作。C/H/S 值已经是正确的了。"
-#: disk-utils/fdisk-menu.c:1056
+#: disk-utils/fdisk-menu.c:1060
msgid "Number of cylinders"
msgstr "柱面数"
-#: disk-utils/fdisk-menu.c:1063
+#: disk-utils/fdisk-menu.c:1067
msgid "Number of heads"
msgstr "磁头数"
-#: disk-utils/fdisk-menu.c:1069
+#: disk-utils/fdisk-menu.c:1073
msgid "Number of sectors"
msgstr "扇区数"
-#: disk-utils/fdisk-menu.c:1120
+#: disk-utils/fdisk-menu.c:1124
#, c-format
msgid "Failed to create '%s' disk label"
msgstr "创建“%s”磁盘标签失败"
@@ -1778,10 +1840,10 @@ msgstr "%s 未挂载\n"
#: disk-utils/fsck.c:334 disk-utils/fsck.cramfs.c:181
#: disk-utils/fsck.cramfs.c:188 disk-utils/fsck.cramfs.c:244
#: disk-utils/fsck.cramfs.c:265 disk-utils/sfdisk.c:308 libfdisk/src/bsd.c:647
-#: login-utils/last.c:215 login-utils/last.c:252 login-utils/sulogin.c:721
+#: login-utils/last.c:217 login-utils/last.c:254 login-utils/sulogin.c:798
#: 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
+#: sys-utils/ctrlaltdel.c:50 sys-utils/irq-common.c:261 sys-utils/rfkill.c:217
+#: sys-utils/setpriv.c:271 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"
@@ -1826,8 +1888,8 @@ msgstr "正在解锁 %s。\n"
msgid "failed to setup description for %s"
msgstr "设置 %s 描述 失败"
-#: disk-utils/fsck.c:475 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
+#: disk-utils/fsck.c:475 misc-utils/findmnt.c:961 misc-utils/lsblk-mnt.c:15
+#: sys-utils/mount.c:92 sys-utils/swapon-common.c:31 sys-utils/umount.c:52
#, c-format
msgid "%s: parse error at line %d -- ignored"
msgstr "%s:第 %d 行解析出错 -- 已忽略"
@@ -1837,10 +1899,10 @@ msgstr "%s:第 %d 行解析出错 -- 已忽略"
msgid "%s: failed to parse fstab"
msgstr "%s:解析 fstab 失败"
-#: disk-utils/fsck.c:694 login-utils/login.c:1115 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
+#: disk-utils/fsck.c:694 login-utils/login.c:1123 login-utils/sulogin.c:1225
+#: login-utils/vipw.c:200 sys-utils/flock.c:351 sys-utils/nsenter.c:291
+#: sys-utils/swapon.c:345 sys-utils/unshare.c:298 sys-utils/unshare.c:716
+#: sys-utils/unshare.c:1058
msgid "fork failed"
msgstr "fork 失败"
@@ -1853,8 +1915,8 @@ msgstr "%s:执行失败"
msgid "wait: no more child process?!?"
msgstr "wait:没有剩余子进程了?!?"
-#: disk-utils/fsck.c:794 sys-utils/flock.c:369 sys-utils/swapon.c:359
-#: sys-utils/unshare.c:248 sys-utils/unshare.c:986
+#: disk-utils/fsck.c:794 sys-utils/flock.c:369 sys-utils/swapon.c:372
+#: sys-utils/unshare.c:248 sys-utils/unshare.c:1082
msgid "waitpid failed"
msgstr "waitpid 失败"
@@ -2006,8 +2068,8 @@ msgstr "必须以 root 用户进行匹配文件系统扫描:%s"
msgid "couldn't find matching filesystem: %s"
msgstr "找不到匹配的文件系统:%s"
-#: disk-utils/fsck.c:1499 disk-utils/fsck.c:1596 misc-utils/kill.c:286
-#: sys-utils/eject.c:281
+#: disk-utils/fsck.c:1499 disk-utils/fsck.c:1596 misc-utils/exch.c:84
+#: misc-utils/kill.c:286 sys-utils/eject.c:281 sys-utils/hwclock.c:1529
msgid "too many arguments"
msgstr "参数过多"
@@ -2079,7 +2141,7 @@ msgstr "文件长度过短"
#: disk-utils/fsck.cramfs.c:186 disk-utils/fsck.cramfs.c:241
#: disk-utils/fsck.cramfs.c:261 libfdisk/src/bsd.c:719 libfdisk/src/bsd.c:901
-#: login-utils/last.c:210 login-utils/last.c:244 sys-utils/fallocate.c:206
+#: login-utils/last.c:212 login-utils/last.c:246 sys-utils/fallocate.c:206
#, c-format
msgid "seek on %s failed"
msgstr "在 %s 上定位失败"
@@ -2182,9 +2244,9 @@ msgid "non-size (%ld vs %ld) bytes"
msgstr "无大小(%ld : %ld)字节"
#: disk-utils/fsck.cramfs.c:425 disk-utils/fsck.cramfs.c:550
-#: disk-utils/swaplabel.c:111 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
+#: disk-utils/swaplabel.c:111 misc-utils/uuidd.c:407 sys-utils/fallocate.c:442
+#: sys-utils/rfkill.c:566 sys-utils/setpriv.c:634 sys-utils/setpriv.c:657
+#: sys-utils/swapon.c:413 term-utils/script.c:322 term-utils/ttymsg.c:175
#, c-format
msgid "write failed: %s"
msgstr "写失败:%s"
@@ -2764,9 +2826,9 @@ msgstr ""
"----------------\n"
#: disk-utils/fsck.minix.c:1435 disk-utils/mkfs.minix.c:858
-#: disk-utils/mkswap.c:744 disk-utils/partx.c:1078 disk-utils/resizepart.c:125
-#: login-utils/utmpdump.c:408 sys-utils/dmesg.c:690 sys-utils/wdctl.c:457
-#: sys-utils/wdctl.c:536 term-utils/setterm.c:911 text-utils/col.c:195
+#: disk-utils/mkswap.c:795 disk-utils/partx.c:1078 disk-utils/resizepart.c:125
+#: login-utils/utmpdump.c:408 sys-utils/dmesg.c:819 sys-utils/wdctl.c:462
+#: sys-utils/wdctl.c:541 term-utils/setterm.c:911 text-utils/col.c:195
#: text-utils/pg.c:1255
msgid "write failed"
msgstr "写失败"
@@ -2989,9 +3051,9 @@ msgstr ""
" -V, --verbose 解释正在进行的操作;\n"
" 多次指定 -V 将导致空运行(dry-run)\n"
-#: disk-utils/mkfs.c:140 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
+#: disk-utils/mkfs.c:140 include/c.h:321 login-utils/su-common.c:1301
+#: login-utils/sulogin.c:940 login-utils/sulogin.c:944 sys-utils/flock.c:123
+#: sys-utils/rtcwake.c:632
#, c-format
msgid "failed to execute %s"
msgstr "执行 %s 失败"
@@ -3352,7 +3414,7 @@ msgstr "%s: 打不开 badblocks 文件"
msgid "block size smaller than physical sector size of %s"
msgstr "块尺寸比 %s 的物理扇区尺寸小"
-#: disk-utils/mkfs.minix.c:706 disk-utils/mkswap.c:356
+#: disk-utils/mkfs.minix.c:706 disk-utils/mkswap.c:365
#, c-format
msgid "cannot determine size of %s"
msgstr "无法确定 %s 的大小"
@@ -3398,97 +3460,115 @@ msgstr "解析块数失败"
msgid "%s is mounted; will not make a filesystem here!"
msgstr "%s 已挂载;将不会在此创建文件系统!"
-#: disk-utils/mkswap.c:118
+#: disk-utils/mkswap.c:122
#, c-format
msgid "Bad user-specified page size %u"
msgstr "用户指定的页大小 %u 有误"
-#: disk-utils/mkswap.c:121
+#: disk-utils/mkswap.c:125
#, c-format
msgid "Using user-specified page size %d, instead of the system value %d"
msgstr "将使用用户指定的页大小 %d 来取代系统值 %d"
-#: disk-utils/mkswap.c:163
+#: disk-utils/mkswap.c:167
msgid "Label was truncated."
msgstr "标签已截短。"
-#: disk-utils/mkswap.c:171
+#: disk-utils/mkswap.c:175
#, c-format
msgid "no label, "
msgstr "无标签,"
-#: disk-utils/mkswap.c:179
+#: disk-utils/mkswap.c:183
#, c-format
msgid "no uuid\n"
msgstr "无 uuid\n"
-#: disk-utils/mkswap.c:188
+#: disk-utils/mkswap.c:192
#, c-format
msgid " %s [options] device [size]\n"
msgstr " %s [选项] 设备 [大小]\n"
-#: disk-utils/mkswap.c:191
+#: disk-utils/mkswap.c:195
msgid "Set up a Linux swap area.\n"
msgstr "设置 Linux 交换区。\n"
-#: disk-utils/mkswap.c:194
+#: disk-utils/mkswap.c:198
msgid " -c, --check check bad blocks before creating the swap area\n"
msgstr " -c, --check 创建交换区之前先检查设备坏块\n"
-#: disk-utils/mkswap.c:195
+#: disk-utils/mkswap.c:199
msgid " -f, --force allow swap size area be larger than device\n"
msgstr " -f, --force 允许交换区大小大于设备大小\n"
-#: disk-utils/mkswap.c:196
+#: disk-utils/mkswap.c:200
msgid " -q, --quiet suppress output and warning messages\n"
msgstr " -q, --quiet 禁止输出和警告信息\n"
-#: disk-utils/mkswap.c:197
+#: disk-utils/mkswap.c:201
msgid " -p, --pagesize SIZE specify page size in bytes\n"
msgstr " -p, --pagesize 大小 指定页面大小,以字节为单位\n"
-#: disk-utils/mkswap.c:198
+#: disk-utils/mkswap.c:202
msgid " -L, --label LABEL specify label\n"
msgstr " -L, --label 标签 指定标签\n"
-#: disk-utils/mkswap.c:199
+#: disk-utils/mkswap.c:203
msgid " -v, --swapversion NUM specify swap-space version number\n"
msgstr " -v, --swapversion 数字 指定交换空间版本号\n"
-#: disk-utils/mkswap.c:200
+#: disk-utils/mkswap.c:204
msgid " -U, --uuid UUID specify the uuid to use\n"
msgstr " -U, --uuid UUID 指定要使用的 uuid\n"
-#: disk-utils/mkswap.c:202
+#: disk-utils/mkswap.c:206
#, c-format
msgid " -e, --endianness=<value> specify the endianness to use (%s, %s or %s)\n"
msgstr ""
-#: disk-utils/mkswap.c:204
+#: disk-utils/mkswap.c:208
+#, fuzzy
+#| msgid " -p, --pagesize SIZE specify page size in bytes\n"
+msgid " -o, --offset OFFSET specify the offset in the device\n"
+msgstr " -p, --pagesize 大小 指定页面大小,以字节为单位\n"
+
+#: disk-utils/mkswap.c:209
+#, fuzzy
+#| msgid " -p, --pagesize SIZE specify page size in bytes\n"
+msgid " -s, --size SIZE specify the size of a swap file in bytes\n"
+msgstr " -p, --pagesize 大小 指定页面大小,以字节为单位\n"
+
+#: disk-utils/mkswap.c:210
+#, fuzzy
+#| msgid " -t, --table create a table\n"
+msgid " -F, --file create a swap file\n"
+msgstr " -t, --table 创建表格\n"
+
+#: disk-utils/mkswap.c:211
msgid " --verbose verbose output\n"
msgstr " --verbose 详尽输出\n"
-#: disk-utils/mkswap.c:207 disk-utils/sfdisk.c:2088
+#: disk-utils/mkswap.c:214 disk-utils/sfdisk.c:2088
#, c-format
msgid " --lock[=<mode>] use exclusive device lock (%s, %s or %s)\n"
msgstr " --lock[=<模式>] 使用独占设备锁(%s、%s 或 %s)\n"
-#: disk-utils/mkswap.c:221
+#: disk-utils/mkswap.c:228
#, c-format
msgid "too many bad pages: %lu"
msgstr "坏页过多:%lu"
-#: disk-utils/mkswap.c:242
+#: disk-utils/mkswap.c:249
msgid "seek failed in check_blocks"
msgstr "check_blocks (检查块)时定位失败"
-#: disk-utils/mkswap.c:252
+#: disk-utils/mkswap.c:259
#, c-format
msgid "%lu bad page\n"
msgid_plural "%lu bad pages\n"
msgstr[0] "%lu 个坏页\n"
-#: disk-utils/mkswap.c:264
+#: disk-utils/mkswap.c:271
#, c-format
msgid ""
"mkswap: %s contains holes or other unsupported extents.\n"
@@ -3497,180 +3577,209 @@ msgstr ""
"mkswap: %s 包含空洞或者其它不支持的扩展。\n"
" 此交换文件可能会在启用时被内核拒绝!\n"
-#: disk-utils/mkswap.c:272
+#: disk-utils/mkswap.c:279
#, c-format
msgid " Use --verbose for more details.\n"
msgstr " 使用 --verbose 显示更多细节。\n"
-#: disk-utils/mkswap.c:313 disk-utils/mkswap.c:338
+#: disk-utils/mkswap.c:320 disk-utils/mkswap.c:345
#, c-format
msgid "hole detected at offset %ju"
msgstr "在偏移量 %ju 处探测到空洞"
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:328
#, c-format
msgid "data inline extent at offset %ju"
msgstr ""
-#: disk-utils/mkswap.c:324
+#: disk-utils/mkswap.c:331
#, c-format
msgid "shared extent at offset %ju"
msgstr ""
-#: disk-utils/mkswap.c:327
+#: disk-utils/mkswap.c:334
#, c-format
msgid "unallocated extent at offset %ju"
msgstr ""
-#: disk-utils/mkswap.c:368
+#: disk-utils/mkswap.c:367
+#, fuzzy
+#| msgid "%s: offset is greater than device size"
+msgid "offset larger than file size"
+msgstr "%s:偏移量超过设备大小"
+
+#: disk-utils/mkswap.c:380
msgid "unable to alloc new libblkid probe"
msgstr "无法分配新的 libblkid 探针"
-#: disk-utils/mkswap.c:370
+#: disk-utils/mkswap.c:382
msgid "unable to assign device to libblkid probe"
msgstr "无法将设备分配给 libblkid 探针"
-#: disk-utils/mkswap.c:392
+#: disk-utils/mkswap.c:395
+#, c-format
+msgid "cannot create swap file %s: node isn't regular file"
+msgstr ""
+
+#: disk-utils/mkswap.c:397
+#, fuzzy, c-format
+#| msgid "cannot open partition sector save file (%s)"
+msgid "cannot set permissions on swap file %s"
+msgstr "打不开分区扇区保存文件(%s)"
+
+#: disk-utils/mkswap.c:409 disk-utils/mkswap.c:413 disk-utils/mkswap.c:416
+#, fuzzy, c-format
+#| msgid "could not truncate file: %s"
+msgid "couldn't allocate swap file %s"
+msgstr "无法截短文件:%s"
+
+#: disk-utils/mkswap.c:426
#, c-format
msgid "warning: checking bad blocks from swap file is not supported: %s"
msgstr "警告:不支持检查交换区的坏块:%s"
-#: disk-utils/mkswap.c:407 disk-utils/mkswap.c:432 disk-utils/mkswap.c:480
+#: disk-utils/mkswap.c:441 disk-utils/mkswap.c:466 disk-utils/mkswap.c:518
msgid "unable to rewind swap-device"
msgstr "无法倒回(rewind)交换设备"
-#: disk-utils/mkswap.c:435
+#: disk-utils/mkswap.c:469
msgid "unable to erase bootbits sectors"
msgstr "不能擦除 bootbits 扇区"
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:486
#, c-format
msgid "%s: warning: wiping old %s signature."
msgstr "%s:警告,将擦除旧的 %s 签名。"
-#: disk-utils/mkswap.c:457
+#: disk-utils/mkswap.c:491
#, c-format
msgid "%s: warning: don't erase bootbits sectors"
msgstr "%s:警告,不要擦除 bootbits 扇区"
-#: disk-utils/mkswap.c:460
+#: disk-utils/mkswap.c:494
#, c-format
msgid " (%s partition table detected). "
msgstr " (检测到 %s 分区表)。"
-#: disk-utils/mkswap.c:462
+#: disk-utils/mkswap.c:496
#, c-format
msgid " (compiled without libblkid). "
msgstr " (编译时未链接 libblkid)。"
-#: disk-utils/mkswap.c:463
+#: disk-utils/mkswap.c:497
#, c-format
msgid "Use -f to force.\n"
msgstr "使用 -f 选项强制执行。\n"
-#: disk-utils/mkswap.c:485
+#: disk-utils/mkswap.c:523
#, c-format
msgid "%s: unable to write signature page"
msgstr "%s:无法写签名页"
-#: disk-utils/mkswap.c:543
+#: disk-utils/mkswap.c:584
msgid "parsing page size failed"
msgstr "解析页大小失败"
-#: disk-utils/mkswap.c:552
+#: disk-utils/mkswap.c:593
msgid "parsing version number failed"
msgstr "解析版本号失败"
-#: disk-utils/mkswap.c:555
+#: disk-utils/mkswap.c:596
#, c-format
msgid "swapspace version %d is not supported"
msgstr "不支持 swapspace 版本 %d"
-#: disk-utils/mkswap.c:561
+#: disk-utils/mkswap.c:602
#, c-format
msgid "warning: ignoring -U (UUIDs are unsupported by %s)"
msgstr "警告:将忽略 -U 选项(%s 不支持 UUID)"
-#: disk-utils/mkswap.c:574
+#: disk-utils/mkswap.c:615
#, fuzzy, c-format
#| msgid "swapspace version %d is not supported"
msgid "invalid endianness %s is not supported"
msgstr "不支持 swapspace 版本 %d"
-#: disk-utils/mkswap.c:603
+#: disk-utils/mkswap.c:620 misc-utils/lsclocks.c:275
+#, fuzzy
+#| msgid "invalid block-count"
+msgid "Invalid offset"
+msgstr "无效的块计数"
+
+#: disk-utils/mkswap.c:654
msgid "only one device argument is currently supported"
msgstr "当前只支持一个设备参数"
-#: disk-utils/mkswap.c:616
+#: disk-utils/mkswap.c:667
msgid "error: parsing UUID failed"
msgstr "错误:解析 UUID 失败"
-#: disk-utils/mkswap.c:625
+#: disk-utils/mkswap.c:676
msgid "error: Nowhere to set up swap on?"
msgstr "错误:没有设置交换空间的地方?"
-#: disk-utils/mkswap.c:631
+#: disk-utils/mkswap.c:682
msgid "invalid block count argument"
msgstr "无效的 块计数 参数"
-#: disk-utils/mkswap.c:640
+#: disk-utils/mkswap.c:691
#, c-format
msgid "error: size %llu KiB is larger than device size %<PRIu64> KiB"
msgstr "错误:尺寸 %llu KiB 大于设备尺寸 %<PRIu64> KiB"
-#: disk-utils/mkswap.c:646
+#: disk-utils/mkswap.c:697
#, c-format
msgid "error: swap area needs to be at least %ld KiB"
msgstr "错误:交换区至少需要 %ld KiB"
-#: disk-utils/mkswap.c:652
+#: disk-utils/mkswap.c:703
#, c-format
msgid "warning: truncating swap area to %llu KiB"
msgstr "警告:将把交换区截短为 %llu KiB"
-#: disk-utils/mkswap.c:657
+#: disk-utils/mkswap.c:708
#, c-format
msgid "error: %s is mounted; will not make swapspace"
msgstr "错误:%s 已挂载;将不会创建交换空间"
-#: disk-utils/mkswap.c:664
+#: disk-utils/mkswap.c:715
#, c-format
msgid "%s: insecure permissions %04o, fix with: chmod %04o %s"
msgstr "%s:不安全的权限 %04o,建议修复方式:chmod %04o %s"
-#: disk-utils/mkswap.c:669
+#: disk-utils/mkswap.c:720
#, c-format
msgid "%s: insecure file owner %d, fix with: chown 0:0 %s"
msgstr "%s:不安全的文件拥有者 %d,建议修复方式:chown 0:0 %s"
-#: disk-utils/mkswap.c:688
+#: disk-utils/mkswap.c:739
msgid "Unable to set up swap-space: unreadable"
msgstr "无法设置交换空间:不可读"
-#: disk-utils/mkswap.c:694
+#: disk-utils/mkswap.c:745
#, c-format
msgid "Setting up swapspace version %d, size = %s (%<PRIu64> bytes)\n"
msgstr "正在设置交换空间版本 %d,大小 = %s (%<PRIu64> 个字节)\n"
-#: disk-utils/mkswap.c:714
+#: disk-utils/mkswap.c:765
#, c-format
msgid "%s: unable to obtain selinux file label"
msgstr "%s:无法获得 selinux 文件标签"
-#: disk-utils/mkswap.c:719
+#: disk-utils/mkswap.c:770
#, c-format
msgid "%s: unable to obtain default selinux file label"
msgstr "%s:无法获得默认 selinux 文件标签"
-#: disk-utils/mkswap.c:723
+#: disk-utils/mkswap.c:774
msgid "unable to create new selinux context"
msgstr "无法创建新的 selinux 环境(context)"
-#: disk-utils/mkswap.c:725
+#: disk-utils/mkswap.c:776
msgid "couldn't compute selinux context"
msgstr "无法计算 selinux 环境(context)"
-#: disk-utils/mkswap.c:731
+#: disk-utils/mkswap.c:782
#, c-format
msgid "unable to relabel %s to %s"
msgstr "无法将 %s 标签改为 %s"
@@ -3699,7 +3808,7 @@ msgstr "易读形式的大小"
msgid "partition name"
msgstr "分区名"
-#: disk-utils/partx.c:99 misc-utils/findmnt.c:118 misc-utils/lsblk.c:205
+#: disk-utils/partx.c:99 misc-utils/findmnt.c:128 misc-utils/lsblk.c:211
msgid "partition UUID"
msgstr "分区 UUID"
@@ -3707,7 +3816,7 @@ msgstr "分区 UUID"
msgid "partition table type (dos, gpt, ...)"
msgstr "分区表类型(dos、gpt、...)"
-#: disk-utils/partx.c:101 misc-utils/lsblk.c:200
+#: disk-utils/partx.c:101 misc-utils/lsblk.c:206
msgid "partition flags"
msgstr "分区标志"
@@ -3715,7 +3824,7 @@ msgstr "分区标志"
msgid "partition type (a string, a UUID, or hex)"
msgstr "分区类型(字符串,UUID 或十六进制数)"
-#: disk-utils/partx.c:121 sys-utils/losetup.c:554 sys-utils/losetup.c:670
+#: disk-utils/partx.c:121 sys-utils/losetup.c:619 sys-utils/losetup.c:740
msgid "failed to initialize loopcxt"
msgstr "初始化 loopcxt 失败"
@@ -3734,18 +3843,19 @@ msgstr "尝试将“%s”用作回环设备\n"
msgid "%s: failed to set backing file"
msgstr "%s:设置后备文件失败"
-#: disk-utils/partx.c:138 sys-utils/losetup.c:603
+#: disk-utils/partx.c:138 sys-utils/losetup.c:671
#, c-format
msgid "%s: failed to set up loop device"
msgstr "%s:设置回环设备失败"
-#: disk-utils/partx.c:168 login-utils/lslogins.c:322 misc-utils/fincore.c:92
-#: misc-utils/findmnt.c:383 misc-utils/lsblk.c:343 misc-utils/lsfd.c:478
-#: 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
+#: disk-utils/partx.c:168 login-utils/lslogins.c:322 misc-utils/fincore.c:151
+#: misc-utils/findmnt.c:393 misc-utils/lsblk.c:373 misc-utils/lsclocks.c:171
+#: misc-utils/lsfd.c:564 misc-utils/lslocks.c:564 misc-utils/uuidparse.c:125
+#: misc-utils/wipefs.c:132 sys-utils/irq-common.c:95 sys-utils/losetup.c:130
+#: sys-utils/lscpu.c:192 sys-utils/lscpu.c:207 sys-utils/lsipc.c:233
+#: sys-utils/lsmem.c:171 sys-utils/lsns.c:261 sys-utils/prlimit.c:283
+#: sys-utils/rfkill.c:163 sys-utils/swapon.c:163 sys-utils/wdctl.c:184
+#: sys-utils/zramctl.c:147
#, c-format
msgid "unknown column: %s"
msgstr "未知列: %s"
@@ -3841,11 +3951,12 @@ msgid "#%2d: %9ju-%9ju (%9ju sector, %6ju MB)\n"
msgid_plural "#%2d: %9ju-%9ju (%9ju sectors, %6ju MB)\n"
msgstr[0] "#%2d:%9ju-%9ju (%9ju 扇区%6ju MB)\n"
-#: disk-utils/partx.c:687 misc-utils/fincore.c:371 misc-utils/findmnt.c:1792
-#: misc-utils/lsblk.c:2395 misc-utils/lsfd.c:533 misc-utils/lsfd.c:1988
-#: misc-utils/lslocks.c:487 sys-utils/losetup.c:340 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
+#: disk-utils/partx.c:687 include/column-list-table.h:62
+#: misc-utils/fincore.c:514 misc-utils/findmnt.c:1925 misc-utils/lsblk.c:2270
+#: misc-utils/lsblk.c:2773 misc-utils/lsclocks.c:657 misc-utils/lsfd.c:615
+#: misc-utils/lsfd.c:2400 misc-utils/lslocks.c:769 sys-utils/losetup.c:403
+#: sys-utils/lscpu.c:608 sys-utils/lscpu.c:764 sys-utils/prlimit.c:312
+#: sys-utils/rfkill.c:488 sys-utils/swapon.c:318 sys-utils/wdctl.c:365
msgid "failed to allocate output column"
msgstr "分配输出列失败"
@@ -3898,7 +4009,7 @@ msgstr ""
" -s, --show 列出分区\n"
"\n"
-#: disk-utils/partx.c:773 misc-utils/lsblk.c:2000 sys-utils/lsmem.c:528
+#: disk-utils/partx.c:773 misc-utils/lsblk.c:2325 sys-utils/lsmem.c:521
msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
@@ -3910,20 +4021,20 @@ msgstr " -g, --noheadings --show 时不打印标题\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:776 sys-utils/irqtop.c:271 sys-utils/lsirq.c:66
+#: disk-utils/partx.c:776 sys-utils/irqtop.c:264 sys-utils/lsirq.c:59
msgid " -o, --output <list> define which output columns to use\n"
msgstr " -o, --output <列表> 定义使用哪个输出列\n"
-#: disk-utils/partx.c:777 sys-utils/lsmem.c:531
+#: disk-utils/partx.c:777 sys-utils/lsmem.c:524
msgid " --output-all output all columns\n"
msgstr " --output-all 输出所有列\n"
-#: disk-utils/partx.c:778 misc-utils/lsblk.c:1994 sys-utils/lsirq.c:64
-#: sys-utils/lsmem.c:526
+#: disk-utils/partx.c:778 misc-utils/lsblk.c:2315 sys-utils/lsirq.c:57
+#: sys-utils/lsmem.c:519
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs 使用 key=“value” 输出格式\n"
-#: disk-utils/partx.c:779 misc-utils/lsblk.c:2010 sys-utils/lsmem.c:532
+#: disk-utils/partx.c:779 misc-utils/lsblk.c:2335 sys-utils/lsmem.c:525
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
@@ -4015,8 +4126,8 @@ msgstr "无法定位块设备“%s”"
msgid "Device '%s' is not a block device"
msgstr "设备“%s”不是块设备"
-#: 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
+#: disk-utils/raw.c:195 disk-utils/raw.c:198 sys-utils/ipcrm.c:358
+#: sys-utils/ipcrm.c:372 sys-utils/ipcrm.c:386
msgid "failed to parse argument"
msgstr "解析参数失败"
@@ -4331,7 +4442,7 @@ msgstr "未指定分区号"
#: 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:802
+#: sys-utils/losetup.c:874
msgid "unexpected arguments"
msgstr "参数异常"
@@ -4476,7 +4587,7 @@ msgstr " 示例:\n"
msgid " , 4G Creates a 4GiB partition at default start offset.\n"
msgstr " , 4G 在默认起始偏移位置创建一个 4GiB 分区。\n"
-#: disk-utils/sfdisk.c:1546 sys-utils/dmesg.c:1680
+#: disk-utils/sfdisk.c:1546 sys-utils/dmesg.c:1952
msgid "unsupported command"
msgstr "不支持的命令"
@@ -4894,12 +5005,12 @@ msgstr ""
msgid "ignore -U (UUIDs are unsupported)"
msgstr "忽略 -U (不支持 UUID)"
-#: include/c.h:301
+#: include/c.h:312
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "请尝试执行“%s --help”了解更多信息。\n"
-#: include/c.h:446
+#: include/c.h:457
msgid ""
"\n"
"Usage:\n"
@@ -4907,7 +5018,7 @@ msgstr ""
"\n"
"用法:\n"
-#: include/c.h:447
+#: include/c.h:458
msgid ""
"\n"
"Options:\n"
@@ -4915,7 +5026,7 @@ msgstr ""
"\n"
"选项:\n"
-#: include/c.h:448
+#: include/c.h:459
msgid ""
"\n"
"Functions:\n"
@@ -4923,7 +5034,7 @@ msgstr ""
"\n"
"功能:\n"
-#: include/c.h:449
+#: include/c.h:460
msgid ""
"\n"
"Commands:\n"
@@ -4931,7 +5042,7 @@ msgstr ""
"\n"
"命令:\n"
-#: include/c.h:450
+#: include/c.h:461
msgid ""
"\n"
"Arguments:\n"
@@ -4939,7 +5050,7 @@ msgstr ""
"\n"
"参数:\n"
-#: include/c.h:451
+#: include/c.h:462
msgid ""
"\n"
"Available output columns:\n"
@@ -4947,15 +5058,27 @@ msgstr ""
"\n"
"可用的输出列:\n"
-#: include/c.h:454
+#: include/c.h:463
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Generic columns:\n"
+msgid ""
+"\n"
+"Default columns:\n"
+msgstr ""
+"\n"
+"常规选项:\n"
+
+#: include/c.h:466
msgid "display this help"
msgstr "显示此帮助"
-#: include/c.h:455
+#: include/c.h:467
msgid "display version"
msgstr "显示版本"
-#: include/c.h:465
+#: include/c.h:477
#, c-format
msgid ""
" %s arguments may be followed by the suffixes for\n"
@@ -4964,7 +5087,7 @@ msgstr ""
" %s 参数可能跟随一个后缀,包括\n"
" GiB、TiB、PiB、EiB、ZiB 和 YiB(其中的“iB”是可选的)\n"
-#: include/c.h:468
+#: include/c.h:480
#, c-format
msgid ""
"\n"
@@ -4973,23 +5096,23 @@ msgstr ""
"\n"
"更多信息请参阅 %s。\n"
-#: include/c.h:470
+#: include/c.h:482
#, c-format
msgid "%s from %s\n"
msgstr "%s,来自 %s\n"
-#: include/c.h:492 misc-utils/kill.c:237 term-utils/agetty.c:704
+#: include/c.h:504 misc-utils/kill.c:237 term-utils/agetty.c:693
#, fuzzy, c-format
#| msgid "%s from %s\n"
msgid "%s from %s"
msgstr "%s,来自 %s\n"
-#: include/c.h:496
+#: include/c.h:508
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
+#: login-utils/vipw.c:291 sys-utils/rtcwake.c:313 term-utils/setterm.c:833
msgid "write error"
msgstr "写出错"
@@ -5001,8 +5124,8 @@ msgstr "默认启用颜色"
msgid "colors are disabled by default"
msgstr "默认禁用颜色"
-#: include/env.h:30 lib/pager.c:158 login-utils/login.c:1199
-#: login-utils/login.c:1203 term-utils/agetty.c:1241
+#: include/env.h:30 lib/pager.c:160 login-utils/login.c:1207
+#: login-utils/login.c:1211 term-utils/agetty.c:1204
#, c-format
msgid "failed to set the %s environment variable"
msgstr "设置环境变量 %s 失败"
@@ -5901,140 +6024,164 @@ msgstr "ChromeOS 根文件系统"
msgid "ChromeOS reserved"
msgstr "ChromeOS 保留"
+#: include/pt-gpt-partnames.h:235
+#, fuzzy
+#| msgid "ChromeOS reserved"
+msgid "ChromeOS firmware"
+msgstr "ChromeOS 保留"
+
+#: include/pt-gpt-partnames.h:236
+#, fuzzy
+#| msgid "ChromeOS kernel"
+msgid "ChromeOS miniOS"
+msgstr "ChromeOS 内核"
+
#: include/pt-gpt-partnames.h:237
+#, fuzzy
+#| msgid "ChromeOS kernel"
+msgid "ChromeOS hibernate"
+msgstr "ChromeOS 内核"
+
+#: include/pt-gpt-partnames.h:240
msgid "MidnightBSD data"
msgstr "MidnightBSD 数据"
-#: include/pt-gpt-partnames.h:238
+#: include/pt-gpt-partnames.h:241
msgid "MidnightBSD boot"
msgstr "MidnightBSD 启动"
-#: include/pt-gpt-partnames.h:239
+#: include/pt-gpt-partnames.h:242
msgid "MidnightBSD swap"
msgstr "MidnightBSD 交换"
-#: include/pt-gpt-partnames.h:240
+#: include/pt-gpt-partnames.h:243
msgid "MidnightBSD UFS"
msgstr "MidnightBSD UFS"
-#: include/pt-gpt-partnames.h:241
+#: include/pt-gpt-partnames.h:244
msgid "MidnightBSD ZFS"
msgstr "MidnightBSD ZFS"
-#: include/pt-gpt-partnames.h:242
+#: include/pt-gpt-partnames.h:245
msgid "MidnightBSD Vinum"
msgstr "MidnightBSD Vinum"
-#: include/pt-gpt-partnames.h:245
+#: include/pt-gpt-partnames.h:248
msgid "Ceph Journal"
msgstr "Ceph 日志"
-#: include/pt-gpt-partnames.h:246
+#: include/pt-gpt-partnames.h:249
msgid "Ceph Encrypted Journal"
msgstr "Ceph 加密日志"
-#: include/pt-gpt-partnames.h:247
+#: include/pt-gpt-partnames.h:250
msgid "Ceph OSD"
msgstr "Ceph OSD"
-#: include/pt-gpt-partnames.h:248
+#: include/pt-gpt-partnames.h:251
msgid "Ceph crypt OSD"
msgstr "Ceph 加密 OSD"
-#: include/pt-gpt-partnames.h:249
+#: include/pt-gpt-partnames.h:252
msgid "Ceph disk in creation"
msgstr "创建中的 Ceph 磁盘"
-#: include/pt-gpt-partnames.h:250
+#: include/pt-gpt-partnames.h:253
msgid "Ceph crypt disk in creation"
msgstr "创建中的加密 Ceph 磁盘"
-#: include/pt-gpt-partnames.h:253 include/pt-mbr-partnames.h:109
+#: include/pt-gpt-partnames.h:256 include/pt-mbr-partnames.h:109
msgid "VMware VMFS"
msgstr "VMware VMFS"
-#: include/pt-gpt-partnames.h:254
+#: include/pt-gpt-partnames.h:257
msgid "VMware Diagnostic"
msgstr "VMware 诊断"
-#: include/pt-gpt-partnames.h:255
+#: include/pt-gpt-partnames.h:258
msgid "VMware Virtual SAN"
msgstr "VMware Virtual SAN"
-#: include/pt-gpt-partnames.h:256
+#: include/pt-gpt-partnames.h:259
msgid "VMware Virsto"
msgstr "VMware Virsto"
-#: include/pt-gpt-partnames.h:257
+#: include/pt-gpt-partnames.h:260
msgid "VMware Reserved"
msgstr "VMware 保留"
-#: include/pt-gpt-partnames.h:260
+#: include/pt-gpt-partnames.h:263
msgid "OpenBSD data"
msgstr "OpenBSD 数据"
-#: include/pt-gpt-partnames.h:263
+#: include/pt-gpt-partnames.h:266
msgid "QNX6 file system"
msgstr "QNX6 文件系统"
-#: include/pt-gpt-partnames.h:266
+#: include/pt-gpt-partnames.h:269
msgid "Plan 9 partition"
msgstr "Plan 9 分区"
-#: include/pt-gpt-partnames.h:269
+#: include/pt-gpt-partnames.h:272
msgid "HiFive FSBL"
msgstr "HiFive FSBL"
-#: include/pt-gpt-partnames.h:270
+#: include/pt-gpt-partnames.h:273
msgid "HiFive BBL"
msgstr "HiFive BBL"
-#: include/pt-gpt-partnames.h:273
+#: include/pt-gpt-partnames.h:276
msgid "Haiku BFS"
msgstr "Haiku BFS"
-#: include/pt-gpt-partnames.h:276
+#: include/pt-gpt-partnames.h:279
msgid "Marvell Armada 3700 Boot partition"
msgstr ""
-#: include/pt-gpt-partnames.h:280
+#: include/pt-gpt-partnames.h:283
msgid "DragonFlyBSD Label32"
msgstr ""
-#: include/pt-gpt-partnames.h:281
+#: include/pt-gpt-partnames.h:284
msgid "DragonFlyBSD Swap"
msgstr ""
-#: include/pt-gpt-partnames.h:282
+#: include/pt-gpt-partnames.h:285
msgid "DragonFlyBSD UFS1"
msgstr ""
-#: include/pt-gpt-partnames.h:283
+#: include/pt-gpt-partnames.h:286
#, fuzzy
#| msgid "FreeBSD Vinum"
msgid "DragonFlyBSD Vinum"
msgstr "FreeBSD Vinum"
-#: include/pt-gpt-partnames.h:284
+#: include/pt-gpt-partnames.h:287
msgid "DragonFlyBSD CCD"
msgstr ""
-#: include/pt-gpt-partnames.h:285
+#: include/pt-gpt-partnames.h:288
msgid "DragonFlyBSD Label64"
msgstr ""
-#: include/pt-gpt-partnames.h:286
+#: include/pt-gpt-partnames.h:289
msgid "DragonFlyBSD Legacy"
msgstr ""
-#: include/pt-gpt-partnames.h:287
+#: include/pt-gpt-partnames.h:290
msgid "DragonFlyBSD HAMMER"
msgstr ""
-#: include/pt-gpt-partnames.h:288
+#: include/pt-gpt-partnames.h:291
msgid "DragonFlyBSD HAMMER2"
msgstr ""
+#: include/pt-gpt-partnames.h:294
+#, fuzzy
+#| msgid "Windows recovery environment"
+msgid "U-Boot environment"
+msgstr "Windows 恢复环境"
+
#: include/pt-mbr-partnames.h:5
msgid "Empty"
msgstr "空"
@@ -6434,6 +6581,18 @@ msgstr "%s:获取锁失败"
msgid "OK\n"
msgstr "正常\n"
+#: lib/caputils.c:104
+msgid "capget failed"
+msgstr "capget 失败"
+
+#: lib/caputils.c:112
+msgid "capset failed"
+msgstr "capset 失败"
+
+#: lib/caputils.c:124
+msgid "prctl(PR_CAP_AMBIENT) failed"
+msgstr "prctl(PR_CAP_AMBIENT) 失败"
+
#: libfdisk/src/ask.c:509 libfdisk/src/ask.c:521
#, c-format
msgid "Selected partition %ju"
@@ -6474,7 +6633,7 @@ msgstr "第一个柱面"
msgid "Last cylinder, +/-cylinders or +/-size{K,M,G,T,P}"
msgstr "最后一个柱面, +/-cylinders 或 +size{K,M,G,T,P}"
-#: libfdisk/src/bsd.c:296 libfdisk/src/dos.c:1441 libfdisk/src/gpt.c:2551
+#: libfdisk/src/bsd.c:296 libfdisk/src/dos.c:1441 libfdisk/src/gpt.c:2552
msgid "Last sector, +/-sectors or +/-size{K,M,G,T,P}"
msgstr "最后一个扇区,+/-sectors 或 +size{K,M,G,T,P}"
@@ -6495,7 +6654,7 @@ msgstr "磁盘"
msgid "Packname"
msgstr "包名"
-#: libfdisk/src/bsd.c:463 libfdisk/src/sun.c:1137
+#: libfdisk/src/bsd.c:463 libfdisk/src/sun.c:1141
msgid "Flags"
msgstr "标志"
@@ -6523,16 +6682,16 @@ msgstr "磁道/柱面"
msgid "Sectors/Cylinder"
msgstr "扇区/柱面"
-#: 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
+#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1029 libfdisk/src/dos.c:2816
+#: libfdisk/src/sgi.c:1165 libfdisk/src/sun.c:203 libfdisk/src/sun.c:1137
msgid "Cylinders"
msgstr "柱面"
-#: libfdisk/src/bsd.c:496 libfdisk/src/sun.c:783
+#: libfdisk/src/bsd.c:496 libfdisk/src/sun.c:787
msgid "Rpm"
msgstr "转每分"
-#: libfdisk/src/bsd.c:501 libfdisk/src/sgi.c:291 libfdisk/src/sun.c:803
+#: libfdisk/src/bsd.c:501 libfdisk/src/sgi.c:293 libfdisk/src/sun.c:807
msgid "Interleave"
msgstr "交错"
@@ -6659,7 +6818,7 @@ msgstr "Cpg"
msgid "%s: fsync device failed"
msgstr "%s:设备 fsync 失败"
-#: libfdisk/src/context.c:772 misc-utils/wipefs.c:619
+#: libfdisk/src/context.c:772 misc-utils/wipefs.c:616
#, c-format
msgid "%s: close device failed"
msgstr "%s:关闭设备失败"
@@ -6801,14 +6960,14 @@ msgstr "分区表 %3$zu 的无效标志 0x%1$02x%2$02x 将通过写入来更正"
msgid "Start sector %ju out of range."
msgstr "起始扇区 %ju 超出范围。"
-#: libfdisk/src/dos.c:1276 libfdisk/src/gpt.c:2409 libfdisk/src/sgi.c:842
-#: libfdisk/src/sun.c:528
+#: libfdisk/src/dos.c:1276 libfdisk/src/gpt.c:2410 libfdisk/src/sgi.c:844
+#: libfdisk/src/sun.c:532
#, c-format
msgid "Partition %zu is already defined. Delete it before re-adding it."
msgstr "分区 %zu 已经定义过。请删除后再重新添加它。"
#: libfdisk/src/dos.c:1291 libfdisk/src/dos.c:1317 libfdisk/src/dos.c:1375
-#: libfdisk/src/dos.c:1407 libfdisk/src/gpt.c:2418
+#: libfdisk/src/dos.c:1407 libfdisk/src/gpt.c:2419
msgid "No free sectors available."
msgstr "无空闲扇区可用。"
@@ -6865,513 +7024,513 @@ msgstr "分区 %zu 的物理/逻辑终点不同:物理=(%d, %d, %d), 逻辑=(%
msgid "Partition %zu: does not end on cylinder boundary."
msgstr "分区 %zu 未结束在柱面边界上。"
-#: libfdisk/src/dos.c:1748
+#: libfdisk/src/dos.c:1756
#, c-format
msgid "Partition %zu: bad start-of-data."
msgstr "分区 %zu:数据起点错误。"
-#: libfdisk/src/dos.c:1764
+#: libfdisk/src/dos.c:1772
#, c-format
msgid "Partition %zu: overlaps partition %zu."
msgstr "分区 %zu:与 分区 %zu 重叠。"
-#: libfdisk/src/dos.c:1793
+#: libfdisk/src/dos.c:1801
#, c-format
msgid "Partition %zu: empty."
msgstr "分区 %zu:空分区。"
-#: libfdisk/src/dos.c:1800
+#: libfdisk/src/dos.c:1808
#, c-format
msgid "Logical partition %zu: not entirely in partition %zu."
msgstr "逻辑分区 %zu:没有完全在分区 %zu 中。"
-#: libfdisk/src/dos.c:1809 libfdisk/src/gpt.c:2315
+#: libfdisk/src/dos.c:1817 libfdisk/src/gpt.c:2316
msgid "No errors detected."
msgstr "未检测到错误。"
-#: libfdisk/src/dos.c:1811
+#: libfdisk/src/dos.c:1819
#, 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:1814
+#: libfdisk/src/dos.c:1822
#, fuzzy, c-format
#| msgid "Remaining %lld unallocated %ld-byte sectors."
msgid "Remaining %ju unallocated %ld-byte sectors."
msgstr "剩余 %lld 未分配的 %ld字节 扇区。"
-#: libfdisk/src/dos.c:1818 libfdisk/src/gpt.c:2335
+#: libfdisk/src/dos.c:1826 libfdisk/src/gpt.c:2336
#, c-format
msgid "%d error detected."
msgid_plural "%d errors detected."
msgstr[0] "检测到 %d 个错误。"
-#: libfdisk/src/dos.c:1851
+#: libfdisk/src/dos.c:1861
msgid "The maximum number of partitions has been created."
msgstr "已创建分区达到最大数量。"
-#: libfdisk/src/dos.c:1884 libfdisk/src/dos.c:1899 libfdisk/src/dos.c:2352
+#: libfdisk/src/dos.c:1894 libfdisk/src/dos.c:1909 libfdisk/src/dos.c:2362
msgid "Extended partition already exists."
msgstr "扩展分区已存在。"
-#: libfdisk/src/dos.c:1914
+#: libfdisk/src/dos.c:1924
msgid "Extended partition does not exists. Failed to add logical partition."
msgstr "扩展分区不存在。添加逻辑分区失败。"
-#: libfdisk/src/dos.c:1974
+#: libfdisk/src/dos.c:1984
msgid "All primary partitions are in use."
msgstr "所有主分区都在使用中。"
-#: libfdisk/src/dos.c:1976 libfdisk/src/dos.c:1988
+#: libfdisk/src/dos.c:1986 libfdisk/src/dos.c:1998
msgid "All space for primary partitions is in use."
msgstr "所有主分区的空间都在使用中。"
#. TRANSLATORS: Try to keep this within 80 characters.
-#: libfdisk/src/dos.c:1991
+#: libfdisk/src/dos.c:2001
msgid "To create more partitions, first replace a primary with an extended partition."
msgstr "要创建更多分区,请先将一个主分区替换为扩展分区。"
-#: libfdisk/src/dos.c:2012
+#: libfdisk/src/dos.c:2022
msgid "Partition type"
msgstr "分区类型"
-#: libfdisk/src/dos.c:2016
+#: libfdisk/src/dos.c:2026
#, c-format
msgid "%u primary, %d extended, %u free"
msgstr "%u个主分区,%d个扩展分区,%u空闲"
-#: libfdisk/src/dos.c:2021
+#: libfdisk/src/dos.c:2031
msgid "primary"
msgstr "主分区"
-#: libfdisk/src/dos.c:2023
+#: libfdisk/src/dos.c:2033
msgid "extended"
msgstr "扩展分区"
-#: libfdisk/src/dos.c:2023
+#: libfdisk/src/dos.c:2033
msgid "container for logical partitions"
msgstr "逻辑分区容器"
-#: libfdisk/src/dos.c:2025
+#: libfdisk/src/dos.c:2035
msgid "logical"
msgstr "逻辑分区"
-#: libfdisk/src/dos.c:2025
+#: libfdisk/src/dos.c:2035
msgid "numbered from 5"
msgstr "从 5 开始编号"
-#: libfdisk/src/dos.c:2064
+#: libfdisk/src/dos.c:2074
#, c-format
msgid "Invalid partition type `%c'."
msgstr "无效的分区类型“%c”。"
-#: libfdisk/src/dos.c:2082
+#: libfdisk/src/dos.c:2092
#, c-format
msgid "Cannot write sector %jd: seek failed"
msgstr "写扇区 %jd 失败:定位失败"
-#: libfdisk/src/dos.c:2242 libfdisk/src/gpt.c:1291
+#: libfdisk/src/dos.c:2252 libfdisk/src/gpt.c:1292
msgid "Disk identifier"
msgstr "磁盘标识符"
-#: libfdisk/src/dos.c:2357
+#: libfdisk/src/dos.c:2367
msgid "Type 0 means free space to many systems. Having partitions of type 0 is probably unwise."
msgstr "很多系统将类型 0 视为空闲空间。不建议设置类型为 0 的分区。"
-#: libfdisk/src/dos.c:2362
+#: libfdisk/src/dos.c:2372
msgid "Cannot change type of the extended partition which is already used by logical partitions. Delete logical partitions first."
msgstr "无法更改已被逻辑分区使用的扩展分区的类型。请先删除逻辑分区。"
-#: libfdisk/src/dos.c:2684
+#: libfdisk/src/dos.c:2694
#, c-format
msgid "Partition %zu: no data area."
msgstr "分区 %zu:无数据区。"
-#: libfdisk/src/dos.c:2718
+#: libfdisk/src/dos.c:2728
msgid "New beginning of data"
msgstr "新数据起点"
-#: libfdisk/src/dos.c:2735
+#: libfdisk/src/dos.c:2745
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
+#: libfdisk/src/dos.c:2791
#, c-format
msgid "Partition %zu: is an extended partition."
msgstr "分区 %zu:是一个扩展分区。"
-#: libfdisk/src/dos.c:2787
+#: libfdisk/src/dos.c:2797
#, c-format
msgid "The bootable flag on partition %zu is enabled now."
msgstr "分区 %zu 的 可启动 标志已启用。"
-#: libfdisk/src/dos.c:2788
+#: libfdisk/src/dos.c:2798
#, c-format
msgid "The bootable flag on partition %zu is disabled now."
msgstr "分区 %zu 的 可启动 标志已禁用。"
-#: libfdisk/src/dos.c:2801 libfdisk/src/gpt.c:3243 libfdisk/src/sgi.c:1158
-#: libfdisk/src/sun.c:1129
+#: libfdisk/src/dos.c:2811 libfdisk/src/gpt.c:3244 libfdisk/src/sgi.c:1161
+#: libfdisk/src/sun.c:1133
msgid "Device"
msgstr "设备"
-#: libfdisk/src/dos.c:2802 libfdisk/src/sun.c:40
+#: libfdisk/src/dos.c:2812 libfdisk/src/sun.c:40
msgid "Boot"
msgstr "启动"
-#: libfdisk/src/dos.c:2808 libfdisk/src/sgi.c:1164 libfdisk/src/sun.c:1135
+#: libfdisk/src/dos.c:2818 libfdisk/src/sgi.c:1167 libfdisk/src/sun.c:1139
msgid "Id"
msgstr "Id"
-#: libfdisk/src/dos.c:2812
+#: libfdisk/src/dos.c:2822
msgid "Start-C/H/S"
msgstr "起始-C/H/S"
-#: libfdisk/src/dos.c:2813
+#: libfdisk/src/dos.c:2823
msgid "End-C/H/S"
msgstr "终-C/H/S"
-#: libfdisk/src/dos.c:2814 libfdisk/src/gpt.c:3253 libfdisk/src/sgi.c:1166
+#: libfdisk/src/dos.c:2824 libfdisk/src/gpt.c:3254 libfdisk/src/sgi.c:1169
msgid "Attrs"
msgstr "属性"
-#: libfdisk/src/gpt.c:691
+#: libfdisk/src/gpt.c:692
msgid "failed to allocate GPT header"
msgstr "分配 GPT 头失败"
-#: libfdisk/src/gpt.c:800
+#: libfdisk/src/gpt.c:801
msgid "First LBA specified by script is out of range."
msgstr "脚本指定的第一个 LBA 超出范围。"
-#: libfdisk/src/gpt.c:812
+#: libfdisk/src/gpt.c:813
msgid "Last LBA specified by script is out of range."
msgstr "脚本指定的最后一个 LBA 超出范围。"
-#: libfdisk/src/gpt.c:953
+#: libfdisk/src/gpt.c:954
#, c-format
msgid "GPT PMBR size mismatch (%<PRIu64> != %<PRIu64>) will be corrected by write."
msgstr "GPT PMBR 大小不符(%<PRIu64> != %<PRIu64>),将用写入予以更正。"
-#: libfdisk/src/gpt.c:978
+#: libfdisk/src/gpt.c:979
msgid "gpt: stat() failed"
msgstr "gpt:stat() 失败"
-#: libfdisk/src/gpt.c:988
+#: libfdisk/src/gpt.c:989
#, c-format
msgid "gpt: cannot handle files with mode %o"
msgstr "gpt:无法操作模式为 %o 的文件"
-#: libfdisk/src/gpt.c:1248
+#: libfdisk/src/gpt.c:1249
msgid "GPT Header"
msgstr "GPT 头"
-#: libfdisk/src/gpt.c:1253
+#: libfdisk/src/gpt.c:1254
msgid "GPT Entries"
msgstr "GPT 记录项"
-#: libfdisk/src/gpt.c:1259
+#: libfdisk/src/gpt.c:1260
msgid "GPT Backup Entries"
msgstr "GPT 备份记录项"
-#: libfdisk/src/gpt.c:1265
+#: libfdisk/src/gpt.c:1266
msgid "GPT Backup Header"
msgstr "GPT 备份头"
-#: libfdisk/src/gpt.c:1298
+#: libfdisk/src/gpt.c:1299
msgid "First usable LBA"
msgstr "第一个可用 LBA"
-#: libfdisk/src/gpt.c:1303
+#: libfdisk/src/gpt.c:1304
msgid "Last usable LBA"
msgstr "最后一个可用 LBA"
#. TRANSLATORS: The LBA (Logical Block Address) of the backup GPT header.
-#: libfdisk/src/gpt.c:1309
+#: libfdisk/src/gpt.c:1310
msgid "Alternative LBA"
msgstr "替代 LBA"
#. TRANSLATORS: The start of the array of partition entries.
-#: libfdisk/src/gpt.c:1315
+#: libfdisk/src/gpt.c:1316
#, 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
+#: libfdisk/src/gpt.c:1322
#, fuzzy
#| msgid "Partition entries LBA"
msgid "Partition entries ending LBA"
msgstr "分区记录项 LBA"
-#: libfdisk/src/gpt.c:1328
+#: libfdisk/src/gpt.c:1329
msgid "Allocated partition entries"
msgstr "已分配的分区项"
-#: libfdisk/src/gpt.c:1670
+#: libfdisk/src/gpt.c:1671
msgid "The backup GPT table is corrupt, but the primary appears OK, so that will be used."
msgstr "备份 GPT 表损坏,但主表似乎正常,将使用它。"
-#: libfdisk/src/gpt.c:1680
+#: libfdisk/src/gpt.c:1681
msgid "The primary GPT table is corrupt, but the backup appears OK, so that will be used."
msgstr "主 GPT 表损坏,但备份似乎正常,将使用它。"
-#: libfdisk/src/gpt.c:1696
+#: libfdisk/src/gpt.c:1697
msgid "The backup GPT table is not on the end of the device."
msgstr "备份 GPT 表不在设备的末尾位置。"
-#: libfdisk/src/gpt.c:1699
+#: libfdisk/src/gpt.c:1700
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:1703
+#: libfdisk/src/gpt.c:1704
#, fuzzy
#| msgid "failed to allocate output table"
msgid "Failed to recalculate backup GPT table location"
msgstr "分配输出表失败"
-#: libfdisk/src/gpt.c:1858
+#: libfdisk/src/gpt.c:1859
#, c-format
msgid "unsupported GPT attribute bit '%s'"
msgstr "不支持的 GPT 属性位“%s”"
-#: libfdisk/src/gpt.c:1863
+#: libfdisk/src/gpt.c:1864
#, fuzzy, c-format
#| msgid "failed to parse list '%s'"
msgid "failed to parse GPT attribute string '%s'"
msgstr "解析列表“%s”失败"
-#: libfdisk/src/gpt.c:1963
+#: libfdisk/src/gpt.c:1964
#, c-format
msgid "Partition UUID changed from %s to %s."
msgstr "分区 UUID 已从 %s 更改为 %s。"
-#: libfdisk/src/gpt.c:1972
+#: libfdisk/src/gpt.c:1973
msgid "Failed to translate partition name, name not changed."
msgstr "翻译分区名称失败,名称未改变。"
-#: libfdisk/src/gpt.c:1974
+#: libfdisk/src/gpt.c:1975
#, c-format
msgid "Partition name changed from '%s' to '%.*s'."
msgstr "分区名已由“%s”改为“%.*s”。"
-#: libfdisk/src/gpt.c:2003
+#: libfdisk/src/gpt.c:2004
msgid "The start of the partition understeps FirstUsableLBA."
msgstr "分区起点未到首个可用 LBA。"
-#: libfdisk/src/gpt.c:2010
+#: libfdisk/src/gpt.c:2011
msgid "The end of the partition oversteps LastUsableLBA."
msgstr "分区终点超过了最后可用 LBA。"
-#: libfdisk/src/gpt.c:2203
+#: libfdisk/src/gpt.c:2204
msgid "The device contains hybrid MBR -- writing GPT only."
msgstr "该设备包含混合 MBR -- 将只写入 GPT。"
-#: libfdisk/src/gpt.c:2239
+#: libfdisk/src/gpt.c:2240
msgid "Disk does not contain a valid backup header."
msgstr "磁盘不含有效的备用磁头。"
-#: libfdisk/src/gpt.c:2244
+#: libfdisk/src/gpt.c:2245
msgid "Invalid primary header CRC checksum."
msgstr "无效的主磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:2248
+#: libfdisk/src/gpt.c:2249
msgid "Invalid backup header CRC checksum."
msgstr "无效的备份磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:2253
+#: libfdisk/src/gpt.c:2254
msgid "Invalid partition entry checksum."
msgstr "无效的分区记录校验和。"
-#: libfdisk/src/gpt.c:2258
+#: libfdisk/src/gpt.c:2259
msgid "Invalid primary header LBA sanity checks."
msgstr "无效的主磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:2262
+#: libfdisk/src/gpt.c:2263
msgid "Invalid backup header LBA sanity checks."
msgstr "无效的备用磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:2267
+#: libfdisk/src/gpt.c:2268
msgid "MyLBA mismatch with real position at primary header."
msgstr "MyLBA 不匹配,真正位置在主磁头。"
-#: libfdisk/src/gpt.c:2271
+#: libfdisk/src/gpt.c:2272
msgid "MyLBA mismatch with real position at backup header."
msgstr "MyLBA 不匹配,真正位置在备份磁头。"
-#: libfdisk/src/gpt.c:2276
+#: libfdisk/src/gpt.c:2277
msgid "Disk is too small to hold all data."
msgstr "磁盘太小,放不下所有数据。"
-#: libfdisk/src/gpt.c:2286
+#: libfdisk/src/gpt.c:2287
msgid "Primary and backup header mismatch."
msgstr "主磁头和备份磁头不匹配。"
-#: libfdisk/src/gpt.c:2292
+#: libfdisk/src/gpt.c:2293
#, c-format
msgid "Partition %u overlaps with partition %u."
msgstr "分区 %u 与 %u 重叠。"
-#: libfdisk/src/gpt.c:2299
+#: libfdisk/src/gpt.c:2300
#, c-format
msgid "Partition %u is too big for the disk."
msgstr "分区 %u 对于该磁盘而言过大。"
-#: libfdisk/src/gpt.c:2306
+#: libfdisk/src/gpt.c:2307
#, c-format
msgid "Partition %u ends before it starts."
msgstr "分区 %u 结束于起点之前。"
-#: libfdisk/src/gpt.c:2316
+#: libfdisk/src/gpt.c:2317
#, c-format
msgid "Header version: %s"
msgstr "磁头版本:%s"
-#: libfdisk/src/gpt.c:2317
+#: libfdisk/src/gpt.c:2318
#, 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:2327
+#: libfdisk/src/gpt.c:2328
#, 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:2414
+#: libfdisk/src/gpt.c:2415
msgid "All partitions are already in use."
msgstr "所有分区均已占用。"
-#: libfdisk/src/gpt.c:2465
+#: libfdisk/src/gpt.c:2466
#, fuzzy
#| msgid "No free sectors available."
msgid "No enough free sectors available."
msgstr "无空闲扇区可用。"
-#: libfdisk/src/gpt.c:2479 libfdisk/src/gpt.c:2506
+#: libfdisk/src/gpt.c:2480 libfdisk/src/gpt.c:2507
#, c-format
msgid "Sector %ju already used."
msgstr "扇区 %ju 已使用。"
-#: libfdisk/src/gpt.c:2580
+#: libfdisk/src/gpt.c:2581
#, c-format
msgid "Could not create partition %zu"
msgstr "无法创建分区 %zu"
-#: libfdisk/src/gpt.c:2587
+#: libfdisk/src/gpt.c:2588
#, c-format
msgid "The last usable GPT sector is %ju, but %ju is requested."
msgstr "最后一个可用的 GPT 扇区是 %ju,但请求了 %ju。"
-#: libfdisk/src/gpt.c:2594
+#: libfdisk/src/gpt.c:2595
#, c-format
msgid "The first usable GPT sector is %ju, but %ju is requested."
msgstr "第一个可用的 GPT 扇区是 %ju,但请求了 %ju。"
-#: libfdisk/src/gpt.c:2733
+#: libfdisk/src/gpt.c:2734
#, c-format
msgid "Created a new GPT disklabel (GUID: %s)."
msgstr "已创建新的 GPT 磁盘标签(GUID: %s)。"
-#: libfdisk/src/gpt.c:2736
+#: libfdisk/src/gpt.c:2737
#, fuzzy, c-format
#| msgid "The maximum number of partitions has been created."
msgid "The maximal number of partitions is %zu (default is %zu)."
msgstr "已创建分区达到最大数量。"
-#: libfdisk/src/gpt.c:2758
+#: libfdisk/src/gpt.c:2759
msgid "Enter new disk UUID (in 8-4-4-4-12 format)"
msgstr "输入新磁盘 UUID(以 8-4-4-4-12 格式)"
-#: libfdisk/src/gpt.c:2766
+#: libfdisk/src/gpt.c:2767
msgid "Failed to parse your UUID."
msgstr "解析您的 UUID 失败。"
-#: libfdisk/src/gpt.c:2780
+#: libfdisk/src/gpt.c:2781
#, c-format
msgid "Disk identifier changed from %s to %s."
msgstr "将磁盘标识从 %s 更改为 %s 失败。"
-#: libfdisk/src/gpt.c:2800
+#: libfdisk/src/gpt.c:2801
msgid "Not enough space for new partition table!"
msgstr "创建新分区表的空闲空间不够!"
-#: libfdisk/src/gpt.c:2811
+#: libfdisk/src/gpt.c:2812
#, 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:2816
+#: libfdisk/src/gpt.c:2817
#, 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:2862
+#: libfdisk/src/gpt.c:2863
msgid "The partition entry size is zero."
msgstr "分区条目大小为零。"
-#: libfdisk/src/gpt.c:2864
+#: libfdisk/src/gpt.c:2865
#, c-format
msgid "The number of the partition has to be smaller than %zu."
msgstr "分区数量必须小于 %zu。"
-#: libfdisk/src/gpt.c:2888
+#: libfdisk/src/gpt.c:2889
msgid "Cannot allocate memory!"
msgstr "无法分配内存!"
-#: libfdisk/src/gpt.c:2917
+#: libfdisk/src/gpt.c:2918
#, 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:3027
+#: libfdisk/src/gpt.c:3028
#, c-format
msgid "The attributes on partition %zu changed to 0x%016<PRIx64>."
msgstr "分区 %zu 的属性已改为 0x%016<PRIx64>。"
-#: libfdisk/src/gpt.c:3077
+#: libfdisk/src/gpt.c:3078
msgid "Enter GUID specific bit"
msgstr "输入 GUID 特定位"
-#: libfdisk/src/gpt.c:3092
+#: libfdisk/src/gpt.c:3093
#, c-format
msgid "failed to toggle unsupported bit %lu"
msgstr "开/关不支持的位 %lu 失败"
-#: libfdisk/src/gpt.c:3105
+#: libfdisk/src/gpt.c:3106
#, c-format
msgid "The GUID specific bit %d on partition %zu is enabled now."
msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已启用。"
-#: libfdisk/src/gpt.c:3106
+#: libfdisk/src/gpt.c:3107
#, c-format
msgid "The GUID specific bit %d on partition %zu is disabled now."
msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已禁用。"
-#: libfdisk/src/gpt.c:3110
+#: libfdisk/src/gpt.c:3111
#, c-format
msgid "The %s flag on partition %zu is enabled now."
msgstr "分区 %2$zu 上的标志 %1$s 现已启用。"
-#: libfdisk/src/gpt.c:3111
+#: libfdisk/src/gpt.c:3112
#, c-format
msgid "The %s flag on partition %zu is disabled now."
msgstr "分区 %2$zu 上的标志 %1$s 现已禁用。"
-#: libfdisk/src/gpt.c:3250
+#: libfdisk/src/gpt.c:3251
msgid "Type-UUID"
msgstr "类型-UUID"
-#: libfdisk/src/gpt.c:3251
+#: libfdisk/src/gpt.c:3252
msgid "UUID"
msgstr "UUID"
-#: libfdisk/src/gpt.c:3252 login-utils/chfn.c:151 login-utils/chfn.c:153
+#: libfdisk/src/gpt.c:3253 login-utils/chfn.c:151 login-utils/chfn.c:153
#: login-utils/chfn.c:316
msgid "Name"
msgstr "名称"
@@ -7397,9 +7556,9 @@ msgstr "剩余空间"
msgid "Failed to resize partition #%zu."
msgstr "调整分区 #%zu 的大小失败。"
-#: libfdisk/src/parttype.c:291 misc-utils/findmnt.c:753
+#: libfdisk/src/parttype.c:291 misc-utils/findmnt.c:796
#: misc-utils/uuidparse.c:199 misc-utils/uuidparse.c:217 schedutils/chrt.c:127
-#: schedutils/ionice.c:81 sys-utils/hwclock.c:286
+#: schedutils/ionice.c:81 sys-utils/hwclock.c:293
msgid "unknown"
msgstr "未知"
@@ -7483,160 +7642,160 @@ msgstr "SGI xvm"
msgid "Linux native"
msgstr "Linux native"
-#: libfdisk/src/sgi.c:158
+#: libfdisk/src/sgi.c:160
msgid "SGI info created on second sector."
msgstr "在第二扇区创建了 SGI 信息。"
-#: libfdisk/src/sgi.c:258
+#: libfdisk/src/sgi.c:260
msgid "Detected an SGI disklabel with wrong checksum."
msgstr "检测到校验和错误的 sgi 磁盘标签。"
-#: libfdisk/src/sgi.c:281 libfdisk/src/sun.c:793
+#: libfdisk/src/sgi.c:283 libfdisk/src/sun.c:797
msgid "Physical cylinders"
msgstr "物理柱面数"
-#: libfdisk/src/sgi.c:286 libfdisk/src/sun.c:798
+#: libfdisk/src/sgi.c:288 libfdisk/src/sun.c:802
msgid "Extra sects/cyl"
msgstr "额外扇区/柱面"
-#: libfdisk/src/sgi.c:296
+#: libfdisk/src/sgi.c:298
msgid "Bootfile"
msgstr "启动文件"
-#: libfdisk/src/sgi.c:394
+#: libfdisk/src/sgi.c:396
msgid "Invalid bootfile! The bootfile must be an absolute non-zero pathname, e.g. \"/unix\" or \"/unix.save\"."
msgstr "无效的启动文件!启动文件必须为绝对非零路径名,例如“/unix”或“/unix.save”。"
-#: libfdisk/src/sgi.c:402
+#: libfdisk/src/sgi.c:404
#, c-format
msgid "Name of bootfile is too long: %zu byte maximum."
msgid_plural "Name of bootfile is too long: %zu bytes maximum."
msgstr[0] "启动文件名过长:最多 %zu 个字节。"
-#: libfdisk/src/sgi.c:411
+#: libfdisk/src/sgi.c:413
msgid "Bootfile must have a fully qualified pathname."
msgstr "启动文件必须用完全限定路径名。"
-#: libfdisk/src/sgi.c:417
+#: libfdisk/src/sgi.c:419
msgid "Be aware that the bootfile is not checked for existence. SGI's default is \"/unix\", and for backup \"/unix.save\"."
msgstr "注意,不会检查启动文件是否存在。SGI 默认值为“/unix”,备份为“/unix.save”。"
-#: libfdisk/src/sgi.c:442
+#: libfdisk/src/sgi.c:444
#, c-format
msgid "The current boot file is: %s"
msgstr "当前启动文件为:%s"
-#: libfdisk/src/sgi.c:444
+#: libfdisk/src/sgi.c:446
msgid "Enter of the new boot file"
msgstr "输入新启动文件的路径"
-#: libfdisk/src/sgi.c:449
+#: libfdisk/src/sgi.c:451
msgid "Boot file is unchanged."
msgstr "启动文件未改变。"
-#: libfdisk/src/sgi.c:460
+#: libfdisk/src/sgi.c:462
#, c-format
msgid "Bootfile has been changed to \"%s\"."
msgstr "启动文件已更改为“%s”。"
-#: libfdisk/src/sgi.c:599
+#: libfdisk/src/sgi.c:601
msgid "More than one entire disk entry present."
msgstr "存在超过一个整磁盘记录。"
-#: libfdisk/src/sgi.c:606 libfdisk/src/sun.c:467
+#: libfdisk/src/sgi.c:608 libfdisk/src/sun.c:471
msgid "No partitions defined."
msgstr "未定义分区。"
-#: libfdisk/src/sgi.c:616
+#: libfdisk/src/sgi.c:618
msgid "IRIX likes it when partition 11 covers the entire disk."
msgstr "IRIX 偏向于让分区 11 覆盖整个磁盘。"
-#: libfdisk/src/sgi.c:620
+#: libfdisk/src/sgi.c:622
#, c-format
msgid "The entire disk partition should start at block 0, not at block %d."
msgstr "整磁盘分区应开始于块 0,而非块 %d。"
-#: libfdisk/src/sgi.c:631
+#: libfdisk/src/sgi.c:633
msgid "Partition 11 should cover the entire disk."
msgstr "分区 11 应覆盖整个磁盘。"
-#: libfdisk/src/sgi.c:655
+#: libfdisk/src/sgi.c:657
#, c-format
msgid "Partitions %d and %d overlap by %d sector."
msgid_plural "Partitions %d and %d overlap by %d sectors."
msgstr[0] "分区 %d 与 %d 重叠了 %d 个扇区。"
-#: libfdisk/src/sgi.c:666 libfdisk/src/sgi.c:688
+#: libfdisk/src/sgi.c:668 libfdisk/src/sgi.c:690
#, c-format
msgid "Unused gap of %8u sector: sector %8u"
msgid_plural "Unused gap of %8u sectors: sectors %8u-%u"
msgstr[0] "有未使用的 %8u 个扇区的间隙:扇区 %8u-%u"
-#: libfdisk/src/sgi.c:701
+#: libfdisk/src/sgi.c:703
msgid "The boot partition does not exist."
msgstr "启动分区不存在。"
-#: libfdisk/src/sgi.c:705
+#: libfdisk/src/sgi.c:707
msgid "The swap partition does not exist."
msgstr "交换分区不存在。"
-#: libfdisk/src/sgi.c:709
+#: libfdisk/src/sgi.c:711
msgid "The swap partition has no swap type."
msgstr "交换分区不是交换类型。"
-#: libfdisk/src/sgi.c:712
+#: libfdisk/src/sgi.c:714
msgid "You have chosen an unusual bootfile name."
msgstr "您选择了一个不常用的启动文件名。"
-#: libfdisk/src/sgi.c:762
+#: libfdisk/src/sgi.c:764
msgid "Partition overlap on the disk."
msgstr "磁盘上的分区重叠。"
-#: libfdisk/src/sgi.c:847
+#: libfdisk/src/sgi.c:849
msgid "Attempting to generate entire disk entry automatically."
msgstr "尝试自动生成整磁盘记录。"
-#: libfdisk/src/sgi.c:852
+#: libfdisk/src/sgi.c:854
msgid "The entire disk is already covered with partitions."
msgstr "整个磁盘已经被分区覆盖。"
-#: libfdisk/src/sgi.c:856
+#: libfdisk/src/sgi.c:858
msgid "You got a partition overlap on the disk. Fix it first!"
msgstr "磁盘上有重叠分区。请先修复它!"
-#: libfdisk/src/sgi.c:878 libfdisk/src/sun.c:563
+#: libfdisk/src/sgi.c:880 libfdisk/src/sun.c:567
#, c-format
msgid "First %s"
msgstr "起始 %s"
-#: libfdisk/src/sgi.c:902 libfdisk/src/sgi.c:953
+#: libfdisk/src/sgi.c:904 libfdisk/src/sgi.c:955
msgid "It is highly recommended that the eleventh partition covers the entire disk and is of type 'SGI volume'."
msgstr "强烈建议第十一分区覆盖整个磁盘,并使用“SGI volume”类型。"
-#: libfdisk/src/sgi.c:917
+#: libfdisk/src/sgi.c:919
#, c-format
msgid "Last %s or +%s or +size{K,M,G,T,P}"
msgstr "最后 %s 或+%s 或 +大小{K,M,G,T,P}"
-#: libfdisk/src/sgi.c:989 libfdisk/src/sun.c:248
+#: libfdisk/src/sgi.c:991 libfdisk/src/sun.c:248
#, 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:1056
+#: libfdisk/src/sgi.c:1059
msgid "Created a new SGI disklabel."
msgstr "创建新的SGI 磁盘标签。"
-#: libfdisk/src/sgi.c:1075
+#: libfdisk/src/sgi.c:1078
msgid "Sorry, only for non-empty partitions you can change the tag."
msgstr "抱歉,只有非空分区才能更改标志(tag)。"
-#: libfdisk/src/sgi.c:1081
+#: libfdisk/src/sgi.c:1084
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:1090
+#: libfdisk/src/sgi.c:1093
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)能违反这一规定。您确定要将这一分区标记成其他类型吗?"
@@ -7729,50 +7888,50 @@ msgstr "扇区/磁道"
msgid "Created a new Sun disklabel."
msgstr "创建新的 Sun 磁盘标签。"
-#: libfdisk/src/sun.c:425
+#: libfdisk/src/sun.c:429
#, c-format
msgid "Partition %u doesn't end on cylinder boundary."
msgstr "分区 %u 未结束在柱面边界上。"
-#: libfdisk/src/sun.c:444
+#: libfdisk/src/sun.c:448
#, c-format
msgid "Partition %u overlaps with others in sectors %u-%u."
msgstr "分区 %u 在扇区 %u-%u 与其他分区重叠。"
-#: libfdisk/src/sun.c:472
+#: libfdisk/src/sun.c:476
#, c-format
msgid "Unused gap - sectors 0-%u."
msgstr "未使用的间隙 - 扇区 0-%u。"
-#: libfdisk/src/sun.c:474 libfdisk/src/sun.c:480
+#: libfdisk/src/sun.c:478 libfdisk/src/sun.c:484
#, c-format
msgid "Unused gap - sectors %u-%u."
msgstr "未使用的间隙 - 扇区 %u-%u。"
-#: libfdisk/src/sun.c:542
+#: libfdisk/src/sun.c:546
msgid "Other partitions already cover the whole disk. Delete some/shrink them before retry."
msgstr "其他分区已覆盖了整个磁盘。删除几个分区或压缩它们,然后重试。"
-#: libfdisk/src/sun.c:559
+#: libfdisk/src/sun.c:563
msgid "It is highly recommended that the third partition covers the whole disk and is of type `Whole disk'"
msgstr "强烈建议让第三个分区覆盖整个磁盘,并设为“整盘”类型"
-#: libfdisk/src/sun.c:601
+#: libfdisk/src/sun.c:605
#, c-format
msgid "Aligning the first sector from %u to %u to be on cylinder boundary."
msgstr "将把从 %u 到 %u 的首个扇区对齐到柱面边界。"
-#: libfdisk/src/sun.c:629
+#: libfdisk/src/sun.c:633
#, c-format
msgid "Sector %d is already allocated"
msgstr "扇区 %d 已分配"
-#: libfdisk/src/sun.c:658
+#: libfdisk/src/sun.c:662
#, c-format
msgid "Last %s or +/-%s or +/-size{K,M,G,T,P}"
msgstr "最后 %s 或 +/-%s 或 +/-大小{K,M,G,T,P}"
-#: libfdisk/src/sun.c:706
+#: libfdisk/src/sun.c:710
#, c-format
msgid ""
"You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -7782,44 +7941,44 @@ msgstr ""
"您没有使第三个分区覆盖整个磁盘,但是值 %lu %s 覆盖了其他分区。\n"
"您的记录已经更改为 %lu %s"
-#: libfdisk/src/sun.c:749
+#: libfdisk/src/sun.c:753
#, c-format
msgid "If you want to maintain SunOS/Solaris compatibility, consider leaving this partition as Whole disk (5), starting at 0, with %u sectors"
msgstr "如果您想与 SunOS/Solaris 兼容,请保持此分区为 整盘 (5),以 0 开始,大小为 %u 个扇区"
-#: libfdisk/src/sun.c:773
+#: libfdisk/src/sun.c:777
msgid "Label ID"
msgstr "标签 ID"
-#: libfdisk/src/sun.c:778
+#: libfdisk/src/sun.c:782
msgid "Volume ID"
msgstr "卷 ID"
-#: libfdisk/src/sun.c:788
+#: libfdisk/src/sun.c:792
msgid "Alternate cylinders"
msgstr "备用柱面数"
-#: libfdisk/src/sun.c:894
+#: libfdisk/src/sun.c:898
msgid "Number of alternate cylinders"
msgstr "备用柱面的数量"
-#: libfdisk/src/sun.c:919
+#: libfdisk/src/sun.c:923
msgid "Extra sectors per cylinder"
msgstr "每个柱面的额外扇区数"
-#: libfdisk/src/sun.c:943
+#: libfdisk/src/sun.c:947
msgid "Interleave factor"
msgstr "交错系数"
-#: libfdisk/src/sun.c:967
+#: libfdisk/src/sun.c:971
msgid "Rotation speed (rpm)"
msgstr "转速(转/分)"
-#: libfdisk/src/sun.c:991
+#: libfdisk/src/sun.c:995
msgid "Number of physical cylinders"
msgstr "物理柱面数"
-#: libfdisk/src/sun.c:1056
+#: libfdisk/src/sun.c:1060
msgid ""
"Consider leaving partition 3 as Whole disk (5),\n"
"as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -7827,7 +7986,7 @@ msgstr ""
"考虑保持分区 3 为 整盘 (5),\n"
"这是 SunOS/Solaris 的规定,Linux 也建议这么做。\n"
-#: libfdisk/src/sun.c:1067
+#: libfdisk/src/sun.c:1071
msgid ""
"It is highly recommended that the partition at offset 0\n"
"is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -7858,7 +8017,7 @@ msgstr "无法读取%s:%s"
msgid "hush login status: restore original IDs failed"
msgstr "静默(hush)登录状态:恢复原 ID 失败"
-#: libmount/src/context.c:2729
+#: libmount/src/context.c:2740
#, c-format
msgid "operation failed: %m"
msgstr "操作失败:%m"
@@ -8023,148 +8182,148 @@ msgstr "%s:文件系统已卸载,但 mount(8) 失败"
msgid "filesystem was mounted, but any subsequent operation failed: %m"
msgstr "%s:文件系统已卸载,但 mount(8) 失败"
-#: libmount/src/context_mount.c:1584 login-utils/newgrp.c:228
+#: libmount/src/context_mount.c:1575
+#, fuzzy, c-format
+#| msgid "mount(2) system call failed: %m"
+msgid "%s system call failed: %s"
+msgstr "mount(2) 系统调用失败:%m"
+
+#: libmount/src/context_mount.c:1590 login-utils/newgrp.c:228
#, c-format
msgid "permission denied"
msgstr "权限不足"
-#: libmount/src/context_mount.c:1586 libmount/src/context_mount.c:1629
+#: libmount/src/context_mount.c:1592 libmount/src/context_mount.c:1633
#, c-format
msgid "mount point is not a directory"
msgstr "挂载点不是目录"
-#: libmount/src/context_mount.c:1588
+#: libmount/src/context_mount.c:1594
#, c-format
msgid "must be superuser to use mount"
msgstr "必须以超级用户身份使用 mount"
-#: libmount/src/context_mount.c:1595
+#: libmount/src/context_mount.c:1601
#, c-format
msgid "mount point is busy"
msgstr "挂载点忙"
-#: libmount/src/context_mount.c:1602
+#: libmount/src/context_mount.c:1608
#, c-format
msgid "%s already mounted on %s"
msgstr "%s 已挂载于 %s"
-#: libmount/src/context_mount.c:1606
+#: libmount/src/context_mount.c:1612
#, c-format
msgid "%s already mounted or mount point busy"
msgstr "%s 已经挂载或挂载点忙"
-#: libmount/src/context_mount.c:1611
+#: libmount/src/context_mount.c:1617
#, c-format
msgid "mount point does not exist"
msgstr "挂载点不存在"
-#: libmount/src/context_mount.c:1614
+#: libmount/src/context_mount.c:1620
#, c-format
msgid "mount point is a symbolic link to nowhere"
msgstr "挂载点是一个没有目标的符号链接"
-#: libmount/src/context_mount.c:1619
+#: libmount/src/context_mount.c:1625
#, c-format
msgid "special device %s does not exist"
msgstr "特殊设备 %s 不存在"
-#: libmount/src/context_mount.c:1622 libmount/src/context_mount.c:1638
-#: libmount/src/context_mount.c:1722 libmount/src/context_mount.c:1745
-#, c-format
-msgid "mount(2) system call failed: %m"
-msgstr "mount(2) 系统调用失败:%m"
-
-#: libmount/src/context_mount.c:1634
+#: libmount/src/context_mount.c:1638
#, c-format
msgid "special device %s does not exist (a path prefix is not a directory)"
msgstr "特殊设备 %s 不存在(路径前缀不是目录)"
-#: libmount/src/context_mount.c:1646
+#: libmount/src/context_mount.c:1648
#, c-format
msgid "mount point not mounted or bad option"
msgstr "挂载点未挂载或选项有误"
-#: libmount/src/context_mount.c:1648
+#: libmount/src/context_mount.c:1650
#, c-format
msgid "not mount point or bad option"
msgstr "不是一个挂载点或选项有误"
-#: libmount/src/context_mount.c:1651
+#: libmount/src/context_mount.c:1653
#, c-format
msgid "bad option; moving a mount residing under a shared mount is unsupported"
msgstr "选项错误;不支持移动位于共享挂载内的挂载"
-#: libmount/src/context_mount.c:1655
+#: libmount/src/context_mount.c:1657
#, 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:1659
+#: libmount/src/context_mount.c:1661
#, 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:1666
+#: libmount/src/context_mount.c:1668
#, c-format
msgid "mount table full"
msgstr "挂载表满"
-#: libmount/src/context_mount.c:1671
+#: libmount/src/context_mount.c:1673
#, c-format
msgid "can't read superblock on %s"
msgstr "无法读取 %s 上的超级块"
-#: libmount/src/context_mount.c:1678
+#: libmount/src/context_mount.c:1680
#, c-format
msgid "unknown filesystem type '%s'"
msgstr "未知的文件系统类型“%s”"
-#: libmount/src/context_mount.c:1681
+#: libmount/src/context_mount.c:1683
#, c-format
msgid "unknown filesystem type"
msgstr "未知的文件系统类型"
-#: libmount/src/context_mount.c:1690
+#: libmount/src/context_mount.c:1692
#, c-format
msgid "%s is not a block device, and stat(2) fails?"
msgstr "%s 不是块设备,而且 stat(2) 失败?"
-#: libmount/src/context_mount.c:1693
+#: libmount/src/context_mount.c:1695
#, 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:1696
+#: libmount/src/context_mount.c:1698
#, c-format
msgid "%s is not a block device; try \"-o loop\""
msgstr "%s 不是块设备;请尝试“-o loop”"
-#: libmount/src/context_mount.c:1698
+#: libmount/src/context_mount.c:1700
#, c-format
msgid "%s is not a block device"
msgstr "%s 不是一个块设备"
-#: libmount/src/context_mount.c:1705
+#: libmount/src/context_mount.c:1707
#, c-format
msgid "%s is not a valid block device"
msgstr "%s 不是一个有效的块设备"
-#: libmount/src/context_mount.c:1713
+#: libmount/src/context_mount.c:1715
#, c-format
msgid "cannot mount %s read-only"
msgstr "无法以只读方式挂载 %s"
-#: libmount/src/context_mount.c:1715
+#: libmount/src/context_mount.c:1717
#, c-format
msgid "%s is write-protected but explicit read-write mode requested"
msgstr "%s 是写保护的,但明确请求了读写模式"
-#: libmount/src/context_mount.c:1717
+#: libmount/src/context_mount.c:1719
#, c-format
msgid "cannot remount %s read-write, is write-protected"
msgstr "无法以读写方式重新挂载 %s,它是写保护的"
-#: libmount/src/context_mount.c:1719
+#: libmount/src/context_mount.c:1721
#, c-format
msgid "bind %s failed"
msgstr "绑定 %s 失败"
@@ -8179,6 +8338,12 @@ msgstr "在 %s 上找不到媒体"
msgid "cannot mount; probably corrupted filesystem on %s"
msgstr "无法挂载;%s 上的文件系统可能已损坏"
+#: libmount/src/context_mount.c:1746
+#, fuzzy, c-format
+#| msgid "mount(2) system call failed: %m"
+msgid "%s system call failed: %m"
+msgstr "mount(2) 系统调用失败:%m"
+
#: libmount/src/context_umount.c:1257 libmount/src/context_umount.c:1311
#, c-format
msgid "not mounted"
@@ -8265,13 +8430,13 @@ msgstr "getrandom() 函数"
msgid "libc pseudo-random functions"
msgstr "libc 伪随机函数"
-#: lib/shells.c:36
+#: lib/shells.c:27
#, fuzzy, c-format
#| msgid "cannot open lock file %s"
msgid "Cannot parse shells files: %s"
msgstr "不能打开锁文件 %s"
-#: lib/shells.c:44
+#: lib/shells.c:54 lib/shells.c:97
#, c-format
msgid "Cannot evaluate entries in shells files: %s"
msgstr ""
@@ -8296,15 +8461,21 @@ msgstr "%s:不是有效的交换分区"
msgid "%s: unsupported swap version '%s'"
msgstr "%s:不支持的 swap 版本“%s”"
-#: lib/timeutils.c:507
+#: lib/timeutils.c:540
msgid "format_iso_time: buffer overflow."
msgstr "format_iso_time:缓冲溢出。"
-#: lib/timeutils.c:525 lib/timeutils.c:549
+#: lib/timeutils.c:558 lib/timeutils.c:593
#, c-format
msgid "time %<PRId64> is out of range."
msgstr "时间 %<PRId64> 超出范围。"
+#: lib/timeutils.c:692
+#, fuzzy
+#| msgid "format_iso_time: buffer overflow."
+msgid "format_reltime: buffer overflow."
+msgstr "format_iso_time:缓冲溢出。"
+
#: login-utils/chfn.c:91 login-utils/chsh.c:70 login-utils/lslogins.c:1442
#, c-format
msgid " %s [options] [<username>]\n"
@@ -8335,7 +8506,7 @@ msgstr " -h, --home-phone <电话> 住宅电话\n"
msgid "field %s is too long"
msgstr "字段 %s 过长"
-#: login-utils/chfn.c:122 login-utils/chsh.c:182
+#: login-utils/chfn.c:122 login-utils/chsh.c:170
#, c-format
msgid "%s: has illegal characters"
msgstr "%s:含有非法字符"
@@ -8358,7 +8529,7 @@ msgstr "办公电话"
msgid "Home Phone"
msgstr "住宅电话"
-#: login-utils/chfn.c:189 login-utils/chsh.c:135
+#: login-utils/chfn.c:189 login-utils/chsh.c:123
msgid "cannot handle multiple usernames"
msgstr "无法处理多个用户名"
@@ -8386,17 +8557,17 @@ msgstr "Finger 信息*没有*更改。请稍后重试。\n"
msgid "Finger information changed.\n"
msgstr "Finger 信息已更改。\n"
-#: login-utils/chfn.c:418 login-utils/chsh.c:219 sys-utils/unshare.c:426
+#: login-utils/chfn.c:418 login-utils/chsh.c:207 sys-utils/unshare.c:429
#, c-format
msgid "you (user %d) don't exist."
msgstr "您(用户 %d)不存在。"
-#: login-utils/chfn.c:424 login-utils/chsh.c:224 login-utils/libuser.c:59
+#: login-utils/chfn.c:424 login-utils/chsh.c:212 login-utils/libuser.c:59
#, c-format
msgid "user \"%s\" does not exist."
msgstr "用户“%s”不存在。"
-#: login-utils/chfn.c:430 login-utils/chsh.c:230
+#: login-utils/chfn.c:430 login-utils/chsh.c:218
msgid "can only change local entries"
msgstr "只能更改本地记录"
@@ -8405,11 +8576,11 @@ msgstr "只能更改本地记录"
msgid "%s is not authorized to change the finger info of %s"
msgstr "%s 未得到授权更改 %s 的 finger 信息"
-#: login-utils/chfn.c:441 login-utils/chsh.c:240
+#: login-utils/chfn.c:441 login-utils/chsh.c:228
msgid "Unknown user context"
msgstr "未知用户环境(context)"
-#: login-utils/chfn.c:446 login-utils/chsh.c:245
+#: login-utils/chfn.c:446 login-utils/chsh.c:233
#, c-format
msgid "can't set default context for %s"
msgstr "无法设置 %s 默认环境(context)"
@@ -8440,26 +8611,26 @@ msgstr " -s, --shell <shell> 指定登录 shell\n"
msgid " -l, --list-shells print list of shells and exit\n"
msgstr " -l, --list-shells 打印 shell 列表并退出\n"
-#: login-utils/chsh.c:176
+#: login-utils/chsh.c:164
msgid "shell must be a full path name"
msgstr "shell 必须为完整路径名称"
-#: login-utils/chsh.c:178
+#: login-utils/chsh.c:166
#, c-format
msgid "\"%s\" does not exist"
msgstr "“%s”不存在"
-#: login-utils/chsh.c:180
+#: login-utils/chsh.c:168
#, c-format
msgid "\"%s\" is not executable"
msgstr "“%s”不可执行"
-#: login-utils/chsh.c:186
+#: login-utils/chsh.c:174
#, c-format
msgid "Warning: \"%s\" is not listed in %s."
msgstr "警告:“%s”未在 %s 中列出。"
-#: login-utils/chsh.c:190 login-utils/chsh.c:194
+#: login-utils/chsh.c:178 login-utils/chsh.c:182
#, c-format
msgid ""
"\"%s\" is not listed in %s.\n"
@@ -8468,38 +8639,38 @@ msgstr ""
"“%s”未列在 %s 中。\n"
"请使用 %s -l 查看列表。"
-#: login-utils/chsh.c:239
+#: login-utils/chsh.c:227
#, c-format
msgid "%s is not authorized to change the shell of %s"
msgstr "%s 无权更改 %s 的 shell"
-#: login-utils/chsh.c:264
+#: login-utils/chsh.c:252
msgid "running UID doesn't match UID of user we're altering, shell change denied"
msgstr "运行 UID 与要更改的用户的 UID 不匹配,更改 shell 被拒绝"
-#: login-utils/chsh.c:269
+#: login-utils/chsh.c:257
#, c-format
msgid "your shell is not in %s, shell change denied"
msgstr "您的 shell 不在 %s 中,更改 shell 被拒绝"
-#: login-utils/chsh.c:273
+#: login-utils/chsh.c:261
#, c-format
msgid "Changing shell for %s.\n"
msgstr "正在更改 %s 的 shell。\n"
-#: login-utils/chsh.c:281
+#: login-utils/chsh.c:269
msgid "New shell"
msgstr "新 shell"
-#: login-utils/chsh.c:289
+#: login-utils/chsh.c:277
msgid "Shell not changed."
msgstr "Shell 未更改。"
-#: login-utils/chsh.c:294
+#: login-utils/chsh.c:282
msgid "Shell *NOT* changed. Try again later."
msgstr "Shell *未* 更改。请稍后重试。"
-#: login-utils/chsh.c:298
+#: login-utils/chsh.c:286
msgid ""
"setpwnam failed\n"
"Shell *NOT* changed. Try again later."
@@ -8507,7 +8678,7 @@ msgstr ""
"setpwnam 失败\n"
"Shell *未* 更改。请稍后重试。"
-#: login-utils/chsh.c:302
+#: login-utils/chsh.c:290
#, c-format
msgid "Shell changed.\n"
msgstr "Shell 已更改。\n"
@@ -8517,79 +8688,83 @@ msgstr "Shell 已更改。\n"
msgid "Usage: %s <passwordfile> <username>...\n"
msgstr "用法:%s <密码文件> <用户名>...\n"
-#: login-utils/last.c:175 login-utils/lslogins.c:1433 sys-utils/dmesg.c:1348
+#: login-utils/last.c:177 login-utils/lslogins.c:1433 sys-utils/dmesg.c:1600
#: sys-utils/lsipc.c:283
#, c-format
msgid "unknown time format: %s"
msgstr "未知时间格式: %s"
-#: login-utils/last.c:439 login-utils/last.c:450 login-utils/last.c:901
+#: login-utils/last.c:444 login-utils/last.c:455 login-utils/last.c:911
msgid "preallocation size exceeded"
msgstr "超过了预分配大小"
-#: login-utils/last.c:568
+#: login-utils/last.c:574
#, c-format
msgid " %s [options] [<username>...] [<tty>...]\n"
msgstr " %s [选项] [<用户名>...] [<tty>...]\n"
-#: login-utils/last.c:571
+#: login-utils/last.c:577
msgid "Show a listing of last logged in users.\n"
msgstr "显示上次登录用户的列表。\n"
-#: login-utils/last.c:574
+#: login-utils/last.c:580
msgid " -<number> how many lines to show\n"
msgstr " -<数字> 显示行数\n"
-#: login-utils/last.c:575
+#: login-utils/last.c:581
msgid " -a, --hostlast display hostnames in the last column\n"
msgstr " -a, --hostlast 最后一列显示主机名\n"
-#: login-utils/last.c:576
+#: login-utils/last.c:582
msgid " -d, --dns translate the IP number back into a hostname\n"
msgstr " -d, --dns 将 IP 号转换回主机名\n"
-#: login-utils/last.c:578
+#: login-utils/last.c:584
#, c-format
msgid " -f, --file <file> use a specific file instead of %s\n"
msgstr " -F, --file <文件> 用指定文件代替 %s\n"
-#: login-utils/last.c:579
+#: login-utils/last.c:585
msgid " -F, --fulltimes print full login and logout times and dates\n"
msgstr " -F, --fulltimes 打印完整的登录和注销时间和日期\n"
-#: login-utils/last.c:580
+#: login-utils/last.c:586
msgid " -i, --ip display IP numbers in numbers-and-dots notation\n"
msgstr " -i, --ip 以数字和点的形式显示 IP 号\n"
-#: login-utils/last.c:581
+#: login-utils/last.c:587
msgid " -n, --limit <number> how many lines to show\n"
msgstr " -n, --limit <数字> 要显示的行数\n"
-#: login-utils/last.c:582
+#: login-utils/last.c:588
msgid " -R, --nohostname don't display the hostname field\n"
msgstr " -R, --nohostname 不显示主机名字段\n"
-#: login-utils/last.c:583
+#: login-utils/last.c:589
msgid " -s, --since <time> display the lines since the specified time\n"
msgstr " -s, --since <时间> 显示从指定时间起的行\n"
-#: login-utils/last.c:584
+#: login-utils/last.c:590
msgid " -t, --until <time> display the lines until the specified time\n"
msgstr " -t, --until <时间> 显示到指定时间为止的行\n"
-#: login-utils/last.c:585
+#: login-utils/last.c:591
+msgid " -T, --tab-separated\tuse tabs as delimiters\n"
+msgstr ""
+
+#: login-utils/last.c:592
msgid " -p, --present <time> display who were present at the specified time\n"
msgstr " -p, --present <时间> 显示在指定时间谁在场(present)\n"
-#: login-utils/last.c:586
+#: login-utils/last.c:593
msgid " -w, --fullnames display full user and domain names\n"
msgstr " -w, --fullnames 显示完整的用户名和域名\n"
-#: login-utils/last.c:587
+#: login-utils/last.c:594
msgid " -x, --system display system shutdown entries and run level changes\n"
msgstr " -x, --system 显示系统关机项和运行级别更改\n"
-#: login-utils/last.c:588
+#: login-utils/last.c:595
msgid ""
" --time-format <format> show timestamps in the specified <format>:\n"
" notime|short|full|iso\n"
@@ -8597,7 +8772,7 @@ msgstr ""
" --time-format <格式> 以指定<格式>显示时间戳:\n"
" notime|short|full|iso\n"
-#: login-utils/last.c:902
+#: login-utils/last.c:912
#, fuzzy, c-format
#| msgid ""
#| "\n"
@@ -8609,14 +8784,14 @@ msgstr ""
"\n"
"%s 开始 %s"
-#: login-utils/last.c:1011 term-utils/scriptlive.c:85
+#: login-utils/last.c:1023 term-utils/scriptlive.c:85
#: term-utils/scriptlive.c:89 term-utils/scriptreplay.c:80
-#: term-utils/scriptreplay.c:84 text-utils/more.c:285 text-utils/more.c:291
+#: term-utils/scriptreplay.c:84 text-utils/more.c:286 text-utils/more.c:292
msgid "failed to parse number"
msgstr "解析数字失败"
-#: login-utils/last.c:1032 login-utils/last.c:1037 login-utils/last.c:1042
-#: sys-utils/dmesg.c:1566 sys-utils/dmesg.c:1572 sys-utils/rtcwake.c:511
+#: login-utils/last.c:1044 login-utils/last.c:1049 login-utils/last.c:1054
+#: sys-utils/dmesg.c:1830 sys-utils/dmesg.c:1836 sys-utils/rtcwake.c:520
#, c-format
msgid "invalid time value \"%s\""
msgstr "无效的时间值\"%s\""
@@ -8639,120 +8814,120 @@ msgstr "更改用户属性失败"
msgid "user attribute not changed: %s"
msgstr "用户属性未更改:%s"
-#: login-utils/login.c:413
+#: login-utils/login.c:415
#, c-format
msgid "You have new mail.\n"
msgstr "有您的新邮件。\n"
-#: login-utils/login.c:415
+#: login-utils/login.c:417
#, c-format
msgid "You have mail.\n"
msgstr "有您的邮件。\n"
-#: login-utils/login.c:438
+#: login-utils/login.c:440
#, c-format
msgid "FATAL: can't reopen tty: %m"
msgstr "致命:无法重新打开 tty:%m"
-#: login-utils/login.c:444
+#: login-utils/login.c:446
#, c-format
msgid "FATAL: %s is not a terminal"
msgstr "致命:%s 不是终端"
-#: login-utils/login.c:463
+#: login-utils/login.c:465
#, fuzzy, c-format
#| msgid "chown (%s, %lu, %lu) failed: %m"
msgid "chown (%s, %u, %u) failed: %m"
msgstr "chown (%s, %lu, %lu) 失败:%m"
-#: login-utils/login.c:468
+#: login-utils/login.c:470
#, c-format
msgid "chmod (%s, %u) failed: %m"
msgstr "chmod (%s, %u) 失败:%m"
-#: login-utils/login.c:531
+#: login-utils/login.c:535
msgid "FATAL: bad tty"
msgstr "致命:坏的 tty"
-#: login-utils/login.c:547
+#: login-utils/login.c:550
#, c-format
msgid "TIOCGWINSZ ioctl failed: %m"
msgstr "TIOCGWINSZ ioctl 失败: %m"
-#: login-utils/login.c:555
+#: login-utils/login.c:564
#, c-format
msgid "FATAL: %s: change permissions failed: %m"
msgstr "致命:%s:更改权限失败:%m"
-#: login-utils/login.c:584
+#: login-utils/login.c:595
#, c-format
msgid "TIOCSWINSZ ioctl failed: %m"
msgstr "TIOCSWINSZ ioctl 失败: %m"
-#: login-utils/login.c:690
+#: login-utils/login.c:701
#, c-format
msgid "Last login: %.*s "
msgstr "上次登录:%.*s "
-#: login-utils/login.c:694
+#: login-utils/login.c:705
#, c-format
msgid "from %s\n"
msgstr "来自 %s\n"
-#: login-utils/login.c:697
+#: login-utils/login.c:708
#, c-format
msgid "on %s\n"
msgstr "于 %s\n"
-#: login-utils/login.c:713
+#: login-utils/login.c:724
msgid "write lastlog failed"
msgstr "写 lastlog 失败"
-#: login-utils/login.c:804
+#: login-utils/login.c:815
#, c-format
msgid "DIALUP AT %s BY %s"
msgstr "DIALUP AT %s BY %s"
-#: login-utils/login.c:809
+#: login-utils/login.c:820
#, c-format
msgid "ROOT LOGIN ON %s FROM %s"
msgstr "ROOT LOGIN ON %s FROM %s"
-#: login-utils/login.c:812
+#: login-utils/login.c:823
#, c-format
msgid "ROOT LOGIN ON %s"
msgstr "ROOT LOGIN ON %s"
-#: login-utils/login.c:815
+#: login-utils/login.c:826
#, c-format
msgid "LOGIN ON %s BY %s FROM %s"
msgstr "LOGIN ON %s BY %s FROM %s"
-#: login-utils/login.c:818
+#: login-utils/login.c:829
#, c-format
msgid "LOGIN ON %s BY %s"
msgstr "LOGIN ON %s BY %s"
-#: login-utils/login.c:853
+#: login-utils/login.c:864
msgid "login: "
msgstr "登录:"
-#: login-utils/login.c:889
+#: login-utils/login.c:897
#, c-format
msgid "PAM failure, aborting: %s"
msgstr "PAM 失败,将中止:%s"
-#: login-utils/login.c:890
+#: login-utils/login.c:898
#, c-format
msgid "Couldn't initialize PAM: %s"
msgstr "无法初始化 PAM:%s"
-#: login-utils/login.c:963
+#: login-utils/login.c:971
#, c-format
msgid "FAILED LOGIN %u FROM %s FOR %s, %s"
msgstr "FAILED LOGIN %u FROM %s FOR %s, %s"
-#: login-utils/login.c:973 login-utils/sulogin.c:1101
+#: login-utils/login.c:981 login-utils/sulogin.c:1214
#, c-format
msgid ""
"Login incorrect\n"
@@ -8761,7 +8936,7 @@ msgstr ""
"登录不正确\n"
"\n"
-#: login-utils/login.c:975
+#: login-utils/login.c:983
#, c-format
msgid ""
"Password incorrect\n"
@@ -8770,17 +8945,17 @@ msgstr ""
"密码不正确\n"
"\n"
-#: login-utils/login.c:989
+#: login-utils/login.c:997
#, 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:995
+#: login-utils/login.c:1003
#, c-format
msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-#: login-utils/login.c:1003
+#: login-utils/login.c:1011
#, c-format
msgid ""
"\n"
@@ -8789,7 +8964,7 @@ msgstr ""
"\n"
"登录不正确\n"
-#: login-utils/login.c:1030 login-utils/login.c:1421 login-utils/login.c:1447
+#: login-utils/login.c:1038 login-utils/login.c:1454 login-utils/login.c:1480
msgid ""
"\n"
"Session setup problem, abort."
@@ -8797,92 +8972,98 @@ msgstr ""
"\n"
"会话设置问题,中止。"
-#: login-utils/login.c:1031
+#: login-utils/login.c:1039
msgid "NULL user name. Abort."
msgstr "空(NULL)用户名。中止。"
-#: login-utils/login.c:1169
+#: login-utils/login.c:1177
#, c-format
msgid "TIOCSCTTY failed: %m"
msgstr "TIOCSCTTY 失败:%m"
-#: login-utils/login.c:1271
+#: login-utils/login.c:1279
#, c-format
msgid " %s [-p] [-h <host>] [-H] [[-f] <username>]\n"
msgstr "%s [-p] [-h <主机>] [-H] [[-f] <用户名>]\n"
-#: login-utils/login.c:1273
+#: login-utils/login.c:1281
msgid "Begin a session on the system.\n"
msgstr "在此系统上开始一次会话。\n"
-#: login-utils/login.c:1276
+#: login-utils/login.c:1284
msgid " -p do not destroy the environment"
msgstr " -p 不要清空环境信息"
-#: login-utils/login.c:1277
+#: login-utils/login.c:1285
msgid " -f skip a login authentication"
msgstr " -f 跳过登录认证"
-#: login-utils/login.c:1278
+#: login-utils/login.c:1286
msgid " -h <host> hostname to be used for utmp logging"
msgstr ""
-#: login-utils/login.c:1279
+#: login-utils/login.c:1287
msgid " -H suppress hostname in the login prompt"
msgstr " -H 在登录提示符中不显示主机名"
+#: login-utils/login.c:1305 term-utils/agetty.c:3010
+#, fuzzy
+#| msgid "failed to initialize loopcxt"
+msgid "failed to initialize path context"
+msgstr "初始化 loopcxt 失败"
+
#. TRANSLATORS: The standard value for %u is 60.
-#: login-utils/login.c:1307
+#: login-utils/login.c:1337
#, c-format
msgid "%s: timed out after %u seconds"
msgstr "%s:%u 秒后超时"
-#: login-utils/login.c:1334
+#: login-utils/login.c:1366
#, c-format
msgid "login: -h is for superuser only\n"
msgstr "login:-h 是超级用户专用选项\n"
-#: login-utils/login.c:1422
+#: login-utils/login.c:1455
#, c-format
msgid "Invalid user name \"%s\". Abort."
msgstr "无效的用户名“%s”。中止。"
-#: login-utils/login.c:1446
+#: login-utils/login.c:1479
#, c-format
msgid "groups initialization failed: %m"
msgstr "组初始化失败:%m"
-#: login-utils/login.c:1474
+#: login-utils/login.c:1507
msgid "setgid() failed"
msgstr "setgid() 失败"
-#: login-utils/login.c:1498
+#: login-utils/login.c:1531
msgid "setuid() failed"
msgstr "setuid() 失败"
-#: login-utils/login.c:1504 login-utils/sulogin.c:801
+#: login-utils/login.c:1537 login-utils/sulogin.c:878
#, c-format
msgid "%s: change directory failed"
msgstr "%s:更改目录失败"
-#: login-utils/login.c:1511 login-utils/sulogin.c:802
+#: login-utils/login.c:1544 login-utils/sulogin.c:879
#, c-format
msgid "Logging in with home = \"/\".\n"
msgstr "以 home = “/” 登录。\n"
-#: login-utils/login.c:1542
+#: login-utils/login.c:1576
msgid "couldn't exec shell script"
msgstr "无法执行(exec) shell 脚本"
-#: login-utils/login.c:1544
+#: login-utils/login.c:1578
msgid "no shell"
msgstr "无 shell"
-#: login-utils/lslogins.c:218 sys-utils/lscpu.c:339 sys-utils/lsmem.c:266
+#: login-utils/lslogins.c:218 sys-utils/lscpu.c:331 sys-utils/lsmem.c:259
msgid "no"
msgstr "否"
-#: login-utils/lslogins.c:227 misc-utils/lsblk.c:199
+#: login-utils/lslogins.c:227 misc-utils/lsblk.c:205
msgid "user name"
msgstr "用户名"
@@ -8890,7 +9071,7 @@ msgstr "用户名"
msgid "Username"
msgstr "用户名"
-#: login-utils/lslogins.c:228 sys-utils/renice.c:54
+#: login-utils/lslogins.c:228 sys-utils/renice.c:56
msgid "user ID"
msgstr "用户 ID"
@@ -9094,8 +9275,8 @@ msgstr "用户运行的进程数"
msgid "Running processes"
msgstr "运行中的进程"
-#: 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
+#: login-utils/lslogins.c:303 misc-utils/findmnt.c:152 misc-utils/lsblk.c:267
+#: sys-utils/lsipc.c:205 sys-utils/lsmem.c:138
#, c-format
msgid "too many columns specified, the limit is %zu columns"
msgstr "指定了过多的列,限制是 %zu 列"
@@ -9250,7 +9431,7 @@ msgstr "getline() 失败"
msgid "Password: "
msgstr "密码:"
-#: login-utils/newgrp.c:160 login-utils/sulogin.c:1083
+#: login-utils/newgrp.c:160 login-utils/sulogin.c:1196
msgid "crypt failed"
msgstr "crypt 失败"
@@ -9267,8 +9448,8 @@ msgstr "以新的组登录。\n"
msgid "who are you?"
msgstr "您是哪位?"
-#: login-utils/newgrp.c:218 login-utils/newgrp.c:230 sys-utils/nsenter.c:567
-#: sys-utils/unshare.c:1087
+#: login-utils/newgrp.c:218 login-utils/newgrp.c:230 sys-utils/nsenter.c:682
+#: sys-utils/unshare.c:1185
msgid "setgid failed"
msgstr "setgid 失败"
@@ -9276,17 +9457,18 @@ msgstr "setgid 失败"
msgid "no such group"
msgstr "无此组"
-#: login-utils/newgrp.c:234 sys-utils/nsenter.c:569 sys-utils/unshare.c:1090
+#: login-utils/newgrp.c:234 sys-utils/nsenter.c:684 sys-utils/unshare.c:1188
msgid "setuid failed"
msgstr "setuid 失败"
-#: login-utils/nologin.c:28 misc-utils/lsfd.c:1539 misc-utils/lslocks.c:545
-#: misc-utils/mcookie.c:83 misc-utils/uuidd.c:97 misc-utils/uuidgen.c:26
-#: sys-utils/dmesg.c:282 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
+#: login-utils/nologin.c:28 misc-utils/lastlog2.c:108 misc-utils/lsclocks.c:182
+#: misc-utils/lsfd.c:1893 misc-utils/lslocks.c:810 misc-utils/mcookie.c:87
+#: misc-utils/uuidd.c:97 misc-utils/uuidgen.c:29 sys-utils/dmesg.c:317
+#: sys-utils/ipcmk.c:67 sys-utils/irqtop.c:255 sys-utils/lscpu.c:1171
+#: sys-utils/lsipc.c:292 sys-utils/lsirq.c:50 sys-utils/lsmem.c:512
+#: sys-utils/readprofile.c:95 sys-utils/rtcwake.c:108
#: term-utils/scriptlive.c:57 term-utils/scriptreplay.c:47
-#: term-utils/setterm.c:381 text-utils/line.c:31
+#: term-utils/setterm.c:381 text-utils/line.c:30
#, c-format
msgid " %s [options]\n"
msgstr " %s [选项]\n"
@@ -9304,92 +9486,92 @@ msgstr " -c, --command <命令> 无操作(用于保持与 su -c 的兼容
msgid "This account is currently not available.\n"
msgstr "此帐户目前不可用。\n"
-#: login-utils/su-common.c:233
+#: login-utils/su-common.c:234
msgid " (core dumped)"
msgstr " (核心已转储)"
-#: login-utils/su-common.c:281
+#: login-utils/su-common.c:282
msgid "change owner or mode for pseudo-terminal failed"
msgstr ""
-#: login-utils/su-common.c:377
+#: login-utils/su-common.c:378
msgid "failed to modify environment"
msgstr "修改环境失败"
-#: login-utils/su-common.c:413
+#: login-utils/su-common.c:414
msgid "may not be used by non-root users"
msgstr "非 root 用户不能使用"
-#: login-utils/su-common.c:437
+#: login-utils/su-common.c:438
msgid "authentication failed"
msgstr "验证失败"
-#: login-utils/su-common.c:450
+#: login-utils/su-common.c:451
#, c-format
msgid "cannot open session: %s"
msgstr "无法打开会话:%s"
-#: login-utils/su-common.c:469
+#: login-utils/su-common.c:470
msgid "cannot block signals"
msgstr "无法阻塞信号"
-#: login-utils/su-common.c:486
+#: login-utils/su-common.c:487
msgid "cannot initialize signal mask for session"
msgstr ""
-#: login-utils/su-common.c:494
+#: login-utils/su-common.c:495
#, fuzzy
#| msgid "cannot block signals"
msgid "cannot initialize signal mask"
msgstr "无法阻塞信号"
-#: login-utils/su-common.c:504
+#: login-utils/su-common.c:505
#, fuzzy
#| msgid "cannot set signal handler"
msgid "cannot set signal handler for session"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:512 misc-utils/uuidd.c:439
-#: sys-utils/lscpu-virt.c:489
+#: login-utils/su-common.c:513 misc-utils/uuidd.c:439
+#: sys-utils/lscpu-virt.c:506
msgid "cannot set signal handler"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:520
+#: login-utils/su-common.c:521
#, fuzzy
#| msgid "cannot set signal handler"
msgid "cannot set signal mask"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:547 term-utils/script.c:961
+#: login-utils/su-common.c:548 term-utils/script.c:961
#: term-utils/scriptlive.c:296
msgid "failed to create pseudo-terminal"
msgstr "创建伪终端失败"
-#: login-utils/su-common.c:549 term-utils/script.c:968
+#: login-utils/su-common.c:550 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
+#: login-utils/su-common.c:565
#, fuzzy
#| msgid "cannot set signal handler"
msgid "cannot set child signal handler"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:574 term-utils/script.c:977
+#: login-utils/su-common.c:575 term-utils/script.c:977
#: term-utils/scriptlive.c:305
msgid "cannot create child process"
msgstr "无法创建子进程"
-#: login-utils/su-common.c:593 sys-utils/nsenter.c:510
+#: login-utils/su-common.c:594 sys-utils/nsenter.c:621
#: sys-utils/switch_root.c:189
#, c-format
msgid "cannot change directory to %s"
msgstr "无法更改到 %s 目录"
-#: login-utils/su-common.c:619 term-utils/scriptlive.c:354
+#: login-utils/su-common.c:620 term-utils/scriptlive.c:354
#, c-format
msgid ""
"\n"
@@ -9398,48 +9580,48 @@ msgstr ""
"\n"
"会话已终止,正在杀死 shell..."
-#: login-utils/su-common.c:630
+#: login-utils/su-common.c:631
#, c-format
msgid " ...killed.\n"
msgstr " ...已杀死。\n"
-#: login-utils/su-common.c:727
+#: login-utils/su-common.c:728
msgid "failed to set the PATH environment variable"
msgstr "设置 PATH 环境变量失败"
-#: login-utils/su-common.c:804
+#: login-utils/su-common.c:805
msgid "cannot set groups"
msgstr "无法设置 组"
-#: login-utils/su-common.c:810
+#: login-utils/su-common.c:811
#, fuzzy, c-format
#| msgid "failed to parse level '%s'"
msgid "failed to establish user credentials: %s"
msgstr "解析级别“%s”失败"
-#: login-utils/su-common.c:820
+#: login-utils/su-common.c:821
msgid "cannot set group id"
msgstr "无法设置 组 id"
-#: login-utils/su-common.c:822
+#: login-utils/su-common.c:823
msgid "cannot set user id"
msgstr "无法设置 用户 id"
-#: login-utils/su-common.c:886
+#: login-utils/su-common.c:889
msgid " -m, -p, --preserve-environment do not reset environment variables\n"
msgstr " -m, -p, --preserve-environment 不重置环境变量\n"
-#: login-utils/su-common.c:887
+#: login-utils/su-common.c:890
#, 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:890
+#: login-utils/su-common.c:893
msgid " -g, --group <group> specify the primary group\n"
msgstr " -g, --group <组> 指定主组\n"
-#: login-utils/su-common.c:891
+#: login-utils/su-common.c:894
#, fuzzy
#| msgid ""
#| " -G, --supp-group <group> specify a supplemental group\n"
@@ -9449,15 +9631,15 @@ msgstr ""
" -G, --supp-group <组> 指定一个辅助组\n"
"\n"
-#: login-utils/su-common.c:894
+#: login-utils/su-common.c:897
msgid " -, -l, --login make the shell a login shell\n"
msgstr " -, -l, --login 使 shell 成为登录 shell\n"
-#: login-utils/su-common.c:895
+#: login-utils/su-common.c:898
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:896
+#: login-utils/su-common.c:899
msgid ""
" --session-command <command> pass a single command to the shell with -c\n"
" and do not create a new session\n"
@@ -9465,19 +9647,25 @@ msgstr ""
" --session-command <命令> 使用 -c 向 shell 传递一条命令\n"
" 而不创建新会话\n"
-#: login-utils/su-common.c:898
+#: login-utils/su-common.c:901
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:899
+#: login-utils/su-common.c:902
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:900
+#: login-utils/su-common.c:903
msgid " -P, --pty create a new pseudo-terminal\n"
msgstr ""
-#: login-utils/su-common.c:910
+#: login-utils/su-common.c:904
+#, fuzzy
+#| msgid " -t, --table create a table\n"
+msgid " -T, --no-pty do not create a new pseudo-terminal (bad security!)\n"
+msgstr " -t, --table 创建表格\n"
+
+#: login-utils/su-common.c:914
#, fuzzy, c-format
#| msgid ""
#| " %1$s [options] <dev> [[-N] <part>]\n"
@@ -9489,7 +9677,7 @@ msgstr ""
" %1$s [选项] <设备> [[-N] <分区>]\n"
" %1$s [选项] <命令>\n"
-#: login-utils/su-common.c:915
+#: login-utils/su-common.c:919
#, fuzzy
#| msgid ""
#| "\n"
@@ -9506,16 +9694,16 @@ msgstr ""
"将退而使用与 su(1) 兼容的语法并执行标准 shell。\n"
"选项 -c、-f、-l 及 -s 与 -u 相互排斥。\n"
-#: login-utils/su-common.c:920
+#: login-utils/su-common.c:924
msgid " -u, --user <user> username\n"
msgstr " -u, --user <用户> 用户名\n"
-#: login-utils/su-common.c:931
+#: login-utils/su-common.c:935
#, c-format
msgid " %s [options] [-] [<user> [<argument>...]]\n"
msgstr " %s [选项] [-] [<用户> [<参数>...]]\n"
-#: login-utils/su-common.c:935
+#: login-utils/su-common.c:939
#, fuzzy
#| msgid ""
#| "\n"
@@ -9529,81 +9717,111 @@ msgstr ""
"将有效用户 id 和组 id 更改为<用户>的 id。\n"
"单个 - 视为 -l。如果未指定<用户>,将假定为 root。\n"
-#: login-utils/su-common.c:1012
+#: login-utils/su-common.c:1016
#, 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:1018
+#: login-utils/su-common.c:1022
#, c-format
msgid "group %s does not exist"
msgstr "组 %s 不存在"
-#: login-utils/su-common.c:1127
+#: login-utils/su-common.c:1132
msgid "--pty is not supported for your system"
msgstr "--pty 在您的系统上不受支持"
-#: login-utils/su-common.c:1161
+#: login-utils/su-common.c:1170
msgid "ignoring --preserve-environment, it's mutually exclusive with --login"
msgstr "将忽略 --preserve-environment,它与 --login 互斥。"
-#: login-utils/su-common.c:1175
+#: login-utils/su-common.c:1184
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:1178
+#: login-utils/su-common.c:1187
msgid "no command was specified"
msgstr "没有指定命令"
-#: login-utils/su-common.c:1190
+#: login-utils/su-common.c:1199
msgid "only root can specify alternative groups"
msgstr "只有 root 用户能指定替代组"
-#: login-utils/su-common.c:1201
+#: login-utils/su-common.c:1210
#, 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:1236
+#: login-utils/su-common.c:1245
#, c-format
msgid "using restricted shell %s"
msgstr "将使用受限 shell %s"
-#: login-utils/su-common.c:1257
+#: login-utils/su-common.c:1266
msgid "failed to allocate pty handler"
msgstr ""
-#: login-utils/su-common.c:1283
+#: login-utils/su-common.c:1292
#, c-format
msgid "warning: cannot change directory to %s"
msgstr "警告:无法更改到 %s 目录"
-#: login-utils/sulogin.c:173 login-utils/sulogin.c:176
+#: login-utils/sulogin.c:131
+#, fuzzy
+#| msgid "failed to execute %s"
+msgid "failed to compute seuser"
+msgstr "执行 %s 失败"
+
+#: login-utils/sulogin.c:136
+#, fuzzy
+#| msgid "couldn't compute selinux context"
+msgid "failed to compute default context"
+msgstr "无法计算 selinux 环境(context)"
+
+#: login-utils/sulogin.c:156
+#, fuzzy, c-format
+#| msgid "failed to set the controlling terminal"
+msgid "failed to get context of terminal %s"
+msgstr "设置控制终端失败"
+
+#: login-utils/sulogin.c:162
+#, fuzzy
+#| msgid "This account is currently not available.\n"
+msgid "security class chr_file not available"
+msgstr "此帐户目前不可用。\n"
+
+#: login-utils/sulogin.c:169
+#, fuzzy
+#| msgid "failed to create pseudo-terminal"
+msgid "failed to compute relabel context of terminal"
+msgstr "创建伪终端失败"
+
+#: login-utils/sulogin.c:252 login-utils/sulogin.c:255
#, c-format
msgid "tcgetattr failed"
msgstr "tcgetattr 失败"
-#: login-utils/sulogin.c:259
+#: login-utils/sulogin.c:338
msgid "tcsetattr failed"
msgstr "tcsetattr 失败"
-#: login-utils/sulogin.c:523
+#: login-utils/sulogin.c:600
#, c-format
msgid "%s: no entry for root\n"
msgstr "%s:无 root 的记录\n"
-#: login-utils/sulogin.c:550
+#: login-utils/sulogin.c:627
#, c-format
msgid "%s: no entry for root"
msgstr "%s:无 root 的记录"
-#: login-utils/sulogin.c:555
+#: login-utils/sulogin.c:632
#, c-format
msgid "%s: root password garbled"
msgstr "%s:root 密码有误"
-#: login-utils/sulogin.c:584
+#: login-utils/sulogin.c:661
#, c-format
msgid ""
"\n"
@@ -9618,49 +9836,63 @@ msgstr ""
"\n"
"按 Enter 继续。\n"
-#: login-utils/sulogin.c:590
+#: login-utils/sulogin.c:667
#, c-format
msgid "Give root password for login: "
msgstr "指定 root 的登录密码:"
-#: login-utils/sulogin.c:592
+#: login-utils/sulogin.c:669
#, c-format
msgid "Press Enter for login: "
msgstr "按 Enter 键登录:"
-#: login-utils/sulogin.c:595
+#: login-utils/sulogin.c:672
#, c-format
msgid "Give root password for maintenance\n"
msgstr "指定 root 的维护密码\n"
-#: login-utils/sulogin.c:597
+#: login-utils/sulogin.c:674
#, c-format
msgid "Press Enter for maintenance\n"
msgstr "按 Enter 键进行维护\n"
-#: login-utils/sulogin.c:598
+#: login-utils/sulogin.c:675
#, c-format
msgid "(or press Control-D to continue): "
msgstr "(或按 Control-D 键继续):"
-#: login-utils/sulogin.c:805
+#: login-utils/sulogin.c:882
msgid "change directory to system root failed"
msgstr "更改到系统根目录失败"
-#: login-utils/sulogin.c:855
-msgid "setexeccon failed"
-msgstr "setexeccon 失败"
+#: login-utils/sulogin.c:927
+#, fuzzy, c-format
+#| msgid "failed to connect to %s port %s"
+msgid "failed to set context to %s for terminal %s"
+msgstr "连接 %s 端口 %s 失败"
+
+#: login-utils/sulogin.c:932
+#, fuzzy, c-format
+#| msgid "failed to set exec context to '%s'"
+msgid "failed to set exec context to %s"
+msgstr "向“%s”设置 exec 环境失败"
+
+#: login-utils/sulogin.c:963
+#, fuzzy, c-format
+#| msgid "failed to connect to %s port %s"
+msgid "failed to reset context to %s for terminal %s"
+msgstr "连接 %s 端口 %s 失败"
-#: login-utils/sulogin.c:876
+#: login-utils/sulogin.c:976
#, c-format
msgid " %s [options] [tty device]\n"
msgstr " %s [选项] [tty 设备]\n"
-#: login-utils/sulogin.c:879
+#: login-utils/sulogin.c:979
msgid "Single-user login.\n"
msgstr "单用户登录。\n"
-#: login-utils/sulogin.c:882
+#: login-utils/sulogin.c:982
msgid ""
" -p, --login-shell start a login shell\n"
" -t, --timeout <seconds> max time to wait for a password (default: no limit)\n"
@@ -9670,24 +9902,24 @@ msgstr ""
" -t, --timeout <秒数> 等待密码的最大时间(默认:无限制)\n"
" -e, --force 如果 getpwnam(3) 失败,直接检查密码文件\n"
-#: 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
+#: login-utils/sulogin.c:1038 misc-utils/findmnt.c:1736 sys-utils/wdctl.c:792
+#: term-utils/agetty.c:852 term-utils/wall.c:224
msgid "invalid timeout argument"
msgstr "无效的 timeout 超时参数"
-#: login-utils/sulogin.c:965
+#: login-utils/sulogin.c:1065
msgid "only superuser can run this program"
msgstr "只有超级用户能运行此程序"
-#: login-utils/sulogin.c:1008
+#: login-utils/sulogin.c:1108
msgid "cannot open console"
msgstr "打不开终端"
-#: login-utils/sulogin.c:1015
+#: login-utils/sulogin.c:1115
msgid "cannot open password database"
msgstr "无法打开密码数据库"
-#: login-utils/sulogin.c:1098
+#: login-utils/sulogin.c:1211
#, c-format
msgid ""
"cannot execute su shell\n"
@@ -9696,7 +9928,7 @@ msgstr ""
"无法执行 su shell\n"
"\n"
-#: login-utils/sulogin.c:1105
+#: login-utils/sulogin.c:1218
msgid ""
"Timed out\n"
"\n"
@@ -9704,7 +9936,7 @@ msgstr ""
"超时\n"
"\n"
-#: login-utils/sulogin.c:1137
+#: login-utils/sulogin.c:1250
msgid ""
"cannot wait on su shell\n"
"\n"
@@ -10006,7 +10238,7 @@ msgstr ""
msgid "unsupported output format %s"
msgstr "不支持的输出格式:%s"
-#: misc-utils/blkid.c:786 misc-utils/fadvise.c:119 misc-utils/wipefs.c:734
+#: misc-utils/blkid.c:786 misc-utils/fadvise.c:119 misc-utils/wipefs.c:738
msgid "invalid offset argument"
msgstr "无效的 偏移 参数"
@@ -10193,6 +10425,90 @@ msgstr " -o, --output <列表> 定义使用哪个输出列\n"
msgid " --color[=<when>] colorize messages (%s, %s or %s)\n"
msgstr " --color[=<时机>] 消息彩色显示(auto, always 或 never)\n"
+#: misc-utils/enosys.c:85
+#, fuzzy, c-format
+#| msgid " %s [options] -u <user> <command>\n"
+msgid " %s [options] -- <command>\n"
+msgstr " %s [选项] -u <用户> <命令>\n"
+
+#: misc-utils/enosys.c:88
+#, fuzzy
+#| msgid " -a, --all print all devices\n"
+msgid " -s, --syscall syscall to block\n"
+msgstr " -a, --all 打印所有设备\n"
+
+#: misc-utils/enosys.c:89
+#, fuzzy
+#| msgid " -u, --unlock remove a lock\n"
+msgid " -i, --ioctl ioctl to block\n"
+msgstr " -u, --unlock 移除锁\n"
+
+#: misc-utils/enosys.c:90
+#, fuzzy
+#| msgid " -l, --list use list format output\n"
+msgid " -l, --list list known syscalls\n"
+msgstr " -l, --list 使用列表格式的输出\n"
+
+#: misc-utils/enosys.c:146
+#, fuzzy
+#| msgid "unknown user %s"
+msgid "Unknown syscall"
+msgstr "未知用户 %s"
+
+#: misc-utils/enosys.c:166
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown ioctl"
+msgstr "未知"
+
+#: misc-utils/enosys.c:198
+#, fuzzy
+#| msgid "number too big"
+msgid "filter too big"
+msgstr "数字过大"
+
+#: misc-utils/enosys.c:256
+msgid "Seccomp non-functional"
+msgstr ""
+
+#: misc-utils/enosys.c:259
+msgid "Could not run prctl(PR_SET_NO_NEW_PRIVS)"
+msgstr ""
+
+#: misc-utils/enosys.c:262
+#, fuzzy
+#| msgid "cannot set timerfd"
+msgid "Could not seccomp filter"
+msgstr "无法设置 timerfd"
+
+#: misc-utils/enosys.c:265
+#, fuzzy
+#| msgid "cannot set timerfd"
+msgid "Could not exec"
+msgstr "无法设置 timerfd"
+
+#: misc-utils/exch.c:42
+#, fuzzy, c-format
+#| msgid " %s [options] pathname [pathname ...]\n"
+msgid " %s [options] oldpath newpath\n"
+msgstr " %s [选项] 路径名 [路径名 ...]\n"
+
+#: misc-utils/exch.c:44
+msgid "Atomically exchanges paths between two files.\n"
+msgstr ""
+
+#: misc-utils/exch.c:81
+#, fuzzy
+#| msgid "too many arguments"
+msgid "too few arguments"
+msgstr "参数过多"
+
+#: misc-utils/exch.c:91
+#, fuzzy, c-format
+#| msgid "failed to change directory to %s"
+msgid "failed to exchange \"%s\" and \"%s\""
+msgstr "将目录更改到 %s 失败"
+
#: misc-utils/fadvise.c:49
#, c-format
msgid " %s [options] file\n"
@@ -10238,7 +10554,7 @@ msgstr ""
msgid "invalid fd argument"
msgstr "无效的 速度 参数"
-#: misc-utils/fadvise.c:131 misc-utils/fincore.c:339 sys-utils/losetup.c:846
+#: misc-utils/fadvise.c:131 misc-utils/fincore.c:482 sys-utils/losetup.c:917
msgid "no file specified"
msgstr "未指定文件"
@@ -10260,73 +10576,135 @@ msgstr "错误的文件描述符"
msgid "failed to advise: %s"
msgstr "读取管道失败"
-#: misc-utils/fincore.c:61
+#: misc-utils/fincore.c:98
#, fuzzy
#| msgid "Shared memory pages"
msgid "file data resident in memory in pages"
msgstr "共享内存页"
-#: misc-utils/fincore.c:62
+#: misc-utils/fincore.c:99
msgid "file data resident in memory in bytes"
msgstr ""
-#: misc-utils/fincore.c:63
+#: misc-utils/fincore.c:100
msgid "size of the file"
msgstr "文件大小"
-#: misc-utils/fincore.c:64
+#: misc-utils/fincore.c:101
msgid "file name"
msgstr "文件名称"
-#: misc-utils/fincore.c:174
+#: misc-utils/fincore.c:102
+#, fuzzy
+#| msgid "number of sectors"
+msgid "number of dirty pages"
+msgstr "扇区数"
+
+#: misc-utils/fincore.c:103
+#, fuzzy
+#| msgid "number of sectors"
+msgid "number of dirty bytes"
+msgstr "扇区数"
+
+#: misc-utils/fincore.c:104
+msgid "number of pages marked for writeback"
+msgstr ""
+
+#: misc-utils/fincore.c:105
+msgid "number of bytes marked for writeback"
+msgstr ""
+
+#: misc-utils/fincore.c:106
+#, fuzzy
+#| msgid "number of sectors"
+msgid "number of evicted pages"
+msgstr "扇区数"
+
+#: misc-utils/fincore.c:107
+#, fuzzy
+#| msgid "number of sectors"
+msgid "number of evicted bytes"
+msgstr "扇区数"
+
+#: misc-utils/fincore.c:108
+#, fuzzy
+#| msgid "number of days required between changes"
+msgid "number of recently evicted pages"
+msgstr "更改密码的限期(天)"
+
+#: misc-utils/fincore.c:109
+#, fuzzy
+#| msgid "number of objects migrated by compaction"
+msgid "number of recently evicted bytes"
+msgstr "通过压实迁移的对象数"
+
+#: misc-utils/fincore.c:280
#, fuzzy, c-format
#| msgid "failed to read symlink: %s"
msgid "failed to do mincore: %s"
msgstr "读符号链接失败:%s"
-#: misc-utils/fincore.c:211
+#: misc-utils/fincore.c:315
#, c-format
msgid "failed to do mmap: %s"
msgstr "进行 mmap 失败:%s"
-#: misc-utils/fincore.c:237
+#: misc-utils/fincore.c:346
+#, fuzzy, c-format
+#| msgid "failed to do fstat: %s"
+msgid "failed to do cachestat: %s"
+msgstr "进行 fstat 失败:%s"
+
+#: misc-utils/fincore.c:362
#, c-format
msgid "failed to open: %s"
msgstr "打开失败:%s"
-#: misc-utils/fincore.c:242
+#: misc-utils/fincore.c:367
#, c-format
msgid "failed to do fstat: %s"
msgstr "进行 fstat 失败:%s"
-#: misc-utils/fincore.c:263
+#: misc-utils/fincore.c:376
+#, fuzzy, c-format
+#| msgid "failed to read pipe"
+msgid "failed ioctl to get size: %s"
+msgstr "读取管道失败"
+
+#: misc-utils/fincore.c:397
#, c-format
msgid " %s [options] file...\n"
msgstr " %s [选项] 文件...\n"
-#: misc-utils/fincore.c:266
+#: misc-utils/fincore.c:400
msgid " -J, --json use JSON output format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: misc-utils/fincore.c:267
+#: misc-utils/fincore.c:401
#, 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:268
+#: misc-utils/fincore.c:402
#, 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:269
+#: misc-utils/fincore.c:403
#, fuzzy
#| msgid " -o, --output <list> output columns\n"
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: misc-utils/fincore.c:270
+#: misc-utils/fincore.c:404
+#, fuzzy
+#| msgid " --output-all output all columns\n"
+msgid " --output-all output all columns\n"
+msgstr " --output-all 输出所有列\n"
+
+#: misc-utils/fincore.c:405
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原始输出格式\n"
@@ -10344,163 +10722,185 @@ msgstr "按标签或 UUID 查找文件系统。\n"
msgid "unable to resolve '%s'"
msgstr "不能解析“%s”"
-#: misc-utils/findmnt.c:103
+#: misc-utils/findmnt.c:109
msgid "action detected by --poll"
msgstr "--poll 检测到的操作"
-#: misc-utils/findmnt.c:104 misc-utils/lsblk.c:179
-msgid "filesystem size available"
-msgstr "文件系统可用大小"
+#: misc-utils/findmnt.c:110
+msgid "filesystem size available, use <number> if --bytes is given"
+msgstr ""
-#: misc-utils/findmnt.c:105
+#: misc-utils/findmnt.c:111
msgid "dump(8) period in days [fstab only]"
msgstr "dump(8) 周期(天数) [仅 fstab]"
-#: misc-utils/findmnt.c:106
+#: misc-utils/findmnt.c:112
msgid "filesystem root"
msgstr "文件系统 root"
-#: misc-utils/findmnt.c:107 misc-utils/lsblk.c:182
+#: misc-utils/findmnt.c:113 misc-utils/lsblk.c:186
msgid "filesystem type"
msgstr "文件系统类型"
-#: misc-utils/findmnt.c:108
+#: misc-utils/findmnt.c:114
msgid "FS specific mount options"
msgstr "FS 的特定挂载选项"
-#: misc-utils/findmnt.c:109
+#: misc-utils/findmnt.c:115
msgid "mount ID"
msgstr "挂载 ID"
-#: misc-utils/findmnt.c:110
+#: misc-utils/findmnt.c:116
+#, fuzzy
+#| msgid "Number of alternate cylinders"
+msgid "number of available inodes"
+msgstr "备用柱面的数量"
+
+#: misc-utils/findmnt.c:117
+#, fuzzy
+#| msgid "invalid number of inodes"
+msgid "total number of inodes"
+msgstr "无效的 inodes 数目"
+
+#: misc-utils/findmnt.c:118
+#, fuzzy
+#| msgid "number of sectors"
+msgid "number of used inodes"
+msgstr "扇区数"
+
+#: misc-utils/findmnt.c:119
+msgid "percentage of INO.USED divided by INO.TOTAL"
+msgstr ""
+
+#: misc-utils/findmnt.c:120
msgid "filesystem label"
msgstr "文件系统标签"
-#: misc-utils/findmnt.c:111 misc-utils/lsblk.c:192 misc-utils/lslocks.c:80
+#: misc-utils/findmnt.c:121 misc-utils/lsblk.c:196 misc-utils/lslocks.c:85
msgid "major:minor device number"
msgstr "主:次 设备号"
-#: misc-utils/findmnt.c:112
+#: misc-utils/findmnt.c:122
msgid "old mount options saved by --poll"
msgstr "--poll 保存的旧挂载选项"
-#: misc-utils/findmnt.c:113
+#: misc-utils/findmnt.c:123
msgid "old mountpoint saved by --poll"
msgstr "--poll 保存的旧挂载点"
-#: misc-utils/findmnt.c:114
+#: misc-utils/findmnt.c:124
msgid "all mount options"
msgstr "全部挂臷选项"
-#: misc-utils/findmnt.c:115
+#: misc-utils/findmnt.c:125
msgid "optional mount fields"
msgstr "可选的挂载字段"
-#: misc-utils/findmnt.c:116
+#: misc-utils/findmnt.c:126
#, fuzzy
#| msgid "mount ID"
msgid "mount parent ID"
msgstr "挂载 ID"
-#: misc-utils/findmnt.c:117
+#: misc-utils/findmnt.c:127
msgid "partition label"
msgstr "分区标签"
-#: misc-utils/findmnt.c:119
+#: misc-utils/findmnt.c:129
msgid "pass number on parallel fsck(8) [fstab only]"
msgstr "并行 fsck(8) 的遍数(pass number) [仅 fstab]"
-#: misc-utils/findmnt.c:120
+#: misc-utils/findmnt.c:130
msgid "VFS propagation flags"
msgstr "VFS 传播标志"
-#: misc-utils/findmnt.c:121 misc-utils/lsblk.c:181
-msgid "filesystem size"
-msgstr "文件系统大小"
+#: misc-utils/findmnt.c:131 misc-utils/lsblk.c:185
+msgid "filesystem size, use <number> if --bytes is given"
+msgstr ""
-#: misc-utils/findmnt.c:122
+#: misc-utils/findmnt.c:132
#, fuzzy
#| msgid "source device"
msgid "all possible source devices"
msgstr "源设备"
-#: misc-utils/findmnt.c:123
+#: misc-utils/findmnt.c:133
msgid "source device"
msgstr "源设备"
-#: misc-utils/findmnt.c:124
+#: misc-utils/findmnt.c:134
msgid "mountpoint"
msgstr "挂载点"
-#: misc-utils/findmnt.c:125
+#: misc-utils/findmnt.c:135
msgid "task ID"
msgstr "任务 ID"
-#: misc-utils/findmnt.c:126 misc-utils/lsblk.c:183
-msgid "filesystem size used"
-msgstr "文件系统已用大小"
+#: misc-utils/findmnt.c:136 misc-utils/lsblk.c:187
+msgid "filesystem size used, use <number> if --bytes is given"
+msgstr ""
-#: misc-utils/findmnt.c:127 misc-utils/lsblk.c:184
+#: misc-utils/findmnt.c:137 misc-utils/lsblk.c:188
msgid "filesystem use percentage"
msgstr "文件系统使用百分比"
-#: misc-utils/findmnt.c:128 misc-utils/lsblk.c:228
+#: misc-utils/findmnt.c:138 misc-utils/lsblk.c:234
msgid "filesystem UUID"
msgstr "文件系统 UUID"
-#: misc-utils/findmnt.c:129
+#: misc-utils/findmnt.c:139
msgid "VFS specific mount options"
msgstr "VFS 的特定挂载选项"
-#: misc-utils/findmnt.c:340
+#: misc-utils/findmnt.c:350
#, c-format
msgid "unknown action: %s"
msgstr "未知操作: %s"
-#: misc-utils/findmnt.c:741
+#: misc-utils/findmnt.c:784
msgid "mount"
msgstr "挂载"
-#: misc-utils/findmnt.c:744
+#: misc-utils/findmnt.c:787
msgid "umount"
msgstr "卸载"
-#: misc-utils/findmnt.c:747
+#: misc-utils/findmnt.c:790
msgid "remount"
msgstr "重新挂载"
-#: misc-utils/findmnt.c:750
+#: misc-utils/findmnt.c:793
msgid "move"
msgstr "移动"
-#: misc-utils/findmnt.c:927 misc-utils/findmnt.c:1205 sys-utils/eject.c:715
-#: sys-utils/mount.c:408
+#: misc-utils/findmnt.c:991 misc-utils/findmnt.c:1269 sys-utils/eject.c:715
+#: sys-utils/mount.c:400
msgid "failed to initialize libmount table"
msgstr "初始化 libmount table 失败"
-#: misc-utils/findmnt.c:954 text-utils/hexdump-parse.c:84
+#: misc-utils/findmnt.c:1018 text-utils/hexdump-parse.c:84
#, c-format
msgid "can't read %s"
msgstr "不能读 %s"
-#: misc-utils/findmnt.c:1145 misc-utils/findmnt.c:1211
+#: misc-utils/findmnt.c:1209 misc-utils/findmnt.c:1275
#: 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/fstrim.c:329 sys-utils/mount.c:126 sys-utils/mount.c:174
+#: sys-utils/mount.c:241 sys-utils/swapoff.c:76 sys-utils/swapoff.c:186
+#: sys-utils/swapon.c:260 sys-utils/swapon.c:303 sys-utils/swapon.c:763
#: sys-utils/umount.c:199
msgid "failed to initialize libmount iterator"
msgstr "无法初始化 libmount 迭代器"
-#: misc-utils/findmnt.c:1217
+#: misc-utils/findmnt.c:1281
msgid "failed to initialize libmount tabdiff"
msgstr "初始化 libmount tabdiff 失败"
-#: misc-utils/findmnt.c:1245 misc-utils/kill.c:416
+#: misc-utils/findmnt.c:1309 misc-utils/kill.c:416
msgid "poll() failed"
msgstr "poll() 失败"
-#: misc-utils/findmnt.c:1320
+#: misc-utils/findmnt.c:1408
#, c-format
msgid ""
" %1$s [options]\n"
@@ -10513,15 +10913,15 @@ msgstr ""
" %1$s [选项] <设备> <挂臷点>\n"
" %1$s [选项] [--source <设备>] [--target <挂臷点>]\n"
-#: misc-utils/findmnt.c:1327
+#: misc-utils/findmnt.c:1415
msgid "Find a (mounted) filesystem.\n"
msgstr "查找(挂载的)文件系统。\n"
-#: misc-utils/findmnt.c:1330
+#: misc-utils/findmnt.c:1418
msgid " -s, --fstab search in static table of filesystems\n"
msgstr " -s, --fstab 在文件系统表态表中搜索\n"
-#: misc-utils/findmnt.c:1331
+#: misc-utils/findmnt.c:1419
#, fuzzy
#| msgid ""
#| " -k, --kernel search in kernel table of mounted\n"
@@ -10533,7 +10933,7 @@ msgstr ""
" -k, --kernel 在已挂载文件系统的内核表中搜索\n"
" (默认)\n"
-#: misc-utils/findmnt.c:1333
+#: misc-utils/findmnt.c:1421
msgid ""
" -k, --kernel search in kernel table of mounted\n"
" filesystems (default)\n"
@@ -10541,43 +10941,43 @@ msgstr ""
" -k, --kernel 在已挂载文件系统的内核表中搜索\n"
" (默认)\n"
-#: misc-utils/findmnt.c:1336
+#: misc-utils/findmnt.c:1424
msgid " -p, --poll[=<list>] monitor changes in table of mounted filesystems\n"
msgstr " -p, --poll[=<列表>] 监测已挂臷文件系统表的改变\n"
-#: misc-utils/findmnt.c:1337
+#: misc-utils/findmnt.c:1425
msgid " -w, --timeout <num> upper limit in milliseconds that --poll will block\n"
msgstr " -w, --timeout <数字> --poll 阻塞的时间上限(毫秒)\n"
-#: misc-utils/findmnt.c:1340
+#: misc-utils/findmnt.c:1428
msgid " -A, --all disable all built-in filters, print all filesystems\n"
msgstr " -A, --all 禁用所有内置过滤器,打印所有文件系统\n"
-#: misc-utils/findmnt.c:1341
+#: misc-utils/findmnt.c:1429
msgid " -a, --ascii use ASCII chars for tree formatting\n"
msgstr " -a, --ascii 用 ASCII 字符格式化树\n"
-#: misc-utils/findmnt.c:1342
+#: misc-utils/findmnt.c:1430
msgid " -b, --bytes print sizes in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n"
-#: misc-utils/findmnt.c:1343
+#: misc-utils/findmnt.c:1431
msgid " -C, --nocanonicalize don't canonicalize when comparing paths\n"
msgstr " -c, --no-canonicalize 在比较路径时不对路径规范化\n"
-#: misc-utils/findmnt.c:1344
+#: misc-utils/findmnt.c:1432
msgid " -c, --canonicalize canonicalize printed paths\n"
msgstr " -c, --no-canonicalize 对打印的路径规范化\n"
-#: misc-utils/findmnt.c:1345
+#: misc-utils/findmnt.c:1433
msgid " -D, --df imitate the output of df(1)\n"
msgstr " -D, --df 仿照 df(1) 输出\n"
-#: misc-utils/findmnt.c:1346
+#: misc-utils/findmnt.c:1434
msgid " -d, --direction <word> direction of search, 'forward' or 'backward'\n"
msgstr " -d, --direction <单词> 搜索方向,“forward”(往前)或“backward”(往回)\n"
-#: misc-utils/findmnt.c:1347
+#: misc-utils/findmnt.c:1435
msgid ""
" -e, --evaluate convert tags (LABEL,UUID,PARTUUID,PARTLABEL) \n"
" to device names\n"
@@ -10585,74 +10985,82 @@ msgstr ""
" -e, --evaluate 将标签(LABEL,UUID,PARTUUID,PARTLABEL) 转换为\n"
" 设备名\n"
-#: misc-utils/findmnt.c:1349
+#: misc-utils/findmnt.c:1437
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:1350
+#: misc-utils/findmnt.c:1438
msgid " -f, --first-only print the first found filesystem only\n"
msgstr " -f, --first-only 只打印找到的第一个文件系统\n"
-#: misc-utils/findmnt.c:1351
+#: misc-utils/findmnt.c:1439
+#, fuzzy
+#| msgid " -D, --df imitate the output of df(1)\n"
+msgid " -I, --dfi imitate the output of df(1) with -i option\n"
+msgstr " -D, --df 仿照 df(1) 输出\n"
+
+#: misc-utils/findmnt.c:1440
msgid " -i, --invert invert the sense of matching\n"
msgstr " -i, --invert 反转搜索的匹配\n"
-#: misc-utils/findmnt.c:1352 misc-utils/lslocks.c:552 sys-utils/lsns.c:1291
-#: sys-utils/rfkill.c:639
+#: misc-utils/findmnt.c:1441 misc-utils/lslocks.c:817 sys-utils/lsns.c:1284
+#: sys-utils/rfkill.c:640
msgid " -J, --json use JSON output format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: misc-utils/findmnt.c:1353 sys-utils/lsns.c:1292
+#: misc-utils/findmnt.c:1442 sys-utils/lsns.c:1285
msgid " -l, --list use list format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/findmnt.c:1354
+#: misc-utils/findmnt.c:1443
msgid " -N, --task <tid> use alternative namespace (/proc/<tid>/mountinfo file)\n"
msgstr " -N, --task <tid> 使用替代的名字空间(/proc/<tid>/mountinfo 文件)\n"
-#: misc-utils/findmnt.c:1355
+#: misc-utils/findmnt.c:1444
msgid " -n, --noheadings don't print column headings\n"
msgstr " -n, --noheadings 不打印列标题\n"
-#: misc-utils/findmnt.c:1356
+#: misc-utils/findmnt.c:1445
msgid " -O, --options <list> limit the set of filesystems by mount options\n"
msgstr " -O, --options <列表> 根据挂臷选项限制文件系统集合\n"
-#: misc-utils/findmnt.c:1357
-msgid " -o, --output <list> the output columns to be shown\n"
+#: misc-utils/findmnt.c:1446 misc-utils/lslocks.c:820
+#, fuzzy
+#| msgid " -o, --output <list> the output columns to be shown\n"
+msgid " -o, --output <list> output columns (see --list-columns)\n"
msgstr " -o, --output <列表> 要显示的列\n"
-#: misc-utils/findmnt.c:1358
+#: misc-utils/findmnt.c:1447
msgid " --output-all output all available columns\n"
msgstr " --output-all 输出所有可用列\n"
-#: misc-utils/findmnt.c:1359
+#: misc-utils/findmnt.c:1448
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs 使用 键=“值”的输出格式\n"
-#: misc-utils/findmnt.c:1360
+#: misc-utils/findmnt.c:1449
msgid " --pseudo print only pseudo-filesystems\n"
msgstr " --pseudo 只打印伪文件系统\n"
-#: misc-utils/findmnt.c:1361
+#: misc-utils/findmnt.c:1450
#, 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:1362
+#: misc-utils/findmnt.c:1451
msgid " -R, --submounts print all submounts for the matching filesystems\n"
msgstr " -R, --submounts 打印匹配文件系统的所有子挂载(submount)\n"
-#: misc-utils/findmnt.c:1363
+#: misc-utils/findmnt.c:1452
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: misc-utils/findmnt.c:1364
+#: misc-utils/findmnt.c:1453
msgid " --real print only real filesystems\n"
msgstr " --real 只打印真实文件系统\n"
-#: misc-utils/findmnt.c:1365
+#: misc-utils/findmnt.c:1454
msgid ""
" -S, --source <string> the device to mount (by name, maj:min, \n"
" LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n"
@@ -10660,72 +11068,78 @@ msgstr ""
" -S, --source <字符串> 要挂载的设备(按 名称, 主:次设备号, \n"
" LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n"
-#: misc-utils/findmnt.c:1367
+#: misc-utils/findmnt.c:1456
msgid " -T, --target <path> the path to the filesystem to use\n"
msgstr " -T, --target <路径> 要使用的文件系统的路径\n"
-#: misc-utils/findmnt.c:1368
+#: misc-utils/findmnt.c:1457
msgid " --tree enable tree format output if possible\n"
msgstr " --tree 可能的话,启用树形格式化输出\n"
-#: misc-utils/findmnt.c:1369
+#: misc-utils/findmnt.c:1458
msgid " -M, --mountpoint <dir> the mountpoint directory\n"
msgstr " -M, --mountpoint <目录> 挂载点目录\n"
-#: misc-utils/findmnt.c:1370
+#: misc-utils/findmnt.c:1459
msgid " -t, --types <list> limit the set of filesystems by FS types\n"
msgstr " -t, --types <列表> 根据文件系统类型限制文件系统集合\n"
-#: misc-utils/findmnt.c:1371
+#: misc-utils/findmnt.c:1460
msgid " -U, --uniq ignore filesystems with duplicate target\n"
msgstr " -U, --uniq 忽略目标重复的文件系统\n"
-#: misc-utils/findmnt.c:1372 misc-utils/lslocks.c:559 sys-utils/lsns.c:1299
+#: misc-utils/findmnt.c:1461 misc-utils/lslocks.c:824 sys-utils/lsns.c:1292
msgid " -u, --notruncate don't truncate text in columns\n"
msgstr " -u, --notruncate 不截断列中的文本\n"
-#: misc-utils/findmnt.c:1373
+#: misc-utils/findmnt.c:1462
msgid " -v, --nofsroot don't print [/dir] for bind or btrfs mounts\n"
msgstr " -v, --nofsroot 对绑定式或 btrfs 挂载不打印[/dir]\n"
-#: misc-utils/findmnt.c:1374
+#: misc-utils/findmnt.c:1463
msgid " -y, --shell use column names to be usable as shell variable identifiers\n"
msgstr ""
-#: misc-utils/findmnt.c:1377
+#: misc-utils/findmnt.c:1466
msgid " -x, --verify verify mount table content (default is fstab)\n"
msgstr " -x, --verify 验证挂载表内容(默认为 fstab)\n"
-#: misc-utils/findmnt.c:1378
+#: misc-utils/findmnt.c:1467
msgid " --verbose print more details\n"
msgstr " --verbose 打印更多细节\n"
-#: misc-utils/findmnt.c:1379
+#: misc-utils/findmnt.c:1468
msgid " --vfs-all print all VFS options\n"
msgstr " --vfs-all 打印所有 VFS 选项\n"
-#: misc-utils/findmnt.c:1519
+#: misc-utils/findmnt.c:1471 misc-utils/lslocks.c:827
+#, fuzzy
+#| msgid " --list-modes list available modes\n"
+msgid " -H, --list-columns list the available columns\n"
+msgstr " --list-modes 列出可用模式\n"
+
+#: misc-utils/findmnt.c:1632
#, c-format
msgid "unknown direction '%s'"
msgstr "未知方向“%s”"
-#: misc-utils/findmnt.c:1596
+#: misc-utils/findmnt.c:1713
msgid "invalid TID argument"
msgstr "无效的 TID 参数"
-#: misc-utils/findmnt.c:1683
+#: misc-utils/findmnt.c:1816
msgid "--poll accepts only one file, but more specified by --tab-file"
msgstr "--poll 只接受一个文件,但用 --tab-file 指定了多个"
-#: misc-utils/findmnt.c:1687
+#: misc-utils/findmnt.c:1820
msgid "options --target and --source can't be used together with command line element that is not an option"
msgstr "--target 和 --source 选项不能与非选项的命令行元素一起使用"
-#: misc-utils/findmnt.c:1740 sys-utils/fstrim.c:308
+#: misc-utils/findmnt.c:1873 sys-utils/fstrim.c:308
msgid "failed to initialize libmount cache"
msgstr "初始化 libmount 缓存失败"
-#: misc-utils/findmnt.c:1785
+#: misc-utils/findmnt.c:1918
#, c-format
msgid "%s column is requested, but --poll is not enabled"
msgstr "请示了 %s 列,但未启用 --poll"
@@ -11112,38 +11526,38 @@ msgstr "不止一次指定目标"
msgid "cannot continue"
msgstr "无法继续"
-#: misc-utils/hardlink.c:1100
+#: misc-utils/hardlink.c:1101
#, fuzzy, c-format
#| msgid "unsupported GPT attribute bit '%s'"
msgid "Skipped (attributes mismatch) %s"
msgstr "不支持的 GPT 属性位“%s”"
-#: misc-utils/hardlink.c:1106
+#: misc-utils/hardlink.c:1107
#, c-format
msgid "Skipped (already reflink) %s"
msgstr ""
-#: misc-utils/hardlink.c:1127
+#: misc-utils/hardlink.c:1128
#, c-format
msgid "Skipped (content mismatch) %s"
msgstr ""
-#: misc-utils/hardlink.c:1157
+#: misc-utils/hardlink.c:1158
#, c-format
msgid " %s [options] <directory>|<file> ...\n"
msgstr " %s [options] <目录>|<文件> ...\n"
-#: misc-utils/hardlink.c:1161
+#: misc-utils/hardlink.c:1162
msgid "Consolidate duplicate files using hardlinks.\n"
msgstr ""
-#: misc-utils/hardlink.c:1164
+#: misc-utils/hardlink.c:1165
#, fuzzy
#| 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:1165
+#: misc-utils/hardlink.c:1166
#, fuzzy
#| msgid " -S, --size <size> maximum size for a single message\n"
msgid ""
@@ -11151,23 +11565,23 @@ msgid ""
" (speedup, using more RAM)\n"
msgstr " -S, --size <大小> 单条消息的最大尺寸\n"
-#: misc-utils/hardlink.c:1167
+#: misc-utils/hardlink.c:1168
#, fuzzy
#| 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:1168
+#: misc-utils/hardlink.c:1169
#, 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:1169
+#: misc-utils/hardlink.c:1170
msgid " -i, --include <regex> regular expression to include files/dirs\n"
msgstr " -i, --include <正则> 用于包含文件/目录的正则表达式\n"
-#: misc-utils/hardlink.c:1170
+#: misc-utils/hardlink.c:1171
#, fuzzy
#| msgid ""
#| " -k, --kernel search in kernel table of mounted\n"
@@ -11179,153 +11593,153 @@ msgstr ""
" -k, --kernel 在已挂载文件系统的内核表中搜索\n"
" (默认)\n"
-#: misc-utils/hardlink.c:1172
+#: misc-utils/hardlink.c:1173
#, 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:1173
+#: misc-utils/hardlink.c:1174
#, 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
+#: misc-utils/hardlink.c:1175
#, fuzzy
#| msgid " -t, --ignore ignore failures\n"
msgid " -o, --ignore-owner ignore owner changes\n"
msgstr " -t, --ignore 忽略失败\n"
-#: misc-utils/hardlink.c:1175
+#: misc-utils/hardlink.c:1176
msgid ""
" -O, --keep-oldest keep the oldest file of multiple equal files\n"
" (lower precedence than minimize/maximize)\n"
msgstr ""
-#: misc-utils/hardlink.c:1177
+#: misc-utils/hardlink.c:1178
#, 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
+#: misc-utils/hardlink.c:1179
msgid " -q, --quiet quiet mode - don't print anything\n"
msgstr " -q, --quiet 安静模式 - 不要打印任何内容\n"
-#: misc-utils/hardlink.c:1179
+#: misc-utils/hardlink.c:1180
#, 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
+#: misc-utils/hardlink.c:1181
#, 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
+#: misc-utils/hardlink.c:1182
#, 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
+#: misc-utils/hardlink.c:1183
#, 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
+#: misc-utils/hardlink.c:1184
msgid " -v, --verbose verbose output (repeat for more verbosity)\n"
msgstr " -v, --verbose 详尽输出(重复该参数可获得更详尽内容)\n"
-#: misc-utils/hardlink.c:1184
+#: misc-utils/hardlink.c:1185
#, 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:1186
+#: misc-utils/hardlink.c:1187
msgid " -X, --respect-xattrs respect extended attributes\n"
msgstr ""
-#: misc-utils/hardlink.c:1188
+#: misc-utils/hardlink.c:1189
#, fuzzy
#| msgid " -f, --file <file> log the contents of this file\n"
msgid " -y, --method <name> file content comparison method\n"
msgstr " -f, --file <文件> 记录指定文件的内容\n"
-#: misc-utils/hardlink.c:1191
+#: misc-utils/hardlink.c:1192
#, fuzzy
#| msgid " -E, --echo <when> echo input (auto, always or never)\n"
msgid " --reflink[=<when>] create clone/CoW copies (auto, always, never)\n"
msgstr " -E, --echo <时机> 回显输入(, always 或 never)\n"
-#: misc-utils/hardlink.c:1192
+#: misc-utils/hardlink.c:1193
msgid " --skip-reflinks skip already cloned files (enabled on --reflink)\n"
msgstr ""
-#: misc-utils/hardlink.c:1303
+#: misc-utils/hardlink.c:1304
#, fuzzy
#| msgid "failed to parse size"
msgid "failed to parse minimum size"
msgstr "解析大小失败"
-#: misc-utils/hardlink.c:1306
+#: misc-utils/hardlink.c:1307
#, fuzzy
#| msgid "failed to parse size"
msgid "failed to parse maximum size"
msgstr "解析大小失败"
-#: misc-utils/hardlink.c:1309
+#: misc-utils/hardlink.c:1310
#, fuzzy
#| msgid "failed to parse size"
msgid "failed to parse cache size"
msgstr "解析大小失败"
-#: misc-utils/hardlink.c:1312
+#: misc-utils/hardlink.c:1313
#, fuzzy
#| msgid "failed to parse size"
msgid "failed to parse I/O size"
msgstr "解析大小失败"
-#: misc-utils/hardlink.c:1325
+#: misc-utils/hardlink.c:1326
#, fuzzy, c-format
#| msgid "unsupported lock mode: %s"
msgid "unsupported reflink mode; %s"
msgstr "不支持的锁模式:%s"
-#: misc-utils/hardlink.c:1406
+#: misc-utils/hardlink.c:1407
msgid "cannot register exit handler"
msgstr "无法登记退出处理函数"
-#: misc-utils/hardlink.c:1411
+#: misc-utils/hardlink.c:1412
msgid "no directory or file specified"
msgstr "未指定目录或文件"
-#: misc-utils/hardlink.c:1417
+#: misc-utils/hardlink.c:1418
#, c-format
msgid "cannot initialize %s method, use 'memcmp' fallback"
msgstr ""
-#: misc-utils/hardlink.c:1422
+#: misc-utils/hardlink.c:1423
#, fuzzy
#| msgid "failed to initialize loopcxt"
msgid "failed to initialize files comparior"
msgstr "初始化 loopcxt 失败"
-#: misc-utils/hardlink.c:1434
+#: misc-utils/hardlink.c:1435
msgid "Scanning [device/inode/links]:"
msgstr ""
-#: misc-utils/hardlink.c:1439 sys-utils/fstrim.c:97
+#: misc-utils/hardlink.c:1440 sys-utils/fstrim.c:97
#, c-format
msgid "cannot get realpath: %s"
msgstr "无法获取真实路径:%s"
-#: misc-utils/hardlink.c:1445
+#: misc-utils/hardlink.c:1446
#, c-format
msgid "cannot process %s"
msgstr "无法处理 %s"
@@ -11390,20 +11804,20 @@ msgstr " --verbose 打印将收到信号的 pid\n"
msgid " (with: "
msgstr ""
-#: misc-utils/kill.c:290 misc-utils/kill.c:299 sys-utils/setpriv.c:448
-#: sys-utils/unshare.c:873
+#: misc-utils/kill.c:290 misc-utils/kill.c:299 sys-utils/setpriv.c:454
+#: sys-utils/unshare.c:969
#, c-format
msgid "unknown signal: %s"
msgstr "未知信号:%s"
#: 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
+#: misc-utils/kill.c:338 misc-utils/kill.c:381 sys-utils/mountpoint.c:186
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s 和 %s 相互排斥"
#: misc-utils/kill.c:341 misc-utils/kill.c:356 sys-utils/eject.c:210
-#: sys-utils/eject.c:232 sys-utils/losetup.c:748 sys-utils/tunelp.c:164
+#: sys-utils/eject.c:232 sys-utils/losetup.c:820 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
@@ -11416,7 +11830,7 @@ msgstr "%s 和 %s 相互排斥"
#: 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:329
+#: term-utils/setterm.c:669 text-utils/more.c:330
msgid "argument error"
msgstr "参数出错"
@@ -11460,6 +11874,110 @@ msgstr ""
msgid "cannot find process \"%s\""
msgstr "找不到进程“%s”"
+#: misc-utils/lastlog2.c:111
+msgid " -b, --before DAYS Print only records older than DAYS\n"
+msgstr ""
+
+#: misc-utils/lastlog2.c:112
+#, fuzzy
+#| msgid " -C, --clear clear the kernel ring buffer\n"
+msgid " -C, --clear Clear record of a user (requires -u)\n"
+msgstr " -C, --clear 清除内核环形缓冲区(ring butter)\n"
+
+#: misc-utils/lastlog2.c:113
+msgid " -d, --database FILE Use FILE as lastlog2 database\n"
+msgstr ""
+
+#: misc-utils/lastlog2.c:114
+msgid " -i, --import FILE Import data from old lastlog file\n"
+msgstr ""
+
+#: misc-utils/lastlog2.c:115
+msgid " -r, --rename NEWNAME Rename existing user to NEWNAME (requires -u)\n"
+msgstr ""
+
+#: misc-utils/lastlog2.c:116
+#, fuzzy
+#| msgid " -u, --userspace display userspace messages\n"
+msgid " -s, --service Display PAM service\n"
+msgstr " -u, --userspace 显示用户空间消息\n"
+
+#: misc-utils/lastlog2.c:117
+#, fuzzy
+#| msgid " -r, --reset reset all the counters (root only)\n"
+msgid " -S, --set ySet lastlog record to current time (requires -u)\n"
+msgstr " -r, --reset 重置所有计数(限 root 用户)\n"
+
+#: misc-utils/lastlog2.c:118
+msgid " -t, --time DAYS Print only lastlog records more recent than DAYS\n"
+msgstr ""
+
+#: misc-utils/lastlog2.c:119
+msgid " -u, --user LOGIN Print lastlog record of the specified LOGIN\n"
+msgstr ""
+
+#: misc-utils/lastlog2.c:166 misc-utils/lastlog2.c:199
+#, fuzzy
+#| msgid "cannot update %s"
+msgid "Cannot parse days"
+msgstr "无法更新 %s"
+
+#: misc-utils/lastlog2.c:217
+msgid "Option -C, -i and -S cannot be used together"
+msgstr ""
+
+#: misc-utils/lastlog2.c:221
+#, fuzzy
+#| msgid "Couldn't initialize PAM: %s"
+msgid "Couldn't initialize lastlog2 environment"
+msgstr "无法初始化 PAM:%s"
+
+#: misc-utils/lastlog2.c:226
+#, fuzzy, c-format
+#| msgid "could not read: %s"
+msgid "Couldn't import entries from '%s'"
+msgstr "无法读取︰%s"
+
+#: misc-utils/lastlog2.c:235
+msgid "Options -C, -r and -S require option -u to specify the user"
+msgstr ""
+
+#: misc-utils/lastlog2.c:240 misc-utils/lastlog2.c:283
+#, fuzzy, c-format
+#| msgid "user %s does not exist"
+msgid "User '%s' does not exist."
+msgstr "用户 %s 不存在"
+
+#: misc-utils/lastlog2.c:246
+#, fuzzy, c-format
+#| msgid "could not read: %s"
+msgid "Couldn't remove entry for '%s'"
+msgstr "无法读取︰%s"
+
+#: misc-utils/lastlog2.c:255
+#, fuzzy
+#| msgid "could not determine current format type"
+msgid "Could not determine current time"
+msgstr "不能确定当前格式类型"
+
+#: misc-utils/lastlog2.c:260
+#, fuzzy, c-format
+#| msgid "unsupported logging format: '%s'"
+msgid "Couldn't update login time for '%s'"
+msgstr "不支持的日志格式:“%s”"
+
+#: misc-utils/lastlog2.c:267
+#, fuzzy, c-format
+#| msgid "mount: translated %s '%s' to '%s'\n"
+msgid "Couldn't rename entry '%s' to '%s'"
+msgstr "mount:已将 %s “%s”转换为“%s”\n"
+
+#: misc-utils/lastlog2.c:297
+#, fuzzy
+#| msgid "Couldn't read neither /dev/vcsa0 nor /dev/vcsa"
+msgid "Couldn't read entries for all users"
+msgstr "无法读 /dev/vcsa0 或 /dev/vcsa"
+
#: misc-utils/logger.c:230
#, c-format
msgid "unknown facility name: %s"
@@ -11702,1339 +12220,1588 @@ msgstr " -f, --ignore-case 比较时忽略大小写\n"
msgid " -t, --terminate <char> define the string-termination character\n"
msgstr " -t, --terminate <字符> 定义字符串终止字符\n"
-#: misc-utils/lsblk.c:170
+#: misc-utils/lsblk.c:174
msgid "alignment offset"
msgstr "对齐偏移量"
-#: misc-utils/lsblk.c:171
+#: misc-utils/lsblk.c:175
msgid "udev ID (based on ID-LINK)"
msgstr ""
-#: misc-utils/lsblk.c:172
+#: misc-utils/lsblk.c:176
msgid "the shortest udev /dev/disk/by-id link name"
msgstr ""
-#: misc-utils/lsblk.c:173
+#: misc-utils/lsblk.c:177
msgid "discard alignment offset"
msgstr "忽略对齐偏移量"
-#: misc-utils/lsblk.c:174
+#: misc-utils/lsblk.c:178
#, fuzzy
#| msgid "removable device"
msgid "dax-capable device"
msgstr "可移动设备"
-#: misc-utils/lsblk.c:175
-msgid "discard granularity"
-msgstr "忽略粒度"
+#: misc-utils/lsblk.c:179
+msgid "discard granularity, use <number> if --bytes is given"
+msgstr ""
-#: misc-utils/lsblk.c:176
+#: misc-utils/lsblk.c:180
#, fuzzy
#| msgid "disk serial number"
msgid "disk sequence number"
msgstr "磁盘序列号"
-#: misc-utils/lsblk.c:177
-msgid "discard max bytes"
-msgstr "忽略最大字节数"
+#: misc-utils/lsblk.c:181
+msgid "discard max bytes, use <number> if --bytes is given"
+msgstr ""
-#: misc-utils/lsblk.c:178
+#: misc-utils/lsblk.c:182
msgid "discard zeroes data"
msgstr "忽略零数据"
-#: misc-utils/lsblk.c:180
+#: misc-utils/lsblk.c:183
+msgid "filesystem size available for unprivileged users, use <number> if --bytes is given"
+msgstr ""
+
+#: misc-utils/lsblk.c:184
#, fuzzy
#| msgid "filesystem root"
msgid "mounted filesystem roots"
msgstr "文件系统 root"
-#: misc-utils/lsblk.c:185
+#: misc-utils/lsblk.c:189
msgid "filesystem version"
msgstr "文件系统版本"
-#: misc-utils/lsblk.c:186
+#: misc-utils/lsblk.c:190
msgid "group name"
msgstr "组名"
-#: misc-utils/lsblk.c:187
+#: misc-utils/lsblk.c:191
msgid "Host:Channel:Target:Lun for SCSI"
msgstr "SCSI 的 Host:Channel:Target:Lun"
-#: misc-utils/lsblk.c:188
+#: misc-utils/lsblk.c:192
msgid "removable or hotplug device (usb, pcmcia, ...)"
msgstr "可移动或热插拔设备(usb, pcmcia, ...)"
-#: misc-utils/lsblk.c:189
+#: misc-utils/lsblk.c:193
msgid "internal kernel device name"
msgstr "内部内核设备名称"
-#: misc-utils/lsblk.c:190 misc-utils/wipefs.c:110
+#: misc-utils/lsblk.c:194 misc-utils/wipefs.c:110
msgid "filesystem LABEL"
msgstr "文件系统标签"
-#: misc-utils/lsblk.c:191
+#: misc-utils/lsblk.c:195
msgid "logical sector size"
msgstr "逻辑扇区大小"
-#: misc-utils/lsblk.c:193
+#: misc-utils/lsblk.c:197
+#, fuzzy
+#| msgid "major:minor device number"
+msgid "major device number"
+msgstr "主:次 设备号"
+
+#: misc-utils/lsblk.c:198
+#, fuzzy
+#| msgid "major:minor device number"
+msgid "minor device number"
+msgstr "主:次 设备号"
+
+#: misc-utils/lsblk.c:199
msgid "minimum I/O size"
msgstr "最小 I/O 大小"
-#: misc-utils/lsblk.c:194
+#: misc-utils/lsblk.c:200
msgid "device identifier"
msgstr "设备标识符"
-#: misc-utils/lsblk.c:195
+#: misc-utils/lsblk.c:201
msgid "device node permissions"
msgstr "设备节点权限"
-#: misc-utils/lsblk.c:196
+#: misc-utils/lsblk.c:202
#, fuzzy
#| msgid "device name"
msgid "device queues"
msgstr "设备名"
-#: misc-utils/lsblk.c:197
+#: misc-utils/lsblk.c:203
msgid "device name"
msgstr "设备名"
-#: misc-utils/lsblk.c:198
+#: misc-utils/lsblk.c:204
msgid "optimal I/O size"
msgstr "最优 I/O 大小"
-#: misc-utils/lsblk.c:201
+#: misc-utils/lsblk.c:207
msgid "partition LABEL"
msgstr "分区 LABEL"
-#: misc-utils/lsblk.c:202
+#: misc-utils/lsblk.c:208
#, 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
+#: misc-utils/lsblk.c:209
msgid "partition type name"
msgstr "分区类型名"
-#: misc-utils/lsblk.c:204
+#: misc-utils/lsblk.c:210
#, fuzzy
#| msgid "partition type UUID"
msgid "partition type code or UUID"
msgstr "分区类型 UUID"
-#: misc-utils/lsblk.c:206
+#: misc-utils/lsblk.c:212
msgid "path to the device node"
msgstr "到设备节点的路径"
-#: misc-utils/lsblk.c:207
+#: misc-utils/lsblk.c:213
msgid "physical sector size"
msgstr "物理扇区大小"
-#: misc-utils/lsblk.c:208
+#: misc-utils/lsblk.c:214
msgid "internal parent kernel device name"
msgstr "内部上级内核设备名称"
-#: misc-utils/lsblk.c:209
+#: misc-utils/lsblk.c:215
msgid "partition table type"
msgstr "分区表类型"
-#: misc-utils/lsblk.c:210
+#: misc-utils/lsblk.c:216
msgid "partition table identifier (usually UUID)"
msgstr "分区表标识符(通常为 UUID)"
-#: misc-utils/lsblk.c:211
+#: misc-utils/lsblk.c:217
msgid "adds randomness"
msgstr "添加随机性"
-#: misc-utils/lsblk.c:212
+#: misc-utils/lsblk.c:218
msgid "read-ahead of the device"
msgstr "该设备的预读(read-ahead)"
-#: misc-utils/lsblk.c:213
+#: misc-utils/lsblk.c:219
msgid "device revision"
msgstr "设备修订版本"
-#: misc-utils/lsblk.c:214
+#: misc-utils/lsblk.c:220
msgid "removable device"
msgstr "可移动设备"
-#: misc-utils/lsblk.c:215
+#: misc-utils/lsblk.c:221
msgid "rotational device"
msgstr "转动设备"
-#: misc-utils/lsblk.c:216 sys-utils/losetup.c:79
+#: misc-utils/lsblk.c:222 sys-utils/losetup.c:95
msgid "read-only device"
msgstr "只读设备"
-#: misc-utils/lsblk.c:217
+#: misc-utils/lsblk.c:223
msgid "request queue size"
msgstr "请求队列大小"
-#: misc-utils/lsblk.c:218
+#: misc-utils/lsblk.c:224
msgid "I/O scheduler name"
msgstr "I/O 调度器名称"
-#: misc-utils/lsblk.c:219
+#: misc-utils/lsblk.c:225
msgid "disk serial number"
msgstr "磁盘序列号"
-#: misc-utils/lsblk.c:220
-msgid "size of the device"
-msgstr "磁盘容量"
+#: misc-utils/lsblk.c:226
+msgid "size of the device, use <number> if --bytes is given"
+msgstr ""
-#: misc-utils/lsblk.c:221
+#: misc-utils/lsblk.c:227
#, fuzzy
#| msgid "partition name"
-msgid "partition start offset"
+msgid "partition start offset (in 512-byte sectors)"
msgstr "分区名"
-#: misc-utils/lsblk.c:222
+#: misc-utils/lsblk.c:228
msgid "state of the device"
msgstr "设备的状态"
-#: misc-utils/lsblk.c:223
+#: misc-utils/lsblk.c:229
msgid "de-duplicated chain of subsystems"
msgstr "对成链的子系统去重"
-#: misc-utils/lsblk.c:224
+#: misc-utils/lsblk.c:230
#, 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
+#: misc-utils/lsblk.c:231 sys-utils/zramctl.c:86
msgid "where the device is mounted"
msgstr "设备挂载位置"
-#: misc-utils/lsblk.c:226
+#: misc-utils/lsblk.c:232
msgid "device transport type"
msgstr "设备传输类型"
-#: misc-utils/lsblk.c:227
+#: misc-utils/lsblk.c:233
msgid "device type"
msgstr "设备类型"
-#: misc-utils/lsblk.c:229
+#: misc-utils/lsblk.c:235
msgid "device vendor"
msgstr "设备制造商"
-#: misc-utils/lsblk.c:230
-msgid "write same max bytes"
-msgstr "写相同的最大字节数"
+#: misc-utils/lsblk.c:236
+msgid "write same max bytes, use <number> if --bytes is given"
+msgstr ""
-#: misc-utils/lsblk.c:231
+#: misc-utils/lsblk.c:237
msgid "unique storage identifier"
msgstr "惟一存储标识符"
-#: misc-utils/lsblk.c:232
+#: misc-utils/lsblk.c:238
msgid "zone model"
msgstr ""
-#: misc-utils/lsblk.c:233
-#, fuzzy
-#| msgid "min seg size"
-msgid "zone size"
-msgstr "最小段大小"
+#: misc-utils/lsblk.c:239
+msgid "zone size, use <number> if --bytes is given"
+msgstr ""
-#: misc-utils/lsblk.c:234
-#, fuzzy
-#| msgid "discard granularity"
-msgid "zone write granularity"
-msgstr "忽略粒度"
+#: misc-utils/lsblk.c:240
+msgid "zone write granularity, use <number> if --bytes is given"
+msgstr ""
-#: misc-utils/lsblk.c:235
-#, fuzzy
-#| msgid "write same max bytes"
-msgid "zone append max bytes"
-msgstr "写相同的最大字节数"
+#: misc-utils/lsblk.c:241
+msgid "zone append max bytes, use <number> if --bytes is given"
+msgstr ""
-#: misc-utils/lsblk.c:236
+#: misc-utils/lsblk.c:242
#, fuzzy
#| msgid "number of sectors"
msgid "number of zones"
msgstr "扇区数"
-#: misc-utils/lsblk.c:237
+#: misc-utils/lsblk.c:243
#, fuzzy
#| msgid "max number of open files"
msgid "maximum number of open zones"
msgstr "打开文件的最大数量"
-#: misc-utils/lsblk.c:238
+#: misc-utils/lsblk.c:244
#, fuzzy
#| msgid "max number of processes"
msgid "maximum number of active zones"
msgstr "最大进程数"
-#: misc-utils/lsblk.c:1433
+#: misc-utils/lsblk.c:1347 misc-utils/lsfd.c:1272
+#, fuzzy
+#| msgid "Failed to apply script %s"
+msgid "failed to apply filter"
+msgstr "应用脚本文件 %s 失败"
+
+#: misc-utils/lsblk.c:1564
msgid "failed to allocate device"
msgstr "分配设备失败"
-#: misc-utils/lsblk.c:1493
+#: misc-utils/lsblk.c:1624
msgid "failed to open device directory in sysfs"
msgstr "打开 sysfs 中的设备目录失败"
-#: misc-utils/lsblk.c:1681
+#: misc-utils/lsblk.c:1812
#, c-format
msgid "%s: failed to get sysfs name"
msgstr "%s:获取 sysfs 名称失败"
-#: misc-utils/lsblk.c:1693
+#: misc-utils/lsblk.c:1824
#, c-format
msgid "%s: failed to get whole-disk device number"
msgstr "%s:获取 整盘 设备号失败"
-#: misc-utils/lsblk.c:1766 misc-utils/lsblk.c:1814
+#: misc-utils/lsblk.c:1897 misc-utils/lsblk.c:1945
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
+#: misc-utils/lsblk.c:2005 misc-utils/lsblk.c:2007 misc-utils/lsblk.c:2036
+#: misc-utils/lsblk.c:2038
#, c-format
msgid "failed to parse list '%s'"
msgstr "解析列表“%s”失败"
#. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1881
+#: misc-utils/lsblk.c:2012
#, 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
+#: misc-utils/lsblk.c:2043
#, 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
+#: misc-utils/lsblk.c:2119 misc-utils/lsfd.c:1955
+#, fuzzy
+#| msgid "failed to allocate iterator"
+msgid "failed to allocate filter"
+msgstr "分配迭代器失败"
+
+#: misc-utils/lsblk.c:2121 misc-utils/lsfd.c:1957
+#, fuzzy, c-format
+#| msgid "failed to parse %s"
+msgid "failed to parse \"%s\": %s"
+msgstr "解析 %s 失败"
+
+#: misc-utils/lsblk.c:2152
+#, fuzzy, c-format
+#| msgid "unexpected value in %s: %ju"
+msgid "unexpected counter specification: %s"
+msgstr "%s 有异常值:%ju"
+
+#: misc-utils/lsblk.c:2156
+#, fuzzy
+#| msgid "no mount source specified"
+msgid "counter not properly specified"
+msgstr "未指定挂载来源"
+
+#: misc-utils/lsblk.c:2166 misc-utils/lsfd.c:2045
+#, fuzzy
+#| msgid "failed to allocate iterator"
+msgid "failed to allocate counter"
+msgstr "分配迭代器失败"
+
+#: misc-utils/lsblk.c:2183
+#, fuzzy, c-format
+#| msgid "unsupported source tag: %s"
+msgid "unsupported counter type: %s"
+msgstr "不受支持的源标记︰ %s"
+
+#: misc-utils/lsblk.c:2196
+msgid "Summary:\n"
+msgstr ""
+
+#: misc-utils/lsblk.c:2293
+#, fuzzy
+#| msgid "failed to initialize loopcxt"
+msgid "failed to initialize filter"
+msgstr "初始化 loopcxt 失败"
+
+#: misc-utils/lsblk.c:2302 sys-utils/wdctl.c:230
#, c-format
msgid " %s [options] [<device> ...]\n"
msgstr " %s [选项] [<设备> ...]\n"
-#: misc-utils/lsblk.c:1984
+#: misc-utils/lsblk.c:2305
msgid "List information about block devices.\n"
msgstr "列出块设备的信息。\n"
-#: misc-utils/lsblk.c:1987
+#: misc-utils/lsblk.c:2308
#, 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
+#: misc-utils/lsblk.c:2309
msgid " -D, --discard print discard capabilities\n"
msgstr " -D, --discard 打印时丢弃能力\n"
-#: misc-utils/lsblk.c:1989
+#: misc-utils/lsblk.c:2310
#, 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
+#: misc-utils/lsblk.c:2311
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
+#: misc-utils/lsblk.c:2312 sys-utils/lsirq.c:56 sys-utils/lsmem.c:518
msgid " -J, --json use JSON output format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: misc-utils/lsblk.c:1992
+#: misc-utils/lsblk.c:2313
#, 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
+#: misc-utils/lsblk.c:2314
msgid " -O, --output-all output all columns\n"
msgstr " -O, --output-all 输出所有列\n"
-#: misc-utils/lsblk.c:1995
+#: misc-utils/lsblk.c:2316
+msgid " -Q, --filter <expr> print only lines maching the expression\n"
+msgstr ""
+
+#: misc-utils/lsblk.c:2317
+msgid " --highlight <expr> colorize lines maching the expression\n"
+msgstr ""
+
+#: misc-utils/lsblk.c:2318
+msgid " --ct-filter <expr> restrict the next counter\n"
+msgstr ""
+
+#: misc-utils/lsblk.c:2319
+msgid " --ct <name>[:<param>[:<func>]] define a custom counter\n"
+msgstr ""
+
+#: misc-utils/lsblk.c:2320
msgid " -S, --scsi output info about SCSI devices\n"
msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n"
-#: misc-utils/lsblk.c:1996
+#: misc-utils/lsblk.c:2321
#, 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
+#: misc-utils/lsblk.c:2322
#, 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
+#: misc-utils/lsblk.c:2323
#, 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
+#: misc-utils/lsblk.c:2324
msgid " -a, --all print all devices\n"
msgstr " -a, --all 打印所有设备\n"
-#: misc-utils/lsblk.c:2001
+#: misc-utils/lsblk.c:2326
msgid " -d, --nodeps don't print slaves or holders\n"
msgstr " -d, --nodeps 不打印从属设备(slave)或占位设备(holder)\n"
-#: misc-utils/lsblk.c:2002
+#: misc-utils/lsblk.c:2327
msgid " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"
msgstr " -e, --exclude <列表> 根据主设备号排除设备(默认:内存盘)\n"
-#: misc-utils/lsblk.c:2003
+#: misc-utils/lsblk.c:2328
msgid " -f, --fs output info about filesystems\n"
msgstr " -f, --fs 输出文件系统信息\n"
-#: misc-utils/lsblk.c:2004
+#: misc-utils/lsblk.c:2329
msgid " -i, --ascii use ascii characters only\n"
msgstr " -i, --ascii 只使用 ascii 字符\n"
-#: misc-utils/lsblk.c:2005
+#: misc-utils/lsblk.c:2330
msgid " -l, --list use list format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/lsblk.c:2006
+#: misc-utils/lsblk.c:2331
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
+#: misc-utils/lsblk.c:2332 sys-utils/lsirq.c:58 sys-utils/lsmem.c:522
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"
+#: misc-utils/lsblk.c:2333
+#, fuzzy
+#| msgid " -o, --output <list> output columns\n"
+msgid " -o, --output <list> output columns (see --list-columns)\n"
msgstr " -o, --output <列表> 输出列\n"
-#: misc-utils/lsblk.c:2009
+#: misc-utils/lsblk.c:2334
msgid " -p, --paths print complete device path\n"
msgstr " -p, --paths 打印完整设备路径\n"
-#: misc-utils/lsblk.c:2011
+#: misc-utils/lsblk.c:2336
msgid " -s, --inverse inverse dependencies\n"
msgstr " -s, --inverse 反向依赖\n"
-#: misc-utils/lsblk.c:2012
+#: misc-utils/lsblk.c:2337
msgid " -t, --topology output info about topology\n"
msgstr " -t, --topology 输出拓扑信息\n"
-#: misc-utils/lsblk.c:2013
+#: misc-utils/lsblk.c:2338
#, 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
+#: misc-utils/lsblk.c:2339
msgid " -x, --sort <column> sort output by <column>\n"
msgstr " -x, --sort <列> 按<列>对输出排序\n"
-#: misc-utils/lsblk.c:2015
+#: misc-utils/lsblk.c:2340
msgid " -y, --shell use column names to be usable as shell variable identifiers\n"
msgstr ""
-#: misc-utils/lsblk.c:2016
+#: misc-utils/lsblk.c:2341
#, 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
+#: misc-utils/lsblk.c:2342
msgid " --sysroot <dir> use specified directory as system root\n"
msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
-#: misc-utils/lsblk.c:2034
+#: misc-utils/lsblk.c:2345
+#, fuzzy
+#| msgid " --list-modes list available modes\n"
+msgid " -H, --list-columns list the available columns\n"
+msgstr " --list-modes 列出可用模式\n"
+
+#: misc-utils/lsblk.c:2384
#, c-format
msgid "failed to access sysfs directory: %s"
msgstr "无法访问 sysfs 目录:%s"
-#: misc-utils/lsblk.c:2280
+#: misc-utils/lsblk.c:2643
#, fuzzy
#| msgid "invalid partition number argument"
msgid "invalid output width number argument"
msgstr "无效的分区号参数"
-#: misc-utils/lsblk.c:2439
+#: misc-utils/lsblk.c:2805
msgid "failed to allocate device tree"
msgstr "分配设备树失败"
-#: misc-utils/lsfd.c:125
+#: misc-utils/lsclocks.c:98
+#, fuzzy, c-format
+#| msgid "unknown user %s"
+msgid "Unknown clock type %d"
+msgstr "未知用户 %s"
+
+#: misc-utils/lsclocks.c:149
+#, fuzzy
+#| msgid "type name"
+msgid "type"
+msgstr "类型名称"
+
+#: misc-utils/lsclocks.c:150
+msgid "numeric id"
+msgstr ""
+
+#: misc-utils/lsclocks.c:151
+#, fuzzy
+#| msgid "Resource name"
+msgid "symbolic name"
+msgstr "资源名称"
+
+#: misc-utils/lsclocks.c:152
+#, fuzzy
+#| msgid "file name"
+msgid "readable name"
+msgstr "文件名称"
+
+#: misc-utils/lsclocks.c:153
+#, fuzzy
+#| msgid "Detach time"
+msgid "numeric time"
+msgstr "分离时间"
+
+#: misc-utils/lsclocks.c:154
+#, fuzzy
+#| msgid "human readable size"
+msgid "human readable ISO time"
+msgstr "易读形式的大小"
+
+#: misc-utils/lsclocks.c:155
+#, fuzzy
+#| msgid "human readable size"
+msgid "human readable resolution"
+msgstr "易读形式的大小"
+
+#: misc-utils/lsclocks.c:156
+#, fuzzy
+#| msgid "resource description"
+msgid "resolution"
+msgstr "资源描述"
+
+#: misc-utils/lsclocks.c:157
+#, fuzzy
+#| msgid "human readable size"
+msgid "human readable relative time"
+msgstr "易读形式的大小"
+
+#: misc-utils/lsclocks.c:158
+#, fuzzy
+#| msgid "failed to parse offset"
+msgid "namespace offset"
+msgstr "解析偏移失败"
+
+#: misc-utils/lsclocks.c:185
+#, fuzzy
+#| msgid " -J, --json use JSON output format\n"
+msgid " -J, --json use JSON output format\n"
+msgstr " -J, --json 使用 JSON 输出格式\n"
+
+#: misc-utils/lsclocks.c:186
+#, fuzzy
+#| msgid " -n, --noheadings don't print headings\n"
+msgid " -n, --noheadings don't print headings\n"
+msgstr " -n, --noheadings 不打印标题\n"
+
+#: misc-utils/lsclocks.c:187
+#, fuzzy
+#| msgid " -o, --output <list> output columns\n"
+msgid " -o, --output <list> output columns\n"
+msgstr " -o, --output <列表> 输出列\n"
+
+#: misc-utils/lsclocks.c:188
+#, fuzzy
+#| msgid " --output-all output all columns\n"
+msgid " --output-all output all columns\n"
+msgstr " --output-all 输出所有列\n"
+
+#: misc-utils/lsclocks.c:189
+#, fuzzy
+#| msgid " -r, --raw use raw output format\n"
+msgid " -r, --raw use raw output format\n"
+msgstr " -r, --raw 使用原生输出格式\n"
+
+#: misc-utils/lsclocks.c:190
+#, fuzzy
+#| msgid " -t, --time <ms> driver wait time in milliseconds\n"
+msgid " -t, --time <clock> show current time of single clock\n"
+msgstr " -t, --time <毫秒数> 驱动等待时间(毫秒)\n"
+
+#: misc-utils/lsclocks.c:191
+msgid " --no-discover-dynamic do not try to discover dynamic clocks\n"
+msgstr ""
+
+#: misc-utils/lsclocks.c:192
+msgid " -d, --dynamic-clock <path> also display specified dynamic clock\n"
+msgstr ""
+
+#: misc-utils/lsclocks.c:193
+#, fuzzy
+#| msgid " -p, --pid <pid> display only locks held by this process\n"
+msgid " -c, --cpu-clock <pid> also display CPU clock of specified process\n"
+msgstr " -p, --pid <pid> 只显示由指定进程持有的锁\n"
+
+#: misc-utils/lsclocks.c:248
+#, fuzzy, c-format
+#| msgid "Unknown command: %s"
+msgid "Unknown clock: %s"
+msgstr "未知命令: %s"
+
+#: misc-utils/lsclocks.c:259 misc-utils/lsclocks.c:388
+#: misc-utils/lsclocks.c:435
+#, fuzzy, c-format
+#| msgid "could not read: %s"
+msgid "Could not open %s"
+msgstr "无法读取︰%s"
+
+#: misc-utils/lsclocks.c:325
+#, fuzzy
+#| msgid "failed to parse --timeout"
+msgid "failed to format iso time"
+msgstr "解析 --timeout 失败"
+
+#: misc-utils/lsclocks.c:334 misc-utils/lsclocks.c:347
+#, fuzzy
+#| msgid "failed to create reload file: %s: %m"
+msgid "failed to format relative time"
+msgstr "未能创建 reload 文件︰%s:%m"
+
+#: misc-utils/lsclocks.c:414 misc-utils/lsclocks.c:478
+#, fuzzy, c-format
+#| msgid "could not read: %s"
+msgid "Could not glob: %d"
+msgstr "无法读取︰%s"
+
+#: misc-utils/lsclocks.c:443 sys-utils/hwclock-rtc.c:145
+#, 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) 失败"
+
+#: misc-utils/lsclocks.c:502
+#, c-format
+msgid "Could not get CPU clock of process %jd: %s"
+msgstr ""
+
+#: misc-utils/lsclocks.c:599 misc-utils/lslocks.c:385 misc-utils/uuidd.c:791
+#: misc-utils/waitpid.c:54 sys-utils/nsenter.c:390
+msgid "failed to parse pid"
+msgstr "解析 pid 失败"
+
+#: misc-utils/lsclocks.c:627
+#, fuzzy
+#| msgid "failed to get lock"
+msgid "failed to get time"
+msgstr "获取锁失败"
+
+#: misc-utils/lsfd.c:147
msgid "class of anonymous inode"
msgstr ""
-#: misc-utils/lsfd.c:128
+#: misc-utils/lsfd.c:150
#, fuzzy
#| msgid "cannot create child process"
msgid "association between file and process"
msgstr "无法创建子进程"
-#: misc-utils/lsfd.c:131
+#: misc-utils/lsfd.c:153
msgid "block device driver name resolved by /proc/devices"
msgstr ""
-#: misc-utils/lsfd.c:134
+#: misc-utils/lsfd.c:156
+#, fuzzy
+#| msgid "device %s is associated with %s\n"
+msgid "bpf map id associated with the fd"
+msgstr "设备 %s 与 %s 关联\n"
+
+#: misc-utils/lsfd.c:159
+#, fuzzy
+#| msgid "filesystem type"
+msgid "bpf map type (decoded)"
+msgstr "文件系统类型"
+
+#: misc-utils/lsfd.c:162
+#, fuzzy
+#| msgid "filesystem type"
+msgid "bpf map type (raw)"
+msgstr "文件系统类型"
+
+#: misc-utils/lsfd.c:165
+msgid "bpf object name"
+msgstr ""
+
+#: misc-utils/lsfd.c:168
+msgid "bpf program id associated with the fd"
+msgstr ""
+
+#: misc-utils/lsfd.c:171
+#, fuzzy
+#| msgid "No program specified"
+msgid "bpf program type (decoded)"
+msgstr "未指定程序"
+
+#: misc-utils/lsfd.c:174
+#, fuzzy
+#| msgid "filesystem type"
+msgid "bpf program type (raw)"
+msgstr "文件系统类型"
+
+#: misc-utils/lsfd.c:177
msgid "character device driver name resolved by /proc/devices"
msgstr ""
-#: misc-utils/lsfd.c:137
+#: misc-utils/lsfd.c:180
#, fuzzy
#| msgid "command of the process holding the lock"
msgid "command of the process opening the file"
msgstr "持有锁的进程命令"
-#: misc-utils/lsfd.c:140
+#: misc-utils/lsfd.c:183
msgid "reachability from the file system"
msgstr ""
-#: misc-utils/lsfd.c:143
+#: misc-utils/lsfd.c:186
#, fuzzy
#| msgid "device backing file"
msgid "ID of device containing file"
msgstr "设备后备文件"
-#: misc-utils/lsfd.c:146
+#: misc-utils/lsfd.c:189
msgid "device type (blk, char, or nodev)"
msgstr ""
-#: misc-utils/lsfd.c:149
+#: misc-utils/lsfd.c:192
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:195
+#, fuzzy
+#| msgid "reset failed"
+msgid "eventfd ID"
+msgstr "reset 失败"
+
+#: misc-utils/lsfd.c:198
+#, fuzzy
+#| msgid "bad file descriptor"
+msgid "file descriptors targeted by the eventpoll file"
+msgstr "错误的文件描述符"
-#: misc-utils/lsfd.c:155
+#: misc-utils/lsfd.c:201
#, fuzzy
#| msgid "bad file descriptor"
msgid "file descriptor for the file"
msgstr "错误的文件描述符"
-#: misc-utils/lsfd.c:158
+#: misc-utils/lsfd.c:204
+msgid "flags specified when opening the file"
+msgstr ""
+
+#: misc-utils/lsfd.c:207
#, 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
+#: misc-utils/lsfd.c:210
msgid "local IP address"
msgstr ""
-#: misc-utils/lsfd.c:167
+#: misc-utils/lsfd.c:213
msgid "remote IP address"
msgstr ""
-#: misc-utils/lsfd.c:170
+#: misc-utils/lsfd.c:216
msgid "local IPv6 address"
msgstr ""
-#: misc-utils/lsfd.c:173
+#: misc-utils/lsfd.c:219
msgid "remote IPv6 address"
msgstr ""
-#: misc-utils/lsfd.c:176
+#: misc-utils/lsfd.c:222 misc-utils/lslocks.c:84
+#, fuzzy
+#| msgid "logical NUMA node number"
+msgid "inode number"
+msgstr "逻辑 NUMA 节点数量"
+
+#: misc-utils/lsfd.c:225
+msgid "list of monitoring inodes (cooked)"
+msgstr ""
+
+#: misc-utils/lsfd.c:228
+msgid "list of monitoring inodes (raw, don't decode devices)"
+msgstr ""
+
+#: misc-utils/lsfd.c:231
#, fuzzy
#| msgid "size of the file"
msgid "name of the file (raw)"
msgstr "文件大小"
-#: misc-utils/lsfd.c:179
+#: misc-utils/lsfd.c:234
msgid "opened by a kernel thread"
msgstr ""
-#: misc-utils/lsfd.c:182
+#: misc-utils/lsfd.c:237
msgid "device ID for special, or ID of device containing file"
msgstr ""
-#: misc-utils/lsfd.c:185
+#: misc-utils/lsfd.c:240
msgid "length of file mapping (in page)"
msgstr ""
-#: misc-utils/lsfd.c:188
+#: misc-utils/lsfd.c:243
msgid "misc character device name resolved by /proc/misc"
msgstr ""
-#: misc-utils/lsfd.c:191
+#: misc-utils/lsfd.c:246
#, fuzzy
#| msgid "mount"
msgid "mount id"
msgstr "挂载"
-#: misc-utils/lsfd.c:194
+#: misc-utils/lsfd.c:249
#, fuzzy
#| msgid "lock access mode"
msgid "access mode (rwx)"
msgstr "锁访问模式"
-#: misc-utils/lsfd.c:197
+#: misc-utils/lsfd.c:252
#, fuzzy
#| msgid "size of the file"
msgid "name of the file (cooked)"
msgstr "文件大小"
-#: misc-utils/lsfd.c:200
+#: misc-utils/lsfd.c:255
msgid "netlink multicast groups"
msgstr ""
-#: misc-utils/lsfd.c:203
+#: misc-utils/lsfd.c:258
msgid "netlink local port id"
msgstr ""
-#: misc-utils/lsfd.c:206
+#: misc-utils/lsfd.c:261
msgid "netlink protocol"
msgstr ""
-#: misc-utils/lsfd.c:209
+#: misc-utils/lsfd.c:264
#, fuzzy
#| msgid "ncount"
msgid "link count"
msgstr "ncount"
-#: misc-utils/lsfd.c:212
+#: misc-utils/lsfd.c:267
msgid "name of the namespace (NS.TYPE:[INODE])"
msgstr ""
-#: misc-utils/lsfd.c:215
+#: misc-utils/lsfd.c:270
#, fuzzy
#| msgid "path to the namespace"
msgid "type of the namespace"
msgstr "名字空间路径"
-#: misc-utils/lsfd.c:218
+#: misc-utils/lsfd.c:273
#, fuzzy
#| msgid "size of the file"
msgid "owner of the file"
msgstr "文件大小"
-#: misc-utils/lsfd.c:221
+#: misc-utils/lsfd.c:276
msgid "net interface associated with the packet socket"
msgstr ""
-#: misc-utils/lsfd.c:224
+#: misc-utils/lsfd.c:279
msgid "L3 protocol associated with the packet socket"
msgstr ""
-#: misc-utils/lsfd.c:227
+#: misc-utils/lsfd.c:282
msgid "block device name resolved by /proc/partition"
msgstr ""
-#: misc-utils/lsfd.c:230
+#: misc-utils/lsfd.c:285
#, fuzzy
#| msgid "PID of the process holding the lock"
msgid "PID of the process opening the file"
msgstr "持有锁的进程 PID"
-#: misc-utils/lsfd.c:233
+#: misc-utils/lsfd.c:288
#, fuzzy
#| msgid "command of the process holding the lock"
msgid "command of the process targeted by the pidfd"
msgstr "持有锁的进程命令"
-#: misc-utils/lsfd.c:236
+#: misc-utils/lsfd.c:291
msgid "NSpid field in fdinfo of the pidfd"
msgstr ""
-#: misc-utils/lsfd.c:239
+#: misc-utils/lsfd.c:294
#, 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
+#: misc-utils/lsfd.c:297
msgid "ICMP echo request ID"
msgstr ""
-#: misc-utils/lsfd.c:245
+#: misc-utils/lsfd.c:300
#, fuzzy
#| msgid "%s: cannot get file position"
msgid "file position"
msgstr "%s:无法获取文件位置"
-#: misc-utils/lsfd.c:248
+#: misc-utils/lsfd.c:303
+#, fuzzy
+#| msgid "path to the namespace"
+msgid "tty index of the counterpart"
+msgstr "名字空间路径"
+
+#: misc-utils/lsfd.c:306
#, fuzzy
#| msgid "Number of attached processes"
msgid "protocol number of the raw socket"
msgstr "附加的进程数"
-#: misc-utils/lsfd.c:251
+#: misc-utils/lsfd.c:309
#, fuzzy
#| msgid "no device specified"
msgid "device ID (if special file)"
msgstr "未指定设备"
-#: misc-utils/lsfd.c:254
+#: misc-utils/lsfd.c:312
+#, fuzzy
+#| msgid "signals"
+msgid "masked signals"
+msgstr "信号"
+
+#: misc-utils/lsfd.c:315
#, fuzzy
#| msgid "max file size"
msgid "file size"
msgstr "最大文件尺寸"
-#: misc-utils/lsfd.c:257
+#: misc-utils/lsfd.c:318
msgid "listening socket"
msgstr ""
-#: misc-utils/lsfd.c:260
+#: misc-utils/lsfd.c:321
msgid "inode identifying network namespace where the socket belongs to"
msgstr ""
-#: misc-utils/lsfd.c:263
+#: misc-utils/lsfd.c:324
#, fuzzy
#| msgid "partition name"
msgid "protocol name"
msgstr "分区名"
-#: misc-utils/lsfd.c:266
-msgid "State of socket"
+#: misc-utils/lsfd.c:327
+msgid "shutdown state of socket ([-r?][-w?])"
msgstr ""
-#: misc-utils/lsfd.c:269
+#: misc-utils/lsfd.c:330
+#, fuzzy
+#| msgid "socket"
+msgid "state of socket"
+msgstr "套接字"
+
+#: misc-utils/lsfd.c:333
#, fuzzy
#| msgid "socket"
-msgid "Type of socket"
+msgid "type of socket"
msgstr "套接字"
-#: misc-utils/lsfd.c:272
+#: misc-utils/lsfd.c:336
#, 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
+#: misc-utils/lsfd.c:339
#, fuzzy
#| msgid "filesystem type"
msgid "file type (raw)"
msgstr "文件系统类型"
-#: misc-utils/lsfd.c:278
+#: misc-utils/lsfd.c:342
msgid "local TCP address (INET address:TCP port)"
msgstr ""
-#: misc-utils/lsfd.c:281
+#: misc-utils/lsfd.c:345
msgid "remote TCP address (INET address:TCP port)"
msgstr ""
-#: misc-utils/lsfd.c:284
+#: misc-utils/lsfd.c:348
#, fuzzy
#| msgid "logical CPU number"
msgid "local TCP port"
msgstr "逻辑 CPU 数量"
-#: misc-utils/lsfd.c:287
+#: misc-utils/lsfd.c:351
msgid "remote TCP port"
msgstr ""
-#: misc-utils/lsfd.c:290
+#: misc-utils/lsfd.c:354
#, 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
+#: misc-utils/lsfd.c:357
+#, fuzzy
+#| msgid "locked"
+msgid "clockid"
+msgstr "已锁定"
+
+#: misc-utils/lsfd.c:360
+#, fuzzy
+#| msgid "interleave"
+msgid "interval"
+msgstr "交错"
+
+#: misc-utils/lsfd.c:363
+#, fuzzy
+#| msgid "Minimum change time"
+msgid "remaining time"
+msgstr "最小更改时间"
+
+#: misc-utils/lsfd.c:366
+msgid "network interface behind the tun device"
+msgstr ""
+
+#: misc-utils/lsfd.c:369
#, fuzzy
#| msgid "filesystem type"
msgid "file type (cooked)"
msgstr "文件系统类型"
-#: misc-utils/lsfd.c:296
+#: misc-utils/lsfd.c:372
msgid "local UDP address (INET address:UDP port)"
msgstr ""
-#: misc-utils/lsfd.c:299
+#: misc-utils/lsfd.c:375
msgid "remote UDP address (INET address:UDP port)"
msgstr ""
-#: misc-utils/lsfd.c:302
+#: misc-utils/lsfd.c:378
msgid "local UDP port"
msgstr ""
-#: misc-utils/lsfd.c:305
+#: misc-utils/lsfd.c:381
msgid "remote UDP port"
msgstr ""
-#: misc-utils/lsfd.c:308
+#: misc-utils/lsfd.c:384
msgid "local UDPLite address (INET address:UDPLite port)"
msgstr ""
-#: misc-utils/lsfd.c:311
+#: misc-utils/lsfd.c:387
msgid "remote UDPLite address (INET address:UDPLite port)"
msgstr ""
-#: misc-utils/lsfd.c:314
+#: misc-utils/lsfd.c:390
msgid "local UDPLite port"
msgstr ""
-#: misc-utils/lsfd.c:317
+#: misc-utils/lsfd.c:393
msgid "remote UDPLite port"
msgstr ""
-#: misc-utils/lsfd.c:320
+#: misc-utils/lsfd.c:396
#, fuzzy
#| msgid "Number of attached processes"
msgid "user ID number of the process"
msgstr "附加的进程数"
-#: misc-utils/lsfd.c:323
+#: misc-utils/lsfd.c:399
msgid "filesystem pathname for UNIX domain socket"
msgstr ""
-#: misc-utils/lsfd.c:326
+#: misc-utils/lsfd.c:402
#, fuzzy
#| msgid "Number of attached processes"
msgid "user of the process"
msgstr "附加的进程数"
-#: misc-utils/lsfd.c:370 sys-utils/prlimit.c:87
+#: misc-utils/lsfd.c:405
+msgid "extended version of MDOE (rwxD[Ll]m)"
+msgstr ""
+
+#: misc-utils/lsfd.c:449 sys-utils/prlimit.c:79
msgid "processes"
msgstr "进程"
-#: misc-utils/lsfd.c:374
+#: misc-utils/lsfd.c:453
#, fuzzy
#| msgid "Attached processes"
msgid "root owned processes"
msgstr "附加的进程"
-#: misc-utils/lsfd.c:378
+#: misc-utils/lsfd.c:457
#, fuzzy
#| msgid "kernel messages"
msgid "kernel threads"
msgstr "内核消息"
-#: misc-utils/lsfd.c:382
+#: misc-utils/lsfd.c:461
#, fuzzy
#| msgid "open failed"
msgid "open files"
msgstr "打开失败"
-#: misc-utils/lsfd.c:386
+#: misc-utils/lsfd.c:465
#, fuzzy
#| msgid "open failed"
msgid "RO open files"
msgstr "打开失败"
-#: misc-utils/lsfd.c:390
+#: misc-utils/lsfd.c:469
#, fuzzy
#| msgid "open failed"
msgid "WO open files"
msgstr "打开失败"
-#: misc-utils/lsfd.c:394
+#: misc-utils/lsfd.c:473
msgid "shared mappings"
msgstr ""
-#: misc-utils/lsfd.c:398
+#: misc-utils/lsfd.c:477
msgid "RO shared mappings"
msgstr ""
-#: misc-utils/lsfd.c:402
+#: misc-utils/lsfd.c:481
msgid "WO shared mappings"
msgstr ""
-#: misc-utils/lsfd.c:406
+#: misc-utils/lsfd.c:485
msgid "regular files"
msgstr ""
-#: misc-utils/lsfd.c:410
+#: misc-utils/lsfd.c:489
#, fuzzy
#| msgid "Sectors"
msgid "directories"
msgstr "扇区"
-#: misc-utils/lsfd.c:414
+#: misc-utils/lsfd.c:493
#, fuzzy
#| msgid "socket"
msgid "sockets"
msgstr "套接字"
-#: misc-utils/lsfd.c:418
+#: misc-utils/lsfd.c:497
msgid "fifos/pipes"
msgstr ""
-#: misc-utils/lsfd.c:422
+#: misc-utils/lsfd.c:501
#, fuzzy
#| msgid "/dev/%s: not a character device"
msgid "character devices"
msgstr "/dev/%s:不是字符设备"
-#: misc-utils/lsfd.c:426
+#: misc-utils/lsfd.c:505
#, fuzzy
#| msgid "block device name"
msgid "block devices"
msgstr "块设备名称"
-#: misc-utils/lsfd.c:430
+#: misc-utils/lsfd.c:509
#, fuzzy
#| msgid "unknown user %s"
msgid "unknown types"
msgstr "未知用户 %s"
-#: misc-utils/lsfd.c:527
+#: misc-utils/lsfd.c:609
msgid "too many columns are added via filter expression"
msgstr ""
-#: misc-utils/lsfd.c:1324
+#: misc-utils/lsfd.c:1462
#, fuzzy
#| msgid "failed to allocate UID cache"
msgid "failed to allocate an idcache"
msgstr "分配 UID 缓存失败"
-#: misc-utils/lsfd.c:1379 misc-utils/lslocks.c:292
+#: misc-utils/lsfd.c:1680 misc-utils/lslocks.c:421
msgid "(unknown)"
msgstr "(未知)"
-#: misc-utils/lsfd.c:1435 misc-utils/lsfd-filter.c:374
-#: misc-utils/lsfd-sock-xinfo.c:154 misc-utils/lsfd-sock-xinfo.c:281
+#: misc-utils/lsfd.c:1763 misc-utils/lsfd-sock-xinfo.c:157
+#: misc-utils/lsfd-sock-xinfo.c:296 misc-utils/lslocks.c:167
#, fuzzy
#| msgid "failed to allocate memory: %m"
msgid "failed to allocate memory"
msgstr "分配内存失败:%m"
-#: misc-utils/lsfd.c:1466
+#: misc-utils/lsfd.c:1792
#, fuzzy, c-format
#| msgid "unexpected value in %s: %ju"
msgid "unexpected value for pid specification: %s"
msgstr "%s 有异常值:%ju"
-#: misc-utils/lsfd.c:1468
+#: misc-utils/lsfd.c:1794
#, c-format
msgid "garbage at the end of pid specification: %s"
msgstr ""
-#: misc-utils/lsfd.c:1470
+#: misc-utils/lsfd.c:1796
#, c-format
msgid "out of range value for pid specification: %ld"
msgstr ""
-#: misc-utils/lsfd.c:1514
+#: misc-utils/lsfd.c:1840 misc-utils/lslocks.c:502
#, fuzzy
#| msgid "failed to initialize procfs handler"
msgid "failed to alloc procfs handler"
msgstr "%s:初始化 procfs 处理函数失败"
-#: misc-utils/lsfd.c:1518
+#: misc-utils/lsfd.c:1844 misc-utils/lslocks.c:506
#, fuzzy
#| msgid "failed to open: %s"
msgid "failed to open /proc"
msgstr "打开失败:%s"
-#: misc-utils/lsfd.c:1542
+#: misc-utils/lsfd.c:1896
#, fuzzy
#| msgid " -n, --noheadings don't print headings\n"
-msgid " -l, --threads list in threads level\n"
+msgid " -l, --threads list in threads level\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/lsfd.c:1543
+#: misc-utils/lsfd.c:1897
#, fuzzy
#| msgid " -J, --json use JSON output format\n"
-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:1544
+#: misc-utils/lsfd.c:1898
#, fuzzy
-#| msgid " --noheadings don't print headings\n"
-msgid " -n, --noheadings don't print headings\n"
-msgstr " --noheadings 不打印标题\n"
+#| msgid " -n, --noheadings don't print headings\n"
+msgid " -n, --noheadings don't print headings\n"
+msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/lsfd.c:1545
+#: misc-utils/lsfd.c:1899
#, fuzzy
-#| msgid " -o, --output <list> output columns\n"
-msgid " -o, --output <list> output columns\n"
-msgstr " -o, --output <列表> 输出列\n"
+#| msgid " -o, --output <list> output columns\n"
+msgid " -o, --output <list> output columns (see --list-columns)\n"
+msgstr " -o, --output <列表> 输出列\n"
-#: misc-utils/lsfd.c:1546
+#: misc-utils/lsfd.c:1900
#, fuzzy
#| msgid " -r, --raw use raw output format\n"
-msgid " -r, --raw use raw output format\n"
+msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: misc-utils/lsfd.c:1547
+#: misc-utils/lsfd.c:1901
#, fuzzy
#| msgid " -u, --notruncate don't truncate text in columns\n"
-msgid " -u, --notruncate don't truncate text in columns\n"
+msgid " -u, --notruncate don't truncate text in columns\n"
msgstr " -u, --notruncate 不截断列中的文本\n"
-#: misc-utils/lsfd.c:1548
+#: misc-utils/lsfd.c:1902
#, fuzzy
#| msgid " -p, --pid <pid>... act on these already running processes\n"
-msgid " -p, --pid <pid(s)> collect information only specified processes\n"
+msgid " -p, --pid <pid(s)> collect information only specified processes\n"
msgstr " -p, --pid <pid>... 对这些已运行的进程操作\n"
-#: misc-utils/lsfd.c:1549
-msgid " -i[4|6], --inet[=4|6] list only IPv4 and/or IPv6 sockets\n"
+#: misc-utils/lsfd.c:1903
+msgid " -i[4|6], --inet[=4|=6] list only IPv4 and/or IPv6 sockets\n"
msgstr ""
-#: misc-utils/lsfd.c:1550
-msgid " -Q, --filter <expr> apply display filter\n"
-msgstr ""
+#: misc-utils/lsfd.c:1904
+#, fuzzy
+#| msgid " -i, --noissue do not display issue file\n"
+msgid " -Q, --filter <expr> apply display filter\n"
+msgstr " -i, --noissue 不显示预登录消息(issue)文件\n"
-#: misc-utils/lsfd.c:1551
-msgid " --debug-filter dump the internal data structure of filter and exit\n"
-msgstr ""
+#: misc-utils/lsfd.c:1905
+#, fuzzy
+#| msgid " --show-issue display issue file and exit\n"
+msgid " --debug-filter dump the internal data structure of filter and exit\n"
+msgstr " --show-issue 显示预登录(issue)文件并退出\n"
-#: misc-utils/lsfd.c:1552
+#: misc-utils/lsfd.c:1906
#, fuzzy
#| msgid " --default use default terminal settings\n"
-msgid ""
-" -C, --counter <name>:<expr>\n"
-" define custom counter for --summary output\n"
+msgid " -C, --counter <name>:<expr> define custom counter for --summary output\n"
msgstr " --default 使用默认终端设置\n"
-#: misc-utils/lsfd.c:1554
-msgid " --dump-counters dump counter definitions\n"
+#: misc-utils/lsfd.c:1907
+#, fuzzy
+#| msgid " -s, --counters print individual counters within functions\n"
+msgid " --dump-counters dump counter definitions\n"
+msgstr " -s, --counters 打印函数内的独立计数\n"
+
+#: misc-utils/lsfd.c:1908
+msgid " --summary[=<when>] print summary information (only, append, or never)\n"
msgstr ""
-#: misc-utils/lsfd.c:1555
-msgid " --summary[=<when>] print summary information (only, append, or never)\n"
+#: misc-utils/lsfd.c:1911
+#, fuzzy
+#| msgid " --list-modes list available modes\n"
+msgid " -H, --list-columns list the available columns\n"
+msgstr " --list-modes 列出可用模式\n"
+
+#: misc-utils/lsfd.c:1915
+#, fuzzy
+#| msgid " -default\n"
+msgid "Default"
+msgstr " -default\n"
+
+#: misc-utils/lsfd.c:1916
+msgid "With --threads"
msgstr ""
-#: misc-utils/lsfd.c:1625
+#: misc-utils/lsfd.c:1998
#, c-format
msgid "too short counter specification: -C/--counter %s"
msgstr ""
-#: misc-utils/lsfd.c:1629 misc-utils/lsfd.c:1635
+#: misc-utils/lsfd.c:2002 misc-utils/lsfd.c:2008
#, c-format
msgid "no name for counter: -C/--counter %s"
msgstr ""
-#: misc-utils/lsfd.c:1639
+#: misc-utils/lsfd.c:2012
#, c-format
msgid "empty counter expression given: -C/--counter %s"
msgstr ""
-#: misc-utils/lsfd.c:1647
+#: misc-utils/lsfd.c:2020
#, c-format
msgid "don't use `{' in the name of a counter: %s"
msgstr ""
-#: misc-utils/lsfd.c:1668
-msgid "failed in making filter for a counter: "
-msgstr ""
-
-#: misc-utils/lsfd.c:1736
+#: misc-utils/lsfd.c:2116
#, fuzzy
#| msgid "failed to allocate output table"
msgid "failed to allocate summary table"
msgstr "分配输出表失败"
-#: misc-utils/lsfd.c:1746
+#: misc-utils/lsfd.c:2126
msgid "VALUE"
msgstr ""
-#: misc-utils/lsfd.c:1748 misc-utils/lsfd.c:1754
+#: misc-utils/lsfd.c:2128 misc-utils/lsfd.c:2134
#, fuzzy
#| msgid "failed to allocate output column"
msgid "failed to allocate summary column"
msgstr "分配输出列失败"
-#: misc-utils/lsfd.c:1752
+#: misc-utils/lsfd.c:2132
msgid "COUNTER"
msgstr ""
-#: misc-utils/lsfd.c:1767 misc-utils/lsfd.c:1769 misc-utils/lsfd.c:1772
+#: misc-utils/lsfd.c:2159
+#, fuzzy
+#| msgid "failed to allocate output table"
+msgid "failed to allocate summary line"
+msgstr "分配输出表失败"
+
+#: misc-utils/lsfd.c:2163 misc-utils/lsfd.c:2165
#, fuzzy
#| msgid "failed to add output data"
msgid "failed to add summary data"
msgstr "添加输出信息失败"
-#: misc-utils/lsfd.c:1909
+#: misc-utils/lsfd.c:2314
#, fuzzy, c-format
#| msgid "unknown argument: %s"
msgid "unknown -i/--inet argument: %s"
msgstr "未知参数:%s"
-#: misc-utils/lsfd.c:1935 sys-utils/lsmem.c:641
+#: misc-utils/lsfd.c:2340 sys-utils/lsmem.c:634
msgid "unsupported --summary argument"
msgstr "不支持的 --summary 参数"
-#: misc-utils/lsfd-file.c:311 misc-utils/namei.c:455 sys-utils/lsns.c:1486
+#: misc-utils/lsfd-file.c:504 misc-utils/namei.c:455 sys-utils/lsns.c:1479
msgid "failed to allocate UID cache"
msgstr "分配 UID 缓存失败"
-#: misc-utils/lsfd-filter.c:417
-#, c-format
-msgid "error: string literal is not terminated: %s"
-msgstr ""
-
-#: misc-utils/lsfd-filter.c:511
-#, c-format
-msgid "error: unbalanced parenthesis: %s"
-msgstr ""
-
-#: 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/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/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/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/lsfd-filter.c:711
-#, c-format
-msgid "error: empty left side expression: %s"
-msgstr ""
-
-#: 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/lsfd-filter.c:737
-#, c-format
-msgid "error: cannot add a column to table: %s"
-msgstr ""
-
-#: misc-utils/lsfd-filter.c:763
-#, fuzzy, c-format
-#| msgid "internal error: unsupported dialog type %d"
-msgid "error: unsupported column data type: %d, column: %s"
-msgstr "内部错误:不支持的对话类型 %d"
-
-#: misc-utils/lsfd-filter.c:808 misc-utils/lsfd-filter.c:838
-#, c-format
-msgid "error: empty right side expression: %s"
-msgstr ""
-
-#: misc-utils/lsfd-filter.c:878
-#, fuzzy
-#| msgid "could not compile regular expression %s: %s"
-msgid "error: empty filter expression"
-msgstr "无法编译正则表达式 %s:%s"
-
-#: misc-utils/lsfd-filter.c:979
-#, fuzzy, c-format
-#| msgid "unexpected end of file on %s"
-msgid "unexpected type in filter application: %s"
-msgstr "%s 上的文件结尾异常"
-
-#: misc-utils/lsfd-filter.c:1080
-#, fuzzy, c-format
-#| msgid "input error: unexpected character %c after %s field"
-msgid "error: unexpected operand type %s for: %s"
-msgstr "输入错误:%2$s 字段后出现异常字符 %1$c"
-
-#: misc-utils/lsfd-filter.c:1203 misc-utils/lsfd-filter.c:1236
-#: misc-utils/lsfd-filter.c:1258
-#, fuzzy, c-format
-#| msgid "input error: unexpected character %c after %s field"
-msgid "error: unexpected left operand type %s for: %s"
-msgstr "输入错误:%2$s 字段后出现异常字符 %1$c"
-
-#: misc-utils/lsfd-filter.c:1211 misc-utils/lsfd-filter.c:1244
-#: misc-utils/lsfd-filter.c:1266
-#, fuzzy, c-format
-#| msgid "input error: unexpected character %c after %s field"
-msgid "error: unexpected right operand type %s for: %s"
-msgstr "输入错误:%2$s 字段后出现异常字符 %1$c"
-
-#: misc-utils/lsfd-filter.c:1273
-#, c-format
-msgid "error: string literal is expected as right operand for: %s"
-msgstr ""
-
-#: misc-utils/lsfd-filter.c:1289
-#, fuzzy, c-format
-#| msgid "could not compile regular expression %s: %s"
-msgid "error: could not compile regular expression %s: %s"
-msgstr "无法编译正则表达式 %s:%s"
-
-#: misc-utils/lsfd-filter.c:1325
-msgid "error: unbalanced parenthesis: ("
-msgstr ""
-
-#: misc-utils/lsfd-filter.c:1331
-#, c-format
-msgid "error: garbage at the end of expression: %s"
-msgstr ""
-
-#: misc-utils/lsfd-filter.c:1337
-#, c-format
-msgid "error: bool expression is expected: %s"
-msgstr ""
-
-#: misc-utils/lsfd.h:232
-#, fuzzy
-#| msgid "failed to allocate memory: %m"
-msgid "failed to allocate memory for string"
-msgstr "分配内存失败:%m"
-
-#: misc-utils/lsfd-sock-xinfo.c:230
+#: misc-utils/lsfd-sock-xinfo.c:245
#, fuzzy
#| msgid "failed to allocate output column"
msgid "failed to alloc path context for /var/run/netns"
msgstr "分配输出列失败"
-#: misc-utils/lslocks.c:75
+#: misc-utils/lslocks.c:80
msgid "command of the process holding the lock"
msgstr "持有锁的进程命令"
-#: misc-utils/lslocks.c:76
+#: misc-utils/lslocks.c:81
msgid "PID of the process holding the lock"
msgstr "持有锁的进程 PID"
-#: misc-utils/lslocks.c:77
+#: misc-utils/lslocks.c:82
msgid "kind of lock"
msgstr "锁的类型"
-#: misc-utils/lslocks.c:78
-msgid "size of the lock"
-msgstr "锁的大小"
+#: misc-utils/lslocks.c:83
+msgid "size of the lock, use <number> if --bytes is given"
+msgstr ""
-#: misc-utils/lslocks.c:81
+#: misc-utils/lslocks.c:86
msgid "lock access mode"
msgstr "锁访问模式"
-#: misc-utils/lslocks.c:82
+#: misc-utils/lslocks.c:87
msgid "mandatory state of the lock: 0 (none), 1 (set)"
msgstr "锁的强制(mandatory)状态:0(未设置),1(设置)"
-#: misc-utils/lslocks.c:83
+#: misc-utils/lslocks.c:88
msgid "relative byte offset of the lock"
msgstr "锁的相对字节偏移量"
-#: misc-utils/lslocks.c:84
+#: misc-utils/lslocks.c:89
msgid "ending offset of the lock"
msgstr "锁的末尾偏移量"
-#: misc-utils/lslocks.c:85
+#: misc-utils/lslocks.c:90
msgid "path of the locked file"
msgstr "锁定文件的路径"
-#: misc-utils/lslocks.c:86
+#: misc-utils/lslocks.c:91
msgid "PID of the process blocking the lock"
msgstr "阻塞锁的进程的 PID"
-#: misc-utils/lslocks.c:234
+#: misc-utils/lslocks.c:92
+#, fuzzy
+#| msgid "size of the lock"
+msgid "HOLDERS of the lock"
+msgstr "锁的大小"
+
+#: misc-utils/lslocks.c:286
#, fuzzy, c-format
#| msgid "failed to parse %s"
msgid "failed to parse '%s'"
msgstr "解析 %s 失败"
-#: misc-utils/lslocks.c:266
+#: misc-utils/lslocks.c:358
msgid "failed to parse ID"
msgstr "解析 ID 失败"
-#: 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:294
-msgid "(undefined)"
-msgstr ""
-
-#: misc-utils/lslocks.c:303
+#: misc-utils/lslocks.c:403
msgid "failed to parse start"
msgstr "解析 起点 失败"
-#: misc-utils/lslocks.c:310
+#: misc-utils/lslocks.c:410
msgid "failed to parse end"
msgstr "解析 终点 失败"
-#: misc-utils/lslocks.c:548
+#: misc-utils/lslocks.c:423
+msgid "(undefined)"
+msgstr ""
+
+#: misc-utils/lslocks.c:813
msgid "List local system locks.\n"
msgstr "列出本地系统锁。\n"
-#: misc-utils/lslocks.c:551
+#: misc-utils/lslocks.c:816
#, 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:553
+#: misc-utils/lslocks.c:818
msgid " -i, --noinaccessible ignore locks without read permissions\n"
msgstr " -i, --noinaccessible 忽略没有读权限的锁\n"
-#: misc-utils/lslocks.c:554 sys-utils/lsns.c:1293 sys-utils/rfkill.c:640
+#: misc-utils/lslocks.c:819 sys-utils/lsns.c:1286 sys-utils/rfkill.c:641
msgid " -n, --noheadings don't print headings\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/lslocks.c:555 sys-utils/lsns.c:1294 sys-utils/rfkill.c:641
-msgid " -o, --output <list> define which output columns to use\n"
-msgstr " -o, --output <list> 定义使用哪个输出列\n"
-
-#: misc-utils/lslocks.c:556 sys-utils/lsns.c:1295 sys-utils/rfkill.c:642
+#: misc-utils/lslocks.c:821 sys-utils/lsns.c:1288 sys-utils/rfkill.c:643
msgid " --output-all output all columns\n"
msgstr " --output-all 输出所有列\n"
-#: misc-utils/lslocks.c:557
+#: misc-utils/lslocks.c:822
msgid " -p, --pid <pid> display only locks held by this process\n"
msgstr " -p, --pid <pid> 只显示由指定进程持有的锁\n"
-#: misc-utils/lslocks.c:558 sys-utils/lsns.c:1298 sys-utils/rfkill.c:643
+#: misc-utils/lslocks.c:823 sys-utils/lsns.c:1291 sys-utils/rfkill.c:644
msgid " -r, --raw use the raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: misc-utils/lslocks.c:623 schedutils/chrt.c:413 schedutils/ionice.c:179
-#: schedutils/taskset.c:190 schedutils/uclampset.c:257 sys-utils/choom.c:102
-#: sys-utils/lsns.c:1388 sys-utils/prlimit.c:604
+#: misc-utils/lslocks.c:910 schedutils/chrt.c:413 schedutils/ionice.c:179
+#: schedutils/taskset.c:190 schedutils/uclampset.c:249 sys-utils/choom.c:102
+#: sys-utils/lsns.c:1381 sys-utils/prlimit.c:598
msgid "invalid PID argument"
msgstr "无效的 PID 参数"
-#: misc-utils/mcookie.c:86
+#: misc-utils/mcookie.c:90
msgid "Generate magic cookies for xauth.\n"
msgstr "为 xauth 生成 magic cookies。\n"
-#: misc-utils/mcookie.c:89
+#: misc-utils/mcookie.c:93
msgid " -f, --file <file> use file as a cookie seed\n"
msgstr " -f, --file <文件> 用指定文件作为 cookie 种子\n"
-#: misc-utils/mcookie.c:90
+#: misc-utils/mcookie.c:94
msgid " -m, --max-size <num> limit how much is read from seed files\n"
msgstr " -m, --max-size <数字> 限制从种子文件读取的大小\n"
-#: misc-utils/mcookie.c:91
+#: misc-utils/mcookie.c:95
msgid " -v, --verbose explain what is being done\n"
msgstr " -v, --verbose 解释正在进行的操作\n"
-#: misc-utils/mcookie.c:97 misc-utils/wipefs.c:656 sys-utils/blkdiscard.c:111
+#: misc-utils/mcookie.c:101 misc-utils/wipefs.c:653 sys-utils/blkdiscard.c:111
#: sys-utils/fallocate.c:107 sys-utils/fstrim.c:475
msgid "<num>"
msgstr ""
-#: misc-utils/mcookie.c:124
+#: misc-utils/mcookie.c:128
#, c-format
msgid "Got %zu byte from %s\n"
msgid_plural "Got %zu bytes from %s\n"
msgstr[0] "从 %2$s 获得 %1$zu 字节\n"
-#: misc-utils/mcookie.c:129
+#: misc-utils/mcookie.c:133
#, c-format
msgid "closing %s failed"
msgstr "关闭 %s 失败"
-#: misc-utils/mcookie.c:168 sys-utils/blkdiscard.c:204 sys-utils/fstrim.c:542
-#: text-utils/hexdump.c:117
+#: misc-utils/mcookie.c:172 sys-utils/blkdiscard.c:204 sys-utils/fstrim.c:542
+#: text-utils/hexdump.c:122
msgid "failed to parse length"
msgstr "解析长度失败"
-#: misc-utils/mcookie.c:181
+#: misc-utils/mcookie.c:185
msgid "--max-size ignored when used without --file"
msgstr "不带 --file 时忽略 --max-size"
-#: misc-utils/mcookie.c:190
+#: misc-utils/mcookie.c:194
#, c-format
msgid "Got %d byte from %s\n"
msgid_plural "Got %d bytes from %s\n"
@@ -13221,7 +13988,7 @@ 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
+#: misc-utils/pipesz.c:296 sys-utils/ipcs.c:313 sys-utils/ipcs.c:538
msgid "size"
msgstr "大小"
@@ -13238,93 +14005,93 @@ msgstr ",就绪"
msgid "using last specified size"
msgstr "mount:类型指定了两次"
-#: misc-utils/rename.c:117
+#: misc-utils/rename.c:113
#, c-format
msgid "%s: overwrite `%s'? "
msgstr ""
-#: misc-utils/rename.c:159 misc-utils/rename.c:224
+#: misc-utils/rename.c:155 misc-utils/rename.c:220
#, c-format
msgid "%s: not accessible"
msgstr "%s:不可访问"
-#: misc-utils/rename.c:168
+#: misc-utils/rename.c:164
#, c-format
msgid "%s: not a symbolic link"
msgstr "%s:不是符号链接"
-#: misc-utils/rename.c:175
+#: misc-utils/rename.c:171
#, c-format
msgid "%s: readlink failed"
msgstr "%s:readlink 失败"
-#: misc-utils/rename.c:191
+#: misc-utils/rename.c:187
#, c-format
msgid "Skipping existing link: `%s' -> `%s'\n"
msgstr "跳过已存在的链接:“%s”->“%s”\n"
-#: misc-utils/rename.c:197
+#: misc-utils/rename.c:193
#, c-format
msgid "%s: unlink failed"
msgstr "%s:unlink 失败"
-#: misc-utils/rename.c:201
+#: misc-utils/rename.c:197
#, c-format
msgid "%s: symlinking to %s failed"
msgstr "%s:符号链接到 %s 失败"
-#: misc-utils/rename.c:240
+#: misc-utils/rename.c:236
#, c-format
msgid "Skipping existing file: `%s'\n"
msgstr "跳过已存在的文件:“%s”\n"
-#: misc-utils/rename.c:244
+#: misc-utils/rename.c:240
#, c-format
msgid "%s: rename to %s failed"
msgstr "%s:重命名为 %s 失败"
-#: misc-utils/rename.c:258
+#: misc-utils/rename.c:254
#, c-format
msgid " %s [options] <expression> <replacement> <file>...\n"
msgstr " %s [选项] <表达式> <替换> <文件>...\n"
-#: misc-utils/rename.c:262
+#: misc-utils/rename.c:258
msgid "Rename files.\n"
msgstr "重命名文件。\n"
-#: misc-utils/rename.c:265
+#: misc-utils/rename.c:261
msgid " -v, --verbose explain what is being done\n"
msgstr " -v, --verbose 解释正在进行的操作\n"
-#: misc-utils/rename.c:266
+#: misc-utils/rename.c:262
msgid " -s, --symlink act on the target of symlinks\n"
msgstr " -s, --symlink 在符号链接的目标上执行操作\n"
-#: misc-utils/rename.c:267
+#: misc-utils/rename.c:263
msgid " -n, --no-act do not make any changes\n"
msgstr " -n, --no-act 不要进行任何修改\n"
-#: misc-utils/rename.c:268
+#: misc-utils/rename.c:264
#, fuzzy
#| msgid " -a, --all print all devices\n"
msgid " -a, --all replace all occurrences\n"
msgstr " -a, --all 打印所有设备\n"
-#: misc-utils/rename.c:269
+#: misc-utils/rename.c:265
#, 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
+#: misc-utils/rename.c:266
msgid " -o, --no-overwrite don't overwrite existing files\n"
msgstr " -o, --no-overwrite 不要覆写已存在的文件\n"
-#: misc-utils/rename.c:271
+#: misc-utils/rename.c:267
msgid " -i, --interactive prompt before overwrite\n"
msgstr " -i, --interactive 覆写之前进行提示\n"
-#: misc-utils/rename.c:361
+#: misc-utils/rename.c:357
msgid "failed to get terminal attributes"
msgstr "取终端属性失败"
@@ -13467,210 +14234,227 @@ msgstr "没有收到文件描述符,请检查 systemctl 状态 uuidd.socket"
msgid "too many file descriptors received, check uuidd.socket"
msgstr "收到太多文件描述符,请检查 uuidd.socket"
-#: 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
+#: misc-utils/uuidd.c:452 text-utils/more.c:1380
msgid "poll failed"
msgstr "轮询失败"
-#: misc-utils/uuidd.c:466
+#: misc-utils/uuidd.c:457
#, c-format
msgid "timeout [%d sec]\n"
msgstr "超时 [%d 秒]\n"
-#: misc-utils/uuidd.c:483 sys-utils/irqtop.c:228 sys-utils/irqtop.c:231
-#: sys-utils/irqtop.c:248 term-utils/setterm.c:923 text-utils/column.c:611
+#: misc-utils/uuidd.c:474 sys-utils/irqtop.c:221 sys-utils/irqtop.c:224
+#: sys-utils/irqtop.c:241 term-utils/setterm.c:923 text-utils/column.c:611
#: text-utils/column.c:641
msgid "read failed"
msgstr "read 失败"
-#: misc-utils/uuidd.c:485
+#: misc-utils/uuidd.c:476
#, c-format
msgid "error reading from client, len = %d"
msgstr "从客户端读取出错,长度 = %d"
-#: misc-utils/uuidd.c:494
+#: misc-utils/uuidd.c:485
#, c-format
msgid "operation %d, incoming num = %d\n"
msgstr "操作 %d,接收数 = %d\n"
-#: misc-utils/uuidd.c:497
+#: misc-utils/uuidd.c:488
#, c-format
msgid "operation %d\n"
msgstr "操作 %d\n"
-#: misc-utils/uuidd.c:512 misc-utils/uuidd.c:533
+#: misc-utils/uuidd.c:503 misc-utils/uuidd.c:524
#, fuzzy
#| msgid "failed to parse logical block size"
msgid "failed to open/lock clock counter"
msgstr "解析逻辑块大小失败"
-#: misc-utils/uuidd.c:515
+#: misc-utils/uuidd.c:506
#, c-format
msgid "Generated time UUID: %s\n"
msgstr "已生成时间 UUID:%s\n"
-#: misc-utils/uuidd.c:525
+#: misc-utils/uuidd.c:516
#, c-format
msgid "Generated random UUID: %s\n"
msgstr "已生成随机 UUID:%s\n"
-#: misc-utils/uuidd.c:536
+#: misc-utils/uuidd.c:527
#, 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:557
+#: misc-utils/uuidd.c:548
#, c-format
msgid "Generated %d UUID:\n"
msgid_plural "Generated %d UUIDs:\n"
msgstr[0] "已生成 %d 个 UUID:\n"
-#: misc-utils/uuidd.c:569
+#: misc-utils/uuidd.c:560
#, c-format
msgid "Invalid operation %d\n"
msgstr "无效操作 %d\n"
-#: misc-utils/uuidd.c:581
+#: misc-utils/uuidd.c:572
#, c-format
msgid "Unexpected reply length from server %d"
msgstr "服务器 %d 响应长度异常"
-#: misc-utils/uuidd.c:601
+#: misc-utils/uuidd.c:592
#, fuzzy
#| msgid "failed to parse column"
msgid "failed to parse --cont-clock/-C"
msgstr "解析列失败"
-#: misc-utils/uuidd.c:652
+#: misc-utils/uuidd.c:643
msgid "failed to parse --uuids"
msgstr "解析 --uuids 失败"
-#: misc-utils/uuidd.c:669
+#: misc-utils/uuidd.c:660
msgid "uuidd has been built without support for socket activation"
msgstr "uuidd 构建时没有添加套接字激活支持"
-#: misc-utils/uuidd.c:688
+#: misc-utils/uuidd.c:679
msgid "failed to parse --timeout"
msgstr "解析 --timeout 失败"
-#: misc-utils/uuidd.c:729
+#: misc-utils/uuidd.c:720
#, c-format
msgid "socket name too long: %s"
msgstr "套接字名称过长:%s"
-#: misc-utils/uuidd.c:736
+#: misc-utils/uuidd.c:727
msgid "Both --socket-activation and --socket specified. Ignoring --socket."
msgstr "同时指定了 --socket-activation 和 --socket。将忽略 --socket"
-#: misc-utils/uuidd.c:747 misc-utils/uuidd.c:782
+#: misc-utils/uuidd.c:738 misc-utils/uuidd.c:773
#, c-format
msgid "error calling uuidd daemon (%s)"
msgstr "调用 uuidd 守护进程(%s)出错"
-#: misc-utils/uuidd.c:748 misc-utils/uuidd.c:783
+#: misc-utils/uuidd.c:739 misc-utils/uuidd.c:774
msgid "unexpected error"
msgstr "意外错误"
-#: misc-utils/uuidd.c:756
+#: misc-utils/uuidd.c:747
#, 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:762
+#: misc-utils/uuidd.c:753
#, c-format
msgid "List of UUIDs:\n"
msgstr "UUID 列表:\n"
-#: misc-utils/uuidd.c:804
+#: misc-utils/uuidd.c:795
#, c-format
msgid "couldn't kill uuidd running at pid %d"
msgstr "无法运行 pid 为 %d 的 uuidd"
-#: misc-utils/uuidd.c:809
+#: misc-utils/uuidd.c:800
#, c-format
msgid "Killed uuidd running at pid %d.\n"
msgstr "已杀死运行 pid 为 %d 的 uuidd。\n"
-#: misc-utils/uuidgen.c:29
+#: misc-utils/uuidgen.c:32
msgid "Create a new UUID value.\n"
msgstr "创建新的 UUID 值。\n"
-#: misc-utils/uuidgen.c:32
+#: misc-utils/uuidgen.c:35
#, fuzzy
#| msgid " -r, --random test random-based generation\n"
-msgid " -r, --random generate random-based uuid\n"
+msgid " -r, --random generate random-based uuid\n"
msgstr " -r, --random 测试基于随机数的生成方式\n"
-#: misc-utils/uuidgen.c:33
-msgid " -t, --time generate time-based uuid\n"
+#: misc-utils/uuidgen.c:36
+#, fuzzy
+#| msgid " -t, --time generate time-based uuid\n"
+msgid " -t, --time generate time-based uuid\n"
msgstr " -t, --time 生成基于时间的 uuid\n"
-#: misc-utils/uuidgen.c:34
-msgid " -n, --namespace ns generate hash-based uuid in this namespace\n"
-msgstr ""
+#: misc-utils/uuidgen.c:37
+#, fuzzy
+#| msgid " -N, --namespace <ns> perform umount in another namespace\n"
+msgid " -n, --namespace <ns> generate hash-based uuid in this namespace\n"
+msgstr " -N, --namespace <ns> 在另一个命名空间进行卸载\n"
-#: misc-utils/uuidgen.c:35
+#: misc-utils/uuidgen.c:38
#, fuzzy, c-format
#| msgid " -a, --all print all devices\n"
-msgid " available namespaces: %s\n"
+msgid " available namespaces: %s\n"
msgstr " -a, --all 打印所有设备\n"
-#: misc-utils/uuidgen.c:36
-msgid " -N, --name name generate hash-based uuid from this name\n"
-msgstr ""
+#: misc-utils/uuidgen.c:39
+#, fuzzy
+#| msgid " -r, --random test random-based generation\n"
+msgid " -N, --name <name> generate hash-based uuid from this name\n"
+msgstr " -r, --random 测试基于随机数的生成方式\n"
-#: misc-utils/uuidgen.c:37
-msgid " -m, --md5 generate md5 hash\n"
+#: misc-utils/uuidgen.c:40
+#, fuzzy
+#| msgid " -m, --md5 generate md5 hash\n"
+msgid " -m, --md5 generate md5 hash\n"
msgstr " -m, --md5 生成 md5 散列\n"
-#: misc-utils/uuidgen.c:38
-msgid " -s, --sha1 generate sha1 hash\n"
+#: misc-utils/uuidgen.c:41
+#, fuzzy
+#| msgid " -n, --uuids <num> request number of uuids\n"
+msgid " -C, --count <num> generate more uuids in loop\n"
+msgstr " -n, --uuids <数值> 请求指定数量的 uuid\n"
+
+#: misc-utils/uuidgen.c:42
+#, fuzzy
+#| msgid " -s, --sha1 generate sha1 hash\n"
+msgid " -s, --sha1 generate sha1 hash\n"
msgstr " -s, --sha1 生成 sha1 散列\n"
-#: misc-utils/uuidgen.c:39
+#: misc-utils/uuidgen.c:43
#, fuzzy
#| msgid " -i, --invert invert the sense of matching\n"
-msgid " -x, --hex interpret name as hex string\n"
+msgid " -x, --hex interpret name as hex string\n"
msgstr " -i, --invert 反转搜索的匹配\n"
-#: misc-utils/uuidgen.c:53
+#: misc-utils/uuidgen.c:57
msgid "not a valid hex string"
msgstr "不是有效的十六进制字符串"
-#: misc-utils/uuidgen.c:144
+#: misc-utils/uuidgen.c:146
+#, fuzzy
+#| msgid "invalid columns argument"
+msgid "invalid count argument"
+msgstr "无效的 列数 参数"
+
+#: misc-utils/uuidgen.c:166
#, fuzzy
#| msgid "%s requires an argument"
msgid "--namespace requires --name argument"
msgstr "%s 需要一个参数"
-#: misc-utils/uuidgen.c:148
+#: misc-utils/uuidgen.c:170
#, fuzzy
#| msgid "--init-groups requires --ruid or --reuid"
msgid "--namespace requires --md5 or --sha1"
msgstr "--init-groups 需要 --ruid 或者 --reuid"
-#: misc-utils/uuidgen.c:153
+#: misc-utils/uuidgen.c:175
msgid "--name requires --namespace argument"
msgstr "--name 需要 --namespace 参数"
-#: misc-utils/uuidgen.c:157
+#: misc-utils/uuidgen.c:179
#, fuzzy
#| msgid "%s requires an argument"
msgid "--md5 or --sha1 requires --namespace argument"
msgstr "%s 需要一个参数"
-#: misc-utils/uuidgen.c:182
+#: misc-utils/uuidgen.c:205
#, c-format
msgid "unknown namespace alias: '%s'"
msgstr "未知的名字空间别名︰“%s”"
-#: misc-utils/uuidgen.c:188
+#: misc-utils/uuidgen.c:211
#, fuzzy, c-format
#| msgid "invalid id: %s"
msgid "invalid uuid for namespace: '%s'"
@@ -13749,114 +14533,114 @@ msgid "sha1-based"
msgstr "基于sha1"
#: misc-utils/uuidparse.c:267 misc-utils/wipefs.c:178
-#: 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
+#: sys-utils/irq-common.c:148 sys-utils/irq-common.c:481 sys-utils/lscpu.c:986
+#: sys-utils/lsns.c:1139 sys-utils/zramctl.c:505
msgid "failed to initialize output column"
msgstr "初始化输出列失败"
-#: misc-utils/waitpid.c:70
+#: misc-utils/waitpid.c:68
#, c-format
msgid "PID %d has exited, skipping"
msgstr ""
-#: misc-utils/waitpid.c:73
+#: misc-utils/waitpid.c:71
#, fuzzy, c-format
#| msgid "could not read: %s"
msgid "could not open pid %u"
msgstr "无法读取︰%s"
-#: misc-utils/waitpid.c:92
+#: misc-utils/waitpid.c:90
#, fuzzy
#| msgid "cannot not create timerfd"
msgid "could not create timerfd"
msgstr "无法创建 timerfd"
-#: misc-utils/waitpid.c:95
+#: misc-utils/waitpid.c:93
#, fuzzy
#| msgid "cannot set timerfd"
msgid "could not set timer"
msgstr "无法设置 timerfd"
-#: misc-utils/waitpid.c:111
+#: misc-utils/waitpid.c:109
#, fuzzy
#| msgid "cannot not create timerfd"
msgid "could not add timerfd"
msgstr "无法创建 timerfd"
-#: misc-utils/waitpid.c:121
+#: misc-utils/waitpid.c:119
#, fuzzy
#| msgid "could not read: %s"
msgid "could not add listener"
msgstr "无法读取︰%s"
-#: misc-utils/waitpid.c:139
+#: misc-utils/waitpid.c:137
msgid "failure during wait"
msgstr ""
-#: misc-utils/waitpid.c:143
+#: misc-utils/waitpid.c:141
#, c-format
msgid "Timeout expired\n"
msgstr ""
-#: misc-utils/waitpid.c:147
+#: misc-utils/waitpid.c:145
#, c-format
msgid "PID %d finished\n"
msgstr ""
-#: misc-utils/waitpid.c:160
+#: misc-utils/waitpid.c:158
#, fuzzy, c-format
#| msgid " %s [options] file...\n"
msgid " %s [options] pid...\n"
msgstr " %s [选项] 文件...\n"
-#: misc-utils/waitpid.c:163
+#: misc-utils/waitpid.c:161
#, fuzzy
#| msgid " -v, --verbose be more verbose\n"
msgid " -v, --verbose be more verbose\n"
msgstr " -v, --verbose 更详尽\n"
-#: misc-utils/waitpid.c:164
+#: misc-utils/waitpid.c:162
#, 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
+#: misc-utils/waitpid.c:163
#, fuzzy
#| msgid " -a, --all print all devices\n"
msgid " -e, --exited allow exited PIDs\n"
msgstr " -a, --all 打印所有设备\n"
-#: misc-utils/waitpid.c:166
+#: misc-utils/waitpid.c:164
#, 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
+#: misc-utils/waitpid.c:202
#, fuzzy
#| msgid "failed to parse --timeout"
msgid "Could not parse timeout"
msgstr "解析 --timeout 失败"
-#: misc-utils/waitpid.c:210
+#: misc-utils/waitpid.c:208
#, fuzzy
#| msgid "invalid block-count"
msgid "Invalid count"
msgstr "无效的块计数"
-#: misc-utils/waitpid.c:237
+#: misc-utils/waitpid.c:235
#, fuzzy
#| msgid "no file specified"
msgid "no PIDs specified"
msgstr "未指定文件"
-#: misc-utils/waitpid.c:241
+#: misc-utils/waitpid.c:239
#, c-format
msgid "can't want for %zu of %zu PIDs"
msgstr ""
-#: misc-utils/waitpid.c:249
+#: misc-utils/waitpid.c:247
#, fuzzy
#| msgid "could not read: %s"
msgid "could not create epoll"
@@ -13973,99 +14757,107 @@ msgstr "%s:创建签名备份失败"
msgid "%s: calling ioctl to re-read partition table: %m\n"
msgstr "%s:将调用 ioctl 来重新读分区表:%m\n"
-#: misc-utils/wipefs.c:542
-msgid "failed to create a signature backup, $HOME undefined"
-msgstr "创建签名备份失败,未定义 $HOME"
-
-#: misc-utils/wipefs.c:560
+#: misc-utils/wipefs.c:557
#, c-format
msgid "%s: ignoring nested \"%s\" partition table on non-whole disk device"
msgstr "%s:忽略 非整盘 设备上的嵌套分区表“%s”"
-#: misc-utils/wipefs.c:589
+#: misc-utils/wipefs.c:586
#, c-format
msgid "%s: offset 0x%jx not found"
msgstr "%s:找不到偏移 0x%jx"
-#: misc-utils/wipefs.c:594
+#: misc-utils/wipefs.c:591
msgid "Use the --force option to force erase."
msgstr "使用 --force 选项强制擦除。"
-#: misc-utils/wipefs.c:597
+#: misc-utils/wipefs.c:594
#, fuzzy, c-format
#| msgid "%s: cannot fflush changes: %s"
msgid "%s: cannot flush modified buffers"
msgstr "%s:无法 fflush 更改:%s"
-#: misc-utils/wipefs.c:636
+#: misc-utils/wipefs.c:633
msgid "Wipe signatures from a device."
msgstr "从设备擦除签名。"
-#: misc-utils/wipefs.c:639
+#: misc-utils/wipefs.c:636
#, fuzzy
#| msgid " -a, --all print all devices\n"
-msgid " -a, --all wipe all magic strings (BE CAREFUL!)"
+msgid " -a, --all wipe all magic strings (BE CAREFUL!)"
msgstr " -a, --all 打印所有设备\n"
-#: misc-utils/wipefs.c:640
+#: misc-utils/wipefs.c:637
#, fuzzy
#| msgid "failed to create a signature backup, $HOME undefined"
-msgid " -b, --backup create a signature backup in $HOME"
+msgid " -b, --backup[=<dir>] create a signature backup in <dir> or $HOME"
msgstr "创建签名备份失败,未定义 $HOME"
-#: misc-utils/wipefs.c:641
-msgid " -f, --force force erasure"
+#: misc-utils/wipefs.c:638
+#, fuzzy
+#| msgid " -f, --force force erasure"
+msgid " -f, --force force erasure"
msgstr " -f, --force 强制擦除"
-#: misc-utils/wipefs.c:642
+#: misc-utils/wipefs.c:639
#, fuzzy
#| msgid " -n, --noheadings don't print headings\n"
-msgid " -i, --noheadings don't print headings"
+msgid " -i, --noheadings don't print headings"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/wipefs.c:643
-msgid " -J, --json use JSON output format"
-msgstr " -J, --json 使用 JSON 输出格式"
+#: misc-utils/wipefs.c:640
+#, fuzzy
+#| msgid " -J, --json use JSON output format\n"
+msgid " -J, --json use JSON output format"
+msgstr " -J, --json 使用 JSON 输出格式\n"
-#: misc-utils/wipefs.c:644
+#: misc-utils/wipefs.c:641
#, fuzzy
#| msgid " --no-act do everything except the write the log\n"
-msgid " -n, --no-act do everything except the actual write() call"
+msgid " -n, --no-act do everything except the actual write() call"
msgstr " --no-act 操作但不实际写入日志\n"
-#: misc-utils/wipefs.c:645
+#: misc-utils/wipefs.c:642
#, fuzzy
#| msgid " -o, --offset <num> offset for range operations, in bytes\n"
-msgid " -o, --offset <num> offset to erase, in bytes"
+msgid " -o, --offset <num> offset to erase, in bytes"
msgstr " -o, --offset <数字> 范围操作的偏移量(字节数)\n"
-#: misc-utils/wipefs.c:646
-msgid " -O, --output <list> COLUMNS to display (see below)"
-msgstr ""
+#: misc-utils/wipefs.c:643
+#, 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/wipefs.c:647
+#: misc-utils/wipefs.c:644
#, fuzzy
#| msgid " -p, --parse[=<list>] print out a parsable format\n"
-msgid " -p, --parsable print out in parsable instead of printable format"
+msgid " -p, --parsable print out in parsable instead of printable format"
msgstr " -p, --parse[=<列表>] 打印可解析格式\n"
-#: misc-utils/wipefs.c:648
-msgid " -q, --quiet suppress output messages"
+#: misc-utils/wipefs.c:645
+#, fuzzy
+#| msgid " -q, --quiet suppress output messages"
+msgid " -q, --quiet suppress output messages"
msgstr " -q, --quiet 禁止输出信息"
-#: misc-utils/wipefs.c:649
+#: misc-utils/wipefs.c:646
#, 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"
+msgid " -t, --types <list> limit the set of filesystem, RAIDs or partition tables"
msgstr " -t, --types <列表> 根据文件系统类型限制文件系统集合\n"
-#: misc-utils/wipefs.c:651
+#: misc-utils/wipefs.c:648
#, 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:770
+#: misc-utils/wipefs.c:718
+msgid "failed to create a signature backup, $HOME undefined"
+msgstr "创建签名备份失败,未定义 $HOME"
+
+#: misc-utils/wipefs.c:774
msgid "The --backup option is meaningless in this context"
msgstr "--backup 在此环境中无意义"
@@ -14444,16 +15236,16 @@ msgstr "获取 pid %d 的亲和力失败"
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
+#: schedutils/taskset.c:213 sys-utils/chcpu.c:300 sys-utils/irqtop.c:319
msgid "cannot determine NR_CPUS; aborting"
msgstr "无法确定 NR_CPUS;将中止"
#: schedutils/taskset.c:222 schedutils/taskset.c:235 sys-utils/chcpu.c:307
-#: sys-utils/irqtop.c:330
+#: sys-utils/irqtop.c:323
msgid "cpuset_alloc failed"
msgstr "cpuset_alloc 失败"
-#: schedutils/taskset.c:242 sys-utils/chcpu.c:234 sys-utils/irqtop.c:333
+#: schedutils/taskset.c:242 sys-utils/chcpu.c:234 sys-utils/irqtop.c:326
#, c-format
msgid "failed to parse CPU list: %s"
msgstr "解析 CPU 列表失败:%s"
@@ -14547,24 +15339,19 @@ msgstr "设置 pid %d 的策略失败"
msgid "util_min must be <= util_max"
msgstr "util_min 必须 <= util_max"
-#: schedutils/uclampset.c:218
-#, c-format
-msgid "%d out of range"
-msgstr "%d 超出范围"
-
-#: schedutils/uclampset.c:269
+#: schedutils/uclampset.c:261
msgid "invalid util_min argument"
msgstr "无效的 util_min 参数"
-#: schedutils/uclampset.c:274
+#: schedutils/uclampset.c:265
msgid "invalid util_max argument"
msgstr "无效的 util_max 参数"
-#: schedutils/uclampset.c:296
+#: schedutils/uclampset.c:286
msgid "missing -p option"
msgstr "缺少 -p 参数"
-#: schedutils/uclampset.c:314
+#: schedutils/uclampset.c:304
msgid "no cmd to execute"
msgstr "无可执行的指令"
@@ -14621,8 +15408,8 @@ msgstr " -z, --zeroout 用 零填充而非丢弃\n"
msgid "%s: %s ioctl failed"
msgstr "%s:%s ioctl 失败"
-#: sys-utils/blkdiscard.c:208 sys-utils/fstrim.c:546 sys-utils/losetup.c:728
-#: text-utils/hexdump.c:124
+#: sys-utils/blkdiscard.c:208 sys-utils/fstrim.c:546 sys-utils/losetup.c:799
+#: text-utils/hexdump.c:129
msgid "failed to parse offset"
msgstr "解析偏移失败"
@@ -14631,7 +15418,7 @@ msgid "failed to parse step"
msgstr "解析步长失败"
#: sys-utils/blkdiscard.c:242 sys-utils/blkpr.c:307 sys-utils/blkzone.c:492
-#: sys-utils/fallocate.c:382 sys-utils/fsfreeze.c:110 sys-utils/fstrim.c:577
+#: sys-utils/fallocate.c:384 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 "参数数量异常"
@@ -14919,7 +15706,7 @@ msgstr "解析行数失败"
msgid "failed to parse zone offset"
msgstr "解析偏移失败"
-#: sys-utils/blkzone.c:485 sys-utils/setsid.c:92
+#: sys-utils/blkzone.c:485 sys-utils/setpgid.c:66 sys-utils/setsid.c:94
msgid "no command specified"
msgstr "没有指定命令"
@@ -15186,7 +15973,7 @@ msgstr "%s 启用失败"
msgid "%s disable failed"
msgstr "%s 禁用失败"
-#: sys-utils/chmem.c:274 sys-utils/lsmem.c:503
+#: sys-utils/chmem.c:274 sys-utils/lsmem.c:496
#, c-format
msgid "Failed to read %s"
msgstr "无法读取 %s"
@@ -15299,7 +16086,7 @@ msgstr ""
"\n"
"支持的日志设施:\n"
-#: sys-utils/chmem.c:394 sys-utils/lscpu-cputype.c:891 sys-utils/lsmem.c:667
+#: sys-utils/chmem.c:394 sys-utils/lscpu-cputype.c:904 sys-utils/lsmem.c:660
#, fuzzy, c-format
#| msgid "%s: failed to initialize sysfs handler"
msgid "failed to initialize %s handler"
@@ -15404,253 +16191,332 @@ msgstr "设置数据失败"
msgid "pid %d's OOM score adjust value changed from %d to %d\n"
msgstr ""
-#: sys-utils/ctrlaltdel.c:28
+#: sys-utils/ctrlaltdel.c:34
#, c-format
msgid " %s hard|soft\n"
msgstr " %s hard|soft\n"
-#: sys-utils/ctrlaltdel.c:31
+#: sys-utils/ctrlaltdel.c:37
#, c-format
msgid "Set the function of the Ctrl-Alt-Del combination.\n"
msgstr "设置 Ctrl-Alt-Del 组合键的功能。\n"
-#: sys-utils/ctrlaltdel.c:54
+#: sys-utils/ctrlaltdel.c:60
msgid "implicit"
msgstr "隐含"
-#: sys-utils/ctrlaltdel.c:55
+#: sys-utils/ctrlaltdel.c:61
#, c-format
msgid "unexpected value in %s: %ju"
msgstr "%s 有异常值:%ju"
-#: sys-utils/ctrlaltdel.c:66
-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:396 sys-utils/ipcrm.c:419
+#: sys-utils/ctrlaltdel.c:76 sys-utils/ipcrm.c:401 sys-utils/ipcrm.c:424
#, c-format
msgid "unknown argument: %s"
msgstr "未知参数:%s"
-#: sys-utils/dmesg.c:110
+#: sys-utils/dmesg.c:124
msgid "system is unusable"
msgstr "系统无法使用"
-#: sys-utils/dmesg.c:111
+#: sys-utils/dmesg.c:125
msgid "action must be taken immediately"
msgstr "操作必须立即执行"
-#: sys-utils/dmesg.c:112
+#: sys-utils/dmesg.c:126
msgid "critical conditions"
msgstr "紧急条件"
-#: sys-utils/dmesg.c:113
+#: sys-utils/dmesg.c:127
msgid "error conditions"
msgstr "错误条件"
-#: sys-utils/dmesg.c:114
+#: sys-utils/dmesg.c:128
msgid "warning conditions"
msgstr "警告条件"
-#: sys-utils/dmesg.c:115
+#: sys-utils/dmesg.c:129
msgid "normal but significant condition"
msgstr "正常但重要的条件"
-#: sys-utils/dmesg.c:116
+#: sys-utils/dmesg.c:130
msgid "informational"
msgstr "信息"
-#: sys-utils/dmesg.c:117
+#: sys-utils/dmesg.c:131
msgid "debug-level messages"
msgstr "调试级别的消息"
-#: sys-utils/dmesg.c:131
+#: sys-utils/dmesg.c:146
msgid "kernel messages"
msgstr "内核消息"
-#: sys-utils/dmesg.c:132
+#: sys-utils/dmesg.c:147
msgid "random user-level messages"
msgstr "随机的用户级消息"
-#: sys-utils/dmesg.c:133
+#: sys-utils/dmesg.c:148
msgid "mail system"
msgstr "邮件系统"
-#: sys-utils/dmesg.c:134
+#: sys-utils/dmesg.c:149
msgid "system daemons"
msgstr "系统守护进程"
-#: sys-utils/dmesg.c:135
+#: sys-utils/dmesg.c:150
msgid "security/authorization messages"
msgstr "安全/认证消息"
-#: sys-utils/dmesg.c:136
+#: sys-utils/dmesg.c:151
msgid "messages generated internally by syslogd"
msgstr "syslogd 内部生成的消息"
-#: sys-utils/dmesg.c:137
+#: sys-utils/dmesg.c:152
msgid "line printer subsystem"
msgstr "行打印机子系统"
-#: sys-utils/dmesg.c:138
+#: sys-utils/dmesg.c:153
msgid "network news subsystem"
msgstr "网络新闻子系统"
-#: sys-utils/dmesg.c:139
+#: sys-utils/dmesg.c:154
msgid "UUCP subsystem"
msgstr "UUCP 子系统"
-#: sys-utils/dmesg.c:140
+#: sys-utils/dmesg.c:155
msgid "clock daemon"
msgstr "时钟守护进程"
-#: sys-utils/dmesg.c:141
+#: sys-utils/dmesg.c:156
msgid "security/authorization messages (private)"
msgstr "安全/认证消息(私有)"
-#: sys-utils/dmesg.c:142
+#: sys-utils/dmesg.c:157
msgid "FTP daemon"
msgstr "FTP 守护进程"
-#: sys-utils/dmesg.c:285
+#: sys-utils/dmesg.c:158
+#, fuzzy
+#| msgid "noreserve"
+msgid "reserved 0"
+msgstr "noreserve"
+
+#: sys-utils/dmesg.c:159
+#, fuzzy
+#| msgid "noreserve"
+msgid "reserved 1"
+msgstr "noreserve"
+
+#: sys-utils/dmesg.c:160
+#, fuzzy
+#| msgid "noreserve"
+msgid "reserved 2"
+msgstr "noreserve"
+
+#: sys-utils/dmesg.c:161
+#, fuzzy
+#| msgid "noreserve"
+msgid "reserved 3"
+msgstr "noreserve"
+
+#: sys-utils/dmesg.c:162
+#, fuzzy
+#| msgid "local"
+msgid "local use 0"
+msgstr "当地"
+
+#: sys-utils/dmesg.c:163
+#, fuzzy
+#| msgid "local"
+msgid "local use 1"
+msgstr "当地"
+
+#: sys-utils/dmesg.c:164
+#, fuzzy
+#| msgid "local"
+msgid "local use 2"
+msgstr "当地"
+
+#: sys-utils/dmesg.c:165
+#, fuzzy
+#| msgid "local"
+msgid "local use 3"
+msgstr "当地"
+
+#: sys-utils/dmesg.c:166
+#, fuzzy
+#| msgid "local"
+msgid "local use 4"
+msgstr "当地"
+
+#: sys-utils/dmesg.c:167
+#, fuzzy
+#| msgid "local"
+msgid "local use 5"
+msgstr "当地"
+
+#: sys-utils/dmesg.c:168
+#, fuzzy
+#| msgid "local"
+msgid "local use 6"
+msgstr "当地"
+
+#: sys-utils/dmesg.c:169
+#, fuzzy
+#| msgid "local"
+msgid "local use 7"
+msgstr "当地"
+
+#: sys-utils/dmesg.c:320
msgid "Display or control the kernel ring buffer.\n"
msgstr "显示或控制内核环形缓冲区。\n"
-#: sys-utils/dmesg.c:288
+#: sys-utils/dmesg.c:323
msgid " -C, --clear clear the kernel ring buffer\n"
msgstr " -C, --clear 清除内核环形缓冲区(ring butter)\n"
-#: sys-utils/dmesg.c:289
+#: sys-utils/dmesg.c:324
msgid " -c, --read-clear read and clear all messages\n"
msgstr " -c, --read-clear 读取并清除所有消息\n"
-#: sys-utils/dmesg.c:290
+#: sys-utils/dmesg.c:325
msgid " -D, --console-off disable printing messages to console\n"
msgstr " -D, --console-off 禁止向终端打印消息\n"
-#: sys-utils/dmesg.c:291
+#: sys-utils/dmesg.c:326
msgid " -E, --console-on enable printing messages to console\n"
msgstr " -E, --console-on 启用向终端打印消息\n"
-#: sys-utils/dmesg.c:292
+#: sys-utils/dmesg.c:327
msgid " -F, --file <file> use the file instead of the kernel log buffer\n"
msgstr " -F, --file <文件> 用 文件 代替内核日志缓冲区\n"
-#: sys-utils/dmesg.c:293
+#: sys-utils/dmesg.c:328
+#, fuzzy
+#| msgid " -F, --file <file> use the file instead of the kernel log buffer\n"
+msgid " -K, --kmsg-file <file> use the file in kmsg format\n"
+msgstr " -F, --file <文件> 用 文件 代替内核日志缓冲区\n"
+
+#: sys-utils/dmesg.c:329
msgid " -f, --facility <list> restrict output to defined facilities\n"
msgstr " -f, --facility <列表> 将输出限制为定义的设施\n"
-#: sys-utils/dmesg.c:294
+#: sys-utils/dmesg.c:330
msgid " -H, --human human readable output\n"
msgstr " -H, --human 易读格式输出\n"
-#: sys-utils/dmesg.c:295
+#: sys-utils/dmesg.c:331
#, 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:296
+#: sys-utils/dmesg.c:332
msgid " -k, --kernel display kernel messages\n"
msgstr " -k, --kernel 显示内核消息\n"
-#: sys-utils/dmesg.c:298
+#: sys-utils/dmesg.c:334
#, 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:301
+#: sys-utils/dmesg.c:337
msgid " -l, --level <list> restrict output to defined levels\n"
msgstr " -l, --level <列表> 限制输出级别\n"
-#: sys-utils/dmesg.c:302
+#: sys-utils/dmesg.c:338
msgid " -n, --console-level <level> set level of messages printed to console\n"
msgstr " -n, --console-level <级别> 设置打印到终端的消息级别\n"
-#: sys-utils/dmesg.c:303
+#: sys-utils/dmesg.c:339
msgid " -P, --nopager do not pipe output into a pager\n"
msgstr " -P, --nopager 不将输出通过管道传递给分页程序\n"
-#: sys-utils/dmesg.c:304
+#: sys-utils/dmesg.c:340
msgid " -p, --force-prefix force timestamp output on each line of multi-line messages\n"
msgstr ""
-#: sys-utils/dmesg.c:305
+#: sys-utils/dmesg.c:341
msgid " -r, --raw print the raw message buffer\n"
msgstr " -r, --raw 打印原生消息缓冲区\n"
-#: sys-utils/dmesg.c:306
+#: sys-utils/dmesg.c:342
#, 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:307
+#: sys-utils/dmesg.c:343
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:308
+#: sys-utils/dmesg.c:344
msgid " -s, --buffer-size <size> buffer size to query the kernel ring buffer\n"
msgstr " -s, --buffer-size <大小> 查询内核环形缓冲区所用的缓冲区大小\n"
-#: sys-utils/dmesg.c:309
+#: sys-utils/dmesg.c:345
msgid " -u, --userspace display userspace messages\n"
msgstr " -u, --userspace 显示用户空间消息\n"
-#: sys-utils/dmesg.c:310
+#: sys-utils/dmesg.c:346
msgid " -w, --follow wait for new messages\n"
msgstr " -w, --follow 等待新消息\n"
-#: sys-utils/dmesg.c:311
+#: sys-utils/dmesg.c:347
#, 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:312
+#: sys-utils/dmesg.c:348
msgid " -x, --decode decode facility and level to readable string\n"
msgstr " -x, --decode 将设施和级别解码为可读的字符串\n"
-#: sys-utils/dmesg.c:313
+#: sys-utils/dmesg.c:349
msgid " -d, --show-delta show time delta between printed messages\n"
msgstr " -d, --show-delta 显示打印消息之间的时间差\n"
-#: sys-utils/dmesg.c:314
+#: sys-utils/dmesg.c:350
msgid " -e, --reltime show local time and time delta in readable format\n"
msgstr " -e, --reltime 以易读格式显示本地时间和时间差\n"
-#: sys-utils/dmesg.c:315
+#: sys-utils/dmesg.c:351
msgid " -T, --ctime show human-readable timestamp (may be inaccurate!)\n"
msgstr " -T, --ctime 显示易读的时间戳(可能不准确!)\n"
-#: sys-utils/dmesg.c:316
+#: sys-utils/dmesg.c:352
msgid " -t, --notime don't show any timestamp with messages\n"
msgstr " -t, --notime 不显示任何消息的时间戳\n"
-#: sys-utils/dmesg.c:317
+#: sys-utils/dmesg.c:353
+#, fuzzy
+#| msgid ""
+#| " --time-format <format> show timestamp using the given format:\n"
+#| " [delta|reltime|ctime|notime|iso]\n"
+#| "Suspending/resume will make ctime and iso timestamps inaccurate.\n"
msgid ""
" --time-format <format> show timestamp using the given format:\n"
-" [delta|reltime|ctime|notime|iso]\n"
+" [delta|reltime|ctime|notime|iso|raw]\n"
"Suspending/resume will make ctime and iso timestamps inaccurate.\n"
msgstr ""
" --time-format <格式> 以指定格式显示时间戳:\n"
" [delta|reltime|ctime|notime|iso]\n"
"挂起/恢复会使 ctime 和 iso 时间戳不精确。\n"
-#: sys-utils/dmesg.c:320
+#: sys-utils/dmesg.c:356
#, 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:321
+#: sys-utils/dmesg.c:357
#, 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:325
+#: sys-utils/dmesg.c:361
msgid ""
"\n"
"Supported log facilities:\n"
@@ -15658,7 +16524,7 @@ msgstr ""
"\n"
"支持的日志设施:\n"
-#: sys-utils/dmesg.c:331
+#: sys-utils/dmesg.c:367
msgid ""
"\n"
"Supported log levels (priorities):\n"
@@ -15666,27 +16532,27 @@ msgstr ""
"\n"
"支持的日志级别(优先级):\n"
-#: sys-utils/dmesg.c:385
+#: sys-utils/dmesg.c:469
#, c-format
msgid "failed to parse level '%s'"
msgstr "解析级别“%s”失败"
-#: sys-utils/dmesg.c:387
+#: sys-utils/dmesg.c:471
#, c-format
msgid "unknown level '%s'"
msgstr "未知级别“%s”"
-#: sys-utils/dmesg.c:423
+#: sys-utils/dmesg.c:507
#, c-format
msgid "failed to parse facility '%s'"
msgstr "解析设施“%s”失败"
-#: sys-utils/dmesg.c:425
+#: sys-utils/dmesg.c:509
#, c-format
msgid "unknown facility '%s'"
msgstr "未知设施“%s”"
-#: sys-utils/dmesg.c:553
+#: sys-utils/dmesg.c:677
#, c-format
msgid "cannot mmap: %s"
msgstr "无法 mmap:%s"
@@ -15695,38 +16561,44 @@ msgstr "无法 mmap:%s"
#. 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:869
+#: sys-utils/dmesg.c:1049
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:879
+#: sys-utils/dmesg.c:1059
msgid "%b%e %H:%M"
msgstr ""
-#: sys-utils/dmesg.c:1532
+#: sys-utils/dmesg.c:1569
+#, fuzzy
+#| msgid "data block too large"
+msgid "record too large"
+msgstr "数据块过大"
+
+#: sys-utils/dmesg.c:1795
msgid "invalid buffer size argument"
msgstr "无效的 缓冲区大小 参数"
-#: sys-utils/dmesg.c:1618
-msgid "--show-delta is ignored when used together with iso8601 time format"
-msgstr "--show-delta 与 iso8601 时间格式共用时将忽略"
-
-#: sys-utils/dmesg.c:1642
+#: sys-utils/dmesg.c:1915
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:1662
+#: sys-utils/dmesg.c:1919
+msgid "only kmsg supports multi-line messages"
+msgstr ""
+
+#: sys-utils/dmesg.c:1934
msgid "read kernel buffer failed"
msgstr "读取内核缓冲区失败"
-#: sys-utils/dmesg.c:1670
+#: sys-utils/dmesg.c:1942
msgid "clear kernel buffer failed"
msgstr "清除内核缓冲区失败"
-#: sys-utils/dmesg.c:1686
+#: sys-utils/dmesg.c:1958
msgid "klogctl failed"
msgstr "klogctl 失败"
@@ -15890,8 +16762,8 @@ msgstr "不是 sg 设备,或为旧 sg 驱动"
msgid "%s: unmounting"
msgstr "%s:正在卸载"
-#: sys-utils/eject.c:662 sys-utils/mount.c:59 sys-utils/umount.c:122
-#: text-utils/more.c:1271
+#: sys-utils/eject.c:662 sys-utils/mount.c:51 sys-utils/umount.c:122
+#: text-utils/more.c:1268
#, fuzzy
#| msgid "permission denied"
msgid "drop permissions failed"
@@ -16133,51 +17005,51 @@ msgstr "%s:read 失败"
msgid "%s: %s (%ju bytes) converted to sparse holes.\n"
msgstr "%s:已将 %s(%ju 字节) 转换为稀疏空洞。\n"
-#: sys-utils/fallocate.c:361
+#: sys-utils/fallocate.c:363
msgid "posix_fallocate support is not compiled"
msgstr ""
-#: sys-utils/fallocate.c:377 sys-utils/fsfreeze.c:106
+#: sys-utils/fallocate.c:379 sys-utils/fsfreeze.c:106
msgid "no filename specified"
msgstr "未指定文件名"
-#: sys-utils/fallocate.c:389 sys-utils/fallocate.c:395
+#: sys-utils/fallocate.c:391 sys-utils/fallocate.c:397
msgid "invalid length value specified"
msgstr "指定的长度值无效"
-#: sys-utils/fallocate.c:393
+#: sys-utils/fallocate.c:395
msgid "no length argument specified"
msgstr "没有指定长度参数"
-#: sys-utils/fallocate.c:398
+#: sys-utils/fallocate.c:400
msgid "invalid offset value specified"
msgstr "指定的偏移值无效"
-#: sys-utils/fallocate.c:421
+#: sys-utils/fallocate.c:423
#, 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
+#: sys-utils/fallocate.c:426
#, 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
+#: sys-utils/fallocate.c:429
#, 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
+#: sys-utils/fallocate.c:432
#, 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
+#: sys-utils/fallocate.c:435
#, fuzzy, c-format
#| msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
msgid "%s: %s (%ju bytes) allocated.\n"
@@ -16363,7 +17235,7 @@ msgstr "%s:%s (%<PRIu64> 字节) 已修剪\n"
msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
msgstr "%s:%s (%<PRIu64> 字节) 已修剪\n"
-#: sys-utils/fstrim.c:290 sys-utils/lsns.c:1494 sys-utils/swapon.c:746
+#: sys-utils/fstrim.c:290 sys-utils/lsns.c:1487 sys-utils/swapon.c:759
#: sys-utils/umount.c:271
#, c-format
msgid "failed to parse %s"
@@ -16457,20 +17329,20 @@ msgstr "解析 最小范围长度 失败"
msgid "no mountpoint specified"
msgstr "未指定挂载点"
-#: sys-utils/hwclock.c:215
+#: sys-utils/hwclock.c:222
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "将假设硬件时钟保持为 %s 时间。\n"
-#: sys-utils/hwclock.c:216 sys-utils/hwclock.c:286
+#: sys-utils/hwclock.c:223 sys-utils/hwclock.c:293
msgid "UTC"
msgstr "UTC"
-#: sys-utils/hwclock.c:216 sys-utils/hwclock.c:285
+#: sys-utils/hwclock.c:223 sys-utils/hwclock.c:292
msgid "local"
msgstr "当地"
-#: sys-utils/hwclock.c:258 sys-utils/hwclock.c:261
+#: sys-utils/hwclock.c:265 sys-utils/hwclock.c:268
#, fuzzy, c-format
#| msgid ""
#| "Warning: unrecognized third line in adjtime file\n"
@@ -16480,7 +17352,7 @@ msgstr ""
"警告:adjtime 文件第三行无法识别\n"
"(应为:“UTC”或“LOCAL”或空)"
-#: sys-utils/hwclock.c:273
+#: sys-utils/hwclock.c:280
msgid ""
"Warning: unrecognized third line in adjtime file\n"
"(Expected: `UTC' or `LOCAL' or nothing.)"
@@ -16488,84 +17360,84 @@ msgstr ""
"警告:adjtime 文件第三行无法识别\n"
"(应为:“UTC”或“LOCAL”或空)"
-#: sys-utils/hwclock.c:279
+#: sys-utils/hwclock.c:286
#, 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:281
+#: sys-utils/hwclock.c:288
#, 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:283
+#: sys-utils/hwclock.c:290
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "硬件时钟为 %s 时间\n"
-#: sys-utils/hwclock.c:310
+#: sys-utils/hwclock.c:317
#, c-format
msgid "Waiting for clock tick...\n"
msgstr "正在等待时钟滴答...\n"
-#: sys-utils/hwclock.c:316
+#: sys-utils/hwclock.c:323
#, c-format
msgid "...synchronization failed\n"
msgstr "...同步失败\n"
-#: sys-utils/hwclock.c:318
+#: sys-utils/hwclock.c:325
#, c-format
msgid "...got clock tick\n"
msgstr "...已获取时钟滴答\n"
-#: sys-utils/hwclock.c:359
+#: sys-utils/hwclock.c:366
#, 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:366
+#: sys-utils/hwclock.c:373
#, 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:392
+#: sys-utils/hwclock.c:399
#, 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:419
+#: sys-utils/hwclock.c:426
#, 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:455
+#: sys-utils/hwclock.c:462
#, c-format
msgid "RTC type: '%s'\n"
msgstr "RTC 类型:“%s”\n"
-#: sys-utils/hwclock.c:555
+#: sys-utils/hwclock.c:562
#, fuzzy, c-format
#| msgid "%s %.6f seconds\n"
msgid "Using delay: %.6f seconds\n"
msgstr "%s %.6f 秒\n"
-#: sys-utils/hwclock.c:574
+#: sys-utils/hwclock.c:581
#, 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:596
+#: sys-utils/hwclock.c:603
#, 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:623
+#: sys-utils/hwclock.c:630
#, fuzzy, c-format
#| msgid ""
#| "%ld.%06ld is close enough to %ld.%06ld (%.6f < %.6f)\n"
@@ -16577,39 +17449,39 @@ msgstr ""
"%ld.%06d 距 %ld.%06d 太近(%.6f < %.6f)\n"
"请将 RTC 设为 %ld (%ld + %d; refsystime = %ld.%06d)\n"
-#: sys-utils/hwclock.c:717
+#: sys-utils/hwclock.c:724
#, 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:720
+#: sys-utils/hwclock.c:727
#, 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:724
+#: sys-utils/hwclock.c:731
#, c-format
msgid "Calling settimeofday(NULL, %d) to warp System time, set PCIL and the kernel tz.\n"
msgstr ""
-#: sys-utils/hwclock.c:729
+#: sys-utils/hwclock.c:736
#, 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:751
+#: sys-utils/hwclock.c:758
msgid "settimeofday() failed"
msgstr "settimeofday() 失败"
-#: sys-utils/hwclock.c:775
+#: sys-utils/hwclock.c:782
#, c-format
msgid "Not adjusting drift factor because the --update-drift option was not used.\n"
msgstr "将不调整漂移系数,因为没有使用 --update-drift 选项。\n"
-#: sys-utils/hwclock.c:779
+#: sys-utils/hwclock.c:786
#, c-format
msgid ""
"Not adjusting drift factor because last calibration time is zero,\n"
@@ -16618,12 +17490,12 @@ msgstr ""
"将不调整漂移系数,因为上次校准时间为零,\n"
"历史有问题;需要启动校准。\n"
-#: sys-utils/hwclock.c:785
+#: sys-utils/hwclock.c:792
#, 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:823
+#: sys-utils/hwclock.c:830
#, c-format
msgid ""
"Clock drift factor was calculated as %f seconds/day.\n"
@@ -16632,7 +17504,7 @@ msgstr ""
"时钟漂移系数会按 %f 秒/天计算。\n"
"系数过大,将重置为 0。\n"
-#: sys-utils/hwclock.c:830
+#: sys-utils/hwclock.c:837
#, fuzzy, c-format
#| msgid ""
#| "Clock drifted %f seconds in the past %f seconds\n"
@@ -16644,7 +17516,7 @@ msgid ""
"Adjusting drift factor by %f seconds/day\n"
msgstr "在过去的 %2$d 秒内,时钟漂移了 %1$.1f 秒,而漂移系数为 %3$f 秒/天。会将漂移系数调整 %4$f 秒/天\n"
-#: sys-utils/hwclock.c:874
+#: sys-utils/hwclock.c:881
#, fuzzy, c-format
#| msgid "Time since last adjustment is %d second\n"
#| msgid_plural "Time since last adjustment is %d seconds\n"
@@ -16652,465 +17524,515 @@ 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:878
+#: sys-utils/hwclock.c:885
#, 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:903
+#: sys-utils/hwclock.c:910
#, c-format
msgid ""
"New %s data:\n"
"%s"
msgstr ""
-#: sys-utils/hwclock.c:920
+#: sys-utils/hwclock.c:927
#, c-format
msgid "cannot update %s"
msgstr "无法更新 %s"
-#: sys-utils/hwclock.c:956
+#: sys-utils/hwclock.c:963
#, c-format
msgid "Not setting clock because last adjustment time is zero, so history is bad.\n"
msgstr "将不设置时钟,因为上次调整时间为零,历史有误。\n"
-#: sys-utils/hwclock.c:960
+#: sys-utils/hwclock.c:967
#, c-format
msgid "Not setting clock because drift factor %f is far too high.\n"
msgstr "将不设置时钟,因为上次漂移系数 %f 过高。\n"
-#: sys-utils/hwclock.c:990
+#: sys-utils/hwclock.c:997
#, c-format
msgid "No usable clock interface found.\n"
msgstr "未找到可用的时钟接口。\n"
-#: sys-utils/hwclock.c:992
+#: sys-utils/hwclock.c:999
msgid "Cannot access the Hardware Clock via any known method."
msgstr "无法通过已知的任何方式访问硬件时钟。"
-#: sys-utils/hwclock.c:996
+#: sys-utils/hwclock.c:1003
#, 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:1046
+#: sys-utils/hwclock.c:1053
#, c-format
msgid "Target date: %<PRId64>\n"
msgstr ""
-#: sys-utils/hwclock.c:1047
+#: sys-utils/hwclock.c:1054
#, c-format
msgid "Predicted RTC: %<PRId64>\n"
msgstr ""
-#: sys-utils/hwclock.c:1077
+#: sys-utils/hwclock.c:1084
msgid "RTC read returned an invalid value."
msgstr ""
-#: sys-utils/hwclock.c:1107
+#: sys-utils/hwclock.c:1114
#, c-format
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr "需要的调整不到一秒,将不设置时钟。\n"
-#: sys-utils/hwclock.c:1144
+#: sys-utils/hwclock.c:1151
#, fuzzy
#| msgid "unable to read super block"
msgid "unable to read the RTC epoch."
msgstr "不能读超级块"
-#: sys-utils/hwclock.c:1146
+#: sys-utils/hwclock.c:1153
#, c-format
msgid "The RTC epoch is set to %lu.\n"
msgstr ""
-#: sys-utils/hwclock.c:1149
+#: sys-utils/hwclock.c:1156
msgid "--epoch is required for --setepoch."
msgstr ""
-#: sys-utils/hwclock.c:1152
+#: sys-utils/hwclock.c:1159
#, fuzzy
#| msgid "Unable to set system clock.\n"
msgid "unable to set the RTC epoch."
msgstr "无法设置系统时钟。\n"
-#: sys-utils/hwclock.c:1165
+#: sys-utils/hwclock.c:1172
#, fuzzy, c-format
#| msgid "unable to read super block"
msgid "unable to read the RTC parameter %s"
msgstr "不能读超级块"
-#: sys-utils/hwclock.c:1170
+#: sys-utils/hwclock.c:1177
#, c-format
msgid "The RTC parameter 0x%jx is set to 0x%jx.\n"
msgstr ""
-#: sys-utils/hwclock.c:1198
+#: sys-utils/hwclock.c:1219
#, fuzzy, c-format
#| msgid " hwclock [function] [option...]\n"
msgid " %s [function] [option...]\n"
msgstr " hwclock [功能] [选项...]\n"
-#: sys-utils/hwclock.c:1201
+#: sys-utils/hwclock.c:1222
msgid "Time clocks utility."
msgstr ""
-#: sys-utils/hwclock.c:1204
+#: sys-utils/hwclock.c:1225
#, fuzzy
#| msgid " -r, --show display the RTC time"
msgid " -r, --show display the RTC time"
msgstr " -r, --show 显示 RTC 时间"
-#: sys-utils/hwclock.c:1205
+#: sys-utils/hwclock.c:1226
#, fuzzy
#| msgid " -Z, --context display SELinux contexts\n"
msgid " --get display drift corrected RTC time"
msgstr " -Z, --context 显示 SELinux 环境\n"
-#: sys-utils/hwclock.c:1206
+#: sys-utils/hwclock.c:1227
#, fuzzy
#| msgid " -r, --reset reset the port\n"
msgid " --set set the RTC according to --date"
msgstr " -r, --reset 重置端口\n"
-#: sys-utils/hwclock.c:1207
+#: sys-utils/hwclock.c:1228
#, 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:1208
+#: sys-utils/hwclock.c:1229
#, fuzzy
#| msgid " -t, --types <list> limit the set of filesystem types\n"
msgid " -w, --systohc set the RTC from the system time"
msgstr " -t, --types <列表> 限制文件系统集合\n"
-#: sys-utils/hwclock.c:1209
+#: sys-utils/hwclock.c:1230
#, fuzzy
#| msgid " set vesa powersaving features\n"
msgid " --systz send timescale configurations to the kernel"
msgstr " 设置 vesa 节能功能\n"
-#: sys-utils/hwclock.c:1210
+#: sys-utils/hwclock.c:1231
#, 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:1212
+#: sys-utils/hwclock.c:1233
#, fuzzy
#| msgid " --help display this help and exit\n"
msgid " --getepoch display the RTC epoch"
msgstr " --help 显示此帮助并退出\n"
-#: sys-utils/hwclock.c:1213
+#: sys-utils/hwclock.c:1234
#, 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
+#: sys-utils/hwclock.c:1237
#, fuzzy
#| msgid " --help display this help and exit\n"
msgid " --param-get <param> display the RTC parameter"
msgstr " --help 显示此帮助并退出\n"
-#: sys-utils/hwclock.c:1217
+#: sys-utils/hwclock.c:1238
msgid " --param-set <param>=<value> set the RTC parameter"
msgstr ""
-#: sys-utils/hwclock.c:1219
+#: sys-utils/hwclock.c:1239
+#, fuzzy
+#| msgid " --raw use raw status output format\n"
+msgid " --vl-read read voltage low information"
+msgstr " --raw 使用原生状态输出格式\n"
+
+#: sys-utils/hwclock.c:1240
+#, fuzzy
+#| msgid " -C, --clear clear the kernel ring buffer\n"
+msgid " --vl-clear clear voltage low information"
+msgstr " -C, --clear 清除内核环形缓冲区(ring butter)\n"
+
+#: sys-utils/hwclock.c:1242
#, fuzzy
#| msgid " -r, --reset reset the port\n"
msgid " --predict predict the drifted RTC time according to --date"
msgstr " -r, --reset 重置端口\n"
-#: sys-utils/hwclock.c:1221
+#: sys-utils/hwclock.c:1244
#, 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:1222
+#: sys-utils/hwclock.c:1245
#, fuzzy
#| msgid " -l, --local RTC uses local timezone\n"
msgid " -l, --localtime the RTC timescale is Local"
msgstr " -l, --local RTC 使用本地时区\n"
-#: sys-utils/hwclock.c:1225
+#: sys-utils/hwclock.c:1248
#, fuzzy, c-format
#| msgid " -f, --file <file> use a specific file instead of %s\n"
msgid " -f, --rtc <file> use an alternate file to %1$s\n"
msgstr " -F, --file <文件> 用指定文件代替 %s\n"
-#: sys-utils/hwclock.c:1228
+#: sys-utils/hwclock.c:1251
#, 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:1229
+#: sys-utils/hwclock.c:1252
#, 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:1230
+#: sys-utils/hwclock.c:1253
#, 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:1232
+#: sys-utils/hwclock.c:1255
msgid " --epoch <year> epoch input for --setepoch"
msgstr ""
-#: sys-utils/hwclock.c:1234
+#: sys-utils/hwclock.c:1257
#, fuzzy
#| msgid " -r, --reset reset the port\n"
msgid " --update-drift update the RTC drift factor"
msgstr " -r, --reset 重置端口\n"
-#: sys-utils/hwclock.c:1236
+#: sys-utils/hwclock.c:1259
#, 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:1238
+#: sys-utils/hwclock.c:1261
#, fuzzy, c-format
#| msgid " -f, --file <file> use a specific file instead of %s\n"
msgid " --adjfile <file> use an alternate file to %1$s\n"
msgstr " -F, --file <文件> 用指定文件代替 %s\n"
-#: sys-utils/hwclock.c:1239
+#: sys-utils/hwclock.c:1262
#, fuzzy
#| msgid " --test dry run; implies --verbose"
msgid " --test dry run; implies --verbose"
msgstr " --test 测试运行;隐含启用 --verbose"
-#: sys-utils/hwclock.c:1240
+#: sys-utils/hwclock.c:1263
#, fuzzy
#| msgid " -v, --verbose display more details\n"
msgid " -v, --verbose display more details"
msgstr " -v, --verbose 显示更多细节\n"
-#: sys-utils/hwclock.c:1247
+#: sys-utils/hwclock.c:1270
msgid " <param> is either a numeric RTC parameter value or one of these aliases:"
msgstr ""
-#: sys-utils/hwclock.c:1250
+#: sys-utils/hwclock.c:1273
#, c-format
msgid " - %1$s: %2$s (0x%3$x)\n"
msgstr ""
-#: sys-utils/hwclock.c:1254
+#: sys-utils/hwclock.c:1277
msgid " See Kernel's include/uapi/linux/rtc.h for parameters and values."
msgstr ""
-#: sys-utils/hwclock.c:1256
+#: sys-utils/hwclock.c:1279
msgid " <param> and <value> accept hexadecimal values if prefixed with 0x, otherwise decimal."
msgstr ""
-#: sys-utils/hwclock.c:1357
+#: sys-utils/hwclock.c:1384
msgid "Unable to connect to audit system"
msgstr "无法连接到审计系统"
-#: sys-utils/hwclock.c:1381
+#: sys-utils/hwclock.c:1408
msgid "use --verbose, --debug has been deprecated."
msgstr ""
-#: sys-utils/hwclock.c:1494
-#, fuzzy, c-format
-#| msgid "too many arguments"
-msgid "%d too many arguments given"
-msgstr "参数过多"
-
-#: sys-utils/hwclock.c:1502
+#: sys-utils/hwclock.c:1537
msgid "--update-drift requires --set or --systohc"
msgstr ""
-#: sys-utils/hwclock.c:1507
+#: sys-utils/hwclock.c:1542
msgid "With --noadjfile, you must specify either --utc or --localtime"
msgstr "指定 --noadjfile 时,您必须指定 --utc 或 --localtime"
-#: sys-utils/hwclock.c:1514
+#: sys-utils/hwclock.c:1549
msgid "--date is required for --set or --predict"
msgstr ""
-#: sys-utils/hwclock.c:1531
+#: sys-utils/hwclock.c:1566
#, c-format
msgid "invalid date '%s'"
msgstr "无效日期“%s”"
-#: sys-utils/hwclock.c:1554
+#: sys-utils/hwclock.c:1596
#, 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:1571
+#: sys-utils/hwclock.c:1613
msgid "Test mode: nothing was changed."
msgstr "演示模式:无实际修改。"
-#: sys-utils/hwclock-cmos.c:360
+#: sys-utils/hwclock.c:1633
+#, fuzzy
+#| msgid "cannot set timerfd"
+msgid "could not send audit message"
+msgstr "无法设置 timerfd"
+
+#: sys-utils/hwclock-cmos.c:366
msgid "ISA port access is not implemented"
msgstr "未实现 ISA 端口访问"
-#: sys-utils/hwclock-cmos.c:362
+#: sys-utils/hwclock-cmos.c:368
msgid "iopl() port access failed"
msgstr "iopl() 端口访问失败"
-#: sys-utils/hwclock-cmos.c:373
+#: sys-utils/hwclock-cmos.c:379
#, 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:48
+#: sys-utils/hwclock-rtc.c:53
#, fuzzy
#| msgid "unsupported filesystem features"
msgid "supported features"
msgstr "不支持的文件系统特性"
-#: sys-utils/hwclock-rtc.c:49
+#: sys-utils/hwclock-rtc.c:54
msgid "time correction"
msgstr ""
-#: sys-utils/hwclock-rtc.c:50
+#: sys-utils/hwclock-rtc.c:55
msgid "backup switch mode"
msgstr ""
-#: sys-utils/hwclock-rtc.c:101
+#: sys-utils/hwclock-rtc.c:106
#, c-format
msgid "Trying to open: %s\n"
msgstr "正在尝试打开:%s\n"
-#: sys-utils/hwclock-rtc.c:126 sys-utils/hwclock-rtc.c:216
+#: sys-utils/hwclock-rtc.c:131 sys-utils/hwclock-rtc.c:221
msgid "cannot open rtc device"
msgstr "无法打开 rtc 设备"
-#: 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:177
+#: sys-utils/hwclock-rtc.c:182
#, c-format
msgid "Waiting in loop for time from %s to change\n"
msgstr "正在循环等待来自 %s 的时间更改\n"
-#: sys-utils/hwclock-rtc.c:196
+#: sys-utils/hwclock-rtc.c:201
msgid "Timed out waiting for time change."
msgstr "等待时间更改超时。"
-#: sys-utils/hwclock-rtc.c:244
+#: sys-utils/hwclock-rtc.c:249
#, c-format
msgid "select() to %s to wait for clock tick timed out"
msgstr "对 %s select() 以等待时钟嘀嗒超时"
-#: sys-utils/hwclock-rtc.c:247
+#: sys-utils/hwclock-rtc.c:252
#, c-format
msgid "select() to %s to wait for clock tick failed"
msgstr "对 %s select() 以等待时钟嘀嗒失败"
-#: sys-utils/hwclock-rtc.c:252
+#: sys-utils/hwclock-rtc.c:257
#, c-format
msgid "ioctl() to %s to turn off update interrupts failed"
msgstr "对 %s ioctl() 以关闭更新中断失败"
-#: sys-utils/hwclock-rtc.c:258
+#: sys-utils/hwclock-rtc.c:263
#, 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:303
+#: sys-utils/hwclock-rtc.c:308
#, fuzzy, c-format
#| 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:309
+#: sys-utils/hwclock-rtc.c:314
#, 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:325
+#: sys-utils/hwclock-rtc.c:330
#, fuzzy
#| msgid "Using the /dev interface to the clock."
msgid "Using the rtc interface to the clock."
msgstr "将对时钟使用 /dev 接口。"
-#: sys-utils/hwclock-rtc.c:358
+#: sys-utils/hwclock-rtc.c:363
#, 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:364
+#: sys-utils/hwclock-rtc.c:369
#, 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:383
+#: sys-utils/hwclock-rtc.c:388
#, fuzzy, c-format
#| msgid "invalid epoch argument"
msgid "invalid epoch '%s'."
msgstr "无效的纪元(epoch)参数"
-#: sys-utils/hwclock-rtc.c:394
+#: sys-utils/hwclock-rtc.c:399
#, 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:400
+#: sys-utils/hwclock-rtc.c:405
#, 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
+#: sys-utils/hwclock-rtc.c:447 sys-utils/hwclock-rtc.c:489
msgid "could not convert parameter name to number"
msgstr ""
-#: sys-utils/hwclock-rtc.c:454
+#: sys-utils/hwclock-rtc.c:459
#, 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
+#: sys-utils/hwclock-rtc.c:470
#, 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
+#: sys-utils/hwclock-rtc.c:496
msgid "expected <param>=<value>"
msgstr ""
-#: sys-utils/hwclock-rtc.c:495
+#: sys-utils/hwclock-rtc.c:500
msgid "could not convert parameter value to number"
msgstr ""
-#: sys-utils/hwclock-rtc.c:507
+#: sys-utils/hwclock-rtc.c:512
#, 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
+#: sys-utils/hwclock-rtc.c:518
#, 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/hwclock-rtc.c:552
+msgid "Voltage too low, RTC data is invalid"
+msgstr ""
+
+#: sys-utils/hwclock-rtc.c:553
+msgid "Backup voltage is low"
+msgstr ""
+
+#: sys-utils/hwclock-rtc.c:554
+msgid "Backup empty or not present"
+msgstr ""
+
+#: sys-utils/hwclock-rtc.c:555
+msgid "Voltage is low, RTC accuracy is reduced"
+msgstr ""
+
+#: sys-utils/hwclock-rtc.c:556
+msgid "Backup switchover happened"
+msgstr ""
+
+#: sys-utils/hwclock-rtc.c:566
+#, fuzzy, c-format
+#| msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+msgid "ioctl(%d, RTC_VL_READ) on %s failed"
+msgstr "对 %s 进行 ioctl(RTC_EPOCH_READ) 失败"
+
+#: sys-utils/hwclock-rtc.c:572
+#, fuzzy, c-format
+#| msgid "ioctl(RTC_EPOCH_READ) to %s failed"
+msgid "ioctl(%d, RTC_VL_READ) on %s returned 0x%x\n"
+msgstr "对 %s 进行 ioctl(RTC_EPOCH_READ) 失败"
+
+#: sys-utils/hwclock-rtc.c:601
+#, fuzzy, c-format
+#| msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgid "ioctl(%d, RTC_VL_CLEAR) on %s failed"
+msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
+
+#: sys-utils/hwclock-rtc.c:607
+#, fuzzy, c-format
+#| msgid "ioctl(RTC_EPOCH_SET) to %s failed"
+msgid "ioctl(%d, RTC_VL_CLEAR) on %s succeeded.\n"
+msgstr "对 %s 进行 ioctl(RTC_EPOCH_SET) 失败"
+
#: sys-utils/ipcmk.c:70
msgid "Create various IPC resources.\n"
msgstr "创建各种 IPC 资源。\n"
@@ -17137,7 +18059,7 @@ msgstr " -p, --mode <模式> 资源的权限模式掩码(默认为 0644)\
msgid "<size>"
msgstr "大小"
-#: sys-utils/ipcmk.c:114 sys-utils/losetup.c:755 sys-utils/zramctl.c:654
+#: sys-utils/ipcmk.c:114 sys-utils/losetup.c:827 sys-utils/zramctl.c:654
msgid "failed to parse size"
msgstr "解析大小失败"
@@ -17178,7 +18100,7 @@ msgstr "创建信号量失败"
msgid "Semaphore id: %d\n"
msgstr "信号量 id:%d\n"
-#: sys-utils/ipcrm.c:51
+#: sys-utils/ipcrm.c:56
#, c-format
msgid ""
" %1$s [options]\n"
@@ -17187,117 +18109,117 @@ msgstr ""
" %1$s [选项]\n"
" %1$s shm|msg|sem <id>...\n"
-#: sys-utils/ipcrm.c:55
+#: sys-utils/ipcrm.c:60
msgid "Remove certain IPC resources.\n"
msgstr "移除某个 IPC 资源。\n"
-#: sys-utils/ipcrm.c:58
+#: sys-utils/ipcrm.c:63
msgid " -m, --shmem-id <id> remove shared memory segment by id\n"
msgstr " -m, --shmem-id <id> 按 id 号移除共享内存段\n"
-#: sys-utils/ipcrm.c:59
+#: sys-utils/ipcrm.c:64
msgid " -M, --shmem-key <key> remove shared memory segment by key\n"
msgstr " -M, --shmem-key <键> 按键值移除共享内存段\n"
-#: sys-utils/ipcrm.c:60
+#: sys-utils/ipcrm.c:65
msgid " -q, --queue-id <id> remove message queue by id\n"
msgstr " -q, --queue-id <id> 按 id 号移除消息队列\n"
-#: sys-utils/ipcrm.c:61
+#: sys-utils/ipcrm.c:66
msgid " -Q, --queue-key <key> remove message queue by key\n"
msgstr " -Q, --queue-key <键> 按键值移除消息队列\n"
-#: sys-utils/ipcrm.c:62
+#: sys-utils/ipcrm.c:67
msgid " -s, --semaphore-id <id> remove semaphore by id\n"
msgstr " -s, --semaphore-id <id> 按 id 号移除信号量\n"
-#: sys-utils/ipcrm.c:63
+#: sys-utils/ipcrm.c:68
msgid " -S, --semaphore-key <key> remove semaphore by key\n"
msgstr " -S, --semaphore-key <键> 按键值移除信号量\n"
-#: sys-utils/ipcrm.c:64
+#: sys-utils/ipcrm.c:69
msgid " -a, --all[=shm|msg|sem] remove all (in the specified category)\n"
msgstr " -a, --all[=<shm|msg|sem>] (将指定类别中的)全部移除\n"
-#: sys-utils/ipcrm.c:65
+#: sys-utils/ipcrm.c:70
msgid " -v, --verbose explain what is being done\n"
msgstr " -v, --verbose 解释正在进行的操作\n"
-#: sys-utils/ipcrm.c:86
+#: sys-utils/ipcrm.c:91
#, c-format
msgid "removing shared memory segment id `%d'\n"
msgstr "正在移除共享内存段 id “%d”\n"
-#: sys-utils/ipcrm.c:91
+#: sys-utils/ipcrm.c:96
#, c-format
msgid "removing message queue id `%d'\n"
msgstr "正在移除消息队列 id “%d”\n"
-#: sys-utils/ipcrm.c:96
+#: sys-utils/ipcrm.c:101
#, c-format
msgid "removing semaphore id `%d'\n"
msgstr "正在移除信号量 id “%d”\n"
-#: sys-utils/ipcrm.c:108 sys-utils/ipcrm.c:223
+#: sys-utils/ipcrm.c:113 sys-utils/ipcrm.c:228
msgid "permission denied for key"
msgstr "对 键 的权限不足"
-#: sys-utils/ipcrm.c:108
+#: sys-utils/ipcrm.c:113
msgid "permission denied for id"
msgstr "对 id 的权限不足"
-#: sys-utils/ipcrm.c:111 sys-utils/ipcrm.c:229
+#: sys-utils/ipcrm.c:116 sys-utils/ipcrm.c:234
msgid "invalid key"
msgstr "无效键"
-#: sys-utils/ipcrm.c:111
+#: sys-utils/ipcrm.c:116
msgid "invalid id"
msgstr "无效 id"
-#: sys-utils/ipcrm.c:114 sys-utils/ipcrm.c:226
+#: sys-utils/ipcrm.c:119 sys-utils/ipcrm.c:231
msgid "already removed key"
msgstr "已移除的键"
-#: sys-utils/ipcrm.c:114
+#: sys-utils/ipcrm.c:119
msgid "already removed id"
msgstr "已移除的 id"
-#: sys-utils/ipcrm.c:117 sys-utils/ipcrm.c:232
+#: sys-utils/ipcrm.c:122 sys-utils/ipcrm.c:237
msgid "key failed"
msgstr "键失败"
-#: sys-utils/ipcrm.c:117
+#: sys-utils/ipcrm.c:122
msgid "id failed"
msgstr "ID 失败"
-#: sys-utils/ipcrm.c:135
+#: sys-utils/ipcrm.c:140
#, c-format
msgid "invalid id: %s"
msgstr "无效 ID:%s"
-#: sys-utils/ipcrm.c:168
+#: sys-utils/ipcrm.c:173
#, c-format
msgid "resource(s) deleted\n"
msgstr "资源已删除\n"
-#: sys-utils/ipcrm.c:201
+#: sys-utils/ipcrm.c:206
#, c-format
msgid "illegal key (%s)"
msgstr "非法的键(%s)"
-#: sys-utils/ipcrm.c:257
+#: sys-utils/ipcrm.c:262
msgid "kernel not configured for shared memory"
msgstr "内核未做共享内存的相关配置"
-#: sys-utils/ipcrm.c:270
+#: sys-utils/ipcrm.c:275
msgid "kernel not configured for semaphores"
msgstr "内核未做信号量的相关配置"
-#: sys-utils/ipcrm.c:291
+#: sys-utils/ipcrm.c:296
msgid "kernel not configured for message queues"
msgstr "内核未做消息的相关配置"
-#: sys-utils/ipcs.c:61
+#: sys-utils/ipcs.c:71
#, c-format
msgid ""
" %1$s [resource-option...] [output-option]\n"
@@ -17306,113 +18228,113 @@ msgstr ""
" %1$s [资源选项...] [输出选项]\n"
" %1$s -m|-q|-s -i <id>\n"
-#: sys-utils/ipcs.c:65 sys-utils/lsipc.c:295
+#: sys-utils/ipcs.c:75 sys-utils/lsipc.c:295
msgid "Show information on IPC facilities.\n"
msgstr "显示 IPC 设施的信息。\n"
-#: sys-utils/ipcs.c:68
+#: sys-utils/ipcs.c:78
msgid " -i, --id <id> print details on resource identified by <id>\n"
msgstr " -i, --id <id> 打印由<id>标识的资源的详细信息\n"
-#: sys-utils/ipcs.c:72 sys-utils/lsipc.c:298
+#: sys-utils/ipcs.c:82 sys-utils/lsipc.c:298
msgid "Resource options:\n"
msgstr "资源选项:\n"
-#: sys-utils/ipcs.c:73 sys-utils/lsipc.c:299
+#: sys-utils/ipcs.c:83 sys-utils/lsipc.c:299
msgid " -m, --shmems shared memory segments\n"
msgstr " -m, --shmems 共享内存段\n"
-#: sys-utils/ipcs.c:74 sys-utils/lsipc.c:300
+#: sys-utils/ipcs.c:84 sys-utils/lsipc.c:300
msgid " -q, --queues message queues\n"
msgstr " -q, --queues 消息队列\n"
-#: sys-utils/ipcs.c:75 sys-utils/lsipc.c:301
+#: sys-utils/ipcs.c:85 sys-utils/lsipc.c:301
msgid " -s, --semaphores semaphores\n"
msgstr " -s, --semaphores 信号量\n"
-#: sys-utils/ipcs.c:76
+#: sys-utils/ipcs.c:86
msgid " -a, --all all (default)\n"
msgstr " -a, --all 全部(默认)\n"
-#: sys-utils/ipcs.c:79
+#: sys-utils/ipcs.c:89
msgid "Output options:\n"
msgstr "输出选项:\n"
-#: sys-utils/ipcs.c:80
+#: sys-utils/ipcs.c:90
msgid " -t, --time show attach, detach and change times\n"
msgstr " -t, --time 显示附加、脱离和更改时间\n"
-#: sys-utils/ipcs.c:81
+#: sys-utils/ipcs.c:91
msgid " -p, --pid show PIDs of creator and last operator\n"
msgstr " -p, --pid 显示创建者和最后操作者的 PID\n"
-#: sys-utils/ipcs.c:82
+#: sys-utils/ipcs.c:92
msgid " -c, --creator show creator and owner\n"
msgstr " -c, --creator 显示创建者和拥有者\n"
-#: sys-utils/ipcs.c:83
+#: sys-utils/ipcs.c:93
msgid " -l, --limits show resource limits\n"
msgstr " -l, --limits 显示资源限制\n"
-#: sys-utils/ipcs.c:84
+#: sys-utils/ipcs.c:94
msgid " -u, --summary show status summary\n"
msgstr " -u, --summary 显示状态摘要\n"
-#: sys-utils/ipcs.c:85
+#: sys-utils/ipcs.c:95
msgid " --human show sizes in human-readable format\n"
msgstr " --human 以易读格式显示大小\n"
-#: sys-utils/ipcs.c:86
+#: sys-utils/ipcs.c:96
msgid " -b, --bytes show sizes in bytes\n"
msgstr " -b, --bytes 以字节数显示大小\n"
-#: sys-utils/ipcs.c:124
+#: sys-utils/ipcs.c:134
#, fuzzy
#| msgid "failed to parse argument"
msgid "failed to parse id argument"
msgstr "解析参数失败"
-#: sys-utils/ipcs.c:172
+#: sys-utils/ipcs.c:182
msgid "when using an ID, a single resource must be specified"
msgstr "使用 ID 时,必须指定一个资源"
-#: sys-utils/ipcs.c:212
+#: sys-utils/ipcs.c:222
#, c-format
msgid "unable to fetch shared memory limits\n"
msgstr "无法获取共享内存限制\n"
-#: sys-utils/ipcs.c:215
+#: sys-utils/ipcs.c:225
#, c-format
msgid "------ Shared Memory Limits --------\n"
msgstr "---------- 同享内存限制 ------------\n"
-#: sys-utils/ipcs.c:216
+#: sys-utils/ipcs.c:226
#, c-format
msgid "max number of segments = %ju\n"
msgstr "最大段数 = %ju\n"
-#: sys-utils/ipcs.c:218
+#: sys-utils/ipcs.c:228
msgid "max seg size"
msgstr "最大段大小"
-#: sys-utils/ipcs.c:225
+#: sys-utils/ipcs.c:235
msgid "max total shared memory (kbytes)"
msgstr "最大总共享内存(千字节)"
-#: sys-utils/ipcs.c:233
+#: sys-utils/ipcs.c:243
msgid "max total shared memory"
msgstr "最大总共享内存"
-#: sys-utils/ipcs.c:236
+#: sys-utils/ipcs.c:246
msgid "min seg size"
msgstr "最小段大小"
-#: sys-utils/ipcs.c:248
+#: sys-utils/ipcs.c:258
#, c-format
msgid "kernel not configured for shared memory\n"
msgstr "内核未做共享内存的相关配置\n"
-#: sys-utils/ipcs.c:252
+#: sys-utils/ipcs.c:262
#, c-format
msgid "------ Shared Memory Status --------\n"
msgstr "---------- 共享内存状态 ------------\n"
@@ -17427,7 +18349,7 @@ msgstr "---------- 共享内存状态 ------------\n"
#. "pages swapped = %ld\n"
#. "swap performance = %ld attempts, %ld successes\n"
#.
-#: sys-utils/ipcs.c:264
+#: sys-utils/ipcs.c:274
#, c-format
msgid ""
"segments allocated %d\n"
@@ -17442,309 +18364,309 @@ msgstr ""
"页交换 %ld\n"
"交换性能:%ld 次尝试\t %ld 次成功\n"
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:291
#, c-format
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr "------------- 共享内存段创建者/拥有者 ---------------\n"
-#: sys-utils/ipcs.c:283 sys-utils/ipcs.c:289 sys-utils/ipcs.c:296
-#: sys-utils/ipcs.c:302
+#: sys-utils/ipcs.c:293 sys-utils/ipcs.c:299 sys-utils/ipcs.c:306
+#: sys-utils/ipcs.c:312
msgid "shmid"
msgstr "shmid"
-#: 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
+#: sys-utils/ipcs.c:293 sys-utils/ipcs.c:312 sys-utils/ipcs.c:417
+#: sys-utils/ipcs.c:432 sys-utils/ipcs.c:519 sys-utils/ipcs.c:537
msgid "perms"
msgstr "权限"
-#: sys-utils/ipcs.c:283 sys-utils/ipcs.c:407 sys-utils/ipcs.c:509
+#: sys-utils/ipcs.c:293 sys-utils/ipcs.c:417 sys-utils/ipcs.c:519
msgid "cuid"
msgstr "cuid"
-#: sys-utils/ipcs.c:283 sys-utils/ipcs.c:407 sys-utils/ipcs.c:509
+#: sys-utils/ipcs.c:293 sys-utils/ipcs.c:417 sys-utils/ipcs.c:519
msgid "cgid"
msgstr "cgid"
-#: sys-utils/ipcs.c:283 sys-utils/ipcs.c:407 sys-utils/ipcs.c:509
+#: sys-utils/ipcs.c:293 sys-utils/ipcs.c:417 sys-utils/ipcs.c:519
msgid "uid"
msgstr "uid"
-#: sys-utils/ipcs.c:283 sys-utils/ipcs.c:407 sys-utils/ipcs.c:509
+#: sys-utils/ipcs.c:293 sys-utils/ipcs.c:417 sys-utils/ipcs.c:519
msgid "gid"
msgstr "gid"
-#: sys-utils/ipcs.c:287
+#: sys-utils/ipcs.c:297
#, c-format
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr "------------ 共享内存 附加/脱离/更改 时间 --------------\n"
-#: 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
+#: sys-utils/ipcs.c:299 sys-utils/ipcs.c:306 sys-utils/ipcs.c:312
+#: sys-utils/ipcs.c:423 sys-utils/ipcs.c:432 sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:531 sys-utils/ipcs.c:537
msgid "owner"
msgstr "拥有者"
-#: sys-utils/ipcs.c:289
+#: sys-utils/ipcs.c:299
msgid "attached"
msgstr "已附加"
-#: sys-utils/ipcs.c:289
+#: sys-utils/ipcs.c:299
msgid "detached"
msgstr "已断开"
-#: sys-utils/ipcs.c:290
+#: sys-utils/ipcs.c:300
msgid "changed"
msgstr "已更改"
-#: sys-utils/ipcs.c:294
+#: sys-utils/ipcs.c:304
#, c-format
msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
msgstr "-------- 共享内存 创建者/上次修改者 PID ----------\n"
-#: sys-utils/ipcs.c:296
+#: sys-utils/ipcs.c:306
msgid "cpid"
msgstr "cpid"
-#: sys-utils/ipcs.c:296
+#: sys-utils/ipcs.c:306
msgid "lpid"
msgstr "lpid"
-#: sys-utils/ipcs.c:300
+#: sys-utils/ipcs.c:310
#, c-format
msgid "------ Shared Memory Segments --------\n"
msgstr "------------ 共享内存段 --------------\n"
-#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:422 sys-utils/ipcs.c:527
+#: sys-utils/ipcs.c:312 sys-utils/ipcs.c:432 sys-utils/ipcs.c:537
msgid "key"
msgstr "键"
-#: sys-utils/ipcs.c:303 sys-utils/prlimit.c:77 sys-utils/prlimit.c:78
-#: sys-utils/prlimit.c:80 sys-utils/prlimit.c:81 sys-utils/prlimit.c:83
-#: sys-utils/prlimit.c:84 sys-utils/prlimit.c:88 sys-utils/prlimit.c:92
+#: sys-utils/ipcs.c:313 sys-utils/prlimit.c:69 sys-utils/prlimit.c:70
+#: sys-utils/prlimit.c:72 sys-utils/prlimit.c:73 sys-utils/prlimit.c:75
+#: sys-utils/prlimit.c:76 sys-utils/prlimit.c:80 sys-utils/prlimit.c:84
msgid "bytes"
msgstr "字节"
-#: sys-utils/ipcs.c:304
+#: sys-utils/ipcs.c:314
msgid "nattch"
msgstr "连接数"
-#: sys-utils/ipcs.c:304
+#: sys-utils/ipcs.c:314
msgid "status"
msgstr "状态"
-#: 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
+#: sys-utils/ipcs.c:338 sys-utils/ipcs.c:340 sys-utils/ipcs.c:342
+#: sys-utils/ipcs.c:455 sys-utils/ipcs.c:457 sys-utils/ipcs.c:562
+#: sys-utils/ipcs.c:564 sys-utils/ipcs.c:566 sys-utils/ipcs.c:619
+#: sys-utils/ipcs.c:621 sys-utils/ipcs.c:650 sys-utils/ipcs.c:652
+#: sys-utils/ipcs.c:654 sys-utils/ipcs.c:678
msgid "Not set"
msgstr "未设置"
-#: sys-utils/ipcs.c:358 sys-utils/lsipc.c:1012 sys-utils/lsipc.c:1018
+#: sys-utils/ipcs.c:368 sys-utils/lsipc.c:1014 sys-utils/lsipc.c:1020
msgid "dest"
msgstr "目标"
-#: sys-utils/ipcs.c:359 sys-utils/lsipc.c:1013 sys-utils/lsipc.c:1026
+#: sys-utils/ipcs.c:369 sys-utils/lsipc.c:1015 sys-utils/lsipc.c:1028
msgid "locked"
msgstr "已锁定"
-#: sys-utils/ipcs.c:378
+#: sys-utils/ipcs.c:388
#, c-format
msgid "unable to fetch semaphore limits\n"
msgstr "无法获取信号量限制\n"
-#: sys-utils/ipcs.c:381
+#: sys-utils/ipcs.c:391
#, c-format
msgid "------ Semaphore Limits --------\n"
msgstr "--------- 信号量限制 -----------\n"
-#: sys-utils/ipcs.c:382
+#: sys-utils/ipcs.c:392
#, c-format
msgid "max number of arrays = %d\n"
msgstr "最大数组数量 = %d\n"
-#: sys-utils/ipcs.c:383
+#: sys-utils/ipcs.c:393
#, c-format
msgid "max semaphores per array = %d\n"
msgstr "每个数组的最大信号量数目 = %d\n"
-#: sys-utils/ipcs.c:384
+#: sys-utils/ipcs.c:394
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr "系统最大信号量数 = %d\n"
-#: sys-utils/ipcs.c:385
+#: sys-utils/ipcs.c:395
#, c-format
msgid "max ops per semop call = %d\n"
msgstr "每次信号量调用最大操作数 = %d\n"
-#: sys-utils/ipcs.c:386
+#: sys-utils/ipcs.c:396
#, c-format
msgid "semaphore max value = %u\n"
msgstr "信号量最大值=%u\n"
-#: sys-utils/ipcs.c:395
+#: sys-utils/ipcs.c:405
#, c-format
msgid "kernel not configured for semaphores\n"
msgstr "内核未做信号量的相关配置\n"
-#: sys-utils/ipcs.c:398
+#: sys-utils/ipcs.c:408
#, c-format
msgid "------ Semaphore Status --------\n"
msgstr "--------- 信号量状态 -----------\n"
-#: sys-utils/ipcs.c:399
+#: sys-utils/ipcs.c:409
#, c-format
msgid "used arrays = %d\n"
msgstr "已使用数组 = %d\n"
-#: sys-utils/ipcs.c:400
+#: sys-utils/ipcs.c:410
#, c-format
msgid "allocated semaphores = %d\n"
msgstr "已分配信号量数 = %d\n"
-#: sys-utils/ipcs.c:405
+#: sys-utils/ipcs.c:415
#, c-format
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr "----------- 信号量数组创建者/拥有者 ------------\n"
-#: sys-utils/ipcs.c:407 sys-utils/ipcs.c:413 sys-utils/ipcs.c:422
+#: sys-utils/ipcs.c:417 sys-utils/ipcs.c:423 sys-utils/ipcs.c:432
msgid "semid"
msgstr "semid"
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:421
#, c-format
msgid "------ Semaphore Operation/Change Times --------\n"
msgstr "------------ 信号量 操作/更改 时间 -------------\n"
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:423
msgid "last-op"
msgstr "上一操作"
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:423
msgid "last-changed"
msgstr "上次更改"
-#: sys-utils/ipcs.c:420
+#: sys-utils/ipcs.c:430
#, c-format
msgid "------ Semaphore Arrays --------\n"
msgstr "--------- 信号量数组 -----------\n"
-#: sys-utils/ipcs.c:422
+#: sys-utils/ipcs.c:432
msgid "nsems"
msgstr "nsems"
-#: sys-utils/ipcs.c:479
+#: sys-utils/ipcs.c:489
#, c-format
msgid "unable to fetch message limits\n"
msgstr "无法获取消息限制\n"
-#: sys-utils/ipcs.c:482
+#: sys-utils/ipcs.c:492
#, c-format
msgid "------ Messages Limits --------\n"
msgstr "---------- 消息限制 -----------\n"
-#: sys-utils/ipcs.c:483
+#: sys-utils/ipcs.c:493
#, c-format
msgid "max queues system wide = %d\n"
msgstr "系统最大队列数量 = %d\n"
-#: sys-utils/ipcs.c:485
+#: sys-utils/ipcs.c:495
msgid "max size of message"
msgstr "最大消息尺寸"
-#: sys-utils/ipcs.c:487
+#: sys-utils/ipcs.c:497
msgid "default max size of queue"
msgstr "默认的队列最大尺寸"
-#: sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:504
#, c-format
msgid "kernel not configured for message queues\n"
msgstr "内核未做消息的相关配置\n"
-#: sys-utils/ipcs.c:497
+#: sys-utils/ipcs.c:507
#, c-format
msgid "------ Messages Status --------\n"
msgstr "---------- 消息状态 -----------\n"
-#: sys-utils/ipcs.c:499
+#: sys-utils/ipcs.c:509
#, c-format
msgid "allocated queues = %d\n"
msgstr "已分配队列数 = %d\n"
-#: sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:510
#, c-format
msgid "used headers = %d\n"
msgstr "已用消息头(header)数 = %d\n"
-#: sys-utils/ipcs.c:502
+#: sys-utils/ipcs.c:512
msgid "used space"
msgstr "已用空间"
-#: sys-utils/ipcs.c:503
+#: sys-utils/ipcs.c:513
msgid " bytes\n"
msgstr " 字节\n"
-#: sys-utils/ipcs.c:507
+#: sys-utils/ipcs.c:517
#, c-format
msgid "------ Message Queues Creators/Owners --------\n"
msgstr "---------- 消息队列 创建者/拥有者 ------------\n"
-#: sys-utils/ipcs.c:509 sys-utils/ipcs.c:515 sys-utils/ipcs.c:521
-#: sys-utils/ipcs.c:527
+#: sys-utils/ipcs.c:519 sys-utils/ipcs.c:525 sys-utils/ipcs.c:531
+#: sys-utils/ipcs.c:537
msgid "msqid"
msgstr "msqid"
-#: sys-utils/ipcs.c:513
+#: sys-utils/ipcs.c:523
#, c-format
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr "----------- 消息队列 发送/接收/更改 时间 ------------\n"
-#: sys-utils/ipcs.c:515
+#: sys-utils/ipcs.c:525
msgid "send"
msgstr "发送"
-#: sys-utils/ipcs.c:515
+#: sys-utils/ipcs.c:525
msgid "recv"
msgstr "接收"
-#: sys-utils/ipcs.c:515
+#: sys-utils/ipcs.c:525
msgid "change"
msgstr "更改"
-#: sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:529
#, c-format
msgid "------ Message Queues PIDs --------\n"
msgstr "--------- 消息队列 PID -----------\n"
-#: sys-utils/ipcs.c:521
+#: sys-utils/ipcs.c:531
msgid "lspid"
msgstr "lspid"
-#: sys-utils/ipcs.c:521
+#: sys-utils/ipcs.c:531
msgid "lrpid"
msgstr "lrpid"
-#: sys-utils/ipcs.c:525
+#: sys-utils/ipcs.c:535
#, c-format
msgid "------ Message Queues --------\n"
msgstr "--------- 消息队列 -----------\n"
-#: sys-utils/ipcs.c:528
+#: sys-utils/ipcs.c:538
msgid "used-bytes"
msgstr "已用字节数"
-#: sys-utils/ipcs.c:529
+#: sys-utils/ipcs.c:539
msgid "messages"
msgstr "消息"
-#: 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
+#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:633 sys-utils/ipcs.c:666
+#: sys-utils/lsipc.c:559 sys-utils/lsipc.c:753 sys-utils/lsipc.c:916
#, c-format
msgid "id %d not found"
msgstr "找不到 id %d"
-#: sys-utils/ipcs.c:597
+#: sys-utils/ipcs.c:607
#, c-format
msgid ""
"\n"
@@ -17753,45 +18675,45 @@ msgstr ""
"\n"
"共享内存段 shmid=%d\n"
-#: sys-utils/ipcs.c:598
+#: sys-utils/ipcs.c:608
#, 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:601
+#: sys-utils/ipcs.c:611
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr "模式=%#o\t访问权限=%#o\n"
-#: sys-utils/ipcs.c:603
+#: sys-utils/ipcs.c:613
msgid "size="
msgstr "大小="
-#: sys-utils/ipcs.c:603
+#: sys-utils/ipcs.c:613
msgid "bytes="
msgstr "字节数="
-#: sys-utils/ipcs.c:605
+#: sys-utils/ipcs.c:615
#, c-format
msgid "lpid=%u\tcpid=%u\tnattch=%jd\n"
msgstr "lpid=%u\tcpid=%u\tnattch=%jd\n"
-#: sys-utils/ipcs.c:608
+#: sys-utils/ipcs.c:618
#, c-format
msgid "att_time=%-26.24s\n"
msgstr "附加时间=%-26.24s\n"
-#: sys-utils/ipcs.c:610
+#: sys-utils/ipcs.c:620
#, c-format
msgid "det_time=%-26.24s\n"
msgstr "脱离时间=%-26.24s\n"
-#: sys-utils/ipcs.c:612 sys-utils/ipcs.c:643
+#: sys-utils/ipcs.c:622 sys-utils/ipcs.c:653
#, c-format
msgid "change_time=%-26.24s\n"
msgstr "更改时间=%-26.24s\n"
-#: sys-utils/ipcs.c:627
+#: sys-utils/ipcs.c:637
#, c-format
msgid ""
"\n"
@@ -17800,38 +18722,38 @@ msgstr ""
"\n"
"消息队列 msqid=%d\n"
-#: sys-utils/ipcs.c:628
+#: sys-utils/ipcs.c:638
#, 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:632
+#: sys-utils/ipcs.c:642
msgid "csize="
msgstr "csize="
-#: sys-utils/ipcs.c:632
+#: sys-utils/ipcs.c:642
msgid "cbytes="
msgstr "cbytes="
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:644
msgid "qsize="
msgstr "qsize="
-#: sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:644
msgid "qbytes="
msgstr "qbytes="
-#: sys-utils/ipcs.c:639
+#: sys-utils/ipcs.c:649
#, c-format
msgid "send_time=%-26.24s\n"
msgstr "发送时间=%-26.24s\n"
-#: sys-utils/ipcs.c:641
+#: sys-utils/ipcs.c:651
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr "接收时间=%-26.24s\n"
-#: sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:670
#, c-format
msgid ""
"\n"
@@ -17840,276 +18762,276 @@ msgstr ""
"\n"
"信号量数组 semid=%d\n"
-#: sys-utils/ipcs.c:661
+#: sys-utils/ipcs.c:671
#, 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:664
+#: sys-utils/ipcs.c:674
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr "模式=%#o,访问权限=%#o\n"
-#: sys-utils/ipcs.c:666
+#: sys-utils/ipcs.c:676
#, c-format
msgid "nsems = %ju\n"
msgstr "nsems = %ju\n"
-#: sys-utils/ipcs.c:667
+#: sys-utils/ipcs.c:677
#, c-format
msgid "otime = %-26.24s\n"
msgstr "otime = %-26.24s\n"
-#: sys-utils/ipcs.c:669
+#: sys-utils/ipcs.c:679
#, c-format
msgid "ctime = %-26.24s\n"
msgstr "ctime = %-26.24s\n"
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:682
msgid "semnum"
msgstr "semnum"
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:682
msgid "value"
msgstr "值"
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:682
msgid "ncount"
msgstr "ncount"
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:682
msgid "zcount"
msgstr "zcount"
-#: sys-utils/ipcs.c:672
+#: sys-utils/ipcs.c:682
msgid "pid"
msgstr "pid"
-#: sys-utils/ipcutils.c:234 sys-utils/ipcutils.c:238 sys-utils/ipcutils.c:242
-#: sys-utils/ipcutils.c:246
+#: sys-utils/ipcutils.c:245 sys-utils/ipcutils.c:249 sys-utils/ipcutils.c:253
+#: sys-utils/ipcutils.c:257
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: sys-utils/ipcutils.c:507
+#: sys-utils/ipcutils.c:518
#, c-format
msgid "%s (bytes) = "
msgstr "%s (字节) = "
-#: sys-utils/ipcutils.c:509
+#: sys-utils/ipcutils.c:520
#, c-format
msgid "%s (kbytes) = "
msgstr "%s (千字节) = "
-#: sys-utils/irq-common.c:54
+#: sys-utils/irq-common.c:46
msgid "interrupts"
msgstr "中断"
-#: sys-utils/irq-common.c:55
+#: sys-utils/irq-common.c:47
#, fuzzy
#| msgid "read count"
msgid "total count"
msgstr "读计数"
-#: sys-utils/irq-common.c:56
+#: sys-utils/irq-common.c:48
#, fuzzy
#| msgid "read count"
msgid "delta count"
msgstr "读计数"
-#: sys-utils/irq-common.c:57
+#: sys-utils/irq-common.c:49
msgid "name"
msgstr "名称"
-#: sys-utils/irq-common.c:139 sys-utils/irq-common.c:460 sys-utils/lsmem.c:702
-#: sys-utils/lsns.c:1116
+#: sys-utils/irq-common.c:131 sys-utils/irq-common.c:463 sys-utils/lsmem.c:695
+#: sys-utils/lsns.c:1109
msgid "failed to initialize output table"
msgstr "初始化输出表失败"
-#: sys-utils/irq-common.c:173 sys-utils/lsns.c:1037
+#: sys-utils/irq-common.c:165 sys-utils/lsns.c:1030
msgid "failed to add line to output"
msgstr "向输出添加行出错"
-#: sys-utils/irq-common.c:416
+#: sys-utils/irq-common.c:419
#, fuzzy
#| msgid "unsupported color mode"
msgid "unsupported column name to sort output"
msgstr "不支持的颜色模式"
-#: sys-utils/irq-common.c:468
+#: sys-utils/irq-common.c:471
#, fuzzy
#| msgid "interrupts"
msgid "cpu-interrupts"
msgstr "中断"
-#: sys-utils/irq-common.c:504
+#: sys-utils/irq-common.c:507
#, no-c-format
msgid "%delta:"
msgstr ""
-#: sys-utils/irqtop.c:139
+#: sys-utils/irqtop.c:132
#, c-format
msgid ""
"irqtop | total: %ld delta: %ld | %s | %s\n"
"\n"
msgstr ""
-#: sys-utils/irqtop.c:187
+#: sys-utils/irqtop.c:180
msgid "cannot not create timerfd"
msgstr "无法创建 timerfd"
-#: sys-utils/irqtop.c:189
+#: sys-utils/irqtop.c:182
msgid "cannot set timerfd"
msgstr "无法设置 timerfd"
-#: sys-utils/irqtop.c:194 sys-utils/irqtop.c:212 sys-utils/irqtop.c:217
+#: sys-utils/irqtop.c:187 sys-utils/irqtop.c:205 sys-utils/irqtop.c:210
msgid "epoll_ctl failed"
msgstr "epoll_ctl 失败"
-#: sys-utils/irqtop.c:197
+#: sys-utils/irqtop.c:190
msgid "sigfillset failed"
msgstr "sigfillset 失败"
-#: sys-utils/irqtop.c:199
+#: sys-utils/irqtop.c:192 sys-utils/setpgid.c:81 sys-utils/setpgid.c:85
msgid "sigprocmask failed"
msgstr "sigprocmask 失败"
-#: sys-utils/irqtop.c:207
+#: sys-utils/irqtop.c:200
msgid "cannot not create signalfd"
msgstr "无法创建 signalfd"
-#: sys-utils/irqtop.c:265
+#: sys-utils/irqtop.c:258
msgid "Interactive utility to display kernel interrupt information."
msgstr ""
-#: sys-utils/irqtop.c:268
+#: sys-utils/irqtop.c:261
msgid " -c, --cpu-stat <mode> show per-cpu stat (auto, enable, disable)\n"
msgstr ""
-#: sys-utils/irqtop.c:269
+#: sys-utils/irqtop.c:262
msgid " -C, --cpu-list <list> specify cpus in list format\n"
msgstr ""
-#: sys-utils/irqtop.c:270
+#: sys-utils/irqtop.c:263
msgid " -d, --delay <secs> delay updates\n"
msgstr ""
-#: sys-utils/irqtop.c:272 sys-utils/lsirq.c:67
+#: sys-utils/irqtop.c:265 sys-utils/lsirq.c:60
#, 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:273 sys-utils/lsirq.c:68
+#: sys-utils/irqtop.c:266 sys-utils/lsirq.c:61
#, 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:277
+#: sys-utils/irqtop.c:270
msgid ""
"\n"
"The following interactive key commands are valid:\n"
msgstr ""
-#: sys-utils/irqtop.c:278
+#: sys-utils/irqtop.c:271
msgid " i sort by IRQ\n"
msgstr ""
-#: sys-utils/irqtop.c:279
+#: sys-utils/irqtop.c:272
msgid " t sort by TOTAL\n"
msgstr ""
-#: sys-utils/irqtop.c:280
+#: sys-utils/irqtop.c:273
msgid " d sort by DELTA\n"
msgstr ""
-#: sys-utils/irqtop.c:281
+#: sys-utils/irqtop.c:274
msgid " n sort by NAME\n"
msgstr ""
-#: sys-utils/irqtop.c:282
+#: sys-utils/irqtop.c:275
msgid " q Q quit program\n"
msgstr ""
-#: sys-utils/irqtop.c:320
+#: sys-utils/irqtop.c:313
#, fuzzy, c-format
#| msgid "unsupported mode name: '%s'"
msgid "unsupported mode '%s'"
msgstr "不支持的模式名称:“%s”"
-#: sys-utils/irqtop.c:342
+#: sys-utils/irqtop.c:335
#, fuzzy
#| msgid "failed to parse argument"
msgid "failed to parse delay argument"
msgstr "解析参数失败"
-#: sys-utils/irqtop.c:399
+#: sys-utils/irqtop.c:392
msgid "terminal setting retrieval"
msgstr ""
-#: sys-utils/ldattach.c:184
+#: sys-utils/ldattach.c:181
msgid "invalid iflag"
msgstr "无效的 iflag"
-#: sys-utils/ldattach.c:200
+#: sys-utils/ldattach.c:197
#, c-format
msgid " %s [options] <ldisc> <device>\n"
msgstr " %s [选项] <线路规则> <设备>\n"
-#: sys-utils/ldattach.c:203
+#: sys-utils/ldattach.c:200
msgid "Attach a line discipline to a serial line.\n"
msgstr "向串口线附加一条线路规则。\n"
-#: sys-utils/ldattach.c:206
+#: sys-utils/ldattach.c:203
msgid " -d, --debug print verbose messages to stderr\n"
msgstr " -d, --debug 向标准错误打印详尽消息\n"
-#: sys-utils/ldattach.c:207
+#: sys-utils/ldattach.c:204
msgid " -s, --speed <value> set serial line speed\n"
msgstr " -s, --speed <值> 设置串口线速度\n"
-#: sys-utils/ldattach.c:208
+#: sys-utils/ldattach.c:205
msgid " -c, --intro-command <string> intro sent before ldattach\n"
msgstr " -c, --intro-command <字符串> 先发送 intro 后发送 ldattach\n"
-#: sys-utils/ldattach.c:209
+#: sys-utils/ldattach.c:206
msgid " -p, --pause <seconds> pause between intro and ldattach\n"
msgstr " -p, --pause <秒数> 在 intro 和 ldattach 之间暂停\n"
-#: sys-utils/ldattach.c:210
+#: sys-utils/ldattach.c:207
msgid " -7, --sevenbits set character size to 7 bits\n"
msgstr " -7, --sevenbits 字节大小设为 7 位\n"
-#: sys-utils/ldattach.c:211
+#: sys-utils/ldattach.c:208
msgid " -8, --eightbits set character size to 8 bits\n"
msgstr " -8, --eightbits 字节大小设为 8 位\n"
-#: sys-utils/ldattach.c:212
+#: sys-utils/ldattach.c:209
msgid " -n, --noparity set parity to none\n"
msgstr " -n, --noparity 设为无校验位\n"
-#: sys-utils/ldattach.c:213
+#: sys-utils/ldattach.c:210
msgid " -e, --evenparity set parity to even\n"
msgstr " -e, --evenparity 设为奇检验\n"
-#: sys-utils/ldattach.c:214
+#: sys-utils/ldattach.c:211
msgid " -o, --oddparity set parity to odd\n"
msgstr " -o, --oddparity 设为偶检验\n"
-#: sys-utils/ldattach.c:215
+#: sys-utils/ldattach.c:212
msgid " -1, --onestopbit set stop bits to one\n"
msgstr " -1, --onestopbit 停止位设为 1\n"
-#: sys-utils/ldattach.c:216
+#: sys-utils/ldattach.c:213
msgid " -2, --twostopbits set stop bits to two\n"
msgstr " -2, --twostopbits 停止位设为 2\n"
-#: sys-utils/ldattach.c:217
+#: sys-utils/ldattach.c:214
msgid " -i, --iflag [-]<iflag> set input mode flag\n"
msgstr " -i, --iflag [-]<iflag> 设置输入模式标志\n"
-#: sys-utils/ldattach.c:222
+#: sys-utils/ldattach.c:219
msgid ""
"\n"
"Known <ldisc> names:\n"
@@ -18117,7 +19039,7 @@ msgstr ""
"\n"
"已知<线路规则>名称:\n"
-#: sys-utils/ldattach.c:226
+#: sys-utils/ldattach.c:223
msgid ""
"\n"
"Known <iflag> names:\n"
@@ -18125,118 +19047,148 @@ msgstr ""
"\n"
"已知<iflag>名称:\n"
-#: sys-utils/ldattach.c:344
+#: sys-utils/ldattach.c:341
msgid "invalid speed argument"
msgstr "无效的 速度 参数"
-#: sys-utils/ldattach.c:347
+#: sys-utils/ldattach.c:344
msgid "invalid pause argument"
msgstr "无效的暂停参数"
-#: sys-utils/ldattach.c:374
+#: sys-utils/ldattach.c:371
msgid "invalid line discipline argument"
msgstr "无效的 线路规则 参数"
-#: sys-utils/ldattach.c:394
+#: sys-utils/ldattach.c:391
#, c-format
msgid "%s is not a serial line"
msgstr "%s 不是串行线"
-#: sys-utils/ldattach.c:401
+#: sys-utils/ldattach.c:398
#, c-format
msgid "cannot get terminal attributes for %s"
msgstr "无法获取 %s 的终端属性"
-#: sys-utils/ldattach.c:404
+#: sys-utils/ldattach.c:401
#, c-format
msgid "speed %d unsupported"
msgstr "不支持速度 %d"
-#: sys-utils/ldattach.c:453
+#: sys-utils/ldattach.c:450
#, c-format
msgid "cannot set terminal attributes for %s"
msgstr "无法设置 %s 的终端属性"
-#: sys-utils/ldattach.c:463
+#: sys-utils/ldattach.c:460
#, c-format
msgid "cannot write intro command to %s"
msgstr "无法向 %s 写入 intro 命令"
-#: sys-utils/ldattach.c:473
+#: sys-utils/ldattach.c:470
msgid "cannot set line discipline"
msgstr "无法设置行规则"
-#: sys-utils/ldattach.c:483
+#: sys-utils/ldattach.c:480
msgid "cannot daemonize"
msgstr "无法转为守护进程"
-#: sys-utils/losetup.c:72
+#: sys-utils/losetup.c:85
msgid "autoclear flag set"
msgstr "已设置 自动清除 标志"
-#: sys-utils/losetup.c:73
+#: sys-utils/losetup.c:86
msgid "device backing file"
msgstr "设备后备文件"
-#: sys-utils/losetup.c:74
+#: sys-utils/losetup.c:87
msgid "backing file inode number"
msgstr "后备文件 inode 号"
-#: sys-utils/losetup.c:75
+#: sys-utils/losetup.c:88
msgid "backing file major:minor device number"
msgstr "后备文件 主:次 设备号"
-#: sys-utils/losetup.c:76
+#: sys-utils/losetup.c:89
+#, fuzzy
+#| msgid "backing file major:minor device number"
+msgid "backing file major device number"
+msgstr "后备文件 主:次 设备号"
+
+#: sys-utils/losetup.c:90
+#, fuzzy
+#| msgid "backing file major:minor device number"
+msgid "backing file minor device number"
+msgstr "后备文件 主:次 设备号"
+
+#: sys-utils/losetup.c:91
msgid "loop device name"
msgstr "回环设备名"
-#: sys-utils/losetup.c:77
+#: sys-utils/losetup.c:92
msgid "offset from the beginning"
msgstr "起始位置偏移"
-#: sys-utils/losetup.c:78
+#: sys-utils/losetup.c:93
msgid "partscan flag set"
msgstr "已设置 partscan 标志"
-#: sys-utils/losetup.c:80
+#: sys-utils/losetup.c:94
+#, fuzzy
+#| msgid "loop device name"
+msgid "loop device reference string"
+msgstr "回环设备名"
+
+#: sys-utils/losetup.c:96
msgid "size limit of the file in bytes"
msgstr "文件的大小限制(字节数)"
-#: sys-utils/losetup.c:81
+#: sys-utils/losetup.c:97
msgid "loop device major:minor number"
msgstr "回环设备 主:次 设备号"
-#: sys-utils/losetup.c:82
+#: sys-utils/losetup.c:98
+#, fuzzy
+#| msgid "loop device major:minor number"
+msgid "loop device major number"
+msgstr "回环设备 主:次 设备号"
+
+#: sys-utils/losetup.c:99
+#, fuzzy
+#| msgid "loop device major:minor number"
+msgid "loop device minor number"
+msgstr "回环设备 主:次 设备号"
+
+#: sys-utils/losetup.c:100
msgid "access backing file with direct-io"
msgstr "通过直接 IO 访问后备文件"
-#: sys-utils/losetup.c:83
+#: sys-utils/losetup.c:101
#, fuzzy
#| msgid "logical sector size"
msgid "logical sector size in bytes"
msgstr "逻辑扇区大小"
-#: sys-utils/losetup.c:140 sys-utils/losetup.c:151
+#: sys-utils/losetup.c:160 sys-utils/losetup.c:173
#, c-format
msgid ", offset %ju"
msgstr ",偏移 %ju"
-#: sys-utils/losetup.c:143 sys-utils/losetup.c:154
+#: sys-utils/losetup.c:162 sys-utils/losetup.c:175
#, c-format
msgid ", sizelimit %ju"
msgstr ",大小限制 %ju"
-#: sys-utils/losetup.c:162
+#: sys-utils/losetup.c:183
#, c-format
msgid ", encryption %s (type %u)"
msgstr ",加密 %s(类型 %u)"
-#: sys-utils/losetup.c:206
+#: sys-utils/losetup.c:238
#, c-format
msgid "%s: detach failed"
msgstr "%s:断开失败"
-#: sys-utils/losetup.c:402
+#: sys-utils/losetup.c:465
#, c-format
msgid ""
" %1$s [options] [<loopdev>]\n"
@@ -18245,357 +19197,368 @@ msgstr ""
" %1$s [选项] [<回环设备>]\n"
" %1$s [选项] -f | <回环设备> <文件>\n"
-#: sys-utils/losetup.c:407
+#: sys-utils/losetup.c:470
msgid "Set up and control loop devices.\n"
msgstr "设置和控制回环设备。\n"
-#: sys-utils/losetup.c:411
+#: sys-utils/losetup.c:474
msgid " -a, --all list all used devices\n"
msgstr " -a, --all 列出所有使用的设备\n"
-#: sys-utils/losetup.c:412
+#: sys-utils/losetup.c:475
msgid " -d, --detach <loopdev>... detach one or more devices\n"
msgstr " -d, --detach <回环设备>... 断开一台或多台设备\n"
-#: sys-utils/losetup.c:413
+#: sys-utils/losetup.c:476
msgid " -D, --detach-all detach all used devices\n"
msgstr " -D, --detach-all 断开所有使用的设备\n"
-#: sys-utils/losetup.c:414
+#: sys-utils/losetup.c:477
msgid " -f, --find find first unused device\n"
msgstr " -f, --find 查找第一个未使用的设备\n"
-#: sys-utils/losetup.c:415
+#: sys-utils/losetup.c:478
msgid " -c, --set-capacity <loopdev> resize the device\n"
msgstr " -c, --set-capacity <回环设备> 改变设备容量\n"
-#: sys-utils/losetup.c:416
+#: sys-utils/losetup.c:479
msgid " -j, --associated <file> list all devices associated with <file>\n"
msgstr " -j, --associated <文件> 列出所有与 <文件> 相关的设备\n"
-#: sys-utils/losetup.c:417
+#: sys-utils/losetup.c:480
msgid " -L, --nooverlap avoid possible conflict between devices\n"
msgstr " -L, --nooverlap 避免设备间的潜在冲突\n"
-#: sys-utils/losetup.c:421
+#: sys-utils/losetup.c:484
msgid " -o, --offset <num> start at offset <num> into file\n"
msgstr " -o, --offset <数字> 在文件偏移量 <数字> 处开始\n"
-#: sys-utils/losetup.c:422
+#: sys-utils/losetup.c:485
msgid " --sizelimit <num> device is limited to <num> bytes of the file\n"
msgstr " --sizelimit <数字> 设备限制为了文件的<数字>个字节\n"
-#: sys-utils/losetup.c:423
+#: sys-utils/losetup.c:486
#, 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:424
+#: sys-utils/losetup.c:487
msgid " -P, --partscan create a partitioned loop device\n"
msgstr " -P, --partscan 创建带分区的回环设备\n"
-#: sys-utils/losetup.c:425
+#: sys-utils/losetup.c:488
msgid " -r, --read-only set up a read-only loop device\n"
msgstr " -r, --read-only 创建只读的回环设备\n"
-#: sys-utils/losetup.c:426
+#: sys-utils/losetup.c:489
msgid " --direct-io[=<on|off>] open backing file with O_DIRECT\n"
msgstr " --direct-io[=<on|off>] 通过 O_DIRECT 打开后备文件\n"
-#: sys-utils/losetup.c:427
+#: sys-utils/losetup.c:490
+msgid " --loop-ref <string> loop device reference\n"
+msgstr ""
+
+#: sys-utils/losetup.c:491
msgid " --show print device name after setup (with -f)\n"
msgstr " --show 设置后打印设备名(加 -f 选项)\n"
-#: sys-utils/losetup.c:428
+#: sys-utils/losetup.c:492
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详尽模式\n"
-#: sys-utils/losetup.c:432
+#: sys-utils/losetup.c:496
msgid " -J, --json use JSON --list output format\n"
msgstr " -J, --json 使用 JSON --list 输出格式\n"
-#: sys-utils/losetup.c:433
+#: sys-utils/losetup.c:497
msgid " -l, --list list info about all or specified (default)\n"
msgstr " -l, --list 列出所有或指定的信息(默认)\n"
-#: sys-utils/losetup.c:434
+#: sys-utils/losetup.c:498
msgid " -n, --noheadings don't print headings for --list output\n"
msgstr " -n, --noheadings --list 输出时不打印标题\n"
-#: sys-utils/losetup.c:435
+#: sys-utils/losetup.c:499
msgid " -O, --output <cols> specify columns to output for --list\n"
msgstr " -O, --output <列> 指定 --list 选项要输出的列\n"
-#: sys-utils/losetup.c:436
+#: sys-utils/losetup.c:500
#, fuzzy
#| msgid " -O, --output-all output all columns\n"
msgid " --output-all output all columns\n"
msgstr " -O, --output-all 输出所有列\n"
-#: sys-utils/losetup.c:437
+#: sys-utils/losetup.c:501
msgid " --raw use raw --list output format\n"
msgstr " --raw 使用原生 --list 输出格式\n"
-#: sys-utils/losetup.c:465
+#: sys-utils/losetup.c:529
#, c-format
msgid "%s: Warning: file is smaller than 512 bytes; the loop device may be useless or invisible for system tools."
msgstr "%s:警告,文件小于 512 个字节,回环设备可能无用或在系统工具中看不到。"
-#: sys-utils/losetup.c:469
-#, c-format
-msgid "%s: Warning: file does not fit into a 512-byte sector; the end of the file will be ignored."
+#: sys-utils/losetup.c:533
+#, fuzzy, c-format
+#| msgid "%s: Warning: file does not fit into a 512-byte sector; the end of the file will be ignored."
+msgid "%s: Warning: file does not end on a 512-byte sector boundary; the remaining end of the file will be ignored."
msgstr "%s:警告,文件未对齐 512 字节扇区,其末尾将被忽略。"
-#: sys-utils/losetup.c:488
+#: sys-utils/losetup.c:552
msgid "cannot find an unused loop device"
msgstr "找不到未使用的回环设备"
-#: sys-utils/losetup.c:510 sys-utils/losetup.c:562
+#: sys-utils/losetup.c:575 sys-utils/losetup.c:627
#, c-format
msgid "%s: overlapping loop device exists"
msgstr "%s: 重叠的回环设备已存在"
-#: sys-utils/losetup.c:521
+#: sys-utils/losetup.c:586
#, c-format
msgid "%s: overlapping read-only loop device exists"
msgstr "%s: 存在重叠的只读回环设备"
-#: sys-utils/losetup.c:528
+#: sys-utils/losetup.c:593
#, c-format
msgid "%s: overlapping encrypted loop device exists"
msgstr "%s:存在重叠的加密回环设备"
-#: sys-utils/losetup.c:534
+#: sys-utils/losetup.c:599
#, c-format
msgid "%s: failed to re-use loop device"
msgstr "%s︰ 未能重新使用回环设备"
-#: sys-utils/losetup.c:540
+#: sys-utils/losetup.c:605
msgid "failed to inspect loop devices"
msgstr "审查回环设备失败"
-#: sys-utils/losetup.c:563
+#: sys-utils/losetup.c:628
#, c-format
msgid "%s: failed to check for conflicting loop devices"
msgstr "%s︰ 检查冲突的循环设备失败"
-#: sys-utils/losetup.c:586
+#: sys-utils/losetup.c:650
+#, fuzzy
+#| msgid "cannot set line discipline"
+msgid "cannot set loop reference string"
+msgstr "无法设置行规则"
+
+#: sys-utils/losetup.c:654
#, c-format
msgid "%s: failed to use backing file"
msgstr "%s:使用后备文件失败"
-#: sys-utils/losetup.c:683
+#: sys-utils/losetup.c:753
msgid "failed to parse logical block size"
msgstr "解析逻辑块大小失败"
-#: sys-utils/losetup.c:689 sys-utils/losetup.c:699 sys-utils/losetup.c:827
-#: sys-utils/losetup.c:841 sys-utils/losetup.c:879
+#: sys-utils/losetup.c:758 sys-utils/losetup.c:770 sys-utils/losetup.c:898
+#: sys-utils/losetup.c:912 sys-utils/losetup.c:949
#, c-format
msgid "%s: failed to use device"
msgstr "%s:使用设备失败"
-#: sys-utils/losetup.c:838
+#: sys-utils/losetup.c:909
msgid "no loop device specified"
msgstr "未指定回环设备"
-#: sys-utils/losetup.c:853
+#: sys-utils/losetup.c:924
#, c-format
msgid "the options %s are allowed during loop device setup only"
msgstr "选项 %s 只允许在设置回环设备时使用"
-#: sys-utils/losetup.c:858
+#: sys-utils/losetup.c:929
msgid "the option --offset is not allowed in this context"
msgstr "此环境下不允许使用 --offset 选项"
-#: sys-utils/losetup.c:910
+#: sys-utils/losetup.c:981
#, c-format
msgid "%s: set capacity failed"
msgstr "%s:设置容量失败"
-#: sys-utils/losetup.c:916
+#: sys-utils/losetup.c:987
#, c-format
msgid "%s: set direct io failed"
msgstr "%s︰ 设置直接 io 失败"
-#: sys-utils/losetup.c:922
+#: sys-utils/losetup.c:993
#, c-format
msgid "%s: set logical block size failed"
msgstr "%s:设置逻辑块大小失败"
-#: sys-utils/lscpu.c:48
+#: sys-utils/lscpu.c:40
msgid "none"
msgstr "无"
-#: sys-utils/lscpu.c:49
+#: sys-utils/lscpu.c:41
msgid "para"
msgstr "半"
-#: sys-utils/lscpu.c:50
+#: sys-utils/lscpu.c:42
msgid "full"
msgstr "完全"
-#: sys-utils/lscpu.c:51
+#: sys-utils/lscpu.c:43
msgid "container"
msgstr "容器"
-#: sys-utils/lscpu.c:75
+#: sys-utils/lscpu.c:67
msgid "horizontal"
msgstr "水平"
-#: sys-utils/lscpu.c:76
+#: sys-utils/lscpu.c:68
msgid "vertical"
msgstr "竖直"
-#: sys-utils/lscpu.c:144
+#: sys-utils/lscpu.c:136
msgid "crude measurement of CPU speed"
msgstr ""
-#: sys-utils/lscpu.c:145
+#: sys-utils/lscpu.c:137
msgid "logical CPU number"
msgstr "逻辑 CPU 数量"
-#: sys-utils/lscpu.c:146
+#: sys-utils/lscpu.c:138
msgid "logical core number"
msgstr "逻辑核心数量"
-#: sys-utils/lscpu.c:147
+#: sys-utils/lscpu.c:139
#, fuzzy
#| msgid "logical core number"
msgid "logical cluster number"
msgstr "逻辑核心数量"
-#: sys-utils/lscpu.c:148
+#: sys-utils/lscpu.c:140
msgid "logical socket number"
msgstr "逻辑(CPU)座数量"
-#: sys-utils/lscpu.c:149
+#: sys-utils/lscpu.c:141
msgid "logical NUMA node number"
msgstr "逻辑 NUMA 节点数量"
-#: sys-utils/lscpu.c:150
+#: sys-utils/lscpu.c:142
msgid "logical book number"
msgstr "逻辑 book 数"
-#: sys-utils/lscpu.c:151
+#: sys-utils/lscpu.c:143
msgid "logical drawer number"
msgstr "逻辑抽屉号"
-#: sys-utils/lscpu.c:152
+#: sys-utils/lscpu.c:144
msgid "shows how caches are shared between CPUs"
msgstr "显示 CPU 间是如何共享缓存的"
-#: sys-utils/lscpu.c:153
+#: sys-utils/lscpu.c:145
msgid "CPU dispatching mode on virtual hardware"
msgstr "虚拟硬件上的 CPU 调度模式"
-#: sys-utils/lscpu.c:154
+#: sys-utils/lscpu.c:146
msgid "physical address of a CPU"
msgstr "CPU 的物理地址"
-#: sys-utils/lscpu.c:155
+#: sys-utils/lscpu.c:147
msgid "shows if the hypervisor has allocated the CPU"
msgstr "显示超级监督(hypervisor)是否分配了 CPU"
-#: sys-utils/lscpu.c:156
+#: sys-utils/lscpu.c:148
msgid "shows if Linux currently makes use of the CPU"
msgstr "显示 Linux 当前是否在使用该 CPU"
-#: sys-utils/lscpu.c:157
+#: sys-utils/lscpu.c:149
#, fuzzy
#| msgid "shows the maximum MHz of the CPU"
msgid "shows the currently MHz of the CPU"
msgstr "显示 CPU 的最大 MHz"
-#: sys-utils/lscpu.c:158
+#: sys-utils/lscpu.c:150
msgid "shows scaling percentage of the CPU frequency"
msgstr ""
-#: sys-utils/lscpu.c:159
+#: sys-utils/lscpu.c:151
msgid "shows the maximum MHz of the CPU"
msgstr "显示 CPU 的最大 MHz"
-#: sys-utils/lscpu.c:160
+#: sys-utils/lscpu.c:152
msgid "shows the minimum MHz of the CPU"
msgstr "显示 CPU 的最小 MHz"
-#: sys-utils/lscpu.c:161
+#: sys-utils/lscpu.c:153
msgid "shows CPU model name"
msgstr ""
-#: sys-utils/lscpu.c:166
+#: sys-utils/lscpu.c:158
#, fuzzy
#| msgid "set filesystem readahead"
msgid "size of all system caches"
msgstr "设置 文件系统 readahead"
-#: sys-utils/lscpu.c:167
+#: sys-utils/lscpu.c:159
msgid "cache level"
msgstr "缓存等级"
-#: sys-utils/lscpu.c:168
+#: sys-utils/lscpu.c:160
msgid "cache name"
msgstr "缓存名称"
-#: sys-utils/lscpu.c:169
+#: sys-utils/lscpu.c:161
#, fuzzy
#| msgid "size of the device"
msgid "size of one cache"
msgstr "磁盘容量"
-#: sys-utils/lscpu.c:170
+#: sys-utils/lscpu.c:162
msgid "cache type"
msgstr "缓存类型"
-#: sys-utils/lscpu.c:171
+#: sys-utils/lscpu.c:163
msgid "ways of associativity"
msgstr ""
-#: sys-utils/lscpu.c:172
+#: sys-utils/lscpu.c:164
msgid "allocation policy"
msgstr ""
-#: sys-utils/lscpu.c:173
+#: sys-utils/lscpu.c:165
msgid "write policy"
msgstr "写策略"
-#: sys-utils/lscpu.c:174
+#: sys-utils/lscpu.c:166
#, fuzzy
#| msgid "Number of physical cylinders"
msgid "number of physical cache line per cache tag"
msgstr "物理柱面数"
-#: sys-utils/lscpu.c:175
+#: sys-utils/lscpu.c:167
msgid "number of sets in the cache; set lines has the same cache index"
msgstr ""
-#: sys-utils/lscpu.c:176
+#: sys-utils/lscpu.c:168
msgid "minimum amount of data in bytes transferred from memory to cache"
msgstr ""
-#: sys-utils/lscpu.c:229
+#: sys-utils/lscpu.c:221
#, fuzzy
#| msgid "failed to initialize procfs handler"
msgid "failed to initialize rootfs handler"
msgstr "%s:初始化 procfs 处理函数失败"
-#: sys-utils/lscpu.c:236
+#: sys-utils/lscpu.c:228
msgid "failed to initialize CPUs sysfs handler"
msgstr "%s:初始化 CPU sysfs 处理函数失败"
-#: sys-utils/lscpu.c:243
+#: sys-utils/lscpu.c:235
msgid "failed to initialize procfs handler"
msgstr "%s:初始化 procfs 处理函数失败"
-#: sys-utils/lscpu.c:336
+#: sys-utils/lscpu.c:328
msgid "Y"
msgstr "Y"
-#: sys-utils/lscpu.c:336
+#: sys-utils/lscpu.c:328
msgid "N"
msgstr "N"
-#: sys-utils/lscpu.c:677
+#: sys-utils/lscpu.c:669
#, fuzzy, c-format
#| msgid ""
#| "# The following is the parsable format, which can be fed to other\n"
@@ -18609,329 +19572,329 @@ msgstr ""
"# 以下是可解析格式,可以输给其他程序。每列中的各个不同项有一个惟一\n"
"# 的从 0 开始的 ID。\n"
-#: sys-utils/lscpu.c:880
+#: sys-utils/lscpu.c:876
msgid "Model name:"
msgstr "型号名称:"
-#: sys-utils/lscpu.c:882
+#: sys-utils/lscpu.c:878
msgid "BIOS Model name:"
msgstr "BIOS 型号名称:"
-#: sys-utils/lscpu.c:884
+#: sys-utils/lscpu.c:880
#, fuzzy
#| msgid "CPU family:"
msgid "BIOS CPU family:"
msgstr "CPU 系列:"
-#: sys-utils/lscpu.c:886
+#: sys-utils/lscpu.c:882
msgid "Machine type:"
msgstr "机器类型︰"
-#: sys-utils/lscpu.c:888
+#: sys-utils/lscpu.c:884
msgid "CPU family:"
msgstr "CPU 系列:"
-#: sys-utils/lscpu.c:890
+#: sys-utils/lscpu.c:886
msgid "Model:"
msgstr "型号:"
-#: sys-utils/lscpu.c:892
+#: sys-utils/lscpu.c:888
msgid "Thread(s) per core:"
msgstr "每个核的线程数:"
-#: sys-utils/lscpu.c:894
+#: sys-utils/lscpu.c:890
#, fuzzy
#| msgid "Core(s) per socket:"
msgid "Core(s) per cluster:"
msgstr "每个座的核数:"
-#: sys-utils/lscpu.c:896
+#: sys-utils/lscpu.c:892
msgid "Core(s) per socket:"
msgstr "每个座的核数:"
-#: sys-utils/lscpu.c:899
+#: sys-utils/lscpu.c:895
msgid "Socket(s) per book:"
msgstr "每个 book 的座数:"
-#: sys-utils/lscpu.c:901
+#: sys-utils/lscpu.c:897
msgid "Book(s) per drawer:"
msgstr "每个抽屉里的 Book 数︰"
-#: sys-utils/lscpu.c:902
+#: sys-utils/lscpu.c:898
msgid "Drawer(s):"
msgstr "抽屉:"
-#: sys-utils/lscpu.c:904
+#: sys-utils/lscpu.c:900
msgid "Book(s):"
msgstr "Book:"
-#: sys-utils/lscpu.c:908 sys-utils/lscpu.c:910 sys-utils/lscpu.c:915
+#: sys-utils/lscpu.c:904 sys-utils/lscpu.c:906 sys-utils/lscpu.c:911
msgid "Socket(s):"
msgstr "座:"
-#: sys-utils/lscpu.c:912
+#: sys-utils/lscpu.c:908
msgid "Cluster(s):"
msgstr ""
-#: sys-utils/lscpu.c:920
+#: sys-utils/lscpu.c:916
msgid "Stepping:"
msgstr "步进:"
-#: sys-utils/lscpu.c:922
+#: sys-utils/lscpu.c:918
#, fuzzy
#| msgid "FreeBSD boot"
msgid "Frequency boost:"
msgstr "FreeBSD 启动"
-#: sys-utils/lscpu.c:923
+#: sys-utils/lscpu.c:919
#, fuzzy
#| msgid "Unusable"
msgid "enabled"
msgstr "不可用"
-#: sys-utils/lscpu.c:923
+#: sys-utils/lscpu.c:919
#, fuzzy
#| msgid "CPU %u disabled\n"
msgid "disabled"
msgstr "CPU %u 已禁用\n"
-#: sys-utils/lscpu.c:927
+#: sys-utils/lscpu.c:923
msgid "CPU dynamic MHz:"
msgstr "CPU 动态 MHz:"
-#: sys-utils/lscpu.c:929
+#: sys-utils/lscpu.c:925
msgid "CPU static MHz:"
msgstr "CPU 静态 MHz:"
-#: sys-utils/lscpu.c:934
+#: sys-utils/lscpu.c:930
#, fuzzy
#| msgid "CPU min MHz:"
msgid "CPU(s) scaling MHz:"
msgstr "CPU 最小 MHz:"
-#: sys-utils/lscpu.c:935
+#: sys-utils/lscpu.c:931
msgid "CPU max MHz:"
msgstr "CPU 最大 MHz:"
-#: sys-utils/lscpu.c:936
+#: sys-utils/lscpu.c:932
msgid "CPU min MHz:"
msgstr "CPU 最小 MHz:"
-#: sys-utils/lscpu.c:939
+#: sys-utils/lscpu.c:935
msgid "BogoMIPS:"
msgstr "BogoMIPS:"
-#: sys-utils/lscpu.c:942
+#: sys-utils/lscpu.c:938
msgid "Dispatching mode:"
msgstr "分派模式:"
-#: sys-utils/lscpu.c:945
+#: sys-utils/lscpu.c:941
msgid "Physical sockets:"
msgstr "物理套接字︰"
-#: sys-utils/lscpu.c:946
+#: sys-utils/lscpu.c:942
msgid "Physical chips:"
msgstr "物理芯片︰"
-#: sys-utils/lscpu.c:947
+#: sys-utils/lscpu.c:943
msgid "Physical cores/chip:"
msgstr "物理核心/芯片︰"
-#: sys-utils/lscpu.c:951
+#: sys-utils/lscpu.c:947
msgid "Flags:"
msgstr "标记:"
-#: sys-utils/lscpu.c:995
+#: sys-utils/lscpu.c:991
msgid "Architecture:"
msgstr "架构:"
-#: sys-utils/lscpu.c:1008
+#: sys-utils/lscpu.c:1002
msgid "CPU op-mode(s):"
msgstr "CPU 运行模式:"
-#: sys-utils/lscpu.c:1011
+#: sys-utils/lscpu.c:1005
msgid "Address sizes:"
msgstr ""
-#: sys-utils/lscpu.c:1014 sys-utils/lscpu.c:1016
+#: sys-utils/lscpu.c:1008 sys-utils/lscpu.c:1010
msgid "Byte Order:"
msgstr "字节序:"
-#: sys-utils/lscpu.c:1019
+#: sys-utils/lscpu.c:1013
msgid "CPU(s):"
msgstr "CPU:"
-#: sys-utils/lscpu.c:1023
+#: sys-utils/lscpu.c:1017
msgid "On-line CPU(s) mask:"
msgstr "在线 CPU 掩码:"
-#: sys-utils/lscpu.c:1024
+#: sys-utils/lscpu.c:1018
msgid "On-line CPU(s) list:"
msgstr "在线 CPU 列表:"
-#: sys-utils/lscpu.c:1036
+#: sys-utils/lscpu.c:1030
msgid "failed to callocate cpu set"
msgstr "分配(callocate) CPU 组 失败"
-#: sys-utils/lscpu.c:1045
+#: sys-utils/lscpu.c:1039
msgid "Off-line CPU(s) mask:"
msgstr "离线 CPU 掩码:"
-#: sys-utils/lscpu.c:1046
+#: sys-utils/lscpu.c:1040
msgid "Off-line CPU(s) list:"
msgstr "离线 CPU 列表:"
-#: sys-utils/lscpu.c:1053
+#: sys-utils/lscpu.c:1047
msgid "Vendor ID:"
msgstr "厂商 ID:"
-#: sys-utils/lscpu.c:1055
+#: sys-utils/lscpu.c:1049
msgid "BIOS Vendor ID:"
msgstr "BIOS 厂商 ID:"
-#: sys-utils/lscpu.c:1063
+#: sys-utils/lscpu.c:1057
#, fuzzy
#| msgid "Virtualization type:"
msgid "Virtualization features:"
msgstr "虚拟化类型:"
-#: sys-utils/lscpu.c:1065 sys-utils/lscpu.c:1067
+#: sys-utils/lscpu.c:1059 sys-utils/lscpu.c:1061
msgid "Virtualization:"
msgstr "虚拟化:"
-#: sys-utils/lscpu.c:1070
+#: sys-utils/lscpu.c:1064
msgid "Hypervisor:"
msgstr "超管理器:"
-#: sys-utils/lscpu.c:1072
+#: sys-utils/lscpu.c:1066
msgid "Hypervisor vendor:"
msgstr "超管理器厂商:"
-#: sys-utils/lscpu.c:1073
+#: sys-utils/lscpu.c:1067
msgid "Virtualization type:"
msgstr "虚拟化类型:"
-#: sys-utils/lscpu.c:1096
+#: sys-utils/lscpu.c:1090
msgid "Caches (sum of all):"
msgstr ""
-#: sys-utils/lscpu.c:1100 sys-utils/lscpu.c:1130 sys-utils/lscpu.c:1162
+#: sys-utils/lscpu.c:1094 sys-utils/lscpu.c:1124 sys-utils/lscpu.c:1156
#, fuzzy, c-format
#| msgid "%s"
msgid "%s:"
msgstr "%s"
-#: sys-utils/lscpu.c:1100 sys-utils/lscpu.c:1130
+#: sys-utils/lscpu.c:1094 sys-utils/lscpu.c:1124
#, c-format
msgid "%s cache:"
msgstr "%s 缓存:"
-#: sys-utils/lscpu.c:1103
+#: sys-utils/lscpu.c:1097
#, c-format
msgid "%<PRIu64> (%d instance)"
msgid_plural "%<PRIu64> (%d instances)"
msgstr[0] ""
-#: sys-utils/lscpu.c:1112
+#: sys-utils/lscpu.c:1106
#, c-format
msgid "%s (%d instance)"
msgid_plural "%s (%d instances)"
msgstr[0] ""
-#: sys-utils/lscpu.c:1127
+#: sys-utils/lscpu.c:1121
msgid "Caches:"
msgstr "缓存:"
-#: sys-utils/lscpu.c:1146
+#: sys-utils/lscpu.c:1140
msgid "NUMA:"
msgstr ""
-#: sys-utils/lscpu.c:1148
+#: sys-utils/lscpu.c:1142
msgid "NUMA node(s):"
msgstr "NUMA 节点:"
-#: sys-utils/lscpu.c:1150
+#: sys-utils/lscpu.c:1144
#, c-format
msgid "NUMA node%d CPU(s):"
msgstr "NUMA 节点%d CPU:"
-#: sys-utils/lscpu.c:1158
+#: sys-utils/lscpu.c:1152
#, fuzzy
#| msgid "Inheritable capabilities: "
msgid "Vulnerabilities:"
msgstr "可继承的权能:"
-#: sys-utils/lscpu.c:1162
+#: sys-utils/lscpu.c:1156
#, fuzzy, c-format
#| msgid "unknown capability \"%s\""
msgid "Vulnerability %s:"
msgstr "未知权能“%s”"
-#: sys-utils/lscpu.c:1180
+#: sys-utils/lscpu.c:1174
msgid "Display information about the CPU architecture.\n"
msgstr "显示 CPU 架构信息。\n"
-#: sys-utils/lscpu.c:1183
+#: sys-utils/lscpu.c:1177
msgid " -a, --all print both online and offline CPUs (default for -e)\n"
msgstr " -a, --all 同时打印在线和离线 CPU (-e 选项默认值)\n"
-#: sys-utils/lscpu.c:1184
+#: sys-utils/lscpu.c:1178
msgid " -b, --online print online CPUs only (default for -p)\n"
msgstr " -b, --online 只打印在线 CPU (-p 选项默认值)\n"
-#: sys-utils/lscpu.c:1185
+#: sys-utils/lscpu.c:1179
#, 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:1186
+#: sys-utils/lscpu.c:1180
#, 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:1187
+#: sys-utils/lscpu.c:1181
msgid " -c, --offline print offline CPUs only\n"
msgstr " -c, --offline 只打印离线 CPU\n"
-#: sys-utils/lscpu.c:1188
+#: sys-utils/lscpu.c:1182
#, 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:1189
+#: sys-utils/lscpu.c:1183
msgid " -e, --extended[=<list>] print out an extended readable format\n"
msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n"
-#: sys-utils/lscpu.c:1190
+#: sys-utils/lscpu.c:1184
msgid " -p, --parse[=<list>] print out a parsable format\n"
msgstr " -p, --parse[=<列表>] 打印可解析格式\n"
-#: sys-utils/lscpu.c:1191
+#: sys-utils/lscpu.c:1185
msgid " -s, --sysroot <dir> use specified directory as system root\n"
msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
-#: sys-utils/lscpu.c:1192
+#: sys-utils/lscpu.c:1186
msgid " -x, --hex print hexadecimal masks rather than lists of CPUs\n"
msgstr " -x, --hex 打印十六进制掩码而非 CPU 列表\n"
-#: sys-utils/lscpu.c:1193
+#: sys-utils/lscpu.c:1187
msgid " -y, --physical print physical instead of logical IDs\n"
msgstr " -y, --physical 打印物理 ID 而非逻辑 ID\n"
-#: sys-utils/lscpu.c:1194
+#: sys-utils/lscpu.c:1188
msgid " --hierarchic[=when] use subsections in summary (auto, never, always)\n"
msgstr ""
-#: sys-utils/lscpu.c:1195
+#: sys-utils/lscpu.c:1189
#, 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:1199
+#: sys-utils/lscpu.c:1193
#, fuzzy
#| msgid ""
#| "\n"
@@ -18943,7 +19906,7 @@ msgstr ""
"\n"
"可用列(用于 -o):\n"
-#: sys-utils/lscpu.c:1203
+#: sys-utils/lscpu.c:1197
#, fuzzy
#| msgid ""
#| "\n"
@@ -18955,31 +19918,43 @@ msgstr ""
"\n"
"可用列(用于 -o):\n"
-#: sys-utils/lscpu.c:1319
+#: sys-utils/lscpu.c:1313
#, fuzzy
#| msgid "unsupported --summary argument"
msgid "unsupported --flat argument"
msgstr "不支持的 --summary 参数"
-#: sys-utils/lscpu.c:1343
+#: sys-utils/lscpu.c:1337
#, 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:606
+#: sys-utils/lscpu-cputype.c:619
msgid "error: uname failed"
msgstr "错误:uname 失败"
-#: sys-utils/lscpu-cputype.c:713
+#: sys-utils/lscpu-cputype.c:726
#, c-format
msgid "failed to determine number of CPUs: %s"
msgstr "确定 CPU 数 失败:%s"
-#: sys-utils/lscpu-cputype.c:916
+#: sys-utils/lscpu-cputype.c:929
msgid "Failed to extract the node number"
msgstr "提取节点号失败"
-#: sys-utils/lscpu-virt.c:494
+#: sys-utils/lscpu-virt.c:492 sys-utils/lscpu-virt.c:514
+#, fuzzy
+#| msgid "cannot set signal handler"
+msgid "cannot restore signal mask"
+msgstr "无法设置信号处理函数"
+
+#: sys-utils/lscpu-virt.c:499
+#, fuzzy
+#| msgid "cannot block signals"
+msgid "cannot unblock signal"
+msgstr "无法阻塞信号"
+
+#: sys-utils/lscpu-virt.c:511
#, fuzzy
#| msgid "cannot set signal handler"
msgid "cannot restore signal handler"
@@ -19303,368 +20278,376 @@ msgstr ""
"元素:\n"
"\n"
-#: sys-utils/lsipc.c:709 sys-utils/lsipc.c:873 sys-utils/lsipc.c:1072
+#: sys-utils/lsipc.c:709 sys-utils/lsipc.c:875 sys-utils/lsipc.c:1074
msgid "failed to set data"
msgstr "设置数据失败"
-#: sys-utils/lsipc.c:734
+#: sys-utils/lsipc.c:736
msgid "Number of semaphore identifiers"
msgstr "信号量标识符的数量"
-#: sys-utils/lsipc.c:735
+#: sys-utils/lsipc.c:737
msgid "Total number of semaphores"
msgstr "信号量的总数"
-#: sys-utils/lsipc.c:736
+#: sys-utils/lsipc.c:738
msgid "Max semaphores per semaphore set."
msgstr "每个信号量集的最大信号量数。"
-#: sys-utils/lsipc.c:737
+#: sys-utils/lsipc.c:739
msgid "Max number of operations per semop(2)"
msgstr "每个 semop(2) 的最大操作数"
-#: sys-utils/lsipc.c:738
+#: sys-utils/lsipc.c:740
msgid "Semaphore max value"
msgstr "信号量的最大值"
-#: sys-utils/lsipc.c:898
+#: sys-utils/lsipc.c:900
msgid "Number of message queues"
msgstr "消息队列的数目"
-#: sys-utils/lsipc.c:899
+#: sys-utils/lsipc.c:901
msgid "Max size of message (bytes)"
msgstr "消息的最大尺寸(字节)"
-#: sys-utils/lsipc.c:900
+#: sys-utils/lsipc.c:902
msgid "Default max size of queue (bytes)"
msgstr "队列的默认最大尺寸(字节)"
-#: sys-utils/lsipc.c:1014 sys-utils/lsipc.c:1033
+#: sys-utils/lsipc.c:1016 sys-utils/lsipc.c:1035
msgid "hugetlb"
msgstr "hugetlb"
-#: sys-utils/lsipc.c:1015 sys-utils/lsipc.c:1040
+#: sys-utils/lsipc.c:1017 sys-utils/lsipc.c:1042
msgid "noreserve"
msgstr "noreserve"
-#: sys-utils/lsipc.c:1097
+#: sys-utils/lsipc.c:1099
msgid "Shared memory segments"
msgstr "共享内存段"
-#: sys-utils/lsipc.c:1098
+#: sys-utils/lsipc.c:1100
msgid "Shared memory pages"
msgstr "共享内存页"
-#: sys-utils/lsipc.c:1099
+#: sys-utils/lsipc.c:1101
msgid "Max size of shared memory segment (bytes)"
msgstr "共享内存段的最大尺寸(字节)"
-#: sys-utils/lsipc.c:1100
+#: sys-utils/lsipc.c:1102
msgid "Min size of shared memory segment (bytes)"
msgstr "共享内存段的最小尺寸(字节)"
-#: sys-utils/lsipc.c:1171
+#: sys-utils/lsipc.c:1173
msgid "failed to parse IPC identifier"
msgstr "解析 IPC 标识符失败"
-#: sys-utils/lsipc.c:1268
+#: sys-utils/lsipc.c:1270
msgid "--global is mutually exclusive with --creator, --id and --time"
msgstr "--global 与 --creator, --id 和 --time 互斥"
-#: sys-utils/lsirq.c:60
+#: sys-utils/lsirq.c:53
#, fuzzy
#| msgid "Display kernel profiling information.\n"
msgid "Utility to display kernel interrupt information."
msgstr "显示内核分析信息。\n"
-#: sys-utils/lsmem.c:126
+#: sys-utils/lsmem.c:119
msgid "start and end address of the memory range"
msgstr ""
-#: sys-utils/lsmem.c:127
+#: sys-utils/lsmem.c:120
#, fuzzy
#| msgid "size of the device"
msgid "size of the memory range"
msgstr "磁盘容量"
-#: sys-utils/lsmem.c:128
+#: sys-utils/lsmem.c:121
msgid "online status of the memory range"
msgstr ""
-#: sys-utils/lsmem.c:129
+#: sys-utils/lsmem.c:122
#, fuzzy
#| msgid " removable"
msgid "memory is removable"
msgstr " 可移动"
-#: sys-utils/lsmem.c:130
+#: sys-utils/lsmem.c:123
msgid "memory block number or blocks range"
msgstr ""
-#: sys-utils/lsmem.c:131
+#: sys-utils/lsmem.c:124
#, fuzzy
#| msgid "not enough memory"
msgid "numa node of memory"
msgstr "内存不足"
-#: sys-utils/lsmem.c:132
+#: sys-utils/lsmem.c:125
msgid "valid zones for the memory range"
msgstr ""
-#: sys-utils/lsmem.c:259
+#: sys-utils/lsmem.c:252
msgid "online"
msgstr "在线"
-#: sys-utils/lsmem.c:260
+#: sys-utils/lsmem.c:253
msgid "offline"
msgstr "离线"
-#: sys-utils/lsmem.c:261
+#: sys-utils/lsmem.c:254
msgid "on->off"
msgstr ""
-#: sys-utils/lsmem.c:315 sys-utils/lsmem.c:322
+#: sys-utils/lsmem.c:308 sys-utils/lsmem.c:315
#, fuzzy
#| msgid "get blocksize"
msgid "Memory block size:"
msgstr "获得块大小"
-#: sys-utils/lsmem.c:316 sys-utils/lsmem.c:326
+#: sys-utils/lsmem.c:309 sys-utils/lsmem.c:319
#, fuzzy
#| msgid "max total shared memory"
msgid "Total online memory:"
msgstr "最大总共享内存"
-#: sys-utils/lsmem.c:317 sys-utils/lsmem.c:330
+#: sys-utils/lsmem.c:310 sys-utils/lsmem.c:323
msgid "Total offline memory:"
msgstr ""
-#: sys-utils/lsmem.c:343
+#: sys-utils/lsmem.c:336
#, c-format
msgid "Failed to open %s"
msgstr "打开 %s 失败"
-#: sys-utils/lsmem.c:462 sys-utils/lsmem.c:467
+#: sys-utils/lsmem.c:455 sys-utils/lsmem.c:460
#, fuzzy
#| msgid "failed to parse number of blocks"
msgid "failed to read memory block size"
msgstr "解析块数失败"
-#: sys-utils/lsmem.c:497
+#: sys-utils/lsmem.c:490
#, fuzzy
#| msgid "This system does not support rescanning of CPUs"
msgid "This system does not support memory blocks"
msgstr "该系统不支持重新扫描 CPU"
-#: sys-utils/lsmem.c:522
+#: sys-utils/lsmem.c:515
msgid "List the ranges of available memory with their online status.\n"
msgstr ""
-#: sys-utils/lsmem.c:527
+#: sys-utils/lsmem.c:520
#, 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:533
+#: sys-utils/lsmem.c:523
+msgid " -o, --output <list> output columns\n"
+msgstr " -o, --output <列表> 输出列\n"
+
+#: sys-utils/lsmem.c:526
#, 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:534
+#: sys-utils/lsmem.c:527
#, 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:535
+#: sys-utils/lsmem.c:528
msgid " --summary[=when] print summary information (never,always or only)\n"
msgstr ""
-#: sys-utils/lsmem.c:661
+#: sys-utils/lsmem.c:654
#, 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:669
+#: sys-utils/lsmem.c:662
#, fuzzy
#| msgid "invalid argument of -r"
msgid "invalid argument to --sysroot"
msgstr "-r 的参数无效"
-#: sys-utils/lsmem.c:717
+#: sys-utils/lsmem.c:710
msgid "Failed to initialize output column"
msgstr "初始化输出列失败"
-#: sys-utils/lsns.c:117
+#: sys-utils/lsns.c:110
msgid "namespace identifier (inode number)"
msgstr "名字空间标识符 (inode 号)"
-#: sys-utils/lsns.c:118
+#: sys-utils/lsns.c:111
msgid "kind of namespace"
msgstr "名字空间类型"
-#: sys-utils/lsns.c:119
+#: sys-utils/lsns.c:112
msgid "path to the namespace"
msgstr "名字空间路径"
-#: sys-utils/lsns.c:120
+#: sys-utils/lsns.c:113
msgid "number of processes in the namespace"
msgstr "名字空间中的进程数"
-#: sys-utils/lsns.c:121
+#: sys-utils/lsns.c:114
msgid "lowest PID in the namespace"
msgstr "名字空间中的最低 PID"
-#: sys-utils/lsns.c:122
+#: sys-utils/lsns.c:115
msgid "PPID of the PID"
msgstr "PID 的 PPID"
-#: sys-utils/lsns.c:123
+#: sys-utils/lsns.c:116
msgid "command line of the PID"
msgstr "PID 的命令行"
-#: sys-utils/lsns.c:124
+#: sys-utils/lsns.c:117
msgid "UID of the PID"
msgstr "PID 的 UID"
-#: sys-utils/lsns.c:125
+#: sys-utils/lsns.c:118
msgid "username of the PID"
msgstr "PID 的用户名"
-#: sys-utils/lsns.c:126
+#: sys-utils/lsns.c:119
msgid "namespace ID as used by network subsystem"
msgstr ""
-#: sys-utils/lsns.c:127
+#: sys-utils/lsns.c:120
msgid "nsfs mountpoint (usually used network subsystem)"
msgstr ""
-#: sys-utils/lsns.c:128
+#: sys-utils/lsns.c:121
#, fuzzy
#| msgid "namespace identifier (inode number)"
msgid "parent namespace identifier (inode number)"
msgstr "名字空间标识符 (inode 号)"
-#: sys-utils/lsns.c:129
+#: sys-utils/lsns.c:122
#, fuzzy
#| msgid "namespace identifier (inode number)"
msgid "owner namespace identifier (inode number)"
msgstr "名字空间标识符 (inode 号)"
-#: sys-utils/lsns.c:1285
+#: sys-utils/lsns.c:1278
#, c-format
msgid " %s [options] [<namespace>]\n"
msgstr " %s [选项] [<名字空间>]\n"
-#: sys-utils/lsns.c:1288
+#: sys-utils/lsns.c:1281
msgid "List system namespaces.\n"
msgstr "列出系统名字空间。\n"
-#: sys-utils/lsns.c:1296
+#: sys-utils/lsns.c:1287 sys-utils/rfkill.c:642
+msgid " -o, --output <list> define which output columns to use\n"
+msgstr " -o, --output <list> 定义使用哪个输出列\n"
+
+#: sys-utils/lsns.c:1289
#, fuzzy
#| msgid " -q, --quiet suppress output messages"
msgid " -P, --persistent namespaces without processes\n"
msgstr " -q, --quiet 禁止输出信息"
-#: sys-utils/lsns.c:1297
+#: sys-utils/lsns.c:1290
msgid " -p, --task <pid> print process namespaces\n"
msgstr " -p, --task <pid> 打印进程名字空间\n"
-#: sys-utils/lsns.c:1300
+#: sys-utils/lsns.c:1293
msgid " -W, --nowrap don't use multi-line representation\n"
msgstr " -W, --nowrap 不要使用多行表现\n"
-#: sys-utils/lsns.c:1301
+#: sys-utils/lsns.c:1294
#, 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:1302
+#: sys-utils/lsns.c:1295
#, 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
+#: sys-utils/lsns.c:1396
#, c-format
msgid "unknown namespace type: %s"
msgstr "未知的名字空间类型︰ %s"
-#: sys-utils/lsns.c:1423
+#: sys-utils/lsns.c:1416
#, fuzzy, c-format
#| msgid "unknown namespace type: %s"
msgid "unknown tree type: %s"
msgstr "未知的名字空间类型︰ %s"
-#: sys-utils/lsns.c:1445
+#: sys-utils/lsns.c:1438
msgid "--task is mutually exclusive with <namespace>"
msgstr "--task 与 <名字空间> 互斥"
-#: sys-utils/lsns.c:1446
+#: sys-utils/lsns.c:1439
msgid "invalid namespace argument"
msgstr "无效的名字空间参数"
-#: sys-utils/lsns.c:1476
+#: sys-utils/lsns.c:1469
#, 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
+#: sys-utils/lsns.c:1497
#, c-format
msgid "not found namespace: %ju"
msgstr "找不到名字空间︰ %ju"
-#: sys-utils/mount.c:63 sys-utils/umount.c:126
+#: sys-utils/mount.c:55 sys-utils/umount.c:126
#, fuzzy
#| msgid "permission denied"
msgid "drop permissions failed."
msgstr "权限不足"
-#: sys-utils/mount.c:83 sys-utils/umount.c:65
+#: sys-utils/mount.c:75 sys-utils/umount.c:65
#, c-format
msgid "%s from %s (libmount %s"
msgstr "%s,来自 %s(libmount %s"
-#: sys-utils/mount.c:130
+#: sys-utils/mount.c:122
msgid "failed to read mtab"
msgstr "读取 mtab 失败"
-#: sys-utils/mount.c:192 sys-utils/mount.c:259 sys-utils/umount.c:209
+#: sys-utils/mount.c:184 sys-utils/mount.c:251 sys-utils/umount.c:209
#, c-format
msgid "%-25s: ignored\n"
msgstr "%-25s:已忽略\n"
-#: sys-utils/mount.c:193
+#: sys-utils/mount.c:185
#, c-format
msgid "%-25s: already mounted\n"
msgstr "%-25s:已经挂载\n"
-#: sys-utils/mount.c:300
+#: sys-utils/mount.c:292
#, c-format
msgid "%s: %s moved to %s.\n"
msgstr "%s:%s 已移到 %s。\n"
-#: sys-utils/mount.c:302
+#: sys-utils/mount.c:294
#, c-format
msgid "%s: %s bound on %s.\n"
msgstr "%s:%s 已绑定到 %s 。\n"
-#: sys-utils/mount.c:305 sys-utils/mount.c:309
+#: sys-utils/mount.c:297 sys-utils/mount.c:301
#, c-format
msgid "%s: %s mounted on %s.\n"
msgstr "%s:%s 已挂臷到 %s。\n"
-#: sys-utils/mount.c:307
+#: sys-utils/mount.c:299
#, c-format
msgid "%s: %s propagation flags changed.\n"
msgstr "%s:%s 传播标志已更改。\n"
-#: sys-utils/mount.c:327
+#: sys-utils/mount.c:319
#, fuzzy, c-format
#| msgid ""
#| "mount: %s does not contain SELinux labels.\n"
@@ -19684,34 +20667,34 @@ msgstr ""
" 受限制的应用程序可能会生成 AVC 消息,并被阻止访问该文件系统。\n"
" 更多详细信息请参阅 restorecon(8) 和 mount(8)。\n"
-#: sys-utils/mount.c:356
+#: sys-utils/mount.c:348
#, 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
+#: sys-utils/mount.c:380
#, c-format
msgid " dmesg(1) may have more information after failed mount system call.\n"
msgstr ""
-#: sys-utils/mount.c:417
+#: sys-utils/mount.c:409
#, c-format
msgid "%s: failed to parse"
msgstr "%s:解析失败"
-#: sys-utils/mount.c:459
+#: sys-utils/mount.c:451
#, c-format
msgid "unsupported option format: %s"
msgstr "不支持的参数格式:%s"
-#: sys-utils/mount.c:465
+#: sys-utils/mount.c:457
#, c-format
msgid "failed to append option '%s'"
msgstr "追加选项“%s”失败"
-#: sys-utils/mount.c:486
+#: sys-utils/mount.c:478
#, c-format
msgid ""
" %1$s [-lhV]\n"
@@ -19726,61 +20709,85 @@ msgstr ""
" %1$s [选项] <源> <目录>\n"
" %1$s <操作> <挂载点> [<目标>]\n"
-#: sys-utils/mount.c:494
+#: sys-utils/mount.c:486
msgid "Mount a filesystem.\n"
msgstr "挂载文件系统。\n"
-#: sys-utils/mount.c:497
+#: sys-utils/mount.c:489
#, fuzzy
#| msgid " -a, --all unmount all filesystems\n"
msgid " -a, --all mount all filesystems mentioned in fstab\n"
msgstr " -a, --all 卸载所有文件系统\n"
-#: sys-utils/mount.c:498 sys-utils/umount.c:94
+#: sys-utils/mount.c:490 sys-utils/umount.c:94
msgid " -c, --no-canonicalize don't canonicalize paths\n"
msgstr " -c, --no-canonicalize 不对路径规范化\n"
-#: sys-utils/mount.c:499
+#: sys-utils/mount.c:491
#, 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
+#: sys-utils/mount.c:492
#, 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
+#: sys-utils/mount.c:493
#, 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
+#: sys-utils/mount.c:494
msgid " -i, --internal-only don't call the mount.<type> helpers\n"
msgstr " -i, --internal-only 不调用 mount.<type> 辅助程序\n"
-#: sys-utils/mount.c:503
+#: sys-utils/mount.c:495
msgid " -l, --show-labels show also filesystem labels\n"
msgstr " -l, --show-labels 也显示文件系统标签\n"
-#: sys-utils/mount.c:504
+#: sys-utils/mount.c:496
+#, fuzzy
+#| msgid " -r, --map-root-user map current user to root (implies --user)\n"
+msgid ""
+" --map-groups <inner>:<outer>:<count>\n"
+" add the specified GID map to an ID-mapped mount\n"
+msgstr " -r, --map-root-user 将当前用户映射为 root (连带打开 --user)\n"
+
+#: sys-utils/mount.c:498
+#, fuzzy
+#| msgid " -r, --map-root-user map current user to root (implies --user)\n"
+msgid ""
+" --map-users <inner>:<outer>:<count>\n"
+" add the specified UID map to an ID-mapped mount\n"
+msgstr " -r, --map-root-user 将当前用户映射为 root (连带打开 --user)\n"
+
+#: sys-utils/mount.c:500
+#, fuzzy
+#| msgid " --default use default terminal settings\n"
+msgid ""
+" --map-users /proc/<pid>/ns/user\n"
+" specify the user namespace for an ID-mapped mount\n"
+msgstr " --default 使用默认终端设置\n"
+
+#: sys-utils/mount.c:502
msgid " -m, --mkdir[=<mode>] alias to '-o X-mount.mkdir[=<mode>]'\n"
msgstr ""
-#: sys-utils/mount.c:505 sys-utils/umount.c:99
+#: sys-utils/mount.c:503 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:506
+#: sys-utils/mount.c:504
msgid ""
" --options-mode <mode>\n"
" what to do with options loaded from fstab\n"
msgstr ""
-#: sys-utils/mount.c:508
+#: sys-utils/mount.c:506
#, fuzzy
#| msgid ""
#| " --propagation slave|shared|private|unchanged\n"
@@ -19792,39 +20799,39 @@ msgstr ""
" --propagation slave|shared|private|unchanged\n"
" 修改 mount 名字空间中的 mount 传播\n"
-#: sys-utils/mount.c:510
+#: sys-utils/mount.c:508
msgid ""
" --options-source-force\n"
" force use of options from fstab/mtab\n"
msgstr ""
-#: sys-utils/mount.c:512
+#: sys-utils/mount.c:510
#, 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
+#: sys-utils/mount.c:511
#, 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
+#: sys-utils/mount.c:512 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
+#: sys-utils/mount.c:513
#, 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
+#: sys-utils/mount.c:514 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
+#: sys-utils/mount.c:515
#, fuzzy
#| msgid ""
#| " --source <src> explicitly specifies source (path, label, uuid)\n"
@@ -19834,7 +20841,7 @@ msgstr ""
" --source <源> 指明源(路径、标签、uuid)\n"
" --target <目标> 指明挂载点\n"
-#: sys-utils/mount.c:518
+#: sys-utils/mount.c:516
#, fuzzy
#| msgid ""
#| " --source <src> explicitly specifies source (path, label, uuid)\n"
@@ -19844,7 +20851,7 @@ msgstr ""
" --source <源> 指明源(路径、标签、uuid)\n"
" --target <目标> 指明挂载点\n"
-#: sys-utils/mount.c:519
+#: sys-utils/mount.c:517
#, fuzzy
#| msgid " --default use default terminal settings\n"
msgid ""
@@ -19852,79 +20859,79 @@ msgid ""
" specifies path used for all mountpoints\n"
msgstr " --default 使用默认终端设置\n"
-#: sys-utils/mount.c:521 sys-utils/umount.c:105
+#: sys-utils/mount.c:519 sys-utils/umount.c:105
msgid " -v, --verbose say what is being done\n"
msgstr " -v, --verbose 打印当前进行的操作\n"
-#: sys-utils/mount.c:522
+#: sys-utils/mount.c:520
msgid " -w, --rw, --read-write mount the filesystem read-write (default)\n"
msgstr " -w, --rw, --read-write 以读写方式挂载文件系统(默认)\n"
-#: sys-utils/mount.c:523
+#: sys-utils/mount.c:521
#, fuzzy
#| msgid " -S, --setuid <uid> set uid in entered namespace\n"
msgid " -N, --namespace <ns> perform mount in another namespace\n"
msgstr " -S, --setuid <uid> 设置进入空间中的 uid\n"
-#: sys-utils/mount.c:529
+#: sys-utils/mount.c:527
#, fuzzy
#| msgid "Resource"
msgid "Source:\n"
msgstr "资源"
-#: sys-utils/mount.c:530
+#: sys-utils/mount.c:528
#, 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
+#: sys-utils/mount.c:529
#, 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
+#: sys-utils/mount.c:530
#, 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
+#: sys-utils/mount.c:531
msgid " UUID=<uuid> specifies device by filesystem UUID\n"
msgstr ""
-#: sys-utils/mount.c:534
+#: sys-utils/mount.c:532
msgid " PARTLABEL=<label> specifies device by partition label\n"
msgstr ""
-#: sys-utils/mount.c:535
+#: sys-utils/mount.c:533
msgid " PARTUUID=<uuid> specifies device by partition UUID\n"
msgstr ""
-#: sys-utils/mount.c:536
+#: sys-utils/mount.c:534
#, 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
+#: sys-utils/mount.c:535
#, fuzzy
#| msgid " <dev> device (usually disk) path\n"
msgid " <device> specifies device by path\n"
msgstr " <设备> 设备(通常是磁盘)的路径\n"
-#: sys-utils/mount.c:538
+#: sys-utils/mount.c:536
msgid " <directory> mountpoint for bind mounts (see --bind/rbind)\n"
msgstr ""
-#: sys-utils/mount.c:539
+#: sys-utils/mount.c:537
#, 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
+#: sys-utils/mount.c:540
#, fuzzy
#| msgid ""
#| "\n"
@@ -19934,85 +20941,85 @@ msgstr ""
"\n"
"选项:\n"
-#: sys-utils/mount.c:543
+#: sys-utils/mount.c:541
#, 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
+#: sys-utils/mount.c:542
#, 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
+#: sys-utils/mount.c:543
#, 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
+#: sys-utils/mount.c:544
#, 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
+#: sys-utils/mount.c:545
#, 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
+#: sys-utils/mount.c:546
msgid " --make-private mark a subtree as private\n"
msgstr ""
-#: sys-utils/mount.c:549
+#: sys-utils/mount.c:547
msgid " --make-unbindable mark a subtree as unbindable\n"
msgstr ""
-#: sys-utils/mount.c:550
+#: sys-utils/mount.c:548
#, 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
+#: sys-utils/mount.c:549
#, 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
+#: sys-utils/mount.c:550
#, 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
+#: sys-utils/mount.c:551
msgid " --make-runbindable recursively mark a whole subtree as unbindable\n"
msgstr ""
-#: sys-utils/mount.c:704 sys-utils/umount.c:520
+#: sys-utils/mount.c:707 sys-utils/umount.c:520
msgid "libmount context allocation failed"
msgstr "libmount 环境(context)分配失败"
-#: sys-utils/mount.c:766 sys-utils/umount.c:582
+#: sys-utils/mount.c:769 sys-utils/umount.c:582
msgid "failed to set options pattern"
msgstr "设置选项模式失败"
-#: sys-utils/mount.c:818 sys-utils/umount.c:599
+#: sys-utils/mount.c:821 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:986
+#: sys-utils/mount.c:1009
msgid "source specified more than once"
msgstr "源指定了多次"
-#: sys-utils/mountpoint.c:121
+#: sys-utils/mountpoint.c:112
#, c-format
msgid ""
" %1$s [-qd] /path/to/directory\n"
@@ -20021,11 +21028,11 @@ msgstr ""
" %1$s [-qd] /目录/的/路径\n"
" %1$s -x /dev/设备\n"
-#: sys-utils/mountpoint.c:125
+#: sys-utils/mountpoint.c:116
msgid "Check whether a directory or file is a mountpoint.\n"
msgstr "检查目录或文件是否为挂载点。\n"
-#: sys-utils/mountpoint.c:128
+#: sys-utils/mountpoint.c:119
#, fuzzy
#| msgid ""
#| " -q, --quiet quiet mode - don't print anything\n"
@@ -20041,323 +21048,381 @@ msgstr ""
" -d, --fs-devno 打印文件系统的 主:次 设备号\n"
" -x, --devno 打印块设备的主:次设备号\n"
-#: sys-utils/mountpoint.c:210
+#: sys-utils/mountpoint.c:201
#, c-format
msgid "%s is not a mountpoint\n"
msgstr "%s 不是一个挂载点\n"
-#: sys-utils/mountpoint.c:216
+#: sys-utils/mountpoint.c:207
#, c-format
msgid "%s is a mountpoint\n"
msgstr "%s 是一个挂载点\n"
-#: sys-utils/nsenter.c:78 sys-utils/setarch.c:144 sys-utils/unshare.c:643
+#: sys-utils/nsenter.c:82 sys-utils/setarch.c:144 sys-utils/unshare.c:733
#, c-format
msgid " %s [options] [<program> [<argument>...]]\n"
msgstr " %s [选项] [<程序> [<参数>...]]\n"
-#: sys-utils/nsenter.c:82
+#: sys-utils/nsenter.c:86
msgid "Run a program with namespaces of other processes.\n"
msgstr "以其他程序的名字空间运行某个程序。\n"
-#: sys-utils/nsenter.c:85
+#: sys-utils/nsenter.c:89
msgid " -a, --all enter all namespaces\n"
msgstr " -a, --all 进入所有名字空间\n"
-#: sys-utils/nsenter.c:86
+#: sys-utils/nsenter.c:90
msgid " -t, --target <pid> target process to get namespaces from\n"
msgstr " -t, --target <pid> 要获取名字空间的目标进程\n"
-#: sys-utils/nsenter.c:87
+#: sys-utils/nsenter.c:91
msgid " -m, --mount[=<file>] enter mount namespace\n"
msgstr " -m, --mount[=<文件>] 进入 mount 名字空间\n"
-#: sys-utils/nsenter.c:88
+#: sys-utils/nsenter.c:92
msgid " -u, --uts[=<file>] enter UTS namespace (hostname etc)\n"
msgstr " -u, --uts[=<文件>] 进入 UTS 名字空间(主机名等)\n"
-#: sys-utils/nsenter.c:89
+#: sys-utils/nsenter.c:93
msgid " -i, --ipc[=<file>] enter System V IPC namespace\n"
msgstr " -i, --ipc[=<文件>] 进入 System V IPC 名字空间\n"
-#: sys-utils/nsenter.c:90
+#: sys-utils/nsenter.c:94
msgid " -n, --net[=<file>] enter network namespace\n"
msgstr " -n, --net[=<文件>] 进入网络名字空间\n"
-#: sys-utils/nsenter.c:91
+#: sys-utils/nsenter.c:95
msgid " -p, --pid[=<file>] enter pid namespace\n"
msgstr " -p, --pid[=<文件>] 进入 pid 名字空间\n"
-#: sys-utils/nsenter.c:92
+#: sys-utils/nsenter.c:96
msgid " -C, --cgroup[=<file>] enter cgroup namespace\n"
msgstr " -C, --cgroup[=<文件>] 进入 cgroup 名字空间\n"
-#: sys-utils/nsenter.c:93
+#: sys-utils/nsenter.c:97
msgid " -U, --user[=<file>] enter user namespace\n"
msgstr " -U, --user[=<文件>] 进入用户名字空间\n"
-#: sys-utils/nsenter.c:94
+#: sys-utils/nsenter.c:98
+#, fuzzy
+#| msgid " -U, --user[=<file>] enter user namespace\n"
+msgid " --user-parent enter parent user namespace\n"
+msgstr " -U, --user[=<文件>] 进入用户名字空间\n"
+
+#: sys-utils/nsenter.c:99
#, 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:95
+#: sys-utils/nsenter.c:100
#, 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:96
+#: sys-utils/nsenter.c:101
#, 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:97
+#: sys-utils/nsenter.c:102
msgid " --preserve-credentials do not touch uids or gids\n"
msgstr " --preserve-credentials 不干涉 uid 或 gid\n"
-#: sys-utils/nsenter.c:98
+#: sys-utils/nsenter.c:103
+#, fuzzy
+#| msgid " -a, --all print all devices\n"
+msgid " --keep-caps retain capabilities granted in user namespaces\n"
+msgstr " -a, --all 打印所有设备\n"
+
+#: sys-utils/nsenter.c:104
msgid " -r, --root[=<dir>] set the root directory\n"
msgstr " -r, --root[=<目录>] 设置根目录\n"
-#: sys-utils/nsenter.c:99
+#: sys-utils/nsenter.c:105
msgid " -w, --wd[=<dir>] set the working directory\n"
msgstr " -w, --wd[=<dir>] 设置工作目录\n"
-#: sys-utils/nsenter.c:100
+#: sys-utils/nsenter.c:106
#, 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
+#: sys-utils/nsenter.c:107
#, 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
+#: sys-utils/nsenter.c:108
msgid " -F, --no-fork do not fork before exec'ing <program>\n"
msgstr " -F, --no-fork 执行 <程序> 前不 fork\n"
-#: sys-utils/nsenter.c:104
+#: sys-utils/nsenter.c:109
+#, fuzzy
+#| msgid " -s, --symlink act on the target of symlinks\n"
+msgid " -c, --join-cgroup join the cgroup of the target process\n"
+msgstr " -s, --symlink 在符号链接的目标上执行操作\n"
+
+#: sys-utils/nsenter.c:111
msgid " -Z, --follow-context set SELinux context according to --target PID\n"
msgstr " -Z, --follow-context 根据 --target PID 设置 SELinux 环境\n"
-#: sys-utils/nsenter.c:131
+#: sys-utils/nsenter.c:143
+#, fuzzy, c-format
+#| msgid "failed to set personality to %s"
+msgid "failed to open parent ns of %s"
+msgstr "无法将人格(personality)设置为 %s"
+
+#: sys-utils/nsenter.c:149
+#, fuzzy
+#| msgid "unknown namespace type: %s"
+msgid "no namespaces to get parent of"
+msgstr "未知的名字空间类型︰ %s"
+
+#: sys-utils/nsenter.c:166
#, c-format
msgid "neither filename nor target pid supplied for %s"
msgstr "没有为 %s 提供文件名或目标 pid"
-#: sys-utils/nsenter.c:353 sys-utils/unshare.c:828 sys-utils/unshare.c:884
+#: sys-utils/nsenter.c:211 sys-utils/nsenter.c:217
+#, fuzzy
+#| msgid "%s: failed to get device path"
+msgid "failed to get cgroup path"
+msgstr "%s:获取设备路径失败"
+
+#: sys-utils/nsenter.c:223
+#, fuzzy
+#| msgid "failed to open: %s"
+msgid "failed to open cgroup.procs"
+msgstr "打开失败:%s"
+
+#: sys-utils/nsenter.c:235
+#, fuzzy, c-format
+#| msgid "stat of %s failed"
+msgid "statfs %s failed"
+msgstr "对 %s stat 失败"
+
+#: sys-utils/nsenter.c:248
+#, fuzzy
+#| msgid "initgroups failed"
+msgid "write cgroup.procs failed"
+msgstr "initgroups 失败"
+
+#: sys-utils/nsenter.c:444 sys-utils/unshare.c:918 sys-utils/unshare.c:980
msgid "failed to parse uid"
msgstr "解析 uid 失败"
-#: sys-utils/nsenter.c:360 sys-utils/unshare.c:832 sys-utils/unshare.c:888
+#: sys-utils/nsenter.c:451 sys-utils/unshare.c:922 sys-utils/unshare.c:984
msgid "failed to parse gid"
msgstr "解析 gid 失败"
-#: sys-utils/nsenter.c:406
+#: sys-utils/nsenter.c:506
msgid "no target PID specified for --follow-context"
msgstr "没有为 --follow-context 设置目标 PID"
-#: sys-utils/nsenter.c:408
+#: sys-utils/nsenter.c:508
#, c-format
msgid "failed to get %d SELinux context"
msgstr "未能获取 %d SELinux 环境"
-#: sys-utils/nsenter.c:411
+#: sys-utils/nsenter.c:511
#, c-format
msgid "failed to set exec context to '%s'"
msgstr "向“%s”设置 exec 环境失败"
-#: sys-utils/nsenter.c:418
+#: sys-utils/nsenter.c:518
#, fuzzy
#| msgid "no target PID specified for --follow-context"
msgid "no target PID specified for --all"
msgstr "没有为 --follow-context 设置目标 PID"
-#: sys-utils/nsenter.c:482
+#: sys-utils/nsenter.c:546
+msgid "--join-cgroup is only supported in cgroup v2"
+msgstr ""
+
+#: sys-utils/nsenter.c:593
#, c-format
msgid "reassociate to namespace '%s' failed"
msgstr "重新关联到名字空间“%s”失败"
-#: sys-utils/nsenter.c:498 sys-utils/nsenter.c:521
+#: sys-utils/nsenter.c:609 sys-utils/nsenter.c:632
msgid "cannot open current working directory"
msgstr "打不开当前工作目录"
-#: sys-utils/nsenter.c:505
+#: sys-utils/nsenter.c:616
msgid "change directory by root file descriptor failed"
msgstr "根据 root 文件描述符 更改目录失败"
-#: sys-utils/nsenter.c:508
+#: sys-utils/nsenter.c:619
msgid "chroot failed"
msgstr "chroot 失败"
-#: sys-utils/nsenter.c:528
+#: sys-utils/nsenter.c:639
msgid "change directory by working directory file descriptor failed"
msgstr "按工作目录文件描述符更改目录失败"
-#: sys-utils/nsenter.c:537
+#: sys-utils/nsenter.c:648
#, fuzzy
#| msgid "failed to set the %s environment variable"
msgid "failed to get environment variables"
msgstr "设置环境变量 %s 失败"
-#: sys-utils/nsenter.c:540
+#: sys-utils/nsenter.c:651
#, fuzzy
#| msgid "failed to set the %s environment variable"
msgid "failed to set environment variables"
msgstr "设置环境变量 %s 失败"
-#: sys-utils/nsenter.c:549
+#: sys-utils/nsenter.c:664
#, 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
+#: sys-utils/nsenter.c:680 sys-utils/setpriv.c:1041 sys-utils/setpriv.c:1048
+#: sys-utils/unshare.c:1183
msgid "setgroups failed"
msgstr "setgroups 失败"
-#: sys-utils/pivot_root.c:34
+#: sys-utils/pivot_root.c:29
#, c-format
msgid " %s [options] new_root put_old\n"
msgstr " %s [选项] 新根目录 旧根目录更名\n"
-#: sys-utils/pivot_root.c:38
+#: sys-utils/pivot_root.c:33
msgid "Change the root filesystem.\n"
msgstr "更改根文件系统。\n"
-#: sys-utils/pivot_root.c:75
+#: sys-utils/pivot_root.c:70
#, c-format
msgid "failed to change root from `%s' to `%s'"
msgstr "将根目录从“%s”更改为“%s”失败"
-#: sys-utils/prlimit.c:77
+#: sys-utils/prlimit.c:69
msgid "address space limit"
msgstr "地址空间限制"
-#: sys-utils/prlimit.c:78
+#: sys-utils/prlimit.c:70
msgid "max core file size"
msgstr "最大核心文件尺寸"
-#: sys-utils/prlimit.c:79
+#: sys-utils/prlimit.c:71
msgid "CPU time"
msgstr "CPU 时间"
-#: sys-utils/prlimit.c:79
+#: sys-utils/prlimit.c:71
msgid "seconds"
msgstr "秒数"
-#: sys-utils/prlimit.c:80
+#: sys-utils/prlimit.c:72
msgid "max data size"
msgstr "最大数据尺寸"
-#: sys-utils/prlimit.c:81
+#: sys-utils/prlimit.c:73
msgid "max file size"
msgstr "最大文件尺寸"
-#: sys-utils/prlimit.c:82
+#: sys-utils/prlimit.c:74
msgid "max number of file locks held"
msgstr "最大文件锁保持数量"
-#: sys-utils/prlimit.c:82
+#: sys-utils/prlimit.c:74
msgid "locks"
msgstr "锁"
-#: sys-utils/prlimit.c:83
+#: sys-utils/prlimit.c:75
msgid "max locked-in-memory address space"
msgstr "最大内存锁定(locked-in-memory)地址空间"
-#: sys-utils/prlimit.c:84
+#: sys-utils/prlimit.c:76
msgid "max bytes in POSIX mqueues"
msgstr "POSIX 消息队列中的最大字节数"
-#: sys-utils/prlimit.c:85
+#: sys-utils/prlimit.c:77
msgid "max nice prio allowed to raise"
msgstr "允许提升的最大 nice 优先级"
-#: sys-utils/prlimit.c:86
+#: sys-utils/prlimit.c:78
msgid "max number of open files"
msgstr "打开文件的最大数量"
-#: sys-utils/prlimit.c:86
+#: sys-utils/prlimit.c:78
msgid "files"
msgstr "文件"
-#: sys-utils/prlimit.c:87
+#: sys-utils/prlimit.c:79
msgid "max number of processes"
msgstr "最大进程数"
-#: sys-utils/prlimit.c:88
+#: sys-utils/prlimit.c:80
msgid "max resident set size"
msgstr "最大驻留集尺寸"
-#: sys-utils/prlimit.c:89
+#: sys-utils/prlimit.c:81
msgid "max real-time priority"
msgstr "最大实时优先级"
-#: sys-utils/prlimit.c:90
+#: sys-utils/prlimit.c:82
msgid "timeout for real-time tasks"
msgstr "实时任务超时"
-#: sys-utils/prlimit.c:90
+#: sys-utils/prlimit.c:82
msgid "microsecs"
msgstr "毫秒数"
-#: sys-utils/prlimit.c:91
+#: sys-utils/prlimit.c:83
msgid "max number of pending signals"
msgstr "挂起(pending)信号的最大数量"
-#: sys-utils/prlimit.c:91
+#: sys-utils/prlimit.c:83
msgid "signals"
msgstr "信号"
-#: sys-utils/prlimit.c:92
+#: sys-utils/prlimit.c:84
msgid "max stack size"
msgstr "最大栈(stack)尺寸"
-#: sys-utils/prlimit.c:125
+#: sys-utils/prlimit.c:117
msgid "resource name"
msgstr "资源名称"
-#: sys-utils/prlimit.c:126
+#: sys-utils/prlimit.c:118
msgid "resource description"
msgstr "资源描述"
-#: sys-utils/prlimit.c:127
+#: sys-utils/prlimit.c:119
msgid "soft limit"
msgstr "软限制"
-#: sys-utils/prlimit.c:128
+#: sys-utils/prlimit.c:120
msgid "hard limit (ceiling)"
msgstr "硬限制(触顶)"
-#: sys-utils/prlimit.c:129
+#: sys-utils/prlimit.c:121
msgid "units"
msgstr "单位"
-#: sys-utils/prlimit.c:168
+#: sys-utils/prlimit.c:160
#, 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:170
+#: sys-utils/prlimit.c:162
#, 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:173
+#: sys-utils/prlimit.c:165
msgid "Show or change the resource limits of a process.\n"
msgstr "显示或更改进程的资源限制。 \n"
-#: sys-utils/prlimit.c:176
+#: sys-utils/prlimit.c:168
#, fuzzy
#| msgid ""
#| " -p, --pid <pid> process id\n"
@@ -20382,7 +21447,7 @@ msgstr ""
" -h, --help 显示此帮助并退出\n"
" -V, --version 输出版本信息并退出\n"
-#: sys-utils/prlimit.c:184
+#: sys-utils/prlimit.c:176
#, fuzzy
#| msgid "Resource"
msgid ""
@@ -20390,7 +21455,7 @@ msgid ""
"Resources:\n"
msgstr "资源"
-#: sys-utils/prlimit.c:185
+#: sys-utils/prlimit.c:177
msgid ""
" -c, --core maximum size of core files created\n"
" -d, --data maximum size of a process's data segment\n"
@@ -20428,157 +21493,157 @@ msgstr ""
" -y, --rttime 实时调度时进程调度的 CPU\n"
" (间隔)时间(毫秒)\n"
-#: sys-utils/prlimit.c:205
+#: sys-utils/prlimit.c:197
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
+#: sys-utils/prlimit.c:248 sys-utils/prlimit.c:254 sys-utils/prlimit.c:371
+#: sys-utils/prlimit.c:376
msgid "unlimited"
msgstr "无限制"
-#: sys-utils/prlimit.c:345
+#: sys-utils/prlimit.c:337
#, c-format
msgid "failed to get old %s limit"
msgstr "获取旧的 %s 限制失败"
-#: sys-utils/prlimit.c:369
+#: sys-utils/prlimit.c:361
#, c-format
msgid "the soft limit %s cannot exceed the hard limit"
msgstr "软限制 %s 不能超过硬限制"
-#: sys-utils/prlimit.c:376
+#: sys-utils/prlimit.c:368
#, c-format
msgid "New %s limit for pid %d: "
msgstr "pid %2$d 的新 %1$s 限制:"
-#: sys-utils/prlimit.c:391
+#: sys-utils/prlimit.c:383
#, c-format
msgid "failed to set the %s resource limit"
msgstr "设置 %s 资源限制失败"
-#: sys-utils/prlimit.c:392
+#: sys-utils/prlimit.c:384
#, c-format
msgid "failed to get the %s resource limit"
msgstr "获取 %s 资源限制失败"
-#: sys-utils/prlimit.c:474
+#: sys-utils/prlimit.c:468
#, c-format
msgid "failed to parse %s limit"
msgstr "解析 %s 限制失败"
-#: sys-utils/prlimit.c:603
+#: sys-utils/prlimit.c:597
msgid "option --pid may be specified only once"
msgstr "--pid 选项只能指定一次"
-#: sys-utils/prlimit.c:632
+#: sys-utils/prlimit.c:626
msgid "options --pid and COMMAND are mutually exclusive"
msgstr "--pid 和 命令 互相排斥"
-#: sys-utils/readprofile.c:109
+#: sys-utils/readprofile.c:98
msgid "Display kernel profiling information.\n"
msgstr "显示内核分析信息。\n"
-#: sys-utils/readprofile.c:113
+#: sys-utils/readprofile.c:102
#, c-format
msgid " -m, --mapfile <mapfile> (defaults: \"%s\" and\n"
msgstr " -m, --mapfile <映射文件> (默认:“%s”和\n"
-#: sys-utils/readprofile.c:115
+#: sys-utils/readprofile.c:104
#, c-format
msgid " \"%s\")\n"
msgstr " “%s”)\n"
-#: sys-utils/readprofile.c:117
+#: sys-utils/readprofile.c:106
#, c-format
msgid " -p, --profile <pro-file> (default: \"%s\")\n"
msgstr " -p, --profile <pro-file> (默认:“%s”)\n"
-#: sys-utils/readprofile.c:118
+#: sys-utils/readprofile.c:107
msgid " -M, --multiplier <mult> set the profiling multiplier to <mult>\n"
msgstr " -M, --multiplier <乘数> 将性能测试乘数设置为<乘数>\n"
-#: sys-utils/readprofile.c:119
+#: sys-utils/readprofile.c:108
msgid " -i, --info print only info about the sampling step\n"
msgstr " -i, --info 只打印有关采样步骤(sampling step)的信息\n"
-#: sys-utils/readprofile.c:120
+#: sys-utils/readprofile.c:109
msgid " -v, --verbose print verbose data\n"
msgstr " -v, --verbose 打印详细信息\n"
-#: sys-utils/readprofile.c:121
+#: sys-utils/readprofile.c:110
msgid " -a, --all print all symbols, even if count is 0\n"
msgstr " -a, --all 打印所有符号,即使计数为 0\n"
-#: sys-utils/readprofile.c:122
+#: sys-utils/readprofile.c:111
msgid " -b, --histbin print individual histogram-bin counts\n"
msgstr " -b, --histbin 打印各个直方图区间的计数\n"
-#: sys-utils/readprofile.c:123
+#: sys-utils/readprofile.c:112
msgid " -s, --counters print individual counters within functions\n"
msgstr " -s, --counters 打印函数内的独立计数\n"
-#: sys-utils/readprofile.c:124
+#: sys-utils/readprofile.c:113
msgid " -r, --reset reset all the counters (root only)\n"
msgstr " -r, --reset 重置所有计数(限 root 用户)\n"
-#: sys-utils/readprofile.c:125
+#: sys-utils/readprofile.c:114
msgid " -n, --no-auto disable byte order auto-detection\n"
msgstr " -n, --no-auto 禁用字节顺序自动检测\n"
-#: sys-utils/readprofile.c:204
+#: sys-utils/readprofile.c:193
#, fuzzy
#| msgid "failed to parse pid"
msgid "failed to parse multiplier"
msgstr "解析 pid 失败"
-#: sys-utils/readprofile.c:242
+#: sys-utils/readprofile.c:231
#, c-format
msgid "error writing %s"
msgstr "写 %s 出错"
-#: sys-utils/readprofile.c:253
+#: sys-utils/readprofile.c:242
msgid "input file is empty"
msgstr "输入文件为空"
-#: sys-utils/readprofile.c:275
+#: sys-utils/readprofile.c:264
msgid "Assuming reversed byte order. Use -n to force native byte order."
msgstr "将假设为反向字节顺序。可使用 -n 强制为原生字节顺序。"
-#: sys-utils/readprofile.c:290
+#: sys-utils/readprofile.c:279
#, c-format
msgid "Sampling_step: %u\n"
msgstr "采样步长:%u\n"
-#: sys-utils/readprofile.c:306 sys-utils/readprofile.c:327
+#: sys-utils/readprofile.c:295 sys-utils/readprofile.c:316
#, c-format
msgid "%s(%i): wrong map line"
msgstr "%s(%i):错误的 map 行"
-#: sys-utils/readprofile.c:317
+#: sys-utils/readprofile.c:306
#, c-format
msgid "can't find \"_stext\" in %s"
msgstr "在 %s 中找不到“_stext”"
-#: sys-utils/readprofile.c:350
+#: sys-utils/readprofile.c:339
msgid "profile address out of range. Wrong map file?"
msgstr "配置(profile)地址超出范围。map 文件错误?"
-#: sys-utils/readprofile.c:411
+#: sys-utils/readprofile.c:400
msgid "total"
msgstr "总计"
-#: sys-utils/renice.c:52
+#: sys-utils/renice.c:54
msgid "process ID"
msgstr "进程 ID"
-#: sys-utils/renice.c:53
+#: sys-utils/renice.c:55
msgid "process group ID"
msgstr "进程组 ID"
-#: sys-utils/renice.c:62
+#: sys-utils/renice.c:64
#, fuzzy, c-format
#| msgid ""
#| " %1$s [-n] <priority> [-p|--pid] <pid>...\n"
@@ -20593,170 +21658,170 @@ msgstr ""
" %1$s [-n] <优先级> -g|--pgrp <pgid>...\n"
" %1$s [-n] <优先级> -u|--user <用户>...\n"
-#: sys-utils/renice.c:68
+#: sys-utils/renice.c:70
msgid "Alter the priority of running processes.\n"
msgstr "改变运行进程的优先级。 \n"
-#: sys-utils/renice.c:71
+#: sys-utils/renice.c:73
#, fuzzy
#| msgid " -n, --priority <num> specify the nice increment value\n"
msgid " -n <num> specify the nice value\n"
msgstr " -n, --priority <数字> 指定 nice 增量\n"
-#: sys-utils/renice.c:72
+#: sys-utils/renice.c:74
#, 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
+#: sys-utils/renice.c:75
#, fuzzy
#| msgid " set vesa powersaving features\n"
msgid " then the priority is 'relative' to current\n"
msgstr " 设置 vesa 节能功能\n"
-#: sys-utils/renice.c:74
+#: sys-utils/renice.c:76
#, 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
+#: sys-utils/renice.c:77
#, 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
+#: sys-utils/renice.c:78
#, 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
+#: sys-utils/renice.c:79
#, 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:78
+#: sys-utils/renice.c:80
#, 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:79
+#: sys-utils/renice.c:81
#, 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:91
+#: sys-utils/renice.c:93
#, c-format
msgid "failed to get priority for %d (%s)"
msgstr "获取 %d (%s) 的优先级失败"
-#: sys-utils/renice.c:110
+#: sys-utils/renice.c:112
#, c-format
msgid "failed to set priority for %d (%s)"
msgstr "设置 %d 的优先级失败(%s)"
-#: sys-utils/renice.c:115
+#: sys-utils/renice.c:117
#, c-format
msgid "%d (%s) old priority %d, new priority %d\n"
msgstr "%d (%s) 旧优先级为 %d,新优先级为 %d\n"
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:183
#, c-format
msgid "invalid priority '%s'"
msgstr "无效的优先级“%s”"
-#: sys-utils/renice.c:208
+#: sys-utils/renice.c:210
#, 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:217
+#: sys-utils/renice.c:219
#, c-format
msgid "bad %s value: %s"
msgstr "错误的 %s 值:%s"
-#: sys-utils/rfkill.c:131
+#: sys-utils/rfkill.c:132
msgid "kernel device name"
msgstr "内核设备名称"
-#: sys-utils/rfkill.c:132
+#: sys-utils/rfkill.c:133
msgid "device identifier value"
msgstr "设备标识符值"
-#: sys-utils/rfkill.c:133
+#: sys-utils/rfkill.c:134
msgid "device type name that can be used as identifier"
msgstr ""
-#: sys-utils/rfkill.c:134
+#: sys-utils/rfkill.c:135
msgid "device type description"
msgstr "设备类型描述"
-#: sys-utils/rfkill.c:135
+#: sys-utils/rfkill.c:136
#, fuzzy
#| msgid "size of the lock"
msgid "status of software block"
msgstr "锁的大小"
-#: sys-utils/rfkill.c:136
+#: sys-utils/rfkill.c:137
#, fuzzy
#| msgid "Show the status of the hardware watchdog.\n"
msgid "status of hardware block"
msgstr "显示硬件看门狗的状态。\n"
-#: sys-utils/rfkill.c:200
+#: sys-utils/rfkill.c:201
#, fuzzy, c-format
#| msgid "cannot lock %s"
msgid "cannot set non-blocking %s"
msgstr "无法锁定 %s"
-#: sys-utils/rfkill.c:221
+#: sys-utils/rfkill.c:222
#, c-format
msgid "wrong size of rfkill event: %zu < %zu"
msgstr ""
-#: sys-utils/rfkill.c:259
+#: sys-utils/rfkill.c:260
#, fuzzy, c-format
#| msgid "failed to parse %s"
msgid "failed to poll %s"
msgstr "解析 %s 失败"
-#: sys-utils/rfkill.c:328
+#: sys-utils/rfkill.c:329
msgid "invalid identifier"
msgstr "无效的标识符"
-#: sys-utils/rfkill.c:408 sys-utils/rfkill.c:411
+#: sys-utils/rfkill.c:409 sys-utils/rfkill.c:412
#, fuzzy
#| msgid "locked"
msgid "blocked"
msgstr "已锁定"
-#: sys-utils/rfkill.c:408 sys-utils/rfkill.c:411
+#: sys-utils/rfkill.c:409 sys-utils/rfkill.c:412
#, fuzzy
#| msgid "locked"
msgid "unblocked"
msgstr "已锁定"
-#: 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
+#: sys-utils/rfkill.c:431 sys-utils/rfkill.c:506 sys-utils/rfkill.c:547
+#: sys-utils/rfkill.c:583 sys-utils/rfkill.c:604
#, c-format
msgid "invalid identifier: %s"
msgstr "无效的标识符:%s"
-#: sys-utils/rfkill.c:633
+#: sys-utils/rfkill.c:634
#, fuzzy, c-format
#| msgid " %s [options] [<device> ...]\n"
msgid " %s [options] command [identifier ...]\n"
msgstr " %s [选项] [<设备> ...]\n"
-#: sys-utils/rfkill.c:636
+#: sys-utils/rfkill.c:637
msgid "Tool for enabling and disabling wireless devices.\n"
msgstr ""
@@ -20765,49 +21830,49 @@ msgstr ""
#. *
#. list [identifier] (lista [tarkenne])
#.
-#: sys-utils/rfkill.c:660
+#: sys-utils/rfkill.c:661
#, fuzzy
#| msgid " -help\n"
msgid " help\n"
msgstr " -help\n"
-#: sys-utils/rfkill.c:661
+#: sys-utils/rfkill.c:662
msgid " event\n"
msgstr ""
-#: sys-utils/rfkill.c:662
+#: sys-utils/rfkill.c:663
#, fuzzy
#| msgid "Disk identifier"
msgid " list [identifier]\n"
msgstr "磁盘标识符"
-#: sys-utils/rfkill.c:663
+#: sys-utils/rfkill.c:664
#, fuzzy
#| msgid "Disk identifier"
msgid " block identifier\n"
msgstr "磁盘标识符"
-#: sys-utils/rfkill.c:664
+#: sys-utils/rfkill.c:665
#, fuzzy
#| msgid "Disk identifier"
msgid " unblock identifier\n"
msgstr "磁盘标识符"
-#: sys-utils/rfkill.c:665
+#: sys-utils/rfkill.c:666
#, fuzzy
#| msgid "Disk identifier"
msgid " toggle identifier\n"
msgstr "磁盘标识符"
-#: sys-utils/rtcwake.c:102
+#: sys-utils/rtcwake.c:111
msgid "Enter a system sleep state until a specified wakeup time.\n"
msgstr "进入系统睡眠状态,直到指定的唤醒时间。\n"
-#: sys-utils/rtcwake.c:105
+#: sys-utils/rtcwake.c:114
msgid " -a, --auto reads the clock mode from adjust file (default)\n"
msgstr " -a, --auto 从 adjust 文件读取时钟模式(默认)\n"
-#: sys-utils/rtcwake.c:107
+#: sys-utils/rtcwake.c:116
#, c-format
msgid ""
" -A, --adjfile <file> specifies the path to the adjust file\n"
@@ -20816,194 +21881,194 @@ msgstr ""
" -A, --adjfile <文件> 指定 adjust 文件的路径\n"
" 默认为 %s\n"
-#: sys-utils/rtcwake.c:109
+#: sys-utils/rtcwake.c:118
msgid " --date <timestamp> date time of timestamp to wake\n"
msgstr " --date <时间戳> 唤醒时间戳的日期时间\n"
-#: sys-utils/rtcwake.c:110
+#: sys-utils/rtcwake.c:119
msgid " -d, --device <device> select rtc device (rtc0|rtc1|...)\n"
msgstr " -d, --device <设备> 选择 rtc 设备(rtc0|rtc1|...)\n"
-#: sys-utils/rtcwake.c:111
+#: sys-utils/rtcwake.c:120
msgid " -n, --dry-run does everything, but suspend\n"
msgstr " -n, --dry-run 演示操作但不执行(suspend)\n"
-#: sys-utils/rtcwake.c:112
+#: sys-utils/rtcwake.c:121
msgid " -l, --local RTC uses local timezone\n"
msgstr " -l, --local RTC 使用本地时区\n"
-#: sys-utils/rtcwake.c:113
+#: sys-utils/rtcwake.c:122
msgid " --list-modes list available modes\n"
msgstr " --list-modes 列出可用模式\n"
-#: sys-utils/rtcwake.c:114
+#: sys-utils/rtcwake.c:123
msgid " -m, --mode <mode> standby|mem|... sleep mode\n"
msgstr " -m, --mode <模式> 指定 standby|mem|... 等睡眠模式\n"
-#: sys-utils/rtcwake.c:115
+#: sys-utils/rtcwake.c:124
msgid " -s, --seconds <seconds> seconds to sleep\n"
msgstr " -s, --seconds <秒数> 指定睡眠的秒数\n"
-#: sys-utils/rtcwake.c:116
+#: sys-utils/rtcwake.c:125
msgid " -t, --time <time_t> time to wake\n"
msgstr " -t, --time <time_t> 指定唤醒时刻\n"
-#: sys-utils/rtcwake.c:117
+#: sys-utils/rtcwake.c:126
msgid " -u, --utc RTC uses UTC\n"
msgstr " -u, --utc RTC 使用 UTC\n"
-#: sys-utils/rtcwake.c:118
+#: sys-utils/rtcwake.c:127
msgid " -v, --verbose verbose messages\n"
msgstr " -v, --verbose 输出详尽消息\n"
-#: sys-utils/rtcwake.c:168
+#: sys-utils/rtcwake.c:177
msgid "read rtc time failed"
msgstr "读取 rtc 时间失败"
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:183
msgid "read system time failed"
msgstr "读取系统时间失败"
-#: sys-utils/rtcwake.c:190
+#: sys-utils/rtcwake.c:199
msgid "convert rtc time failed"
msgstr "转换 rtc 时间失败"
-#: sys-utils/rtcwake.c:240
+#: sys-utils/rtcwake.c:249
msgid "set rtc wake alarm failed"
msgstr "设置 rtc 唤醒闹钟失败"
-#: sys-utils/rtcwake.c:280
+#: sys-utils/rtcwake.c:289
msgid "discarding stdin"
msgstr "丢弃标准输入"
-#: sys-utils/rtcwake.c:331
+#: sys-utils/rtcwake.c:340
#, c-format
msgid "unexpected third line in: %s: %s"
msgstr "第 3 行异常:%s:%s"
-#: sys-utils/rtcwake.c:345 sys-utils/rtcwake.c:675
+#: sys-utils/rtcwake.c:354 sys-utils/rtcwake.c:684
msgid "read rtc alarm failed"
msgstr "读取 rtc 闹钟失败"
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:359
#, c-format
msgid "alarm: off\n"
msgstr "闹钟:关\n"
-#: sys-utils/rtcwake.c:363
+#: sys-utils/rtcwake.c:372
msgid "convert time failed"
msgstr "转换时间失败"
-#: sys-utils/rtcwake.c:369
+#: sys-utils/rtcwake.c:378
#, c-format
msgid "alarm: on %s"
msgstr "闹钟:于 %s"
-#: sys-utils/rtcwake.c:402
+#: sys-utils/rtcwake.c:411
#, c-format
msgid "%s: unable to find device"
msgstr "%s:找不到设备"
-#: sys-utils/rtcwake.c:413
+#: sys-utils/rtcwake.c:422
#, c-format
msgid "could not read: %s"
msgstr "无法读取︰%s"
-#: sys-utils/rtcwake.c:493
+#: sys-utils/rtcwake.c:502
#, c-format
msgid "unrecognized suspend state '%s'"
msgstr "不支持的挂起状态“%s”"
-#: sys-utils/rtcwake.c:501
+#: sys-utils/rtcwake.c:510
msgid "invalid seconds argument"
msgstr "无效的 秒数 参数"
-#: sys-utils/rtcwake.c:505
+#: sys-utils/rtcwake.c:514
msgid "invalid time argument"
msgstr "无效的 时间 参数"
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:541
#, c-format
msgid "%s: assuming RTC uses UTC ...\n"
msgstr "%s:将假设 RTC 使用 UTC...\n"
-#: sys-utils/rtcwake.c:537
+#: sys-utils/rtcwake.c:546
msgid "Using UTC time.\n"
msgstr "使用 UTC 时间。\n"
-#: sys-utils/rtcwake.c:538
+#: sys-utils/rtcwake.c:547
msgid "Using local time.\n"
msgstr "使用当地时间。\n"
-#: sys-utils/rtcwake.c:541
+#: sys-utils/rtcwake.c:550
msgid "must provide wake time (see --seconds, --time and --date options)"
msgstr "必须提供唤醒时间(见 --seconds, --time 和 --date 选项)"
-#: sys-utils/rtcwake.c:547
+#: sys-utils/rtcwake.c:556
#, c-format
msgid "%s not enabled for wakeup events"
msgstr "%s 没有为唤醒事件启用"
-#: sys-utils/rtcwake.c:554
+#: sys-utils/rtcwake.c:563
#, fuzzy, c-format
#| msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
msgid "alarm %<PRId64>, sys_time %<PRId64>, rtc_time %<PRId64>, seconds %<PRIu64>\n"
msgstr "闹钟 %ld,sys 时间 %ld,rtc 时间 %ld,秒数 %u\n"
-#: sys-utils/rtcwake.c:567
+#: sys-utils/rtcwake.c:576
#, c-format
msgid "time doesn't go backward to %s"
msgstr "时间不能返回到 %s"
-#: sys-utils/rtcwake.c:580
+#: sys-utils/rtcwake.c:589
#, c-format
msgid "%s: wakeup using %s at %s"
msgstr "%1$s:用 %3$s 的 %2$s 唤醒"
-#: sys-utils/rtcwake.c:586
+#: sys-utils/rtcwake.c:595
#, c-format
msgid "%s: wakeup from \"%s\" using %s at %s"
msgstr "%s:从“%s”唤醒,使用 %s,时间 %s"
-#: sys-utils/rtcwake.c:596
+#: sys-utils/rtcwake.c:605
#, c-format
msgid "suspend mode: no; leaving\n"
msgstr "挂起模式:无;将离开\n"
-#: sys-utils/rtcwake.c:619
+#: sys-utils/rtcwake.c:628
#, c-format
msgid "suspend mode: off; executing %s\n"
msgstr "挂起模式:关;正在执行 %s\n"
-#: sys-utils/rtcwake.c:628
+#: sys-utils/rtcwake.c:637
msgid "failed to find shutdown command"
msgstr "无法找到 shutdown 命令"
-#: sys-utils/rtcwake.c:638
+#: sys-utils/rtcwake.c:647
#, c-format
msgid "suspend mode: on; reading rtc\n"
msgstr "挂起模式:开;正在读 rtc\n"
-#: sys-utils/rtcwake.c:643
+#: sys-utils/rtcwake.c:652
msgid "rtc read failed"
msgstr "读 rtc 失败"
-#: sys-utils/rtcwake.c:655
+#: sys-utils/rtcwake.c:664
#, c-format
msgid "suspend mode: disable; disabling alarm\n"
msgstr "挂起模式:禁用;正在禁用闹钟\n"
-#: sys-utils/rtcwake.c:659
+#: sys-utils/rtcwake.c:668
#, c-format
msgid "suspend mode: show; printing alarm info\n"
msgstr "挂起模式:显示;正在打印闹钟信息\n"
-#: sys-utils/rtcwake.c:666
+#: sys-utils/rtcwake.c:675
#, c-format
msgid "suspend mode: %s; suspending system\n"
msgstr "挂起模式:%s;正在挂起系统\n"
-#: sys-utils/rtcwake.c:680
+#: sys-utils/rtcwake.c:689
msgid "disable rtc alarm interrupt failed"
msgstr "禁用 rtc 闹钟中断失败"
@@ -21081,161 +22146,202 @@ msgstr " --list 列出可设置的架构并退出\n"
msgid " --show[=personality] show current or specific personality and exit\n"
msgstr ""
-#: sys-utils/setarch.c:346
+#: sys-utils/setarch.c:352
#, c-format
msgid "Kernel cannot set architecture to %s"
msgstr "内核不能设置为 %s 的架构"
-#: sys-utils/setarch.c:411
+#: sys-utils/setarch.c:417
msgid "Can not get current kernel personality"
msgstr ""
-#: sys-utils/setarch.c:464
+#: sys-utils/setarch.c:470
msgid "Not enough arguments"
msgstr "参数不够"
-#: sys-utils/setarch.c:532
+#: sys-utils/setarch.c:538
msgid "unrecognized option '--list'"
msgstr "无法识别的“--list”选项"
-#: sys-utils/setarch.c:541
+#: sys-utils/setarch.c:547
#, fuzzy
#| msgid "mount ID"
msgid "could not parse personality"
msgstr "挂载 ID"
-#: sys-utils/setarch.c:545
+#: sys-utils/setarch.c:551
#, fuzzy
#| msgid "unrecognized option '--list'"
msgid "unrecognized option '--show'"
msgstr "无法识别的“--list”选项"
-#: sys-utils/setarch.c:559
+#: sys-utils/setarch.c:565
#, fuzzy
msgid "no architecture argument or personality flags specified"
msgstr "未指定架构参数"
-#: sys-utils/setarch.c:571
+#: sys-utils/setarch.c:577
#, c-format
msgid "%s: Unrecognized architecture"
msgstr "%s:未识别的架构"
-#: sys-utils/setarch.c:589
+#: sys-utils/setarch.c:595
#, c-format
msgid "failed to set personality to %s"
msgstr "无法将人格(personality)设置为 %s"
-#: sys-utils/setarch.c:601
+#: sys-utils/setarch.c:607
#, c-format
msgid "Execute command `%s'.\n"
msgstr "执行命令“%s”。\n"
-#: sys-utils/setpriv.c:119
+#: sys-utils/setpgid.c:20 sys-utils/setsid.c:35
+#, c-format
+msgid " %s [options] <program> [arguments ...]\n"
+msgstr " %s [选项] <程序> [参数 ...]\n"
+
+#: sys-utils/setpgid.c:24
+#, fuzzy
+#| msgid "Run a program in a new session.\n"
+msgid "Run a program in a new process group.\n"
+msgstr "在新会话中运行程序。\n"
+
+#: sys-utils/setpgid.c:27
+#, fuzzy
+#| msgid " -f, --force force check\n"
+msgid " -f, --foregound Make a foreground process group\n"
+msgstr " -f, --force 强制检查\n"
+
+#: sys-utils/setpgid.c:71
+#, fuzzy
+#| msgid "setgid failed"
+msgid "setpgid failed"
+msgstr "setgid 失败"
+
+#: sys-utils/setpgid.c:77
+#, fuzzy
+#| msgid "sigfillset failed"
+msgid "sigemptyset failed"
+msgstr "sigfillset 失败"
+
+#: sys-utils/setpgid.c:79
+#, fuzzy
+#| msgid "sigfillset failed"
+msgid "sigaddset failed"
+msgstr "sigfillset 失败"
+
+#: sys-utils/setpgid.c:83
+#, fuzzy
+#| msgid "tcsetattr failed"
+msgid "tcsetpgrp failed"
+msgstr "tcsetattr 失败"
+
+#: sys-utils/setpriv.c:121
#, c-format
msgid " %s [options] <program> [<argument>...]\n"
msgstr " %s [选项] <程序> [<参数>...]\n"
-#: sys-utils/setpriv.c:123
+#: sys-utils/setpriv.c:125
msgid "Run a program with different privilege settings.\n"
msgstr "以不同的权限设置运行程序。\n"
-#: sys-utils/setpriv.c:126
+#: sys-utils/setpriv.c:128
#, 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
+#: sys-utils/setpriv.c:129
#, 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
+#: sys-utils/setpriv.c:130
#, 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
+#: sys-utils/setpriv.c:131
#, 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
+#: sys-utils/setpriv.c:132
#, 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
+#: sys-utils/setpriv.c:133
#, 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
+#: sys-utils/setpriv.c:134
#, 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
+#: sys-utils/setpriv.c:135
#, 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
+#: sys-utils/setpriv.c:136
#, 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
+#: sys-utils/setpriv.c:137
#, 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
+#: sys-utils/setpriv.c:138
#, 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
+#: sys-utils/setpriv.c:139
#, fuzzy
#| msgid " --clear-groups clear supplementary groups\n"
msgid " --clear-groups clear supplementary groups\n"
msgstr " --clear-groups 清除附属组\n"
-#: sys-utils/setpriv.c:138
+#: sys-utils/setpriv.c:140
#, fuzzy
#| msgid " --keep-groups keep supplementary groups\n"
msgid " --keep-groups keep supplementary groups\n"
msgstr " --keep-groups 保留附属组\n"
-#: sys-utils/setpriv.c:139
+#: sys-utils/setpriv.c:141
#, fuzzy
#| msgid " --keep-groups keep supplementary groups\n"
msgid " --init-groups initialize supplementary groups\n"
msgstr " --keep-groups 保留附属组\n"
-#: sys-utils/setpriv.c:140
+#: sys-utils/setpriv.c:142
#, 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
+#: sys-utils/setpriv.c:143
#, fuzzy
#| msgid " --securebits <bits> set securebits\n"
msgid " --securebits <bits> set securebits\n"
msgstr " --securebits <位> 设置安全位\n"
-#: sys-utils/setpriv.c:142
+#: sys-utils/setpriv.c:144
#, fuzzy
#| msgid " --store save current terminal settings as default\n"
msgid ""
@@ -21243,422 +22349,477 @@ msgid ""
" set or clear parent death signal\n"
msgstr " --store 将当前终端设置保存为默认值\n"
-#: sys-utils/setpriv.c:144
+#: sys-utils/setpriv.c:146
#, 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
+#: sys-utils/setpriv.c:147
#, 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:146
+#: sys-utils/setpriv.c:148
+msgid " --landlock-access <access> add Landlock access\n"
+msgstr ""
+
+#: sys-utils/setpriv.c:149
+msgid " --landlock-rule <rule> add Landlock rule\n"
+msgstr ""
+
+#: sys-utils/setpriv.c:150
msgid ""
" --reset-env clear all environment and initialize\n"
" HOME, SHELL, USER, LOGNAME and PATH\n"
msgstr ""
-#: sys-utils/setpriv.c:152
+#: sys-utils/setpriv.c:156
msgid " This tool can be dangerous. Read the manpage, and be careful.\n"
msgstr "运行此工具有风险。请阅读 man 手册,谨慎操作。\n"
-#: sys-utils/setpriv.c:170
+#: sys-utils/setpriv.c:176
msgid "invalid capability type"
msgstr "无效的权能类型"
-#: sys-utils/setpriv.c:193 sys-utils/setpriv.c:412
+#: sys-utils/setpriv.c:199 sys-utils/setpriv.c:418
#, c-format
msgid "cap %d: libcap-ng is broken"
msgstr "权能 %d:libcap-ng 损坏"
-#: sys-utils/setpriv.c:219 sys-utils/setpriv.c:560
+#: sys-utils/setpriv.c:225 sys-utils/setpriv.c:566
msgid "getting process secure bits failed"
msgstr "获取进程安全位失败"
-#: sys-utils/setpriv.c:223
+#: sys-utils/setpriv.c:229
#, c-format
msgid "Securebits: "
msgstr "安全位:"
-#: sys-utils/setpriv.c:243 sys-utils/setpriv.c:327
+#: sys-utils/setpriv.c:249 sys-utils/setpriv.c:333
#, c-format
msgid "[none]\n"
msgstr "[无]\n"
-#: sys-utils/setpriv.c:269
+#: sys-utils/setpriv.c:275
#, c-format
msgid "%s: too long"
msgstr "%s:过长"
-#: sys-utils/setpriv.c:297
+#: sys-utils/setpriv.c:303
#, c-format
msgid "Supplementary groups: "
msgstr "附属组:"
-#: sys-utils/setpriv.c:299 sys-utils/setpriv.c:365 sys-utils/setpriv.c:370
-#: sys-utils/setpriv.c:376 sys-utils/setpriv.c:382 sys-utils/setpriv.c:389
+#: sys-utils/setpriv.c:305 sys-utils/setpriv.c:371 sys-utils/setpriv.c:376
+#: sys-utils/setpriv.c:382 sys-utils/setpriv.c:388 sys-utils/setpriv.c:395
#, c-format
msgid "[none]"
msgstr "[无]"
-#: sys-utils/setpriv.c:317
+#: sys-utils/setpriv.c:323
msgid "get pdeathsig failed"
msgstr "获取 pdeathsig 失败"
-#: sys-utils/setpriv.c:321
+#: sys-utils/setpriv.c:327
#, fuzzy, c-format
#| msgid "set parent death signal failed"
msgid "Parent death signal: "
msgstr "设置父进程死亡信号失败"
-#: sys-utils/setpriv.c:337
+#: sys-utils/setpriv.c:343
#, c-format
msgid "uid: %u\n"
msgstr "uid:%u\n"
-#: sys-utils/setpriv.c:338
+#: sys-utils/setpriv.c:344
#, c-format
msgid "euid: %u\n"
msgstr "euid:%u\n"
-#: sys-utils/setpriv.c:341
+#: sys-utils/setpriv.c:347
#, c-format
msgid "suid: %u\n"
msgstr "suid:%u\n"
-#: sys-utils/setpriv.c:343 sys-utils/setpriv.c:456
+#: sys-utils/setpriv.c:349 sys-utils/setpriv.c:462
msgid "getresuid failed"
msgstr "getresuid 失败"
-#: sys-utils/setpriv.c:352 sys-utils/setpriv.c:471
+#: sys-utils/setpriv.c:358 sys-utils/setpriv.c:477
msgid "getresgid failed"
msgstr "getresgid 失败"
-#: sys-utils/setpriv.c:363
+#: sys-utils/setpriv.c:369
#, c-format
msgid "Effective capabilities: "
msgstr "有效权能:"
-#: sys-utils/setpriv.c:368
+#: sys-utils/setpriv.c:374
#, c-format
msgid "Permitted capabilities: "
msgstr "允许的权能:"
-#: sys-utils/setpriv.c:374
+#: sys-utils/setpriv.c:380
#, c-format
msgid "Inheritable capabilities: "
msgstr "可继承的权能:"
-#: sys-utils/setpriv.c:379
+#: sys-utils/setpriv.c:385
#, fuzzy, c-format
#| msgid "Permitted capabilities: "
msgid "Ambient capabilities: "
msgstr "允许的权能:"
-#: sys-utils/setpriv.c:384
+#: sys-utils/setpriv.c:390
#, c-format
msgid "[unsupported]"
msgstr "[不支持]"
-#: sys-utils/setpriv.c:387
+#: sys-utils/setpriv.c:393
#, c-format
msgid "Capability bounding set: "
msgstr "权能绑定集:"
-#: sys-utils/setpriv.c:396
+#: sys-utils/setpriv.c:402
msgid "SELinux label"
msgstr "SELinux 标签"
-#: sys-utils/setpriv.c:399
+#: sys-utils/setpriv.c:405
msgid "AppArmor profile"
msgstr "AppArmor 配置文件"
-#: sys-utils/setpriv.c:434
+#: sys-utils/setpriv.c:440
msgid "Invalid supplementary group id"
msgstr "无效的附属组 id"
-#: sys-utils/setpriv.c:444
+#: sys-utils/setpriv.c:450
msgid "failed to get parent death signal"
msgstr "获取父进程死亡信号失败"
-#: sys-utils/setpriv.c:464
+#: sys-utils/setpriv.c:470
msgid "setresuid failed"
msgstr "setresuid 失败"
-#: sys-utils/setpriv.c:479
+#: sys-utils/setpriv.c:485
msgid "setresgid failed"
msgstr "setresgid 失败"
-#: sys-utils/setpriv.c:511
+#: sys-utils/setpriv.c:517
msgid "unsupported capability type"
msgstr "不支持的权能类型"
-#: sys-utils/setpriv.c:528
+#: sys-utils/setpriv.c:534
msgid "bad capability string"
msgstr "错误的权能字符串"
-#: sys-utils/setpriv.c:545
+#: sys-utils/setpriv.c:551
#, c-format
msgid "unknown capability \"%s\""
msgstr "未知权能“%s”"
-#: sys-utils/setpriv.c:569
+#: sys-utils/setpriv.c:575
msgid "unrecognized securebit set -- refusing to adjust"
msgstr "无法识别的安全位集 -- 拒绝调整"
-#: sys-utils/setpriv.c:573
+#: sys-utils/setpriv.c:579
msgid "bad securebits string"
msgstr "安全位字符串有误"
-#: sys-utils/setpriv.c:580
+#: sys-utils/setpriv.c:586
msgid "+all securebits is not allowed"
msgstr "+all 安全位是不允许的"
-#: sys-utils/setpriv.c:593
+#: sys-utils/setpriv.c:599
msgid "adjusting keep_caps does not make sense"
msgstr "调整 keep_caps(保持权能) 没有意义"
-#: sys-utils/setpriv.c:597
+#: sys-utils/setpriv.c:603
msgid "unrecognized securebit"
msgstr "无法识别的安全位"
-#: sys-utils/setpriv.c:617
+#: sys-utils/setpriv.c:623
msgid "SELinux is not running"
msgstr "SELinux 没有运行"
-#: sys-utils/setpriv.c:632
+#: sys-utils/setpriv.c:638
#, c-format
msgid "close failed: %s"
msgstr "关闭失败:%s"
-#: sys-utils/setpriv.c:640
+#: sys-utils/setpriv.c:646
msgid "AppArmor is not running"
msgstr "AppArmor 没有运行"
-#: sys-utils/setpriv.c:819
+#: sys-utils/setpriv.c:829
msgid "duplicate --no-new-privs option"
msgstr "复制 --no-new-privs 选项"
-#: sys-utils/setpriv.c:824
+#: sys-utils/setpriv.c:834
msgid "duplicate ruid"
msgstr "复制 ruid"
-#: sys-utils/setpriv.c:826
+#: sys-utils/setpriv.c:836
msgid "failed to parse ruid"
msgstr "解析 ruid 失败"
-#: sys-utils/setpriv.c:834
+#: sys-utils/setpriv.c:844
msgid "duplicate euid"
msgstr "复制 euid"
-#: sys-utils/setpriv.c:836
+#: sys-utils/setpriv.c:846
msgid "failed to parse euid"
msgstr "解析 euid 失败"
-#: sys-utils/setpriv.c:840
+#: sys-utils/setpriv.c:850
msgid "duplicate ruid or euid"
msgstr "复制 ruid 或 euid"
-#: sys-utils/setpriv.c:842
+#: sys-utils/setpriv.c:852
msgid "failed to parse reuid"
msgstr "解析 reuid 失败"
-#: sys-utils/setpriv.c:851
+#: sys-utils/setpriv.c:861
msgid "duplicate rgid"
msgstr "复制 rgid"
-#: sys-utils/setpriv.c:853
+#: sys-utils/setpriv.c:863
msgid "failed to parse rgid"
msgstr "解析 rgid 失败"
-#: sys-utils/setpriv.c:857
+#: sys-utils/setpriv.c:867
msgid "duplicate egid"
msgstr "复制 egid"
-#: sys-utils/setpriv.c:859
+#: sys-utils/setpriv.c:869
msgid "failed to parse egid"
msgstr "解析 egid 失败"
-#: sys-utils/setpriv.c:863
+#: sys-utils/setpriv.c:873
msgid "duplicate rgid or egid"
msgstr "复制 rgid 或 egid"
-#: sys-utils/setpriv.c:865
+#: sys-utils/setpriv.c:875
msgid "failed to parse regid"
msgstr "解析 regid 失败"
-#: sys-utils/setpriv.c:870
+#: sys-utils/setpriv.c:880
msgid "duplicate --clear-groups option"
msgstr "复制 --clear-groups 选项"
-#: sys-utils/setpriv.c:876
+#: sys-utils/setpriv.c:886
msgid "duplicate --keep-groups option"
msgstr "复制 --keep-groups 选项"
-#: sys-utils/setpriv.c:882
+#: sys-utils/setpriv.c:892
msgid "duplicate --init-groups option"
msgstr "复制 --init-groups 选项"
-#: sys-utils/setpriv.c:888
+#: sys-utils/setpriv.c:898
msgid "duplicate --groups option"
msgstr "复制 --groups 选项"
-#: sys-utils/setpriv.c:894
+#: sys-utils/setpriv.c:904
msgid "duplicate --keep-pdeathsig option"
msgstr "复制 --keep-pdeathsig 选项"
-#: sys-utils/setpriv.c:903
+#: sys-utils/setpriv.c:913
msgid "duplicate --inh-caps option"
msgstr "复制 --inh-caps 选项"
-#: sys-utils/setpriv.c:909
+#: sys-utils/setpriv.c:919
msgid "duplicate --ambient-caps option"
msgstr "复制 --ambient-caps 选项"
-#: sys-utils/setpriv.c:915
+#: sys-utils/setpriv.c:925
msgid "duplicate --bounding-set option"
msgstr "复制 --bounding-set 选项"
-#: sys-utils/setpriv.c:921
+#: sys-utils/setpriv.c:931
msgid "duplicate --securebits option"
msgstr "复制 --securebits 选项"
-#: sys-utils/setpriv.c:927
+#: sys-utils/setpriv.c:937
msgid "duplicate --selinux-label option"
msgstr "复制 --selinux-label 选项"
-#: sys-utils/setpriv.c:933
+#: sys-utils/setpriv.c:943
msgid "duplicate --apparmor-profile option"
msgstr "复制 --apparmor-profile 选项"
-#: sys-utils/setpriv.c:952
+#: sys-utils/setpriv.c:968
msgid "--dump is incompatible with all other options"
msgstr "--dump 与其他所有选项不兼容"
-#: sys-utils/setpriv.c:960
+#: sys-utils/setpriv.c:976
msgid "--list-caps must be specified alone"
msgstr "--list-caps 必须作为单独选项指定"
-#: sys-utils/setpriv.c:966
+#: sys-utils/setpriv.c:982
msgid "No program specified"
msgstr "未指定程序"
-#: sys-utils/setpriv.c:972
+#: sys-utils/setpriv.c:988
#, 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"
-#: sys-utils/setpriv.c:976
+#: sys-utils/setpriv.c:992
msgid "--init-groups requires --ruid or --reuid"
msgstr "--init-groups 需要 --ruid 或者 --reuid"
-#: sys-utils/setpriv.c:980
+#: sys-utils/setpriv.c:996
#, c-format
msgid "uid %ld not found, --init-groups requires an user that can be found on the system"
msgstr ""
-#: sys-utils/setpriv.c:995
+#: sys-utils/setpriv.c:1011
msgid "disallow granting new privileges failed"
msgstr "禁止赋予新权限失败"
-#: sys-utils/setpriv.c:1003
+#: sys-utils/setpriv.c:1019
msgid "keep process capabilities failed"
msgstr "保持进程权能失败"
-#: sys-utils/setpriv.c:1011
+#: sys-utils/setpriv.c:1027
msgid "activate capabilities"
msgstr "激活权能"
-#: sys-utils/setpriv.c:1017
+#: sys-utils/setpriv.c:1033
msgid "reactivate capabilities"
msgstr "重新激活权能"
-#: sys-utils/setpriv.c:1028
+#: sys-utils/setpriv.c:1044
msgid "initgroups failed"
msgstr "initgroups 失败"
-#: sys-utils/setpriv.c:1036
+#: sys-utils/setpriv.c:1052
msgid "set process securebits failed"
msgstr "设置进程安全位失败"
-#: sys-utils/setpriv.c:1042
+#: sys-utils/setpriv.c:1058
msgid "apply bounding set"
msgstr "应用绑定集"
-#: sys-utils/setpriv.c:1048
+#: sys-utils/setpriv.c:1064
msgid "apply capabilities"
msgstr "应用权能"
-#: sys-utils/setpriv.c:1057
+#: sys-utils/setpriv.c:1073
msgid "set parent death signal failed"
msgstr "设置父进程死亡信号失败"
-#: sys-utils/setsid.c:33
-#, c-format
-msgid " %s [options] <program> [arguments ...]\n"
-msgstr " %s [选项] <程序> [参数 ...]\n"
+#: sys-utils/setpriv-landlock.c:106
+#, fuzzy, c-format
+#| msgid "could not read: %s"
+msgid "could not parse landlock fs access: %s"
+msgstr "无法读取︰%s"
+
+#: sys-utils/setpriv-landlock.c:137 sys-utils/setpriv-landlock.c:140
+#, fuzzy, c-format
+#| msgid "invalid argument: %s"
+msgid "invalid landlock rule: %s"
+msgstr "无效参数:%s"
+
+#: sys-utils/setpriv-landlock.c:151
+#, fuzzy, c-format
+#| msgid "could not read: %s"
+msgid "could not open file for landlock: %s"
+msgstr "无法读取︰%s"
+
+#: sys-utils/setpriv-landlock.c:178
+#, fuzzy
+#| msgid "fallocate failed"
+msgid "landlock_create_ruleset failed"
+msgstr "fallocate 失败"
+
+#: sys-utils/setpriv-landlock.c:187
+#, fuzzy
+#| msgid "fallocate failed"
+msgid "adding landlock rule failed"
+msgstr "fallocate 失败"
+
+#: sys-utils/setpriv-landlock.c:191
+#, fuzzy
+#| msgid "disallow granting new privileges failed"
+msgid "disallow granting new privileges for landlock failed"
+msgstr "禁止赋予新权限失败"
+
+#: sys-utils/setpriv-landlock.c:194
+msgid "landlock_restrict_self faild"
+msgstr ""
+
+#: sys-utils/setpriv-landlock.c:202
+#, fuzzy, c-format
+#| msgid "lock access mode"
+msgid "Landlock accesses:\n"
+msgstr "锁访问模式"
-#: sys-utils/setsid.c:37
+#: sys-utils/setpriv-landlock.h:44
+#, fuzzy
+#| msgid "unsupported command"
+msgid "no support for landlock"
+msgstr "不支持的命令"
+
+#: sys-utils/setsid.c:39
msgid "Run a program in a new session.\n"
msgstr "在新会话中运行程序。\n"
-#: sys-utils/setsid.c:40
+#: sys-utils/setsid.c:42
msgid " -c, --ctty set the controlling terminal to the current one\n"
msgstr " -c, --ctty 将控制终端设置为当前终端\n"
-#: sys-utils/setsid.c:41
+#: sys-utils/setsid.c:43
msgid " -f, --fork always fork\n"
msgstr " -f, --fork 总是 fork\n"
-#: sys-utils/setsid.c:42
+#: sys-utils/setsid.c:44
msgid " -w, --wait wait program to exit, and use the same return\n"
msgstr " -w, --wait 等待程序退出,并使用它的返回值\n"
-#: sys-utils/setsid.c:100
+#: sys-utils/setsid.c:102
msgid "fork"
msgstr "fork"
-#: sys-utils/setsid.c:112
+#: sys-utils/setsid.c:114
#, c-format
msgid "child %d did not exit normally"
msgstr "子 %d 未正常退出"
-#: sys-utils/setsid.c:117
+#: sys-utils/setsid.c:119
msgid "setsid failed"
msgstr "setsid 失败"
-#: sys-utils/setsid.c:120
+#: sys-utils/setsid.c:122
msgid "failed to set the controlling terminal"
msgstr "设置控制终端失败"
-#: sys-utils/swapoff.c:94
+#: sys-utils/swapoff.c:107
#, c-format
msgid "swapoff %s\n"
msgstr "swapoff %s\n"
-#: sys-utils/swapoff.c:114
+#: sys-utils/swapoff.c:127
msgid "Not superuser."
msgstr "非超级用户。"
-#: sys-utils/swapoff.c:117 sys-utils/swapoff.c:122
+#: sys-utils/swapoff.c:130 sys-utils/swapoff.c:135
#, c-format
msgid "%s: swapoff failed"
msgstr "%s:swapoff 失败"
-#: sys-utils/swapoff.c:141 sys-utils/swapon.c:807
+#: sys-utils/swapoff.c:154 sys-utils/swapon.c:820
#, c-format
msgid " %s [options] [<spec>]\n"
msgstr " %s [选项] [<指定>]\n"
-#: sys-utils/swapoff.c:144
+#: sys-utils/swapoff.c:157
msgid "Disable devices and files for paging and swapping.\n"
msgstr "禁止将设备和文件用于分页和交换。\n"
-#: sys-utils/swapoff.c:147
+#: sys-utils/swapoff.c:160
msgid ""
" -a, --all disable all swaps from /proc/swaps\n"
" -v, --verbose verbose mode\n"
@@ -21666,7 +22827,7 @@ msgstr ""
" -a, --all 禁用 /proc/swaps 中的所有交换区\n"
" -v, --verbose verbose mode\n"
-#: sys-utils/swapoff.c:153
+#: sys-utils/swapoff.c:166
msgid ""
"\n"
"The <spec> parameter:\n"
@@ -21686,195 +22847,195 @@ msgstr ""
" <设备> 要使用设备的名称\n"
" <文件> 要使用文件的名称\n"
-#: sys-utils/swapon.c:96
+#: sys-utils/swapon.c:109
msgid "device file or partition path"
msgstr "设备文件或分区路径"
-#: sys-utils/swapon.c:97
+#: sys-utils/swapon.c:110
msgid "type of the device"
msgstr "设备的类型"
-#: sys-utils/swapon.c:98
+#: sys-utils/swapon.c:111
msgid "size of the swap area"
msgstr "交换区大小"
-#: sys-utils/swapon.c:99
+#: sys-utils/swapon.c:112
msgid "bytes in use"
msgstr "已使用字节数"
-#: sys-utils/swapon.c:100
+#: sys-utils/swapon.c:113
msgid "swap priority"
msgstr "交换优先级"
-#: sys-utils/swapon.c:101
+#: sys-utils/swapon.c:114
msgid "swap uuid"
msgstr "swap uuid"
-#: sys-utils/swapon.c:102
+#: sys-utils/swapon.c:115
msgid "swap label"
msgstr "swap 标签"
#. TRANSLATORS: The tabs make each field a multiple of 8 characters. Keep aligned with each entry below.
-#: sys-utils/swapon.c:250
+#: sys-utils/swapon.c:263
#, fuzzy, c-format
#| msgid "%s\t\t\t\tType\t\tSize\tUsed\tPriority\n"
msgid "Filename\t\t\t\tType\t\tSize\t\tUsed\t\tPriority\n"
msgstr "%s\t\t\t\t类型\t\t大小\t已用\t权限\n"
-#: sys-utils/swapon.c:328
+#: sys-utils/swapon.c:341
#, c-format
msgid "%s: reinitializing the swap."
msgstr "%s:正在重新初始化交换区。"
-#: sys-utils/swapon.c:387
+#: sys-utils/swapon.c:400
#, c-format
msgid "%s: lseek failed"
msgstr "%s:lseek 失败"
-#: sys-utils/swapon.c:393
+#: sys-utils/swapon.c:406
#, c-format
msgid "%s: write signature failed"
msgstr "%s:写签名失败"
-#: sys-utils/swapon.c:536
+#: sys-utils/swapon.c:549
#, c-format
msgid "%s: insecure permissions %04o, %04o suggested."
msgstr "%s:不安全的权限 %04o,建议使用 %04o。"
-#: sys-utils/swapon.c:541
+#: sys-utils/swapon.c:554
#, c-format
msgid "%s: insecure file owner %d, 0 (root) suggested."
msgstr "%s:不安全的文件拥有者 %d,建议使用 0(root)。"
-#: sys-utils/swapon.c:547
+#: sys-utils/swapon.c:560
#, c-format
msgid "%s: skipping - it appears to have holes."
msgstr "%s:将跳过 - 它似乎有空洞。"
-#: sys-utils/swapon.c:555
+#: sys-utils/swapon.c:568
#, c-format
msgid "%s: get size failed"
msgstr "%s:获取大小失败"
-#: sys-utils/swapon.c:561
+#: sys-utils/swapon.c:574
#, c-format
msgid "%s: read swap header failed"
msgstr "%s:读交换区头失败"
-#: sys-utils/swapon.c:566
+#: sys-utils/swapon.c:579
#, c-format
msgid "%s: found signature [pagesize=%d, signature=%s]"
msgstr "%s:找到签名[页尺寸=%d, 签名=%s]"
-#: sys-utils/swapon.c:577
+#: sys-utils/swapon.c:590
#, c-format
msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
msgstr "%s:页大小=%d,交换区大小=%llu,设备大小=%llu"
-#: sys-utils/swapon.c:582
+#: sys-utils/swapon.c:595
#, c-format
msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
msgstr "%s:末页 0x%08llx 大于交换空间的实际大小"
-#: sys-utils/swapon.c:592
+#: sys-utils/swapon.c:605
#, c-format
msgid "%s: swap format pagesize does not match."
msgstr "%s:交换格式 页大小 不匹配。"
-#: sys-utils/swapon.c:598
+#: sys-utils/swapon.c:611
#, c-format
msgid "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
msgstr "%s:交换格式 页大小 不匹配。(使用 --fixpgsz 来重新对它初始化。)"
-#: sys-utils/swapon.c:607
+#: sys-utils/swapon.c:620
#, c-format
msgid "%s: software suspend data detected. Rewriting the swap signature."
msgstr "%s:检测到软件挂起数据。将重新写交换签名。"
-#: sys-utils/swapon.c:677
+#: sys-utils/swapon.c:690
#, c-format
msgid "swapon %s\n"
msgstr "swapon %s\n"
-#: sys-utils/swapon.c:681
+#: sys-utils/swapon.c:694
#, c-format
msgid "%s: swapon failed"
msgstr "%s:swapon 失败"
-#: sys-utils/swapon.c:760
+#: sys-utils/swapon.c:773
#, c-format
msgid "%s: noauto option -- ignored"
msgstr "%s:无自动选项 -- 已忽略"
-#: sys-utils/swapon.c:782
+#: sys-utils/swapon.c:795
#, c-format
msgid "%s: already active -- ignored"
msgstr "%s:已激活 -- 已忽略"
-#: sys-utils/swapon.c:788
+#: sys-utils/swapon.c:801
#, c-format
msgid "%s: inaccessible -- ignored"
msgstr "%s:无法访问 -- 已忽略"
-#: sys-utils/swapon.c:810
+#: sys-utils/swapon.c:823
msgid "Enable devices and files for paging and swapping.\n"
msgstr "允许将设备和文件用于分页和交换。\n"
-#: sys-utils/swapon.c:813
+#: sys-utils/swapon.c:826
msgid " -a, --all enable all swaps from /etc/fstab\n"
msgstr " -a, --all 启用 /etc/fstab 中的所有交换区\n"
-#: sys-utils/swapon.c:814
+#: sys-utils/swapon.c:827
msgid " -d, --discard[=<policy>] enable swap discards, if supported by device\n"
msgstr " -d, --discard[=<policy>] 如果设备支持,启用 swap 丢弃\n"
-#: sys-utils/swapon.c:815
+#: sys-utils/swapon.c:828
msgid " -e, --ifexists silently skip devices that do not exist\n"
msgstr " -e, --ifexists 自动跳过不存在的设备而不提示\n"
-#: sys-utils/swapon.c:816
+#: sys-utils/swapon.c:829
msgid " -f, --fixpgsz reinitialize the swap space if necessary\n"
msgstr " -f, --fixpgsz 必要时重新初始化交换区\n"
-#: sys-utils/swapon.c:817
+#: sys-utils/swapon.c:830
msgid " -o, --options <list> comma-separated list of swap options\n"
msgstr " -o, --options <列表> 以英文逗号分隔的 swap 选项\n"
-#: sys-utils/swapon.c:818
+#: sys-utils/swapon.c:831
msgid " -p, --priority <prio> specify the priority of the swap device\n"
msgstr " -p, --priority <优先级> 指定交换设备的优先级\n"
-#: sys-utils/swapon.c:819
+#: sys-utils/swapon.c:832
msgid " -s, --summary display summary about used swap devices (DEPRECATED)\n"
msgstr " -s, --summary 显示已使用交换设备的摘要(已废弃)\n"
-#: sys-utils/swapon.c:820
+#: sys-utils/swapon.c:833
#, 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
+#: sys-utils/swapon.c:834
msgid " --show[=<columns>] display summary in definable table\n"
msgstr " --show[=<列>] 以可自定义的表格形式打印摘要\n"
-#: sys-utils/swapon.c:822
+#: sys-utils/swapon.c:835
msgid " --noheadings don't print table heading (with --show)\n"
msgstr " --noheadings 不打印表头(与 --show 合用)\n"
-#: sys-utils/swapon.c:823
+#: sys-utils/swapon.c:836
msgid " --raw use the raw output format (with --show)\n"
msgstr " --raw 使用原生输出格式(与 --show 合用)\n"
-#: sys-utils/swapon.c:824
+#: sys-utils/swapon.c:837
msgid " --bytes display swap size in bytes in --show output\n"
msgstr " --bytes 在 --show 输出中以字节数显示交换区大小\n"
-#: sys-utils/swapon.c:825
+#: sys-utils/swapon.c:838
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详尽模式\n"
-#: sys-utils/swapon.c:830
+#: sys-utils/swapon.c:843
msgid ""
"\n"
"The <spec> parameter:\n"
@@ -21898,7 +23059,7 @@ msgstr ""
" <设备> 要使用设备的名称\n"
" <文件> 要使用文件的名称\n"
-#: sys-utils/swapon.c:840
+#: sys-utils/swapon.c:853
msgid ""
"\n"
"Available discard policy types (for --discard):\n"
@@ -21912,16 +23073,16 @@ msgstr ""
" pages\t :对释放的页在重新使用前丢弃\n"
" * 如果未选择策略,则两者都将启用。(默认)\n"
-#: sys-utils/swapon.c:923
+#: sys-utils/swapon.c:936
msgid "failed to parse priority"
msgstr "解析优先级失败"
-#: sys-utils/swapon.c:945
+#: sys-utils/swapon.c:958
#, c-format
msgid "unsupported discard policy: %s"
msgstr "不支持的丢弃策略:%s"
-#: sys-utils/swapon-common.c:73
+#: sys-utils/swapon-common.c:85
#, c-format
msgid "cannot find the device for %s"
msgstr "找不到对应 %s 的设备"
@@ -22237,98 +23398,115 @@ msgstr "reset 失败"
msgid "failed to read eventfd"
msgstr "读 速度 失败"
-#: sys-utils/unshare.c:402
+#: sys-utils/unshare.c:408
#, fuzzy, c-format
#| msgid "invalid date '%s'"
msgid "invalid mapping '%s'"
msgstr "无效日期“%s”"
-#: sys-utils/unshare.c:430
+#: sys-utils/unshare.c:433 sys-utils/unshare.c:493
#, 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
+#: sys-utils/unshare.c:458 sys-utils/unshare.c:464
#, fuzzy
#| msgid "failed to parse uid"
msgid "failed to parse subid map"
msgstr "解析 uid 失败"
-#: sys-utils/unshare.c:470
+#: sys-utils/unshare.c:473
#, c-format
msgid "no line matching user \"%s\" in %s"
msgstr ""
-#: sys-utils/unshare.c:647
+#: sys-utils/unshare.c:661
+#, c-format
+msgid "%s too large for kernel 4k limit"
+msgstr ""
+
+#: sys-utils/unshare.c:667
+#, fuzzy, c-format
+#| msgid "failed to open: %s"
+msgid "failed to open %s"
+msgstr "打开失败:%s"
+
+#: sys-utils/unshare.c:669
+#, fuzzy, c-format
+#| msgid "unable to write %s"
+msgid "failed to write %s"
+msgstr "不能写 %s"
+
+#: sys-utils/unshare.c:737
msgid "Run a program with some namespaces unshared from the parent.\n"
msgstr "以某些未与父(进程)共享的名字空间运行某个程序。\n"
-#: sys-utils/unshare.c:650
+#: sys-utils/unshare.c:740
msgid " -m, --mount[=<file>] unshare mounts namespace\n"
msgstr " -m, --mount[=<文件>] 取消共享 mounts 名字空间\n"
-#: sys-utils/unshare.c:651
+#: sys-utils/unshare.c:741
msgid " -u, --uts[=<file>] unshare UTS namespace (hostname etc)\n"
msgstr " -u, --uts[=<文件>] 取消共享 UTS 名字空间(主机名等)\n"
-#: sys-utils/unshare.c:652
+#: sys-utils/unshare.c:742
msgid " -i, --ipc[=<file>] unshare System V IPC namespace\n"
msgstr " -i, --ipc[=<文件>] 取消共享 System V IPC 名字空间\n"
-#: sys-utils/unshare.c:653
+#: sys-utils/unshare.c:743
msgid " -n, --net[=<file>] unshare network namespace\n"
msgstr " -n, --net[=<file>] 取消共享网络名字空间\n"
-#: sys-utils/unshare.c:654
+#: sys-utils/unshare.c:744
msgid " -p, --pid[=<file>] unshare pid namespace\n"
msgstr " -p, --pid[=<文件>] 取消共享 pid 名字空间\n"
-#: sys-utils/unshare.c:655
+#: sys-utils/unshare.c:745
msgid " -U, --user[=<file>] unshare user namespace\n"
msgstr " -U, --user[=<文件>] 取消共享用户名字空间\n"
-#: sys-utils/unshare.c:656
+#: sys-utils/unshare.c:746
msgid " -C, --cgroup[=<file>] unshare cgroup namespace\n"
msgstr " -C, --cgroup[=<文件>] 取消共享 cgroup 名字空间\n"
-#: sys-utils/unshare.c:657
+#: sys-utils/unshare.c:747
msgid " -T, --time[=<file>] unshare time namespace\n"
msgstr " -T, --time[=<文件>] 取消共享时间名字空间\n"
-#: sys-utils/unshare.c:659
+#: sys-utils/unshare.c:749
msgid " -f, --fork fork before launching <program>\n"
msgstr " -f, --fork 在启动<程序>前 fork\n"
-#: sys-utils/unshare.c:660
+#: sys-utils/unshare.c:750
#, 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:661
+#: sys-utils/unshare.c:751
#, 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:662
+#: sys-utils/unshare.c:752
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:663
+#: sys-utils/unshare.c:753
#, 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:664
+#: sys-utils/unshare.c:754
#, 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
+#: sys-utils/unshare.c:755
#, fuzzy
#| msgid " -r, --map-root-user map current user to root (implies --user)\n"
msgid ""
@@ -22336,7 +23514,7 @@ msgid ""
" map count users from outeruid to inneruid (implies --user)\n"
msgstr " -r, --map-root-user 将当前用户映射为 root (连带打开 --user)\n"
-#: sys-utils/unshare.c:667
+#: sys-utils/unshare.c:757
#, fuzzy
#| msgid " -r, --map-root-user map current user to root (implies --user)\n"
msgid ""
@@ -22344,19 +23522,19 @@ msgid ""
" map count groups from outergid to innergid (implies --user)\n"
msgstr " -r, --map-root-user 将当前用户映射为 root (连带打开 --user)\n"
-#: sys-utils/unshare.c:670
+#: sys-utils/unshare.c:760
msgid ""
" --kill-child[=<signame>] when dying, kill the forked child (implies --fork)\n"
" defaults to SIGKILL\n"
msgstr ""
-#: sys-utils/unshare.c:672
+#: sys-utils/unshare.c:762
#, 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:673
+#: sys-utils/unshare.c:763
#, fuzzy
#| msgid ""
#| " --propagation slave|shared|private|unchanged\n"
@@ -22368,137 +23546,131 @@ msgstr ""
" --propagation slave|shared|private|unchanged\n"
" 修改 mount 名字空间中的 mount 传播\n"
-#: sys-utils/unshare.c:675
+#: sys-utils/unshare.c:765
#, 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:676
+#: sys-utils/unshare.c:766
#, 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:678
+#: sys-utils/unshare.c:768
#, 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:679
+#: sys-utils/unshare.c:769
#, 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:680
+#: sys-utils/unshare.c:770
#, 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:681
+#: sys-utils/unshare.c:771
#, 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:682
+#: sys-utils/unshare.c:772
msgid " --monotonic <offset> set clock monotonic offset (seconds) in time namespaces\n"
msgstr ""
-#: sys-utils/unshare.c:683
+#: sys-utils/unshare.c:773
msgid " --boottime <offset> set clock boottime offset (seconds) in time namespaces\n"
msgstr ""
-#: sys-utils/unshare.c:898
+#: sys-utils/unshare.c:994
#, fuzzy
#| msgid "failed to parse offset"
msgid "failed to parse monotonic offset"
msgstr "解析偏移失败"
-#: sys-utils/unshare.c:902
+#: sys-utils/unshare.c:998
#, fuzzy
#| msgid "failed to parse offset"
msgid "failed to parse boottime offset"
msgstr "解析偏移失败"
-#: sys-utils/unshare.c:916
+#: sys-utils/unshare.c:1012
msgid "options --monotonic and --boottime require unsharing of a time namespace (-T)"
msgstr ""
-#: sys-utils/unshare.c:930
+#: sys-utils/unshare.c:1026
msgid "unshare failed"
msgstr "unshare 失败"
-#: sys-utils/unshare.c:947
+#: sys-utils/unshare.c:1043
#, fuzzy
#| msgid "sigprocmask failed"
msgid "sigprocmask block failed"
msgstr "sigprocmask 失败"
-#: sys-utils/unshare.c:953
+#: sys-utils/unshare.c:1049
#, fuzzy
#| msgid "pidfd_open() failed: %d"
msgid "pidfd_open failed"
msgstr "pidfd_open() 失败:%d"
-#: sys-utils/unshare.c:966
+#: sys-utils/unshare.c:1062
#, fuzzy
#| msgid "sigprocmask failed"
msgid "sigprocmask restore failed"
msgstr "sigprocmask 失败"
-#: sys-utils/unshare.c:1002
+#: sys-utils/unshare.c:1095
+#, fuzzy
+#| msgid "sigfillset failed"
+msgid "signal handler reset failed"
+msgstr "sigfillset 失败"
+
+#: sys-utils/unshare.c:1100
#, fuzzy
#| msgid "sigprocmask failed"
msgid "sigprocmask unblock failed"
msgstr "sigprocmask 失败"
-#: sys-utils/unshare.c:1006
+#: sys-utils/unshare.c:1104
msgid "child exit failed"
msgstr "子进程退出失败"
-#: sys-utils/unshare.c:1045
+#: sys-utils/unshare.c:1143
#, 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:1060
+#: sys-utils/unshare.c:1158
#, c-format
msgid "cannot change root directory to '%s'"
msgstr "无法更改根目录至“%s”"
-#: sys-utils/unshare.c:1064
+#: sys-utils/unshare.c:1162
#, c-format
msgid "cannot chdir to '%s'"
msgstr "无法更改目录(chdir)到“%s”"
-#: sys-utils/unshare.c:1076
+#: sys-utils/unshare.c:1174
#, fuzzy, c-format
#| msgid "cannot change root filesystem propagation"
msgid "cannot change %s filesystem propagation"
msgstr "无法更改根文件系统传播"
-#: sys-utils/unshare.c:1080
+#: sys-utils/unshare.c:1178
#, c-format
msgid "mount %s failed"
msgstr "挂载 %s 失败"
-#: sys-utils/unshare.c:1105
-msgid "capget failed"
-msgstr "capget 失败"
-
-#: sys-utils/unshare.c:1113
-msgid "capset failed"
-msgstr "capset 失败"
-
-#: sys-utils/unshare.c:1125
-msgid "prctl(PR_CAP_AMBIENT) failed"
-msgstr "prctl(PR_CAP_AMBIENT) 失败"
-
#: sys-utils/wdctl.c:73
msgid "Card previously reset the CPU"
msgstr "卡曾经重置 CPU"
@@ -22567,16 +23739,16 @@ msgstr "标志启动状态"
msgid "watchdog device name"
msgstr "看门狗设备名称"
-#: sys-utils/wdctl.c:166
+#: sys-utils/wdctl.c:171
#, c-format
msgid "unknown flag: %s"
msgstr "未知标志:%s"
-#: sys-utils/wdctl.c:228
+#: sys-utils/wdctl.c:233
msgid "Show the status of the hardware watchdog.\n"
msgstr "显示硬件看门狗的状态。\n"
-#: sys-utils/wdctl.c:231
+#: sys-utils/wdctl.c:236
#, fuzzy
#| msgid ""
#| " -f, --flags <list> print selected flags only\n"
@@ -22614,49 +23786,49 @@ msgstr ""
" -s, --settimeout <秒> 设置看门狗超时\n"
" -x, --flags-only 只打印标志表格(同 -I -T)\n"
-#: sys-utils/wdctl.c:249
+#: sys-utils/wdctl.c:254
#, c-format
msgid "The default device is %s.\n"
msgstr "默认设备为 %s。\n"
-#: sys-utils/wdctl.c:251
+#: sys-utils/wdctl.c:256
#, c-format
msgid "No default device is available.\n"
msgstr "没有可用的默认设备。\n"
-#: sys-utils/wdctl.c:379
+#: sys-utils/wdctl.c:384
#, c-format
msgid "%s: unknown flags 0x%x\n"
msgstr "%s:未知标志 0x%x\n"
-#: sys-utils/wdctl.c:415
+#: sys-utils/wdctl.c:420
#, c-format
msgid "%s: watchdog already in use, terminating."
msgstr "%s:看门狗正在使用,将终止。"
-#: sys-utils/wdctl.c:429 sys-utils/wdctl.c:528
+#: sys-utils/wdctl.c:434 sys-utils/wdctl.c:533
#, c-format
msgid "%s: failed to disarm watchdog"
msgstr "%s:喂看门狗失败"
-#: sys-utils/wdctl.c:439
+#: sys-utils/wdctl.c:444
#, c-format
msgid "cannot set timeout for %s"
msgstr "无法设置 %s 的超时"
-#: sys-utils/wdctl.c:441
+#: sys-utils/wdctl.c:446
#, 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:449
+#: sys-utils/wdctl.c:454
#, fuzzy, c-format
#| msgid "cannot set timeout for %s"
msgid "cannot set pretimeout for %s"
msgstr "无法设置 %s 的超时"
-#: sys-utils/wdctl.c:451
+#: sys-utils/wdctl.c:456
#, fuzzy, c-format
#| msgid "Timeout has been set to %d second.\n"
#| msgid_plural "Timeout has been set to %d seconds.\n"
@@ -22664,54 +23836,54 @@ 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
+#: sys-utils/wdctl.c:475
#, fuzzy
#| msgid "cannot set timeout for %s"
msgid "cannot set pre-timeout governor"
msgstr "无法设置 %s 的超时"
-#: sys-utils/wdctl.c:500
+#: sys-utils/wdctl.c:505
#, c-format
msgid "%s: failed to get information about watchdog"
msgstr "%s:获取看门狗信息失败"
-#: sys-utils/wdctl.c:609
+#: sys-utils/wdctl.c:637
#, c-format
msgid "cannot read information about %s"
msgstr "无法读取有关 %s 的信息"
-#: sys-utils/wdctl.c:620 sys-utils/wdctl.c:623 sys-utils/wdctl.c:626
+#: sys-utils/wdctl.c:648 sys-utils/wdctl.c:651 sys-utils/wdctl.c:654
#, c-format
msgid "%-14s %2i second\n"
msgid_plural "%-14s %2i seconds\n"
msgstr[0] "%-14s %2i 秒\n"
-#: sys-utils/wdctl.c:621
+#: sys-utils/wdctl.c:649
msgid "Timeout:"
msgstr "超时:"
-#: sys-utils/wdctl.c:624
+#: sys-utils/wdctl.c:652
msgid "Timeleft:"
msgstr "剩余时间:"
-#: sys-utils/wdctl.c:627
+#: sys-utils/wdctl.c:655
msgid "Pre-timeout:"
msgstr "预超时:"
-#: sys-utils/wdctl.c:633 sys-utils/wdctl.c:638
+#: sys-utils/wdctl.c:661 sys-utils/wdctl.c:666
#, 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
+#: sys-utils/wdctl.c:661
#, fuzzy
#| msgid "Pre-timeout:"
msgid "Pre-timeout governor:"
msgstr "预超时:"
-#: sys-utils/wdctl.c:639
+#: sys-utils/wdctl.c:667
#, fuzzy
#| msgid ""
#| "\n"
@@ -22721,25 +23893,25 @@ msgstr ""
"\n"
"可用的输出列:\n"
-#: sys-utils/wdctl.c:697
+#: sys-utils/wdctl.c:725
msgid "Device:"
msgstr "设备:"
-#: sys-utils/wdctl.c:699
+#: sys-utils/wdctl.c:727
msgid "Identity:"
msgstr "标识:"
-#: sys-utils/wdctl.c:701
+#: sys-utils/wdctl.c:729
msgid "version"
msgstr "版本:"
-#: sys-utils/wdctl.c:768
+#: sys-utils/wdctl.c:796
#, fuzzy
#| msgid "invalid timeout argument"
msgid "invalid pretimeout argument"
msgstr "无效的 timeout 超时参数"
-#: sys-utils/wdctl.c:822
+#: sys-utils/wdctl.c:850
msgid "No default device is available."
msgstr "无可用默认设备。"
@@ -22899,151 +24071,151 @@ msgstr "%s︰设置算法失败"
msgid "%s: failed to set disksize (%ju bytes)"
msgstr "%s:设置磁盘大小失败(%ju 个字节)"
-#: term-utils/agetty.c:512
+#: term-utils/agetty.c:498
#, c-format
msgid "%s%s (automatic login)\n"
msgstr "%s%s (自动登录)\n"
-#: term-utils/agetty.c:569
+#: term-utils/agetty.c:555
#, c-format
msgid "%s: can't change root directory %s: %m"
msgstr "%s:无法更改根目录 %s:%m"
-#: term-utils/agetty.c:572
+#: term-utils/agetty.c:558
#, c-format
msgid "%s: can't change working directory %s: %m"
msgstr "%s:无法更改工作目录 %s:%m"
-#: term-utils/agetty.c:575
+#: term-utils/agetty.c:561
#, c-format
msgid "%s: can't change process priority: %m"
msgstr "%s:无法更改进程优先级:%m"
-#: term-utils/agetty.c:586
+#: term-utils/agetty.c:575
#, c-format
msgid "%s: can't exec %s: %m"
msgstr "%s:无法执行 %s:%m"
-#: 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
+#: term-utils/agetty.c:606 term-utils/agetty.c:774 term-utils/agetty.c:953
+#: term-utils/agetty.c:1201 term-utils/agetty.c:1480 term-utils/agetty.c:1498
+#: term-utils/agetty.c:1535 term-utils/agetty.c:1545 term-utils/agetty.c:1587
+#: term-utils/agetty.c:1948 term-utils/agetty.c:2309 term-utils/agetty.c:2891
#, c-format
msgid "failed to allocate memory: %m"
msgstr "分配内存失败:%m"
-#: term-utils/agetty.c:791
+#: term-utils/agetty.c:783
msgid "invalid delay argument"
msgstr "无效的延迟参数"
-#: term-utils/agetty.c:829
+#: term-utils/agetty.c:821
msgid "invalid argument of --local-line"
msgstr "--local-line 选项参数无效"
-#: term-utils/agetty.c:848
+#: term-utils/agetty.c:840
msgid "invalid nice argument"
msgstr "无效的 nice 参数"
-#: term-utils/agetty.c:939
+#: term-utils/agetty.c:931
#, fuzzy, c-format
#| msgid "could not set terminal attributes"
msgid "could not get terminal name: %d"
msgstr "无法设置终端属性"
-#: term-utils/agetty.c:966
+#: term-utils/agetty.c:958
#, c-format
msgid "bad speed: %s"
msgstr "速度有误:%s"
-#: term-utils/agetty.c:968
+#: term-utils/agetty.c:960
msgid "too many alternate speeds"
msgstr "备选速度过多"
-#: term-utils/agetty.c:1075 term-utils/agetty.c:1079 term-utils/agetty.c:1132
+#: term-utils/agetty.c:1067 term-utils/agetty.c:1071 term-utils/agetty.c:1124
#, c-format
msgid "/dev/%s: cannot open as standard input: %m"
msgstr "/dev/%s:无法以标准输入打开:%m"
-#: term-utils/agetty.c:1098
+#: term-utils/agetty.c:1090
#, c-format
msgid "/dev/%s: not a character device"
msgstr "/dev/%s:不是字符设备"
-#: term-utils/agetty.c:1100
+#: term-utils/agetty.c:1092
#, c-format
msgid "/dev/%s: not a tty"
msgstr "/dev/%s:不是终端"
-#: term-utils/agetty.c:1104 term-utils/agetty.c:1136
+#: term-utils/agetty.c:1096 term-utils/agetty.c:1128
#, c-format
msgid "/dev/%s: cannot get controlling tty: %m"
msgstr "/dev/%s:无法获取控制 tty:%m"
-#: term-utils/agetty.c:1126
+#: term-utils/agetty.c:1118
#, c-format
msgid "/dev/%s: vhangup() failed: %m"
msgstr "/dev/%s:vhangup() 失败:%m"
-#: term-utils/agetty.c:1147
+#: term-utils/agetty.c:1139
#, c-format
msgid "%s: not open for read/write"
msgstr "%s:未打开(就)读/写"
-#: term-utils/agetty.c:1152
+#: term-utils/agetty.c:1144
#, c-format
msgid "/dev/%s: cannot set process group: %m"
msgstr "/dev/%s:无法设置进程组:%m"
-#: term-utils/agetty.c:1166
+#: term-utils/agetty.c:1158
#, c-format
msgid "%s: dup problem: %m"
msgstr "%s:dup 问题:%m"
-#: term-utils/agetty.c:1183
+#: term-utils/agetty.c:1175
#, c-format
msgid "%s: failed to get terminal attributes: %m"
msgstr "%s:获取终端属性失败:%m"
-#: term-utils/agetty.c:1414 term-utils/agetty.c:1443
+#: term-utils/agetty.c:1377 term-utils/agetty.c:1406
#, c-format
msgid "setting terminal attributes failed: %m"
msgstr "设置终端属性失败:%m"
-#: term-utils/agetty.c:1562
+#: term-utils/agetty.c:1525
msgid "cannot open os-release file"
msgstr "无法打开 os-release 文件"
-#: term-utils/agetty.c:1729
+#: term-utils/agetty.c:1692
#, c-format
msgid "failed to create reload file: %s: %m"
msgstr "未能创建 reload 文件︰%s:%m"
-#: term-utils/agetty.c:2049
+#: term-utils/agetty.c:2012
#, c-format
msgid "failed to get terminal attributes: %m"
msgstr "获取终端属性失败:%m"
-#: term-utils/agetty.c:2071
+#: term-utils/agetty.c:2034
msgid "[press ENTER to login]"
msgstr "[按 ENTER 键登录]"
-#: term-utils/agetty.c:2099
+#: term-utils/agetty.c:2062
msgid "Num Lock off"
msgstr "Num Lock 关"
-#: term-utils/agetty.c:2102
+#: term-utils/agetty.c:2065
msgid "Num Lock on"
msgstr "Num Lock 开"
-#: term-utils/agetty.c:2105
+#: term-utils/agetty.c:2068
msgid "Caps Lock on"
msgstr "Caps Lock 开"
-#: term-utils/agetty.c:2108
+#: term-utils/agetty.c:2071
msgid "Scroll Lock on"
msgstr "Scroll Lock 开"
-#: term-utils/agetty.c:2111
+#: term-utils/agetty.c:2074
#, c-format
msgid ""
"Hint: %s\n"
@@ -23052,32 +24224,32 @@ msgstr ""
"提示:%s\n"
"\n"
-#: term-utils/agetty.c:2255
+#: term-utils/agetty.c:2218
#, c-format
msgid "%s: read: %m"
msgstr "%s:read:%m"
-#: term-utils/agetty.c:2322
+#: term-utils/agetty.c:2285
#, c-format
msgid "%s: input overrun"
msgstr "%s:输入过载"
-#: term-utils/agetty.c:2342 term-utils/agetty.c:2350
+#: term-utils/agetty.c:2305 term-utils/agetty.c:2313
#, c-format
msgid "%s: invalid character conversion for login name"
msgstr "%s:登录名字符转换无效"
-#: term-utils/agetty.c:2356
+#: term-utils/agetty.c:2319
#, c-format
msgid "%s: invalid character 0x%x in login name"
msgstr "%s:登录名中的字符 0x%x 无效"
-#: term-utils/agetty.c:2441
+#: term-utils/agetty.c:2404
#, c-format
msgid "%s: failed to set terminal attributes: %m"
msgstr "%s:设置终端属性失败:%m"
-#: term-utils/agetty.c:2486
+#: term-utils/agetty.c:2449
#, c-format
msgid ""
" %1$s [options] <line> [<baud_rate>,...] [<termtype>]\n"
@@ -23086,168 +24258,174 @@ msgstr ""
" %1$s [选项] <线路> [<波特率>,...] [<终端类型>]\n"
" %1$s [选项] <波特率>,... <线路> [<终端类型>]\n"
-#: term-utils/agetty.c:2490
+#: term-utils/agetty.c:2453
msgid "Open a terminal and set its mode.\n"
msgstr "打开一个终端并设置其模式。\n"
-#: term-utils/agetty.c:2493
+#: term-utils/agetty.c:2456
msgid " -8, --8bits assume 8-bit tty\n"
msgstr " -8, --8bits 采用 8 位 tty\n"
-#: term-utils/agetty.c:2494
+#: term-utils/agetty.c:2457
msgid " -a, --autologin <user> login the specified user automatically\n"
msgstr " -a, --autologin <用户> 以指定用户自动登录\n"
-#: term-utils/agetty.c:2495
+#: term-utils/agetty.c:2458
msgid " -c, --noreset do not reset control mode\n"
msgstr " -c, --noreset 不重置控制模式\n"
-#: term-utils/agetty.c:2496
+#: term-utils/agetty.c:2459
msgid " -E, --remote use -r <hostname> for login(1)\n"
msgstr " -E, --remote 使用 -r <主机名> 选项调用 login(1)\n"
-#: term-utils/agetty.c:2497
+#: term-utils/agetty.c:2460
#, 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:2498
+#: term-utils/agetty.c:2461
msgid " --show-issue display issue file and exit\n"
msgstr " --show-issue 显示预登录(issue)文件并退出\n"
-#: term-utils/agetty.c:2499
+#: term-utils/agetty.c:2462
msgid " -h, --flow-control enable hardware flow control\n"
msgstr " -h, --flow-control 启用硬件流控制\n"
-#: term-utils/agetty.c:2500
+#: term-utils/agetty.c:2463
msgid " -H, --host <hostname> specify login host\n"
msgstr " -H, --host <主机名> 指定登录主机\n"
-#: term-utils/agetty.c:2501
+#: term-utils/agetty.c:2464
msgid " -i, --noissue do not display issue file\n"
msgstr " -i, --noissue 不显示预登录消息(issue)文件\n"
-#: term-utils/agetty.c:2502
+#: term-utils/agetty.c:2465
msgid " -I, --init-string <string> set init string\n"
msgstr " -I, --init-string <字符串> 设置初始字符串\n"
-#: term-utils/agetty.c:2503
+#: term-utils/agetty.c:2466
msgid " -J --noclear do not clear the screen before prompt\n"
msgstr " -J --noclear 提示之前不清屏\n"
-#: term-utils/agetty.c:2504
+#: term-utils/agetty.c:2467
msgid " -l, --login-program <file> specify login program\n"
msgstr " -l, --login-program <文件> 指定登录程序\n"
-#: term-utils/agetty.c:2505
+#: term-utils/agetty.c:2468
msgid " -L, --local-line[=<mode>] control the local line flag\n"
msgstr " -L, --local-line[=<模式>] 控制本地线路标志\n"
-#: term-utils/agetty.c:2506
+#: term-utils/agetty.c:2469
msgid " -m, --extract-baud extract baud rate during connect\n"
msgstr " -m, --extract-baud 连接过程中提取波特率\n"
-#: term-utils/agetty.c:2507
+#: term-utils/agetty.c:2470
msgid " -n, --skip-login do not prompt for login\n"
msgstr " -n, --skip-login 不提示登录\n"
-#: term-utils/agetty.c:2508
+#: term-utils/agetty.c:2471
msgid " -N --nonewline do not print a newline before issue\n"
msgstr " -N --nonewline 预登录消息(issue)前不打印换行(newline)\n"
-#: term-utils/agetty.c:2509
+#: term-utils/agetty.c:2472
msgid " -o, --login-options <opts> options that are passed to login\n"
msgstr " -o, --login-options <选项> 传递给登录程序的选项\n"
-#: term-utils/agetty.c:2510
+#: term-utils/agetty.c:2473
msgid " -p, --login-pause wait for any key before the login\n"
msgstr " -p, --login-pause 登录前等待按下任意键来继续\n"
-#: term-utils/agetty.c:2511
+#: term-utils/agetty.c:2474
msgid " -r, --chroot <dir> change root to the directory\n"
msgstr " -r, --chroot <目录> 将根目录更改为指定目录\n"
-#: term-utils/agetty.c:2512
+#: term-utils/agetty.c:2475
msgid " -R, --hangup do virtually hangup on the tty\n"
msgstr " -R, --hangup 对 tty 执行虚拟挂起(virtual hangup)\n"
-#: term-utils/agetty.c:2513
+#: term-utils/agetty.c:2476
msgid " -s, --keep-baud try to keep baud rate after break\n"
msgstr " -s, --keep-baud 中断(break)后尝试保持波特率\n"
-#: term-utils/agetty.c:2514
+#: term-utils/agetty.c:2477
msgid " -t, --timeout <number> login process timeout\n"
msgstr " -t, --timeout <数字> 登录进程超时(秒)\n"
-#: term-utils/agetty.c:2515
+#: term-utils/agetty.c:2478
msgid " -U, --detect-case detect uppercase terminal\n"
msgstr " -U, --detect-case 检测纯大写终端\n"
-#: term-utils/agetty.c:2516
+#: term-utils/agetty.c:2479
msgid " -w, --wait-cr wait carriage-return\n"
msgstr " -w, --wait-cr 等待回车\n"
-#: term-utils/agetty.c:2517
+#: term-utils/agetty.c:2480
msgid " --nohints do not print hints\n"
msgstr " --nohints 不打印提示信息\n"
-#: term-utils/agetty.c:2518
+#: term-utils/agetty.c:2481
msgid " --nohostname no hostname at all will be shown\n"
msgstr " --nohostname 将完全不显示主机名\n"
-#: term-utils/agetty.c:2519
+#: term-utils/agetty.c:2482
msgid " --long-hostname show full qualified hostname\n"
msgstr " --long-hostname 显示完全限定主机名\n"
-#: term-utils/agetty.c:2520
+#: term-utils/agetty.c:2483
msgid " --erase-chars <string> additional backspace chars\n"
msgstr " --erase-chars <字符串> 附加的退格字符\n"
-#: term-utils/agetty.c:2521
+#: term-utils/agetty.c:2484
msgid " --kill-chars <string> additional kill chars\n"
msgstr " --kill-chars <字符串> 附加的杀死(kill)字符\n"
-#: term-utils/agetty.c:2522
+#: term-utils/agetty.c:2485
msgid " --chdir <directory> chdir before the login\n"
msgstr " --chdir <目录> 登录前切换目录(chdir)\n"
-#: term-utils/agetty.c:2523
+#: term-utils/agetty.c:2486
msgid " --delay <number> sleep seconds before prompt\n"
msgstr " --delay <数字> 提示前睡眠的秒数\n"
-#: term-utils/agetty.c:2524
+#: term-utils/agetty.c:2487
msgid " --nice <number> run login with this priority\n"
msgstr " --nice <数字> 以指定优先级运行 login\n"
-#: term-utils/agetty.c:2525
+#: term-utils/agetty.c:2488
msgid " --reload reload prompts on running agetty instances\n"
msgstr " --reload 在运行 agetty 实例时重新载入提示\n"
-#: term-utils/agetty.c:2526
+#: term-utils/agetty.c:2489
msgid " --list-speeds display supported baud rates\n"
msgstr " --list-speeds 显示支持的波特率\n"
-#: term-utils/agetty.c:2874
+#: term-utils/agetty.c:2848
#, c-format
msgid "%d user"
msgid_plural "%d users"
msgstr[0] "%d 位用户"
-#: term-utils/agetty.c:3004
+#: term-utils/agetty.c:2978
#, c-format
msgid "checkname failed: %m"
msgstr "checkname 失败:%m"
-#: term-utils/agetty.c:3016
+#: term-utils/agetty.c:2990
#, c-format
msgid "cannot touch file %s"
msgstr "无法 touch 文件 %s"
-#: term-utils/agetty.c:3020
+#: term-utils/agetty.c:2994
msgid "--reload is unsupported on your system"
msgstr "您的系统不支持 --reload"
+#: term-utils/agetty.c:3016
+#, fuzzy
+#| msgid "failed to open directory"
+msgid "failed to open credentials directory"
+msgstr "打开目录失败"
+
#: term-utils/mesg.c:78
#, c-format
msgid " %s [options] [y | n]\n"
@@ -23497,13 +24675,13 @@ msgstr ""
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
+#: term-utils/scriptlive.c:226 term-utils/scriptreplay.c:234
#, fuzzy
#| msgid "failed to parse argument"
msgid "failed to parse maximal delay argument"
msgstr "解析参数失败"
-#: term-utils/scriptlive.c:249 term-utils/scriptreplay.c:274
+#: term-utils/scriptlive.c:249 term-utils/scriptreplay.c:275
msgid "timing file not specified"
msgstr "未指定时序文件"
@@ -23566,26 +24744,26 @@ msgstr " -c, --cr-mode <类型> CR 字符模式(auto, never, always)\n"
msgid "unexpected tcgetattr failure"
msgstr "未预期的 tcgetattr 失败"
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:213
#, c-format
msgid "unsupported mode name: '%s'"
msgstr "不支持的模式名称:“%s”"
-#: term-utils/scriptreplay.c:245
+#: term-utils/scriptreplay.c:246
#, c-format
msgid "unsupported stream name: '%s'"
msgstr "不支持的流名称:“%s”"
-#: term-utils/scriptreplay.c:276
+#: term-utils/scriptreplay.c:277
msgid "data log file not specified"
msgstr "未指定数据日志文件"
-#: term-utils/scriptreplay.c:330
+#: term-utils/scriptreplay.c:331
#, c-format
msgid "%s: log file error"
msgstr "%s:日志文件错误"
-#: term-utils/scriptreplay.c:332
+#: term-utils/scriptreplay.c:333
#, c-format
msgid "%s: line %d: timing file error"
msgstr "%s:行 %d:时序文件错误"
@@ -23881,122 +25059,134 @@ msgstr "无法 fork"
msgid "%s: BAD ERROR, message is far too long"
msgstr "%s:严重错误,消息太长太长了"
-#: term-utils/wall.c:89
+#: term-utils/wall.c:94
#, c-format
msgid " %s [options] [<file> | <message>]\n"
msgstr " %s [选项] [<文件> | <消息>]\n"
-#: term-utils/wall.c:92
+#: term-utils/wall.c:97
msgid "Write a message to all users.\n"
msgstr "向所有用户发消息。\n"
-#: term-utils/wall.c:95
+#: term-utils/wall.c:100
#, 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:96
+#: term-utils/wall.c:101
msgid " -n, --nobanner do not print banner, works only for root\n"
msgstr " -n, --nobanner 不打印欢迎消息,只对 root 用户生效\n"
-#: term-utils/wall.c:97
+#: term-utils/wall.c:102
msgid " -t, --timeout <timeout> write timeout in seconds\n"
msgstr " -t, --timeout <超时> 写超时(秒)\n"
-#: term-utils/wall.c:125
+#: term-utils/wall.c:130
msgid "invalid group argument"
msgstr "无效的组参数"
-#: term-utils/wall.c:127
+#: term-utils/wall.c:132
#, c-format
msgid "%s: unknown gid"
msgstr "%s:未知的 gid"
-#: term-utils/wall.c:170
+#: term-utils/wall.c:175
msgid "getgrouplist found more groups than sysconf allows"
msgstr ""
-#: term-utils/wall.c:216
+#: term-utils/wall.c:221
msgid "--nobanner is available only for root"
msgstr "--nobanner 只有 root 能用"
-#: term-utils/wall.c:221
+#: term-utils/wall.c:226
#, c-format
msgid "invalid timeout argument: %s"
msgstr "无效的超时参数:%s"
-#: term-utils/wall.c:293
+#: term-utils/wall.c:262 term-utils/write.c:144 term-utils/write.c:215
+#, fuzzy, c-format
+#| msgid "error writing %s: %s"
+msgid "error getting sessions: %s"
+msgstr "写 %s 出错:%s"
+
+#: term-utils/wall.c:270 term-utils/write.c:153 term-utils/write.c:223
+#, fuzzy, c-format
+#| msgid "gethostname failed"
+msgid "get user name failed: %s"
+msgstr "gethostname 失败"
+
+#: term-utils/wall.c:333
msgid "cannot get passwd uid"
msgstr "无法获取 passwd uid"
-#: term-utils/wall.c:317
+#: term-utils/wall.c:357
#, c-format
msgid "Broadcast message from %s@%s (%s) (%s):"
msgstr "来自 %s@%s (%s) (%s) 的广播消息:"
-#: term-utils/wall.c:349
+#: term-utils/wall.c:389
#, c-format
msgid "will not read %s - use stdin."
msgstr "将不读 %s - 使用 stdin。"
-#: term-utils/write.c:87
+#: term-utils/write.c:92
#, c-format
msgid " %s [options] <user> [<ttyname>]\n"
msgstr " %s [选项] <用户> [<tty名称>]\n"
-#: term-utils/write.c:91
+#: term-utils/write.c:96
msgid "Send a message to another user.\n"
msgstr "向另一个用户发送消息。\n"
-#: term-utils/write.c:116
+#: term-utils/write.c:121
#, c-format
msgid "effective gid does not match group of %s"
msgstr "有效 gid 与组 %s 不匹配"
-#: term-utils/write.c:201
+#: term-utils/write.c:309
#, c-format
msgid "%s is not logged in"
msgstr "%s 未登录"
-#: term-utils/write.c:206
+#: term-utils/write.c:314
msgid "can't find your tty's name"
msgstr "找不到您的 tty 名称"
-#: term-utils/write.c:211
+#: term-utils/write.c:319
#, c-format
msgid "%s has messages disabled"
msgstr "%s 禁用了消息"
-#: term-utils/write.c:214
+#: term-utils/write.c:322
#, c-format
msgid "%s is logged in more than once; writing to %s"
msgstr "%s 登录了多次;将记入 %s"
-#: term-utils/write.c:265
+#: term-utils/write.c:373
#, 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:269
+#: term-utils/write.c:377
#, c-format
msgid "Message from %s@%s on %s at %02d:%02d ..."
msgstr "%s@%s 于 %s 在 %02d:%02d 发的消息..."
-#: term-utils/write.c:280
+#: term-utils/write.c:388
msgid "carefulputc failed"
msgstr "carefulputc 失败"
-#: term-utils/write.c:318
+#: term-utils/write.c:426
msgid "you have write permission turned off"
msgstr "您关闭了写权限"
-#: term-utils/write.c:341
+#: term-utils/write.c:449
#, c-format
msgid "%s is not logged in on %s"
msgstr "%s 未在 %s 上登录"
-#: term-utils/write.c:347
+#: term-utils/write.c:455
#, c-format
msgid "%s has messages disabled on %s"
msgstr "%s 在 %s 上禁用了消息"
@@ -24045,7 +25235,7 @@ msgstr "-- 行已经被冲洗(flushed)"
msgid "bad -l argument"
msgstr "-l 参数有误"
-#: text-utils/colcrt.c:82 text-utils/column.c:743
+#: text-utils/colcrt.c:82 text-utils/column.c:745
#, c-format
msgid " %s [options] [<file>...]\n"
msgstr " %s [选项] [<文件>...]\n"
@@ -24142,121 +25332,121 @@ msgstr ""
msgid "failed to allocate output data"
msgstr "分配输出数据失败"
-#: text-utils/column.c:746
+#: text-utils/column.c:748
msgid "Columnate lists.\n"
msgstr "成列输出内容。\n"
-#: text-utils/column.c:749
+#: text-utils/column.c:751
msgid " -t, --table create a table\n"
msgstr " -t, --table 创建表格\n"
-#: text-utils/column.c:750
+#: text-utils/column.c:752
#, 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:751
+#: text-utils/column.c:753
#, 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:752
+#: text-utils/column.c:754
#, 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:753
+#: text-utils/column.c:755
#, 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:754
+#: text-utils/column.c:756
#, 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:755
+#: text-utils/column.c:757
msgid " -E, --table-noextreme <columns> don't count long text from the columns to column width\n"
msgstr ""
-#: text-utils/column.c:756
+#: text-utils/column.c:758
#, 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:757
+#: text-utils/column.c:759
#, 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:758
+#: text-utils/column.c:760
msgid " -e, --table-header-repeat repeat header for each page\n"
msgstr ""
-#: text-utils/column.c:759
+#: text-utils/column.c:761
#, 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:760
+#: text-utils/column.c:762
msgid " -R, --table-right <columns> right align text in these columns\n"
msgstr ""
-#: text-utils/column.c:761
+#: text-utils/column.c:763
#, 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:762
+#: text-utils/column.c:764
msgid " -W, --table-wrap <columns> wrap text in the columns when necessary\n"
msgstr ""
-#: text-utils/column.c:763
+#: text-utils/column.c:765
#, 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:764
+#: text-utils/column.c:766
#, 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:767
+#: text-utils/column.c:769
#, 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:768
+#: text-utils/column.c:770
#, 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:769
+#: text-utils/column.c:771
#, 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:772
+#: text-utils/column.c:774
#, 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:773
+#: text-utils/column.c:775
#, fuzzy
#| msgid ""
#| " -o, --output-separator <string>\n"
@@ -24266,118 +25456,124 @@ msgstr ""
" -o, --output-separator <字符串>\n"
" 表格输出列分隔符,默认为两个空格\n"
-#: text-utils/column.c:774
+#: text-utils/column.c:776
#, 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:775
+#: text-utils/column.c:777
#, 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:856
+#: text-utils/column.c:858
msgid "invalid columns argument"
msgstr "无效的 列数 参数"
-#: text-utils/column.c:882
+#: text-utils/column.c:884
#, fuzzy
#| msgid "invalid columns argument"
msgid "invalid columns limit argument"
msgstr "无效的 列数 参数"
-#: text-utils/column.c:884
+#: text-utils/column.c:886
msgid "columns limit must be greater than zero"
msgstr ""
-#: text-utils/column.c:887
+#: text-utils/column.c:889
msgid "failed to parse column names"
msgstr "解析列名称失败"
-#: text-utils/column.c:914
+#: text-utils/column.c:916
#, fuzzy
#| msgid "failed to allocate iterator"
msgid "failed to use input separator"
msgstr "分配迭代器失败"
-#: text-utils/column.c:947
+#: text-utils/column.c:949
msgid "options --tree-id and --tree-parent are required for tree formatting"
msgstr ""
-#: text-utils/column.c:955
+#: text-utils/column.c:957
msgid "option --table required for all --table-*"
msgstr "所有 --table-* 均需要 --table 选项"
-#: text-utils/column.c:958
+#: text-utils/column.c:960
#, 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:237
+#: text-utils/hexdump.c:167 text-utils/more.c:238
#, c-format
msgid " %s [options] <file>...\n"
msgstr " %s [选项] <文件>...\n"
-#: text-utils/hexdump.c:165
+#: text-utils/hexdump.c:170
msgid "Display file contents in hexadecimal, decimal, octal, or ascii.\n"
msgstr "以十六进制、十进制、八进制、二进制或 ascii 显示文件内容。\n"
-#: text-utils/hexdump.c:168
+#: text-utils/hexdump.c:173
msgid " -b, --one-byte-octal one-byte octal display\n"
msgstr " -b, --one-byte-octal 单字节八进制显示\n"
-#: text-utils/hexdump.c:169
+#: text-utils/hexdump.c:174
+#, fuzzy
+#| msgid " -x, --two-bytes-hex two-byte hexadecimal display\n"
+msgid " -X, --one-byte-hex one-byte hexadecimal display\n"
+msgstr " -x, --two-bytes-hex 双字节十六进制显示\n"
+
+#: text-utils/hexdump.c:175
msgid " -c, --one-byte-char one-byte character display\n"
msgstr " -c, --one-byte-char 单字节字符显示\n"
-#: text-utils/hexdump.c:170
+#: text-utils/hexdump.c:176
msgid " -C, --canonical canonical hex+ASCII display\n"
msgstr " -C, --canonical 规范化 hex+ASCII 显示\n"
-#: text-utils/hexdump.c:171
+#: text-utils/hexdump.c:177
msgid " -d, --two-bytes-decimal two-byte decimal display\n"
msgstr " -d, --two-bytes-decimal 双字节十进制显示\n"
-#: text-utils/hexdump.c:172
+#: text-utils/hexdump.c:178
msgid " -o, --two-bytes-octal two-byte octal display\n"
msgstr " -o, --two-bytes-octal 双字节八进制显示\n"
-#: text-utils/hexdump.c:173
+#: text-utils/hexdump.c:179
msgid " -x, --two-bytes-hex two-byte hexadecimal display\n"
msgstr " -x, --two-bytes-hex 双字节十六进制显示\n"
-#: text-utils/hexdump.c:174
+#: text-utils/hexdump.c:180
msgid " -L, --color[=<mode>] interpret color formatting specifiers\n"
msgstr " -L, --color[=<模式>] 解释颜色格式化限定符\n"
-#: text-utils/hexdump.c:177
+#: text-utils/hexdump.c:183
msgid " -e, --format <format> format string to be used for displaying data\n"
msgstr " -e, --format <格式> 用于显示数据的格式化字符串\n"
-#: text-utils/hexdump.c:178
+#: text-utils/hexdump.c:184
msgid " -f, --format-file <file> file that contains format strings\n"
msgstr " -f, --format-file <文件> 包含格式字符串的文件\n"
-#: text-utils/hexdump.c:179
+#: text-utils/hexdump.c:185
msgid " -n, --length <length> interpret only length bytes of input\n"
msgstr " -n, --length <长度> 只解释规定字节长度的输入\n"
-#: text-utils/hexdump.c:180
+#: text-utils/hexdump.c:186
msgid " -s, --skip <offset> skip offset bytes from the beginning\n"
msgstr " -s, --skip <偏移> 跳过开头的指定字节偏移\n"
-#: text-utils/hexdump.c:181
+#: text-utils/hexdump.c:187
msgid " -v, --no-squeezing output identical lines\n"
msgstr " -v, --no-squeezing 输出相同的行\n"
-#: text-utils/hexdump.c:187
+#: text-utils/hexdump.c:193
msgid "<length> and <offset>"
msgstr ""
-#: text-utils/hexdump-display.c:366
+#: text-utils/hexdump-display.c:374
msgid "all input file arguments failed"
msgstr "所有输入文件参数失败"
@@ -24401,99 +25597,99 @@ msgstr "格式损坏 {%s}"
msgid "bad conversion character %%%s"
msgstr "转换字符 %%%s 有误"
-#: text-utils/hexdump-parse.c:440
+#: text-utils/hexdump-parse.c:438
msgid "byte count with multiple conversion characters"
msgstr "对字符计数使用了多个转换字符"
-#: text-utils/line.c:34
+#: text-utils/line.c:33
msgid "Read one line.\n"
msgstr "读一行内容。\n"
-#: text-utils/more.c:240
+#: text-utils/more.c:241
#, fuzzy
#| 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:243
+#: text-utils/more.c:244
#, 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:244
+#: text-utils/more.c:245
#, 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:245
+#: text-utils/more.c:246
#, 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:246
+#: text-utils/more.c:247
#, 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:247
+#: text-utils/more.c:248
#, 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:248
+#: text-utils/more.c:249
msgid " -e, --exit-on-eof exit on end-of-file"
msgstr ""
-#: text-utils/more.c:249
+#: text-utils/more.c:250
#, 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:250
+#: text-utils/more.c:251
#, fuzzy
#| msgid " -u suppress underlining\n"
msgid " -u, --plain suppress underlining and bold"
msgstr " -u 屏蔽下划线\n"
-#: text-utils/more.c:251
+#: text-utils/more.c:252
#, 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:252
+#: text-utils/more.c:253
#, fuzzy
#| msgid " -<number> same as '-n <number>'\n"
msgid " -<number> same as --lines"
msgstr " -<数字> 同“-n <数字>”\n"
-#: text-utils/more.c:253
+#: text-utils/more.c:254
#, fuzzy
#| msgid " +<number> display file beginning from line number\n"
msgid " +<number> display file beginning from line number"
msgstr " +<数字> 从指定行开始显示文件\n"
-#: text-utils/more.c:254
+#: text-utils/more.c:255
#, 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:357
+#: text-utils/more.c:358
msgid "MORE environment variable"
msgstr "MORE 环境变量"
-#: text-utils/more.c:410
+#: text-utils/more.c:411
msgid "magic failed"
msgstr "魔数校验失败"
-#: text-utils/more.c:414 text-utils/more.c:433
+#: text-utils/more.c:415 text-utils/more.c:434
#, c-format
msgid ""
"\n"
@@ -24504,7 +25700,7 @@ msgstr ""
"******** %s:不是文本文件 ********\n"
"\n"
-#: text-utils/more.c:467
+#: text-utils/more.c:468
#, c-format
msgid ""
"\n"
@@ -24515,27 +25711,27 @@ msgstr ""
"*** %s:目录 ***\n"
"\n"
-#: text-utils/more.c:729
+#: text-utils/more.c:727
#, c-format
msgid "--More--"
msgstr "--更多--"
-#: text-utils/more.c:731
+#: text-utils/more.c:729
#, c-format
msgid "(Next file: %s)"
msgstr "(下个文件:%s)"
-#: text-utils/more.c:736 text-utils/more.c:742
+#: text-utils/more.c:734 text-utils/more.c:740
#, c-format
msgid "(END)"
msgstr ""
-#: text-utils/more.c:747
+#: text-utils/more.c:745
#, c-format
msgid "[Press space to continue, 'q' to quit.]"
msgstr "[按空格键继续,“q”键退出。]"
-#: text-utils/more.c:949
+#: text-utils/more.c:947
msgid ""
"\n"
"...Skipping "
@@ -24543,40 +25739,40 @@ msgstr ""
"\n"
"...跳过 "
-#: text-utils/more.c:953
+#: text-utils/more.c:951
msgid "...Skipping to file "
msgstr "...跳到文件 "
-#: text-utils/more.c:955
+#: text-utils/more.c:953
msgid "...Skipping back to file "
msgstr "...将跳回文件 "
-#: text-utils/more.c:1117
+#: text-utils/more.c:1115
msgid "Line too long"
msgstr "行过长"
-#: text-utils/more.c:1160
+#: text-utils/more.c:1158
msgid "No previous command to substitute for"
msgstr "没有要替换的前一命令"
-#: text-utils/more.c:1189
+#: text-utils/more.c:1187
#, c-format
msgid "[Use q or Q to quit]"
msgstr "[使用 q 或 Q 退出]"
-#: text-utils/more.c:1275
+#: text-utils/more.c:1272
msgid "exec failed\n"
msgstr "exec 失败\n"
-#: text-utils/more.c:1285
+#: text-utils/more.c:1282
msgid "can't fork\n"
msgstr "无法 fork\n"
-#: text-utils/more.c:1441
+#: text-utils/more.c:1480
msgid "...skipping\n"
msgstr "...跳过\n"
-#: text-utils/more.c:1478
+#: text-utils/more.c:1517
msgid ""
"\n"
"Pattern not found\n"
@@ -24584,11 +25780,11 @@ msgstr ""
"\n"
"未找到模式\n"
-#: text-utils/more.c:1482 text-utils/pg.c:1032 text-utils/pg.c:1180
+#: text-utils/more.c:1521 text-utils/pg.c:1032 text-utils/pg.c:1180
msgid "Pattern not found"
msgstr "找不到模式"
-#: text-utils/more.c:1500
+#: text-utils/more.c:1539
#, fuzzy
#| msgid ""
#| "\n"
@@ -24602,7 +25798,7 @@ msgstr ""
"多数命令可在前面加整数参数 k。方括号中为参数的默认值\n"
"星号(*)表示参数将成为新的默认值。\n"
-#: text-utils/more.c:1506
+#: text-utils/more.c:1545
#, fuzzy, c-format
#| msgid ""
#| "<space> Display next k lines of text [current screen size]\n"
@@ -24665,19 +25861,19 @@ msgstr ""
":f 显示当前文件名和行号\n"
". 重复前一命令\n"
-#: text-utils/more.c:1572
+#: text-utils/more.c:1611
#, c-format
msgid "...back %d page"
msgid_plural "...back %d pages"
msgstr[0] "...后退 %d 页"
-#: text-utils/more.c:1596
+#: text-utils/more.c:1635
#, c-format
msgid "...skipping %d line"
msgid_plural "...skipping %d lines"
msgstr[0] "...跳过 %d 行"
-#: text-utils/more.c:1696
+#: text-utils/more.c:1735
msgid ""
"\n"
"***Back***\n"
@@ -24687,21 +25883,21 @@ msgstr ""
"***后退***\n"
"\n"
-#: text-utils/more.c:1715
+#: text-utils/more.c:1754
#, c-format
msgid "\"%s\" line %d"
msgstr "“%s”第 %d 行"
-#: text-utils/more.c:1718
+#: text-utils/more.c:1757
#, c-format
msgid "[Not a file] line %d"
msgstr "[不是文件] 第 %d 行"
-#: text-utils/more.c:1724
+#: text-utils/more.c:1763
msgid "No previous regular expression"
msgstr "无上一个正则表达式"
-#: text-utils/more.c:1793
+#: text-utils/more.c:1832
#, c-format
msgid "[Press 'h' for instructions.]"
msgstr "[按“h”键获取说明。]"
@@ -24930,6 +26126,152 @@ msgid "terminal `%s' is not known, defaulting to `dumb'"
msgstr "终端“%s”未知,将使用默认值“dumb”"
#, c-format
+#~ msgid "Device already contains a %s signature; it will be removed by a write command."
+#~ msgstr "设备已包含一个 %s 签名;写入命令会将其移除。"
+
+#~ msgid "setexeccon failed"
+#~ msgstr "setexeccon 失败"
+
+#~ msgid "filesystem size available"
+#~ msgstr "文件系统可用大小"
+
+#~ msgid "filesystem size"
+#~ msgstr "文件系统大小"
+
+#~ msgid "filesystem size used"
+#~ msgstr "文件系统已用大小"
+
+#~ msgid "discard granularity"
+#~ msgstr "忽略粒度"
+
+#~ msgid "discard max bytes"
+#~ msgstr "忽略最大字节数"
+
+#~ msgid "size of the device"
+#~ msgstr "磁盘容量"
+
+#~ msgid "write same max bytes"
+#~ msgstr "写相同的最大字节数"
+
+#, fuzzy
+#~| msgid "discard granularity"
+#~ msgid "zone write granularity"
+#~ msgstr "忽略粒度"
+
+#, fuzzy
+#~| msgid "write same max bytes"
+#~ msgid "zone append max bytes"
+#~ msgstr "写相同的最大字节数"
+
+#, fuzzy
+#~| msgid " -J, --json use JSON output format\n"
+#~ msgid " -J, --json use JSON output format\n"
+#~ msgstr " -J, --json 使用 JSON 输出格式\n"
+
+#, fuzzy
+#~| msgid " --noheadings don't print headings\n"
+#~ msgid " -n, --noheadings don't print headings\n"
+#~ msgstr " --noheadings 不打印标题\n"
+
+#, fuzzy
+#~| msgid " -o, --output <list> output columns\n"
+#~ msgid " -o, --output <list> output columns\n"
+#~ msgstr " -o, --output <列表> 输出列\n"
+
+#, fuzzy
+#~| msgid " -r, --raw use raw output format\n"
+#~ msgid " -r, --raw use raw output format\n"
+#~ msgstr " -r, --raw 使用原生输出格式\n"
+
+#, 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"
+
+#, fuzzy, c-format
+#~| msgid "input error: unexpected character %c after %s field"
+#~ msgid "error: unexpected character %c after ="
+#~ msgstr "输入错误:%2$s 字段后出现异常字符 %1$c"
+
+#, fuzzy, c-format
+#~| msgid "%s: failed to get partition number"
+#~ msgid "error: failed to convert input to number"
+#~ msgstr "%s:获取分区号失败"
+
+#, fuzzy, c-format
+#~| msgid "input error: unexpected character %c after %s field"
+#~ msgid "error: unexpected character %c"
+#~ msgstr "输入错误:%2$s 字段后出现异常字符 %1$c"
+
+#, fuzzy, c-format
+#~| msgid "input error: unexpected character %c after %s field"
+#~ msgid "error: unexpected token: %s after %s"
+#~ msgstr "输入错误:%2$s 字段后出现异常字符 %1$c"
+
+#, fuzzy, c-format
+#~| msgid "error writing sector %lu on %s"
+#~ msgid "error: no such column: %s"
+#~ msgstr "写 %2$s 上的 %1$lu 扇区出错"
+
+#, fuzzy, c-format
+#~| msgid "internal error: unsupported dialog type %d"
+#~ msgid "error: unsupported column data type: %d, column: %s"
+#~ msgstr "内部错误:不支持的对话类型 %d"
+
+#, fuzzy
+#~| msgid "could not compile regular expression %s: %s"
+#~ msgid "error: empty filter expression"
+#~ msgstr "无法编译正则表达式 %s:%s"
+
+#, fuzzy, c-format
+#~| msgid "unexpected end of file on %s"
+#~ msgid "unexpected type in filter application: %s"
+#~ msgstr "%s 上的文件结尾异常"
+
+#, 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"
+
+#, 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"
+
+#, 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"
+
+#, fuzzy, c-format
+#~| msgid "could not compile regular expression %s: %s"
+#~ msgid "error: could not compile regular expression %s: %s"
+#~ msgstr "无法编译正则表达式 %s:%s"
+
+#, fuzzy
+#~| msgid "failed to allocate memory: %m"
+#~ msgid "failed to allocate memory for string"
+#~ msgstr "分配内存失败:%m"
+
+#~ msgid " -J, --json use JSON output format"
+#~ msgstr " -J, --json 使用 JSON 输出格式"
+
+#, c-format
+#~ msgid "%d out of range"
+#~ msgstr "%d 超出范围"
+
+#~ msgid "You must be root to set the Ctrl-Alt-Del behavior"
+#~ msgstr "只有 root 用户才能设置 Ctrl-Alt-Del 行为"
+
+#~ msgid "--show-delta is ignored when used together with iso8601 time format"
+#~ msgstr "--show-delta 与 iso8601 时间格式共用时将忽略"
+
+#, fuzzy, c-format
+#~| msgid "too many arguments"
+#~ msgid "%d too many arguments given"
+#~ msgstr "参数过多"
+
+#, c-format
#~ msgid "chown failed: %s"
#~ msgstr "chown 失败:%s"
@@ -25271,9 +26613,6 @@ msgstr "终端“%s”未知,将使用默认值“dumb”"
#~ msgid "Rufus alignment"
#~ msgstr "Rufus 对齐"
-#~ msgid "user %s does not exist"
-#~ msgstr "用户 %s 不存在"
-
#~ msgid "only root can use \"--%s\" option (effective UID is %u)"
#~ msgstr "只有 root 用户能使用“--%s”选项(有效 UID 是 %u)"
@@ -25393,9 +26732,6 @@ msgstr "终端“%s”未知,将使用默认值“dumb”"
#~ msgid "%15s: %s"
#~ msgstr "%15s: %s"
-#~ msgid "Device %s already contains a %s signature."
-#~ msgstr "设备 %s 已包含一个 %s 签名。"
-
#~ msgid "Geometry"
#~ msgstr "几何属性"
@@ -25983,9 +27319,6 @@ msgstr "终端“%s”未知,将使用默认值“dumb”"
#~ msgid "use of 'kill --pid' option as command name is deprecated"
#~ msgstr "将“kill --pid”选项当作命令的做法已经废弃"
-#~ msgid "%s: failed to get device path"
-#~ msgstr "%s:获取设备路径失败"
-
#~ msgid "%s: unknown device name"
#~ msgstr "%s:未知设备名称"
@@ -26174,9 +27507,6 @@ msgstr "终端“%s”未知,将使用默认值“dumb”"
#~ msgid "write error on %s - cannot write sector %llu"
#~ msgstr "在 %s 上定位出错 - 无法定位到 %llu"
-#~ msgid "cannot open partition sector save file (%s)"
-#~ msgstr "打不开分区扇区保存文件(%s)"
-
#~ msgid "write error on %s"
#~ msgstr "%s 写出错"
@@ -26470,9 +27800,6 @@ msgstr "终端“%s”未知,将使用默认值“dumb”"
#~ msgid "unrecognized input: %s"
#~ msgstr "无法识别的输入:%s"
-#~ msgid "number too big"
-#~ msgstr "数字过大"
-
#~ msgid "trailing junk after number"
#~ msgstr "数字后有垃圾内容"
@@ -26857,9 +28184,6 @@ msgstr "终端“%s”未知,将使用默认值“dumb”"
#~ "\n"
#~ "wtmp 开始 %s"
-#~ msgid "gethostname failed"
-#~ msgstr "gethostname 失败"
-
#~ msgid ""
#~ "\n"
#~ "interrupted %10.10s %5.5s \n"
@@ -27235,9 +28559,6 @@ msgstr "终端“%s”未知,将使用默认值“dumb”"
#~ msgid " [notime|short|full|iso]\n"
#~ msgstr " [notime|short|full|iso]\n"
-#~ msgid " %s [options] pathname [pathname ...]\n"
-#~ msgstr " %s [选项] 路径名 [路径名 ...]\n"
-
#~ msgid "no filename specified."
#~ msgstr "未指定文件名。"
@@ -27866,9 +29187,6 @@ msgstr "终端“%s”未知,将使用默认值“dumb”"
#~ msgid "cannot open %s (%s) - mtab not updated"
#~ msgstr "无法打开 %s (%s) - mtab 未更新"
-#~ msgid "error writing %s: %s"
-#~ msgstr "写 %s 出错:%s"
-
#~ msgid "error changing mode of %s: %s\n"
#~ msgstr "更改 %s 的模式出错:%s\n"
@@ -27893,9 +29211,6 @@ msgstr "终端“%s”未知,将使用默认值“dumb”"
#~ msgid "mount: improperly quoted option string '%s'"
#~ msgstr "mount:选项字符串“%s”引号没有正确闭合"
-#~ msgid "mount: translated %s '%s' to '%s'\n"
-#~ msgstr "mount:已将 %s “%s”转换为“%s”\n"
-
#~ msgid "mount: SELinux *context= options are ignore on remount.\n"
#~ msgstr "mount:SELinux *context= 选项重新挂载会时忽略。\n"
@@ -28329,9 +29644,6 @@ msgstr "终端“%s”未知,将使用默认值“dumb”"
#~ msgid "failed to parse 'offset=%s' options\n"
#~ msgstr "解析 'offset=%s' 选项失败\n"
-#~ msgid "device %s is associated with %s\n"
-#~ msgstr "设备 %s 与 %s 关联\n"
-
#~ msgid "device %s is not associated with %s\n"
#~ msgstr "设备 %s 未与 %s 关联\n"
@@ -28547,9 +29859,6 @@ msgstr "终端“%s”未知,将使用默认值“dumb”"
#~ msgid " -linewrap <on|off>\n"
#~ msgstr " -linewrap <on|off>\n"
-#~ msgid " -default\n"
-#~ msgstr " -default\n"
-
#~ msgid " -foreground <default|black|blue|cyan|green|magenta|red|white|yellow>\n"
#~ msgstr " -foreground <default|black|blue|cyan|green|magenta|red|white|yellow>\n"
@@ -28616,9 +29925,6 @@ msgstr "终端“%s”未知,将使用默认值“dumb”"
#~ msgid "Error writing screendump"
#~ msgstr "写屏幕转储失败"
-#~ msgid "Couldn't read neither /dev/vcsa0 nor /dev/vcsa"
-#~ msgstr "无法读 /dev/vcsa0 或 /dev/vcsa"
-
#~ msgid ""
#~ "Usage: %s [options] file...\n"
#~ "\n"
@@ -28828,9 +30134,6 @@ msgstr "终端“%s”未知,将使用默认值“dumb”"
#~ msgid "unable to seek on %s"
#~ msgstr "无法在 %s 上定位"
-#~ msgid "unable to write %s"
-#~ msgstr "不能写 %s"
-
#~ msgid "fatal error"
#~ msgstr "致命错误"