msgstr ""
"Project-Id-Version: util-linux-2.36-rc2\n"
"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
-"POT-Creation-Date: 2020-07-22 12:05+0200\n"
+"POT-Creation-Date: 2021-05-31 18:30+0200\n"
"PO-Revision-Date: 2020-07-12 22:32-0400\n"
"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
#: disk-utils/addpart.c:52 disk-utils/blockdev.c:244 disk-utils/delpart.c:52
#: disk-utils/mkfs.bfs.c:127 disk-utils/resizepart.c:96 misc-utils/kill.c:314
-#: misc-utils/kill.c:375 misc-utils/rename.c:289 misc-utils/whereis.c:524
+#: misc-utils/kill.c:375 misc-utils/rename.c:289 misc-utils/whereis.c:527
#: sys-utils/flock.c:177 sys-utils/ipcrm.c:160 sys-utils/ldattach.c:367
-#: sys-utils/renice.c:144 sys-utils/switch_root.c:240 sys-utils/tunelp.c:152
-#: term-utils/agetty.c:893 term-utils/agetty.c:894 term-utils/agetty.c:902
-#: term-utils/agetty.c:903
+#: sys-utils/renice.c:144 sys-utils/switch_root.c:261 sys-utils/tunelp.c:152
+#: term-utils/agetty.c:897 term-utils/agetty.c:898 term-utils/agetty.c:906
+#: term-utils/agetty.c:907
msgid "not enough arguments"
msgstr "参数不够"
#: disk-utils/addpart.c:57 disk-utils/blockdev.c:293 disk-utils/blockdev.c:437
-#: disk-utils/blockdev.c:464 disk-utils/cfdisk.c:2743 disk-utils/delpart.c:58
-#: disk-utils/fdformat.c:229 disk-utils/fdisk.c:812 disk-utils/fdisk.c:1143
+#: disk-utils/blockdev.c:464 disk-utils/cfdisk.c:2768 disk-utils/delpart.c:58
+#: disk-utils/fdformat.c:229 disk-utils/fdisk.c:810 disk-utils/fdisk.c:1141
#: disk-utils/fdisk-list.c:327 disk-utils/fdisk-list.c:368
-#: disk-utils/fdisk-list.c:391 disk-utils/fsck.c:1466
-#: disk-utils/fsck.cramfs.c:155 disk-utils/fsck.cramfs.c:514
+#: disk-utils/fdisk-list.c:391 disk-utils/fsck.c:1470
+#: disk-utils/fsck.cramfs.c:161 disk-utils/fsck.cramfs.c:520
#: disk-utils/isosize.c:53 disk-utils/mkfs.bfs.c:186
#: disk-utils/mkfs.cramfs.c:171 disk-utils/mkfs.cramfs.c:660
-#: disk-utils/mkfs.cramfs.c:799 disk-utils/mkfs.minix.c:823
-#: disk-utils/mkswap.c:220 disk-utils/mkswap.c:249 disk-utils/partx.c:1021
-#: disk-utils/resizepart.c:104 disk-utils/sfdisk.c:378 disk-utils/sfdisk.c:498
-#: disk-utils/sfdisk.c:801 disk-utils/sfdisk.c:1082 disk-utils/swaplabel.c:65
-#: libfdisk/src/bsd.c:642 login-utils/islocal.c:86 login-utils/last.c:679
+#: disk-utils/mkfs.cramfs.c:799 disk-utils/mkfs.minix.c:838
+#: disk-utils/mkswap.c:316 disk-utils/mkswap.c:345 disk-utils/partx.c:1021
+#: disk-utils/resizepart.c:104 disk-utils/sfdisk.c:380 disk-utils/sfdisk.c:501
+#: disk-utils/sfdisk.c:812 disk-utils/sfdisk.c:1093 disk-utils/swaplabel.c:65
+#: libfdisk/src/bsd.c:642 login-utils/islocal.c:86 login-utils/last.c:694
#: login-utils/sulogin.c:444 login-utils/sulogin.c:481
#: login-utils/utmpdump.c:134 login-utils/utmpdump.c:354
-#: login-utils/utmpdump.c:374 login-utils/vipw.c:261 login-utils/vipw.c:279
-#: misc-utils/findmnt.c:1115 misc-utils/logger.c:1241 misc-utils/mcookie.c:119
-#: misc-utils/uuidd.c:198 sys-utils/blkdiscard.c:225 sys-utils/blkzone.c:139
-#: sys-utils/dmesg.c:530 sys-utils/eject.c:499 sys-utils/eject.c:698
-#: sys-utils/fallocate.c:402 sys-utils/fsfreeze.c:116 sys-utils/fstrim.c:103
-#: sys-utils/hwclock.c:235 sys-utils/hwclock.c:894 sys-utils/hwclock-rtc.c:138
-#: sys-utils/hwclock-rtc.c:403 sys-utils/hwclock-rtc.c:438
-#: sys-utils/irq-common.c:214 sys-utils/ldattach.c:391 sys-utils/lscpu.c:536
-#: sys-utils/lsmem.c:658 sys-utils/nsenter.c:131 sys-utils/rfkill.c:192
-#: sys-utils/rfkill.c:553 sys-utils/rtcwake.c:137 sys-utils/rtcwake.c:292
-#: sys-utils/setpriv.c:259 sys-utils/setpriv.c:628 sys-utils/setpriv.c:651
-#: sys-utils/swapon.c:374 sys-utils/swapon.c:517 sys-utils/switch_root.c:167
-#: sys-utils/unshare.c:112 sys-utils/unshare.c:127 sys-utils/wdctl.c:361
-#: sys-utils/zramctl.c:517 term-utils/agetty.c:2961 term-utils/mesg.c:143
-#: term-utils/script.c:382 term-utils/scriptlive.c:256
+#: login-utils/utmpdump.c:378 login-utils/vipw.c:250 login-utils/vipw.c:268
+#: misc-utils/findmnt.c:1131 misc-utils/hardlink.c:584 misc-utils/logger.c:1241
+#: misc-utils/mcookie.c:119 misc-utils/uuidd.c:231 sys-utils/blkdiscard.c:230
+#: sys-utils/blkzone.c:144 sys-utils/dmesg.c:536 sys-utils/eject.c:499
+#: sys-utils/eject.c:698 sys-utils/fallocate.c:405 sys-utils/fsfreeze.c:116
+#: sys-utils/fstrim.c:103 sys-utils/hwclock.c:239 sys-utils/hwclock.c:906
+#: sys-utils/hwclock-rtc.c:138 sys-utils/hwclock-rtc.c:403
+#: sys-utils/hwclock-rtc.c:438 sys-utils/irq-common.c:253
+#: sys-utils/ldattach.c:391 sys-utils/lscpu-cputype.c:456 sys-utils/lsmem.c:658
+#: sys-utils/nsenter.c:131 sys-utils/rfkill.c:195 sys-utils/rtcwake.c:137
+#: sys-utils/rtcwake.c:292 sys-utils/setpriv.c:256 sys-utils/setpriv.c:622
+#: sys-utils/setpriv.c:645 sys-utils/swapon.c:387 sys-utils/swapon.c:530
+#: sys-utils/switch_root.c:174 sys-utils/unshare.c:112 sys-utils/unshare.c:127
+#: sys-utils/wdctl.c:361 sys-utils/zramctl.c:517 term-utils/agetty.c:2965
+#: term-utils/mesg.c:154 term-utils/script.c:383 term-utils/scriptlive.c:256
#: term-utils/scriptlive.c:259 term-utils/scriptlive.c:262
-#: term-utils/scriptreplay.c:260 term-utils/scriptreplay.c:263
-#: term-utils/scriptreplay.c:266 term-utils/scriptreplay.c:269
-#: term-utils/wall.c:421 text-utils/colcrt.c:284 text-utils/more.c:460
-#: text-utils/rev.c:140 text-utils/ul.c:230
+#: term-utils/scriptreplay.c:281 term-utils/scriptreplay.c:284
+#: term-utils/scriptreplay.c:287 term-utils/scriptreplay.c:290
+#: term-utils/wall.c:421 text-utils/colcrt.c:284 text-utils/more.c:453
+#: text-utils/rev.c:140 text-utils/ul.c:637
#, c-format
msgid "cannot open %s"
msgstr "打不开 %s"
#: disk-utils/blockdev.c:286 disk-utils/fdformat.c:219
#: disk-utils/fsck.minix.c:1336 disk-utils/isosize.c:155
-#: disk-utils/mkfs.bfs.c:175 disk-utils/mkfs.c:110 disk-utils/mkfs.minix.c:812
-#: disk-utils/swaplabel.c:180 misc-utils/wipefs.c:778
-#: sys-utils/blkdiscard.c:214 sys-utils/blkzone.c:459 sys-utils/tunelp.c:241
+#: disk-utils/mkfs.bfs.c:175 disk-utils/mkfs.c:110 disk-utils/mkfs.minix.c:827
+#: disk-utils/swaplabel.c:180 misc-utils/wipefs.c:779
+#: sys-utils/blkdiscard.c:219 sys-utils/blkzone.c:487 sys-utils/tunelp.c:241
#: sys-utils/zramctl.c:713 sys-utils/zramctl.c:739
msgid "no device specified"
msgstr "未指定设备"
msgstr "退出程序而不写入更改"
#: disk-utils/cfdisk.c:196 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1031
-#: libfdisk/src/dos.c:2606 libfdisk/src/gpt.c:3145 libfdisk/src/sgi.c:1164
+#: libfdisk/src/dos.c:2616 libfdisk/src/gpt.c:3194 libfdisk/src/sgi.c:1164
#: libfdisk/src/sun.c:1136
msgid "Type"
msgstr "类型"
msgid "internal error: unsupported dialog type %d"
msgstr "内部错误：不支持的对话类型 %d"
-#: disk-utils/cfdisk.c:1287
+#: disk-utils/cfdisk.c:1301
#, c-format
msgid "%s (mounted)"
msgstr "%s (已挂载)"
-#: disk-utils/cfdisk.c:1307
+#: disk-utils/cfdisk.c:1321
msgid "Partition name:"
msgstr "分区名："
-#: disk-utils/cfdisk.c:1314
+#: disk-utils/cfdisk.c:1328
msgid "Partition UUID:"
msgstr "分区 UUID："
-#: disk-utils/cfdisk.c:1326
+#: disk-utils/cfdisk.c:1340
msgid "Partition type:"
msgstr "分区类型："
-#: disk-utils/cfdisk.c:1333
+#: disk-utils/cfdisk.c:1347
msgid "Attributes:"
msgstr "属性："
-#: disk-utils/cfdisk.c:1357
+#: disk-utils/cfdisk.c:1371
msgid "Filesystem UUID:"
msgstr "文件系统 UUID："
-#: disk-utils/cfdisk.c:1364
+#: disk-utils/cfdisk.c:1378
msgid "Filesystem LABEL:"
msgstr "文件系统标签："
-#: disk-utils/cfdisk.c:1370
+#: disk-utils/cfdisk.c:1384
msgid "Filesystem:"
msgstr "文件系统："
-#: disk-utils/cfdisk.c:1375
+#: disk-utils/cfdisk.c:1389
msgid "Mountpoint:"
msgstr "挂载点："
-#: disk-utils/cfdisk.c:1719
+#: disk-utils/cfdisk.c:1733
#, c-format
msgid "Disk: %s"
msgstr "磁盘：%s"
-#: disk-utils/cfdisk.c:1721
+#: disk-utils/cfdisk.c:1735
#, c-format
msgid "Size: %s, %<PRIu64> bytes, %ju sectors"
msgstr "尺寸：%s，%<PRIu64> 字节，%ju 个扇区"
-#: disk-utils/cfdisk.c:1724
+#: disk-utils/cfdisk.c:1738
#, c-format
msgid "Label: %s, identifier: %s"
msgstr "标签：%s，标识符：%s"
-#: disk-utils/cfdisk.c:1727
+#: disk-utils/cfdisk.c:1741
#, c-format
msgid "Label: %s"
msgstr "标签：%s"
-#: disk-utils/cfdisk.c:1878
+#: disk-utils/cfdisk.c:1892
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:1884
+#: disk-utils/cfdisk.c:1898
msgid "Please, specify size."
msgstr "请指定文件大小。"
-#: disk-utils/cfdisk.c:1906
+#: disk-utils/cfdisk.c:1920
#, c-format
msgid "Minimum size is %<PRIu64> bytes."
msgstr "最小尺寸为 %<PRIu64> 字节。"
-#: disk-utils/cfdisk.c:1915
+#: disk-utils/cfdisk.c:1929
#, c-format
msgid "Maximum size is %<PRIu64> bytes."
msgstr "最大尺寸为 %<PRIu64> 字节。"
-#: disk-utils/cfdisk.c:1922
+#: disk-utils/cfdisk.c:1936
msgid "Failed to parse size."
msgstr "解析大小失败。"
-#: disk-utils/cfdisk.c:1980
+#: disk-utils/cfdisk.c:1994
msgid "Select partition type"
msgstr "选择分区类型"
-#: disk-utils/cfdisk.c:2030 disk-utils/cfdisk.c:2060
+#: disk-utils/cfdisk.c:2044 disk-utils/cfdisk.c:2074
msgid "Enter script file name: "
msgstr "输入脚本文件名："
-#: disk-utils/cfdisk.c:2031
+#: disk-utils/cfdisk.c:2045
msgid "The script file will be applied to in-memory partition table."
msgstr "该脚本文件将应用于内存中的分区表。"
-#: disk-utils/cfdisk.c:2040 disk-utils/cfdisk.c:2082
+#: disk-utils/cfdisk.c:2054 disk-utils/cfdisk.c:2096
#: disk-utils/fdisk-menu.c:481 disk-utils/fdisk-menu.c:525
#, c-format
msgid "Cannot open %s"
msgstr "打不开 %s"
-#: disk-utils/cfdisk.c:2042 disk-utils/fdisk-menu.c:483
+#: disk-utils/cfdisk.c:2056 disk-utils/fdisk-menu.c:483
#, c-format
msgid "Failed to parse script file %s"
msgstr "解析脚本文件 %s 失败"
-#: disk-utils/cfdisk.c:2044 disk-utils/fdisk-menu.c:485
+#: disk-utils/cfdisk.c:2058 disk-utils/fdisk-menu.c:485
#, c-format
msgid "Failed to apply script %s"
msgstr "应用脚本文件 %s 失败"
-#: disk-utils/cfdisk.c:2061
+#: disk-utils/cfdisk.c:2075
msgid "The current in-memory partition table will be dumped to the file."
msgstr "当前的内存中分区表将转储到该文件中。"
-#: disk-utils/cfdisk.c:2069 disk-utils/fdisk-menu.c:513
+#: disk-utils/cfdisk.c:2083 disk-utils/fdisk-menu.c:513
msgid "Failed to allocate script handler"
msgstr "分配脚本处理程序失败"
-#: disk-utils/cfdisk.c:2075
+#: disk-utils/cfdisk.c:2089
msgid "Failed to read disk layout into script."
msgstr "将磁盘布局读入脚本出错。"
-#: disk-utils/cfdisk.c:2089
+#: disk-utils/cfdisk.c:2103
msgid "Disk layout successfully dumped."
msgstr "成功转储了磁盘布局。"
-#: disk-utils/cfdisk.c:2092 disk-utils/fdisk-menu.c:531
+#: disk-utils/cfdisk.c:2106 disk-utils/fdisk-menu.c:531
#, c-format
msgid "Failed to write script %s"
msgstr "写脚本文件 %s 失败"
-#: disk-utils/cfdisk.c:2128
+#: disk-utils/cfdisk.c:2142
msgid "Select label type"
msgstr "选择标签类型"
-#: disk-utils/cfdisk.c:2131 disk-utils/fdisk.c:1158 disk-utils/fdisk-menu.c:489
+#: disk-utils/cfdisk.c:2145 disk-utils/fdisk.c:1162 disk-utils/fdisk-menu.c:489
msgid "Device does not contain a recognized partition table."
msgstr "设备不包含可识别的分区表。"
-#: disk-utils/cfdisk.c:2139
-msgid "Select a type to create a new label or press 'L' to load script file."
+#: disk-utils/cfdisk.c:2153
+#, fuzzy
+msgid "Select a type to create a new label, press 'L' to load script file, 'Q' quits."
msgstr "选择一种类型来创建新标签，或按“L”加载脚本文件。"
# 以下三句连贯，一起翻译
-#: disk-utils/cfdisk.c:2188
+#: disk-utils/cfdisk.c:2202
msgid "This is cfdisk, a curses-based disk partitioning program."
msgstr "这是 cfdisk，一款基于 curses 的磁盘分区程序，"
-#: disk-utils/cfdisk.c:2189
+#: disk-utils/cfdisk.c:2203
msgid "It lets you create, delete, and modify partitions on a block device."
msgstr "可以创建、删除和修改块设备上的分区。"
# 以下两条注意对齐
-#: disk-utils/cfdisk.c:2191
+#: disk-utils/cfdisk.c:2205
msgid "Command Meaning"
msgstr "命令 意义"
-#: disk-utils/cfdisk.c:2192
+#: disk-utils/cfdisk.c:2206
msgid "------- -------"
msgstr "------- -------"
-#: disk-utils/cfdisk.c:2193
+#: disk-utils/cfdisk.c:2207
msgid " b Toggle bootable flag of the current partition"
msgstr " b 切换当前分区的 可启动 标志"
-#: disk-utils/cfdisk.c:2194
+#: disk-utils/cfdisk.c:2208
msgid " d Delete the current partition"
msgstr " d 删除当前分区"
-#: disk-utils/cfdisk.c:2195
+#: disk-utils/cfdisk.c:2209
msgid " h Print this screen"
msgstr " h 打印此屏幕"
-#: disk-utils/cfdisk.c:2196
+#: disk-utils/cfdisk.c:2210
msgid " n Create new partition from free space"
msgstr " n 从空闲空间创建新分区"
-#: disk-utils/cfdisk.c:2197
+#: disk-utils/cfdisk.c:2211
msgid " q Quit program without writing partition table"
msgstr " q 退出程序但不写入分区表"
-#: disk-utils/cfdisk.c:2198
+#: disk-utils/cfdisk.c:2212
+#, fuzzy
+msgid " r Reduce or enlarge the current partition"
+msgstr "减小或扩大当前分区"
+
+#: disk-utils/cfdisk.c:2213
msgid " s Fix partitions order (only when in disarray)"
msgstr " s 修复分区顺序(仅磁盘阵列)"
-#: disk-utils/cfdisk.c:2199
+#: disk-utils/cfdisk.c:2214
msgid " t Change the partition type"
msgstr " t 更改分区类型"
-#: disk-utils/cfdisk.c:2200
+#: disk-utils/cfdisk.c:2215
msgid " u Dump disk layout to sfdisk compatible script file"
msgstr " u 将磁盘布局转储到兼容 sfdisk 的脚本文件"
-#: disk-utils/cfdisk.c:2201
+#: disk-utils/cfdisk.c:2216
msgid " W Write partition table to disk (you must enter uppercase W);"
msgstr " W 将分区表写入磁盘(必须输入大写 W)；"
-#: disk-utils/cfdisk.c:2202
+#: disk-utils/cfdisk.c:2217
msgid " since this might destroy data on the disk, you must either"
msgstr " 由于这可能破坏磁盘上的数据，您必须"
-#: disk-utils/cfdisk.c:2203
+#: disk-utils/cfdisk.c:2218
msgid " confirm or deny the write by entering 'yes' or 'no'"
msgstr " 通过输入“yes”或“no”来确认或拒绝"
-#: disk-utils/cfdisk.c:2204
+#: disk-utils/cfdisk.c:2219
msgid " x Display/hide extra information about a partition"
msgstr " x 显示/隐藏分区的额外信息"
-#: disk-utils/cfdisk.c:2205
+#: disk-utils/cfdisk.c:2220
msgid "Up Arrow Move cursor to the previous partition"
msgstr "上箭头 光标移到上一分区"
-#: disk-utils/cfdisk.c:2206
+#: disk-utils/cfdisk.c:2221
msgid "Down Arrow Move cursor to the next partition"
msgstr "下箭头 光标移到下一分区"
-#: disk-utils/cfdisk.c:2207
+#: disk-utils/cfdisk.c:2222
msgid "Left Arrow Move cursor to the previous menu item"
msgstr "上箭头 光标移到上一菜单项"
-#: disk-utils/cfdisk.c:2208
+#: disk-utils/cfdisk.c:2223
msgid "Right Arrow Move cursor to the next menu item"
msgstr "下箭头 光标移到下一菜单项"
-#: disk-utils/cfdisk.c:2210
+#: disk-utils/cfdisk.c:2225
msgid "Note: All of the commands can be entered with either upper or lower"
msgstr "注：所有命令均可以大写或小写"
-#: disk-utils/cfdisk.c:2211
+#: disk-utils/cfdisk.c:2226
msgid "case letters (except for Write)."
msgstr "字母输入(除了 写入)。"
-#: disk-utils/cfdisk.c:2213
+#: disk-utils/cfdisk.c:2228
msgid "Use lsblk(8) or partx(8) to see more details about the device."
msgstr "使用 lsblk(8) 或 partx(8) 了解有关磁盘的更多细节。"
-#: disk-utils/cfdisk.c:2223 disk-utils/cfdisk.c:2526
+#: disk-utils/cfdisk.c:2238 disk-utils/cfdisk.c:2541
msgid "Press a key to continue."
msgstr "按下一个键继续。"
-#: disk-utils/cfdisk.c:2309
+#: disk-utils/cfdisk.c:2324
msgid "Could not toggle the flag."
msgstr "无法切换标志。"
-#: disk-utils/cfdisk.c:2319
+#: disk-utils/cfdisk.c:2334
#, c-format
msgid "Could not delete partition %zu."
msgstr "无法删除分区 %zu。"
-#: disk-utils/cfdisk.c:2321 disk-utils/fdisk-menu.c:662
+#: disk-utils/cfdisk.c:2336 disk-utils/fdisk-menu.c:662
#, c-format
msgid "Partition %zu has been deleted."
msgstr "分区 %zu 已删除。"
-#: disk-utils/cfdisk.c:2342
+#: disk-utils/cfdisk.c:2357
msgid "Partition size: "
msgstr "分区大小："
-#: disk-utils/cfdisk.c:2383
+#: disk-utils/cfdisk.c:2398
#, c-format
msgid "Changed type of partition %zu."
msgstr "已更改分区 %zu 的类型。"
-#: disk-utils/cfdisk.c:2385
+#: disk-utils/cfdisk.c:2400
#, c-format
msgid "The type of partition %zu is unchanged."
msgstr "分区 %zu 的类型未更改。"
-#: disk-utils/cfdisk.c:2406
+#: disk-utils/cfdisk.c:2421
msgid "New size: "
msgstr "新大小："
-#: disk-utils/cfdisk.c:2421
+#: disk-utils/cfdisk.c:2436
#, c-format
msgid "Partition %zu resized."
msgstr "已调整分区 %zu 的大小。"
-#: disk-utils/cfdisk.c:2439 disk-utils/cfdisk.c:2555 disk-utils/fdisk.c:1140
-#: disk-utils/fdisk-menu.c:592
+#: disk-utils/cfdisk.c:2454 disk-utils/fdisk.c:1138 disk-utils/fdisk-menu.c:592
msgid "Device is open in read-only mode."
msgstr "设备以只读方式打开。"
-#: disk-utils/cfdisk.c:2444
+#: disk-utils/cfdisk.c:2459
msgid "Are you sure you want to write the partition table to disk? "
msgstr "您确定想将分区表写入磁盘吗？"
-#: disk-utils/cfdisk.c:2446
+#: disk-utils/cfdisk.c:2461
msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog."
msgstr "输入“yes”或“no”或按 ESC 取消对话框。"
-#: disk-utils/cfdisk.c:2451 login-utils/lslogins.c:218 sys-utils/lscpu.c:1602
-#: sys-utils/lscpu.c:1612 sys-utils/lsmem.c:266
+#: disk-utils/cfdisk.c:2466 login-utils/lslogins.c:218 sys-utils/lscpu.c:412
+#: sys-utils/lscpu.c:422 sys-utils/lsmem.c:266
msgid "yes"
msgstr "是"
-#: disk-utils/cfdisk.c:2452
+#: disk-utils/cfdisk.c:2467
msgid "Did not write partition table to disk."
msgstr "未将分区表写入磁盘。"
-#: disk-utils/cfdisk.c:2457
+#: disk-utils/cfdisk.c:2472
msgid "Failed to write disklabel."
msgstr "写磁盘标签失败。"
-#: disk-utils/cfdisk.c:2463 disk-utils/fdisk-menu.c:599
+#: disk-utils/cfdisk.c:2478 disk-utils/fdisk-menu.c:599
msgid "The partition table has been altered."
msgstr "分区表已调整。"
-#: disk-utils/cfdisk.c:2486 disk-utils/cfdisk.c:2557
+#: disk-utils/cfdisk.c:2501 disk-utils/cfdisk.c:2576
msgid "Note that partition table entries are not in disk order now."
msgstr "注意，现在分区表记录没有按磁盘顺序。"
-#: disk-utils/cfdisk.c:2523
+#: disk-utils/cfdisk.c:2538
#, c-format
msgid "Device already contains a %s signature; it will be removed by a write command."
msgstr "设备已包含一个 %s 签名；写入命令会将其移除。"
-#: disk-utils/cfdisk.c:2534
+#: disk-utils/cfdisk.c:2550
msgid "failed to create a new disklabel"
msgstr "创建新磁盘标签失败"
-#: disk-utils/cfdisk.c:2542
+#: disk-utils/cfdisk.c:2559
msgid "failed to read partitions"
msgstr "读分区失败"
-#: disk-utils/cfdisk.c:2641
+#: disk-utils/cfdisk.c:2572
+#, fuzzy
+msgid "Device is open in read-only mode. Changes will remain in memory only."
+msgstr "设备以只读方式打开。"
+
+#: disk-utils/cfdisk.c:2574
+msgid "Device is currently in use, repartitioning is probably a bad idea."
+msgstr ""
+
+#: disk-utils/cfdisk.c:2660
#, c-format
msgid " %1$s [options] <disk>\n"
msgstr " %1$s [选项] <磁盘>\n"
-#: disk-utils/cfdisk.c:2644 disk-utils/fdisk.c:857 disk-utils/sfdisk.c:2005
+#: disk-utils/cfdisk.c:2663 disk-utils/fdisk.c:855 disk-utils/sfdisk.c:2018
msgid "Display or manipulate a disk partition table.\n"
msgstr "显示或操作磁盘分区表。\n"
-#: disk-utils/cfdisk.c:2648
+#: disk-utils/cfdisk.c:2667
#, c-format
msgid " -L, --color[=<when>] colorize output (%s, %s or %s)\n"
msgstr " -L, --color[=<时机>] 彩色输出（%s, %s 或 %s）\n"
-#: disk-utils/cfdisk.c:2651
+#: disk-utils/cfdisk.c:2670
msgid " -z, --zero start with zeroed partition table\n"
msgstr " -z, --zero 以空分区表开始\n"
-#: disk-utils/cfdisk.c:2653
+#: disk-utils/cfdisk.c:2672
#, c-format
msgid " --lock[=<mode>] use exclusive device lock (%s, %s or %s)\n"
msgstr " --lock[=<模式>] 使用独占设备锁（%s、%s 或 %s）\n"
-#: disk-utils/cfdisk.c:2694 disk-utils/fdisk.c:1016 disk-utils/sfdisk.c:2305
-#: misc-utils/cal.c:436 sys-utils/dmesg.c:1437 text-utils/hexdump.c:114
+#: disk-utils/cfdisk.c:2673
+#, fuzzy
+msgid " -r, --read-only forced open cfdisk in read-only mode\n"
+msgstr " -r, --read-only 创建只读的回环设备\n"
+
+#: disk-utils/cfdisk.c:2716 disk-utils/fdisk.c:1014 disk-utils/sfdisk.c:2319
+#: misc-utils/cal.c:426 sys-utils/dmesg.c:1453 text-utils/hexdump.c:121
msgid "unsupported color mode"
msgstr "不支持的颜色模式"
-#: disk-utils/cfdisk.c:2721 disk-utils/fdisk.c:951 disk-utils/sfdisk.c:231
+#: disk-utils/cfdisk.c:2746 disk-utils/fdisk.c:949 disk-utils/sfdisk.c:231
msgid "failed to allocate libfdisk context"
msgstr "分配 libfdisk 环境(context)失败"
"将继续 ... "
#: disk-utils/fdformat.c:146 disk-utils/fsck.minix.c:183
-#: disk-utils/swaplabel.c:123 misc-utils/wipefs.c:648 sys-utils/blkdiscard.c:86
+#: disk-utils/swaplabel.c:123 misc-utils/wipefs.c:648 sys-utils/blkdiscard.c:89
#: sys-utils/tunelp.c:95
#, c-format
msgid " %s [options] <device>\n"
msgid "invalid argument - repair"
msgstr "无效参数 - repair"
-#: disk-utils/fdformat.c:223 disk-utils/fsck.cramfs.c:151
+#: disk-utils/fdformat.c:223 disk-utils/fsck.cramfs.c:157
#: disk-utils/mkfs.bfs.c:182 disk-utils/mkfs.cramfs.c:337
#: disk-utils/mkfs.cramfs.c:758 disk-utils/mkfs.cramfs.c:796
-#: disk-utils/mkfs.minix.c:820 disk-utils/mkswap.c:246 disk-utils/partx.c:959
-#: login-utils/last.c:693 login-utils/utmpdump.c:137 misc-utils/namei.c:135
-#: misc-utils/rename.c:120 misc-utils/rename.c:182 sys-utils/blkdiscard.c:228
-#: sys-utils/blkzone.c:142 sys-utils/dmesg.c:532 sys-utils/fallocate.c:201
+#: disk-utils/mkfs.minix.c:835 disk-utils/mkswap.c:342 disk-utils/partx.c:959
+#: login-utils/last.c:708 login-utils/utmpdump.c:137 misc-utils/namei.c:135
+#: misc-utils/rename.c:120 misc-utils/rename.c:182 sys-utils/blkdiscard.c:233
+#: sys-utils/blkzone.c:147 sys-utils/dmesg.c:538 sys-utils/fallocate.c:201
#: sys-utils/fsfreeze.c:119 sys-utils/fstrim.c:75 sys-utils/nsenter.c:166
-#: sys-utils/nsenter.c:170 sys-utils/swapon.c:522 sys-utils/switch_root.c:94
-#: sys-utils/switch_root.c:137 term-utils/mesg.c:145
+#: sys-utils/nsenter.c:170 sys-utils/swapon.c:535 sys-utils/switch_root.c:93
+#: sys-utils/switch_root.c:134 sys-utils/switch_root.c:139
+#: term-utils/mesg.c:144 term-utils/mesg.c:156
#, c-format
msgid "stat of %s failed"
msgstr "对 %s stat 失败"
-#: disk-utils/fdformat.c:226 disk-utils/partx.c:1018 misc-utils/lsblk.c:1447
-#: sys-utils/blkdiscard.c:230 sys-utils/blkzone.c:144
-#: sys-utils/mountpoint.c:107
+#: disk-utils/fdformat.c:226 disk-utils/partx.c:1018 misc-utils/lsblk.c:1525
+#: sys-utils/blkdiscard.c:235 sys-utils/blkzone.c:149
+#: sys-utils/mountpoint.c:109
#, c-format
msgid "%s: not a block device"
msgstr "%s：不是一个块设备"
msgstr "将使用默认回应 %c。"
#: disk-utils/fdisk.c:224 disk-utils/fdisk.c:298 disk-utils/fdisk.c:375
-#: libfdisk/src/dos.c:1382 libfdisk/src/gpt.c:2472
+#: libfdisk/src/dos.c:1382 libfdisk/src/gpt.c:2518
msgid "Value out of range."
msgstr "值超出范围。"
msgid "Partition type (type L to list all types): "
msgstr "分区类型(输入 L 列出所有类型)："
-#: disk-utils/fdisk.c:510
+#: disk-utils/fdisk.c:511
#, c-format
msgid "Failed to parse '%s' partition type."
msgstr "解析“%s”分区类型失败。"
-#: disk-utils/fdisk.c:601
+#: disk-utils/fdisk.c:602
msgid ""
"\n"
"Aliases:\n"
"\n"
"别名：\n"
-#: disk-utils/fdisk.c:627
+#: disk-utils/fdisk.c:628
msgid "DOS Compatibility flag is set (DEPRECATED!)"
msgstr "已设置 DOS 兼容性标志(已废弃！)"
-#: disk-utils/fdisk.c:628
+#: disk-utils/fdisk.c:629
msgid "DOS Compatibility flag is not set"
msgstr "DOS 兼容性标志未设置"
-#: disk-utils/fdisk.c:650 disk-utils/fdisk.c:688
+#: disk-utils/fdisk.c:651 disk-utils/fdisk.c:689
#, c-format
msgid "Partition %zu does not exist yet!"
msgstr "分区 %zu 还不存在！"
-#: disk-utils/fdisk.c:655 disk-utils/fdisk.c:666 libfdisk/src/ask.c:1028
+#: disk-utils/fdisk.c:656 disk-utils/fdisk.c:667 libfdisk/src/ask.c:1028
msgid "Unknown"
msgstr "未知"
-#: disk-utils/fdisk.c:665
+#: disk-utils/fdisk.c:666
#, c-format
msgid "Changed type of partition '%s' to '%s'."
msgstr "已将分区“%s”的类型更改为“%s”。"
-#: disk-utils/fdisk.c:669
+#: disk-utils/fdisk.c:670
#, c-format
msgid "Type of partition %zu is unchanged: %s."
msgstr "分区 %zu 的类型未更改：%s。"
-#: disk-utils/fdisk.c:765
+#: disk-utils/fdisk.c:766
#, c-format
msgid ""
"\n"
"\n"
"%s: 偏移 = %<PRIu64>, 大小 = %zu 字节。"
-#: disk-utils/fdisk.c:771
+#: disk-utils/fdisk.c:772
msgid "cannot seek"
msgstr "无法定位"
-#: disk-utils/fdisk.c:776
+#: disk-utils/fdisk.c:777
msgid "cannot read"
msgstr "不能读"
-#: disk-utils/fdisk.c:789 libfdisk/src/bsd.c:258 libfdisk/src/dos.c:968
-#: libfdisk/src/gpt.c:2400
+#: disk-utils/fdisk.c:788 libfdisk/src/bsd.c:258 libfdisk/src/dos.c:968
+#: libfdisk/src/gpt.c:2446
msgid "First sector"
msgstr "第一个扇区"
-#: disk-utils/fdisk.c:816
+#: disk-utils/fdisk.c:814
#, c-format
msgid "BLKGETSIZE ioctl failed on %s"
msgstr "对 %s 进行 BLKGETSIZE ioctl 失败"
-#: disk-utils/fdisk.c:834
+#: disk-utils/fdisk.c:832
#, 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:837
#, fuzzy, c-format
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:850
#, fuzzy, c-format
msgid ""
" %1$s [options] <disk> change partition table\n"
" %1$s [选项] <磁盘> 更改分区表\n"
" %1$s [选项] -l [<磁盘>] 列出分区表\n"
-#: disk-utils/fdisk.c:860
+#: disk-utils/fdisk.c:858
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:859
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:860
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:862
#, 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:865
msgid " -l, --list display partitions and exit\n"
msgstr " -l, --list 显示分区并退出\n"
-#: disk-utils/fdisk.c:868
+#: disk-utils/fdisk.c:866
#, fuzzy
msgid " -x, --list-details like --list but with more details\n"
msgstr " -l, --list [<设备> ...] 列出每台设备上的分区\n"
-#: disk-utils/fdisk.c:870
+#: disk-utils/fdisk.c:868
#, fuzzy
msgid " -n, --noauto-pt don't create default partition table on empty devices\n"
msgstr " -P, --partscan 创建带分区的回环设备\n"
-#: disk-utils/fdisk.c:871
+#: disk-utils/fdisk.c:869
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: disk-utils/fdisk.c:872
+#: disk-utils/fdisk.c:870
msgid " -t, --type <type> recognize specified partition table type only\n"
msgstr " -t, --type <类型> 只识别指定的分区表类型\n"
-#: disk-utils/fdisk.c:873
+#: disk-utils/fdisk.c:871
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:872
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:873
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:875
#, 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:877
#, 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:2059
+#: disk-utils/fdisk.c:879 disk-utils/sfdisk.c:2072
#, 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:882
msgid " -C, --cylinders <number> specify the number of cylinders\n"
msgstr " -C, --cylinders <数字> 指定柱面数\n"
-#: disk-utils/fdisk.c:885
+#: disk-utils/fdisk.c:883
msgid " -H, --heads <number> specify the number of heads\n"
msgstr " -H, --heads <数字> 指定磁头数\n"
-#: disk-utils/fdisk.c:886
+#: disk-utils/fdisk.c:884
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:882
+#: disk-utils/fdisk.c:959 disk-utils/fdisk.c:961 disk-utils/partx.c:882
msgid "invalid sector size argument"
msgstr "无效的 扇区大小 参数"
-#: disk-utils/fdisk.c:973
+#: disk-utils/fdisk.c:971
msgid "invalid cylinders argument"
msgstr "无效的 柱面数 参数"
-#: disk-utils/fdisk.c:985
+#: disk-utils/fdisk.c:983
msgid "not found DOS label driver"
msgstr "未找到 DOS 标签驱动"
-#: disk-utils/fdisk.c:991
+#: disk-utils/fdisk.c:989
#, c-format
msgid "unknown compatibility mode '%s'"
msgstr "未知兼容模式“%s”"
-#: disk-utils/fdisk.c:998
+#: disk-utils/fdisk.c:996
msgid "invalid heads argument"
msgstr "无效的 磁头数 参数"
-#: disk-utils/fdisk.c:1004
+#: disk-utils/fdisk.c:1002
msgid "invalid sectors argument"
msgstr "无效的 扇区数 参数"
-#: disk-utils/fdisk.c:1036
+#: disk-utils/fdisk.c:1034
#, c-format
msgid "unsupported disklabel: %s"
msgstr "不支持的磁盘标签：%s"
-#: disk-utils/fdisk.c:1044
+#: disk-utils/fdisk.c:1042
msgid "unsupported unit"
msgstr "不支持的单位"
-#: disk-utils/fdisk.c:1052 disk-utils/fdisk.c:1057 disk-utils/sfdisk.c:2266
-#: disk-utils/sfdisk.c:2271
+#: disk-utils/fdisk.c:1050 disk-utils/fdisk.c:1055 disk-utils/sfdisk.c:2280
+#: disk-utils/sfdisk.c:2285
msgid "unsupported wipe mode"
msgstr "不支持的擦除模式"
-#: disk-utils/fdisk.c:1078
+#: disk-utils/fdisk.c:1076
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:696
+#: disk-utils/fdisk.c:1107 disk-utils/fdisk.c:1122 disk-utils/fsck.cramfs.c:702
#: disk-utils/mkfs.bfs.c:192 disk-utils/mkfs.cramfs.c:786
#: disk-utils/partx.c:975 disk-utils/raw.c:136 disk-utils/raw.c:149
-#: disk-utils/raw.c:161 disk-utils/raw.c:202 misc-utils/cal.c:534
-#: misc-utils/findfs.c:58 misc-utils/look.c:149 misc-utils/whereis.c:577
-#: misc-utils/whereis.c:588 misc-utils/whereis.c:599 misc-utils/whereis.c:641
-#: schedutils/chrt.c:513 schedutils/ionice.c:262 schedutils/taskset.c:188
-#: sys-utils/chcpu.c:355 sys-utils/chmem.c:422 sys-utils/dmesg.c:1505
-#: sys-utils/ipcmk.c:138 sys-utils/ldattach.c:320 sys-utils/losetup.c:913
-#: sys-utils/lscpu.c:2426 sys-utils/lsmem.c:643 sys-utils/mount.c:824
-#: sys-utils/mount.c:832 sys-utils/mount.c:879 sys-utils/mount.c:892
-#: sys-utils/mount.c:964 sys-utils/mountpoint.c:189 sys-utils/pivot_root.c:71
-#: sys-utils/swapoff.c:258 sys-utils/swapon.c:992 sys-utils/switch_root.c:249
-#: sys-utils/umount.c:598 term-utils/setterm.c:1197 text-utils/col.c:233
-#: text-utils/more.c:2058
+#: disk-utils/raw.c:161 disk-utils/raw.c:202 misc-utils/cal.c:524
+#: misc-utils/findfs.c:58 misc-utils/look.c:149 misc-utils/whereis.c:580
+#: misc-utils/whereis.c:591 misc-utils/whereis.c:602 misc-utils/whereis.c:644
+#: schedutils/chrt.c:443 schedutils/ionice.c:262 schedutils/taskset.c:188
+#: sys-utils/chcpu.c:355 sys-utils/chmem.c:422 sys-utils/dmesg.c:1536
+#: sys-utils/ipcmk.c:138 sys-utils/ldattach.c:320 sys-utils/losetup.c:917
+#: sys-utils/lscpu.c:1294 sys-utils/lsmem.c:643 sys-utils/mount.c:833
+#: sys-utils/mount.c:841 sys-utils/mount.c:888 sys-utils/mount.c:901
+#: sys-utils/mount.c:973 sys-utils/mountpoint.c:191 sys-utils/pivot_root.c:71
+#: sys-utils/swapoff.c:258 sys-utils/swapon.c:1005 sys-utils/switch_root.c:270
+#: sys-utils/umount.c:625 term-utils/setterm.c:1197 text-utils/col.c:584
+#: text-utils/more.c:2063
msgid "bad usage"
msgstr "错误用法"
-#: disk-utils/fdisk.c:1130
+#: disk-utils/fdisk.c:1128
#, c-format
msgid "Welcome to fdisk (%s)."
msgstr "欢迎使用 fdisk (%s)。"
-#: disk-utils/fdisk.c:1132 disk-utils/sfdisk.c:1771
+#: disk-utils/fdisk.c:1130 disk-utils/sfdisk.c:1783
msgid ""
"Changes will remain in memory only, until you decide to write them.\n"
"Be careful before using the write command.\n"
"更改将停留在内存中，直到您决定将更改写入磁盘。\n"
"使用写入命令前请三思。\n"
-#: disk-utils/fdisk.c:1164
+#: disk-utils/fdisk.c:1145
+#, fuzzy
+#| msgid ""
+#| "This disk is currently in use - repartitioning is probably a bad idea.\n"
+#| "Umount all file systems, and swapoff all swap partitions on this disk.\n"
+#| "Use the --no-reread flag to suppress this check.\n"
+msgid ""
+"This disk is currently in use - repartitioning is probably a bad idea.\n"
+"It's recommended to umount all file systems, and swapoff all swap\n"
+"partitions on this disk.\n"
+msgstr ""
+"该磁盘目前正在使用 - 不建议您重新分区。\n"
+"请卸载此磁盘上所有的文件系统，并关闭(swapoff)上面的交换分区。\n"
+"可使用 --no-reread 标志阻止此检查。\n"
+
+#: disk-utils/fdisk.c:1168
msgid "A hybrid GPT was detected. You have to sync the hybrid MBR manually (expert command 'M')."
msgstr "检测到混合 GPT。您需要手动同步混合 MBR (用专家命令“M”)"
msgstr "对齐偏移量：%lu 字节"
#: disk-utils/fdisk-list.c:120 disk-utils/fdisk-list.c:241
-#: disk-utils/fsck.c:1253
+#: disk-utils/fsck.c:1257
msgid "failed to allocate iterator"
msgstr "分配迭代器失败"
#: disk-utils/fdisk-list.c:126 disk-utils/fdisk-list.c:247
-#: disk-utils/partx.c:669 login-utils/lslogins.c:1066 misc-utils/fincore.c:356
-#: misc-utils/findmnt.c:1634 misc-utils/lsblk.c:2083 misc-utils/lslocks.c:456
+#: disk-utils/partx.c:669 login-utils/lslogins.c:1067 misc-utils/fincore.c:356
+#: misc-utils/findmnt.c:1662 misc-utils/lsblk.c:2170 misc-utils/lslocks.c:456
#: misc-utils/uuidparse.c:252 misc-utils/wipefs.c:157 sys-utils/losetup.c:325
-#: sys-utils/lscpu.c:1674 sys-utils/lscpu.c:1902 sys-utils/lscpu.c:2034
-#: sys-utils/lsipc.c:351 sys-utils/prlimit.c:297 sys-utils/rfkill.c:459
-#: sys-utils/swapon.c:283 sys-utils/wdctl.c:299 sys-utils/zramctl.c:496
-#: text-utils/column.c:209
+#: sys-utils/lscpu.c:577 sys-utils/lscpu.c:727 sys-utils/lscpu.c:928
+#: sys-utils/lsipc.c:351 sys-utils/prlimit.c:300 sys-utils/rfkill.c:465
+#: sys-utils/swapon.c:296 sys-utils/wdctl.c:299 sys-utils/zramctl.c:496
+#: text-utils/column.c:210
msgid "failed to allocate output table"
msgstr "分配输出表失败"
#: disk-utils/fdisk-list.c:167 disk-utils/fdisk-list.c:271
-#: disk-utils/partx.c:583 login-utils/lslogins.c:1124 misc-utils/fincore.c:123
-#: misc-utils/findmnt.c:697 misc-utils/findmnt.c:715 misc-utils/lsblk.c:1078
+#: disk-utils/partx.c:583 login-utils/lslogins.c:1125 misc-utils/fincore.c:123
+#: misc-utils/findmnt.c:705 misc-utils/findmnt.c:723 misc-utils/lsblk.c:1116
#: misc-utils/lslocks.c:393 misc-utils/uuidparse.c:154 misc-utils/wipefs.c:224
-#: sys-utils/losetup.c:348 sys-utils/losetup.c:377 sys-utils/lscpu.c:1707
-#: sys-utils/lscpu.c:1930 sys-utils/lscpu.c:1958 sys-utils/lsipc.c:480
-#: sys-utils/lsipc.c:555 sys-utils/lsipc.c:657 sys-utils/lsipc.c:749
-#: sys-utils/lsipc.c:910 sys-utils/prlimit.c:229 sys-utils/rfkill.c:376
+#: sys-utils/losetup.c:348 sys-utils/losetup.c:377 sys-utils/lscpu.c:491
+#: sys-utils/lscpu.c:756 sys-utils/lscpu.c:788 sys-utils/lsipc.c:481
+#: sys-utils/lsipc.c:562 sys-utils/lsipc.c:664 sys-utils/lsipc.c:756
+#: sys-utils/lsipc.c:920 sys-utils/prlimit.c:229 sys-utils/rfkill.c:380
#: sys-utils/swapon.c:179 sys-utils/wdctl.c:249 sys-utils/zramctl.c:414
-#: text-utils/column.c:453 text-utils/column.c:474
+#: text-utils/column.c:474 text-utils/column.c:499
msgid "failed to allocate output line"
msgstr "分配输出行失败"
#: disk-utils/fdisk-list.c:177 disk-utils/fdisk-list.c:278
-#: disk-utils/partx.c:646 login-utils/lslogins.c:1225 misc-utils/fincore.c:159
-#: misc-utils/findmnt.c:701 misc-utils/findmnt.c:720 misc-utils/lsblk.c:1119
+#: disk-utils/partx.c:646 login-utils/lslogins.c:1229 misc-utils/fincore.c:159
+#: misc-utils/findmnt.c:709 misc-utils/findmnt.c:728 misc-utils/lsblk.c:1157
#: misc-utils/lslocks.c:443 misc-utils/uuidparse.c:239 misc-utils/wipefs.c:264
-#: sys-utils/losetup.c:305 sys-utils/lscpu.c:1773 sys-utils/lscpu.c:1938
-#: sys-utils/lscpu.c:1962 sys-utils/lscpu.c:1970 sys-utils/lsipc.c:514
-#: sys-utils/lsipc.c:639 sys-utils/prlimit.c:261 sys-utils/rfkill.c:404
+#: sys-utils/losetup.c:305 sys-utils/lscpu.c:559 sys-utils/lscpu.c:763
+#: sys-utils/lscpu.c:792 sys-utils/lscpu.c:802 sys-utils/lsipc.c:521
+#: sys-utils/lsipc.c:646 sys-utils/prlimit.c:264 sys-utils/rfkill.c:408
#: sys-utils/swapon.c:227 sys-utils/wdctl.c:277 sys-utils/zramctl.c:481
-#: text-utils/column.c:460
+#: text-utils/column.c:483
msgid "failed to add output data"
msgstr "添加输出信息失败"
msgid "Partition table entries are not in disk order."
msgstr "分区表记录没有按磁盘顺序。"
-#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1026 libfdisk/src/dos.c:2600
-#: libfdisk/src/gpt.c:3141 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1130
+#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1026 libfdisk/src/dos.c:2610
+#: libfdisk/src/gpt.c:3190 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1130
msgid "Start"
msgstr "起点"
-#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1027 libfdisk/src/dos.c:2601
-#: libfdisk/src/gpt.c:3142 libfdisk/src/sgi.c:1159 libfdisk/src/sun.c:1131
+#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1027 libfdisk/src/dos.c:2611
+#: libfdisk/src/gpt.c:3191 libfdisk/src/sgi.c:1159 libfdisk/src/sun.c:1131
msgid "End"
msgstr "末尾"
-#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1028 libfdisk/src/dos.c:2602
-#: libfdisk/src/gpt.c:3143 libfdisk/src/sgi.c:1160 libfdisk/src/sun.c:1132
+#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1028 libfdisk/src/dos.c:2612
+#: libfdisk/src/gpt.c:3192 libfdisk/src/sgi.c:1160 libfdisk/src/sun.c:1132
msgid "Sectors"
msgstr "扇区"
-#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1030 libfdisk/src/dos.c:2604
-#: libfdisk/src/gpt.c:3144 libfdisk/src/sgi.c:1162 libfdisk/src/sun.c:1134
+#: disk-utils/fdisk-list.c:233 libfdisk/src/bsd.c:1030 libfdisk/src/dos.c:2614
+#: libfdisk/src/gpt.c:3193 libfdisk/src/sgi.c:1162 libfdisk/src/sun.c:1134
msgid "Size"
msgstr "大小"
"\n"
"帮助 (专业命令)：\n"
-#: disk-utils/fdisk-menu.c:374 disk-utils/sfdisk.c:1435
+#: disk-utils/fdisk-menu.c:374 disk-utils/sfdisk.c:1447
#, c-format
msgid ""
"\n"
msgid "Script successfully saved."
msgstr "成本保存了脚本。"
-#: disk-utils/fdisk-menu.c:556 disk-utils/sfdisk.c:1661
+#: disk-utils/fdisk-menu.c:556 disk-utils/sfdisk.c:1673
#, c-format
msgid "Partition #%zu contains a %s signature."
msgstr "分区 #%zu 包含一个 %s 签名。"
-#: disk-utils/fdisk-menu.c:559 disk-utils/sfdisk.c:1664
+#: disk-utils/fdisk-menu.c:559 disk-utils/sfdisk.c:1676
msgid "Do you want to remove the signature?"
msgstr "您想移除该签名吗？"
-#: disk-utils/fdisk-menu.c:564 disk-utils/sfdisk.c:1669
+#: disk-utils/fdisk-menu.c:564 disk-utils/sfdisk.c:1681
msgid "The signature will be removed by a write command."
msgstr "写入命令将移除该签名。"
msgid "Number of sectors"
msgstr "扇区数"
+#: disk-utils/fdisk-menu.c:1105
+#, fuzzy, c-format
+msgid "Failed to create '%s' disk label"
+msgstr "创建新磁盘标签失败"
+
#: disk-utils/fsck.c:213
#, c-format
msgid "%s is mounted\n"
msgid "%s is not mounted\n"
msgstr "%s 未挂载\n"
-#: disk-utils/fsck.c:329 disk-utils/fsck.cramfs.c:174
-#: disk-utils/fsck.cramfs.c:181 disk-utils/fsck.cramfs.c:237
-#: disk-utils/fsck.cramfs.c:258 disk-utils/sfdisk.c:305 libfdisk/src/bsd.c:647
-#: login-utils/last.c:208 login-utils/last.c:245 login-utils/sulogin.c:657
-#: misc-utils/hardlink.c:290 misc-utils/hardlink.c:292
-#: sys-utils/ctrlaltdel.c:44 sys-utils/irq-common.c:220 sys-utils/rfkill.c:213
-#: sys-utils/setpriv.c:268 term-utils/setterm.c:746 term-utils/setterm.c:802
-#: term-utils/setterm.c:806 term-utils/setterm.c:813
+#: disk-utils/fsck.c:329 disk-utils/fsck.cramfs.c:180
+#: disk-utils/fsck.cramfs.c:187 disk-utils/fsck.cramfs.c:243
+#: disk-utils/fsck.cramfs.c:264 disk-utils/sfdisk.c:307 libfdisk/src/bsd.c:647
+#: login-utils/last.c:214 login-utils/last.c:251 login-utils/sulogin.c:657
+#: misc-utils/hardlink.c:586 misc-utils/hardlink.c:743
+#: schedutils/uclampset.c:111 sys-utils/ctrlaltdel.c:44
+#: sys-utils/irq-common.c:259 sys-utils/rfkill.c:216 sys-utils/setpriv.c:265
+#: term-utils/setterm.c:746 term-utils/setterm.c:802 term-utils/setterm.c:806
+#: term-utils/setterm.c:813
#, c-format
msgid "cannot read %s"
msgstr "不能读 %s"
msgid "failed to setup description for %s"
msgstr "设置 %s 描述 失败"
-#: disk-utils/fsck.c:470 misc-utils/findmnt.c:793 misc-utils/lsblk-mnt.c:17
-#: sys-utils/mount.c:95 sys-utils/swapon-common.c:19 sys-utils/umount.c:51
+#: disk-utils/fsck.c:470 misc-utils/findmnt.c:801 misc-utils/lsblk-mnt.c:15
+#: sys-utils/mount.c:104 sys-utils/swapon-common.c:19 sys-utils/umount.c:52
#, c-format
msgid "%s: parse error at line %d -- ignored"
msgstr "%s：第 %d 行解析出错 -- 已忽略"
msgid "%s: failed to parse fstab"
msgstr "%s：解析 fstab 失败"
-#: disk-utils/fsck.c:685 login-utils/login.c:1016 login-utils/sulogin.c:1024
-#: login-utils/vipw.c:208 sys-utils/flock.c:348 sys-utils/nsenter.c:182
-#: sys-utils/swapon.c:319 sys-utils/unshare.c:242 sys-utils/unshare.c:567
+#: disk-utils/fsck.c:689 login-utils/login.c:1108 login-utils/sulogin.c:1025
+#: login-utils/vipw.c:197 sys-utils/flock.c:351 sys-utils/nsenter.c:182
+#: sys-utils/swapon.c:332 sys-utils/unshare.c:242 sys-utils/unshare.c:567
msgid "fork failed"
msgstr "fork 失败"
-#: disk-utils/fsck.c:692
+#: disk-utils/fsck.c:696
#, c-format
msgid "%s: execute failed"
msgstr "%s：执行失败"
-#: disk-utils/fsck.c:780
+#: disk-utils/fsck.c:784
msgid "wait: no more child process?!?"
msgstr "wait：没有剩余子进程了？！？"
-#: disk-utils/fsck.c:783 sys-utils/flock.c:366 sys-utils/swapon.c:351
+#: disk-utils/fsck.c:787 sys-utils/flock.c:369 sys-utils/swapon.c:364
#: sys-utils/unshare.c:594 sys-utils/unshare.c:607
msgid "waitpid failed"
msgstr "waitpid 失败"
-#: disk-utils/fsck.c:801
+#: disk-utils/fsck.c:805
#, c-format
msgid "Warning... %s for device %s exited with signal %d."
msgstr "警告... 对设备 %2$s 的 %1$s 以信号 %3$d 退出。"
-#: disk-utils/fsck.c:807
+#: disk-utils/fsck.c:811
#, c-format
msgid "%s %s: status is %x, should never happen."
msgstr "%s %s：状态为 %x，这不应该发生。"
-#: disk-utils/fsck.c:853
+#: disk-utils/fsck.c:857
#, c-format
msgid "Finished with %s (exit status %d)\n"
msgstr "以 %s 结束(退出状态为 %d)\n"
-#: disk-utils/fsck.c:934
-#, c-format
-msgid "error %d (%m) while executing fsck.%s for %s"
+#: disk-utils/fsck.c:938
+#, fuzzy, c-format
+msgid "error %d (%s) while executing fsck.%s for %s"
msgstr "对 %3$s 执行 fsck.%2$s 时出现错误 %1$d (%m)"
-#: disk-utils/fsck.c:1000
+#: disk-utils/fsck.c:1004
msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'."
msgstr "传递给 -t 选项的文件系统类型必须全部/全不以“no”或“!”为前缀。"
-#: disk-utils/fsck.c:1116
+#: disk-utils/fsck.c:1120
#, c-format
msgid "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
msgstr "%s：将跳过 /etc/fstab 中的错误行：fsck 通过次数非零的绑定式挂载"
-#: disk-utils/fsck.c:1128
+#: disk-utils/fsck.c:1132
#, c-format
msgid "%s: skipping nonexistent device\n"
msgstr "%s：将跳过不存在的设备\n"
-#: disk-utils/fsck.c:1133
+#: disk-utils/fsck.c:1137
#, c-format
msgid "%s: nonexistent device (\"nofail\" fstab option may be used to skip this device)\n"
msgstr "%s：设备不存在(可以使用fstab 选项“nofail”来跳过此设备)\n"
-#: disk-utils/fsck.c:1150
+#: disk-utils/fsck.c:1154
#, c-format
msgid "%s: skipping unknown filesystem type\n"
msgstr "%s：跳过未知的文件系统类型\n"
-#: disk-utils/fsck.c:1164
+#: disk-utils/fsck.c:1168
#, c-format
msgid "cannot check %s: fsck.%s not found"
msgstr "无法检查 %s：找不到 fsck.%s"
-#: disk-utils/fsck.c:1268
+#: disk-utils/fsck.c:1272
msgid "Checking all file systems.\n"
msgstr "正在检查所有文件系统。\n"
# pass number 是fstab中定义的，不为0则每次检测
-#: disk-utils/fsck.c:1359
+#: disk-utils/fsck.c:1363
#, c-format
msgid "--waiting-- (pass %d)\n"
msgstr "--等待中-- (第 %d 遍)\n"
-#: disk-utils/fsck.c:1385
+#: disk-utils/fsck.c:1389
#, c-format
msgid " %s [options] -- [fs-options] [<filesystem> ...]\n"
msgstr " %s [选项] -- [文件系统选项] [<文件系统> ...]\n"
-#: disk-utils/fsck.c:1389
+#: disk-utils/fsck.c:1393
msgid "Check and repair a Linux filesystem.\n"
msgstr "检查并修复 Linux 文件系统。\n"
-#: disk-utils/fsck.c:1392
+#: disk-utils/fsck.c:1396
msgid " -A check all filesystems\n"
msgstr " -A 检查所有文件系统\n"
-#: disk-utils/fsck.c:1393
+#: disk-utils/fsck.c:1397
msgid " -C [<fd>] display progress bar; file descriptor is for GUIs\n"
msgstr " -C [<fd>] 显示进度条；文件描述符 fd 用于图形用户界面\n"
-#: disk-utils/fsck.c:1394
+#: disk-utils/fsck.c:1398
msgid " -l lock the device to guarantee exclusive access\n"
msgstr " -l 锁定设备以确保独占访问\n"
-#: disk-utils/fsck.c:1395
+#: disk-utils/fsck.c:1399
msgid " -M do not check mounted filesystems\n"
msgstr " -M 不检查已挂臷的文件系统\n"
-#: disk-utils/fsck.c:1396
+#: disk-utils/fsck.c:1400
msgid " -N do not execute, just show what would be done\n"
msgstr " -N 不执行，只显示将执行的操作\n"
-#: disk-utils/fsck.c:1397
+#: disk-utils/fsck.c:1401
msgid " -P check filesystems in parallel, including root\n"
msgstr " -P 并行检查文件系统，包括 root\n"
-#: disk-utils/fsck.c:1398
+#: disk-utils/fsck.c:1402
msgid " -R skip root filesystem; useful only with '-A'\n"
msgstr " -R 跳过根文件系统；只在指定 '-A' 时有用\n"
-#: disk-utils/fsck.c:1399
+#: disk-utils/fsck.c:1403
msgid ""
" -r [<fd>] report statistics for each device checked;\n"
" file descriptor is for GUIs\n"
" -r [<fd>] 报告对每个已检查设备的统计；\n"
" 文件描述符用于 GUI\n"
-#: disk-utils/fsck.c:1401
+#: disk-utils/fsck.c:1405
msgid " -s serialize the checking operations\n"
msgstr " -s 串行化检查操作\n"
-#: disk-utils/fsck.c:1402
+#: disk-utils/fsck.c:1406
msgid " -T do not show the title on startup\n"
msgstr " -T 启动时不显示标题\n"
-#: disk-utils/fsck.c:1403
+#: disk-utils/fsck.c:1407
msgid ""
" -t <type> specify filesystem types to be checked;\n"
" <type> is allowed to be a comma-separated list\n"
" -t <类型> 指定要检查的文件系统类型；\n"
" <类型> 可以是以英文逗号分隔的列表\n"
-#: disk-utils/fsck.c:1405
+#: disk-utils/fsck.c:1409
msgid " -V explain what is being done\n"
msgstr " -V 解释正在进行的操作\n"
-#: disk-utils/fsck.c:1411
+#: disk-utils/fsck.c:1415
msgid "See the specific fsck.* commands for available fs-options."
msgstr "参见特定的 fsck.* 命令了解可用的文件系统选项。"
-#: disk-utils/fsck.c:1456
+#: disk-utils/fsck.c:1460
msgid "too many devices"
msgstr "设备过多"
-#: disk-utils/fsck.c:1468
+#: disk-utils/fsck.c:1472
msgid "Is /proc mounted?"
msgstr "/proc 挂载了吗？"
-#: disk-utils/fsck.c:1476
+#: disk-utils/fsck.c:1480
#, c-format
msgid "must be root to scan for matching filesystems: %s"
msgstr "必须以 root 用户进行匹配文件系统扫描：%s"
-#: disk-utils/fsck.c:1480
+#: disk-utils/fsck.c:1484
#, c-format
msgid "couldn't find matching filesystem: %s"
msgstr "找不到匹配的文件系统：%s"
-#: disk-utils/fsck.c:1488 disk-utils/fsck.c:1585 misc-utils/kill.c:281
+#: disk-utils/fsck.c:1492 disk-utils/fsck.c:1589 misc-utils/kill.c:281
#: sys-utils/eject.c:279
msgid "too many arguments"
msgstr "参数过多"
-#: disk-utils/fsck.c:1543 disk-utils/fsck.c:1546
+#: disk-utils/fsck.c:1547 disk-utils/fsck.c:1550
msgid "invalid argument of -r"
msgstr "-r 的参数无效"
-#: disk-utils/fsck.c:1558
+#: disk-utils/fsck.c:1562
#, c-format
msgid "option '%s' may be specified only once"
msgstr "选项“%s”只能指定一次"
-#: disk-utils/fsck.c:1565 misc-utils/kill.c:327 misc-utils/kill.c:343
+#: disk-utils/fsck.c:1569 misc-utils/kill.c:327 misc-utils/kill.c:343
#, c-format
msgid "option '%s' requires an argument"
msgstr "“%s”选项需要一个参数"
-#: disk-utils/fsck.c:1596
+#: disk-utils/fsck.c:1600
#, c-format
msgid "invalid argument of -r: %d"
msgstr "-r 的参数无效：%d"
-#: disk-utils/fsck.c:1639
+#: disk-utils/fsck.c:1643
msgid "the -l option can be used with one device only -- ignore"
msgstr "-l 选项只能用于一个设备 -- 忽略"
-#: disk-utils/fsck.cramfs.c:111
+#: disk-utils/fsck.cramfs.c:117
#, c-format
msgid " %s [options] <file>\n"
msgstr " %s [选项] <文件>\n"
-#: disk-utils/fsck.cramfs.c:114
+#: disk-utils/fsck.cramfs.c:120
msgid "Check and repair a compressed ROM filesystem.\n"
msgstr "检查并修复压缩的 ROM 文件系统。\n"
-#: disk-utils/fsck.cramfs.c:117
+#: disk-utils/fsck.cramfs.c:123
msgid " -a for compatibility only, ignored\n"
msgstr " -a 纯兼容性选项，忽略\n"
-#: disk-utils/fsck.cramfs.c:118
+#: disk-utils/fsck.cramfs.c:124
msgid " -v, --verbose be more verbose\n"
msgstr " -v, --verbose 更详尽\n"
-#: disk-utils/fsck.cramfs.c:119
+#: disk-utils/fsck.cramfs.c:125
msgid " -y for compatibility only, ignored\n"
msgstr " -y 纯兼容性选项，忽略\n"
-#: disk-utils/fsck.cramfs.c:120
+#: disk-utils/fsck.cramfs.c:126
msgid " -b, --blocksize <size> use this blocksize, defaults to page size\n"
msgstr " -b, --blocksize <大小> 使用指定的块大小，默认为页的大小\n"
-#: disk-utils/fsck.cramfs.c:121
+#: disk-utils/fsck.cramfs.c:127
msgid " --extract[=<dir>] test uncompression, optionally extract into <dir>\n"
msgstr " --extract[=<目录>] 测试解压，可指定解压到<目录>\n"
-#: disk-utils/fsck.cramfs.c:161
+#: disk-utils/fsck.cramfs.c:167
#, c-format
msgid "ioctl failed: unable to determine device size: %s"
msgstr "ioctl 失败：无法确定设备大小：%s"
-#: disk-utils/fsck.cramfs.c:167
+#: disk-utils/fsck.cramfs.c:173
#, c-format
msgid "not a block device or file: %s"
msgstr "不是一个块设备或文件：%s"
-#: disk-utils/fsck.cramfs.c:170 disk-utils/fsck.cramfs.c:206
+#: disk-utils/fsck.cramfs.c:176 disk-utils/fsck.cramfs.c:212
msgid "file length too short"
msgstr "文件长度过短"
-#: disk-utils/fsck.cramfs.c:179 disk-utils/fsck.cramfs.c:234
-#: disk-utils/fsck.cramfs.c:254 libfdisk/src/bsd.c:719 libfdisk/src/bsd.c:901
-#: login-utils/last.c:203 login-utils/last.c:237 sys-utils/fallocate.c:206
+#: disk-utils/fsck.cramfs.c:185 disk-utils/fsck.cramfs.c:240
+#: disk-utils/fsck.cramfs.c:260 libfdisk/src/bsd.c:719 libfdisk/src/bsd.c:901
+#: login-utils/last.c:209 login-utils/last.c:243 sys-utils/fallocate.c:206
#, c-format
msgid "seek on %s failed"
msgstr "在 %s 上定位失败"
-#: disk-utils/fsck.cramfs.c:185 disk-utils/fsck.cramfs.c:187
+#: disk-utils/fsck.cramfs.c:191 disk-utils/fsck.cramfs.c:193
msgid "superblock magic not found"
msgstr "超级块魔数(magic)未找到"
-#: disk-utils/fsck.cramfs.c:190
+#: disk-utils/fsck.cramfs.c:196
#, c-format
msgid "cramfs endianness is %s\n"
msgstr "cramfs 大小端为 %s\n"
-#: disk-utils/fsck.cramfs.c:191
+#: disk-utils/fsck.cramfs.c:197
msgid "big"
msgstr "大端"
-#: disk-utils/fsck.cramfs.c:191
+#: disk-utils/fsck.cramfs.c:197
msgid "little"
msgstr "小端"
-#: disk-utils/fsck.cramfs.c:195
+#: disk-utils/fsck.cramfs.c:201
msgid "unsupported filesystem features"
msgstr "不支持的文件系统特性"
-#: disk-utils/fsck.cramfs.c:199
+#: disk-utils/fsck.cramfs.c:205
#, c-format
msgid "superblock size (%d) too small"
msgstr "超级块尺寸(%d)过小"
-#: disk-utils/fsck.cramfs.c:204
+#: disk-utils/fsck.cramfs.c:210
msgid "zero file count"
msgstr "零文件计数"
-#: disk-utils/fsck.cramfs.c:208
+#: disk-utils/fsck.cramfs.c:214
msgid "file extends past end of filesystem"
msgstr "警告：文件超过了文件系统终点"
-#: disk-utils/fsck.cramfs.c:210
+#: disk-utils/fsck.cramfs.c:216
msgid "old cramfs format"
msgstr "旧的 cramfs 格式"
-#: disk-utils/fsck.cramfs.c:219
+#: disk-utils/fsck.cramfs.c:225
msgid "unable to test CRC: old cramfs format"
msgstr "无法检测 CRC：旧的 cramfs 格式"
-#: disk-utils/fsck.cramfs.c:239
+#: disk-utils/fsck.cramfs.c:245
#, c-format
msgid "failed to read %<PRIu32> bytes from file %s"
msgstr "读取 %<PRIu32> 字节（读自文件 %s）时失败"
-#: disk-utils/fsck.cramfs.c:277
+#: disk-utils/fsck.cramfs.c:283
msgid "crc error"
msgstr "crc 错误"
-#: disk-utils/fsck.cramfs.c:307 disk-utils/fsck.minix.c:558
+#: disk-utils/fsck.cramfs.c:313 disk-utils/fsck.minix.c:558
msgid "seek failed"
msgstr "定位失败"
-#: disk-utils/fsck.cramfs.c:311
+#: disk-utils/fsck.cramfs.c:317
msgid "read romfs failed"
msgstr "读取 romfs 失败"
-#: disk-utils/fsck.cramfs.c:343
+#: disk-utils/fsck.cramfs.c:349
msgid "root inode is not directory"
msgstr "根 inode 不是一个目录"
-#: disk-utils/fsck.cramfs.c:347
+#: disk-utils/fsck.cramfs.c:353
#, c-format
msgid "bad root offset (%lu)"
msgstr "错误的根偏移(%lu)"
-#: disk-utils/fsck.cramfs.c:365
+#: disk-utils/fsck.cramfs.c:371
msgid "data block too large"
msgstr "数据块过大"
-#: disk-utils/fsck.cramfs.c:369
+#: disk-utils/fsck.cramfs.c:375
#, c-format
msgid "decompression error: %s"
msgstr "解压出错：%s"
-#: disk-utils/fsck.cramfs.c:395
+#: disk-utils/fsck.cramfs.c:401
#, c-format
msgid " hole at %lu (%zu)\n"
msgstr " 位于 %lu 的空洞(%zu)\n"
-#: disk-utils/fsck.cramfs.c:402 disk-utils/fsck.cramfs.c:554
+#: disk-utils/fsck.cramfs.c:408 disk-utils/fsck.cramfs.c:560
#, c-format
msgid " uncompressing block at %lu to %lu (%lu)\n"
msgstr " 正在将 %lu 处的块解压到 %lu (%lu)\n"
-#: disk-utils/fsck.cramfs.c:409
+#: disk-utils/fsck.cramfs.c:415
#, c-format
msgid "non-block (%ld) bytes"
msgstr "非块(%ld)字节 "
-#: disk-utils/fsck.cramfs.c:413
+#: disk-utils/fsck.cramfs.c:419
#, c-format
msgid "non-size (%ld vs %ld) bytes"
msgstr "无大小(%ld ： %ld)字节"
-#: disk-utils/fsck.cramfs.c:418 disk-utils/fsck.cramfs.c:520
-#: disk-utils/swaplabel.c:109 misc-utils/uuidd.c:369 sys-utils/fallocate.c:414
-#: sys-utils/rfkill.c:560 sys-utils/setpriv.c:634 sys-utils/setpriv.c:657
-#: sys-utils/swapon.c:392 term-utils/script.c:318 term-utils/ttymsg.c:175
+#: disk-utils/fsck.cramfs.c:424 disk-utils/fsck.cramfs.c:526
+#: disk-utils/swaplabel.c:109 misc-utils/uuidd.c:403 sys-utils/fallocate.c:417
+#: sys-utils/rfkill.c:555 sys-utils/setpriv.c:628 sys-utils/setpriv.c:651
+#: sys-utils/swapon.c:405 term-utils/script.c:319 term-utils/ttymsg.c:175
#, c-format
msgid "write failed: %s"
msgstr "写失败：%s"
-#: disk-utils/fsck.cramfs.c:428
+#: disk-utils/fsck.cramfs.c:434
#, c-format
msgid "lchown failed: %s"
msgstr "lchown 失败：%s"
-#: disk-utils/fsck.cramfs.c:432
+#: disk-utils/fsck.cramfs.c:438
#, c-format
msgid "chown failed: %s"
msgstr "chown 失败：%s"
-#: disk-utils/fsck.cramfs.c:437
+#: disk-utils/fsck.cramfs.c:443
#, c-format
msgid "utimes failed: %s"
msgstr "utimes 失败：%s"
-#: disk-utils/fsck.cramfs.c:449
+#: disk-utils/fsck.cramfs.c:455
#, c-format
msgid "directory inode has zero offset and non-zero size: %s"
msgstr "目录 inode 偏移为 0，大小不为 0：%s"
-#: disk-utils/fsck.cramfs.c:464
+#: disk-utils/fsck.cramfs.c:470
#, c-format
msgid "mkdir failed: %s"
msgstr "mkdir 失败：%s"
-#: disk-utils/fsck.cramfs.c:480
+#: disk-utils/fsck.cramfs.c:486
msgid "filename length is zero"
msgstr "文件名长度为 0"
-#: disk-utils/fsck.cramfs.c:482
+#: disk-utils/fsck.cramfs.c:488
msgid "bad filename length"
msgstr "文件名长度有误"
-#: disk-utils/fsck.cramfs.c:488
+#: disk-utils/fsck.cramfs.c:494
msgid "bad inode offset"
msgstr "inode 偏移有误"
-#: disk-utils/fsck.cramfs.c:503
+#: disk-utils/fsck.cramfs.c:509
msgid "file inode has zero offset and non-zero size"
msgstr "文件 inode 偏移为 0，大小不为 0"
-#: disk-utils/fsck.cramfs.c:506
+#: disk-utils/fsck.cramfs.c:512
msgid "file inode has zero size and non-zero offset"
msgstr "文件 inode 大小为 0，偏移不为 0"
-#: disk-utils/fsck.cramfs.c:535
+#: disk-utils/fsck.cramfs.c:541
msgid "symbolic link has zero offset"
msgstr "符号链接偏移为 0"
-#: disk-utils/fsck.cramfs.c:537
+#: disk-utils/fsck.cramfs.c:543
msgid "symbolic link has zero size"
msgstr "符号链接大小为 0"
-#: disk-utils/fsck.cramfs.c:546
+#: disk-utils/fsck.cramfs.c:552
#, c-format
msgid "size error in symlink: %s"
msgstr "符号链接大小出错：%s"
-#: disk-utils/fsck.cramfs.c:560
+#: disk-utils/fsck.cramfs.c:566
#, c-format
msgid "symlink failed: %s"
msgstr "symlink 失败：%s"
-#: disk-utils/fsck.cramfs.c:573
+#: disk-utils/fsck.cramfs.c:579
#, c-format
msgid "special file has non-zero offset: %s"
msgstr "特殊文件的偏移不为 0：%s"
-#: disk-utils/fsck.cramfs.c:583
+#: disk-utils/fsck.cramfs.c:589
#, c-format
msgid "fifo has non-zero size: %s"
msgstr "FIFO 的大小不为 0：%s"
-#: disk-utils/fsck.cramfs.c:589
+#: disk-utils/fsck.cramfs.c:595
#, c-format
msgid "socket has non-zero size: %s"
msgstr "套接字的大小不为 0：%s"
-#: disk-utils/fsck.cramfs.c:592
+#: disk-utils/fsck.cramfs.c:598
#, c-format
msgid "bogus mode: %s (%o)"
msgstr "伪(bogus)模式：%s (%o)"
-#: disk-utils/fsck.cramfs.c:601
+#: disk-utils/fsck.cramfs.c:607
#, c-format
msgid "mknod failed: %s"
msgstr "mknod 失败：%s"
-#: disk-utils/fsck.cramfs.c:633
+#: disk-utils/fsck.cramfs.c:639
#, c-format
msgid "directory data start (%lu) < sizeof(struct cramfs_super) + start (%zu)"
msgstr "目录数据起点(%lu) < sizeof(struct cramfs_super) + 起点 (%zu)"
-#: disk-utils/fsck.cramfs.c:637
+#: disk-utils/fsck.cramfs.c:643
#, c-format
msgid "directory data end (%lu) != file data start (%lu)"
msgstr "目录数据终点 (%lu) != 文件数据起点 (%lu)"
-#: disk-utils/fsck.cramfs.c:641
+#: disk-utils/fsck.cramfs.c:647
msgid "invalid file data offset"
msgstr "无效的文件数据偏移"
-#: disk-utils/fsck.cramfs.c:689 disk-utils/mkfs.cramfs.c:736
+#: disk-utils/fsck.cramfs.c:695 disk-utils/mkfs.cramfs.c:736
msgid "invalid blocksize argument"
msgstr "无效的 块大小 参数"
-#: disk-utils/fsck.cramfs.c:712
+#: disk-utils/fsck.cramfs.c:729
#, c-format
msgid "%s: OK\n"
msgstr "%s：OK\n"
msgid "%ld blocks\n"
msgstr "%ld 块\n"
-#: disk-utils/fsck.minix.c:647 disk-utils/mkfs.minix.c:568
+#: disk-utils/fsck.minix.c:647 disk-utils/mkfs.minix.c:571
#, c-format
msgid "Firstdatazone=%jd (%jd)\n"
msgstr "首个数据区=%jd (%jd)\n"
"文件系统已经更改\n"
"----------------\n"
-#: disk-utils/fsck.minix.c:1429 disk-utils/mkfs.minix.c:837
-#: disk-utils/mkswap.c:561 disk-utils/partx.c:1068 disk-utils/resizepart.c:115
-#: login-utils/utmpdump.c:391 sys-utils/dmesg.c:678 sys-utils/wdctl.c:386
-#: sys-utils/wdctl.c:446 term-utils/setterm.c:908 text-utils/pg.c:1259
+#: disk-utils/fsck.minix.c:1429 disk-utils/mkfs.minix.c:854
+#: disk-utils/mkswap.c:667 disk-utils/partx.c:1068 disk-utils/resizepart.c:115
+#: login-utils/utmpdump.c:395 sys-utils/dmesg.c:679 sys-utils/wdctl.c:386
+#: sys-utils/wdctl.c:446 term-utils/setterm.c:908 text-utils/col.c:195
+#: text-utils/pg.c:1259
msgid "write failed"
msgstr "写失败"
" -V, --verbose 解释正在进行的操作；\n"
" 多次指定 -V 将导致空运行(dry-run)\n"
-#: disk-utils/mkfs.c:133 include/c.h:254 login-utils/su-common.c:1214
-#: login-utils/sulogin.c:793 login-utils/sulogin.c:797 sys-utils/flock.c:123
-#: sys-utils/rtcwake.c:621
+#: disk-utils/mkfs.c:133 include/c.h:269 login-utils/su-common.c:1238
+#: login-utils/sulogin.c:794 login-utils/sulogin.c:798 sys-utils/flock.c:123
+#: sys-utils/rtcwake.c:623
#, c-format
msgid "failed to execute %s"
msgstr "执行 %s 失败"
"that some device files will be wrong."
msgstr "警告：设备号被截短为 %u 位。几乎可以肯定某些设备文件将出错。"
-#: disk-utils/mkfs.minix.c:138
+#: disk-utils/mkfs.minix.c:139
#, c-format
msgid " %s [options] /dev/name [blocks]\n"
msgstr " %s [选项] /dev/name [块数]\n"
-#: disk-utils/mkfs.minix.c:140
+#: disk-utils/mkfs.minix.c:141
msgid " -1 use Minix version 1\n"
msgstr " -1 使用 Minix 第 1 版\n"
-#: disk-utils/mkfs.minix.c:141
+#: disk-utils/mkfs.minix.c:142
msgid " -2, -v use Minix version 2\n"
msgstr " -2, -v 使用 Minix 第 2 版\n"
-#: disk-utils/mkfs.minix.c:142
+#: disk-utils/mkfs.minix.c:143
msgid " -3 use Minix version 3\n"
msgstr " -3 使用 Minix 第 3 版\n"
-#: disk-utils/mkfs.minix.c:143
+#: disk-utils/mkfs.minix.c:144
msgid " -n, --namelength <num> maximum length of filenames\n"
msgstr " -n, --namelength <数字> 文件名的最大长度\n"
-#: disk-utils/mkfs.minix.c:144
+#: disk-utils/mkfs.minix.c:145
msgid " -i, --inodes <num> number of inodes for the filesystem\n"
msgstr " -i, --inodes <数字> 文件系统的 inode 数\n"
-#: disk-utils/mkfs.minix.c:145
+#: disk-utils/mkfs.minix.c:146
msgid " -c, --check check the device for bad blocks\n"
msgstr " -c, --check 检查设备坏块\n"
-#: disk-utils/mkfs.minix.c:146
+#: disk-utils/mkfs.minix.c:147
msgid " -l, --badblocks <file> list of bad blocks from file\n"
msgstr " -l, --badblocks <文件> 列出文件中的坏块\n"
-#: disk-utils/mkfs.minix.c:189
+#: disk-utils/mkfs.minix.c:149
+#, fuzzy, c-format
+msgid " --lock[=<mode>] use exclusive device lock (%s, %s or %s)\n"
+msgstr " --lock[=<模式>] 使用独占设备锁（%s、%s 或 %s）\n"
+
+#: disk-utils/mkfs.minix.c:192
#, c-format
msgid "%s: seek to boot block failed in write_tables"
msgstr "%s：在 write_tables 中定位到启动块失败"
-#: disk-utils/mkfs.minix.c:192
+#: disk-utils/mkfs.minix.c:195
#, c-format
msgid "%s: unable to clear boot sector"
msgstr "%s：无法清除启动扇区"
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:197
#, c-format
msgid "%s: seek failed in write_tables"
msgstr "%s：在 write_tables 中定位失败"
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:200
#, c-format
msgid "%s: unable to write super-block"
msgstr "%s：无法写超级块"
-#: disk-utils/mkfs.minix.c:200
+#: disk-utils/mkfs.minix.c:203
#, c-format
msgid "%s: unable to write inode map"
msgstr "%s：无法写 inode map"
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
#, c-format
msgid "%s: unable to write zone map"
msgstr "%s：无法写 zone map"
-#: disk-utils/mkfs.minix.c:206
+#: disk-utils/mkfs.minix.c:209
#, c-format
msgid "%s: unable to write inodes"
msgstr "%s：无法写 inodes"
-#: disk-utils/mkfs.minix.c:211
+#: disk-utils/mkfs.minix.c:214
#, c-format
msgid "%s: seek failed in write_block"
msgstr "%s：在 write_block 中定位失败"
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:217
#, c-format
msgid "%s: write failed in write_block"
msgstr "%s：在 write_block 中写入失败"
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:226 disk-utils/mkfs.minix.c:301
+#: disk-utils/mkfs.minix.c:350
#, c-format
msgid "%s: too many bad blocks"
msgstr "%s：坏块太多"
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:234
#, c-format
msgid "%s: not enough good blocks"
msgstr "%s：好块不够"
-#: disk-utils/mkfs.minix.c:546
+#: disk-utils/mkfs.minix.c:549
#, c-format
msgid ""
"First data block at %jd, which is too far (max %d).\n"
"第一个数据块位于 %jd，过远(最大为 %d)。\n"
"请尝试通过传递 --inodes <数值> 来指定更少的 inode"
-#: disk-utils/mkfs.minix.c:566
+#: disk-utils/mkfs.minix.c:569
#, c-format
msgid "%lu inode\n"
msgid_plural "%lu inodes\n"
msgstr[0] "%lu 个 inode\n"
-#: disk-utils/mkfs.minix.c:567
+#: disk-utils/mkfs.minix.c:570
#, c-format
msgid "%lu block\n"
msgid_plural "%lu blocks\n"
msgstr[0] "%lu 个块\n"
-#: disk-utils/mkfs.minix.c:570
+#: disk-utils/mkfs.minix.c:573
#, c-format
msgid "Zonesize=%zu\n"
msgstr "区大小=%zu\n"
-#: disk-utils/mkfs.minix.c:571
+#: disk-utils/mkfs.minix.c:574
#, c-format
msgid ""
"Maxsize=%zu\n"
"最大尺寸=%zu\n"
"\n"
-#: disk-utils/mkfs.minix.c:584
+#: disk-utils/mkfs.minix.c:587
#, c-format
msgid "%s: seek failed during testing of blocks"
msgstr "%s：在测试块时定位失败"
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:594
#, c-format
msgid "Weird values in do_check: probably bugs\n"
msgstr "do_check 中的值异常：可能有 bug\n"
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:627
#, c-format
msgid "%s: seek failed in check_blocks"
msgstr "%s：在 check_blocks 中定位失败"
-#: disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:637
#, c-format
msgid "%s: bad blocks before data-area: cannot make fs"
msgstr "%s：数据区前有坏块：无法创建文件系统"
-#: disk-utils/mkfs.minix.c:641 disk-utils/mkfs.minix.c:665
+#: disk-utils/mkfs.minix.c:644 disk-utils/mkfs.minix.c:668
#, c-format
msgid "%d bad block\n"
msgid_plural "%d bad blocks\n"
msgstr[0] "%d 个坏块\n"
-#: disk-utils/mkfs.minix.c:650
+#: disk-utils/mkfs.minix.c:653
#, c-format
msgid "%s: can't open file of bad blocks"
msgstr "%s: 打不开坏块文件"
-#: disk-utils/mkfs.minix.c:655
+#: disk-utils/mkfs.minix.c:658
#, c-format
msgid "badblock number input error on line %d\n"
msgstr "第 %d 行坏块数输入错误\n"
-#: disk-utils/mkfs.minix.c:656
+#: disk-utils/mkfs.minix.c:659
#, c-format
msgid "%s: cannot read badblocks file"
msgstr "%s: 打不开 badblocks 文件"
-#: disk-utils/mkfs.minix.c:696
+#: disk-utils/mkfs.minix.c:699
#, c-format
msgid "block size smaller than physical sector size of %s"
msgstr "块尺寸比 %s 的物理扇区尺寸小"
-#: disk-utils/mkfs.minix.c:699
+#: disk-utils/mkfs.minix.c:702
#, c-format
msgid "cannot determine size of %s"
msgstr "无法确定 %s 的大小"
-#: disk-utils/mkfs.minix.c:707
+#: disk-utils/mkfs.minix.c:710
#, c-format
msgid "%s: requested blocks (%llu) exceeds available (%llu) blocks\n"
msgstr "%s：重复的块 (%llu) 超出可用的 (%llu) 块\n"
-#: disk-utils/mkfs.minix.c:710
+#: disk-utils/mkfs.minix.c:713
#, c-format
msgid "%s: number of blocks too small"
msgstr "%s：块数太小"
-#: disk-utils/mkfs.minix.c:725 disk-utils/mkfs.minix.c:731
+#: disk-utils/mkfs.minix.c:728 disk-utils/mkfs.minix.c:734
#, c-format
msgid "unsupported name length: %d"
msgstr "不支持的名字长度：%d"
-#: disk-utils/mkfs.minix.c:734
+#: disk-utils/mkfs.minix.c:737
#, c-format
msgid "unsupported minix file system version: %d"
msgstr " 不支持的 minix 文件系统版本：%d"
-#: disk-utils/mkfs.minix.c:771
+#: disk-utils/mkfs.minix.c:778
msgid "-v is ambiguous, use '-2' instead"
msgstr "-v 含义不清，请转用“-2”"
-#: disk-utils/mkfs.minix.c:782
+#: disk-utils/mkfs.minix.c:789
msgid "failed to parse maximum length of filenames"
msgstr "解析文件名最大长度失败"
-#: disk-utils/mkfs.minix.c:786
+#: disk-utils/mkfs.minix.c:793
msgid "failed to parse number of inodes"
msgstr "解析 inode 数 失败"
-#: disk-utils/mkfs.minix.c:809
+#: disk-utils/mkfs.minix.c:824
msgid "failed to parse number of blocks"
msgstr "解析块数失败"
-#: disk-utils/mkfs.minix.c:817
+#: disk-utils/mkfs.minix.c:832
#, c-format
msgid "%s is mounted; will not make a filesystem here!"
msgstr "%s 已挂载；将不会在此创建文件系统！"
-#: disk-utils/mkswap.c:81
+#: disk-utils/mkswap.c:90
#, c-format
msgid "Bad user-specified page size %u"
msgstr "用户指定的页大小 %u 有误"
-#: disk-utils/mkswap.c:84
+#: disk-utils/mkswap.c:93
#, c-format
msgid "Using user-specified page size %d, instead of the system value %d"
msgstr "将使用用户指定的页大小 %d 来取代系统值 %d"
-#: disk-utils/mkswap.c:125
+#: disk-utils/mkswap.c:134
msgid "Label was truncated."
msgstr "标签已截短。"
-#: disk-utils/mkswap.c:133
+#: disk-utils/mkswap.c:142
#, c-format
msgid "no label, "
msgstr "无标签，"
-#: disk-utils/mkswap.c:141
+#: disk-utils/mkswap.c:150
#, c-format
msgid "no uuid\n"
msgstr "无 uuid\n"
-#: disk-utils/mkswap.c:149
-#, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] device [size]\n"
+#: disk-utils/mkswap.c:159
+#, fuzzy, c-format
+msgid " %s [options] device [size]\n"
msgstr ""
"\n"
"用法\n"
" %s [选项] 设备 [大小]\n"
-#: disk-utils/mkswap.c:154
+#: disk-utils/mkswap.c:162
msgid "Set up a Linux swap area.\n"
msgstr "设置 Linux 交换区。\n"
-#: disk-utils/mkswap.c:157
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-" -c, --check check bad blocks before creating the swap area\n"
-" -f, --force allow swap size area be larger than device\n"
-" -p, --pagesize SIZE specify page size in bytes\n"
-" -L, --label LABEL specify label\n"
-" -v, --swapversion NUM specify swap-space version number\n"
-" -U, --uuid UUID specify the uuid to use\n"
-msgstr ""
-"\n"
-"选项：\n"
-" -c, --check 创建交换区前检查坏块\n"
-" -f, --force 允许交换区大于设备大小\n"
-" -p, --pagesize SIZE 指定页大小为 SIZE 字节\n"
-" -L, --label LABEL 指定标签为 LABEL\n"
-" -v, --swapversion NUM 指定交换空间版本号为 NUM\n"
-" -U, --uuid UUID 指定要使用的 UUID\n"
-
-#: disk-utils/mkswap.c:166 disk-utils/sfdisk.c:2048
+#: disk-utils/mkswap.c:165
+#, fuzzy
+msgid " -c, --check check bad blocks before creating the swap area\n"
+msgstr " -c, --check 检查设备坏块\n"
+
+#: disk-utils/mkswap.c:166
+#, fuzzy
+msgid " -f, --force allow swap size area be larger than device\n"
+msgstr " -f, --find 查找空闲设备\n"
+
+#: disk-utils/mkswap.c:167
+#, fuzzy
+msgid " -p, --pagesize SIZE specify page size in bytes\n"
+msgstr " -b, --bytes 以字节数显示大小\n"
+
+#: disk-utils/mkswap.c:168
+#, fuzzy
+msgid " -L, --label LABEL specify label\n"
+msgstr " -X, --label <名称> 指定标签类型(dos, gpt, ...)\n"
+
+#: disk-utils/mkswap.c:169
+#, fuzzy
+msgid " -v, --swapversion NUM specify swap-space version number\n"
+msgstr " -N, --partno <数字> 指定分区号\n"
+
+#: disk-utils/mkswap.c:170
+#, fuzzy
+msgid " -U, --uuid UUID specify the uuid to use\n"
+msgstr " -g, --group <组> 指定主组\n"
+
+#: disk-utils/mkswap.c:171
+#, fuzzy
+msgid " --verbose verbose output\n"
+msgstr " -v, --verbose 详尽模式\n"
+
+#: disk-utils/mkswap.c:174 disk-utils/sfdisk.c:2061
#, fuzzy, c-format
msgid " --lock[=<mode>] use exclusive device lock (%s, %s or %s)\n"
msgstr " --color[=<何时>] 彩色输出（%s, %s 或 %s）\n"
-#: disk-utils/mkswap.c:179
+#: disk-utils/mkswap.c:187
#, c-format
msgid "too many bad pages: %lu"
msgstr "坏页过多：%lu"
-#: disk-utils/mkswap.c:200
+#: disk-utils/mkswap.c:208
msgid "seek failed in check_blocks"
msgstr "check_blocks (检查块)时定位失败"
-#: disk-utils/mkswap.c:208
+#: disk-utils/mkswap.c:216
#, c-format
msgid "%lu bad page\n"
msgid_plural "%lu bad pages\n"
msgstr[0] "%lu 个坏页\n"
-#: disk-utils/mkswap.c:233
+#: disk-utils/mkswap.c:228
+#, c-format
+msgid ""
+"mkswap: %s contains holes or other unsupported extents.\n"
+" This swap file can be rejected by kernel on swap activation!\n"
+msgstr ""
+
+#: disk-utils/mkswap.c:236
+#, fuzzy, c-format
+msgid " Use --verbose for more details.\n"
+msgstr " --verbose 打印更多细节\n"
+
+#: disk-utils/mkswap.c:275 disk-utils/mkswap.c:300
+#, c-format
+msgid "hole detected at offset %ju"
+msgstr ""
+
+#: disk-utils/mkswap.c:283
+#, c-format
+msgid "data inline extent at offset %ju"
+msgstr ""
+
+#: disk-utils/mkswap.c:286
+#, c-format
+msgid "shared extent at offset %ju"
+msgstr ""
+
+#: disk-utils/mkswap.c:289
+#, c-format
+msgid "unallocated extent at offset %ju"
+msgstr ""
+
+#: disk-utils/mkswap.c:329
msgid "unable to alloc new libblkid probe"
msgstr "无法分配新的 libblkid 探针"
-#: disk-utils/mkswap.c:235
+#: disk-utils/mkswap.c:331
msgid "unable to assign device to libblkid probe"
msgstr "无法将设备分配给 libblkid 探针"
-#: disk-utils/mkswap.c:256
+#: disk-utils/mkswap.c:352
#, c-format
msgid "warning: checking bad blocks from swap file is not supported: %s"
msgstr "警告：不支持检查交换区的坏块：%s"
-#: disk-utils/mkswap.c:272 disk-utils/mkswap.c:297 disk-utils/mkswap.c:344
+#: disk-utils/mkswap.c:367 disk-utils/mkswap.c:392 disk-utils/mkswap.c:439
msgid "unable to rewind swap-device"
msgstr "无法倒回(rewind)交换设备"
-#: disk-utils/mkswap.c:300
+#: disk-utils/mkswap.c:395
msgid "unable to erase bootbits sectors"
msgstr "不能擦除 bootbits 扇区"
-#: disk-utils/mkswap.c:316
+#: disk-utils/mkswap.c:411
#, c-format
msgid "%s: warning: wiping old %s signature."
msgstr "%s：警告，将擦除旧的 %s 签名。"
-#: disk-utils/mkswap.c:321
+#: disk-utils/mkswap.c:416
#, c-format
msgid "%s: warning: don't erase bootbits sectors"
msgstr "%s：警告，不要擦除 bootbits 扇区"
-#: disk-utils/mkswap.c:324
+#: disk-utils/mkswap.c:419
#, c-format
msgid " (%s partition table detected). "
msgstr " (检测到 %s 分区表)。"
-#: disk-utils/mkswap.c:326
+#: disk-utils/mkswap.c:421
#, c-format
msgid " (compiled without libblkid). "
msgstr " (编译时未链接 libblkid)。"
-#: disk-utils/mkswap.c:327
+#: disk-utils/mkswap.c:422
#, c-format
msgid "Use -f to force.\n"
msgstr "使用 -f 选项强制执行。\n"
-#: disk-utils/mkswap.c:349
+#: disk-utils/mkswap.c:444
#, c-format
msgid "%s: unable to write signature page"
msgstr "%s：无法写签名页"
-#: disk-utils/mkswap.c:394
+#: disk-utils/mkswap.c:491
msgid "parsing page size failed"
msgstr "解析页大小失败"
-#: disk-utils/mkswap.c:400
+#: disk-utils/mkswap.c:497
msgid "parsing version number failed"
msgstr "解析版本号失败"
-#: disk-utils/mkswap.c:403
+#: disk-utils/mkswap.c:500
#, c-format
msgid "swapspace version %d is not supported"
msgstr "不支持 swapspace 版本 %d"
-#: disk-utils/mkswap.c:409
+#: disk-utils/mkswap.c:506
#, c-format
msgid "warning: ignoring -U (UUIDs are unsupported by %s)"
msgstr "警告：将忽略 -U 选项(%s 不支持 UUID)"
-#: disk-utils/mkswap.c:436
+#: disk-utils/mkswap.c:536
msgid "only one device argument is currently supported"
msgstr "当前只支持一个设备参数"
-#: disk-utils/mkswap.c:443
+#: disk-utils/mkswap.c:543
msgid "error: parsing UUID failed"
msgstr "错误：解析 UUID 失败"
-#: disk-utils/mkswap.c:452
+#: disk-utils/mkswap.c:552
msgid "error: Nowhere to set up swap on?"
msgstr "错误：没有设置交换空间的地方？"
-#: disk-utils/mkswap.c:458
+#: disk-utils/mkswap.c:558
msgid "invalid block count argument"
msgstr "无效的 块计数 参数"
-#: disk-utils/mkswap.c:467
+#: disk-utils/mkswap.c:567
#, c-format
msgid "error: size %llu KiB is larger than device size %<PRIu64> KiB"
msgstr "错误：尺寸 %llu KiB 大于设备尺寸 %<PRIu64> KiB"
-#: disk-utils/mkswap.c:473
+#: disk-utils/mkswap.c:573
#, c-format
msgid "error: swap area needs to be at least %ld KiB"
msgstr "错误：交换区至少需要 %ld KiB"
-#: disk-utils/mkswap.c:478
+#: disk-utils/mkswap.c:578
#, c-format
msgid "warning: truncating swap area to %llu KiB"
msgstr "警告：将把交换区截短为 %llu KiB"
-#: disk-utils/mkswap.c:483
+#: disk-utils/mkswap.c:583
#, c-format
msgid "error: %s is mounted; will not make swapspace"
msgstr "错误：%s 已挂载；将不会创建交换空间"
-#: disk-utils/mkswap.c:490 sys-utils/swapon.c:528
-#, c-format
-msgid "%s: insecure permissions %04o, %04o suggested."
+#: disk-utils/mkswap.c:590
+#, fuzzy, c-format
+msgid "%s: insecure permissions %04o, fix with: chmod %04o %s"
msgstr "%s：不安全的权限 %04o，建议使用 %04o。"
-#: disk-utils/mkswap.c:494 sys-utils/swapon.c:533
-#, c-format
-msgid "%s: insecure file owner %d, 0 (root) suggested."
+#: disk-utils/mkswap.c:594
+#, fuzzy, c-format
+msgid "%s: insecure file owner %d, fix with: chown 0:0 %s"
msgstr "%s：不安全的文件拥有者 %d，建议使用 0(root)。"
-#: disk-utils/mkswap.c:509
+#: disk-utils/mkswap.c:613
msgid "Unable to set up swap-space: unreadable"
msgstr "无法设置交换空间：不可读"
-#: disk-utils/mkswap.c:514
+#: disk-utils/mkswap.c:618
#, c-format
msgid "Setting up swapspace version %d, size = %s (%<PRIu64> bytes)\n"
msgstr "正在设置交换空间版本 %d，大小 = %s (%<PRIu64> 个字节)\n"
-#: disk-utils/mkswap.c:534
+#: disk-utils/mkswap.c:637
#, c-format
msgid "%s: unable to obtain selinux file label"
msgstr "%s：无法获得 selinux 文件标签"
-#: disk-utils/mkswap.c:537
-msgid "unable to matchpathcon()"
-msgstr "无法执行 matchpathcon()"
+#: disk-utils/mkswap.c:642
+#, fuzzy, c-format
+msgid "%s: unable to obtain default selinux file label"
+msgstr "%s：无法获得 selinux 文件标签"
-#: disk-utils/mkswap.c:540
+#: disk-utils/mkswap.c:646
msgid "unable to create new selinux context"
msgstr "无法创建新的 selinux 环境(context)"
-#: disk-utils/mkswap.c:542
+#: disk-utils/mkswap.c:648
msgid "couldn't compute selinux context"
msgstr "无法计算 selinux 环境(context)"
-#: disk-utils/mkswap.c:548
+#: disk-utils/mkswap.c:654
#, c-format
msgid "unable to relabel %s to %s"
msgstr "无法将 %s 标签改为 %s"
msgid "partition name"
msgstr "分区名"
-#: disk-utils/partx.c:92 misc-utils/findmnt.c:108 misc-utils/lsblk.c:176
+#: disk-utils/partx.c:92 misc-utils/findmnt.c:115 misc-utils/lsblk.c:183
msgid "partition UUID"
msgstr "分区 UUID"
msgid "partition table type (dos, gpt, ...)"
msgstr "分区表类型(dos、gpt、...)"
-#: disk-utils/partx.c:94 misc-utils/lsblk.c:177
+#: disk-utils/partx.c:94 misc-utils/lsblk.c:184
msgid "partition flags"
msgstr "分区标志"
msgid "partition type (a string, a UUID, or hex)"
msgstr "分区类型(字符串，UUID 或十六进制数)"
-#: disk-utils/partx.c:114 sys-utils/losetup.c:534 sys-utils/losetup.c:648
+#: disk-utils/partx.c:114 sys-utils/losetup.c:534 sys-utils/losetup.c:652
msgid "failed to initialize loopcxt"
msgstr "初始化 loopcxt 失败"
msgid "%s: failed to set backing file"
msgstr "%s：设置后备文件失败"
-#: disk-utils/partx.c:131 sys-utils/losetup.c:581
+#: disk-utils/partx.c:131 sys-utils/losetup.c:585
#, c-format
msgid "%s: failed to set up loop device"
msgstr "%s：设置回环设备失败"
#: disk-utils/partx.c:161 login-utils/lslogins.c:320 misc-utils/fincore.c:92
-#: misc-utils/findmnt.c:376 misc-utils/lsblk.c:317 misc-utils/lslocks.c:344
-#: misc-utils/uuidparse.c:125 misc-utils/wipefs.c:132 sys-utils/irq-common.c:70
-#: sys-utils/losetup.c:112 sys-utils/lscpu.c:241 sys-utils/lscpu.c:256
-#: sys-utils/lsipc.c:232 sys-utils/lsmem.c:178 sys-utils/lsns.c:225
-#: sys-utils/prlimit.c:277 sys-utils/rfkill.c:159 sys-utils/swapon.c:150
-#: sys-utils/wdctl.c:161 sys-utils/zramctl.c:147
+#: misc-utils/findmnt.c:378 misc-utils/lsblk.c:324 misc-utils/lslocks.c:344
+#: misc-utils/uuidparse.c:125 misc-utils/wipefs.c:132
+#: sys-utils/irq-common.c:102 sys-utils/losetup.c:112 sys-utils/lscpu.c:193
+#: sys-utils/lscpu.c:208 sys-utils/lsipc.c:232 sys-utils/lsmem.c:178
+#: sys-utils/lsns.c:238 sys-utils/prlimit.c:280 sys-utils/rfkill.c:162
+#: sys-utils/swapon.c:150 sys-utils/wdctl.c:161 sys-utils/zramctl.c:147
#, c-format
msgid "unknown column: %s"
msgstr "未知列: %s"
msgid_plural "#%2d: %9ju-%9ju (%9ju sectors, %6ju MB)\n"
msgstr[0] "#%2d：%9ju-%9ju (%9ju 扇区%6ju MB)\n"
-#: disk-utils/partx.c:680 misc-utils/fincore.c:370 misc-utils/findmnt.c:1662
-#: misc-utils/lsblk.c:2122 misc-utils/lslocks.c:471 sys-utils/losetup.c:339
-#: sys-utils/lscpu.c:1683 sys-utils/lscpu.c:1911 sys-utils/prlimit.c:306
-#: sys-utils/rfkill.c:471 sys-utils/swapon.c:292 sys-utils/wdctl.c:310
+#: disk-utils/partx.c:680 misc-utils/fincore.c:370 misc-utils/findmnt.c:1690
+#: misc-utils/lsblk.c:2213 misc-utils/lslocks.c:471 sys-utils/losetup.c:339
+#: sys-utils/lscpu.c:586 sys-utils/lscpu.c:736 sys-utils/prlimit.c:309
+#: sys-utils/rfkill.c:477 sys-utils/swapon.c:305 sys-utils/wdctl.c:310
msgid "failed to allocate output column"
msgstr "分配输出列失败"
" -s, --show 列出分区\n"
"\n"
-#: disk-utils/partx.c:766 misc-utils/lsblk.c:1780 sys-utils/lsmem.c:515
+#: disk-utils/partx.c:766 misc-utils/lsblk.c:1858 sys-utils/lsmem.c:515
msgid " -b, --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
msgid " -n, --nr <n:m> specify the range of partitions (e.g. --nr 2:4)\n"
msgstr " -n, --nr <n:m> 指定分区范围(例如：--nr 2:4)\n"
-#: disk-utils/partx.c:769 sys-utils/irqtop.c:224 sys-utils/lsirq.c:66
+#: disk-utils/partx.c:769 sys-utils/irqtop.c:251 sys-utils/lsirq.c:66
msgid " -o, --output <list> define which output columns to use\n"
msgstr " -o, --output <列表> 定义使用哪个输出列\n"
msgid " --output-all output all columns\n"
msgstr " --output-all 输出所有列\n"
-#: disk-utils/partx.c:771 misc-utils/lsblk.c:1776 sys-utils/lsirq.c:64
+#: disk-utils/partx.c:771 misc-utils/lsblk.c:1854 sys-utils/lsirq.c:64
#: sys-utils/lsmem.c:513
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs 使用 key=“value” 输出格式\n"
-#: disk-utils/partx.c:772 misc-utils/lsblk.c:1791 sys-utils/lsmem.c:519
+#: disk-utils/partx.c:772 misc-utils/lsblk.c:1869 sys-utils/lsmem.c:519
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
msgid "failed to resize partition"
msgstr "调整分区大小失败"
-#: disk-utils/sfdisk.c:239
+#: disk-utils/sfdisk.c:241
msgid "failed to allocate nested libfdisk context"
msgstr "分配嵌套 libfdisk 环境(context)失败"
-#: disk-utils/sfdisk.c:299
+#: disk-utils/sfdisk.c:301
#, c-format
msgid "cannot seek %s"
msgstr "无法定位 %s"
-#: disk-utils/sfdisk.c:310 libfdisk/src/bsd.c:724 libfdisk/src/bsd.c:905
-#: term-utils/script.c:461
+#: disk-utils/sfdisk.c:312 libfdisk/src/bsd.c:724 libfdisk/src/bsd.c:905
+#: schedutils/uclampset.c:119 term-utils/script.c:462
#, c-format
msgid "cannot write %s"
msgstr "无法写 %s"
-#: disk-utils/sfdisk.c:317
+#: disk-utils/sfdisk.c:319
#, c-format
msgid "%12s (offset %5ju, size %5ju): %s"
msgstr "%12s (偏移 %5ju, 大小 %5ju): %s"
-#: disk-utils/sfdisk.c:323
+#: disk-utils/sfdisk.c:325
#, c-format
msgid "%s: failed to create a backup"
msgstr "%s：创建备份失败"
-#: disk-utils/sfdisk.c:336
+#: disk-utils/sfdisk.c:338
msgid "failed to create a backup file, $HOME undefined"
msgstr "创建备份失败，未定义 $HOME"
-#: disk-utils/sfdisk.c:362
+#: disk-utils/sfdisk.c:364
msgid "Backup files:"
msgstr "备份文件："
-#: disk-utils/sfdisk.c:408
+#: disk-utils/sfdisk.c:410
msgid "failed to read new partition from device; ignoring --move-data"
msgstr "从设备读取新分区失败；将忽略 --move-data"
-#: disk-utils/sfdisk.c:410
+#: disk-utils/sfdisk.c:412
msgid "failed to get size of the new partition; ignoring --move-data"
msgstr "获取新分区大小失败，将忽略 --move-data"
-#: disk-utils/sfdisk.c:412
+#: disk-utils/sfdisk.c:414
msgid "failed to get start of the new partition; ignoring --move-data"
msgstr "获取新分区起点失败，将忽略 --move-data"
-#: disk-utils/sfdisk.c:414
+#: disk-utils/sfdisk.c:416
msgid "failed to get size of the old partition; ignoring --move-data"
msgstr "获取新分区大小失败，将忽略 --move-data"
-#: disk-utils/sfdisk.c:416
+#: disk-utils/sfdisk.c:418
msgid "failed to get start of the old partition; ignoring --move-data"
msgstr "获取旧分区起点失败，将忽略 --move-data"
-#: disk-utils/sfdisk.c:418
+#: disk-utils/sfdisk.c:420
msgid "start of the partition has not been moved; ignoring --move-data"
msgstr "分区起点未移动；将忽略 --move-data"
-#: disk-utils/sfdisk.c:420
+#: disk-utils/sfdisk.c:422
msgid "new partition is smaller than original; ignoring --move-data"
msgstr "新分区小于原分区；将忽略 --move-data"
-#: disk-utils/sfdisk.c:471
+#: disk-utils/sfdisk.c:473
msgid "Data move: (--no-act)"
msgstr "数据移动︰（--no-act）"
-#: disk-utils/sfdisk.c:471
+#: disk-utils/sfdisk.c:473
msgid "Data move:"
msgstr "数据移动︰"
-#: disk-utils/sfdisk.c:474
+#: disk-utils/sfdisk.c:476
#, c-format
msgid " typescript file: %s"
msgstr "typescript 文件：%s"
-#: disk-utils/sfdisk.c:475
+#: disk-utils/sfdisk.c:477
#, c-format
msgid " start sector: (from/to) %ju / %ju\n"
msgstr ""
-#: disk-utils/sfdisk.c:476
+#: disk-utils/sfdisk.c:478
#, fuzzy, c-format
msgid " sectors: %ju\n"
msgstr "，%llu 个扇区\n"
-#: disk-utils/sfdisk.c:477
+#: disk-utils/sfdisk.c:479
#, fuzzy, c-format
msgid " step size: %zu bytes\n"
msgstr "获得字节大小"
-#: disk-utils/sfdisk.c:487
+#: disk-utils/sfdisk.c:489
msgid "Do you want to move partition data?"
msgstr "您想移动分区数据吗？"
-#: disk-utils/sfdisk.c:489 disk-utils/sfdisk.c:1975
+#: disk-utils/sfdisk.c:491 disk-utils/sfdisk.c:1988
msgid "Leaving."
msgstr "离开中。"
-#: disk-utils/sfdisk.c:549
+#: disk-utils/sfdisk.c:553
#, c-format
msgid "cannot read at offset: %zu; continue"
msgstr ""
-#: disk-utils/sfdisk.c:560
+#: disk-utils/sfdisk.c:564
#, c-format
msgid "cannot write at offset: %zu; continue"
msgstr ""
-#: disk-utils/sfdisk.c:589
+#: disk-utils/sfdisk.c:593
#, c-format
msgid "Moved %ju from %ju sectors (%.3f%%, %.1f MiB/s)."
msgstr ""
-#: disk-utils/sfdisk.c:594
+#: disk-utils/sfdisk.c:598
#, c-format
msgid "Moved %ju from %ju sectors (%.3f%%)."
msgstr ""
-#: disk-utils/sfdisk.c:612
+#: disk-utils/sfdisk.c:622
#, c-format
msgid "Moved %ju from %ju sectors (%.0f%%)."
msgstr ""
-#: disk-utils/sfdisk.c:626
+#: disk-utils/sfdisk.c:635
msgid "Your data has not been moved (--no-act)."
msgstr "您的数据未被移动（--no-act）。"
-#: disk-utils/sfdisk.c:628
+#: disk-utils/sfdisk.c:637
#, fuzzy, c-format
msgid "%zu I/O errors detected!"
msgstr "检测到 %d 个错误。"
-#: disk-utils/sfdisk.c:631
+#: disk-utils/sfdisk.c:640
#, c-format
msgid "%s: failed to move data"
msgstr "%s：移动数据失败"
-#: disk-utils/sfdisk.c:641
+#: disk-utils/sfdisk.c:652
msgid "The partition table is unchanged (--no-act)."
msgstr "分区表未更改(--no-act)。"
-#: disk-utils/sfdisk.c:649
+#: disk-utils/sfdisk.c:660
msgid ""
"\n"
"The partition table has been altered."
"\n"
"分区表已调整。"
-#: disk-utils/sfdisk.c:724
+#: disk-utils/sfdisk.c:735
#, c-format
msgid "unsupported label '%s'"
msgstr "不支持的标签：“%s”"
-#: disk-utils/sfdisk.c:727
+#: disk-utils/sfdisk.c:738
msgid ""
"Id Name\n"
"\n"
"Id 名称\n"
"\n"
-#: disk-utils/sfdisk.c:754
+#: disk-utils/sfdisk.c:765
msgid "unrecognized partition table type"
msgstr "未识别的分区表类型"
-#: disk-utils/sfdisk.c:807
+#: disk-utils/sfdisk.c:818
#, c-format
msgid "Cannot get size of %s"
msgstr "无法获得 %s 的大小"
-#: disk-utils/sfdisk.c:844
+#: disk-utils/sfdisk.c:855
#, c-format
msgid "total: %ju blocks\n"
msgstr "共计：%ju 个块\n"
-#: disk-utils/sfdisk.c:903 disk-utils/sfdisk.c:981 disk-utils/sfdisk.c:1018
-#: disk-utils/sfdisk.c:1043 disk-utils/sfdisk.c:1113 disk-utils/sfdisk.c:1180
-#: disk-utils/sfdisk.c:1235 disk-utils/sfdisk.c:1291 disk-utils/sfdisk.c:1344
-#: disk-utils/sfdisk.c:1382 disk-utils/sfdisk.c:1718
+#: disk-utils/sfdisk.c:914 disk-utils/sfdisk.c:992 disk-utils/sfdisk.c:1029
+#: disk-utils/sfdisk.c:1054 disk-utils/sfdisk.c:1124 disk-utils/sfdisk.c:1192
+#: disk-utils/sfdisk.c:1247 disk-utils/sfdisk.c:1303 disk-utils/sfdisk.c:1356
+#: disk-utils/sfdisk.c:1394 disk-utils/sfdisk.c:1730
msgid "no disk device specified"
msgstr "未指定磁盘设备"
-#: disk-utils/sfdisk.c:913
+#: disk-utils/sfdisk.c:924
msgid "toggle boot flags is unsupported for Hybrid GPT/MBR"
msgstr "混合 GPT/MBR 不支持切换启动（boot）标志"
-#: disk-utils/sfdisk.c:918
+#: disk-utils/sfdisk.c:929
msgid "cannot switch to PMBR"
msgstr "无法切换至 PMBR"
-#: disk-utils/sfdisk.c:919
+#: disk-utils/sfdisk.c:930
msgid "Activation is unsupported for GPT -- entering nested PMBR."
msgstr "GPT 不支持激活（Activation）-- 将进入嵌套 PMBR。"
-#: disk-utils/sfdisk.c:922
+#: disk-utils/sfdisk.c:933
msgid "toggle boot flags is supported for MBR or PMBR only"
msgstr "只支持为 MBR 或 PMBR 切换启动（boot）标志"
-#: disk-utils/sfdisk.c:954 disk-utils/sfdisk.c:997 disk-utils/sfdisk.c:1118
-#: disk-utils/sfdisk.c:1185 disk-utils/sfdisk.c:1240 disk-utils/sfdisk.c:1296
-#: disk-utils/sfdisk.c:1716 disk-utils/sfdisk.c:2240
+#: disk-utils/sfdisk.c:965 disk-utils/sfdisk.c:1008 disk-utils/sfdisk.c:1129
+#: disk-utils/sfdisk.c:1197 disk-utils/sfdisk.c:1252 disk-utils/sfdisk.c:1308
+#: disk-utils/sfdisk.c:1728 disk-utils/sfdisk.c:2254
msgid "failed to parse partition number"
msgstr "解析分区号失败"
-#: disk-utils/sfdisk.c:959
+#: disk-utils/sfdisk.c:970
#, c-format
msgid "%s: partition %d: failed to toggle bootable flag"
msgstr "%s：分区 %d：开/关启动标志失败"
-#: disk-utils/sfdisk.c:992 disk-utils/sfdisk.c:1000
+#: disk-utils/sfdisk.c:1003 disk-utils/sfdisk.c:1011
#, c-format
msgid "%s: partition %zu: failed to delete"
msgstr "%s：分区 %zu：删除失败"
-#: disk-utils/sfdisk.c:1048
+#: disk-utils/sfdisk.c:1059
#, c-format
msgid "%s: does not contain a recognized partition table"
msgstr "%s：不包含可识别的分区表"
-#: disk-utils/sfdisk.c:1052
+#: disk-utils/sfdisk.c:1063
msgid "failed to allocate dump struct"
msgstr "分配转储结构失败"
-#: disk-utils/sfdisk.c:1056
+#: disk-utils/sfdisk.c:1067
#, c-format
msgid "%s: failed to dump partition table"
msgstr "%s：转储分区表失败"
-#: disk-utils/sfdisk.c:1091
+#: disk-utils/sfdisk.c:1102
#, c-format
msgid "%s: no partition table found"
msgstr "%s：找不到分区表"
-#: disk-utils/sfdisk.c:1095
+#: disk-utils/sfdisk.c:1106
#, c-format
msgid "%s: partition %zu: partition table contains only %zu partitions"
msgstr "%s：分区 %zu：分区表中只包含 %zu 个分区"
-#: disk-utils/sfdisk.c:1098
+#: disk-utils/sfdisk.c:1109
#, c-format
msgid "%s: partition %zu: partition is unused"
msgstr "%s: 分区 %zu: 分区未使用"
-#: disk-utils/sfdisk.c:1117 disk-utils/sfdisk.c:1184 disk-utils/sfdisk.c:1239
-#: disk-utils/sfdisk.c:1295
+#: disk-utils/sfdisk.c:1128 disk-utils/sfdisk.c:1196 disk-utils/sfdisk.c:1251
+#: disk-utils/sfdisk.c:1307
msgid "no partition number specified"
msgstr "未指定分区号"
-#: disk-utils/sfdisk.c:1123 disk-utils/sfdisk.c:1190 disk-utils/sfdisk.c:1245
-#: disk-utils/sfdisk.c:1301 disk-utils/sfdisk.c:1350 disk-utils/sfdisk.c:1384
-#: sys-utils/losetup.c:778
+#: disk-utils/sfdisk.c:1134 disk-utils/sfdisk.c:1202 disk-utils/sfdisk.c:1257
+#: disk-utils/sfdisk.c:1313 disk-utils/sfdisk.c:1362 disk-utils/sfdisk.c:1396
+#: sys-utils/losetup.c:782
msgid "unexpected arguments"
msgstr "参数异常"
-#: disk-utils/sfdisk.c:1138
+#: disk-utils/sfdisk.c:1149
#, c-format
msgid "%s: partition %zu: failed to get partition type"
msgstr "%s: 分区 %zu:获取分区类型失败"
-#: disk-utils/sfdisk.c:1160
+#: disk-utils/sfdisk.c:1172
#, c-format
msgid "failed to parse %s partition type '%s'"
msgstr "解析 %s 的分区类型“%s”失败"
-#: disk-utils/sfdisk.c:1164
+#: disk-utils/sfdisk.c:1176
#, c-format
msgid "%s: partition %zu: failed to set partition type"
msgstr "%s: 分区 %zu: 设置分区类型失败"
-#: disk-utils/sfdisk.c:1202
+#: disk-utils/sfdisk.c:1214
#, c-format
msgid "%s: partition %zu: failed to get partition UUID"
msgstr "%s: 分区 %zu: 获取分区 UUID 失败"
-#: disk-utils/sfdisk.c:1215 disk-utils/sfdisk.c:1270 disk-utils/sfdisk.c:1324
+#: disk-utils/sfdisk.c:1227 disk-utils/sfdisk.c:1282 disk-utils/sfdisk.c:1336
msgid "failed to allocate partition object"
msgstr "分配分区对象失败"
-#: disk-utils/sfdisk.c:1219
+#: disk-utils/sfdisk.c:1231
#, c-format
msgid "%s: partition %zu: failed to set partition UUID"
msgstr "%s: 分区 %zu: 设置分区 UUID 失败"
-#: disk-utils/sfdisk.c:1257
+#: disk-utils/sfdisk.c:1269
#, c-format
msgid "%s: partition %zu: failed to get partition name"
msgstr "%s: 分区 %zu: 获取分区名失败"
-#: disk-utils/sfdisk.c:1274
+#: disk-utils/sfdisk.c:1286
#, c-format
msgid "%s: partition %zu: failed to set partition name"
msgstr "%s: 分区 %zu: 设置分区名失败"
-#: disk-utils/sfdisk.c:1328
+#: disk-utils/sfdisk.c:1340
#, c-format
msgid "%s: partition %zu: failed to set partition attributes"
msgstr "%s: 分区 %zu: 设置分区属性失败"
-#: disk-utils/sfdisk.c:1365
+#: disk-utils/sfdisk.c:1377
#, fuzzy, c-format
msgid "%s: failed to set disklabel ID"
msgstr "%s：无法定位到交换区标签 "
-#: disk-utils/sfdisk.c:1380
+#: disk-utils/sfdisk.c:1392
#, fuzzy
msgid "no relocate operation specified"
msgstr "未指定 --date 选项。"
-#: disk-utils/sfdisk.c:1394
+#: disk-utils/sfdisk.c:1406
#, fuzzy
msgid "unsupported relocation operation"
msgstr "不支持的参数格式：%s"
-#: disk-utils/sfdisk.c:1439
+#: disk-utils/sfdisk.c:1451
msgid " Commands:\n"
msgstr " 命令：\n"
-#: disk-utils/sfdisk.c:1441
+#: disk-utils/sfdisk.c:1453
msgid " write write table to disk and exit\n"
msgstr " write 将分区表写入磁盘并退出\n"
-#: disk-utils/sfdisk.c:1442
+#: disk-utils/sfdisk.c:1454
msgid " quit show new situation and wait for user's feedback before write\n"
msgstr " quit 显示新状况并等待用户反馈后再写入\n"
-#: disk-utils/sfdisk.c:1443
+#: disk-utils/sfdisk.c:1455
msgid " abort exit sfdisk shell\n"
msgstr " abort 退出 sfdisk shell\n"
-#: disk-utils/sfdisk.c:1444
+#: disk-utils/sfdisk.c:1456
msgid " print display the partition table\n"
msgstr " print 显示分区表\n"
-#: disk-utils/sfdisk.c:1445
+#: disk-utils/sfdisk.c:1457
msgid " help show this help text\n"
msgstr " help 显示帮助并退出\n"
-#: disk-utils/sfdisk.c:1447
+#: disk-utils/sfdisk.c:1459
msgid " Ctrl-D the same as 'quit'\n"
msgstr " Ctrl-D 同“quit”\n"
-#: disk-utils/sfdisk.c:1451
+#: disk-utils/sfdisk.c:1463
msgid " Input format:\n"
msgstr " 输入格式：\n"
-#: disk-utils/sfdisk.c:1453
+#: disk-utils/sfdisk.c:1465
msgid " <start>, <size>, <type>, <bootable>\n"
msgstr " <起点>, <大小>, <类型>, <可启动>\n"
-#: disk-utils/sfdisk.c:1456
+#: disk-utils/sfdisk.c:1468
msgid ""
" <start> Beginning of the partition in sectors, or bytes if\n"
" specified in the format <number>{K,M,G,T,P,E,Z,Y}.\n"
" <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n"
" 默认为第一处可用空间。\n"
-#: disk-utils/sfdisk.c:1461
+#: disk-utils/sfdisk.c:1473
msgid ""
" <size> Size of the partition in sectors, or bytes if\n"
" specified in the format <number>{K,M,G,T,P,E,Z,Y}.\n"
" <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n"
" 默认为所有可用空间。\n"
-#: disk-utils/sfdisk.c:1466
+#: disk-utils/sfdisk.c:1478
msgid " <type> The partition type. Default is a Linux data partition.\n"
msgstr " <类型> 分区类型。默认为 Linux 数据分区。\n"
-#: disk-utils/sfdisk.c:1467
+#: disk-utils/sfdisk.c:1479
#, fuzzy
msgid " MBR: hex or L,S,Ex,X,U,R,V shortcuts.\n"
msgstr " MBR：hex 或 L,S,E,X,U,R,V 快捷方式。\n"
-#: disk-utils/sfdisk.c:1468
+#: disk-utils/sfdisk.c:1480
msgid " GPT: UUID or L,S,H,U,R,V shortcuts.\n"
msgstr " GPT：UUID 或 L,S,H,U,R,V 快捷方式。\n"
-#: disk-utils/sfdisk.c:1471
+#: disk-utils/sfdisk.c:1483
msgid " <bootable> Use '*' to mark an MBR partition as bootable.\n"
msgstr " <可启动> 使用“*”将 MBR 分区标记为 可启动。\n"
-#: disk-utils/sfdisk.c:1475
+#: disk-utils/sfdisk.c:1487
msgid " Example:\n"
msgstr "示例：\n"
-#: disk-utils/sfdisk.c:1477
+#: disk-utils/sfdisk.c:1489
msgid " , 4G Creates a 4GiB partition at default start offset.\n"
msgstr " , 4G 在默认起始偏移位置创建一个 4GiB 分区。\n"
-#: disk-utils/sfdisk.c:1509 sys-utils/dmesg.c:1578
+#: disk-utils/sfdisk.c:1521 sys-utils/dmesg.c:1616
msgid "unsupported command"
msgstr "不支持的命令"
-#: disk-utils/sfdisk.c:1511
+#: disk-utils/sfdisk.c:1523
#, c-format
msgid "line %d: unsupported command"
msgstr "第 %d 行：不支持的命令"
-#: disk-utils/sfdisk.c:1630
+#: disk-utils/sfdisk.c:1642
#, fuzzy, c-format
-msgid "The device contains '%s' signature and it will be removed by a write command. See sfdisk(8) man page and --wipe option for more details."
+msgid "The device contains '%s' signature and it may be removed by a write command. See sfdisk(8) man page and --wipe option for more details."
msgstr "设备已包含一个 %s 签名；写入命令会将其移除。"
-#: disk-utils/sfdisk.c:1637
+#: disk-utils/sfdisk.c:1649
#, fuzzy, c-format
msgid "The device contains '%s' signature and it may remain on the device. It is recommended to wipe the device with wipefs(8) or sfdisk --wipe, in order to avoid possible collisions."
msgstr "旧签名 %s 可能仍然在设备上存留。建议您使用 wipefs(8) 或者 fdisk --wipe 来擦除该设备，以避免潜在的冲突。"
-#: disk-utils/sfdisk.c:1685
+#: disk-utils/sfdisk.c:1697
msgid "failed to allocate partition name"
msgstr "分配分区名失败"
-#: disk-utils/sfdisk.c:1724
+#: disk-utils/sfdisk.c:1736
msgid "failed to allocate script handler"
msgstr "分配脚本处理程序失败"
-#: disk-utils/sfdisk.c:1740
+#: disk-utils/sfdisk.c:1752
#, c-format
msgid "%s: cannot modify partition %d: no partition table was found"
msgstr "%s：无法修改分区 %d：未找到分区表"
-#: disk-utils/sfdisk.c:1745
+#: disk-utils/sfdisk.c:1757
#, c-format
msgid "%s: cannot modify partition %d: partition table contains only %zu partitions"
msgstr "%s: 无法修改分区 %d: 分区表只包含 %zu 个分区"
-#: disk-utils/sfdisk.c:1751
+#: disk-utils/sfdisk.c:1763
#, c-format
msgid "warning: %s: partition %d is not defined yet"
msgstr "警告：%s: 分区 %d 尚未定义"
-#: disk-utils/sfdisk.c:1769
+#: disk-utils/sfdisk.c:1781
#, c-format
msgid ""
"\n"
"\n"
"欢迎使用 sfdisk (%s)。"
-#: disk-utils/sfdisk.c:1777
+#: disk-utils/sfdisk.c:1789
msgid "Checking that no-one is using this disk right now ..."
msgstr "请检查现在是不是有人在使用此磁盘..."
-#: disk-utils/sfdisk.c:1780
+#: disk-utils/sfdisk.c:1792
msgid ""
" FAILED\n"
"\n"
" 失败\n"
"\n"
-#: disk-utils/sfdisk.c:1783
+#: disk-utils/sfdisk.c:1795
msgid ""
"This disk is currently in use - repartitioning is probably a bad idea.\n"
"Umount all file systems, and swapoff all swap partitions on this disk.\n"
"请卸载此磁盘上所有的文件系统，并关闭(swapoff)上面的交换分区。\n"
"可使用 --no-reread 标志阻止此检查。\n"
-#: disk-utils/sfdisk.c:1788
+#: disk-utils/sfdisk.c:1800
msgid "Use the --force flag to overrule all checks."
msgstr "使用 --force 标志否决所有检查。"
-#: disk-utils/sfdisk.c:1790
+#: disk-utils/sfdisk.c:1802
msgid ""
" OK\n"
"\n"
" 好的\n"
"\n"
-#: disk-utils/sfdisk.c:1799
+#: disk-utils/sfdisk.c:1811
msgid ""
"\n"
"Old situation:"
"\n"
"旧状况："
-#: disk-utils/sfdisk.c:1812
+#: disk-utils/sfdisk.c:1824
#, fuzzy
msgid "failed to set script header"
msgstr "分配脚本处理程序失败"
-#: disk-utils/sfdisk.c:1817
+#: disk-utils/sfdisk.c:1829
#, c-format
msgid ""
"\n"
"sfdisk 即将创建一个新的磁盘标签“%s”。\n"
"在定义第一个分区之前使用“label: <名字>”可覆盖默认值。"
-#: disk-utils/sfdisk.c:1820
+#: disk-utils/sfdisk.c:1832
msgid ""
"\n"
"Type 'help' to get more information.\n"
"\n"
"请执行“%s --help”了解更多信息。\n"
-#: disk-utils/sfdisk.c:1838
+#: disk-utils/sfdisk.c:1850
msgid "All partitions used."
msgstr "所有分区均已使用。"
-#: disk-utils/sfdisk.c:1858
+#: disk-utils/sfdisk.c:1870
#, c-format
msgid "Unknown script header '%s' -- ignore."
msgstr ""
-#: disk-utils/sfdisk.c:1874
+#: disk-utils/sfdisk.c:1886
msgid "Done.\n"
msgstr "完成。\n"
-#: disk-utils/sfdisk.c:1886
+#: disk-utils/sfdisk.c:1898
msgid "Ignoring partition."
msgstr "忽略分区。"
-#: disk-utils/sfdisk.c:1895 disk-utils/sfdisk.c:1956
-msgid "Failed to apply script headers, disk label not created."
+#: disk-utils/sfdisk.c:1908
+#, fuzzy
+msgid "Failed to apply script headers, disk label not created"
msgstr "无法应用脚本标头(header)，未创建磁盘标签。"
-#: disk-utils/sfdisk.c:1916
+#: disk-utils/sfdisk.c:1929
#, c-format
msgid "Failed to add #%d partition"
msgstr "添加 #%d 分区失败"
-#: disk-utils/sfdisk.c:1939
+#: disk-utils/sfdisk.c:1952
msgid "Script header accepted."
msgstr "已接受脚本标头(header)。"
-#: disk-utils/sfdisk.c:1963
+#: disk-utils/sfdisk.c:1969
+msgid "Failed to apply script headers, disk label not created."
+msgstr "无法应用脚本标头(header)，未创建磁盘标签。"
+
+#: disk-utils/sfdisk.c:1976
msgid ""
"\n"
"New situation:"
"\n"
"新状况："
-#: disk-utils/sfdisk.c:1973
+#: disk-utils/sfdisk.c:1986
msgid "Do you want to write this to disk?"
msgstr "您想写入该磁盘吗？"
-#: disk-utils/sfdisk.c:1986
+#: disk-utils/sfdisk.c:1999
msgid "Leaving.\n"
msgstr "离开中。\n"
-#: disk-utils/sfdisk.c:2001
+#: disk-utils/sfdisk.c:2014
#, c-format
msgid ""
" %1$s [options] <dev> [[-N] <part>]\n"
" %1$s [选项] <设备> [[-N] <分区>]\n"
" %1$s [选项] <命令>\n"
-#: disk-utils/sfdisk.c:2008
+#: disk-utils/sfdisk.c:2021
msgid " -A, --activate <dev> [<part> ...] list or set bootable (P)MBR partitions\n"
msgstr " -A, --activate <设备> [<分区> ...] 列出或设置可启动的 (P)MBR 分区\n"
-#: disk-utils/sfdisk.c:2009
+#: disk-utils/sfdisk.c:2022
msgid " -d, --dump <dev> dump partition table (usable for later input)\n"
msgstr " -d, --dump <设备> 转储分区表(用于后续输入)\n"
-#: disk-utils/sfdisk.c:2010
+#: disk-utils/sfdisk.c:2023
msgid " -J, --json <dev> dump partition table in JSON format\n"
msgstr " -J, --json <设备> 以 JSON 格式转储分区表\n"
-#: disk-utils/sfdisk.c:2011
+#: disk-utils/sfdisk.c:2024
msgid " -g, --show-geometry [<dev> ...] list geometry of all or specified devices\n"
msgstr " -g, --show-geometry [<设备> ...] 列出所有或指定设备的几何属性\n"
-#: disk-utils/sfdisk.c:2012
+#: disk-utils/sfdisk.c:2025
msgid " -l, --list [<dev> ...] list partitions of each device\n"
msgstr " -l, --list [<设备> ...] 列出每台设备上的分区\n"
-#: disk-utils/sfdisk.c:2013
+#: disk-utils/sfdisk.c:2026
msgid " -F, --list-free [<dev> ...] list unpartitioned free areas of each device\n"
msgstr " -F, --list-free [<设备> ...] 列出每台设备上的未分区空间\n"
-#: disk-utils/sfdisk.c:2014
+#: disk-utils/sfdisk.c:2027
msgid " -r, --reorder <dev> fix partitions order (by start offset)\n"
msgstr " -r, --reorder <设备> (通过起始偏移量)修复分区顺序\n"
-#: disk-utils/sfdisk.c:2015
+#: disk-utils/sfdisk.c:2028
msgid " -s, --show-size [<dev> ...] list sizes of all or specified devices\n"
msgstr " -s, --show-size [<设备> ...] 列出所有或指定设备的大小\n"
-#: disk-utils/sfdisk.c:2016
+#: disk-utils/sfdisk.c:2029
msgid " -T, --list-types print the recognized types (see -X)\n"
msgstr " -T, --list-types 打印识别的类型(见 -X)\n"
-#: disk-utils/sfdisk.c:2017
+#: disk-utils/sfdisk.c:2030
msgid " -V, --verify [<dev> ...] test whether partitions seem correct\n"
msgstr " -V, --verify [<设备> ...] 测试分区是否正确\n"
-#: disk-utils/sfdisk.c:2018
+#: disk-utils/sfdisk.c:2031
msgid " --delete <dev> [<part> ...] delete all or specified partitions\n"
msgstr " --delete <设备> [<分区> ...] 删除所有或指定分区\n"
-#: disk-utils/sfdisk.c:2021
+#: disk-utils/sfdisk.c:2034
msgid " --part-label <dev> <part> [<str>] print or change partition label\n"
msgstr " --part-label <设备> <分区> [<字符串>] 打印或更改分区标签\n"
-#: disk-utils/sfdisk.c:2022
+#: disk-utils/sfdisk.c:2035
msgid " --part-type <dev> <part> [<type>] print or change partition type\n"
msgstr " --part-type <设备> <分区> [<类型>] 打印或更改分区类型\n"
-#: disk-utils/sfdisk.c:2023
+#: disk-utils/sfdisk.c:2036
msgid " --part-uuid <dev> <part> [<uuid>] print or change partition uuid\n"
msgstr " --part-uuid <设备> <分区> [<uuid>] 打印或更改分区 uuid\n"
-#: disk-utils/sfdisk.c:2024
+#: disk-utils/sfdisk.c:2037
msgid " --part-attrs <dev> <part> [<str>] print or change partition attributes\n"
msgstr " --part-attrs <设备> <分区> [<字符串>] 打印或更改分区属性\n"
-#: disk-utils/sfdisk.c:2027
+#: disk-utils/sfdisk.c:2040
#, fuzzy
msgid " --disk-id <dev> [<str>] print or change disk label ID (UUID)\n"
msgstr " --part-label <设备> <分区> [<字符串>] 打印或更改分区标签\n"
-#: disk-utils/sfdisk.c:2028
+#: disk-utils/sfdisk.c:2041
#, fuzzy
msgid " --relocate <oper> <dev> move partition header\n"
msgstr " -l, --list [<设备> ...] 列出每台设备上的分区\n"
-#: disk-utils/sfdisk.c:2031
+#: disk-utils/sfdisk.c:2044
msgid " <dev> device (usually disk) path\n"
msgstr " <设备> 设备(通常是磁盘)的路径\n"
-#: disk-utils/sfdisk.c:2032
+#: disk-utils/sfdisk.c:2045
msgid " <part> partition number\n"
msgstr " <分区> 分区号\n"
-#: disk-utils/sfdisk.c:2033
+#: disk-utils/sfdisk.c:2046
msgid " <type> partition type, GUID for GPT, hex for MBR\n"
msgstr " <类型> 分区类型，GUID 对应 GPT，hex 对应 MBR\n"
-#: disk-utils/sfdisk.c:2036
+#: disk-utils/sfdisk.c:2049
msgid " -a, --append append partitions to existing partition table\n"
msgstr " -a, --append 将分区附加到已有分区表\n"
-#: disk-utils/sfdisk.c:2037
+#: disk-utils/sfdisk.c:2050
msgid " -b, --backup backup partition table sectors (see -O)\n"
msgstr " -b, --backup 备份分区表扇区(见 -O)\n"
-#: disk-utils/sfdisk.c:2038
+#: disk-utils/sfdisk.c:2051
msgid " --bytes print SIZE in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印 SIZE\n"
-#: disk-utils/sfdisk.c:2039
+#: disk-utils/sfdisk.c:2052
msgid " --move-data[=<typescript>] move partition data after relocation (requires -N)\n"
msgstr " --move-data[=<typescript>] 重新定位后移动分区数据(需要 -N)\n"
-#: disk-utils/sfdisk.c:2040
+#: disk-utils/sfdisk.c:2053
msgid " --move-use-fsync use fsync after each write when move data\n"
msgstr " --move-use-fsync 移动数据每次写入后调用 fsync\n"
-#: disk-utils/sfdisk.c:2041
+#: disk-utils/sfdisk.c:2054
msgid " -f, --force disable all consistency checking\n"
msgstr " -f, --force 禁用所有的一致性检查\n"
-#: disk-utils/sfdisk.c:2044
+#: disk-utils/sfdisk.c:2057
#, c-format
msgid " --color[=<when>] colorize output (%s, %s or %s)\n"
msgstr " --color[=<何时>] 彩色输出（%s, %s 或 %s）\n"
-#: disk-utils/sfdisk.c:2049
+#: disk-utils/sfdisk.c:2062
msgid " -N, --partno <num> specify partition number\n"
msgstr " -N, --partno <数字> 指定分区号\n"
-#: disk-utils/sfdisk.c:2050
+#: disk-utils/sfdisk.c:2063
msgid " -n, --no-act do everything except write to device\n"
msgstr " -n, --no-act 不真正执行写入设备\n"
-#: disk-utils/sfdisk.c:2051
+#: disk-utils/sfdisk.c:2064
msgid " --no-reread do not check whether the device is in use\n"
msgstr " --no-reread 不检查设备是否正在使用\n"
-#: disk-utils/sfdisk.c:2052
+#: disk-utils/sfdisk.c:2065
msgid " --no-tell-kernel do not tell kernel about changes\n"
msgstr " --no-tell-kernel 更改而不告诉内核\n"
-#: disk-utils/sfdisk.c:2053
+#: disk-utils/sfdisk.c:2066
msgid " -O, --backup-file <path> override default backup file name\n"
msgstr " -O, --backup-file <路径> 覆盖默认的备份文件名\n"
-#: disk-utils/sfdisk.c:2054
+#: disk-utils/sfdisk.c:2067
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: disk-utils/sfdisk.c:2055
+#: disk-utils/sfdisk.c:2068
msgid " -q, --quiet suppress extra info messages\n"
msgstr " -q, --quiet 禁止输出额外信息\n"
-#: disk-utils/sfdisk.c:2057
+#: disk-utils/sfdisk.c:2070
#, c-format
msgid " -w, --wipe <mode> wipe signatures (%s, %s or %s)\n"
msgstr " -w, --wipe <模式> 擦除签名（%s, %s 或 %s）\n"
-#: disk-utils/sfdisk.c:2060
+#: disk-utils/sfdisk.c:2073
msgid " -X, --label <name> specify label type (dos, gpt, ...)\n"
msgstr " -X, --label <名称> 指定标签类型(dos, gpt, ...)\n"
-#: disk-utils/sfdisk.c:2061
+#: disk-utils/sfdisk.c:2074
msgid " -Y, --label-nested <name> specify nested label type (dos, bsd)\n"
msgstr " -Y, --label-nested <名称> 指定嵌套标签类型(dos, bsd)\n"
-#: disk-utils/sfdisk.c:2063
+#: disk-utils/sfdisk.c:2076
msgid " -G, --show-pt-geometry deprecated, alias to --show-geometry\n"
msgstr " -G, --show-pt-geometry 已废弃，同 --show-geometry\n"
-#: disk-utils/sfdisk.c:2064
+#: disk-utils/sfdisk.c:2077
msgid " -L, --Linux deprecated, only for backward compatibility\n"
msgstr " -L, --Linux 已废弃，仅为向后兼容\n"
-#: disk-utils/sfdisk.c:2065
+#: disk-utils/sfdisk.c:2078
msgid " -u, --unit S deprecated, only sector unit is supported\n"
msgstr " -u, --unit S 已废弃，只支持扇区单位\n"
-#: disk-utils/sfdisk.c:2194
+#: disk-utils/sfdisk.c:2208
#, c-format
msgid "%s is deprecated in favour of --part-type"
msgstr "%s 已废弃，请改用 --part-type"
-#: disk-utils/sfdisk.c:2199
+#: disk-utils/sfdisk.c:2213
msgid "--id is deprecated in favour of --part-type"
msgstr "--id 已废弃，请改用 --part-type"
-#: disk-utils/sfdisk.c:2215
+#: disk-utils/sfdisk.c:2229
msgid "--show-pt-geometry is no more implemented. Using --show-geometry."
msgstr "--show-pt-geometry 不再实现。请使用 --show-geometry。"
-#: disk-utils/sfdisk.c:2227
+#: disk-utils/sfdisk.c:2241
msgid "--Linux option is unnecessary and deprecated"
msgstr "--Linux 选项没必要，并且已废弃"
-#: disk-utils/sfdisk.c:2256
+#: disk-utils/sfdisk.c:2270
#, c-format
msgid "unsupported unit '%c'"
msgstr "不支持的单位“%c”"
-#: disk-utils/sfdisk.c:2351
+#: disk-utils/sfdisk.c:2365
msgid "--movedata requires -N"
msgstr "--movedata 需要 -N"
msgid "ignore -U (UUIDs are unsupported)"
msgstr "忽略 -U (不支持 UUID)"
-#: include/c.h:245
+#: include/c.h:260
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "请尝试执行“%s --help”了解更多信息。\n"
-#: include/c.h:349
+#: include/c.h:364
msgid ""
"\n"
"Usage:\n"
"\n"
"用法：\n"
-#: include/c.h:350
+#: include/c.h:365
msgid ""
"\n"
"Options:\n"
"\n"
"选项：\n"
-#: include/c.h:351
+#: include/c.h:366
msgid ""
"\n"
"Functions:\n"
"\n"
"功能：\n"
-#: include/c.h:352
+#: include/c.h:367
msgid ""
"\n"
"Commands:\n"
"\n"
"命令：\n"
-#: include/c.h:353
+#: include/c.h:368
#, fuzzy
msgid ""
"\n"
"Arguments:\n"
msgstr "参数错误"
-#: include/c.h:354
+#: include/c.h:369
msgid ""
"\n"
"Available output columns:\n"
"\n"
"可用的输出列：\n"
-#: include/c.h:357
+#: include/c.h:372
msgid "display this help"
msgstr "显示此帮助"
-#: include/c.h:358
+#: include/c.h:373
msgid "display version"
msgstr "显示版本"
-#: include/c.h:368
+#: include/c.h:383
#, c-format
msgid ""
" %s arguments may be followed by the suffixes for\n"
" GiB, TiB, PiB, EiB, ZiB, and YiB (the \"iB\" is optional)\n"
msgstr ""
-#: include/c.h:371
+#: include/c.h:386
#, c-format
msgid ""
"\n"
"\n"
"更多信息请参阅 %s。\n"
-#: include/c.h:373
+#: include/c.h:388
#, c-format
msgid "%s from %s\n"
msgstr "%s，来自 %s\n"
-#: include/closestream.h:70 include/closestream.h:72 login-utils/vipw.c:276
-#: login-utils/vipw.c:295 sys-utils/rtcwake.c:304 term-utils/setterm.c:833
-#: text-utils/col.c:160
+#: include/closestream.h:70 include/closestream.h:72 login-utils/vipw.c:265
+#: login-utils/vipw.c:284 sys-utils/rtcwake.c:304 term-utils/setterm.c:833
msgid "write error"
msgstr "写出错"
msgid "colors are disabled by default"
msgstr "默认禁用颜色"
-#: include/env.h:18 lib/pager.c:153 login-utils/login.c:1102
-#: login-utils/login.c:1106 term-utils/agetty.c:1203
+#: include/env.h:25 lib/pager.c:153 login-utils/login.c:1192
+#: login-utils/login.c:1196 term-utils/agetty.c:1207
#, c-format
msgid "failed to set the %s environment variable"
msgstr "设置环境变量 %s 失败"
msgstr "Linux root (x86)"
#: include/pt-gpt-partnames.h:53
-msgid "Linux root (ARM)"
-msgstr "Linux root (ARM)"
-
-#: include/pt-gpt-partnames.h:54
msgid "Linux root (x86-64)"
msgstr "Linux root (x86-64)"
+#: include/pt-gpt-partnames.h:54
+msgid "Linux root (ARM)"
+msgstr "Linux root (ARM)"
+
#: include/pt-gpt-partnames.h:55
msgid "Linux root (ARM-64)"
msgstr "Linux root (ARM-64)"
#: include/pt-gpt-partnames.h:63
#, fuzzy
-msgid "Linux root verity (x86)"
+msgid "Linux /usr (x86)"
msgstr "Linux root (x86)"
#: include/pt-gpt-partnames.h:64
#, fuzzy
-msgid "Linux root verity (ARM)"
-msgstr "Linux root (ARM)"
+msgid "Linux /usr (x86-64)"
+msgstr "Linux root (x86-64)"
#: include/pt-gpt-partnames.h:65
#, fuzzy
+msgid "Linux /usr (ARM)"
+msgstr "Linux root (ARM)"
+
+#: include/pt-gpt-partnames.h:66
+#, fuzzy
+msgid "Linux /usr (ARM-64)"
+msgstr "Linux root (ARM-64)"
+
+#: include/pt-gpt-partnames.h:67
+#, fuzzy
+msgid "Linux /usr (IA-64)"
+msgstr "Linux root\t(IA-64)"
+
+#: include/pt-gpt-partnames.h:68
+#, fuzzy
+msgid "Linux root verity (x86)"
+msgstr "Linux root (x86)"
+
+#: include/pt-gpt-partnames.h:69
+#, fuzzy
msgid "Linux root verity (x86-64)"
msgstr "Linux root (x86-64)"
-#: include/pt-gpt-partnames.h:66
+#: include/pt-gpt-partnames.h:70
+#, fuzzy
+msgid "Linux root verity (ARM)"
+msgstr "Linux root (ARM)"
+
+#: include/pt-gpt-partnames.h:71
#, fuzzy
msgid "Linux root verity (ARM-64)"
msgstr "Linux root (ARM-64)"
-#: include/pt-gpt-partnames.h:67
+#: include/pt-gpt-partnames.h:72
#, fuzzy
msgid "Linux root verity (IA-64)"
msgstr "Linux root\t(IA-64)"
-#: include/pt-gpt-partnames.h:73 include/pt-mbr-partnames.h:95
+#: include/pt-gpt-partnames.h:73
+#, fuzzy
+msgid "Linux /usr verity (x86)"
+msgstr "Linux root (x86)"
+
+#: include/pt-gpt-partnames.h:74
+#, fuzzy
+msgid "Linux /usr verity (x86-64)"
+msgstr "Linux root (x86-64)"
+
+#: include/pt-gpt-partnames.h:75
+#, fuzzy
+msgid "Linux /usr verity (ARM)"
+msgstr "Linux root (ARM)"
+
+#: include/pt-gpt-partnames.h:76
+#, fuzzy
+msgid "Linux /usr verity (ARM-64)"
+msgstr "Linux root (ARM-64)"
+
+#: include/pt-gpt-partnames.h:77
+#, fuzzy
+msgid "Linux /usr verity (IA-64)"
+msgstr "Linux root\t(IA-64)"
+
+#: include/pt-gpt-partnames.h:83 include/pt-mbr-partnames.h:95
msgid "Linux extended boot"
msgstr "Linux 扩展启动"
-#: include/pt-gpt-partnames.h:76
+#: include/pt-gpt-partnames.h:86
+#, fuzzy
+msgid "Linux user's home"
+msgstr "Linux home"
+
+#: include/pt-gpt-partnames.h:89
msgid "FreeBSD data"
msgstr "FreeBSD 数据"
-#: include/pt-gpt-partnames.h:77
+#: include/pt-gpt-partnames.h:90
msgid "FreeBSD boot"
msgstr "FreeBSD 启动"
-#: include/pt-gpt-partnames.h:78
+#: include/pt-gpt-partnames.h:91
msgid "FreeBSD swap"
msgstr "FreeBSD 交换"
-#: include/pt-gpt-partnames.h:79
+#: include/pt-gpt-partnames.h:92
msgid "FreeBSD UFS"
msgstr "FreeBSD UFS"
-#: include/pt-gpt-partnames.h:80
+#: include/pt-gpt-partnames.h:93
msgid "FreeBSD ZFS"
msgstr "FreeBSD ZFS"
-#: include/pt-gpt-partnames.h:81
+#: include/pt-gpt-partnames.h:94
msgid "FreeBSD Vinum"
msgstr "FreeBSD Vinum"
-#: include/pt-gpt-partnames.h:84
+#: include/pt-gpt-partnames.h:97
msgid "Apple HFS/HFS+"
msgstr "Apple HFS/HFS+"
-#: include/pt-gpt-partnames.h:85
+#: include/pt-gpt-partnames.h:98
msgid "Apple APFS"
msgstr "Apple APFS"
-#: include/pt-gpt-partnames.h:86
+#: include/pt-gpt-partnames.h:99
msgid "Apple UFS"
msgstr "Apple UFS"
-#: include/pt-gpt-partnames.h:87
+#: include/pt-gpt-partnames.h:100
msgid "Apple RAID"
msgstr "Apple RAID"
-#: include/pt-gpt-partnames.h:88
+#: include/pt-gpt-partnames.h:101
msgid "Apple RAID offline"
msgstr "Apple RAID 离线"
-#: include/pt-gpt-partnames.h:89
+#: include/pt-gpt-partnames.h:102
msgid "Apple boot"
msgstr "Apple 启动"
-#: include/pt-gpt-partnames.h:90
+#: include/pt-gpt-partnames.h:103
msgid "Apple label"
msgstr "Apple 标签"
-#: include/pt-gpt-partnames.h:91
+#: include/pt-gpt-partnames.h:104
msgid "Apple TV recovery"
msgstr "Apple TV 恢复"
-#: include/pt-gpt-partnames.h:92
+#: include/pt-gpt-partnames.h:105
msgid "Apple Core storage"
msgstr "Apple Core 存储"
-#: include/pt-gpt-partnames.h:95 include/pt-mbr-partnames.h:77
+#: include/pt-gpt-partnames.h:108 include/pt-mbr-partnames.h:77
msgid "Solaris boot"
msgstr "Solaris 启动"
-#: include/pt-gpt-partnames.h:96
+#: include/pt-gpt-partnames.h:109
msgid "Solaris root"
msgstr "Solaris root"
-#: include/pt-gpt-partnames.h:98
+#: include/pt-gpt-partnames.h:111
msgid "Solaris /usr & Apple ZFS"
msgstr "Solaris /usr & Apple ZFS"
-#: include/pt-gpt-partnames.h:99
+#: include/pt-gpt-partnames.h:112
msgid "Solaris swap"
msgstr "Solaris 交换"
-#: include/pt-gpt-partnames.h:100
+#: include/pt-gpt-partnames.h:113
msgid "Solaris backup"
msgstr "Solaris 备份"
-#: include/pt-gpt-partnames.h:101
+#: include/pt-gpt-partnames.h:114
msgid "Solaris /var"
msgstr "Solaris /var"
-#: include/pt-gpt-partnames.h:102
+#: include/pt-gpt-partnames.h:115
msgid "Solaris /home"
msgstr "Solaris /home"
-#: include/pt-gpt-partnames.h:103
+#: include/pt-gpt-partnames.h:116
msgid "Solaris alternate sector"
msgstr "Solaris 备选扇区"
-#: include/pt-gpt-partnames.h:104
+#: include/pt-gpt-partnames.h:117
msgid "Solaris reserved 1"
msgstr "Solaris 保留 1"
-#: include/pt-gpt-partnames.h:105
+#: include/pt-gpt-partnames.h:118
msgid "Solaris reserved 2"
msgstr "Solaris 保留 2"
-#: include/pt-gpt-partnames.h:106
+#: include/pt-gpt-partnames.h:119
msgid "Solaris reserved 3"
msgstr "Solaris 保留 3"
-#: include/pt-gpt-partnames.h:107
+#: include/pt-gpt-partnames.h:120
msgid "Solaris reserved 4"
msgstr "Solaris 保留 4"
-#: include/pt-gpt-partnames.h:108
+#: include/pt-gpt-partnames.h:121
msgid "Solaris reserved 5"
msgstr "Solaris 保留 5"
-#: include/pt-gpt-partnames.h:111
+#: include/pt-gpt-partnames.h:124
msgid "NetBSD swap"
msgstr "NetBSD 交换"
-#: include/pt-gpt-partnames.h:112
+#: include/pt-gpt-partnames.h:125
msgid "NetBSD FFS"
msgstr "NetBSD FFS"
-#: include/pt-gpt-partnames.h:113
+#: include/pt-gpt-partnames.h:126
msgid "NetBSD LFS"
msgstr "NetBSD LFS"
-#: include/pt-gpt-partnames.h:114
+#: include/pt-gpt-partnames.h:127
msgid "NetBSD concatenated"
msgstr "NetBSD concatenated"
-#: include/pt-gpt-partnames.h:115
+#: include/pt-gpt-partnames.h:128
msgid "NetBSD encrypted"
msgstr "NetBSD 加密"
-#: include/pt-gpt-partnames.h:116
+#: include/pt-gpt-partnames.h:129
msgid "NetBSD RAID"
msgstr "NetBSD RAID"
-#: include/pt-gpt-partnames.h:119
+#: include/pt-gpt-partnames.h:132
msgid "ChromeOS kernel"
msgstr "ChromeOS 内核"
-#: include/pt-gpt-partnames.h:120
+#: include/pt-gpt-partnames.h:133
msgid "ChromeOS root fs"
msgstr "ChromeOS 根文件系统"
-#: include/pt-gpt-partnames.h:121
+#: include/pt-gpt-partnames.h:134
msgid "ChromeOS reserved"
msgstr "ChromeOS 保留"
-#: include/pt-gpt-partnames.h:124
+#: include/pt-gpt-partnames.h:137
msgid "MidnightBSD data"
msgstr "MidnightBSD 数据"
-#: include/pt-gpt-partnames.h:125
+#: include/pt-gpt-partnames.h:138
msgid "MidnightBSD boot"
msgstr "MidnightBSD 启动"
-#: include/pt-gpt-partnames.h:126
+#: include/pt-gpt-partnames.h:139
msgid "MidnightBSD swap"
msgstr "MidnightBSD 交换"
-#: include/pt-gpt-partnames.h:127
+#: include/pt-gpt-partnames.h:140
msgid "MidnightBSD UFS"
msgstr "MidnightBSD UFS"
-#: include/pt-gpt-partnames.h:128
+#: include/pt-gpt-partnames.h:141
msgid "MidnightBSD ZFS"
msgstr "MidnightBSD ZFS"
-#: include/pt-gpt-partnames.h:129
+#: include/pt-gpt-partnames.h:142
msgid "MidnightBSD Vinum"
msgstr "MidnightBSD Vinum"
-#: include/pt-gpt-partnames.h:132
+#: include/pt-gpt-partnames.h:145
msgid "Ceph Journal"
msgstr "Ceph 日志"
-#: include/pt-gpt-partnames.h:133
+#: include/pt-gpt-partnames.h:146
msgid "Ceph Encrypted Journal"
msgstr "Ceph 加密日志"
-#: include/pt-gpt-partnames.h:134
+#: include/pt-gpt-partnames.h:147
msgid "Ceph OSD"
msgstr "Ceph OSD"
-#: include/pt-gpt-partnames.h:135
+#: include/pt-gpt-partnames.h:148
msgid "Ceph crypt OSD"
msgstr "Ceph 加密 OSD"
-#: include/pt-gpt-partnames.h:136
+#: include/pt-gpt-partnames.h:149
msgid "Ceph disk in creation"
msgstr "创建中的 Ceph 磁盘"
-#: include/pt-gpt-partnames.h:137
+#: include/pt-gpt-partnames.h:150
msgid "Ceph crypt disk in creation"
msgstr "创建中的加密 Ceph 磁盘"
-#: include/pt-gpt-partnames.h:140 include/pt-mbr-partnames.h:104
+#: include/pt-gpt-partnames.h:153 include/pt-mbr-partnames.h:104
msgid "VMware VMFS"
msgstr "VMware VMFS"
-#: include/pt-gpt-partnames.h:141
+#: include/pt-gpt-partnames.h:154
msgid "VMware Diagnostic"
msgstr "VMware 诊断"
-#: include/pt-gpt-partnames.h:142
+#: include/pt-gpt-partnames.h:155
#, fuzzy
msgid "VMware Virtual SAN"
msgstr "VMware VMFS"
-#: include/pt-gpt-partnames.h:143
+#: include/pt-gpt-partnames.h:156
#, fuzzy
msgid "VMware Virsto"
msgstr "VMware VMFS"
-#: include/pt-gpt-partnames.h:144
+#: include/pt-gpt-partnames.h:157
msgid "VMware Reserved"
msgstr "VMware 保留"
-#: include/pt-gpt-partnames.h:147
+#: include/pt-gpt-partnames.h:160
msgid "OpenBSD data"
msgstr "OpenBSD 数据"
-#: include/pt-gpt-partnames.h:150
+#: include/pt-gpt-partnames.h:163
msgid "QNX6 file system"
msgstr "QNX6 文件系统"
-#: include/pt-gpt-partnames.h:153
+#: include/pt-gpt-partnames.h:166
msgid "Plan 9 partition"
msgstr "Plan 9 分区"
-#: include/pt-gpt-partnames.h:156
+#: include/pt-gpt-partnames.h:169
msgid "HiFive Unleashed FSBL"
msgstr "HiFive Unleashed FSBL"
-#: include/pt-gpt-partnames.h:157
+#: include/pt-gpt-partnames.h:170
msgid "HiFive Unleashed BBL"
msgstr "HiFive Unleashed BBL"
msgid "Last cylinder, +/-cylinders or +/-size{K,M,G,T,P}"
msgstr "最后一个柱面, +/-cylinders 或 +size{K,M,G,T,P}"
-#: libfdisk/src/bsd.c:296 libfdisk/src/dos.c:1358 libfdisk/src/gpt.c:2449
+#: libfdisk/src/bsd.c:296 libfdisk/src/dos.c:1358 libfdisk/src/gpt.c:2495
msgid "Last sector, +/-sectors or +/-size{K,M,G,T,P}"
msgstr "最后一个扇区，+/-sectors 或 +size{K,M,G,T,P}"
msgid "Sectors/Cylinder"
msgstr "扇区/柱面"
-#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1029 libfdisk/src/dos.c:2603
+#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1029 libfdisk/src/dos.c:2613
#: libfdisk/src/sgi.c:1161 libfdisk/src/sun.c:203 libfdisk/src/sun.c:1133
msgid "Cylinders"
msgstr "柱面"
msgid "Disklabel written to %s."
msgstr "磁盘标签已写入 %s。"
-#: libfdisk/src/bsd.c:920 libfdisk/src/context.c:753
+#: libfdisk/src/bsd.c:920 libfdisk/src/context.c:776
msgid "Syncing disks."
msgstr "正在同步磁盘。"
msgid "Cpg"
msgstr "Cpg"
-#: libfdisk/src/context.c:743
+#: libfdisk/src/context.c:766
#, c-format
msgid "%s: fsync device failed"
msgstr "%s：设备 fsync 失败"
-#: libfdisk/src/context.c:748
+#: libfdisk/src/context.c:771
#, c-format
msgid "%s: close device failed"
msgstr "%s：关闭设备失败"
-#: libfdisk/src/context.c:828
+#: libfdisk/src/context.c:854
msgid "Calling ioctl() to re-read partition table."
msgstr "将调用 ioctl() 来重新读分区表。"
-#: libfdisk/src/context.c:836
+#: libfdisk/src/context.c:862
msgid "Re-reading the partition table failed."
msgstr "重新读取分区表失败。"
-#: libfdisk/src/context.c:838
+#: libfdisk/src/context.c:864
#, fuzzy
msgid "The kernel still uses the old table. The new table will be used at the next reboot or after you run partprobe(8) or partx(8)."
msgstr "内核仍在使用旧分区表。新分区表将在下次重启或运行 partprobe(8) 或 kpartx(8) 后生效。"
-#: libfdisk/src/context.c:928
+#: libfdisk/src/context.c:954
#, c-format
msgid "Failed to remove partition %zu from system"
msgstr "从系统上移除分区 %zu 时失败"
-#: libfdisk/src/context.c:937
+#: libfdisk/src/context.c:963
#, c-format
msgid "Failed to update system information about partition %zu"
msgstr "更新系统中有关分区 %zu 的信息时失败"
-#: libfdisk/src/context.c:946
+#: libfdisk/src/context.c:983
#, c-format
msgid "Failed to add partition %zu to system"
msgstr "添加分区 %zu 至系统时失败"
-#: libfdisk/src/context.c:952
+#: libfdisk/src/context.c:989
msgid "The kernel still uses the old partitions. The new table will be used at the next reboot. "
msgstr "内核仍在使用旧分区。新分区表将在下次重启后生效。"
-#: libfdisk/src/context.c:1163
+#: libfdisk/src/context.c:1193
msgid "cylinder"
msgid_plural "cylinders"
msgstr[0] "柱面"
-#: libfdisk/src/context.c:1164
+#: libfdisk/src/context.c:1194
msgid "sector"
msgid_plural "sectors"
msgstr[0] "扇区"
-#: libfdisk/src/context.c:1520
+#: libfdisk/src/context.c:1550
msgid "Incomplete geometry setting."
msgstr "不完整的几何属性设置。"
msgid "Start sector %ju out of range."
msgstr "起始扇区 %ju 超出范围。"
-#: libfdisk/src/dos.c:1194 libfdisk/src/gpt.c:2323 libfdisk/src/sgi.c:842
+#: libfdisk/src/dos.c:1194 libfdisk/src/gpt.c:2369 libfdisk/src/sgi.c:842
#: libfdisk/src/sun.c:528
#, c-format
msgid "Partition %zu is already defined. Delete it before re-adding it."
msgstr "分区 %zu 已经定义过。请删除后再重新添加它。"
#: libfdisk/src/dos.c:1209 libfdisk/src/dos.c:1235 libfdisk/src/dos.c:1292
-#: libfdisk/src/dos.c:1324 libfdisk/src/gpt.c:2332
+#: libfdisk/src/dos.c:1324 libfdisk/src/gpt.c:2378
msgid "No free sectors available."
msgstr "无空闲扇区可用。"
msgid "Logical partition %zu: not entirely in partition %zu."
msgstr "逻辑分区 %zu：没有完全在分区 %zu 中。"
-#: libfdisk/src/dos.c:1705 libfdisk/src/gpt.c:2229
+#: libfdisk/src/dos.c:1705 libfdisk/src/gpt.c:2275
msgid "No errors detected."
msgstr "未检测到错误。"
msgid "Remaining %lld unallocated %ld-byte sectors."
msgstr "剩余 %lld 未分配的 %ld字节 扇区。"
-#: libfdisk/src/dos.c:1714 libfdisk/src/gpt.c:2249
+#: libfdisk/src/dos.c:1714 libfdisk/src/gpt.c:2295
#, c-format
msgid "%d error detected."
msgid_plural "%d errors detected."
msgid "The maximum number of partitions has been created."
msgstr "已创建分区达到最大数量。"
-#: libfdisk/src/dos.c:1780 libfdisk/src/dos.c:1795 libfdisk/src/dos.c:2238
+#: libfdisk/src/dos.c:1780 libfdisk/src/dos.c:1795 libfdisk/src/dos.c:2248
msgid "Extended partition already exists."
msgstr "扩展分区已存在。"
msgid "Extended partition does not exists. Failed to add logical partition."
msgstr "扩展分区不存在。添加逻辑分区失败。"
-#: libfdisk/src/dos.c:1862
+#: libfdisk/src/dos.c:1871
msgid "All primary partitions are in use."
msgstr "所有主分区都在使用中。"
-#: libfdisk/src/dos.c:1864 libfdisk/src/dos.c:1875
+#: libfdisk/src/dos.c:1873 libfdisk/src/dos.c:1885
msgid "All space for primary partitions is in use."
msgstr "所有主分区的空间都在使用中。"
#. TRANSLATORS: Try to keep this within 80 characters.
-#: libfdisk/src/dos.c:1878
+#: libfdisk/src/dos.c:1888
msgid "To create more partitions, first replace a primary with an extended partition."
msgstr "要创建更多分区，请先将一个主分区替换为扩展分区。"
-#: libfdisk/src/dos.c:1899
+#: libfdisk/src/dos.c:1909
msgid "Partition type"
msgstr "分区类型"
-#: libfdisk/src/dos.c:1903
+#: libfdisk/src/dos.c:1913
#, fuzzy, c-format
msgid "%u primary, %d extended, %u free"
msgstr "%zu个主分区，%d个扩展分区，%zu空闲"
-#: libfdisk/src/dos.c:1908
+#: libfdisk/src/dos.c:1918
msgid "primary"
msgstr "主分区"
-#: libfdisk/src/dos.c:1910
+#: libfdisk/src/dos.c:1920
msgid "extended"
msgstr "扩展分区"
-#: libfdisk/src/dos.c:1910
+#: libfdisk/src/dos.c:1920
msgid "container for logical partitions"
msgstr "逻辑分区容器"
-#: libfdisk/src/dos.c:1912
+#: libfdisk/src/dos.c:1922
msgid "logical"
msgstr "逻辑分区"
-#: libfdisk/src/dos.c:1912
+#: libfdisk/src/dos.c:1922
msgid "numbered from 5"
msgstr "从 5 开始编号"
-#: libfdisk/src/dos.c:1951
+#: libfdisk/src/dos.c:1961
#, c-format
msgid "Invalid partition type `%c'."
msgstr "无效的分区类型“%c”。"
-#: libfdisk/src/dos.c:1969
+#: libfdisk/src/dos.c:1979
#, c-format
msgid "Cannot write sector %jd: seek failed"
msgstr "写扇区 %jd 失败：定位失败"
-#: libfdisk/src/dos.c:2129 libfdisk/src/gpt.c:1248
+#: libfdisk/src/dos.c:2139 libfdisk/src/gpt.c:1294
msgid "Disk identifier"
msgstr "磁盘标识符"
-#: libfdisk/src/dos.c:2243
+#: libfdisk/src/dos.c:2253
msgid "Type 0 means free space to many systems. Having partitions of type 0 is probably unwise."
msgstr "很多系统将类型 0 视为空闲空间。不建议设置类型为 0 的分区。"
-#: libfdisk/src/dos.c:2248
+#: libfdisk/src/dos.c:2258
msgid "Cannot change type of the extended partition which is already used by logical partitions. Delete logical partitions first."
msgstr "无法更改已被逻辑分区使用的扩展分区的类型。请先删除逻辑分区。"
-#: libfdisk/src/dos.c:2434 libfdisk/src/gpt.c:3050
+#: libfdisk/src/dos.c:2444 libfdisk/src/gpt.c:3100
msgid "Nothing to do. Ordering is correct already."
msgstr "无须操作。顺序已经是正确的了。"
-#: libfdisk/src/dos.c:2489
+#: libfdisk/src/dos.c:2499
#, c-format
msgid "Partition %zu: no data area."
msgstr "分区 %zu：无数据区。"
-#: libfdisk/src/dos.c:2522
+#: libfdisk/src/dos.c:2532
msgid "New beginning of data"
msgstr "新数据起点"
-#: libfdisk/src/dos.c:2578
+#: libfdisk/src/dos.c:2588
#, c-format
msgid "Partition %zu: is an extended partition."
msgstr "分区 %zu：是一个扩展分区。"
-#: libfdisk/src/dos.c:2584
+#: libfdisk/src/dos.c:2594
#, c-format
msgid "The bootable flag on partition %zu is enabled now."
msgstr "分区 %zu 的 可启动 标志已启用。"
-#: libfdisk/src/dos.c:2585
+#: libfdisk/src/dos.c:2595
#, c-format
msgid "The bootable flag on partition %zu is disabled now."
msgstr "分区 %zu 的 可启动 标志已禁用。"
-#: libfdisk/src/dos.c:2598 libfdisk/src/gpt.c:3140 libfdisk/src/sgi.c:1157
+#: libfdisk/src/dos.c:2608 libfdisk/src/gpt.c:3189 libfdisk/src/sgi.c:1157
#: libfdisk/src/sun.c:1129
msgid "Device"
msgstr "设备"
-#: libfdisk/src/dos.c:2599 libfdisk/src/sun.c:40
+#: libfdisk/src/dos.c:2609 libfdisk/src/sun.c:40
msgid "Boot"
msgstr "启动"
-#: libfdisk/src/dos.c:2605 libfdisk/src/sgi.c:1163 libfdisk/src/sun.c:1135
+#: libfdisk/src/dos.c:2615 libfdisk/src/sgi.c:1163 libfdisk/src/sun.c:1135
msgid "Id"
msgstr "Id"
-#: libfdisk/src/dos.c:2609
+#: libfdisk/src/dos.c:2619
msgid "Start-C/H/S"
msgstr "起始-C/H/S"
-#: libfdisk/src/dos.c:2610
+#: libfdisk/src/dos.c:2620
msgid "End-C/H/S"
msgstr "终-C/H/S"
-#: libfdisk/src/dos.c:2611 libfdisk/src/gpt.c:3150 libfdisk/src/sgi.c:1165
+#: libfdisk/src/dos.c:2621 libfdisk/src/gpt.c:3199 libfdisk/src/sgi.c:1165
msgid "Attrs"
msgstr "属性"
-#: libfdisk/src/gpt.c:682
+#: libfdisk/src/gpt.c:690
msgid "failed to allocate GPT header"
msgstr "分配 GPT 头失败"
-#: libfdisk/src/gpt.c:765
+#: libfdisk/src/gpt.c:799
msgid "First LBA specified by script is out of range."
msgstr "脚本指定的第一个 LBA 超出范围。"
-#: libfdisk/src/gpt.c:777
+#: libfdisk/src/gpt.c:811
msgid "Last LBA specified by script is out of range."
msgstr "脚本指定的最后一个 LBA 超出范围。"
-#: libfdisk/src/gpt.c:919
+#: libfdisk/src/gpt.c:952
#, c-format
msgid "GPT PMBR size mismatch (%<PRIu64> != %<PRIu64>) will be corrected by write."
msgstr "GPT PMBR 大小不符（%<PRIu64> != %<PRIu64>），将用写入予以更正。"
-#: libfdisk/src/gpt.c:944
+#: libfdisk/src/gpt.c:977
msgid "gpt: stat() failed"
msgstr "gpt：stat() 失败"
-#: libfdisk/src/gpt.c:954
+#: libfdisk/src/gpt.c:987
#, c-format
msgid "gpt: cannot handle files with mode %o"
msgstr "gpt：无法操作模式为 %o 的文件"
-#: libfdisk/src/gpt.c:1218
+#: libfdisk/src/gpt.c:1252
msgid "GPT Header"
msgstr "GPT 头"
-#: libfdisk/src/gpt.c:1223
+#: libfdisk/src/gpt.c:1257
msgid "GPT Entries"
msgstr "GPT 记录项"
-#: libfdisk/src/gpt.c:1255
+#: libfdisk/src/gpt.c:1263
+#, fuzzy
+msgid "GPT Backup Entries"
+msgstr "GPT 记录项"
+
+#: libfdisk/src/gpt.c:1269
+#, fuzzy
+msgid "GPT Backup Header"
+msgstr "GPT 头"
+
+#: libfdisk/src/gpt.c:1301
msgid "First LBA"
msgstr "第一个 LBA"
-#: libfdisk/src/gpt.c:1260
+#: libfdisk/src/gpt.c:1306
msgid "Last LBA"
msgstr "最后一个 LBA"
#. TRANSLATORS: The LBA (Logical Block Address) of the backup GPT header.
-#: libfdisk/src/gpt.c:1266
+#: libfdisk/src/gpt.c:1312
msgid "Alternative LBA"
msgstr "替代 LBA"
#. TRANSLATORS: The start of the array of partition entries.
-#: libfdisk/src/gpt.c:1272
+#: libfdisk/src/gpt.c:1318
msgid "Partition entries LBA"
msgstr "分区记录项 LBA"
-#: libfdisk/src/gpt.c:1277
+#: libfdisk/src/gpt.c:1323
msgid "Allocated partition entries"
msgstr "已分配的分区项"
-#: libfdisk/src/gpt.c:1619
+#: libfdisk/src/gpt.c:1665
msgid "The backup GPT table is corrupt, but the primary appears OK, so that will be used."
msgstr "备份 GPT 表损坏，但主表似乎正常，将使用它。"
-#: libfdisk/src/gpt.c:1629
+#: libfdisk/src/gpt.c:1675
msgid "The primary GPT table is corrupt, but the backup appears OK, so that will be used."
msgstr "主 GPT 表损坏，但备份似乎正常，将使用它。"
-#: libfdisk/src/gpt.c:1645
+#: libfdisk/src/gpt.c:1691
#, fuzzy
msgid "The backup GPT table is not on the end of the device."
msgstr "备份 GPT 表损坏，但主表似乎正常，将使用它。"
-#: libfdisk/src/gpt.c:1648
+#: libfdisk/src/gpt.c:1694
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:1652
+#: libfdisk/src/gpt.c:1698
#, fuzzy
msgid "Failed to recalculate backup GPT table location"
msgstr "分配输出表失败"
-#: libfdisk/src/gpt.c:1807
+#: libfdisk/src/gpt.c:1853
#, c-format
msgid "unsupported GPT attribute bit '%s'"
msgstr "不支持的 GPT 属性位“%s”"
-#: libfdisk/src/gpt.c:1812
+#: libfdisk/src/gpt.c:1858
#, fuzzy, c-format
msgid "failed to parse GPT attribute string '%s'"
msgstr "解析列表“%s”失败"
-#: libfdisk/src/gpt.c:1912
+#: libfdisk/src/gpt.c:1958
#, c-format
msgid "Partition UUID changed from %s to %s."
msgstr "分区 UUID 已从 %s 更改为 %s。"
-#: libfdisk/src/gpt.c:1921
+#: libfdisk/src/gpt.c:1967
msgid "Failed to translate partition name, name not changed."
msgstr "翻译分区名称失败，名称未改变。"
-#: libfdisk/src/gpt.c:1923
+#: libfdisk/src/gpt.c:1969
#, c-format
msgid "Partition name changed from '%s' to '%.*s'."
msgstr "分区名已由“%s”改为“%.*s”。"
-#: libfdisk/src/gpt.c:1952
+#: libfdisk/src/gpt.c:1998
msgid "The start of the partition understeps FirstUsableLBA."
msgstr "分区起点未到首个可用 LBA。"
-#: libfdisk/src/gpt.c:1959
+#: libfdisk/src/gpt.c:2005
msgid "The end of the partition oversteps LastUsableLBA."
msgstr "分区终点超过了最后可用 LBA。"
-#: libfdisk/src/gpt.c:2117
+#: libfdisk/src/gpt.c:2163
msgid "The device contains hybrid MBR -- writing GPT only."
msgstr "该设备包含混合 MBR -- 将只写入 GPT。"
-#: libfdisk/src/gpt.c:2153
+#: libfdisk/src/gpt.c:2199
msgid "Disk does not contain a valid backup header."
msgstr "磁盘不含有效的备用磁头。"
-#: libfdisk/src/gpt.c:2158
+#: libfdisk/src/gpt.c:2204
msgid "Invalid primary header CRC checksum."
msgstr "无效的主磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:2162
+#: libfdisk/src/gpt.c:2208
msgid "Invalid backup header CRC checksum."
msgstr "无效的备份磁头 CRC 校验和。"
-#: libfdisk/src/gpt.c:2167
+#: libfdisk/src/gpt.c:2213
msgid "Invalid partition entry checksum."
msgstr "无效的分区记录校验和。"
-#: libfdisk/src/gpt.c:2172
+#: libfdisk/src/gpt.c:2218
msgid "Invalid primary header LBA sanity checks."
msgstr "无效的主磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:2176
+#: libfdisk/src/gpt.c:2222
msgid "Invalid backup header LBA sanity checks."
msgstr "无效的备用磁头 LBA 完整性检查。"
-#: libfdisk/src/gpt.c:2181
+#: libfdisk/src/gpt.c:2227
msgid "MyLBA mismatch with real position at primary header."
msgstr "MyLBA 不匹配，真正位置在主磁头。"
-#: libfdisk/src/gpt.c:2185
+#: libfdisk/src/gpt.c:2231
msgid "MyLBA mismatch with real position at backup header."
msgstr "MyLBA 不匹配，真正位置在备份磁头。"
-#: libfdisk/src/gpt.c:2190
+#: libfdisk/src/gpt.c:2236
msgid "Disk is too small to hold all data."
msgstr "磁盘太小，放不下所有数据。"
-#: libfdisk/src/gpt.c:2200
+#: libfdisk/src/gpt.c:2246
msgid "Primary and backup header mismatch."
msgstr "主磁头和备份磁头不匹配。"
-#: libfdisk/src/gpt.c:2206
+#: libfdisk/src/gpt.c:2252
#, c-format
msgid "Partition %u overlaps with partition %u."
msgstr "分区 %u 与 %u 重叠。"
-#: libfdisk/src/gpt.c:2213
+#: libfdisk/src/gpt.c:2259
#, c-format
msgid "Partition %u is too big for the disk."
msgstr "分区 %u 对于该磁盘而言过大。"
-#: libfdisk/src/gpt.c:2220
+#: libfdisk/src/gpt.c:2266
#, c-format
msgid "Partition %u ends before it starts."
msgstr "分区 %u 结束于起点之前。"
-#: libfdisk/src/gpt.c:2230
+#: libfdisk/src/gpt.c:2276
#, c-format
msgid "Header version: %s"
msgstr "磁头版本：%s"
-#: libfdisk/src/gpt.c:2231
+#: libfdisk/src/gpt.c:2277
#, fuzzy, c-format
msgid "Using %zu out of %zu partitions."
msgstr "使用着 %2$d 个分区中的 %1$u 个。"
-#: libfdisk/src/gpt.c:2241
+#: libfdisk/src/gpt.c:2287
#, 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:2328
+#: libfdisk/src/gpt.c:2374
msgid "All partitions are already in use."
msgstr "所有分区均已占用。"
-#: libfdisk/src/gpt.c:2385 libfdisk/src/gpt.c:2412
+#: libfdisk/src/gpt.c:2431 libfdisk/src/gpt.c:2458
#, c-format
msgid "Sector %ju already used."
msgstr "扇区 %ju 已使用。"
-#: libfdisk/src/gpt.c:2478
+#: libfdisk/src/gpt.c:2524
#, c-format
msgid "Could not create partition %zu"
msgstr "无法创建分区 %zu"
-#: libfdisk/src/gpt.c:2485
+#: libfdisk/src/gpt.c:2531
#, c-format
msgid "The last usable GPT sector is %ju, but %ju is requested."
msgstr "最后一个可用的 GPT 扇区是 %ju，但请求了 %ju。"
-#: libfdisk/src/gpt.c:2492
+#: libfdisk/src/gpt.c:2538
#, c-format
msgid "The first usable GPT sector is %ju, but %ju is requested."
msgstr "第一个可用的 GPT 扇区是 %ju，但请求了 %ju。"
-#: libfdisk/src/gpt.c:2631
+#: libfdisk/src/gpt.c:2677
#, c-format
msgid "Created a new GPT disklabel (GUID: %s)."
msgstr "已创建新的 GPT 磁盘标签(GUID: %s)。"
-#: libfdisk/src/gpt.c:2652
+#: libfdisk/src/gpt.c:2680
+#, fuzzy, c-format
+msgid "The maximal number of partitions is %d (default is %d)."
+msgstr "已创建分区达到最大数量。"
+
+#: libfdisk/src/gpt.c:2702
msgid "Enter new disk UUID (in 8-4-4-4-12 format)"
msgstr "输入新磁盘 UUID(以 8-4-4-4-12 格式)"
-#: libfdisk/src/gpt.c:2660
+#: libfdisk/src/gpt.c:2710
msgid "Failed to parse your UUID."
msgstr "解析您的 UUID 失败。"
-#: libfdisk/src/gpt.c:2674
+#: libfdisk/src/gpt.c:2724
#, c-format
msgid "Disk identifier changed from %s to %s."
msgstr "将磁盘标识从 %s 更改为 %s 失败。"
-#: libfdisk/src/gpt.c:2694
+#: libfdisk/src/gpt.c:2744
msgid "Not enough space for new partition table!"
msgstr "创建新分区表的空闲空间不够！"
-#: libfdisk/src/gpt.c:2705
+#: libfdisk/src/gpt.c:2755
#, fuzzy, c-format
msgid "Partition #%zu out of range (minimal start is %<PRIu64> sectors)"
msgstr "分区 #%u 超出范围(最小起点是 %<PRIu64> 扇区)"
-#: libfdisk/src/gpt.c:2710
+#: libfdisk/src/gpt.c:2760
#, fuzzy, c-format
msgid "Partition #%zu out of range (maximal end is %<PRIu64> sectors)"
msgstr "分区 #%u 超出范围(最小终点是 %<PRIu64> 扇区)"
-#: libfdisk/src/gpt.c:2756
+#: libfdisk/src/gpt.c:2806
msgid "The partition entry size is zero."
msgstr "分区条目大小为零。"
-#: libfdisk/src/gpt.c:2758
+#: libfdisk/src/gpt.c:2808
#, c-format
msgid "The number of the partition has to be smaller than %zu."
msgstr "分区数量必须小于 %zu。"
-#: libfdisk/src/gpt.c:2782
+#: libfdisk/src/gpt.c:2832
msgid "Cannot allocate memory!"
msgstr "无法分配内存！"
-#: libfdisk/src/gpt.c:2811
+#: libfdisk/src/gpt.c:2861
#, c-format
msgid "Partition table length changed from %<PRIu32> to %<PRIu64>."
msgstr "分区表长度已从 %<PRIu32> 改为 %<PRIu64>。"
-#: libfdisk/src/gpt.c:2921
+#: libfdisk/src/gpt.c:2971
#, c-format
msgid "The attributes on partition %zu changed to 0x%016<PRIx64>."
msgstr "分区 %zu 的属性已改为 0x%016<PRIx64>。"
-#: libfdisk/src/gpt.c:2971
+#: libfdisk/src/gpt.c:3021
msgid "Enter GUID specific bit"
msgstr "输入 GUID 特定位"
-#: libfdisk/src/gpt.c:2986
+#: libfdisk/src/gpt.c:3036
#, c-format
msgid "failed to toggle unsupported bit %lu"
msgstr "开/关不支持的位 %lu 失败"
-#: libfdisk/src/gpt.c:2999
+#: libfdisk/src/gpt.c:3049
#, c-format
msgid "The GUID specific bit %d on partition %zu is enabled now."
msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已启用。"
-#: libfdisk/src/gpt.c:3000
+#: libfdisk/src/gpt.c:3050
#, c-format
msgid "The GUID specific bit %d on partition %zu is disabled now."
msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已禁用。"
-#: libfdisk/src/gpt.c:3004
+#: libfdisk/src/gpt.c:3054
#, c-format
msgid "The %s flag on partition %zu is enabled now."
msgstr "分区 %2$zu 上的标志 %1$s 现已启用。"
-#: libfdisk/src/gpt.c:3005
+#: libfdisk/src/gpt.c:3055
#, c-format
msgid "The %s flag on partition %zu is disabled now."
msgstr "分区 %2$zu 上的标志 %1$s 现已禁用。"
-#: libfdisk/src/gpt.c:3147
+#: libfdisk/src/gpt.c:3196
msgid "Type-UUID"
msgstr "类型-UUID"
-#: libfdisk/src/gpt.c:3148
+#: libfdisk/src/gpt.c:3197
msgid "UUID"
msgstr "UUID"
-#: libfdisk/src/gpt.c:3149 login-utils/chfn.c:156 login-utils/chfn.c:158
+#: libfdisk/src/gpt.c:3198 login-utils/chfn.c:156 login-utils/chfn.c:158
#: login-utils/chfn.c:322
msgid "Name"
msgstr "名称"
msgid "Failed to resize partition #%zu."
msgstr "调整分区 #%zu 的大小失败。"
-#: libfdisk/src/parttype.c:288 misc-utils/findmnt.c:662
-#: misc-utils/uuidparse.c:199 misc-utils/uuidparse.c:217 schedutils/chrt.c:205
-#: schedutils/ionice.c:79 sys-utils/hwclock.c:276
+#: libfdisk/src/parttype.c:288 misc-utils/findmnt.c:670
+#: misc-utils/uuidparse.c:199 misc-utils/uuidparse.c:217 schedutils/chrt.c:127
+#: schedutils/ionice.c:79 sys-utils/hwclock.c:282
msgid "unknown"
msgstr "未知"
"和启动锁。\n"
"您确信要把该分区标记为 Linux 交换分区吗？"
-#: libmount/src/context.c:2761
+#: libmount/src/context.c:2791
#, c-format
msgid "operation failed: %m"
msgstr "操作失败：%m"
-#: libmount/src/context_mount.c:1638
+#: libmount/src/context_mount.c:1653
#, c-format
msgid "WARNING: failed to apply propagation flags"
msgstr "警告：应用传播标志失败"
-#: libmount/src/context_mount.c:1648
+#: libmount/src/context_mount.c:1663
#, fuzzy, c-format
msgid "WARNING: source write-protected, mounted read-only"
msgstr "警告：设备写保护，使用只读方式挂载"
-#: libmount/src/context_mount.c:1662
+#: libmount/src/context_mount.c:1677
#, c-format
msgid "operation permitted for root only"
msgstr "操作只允许由 root 进行"
-#: libmount/src/context_mount.c:1666
+#: libmount/src/context_mount.c:1681
#, c-format
msgid "%s is already mounted"
msgstr "%s 已经挂载"
-#: libmount/src/context_mount.c:1672
+#: libmount/src/context_mount.c:1687
#, c-format
msgid "can't find in %s"
msgstr "无法在 %s 中找到"
-#: libmount/src/context_mount.c:1675
+#: libmount/src/context_mount.c:1690
#, c-format
msgid "can't find mount point in %s"
msgstr "无法在 %s 中找到挂载点"
-#: libmount/src/context_mount.c:1678
+#: libmount/src/context_mount.c:1693
#, c-format
msgid "can't find mount source %s in %s"
msgstr "在 %2$s 中找不到挂载源 %1$s"
-#: libmount/src/context_mount.c:1683
+#: libmount/src/context_mount.c:1698
#, c-format
msgid "more filesystems detected on %s; use -t <type> or wipefs(8)"
msgstr "%s 上探测到了更多文件系统；请使用 -t <类型> 或 wipefs(8)"
-#: libmount/src/context_mount.c:1688
+#: libmount/src/context_mount.c:1703
#, c-format
msgid "failed to determine filesystem type"
msgstr "无法确定文件系统类型"
-#: libmount/src/context_mount.c:1689
+#: libmount/src/context_mount.c:1704
#, c-format
msgid "no filesystem type specified"
msgstr "未指定文件系统类型"
-#: libmount/src/context_mount.c:1696
+#: libmount/src/context_mount.c:1711
#, c-format
msgid "can't find %s"
msgstr "找不到 %s"
-#: libmount/src/context_mount.c:1698
+#: libmount/src/context_mount.c:1713
#, c-format
msgid "no mount source specified"
msgstr "未指定挂载来源"
-#: libmount/src/context_mount.c:1704
+#: libmount/src/context_mount.c:1719
#, c-format
msgid "failed to parse mount options: %m"
msgstr "解析挂臷选项失败：%m"
-#: libmount/src/context_mount.c:1705
+#: libmount/src/context_mount.c:1720
#, c-format
msgid "failed to parse mount options"
msgstr "解析挂臷选项失败"
-#: libmount/src/context_mount.c:1709
+#: libmount/src/context_mount.c:1724
#, fuzzy, c-format
msgid "failed to setup loop device for %s"
msgstr "%s：设置回环设备失败"
-#: libmount/src/context_mount.c:1713
+#: libmount/src/context_mount.c:1728
#, fuzzy, c-format
msgid "overlapping loop device exists for %s"
msgstr "%s: 重叠的回环设备已存在"
-#: libmount/src/context_mount.c:1717 libmount/src/context_umount.c:1263
+#: libmount/src/context_mount.c:1732 libmount/src/context_umount.c:1270
#, fuzzy, c-format
msgid "locking failed"
msgstr "关闭 %s 失败"
-#: libmount/src/context_mount.c:1721 libmount/src/context_umount.c:1269
-#: sys-utils/umount.c:249 sys-utils/umount.c:265
+#: libmount/src/context_mount.c:1736 libmount/src/context_umount.c:1276
+#: sys-utils/umount.c:257 sys-utils/umount.c:273
#, c-format
msgid "failed to switch namespace"
msgstr "切换名字空间失败"
-#: libmount/src/context_mount.c:1724
+#: libmount/src/context_mount.c:1739
#, c-format
msgid "mount failed: %m"
msgstr "挂载失败：%m"
-#: libmount/src/context_mount.c:1734
+#: libmount/src/context_mount.c:1749
#, fuzzy, c-format
msgid "filesystem was mounted, but failed to update userspace mount table"
msgstr "%s：文件系统已卸载，但 mount(8) 失败"
-#: libmount/src/context_mount.c:1740
+#: libmount/src/context_mount.c:1755
#, fuzzy, c-format
msgid "filesystem was mounted, but failed to switch namespace back"
msgstr "%s：文件系统已卸载，但 mount(8) 失败"
-#: libmount/src/context_mount.c:1747
+#: libmount/src/context_mount.c:1762
#, fuzzy, c-format
msgid "filesystem was mounted, but any subsequent operation failed: %m"
msgstr "%s：文件系统已卸载，但 mount(8) 失败"
-#: libmount/src/context_mount.c:1765 libmount/src/context_mount.c:1810
+#: libmount/src/context_mount.c:1780 libmount/src/context_mount.c:1825
#, c-format
msgid "mount point is not a directory"
msgstr "挂载点不是目录"
-#: libmount/src/context_mount.c:1767 login-utils/newgrp.c:226
+#: libmount/src/context_mount.c:1782 login-utils/newgrp.c:226
#, c-format
msgid "permission denied"
msgstr "权限不足"
-#: libmount/src/context_mount.c:1769
+#: libmount/src/context_mount.c:1784
#, c-format
msgid "must be superuser to use mount"
msgstr "必须以超级用户身份使用 mount"
-#: libmount/src/context_mount.c:1776
+#: libmount/src/context_mount.c:1791
#, c-format
msgid "mount point is busy"
msgstr "挂载点忙"
-#: libmount/src/context_mount.c:1783
+#: libmount/src/context_mount.c:1798
#, c-format
msgid "%s already mounted on %s"
msgstr "%s 已挂载于 %s"
-#: libmount/src/context_mount.c:1787
+#: libmount/src/context_mount.c:1802
#, c-format
msgid "%s already mounted or mount point busy"
msgstr "%s 已经挂载或挂载点忙"
-#: libmount/src/context_mount.c:1792
+#: libmount/src/context_mount.c:1807
#, c-format
msgid "mount point does not exist"
msgstr "挂载点不存在"
-#: libmount/src/context_mount.c:1795
+#: libmount/src/context_mount.c:1810
#, c-format
msgid "mount point is a symbolic link to nowhere"
msgstr "挂载点是一个没有目标的符号链接"
-#: libmount/src/context_mount.c:1800
+#: libmount/src/context_mount.c:1815
#, c-format
msgid "special device %s does not exist"
msgstr "特殊设备 %s 不存在"
-#: libmount/src/context_mount.c:1803 libmount/src/context_mount.c:1819
-#: libmount/src/context_mount.c:1903 libmount/src/context_mount.c:1926
+#: libmount/src/context_mount.c:1818 libmount/src/context_mount.c:1834
+#: libmount/src/context_mount.c:1918 libmount/src/context_mount.c:1941
#, c-format
msgid "mount(2) system call failed: %m"
msgstr "mount(2) 系统调用失败：%m"
-#: libmount/src/context_mount.c:1815
+#: libmount/src/context_mount.c:1830
#, c-format
msgid "special device %s does not exist (a path prefix is not a directory)"
msgstr "特殊设备 %s 不存在(路径前缀不是目录)"
-#: libmount/src/context_mount.c:1827
+#: libmount/src/context_mount.c:1842
#, c-format
msgid "mount point not mounted or bad option"
msgstr "挂载点未挂载或选项有误"
-#: libmount/src/context_mount.c:1829
+#: libmount/src/context_mount.c:1844
#, c-format
msgid "not mount point or bad option"
msgstr "不是一个挂载点或选项有误"
-#: libmount/src/context_mount.c:1832
+#: libmount/src/context_mount.c:1847
#, c-format
msgid "bad option; moving a mount residing under a shared mount is unsupported"
msgstr "选项错误；不支持移动位于共享挂载内的挂载"
-#: libmount/src/context_mount.c:1836
+#: libmount/src/context_mount.c:1851
#, 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:1840
+#: libmount/src/context_mount.c:1855
#, 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:1847
+#: libmount/src/context_mount.c:1862
#, c-format
msgid "mount table full"
msgstr "挂载表满"
-#: libmount/src/context_mount.c:1852
+#: libmount/src/context_mount.c:1867
#, c-format
msgid "can't read superblock on %s"
msgstr "无法读取 %s 上的超级块"
-#: libmount/src/context_mount.c:1859
+#: libmount/src/context_mount.c:1874
#, c-format
msgid "unknown filesystem type '%s'"
msgstr "未知的文件系统类型“%s”"
-#: libmount/src/context_mount.c:1862
+#: libmount/src/context_mount.c:1877
#, c-format
msgid "unknown filesystem type"
msgstr "未知的文件系统类型"
-#: libmount/src/context_mount.c:1871
+#: libmount/src/context_mount.c:1886
#, c-format
msgid "%s is not a block device, and stat(2) fails?"
msgstr "%s 不是块设备，而且 stat(2) 失败？"
-#: libmount/src/context_mount.c:1874
+#: libmount/src/context_mount.c:1889
#, 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:1877
+#: libmount/src/context_mount.c:1892
#, c-format
msgid "%s is not a block device; try \"-o loop\""
msgstr "%s 不是块设备；请尝试“-o loop”"
-#: libmount/src/context_mount.c:1879
+#: libmount/src/context_mount.c:1894
#, c-format
msgid "%s is not a block device"
msgstr "%s 不是一个块设备"
-#: libmount/src/context_mount.c:1886
+#: libmount/src/context_mount.c:1901
#, c-format
msgid "%s is not a valid block device"
msgstr "%s 不是一个有效的块设备"
-#: libmount/src/context_mount.c:1894
+#: libmount/src/context_mount.c:1909
#, c-format
msgid "cannot mount %s read-only"
msgstr "无法以只读方式挂载 %s"
-#: libmount/src/context_mount.c:1896
+#: libmount/src/context_mount.c:1911
#, c-format
msgid "%s is write-protected but explicit read-write mode requested"
msgstr "%s 是写保护的，但明确请求了读写模式"
-#: libmount/src/context_mount.c:1898
+#: libmount/src/context_mount.c:1913
#, c-format
msgid "cannot remount %s read-write, is write-protected"
msgstr "无法以读写方式重新挂载 %s，它是写保护的"
-#: libmount/src/context_mount.c:1900
+#: libmount/src/context_mount.c:1915
#, c-format
msgid "bind %s failed"
msgstr "绑定 %s 失败"
-#: libmount/src/context_mount.c:1911
+#: libmount/src/context_mount.c:1926
#, c-format
msgid "no medium found on %s"
msgstr "在 %s 上找不到媒体"
-#: libmount/src/context_mount.c:1918
+#: libmount/src/context_mount.c:1933
#, c-format
msgid "cannot mount; probably corrupted filesystem on %s"
msgstr "无法挂载；%s 上的文件系统可能已损坏"
-#: libmount/src/context_umount.c:1257 libmount/src/context_umount.c:1311
+#: libmount/src/context_umount.c:1264 libmount/src/context_umount.c:1318
#, c-format
msgid "not mounted"
msgstr "未挂载"
-#: libmount/src/context_umount.c:1273
+#: libmount/src/context_umount.c:1280
#, c-format
msgid "umount failed: %m"
msgstr "挂载失败：%m"
-#: libmount/src/context_umount.c:1282
+#: libmount/src/context_umount.c:1289
#, c-format
msgid "filesystem was unmounted, but failed to update userspace mount table"
msgstr "文件系统已卸载，但更新用户空间挂载表失败"
-#: libmount/src/context_umount.c:1288
+#: libmount/src/context_umount.c:1295
#, fuzzy, c-format
msgid "filesystem was unmounted, but failed to switch namespace back"
msgstr "%s：文件系统已卸载，但 mount(8) 失败"
-#: libmount/src/context_umount.c:1295
+#: libmount/src/context_umount.c:1302
#, fuzzy, c-format
msgid "filesystem was unmounted, but any subsequent operation failed: %m"
msgstr "%s：文件系统已卸载，但 mount(8) 失败"
-#: libmount/src/context_umount.c:1308
+#: libmount/src/context_umount.c:1315
#, c-format
msgid "invalid block device"
msgstr "无效的块设备"
-#: libmount/src/context_umount.c:1314
+#: libmount/src/context_umount.c:1321
#, c-format
msgid "can't write superblock"
msgstr "无法写超级块"
-#: libmount/src/context_umount.c:1317
+#: libmount/src/context_umount.c:1324
#, c-format
msgid "target is busy"
msgstr "目标忙"
-#: libmount/src/context_umount.c:1320
+#: libmount/src/context_umount.c:1327
#, c-format
msgid "no mount point specified"
msgstr "未指定挂载点"
-#: libmount/src/context_umount.c:1323
+#: libmount/src/context_umount.c:1330
#, c-format
msgid "must be superuser to unmount"
msgstr "必须以超级用户身份卸载"
-#: libmount/src/context_umount.c:1326
+#: libmount/src/context_umount.c:1333
#, c-format
msgid "block devices are not permitted on filesystem"
msgstr "文件系统不允许块设备"
-#: libmount/src/context_umount.c:1329
+#: libmount/src/context_umount.c:1336
#, c-format
msgid "umount(2) system call failed: %m"
msgstr "umount(2) 系统调用失败：%m"
msgid "the plymouth request %c is not implemented"
msgstr "plymouth 请求 %c 没有实现"
-#: lib/randutils.c:189
+#: lib/randutils.c:196
msgid "getrandom() function"
msgstr "getrandom() 函数"
-#: lib/randutils.c:202
+#: lib/randutils.c:209
msgid "libc pseudo-random functions"
msgstr "libc 伪随机函数"
-#: lib/swapprober.c:17 lib/swapprober.c:30
+#: lib/swapprober.c:22 lib/swapprober.c:35
#, c-format
msgid "%s: unable to probe device"
msgstr "%s：无法探测设备"
-#: lib/swapprober.c:32
+#: lib/swapprober.c:37
#, c-format
msgid "%s: ambiguous probing result; use wipefs(8)"
msgstr "%s：探测结果有歧义；请使用 wipefs(8)"
-#: lib/swapprober.c:34
+#: lib/swapprober.c:39
#, c-format
msgid "%s: not a valid swap partition"
msgstr "%s：不是有效的交换分区"
-#: lib/swapprober.c:41
+#: lib/swapprober.c:46
#, c-format
msgid "%s: unsupported swap version '%s'"
msgstr "%s：不支持的 swap 版本“%s”"
-#: lib/timeutils.c:465
+#: lib/timeutils.c:466
msgid "format_iso_time: buffer overflow."
msgstr "format_iso_time：缓冲溢出。"
-#: lib/timeutils.c:483 lib/timeutils.c:507
-#, c-format
-msgid "time %ld is out of range."
+#: lib/timeutils.c:484 lib/timeutils.c:508
+#, fuzzy, c-format
+#| msgid "time %ld is out of range."
+msgid "time %<PRId64> is out of range."
msgstr "时间 %ld 超出范围。"
-#: login-utils/chfn.c:96 login-utils/chsh.c:75 login-utils/lslogins.c:1378
+#: login-utils/chfn.c:96 login-utils/chsh.c:75 login-utils/lslogins.c:1382
#, c-format
msgid " %s [options] [<username>]\n"
msgstr " %s [选项] [<用户名>]\n"
msgid "can only change local entries"
msgstr "只能更改本地记录"
-#: login-utils/chfn.c:449
+#: login-utils/chfn.c:445
#, c-format
msgid "%s is not authorized to change the finger info of %s"
msgstr "%s 未得到授权更改 %s 的 finger 信息"
-#: login-utils/chfn.c:451 login-utils/chsh.c:301
+#: login-utils/chfn.c:447 login-utils/chsh.c:295
msgid "Unknown user context"
msgstr "未知用户环境(context)"
-#: login-utils/chfn.c:457 login-utils/chsh.c:307
+#: login-utils/chfn.c:452 login-utils/chsh.c:300
#, c-format
msgid "can't set default context for %s"
msgstr "无法设置 %s 默认环境(context)"
-#: login-utils/chfn.c:468
+#: login-utils/chfn.c:463
msgid "running UID doesn't match UID of user we're altering, change denied"
msgstr "运行中的 UID 与要改变的用户的 UID 不匹配，更改被拒绝"
-#: login-utils/chfn.c:472
+#: login-utils/chfn.c:467
#, c-format
msgid "Changing finger information for %s.\n"
msgstr "正在更改 %s 的 finger 信息。\n"
-#: login-utils/chfn.c:486
+#: login-utils/chfn.c:481
#, c-format
msgid "Finger information not changed.\n"
msgstr "Finger 信息未更改。\n"
"“%s”未列在 %s 中。\n"
"请使用 %s -l 查看列表。"
-#: login-utils/chsh.c:300
+#: login-utils/chsh.c:294
#, c-format
msgid "%s is not authorized to change the shell of %s"
msgstr "%s 无权更改 %s 的 shell"
-#: login-utils/chsh.c:326
+#: login-utils/chsh.c:319
msgid "running UID doesn't match UID of user we're altering, shell change denied"
msgstr "运行 UID 与要更改的用户的 UID 不匹配，更改 shell 被拒绝"
-#: login-utils/chsh.c:331
+#: login-utils/chsh.c:324
#, c-format
msgid "your shell is not in %s, shell change denied"
msgstr "您的 shell 不在 %s 中，更改 shell 被拒绝"
-#: login-utils/chsh.c:335
+#: login-utils/chsh.c:328
#, c-format
msgid "Changing shell for %s.\n"
msgstr "正在更改 %s 的 shell。\n"
-#: login-utils/chsh.c:343
+#: login-utils/chsh.c:336
msgid "New shell"
msgstr "新 shell"
-#: login-utils/chsh.c:351
+#: login-utils/chsh.c:344
msgid "Shell not changed."
msgstr "Shell 未更改。"
-#: login-utils/chsh.c:356
+#: login-utils/chsh.c:349
msgid "Shell *NOT* changed. Try again later."
msgstr "Shell *未* 更改。请稍后重试。"
-#: login-utils/chsh.c:360
+#: login-utils/chsh.c:353
msgid ""
"setpwnam failed\n"
"Shell *NOT* changed. Try again later."
"setpwnam 失败\n"
"Shell *未* 更改。请稍后重试。"
-#: login-utils/chsh.c:364
+#: login-utils/chsh.c:357
#, c-format
msgid "Shell changed.\n"
msgstr "Shell 已更改。\n"
msgid "Usage: %s <passwordfile> <username>...\n"
msgstr "用法：%s <密码文件> <用户名>...\n"
-#: login-utils/last.c:169 login-utils/lslogins.c:1369 sys-utils/dmesg.c:1288
+#: login-utils/last.c:174 login-utils/lslogins.c:1373 sys-utils/dmesg.c:1300
#: sys-utils/lsipc.c:282
#, c-format
msgid "unknown time format: %s"
msgstr "未知时间格式: %s"
-#: login-utils/last.c:278 login-utils/last.c:286
+#: login-utils/last.c:285 login-utils/last.c:293
#, c-format
msgid "Interrupted %s"
msgstr "中断的 %s"
-#: login-utils/last.c:443 login-utils/last.c:454 login-utils/last.c:897
+#: login-utils/last.c:451 login-utils/last.c:462 login-utils/last.c:912
msgid "preallocation size exceeded"
msgstr "超过了预分配大小"
-#: login-utils/last.c:573
+#: login-utils/last.c:581
#, c-format
msgid " %s [options] [<username>...] [<tty>...]\n"
msgstr " %s [选项] [<用户名>...] [<tty>...]\n"
-#: login-utils/last.c:576
+#: login-utils/last.c:584
msgid "Show a listing of last logged in users.\n"
msgstr "显示上次登录用户的列表。\n"
-#: login-utils/last.c:579
+#: login-utils/last.c:587
msgid " -<number> how many lines to show\n"
msgstr " -<数字> 显示行数\n"
-#: login-utils/last.c:580
+#: login-utils/last.c:588
msgid " -a, --hostlast display hostnames in the last column\n"
msgstr " -a, --hostlast 最后一列显示主机名\n"
-#: login-utils/last.c:581
+#: login-utils/last.c:589
msgid " -d, --dns translate the IP number back into a hostname\n"
msgstr " -d, --dns 将 IP 号转换回主机名\n"
-#: login-utils/last.c:583
+#: login-utils/last.c:591
#, c-format
msgid " -f, --file <file> use a specific file instead of %s\n"
msgstr " -F, --file <文件> 用指定文件代替 %s\n"
-#: login-utils/last.c:584
+#: login-utils/last.c:592
msgid " -F, --fulltimes print full login and logout times and dates\n"
msgstr " -F, --fulltimes 打印完整的登录和注销时间和日期\n"
-#: login-utils/last.c:585
+#: login-utils/last.c:593
msgid " -i, --ip display IP numbers in numbers-and-dots notation\n"
msgstr " -i, --ip 以数字和点的形式显示 IP 号\n"
-#: login-utils/last.c:586
+#: login-utils/last.c:594
msgid " -n, --limit <number> how many lines to show\n"
msgstr " -n, --limit <数字> 要显示的行数\n"
-#: login-utils/last.c:587
+#: login-utils/last.c:595
msgid " -R, --nohostname don't display the hostname field\n"
msgstr " -R, --nohostname 不显示主机名字段\n"
-#: login-utils/last.c:588
+#: login-utils/last.c:596
msgid " -s, --since <time> display the lines since the specified time\n"
msgstr " -s, --since <时间> 显示从指定时间起的行\n"
-#: login-utils/last.c:589
+#: login-utils/last.c:597
msgid " -t, --until <time> display the lines until the specified time\n"
msgstr " -t, --until <时间> 显示到指定时间为止的行\n"
-#: login-utils/last.c:590
+#: login-utils/last.c:598
msgid " -p, --present <time> display who were present at the specified time\n"
msgstr " -p, --present <时间> 显示在指定时间谁在场(present)\n"
-#: login-utils/last.c:591
+#: login-utils/last.c:599
msgid " -w, --fullnames display full user and domain names\n"
msgstr " -w, --fullnames 显示完整的用户名和域名\n"
-#: login-utils/last.c:592
+#: login-utils/last.c:600
msgid " -x, --system display system shutdown entries and run level changes\n"
msgstr " -x, --system 显示系统关机项和运行级别更改\n"
-#: login-utils/last.c:593
+#: login-utils/last.c:601
msgid ""
" --time-format <format> show timestamps in the specified <format>:\n"
" notime|short|full|iso\n"
" --time-format <格式> 以指定<格式>显示时间戳：\n"
" notime|short|full|iso\n"
-#: login-utils/last.c:898
+#: login-utils/last.c:913
#, fuzzy, c-format
msgid ""
"\n"
"\n"
"%s 开始 %s"
-#: login-utils/last.c:976 term-utils/scriptlive.c:85 term-utils/scriptlive.c:89
-#: term-utils/scriptreplay.c:79 term-utils/scriptreplay.c:83
-#: text-utils/more.c:280 text-utils/more.c:286
+#: login-utils/last.c:1022 term-utils/scriptlive.c:85
+#: term-utils/scriptlive.c:89 term-utils/scriptreplay.c:80
+#: term-utils/scriptreplay.c:84 text-utils/more.c:281 text-utils/more.c:287
msgid "failed to parse number"
msgstr "解析数字失败"
-#: login-utils/last.c:997 login-utils/last.c:1002 login-utils/last.c:1007
-#: sys-utils/rtcwake.c:512
+#: login-utils/last.c:1043 login-utils/last.c:1048 login-utils/last.c:1053
+#: sys-utils/dmesg.c:1514 sys-utils/dmesg.c:1522 sys-utils/rtcwake.c:511
#, c-format
msgid "invalid time value \"%s\""
msgstr "无效的时间值\"%s\""
msgid "user attribute not changed: %s"
msgstr "用户属性未更改：%s"
-#: login-utils/login.c:366
+#: login-utils/login.c:417
+#, c-format
+msgid "You have new mail.\n"
+msgstr "有您的新邮件。\n"
+
+#: login-utils/login.c:419
+#, c-format
+msgid "You have mail.\n"
+msgstr "有您的邮件。\n"
+
+#: login-utils/login.c:442
#, c-format
msgid "FATAL: can't reopen tty: %m"
msgstr "致命：无法重新打开 tty：%m"
-#: login-utils/login.c:372
+#: login-utils/login.c:448
#, c-format
msgid "FATAL: %s is not a terminal"
msgstr "致命：%s 不是终端"
-#: login-utils/login.c:390
-#, c-format
-msgid "chown (%s, %lu, %lu) failed: %m"
+#: login-utils/login.c:467
+#, fuzzy, c-format
+msgid "chown (%s, %u, %u) failed: %m"
msgstr "chown (%s, %lu, %lu) 失败：%m"
-#: login-utils/login.c:394
+#: login-utils/login.c:472
#, c-format
msgid "chmod (%s, %u) failed: %m"
msgstr "chmod (%s, %u) 失败：%m"
-#: login-utils/login.c:455
+#: login-utils/login.c:534
msgid "FATAL: bad tty"
msgstr "致命：坏的 tty"
-#: login-utils/login.c:473
+#: login-utils/login.c:552
#, c-format
msgid "FATAL: %s: change permissions failed: %m"
msgstr "致命：%s：更改权限失败：%m"
-#: login-utils/login.c:604
+#: login-utils/login.c:682
#, c-format
msgid "Last login: %.*s "
msgstr "上次登录：%.*s "
-#: login-utils/login.c:606
-#, c-format
-msgid "from %.*s\n"
+#: login-utils/login.c:686
+#, fuzzy, c-format
+msgid "from %s\n"
msgstr "来自 %.*s\n"
-#: login-utils/login.c:609
-#, c-format
-msgid "on %.*s\n"
+#: login-utils/login.c:689
+#, fuzzy, c-format
+msgid "on %s\n"
msgstr "于 %.*s\n"
-#: login-utils/login.c:625
+#: login-utils/login.c:705
msgid "write lastlog failed"
msgstr "写 lastlog 失败"
-#: login-utils/login.c:716
+#: login-utils/login.c:796
#, c-format
msgid "DIALUP AT %s BY %s"
msgstr "DIALUP AT %s BY %s"
-#: login-utils/login.c:721
+#: login-utils/login.c:801
#, c-format
msgid "ROOT LOGIN ON %s FROM %s"
msgstr "ROOT LOGIN ON %s FROM %s"
-#: login-utils/login.c:724
+#: login-utils/login.c:804
#, c-format
msgid "ROOT LOGIN ON %s"
msgstr "ROOT LOGIN ON %s"
-#: login-utils/login.c:727
+#: login-utils/login.c:807
#, c-format
msgid "LOGIN ON %s BY %s FROM %s"
msgstr "LOGIN ON %s BY %s FROM %s"
-#: login-utils/login.c:730
+#: login-utils/login.c:810
#, c-format
msgid "LOGIN ON %s BY %s"
msgstr "LOGIN ON %s BY %s"
-#: login-utils/login.c:764
+#: login-utils/login.c:845
msgid "login: "
msgstr "登录："
-#: login-utils/login.c:795
+#: login-utils/login.c:881
#, c-format
msgid "PAM failure, aborting: %s"
msgstr "PAM 失败，将中止：%s"
-#: login-utils/login.c:796
+#: login-utils/login.c:882
#, c-format
msgid "Couldn't initialize PAM: %s"
msgstr "无法初始化 PAM：%s"
-#: login-utils/login.c:866
+#: login-utils/login.c:955
#, c-format
msgid "FAILED LOGIN %u FROM %s FOR %s, %s"
msgstr "FAILED LOGIN %u FROM %s FOR %s, %s"
-#: login-utils/login.c:874 login-utils/sulogin.c:1013
+#: login-utils/login.c:965 login-utils/sulogin.c:1014
#, c-format
msgid ""
"Login incorrect\n"
"登录不正确\n"
"\n"
-#: login-utils/login.c:889
+#: login-utils/login.c:967
+#, fuzzy, c-format
+msgid ""
+"Password incorrect\n"
+"\n"
+msgstr ""
+"登录不正确\n"
+"\n"
+
+#: login-utils/login.c:981
#, 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:895
+#: login-utils/login.c:987
#, c-format
msgid "FAILED LOGIN SESSION FROM %s FOR %s, %s"
msgstr "FAILED LOGIN SESSION FROM %s FOR %s, %s"
-#: login-utils/login.c:903
+#: login-utils/login.c:995
#, c-format
msgid ""
"\n"
"\n"
"登录不正确\n"
-#: login-utils/login.c:931 login-utils/login.c:1314 login-utils/login.c:1337
+#: login-utils/login.c:1023 login-utils/login.c:1411 login-utils/login.c:1437
msgid ""
"\n"
"Session setup problem, abort."
"\n"
"会话设置问题，中止。"
-#: login-utils/login.c:932
+#: login-utils/login.c:1024
msgid "NULL user name. Abort."
msgstr "空（NULL）用户名。中止。"
-#: login-utils/login.c:1070
+#: login-utils/login.c:1162
#, c-format
msgid "TIOCSCTTY failed: %m"
msgstr "TIOCSCTTY 失败：%m"
-#: login-utils/login.c:1174
+#: login-utils/login.c:1264
#, c-format
msgid " %s [-p] [-h <host>] [-H] [[-f] <username>]\n"
msgstr "%s [-p] [-h <主机>] [-H] [[-f] <用户名>]\n"
-#: login-utils/login.c:1176
+#: login-utils/login.c:1266
msgid "Begin a session on the system.\n"
msgstr "在此系统上开始一次会话。\n"
-#: login-utils/login.c:1179
+#: login-utils/login.c:1269
msgid " -p do not destroy the environment"
msgstr " -p 不要清空环境信息"
-#: login-utils/login.c:1180
+#: login-utils/login.c:1270
#, fuzzy
msgid " -f skip a login authentication"
msgstr " -f 不分割长行\n"
-#: login-utils/login.c:1181
+#: login-utils/login.c:1271
msgid " -h <host> hostname to be used for utmp logging"
msgstr ""
-#: login-utils/login.c:1182
+#: login-utils/login.c:1272
msgid " -H suppress hostname in the login prompt"
msgstr " -H 在登录提示符中不显示主机名"
-#: login-utils/login.c:1228
+#. TRANSLATORS: The standard value for %u is 60.
+#: login-utils/login.c:1296
#, c-format
msgid "%s: timed out after %u seconds"
msgstr "%s：%u 秒后超时"
-#: login-utils/login.c:1255
+#: login-utils/login.c:1323
#, c-format
msgid "login: -h is for superuser only\n"
msgstr "login：-h 是超级用户专用选项\n"
-#: login-utils/login.c:1315
+#: login-utils/login.c:1412
#, c-format
msgid "Invalid user name \"%s\". Abort."
msgstr "无效的用户名“%s”。中止。"
-#: login-utils/login.c:1336
+#: login-utils/login.c:1436
#, c-format
msgid "groups initialization failed: %m"
msgstr "组初始化失败：%m"
-#: login-utils/login.c:1361 sys-utils/mount.c:57 sys-utils/umount.c:122
+#: login-utils/login.c:1464 sys-utils/mount.c:59 sys-utils/umount.c:123
msgid "setgid() failed"
msgstr "setgid() 失败"
-#: login-utils/login.c:1391
-#, c-format
-msgid "You have new mail.\n"
-msgstr "有您的新邮件。\n"
-
-#: login-utils/login.c:1393
-#, c-format
-msgid "You have mail.\n"
-msgstr "有您的邮件。\n"
-
-#: login-utils/login.c:1407 sys-utils/mount.c:60 sys-utils/umount.c:125
+#: login-utils/login.c:1488 sys-utils/mount.c:62 sys-utils/umount.c:126
msgid "setuid() failed"
msgstr "setuid() 失败"
-#: login-utils/login.c:1413 login-utils/sulogin.c:731
+#: login-utils/login.c:1494 login-utils/sulogin.c:731
#, c-format
msgid "%s: change directory failed"
msgstr "%s：更改目录失败"
-#: login-utils/login.c:1420 login-utils/sulogin.c:732
+#: login-utils/login.c:1501 login-utils/sulogin.c:732
#, c-format
msgid "Logging in with home = \"/\".\n"
msgstr "以 home = “/” 登录。\n"
-#: login-utils/login.c:1446
+#: login-utils/login.c:1529
msgid "couldn't exec shell script"
msgstr "无法执行(exec) shell 脚本"
-#: login-utils/login.c:1448
+#: login-utils/login.c:1531
msgid "no shell"
msgstr "无 shell"
msgid "hush login status: restore original IDs failed"
msgstr "静默(hush)登录状态：恢复原 ID 失败"
-#: login-utils/lslogins.c:217 sys-utils/lscpu.c:1602 sys-utils/lscpu.c:1612
+#: login-utils/lslogins.c:217 sys-utils/lscpu.c:412 sys-utils/lscpu.c:422
#: sys-utils/lsmem.c:266
msgid "no"
msgstr "否"
-#: login-utils/lslogins.c:226 misc-utils/lsblk.c:189
+#: login-utils/lslogins.c:226 misc-utils/lsblk.c:196
msgid "user name"
msgstr "用户名"
msgid "Running processes"
msgstr "运行中的进程"
-#: login-utils/lslogins.c:301 misc-utils/findmnt.c:136 misc-utils/lsblk.c:229
+#: login-utils/lslogins.c:301 misc-utils/findmnt.c:138 misc-utils/lsblk.c:236
#: sys-utils/lsipc.c:204 sys-utils/lsmem.c:145
#, c-format
msgid "too many columns specified, the limit is %zu columns"
msgid "failed to compose time string"
msgstr "生成时间字符串失败"
-#: login-utils/lslogins.c:759
+#: login-utils/lslogins.c:761
msgid "failed to get supplementary groups"
msgstr "获得附属组失败"
-#: login-utils/lslogins.c:1045
+#: login-utils/lslogins.c:1046
#, c-format
msgid "cannot found '%s'"
msgstr "无法找到“%s”"
-#: login-utils/lslogins.c:1221
+#: login-utils/lslogins.c:1225
msgid "internal error: unknown column"
msgstr "内部错误：未知的列"
-#: login-utils/lslogins.c:1318
+#: login-utils/lslogins.c:1322
#, c-format
msgid ""
"\n"
"\n"
"上次的日志：\n"
-#: login-utils/lslogins.c:1381
+#: login-utils/lslogins.c:1385
msgid "Display information about known users in the system.\n"
msgstr "显示系统中已知用户的信息。\n"
-#: login-utils/lslogins.c:1384
+#: login-utils/lslogins.c:1388
msgid " -a, --acc-expiration display info about passwords expiration\n"
msgstr " -a, --acc-expiration 显示关于密码过期的信息\n"
-#: login-utils/lslogins.c:1385
+#: login-utils/lslogins.c:1389
msgid " -c, --colon-separate display data in a format similar to /etc/passwd\n"
msgstr " -c, --colon-separate 以与 /etc/passwd 相似的格式显示日期\n"
-#: login-utils/lslogins.c:1386 sys-utils/lsipc.c:310
+#: login-utils/lslogins.c:1390 sys-utils/lsipc.c:310
msgid " -e, --export display in an export-able output format\n"
msgstr " -e, --export 以可导出的格式显示\n"
-#: login-utils/lslogins.c:1387
+#: login-utils/lslogins.c:1391
msgid " -f, --failed display data about the users' last failed logins\n"
msgstr " -f, --failed 显示有关该用户上次登录失败的数据\n"
-#: login-utils/lslogins.c:1388
+#: login-utils/lslogins.c:1392
msgid " -G, --supp-groups display information about groups\n"
msgstr " -G, --supp-groups 显示与组相关的信息\n"
-#: login-utils/lslogins.c:1389
+#: login-utils/lslogins.c:1393
msgid " -g, --groups=<groups> display users belonging to a group in <groups>\n"
msgstr " -g, --groups=<groups> 显示属于<groups>中的组的用户\n"
-#: login-utils/lslogins.c:1390
+#: login-utils/lslogins.c:1394
msgid " -L, --last show info about the users' last login sessions\n"
msgstr " -L, --last 显示关于该用户上次登录会话的信息\n"
-#: login-utils/lslogins.c:1391
+#: login-utils/lslogins.c:1395
msgid " -l, --logins=<logins> display only users from <logins>\n"
msgstr " -l, --logins=<登录方式> 只显示以指定<登录方式>登录的用户\n"
-#: login-utils/lslogins.c:1392 sys-utils/lsipc.c:312
+#: login-utils/lslogins.c:1396 sys-utils/lsipc.c:312
msgid " -n, --newline display each piece of information on a new line\n"
msgstr " -n, --newline 逐行显示每一部分信息\n"
-#: login-utils/lslogins.c:1393 sys-utils/lsipc.c:305
+#: login-utils/lslogins.c:1397 sys-utils/lsipc.c:305
msgid " --noheadings don't print headings\n"
msgstr " --noheadings 不打印标题\n"
-#: login-utils/lslogins.c:1394 sys-utils/lsipc.c:306
+#: login-utils/lslogins.c:1398 sys-utils/lsipc.c:306
msgid " --notruncate don't truncate output\n"
msgstr " --notruncate 不截断输出\n"
-#: login-utils/lslogins.c:1395 sys-utils/lsipc.c:314
+#: login-utils/lslogins.c:1399 sys-utils/lsipc.c:314
msgid " -o, --output[=<list>] define the columns to output\n"
msgstr " -o, --output[=<列表>] 定义要输出的列\n"
-#: login-utils/lslogins.c:1396
+#: login-utils/lslogins.c:1400
msgid " --output-all output all columns\n"
msgstr " --output-all 输出所有列\n"
-#: login-utils/lslogins.c:1397
+#: login-utils/lslogins.c:1401
msgid " -p, --pwd display information related to login by password.\n"
msgstr " -p, --pwd 显示与 用密码登录 相关的信息。\n"
-#: login-utils/lslogins.c:1398 sys-utils/lsipc.c:316
+#: login-utils/lslogins.c:1402 sys-utils/lsipc.c:316
msgid " -r, --raw display in raw mode\n"
msgstr " -r, --raw 以原始方式显示\n"
-#: login-utils/lslogins.c:1399
+#: login-utils/lslogins.c:1403
msgid " -s, --system-accs display system accounts\n"
msgstr " -s, --system-accs 显示系统帐户\n"
-#: login-utils/lslogins.c:1400 sys-utils/lsipc.c:307
+#: login-utils/lslogins.c:1404 sys-utils/lsipc.c:307
msgid " --time-format=<type> display dates in short, full or iso format\n"
msgstr " --time-format=<格式> 以短、长或 iso 格式显示日期\n"
-#: login-utils/lslogins.c:1401
+#: login-utils/lslogins.c:1405
msgid " -u, --user-accs display user accounts\n"
msgstr " -u, --user-accs 显示用户帐户\n"
-#: login-utils/lslogins.c:1402
+#: login-utils/lslogins.c:1406
msgid " -Z, --context display SELinux contexts\n"
msgstr " -Z, --context 显示 SELinux 环境\n"
-#: login-utils/lslogins.c:1403
+#: login-utils/lslogins.c:1407
msgid " -z, --print0 delimit user entries with a nul character\n"
msgstr " -z, --print0 用空字符(nul)分隔用户记录项\n"
-#: login-utils/lslogins.c:1404
+#: login-utils/lslogins.c:1408
msgid " --wtmp-file <path> set an alternate path for wtmp\n"
msgstr " --wtmp-file <路径> 设置 wtmp 的可选路径\n"
-#: login-utils/lslogins.c:1405
+#: login-utils/lslogins.c:1409
msgid " --btmp-file <path> set an alternate path for btmp\n"
msgstr " --btmp-file <路径> 设置 btmp 的可选路径\n"
-#: login-utils/lslogins.c:1406
+#: login-utils/lslogins.c:1410
#, fuzzy
msgid " --lastlog <path> set an alternate path for lastlog\n"
msgstr " --wtmp-file <路径> 设置 wtmp 的可选路径\n"
-#: login-utils/lslogins.c:1595
+#: login-utils/lslogins.c:1599
msgid "failed to request selinux state"
msgstr "请求 selinux 状态失败"
-#: login-utils/lslogins.c:1609 login-utils/lslogins.c:1614
+#: login-utils/lslogins.c:1613 login-utils/lslogins.c:1618
msgid "Only one user may be specified. Use -l for multiple users."
msgstr "只能指定一个用户。多用户请使用 -l。"
msgid "Password: "
msgstr "密码："
-#: login-utils/newgrp.c:160 login-utils/sulogin.c:997
+#: login-utils/newgrp.c:160 login-utils/sulogin.c:998
msgid "crypt failed"
msgstr "crypt 失败"
msgid "who are you?"
msgstr "您是哪位？"
-#: login-utils/newgrp.c:216 login-utils/newgrp.c:228 sys-utils/nsenter.c:482
+#: login-utils/newgrp.c:216 login-utils/newgrp.c:228 sys-utils/nsenter.c:484
#: sys-utils/unshare.c:663 text-utils/more.c:1256
msgid "setgid failed"
msgstr "setgid 失败"
msgid "no such group"
msgstr "无此组"
-#: login-utils/newgrp.c:232 sys-utils/nsenter.c:484 sys-utils/unshare.c:666
+#: login-utils/newgrp.c:232 sys-utils/nsenter.c:486 sys-utils/unshare.c:666
#: text-utils/more.c:1254
msgid "setuid failed"
msgstr "setuid 失败"
-#: login-utils/nologin.c:27 misc-utils/lslocks.c:528 misc-utils/mcookie.c:83
-#: misc-utils/uuidd.c:62 misc-utils/uuidgen.c:26 sys-utils/dmesg.c:269
-#: sys-utils/ipcmk.c:67 sys-utils/irqtop.c:217 sys-utils/lscpu.c:2261
+#: login-utils/nologin.c:28 misc-utils/lslocks.c:528 misc-utils/mcookie.c:83
+#: misc-utils/uuidd.c:95 misc-utils/uuidgen.c:26 sys-utils/dmesg.c:272
+#: sys-utils/ipcmk.c:67 sys-utils/irqtop.c:244 sys-utils/lscpu.c:1136
#: sys-utils/lsipc.c:291 sys-utils/lsirq.c:57 sys-utils/lsmem.c:506
#: sys-utils/readprofile.c:104 sys-utils/rtcwake.c:99
-#: term-utils/scriptlive.c:57 term-utils/scriptreplay.c:46
+#: term-utils/scriptlive.c:57 term-utils/scriptreplay.c:47
#: term-utils/setterm.c:381 text-utils/line.c:31
#, c-format
msgid " %s [options]\n"
msgstr " %s [选项]\n"
-#: login-utils/nologin.c:30
+#: login-utils/nologin.c:31
msgid "Politely refuse a login.\n"
msgstr "客气的拒绝登录。\n"
-#: login-utils/nologin.c:33
+#: login-utils/nologin.c:34
msgid " -c, --command <command> does nothing (for compatibility with su -c)\n"
msgstr " -c, --command <命令> 无操作（用于保持与 su -c 的兼容性）\n"
-#: login-utils/nologin.c:113
+#: login-utils/nologin.c:109
#, c-format
msgid "This account is currently not available.\n"
msgstr "此帐户目前不可用。\n"
msgid " (core dumped)"
msgstr " (核心已转储)"
-#: login-utils/su-common.c:349
+#: login-utils/su-common.c:275
+msgid "change owner or mode for pseudo-terminal failed"
+msgstr ""
+
+#: login-utils/su-common.c:369
msgid "failed to modify environment"
msgstr "修改环境失败"
-#: login-utils/su-common.c:385
+#: login-utils/su-common.c:405
msgid "may not be used by non-root users"
msgstr "非 root 用户不能使用"
-#: login-utils/su-common.c:409
+#: login-utils/su-common.c:429
msgid "authentication failed"
msgstr "验证失败"
-#: login-utils/su-common.c:422
+#: login-utils/su-common.c:442
#, c-format
msgid "cannot open session: %s"
msgstr "无法打开会话：%s"
-#: login-utils/su-common.c:441
+#: login-utils/su-common.c:461
msgid "cannot block signals"
msgstr "无法阻塞信号"
-#: login-utils/su-common.c:458
+#: login-utils/su-common.c:478
msgid "cannot initialize signal mask for session"
msgstr ""
-#: login-utils/su-common.c:466
+#: login-utils/su-common.c:486
#, fuzzy
msgid "cannot initialize signal mask"
msgstr "无法阻塞信号"
-#: login-utils/su-common.c:476
+#: login-utils/su-common.c:496
#, fuzzy
msgid "cannot set signal handler for session"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:484 misc-utils/uuidd.c:401 sys-utils/lscpu.c:889
+#: login-utils/su-common.c:504 misc-utils/uuidd.c:435
+#: sys-utils/lscpu-virt.c:486
msgid "cannot set signal handler"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:492
+#: login-utils/su-common.c:512
#, fuzzy
msgid "cannot set signal mask"
msgstr "无法设置信号处理函数"
-#: login-utils/su-common.c:517 term-utils/script.c:949
+#: login-utils/su-common.c:538 term-utils/script.c:944
#: term-utils/scriptlive.c:296
#, fuzzy
msgid "failed to create pseudo-terminal"
msgstr "创建新磁盘标签失败"
-#: login-utils/su-common.c:529 term-utils/script.c:959
+#: login-utils/su-common.c:550 term-utils/script.c:954
#: term-utils/scriptlive.c:303
msgid "cannot create child process"
msgstr "无法创建子进程"
-#: login-utils/su-common.c:548
+#: login-utils/su-common.c:569 sys-utils/nsenter.c:461
+#: sys-utils/switch_root.c:189
#, c-format
msgid "cannot change directory to %s"
msgstr "无法更改到 %s 目录"
-#: login-utils/su-common.c:575 term-utils/scriptlive.c:352
+#: login-utils/su-common.c:595 term-utils/scriptlive.c:352
#, c-format
msgid ""
"\n"
"\n"
"会话已终止，正在杀死 shell..."
-#: login-utils/su-common.c:586
+#: login-utils/su-common.c:606
#, c-format
msgid " ...killed.\n"
msgstr " ...已杀死。\n"
-#: login-utils/su-common.c:683
+#: login-utils/su-common.c:703
msgid "failed to set the PATH environment variable"
msgstr "设置 PATH 环境变量失败"
-#: login-utils/su-common.c:760
+#: login-utils/su-common.c:780
msgid "cannot set groups"
msgstr "无法设置 组"
-#: login-utils/su-common.c:766
+#: login-utils/su-common.c:786
#, fuzzy, c-format
msgid "failed to establish user credentials: %s"
msgstr "解析级别“%s”失败"
-#: login-utils/su-common.c:776 sys-utils/eject.c:660
+#: login-utils/su-common.c:796 sys-utils/eject.c:660
msgid "cannot set group id"
msgstr "无法设置 组 id"
-#: login-utils/su-common.c:778 sys-utils/eject.c:663
+#: login-utils/su-common.c:798 sys-utils/eject.c:663
msgid "cannot set user id"
msgstr "无法设置 用户 id"
-#: login-utils/su-common.c:846
+#: login-utils/su-common.c:866
msgid " -m, -p, --preserve-environment do not reset environment variables\n"
msgstr " -m, -p, --preserve-environment 不重置环境变量\n"
-#: login-utils/su-common.c:847
+#: login-utils/su-common.c:867
#, fuzzy
msgid " -w, --whitelist-environment <list> don't reset specified variables\n"
msgstr " -m, -p, --preserve-environment 不重置环境变量\n"
-#: login-utils/su-common.c:850
+#: login-utils/su-common.c:870
msgid " -g, --group <group> specify the primary group\n"
msgstr " -g, --group <组> 指定主组\n"
-#: login-utils/su-common.c:851
+#: login-utils/su-common.c:871
#, fuzzy
msgid " -G, --supp-group <group> specify a supplemental group\n"
msgstr ""
" -G, --supp-group <组> 指定一个辅助组\n"
"\n"
-#: login-utils/su-common.c:854
+#: login-utils/su-common.c:874
msgid " -, -l, --login make the shell a login shell\n"
msgstr " -, -l, --login 使 shell 成为登录 shell\n"
-#: login-utils/su-common.c:855
+#: login-utils/su-common.c:875
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:856
+#: login-utils/su-common.c:876
msgid ""
" --session-command <command> pass a single command to the shell with -c\n"
" and do not create a new session\n"
" --session-command <命令> 使用 -c 向 shell 传递一条命令\n"
" 而不创建新会话\n"
-#: login-utils/su-common.c:858
+#: login-utils/su-common.c:878
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:859
+#: login-utils/su-common.c:879
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:860
+#: login-utils/su-common.c:880
msgid " -P, --pty create a new pseudo-terminal\n"
msgstr ""
-#: login-utils/su-common.c:870
+#: login-utils/su-common.c:890
#, fuzzy, c-format
msgid ""
" %1$s [options] -u <user> [[--] <command>]\n"
" %1$s [选项] <设备> [[-N] <分区>]\n"
" %1$s [选项] <命令>\n"
-#: login-utils/su-common.c:875
+#: login-utils/su-common.c:895
#, fuzzy
msgid ""
"Run <command> with the effective user ID and group ID of <user>. If -u is\n"
"将退而使用与 su(1) 兼容的语法并执行标准 shell。\n"
"选项 -c、-f、-l 及 -s 与 -u 相互排斥。\n"
-#: login-utils/su-common.c:880
+#: login-utils/su-common.c:900
#, fuzzy
msgid " -u, --user <user> username\n"
msgstr " -u, --user <用户> 用户名\n"
-#: login-utils/su-common.c:891
+#: login-utils/su-common.c:911
#, c-format
msgid " %s [options] [-] [<user> [<argument>...]]\n"
msgstr " %s [选项] [-] [<用户> [<参数>...]]\n"
-#: login-utils/su-common.c:895
+#: login-utils/su-common.c:915
#, fuzzy
msgid ""
"Change the effective user ID and group ID to that of <user>.\n"
"将有效用户 id 和组 id 更改为<用户>的 id。\n"
"单个 - 视为 -l。如果未指定<用户>，将假定为 root。\n"
-#: login-utils/su-common.c:943
+#: login-utils/su-common.c:963
#, 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:949
+#: login-utils/su-common.c:969
#, c-format
msgid "group %s does not exist"
msgstr "组 %s 不存在"
-#: login-utils/su-common.c:1058
+#: login-utils/su-common.c:1078
msgid "--pty is not supported for your system"
msgstr "--pty 在您的系统上不受支持"
-#: login-utils/su-common.c:1092
+#: login-utils/su-common.c:1112
msgid "ignoring --preserve-environment, it's mutually exclusive with --login"
msgstr "将忽略 --preserve-environment，它与 --login 互斥。"
-#: login-utils/su-common.c:1106
+#: login-utils/su-common.c:1126
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:1109
+#: login-utils/su-common.c:1129
msgid "no command was specified"
msgstr "没有指定命令"
-#: login-utils/su-common.c:1121
+#: login-utils/su-common.c:1141
msgid "only root can specify alternative groups"
msgstr "只有 root 用户能指定替代组"
-#: login-utils/su-common.c:1132
+#: login-utils/su-common.c:1152
#, 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:1167
+#: login-utils/su-common.c:1187
#, c-format
msgid "using restricted shell %s"
msgstr "将使用受限 shell %s"
-#: login-utils/su-common.c:1186
+#: login-utils/su-common.c:1206
msgid "failed to allocate pty handler"
msgstr ""
-#: login-utils/su-common.c:1208
+#: login-utils/su-common.c:1232
#, c-format
msgid "warning: cannot change directory to %s"
msgstr "警告：无法更改到 %s 目录"
msgid "change directory to system root failed"
msgstr "更改到系统根目录失败"
-#: login-utils/sulogin.c:784
+#: login-utils/sulogin.c:785
msgid "setexeccon failed"
msgstr "setexeccon 失败"
-#: login-utils/sulogin.c:805
+#: login-utils/sulogin.c:806
#, c-format
msgid " %s [options] [tty device]\n"
msgstr " %s [选项] [tty 设备]\n"
-#: login-utils/sulogin.c:808
+#: login-utils/sulogin.c:809
msgid "Single-user login.\n"
msgstr "单用户登录。\n"
-#: login-utils/sulogin.c:811
+#: login-utils/sulogin.c:812
msgid ""
" -p, --login-shell start a login shell\n"
" -t, --timeout <seconds> max time to wait for a password (default: no limit)\n"
" -t, --timeout <秒数> 等待密码的最大时间(默认：无限制)\n"
" -e, --force 如果 getpwnam(3) 失败，直接检查密码文件\n"
-#: login-utils/sulogin.c:867 misc-utils/findmnt.c:1498 sys-utils/wdctl.c:640
-#: term-utils/agetty.c:843 term-utils/wall.c:218
+#: login-utils/sulogin.c:868 misc-utils/findmnt.c:1520 sys-utils/wdctl.c:640
+#: term-utils/agetty.c:847 term-utils/wall.c:218
msgid "invalid timeout argument"
msgstr "无效的 timeout 超时参数"
-#: login-utils/sulogin.c:886
+#: login-utils/sulogin.c:887
msgid "only superuser can run this program"
msgstr "只有超级用户能运行此程序"
-#: login-utils/sulogin.c:929
+#: login-utils/sulogin.c:930
msgid "cannot open console"
msgstr "打不开终端"
-#: login-utils/sulogin.c:936
+#: login-utils/sulogin.c:937
msgid "cannot open password database"
msgstr "无法打开密码数据库"
-#: login-utils/sulogin.c:1010
+#: login-utils/sulogin.c:1011
#, fuzzy, c-format
msgid ""
"cannot execute su shell\n"
"无法执行 su shell\n"
"\n"
-#: login-utils/sulogin.c:1017
+#: login-utils/sulogin.c:1018
msgid ""
"Timed out\n"
"\n"
"超时\n"
"\n"
-#: login-utils/sulogin.c:1049
+#: login-utils/sulogin.c:1050
#, fuzzy
msgid ""
"cannot wait on su shell\n"
msgid " -o, --output <file> write to file instead of standard output\n"
msgstr " -o, --output <文件> 写入文件而非标准输出\n"
-#: login-utils/utmpdump.c:377
+#: login-utils/utmpdump.c:381
msgid "following standard input is unsupported"
msgstr "不支持跟随(follow)标准输入"
-#: login-utils/utmpdump.c:383
+#: login-utils/utmpdump.c:387
#, c-format
msgid "Utmp undump of %s\n"
msgstr "%s 的 Utmp undump\n"
-#: login-utils/utmpdump.c:386
+#: login-utils/utmpdump.c:390
#, c-format
msgid "Utmp dump of %s\n"
msgstr "%s 的 Utmp dump\n"
-#: login-utils/vipw.c:145
+#: login-utils/vipw.c:129
msgid "can't open temporary file"
msgstr "无法打开临时文件"
-#: login-utils/vipw.c:161
+#: login-utils/vipw.c:149
#, c-format
msgid "%s: create a link to %s failed"
msgstr "%s：创建指向 %s 的链接失败"
-#: login-utils/vipw.c:168
+#: login-utils/vipw.c:157
#, c-format
msgid "Can't get context for %s"
msgstr "无法获取 %s 的环境"
-#: login-utils/vipw.c:174
+#: login-utils/vipw.c:163
#, c-format
msgid "Can't set context for %s"
msgstr "无法设置 %s 的环境"
-#: login-utils/vipw.c:239
+#: login-utils/vipw.c:228
#, c-format
msgid "%s unchanged"
msgstr "%s 未改变"
-#: login-utils/vipw.c:257
+#: login-utils/vipw.c:246
msgid "cannot get lock"
msgstr "无法获得锁"
-#: login-utils/vipw.c:284
+#: login-utils/vipw.c:273
msgid "no changes made"
msgstr "无改变"
-#: login-utils/vipw.c:293
+#: login-utils/vipw.c:282
msgid "cannot chmod file"
msgstr "无法对文件 chmod"
-#: login-utils/vipw.c:308
+#: login-utils/vipw.c:297
msgid "Edit the password or group file.\n"
msgstr "编辑密码或组文件。\n"
-#: login-utils/vipw.c:360
+#: login-utils/vipw.c:349
msgid "You are using shadow groups on this system.\n"
msgstr "您正在使用此系统上的遮蔽(shadow)组。\n"
-#: login-utils/vipw.c:361
+#: login-utils/vipw.c:350
msgid "You are using shadow passwords on this system.\n"
msgstr "您正在使用此系统上的遮蔽(shadow)密码。\n"
#. TRANSLATORS: this program uses for y and n rpmatch(3),
#. * which means they can be translated.
-#: login-utils/vipw.c:365
+#: login-utils/vipw.c:354
#, c-format
msgid "Would you like to edit %s now [y/n]? "
msgstr "您想现在编辑 %s 吗[y/n]？"
#: misc-utils/blkid.c:93
#, fuzzy
+msgid " -H, --hint <value> set hint for probing function\n"
+msgstr " -P, --port <端口> 使用指定端口进行 UDP 或 TCP 连接\n"
+
+#: misc-utils/blkid.c:94
+#, fuzzy
msgid " -S, --size <size> overwrite device size\n"
msgstr " -s, --size <尺寸> 设备尺寸\n"
-#: misc-utils/blkid.c:94
+#: misc-utils/blkid.c:95
#, fuzzy
msgid " -O, --offset <offset> probe at the given offset\n"
msgstr " -H, --host <主机名> 指定登录主机\n"
-#: misc-utils/blkid.c:95
+#: misc-utils/blkid.c:96
#, fuzzy
msgid " -u, --usages <list> filter by \"usage\" (e.g. -u filesystem,raid)\n"
msgstr " -t, --types <列表> 限制文件系统集合\n"
-#: misc-utils/blkid.c:96
+#: misc-utils/blkid.c:97
#, fuzzy
msgid " -n, --match-types <list> filter by filesystem type (e.g. -n vfat,ext3)\n"
msgstr " -t, --types <列表> 限制文件系统集合\n"
-#: misc-utils/blkid.c:97
+#: misc-utils/blkid.c:98
msgid " -D, --no-part-details don't print info from partition table\n"
msgstr " -D, --no-part-details 不要打印来自分区表的信息\n"
-#: misc-utils/blkid.c:103
+#: misc-utils/blkid.c:104
msgid "<size> and <offset>"
msgstr ""
-#: misc-utils/blkid.c:105
+#: misc-utils/blkid.c:106
#, fuzzy
msgid " <dev> specify device(s) to probe (default: all devices)\n"
msgstr " <设备> 设备(通常是磁盘)的路径\n"
-#: misc-utils/blkid.c:237
+#: misc-utils/blkid.c:238
msgid "(mounted, mtpt unknown)"
msgstr ""
-#: misc-utils/blkid.c:239
+#: misc-utils/blkid.c:240
msgid "(in use)"
msgstr "（使用中）"
-#: misc-utils/blkid.c:241
+#: misc-utils/blkid.c:242
msgid "(not mounted)"
msgstr "（未挂载）"
-#: misc-utils/blkid.c:509 misc-utils/blkid.c:515
+#: misc-utils/blkid.c:519 misc-utils/blkid.c:525
#, c-format
msgid "error: %s"
msgstr "错误：%s"
-#: misc-utils/blkid.c:558
+#: misc-utils/blkid.c:568
#, c-format
msgid "%s: ambivalent result (probably more filesystems on the device, use wipefs(8) to see more details)"
msgstr ""
-#: misc-utils/blkid.c:604
+#: misc-utils/blkid.c:614
#, fuzzy, c-format
msgid "unknown keyword in -u <list> argument: '%s'"
msgstr "未知参数：%s"
-#: misc-utils/blkid.c:621
+#: misc-utils/blkid.c:631
msgid "error: -u <list> argument is empty"
msgstr ""
-#: misc-utils/blkid.c:770
+#: misc-utils/blkid.c:784
#, c-format
msgid "unsupported output format %s"
msgstr "不支持的输出格式：%s"
-#: misc-utils/blkid.c:773 misc-utils/wipefs.c:748
+#: misc-utils/blkid.c:787 misc-utils/wipefs.c:749
msgid "invalid offset argument"
msgstr "无效的 偏移 参数"
-#: misc-utils/blkid.c:780
+#: misc-utils/blkid.c:794
#, fuzzy
msgid "Too many tags specified"
msgstr "没有指定命令"
-#: misc-utils/blkid.c:786
+#: misc-utils/blkid.c:800
#, fuzzy
msgid "invalid size argument"
msgstr "无效的 时间 参数"
-#: misc-utils/blkid.c:790
+#: misc-utils/blkid.c:804
msgid "Can only search for one NAME=value pair"
msgstr ""
-#: misc-utils/blkid.c:797
+#: misc-utils/blkid.c:811
msgid "-t needs NAME=value pair"
msgstr ""
-#: misc-utils/blkid.c:803
+#: misc-utils/blkid.c:817
#, c-format
msgid "%s from %s (libblkid %s, %s)\n"
msgstr "%s，来自 %s（libblkid %s，%s）\n"
-#: misc-utils/blkid.c:849
+#: misc-utils/blkid.c:863
msgid "The low-level probing mode does not support 'list' output format"
msgstr ""
-#: misc-utils/blkid.c:862
+#: misc-utils/blkid.c:876
msgid "The low-level probing mode requires a device"
msgstr ""
-#: misc-utils/blkid.c:912
+#: misc-utils/blkid.c:887
+#, fuzzy, c-format
+msgid "Failed to use probing hint: %s"
+msgstr "无法将人格(personality)设置为 %s"
+
+#: misc-utils/blkid.c:930
msgid "The lookup option requires a search type specified using -t"
msgstr ""
-#: misc-utils/cal.c:418
+#: misc-utils/cal.c:408
msgid "invalid month argument"
msgstr "无效的月份参数"
-#: misc-utils/cal.c:426
+#: misc-utils/cal.c:416
msgid "invalid week argument"
msgstr "无效的 周 参数"
-#: misc-utils/cal.c:428
+#: misc-utils/cal.c:418
msgid "illegal week value: use 1-54"
msgstr "非法的 周 值：请使用 1-54"
-#: misc-utils/cal.c:480
+#: misc-utils/cal.c:470
#, c-format
msgid "failed to parse timestamp or unknown month name: %s"
msgstr " 解析时间戳失败或月份名未知：%s"
-#: misc-utils/cal.c:489
+#: misc-utils/cal.c:479
msgid "illegal day value"
msgstr "日 值不合法"
-#: misc-utils/cal.c:491 misc-utils/cal.c:515
+#: misc-utils/cal.c:481 misc-utils/cal.c:505
#, c-format
msgid "illegal day value: use 1-%d"
msgstr "日 值不合法：请使用 1-%d"
-#: misc-utils/cal.c:495 misc-utils/cal.c:503
+#: misc-utils/cal.c:485 misc-utils/cal.c:493
msgid "illegal month value: use 1-12"
msgstr "月份值不合法：请使用 1-12"
-#: misc-utils/cal.c:499
+#: misc-utils/cal.c:489
#, c-format
msgid "unknown month name: %s"
msgstr "月份名未知：%s"
-#: misc-utils/cal.c:506 misc-utils/cal.c:510
+#: misc-utils/cal.c:496 misc-utils/cal.c:500
msgid "illegal year value"
msgstr "年份值不合法"
-#: misc-utils/cal.c:508
+#: misc-utils/cal.c:498
msgid "illegal year value: use positive integer"
msgstr "年份值不合法：请使用正整数"
-#: misc-utils/cal.c:544 misc-utils/cal.c:557
+#: misc-utils/cal.c:534 misc-utils/cal.c:547
#, c-format
msgid "illegal week value: year %d doesn't have week %d"
msgstr "非法的 周 值：%d 年没有第 %d 周"
-#: misc-utils/cal.c:1283
+#: misc-utils/cal.c:1248
#, c-format
msgid " %s [options] [[[day] month] year]\n"
msgstr " %s [选项] [[[日] 月] 年]\n"
-#: misc-utils/cal.c:1284
+#: misc-utils/cal.c:1249
#, c-format
msgid " %s [options] <timestamp|monthname>\n"
msgstr " %s [选项] <时间戳|月份名>\n"
-#: misc-utils/cal.c:1287
+#: misc-utils/cal.c:1252
msgid "Display a calendar, or some part of it.\n"
msgstr "显示日历或部分日历。\n"
-#: misc-utils/cal.c:1288
+#: misc-utils/cal.c:1253
msgid "Without any arguments, display the current month.\n"
msgstr "不带参数时，显示当月日历。\n"
-#: misc-utils/cal.c:1291
+#: misc-utils/cal.c:1256
msgid " -1, --one show only a single month (default)\n"
msgstr " -1, --one 只显示一个月(默认)\n"
-#: misc-utils/cal.c:1292
+#: misc-utils/cal.c:1257
msgid " -3, --three show three months spanning the date\n"
msgstr " -3, --three 显示该日期前后三个月\n"
-#: misc-utils/cal.c:1293
+#: misc-utils/cal.c:1258
msgid " -n, --months <num> show num months starting with date's month\n"
msgstr " -n, --months < 数字> 显示以日期所在月份开始的若干个月\n"
-#: misc-utils/cal.c:1294
+#: misc-utils/cal.c:1259
msgid " -S, --span span the date when displaying multiple months\n"
msgstr " -S, --span 显示多个月份时的日期范围\n"
-#: misc-utils/cal.c:1295
+#: misc-utils/cal.c:1260
msgid " -s, --sunday Sunday as first day of week\n"
msgstr " -s, --sunday 周日作为一周的第一天\n"
-#: misc-utils/cal.c:1296
+#: misc-utils/cal.c:1261
msgid " -m, --monday Monday as first day of week\n"
msgstr " -m, --monday 周一作为一周的第一天\n"
-#: misc-utils/cal.c:1297
+#: misc-utils/cal.c:1262
#, fuzzy
msgid " -j, --julian use day-of-year for all calendars\n"
msgstr " -j, --julian 输出儒略日期\n"
-#: misc-utils/cal.c:1298
+#: misc-utils/cal.c:1263
msgid " --reform <val> Gregorian reform date (1752|gregorian|iso|julian)\n"
msgstr ""
-#: misc-utils/cal.c:1299
+#: misc-utils/cal.c:1264
msgid " --iso alias for --reform=iso\n"
msgstr " --iso --reform=iso 的别名\n"
-#: misc-utils/cal.c:1300
+#: misc-utils/cal.c:1265
msgid " -y, --year show the whole year\n"
msgstr " -y, --year 显示全年\n"
-#: misc-utils/cal.c:1301
+#: misc-utils/cal.c:1266
msgid " -Y, --twelve show the next twelve months\n"
msgstr " -Y, --twelve 显示之后的 12 个月\n"
-#: misc-utils/cal.c:1302
+#: misc-utils/cal.c:1267
msgid " -w, --week[=<num>] show US or ISO-8601 week numbers\n"
msgstr " -w, --week[=<数字>] 显示美国或 ISO-8601 周数\n"
-#: misc-utils/cal.c:1303
+#: misc-utils/cal.c:1268
#, fuzzy
msgid " -v, --vertical show day vertically instead of line\n"
msgstr " -y, --physical 打印物理 ID 而非逻辑 ID\n"
-#: misc-utils/cal.c:1305
+#: misc-utils/cal.c:1270
#, fuzzy, c-format
msgid " --color[=<when>] colorize messages (%s, %s or %s)\n"
msgstr " --color[=<时机>] 消息彩色显示(auto, always 或 never)\n"
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原始输出格式\n"
-#: misc-utils/fincore.c:338 sys-utils/losetup.c:820
+#: misc-utils/fincore.c:338 sys-utils/losetup.c:824
msgid "no file specified"
msgstr "未指定文件"
msgid "unable to resolve '%s'"
msgstr "不能解析“%s”"
-#: misc-utils/findmnt.c:99
-msgid "source device"
-msgstr "源设备"
-
#: misc-utils/findmnt.c:100
-msgid "mountpoint"
-msgstr "挂载点"
+msgid "action detected by --poll"
+msgstr "--poll 检测到的操作"
-#: misc-utils/findmnt.c:101 misc-utils/lsblk.c:161
-msgid "filesystem type"
-msgstr "文件系统类型"
+#: misc-utils/findmnt.c:101 misc-utils/lsblk.c:163
+msgid "filesystem size available"
+msgstr "文件系统可用大小"
#: misc-utils/findmnt.c:102
-msgid "all mount options"
-msgstr "全部挂臷选项"
+msgid "dump(8) period in days [fstab only]"
+msgstr "dump(8) 周期(天数) [仅 fstab]"
#: misc-utils/findmnt.c:103
-msgid "VFS specific mount options"
-msgstr "VFS 的特定挂载选项"
+msgid "filesystem root"
+msgstr "文件系统 root"
-#: misc-utils/findmnt.c:104
-msgid "FS specific mount options"
-msgstr "FS 的特定挂载选项"
+#: misc-utils/findmnt.c:104 misc-utils/lsblk.c:165
+msgid "filesystem type"
+msgstr "文件系统类型"
#: misc-utils/findmnt.c:105
-msgid "filesystem label"
-msgstr "文件系统标签"
+msgid "FS specific mount options"
+msgstr "FS 的特定挂载选项"
-#: misc-utils/findmnt.c:106 misc-utils/lsblk.c:168
-msgid "filesystem UUID"
-msgstr "æ\96\87件系ç»\9f UUID"
+#: misc-utils/findmnt.c:106
+msgid "mount ID"
+msgstr "æ\8c\82è½½ ID"
#: misc-utils/findmnt.c:107
-msgid "partition label"
-msgstr "分区标签"
+msgid "filesystem label"
+msgstr "文件系统标签"
-#: misc-utils/findmnt.c:109 misc-utils/lsblk.c:157
+#: misc-utils/findmnt.c:108 misc-utils/lsblk.c:161
msgid "major:minor device number"
msgstr "主:次 设备号"
-#: misc-utils/findmnt.c:110
-msgid "action detected by --poll"
-msgstr "--poll 检测到的操作"
-
-#: misc-utils/findmnt.c:111
+#: misc-utils/findmnt.c:109
msgid "old mount options saved by --poll"
msgstr "--poll 保存的旧挂载选项"
-#: misc-utils/findmnt.c:112
+#: misc-utils/findmnt.c:110
msgid "old mountpoint saved by --poll"
msgstr "--poll 保存的旧挂载点"
-#: misc-utils/findmnt.c:113 misc-utils/lsblk.c:160
-msgid "filesystem size"
-msgstr "文件系统大小"
+#: misc-utils/findmnt.c:111
+msgid "all mount options"
+msgstr "全部挂臷选项"
-#: misc-utils/findmnt.c:114 misc-utils/lsblk.c:159
-msgid "filesystem size available"
-msgstr "文件系统可用大小"
+#: misc-utils/findmnt.c:112
+msgid "optional mount fields"
+msgstr "可选的挂载字段"
-#: misc-utils/findmnt.c:115 misc-utils/lsblk.c:162
-msgid "filesystem size used"
-msgstr "文件系统已用大小"
+#: misc-utils/findmnt.c:113
+#, fuzzy
+msgid "mount parent ID"
+msgstr "挂载 ID"
-#: misc-utils/findmnt.c:116 misc-utils/lsblk.c:163
-msgid "filesystem use percentage"
-msgstr "文件系统使用百分比"
+#: misc-utils/findmnt.c:114
+msgid "partition label"
+msgstr "分区标签"
+
+#: misc-utils/findmnt.c:116
+msgid "pass number on parallel fsck(8) [fstab only]"
+msgstr "并行 fsck(8) 的遍数(pass number) [仅 fstab]"
#: misc-utils/findmnt.c:117
-msgid "filesystem root"
-msgstr "文件系统 root"
+msgid "VFS propagation flags"
+msgstr "VFS 传播标志"
-#: misc-utils/findmnt.c:118
-msgid "task ID"
-msgstr "任务 ID"
+#: misc-utils/findmnt.c:118 misc-utils/lsblk.c:164
+msgid "filesystem size"
+msgstr "文件系统大小"
#: misc-utils/findmnt.c:119
-msgid "mount ID"
-msgstr "æ\8c\82è½½ ID"
+msgid "source device"
+msgstr "æº\90设å¤\87"
#: misc-utils/findmnt.c:120
-msgid "optional mount fields"
-msgstr "可选的挂载字段"
+msgid "mountpoint"
+msgstr "挂载点"
#: misc-utils/findmnt.c:121
-msgid "VFS propagation flags"
-msgstr "VFS 传播标志"
+msgid "task ID"
+msgstr "任务 ID"
-#: misc-utils/findmnt.c:122
-msgid "dump(8) period in days [fstab only]"
-msgstr "dump(8) 周期(天数) [仅 fstab]"
+#: misc-utils/findmnt.c:122 misc-utils/lsblk.c:166
+msgid "filesystem size used"
+msgstr "文件系统已用大小"
-#: misc-utils/findmnt.c:123
-msgid "pass number on parallel fsck(8) [fstab only]"
-msgstr "并行 fsck(8) 的遍数(pass number) [仅 fstab]"
+#: misc-utils/findmnt.c:123 misc-utils/lsblk.c:167
+msgid "filesystem use percentage"
+msgstr "文件系统使用百分比"
+
+#: misc-utils/findmnt.c:124 misc-utils/lsblk.c:175
+msgid "filesystem UUID"
+msgstr "文件系统 UUID"
+
+#: misc-utils/findmnt.c:125
+msgid "VFS specific mount options"
+msgstr "VFS 的特定挂载选项"
-#: misc-utils/findmnt.c:333
+#: misc-utils/findmnt.c:335
#, c-format
msgid "unknown action: %s"
msgstr "未知操作: %s"
-#: misc-utils/findmnt.c:650
+#: misc-utils/findmnt.c:658
msgid "mount"
msgstr "挂载"
-#: misc-utils/findmnt.c:653
+#: misc-utils/findmnt.c:661
msgid "umount"
msgstr "卸载"
-#: misc-utils/findmnt.c:656
+#: misc-utils/findmnt.c:664
msgid "remount"
msgstr "重新挂载"
-#: misc-utils/findmnt.c:659
+#: misc-utils/findmnt.c:667
msgid "move"
msgstr "移动"
-#: misc-utils/findmnt.c:823 misc-utils/findmnt.c:1093 sys-utils/eject.c:717
-#: sys-utils/mount.c:369
+#: misc-utils/findmnt.c:831 misc-utils/findmnt.c:1109 sys-utils/eject.c:717
+#: sys-utils/mount.c:378
msgid "failed to initialize libmount table"
msgstr "初始化 libmount table 失败"
-#: misc-utils/findmnt.c:850 text-utils/hexdump-parse.c:84
+#: misc-utils/findmnt.c:858 text-utils/hexdump-parse.c:84
#, c-format
msgid "can't read %s"
msgstr "不能读 %s"
-#: misc-utils/findmnt.c:1033 misc-utils/findmnt.c:1099
+#: misc-utils/findmnt.c:1049 misc-utils/findmnt.c:1115
#: misc-utils/findmnt-verify.c:95 misc-utils/findmnt-verify.c:487
-#: sys-utils/fstrim.c:287 sys-utils/mount.c:127 sys-utils/mount.c:175
-#: sys-utils/mount.c:242 sys-utils/swapoff.c:63 sys-utils/swapoff.c:173
-#: sys-utils/swapon.c:247 sys-utils/swapon.c:277 sys-utils/swapon.c:736
-#: sys-utils/umount.c:187
+#: sys-utils/fstrim.c:288 sys-utils/mount.c:136 sys-utils/mount.c:184
+#: sys-utils/mount.c:251 sys-utils/swapoff.c:63 sys-utils/swapoff.c:173
+#: sys-utils/swapon.c:247 sys-utils/swapon.c:290 sys-utils/swapon.c:749
+#: sys-utils/umount.c:195
msgid "failed to initialize libmount iterator"
msgstr "无法初始化 libmount 迭代器"
-#: misc-utils/findmnt.c:1105
+#: misc-utils/findmnt.c:1121
msgid "failed to initialize libmount tabdiff"
msgstr "初始化 libmount tabdiff 失败"
-#: misc-utils/findmnt.c:1133 misc-utils/kill.c:407
+#: misc-utils/findmnt.c:1149 misc-utils/kill.c:407
msgid "poll() failed"
msgstr "poll() 失败"
-#: misc-utils/findmnt.c:1208
+#: misc-utils/findmnt.c:1224
#, c-format
msgid ""
" %1$s [options]\n"
" %1$s [选项] <设备> <挂臷点>\n"
" %1$s [选项] [--source <设备>] [--target <挂臷点>]\n"
-#: misc-utils/findmnt.c:1215
+#: misc-utils/findmnt.c:1231
msgid "Find a (mounted) filesystem.\n"
msgstr "查找(挂载的)文件系统。\n"
-#: misc-utils/findmnt.c:1218
+#: misc-utils/findmnt.c:1234
msgid " -s, --fstab search in static table of filesystems\n"
msgstr " -s, --fstab 在文件系统表态表中搜索\n"
-#: misc-utils/findmnt.c:1219
+#: misc-utils/findmnt.c:1235
#, fuzzy
msgid ""
" -m, --mtab search in table of mounted filesystems\n"
" -k, --kernel 在已挂载文件系统的内核表中搜索\n"
" (默认)\n"
-#: misc-utils/findmnt.c:1221
+#: misc-utils/findmnt.c:1237
msgid ""
" -k, --kernel search in kernel table of mounted\n"
" filesystems (default)\n"
" -k, --kernel 在已挂载文件系统的内核表中搜索\n"
" (默认)\n"
-#: misc-utils/findmnt.c:1224
+#: misc-utils/findmnt.c:1240
msgid " -p, --poll[=<list>] monitor changes in table of mounted filesystems\n"
msgstr " -p, --poll[=<列表>] 监测已挂臷文件系统表的改变\n"
-#: misc-utils/findmnt.c:1225
+#: misc-utils/findmnt.c:1241
msgid " -w, --timeout <num> upper limit in milliseconds that --poll will block\n"
msgstr " -w, --timeout <数字> --poll 阻塞的时间上限(毫秒)\n"
-#: misc-utils/findmnt.c:1228
+#: misc-utils/findmnt.c:1244
msgid " -A, --all disable all built-in filters, print all filesystems\n"
msgstr " -A, --all 禁用所有内置过滤器，打印所有文件系统\n"
-#: misc-utils/findmnt.c:1229
+#: misc-utils/findmnt.c:1245
msgid " -a, --ascii use ASCII chars for tree formatting\n"
msgstr " -a, --ascii 用 ASCII 字符格式化树\n"
-#: misc-utils/findmnt.c:1230
+#: misc-utils/findmnt.c:1246
msgid " -b, --bytes print sizes in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n"
-#: misc-utils/findmnt.c:1231
+#: misc-utils/findmnt.c:1247
msgid " -C, --nocanonicalize don't canonicalize when comparing paths\n"
msgstr " -c, --no-canonicalize 在比较路径时不对路径规范化\n"
-#: misc-utils/findmnt.c:1232
+#: misc-utils/findmnt.c:1248
msgid " -c, --canonicalize canonicalize printed paths\n"
msgstr " -c, --no-canonicalize 对打印的路径规范化\n"
-#: misc-utils/findmnt.c:1233
+#: misc-utils/findmnt.c:1249
msgid " -D, --df imitate the output of df(1)\n"
msgstr " -D, --df 仿照 df(1) 输出\n"
-#: misc-utils/findmnt.c:1234
+#: misc-utils/findmnt.c:1250
msgid " -d, --direction <word> direction of search, 'forward' or 'backward'\n"
msgstr " -d, --direction <单词> 搜索方向，“forward”(往前)或“backward”(往回)\n"
-#: misc-utils/findmnt.c:1235
+#: misc-utils/findmnt.c:1251
msgid ""
" -e, --evaluate convert tags (LABEL,UUID,PARTUUID,PARTLABEL) \n"
" to device names\n"
" -e, --evaluate 将标签(LABEL,UUID,PARTUUID,PARTLABEL) 转换为\n"
" 设备名\n"
-#: misc-utils/findmnt.c:1237
+#: misc-utils/findmnt.c:1253
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:1238
+#: misc-utils/findmnt.c:1254
msgid " -f, --first-only print the first found filesystem only\n"
msgstr " -f, --first-only 只打印找到的第一个文件系统\n"
-#: misc-utils/findmnt.c:1239
+#: misc-utils/findmnt.c:1255
msgid " -i, --invert invert the sense of matching\n"
msgstr " -i, --invert 反转搜索的匹配\n"
-#: misc-utils/findmnt.c:1240 misc-utils/lslocks.c:535 sys-utils/lsns.c:905
-#: sys-utils/rfkill.c:581
+#: misc-utils/findmnt.c:1256 misc-utils/lslocks.c:535 sys-utils/lsns.c:970
+#: sys-utils/rfkill.c:629
msgid " -J, --json use JSON output format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: misc-utils/findmnt.c:1241 sys-utils/lsns.c:906
+#: misc-utils/findmnt.c:1257 sys-utils/lsns.c:971
msgid " -l, --list use list format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/findmnt.c:1242
+#: misc-utils/findmnt.c:1258
msgid " -N, --task <tid> use alternative namespace (/proc/<tid>/mountinfo file)\n"
msgstr " -N, --task <tid> 使用替代的名字空间(/proc/<tid>/mountinfo 文件)\n"
-#: misc-utils/findmnt.c:1243
+#: misc-utils/findmnt.c:1259
msgid " -n, --noheadings don't print column headings\n"
msgstr " -n, --noheadings 不打印列标题\n"
-#: misc-utils/findmnt.c:1244
+#: misc-utils/findmnt.c:1260
msgid " -O, --options <list> limit the set of filesystems by mount options\n"
msgstr " -O, --options <列表> 根据挂臷选项限制文件系统集合\n"
-#: misc-utils/findmnt.c:1245
+#: misc-utils/findmnt.c:1261
msgid " -o, --output <list> the output columns to be shown\n"
msgstr " -o, --output <列表> 要显示的列\n"
-#: misc-utils/findmnt.c:1246
+#: misc-utils/findmnt.c:1262
#, fuzzy
msgid " --output-all output all available columns\n"
msgstr " -O, --output-all 输出所有列\n"
-#: misc-utils/findmnt.c:1247
+#: misc-utils/findmnt.c:1263
msgid " -P, --pairs use key=\"value\" output format\n"
msgstr " -P, --pairs 使用 键=“值”的输出格式\n"
-#: misc-utils/findmnt.c:1248
+#: misc-utils/findmnt.c:1264
#, fuzzy
msgid " --pseudo print only pseudo-filesystems\n"
msgstr " --verbose 打印更多细节\n"
-#: misc-utils/findmnt.c:1249
+#: misc-utils/findmnt.c:1265
+#, fuzzy
+msgid " --shadowed print only filesystems over-mounted by another filesystem\n"
+msgstr " --verbose 打印更多细节\n"
+
+#: misc-utils/findmnt.c:1266
msgid " -R, --submounts print all submounts for the matching filesystems\n"
msgstr " -R, --submounts 打印匹配文件系统的所有子挂载(submount)\n"
-#: misc-utils/findmnt.c:1250
+#: misc-utils/findmnt.c:1267
msgid " -r, --raw use raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: misc-utils/findmnt.c:1251
+#: misc-utils/findmnt.c:1268
#, fuzzy
msgid " --real print only real filesystems\n"
msgstr " -a, --all 卸载所有文件系统\n"
-#: misc-utils/findmnt.c:1252
+#: misc-utils/findmnt.c:1269
msgid ""
" -S, --source <string> the device to mount (by name, maj:min, \n"
" LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n"
" -S, --source <字符串> 要挂载的设备(按 名称, 主:次设备号, \n"
" LABEL=, UUID=, PARTUUID=, PARTLABEL=)\n"
-#: misc-utils/findmnt.c:1254
+#: misc-utils/findmnt.c:1271
msgid " -T, --target <path> the path to the filesystem to use\n"
msgstr " -T, --target <路径> 要使用的文件系统的路径\n"
-#: misc-utils/findmnt.c:1255
+#: misc-utils/findmnt.c:1272
#, fuzzy
-msgid " --tree enable tree format output is possible\n"
+msgid " --tree enable tree format output if possible\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/findmnt.c:1256
+#: misc-utils/findmnt.c:1273
msgid " -M, --mountpoint <dir> the mountpoint directory\n"
msgstr " -M, --mountpoint <目录> 挂载点目录\n"
-#: misc-utils/findmnt.c:1257
+#: misc-utils/findmnt.c:1274
msgid " -t, --types <list> limit the set of filesystems by FS types\n"
msgstr " -t, --types <列表> 根据文件系统类型限制文件系统集合\n"
-#: misc-utils/findmnt.c:1258
+#: misc-utils/findmnt.c:1275
msgid " -U, --uniq ignore filesystems with duplicate target\n"
msgstr " -U, --uniq 忽略目标重复的文件系统\n"
-#: misc-utils/findmnt.c:1259 misc-utils/lslocks.c:542 sys-utils/lsns.c:912
+#: misc-utils/findmnt.c:1276 misc-utils/lslocks.c:542 sys-utils/lsns.c:977
msgid " -u, --notruncate don't truncate text in columns\n"
msgstr " -u, --notruncate 不截断列中的文本\n"
-#: misc-utils/findmnt.c:1260
+#: misc-utils/findmnt.c:1277
msgid " -v, --nofsroot don't print [/dir] for bind or btrfs mounts\n"
msgstr " -v, --nofsroot 对绑定式或 btrfs 挂载不打印[/dir]\n"
-#: misc-utils/findmnt.c:1263
+#: misc-utils/findmnt.c:1280
msgid " -x, --verify verify mount table content (default is fstab)\n"
msgstr " -x, --verify 验证挂载表内容(默认为 fstab)\n"
-#: misc-utils/findmnt.c:1264
+#: misc-utils/findmnt.c:1281
msgid " --verbose print more details\n"
msgstr " --verbose 打印更多细节\n"
-#: misc-utils/findmnt.c:1399
+#: misc-utils/findmnt.c:1282
+#, fuzzy
+msgid " --vfs-all print all VFS options\n"
+msgstr " -a, --all 打印所有设备\n"
+
+#: misc-utils/findmnt.c:1421
#, c-format
msgid "unknown direction '%s'"
msgstr "未知方向“%s”"
-#: misc-utils/findmnt.c:1475
+#: misc-utils/findmnt.c:1497
msgid "invalid TID argument"
msgstr "无效的 TID 参数"
-#: misc-utils/findmnt.c:1554
+#: misc-utils/findmnt.c:1582
msgid "--poll accepts only one file, but more specified by --tab-file"
msgstr "--poll 只接受一个文件，但用 --tab-file 指定了多个"
-#: misc-utils/findmnt.c:1558
+#: misc-utils/findmnt.c:1586
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:1611 sys-utils/fstrim.c:267
+#: misc-utils/findmnt.c:1639 sys-utils/fstrim.c:267
msgid "failed to initialize libmount cache"
msgstr "初始化 libmount 缓存失败"
-#: misc-utils/findmnt.c:1655
+#: misc-utils/findmnt.c:1683
#, c-format
msgid "%s column is requested, but --poll is not enabled"
msgstr "请示了 %s 列，但未启用 --poll"
msgid "Success, no errors or warnings detected\n"
msgstr "成功，未检测到错误或警告\n"
-#: misc-utils/getopt.c:302
+#: misc-utils/getopt.c:315
msgid "empty long option after -l or --long argument"
msgstr "-l 或 --long 参数后的长选项为空"
-#: misc-utils/getopt.c:323
+#: misc-utils/getopt.c:336
msgid "unknown shell after -s or --shell argument"
msgstr "-s 或 --shell 参数后是未知的 shell"
-#: misc-utils/getopt.c:330
+#: misc-utils/getopt.c:343
#, c-format
msgid ""
" %1$s <optstring> <parameters>\n"
" %1$s [options] [--] 选项字符串 参数\n"
" %1$s [options] -o|--options 选项字符串 [选项] [--] 参数\n"
-#: misc-utils/getopt.c:336
+#: misc-utils/getopt.c:349
msgid "Parse command options.\n"
msgstr "解析命令选项。 \n"
-#: misc-utils/getopt.c:339
+#: misc-utils/getopt.c:352
msgid " -a, --alternative allow long options starting with single -\n"
msgstr " -a, --alternative 允许长选项以单个 - 开头\n"
-#: misc-utils/getopt.c:340
+#: misc-utils/getopt.c:353
msgid " -l, --longoptions <longopts> the long options to be recognized\n"
msgstr " -l, --longoptions <longopts> 要识别的长选项\n"
-#: misc-utils/getopt.c:341
+#: misc-utils/getopt.c:354
msgid " -n, --name <progname> the name under which errors are reported\n"
msgstr " -n, --name <progname> 要报告其错误的程序名称\n"
-#: misc-utils/getopt.c:342
+#: misc-utils/getopt.c:355
msgid " -o, --options <optstring> the short options to be recognized\n"
msgstr " -o, --options <optstring> 要识别的短选项名称\n"
-#: misc-utils/getopt.c:343
+#: misc-utils/getopt.c:356
msgid " -q, --quiet disable error reporting by getopt(3)\n"
msgstr " -q, --quiet 禁止 getopt(3) 的错误报告\n"
-#: misc-utils/getopt.c:344
+#: misc-utils/getopt.c:357
msgid " -Q, --quiet-output no normal output\n"
msgstr " -Q, --quiet-output 无常规输出\n"
-#: misc-utils/getopt.c:345
+#: misc-utils/getopt.c:358
msgid " -s, --shell <shell> set quoting conventions to those of <shell>\n"
msgstr " -s, --shell <shell> 设置 <shell> 的引用习惯\n"
-#: misc-utils/getopt.c:346
+#: misc-utils/getopt.c:359
msgid " -T, --test test for getopt(1) version\n"
msgstr " -T, --test getopt(1) 版本测试\n"
-#: misc-utils/getopt.c:347
+#: misc-utils/getopt.c:360
msgid " -u, --unquoted do not quote the output\n"
msgstr " -u, --unquoted 不引用输出\n"
-#: misc-utils/getopt.c:396 misc-utils/getopt.c:456
+#: misc-utils/getopt.c:409 misc-utils/getopt.c:468
msgid "missing optstring argument"
msgstr "缺少 optstring 参数"
-#: misc-utils/getopt.c:451
+#: misc-utils/getopt.c:463
msgid "internal error, contact the author."
msgstr "内部错误，请联系作者。"
-#: misc-utils/hardlink.c:127
+#: misc-utils/hardlink.c:286
+#, fuzzy
+msgid "Mode:"
+msgstr "型号："
+
+#: misc-utils/hardlink.c:287
+msgid "dry-run"
+msgstr ""
+
+#: misc-utils/hardlink.c:287
+msgid "real"
+msgstr ""
+
+#: misc-utils/hardlink.c:288
+#, fuzzy
+msgid "Files:"
+msgstr "文件"
+
+#: misc-utils/hardlink.c:289 misc-utils/hardlink.c:295
#, c-format
-msgid "Directories: %9lld\n"
+msgid "%-15s %zu files"
+msgstr ""
+
+#: misc-utils/hardlink.c:289
+msgid "Linked:"
msgstr ""
-#: misc-utils/hardlink.c:128
+#: misc-utils/hardlink.c:292
#, c-format
-msgid "Objects: %9lld\n"
+msgid "%-15s %zu xattrs"
+msgstr ""
+
+#: misc-utils/hardlink.c:292 misc-utils/hardlink.c:295
+msgid "Compared:"
msgstr ""
-#: misc-utils/hardlink.c:129
+#: misc-utils/hardlink.c:302
+#, fuzzy
+msgid "Saved:"
+msgstr "已保存"
+
+#: misc-utils/hardlink.c:305
+#, fuzzy, c-format
+msgid "%-15s %<PRId64>.%06<PRId64> seconds"
+msgstr "%-14s %2i 秒\n"
+
+#: misc-utils/hardlink.c:305
+#, fuzzy
+msgid "Duration:"
+msgstr "描述"
+
+#: misc-utils/hardlink.c:343
+#, fuzzy, c-format
+msgid "cannot get xattr names for %s"
+msgstr "无法获取 %s 的阈值"
+
+#: misc-utils/hardlink.c:359
+#, fuzzy, c-format
+msgid "cannot get xattr value of %s for %s"
+msgstr "无法获取 %s 的阈值"
+
+#: misc-utils/hardlink.c:439
#, c-format
-msgid "Regular files: %9lld\n"
+msgid "Comparing xattrs of %s to %s"
msgstr ""
-#: misc-utils/hardlink.c:130
+#: misc-utils/hardlink.c:541
#, fuzzy, c-format
-msgid "Comparisons: %9lld\n"
+msgid "Comparing %s to %s"
msgstr "分区数：%d"
-#: misc-utils/hardlink.c:132
-msgid "Would link: "
+#: misc-utils/hardlink.c:667
+#, c-format
+msgid "%sLinking %s to %s (-%s)"
msgstr ""
-#: misc-utils/hardlink.c:133
-msgid "Linked: "
+#: misc-utils/hardlink.c:668
+msgid "[DryRun] "
msgstr ""
-#: misc-utils/hardlink.c:135
-msgid "Would save: "
-msgstr ""
+#: misc-utils/hardlink.c:681
+#, fuzzy, c-format
+msgid "cannot link %s to %s"
+msgstr "无法打开 %s：%s"
-#: misc-utils/hardlink.c:136
-msgid "Saved: "
-msgstr ""
+#: misc-utils/hardlink.c:686
+#, fuzzy, c-format
+msgid "cannot rename %s to %s"
+msgstr "无法将 %s 改名为 %s：%s\n"
-#: misc-utils/hardlink.c:142
+#: misc-utils/hardlink.c:758
#, c-format
-msgid " %s [options] directory...\n"
-msgstr " %s [选项] 目录...\n"
-
-#: misc-utils/hardlink.c:145
-msgid "Consolidate duplicate files using hardlinks."
+msgid "Skipped %s (smaller than configured size)"
msgstr ""
-#: misc-utils/hardlink.c:148
-msgid " -c, --content compare only contents, ignore permission, etc."
-msgstr " -c, --content 只比较内容，忽略权限等其它信息"
+#: misc-utils/hardlink.c:762
+#, fuzzy, c-format
+msgid "Visiting %s (file %zu)"
+msgstr "关闭 %s 失败"
-#: misc-utils/hardlink.c:149
-msgid " -n, --dry-run don't actually link anything"
-msgstr " -n, --dry-run 不要实际进行任何链接操作"
+#: misc-utils/hardlink.c:820
+#, fuzzy
+msgid "cannot continue"
+msgstr "无法转为守护进程"
-#: misc-utils/hardlink.c:150
-msgid " -v, --verbose print summary after hardlinking"
-msgstr " -v, --verbose 硬链接后输出简要信息"
+#: misc-utils/hardlink.c:875
+#, fuzzy, c-format
+msgid " %s [options] <directory>|<file> ...\n"
+msgstr " %s [选项] 目录...\n"
-#: misc-utils/hardlink.c:151
-msgid " -vv print every hardlinked file and summary"
-msgstr " -vv 输出每一个硬链接的文件及其简要信息"
+#: misc-utils/hardlink.c:879
+msgid "Consolidate duplicate files using hardlinks.\n"
+msgstr ""
-#: misc-utils/hardlink.c:152
-msgid " -f, --force force hardlinking across filesystems"
-msgstr " -f, --force 强制跨文件系统进行硬链接"
+#: misc-utils/hardlink.c:882
+#, fuzzy
+msgid " -v, --verbose verbose output (repeat for more verbosity)\n"
+msgstr " -v, --verbose 更详尽\n"
-#: misc-utils/hardlink.c:153
-msgid " -x, --exclude <regex> exclude files matching pattern"
-msgstr " -x, --exclude <正则> 排除匹配指定模式的文件"
+#: misc-utils/hardlink.c:883
+#, fuzzy
+msgid " -q, --quiet quiet mode - don't print anything\n"
+msgstr " -q, --quiet 开启安静模式\n"
-#: misc-utils/hardlink.c:167
-msgid "integer overflow"
-msgstr "整数溢出"
+#: misc-utils/hardlink.c:884
+#, fuzzy
+msgid " -n, --dry-run don't actually link anything\n"
+msgstr " -n, --dry-run 不要实际进行任何链接操作"
-#: misc-utils/hardlink.c:196
-#, c-format
-msgid "%s is on different filesystem than the rest (use -f option to override)."
-msgstr ""
+#: misc-utils/hardlink.c:885
+#, fuzzy
+msgid " -f, --respect-name filenames have to be identical\n"
+msgstr " -U, --detect-case 检测纯大写终端\n"
-#: misc-utils/hardlink.c:306 sys-utils/unshare.c:208 text-utils/more.c:408
-#, c-format
-msgid "cannot stat %s"
-msgstr "无法 stat %s"
+#: misc-utils/hardlink.c:886
+#, fuzzy
+msgid " -p, --ignore-mode ignore changes of file mode\n"
+msgstr " -t, --ignore 忽略失败\n"
-#: misc-utils/hardlink.c:312
-#, fuzzy, c-format
-msgid "file %s changed underneath us"
-msgstr "将目录更改到 %s 失败"
+#: misc-utils/hardlink.c:887
+#, fuzzy
+msgid " -o, --ignore-owner ignore owner changes\n"
+msgstr " -t, --ignore 忽略失败\n"
-#: misc-utils/hardlink.c:332
-#, c-format
-msgid "failed to hardlink %s to %s (create temporary link as %s failed)"
-msgstr ""
+#: misc-utils/hardlink.c:888
+#, fuzzy
+msgid " -t, --ignore-time ignore timestamps (when testing for equality)\n"
+msgstr " -t, --notime 不显示任何消息的时间戳\n"
-#: misc-utils/hardlink.c:339
-#, c-format
-msgid "failed to hardlink %s to %s (rename temporary link to %s failed)"
+#: misc-utils/hardlink.c:890
+msgid " -X, --respect-xattrs respect extended attributes\n"
msgstr ""
-#: misc-utils/hardlink.c:343
-#, c-format
-msgid "failed to remove temporary link %s"
-msgstr "移除临时链接 %s 失败"
+#: misc-utils/hardlink.c:892
+#, fuzzy
+msgid ""
+" -m, --maximize maximize the hardlink count, remove the file with\n"
+" lowest hardlink count\n"
+msgstr ""
+" -k, --kernel 在已挂载文件系统的内核表中搜索\n"
+" (默认)\n"
-#: misc-utils/hardlink.c:354
-#, c-format
-msgid " %s %s to %s\n"
-msgstr " %s %s 到 %s\n"
+#: misc-utils/hardlink.c:894
+#, fuzzy
+msgid " -M, --minimize reverse the meaning of -m\n"
+msgstr " -i, --invert 反转搜索的匹配\n"
-#: misc-utils/hardlink.c:355 misc-utils/hardlink.c:361
-msgid "Would link"
+#: misc-utils/hardlink.c:895
+msgid ""
+" -O, --keep-oldest keep the oldest file of multiple equal files\n"
+" (lower precedence than minimize/maximize)\n"
msgstr ""
-#: misc-utils/hardlink.c:355 misc-utils/hardlink.c:361
-msgid "Linked"
-msgstr ""
+#: misc-utils/hardlink.c:897
+#, fuzzy
+msgid " -x, --exclude <regex> regular expression to exclude files\n"
+msgstr " -x, --exclude <正则> 排除匹配指定模式的文件"
-#: misc-utils/hardlink.c:360
-#, c-format
-msgid " %s %s to %s, %s %jd\n"
+#: misc-utils/hardlink.c:898
+msgid " -i, --include <regex> regular expression to include files/dirs\n"
msgstr ""
-#: misc-utils/hardlink.c:363
-msgid "would save"
-msgstr "将要保存"
+#: misc-utils/hardlink.c:899
+#, fuzzy
+msgid " -s, --minimum-size <size> minimum size for files.\n"
+msgstr " -S, --size <大小> 单条消息的最大尺寸\n"
+
+#: misc-utils/hardlink.c:900
+#, fuzzy
+msgid " -c, --content compare only file contents, same as -pot\n"
+msgstr " -c, --content 只比较内容，忽略权限等其它信息"
-#: misc-utils/hardlink.c:363 text-utils/pg.c:1266
-msgid "saved"
-msgstr "已保存"
+#: misc-utils/hardlink.c:927
+#, fuzzy, c-format
+msgid "could not compile regular expression %s: %s"
+msgstr "无上一个正则表达式"
-#: misc-utils/hardlink.c:437
-msgid "option --exclude not supported (built without pcre2)"
-msgstr "不支持 --exclude 选项（构建时未配置使用 pcre2）"
+#: misc-utils/hardlink.c:1020 sys-utils/ipcmk.c:114 sys-utils/losetup.c:735
+#: sys-utils/zramctl.c:650
+msgid "failed to parse size"
+msgstr "解析大小失败"
-#: misc-utils/hardlink.c:450
-msgid "no directory specified"
+#: misc-utils/hardlink.c:1070
+#, fuzzy
+msgid "cannot register exit handler"
+msgstr "无法设置信号处理函数"
+
+#: misc-utils/hardlink.c:1075
+#, fuzzy
+msgid "no directory or file specified"
msgstr "未指定目录"
-#: misc-utils/hardlink.c:464
+#: misc-utils/hardlink.c:1082
#, fuzzy, c-format
-msgid "pattern error at offset %d: %s"
-msgstr "%s：第 %d 行解析出错"
-
-#: misc-utils/hardlink.c:509
-#, c-format
-msgid "Skipping %s%s\n"
-msgstr "跳过 %s%s\n"
+msgid "cannot process %s"
+msgstr "无法访问 %s"
#: misc-utils/kill.c:168
#, c-format
msgid " --verbose print pids that will be signaled\n"
msgstr " --verbose 打印将收到信号的 pid\n"
-#: misc-utils/kill.c:232 term-utils/agetty.c:687
+#: misc-utils/kill.c:232 term-utils/agetty.c:691
#, fuzzy, c-format
msgid "%s from %s"
msgstr "%s，来自 %s\n"
msgid " (with: "
msgstr ""
-#: misc-utils/kill.c:285 misc-utils/kill.c:294 sys-utils/setpriv.c:451
+#: misc-utils/kill.c:285 misc-utils/kill.c:294 sys-utils/setpriv.c:448
#: sys-utils/unshare.c:499
#, c-format
msgid "unknown signal: %s"
msgstr "未知信号：%s"
#: misc-utils/kill.c:305 misc-utils/kill.c:308 misc-utils/kill.c:317
-#: misc-utils/kill.c:329 misc-utils/kill.c:372 sys-utils/mountpoint.c:193
+#: misc-utils/kill.c:329 misc-utils/kill.c:372 sys-utils/mountpoint.c:195
#, c-format
msgid "%s and %s are mutually exclusive"
msgstr "%s 和 %s 相互排斥"
#: misc-utils/kill.c:332 misc-utils/kill.c:347 sys-utils/eject.c:208
-#: sys-utils/eject.c:230 sys-utils/losetup.c:726 sys-utils/tunelp.c:164
+#: sys-utils/eject.c:230 sys-utils/losetup.c:730 sys-utils/tunelp.c:164
#: sys-utils/tunelp.c:171 sys-utils/tunelp.c:178 sys-utils/tunelp.c:185
#: sys-utils/tunelp.c:192 sys-utils/tunelp.c:198 sys-utils/tunelp.c:202
#: sys-utils/tunelp.c:209 term-utils/setterm.c:211 term-utils/setterm.c:214
#: term-utils/setterm.c:571 term-utils/setterm.c:576 term-utils/setterm.c:600
#: term-utils/setterm.c:605 term-utils/setterm.c:610 term-utils/setterm.c:615
#: term-utils/setterm.c:620 term-utils/setterm.c:625 term-utils/setterm.c:634
-#: term-utils/setterm.c:669 text-utils/more.c:324
+#: term-utils/setterm.c:669 text-utils/more.c:325
msgid "argument error"
msgstr "参数出错"
msgid " -t, --terminate <char> define the string-termination character\n"
msgstr " -t, --terminate <字符> 定义字符串终止字符\n"
-#: misc-utils/lsblk.c:153
+#: misc-utils/lsblk.c:157
msgid "device name"
msgstr "设备名"
-#: misc-utils/lsblk.c:154
+#: misc-utils/lsblk.c:158
msgid "internal kernel device name"
msgstr "内部内核设备名称"
-#: misc-utils/lsblk.c:155
+#: misc-utils/lsblk.c:159
msgid "internal parent kernel device name"
msgstr "内部上级内核设备名称"
-#: misc-utils/lsblk.c:156
+#: misc-utils/lsblk.c:160
msgid "path to the device node"
msgstr "到设备节点的路径"
-#: misc-utils/lsblk.c:164
+#: misc-utils/lsblk.c:168
+#, fuzzy
+msgid "mounted filesystem roots"
+msgstr "文件系统 root"
+
+#: misc-utils/lsblk.c:169
msgid "filesystem version"
msgstr "文件系统版本"
-#: misc-utils/lsblk.c:166 sys-utils/zramctl.c:86
+#: misc-utils/lsblk.c:171 sys-utils/zramctl.c:86
msgid "where the device is mounted"
msgstr "设备挂载位置"
-#: misc-utils/lsblk.c:167 misc-utils/wipefs.c:110
+#: misc-utils/lsblk.c:172
+#, fuzzy
+msgid "all locations where device is mounted"
+msgstr "设备挂载位置"
+
+#: misc-utils/lsblk.c:174 misc-utils/wipefs.c:110
msgid "filesystem LABEL"
msgstr "文件系统标签"
-#: misc-utils/lsblk.c:170
+#: misc-utils/lsblk.c:177
msgid "partition table identifier (usually UUID)"
msgstr "分区表标识符（通常为 UUID）"
-#: misc-utils/lsblk.c:171
+#: misc-utils/lsblk.c:178
msgid "partition table type"
msgstr "分区表类型"
-#: misc-utils/lsblk.c:173
+#: misc-utils/lsblk.c:180
#, fuzzy
msgid "partition type code or UUID"
msgstr "分区类型 UUID"
-#: misc-utils/lsblk.c:174
+#: misc-utils/lsblk.c:181
msgid "partition type name"
msgstr "分区类型名"
-#: misc-utils/lsblk.c:175
+#: misc-utils/lsblk.c:182
msgid "partition LABEL"
msgstr "分区 LABEL"
-#: misc-utils/lsblk.c:179
+#: misc-utils/lsblk.c:186
msgid "read-ahead of the device"
msgstr "该设备的预读(read-ahead)"
-#: misc-utils/lsblk.c:180 sys-utils/losetup.c:79
+#: misc-utils/lsblk.c:187 sys-utils/losetup.c:79
msgid "read-only device"
msgstr "只读设备"
-#: misc-utils/lsblk.c:181
+#: misc-utils/lsblk.c:188
msgid "removable device"
msgstr "可移动设备"
-#: misc-utils/lsblk.c:182
+#: misc-utils/lsblk.c:189
msgid "removable or hotplug device (usb, pcmcia, ...)"
msgstr "可移动或热插拔设备(usb, pcmcia, ...)"
-#: misc-utils/lsblk.c:183
+#: misc-utils/lsblk.c:190
msgid "rotational device"
msgstr "转动设备"
-#: misc-utils/lsblk.c:184
+#: misc-utils/lsblk.c:191
msgid "adds randomness"
msgstr "添加随机性"
-#: misc-utils/lsblk.c:185
+#: misc-utils/lsblk.c:192
msgid "device identifier"
msgstr "设备标识符"
-#: misc-utils/lsblk.c:186
+#: misc-utils/lsblk.c:193
msgid "disk serial number"
msgstr "磁盘序列号"
-#: misc-utils/lsblk.c:187
+#: misc-utils/lsblk.c:194
msgid "size of the device"
msgstr "磁盘容量"
-#: misc-utils/lsblk.c:188
+#: misc-utils/lsblk.c:195
msgid "state of the device"
msgstr "设备的状态"
-#: misc-utils/lsblk.c:190
+#: misc-utils/lsblk.c:197
msgid "group name"
msgstr "组名"
-#: misc-utils/lsblk.c:191
+#: misc-utils/lsblk.c:198
msgid "device node permissions"
msgstr "设备节点权限"
-#: misc-utils/lsblk.c:192
+#: misc-utils/lsblk.c:199
msgid "alignment offset"
msgstr "对齐偏移量"
-#: misc-utils/lsblk.c:193
+#: misc-utils/lsblk.c:200
msgid "minimum I/O size"
msgstr "最小 I/O 大小"
-#: misc-utils/lsblk.c:194
+#: misc-utils/lsblk.c:201
msgid "optimal I/O size"
msgstr "最优 I/O 大小"
-#: misc-utils/lsblk.c:195
+#: misc-utils/lsblk.c:202
msgid "physical sector size"
msgstr "物理扇区大小"
-#: misc-utils/lsblk.c:196
+#: misc-utils/lsblk.c:203
msgid "logical sector size"
msgstr "逻辑扇区大小"
-#: misc-utils/lsblk.c:197
+#: misc-utils/lsblk.c:204
msgid "I/O scheduler name"
msgstr "I/O 调度器名称"
-#: misc-utils/lsblk.c:198
+#: misc-utils/lsblk.c:205
msgid "request queue size"
msgstr "请求队列大小"
-#: misc-utils/lsblk.c:199
+#: misc-utils/lsblk.c:206
msgid "device type"
msgstr "设备类型"
-#: misc-utils/lsblk.c:200
+#: misc-utils/lsblk.c:207
msgid "discard alignment offset"
msgstr "忽略对齐偏移量"
-#: misc-utils/lsblk.c:201
+#: misc-utils/lsblk.c:208
msgid "discard granularity"
msgstr "忽略粒度"
-#: misc-utils/lsblk.c:202
+#: misc-utils/lsblk.c:209
msgid "discard max bytes"
msgstr "忽略最大字节数"
-#: misc-utils/lsblk.c:203
+#: misc-utils/lsblk.c:210
msgid "discard zeroes data"
msgstr "忽略零数据"
-#: misc-utils/lsblk.c:204
+#: misc-utils/lsblk.c:211
msgid "write same max bytes"
msgstr "写相同的最大字节数"
-#: misc-utils/lsblk.c:205
+#: misc-utils/lsblk.c:212
msgid "unique storage identifier"
msgstr "惟一存储标识符"
-#: misc-utils/lsblk.c:206
+#: misc-utils/lsblk.c:213
msgid "Host:Channel:Target:Lun for SCSI"
msgstr "SCSI 的 Host:Channel:Target:Lun"
-#: misc-utils/lsblk.c:207
+#: misc-utils/lsblk.c:214
msgid "device transport type"
msgstr "设备传输类型"
-#: misc-utils/lsblk.c:208
+#: misc-utils/lsblk.c:215
msgid "de-duplicated chain of subsystems"
msgstr "对成链的子系统去重"
-#: misc-utils/lsblk.c:209
+#: misc-utils/lsblk.c:216
msgid "device revision"
msgstr "设备修订版本"
-#: misc-utils/lsblk.c:210
+#: misc-utils/lsblk.c:217
msgid "device vendor"
msgstr "设备制造商"
-#: misc-utils/lsblk.c:211
+#: misc-utils/lsblk.c:218
msgid "zone model"
msgstr ""
-#: misc-utils/lsblk.c:212
+#: misc-utils/lsblk.c:219
#, fuzzy
msgid "dax-capable device"
msgstr "可移动设备"
-#: misc-utils/lsblk.c:1243
+#: misc-utils/lsblk.c:1295
msgid "failed to allocate device"
msgstr "分配设备失败"
-#: misc-utils/lsblk.c:1283
+#: misc-utils/lsblk.c:1355
msgid "failed to open device directory in sysfs"
msgstr "打开 sysfs 中的设备目录失败"
-#: misc-utils/lsblk.c:1465
+#: misc-utils/lsblk.c:1543
#, c-format
msgid "%s: failed to get sysfs name"
msgstr "%s：获取 sysfs 名称失败"
-#: misc-utils/lsblk.c:1477
+#: misc-utils/lsblk.c:1555
#, c-format
msgid "%s: failed to get whole-disk device number"
msgstr "%s：获取 整盘 设备号失败"
-#: misc-utils/lsblk.c:1550 misc-utils/lsblk.c:1598
+#: misc-utils/lsblk.c:1628 misc-utils/lsblk.c:1676
msgid "failed to allocate /sys handler"
msgstr "分配 /sys 处理程序失败"
-#: misc-utils/lsblk.c:1658 misc-utils/lsblk.c:1660 misc-utils/lsblk.c:1689
-#: misc-utils/lsblk.c:1691
+#: misc-utils/lsblk.c:1736 misc-utils/lsblk.c:1738 misc-utils/lsblk.c:1767
+#: misc-utils/lsblk.c:1769
#, c-format
msgid "failed to parse list '%s'"
msgstr "解析列表“%s”失败"
#. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1665
+#: misc-utils/lsblk.c:1743
#, 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:1696
+#: misc-utils/lsblk.c:1774
#, c-format
msgid "the list of included devices is too large (limit is %d devices)"
msgstr "包含设备列表过大(限制为 %d 台设备)"
-#: misc-utils/lsblk.c:1765 sys-utils/wdctl.c:207
+#: misc-utils/lsblk.c:1843 sys-utils/wdctl.c:207
#, c-format
msgid " %s [options] [<device> ...]\n"
msgstr " %s [选项] [<设备> ...]\n"
-#: misc-utils/lsblk.c:1768
+#: misc-utils/lsblk.c:1846
msgid "List information about block devices.\n"
msgstr "列出块设备的信息。\n"
-#: misc-utils/lsblk.c:1771
+#: misc-utils/lsblk.c:1849
msgid " -D, --discard print discard capabilities\n"
msgstr " -D, --discard 打印时丢弃能力\n"
-#: misc-utils/lsblk.c:1772
+#: misc-utils/lsblk.c:1850
#, fuzzy
msgid " -E, --dedup <column> de-duplicate output by <column>\n"
msgstr " -x, --sort <列> 按<列>对输出排序\n"
-#: misc-utils/lsblk.c:1773
+#: misc-utils/lsblk.c:1851
msgid " -I, --include <list> show only devices with specified major numbers\n"
msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n"
-#: misc-utils/lsblk.c:1774 sys-utils/lsirq.c:63 sys-utils/lsmem.c:512
+#: misc-utils/lsblk.c:1852 sys-utils/lsirq.c:63 sys-utils/lsmem.c:512
msgid " -J, --json use JSON output format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: misc-utils/lsblk.c:1775
+#: misc-utils/lsblk.c:1853
msgid " -O, --output-all output all columns\n"
msgstr " -O, --output-all 输出所有列\n"
-#: misc-utils/lsblk.c:1777
+#: misc-utils/lsblk.c:1855
msgid " -S, --scsi output info about SCSI devices\n"
msgstr " -S, --scsi 输出有关 SCSI 设备的信息\n"
-#: misc-utils/lsblk.c:1778
+#: misc-utils/lsblk.c:1856
#, fuzzy
msgid " -T, --tree[=<column>] use tree format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/lsblk.c:1779
+#: misc-utils/lsblk.c:1857
msgid " -a, --all print all devices\n"
msgstr " -a, --all 打印所有设备\n"
-#: misc-utils/lsblk.c:1781
+#: misc-utils/lsblk.c:1859
msgid " -d, --nodeps don't print slaves or holders\n"
msgstr " -d, --nodeps 不打印从属设备(slave)或占位设备(holder)\n"
-#: misc-utils/lsblk.c:1782
+#: misc-utils/lsblk.c:1860
msgid " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"
msgstr " -e, --exclude <列表> 根据主设备号排除设备(默认：内存盘)\n"
-#: misc-utils/lsblk.c:1783
+#: misc-utils/lsblk.c:1861
msgid " -f, --fs output info about filesystems\n"
msgstr " -f, --fs 输出文件系统信息\n"
-#: misc-utils/lsblk.c:1784
+#: misc-utils/lsblk.c:1862
msgid " -i, --ascii use ascii characters only\n"
msgstr " -i, --ascii 只使用 ascii 字符\n"
-#: misc-utils/lsblk.c:1785
+#: misc-utils/lsblk.c:1863
msgid " -l, --list use list format output\n"
msgstr " -l, --list 使用列表格式的输出\n"
-#: misc-utils/lsblk.c:1786
+#: misc-utils/lsblk.c:1864
#, fuzzy
msgid " -M, --merge group parents of sub-trees (usable for RAIDs, Multi-path)\n"
msgstr " -d, --dump <设备> 转储分区表(用于后续输入)\n"
-#: misc-utils/lsblk.c:1787
+#: misc-utils/lsblk.c:1865
msgid " -m, --perms output info about permissions\n"
msgstr " -m, --perms 输出权限信息\n"
-#: misc-utils/lsblk.c:1788 sys-utils/lsirq.c:65 sys-utils/lsmem.c:516
+#: misc-utils/lsblk.c:1866 sys-utils/lsirq.c:65 sys-utils/lsmem.c:516
msgid " -n, --noheadings don't print headings\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/lsblk.c:1789 sys-utils/lsmem.c:517
+#: misc-utils/lsblk.c:1867 sys-utils/lsmem.c:517
msgid " -o, --output <list> output columns\n"
msgstr " -o, --output <列表> 输出列\n"
-#: misc-utils/lsblk.c:1790
+#: misc-utils/lsblk.c:1868
msgid " -p, --paths print complete device path\n"
msgstr " -p, --paths 打印完整设备路径\n"
-#: misc-utils/lsblk.c:1792
+#: misc-utils/lsblk.c:1870
msgid " -s, --inverse inverse dependencies\n"
msgstr " -s, --inverse 反向依赖\n"
-#: misc-utils/lsblk.c:1793
+#: misc-utils/lsblk.c:1871
msgid " -t, --topology output info about topology\n"
msgstr " -t, --topology 输出拓扑信息\n"
-#: misc-utils/lsblk.c:1794
+#: misc-utils/lsblk.c:1872
#, fuzzy
-msgid " -z, --zoned print zone model\n"
-msgstr " -c, --offline 只打印离线 CPU\n"
+msgid " -w, --width <num> specifies output width as number of characters\n"
+msgstr " -c, --columns <宽度> 输出宽度(字符数)\n"
-#: misc-utils/lsblk.c:1795
+#: misc-utils/lsblk.c:1873
msgid " -x, --sort <column> sort output by <column>\n"
msgstr " -x, --sort <列> 按<列>对输出排序\n"
-#: misc-utils/lsblk.c:1796
+#: misc-utils/lsblk.c:1874
+#, fuzzy
+msgid " -z, --zoned print zone model\n"
+msgstr " -c, --offline 只打印离线 CPU\n"
+
+#: misc-utils/lsblk.c:1875
msgid " --sysroot <dir> use specified directory as system root\n"
msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
-#: misc-utils/lsblk.c:1813
+#: misc-utils/lsblk.c:1892
#, c-format
msgid "failed to access sysfs directory: %s"
msgstr "无法访问 sysfs 目录：%s"
-#: misc-utils/lsblk.c:2154
+#: misc-utils/lsblk.c:2099
+#, fuzzy
+msgid "invalid output width number argument"
+msgstr "无效的分区号参数"
+
+#: misc-utils/lsblk.c:2257
msgid "failed to allocate device tree"
msgstr "分配设备树失败"
msgid "failed to parse ID"
msgstr "解析 ID 失败"
-#: misc-utils/lslocks.c:281 sys-utils/nsenter.c:262
+#: misc-utils/lslocks.c:281 misc-utils/uuidd.c:755 sys-utils/nsenter.c:262
msgid "failed to parse pid"
msgstr "解析 pid 失败"
msgid " -i, --noinaccessible ignore locks without read permissions\n"
msgstr " -i, --noinaccessible 忽略没有读权限的锁\n"
-#: misc-utils/lslocks.c:537 sys-utils/lsns.c:907 sys-utils/rfkill.c:582
+#: misc-utils/lslocks.c:537 sys-utils/lsns.c:972 sys-utils/rfkill.c:630
msgid " -n, --noheadings don't print headings\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: misc-utils/lslocks.c:538 sys-utils/lsns.c:908 sys-utils/rfkill.c:583
+#: misc-utils/lslocks.c:538 sys-utils/lsns.c:973 sys-utils/rfkill.c:631
msgid " -o, --output <list> define which output columns to use\n"
msgstr " -o, --output <list> 定义使用哪个输出列\n"
-#: misc-utils/lslocks.c:539 sys-utils/lsns.c:909 sys-utils/rfkill.c:584
+#: misc-utils/lslocks.c:539 sys-utils/lsns.c:974 sys-utils/rfkill.c:632
msgid " --output-all output all columns\n"
msgstr " --output-all 输出所有列\n"
msgid " -p, --pid <pid> display only locks held by this process\n"
msgstr " -p, --pid <pid> 只显示由指定进程持有的锁\n"
-#: misc-utils/lslocks.c:541 sys-utils/lsns.c:911 sys-utils/rfkill.c:585
+#: misc-utils/lslocks.c:541 sys-utils/lsns.c:976 sys-utils/rfkill.c:633
msgid " -r, --raw use the raw output format\n"
msgstr " -r, --raw 使用原生输出格式\n"
-#: misc-utils/lslocks.c:606 schedutils/chrt.c:484 schedutils/ionice.c:177
-#: schedutils/taskset.c:171 sys-utils/choom.c:102 sys-utils/lsns.c:993
-#: sys-utils/prlimit.c:587
+#: misc-utils/lslocks.c:606 schedutils/chrt.c:414 schedutils/ionice.c:177
+#: schedutils/taskset.c:171 schedutils/uclampset.c:255 sys-utils/choom.c:102
+#: sys-utils/lsns.c:1058 sys-utils/prlimit.c:593
msgid "invalid PID argument"
msgstr "无效的 PID 参数"
msgid " -v, --verbose explain what is being done\n"
msgstr " -v, --verbose 解释正在进行的操作\n"
-#: misc-utils/mcookie.c:97 misc-utils/wipefs.c:671 sys-utils/blkdiscard.c:104
-#: sys-utils/fallocate.c:107 sys-utils/fstrim.c:434
+#: misc-utils/mcookie.c:97 misc-utils/wipefs.c:671 sys-utils/blkdiscard.c:107
+#: sys-utils/fallocate.c:107 sys-utils/fstrim.c:435
msgid "<num>"
msgstr ""
msgid "closing %s failed"
msgstr "关闭 %s 失败"
-#: misc-utils/mcookie.c:168 sys-utils/blkdiscard.c:184 sys-utils/fstrim.c:500
-#: text-utils/hexdump.c:117
+#: misc-utils/mcookie.c:168 sys-utils/blkdiscard.c:189 sys-utils/fstrim.c:501
+#: text-utils/hexdump.c:124
msgid "failed to parse length"
msgstr "解析长度失败"
msgid "pathname argument is missing"
msgstr "缺少 路径名 参数"
-#: misc-utils/namei.c:414 sys-utils/lsns.c:1070
+#: misc-utils/namei.c:414 sys-utils/lsns.c:1135
msgid "failed to allocate UID cache"
msgstr "分配 UID 缓存失败"
msgid "failed to get terminal attributes"
msgstr "取终端属性失败"
-#: misc-utils/uuidd.c:64
+#: misc-utils/uuidd.c:97
msgid "A daemon for generating UUIDs.\n"
msgstr "一个用于生成 UUID 的守护进程。\n"
-#: misc-utils/uuidd.c:66
+#: misc-utils/uuidd.c:99
msgid " -p, --pid <path> path to pid file\n"
msgstr " -p, --pid <路径> pid 文件路径\n"
-#: misc-utils/uuidd.c:67
+#: misc-utils/uuidd.c:100
msgid " -s, --socket <path> path to socket\n"
msgstr " -s, --socket <路径> 套接字路径\n"
-#: misc-utils/uuidd.c:68
+#: misc-utils/uuidd.c:101
msgid " -T, --timeout <sec> specify inactivity timeout\n"
msgstr " -T, --timeout <秒> 指定无活动超时\n"
-#: misc-utils/uuidd.c:69
+#: misc-utils/uuidd.c:102
msgid " -k, --kill kill running daemon\n"
msgstr " -k, --kill 杀死运行中的守护进程\n"
-#: misc-utils/uuidd.c:70
+#: misc-utils/uuidd.c:103
msgid " -r, --random test random-based generation\n"
msgstr " -r, --random 测试基于随机数的生成方式\n"
-#: misc-utils/uuidd.c:71
+#: misc-utils/uuidd.c:104
msgid " -t, --time test time-based generation\n"
msgstr " -t, --time 测试基于时间的生成方式\n"
-#: misc-utils/uuidd.c:72
+#: misc-utils/uuidd.c:105
msgid " -n, --uuids <num> request number of uuids\n"
msgstr " -n, --uuids <数值> 请求指定数量的 uuid\n"
-#: misc-utils/uuidd.c:73
+#: misc-utils/uuidd.c:106
msgid " -P, --no-pid do not create pid file\n"
msgstr " -P, --no-pid 不创建 pid 文件\n"
-#: misc-utils/uuidd.c:74
+#: misc-utils/uuidd.c:107
msgid " -F, --no-fork do not daemonize using double-fork\n"
msgstr " -F, --no-fork 不使用双 fork 变成守护进程\n"
-#: misc-utils/uuidd.c:75
+#: misc-utils/uuidd.c:108
msgid " -S, --socket-activation do not create listening socket\n"
msgstr " -S, --socket-activation 不创建侦听套接字\n"
-#: misc-utils/uuidd.c:76
+#: misc-utils/uuidd.c:109
msgid " -d, --debug run in debugging mode\n"
msgstr " -d, --debug 以调试模式运行\n"
-#: misc-utils/uuidd.c:77
+#: misc-utils/uuidd.c:110
msgid " -q, --quiet turn on quiet mode\n"
msgstr " -q, --quiet 开启安静模式\n"
-#: misc-utils/uuidd.c:109
+#: misc-utils/uuidd.c:142
msgid "bad arguments"
msgstr "参数错误"
-#: misc-utils/uuidd.c:116
+#: misc-utils/uuidd.c:149
msgid "socket"
msgstr "套接字"
-#: misc-utils/uuidd.c:127
+#: misc-utils/uuidd.c:160
msgid "connect"
msgstr "连接"
-#: misc-utils/uuidd.c:147
+#: misc-utils/uuidd.c:180
msgid "write"
msgstr "写"
-#: misc-utils/uuidd.c:155
+#: misc-utils/uuidd.c:188
msgid "read count"
msgstr "读计数"
-#: misc-utils/uuidd.c:161
+#: misc-utils/uuidd.c:194
msgid "bad response length"
msgstr "响应长度错误"
-#: misc-utils/uuidd.c:212
+#: misc-utils/uuidd.c:245
#, c-format
msgid "cannot lock %s"
msgstr "无法锁定 %s"
-#: misc-utils/uuidd.c:237
+#: misc-utils/uuidd.c:270
msgid "couldn't create unix stream socket"
msgstr "无法创建 unix 流套接字"
-#: misc-utils/uuidd.c:262
+#: misc-utils/uuidd.c:295
#, c-format
msgid "couldn't bind unix socket %s"
msgstr "无法绑定 unix 套接字 %s"
-#: misc-utils/uuidd.c:289
+#: misc-utils/uuidd.c:322
msgid "receiving signal failed"
msgstr "接收信号失败"
-#: misc-utils/uuidd.c:304
+#: misc-utils/uuidd.c:337
msgid "timed out"
msgstr "已超时"
-#: misc-utils/uuidd.c:339 sys-utils/flock.c:274
+#: misc-utils/uuidd.c:373 sys-utils/flock.c:276
msgid "cannot set up timer"
msgstr "无法设置定时器"
-#: misc-utils/uuidd.c:347
+#: misc-utils/uuidd.c:381
#, c-format
msgid "uuidd daemon is already running at pid %s"
msgstr "uuidd 守护进程已运行，pid 为 %s"
-#: misc-utils/uuidd.c:356
+#: misc-utils/uuidd.c:390
#, c-format
msgid "couldn't listen on unix socket %s"
msgstr "无法侦听 unix 套接字 %s"
-#: misc-utils/uuidd.c:366
+#: misc-utils/uuidd.c:400
#, c-format
msgid "could not truncate file: %s"
msgstr "无法截短文件：%s"
-#: misc-utils/uuidd.c:380
+#: misc-utils/uuidd.c:414
msgid "sd_listen_fds() failed"
msgstr "sd_listen_fds() 失败"
-#: misc-utils/uuidd.c:383
+#: misc-utils/uuidd.c:417
msgid "no file descriptors received, check systemctl status uuidd.socket"
msgstr "没有收到文件描述符，请检查 systemctl 状态 uuidd.socket"
-#: misc-utils/uuidd.c:386
+#: misc-utils/uuidd.c:420
msgid "too many file descriptors received, check uuidd.socket"
msgstr "收到太多文件描述符，请检查 uuidd.socket"
-#: misc-utils/uuidd.c:414 text-utils/more.c:1353
+#: misc-utils/uuidd.c:448 text-utils/more.c:1353
msgid "poll failed"
msgstr "轮询失败"
-#: misc-utils/uuidd.c:419
+#: misc-utils/uuidd.c:453
#, c-format
msgid "timeout [%d sec]\n"
msgstr "超时 [%d 秒]\n"
-#: misc-utils/uuidd.c:436 sys-utils/irqtop.c:183 sys-utils/irqtop.c:186
-#: sys-utils/irqtop.c:203 term-utils/setterm.c:920 text-utils/column.c:495
-#: text-utils/column.c:518
+#: misc-utils/uuidd.c:470 sys-utils/irqtop.c:210 sys-utils/irqtop.c:213
+#: sys-utils/irqtop.c:230 term-utils/setterm.c:920 text-utils/column.c:531
+#: text-utils/column.c:561
msgid "read failed"
msgstr "read 失败"
-#: misc-utils/uuidd.c:438
+#: misc-utils/uuidd.c:472
#, c-format
msgid "error reading from client, len = %d"
msgstr "从客户端读取出错，长度 = %d"
-#: misc-utils/uuidd.c:447
+#: misc-utils/uuidd.c:481
#, c-format
msgid "operation %d, incoming num = %d\n"
msgstr "操作 %d，接收数 = %d\n"
-#: misc-utils/uuidd.c:450
+#: misc-utils/uuidd.c:484
#, c-format
msgid "operation %d\n"
msgstr "操作 %d\n"
-#: misc-utils/uuidd.c:466
+#: misc-utils/uuidd.c:500
#, c-format
msgid "Generated time UUID: %s\n"
msgstr "已生成时间 UUID：%s\n"
-#: misc-utils/uuidd.c:476
+#: misc-utils/uuidd.c:510
#, c-format
msgid "Generated random UUID: %s\n"
msgstr "已生成随机 UUID：%s\n"
-#: misc-utils/uuidd.c:485
+#: misc-utils/uuidd.c:519
#, 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:506
+#: misc-utils/uuidd.c:540
#, c-format
msgid "Generated %d UUID:\n"
msgid_plural "Generated %d UUIDs:\n"
msgstr[0] "已生成 %d 个 UUID：\n"
-#: misc-utils/uuidd.c:520
+#: misc-utils/uuidd.c:552
#, c-format
msgid "Invalid operation %d\n"
msgstr "无效操作 %d\n"
-#: misc-utils/uuidd.c:532
+#: misc-utils/uuidd.c:564
#, c-format
msgid "Unexpected reply length from server %d"
msgstr "服务器 %d 响应长度异常"
-#: misc-utils/uuidd.c:593
+#: misc-utils/uuidd.c:607
msgid "failed to parse --uuids"
msgstr "解析 --uuids 失败"
-#: misc-utils/uuidd.c:610
+#: misc-utils/uuidd.c:624
msgid "uuidd has been built without support for socket activation"
msgstr "uuidd 构建时没有添加套接字激活支持"
-#: misc-utils/uuidd.c:629
+#: misc-utils/uuidd.c:643
msgid "failed to parse --timeout"
msgstr "解析 --timeout 失败"
-#: misc-utils/uuidd.c:642
+#: misc-utils/uuidd.c:684
#, c-format
msgid "socket name too long: %s"
msgstr "套接字名称过长：%s"
-#: misc-utils/uuidd.c:649
+#: misc-utils/uuidd.c:691
msgid "Both --socket-activation and --socket specified. Ignoring --socket."
msgstr "同时指定了 --socket-activation 和 --socket。将忽略 --socket"
-#: misc-utils/uuidd.c:656 misc-utils/uuidd.c:684
+#: misc-utils/uuidd.c:702 misc-utils/uuidd.c:737
#, c-format
msgid "error calling uuidd daemon (%s)"
msgstr "调用 uuidd 守护进程(%s)出错"
-#: misc-utils/uuidd.c:657 misc-utils/uuidd.c:685
+#: misc-utils/uuidd.c:703 misc-utils/uuidd.c:738
msgid "unexpected error"
msgstr "意外错误"
-#: misc-utils/uuidd.c:665
+#: misc-utils/uuidd.c:711
#, 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:669
+#: misc-utils/uuidd.c:717
#, c-format
msgid "List of UUIDs:\n"
msgstr "UUID 列表：\n"
-#: misc-utils/uuidd.c:701
+#: misc-utils/uuidd.c:759
#, c-format
msgid "couldn't kill uuidd running at pid %d"
msgstr "无法运行 pid 为 %d 的 uuidd"
-#: misc-utils/uuidd.c:706
+#: misc-utils/uuidd.c:764
#, c-format
msgid "Killed uuidd running at pid %d.\n"
msgstr "已杀死运行 pid 为 %d 的 uuidd。\n"
msgstr ""
#: misc-utils/uuidgen.c:35
+#, fuzzy, c-format
+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:36
+#: misc-utils/uuidgen.c:37
msgid " -m, --md5 generate md5 hash\n"
msgstr " -m, --md5 生成 md5 散列\n"
-#: misc-utils/uuidgen.c:37
+#: misc-utils/uuidgen.c:38
msgid " -s, --sha1 generate sha1 hash\n"
msgstr " -s, --sha1 生成 sha1 散列\n"
-#: misc-utils/uuidgen.c:38
+#: misc-utils/uuidgen.c:39
#, fuzzy
msgid " -x, --hex interpret name as hex string\n"
msgstr " -i, --invert 反转搜索的匹配\n"
+#: misc-utils/uuidgen.c:53
+#, fuzzy
+msgid "not a valid hex string"
+msgstr "%s：不是有效的交换分区"
+
+#: misc-utils/uuidgen.c:144
+#, fuzzy
+msgid "--namespace requires --name argument"
+msgstr "%s 需要一个参数"
+
+#: misc-utils/uuidgen.c:148
+#, fuzzy
+msgid "--namespace requires --md5 or --sha1"
+msgstr "--init-groups 需要 --ruid 或者 --reuid"
+
+#: misc-utils/uuidgen.c:153
+#, fuzzy
+msgid "--name requires --namespace argument"
+msgstr "无效的名字空间参数"
+
+#: misc-utils/uuidgen.c:157
+#, fuzzy
+msgid "--md5 or --sha1 requires --namespace argument"
+msgstr "%s 需要一个参数"
+
+#: misc-utils/uuidgen.c:182
+#, fuzzy, c-format
+msgid "unknown namespace alias: '%s'"
+msgstr "未知的名字空间类型︰ %s"
+
+#: misc-utils/uuidgen.c:188
+#, fuzzy, c-format
+msgid "invalid uuid for namespace: '%s'"
+msgstr "无效 ID：%s"
+
#: misc-utils/uuidparse.c:76
#, fuzzy
msgid "unique identifier"
msgstr ""
#: misc-utils/uuidparse.c:267 misc-utils/wipefs.c:178
-#: sys-utils/irq-common.c:123 sys-utils/lscpu.c:2044 sys-utils/lsns.c:807
-#: sys-utils/zramctl.c:505
+#: sys-utils/irq-common.c:155 sys-utils/irq-common.c:459 sys-utils/lscpu.c:948
+#: sys-utils/lsns.c:872 sys-utils/zramctl.c:505
msgid "failed to initialize output column"
msgstr "初始化输出列失败"
-#: misc-utils/whereis.c:199
+#: misc-utils/whereis.c:201
#, c-format
msgid " %s [options] [-BMS <dir>... -f] <name>\n"
msgstr " %s [选项] [-BMS <dir>... -f] <名称>\n"
-#: misc-utils/whereis.c:202
+#: misc-utils/whereis.c:204
msgid "Locate the binary, source, and manual-page files for a command.\n"
msgstr "定位某个命令的二进制文件、源码和帮助页文件。\n"
-#: misc-utils/whereis.c:205
+#: misc-utils/whereis.c:207
msgid " -b search only for binaries\n"
msgstr " -b 只搜索二进制文件\n"
-#: misc-utils/whereis.c:206
+#: misc-utils/whereis.c:208
msgid " -B <dirs> define binaries lookup path\n"
msgstr " -B <目录> 定义二进制文件查找路径\n"
-#: misc-utils/whereis.c:207
+#: misc-utils/whereis.c:209
msgid " -m search only for manuals and infos\n"
msgstr " -m 只搜索手册和信息\n"
-#: misc-utils/whereis.c:208
+#: misc-utils/whereis.c:210
msgid " -M <dirs> define man and info lookup path\n"
msgstr " -M <目录> 定义 man 和 info 查找路径\n"
-#: misc-utils/whereis.c:209
+#: misc-utils/whereis.c:211
msgid " -s search only for sources\n"
msgstr " -s 只搜索源代码\n"
-#: misc-utils/whereis.c:210
+#: misc-utils/whereis.c:212
msgid " -S <dirs> define sources lookup path\n"
msgstr " -S <目录> 定义源代码查找路径\n"
-#: misc-utils/whereis.c:211
+#: misc-utils/whereis.c:213
msgid " -f terminate <dirs> argument list\n"
msgstr " -f 终止 <目录> 参数列表\n"
-#: misc-utils/whereis.c:212
+#: misc-utils/whereis.c:214
msgid " -u search for unusual entries\n"
msgstr " -u 搜索不常见记录\n"
-#: misc-utils/whereis.c:213
+#: misc-utils/whereis.c:215
msgid " -l output effective lookup paths\n"
msgstr " -l 输出有效查找路径\n"
-#: misc-utils/whereis.c:652
+#: misc-utils/whereis.c:655
msgid "option -f is missing"
msgstr "缺少 -f 选项"
msgid " --lock[=<mode>] use exclusive device lock (%s, %s or %s)\n"
msgstr " --color[=<时机>] 消息彩色显示(auto, always 或 never)\n"
-#: misc-utils/wipefs.c:784
+#: misc-utils/wipefs.c:785
msgid "The --backup option is meaningless in this context"
msgstr "--backup 在此环境中无意义"
-#: schedutils/chrt.c:135
+#: schedutils/chrt.c:60
msgid "Show or change the real-time scheduling attributes of a process.\n"
msgstr "显示或更改某个进程的实时调度属性。\n"
-#: schedutils/chrt.c:137
+#: schedutils/chrt.c:62
msgid ""
"Set policy:\n"
" chrt [options] <priority> <command> [<arg>...]\n"
" chrt [选项] <优先级> <命令> [<参数>...]\n"
" chrt [选项] --pid <优先级> <pid>\n"
-#: schedutils/chrt.c:141
+#: schedutils/chrt.c:66
msgid ""
"Get policy:\n"
" chrt [options] -p <pid>\n"
"获取策略\n"
" chrt [选项] -p <pid>\n"
-#: schedutils/chrt.c:145
+#: schedutils/chrt.c:70
msgid "Policy options:\n"
msgstr "策略选项：\n"
-#: schedutils/chrt.c:146
+#: schedutils/chrt.c:71
msgid " -b, --batch set policy to SCHED_BATCH\n"
msgstr " -b, --batch 将策略设置为 SCHED_BATCH\n"
-#: schedutils/chrt.c:147
+#: schedutils/chrt.c:72
msgid " -d, --deadline set policy to SCHED_DEADLINE\n"
msgstr " -d, --deadline 将策略设置为 SCHED_DEADLINE\n"
-#: schedutils/chrt.c:148
+#: schedutils/chrt.c:73
msgid " -f, --fifo set policy to SCHED_FIFO\n"
msgstr " -f, --fifo 将策略设置为 SCHED_FIFO\n"
-#: schedutils/chrt.c:149
+#: schedutils/chrt.c:74
msgid " -i, --idle set policy to SCHED_IDLE\n"
msgstr " -i, --idle 将策略设置为 SCHED_IDLE\n"
-#: schedutils/chrt.c:150
+#: schedutils/chrt.c:75
msgid " -o, --other set policy to SCHED_OTHER\n"
msgstr " -o, --other 将策略设置为 SCHED_OTHER\n"
-#: schedutils/chrt.c:151
+#: schedutils/chrt.c:76
msgid " -r, --rr set policy to SCHED_RR (default)\n"
msgstr " -r, --rr 将策略设置为 SCHED_RR (默认)\n"
-#: schedutils/chrt.c:154
+#: schedutils/chrt.c:79
msgid "Scheduling options:\n"
msgstr "调度选项：\n"
-#: schedutils/chrt.c:155
-msgid " -R, --reset-on-fork set SCHED_RESET_ON_FORK for FIFO or RR\n"
+#: schedutils/chrt.c:80
+#, fuzzy
+msgid " -R, --reset-on-fork set reset-on-fork flag\n"
msgstr " -R, --reset-on-fork 为 FIFO 或 RR 设置 SCHED_RESET_ON_FORK\n"
-#: schedutils/chrt.c:156
+#: schedutils/chrt.c:81
msgid " -T, --sched-runtime <ns> runtime parameter for DEADLINE\n"
msgstr " -T, --sched-runtime <ns> DEADLINE 的运行时参数\n"
-#: schedutils/chrt.c:157
+#: schedutils/chrt.c:82
msgid " -P, --sched-period <ns> period parameter for DEADLINE\n"
msgstr " -P, --sched-period <ns> DEADLINE 的周期参数\n"
-#: schedutils/chrt.c:158
+#: schedutils/chrt.c:83
msgid " -D, --sched-deadline <ns> deadline parameter for DEADLINE\n"
msgstr " -D, --sched-deadline <ns> DEADLINE 的截止时间参数\n"
-#: schedutils/chrt.c:161
+#: schedutils/chrt.c:86
msgid "Other options:\n"
msgstr "其他选项：\n"
-#: schedutils/chrt.c:162
+#: schedutils/chrt.c:87 schedutils/uclampset.c:66
msgid " -a, --all-tasks operate on all the tasks (threads) for a given pid\n"
msgstr " -a, --all-tasks 对指定 pid 的所有任务(线程) 操作\n"
-#: schedutils/chrt.c:163
+#: schedutils/chrt.c:88
msgid " -m, --max show min and max valid priorities\n"
msgstr " -m, --max 显示最小和最大有效优先级\n"
-#: schedutils/chrt.c:164
+#: schedutils/chrt.c:89
msgid " -p, --pid operate on existing given pid\n"
msgstr " -p, --pid 对指定且存在的 pid 操作\n"
-#: schedutils/chrt.c:165
+#: schedutils/chrt.c:90 schedutils/uclampset.c:70
msgid " -v, --verbose display status information\n"
msgstr " -v, --verbose 显示状态信息\n"
-#: schedutils/chrt.c:231 schedutils/chrt.c:253
+#: schedutils/chrt.c:153 schedutils/chrt.c:175
#, c-format
msgid "failed to get pid %d's policy"
msgstr "无法获得 pid %d 的策略"
-#: schedutils/chrt.c:256
+#: schedutils/chrt.c:178
#, c-format
msgid "failed to get pid %d's attributes"
msgstr "获取 pid %d 的属性失败"
-#: schedutils/chrt.c:266
+#: schedutils/chrt.c:188
#, c-format
msgid "pid %d's new scheduling policy: %s"
msgstr "pid “%d” 的新调度策略：%s"
-#: schedutils/chrt.c:268
+#: schedutils/chrt.c:190
#, c-format
msgid "pid %d's current scheduling policy: %s"
msgstr "pid %d 当前的调度策略︰ %s"
-#: schedutils/chrt.c:275
+#: schedutils/chrt.c:197
#, c-format
msgid "pid %d's new scheduling priority: %d\n"
msgstr "pid %d 的新调度策略：%d\n"
-#: schedutils/chrt.c:277
+#: schedutils/chrt.c:199
#, c-format
msgid "pid %d's current scheduling priority: %d\n"
msgstr "pid %d 的当前调度优先级：%d\n"
-#: schedutils/chrt.c:282
+#: schedutils/chrt.c:204
#, c-format
msgid "pid %d's new runtime/deadline/period parameters: %ju/%ju/%ju\n"
msgstr "pid %d 新的运行时/截止时间/周期参数︰ %ju/%ju/%ju\n"
-#: schedutils/chrt.c:285
+#: schedutils/chrt.c:207
#, c-format
msgid "pid %d's current runtime/deadline/period parameters: %ju/%ju/%ju\n"
msgstr "pid %d 当前的运行时/截止时间/周期参数︰ %ju/%ju/%ju\n"
-#: schedutils/chrt.c:299 schedutils/chrt.c:404
+#: schedutils/chrt.c:222 schedutils/chrt.c:229 schedutils/chrt.c:332
+#: schedutils/chrt.c:340 schedutils/uclampset.c:141 schedutils/uclampset.c:182
msgid "cannot obtain the list of tasks"
msgstr "无法获取任务列表"
-#: schedutils/chrt.c:333
+#: schedutils/chrt.c:259
#, c-format
msgid "%s min/max priority\t: %d/%d\n"
msgstr "%s 最小/最大优先级\t: %d/%d\n"
-#: schedutils/chrt.c:336
+#: schedutils/chrt.c:262
#, c-format
msgid "%s not supported?\n"
msgstr "%s 不支持？ \n"
-#: schedutils/chrt.c:408
+#: schedutils/chrt.c:336
#, c-format
msgid "failed to set tid %d's policy"
msgstr "设置 tid %d 策略失败"
-#: schedutils/chrt.c:413
+#: schedutils/chrt.c:343
#, c-format
msgid "failed to set pid %d's policy"
msgstr "设置 pid %d 的策略失败"
-#: schedutils/chrt.c:493
+#: schedutils/chrt.c:423
msgid "invalid runtime argument"
msgstr "无效的运行时参数"
-#: schedutils/chrt.c:496
+#: schedutils/chrt.c:426
msgid "invalid period argument"
msgstr "无效的周期参数"
-#: schedutils/chrt.c:499
+#: schedutils/chrt.c:429
msgid "invalid deadline argument"
msgstr "无效的截止时间参数"
-#: schedutils/chrt.c:524
+#: schedutils/chrt.c:454
msgid "invalid priority argument"
msgstr "无效的 优先级 参数"
-#: schedutils/chrt.c:528
-msgid "--reset-on-fork option is supported for SCHED_FIFO and SCHED_RR policies only"
-msgstr "--reset-on-fork 选项只支持 SCHED_FIFO and SCHED_RR 策略"
-
-#: schedutils/chrt.c:533
+#: schedutils/chrt.c:458
msgid "--sched-{runtime,deadline,period} options are supported for SCHED_DEADLINE only"
msgstr "--sched-{runtime,deadline,period} 选项只支持 SCHED_DEADLINE"
-#: schedutils/chrt.c:548
+#: schedutils/chrt.c:473
msgid "SCHED_DEADLINE is unsupported"
msgstr "不支持 SCHED_DEADLINE"
-#: schedutils/chrt.c:555
+#: schedutils/chrt.c:480
#, c-format
msgid "unsupported priority value for the policy: %d: see --max for valid range"
msgstr "不支持此策略的优先级值：%d：查看 --max 了解有效范围"
msgid "pid %d's new affinity list: %s\n"
msgstr "pid %d 的新亲和力列表：%s\n"
-#: schedutils/taskset.c:92
-#, c-format
-msgid "pid %d's current affinity list: %s\n"
-msgstr "pid %d 的当前亲和力列表：%s\n"
+#: schedutils/taskset.c:92
+#, c-format
+msgid "pid %d's current affinity list: %s\n"
+msgstr "pid %d 的当前亲和力列表：%s\n"
+
+#: schedutils/taskset.c:95
+#, c-format
+msgid "pid %d's new affinity mask: %s\n"
+msgstr "pid %d 的新亲和力掩码：%s\n"
+
+#: schedutils/taskset.c:96
+#, c-format
+msgid "pid %d's current affinity mask: %s\n"
+msgstr "pid %d 的当前亲和力掩码：%s\n"
+
+#: schedutils/taskset.c:100
+msgid "internal error: conversion from cpuset to string failed"
+msgstr "内部错误：从 cpuset 转换到字符串失败"
+
+#: schedutils/taskset.c:109
+#, c-format
+msgid "failed to set pid %d's affinity"
+msgstr "设置 pid %d 的亲和力失败"
+
+#: schedutils/taskset.c:110
+#, c-format
+msgid "failed to get pid %d's affinity"
+msgstr "获取 pid %d 的亲和力失败"
+
+#: schedutils/taskset.c:194 sys-utils/chcpu.c:300
+msgid "cannot determine NR_CPUS; aborting"
+msgstr "无法确定 NR_CPUS；将中止"
+
+#: schedutils/taskset.c:203 schedutils/taskset.c:216 sys-utils/chcpu.c:307
+msgid "cpuset_alloc failed"
+msgstr "cpuset_alloc 失败"
+
+#: schedutils/taskset.c:223 sys-utils/chcpu.c:234
+#, c-format
+msgid "failed to parse CPU list: %s"
+msgstr "解析 CPU 列表失败：%s"
+
+#: schedutils/taskset.c:226
+#, c-format
+msgid "failed to parse CPU mask: %s"
+msgstr "解析 CPU 掩码失败：%s"
+
+#: schedutils/uclampset.c:56
+#, fuzzy, c-format
+msgid ""
+" %1$s [options]\n"
+" %1$s [options] --pid <pid> | --system | <command> <arg>...\n"
+msgstr ""
+" %1$s [选项] -p <pid>...\n"
+" %1$s [选项] -P <pgid>...\n"
+" %1$s [选项] -u <uid>...\n"
+" %1$s [选项] <命令>\n"
+
+#: schedutils/uclampset.c:61
+#, fuzzy
+msgid "Show or change the utilization clamping attributes.\n"
+msgstr "显示或更改某个进程的实时调度属性。\n"
+
+#: schedutils/uclampset.c:64
+#, fuzzy
+msgid " -m <value> util_min value to set\n"
+msgstr " -<数字> 显示行数\n"
+
+#: schedutils/uclampset.c:65
+#, fuzzy
+msgid " -M <value> util_max value to set\n"
+msgstr " -<数字> 显示行数\n"
+
+#: schedutils/uclampset.c:67
+#, fuzzy
+msgid " -p, --pid <pid> operate on existing given pid\n"
+msgstr " -p, --pid 对指定且存在的 pid 操作\n"
+
+#: schedutils/uclampset.c:68
+#, fuzzy
+msgid " -s, --system operate on system\n"
+msgstr " -s, --system-accs 显示系统帐户\n"
+
+#: schedutils/uclampset.c:69
+msgid " -R, --reset-on-fork set reset-on-fork flag\n"
+msgstr ""
+
+#: schedutils/uclampset.c:75
+msgid "Utilization value range is [0:1024]. Use special -1 value to reset to system's default.\n"
+msgstr ""
+
+#: schedutils/uclampset.c:92 schedutils/uclampset.c:157
+#, fuzzy, c-format
+msgid "failed to get pid %d's uclamp values"
+msgstr "获取 pid %d 的属性失败"
-#: schedutils/taskset.c:95
+#: schedutils/uclampset.c:99
#, c-format
-msgid "pid %d's new affinity mask: %s\n"
-msgstr "pid %d 的新亲和力掩码：%s\n"
+msgid "%s (%d) util_clamp: min: %d max: %d\n"
+msgstr ""
-#: schedutils/taskset.c:96
+#: schedutils/uclampset.c:129
#, c-format
-msgid "pid %d's current affinity mask: %s\n"
-msgstr "pid %d 的当前亲和力掩码：%s\n"
+msgid "System util_clamp: min: %u max: %u\n"
+msgstr ""
-#: schedutils/taskset.c:100
-msgid "internal error: conversion from cpuset to string failed"
-msgstr "内部错误：从 cpuset 转换到字符串失败"
+#: schedutils/uclampset.c:186
+#, fuzzy, c-format
+msgid "failed to set tid %d's uclamp values"
+msgstr "设置 tid %d 策略失败"
-#: schedutils/taskset.c:109
-#, c-format
-msgid "failed to set pid %d's affinity"
-msgstr "设置 pid %d 的亲和力失败"
+#: schedutils/uclampset.c:191
+#, fuzzy, c-format
+msgid "failed to set pid %d's uclamp values"
+msgstr "设置 pid %d 的策略失败"
-#: schedutils/taskset.c:110
-#, c-format
-msgid "failed to get pid %d's affinity"
-msgstr "获取 pid %d 的亲和力失败"
+#: schedutils/uclampset.c:205
+msgid "util_min must be <= util_max"
+msgstr ""
-#: schedutils/taskset.c:194 sys-utils/chcpu.c:300
-msgid "cannot determine NR_CPUS; aborting"
-msgstr "无法确定 NR_CPUS；将中止"
+#: schedutils/uclampset.c:216
+#, fuzzy, c-format
+msgid "%d out of range"
+msgstr "值超出范围。"
-#: schedutils/taskset.c:203 schedutils/taskset.c:216 sys-utils/chcpu.c:307
-msgid "cpuset_alloc failed"
-msgstr "cpuset_alloc 失败"
+#: schedutils/uclampset.c:268
+#, fuzzy
+msgid "invalid util_min argument"
+msgstr "无效的 时间 参数"
-#: schedutils/taskset.c:223 sys-utils/chcpu.c:234
-#, c-format
-msgid "failed to parse CPU list: %s"
-msgstr "解析 CPU 列表失败：%s"
+#: schedutils/uclampset.c:274
+#, fuzzy
+msgid "invalid util_max argument"
+msgstr "无效的 时间 参数"
-#: schedutils/taskset.c:226
-#, c-format
-msgid "failed to parse CPU mask: %s"
-msgstr "解析 CPU 掩码失败：%s"
+#: schedutils/uclampset.c:297
+#, fuzzy
+msgid "missing -p option"
+msgstr "缺少 optstring 参数"
+
+#: schedutils/uclampset.c:315
+#, fuzzy
+msgid "no cmd to execute"
+msgstr "执行 %s 失败"
-#: sys-utils/blkdiscard.c:70
+#: sys-utils/blkdiscard.c:73
#, c-format
msgid "%s: Zero-filled %<PRIu64> bytes from the offset %<PRIu64>\n"
msgstr "%s: 用零填充的 %<PRIu64> 个字节，始于偏移量 %<PRIu64>\n"
-#: sys-utils/blkdiscard.c:75
+#: sys-utils/blkdiscard.c:78
#, c-format
msgid "%s: Discarded %<PRIu64> bytes from the offset %<PRIu64>\n"
msgstr "%1$s：已忽略从偏移 %3$<PRIu64> 位置开始的 %2$<PRIu64> 个字节\n"
-#: sys-utils/blkdiscard.c:89
+#: sys-utils/blkdiscard.c:92
msgid "Discard the content of sectors on a device.\n"
msgstr "丢弃一个设备上的扇区内容。\n"
-#: sys-utils/blkdiscard.c:92
+#: sys-utils/blkdiscard.c:95
msgid " -f, --force disable all checking\n"
msgstr " -f, --force 禁用所有检查\n"
-#: sys-utils/blkdiscard.c:93
+#: sys-utils/blkdiscard.c:96
msgid " -o, --offset <num> offset in bytes to discard from\n"
msgstr " -o, --offset <数值> 要丢弃的起始位置(字节)\n"
-#: sys-utils/blkdiscard.c:94
+#: sys-utils/blkdiscard.c:97
msgid " -l, --length <num> length of bytes to discard from the offset\n"
msgstr " -l, --length <数值> 从起始处起要丢弃的长度(字节数)\n"
-#: sys-utils/blkdiscard.c:95
+#: sys-utils/blkdiscard.c:98
msgid " -p, --step <num> size of the discard iterations within the offset\n"
msgstr " -p, --step <数值> 在偏移范围内丢弃迭代的尺寸\n"
-#: sys-utils/blkdiscard.c:96
+#: sys-utils/blkdiscard.c:99
msgid " -s, --secure perform secure discard\n"
msgstr " -s, --secure 执行安全丢弃\n"
-#: sys-utils/blkdiscard.c:97
+#: sys-utils/blkdiscard.c:100
msgid " -z, --zeroout zero-fill rather than discard\n"
msgstr " -z, --zeroout 用 零填充而非丢弃\n"
-#: sys-utils/blkdiscard.c:98
+#: sys-utils/blkdiscard.c:101
msgid " -v, --verbose print aligned length and offset\n"
msgstr " -v, --verbose 打印对齐的长度和偏移\n"
-#: sys-utils/blkdiscard.c:188 sys-utils/fstrim.c:504 sys-utils/losetup.c:706
-#: text-utils/hexdump.c:124
+#: sys-utils/blkdiscard.c:193 sys-utils/fstrim.c:505 sys-utils/losetup.c:710
+#: text-utils/hexdump.c:131
msgid "failed to parse offset"
msgstr "解析偏移失败"
-#: sys-utils/blkdiscard.c:192
+#: sys-utils/blkdiscard.c:197
msgid "failed to parse step"
msgstr "解析步长失败"
-#: sys-utils/blkdiscard.c:219 sys-utils/blkzone.c:463 sys-utils/fallocate.c:379
-#: sys-utils/fsfreeze.c:110 sys-utils/fstrim.c:532 sys-utils/umount.c:588
+#: sys-utils/blkdiscard.c:224 sys-utils/blkzone.c:491 sys-utils/fallocate.c:382
+#: sys-utils/fsfreeze.c:110 sys-utils/fstrim.c:533 sys-utils/umount.c:615
msgid "unexpected number of arguments"
msgstr "参数数量异常"
-#: sys-utils/blkdiscard.c:233
+#: sys-utils/blkdiscard.c:238
#, c-format
msgid "%s: BLKGETSIZE64 ioctl failed"
msgstr "%s：BLKGETSIZE64 ioctl 失败"
-#: sys-utils/blkdiscard.c:235 sys-utils/blkzone.c:150
+#: sys-utils/blkdiscard.c:240 sys-utils/blkzone.c:155
#, c-format
msgid "%s: BLKSSZGET ioctl failed"
msgstr "%s：BLKSSZGET ioctl 失败"
-#: sys-utils/blkdiscard.c:239
+#: sys-utils/blkdiscard.c:244
#, c-format
msgid "%s: offset %<PRIu64> is not aligned to sector size %i"
msgstr "%s: 偏移量 %<PRIu64> 未与扇区大小 %i 对齐"
-#: sys-utils/blkdiscard.c:244 sys-utils/blkzone.c:320
+#: sys-utils/blkdiscard.c:249 sys-utils/blkzone.c:348
#, c-format
msgid "%s: offset is greater than device size"
msgstr "%s：偏移量超过设备大小"
-#: sys-utils/blkdiscard.c:253
+#: sys-utils/blkdiscard.c:258
#, c-format
msgid "%s: length %<PRIu64> is not aligned to sector size %i"
msgstr "%s: 长度 %<PRIu64> 未与扇区大小 %i 对齐"
-#: sys-utils/blkdiscard.c:265
-msgid "This is destructive operation, data will be lost! Use the -f option to override."
-msgstr ""
-
-#: sys-utils/blkdiscard.c:268
+#: sys-utils/blkdiscard.c:262
msgid "Operation forced, data will be lost!"
msgstr ""
#: sys-utils/blkdiscard.c:273
+msgid "This is destructive operation, data will be lost! Use the -f option to override."
+msgstr ""
+
+#: sys-utils/blkdiscard.c:280
#, fuzzy
msgid "failed to probe the device"
msgstr "分配设备失败"
-#: sys-utils/blkdiscard.c:287
+#: sys-utils/blkdiscard.c:296
#, c-format
msgid "%s: BLKZEROOUT ioctl failed"
msgstr "%s: BLKZEROOUT ioctl 失败"
-#: sys-utils/blkdiscard.c:291
+#: sys-utils/blkdiscard.c:300
#, c-format
msgid "%s: BLKSECDISCARD ioctl failed"
msgstr "%s：BLKSECDISCARD ioctl 失败"
-#: sys-utils/blkdiscard.c:295
+#: sys-utils/blkdiscard.c:304
#, c-format
msgid "%s: BLKDISCARD ioctl failed"
msgstr "%s：BLKDISCARD ioctl 失败"
-#: sys-utils/blkzone.c:92
+#: sys-utils/blkzone.c:93
#, fuzzy
msgid "Report zone information about the given device"
msgstr "列出块设备的信息。\n"
-#: sys-utils/blkzone.c:98
+#: sys-utils/blkzone.c:97
+#, fuzzy
+msgid "Report sum of zone capacities for the given device"
+msgstr "列出块设备的信息。\n"
+
+#: sys-utils/blkzone.c:103
msgid "Reset a range of zones."
msgstr ""
-#: sys-utils/blkzone.c:104
+#: sys-utils/blkzone.c:109
msgid "Open a range of zones."
msgstr ""
-#: sys-utils/blkzone.c:110
+#: sys-utils/blkzone.c:115
msgid "Close a range of zones."
msgstr ""
-#: sys-utils/blkzone.c:116
+#: sys-utils/blkzone.c:121
msgid "Set a range of zones to Full."
msgstr ""
-#: sys-utils/blkzone.c:147
+#: sys-utils/blkzone.c:152
#, fuzzy, c-format
msgid "%s: blkdev_get_sectors ioctl failed"
msgstr "%s︰ 设置直接 io 失败"
-#: sys-utils/blkzone.c:227
+#: sys-utils/blkzone.c:242
#, fuzzy, c-format
msgid "%s: offset is greater than or equal to device size"
msgstr "%s：偏移量超过设备大小"
-#: sys-utils/blkzone.c:231 sys-utils/blkzone.c:310
+#: sys-utils/blkzone.c:246 sys-utils/blkzone.c:338
#, fuzzy, c-format
msgid "%s: unable to determine zone size"
msgstr "%s：无法写 zone map"
-#: sys-utils/blkzone.c:249
+#: sys-utils/blkzone.c:264
#, fuzzy, c-format
msgid "%s: BLKREPORTZONE ioctl failed"
msgstr "%s：BLKGETSIZE64 ioctl 失败"
-#: sys-utils/blkzone.c:252
+#: sys-utils/blkzone.c:267
#, c-format
msgid "Found %d zones from 0x%<PRIx64>\n"
msgstr ""
-#: sys-utils/blkzone.c:278
+#: sys-utils/blkzone.c:302
#, c-format
-msgid " start: 0x%09<PRIx64>, len 0x%06<PRIx64>, wptr 0x%06<PRIx64> reset:%u non-seq:%u, zcond:%2u(%s) [type: %u(%s)]\n"
+msgid " start: 0x%09<PRIx64>, len 0x%06<PRIx64>,
cap 0x%06<PRIx64>, wptr 0x%06<PRIx64> reset:%u non-seq:%u, zcond:%2u(%s) [type: %u(%s)]\n"
msgstr ""
-#: sys-utils/blkzone.c:315
+#: sys-utils/blkzone.c:318
+#, c-format
+msgid "0x%09<PRIx64>\n"
+msgstr ""
+
+#: sys-utils/blkzone.c:343
#, fuzzy, c-format
msgid "%s: offset %<PRIu64> is not aligned to zone size %lu"
msgstr "%s: 偏移量 %<PRIu64> 未与扇区大小 %i 对齐"
-#: sys-utils/blkzone.c:334
+#: sys-utils/blkzone.c:362
#, fuzzy, c-format
msgid "%s: number of sectors %<PRIu64> is not aligned to zone size %lu"
msgstr "%s: 偏移量 %<PRIu64> 未与扇区大小 %i 对齐"
-#: sys-utils/blkzone.c:342
+#: sys-utils/blkzone.c:370
#, c-format
msgid "%s: %s ioctl failed"
msgstr "%s：%s ioctl 失败"
-#: sys-utils/blkzone.c:345
+#: sys-utils/blkzone.c:373
#, fuzzy, c-format
msgid "%s: successful %s of zones in range from %<PRIu64>, to %<PRIu64>"
msgstr "分区表长度已从 %<PRIu32> 改为 %<PRIu64>。"
-#: sys-utils/blkzone.c:360
+#: sys-utils/blkzone.c:388
#, c-format
msgid " %s <command> [options] <device>\n"
msgstr " %s <命令> [选项] <设备>\n"
-#: sys-utils/blkzone.c:363
+#: sys-utils/blkzone.c:391
msgid "Run zone command on the given block device.\n"
msgstr ""
-#: sys-utils/blkzone.c:370
+#: sys-utils/blkzone.c:398
#, fuzzy
msgid " -o, --offset <sector> start sector of zone to act (in 512-byte sectors)\n"
msgstr " -o, --offset <数字> 范围操作的偏移量(字节数)\n"
-#: sys-utils/blkzone.c:371
+#: sys-utils/blkzone.c:399
msgid " -l, --length <sectors> maximum sectors to act (in 512-byte sectors)\n"
msgstr ""
-#: sys-utils/blkzone.c:372
+#: sys-utils/blkzone.c:400
#, fuzzy
msgid " -c, --count <number> maximum number of zones\n"
msgstr " -t, --streams <数字> 压缩流数量\n"
-#: sys-utils/blkzone.c:373
+#: sys-utils/blkzone.c:401
#, fuzzy
msgid " -f, --force enforce on block devices used by the system\n"
msgstr " -f, --force 强制跨文件系统进行硬链接"
-#: sys-utils/blkzone.c:374
+#: sys-utils/blkzone.c:402
#, fuzzy
msgid " -v, --verbose display more details\n"
msgstr " --verbose 打印更多细节\n"
-#: sys-utils/blkzone.c:379
+#: sys-utils/blkzone.c:407
#, fuzzy
msgid "<sector> and <sectors>"
msgstr "扇区计数：%d，扇区大小：%d\n"
-#: sys-utils/blkzone.c:417
+#: sys-utils/blkzone.c:445
#, fuzzy, c-format
msgid "%s is not valid command name"
msgstr "%s 不是一个有效的块设备"
-#: sys-utils/blkzone.c:429
+#: sys-utils/blkzone.c:457
#, fuzzy
msgid "failed to parse number of zones"
msgstr "解析行数失败"
-#: sys-utils/blkzone.c:433
+#: sys-utils/blkzone.c:461
#, fuzzy
msgid "failed to parse number of sectors"
msgstr "解析行数失败"
-#: sys-utils/blkzone.c:437
+#: sys-utils/blkzone.c:465
#, fuzzy
msgid "failed to parse zone offset"
msgstr "解析偏移失败"
-#: sys-utils/blkzone.c:456 sys-utils/setsid.c:92
+#: sys-utils/blkzone.c:484 sys-utils/setsid.c:92
#, fuzzy
msgid "no command specified"
msgstr "没有指定命令"
msgid "invalid CPU number in CPU list: %s"
msgstr "CPU 列表中的 CPU 数量无效：%s"
-#: sys-utils/chcpu.c:241 text-utils/col.c:131
+#: sys-utils/chcpu.c:241 text-utils/col.c:170
#, c-format
msgid ""
"\n"
"\n"
"支持的日志设施：\n"
-#: sys-utils/chmem.c:387 sys-utils/lscpu.c:1444 sys-utils/lsmem.c:654
+#: sys-utils/chmem.c:387 sys-utils/lscpu-cputype.c:844 sys-utils/lsmem.c:654
#, fuzzy, c-format
msgid "failed to initialize %s handler"
msgstr "%s：初始化 sysfs 处理函数失败"
msgid "invalid adjust argument"
msgstr "无效的 磁头数 参数"
-#: sys-utils/choom.c:119 term-utils/mesg.c:177
+#: sys-utils/choom.c:119 term-utils/mesg.c:178
#, c-format
msgid "invalid argument: %s"
msgstr "无效参数：%s"
msgid "FTP daemon"
msgstr "FTP 守护进程"
-#: sys-utils/dmesg.c:272
+#: sys-utils/dmesg.c:275
msgid "Display or control the kernel ring buffer.\n"
msgstr "显示或控制内核环形缓冲区。\n"
-#: sys-utils/dmesg.c:275
+#: sys-utils/dmesg.c:278
msgid " -C, --clear clear the kernel ring buffer\n"
msgstr " -C, --clear 清除内核环形缓冲区(ring butter)\n"
-#: sys-utils/dmesg.c:276
+#: sys-utils/dmesg.c:279
msgid " -c, --read-clear read and clear all messages\n"
msgstr " -c, --read-clear 读取并清除所有消息\n"
-#: sys-utils/dmesg.c:277
+#: sys-utils/dmesg.c:280
msgid " -D, --console-off disable printing messages to console\n"
msgstr " -D, --console-off 禁止向终端打印消息\n"
-#: sys-utils/dmesg.c:278
+#: sys-utils/dmesg.c:281
msgid " -E, --console-on enable printing messages to console\n"
msgstr " -E, --console-on 启用向终端打印消息\n"
-#: sys-utils/dmesg.c:279
+#: sys-utils/dmesg.c:282
msgid " -F, --file <file> use the file instead of the kernel log buffer\n"
msgstr " -F, --file <文件> 用 文件 代替内核日志缓冲区\n"
-#: sys-utils/dmesg.c:280
+#: sys-utils/dmesg.c:283
msgid " -f, --facility <list> restrict output to defined facilities\n"
msgstr " -f, --facility <列表> 将输出限制为定义的设施\n"
-#: sys-utils/dmesg.c:281
+#: sys-utils/dmesg.c:284
msgid " -H, --human human readable output\n"
msgstr " -H, --human 易读格式输出\n"
-#: sys-utils/dmesg.c:282
+#: sys-utils/dmesg.c:285
msgid " -k, --kernel display kernel messages\n"
msgstr " -k, --kernel 显示内核消息\n"
-#: sys-utils/dmesg.c:284
+#: sys-utils/dmesg.c:287
#, fuzzy, c-format
msgid " -L, --color[=<when>] colorize messages (%s, %s or %s)\n"
msgstr " -L, --color[=<时机>] 彩色显示消息(auto, always 或 never)\n"
-#: sys-utils/dmesg.c:287
+#: sys-utils/dmesg.c:290
msgid " -l, --level <list> restrict output to defined levels\n"
msgstr " -l, --level <列表> 限制输出级别\n"
-#: sys-utils/dmesg.c:288
+#: sys-utils/dmesg.c:291
msgid " -n, --console-level <level> set level of messages printed to console\n"
msgstr " -n, --console-level <级别> 设置打印到终端的消息级别\n"
-#: sys-utils/dmesg.c:289
+#: sys-utils/dmesg.c:292
msgid " -P, --nopager do not pipe output into a pager\n"
msgstr " -P, --nopager 不将输出通过管道传递给分页程序\n"
-#: sys-utils/dmesg.c:290
+#: sys-utils/dmesg.c:293
msgid " -p, --force-prefix force timestamp output on each line of multi-line messages\n"
msgstr ""
-#: sys-utils/dmesg.c:291
+#: sys-utils/dmesg.c:294
msgid " -r, --raw print the raw message buffer\n"
msgstr " -r, --raw 打印原生消息缓冲区\n"
-#: sys-utils/dmesg.c:292
+#: sys-utils/dmesg.c:295
#, fuzzy
msgid " --noescape don't escape unprintable character\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: sys-utils/dmesg.c:293
+#: sys-utils/dmesg.c:296
msgid " -S, --syslog force to use syslog(2) rather than /dev/kmsg\n"
msgstr " -S, --syslog 强制使用 syslog(2) 而非 /dev/kmsg\n"
-#: sys-utils/dmesg.c:294
+#: sys-utils/dmesg.c:297
msgid " -s, --buffer-size <size> buffer size to query the kernel ring buffer\n"
msgstr " -s, --buffer-size <大小> 查询内核环形缓冲区所用的缓冲区大小\n"
-#: sys-utils/dmesg.c:295
+#: sys-utils/dmesg.c:298
msgid " -u, --userspace display userspace messages\n"
msgstr " -u, --userspace 显示用户空间消息\n"
-#: sys-utils/dmesg.c:296
+#: sys-utils/dmesg.c:299
msgid " -w, --follow wait for new messages\n"
msgstr " -w, --follow 等待新消息\n"
-#: sys-utils/dmesg.c:297
+#: sys-utils/dmesg.c:300
#, fuzzy
msgid " -W, --follow-new wait and print only new messages\n"
msgstr " -w, --follow 等待新消息\n"
-#: sys-utils/dmesg.c:298
+#: sys-utils/dmesg.c:301
msgid " -x, --decode decode facility and level to readable string\n"
msgstr " -x, --decode 将设施和级别解码为可读的字符串\n"
-#: sys-utils/dmesg.c:299
+#: sys-utils/dmesg.c:302
msgid " -d, --show-delta show time delta between printed messages\n"
msgstr " -d, --show-delta 显示打印消息之间的时间差\n"
-#: sys-utils/dmesg.c:300
+#: sys-utils/dmesg.c:303
msgid " -e, --reltime show local time and time delta in readable format\n"
msgstr " -e, --reltime 以易读格式显示本地时间和时间差\n"
-#: sys-utils/dmesg.c:301
+#: sys-utils/dmesg.c:304
msgid " -T, --ctime show human-readable timestamp (may be inaccurate!)\n"
msgstr " -T, --ctime 显示易读的时间戳(可能不准确！)\n"
-#: sys-utils/dmesg.c:302
+#: sys-utils/dmesg.c:305
msgid " -t, --notime don't show any timestamp with messages\n"
msgstr " -t, --notime 不显示任何消息的时间戳\n"
-#: sys-utils/dmesg.c:303
+#: sys-utils/dmesg.c:306
msgid ""
" --time-format <format> show timestamp using the given format:\n"
" [delta|reltime|ctime|notime|iso]\n"
" [delta|reltime|ctime|notime|iso]\n"
"挂起/恢复会使 ctime 和 iso 时间戳不精确。\n"
-#: sys-utils/dmesg.c:308
+#: sys-utils/dmesg.c:309
+#, fuzzy
+msgid " --since <time> display the lines since the specified time\n"
+msgstr " -s, --since <时间> 显示从指定时间起的行\n"
+
+#: sys-utils/dmesg.c:310
+#, fuzzy
+msgid " --until <time> display the lines until the specified time\n"
+msgstr " -t, --until <时间> 显示到指定时间为止的行\n"
+
+#: sys-utils/dmesg.c:314
msgid ""
"\n"
"Supported log facilities:\n"
"\n"
"支持的日志设施：\n"
-#: sys-utils/dmesg.c:314
+#: sys-utils/dmesg.c:320
msgid ""
"\n"
"Supported log levels (priorities):\n"
"\n"
"支持的日志级别(优先级)：\n"
-#: sys-utils/dmesg.c:368
+#: sys-utils/dmesg.c:374
#, c-format
msgid "failed to parse level '%s'"
msgstr "解析级别“%s”失败"
-#: sys-utils/dmesg.c:370
+#: sys-utils/dmesg.c:376
#, c-format
msgid "unknown level '%s'"
msgstr "未知级别“%s”"
-#: sys-utils/dmesg.c:406
+#: sys-utils/dmesg.c:412
#, c-format
msgid "failed to parse facility '%s'"
msgstr "解析设施“%s”失败"
-#: sys-utils/dmesg.c:408
+#: sys-utils/dmesg.c:414
#, c-format
msgid "unknown facility '%s'"
msgstr "未知设施“%s”"
-#: sys-utils/dmesg.c:536
+#: sys-utils/dmesg.c:542
#, c-format
msgid "cannot mmap: %s"
msgstr "无法 mmap：%s"
-#: sys-utils/dmesg.c:1463
+#: sys-utils/dmesg.c:1479
msgid "invalid buffer size argument"
msgstr "无效的 缓冲区大小 参数"
-#: sys-utils/dmesg.c:1527
+#: sys-utils/dmesg.c:1558
msgid "--show-delta is ignored when used together with iso8601 time format"
msgstr "--show-delta 与 iso8601 时间格式共用时将忽略"
-#: sys-utils/dmesg.c:1550
+#: sys-utils/dmesg.c:1581
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:1565
+#: sys-utils/dmesg.c:1598
msgid "read kernel buffer failed"
msgstr "读取内核缓冲区失败"
-#: sys-utils/dmesg.c:1584
+#: sys-utils/dmesg.c:1606
+#, fuzzy
+msgid "clear kernel buffer failed"
+msgstr "读取内核缓冲区失败"
+
+#: sys-utils/dmesg.c:1622
msgid "klogctl failed"
msgstr "klogctl 失败"
msgid "device name is `%s'"
msgstr "设备名称为“%s”"
-#: sys-utils/eject.c:898 sys-utils/umount.c:343 sys-utils/umount.c:367
+#: sys-utils/eject.c:898 sys-utils/umount.c:361 sys-utils/umount.c:385
#, c-format
msgid "%s: not mounted"
msgstr "%s：未挂载"
msgid "%s: read failed"
msgstr "%s：read 失败"
-#: sys-utils/fallocate.c:278
+#: sys-utils/fallocate.c:281
#, c-format
msgid "%s: %s (%ju bytes) converted to sparse holes.\n"
msgstr "%s：已将 %s(%ju 字节) 转换为稀疏空洞。\n"
-#: sys-utils/fallocate.c:358
+#: sys-utils/fallocate.c:361
msgid "posix_fallocate support is not compiled"
msgstr ""
-#: sys-utils/fallocate.c:374 sys-utils/fsfreeze.c:106
+#: sys-utils/fallocate.c:377 sys-utils/fsfreeze.c:106
msgid "no filename specified"
msgstr "未指定文件名"
-#: sys-utils/fallocate.c:386 sys-utils/fallocate.c:392
+#: sys-utils/fallocate.c:389 sys-utils/fallocate.c:395
msgid "invalid length value specified"
msgstr "指定的长度值无效"
-#: sys-utils/fallocate.c:390
+#: sys-utils/fallocate.c:393
msgid "no length argument specified"
msgstr "没有指定长度参数"
-#: sys-utils/fallocate.c:395
+#: sys-utils/fallocate.c:398
msgid "invalid offset value specified"
msgstr "指定的偏移值无效"
msgid "invalid exit code"
msgstr "无效退出代码"
-#: sys-utils/flock.c:231
+#: sys-utils/flock.c:216
+msgid "exit code out of range (expected 0 to 255)"
+msgstr ""
+
+#: sys-utils/flock.c:233
msgid "the --no-fork and --close options are incompatible"
msgstr "--no-fork 和 --close 选项不兼容"
-#: sys-utils/flock.c:239
+#: sys-utils/flock.c:241
#, c-format
msgid "%s requires exactly one command argument"
msgstr "%s 需要惟一的命令行参数"
-#: sys-utils/flock.c:257
+#: sys-utils/flock.c:259
msgid "bad file descriptor"
msgstr "错误的文件描述符"
-#: sys-utils/flock.c:260
+#: sys-utils/flock.c:262
msgid "requires file descriptor, file or directory"
msgstr "需要文件描述符、文件或目录"
-#: sys-utils/flock.c:284
+#: sys-utils/flock.c:286
msgid "failed to get lock"
msgstr "获取锁失败"
-#: sys-utils/flock.c:291
+#: sys-utils/flock.c:293
msgid "timeout while waiting to get lock"
msgstr "等待获得锁超时"
-#: sys-utils/flock.c:332
-#, c-format
-msgid "%s: getting lock took %ld.%06ld seconds\n"
+#: sys-utils/flock.c:334
+#, fuzzy, c-format
+#| msgid "%s: getting lock took %ld.%06ld seconds\n"
+msgid "%s: getting lock took %<PRId64>.%06<PRId64> seconds\n"
msgstr "%s：等待获得锁花了 %ld.%06ld 秒\n"
-#: sys-utils/flock.c:343
+#: sys-utils/flock.c:346
#, c-format
msgid "%s: executing %s\n"
msgstr "%s: 正在执行 %s\n"
msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
msgstr "%s：%s (%<PRIu64> 字节) 已修剪\n"
-#: sys-utils/fstrim.c:249 sys-utils/lsns.c:1079 sys-utils/swapon.c:732
-#: sys-utils/umount.c:259
+#: sys-utils/fstrim.c:249 sys-utils/lsns.c:1144 sys-utils/swapon.c:745
+#: sys-utils/umount.c:267
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失败"
msgid "failed to allocate FS handler"
msgstr "分配脚本处理程序失败"
-#: sys-utils/fstrim.c:363 sys-utils/fstrim.c:544
+#: sys-utils/fstrim.c:364 sys-utils/fstrim.c:545
#, c-format
msgid "%s: the discard operation is not supported"
msgstr "%s：不支持丢弃操作"
-#: sys-utils/fstrim.c:414
+#: sys-utils/fstrim.c:415
#, c-format
msgid " %s [options] <mount point>\n"
msgstr " %s [选项] <挂臷点>\n"
-#: sys-utils/fstrim.c:417
+#: sys-utils/fstrim.c:418
msgid "Discard unused blocks on a mounted filesystem.\n"
msgstr "忽略已挂载文件系统上的未用锁。\n"
-#: sys-utils/fstrim.c:420
+#: sys-utils/fstrim.c:421
#, fuzzy
msgid " -a, --all trim mounted filesystems\n"
msgstr " -a, --all 卸载所有文件系统\n"
-#: sys-utils/fstrim.c:421
+#: sys-utils/fstrim.c:422
#, fuzzy
msgid " -A, --fstab trim filesystems from /etc/fstab\n"
msgstr " -a, --all 修剪不支持的所有已挂载文件系统\n"
-#: sys-utils/fstrim.c:422
+#: sys-utils/fstrim.c:423
#, fuzzy
msgid " -I, --listed-in <list> trim filesystems listed in specified files\n"
msgstr " -m, -p, --preserve-environment 不重置环境变量\n"
-#: sys-utils/fstrim.c:423
+#: sys-utils/fstrim.c:424
#, fuzzy
msgid " -o, --offset <num> the offset in bytes to start discarding from\n"
msgstr " -o, --offset <数字> 开始丢弃的偏移量(字节)\n"
-#: sys-utils/fstrim.c:424
+#: sys-utils/fstrim.c:425
#, fuzzy
msgid " -l, --length <num> the number of bytes to discard\n"
msgstr " -l, --length <数字> 要丢弃的字符数\n"
-#: sys-utils/fstrim.c:425
+#: sys-utils/fstrim.c:426
#, fuzzy
msgid " -m, --minimum <num> the minimum extent length to discard\n"
msgstr " -m, --minimum <数字> 要丢弃的最小限制长度\n"
-#: sys-utils/fstrim.c:426
+#: sys-utils/fstrim.c:427
#, fuzzy
msgid " -v, --verbose print number of discarded bytes\n"
msgstr " -v, --verbose 打印丢弃的字节数\n"
-#: sys-utils/fstrim.c:427
+#: sys-utils/fstrim.c:428
#, fuzzy
msgid " --quiet-unsupported suppress error messages if trim unsupported\n"
msgstr " -q, --quiet 禁止输出额外信息\n"
-#: sys-utils/fstrim.c:428
+#: sys-utils/fstrim.c:429
#, fuzzy
msgid " -n, --dry-run does everything, but trim\n"
msgstr " -n, --dry-run 演示操作但不执行(suspend)\n"
-#: sys-utils/fstrim.c:508
+#: sys-utils/fstrim.c:509
msgid "failed to parse minimum extent length"
msgstr "解析 最小范围长度 失败"
-#: sys-utils/fstrim.c:527
+#: sys-utils/fstrim.c:528
msgid "no mountpoint specified"
msgstr "未指定挂载点"
-#: sys-utils/hwclock.c:211
+#: sys-utils/hwclock.c:213
#, c-format
msgid "Assuming hardware clock is kept in %s time.\n"
msgstr "将假设硬件时钟保持为 %s 时间。\n"
-#: sys-utils/hwclock.c:212 sys-utils/hwclock.c:276
+#: sys-utils/hwclock.c:214 sys-utils/hwclock.c:282
msgid "UTC"
msgstr "UTC"
-#: sys-utils/hwclock.c:212 sys-utils/hwclock.c:275
+#: sys-utils/hwclock.c:214 sys-utils/hwclock.c:281
msgid "local"
msgstr "当地"
-#: sys-utils/hwclock.c:262
+#: sys-utils/hwclock.c:269
msgid ""
"Warning: unrecognized third line in adjtime file\n"
"(Expected: `UTC' or `LOCAL' or nothing.)"
"警告：adjtime 文件第三行无法识别\n"
"(应为：“UTC”或“LOCAL”或空)"
-#: sys-utils/hwclock.c:269
-#, c-format
-msgid "Last drift adjustment done at %ld seconds after 1969\n"
+#: sys-utils/hwclock.c:275
+#, 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:271
-#, c-format
-msgid "Last calibration done at %ld seconds after 1969\n"
+#: sys-utils/hwclock.c:277
+#, 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:273
+#: sys-utils/hwclock.c:279
#, c-format
msgid "Hardware clock is on %s time\n"
msgstr "硬件时钟为 %s 时间\n"
-#: sys-utils/hwclock.c:300
+#: sys-utils/hwclock.c:306
#, c-format
msgid "Waiting for clock tick...\n"
msgstr "正在等等时钟滴答...\n"
-#: sys-utils/hwclock.c:306
+#: sys-utils/hwclock.c:312
#, c-format
msgid "...synchronization failed\n"
msgstr "...同步失败\n"
-#: sys-utils/hwclock.c:308
+#: sys-utils/hwclock.c:314
#, c-format
msgid "...got clock tick\n"
msgstr "...已获取时钟滴答\n"
-#: sys-utils/hwclock.c:349
+#: sys-utils/hwclock.c:355
#, 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:357
-#, c-format
-msgid "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
+#: sys-utils/hwclock.c:362
+#, 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:384
+#: sys-utils/hwclock.c:388
#, 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:411
-#, c-format
-msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
+#: sys-utils/hwclock.c:415
+#, 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:447
+#: sys-utils/hwclock.c:451
#, c-format
msgid "RTC type: '%s'\n"
msgstr "RTC 类型：“%s”\n"
-#: sys-utils/hwclock.c:547
+#: sys-utils/hwclock.c:551
#, fuzzy, c-format
msgid "Using delay: %.6f seconds\n"
msgstr "%s %.6f 秒\n"
-#: sys-utils/hwclock.c:566
-#, c-format
-msgid "time jumped backward %.6f seconds to %ld.%06ld - retargeting\n"
+#: sys-utils/hwclock.c:570
+#, 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:588
-#, c-format
-msgid "missed it - %ld.%06ld is too far past %ld.%06ld (%.6f > %.6f)\n"
+#: sys-utils/hwclock.c:592
+#, 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:615
+#: sys-utils/hwclock.c:619
#, fuzzy, c-format
msgid ""
-"%ld.%06ld is close enough to %ld.%06ld (%.6f < %.6f)\n"
-"Set RTC to %ld (%ld + %d; refsystime = %ld.%06ld)\n"
+"%<PRId64>.%06<PRId64> is close enough to %<PRId64>.%06<PRId64> (%.6f < %.6f)\n"
+"Set RTC to %<PRId64> (%<PRId64> + %d; refsystime = %<PRId64>.%06<PRId64>)\n"
msgstr ""
"%ld.%06d 距 %ld.%06d 太近(%.6f < %.6f)\n"
"请将 RTC 设为 %ld (%ld + %d; refsystime = %ld.%06d)\n"
-#: sys-utils/hwclock.c:701
+#: sys-utils/hwclock.c:713
#, fuzzy
msgid "Calling settimeofday(NULL, 0) to lock the warp_clock function."
msgstr "正在调用 settimeofday(NULL, %d)"
-#: sys-utils/hwclock.c:704
+#: sys-utils/hwclock.c:716
#, fuzzy, c-format
msgid "Calling settimeofday(NULL, %d) to set the kernel timezone.\n"
msgstr "正在调用 settimeofday(NULL, %d)"
-#: sys-utils/hwclock.c:708
+#: sys-utils/hwclock.c:720
#, c-format
msgid "Calling settimeofday(NULL, %d) to warp System time, set PCIL and the kernel tz.\n"
msgstr ""
-#: sys-utils/hwclock.c:713
+#: sys-utils/hwclock.c:725
#, fuzzy, c-format
-msgid "Calling settimeofday(%ld.%06ld, NULL) to set the System time.\n"
+msgid "Calling settimeofday(%<PRId64>.%06<PRId64>, NULL) to set the System time.\n"
msgstr "正在调用 settimeofday：\n"
-#: sys-utils/hwclock.c:735
+#: sys-utils/hwclock.c:747
msgid "settimeofday() failed"
msgstr "settimeofday() 失败"
-#: sys-utils/hwclock.c:759
+#: sys-utils/hwclock.c:771
#, c-format
msgid "Not adjusting drift factor because the --update-drift option was not used.\n"
msgstr "将不调整漂移系数，因为没有使用 --update-drift 选项。\n"
-#: sys-utils/hwclock.c:763
+#: sys-utils/hwclock.c:775
#, c-format
msgid ""
"Not adjusting drift factor because last calibration time is zero,\n"
"将不调整漂移系数，因为上次校准时间为零，\n"
"历史有问题；需要启动校准。\n"
-#: sys-utils/hwclock.c:769
+#: sys-utils/hwclock.c:781
#, 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:807
+#: sys-utils/hwclock.c:819
#, c-format
msgid ""
"Clock drift factor was calculated as %f seconds/day.\n"
"时钟漂移系数会按 %f 秒/天计算。\n"
"系数过大，将重置为 0。\n"
-#: sys-utils/hwclock.c:814
+#: sys-utils/hwclock.c:826
#, fuzzy, c-format
msgid ""
"Clock drifted %f seconds in the past %f seconds\n"
"Adjusting drift factor by %f seconds/day\n"
msgstr "在过去的 %2$d 秒内，时钟漂移了 %1$.1f 秒，而漂移系数为 %3$f 秒/天。会将漂移系数调整 %4$f 秒/天\n"
-#: sys-utils/hwclock.c:858
+#: sys-utils/hwclock.c:870
#, fuzzy, c-format
-msgid "Time since last adjustment is %ld second\n"
-msgid_plural "Time since last adjustment is %ld seconds\n"
+msgid "Time since last adjustment is %<PRId64> second\n"
+msgid_plural "Time since last adjustment is %<PRId64> seconds\n"
msgstr[0] "距上次调整的时间为 %d 秒\n"
-#: sys-utils/hwclock.c:862
-#, c-format
-msgid "Calculated Hardware Clock drift is %ld.%06ld seconds\n"
+#: sys-utils/hwclock.c:874
+#, 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:887
+#: sys-utils/hwclock.c:899
#, c-format
msgid ""
"New %s data:\n"
"%s"
msgstr ""
-#: sys-utils/hwclock.c:899
+#: sys-utils/hwclock.c:911
#, c-format
msgid "cannot update %s"
msgstr "无法更新 %s"
-#: sys-utils/hwclock.c:935
+#: sys-utils/hwclock.c:947
#, c-format
msgid "Not setting clock because last adjustment time is zero, so history is bad.\n"
msgstr "将不设置时钟，因为上次调整时间为零，历史有误。\n"
-#: sys-utils/hwclock.c:939
+#: sys-utils/hwclock.c:951
#, c-format
msgid "Not setting clock because drift factor %f is far too high.\n"
msgstr "将不设置时钟，因为上次漂移系数 %f 过高。\n"
-#: sys-utils/hwclock.c:969
+#: sys-utils/hwclock.c:981
#, c-format
msgid "No usable clock interface found.\n"
msgstr "未找到可用的时钟接口。\n"
-#: sys-utils/hwclock.c:971
+#: sys-utils/hwclock.c:983
msgid "Cannot access the Hardware Clock via any known method."
msgstr "无法通过已知的任何方式访问硬件时钟。"
-#: sys-utils/hwclock.c:975
+#: sys-utils/hwclock.c:987
#, fuzzy
msgid "Use the --verbose option to see the details of our search for an access method."
msgstr "请使用 --debug 选项来观察程序搜索访问方法的详情。"
-#: sys-utils/hwclock.c:1025
+#: sys-utils/hwclock.c:1037
#, c-format
-msgid "Target date: %ld\n"
+msgid "Target date: %<PRId64>\n"
msgstr ""
-#: sys-utils/hwclock.c:1026
+#: sys-utils/hwclock.c:1038
#, c-format
-msgid "Predicted RTC: %ld\n"
+msgid "Predicted RTC: %<PRId64>\n"
msgstr ""
-#: sys-utils/hwclock.c:1056
+#: sys-utils/hwclock.c:1068
msgid "RTC read returned an invalid value."
msgstr ""
-#: sys-utils/hwclock.c:1086
+#: sys-utils/hwclock.c:1098
#, c-format
msgid "Needed adjustment is less than one second, so not setting clock.\n"
msgstr "需要的调整不到一秒，将不设置时钟。\n"
-#: sys-utils/hwclock.c:1123
+#: sys-utils/hwclock.c:1135
#, fuzzy
msgid "unable to read the RTC epoch."
msgstr "不能读超级块"
-#: sys-utils/hwclock.c:1125
+#: sys-utils/hwclock.c:1137
#, c-format
msgid "The RTC epoch is set to %lu.\n"
msgstr ""
-#: sys-utils/hwclock.c:1128
+#: sys-utils/hwclock.c:1140
msgid "--epoch is required for --setepoch."
msgstr ""
-#: sys-utils/hwclock.c:1131
+#: sys-utils/hwclock.c:1143
#, fuzzy
msgid "unable to set the RTC epoch."
msgstr "无法设置系统时钟。\n"
-#: sys-utils/hwclock.c:1145
+#: sys-utils/hwclock.c:1157
#, fuzzy, c-format
msgid " %s [function] [option...]\n"
msgstr " hwclock [功能] [选项...]\n"
-#: sys-utils/hwclock.c:1148
+#: sys-utils/hwclock.c:1160
msgid "Time clocks utility."
msgstr ""
-#: sys-utils/hwclock.c:1151
+#: sys-utils/hwclock.c:1163
msgid " -r, --show display the RTC time"
msgstr " -r, --show 显示 RTC 时间"
-#: sys-utils/hwclock.c:1152
+#: sys-utils/hwclock.c:1164
#, fuzzy
msgid " --get display drift corrected RTC time"
msgstr " -Z, --context 显示 SELinux 环境\n"
-#: sys-utils/hwclock.c:1153
+#: sys-utils/hwclock.c:1165
#, fuzzy
msgid " --set set the RTC according to --date"
msgstr " -r, --reset 重置端口\n"
-#: sys-utils/hwclock.c:1154
+#: sys-utils/hwclock.c:1166
msgid " -s, --hctosys set the system time from the RTC"
msgstr ""
-#: sys-utils/hwclock.c:1155
+#: sys-utils/hwclock.c:1167
#, fuzzy
msgid " -w, --systohc set the RTC from the system time"
msgstr " -t, --types <列表> 限制文件系统集合\n"
-#: sys-utils/hwclock.c:1156
+#: sys-utils/hwclock.c:1168
msgid " --systz send timescale configurations to the kernel"
msgstr ""
-#: sys-utils/hwclock.c:1157
+#: sys-utils/hwclock.c:1169
msgid " -a, --adjust adjust the RTC to account for systematic drift"
msgstr ""
-#: sys-utils/hwclock.c:1159
+#: sys-utils/hwclock.c:1171
#, fuzzy
msgid " --getepoch display the RTC epoch"
msgstr " --help 显示此帮助并退出\n"
-#: sys-utils/hwclock.c:1160
+#: sys-utils/hwclock.c:1172
msgid " --setepoch set the RTC epoch according to --epoch"
msgstr ""
-#: sys-utils/hwclock.c:1162
+#: sys-utils/hwclock.c:1174
msgid " --predict predict the drifted RTC time according to --date"
msgstr ""
-#: sys-utils/hwclock.c:1164
+#: sys-utils/hwclock.c:1176
#, fuzzy
msgid " -u, --utc the RTC timescale is UTC"
msgstr " -u, --utc RTC 使用 UTC\n"
-#: sys-utils/hwclock.c:1165
+#: sys-utils/hwclock.c:1177
#, fuzzy
msgid " -l, --localtime the RTC timescale is Local"
msgstr " -l, --local RTC 使用本地时区\n"
-#: sys-utils/hwclock.c:1168
+#: sys-utils/hwclock.c:1180
#, fuzzy, c-format
msgid " -f, --rtc <file> use an alternate file to %1$s\n"
msgstr " -F, --file <文件> 用指定文件代替 %s\n"
-#: sys-utils/hwclock.c:1171
+#: sys-utils/hwclock.c:1183
#, c-format
msgid " --directisa use the ISA bus instead of %1$s access\n"
msgstr ""
-#: sys-utils/hwclock.c:1172
+#: sys-utils/hwclock.c:1184
msgid " --date <time> date/time input for --set and --predict"
msgstr " --date <时间戳> 指定用于 --set 和 --predict 的日期/时间输入"
-#: sys-utils/hwclock.c:1173
+#: sys-utils/hwclock.c:1185
msgid " --delay <sec> delay used when set new RTC time"
msgstr ""
-#: sys-utils/hwclock.c:1175
+#: sys-utils/hwclock.c:1187
msgid " --epoch <year> epoch input for --setepoch"
msgstr ""
-#: sys-utils/hwclock.c:1177
+#: sys-utils/hwclock.c:1189
msgid " --update-drift update the RTC drift factor"
msgstr ""
-#: sys-utils/hwclock.c:1179
+#: sys-utils/hwclock.c:1191
#, c-format
msgid " --noadjfile do not use %1$s\n"
msgstr " --noadjfile 不使用 %1$s\n"
-#: sys-utils/hwclock.c:1181
+#: sys-utils/hwclock.c:1193
#, fuzzy, c-format
msgid " --adjfile <file> use an alternate file to %1$s\n"
msgstr " -F, --file <文件> 用指定文件代替 %s\n"
-#: sys-utils/hwclock.c:1182
+#: sys-utils/hwclock.c:1194
msgid " --test dry run; implies --verbose"
msgstr " --test 测试运行；隐含启用 --verbose"
-#: sys-utils/hwclock.c:1183
+#: sys-utils/hwclock.c:1195
msgid " -v, --verbose display more details"
msgstr " -v, --verbose 显示更多细节"
-#: sys-utils/hwclock.c:1279
+#: sys-utils/hwclock.c:1291
msgid "Unable to connect to audit system"
msgstr "无法连接到审计系统"
-#: sys-utils/hwclock.c:1303
+#: sys-utils/hwclock.c:1315
msgid "use --verbose, --debug has been deprecated."
msgstr ""
-#: sys-utils/hwclock.c:1405
+#: sys-utils/hwclock.c:1417
#, fuzzy, c-format
msgid "%d too many arguments given"
msgstr "参数过多"
-#: sys-utils/hwclock.c:1413
+#: sys-utils/hwclock.c:1425
msgid "--update-drift requires --set or --systohc"
msgstr ""
-#: sys-utils/hwclock.c:1418
+#: sys-utils/hwclock.c:1430
msgid "With --noadjfile, you must specify either --utc or --localtime"
msgstr "指定 --noadjfile 时，您必须指定 --utc 或 --localtime"
-#: sys-utils/hwclock.c:1425
+#: sys-utils/hwclock.c:1437
msgid "--date is required for --set or --predict"
msgstr ""
-#: sys-utils/hwclock.c:1442
+#: sys-utils/hwclock.c:1454
#, fuzzy, c-format
msgid "invalid date '%s'"
msgstr "无效 ID：%s"
-#: sys-utils/hwclock.c:1456
+#: sys-utils/hwclock.c:1468
#, fuzzy, c-format
-msgid "System Time: %ld.%06ld\n"
+msgid "System Time: %<PRId64>.%06<PRId64>\n"
msgstr "当前系统时间：%ld = %s\n"
-#: sys-utils/hwclock.c:1472
+#: sys-utils/hwclock.c:1485
msgid "Test mode: nothing was changed."
msgstr "演示模式：无实际修改。"
msgid "<size>"
msgstr "大小"
-#: sys-utils/ipcmk.c:114 sys-utils/losetup.c:731 sys-utils/zramctl.c:650
-msgid "failed to parse size"
-msgstr "解析大小失败"
-
#: sys-utils/ipcmk.c:121
msgid "failed to parse elements"
msgstr "解析元素失败"
msgid "max seg size"
msgstr "最大段大小"
-#: sys-utils/ipcs.c:225
+#: sys-utils/ipcs.c:224
+#, fuzzy
+msgid "max total shared memory (kbytes)"
+msgstr "最大总共享内存"
+
+#: sys-utils/ipcs.c:232
msgid "max total shared memory"
msgstr "最大总共享内存"
-#: sys-utils/ipcs.c:227
+#: sys-utils/ipcs.c:235
msgid "min seg size"
msgstr "最小段大小"
-#: sys-utils/ipcs.c:239
+#: sys-utils/ipcs.c:247
#, c-format
msgid "kernel not configured for shared memory\n"
msgstr "内核未做共享内存的相关配置\n"
-#: sys-utils/ipcs.c:243
+#: sys-utils/ipcs.c:251
#, c-format
msgid "------ Shared Memory Status --------\n"
msgstr "---------- 共享内存状态 ------------\n"
#. "pages swapped = %ld\n"
#. "swap performance = %ld attempts, %ld successes\n"
#.
-#: sys-utils/ipcs.c:255
+#: sys-utils/ipcs.c:263
#, c-format
msgid ""
"segments allocated %d\n"
"页交换 %ld\n"
"交换性能：%ld 次尝试\t %ld 次成功\n"
-#: sys-utils/ipcs.c:272
+#: sys-utils/ipcs.c:280
#, c-format
msgid "------ Shared Memory Segment Creators/Owners --------\n"
msgstr "------------- 共享内存段创建者/拥有者 ---------------\n"
-#: sys-utils/ipcs.c:274 sys-utils/ipcs.c:280 sys-utils/ipcs.c:287
-#: sys-utils/ipcs.c:293
+#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:288 sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:301
msgid "shmid"
msgstr "shmid"
-#: sys-utils/ipcs.c:274 sys-utils/ipcs.c:293 sys-utils/ipcs.c:398
-#: sys-utils/ipcs.c:413 sys-utils/ipcs.c:500 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:301 sys-utils/ipcs.c:406
+#: sys-utils/ipcs.c:421 sys-utils/ipcs.c:508 sys-utils/ipcs.c:526
msgid "perms"
msgstr "权限"
-#: sys-utils/ipcs.c:274 sys-utils/ipcs.c:398 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:406 sys-utils/ipcs.c:508
msgid "cuid"
msgstr "cuid"
-#: sys-utils/ipcs.c:274 sys-utils/ipcs.c:398 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:406 sys-utils/ipcs.c:508
msgid "cgid"
msgstr "cgid"
-#: sys-utils/ipcs.c:274 sys-utils/ipcs.c:398 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:406 sys-utils/ipcs.c:508
msgid "uid"
msgstr "uid"
-#: sys-utils/ipcs.c:274 sys-utils/ipcs.c:398 sys-utils/ipcs.c:500
+#: sys-utils/ipcs.c:282 sys-utils/ipcs.c:406 sys-utils/ipcs.c:508
msgid "gid"
msgstr "gid"
-#: sys-utils/ipcs.c:278
+#: sys-utils/ipcs.c:286
#, c-format
msgid "------ Shared Memory Attach/Detach/Change Times --------\n"
msgstr "------------ 共享内存 附加/脱离/更改 时间 --------------\n"
-#: sys-utils/ipcs.c:280 sys-utils/ipcs.c:287 sys-utils/ipcs.c:293
-#: sys-utils/ipcs.c:404 sys-utils/ipcs.c:413 sys-utils/ipcs.c:506
-#: sys-utils/ipcs.c:512 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:288 sys-utils/ipcs.c:295 sys-utils/ipcs.c:301
+#: sys-utils/ipcs.c:412 sys-utils/ipcs.c:421 sys-utils/ipcs.c:514
+#: sys-utils/ipcs.c:520 sys-utils/ipcs.c:526
msgid "owner"
msgstr "拥有者"
-#: sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:288
msgid "attached"
msgstr "已附加"
-#: sys-utils/ipcs.c:280
+#: sys-utils/ipcs.c:288
msgid "detached"
msgstr "已断开"
-#: sys-utils/ipcs.c:281
+#: sys-utils/ipcs.c:289
msgid "changed"
msgstr "已更改"
-#: sys-utils/ipcs.c:285
+#: sys-utils/ipcs.c:293
#, c-format
msgid "------ Shared Memory Creator/Last-op PIDs --------\n"
msgstr "-------- 共享内存 创建者/上次修改者 PID ----------\n"
-#: sys-utils/ipcs.c:287
+#: sys-utils/ipcs.c:295
msgid "cpid"
msgstr "cpid"
-#: sys-utils/ipcs.c:287
+#: sys-utils/ipcs.c:295
msgid "lpid"
msgstr "lpid"
-#: sys-utils/ipcs.c:291
+#: sys-utils/ipcs.c:299
#, c-format
msgid "------ Shared Memory Segments --------\n"
msgstr "------------ 共享内存段 --------------\n"
-#: sys-utils/ipcs.c:293 sys-utils/ipcs.c:413 sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:301 sys-utils/ipcs.c:421 sys-utils/ipcs.c:526
msgid "key"
msgstr "键"
-#: sys-utils/ipcs.c:294 sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:302 sys-utils/ipcs.c:527
msgid "size"
msgstr "大小"
-#: sys-utils/ipcs.c:294 sys-utils/prlimit.c:75 sys-utils/prlimit.c:76
+#: sys-utils/ipcs.c:302 sys-utils/prlimit.c:75 sys-utils/prlimit.c:76
#: sys-utils/prlimit.c:78 sys-utils/prlimit.c:79 sys-utils/prlimit.c:81
#: sys-utils/prlimit.c:82 sys-utils/prlimit.c:86 sys-utils/prlimit.c:90
msgid "bytes"
msgstr "字节"
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:303
msgid "nattch"
msgstr "连接数"
-#: sys-utils/ipcs.c:295
+#: sys-utils/ipcs.c:303
msgid "status"
msgstr "状态"
-#: sys-utils/ipcs.c:319 sys-utils/ipcs.c:321 sys-utils/ipcs.c:323
-#: sys-utils/ipcs.c:436 sys-utils/ipcs.c:438 sys-utils/ipcs.c:543
-#: sys-utils/ipcs.c:545 sys-utils/ipcs.c:547 sys-utils/ipcs.c:600
-#: sys-utils/ipcs.c:602 sys-utils/ipcs.c:631 sys-utils/ipcs.c:633
-#: sys-utils/ipcs.c:635 sys-utils/ipcs.c:659
+#: sys-utils/ipcs.c:327 sys-utils/ipcs.c:329 sys-utils/ipcs.c:331
+#: sys-utils/ipcs.c:444 sys-utils/ipcs.c:446 sys-utils/ipcs.c:551
+#: sys-utils/ipcs.c:553 sys-utils/ipcs.c:555 sys-utils/ipcs.c:608
+#: sys-utils/ipcs.c:610 sys-utils/ipcs.c:639 sys-utils/ipcs.c:641
+#: sys-utils/ipcs.c:643 sys-utils/ipcs.c:667
msgid "Not set"
msgstr "未设置"
-#: sys-utils/ipcs.c:349 sys-utils/lsipc.c:997 sys-utils/lsipc.c:1003
+#: sys-utils/ipcs.c:357 sys-utils/lsipc.c:1007 sys-utils/lsipc.c:1013
msgid "dest"
msgstr "目标"
-#: sys-utils/ipcs.c:350 sys-utils/lsipc.c:998 sys-utils/lsipc.c:1011
+#: sys-utils/ipcs.c:358 sys-utils/lsipc.c:1008 sys-utils/lsipc.c:1021
msgid "locked"
msgstr "已锁定"
-#: sys-utils/ipcs.c:369
+#: sys-utils/ipcs.c:377
#, c-format
msgid "unable to fetch semaphore limits\n"
msgstr "无法获取信号量限制\n"
-#: sys-utils/ipcs.c:372
+#: sys-utils/ipcs.c:380
#, c-format
msgid "------ Semaphore Limits --------\n"
msgstr "--------- 信号量限制 -----------\n"
-#: sys-utils/ipcs.c:373
+#: sys-utils/ipcs.c:381
#, c-format
msgid "max number of arrays = %d\n"
msgstr "最大数组数量 = %d\n"
-#: sys-utils/ipcs.c:374
+#: sys-utils/ipcs.c:382
#, c-format
msgid "max semaphores per array = %d\n"
msgstr "每个数组的最大信号量数目 = %d\n"
-#: sys-utils/ipcs.c:375
+#: sys-utils/ipcs.c:383
#, c-format
msgid "max semaphores system wide = %d\n"
msgstr "系统最大信号量数 = %d\n"
-#: sys-utils/ipcs.c:376
+#: sys-utils/ipcs.c:384
#, c-format
msgid "max ops per semop call = %d\n"
msgstr "每次信号量调用最大操作数 = %d\n"
-#: sys-utils/ipcs.c:377
+#: sys-utils/ipcs.c:385
#, c-format
msgid "semaphore max value = %u\n"
msgstr "信号量最大值=%u\n"
-#: sys-utils/ipcs.c:386
+#: sys-utils/ipcs.c:394
#, c-format
msgid "kernel not configured for semaphores\n"
msgstr "内核未做信号量的相关配置\n"
-#: sys-utils/ipcs.c:389
+#: sys-utils/ipcs.c:397
#, c-format
msgid "------ Semaphore Status --------\n"
msgstr "--------- 信号量状态 -----------\n"
-#: sys-utils/ipcs.c:390
+#: sys-utils/ipcs.c:398
#, c-format
msgid "used arrays = %d\n"
msgstr "已使用数组 = %d\n"
-#: sys-utils/ipcs.c:391
+#: sys-utils/ipcs.c:399
#, c-format
msgid "allocated semaphores = %d\n"
msgstr "已分配信号量数 = %d\n"
-#: sys-utils/ipcs.c:396
+#: sys-utils/ipcs.c:404
#, c-format
msgid "------ Semaphore Arrays Creators/Owners --------\n"
msgstr "----------- 信号量数组创建者/拥有者 ------------\n"
-#: sys-utils/ipcs.c:398 sys-utils/ipcs.c:404 sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:406 sys-utils/ipcs.c:412 sys-utils/ipcs.c:421
msgid "semid"
msgstr "semid"
-#: sys-utils/ipcs.c:402
+#: sys-utils/ipcs.c:410
#, c-format
msgid "------ Semaphore Operation/Change Times --------\n"
msgstr "------------ 信号量 操作/更改 时间 -------------\n"
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:412
msgid "last-op"
msgstr "上一操作"
-#: sys-utils/ipcs.c:404
+#: sys-utils/ipcs.c:412
msgid "last-changed"
msgstr "上次更改"
-#: sys-utils/ipcs.c:411
+#: sys-utils/ipcs.c:419
#, c-format
msgid "------ Semaphore Arrays --------\n"
msgstr "--------- 信号量数组 -----------\n"
-#: sys-utils/ipcs.c:413
+#: sys-utils/ipcs.c:421
msgid "nsems"
msgstr "nsems"
-#: sys-utils/ipcs.c:470
+#: sys-utils/ipcs.c:478
#, c-format
msgid "unable to fetch message limits\n"
msgstr "无法获取消息限制\n"
-#: sys-utils/ipcs.c:473
+#: sys-utils/ipcs.c:481
#, c-format
msgid "------ Messages Limits --------\n"
msgstr "---------- 消息限制 -----------\n"
-#: sys-utils/ipcs.c:474
+#: sys-utils/ipcs.c:482
#, c-format
msgid "max queues system wide = %d\n"
msgstr "系统最大队列数量 = %d\n"
-#: sys-utils/ipcs.c:476
+#: sys-utils/ipcs.c:484
msgid "max size of message"
msgstr "最大消息尺寸"
-#: sys-utils/ipcs.c:478
+#: sys-utils/ipcs.c:486
msgid "default max size of queue"
msgstr "默认的队列最大尺寸"
-#: sys-utils/ipcs.c:485
+#: sys-utils/ipcs.c:493
#, c-format
msgid "kernel not configured for message queues\n"
msgstr "内核未做消息的相关配置\n"
-#: sys-utils/ipcs.c:488
+#: sys-utils/ipcs.c:496
#, c-format
msgid "------ Messages Status --------\n"
msgstr "---------- 消息状态 -----------\n"
-#: sys-utils/ipcs.c:490
+#: sys-utils/ipcs.c:498
#, c-format
msgid "allocated queues = %d\n"
msgstr "已分配队列数 = %d\n"
-#: sys-utils/ipcs.c:491
+#: sys-utils/ipcs.c:499
#, c-format
msgid "used headers = %d\n"
msgstr "已用消息头(header)数 = %d\n"
-#: sys-utils/ipcs.c:493
+#: sys-utils/ipcs.c:501
msgid "used space"
msgstr "已用空间"
-#: sys-utils/ipcs.c:494
+#: sys-utils/ipcs.c:502
msgid " bytes\n"
msgstr " 字节\n"
-#: sys-utils/ipcs.c:498
+#: sys-utils/ipcs.c:506
#, c-format
msgid "------ Message Queues Creators/Owners --------\n"
msgstr "---------- 消息队列 创建者/拥有者 ------------\n"
-#: sys-utils/ipcs.c:500 sys-utils/ipcs.c:506 sys-utils/ipcs.c:512
-#: sys-utils/ipcs.c:518
+#: sys-utils/ipcs.c:508 sys-utils/ipcs.c:514 sys-utils/ipcs.c:520
+#: sys-utils/ipcs.c:526
msgid "msqid"
msgstr "msqid"
-#: sys-utils/ipcs.c:504
+#: sys-utils/ipcs.c:512
#, c-format
msgid "------ Message Queues Send/Recv/Change Times --------\n"
msgstr "----------- 消息队列 发送/接收/更改 时间 ------------\n"
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:514
msgid "send"
msgstr "发送"
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:514
msgid "recv"
msgstr "接收"
-#: sys-utils/ipcs.c:506
+#: sys-utils/ipcs.c:514
msgid "change"
msgstr "更改"
-#: sys-utils/ipcs.c:510
+#: sys-utils/ipcs.c:518
#, c-format
msgid "------ Message Queues PIDs --------\n"
msgstr "--------- 消息队列 PID -----------\n"
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:520
msgid "lspid"
msgstr "lspid"
-#: sys-utils/ipcs.c:512
+#: sys-utils/ipcs.c:520
msgid "lrpid"
msgstr "lrpid"
-#: sys-utils/ipcs.c:516
+#: sys-utils/ipcs.c:524
#, c-format
msgid "------ Message Queues --------\n"
msgstr "--------- 消息队列 -----------\n"
-#: sys-utils/ipcs.c:519
+#: sys-utils/ipcs.c:527
msgid "used-bytes"
msgstr "已用字节数"
-#: sys-utils/ipcs.c:520
+#: sys-utils/ipcs.c:528
msgid "messages"
msgstr "消息"
-#: sys-utils/ipcs.c:584 sys-utils/ipcs.c:614 sys-utils/ipcs.c:647
-#: sys-utils/lsipc.c:547 sys-utils/lsipc.c:739 sys-utils/lsipc.c:899
+#: sys-utils/ipcs.c:592 sys-utils/ipcs.c:622 sys-utils/ipcs.c:655
+#: sys-utils/lsipc.c:554 sys-utils/lsipc.c:746 sys-utils/lsipc.c:909
#, c-format
msgid "id %d not found"
msgstr "找不到 id %d"
-#: sys-utils/ipcs.c:588
+#: sys-utils/ipcs.c:596
#, c-format
msgid ""
"\n"
"\n"
"共享内存段 shmid=%d\n"
-#: sys-utils/ipcs.c:589
+#: sys-utils/ipcs.c:597
#, 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:592
+#: sys-utils/ipcs.c:600
#, c-format
msgid "mode=%#o\taccess_perms=%#o\n"
msgstr "模式=%#o\t访问权限=%#o\n"
-#: sys-utils/ipcs.c:594
+#: sys-utils/ipcs.c:602
msgid "size="
msgstr "大小="
-#: sys-utils/ipcs.c:594
+#: sys-utils/ipcs.c:602
msgid "bytes="
msgstr "字节数="
-#: sys-utils/ipcs.c:596
+#: sys-utils/ipcs.c:604
#, c-format
msgid "lpid=%u\tcpid=%u\tnattch=%jd\n"
msgstr "lpid=%u\tcpid=%u\tnattch=%jd\n"
-#: sys-utils/ipcs.c:599
+#: sys-utils/ipcs.c:607
#, c-format
msgid "att_time=%-26.24s\n"
msgstr "附加时间=%-26.24s\n"
-#: sys-utils/ipcs.c:601
+#: sys-utils/ipcs.c:609
#, c-format
msgid "det_time=%-26.24s\n"
msgstr "脱离时间=%-26.24s\n"
-#: sys-utils/ipcs.c:603 sys-utils/ipcs.c:634
+#: sys-utils/ipcs.c:611 sys-utils/ipcs.c:642
#, c-format
msgid "change_time=%-26.24s\n"
msgstr "更改时间=%-26.24s\n"
-#: sys-utils/ipcs.c:618
+#: sys-utils/ipcs.c:626
#, c-format
msgid ""
"\n"
"\n"
"消息队列 msqid=%d\n"
-#: sys-utils/ipcs.c:619
+#: sys-utils/ipcs.c:627
#, 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:623
+#: sys-utils/ipcs.c:631
msgid "csize="
msgstr "csize="
-#: sys-utils/ipcs.c:623
+#: sys-utils/ipcs.c:631
msgid "cbytes="
msgstr "cbytes="
-#: sys-utils/ipcs.c:625
+#: sys-utils/ipcs.c:633
msgid "qsize="
msgstr "qsize="
-#: sys-utils/ipcs.c:625
+#: sys-utils/ipcs.c:633
msgid "qbytes="
msgstr "qbytes="
-#: sys-utils/ipcs.c:630
+#: sys-utils/ipcs.c:638
#, c-format
msgid "send_time=%-26.24s\n"
msgstr "发送时间=%-26.24s\n"
-#: sys-utils/ipcs.c:632
+#: sys-utils/ipcs.c:640
#, c-format
msgid "rcv_time=%-26.24s\n"
msgstr "接收时间=%-26.24s\n"
-#: sys-utils/ipcs.c:651
+#: sys-utils/ipcs.c:659
#, c-format
msgid ""
"\n"
"\n"
"信号量数组 semid=%d\n"
-#: sys-utils/ipcs.c:652
+#: sys-utils/ipcs.c:660
#, 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:655
+#: sys-utils/ipcs.c:663
#, c-format
msgid "mode=%#o, access_perms=%#o\n"
msgstr "模式=%#o，访问权限=%#o\n"
-#: sys-utils/ipcs.c:657
+#: sys-utils/ipcs.c:665
#, c-format
msgid "nsems = %ju\n"
msgstr "nsems = %ju\n"
-#: sys-utils/ipcs.c:658
+#: sys-utils/ipcs.c:666
#, c-format
msgid "otime = %-26.24s\n"
msgstr "otime = %-26.24s\n"
-#: sys-utils/ipcs.c:660
+#: sys-utils/ipcs.c:668
#, c-format
msgid "ctime = %-26.24s\n"
msgstr "ctime = %-26.24s\n"
-#: sys-utils/ipcs.c:663
+#: sys-utils/ipcs.c:671
msgid "semnum"
msgstr "semnum"
-#: sys-utils/ipcs.c:663
+#: sys-utils/ipcs.c:671
msgid "value"
msgstr "值"
-#: sys-utils/ipcs.c:663
+#: sys-utils/ipcs.c:671
msgid "ncount"
msgstr "ncount"
-#: sys-utils/ipcs.c:663
+#: sys-utils/ipcs.c:671
msgid "zcount"
msgstr "zcount"
-#: sys-utils/ipcs.c:663
+#: sys-utils/ipcs.c:671
msgid "pid"
msgstr "pid"
msgid "%s (kbytes) = "
msgstr "%s (千字节) = "
-#: sys-utils/irq-common.c:53 sys-utils/irq-common.c:114
+#: sys-utils/irq-common.c:53
msgid "interrupts"
msgstr "中断"
msgid "name"
msgstr "名称"
-#: sys-utils/irq-common.c:106 sys-utils/lsmem.c:689 sys-utils/lsns.c:782
+#: sys-utils/irq-common.c:138 sys-utils/irq-common.c:443 sys-utils/lsmem.c:689
+#: sys-utils/lsns.c:847
msgid "failed to initialize output table"
msgstr "初始化输出表失败"
-#: sys-utils/irq-common.c:145 sys-utils/lsns.c:720
+#: sys-utils/irq-common.c:172 sys-utils/lsns.c:779
msgid "failed to add line to output"
msgstr "向输出添加行出错"
-#: sys-utils/irq-common.c:348
+#: sys-utils/irq-common.c:401
#, fuzzy
msgid "unsupported column name to sort output"
msgstr "不支持的颜色模式"
-#: sys-utils/irqtop.c:114
+#: sys-utils/irq-common.c:451
+#, fuzzy
+msgid "cpu-interrupts"
+msgstr "中断"
+
+#: sys-utils/irq-common.c:483
+#, no-c-format
+msgid "%delta:"
+msgstr ""
+
+#: sys-utils/irqtop.c:123
#, c-format
msgid ""
"irqtop | total: %ld delta: %ld | %s | %s\n"
"\n"
msgstr ""
-#: sys-utils/irqtop.c:142
+#: sys-utils/irqtop.c:169
msgid "cannot not create timerfd"
msgstr "无法创建 timerfd"
-#: sys-utils/irqtop.c:144
+#: sys-utils/irqtop.c:171
msgid "cannot set timerfd"
msgstr "无法设置 timerfd"
-#: sys-utils/irqtop.c:149 sys-utils/irqtop.c:167 sys-utils/irqtop.c:172
+#: sys-utils/irqtop.c:176 sys-utils/irqtop.c:194 sys-utils/irqtop.c:199
msgid "epoll_ctl failed"
msgstr "epoll_ctl 失败"
-#: sys-utils/irqtop.c:152
+#: sys-utils/irqtop.c:179
msgid "sigfillset failed"
msgstr "sigfillset 失败"
-#: sys-utils/irqtop.c:154
+#: sys-utils/irqtop.c:181
msgid "sigprocmask failed"
msgstr "sigprocmask 失败"
-#: sys-utils/irqtop.c:162
+#: sys-utils/irqtop.c:189
msgid "cannot not create signalfd"
msgstr "无法创建 signalfd"
-#: sys-utils/irqtop.c:220
+#: sys-utils/irqtop.c:247
msgid "Interactive utility to display kernel interrupt information."
msgstr ""
-#: sys-utils/irqtop.c:223
+#: sys-utils/irqtop.c:250
msgid " -d, --delay <secs> delay updates\n"
msgstr ""
-#: sys-utils/irqtop.c:225 sys-utils/lsirq.c:67
+#: sys-utils/irqtop.c:252 sys-utils/lsirq.c:67
#, fuzzy
msgid " -s, --sort <column> specify sort column\n"
msgstr " -x, --sort <列> 按<列>对输出排序\n"
-#: sys-utils/irqtop.c:229
+#: sys-utils/irqtop.c:253 sys-utils/lsirq.c:68
+#, fuzzy
+msgid " -S, --softirq show softirqs instead of interrupts\n"
+msgstr " -y, --physical 打印物理 ID 而非逻辑 ID\n"
+
+#: sys-utils/irqtop.c:257
msgid ""
"\n"
"The following interactive key commands are valid:\n"
msgstr ""
-#: sys-utils/irqtop.c:230
+#: sys-utils/irqtop.c:258
msgid " i sort by IRQ\n"
msgstr ""
-#: sys-utils/irqtop.c:231
+#: sys-utils/irqtop.c:259
msgid " t sort by TOTAL\n"
msgstr ""
-#: sys-utils/irqtop.c:232
+#: sys-utils/irqtop.c:260
msgid " d sort by DELTA\n"
msgstr ""
-#: sys-utils/irqtop.c:233
+#: sys-utils/irqtop.c:261
msgid " n sort by NAME\n"
msgstr ""
-#: sys-utils/irqtop.c:234
+#: sys-utils/irqtop.c:262
msgid " q Q quit program\n"
msgstr ""
-#: sys-utils/irqtop.c:266
+#: sys-utils/irqtop.c:295
#, fuzzy
msgid "failed to parse delay argument"
msgstr "解析参数失败"
-#: sys-utils/irqtop.c:320
+#: sys-utils/irqtop.c:352
msgid "terminal setting retrieval"
msgstr ""
msgid "%s: failed to check for conflicting loop devices"
msgstr "%s︰ 检查冲突的循环设备失败"
-#: sys-utils/losetup.c:555 sys-utils/losetup.c:875
+#: sys-utils/losetup.c:555 sys-utils/losetup.c:879
msgid "cannot find an unused loop device"
msgstr "找不到未使用的回环设备"
msgid "%s: failed to use backing file"
msgstr "%s：使用后备文件失败"
-#: sys-utils/losetup.c:661
+#: sys-utils/losetup.c:665
msgid "failed to parse logical block size"
msgstr "解析逻辑块大小失败"
-#: sys-utils/losetup.c:667 sys-utils/losetup.c:677 sys-utils/losetup.c:801
-#: sys-utils/losetup.c:815 sys-utils/losetup.c:855
+#: sys-utils/losetup.c:671 sys-utils/losetup.c:681 sys-utils/losetup.c:805
+#: sys-utils/losetup.c:819 sys-utils/losetup.c:859
#, c-format
msgid "%s: failed to use device"
msgstr "%s：使用设备失败"
-#: sys-utils/losetup.c:812
+#: sys-utils/losetup.c:816
msgid "no loop device specified"
msgstr "未指定回环设备"
-#: sys-utils/losetup.c:827
+#: sys-utils/losetup.c:831
#, c-format
msgid "the options %s are allowed during loop device setup only"
msgstr "选项 %s 只允许在设置回环设备时使用"
-#: sys-utils/losetup.c:832
+#: sys-utils/losetup.c:836
msgid "the option --offset is not allowed in this context"
msgstr "此环境下不允许使用 --offset 选项"
-#: sys-utils/losetup.c:896
+#: sys-utils/losetup.c:900
#, c-format
msgid "%s: set capacity failed"
msgstr "%s：设置容量失败"
-#: sys-utils/losetup.c:903
+#: sys-utils/losetup.c:907
#, c-format
msgid "%s: set direct io failed"
msgstr "%s︰ 设置直接 io 失败"
-#: sys-utils/losetup.c:909
+#: sys-utils/losetup.c:913
#, c-format
msgid "%s: set logical block size failed"
msgstr "%s：设置逻辑块大小失败"
-#: sys-utils/lscpu.c:82
+#: sys-utils/lscpu.c:46
msgid "none"
msgstr "无"
-#: sys-utils/lscpu.c:83
+#: sys-utils/lscpu.c:47
msgid "para"
msgstr "半"
-#: sys-utils/lscpu.c:84
+#: sys-utils/lscpu.c:48
msgid "full"
msgstr "完全"
-#: sys-utils/lscpu.c:85
+#: sys-utils/lscpu.c:49
msgid "container"
msgstr "容器"
-#: sys-utils/lscpu.c:128
+#: sys-utils/lscpu.c:73
msgid "horizontal"
msgstr "水平"
-#: sys-utils/lscpu.c:129
+#: sys-utils/lscpu.c:74
msgid "vertical"
msgstr "竖直"
-#: sys-utils/lscpu.c:197
+#: sys-utils/lscpu.c:139
+msgid "crude measurement of CPU speed"
+msgstr ""
+
+#: sys-utils/lscpu.c:140
msgid "logical CPU number"
msgstr "逻辑 CPU 数量"
-#: sys-utils/lscpu.c:198
+#: sys-utils/lscpu.c:141
msgid "logical core number"
msgstr "逻辑核心数量"
-#: sys-utils/lscpu.c:199
+#: sys-utils/lscpu.c:142
+#, fuzzy
+msgid "logical cluster number"
+msgstr "逻辑核心数量"
+
+#: sys-utils/lscpu.c:143
msgid "logical socket number"
msgstr "逻辑(CPU)座数量"
-#: sys-utils/lscpu.c:200
+#: sys-utils/lscpu.c:144
msgid "logical NUMA node number"
msgstr "逻辑 NUMA 节点数量"
-#: sys-utils/lscpu.c:201
+#: sys-utils/lscpu.c:145
msgid "logical book number"
msgstr "逻辑 book 数"
-#: sys-utils/lscpu.c:202
+#: sys-utils/lscpu.c:146
msgid "logical drawer number"
msgstr "逻辑抽屉号"
-#: sys-utils/lscpu.c:203
+#: sys-utils/lscpu.c:147
msgid "shows how caches are shared between CPUs"
msgstr "显示 CPU 间是如何共享缓存的"
-#: sys-utils/lscpu.c:204
+#: sys-utils/lscpu.c:148
msgid "CPU dispatching mode on virtual hardware"
msgstr "虚拟硬件上的 CPU 调度模式"
-#: sys-utils/lscpu.c:205
+#: sys-utils/lscpu.c:149
msgid "physical address of a CPU"
msgstr "CPU 的物理地址"
-#: sys-utils/lscpu.c:206
+#: sys-utils/lscpu.c:150
msgid "shows if the hypervisor has allocated the CPU"
msgstr "显示超级监督(hypervisor)是否分配了 CPU"
-#: sys-utils/lscpu.c:207
+#: sys-utils/lscpu.c:151
msgid "shows if Linux currently makes use of the CPU"
msgstr "显示 Linux 当前是否在使用该 CPU"
-#: sys-utils/lscpu.c:208
+#: sys-utils/lscpu.c:152
+#, fuzzy
+msgid "shows the currently MHz of the CPU"
+msgstr "显示 CPU 的最大 MHz"
+
+#: sys-utils/lscpu.c:153
msgid "shows the maximum MHz of the CPU"
msgstr "显示 CPU 的最大 MHz"
-#: sys-utils/lscpu.c:209
+#: sys-utils/lscpu.c:154
msgid "shows the minimum MHz of the CPU"
msgstr "显示 CPU 的最小 MHz"
-#: sys-utils/lscpu.c:214
+#: sys-utils/lscpu.c:159
#, fuzzy
msgid "size of all system caches"
msgstr "设置 文件系统 readahead"
-#: sys-utils/lscpu.c:215
+#: sys-utils/lscpu.c:160
msgid "cache level"
msgstr "缓存等级"
-#: sys-utils/lscpu.c:216
+#: sys-utils/lscpu.c:161
msgid "cache name"
msgstr "缓存名称"
-#: sys-utils/lscpu.c:217
+#: sys-utils/lscpu.c:162
#, fuzzy
msgid "size of one cache"
msgstr "磁盘容量"
-#: sys-utils/lscpu.c:218
+#: sys-utils/lscpu.c:163
msgid "cache type"
msgstr "缓存类型"
-#: sys-utils/lscpu.c:219
+#: sys-utils/lscpu.c:164
msgid "ways of associativity"
msgstr ""
-#: sys-utils/lscpu.c:220
+#: sys-utils/lscpu.c:165
msgid "allocation policy"
msgstr ""
-#: sys-utils/lscpu.c:221
+#: sys-utils/lscpu.c:166
msgid "write policy"
msgstr "写策略"
-#: sys-utils/lscpu.c:222
+#: sys-utils/lscpu.c:167
#, fuzzy
msgid "number of physical cache line per cache t"
msgstr "物理柱面数"
-#: sys-utils/lscpu.c:223
+#: sys-utils/lscpu.c:168
msgid "number of sets in the cache; set lines has the same cache index"
msgstr ""
-#: sys-utils/lscpu.c:224
+#: sys-utils/lscpu.c:169
msgid "minimum amount of data in bytes transferred from memory to cache"
msgstr ""
-#: sys-utils/lscpu.c:532
-msgid "error: uname failed"
-msgstr "错误：uname 失败"
-
-#: sys-utils/lscpu.c:626
-#, c-format
-msgid "failed to determine number of CPUs: %s"
-msgstr "确定 CPU 数 失败：%s"
-
-#: sys-utils/lscpu.c:894
-#, fuzzy
-msgid "cannot restore signal handler"
-msgstr "无法设置信号处理函数"
+#: sys-utils/lscpu.c:220
+msgid "failed to initialize CPUs sysfs handler"
+msgstr "%s：初始化 CPU sysfs 处理函数失败"
-#: sys-utils/lscpu.c:1468
-msgid "Failed to extract the node number"
-msgstr "提取节点号失败"
+#: sys-utils/lscpu.c:227
+msgid "failed to initialize procfs handler"
+msgstr "%s：初始化 procfs 处理函数失败"
-#: sys-utils/lscpu.c:1599 sys-utils/lscpu.c:1609
+#: sys-utils/lscpu.c:409 sys-utils/lscpu.c:419
msgid "Y"
msgstr "Y"
-#: sys-utils/lscpu.c:1599 sys-utils/lscpu.c:1609
+#: sys-utils/lscpu.c:409 sys-utils/lscpu.c:419
msgid "N"
msgstr "N"
-#: sys-utils/lscpu.c:1817
-#, c-format
+#: sys-utils/lscpu.c:645
+#, fuzzy, c-format
msgid ""
"# The following is the parsable format, which can be fed to other\n"
"# programs. Each different item in every column has an unique ID\n"
-"# starting from zero.\n"
+"# starting usually from zero.\n"
msgstr ""
"# 以下是可解析格式，可以输给其他程序。每列中的各个不同项有一个惟一\n"
"# 的从 0 开始的 ID。\n"
-#: sys-utils/lscpu.c:2046
-msgid "Architecture:"
-msgstr "架构："
-
-#: sys-utils/lscpu.c:2059
-msgid "CPU op-mode(s):"
-msgstr "CPU 运行模式："
-
-#: sys-utils/lscpu.c:2062 sys-utils/lscpu.c:2064
-msgid "Byte Order:"
-msgstr "字节序："
-
-#: sys-utils/lscpu.c:2068
-msgid "Address sizes:"
-msgstr ""
-
-#: sys-utils/lscpu.c:2070
-msgid "CPU(s):"
-msgstr "CPU:"
-
-#: sys-utils/lscpu.c:2073
-msgid "On-line CPU(s) mask:"
-msgstr "在线 CPU 掩码："
+#: sys-utils/lscpu.c:843
+msgid "Model name:"
+msgstr "型号名称："
-#: sys-utils/lscpu.c:2074
-msgid "On-line CPU(s) list:"
-msgstr "在线 CPU 列表："
+#: sys-utils/lscpu.c:845
+#, fuzzy
+msgid "BIOS Model name:"
+msgstr "型号名称："
-#: sys-utils/lscpu.c:2086
-msgid "failed to callocate cpu set"
-msgstr "分配(callocate) CPU 组 失败"
+#: sys-utils/lscpu.c:847
+msgid "Machine type:"
+msgstr "机器类型︰"
-#: sys-utils/lscpu.c:2093
-msgid "Off-line CPU(s) mask:"
-msgstr "离线 CPU 掩码："
+#: sys-utils/lscpu.c:849
+msgid "CPU family:"
+msgstr "CPU 系列："
-#: sys-utils/lscpu.c:2094
-msgid "Off-line CPU(s) list:"
-msgstr "离线 CPU 列表："
+#: sys-utils/lscpu.c:851
+msgid "Model:"
+msgstr "型号："
-#: sys-utils/lscpu.c:2129
+#: sys-utils/lscpu.c:853
msgid "Thread(s) per core:"
msgstr "每个核的线程数："
-#: sys-utils/lscpu.c:2131
+#: sys-utils/lscpu.c:855
+#, fuzzy
+msgid "Core(s) per cluster:"
+msgstr "每个座的核数："
+
+#: sys-utils/lscpu.c:857
msgid "Core(s) per socket:"
msgstr "每个座的核数："
-#: sys-utils/lscpu.c:2134
+#: sys-utils/lscpu.c:860
msgid "Socket(s) per book:"
msgstr "每个 book 的座数："
-#: sys-utils/lscpu.c:2137
+#: sys-utils/lscpu.c:862
msgid "Book(s) per drawer:"
msgstr "每个抽屉里的 Book 数︰"
-#: sys-utils/lscpu.c:2139
+#: sys-utils/lscpu.c:863
msgid "Drawer(s):"
msgstr "抽屉："
-#: sys-utils/lscpu.c:2141
+#: sys-utils/lscpu.c:865
msgid "Book(s):"
msgstr "Book："
-#: sys-utils/lscpu.c:2144
+#: sys-utils/lscpu.c:869 sys-utils/lscpu.c:871 sys-utils/lscpu.c:876
msgid "Socket(s):"
msgstr "座："
-#: sys-utils/lscpu.c:2148
-msgid "NUMA node(s):"
-msgstr "NUMA 节点："
-
-#: sys-utils/lscpu.c:2150
-msgid "Vendor ID:"
-msgstr "厂商 ID："
-
-#: sys-utils/lscpu.c:2152
-msgid "Machine type:"
-msgstr "机器类型︰"
-
-#: sys-utils/lscpu.c:2154
-msgid "CPU family:"
-msgstr "CPU 系列："
-
-#: sys-utils/lscpu.c:2156
-msgid "Model:"
-msgstr "型号："
-
-#: sys-utils/lscpu.c:2158
-msgid "Model name:"
-msgstr "型号名称："
+#: sys-utils/lscpu.c:873
+msgid "Cluster(s):"
+msgstr ""
-#: sys-utils/lscpu.c:2160
+#: sys-utils/lscpu.c:881
msgid "Stepping:"
msgstr "步进："
-#: sys-utils/lscpu.c:2162
+#: sys-utils/lscpu.c:883
#, fuzzy
msgid "Frequency boost:"
msgstr "FreeBSD 启动"
-#: sys-utils/lscpu.c:2163
+#: sys-utils/lscpu.c:884
#, fuzzy
msgid "enabled"
msgstr "不可用"
-#: sys-utils/lscpu.c:2163
+#: sys-utils/lscpu.c:884
#, fuzzy
msgid "disabled"
msgstr "CPU %u 已禁用\n"
-#: sys-utils/lscpu.c:2165
-msgid "CPU MHz:"
-msgstr "CPU MHz："
-
-#: sys-utils/lscpu.c:2167
+#: sys-utils/lscpu.c:888
msgid "CPU dynamic MHz:"
msgstr "CPU 动态 MHz:"
-#: sys-utils/lscpu.c:2169
+#: sys-utils/lscpu.c:890
msgid "CPU static MHz:"
msgstr "CPU 静态 MHz:"
-#: sys-utils/lscpu.c:2171
+#: sys-utils/lscpu.c:893
msgid "CPU max MHz:"
msgstr "CPU 最大 MHz："
-#: sys-utils/lscpu.c:2173
+#: sys-utils/lscpu.c:894
msgid "CPU min MHz:"
msgstr "CPU 最小 MHz："
-#: sys-utils/lscpu.c:2175
+#: sys-utils/lscpu.c:897
msgid "BogoMIPS:"
msgstr "BogoMIPS："
-#: sys-utils/lscpu.c:2178 sys-utils/lscpu.c:2180
+#: sys-utils/lscpu.c:900
+msgid "Dispatching mode:"
+msgstr "分派模式："
+
+#: sys-utils/lscpu.c:903
+msgid "Physical sockets:"
+msgstr "物理套接字︰"
+
+#: sys-utils/lscpu.c:904
+msgid "Physical chips:"
+msgstr "物理芯片︰"
+
+#: sys-utils/lscpu.c:905
+msgid "Physical cores/chip:"
+msgstr "物理核心/芯片︰"
+
+#: sys-utils/lscpu.c:909
+msgid "Flags:"
+msgstr "标记："
+
+#: sys-utils/lscpu.c:954
+msgid "Architecture:"
+msgstr "架构："
+
+#: sys-utils/lscpu.c:967
+msgid "CPU op-mode(s):"
+msgstr "CPU 运行模式："
+
+#: sys-utils/lscpu.c:970
+msgid "Address sizes:"
+msgstr ""
+
+#: sys-utils/lscpu.c:972 sys-utils/lscpu.c:974
+msgid "Byte Order:"
+msgstr "字节序："
+
+#: sys-utils/lscpu.c:978
+msgid "CPU(s):"
+msgstr "CPU:"
+
+#: sys-utils/lscpu.c:982
+msgid "On-line CPU(s) mask:"
+msgstr "在线 CPU 掩码："
+
+#: sys-utils/lscpu.c:983
+msgid "On-line CPU(s) list:"
+msgstr "在线 CPU 列表："
+
+#: sys-utils/lscpu.c:995
+msgid "failed to callocate cpu set"
+msgstr "分配(callocate) CPU 组 失败"
+
+#: sys-utils/lscpu.c:1004
+msgid "Off-line CPU(s) mask:"
+msgstr "离线 CPU 掩码："
+
+#: sys-utils/lscpu.c:1005
+msgid "Off-line CPU(s) list:"
+msgstr "离线 CPU 列表："
+
+#: sys-utils/lscpu.c:1012
+msgid "Vendor ID:"
+msgstr "厂商 ID："
+
+#: sys-utils/lscpu.c:1014
+#, fuzzy
+msgid "BIOS Vendor ID:"
+msgstr "厂商 ID："
+
+#: sys-utils/lscpu.c:1022
+#, fuzzy
+msgid "Virtualization features:"
+msgstr "虚拟化类型："
+
+#: sys-utils/lscpu.c:1024 sys-utils/lscpu.c:1026
msgid "Virtualization:"
msgstr "虚拟化："
-#: sys-utils/lscpu.c:2183
+#: sys-utils/lscpu.c:1029
msgid "Hypervisor:"
msgstr "超管理器："
-#: sys-utils/lscpu.c:2185
+#: sys-utils/lscpu.c:1031
msgid "Hypervisor vendor:"
msgstr "超管理器厂商："
-#: sys-utils/lscpu.c:2186
+#: sys-utils/lscpu.c:1032
msgid "Virtualization type:"
msgstr "虚拟化类型："
-#: sys-utils/lscpu.c:2189
-msgid "Dispatching mode:"
-msgstr "分派模式："
+#: sys-utils/lscpu.c:1055
+msgid "Caches (sum of all):"
+msgstr ""
-#: sys-utils/lscpu.c:2206 sys-utils/lscpu.c:2224
+#: sys-utils/lscpu.c:1059 sys-utils/lscpu.c:1089 sys-utils/lscpu.c:1121
+#, fuzzy, c-format
+msgid "%s:"
+msgstr "%s"
+
+#: sys-utils/lscpu.c:1059 sys-utils/lscpu.c:1089
#, c-format
msgid "%s cache:"
msgstr "%s 缓存："
-#: sys-utils/lscpu.c:2231
+#: sys-utils/lscpu.c:1062
#, c-format
-msgid "NUMA node%d CPU(s):"
-msgstr "NUMA 节点%d CPU："
+msgid "%<PRIu64> (%d instance)"
+msgid_plural "%<PRIu64> (%d instances)"
+msgstr[0] ""
-#: sys-utils/lscpu.c:2236
-msgid "Physical sockets:"
-msgstr "物理套接字︰"
+#: sys-utils/lscpu.c:1071
+#, c-format
+msgid "%s (%d instance)"
+msgid_plural "%s (%d instances)"
+msgstr[0] ""
-#: sys-utils/lscpu.c:2237
-msgid "Physical chips:"
-msgstr "物理芯片︰"
+#: sys-utils/lscpu.c:1086
+#, fuzzy
+msgid "Caches:"
+msgstr "%s 缓存："
-#: sys-utils/lscpu.c:2238
-msgid "Physical cores/chip:"
-msgstr "物理核心/芯片︰"
+#: sys-utils/lscpu.c:1105
+msgid "NUMA:"
+msgstr ""
-#: sys-utils/lscpu.c:2249
-msgid "Flags:"
-msgstr "标记："
+#: sys-utils/lscpu.c:1107
+msgid "NUMA node(s):"
+msgstr "NUMA 节点："
+
+#: sys-utils/lscpu.c:1109
+#, c-format
+msgid "NUMA node%d CPU(s):"
+msgstr "NUMA 节点%d CPU："
+
+#: sys-utils/lscpu.c:1117
+#, fuzzy
+msgid "Vulnerabilities:"
+msgstr "可继承的权能："
+
+#: sys-utils/lscpu.c:1121
+#, fuzzy, c-format
+msgid "Vulnerability %s:"
+msgstr "未知权能“%s”"
-#: sys-utils/lscpu.c:2264
+#: sys-utils/lscpu.c:1139
msgid "Display information about the CPU architecture.\n"
msgstr "显示 CPU 架构信息。\n"
-#: sys-utils/lscpu.c:2267
+#: sys-utils/lscpu.c:1142
msgid " -a, --all print both online and offline CPUs (default for -e)\n"
msgstr " -a, --all 同时打印在线和离线 CPU (-e 选项默认值)\n"
-#: sys-utils/lscpu.c:2268
+#: sys-utils/lscpu.c:1143
msgid " -b, --online print online CPUs only (default for -p)\n"
msgstr " -b, --online 只打印在线 CPU (-p 选项默认值)\n"
-#: sys-utils/lscpu.c:2269
+#: sys-utils/lscpu.c:1144
#, fuzzy
msgid " -B, --bytes print sizes in bytes rather than in human readable format\n"
msgstr " -b, --bytes 以字节为单位而非易读的格式来打印大小\n"
-#: sys-utils/lscpu.c:2270
+#: sys-utils/lscpu.c:1145
#, fuzzy
msgid " -C, --caches[=<list>] info about caches in extended readable format\n"
msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n"
-#: sys-utils/lscpu.c:2271
+#: sys-utils/lscpu.c:1146
msgid " -c, --offline print offline CPUs only\n"
msgstr " -c, --offline 只打印离线 CPU\n"
-#: sys-utils/lscpu.c:2272
+#: sys-utils/lscpu.c:1147
#, fuzzy
msgid " -J, --json use JSON for default or extended format\n"
msgstr " -J, --json 使用 JSON 输出格式\n"
-#: sys-utils/lscpu.c:2273
+#: sys-utils/lscpu.c:1148
msgid " -e, --extended[=<list>] print out an extended readable format\n"
msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n"
-#: sys-utils/lscpu.c:2274
+#: sys-utils/lscpu.c:1149
msgid " -p, --parse[=<list>] print out a parsable format\n"
msgstr " -p, --parse[=<列表>] 打印可解析格式\n"
-#: sys-utils/lscpu.c:2275
+#: sys-utils/lscpu.c:1150
msgid " -s, --sysroot <dir> use specified directory as system root\n"
msgstr " -s, --sysroot <目录> 以指定目录作为系统根目录\n"
-#: sys-utils/lscpu.c:2276
+#: sys-utils/lscpu.c:1151
msgid " -x, --hex print hexadecimal masks rather than lists of CPUs\n"
msgstr " -x, --hex 打印十六进制掩码而非 CPU 列表\n"
-#: sys-utils/lscpu.c:2277
+#: sys-utils/lscpu.c:1152
msgid " -y, --physical print physical instead of logical IDs\n"
msgstr " -y, --physical 打印物理 ID 而非逻辑 ID\n"
-#: sys-utils/lscpu.c:2278
+#: sys-utils/lscpu.c:1153
#, fuzzy
msgid " --output-all print all available columns for -e, -p or -C\n"
msgstr " -O, --output-all 输出所有列\n"
-#: sys-utils/lscpu.c:2282
+#: sys-utils/lscpu.c:1157
#, fuzzy
msgid ""
"\n"
"\n"
"可用列(用于 -o)：\n"
-#: sys-utils/lscpu.c:2286
+#: sys-utils/lscpu.c:1161
#, fuzzy
msgid ""
"\n"
"\n"
"可用列(用于 -o)：\n"
-#: sys-utils/lscpu.c:2419
+#: sys-utils/lscpu.c:1287
#, c-format
msgid "%s: options --all, --online and --offline may only be used with options --extended or --parse.\n"
msgstr "%s：--all、--online 和 --offline 选项只能与 --extended 或 --parse 选项一起使用。\n"
-#: sys-utils/lscpu.c:2441
-msgid "failed to initialize CPUs sysfs handler"
-msgstr "%s：初始化 CPU sysfs 处理函数失败"
+#: sys-utils/lscpu-cputype.c:569
+msgid "error: uname failed"
+msgstr "错误：uname 失败"
-#: sys-utils/lscpu.c:2448
-msgid "failed to initialize procfs handler"
-msgstr "%s：初始化 procfs 处理函数失败"
+#: sys-utils/lscpu-cputype.c:666
+#, c-format
+msgid "failed to determine number of CPUs: %s"
+msgstr "确定 CPU 数 失败：%s"
+
+#: sys-utils/lscpu-cputype.c:869
+msgid "Failed to extract the node number"
+msgstr "提取节点号失败"
+
+#: sys-utils/lscpu-virt.c:491
+#, fuzzy
+msgid "cannot restore signal handler"
+msgstr "无法设置信号处理函数"
#: sys-utils/lsipc.c:149
msgid "Resource key"
"元素：\n"
"\n"
-#: sys-utils/lsipc.c:697 sys-utils/lsipc.c:858 sys-utils/lsipc.c:1057
+#: sys-utils/lsipc.c:704 sys-utils/lsipc.c:868 sys-utils/lsipc.c:1067
msgid "failed to set data"
msgstr "设置数据失败"
-#: sys-utils/lsipc.c:722
+#: sys-utils/lsipc.c:729
msgid "Number of semaphore identifiers"
msgstr "信号量标识符的数量"
-#: sys-utils/lsipc.c:723
+#: sys-utils/lsipc.c:730
msgid "Total number of semaphores"
msgstr "信号量的总数"
-#: sys-utils/lsipc.c:724
+#: sys-utils/lsipc.c:731
msgid "Max semaphores per semaphore set."
msgstr "每个信号量集的最大信号量数。"
-#: sys-utils/lsipc.c:725
+#: sys-utils/lsipc.c:732
msgid "Max number of operations per semop(2)"
msgstr "每个 semop(2) 的最大操作数"
-#: sys-utils/lsipc.c:726
+#: sys-utils/lsipc.c:733
msgid "Semaphore max value"
msgstr "信号量的最大值"
-#: sys-utils/lsipc.c:883
+#: sys-utils/lsipc.c:893
msgid "Number of message queues"
msgstr "消息队列的数目"
-#: sys-utils/lsipc.c:884
+#: sys-utils/lsipc.c:894
msgid "Max size of message (bytes)"
msgstr "消息的最大尺寸(字节)"
-#: sys-utils/lsipc.c:885
+#: sys-utils/lsipc.c:895
msgid "Default max size of queue (bytes)"
msgstr "队列的默认最大尺寸(字节)"
-#: sys-utils/lsipc.c:999 sys-utils/lsipc.c:1018
+#: sys-utils/lsipc.c:1009 sys-utils/lsipc.c:1028
msgid "hugetlb"
msgstr "hugetlb"
-#: sys-utils/lsipc.c:1000 sys-utils/lsipc.c:1025
+#: sys-utils/lsipc.c:1010 sys-utils/lsipc.c:1035
msgid "noreserve"
msgstr "noreserve"
-#: sys-utils/lsipc.c:1082
+#: sys-utils/lsipc.c:1092
msgid "Shared memory segments"
msgstr "共享内存段"
-#: sys-utils/lsipc.c:1083
+#: sys-utils/lsipc.c:1093
msgid "Shared memory pages"
msgstr "共享内存页"
-#: sys-utils/lsipc.c:1084
+#: sys-utils/lsipc.c:1094
msgid "Max size of shared memory segment (bytes)"
msgstr "共享内存段的最大尺寸(字节)"
-#: sys-utils/lsipc.c:1085
+#: sys-utils/lsipc.c:1095
msgid "Min size of shared memory segment (bytes)"
msgstr "共享内存段的最小尺寸(字节)"
-#: sys-utils/lsipc.c:1155
+#: sys-utils/lsipc.c:1165
msgid "failed to parse IPC identifier"
msgstr "解析 IPC 标识符失败"
-#: sys-utils/lsipc.c:1249
+#: sys-utils/lsipc.c:1259
msgid "--global is mutually exclusive with --creator, --id and --time"
msgstr "--global 与 --creator, --id 和 --time 互斥"
msgid "Failed to initialize output column"
msgstr "初始化输出列失败"
-#: sys-utils/lsns.c:99
+#: sys-utils/lsns.c:105
msgid "namespace identifier (inode number)"
msgstr "名字空间标识符 (inode 号)"
-#: sys-utils/lsns.c:100
+#: sys-utils/lsns.c:106
msgid "kind of namespace"
msgstr "名字空间类型"
-#: sys-utils/lsns.c:101
+#: sys-utils/lsns.c:107
msgid "path to the namespace"
msgstr "名字空间路径"
-#: sys-utils/lsns.c:102
+#: sys-utils/lsns.c:108
msgid "number of processes in the namespace"
msgstr "名字空间中的进程数"
-#: sys-utils/lsns.c:103
+#: sys-utils/lsns.c:109
msgid "lowest PID in the namespace"
msgstr "名字空间中的最低 PID"
-#: sys-utils/lsns.c:104
+#: sys-utils/lsns.c:110
msgid "PPID of the PID"
msgstr "PID 的 PPID"
-#: sys-utils/lsns.c:105
+#: sys-utils/lsns.c:111
msgid "command line of the PID"
msgstr "PID 的命令行"
-#: sys-utils/lsns.c:106
+#: sys-utils/lsns.c:112
msgid "UID of the PID"
msgstr "PID 的 UID"
-#: sys-utils/lsns.c:107
+#: sys-utils/lsns.c:113
msgid "username of the PID"
msgstr "PID 的用户名"
-#: sys-utils/lsns.c:108
+#: sys-utils/lsns.c:114
msgid "namespace ID as used by network subsystem"
msgstr ""
-#: sys-utils/lsns.c:109
+#: sys-utils/lsns.c:115
msgid "nsfs mountpoint (usually used network subsystem)"
msgstr ""
-#: sys-utils/lsns.c:899
+#: sys-utils/lsns.c:116
+#, fuzzy
+#| msgid "namespace identifier (inode number)"
+msgid "parent namespace identifier (inode number)"
+msgstr "名字空间标识符 (inode 号)"
+
+#: sys-utils/lsns.c:117
+#, fuzzy
+#| msgid "namespace identifier (inode number)"
+msgid "owner namespace identifier (inode number)"
+msgstr "名字空间标识符 (inode 号)"
+
+#: sys-utils/lsns.c:964
#, c-format
msgid " %s [options] [<namespace>]\n"
msgstr " %s [选项] [<名字空间>]\n"
-#: sys-utils/lsns.c:902
+#: sys-utils/lsns.c:967
msgid "List system namespaces.\n"
msgstr "列出系统名字空间。\n"
-#: sys-utils/lsns.c:910
+#: sys-utils/lsns.c:975
msgid " -p, --task <pid> print process namespaces\n"
msgstr " -p, --task <pid> 打印进程名字空间\n"
-#: sys-utils/lsns.c:913
+#: sys-utils/lsns.c:978
msgid " -W, --nowrap don't use multi-line representation\n"
msgstr " -W, --nowrap 不要使用多行表现\n"
-#: sys-utils/lsns.c:914
+#: sys-utils/lsns.c:979
#, fuzzy
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:1008
+#: sys-utils/lsns.c:1073
#, c-format
msgid "unknown namespace type: %s"
msgstr "未知的名字空间类型︰ %s"
-#: sys-utils/lsns.c:1037
+#: sys-utils/lsns.c:1102
msgid "--task is mutually exclusive with <namespace>"
msgstr "--task 与 <名字空间> 互斥"
-#: sys-utils/lsns.c:1038
+#: sys-utils/lsns.c:1103
msgid "invalid namespace argument"
msgstr "无效的名字空间参数"
-#: sys-utils/lsns.c:1090
+#: sys-utils/lsns.c:1155
#, c-format
msgid "not found namespace: %ju"
msgstr "找不到名字空间︰ %ju"
-#: sys-utils/mount.c:65 sys-utils/umount.c:130
+#: sys-utils/mount.c:67 sys-utils/umount.c:131
#, fuzzy
msgid "drop permissions failed."
msgstr "权限不足"
-#: sys-utils/mount.c:78 sys-utils/umount.c:64
+#: sys-utils/mount.c:87 sys-utils/umount.c:65
#, c-format
msgid "%s from %s (libmount %s"
msgstr "%s，来自 %s(libmount %s"
-#: sys-utils/mount.c:123
+#: sys-utils/mount.c:132
msgid "failed to read mtab"
msgstr "读取 mtab 失败"
-#: sys-utils/mount.c:185 sys-utils/mount.c:252 sys-utils/umount.c:197
+#: sys-utils/mount.c:194 sys-utils/mount.c:261 sys-utils/umount.c:205
#, c-format
msgid "%-25s: ignored\n"
msgstr "%-25s：已忽略\n"
-#: sys-utils/mount.c:186
+#: sys-utils/mount.c:195
#, c-format
msgid "%-25s: already mounted\n"
msgstr "%-25s：已经挂载\n"
-#: sys-utils/mount.c:293
+#: sys-utils/mount.c:302
#, c-format
msgid "%s: %s moved to %s.\n"
msgstr "%s：%s 已移到 %s。\n"
-#: sys-utils/mount.c:295
+#: sys-utils/mount.c:304
#, c-format
msgid "%s: %s bound on %s.\n"
msgstr "%s：%s 已绑定到 %s 。\n"
-#: sys-utils/mount.c:298 sys-utils/mount.c:302
+#: sys-utils/mount.c:307 sys-utils/mount.c:311
#, c-format
msgid "%s: %s mounted on %s.\n"
msgstr "%s：%s 已挂臷到 %s。\n"
-#: sys-utils/mount.c:300
+#: sys-utils/mount.c:309
#, c-format
msgid "%s: %s propagation flags changed.\n"
msgstr "%s：%s 传播标志已更改。\n"
-#: sys-utils/mount.c:320
-#, c-format
+#: sys-utils/mount.c:329
+#, fuzzy, c-format
msgid ""
"mount: %s does not contain SELinux labels.\n"
-" You just mounted an file system that supports labels which does not\n"
+" You just mounted a file system that supports labels which does not\n"
" contain labels, onto an SELinux box. It is likely that confined\n"
" applications will generate AVC messages and not be allowed access to\n"
" this file system. For more details see restorecon(8) and mount(8).\n"
" 受限制的应用程序可能会生成 AVC 消息，并被阻止访问该文件系统。\n"
" 更多详细信息请参阅 restorecon(8) 和 mount(8)。\n"
-#: sys-utils/mount.c:378
+#: sys-utils/mount.c:387
#, c-format
msgid "%s: failed to parse"
msgstr "%s：解析失败"
-#: sys-utils/mount.c:418
+#: sys-utils/mount.c:427
#, c-format
msgid "unsupported option format: %s"
msgstr "不支持的参数格式：%s"
-#: sys-utils/mount.c:420
+#: sys-utils/mount.c:429
#, c-format
msgid "failed to append option '%s'"
msgstr "追加选项“%s”失败"
-#: sys-utils/mount.c:438
+#: sys-utils/mount.c:447
#, c-format
msgid ""
" %1$s [-lhV]\n"
" %1$s [选项] <源> <目录>\n"
" %1$s <操作> <挂载点> [<目标>]\n"
-#: sys-utils/mount.c:446
+#: sys-utils/mount.c:455
msgid "Mount a filesystem.\n"
msgstr "挂载文件系统。\n"
-#: sys-utils/mount.c:450
+#: sys-utils/mount.c:459
#, c-format
msgid ""
" -a, --all mount all filesystems mentioned in fstab\n"
" -F, --fork 对每个设备禁用 fork(和 -a 选项一起使用)\n"
" -T, --fstab <路径> /etc/fstab 的替代文件\n"
-#: sys-utils/mount.c:456
+#: sys-utils/mount.c:465
#, c-format
msgid " -i, --internal-only don't call the mount.<type> helpers\n"
msgstr " -i, --internal-only 不调用 mount.<type> 辅助程序\n"
-#: sys-utils/mount.c:458
+#: sys-utils/mount.c:467
#, c-format
msgid " -l, --show-labels show also filesystem labels\n"
msgstr " -l, --show-labels 也显示文件系统标签\n"
-#: sys-utils/mount.c:460 sys-utils/umount.c:98
+#: sys-utils/mount.c:469 sys-utils/umount.c:99
#, c-format
msgid " -n, --no-mtab don't write to /etc/mtab\n"
msgstr " -n, --no-mtab 不写 /etc/mtab\n"
-#: sys-utils/mount.c:462
+#: sys-utils/mount.c:471
#, c-format
msgid ""
" --options-mode <mode>\n"
" force use of options from fstab/mtab\n"
msgstr ""
-#: sys-utils/mount.c:469
+#: sys-utils/mount.c:478
#, c-format
msgid ""
" -o, --options <list> comma-separated list of mount options\n"
" -r, --read-only 以只读方式挂载文件系统(同 -o ro)\n"
" -t, --types <列表> 限制文件系统类型集合\n"
-#: sys-utils/mount.c:474
+#: sys-utils/mount.c:483
#, c-format
msgid ""
" --source <src> explicitly specifies source (path, label, uuid)\n"
" --source <源> 指明源(路径、标签、uuid)\n"
" --target <目标> 指明挂载点\n"
-#: sys-utils/mount.c:477
+#: sys-utils/mount.c:486
#, fuzzy, c-format
msgid ""
" --target-prefix <path>\n"
-" specifies path use for all mountpoints\n"
+" specifies path used for all mountpoints\n"
msgstr " --default 使用默认终端设置\n"
-#: sys-utils/mount.c:480 sys-utils/umount.c:104
+#: sys-utils/mount.c:489 sys-utils/umount.c:105
#, c-format
msgid " -v, --verbose say what is being done\n"
msgstr " -v, --verbose 打印当前进行的操作\n"
-#: sys-utils/mount.c:482
+#: sys-utils/mount.c:491
#, c-format
msgid " -w, --rw, --read-write mount the filesystem read-write (default)\n"
msgstr " -w, --rw, --read-write 以读写方式挂载文件系统(默认)\n"
-#: sys-utils/mount.c:484
+#: sys-utils/mount.c:493
#, fuzzy, c-format
msgid " -N, --namespace <ns> perform mount in another namespace\n"
msgstr " -S, --setuid <uid> 设置进入空间中的 uid\n"
-#: sys-utils/mount.c:490
+#: sys-utils/mount.c:499
#, fuzzy, c-format
msgid ""
"\n"
" PARTLABEL=<标签> 按分区标签指定设备\n"
" PARTUUID=<uuid> 按分区 UUID 指定设备\n"
-#: sys-utils/mount.c:500
+#: sys-utils/mount.c:509
#, c-format
msgid ""
" <device> specifies device by path\n"
" <目录> 绑定式挂载的挂载点(参阅 --bind/rbind)\n"
" <文件> 用于设置回环设备的常规文件\n"
-#: sys-utils/mount.c:505
+#: sys-utils/mount.c:514
#, c-format
msgid ""
"\n"
" -M, --move 将子树移动到其他位置\n"
" -R, --rbind 挂载其他位置的子树及其包含的所有子挂载(submount)\n"
-#: sys-utils/mount.c:510
+#: sys-utils/mount.c:519
#, c-format
msgid ""
" --make-shared mark a subtree as shared\n"
" --make-private 将子树标记为 私有\n"
" --make-unbindable 将子树标记为 不可绑定\n"
-#: sys-utils/mount.c:515
+#: sys-utils/mount.c:524
#, c-format
msgid ""
" --make-rshared recursively mark a whole subtree as shared\n"
" --make-rprivate 递归地将整个子树标记为 私有\n"
" --make-runbindable 递归地将整个子树标记为 不可绑定\n"
-#: sys-utils/mount.c:666 sys-utils/umount.c:498
+#: sys-utils/mount.c:675 sys-utils/umount.c:516
msgid "libmount context allocation failed"
msgstr "libmount 环境(context)分配失败"
-#: sys-utils/mount.c:728 sys-utils/umount.c:551
+#: sys-utils/mount.c:737 sys-utils/umount.c:578
msgid "failed to set options pattern"
msgstr "设置选项模式失败"
-#: sys-utils/mount.c:775 sys-utils/umount.c:568
+#: sys-utils/mount.c:784 sys-utils/umount.c:595
#, fuzzy, c-format
msgid "failed to set target namespace to %s"
msgstr "无法将人格(personality)设置为 %s"
-#: sys-utils/mount.c:941
+#: sys-utils/mount.c:950
msgid "source specified more than once"
msgstr "源指定了多次"
-#: sys-utils/mountpoint.c:119
+#: sys-utils/mountpoint.c:121
#, c-format
msgid ""
" %1$s [-qd] /path/to/directory\n"
" %1$s [-qd] /目录/的/路径\n"
" %1$s -x /dev/设备\n"
-#: sys-utils/mountpoint.c:123
+#: sys-utils/mountpoint.c:125
msgid "Check whether a directory or file is a mountpoint.\n"
msgstr "检查目录或文件是否为挂载点。\n"
-#: sys-utils/mountpoint.c:126
+#: sys-utils/mountpoint.c:128
#, fuzzy
msgid ""
" -q, --quiet quiet mode - don't print anything\n"
" -d, --fs-devno 打印文件系统的 主：次 设备号\n"
" -x, --devno 打印块设备的主：次设备号\n"
-#: sys-utils/mountpoint.c:207
+#: sys-utils/mountpoint.c:210
#, c-format
msgid "%s is not a mountpoint\n"
msgstr "%s 不是一个挂载点\n"
-#: sys-utils/mountpoint.c:213
+#: sys-utils/mountpoint.c:216
#, c-format
msgid "%s is a mountpoint\n"
msgstr "%s 是一个挂载点\n"
msgid "chroot failed"
msgstr "chroot 失败"
-#: sys-utils/nsenter.c:469
+#: sys-utils/nsenter.c:471
msgid "change directory by working directory file descriptor failed"
msgstr "按工作目录文件描述符更改目录失败"
-#: sys-utils/nsenter.c:480 sys-utils/setpriv.c:1031 sys-utils/setpriv.c:1038
+#: sys-utils/nsenter.c:482 sys-utils/setpriv.c:1025 sys-utils/setpriv.c:1032
#: sys-utils/unshare.c:661
msgid "setgroups failed"
msgstr "setgroups 失败"
" -y, --rttime 实时调度时进程调度的 CPU\n"
" (间隔)时间(毫秒)\n"
-#: sys-utils/prlimit.c:243 sys-utils/prlimit.c:249 sys-utils/prlimit.c:365
-#: sys-utils/prlimit.c:370
+#: sys-utils/prlimit.c:245 sys-utils/prlimit.c:251 sys-utils/prlimit.c:368
+#: sys-utils/prlimit.c:373
msgid "unlimited"
msgstr "无限制"
-#: sys-utils/prlimit.c:331
+#: sys-utils/prlimit.c:334
#, c-format
msgid "failed to get old %s limit"
msgstr "获取旧的 %s 限制失败"
-#: sys-utils/prlimit.c:355
+#: sys-utils/prlimit.c:358
#, c-format
msgid "the soft limit %s cannot exceed the hard limit"
msgstr "软限制 %s 不能超过硬限制"
-#: sys-utils/prlimit.c:362
+#: sys-utils/prlimit.c:365
#, c-format
msgid "New %s limit for pid %d: "
msgstr "pid %2$d 的新 %1$s 限制："
-#: sys-utils/prlimit.c:377
+#: sys-utils/prlimit.c:380
#, c-format
msgid "failed to set the %s resource limit"
msgstr "设置 %s 资源限制失败"
-#: sys-utils/prlimit.c:378
+#: sys-utils/prlimit.c:381
#, c-format
msgid "failed to get the %s resource limit"
msgstr "获取 %s 资源限制失败"
-#: sys-utils/prlimit.c:457
+#: sys-utils/prlimit.c:463
#, c-format
msgid "failed to parse %s limit"
msgstr "解析 %s 限制失败"
-#: sys-utils/prlimit.c:586
+#: sys-utils/prlimit.c:592
msgid "option --pid may be specified only once"
msgstr "--pid 选项只能指定一次"
-#: sys-utils/prlimit.c:615
+#: sys-utils/prlimit.c:621
msgid "options --pid and COMMAND are mutually exclusive"
msgstr "--pid 和 命令 互相排斥"
msgid " -n, --no-auto disable byte order auto-detection\n"
msgstr " -n, --no-auto 禁用字节顺序自动检测\n"
-#: sys-utils/readprofile.c:239
+#: sys-utils/readprofile.c:240
#, c-format
msgid "error writing %s"
msgstr "写 %s 出错"
-#: sys-utils/readprofile.c:250
+#: sys-utils/readprofile.c:251
msgid "input file is empty"
msgstr "输入文件为空"
-#: sys-utils/readprofile.c:272
+#: sys-utils/readprofile.c:273
msgid "Assuming reversed byte order. Use -n to force native byte order."
msgstr "将假设为反向字节顺序。可使用 -n 强制为原生字节顺序。"
-#: sys-utils/readprofile.c:287
+#: sys-utils/readprofile.c:288
#, c-format
msgid "Sampling_step: %u\n"
msgstr "采样步长：%u\n"
-#: sys-utils/readprofile.c:303 sys-utils/readprofile.c:324
+#: sys-utils/readprofile.c:304 sys-utils/readprofile.c:325
#, c-format
msgid "%s(%i): wrong map line"
msgstr "%s(%i)：错误的 map 行"
-#: sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:315
#, c-format
msgid "can't find \"_stext\" in %s"
msgstr "在 %s 中找不到“_stext”"
-#: sys-utils/readprofile.c:347
+#: sys-utils/readprofile.c:348
msgid "profile address out of range. Wrong map file?"
msgstr "配置(profile)地址超出范围。map 文件错误？"
-#: sys-utils/readprofile.c:405
+#: sys-utils/readprofile.c:409
msgid "total"
msgstr "总计"
msgid "bad %s value: %s"
msgstr "错误的 %s 值：%s"
-#: sys-utils/rfkill.c:128
+#: sys-utils/rfkill.c:131
msgid "kernel device name"
msgstr "内核设备名称"
-#: sys-utils/rfkill.c:129
+#: sys-utils/rfkill.c:132
msgid "device identifier value"
msgstr "设备标识符值"
-#: sys-utils/rfkill.c:130
+#: sys-utils/rfkill.c:133
msgid "device type name that can be used as identifier"
msgstr ""
-#: sys-utils/rfkill.c:131
+#: sys-utils/rfkill.c:134
msgid "device type description"
msgstr "设备类型描述"
-#: sys-utils/rfkill.c:132
+#: sys-utils/rfkill.c:135
#, fuzzy
msgid "status of software block"
msgstr "锁的大小"
-#: sys-utils/rfkill.c:133
+#: sys-utils/rfkill.c:136
#, fuzzy
msgid "status of hardware block"
msgstr "显示硬件看门狗的状态。\n"
-#: sys-utils/rfkill.c:197
+#: sys-utils/rfkill.c:200
#, fuzzy, c-format
msgid "cannot set non-blocking %s"
msgstr "无法锁定 %s"
-#: sys-utils/rfkill.c:218
+#: sys-utils/rfkill.c:221
#, c-format
-msgid "wrong size of rfkill event: %zu < %d"
+msgid "wrong size of rfkill event: %zu < %zu"
msgstr ""
-#: sys-utils/rfkill.c:248
+#: sys-utils/rfkill.c:252
#, fuzzy, c-format
msgid "failed to poll %s"
msgstr "解析 %s 失败"
-#: sys-utils/rfkill.c:315
+#: sys-utils/rfkill.c:319
msgid "invalid identifier"
msgstr "无效的标识符"
-#: sys-utils/rfkill.c:395 sys-utils/rfkill.c:398
+#: sys-utils/rfkill.c:399 sys-utils/rfkill.c:402
#, fuzzy
msgid "blocked"
msgstr "已锁定"
-#: sys-utils/rfkill.c:395 sys-utils/rfkill.c:398
+#: sys-utils/rfkill.c:399 sys-utils/rfkill.c:402
#, fuzzy
msgid "unblocked"
msgstr "已锁定"
-#: sys-utils/rfkill.c:417 sys-utils/rfkill.c:489 sys-utils/rfkill.c:533
+#: sys-utils/rfkill.c:421 sys-utils/rfkill.c:495 sys-utils/rfkill.c:536
+#: sys-utils/rfkill.c:572 sys-utils/rfkill.c:593
#, c-format
msgid "invalid identifier: %s"
msgstr "无效的标识符：%s"
-#: sys-utils/rfkill.c:575
+#: sys-utils/rfkill.c:623
#, fuzzy, c-format
msgid " %s [options] command [identifier ...]\n"
msgstr " %s [选项] [<设备> ...]\n"
-#: sys-utils/rfkill.c:578
+#: sys-utils/rfkill.c:626
msgid "Tool for enabling and disabling wireless devices.\n"
msgstr ""
#. *
#. list [identifier] (lista [tarkenne])
#.
-#: sys-utils/rfkill.c:602
+#: sys-utils/rfkill.c:650
#, fuzzy
msgid " help\n"
msgstr " -help\n"
-#: sys-utils/rfkill.c:603
+#: sys-utils/rfkill.c:651
msgid " event\n"
msgstr ""
-#: sys-utils/rfkill.c:604
+#: sys-utils/rfkill.c:652
#, fuzzy
msgid " list [identifier]\n"
msgstr "磁盘标识符"
-#: sys-utils/rfkill.c:605
+#: sys-utils/rfkill.c:653
#, fuzzy
msgid " block identifier\n"
msgstr "磁盘标识符"
-#: sys-utils/rfkill.c:606
+#: sys-utils/rfkill.c:654
#, fuzzy
msgid " unblock identifier\n"
msgstr "磁盘标识符"
+#: sys-utils/rfkill.c:655
+#, fuzzy
+msgid " toggle identifier\n"
+msgstr "磁盘标识符"
+
#: sys-utils/rtcwake.c:102
msgid "Enter a system sleep state until a specified wakeup time.\n"
msgstr "进入系统睡眠状态，直到指定的唤醒时间。\n"
msgid "unexpected third line in: %s: %s"
msgstr "第 3 行异常：%s：%s"
-#: sys-utils/rtcwake.c:345 sys-utils/rtcwake.c:673
+#: sys-utils/rtcwake.c:345 sys-utils/rtcwake.c:675
msgid "read rtc alarm failed"
msgstr "读取 rtc 闹钟失败"
msgid "could not read: %s"
msgstr "无法读取︰%s"
-#: sys-utils/rtcwake.c:494
+#: sys-utils/rtcwake.c:493
#, c-format
msgid "unrecognized suspend state '%s'"
msgstr "不支持的挂起状态“%s”"
-#: sys-utils/rtcwake.c:502
+#: sys-utils/rtcwake.c:501
msgid "invalid seconds argument"
msgstr "无效的 秒数 参数"
-#: sys-utils/rtcwake.c:506
+#: sys-utils/rtcwake.c:505
msgid "invalid time argument"
msgstr "无效的 时间 参数"
-#: sys-utils/rtcwake.c:533
+#: sys-utils/rtcwake.c:532
#, c-format
msgid "%s: assuming RTC uses UTC ...\n"
msgstr "%s：将假设 RTC 使用 UTC...\n"
-#: sys-utils/rtcwake.c:538
+#: sys-utils/rtcwake.c:537
msgid "Using UTC time.\n"
msgstr "使用 UTC 时间。\n"
-#: sys-utils/rtcwake.c:539
+#: sys-utils/rtcwake.c:538
msgid "Using local time.\n"
msgstr "使用当地时间。\n"
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:541
msgid "must provide wake time (see --seconds, --time and --date options)"
msgstr "必须提供唤醒时间(见 --seconds, --time 和 --date 选项)"
-#: sys-utils/rtcwake.c:548
+#: sys-utils/rtcwake.c:547
#, c-format
msgid "%s not enabled for wakeup events"
msgstr "%s 没有为唤醒事件启用"
-#: sys-utils/rtcwake.c:555
-#, c-format
-msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
+#: sys-utils/rtcwake.c:554
+#, 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:565
+#: sys-utils/rtcwake.c:567
#, c-format
msgid "time doesn't go backward to %s"
msgstr "时间不能返回到 %s"
-#: sys-utils/rtcwake.c:578
+#: sys-utils/rtcwake.c:580
#, c-format
msgid "%s: wakeup using %s at %s"
msgstr "%1$s：用 %3$s 的 %2$s 唤醒"
-#: sys-utils/rtcwake.c:584
+#: sys-utils/rtcwake.c:586
#, c-format
msgid "%s: wakeup from \"%s\" using %s at %s"
msgstr "%s：从“%s”唤醒，使用 %s，时间 %s"
-#: sys-utils/rtcwake.c:594
+#: sys-utils/rtcwake.c:596
#, c-format
msgid "suspend mode: no; leaving\n"
msgstr "挂起模式：无；将离开\n"
-#: sys-utils/rtcwake.c:617
+#: sys-utils/rtcwake.c:619
#, c-format
msgid "suspend mode: off; executing %s\n"
msgstr "挂起模式：关；正在执行 %s\n"
-#: sys-utils/rtcwake.c:626
+#: sys-utils/rtcwake.c:628
msgid "failed to find shutdown command"
msgstr "无法找到 shutdown 命令"
-#: sys-utils/rtcwake.c:636
+#: sys-utils/rtcwake.c:638
#, c-format
msgid "suspend mode: on; reading rtc\n"
msgstr "挂起模式：开；正在读 rtc\n"
-#: sys-utils/rtcwake.c:641
+#: sys-utils/rtcwake.c:643
msgid "rtc read failed"
msgstr "读 rtc 失败"
-#: sys-utils/rtcwake.c:653
+#: sys-utils/rtcwake.c:655
#, c-format
msgid "suspend mode: disable; disabling alarm\n"
msgstr "挂起模式：禁用；正在禁用闹钟\n"
-#: sys-utils/rtcwake.c:657
+#: sys-utils/rtcwake.c:659
#, c-format
msgid "suspend mode: show; printing alarm info\n"
msgstr "挂起模式：显示；正在打印闹钟信息\n"
-#: sys-utils/rtcwake.c:664
+#: sys-utils/rtcwake.c:666
#, c-format
msgid "suspend mode: %s; suspending system\n"
msgstr "挂起模式：%s；正在挂起系统\n"
-#: sys-utils/rtcwake.c:678
+#: sys-utils/rtcwake.c:680
msgid "disable rtc alarm interrupt failed"
msgstr "禁用 rtc 闹钟中断失败"
msgid "invalid capability type"
msgstr "无效的权能类型"
-#: sys-utils/setpriv.c:222 sys-utils/setpriv.c:566
+#: sys-utils/setpriv.c:193 sys-utils/setpriv.c:412
+#, c-format
+msgid "cap %d: libcap-ng is broken"
+msgstr "权能 %d：libcap-ng 损坏"
+
+#: sys-utils/setpriv.c:219 sys-utils/setpriv.c:560
msgid "getting process secure bits failed"
msgstr "获取进程安全位失败"
-#: sys-utils/setpriv.c:226
+#: sys-utils/setpriv.c:223
#, c-format
msgid "Securebits: "
msgstr "安全位："
-#: sys-utils/setpriv.c:246
+#: sys-utils/setpriv.c:243 sys-utils/setpriv.c:327
#, c-format
msgid "[none]\n"
msgstr "[无]\n"
-#: sys-utils/setpriv.c:272
+#: sys-utils/setpriv.c:269
#, c-format
msgid "%s: too long"
msgstr "%s：过长"
-#: sys-utils/setpriv.c:300
+#: sys-utils/setpriv.c:297
#, c-format
msgid "Supplementary groups: "
msgstr "附属组："
-#: sys-utils/setpriv.c:302 sys-utils/setpriv.c:368 sys-utils/setpriv.c:373
-#: sys-utils/setpriv.c:379 sys-utils/setpriv.c:385 sys-utils/setpriv.c:392
+#: 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
#, c-format
msgid "[none]"
msgstr "[无]"
-#: sys-utils/setpriv.c:320
+#: sys-utils/setpriv.c:317
msgid "get pdeathsig failed"
msgstr "获取 pdeathsig 失败"
-#: sys-utils/setpriv.c:340
+#: sys-utils/setpriv.c:321
+#, fuzzy, c-format
+msgid "Parent death signal: "
+msgstr "设置父进程死亡信号失败"
+
+#: sys-utils/setpriv.c:337
#, c-format
msgid "uid: %u\n"
msgstr "uid：%u\n"
-#: sys-utils/setpriv.c:341
+#: sys-utils/setpriv.c:338
#, c-format
msgid "euid: %u\n"
msgstr "euid：%u\n"
-#: sys-utils/setpriv.c:344
+#: sys-utils/setpriv.c:341
#, c-format
msgid "suid: %u\n"
msgstr "suid：%u\n"
-#: sys-utils/setpriv.c:346 sys-utils/setpriv.c:459
+#: sys-utils/setpriv.c:343 sys-utils/setpriv.c:456
msgid "getresuid failed"
msgstr "getresuid 失败"
-#: sys-utils/setpriv.c:355 sys-utils/setpriv.c:474
+#: sys-utils/setpriv.c:352 sys-utils/setpriv.c:471
msgid "getresgid failed"
msgstr "getresgid 失败"
-#: sys-utils/setpriv.c:366
+#: sys-utils/setpriv.c:363
#, c-format
msgid "Effective capabilities: "
msgstr "有效权能："
-#: sys-utils/setpriv.c:371
+#: sys-utils/setpriv.c:368
#, c-format
msgid "Permitted capabilities: "
msgstr "允许的权能："
-#: sys-utils/setpriv.c:377
+#: sys-utils/setpriv.c:374
#, c-format
msgid "Inheritable capabilities: "
msgstr "可继承的权能："
-#: sys-utils/setpriv.c:382
+#: sys-utils/setpriv.c:379
#, fuzzy, c-format
msgid "Ambient capabilities: "
msgstr "允许的权能："
-#: sys-utils/setpriv.c:387
+#: sys-utils/setpriv.c:384
#, c-format
msgid "[unsupported]"
msgstr "[不支持]"
-#: sys-utils/setpriv.c:390
+#: sys-utils/setpriv.c:387
#, c-format
msgid "Capability bounding set: "
msgstr "权能绑定集："
-#: sys-utils/setpriv.c:399
+#: sys-utils/setpriv.c:396
msgid "SELinux label"
msgstr "SELinux 标签"
-#: sys-utils/setpriv.c:402
+#: sys-utils/setpriv.c:399
msgid "AppArmor profile"
msgstr "AppArmor 配置文件"
-#: sys-utils/setpriv.c:415
-#, c-format
-msgid "cap %d: libcap-ng is broken"
-msgstr "权能 %d：libcap-ng 损坏"
-
-#: sys-utils/setpriv.c:437
+#: sys-utils/setpriv.c:434
msgid "Invalid supplementary group id"
msgstr "无效的附属组 id"
-#: sys-utils/setpriv.c:447
+#: sys-utils/setpriv.c:444
msgid "failed to get parent death signal"
msgstr "获取父进程死亡信号失败"
-#: sys-utils/setpriv.c:467
+#: sys-utils/setpriv.c:464
msgid "setresuid failed"
msgstr "setresuid 失败"
-#: sys-utils/setpriv.c:482
+#: sys-utils/setpriv.c:479
msgid "setresgid failed"
msgstr "setresgid 失败"
-#: sys-utils/setpriv.c:514
+#: sys-utils/setpriv.c:511
msgid "unsupported capability type"
msgstr "不支持的权能类型"
-#: sys-utils/setpriv.c:531
+#: sys-utils/setpriv.c:528
msgid "bad capability string"
msgstr "错误的权能字符串"
-#: sys-utils/setpriv.c:539
-msgid "libcap-ng is too old for \"all\" caps"
-msgstr "对于“all”权能，libcap-ng 太旧"
-
-#: sys-utils/setpriv.c:551
+#: sys-utils/setpriv.c:545
#, c-format
msgid "unknown capability \"%s\""
msgstr "未知权能“%s”"
-#: sys-utils/setpriv.c:575
+#: sys-utils/setpriv.c:569
msgid "unrecognized securebit set -- refusing to adjust"
msgstr "无法识别的安全位集 -- 拒绝调整"
-#: sys-utils/setpriv.c:579
+#: sys-utils/setpriv.c:573
msgid "bad securebits string"
msgstr "安全位字符串有误"
-#: sys-utils/setpriv.c:586
+#: sys-utils/setpriv.c:580
msgid "+all securebits is not allowed"
msgstr "+all 安全位是不允许的"
-#: sys-utils/setpriv.c:599
+#: sys-utils/setpriv.c:593
msgid "adjusting keep_caps does not make sense"
msgstr "调整 keep_caps(保持权能) 没有意义"
-#: sys-utils/setpriv.c:603
+#: sys-utils/setpriv.c:597
msgid "unrecognized securebit"
msgstr "无法识别的安全位"
-#: sys-utils/setpriv.c:623
+#: sys-utils/setpriv.c:617
msgid "SELinux is not running"
msgstr "SELinux 没有运行"
-#: sys-utils/setpriv.c:638
+#: sys-utils/setpriv.c:632
#, c-format
msgid "close failed: %s"
msgstr "关闭失败：%s"
-#: sys-utils/setpriv.c:646
+#: sys-utils/setpriv.c:640
msgid "AppArmor is not running"
msgstr "AppArmor 没有运行"
-#: sys-utils/setpriv.c:825
+#: sys-utils/setpriv.c:819
msgid "duplicate --no-new-privs option"
msgstr "复制 --no-new-privs 选项"
-#: sys-utils/setpriv.c:830
+#: sys-utils/setpriv.c:824
msgid "duplicate ruid"
msgstr "复制 ruid"
-#: sys-utils/setpriv.c:832
+#: sys-utils/setpriv.c:826
msgid "failed to parse ruid"
msgstr "解析 ruid 失败"
-#: sys-utils/setpriv.c:840
+#: sys-utils/setpriv.c:834
msgid "duplicate euid"
msgstr "复制 euid"
-#: sys-utils/setpriv.c:842
+#: sys-utils/setpriv.c:836
msgid "failed to parse euid"
msgstr "解析 euid 失败"
-#: sys-utils/setpriv.c:846
+#: sys-utils/setpriv.c:840
msgid "duplicate ruid or euid"
msgstr "复制 ruid 或 euid"
-#: sys-utils/setpriv.c:848
+#: sys-utils/setpriv.c:842
msgid "failed to parse reuid"
msgstr "解析 reuid 失败"
-#: sys-utils/setpriv.c:857
+#: sys-utils/setpriv.c:851
msgid "duplicate rgid"
msgstr "复制 rgid"
-#: sys-utils/setpriv.c:859
+#: sys-utils/setpriv.c:853
msgid "failed to parse rgid"
msgstr "解析 rgid 失败"
-#: sys-utils/setpriv.c:863
+#: sys-utils/setpriv.c:857
msgid "duplicate egid"
msgstr "复制 egid"
-#: sys-utils/setpriv.c:865
+#: sys-utils/setpriv.c:859
msgid "failed to parse egid"
msgstr "解析 egid 失败"
-#: sys-utils/setpriv.c:869
+#: sys-utils/setpriv.c:863
msgid "duplicate rgid or egid"
msgstr "复制 rgid 或 egid"
-#: sys-utils/setpriv.c:871
+#: sys-utils/setpriv.c:865
msgid "failed to parse regid"
msgstr "解析 regid 失败"
-#: sys-utils/setpriv.c:876
+#: sys-utils/setpriv.c:870
msgid "duplicate --clear-groups option"
msgstr "复制 --clear-groups 选项"
-#: sys-utils/setpriv.c:882
+#: sys-utils/setpriv.c:876
msgid "duplicate --keep-groups option"
msgstr "复制 --keep-groups 选项"
-#: sys-utils/setpriv.c:888
+#: sys-utils/setpriv.c:882
msgid "duplicate --init-groups option"
msgstr "复制 --init-groups 选项"
-#: sys-utils/setpriv.c:894
+#: sys-utils/setpriv.c:888
msgid "duplicate --groups option"
msgstr "复制 --groups 选项"
-#: sys-utils/setpriv.c:900
+#: sys-utils/setpriv.c:894
msgid "duplicate --keep-pdeathsig option"
msgstr "复制 --keep-pdeathsig 选项"
-#: sys-utils/setpriv.c:909
+#: sys-utils/setpriv.c:903
msgid "duplicate --inh-caps option"
msgstr "复制 --inh-caps 选项"
-#: sys-utils/setpriv.c:915
+#: sys-utils/setpriv.c:909
msgid "duplicate --ambient-caps option"
msgstr "复制 --ambient-caps 选项"
-#: sys-utils/setpriv.c:921
+#: sys-utils/setpriv.c:915
msgid "duplicate --bounding-set option"
msgstr "复制 --bounding-set 选项"
-#: sys-utils/setpriv.c:927
+#: sys-utils/setpriv.c:921
msgid "duplicate --securebits option"
msgstr "复制 --securebits 选项"
-#: sys-utils/setpriv.c:933
+#: sys-utils/setpriv.c:927
msgid "duplicate --selinux-label option"
msgstr "复制 --selinux-label 选项"
-#: sys-utils/setpriv.c:939
+#: sys-utils/setpriv.c:933
msgid "duplicate --apparmor-profile option"
msgstr "复制 --apparmor-profile 选项"
-#: sys-utils/setpriv.c:958
+#: sys-utils/setpriv.c:952
msgid "--dump is incompatible with all other options"
msgstr "--dump 与其他所有选项不兼容"
-#: sys-utils/setpriv.c:966
+#: sys-utils/setpriv.c:960
msgid "--list-caps must be specified alone"
msgstr "--list-caps 必须作为单独选项指定"
-#: sys-utils/setpriv.c:972
+#: sys-utils/setpriv.c:966
msgid "No program specified"
msgstr "未指定程序"
-#: sys-utils/setpriv.c:978
+#: sys-utils/setpriv.c:972
#, fuzzy
msgid "--[re]gid requires --keep-groups, --clear-groups, --init-groups, or --groups"
msgstr "--[re]gid 需要 --keep-groups、--clear-groups 或 --groups"
-#: sys-utils/setpriv.c:982
+#: sys-utils/setpriv.c:976
msgid "--init-groups requires --ruid or --reuid"
msgstr "--init-groups 需要 --ruid 或者 --reuid"
-#: sys-utils/setpriv.c:986
+#: sys-utils/setpriv.c:980
#, c-format
msgid "uid %ld not found, --init-groups requires an user that can be found on the system"
msgstr ""
-#: sys-utils/setpriv.c:1001
+#: sys-utils/setpriv.c:995
msgid "disallow granting new privileges failed"
msgstr "禁止赋予新权限失败"
-#: sys-utils/setpriv.c:1009
+#: sys-utils/setpriv.c:1003
msgid "keep process capabilities failed"
msgstr "保持进程权能失败"
-#: sys-utils/setpriv.c:1017
+#: sys-utils/setpriv.c:1011
msgid "activate capabilities"
msgstr "激活权能"
-#: sys-utils/setpriv.c:1023
+#: sys-utils/setpriv.c:1017
msgid "reactivate capabilities"
msgstr "重新激活权能"
-#: sys-utils/setpriv.c:1034
+#: sys-utils/setpriv.c:1028
msgid "initgroups failed"
msgstr "initgroups 失败"
-#: sys-utils/setpriv.c:1042
+#: sys-utils/setpriv.c:1036
msgid "set process securebits failed"
msgstr "设置进程安全位失败"
-#: sys-utils/setpriv.c:1048
+#: sys-utils/setpriv.c:1042
msgid "apply bounding set"
msgstr "应用绑定集"
-#: sys-utils/setpriv.c:1054
+#: sys-utils/setpriv.c:1048
msgid "apply capabilities"
msgstr "应用权能"
-#: sys-utils/setpriv.c:1063
+#: sys-utils/setpriv.c:1057
msgid "set parent death signal failed"
msgstr "设置父进程死亡信号失败"
msgid "%s: swapoff failed"
msgstr "%s：swapoff 失败"
-#: sys-utils/swapoff.c:141 sys-utils/swapon.c:793
+#: sys-utils/swapoff.c:141 sys-utils/swapon.c:806
#, c-format
msgid " %s [options] [<spec>]\n"
msgstr " %s [选项] [<指定>]\n"
msgid "swap label"
msgstr "swap 标签"
-#: sys-utils/swapon.c:249
-#, c-format
-msgid "%s\t\t\t\tType\t\tSize\tUsed\tPriority\n"
+#. TRANSLATORS: The tabs make each field a multiple of 8 characters. Keep aligned with each entry below.
+#: sys-utils/swapon.c:250
+#, 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:249
-msgid "Filename"
-msgstr "文件名"
-
-#: sys-utils/swapon.c:315
+#: sys-utils/swapon.c:328
#, c-format
msgid "%s: reinitializing the swap."
msgstr "%s：正在重新初始化交换区。"
-#: sys-utils/swapon.c:379
+#: sys-utils/swapon.c:392
#, c-format
msgid "%s: lseek failed"
msgstr "%s：lseek 失败"
-#: sys-utils/swapon.c:385
+#: sys-utils/swapon.c:398
#, c-format
msgid "%s: write signature failed"
msgstr "%s：写签名失败"
-#: sys-utils/swapon.c:539
+#: sys-utils/swapon.c:541
+#, c-format
+msgid "%s: insecure permissions %04o, %04o suggested."
+msgstr "%s：不安全的权限 %04o，建议使用 %04o。"
+
+#: sys-utils/swapon.c:546
+#, c-format
+msgid "%s: insecure file owner %d, 0 (root) suggested."
+msgstr "%s：不安全的文件拥有者 %d，建议使用 0(root)。"
+
+#: sys-utils/swapon.c:552
#, c-format
msgid "%s: skipping - it appears to have holes."
msgstr "%s：将跳过 - 它似乎有空洞。"
-#: sys-utils/swapon.c:547
+#: sys-utils/swapon.c:560
#, c-format
msgid "%s: get size failed"
msgstr "%s：获取大小失败"
-#: sys-utils/swapon.c:553
+#: sys-utils/swapon.c:566
#, c-format
msgid "%s: read swap header failed"
msgstr "%s：读交换区头失败"
-#: sys-utils/swapon.c:558
+#: sys-utils/swapon.c:571
#, c-format
msgid "%s: found signature [pagesize=%d, signature=%s]"
msgstr "%s：找到签名[页尺寸=%d, 签名=%s]"
-#: sys-utils/swapon.c:569
+#: sys-utils/swapon.c:582
#, c-format
msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
msgstr "%s：页大小=%d，交换区大小=%llu，设备大小=%llu"
-#: sys-utils/swapon.c:574
+#: sys-utils/swapon.c:587
#, c-format
msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
msgstr "%s：末页 0x%08llx 大于交换空间的实际大小"
-#: sys-utils/swapon.c:584
+#: sys-utils/swapon.c:597
#, c-format
msgid "%s: swap format pagesize does not match."
msgstr "%s：交换格式 页大小 不匹配。"
-#: sys-utils/swapon.c:590
+#: sys-utils/swapon.c:603
#, c-format
msgid "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
msgstr "%s：交换格式 页大小 不匹配。(使用 --fixpgsz 来重新对它初始化。)"
-#: sys-utils/swapon.c:599
+#: sys-utils/swapon.c:612
#, c-format
msgid "%s: software suspend data detected. Rewriting the swap signature."
msgstr "%s：检测到软件挂起数据。将重新写交换签名。"
-#: sys-utils/swapon.c:669
+#: sys-utils/swapon.c:682
#, c-format
msgid "swapon %s\n"
msgstr "swapon %s\n"
-#: sys-utils/swapon.c:673
+#: sys-utils/swapon.c:686
#, c-format
msgid "%s: swapon failed"
msgstr "%s：swapon 失败"
-#: sys-utils/swapon.c:746
+#: sys-utils/swapon.c:759
#, c-format
msgid "%s: noauto option -- ignored"
msgstr "%s：无自动选项 -- 已忽略"
-#: sys-utils/swapon.c:768
+#: sys-utils/swapon.c:781
#, c-format
msgid "%s: already active -- ignored"
msgstr "%s：已激活 -- 已忽略"
-#: sys-utils/swapon.c:774
+#: sys-utils/swapon.c:787
#, c-format
msgid "%s: inaccessible -- ignored"
msgstr "%s：无法访问 -- 已忽略"
-#: sys-utils/swapon.c:796
+#: sys-utils/swapon.c:809
msgid "Enable devices and files for paging and swapping.\n"
msgstr "允许将设备和文件用于分页和交换。\n"
-#: sys-utils/swapon.c:799
+#: sys-utils/swapon.c:812
msgid " -a, --all enable all swaps from /etc/fstab\n"
msgstr " -a, --all 启用 /etc/fstab 中的所有交换区\n"
-#: sys-utils/swapon.c:800
+#: sys-utils/swapon.c:813
msgid " -d, --discard[=<policy>] enable swap discards, if supported by device\n"
msgstr " -d, --discard[=<policy>] 如果设备支持，启用 swap 丢弃\n"
-#: sys-utils/swapon.c:801
+#: sys-utils/swapon.c:814
msgid " -e, --ifexists silently skip devices that do not exist\n"
msgstr " -e, --ifexists 自动跳过不存在的设备而不提示\n"
-#: sys-utils/swapon.c:802
+#: sys-utils/swapon.c:815
msgid " -f, --fixpgsz reinitialize the swap space if necessary\n"
msgstr " -f, --fixpgsz 必要时重新初始化交换区\n"
-#: sys-utils/swapon.c:803
+#: sys-utils/swapon.c:816
msgid " -o, --options <list> comma-separated list of swap options\n"
msgstr " -o, --options <列表> 以英文逗号分隔的 swap 选项\n"
-#: sys-utils/swapon.c:804
+#: sys-utils/swapon.c:817
msgid " -p, --priority <prio> specify the priority of the swap device\n"
msgstr " -p, --priority <优先级> 指定交换设备的优先级\n"
-#: sys-utils/swapon.c:805
+#: sys-utils/swapon.c:818
msgid " -s, --summary display summary about used swap devices (DEPRECATED)\n"
msgstr " -s, --summary 显示已使用交换设备的摘要(已废弃)\n"
-#: sys-utils/swapon.c:806
+#: sys-utils/swapon.c:819
msgid " --show[=<columns>] display summary in definable table\n"
msgstr " --show[=<列>] 以可自定义的表格形式打印摘要\n"
-#: sys-utils/swapon.c:807
+#: sys-utils/swapon.c:820
msgid " --noheadings don't print table heading (with --show)\n"
msgstr " --noheadings 不打印表头(与 --show 合用)\n"
-#: sys-utils/swapon.c:808
+#: sys-utils/swapon.c:821
msgid " --raw use the raw output format (with --show)\n"
msgstr " --raw 使用原生输出格式(与 --show 合用)\n"
-#: sys-utils/swapon.c:809
+#: sys-utils/swapon.c:822
msgid " --bytes display swap size in bytes in --show output\n"
msgstr " --bytes 在 --show 输出中以字节数显示交换区大小\n"
-#: sys-utils/swapon.c:810
+#: sys-utils/swapon.c:823
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详尽模式\n"
-#: sys-utils/swapon.c:815
+#: sys-utils/swapon.c:828
msgid ""
"\n"
"The <spec> parameter:\n"
" <设备> 要使用设备的名称\n"
" <文件> 要使用文件的名称\n"
-#: sys-utils/swapon.c:825
+#: sys-utils/swapon.c:838
msgid ""
"\n"
"Available discard policy types (for --discard):\n"
" pages\t ：对释放的页在重新使用前丢弃\n"
" * 如果未选择策略，则两者都将启用。(默认)\n"
-#: sys-utils/swapon.c:907
+#: sys-utils/swapon.c:920
msgid "failed to parse priority"
msgstr "解析优先级失败"
-#: sys-utils/swapon.c:926
+#: sys-utils/swapon.c:939
#, c-format
msgid "unsupported discard policy: %s"
msgstr "不支持的丢弃策略：%s"
msgid "failed to open directory"
msgstr "打开目录失败"
-#: sys-utils/switch_root.c:68
+#: sys-utils/switch_root.c:67
msgid "stat failed"
msgstr "stat 失败"
-#: sys-utils/switch_root.c:79
+#: sys-utils/switch_root.c:78
msgid "failed to read directory"
msgstr "读目录失败"
-#: sys-utils/switch_root.c:116
+#: sys-utils/switch_root.c:113
#, c-format
msgid "failed to unlink %s"
msgstr "unlink %s 失败"
-#: sys-utils/switch_root.c:153
+#: sys-utils/switch_root.c:160
#, c-format
msgid "failed to mount moving %s to %s"
msgstr "将 %s 挂载移动到 %s 失败"
-#: sys-utils/switch_root.c:155
+#: sys-utils/switch_root.c:162
#, c-format
msgid "forcing unmount of %s"
msgstr "正在强制卸载 %s"
-#: sys-utils/switch_root.c:161
+#: sys-utils/switch_root.c:168
#, c-format
msgid "failed to change directory to %s"
msgstr "将目录更改到 %s 失败"
-#: sys-utils/switch_root.c:173
+#: sys-utils/switch_root.c:179
#, c-format
msgid "failed to mount moving %s to /"
msgstr "将 %s 挂载移动到 / 失败"
-#: sys-utils/switch_root.c:179
+#: sys-utils/switch_root.c:184
msgid "failed to change root"
msgstr "更改 root 失败"
-#: sys-utils/switch_root.c:192
+#: sys-utils/switch_root.c:203
msgid "old root filesystem is not an initramfs"
msgstr "旧根文件系统不是 initramfs 格式"
-#: sys-utils/switch_root.c:205
+#: sys-utils/switch_root.c:226
#, c-format
msgid " %s [options] <newrootdir> <init> <args to init>\n"
msgstr " %s [选项] <新根目录> <init 程序> <init 程序参数>\n"
-#: sys-utils/switch_root.c:209
+#: sys-utils/switch_root.c:230
msgid "Switch to another filesystem as the root of the mount tree.\n"
msgstr "切换到另一个文件系统作为挂载树的根目录。\n"
-#: sys-utils/switch_root.c:254
+#: sys-utils/switch_root.c:275
msgid "failed. Sorry."
msgstr "失败了。抱歉。"
-#: sys-utils/switch_root.c:257
+#: sys-utils/switch_root.c:278
#, c-format
msgid "cannot access %s"
msgstr "无法访问 %s"
msgid "%s using polling\n"
msgstr "%s 使用轮询\n"
-#: sys-utils/umount.c:81
+#: sys-utils/umount.c:82
#, c-format
msgid ""
" %1$s [-hV]\n"
" %1$s -a [选项]\n"
" %1$s [选项] <源> | <目录>\n"
-#: sys-utils/umount.c:87
+#: sys-utils/umount.c:88
msgid "Unmount filesystems.\n"
msgstr "卸载文件系统。\n"
-#: sys-utils/umount.c:90
+#: sys-utils/umount.c:91
msgid " -a, --all unmount all filesystems\n"
msgstr " -a, --all 卸载所有文件系统\n"
-#: sys-utils/umount.c:91
+#: sys-utils/umount.c:92
msgid ""
" -A, --all-targets unmount all mountpoints for the given device in the\n"
" current namespace\n"
" -A, --all-targets 卸载当前名字空间内指定设备\n"
" 对应的所有挂臷点\n"
-#: sys-utils/umount.c:93
+#: sys-utils/umount.c:94
msgid " -c, --no-canonicalize don't canonicalize paths\n"
msgstr " -c, --no-canonicalize 不对路径规范化\n"
-#: sys-utils/umount.c:94
+#: sys-utils/umount.c:95
msgid " -d, --detach-loop if mounted loop device, also free this loop device\n"
msgstr " -d, --detach-loop 若挂臷了回环设备，也释放该回环设备\n"
-#: sys-utils/umount.c:95
+#: sys-utils/umount.c:96
msgid " --fake dry run; skip the umount(2) syscall\n"
msgstr " --fake 空运行；跳过 umount(2) 系统调用\n"
-#: sys-utils/umount.c:96
+#: sys-utils/umount.c:97
msgid " -f, --force force unmount (in case of an unreachable NFS system)\n"
msgstr " -f, --force 强制卸载(遇到不响应的 NFS 系统时)\n"
-#: sys-utils/umount.c:97
+#: sys-utils/umount.c:98
msgid " -i, --internal-only don't call the umount.<type> helpers\n"
msgstr " -i, --internal-only 不调用 umount.<类型> 辅助程序\n"
-#: sys-utils/umount.c:99
+#: sys-utils/umount.c:100
msgid " -l, --lazy detach the filesystem now, clean up things later\n"
msgstr " -l, --lazy 立即断开文件系统，清理以后执行\n"
-#: sys-utils/umount.c:100
+#: sys-utils/umount.c:101
msgid " -O, --test-opts <list> limit the set of filesystems (use with -a)\n"
msgstr " -O, --test-opts <列表> 限制文件系统集合(和 -a 选项一起使用)\n"
-#: sys-utils/umount.c:101
+#: sys-utils/umount.c:102
msgid " -R, --recursive recursively unmount a target with all its children\n"
msgstr " -R, --recursive 递归卸载目录及其子对象\n"
-#: sys-utils/umount.c:102
+#: sys-utils/umount.c:103
msgid " -r, --read-only in case unmounting fails, try to remount read-only\n"
msgstr " -r, --read-only 若卸载失败，尝试以只读方式重新挂臷\n"
-#: sys-utils/umount.c:103
+#: sys-utils/umount.c:104
msgid " -t, --types <list> limit the set of filesystem types\n"
msgstr " -t, --types <列表> 限制文件系统集合\n"
-#: sys-utils/umount.c:105
+#: sys-utils/umount.c:106
msgid " -q, --quiet suppress 'not mounted' error messages\n"
msgstr " -q, --quiet 不要输出“未挂载”错误信息\n"
-#: sys-utils/umount.c:106
+#: sys-utils/umount.c:107
msgid " -N, --namespace <ns> perform umount in another namespace\n"
msgstr " -N, --namespace <ns> 在另一个命名空间进行卸载\n"
-#: sys-utils/umount.c:149
+#: sys-utils/umount.c:157
#, c-format
msgid "%s (%s) unmounted"
msgstr "%s (%s) 已卸载"
-#: sys-utils/umount.c:151
+#: sys-utils/umount.c:159
#, c-format
msgid "%s unmounted"
msgstr "%s 未挂载"
-#: sys-utils/umount.c:220
+#: sys-utils/umount.c:228
msgid "failed to set umount target"
msgstr "设置卸载目标失败"
-#: sys-utils/umount.c:253
+#: sys-utils/umount.c:261
msgid "libmount table allocation failed"
msgstr "libmount 表分配失败"
-#: sys-utils/umount.c:299 sys-utils/umount.c:381
+#: sys-utils/umount.c:307 sys-utils/umount.c:399
msgid "libmount iterator allocation failed"
msgstr "分配 libmount 迭代器失败！"
-#: sys-utils/umount.c:305
+#: sys-utils/umount.c:320
#, c-format
msgid "failed to get child fs of %s"
msgstr "获取 %s 的子文件系统失败"
-#: sys-utils/umount.c:344 sys-utils/umount.c:368
+#: sys-utils/umount.c:362 sys-utils/umount.c:386
#, c-format
msgid "%s: not found"
msgstr "%s：找不到"
-#: sys-utils/umount.c:375
+#: sys-utils/umount.c:393
#, c-format
msgid "%s: failed to determine source (--all-targets is unsupported on systems with regular mtab file)."
msgstr "%s：确定源失败(有常规 mtab 文件的系统不支持 --all-targets)"
msgid "mount %s on %s failed"
msgstr "将 %s 挂载到 %s 失败"
+#: sys-utils/unshare.c:208 text-utils/more.c:457
+#, c-format
+msgid "cannot stat %s"
+msgstr "无法 stat %s"
+
#: sys-utils/unshare.c:221
msgid "failed to open /proc/self/timens_offsets"
msgstr "打开 /proc/self/timens_offsets 失败"
msgstr "无法更改目录（chdir）到“%s”"
#: sys-utils/unshare.c:654
-#, c-format
-msgid "umount %s failed"
-msgstr "卸载 %s 失败"
+#, fuzzy, c-format
+#| msgid "cannot change root filesystem propagation"
+msgid "cannot change %s filesystem propagation"
+msgstr "无法更改根文件系统传播"
#: sys-utils/unshare.c:656
#, c-format
msgid "mount %s failed"
msgstr "挂载 %s 失败"
-#: sys-utils/unshare.c:682
+#: sys-utils/unshare.c:681
msgid "capget failed"
msgstr "capget 失败"
-#: sys-utils/unshare.c:690
+#: sys-utils/unshare.c:689
msgid "capset failed"
msgstr "capset 失败"
-#: sys-utils/unshare.c:702
+#: sys-utils/unshare.c:701
msgid "prctl(PR_CAP_AMBIENT) failed"
msgstr "prctl(PR_CAP_AMBIENT) 失败"
msgid "%s: failed to set disksize (%ju bytes)"
msgstr "%s：设置磁盘大小失败(%ju 个字节)"
-#: term-utils/agetty.c:492
+#: term-utils/agetty.c:496
#, c-format
msgid "%s%s (automatic login)\n"
msgstr "%s%s (自动登录)\n"
-#: term-utils/agetty.c:549
+#: term-utils/agetty.c:553
#, c-format
msgid "%s: can't change root directory %s: %m"
msgstr "%s：无法更改根目录 %s：%m"
-#: term-utils/agetty.c:552
+#: term-utils/agetty.c:556
#, c-format
msgid "%s: can't change working directory %s: %m"
msgstr "%s：无法更改工作目录 %s：%m"
-#: term-utils/agetty.c:555
+#: term-utils/agetty.c:559
#, c-format
msgid "%s: can't change process priority: %m"
msgstr "%s：无法更改进程优先级：%m"
-#: term-utils/agetty.c:566
+#: term-utils/agetty.c:570
#, c-format
msgid "%s: can't exec %s: %m"
msgstr "%s：无法执行 %s：%m"
-#: term-utils/agetty.c:597 term-utils/agetty.c:935 term-utils/agetty.c:1479
-#: term-utils/agetty.c:1497 term-utils/agetty.c:1534 term-utils/agetty.c:1544
-#: term-utils/agetty.c:1586 term-utils/agetty.c:1947 term-utils/agetty.c:2303
-#: term-utils/agetty.c:2864
+#: term-utils/agetty.c:601 term-utils/agetty.c:939 term-utils/agetty.c:1483
+#: term-utils/agetty.c:1501 term-utils/agetty.c:1538 term-utils/agetty.c:1548
+#: term-utils/agetty.c:1590 term-utils/agetty.c:1951 term-utils/agetty.c:2307
+#: term-utils/agetty.c:2868
#, c-format
msgid "failed to allocate memory: %m"
msgstr "分配内存失败：%m"
-#: term-utils/agetty.c:774
+#: term-utils/agetty.c:778
msgid "invalid delay argument"
msgstr "无效的延迟参数"
-#: term-utils/agetty.c:812
+#: term-utils/agetty.c:816
msgid "invalid argument of --local-line"
msgstr "--local-line 选项参数无效"
-#: term-utils/agetty.c:831
+#: term-utils/agetty.c:835
msgid "invalid nice argument"
msgstr "无效的 nice 参数"
-#: term-utils/agetty.c:940
+#: term-utils/agetty.c:944
#, c-format
msgid "bad speed: %s"
msgstr "速度有误：%s"
-#: term-utils/agetty.c:942
+#: term-utils/agetty.c:946
msgid "too many alternate speeds"
msgstr "备选速度过多"
-#: term-utils/agetty.c:1049 term-utils/agetty.c:1053 term-utils/agetty.c:1106
+#: term-utils/agetty.c:1053 term-utils/agetty.c:1057 term-utils/agetty.c:1110
#, c-format
msgid "/dev/%s: cannot open as standard input: %m"
msgstr "/dev/%s：无法以标准输入打开：%m"
-#: term-utils/agetty.c:1072
+#: term-utils/agetty.c:1076
#, c-format
msgid "/dev/%s: not a character device"
msgstr "/dev/%s：不是字符设备"
-#: term-utils/agetty.c:1074
+#: term-utils/agetty.c:1078
#, c-format
msgid "/dev/%s: not a tty"
msgstr "/dev/%s：不是终端"
-#: term-utils/agetty.c:1078 term-utils/agetty.c:1110
+#: term-utils/agetty.c:1082 term-utils/agetty.c:1114
#, c-format
msgid "/dev/%s: cannot get controlling tty: %m"
msgstr "/dev/%s：无法获取控制 tty：%m"
-#: term-utils/agetty.c:1100
+#: term-utils/agetty.c:1104
#, c-format
msgid "/dev/%s: vhangup() failed: %m"
msgstr "/dev/%s：vhangup() 失败：%m"
-#: term-utils/agetty.c:1121
+#: term-utils/agetty.c:1125
#, c-format
msgid "%s: not open for read/write"
msgstr "%s：未打开(就)读/写"
-#: term-utils/agetty.c:1126
+#: term-utils/agetty.c:1130
#, c-format
msgid "/dev/%s: cannot set process group: %m"
msgstr "/dev/%s：无法设置进程组：%m"
-#: term-utils/agetty.c:1140
+#: term-utils/agetty.c:1144
#, c-format
msgid "%s: dup problem: %m"
msgstr "%s：dup 问题：%m"
-#: term-utils/agetty.c:1157
+#: term-utils/agetty.c:1161
#, c-format
msgid "%s: failed to get terminal attributes: %m"
msgstr "%s：获取终端属性失败：%m"
-#: term-utils/agetty.c:1376 term-utils/agetty.c:1405
+#: term-utils/agetty.c:1380 term-utils/agetty.c:1409
#, c-format
msgid "setting terminal attributes failed: %m"
msgstr "设置终端属性失败：%m"
-#: term-utils/agetty.c:1524
+#: term-utils/agetty.c:1528
msgid "cannot open os-release file"
msgstr "无法打开 os-release 文件"
-#: term-utils/agetty.c:1691
+#: term-utils/agetty.c:1695
#, c-format
msgid "failed to create reload file: %s: %m"
msgstr "未能创建 reload 文件︰%s：%m"
-#: term-utils/agetty.c:2011
+#: term-utils/agetty.c:2015
#, c-format
msgid "failed to get terminal attributes: %m"
msgstr "获取终端属性失败：%m"
-#: term-utils/agetty.c:2033
+#: term-utils/agetty.c:2037
msgid "[press ENTER to login]"
msgstr "[按 ENTER 键登录]"
-#: term-utils/agetty.c:2060
+#: term-utils/agetty.c:2064
msgid "Num Lock off"
msgstr "Num Lock 关"
-#: term-utils/agetty.c:2063
+#: term-utils/agetty.c:2067
msgid "Num Lock on"
msgstr "Num Lock 开"
-#: term-utils/agetty.c:2066
+#: term-utils/agetty.c:2070
msgid "Caps Lock on"
msgstr "Caps Lock 开"
-#: term-utils/agetty.c:2069
+#: term-utils/agetty.c:2073
msgid "Scroll Lock on"
msgstr "Scroll Lock 开"
-#: term-utils/agetty.c:2072
+#: term-utils/agetty.c:2076
#, c-format
msgid ""
"Hint: %s\n"
"提示：%s\n"
"\n"
-#: term-utils/agetty.c:2214
+#: term-utils/agetty.c:2218
#, c-format
msgid "%s: read: %m"
msgstr "%s：read：%m"
-#: term-utils/agetty.c:2279
+#: term-utils/agetty.c:2283
#, c-format
msgid "%s: input overrun"
msgstr "%s：输入过载"
-#: term-utils/agetty.c:2299 term-utils/agetty.c:2307
+#: term-utils/agetty.c:2303 term-utils/agetty.c:2311
#, c-format
msgid "%s: invalid character conversion for login name"
msgstr "%s：登录名字符转换无效"
-#: term-utils/agetty.c:2313
+#: term-utils/agetty.c:2317
#, c-format
msgid "%s: invalid character 0x%x in login name"
msgstr "%s：登录名中的字符 0x%x 无效"
-#: term-utils/agetty.c:2398
+#: term-utils/agetty.c:2402
#, c-format
msgid "%s: failed to set terminal attributes: %m"
msgstr "%s：设置终端属性失败：%m"
-#: term-utils/agetty.c:2436
+#: term-utils/agetty.c:2440
#, c-format
msgid ""
" %1$s [options] <line> [<baud_rate>,...] [<termtype>]\n"
" %1$s [选项] <线路> [<波特率>,...] [<终端类型>]\n"
" %1$s [选项] <波特率>,... <线路> [<终端类型>]\n"
-#: term-utils/agetty.c:2440
+#: term-utils/agetty.c:2444
msgid "Open a terminal and set its mode.\n"
msgstr "打开一个终端并设置其模式。\n"
-#: term-utils/agetty.c:2443
+#: term-utils/agetty.c:2447
msgid " -8, --8bits assume 8-bit tty\n"
msgstr " -8, --8bits 采用 8 位 tty\n"
-#: term-utils/agetty.c:2444
+#: term-utils/agetty.c:2448
msgid " -a, --autologin <user> login the specified user automatically\n"
msgstr " -a, --autologin <用户> 以指定用户自动登录\n"
-#: term-utils/agetty.c:2445
+#: term-utils/agetty.c:2449
msgid " -c, --noreset do not reset control mode\n"
msgstr " -c, --noreset 不重置控制模式\n"
-#: term-utils/agetty.c:2446
+#: term-utils/agetty.c:2450
msgid " -E, --remote use -r <hostname> for login(1)\n"
msgstr " -E, --remote 使用 -r <主机名> 选项调用 login(1)\n"
-#: term-utils/agetty.c:2447
+#: term-utils/agetty.c:2451
#, fuzzy
msgid " -f, --issue-file <list> display issue files or directories\n"
msgstr " -f, --issue-file <文件> 指定要显示的预登录消息(issue)文件\n"
-#: term-utils/agetty.c:2448
+#: term-utils/agetty.c:2452
msgid " --show-issue display issue file and exit\n"
msgstr " --show-issue 显示预登录（issue）文件并退出\n"
-#: term-utils/agetty.c:2449
+#: term-utils/agetty.c:2453
msgid " -h, --flow-control enable hardware flow control\n"
msgstr " -h, --flow-control 启用硬件流控制\n"
-#: term-utils/agetty.c:2450
+#: term-utils/agetty.c:2454
msgid " -H, --host <hostname> specify login host\n"
msgstr " -H, --host <主机名> 指定登录主机\n"
-#: term-utils/agetty.c:2451
+#: term-utils/agetty.c:2455
msgid " -i, --noissue do not display issue file\n"
msgstr " -i, --noissue 不显示预登录消息(issue)文件\n"
-#: term-utils/agetty.c:2452
+#: term-utils/agetty.c:2456
msgid " -I, --init-string <string> set init string\n"
msgstr " -I, --init-string <字符串> 设置初始字符串\n"
-#: term-utils/agetty.c:2453
+#: term-utils/agetty.c:2457
msgid " -J --noclear do not clear the screen before prompt\n"
msgstr " -J --noclear 提示之前不清屏\n"
-#: term-utils/agetty.c:2454
+#: term-utils/agetty.c:2458
msgid " -l, --login-program <file> specify login program\n"
msgstr " -l, --login-program <文件> 指定登录程序\n"
-#: term-utils/agetty.c:2455
+#: term-utils/agetty.c:2459
msgid " -L, --local-line[=<mode>] control the local line flag\n"
msgstr " -L, --local-line[=<模式>] 控制本地线路标志\n"
-#: term-utils/agetty.c:2456
+#: term-utils/agetty.c:2460
msgid " -m, --extract-baud extract baud rate during connect\n"
msgstr " -m, --extract-baud 连接过程中提取波特率\n"
-#: term-utils/agetty.c:2457
+#: term-utils/agetty.c:2461
msgid " -n, --skip-login do not prompt for login\n"
msgstr " -n, --skip-login 不提示登录\n"
-#: term-utils/agetty.c:2458
+#: term-utils/agetty.c:2462
msgid " -N --nonewline do not print a newline before issue\n"
msgstr " -N --nonewline 预登录消息(issue)前不打印换行(newline)\n"
-#: term-utils/agetty.c:2459
+#: term-utils/agetty.c:2463
msgid " -o, --login-options <opts> options that are passed to login\n"
msgstr " -o, --login-options <选项> 传递给登录程序的选项\n"
-#: term-utils/agetty.c:2460
+#: term-utils/agetty.c:2464
msgid " -p, --login-pause wait for any key before the login\n"
msgstr " -p, --login-pause 登录前等待按下任意键来继续\n"
-#: term-utils/agetty.c:2461
+#: term-utils/agetty.c:2465
msgid " -r, --chroot <dir> change root to the directory\n"
msgstr " -r, --chroot <目录> 将根目录更改为指定目录\n"
-#: term-utils/agetty.c:2462
+#: term-utils/agetty.c:2466
msgid " -R, --hangup do virtually hangup on the tty\n"
msgstr " -R, --hangup 对 tty 执行虚拟挂起(virtual hangup)\n"
-#: term-utils/agetty.c:2463
+#: term-utils/agetty.c:2467
msgid " -s, --keep-baud try to keep baud rate after break\n"
msgstr " -s, --keep-baud 中断(break)后尝试保持波特率\n"
-#: term-utils/agetty.c:2464
+#: term-utils/agetty.c:2468
msgid " -t, --timeout <number> login process timeout\n"
msgstr " -t, --timeout <数字> 登录进程超时(秒)\n"
-#: term-utils/agetty.c:2465
+#: term-utils/agetty.c:2469
msgid " -U, --detect-case detect uppercase terminal\n"
msgstr " -U, --detect-case 检测纯大写终端\n"
-#: term-utils/agetty.c:2466
+#: term-utils/agetty.c:2470
msgid " -w, --wait-cr wait carriage-return\n"
msgstr " -w, --wait-cr 等待回车\n"
-#: term-utils/agetty.c:2467
+#: term-utils/agetty.c:2471
msgid " --nohints do not print hints\n"
msgstr " --nohints 不打印提示信息\n"
-#: term-utils/agetty.c:2468
+#: term-utils/agetty.c:2472
msgid " --nohostname no hostname at all will be shown\n"
msgstr " --nohostname 将完全不显示主机名\n"
-#: term-utils/agetty.c:2469
+#: term-utils/agetty.c:2473
msgid " --long-hostname show full qualified hostname\n"
msgstr " --long-hostname 显示完全限定主机名\n"
-#: term-utils/agetty.c:2470
+#: term-utils/agetty.c:2474
msgid " --erase-chars <string> additional backspace chars\n"
msgstr " --erase-chars <字符串> 附加的退格字符\n"
-#: term-utils/agetty.c:2471
+#: term-utils/agetty.c:2475
msgid " --kill-chars <string> additional kill chars\n"
msgstr " --kill-chars <字符串> 附加的杀死(kill)字符\n"
-#: term-utils/agetty.c:2472
+#: term-utils/agetty.c:2476
msgid " --chdir <directory> chdir before the login\n"
msgstr " --chdir <目录> 登录前切换目录(chdir)\n"
-#: term-utils/agetty.c:2473
+#: term-utils/agetty.c:2477
msgid " --delay <number> sleep seconds before prompt\n"
msgstr " --delay <数字> 提示前睡眠的秒数\n"
-#: term-utils/agetty.c:2474
+#: term-utils/agetty.c:2478
msgid " --nice <number> run login with this priority\n"
msgstr " --nice <数字> 以指定优先级运行 login\n"
-#: term-utils/agetty.c:2475
+#: term-utils/agetty.c:2479
msgid " --reload reload prompts on running agetty instances\n"
msgstr " --reload 在运行 agetty 实例时重新载入提示\n"
-#: term-utils/agetty.c:2476
+#: term-utils/agetty.c:2480
msgid " --list-speeds display supported baud rates\n"
msgstr " --list-speeds 显示支持的波特率\n"
-#: term-utils/agetty.c:2821
+#: term-utils/agetty.c:2825
#, c-format
msgid "%d user"
msgid_plural "%d users"
msgstr[0] "%d 位用户"
-#: term-utils/agetty.c:2952
+#: term-utils/agetty.c:2956
#, c-format
msgid "checkname failed: %m"
msgstr "checkname 失败：%m"
-#: term-utils/agetty.c:2964
+#: term-utils/agetty.c:2968
#, c-format
msgid "cannot touch file %s"
msgstr "无法 touch 文件 %s"
-#: term-utils/agetty.c:2968
+#: term-utils/agetty.c:2972
msgid "--reload is unsupported on your system"
msgstr "您的系统不支持 --reload"
msgid "ttyname() failed, attempting to go around using: %s"
msgstr "ttyname() 失败，尝试使用其它命令绕过：%s"
-#: term-utils/mesg.c:150
+#: term-utils/mesg.c:146
msgid "is y"
msgstr "是 y"
-#: term-utils/mesg.c:153
+#: term-utils/mesg.c:149
msgid "is n"
msgstr "是 n"
-#: term-utils/mesg.c:164 term-utils/mesg.c:171
+#: term-utils/mesg.c:165 term-utils/mesg.c:172
#, c-format
msgid "change %s mode failed"
msgstr "更改 %s 模式失败"
-#: term-utils/mesg.c:166
+#: term-utils/mesg.c:167
msgid "write access to your terminal is allowed"
msgstr "对您的终端的写访问已被允许"
-#: term-utils/mesg.c:173
+#: term-utils/mesg.c:174
msgid "write access to your terminal is denied"
msgstr "对您的终端的写访问已被拒绝"
msgstr " --force 强制使用指定输出文件，无论目标文件是链接与否\n"
#: term-utils/script.c:211
-msgid " -E, --echo <when> echo input (auto, always or never)\n"
+#, fuzzy
+msgid " -E, --echo <when> echo input in session (auto, always or never)\n"
msgstr " -E, --echo <时机> 回显输入（, always 或 never）\n"
#: term-utils/script.c:212
"\n"
"脚本完成于 %s [COMMAND_EXIT_CODE=\"%d\"]\n"
-#: term-utils/script.c:394
+#: term-utils/script.c:395
#, c-format
msgid "Script started on %s ["
msgstr "脚本启动于 %s ["
-#: term-utils/script.c:406
+#: term-utils/script.c:407
#, c-format
msgid "<not executed on terminal>"
msgstr "<未在终端上执行>"
"如果真想用它，使用 --force 选项。\n"
"程序没有启动。"
-#: term-utils/script.c:827
+#: term-utils/script.c:822
#, c-format
msgid "unssuported echo mode: '%s'"
msgstr "不支持的回显模式：“%s”"
-#: term-utils/script.c:852
+#: term-utils/script.c:847
msgid "failed to parse output limit size"
msgstr "解析输出大小限制失败"
-#: term-utils/script.c:863
+#: term-utils/script.c:858
#, fuzzy, c-format
msgid "unsupported logging format: '%s'"
msgstr "不支持的日志格式：“%s”"
-#: term-utils/script.c:907
+#: term-utils/script.c:902
msgid "log multiple streams is mutually exclusive with 'classic' format"
msgstr "无法在使用“classic”（经典）格式时同时记录多个流"
-#: term-utils/script.c:934
+#: term-utils/script.c:929
#, c-format
msgid "Script started"
msgstr "脚本已启动"
-#: term-utils/script.c:936
+#: term-utils/script.c:931
#, c-format
msgid ", output log file is '%s'"
msgstr "，输出日志文件为“%s”"
-#: term-utils/script.c:938
+#: term-utils/script.c:933
#, c-format
msgid ", input log file is '%s'"
msgstr "，输入日志文件为“%s”"
-#: term-utils/script.c:940
+#: term-utils/script.c:935
#, c-format
msgid ", timing file is '%s'"
msgstr "，时序文件为“%s”"
-#: term-utils/script.c:941
+#: term-utils/script.c:936
#, c-format
msgid ".\n"
msgstr "。\n"
-#: term-utils/script.c:1047
+#: term-utils/script.c:1042
#, c-format
msgid "Script done.\n"
msgstr "脚本已完成。\n"
msgid "Execute terminal typescript.\n"
msgstr "执行终端打字稿（typescript）。\n"
-#: term-utils/scriptlive.c:67 term-utils/scriptreplay.c:56
+#: term-utils/scriptlive.c:67 term-utils/scriptreplay.c:57
msgid " -t, --timing <file> script timing log file\n"
msgstr " -t, --timing <文件> script timing log file\n"
-#: term-utils/scriptlive.c:68 term-utils/scriptreplay.c:57
+#: term-utils/scriptlive.c:68 term-utils/scriptreplay.c:58
msgid " -T, --log-timing <file> alias to -t\n"
msgstr " -T, --log-timing <文件> 等效于 -t\n"
-#: term-utils/scriptlive.c:69 term-utils/scriptreplay.c:58
+#: term-utils/scriptlive.c:69 term-utils/scriptreplay.c:59
#, fuzzy
msgid " -I, --log-in <file> script stdin log file\n"
msgstr " -I, --log-in <文件> 脚本标准输入日志文件\n"
-#: term-utils/scriptlive.c:70 term-utils/scriptreplay.c:60
+#: term-utils/scriptlive.c:70 term-utils/scriptreplay.c:61
msgid " -B, --log-io <file> script stdin and stdout log file\n"
msgstr ""
msgid " -c, --command <command> run command rather than interactive shell\n"
msgstr " -c, --command <命令> 通过 shell 运行单个命令字符串\n"
-#: term-utils/scriptlive.c:74 term-utils/scriptreplay.c:66
+#: term-utils/scriptlive.c:74 term-utils/scriptreplay.c:67
msgid " -d, --divisor <num> speed up or slow down execution with time divisor\n"
msgstr ""
-#: term-utils/scriptlive.c:75 term-utils/scriptreplay.c:67
+#: term-utils/scriptlive.c:75 term-utils/scriptreplay.c:68
#, fuzzy
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:212
+#: term-utils/scriptlive.c:226 term-utils/scriptreplay.c:233
#, fuzzy
msgid "failed to parse maximal delay argument"
msgstr "解析参数失败"
-#: term-utils/scriptlive.c:249 term-utils/scriptreplay.c:253
+#: term-utils/scriptlive.c:249 term-utils/scriptreplay.c:274
msgid "timing file not specified"
msgstr "未指定时序文件"
">>> scriptlive: done.\n"
msgstr ""
-#: term-utils/scriptreplay.c:49
+#: term-utils/scriptreplay.c:50
#, c-format
msgid " %s [-t] timingfile [typescript] [divisor]\n"
msgstr " %s [-t] timingfile [typescript] [divisor]\n"
-#: term-utils/scriptreplay.c:53
+#: term-utils/scriptreplay.c:54
msgid "Play back terminal typescripts, using timing information.\n"
msgstr "使用定时信息回话终端 typescript。\n"
-#: term-utils/scriptreplay.c:59
+#: term-utils/scriptreplay.c:60
msgid " -O, --log-out <file> script stdout log file (default)\n"
msgstr ""
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:63
msgid " -s, --typescript <file> deprecated alias to -O\n"
msgstr " -s, --typescript <文件> 已不建议使用的 -O 的别名\n"
-#: term-utils/scriptreplay.c:65
+#: term-utils/scriptreplay.c:66
#, fuzzy
msgid " --summary display overview about recorded session and exit\n"
msgstr " -V 显示版本信息并退出\n"
-#: term-utils/scriptreplay.c:68
+#: term-utils/scriptreplay.c:69
msgid " -x, --stream <name> stream type (out, in, signal or info)\n"
msgstr " -x, --stream <name> 流类型（out, in, signal 或 info）\n"
-#: term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:70
msgid " -c, --cr-mode <type> CR char mode (auto, never, always)\n"
msgstr " -c, --cr-mode <类型> CR 字符模式（auto, never, always）\n"
-#: term-utils/scriptreplay.c:191
+#: term-utils/scriptreplay.c:131
+#, fuzzy
+msgid "unexpected tcgetattr failure"
+msgstr "tcgetattr 失败"
+
+#: term-utils/scriptreplay.c:212
#, c-format
msgid "unsupported mode name: '%s'"
msgstr "不支持的模式名称：“%s”"
-#: term-utils/scriptreplay.c:224
+#: term-utils/scriptreplay.c:245
#, c-format
msgid "unsupported stream name: '%s'"
msgstr "不支持的流名称：“%s”"
-#: term-utils/scriptreplay.c:255
+#: term-utils/scriptreplay.c:276
msgid "data log file not specified"
msgstr "未指定数据日志文件"
-#: term-utils/scriptreplay.c:304
+#: term-utils/scriptreplay.c:330
#, c-format
msgid "%s: log file error"
msgstr "%s：日志文件错误"
-#: term-utils/scriptreplay.c:306
+#: term-utils/scriptreplay.c:332
#, c-format
msgid "%s: line %d: timing file error"
msgstr "%s：行 %d：时序文件错误"
msgid "%s has messages disabled on %s"
msgstr "%s 在 %s 上禁用了消息"
-#: text-utils/col.c:135
-msgid "Filter out reverse line feeds.\n"
+#: text-utils/col.c:174
+#, fuzzy
+msgid "Filter out reverse line feeds from standard input.\n"
msgstr "过滤反换行。\n"
-#: text-utils/col.c:138
+#: text-utils/col.c:177
#, c-format
msgid ""
"\n"
" -x, --spaces 将制表符转换为空格\n"
" -l, --lines NUM 缓冲至少 NUM 行\n"
-#: text-utils/col.c:151 text-utils/colrm.c:69
-#, c-format
-msgid ""
-"%s reads from standard input and writes to standard output\n"
-"\n"
-msgstr ""
-"%s 读取标准输入并写入标准输出\n"
-"\n"
-
-#: text-utils/col.c:215
-msgid "bad -l argument"
-msgstr "-l 参数有误"
-
-#: text-utils/col.c:246
-#, c-format
-msgid "failed on line %d"
-msgstr "在 %d 行失败"
-
-#: text-utils/col.c:344
+#: text-utils/col.c:496
#, c-format
msgid "warning: can't back up %s."
msgstr "警告：无法备份 %s。"
-#: text-utils/col.c:345
+#: text-utils/col.c:498
msgid "past first line"
msgstr "越过第一行"
-#: text-utils/col.c:345
+#: text-utils/col.c:499
msgid "-- line already flushed"
msgstr "-- 行已经被冲洗(flushed)"
-#: text-utils/colcrt.c:82 text-utils/column.c:626
+#: text-utils/col.c:565
+msgid "bad -l argument"
+msgstr "-l 参数有误"
+
+#: text-utils/colcrt.c:82 text-utils/column.c:663
#, c-format
msgid " %s [options] [<file>...]\n"
msgstr " %s [选项] [<文件>...]\n"
msgid "Filter out the specified columns.\n"
msgstr "过滤指定列。\n"
+#: text-utils/colrm.c:69
+#, c-format
+msgid ""
+"%s reads from standard input and writes to standard output\n"
+"\n"
+msgstr ""
+"%s 读取标准输入并写入标准输出\n"
+"\n"
+
#: text-utils/colrm.c:184
msgid "first argument"
msgstr "第一个参数"
msgid "second argument"
msgstr "第二个参数"
-#: text-utils/column.c:235
+#: text-utils/column.c:236
msgid "failed to parse column"
msgstr "解析列失败"
-#: text-utils/column.c:245
+#: text-utils/column.c:246
#, c-format
msgid "undefined column name '%s'"
msgstr "未定义的列名称“%s”"
-#: text-utils/column.c:321
+#: text-utils/column.c:336
msgid "failed to parse --table-order list"
msgstr "解析 --table-order 列表失败"
-#: text-utils/column.c:397
+#: text-utils/column.c:412
msgid "failed to parse --table-right list"
msgstr "解析 --table-right 列表失败"
-#: text-utils/column.c:401
+#: text-utils/column.c:416
msgid "failed to parse --table-trunc list"
msgstr "解析 --table-trunc 列表失败"
-#: text-utils/column.c:405
+#: text-utils/column.c:420
msgid "failed to parse --table-noextreme list"
msgstr "解析 --table-noextreme 列表失败"
-#: text-utils/column.c:409
+#: text-utils/column.c:424
msgid "failed to parse --table-wrap list"
msgstr "解析 --table-wrap 列表失败"
-#: text-utils/column.c:413
+#: text-utils/column.c:428
msgid "failed to parse --table-hide list"
msgstr "解析 --table-hide 列表失败"
-#: text-utils/column.c:444
+#: text-utils/column.c:465
#, c-format
msgid "line %zu: for JSON the name of the column %zu is required"
msgstr ""
-#: text-utils/column.c:458
+#: text-utils/column.c:481
msgid "failed to allocate output data"
msgstr "分配输出数据失败"
-#: text-utils/column.c:629
+#: text-utils/column.c:666
msgid "Columnate lists.\n"
msgstr "成列输出内容。\n"
-#: text-utils/column.c:632
+#: text-utils/column.c:669
msgid " -t, --table create a table\n"
msgstr " -t, --table 创建表格\n"
-#: text-utils/column.c:633
+#: text-utils/column.c:670
#, fuzzy
msgid " -n, --table-name <name> table name for JSON output\n"
msgstr " -n, --name <progname> 要报告其错误的程序名称\n"
-#: text-utils/column.c:634
+#: text-utils/column.c:671
#, fuzzy
msgid " -O, --table-order <columns> specify order of output columns\n"
msgstr " -x, --sort <列> 按<列>对输出排序\n"
-#: text-utils/column.c:635
+#: text-utils/column.c:672
#, fuzzy
msgid " -N, --table-columns <names> comma separated columns names\n"
msgstr " -o, --options <列表> 以英文逗号分隔的 swap 选项\n"
-#: text-utils/column.c:636
+#: text-utils/column.c:673
+#, fuzzy
+msgid " -l, --table-columns-limit <num> maximal number of input columns\n"
+msgstr " -t, --streams <数字> 压缩流数量\n"
+
+#: text-utils/column.c:674
msgid " -E, --table-noextreme <columns> don't count long text from the columns to column width\n"
msgstr ""
-#: text-utils/column.c:637
+#: text-utils/column.c:675
#, fuzzy
msgid " -d, --table-noheadings don't print header\n"
msgstr " -n, --noheadings 不打印标题\n"
-#: text-utils/column.c:638
+#: text-utils/column.c:676
msgid " -e, --table-header-repeat repeat header for each page\n"
msgstr ""
-#: text-utils/column.c:639
+#: text-utils/column.c:677
#, fuzzy
msgid " -H, --table-hide <columns> don't print the columns\n"
msgstr " -n, --noheadings 不打印列标题\n"
-#: text-utils/column.c:640
+#: text-utils/column.c:678
msgid " -R, --table-right <columns> right align text in these columns\n"
msgstr ""
-#: text-utils/column.c:641
+#: text-utils/column.c:679
#, fuzzy
msgid " -T, --table-truncate <columns> truncate text in the columns when necessary\n"
msgstr " -u, --notruncate 不截断列中的文本\n"
-#: text-utils/column.c:642
+#: text-utils/column.c:680
msgid " -W, --table-wrap <columns> wrap text in the columns when necessary\n"
msgstr ""
-#: text-utils/column.c:643
-msgid " -L, --table-empty-lines don't ignore empty lines\n"
+#: text-utils/column.c:681
+#, fuzzy
+msgid " -L, --keep-empty-lines don't ignore empty lines\n"
msgstr " -L, --table-empty-lines 不要忽略空行\n"
-#: text-utils/column.c:644
+#: text-utils/column.c:682
#, fuzzy
msgid " -J, --json use JSON output format for table\n"
msgstr " -J, --json 使用 JSON --list 输出格式\n"
-#: text-utils/column.c:647
+#: text-utils/column.c:685
#, fuzzy
msgid " -r, --tree <column> column to use tree-like output for the table\n"
msgstr " -O, --output <列> 指定 --list 选项要输出的列\n"
-#: text-utils/column.c:648
+#: text-utils/column.c:686
#, fuzzy
msgid " -i, --tree-id <column> line ID to specify child-parent relation\n"
msgstr " -i, --irq <数字> 指定并口中断号\n"
-#: text-utils/column.c:649
+#: text-utils/column.c:687
#, fuzzy
msgid " -p, --tree-parent <column> parent to specify child-parent relation\n"
msgstr " -N, --partno <数字> 指定分区号\n"
-#: text-utils/column.c:652
+#: text-utils/column.c:690
#, fuzzy
msgid " -c, --output-width <width> width of output in number of characters\n"
msgstr " -c, --columns <宽度> 输出宽度(字符数)\n"
-#: text-utils/column.c:653
+#: text-utils/column.c:691
#, fuzzy
msgid " -o, --output-separator <string> columns separator for table output (default is two spaces)\n"
msgstr ""
" -o, --output-separator <字符串>\n"
" 表格输出列分隔符，默认为两个空格\n"
-#: text-utils/column.c:654
+#: text-utils/column.c:692
#, fuzzy
msgid " -s, --separator <string> possible table delimiters\n"
msgstr " -s, --separator <字符串> 可用的表格分隔符\n"
-#: text-utils/column.c:655
+#: text-utils/column.c:693
#, fuzzy
msgid " -x, --fillrows fill rows before columns\n"
msgstr " -x, --fillrows 先填充行，再填充列\n"
-#: text-utils/column.c:724
+#: text-utils/column.c:764
msgid "invalid columns argument"
msgstr "无效的 列数 参数"
-#: text-utils/column.c:749
+#: text-utils/column.c:789
+#, fuzzy
+msgid "invalid columns limit argument"
+msgstr "无效的 列数 参数"
+
+#: text-utils/column.c:791
+msgid "columns limit must be greater than zero"
+msgstr ""
+
+#: text-utils/column.c:794
msgid "failed to parse column names"
msgstr "解析列名称失败"
-#: text-utils/column.c:804
+#: text-utils/column.c:849
msgid "options --tree-id and --tree-parent are required for tree formatting"
msgstr ""
-#: text-utils/column.c:812
+#: text-utils/column.c:857
msgid "option --table required for all --table-*"
msgstr "所有 --table-* 均需要 --table 选项"
-#: text-utils/column.c:815
+#: text-utils/column.c:860
msgid "option --table-columns required for --json"
msgstr "使用 --json 需要 --table-columns 选项"
-#: text-utils/hexdump.c:155 text-utils/more.c:234
+#: text-utils/hexdump.c:162 text-utils/more.c:235
#, c-format
msgid " %s [options] <file>...\n"
msgstr " %s [选项] <文件>...\n"
-#: text-utils/hexdump.c:158
+#: text-utils/hexdump.c:165
msgid "Display file contents in hexadecimal, decimal, octal, or ascii.\n"
msgstr "以十六进制、十进制、八进制、二进制或 ascii 显示文件内容。\n"
-#: text-utils/hexdump.c:161
+#: text-utils/hexdump.c:168
msgid " -b, --one-byte-octal one-byte octal display\n"
msgstr " -b, --one-byte-octal 单字节八进制显示\n"
-#: text-utils/hexdump.c:162
+#: text-utils/hexdump.c:169
msgid " -c, --one-byte-char one-byte character display\n"
msgstr " -c, --one-byte-char 单字节字符显示\n"
-#: text-utils/hexdump.c:163
+#: text-utils/hexdump.c:170
msgid " -C, --canonical canonical hex+ASCII display\n"
msgstr " -C, --canonical 规范化 hex+ASCII 显示\n"
-#: text-utils/hexdump.c:164
+#: text-utils/hexdump.c:171
msgid " -d, --two-bytes-decimal two-byte decimal display\n"
msgstr " -d, --two-bytes-decimal 双字节十进制显示\n"
-#: text-utils/hexdump.c:165
+#: text-utils/hexdump.c:172
msgid " -o, --two-bytes-octal two-byte octal display\n"
msgstr " -o, --two-bytes-octal 双字节八进制显示\n"
-#: text-utils/hexdump.c:166
+#: text-utils/hexdump.c:173
msgid " -x, --two-bytes-hex two-byte hexadecimal display\n"
msgstr " -x, --two-bytes-hex 双字节十六进制显示\n"
-#: text-utils/hexdump.c:167
+#: text-utils/hexdump.c:174
msgid " -L, --color[=<mode>] interpret color formatting specifiers\n"
msgstr " -L, --color[=<模式>] 解释颜色格式化限定符\n"
-#: text-utils/hexdump.c:170
+#: text-utils/hexdump.c:177
msgid " -e, --format <format> format string to be used for displaying data\n"
msgstr " -e, --format <格式> 用于显示数据的格式化字符串\n"
-#: text-utils/hexdump.c:171
+#: text-utils/hexdump.c:178
msgid " -f, --format-file <file> file that contains format strings\n"
msgstr " -f, --format-file <文件> 包含格式字符串的文件\n"
-#: text-utils/hexdump.c:172
+#: text-utils/hexdump.c:179
msgid " -n, --length <length> interpret only length bytes of input\n"
msgstr " -n, --length <长度> 只解释规定字节长度的输入\n"
-#: text-utils/hexdump.c:173
+#: text-utils/hexdump.c:180
msgid " -s, --skip <offset> skip offset bytes from the beginning\n"
msgstr " -s, --skip <偏移> 跳过开头的指定字节偏移\n"
-#: text-utils/hexdump.c:174
+#: text-utils/hexdump.c:181
msgid " -v, --no-squeezing output identical lines\n"
msgstr " -v, --no-squeezing 输出相同的行\n"
-#: text-utils/hexdump.c:180
+#: text-utils/hexdump.c:187
msgid "<length> and <offset>"
msgstr ""
msgid "Read one line.\n"
msgstr "读一行内容。\n"
-#: text-utils/more.c:237
+#: text-utils/more.c:238
#, fuzzy
msgid "A file perusal filter for CRT viewing."
msgstr "适合屏幕查看的文件阅读输出工具。\n"
-#: text-utils/more.c:240
+#: text-utils/more.c:241
#, fuzzy
msgid " -d, --silent display help instead of ringing bell"
msgstr " -d 显示帮助而非响铃\n"
-#: text-utils/more.c:241
+#: text-utils/more.c:242
#, fuzzy
msgid " -f, --logical count logical rather than screen lines"
msgstr " -f 计算逻辑行数，而非屏幕行数\n"
-#: text-utils/more.c:242
+#: text-utils/more.c:243
#, fuzzy
msgid " -l, --no-pause suppress pause after form feed"
msgstr " -l 屏蔽换页(form feed)后的暂停\n"
-#: text-utils/more.c:243
+#: text-utils/more.c:244
#, fuzzy
msgid " -c, --print-over do not scroll, display text and clean line ends"
msgstr " -c 不滚动，显示文本并清理行末\n"
-#: text-utils/more.c:244
+#: text-utils/more.c:245
#, fuzzy
msgid " -p, --clean-print do not scroll, clean screen and display text"
msgstr " -p 不滚动，清除屏幕并显示文本\n"
-#: text-utils/more.c:245
+#: text-utils/more.c:246
#, fuzzy
msgid " -s, --squeeze squeeze multiple blank lines into one"
msgstr " -s 将多行空行压缩为一行\n"
-#: text-utils/more.c:246
+#: text-utils/more.c:247
#, fuzzy
msgid " -u, --plain suppress underlining and bold"
msgstr " -u 屏蔽下划线\n"
-#: text-utils/more.c:247
+#: text-utils/more.c:248
#, fuzzy
msgid " -n, --lines <number> the number of lines per screenful"
msgstr " -<数字> 每屏的行数\n"
-#: text-utils/more.c:248
+#: text-utils/more.c:249
#, fuzzy
msgid " -<number> same as --lines"
msgstr " -<数字> 同“-n <数字>”\n"
-#: text-utils/more.c:249
+#: text-utils/more.c:250
#, fuzzy
msgid " +<number> display file beginning from line number"
msgstr " +<数字> 从指定行开始显示文件\n"
-#: text-utils/more.c:250
+#: text-utils/more.c:251
#, fuzzy
msgid " +/<pattern> display file beginning from pattern match"
msgstr " +/<字符串> 从匹配搜索字符串的位置开始显示文件\n"
-#: text-utils/more.c:351
+#: text-utils/more.c:352
#, fuzzy
msgid "MORE environment variable"
msgstr "设置环境变量 %s 失败"
-#: text-utils/more.c:404
-#, fuzzy, c-format
-msgid "magic failed: %s\n"
+#: text-utils/more.c:405
+#, fuzzy
+msgid "magic failed"
msgstr "mkdir 失败：%s"
-#: text-utils/more.c:417 text-utils/more.c:436
+#: text-utils/more.c:409 text-utils/more.c:428
#, c-format
msgid ""
"\n"
"******** %s：不是文件文件 ********\n"
"\n"
-#: text-utils/more.c:465
+#: text-utils/more.c:461
#, c-format
msgid ""
"\n"
"*** %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:739
+#: text-utils/more.c:737
#, c-format
msgid "[Press space to continue, 'q' to quit.]"
msgstr "[按空格键继续，“q”键退出。]"
msgid_plural "...skipping %d lines"
msgstr[0] "...跳过 %d 行"
-#: text-utils/more.c:1677
+#: text-utils/more.c:1682
msgid ""
"\n"
"***Back***\n"
"***后退***\n"
"\n"
-#: text-utils/more.c:1696
+#: text-utils/more.c:1701
#, c-format
msgid "\"%s\" line %d"
msgstr "“%s”第 %d 行"
-#: text-utils/more.c:1699
+#: text-utils/more.c:1704
#, c-format
msgid "[Not a file] line %d"
msgstr "[不是文件] 第 %d 行"
-#: text-utils/more.c:1705
+#: text-utils/more.c:1710
msgid "No previous regular expression"
msgstr "无上一个正则表达式"
-#: text-utils/more.c:1774
+#: text-utils/more.c:1779
#, c-format
msgid "[Press 'h' for instructions.]"
msgstr "[按“h”键获取说明。]"
msgid "cannot open "
msgstr "打不开 "
+#: text-utils/pg.c:1266
+msgid "saved"
+msgstr "已保存"
+
#: text-utils/pg.c:1356
msgid ": !command not allowed in rflag mode.\n"
msgstr ": !命令 在 rflag 模式下不许使用。\n"
msgid "Reverse lines characterwise.\n"
msgstr "对成行的内容逐字翻转。\n"
-#: text-utils/ul.c:142
+#: text-utils/ul.c:123
#, c-format
msgid " %s [options] [<file> ...]\n"
msgstr " %s [选项] [<文件> ...]\n"
-#: text-utils/ul.c:145
+#: text-utils/ul.c:126
msgid "Do underlining.\n"
msgstr "加下划线。\n"
-#: text-utils/ul.c:148
+#: text-utils/ul.c:129
msgid " -t, -T, --terminal TERMINAL override the TERM environment variable\n"
msgstr " -t, -T, --terminal TERMINAL 用 TERMINAL 覆盖 TERM 环境变量的值\n"
-#: text-utils/ul.c:149
+#: text-utils/ul.c:130
msgid " -i, --indicated underlining is indicated via a separate line\n"
msgstr " -i, --indicated 通过单独一行表示下划线\n"
-#: text-utils/ul.c:209
+#: text-utils/ul.c:503
+#, c-format
+msgid "unknown escape sequence in input: %o, %o"
+msgstr "输入中有未知转义序列：%o，%o"
+
+#: text-utils/ul.c:618
msgid "trouble reading terminfo"
msgstr "读取终端信息出错"
-#: text-utils/ul.c:214
+#: text-utils/ul.c:622
#, c-format
msgid "terminal `%s' is not known, defaulting to `dumb'"
msgstr "终端“%s”未知，将使用默认值“dumb”"
-#: text-utils/ul.c:304
+#~ msgid "Filename"
+#~ msgstr "文件名"
+
#, c-format
-msgid "unknown escape sequence in input: %o, %o"
-msgstr "输入中有未知转义序列：%o，%o"
+#~ msgid "umount %s failed"
+#~ msgstr "卸载 %s 失败"
+
+#, c-format
+#~ msgid ""
+#~ "\n"
+#~ "Options:\n"
+#~ " -c, --check check bad blocks before creating the swap area\n"
+#~ " -f, --force allow swap size area be larger than device\n"
+#~ " -p, --pagesize SIZE specify page size in bytes\n"
+#~ " -L, --label LABEL specify label\n"
+#~ " -v, --swapversion NUM specify swap-space version number\n"
+#~ " -U, --uuid UUID specify the uuid to use\n"
+#~ msgstr ""
+#~ "\n"
+#~ "选项：\n"
+#~ " -c, --check 创建交换区前检查坏块\n"
+#~ " -f, --force 允许交换区大于设备大小\n"
+#~ " -p, --pagesize SIZE 指定页大小为 SIZE 字节\n"
+#~ " -L, --label LABEL 指定标签为 LABEL\n"
+#~ " -v, --swapversion NUM 指定交换空间版本号为 NUM\n"
+#~ " -U, --uuid UUID 指定要使用的 UUID\n"
+
+#~ msgid "unable to matchpathcon()"
+#~ msgstr "无法执行 matchpathcon()"
+
+#~ msgid " -v, --verbose print summary after hardlinking"
+#~ msgstr " -v, --verbose 硬链接后输出简要信息"
+
+#~ msgid " -vv print every hardlinked file and summary"
+#~ msgstr " -vv 输出每一个硬链接的文件及其简要信息"
+
+#~ msgid " -f, --force force hardlinking across filesystems"
+#~ msgstr " -f, --force 强制跨文件系统进行硬链接"
+
+#~ msgid "integer overflow"
+#~ msgstr "整数溢出"
+
+#, fuzzy, c-format
+#~ msgid "file %s changed underneath us"
+#~ msgstr "将目录更改到 %s 失败"
+
+#, c-format
+#~ msgid "failed to remove temporary link %s"
+#~ msgstr "移除临时链接 %s 失败"
+
+#, c-format
+#~ msgid " %s %s to %s\n"
+#~ msgstr " %s %s 到 %s\n"
+
+#~ msgid "would save"
+#~ msgstr "将要保存"
+
+#~ msgid "option --exclude not supported (built without pcre2)"
+#~ msgstr "不支持 --exclude 选项（构建时未配置使用 pcre2）"
+
+#, fuzzy, c-format
+#~ msgid "pattern error at offset %d: %s"
+#~ msgstr "%s：第 %d 行解析出错"
+
+#, c-format
+#~ msgid "Skipping %s%s\n"
+#~ msgstr "跳过 %s%s\n"
+
+#~ msgid "--reset-on-fork option is supported for SCHED_FIFO and SCHED_RR policies only"
+#~ msgstr "--reset-on-fork 选项只支持 SCHED_FIFO and SCHED_RR 策略"
-#: text-utils/ul.c:629
-msgid "Input line too long."
-msgstr "输入行过长。"
+#~ msgid "CPU MHz:"
+#~ msgstr "CPU MHz："
+
+#~ msgid "libcap-ng is too old for \"all\" caps"
+#~ msgstr "对于“all”权能，libcap-ng 太旧"
+
+#, c-format
+#~ msgid "failed on line %d"
+#~ msgstr "在 %d 行失败"
+
+#~ msgid "Input line too long."
+#~ msgstr "输入行过长。"
#~ msgid "%s: failed to read partition start from sysfs"
#~ msgstr "%s：读取从 sysfs 起始的分区失败"
#~ msgid " %s [options] -u <user> <command>\n"
#~ msgstr " %s [选项] -u <用户> <命令>\n"
-#~ msgid "%s"
-#~ msgstr "%s"
-
#~ msgid "%04d"
#~ msgstr "%04d"
#~ msgid "Try `%s --help' for more information."
#~ msgstr "请使用“%s --help”了解更多信息。"
-#~ msgid "Failed to set personality to %s"
-#~ msgstr "无法将人格(personality)设置为 %s"
-
#~ msgid "unrecognized option '%c'"
#~ msgstr "不识别的选项“%c”"
#~ msgid "error changing owner of %s: %s\n"
#~ msgstr "更改 %s 的所有者失败：%s\n"
-#~ msgid "can't rename %s to %s: %s\n"
-#~ msgstr "无法将 %s 改名为 %s：%s\n"
-
#~ msgid ""
#~ "\n"
#~ "mount: warning: /etc/mtab is not writable (e.g. read-only filesystem).\n"
#~ msgid "cannot issue CYGETMON on %s"
#~ msgstr "无法对 %s 实施 CYGETMON 命令"
-#~ msgid "cannot get threshold for %s"
-#~ msgstr "无法获取 %s 的阈值"
-
#~ msgid "cannot get timeout for %s"
#~ msgstr "无法获取 %s 的超时"
projects / thirdparty / util-linux.git / blobdiff